From 2ab91d4cc1e4aac209a0510b55220112e31c1760 Mon Sep 17 00:00:00 2001
From: Mirabela Butiseaca <43749486+Mira-Bela@users.noreply.github.com>
Date: Tue, 29 Jun 2021 11:48:48 +0100
Subject: [PATCH 1/6] c-variables

---
 exercises/B-hello-world/exercise.js | 5 ++++-
 exercises/C-variables/exercise.js   | 4 +++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/exercises/B-hello-world/exercise.js b/exercises/B-hello-world/exercise.js
index b179ee953..ddceacde6 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!");
+
+
+
diff --git a/exercises/C-variables/exercise.js b/exercises/C-variables/exercise.js
index a6bbb9786..7b0cd9dca 100644
--- a/exercises/C-variables/exercise.js
+++ b/exercises/C-variables/exercise.js
@@ -1,3 +1,5 @@
 // Start by creating a variable `greeting`
-
+greeting = " Hello world"
 console.log(greeting);
+console.log(greeting);
+console.log(greeting);
\ No newline at end of file

From 0c102c6282dae7df513493954c58f616129fe88f Mon Sep 17 00:00:00 2001
From: Mirabela Butiseaca <43749486+Mira-Bela@users.noreply.github.com>
Date: Wed, 7 Jul 2021 00:53:33 +0100
Subject: [PATCH 2/6] strings

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

diff --git a/exercises/D-strings/exercise.js b/exercises/D-strings/exercise.js
index 2cffa6a81..e02fb26ea 100644
--- a/exercises/D-strings/exercise.js
+++ b/exercises/D-strings/exercise.js
@@ -1,3 +1,8 @@
 // Start by creating a variable `message`
 
+var message = "This is a string";
+var messageType = typeof message;
+
+console.log(messageType); // logs 'string'
+
 console.log(message);

From 63e810620bac1a9d2d51746653dff570983f10fc Mon Sep 17 00:00:00 2001
From: Mirabela Butiseaca <43749486+Mira-Bela@users.noreply.github.com>
Date: Wed, 4 Aug 2021 17:01:24 +0100
Subject: [PATCH 3/6] exercise-j-functions

---
 exercises/E-strings-concatenation/exercise.js | 9 ++++++++-
 exercises/F-strings-methods/exercise.js       | 5 +++++
 exercises/F-strings-methods/exercise2.js      | 4 +++-
 exercises/G-numbers/exercise.js               | 9 +++++++++
 exercises/I-floats/exercise.js                | 6 ++++++
 exercises/J-functions/exercise.js             | 6 ++++++
 exercises/J-functions/exercise2.js            | 1 +
 exercises/K-functions-parameters/exercise.js  | 3 ++-
 8 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/exercises/E-strings-concatenation/exercise.js b/exercises/E-strings-concatenation/exercise.js
index 2cffa6a81..f93077039 100644
--- a/exercises/E-strings-concatenation/exercise.js
+++ b/exercises/E-strings-concatenation/exercise.js
@@ -1,3 +1,10 @@
 // Start by creating a variable `message`
+var greeting = "Hello, my name is";
+var name = "Daniel";
+
+var message = greeting +" "+ name;
+
+ console.log(message); // Logs "Hello, my name is Daniel"
+
+
 
-console.log(message);
diff --git a/exercises/F-strings-methods/exercise.js b/exercises/F-strings-methods/exercise.js
index 2cffa6a81..e589f85a8 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`
+var name = "Daniel";
+var nameLenght = name.lenght;
 
+console.log(name.Lenght);
+var introWord = "My name is"
+var message = introWord +" "+ name + "and my name is" + name.Lenght + "characters long.";
 console.log(message);
diff --git a/exercises/F-strings-methods/exercise2.js b/exercises/F-strings-methods/exercise2.js
index b4b46943d..39eab8d8a 100644
--- a/exercises/F-strings-methods/exercise2.js
+++ b/exercises/F-strings-methods/exercise2.js
@@ -1,3 +1,5 @@
 const name = " Daniel  ";
+var nameLenght = name.lenght;
+var message = "My name is " + name + " and my name is " + name.lenght + "characters long.";
 
-console.log(message);
+console.log(message.trim());
diff --git a/exercises/G-numbers/exercise.js b/exercises/G-numbers/exercise.js
index 49e7bc00b..711be72db 100644
--- a/exercises/G-numbers/exercise.js
+++ b/exercises/G-numbers/exercise.js
@@ -1 +1,10 @@
 // Start by creating a variables `numberOfStudents` and `numberOfMentors`
+ var numberOfStudents =  15;
+ var numberOfMentors = 8; 
+ var totalNumber = numberOfStudents + numberOfMentors;
+
+ console.log("Number of students:" + " " +  numberOfStudents);
+ console.log("Numbers of mentors:" + " " +  numberOfMentors);
+ console.log("Total number of students and mentors:" + " " + totalNumber);
+
+
diff --git a/exercises/I-floats/exercise.js b/exercises/I-floats/exercise.js
index a5bbcd852..419612422 100644
--- a/exercises/I-floats/exercise.js
+++ b/exercises/I-floats/exercise.js
@@ -1,2 +1,8 @@
 var numberOfStudents = 15;
 var numberOfMentors = 8;
+var totalNumber = numberOfStudents + numberOfMentors;
+var percentageOfStudents = (numberOfStudents/totalNumber)*100;
+var precentageOfMentors = (numberOfMentors/totalNumber)* 100;
+
+console.log(" Percentage students:" + " " + Math.round(percentageOfStudents) + "%");
+console.log(" Percentage mentors:" + " " + Math.round(precentageOfMentors) + "%");
diff --git a/exercises/J-functions/exercise.js b/exercises/J-functions/exercise.js
index 0ae5850e5..a73546894 100644
--- a/exercises/J-functions/exercise.js
+++ b/exercises/J-functions/exercise.js
@@ -1,7 +1,13 @@
 function halve(number) {
   // complete the function here
+  return number /2;
 }
 
 var result = halve(12);
 
 console.log(result);
+
+
+var result = halve(18);
+console.log(result);
+
diff --git a/exercises/J-functions/exercise2.js b/exercises/J-functions/exercise2.js
index 82ef5e780..c9cf12e8c 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..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`

From ce72911f904c80995a5a8dc74f46a04d8a146d02 Mon Sep 17 00:00:00 2001
From: Mirabela Butiseaca <43749486+Mira-Bela@users.noreply.github.com>
Date: Thu, 5 Aug 2021 11:03:43 +0100
Subject: [PATCH 4/6] k-function-parameters

---
 exercises/K-functions-parameters/exercise.js  | 1 +
 exercises/K-functions-parameters/exercise2.js | 4 +++-
 exercises/K-functions-parameters/exercise3.js | 4 +++-
 exercises/K-functions-parameters/exercise4.js | 5 ++++-
 exercises/K-functions-parameters/exercise5.js | 4 +++-
 5 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/exercises/K-functions-parameters/exercise.js b/exercises/K-functions-parameters/exercise.js
index a4eed9d76..ea37b2d9e 100644
--- a/exercises/K-functions-parameters/exercise.js
+++ b/exercises/K-functions-parameters/exercise.js
@@ -8,3 +8,4 @@ function multiply(num1, num2) {
 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..c098934ec 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(num1, num2){
+return num1/num2;
+}
 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..8ae11acd9 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..6f1c958f7 100644
--- a/exercises/K-functions-parameters/exercise4.js
+++ b/exercises/K-functions-parameters/exercise4.js
@@ -1,5 +1,8 @@
 // Declare your function first
-
+function addNumbers(num1, num2){
+    return num1 + num2;
+}
 // Call the function and assign to a variable `sum`
+var sum = addNumbers(13, 124);
 
 console.log(sum);
diff --git a/exercises/K-functions-parameters/exercise5.js b/exercises/K-functions-parameters/exercise5.js
index 7c5bcd605..24f597764 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 "Hi, my name is " + name + " and my age is " + age
+}
 const greeting = createLongGreeting("Daniel", 30);
 
 console.log(greeting);

From c3df9e178a919e102db7c2f43e1f5562b32438f3 Mon Sep 17 00:00:00 2001
From: Mirabela Butiseaca <43749486+Mira-Bela@users.noreply.github.com>
Date: Thu, 5 Aug 2021 13:59:28 +0100
Subject: [PATCH 5/6] mandatory

---
 .vscode/launch.json                      | 17 +++++++++++++++++
 exercises/L-functions-nested/exercise.js | 12 ++++++++++++
 mandatory/1-syntax-errors.js             |  8 ++++----
 mandatory/2-logic-error.js               |  8 ++++----
 mandatory/4-tax.js                       |  8 ++++++--
 5 files changed, 43 insertions(+), 10 deletions(-)
 create mode 100644 .vscode/launch.json

diff --git a/.vscode/launch.json b/.vscode/launch.json
new file mode 100644
index 000000000..eab977d61
--- /dev/null
+++ b/.vscode/launch.json
@@ -0,0 +1,17 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "pwa-node",
+            "request": "launch",
+            "name": "Launch Program",
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
+            "program": "${file}"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/exercises/L-functions-nested/exercise.js b/exercises/L-functions-nested/exercise.js
index a5d377442..918434bb1 100644
--- a/exercises/L-functions-nested/exercise.js
+++ b/exercises/L-functions-nested/exercise.js
@@ -3,3 +3,15 @@ var mentor2 = "Irina";
 var mentor3 = "Mimi";
 var mentor4 = "Rob";
 var mentor5 = "Yohannes";
+
+/*function shoutyGreeting(mentorName){
+    let soutyName = mentorName.toUppercase();
+    console.log("Hello "+ shoutyName);
+
+}
+
+shoutyGreeting(mentor1);
+shoutyGreeting(mentor2);
+shoutyGreeting(mentor3);
+shoutyGreeting(mentor4);
+shoutyGreeting(mentor5);*/
\ No newline at end of file
diff --git a/mandatory/1-syntax-errors.js b/mandatory/1-syntax-errors.js
index a10cc9ac2..fdd68a579 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..49fceab19 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/4-tax.js b/mandatory/4-tax.js
index ba77c7ae2..91b72d4e7 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 totalPrice = price * 0.2;
+  //totalPrice.toFixed(2);
+  //return totalPrice;
+}
 
 /*
   CURRENCY FORMATTING
@@ -25,7 +29,7 @@ function addTaxAndFormatCurrency() {}
 
 There are some Tests in this file that will help you work out if your code is working.
 
-To run the tests for just this one file, type `npm test -- --testPathPattern 4-tax` into your terminal
+To run the tests for just this one file,  type `npm test -- --testPathPattern 4-tax` into your terminal
 (Reminder: You must have run `npm install` one time before this will work!)
 ===================================================
 */

From 603320f012f94f7cebbc58acce58153c3a6afe6d Mon Sep 17 00:00:00 2001
From: Mirabela Butiseaca <43749486+Mira-Bela@users.noreply.github.com>
Date: Thu, 5 Aug 2021 14:10:54 +0100
Subject: [PATCH 6/6] c1week1