diff --git a/exercises/B-hello-world/exercise.js b/exercises/B-hello-world/exercise.js index b179ee953..415d78f10 100644 --- a/exercises/B-hello-world/exercise.js +++ b/exercises/B-hello-world/exercise.js @@ -1 +1,4 @@ -console.log("Hello world"); +console.log("Hello world" + " I am enjoying the journey into JavaScript and taking the challenge on head-first!"); +console.log("This is a interesting exercise.") +// console.log(What happens now?) +console.log(21) \ No newline at end of file diff --git a/exercises/C-variables/exercise.js b/exercises/C-variables/exercise.js index a6bbb9786..a1af96912 100644 --- a/exercises/C-variables/exercise.js +++ b/exercises/C-variables/exercise.js @@ -1,3 +1,5 @@ // 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/README.md b/exercises/D-strings/README.md index 1516f536e..63c85a9d6 100644 --- a/exercises/D-strings/README.md +++ b/exercises/D-strings/README.md @@ -1,6 +1,6 @@ In programming there are different _types of_ data. You've used one data type already: **string**. -Computers recognise strings as a sequence of characters but to humans, strings are simply lines of text. +Computers recognize strings as a sequence of characters but to humans, strings are simply lines of text. ```js var message = "This is a string"; diff --git a/exercises/D-strings/exercise.js b/exercises/D-strings/exercise.js index 2cffa6a81..41c1449e7 100644 --- a/exercises/D-strings/exercise.js +++ b/exercises/D-strings/exercise.js @@ -1,3 +1,5 @@ // Start by creating a variable `message` - +var message = "Strings are brilliant tools in jS."; +var 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..9684d8bcf 100644 --- a/exercises/E-strings-concatenation/exercise.js +++ b/exercises/E-strings-concatenation/exercise.js @@ -1,3 +1,6 @@ // Start by creating a variable `message` +var greeting = "Hi there, welcome, my name is"; +var name = " Ryan"; +var message = greeting + name; console.log(message); diff --git a/exercises/F-strings-methods/exercise.js b/exercises/F-strings-methods/exercise.js index 2cffa6a81..26e10b48e 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` - +name = "Ryan"; +message = "Hey there my name is " + name + " and it is " + name.length + " characters long."; console.log(message); diff --git a/exercises/F-strings-methods/exercise2.js b/exercises/F-strings-methods/exercise2.js index b4b46943d..542c828a4 100644 --- a/exercises/F-strings-methods/exercise2.js +++ b/exercises/F-strings-methods/exercise2.js @@ -1,3 +1,5 @@ const name = " Daniel "; +greeting = "Hi, my name is " + name.trim() + " and it is " + name.length + " characters long."; +// message = greeting.trim(); -console.log(message); +console.log(greeting); diff --git a/exercises/G-numbers/README.md b/exercises/G-numbers/README.md index 4c6f45a41..1e8b18a82 100644 --- a/exercises/G-numbers/README.md +++ b/exercises/G-numbers/README.md @@ -6,7 +6,7 @@ Unlike strings, numbers do not need to be wrapped in quotes. var age = 30; ``` -You can use mathematical operators to caclulate numbers: +You can use mathematical operators to calculate numbers: ```js var sum = 10 + 2; // 12 @@ -25,5 +25,5 @@ var difference = 10 - 2; // 8 ``` Number of students: 15 Number of mentors: 8 -Total numnber of students and mentors: 23 +Total number of students and mentors: 23 ``` diff --git a/exercises/G-numbers/exercise.js b/exercises/G-numbers/exercise.js index 49e7bc00b..78ce7d5b6 100644 --- a/exercises/G-numbers/exercise.js +++ b/exercises/G-numbers/exercise.js @@ -1 +1,8 @@ // Start by creating a variables `numberOfStudents` and `numberOfMentors` +var numberOfStudents = 22; +var numberOfMentors = 15; + +sum = numberOfStudents + numberOfMentors; + +console.log(sum); +// console.log(numberOfStudents + numberOfMentors); \ No newline at end of file diff --git a/exercises/I-floats/exercise.js b/exercises/I-floats/exercise.js index a5bbcd852..b00fcbc64 100644 --- a/exercises/I-floats/exercise.js +++ b/exercises/I-floats/exercise.js @@ -1,2 +1,10 @@ var numberOfStudents = 15; var numberOfMentors = 8; + +var sum = numberOfMentors + numberOfStudents; + +var percentageOfStudents = Math.round(numberOfStudents / sum * 100); +var percentageOfMentors = Math.round(numberOfMentors / sum * 100); + +console.log(percentageOfStudents+"%"); +console.log(percentageOfMentors+"%"); \ No newline at end of file diff --git a/exercises/J-functions/exercise.js b/exercises/J-functions/exercise.js index 0ae5850e5..bd5c57928 100644 --- a/exercises/J-functions/exercise.js +++ b/exercises/J-functions/exercise.js @@ -1,7 +1,12 @@ function halve(number) { // complete the function here + return number / 2; } var result = halve(12); +var result2 = halve(23); +var result3 = halve(30); console.log(result); +console.log(result2); +console.log(result3); diff --git a/exercises/J-functions/exercise2.js b/exercises/J-functions/exercise2.js index 82ef5e780..468d45596 100644 --- a/exercises/J-functions/exercise2.js +++ b/exercises/J-functions/exercise2.js @@ -1,5 +1,6 @@ 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..a4eed9d76 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, num2) { // Calculate the result of the function and return it + return num1 * num2; } // 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..ff8703696 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 (num1, num2){ + return num1/num2; +} 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..60bc7aefe 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 "Hi there, 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..be037ea9f 100644 --- a/exercises/K-functions-parameters/exercise4.js +++ b/exercises/K-functions-parameters/exercise4.js @@ -1,5 +1,8 @@ // Declare your function first - +function addition(num1, num2){ + return num1 + num2; +} // Call the function and assign to a variable `sum` +var sum = addition(13, 124); console.log(sum); diff --git a/exercises/K-functions-parameters/exercise5.js b/exercises/K-functions-parameters/exercise5.js index 7c5bcd605..9e6e639c8 100644 --- a/exercises/K-functions-parameters/exercise5.js +++ b/exercises/K-functions-parameters/exercise5.js @@ -1,5 +1,7 @@ // 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); console.log(greeting); diff --git a/exercises/L-functions-nested/README.md b/exercises/L-functions-nested/README.md index f5e571303..11597c986 100644 --- a/exercises/L-functions-nested/README.md +++ b/exercises/L-functions-nested/README.md @@ -9,7 +9,7 @@ function getAgeInDays(age) { return age * 365; } -function createCreeting(name, age) { +function createGreeting(name, age) { var ageInDays = getAgeInDays(age); var message = "My Name is " + name + " and I was born over " + ageInDays + " days ago!"; diff --git a/exercises/L-functions-nested/exercise.js b/exercises/L-functions-nested/exercise.js index a5d377442..228e59f26 100644 --- a/exercises/L-functions-nested/exercise.js +++ b/exercises/L-functions-nested/exercise.js @@ -1,5 +1,40 @@ +// exercise 1 +var students = 8; +var mentors = 15; + +function percentage(total){ + +var sum = students + mentors; +return Math.round(total/sum *100) + "%"; + +} + +function result(message, type){ +return message + type; + +} + +console.log(result("The percentage of ", "students in the class is ") + percentage(8)); +console.log(result("The percentage of ", "mentors in the class is ") + percentage(15)); + +// exercise2 + var mentor1 = "Daniel"; var mentor2 = "Irina"; var mentor3 = "Mimi"; var mentor4 = "Rob"; var mentor5 = "Yohannes"; + +function upperCase(name){ + return name.toUpperCase(); +} + +function greeting(name){ + return "HELLO " + name + "!"; +} + +console.log(greeting(upperCase(mentor1))); +console.log(greeting(upperCase(mentor2))); +console.log(greeting(upperCase(mentor3))); +console.log(greeting(upperCase(mentor4))); +console.log(greeting(upperCase(mentor5))); diff --git a/mandatory/1-syntax-errors.js b/mandatory/1-syntax-errors.js index 0a21afd1b..52e58d427 100644 --- a/mandatory/1-syntax-errors.js +++ b/mandatory/1-syntax-errors.js @@ -1,16 +1,16 @@ // 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..3f63dfc07 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..5ae78450d 100644 --- a/mandatory/3-function-output.js +++ b/mandatory/3-function-output.js @@ -1,15 +1,18 @@ // Add comments to explain what this function does. You're meant to use Google! +// The below function will generate a random number between 0 and 1 and multiply by 10 returning a number between 0 and 9 function getNumber() { return Math.random() * 10; } // Add comments to explain what this function does. You're meant to use Google! +// The below string method concatenates the two arguments. function s(w1, w2) { return w1.concat(w2); } function concatenate(firstWord, secondWord, thirdWord) { // Write the body of this function to concatenate three words together. + return firstWord + " " + secondWord + " " + thirdWord; // Look at the test case below to understand what this function is expected to return. } diff --git a/mandatory/4-tax.js b/mandatory/4-tax.js index c9e41c691..cb2d30b7a 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) { + +return price + price*0.2; + +} /* CURRENCY FORMATTING @@ -17,7 +21,13 @@ 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 result = (calculateSalesTax(price)).toFixed(2); + console.log(result); + return "£" + result; + + +} /* ===================================================