diff --git a/exercises/B-hello-world/exercise.js b/exercises/B-hello-world/exercise.js index b179ee953..b5d352779 100644 --- a/exercises/B-hello-world/exercise.js +++ b/exercises/B-hello-world/exercise.js @@ -1 +1 @@ -console.log("Hello world"); +console.log('Hello Jiahd'); diff --git a/exercises/C-variables/exercise.js b/exercises/C-variables/exercise.js index a6bbb9786..628a44964 100644 --- a/exercises/C-variables/exercise.js +++ b/exercises/C-variables/exercise.js @@ -1,3 +1,6 @@ // Start by creating a variable `greeting` +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..731eff86b 100644 --- a/exercises/D-strings/exercise.js +++ b/exercises/D-strings/exercise.js @@ -1,3 +1,9 @@ // Start by creating a variable `message` -console.log(message); + + +var message = "This is a string"; +var messageType = typeof message; + +console.log(messageType); + diff --git a/exercises/E-strings-concatenation/exercise.js b/exercises/E-strings-concatenation/exercise.js index 2cffa6a81..10882baf8 100644 --- a/exercises/E-strings-concatenation/exercise.js +++ b/exercises/E-strings-concatenation/exercise.js @@ -1,3 +1,10 @@ // Start by creating a variable `message` -console.log(message); + + +var greetingStart = "Hello, my name is "; +var name = "JIHAD"; + +var greeting = greetingStart + name; + +console.log(greeting); diff --git a/exercises/F-strings-methods/exercise.js b/exercises/F-strings-methods/exercise.js index 2cffa6a81..915fbadd0 100644 --- a/exercises/F-strings-methods/exercise.js +++ b/exercises/F-strings-methods/exercise.js @@ -1,3 +1,11 @@ + + + // Start by creating a variable `message` +var name = "Jihad"; +var nameLength = name.length; +var message = 'My Name is ' + name + ' and my name is ' + nameLength + ' characters long'; + console.log(message); + diff --git a/exercises/F-strings-methods/exercise2.js b/exercises/F-strings-methods/exercise2.js index b4b46943d..14701f7a6 100644 --- a/exercises/F-strings-methods/exercise2.js +++ b/exercises/F-strings-methods/exercise2.js @@ -1,3 +1,10 @@ -const name = " Daniel "; -console.log(message); + + + +var name = "Jihad"; +var nameLength = name.length; +var message = 'My Name is ' + name + ' and my name is ' + nameLength + ' characters long'; + + +console.log(message.trim()) diff --git a/exercises/G-numbers/exercise.js b/exercises/G-numbers/exercise.js index 49e7bc00b..bc147e7be 100644 --- a/exercises/G-numbers/exercise.js +++ b/exercises/G-numbers/exercise.js @@ -1 +1,16 @@ // Start by creating a variables `numberOfStudents` and `numberOfMentors` + + +var numberOfStudents = 15 +var numberOfMentors = 8 +var Total = numberOfStudents + numberOfMentors; + + + +// Number of students: 15 +// Number of mentors: 8 +// Total number of students and mentors: 23 + +console.log('number of studets is : ' + numberOfStudents) +console.log('number of Mentors is : ' + numberOfMentors) +console.log('Total number of students and mentors: ' + Total) \ No newline at end of file diff --git a/exercises/I-floats/exercise.js b/exercises/I-floats/exercise.js index a5bbcd852..f64051053 100644 --- a/exercises/I-floats/exercise.js +++ b/exercises/I-floats/exercise.js @@ -1,2 +1,26 @@ + + var numberOfStudents = 15; var numberOfMentors = 8; + +var total = numberOfStudents + numberOfMentors; + +// console.log(total) + + + +var PercentageStudents = numberOfStudents / total; +var PercentageMentors = numberOfMentors / total; + + +var StudentsRound = Math.round(PercentageStudents * 100); +var MentorssRound = Math.round(PercentageMentors * 100); + + +console.log('Percentage students: ' + StudentsRound); +console.log('Percentage Mentors: ' + MentorssRound); + + +// // Percentage students: 65% +// // Percentage mentors: 35% +// // ``` \ No newline at end of file diff --git a/exercises/J-functions/exercise.js b/exercises/J-functions/exercise.js index 0ae5850e5..bd6133c6f 100644 --- a/exercises/J-functions/exercise.js +++ b/exercises/J-functions/exercise.js @@ -1,5 +1,7 @@ function halve(number) { - // complete the function here + + + return number/2; } var result = halve(12); diff --git a/exercises/J-functions/exercise2.js b/exercises/J-functions/exercise2.js index 82ef5e780..a70b80b09 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/exercise.js b/exercises/K-functions-parameters/exercise.js index 8d5db5e69..c15480416 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(a, b) { + return a * b; } // 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..72e09b5e4 100644 --- a/exercises/K-functions-parameters/exercise2.js +++ b/exercises/K-functions-parameters/exercise2.js @@ -1,5 +1,7 @@ -// Declare your function first +function divide(a, b) { +return a /b ; +} var result = divide(3, 4); console.log(result); diff --git a/exercises/K-functions-parameters/exercise3.js b/exercises/K-functions-parameters/exercise3.js index 537e9f4ec..bf86c392e 100644 --- a/exercises/K-functions-parameters/exercise3.js +++ b/exercises/K-functions-parameters/exercise3.js @@ -1,5 +1,22 @@ -// Write your function here + + + + + + + + + + + + + + +function createGreeting(name) { +return 'Hello my name is ' + name; + +} 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..07b628866 100644 --- a/exercises/K-functions-parameters/exercise4.js +++ b/exercises/K-functions-parameters/exercise4.js @@ -1,5 +1,10 @@ -// Declare your function first +function total(a, b) { +return a + b; + +} // Call the function and assign to a variable `sum` +var sum = total(13, 124); + console.log(sum); diff --git a/exercises/K-functions-parameters/exercise5.js b/exercises/K-functions-parameters/exercise5.js index 7c5bcd605..6459f36d1 100644 --- a/exercises/K-functions-parameters/exercise5.js +++ b/exercises/K-functions-parameters/exercise5.js @@ -1,4 +1,8 @@ // Declare your function here +function createLongGreeting(name, age) { +return `Hello, my name is ${name} and I'm ${age} years old`; + +} const greeting = createLongGreeting("Daniel", 30); diff --git a/exercises/L-functions-nested/README.md b/exercises/L-functions-nested/README.md index 1c4ae9c8a..78b3af2b2 100644 --- a/exercises/L-functions-nested/README.md +++ b/exercises/L-functions-nested/README.md @@ -23,7 +23,7 @@ function createCreeting(name, age) { - Your program should include a function that spells their name in uppercase, and a function that creates a shouty greeting. - Log each greeting to the console. -## Expected result +## Expected result- ``` HELLO DANIEL diff --git a/exercises/L-functions-nested/exercise.js b/exercises/L-functions-nested/exercise.js index a5d377442..2029c806b 100644 --- a/exercises/L-functions-nested/exercise.js +++ b/exercises/L-functions-nested/exercise.js @@ -3,3 +3,20 @@ var mentor2 = "Irina"; var mentor3 = "Mimi"; var mentor4 = "Rob"; var mentor5 = "Yohannes"; + + +function upperName(name) { + return name.toUpperCase() +} + +function greeting(name) { + + var upperspell = upperName(name) + var massage = 'Hello ' + name; + return massage; +} +console.log(greeting(mentor1)); +console.log(greeting(mentor2)); +console.log(greeting(mentor3)); +console.log(greeting(mentor4)); +console.log(greeting(mentor5)); \ No newline at end of file diff --git a/mandatory/1-syntax-errors.js b/mandatory/1-syntax-errors.js index a10cc9ac2..23af66ae3 100644 --- a/mandatory/1-syntax-errors.js +++ b/mandatory/1-syntax-errors.js @@ -1,16 +1,19 @@ // There are syntax errors in this code - can you fix it to pass the tests? -function addNumbers(a b c) { - return a + b + c; +function addNumbers(a, b, c) { + return (parseInt(a) + parseInt(b) + parseInt(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}`); } /* diff --git a/mandatory/2-logic-error.js b/mandatory/2-logic-error.js index 9cca7603b..dc731729d 100644 --- a/mandatory/2-logic-error.js +++ b/mandatory/2-logic-error.js @@ -1,16 +1,18 @@ // 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; + return a * b * c; + } /* diff --git a/mandatory/3-function-output.js b/mandatory/3-function-output.js index 5a953ba60..5cda37c05 100644 --- a/mandatory/3-function-output.js +++ b/mandatory/3-function-output.js @@ -2,15 +2,22 @@ function getRandomNumber() { 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. + + // Add comments to explain what this function does. You're meant to use Google! function combine2Words(word1, word2) { return word1.concat(word2); } +// The concat() method concatenates the string arguments to the calling string and returns 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.concat(" ", secondWord, " ", thirdWord) + } /* diff --git a/mandatory/4-tax.js b/mandatory/4-tax.js index ba77c7ae2..69925ceb4 100644 --- a/mandatory/4-tax.js +++ b/mandatory/4-tax.js @@ -5,7 +5,14 @@ Sales tax is 20% of the price of the product. */ -function calculateSalesTax() {} +function calculateSalesTax(num) { + + return num * 1.2; + + +} + + /* CURRENCY FORMATTING @@ -17,7 +24,10 @@ function calculateSalesTax() {} Remember that the prices must include the sales tax (hint: you already wrote a function for this!) */ -function addTaxAndFormatCurrency() {} +function addTaxAndFormatCurrency(num) { +return '£' + (num * 1.2).toFixed(2); + +} /* ===================================================