From 56c33ea0e1b21c6af80c74149e5558320c4f23f3 Mon Sep 17 00:00:00 2001
From: HamedHejjo <77501707+HamedHejjo@users.noreply.github.com>
Date: Wed, 30 Jun 2021 23:46:18 +0300
Subject: [PATCH 1/2]  the homework solved

---
 exercises/B-hello-world/exercise.js           | 3 +++
 exercises/C-variables/exercise.js             | 3 +++
 exercises/D-strings/exercise.js               | 2 ++
 exercises/E-strings-concatenation/exercise.js | 4 +++-
 exercises/F-strings-methods/exercise.js       | 3 ++-
 exercises/F-strings-methods/exercise2.js      | 2 +-
 exercises/G-numbers/exercise.js               | 8 ++++++++
 exercises/I-floats/exercise.js                | 6 ++++++
 exercises/J-functions/exercise.js             | 3 +++
 exercises/J-functions/exercise2.js            | 1 +
 exercises/K-functions-parameters/exercise.js  | 3 ++-
 exercises/K-functions-parameters/exercise2.js | 4 ++++
 exercises/K-functions-parameters/exercise3.js | 5 ++++-
 exercises/K-functions-parameters/exercise4.js | 6 ++++--
 exercises/K-functions-parameters/exercise5.js | 4 +++-
 exercises/L-functions-nested/exercise.js      | 7 +++++++
 mandatory/1-syntax-errors.js                  | 8 ++++----
 mandatory/2-logic-error.js                    | 8 ++++----
 mandatory/3-function-output.js                | 4 ++++
 mandatory/4-tax.js                            | 8 ++++++--
 20 files changed, 74 insertions(+), 18 deletions(-)

diff --git a/exercises/B-hello-world/exercise.js b/exercises/B-hello-world/exercise.js
index b179ee953..3f611e20f 100644
--- a/exercises/B-hello-world/exercise.js
+++ b/exercises/B-hello-world/exercise.js
@@ -1 +1,4 @@
 console.log("Hello world");
+console.log("Hello World. I just started learning JavaScript!");
+console.log(9876);
+console.log(7877);
diff --git a/exercises/C-variables/exercise.js b/exercises/C-variables/exercise.js
index a6bbb9786..319a969d1 100644
--- a/exercises/C-variables/exercise.js
+++ b/exercises/C-variables/exercise.js
@@ -1,3 +1,6 @@
 // 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..853d733c2 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";
 console.log(message);
+console.log(typeof message);
diff --git a/exercises/E-strings-concatenation/exercise.js b/exercises/E-strings-concatenation/exercise.js
index 2cffa6a81..218654de0 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 = "hamed";
+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..eef388d88 100644
--- a/exercises/F-strings-methods/exercise.js
+++ b/exercises/F-strings-methods/exercise.js
@@ -1,3 +1,4 @@
 // Start by creating a variable `message`
 
-console.log(message);
+let message = "My name is hamed and my name is ";
+console.log(message +message.length +"characters long");
diff --git a/exercises/F-strings-methods/exercise2.js b/exercises/F-strings-methods/exercise2.js
index b4b46943d..f8f1c2b6b 100644
--- a/exercises/F-strings-methods/exercise2.js
+++ b/exercises/F-strings-methods/exercise2.js
@@ -1,3 +1,3 @@
 const name = " Daniel  ";
 
-console.log(message);
+console.log(name.trim());
diff --git a/exercises/G-numbers/exercise.js b/exercises/G-numbers/exercise.js
index 49e7bc00b..3d1d003b0 100644
--- a/exercises/G-numbers/exercise.js
+++ b/exercises/G-numbers/exercise.js
@@ -1 +1,9 @@
 // Start by creating a variables `numberOfStudents` and `numberOfMentors`
+let numberOfStudents = 22;
+let numberOfMentors = 5;
+console.log(`Number of students: ${numberOfStudents}`);
+console.log(`Number of mentors: ${numberOfMentors}`);
+console.log(
+  "Total numnber of students and mentors:" +
+    (numberOfStudents + numberOfMentors)
+);
diff --git a/exercises/I-floats/exercise.js b/exercises/I-floats/exercise.js
index a5bbcd852..c3e801089 100644
--- a/exercises/I-floats/exercise.js
+++ b/exercises/I-floats/exercise.js
@@ -1,2 +1,8 @@
 var numberOfStudents = 15;
 var numberOfMentors = 8;
+let total = numberOfStudents + numberOfMentors;
+let perStudent = Math.round((numberOfStudents * 100) / total);
+let perMentor = Math.round((numberOfMentors * 100) / total);
+
+console.log("Percentage students: " + perStudent + "%");
+console.log("Percentage mentors: " + perMentor + "%");
diff --git a/exercises/J-functions/exercise.js b/exercises/J-functions/exercise.js
index 0ae5850e5..d1d2de5c0 100644
--- a/exercises/J-functions/exercise.js
+++ b/exercises/J-functions/exercise.js
@@ -1,7 +1,10 @@
 function halve(number) {
   // complete the function here
+  return number / 2;
 }
 
 var result = halve(12);
+var result2 = halve(50);
 
 console.log(result);
+console.log(result2);
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..44b4a54da 100644
--- a/exercises/K-functions-parameters/exercise2.js
+++ b/exercises/K-functions-parameters/exercise2.js
@@ -1,5 +1,9 @@
 // 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..756d2cad6 100644
--- a/exercises/K-functions-parameters/exercise3.js
+++ b/exercises/K-functions-parameters/exercise3.js
@@ -1,5 +1,8 @@
 // Write your function here
 
-var greeting = createGreeting("Daniel");
+function createGreeting(name) {
+  return "Hello, my name is " + name;
+}
+var greeting = createGreeting("hamed");
 
 console.log(greeting);
diff --git a/exercises/K-functions-parameters/exercise4.js b/exercises/K-functions-parameters/exercise4.js
index 7ab44589e..e329103be 100644
--- a/exercises/K-functions-parameters/exercise4.js
+++ b/exercises/K-functions-parameters/exercise4.js
@@ -1,5 +1,7 @@
 // Declare your function first
-
+function add(x, y) {
+  return x + y;
+}
 // Call the function and assign to a variable `sum`
-
+let 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..75ef0f992 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'm ${age} years`;
+}
 const greeting = createLongGreeting("Daniel", 30);
 
 console.log(greeting);
diff --git a/exercises/L-functions-nested/exercise.js b/exercises/L-functions-nested/exercise.js
index a5d377442..97d59bc43 100644
--- a/exercises/L-functions-nested/exercise.js
+++ b/exercises/L-functions-nested/exercise.js
@@ -1,5 +1,12 @@
+function greeting(name) {
+  return "HELLO " + name.toUpperCase();
+}
 var mentor1 = "Daniel";
 var mentor2 = "Irina";
 var mentor3 = "Mimi";
 var mentor4 = "Rob";
 var mentor5 = "Yohannes";
+console.log(greeting(mentor1));
+console.log(greeting(mentor2));
+console.log(greeting(mentor3));
+console.log(greeting(mentor4));
diff --git a/mandatory/1-syntax-errors.js b/mandatory/1-syntax-errors.js
index a10cc9ac2..4babab9dd 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";
+  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/2-logic-error.js b/mandatory/2-logic-error.js
index 9cca7603b..095dfc684 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;
+  
 }
 
 /* 
diff --git a/mandatory/3-function-output.js b/mandatory/3-function-output.js
index 5a953ba60..4be1a0188 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!
+// Returns a random num from 0 to 9:
 function getRandomNumber() {
   return Math.random() * 10;
 }
 
 // Add comments to explain what this function does. You're meant to use Google!
+//  returns a new string containing the text of the joined strings.
+// output  word1 + word2
 function combine2Words(word1, word2) {
   return word1.concat(word2);
 }
@@ -11,6 +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 + " ").concat((secondWord + " ").concat(thirdWord));
 }
 
 /* 
diff --git a/mandatory/4-tax.js b/mandatory/4-tax.js
index ba77c7ae2..d9600f584 100644
--- a/mandatory/4-tax.js
+++ b/mandatory/4-tax.js
@@ -5,7 +5,9 @@
   Sales tax is 20% of the price of the product.
 */
 
-function calculateSalesTax() {}
+function calculateSalesTax(num) {
+  return num - num * 0.2;
+}
 
 /*
   CURRENCY FORMATTING
@@ -17,7 +19,9 @@ function calculateSalesTax() {}
   Remember that the prices must include the sales tax (hint: you already wrote a function for this!)
 */
 
-function addTaxAndFormatCurrency() {}
+function addTaxAndFormatCurrency(num) {
+  return "£" + calculateSalesTax(num).toFixed(2);
+}
 
 /* 
 ===================================================

From c648016a12db135204f9de4a417c42d11dd8ee4d Mon Sep 17 00:00:00 2001
From: HamedHejjo <77501707+HamedHejjo@users.noreply.github.com>
Date: Thu, 1 Jul 2021 00:17:28 +0300
Subject: [PATCH 2/2] fix ex funcion nested

---
 exercises/L-functions-nested/exercise.js | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/exercises/L-functions-nested/exercise.js b/exercises/L-functions-nested/exercise.js
index 97d59bc43..fa1ef93e3 100644
--- a/exercises/L-functions-nested/exercise.js
+++ b/exercises/L-functions-nested/exercise.js
@@ -1,12 +1,19 @@
-function greeting(name) {
-  return "HELLO " + name.toUpperCase();
-}
 var mentor1 = "Daniel";
 var mentor2 = "Irina";
 var mentor3 = "Mimi";
 var mentor4 = "Rob";
 var mentor5 = "Yohannes";
+
+function nameUpperCase(mentor) {
+  return mentor.toUpperCase();
+}
+
+function greeting(name) {
+  return "HELLO " + nameUpperCase(name);
+}
+
 console.log(greeting(mentor1));
 console.log(greeting(mentor2));
 console.log(greeting(mentor3));
 console.log(greeting(mentor4));
+console.log(greeting(mentor5));