CodeYourFuture · AnthonyMogotlane · Jun 29, 2022 · Jun 29, 2022 · Jun 29, 2022 · Jun 29, 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, I am learning JavaScript!");
diff --git a/exercises/C-variables/exercise.js b/exercises/C-variables/exercise.js
@@ -1,3 +1,6 @@
 // Start by creating a variable `greeting`
+let 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`
+let message = "This is a string";
+let messageDataType = typeof message;
 
 console.log(message);
+console.log(messageDataType);
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`
+let greeting = "Hello, my name is ";
+let fistName = "Anthony";
+let message = greeting + fistName;
 
 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`
+let firstName = "Anthony";
+let firstNameLength = firstName.length;
+let message = `My name is ${firstName} and my name is ${firstNameLength} characters long`;
 
 console.log(message);
diff --git a/exercises/F-strings-methods/exercise2.js b/exercises/F-strings-methods/exercise2.js
@@ -1,3 +1,5 @@
-const name = " Daniel  ";
+const name = " Daniel  ".trim();
+let nameLength = name.length;
+let message = `My name is ${name} and my name is ${nameLength} characters long`;
 
-console.log(message);
+console.log(message.trim());
diff --git a/exercises/G-numbers/README.md b/exercises/G-numbers/README.md
@@ -6,7 +6,7 @@ Unlike strings, numbers do not need to be wrapped in quotes.
 var age = 30;
 ```
 
-You can use mathematical operators to caclulate numbers:
+You can use mathematical operators to calculate numbers:
 
 ```js
 var sum = 10 + 2; // 12
@@ -25,5 +25,5 @@ var difference = 10 - 2; // 8
 ```
 Number of students: 15
 Number of mentors: 8
-Total numnber of students and mentors: 23
+Total number of students and mentors: 23
 ```
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`
+let numberOfStudents = 15;
+let numberOfMentors = 8;
+let total = numberOfStudents + numberOfMentors;
+
+console.log("Number of students:", numberOfStudents);
+console.log("Number of mentors:", numberOfStudents);
+console.log("Total number of students and mentors:", 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;
+
+function percentageCalc(number) {
+    return Math.round((number/(numberOfMentors + numberOfStudents)) * 100) + "%";
+}
+
+console.log("Percentage students: ", percentageCalc( numberOfStudents));
+console.log("Percentage mentors: ", percentageCalc(numberOfMentors));
+
+
+
+
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/README.md b/exercises/K-functions-parameters/README.md
@@ -10,7 +10,7 @@ function add(a, b) {
 
 When you write a function (sometimes called _declaring a function_) you assign names to the parameters inside of the parentheses (`()`). Parameters can be called anything.
 
-This function is exactly the same as the on above:
+This function is exactly the same as the one above:
 
 ```js
 function add(num1, num2) {
@@ -61,7 +61,7 @@ Hello, my name is Daniel
 
 ## Exercise 5
 
-- Write a function that takes a name (a string) and an age (a number) and returns a greeting (a string)
+- Write a function that takes a name (a string) and an age (a number) and returns a greeting (a string);
 
 ## Expected 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,8 @@
 // Declare your function first
-
+function divide(num1, num2) {
+    // Calculate the result of the function and return it
+    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
+var createGreeting = firstName => "Hello, my name is " + firstName;
 
-var greeting = createGreeting("Daniel");
+var greeting = createGreeting("Anthony");
 
 console.log(greeting);
diff --git a/exercises/K-functions-parameters/exercise4.js b/exercises/K-functions-parameters/exercise4.js
@@ -1,5 +1,5 @@
 // Declare your function first
-
+const addNumbers = (num1, num2) => num1 + num2;
 // Call the function and assign to a variable `sum`
-
+let sum = addNumbers(13, 124);
 console.log(sum);
diff --git a/exercises/K-functions-parameters/exercise5.js b/exercises/K-functions-parameters/exercise5.js
@@ -1,5 +1,6 @@
 // Declare your function here
+const createLongGreeting = (firstName, age) => `Hello, my name is ${firstName} and I'm ${age} years old`;
 
-const greeting = createLongGreeting("Daniel", 30);
+const greeting = createLongGreeting("Anthony", 29);
 
 console.log(greeting);
diff --git a/exercises/L-functions-nested/README.md b/exercises/L-functions-nested/README.md
@@ -11,7 +11,7 @@ function getAgeInDays(age) {
 
 function createCreeting(name, age) {
   var ageInDays = getAgeInDays(age);
-  var message =
+  var message = 
     "My Name is " + name + " and I was born over " + ageInDays + " days ago!";
   return message;
 }

diff --git a/exercises/L-functions-nested/exercise.js b/exercises/L-functions-nested/exercise.js
@@ -3,3 +3,15 @@ var mentor2 = "Irina";
 var mentor3 = "Mimi";
 var mentor4 = "Rob";
 var mentor5 = "Yohannes";
+
+// To uppercase function
+const uppercase = firstName => firstName.toUpperCase();
+// Message function
+const message = firstName => {
+    return "HELLO " + uppercase(firstName);
+}
+console.log(message(mentor1));
+console.log(message(mentor2));
+console.log(message(mentor3));
+console.log(message(mentor4));
+console.log(message(mentor5));
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(price) {
+  return price * 1.4;
+}
 
 /*
   CURRENCY CONVERSION
@@ -15,7 +17,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 parseFloat(((price * 0.99) * 5.7).toFixed(2));
+}
 
 /* ======= 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/extra/2-piping.js b/extra/2-piping.js
@@ -16,26 +16,29 @@
   the final result to the variable goodCode
 */
 
-function add() {
-
+function add(num1, num2) {
+  return num1 + num2;
 }
 
-function multiply() {
-
+function multiply(num1, num2) {
+  return num1 * num2;
 }
 
-function format() {
-
+function format(number) {
+  return "£" + number;
 }
 
 const startingValue = 2;
 
 // Why can this code be seen as bad practice? Comment your answer.
-let badCode =
+// It is hard to read
+let badCode = add(startingValue, 10); badCode = multiply(badCode, 2); badCode = format(badCode);
 
 /* BETTER PRACTICE */
 
-let goodCode =
+let goodCode = add(startingValue, 10);
+goodCode = multiply(goodCode, 2);
+goodCode = format(goodCode);
 
 /* ======= 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/extra/3-magic-8-ball.js b/extra/3-magic-8-ball.js
@@ -42,11 +42,23 @@
     Outlook not so good.
     Very doubtful.
 */
+// test runner, jest-extended
+const matchers = require("jest-extended");
+expect.extend(matchers); 
+
+// possible answers arrays
+let veryNegative = ["Don't count on it.", "My reply is no.", "My sources say no.", "Outlook not so good.", "Very doubtful."];
+let negative = ["Reply hazy, try again.", "Ask again later.", "Better not tell you now.", "Cannot predict now.", "Concentrate and ask again."];
+let positive = ["As I see it, yes.", "Most likely.", "Outlook good.", "Yes.", " Signs point to yes."];
+let veryPositive = ["It is certain.", "It is decidedly so.", "Without a doubt.", "Yes - definitely.", "You may rely on it."];  
+let possibleAnswers = veryPositive.concat(positive, negative, veryNegative);
 
 // This should log "The ball has shaken!"
 // and return the answer.
 function shakeBall() {
   //Write your code in here
+  console.log("The ball has shaken!");
+  return possibleAnswers[Math.floor(Math.random() * possibleAnswers.length) + 1];
 }
 
 /* 
@@ -60,6 +72,10 @@ function shakeBall() {
 */
 function checkAnswer(answer) {
   //Write your code in here
+  if (veryPositive.includes(answer)) return "very positive";
+  if (positive.includes(answer)) return "positive";
+  if (negative.includes(answer)) return "negative";
+  if (veryNegative.includes(answer)) return "very negative";
 }
 
 /* 

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";
+  let 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 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 function will return a random number between 0 and less than 10;
 function getRandomNumber() {
   return Math.random() * 10;
 }
 
 // Add comments to explain what this function does. You're meant to use Google!
+// This function will take two words and concatenate them, then return the the words as one 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 + " " + secondWord + " " + thirdWord;
 }
 
 /* 

diff --git a/mandatory/4-tax.js b/mandatory/4-tax.js
@@ -5,19 +5,23 @@
   Sales tax is 20% of the price of the product.
 */
 
-function calculateSalesTax() {}
+function calculateSalesTax(productPrice) {
+  return productPrice + productPrice * .2;
+}
 
 /*
-  CURRENCY FORMATTING
-  ===================
-  The business has informed you that prices must have 2 decimal places
-  They must also start with the currency symbol
-  Write a function that adds tax to a number, and then transforms the total into the format £0.00
+CURRENCY FORMATTING
+===================
+The business has informed you that prices must have 2 decimal places
+They must also start with the currency symbol
+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!)
+Remember that the prices must include the sales tax (hint: you already wrote a function for this!)
 */
 
-function addTaxAndFormatCurrency() {}
+function addTaxAndFormatCurrency(productPrice) {
+  return "£" + (productPrice + productPrice * 0.2).toFixed(2);
+}
 
 /* 
 ===================================================

diff --git a/package.json b/package.json
@@ -4,7 +4,8 @@
   "description": "Exercises for JS1 Week 1",
   "license": "CC-BY-SA-4.0",
   "scripts": {
-    "test": "jest"
+    "test": "jest",
+    "extra-tests": "jest"
   },
   "repository": {
     "type": "git",
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		console.log("Hello world");
		console.log("Hello World, I am learning JavaScript!");