CodeYourFuture · FranklinPTorres · Aug 4, 2022
diff --git a/exercises/B-hello-world/exercise.js b/exercises/B-hello-world/exercise.js
@@ -1 +1 @@
-console.log("Hello world");
+console.log("Hello world. this is my first try");
diff --git a/exercises/C-variables/exercise.js b/exercises/C-variables/exercise.js
@@ -1,3 +1,5 @@
 // Start by creating a variable `greeting`
 
+var greeting = "Hello World!"
+
 console.log(greeting);
diff --git a/exercises/D-strings/exercise.js b/exercises/D-strings/exercise.js
@@ -1,3 +1,7 @@
 // Start by creating a variable `message`
 
+var message = "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 = "Franklin";
 
+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,9 @@
 // Start by creating a variable `message`
+var greetingStart = "Hello my name is Franklin and my name is "
+var name = "Franklin";
+var nameLength = name.length;
+var extraText = " characters long"
+var message = greetingStart + nameLength + extraText;
+
 
 console.log(message);
diff --git a/exercises/F-strings-methods/exercise2.js b/exercises/F-strings-methods/exercise2.js
@@ -1,3 +1,8 @@
-const name = " Daniel  ";
+var greetingStart = "Hello my name is Franklin and my name is "
+var name = "Franklin";
+var nameLength = name.trim;
+var extraText = " characters long"
+var message = greetingStart + nameLength + extraText;
+
 
 console.log(message);
diff --git a/exercises/G-numbers/exercise.js b/exercises/G-numbers/exercise.js
@@ -1 +1,15 @@
 // Start by creating a variables `numberOfStudents` and `numberOfMentors`
+
+var numberOfTrainees = 15 ;
+var trainees ="Number of Trainees "; 
+
+var numberOfMentors = 8;
+var mentors = "Number of Mentors"
+
+var traineesAndMentors = "Total number of Trainees and Mentors "
+
+const total = numberOfTrainees + numberOfMentors
+
+console.log(`${trainees} ${numberOfTrainees}`)
+console.log(`${mentors} ${numberOfMentors}`)
+console.log(`${traineesAndMentors} ${total}`)
diff --git a/exercises/I-floats/README.md b/exercises/I-floats/README.md
@@ -1,4 +1,4 @@
-Numbers can be integers (whole numbers) or floats (numbers with a decimal).
+    Numbers can be integers (whole numbers) or floats (numbers with a decimal).
 
 ```js
 var preciseAge = 30.612437;

diff --git a/exercises/I-floats/exercise.js b/exercises/I-floats/exercise.js
@@ -1,2 +1,19 @@
 var numberOfStudents = 15;
+var student = "Percentage of Students";
+
 var numberOfMentors = 8;
+var mentors = "Percentage of Mentors";
+
+var total = numberOfStudents + numberOfMentors;
+
+var percentageOfStudents = numberOfStudents * 100 / total;
+var percentageOfMentors = numberOfMentors *100 / total;
+
+var roundNumberStudent = Math.round(percentageOfStudents)
+var roundNumberMentors = Math.round(percentageOfMentors)
+
+console.log(`${student} ${roundNumberStudent}%`);
+console.log(`${mentors} ${roundNumberMentors}%`)
+
+
+
diff --git a/exercises/J-functions/exercise.js b/exercises/J-functions/exercise.js
@@ -1,4 +1,5 @@
 function halve(number) {
+  return number / 2;
   // complete the function here
 }
 

diff --git a/exercises/J-functions/exercise2.js b/exercises/J-functions/exercise2.js
@@ -1,4 +1,5 @@
 function triple(number) {
+  return number * 3;
   // complete function here
 }
 

diff --git a/exercises/K-functions-parameters/exercise.js b/exercises/K-functions-parameters/exercise.js
@@ -1,5 +1,6 @@
 // Complete the function so that it takes input parameters
-function multiply() {
+function multiply(a, b) {
+  return a * b;
   // Calculate the result of the function and return it
 }
 

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,10 @@
 // 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,16 @@
+//- Write a function that adds two numbers together
+// - Call the function, passing `13` and `124` as parameters,
+// and assigning the returned value to a variable `sum`
+
 // Declare your function first
 
+function add (a, b){
+    return a + b;
+}
+
+var sum = add(13, 124);
+
+
 // Call the function and assign to a variable `sum`
 
 console.log(sum);
diff --git a/exercises/L-functions-nested/exercise.js b/exercises/L-functions-nested/exercise.js
@@ -1,5 +1,19 @@
+function greetings(mentor) {
 var mentor1 = "Daniel";
 var mentor2 = "Irina";
 var mentor3 = "Mimi";
 var mentor4 = "Rob";
 var mentor5 = "Yohannes";
+
+
+var result = `Hello ${mentor}`
+console.log(result.toUpperCase())
+
+}
+
+
+greetings("Daniel");
+greetings("Irina");
+greetings("Mimi");
+greetings("Rob");
+greetings("Yohannes");
diff --git a/mandatory/1-syntax-errors.js b/mandatory/1-syntax-errors.js
@@ -1,18 +1,30 @@
 // 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;
 }
+var equalty = addNumbers(3, 4, 6);
+console.log(equalty);
+
+function introduceMe(name, age){
+  return `Hello, my name is ${name} and I am ${age} years old`;
+}
+
+var introduce = introduceMe("Sonjide", 27);
+console.log(introduce);
+
 
-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}`;
+
 }
 
+var total = getTotal(23, 5);
+console.log(total);
+
+
 /* 
 ===================================================
 ======= 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
@@ -1,16 +1,19 @@
 // Add comments to explain what this function does. You're meant to use Google!
+//This get a random number that is between 0 (inclusive) and 1 (exclusive)
 function getRandomNumber() {
   return Math.random() * 10;
 }
 
 // Add comments to explain what this function does. You're meant to use Google!
+ //The concat() concatenates the string arguments to calling string and returns in a new 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,13 @@
   Sales tax is 20% of the price of the product.
 */
 
-function calculateSalesTax() {}
+function calculateSalesTax(price) {
+  let taxRate = 0.2;
+  let taxAmount = price * taxRate;
+  let priceAfterTax = price + taxAmount;
+  return priceAfterTax;
+}
+
 
 /*
   CURRENCY FORMATTING
@@ -17,7 +23,10 @@ function calculateSalesTax() {}
   Remember that the prices must include the sales tax (hint: you already wrote a function for this!)
 */
 
-function addTaxAndFormatCurrency() {}
+function addTaxAndFormatCurrency(price) {
+  let priceAfterTax = calculateSalesTax(price);
+  return "£" + priceAfterTax.toFixed(2);
+}
 
 /* 
 ===================================================
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		console.log("Hello world");
		console.log("Hello world. this is my first try");