Finished ex3 to ex5

obada othman · obada othman · commit 51d08b17ea85 · 2020-08-12T16:29:48.000+02:00
diff --git a/Week2/js-exercises/ex3-lemonAllergy.js b/Week2/js-exercises/ex3-lemonAllergy.js
@@ -11,11 +11,13 @@
 
  */
 
-
 function takeOutLemons(basket) {
-  // your code goes in here. The output is a string 
+  // your code goes in here. The output is a string
+  // returns an array that doesn't contain 'lemon' or 'Lemon'
+  const lemonlessBasket = basket.filter((fruit) => fruit != 'Lemon' && fruit != 'lemon');
+  return `My mom bought me a fruit basket, containing [${lemonlessBasket}]`;
 }
 
 const fruitBasket = ['Apple', 'Lemon', 'Grapefruit', 'Lemon', 'Banana', 'Watermelon', 'Lemon'];
 
-console.log(takeOutLemons(fruitBasket));
+console.log(takeOutLemons(fruitBasket)); //My mom bought me a fruit basket, containing [Apple,Grapefruit,Banana,Watermelon]
diff --git a/Week2/js-exercises/ex4-collectiveAge.js b/Week2/js-exercises/ex4-collectiveAge.js
@@ -10,24 +10,30 @@
 
 function collectiveAge(people) {
   // return the sum of age for all the people
+  const individualAges = people.map((person) => person.age);
+  return individualAges.reduce((total, individualAge) => total + individualAge, 0);
+}
+function collectiveMembers(hackYourFutureMembers) {
+  return collectiveAge(hackYourFutureMembers);
 }
 
-const hackYourFutureMembers = [{
+const hackYourFutureMembers = [
+  {
     name: 'Wouter',
-    age: 33
+    age: 33,
   },
   {
     name: 'Federico',
-    age: 32
+    age: 32,
   },
   {
     name: 'Noer',
-    age: 27
+    age: 27,
   },
   {
     name: 'Tjebbe',
-    age: 22
+    age: 22,
   },
 ];
 
-console.log("The collective age of the HYF team is: " + collectiveMembers(hackYourFutureMembers));
+console.log('The collective age of the HYF team is: ' + collectiveMembers(hackYourFutureMembers));
diff --git a/Week2/js-exercises/ex5-myFavoriteHobbies.html b/Week2/js-exercises/ex5-myFavoriteHobbies.html
@@ -1,5 +1,12 @@
-<html>
-
-<!-- your html code goes in here -->
-
-</html>
+<!DOCTYPE html>
+<html lang="en">
+  <!-- your html code goes in here -->
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Document</title>
+  </head>
+  <body>
+    <script src="ex5-myFavoriteHobbies.js"></script>
+  </body>
+</html>
diff --git a/Week2/js-exercises/ex5-myFavoriteHobbies.js b/Week2/js-exercises/ex5-myFavoriteHobbies.js
@@ -10,6 +10,14 @@
 
 function createHTMLList(arr) {
   // your code goes in here
+  const body = document.querySelector('body');
+  const ul = document.createElement('ul');
+  body.appendChild(ul);
+  arr.map((hobby) => {
+    const li = document.createElement('li');
+    li.innerHTML = hobby;
+    ul.appendChild(li);
+  });
 }
 
 const myHobbies = [
@@ -18,4 +26,6 @@ const myHobbies = [
   'Programming',
   'Hanging out with friends',
   'Going to the gym',
-];
+];
+
+createHTMLList(myHobbies);
diff --git a/Week2/project/index.html b/Week2/project/index.html
@@ -1,17 +1,13 @@
 <!DOCTYPE html>
 <html lang="en">
-
-<head>
-  <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <title>Pomodoro Clock</title>
-</head>
-
-<body>
-  <div id="app">
-
-  </div>
-  <script src="index.js"></script>
-</body>
-
-</html>
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Pomodoro Clock</title>
+  </head>
+
+  <body>
+    <div id="app"></div>
+    <script src="index.js"></script>
+  </body>
+</html>
diff --git a/Week2/project/index.js b/Week2/project/index.js
@@ -7,4 +7,4 @@
   Display minutes and seconds
   If the timer finishes the timer should be replaced by the message: Time 's up!
  * 
- */
+ */

Original file line number	Diff line number	Diff line change
`@@ -7,4 +7,4 @@`
`7`	`7`	`Display minutes and seconds`
`8`	`8`	`If the timer finishes the timer should be replaced by the message: Time 's up!`
`9`	`9`	`*`
`10`		`- */`
	`10`	`+ */`