CodeYourFuture · Farnooshmo · Nov 21, 2022 · Nov 23, 2022 · Nov 25, 2022 · Nov 25, 2022
diff --git a/exercises/B-hello-world/exercise.js b/exercises/B-hello-world/exercise.js
@@ -1 +1,10 @@
 console.log("Hello world");
+let greeting ="HEY!";
+console.log(greeting);
+console.log("Hi, A newbie at JavaScript!");
+console.log("Hi, A newbie at JavaScript!");
+console.log("Hi, A newbie at JavaScript!");
+console.log("Hi, A newbie at JavaScript!");
+console.log('Hi, a newbie at JavaACript!');
+console.log(1);
+
diff --git a/exercises/C-variables/exercise.js b/exercises/C-variables/exercise.js
@@ -1,3 +1,6 @@
 // Start by creating a variable `greeting`
-
+var greeting = `Hello guys! Welcome to JavaScript!`;
+console.log(greeting);
 console.log(greeting);
+console.log(greeting);
+
diff --git a/exercises/D-strings/README.md b/exercises/D-strings/README.md
@@ -15,6 +15,7 @@ var message = "This is a string";
 var messageType = typeof message;
 
 console.log(messageType); // logs 'string'
+
 ```
 
 ## Exercise

diff --git a/exercises/D-strings/exercise.js b/exercises/D-strings/exercise.js
@@ -1,3 +1,6 @@
 // Start by creating a variable `message`
-
+var message = "Read the instruction";
+var messageType = typeof message;
 console.log(message);
+console.log(messageType);
+console.log("This is a " + messageType);
diff --git a/exercises/E-strings-concatenation/README.md b/exercises/E-strings-concatenation/README.md
@@ -7,14 +7,21 @@ var name = "Daniel";
 var greeting = greetingStart + name;
 
 console.log(greeting); // Logs "Hello, my name is Daniel"
+
+
 ```
 
 ## Exercise
 
 - Write a program that logs a message with a greeting and your name
 
+var greeting = "Hello! Welcome ";
+var name = "Daniel";
+var greetingSentence = geeting + name;
+
 ## Expected result
 
 ```
+
 Hello, my name is Daniel
 ```
diff --git a/exercises/E-strings-concatenation/exercise.js b/exercises/E-strings-concatenation/exercise.js
@@ -1,3 +1,8 @@
 // Start by creating a variable `message`
-
+var message = "Hello, This is Farnoosh!";
 console.log(message);
+var myName = "Farnoosh";
+var myNameLenght = myName.length;
+console.log(myNameLenght);
+var messageOne = message + " My name is " + myNameLenght + " characters long!";
+console.log(messageOne);
diff --git a/exercises/F-strings-methods/exercise.js b/exercises/F-strings-methods/exercise.js
@@ -1,3 +1,6 @@
-// Start by creating a variable `message`
 
+const message = "Read the instruction!";
+let messageType = typeof message;
 console.log(message);
+console.log(messageType);
+console.log("This is a " + messageType);
diff --git a/exercises/F-strings-methods/exercise2.js b/exercises/F-strings-methods/exercise2.js
@@ -1,3 +1,8 @@
-const name = " Daniel  ";
+const message = "Hello, This is Farnoosh!";
+const myName = "Farnoosh";
+let myNameTrim = myName.trim();
+let myNameLenght = myName.length;
 
-console.log(message);
+let messageTwo = message + " My name is " + myNameLenght + " characters long!";
+console.log(messageTwo);
+console.log(myNameLenght);
diff --git a/exercises/G-numbers/exercise.js b/exercises/G-numbers/exercise.js
@@ -1 +1,14 @@
 // Start by creating a variables `numberOfStudents` and `numberOfMentors`
+var numberOfStudents = 15;
+var numberOfMentors = 8;
+
+students = numberOfStudents;
+mentors = numberOfMentors;
+
+var messageStudent = "Number of students: " + students;
+var MessageMentors = "Number of mentors: " + mentors;
+var totalInClass = students + mentors;
+var messageTotal = "Total number of students and mentors: " + totalInClass;
+console.log(messageStudent);
+console.log(MessageMentors);
+console.log(messageTotal);
diff --git a/exercises/I-floats/exercise.js b/exercises/I-floats/exercise.js
@@ -1,2 +1,15 @@
 var numberOfStudents = 15;
 var numberOfMentors = 8;
+students = numberOfStudents;
+mentors = numberOfMentors;
+
+var totalInClass = students + mentors;
+let percentageOfStudent = (students / totalInClass) * 100;
+let percentageOfStudentRound = Math.round(percentageOfStudent);
+
+console.log("Percentage students: " + percentageOfStudentRound);
+
+let percentageOfMentorsRound = Math.round((mentors / totalInClass) * 100);
+let messagePercentageOfMentors =
+  "Percentage Mentors: " + percentageOfMentorsRound;
+console.log(messagePercentageOfMentors);
diff --git 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);
 
 console.log(result);
+console.log(halve(82));
diff --git 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);

diff --git a/exercises/K-functions-parameters/exercise.js b/exercises/K-functions-parameters/exercise.js
@@ -1,9 +1,9 @@
 // Complete the function so that it takes input parameters
-function multiply() {
-  // Calculate the result of the function and return it
+function multiply(a, b) {
+  return a * b;
 }
 
 // Assign the result of calling the function the variable `result`
-var result = multiply(3, 4);
+let result = multiply(3, 4);
 
 console.log(result);
diff --git 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);
+let result = divide(3, 4);
 
 console.log(result);
diff --git a/exercises/K-functions-parameters/exercise3.js b/exercises/K-functions-parameters/exercise3.js
@@ -1,5 +1,9 @@
-// Write your function here
-
-var greeting = createGreeting("Daniel");
+function createGreeting(name) {
+   const greet = "Hello, my name is ";
+
+  return greet + name;
+
+}
 
+  let greeting = createGreeting("Daniel");
 console.log(greeting);
diff --git 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`
-
+var sum = add(13, 124);
 console.log(sum);
diff --git a/exercises/K-functions-parameters/exercise5.js b/exercises/K-functions-parameters/exercise5.js
@@ -1,4 +1,6 @@
-// Declare your function here
+function createLongGreeting(name, age) {
+  return "Hello, my name is " + name + " and I'm " + age + "years old";
+}
 
 const greeting = createLongGreeting("Daniel", 30);
 

diff --git a/exercises/L-functions-nested/exercise.js b/exercises/L-functions-nested/exercise.js
@@ -3,3 +3,16 @@ var mentor2 = "Irina";
 var mentor3 = "Mimi";
 var mentor4 = "Rob";
 var mentor5 = "Yohannes";
+
+function namesUpperCase(names) {
+  return names.toUpperCase();
+}
+
+function greetingMentors(names) {
+  return `HELLO ${namesUpperCase(names)}`;
+}
+console.log(greetingMentors(mentor1));
+console.log(greetingMentors(mentor2));
+console.log(greetingMentors(mentor3));
+console.log(greetingMentors(mentor4));
+console.log(greetingMentors(mentor5));
diff --git a/extra/1-currency-conversion.js b/extra/1-currency-conversion.js
@@ -5,7 +5,10 @@
   Write a function that converts a price to USD (exchange rate is 1.4 $ to £)
 */
 
-function convertToUSD() {}
+function convertToUSD(price) {
+  let priceInUSD = price * 1.4;
+  return "$" + priceInUSD;
+}
 
 /*
   CURRENCY CONVERSION
@@ -15,7 +18,12 @@ function convertToUSD() {}
   They have also decided that they should add a 1% fee to all foreign transactions, which means you only convert 99% of the £ to BRL.
 */
 
-function convertToBRL() {}
+function convertToBRL(pound) {
+  let convertRate = 0.99 * 5.7 ;
+  let convertReal = pound * convertRate;
+  convertReal = convertReal.toFixed(2);
+  return convertReal;
+}
 
 /* ======= TESTS - DO NOT MODIFY ===== 
 There are some Tests in this file that will help you work out if your code is working.

diff --git a/extra/2-piping.js b/extra/2-piping.js
@@ -16,22 +16,26 @@
   the final result to the variable goodCode
 */
 
-function add() {
+function add(a, b) {
+ return a + b;
+}
 
+function multiply(a, b) {
+return a * b;
 }
 
-function multiply() {
+function format(price) {
 
+return "£" + price;
 }
 
-function format() {
 
-}
+
 
 const startingValue = 2;
 
 // Why can this code be seen as bad practice? Comment your answer.
-let badCode =
+let badCode = 
 
 /* BETTER PRACTICE */
 

diff --git 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";
-
+function introduceMe(name, age) {
+  return "Hello, my name is " + name + " and I am " + age + " years old";
+}
 function getTotal(a, b) {
-  total = a ++ b;
+   const 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
@@ -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
@@ -1,16 +1,18 @@
 // Add comments to explain what this function does. You're meant to use Google!
+//The Math.random() in this function returns a random number between 0 up to 10;
 function getRandomNumber() {
   return Math.random() * 10;
 }
 
 // Add comments to explain what this function does. You're meant to use Google!
+
+// The concat() in this function, joins two strings as a new string;
 function combine2Words(word1, word2) {
-  return word1.concat(word2);
+  return word1.concat(" ", 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, " ", thirdWord);
 }
 
 /* 

diff --git a/mandatory/4-tax.js b/mandatory/4-tax.js
@@ -5,7 +5,10 @@
   Sales tax is 20% of the price of the product.
 */
 
-function calculateSalesTax() {}
+function calculateSalesTax(priceOfProduct) {
+  const salesTax = 0.2 * priceOfProduct;
+  return priceOfProduct + salesTax;
+}
 
 /*
   CURRENCY FORMATTING
@@ -17,7 +20,12 @@ function calculateSalesTax() {}
   Remember that the prices must include the sales tax (hint: you already wrote a function for this!)
 */
 
-function addTaxAndFormatCurrency() {}
+function addTaxAndFormatCurrency(priceOfProduct) {
+  const newLocal = calculateSalesTax(priceOfProduct).toFixed(2);
+  let vat = newLocal;
+  return `£${vat}`;
+}
+console.log(addTaxAndFormatCurrency(17.5));
 
 /* 
 ===================================================
@@ -53,3 +61,7 @@ test("addTaxAndFormatCurrency for £17.50", () => {
 test("addTaxAndFormatCurrency for £34", () => {
   expect(addTaxAndFormatCurrency(34)).toEqual("£40.80");
 });
+function newFunction() {
+  console.log(addTaxAndFormatCurrency(15));
+}
+
diff --git a/package.json b/package.json
@@ -14,15 +14,21 @@
     "url": "https://github.com/CodeYourFuture/JavaScript-Core-1-Coursework-Week1/issues"
   },
   "jest": {
-    "setupFilesAfterEnv": ["jest-extended"],
+    "setupFilesAfterEnv": [
+      "jest-extended"
+    ],
     "projects": [
       {
         "displayName": "mandatory",
-        "testMatch": ["<rootDir>/mandatory/*.js"]
+        "testMatch": [
+          "<rootDir>/mandatory/*.js"
+        ]
       },
       {
         "displayName": "extra",
-        "testMatch": ["<rootDir>/extra/*.js"]
+        "testMatch": [
+          "<rootDir>/extra/*.js"
+        ]
       }
     ]
   },
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,6 +15,7 @@ var message = "This is a string"; @@
     var messageType = typeof message;
     console.log(messageType); // logs 'string'
     ```
     ## Exercise
@@ Expand Down @@