From 99d49adac1843366b72168dfc232ef348fe57769 Mon Sep 17 00:00:00 2001
From: Jim Cramer <remarcmij@gmail.com>
Date: Sun, 27 May 2018 10:57:24 +0200
Subject: [PATCH 1/6] preparation for homework as PR

---
 .gitignore                        |  61 +++++++++
 .vscode/settings.json             |   8 +-
 LICENSE                           |   3 +
 README.md                         |   4 +-
 Week1/MAKEME.md                   | 210 ++++++++++++++++++++++--------
 Week1/assets/hyf-github-error.png | Bin 0 -> 10721 bytes
 Week2/MAKEME.md                   |  36 ++++-
 Week3/MAKEME.md                   | 200 ++++++++++++----------------
 Week3/README.md                   |   5 +
 homework/.eslintrc                |  47 +++++++
 homework/src/App.js               |  72 ++++++++++
 homework/src/Contributor.js       |  18 +++
 homework/src/Repository.js        |  34 +++++
 homework/src/Util.js              |  35 +++++
 homework/src/hyf.png              | Bin 0 -> 6971 bytes
 homework/src/index.html           |  23 ++++
 homework/src/index.js             |  47 +++++++
 homework/src/style.css            |   3 +
 termp.html                        |   5 +
 19 files changed, 632 insertions(+), 179 deletions(-)
 create mode 100644 .gitignore
 create mode 100644 LICENSE
 create mode 100644 Week1/assets/hyf-github-error.png
 create mode 100644 homework/.eslintrc
 create mode 100644 homework/src/App.js
 create mode 100644 homework/src/Contributor.js
 create mode 100644 homework/src/Repository.js
 create mode 100644 homework/src/Util.js
 create mode 100644 homework/src/hyf.png
 create mode 100644 homework/src/index.html
 create mode 100644 homework/src/index.js
 create mode 100644 homework/src/style.css
 create mode 100644 termp.html

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..6c589c2f8
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,61 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (http://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules/
+jspm_packages/
+
+# Typescript v1 declaration files
+typings/
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# dotenv environment variables file
+.env
+
+.netlify
+dist/
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 6e2e53564..f7a55df12 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,6 +1,10 @@
 {
+  "editor.formatOnSave": true,
+  "editor.formatOnType": true,
+  "editor.formatOnPaste": true,
+  "editor.detectIndentation": false,
+  "editor.tabSize": 2,
   "cSpell.words": [
-    "orgs",
-    "repos"
+    "tabindex"
   ]
 }
\ No newline at end of file
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 000000000..79285a5eb
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,3 @@
+This work is licensed under the Creative Commons Attribution 4.0 International License.
+To view a copy of this license, visit http://creativecommons.org/licenses/by/4.0/ 
+or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
\ No newline at end of file
diff --git a/README.md b/README.md
index 0f0f7e9b1..c6d11c65a 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ Here you can find course content and homework for the JavaScript3 modules
 |----|-----|----|--------|
 |1.|• Structure for a basic SPA (Single Page Application) <br>• [XMLHttpRequests](../../../fundamentals/blob/master/fundamentals/XMLHttpRequest.md) <br>• API calls|[Reading Week 1](/Week1/README.md)|[Homework Week 1](/Week1/MAKEME.md)|
 |2.|• [Event Loop (order of execution)](../../../fundamentals/blob/master/fundamentals/event_loop.md)<br>• [Promises](../../../fundamentals/blob/master/fundamentals/promises.md)|[Reading Week 2](/Week2/README.md)|[Homework Week 2](/Week2/MAKEME.md)|
-|3.|• [try...catch](../../../fundamentals/blob/master/fundamentals/try_catch.md)<br>• [async/await](../../../fundamentals/blob/master/fundamentals/async_await.md)<br>• [Object Oriented Programming and ES6 Classes](../../../fundamentals/blob/master/fundamentals/oop_classes.md)<br>• [The `this` keyword](../../../fundamentals/blob/master/fundamentals/this.md)<br>• call, apply, bind |[Reading Week 3](/Week3/README.md)|[Homework Week 3](/Week3/MAKEME.md)|
+|3.|• [try...catch](../../../fundamentals/blob/master/fundamentals/try_catch.md)<br>• [async/await](../../../fundamentals/blob/master/fundamentals/async_await.md)<br>• [The `this` keyword](../../../fundamentals/blob/master/fundamentals/this.md)<br>• call, apply, bind<BR>• [Object Oriented Programming and ES6 Classes](../../../fundamentals/blob/master/fundamentals/oop_classes.md)|[Reading Week 3](/Week3/README.md)|[Homework Week 3](/Week3/MAKEME.md)|
 
 __Kind note:__
 
@@ -18,3 +18,5 @@ We expect you to __always__ come prepared to the class on Sunday.
 A good understanding of all the above mentioned topics. Want to check your Knowledge? Go through the [JavaScript Fundamentals README](../../../fundamentals/blob/master/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 :)*
+
+<a rel="license" href="http://creativecommons.org/licenses/by/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by/4.0/88x31.png" /></a><br />This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>.
diff --git a/Week1/MAKEME.md b/Week1/MAKEME.md
index a1c527078..4e90abaa9 100644
--- a/Week1/MAKEME.md
+++ b/Week1/MAKEME.md
@@ -7,108 +7,212 @@ Topics discussed this week:
 • API calls
 ```
 
-
 >[Here](/Week3/README.md) you find the readings you have to complete before the ninth lecture.
 
 ## Step 1: Feedback
 
-_Deadline Monday_
-
-Please provide feedback in an issue.
-
-_Deadline Monday_
+**_Deadline Monday_**
 
-## Step 2: FINISH ALL YOUR JAVASCRIPT HOMEWORK
+Please provide feedback on last week's homework from a fellow student as a GitHub issue.
 
-_Deadline Saturday_
+## Step 2: Single Page Application :sweat_drops:
 
-:point_up:
+**_Deadline Thursday_**
 
-## Step 3: SPA :sweat_drops:
+_This homework is more extensive and challenging than previous homework! Please read the instructions below carefully and follow them precisely. Start this homework as soon as you can and allow time for discussion and questions (slack!)._
 
-_Deadline Saturday_
+### 2.1 Introduction
 
-You are going to write a SPA (Single Page Application) that uses the [GitHub API](https://developer.github.com/guides/getting-started/).
+You are going to write a _Single Page Application_ (SPA) that uses the [GitHub API](https://developer.github.com/guides/getting-started/).
 
-This application should display information about the available [HYF repositories](https://github.com/hackyourfuture):
+This application should display information about the available [HYF GitHub repositories](https://github.com/hackyourfuture):
 
 - You should be able to select a repository from a list of available repositories.
 - The application should display high-level information about the selected repository and show a list of its contributors.
+- When clicking on the name of the selected repository the GitHub page for the corresponding repository should be opened in a new browser tab.
+- When clicking on a contributor, the GitHub page for the contributor should be opened in a new browser tab.
 
 Figure 1 below shows an example of what your application could look like. Note that this is just an example. If you find it boring or unimaginative, please improve on it! On the other hand, a simpler version is OK too, so long as you implement the expected functionality.
 
 ![UI Example](./assets/hyf-github.png)
 
-Figure 1. Example User Interface using [Material Design](https://material.io/guidelines/) principles.
+<small>Figure 1. Example User Interface using [Material Design](https://material.io/guidelines/) principles.</small>
 
-### Instructions
+A live version of this application can be found here: http://hyf-github.netlify.com/
 
-1. Create this application in the `week1` folder of your `hyf-javascript1` repo. Your application should at minimum consist of the files `index.html`, `style.css` and `app.js`.
-2. Your `index.html` file should load the `style.css` and `app.js` files, using the appropriate HTML tags.
-3. The `body` of your `index.html` should contain a single `div` element like this: `<div id="root"></div>`.
-4. All other HTML elements should be generated programmatically by your `app.js` file and ultimately be hanging off the root `div` element.
-5. Implement the repository selection list by means of an HTML [\<select\>](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/select) element.
+### 2.2 The GitHub API
 
-You will need to use XMLHttpRequests against the GitHub API to get the relevant information. The GitHub API documentation is very extensive. An overview is given [here](https://developer.github.com/v3/) but we will point you to the relevant sections in the documentation needed for this assignment.
+#### 2.2.1 Get a list of HYF repositories
 
-#### List of repositories
-
-You can obtain a list of HYF repositories through this API endpoint ([What is an API Endpoint?](https://teamtreehouse.com/community/what-is-an-api-endpoint)):
+You can fetch a list of HYF repositories through this API endpoint ([What is an API Endpoint?](https://teamtreehouse.com/community/what-is-an-api-endpoint)):
 
 ```
 https://api.github.com/orgs/HackYourFuture/repos?per_page=100
 ```
 
-GitHub API documentation: [List organization repositories](https://developer.github.com/v3/repos/#list-organization-repositories)
+If you open this URL in the browser (_try it!_) you will receive JSON data about the available HYF repositories. This is the data that you will need to work with in this assignment.
+
+<small>Note the query string `?per_page=100` in the above URL. If you don't specify this query string you will only get the first 30 repositories (the default `per_page` is 30). HackYourFuture has more than 30 repositories but less than 100.</small>
+
+The returned JSON data contains some basic information about each repository, such as `name`, `full_name`, `description` etc. There are also many properties that contain URLs to obtain detail information about certain aspects of the repository.
+
+#### 2.2.2 Get contributor information for a repository
+
+The JSON data that is returned from the initial request to get repository information includes a property named `contributors_url`. Use the value of this property to fetch a list of contributors.
+
+#### 2.2.3 GitHub API documentation
+
+You can find detailed information about the GitHub API by means of the link listed below. However, the documentation is very extensive and not easy to digest. For this homework it is not necessary to study the GitHub API documentation. We provide the link here for completeness.
+
+> GitHub API documentation: https://developer.github.com/v3/
+
+### 2.3 Preparation
+
+You will be working on this same application during the next three weeks. For each week you will need to create a new Git branch, as listed in the Table 1 below.
+
+| Week | Branch | Assignment |
+|:----:|--------|------------|
+| 1   | `week1` | Create a basic application using callbacks to handle network requests. |
+| 2   | `week2`  | 1. Refactor the callbacks to promises.<br>2. Make the UI responsive.|
+| 3   | `week3`   | 1. Refactor the application to use ES6 Classes and async/await.<br>2. Make the app ARIA-compliant. |
+
+<small>Table 1. Homework schedule</small>
+
+**Instructions**
+
+1. Fork the JavaScript3 repository (_this repository_) to your own GitHub account.
+2. Clone the fork to your laptop.
+3. Open the `homework` folder inside the cloned repository in VSCode.
+4. Create a new branch for the week 1 homework with the following command:
+
+    ```
+    git checkout -b week1
+    ```
+
+### 2.4 Code Overview
+
+The files that make up the application are located in the `src` folder. It contains the following files:
+
+| Filename         | Description |
+|------------------|-------------|
+| ~~`App.js`~~         | Not used in week 1 and 2. |
+| ~~`Contributor.js`~~ | Not used in week 1 and 2. |
+| `hyf.png`            | Contains the HackYourFuture logo. |
+| `index.html`         | The application's HTML file. |
+| `index.js`           | A starter JavaScript file. |
+| ~~`Repository.js`~~  | Not used in week 1 and 2. |
+| `style.css`          | A starter CSS file. |
+| ~~`Util.js`~~        | Not used in week 1 and 2. |
+
+In week 1, you should only modify `index.js` and `style.css`.
+
+_**Do not modify any other files at this time!**_
 
-Note the query string `?per_page=100`. If you don't specify this query string you will only get the first 30 repositories (the default `per_page` is 30 and HYF has more than 30 - but less than 100).
+#### 2.4.1 A first examination
 
-#### Get contributor information
+1. Open `index.html` and examine its contents (but don't modify anything). Notice that the HTML `body` looks like this:
 
-The response object that is returned by GitHub from the request to get repository information includes a property with the `contributors_url`. Use the value of this property to make a new request to GitHub to obtain a list of contributors.
+    ```html
+    <body>
+      <div id="root"></div>
+      <script src="./index.js"></script>
+    </body>
+    ```
 
-In the lecture we developed some utility functions to simplify making XMLHttpRequests (function `fetchJSON()`) and creating and manipulating HTML elements (function `createAndAppend()`). You are free to copy and use these utility functions, but if you do we expect that you can explain how they work.
+    The `body` tag contains a single `div` to which you will need to dynamically append HTML elements through your JavaScript code in `index.js`.
 
-### Refinements
+2. Open `index.js`. This file contains a starter set of code for you to expand. It contains the following three functions:
 
-- Make all the repositories link to their own page in GitHub. Use the value of the key: `name` to make this work (hint: GitHub urls always look like this https://api.github.com/repos/HackYourFuture/[repositoryName] where [repositoryName] would be replaced by the actual `name` of the repository, for example `CommandLine`).
-- Make sure the link opens in a new tab.
+    | Function | Description |
+    |----------|-------------|
+    | `fetchJSON` | Uses `XMLHttpRequest` to fetch JSON data from an API end point. This function uses an asynchronous callback.  |
+    | `createAndAppend` | A utility function for easily creating and appending HTML elements. |
+    | `main` | Contains the start-up code for the application. |
+    
+    `index.js` also contains a constant with the URL for the HYF repositories as listed in section 2.2.1:
 
-### Important
+    ```js
+    const HYF_REPOS_URL = 'https://api.github.com/orgs/HackYourFuture/repos?per_page=100';
+    ```
 
-- Do not duplicate code! This is especially important for making requests since we are making multiple ones with different urls and we want to do different actions based on the call we are making. Here are some handles to get you started:
-  - Write a function called `fetchJSON` (or copy from the lecture code) which accepts (at least) the following parameters: `url` and `callback`.
-  - Make sure your `callback` is called when the request errors or when it sends a response (look at the documentation)
-  - Your `callback` functions should accept two parameters so it can handle both errors: `err` and `response`.
-  So when a user selects a repository from the list you want to call `fetchJSON` with a different `url` and supply it with a function that handles both errors (display an error message to the user for example) and responses (render it correctly as HTML elements in your page).
-- When the user changes the selected repository, any existing repository information in your page should be cleared before displaying the new information.
-- Make your functions small and reusable (modular)! That means create separate functions to handle certain steps.
+3. Open the `index.html` file in your browser. Notice that it produces the same JSON output that you saw previously when you opened the URL directly in the browser.
 
-Note:
+4. Review the `main()` function in `index.js` and examine how this code renders the JSON output in the browser by means of a `pre` HTML element (for demonstration purposes).
 
-1. Please remove all redundant, commented-out code and console.log's from your files before pushing your homework as finished. There is no need for your mentors to review this stuff.
-2. Please make sure your code is well-formatted and follows the recommended naming conventions.
+### 2.5 Week 1 Assignment
 
-_GO WILD_
+The assignment is to produce an application similar to the one illustrated in Figure 1 above.
 
-Again, check out the GitHub API documentation to see what kind of magic stuff you can do with it.
+It should include the following components:
 
-The assignment is to implement something extra that is not in the assignment :scream: (nice and vague, right?)
+1. An HTML `select` element from which the user can select a HYF repository. This `select` element must be populated with `option` elements, one for each HYF repository.
+2. A left-hand column that displays basic information about the selected repository.
+3. A right-hand column that displays a list of contributors to the repository.
 
-Endless fun and possibilities. Need inspiration? Check out the GitHub API documentation. Oh, and please make it look nice (hint: use the stuff you learned in HTML/CSS)!
+**Functional Requirements:**
 
+1. The list of repositories in the `select` element should be sorted (case-insensitive) on repository name.
+2. At start-up your application should display information about the first repository as displayed in the `select` element.
+3. When the user changes the selection, the information in the web page should be refreshed for the newly selected repository.
+4. You should be able to click on the repository name of the selected repository to open a new browser tab with the GitHub page for that repository.
+5. You should be able to click on a contributor to open a new browser tab with the GitHub page for that contributor.
+6. You should render network errors to the DOM (see Figure 2 below for an example). Do not use `console.log` as regular users will not see the console output.
+7. Your UI should be responsive. Try it with Chrome Developer Tools in the browser, using a mobile phone format and a tablet format, portrait and landscape. If necessary, you can also do this work in week 2.
+
+![Error rendering](./assets/hyf-github-error.png)
+
+<small>Figure 2. Rendering of network errors.</small>
+
+**Code modifications:**
+
+**`index.js`**
+
+- Add new functions and modify function `main()` as you see fit. It is not likely that you will need to modify `fetchJSON()` and `createAndAppend()`.
+
+**`style.css`**
+
+- Add your own styling.
+
+**Hints:**
+
+- Add one `option` element per repository to the `select` element, where each `option` element has the array index of the repository as its `value` attribute and the name of the repository as its text content:
+
+    ```html
+    <select>
+      <option value="0">alumni</option>
+      <option value="1">angular</option>
+      <!-- etc -->
+    </select>
+    ```
+
+
+- To sort the list repositories use [`.sort()`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort) and [`.localeCompare()`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/localeCompare).
+
+- Use CSS media queries and [Flexbox](https://css-tricks.com/snippets/css/a-guide-to-flexbox/) to make the UI responsive. 
+
+- To force a 404 network error so that you can test the rendering of errors, change the URL to make an invalid GitHub request, e.g. append an `x` to `orgs`: `orgsx`.
+
+
+### 2.5 Handing in your homework
+
+
+1. Push your `week1` branch to GitHub:
+
+    ```
+    git push -u origin week1
+    ```
+
+2. Create a pull request for your `week1` branch.
+
+---
 
 _BONUS_ : Code Kata Race
 
 - [Codewars](https://www.codewars.com/collections/hyf-homework-number-2)
 
 
-## Step 5: Read before next lecture
+## Step 3: Read before next lecture
 
 _Deadline Sunday morning_
 
-Go trough the reading material in the [README.md](/Week2/README.md) to prepare for your next class.
-
->Commit and push your homework in your "hyf-javascript3" GitHub repository.
-Make sure that your commit message are meaningful.
-Place the link to your repository folder in Trello.
\ No newline at end of file
+Go through the reading material in the [README.md](/Week2/README.md) to prepare for your next class.
diff --git a/Week1/assets/hyf-github-error.png b/Week1/assets/hyf-github-error.png
new file mode 100644
index 0000000000000000000000000000000000000000..545c658f4b105f1dd36fdde8d9bdd4d276d3dcdf
GIT binary patch
literal 10721
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

literal 0
HcmV?d00001

diff --git a/Week2/MAKEME.md b/Week2/MAKEME.md
index 493e41685..9aec2885e 100644
--- a/Week2/MAKEME.md
+++ b/Week2/MAKEME.md
@@ -27,18 +27,44 @@ Topics discussed this week:
 
 ## Step 3: Promises
 
-_Deadline Saturday_
+**_Deadline Thursday_**
 
-The assignment for this week is:
+### 3.1 Preparation
+
+The homework for week 2 will build on the work you did in week 1. You will create a new branch based on the `week1` branch.
+
+1. Make sure that you committed all changes in the week 1 version of your homework.
+2. Create a new `week2` branch:
+
+    ```
+    git checkout -b week2
+    ```
+
+### 3.2 Assignment
+
+You will continue to work on the files `index.js` and (possibly) `style.css`.
 
 - Complete your GitHub app code from the previous week, if needed, to meet the requirements from that week's assignment.
 - Replace all asynchronous callbacks (e.g. as used with XMLHttpRequest) by ES6 promises.
 - Beautify your app's styling.
+- Make your app responsive (use CSS media queries and [Flexbox](https://css-tricks.com/snippets/css/a-guide-to-flexbox/)).
+- Make your app ARIA-compliant.
+
+**ARIA-compliance**
+
+Please review the material from the HTML/CSS module: [Get familiar with Accessible Rich Internet Applications (ARIA)](https://github.com/HackYourFuture/HTML-CSS/tree/master/Week1#get-familiar-with-accessible-rich-internet-applications-aria).
+
+For the GitHub application ARIA-compliance means that the Contributors list should either be a native HTML list (i.e. using `ul` and `li` elements) or otherwise marked with an appropriate ARIA **role**. Furthermore, a user should be able to navigate to all interactive elements using the keyboard (e.g., using the **Tab** key). Pressing **Enter** on such an element should be equivalent to a clicking the mouse.
+
+### 3.3 Handing in your homework
+
+1. Push your `week2` branch to GitHub:
 
-Bonus assignments:
+    ```
+    git push -u origin week2
+    ```
 
-- Make your app responsive (using media queries)
-- Make your app ARIA-compliant
+2. Create a pull request for your `week2` branch.
 
 Note:
 
diff --git a/Week3/MAKEME.md b/Week3/MAKEME.md
index 95372e913..e89d9d544 100644
--- a/Week3/MAKEME.md
+++ b/Week3/MAKEME.md
@@ -7,37 +7,90 @@ Topics discussed this week:
 • call, apply, bind
 ```
 
-## Step 1: Give feedback
+## Step 1: Fix requested changes
 
-_Deadline Monday_
+_Deadline Wednesday_
 
-Give feedback on Step 3 of last weeks homework. Please provide the feedback in an issue.
+- Fix the requested changes from the PR from the last weeks and make sure you explain how you fixed the issue in a comment.
 
-## Step 2: Issues
+## Step 2
 
-_Deadline Monday_
+### 2.1 Preparation
 
-- Solve all your Git issues. DO NO CLOSE AN ISSUE WITHOUT AN EXPLANATION OR CODE COMMIT REFERENCING THAT ISSUE.
+The homework for week 3 will build on the work you did in week 2. You will create a new branch based on the `week2` branch.
 
-## Step 3: Fix issues
+1. Make sure that you committed all changes in the week 2 version of your homework.
+2. Create a new `week3` branch:
 
-_Deadline Wednesday_
+    ```
+    git checkout -b week3
+    ```
 
-- Fix the issues from the last weeks and make sure you explain how you fixed the issue in a comment (or commit message)
+### 2.2 Assignment
 
-## Step 4
+This week you will work with all JavaScript files in the `src` folder. The assignment consists of two parts:
 
-_Deadline Thursday_
+1. Refactor all `.then()` and `.catch()` methods with `async`/`await` and `try...catch`.
+2. Refactor your application to use ES6 classes.
 
-- Sort the list the repositories in the `<select>` by name (case-insensitive).
-- Refactor your app to replace `.then()` and `.catch()` with `async`/`await` and `try...catch`.
+#### 2.2.1 async/await
 
-Read:
+**_Deadline Thursday_**
+
+_Read:_
 
 - [try...catch](../../../../fundamentals/blob/master/fundamentals/try_catch.md)
 - [async/await](../../../../fundamentals/blob/master/fundamentals/async_await.md)
 
-## Step 5: OOP and ES6 classes
+_Instructions:_
+
+- Refactor all `.then()` and `.catch()` methods with `async`/`await` and `try...catch`.
+
+TODO: ARIA-compliance
+
+#### 2.2.2 Bonus assignment: ES6 Classes
+
+**_Deadline Saturday_**
+
+This final **bonus** assignment requires you to got the extra mile and master Object Oriented Programming and ES6 classes. ES6 classes are not used in the Node and Database modules. You will not come across them again until the React module.
+
+TODO: Is this optional/bonus? Separate branch `final`?
+
+**_Deadline Thursday_**
+
+In this assignment you need to redistribute and adapt the code from `index.js` to the files `App.js`, `Repository.js` and `Contributor.js`. You do not need to modify `Util.js`.
+
+| File             | Description |
+|------------------|-------------|
+| `App.js`         | The `App` class contains the start-up code and manages the overall orchestration of the app. |
+| `Repository.js`  | The `Repository` class holds code and data for a single repository. |
+| `Contributor.js` | The `Contributor` class holds code and data for a single contributor. |
+| `Util.js`        | The `Util` class contains static helper methods for use in the other classes. |
+
+The `App.js`, `Repository.js` and `Contributor.js` files each contain skeleton code that you can use to migrate portions of your code from `index.js` to.
+
+_Read:_
+
+- HYF fundamental: [ES6 Classes](https://github.com/HackYourFuture/fundamentals/blob/master/fundamentals/oop_classes.md#es6-classes)
+- More on ES6 classes: [ES6 Classes in Depth](https://ponyfoo.com/articles/es6-classes-in-depth)
+
+_Instructions:_
+
+1. Commit any outstanding changes.
+2. Change the content of the `body` tag of `index.html` as follows:
+
+    ```html
+    <body>
+      <div id="root"></div>
+      <script src="./Util.js"></script>
+      <script src="./Repository.js"></script>
+      <script src="./Contributor.js"></script>
+      <script src="./App.js"></script>
+    </body>
+    ```
+
+
+## Step 3: OOP and ES6 classes
 
 - If you need to refresh your memory on es6 classes: [es6-classes-in-depth](https://ponyfoo.com/articles/es6-classes-in-depth)
 
@@ -52,113 +105,24 @@ Read:
 
 Instructions:
 
-1. You should refactor your code to use three classes, named `Repository`, `Contributor` and `View`.
+1. You should refactor your code into four classes, named `App`, `Repository`, `Contributor` and `Util`.
 2. Move your existing code that deals with rendering the repository information to the `render()` method of the `Repository` class.
 3. Move your existing code that deals with rendering the information for a single contributor to the `render()` method of the `Contributor` class.
 4. Move your existing code responsible for initializing your application to the `constructor` of the `View` class.
 5. The bulk of your remaining code should probably go to the `fetchAndRender()` method of the `View` class.
 
-### Suggested skeleton
-
-You could use this skeleton as overall design for your code in `app.js`:
-
-```js
-'use strict';
-{
-  const hyfUrl = 'https://api.github.com';
-  const hyfReposUrl = hyfUrl + '/orgs/HackYourFuture/repos?per_page=100';
-
-  class Repository {
-    constructor(data) {
-      this._data = data;
-    }
-
-    /**
-     * Render the repository info to the DOM.
-     * @param {HTML element} parent The parent element in which to render the repository.
-     * info.
-     */
-    render(parent) {
-      // Add your code here.
-      // This method should render the repository data stored in the '_data' property
-      // as HTML elements and append them to the `parent` element.
-    }
-
-    /**
-     * Returns an array of contributors as a promise
-    */
-    fetchContributors() {
-      // Add your code here
-    }
-  }
-
-  class Contributor {
-    constructor(data) {
-      this._data = data;
-    }
-
-    /**
-     * Render the contributor info to the DOM.
-     * @param {HTML element} parent The parent element in which to render the contributor.
-     * info.
-     */
-    render(parent) {
-      // Add your code here.
-      // This method should render the contributor data stored in the 'data' property
-      // as HTML elements and append them to the `parent` element.
-    }
-  }
-
-  class View {
-    constructor() {
-      this.initialize();
-    }
-
-    /**
-     * View initialization
-     */
-    async initialize() {
-      // Add code here to initialize your app
-      // 1. Create the fixed HTML elements of your page
-      // 2. Make an initial XMLHttpRequest to populate your <select> element
-    }
-
-    /**
-     * Fetch information for the selected repository and render the
-     * information as HTML elements in the DOM
-     * @param {*} repoName The name of the selected repository
-     */
-    async fetchAndRender(repoName) {
-      const leftDiv = ...;
-      const rightDiv = ...;
-
-      // ...
-
-      try {
-        const contributors = await repo.fetchContributors();
-        repo.render(leftDiv);
-        contributors
-          .map(contributor => new Contributor(contributor))
-          .forEach(contributor => contributor.render(contributorList));
-      }
-      catch (error) {
-        createAndAppend('div', container, { html: error.message, class: 'alert alert-error' });
-      }
-    }
-
-    /**
-     * Fetch API data as JSON data in a promise
-     * @param {string} url The URL of the API endpoint.
-     * @returns A promise.
-     */
-    fetchJSON(url) {
-      // Add your code here
-    }
-  }
-
-  window.onload = () => new View();
-}
-```
+TODO: describe the division of work between the classes
+
+
+### 3.3 Handing in your homework
+
+1. Push your `week2` branch to GitHub:
+
+    ```
+    git push -u origin week2
+    ```
+
+2. Create a pull request for your `week2` branch.
 
 Note:
 
@@ -170,7 +134,7 @@ _Deadline Sunday morning_
 
 Go trough the reading material in the [README.md](https://github.com/HackYourFuture/Node.js) of the Node repository to prepare for your next class.
 
-## _BONUS_ : Code Kata Race
+## Alternative _BONUS_ : Code Kata Race
 
 If you haven't already join our clan: "Hack Your Future" in codewars
 
diff --git a/Week3/README.md b/Week3/README.md
index a7472cff3..2c317379f 100644
--- a/Week3/README.md
+++ b/Week3/README.md
@@ -21,4 +21,9 @@ Here are resources that we like you to read as a preparation for the third lectu
 - [Function.prototype.bind()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Function/bind)
 
 
+## Recommended Readings
+
+[Eloquent JavaScript: Chapter 6 - The Secret Life of Objects](http://eloquentjavascript.net/06_object.html). Read up to the section of **Maps**.
+
+
 _Please go through the material and come to class prepared!_
\ No newline at end of file
diff --git a/homework/.eslintrc b/homework/.eslintrc
new file mode 100644
index 000000000..ae8189517
--- /dev/null
+++ b/homework/.eslintrc
@@ -0,0 +1,47 @@
+{
+  "env": {
+    "browser": true,
+    "commonjs": true,
+    "es6": true,
+    "node": true
+  },
+  "parserOptions": {
+    "ecmaVersion": 2017,
+    "ecmaFeatures": {
+      "jsx": true
+    },
+    "sourceType": "module"
+  },
+  "extends": [
+    "eslint:recommended"
+  ],
+  "rules": {
+    "no-const-assign": "warn",
+    "no-this-before-super": "warn",
+    "no-undef": "warn",
+    "no-unreachable": "warn",
+    "no-unused-vars": "warn",
+    "constructor-super": "warn",
+    "valid-typeof": "warn",
+    "no-var": "warn",
+    "prefer-const": "warn",
+    "no-multiple-empty-lines": "warn",
+    "eol-last": [
+      "error",
+      "always"
+    ],
+    "no-console": "off",
+    "camelcase": "warn",
+    "eqeqeq": [
+      "error",
+      "always",
+      {
+        "null": "ignore"
+      }
+    ],
+    "semi": [
+      "warn",
+      "always"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/homework/src/App.js b/homework/src/App.js
new file mode 100644
index 000000000..e1fb13db2
--- /dev/null
+++ b/homework/src/App.js
@@ -0,0 +1,72 @@
+'use strict';
+
+/* global Util, Repository, Contributor */
+
+class App {
+  constructor(url) {
+    this.initialize(url);
+  }
+
+  /**
+   * Initialization
+   * @param {string} url The GitHub URL for obtaining the organization's repositories.
+   */
+  async initialize(url) {
+    // Add code here to initialize your app
+    // 1. Create the fixed HTML elements of your page
+    // 2. Make an initial XMLHttpRequest using Util.fetchJSON() to populate your <select> element
+
+    const root = document.getElementById('root');
+    // ...
+
+    try {
+      // ...
+      const repos = await Util.fetchJSON(url);
+      this.repos = repos.map(repo => new Repository(repo));
+      // ...
+    } catch (error) {
+      this.renderError(error);
+    }
+  }
+
+  /**
+   * Fetch contributor information for the selected repository and render the
+   * repo and its contributors as HTML elements in the DOM.
+   * @param {number} index The array index of the repository.
+   */
+  async fetchContributorsAndRender(index) {
+    try {
+      const repo = this.repos[index];
+      const contributors = await repo.fetchContributors();
+
+      const container = document.getElementById('container');
+      // Erase previously generated inner HTML from the container div
+      container.innerHTML = '';
+
+      const leftDiv = Util.createAndAppend('div', container);
+      const rightDiv = Util.createAndAppend('div', container);
+
+      const contributorList = Util.createAndAppend('ul', rightDiv);
+
+      repo.render(leftDiv);
+
+      contributors
+        .map(contributor => new Contributor(contributor))
+        .forEach(contributor => contributor.render(contributorList));
+    } catch (error) {
+      this.renderError(error);
+    }
+  }
+
+  /**
+   * Render an error to the DOM.
+   * @param {Error} error An Error object describing the error.
+   */
+  renderError(error) {
+    // Replace this comment with your code
+  }
+}
+
+const HYF_REPOS_URL = 'https://api.github.com/orgs/HackYourFuture/repos?per_page=100';
+
+window.onload = () => new App(HYF_REPOS_URL);
diff --git a/homework/src/Contributor.js b/homework/src/Contributor.js
new file mode 100644
index 000000000..34bcc810b
--- /dev/null
+++ b/homework/src/Contributor.js
@@ -0,0 +1,18 @@
+'use strict';
+
+/* global Util */
+
+// eslint-disable-next-line no-unused-vars
+class Contributor {
+  constructor(data) {
+    this.data = data;
+  }
+
+  /**
+   * Render the contributor info to the DOM.
+   * @param {HTMLElement} contributorList The parent element in which to render the contributor.
+  */
+  render(contributorList) {
+    // Replace this comment with your code
+  }
+}
diff --git a/homework/src/Repository.js b/homework/src/Repository.js
new file mode 100644
index 000000000..c4d3ec797
--- /dev/null
+++ b/homework/src/Repository.js
@@ -0,0 +1,34 @@
+'use strict';
+
+/* global Util */
+
+// eslint-disable-next-line no-unused-vars
+class Repository {
+  constructor(data) {
+    this.data = data;
+  }
+
+  /**
+   * Render the repository info to the DOM.
+   * @param {HTMLElement} parent The parent element in which to render the repository.
+   */
+  render(parent) {
+    //
+    // Replace this comment with your code
+    //
+  }
+
+  /**
+   * Returns an array of contributors as a promise
+   */
+  fetchContributors() {
+    return Util.fetchJSON(this.data.contributors_url);
+  }
+
+  /**
+   * Returns the name of the repository
+   */
+  name() {
+    return this.data.name;
+  }
+}
diff --git a/homework/src/Util.js b/homework/src/Util.js
new file mode 100644
index 000000000..4de3f0185
--- /dev/null
+++ b/homework/src/Util.js
@@ -0,0 +1,35 @@
+'use strict';
+
+// eslint-disable-next-line no-unused-vars
+class Util {
+  static createAndAppend(name, parent, options = {}) {
+    const elem = document.createElement(name);
+    parent.appendChild(elem);
+    Object.keys(options).forEach((key) => {
+      const value = options[key];
+      if (key === 'html') {
+        elem.innerHTML = value;
+      } else {
+        elem.setAttribute(key, value);
+      }
+    });
+    return elem;
+  }
+
+  static fetchJSON(url) {
+    return new Promise((resolve, reject) => {
+      const xhr = new XMLHttpRequest();
+      xhr.open('GET', url);
+      xhr.responseType = 'json';
+      xhr.onload = () => {
+        if (xhr.status < 400) {
+          resolve(xhr.response);
+        } else {
+          reject(new Error(`Network error: ${xhr.status} - ${xhr.statusText}`));
+        }
+      };
+      xhr.onerror = () => reject(new Error('Network request failed'));
+      xhr.send();
+    });
+  }
+}
diff --git a/homework/src/hyf.png b/homework/src/hyf.png
new file mode 100644
index 0000000000000000000000000000000000000000..a4626c91cc28dd92f3a8843aa3919c472d609984
GIT binary patch
literal 6971
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

literal 0
HcmV?d00001

diff --git a/homework/src/index.html b/homework/src/index.html
new file mode 100644
index 000000000..9c8f80c1a
--- /dev/null
+++ b/homework/src/index.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
+  <meta name="theme-color" content="#000000">
+  <meta name="apple-mobile-web-app-capable" content="yes">
+  <meta name="mobile-web-app-capable" content="yes">
+  <meta name="format-detection" content="telephone=no">
+  <link rel="apple-touch-icon" href="./hyf.png">
+  <link rel="shortcut icon" type="image/png" href="./hyf.png" />
+  <title>HYF-GITHUB</title>
+  <link href="https://fonts.googleapis.com/css?family=Roboto:400,700" rel="stylesheet">
+  <link rel="stylesheet" href="./style.css">
+</head>
+
+<body>
+  <div id="root"></div>
+  <script src="./index.js"></script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/homework/src/index.js b/homework/src/index.js
new file mode 100644
index 000000000..1cb1638a0
--- /dev/null
+++ b/homework/src/index.js
@@ -0,0 +1,47 @@
+'use strict';
+
+{
+  function fetchJSON(url, cb) {
+    const xhr = new XMLHttpRequest();
+    xhr.open('GET', url);
+    xhr.responseType = 'json';
+    xhr.onload = () => {
+      if (xhr.status < 400) {
+        cb(null, xhr.response);
+      } else {
+        cb(new Error(`Network error: ${xhr.status} - ${xhr.statusText}`));
+      }
+    };
+    xhr.onerror = () => cb(new Error('Network request failed'));
+    xhr.send();
+  }
+
+  function createAndAppend(name, parent, options = {}) {
+    const elem = document.createElement(name);
+    parent.appendChild(elem);
+    Object.keys(options).forEach((key) => {
+      const value = options[key];
+      if (key === 'html') {
+        elem.innerHTML = value;
+      } else {
+        elem.setAttribute(key, value);
+      }
+    });
+    return elem;
+  }
+
+  function main(url) {
+    fetchJSON(url, (err, data) => {
+      const root = document.getElementById('root');
+      if (err) {
+        createAndAppend('div', root, { html: err.message, class: 'alert-error' });
+      } else {
+        createAndAppend('pre', root, { html: JSON.stringify(data, null, 2) });
+      }
+    });
+  }
+
+  const HYF_REPOS_URL = 'https://api.github.com/orgs/HackYourFuture/repos?per_page=100';
+
+  window.onload = () => main(HYF_REPOS_URL);
+}
diff --git a/homework/src/style.css b/homework/src/style.css
new file mode 100644
index 000000000..a8985a8a5
--- /dev/null
+++ b/homework/src/style.css
@@ -0,0 +1,3 @@
+.alert-error {
+    color: red;
+}
\ No newline at end of file
diff --git a/termp.html b/termp.html
new file mode 100644
index 000000000..ba3809c4d
--- /dev/null
+++ b/termp.html
@@ -0,0 +1,5 @@
+<select>
+  <option value="0">alumni</option>
+  <option value="1">angular</option>
+  <!-- etc -->
+</select>
\ No newline at end of file

From 14cb668dd0852ac7c18fbf9fb7065f57ef1a9e9a Mon Sep 17 00:00:00 2001
From: Jim Cramer <remarcmij@gmail.com>
Date: Wed, 30 May 2018 17:28:16 +0200
Subject: [PATCH 2/6] updated MAKEME's

---
 Week1/MAKEME.md | 17 +++++++---
 Week2/MAKEME.md | 22 ++++++-------
 Week3/MAKEME.md | 82 ++++++++++++++++++++-----------------------------
 termp.html      |  5 ---
 4 files changed, 56 insertions(+), 70 deletions(-)
 delete mode 100644 termp.html

diff --git a/Week1/MAKEME.md b/Week1/MAKEME.md
index 4e90abaa9..6281b264a 100644
--- a/Week1/MAKEME.md
+++ b/Week1/MAKEME.md
@@ -19,7 +19,7 @@ Please provide feedback on last week's homework from a fellow student as a GitHu
 
 **_Deadline Thursday_**
 
-_This homework is more extensive and challenging than previous homework! Please read the instructions below carefully and follow them precisely. Start this homework as soon as you can and allow time for discussion and questions (slack!)._
+_This homework is more extensive and challenging than previous homework! Please read the instructions below carefully and follow them meticulously. Start this homework as soon as you can and allow time for discussion and questions (slack!)._
 
 ### 2.1 Introduction
 
@@ -54,7 +54,7 @@ If you open this URL in the browser (_try it!_) you will receive JSON data about
 
 <small>Note the query string `?per_page=100` in the above URL. If you don't specify this query string you will only get the first 30 repositories (the default `per_page` is 30). HackYourFuture has more than 30 repositories but less than 100.</small>
 
-The returned JSON data contains some basic information about each repository, such as `name`, `full_name`, `description` etc. There are also many properties that contain URLs to obtain detail information about certain aspects of the repository.
+The returned JSON data contains some basic information about each repository, such as `name`, `full_name`, `description` etc. There are also many properties that contain URLs that can be used to obtain detail information about certain aspects of the repository.
 
 #### 2.2.2 Get contributor information for a repository
 
@@ -73,8 +73,8 @@ You will be working on this same application during the next three weeks. For ea
 | Week | Branch | Assignment |
 |:----:|--------|------------|
 | 1   | `week1` | Create a basic application using callbacks to handle network requests. |
-| 2   | `week2`  | 1. Refactor the callbacks to promises.<br>2. Make the UI responsive.|
-| 3   | `week3`   | 1. Refactor the application to use ES6 Classes and async/await.<br>2. Make the app ARIA-compliant. |
+| 2   | `week2` | - Refactor the callbacks to promises.<br>- Make the UI responsive.|
+| 3   | `week3` | - Refactor the application to use ES6 Classes and async/await.<br>- Make the app ARIA-compliant. |
 
 <small>Table 1. Homework schedule</small>
 
@@ -190,11 +190,18 @@ It should include the following components:
 
 - Use CSS media queries and [Flexbox](https://css-tricks.com/snippets/css/a-guide-to-flexbox/) to make the UI responsive. 
 
-- To force a 404 network error so that you can test the rendering of errors, change the URL to make an invalid GitHub request, e.g. append an `x` to `orgs`: `orgsx`.
+- To force a `404` network error so that you can test the rendering of errors, change the URL to make an invalid GitHub request, e.g. append an `x` to `orgs`: `orgsx`.
 
 
 ### 2.5 Handing in your homework
 
+- Have you removed all commented out code (should never be present in a PR)?
+- Have you used `const` and `let` and avoided `var`?
+- Do the variable, function and argument names you created follow the [Naming Conventions](../../../../fundamentals/blob/master/fundamentals/naming_conventions.md)?
+- Is your code well-formatted (see [Code Formatting](../../../../fundamentals/blob/master/fundamentals/naming_conventions.md))?
+- Have you resolved all issues flagged by ESLint and the spell checker (no wavy red and green underlines in VSCode)?
+
+If the answer is 'yes' to all preceding questions you are ready to follow these instructions:
 
 1. Push your `week1` branch to GitHub:
 
diff --git a/Week2/MAKEME.md b/Week2/MAKEME.md
index 9aec2885e..04c09b4da 100644
--- a/Week2/MAKEME.md
+++ b/Week2/MAKEME.md
@@ -20,12 +20,11 @@ Topics discussed this week:
     - YouTube: [promises](https://www.youtube.com/watch?v=WBupia9oidU)
 
 
-## Step 2: Feedback
+## Step 2: Implement requested PR changes
 
-- Create at least 2 issues (bug / feature / code improvement) on another student's GitHub repository.
-- Solve the issue(s) proposed by another students in your GitHub repository. More info [here](https://hackyourfuture.slack.com/files/michahell/F31BX1XT6/Merging_a_local_branch_into_master).
+- Fix Requested Changes (if any) on the Pull Request.
 
-## Step 3: Promises
+## Step 3: Convert callbacks to promises
 
 **_Deadline Thursday_**
 
@@ -47,16 +46,17 @@ You will continue to work on the files `index.js` and (possibly) `style.css`.
 - Complete your GitHub app code from the previous week, if needed, to meet the requirements from that week's assignment.
 - Replace all asynchronous callbacks (e.g. as used with XMLHttpRequest) by ES6 promises.
 - Beautify your app's styling.
-- Make your app responsive (use CSS media queries and [Flexbox](https://css-tricks.com/snippets/css/a-guide-to-flexbox/)).
-- Make your app ARIA-compliant.
+- If not yet completed in week 1, make your app responsive (use CSS media queries and [Flexbox](https://css-tricks.com/snippets/css/a-guide-to-flexbox/)).
 
-**ARIA-compliance**
-
-Please review the material from the HTML/CSS module: [Get familiar with Accessible Rich Internet Applications (ARIA)](https://github.com/HackYourFuture/HTML-CSS/tree/master/Week1#get-familiar-with-accessible-rich-internet-applications-aria).
+### 3.3 Handing in your homework
 
-For the GitHub application ARIA-compliance means that the Contributors list should either be a native HTML list (i.e. using `ul` and `li` elements) or otherwise marked with an appropriate ARIA **role**. Furthermore, a user should be able to navigate to all interactive elements using the keyboard (e.g., using the **Tab** key). Pressing **Enter** on such an element should be equivalent to a clicking the mouse.
+- Have you removed all commented out code (should never be present in a PR)?
+- Have you used `const` and `let` and avoided `var`?
+- Do the variable, function and argument names you created follow the [Naming Conventions](../../../../fundamentals/blob/master/fundamentals/naming_conventions.md)?
+- Is your code well-formatted (see [Code Formatting](../../../../fundamentals/blob/master/fundamentals/naming_conventions.md))?
+- Have you resolved all issues flagged by ESLint and the spell checker (no wavy red and green underlines in VSCode)?
 
-### 3.3 Handing in your homework
+If the answer is 'yes' to all preceding questions you are ready to follow these instructions:
 
 1. Push your `week2` branch to GitHub:
 
diff --git a/Week3/MAKEME.md b/Week3/MAKEME.md
index e89d9d544..61f38d8c5 100644
--- a/Week3/MAKEME.md
+++ b/Week3/MAKEME.md
@@ -7,16 +7,25 @@ Topics discussed this week:
 • call, apply, bind
 ```
 
+
 ## Step 1: Fix requested changes
 
-_Deadline Wednesday_
+_Deadline Monday_
 
-- Fix the requested changes from the PR from the last weeks and make sure you explain how you fixed the issue in a comment.
+- Fix Requested Changes (if any) on the Pull Request.
 
 ## Step 2
 
+**_Deadline Thursday_**
+
 ### 2.1 Preparation
 
+**Read the fundamental pages on:**
+
+- [try...catch](../../../../fundamentals/blob/master/fundamentals/try_catch.md)
+- [async/await](../../../../fundamentals/blob/master/fundamentals/async_await.md)
+
+
 The homework for week 3 will build on the work you did in week 2. You will create a new branch based on the `week2` branch.
 
 1. Make sure that you committed all changes in the week 2 version of your homework.
@@ -31,33 +40,29 @@ The homework for week 3 will build on the work you did in week 2. You will creat
 This week you will work with all JavaScript files in the `src` folder. The assignment consists of two parts:
 
 1. Refactor all `.then()` and `.catch()` methods with `async`/`await` and `try...catch`.
-2. Refactor your application to use ES6 classes.
+2. Make your app ARIA-compliant (see below).
+3. Refactor your application to use ES6 classes.
+
 
 #### 2.2.1 async/await
 
-**_Deadline Thursday_**
+**Instructions:**
 
-_Read:_
+1. Refactor all `.then()` and `.catch()` methods with `async`/`await` and `try...catch`.
 
-- [try...catch](../../../../fundamentals/blob/master/fundamentals/try_catch.md)
-- [async/await](../../../../fundamentals/blob/master/fundamentals/async_await.md)
+2. Make sure that your error handling code still works. See the week2 MAKEME on how to force an error response from GitHub.
 
-_Instructions:_
 
-- Refactor all `.then()` and `.catch()` methods with `async`/`await` and `try...catch`.
+#### 2.2.2 ARIA-compliance
 
-TODO: ARIA-compliance
+Please review the material from the HTML/CSS module: [Get familiar with Accessible Rich Internet Applications (ARIA)](https://github.com/HackYourFuture/HTML-CSS/tree/master/Week1#get-familiar-with-accessible-rich-internet-applications-aria).
 
-#### 2.2.2 Bonus assignment: ES6 Classes
+For the GitHub application ARIA-compliance means that the Contributors list should either be a native HTML list (i.e. using `ul` and `li` elements) or otherwise marked with an appropriate ARIA **role**. Furthermore, a user should be able to navigate through all interactive elements using the keyboard (e.g., using the **Tab** key). Pressing **Enter** on such an element should be equivalent to clicking the mouse.
 
-**_Deadline Saturday_**
+#### 2.2.3 ES6 Classes (Bonus)
 
 This final **bonus** assignment requires you to got the extra mile and master Object Oriented Programming and ES6 classes. ES6 classes are not used in the Node and Database modules. You will not come across them again until the React module.
 
-TODO: Is this optional/bonus? Separate branch `final`?
-
-**_Deadline Thursday_**
-
 In this assignment you need to redistribute and adapt the code from `index.js` to the files `App.js`, `Repository.js` and `Contributor.js`. You do not need to modify `Util.js`.
 
 | File             | Description |
@@ -76,8 +81,7 @@ _Read:_
 
 _Instructions:_
 
-1. Commit any outstanding changes.
-2. Change the content of the `body` tag of `index.html` as follows:
+1. Copy `index.html` to file named `classes.html` and change the content of the `body` tag of `classes.html` as follows:
 
     ```html
     <body>
@@ -90,45 +94,25 @@ _Instructions:_
     ```
 
 
-## Step 3: OOP and ES6 classes
-
-- If you need to refresh your memory on es6 classes: [es6-classes-in-depth](https://ponyfoo.com/articles/es6-classes-in-depth)
-
-_Deadline Saturday_
-
-Refactor your GitHub app to use OOP with ES6 classes (see skeleton code below). We will be introducing a `Repository` and a `Contributor` class that will each be responsible for rendering their own data. A third `View` class will contain all remaining code.
+#### 2.2.4 Handing in your homework
 
-Read:
+- Have you removed all commented out code (should never be present in a PR)?
+- Have you used `const` and `let` and avoided `var`?
+- Do the variable, function and argument names you created follow the [Naming Conventions](../../../../fundamentals/blob/master/fundamentals/naming_conventions.md)?
+- Is your code well-formatted (see [Code Formatting](../../../../fundamentals/blob/master/fundamentals/naming_conventions.md))?
+- Have you resolved all issues flagged by ESLint and the spell checker (no wavy red and green underlines in VSCode)?
 
-- [Object Oriented Programming and ES6 Classes](../../../../fundamentals/blob/master/fundamentals/oop_classes.md)
-- [The `this` keyword](../../../../fundamentals/blob/master/fundamentals/this.md)
+If the answer is 'yes' to all preceding questions you are ready to follow these instructions:
 
-Instructions:
-
-1. You should refactor your code into four classes, named `App`, `Repository`, `Contributor` and `Util`.
-2. Move your existing code that deals with rendering the repository information to the `render()` method of the `Repository` class.
-3. Move your existing code that deals with rendering the information for a single contributor to the `render()` method of the `Contributor` class.
-4. Move your existing code responsible for initializing your application to the `constructor` of the `View` class.
-5. The bulk of your remaining code should probably go to the `fetchAndRender()` method of the `View` class.
-
-TODO: describe the division of work between the classes
-
-
-### 3.3 Handing in your homework
-
-1. Push your `week2` branch to GitHub:
+1. Push your `week3` branch to GitHub:
 
     ```
-    git push -u origin week2
+    git push -u origin week3
     ```
 
-2. Create a pull request for your `week2` branch.
-
-Note:
+2. Create a pull request for your `week3` branch.
 
-1. Please remove all redundant, commented-out code and console.log's from your files before pushing your homework as finished. There is no need for your mentors to review this stuff.
-2. Please make sure your code is well-formatted and follows the recommended naming conventions.
-## Step 6: Read before next lecture
+## Step 3: Read before next lecture
 
 _Deadline Sunday morning_
 
diff --git a/termp.html b/termp.html
deleted file mode 100644
index ba3809c4d..000000000
--- a/termp.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<select>
-  <option value="0">alumni</option>
-  <option value="1">angular</option>
-  <!-- etc -->
-</select>
\ No newline at end of file

From a02af3396b173e018c1f0bb137e8ea1ff62c701d Mon Sep 17 00:00:00 2001
From: Jim Cramer <remarcmij@gmail.com>
Date: Thu, 31 May 2018 15:04:38 +0200
Subject: [PATCH 3/6] Removed bonus designation from ES6 classes assignment

---
 Week3/MAKEME.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Week3/MAKEME.md b/Week3/MAKEME.md
index 61f38d8c5..81ea6db22 100644
--- a/Week3/MAKEME.md
+++ b/Week3/MAKEME.md
@@ -59,9 +59,11 @@ Please review the material from the HTML/CSS module: [Get familiar with Accessib
 
 For the GitHub application ARIA-compliance means that the Contributors list should either be a native HTML list (i.e. using `ul` and `li` elements) or otherwise marked with an appropriate ARIA **role**. Furthermore, a user should be able to navigate through all interactive elements using the keyboard (e.g., using the **Tab** key). Pressing **Enter** on such an element should be equivalent to clicking the mouse.
 
-#### 2.2.3 ES6 Classes (Bonus)
+#### 2.2.3 ES6 Classes
 
-This final **bonus** assignment requires you to got the extra mile and master Object Oriented Programming and ES6 classes. ES6 classes are not used in the Node and Database modules. You will not come across them again until the React module.
+**_Deadline Saturday_**
+
+This final assignment requires you to go the extra mile and master Object Oriented Programming and ES6 classes.
 
 In this assignment you need to redistribute and adapt the code from `index.js` to the files `App.js`, `Repository.js` and `Contributor.js`. You do not need to modify `Util.js`.
 

From c1d13033d73162ad89b91781b16ed98646d39e7c Mon Sep 17 00:00:00 2001
From: Jim Cramer <remarcmij@gmail.com>
Date: Fri, 8 Jun 2018 12:37:23 +0200
Subject: [PATCH 4/6] incorporated Maartjes feedback

---
 README.md       |  2 +-
 Week1/MAKEME.md |  2 +-
 Week3/MAKEME.md | 13 ++++++-------
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 65b9a4985..fa97dad57 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ Here you can find course content and homework for the JavaScript3 modules
 |----|-----|----|--------|
 |1.|• Structure for a basic SPA (Single Page Application) <br>• [XMLHttpRequests](../../../fundamentals/blob/master/fundamentals/XMLHttpRequest.md) <br>• API calls|[Reading Week 1](/Week1/README.md)|[Homework Week 1](/Week1/MAKEME.md)|
 |2.|• [Event Loop (order of execution)](../../../fundamentals/blob/master/fundamentals/event_loop.md)<br>• [Promises](../../../fundamentals/blob/master/fundamentals/promises.md)|[Reading Week 2](/Week2/README.md)|[Homework Week 2](/Week2/MAKEME.md)|
-|3.|• [try...catch](../../../fundamentals/blob/master/fundamentals/try_catch.md)<br>• [async/await](../../../fundamentals/blob/master/fundamentals/async_await.md)<br>• [The `this` keyword](../../../fundamentals/blob/master/fundamentals/this.md)<br>• call, apply, bind<BR>• [Object Oriented Programming and ES6 Classes](../../../fundamentals/blob/master/fundamentals/oop_classes.md)|[Reading Week 3](/Week3/README.md)|[Homework Week 3](/Week3/MAKEME.md)|
+|3.|• [try...catch](../../../fundamentals/blob/master/fundamentals/try_catch.md)<br>• [async/await](../../../fundamentals/blob/master/fundamentals/async_await.md)<br>• [The `this` keyword](../../../fundamentals/blob/master/fundamentals/this.md)<br>• call, apply, bind<br>• [Object Oriented Programming and ES6 Classes](../../../fundamentals/blob/master/fundamentals/oop_classes.md)|[Reading Week 3](/Week3/README.md)|[Homework Week 3](/Week3/MAKEME.md)|
 
 __Kind note:__
 
diff --git a/Week1/MAKEME.md b/Week1/MAKEME.md
index 6281b264a..2b8ff2803 100644
--- a/Week1/MAKEME.md
+++ b/Week1/MAKEME.md
@@ -19,7 +19,7 @@ Please provide feedback on last week's homework from a fellow student as a GitHu
 
 **_Deadline Thursday_**
 
-_This homework is more extensive and challenging than previous homework! Please read the instructions below carefully and follow them meticulously. Start this homework as soon as you can and allow time for discussion and questions (slack!)._
+_This homework is more extensive and challenging than previous homework! Please read the instructions below carefully and follow them with great attention to detail. Start this homework as soon as you can and allow time for discussion and questions (slack!)._
 
 ### 2.1 Introduction
 
diff --git a/Week3/MAKEME.md b/Week3/MAKEME.md
index 81ea6db22..56eff3595 100644
--- a/Week3/MAKEME.md
+++ b/Week3/MAKEME.md
@@ -53,13 +53,7 @@ This week you will work with all JavaScript files in the `src` folder. The assig
 2. Make sure that your error handling code still works. See the week2 MAKEME on how to force an error response from GitHub.
 
 
-#### 2.2.2 ARIA-compliance
-
-Please review the material from the HTML/CSS module: [Get familiar with Accessible Rich Internet Applications (ARIA)](https://github.com/HackYourFuture/HTML-CSS/tree/master/Week1#get-familiar-with-accessible-rich-internet-applications-aria).
-
-For the GitHub application ARIA-compliance means that the Contributors list should either be a native HTML list (i.e. using `ul` and `li` elements) or otherwise marked with an appropriate ARIA **role**. Furthermore, a user should be able to navigate through all interactive elements using the keyboard (e.g., using the **Tab** key). Pressing **Enter** on such an element should be equivalent to clicking the mouse.
-
-#### 2.2.3 ES6 Classes
+#### 2.2.2 ES6 Classes (BONUS)
 
 **_Deadline Saturday_**
 
@@ -95,6 +89,11 @@ _Instructions:_
     </body>
     ```
 
+#### 2.2.3 ARIA-compliance
+
+Please review the material from the HTML/CSS module: [Get familiar with Accessible Rich Internet Applications (ARIA)](https://github.com/HackYourFuture/HTML-CSS/tree/master/Week1#get-familiar-with-accessible-rich-internet-applications-aria).
+
+For the GitHub application ARIA-compliance means that the Contributors list should either be a native HTML list (i.e. using `ul` and `li` elements) or otherwise marked with an appropriate ARIA **role**. Furthermore, a user should be able to navigate through all interactive elements using the keyboard (e.g., using the **Tab** key). Pressing **Enter** on such an element should be equivalent to clicking the mouse.
 
 #### 2.2.4 Handing in your homework
 

From 5c9c677648eb244facb5615f2116411921828767 Mon Sep 17 00:00:00 2001
From: Jim Cramer <remarcmij@gmail.com>
Date: Fri, 8 Jun 2018 12:44:05 +0200
Subject: [PATCH 5/6] Made ARIA-compliance BONUS instead of ES6 Classes

---
 Week3/MAKEME.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Week3/MAKEME.md b/Week3/MAKEME.md
index 56eff3595..ad6e7286e 100644
--- a/Week3/MAKEME.md
+++ b/Week3/MAKEME.md
@@ -53,7 +53,7 @@ This week you will work with all JavaScript files in the `src` folder. The assig
 2. Make sure that your error handling code still works. See the week2 MAKEME on how to force an error response from GitHub.
 
 
-#### 2.2.2 ES6 Classes (BONUS)
+#### 2.2.2 ES6 Classes
 
 **_Deadline Saturday_**
 
@@ -89,7 +89,7 @@ _Instructions:_
     </body>
     ```
 
-#### 2.2.3 ARIA-compliance
+#### 2.2.3 ARIA-compliance (BONUS)
 
 Please review the material from the HTML/CSS module: [Get familiar with Accessible Rich Internet Applications (ARIA)](https://github.com/HackYourFuture/HTML-CSS/tree/master/Week1#get-familiar-with-accessible-rich-internet-applications-aria).
 

From 936bff191bf93ec5d555a73fb93789a48f529df7 Mon Sep 17 00:00:00 2001
From: Jim Cramer <remarcmij@gmail.com>
Date: Fri, 8 Jun 2018 12:50:10 +0200
Subject: [PATCH 6/6] Clarification on the functionalities the application is
 to deliver

---
 Week1/MAKEME.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Week1/MAKEME.md b/Week1/MAKEME.md
index 2b8ff2803..f6bd345b6 100644
--- a/Week1/MAKEME.md
+++ b/Week1/MAKEME.md
@@ -25,9 +25,9 @@ _This homework is more extensive and challenging than previous homework! Please
 
 You are going to write a _Single Page Application_ (SPA) that uses the [GitHub API](https://developer.github.com/guides/getting-started/).
 
-This application should display information about the available [HYF GitHub repositories](https://github.com/hackyourfuture):
+This application should display information about the available [HYF GitHub repositories](https://github.com/hackyourfuture). The functionalities we would like to see in your application are as follows:
 
-- You should be able to select a repository from a list of available repositories.
+- The user should be able to select a repository from a list of available repositories.
 - The application should display high-level information about the selected repository and show a list of its contributors.
 - When clicking on the name of the selected repository the GitHub page for the corresponding repository should be opened in a new browser tab.
 - When clicking on a contributor, the GitHub page for the contributor should be opened in a new browser tab.