CodeYourFuture · cbaggini · Nov 25, 2020 · Nov 25, 2020 · Nov 25, 2020 · Nov 26, 2020
diff --git a/exercises/B-hello-world/README.md b/exercises/B-hello-world/README.md
@@ -6,13 +6,13 @@ Inside of `exercise.js` there's a line of code that will print "Hello world!".
 
 ### 1. Run the program
 
-* Open a terminal window
-* Change directory to this folder (`cd B-hello-world`)
-* Run the program using node (`node exercise.js`)
+- Open a terminal window
+- Change directory to this folder (`cd B-hello-world`)
+- Run the program using node (`node exercise.js`)
 
 ### 2. Experiment
 
-* 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?
+- 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? Syntax error
+- What happens when you console.log() just a number without quotes? It prints the number
diff --git a/exercises/B-hello-world/exercise.js b/exercises/B-hello-world/exercise.js
@@ -1 +1,2 @@
-console.log("Hello world");
+console.log("Hello World. I just started learning JavaScript!");
+console.log(2);
diff --git a/exercises/C-variables/README.md b/exercises/C-variables/README.md
@@ -12,8 +12,8 @@ The program above will print "Hello world" to the console. Notice how it uses th
 
 ## Exercise
 
-* Add a variable `greeting` to exercise.js (make sure it comes _before_ the console.log)
-* Print your `greeting` to the console 3 times
+- Add a variable `greeting` to exercise.js (make sure it comes _before_ the console.log)
+- Print your `greeting` to the console 3 times
 
 > Remember: to run this exercise you must change directory to the `D-variables`. If you already have a terminal window open for the previous exercise you can do this by running the command `cd ../D-variables`.
 

diff --git a/exercises/C-variables/exercise.js b/exercises/C-variables/exercise.js
@@ -1,3 +1,6 @@
 // Start by creating a variable `greeting`
+const 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
@@ -19,7 +19,7 @@ console.log(messageType); // logs 'string'
 
 ## Exercise
 
-* Write a program that logs a message and its type
+- Write a program that logs a message and its type
 
 ## Expected result
 

diff --git a/exercises/D-strings/exercise.js b/exercises/D-strings/exercise.js
@@ -1,3 +1,5 @@
 // Start by creating a variable `message`
+const message = "This is a string";
 
 console.log(message);
+console.log(typeof message);
diff --git a/exercises/E-strings-concatenation/exercise.js b/exercises/E-strings-concatenation/exercise.js
@@ -1,3 +1,7 @@
 // Start by creating a variable `message`
+let greetingStart = "Hello, my name is ";
+let name = "Cecilia";
 
-console.log(message);
+let greeting = greetingStart + name;
+
+console.log(greeting); 
diff --git a/exercises/F-strings-methods/exercise.js b/exercises/F-strings-methods/exercise.js
@@ -1,3 +1,4 @@
 // Start by creating a variable `message`
+const name = "Cecilia"
 
-console.log(message);
+console.log("My name is " + name + " and my name is " + name.length + " characters long"); 
diff --git a/exercises/F-strings-methods/exercise2.js b/exercises/F-strings-methods/exercise2.js
@@ -1,3 +1,3 @@
 const name = " Daniel  ";
 
-console.log(message);
+console.log("My name is " + name.trim() + " and my name is " + name.trim().length + " characters long"); 
diff --git a/exercises/G-numbers/exercise.js b/exercises/G-numbers/exercise.js
@@ -1 +1,7 @@
 // Start by creating a variables `numberOfStudents` and `numberOfMentors`
+const numberOfStudents = 15;
+const numberOfMentors = 8;
+
+console.log("Number of students: " + numberOfStudents);
+console.log("Number of mentors: " + numberOfMentors);
+console.log("Total number of students and mentors: " + (numberOfMentors + numberOfStudents));
diff --git a/exercises/I-floats/exercise.js b/exercises/I-floats/exercise.js
@@ -1,2 +1,5 @@
-var numberOfStudents = 15;
-var numberOfMentors = 8;
+const numberOfStudents = 15;
+const numberOfMentors = 8; 
+
+console.log("Percentage students: " + Math.round(numberOfStudents/(numberOfStudents + numberOfMentors)*100)+"%");
+console.log("Percentage mentors: " + Math.round(numberOfMentors/(numberOfStudents + numberOfMentors)*100)+"%");
diff --git a/exercises/J-functions/exercise.js b/exercises/J-functions/exercise.js
@@ -1,7 +1,11 @@
 function halve(number) {
   // complete the function here
+  return number/2;
 }
 
-var result = halve(12);
+let result = halve(12);
+
+let result1 = halve(15); 
 
 console.log(result);
+console.log(result1);
diff --git a/exercises/J-functions/exercise2.js b/exercises/J-functions/exercise2.js
@@ -1,7 +1,8 @@
 function triple(number) {
   // complete function here
+  return number*3;
 }
 
-var result = triple(12);
+let result = triple(12);
 
 console.log(result);
diff --git a/exercises/K-functions-parameters/exercise.js b/exercises/K-functions-parameters/exercise.js
@@ -1,9 +1,10 @@
 // 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`
-var result = multiply(3, 4);
+const result = multiply(3, 4);
 
 console.log(result);
diff --git a/exercises/K-functions-parameters/exercise2.js b/exercises/K-functions-parameters/exercise2.js
@@ -1,5 +1,8 @@
 // Declare your function first
+function divide(a, b) {
+    return a/b;
+}
 
-var result = divide(3, 4);
+const result = divide(3, 4);
 
 console.log(result);
diff --git a/exercises/K-functions-parameters/exercise3.js b/exercises/K-functions-parameters/exercise3.js
@@ -1,5 +1,8 @@
 // Write your function here
+function createGreeting(greet) {
+    return "Hello, my name is " + greet;
+}
 
-var greeting = createGreeting("Daniel");
+const greeting = createGreeting("Daniel");
 
 console.log(greeting);
diff --git a/exercises/K-functions-parameters/exercise4.js b/exercises/K-functions-parameters/exercise4.js
@@ -1,5 +1,8 @@
 // Declare your function first
-
+function addition(a,b) {
+    return a + b;
+}
 // Call the function and assign to a variable `sum`
+let sum = addition(13, 124);
 
 console.log(sum);
diff --git 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
@@ -1,5 +1,16 @@
-var mentor1 = "Daniel";
-var mentor2 = "Irina";
-var mentor3 = "Mimi";
-var mentor4 = "Rob";
-var mentor5 = "Yohannes";
+let students = { "type": "students", "number": 15};
+let mentors = { "type": "mentors", "number": 8};
+
+function calculatePercentage(a,b) {
+    return Math.round(a.number / (a.number + b.number) * 100);
+}
+
+function createMessage(cat1, cat2) {
+    return "Percentage " + cat1.type + ": " + calculatePercentage(cat1, cat2) + "%";
+}
+
+let percentageOfStudents = createMessage(students, mentors);
+let percentageOfMentors = createMessage(mentors, students);
+
+console.log(percentageOfStudents);
+console.log(percentageOfMentors);
diff --git a/exercises/L-functions-nested/exercise2.js b/exercises/L-functions-nested/exercise2.js
@@ -0,0 +1,19 @@
+let mentor1 = "Daniel";
+let mentor2 = "Irina";
+let mentor3 = "Mimi";
+let mentor4 = "Rob";
+let mentor5 = "Yohannes";
+
+function shoutName(name) {
+    return name.toUpperCase();
+}
+
+function shoutGreeting(mentor) {
+    return "HELLO " + shoutName(mentor);
+}
+
+console.log(shoutGreeting(mentor1));
+console.log(shoutGreeting(mentor2));
+console.log(shoutGreeting(mentor3));
+console.log(shoutGreeting(mentor4));
+console.log(shoutGreeting(mentor5));
diff --git a/extra/1-currency-conversion.js b/extra/1-currency-conversion.js
@@ -5,7 +5,9 @@
   Write a function that converts a price to USD (exchange rate is 1.4 $ to £)
 */
 
-function convertToUSD() {}
+function convertToUSD(price) {
+  return price * 1.4;
+}
 
 /*
   CURRENCY FORMATTING
@@ -15,7 +17,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(price) {
+  return price * 0.99 * 5.7;
+}
 
 /* ======= 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
@@ -16,26 +16,28 @@
   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(num) {
+    return `£${num}`;
 }
 
 const startingValue = 2
 
 // Why can this code be seen as bad practice? Comment your answer.
-let badCode = 
+// It is not clear what's going on for someone who is not familiar with the code.
+let badCode = format(multiply(add(startingValue, 10), 2));
 
 /* BETTER PRACTICE */
-
-let goodCode = 
+let addedValue = add(startingValue, 10);
+let multipliedValue = multiply(addedValue, 2);
+let goodCode = format(multipliedValue);
 
 /* ======= TESTS - DO NOT MODIFY ===== 
 There are some Tests in this file that will help you work out if your code is working.