CodeYourFuture · zkhing · Oct 3, 2022 · Oct 6, 2022 · Jul 28, 2023
diff --git a/1-exercises/A-accessing-values/exercise1.js b/1-exercises/A-accessing-values/exercise1.js
@@ -5,19 +5,19 @@
 */
 
 let dog = {
-  breed: "Dalmatian",
-  name: "Spot",
-  isHungry: true,
-  happiness: 6
+  breed: "Dalmatian",//string
+  name: "Spot",      //string
+  isHungry: true,    //boolean
+  happiness: 6       //number
 };
 
 /*
   You can access the values of each property using dot notation.
   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
@@ -16,10 +16,10 @@ let capitalCities = {
   Do not use dot notation for this exercise!
 */
 
-let myCountry = "UnitedKingdom";
-let myCapitalCity; // complete the code
-
-console.log(myCapitalCity);
+// let myCountry = "UnitedKingdom";
+// let myCapitalCity = capitalCities["UnitedKingdom"]; // complete the code
+const myCountry = capitalCities["UnitedKingdom"]
+console.log(myCountry);
 
 /* EXPECTED RESULT
 

diff --git a/1-exercises/A-accessing-values/exercise3.js b/1-exercises/A-accessing-values/exercise3.js
@@ -21,7 +21,7 @@ let basketballTeam = {
 */
 
 // write code here
-
+console.log(basketballTeam.topPlayers.sort().join('\n'));
 
 /* EXPECTED RESULT
 

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

diff --git a/1-exercises/B-setting-values/exercise2.js b/1-exercises/B-setting-values/exercise2.js
@@ -16,6 +16,7 @@ let student = {
 */
 
 // write code here
+student["attendance"] = 90;
 
 /*
   - Write an "if" statement that changes the value of hasPassed to true
@@ -27,6 +28,12 @@ let student = {
 
 // write code here
 
+  if(student["attendance"] >= 90 && student["examScore"] > 60){
+     student["hasPassed"] = true;
+  }
+
+
+
 console.log(student);
 
 /* EXPECTED RESULT

diff --git a/1-exercises/C-undefined-properties/exercise.js b/1-exercises/C-undefined-properties/exercise.js
@@ -14,24 +14,24 @@ let car = {
   yearsOld: 8,
 };
 
-console.log(car["colour"]);
+console.log(car["colour"]);// colour property or key hasn't defined any value.
 
 // Example 2
 function sayHelloToUser(user) {
-  console.log(`Hello ${user.firstName}`);
+  console.log(`Hello ${user.firstName}`); //user.firstName property doesn't exit.
 }
 
-let user = {
-  name: "Mira"
-};
+ let user = {
+   name: "Mira"
+ };
 
 sayHelloToUser(user);
 
 // Example 3
 let myPet = {
   animal: "Cat",
   getName: function() {
-    "My pet's name is Fluffy";
+      "My pet's name is Fluffy"; // getName function which is myPet object method doesn't have return keyword.
   },
 };
 

diff --git a/1-exercises/D-object-methods/exercise.js b/1-exercises/D-object-methods/exercise.js
@@ -9,6 +9,9 @@
 
 let student = {
   // write code here
+  getName: function(name){
+      console.log("Student name: " + name);
+  }
 }
 
 student.getName("Daniel");

diff --git a/2-mandatory/1-recipes.js b/2-mandatory/1-recipes.js
@@ -22,4 +22,23 @@
   You should write and log at least 5 recipes
 */
 
-// write code here
+// write code here
+function Recipe(title, serves, ingredients) {
+    this.title = title,
+    this.serves = serves,
+    this.ingredients = ingredients
+}
+// USE CONSTRCUTOR TO BUILD OBJECTS QUICKLY
+let receipeOne = new Recipe("Stir Friedrice", 1, ["vege","oyster sauce","chicken","rice"]);
+let receipeTwo = new Recipe("Stir Friednoodle", 2, ["vege","sweetchilli sauce","chicken","noodle"]);
+let receipeThree = new Recipe("Chicken Curry", 3, ["onion","oil","chicken","spices"]);
+let receipeFour = new Recipe("Lentils Soup", 4, ["lentils","onion","garlic"]);
+let receipeFive = new Recipe("Chicken Salad", 5, ["lettuce","ceasar dressing","chicken","olive"]);
+
+const recipes = [receipeOne, receipeTwo, receipeThree, receipeFour, receipeFive]
+
+ recipes.forEach((recipe) => {
+  console.log(recipe.title);
+  console.log(`Serve: ${recipe.serves}`);
+  console.log(`Ingredients: \n ${recipe.ingredients}`);
+});
diff --git a/2-mandatory/2-currency-code-lookup.js b/2-mandatory/2-currency-code-lookup.js
@@ -17,10 +17,19 @@ const COUNTRY_CURRENCY_CODES = [
   ["MX", "MXN"],
 ];
 
+
+
 function createLookup(countryCurrencyCodes) {
   // write code here
+  let newObject = {};
+  for(let country of countryCurrencyCodes){
+    newObject[country[0]] = country[1];
+   }
+  return newObject;
+  //return Object.fromEntries(countryCurrencyCodes)
 }
 
+
 /* ======= TESTS - DO NOT MODIFY =====
 - To run the tests for this exercise, run `npm test -- --testPathPattern 2-currency-code-lookup.js`
 - To run all exercises/tests in the mandatory folder, run `npm test`

diff --git a/2-mandatory/3-shopping-list.js b/2-mandatory/3-shopping-list.js
@@ -18,9 +18,21 @@ let pantry = {
   cupboardContents: ["salt", "tinned tomatoes", "oregano"],
 };
 
+
 function createShoppingList(recipe) {
-  // write code here
+  const missingItems = [];
+  const allPantryContents = pantry.fridgeContents.concat(pantry.cupboardContents);
+
+  const missingIngredients = recipe.ingredients.filter(ingredient => {
+    return !(allPantryContents.includes(ingredient))
+  })
+
+  return {
+    name: recipe.name,
+    items: missingIngredients
+  }
 }
+
 
 /* ======= TESTS - DO NOT MODIFY =====
 - To run the tests for this exercise, run `npm test -- --testPathPattern 3-shopping-list.js`

diff --git a/2-mandatory/4-restaurant.js b/2-mandatory/4-restaurant.js
@@ -21,6 +21,19 @@ const MENU = {
 
 let cashRegister = {
   // write code here
+  orderBurger: function(balance){
+    if(balance >= MENU["burger"]){
+      return balance - MENU["burger"];
+    }
+    return balance;
+  },
+
+  orderFalafel: function(balance){
+    if(balance >= MENU["falafel"]){
+      return balance - MENU["falafel"];
+    }
+    return balance;
+  }
 }
 
 /* ======= TESTS - DO NOT MODIFY =====
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,7 +21,7 @@ let basketballTeam = { @@
     */
     // write code here
+    console.log(basketballTeam.topPlayers.sort().join('\n'));
     /* EXPECTED RESULT
@@ Expand Down @@