CodeYourFuture · osagiestar · Jun 15, 2020 · Jun 15, 2020 · Jun 15, 2020 · Jun 15, 2020
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -1,10 +1,10 @@
 # Your Details

-Your Name:
-Your City:
-Your Slack Name:
+Your Name: Osagie Okoedo
+Your City: Birmingham
+Your Slack Name: Osagie Okoedo

 # Homework Details

-Module:
-Week:
+Module: JavaScript
+Week: 1
diff --git a/.vscode/launch.json 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": "node",
+            "request": "launch",
+            "name": "Launch Program",
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
+            "program": "${file}"
+        }
+    ]
+}
diff --git a/week-1/1-exercises/B-hello-world/exercise.js b/week-1/1-exercises/B-hello-world/exercise.js
@@ -1 +1,10 @@
-console.log("Hello world");
+/* console.log() with quotes, single or double, returns the message on the console*/
+console.log("Hello world. I just started learning JavaScript!");
+console.log('Hello world. I just started learning JavaScript!');
+console.log("Hello world. I just started learning JavaScript!");
+
+/*Without the quote marks, I see an error message (SyntaxError: missing) */
+console.log(Hello world. I just started learning JavaScript!);
+
+/* with just a number and no quotes the output is the number */
+console.log(4);
diff --git a/week-1/1-exercises/C-variables/exercise.js b/week-1/1-exercises/C-variables/exercise.js
@@ -1,3 +1,7 @@
-// Start by creating a variable `greeting`
+/* * */

+let greeting = "Hello world";
+
+console.log(greeting);
+console.log(greeting);
 console.log(greeting);
diff --git a/week-1/1-exercises/D-strings/exercise.js b/week-1/1-exercises/D-strings/exercise.js
@@ -1,3 +1,5 @@
 // Start by creating a variable `message`

+let message = "This is a string";
 console.log(message);
+console.log(typeof message);
diff --git a/week-1/1-exercises/E-strings-concatenation/exercise.js b/week-1/1-exercises/E-strings-concatenation/exercise.js
@@ -1,3 +1,4 @@
 // Start by creating a variable `message`
-
-console.log(message);
+let greeting = "Hello, my name is ";
+let name = "Osagie";
+console.log(greeting + name);
diff --git a/week-1/1-exercises/F-strings-methods/README.md b/week-1/1-exercises/F-strings-methods/README.md
@@ -4,7 +4,11 @@ You can find out how many characters there are in a string by using the `length`
 var name = "Daniel";
 var nameLength = name.length;

-console.log(nameLength); // Logs 6
+console.log(nameLength); // Logs 6var message = "This is a string";
+// var messageType = typeof message;
+
+// console.log(message);
+// console.log(messageType);
 ```

 You can also get a modified version of a string by calling _string methods_. Let's try one:
@@ -20,7 +24,7 @@ You can find out more about string properties and methods by searching for "Java

 ## Exercise 1

-* Log a message that includes the length of your name
+- Log a message that includes the length of your name

 ## Expected result

@@ -30,8 +34,8 @@ My name is Daniel and my name is 6 characters long

 ## Exercise 2

-* Log the same message using the variable, `name` provided
-* Use the `.trim` method to remove the extra whitespace
+- Log the same message using the variable, `name` provided
+- Use the `.trim` method to remove the extra whitespace

 ## Expected result


diff --git a/week-1/1-exercises/F-strings-methods/exercise.js b/week-1/1-exercises/F-strings-methods/exercise.js
@@ -1,3 +1,21 @@
 // Start by creating a variable `message`

+// Ecercise 1 //
+let name = "Osagie";
+let namelength = name.length;
+let message =
+  "My name is " + name + " and my name is " + namelength + " characters long";
+console.log(message);
+
+// Exercise 2 //
+// For this exercise, I made spaces before and after name//
+let nameWithSpace = "   Osagie  ";
+let nameTrimmed = nameWithSpace.trim();
+let namelength = nameWithSpace.length;
+let message =
+  "My name is " +
+  nameTrimmed +
+  " and my name is " +
+  nameTrimmed.length +
+  " characters long";
 console.log(message);
diff --git a/week-1/1-exercises/F-strings-methods/exercise2.js b/week-1/1-exercises/F-strings-methods/exercise2.js
@@ -1,3 +1,11 @@
+// Exercise 2 //
 const name = " Daniel  ";
-
+let nameTrimmed = name.trim();
+let namelength = nameTrimmed.length;
+let message =
+  "My name is " +
+  nameTrimmed +
+  " and my name is " +
+  nameTrimmed.length +
+  " characters long";
 console.log(message);
diff --git a/week-1/1-exercises/G-numbers/exercise.js b/week-1/1-exercises/G-numbers/exercise.js
@@ -1 +1,8 @@
-// Start by creating a variables `numberOfStudents` and `numberOfMentors`
+let numberOfStudents = 15;
+let numberOfMentors = 8;
+
+let totalOfStudentsAndMentors = numberOfStudents + numberOfMentors;
+let message = "Total number of students and mentors: ";
+
+console.log(message + totalOfStudentsAndMentors);
+console.log(`${message}${totalOfStudentsAndMentors}`);
diff --git a/week-1/1-exercises/I-floats/exercise.js b/week-1/1-exercises/I-floats/exercise.js
@@ -1,2 +1,20 @@
 var numberOfStudents = 15;
 var numberOfMentors = 8;
+let totalofStudentsAndMentors = numberOfStudents + numberOfMentors;
+
+let percentOfStudents = (numberOfStudents / totalofStudentsAndMentors) * 100;
+let percentOfMentors = (numberOfMentors / totalofStudentsAndMentors) * 100;
+
+let approxPercent = Math.round(percentOfStudents);
+let approxPer = Math.round(percentOfMentors);
+let comment1 = "Percentage students:";
+let comment2 = "Percentage mentors:";
+
+// console.log(percentOfStudents);
+// console.log(percentOfMentors);
+
+// console.log(approxPercent);
+// console.log(approxPer);
+
+console.log(`${comment1} ${approxPercent}%`);
+console.log(`${comment2} ${approxPer}%`);
diff --git a/week-1/1-exercises/J-functions/exercise.js b/week-1/1-exercises/J-functions/exercise.js
@@ -1,7 +1,11 @@
 function halve(number) {
-  // complete the function here
+  return number / 2; // complete the function here
 }

-var result = halve(12);
+let output = halve(12);
+let result = halve(50);
+let value = halve(36);

+console.log(output);
 console.log(result);
+console.log(value);
diff --git a/week-1/1-exercises/J-functions/exercise2.js b/week-1/1-exercises/J-functions/exercise2.js
@@ -1,7 +1,7 @@
 function triple(number) {
-  // complete function here
+  return number * 3;
 }

-var result = triple(12);
+let result = triple(12);

 console.log(result);
diff --git a/week-1/1-exercises/K-functions-parameters/exercise.js b/week-1/1-exercises/K-functions-parameters/exercise.js
@@ -1,9 +1,7 @@
-// Complete the function so that it takes input parameters
-function multiply() {
-  // Calculate the result of the function and return it
-}
-
-// Assign the result of calling the function the variable `result`
-var result = multiply(3, 4);
+// multiplication function//

+function multiply(a, b) {
+  return a * b;
+}
+let result = multiply(3, 4);
 console.log(result);
diff --git a/week-1/1-exercises/K-functions-parameters/exercise2.js b/week-1/1-exercises/K-functions-parameters/exercise2.js
@@ -1,5 +1,7 @@
 // Declare your function first
-
-var result = divide(3, 4);
+function divide(a, b) {
+  return a / b;
+}
+let result = divide(3, 4);

 console.log(result);
diff --git a/week-1/1-exercises/K-functions-parameters/exercise3.js b/week-1/1-exercises/K-functions-parameters/exercise3.js
@@ -1,5 +1,8 @@
 // Write your function here
-
-var greeting = createGreeting("Daniel");
-
-console.log(greeting);
+function createGreeting(name) {
+  // let greeting = "Hello, my name is ";
+  // let fullGreeting = greeting + name;
+  let fullGreeting = "Hello, my name is " + name;
+  return fullGreeting;
+}
+console.log(createGreeting("Daniel"));
diff --git a/week-1/1-exercises/K-functions-parameters/exercise4.js b/week-1/1-exercises/K-functions-parameters/exercise4.js
@@ -1,5 +1,6 @@
 // Declare your function first
-
+function sum(num1, num2) {
+  return num1 + num2;
+}
 // Call the function and assign to a variable `sum`
-
-console.log(sum);
+console.log(sum(13, 124)); // calling the function and passing the numbers
diff --git a/week-1/1-exercises/K-functions-parameters/exercise5.js b/week-1/1-exercises/K-functions-parameters/exercise5.js
@@ -1,5 +1,8 @@
 // Declare your function here
-
-const greeting = createLongGreeting("Daniel", 30);
-
-console.log(greeting);
+function createLongGreeting(name, age) {
+  // let name = "Daniel";
+  // let age = 30;
+  const greeting = `My name is ${name} and I'm ${age} years old`;
+  return greeting;
+}
+console.log(createLongGreeting("Daniel", 30));
diff --git a/week-1/1-exercises/L-functions-nested/exercise.js b/week-1/1-exercises/L-functions-nested/exercise.js
@@ -1,5 +1,47 @@
+//Exercise 1//
+function percentProgram(firstNumber, secondNumber) {
+  let overallTotal = firstNumber + secondNumber;
+
+  let percentage = Math.round((firstNumber / overallTotal) * 100);
+  return percentage;
+}
+
+function message(numberOfStudents, numberOfMentors) {
+  let percentOfStudents = percentProgram(numberOfStudents, numberOfMentors);
+  let percentOfMentors = percentProgram(numberOfMentors, numberOfStudents);
+  let fullMessage = `Percentage students: ${percentOfStudents}% Percentage mentors: ${percentOfMentors}%`;
+  return fullMessage;
+}
+let finalMessage = message(15, 8);
+console.log(finalMessage);
+
+// console.log(`${comment1} ${approxPercent}%`);
+// console.log(`${comment2} ${approxPer}%`);
+
 var mentor1 = "Daniel";
 var mentor2 = "Irina";
 var mentor3 = "Mimi";
 var mentor4 = "Rob";
 var mentor5 = "Yohannes";
+
+function shoutyGreeting(mentor) {
+  let nameUpperCase = mentor.toUpperCase();
+  let greeting = `HELLO ${nameUpperCase}`;
+  return greeting;
+}
+
+let greeting1 = shoutyGreeting(mentor1);
+let greeting2 = shoutyGreeting(mentor2);
+let greeting3 = shoutyGreeting(mentor3);
+let greeting4 = shoutyGreeting(mentor4);
+let greeting5 = shoutyGreeting(mentor5);
+
+console.log(greeting1);
+
+console.log(greeting2);
+
+console.log(greeting3);
+
+console.log(greeting4);
+
+console.log(greeting5);
diff --git a/week-1/2-mandatory/1-syntax-errors.js b/week-1/2-mandatory/1-syntax-errors.js
@@ -1,17 +1,16 @@
 // There are syntax errors in this code - can you fix it to pass the tests?

-function addNumbers(a b c) {
-    return 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;
-
-    // Use string interpolation here
-    return "The total is %{total}"
+  let total = a + b;
+  return `The total is ${total}`;
 }

 /* ======= TESTS - DO NOT MODIFY =====
@@ -20,19 +19,25 @@ There are some Tests in this file that will help you work out if your code is wo
 To run these tests type `node 1-syntax-errors.js` into your terminal
 */

-const util = require('util');
+const util = require("util");

 function test(test_name, actual, expected) {
-    let status;
-    if (actual === expected) {
-        status = "PASSED";
-    } else {
-        status = `FAILED: expected: ${util.inspect(expected)} but your function returned: ${util.inspect(actual)}`;
-    }
-
-    console.log(`${test_name}: ${status}`);
+  let status;
+  if (actual === expected) {
+    status = "PASSED";
+  } else {
+    status = `FAILED: expected: ${util.inspect(
+      expected
+    )} but your function returned: ${util.inspect(actual)}`;
+  }
+
+  console.log(`${test_name}: ${status}`);
 }

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