From c3ea079516c7a50dcb21a2364f97e0edbc681b95 Mon Sep 17 00:00:00 2001 From: Riyaaz Singh <94745207+Riyaazct@users.noreply.github.com> Date: Mon, 19 Sep 2022 20:50:50 +0200 Subject: [PATCH 01/14] complete exercises 1 to 6 --- debugging/demo/demo1/demo1.js | 53 ++++++++++++++++++++--------------- errors/exercise1.js | 4 +-- errors/exercise2.js | 11 ++++---- errors/exercise3.js | 2 +- errors/exercise4.js | 4 +-- errors/exercise5.js | 2 +- errors/exercise6.js | 8 +++--- 7 files changed, 46 insertions(+), 38 deletions(-) diff --git a/debugging/demo/demo1/demo1.js b/debugging/demo/demo1/demo1.js index 0d8e695..2cbce39 100644 --- a/debugging/demo/demo1/demo1.js +++ b/debugging/demo/demo1/demo1.js @@ -1,35 +1,42 @@ -const tomatoes = 'tomatoes'; -const chocolate= 'chocolate'yummy'; -const yogurt = 'yogurt'; +const tomatoes = "tomatoes"; +const chocolate = "chocolate yummy"; +const yogurt = "yogurt"; const rice = "rice"; -const fridge =[{ item: tomatoes, quantity: 5}, - { item: chocolate, quantity: 1}, - { item: yogurt, quantity: 5}]; +const fridge = [ + { item: tomatoes, quantity: 5 }, + { item: chocolate, quantity: 1 }, + { item: yogurt, quantity: 5 }, +]; -const wantedList = [{ item: tomatoes, quantity: 4}, - { item: chocolate, quantity: 10}, - { item: yogurt, quantity: 2}] +const wantedList = [ + { item: tomatoes, quantity: 4 }, + { item: chocolate, quantity: 10 }, + { item: yogurt, quantity: 2 }, +]; const shoppingList = (fridge, wantedList) => { - return wantedList.map(groceryWantedList => { - let groceryFridge = fridge.find( gf => gf.item === groceryWantedList.item); - if (groceryFridge===null){ + return wantedList + .map((groceryWantedList) => { + let groceryFridge = fridge.find( + (gf) => gf.item === groceryWantedList.item + ); + if (groceryFridge === null) { return groceryWantedList; } else { - if (groceryFridge.quantity < groceryWantedList.quantity){ + if (groceryFridge.quantity < groceryWantedList.quantity) { return { - item: groceryWantedList.item, - quantity: groceryWantedList.quantity - groceryFridge.quantity + item: groceryWantedList.item, + quantity: groceryWantedList.quantity - groceryFridge.quantity, }; - } - else{ - return null; + } else { + return null; + } } - } - }).filter(item => item !== null); + }) + .filter((item) => item !== null); }; -shoppingList (fridge, wantedList).forEach( (item) => { - console.log (`${item.item}: ${item.quantity}`); - }) \ No newline at end of file +shoppingList(fridge, wantedList).forEach((item) => { + console.log(`${item.item}: ${item.quantity}`); +}); diff --git a/errors/exercise1.js b/errors/exercise1.js index 6adfa43..5834b50 100644 --- a/errors/exercise1.js +++ b/errors/exercise1.js @@ -1,3 +1,3 @@ -if (3 > Math.PI { - console.log("wait what?"); +if (3 > Math.PI) { + console.log("wait what?"); } diff --git a/errors/exercise2.js b/errors/exercise2.js index da8708f..bc748c8 100644 --- a/errors/exercise2.js +++ b/errors/exercise2.js @@ -1,6 +1,7 @@ -let charge = function() { - if (sunny) { - useSolarCells(); - } else { - promptBikeRide(); +let charge = function () { + if (sunny) { + useSolarCells(); + } else { + promptBikeRide(); + } }; diff --git a/errors/exercise3.js b/errors/exercise3.js index d100040..4124f72 100644 --- a/errors/exercise3.js +++ b/errors/exercise3.js @@ -1,2 +1,2 @@ let ward = "hello"; -word.substring(1); +ward.substring(1); diff --git a/errors/exercise4.js b/errors/exercise4.js index c59741a..8592f59 100644 --- a/errors/exercise4.js +++ b/errors/exercise4.js @@ -1,5 +1,5 @@ -let numbers = { a: 13, b: 37, c: 42 }; +let numbers = [{ a: 13, b: 37, c: 42 }]; numbers.map(function (num) { - return num * 2; + return num * 2; }); diff --git a/errors/exercise5.js b/errors/exercise5.js index db8a957..06a1b35 100644 --- a/errors/exercise5.js +++ b/errors/exercise5.js @@ -1,2 +1,2 @@ -let name; +let name = "string"; name.substring(1); diff --git a/errors/exercise6.js b/errors/exercise6.js index 8ef8108..f6210b5 100644 --- a/errors/exercise6.js +++ b/errors/exercise6.js @@ -3,8 +3,8 @@ // Item #2 on the list is eggs // Item #3 on the list is milk -let arr ["bread", eggs", "milk"]; +let arr = ["bread", "eggs", "milk"]; -items.forEach(item, index -> { - console.log(`Item #${index + 1} on the list is ${item}`); -}; +arr.forEach((item, index) => { + console.log(`Item #${index + 1} on the list is ${item}`); +}); From 3082a5f72ba2292d02be13428a821df1bb691632 Mon Sep 17 00:00:00 2001 From: Riyaaz Singh <94745207+Riyaazct@users.noreply.github.com> Date: Mon, 19 Sep 2022 21:35:49 +0200 Subject: [PATCH 02/14] Update exercise7.js incomplete, struggling with this exercise --- errors/exercise7.js | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/errors/exercise7.js b/errors/exercise7.js index 40633fd..5e021b5 100644 --- a/errors/exercise7.js +++ b/errors/exercise7.js @@ -6,27 +6,27 @@ // ] function getTemperatureReport(cities) { - let report = []; + let report = []; - for(let i = 0; i < cities.length(); i++) { - let temperature = temperatureService(city[i]); - report.push(`The temperature in ${city[i]} is ${temperature} degrees`); - } - return report; + for (let i = 0; i < cities.length; i++) { + let temperature = Object.values(temperatureService(cities[i])); + report.push(`The temperature in ${cities[i]} is ${temperature[i]} degrees`); + } + return report; } function temperatureService() { - let temparatureMap = { - 'London': 10, - 'Paris': 12, - 'Barcelona': 17, - 'Dubai' 27, - 'Mumbai': 29, - 'São Paulo': 23 - 'Lagos': 33 - + let temperatureMap = { + London: 10, + Paris: 12, + Barcelona: 17, + Dubai: 27, + Mumbai: 29, + "São Paulo": 23, + Lagos: 33, + }; - return temparatureMap[city]; + return temperatureMap; } let report = getTemperatureReport(["London", "Paris", "São Paulo"]); From 870a970543d17101e60ac9d662c2fd8de475c2cb Mon Sep 17 00:00:00 2001 From: Riyaaz Singh <94745207+Riyaazct@users.noreply.github.com> Date: Tue, 20 Sep 2022 18:50:34 +0200 Subject: [PATCH 03/14] Update exercise7.js --- errors/exercise7.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/errors/exercise7.js b/errors/exercise7.js index 5e021b5..5c4388b 100644 --- a/errors/exercise7.js +++ b/errors/exercise7.js @@ -9,14 +9,14 @@ function getTemperatureReport(cities) { let report = []; for (let i = 0; i < cities.length; i++) { - let temperature = Object.values(temperatureService(cities[i])); - report.push(`The temperature in ${cities[i]} is ${temperature[i]} degrees`); + let temperature = temperatureService(cities[i]); + report.push(`The temperature in ${cities[i]} is ${temperature} degrees`); } return report; } -function temperatureService() { - let temperatureMap = { +function temperatureService(city) { + let temparatureMap = { London: 10, Paris: 12, Barcelona: 17, @@ -25,8 +25,7 @@ function temperatureService() { "São Paulo": 23, Lagos: 33, }; - - return temperatureMap; + return temparatureMap[city]; } let report = getTemperatureReport(["London", "Paris", "São Paulo"]); From 807a06f7f6bacff343210026032f430ad6aaec9f Mon Sep 17 00:00:00 2001 From: Riyaaz Singh <94745207+Riyaazct@users.noreply.github.com> Date: Tue, 20 Sep 2022 19:46:26 +0200 Subject: [PATCH 04/14] complete demo folder --- debugging/demo/demo2/index.html | 3 +- debugging/demo/demo2/script.js | 89 +++++++++++++++++---------------- 2 files changed, 49 insertions(+), 43 deletions(-) diff --git a/debugging/demo/demo2/index.html b/debugging/demo/demo2/index.html index 8cc1a42..2207d59 100644 --- a/debugging/demo/demo2/index.html +++ b/debugging/demo/demo2/index.html @@ -1,6 +1,5 @@
- Javascript Demo Exercise 2 + + diff --git a/debugging/demo/demo2/script.js b/debugging/demo/demo2/script.js index 1c7bec9..4321eb9 100644 --- a/debugging/demo/demo2/script.js +++ b/debugging/demo/demo2/script.js @@ -1,43 +1,48 @@ -document.addEventListener("DOMContentLoaded", ( ) => { - var data = [ - { - text: 'Overshadowing #UNGA is the big question: Will Obama and Rouhani meet?', - href: 'https://twitter.com/cnnbrk/status/382528782738800641' - }, - { - text: "Marine's family hopes visiting Iranian president will help free their son", - href: 'https://twitter.com/cnnbrk/status/382519683053649920' - }, - { - text: 'Obama addresses United Nations.', - href: 'https://twitter.com/cnnbrk/status/382507500903202817' - }, - { - text: '', - href: 'https://twitter.com/CNNMoney/status/382497891723804672' - }, - { - text: "If you're seeing this as a button, congratulations!", - href: 'http://twitter.com' - } - ]; - for (var i = 0; i