From b87b4725b9a254fe2f4a0892c930a46c4d039231 Mon Sep 17 00:00:00 2001 From: Abdulmajidram <115878433+Abdulmajidram@users.noreply.github.com> Date: Tue, 20 Dec 2022 14:21:56 +0000 Subject: [PATCH] Exercises and Mandatory --- 1-exercises/A-accessing-values/exercise1.js | 12 +++++----- 1-exercises/A-accessing-values/exercise2.js | 2 +- 1-exercises/A-accessing-values/exercise3.js | 5 +++++ 1-exercises/B-setting-values/exercise1.js | 6 ++++- 1-exercises/B-setting-values/exercise2.js | 6 ++++- .../C-undefined-properties/exercise.js | 3 +++ 1-exercises/D-object-methods/exercise.js | 4 ++++ 2-mandatory/1-recipes.js | 22 ++++++++++++++++++- 2-mandatory/2-currency-code-lookup.js | 6 +++++ 2-mandatory/3-shopping-list.js | 12 ++++++++++ 2-mandatory/4-restaurant.js | 13 +++++++++++ 11 files changed, 81 insertions(+), 10 deletions(-) diff --git a/1-exercises/A-accessing-values/exercise1.js b/1-exercises/A-accessing-values/exercise1.js index 67416c69..20149edd 100644 --- a/1-exercises/A-accessing-values/exercise1.js +++ b/1-exercises/A-accessing-values/exercise1.js @@ -5,10 +5,10 @@ */ let dog = { - breed: "Dalmatian", - name: "Spot", - isHungry: true, - happiness: 6 + breed: "Dalmatian", // String + name: "Spot", // String + isHungry: true, // boolean + happiness: 6 // number }; /* @@ -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 index 5b523ace..c7c8e188 100644 --- 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 index 2e160dd5..c188ba0e 100644 --- a/1-exercises/A-accessing-values/exercise3.js +++ b/1-exercises/A-accessing-values/exercise3.js @@ -22,7 +22,12 @@ let basketballTeam = { // write code here +let topPlayers = basketballTeam.topPlayers; +topPlayers.sort(); +for (let player of topPlayers) { + console.log(player); +} /* EXPECTED RESULT Dennis Rodman diff --git a/1-exercises/B-setting-values/exercise1.js b/1-exercises/B-setting-values/exercise1.js index 7d0b05c5..b117767d 100644 --- 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 index 59fb7c1e..b5af1718 100644 --- a/1-exercises/B-setting-values/exercise2.js +++ b/1-exercises/B-setting-values/exercise2.js @@ -16,7 +16,7 @@ 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 @@ -27,6 +27,10 @@ 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 index 8b00f6ce..bf66c15f 100644 --- a/1-exercises/C-undefined-properties/exercise.js +++ b/1-exercises/C-undefined-properties/exercise.js @@ -15,6 +15,7 @@ let car = { }; console.log(car["colour"]); +// there is no value for colour. // Example 2 function sayHelloToUser(user) { @@ -26,6 +27,7 @@ let user = { }; sayHelloToUser(user); + // firstName isn't defined for the console to log it , if we put name instead of firstName then it will print Mira. // Example 3 let myPet = { @@ -36,3 +38,4 @@ let myPet = { }; console.log(myPet.getName()); +// The function getName: doesn't have a return to return the string \ No newline at end of file diff --git a/1-exercises/D-object-methods/exercise.js b/1-exercises/D-object-methods/exercise.js index 0b57f2e1..34dff7c4 100644 --- a/1-exercises/D-object-methods/exercise.js +++ b/1-exercises/D-object-methods/exercise.js @@ -9,6 +9,10 @@ let student = { // write code here + getName(name) { + console.log(`Student name: ${name}`); + } + } student.getName("Daniel"); diff --git a/2-mandatory/1-recipes.js b/2-mandatory/1-recipes.js index 6243fa9c..37739416 100644 --- a/2-mandatory/1-recipes.js +++ b/2-mandatory/1-recipes.js @@ -22,4 +22,24 @@ You should write and log at least 5 recipes */ -// write code here \ No newline at end of file +// write code here + +let recipe1 = { + title: "Mole", + servings: 2, + ingredients: ["cinnamon", "cumin", "cocoa"] +} + +console.log(recipe1.title); +console.log(`Serves: ${recipe1.servings}`); +console.log("Ingredients:"); +for (let ingredient of recipe1.ingredients) { + console.log(ingredient); +} + + + + + + + diff --git a/2-mandatory/2-currency-code-lookup.js b/2-mandatory/2-currency-code-lookup.js index 5fde14f1..b9a7a560 100644 --- a/2-mandatory/2-currency-code-lookup.js +++ b/2-mandatory/2-currency-code-lookup.js @@ -19,6 +19,12 @@ const COUNTRY_CURRENCY_CODES = [ function createLookup(countryCurrencyCodes) { // write code here + let lookup = {}; + for (let [countryCode, currencyCode] of countryCurrencyCodes) { + lookup[countryCode] = currencyCode; + } + return lookup; + } /* ======= TESTS - DO NOT MODIFY ===== diff --git a/2-mandatory/3-shopping-list.js b/2-mandatory/3-shopping-list.js index d25cb366..9d23952c 100644 --- a/2-mandatory/3-shopping-list.js +++ b/2-mandatory/3-shopping-list.js @@ -20,6 +20,18 @@ let pantry = { function createShoppingList(recipe) { // write code here + let shoppingList = { + name: recipe.name, + items: [] + }; + + for (let ingredient of recipe.ingredients) { + if (!pantry.fridgeContents.includes(ingredient) && !pantry.cupboardContents.includes(ingredient)) { + shoppingList.items.push(ingredient); + } + } + + return shoppingList; } /* ======= TESTS - DO NOT MODIFY ===== diff --git a/2-mandatory/4-restaurant.js b/2-mandatory/4-restaurant.js index d7b81eea..b5ae9b39 100644 --- a/2-mandatory/4-restaurant.js +++ b/2-mandatory/4-restaurant.js @@ -21,6 +21,19 @@ const MENU = { let cashRegister = { // write code here + orderBurger(balance) { + if (balance >= MENU.burger) { + return balance - MENU.burger; + } + return balance; + }, + + orderFalafel(balance) { + if (balance >= MENU.falafel) { + return balance - MENU.falafel; + } + return balance; + } } /* ======= TESTS - DO NOT MODIFY =====