From a58b9dc894ed31b864f1d9b2e1f7c5ef81faab52 Mon Sep 17 00:00:00 2001
From: David Frary <fraryd@gmail.com>
Date: Mon, 29 Jun 2020 16:31:27 -0400
Subject: [PATCH 01/12] finished edits on 'index.html'

---
 assets/js/shapes.js | 43 ++++++++++++++++++++++++++++++++++---------
 index.html          |  5 -----
 2 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/assets/js/shapes.js b/assets/js/shapes.js
index e4351ba..f7fe866 100644
--- a/assets/js/shapes.js
+++ b/assets/js/shapes.js
@@ -1,31 +1,56 @@
-function getLine(length) {
-    // TODO - write method definition here
-}
 
 
+  function getLine(length) {
+
+let output = "";
+for (let i=0; i<length; i++){
+    output += "*";
+}
+return output;
+}
 
-function getBox(width, height) {
-    // TODO - write method definition here
+ function getBox(width, height) {
+    let output = "";
+    for (let i=0; i<length; i++){
+        output += "*";
+    }
+    return output;
 }
 
 
 
 function getBottomLeftTriangle(length) {
-    // TODO - write method definition here
+    let output = "";
+    for (let i=0; i<length; i++){
+        output += "*";
+    }
+    return output;
 }
 
 
 function getUpperLeftTriangle(length) {
-    // TODO - write method definition here
+    let output = "";
+    for (let i=0; i<length; i++){
+        output += "*";
+    }
+    return output;
 }
 
 
 
 function getPyramid(length) {
-    // TODO - write method definition here
+    let output = "";
+    for (let i=0; i<length; i++){
+        output += "*";
+    }
+    return output;
 }
 
 
 function getCheckerboard(width, height) {
-    // TODO - write method definition here
+    let output = "";
+    for (let i=0; i<length; i++){
+        output += "*";
+    }
+    return output;
 }
diff --git a/index.html b/index.html
index 104b23b..014d39e 100644
--- a/index.html
+++ b/index.html
@@ -26,11 +26,6 @@
 
 
 
-
-
-
-
-
 <!-- ---------------------------------------------------------------------------------- -->
 <!-- ---------------------------------------------------------------------------------- -->
 <!-- ---------------------------------------------------------------------------------- -->

From 8b37663375e07147b65c6a11fff02ea2e2ee8aec Mon Sep 17 00:00:00 2001
From: David Frary <fraryd@gmail.com>
Date: Mon, 29 Jun 2020 16:52:24 -0400
Subject: [PATCH 02/12] finished edits on 'index.html'

---
 assets/js/header-functions.js | 51 +++++++++++++++++++++++++----------
 assets/js/shapes.js           |  5 ++--
 2 files changed, 40 insertions(+), 16 deletions(-)

diff --git a/assets/js/header-functions.js b/assets/js/header-functions.js
index d17b814..1905361 100644
--- a/assets/js/header-functions.js
+++ b/assets/js/header-functions.js
@@ -1,24 +1,47 @@
-function testGetLine(expectedOutput, numberOfStars) {
-    test(expectedOutput, getLine, numberOfStars);
-}
+getLineTests();
+getBoxTests();
+getBottomLeftTriangleTests();
+getUpperLeftTriangleTests();
+getPyramidTests();
+getCheckerboardTests();
+
+
+
 
-function testGetBox(expectedOutput, width, height) {
-    test(expectedOutput, getBox, width, height);
+function getLineTests() {
+    testGetLine("*", 1);
+    testGetLine("**", 2);
+    testGetLine("***", 3);
 }
 
 
-function testGetCheckerboard(expectedOutput, width, height) {
-    test(expectedOutput, getCheckerboard, width, height);
+function getBoxTests() {
+    testGetBox("*\n", 1, 1);
+    testGetBox("**\n**\n", 2, 2);
+    testGetBox("***\n***\n***\n***\n", 3, 4);
 }
 
-function testGetPyramid(expectedOutput, numberOfStars) {
-    test(expectedOutput, getPyramid, numberOfStars);
+function getBottomLeftTriangleTests() {
+    testGetBottomLeftTriangle("*", 1);
+    testGetBottomLeftTriangle("*\n**", 2);
+    testGetBottomLeftTriangle("*\n**\n***", 3);
 }
 
-function testGetUpperLeftTriangle(expectedOutput, numberOfStars) {
-    test(expectedOutput, getUpperLeftTriangle, numberOfStars);
+function getUpperLeftTriangleTests() {
+    testGetUpperLeftTriangle("*", 1);
+    testGetUpperLeftTriangle("**\n*", 2);
+    testGetUpperLeftTriangle("***\n**\n*", 3);
 }
 
-function testGetBottomLeftTriangle(expectedOutput, numberOfStars) {
-    test(expectedOutput, getBottomLeftTriangle, numberOfStars);
-}
\ No newline at end of file
+
+function getPyramidTests() {
+    testGetPyramid("*", 1);
+    testGetPyramid(" * \n***", 2);
+    testGetPyramid("  *  \n *** \n*****", 3);
+}
+
+
+function getCheckerboardTests() {
+    testGetCheckerboard(" *\n* \n", 2, 2);
+    testGetCheckerboard(" * \n* *\n * \n", 3, 3);
+    testGetCheckerboard(" * \n* *\n * \n* *\n", 3, 4);
\ No newline at end of file
diff --git a/assets/js/shapes.js b/assets/js/shapes.js
index f7fe866..723224e 100644
--- a/assets/js/shapes.js
+++ b/assets/js/shapes.js
@@ -14,11 +14,12 @@ return output;
     for (let i=0; i<length; i++){
         output += "*";
     }
+    for (let i=0; i<height; i++){
+        output += "*";
+    }
     return output;
 }
 
-
-
 function getBottomLeftTriangle(length) {
     let output = "";
     for (let i=0; i<length; i++){

From b27edbd5e9c3b4bc416582ec34a20a2db2ab957e Mon Sep 17 00:00:00 2001
From: David Frary <fraryd@gmail.com>
Date: Mon, 29 Jun 2020 16:53:44 -0400
Subject: [PATCH 03/12] finished edits on 'index.html'

---
 assets/js/footer-functions.js |  6 ++---
 assets/js/header-functions.js | 51 ++++++++++-------------------------
 2 files changed, 17 insertions(+), 40 deletions(-)

diff --git a/assets/js/footer-functions.js b/assets/js/footer-functions.js
index 42cc05b..4ee25ea 100644
--- a/assets/js/footer-functions.js
+++ b/assets/js/footer-functions.js
@@ -24,7 +24,7 @@ function getBoxTests() {
 function getBottomLeftTriangleTests() {
     testGetBottomLeftTriangle("*", 1);
     testGetBottomLeftTriangle("*\n**", 2);
-    testGetBottomLeftTriangle("*\n**\n**", 3);
+    testGetBottomLeftTriangle("*\n**\n***", 3);
 }
 
 function getUpperLeftTriangleTests() {
@@ -42,7 +42,7 @@ function getPyramidTests() {
 
 
 function getCheckerboardTests() {
-    testGetCheckerboard(" *\n* ", 2, 2);
-    testGetCheckerboard(" * \n* *\n * ", 3, 3);
+    testGetCheckerboard(" *\n* \n", 2, 2);
+    testGetCheckerboard(" * \n* *\n * \n", 3, 3);
     testGetCheckerboard(" * \n* *\n * \n* *\n", 3, 4);
 }
\ No newline at end of file
diff --git a/assets/js/header-functions.js b/assets/js/header-functions.js
index 1905361..d17b814 100644
--- a/assets/js/header-functions.js
+++ b/assets/js/header-functions.js
@@ -1,47 +1,24 @@
-getLineTests();
-getBoxTests();
-getBottomLeftTriangleTests();
-getUpperLeftTriangleTests();
-getPyramidTests();
-getCheckerboardTests();
-
-
-
-
-function getLineTests() {
-    testGetLine("*", 1);
-    testGetLine("**", 2);
-    testGetLine("***", 3);
+function testGetLine(expectedOutput, numberOfStars) {
+    test(expectedOutput, getLine, numberOfStars);
 }
 
-
-function getBoxTests() {
-    testGetBox("*\n", 1, 1);
-    testGetBox("**\n**\n", 2, 2);
-    testGetBox("***\n***\n***\n***\n", 3, 4);
+function testGetBox(expectedOutput, width, height) {
+    test(expectedOutput, getBox, width, height);
 }
 
-function getBottomLeftTriangleTests() {
-    testGetBottomLeftTriangle("*", 1);
-    testGetBottomLeftTriangle("*\n**", 2);
-    testGetBottomLeftTriangle("*\n**\n***", 3);
-}
 
-function getUpperLeftTriangleTests() {
-    testGetUpperLeftTriangle("*", 1);
-    testGetUpperLeftTriangle("**\n*", 2);
-    testGetUpperLeftTriangle("***\n**\n*", 3);
+function testGetCheckerboard(expectedOutput, width, height) {
+    test(expectedOutput, getCheckerboard, width, height);
 }
 
-
-function getPyramidTests() {
-    testGetPyramid("*", 1);
-    testGetPyramid(" * \n***", 2);
-    testGetPyramid("  *  \n *** \n*****", 3);
+function testGetPyramid(expectedOutput, numberOfStars) {
+    test(expectedOutput, getPyramid, numberOfStars);
 }
 
+function testGetUpperLeftTriangle(expectedOutput, numberOfStars) {
+    test(expectedOutput, getUpperLeftTriangle, numberOfStars);
+}
 
-function getCheckerboardTests() {
-    testGetCheckerboard(" *\n* \n", 2, 2);
-    testGetCheckerboard(" * \n* *\n * \n", 3, 3);
-    testGetCheckerboard(" * \n* *\n * \n* *\n", 3, 4);
\ No newline at end of file
+function testGetBottomLeftTriangle(expectedOutput, numberOfStars) {
+    test(expectedOutput, getBottomLeftTriangle, numberOfStars);
+}
\ No newline at end of file

From a91438dd14b4819d185315b89b52392e9f2365fd Mon Sep 17 00:00:00 2001
From: David Frary <fraryd@gmail.com>
Date: Mon, 29 Jun 2020 21:13:19 -0400
Subject: [PATCH 04/12] finished edits on 'index.html'

---
 assets/js/shapes.js | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/assets/js/shapes.js b/assets/js/shapes.js
index 723224e..3a377f3 100644
--- a/assets/js/shapes.js
+++ b/assets/js/shapes.js
@@ -9,17 +9,23 @@ for (let i=0; i<length; i++){
 return output;
 }
 
+
+//
  function getBox(width, height) {
-    let output = "";
-    for (let i=0; i<length; i++){
-        output += "*";
+    let output1 = "";
+    let output2 = "";
+    
+    for (let i=0; i<width; i++){
+        output1 += "*";
     }
     for (let i=0; i<height; i++){
-        output += "*";
+        output2 += output1 + "\n";
     }
-    return output;
+return output2;
 }
 
+
+//
 function getBottomLeftTriangle(length) {
     let output = "";
     for (let i=0; i<length; i++){
@@ -29,6 +35,7 @@ function getBottomLeftTriangle(length) {
 }
 
 
+//
 function getUpperLeftTriangle(length) {
     let output = "";
     for (let i=0; i<length; i++){
@@ -38,7 +45,7 @@ function getUpperLeftTriangle(length) {
 }
 
 
-
+//
 function getPyramid(length) {
     let output = "";
     for (let i=0; i<length; i++){
@@ -48,9 +55,11 @@ function getPyramid(length) {
 }
 
 
+
+//
 function getCheckerboard(width, height) {
     let output = "";
-    for (let i=0; i<length; i++){
+    for (let i=0; i<width; i++){
         output += "*";
     }
     return output;

From 9d800d19bbdb09db11fe6c7fc1c9e070dc350688 Mon Sep 17 00:00:00 2001
From: David Frary <fraryd@gmail.com>
Date: Mon, 29 Jun 2020 22:11:23 -0400
Subject: [PATCH 05/12] finished edits on 'index.html'

---
 assets/js/shapes.js | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/assets/js/shapes.js b/assets/js/shapes.js
index 3a377f3..765215f 100644
--- a/assets/js/shapes.js
+++ b/assets/js/shapes.js
@@ -1,5 +1,7 @@
 
 
+
+//Line
   function getLine(length) {
 
 let output = "";
@@ -10,7 +12,7 @@ return output;
 }
 
 
-//
+//Box
  function getBox(width, height) {
     let output1 = "";
     let output2 = "";
@@ -25,7 +27,7 @@ return output2;
 }
 
 
-//
+//Bottom Left Triangle
 function getBottomLeftTriangle(length) {
     let output = "";
     for (let i=0; i<length; i++){
@@ -35,7 +37,7 @@ function getBottomLeftTriangle(length) {
 }
 
 
-//
+//Top Left Triangle
 function getUpperLeftTriangle(length) {
     let output = "";
     for (let i=0; i<length; i++){
@@ -45,7 +47,7 @@ function getUpperLeftTriangle(length) {
 }
 
 
-//
+//Pyramid
 function getPyramid(length) {
     let output = "";
     for (let i=0; i<length; i++){
@@ -55,12 +57,16 @@ function getPyramid(length) {
 }
 
 
-
-//
+//Checkerboard
 function getCheckerboard(width, height) {
-    let output = "";
+    let output1 = "";
+    let output2 = "";
+    
     for (let i=0; i<width; i++){
-        output += "*";
+        output1 += "*";
     }
-    return output;
-}
+    for (let i=0; i<height; i++){
+        output2 += output1 + "\n";
+    }
+return output2;
+}
\ No newline at end of file

From 5b058c47310e621420d06260663cdaa2a722a407 Mon Sep 17 00:00:00 2001
From: David Frary <fraryd@gmail.com>
Date: Tue, 30 Jun 2020 08:58:16 -0400
Subject: [PATCH 06/12] finished edits on 'index.html'

---
 assets/js/shapes.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/assets/js/shapes.js b/assets/js/shapes.js
index 765215f..d234c89 100644
--- a/assets/js/shapes.js
+++ b/assets/js/shapes.js
@@ -32,9 +32,12 @@ function getBottomLeftTriangle(length) {
     let output = "";
     for (let i=0; i<length; i++){
         output += "*";
+        for (let j=1; j<i; j++){
+        output += "\n"
+        }
     }
     return output;
-}
+    }
 
 
 //Top Left Triangle

From 2178f611d795d05bb86645353cb5e6f623e49dad Mon Sep 17 00:00:00 2001
From: David Frary <fraryd@gmail.com>
Date: Tue, 30 Jun 2020 09:15:12 -0400
Subject: [PATCH 07/12] finished edits on 'shapes.js'

---
 assets/js/shapes.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/assets/js/shapes.js b/assets/js/shapes.js
index d234c89..3b4a7cf 100644
--- a/assets/js/shapes.js
+++ b/assets/js/shapes.js
@@ -21,7 +21,7 @@ return output;
         output1 += "*";
     }
     for (let i=0; i<height; i++){
-        output2 += output1 + "\n";
+        output2 += output1;
     }
 return output2;
 }
@@ -33,7 +33,7 @@ function getBottomLeftTriangle(length) {
     for (let i=0; i<length; i++){
         output += "*";
         for (let j=1; j<i; j++){
-        output += "\n"
+        output += "\n";
         }
     }
     return output;
@@ -66,7 +66,7 @@ function getCheckerboard(width, height) {
     let output2 = "";
     
     for (let i=0; i<width; i++){
-        output1 += "*";
+        output1 += "*" + " ";
     }
     for (let i=0; i<height; i++){
         output2 += output1 + "\n";

From afd991c41422744dbfe22dae3d946302d0ecba17 Mon Sep 17 00:00:00 2001
From: David Frary <fraryd@gmail.com>
Date: Tue, 30 Jun 2020 12:51:37 -0400
Subject: [PATCH 08/12] finished edits on 'shapes.js'

---
 assets/js/shapes.js | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/assets/js/shapes.js b/assets/js/shapes.js
index 3b4a7cf..b20b311 100644
--- a/assets/js/shapes.js
+++ b/assets/js/shapes.js
@@ -21,7 +21,7 @@ return output;
         output1 += "*";
     }
     for (let i=0; i<height; i++){
-        output2 += output1;
+        output2 += output1 + "\n";
     }
 return output2;
 }
@@ -30,11 +30,11 @@ return output2;
 //Bottom Left Triangle
 function getBottomLeftTriangle(length) {
     let output = "";
-    for (let i=0; i<length; i++){
+    for (let i=0; i<=length; i++){
+        for (let j=length-1; j>=i; j--){
         output += "*";
-        for (let j=1; j<i; j++){
-        output += "\n";
         }
+        output += "\n";
     }
     return output;
     }
@@ -43,11 +43,14 @@ function getBottomLeftTriangle(length) {
 //Top Left Triangle
 function getUpperLeftTriangle(length) {
     let output = "";
-    for (let i=0; i<length; i++){
+    for (let i=0; i<=length; i++){
+        for (let j=length-1; j>=i; j--){
         output += "*";
+        }
+        output += "\n";
     }
     return output;
-}
+    }
 
 
 //Pyramid
@@ -66,7 +69,8 @@ function getCheckerboard(width, height) {
     let output2 = "";
     
     for (let i=0; i<width; i++){
-        output1 += "*" + " ";
+        output1 += "*";
+        output1 += " ";
     }
     for (let i=0; i<height; i++){
         output2 += output1 + "\n";

From e4f4e427ec0ca4cd629e1f1118629b98b0940171 Mon Sep 17 00:00:00 2001
From: David Frary <fraryd@gmail.com>
Date: Tue, 30 Jun 2020 14:31:38 -0400
Subject: [PATCH 09/12] finished edits on 'shapes.js'

---
 assets/js/shapes.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/js/shapes.js b/assets/js/shapes.js
index b20b311..837f8ec 100644
--- a/assets/js/shapes.js
+++ b/assets/js/shapes.js
@@ -31,7 +31,7 @@ return output2;
 function getBottomLeftTriangle(length) {
     let output = "";
     for (let i=0; i<=length; i++){
-        for (let j=length-1; j>=i; j--){
+        for (let j=0; j<=i; j++){
         output += "*";
         }
         output += "\n";

From 458140af8b7cb52b4c0bfbec17c1a7edc75d6473 Mon Sep 17 00:00:00 2001
From: David Frary <fraryd@gmail.com>
Date: Tue, 30 Jun 2020 14:32:50 -0400
Subject: [PATCH 10/12] finished edits on 'shapes.js'

---
 assets/js/shapes.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/js/shapes.js b/assets/js/shapes.js
index 837f8ec..255084e 100644
--- a/assets/js/shapes.js
+++ b/assets/js/shapes.js
@@ -30,7 +30,7 @@ return output2;
 //Bottom Left Triangle
 function getBottomLeftTriangle(length) {
     let output = "";
-    for (let i=0; i<=length; i++){
+    for (let i=0; i<length; i++){
         for (let j=0; j<=i; j++){
         output += "*";
         }

From ca1a82865bfaf1029dbc0141e69d4cdcef0c22a1 Mon Sep 17 00:00:00 2001
From: David Frary <fraryd@gmail.com>
Date: Wed, 1 Jul 2020 10:34:36 -0400
Subject: [PATCH 11/12] finished edits on 'shapes.js'

---
 assets/js/shapes.js | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/assets/js/shapes.js b/assets/js/shapes.js
index 255084e..4c81619 100644
--- a/assets/js/shapes.js
+++ b/assets/js/shapes.js
@@ -30,11 +30,11 @@ return output2;
 //Bottom Left Triangle
 function getBottomLeftTriangle(length) {
     let output = "";
-    for (let i=0; i<length; i++){
-        for (let j=0; j<=i; j++){
+    for (let i=1; i<=length; i++){
+        for (let j=0; j<i; j++){
         output += "*";
         }
-        output += "\n";
+        output = output + "\n";
     }
     return output;
     }
@@ -43,8 +43,8 @@ function getBottomLeftTriangle(length) {
 //Top Left Triangle
 function getUpperLeftTriangle(length) {
     let output = "";
-    for (let i=0; i<=length; i++){
-        for (let j=length-1; j>=i; j--){
+    for (let i=0; i<length; i++){
+        for (let j=length; j>i; j--){
         output += "*";
         }
         output += "\n";
@@ -54,12 +54,22 @@ function getUpperLeftTriangle(length) {
 
 
 //Pyramid
-function getPyramid(length) {
+function getPyramid(length) 
+{
     let output = "";
-    for (let i=0; i<length; i++){
-        output += "*";
-    }
-    return output;
+    for (let i=0; i<length; i++)
+    {
+        for(let j=1; j<length-i; j++)
+        {
+            output+= " ";
+        }
+         for(let k=1; k<=(i * 2 + 1); k++)
+            { 
+              output+= "*";
+            }
+            output+= "\n";
+    }    
+           return output;
 }
 
 

From 7c335923216c0baf7d779aef4abb888dc6018441 Mon Sep 17 00:00:00 2001
From: David Frary <fraryd@gmail.com>
Date: Wed, 1 Jul 2020 11:40:10 -0400
Subject: [PATCH 12/12] finished edits on 'shapes.js'

---
 assets/js/shapes.js | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/assets/js/shapes.js b/assets/js/shapes.js
index 4c81619..9a1f252 100644
--- a/assets/js/shapes.js
+++ b/assets/js/shapes.js
@@ -34,7 +34,7 @@ function getBottomLeftTriangle(length) {
         for (let j=0; j<i; j++){
         output += "*";
         }
-        output = output + "\n";
+        output += "\n";
     }
     return output;
     }
@@ -53,6 +53,7 @@ function getUpperLeftTriangle(length) {
     }
 
 
+
 //Pyramid
 function getPyramid(length) 
 {
@@ -73,17 +74,20 @@ function getPyramid(length)
 }
 
 
+
 //Checkerboard
+
 function getCheckerboard(width, height) {
-    let output1 = "";
-    let output2 = "";
-    
-    for (let i=0; i<width; i++){
-        output1 += "*";
-        output1 += " ";
-    }
-    for (let i=0; i<height; i++){
-        output2 += output1 + "\n";
+    let output = "";
+    for (let i = 0; i <height; i++) {
+        for (let j = 0 ; j < width ; j++) {
+            if (((i+j)%2) == 0) {
+                output += " ";
+            } else {
+                output += "*";
+            }
+        }
+        output += "\n";
     }
-return output2;
+    return output;
 }
\ No newline at end of file