From ba7a43b9dd8d85ab296a1dd152bbc9042fc70955 Mon Sep 17 00:00:00 2001 From: mkruijt Date: Tue, 13 Mar 2018 14:37:51 +0100 Subject: [PATCH 1/5] renamed weeks and fixed paths to fundamentals repository --- README.md | 8 ++++---- {Week4 => Week1}/MAKEME.md | 6 ++---- {Week4 => Week1}/README.md | 0 {Week4 => Week1}/code_examples/Closures (class 10).md | 0 {Week4 => Week1}/code_examples/closure1.js | 0 {Week4 => Week1}/code_examples/closure2.js | 0 {Week4 => Week1}/code_examples/equal.js | 0 {Week4 => Week1}/code_examples/object.js | 0 {Week5 => Week2}/MAKEME.md | 4 ++-- {Week5 => Week2}/README.md | 0 {Week6 => Week3}/MAKEME.md | 4 ++-- {Week6 => Week3}/README.md | 0 12 files changed, 10 insertions(+), 12 deletions(-) rename {Week4 => Week1}/MAKEME.md (97%) rename {Week4 => Week1}/README.md (100%) rename {Week4 => Week1}/code_examples/Closures (class 10).md (100%) rename {Week4 => Week1}/code_examples/closure1.js (100%) rename {Week4 => Week1}/code_examples/closure2.js (100%) rename {Week4 => Week1}/code_examples/equal.js (100%) rename {Week4 => Week1}/code_examples/object.js (100%) rename {Week5 => Week2}/MAKEME.md (96%) rename {Week5 => Week2}/README.md (100%) rename {Week6 => Week3}/MAKEME.md (97%) rename {Week6 => Week3}/README.md (100%) diff --git a/README.md b/README.md index 39de08914..70d349822 100644 --- a/README.md +++ b/README.md @@ -6,15 +6,15 @@ Here you can find course content and homework for the JavaScript2 module |Week|Topic|Read|Homework| |----|-----|----|--------| -|1.|• Capturing user input
• Events
• [Basic DOM manipulations (img src, innerHTML)](fundamentals/DOM_manipulation.md)
• Code debugging using the browser
• [Code commenting](fundamentals/code_commenting.md)
• Structuring code files
• [Code formatting](fundamentals/code_formatting.md) |[Reading Week 4](/Week1/README.md)|[Homework Week 4](/Week1/MAKEME.md)| -|2.|• Functions + JSON/Arrays
• [Array Manipulations](fundamentals/array_manipulation.md)
• JSON
• [Map and filter](fundamentals/map_filter.md)
• Arrow functions |[Reading Week 5](/Week2/README.md)|[Homework Week 5](/Week2/MAKEME.md)| -|3.|• [Closures](fundamentals/scope_closures_this.md)
• Callbacks|[Reading Week 6](/Week3/README.md)|[Homework Week 6](/Week3/MAKEME.md)| +|1.|• Capturing user input
• Events
• [Basic DOM manipulations (img src, innerHTML)](../../../fundamentals/blob/master/fundamentals/DOM_manipulation.md)
• Code debugging using the browser
• [Code commenting](../../../fundamentals/blob/master/fundamentals/code_commenting.md)
• Structuring code files
• [Code formatting](../../../fundamentals/blob/master/fundamentals/code_formatting.md) |[Reading Week 4](/Week1/README.md)|[Homework Week 4](/Week1/MAKEME.md)| +|2.|• Functions + JSON/Arrays
• [Array Manipulations](../../../fundamentals/blob/master/fundamentals/array_manipulation.md)
• JSON
• [Map and filter](../../../fundamentals/blob/master/fundamentals/map_filter.md)
• Arrow functions |[Reading Week 5](/Week2/README.md)|[Homework Week 5](/Week2/MAKEME.md)| +|3.|• [Closures](../../../fundamentals/blob/master/fundamentals/scope_closures_this.md)
• Callbacks|[Reading Week 6](/Week3/README.md)|[Homework Week 6](/Week3/MAKEME.md)| __Kind note:__ We expect you to __always__ come prepared to the class on Sunday. ### Overall -A good understanding of all the above mentioned topics. Want to check your Knowledge? Go through the [JavaScript Fundamentals README](fundamentals/README.md) and research/ ask for help (Slack!) with the concepts that are not entirely clear. +A good understanding of all the above mentioned topics. Want to check your Knowledge? Go through the [JavaScript Fundamentals README](../../../fundamentals/blob/master/fundamentals/README.md) and research/ ask for help (Slack!) with the concepts that are not entirely clear. diff --git a/Week4/MAKEME.md b/Week1/MAKEME.md similarity index 97% rename from Week4/MAKEME.md rename to Week1/MAKEME.md index d48b79e49..3c35937c3 100644 --- a/Week4/MAKEME.md +++ b/Week1/MAKEME.md @@ -11,7 +11,7 @@ Topics discussed in class this week: • State ``` ->[Here](/Week3/README.md) you find the readings you have to complete before the fourth lecture. +>[Here](/Week1/README.md) you find the readings you have to complete before the fourth lecture. ## Step 0: Make a small dance Give yourself (or your neighbor) a little tap on the shoulder, you've made it to JS2! :muscle: @@ -102,7 +102,7 @@ And just for fun ... https://www.freecodecamp.com/challenges/sum-all-numbers-in- _Deadline Sunday morning_ -Go trough the reading material in the [README.md](/Week4/README.md) to prepare for your next class +Go trough the reading material in the [README.md](/Week1/README.md) to prepare for your next class ## :boom: Bonus homework :boom: the Bonus homework for this week (for those of you want an extra challenge) do the following: @@ -126,5 +126,3 @@ How to hand in your homework: • Your hyf-javascript2/week1 should now contain the files of your homework. • Place the link to your repository folder in Trello. ``` - -:star: Additional resources and review: [here](/Week3/REVIEW.md):star: \ No newline at end of file diff --git a/Week4/README.md b/Week1/README.md similarity index 100% rename from Week4/README.md rename to Week1/README.md diff --git a/Week4/code_examples/Closures (class 10).md b/Week1/code_examples/Closures (class 10).md similarity index 100% rename from Week4/code_examples/Closures (class 10).md rename to Week1/code_examples/Closures (class 10).md diff --git a/Week4/code_examples/closure1.js b/Week1/code_examples/closure1.js similarity index 100% rename from Week4/code_examples/closure1.js rename to Week1/code_examples/closure1.js diff --git a/Week4/code_examples/closure2.js b/Week1/code_examples/closure2.js similarity index 100% rename from Week4/code_examples/closure2.js rename to Week1/code_examples/closure2.js diff --git a/Week4/code_examples/equal.js b/Week1/code_examples/equal.js similarity index 100% rename from Week4/code_examples/equal.js rename to Week1/code_examples/equal.js diff --git a/Week4/code_examples/object.js b/Week1/code_examples/object.js similarity index 100% rename from Week4/code_examples/object.js rename to Week1/code_examples/object.js diff --git a/Week5/MAKEME.md b/Week2/MAKEME.md similarity index 96% rename from Week5/MAKEME.md rename to Week2/MAKEME.md index baa6211ac..e2402553f 100644 --- a/Week5/MAKEME.md +++ b/Week2/MAKEME.md @@ -9,7 +9,7 @@ Topics discussed this week: • Arrow functions ``` ->[Here](/Week5/README.md) you find the readings you have to complete before the sixth lecture. +>[Here](/Week2/README.md) you find the readings you have to complete before the sixth lecture. ## Step 1: Feedback @@ -118,7 +118,7 @@ _Deadline Saturday_ _Deadline Sunday morning_ -Go trough the reading material in the [README.md](/Week5/README.md) to prepare for your next class +Go trough the reading material in the [README.md](/Week2/README.md) to prepare for your next class ``` diff --git a/Week5/README.md b/Week2/README.md similarity index 100% rename from Week5/README.md rename to Week2/README.md diff --git a/Week6/MAKEME.md b/Week3/MAKEME.md similarity index 97% rename from Week6/MAKEME.md rename to Week3/MAKEME.md index 3f35feda8..fd331b57b 100644 --- a/Week6/MAKEME.md +++ b/Week3/MAKEME.md @@ -7,7 +7,7 @@ Topics discussed this week: • Callbacks ``` ->[Here](/Week6/README.md) you find the readings you have to complete before the seventh lecture. +>[Here](/Week3/README.md) you find the readings you have to complete before the seventh lecture. ## Step 1: Feedback @@ -154,7 +154,7 @@ __Bonus__: Write a function takes this array `['a', 'b', 'c', 'd', 'a', 'e', 'f' _Deadline Sunday morning_ -Go trough the reading material in the [README.md](/Week6/README.md) to prepare for your next class +Go trough the reading material in the [README.md](/Week3/README.md) to prepare for your next class ``` diff --git a/Week6/README.md b/Week3/README.md similarity index 100% rename from Week6/README.md rename to Week3/README.md From f579077370c242de16e6c0f2eacb0ee607240090 Mon Sep 17 00:00:00 2001 From: mkruijt Date: Tue, 13 Mar 2018 14:40:42 +0100 Subject: [PATCH 2/5] now also fixed the paths in the week folders --- Week1/MAKEME.md | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Week1/MAKEME.md b/Week1/MAKEME.md index 3c35937c3..ce29dab34 100644 --- a/Week1/MAKEME.md +++ b/Week1/MAKEME.md @@ -20,29 +20,29 @@ Give yourself (or your neighbor) a little tap on the shoulder, you've made it to Week 2 -- [Variables (var, let, const)](../fundamentals/variables.md) -- [Basic Data types (Strings, Numbers, Arrays, Booleans)](../fundamentals/values.md) -- [Operators](../fundamentals/operators.md) -- [Naming conventions](../fundamentals/naming_conventions.md) +- [Variables (var, let, const)](./../../../../fundamentals/blob/master/fundamentals/fundamentals/variables.md) +- [Basic Data types (Strings, Numbers, Arrays, Booleans)](./../../../../fundamentals/blob/master/fundamentals/values.md) +- [Operators](./../../../../fundamentals/blob/master/fundamentals/operators.md) +- [Naming conventions](./../../../../fundamentals/blob/master/fundamentals/naming_conventions.md) Week 3 -- [Advanced data types (objects)](../fundamentals/objects.md) -- [Conditional execution](../fundamentals/conditional_execution.md)
-- [Statements vs Expressions](../fundamentals/statements_expressions.md)
-- [Loops (for/while)](../fundamentals/loops.md) -- [Functions](../fundamentals/functions.md) -- [Scope](../fundamentals/scope.md) +- [Advanced data types (objects)](./../../../../fundamentals/blob/master/fundamentals/objects.md) +- [Conditional execution](./../../../../fundamentals/blob/master/fundamentals/conditional_execution.md)
+- [Statements vs Expressions](./../../../../fundamentals/blob/master/fundamentals/statements_expressions.md)
+- [Loops (for/while)](./../../../../fundamentals/blob/master/fundamentals/loops.md) +- [Functions](./../../../../fundamentals/blob/master/fundamentals/functions.md) +- [Scope](./../../../../fundamentals/blob/master/fundamentals/scope.md) Week 4 - Capturing user input - Events -- [Basic DOM manipulations (img src, innerHTML)](../fundamentals/DOM_manipulation.md) +- [Basic DOM manipulations (img src, innerHTML)](./../../../../fundamentals/blob/master/fundamentals/DOM_manipulation.md) - Code debugging using the browser -- [Code commenting](../fundamentals/code_commenting.md) +- [Code commenting](./../../../../fundamentals/blob/master/fundamentals/code_commenting.md) - Structuring code files -- [Code formatting](../fundamentals/code_formatting.md) +- [Code formatting](./../../../../fundamentals/blob/master/fundamentals/code_formatting.md) ## Step 1: Implement feedback From 03c2eb3016adba91791a31c475312418ab09edea Mon Sep 17 00:00:00 2001 From: Maartje Kruijt Date: Tue, 13 Mar 2018 14:41:44 +0100 Subject: [PATCH 3/5] fix path mistake --- Week1/MAKEME.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Week1/MAKEME.md b/Week1/MAKEME.md index ce29dab34..f919c1c40 100644 --- a/Week1/MAKEME.md +++ b/Week1/MAKEME.md @@ -20,7 +20,7 @@ Give yourself (or your neighbor) a little tap on the shoulder, you've made it to Week 2 -- [Variables (var, let, const)](./../../../../fundamentals/blob/master/fundamentals/fundamentals/variables.md) +- [Variables (var, let, const)](./../../../../fundamentals/blob/master/fundamentals/variables.md) - [Basic Data types (Strings, Numbers, Arrays, Booleans)](./../../../../fundamentals/blob/master/fundamentals/values.md) - [Operators](./../../../../fundamentals/blob/master/fundamentals/operators.md) - [Naming conventions](./../../../../fundamentals/blob/master/fundamentals/naming_conventions.md) From 2e10688cdeb7b6e603a0afaa84af5a2f73c18d26 Mon Sep 17 00:00:00 2001 From: mkruijt Date: Tue, 13 Mar 2018 15:08:00 +0100 Subject: [PATCH 4/5] changes header --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 70d349822..4e705a1d6 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ >Please help us improve and share your feedback! If you find better tutorials or links, please share them by opening a Pull Request. -# JavaScript2 +# HackYourFuture JavaScript 2 Here you can find course content and homework for the JavaScript2 module @@ -17,4 +17,4 @@ We expect you to __always__ come prepared to the class on Sunday. ### Overall A good understanding of all the above mentioned topics. Want to check your Knowledge? Go through the [JavaScript Fundamentals README](../../../fundamentals/blob/master/fundamentals/README.md) and research/ ask for help (Slack!) with the concepts that are not entirely clear. - +*The HackYourFuture curriculum is subject to CC BY copyright. This means you can freely use our materials, but just make sure to give us credit for it :)* From 9d687288e0344bf95ce258e660fead0c0df01cd7 Mon Sep 17 00:00:00 2001 From: mkruijt Date: Tue, 13 Mar 2018 15:39:40 +0100 Subject: [PATCH 5/5] corrected week numbers in columns --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 4e705a1d6..8d9c59238 100644 --- a/README.md +++ b/README.md @@ -6,9 +6,9 @@ Here you can find course content and homework for the JavaScript2 module |Week|Topic|Read|Homework| |----|-----|----|--------| -|1.|• Capturing user input
• Events
• [Basic DOM manipulations (img src, innerHTML)](../../../fundamentals/blob/master/fundamentals/DOM_manipulation.md)
• Code debugging using the browser
• [Code commenting](../../../fundamentals/blob/master/fundamentals/code_commenting.md)
• Structuring code files
• [Code formatting](../../../fundamentals/blob/master/fundamentals/code_formatting.md) |[Reading Week 4](/Week1/README.md)|[Homework Week 4](/Week1/MAKEME.md)| -|2.|• Functions + JSON/Arrays
• [Array Manipulations](../../../fundamentals/blob/master/fundamentals/array_manipulation.md)
• JSON
• [Map and filter](../../../fundamentals/blob/master/fundamentals/map_filter.md)
• Arrow functions |[Reading Week 5](/Week2/README.md)|[Homework Week 5](/Week2/MAKEME.md)| -|3.|• [Closures](../../../fundamentals/blob/master/fundamentals/scope_closures_this.md)
• Callbacks|[Reading Week 6](/Week3/README.md)|[Homework Week 6](/Week3/MAKEME.md)| +|1.|• Capturing user input
• Events
• [Basic DOM manipulations (img src, innerHTML)](../../../fundamentals/blob/master/fundamentals/DOM_manipulation.md)
• Code debugging using the browser
• [Code commenting](../../../fundamentals/blob/master/fundamentals/code_commenting.md)
• Structuring code files
• [Code formatting](../../../fundamentals/blob/master/fundamentals/code_formatting.md) |[Reading Week 1](/Week1/README.md)|[Homework Week 1](/Week1/MAKEME.md)| +|2.|• Functions + JSON/Arrays
• [Array Manipulations](../../../fundamentals/blob/master/fundamentals/array_manipulation.md)
• JSON
• [Map and filter](../../../fundamentals/blob/master/fundamentals/map_filter.md)
• Arrow functions |[Reading Week 2](/Week2/README.md)|[Homework Week 2](/Week2/MAKEME.md)| +|3.|• [Closures](../../../fundamentals/blob/master/fundamentals/scope_closures_this.md)
• Callbacks|[Reading Week 3](/Week3/README.md)|[Homework Week 3](/Week3/MAKEME.md)| __Kind note:__