diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 000000000..eab977d61 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,17 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "type": "pwa-node", + "request": "launch", + "name": "Launch Program", + "skipFiles": [ + "/**" + ], + "program": "${file}" + } + ] +} \ No newline at end of file diff --git a/exercises/B-hello-world/exercise.js b/exercises/B-hello-world/exercise.js index b179ee953..a726ed3cf 100644 --- a/exercises/B-hello-world/exercise.js +++ b/exercises/B-hello-world/exercise.js @@ -1 +1 @@ -console.log("Hello world"); +console.log(2+2); diff --git a/exercises/C-variables/exercise.js b/exercises/C-variables/exercise.js index a6bbb9786..42d22dafc 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/exercise.js b/exercises/D-strings/exercise.js index 2cffa6a81..538358fb0 100644 --- a/exercises/D-strings/exercise.js +++ b/exercises/D-strings/exercise.js @@ -1,3 +1,5 @@ // Start by creating a variable `message` - +message = "this is a string"; +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..7087acdbc 100644 --- a/exercises/E-strings-concatenation/exercise.js +++ b/exercises/E-strings-concatenation/exercise.js @@ -1,3 +1,8 @@ // Start by creating a variable `message` -console.log(message); +var greetingStart = "Hello, my name is "; +var name = "Daniel"; + +var greeting = greetingStart + name; + +console.log(greeting); \ No newline at end of file diff --git a/exercises/F-strings-methods/exercise.js b/exercises/F-strings-methods/exercise.js index 2cffa6a81..b3e428e30 100644 --- a/exercises/F-strings-methods/exercise.js +++ b/exercises/F-strings-methods/exercise.js @@ -1,3 +1,5 @@ // Start by creating a variable `message` -console.log(message); +name = "Fareedh"; +nameLength = name.length; +console.log("My name is " + name + " and it is "+ nameLength + " characters long"); diff --git a/exercises/F-strings-methods/exercise2.js b/exercises/F-strings-methods/exercise2.js index b4b46943d..ff00a98d1 100644 --- a/exercises/F-strings-methods/exercise2.js +++ b/exercises/F-strings-methods/exercise2.js @@ -1,3 +1,5 @@ -const name = " Daniel "; +name = "Fareedh"; +nameLength = name.length; +message = "My name is " + name + " and it is "+ nameLength + " characters long "; -console.log(message); +console.log(message.trim()); diff --git a/exercises/G-numbers/exercise.js b/exercises/G-numbers/exercise.js index 49e7bc00b..63853c923 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 numberOfMentors = 8; +let numberOfStudents = 15; +let totalNumber = numberOfMentors + numberOfStudents; + +console.log("Number of Mentors: "+ numberOfMentors); +console.log("Number of Students: "+ numberOfStudents); +console.log("Total Number of Student and Mentors: "+ totalNumber); diff --git a/exercises/I-floats/exercise.js b/exercises/I-floats/exercise.js index a5bbcd852..847a39452 100644 --- a/exercises/I-floats/exercise.js +++ b/exercises/I-floats/exercise.js @@ -1,2 +1,9 @@ var numberOfStudents = 15; var numberOfMentors = 8; +var totalNumber = numberOfMentors + numberOfStudents; + +var mentorPercentage = Math.round((numberOfMentors/totalNumber)*100) + "%"; +var studentPercentage = Math.round((numberOfStudents/totalNumber)*100) + "%"; + +console.log("Percentage of Students: "+ studentPercentage); +console.log("Percentage of Mentors: "+ mentorPercentage); \ No newline at end of file diff --git a/exercises/J-functions/exercise.js b/exercises/J-functions/exercise.js index 0ae5850e5..e9ba2f0ef 100644 --- a/exercises/J-functions/exercise.js +++ b/exercises/J-functions/exercise.js @@ -1,5 +1,6 @@ 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..6d216ffc6 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..2ae706109 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..e381b0244 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..edc9f3162 100644 --- a/exercises/K-functions-parameters/exercise3.js +++ b/exercises/K-functions-parameters/exercise3.js @@ -1,5 +1,8 @@ // 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..acbb89003 100644 --- a/exercises/K-functions-parameters/exercise4.js +++ b/exercises/K-functions-parameters/exercise4.js @@ -1,5 +1,9 @@ // Declare your function first +function addition(num1, num2){ + return num1+num2; +} // Call the function and assign to a variable `sum` +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/exercise.js b/exercises/L-functions-nested/exercise.js index a5d377442..5a3702852 100644 --- a/exercises/L-functions-nested/exercise.js +++ b/exercises/L-functions-nested/exercise.js @@ -3,3 +3,15 @@ var mentor2 = "Irina"; var mentor3 = "Mimi"; var mentor4 = "Rob"; var mentor5 = "Yohannes"; + +function greeting(name){ + var capital = "Hello, "+ name; + return capital.toUpperCase(); +} + + +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/extra/1-currency-conversion.js b/extra/1-currency-conversion.js index d82e59480..8a3bc1efd 100644 --- a/extra/1-currency-conversion.js +++ b/extra/1-currency-conversion.js @@ -5,7 +5,11 @@ Write a function that converts a price to USD (exchange rate is 1.4 $ to £) */ -function convertToUSD() {} +function convertToUSD(initialPrice) { + return Math.round(initialPrice*1.4)+ " $"; +} + +console.log(convertToUSD(1000)); /* CURRENCY CONVERSION @@ -15,7 +19,11 @@ 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(toBrazilian) { + return Math.round(toBrazilian*5.7 - (toBrazilian*5.7)*(1/100)) + " BRL"; +} +console.log(convertToBRL(1000)); + /* ======= 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..22cc030be 100644 --- a/extra/2-piping.js +++ b/extra/2-piping.js @@ -16,16 +16,17 @@ the final result to the variable goodCode */ -function add() { - +function add(num1, num2) { + return num1+num2; } -function multiply() { - +function multiply(num1, num2) { + return num1*num2; } -function format() { +function format(num) { + return "£" + num.toString(); } const startingValue = 2; diff --git a/extra/3-magic-8-ball.js b/extra/3-magic-8-ball.js index f3adbefa5..30e50656b 100644 --- a/extra/3-magic-8-ball.js +++ b/extra/3-magic-8-ball.js @@ -47,7 +47,9 @@ // and return the answer. function shakeBall() { //Write your code in here + console.log("The ball has been shaken!") } +shakeBall(); /* This function should say whether the answer it is given is @@ -60,6 +62,7 @@ function shakeBall() { */ function checkAnswer(answer) { //Write your code in here + } /* diff --git a/mandatory/1-syntax-errors.js b/mandatory/1-syntax-errors.js index a10cc9ac2..16f0b0b6d 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) { +//added missing comas. +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"; +// added + sign + return "Hello, my name is " + name "and I am " + age + "years old"; -function getTotal(a, b) { - total = a ++ b; - return "The total is total"; +function getTotal(a, b) { + total = a + b; +//took out one of the + signs and also corrected the return syntax + return "The total is" + total; } /* diff --git a/mandatory/2-logic-error.js b/mandatory/2-logic-error.js index 9cca7603b..7c1b3643f 100644 --- a/mandatory/2-logic-error.js +++ b/mandatory/2-logic-error.js @@ -1,16 +1,19 @@ // The syntax for this function is valid but it has an error, find it and fix it. function trimWord(word) { - return wordtrim(); + //Corrected the trim method + return word.trim(); } + function getStringLength(word) { - return "word".length(); + //took out the brackets because length method does not take parameters + return word.length; } function multiply(a, b, c) { - a * b * c; - return; + //corrected the positioning of the code + return a * b * c; } /* diff --git a/mandatory/3-function-output.js b/mandatory/3-function-output.js index 5a953ba60..690e8c97d 100644 --- a/mandatory/3-function-output.js +++ b/mandatory/3-function-output.js @@ -1,16 +1,23 @@ // Add comments to explain what this function does. You're meant to use Google! function getRandomNumber() { + // This gets a random number between 0 and 1(excluded) and multiplies it by 10 return Math.random() * 10; } // Add comments to explain what this function does. You're meant to use Google! function combine2Words(word1, word2) { + //this function joins two words that have been entered as parameters return word1.concat(word2); } 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. + //we could either return them with spaces between them like this ; + //return firstWord + " " + secondWord + " " + thirdWord; + //OR we could use the concat method to join the three strings(Here we add the spaces manually as we the parameters) + return firstWord.concat(secondWord).concat(thirdWord); + } /* diff --git a/mandatory/4-tax.js b/mandatory/4-tax.js index ba77c7ae2..75faf94ef 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 + ((20/100)*price); +} /* CURRENCY FORMATTING @@ -17,7 +19,11 @@ function calculateSalesTax() {} Remember that the prices must include the sales tax (hint: you already wrote a function for this!) */ -function addTaxAndFormatCurrency() {} +function addTaxAndFormatCurrency(price) { + var transform = "£" + parseFloat(calculateSalesTax(price)).toFixed(2); + return transform; +} +console.log(addTaxAndFormatCurrency(34)); /* ===================================================