CodeYourFuture · MarvinLeeMarshall · Jul 1, 2022 · chezlinbenson · Jul 1, 2022 · chezlinbenson
diff --git a/exercises/B-hello-world/README.md b/exercises/B-hello-world/README.md
@@ -15,4 +15,6 @@ Inside of `exercise.js` there's a line of code that will print "Hello world!".
 - Try to `console.log()` something different. For example, 'Hello World. I just started learning JavaScript!'.
 - Try to console.log() several things at once.
 - What happens when you get rid of the quote marks?
+  I experience a syntax error.
 - What happens when you console.log() just a number without quotes?
+  The number is displayed in console.
diff --git a/exercises/B-hello-world/exercise.js b/exercises/B-hello-world/exercise.js
@@ -1 +1,5 @@
-console.log("Hello world");
+console.log("Hello world I have just started learning java script! :)");
+console.log("My name is Marvin");
+console.log("I love my life");
+
+console.log(8)
diff --git a/exercises/C-variables/exercise.js b/exercises/C-variables/exercise.js
@@ -1,3 +1,3 @@
 // Start by creating a variable `greeting`
-
+var greeting = "Hello There everybody!"
 console.log(greeting);
diff --git a/exercises/D-strings/exercise.js b/exercises/D-strings/exercise.js
@@ -1,3 +1,5 @@
 // Start by creating a variable `message`
+var message = "This is a string";
 
 console.log(message);
+console.log(typeof message)
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 message = "Good day everybody";
+var myName = "my name is Marvin Marshall.";
 
+message = message + myName;
 console.log(message);
diff --git a/exercises/F-strings-methods/exercise.js b/exercises/F-strings-methods/exercise.js
@@ -1,3 +1,4 @@
 // Start by creating a variable `message`
+var message = "My name is Marvin and my name is 6 characters long";
 
 console.log(message);
diff --git a/exercises/F-strings-methods/exercise2.js b/exercises/F-strings-methods/exercise2.js
@@ -1,3 +1,3 @@
-const name = " Daniel  ";
+const name = "My name is Daniel and my name is 6 characters long  ";
 
-console.log(message);
+console.log(name.trim());
diff --git a/exercises/G-numbers/exercise.js b/exercises/G-numbers/exercise.js
@@ -1 +1,5 @@
 // Start by creating a variables `numberOfStudents` and `numberOfMentors`
+var numberOfStudents = 15;
+var numberOfMentors = 8;
+
+console.log(numberOfStudents + numberOfMentors);
diff --git a/exercises/I-floats/exercise.js b/exercises/I-floats/exercise.js
@@ -1,2 +1,18 @@
 var numberOfStudents = 15;
 var numberOfMentors = 8;
+
+var percentSign = "%"
+var total = numberOfStudents + numberOfMentors;
+/*calculation for students*/
+
+var text1 = "Percentage of Students ";
+var percentageOfStudent = numberOfStudents / total * 100;
+var roundNumberForStudent = Math.round(percentageOfStudent)
+
+console.log(text1 + roundNumberForStudent + percentSign);
+
+/*calculation for mentors*/
+var text2 = "Percentage of Mentors ";
+var percentageOfMentor = numberOfMentors / total * 100;
+var roundNumberForMentor = Math.round(percentageOfMentor)
+console.log(text2 + roundNumberForMentor + percentSign);
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(93);
 
 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,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
@@ -1,5 +1,6 @@
-// Write your function here
+function greeting(name){
+    return "Good Morning " + name;
+}
 
-var greeting = createGreeting("Daniel");
-
-console.log(greeting);
+var greet = greeting('Marvin');
+console.log (greet)
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(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,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
@@ -3,3 +3,23 @@ var mentor2 = "Irina";
 var mentor3 = "Mimi";
 var mentor4 = "Rob";
 var mentor5 = "Yohannes";
+
+
+function shoutyGreeting(name){
+    var shouty = "HELLO " ;
+    return shouty + name;
+}
+
+const shoutyGreet1= shoutyGreeting(mentor1);
+const shoutyGreet2= shoutyGreeting(mentor2);
+const shoutyGreet3= shoutyGreeting(mentor3);
+const shoutyGreet4= shoutyGreeting(mentor4);
+const shoutyGreet5= shoutyGreeting(mentor5);
+
+
+
+console.log(shoutyGreet1.toUpperCase());
+console.log(shoutyGreet2.toUpperCase());
+console.log(shoutyGreet3.toUpperCase());
+console.log(shoutyGreet4.toUpperCase());
+console.log(shoutyGreet5.toUpperCase());
diff --git a/mandatory/1-syntax-errors.js b/mandatory/1-syntax-errors.js
@@ -1,18 +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 " + 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;
-
-  return "The total is total";
+  return "The total is " + (a + b);
 }
 
+
 /* 
 ===================================================
 ======= 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();
+  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
@@ -3,12 +3,15 @@ function getRandomNumber() {
   return Math.random() * 10;
 }
 
+//The above function grabs a random number by using the Math.random() method and multiplies that random number by 10.
+
 // Add comments to explain what this function does. You're meant to use Google!
 function combine2Words(word1, word2) {
   return word1.concat(word2);
 }
 
 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.
 }

diff --git 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){
+var tax = 20 / 100;
+var money = price * tax;
+return price + money;
+}
 
 /*
   CURRENCY FORMATTING
@@ -17,7 +21,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){
+var tax = 20 / 100;
+var money = price * tax;
+var calc = price + money;
+return "£" + calc.toFixed(2);
+
+}
 
 /* 
 ===================================================