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(amount) {
let poundToDollar=amount*1.4;
return poundToDollar;
}

/*
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(amountTwo) {
let poundToBrazilian= ((amountTwo)*(0.99)*5.700).toFixed(2) ;
return parseFloat(poundToBrazilian);
}

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

function add() {

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

function multiply() {

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

function format() {

function format(a) {
return `£${a}`;
}

const startingValue = 2;

// Why can this code be seen as bad practice? Comment your answer.
let badCode =
let badCode =format(multiply(add(startingValue,10),2))

/* BETTER PRACTICE */

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

/* ======= TESTS - DO NOT MODIFY =====
There are some Tests in this file that will help you work out if your code is working.
Expand Down
16 changes: 8 additions & 8 deletions mandatory/1-syntax-errors.js
Original file line number Diff line number Diff line change
@@ -1,17 +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}`;
};

/*
===================================================
Expand Down
7 changes: 3 additions & 4 deletions mandatory/2-logic-error.js
Original file line number Diff line number Diff line change
@@ -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;
}

/*
Expand Down
9 changes: 7 additions & 2 deletions mandatory/3-function-output.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,20 @@
function getRandomNumber() {
return Math.random() * 10;
}

/* In this function the main purpose is to pick a random number with .random method that are >0 but <1
*/
// Add comments to explain what this function does. You're meant to use Google!
function combine2Words(word1, word2) {
return word1.concat(word2);
}

/* This function is to combine 2 different string and give us a new string.
*/
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.
let allString= firstWord+" "+secondWord+" "+ thirdWord;
return allString;

}

/*
Expand Down
11 changes: 9 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(productPrice) {
let productTotal=productPrice+(productPrice*0.2);
Copy link
Contributor

Choose a reason for hiding this comment

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

You have no spaces between the variable names and the expression on the right hand side. Double check the README for instructions on how to format your code

return productTotal;
};

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

function addTaxAndFormatCurrency() {}
function addTaxAndFormatCurrency(product) {
let amountOne=( (product*1.2).toFixed(2)).toString();
Copy link
Contributor

Choose a reason for hiding this comment

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

Hello @Jacknguyen4438 ,
Can you think of a better variable name than amountOne? Think about the calculation you're doing here and what it means in order to help you come up with a clearer variable name. Remember your variable names should convey meaning, as your code will be read by other humans.

// let amountTwo= parseFloat(amountOne);
Copy link
Contributor

Choose a reason for hiding this comment

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

👓 Remember to remove old comments

return `£${amountOne}`;
};

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