From 0e2218b1e83ea10078e70952853b7187b0463bec Mon Sep 17 00:00:00 2001
From: Adam-Koza <adam.koza@mail.utoronto.ca>
Date: Thu, 20 Sep 2018 20:54:43 -0400
Subject: [PATCH 1/7] Submit script.

---
 adam-script.js | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 adam-script.js

diff --git a/adam-script.js b/adam-script.js
new file mode 100644
index 0000000..c7b93d9
--- /dev/null
+++ b/adam-script.js
@@ -0,0 +1,15 @@
+function add (num1, num2) {
+    return num1 + num2;  
+}
+
+function subract (num1, num2) {
+    return num1 - num2;
+}
+
+function multiply (num1, num2) {
+    return num1 * num2;
+}
+
+function divide (num1, num2) {
+    return num1 / num2;
+}
\ No newline at end of file

From f9e9e36f1ed0925426cea3c1fe90f2222bf49790 Mon Sep 17 00:00:00 2001
From: Adam-Koza <adam.koza@mail.utoronto.ca>
Date: Thu, 20 Sep 2018 20:56:53 -0400
Subject: [PATCH 2/7] Correct spelling.

---
 adam-script.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/adam-script.js b/adam-script.js
index c7b93d9..2580a68 100644
--- a/adam-script.js
+++ b/adam-script.js
@@ -2,7 +2,7 @@ function add (num1, num2) {
     return num1 + num2;  
 }
 
-function subract (num1, num2) {
+function subtract (num1, num2) {
     return num1 - num2;
 }
 
@@ -12,4 +12,4 @@ function multiply (num1, num2) {
 
 function divide (num1, num2) {
     return num1 / num2;
-}
\ No newline at end of file
+}

From dc77fb12680a31d4cd43558ba04b303b020646f9 Mon Sep 17 00:00:00 2001
From: Adam-Koza <adam.koza@mail.utoronto.ca>
Date: Thu, 20 Sep 2018 21:04:14 -0400
Subject: [PATCH 3/7] Add var declaration.

---
 adam-script.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/adam-script.js b/adam-script.js
index 2580a68..f0bdb9d 100644
--- a/adam-script.js
+++ b/adam-script.js
@@ -1,15 +1,19 @@
 function add (num1, num2) {
-    return num1 + num2;  
+    var z = num1 + num2;
+    return z;
 }
 
 function subtract (num1, num2) {
-    return num1 - num2;
+    var z = num1 - num2;
+    return z;
 }
 
 function multiply (num1, num2) {
-    return num1 * num2;
+    var z = num1 * num2;
+    return z;
 }
 
 function divide (num1, num2) {
-    return num1 / num2;
+    var z = num1 / num2;
+    return z;
 }

From 9fa692ae10a3a69454c2589a69ecb0390bf39b64 Mon Sep 17 00:00:00 2001
From: Adam-Koza <adam.koza@mail.utoronto.ca>
Date: Thu, 20 Sep 2018 21:07:54 -0400
Subject: [PATCH 4/7] Add console prints.

---
 adam-script.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/adam-script.js b/adam-script.js
index f0bdb9d..01ad1ee 100644
--- a/adam-script.js
+++ b/adam-script.js
@@ -17,3 +17,9 @@ function divide (num1, num2) {
     var z = num1 / num2;
     return z;
 }
+
+console.log(add(1, 2));
+console.log(subtract(2,1));
+console.log(multiply(2,2));
+console.log(divide(4,2));
+

From ce376b7f512bd67dd9588bd43db9b31661db5306 Mon Sep 17 00:00:00 2001
From: Adam-Koza <adam.koza@mail.utoronto.ca>
Date: Thu, 20 Sep 2018 21:50:25 -0400
Subject: [PATCH 5/7] Add function comparisons.

---
 adam-script.js | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)

diff --git a/adam-script.js b/adam-script.js
index 01ad1ee..55f973e 100644
--- a/adam-script.js
+++ b/adam-script.js
@@ -23,3 +23,60 @@ console.log(subtract(2,1));
 console.log(multiply(2,2));
 console.log(divide(4,2));
 
+var x = 100;
+var y = 150;
+
+var sum = add(x,y);
+var dif = subtract(y,x);
+var prod = multiply(x,y);
+var quo = divide(y,x);
+
+if (sum == 250) {
+    console.log("Correct. Sum is 250");
+} else {
+    console.log("Sum function is not working.");
+}
+
+if (dif == 50) {
+    console.log("Correct. Difference is 50.");
+} else {
+    console.log("Difference function is not working.");
+}
+
+if (prod == 15000) {
+    console.log("Correct. Product is 15,000.");
+} else {
+    console.log("Product function is not working.");
+}
+
+if (quo == 1.5) {
+    console.log("Correct. Quotient is 1.5.");
+} else {
+    console.log("Quotient function is not working.");
+}
+
+
+var x = Math.random();
+var y = Math.random();
+
+var sum = add(x,y);
+var dif = subtract(y,x);
+var prod = multiply(x,y);
+var quo = divide(y,x);
+
+if (sum > dif) {
+    console.log("Sum is greater then Dif");
+} else if (sum < dif) {
+    console.log("Sum is less than Dif");
+} else {
+    console.log("Sum is equal to Dif");
+}
+
+if (prod > quo) {
+    console.log("Product is greater then Quotient");
+} else if (prod < quo) {
+    console.log("Product is less than Quotient");
+} else {
+    console.log("Product is equal to Quotient");
+}
+

From 065de31079e5e52f5e9f6a52b4b69727ea733fa7 Mon Sep 17 00:00:00 2001
From: Adam-Koza <adam.koza@mail.utoronto.ca>
Date: Tue, 25 Sep 2018 18:43:34 -0400
Subject: [PATCH 6/7] Add calculator html, css, and restructure repo.

---
 Adam/calculator.html                          | 40 ++++++++++
 adam-script.js => Adam/scripts/adam-script.js |  0
 Adam/scripts/scripts.js                       | 15 ++++
 Adam/styles/styles.css                        | 76 +++++++++++++++++++
 4 files changed, 131 insertions(+)
 create mode 100644 Adam/calculator.html
 rename adam-script.js => Adam/scripts/adam-script.js (100%)
 create mode 100644 Adam/scripts/scripts.js
 create mode 100644 Adam/styles/styles.css

diff --git a/Adam/calculator.html b/Adam/calculator.html
new file mode 100644
index 0000000..6116116
--- /dev/null
+++ b/Adam/calculator.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="UTF-8">
+    <title>Adam's Calculator</title>
+    <link rel="stylesheet" href="styles/styles.css">
+  </head>
+
+  <body>
+
+  <div class="container">
+
+    <div id="calculator">
+        <div id="result">0</div>
+        <div id="buttons">
+            <div class="button toprow">+</div>
+            <div class="button">7</div>
+            <div class="button">4</div>
+            <div class="button">1</div>
+            <div id="zero" class="button">0</div>
+            <div class="button toprow">-</div>
+            <div class="button">8</div>
+            <div class="button">5</div>
+            <div class="button">2</div>
+            <div class="button">.</div>
+            <div class="button toprow">x</div>
+            <div class="button">9</div>
+            <div class="button">6</div>
+            <div class="button">3</div>
+            <div class="button">AC</div>
+            <div class="button toprow">÷</div>
+            <div id="equals">=</div>    
+            
+        </div>
+    </div>
+  </div>
+  
+  </body>
+
+</html>
\ No newline at end of file
diff --git a/adam-script.js b/Adam/scripts/adam-script.js
similarity index 100%
rename from adam-script.js
rename to Adam/scripts/adam-script.js
diff --git a/Adam/scripts/scripts.js b/Adam/scripts/scripts.js
new file mode 100644
index 0000000..c7b93d9
--- /dev/null
+++ b/Adam/scripts/scripts.js
@@ -0,0 +1,15 @@
+function add (num1, num2) {
+    return num1 + num2;  
+}
+
+function subract (num1, num2) {
+    return num1 - num2;
+}
+
+function multiply (num1, num2) {
+    return num1 * num2;
+}
+
+function divide (num1, num2) {
+    return num1 / num2;
+}
\ No newline at end of file
diff --git a/Adam/styles/styles.css b/Adam/styles/styles.css
new file mode 100644
index 0000000..de02d43
--- /dev/null
+++ b/Adam/styles/styles.css
@@ -0,0 +1,76 @@
+html {
+    height: 100%;
+}
+
+body {
+    height: 100%;
+    font-size: 45px;
+    background-color: #93d6d9;
+}
+
+.container {
+    height:100%;
+    width: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+
+#calculator {
+    height: 70%;
+    width: 35%;
+    box-sizing: border-box;
+    border-radius: 15px;
+}
+
+#result {
+    height: 25%;
+    width: 100%;
+    font-size: 155px;
+    text-align: right;
+    box-sizing: border-box;
+    background-color: #252525;
+    color: white;
+    border-top-left-radius: 15px;
+    border-top-right-radius: 15px;
+}
+
+#buttons {
+    height: 75%;
+    display: flex;
+    flex-direction: column;
+    flex-wrap: wrap;
+    border-bottom-left-radius: 15px;
+    border-bottom-right-radius: 15px;
+}
+
+.button {
+    width: 25%;
+    height: 20%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    box-sizing: border-box;
+    border: 1px solid#b1b0b1;
+    background-color: #ffffff;
+}
+
+.toprow {
+    background-color: #e9e9e9;
+}
+
+#equals {
+    width: 25%;
+    height: 80%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    box-sizing: border-box;
+    background-color: #ea8666;
+    border: 1px solid #b1b0b1;
+    border-bottom-right-radius: 15px;
+}
+
+#zero {
+    border-bottom-left-radius: 15px;
+}
\ No newline at end of file

From 30459082a3c2c8f01cd38840418a20ac6193432c Mon Sep 17 00:00:00 2001
From: Adam-Koza <adam.koza@mail.utoronto.ca>
Date: Tue, 25 Sep 2018 18:53:50 -0400
Subject: [PATCH 7/7] Change divs to buttons.

---
 Adam/calculator.html | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/Adam/calculator.html b/Adam/calculator.html
index 6116116..7e6a719 100644
--- a/Adam/calculator.html
+++ b/Adam/calculator.html
@@ -13,23 +13,23 @@
     <div id="calculator">
         <div id="result">0</div>
         <div id="buttons">
-            <div class="button toprow">+</div>
-            <div class="button">7</div>
-            <div class="button">4</div>
-            <div class="button">1</div>
-            <div id="zero" class="button">0</div>
-            <div class="button toprow">-</div>
-            <div class="button">8</div>
-            <div class="button">5</div>
-            <div class="button">2</div>
-            <div class="button">.</div>
-            <div class="button toprow">x</div>
-            <div class="button">9</div>
-            <div class="button">6</div>
-            <div class="button">3</div>
-            <div class="button">AC</div>
-            <div class="button toprow">÷</div>
-            <div id="equals">=</div>    
+            <button class="button toprow">+</button>
+            <button class="button">7</button>
+            <button class="button">4</button>
+            <button class="button">1</button>
+            <button id="zero" class="button">0</button>
+            <button class="button toprow">-</button>
+            <button class="button">8</button>
+            <button class="button">5</button>
+            <button class="button">2</button>
+            <button class="button">.</button>
+            <button class="button toprow">x</button>
+            <button class="button">9</button>
+            <button class="button">6</button>
+            <button class="button">3</button>
+            <button class="button">AC</button>
+            <button class="button toprow">÷</button>
+            <button id="equals">=</button>
             
         </div>
     </div>