CodeYourFuture · LN2410 · Jul 5, 2022 · Jul 6, 2022 · Jul 6, 2022 · Jul 13, 2022
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,4 @@
+{
+    "editor.formatOnPaste": true,
+    "editor.formatOnSave": true
+}
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 world, I just started learning Javascript"); //I get a syntax error when I remove quotes
+console.log(12345);
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 = "This is a message 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 message = "Welcome to Code Your Future";
+var name = " Lihle";
 
-console.log(message);
+var greeting = message + name;
+console.log(greeting);
diff --git a/exercises/F-strings-methods/exercise.js b/exercises/F-strings-methods/exercise.js
@@ -1,3 +1,8 @@
 // Start by creating a variable `message`
+var name = "Lihle";
+var message = "My name is " + name;
+var characters = "and my name is";
+var nameLength = name.length;
+var lastPart = "characters long";
 
-console.log(message);
+console.log(message, characters, nameLength, lastPart);
diff --git a/exercises/F-strings-methods/exercise2.js b/exercises/F-strings-methods/exercise2.js
@@ -1,3 +1,8 @@
 const name = " Daniel  ";
+var message = "My name is " + name.trim();
+var characters = "and my name is";
+var nameLength = name.trim().length;
+var lastPart = "characters long";
 
-console.log(message);
+console.log(message, characters, nameLength, lastPart);
+//console.log(message);
diff --git a/exercises/G-numbers/exercise.js b/exercises/G-numbers/exercise.js
@@ -1 +1,6 @@
 // Start by creating a variables `numberOfStudents` and `numberOfMentors`
+var numberOfStudents = 15;
+var numberOfMentors = 8;
+var total = 15 + 8;
+
+console.log("The total number of students and mentors is", total);
diff --git a/exercises/I-floats/exercise.js b/exercises/I-floats/exercise.js
@@ -1,2 +1,10 @@
 var numberOfStudents = 15;
 var numberOfMentors = 8;
+
+var studentPercentage = numberOfStudents/(numberOfStudents+numberOfMentors)*100;
+var mentorPercentage = numberOfMentors/ (numberOfMentors + numberOfStudents) *100;
+
+console.log("Student Percentage:", Math.round(studentPercentage));
+console.log("Mentor Percentage:", Math.round(mentorPercentage));
+
+
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);
 
-console.log(result);
+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,9 +1,10 @@
 // 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`
 var result = multiply(3, 4);
 
-console.log(result);
+console.log(result);
diff --git a/exercises/K-functions-parameters/exercise2.js b/exercises/K-functions-parameters/exercise2.js
@@ -1,5 +1,8 @@
 // Declare your function first
+function divide (a, b){
+    return a / b;
+}
 
 var result = divide(3, 4);
 
-console.log(result);
+console.log(result);
diff --git a/exercises/K-functions-parameters/exercise3.js b/exercises/K-functions-parameters/exercise3.js
@@ -1,5 +1,8 @@
 // Write your function here
+function createGreeting(name){
+    return "Hello, my name is " + name;
+}
 
 var greeting = createGreeting("Daniel");
 
-console.log(greeting);
+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 addNumbers(num1, num2){
+    return num1 + num2;
+}
 
 // Call the function and assign to a variable `sum`
+var sum = addNumbers(13, 124);
 
-console.log(sum);
+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,13 @@ var mentor2 = "Irina";
 var mentor3 = "Mimi";
 var mentor4 = "Rob";
 var mentor5 = "Yohannes";
+
+function spellInCapitalLetters(name) {
+    return `HELLO ${name.toUpperCase()}!`;
+}
+
+console.log(spellInCapitalLetters(mentor1));
+console.log(spellInCapitalLetters(mentor2));
+console.log(spellInCapitalLetters(mentor3));
+console.log(spellInCapitalLetters(mentor4));
+console.log(spellInCapitalLetters(mentor5));
diff --git a/extra/1-currency-conversion.js b/extra/1-currency-conversion.js
@@ -5,8 +5,9 @@
   Write a function that converts a price to USD (exchange rate is 1.4 $ to £)
 */
 
-function convertToUSD() {}
-
+function convertToUSD(price) {
+  return price * 1.4;
+}
 /*
   CURRENCY CONVERSION
   ===================
@@ -15,7 +16,9 @@ function convertToUSD() {}
   They have also decided that they should add a 1% fee to all foreign transactions, which means you only convert 99% of the £ to BRL.
 */
 
-function convertToBRL() {}
+function convertToBRL(price) {
+  return price * 0.57;
+}
 
 /* ======= TESTS - DO NOT MODIFY ===== 
 There are some Tests in this file that will help you work out if your code is working.

diff --git a/mandatory/1-syntax-errors.js b/mandatory/1-syntax-errors.js
@@ -1,16 +1,18 @@
 // 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;
 }
 
 /* 

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
@@ -10,6 +10,7 @@ function combine2Words(word1, word2) {
 
 function concatenate(firstWord, secondWord, thirdWord) {
   // Write the body of this function to concatenate three words together.
+  return firstWord.concat(" " + secondWord).concat(" " + thirdWord);
   // 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,8 +5,9 @@
   Sales tax is 20% of the price of the product.
 */
 
-function calculateSalesTax() {}
-
+function calculateSalesTax(productPrice) {
+  return productPrice * 0.20 + productPrice;
+}
 /*
   CURRENCY FORMATTING
   ===================
@@ -17,7 +18,10 @@ function calculateSalesTax() {}
   Remember that the prices must include the sales tax (hint: you already wrote a function for this!)
 */
 
-function addTaxAndFormatCurrency() {}
+function addTaxAndFormatCurrency(productPrice) {
+  var price = calculateSalesTax(productPrice);
+  return `£${price.toFixed(2)}`;
+}
 
 /* 
 ===================================================