CodeYourFuture · Osman-Hajr · Jun 19, 2020 · Jun 20, 2020 · Jun 20, 2020 · Jun 20, 2020
diff --git a/week-1/1-exercises/B-hello-world/exercise.js b/week-1/1-exercises/B-hello-world/exercise.js
@@ -1 +1,3 @@
-console.log("Hello world");
+console.log("Hello world. I just started learning JavaScript!.");
+console.log("My name is Osman.");
+console.log("I'm " + 27 + " years old.");
diff --git a/week-1/1-exercises/C-variables/exercise.js b/week-1/1-exercises/C-variables/exercise.js
@@ -1,3 +1,5 @@
 // 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,4 @@
 // 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,5 @@
 // Start by creating a variable `message`
-
-console.log(message);
+let name = "Osman.";
+let greeting = "Hello, my name is ";
+let introduction = greeting + name;
+console.log(introduction);
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,6 @@
 // Start by creating a variable `message`
-
-console.log(message);
+let name = "Osman";
+let nameLength = name.length;
+console.log(
+	"My name is " + name + "and my name is " + nameLength + " characters long"
+);
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,10 @@
-const name = " Daniel  ";
-
-console.log(message);
+let name = " Daniel  ";
+let nameTrim = name.trim();
+let lengthOfName = nameTrim.length;
+console.log(
+	"My name is " +
+		name.trim() +
+		" and my name is " +
+		lengthOfName +
+		" characters long."
+);
diff --git a/week-1/1-exercises/G-numbers/exercise.js b/week-1/1-exercises/G-numbers/exercise.js
@@ -1 +1,7 @@
 // Start by creating a variables `numberOfStudents` and `numberOfMentors`
+let numberOfStudents = 15;
+let numberOfMentors = 8;
+let sum = numberOfStudents + numberOfMentors;
+console.log("Number of students: " + numberOfStudents);
+console.log("Number of mentors: " + numberOfMentors);
+console.log("Total number of students and mentors: " + sum);
diff --git a/week-1/1-exercises/I-floats/exercise.js b/week-1/1-exercises/I-floats/exercise.js
@@ -1,2 +1,7 @@
 var numberOfStudents = 15;
 var numberOfMentors = 8;
+let sum = numberOfStudents + numberOfMentors;
+let studentsPercentage = Math.round((numberOfStudents / sum) * 100);
+let mentorsPercentage = Math.round((numberOfMentors / sum) * 100);
+console.log("Percentage students: " + studentsPercentage + "%");
+console.log("Percentage mentors: " + mentorsPercentage + "%");
diff --git a/week-1/1-exercises/J-functions/exercise.js b/week-1/1-exercises/J-functions/exercise.js
@@ -1,7 +1,12 @@
 function halve(number) {
-  // complete the function here
+	// complete the function here
+	return number / 2;
 }
-
+var divide = halve(65);
 var result = halve(12);
-
+var num = halve(109);
+var output = halve(34);
+console.log(divide);
 console.log(result);
+console.log(num);
+console.log(output);
diff --git a/week-1/1-exercises/J-functions/exercise2.js b/week-1/1-exercises/J-functions/exercise2.js
@@ -1,5 +1,6 @@
 function triple(number) {
  // complete function here
+  return number * 3;
 }

 var result = triple(12);

diff --git a/week-1/1-exercises/K-functions-parameters/exercise.js b/week-1/1-exercises/K-functions-parameters/exercise.js
@@ -1,6 +1,7 @@
 // Complete the function so that it takes input parameters
-function multiply() {
-  // Calculate the result of the function and return it
+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/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
-
+function divide(num1, num2) {
+	return num1 / num2;
+}
 var 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,7 @@
 // Write your function here
-
+function createGreeting(name) {
+	return "Hello, my name is " + name;
+}
 var greeting = createGreeting("Daniel");

 console.log(greeting);
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,7 @@
 // Declare your function first
-
+function add(num1, num2){
+    return num1 + num2;
+}
 // Call the function and assign to a variable `sum`
-
+let sum = add(13, 124);
 console.log(sum);
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,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/week-1/1-exercises/L-functions-nested/exercise.js b/week-1/1-exercises/L-functions-nested/exercise.js
@@ -1,3 +1,10 @@
+let studentsNumber = 15;
+let mentorsNumber = 8;
+let sum = studentsNumber + mentorsNumber;
+function percentage(prcntg){
+    return Math.round(prcntg / sum * 100);
+}
+function getPrcentage()
 var mentor1 = "Daniel";
 var mentor2 = "Irina";
 var mentor3 = "Mimi";

diff --git a/week-1/2-mandatory/1-syntax-errors.js b/week-1/2-mandatory/1-syntax-errors.js
@@ -1,36 +1,41 @@
-
-
 // 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 getAddition(a, b) {
-    total = a ++ b
+function introduceMe(name, age) {
+	return "Hello, my name is " + name + " and I am " + age + " years old";
+}
+function getRemainder(a, b) {
+	let total = a % b;

-    // Use string interpolation here
-    return "The total is %{total}"
+	// Use string interpolation here
+	return `The remainder is ${total}`;
 }

 /* ======= TESTS - DO NOT MODIFY ===== */
-// 
+//
 // To run these tests type `node 1-syntax-errors.js` into your terminal

 function test(test_name, expr) {
-    let status;
-    if (expr) {
-        status = "PASSED"
-    } else {
-        status = "FAILED"
-    }
-
-    console.log(`${test_name}: ${status}`)
+	let status;
+	if (expr) {
+		status = "PASSED";
+	} else {
+		status = "FAILED";
+	}
+
+	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 getRemainder function", getRemainder(23,5) === "The remainder is 3")
+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 getRemainder function",
+	getRemainder(23, 5) === "The remainder is 3"
+);
diff --git a/week-1/2-mandatory/2-logic-error.js b/week-1/2-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 word.trim();
 }

 function getWordLength(word) {
-  return "word".length()
+	return word.length();
 }

 function multiply(a, b, c) {
-  a * b * c;
-  return;
+	return a * b * c;
 }

 /* ======= TESTS - DO NOT MODIFY ===== 
@@ -20,16 +19,22 @@ To run these tests type `node 2-logic-error` into your terminal
 */

 function test(test_name, expr) {
-  let status;
-  if (expr) {
-      status = "PASSED"
-  } else {
-      status = "FAILED"
-  }
-
-  console.log(`${test_name}: ${status}`)
+	let status;
+	if (expr) {
+		status = "PASSED";
+	} else {
+		status = "FAILED";
+	}
+
+	console.log(`${test_name}: ${status}`);
 }

-test("fixed trimWord function", trimWord("  CodeYourFuture ") === "CodeYourFuture")
-test("fixed wordLength function", getWordLength("A wild sentence appeared!") === 25)
-test("fixed multiply function", multiply(2,3,6) === 36)
+test(
+	"fixed trimWord function",
+	trimWord("  CodeYourFuture ") === "CodeYourFuture"
+);
+test(
+	"fixed wordLength function",
+	getWordLength("A wild sentence appeared!") === 25
+);
+test("fixed multiply function", multiply(2, 3, 6) === 36);
diff --git a/week-1/2-mandatory/3-function-output.js b/week-1/2-mandatory/3-function-output.js
@@ -1,16 +1,21 @@
 // Add comments to explain what this function does. You're meant to use Google!
+// a function with no parameters passed. The function is to multiply the given value with 10.
 function getNumber() {
-  return Math.random() * 10;
+	// It will return numbers from 0 to 9 multiplied by 10.
+	return Math.random() * 10;
 }

 // Add comments to explain what this function does. You're meant to use Google!
+// This is a function with 2 parameters to concatenate 2 values
 function s(w1, w2) {
-  return w1.concat(w2);
+	// The value of (w2) will be added to after the value of (w1);
+	return w1.concat(w2);
 }

 function concatenate(firstWord, secondWord, thirdWord) {
-  // Write the body of this function to concatenate three words together
-  // Look at the test case below to understand what to expect in return
+	// Write the body of this function to concatenate three words together
+	return firstWord.concat(" ", secondWord, " ", thirdWord);
+	// Look at the test case below to understand what to expect in return
 }

 /* ======= TESTS - DO NOT MODIFY ===== 
@@ -20,25 +25,25 @@ To run these tests type `node 3-function-output` into your terminal
 */

 function test(test_name, expr) {
-  let status;
-  if (expr) {
-    status = "PASSED";
-  } else {
-    status = "FAILED";
-  }
+	let status;
+	if (expr) {
+		status = "PASSED";
+	} else {
+		status = "FAILED";
+	}

-  console.log(`${test_name}: ${status}`);
+	console.log(`${test_name}: ${status}`);
 }

 test(
-  "concatenate function - case 1 works",
-  concatenate("code", "your", "future") === "code your future"
+	"concatenate function - case 1 works",
+	concatenate("code", "your", "future") === "code your future"
 );
 test(
-  "concatenate function - case 2 works",
-  concatenate("I", "like", "pizza") === "I like pizza"
+	"concatenate function - case 2 works",
+	concatenate("I", "like", "pizza") === "I like pizza"
 );
 test(
-  "concatenate function - case 3 works",
-  concatenate("I", "am", 13) === "I am 13"
+	"concatenate function - case 3 works",
+	concatenate("I", "am", 13) === "I am 13"
 );