NorthWest class 4 - Salvador Cuevas Garcia - JavaScript - 1

exercises/B-hello-world/README.md

@@ -14,5 +14,5 @@ Inside of `exercise.js` there's a line of code that will print "Hello world!".
 
 - Try to `console.log()` something different. For example, 'Hello World. I just started learning JavaScript!'.
 - Try to console.log() several things at once.
-- What happens when you get rid of the quote marks?
-- What happens when you console.log() just a number without quotes?
+- What happens when you get rid of the quote marks? SyntaxError: missing ) after argument list
+- What happens when you console.log() just a number without quotes? Shows the number in yellow.

exercises/B-hello-world/exercise.js

@@ -1 +1,6 @@
-console.log("Hello world");
+console.log("Hello World. I just started learning JavaScript!");
+console.log("Hello World. I just started learning JavaScript! 1");
+console.log("Hello World. I just started learning JavaScript! 2");
+console.log("Hello World. I just started learning JavaScript! 3");
+console.log("Hello World. I just started learning JavaScript! 4");
+console.log(1);

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);
+

exercises/D-strings/exercise.js

@@ -1,3 +1,5 @@
 // Start by creating a variable `message`
-
+var message = "This is a string"
+var typemessage = typeof message
 console.log(message);
+console.log(typemessage);

exercises/E-strings-concatenation/exercise.js

@@ -1,3 +1,5 @@
 // Start by creating a variable `message`
-
-console.log(message);
+var greetingStart = "Hello, my name is";
+var myname = " Salvador";
+var greeting = greetingStart + myname;
+console.log(greeting);

exercises/F-strings-methods/exercise.js

@@ -1,3 +1,10 @@
 // Start by creating a variable `message`
+var greetingStart = "My name is ";
+var myname = "Salvador ";
+var greetingMiddle = "and my name is ";
+var nameLength = myname.length;
+var greetingEnd = " characters long"
 
-console.log(message);
+var alltogether = greetingStart + myname + greetingMiddle + nameLength + greetingEnd;
+
+console.log(alltogether);

exercises/F-strings-methods/exercise2.js

@@ -1,3 +1,4 @@
 const name = " Daniel  ";
+var trim = name.trim();
 
-console.log(message);
+console.log(trim);

exercises/G-numbers/exercise.js

@@ -1 +1,10 @@
 // Start by creating a variables `numberOfStudents` and `numberOfMentors`
+var students = 15;
+var mentors = 8;
+var numberOfStudents = "Number of students: " + students;
+var numberOfMentors = "Number of mentors: " + mentors;
+var total = "Total numnber of students and mentors: " + (mentors + students);
+
+console.log(numberOfStudents);
+console.log(numberOfMentors);
+console.log(total);

exercises/I-floats/README.md

@@ -1,8 +1,4 @@
-Numbers can be integers (whole numbers) or floats (numbers with a decimal).
-
-```js
-var preciseAge = 30.612437;
-```
+---
 
 Floats can be rounded to the nearest whole number using the `Math.round` function:
 
@@ -21,3 +17,5 @@ var roughAge = Math.round(preciseAge); // 30
 Percentage students: 65%
 Percentage mentors: 35%
 ```
+
+-

exercises/I-floats/exercise.js

@@ -1,2 +1,12 @@
 var numberOfStudents = 15;
 var numberOfMentors = 8;
+var porcentageStudents =
+  (numberOfStudents * 100) / (numberOfStudents + numberOfMentors);
+var porcentageMentors =
+  (numberOfMentors * 100) / (numberOfStudents + numberOfMentors);
+
+var students = Math.round(porcentageStudents);
+var mentors = Math.round(porcentageMentors);
+
+console.log("Percentage students: " + students + "%");
+console.log("Percentage mentors: " + mentors + "%");

exercises/J-functions/exercise.js

@@ -1,7 +1,11 @@
 function halve(number) {
   // complete the function here
+  return number / 2;
 }
 
 var result = halve(12);
 
 console.log(result);
+
+console.log(halve(5));
+console.log(halve(10));

exercises/J-functions/exercise2.js

@@ -1,5 +1,6 @@
 function triple(number) {
   // complete function here
+  return number * 3;
 }
 
 var result = triple(12);

exercises/K-functions-parameters/exercise.js

@@ -1,6 +1,7 @@
 // Complete the function so that it takes input parameters
-function multiply() {
+function multiply(a, b) {
   // Calculate the result of the function and return it
+  return a * b;
 }
 
 // Assign the result of calling the function the variable `result`

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);

exercises/K-functions-parameters/exercise3.js

@@ -1,4 +1,7 @@
 // Write your function here
+function createGreeting(string) {
+  return "Hello, my name is " + string;
+}
 
 var greeting = createGreeting("Daniel");
 

exercises/K-functions-parameters/exercise4.js

@@ -1,5 +1,9 @@
 // Declare your function first
+function add(a, b) {
+  return a + b;
+}
 
-// Call the function and assign to a variable `sum`
+var sum = add(13, 124);
 
 console.log(sum);
+// Call the function and assign to a variable `sum`

exercises/K-functions-parameters/exercise5.js

@@ -1,4 +1,7 @@
 // Declare your function here
+function createLongGreeting(string, a) {
+  return "Hello, my name is " + string + " and I'm " + a + " years old";
+}
 
 const greeting = createLongGreeting("Daniel", 30);
 

exercises/L-functions-nested/exercise.js

@@ -3,3 +3,14 @@ var mentor2 = "Irina";
 var mentor3 = "Mimi";
 var mentor4 = "Rob";
 var mentor5 = "Yohannes";
+
+function shout(string) {
+  var uppercase = string.toUpperCase();
+  return "HELLO " + uppercase;
+}
+
+console.log(shout(mentor1));
+console.log(shout(mentor2));
+console.log(shout(mentor3));
+console.log(shout(mentor4));
+console.log(shout(mentor5));

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;
+  var total = a + b;
 
-  return "The total is total";
+  return "The total is " + total;
 }
 
 /* 

mandatory/2-logic-error.js

@@ -1,16 +1,15 @@
 // 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;
 }
 
 /* 

mandatory/3-function-output.js

@@ -1,16 +1,17 @@
 // Add comments to explain what this function does. You're meant to use Google!
 function getRandomNumber() {
-  return Math.random() * 10;
+  return Math.random() * 10; // Get a random number and multiply it by 10
 }
 
 // Add comments to explain what this function does. You're meant to use Google!
 function combine2Words(word1, word2) {
-  return word1.concat(word2);
+  return word1.concat(word2); /* Join word1 and word2 */
 }
 
-function concatenate(firstWord, secondWord, thirdWord) {
+function concatenate(string1, string2, string3) {
   // 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 string1.concat(" ", string2, " ", string3);
 }
 
 /* 

mandatory/4-tax.js

@@ -5,8 +5,9 @@
   Sales tax is 20% of the price of the product.
 */
 
-function calculateSalesTax() {}
-
+function calculateSalesTax(num) {
+  return num * 1.2;
+}
 /*
   CURRENCY FORMATTING
   ===================
@@ -17,8 +18,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) {
+  var total = calculateSalesTax(num).toFixed(2);
+  return "£" + total;
+}
 /* 
 ===================================================
 ======= TESTS - DO NOT MODIFY BELOW THIS LINE =====

package.json

@@ -14,7 +14,9 @@
     "url": "https://github.com/CodeYourFuture/JavaScript-Core-1-Coursework-Week1/issues"
   },
   "jest": {
-    "setupFilesAfterEnv": ["jest-extended"]
+    "setupFilesAfterEnv": [
+      "jest-extended"
+    ]
   },
   "homepage": "https://github.com/CodeYourFuture/JavaScript-Core-1-Coursework-Week1#readme",
   "devDependencies": {