From 1ec16c5a137cc693ebf0822096a9816fe5f5961a Mon Sep 17 00:00:00 2001
From: dotdashdon <80584408+dotdashdon@users.noreply.github.com>
Date: Sat, 7 Aug 2021 17:23:52 +0100
Subject: [PATCH 01/19] Completed Exercise B

---
 exercises/B-hello-world/README.md   | 2 +-
 exercises/B-hello-world/exercise.js | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/exercises/B-hello-world/README.md b/exercises/B-hello-world/README.md
index 8c704fb43..99e7eff57 100644
--- a/exercises/B-hello-world/README.md
+++ b/exercises/B-hello-world/README.md
@@ -7,7 +7,7 @@ Inside of `exercise.js` there's a line of code that will print "Hello world!".
 ### 1. Run the program
 
 - Open a terminal window
-- Change directory to this folder (`cd B-hello-world`)
+- Change directory to this folder
 - Run the program using node (`node exercise.js`)
 
 ### 2. Experiment
diff --git a/exercises/B-hello-world/exercise.js b/exercises/B-hello-world/exercise.js
index b179ee953..a65c38863 100644
--- a/exercises/B-hello-world/exercise.js
+++ b/exercises/B-hello-world/exercise.js
@@ -1 +1,9 @@
 console.log("Hello world");
+//Experiment
+console.log("Hello world. I just started learning Javascript!");
+console.log("This");
+console.log("is");
+console.log("a");
+console.log("drill.");
+
+console.log("hello world");//error shown when run without quotes. 

From 376089e92146da858460583e6881cc3bffa76103 Mon Sep 17 00:00:00 2001
From: dotdashdon <80584408+dotdashdon@users.noreply.github.com>
Date: Sat, 7 Aug 2021 17:30:20 +0100
Subject: [PATCH 02/19] Completed Exercise C

---
 exercises/C-variables/exercise.js | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/exercises/C-variables/exercise.js b/exercises/C-variables/exercise.js
index a6bbb9786..63b0f28ce 100644
--- a/exercises/C-variables/exercise.js
+++ b/exercises/C-variables/exercise.js
@@ -1,3 +1,13 @@
 // Start by creating a variable `greeting`
-
+let greeting ='Hello world';
+console.log(greeting);
+console.log(greeting);
 console.log(greeting);
+
+// Alternative using loop?
+
+let greeting1 ='Hello world';
+
+for(let i = 0; i <3;i++) {
+    console.log(greeting1);
+}
\ No newline at end of file

From 8dff74203b3a86ca4c9adc2f04c4b2de3507f3ab Mon Sep 17 00:00:00 2001
From: dotdashdon <80584408+dotdashdon@users.noreply.github.com>
Date: Sat, 7 Aug 2021 17:33:00 +0100
Subject: [PATCH 03/19] Completed D exercise

---
 exercises/D-strings/exercise.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/exercises/D-strings/exercise.js b/exercises/D-strings/exercise.js
index 2cffa6a81..55ca9d5f5 100644
--- a/exercises/D-strings/exercise.js
+++ b/exercises/D-strings/exercise.js
@@ -1,3 +1,6 @@
 // Start by creating a variable `message`
+let message ="This is my homework";
+let messageType = typeof message;
 
 console.log(message);
+console.log(messageType);

From 8c076f8c4d884e724d2b75db5ea204b3ee4b7123 Mon Sep 17 00:00:00 2001
From: dotdashdon <80584408+dotdashdon@users.noreply.github.com>
Date: Sat, 7 Aug 2021 17:36:09 +0100
Subject: [PATCH 04/19] Completed Exercise E

---
 exercises/E-strings-concatenation/exercise.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/exercises/E-strings-concatenation/exercise.js b/exercises/E-strings-concatenation/exercise.js
index 2cffa6a81..00ae1a4bc 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`
+let greetingOpener = 'Hello my name is ';
+let myName = ' Donna.';
+let greeting = greetingOpener + myName;
 
-console.log(message);
+console.log(greeting);

From fb9159dd7b03907113e1d730f9ccf21174b3e57a Mon Sep 17 00:00:00 2001
From: dotdashdon <80584408+dotdashdon@users.noreply.github.com>
Date: Sat, 7 Aug 2021 17:45:18 +0100
Subject: [PATCH 05/19] Completed exercise F(i).

---
 exercises/F-strings-methods/exercise.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/exercises/F-strings-methods/exercise.js b/exercises/F-strings-methods/exercise.js
index 2cffa6a81..ac36e9c21 100644
--- a/exercises/F-strings-methods/exercise.js
+++ b/exercises/F-strings-methods/exercise.js
@@ -1,3 +1,8 @@
 // Start by creating a variable `message`
+let myName ='Donna';
+let nameLength =myName.length
+console.log(myName.length);
 
-console.log(message);
+console.log(`My name is ${myName} and my name is ${myName.length} characters long.`);
+
+console.log(myName.trim);
\ No newline at end of file

From 73dcd8b669f4023e2979b60bd16db7c4edc57526 Mon Sep 17 00:00:00 2001
From: dotdashdon <80584408+dotdashdon@users.noreply.github.com>
Date: Sat, 7 Aug 2021 17:49:54 +0100
Subject: [PATCH 06/19] Attempted Exercise F(ii)

This would not print to the terminal...
---
 exercises/F-strings-methods/exercise2.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/exercises/F-strings-methods/exercise2.js b/exercises/F-strings-methods/exercise2.js
index b4b46943d..801cfce80 100644
--- a/exercises/F-strings-methods/exercise2.js
+++ b/exercises/F-strings-methods/exercise2.js
@@ -1,3 +1,3 @@
-const name = " Daniel  ";
+let yourName = " My name is Daniel and my name is 6 characters long  ";
 
-console.log(message);
+console.log(yourName.trim);

From 6c72665b77de4d3fb70ddc5f27795586b97e4e56 Mon Sep 17 00:00:00 2001
From: dotdashdon <80584408+dotdashdon@users.noreply.github.com>
Date: Sat, 7 Aug 2021 17:56:03 +0100
Subject: [PATCH 07/19] Completed Exercise G

---
 exercises/G-numbers/exercise.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/exercises/G-numbers/exercise.js b/exercises/G-numbers/exercise.js
index 49e7bc00b..490f1db75 100644
--- a/exercises/G-numbers/exercise.js
+++ b/exercises/G-numbers/exercise.js
@@ -1 +1,6 @@
 // Start by creating a variables `numberOfStudents` and `numberOfMentors`
+
+let numberOfStudents = 15;
+let numberOfMentors = 8;
+
+console.log(`There are ${numberOfStudents} students and ${numberOfMentors} mentors.`);
\ No newline at end of file

From c4ce821c928bfe76cdfcab84a3040c54995702b9 Mon Sep 17 00:00:00 2001
From: dotdashdon <80584408+dotdashdon@users.noreply.github.com>
Date: Sat, 7 Aug 2021 18:51:08 +0100
Subject: [PATCH 08/19] Completed Exercise I

This was quite hard!
---
 exercises/I-floats/exercise.js | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/exercises/I-floats/exercise.js b/exercises/I-floats/exercise.js
index a5bbcd852..8889d987d 100644
--- a/exercises/I-floats/exercise.js
+++ b/exercises/I-floats/exercise.js
@@ -1,2 +1,11 @@
-var numberOfStudents = 15;
-var numberOfMentors = 8;
+let numberOfStudents = 15;
+let numberOfMentors = 8;
+
+let total =numberOfStudents + numberOfMentors;
+console.log(`Total number of students and mentors: ${numberOfStudents + numberOfMentors}`);
+
+let percentageStudents =(100/total)*numberOfStudents;
+console.log(`Percentage of students: ${Math.round(percentageStudents)}`);
+
+let percentageMentors=(100/total)*numberOfMentors;
+console.log(`Percentage of mentors: ${Math.round(percentageMentors)}`);

From d951dd098b32164d7d9779195cfac2e41b3c655f Mon Sep 17 00:00:00 2001
From: dotdashdon <80584408+dotdashdon@users.noreply.github.com>
Date: Sat, 7 Aug 2021 18:51:56 +0100
Subject: [PATCH 09/19] Added % to exercise I

---
 exercises/I-floats/exercise.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/exercises/I-floats/exercise.js b/exercises/I-floats/exercise.js
index 8889d987d..c1dda3f98 100644
--- a/exercises/I-floats/exercise.js
+++ b/exercises/I-floats/exercise.js
@@ -5,7 +5,7 @@ let total =numberOfStudents + numberOfMentors;
 console.log(`Total number of students and mentors: ${numberOfStudents + numberOfMentors}`);
 
 let percentageStudents =(100/total)*numberOfStudents;
-console.log(`Percentage of students: ${Math.round(percentageStudents)}`);
+console.log(`Percentage of students: ${Math.round(percentageStudents)}%`);
 
 let percentageMentors=(100/total)*numberOfMentors;
-console.log(`Percentage of mentors: ${Math.round(percentageMentors)}`);
+console.log(`Percentage of mentors: ${Math.round(percentageMentors)}%`);

From c63d2ff8d8a95086d722919ef782ca8d1c976ba9 Mon Sep 17 00:00:00 2001
From: dotdashdon <80584408+dotdashdon@users.noreply.github.com>
Date: Sat, 7 Aug 2021 19:00:42 +0100
Subject: [PATCH 10/19] Completed Exercise J (i)

---
 exercises/J-functions/exercise.js  | 5 +++--
 exercises/J-functions/exercise2.js | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/exercises/J-functions/exercise.js b/exercises/J-functions/exercise.js
index 0ae5850e5..3d62bf1b3 100644
--- a/exercises/J-functions/exercise.js
+++ b/exercises/J-functions/exercise.js
@@ -1,7 +1,8 @@
 function halve(number) {
-  // complete the function here
+  return number/2;
 }
 
-var result = halve(12);
+let result = halve(12);
 
 console.log(result);
+
diff --git a/exercises/J-functions/exercise2.js b/exercises/J-functions/exercise2.js
index 82ef5e780..a57a8d69a 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 b0d3de44f99e512f5fc2278f0a4a7d472f61300a Mon Sep 17 00:00:00 2001
From: dotdashdon <80584408+dotdashdon@users.noreply.github.com>
Date: Sat, 7 Aug 2021 19:01:45 +0100
Subject: [PATCH 11/19] Update exercise2.js

---
 exercises/J-functions/exercise2.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/exercises/J-functions/exercise2.js b/exercises/J-functions/exercise2.js
index a57a8d69a..40c9b3f88 100644
--- a/exercises/J-functions/exercise2.js
+++ b/exercises/J-functions/exercise2.js
@@ -2,6 +2,6 @@ function triple(number) {
   return number*3;
 }
 
-var result = triple(12);
+let result = triple(12);
 
 console.log(result);

From b09837d428a10c19223da6d42204de121813775f Mon Sep 17 00:00:00 2001
From: dotdashdon <80584408+dotdashdon@users.noreply.github.com>
Date: Sat, 7 Aug 2021 19:09:05 +0100
Subject: [PATCH 12/19] Completed Exercise K(i)

Errant ; made this take longer than necessary.
---
 exercises/K-functions-parameters/exercise.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/exercises/K-functions-parameters/exercise.js b/exercises/K-functions-parameters/exercise.js
index 8d5db5e69..62cabfe8e 100644
--- a/exercises/K-functions-parameters/exercise.js
+++ b/exercises/K-functions-parameters/exercise.js
@@ -1,9 +1,8 @@
 // Complete the function so that it takes input parameters
-function multiply() {
-  // Calculate the result of the function and return it
+function multiply(num1, num2) {
+  return num1 * num2;
 }
 
 // Assign the result of calling the function the variable `result`
-var result = multiply(3, 4);
-
+let result = multiply(3, 4);
 console.log(result);

From b540ef3ba07004fc1d8777b138d6ed54ecd7c20e Mon Sep 17 00:00:00 2001
From: dotdashdon <80584408+dotdashdon@users.noreply.github.com>
Date: Sat, 7 Aug 2021 20:00:33 +0100
Subject: [PATCH 13/19] Completed Ex.K

I found ex. 4 harder than it should have been.
---
 exercises/K-functions-parameters/exercise2.js |  8 ++++++--
 exercises/K-functions-parameters/exercise3.js | 11 +++++++++--
 exercises/K-functions-parameters/exercise4.js |  6 ++++--
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/exercises/K-functions-parameters/exercise2.js b/exercises/K-functions-parameters/exercise2.js
index db7a8904b..df40480a0 100644
--- a/exercises/K-functions-parameters/exercise2.js
+++ b/exercises/K-functions-parameters/exercise2.js
@@ -1,5 +1,9 @@
-// Declare your function first
 
-var result = divide(3, 4);
+function divide(Num1,Num2){
+return Num1/Num2;
+}
+let 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..46d6a4a73 100644
--- a/exercises/K-functions-parameters/exercise3.js
+++ b/exercises/K-functions-parameters/exercise3.js
@@ -1,5 +1,12 @@
-// Write your function here
+//Write your function here
 
-var greeting = createGreeting("Daniel");
+function startGreet(name) {
+return "Hello, my name is " + name.;
+}
+let greeting = startGreet("Daniel")
 
 console.log(greeting);
+
+
+
+
diff --git a/exercises/K-functions-parameters/exercise4.js b/exercises/K-functions-parameters/exercise4.js
index 7ab44589e..e1f6f38e0 100644
--- a/exercises/K-functions-parameters/exercise4.js
+++ b/exercises/K-functions-parameters/exercise4.js
@@ -1,5 +1,7 @@
 // Declare your function first
-
+function sum (num1,num2) {
+    return num1 + num2;
+}
 // Call the function and assign to a variable `sum`
 
-console.log(sum);
+console.log(sum(13, 124));

From f05604c201801141c288a66c8a7823143bf6c529 Mon Sep 17 00:00:00 2001
From: dotdashdon <80584408+dotdashdon@users.noreply.github.com>
Date: Sat, 7 Aug 2021 20:11:14 +0100
Subject: [PATCH 14/19] Completed Ex.K

For some reason I kept creating variables to begin with and this really slowed me down. Long long day...!
---
 exercises/K-functions-parameters/exercise5.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/exercises/K-functions-parameters/exercise5.js b/exercises/K-functions-parameters/exercise5.js
index 7c5bcd605..890c585ff 100644
--- a/exercises/K-functions-parameters/exercise5.js
+++ b/exercises/K-functions-parameters/exercise5.js
@@ -1,4 +1,7 @@
 // Declare your function here
+function createLongGreeting(nom, age) {
+    return `Hello, my name is ${nom} and I am ${age} years old`
+}
 
 const greeting = createLongGreeting("Daniel", 30);
 

From 523c72886111ae967f5583c9f6d4015819990ac7 Mon Sep 17 00:00:00 2001
From: dotdashdon <80584408+dotdashdon@users.noreply.github.com>
Date: Sun, 8 Aug 2021 18:19:15 +0100
Subject: [PATCH 15/19] Exercise L

This took ages and was really confusing. I do not feel this kind of thing was covered in class.
---
 exercises/L-functions-nested/exercise.js | 25 +++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/exercises/L-functions-nested/exercise.js b/exercises/L-functions-nested/exercise.js
index a5d377442..e78516e06 100644
--- a/exercises/L-functions-nested/exercise.js
+++ b/exercises/L-functions-nested/exercise.js
@@ -1,5 +1,20 @@
-var mentor1 = "Daniel";
-var mentor2 = "Irina";
-var mentor3 = "Mimi";
-var mentor4 = "Rob";
-var mentor5 = "Yohannes";
+let mentor1 = " Daniel";
+let mentor2 = " Irina";
+let mentor3 = " Mimi";
+let mentor4 = " Rob";
+let mentor5 = " Yohannes";
+
+function shoutName (mentor) {
+    return mentor.toUpperCase();
+}
+
+function shoutGreeting (mentor) {
+    let greeting = 'HELLO';
+    return greeting  +  shoutName(mentor);
+}
+
+ console.log(shoutGreeting(mentor1));
+ console.log(shoutGreeting(mentor2));
+ console.log(shoutGreeting(mentor3));
+ console.log(shoutGreeting(mentor4));
+ console.log(shoutGreeting(mentor5));

From 5ed636f3b172f62698d09ae665b627298484e963 Mon Sep 17 00:00:00 2001
From: dotdashdon <80584408+dotdashdon@users.noreply.github.com>
Date: Wed, 18 Aug 2021 11:52:14 +0100
Subject: [PATCH 16/19] Complete 1

Corrected syntax errors. Completely overthought this initially as added ${} to the second one.
---
 mandatory/1-syntax-errors.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/mandatory/1-syntax-errors.js b/mandatory/1-syntax-errors.js
index a10cc9ac2..b47145379 100644
--- a/mandatory/1-syntax-errors.js
+++ b/mandatory/1-syntax-errors.js
@@ -1,16 +1,18 @@
 // 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);
 }
 
 /* 

From 03fb0b494d8b0377b8fa9bfc5109aaefcb448792 Mon Sep 17 00:00:00 2001
From: dotdashdon <80584408+dotdashdon@users.noreply.github.com>
Date: Wed, 18 Aug 2021 12:02:30 +0100
Subject: [PATCH 17/19] Update 2-logic-error.js

---
 mandatory/2-logic-error.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mandatory/2-logic-error.js b/mandatory/2-logic-error.js
index 9cca7603b..b3436bbd1 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;
+  return (a * b * c);
+
 }
 
 /* 

From fbd8dd12cbefabbaff9a1047193c8aa459ff8f30 Mon Sep 17 00:00:00 2001
From: dotdashdon <80584408+dotdashdon@users.noreply.github.com>
Date: Wed, 18 Aug 2021 12:13:25 +0100
Subject: [PATCH 18/19] Completed function outputs

struggled with the last one
---
 mandatory/3-function-output.js | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/mandatory/3-function-output.js b/mandatory/3-function-output.js
index 5a953ba60..61835be48 100644
--- a/mandatory/3-function-output.js
+++ b/mandatory/3-function-output.js
@@ -2,17 +2,28 @@
 function getRandomNumber() {
   return Math.random() * 10;
 }
+//Math.random () returns a random number between 0 (inclusive ) and 1 (exclusive); (from W3 schools site)
 
 // Add comments to explain what this function does. You're meant to use Google!
 function combine2Words(word1, word2) {
   return word1.concat(word2);
 }
 
+//concat is a method that joins two or more strings (from W3 schools site)
+
+// function concatenate(firstWord, secondWord, thirdWord) {
+// return 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.
+// }
+
+
 function concatenate(firstWord, secondWord, thirdWord) {
+return firstWord.concat(" ", 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.
 }
-
+//
 /* 
 ===================================================
 ======= TESTS - DO NOT MODIFY BELOW THIS LINE =====

From c8189534a40cd075936c653cf80fe8d6fb34b192 Mon Sep 17 00:00:00 2001
From: dotdashdon <80584408+dotdashdon@users.noreply.github.com>
Date: Wed, 18 Aug 2021 14:00:36 +0100
Subject: [PATCH 19/19] Update 4-tax.js

---
 mandatory/4-tax.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/mandatory/4-tax.js b/mandatory/4-tax.js
index ba77c7ae2..b6207f649 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) {
+let salesTax = 20;
+return price/100*20 
+}
 
 /*
   CURRENCY FORMATTING