Skip to content
This repository was archived by the owner on Jan 14, 2024. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions extra/1-currency-conversion.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@
Write a function that converts a price to USD (exchange rate is 1.4 $ to £)
*/

function convertToUSD() {}
function convertToUSD(priceInGBP) {
var priceInUSD = priceInGBP * 1.4;
return priceInUSD;
}

/*
CURRENCY CONVERSION
Expand All @@ -15,7 +18,10 @@ 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(priceInGBP) {
var priceInBRL = (priceInGBP * 5.7) * 0.99;
return priceInBRL;
}

/* ======= TESTS - DO NOT MODIFY =====
There are some Tests in this file that will help you work out if your code is working.
Expand Down
18 changes: 10 additions & 8 deletions extra/2-piping.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,26 +16,28 @@
the final result to the variable goodCode
*/

function add() {

function add(a, b) {
return a + b;
}

function multiply() {

function multiply(a, b) {
return a * b;
}

function format() {

function format(format) {
var format = "£" + format;
return format;
}

const startingValue = 2;

// Why can this code be seen as bad practice? Comment your answer.
let badCode =
let badCode = (startingValue + 10) * 2; return format+badCode; // because it's hard to read

/* BETTER PRACTICE */

let goodCode =
let goodCode = (startingValue + 10) * 2;
return format + goodCode;

/* ======= TESTS - DO NOT MODIFY =====
There are some Tests in this file that will help you work out if your code is working.
Expand Down
12 changes: 10 additions & 2 deletions extra/3-magic-8-ball.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
// This should log "The ball has shaken!"
// and return the answer.
function shakeBall() {
//Write your code in here
console.log("The ball has shaken!");
}

/*
Expand All @@ -59,7 +59,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";
}
}

/*
Expand Down
12 changes: 6 additions & 6 deletions mandatory/1-syntax-errors.js
Original file line number Diff line number Diff line change
@@ -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) {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

are you using prettier formatter to format your code on save? I recommend it, as it will fix issues like this where the space should be after the comma not before

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}`;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great use of interpolation

}

/*
Expand Down
9 changes: 5 additions & 4 deletions mandatory/2-logic-error.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
// 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();
let length = word.length
return length;
}

function multiply(a, b, c) {
a * b * c;
return;
let m = a*b*c;
return m;
}

/*
Expand Down
5 changes: 3 additions & 2 deletions mandatory/3-function-output.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
// Add comments to explain what this function does. You're meant to use Google!
// It generates a random number using Math.random() and it multiplies by 10
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Math.random() returns a number greater than or equal to 0 and less than 1, so this returns a number greater than or equal to 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!
// the concat() method is used to merge two or more arrays.
function combine2Words(word1, word2) {
return word1.concat(word2);
}

function concatenate(firstWord, secondWord, thirdWord) {
return firstWord.concat(" ", secondWord.concat(" ", thirdWord));
Copy link

@ewintram ewintram Mar 4, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you can also add all arguments into the .concat() method call, e.g.

return firstWord.concat(" ", 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.
}
Expand Down
10 changes: 8 additions & 2 deletions mandatory/4-tax.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@
Sales tax is 20% of the price of the product.
*/

function calculateSalesTax() {}
function calculateSalesTax(number) {
let priceOfProduct = number * 1.2;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you could use a variable name for the number 1.2 so it's more meaningful, e.g.

const totalPlusTax = 1.2;
let priceOfProduct = number * totalPlusTax;
return priceOfProduct;

return priceOfProduct;
}

/*
CURRENCY FORMATTING
Expand All @@ -17,7 +20,10 @@ function calculateSalesTax() {}
Remember that the prices must include the sales tax (hint: you already wrote a function for this!)
*/

function addTaxAndFormatCurrency() {}
function addTaxAndFormatCurrency(pound) {
pound = calculateSalesTax(pound);
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's better practice to declare a new variable, rather than reassign the value of a parameter, e.g.

const priceWithTax = calculateSalesTax(pound);

return `£${pound.toFixed(2)}`;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 very nice use of .toFixed() and string interpolation

}

/*
===================================================
Expand Down