From 7e8bf736760f0343562a4070e7efc6e46b986a7c Mon Sep 17 00:00:00 2001
From: Riyaaz Singh <94745207+Riyaazct@users.noreply.github.com>
Date: Thu, 30 Jun 2022 17:25:21 +0200
Subject: [PATCH 1/8] exercise A - D done

---
 exercises/B-hello-world/exercise.js | 3 ++-
 exercises/C-variables/exercise.js   | 4 +++-
 exercises/D-strings/exercise.js     | 4 +++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/exercises/B-hello-world/exercise.js b/exercises/B-hello-world/exercise.js
index b179ee953..68f9e6154 100644
--- a/exercises/B-hello-world/exercise.js
+++ b/exercises/B-hello-world/exercise.js
@@ -1 +1,2 @@
-console.log("Hello world");
+console.log("Hello world I just started learning javascript");
+console.log("Helloooooo");
diff --git a/exercises/C-variables/exercise.js b/exercises/C-variables/exercise.js
index a6bbb9786..a17507f15 100644
--- a/exercises/C-variables/exercise.js
+++ b/exercises/C-variables/exercise.js
@@ -1,3 +1,5 @@
 // Start by creating a variable `greeting`
-
+let 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..9a78510f5 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";
+var messageType = typeof message;
 console.log(message);
+console.log(messageType);

From 46ea5c58fd222320fb17abc76ef8bacc5db96d3b Mon Sep 17 00:00:00 2001
From: Riyaaz Singh <94745207+Riyaazct@users.noreply.github.com>
Date: Thu, 30 Jun 2022 21:12:35 +0200
Subject: [PATCH 2/8] exercise E - F

---
 exercises/E-strings-concatenation/exercise.js | 5 +++--
 exercises/F-strings-methods/exercise.js       | 5 ++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/exercises/E-strings-concatenation/exercise.js b/exercises/E-strings-concatenation/exercise.js
index 2cffa6a81..58eb6dba9 100644
--- a/exercises/E-strings-concatenation/exercise.js
+++ b/exercises/E-strings-concatenation/exercise.js
@@ -1,3 +1,4 @@
-// Start by creating a variable `message`
-
+var greetingStart = "Hello my name is ";
+var myName = "Riyaaz"; // Start by creating a variable `message`
+var message = greetingStart + myName;
 console.log(message);
diff --git a/exercises/F-strings-methods/exercise.js b/exercises/F-strings-methods/exercise.js
index 2cffa6a81..400a1d83a 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 messageStart = "Hello, my name is ";
+var name = "Riyaaz";
+var message =
+  messageStart + name + " and my name is " + name.length + " letters long";
 console.log(message);

From a02400de145a3656ddad3fbe7135b2925b48c384 Mon Sep 17 00:00:00 2001
From: Riyaaz Singh <94745207+Riyaazct@users.noreply.github.com>
Date: Fri, 1 Jul 2022 00:39:55 +0200
Subject: [PATCH 3/8] exercises F - J

---
 exercises/F-strings-methods/exercise2.js | 6 +++++-
 exercises/G-numbers/exercise.js          | 4 ++++
 exercises/I-floats/exercise.js           | 6 ++++++
 exercises/J-functions/exercise.js        | 4 ++--
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/exercises/F-strings-methods/exercise2.js b/exercises/F-strings-methods/exercise2.js
index b4b46943d..983bf9ad5 100644
--- a/exercises/F-strings-methods/exercise2.js
+++ b/exercises/F-strings-methods/exercise2.js
@@ -1,3 +1,7 @@
 const name = " Daniel  ";
-
+var nameTrimmed = name.trim();
+var nameLength = nameTrimmed.length;
+var message1 = "my name is " + name;
+var message2 = "and my name is " + nameLength + " characters long";
+var message = message1 + message2;
 console.log(message);
diff --git a/exercises/G-numbers/exercise.js b/exercises/G-numbers/exercise.js
index 49e7bc00b..8478abf8c 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;
+var total = numberOfStudents + numberOfMentors;
+console.log("Total number of students and mentors: " + total);
diff --git a/exercises/I-floats/exercise.js b/exercises/I-floats/exercise.js
index a5bbcd852..2664ec549 100644
--- a/exercises/I-floats/exercise.js
+++ b/exercises/I-floats/exercise.js
@@ -1,2 +1,8 @@
 var numberOfStudents = 15;
 var numberOfMentors = 8;
+var studentCalc = (15 * 100) / 23;
+var mentorCalc = (8 * 100) / 23;
+var studentPerc = "Percentage students: " + Math.round(studentCalc);
+var mentorPerc = "Percentage of mentors: " + Math.round(mentorCalc);
+console.log(studentPerc + "%");
+console.log(mentorPerc + "%");
diff --git a/exercises/J-functions/exercise.js b/exercises/J-functions/exercise.js
index 0ae5850e5..832220246 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 = halve(75);
 
 console.log(result);

From 2463948c89988646cd5d33ab7d61362268cf0408 Mon Sep 17 00:00:00 2001
From: Riyaaz Singh <94745207+Riyaazct@users.noreply.github.com>
Date: Fri, 1 Jul 2022 01:11:21 +0200
Subject: [PATCH 4/8] completed mandatory test 2 as a trial run

---
 mandatory/2-logic-error.js | 8 ++++----
 mandatory/run              | 4 ++++
 2 files changed, 8 insertions(+), 4 deletions(-)
 create mode 100644 mandatory/run

diff --git a/mandatory/2-logic-error.js b/mandatory/2-logic-error.js
index 9cca7603b..a0154b3c0 100644
--- a/mandatory/2-logic-error.js
+++ b/mandatory/2-logic-error.js
@@ -1,16 +1,16 @@
 // 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;
+  var total = a * b * c;
+  return total;
 }
 
 /* 
diff --git a/mandatory/run b/mandatory/run
new file mode 100644
index 000000000..4a4e32004
--- /dev/null
+++ b/mandatory/run
@@ -0,0 +1,4 @@
+
+> javascript-core-1-coursework-week1@1.0.0 test
+> jest "--testPathPattern" "mandatory/2-logic-errors.js" "-" "single" "test"
+

From 05b805ef694078b495d80fd4a7f3347e16fe9490 Mon Sep 17 00:00:00 2001
From: Riyaaz Singh <94745207+Riyaazct@users.noreply.github.com>
Date: Fri, 1 Jul 2022 01:45:51 +0200
Subject: [PATCH 5/8] completed exercises J - K.

---
 exercises/J-functions/exercise2.js            | 2 +-
 exercises/K-functions-parameters/exercise.js  | 3 ++-
 exercises/K-functions-parameters/exercise2.js | 4 +++-
 exercises/K-functions-parameters/exercise3.js | 4 +++-
 exercises/K-functions-parameters/exercise4.js | 6 ++++--
 exercises/K-functions-parameters/exercise5.js | 4 +++-
 6 files changed, 16 insertions(+), 7 deletions(-)

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);
diff --git a/exercises/K-functions-parameters/exercise.js b/exercises/K-functions-parameters/exercise.js
index 8d5db5e69..a4eed9d76 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(num1, num2) {
   // Calculate the result of the function and return it
+  return num1 * num2;
 }
 
 // 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..05d6f04ff 100644
--- a/exercises/K-functions-parameters/exercise2.js
+++ b/exercises/K-functions-parameters/exercise2.js
@@ -1,4 +1,6 @@
-// Declare your function first
+var divide = function (num1, num2) {
+  return num1 / num2;
+};
 
 var result = divide(3, 4);
 
diff --git a/exercises/K-functions-parameters/exercise3.js b/exercises/K-functions-parameters/exercise3.js
index 537e9f4ec..99100683d 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..de661f96c 100644
--- a/exercises/K-functions-parameters/exercise4.js
+++ b/exercises/K-functions-parameters/exercise4.js
@@ -1,5 +1,7 @@
 // Declare your function first
-
+var add = function (num1, num2) {
+  return num1 + num2;
+};
 // Call the function and assign to a variable `sum`
-
+var sum = add(13, 124);
 console.log(sum);
diff --git a/exercises/K-functions-parameters/exercise5.js b/exercises/K-functions-parameters/exercise5.js
index 7c5bcd605..392c5323d 100644
--- a/exercises/K-functions-parameters/exercise5.js
+++ b/exercises/K-functions-parameters/exercise5.js
@@ -1,4 +1,6 @@
-// Declare your function here
+var createLongGreeting = function (name, age) {
+  return "Hello, my name is " + name + " and I'm " + age + " years old";
+};
 
 const greeting = createLongGreeting("Daniel", 30);
 

From 8c8a5ed89a625a3a918a509d701b6e784a023df2 Mon Sep 17 00:00:00 2001
From: Riyaaz Singh <94745207+Riyaazct@users.noreply.github.com>
Date: Fri, 1 Jul 2022 21:08:33 +0200
Subject: [PATCH 6/8] last of exercises folder completed

---
 exercises/I-floats/exercise.js           |  7 ++---
 exercises/L-functions-nested/exercise.js | 40 ++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/exercises/I-floats/exercise.js b/exercises/I-floats/exercise.js
index 2664ec549..c9c4bea4c 100644
--- a/exercises/I-floats/exercise.js
+++ b/exercises/I-floats/exercise.js
@@ -2,7 +2,6 @@ var numberOfStudents = 15;
 var numberOfMentors = 8;
 var studentCalc = (15 * 100) / 23;
 var mentorCalc = (8 * 100) / 23;
-var studentPerc = "Percentage students: " + Math.round(studentCalc);
-var mentorPerc = "Percentage of mentors: " + Math.round(mentorCalc);
-console.log(studentPerc + "%");
-console.log(mentorPerc + "%");
+var studentPerc = "Percentage students: " + Math.round(studentCalc) + "%";
+var mentorPerc = "Percentage of mentors: " + Math.round(mentorCalc) + "%";
+console.log(studentPerc + "\n" + mentorPerc);
diff --git a/exercises/L-functions-nested/exercise.js b/exercises/L-functions-nested/exercise.js
index a5d377442..4c826102a 100644
--- a/exercises/L-functions-nested/exercise.js
+++ b/exercises/L-functions-nested/exercise.js
@@ -3,3 +3,43 @@ var mentor2 = "Irina";
 var mentor3 = "Mimi";
 var mentor4 = "Rob";
 var mentor5 = "Yohannes";
+
+var mentor1UpperCase = mentor1.toUpperCase();
+var mentor1Greeting = function () {
+  var shoutyMentor1 = "Hello " + mentor1UpperCase;
+  return shoutyMentor1;
+};
+
+var mentor2UpperCase = mentor2.toUpperCase();
+var mentor2Greeting = function () {
+  var shoutyMentor2 = "Hello " + mentor2UpperCase;
+  return shoutyMentor2;
+};
+
+var mentor3UpperCase = mentor3.toUpperCase();
+
+var mentor3Greeting = function () {
+  var shoutyMentor3 = "Hello " + mentor3UpperCase;
+  return shoutyMentor3;
+};
+
+var mentor4UpperCase = mentor4.toUpperCase();
+var mentor4Greeting = function () {
+  var shoutyMentor4 = "Hello " + mentor4UpperCase;
+  return shoutyMentor4;
+};
+var mentor5UpperCase = mentor5.toUpperCase();
+var mentor5Greeting = function () {
+  var shoutyMentor5 = "Hello " + mentor5UpperCase;
+  return shoutyMentor5;
+};
+
+var shouty = function () {
+  console.log(mentor1Greeting());
+  console.log(mentor2Greeting());
+  console.log(mentor3Greeting());
+  console.log(mentor4Greeting());
+  console.log(mentor5Greeting());
+};
+
+shouty();

From 396c71751cd080cc3c727977dec1ba6fd77093b5 Mon Sep 17 00:00:00 2001
From: Riyaaz Singh <94745207+Riyaazct@users.noreply.github.com>
Date: Sat, 2 Jul 2022 20:52:59 +0200
Subject: [PATCH 7/8] completed all required exercises

---
 mandatory/1-syntax-errors.js   | 11 ++++++-----
 mandatory/3-function-output.js |  8 ++++++++
 mandatory/4-tax.js             | 10 ++++++++--
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/mandatory/1-syntax-errors.js b/mandatory/1-syntax-errors.js
index a10cc9ac2..98360ac6b 100644
--- a/mandatory/1-syntax-errors.js
+++ b/mandatory/1-syntax-errors.js
@@ -1,16 +1,17 @@
 // 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;
+  total = a + b;
 
-  return "The total is total";
+  return "The total is " + total;
 }
 
 /* 
diff --git a/mandatory/3-function-output.js b/mandatory/3-function-output.js
index 5a953ba60..dbfea9060 100644
--- a/mandatory/3-function-output.js
+++ b/mandatory/3-function-output.js
@@ -1,4 +1,5 @@
 // Add comments to explain what this function does. You're meant to use Google!
+
 function getRandomNumber() {
   return Math.random() * 10;
 }
@@ -8,9 +9,16 @@ function combine2Words(word1, word2) {
   return word1.concat(word2);
 }
 
+/* The concat() method joins two or more strings.
+
+ The concat() method does not change the existing strings.
+
+ The concat() method returns a new string. */
+
 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 ba77c7ae2..2cbe5a978 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(num1) {
+  let numberWithTax = num1 * 1.2;
+  return numberWithTax;
+}
 
 /*
   CURRENCY FORMATTING
@@ -17,7 +20,10 @@ function calculateSalesTax() {}
   Remember that the prices must include the sales tax (hint: you already wrote a function for this!)
 */
 
-function addTaxAndFormatCurrency() {}
+function addTaxAndFormatCurrency(m2) {
+  total = m2 * 1.2;
+  return "£" + total.toFixed(2);
+}
 
 /* 
 ===================================================

From bbe8061788bf8878d6233fae2d4783fcf7791be2 Mon Sep 17 00:00:00 2001
From: Riyaaz Singh <94745207+Riyaazct@users.noreply.github.com>
Date: Thu, 11 Aug 2022 01:31:51 +0200
Subject: [PATCH 8/8] Create run

---
 run | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 run

diff --git a/run b/run
new file mode 100644
index 000000000..3dcc2280f
--- /dev/null
+++ b/run
@@ -0,0 +1,5 @@
+
+> javascript-core-1-coursework-week1@1.0.0 test
+> jest "--selectProjects" "mandatory" "-" "only" "mandatory" "tests"
+
+Running one project: mandatory