diff --git a/exercises/B-hello-world/exercise.js b/exercises/B-hello-world/exercise.js index b179ee953..d5a6db283 100644 --- a/exercises/B-hello-world/exercise.js +++ b/exercises/B-hello-world/exercise.js @@ -1 +1 @@ -console.log("Hello world"); +console.log("Hello world"); //completed check google classroom for proof diff --git a/exercises/C-variables/exercise.js b/exercises/C-variables/exercise.js index a6bbb9786..072ba3b45 100644 --- a/exercises/C-variables/exercise.js +++ b/exercises/C-variables/exercise.js @@ -1,3 +1,6 @@ -// Start by creating a variable `greeting` +// Start by creating a variable `g +var greeting = "Hello World"; console.log(greeting); +console.log(greeting); +console.log(greeting); diff --git a/exercises/D-strings/exercise.js b/exercises/D-strings/exercise.js index 2cffa6a81..81270ca3c 100644 --- a/exercises/D-strings/exercise.js +++ b/exercises/D-strings/exercise.js @@ -1,3 +1,3 @@ // Start by creating a variable `message` - -console.log(message); +const country = "United Kindgom"; +console.log(typeof country); diff --git a/exercises/E-strings-concatenation/exercise.js b/exercises/E-strings-concatenation/exercise.js index 2cffa6a81..7eb4fee46 100644 --- a/exercises/E-strings-concatenation/exercise.js +++ b/exercises/E-strings-concatenation/exercise.js @@ -1,3 +1,5 @@ // Start by creating a variable `message` +const greetingStart = "Hello my name is"; +const name = "Bimbola"; -console.log(message); +console.log(greetingStart + name); diff --git a/exercises/F-strings-methods/exercise.js b/exercises/F-strings-methods/exercise.js index 2cffa6a81..1f6d96ed9 100644 --- a/exercises/F-strings-methods/exercise.js +++ b/exercises/F-strings-methods/exercise.js @@ -1,3 +1,4 @@ // Start by creating a variable `message` +const names= "Bimbola Lasisi" ; -console.log(message); +console.log(names.length); \ No newline at end of file diff --git a/exercises/F-strings-methods/exercise2.js b/exercises/F-strings-methods/exercise2.js index b4b46943d..214d7fc6f 100644 --- a/exercises/F-strings-methods/exercise2.js +++ b/exercises/F-strings-methods/exercise2.js @@ -1,3 +1,3 @@ -const name = " Daniel "; - -console.log(message); +const name = ' Bimbola Lasisi '; +name.trim(); +console.log(name); diff --git a/exercises/G-numbers/exercise.js b/exercises/G-numbers/exercise.js index 49e7bc00b..db61a25bd 100644 --- a/exercises/G-numbers/exercise.js +++ b/exercises/G-numbers/exercise.js @@ -1 +1,6 @@ // Start by creating a variables `numberOfStudents` and `numberOfMentors` +let numberOfStudents = 15 ; +let numberOfMentors = 8; +let sum = numberOfStudents + numberOfMentors; + +console.log('The sum of ' + numberOfStudents + ' and' + numberOfMentors + 'is ' + sum); \ No newline at end of file diff --git a/exercises/I-floats/exercise.js b/exercises/I-floats/exercise.js index a5bbcd852..090307236 100644 --- a/exercises/I-floats/exercise.js +++ b/exercises/I-floats/exercise.js @@ -1,2 +1,15 @@ -var numberOfStudents = 15; -var numberOfMentors = 8; +let numberOfStudents = 15; + + let numberOfMentors = 8; + + let total = numberOfStudents + numberOfMentors; + let percentageOfStudentsCalc = (numberOfStudents / total ) * 100; +let percentageOfMentorsCalc =(numberOfMentors / total) * 100; + let percentageOfStudents = Math.round(percentageOfStudentsCalc); +let percentageOfMentors = Math.round(percentageOfMentorsCalc); + +console.log('Percentage students: ' + percentageOfStudents + '%'); +console.log('Percentage mentors: ' + percentageOfMentors + '%'); + + + diff --git a/exercises/J-functions/exercise.js b/exercises/J-functions/exercise.js index 0ae5850e5..02951f6c4 100644 --- a/exercises/J-functions/exercise.js +++ b/exercises/J-functions/exercise.js @@ -1,7 +1,14 @@ function halve(number) { - // complete the function here + // complete the function here + +return number / 2; + } -var result = halve(12); +var result = halve(12); +var result2 = halve(24); + + console.log(result); +console.log(result2); \ No newline at end of file diff --git a/exercises/J-functions/exercise2.js b/exercises/J-functions/exercise2.js index 82ef5e780..48f346c55 100644 --- a/exercises/J-functions/exercise2.js +++ b/exercises/J-functions/exercise2.js @@ -1,7 +1,9 @@ function triple(number) { // complete function here + return number * 3 } var result = triple(12); - +var result2 = triple(24) console.log(result); +console.log(result2); diff --git a/exercises/K-functions-parameters/exercise.js b/exercises/K-functions-parameters/exercise.js index 8d5db5e69..5ddce24f4 100644 --- a/exercises/K-functions-parameters/exercise.js +++ b/exercises/K-functions-parameters/exercise.js @@ -1,6 +1,7 @@ // Complete the function so that it takes input parameters -function multiply() { +function multiply(num1, numb2) { // Calculate the result of the function and return it + return num1 * numb2; } // Assign the result of calling the function the variable `result` diff --git a/exercises/K-functions-parameters/exercise2.js b/exercises/K-functions-parameters/exercise2.js index db7a8904b..35b4e000c 100644 --- a/exercises/K-functions-parameters/exercise2.js +++ b/exercises/K-functions-parameters/exercise2.js @@ -1,4 +1,7 @@ // Declare your function first +function divide (num1, num2) { + return num1 / num2; +} var result = divide(3, 4); diff --git a/exercises/K-functions-parameters/exercise3.js b/exercises/K-functions-parameters/exercise3.js index 537e9f4ec..c7cb05068 100644 --- a/exercises/K-functions-parameters/exercise3.js +++ b/exercises/K-functions-parameters/exercise3.js @@ -1,5 +1,7 @@ // Write your function here - +function createGreeting(name){ +return 'Hello, my name is '; +} var greeting = createGreeting("Daniel"); console.log(greeting); diff --git a/exercises/K-functions-parameters/exercise4.js b/exercises/K-functions-parameters/exercise4.js index 7ab44589e..5668595b5 100644 --- a/exercises/K-functions-parameters/exercise4.js +++ b/exercises/K-functions-parameters/exercise4.js @@ -1,5 +1,7 @@ // Declare your function first - +function add(num1, num2) { +return num1 + num2; // Call the function and assign to a variable `sum` - +} +var sum = add (13, 124); console.log(sum); diff --git a/exercises/K-functions-parameters/exercise5.js b/exercises/K-functions-parameters/exercise5.js index 7c5bcd605..0625b893f 100644 --- a/exercises/K-functions-parameters/exercise5.js +++ b/exercises/K-functions-parameters/exercise5.js @@ -1,5 +1,10 @@ // Declare your function here +function createLongGreeting(name, age) { + + return 'Hello, my name is ${name} and i am ${age} years old'; +} + + const greeting = createLongGreeting("Daniel", 30); -const greeting = createLongGreeting("Daniel", 30); console.log(greeting); diff --git a/exercises/L-functions-nested/exercise.js b/exercises/L-functions-nested/exercise.js index a5d377442..d2a3988cd 100644 --- a/exercises/L-functions-nested/exercise.js +++ b/exercises/L-functions-nested/exercise.js @@ -1,5 +1,13 @@ -var mentor1 = "Daniel"; -var mentor2 = "Irina"; -var mentor3 = "Mimi"; -var mentor4 = "Rob"; -var mentor5 = "Yohannes"; +function shoutyGreeting(mentor){ +} +let mentor1 = "Daniel"; +let mentor2 = "Irina"; +let mentor3 = "Mimi"; +let mentor4 = "Rob"; +let mentor5 = "Yohannes"; + +console.log(mentor1.toUpperCase()); +console.log(mentor2.toUpperCase()); +console.log(mentor3.toUpperCase()); +console.log(mentor4.toUpperCase()); +console.log(mentor5.toUpperCase()); \ No newline at end of file diff --git a/extra/1-currency-conversion.js b/extra/1-currency-conversion.js index d82e59480..4d9e3e6bf 100644 --- a/extra/1-currency-conversion.js +++ b/extra/1-currency-conversion.js @@ -5,8 +5,13 @@ Write a function that converts a price to USD (exchange rate is 1.4 $ to £) */ -function convertToUSD() {} +function convertToUSD(amountToPounds) { + return amountToPounds * 1.4 ; +} + +let value = convertToUSD(30); +console.log(value); /* CURRENCY CONVERSION =================== @@ -15,7 +20,13 @@ 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(amountInBrl) { +let exchangeRate = amountInBrl - (0.01 * amountInBrl); +return Math.round(exchangeRate * 5.7) / 100; +} +let value2 = convertToBRL(30); +console.log (value2); + /* ======= 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 index 9c8ebc76a..37ca6bff5 100644 --- a/extra/2-piping.js +++ b/extra/2-piping.js @@ -16,26 +16,31 @@ the final result to the variable goodCode */ -function add() { - +function add(num1 , num2) { + return num1 + num2; } +console.log(add (3, 5)); function multiply() { - + return num1 * numb2; } +console.log(multiply (3, 5)); -function format() { - +function format(pound) { +return pound ; } const startingValue = 2; // Why can this code be seen as bad practice? Comment your answer. -let badCode = - +let badCode = 0; +//let code = newDate(2021, 7, 7)) return newDate: bad code because all togther in one line /* BETTER PRACTICE */ -let goodCode = +let goodCode = 0; +// goodCode =newDate(2021, 7, 06); +// return newDate; +// best practices /* ======= 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 index f3adbefa5..a04437f70 100644 --- a/extra/3-magic-8-ball.js +++ b/extra/3-magic-8-ball.js @@ -43,10 +43,124 @@ Very doubtful. */ -// This should log "The ball has shaken!" + + // and return the answer. -function shakeBall() { +let answer =[ + { + positivity: " It is certain.", + type: " very positive" + }, +{ + + positivity: " It is decidedly so.", + type: " very positive" +}, +{ + + positivity: " Without a doubt.", + type: " very positive" +}, +{ + + positivity: " Yes - definitely.", + type: " very positive" +}, +{ + + positivity: " Yes - definitely.", + type: " very positive" +}, +{ + + positivity: " you may rely on it ", + type: " very positive" +}, +{ + + positivity: " As I see it, yes.", + type: " positive" +}, +{ + + positivity: " Most likely.", + type: " positive" +}, +{ + + positivity: " Outlook good.", + type: "positive" +}, +{ + + positivity: " Yes.", + type: " positive" +}, +{ + + + positivity: " Sign point to yes.", + type: " positive" +}, +{ + + negativity: " Reply hazy, try again", + type: " negative" +}, +{ + + negativity: " Ask again later.", + type: " negative" +}, +{ + + negativity: " Better not tell you now.", + type: " negative" +}, +{ + + negativity: " Cannot predict now.", + type: " negative" +}, +{ + negativity: " Concentrate and ask again.", + type: " negative" +}, +{ + + negativity: " Don't count on it.", + type: " very negative" +}, +{ + + negativity: "My reply is no.", + type: " very negative" +}, +{ + + negativity: " My sources say no.", + type: " very negative" +}, +{ + + negativity: " Outlook not so good.", + type: " very negative" +}, +{ + + negativity: " Very doubtful .", + type: " very negative" +}, +] + + + //Write your code in here +function shakeBall() { + let randomAnswer = Math.floor(maths.random() * 20); + // This should log "The ball has shaken!" + console.log("The ball has shaken!") + return answer[randomAnswer].positivity; } /* @@ -60,8 +174,36 @@ function shakeBall() { */ function checkAnswer(answer) { //Write your code in here -} + let checkAnswer= math.floor(math.randomAnswer() *20) + if (randomAnswer === 20){ + console.log("it is certain") + }else if (randomAnswer === 19){ + console.log('Reply hazy, try again') + }else if (randomAnswer===18 ){ + console.log('It is decidedly so.') + }else if (randomAnswer===17 ){ + console.log('Without a doubt.') + }else if (randomAnswer===16 ){ + console.log('yes -Definitely.') + }else if (randomAnswer===17 ){ + console.log('You may rely rely on it.') + }else if (randomAnswer===15 ){ + console.log('Most likely.') + }else if (randomAnswer===14 ){ + console.log('It is decidedly so.') + }else if (randomAnswer===14 ){ + console.log('out look good.') + }else if (randomAnswer===13 ){ + console.log('yes.') + }else if (randomAnswer===12 ){ + console.log('Sign point to yes.') + }else if (randomAnswer===0 ){ + console.log('very doubtful .') + }else if (randomAnswer===11 ){ + console.log('Reply hazy, try later.') + } +} /* ================================== ======= TESTS - DO NOT MODIFY ===== diff --git a/mandatory/1-syntax-errors.js b/mandatory/1-syntax-errors.js index a10cc9ac2..12f3e2f48 100644 --- a/mandatory/1-syntax-errors.js +++ b/mandatory/1-syntax-errors.js @@ -1,18 +1,18 @@ // 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 " + name "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; +} /* =================================================== ======= TESTS - DO NOT MODIFY BELOW THIS LINE ===== diff --git a/mandatory/2-logic-error.js b/mandatory/2-logic-error.js index 9cca7603b..708112757 100644 --- a/mandatory/2-logic-error.js +++ b/mandatory/2-logic-error.js @@ -1,16 +1,16 @@ // The syntax for this function is valid but it has an error, find it and fix it. 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; + let result = a * b * c; + return (result); } /* diff --git a/mandatory/3-function-output.js b/mandatory/3-function-output.js index 5a953ba60..cf811e59e 100644 --- a/mandatory/3-function-output.js +++ b/mandatory/3-function-output.js @@ -1,16 +1,18 @@ // Add comments to explain what this function does. You're meant to use Google! function getRandomNumber() { - return Math.random() * 10; + return Math.random() * 10; // getNumber function return using math.random method } // Add comments to explain what this function does. You're meant to use Google! function combine2Words(word1, word2) { - return word1.concat(word2); + return word1.concat(word2); // combine2word function return by joining word1 and word 2 together } 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); } /* diff --git a/mandatory/4-tax.js b/mandatory/4-tax.js index ba77c7ae2..0ad900804 100644 --- a/mandatory/4-tax.js +++ b/mandatory/4-tax.js @@ -5,7 +5,11 @@ Sales tax is 20% of the price of the product. */ -function calculateSalesTax() {} +function calculateSalesTax(price) { +let taxPercentages = price * (20 / 100) ; +return taxPercentages + price ; +} + /* CURRENCY FORMATTING @@ -17,7 +21,12 @@ 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 taxPercentages = "£" + (price/100); +return formattedPrice; +} +let result2 = addTaxAndFormatCurrency(20) ; + /* =================================================== diff --git a/package.json b/package.json index 58555936d..778df9683 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,9 @@ "url": "https://github.com/CodeYourFuture/JavaScript-Core-1-Coursework-Week1/issues" }, "jest": { - "setupFilesAfterEnv": ["jest-extended"] + "setupFilesAfterEnv": [ + "jest-extended" + ] }, "homepage": "https://github.com/CodeYourFuture/JavaScript-Core-1-Coursework-Week1#readme", "devDependencies": {