diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 000000000..dad393a59 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,5 @@ +{ + "cSpell.words": [ + "Sonjide" + ] +} \ No newline at end of file diff --git a/exercises/B-hello-world/exercise.js b/exercises/B-hello-world/exercise.js index b179ee953..11308a141 100644 --- a/exercises/B-hello-world/exercise.js +++ b/exercises/B-hello-world/exercise.js @@ -1 +1,3 @@ console.log("Hello world"); +console.log(5); +console.log("I love Javascript.") \ No newline at end of file diff --git a/exercises/C-variables/exercise.js b/exercises/C-variables/exercise.js index a6bbb9786..1dd1a4fbe 100644 --- a/exercises/C-variables/exercise.js +++ b/exercises/C-variables/exercise.js @@ -1,3 +1,5 @@ // Start by creating a variable `greeting` - +let 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..99faa370f 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); +let message="My name is Kudakwashe." +console.log(message+" "+typeof(message)); diff --git a/exercises/E-strings-concatenation/exercise.js b/exercises/E-strings-concatenation/exercise.js index 2cffa6a81..4bc696057 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` - +let greeting="Hello my name is "; +let myName="Kuda"; +let message=greeting+myName ; console.log(message); diff --git a/exercises/F-strings-methods/exercise.js b/exercises/F-strings-methods/exercise.js index 2cffa6a81..5cd7ecfd1 100644 --- a/exercises/F-strings-methods/exercise.js +++ b/exercises/F-strings-methods/exercise.js @@ -1,3 +1,6 @@ // Start by creating a variable `message` - +let myName="Kudakwashe" +let characters=myName.length +let message="My name is "+myName+" and is "+characters+" characters long." console.log(message); + diff --git a/exercises/G-numbers/README.md b/exercises/G-numbers/README.md index 4c6f45a41..0612963fb 100644 --- a/exercises/G-numbers/README.md +++ b/exercises/G-numbers/README.md @@ -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..76c5f9920 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; +console.log("The number of students is "+numberOfStudents); +console.log("The number of mentors is "+numberOfMentors); +console.log("The total number of students and mentors is "+(numberOfMentors+numberOfStudents)); \ No newline at end of file diff --git a/exercises/I-floats/exercise.js b/exercises/I-floats/exercise.js index a5bbcd852..65401b34e 100644 --- a/exercises/I-floats/exercise.js +++ b/exercises/I-floats/exercise.js @@ -1,2 +1,8 @@ var numberOfStudents = 15; var numberOfMentors = 8; +let total=numberOfMentors+numberOfStudents; +let studentPercentage=numberOfStudents/total*100; +let mentorPercentage=numberOfMentors/total*100; +console.log("Percentage students: "+Math.round(studentPercentage)+"%"); +console.log("Mentor students: "+Math.round(mentorPercentage)+"%"); + diff --git a/exercises/J-functions/exercise.js b/exercises/J-functions/exercise.js index 0ae5850e5..138ec7810 100644 --- a/exercises/J-functions/exercise.js +++ b/exercises/J-functions/exercise.js @@ -1,7 +1,9 @@ function halve(number) { // complete the function here + return number*0.5; } var result = halve(12); console.log(result); +console.log(halve(9)); 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..46f8afff0 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..0fe7115e9 100644 --- a/exercises/K-functions-parameters/exercise3.js +++ b/exercises/K-functions-parameters/exercise3.js @@ -1,4 +1,7 @@ // Write your function here +function createGreeting(name){ + return "Hello, my name is "+name; +} var greeting = createGreeting("Daniel"); diff --git a/exercises/K-functions-parameters/exercise4.js b/exercises/K-functions-parameters/exercise4.js index 7ab44589e..e61c3bdd4 100644 --- a/exercises/K-functions-parameters/exercise4.js +++ b/exercises/K-functions-parameters/exercise4.js @@ -1,5 +1,9 @@ // Declare your function first +function addTwoNumbers(num1,num2){ + return num1+num2; +} // Call the function and assign to a variable `sum` +let sum=addTwoNumbers(13,124) console.log(sum); diff --git a/exercises/K-functions-parameters/exercise5.js b/exercises/K-functions-parameters/exercise5.js index 7c5bcd605..f48655e53 100644 --- a/exercises/K-functions-parameters/exercise5.js +++ b/exercises/K-functions-parameters/exercise5.js @@ -1,4 +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); diff --git a/exercises/L-functions-nested/exercise.js b/exercises/L-functions-nested/exercise.js index a5d377442..e704ddb07 100644 --- a/exercises/L-functions-nested/exercise.js +++ b/exercises/L-functions-nested/exercise.js @@ -3,3 +3,40 @@ var mentor2 = "Irina"; var mentor3 = "Mimi"; var mentor4 = "Rob"; var mentor5 = "Yohannes"; + + +function percentageCalculator(people,num, total){ + let percent=(num/total)*100; +function message(){ + return "Percentage "+people+": "+percent+"%"; +} +return message(); +} +console.log(percentageCalculator("Mentors",8,16)); +/*Exercise 2*/ +function greetings(name){ + var up=name.toUpperCase(); +function toUppercase(){ + return up; +} +return "HELLO "+up; +} +console.log(greetings(mentor1)) +console.log(greetings(mentor2)) +console.log(greetings(mentor3)) +console.log(greetings(mentor4)) +console.log(greetings(mentor5)) + + + + + + + + + + + + + + diff --git a/extra/1-currency-conversion.js b/extra/1-currency-conversion.js index 70a2fe863..cf83daea7 100644 --- a/extra/1-currency-conversion.js +++ b/extra/1-currency-conversion.js @@ -5,7 +5,10 @@ Write a function that converts a price to USD (exchange rate is 1.4 $ to £) */ -function convertToUSD() {} +function convertToUSD(euro) { + let us=euro*1.4 + return us; +} /* CURRENCY FORMATTING @@ -15,7 +18,9 @@ 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(euro) { + return euro*5.7*0.99; +} /* ======= 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 067dd0f5b..2d457c42a 100644 --- a/extra/2-piping.js +++ b/extra/2-piping.js @@ -16,26 +16,30 @@ the final result to the variable goodCode */ -function add() { +function add(a,b) { + return a+b; } -function multiply() { +function multiply(a,b) { + return a*b; } -function format() { +function format(a) { + return "£"+a; } const startingValue = 2 // Why can this code be seen as bad practice? Comment your answer. -let badCode = +//It is using string addition which makes the code a little bit more complex +let badCode = "£"+24; /* BETTER PRACTICE */ -let goodCode = +let goodCode = "£24" /* ======= 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/mandatory/1-syntax-errors.js b/mandatory/1-syntax-errors.js index 0a21afd1b..a898b732c 100644 --- a/mandatory/1-syntax-errors.js +++ b/mandatory/1-syntax-errors.js @@ -1,26 +1,25 @@ // 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"; - +addNumbers(3, 4 ,6) +function introduceMe(name, age){ +return "Hello, my name is " + name +" and I am "+ age + " years old"; +} +introduceMe("Sonjide ", 27) function getTotal(a, b) { - total = a ++ b; + total = a + b; - return "The total is total" + return "The total is "+total; } +getTotal(23,5) /* =================================================== ======= TESTS - DO NOT MODIFY BELOW THIS LINE ===== - There are some Tests in this file that will help you work out if your code is working. - To run these tests type `node 1-syntax-errors.js` into your terminal - =================================================== */ @@ -39,4 +38,4 @@ function test(test_name, actual, expected) { test("fixed addNumbers function - case 1", addNumbers(3, 4, 6), 13); test("fixed introduceMe function", introduceMe("Sonjide", 27), "Hello, my name is Sonjide and I am 27 years old"); -test("fixed getTotal function", getTotal(23, 5), "The total is 28"); +test("fixed getTotal function", getTotal(23, 5), "The total is 28"); \ No newline at end of file diff --git a/mandatory/2-logic-error.js b/mandatory/2-logic-error.js index 3c578ad87..d0cf0365d 100644 --- a/mandatory/2-logic-error.js +++ b/mandatory/2-logic-error.js @@ -1,16 +1,17 @@ // 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(); } - +trimWord(" CodeYourFuture "); 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..e21836ece 100644 --- a/mandatory/3-function-output.js +++ b/mandatory/3-function-output.js @@ -11,6 +11,7 @@ function s(w1, w2) { 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; } /* @@ -40,16 +41,16 @@ function test(test_name, actual, expected) { test( "concatenate function - case 1 works", - concatenate("code", "your", "future"), + concatenate("code ", "your ", "future"), "code your future" ); test( "concatenate function - case 2 works", - concatenate("I", "like", "pizza"), + concatenate("I ", "like ", "pizza"), "I like pizza" ); test( "concatenate function - case 3 works", - concatenate("I", "am", 13), + concatenate("I ", "am ", 13), "I am 13" ); diff --git a/mandatory/4-tax.js b/mandatory/4-tax.js index c9e41c691..b91c67aea 100644 --- a/mandatory/4-tax.js +++ b/mandatory/4-tax.js @@ -5,7 +5,10 @@ Sales tax is 20% of the price of the product */ -function calculateSalesTax() {} +function calculateSalesTax(price) { + let tax= price*0.20; + return price+tax; +} /* CURRENCY FORMATTING @@ -17,7 +20,10 @@ function calculateSalesTax() {} Remember that the prices must include the sales tax (hint: you already wrote a function for this!) */ -function addTaxAndFormatCurrency() {} +function addTaxAndFormatCurrency(tax) { + let money="$"+tax; + return money; +} /* ===================================================