moved resources

mkruijt · mkruijt · commit 1f8ecab5450e · 2017-11-24T11:49:46.000+01:00
diff --git a/Week4/MAKEME.md b/Week4/MAKEME.md
@@ -17,25 +17,29 @@ _Deadline Monday_
 
 Give one of your fellow students in Github feedback about their homework of the previous week: create an issue in their repo, telling them what they did great and what they can improve.
 
-## Step 3: Git branching homework
+## Step 3: Git homework
 
 _Deadline Wednesday_
 
-1) Use the `unmeshvrije/MyFirst` repository (the one you cloned) for this homework.
+Git homework for this week:
 
-2) Make a branch.
+Pair up with another student in your class. The homework requires two people to work together. Let us call them admin and user.
 
-3) Name it YOUR-GITHUB-NAME-dev
+1. admin creates a new repository on github called “animals” (without quotes).
+2. admin adds a file called “zoo.txt” with some animal generally found in a zoo.
+3. admin commits and pushes his changes (in master branch)
+4. admin adds user as a collaborator (find out how to add a collaborator to a git repository)
+5. user clones a repository from admin (find out how to clone a repository. Note that `git init` is not required when you clone a repository)
+6. user makes a new branch called user-dev
+7. user adds another file called “pets.txt” with some animals generally found in a home.
+8. user commits and pushes his branch to remote
+9. admin pulls the branch crated by user (find out how to pull changes from the repository)
+10. admin submits the link to his github repository (named animal), where unmesh should be able to see the collaborator’s (i.e. user’s) branch along with his commits.
 
-4) Create a file commands.txt in your branch.
+Note:
 
-5) Add bash commands that you have learnt with descriptions
+The *user* is  *not supposed to fork* the admin’s repository. *admin* is supposed to add user as a collaborator and *user* should just *clone* the repository (i.e. *user* will only have the local copy of the repository). Only *admin* will have the *github* server copy of the repository. Of course, admin will have its local copy of the repository too.
 
-6) Then git add, commit and push them in a remote branch.
-
-**Do not merge the changes to master branch.**
-
-**Do not make any changes to master branch.**
 
 ## Step 3: Some Challenges
 Let's practice working with Objects and Arrays. Go to FreeCodeCamp and complete all challenges under "Object Oriented and Functional Programming" and the _first four challenges_ under "Basic Algorithm Scripting", up until 'Find the longest word in a string.'
diff --git a/Week4/README.md b/Week4/README.md
@@ -1,6 +1,5 @@
 ### Reading Week 4
 
-
 # Reading material for the fifth lecture:
 
 ```
@@ -14,12 +13,20 @@ In week five we will discuss the following topics:
 
 ### Here are resources that we like you to read as a preparation for the coming lecture. 
 
+#### JSON
 - [JSON](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/JSON) (MDN)
 
-- Read about APIS: https://www.programmableweb.com/api-university/what-are-apis-and-how-do-they-work
+#### Map and Filter
+- :dizzy: [Fun fun functional](https://www.youtube.com/playlist?list=PL0zVEGEvSaeEd9hlmCXrk5yUyqUag-n84) :dizzy: Check the first 3-4 videos.
+
+#### Code conventions
 - Code conventions: http://javascript.crockford.com/code.html
+
+#### Array cardio
+- Wes Bos' awesome free tutorials. Just make a free account and do Array Cardio #1 [here](https://javascript30.com/)
+
+#### More objects
 - Objects continued: http://eloquentjavascript.net/06_object.html
-- XHTTP requests: https://www.kirupa.com/html5/making_http_requests_js.htm
 
 
 ### Refresher:
diff --git a/Week5/README.md b/Week5/README.md
@@ -2,11 +2,10 @@
 
 ```
 In week six we will discuss the following topics:
-• Second Git Session
-• Async VS Sync
-• Polling
-• Structure for a basic SPA
-• There is a TEST the second part of the day
+• Closures
+• Events
+• Callbacks
+• Git work flow
 ```
 
 ### Here are resources that we like you to read as a preparation for the coming lecture:
@@ -15,20 +14,11 @@ In week six we will discuss the following topics:
 - [Closures](http://javascriptissexy.com/understand-javascript-closures-with-ease/)
 - [MDN Closures](https://developer.mozilla.org/en/docs/Web/JavaScript/Closures)
 
-
-- Read about Asynchronous vs. Synchronous programming: http://www.hongkiat.com/blog/synchronous-asynchronous-javascript/
+#### Design patterns
 -  [Learning JavaScript Design Patterns](https://addyosmani.com/resources/essentialjsdesignpatterns/book/#detailnamespacing) up to and including chapter 3
-- [Polling](https://davidwalsh.name/javascript-polling) 
-- [JavaScript Variable Scope and Hoisting Explained](http://javascriptissexy.com/javascript-variable-scope-and-hoisting-explained/)
-
-### This Sunday we have a test :boom:
-If you feel you need preparation for the test we recommend to do the following:
-
-- Take a look at the topics listed in the [README](https://github.com/HackYourFuture) of this repo (up to and including week 5). 
-- Review all the _REVIEW.md_ files in every week.
-- Look up the concepts you are struggling with in your __Smarter Way to Learn JavaScript__ book :books:. 
-- It's also useful to go through the reading material and homework of the last weeks.
 
+#### Git work flow
+- Check out this video of Daan to see how we use Git Workflow to hand in Homework (from now on): https://www.youtube.com/watch?v=-o0yomUVVpU&index=2&list=PLVYDhqbgYpYUGxRdtQdYVE5Q8h3bt6SIA
 
 _Please go through the material and come to class prepared!_
 
diff --git a/Week6/README.md b/Week6/README.md
@@ -2,18 +2,18 @@
 
 ```
 In week seven we will discuss the following topics:
-• Git Workflow :muscle: 
-• Map, reduce filter
-• Arrow functions
+• (Object Oriented Programming)
+• Code flow (order of execution)
+• Async VS Sync 
 ```
 
 ### Here are resources that we like you to read as a preparation for the coming lecture:
 
-Some nice resources about map, filter, reduce
-- :dizzy: [Fun fun functional](https://www.youtube.com/playlist?list=PL0zVEGEvSaeEd9hlmCXrk5yUyqUag-n84) :dizzy: Check the first 3-4 videos.
-- Wes Bos' awesome free tutorials. Just make a free account and do Array Cardio #1 [here](https://javascript30.com/)
+#### Async VS Sync 
+- Read about Asynchronous vs. Synchronous programming: http://www.hongkiat.com/blog/synchronous-asynchronous-javascript/
 
-- Check out this video of Daan to see how we use Git Workflow to hand in Homework (from now on): https://www.youtube.com/watch?v=-o0yomUVVpU&index=2&list=PLVYDhqbgYpYUGxRdtQdYVE5Q8h3bt6SIA
+#### Closures and async code
+- [Why closures are helpful with async code](http://stackoverflow.com/questions/13343340/calling-an-asynchronous-function-within-a-for-loop-in-javascript)
 
 _Please go through the material and come to class prepared!_
 
diff --git a/Week7/README.md b/Week7/README.md
@@ -2,20 +2,17 @@
 
 ```
 In week eight we will discuss the following topics:
-• (re)writing data structures (in JSON)
-• Closures
-• Promises
+• Structure for a basic SPA
+• XHTTP Requests
+• API calls
 ```
 
 ### Here are resources that we like you to read as a preparation for the coming lecture:
 
-Some nice resources about promises :ring:
-- [Googles post about Promises](https://developers.google.com/web/fundamentals/getting-started/primers/promises)
-- [A nice article from David Walsh](https://davidwalsh.name/promises)
-- [A real life example](https://github.com/mdn/js-examples/blob/master/promises-test/index.html)
-- [stackoverflow]http://stackoverflow.com/questions/13343340/calling-an-asynchronous-function-within-a-for-loop-in-javascript
+#### APIs
+- Read about APIS: https://www.programmableweb.com/api-university/what-are-apis-and-how-do-they-work
 
-- [Closures](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Closures)
-- [Why closures are helpful with async code](http://stackoverflow.com/questions/13343340/calling-an-asynchronous-function-within-a-for-loop-in-javascript)
+#### XHTTP requests
+- XHTTP requests: https://www.kirupa.com/html5/making_http_requests_js.htm
 
 The last one about [promises](https://www.youtube.com/watch?v=WBupia9oidU)...
diff --git a/Week8/README.md b/Week8/README.md
@@ -2,13 +2,19 @@
 
 ```
 In week nine we will discuss the following topics:
-• Promises refresher
-• Object Literals (and other patterns)
-• There is a TEST the second part of the day
+• (re)writing data structures (in JSON)
+• Promises
 ```
 
 ### Here are resources that we like you to read as a preparation for the coming lecture:
 
+#### Promises
+Some nice resources about promises :ring:
+- [Googles post about Promises](https://developers.google.com/web/fundamentals/getting-started/primers/promises)
+- [A nice article from David Walsh](https://davidwalsh.name/promises)
+- [A real life example](https://github.com/mdn/js-examples/blob/master/promises-test/index.html)
+- [stackoverflow]http://stackoverflow.com/questions/13343340/calling-an-asynchronous-function-within-a-for-loop-in-javascript
+
 
 ```
 If you feel you need preparation for the test we recommend to do the following:
