From 6def9c88e047bffad3d1f7c63c0db1ac098a6a5b Mon Sep 17 00:00:00 2001
From: Joanna <105747071+joannajurczuk94@users.noreply.github.com>
Date: Sun, 31 Jul 2022 12:26:53 +0100
Subject: [PATCH 1/3] Mandatory_excercises_completed

---
 mandatory/1-syntax-errors.js   | 11 +++++------
 mandatory/2-logic-error.js     |  7 +++----
 mandatory/3-function-output.js |  5 +++++
 mandatory/4-tax.js             | 16 ++++++++++++++--
 4 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/mandatory/1-syntax-errors.js b/mandatory/1-syntax-errors.js
index a10cc9ac2..d665caa5f 100644
--- a/mandatory/1-syntax-errors.js
+++ b/mandatory/1-syntax-errors.js
@@ -1,16 +1,15 @@
 // 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";
+  return "The total is" + (a+b);
 }
 
 /* 
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..ef930ffd0 100644
--- a/mandatory/3-function-output.js
+++ b/mandatory/3-function-output.js
@@ -1,9 +1,12 @@
 // Add comments to explain what this function does. You're meant to use Google!
+// The function below takes a random number using Math.random () and multiplies it by 10
+
 function getRandomNumber() {
   return Math.random() * 10;
 }
 
 // Add comments to explain what this function does. You're meant to use Google!
+//function below combines two arguments
 function combine2Words(word1, word2) {
   return word1.concat(word2);
 }
@@ -11,6 +14,8 @@ function combine2Words(word1, word2) {
 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 + "" + secondWord + "" + thirdWord;
+
 }
 
 /* 
diff --git a/mandatory/4-tax.js b/mandatory/4-tax.js
index ba77c7ae2..d61701b47 100644
--- a/mandatory/4-tax.js
+++ b/mandatory/4-tax.js
@@ -5,7 +5,13 @@
   Sales tax is 20% of the price of the product.
 */
 
-function calculateSalesTax() {}
+function calculateSalesTax(productPrice) {
+  let productTax = productPrice * 0.2;
+  return productTax;
+}
+
+//Function Test
+console.log(calculateSalesTax(100));
 
 /*
   CURRENCY FORMATTING
@@ -17,7 +23,13 @@ function calculateSalesTax() {}
   Remember that the prices must include the sales tax (hint: you already wrote a function for this!)
 */
 
-function addTaxAndFormatCurrency() {}
+function addTaxAndFormatCurrency(productPrice) {
+  let productTax = productPrice * 0.2;
+  return "£" + (productTax + productPrice).toFixed(2);
+}
+
+//Function Test
+console.log(addTaxAndFormatCurrency(100));
 
 /* 
 ===================================================

From 48d8d05b8e769110c569f949c2542359d2e88fcc Mon Sep 17 00:00:00 2001
From: Joanna <105747071+joannajurczuk94@users.noreply.github.com>
Date: Thu, 4 Aug 2022 17:57:29 +0100
Subject: [PATCH 2/3] exercises_finished

---
 exercises/B-hello-world/README.md             |  4 ++--
 exercises/B-hello-world/exercise.js           |  4 +++-
 exercises/C-variables/exercise.js             |  4 +++-
 exercises/D-strings/exercise.js               |  6 ++++++
 exercises/E-strings-concatenation/exercise.js |  4 +++-
 exercises/F-strings-methods/exercise.js       |  5 ++++-
 exercises/F-strings-methods/exercise2.js      | 10 ++++++++--
 exercises/G-numbers/exercise.js               |  7 +++++++
 exercises/I-floats/exercise.js                | 11 +++++++++++
 exercises/J-functions/exercise.js             |  3 ++-
 exercises/J-functions/exercise2.js            |  2 +-
 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 |  8 ++++++--
 exercises/K-functions-parameters/exercise5.js | 17 ++++++++++++++++-
 exercises/L-functions-nested/exercise.js      | 15 +++++++++++++++
 17 files changed, 96 insertions(+), 16 deletions(-)

diff --git a/exercises/B-hello-world/README.md b/exercises/B-hello-world/README.md
index 27282c4af..b47f26503 100644
--- a/exercises/B-hello-world/README.md
+++ b/exercises/B-hello-world/README.md
@@ -14,5 +14,5 @@ Inside of `exercise.js` there's a line of code that will print "Hello world!".
 
 - Try to `console.log()` something different. For example, 'Hello World. I just started learning JavaScript!'.
 - Try to console.log() several things at once.
-- What happens when you get rid of the quote marks?
-- What happens when you console.log() just a number without quotes?
+- What happens when you get rid of the quote marks? - SyntaxError appears
+- What happens when you console.log() just a number without quotes? - The Number is displayed
diff --git a/exercises/B-hello-world/exercise.js b/exercises/B-hello-world/exercise.js
index b179ee953..13381e9ce 100644
--- a/exercises/B-hello-world/exercise.js
+++ b/exercises/B-hello-world/exercise.js
@@ -1 +1,3 @@
-console.log("Hello world");
+
+console.log(1);
+console.log("Hello World. I just started learning JavaScript!");
\ No newline at end of file
diff --git a/exercises/C-variables/exercise.js b/exercises/C-variables/exercise.js
index a6bbb9786..9fd6c22e0 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..0b66c4817 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 = "This is a string";
+var messageType = typeof message;
+console.log(message);
 
+var message = "string";
+var messageType = typeof message;
 console.log(message);
+ 
diff --git a/exercises/E-strings-concatenation/exercise.js b/exercises/E-strings-concatenation/exercise.js
index 2cffa6a81..05e903abf 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 greetingStart = "Hello, my name is ";
+var name = "Joanna";
+var message = greetingStart + name;
 console.log(message);
diff --git a/exercises/F-strings-methods/exercise.js b/exercises/F-strings-methods/exercise.js
index 2cffa6a81..b003fb269 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`
 
-console.log(message);
+var name ="Joanna";
+var nameLength = name.length;
+var message = "My name is Joanna and my name is " + nameLength + " characters long"; 
+console.log(message);
\ No newline at end of file
diff --git a/exercises/F-strings-methods/exercise2.js b/exercises/F-strings-methods/exercise2.js
index b4b46943d..4aa12a264 100644
--- a/exercises/F-strings-methods/exercise2.js
+++ b/exercises/F-strings-methods/exercise2.js
@@ -1,3 +1,9 @@
-const name = " Daniel  ";
+const name = "Daniel";
+let nameLength = name.length;
+let message = "Hello, my name is ";
+
+console.log(
+    `${message.trim()} ${name.trim()} 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..2a86a59d0 100644
--- a/exercises/G-numbers/exercise.js
+++ b/exercises/G-numbers/exercise.js
@@ -1 +1,8 @@
 // Start by creating a variables `numberOfStudents` and `numberOfMentors`
+let numberOfStudents = 15;
+let numberOfMentors = 8;
+console.log(`Number of students: ${numberOfStudents}`);
+console.log(`Number of mentors: ${numberOfMentors}`);
+console.log(
+  `Total number of students and mentors : ${(numberOfStudents +numberOfMentors)}`
+);
\ No newline at end of file
diff --git a/exercises/I-floats/exercise.js b/exercises/I-floats/exercise.js
index a5bbcd852..8dfc75cae 100644
--- a/exercises/I-floats/exercise.js
+++ b/exercises/I-floats/exercise.js
@@ -1,2 +1,13 @@
 var numberOfStudents = 15;
 var numberOfMentors = 8;
+console.log(
+  `Percentage students: ${Math.round(
+    (numberOfStudents / (numberOfStudents + numberOfMentors)) * 100
+  )} %`
+);
+
+console.log(
+  `Percentage mentors: ${Math.round(
+    (numberOfMentors / (numberOfStudents + numberOfMentors))*100
+  )} %`
+);
\ No newline at end of file
diff --git a/exercises/J-functions/exercise.js b/exercises/J-functions/exercise.js
index 0ae5850e5..4eaa285b4 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;   // complete the function here
 }
 
 var result = halve(12);
 
 console.log(result);
+
diff --git a/exercises/J-functions/exercise2.js b/exercises/J-functions/exercise2.js
index 82ef5e780..d55548a3b 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;  // complete function here
 }
 
 var result = triple(12);
diff --git a/exercises/K-functions-parameters/exercise.js b/exercises/K-functions-parameters/exercise.js
index 8d5db5e69..4375e3da8 100644
--- a/exercises/K-functions-parameters/exercise.js
+++ b/exercises/K-functions-parameters/exercise.js
@@ -1,5 +1,6 @@
 // Complete the function so that it takes input parameters
-function multiply() {
+function multiply(a, b) {
+  return a * b;
   // Calculate the result of the function and return it
 }
 
@@ -7,3 +8,4 @@ function multiply() {
 var result = multiply(3, 4);
 
 console.log(result);
+
diff --git a/exercises/K-functions-parameters/exercise2.js b/exercises/K-functions-parameters/exercise2.js
index db7a8904b..6839e8684 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..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..40d6d9be1 100644
--- a/exercises/K-functions-parameters/exercise4.js
+++ b/exercises/K-functions-parameters/exercise4.js
@@ -1,5 +1,9 @@
 // Declare your function first
-
+function add (a,b) {
+    return a + b;
+}
 // 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..a67755cf5 100644
--- a/exercises/K-functions-parameters/exercise5.js
+++ b/exercises/K-functions-parameters/exercise5.js
@@ -1,5 +1,20 @@
 // Declare your function here
-
+function createLongGreeting (name, age) {
+  return "Hello, my name is " + name + "and I'm " + age + " old";
+}
 const greeting = createLongGreeting("Daniel", 30);
 
 console.log(greeting);
+
+
+
+
+//## Exercise 5
+
+//- Write a function that takes a name (a string) and an age (a number) and returns a greeting (a string)
+
+//## Expected result
+
+
+//Hello, my name is Daniel and I'm 30 years old
+
diff --git a/exercises/L-functions-nested/exercise.js b/exercises/L-functions-nested/exercise.js
index a5d377442..7a24b4ba2 100644
--- a/exercises/L-functions-nested/exercise.js
+++ b/exercises/L-functions-nested/exercise.js
@@ -3,3 +3,18 @@ var mentor2 = "Irina";
 var mentor3 = "Mimi";
 var mentor4 = "Rob";
 var mentor5 = "Yohannes";
+
+function capitalize(name) {
+  return name.toUpperCase();
+}
+
+function greeting(name) {
+  let mentor = capitalize(name);
+  return "HELLO " + mentor;
+}
+
+console.log(greeting(mentor1));
+console.log(greeting(mentor2));
+console.log(greeting(mentor3));
+console.log(greeting(mentor4));
+console.log(greeting(mentor5));

From 077c5f04d7da18e811f0dd6b1cb47c71dc494703 Mon Sep 17 00:00:00 2001
From: Joanna <105747071+joannajurczuk94@users.noreply.github.com>
Date: Thu, 11 Aug 2022 16:32:06 +0100
Subject: [PATCH 3/3] Code.Fixed

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

diff --git a/mandatory/1-syntax-errors.js b/mandatory/1-syntax-errors.js
index d665caa5f..6efdfb7a0 100644
--- a/mandatory/1-syntax-errors.js
+++ b/mandatory/1-syntax-errors.js
@@ -5,11 +5,11 @@ function addNumbers(a, b, c) {
 }
 
 function introduceMe(name, age){
-  return "Hello, my name is " + name + " and I am " + age + "years old";
+  return "Hello, my name is " + name + " and I am " + age + " years old";
 }
 
 function getTotal(a, b) {
-  return "The total is" + (a+b);
+  return "The total is " + (a+b);
 }
 
 /* 
diff --git a/mandatory/3-function-output.js b/mandatory/3-function-output.js
index ef930ffd0..3b7d213db 100644
--- a/mandatory/3-function-output.js
+++ b/mandatory/3-function-output.js
@@ -14,7 +14,7 @@ function combine2Words(word1, word2) {
 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 + "" + secondWord + "" + thirdWord;
+return firstWord+" "+secondWord +" "+thirdWord;
 
 }
 
diff --git a/mandatory/4-tax.js b/mandatory/4-tax.js
index d61701b47..37b7f3368 100644
--- a/mandatory/4-tax.js
+++ b/mandatory/4-tax.js
@@ -6,8 +6,8 @@
 */
 
 function calculateSalesTax(productPrice) {
-  let productTax = productPrice * 0.2;
-  return productTax;
+  productAndTax = (productPrice*20/100) + productPrice;
+  return productAndTax;
 }
 
 //Function Test
@@ -24,8 +24,8 @@ console.log(calculateSalesTax(100));
 */
 
 function addTaxAndFormatCurrency(productPrice) {
-  let productTax = productPrice * 0.2;
-  return "£" + (productTax + productPrice).toFixed(2);
+ productAndTax = ((productPrice*20/100)+productPrice);
+  return "£" + productAndTax.toFixed(2);
 }
 
 //Function Test