CodeYourFuture · sinopungula · Jan 22, 2021 · Jan 22, 2021 · Jan 24, 2021 · Jan 26, 2021
diff --git a/exercises/B-hello-world/exercise.js b/exercises/B-hello-world/exercise.js
@@ -1 +1,16 @@
 console.log("Hello world");
+console.log('Hello World, will this work?');
+
+
+//with multiple things
+
+console.log('thing1', 'thing2'); //prints them both
+
+//with no quotation marks
+
+console.log(may produce an console.error); //produces an error
+
+
+console.log(8); // produces a number
+
+
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 = 'Checking if this is a string';
+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,6 @@
 // Start by creating a variable `message`
+var messageStart = 'Hello, my name is ';
+var name = 'Sino';
 
+var message = messageStart + name;
 console.log(message);
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`
-
+//var message = 'My name is';
+var myName = 'Sinombulelo';
+var myNameLength = myName.length;
+var message = 'My name is ' + myName + ' and it is a whopping ' + myNameLength + ' letters long!';
 console.log(message);
diff --git a/exercises/F-strings-methods/exercise2.js b/exercises/F-strings-methods/exercise2.js
@@ -1,3 +1,6 @@
-const name = " Daniel  ";
+const myName = " Daniel  ";
+var nameTrim = myName.trim();
+var myNameLength = nameTrim.length;
+var message = 'My name is ' + nameTrim + ' and it is a whopping ' + myNameLength + ' letters long!';
 
 console.log(message);
diff --git 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 totalNumbers = numberOfMentors + numberOfStudents;
+
+
+
+sum = numberOfStudents + numberOfMentors;
+console.log(sum);
diff --git a/exercises/I-floats/README.md b/exercises/I-floats/README.md
@@ -13,7 +13,7 @@ var roughAge = Math.round(preciseAge); // 30
 
 ## Exercise
 
-* Using the variables provided in the exercise calculate the percentage of mentors and students in the group
+- Using the variables provided in the exercise calculate the percentage of mentors and students in the group
 
 ## Expected result
 

diff --git a/exercises/I-floats/exercise.js b/exercises/I-floats/exercise.js
@@ -1,2 +1,13 @@
 var numberOfStudents = 15;
 var numberOfMentors = 8;
+var totalNumber = numberOfStudents + numberOfMentors;
+
+console.log(totalNumber);
+
+percentageOfStudents = numberOfStudents * 100 / totalNumber;
+percentageOfMentors = numberOfMentors * 100 / totalNumber;
+
+console.log(Math.round(percentageOfStudents));
+console.log(Math.round(numberOfMentors));
+
+
diff --git a/exercises/J-functions/exercise.js b/exercises/J-functions/exercise.js
@@ -1,7 +1,12 @@
 function halve(number) {
-  // complete the function here
+  return number / 2;
 }
 
 var result = halve(12);
+console.log(result);
+
+var result = halve(20);
+console.log(result);
 
+var result = halve(6);
 console.log(result);
diff --git a/exercises/J-functions/exercise2.js b/exercises/J-functions/exercise2.js
@@ -1,7 +1,11 @@
 function triple(number) {
-  // complete function here
+  return number * 3;
 }
 
 var result = triple(12);
 
 console.log(result);
+
+var result = triple(3);
+console.log(result);
+
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,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
@@ -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
@@ -1,5 +1,9 @@
 // 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,7 @@
 // Declare your function here
+function createLongGreeting(name, age) {
+    return "Hello, my name is " + name + " and I am " + age + " years old.";
+}
 
 const greeting = createLongGreeting("Daniel", 30);
 

diff --git a/exercises/L-functions-nested/exercise.js b/exercises/L-functions-nested/exercise.js
@@ -1,5 +1,17 @@
-var mentor1 = "Daniel";
-var mentor2 = "Irina";
-var mentor3 = "Mimi";
-var mentor4 = "Rob";
-var mentor5 = "Yohannes";
+var mentor1 = greeting("Daniel");
+var mentor2 = greeting("Irina");
+var mentor3 = greeting("Mimi");
+var mentor4 = greeting("Rob");
+var mentor5 = greeting("Yohannes");
+
+function greeting(name) {
+    return 'HELLO ' + name.toUpperCase();
+}
+
+console.log(mentor1);
+console.log(mentor2);
+console.log(mentor3);
+console.log(mentor4);
+console.log(mentor5);
+
+
diff --git a/exercises/L-functions-nested/exercise2.js b/exercises/L-functions-nested/exercise2.js
@@ -0,0 +1,16 @@
+
+
+function percentage(numOfPeople, totalNumOfPeople) {
+    return Math.round((numOfPeople * 100 / totalNumOfPeople));
+}
+
+
+var percentageStudents = percentage(15,23);
+var percentageMentors = percentage(8, 23);
+
+function message() {
+     return(`Percentage Students: ${percentageStudents}
+Percentage Mentors: ${percentageMentors}`);    
+}
+
+console.log(message());
diff --git a/mandatory/1-syntax-errors.js b/mandatory/1-syntax-errors.js
@@ -1,18 +1,21 @@
 // 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;
 }
 
+console.log(getTotal)
+
 /* 
 ===================================================
 ======= TESTS - DO NOT MODIFY BELOW THIS LINE =====

diff --git 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();
+  //var str = word;
+  return word.trim();
 }
 
 function getWordLength(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,19 @@
 // Add comments to explain what this function does. You're meant to use Google!
 function getNumber() {
-  return Math.random() * 10;
-}
+  return Math.random() * 10; 
+} //getNumber will have Math.random() return a random float between 0 (incl.) and 1(excl) and then  is multiplied by 10
+
 
 // Add comments to explain what this function does. You're meant to use Google!
 function s(w1, w2) {
   return w1.concat(w2);
-}
+} //this function takes the first parameter and concatenates(joins) it with the second parameter(w2)
 
 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 + ' ' + secondWord + ' ' + thirdWord;
+  return `${firstWord} ${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) {
+  return parseFloat((price * 0.20) + price);
+
+}
 
 /*
   CURRENCY FORMATTING
@@ -17,8 +20,13 @@ function calculateSalesTax() {}
   Remember that the prices must include the sales tax (hint: you already wrote a function for this!)
 */
 
-function addTaxAndFormatCurrency() {}
+function addTaxAndFormatCurrency(price) {
+  const newPrice = calculateSalesTax(price);
+  return "£" + newPrice.toFixed(2);
+
+}
 
+const { PassThrough } = require("stream");
 /* 
 ===================================================
 ======= TESTS - DO NOT MODIFY BELOW THIS LINE =====