CodeYourFuture · AlexJora · Jul 1, 2022 · Jul 23, 2022 · Jul 23, 2022 · chandredewet
diff --git a/exercises/B-hello-world/README.md b/exercises/B-hello-world/README.md
@@ -5,9 +5,7 @@ We'll do this in JavaScript, using something called `console.log()`.
 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 exercises/B-hello-world`) - assuming you're at the project root
+('cd exercises/B-hello-world`) - assuming you're at the project root
 - Run the program using node (`node exercise.js`)
 
 ### 2. Experiment

diff --git 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');
+console.log("hello there!!!");
+console.log("finally working!");
+console.log("not working");
diff --git a/exercises/C-variables/README.md b/exercises/C-variables/README.md
@@ -15,7 +15,7 @@ The program above will print "Hello world" to the console. Notice how it uses th
 - 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 `C-variables`. If you already have a terminal window open for the previous exercise you can do this by running the command `cd ../C-variables`.
+> Remember: to run this exercise you must change directory to the `C-variables`. If you already have a terminal window open for the previous exercise you can do this by running the command ``.
 
 ## Expected result
 

diff --git a/exercises/C-variables/exercise.js b/exercises/C-variables/exercise.js
@@ -1,3 +1,3 @@
 // Start by creating a variable `greeting`
-
-console.log(greeting);
+let greeting = "Isn't good day at all!"
+console.log(greeting);
diff --git a/exercises/D-strings/exercise.js b/exercises/D-strings/exercise.js
@@ -1,3 +1,6 @@
 // Start by creating a variable `message`
+var message = "This is a string string"
 
-console.log(message);
+var messageType = typeof message;
+
+console.log(messageType);
diff --git a/exercises/E-strings-concatenation/exercise.js b/exercises/E-strings-concatenation/exercise.js
@@ -1,3 +1,5 @@
 // Start by creating a variable `message`
-
+var greeting = "Good day, my name is ";
+var myName = "Catalina";
+var message = greeting + myName;
 console.log(message);
diff --git a/exercises/F-strings-methods/exercise.js b/exercises/F-strings-methods/exercise.js
@@ -1,3 +1,8 @@
 // Start by creating a variable `message`
+var message1 = "My name is Catalina-Alexandra and my name is ";
+var message2 = " characters long";
+var myName = "Catalina-Alexandra";
+var nameLength = myName.length;
+var message = message1 + nameLength + message2;
 
 console.log(message);
diff --git a/exercises/F-strings-methods/exercise2.js b/exercises/F-strings-methods/exercise2.js
@@ -1,3 +1,11 @@
-const name = " Daniel  ";
+const myName = " Catalina-Alexandra  ";
+const trimmed = myName.trim();
+var message1 = "My name is ";
+var message2 = " and my name is ";
+var message3 = " characters long";
+
+var nameLength = myName.length;
+var message = message1 + trimmed + message2 + nameLength + message3;
+
 
 console.log(message);
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`
+var numberOfStudents = 30 + 2;
+var numberOfMentors = 8 + 1;
+var total = numberOfStudents + numberOfMentors;
+console.log("Number of students: " + numberOfStudents);
+console.log("Number of mentors: " + numberOfMentors);
+console.log("Total number of students and mentors: " + total);
diff --git a/exercises/I-floats/exercise.js b/exercises/I-floats/exercise.js
@@ -1,2 +1,9 @@
 var numberOfStudents = 15;
 var numberOfMentors = 8;
+var proNrOfStudents = 1500 / 23;
+var proNrOfMentors = 800 / 23;
+var proNrOfStudentsRound = Math.round(proNrOfStudents);
+var proNrOfMentorsRound = Math.round(proNrOfMentors);
+
+console.log("Procent of students: " + proNrOfStudentsRound + "%");
+console.log("Procent of mentors: " + proNrOfMentorsRound + "%");
diff --git a/exercises/J-functions/exercise.js b/exercises/J-functions/exercise.js
@@ -1,7 +1,8 @@
 function halve(number) {
   // complete the function here
+  return number / 2;
 }
 
-var result = halve(12);
+var result = halve(200);
 
 console.log(result);
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);
+var result = triple(7);
 
 console.log(result);
diff --git 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
@@ -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
@@ -1,5 +1,8 @@
 // Write your function here
+function createGreeting(myName) {
+    return "Hello, my name is  " + myName;
+}
 
-var greeting = createGreeting("Daniel");
+var greeting = createGreeting("Catalina");
 
 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(nr1, nr2) {
+    return nr1 + nr2;
+}
 
 // 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
@@ -1,5 +1,8 @@
 // Declare your function here
+function createLongGreeting(myName, age) {
+    return "Hello, my name is " + myName + " and I'm " + age + " years old."
+}
 
-const greeting = createLongGreeting("Daniel", 30);
+const greeting = createLongGreeting("Catalina", 47);
 
 console.log(greeting);
diff --git a/exercises/L-functions-nested/exercise.js b/exercises/L-functions-nested/exercise.js
@@ -3,3 +3,18 @@ var mentor2 = "Irina";
 var mentor3 = "Mimi";
 var mentor4 = "Rob";
 var mentor5 = "Yohannes";
+
+function upCase(name) {
+    return name.toUpperCase();
+}
+function greeting(name) {
+    let shouty = upCase(name);
+    let message = "GOOD DAY " + shouty;
+    return message;
+}
+console.log(greeting(mentor1));
+console.log(greeting(mentor2));
+console.log(greeting(mentor3));
+console.log(greeting(mentor4));
+console.log(greeting(mentor5));
+
diff --git a/extra/1-currency-conversion.js b/extra/1-currency-conversion.js
@@ -5,8 +5,11 @@
   Write a function that converts a price to USD (exchange rate is 1.4 $ to £)
 */
 
-function convertToUSD() {}
+function convertToUSD(pound) {
+  return pound * 1.4;
 
+}
+console.log(convertToUSD(32))
 /*
   CURRENCY CONVERSION
   ===================
@@ -15,8 +18,10 @@ 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(pound) {
+  return pound * 5.7;
+}
+console.log(convertToBRL(30));
 /* ======= 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,58 +16,62 @@
   the final result to the variable goodCode
 */
 
-function add() {
+// function add(2, 4) {
+//   return 2 + 4;
 
-}
+// }
 
-function multiply() {
+// function multiply(5, 6) {
+//   return 5 * 6;
 
-}
+// }
 
-function format() {
+// function format($, 20) {
+//   return "$" + "20"
 
-}
+// }
 
-const startingValue = 2;
+// const startingValue = 2;
 
-// Why can this code be seen as bad practice? Comment your answer.
-let badCode =
+// // Why can this code be seen as bad practice? Comment your answer.
+// let badCode =
 
-/* BETTER PRACTICE */
+//   /* BETTER PRACTICE */
 
-let goodCode =
 
-/* ======= TESTS - DO NOT MODIFY ===== 
-There are some Tests in this file that will help you work out if your code is working.
+//   let goodCode =
 
-To run the tests for just this one file, type `npm test -- --testPathPattern 2-piping` into your terminal
-(Reminder: You must have run `npm install` one time before this will work!)
-*/
+//     /* ======= TESTS - DO NOT MODIFY ===== 
+//     There are some Tests in this file that will help you work out if your code is working.
+
+//     To run the tests for just this one file, type `npm test -- --testPathPattern 2-piping` into your terminal
+//     (Reminder: You must have run `npm install` one time before this will work!)
+//     */
 
-test("add function - case 1 works", () => {
-  expect(add(1, 3)).toEqual(4);
-});
+//     test("add function - case 1 works", () => {
+//       expect(add(1, 3)).toEqual(4);
+//     });
 
-test("add function - case 2 works", () => {
-  expect(add(2.4, 5)).toEqual(7.4);
-});
+// test("add function - case 2 works", () => {
+//   expect(add(2.4, 5)).toEqual(7.4);
+// });
 
-test("multiply function works", () => {
-  expect(multiply(2, 3)).toEqual(6);
-});
+// test("multiply function works", () => {
+//   expect(multiply(2, 3)).toEqual(6);
+// });
 
-test("format function works for whole number", () => {
-  expect(format(16)).toEqual("£16");
-});
+// test("format function works for whole number", () => {
+//   expect(format(16)).toEqual("£16");
+// });
 
-test("format function works for decimal number", () => {
-  expect(format(10.1)).toEqual("£10.1");
-});
+// test("format function works for decimal number", () => {
+//   expect(format(10.1)).toEqual("£10.1");
+// });
 
-test("badCode variable correctly assigned", () => {
-  expect(badCode).toEqual("£24");
-});
+// test("badCode variable correctly assigned", () => {
+//   expect(badCode).toEqual("£24");
+// });
 
-test("goodCode variable correctly assigned", () => {
-  expect(goodCode).toEqual("£24");
-});
+// test("goodCode variable correctly assigned", () => {
+//   expect(goodCode).toEqual("£24");
+// });