From e0a2d442cfe2b98f210e5347aef01a2aa6664d0f Mon Sep 17 00:00:00 2001
From: Molly Arant <mccormick.mollyt@gmail.com>
Date: Wed, 24 May 2017 18:47:03 -0400
Subject: [PATCH 1/3] added in functions for things up to triangle

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

diff --git a/index.html b/index.html
index b16c318..a9f8a62 100644
--- a/index.html
+++ b/index.html
@@ -20,14 +20,14 @@ <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="printNumbersOneToTen()">Example 2.1</button></li>
+        <li><button type="button" class="btn btn-primary" onclick="odd()">Example 2.2</button></li>
+        <li><button type="button" class="btn btn-primary" onclick="squareNumbersto100()">Example 2.3</button></li>
+        <li><button type="button" class="btn btn-primary" onclick="randomNumberGenerator()">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="powersOfTwo(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="yourFunctionName()">Example 2.9</button></li>
         <li><button type="button" class="btn btn-primary" onclick="yourFunctionName()">Example 2.10</button></li>
       </ul>
diff --git a/js/script.js b/js/script.js
index ba8cf69..e4892b9 100644
--- a/js/script.js
+++ b/js/script.js
@@ -5,3 +5,67 @@ var display = document.getElementById("display");
 function yourFunctionName (){
   display.innerHTML = "hello";
 }
+
+function printNumbersOneToTen(){
+  display.innerHTML=("oneToTen<br>***Output***");
+  for(var i=1;i<=10;i++){
+    display.innerHTML+=("<br>" +i);
+  }
+}
+function odd(){
+  display.innerHTML=("oddNumbers()<br>***Output***");
+  for(var i=1;i<20;i+=2){
+    display.innerHTML+=("<br>"+i);
+  }
+}
+function squareNumbersto100(){
+  display.innerHTML=("squares()<br>***Output***");
+  for(var i=1;i<=10;i++){
+    display.innerHTML+=("<br>"+ i*i);
+  }
+}
+
+function randomNumberGenerator(){
+display.innerHTML=("random4()<br>***Output***");
+  for(var i=0;i<4;i++){
+    var randomNumber= Math.floor(Math.random()*100);
+    display.innerHTML+=("<br>"+randomNumber);
+  }
+}
+
+function even(n){
+  display.innerHTML=("even(20)<br>***Output***");
+  for(var i=2;i<n;i+=2){
+    display.innerHTML+=("<br>"+i);
+  }
+}
+
+function powersOfTwo(n){
+  display.innerHTML=("***Output***");
+  for(var i=1;i<=n;i++){
+    display.innerHTML+="<br>" + Math.pow(2, i);
+  }
+}
+
+function areWeThereYet(){
+  var answer = prompt("Are we there yet?");
+
+while(answer!="yes"){
+  answer= prompt("Are we there yet?");
+
+}
+display.innerHTML="Good!";
+}
+
+function triangle(){
+  var filledString="triangle()<br>***Output***";
+  for(var i=1;i<=6;i++){
+    for(var j=1;j<i;j++){
+      filledString+=("*");
+    }
+    if(i<6){
+      filledString+=("<br>");
+    }
+  }
+  display.innerHTML=filledString;
+}

From 48de20dc60b56896bb7f8ef9f238c4250f6a7052 Mon Sep 17 00:00:00 2001
From: Molly Arant <mccormick.mollyt@gmail.com>
Date: Wed, 24 May 2017 18:56:09 -0400
Subject: [PATCH 2/3] replaced  triangle function

---
 js/script.js | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/js/script.js b/js/script.js
index e4892b9..effde73 100644
--- a/js/script.js
+++ b/js/script.js
@@ -58,14 +58,10 @@ display.innerHTML="Good!";
 }
 
 function triangle(){
-  var filledString="triangle()<br>***Output***";
-  for(var i=1;i<=6;i++){
-    for(var j=1;j<i;j++){
-      filledString+=("*");
-    }
-    if(i<6){
-      filledString+=("<br>");
+  var star="";
+  display.innerHTML="triangle()<br>***Output***";
+  for(var i=0;i<5;i++){
+      star+="*";
+      display.innerHTML+="<br>"+ star;
     }
   }
-  display.innerHTML=filledString;
-}

From 24c643b151099d3b94e77e5fb0ee5f19134ea7e9 Mon Sep 17 00:00:00 2001
From: Molly Arant <mccormick.mollyt@gmail.com>
Date: Thu, 25 May 2017 08:46:03 -0400
Subject: [PATCH 3/3] completed lab

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

diff --git a/index.html b/index.html
index a9f8a62..44f2f76 100644
--- a/index.html
+++ b/index.html
@@ -28,8 +28,8 @@ <h1>Loops Exercises</h1>
         <li><button type="button" class="btn btn-primary" onclick="powersOfTwo(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="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="tableSquare()">Example 2.9</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 effde73..18c9c94 100644
--- a/js/script.js
+++ b/js/script.js
@@ -65,3 +65,47 @@ function triangle(){
       display.innerHTML+="<br>"+ star;
     }
   }
+
+  function tableSquare(){
+    display.innerHTML="tableSquare()<br>***Output***<br>";
+    var filledTable="";
+    for(var i=1;i<=4;i++){
+      filledTable+="<br>"
+
+      for (var j=1;j<4;j++){
+      filledTable+="|";
+      var multiple= i*j;
+      if (multiple<=9){
+        filledTable+= "\xa0"+multiple+ " \xa0 ";
+      }
+      else if(multiple>=10){
+        filledTable+= " " +multiple + " ";
+      }
+    }
+    filledTable+="|";
+
+  }
+  display.innerHTML+=filledTable;
+}
+
+function tableSquares(n){
+  display.innerHTML="tableSquare()<br>***Output***<br>";
+  var filledTable="";
+  for(var i=1;i<=n;i++){
+    filledTable+="<br>"
+
+    for (var j=1;j<=n;j++){
+    filledTable+="|";
+    var multiple= i*j;
+    if (multiple<=9){
+      filledTable+= "\xa0 "+multiple+ "\xa0 "
+    }
+    else if(multiple>=10){
+      filledTable+= " " +multiple + " ";
+    }
+  }
+  filledTable+="|";
+
+}
+display.innerHTML+=filledTable;
+}