CodeYourFuture · BereniceOgundele · Jul 3, 2022 · Jul 3, 2022 · Aug 2, 2022 · Aug 3, 2022
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,4 @@
+{
+    "editor.formatOnSave": true,
+    "editor.formatOnPaste": true
+}
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.", "I just started learning JavaScript", "I am very new at this, Lets see if this worked");
+// console.log(I am very new at this);
+console.log(5);
diff --git a/exercises/C-variables/exercise.js b/exercises/C-variables/exercise.js
@@ -1,3 +1,5 @@
 // Start by creating a variable `greeting`
-
+var greeting = "Hi there";
+console.log(greeting);
+console.log(greeting);
 console.log(greeting);
diff --git a/exercises/D-strings/README.md b/exercises/D-strings/README.md
@@ -2,6 +2,7 @@ In programming there are different _types of_ data. You've used one data type al
 
 Computers recognise strings as a sequence of characters but to humans, strings are simply lines of text.
 
+
 ```js
 var message = "This is a string";
 ```
@@ -17,6 +18,7 @@ var messageType = typeof message;
 console.log(messageType); // logs 'string'
 ```
 
+
 ## Exercise
 
 - Write a program that logs a message and its type

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 exercise";
+var messageType = typeof message;
+
+console.log(messageType);
 
-console.log(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`
+var greetingStart = "Hello, my name is ";
+var myName = "Berenice";
 
-console.log(message);
+var greeting = greetingStart + myName;
+
+console.log(greeting);
diff --git a/exercises/F-strings-methods/README.md b/exercises/F-strings-methods/README.md
@@ -10,10 +10,7 @@ console.log(nameLength); // Logs 6
 You can also get a modified version of a string by calling _string methods_. Let's try one:
 
 ```js
-var name = "Daniel";
-var nameLowerCase = name.toLowerCase();
-
-console.log(nameLowerCase); // "daniel"
+"" // "daniel"
 ```
 
 You can find out more about string properties and methods by searching for "JavaScript string methods".

diff --git a/exercises/F-strings-methods/exercise.js b/exercises/F-strings-methods/exercise.js
@@ -1,3 +1,7 @@
 // Start by creating a variable `message`
 
-console.log(message);
+const greetingStart = "My name is ";
+const myName  = "Daniel"
+const namePlusLength = " and my name is 6 characters long"
+
+console.log(greetingStart + myName + namePlusLength);
diff --git a/exercises/F-strings-methods/exercise2.js b/exercises/F-strings-methods/exercise2.js
@@ -1,3 +1,18 @@
-const name = " Daniel  ";
+const greetingStart = "My name is ";
+const myName  = " Daniel  "
+const namePlusLength = " and my name is 6 characters long"
+const message = myName.trim();
 
-console.log(message);
+console.log(myName.trim());
+
+
+
+
+
+
+
+// const name = " Daniel  ";
+// const message = name.trim();
+
+// console.log(message);
+// //was not sure if i should combine the X2 exercises 
diff --git a/exercises/G-numbers/exercise.js b/exercises/G-numbers/exercise.js
@@ -1 +1,6 @@
 // Start by creating a variables `numberOfStudents` and `numberOfMentors`
+
+let numberOfStudents = 15;
+let numberOfMentors = 8; 
+
+console.log(numberOfStudents + numberOfMentors);
diff --git a/exercises/I-floats/exercise.js b/exercises/I-floats/exercise.js
@@ -1,2 +1,7 @@
-var numberOfStudents = 15;
-var numberOfMentors = 8;
+var numberOfStudents = 15 / 23;
+var percentagePerGroup = Math.round(numberOfStudents);
+console.log(numberOfStudents);
+
+var numberOfMentors = 8 / 23;
+var percentagePerGroup = Math.round(numberOfMentors)
+console.log(numberOfMentors);
diff --git a/exercises/K-functions-parameters/exercise.js b/exercises/K-functions-parameters/exercise.js
@@ -1,5 +1,5 @@
 // Complete the function so that it takes input parameters
-function multiply() {
+function multiply(num1, num2) {
   // Calculate the result of the function and return it
 }
 

diff --git a/mandatory/1-syntax-errors.js b/mandatory/1-syntax-errors.js
@@ -1,16 +1,17 @@
 // 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;
+  total = a + b;
 
-  return "The total is total";
+  return "The total is " + total;
 }
 
 /* 

diff --git a/mandatory/2-logic-error.js b/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 trimWord();
 }
 
 function getStringLength(word) {
-  return "word".length();
+  return word.length();
 }
 
 function multiply(a, b, c) {
-  a * b * c;
-  return;
+  return a + b + c;
 }
 
 /* 

diff --git a/mandatory/3-function-output.js b/mandatory/3-function-output.js
@@ -2,13 +2,20 @@
 function getRandomNumber() {
   return Math.random() * 10;
 }
+//the function will get numbers between 1 and 10 and round it up or down 
 
 // Add comments to explain what this function does. You're meant to use Google!
 function combine2Words(word1, word2) {
   return word1.concat(word2);
 }
+// /two words will be combined to form a new word
 
 function concatenate(firstWord, secondWord, thirdWord) {
+  var one = "firstWord"
+  var two = "secondWord"
+  var three = "thirdWord"
+
+  console.log(one + two + three);
   // 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.
 }

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"
+        ]
       }
     ]
   },