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 rate = 1.4;
return amount * rate;
}

/*
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(amount) {
let rate = 5.7;
return parseFloat((amount * 5.7 * 0.99).toFixed(2));
Copy link
Author

Choose a reason for hiding this comment

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

Math.round(priceInBRL * 100) / 100; is used in
JavaScript-Core-1-Coursework-Week1-Solution

}

/* ======= TESTS - DO NOT MODIFY =====
There are some Tests in this file that will help you work out if your code is working.
Expand Down
20 changes: 12 additions & 8 deletions extra/2-piping.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,26 +16,30 @@
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(value) {
let currency = "£"
return "£" + value;
}

const startingValue = 2;

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

Choose a reason for hiding this comment

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

Question: have we answered the question here

Copy link
Author

Choose a reason for hiding this comment

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

If the starting value is not a number, the code may return an error.
If the add (10) or multiply (2) in functions are not defined , the code may not produce the correct result.
If the format function is not defined or doesn't behave as expected, the code may not produce the desired string representation of the result.

let badCode =
let badCode = format(multiply(add(startingValue, 10), 2));

/* BETTER PRACTICE */

let goodCode =
let sum = add(startingValue, 10);
let multiplies = multiply(sum , 2);
let goodCode = format(multiplies);
// let 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
97 changes: 59 additions & 38 deletions extra/3-magic-8-ball.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,52 +14,73 @@

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.
*/
**/

Choose a reason for hiding this comment

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

praise: nice converting them all to arrays of strings


let veryPositive = [
"It is certain.",
"It is decidedly so.",
"Without a doubt.",
"Yes - definitely.",
"You may rely on it.",
]


let Positive = [
"As I see it, yes.",
"Most likely.",
"Outlook good.",
"Yes.",
"Signs point to yes."
]


let Negative =[
"Reply hazy, try again.",
"Ask again later.",
"Better not tell you now.",
"Cannot predict now.",
"Concentrate and ask again."
]


let veryNegative = [
"Don't count on it.",
"My reply is no.",
"My sources say no.",
"Outlook not so good.",
"Very doubtful."
]

// 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];
}

/*
This function should say whether the answer it is given is
- very positive
- positive
- negative
- very negative

This function should expect to be called with any value which was returned by the shakeBall function.
*/
//This function should say whether the answer it is given is
let allAnswers =[
...veryPositive,
...Positive,
...Negative,
...veryNegative,
]


//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(veryPositive.includes(answer)){
return "very positive";
} else if (Positive.includes(answer)){
return "Positive";
} else if (Negative.includes(answer)){
return "Negative";
} else if(veryNegative.includes(answer)){
return "very negative";
}
}

/*
Expand Down
11 changes: 6 additions & 5 deletions mandatory/1-syntax-errors.js
Original file line number Diff line number Diff line change
@@ -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;
}

Choose a reason for hiding this comment

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

Comment: Well done! Same as answers as me.
Consider: It makes no difference in the outcome. Sometimes you have space in between curly brackets and sometimes not. I do the same.

Copy link

Choose a reason for hiding this comment

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

Good work Saliha. 👍


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;
total = a + b;

return "The total is total";
return `The total is ${total}`;

Choose a reason for hiding this comment

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

praise: Nice use of template literals here

}

/*
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();
}

Choose a reason for hiding this comment

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

Comment: Looks good and same answers as me on all three.

Copy link

Choose a reason for hiding this comment

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

Good work Saliha. 👍


function getStringLength(word) {
return "word".length();
return word.length;
}

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

/*
Expand Down
5 changes: 3 additions & 2 deletions mandatory/3-function-output.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
// Add comments to explain what this function does. You're meant to use Google!
function getRandomNumber() {
return Math.random() * 10;
// Math.random generate a number between 1 to 10. That is not a whole number nor 1. In order to get a whole number multiply your answer to 10: Math.random() * 10
}

// Add comments to explain what this function does. You're meant to use Google!
function combine2Words(word1, word2) {
return word1.concat(word2);
// this function combine two strings and make a new string.

Choose a reason for hiding this comment

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

Comment: Good description.

Copy link

Choose a reason for hiding this comment

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

Good work Saliha. 👍

}

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.concat(' ',secondWord, ' ',thirdWord,);
}

Choose a reason for hiding this comment

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

Comment: same answer as me.


/*
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,11 @@
Sales tax is 20% of the price of the product.
*/

function calculateSalesTax() {}
function calculateSalesTax(price) {
let salesTax = price * 0.2;
let productPrice = price + salesTax;
return productPrice;
}

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

function addTaxAndFormatCurrency() {}
function addTaxAndFormatCurrency(price) {
let productPrice = calculateSalesTax(price);
return "£" + productPrice.toFixed(2);
}

/*
===================================================
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "Exercises for JS1 Week 1",
"license": "CC-BY-SA-4.0",
"scripts": {
"test": "jest"
"test": "jest --watchAll --verbose"
},
"repository": {
"type": "git",
Expand Down