Merge pull request HackYourFuture-CPH#62 from wistoft/patch-1

benna100 · web-flow · commit 4d2ff8c04274 · 2018-11-06T09:53:45.000+01:00
Fixes for javascript 2 module
diff --git a/JavaScript2/Week4/assets/carGenerator.js b/JavaScript2/Week4/assets/carGenerator.js
@@ -0,0 +1,37 @@
+/**
+ * Get random integer between two numbers, found here: https://stackoverflow.com/a/7228322
+ * @param {integer} min - The min number
+ * @param {integer} max - The max number
+ * @returns {Number} Random number between min and max
+ */
+function randomIntFromInterval(min, max) {
+    return Math.floor(Math.random() * (max - min + 1) + min);
+}
+
+
+/**
+ * Get an array with car objects with random color and speed
+ * @param {integer} numberOfCars - The number of cars 
+ * @returns {array} Array containing the car objects
+ */
+function generateCars(numberOfCars) {
+    const cars = [];
+
+    const carMakes = ['Honda', 'BMW','Fiat','Skoda','Volvo'];
+    const carColors = ['lightgrey', 'lightcyan','lightyellow','lightgreen','lightcoral','lightpink'];
+    
+    for (let i = 0; i < numberOfCars; i++) {
+        const car = {};
+        const randomMakeIndex = randomIntFromInterval(0, carMakes.length - 1);
+        const randomColorIndex = randomIntFromInterval(0, carColors.length - 1);
+
+        car.make = carMakes[randomMakeIndex];
+        car.color = carColors[randomColorIndex];
+        car.speed = randomIntFromInterval(0, 100);
+
+        cars.push(car);
+    }
+
+    return cars;
+}
+
diff --git a/JavaScript2/Week4/homework.md b/JavaScript2/Week4/homework.md
@@ -5,7 +5,7 @@ First off, congratulations on coming this far, well done!
 ## Step 1: Lets get real comfortable with map, filter and sort.
 
 Use the carGenerator function to generate 10 cars. The file with the function is here: 
-[carGenerator.js](/JavaScript2/Week4/classwork/carGenerator.js)
+[carGenerator.js](/JavaScript2/Week4/assets/carGenerator.js)
 
 You call it like this: 
 generateCars(10);
@@ -29,12 +29,12 @@ Create the following arrays:
 ```
 
 
-## Step 3: Some Challenges
+## Step 2: 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.'
 https://www.freecodecamp.org/challenges/store-multiple-values-in-one-variable-using-javascript-arrays
 
-## Step 4: Custom challenge 
-1. Go to https://api.github.com/orgs/HackYourFuture/repos, you will see a list of the repositories our HYF organization has (yes it's a lot of JSON).
+## Step 3: Custom challenge 
+1. Go to https://api.github.com/orgs/HackYourFuture-CPH/repos, you will see a list of the repositories our HYF organization has (yes it's a lot of JSON).
 2. You can copy the JSON and put it in a string at the top of your `.js` file use this tool for that: https://jsonformatter.org/. Copy the json text into the jsonformatter and press this key:
 > ![Variables are like boxes](./assets/jsonformatter.PNG)
 Now you have a json string you can copy into your file. Now print the name of the 3rd github repository to the console.
@@ -43,7 +43,7 @@ Now you have a json string you can copy into your file. Now print the name of th
 5. Use CSS to divide the page in two columns. The left column will have a list of the names for repository. The right column should have the following information about each repository: the number of `stargazers`, the number of `watchers`, the number of `forks`, the `language` of the repository.
 6. place the `avatar_url` (logo) of our organization somewhere on a nice place in your page.
 
-## Step 5: Hand in Homework:
+## Step 4: Hand in Homework:
 Go over your homework one last time:
 
 - Does every file run without errors and with the correct results?
diff --git a/JavaScript2/Week4/review.md b/JavaScript2/Week4/review.md
@@ -170,7 +170,7 @@ Add your favorite person to a list of famous people and show them on a HTML page
 
 For code flow, mentors can use following code and show how everything gets executed using this tool - http://latentflip.com/loupe/
 
-```
+```js
 function firstFunction() {
     for (let i = 0; i < 5; i++) {
         console.log(i);
@@ -195,7 +195,6 @@ function secondFunction() {
 firstFunction();
 ```
 
-I also like following exercise from HYF-CPH repo - https://github.com/HackYourFuture-CPH/JavaScript/blob/master/JavaScript2/Week4/code/exercises.js
 
 
 #### Exercise 2
@@ -207,7 +206,6 @@ Using the planetsFlattened variable:
 Console.log jupiters last moon.
 ```
 
-[JavaScript2/Week4/code/exercises.js](https://github.com/HackYourFuture-CPH/JavaScript/blob/master/JavaScript2/Week4/code/exercises.js)
 
 #### Exercise 3 
 ```
diff --git a/JavaScript2/Week5/homework.md b/JavaScript2/Week5/homework.md
@@ -1,6 +1,5 @@
 ## Homework Week 5
 
->[Here](/Week5/README.md) you find the readings you have to complete before the sixth lecture.
 
 ### Step 0
 All share a video or a resource (this can be a drawing, article or a pod cast) that was helpful for you the last few weeks with learning JavaScript. Please share this in the #teach-yourself channel in Slack. Also write as small note about what the resource i about and why you think it's so helpful (you can share more than one if you like).
@@ -94,26 +93,33 @@ Make a website that fetches (= to get) data asynchronously.
 
 2) Add a button (e.g. 'click me') that when clicked `console.logs` 'you clicked me!'
 
-3) Create a function that fetches from [The Github API](https://developer.github.com/v3/). For example from [this page] (https://api.github.com/orgs/HackYourFuture/repos) (the one we used last week). For help on this check this [SO post](https://stackoverflow.com/questions/247483/http-get-request-in-javascript)
+3) Create a function that fetches from [The Github API](https://developer.github.com/v3/). For example from [this page](https://api.github.com/orgs/HackYourFuture-CPH/repos) (the one we used last week). For help on this check this [SO post](https://stackoverflow.com/questions/247483/http-get-request-in-javascript)
+
 
 4) Display the data that you get from the Github API on your web page.
 
 5) Now link the two together: When you click the button -> get the data from the Github API and display it on your website
 
-6) Make all the repositories link 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.
+6) Make all the repositories link 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-CPH/[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.
 
 7) BONUS: if you look at this:
 
 ```js
-https://api.github.com/repos/HackYourFuture/CommandLine
+https://api.github.com/repos/HackYourFuture-CPH/CommandLine
 ```
 
 You can see `CommandLine` in the URL. These are called "query parameters" and let us specify in detail what we want from the API. Play around with this. For example you can make two buttons that either get data for a specific repository, JavaScript or Node.js. Or go even more crazy and make users type in a search box 'JavaScript' and then send that to the API by changing the repository.
 
-```
-How to hand in your homework:
-• Create a new repository "hyf-javascript2". Also create a new folder "week5" inside this repository. 
-• Upload your homework files inside the week4 folder and write a description for this “commit”.
-• Your hyf-javascript2/week5 should now contain the files of your homework.
-• Post the link on the slack channel and in the Google Form
-```
+
+### Step 4: Hand in Homework:
+Go over your homework one last time:
+
+- Does every file run without errors and with the correct results?
+- Have you used `const` and `let` and avoided `var`?
+- Do the variable, function and argument names you created follow the [Naming Conventions](https://github.com/HackYourFuture/fundamentals/blob/master/fundamentals/naming_conventions.md)?
+- Is your code well-formatted (see [Code Formatting](https://github.com/HackYourFuture/fundamentals/blob/master/fundamentals/naming_conventions.md))?
+
+If you can answer yes to the above questions then you are ready to hand if the homework:
+* Find the hyf-homework git repo (forked from [here](https://github.com/HackYourFuture-CPH/hyf-homework))
+* Add your homework files in the Javascript/javascript2/week2 folder
+* To submit the homework use the link in the top of your classes slack channel. 
diff --git a/JavaScript2/Week5/review.md b/JavaScript2/Week5/review.md
@@ -2,7 +2,6 @@
 
 ```
 this review covers:
-• Git Session
 • Events
 • Callbacks
 • XHTTP Requests
diff --git a/JavaScript2/Week6/homework.md b/JavaScript2/Week6/homework.md
@@ -1,18 +1,17 @@
 # Homework Week 6
 
->[Here](/Week6/reading.md) you find the readings you have to complete before the seventh lecture.
-
 ### Step 1: Feedback
 
-Give feedback on `step 3` of `week 5` to one of your fellow students (do this by creating issues in Github).
+Give feedback on [step 3 of week 5](https://github.com/HackYourFuture-CPH/JavaScript/blob/master/JavaScript2/Week5/homework.md#step-3-homework-for-javascript) to one of your fellow students (do this by creating issues in Github).
+
 
 ### Step 2: Fix issues and API
 
 - Fix the issues from the last week and make sure you explain how you fixed the issue in a comment (or commit message)
 <!-- - Write a script that [polls this API](https://sunrise-sunset.org/api) every 3 seconds and passes a new date every time where date is previous day ++. -->
 
 ### Step 3: SPA :sweat_drops:
-You are going to write a SPA (Single Page Application) that uses the [Github API](https://developer.github.com/guides/getting-started/). Make sure that your app uses a logical pattern just like [this codepen](http://codepen.io/Razpudding/pen/MmVpeW).
+You are going to write a SPA (Single Page Application) that uses the [Github API](https://developer.github.com/guides/getting-started/). Make sure that your app uses a logical pattern just like [this codepen](https://codepen.io/wistoft/pen/KrKyje).
 
 Just like last week:
 
@@ -91,10 +90,15 @@ Anyway, endless fun and possibilities. Need inspiration, check out the Github AP
 __Bonus__: Write a function takes this array `['a', 'b', 'c', 'd', 'a', 'e', 'f', 'c']` and returns an array which only has unique values in it (so it removes the duplicate ones). Make it a 'smart' algorithm that could do it for every array (only strings/number). Try to make it as fast as possible!
 
 
-```
-How to hand in your homework:
-• Create a new repository "hyf-javascript2". Also create a new folder "week6" inside this repository. 
-• Upload your homework files inside the week4 folder and write a description for this “commit”.
-• Your hyf-javascript2/week6 should now contain the files of your homework.
-• Post the link on the slack channel and in the Google Form
-```
+### Step 5: Hand in Homework:
+Go over your homework one last time:
+
+- Does every file run without errors and with the correct results?
+- Have you used `const` and `let` and avoided `var`?
+- Do the variable, function and argument names you created follow the [Naming Conventions](https://github.com/HackYourFuture/fundamentals/blob/master/fundamentals/naming_conventions.md)?
+- Is your code well-formatted (see [Code Formatting](https://github.com/HackYourFuture/fundamentals/blob/master/fundamentals/naming_conventions.md))?
+
+If you can answer yes to the above questions then you are ready to hand if the homework:
+* Find the hyf-homework git repo (forked from [here](https://github.com/HackYourFuture-CPH/hyf-homework))
+* Add your homework files in the Javascript/javascript2/week3 folder
+* To submit the homework use the link in the top of your classes slack channel. 
