From 127d345b7b66dd1bb6e84a111a91a702c3a5ab63 Mon Sep 17 00:00:00 2001
From: Amanda Obiajulu Nwadukwe <xtremeli.basic@gmail.com>
Date: Wed, 23 Jun 2021 18:29:13 +0100
Subject: [PATCH 1/3] Exercise folder completed

Amanda has completed all the exercises in the exercise folder
---
 exercises/B-hello-world/exercise.js           |  9 +++++++++
 exercises/C-variables/exercise.js             |  3 +++
 exercises/D-strings/exercise.js               |  6 ++++++
 exercises/E-strings-concatenation/exercise.js |  4 ++++
 exercises/F-strings-methods/exercise.js       |  9 +++++++++
 exercises/F-strings-methods/exercise2.js      | 13 +++++++++++--
 exercises/G-numbers/exercise.js               | 10 ++++++++++
 exercises/I-floats/exercise.js                | 15 +++++++++++++++
 exercises/J-functions/exercise.js             |  5 ++++-
 exercises/J-functions/exercise2.js            |  3 ++-
 exercises/K-functions-parameters/exercise.js  |  5 +++--
 exercises/K-functions-parameters/exercise2.js |  6 ++++--
 exercises/K-functions-parameters/exercise3.js |  3 +++
 exercises/K-functions-parameters/exercise4.js |  5 ++++-
 exercises/K-functions-parameters/exercise5.js |  6 ++++--
 exercises/L-functions-nested/exercise.js      | 16 ++++++++++++++++
 mandatory/1-syntax-errors.js                  | 12 ++++++------
 mandatory/2-logic-error.js                    |  7 +++----
 mandatory/3-function-output.js                |  5 +++++
 mandatory/4-tax.js                            | 12 ++++++++++--
 package.json                                  |  4 +++-
 21 files changed, 134 insertions(+), 24 deletions(-)

diff --git a/exercises/B-hello-world/exercise.js b/exercises/B-hello-world/exercise.js
index b179ee953..7bb20dbcd 100644
--- a/exercises/B-hello-world/exercise.js
+++ b/exercises/B-hello-world/exercise.js
@@ -1 +1,10 @@
 console.log("Hello world");
+
+//logging several things at once to the console:
+console.log("This is one statement\n", "This is another statement\n", "This is a " + "concatenation");
+
+//When I omit the quote marks, I get a syntax error
+console.log("Hello world, I just started learning JavaScript!");
+
+//When I console.log a number without quotes, the logo is logged in the console
+console.log(232);
diff --git a/exercises/C-variables/exercise.js b/exercises/C-variables/exercise.js
index a6bbb9786..a16ed50c0 100644
--- a/exercises/C-variables/exercise.js
+++ b/exercises/C-variables/exercise.js
@@ -1,3 +1,6 @@
 // Start by creating a variable `greeting`
+var greeting = "Good day!";
 
 console.log(greeting);
+console.log(greeting);
+console.log(greeting);
\ No newline at end of file
diff --git a/exercises/D-strings/exercise.js b/exercises/D-strings/exercise.js
index 2cffa6a81..a87e9ecd5 100644
--- a/exercises/D-strings/exercise.js
+++ b/exercises/D-strings/exercise.js
@@ -1,3 +1,9 @@
 // Start by creating a variable `message`
+var message = "I am learning a lot about strings";
 
+//Type of message
+var messageType = typeof message;
+
+//Logging to the console
 console.log(message);
+console.log(messageType);
\ No newline at end of file
diff --git a/exercises/E-strings-concatenation/exercise.js b/exercises/E-strings-concatenation/exercise.js
index 2cffa6a81..5f7c3d31b 100644
--- a/exercises/E-strings-concatenation/exercise.js
+++ b/exercises/E-strings-concatenation/exercise.js
@@ -1,3 +1,7 @@
 // Start by creating a variable `message`
+var greetingStart = "Hello, my name is ";
+var myName = "Amanda";
+var message = greetingStart + myName;
 
+//Logging to the console
 console.log(message);
diff --git a/exercises/F-strings-methods/exercise.js b/exercises/F-strings-methods/exercise.js
index 2cffa6a81..a0d12dee4 100644
--- a/exercises/F-strings-methods/exercise.js
+++ b/exercises/F-strings-methods/exercise.js
@@ -1,3 +1,12 @@
 // Start by creating a variable `message`
 
+//Storing my name in a variable
+var myName = "Amanda";
+
+//Storing the length of my name in another variable
+var myNameLength = myName.length;
+
+var message = "My name is " + myName + " and my name is " + myNameLength + " characters long.";
+
+//Logging to the console
 console.log(message);
diff --git a/exercises/F-strings-methods/exercise2.js b/exercises/F-strings-methods/exercise2.js
index b4b46943d..0feb48f5b 100644
--- a/exercises/F-strings-methods/exercise2.js
+++ b/exercises/F-strings-methods/exercise2.js
@@ -1,3 +1,12 @@
-const name = " Daniel  ";
+//Storing my name in a variable
+const myName = " Amanda  ";
 
-console.log(message);
+const nameTrim = myName.trim();
+
+//Storing the length of my name in another variable
+var myNameLength = nameTrim.length;
+
+var message = "My name is " + nameTrim + " and my name is " + myNameLength + " characters long.";
+
+//Logging to the console
+console.log(message);
\ No newline at end of file
diff --git a/exercises/G-numbers/exercise.js b/exercises/G-numbers/exercise.js
index 49e7bc00b..80790021c 100644
--- a/exercises/G-numbers/exercise.js
+++ b/exercises/G-numbers/exercise.js
@@ -1 +1,11 @@
 // Start by creating a variables `numberOfStudents` and `numberOfMentors`
+
+var numberOfStudents = 15;
+
+var numberOfMentors = 8;
+
+var total = numberOfStudents + numberOfMentors;
+
+console.log("Number of students: " + numberOfStudents);
+console.log("Number of mentors: " + numberOfMentors);
+console.log("Total number of students and mentors: " + total);
\ No newline at end of file
diff --git a/exercises/I-floats/exercise.js b/exercises/I-floats/exercise.js
index a5bbcd852..87df13c70 100644
--- a/exercises/I-floats/exercise.js
+++ b/exercises/I-floats/exercise.js
@@ -1,2 +1,17 @@
 var numberOfStudents = 15;
 var numberOfMentors = 8;
+
+//Finding the total
+var total = numberOfStudents + numberOfMentors;
+
+//Finding the percentages
+var percentageOfStudents = (numberOfStudents / total) * 100;
+var percentageOfMentors = (numberOfMentors / total) * 100;
+
+//Rounding the percentages
+var roundPercentageOfStudents = Math.round(percentageOfStudents);
+var roundPercentageOfMentors = Math.round(percentageOfMentors);
+
+//Logging to the console
+console.log("Percentage students: " + roundPercentageOfStudents + "%");
+console.log("Percentage mentors: " + roundPercentageOfMentors + "%");
diff --git a/exercises/J-functions/exercise.js b/exercises/J-functions/exercise.js
index 0ae5850e5..1feb26634 100644
--- a/exercises/J-functions/exercise.js
+++ b/exercises/J-functions/exercise.js
@@ -1,7 +1,10 @@
 function halve(number) {
-  // complete the function here
+  //Completing the function
+  return number / 2;
 }
 
 var result = halve(12);
+var result2 = halve(356);
 
 console.log(result);
+console.log(result2);
\ No newline at end of file
diff --git a/exercises/J-functions/exercise2.js b/exercises/J-functions/exercise2.js
index 82ef5e780..a4c1a67a2 100644
--- a/exercises/J-functions/exercise2.js
+++ b/exercises/J-functions/exercise2.js
@@ -1,5 +1,6 @@
 function triple(number) {
-  // complete function here
+  // completing the function:
+  return number * 3;
 }
 
 var result = triple(12);
diff --git a/exercises/K-functions-parameters/exercise.js b/exercises/K-functions-parameters/exercise.js
index 8d5db5e69..7553a0057 100644
--- a/exercises/K-functions-parameters/exercise.js
+++ b/exercises/K-functions-parameters/exercise.js
@@ -1,6 +1,7 @@
 // Complete the function so that it takes input parameters
-function multiply() {
-  // Calculate the result of the function and return it
+function multiply(a, b) {
+  // Calculating the result of the function and returning it
+  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..722a1bf3c 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);
+console.log(result);
\ No newline at end of file
diff --git a/exercises/K-functions-parameters/exercise3.js b/exercises/K-functions-parameters/exercise3.js
index 537e9f4ec..fbfbf0c9b 100644
--- a/exercises/K-functions-parameters/exercise3.js
+++ b/exercises/K-functions-parameters/exercise3.js
@@ -1,4 +1,7 @@
 // Write your function here
+function createGreeting(name){
+    return "Hello, my name is " + name;
+}
 
 var greeting = createGreeting("Daniel");
 
diff --git a/exercises/K-functions-parameters/exercise4.js b/exercises/K-functions-parameters/exercise4.js
index 7ab44589e..87a505e4d 100644
--- a/exercises/K-functions-parameters/exercise4.js
+++ b/exercises/K-functions-parameters/exercise4.js
@@ -1,5 +1,8 @@
 // Declare your function first
-
+function sumNumbers(a,b){
+    return a + b;
+}
 // Call the function and assign to a variable `sum`
+var sum = sumNumbers(13, 124);
 
 console.log(sum);
diff --git a/exercises/K-functions-parameters/exercise5.js b/exercises/K-functions-parameters/exercise5.js
index 7c5bcd605..e62515005 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(name, age){
+    return "Hello, my name is " + name + " and I am " + age + " years old";
+}
 const greeting = createLongGreeting("Daniel", 30);
 
-console.log(greeting);
+console.log(greeting);
\ No newline at end of file
diff --git a/exercises/L-functions-nested/exercise.js b/exercises/L-functions-nested/exercise.js
index a5d377442..50062e8fe 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 upperCase(mentor){
+    return mentor.toUpperCase(); 
+}
+
+function shoutyGreeting(mentor){
+    var name = upperCase(mentor);
+    var message = "HELLO " + name;
+    return message;
+}
+
+shoutyGreeting(mentor1);
+shoutyGreeting(mentor2);
+shoutyGreeting(mentor3);
+shoutyGreeting(mentor4);
+shoutyGreeting(mentor5);
\ No newline at end of file
diff --git a/mandatory/1-syntax-errors.js b/mandatory/1-syntax-errors.js
index a10cc9ac2..eef90dbdc 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;
 }
 
 /* 
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;
 }
 
 /* 
diff --git a/mandatory/3-function-output.js b/mandatory/3-function-output.js
index 5a953ba60..5b0058fe4 100644
--- a/mandatory/3-function-output.js
+++ b/mandatory/3-function-output.js
@@ -1,15 +1,20 @@
 // Add comments to explain what this function does. You're meant to use Google!
+//This function gets random numbers between 0 and 1 and then multiplies in by 10 hence getting random number between 1 and 10
 function getRandomNumber() {
   return Math.random() * 10;
 }
 
 // Add comments to explain what this function does. You're meant to use Google!
+//This function takes in two words as parameters and then joins them together
 function combine2Words(word1, word2) {
   return word1.concat(word2);
 }
 
 function concatenate(firstWord, secondWord, thirdWord) {
   // Write the body of this function to concatenate three words together.
+  var first = firstWord + " ";
+  var second = secondWord + " ";
+  return first.concat(second).concat(thirdWord); 
   // Look at the test case below to understand what this function is expected to return.
 }
 
diff --git a/mandatory/4-tax.js b/mandatory/4-tax.js
index ba77c7ae2..f59db796e 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(price) {
+  var tax = price * (20/ 100);
+  return tax + price;
+  
+}
 
 /*
   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(price) {
+  var actualPrice = (price).toFixed(2);
+  var tax = calculateSalesTax(price);
+  return "£" + tax;
+}
 
 /* 
 ===================================================
diff --git a/package.json b/package.json
index 58555936d..778df9683 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,9 @@
     "url": "https://github.com/CodeYourFuture/JavaScript-Core-1-Coursework-Week1/issues"
   },
   "jest": {
-    "setupFilesAfterEnv": ["jest-extended"]
+    "setupFilesAfterEnv": [
+      "jest-extended"
+    ]
   },
   "homepage": "https://github.com/CodeYourFuture/JavaScript-Core-1-Coursework-Week1#readme",
   "devDependencies": {

From 5e63d158d194e31bdbb9565b26a8639ec52740b0 Mon Sep 17 00:00:00 2001
From: Amanda Obiajulu Nwadukwe <xtremeli.basic@gmail.com>
Date: Wed, 23 Jun 2021 19:27:11 +0100
Subject: [PATCH 2/3] Mandatory exercises done

Amanda has completed the mandatory exercises
---
 mandatory/4-tax.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/mandatory/4-tax.js b/mandatory/4-tax.js
index f59db796e..4dc4e74dc 100644
--- a/mandatory/4-tax.js
+++ b/mandatory/4-tax.js
@@ -22,11 +22,12 @@ function calculateSalesTax(price) {
 */
 
 function addTaxAndFormatCurrency(price) {
-  var actualPrice = (price).toFixed(2);
   var tax = calculateSalesTax(price);
-  return "£" + tax;
+  var actualTax = (tax).toFixed(2);
+  return "£" + actualTax;
 }
 
+console.log(addTaxAndFormatCurrency(30));
 /* 
 ===================================================
 ======= TESTS - DO NOT MODIFY BELOW THIS LINE =====

From e57c69a3e81e9f88099655c45c61d36efad01c3d Mon Sep 17 00:00:00 2001
From: Amanda Obiajulu Nwadukwe <xtremeli.basic@gmail.com>
Date: Fri, 15 Oct 2021 21:54:48 +0100
Subject: [PATCH 3/3] Extra, mandatory and exercises completed

Extra, mandatory and exercises completed
---
 extra/1-currency-conversion.js | 13 +++++++++++--
 extra/2-piping.js              | 18 ++++++++++--------
 extra/3-magic-8-ball.js        |  1 +
 3 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/extra/1-currency-conversion.js b/extra/1-currency-conversion.js
index d82e59480..cae7c63dd 100644
--- a/extra/1-currency-conversion.js
+++ b/extra/1-currency-conversion.js
@@ -5,7 +5,11 @@
   Write a function that converts a price to USD (exchange rate is 1.4 $ to £)
 */
 
-function convertToUSD() {}
+function convertToUSD(price) {
+  var inUsd = 1.4;
+  var converted = inUsd + price;
+  return "$" + converted;
+}
 
 /*
   CURRENCY CONVERSION
@@ -15,7 +19,12 @@ function convertToUSD() {}
   They have also decided that they should add a 1% fee to all foreign transactions, which means you only convert 99% of the £ to BRL.
 */
 
-function convertToBRL() {}
+function convertToBRL(price) {
+  var amountToConvert = price * (99/100);
+  const inBRL = 5.7;
+  var converted = inBRL * amountToConvert;
+  return converted + "BRL";
+}
 
 /* ======= TESTS - DO NOT MODIFY ===== 
 There are some Tests in this file that will help you work out if your code is working.
diff --git a/extra/2-piping.js b/extra/2-piping.js
index 9c8ebc76a..ab69f7a99 100644
--- a/extra/2-piping.js
+++ b/extra/2-piping.js
@@ -16,26 +16,28 @@
   the final result to the variable goodCode
 */
 
-function add() {
-
+function add(a, b) {
+  return a + b;
 }
 
-function multiply() {
-
+function multiply(a, b) {
+  return a * b;
 }
 
-function format() {
-
+function format(number) {
+  return "£" + number;
 }
 
 const startingValue = 2;
 
 // Why can this code be seen as bad practice? Comment your answer.
-let badCode =
+let badCode = format(multiply(add(startingValue, 10), 2));
 
 /* BETTER PRACTICE */
 
-let goodCode =
+var added = add(startingValue, 10);
+var multiplied = multiply(added, 2);
+var goodCode = format(multiplied);
 
 /* ======= TESTS - DO NOT MODIFY ===== 
 There are some Tests in this file that will help you work out if your code is working.
diff --git a/extra/3-magic-8-ball.js b/extra/3-magic-8-ball.js
index f3adbefa5..bc529a9c0 100644
--- a/extra/3-magic-8-ball.js
+++ b/extra/3-magic-8-ball.js
@@ -47,6 +47,7 @@
 // and return the answer.
 function shakeBall() {
   //Write your code in here
+  console.log("The ball has shaken!");
 }
 
 /*