CodeYourFuture · chezlinbenson · Jul 1, 2022 · Jul 1, 2022 · Aug 12, 2022
diff --git 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(Hello);
+console.log(5);
diff --git a/exercises/C-variables/README.md b/exercises/C-variables/README.md
@@ -15,7 +15,8 @@ The program above will print "Hello world" to the console. Notice how it uses th
 - Add a variable `greeting` to exercise.js (make sure it comes _before_ the console.log)
 - Print your `greeting` to the console 3 times
 
-> Remember: to run this exercise you must change directory to the `C-variables`. If you already have a terminal window open for the previous exercise you can do this by running the command `cd ../C-variables`.
+> Remember: to run 
+this exercise you must change directory to the `C-variables`. If you already have a terminal window open for the previous exercise you can do this by running the command `cd ../C-variables`.
 
 ## Expected result
 

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 world";
 
 console.log(greeting);
+console.log(greeting);
+console.log(greeting);
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 = "I like strings";
+var messageType = typeof message;
 
 console.log(message);
+console.log(messageType);
diff --git a/exercises/E-strings-concatenation/exercise.js b/exercises/E-strings-concatenation/exercise.js
@@ -1,3 +1,7 @@
 // Start by creating a variable `message`
+var greetingStart = "Hello, my name is ";
+var name = "Chezlin";
 
-console.log(message);
+var greeting = greetingStart + name;
+
+console.log(greeting);
diff --git a/exercises/F-strings-methods/exercise.js b/exercises/F-strings-methods/exercise.js
@@ -1,3 +1,11 @@
 // Start by creating a variable `message`
+var name = "Chezlin";
+var nameLength = name.length;
+var greeting =
+  "Hello, my name is " +
+  name +
+  " and my name is " +
+  nameLength +
+  " characters long";
 
-console.log(message);
+console.log(greeting);
diff --git a/exercises/F-strings-methods/exercise2.js b/exercises/F-strings-methods/exercise2.js
@@ -1,3 +1,7 @@
-const name = " Daniel  ";
+const name = " Daniel  ".trim();
+// var nameTrim = name;
+var nameLength = name.length;
+var greeting =
+  "My name is " + name + " and my name is " + nameLength + " characters long ";
 
-console.log(message);
+console.log(greeting);
diff --git a/exercises/G-numbers/exercise.js b/exercises/G-numbers/exercise.js
@@ -1 +1,16 @@
 // Start by creating a variables `numberOfStudents` and `numberOfMentors`
+var numberOfStudents = 5;
+var numberOfMentors = 7;
+var total = numberOfStudents + numberOfMentors;
+
+var display =
+  "Number of students: " +
+  numberOfStudents +
+  "\n" +
+  "Number of mentors: " +
+  numberOfMentors +
+  "\n" +
+  "Total number of students and mentors: " +
+  total;
+
+console.log(display);
diff --git a/exercises/I-floats/exercise.js b/exercises/I-floats/exercise.js
@@ -1,2 +1,15 @@
-var numberOfStudents = 15;
-var numberOfMentors = 8;
+var numberOfStudents = 15.386;
+var numberOfMentors = 74.78;
+
+var getPercentageOfStudents = Math.round(numberOfStudents);
+var getPercentageOfMentors = Math.round(numberOfMentors);
+
+display =
+  "Percentage students: " +
+  getPercentageOfStudents +
+  "%" +
+  "\n" +
+  "Percentage mentors: " +
+  getPercentageOfMentors +
+  "%";
+console.log(display);
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);
+var result = halve(4);
 
 console.log(result);
diff --git 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
@@ -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`

diff --git a/exercises/K-functions-parameters/exercise2.js b/exercises/K-functions-parameters/exercise2.js
@@ -1,4 +1,7 @@
 // Declare your function first
+function divide(num1, num2) {
+  return num1 / num2;
+}
 
 var result = divide(3, 4);
 

diff --git 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");
+var createGreeting = "Hello, my name is ";
+var name = "Daniel";
 
-console.log(greeting);
+// var greeting = createGreeting("Daniel")
+
+console.log(createGreeting + name);
diff --git a/exercises/K-functions-parameters/exercise4.js b/exercises/K-functions-parameters/exercise4.js
@@ -1,5 +1,10 @@
 // Declare your function first
+function add(num1, num2) {
+  return num1 + num2;
+}
 
 // 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,5 +1,9 @@
 // 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);
 
 console.log(greeting);
diff --git a/exercises/L-functions-nested/exercise.js b/exercises/L-functions-nested/exercise.js
@@ -3,3 +3,17 @@ var mentor2 = "Irina";
 var mentor3 = "Mimi";
 var mentor4 = "Rob";
 var mentor5 = "Yohannes";
+
+function nameToUpperCase(upperText) {
+  return upperText.toUpperCase();
+}
+
+function greet(mentor1, mentor2, mentor3, mentor4, mentor5) {
+  console.log(nameToUpperCase("Hi there " + mentor1));
+  console.log(nameToUpperCase("Hi there " + mentor2));
+  console.log(nameToUpperCase("Hi there " + mentor3));
+  console.log(nameToUpperCase("Hi there " + mentor4));
+  console.log(nameToUpperCase("Hi there " + mentor5));
+}
+
+greet(mentor1, mentor2, mentor3, mentor4, mentor5);
diff --git a/mandatory/1-syntax-errors.js b/mandatory/1-syntax-errors.js
@@ -1,17 +1,19 @@
 // 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;
 }
+//Testing if REPO works
 
 /* 
 ===================================================

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,24 @@
 // Add comments to explain what this function does. You're meant to use Google!
+
+//(pseudorandom number generator) is an algorithm that outputs numbers in a complex, seemingly unpredictable pattern…
+
 function getRandomNumber() {
   return Math.random() * 10;
 }
 
 // Add comments to explain what this function does. You're meant to use Google!
+
+//. A concat () method is method to combine two strings .
+//Number of arguments. In concat () method,takes only one argument of string and concatenate it with another string. ...
+
 function combine2Words(word1, 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(price) {
+  let tax = price * 0.2;
+  return price + tax;
+}
 
 /*
   CURRENCY FORMATTING
@@ -17,7 +20,9 @@ function calculateSalesTax() {}
   Remember that the prices must include the sales tax (hint: you already wrote a function for this!)
 */
 
-function addTaxAndFormatCurrency() {}
+function addTaxAndFormatCurrency(amount) {
+  return "£" + calculateSalesTax(amount).toFixed(2);
+}
 
 /* 
 ===================================================

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"
+        ]
       }
     ]
   },