From 9717eb5b503b3ea5bf90cf26886c2f537f564f6e Mon Sep 17 00:00:00 2001
From: Shvan <48798783+Shvan1@users.noreply.github.com>
Date: Sat, 18 May 2019 14:24:28 +0200
Subject: [PATCH 1/2] Revert "JS Homework-week 3"

---
 week3.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/week3.js b/week3.js
index c9ba185a6..905616ca7 100644
--- a/week3.js
+++ b/week3.js
@@ -127,5 +127,3 @@ let bar = 42;
 typeof typeof bar;
 console.log(typeof bar); //->> number.
 console.log(typeof typeof bar); //->> string.
-
-//the end.
\ No newline at end of file

From c5580455076a44a5de37acd48ddf5c465d422399 Mon Sep 17 00:00:00 2001
From: Shvan <48798783+Shvan1@users.noreply.github.com>
Date: Sun, 2 Jun 2019 20:32:10 +0200
Subject: [PATCH 2/2] Update week3.js

---
 week3.js | 132 ++++++++++++++++++++++++++++---------------------------
 1 file changed, 67 insertions(+), 65 deletions(-)

diff --git a/week3.js b/week3.js
index 905616ca7..7d34bef42 100644
--- a/week3.js
+++ b/week3.js
@@ -1,101 +1,101 @@
 //String
-let myString = "Hello,this,is,a,difficult-,to-,read,sentence";
+let myString = 'Hello,this,is,a,difficult-,to-,read,sentence';
 console.log(myString);
 console.log(myString.length);
-myString = myString.replace(/,/g, " ");
+myString = myString.replace(/,/g, ' ');
 console.log(myString);
 
 //Arrays
-let favoriteAnimals = ["blowfish", "capricorn", "giraffe"];
+let favoriteAnimals = ['blowfish', 'capricorn', 'giraffe'];
+console.log(favoriteAnimals.push('turtle'));
 console.log(favoriteAnimals);
 
-let favoriteAnimalsOfMauro = ["blowfish", "capricorn", "giraffe", "turtle"];
-console.log(favoriteAnimalsOfMauro);
+let addedAnimalOfJim = ['blowfish', 'capricorn', 'giraffe', 'turtle'];
+console.log(addedAnimalOfJim.splice(1, 0, 'meerkat'));
+console.log("The new value will be: ['blowfish', 'meerkat', 'capricorn', 'giraffe', 'turtle']");
+console.log(addedAnimalOfJim);
+console.log('The array has a length of:', addedAnimalOfJim.length);
 
-let favoriteAnimalsOfJim = ["blowfish", "meerkat", "capricorn", "giraffe", "turtle"];
-console.log("The favorite animal of Jim is added to the array.");
-console.log(favoriteAnimalsOfJim);
-console.log("The array has a length of:", favoriteAnimalsOfJim.length);
-
-let favoriteAnimalsOfJason = ["blowfish", "meerkat", "capricorn", "turtle"];
-console.log(favoriteAnimalsOfJason);
-console.log(favoriteAnimalsOfJason.length);
-console.log(favoriteAnimalsOfJason[1], "The item you are looking for is at index:2");
+let deletedAnimalOfJason = ['blowfish', 'meerkat', 'capricorn', 'giraffe', 'turtle'];
+console.log(deletedAnimalOfJason.splice(-2, 1));
+console.log(deletedAnimalOfJason.length);
+console.log(deletedAnimalOfJason[1], 'The item you are looking for is at index:2');
 
 //JavaScript
 function sum(a, b, c) {
-    return a + b + c;
+  return a + b + c;
 }
 console.log(sum(5, 3, 2));
 //2.
-function colorCar(color){
-    return "A" + color + "car";
- }
- console.log(colorCar("red"));
+function colorCar(color) {
+  return 'A' + color + 'car';
+}
+console.log(colorCar('red'));
 //3.
-let country = {Land: "The Netherlands", Population:"17 million", Capital:"Amsterdam"};
-console.log(country);
-console.log(country.Land);
-console.log(country.Population);
+let country = { Land: 'The Netherlands', Population: '17 million', Capital: 'Amsterdam' };
+for (const elements in country) {
+  console.log((country.elements = country[elements]));
+}
 //4.
-function vehicleType(color, code){
-    if (code === 1){
-    console.log("A" + color + "car");
-} else if (code === 2){
-console.log("A" + color + "motorbike");}
+function vehicleType(color, code) {
+  if (code === 1) {
+    console.log('A' + color + 'car');
+  } else if (code === 2) {
+    console.log('A' + color + 'motorbike');
+  }
 }
-vehicleType("blue", 2);
+vehicleType('blue', 2);
 //5.
-3===3 ? console.log("Yes") : console.log("No");
+3 === 3 ? console.log('Yes') : console.log('No');
 //6
-function vehicle(color, code, age){
-    if (code === 1 || age > 5){
-    console.log("A" + "" + color + "" + "used car");
-} else if (code === 2 || age < 5){
-    console.log("A" + "" + color + "" + "new car");
+function vehicle(color, code, age) {
+  if (code === 1 || age > 5) {
+    console.log('A' + '' + color + '' + 'used car');
+  } else if (code === 2 || age < 5) {
+    console.log('A' + '' + color + '' + 'new car');
+  }
 }
-    }
-vehicle("blue", 1, 5);
+vehicle('blue', 1, 5);
 //7.
-const vehicleList = [
-     "motorbike",
-     "caravan",
-     "bike",
-     "bicycle",
-     "car"
-];
+const vehicleList = ['motorbike', 'caravan', 'bike', 'bicycle', 'car'];
 console.log(vehicleList.length);
 console.log(vehicleList[2]);
 
 //9
-function newVehicle(color){
-    if (vehicleList[2] = 3){
-        console.log("A" + "" + color + "" + "new" + "" + "bike");
-    } else (vehicleList[2] > 3);{
-        console.log("A" + "" + color + "" + "old" + "" + "bike")
-    }
+function newVehicle(color, code, age) {
+  if (vehicleList[2] <= 3) {
+    console.log('A' + ' ' + color + ' ' + 'new' + ' ' + 'bike');
+  } else vehicleList[2] > 3;
+  {
+    console.log('A' + ' ' + color + ' ' + 'old' + ' ' + 'bike');
+  }
 }
-newVehicle("green", 3, 1);
+newVehicle('green', 3, 1);
 
 //10
 const advertisement = vehicleList;
 console.log(advertisement);
 for (let index = 0; index < advertisement; index++) {
-    console.log(advertisement[index]);
+  console.log(advertisement[index]);
 }
-if (advertisement.length = 5) {
-    console.log("Amazing Joe's Garage >>> Here we service cars, motorbikes, caravans and bikes.");
-}else {
-    console.log("Amazing Joe's Garage >>> Here we service bulldozers, lorries and trucks.");
+if ((advertisement.length = 5)) {
+  console.log("Amazing Joe's Garage >>> Here we service cars, motorbikes, caravans and bikes.");
+} else {
+  console.log("Amazing Joe's Garage >>> Here we service bulldozers, lorries and trucks.");
 }
 //11
-const newVehicleList = advertisement + "" + "scooter";
-console.log(newVehicleList);
+const newVehicle = advertisement;
+console.log(newVehicle.push('scooter'));
+consol.log(newVehicle);
 //12.
-let object;
+let empty = {};
 //13+14
-let teachers = {Philip: "HTML/CSS", Rob: "HTML/CSS", Hardit: "CLI", Bonan: "CLI", Ogor: "CLI", Unmesh: "GIT", Marciano: "JS", Sander: "JS"};
-
+let teachers = {
+  name: ['Rob', 'Philip', 'Unmesh'],
+};
+console.log(teachers);
+let task = (teachers.skills = ['HTML/CSS', 'HTML/CSS', 'JavaScript']);
+console.log(task);
 //15
 let x = [1, 2, 3];
 let y = [1, 2, 3];
@@ -110,15 +110,15 @@ console.log(y == z);
 console.log(y === z);
 
 //16.
-let o1 = { foo: "bar" };
-let o2 = { foo: "bar" };
+let o1 = { foo: 'bar' };
+let o2 = { foo: 'bar' };
 let o3 = o2;
 console.log(o1);
 console.log(o2);
 console.log(o3);
 //Do you mean to make new ones?
-let o1New = {quur: "quuur"};
-let o2New = {quur: "quuur"};
+let o1New = { quur: 'quuur' };
+let o2New = { quur: 'quuur' };
 let o3New = o2New;
 console.log(o1New);
 
@@ -127,3 +127,5 @@ let bar = 42;
 typeof typeof bar;
 console.log(typeof bar); //->> number.
 console.log(typeof typeof bar); //->> string.
+
+//the end.