CodeYourFuture · MathoNM · Aug 5, 2022 · Aug 5, 2022
diff --git a/1-exercises/A-accessing-values/exercise1.js b/1-exercises/A-accessing-values/exercise1.js
@@ -16,8 +16,8 @@ let dog = {
   Log the name and breed of this dog using dot notation.
 */
 
-let dogName; // complete the code
-let dogBreed; // complete the code
+let dogName = dog.name; // complete the code
+let dogBreed = dog.breed; // complete the code
 
 console.log(`${dogName} is a ${dogBreed}`);
 

diff --git a/1-exercises/A-accessing-values/exercise2.js b/1-exercises/A-accessing-values/exercise2.js
@@ -17,7 +17,7 @@ let capitalCities = {
 */
 
 let myCountry = "UnitedKingdom";
-let myCapitalCity; // complete the code
+let myCapitalCity = "London"; // complete the code
 
 console.log(myCapitalCity);
 

diff --git a/1-exercises/A-accessing-values/exercise3.js b/1-exercises/A-accessing-values/exercise3.js
@@ -21,8 +21,11 @@ let basketballTeam = {
 */
 
 // write code here
+let basketballTopPlayers = ["Michael Jordan", "Scottie Pippen", "Dennis Rodman"];
 
-
+console.log(basketballTopPlayers[2]);
+console.log(basketballTopPlayers[0]);
+console.log(basketballTopPlayers[1]);
 /* EXPECTED RESULT
 
   Dennis Rodman

diff --git a/1-exercises/B-setting-values/exercise1.js b/1-exercises/B-setting-values/exercise1.js
@@ -10,7 +10,8 @@ let capitalCities = {
   },
   China: {
     name: "Beijing",
-  }
+  },
+
 };
 
 /*
@@ -23,7 +24,12 @@ let capitalCities = {
 */
 
 // write code here
-
+capitalCities.UnitedKingdom.population = 8980000;
+capitalCities.China.population = 21500000;
+capitalCities.Peru = {
+  name: "Lima",
+  population: 9750000,
+};
 console.log(capitalCities);
 
 /* EXPECTED RESULT

diff --git a/1-exercises/B-setting-values/exercise2.js b/1-exercises/B-setting-values/exercise2.js
@@ -17,6 +17,10 @@ let student = {
 
 // write code here
 
+student['attendance'] = 90;
+if (student['attendance'] >= 90 && student['examScore'] > 60) {
+  student['hasPassed'] = true;
+};
 /*
   - Write an "if" statement that changes the value of hasPassed to true
       if the student has attendance that is equal or greater than 90

diff --git a/1-exercises/C-undefined-properties/exercise.js b/1-exercises/C-undefined-properties/exercise.js
@@ -9,6 +9,7 @@
 */
 
 // Example 1
+//The property name 'color' is assigned in console.log but it doesn't exist in our object literal
 let car = {
   brand: "Ford",
   yearsOld: 8,
@@ -17,6 +18,7 @@ let car = {
 console.log(car["colour"]);
 
 // Example 2
+// The console.log should be outside the function and also the comma should be added after the value Mira of the property name.
 function sayHelloToUser(user) {
   console.log(`Hello ${user.firstName}`);
 }

diff --git a/1-exercises/D-object-methods/exercise.js b/1-exercises/D-object-methods/exercise.js
@@ -8,11 +8,15 @@
 */
 
 let student = {
-  // write code here
+  getName: function(name){
+    console.log(`Student name: ${name}`);
 }
+  // write code here
+};
 
 student.getName("Daniel");
 
+
 /* EXPECTED RESULT
 
   Student name: Daniel

diff --git a/2-mandatory/1-recipes.js b/2-mandatory/1-recipes.js
@@ -21,5 +21,36 @@
 
   You should write and log at least 5 recipes
 */
+let recipe = {
+  recipe1:{
+   Title: "Samp and Beans",
+   Serves: 4,
+   Ingredients:["samp", "beans", "water", 'salt', "spice"],
+  },
+  recipe2: {
+   Title: "5 colours",
+   Serves: 6,
+   Ingredients: ["rice","potato salad", "chakalaka","beetroot","lamb"],
+  }
 
+  recipe3: {
+    Title: "cottage pie",
+    Serves: 3,
+    Ingredients: ["mince","tomatoes", "creamy and mash"],
+   }
+
+   recipe4: {
+    Title: "Roasted chicken",
+    Serves: 3,
+    Ingredients: ["chicken","butter", "salt and pepper", "sage"],
+   }
+
+   recipe2: {
+    Title: "5 colours",
+    Serves: 6,
+    Ingredients: ["rice","potato salad", "chakalaka","beetroot","lamb"],
+   }
+}
+console.log(recipe.recipe1);
+console.log(recipe.recipe2);
 // write code here
diff --git a/2-mandatory/3-shopping-list.js b/2-mandatory/3-shopping-list.js
@@ -10,7 +10,7 @@
 
   The createShoppingList function should return an object with two properties:
     - "name" of the recipe, which is a string,
-    - "items", which is an arry of the missing ingredients that need to be on the shopping list
+    - "items", which is an array of the missing ingredients that need to be on the shopping list
 */
 
 let pantry = {
@@ -19,6 +19,16 @@ let pantry = {
 };
 
 function createShoppingList(recipe) {
+  let missingIngredients = recipe.ingredients.filter((ingredient) => {
+    return(
+      !pantry.fridgeContents.includes(ingredient) && 
+      !pantry.cupboardContents.includes(ingredient)
+    );
+  });
+  return{
+    name: recipe.name,
+    items: missingIngredients,
+  };
   // write code here
 }