CodeYourFuture · m4ndycheung · Feb 17, 2023 · Feb 17, 2023 · Feb 18, 2023 · Feb 18, 2023
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(amountGBP) {
+  return amountGBP * 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(amountGBP) {
+  return Number((0.99 * amountGBP * 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,35 @@
   the final result to the variable goodCode
 */
 
-function add() {
-
+function add(numberOne, numberTwo) {
+  return numberOne + numberTwo;
 }
 
-function multiply() {
-
+function multiply(numberOne, numberTwo) {
+  return numberOne * numberTwo;
 }
 
-function format() {
-
+function format(lonelyNumber) {
+  return `£${lonelyNumber}`;
 }
 
 const startingValue = 2;
 
 // Why can this code be seen as bad practice? Comment your answer.
-let badCode =
+
+// So, I'm not too sure what bad code or good code looks like yet so I wrote this, it seems vague and repetitive:
+// let badCode = add(10, startingValue); badCode = multiply(badCode, 2); badCode = format(badCode);
+
+// Below, I wrote some more of what I interpret bad code to look like too. This way seems complicated for me to read functions nested in others (although not sure if that's down to me being a beginner!):
+let badCode = format(multiply(add(10, startingValue), 2));
+
 
 /* BETTER PRACTICE */
+// This seems clearer as the variables say what they do on the tin.
 
-let goodCode =
+let addNumbers = add(10, startingValue);
+let multiplyNumbers = multiply(2, addNumbers);
+let goodCode = format(multiplyNumbers);
 
 /* ======= 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
@@ -43,10 +43,49 @@
     Very doubtful.
 */
 
+
+let veryPositiveAnswers = [
+    `It is certain.`,
+    `It is decidedly so.`,
+    `Without a doubt.`,
+    `Yes - definitely.`,
+    `You may rely on it.`
+]
+
+let positiveAnswers = [
+    `As I see it, yes.`,
+    `Most likely.`,
+    `Outlook good.`,
+    `Yes.`,
+    `Signs point to yes.`
+]
+
+let negativeAnswers = [
+    `Reply hazy, try again.`,
+    `Ask again later.`,
+    `Better not tell you now.`,
+    `Cannot predict now.`,
+    `Concentrate and ask again.`
+]
+
+let veryNegativeAnswers = [
+    `Don't count on it.`,
+    `My reply is no.`,
+    `My sources say no.`,
+    `Outlook not so good.`,
+    `Very doubtful.`
+]
+
+let allAnswers = veryPositiveAnswers.concat(positiveAnswers, negativeAnswers, veryNegativeAnswers);
+
 // This should log "The ball has shaken!"
 // and return the answer.
-function shakeBall() {
-  //Write your code in here
+function shakeBall() { 
+  let randomAnswer = 0;
+
+  console.log(`The ball has shaken!`);
+  randomAnswer = allAnswers[Math.floor(Math.random() * allAnswers.length)];
+  return randomAnswer;
 }
 
 /* 
@@ -59,7 +98,15 @@ function shakeBall() {
   This function should expect to be called with any value which was returned by the shakeBall function.
 */
 function checkAnswer(answer) {
-  //Write your code in here
+  if (veryPositiveAnswers.includes(answer)) {
+    return `very positive`;
+  } else if (positiveAnswers.includes(answer)) {
+    return `positive`;
+  } else if (negativeAnswers.includes(answer)) {
+    return `negative`;
+  } else if (veryNegativeAnswers.includes(answer)) {
+    return `very negative`;
+  }
 }
 
 /* 

diff --git a/mandatory/1-syntax-errors.js b/mandatory/1-syntax-errors.js
@@ -1,16 +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 "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;
+  let 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 these functions is valid but there are some errors, find them and fix them
 
 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,16 +3,24 @@ function getRandomNumber() {
   return Math.random() * 10;
 }
 
+// This function will return a random number greater than or equal to 0 and less than 10. It will be a decimal. We don't need to pass an argument through this function.
+
 // Add comments to explain what this function does. You're meant to use Google!
 function combine2Words(word1, word2) {
   return word1.concat(word2);
 }
 
+// This function will combine 2 arguments passed through it.
+// In this function, word1 will be combined with word2 in that order as word2 is inside the brackets. The function will return a new string.
+
 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.
 }
 
+// Without the " " the words concatenate without spaces between the words. it returned some wild words. I added " " to the concat function to add spaces.
+
 /* 
 ===================================================
 ======= TESTS - DO NOT MODIFY BELOW THIS LINE =====

diff --git a/mandatory/4-tax.js b/mandatory/4-tax.js
@@ -5,7 +5,10 @@
   Sales tax is 20% of the price of the product.
 */
 
-function calculateSalesTax() {}
+function calculateSalesTax(priceNoTax) {  
+  let salesTaxAdded = priceNoTax * 1.2;
+  return salesTaxAdded;
+}
 
 /*
   CURRENCY FORMATTING
@@ -17,7 +20,12 @@ function calculateSalesTax() {}
   Remember that the prices must include the sales tax (hint: you already wrote a function for this!)
 */
 
-function addTaxAndFormatCurrency() {}
+function addTaxAndFormatCurrency(priceNoTax) {
+  let priceWithTax = calculateSalesTax(priceNoTax);
+  let formattedAmount = priceWithTax.toFixed(2);
+
+  return `£${formattedAmount}`;
+}
 
 /* 
 ===================================================