commit

more commit to exercise and mandatory

Author: Osman-Hajr

week-2/1-exercises/F-logical-operators/exercise.js

@@ -11,14 +11,14 @@ var cssLevel = 4;
 
 // Finish the statement to check whether HTML, CSS knowledge are above 5
 // (hint: use the comparison operator from before)
-var htmlLevelAbove5 = 5;
-var cssLevelAbove5 = 5;
+var htmlLevelAbove5 = true;
+var cssLevelAbove5 = false;
 
 // Finish the next two statement
 // Use the previous variables and logical operators
 // Do not "hardcode" the answers
-var cssAndHtmlAbove5;
-var cssOrHtmlAbove5;
+var cssAndHtmlAbove5 = false;
+var cssOrHtmlAbove5 = true;
 
 /* 
   DO NOT EDIT BELOW THIS LINE

week-2/2-mandatory/1-fix-functions.js

@@ -2,89 +2,90 @@
 // Look at the tests and see how you can fix them.
 
 function mood() {
-  let isHappy = true;
+	let isHappy = false;
 
-  if (isHappy) {
-    return "I am happy";
-  } else {
-    return "I am not happy";
-  }
+	if (isHappy) {
+		return "I am happy";
+	} else {
+		return "I am not happy";
+	}
 }
 
 function greaterThan10() {
-  let num = 10;
-  let isBigEnough;
-
-  if (isBigEnough) {
-    return "num is greater than or equal to 10";
-  } else {
-    return "num is not big enough";
-  }
+	let num = 10;
+	let isBigEnough = true;
+
+	if (isBigEnough) {
+		return "num is greater than or equal to 10";
+	} else {
+		return "num is not big enough";
+	}
 }
 
-function sortArray() {
-  let letters = ["a", "n", "c", "e", "z", "f"];
-  let sortedLetters;
+function sortArray(a, b) {
+	let letters = ["a", "n", "c", "e", "z", "f"];
 
-  return sortedLetters;
+	let sortedLetters = letters.sort(a, b);
+
+	return sortedLetters;
 }
 
 function first5() {
-  let numbers = [1, 2, 3, 4, 5, 6, 7, 8];
-  let sliced;
+	let numbers = [1, 2, 3, 4, 5, 6, 7, 8];
+	let sliced = numbers.slice(0, 5);
 
-  return sliced;
+	return sliced;
 }
 
 function get3rdIndex(arr) {
-  let index = 3;
-  let element;
+	let index = 3;
+	let element = arr[index];
 
-  return element;
+	return element;
 }
 
 /* ======= TESTS - DO NOT MODIFY ===== */
 
 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}`);
 }
 
 function arraysEqual(a, b) {
-  if (a === b) return true;
-  if (a == null || b == null) return false;
-  if (a.length != b.length) return false;
+	if (a === b) return true;
+	if (a == null || b == null) return false;
+	if (a.length != b.length) return false;
 
-  for (let i = 0; i < a.length; ++i) {
-    if (a[i] !== b[i]) return false;
-  }
+	for (let i = 0; i < a.length; ++i) {
+		if (a[i] !== b[i]) return false;
+	}
 
-  return true;
+	return true;
 }
 
 test("mood function works", mood() === "I am not happy");
 test(
-  "greaterThanTen function works",
-  greaterThan10() === "num is greater than or equal to 10"
+	"greaterThanTen function works",
+	greaterThan10() === "num is greater than or equal to 10"
 );
 test(
-  "sortArray function works",
-  arraysEqual(sortArray(), ["a", "c", "e", "f", "n", "z"])
+	"sortArray function works",
+	arraysEqual(sortArray(), ["a", "c", "e", "f", "n", "z"])
 );
 test("first5 function works", arraysEqual(first5(), [1, 2, 3, 4, 5]));
 
 test(
-  "get3rdIndex function works - case 1",
-  get3rdIndex(["fruit", "banana", "apple", "strawberry", "raspberry"]) ===
-    "strawberry"
+	"get3rdIndex function works - case 1",
+	get3rdIndex(["fruit", "banana", "apple", "strawberry", "raspberry"]) ===
+		"strawberry"
 );
 test(
-  "get3rdIndex function works - case 2",
-  get3rdIndex([11, 37, 62, 18, 19, 3, 30]) === 18
+	"get3rdIndex function works - case 2",
+	get3rdIndex([11, 37, 62, 18, 19, 3, 30]) === 18
 );