CodeYourFuture · Tony-devops · Jan 5, 2023 · Jan 5, 2023 · Jan 5, 2023 · Jan 5, 2023
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=capitalCities[myCountry]; // 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,7 +21,8 @@ let basketballTeam = {
 */
 
 // write code here
-
+let newArray=basketballTeam.topPlayers.sort();
+newArray.forEach((x)=>{console.log(x)});
 
 /* EXPECTED RESULT
 

diff --git a/1-exercises/B-setting-values/exercise1.js b/1-exercises/B-setting-values/exercise1.js
@@ -23,7 +23,11 @@ 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);
 
 /* EXPECTED RESULT

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

diff --git a/1-exercises/C-undefined-properties/exercise.js b/1-exercises/C-undefined-properties/exercise.js
@@ -8,15 +8,15 @@
     For each example, can you explain why we are seeing undefined?
 */
 
-// Example 1
+// Example 1 color is not defined
 let car = {
   brand: "Ford",
   yearsOld: 8,
 };
 
 console.log(car["colour"]);
 
-// Example 2
+// Example 2 name has been defined and not firstname
 function sayHelloToUser(user) {
   console.log(`Hello ${user.firstName}`);
 }
@@ -27,7 +27,7 @@ let user = {
 
 sayHelloToUser(user);
 
-// Example 3
+// Example 3 function does not have a callback.
 let myPet = {
   animal: "Cat",
   getName: function() {

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 (getNames) {
+    console.log (`Student name: ${getNames}`)
+  } 
 }
 
 student.getName("Daniel");

diff --git a/2-mandatory/1-recipes.js b/2-mandatory/1-recipes.js
@@ -22,4 +22,51 @@
   You should write and log at least 5 recipes
 */
 
-// write code here
+// write code here
+let myRecipe = {
+  recipe1: {
+    title: "Oatcake",
+    serving: 4,
+    ingredients: [
+      "plain cheese",
+      "cream",
+      "stevia",
+      "vanilla essence",
+    ],
+  },
+
+  recipe2: {
+    title: " White Chocolate Brownies",
+    serving: 4,
+    ingredients: ["eggs","white chocolate", "butter",  "sugar"],
+  },
+
+  recipe3: {
+    title: "Curry",
+    serving: 4,
+    ingredients: ["onion", "masala", "tomatoes", "salt"],
+  },
+
+  recipe4: {
+    title: "biryani",
+    serving: 4,
+    ingredients: ["rice", "mix-vegetables", "masala", "olive oil"],
+  },
+
+  recipe5: {
+    title: "ice cream",
+    serving: 4,
+    ingredients: ["cream", "eggs", "sugar", "vanilla essence"],
+  },
+};
+
+function receipeKing(all) {
+  for(each in all) {
+    console.log(`${each}: ${all[each]}`);
+  }
+}
+receipeKing(myRecipe.recipe1);
+receipeKing(myRecipe.recipe2);
+receipeKing(myRecipe.recipe3);
+receipeKing(myRecipe.recipe4);
+receipeKing(myRecipe.recipe5);
diff --git a/2-mandatory/2-currency-code-lookup.js b/2-mandatory/2-currency-code-lookup.js
@@ -19,6 +19,7 @@ const COUNTRY_CURRENCY_CODES = [
 
 function createLookup(countryCurrencyCodes) {
   // write code here
+  return Object.fromEntries(countryCurrencyCodes);
 }
 
 /* ======= TESTS - DO NOT MODIFY =====

diff --git a/2-mandatory/3-shopping-list.js b/2-mandatory/3-shopping-list.js
@@ -20,7 +20,24 @@ let pantry = {
 
 function createShoppingList(recipe) {
   // write code here
+  const newShoppingList = {};
+  newShoppingList.name = recipe.name;
+  newShoppingList.items = [];
+  const pantryList = Object.values(pantry).flat();
+  for(ingredient of recipe.ingredients){
+    if (!pantryList.includes(ingredient)){
+      newShoppingList.items.push(ingredient);
+    }
+  }
+  return newShoppingList;
 }
+/*
+function createShoppingList(recipe) {
+  return {
+    name: recipe.name,
+    items: recipe.ingredients.filter(ingredient => !pantry.fridgeContents.includes(ingredient) && !pantry.cupboardContents.includes(ingredient))
+  }
+} */
 
 /* ======= 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,12 @@ const MENU = {
 
 let cashRegister = {
   // write code here
+  orderBurger : function (balance){
+    return balance >= MENU.burger ? balance - MENU.burger : balance;
+  },
+    orderFalafel: function (balance) {
+     return balance >= MENU.falafel ? balance - MENU.falafel : balance;
+  }
 }
 
 /* ======= TESTS - DO NOT MODIFY =====

diff --git a/3-extra/1-count-words.js b/3-extra/1-count-words.js
@@ -27,6 +27,17 @@ function countWords(string) {
   const wordCount = {};
 
   // write code here
+  if (string === ''){
+    return {}
+  }
+  string.split(' ').forEach(word =>{
+    if(wordCount[word] >= 1){
+      wordCount[word]++
+    }
+    else {
+      wordCount[word] =1
+    }
+  })
 
   return wordCount;
 }