CodeYourFuture · maham511 · Jun 20, 2021 · Jun 20, 2021 · Jun 20, 2021 · Jun 20, 2021
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,6 @@
+{
+    "cSpell.words": [
+        "Sonjide",
+        "wordtrim"
+    ]
+}
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!! :D"
 
 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 = "Message in a bottle";
+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,8 @@
 // Start by creating a variable `message`
 
-console.log(message);
+var greetingStart = "Bonjour, je m'appelle ";
+var myName = "Maha";
+
+var greeting = greetingStart + myName;
+
+console.log(greeting);
diff --git a/exercises/F-strings-methods/exercise.js b/exercises/F-strings-methods/exercise.js
@@ -1,3 +1,13 @@
 // Start by creating a variable `message`
 
+var message;
+var myName = "Maha";
+var nameLength = myName.length;
+message =
+  "My name is " +
+  myName +
+  " and my name is only " +
+  nameLength +
+  " characters long";
+
 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  ";
+const nameTrim = name.trim();
+const nameLength = nameTrim.length;
+
+message =
+  "My name is " + nameTrim + " and my name is " + nameLength + " characters long";
 
 console.log(message);
diff --git a/exercises/G-numbers/exercise.js b/exercises/G-numbers/exercise.js
@@ -1 +1,8 @@
 // Start by creating a variables `numberOfStudents` and `numberOfMentors`
+
+const numberOfStudents = 12;
+const numberOfMentors = 9;
+
+const total = numberOfStudents + numberOfMentors;
+
+console.log(total);
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 = numberOfMentors + numberOfStudents;
+
+var studentPercentage = numberOfStudents / totalNumber * 100;
+var mentorsPercentage = numberOfMentors / totalNumber * 100;
+
+var roundedStudentPercentage = Math.round(studentPercentage);  
+var roundedMentorsPercentage = Math.round(mentorsPercentage);
+
+ console.log("Percentage student: " + roundedStudentPercentage + "%");
+ console.log("Percentage mentors: " + roundedMentorsPercentage + "%");
diff --git a/exercises/J-functions/exercise.js b/exercises/J-functions/exercise.js
@@ -1,5 +1,6 @@
 function halve(number) {
   // complete the function here
+  return number/2;
 }
 
 var result = halve(12);

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(a, b) {
+  return a / b;
+}
 
 var result = divide(3, 4);
 

diff --git a/exercises/K-functions-parameters/exercise3.js b/exercises/K-functions-parameters/exercise3.js
@@ -1,4 +1,7 @@
 // Write your function here
+function createGreeting(name){
+    return `${"Hello, my name is"} ${name}`;
+}
 
 var greeting = createGreeting("Daniel");
 

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 addNum(a, b) {
+  return a + b;
+}
 
 // Call the function and assign to a variable `sum`
+var sum = addNum(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'm"} ${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,34 @@ var mentor2 = "Irina";
 var mentor3 = "Mimi";
 var mentor4 = "Rob";
 var mentor5 = "Yohannes";
+
+//THIS SHOULD WORK!
+function createGreeting(name) {
+  var greeting = `Helloooo ${name}`;
+  return greeting.toUpperCase();
+}
+
+console.log(createGreeting(mentor1));
+console.log(createGreeting(mentor2));
+console.log(createGreeting(mentor3));
+console.log(createGreeting(mentor4));
+// console.log(createGreeting(mentor5));
+
+//UPTO HERE
+
+// // function CreateShoutyGreeting(){
+// //     return createGreeting.toUpperCase();
+// // }
+
+// CREATES ALL CAPS FOR A NAME and logs
+// function createCapName(name){
+//     return name.toUpperCase();
+// }
+// // console.log(createCapName(mentor4));
+
+// function createShoutyGreeting(name){
+//     var message = createCapName(name);
+//     return `Hello ${name}`;
+// }
+// console.log(createShoutyGreeting(mentor4));
+
diff --git a/extra/1-currency-conversion.js b/extra/1-currency-conversion.js
@@ -5,7 +5,9 @@
   Write a function that converts a price to USD (exchange rate is 1.4 $ to £)
 */
 
-function convertToUSD() {}
+function convertToUSD(pounds) {
+  return pounds * 1.4;
+}
 
 /*
   CURRENCY FORMATTING
@@ -15,8 +17,13 @@ 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(pounds) {
+  var brReal = pounds * 5.7;
+  var totalAfterFee = brazReal * 0.99;
+  var totalWithDec = totalAfterFee.toFixed(2);
+  var finalTotalFee = parseFloat(totalWithDec);
+   return finalTotalFee;
+}
 /* ======= 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,16 @@
 // 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";
+  total = a + b;
+  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 getWordLength(word) {
-  return "word".length();
+function getStringLength(word) {
+  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,17 +1,19 @@
-// Add comments to explain what this function does. You're meant to use Google!
+//My Comment - This function gives a random number by using math.random() and multiplying the value by 10  
 function getRandomNumber() {
   return Math.random() * 10;
 }
 
-// Add comments to explain what this function does. You're meant to use Google!
+
+//My comment - The function combines two words using the concat method.
 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} ${secondWord} ${thirdWord}`; 
 }
+/*Can also be written this way:
+   return firstWord + " " + secondWord + " " + thirdWord; */ 
 
 /* 
 ===================================================

diff --git a/mandatory/4-tax.js b/mandatory/4-tax.js
@@ -5,7 +5,9 @@
   Sales tax is 20% of the price of the product.
 */
 
-function calculateSalesTax() {}
+function calculateSalesTax(num) {
+  return num *1.2;    //Adds 20% to number and gives total price including tax
+}
 
 /*
   CURRENCY FORMATTING
@@ -15,9 +17,18 @@ function calculateSalesTax() {}
   Write a function that adds tax to a number, and then transforms the total into the format £0.00
 
   Remember that the prices must include the sales tax (hint: you already wrote a function for this!)
+
 */
 
-function addTaxAndFormatCurrency() {}
+function addTaxAndFormatCurrency(num) {
+   return `£${calculateSalesTax(num).toFixed(2)}`;
+}
+
+//CAN ALSO WRITE THIS WAY:
+// function addTaxAndFormatCurrency(num) {
+//   var totalPrice= `£${calculateSalesTax(num).toFixed(2)}`;
+//   return totalPrice;
+// }
 
 /* 
 ===================================================

diff --git a/package.json b/package.json
@@ -14,7 +14,9 @@
     "url": "https://github.com/CodeYourFuture/JavaScript-Core-1-Coursework-Week1/issues"
   },
   "jest": {
-    "setupFilesAfterEnv": ["jest-extended"]
+    "setupFilesAfterEnv": [
+      "jest-extended"
+    ]
   },
   "homepage": "https://github.com/CodeYourFuture/JavaScript-Core-1-Coursework-Week1#readme",
   "devDependencies": {