diff --git a/exercises/B-hello-world/exercise.js b/exercises/B-hello-world/exercise.js index b179ee953..6a949aa04 100644 --- a/exercises/B-hello-world/exercise.js +++ b/exercises/B-hello-world/exercise.js @@ -1 +1,2 @@ -console.log("Hello world"); +console.log("Hello World"); +console.log(5); \ No newline at end of file diff --git a/exercises/C-variables/exercise.js b/exercises/C-variables/exercise.js index a6bbb9786..36b8eca74 100644 --- a/exercises/C-variables/exercise.js +++ b/exercises/C-variables/exercise.js @@ -1,3 +1,11 @@ -// Start by creating a variable `greeting` +var approach = "greeting";// Start by creating a variable `greeting` -console.log(greeting); +console.log(approach); + +var approach = "greeting";// Start by creating a variable `greeting` + +console.log(approach); + +var approach = "greeting";// Start by creating a variable `greeting` + +console.log(approach); diff --git a/exercises/D-strings/exercise.js b/exercises/D-strings/exercise.js index 2cffa6a81..fee4053c9 100644 --- a/exercises/D-strings/exercise.js +++ b/exercises/D-strings/exercise.js @@ -1,3 +1,6 @@ -// Start by creating a variable `message` +const message = "This is a String"; +const messageType = typeof message; + console.log(message); +console.log(messageType); diff --git a/exercises/E-strings-concatenation/exercise.js b/exercises/E-strings-concatenation/exercise.js index 2cffa6a81..b1b770490 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 introduction = "Hello my name is"; +const name = " Abdulqadir"; -console.log(message); +console.log(introduction); +console.log(name); diff --git a/exercises/F-strings-methods/exercise.js b/exercises/F-strings-methods/exercise.js index 2cffa6a81..d3252c0ea 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` +let name = "Abdulqadir"; +let nameLength = name.length; -console.log(message); +console.log(`My name is ${name} and my name is ${name.length} characters long`); \ No newline at end of file diff --git a/exercises/F-strings-methods/exercise2.js b/exercises/F-strings-methods/exercise2.js index b4b46943d..0fdb111c7 100644 --- a/exercises/F-strings-methods/exercise2.js +++ b/exercises/F-strings-methods/exercise2.js @@ -1,3 +1,5 @@ -const name = " Daniel "; +let name = "Abdulqadir"; +let addTrim = name.trim(); +let newNameLength = addTrim.length; -console.log(message); +console.log(`my name is ${addTrim} and my name is ${newNameLength} characters long`); \ No newline at end of file diff --git a/exercises/G-numbers/exercise.js b/exercises/G-numbers/exercise.js index 49e7bc00b..301fd7815 100644 --- a/exercises/G-numbers/exercise.js +++ b/exercises/G-numbers/exercise.js @@ -1 +1,8 @@ // Start by creating a variables `numberOfStudents` and `numberOfMentors` +let numberOfStudents = 15; +let numberOfMentors = 3; +let total = numberOfStudents + numberOfMentors; + +console.log(`number of students: ${numberOfStudents}`); +console.log(`number of mentors: ${numberOfMentors}` ); +console.log(`total number of students and mentors: ${total}`); diff --git a/exercises/I-floats/exercise.js b/exercises/I-floats/exercise.js index a5bbcd852..759b77c6e 100644 --- a/exercises/I-floats/exercise.js +++ b/exercises/I-floats/exercise.js @@ -1,2 +1,15 @@ var numberOfStudents = 15; var numberOfMentors = 8; +var total = numberOfStudents + numberOfMentors; + +var convertStudent = numberOfStudents/total*100; +var convertMentors = numberOfMentors/total*100; + +var percentageOfStudents = Math.round(convertStudent); +var percentageOfMentors = Math.round(convertMentors); + +console.log(`Student percentage: ${percentageOfStudents}%`); +console.log(`Student percentage: ${percentageOfMentors}%`); + + + diff --git a/exercises/J-functions/exercise.js b/exercises/J-functions/exercise.js index 0ae5850e5..a239e7a4d 100644 --- a/exercises/J-functions/exercise.js +++ b/exercises/J-functions/exercise.js @@ -1,7 +1,13 @@ function halve(number) { - // complete the function here + return number/2; } var result = halve(12); +var result1 = halve(20); +var result2 = halve(30); +var result3 = halve(100); console.log(result); +console.log(result1); +console.log(result2); +console.log(result3); diff --git a/exercises/J-functions/exercise2.js b/exercises/J-functions/exercise2.js index 82ef5e780..9b1665f53 100644 --- a/exercises/J-functions/exercise2.js +++ b/exercises/J-functions/exercise2.js @@ -1,5 +1,5 @@ function triple(number) { - // complete function here + return number*3 } var result = triple(12); diff --git a/exercises/K-functions-parameters/README.md b/exercises/K-functions-parameters/README.md index 02ab2a844..c961dd87c 100644 --- a/exercises/K-functions-parameters/README.md +++ b/exercises/K-functions-parameters/README.md @@ -42,7 +42,7 @@ function add(num1, num2) { * Write a function that takes a name (a string) and returns a greeting -## Expected result +## Expected result ``` Hello, my name is Daniel diff --git a/exercises/K-functions-parameters/exercise.js b/exercises/K-functions-parameters/exercise.js index 8d5db5e69..9e8ac798a 100644 --- a/exercises/K-functions-parameters/exercise.js +++ b/exercises/K-functions-parameters/exercise.js @@ -1,6 +1,6 @@ // Complete the function so that it takes input parameters -function multiply() { - // Calculate the result of the function and return it +function multiply(num1, num2) { + return num1*num2; // Calculate the result of the function and return it } // 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..921ca0c52 100644 --- a/exercises/K-functions-parameters/exercise2.js +++ b/exercises/K-functions-parameters/exercise2.js @@ -1,4 +1,6 @@ -// Declare your function first +function divide(num1, num2){ + return num1/num2; +}// Declare your function first var result = divide(3, 4); diff --git a/exercises/K-functions-parameters/exercise3.js b/exercises/K-functions-parameters/exercise3.js index 537e9f4ec..00c010f17 100644 --- a/exercises/K-functions-parameters/exercise3.js +++ b/exercises/K-functions-parameters/exercise3.js @@ -1,4 +1,6 @@ -// Write your function here +function createGreeting(name){ + return `Hello, my name is ${name}`; +}// Write your function here var greeting = createGreeting("Daniel"); diff --git a/exercises/K-functions-parameters/exercise4.js b/exercises/K-functions-parameters/exercise4.js index 7ab44589e..c2e5cff05 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; +}// Declare your function first -// Call the function and assign to a variable `sum` +var sum = add(13,124);// Call the function and assign to a variable `sum` console.log(sum); diff --git a/exercises/K-functions-parameters/exercise5.js b/exercises/K-functions-parameters/exercise5.js index 7c5bcd605..e43963566 100644 --- a/exercises/K-functions-parameters/exercise5.js +++ b/exercises/K-functions-parameters/exercise5.js @@ -1,4 +1,6 @@ -// Declare your function here +function createLongGreeting(name,age){ + return`Hello, my name is ${name} and I'm ${age} years old` +}// Declare your function here const greeting = createLongGreeting("Daniel", 30); diff --git a/exercises/L-functions-nested/exercise.js b/exercises/L-functions-nested/exercise.js index a5d377442..0dba27846 100644 --- a/exercises/L-functions-nested/exercise.js +++ b/exercises/L-functions-nested/exercise.js @@ -1,5 +1,49 @@ +function percentage(num,total) { + return (num/total*100); +} + +var numberOfStudents = 15; +var numberOfMentors = 8; +var total = numberOfStudents + numberOfMentors; +var totalPercentage = percentage(numberOfStudents,numberOfMentors,total); + +function initialMessage(numberOfStudents, numberOfMentors){ + message = `totalPercentage: ${numberOfStudents} ${numberOfMentors} ${Math.round(percentage)}%`; + return message; +} + +console.log(totalPercentage); + + + + + + + + + + + + var mentor1 = "Daniel"; var mentor2 = "Irina"; var mentor3 = "Mimi"; var mentor4 = "Rob"; var mentor5 = "Yohannes"; + +function shoutyGreeting(name){ + var greeting = name.toUpperCase(); + return greeting = `HELLO ${greeting}`; +} + +var greeting1 = shoutyGreeting(mentor1); +var greeting2 = shoutyGreeting(mentor2); +var greeting3 = shoutyGreeting(mentor3); +var greeting4 = shoutyGreeting(mentor4); +var greeting5 = shoutyGreeting(mentor5); + +console.log(greeting1); +console.log(greeting2); +console.log(greeting3); +console.log(greeting4); +console.log(greeting5); \ No newline at end of file diff --git a/mandatory/1-syntax-errors.js b/mandatory/1-syntax-errors.js index 0a21afd1b..e47e7b75b 100644 --- a/mandatory/1-syntax-errors.js +++ b/mandatory/1-syntax-errors.js @@ -1,16 +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; + total = a + b; - return "The total is total" + return "The total is " + total; + } /* diff --git a/mandatory/2-logic-error.js b/mandatory/2-logic-error.js index 3c578ad87..66e9804b0 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 getWordLength(word) { - return "word".length(); + return word.length; } function multiply(a, b, c) { - a * b * c; - return; + return a*b*c; + } /* diff --git a/mandatory/3-function-output.js b/mandatory/3-function-output.js index c9221a200..d5f48804b 100644 --- a/mandatory/3-function-output.js +++ b/mandatory/3-function-output.js @@ -1,18 +1,21 @@ // Add comments to explain what this function does. You're meant to use Google! function getNumber() { return Math.random() * 10; -} +} // The Math.random() function returns a floating-point, pseudo-random number in the range 0 to less than 1 (inclusive of 0, but not 1)with approximately uniform distribution over that range — which you can then scale to your desired range. so the getnumber function multiplies the psuedo random number between 0 and 10 however not 10. // Add comments to explain what this function does. You're meant to use Google! function s(w1, w2) { return w1.concat(w2); } +//I think this function allows 2 strings to be added together and create or in this case return 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. +return `${firstWord} ${secondWord} ${thirdWord}`; } + /* =================================================== ======= TESTS - DO NOT MODIFY BELOW THIS LINE ===== diff --git a/mandatory/4-tax.js b/mandatory/4-tax.js index c9e41c691..6b9e365fb 100644 --- a/mandatory/4-tax.js +++ b/mandatory/4-tax.js @@ -5,7 +5,9 @@ Sales tax is 20% of the price of the product */ -function calculateSalesTax() {} +function calculateSalesTax(price) { + return price + (price*0.2); +} /* CURRENCY FORMATTING @@ -17,7 +19,9 @@ function calculateSalesTax() {} Remember that the prices must include the sales tax (hint: you already wrote a function for this!) */ -function addTaxAndFormatCurrency() {} +function addTaxAndFormatCurrency(productPrices) { + return "£" + calculateSalesTax(productPrices).toFixed ; +} /* ===================================================