From bef610956064ca18b76037022c7f7d1bc2e2b083 Mon Sep 17 00:00:00 2001
From: aaokunade <67062110+aaokunade@users.noreply.github.com>
Date: Tue, 8 Dec 2020 22:01:21 +0000
Subject: [PATCH 1/2] Finished the Mandatory Exercises

Made changes and fixed errors where required.
---
 mandatory/1-syntax-errors.js   | 12 ++++++------
 mandatory/2-logic-error.js     |  9 ++++-----
 mandatory/3-function-output.js |  5 +++--
 mandatory/4-tax.js             | 14 ++++++++++++--
 4 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/mandatory/1-syntax-errors.js b/mandatory/1-syntax-errors.js
index 0a21afd1b..1c2a7d5b9 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 3c578ad87..901bf0bf5 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();
+function trimWord(word){
+  return word.trim();
 }
 
 function getWordLength(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 c9221a200..2b56abdee 100644
--- a/mandatory/3-function-output.js
+++ b/mandatory/3-function-output.js
@@ -1,16 +1,17 @@
 // Add comments to explain what this function does. You're meant to use Google!
 function getNumber() {
-  return Math.random() * 10;
+  return Math.random() * 10; //This returns a random number between 0 and 1, 0 inclusive and 1 exclusive
 }
 
 // Add comments to explain what this function does. You're meant to use Google!
 function s(w1, w2) {
-  return w1.concat(w2);
+  return w1.concat(w2); // This adds the parameters in the function together and returns it.
 }
 
 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.
+  return firstWord.concat(" ",secondWord," " ,thirdWord);
 }
 
 /* 
diff --git a/mandatory/4-tax.js b/mandatory/4-tax.js
index c9e41c691..439ea750e 100644
--- a/mandatory/4-tax.js
+++ b/mandatory/4-tax.js
@@ -5,7 +5,10 @@
   Sales tax is 20% of the price of the product
 */
 
-function calculateSalesTax() {}
+function calculateSalesTax(productPrice){ 
+  const salesTax = 0.2 * productPrice;
+  return salesTax + productPrice;
+}
 
 /*
   CURRENCY FORMATTING
@@ -17,7 +20,14 @@ function calculateSalesTax() {}
   Remember that the prices must include the sales tax (hint: you already wrote a function for this!)
 */
 
-function addTaxAndFormatCurrency() {}
+function addTaxAndFormatCurrency(productPrice) {
+    const totalPrice = calculateSalesTax(productPrice);
+    // const totalPrice = salesTax + productPrice;
+    const formatCurrency =totalPrice.toFixed(2);
+    return "£" + formatCurrency;
+}
+
+
 
 /* 
 ===================================================

From 5f19f84114098726257e12adbb5a09055dd01928 Mon Sep 17 00:00:00 2001
From: aaokunade <67062110+aaokunade@users.noreply.github.com>
Date: Thu, 10 Dec 2020 14:12:09 +0000
Subject: [PATCH 2/2] Exercises Homework

Exercise homework covered , remains nested.
---
 exercises/B-hello-world/exercise.js           | 4 ++++
 exercises/C-variables/exercise.js             | 2 +-
 exercises/D-strings/exercise.js               | 6 ++++--
 exercises/E-strings-concatenation/exercise.js | 4 +++-
 exercises/F-strings-methods/exercise.js       | 3 +++
 exercises/F-strings-methods/exercise2.js      | 6 +++++-
 exercises/G-numbers/exercise.js               | 5 +++++
 exercises/I-floats/exercise.js                | 4 ++++
 exercises/J-functions/exercise.js             | 6 +++---
 exercises/J-functions/exercise2.js            | 1 +
 exercises/K-functions-parameters/exercise.js  | 3 ++-
 exercises/K-functions-parameters/exercise2.js | 5 +++--
 exercises/K-functions-parameters/exercise3.js | 4 +++-
 exercises/K-functions-parameters/exercise4.js | 6 ++++--
 exercises/K-functions-parameters/exercise5.js | 5 ++++-
 mandatory/3-function-output.js                | 2 +-
 16 files changed, 50 insertions(+), 16 deletions(-)

diff --git a/exercises/B-hello-world/exercise.js b/exercises/B-hello-world/exercise.js
index b179ee953..e6449ff20 100644
--- a/exercises/B-hello-world/exercise.js
+++ b/exercises/B-hello-world/exercise.js
@@ -1 +1,5 @@
 console.log("Hello world");
+console.log("hello World, I just started learning JavaScript");
+console.log(Hello World, I just started learning JavaScript);
+console.log(50);
+console.log("50");
\ No newline at end of file
diff --git a/exercises/C-variables/exercise.js b/exercises/C-variables/exercise.js
index a6bbb9786..c4da9d78c 100644
--- a/exercises/C-variables/exercise.js
+++ b/exercises/C-variables/exercise.js
@@ -1,3 +1,3 @@
 // Start by creating a variable `greeting`
-
+var greeting = "Hello World";
 console.log(greeting);
diff --git a/exercises/D-strings/exercise.js b/exercises/D-strings/exercise.js
index 2cffa6a81..ad51985cb 100644
--- a/exercises/D-strings/exercise.js
+++ b/exercises/D-strings/exercise.js
@@ -1,3 +1,5 @@
 // Start by creating a variable `message`
-
-console.log(message);
+var message = "hello, how are your?";
+console.log(typeof message);
+var msg = 50;
+console.log(typeof msg);
diff --git a/exercises/E-strings-concatenation/exercise.js b/exercises/E-strings-concatenation/exercise.js
index 2cffa6a81..9ed67206e 100644
--- a/exercises/E-strings-concatenation/exercise.js
+++ b/exercises/E-strings-concatenation/exercise.js
@@ -1,3 +1,5 @@
 // Start by creating a variable `message`
-
+var messageStart = "Hello, How are you ";
+var messageName = "Aaishah";
+var message = messageStart + messageName;
 console.log(message);
diff --git a/exercises/F-strings-methods/exercise.js b/exercises/F-strings-methods/exercise.js
index 2cffa6a81..ccf489ccf 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`
+var name =  "Aaishah"
+var nameLength = name.length;
+var 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..a79393e63 100644
--- a/exercises/F-strings-methods/exercise2.js
+++ b/exercises/F-strings-methods/exercise2.js
@@ -1,3 +1,7 @@
 const name = " Daniel  ";
-
+nam = name.trim();
+var nameLength = nam.length;
+var message =
+  "My name is " + nam + " and my name is " + nameLength + " characters long";
 console.log(message);
+
diff --git a/exercises/G-numbers/exercise.js b/exercises/G-numbers/exercise.js
index 49e7bc00b..79178712c 100644
--- a/exercises/G-numbers/exercise.js
+++ b/exercises/G-numbers/exercise.js
@@ -1 +1,6 @@
 // Start by creating a variables `numberOfStudents` and `numberOfMentors`
+var numberOfStudents = 30;
+var numberOfMentors = 23;
+var total = numberOfStudents + numberOfMentors;
+var totalStudentsAndMentors = "The total number of students and mentors is " + total;
+console.log(totalStudentsAndMentors);
\ No newline at end of file
diff --git a/exercises/I-floats/exercise.js b/exercises/I-floats/exercise.js
index a5bbcd852..97be2c465 100644
--- a/exercises/I-floats/exercise.js
+++ b/exercises/I-floats/exercise.js
@@ -1,2 +1,6 @@
 var numberOfStudents = 15;
 var numberOfMentors = 8;
+var percentageOfStudents = Math.round((numberOfStudents*100)/ (numberOfMentors + numberOfStudents));
+var percentageOfMentors = Math.round(numberOfMentors*100/ (numberOfMentors + numberOfStudents));
+console.log(percentageOfMentors);
+console.log(percentageOfStudents);
\ No newline at end of file
diff --git a/exercises/J-functions/exercise.js b/exercises/J-functions/exercise.js
index 0ae5850e5..370d22ac0 100644
--- a/exercises/J-functions/exercise.js
+++ b/exercises/J-functions/exercise.js
@@ -1,7 +1,7 @@
 function halve(number) {
   // complete the function here
+  
+  return number/2;
 }
-
-var result = halve(12);
-
+var result = 12 / 2;
 console.log(result);
diff --git a/exercises/J-functions/exercise2.js b/exercises/J-functions/exercise2.js
index 82ef5e780..468d45596 100644
--- a/exercises/J-functions/exercise2.js
+++ b/exercises/J-functions/exercise2.js
@@ -1,5 +1,6 @@
 function triple(number) {
   // complete function here
+  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..f842a131f 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() {
+function multiply(x, y) {
   // Calculate the result of the function and return it
+  return x * y;
 }
 
 // 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..8c3748393 100644
--- a/exercises/K-functions-parameters/exercise2.js
+++ b/exercises/K-functions-parameters/exercise2.js
@@ -1,5 +1,6 @@
 // Declare your function first
-
+function divide(x, y){
+    return x/y;
+}
 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..42e0dc6fe 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(name){
+    return "Hello, my name is " + name;
+}
 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..a7e46ddbf 100644
--- a/exercises/K-functions-parameters/exercise4.js
+++ b/exercises/K-functions-parameters/exercise4.js
@@ -1,5 +1,7 @@
 // Declare your function first
-
+function addTwoNumbers(a, b){
+    return a + b;
+}
 // Call the function and assign to a variable `sum`
-
+var sum = addTwoNumbers(13, 124);
 console.log(sum);
diff --git a/exercises/K-functions-parameters/exercise5.js b/exercises/K-functions-parameters/exercise5.js
index 7c5bcd605..2cca8641b 100644
--- a/exercises/K-functions-parameters/exercise5.js
+++ b/exercises/K-functions-parameters/exercise5.js
@@ -1,5 +1,8 @@
 // Declare your function here
-
+function createLongGreeting(name, age){
+    // var greetingStart = "Hello my name is "
+    return "Hello, my name is " + name + " and I'm " + age + " years old"; 
+}
 const greeting = createLongGreeting("Daniel", 30);
 
 console.log(greeting);
diff --git a/mandatory/3-function-output.js b/mandatory/3-function-output.js
index 2b56abdee..2f5da7c9f 100644
--- a/mandatory/3-function-output.js
+++ b/mandatory/3-function-output.js
@@ -1,6 +1,6 @@
 // Add comments to explain what this function does. You're meant to use Google!
 function getNumber() {
-  return Math.random() * 10; //This returns a random number between 0 and 1, 0 inclusive and 1 exclusive
+  return Math.random() * 10; //This returns a random number between 0 and 10, 0 inclusive and 10 exclusive
 }
 
 // Add comments to explain what this function does. You're meant to use Google!