From b4bc4a814a4297f577861f64b09702f320b50f12 Mon Sep 17 00:00:00 2001
From: cameronsima <cjsima@gmail.com>
Date: Wed, 24 May 2017 17:14:09 -0400
Subject: [PATCH 1/2] working on table sqaures

---
 index.html   |  20 ++++-----
 js/script.js | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 120 insertions(+), 12 deletions(-)

diff --git a/index.html b/index.html
index b16c318..14a407e 100644
--- a/index.html
+++ b/index.html
@@ -20,16 +20,16 @@ <h1>Loops Exercises</h1>
 
     <section id="menu">
       <ul>
-        <li><button type="button" class="btn btn-primary" onclick="yourFunctionName()">Example 2.1</button></li>
-        <li><button type="button" class="btn btn-primary" onclick="yourFunctionName()">Example 2.2</button></li>
-        <li><button type="button" class="btn btn-primary" onclick="yourFunctionName()">Example 2.3</button></li>
-        <li><button type="button" class="btn btn-primary" onclick="yourFunctionName()">Example 2.4</button></li>
-        <li><button type="button" class="btn btn-primary" onclick="yourFunctionName()">Example 2.5</button></li>
-        <li><button type="button" class="btn btn-primary" onclick="yourFunctionName()">Example 2.6</button></li>
-        <li><button type="button" class="btn btn-primary" onclick="yourFunctionName()">Example 2.7</button></li>
-        <li><button type="button" class="btn btn-primary" onclick="yourFunctionName()">Example 2.8</button></li>
-        <li><button type="button" class="btn btn-primary" onclick="yourFunctionName()">Example 2.9</button></li>
-        <li><button type="button" class="btn btn-primary" onclick="yourFunctionName()">Example 2.10</button></li>
+        <li><button type="button" class="btn btn-primary" onclick="oneToTen()">Example 2.1</button></li>
+        <li><button type="button" class="btn btn-primary" onclick="oddNumbers()">Example 2.2</button></li>
+        <li><button type="button" class="btn btn-primary" onclick="squares()">Example 2.3</button></li>
+        <li><button type="button" class="btn btn-primary" onclick="random4()">Example 2.4</button></li>
+        <li><button type="button" class="btn btn-primary" onclick="even(30)">Example 2.5</button></li>
+        <li><button type="button" class="btn btn-primary" onclick="powers(8)">Example 2.6</button></li>
+        <li><button type="button" class="btn btn-primary" onclick="areWeThereYet()">Example 2.7</button></li>
+        <li><button type="button" class="btn btn-primary" onclick="triangle()">Example 2.8</button></li>
+        <li><button type="button" class="btn btn-primary" onclick="tableSquare()">Example 2.9</button></li>
+        <li><button type="button" class="btn btn-primary" onclick="tableSquares()">Example 2.10</button></li>
       </ul>
     </section>
 
diff --git a/js/script.js b/js/script.js
index ba8cf69..7e3fa56 100644
--- a/js/script.js
+++ b/js/script.js
@@ -2,6 +2,114 @@
 
 var display = document.getElementById("display");
 
-function yourFunctionName (){
-  display.innerHTML = "hello";
+function oneToTen() {
+    
+    var result = "";
+    for (var i = 1; i<=10; i++) {
+        result += '<p>' + i + '</p>';
+    }
+    display.innerHTML = result;
 }
+
+function oddNumbers() {
+    
+    var result = "";
+    for (var i = 1; i<=20; i++) {
+        if (i % 2 != 0) {
+            result += '<p>' + i + '</p>';
+        }
+    }
+    display.innerHTML = result;
+}
+
+function squares() {
+    
+    var result = "";
+    for (var i = 1; i<=10; i++) {
+        result += '<p>' + i*i + '</p>';
+    }
+    display.innerHTML = result;
+}
+
+function random4() {
+    
+    var result = "";
+    for (var i = 0; i<4; i++) {
+        result += '<p>' + (Math.floor(Math.random() * (100 - 1)) + 1) + '</p>';
+    }
+    display.innerHTML = result;
+}
+
+function even(n) {
+    
+    var result = "<ol>";
+    for (var i = 0; i < n; i++) {
+        if (i % 2 == 0) {
+            result += "<li>" + i + '</li>';
+        }
+    }
+    result += "</ol>";
+    display.innerHTML = result; 
+}
+
+function powers(n) {
+    
+    var result = "";
+    var lastNumber = 1;
+    for (var i = 2; i<n*2+1; i++) {
+        
+        if (i % 2 == 0) {
+            var r = lastNumber * 2;
+            result += "<p>" + r + "</p>"
+            lastNumber = r;
+        }
+        
+    }
+    display.innerHTML = result;
+}
+
+function areWeThereYet() {
+    
+    var result = "";
+    var thereYet = "";
+    
+    while (thereYet != "Yes") {
+        result += '<p>"Arewethereyet?"</p>'
+        thereYet = prompt("Are we there yet?");
+        result += "<p>" + thereYet + "</p>";
+        
+    }
+    display.innerHTML = result + "<p>Good!</p>";
+}
+
+function triangle() {
+    
+    var result = "";
+    
+    for (var i = 0; i<6; i++) {
+        var line = "<p>";
+        for (var j = 0; j<i; j++) {
+            line += "*";
+        }
+        
+        result += line + "</p>";
+    }
+    display.innerHTML = result;
+}
+
+function tableSquare() {
+    
+    var result = "";
+    var index = 1;
+    for (var i = 1; i<=4; i++) {
+        var line = "<p>";
+        for (var j = 0; j<4; j++) {
+            line += "|" + index + "|";
+            index++;
+        }
+        line += "</p>";
+        result += line;
+    }
+    display.innerHTML = result;
+}
+

From 4d6c460ad078d2f8f7c1938972f50a9b856f44c3 Mon Sep 17 00:00:00 2001
From: cameronsima <cjsima@gmail.com>
Date: Wed, 24 May 2017 17:19:05 -0400
Subject: [PATCH 2/2] lab 1 done

---
 index.html   |  2 +-
 js/script.js | 28 +++++++++++++++++++++++++++-
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/index.html b/index.html
index 14a407e..5bd997e 100644
--- a/index.html
+++ b/index.html
@@ -29,7 +29,7 @@ <h1>Loops Exercises</h1>
         <li><button type="button" class="btn btn-primary" onclick="areWeThereYet()">Example 2.7</button></li>
         <li><button type="button" class="btn btn-primary" onclick="triangle()">Example 2.8</button></li>
         <li><button type="button" class="btn btn-primary" onclick="tableSquare()">Example 2.9</button></li>
-        <li><button type="button" class="btn btn-primary" onclick="tableSquares()">Example 2.10</button></li>
+        <li><button type="button" class="btn btn-primary" onclick="tableSquares(6)">Example 2.10</button></li>
       </ul>
     </section>
 
diff --git a/js/script.js b/js/script.js
index 7e3fa56..d958cb8 100644
--- a/js/script.js
+++ b/js/script.js
@@ -101,10 +101,36 @@ function tableSquare() {
     
     var result = "";
     var index = 1;
+    
     for (var i = 1; i<=4; i++) {
         var line = "<p>";
         for (var j = 0; j<4; j++) {
-            line += "|" + index + "|";
+            if (index < 10) {
+                line += "|" + " " +index + "|";
+            } else {
+                line += "|" + index + "|";
+            }
+            index++;
+        }
+        line += "</p>";
+        result += line;
+    }
+    display.innerHTML = result;
+}
+
+function tableSquares(n) {
+    
+    var result = "";
+    var index = 1;
+    
+    for (var i = 1; i<=n; i++) {
+        var line = "<p>";
+        for (var j = 0; j<n; j++) {
+            if (index < 10) {
+                line += "|" + " " +index + "|";
+            } else {
+                line += "|" + index + "|";
+            }
             index++;
         }
         line += "</p>";