CodeYourFuture · ChrisKoetzee · Jul 1, 2022
diff --git a/exercises/B-hello-world/exercise.js b/exercises/B-hello-world/exercise.js
@@ -1 +1,3 @@
 console.log("Hello world");
+// console.log(I just learnt JS);
+// console.log(3);
diff --git a/exercises/C-variables/exercise.js b/exercises/C-variables/exercise.js
@@ -1,3 +1,7 @@
 // Start by creating a variable `greeting`
 
+var greeting = "Hello my peeps. ";
+
+console.log(greeting);
 console.log(greeting);
+console.log(greeting);
diff --git a/exercises/D-strings/exercise.js b/exercises/D-strings/exercise.js
@@ -1,3 +1,7 @@
 // Start by creating a variable `message`
 
-console.log(message);
+var textMessage = "This is a string";
+var messageType = typeof textMessage;
+
+console.log(textMessage);
+console.log(messageType);
diff --git a/exercises/E-strings-concatenation/exercise.js b/exercises/E-strings-concatenation/exercise.js
@@ -1,3 +1,8 @@
 // Start by creating a variable `message`
 
-console.log(message);
+var greetingStart = "Hello, my name is ";
+var name = "Chris";
+
+var 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,10 @@
 // Start by creating a variable `message`
 
+var name = "Chris";
+var nameLength = name.length;
+
+
+var message = `My name is ${name} and my name is ${nameLength} characters long`;
+// var message = "My name is " + name + " and my name is " + nameLength + " characters long";
+
 console.log(message);
diff --git a/exercises/F-strings-methods/exercise2.js b/exercises/F-strings-methods/exercise2.js
@@ -1,3 +1,8 @@
-const name = " Daniel  ";
+// const name = " Daniel  ";
 
-console.log(message);
+const name = "Daniel";
+var nameLength = name.length;
+
+var message = "My name is " + name + " and my name is " + nameLength + " characters long";
+
+console.log(message.trim());
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 = 15;
+var numberOfMentors = 8;
+var sum = numberOfStudents + numberOfMentors;
+
+var message = `Total number of students and mentors is : ${sum}`;
+console.log(message);
diff --git a/exercises/I-floats/exercise.js b/exercises/I-floats/exercise.js
@@ -1,2 +1,16 @@
 var numberOfStudents = 15;
 var numberOfMentors = 8;
+var sum = numberOfStudents + numberOfMentors;
+
+var percentageOfStudents = `Percentage students: ${numberOfStudents / sum * 100}`;
+var percentageOfMentors = `Percentage mentors: ${numberOfMentors / sum * 100}`;
+
+console.log(percentageOfStudents);
+console.log(percentageOfMentors);
+
+// var Students = 65.21739130434783;
+// var Stud = Math.round(Students);
+
+// var Mentors = 34.78260869565217;
+// var Ment = Math.round(Mentors);
+
diff --git a/exercises/J-functions/exercise.js b/exercises/J-functions/exercise.js
@@ -1,7 +1,19 @@
 function halve(number) {
+  return number / 2;
   // complete the function here
 }
 
 var result = halve(12);
 
 console.log(result);
+
+// var result = halve(10);
+// console.log(result);
+
+// var result = halve(8);
+// console.log(result);
+
+// var result = halve(1888888884);
+// console.log(result);
+
+
diff --git a/exercises/J-functions/exercise2.js b/exercises/J-functions/exercise2.js
@@ -1,7 +1,16 @@
 function triple(number) {
+  return number * 3;
   // complete function here
 }
 
 var result = triple(12);
 
 console.log(result);
+
+// var result = triple(8);
+// console.log(result);
+// var result = triple(20);
+// console.log(result);
+// var result = triple(50005000);
+// console.log(result);
+
diff --git a/package.json b/package.json
@@ -14,15 +14,21 @@
     "url": "https://github.com/CodeYourFuture/JavaScript-Core-1-Coursework-Week1/issues"
   },
   "jest": {
-    "setupFilesAfterEnv": ["jest-extended"],
+    "setupFilesAfterEnv": [
+      "jest-extended"
+    ],
     "projects": [
       {
         "displayName": "mandatory",
-        "testMatch": ["<rootDir>/mandatory/*.js"]
+        "testMatch": [
+          "<rootDir>/mandatory/*.js"
+        ]
       },
       {
         "displayName": "extra",
-        "testMatch": ["<rootDir>/extra/*.js"]
+        "testMatch": [
+          "<rootDir>/extra/*.js"
+        ]
       }
     ]
   },