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
11 changes: 9 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(Pound) {
return Pound * 1.4;

}

/*
CURRENCY CONVERSION
Expand All @@ -15,7 +18,11 @@ 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(Pound) {
const priceAfterFee = 0.99;
const BRL = priceAfterFee * Pound * 5.7;
return Number(BRL.toFixed(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
22 changes: 12 additions & 10 deletions extra/2-piping.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,30 +16,32 @@
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(number) {
return `£${number}`;

}

const startingValue = 2;

// Why can this code be seen as bad practice? Comment your answer.
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

The task has asked you to comment here why you think this is bad code :).

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

I forgot to add comments. i have added now. Thank you so much for pointing it out.

let badCode =
//It can be seen as a bad code beacuse everything is in one line which makes it hard to read and understand.
const badCode = format((startingValue + 10)*2);
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Nice, but can you do this line using all of your methods rather than maths operands here?


/* BETTER PRACTICE */

let goodCode =

/* ======= TESTS - DO NOT MODIFY =====
There are some Tests in this file that will help you work out if your code is working.
let addition = add(startingValue, 10);
let multipication = multiply(addition, 2);
let goodCode = format(multipication);

/*
To run the tests for just this one file, type `npm test -- --testPathPattern 2-piping` into your terminal
(Reminder: You must have run `npm install` one time before this will work!)
*/
Expand Down
86 changes: 54 additions & 32 deletions extra/3-magic-8-ball.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**

Let's peer into the future using a Magic 8 Ball!
https://en.wikipedia.org/wiki/Magic_8-Ball
i/Magic_8-https://en.wikipedia.org/wikBall

There are a few steps to being able view the future though:
* Ask a question
Expand All @@ -13,40 +13,53 @@
and have different levels of positivity or negativity.

Below are the possible answers:

## Very positive
It is certain.
It is decidedly so.
Without a doubt.
Yes - definitely.
You may rely on it.

## Positive
As I see it, yes.
Most likely.
Outlook good.
Yes.
Signs point to yes.

## Negative
Reply hazy, try again.
Ask again later.
Better not tell you now.
Cannot predict now.
Concentrate and ask again.

## Very negative
Don't count on it.
My reply is no.
My sources say no.
Outlook not so good.
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,
...positiveAnswers,
...negativeAnswers,
...veryNegativeAnswers,
];

// This should log "The ball has shaken!"
// and return the answer.
function shakeBall() {
//Write your code in here
console.log("The ball has shaken!");
let randomIndex = Math.floor(Math.random() * allAnswers.length);
return allAnswers[randomIndex];
}

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

}

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Excellent! Passes all tests and very readable, well done.

/*
Expand Down
15 changes: 8 additions & 7 deletions mandatory/1-syntax-errors.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
// 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`;
}
Comment on lines +8 to +9
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Great use of string interpolation here!

function getTotal(a, b) {
total = a ++ b;
total = a + b;
return `The total is ${total}`;
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

And here too :), good job.


return "The total is total";
}


}
/*
===================================================
======= TESTS - DO NOT MODIFY BELOW THIS LINE =====
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;
}
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Spot on! Nice and clean :)


/*
Expand Down
4 changes: 3 additions & 1 deletion mandatory/3-function-output.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,17 @@
function getRandomNumber() {
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Can you add the comment here to explain what this function does?

return Math.random() * 10;
}
//it returns a number between 0 and 1, excluding 1.so multiplying with it 10,returns number between 0 and 10 but not 10.

// Add comments to explain what this function does. You're meant to use Google!
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

And here too?

function combine2Words(word1, word2) {
return word1.concat(word2);
}

//function combine2words concatinates two strings.
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}`);
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

It is creative that you have used string interpolation here, nice!

}

/*
Expand Down
9 changes: 7 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(sales) {
const tax = 0.2 * sales;
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

I really like how clear you've made this by defining it as a tax variable

return tax + sales;
}

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

function addTaxAndFormatCurrency() {}
function addTaxAndFormatCurrency(sales) {
return "£" + calculateSalesTax(sales) .toFixed(2);
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Smart, but this is doing quite a lot on one line. Adding an extra line with a variable - in the way you did in the function above - could make this more clear.

}

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