From 32ddd94f629bdca2a20fac34021722ae9c15d96f Mon Sep 17 00:00:00 2001
From: Luis Garcia <pacalyps23@frontier.com>
Date: Wed, 24 May 2017 18:10:13 -0400
Subject: [PATCH 1/3] finished lab 1

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

diff --git a/index.html b/index.html
index b16c318..55d9418 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(20)">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="tableSquare(6)">Example 2.10</button></li>
       </ul>
     </section>
 
diff --git a/js/script.js b/js/script.js
index ba8cf69..5f62927 100644
--- a/js/script.js
+++ b/js/script.js
@@ -2,6 +2,116 @@
 
 var display = document.getElementById("display");
 
-function yourFunctionName (){
-  display.innerHTML = "hello";
+function oneToTen()
+{
+  display.innerHTML= "***Output**<br>";
+  for(i =1; i < 11; i++)
+  {
+    display.innerHTML+= i;
+    display.innerHTML += "<br>";
+  }
+}
+
+function oddNumbers()
+{
+  display.innerHTML= "***Output**<br>";
+  for(i =1; i < 20; i++)
+  {
+    display.innerHTML+= i;
+    display.innerHTML += "<br>";
+    i++;
+  }
+}
+
+function squares()
+{
+  display.innerHTML= "***Output**<br>";
+  for(i =1; i < 11; i++)
+  {
+    display.innerHTML+= i*i;
+    display.innerHTML += "<br>";
+  }
+}
+
+function random4()
+{
+  display.innerHTML= "***Output**<br>";
+  for(i =1; i < 5; i++)
+  {
+    display.innerHTML+= Math.floor((Math.random() * 100) + 1);;
+    display.innerHTML += "<br>";
+  }
+}
+
+function even(num)
+{
+  display.innerHTML= "***Output**<br>";
+    for(i =2; i < num; i++)
+    {
+      display.innerHTML+=i;
+      display.innerHTML += "<br>";
+      i++;
+    }
+}
+
+function powers(num)
+{
+  display.innerHTML= "***Output**<br>";
+    for(i =1; i <= num; i++)
+    {
+      display.innerHTML+=Math.pow(2,i);
+      display.innerHTML += "<br>";
+    }
+}
+
+function areWeThereYet()
+{
+  var there = "quit";
+  display.innerHTML= "***Output**<br>";
+  while(there != "yes")
+  {
+    there = prompt("areWeThereYet?")
+    display.innerHTML= "areWeThereYet?<br>";
+  }
+  display.innerHTML= "Good<br>";
+
+}
+
+function triangle()
+{
+  display.innerHTML= "***Output**<br>";
+ for(i = 1; i < 7; i++)
+ {
+      for(j = 1; j < i; j++)
+      {
+          display.innerHTML+="*";
+      }
+      display.innerHTML+="<br>";
+  }
+}
+
+function tableSquare()
+{
+  display.innerHTML= "***Output**<br>A4x4tablesquare<br>";
+ for(i = 1; i < 5; i++)
+ {
+      for(j = 1; j < 5; j++)
+      {
+          display.innerHTML+=" | " +i*j;
+      }
+      display.innerHTML+=" |<br>";
+  }
+}
+
+function tableSquare(num)
+{
+  display.innerHTML= "***Output**<br>A"+num+"x"+num+"tablesquare<br>";
+ for(i = 1; i < num+1; i++)
+ {
+      for(j = 1; j < num+1; j++)
+      {
+          display.innerHTML+=" | " +i*j;
+      }
+      display.innerHTML+=" |<br>";
+  }
 }

From ace29e80f845979282b12a764ab21023dc3915e3 Mon Sep 17 00:00:00 2001
From: Luis Garcia <pacalyps23@frontier.com>
Date: Wed, 24 May 2017 19:30:00 -0400
Subject: [PATCH 2/3] fixed name collision

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

diff --git a/index.html b/index.html
index 55d9418..45353df 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="tableSquare(6)">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 5f62927..4db992b 100644
--- a/js/script.js
+++ b/js/script.js
@@ -103,7 +103,7 @@ function tableSquare()
   }
 }
 
-function tableSquare(num)
+function tableSquares(num)
 {
   display.innerHTML= "***Output**<br>A"+num+"x"+num+"tablesquare<br>";
  for(i = 1; i < num+1; i++)

From 2fdbcf2616d51982cbd24e95c827691308781e63 Mon Sep 17 00:00:00 2001
From: Luis Garcia <pacalyps23@frontier.com>
Date: Thu, 25 May 2017 08:12:20 -0400
Subject: [PATCH 3/3] updated buttons

---
 index.html | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/index.html b/index.html
index 45353df..8363602 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="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(20)">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(6)">Example 2.10</button></li>
+        <li><button type="button" class="btn btn-primary" onclick="oneToTen()">One To Ten</button></li>
+        <li><button type="button" class="btn btn-primary" onclick="oddNumbers()">Odd Numbers</button></li>
+        <li><button type="button" class="btn btn-primary" onclick="squares()">Squares</button></li>
+        <li><button type="button" class="btn btn-primary" onclick="random4()">Randome 4</button></li>
+        <li><button type="button" class="btn btn-primary" onclick="even(20)">Even(n)</button></li>
+        <li><button type="button" class="btn btn-primary" onclick="powers(8)">Powers(n)</button></li>
+        <li><button type="button" class="btn btn-primary" onclick="areWeThereYet()">AreWeThereYet?</button></li>
+        <li><button type="button" class="btn btn-primary" onclick="triangle()">Triangle</button></li>
+        <li><button type="button" class="btn btn-primary" onclick="tableSquare()">Table Square</button></li>
+        <li><button type="button" class="btn btn-primary" onclick="tableSquares(6)">Table Squares(n)</button></li>
       </ul>
     </section>