CodeYourFuture · Elenar9 · Feb 18, 2023 · Feb 18, 2023 · Feb 19, 2023 · Feb 21, 2023
diff --git a/js1-week1.js b/js1-week1.js
@@ -0,0 +1,4 @@
+console.log ("Hello Code Your Future");
+console.log("Hello Maha");
+console.log("Hello Megumi");
+console.log("Hello Mohamad");
diff --git 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 "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;
+ let total = a + b;
 
-  return "The total is total";
+  return `The total is 28`;
 }
 
 /* 
@@ -30,8 +31,8 @@ test("addNumbers adds numbers correctly", () => {
 });
 
 test("introduceMe function returns the correct string", () => {
-  expect(introduceMe("Sonjide", 27)).toEqual(
-    "Hello, my name is Sonjide and I am 27 years old"
+  expect(introduceMe("Sonjide", 28)).toEqual(
+    "Hello, my name is Sonjide and I am 28 years old"
   );
 });
 

diff --git a/mandatory/2-logic-error.js b/mandatory/2-logic-error.js
@@ -1,16 +1,16 @@
 // The syntax for these functions is valid but there are some errors, find them and fix them
 
 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;
+
 }
 
 /* 
@@ -19,7 +19,7 @@ function multiply(a, b, c) {
 
 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 2-logic-error` 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!)
 ===================================================
 */

diff --git a/mandatory/3-function-output.js b/mandatory/3-function-output.js
@@ -8,12 +8,16 @@ function combine2Words(word1, word2) {
   return word1.concat(word2);
 }
 
+// dd
+
 function concatenate(firstWord, secondWord, thirdWord) {
+  return (`${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.
 }
 
 /* 
+
 ===================================================
 ======= TESTS - DO NOT MODIFY BELOW THIS LINE =====
 

diff --git a/mandatory/4-tax.js b/mandatory/4-tax.js
@@ -2,10 +2,14 @@
   SALES TAX
   =========
   A business requires a program that calculates how much the price of a product is including sales tax
-  Sales tax is 20% of the price of the product.
+  Sales tax is 20% of the price of the product...
 */
 
-function calculateSalesTax() {}
+function calculateSalesTax(sales) {
+  let tax = sales * 0.2;
+  let total = sales + tax;
+  return total;
+}
 
 /*
   CURRENCY FORMATTING
@@ -17,7 +21,9 @@ function calculateSalesTax() {}
   Remember that the prices must include the sales tax (hint: you already wrote a function for this!)
 */
 
-function addTaxAndFormatCurrency() {}
+function addTaxAndFormatCurrency(sales) {
+  return "£" + calculateSalesTax(sales) .toFixed(2);
+}
 
 /* 
 ===================================================

diff --git a/practice1-1.js b/practice1-1.js
@@ -0,0 +1,3 @@
+let name ="Danny";
+console.log ('Hola ${name}');
+console.log(name);