From df59802eed7bb2fb817ac6ce7c193ebf0b1c4d46 Mon Sep 17 00:00:00 2001 From: Natalie Zablotska <113237479+nataliiazab@users.noreply.github.com> Date: Wed, 23 Nov 2022 00:46:45 +0000 Subject: [PATCH 01/11] Complete exercise E --- exercises/B-hello-world/exercise.js | 2 ++ exercises/C-variables/exercise.js | 4 +++- exercises/D-strings/exercise.js | 4 +++- exercises/E-strings-concatenation/exercise.js | 3 +++ package.json | 12 +++++++++--- 5 files changed, 20 insertions(+), 5 deletions(-) diff --git a/exercises/B-hello-world/exercise.js b/exercises/B-hello-world/exercise.js index b179ee953..51ee20eec 100644 --- a/exercises/B-hello-world/exercise.js +++ b/exercises/B-hello-world/exercise.js @@ -1 +1,3 @@ console.log("Hello world"); +console.log("Hello World. I just started learning JavaScript!"); +console.log(4) diff --git a/exercises/C-variables/exercise.js b/exercises/C-variables/exercise.js index a6bbb9786..45b5f99bb 100644 --- a/exercises/C-variables/exercise.js +++ b/exercises/C-variables/exercise.js @@ -1,3 +1,5 @@ // Start by creating a variable `greeting` - +var greeting = "Hello world!"; +console.log(greeting); +console.log(greeting); console.log(greeting); diff --git a/exercises/D-strings/exercise.js b/exercises/D-strings/exercise.js index 2cffa6a81..11b1e4b1f 100644 --- a/exercises/D-strings/exercise.js +++ b/exercises/D-strings/exercise.js @@ -1,3 +1,5 @@ // Start by creating a variable `message` - +var message = "This is a string"; console.log(message); +var messageType = typeof message; +console.log(messageType); diff --git a/exercises/E-strings-concatenation/exercise.js b/exercises/E-strings-concatenation/exercise.js index 2cffa6a81..312524abc 100644 --- a/exercises/E-strings-concatenation/exercise.js +++ b/exercises/E-strings-concatenation/exercise.js @@ -1,3 +1,6 @@ // Start by creating a variable `message` +var greeting = 'Hi, my name is '; +var myName = 'Natalie.'; +message = greeting + myName; console.log(message); diff --git a/package.json b/package.json index 93e0861e3..9e7f2ffeb 100644 --- a/package.json +++ b/package.json @@ -14,15 +14,21 @@ "url": "https://github.com/CodeYourFuture/JavaScript-Core-1-Coursework-Week1/issues" }, "jest": { - "setupFilesAfterEnv": ["jest-extended"], + "setupFilesAfterEnv": [ + "jest-extended" + ], "projects": [ { "displayName": "mandatory", - "testMatch": ["/mandatory/*.js"] + "testMatch": [ + "/mandatory/*.js" + ] }, { "displayName": "extra", - "testMatch": ["/extra/*.js"] + "testMatch": [ + "/extra/*.js" + ] } ] }, From f6353deaf21a0868de80d6397bf785225ddc46b3 Mon Sep 17 00:00:00 2001 From: Natalie Zablotska <113237479+nataliiazab@users.noreply.github.com> Date: Wed, 23 Nov 2022 00:56:35 +0000 Subject: [PATCH 02/11] Complete exercise F --- exercises/F-strings-methods/exercise.js | 5 ++++- exercises/F-strings-methods/exercise2.js | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/exercises/F-strings-methods/exercise.js b/exercises/F-strings-methods/exercise.js index 2cffa6a81..3d3b1330a 100644 --- a/exercises/F-strings-methods/exercise.js +++ b/exercises/F-strings-methods/exercise.js @@ -1,3 +1,6 @@ // Start by creating a variable `message` - +const name = "Daniel"; +let nameLength = name.length; +message = + "My name is " + name + " and my name is " + nameLength + " characters long"; console.log(message); diff --git a/exercises/F-strings-methods/exercise2.js b/exercises/F-strings-methods/exercise2.js index b4b46943d..a4d4ea188 100644 --- a/exercises/F-strings-methods/exercise2.js +++ b/exercises/F-strings-methods/exercise2.js @@ -1,3 +1,6 @@ const name = " Daniel "; - +let myName = name.trim(); +let nameLength = myName.length; +message = + "My name is " + myName + " and my name is " + nameLength + " characters long"; console.log(message); From a78d3780517a961d018d56245d38b4cbd99ae178 Mon Sep 17 00:00:00 2001 From: Natalie Zablotska <113237479+nataliiazab@users.noreply.github.com> Date: Wed, 23 Nov 2022 20:50:59 +0000 Subject: [PATCH 03/11] Complete exercise G --- exercises/G-numbers/exercise.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/exercises/G-numbers/exercise.js b/exercises/G-numbers/exercise.js index 49e7bc00b..f66d5446e 100644 --- a/exercises/G-numbers/exercise.js +++ b/exercises/G-numbers/exercise.js @@ -1 +1,5 @@ // Start by creating a variables `numberOfStudents` and `numberOfMentors` +var numberOfStudents = 15; +var numberOfMentors = 8; +let total = numberOfMentors + numberOfStudents; +console.log('Total number of students and mentors:' + ' ' + total); \ No newline at end of file From 26622daf52641a9efdf07facba6e0b0eebb9399f Mon Sep 17 00:00:00 2001 From: Natalie Zablotska <113237479+nataliiazab@users.noreply.github.com> Date: Wed, 23 Nov 2022 20:58:01 +0000 Subject: [PATCH 04/11] Complete exercise I --- exercises/I-floats/exercise.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/exercises/I-floats/exercise.js b/exercises/I-floats/exercise.js index a5bbcd852..cb59b5179 100644 --- a/exercises/I-floats/exercise.js +++ b/exercises/I-floats/exercise.js @@ -1,2 +1,11 @@ var numberOfStudents = 15; var numberOfMentors = 8; +const total = numberOfMentors + numberOfStudents; +let percentageOfStudents = (numberOfStudents / total) * 100; +let percentageOfMentors = (numberOfMentors / total) * 100; +let roundedPercentageOfStudents = Math.round(percentageOfStudents); +let roundedPercentageOfMentors = Math.round(percentageOfMentors); +let message1 = "Percentage students: " + roundedPercentageOfStudents + "%"; +let message2 = "Percentage mentors: " + roundedPercentageOfMentors + "%"; +console.log(message1); +console.log(message2); From ccc1ef49b2fa6b0ad2971e8498a762774cb7af1f Mon Sep 17 00:00:00 2001 From: Natalie Zablotska <113237479+nataliiazab@users.noreply.github.com> Date: Wed, 23 Nov 2022 21:12:44 +0000 Subject: [PATCH 05/11] COMPLETE EXERCISE g --- exercises/J-functions/exercise.js | 2 +- exercises/J-functions/exercise2.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/exercises/J-functions/exercise.js b/exercises/J-functions/exercise.js index 0ae5850e5..e7278f7bd 100644 --- a/exercises/J-functions/exercise.js +++ b/exercises/J-functions/exercise.js @@ -1,5 +1,5 @@ function halve(number) { - // complete the function here + return number / 2; } var result = halve(12); diff --git a/exercises/J-functions/exercise2.js b/exercises/J-functions/exercise2.js index 82ef5e780..95ef62512 100644 --- a/exercises/J-functions/exercise2.js +++ b/exercises/J-functions/exercise2.js @@ -1,5 +1,5 @@ function triple(number) { - // complete function here + return number * 3; } var result = triple(12); From be812fae3ef4a57dc7be8a995bedb59692b9d628 Mon Sep 17 00:00:00 2001 From: Natalie Zablotska <113237479+nataliiazab@users.noreply.github.com> Date: Wed, 23 Nov 2022 21:24:27 +0000 Subject: [PATCH 06/11] Complete exercise K --- exercises/K-functions-parameters/exercise.js | 4 ++-- exercises/K-functions-parameters/exercise2.js | 4 +++- exercises/K-functions-parameters/exercise3.js | 4 +++- exercises/K-functions-parameters/exercise4.js | 5 ++++- exercises/K-functions-parameters/exercise5.js | 4 +++- 5 files changed, 15 insertions(+), 6 deletions(-) diff --git a/exercises/K-functions-parameters/exercise.js b/exercises/K-functions-parameters/exercise.js index 8d5db5e69..c15480416 100644 --- a/exercises/K-functions-parameters/exercise.js +++ b/exercises/K-functions-parameters/exercise.js @@ -1,6 +1,6 @@ // Complete the function so that it takes input parameters -function multiply() { - // Calculate the result of the function and return it +function multiply(a, b) { + return a * b; } // Assign the result of calling the function the variable `result` diff --git a/exercises/K-functions-parameters/exercise2.js b/exercises/K-functions-parameters/exercise2.js index db7a8904b..e7c787d04 100644 --- a/exercises/K-functions-parameters/exercise2.js +++ b/exercises/K-functions-parameters/exercise2.js @@ -1,5 +1,7 @@ // Declare your function first - +function divide(a, b) { + return a / b; +} var result = divide(3, 4); console.log(result); diff --git a/exercises/K-functions-parameters/exercise3.js b/exercises/K-functions-parameters/exercise3.js index 537e9f4ec..82e0e9875 100644 --- a/exercises/K-functions-parameters/exercise3.js +++ b/exercises/K-functions-parameters/exercise3.js @@ -1,5 +1,7 @@ // Write your function here - +function createGreeting(greeting) { + return 'Hello, my name is ' + greeting; +} var greeting = createGreeting("Daniel"); console.log(greeting); diff --git a/exercises/K-functions-parameters/exercise4.js b/exercises/K-functions-parameters/exercise4.js index 7ab44589e..eddbbce21 100644 --- a/exercises/K-functions-parameters/exercise4.js +++ b/exercises/K-functions-parameters/exercise4.js @@ -1,5 +1,8 @@ // Declare your function first - +function addsNumber(a, b) { + return a + b; +} +var sum = addsNumber(13, 124); // Call the function and assign to a variable `sum` console.log(sum); diff --git a/exercises/K-functions-parameters/exercise5.js b/exercises/K-functions-parameters/exercise5.js index 7c5bcd605..dbbcffe14 100644 --- a/exercises/K-functions-parameters/exercise5.js +++ b/exercises/K-functions-parameters/exercise5.js @@ -1,5 +1,7 @@ // Declare your function here - +function createLongGreeting(a, b) { + return "Hello, my name is " + a + " and I'm " + b + " years old"; +} const greeting = createLongGreeting("Daniel", 30); console.log(greeting); From 1e5a3fb4e7bb9714ce81663d105333943a560581 Mon Sep 17 00:00:00 2001 From: Natalie Zablotska <113237479+nataliiazab@users.noreply.github.com> Date: Thu, 24 Nov 2022 21:17:34 +0000 Subject: [PATCH 07/11] complete exercise L --- exercises/L-functions-nested/exercise.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/exercises/L-functions-nested/exercise.js b/exercises/L-functions-nested/exercise.js index a5d377442..3bde09a8c 100644 --- a/exercises/L-functions-nested/exercise.js +++ b/exercises/L-functions-nested/exercise.js @@ -3,3 +3,19 @@ var mentor2 = "Irina"; var mentor3 = "Mimi"; var mentor4 = "Rob"; var mentor5 = "Yohannes"; + +function changeToUpper(mentor) { + return mentor.toUpperCase(); +} + +function createGreeting(mentor) { + var mentorToUpper = changeToUpper(mentor); + var message = "HELLO " + mentorToUpper; + return message; +} + +console.log(createGreeting(mentor1)); +console.log(createGreeting(mentor2)); +console.log(createGreeting(mentor3)); +console.log(createGreeting(mentor4)); +console.log(createGreeting(mentor5)); From 806371035db379950cfbf6d0ff080c867c132b00 Mon Sep 17 00:00:00 2001 From: Natalie Zablotska <113237479+nataliiazab@users.noreply.github.com> Date: Thu, 24 Nov 2022 22:14:07 +0000 Subject: [PATCH 08/11] 1st mandatory test is done --- mandatory/1-syntax-errors.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mandatory/1-syntax-errors.js b/mandatory/1-syntax-errors.js index a10cc9ac2..cc9c2abf1 100644 --- a/mandatory/1-syntax-errors.js +++ b/mandatory/1-syntax-errors.js @@ -1,16 +1,16 @@ // There are syntax errors in this code - can you fix it to pass the tests? -function addNumbers(a b c) { +function addNumbers(a, b, c) { return a + b + c; } -function introduceMe(name, age) - return "Hello, my name is " + name "and I am " age + "years old"; +function introduceMe(name, age) { + return "Hello, my name is " + name + " and I am " + age + " years old"; +} function getTotal(a, b) { - total = a ++ b; - - return "The total is total"; + total = a + b; + return "The total is " + total; } /* From 5a7c598fd9a00790c883a05414f857bb7ef0ec88 Mon Sep 17 00:00:00 2001 From: Natalie Zablotska <113237479+nataliiazab@users.noreply.github.com> Date: Thu, 24 Nov 2022 22:19:18 +0000 Subject: [PATCH 09/11] complete 2 mandatory exercise --- mandatory/2-logic-error.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/mandatory/2-logic-error.js b/mandatory/2-logic-error.js index 9cca7603b..37c4ebc15 100644 --- a/mandatory/2-logic-error.js +++ b/mandatory/2-logic-error.js @@ -1,16 +1,15 @@ // The syntax for this function is valid but it has an error, find it and fix it. function trimWord(word) { - return wordtrim(); + return word.trim(); } function getStringLength(word) { - return "word".length(); + return word.length; } function multiply(a, b, c) { - a * b * c; - return; + return a * b * c; } /* From b09604736589dcf8c3f5842428d93fa56f3b8bf8 Mon Sep 17 00:00:00 2001 From: Natalie Zablotska <113237479+nataliiazab@users.noreply.github.com> Date: Thu, 24 Nov 2022 22:33:18 +0000 Subject: [PATCH 10/11] complete mandatory 3 --- mandatory/3-function-output.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/mandatory/3-function-output.js b/mandatory/3-function-output.js index 5a953ba60..19d3c6660 100644 --- a/mandatory/3-function-output.js +++ b/mandatory/3-function-output.js @@ -2,15 +2,23 @@ function getRandomNumber() { return Math.random() * 10; } +//Math.random() returns a random number from 0 to 9 // Add comments to explain what this function does. You're meant to use Google! function combine2Words(word1, word2) { return word1.concat(word2); } +//Return a string that is all of the words concatenated together function concatenate(firstWord, secondWord, thirdWord) { // Write the body of this function to concatenate three words together. // Look at the test case below to understand what this function is expected to return. + + // let twoWords = firstWord.concat(secondWord); + // let threeWords = twoWords.concat(thirdWord); + // return threeWords; + let message = firstWord + ' ' + secondWord + ' ' + thirdWord; + return message; } /* From d7fcbfb1f8299fa90865e14b435434fa2c8527e8 Mon Sep 17 00:00:00 2001 From: Natalie Zablotska <113237479+nataliiazab@users.noreply.github.com> Date: Thu, 24 Nov 2022 23:33:22 +0000 Subject: [PATCH 11/11] complete 4 exercise --- mandatory/4-tax.js | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/mandatory/4-tax.js b/mandatory/4-tax.js index ba77c7ae2..887772956 100644 --- a/mandatory/4-tax.js +++ b/mandatory/4-tax.js @@ -5,7 +5,11 @@ Sales tax is 20% of the price of the product. */ -function calculateSalesTax() {} +function calculateSalesTax(n) { + let salesTax = (n * 20) / 100; + let total = n + salesTax; + return total; +} /* CURRENCY FORMATTING @@ -17,7 +21,11 @@ function calculateSalesTax() {} Remember that the prices must include the sales tax (hint: you already wrote a function for this!) */ -function addTaxAndFormatCurrency() {} +function addTaxAndFormatCurrency(x) { + let decimal = calculateSalesTax(x); + let finalDecimal = decimal.toFixed(2); + return "£" + finalDecimal; +} /* ===================================================