Skip to content

Commit

Permalink
fix accidental overwrite of log/resources
Browse files Browse the repository at this point in the history
  • Loading branch information
kallaway committed Apr 16, 2018
1 parent d15dc26 commit de5a161
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 25 deletions.
28 changes: 19 additions & 9 deletions log.md
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,20 +1,30 @@
# 100 Jours de Code - Log
# 100 Days Of Code - Log

### Jour 0: 26 Février 2016
### Day 0: February 30, 2016 (Example 1)
##### (delete me or comment me out)

**Progrès**: Correction du CSS, avancement de la fonctionnalité canvas dans l'app
**Today's Progress**: Fixed CSS, worked on canvas functionality for the app.

**Pensées:** J'ai vraiment bataillé avec le CSS, mais, dans l'ensemble, j'ai l'impression que je commence à m'améliorer. Canvas est encore un concept nouveau pour moi, mais j'ai réussi à comprendre des fonctionnalités de base.
**Thoughts:** I really struggled with CSS, but, overall, I feel like I am slowly getting better at it. Canvas is still new for me, but I managed to figure out some basic functionality.

**Lien vers les travaux:** [Calculator App](http://www.example.com)
**Link to work:** [Calculator App](http://www.example.com)

### Jour 2: 27 février 2016
### Day 0: February 30, 2016 (Example 2)
##### (delete me or comment me out)

**Today's Progress**: Fixed CSS, worked on canvas functionality for the app.

**Thoughts**: I really struggled with CSS, but, overall, I feel like I am slowly getting better at it. Canvas is still new for me, but I managed to figure out some basic functionality.

**Link(s) to work**: [Calculator App](http://www.example.com)


### Day 1: June 27, Monday

**Progrès**: J'ai complété des exercices surFreeCodeCamp.
**Today's Progress**: I've gone through many exercises on FreeCodeCamp.

**Pensées** J'ai commencé à codé récemment, et c'est vraiment super quand je parviens à résoudre un exercice d'algorithme après de nombreux essais et d'heures passées dessus.
**Thoughts** I've recently started coding, and it's a great feeling when I finally solve an algorithm challenge after a lot of attempts and hours spent.

**Liens vers les travaux**
**Link(s) to work**
1. [Find the Longest Word in a String](https://www.freecodecamp.com/challenges/find-the-longest-word-in-a-string)
2. [Title Case a Sentence](https://www.freecodecamp.com/challenges/title-case-a-sentence)
30 changes: 14 additions & 16 deletions ressources.md → resources.md
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
# Ressources principales à propos des #100JoursdeCode
# Primary Resources on the #100DaysOfCode

*(Ndlt : la plupart de ces ressources sont actuellement uniquement en anglais.)*

[Site officiel des #100DaysOfCode](http://100daysofcode.com/)
[The #100DaysOfCode Official Site](http://100daysofcode.com/)

### Articles
1. [Join the #100DaysOfCode](https://medium.freecodecamp.com/join-the-100daysofcode-556ddb4579e4) freeCodeCamp Medium
Expand All @@ -11,33 +9,33 @@

### Podcasts

# Ressources additionnelles sur les #100DaysOfCode
# Additional Resources on the #100DaysOfCode

## Articles utiles
## Helpful Articles
1. [Gentle Explanation of 'this keyword in JavaScript](http://rainsoft.io/gentle-explanation-of-this-in-javascript/)

## Projets et Idées
## Projects and Ideas
1. [FreeCodeCamp](https://www.freecodecamp.com)
2. [The Odin Project](http://www.theodinproject.com/)

## Autres ressources
## Other resources
1. [CodeNewbie - #100DaysOfCode Slack Channel](https://codenewbie.typeform.com/to/uwsWlZ)

## Livres (sur la programmation ou non)
## Books (both coding and non-coding)

### Autres:
### Non-Coding
1. ["The War of Art" by Steven Pressfield](http://www.goodreads.com/book/show/1319.The_War_of_Art)
2. ["The Obstacle is the Way" by Ryan Holiday](http://www.goodreads.com/book/show/18668059-the-obstacle-is-the-way?ac=1&from_search=true)
3. ["Ego is the Enemy" by Ryan Holiday](http://www.goodreads.com/book/show/27036528-ego-is-the-enemy?from_search=true&search_version=service)
4. ["Meditations" by Marcus Aurelius](https://www.goodreads.com/book/show/662925.Meditations)

### Programmation
### Coding
1. "Professional Node.js" by Teixeira
2. ["Eloquent Javascript" by Marijn Haverbeke](http://eloquentjavascript.net/) - accessible en ligne gratuitement et en édition papier
2. ["Eloquent Javascript" by Marijn Haverbeke](http://eloquentjavascript.net/) - available online (free) & as a paperback
3. "Mastering JavaScript" by Ved Antani

## Contenus
* [Règles](regles.md)
* [Log - cliquez ici pour voir mes progrès](log.md)
## Contents
* [Rules](rules.md)
* [Log - click here to see my progress](log.md)
* [FAQ](FAQ.md)
* [Ressources](ressources.md)
* [Resources](resources.md)

0 comments on commit de5a161

Please sign in to comment.