diff --git a/Week1/MAKEME.md b/Week1/MAKEME.md
index 787b50988..f2ddc3fe4 100644
--- a/Week1/MAKEME.md
+++ b/Week1/MAKEME.md
@@ -115,14 +115,11 @@ Follow the steps. Make sure that each step is written on the line after.
**Exercise 8: Type checker**
-Write a program that checks the data types of two variables and logs to the console `SAME TYPE` if they are the same type. If they are different types log `Not the same...`.
+Write a program that checks the data types of two variables and logs to the console `SAME TYPE` if they are the same type. If they are different types log `NOT THE SAME TYPE`.
+1. Find out how to check the type of a variable
1. Declare 4 variables: 2 must be `strings` and 2 must be `objects`
-2. Create 6 conditional statements, where for each you check if the data type of one variable is the same as the other
-3. Find out how to check the type of a variable
-4. Write 2 `console.log` statements to log the type of 2 variables, each with a different data type
-5. Now compare the types of your different variables with one another
-6. Log `Not the same...` when the types are different
+2. Create 6 conditional statements, where for each you check if the data type of one variable is the same as the other and then console.log "SAME TYPE" if they are the same type and "NOT THE SAME TYPE" if they are not.
Here's an incomplete example of how it could look:
diff --git a/Week1/homework/codeAlong/calculator/index.html b/Week1/homework/codeAlong/calculator/index.html
new file mode 100644
index 000000000..48d15cb63
--- /dev/null
+++ b/Week1/homework/codeAlong/calculator/index.html
@@ -0,0 +1,75 @@
+
+
+
+
+
+
+
+
+
+
+ Stefanos' Javascript Calculator
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Week1/homework/codeAlong/calculator/main.js b/Week1/homework/codeAlong/calculator/main.js
new file mode 100644
index 000000000..2e6066b2f
--- /dev/null
+++ b/Week1/homework/codeAlong/calculator/main.js
@@ -0,0 +1,122 @@
+class Calculator {
+ constructor(previousOperandTextElement, currentOperandTextElement) {
+ this.previousOperandTextElement = previousOperandTextElement
+ this.currentOperandTextElement = currentOperandTextElement
+ this.clear()
+ }
+
+ clear() {
+ this.currentOperand = ""
+ this.previousOperand = ""
+ this.operation = undefined
+ }
+
+ delete() {
+ this.currentOperand = this.currentOperand.toString().slice(0, -1)
+
+ }
+
+ appendNumber(number) {
+ if (number === "." && this.currentOperand.includes(".")) return
+ this.currentOperand = this.currentOperand.toString() + number.toString()
+ }
+
+ chooseOperation(operation) {
+ if (this.currentOperand === "") return
+ if (this.previousOperand !== "") {
+ this.compute()
+ }
+ this.operation = operation
+ this.previousOperand = this.currentOperand
+ this.currentOperand = ""
+ }
+
+ compute() {
+ let computation
+ const prev = parseFloat(this.previousOperand)
+ const curr = parseFloat(this.currentOperand)
+ if (isNaN(prev) || isNaN(curr)) return
+ switch (this.operation) {
+ case "+":
+ computation = prev + curr
+ break;
+ case "-":
+ computation = prev - curr
+ break;
+ case "×":
+ computation = prev * curr
+ break;
+ case "÷":
+ computation = prev / curr
+ break;
+ default:
+ return
+ }
+ this.currentOperand = computation
+ this.operation = undefined
+ this.previousOperand = ""
+
+ }
+
+ getDisplayNumber(number) {
+ const stringNumber = number.toString()
+ const integerDigits = parseFloat(stringNumber.split(".")[0])
+ const decimalDigits = stringNumber.split(".")[1]
+ let integerDisplay
+ if (isNaN(integerDigits)) {
+ integerDisplay = ""
+ } else {
+ integerDisplay = integerDigits.toLocaleString("en", { maximumFractionDigits: 0 })
+ }
+ if (decimalDigits != null) {
+ return `${integerDisplay}.${decimalDigits}`
+ } else {
+ return integerDisplay
+ }
+ }
+
+ updateDisplay() {
+ this.currentOperandTextElement.innerText = this.getDisplayNumber(this.currentOperand)
+ if (this.operation != null) {
+ this.previousOperandTextElement.innerText = `${this.getDisplayNumber(this.previousOperand)} ${this.operation}`
+ } else {
+ this.previousOperandTextElement.innerText = ""
+ }
+ }
+}
+
+const numberButtons = document.querySelectorAll('[data-number]');
+const operationButtons = document.querySelectorAll('[data-operation]');
+const equalsButton = document.querySelector('[data-equals]');
+const deleteButton = document.querySelector('[data-delete]');
+const allClearButton = document.querySelector('[data-all-clear]');
+const previousOperandTextElement = document.querySelector('[data-previous-operand]');
+const currentOperandTextElement = document.querySelector('[data-current-operand]');
+
+const calculator = new Calculator(previousOperandTextElement, currentOperandTextElement)
+
+numberButtons.forEach(button => {
+ button.addEventListener("click", () => {
+ calculator.appendNumber(button.innerText)
+ calculator.updateDisplay()
+ })
+})
+operationButtons.forEach(button => {
+ button.addEventListener("click", () => {
+ calculator.chooseOperation(button.innerText)
+ calculator.updateDisplay()
+ })
+})
+equalsButton.addEventListener("click", button => {
+ calculator.compute()
+ calculator.updateDisplay()
+})
+allClearButton.addEventListener("click", button => {
+ calculator.clear()
+ calculator.updateDisplay()
+})
+deleteButton.addEventListener("click", button => {
+ calculator.delete()
+ calculator.updateDisplay()
+})
+
diff --git a/Week1/homework/codeAlong/calculator/style.css b/Week1/homework/codeAlong/calculator/style.css
new file mode 100644
index 000000000..efbf361d4
--- /dev/null
+++ b/Week1/homework/codeAlong/calculator/style.css
@@ -0,0 +1,94 @@
+@import url('https://fonts.googleapis.com/css?family=Orbitron&display=swap');
+@import url('https://fonts.googleapis.com/css?family=Montserrat&display=swap');
+
+
+html{height:100%;}
+
+body {
+ background: rgb(162,159,139);
+ background: radial-gradient(circle, rgba(162,159,139,1) 0%, rgba(214,212,195,1) 0%, rgba(162,159,139,1) 100%);
+}
+
+
+div.background{
+ background-color:#55818D;
+ width: 290px;
+ min-height:500px;
+ position: center;
+ margin-top: 25px;
+ border-radius: 4%;
+ padding-top: 10px;
+ padding-bottom: 10px;
+}
+div.screen {
+ width:300px;
+ min-height: 120px;
+ max-height: 160px;
+ background-color: rgba(0,0,0,0.9);
+ border: 1px solid black;
+ font-family: 'Orbitron', sans-serif;
+ letter-spacing:2px;
+ text-align: right;
+ display: flex;
+ align-items: flex-end;
+ justify-content: space-around;
+ flex-direction: column;
+ padding: 10px;
+ word-wrap: break-word;
+ word-break: break-all;
+ overflow: hidden;
+
+}
+div.previous-operand {
+ color: rgba(255,255,255,0.6);
+ font-size: 1.2rem;
+}
+div.current-operand {
+ color: white;
+ font-size: 2.0rem;
+}
+
+button {
+ width:60px;
+ height:60px;
+ background-color: #172027!important;
+ font-family: 'Montserrat', sans-serif;
+ font-size: 1.4rem!important;
+ font-weight: bolder!important;
+ outline: none;
+}
+button:hover {
+ background-color: #283742!important;
+ border: 1px solid #283742!important;
+}
+button:active {
+ background-color: #475d6d!important;
+ border: 1px solid #475d6d!important;
+}
+
+button.equals {
+ background-color: #fa5f18!important;
+ border: 1px solid #fa5f18!important;
+}
+
+button.equals:hover {
+ background-color: #f7814a!important;
+ border: 1px solid #f7814a!important;
+}
+button.equals:active {
+ background-color: #f59b72!important;
+ border: 1px solid #f59b72!important;
+}
+button.clear {
+ color: rgb(236, 60, 60);
+ width: 128px;
+}
+button.clear:hover{
+ color: rgb(250, 86, 86);
+}
+button.clear:focus{
+ color: rgb(250, 103, 103);
+}
+button.clear:active {
+ color: rgb(250, 103, 103);
+}
diff --git a/Week1/homework/index.html b/Week1/homework/index.html
deleted file mode 100644
index e69de29bb..000000000
diff --git a/Week1/homework/js-exercises/animalsArray.js b/Week1/homework/js-exercises/animalsArray.js
new file mode 100644
index 000000000..af44d22b8
--- /dev/null
+++ b/Week1/homework/js-exercises/animalsArray.js
@@ -0,0 +1,9 @@
+"use strict";
+let items = [];
+console.log("[]");
+console.log(items);
+let animals = ["cat", "dog", "rabbit"];
+console.log(animals);
+animals.push("piglet");
+console.log(animals);
+
diff --git a/Week1/homework/js-exercises/compareArrays.js b/Week1/homework/js-exercises/compareArrays.js
new file mode 100644
index 000000000..7b7e55676
--- /dev/null
+++ b/Week1/homework/js-exercises/compareArrays.js
@@ -0,0 +1,7 @@
+"use strict";
+//Variables
+let array1 = ["A", "B", "C", "D"];
+let array2 = [1, 2, 3, 4, 5, 6, 7];
+//Console log
+console.log(array1.length);
+console.log(array2.length);
\ No newline at end of file
diff --git a/Week1/homework/js-exercises/errorDebug.js b/Week1/homework/js-exercises/errorDebug.js
new file mode 100644
index 000000000..4a76173c3
--- /dev/null
+++ b/Week1/homework/js-exercises/errorDebug.js
@@ -0,0 +1,2 @@
+'use strict'
+console.log("I'm awesome");
\ No newline at end of file
diff --git a/Week1/homework/js-exercises/helloWorld.js b/Week1/homework/js-exercises/helloWorld.js
new file mode 100644
index 000000000..ef3b16076
--- /dev/null
+++ b/Week1/homework/js-exercises/helloWorld.js
@@ -0,0 +1,12 @@
+'use strict'
+console.log("Hello, world!");//English
+console.log("Hola, mundo!");//Spanish
+console.log("Ciao, mondo!");//Italian
+console.log("Ola, mundo!");//Portuguese
+console.log("こんにちは世界!");//Japanese
+console.log("Selam Dünya!");//Turkish
+console.log("Hallo Wereld!");//Dutch
+console.log("Привет, мир!");//Russian
+console.log("Hallo Welt!");//German
+console.log("Salve mundi!");//Latin(!)
+
diff --git a/Week1/homework/js-exercises/logNumber.js b/Week1/homework/js-exercises/logNumber.js
new file mode 100644
index 000000000..164ebace1
--- /dev/null
+++ b/Week1/homework/js-exercises/logNumber.js
@@ -0,0 +1,7 @@
+'use strict'
+let numberX;
+console.log("undefined");
+console.log(numberX);
+numberX = 77;
+console.log("The number I assigned to the variable:");
+console.log(numberX);
\ No newline at end of file
diff --git a/Week1/homework/js-exercises/logRemainder.js b/Week1/homework/js-exercises/logRemainder.js
new file mode 100644
index 000000000..c5ffe30f6
--- /dev/null
+++ b/Week1/homework/js-exercises/logRemainder.js
@@ -0,0 +1,4 @@
+"use strict";
+//1. The answer is 1. The number 6 can be divided by 3 so the remainder after the division is 1.
+//2. The answer is 1. The number 20 can be divided by 4 so the remainder after the division is 1.
+//3. The answer is 1. The number 12 can be divided by 2 so the remainder after the division is 1.
\ No newline at end of file
diff --git a/Week1/homework/js-exercises/logString.js b/Week1/homework/js-exercises/logString.js
new file mode 100644
index 000000000..1dde91930
--- /dev/null
+++ b/Week1/homework/js-exercises/logString.js
@@ -0,0 +1,7 @@
+'use strict'
+let myString = "Stefanos Leventis";
+console.log("My full name");
+console.log(myString);
+myString = "The Arkitekt";
+console.log("My nickname as a music producer");
+console.log(myString);
\ No newline at end of file
diff --git a/Week1/homework/js-exercises/numRound.js b/Week1/homework/js-exercises/numRound.js
new file mode 100644
index 000000000..f95a9db5c
--- /dev/null
+++ b/Week1/homework/js-exercises/numRound.js
@@ -0,0 +1,7 @@
+'use strict'
+let z = 7.25;
+console.log(z);
+let a = Math.round(z);
+console.log(a);
+let x = Math.max(a, z);
+console.log(x);
\ No newline at end of file
diff --git a/Week1/homework/js-exercises/stringLength.js b/Week1/homework/js-exercises/stringLength.js
new file mode 100644
index 000000000..7f892f496
--- /dev/null
+++ b/Week1/homework/js-exercises/stringLength.js
@@ -0,0 +1,4 @@
+"use strict";
+let mySentence = "Programming is so interesting!";
+let howLongIsIt = mySentence.length;
+console.log(howLongIsIt);
\ No newline at end of file
diff --git a/Week1/homework/js-exercises/typeCheck.js b/Week1/homework/js-exercises/typeCheck.js
new file mode 100644
index 000000000..c5fca6753
--- /dev/null
+++ b/Week1/homework/js-exercises/typeCheck.js
@@ -0,0 +1,50 @@
+"use strict";
+//Declare variables
+let str1 = "Windows";
+let str2 = "Linux";
+let obj1 = { name: "Bill", surname: "Gates" };
+let obj2 = { name: "Linus", surname: "Torvalds" };
+//Check data type
+console.log(typeof str1);
+console.log(typeof obj1);
+//Conditional statements
+if (typeof (str1) == typeof (str2)) {
+ console.log("SAME");
+} else {
+ console.log("NOT THE SAME");
+}
+if (typeof (str1) == typeof (obj1)) {
+ console.log("SAME");
+} else {
+ console.log("NOT THE SAME");
+}
+if (typeof (str1) == typeof (obj2)) {
+ console.log("SAME");
+} else {
+ console.log("NOT THE SAME");
+}
+if (typeof (str2) == typeof (obj1)) {
+ console.log("SAME");
+} else {
+ console.log("NOT THE SAME");
+}
+if (typeof (str2) == typeof (obj2)) {
+ console.log("SAME");
+} else {
+ console.log("NOT THE SAME");
+}
+if (typeof (obj1) == typeof (obj2)) {
+ console.log("SAME");
+} else {
+ console.log("NOT THE SAME");
+}
+//Alternative solution
+console.log("ALTERNATIVE SOLUTION")
+function compareDate(a, b) {
+ if (typeof (a) === typeof (b)) { return "SAME" }
+ return "NOT THE SAME"
+}
+console.log(compareData(str1, str2));
+console.log(compareData(str1, obj2));
+//END OF CODE
+
diff --git a/Week1/homework/main.js b/Week1/homework/main.js
deleted file mode 100644
index e69de29bb..000000000
diff --git a/Week2/Homework/codeAlong/temperature-converter/index.html b/Week2/Homework/codeAlong/temperature-converter/index.html
new file mode 100644
index 000000000..0adfc9874
--- /dev/null
+++ b/Week2/Homework/codeAlong/temperature-converter/index.html
@@ -0,0 +1,26 @@
+
+
+
+
+
+
+
+
+ Temperature Converter
+
+
+
+
+
+
+ 
+
+