From d37c3cefa2073b1b3e5fb594706b3ed7aba164fd Mon Sep 17 00:00:00 2001
From: Innapoliakova <113248050+Innapoliakova@users.noreply.github.com>
Date: Wed, 23 Nov 2022 23:10:38 +0000
Subject: [PATCH] Exwrcises+mandatory

Changes
---
 exercises/A-setup-ide/README.md               |  2 +-
 exercises/B-hello-world/exercise.js           |  3 +++
 exercises/C-variables/exercise.js             |  7 ++++++-
 exercises/D-strings/exercise.js               |  6 +++++-
 exercises/E-strings-concatenation/exercise.js |  6 ++++--
 exercises/F-strings-methods/exercise.js       | 11 ++++++++++-
 exercises/F-strings-methods/exercise2.js      |  6 ++++--
 exercises/G-numbers/exercise.js               |  5 +++++
 exercises/I-floats/exercise.js                |  8 ++++++++
 exercises/J-functions/exercise.js             |  4 ++++
 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 |  3 +++
 exercises/K-functions-parameters/exercise4.js |  6 ++++--
 exercises/K-functions-parameters/exercise5.js |  3 +++
 exercises/L-functions-nested/exercise.js      |  7 +++++++
 mandatory/1-syntax-errors.js                  | 11 ++++++-----
 mandatory/2-logic-error.js                    |  7 +++----
 mandatory/3-function-output.js                |  3 +++
 mandatory/4-tax.js                            |  9 +++++++--
 21 files changed, 92 insertions(+), 23 deletions(-)

diff --git a/exercises/A-setup-ide/README.md b/exercises/A-setup-ide/README.md
index de230419b..6ed1511e7 100644
--- a/exercises/A-setup-ide/README.md
+++ b/exercises/A-setup-ide/README.md
@@ -8,6 +8,6 @@ There are some tools that will help you to write code. One of these, [Prettier](
 
 ### 2. Enable formatting on save
 
-- In Visual Studio open the settings file (see https://code.visualstudio.com/docs/getstarted/settings#_creating-user-and-workspace-settings)
+- In Visual Studio open the settings file (see  )
 - Search for `editor format`
 - Set `editor.formatOnSave` and `editor.formatOnPaste` to true
diff --git a/exercises/B-hello-world/exercise.js b/exercises/B-hello-world/exercise.js
index b179ee953..83ae2aee7 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('22');
+console.log(Inna);
diff --git a/exercises/C-variables/exercise.js b/exercises/C-variables/exercise.js
index a6bbb9786..9444dfe9d 100644
--- a/exercises/C-variables/exercise.js
+++ b/exercises/C-variables/exercise.js
@@ -1,3 +1,8 @@
 // Start by creating a variable `greeting`
-
+var 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..9c14a4fa3 100644
--- a/exercises/D-strings/exercise.js
+++ b/exercises/D-strings/exercise.js
@@ -1,3 +1,7 @@
 // Start by creating a variable `message`
-
+let message = 'I am a string';
 console.log(message);
+console.log(typeof message);
+let messegeType = typeof message;
+console.log(messegeType);
+
diff --git a/exercises/E-strings-concatenation/exercise.js b/exercises/E-strings-concatenation/exercise.js
index 2cffa6a81..4b8298db6 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`
-
-console.log(message);
+let greetingStart = 'Hello, my name is ';
+let myName = 'Inna';
+let greeting = greetingStart + myName;
+console.log(greeting);
diff --git a/exercises/F-strings-methods/exercise.js b/exercises/F-strings-methods/exercise.js
index 2cffa6a81..ba56b7957 100644
--- a/exercises/F-strings-methods/exercise.js
+++ b/exercises/F-strings-methods/exercise.js
@@ -1,3 +1,12 @@
 // Start by creating a variable `message`
-
+let message = 'My name is Inna Poliakova  ';
 console.log(message);
+
+let namee = 'Poliakova';
+// let nameeLenght = namee.lenght;
+console.log(namee.length);
+console.log(namee.toLowerCase());
+
+
+
+
diff --git a/exercises/F-strings-methods/exercise2.js b/exercises/F-strings-methods/exercise2.js
index b4b46943d..0566dcca4 100644
--- a/exercises/F-strings-methods/exercise2.js
+++ b/exercises/F-strings-methods/exercise2.js
@@ -1,3 +1,5 @@
-const name = " Daniel  ";
+const myName = " Daniel  ";
+
+console.log(myName);
+console.log(myName.trim());
 
-console.log(message);
diff --git a/exercises/G-numbers/exercise.js b/exercises/G-numbers/exercise.js
index 49e7bc00b..cb4383ee3 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 = 45;
+let numberOfMentors = 7;
+let sum = numberOfMentors + numberOfStudents;
+console.log(sum);
+
diff --git a/exercises/I-floats/exercise.js b/exercises/I-floats/exercise.js
index a5bbcd852..bfd93baae 100644
--- a/exercises/I-floats/exercise.js
+++ b/exercises/I-floats/exercise.js
@@ -1,2 +1,10 @@
 var numberOfStudents = 15;
 var numberOfMentors = 8;
+var procentageStudens = numberOfStudents / (numberOfMentors + numberOfStudents) * 100;
+console.log(procentageStudens);
+var procentageMentors = numberOfMentors / (numberOfMentors + numberOfStudents) * 100;
+console.log(procentageMentors);
+let procentageStudensRound = Math.round(procentageStudens);
+console.log(procentageStudensRound);
+let procentageMentorsRound = Math.round(procentageMentors);
+console.log(procentageMentorsRound);
diff --git a/exercises/J-functions/exercise.js b/exercises/J-functions/exercise.js
index 0ae5850e5..953ab44aa 100644
--- a/exercises/J-functions/exercise.js
+++ b/exercises/J-functions/exercise.js
@@ -1,7 +1,11 @@
 function halve(number) {
   // complete the function here
+  return number / 2;
 }
 
 var result = halve(12);
 
 console.log(result);
+
+var result = halve(50);
+console.log(result);
diff --git a/exercises/J-functions/exercise2.js b/exercises/J-functions/exercise2.js
index 82ef5e780..74eff5ea4 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..a9754224e 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(a,b) {
   // Calculate the result of the function and return it
+  return a * b;
 }
 
 // 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..fe20cef14 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..6bbbb9f51 100644
--- a/exercises/K-functions-parameters/exercise3.js
+++ b/exercises/K-functions-parameters/exercise3.js
@@ -1,4 +1,7 @@
 // Write your function here
+function createGreeting (myName) { 
+    return 'Hello, my name is ' + myName 
+} 
 
 var greeting = createGreeting("Daniel");
 
diff --git a/exercises/K-functions-parameters/exercise4.js b/exercises/K-functions-parameters/exercise4.js
index 7ab44589e..10f962fec 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(a,b) {
+    return a + b;
+}
 // 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..621a75aa0 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 (myName, age) {
+    return 'Hello, my name is ' + myName + " and I'm " + age + ' years old';
+}
 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..fb8927d00 100644
--- a/exercises/L-functions-nested/exercise.js
+++ b/exercises/L-functions-nested/exercise.js
@@ -3,3 +3,10 @@ var mentor2 = "Irina";
 var mentor3 = "Mimi";
 var mentor4 = "Rob";
 var mentor5 = "Yohannes";
+
+function greetingUpperCase () {
+    // var newMentor1 = str.toUpperCase();
+    return 'hello ' + mentor1;
+}
+let greeting = greetingUpperCase();
+console.log(greeting.toUpperCase())
\ No newline at end of file
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/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..08fc6b74d 100644
--- a/mandatory/3-function-output.js
+++ b/mandatory/3-function-output.js
@@ -1,14 +1,17 @@
 // Add comments to explain what this function does. You're meant to use Google!
 function getRandomNumber() {
   return Math.random() * 10;
+  // returns a floating-point, pseudo-random number that's greater than or equal to 0 and less than 1, multiplied by 10
 }
 
 // Add comments to explain what this function does. You're meant to use Google!
 function combine2Words(word1, word2) {
   return word1.concat(word2);
+  // a new string, containing 2 words  
 }
 
 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.
 }
diff --git a/mandatory/4-tax.js b/mandatory/4-tax.js
index ba77c7ae2..f4d384c29 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(price) {
+return price + (price/ 100 * 20);
+}
 
 /*
   CURRENCY FORMATTING
@@ -17,7 +19,10 @@ function calculateSalesTax() {}
   Remember that the prices must include the sales tax (hint: you already wrote a function for this!)
 */
 
-function addTaxAndFormatCurrency() {}
+function addTaxAndFormatCurrency(price) {
+  let salePrise = price + (price/ 100 * 20);
+  return '£'+ salePrise.toFixed(2);
+} 
 
 /* 
 ===================================================