From f815508651c20c2f7384db6f8470a139aa24fa5e Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a2-pllopez)" Date: Tue, 3 Sep 2019 18:18:17 +0000 Subject: [PATCH 001/191] =?UTF-8?q?=F0=9F=8C=A0=F0=9F=91=80=20Checkpoint?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shrinkwrap.yaml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 shrinkwrap.yaml diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml new file mode 100644 index 00000000..86c7048d --- /dev/null +++ b/shrinkwrap.yaml @@ -0,0 +1,15 @@ +dependencies: + mime: 2.4.4 +packages: + /mime/2.4.4: + dev: false + engines: + node: '>=4.0.0' + hasBin: true + resolution: + integrity: sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA== +registry: 'https://registry.npmjs.org/' +shrinkwrapMinorVersion: 9 +shrinkwrapVersion: 3 +specifiers: + mime: ^2.4.4 From c15e2a59a6f7586736b4cda16960c6fe046a79a8 Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a2-pllopez)" Date: Tue, 3 Sep 2019 18:53:15 +0000 Subject: [PATCH 002/191] =?UTF-8?q?=F0=9F=93=BA=F0=9F=8F=B0=20Checkpoint?= =?UTF-8?q?=20./public/index.html:6266626/43?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/index.html | 1 + 1 file changed, 1 insertion(+) diff --git a/public/index.html b/public/index.html index c56d620e..581b2049 100755 --- a/public/index.html +++ b/public/index.html @@ -26,6 +26,7 @@ }) .then( function( response ) { // do something with the reponse + alert(input.value) console.log( response ) }) From 59f5e509062c38283fe1693796e20a486d970f89 Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a2-pllopez)" Date: Wed, 4 Sep 2019 13:30:09 +0000 Subject: [PATCH 003/191] =?UTF-8?q?=F0=9F=91=A8=E2=80=8D=E2=9D=A4=EF=B8=8F?= =?UTF-8?q?=E2=80=8D=F0=9F=92=8B=E2=80=8D=F0=9F=91=A8=F0=9F=8D=9A=20Checkp?= =?UTF-8?q?oint=20./public/css/style.css:6266626/2=20./public/index.html:6?= =?UTF-8?q?266626/343=20./package.json:6266626/15?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- public/css/style.css | 3 ++- public/index.html | 7 ++++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 988f135f..6f08b507 100755 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "", + "name": "Paris Lopez", "version": "", "description": "", "author": "", diff --git a/public/css/style.css b/public/css/style.css index d5f842ab..e5b73639 100755 --- a/public/css/style.css +++ b/public/css/style.css @@ -1 +1,2 @@ -/*Style your own assignment! This is fun! */ \ No newline at end of file +/*Style your own assignment! This is fun! */ + diff --git a/public/index.html b/public/index.html index 581b2049..c6265615 100755 --- a/public/index.html +++ b/public/index.html @@ -6,12 +6,14 @@
- +
+
+ Your Name +
@@ -67,9 +68,12 @@
+
- +
diff --git a/public/js/scripts.js b/public/js/scripts.js index de052eae..d2aba24b 100755 --- a/public/js/scripts.js +++ b/public/js/scripts.js @@ -1,3 +1,10 @@ // Add some Javascript code here, to run on the front end. -console.log("Welcome to assignment 2!") \ No newline at end of file +console.log("Welcome to assignment 2!") + +const days = [ + "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday" +] +//.boardsection[data-board] +const nextButton = document.querySelector( '' ); +console.log(nextButton) \ No newline at end of file From 331abc2c3a903f8b3f4472ceedcbf3c1b0509227 Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a2-pllopez)" Date: Sun, 8 Sep 2019 20:25:21 +0000 Subject: [PATCH 035/191] =?UTF-8?q?=F0=9F=8F=8C=F0=9F=9A=9E=20Checkpoint?= =?UTF-8?q?=20./public/js/scripts.js:6266626/233=20./public/index.html:626?= =?UTF-8?q?6626/167=20./public/css/style.css:6266626/393?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/css/style.css | 15 +++++++++++++++ public/index.html | 5 ++++- public/js/scripts.js | 7 +++++-- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/public/css/style.css b/public/css/style.css index 6fe0bbf1..2f8c7946 100755 --- a/public/css/style.css +++ b/public/css/style.css @@ -31,6 +31,7 @@ body { border: 1px solid white; display: flex; flex-direction: column; + animation-name } .board[data-board] .tasklist { @@ -53,4 +54,18 @@ body { #next { left: 200px; +} + +@keyframes dailyTransition { + 0% { + translateX: -100%; + translateY: -100% + } + 50% { + translateX: 300%; + } + 100% { + translateY: 100%; + translateX: -200% + } } \ No newline at end of file diff --git a/public/index.html b/public/index.html index cb3662b9..c63ba76b 100755 --- a/public/index.html +++ b/public/index.html @@ -143,8 +143,11 @@ } window.onload = function() { - const button = document.querySelector( 'button' ) + const button = document.querySelector( '#submit' ) button.onclick = submit + + const nextButton = document.querySelector( '#next' ) + nextButton.onclick = nextAction } diff --git a/public/js/scripts.js b/public/js/scripts.js index d2aba24b..9cbf690d 100755 --- a/public/js/scripts.js +++ b/public/js/scripts.js @@ -6,5 +6,8 @@ const days = [ "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday" ] //.boardsection[data-board] -const nextButton = document.querySelector( '' ); -console.log(nextButton) \ No newline at end of file +//const nextButton = document.querySelector( '#next' ); + +const nextAction = function() { + document.querySelector( '.boardsection' ).css('transform: 50%' ); +} \ No newline at end of file From f03ed7f2e5014ddb7fa9dad8208cc60048562e1e Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a2-pllopez)" Date: Sun, 8 Sep 2019 20:37:20 +0000 Subject: [PATCH 036/191] =?UTF-8?q?=F0=9F=99=8B=F0=9F=95=B9=20Checkpoint?= =?UTF-8?q?=20./public/css/style.css:6266626/1577?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/css/style.css | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/public/css/style.css b/public/css/style.css index 2f8c7946..8c9fdbf9 100755 --- a/public/css/style.css +++ b/public/css/style.css @@ -31,7 +31,8 @@ body { border: 1px solid white; display: flex; flex-direction: column; - animation-name + animation-name: next; + animation-duration: 2s; } .board[data-board] .tasklist { @@ -56,16 +57,22 @@ body { left: 200px; } -@keyframes dailyTransition { +@keyframes next { 0% { - translateX: -100%; - translateY: -100% + transform: translateX(-200%); + transform: translateX(-200%); + translateY: -100%; } 50% { translateX: 300%; } 100% { - translateY: 100%; - translateX: -200% + transform: translateX(-200%); + } +} + +@keyframes color { + 100% { + background-color: white; } } \ No newline at end of file From 276a12ca0e36e68bb5db715a6a5ea39819da2c91 Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a2-pllopez)" Date: Sun, 8 Sep 2019 20:49:24 +0000 Subject: [PATCH 037/191] =?UTF-8?q?=F0=9F=8E=BA=F0=9F=92=97=20Checkpoint?= =?UTF-8?q?=20./public/css/style.css:6266626/1170?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/css/style.css | 40 ++++++++++++++++++++++++++++++---------- 1 file changed, 30 insertions(+), 10 deletions(-) diff --git a/public/css/style.css b/public/css/style.css index 8c9fdbf9..7716c8a5 100755 --- a/public/css/style.css +++ b/public/css/style.css @@ -19,6 +19,7 @@ body { } .board { + overflow: hidden; display: flex; flex-direction: row; width: 98vw; @@ -31,8 +32,11 @@ body { border: 1px solid white; display: flex; flex-direction: column; - animation-name: next; - animation-duration: 2s; +} + +.boardsection:first-child{ + flex-direction: column; + animation: next 6s; } .board[data-board] .tasklist { @@ -58,21 +62,37 @@ body { } @keyframes next { - 0% { - transform: translateX(-200%); - transform: translateX(-200%); - translateY: -100%; + 10% { + transform: translateX(-150%); + } + 25% { + transform: translateY(-300%); } 50% { - translateX: 300%; + transform: translateX(1000%); + } + 75% { + transform: translateY(0%); } 100% { - transform: translateX(-200%); + transform: translateX(0%); } } -@keyframes color { +@keyframes nextbody { + 10% { + transform: translateX(0%; + } + 25% { + transform: translateY(-300%); + } + 50% { + transform: translateX(1000%); + } + 75% { + transform: translateY(0%); + } 100% { - background-color: white; + transform: translateX(0%); } } \ No newline at end of file From 10bc24f5360b2468e810d586ebe51a7e0a298c31 Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a2-pllopez)" Date: Sun, 8 Sep 2019 21:01:31 +0000 Subject: [PATCH 038/191] =?UTF-8?q?=F0=9F=95=8D=F0=9F=8C=84=20Checkpoint?= =?UTF-8?q?=20./public/css/style.css:6266626/1473?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/css/style.css | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/public/css/style.css b/public/css/style.css index 7716c8a5..f3edf040 100755 --- a/public/css/style.css +++ b/public/css/style.css @@ -32,11 +32,11 @@ body { border: 1px solid white; display: flex; flex-direction: column; + animation: nextbody 1s forwards; } .boardsection:first-child{ - flex-direction: column; - animation: next 6s; + animation: next 3s forwards; } .board[data-board] .tasklist { @@ -63,36 +63,24 @@ body { @keyframes next { 10% { - transform: translateX(-150%); + transform: translateX(-150%) translateY(0%); } 25% { - transform: translateY(-300%); + transform: translateX(-150%) translateY(-300%); } 50% { - transform: translateX(1000%); + transform: translateX(1000%) translateY(-300%); } 75% { - transform: translateY(0%); + transform: translateX(1000%) translateY(0%); } 100% { - transform: translateX(0%); + transform: translateX(600%) translateY(0%); } } @keyframes nextbody { - 10% { - transform: translateX(0%; - } - 25% { - transform: translateY(-300%); - } - 50% { - transform: translateX(1000%); - } - 75% { - transform: translateY(0%); - } 100% { - transform: translateX(0%); + transform: translateX(-100%) translateY(0%); } } \ No newline at end of file From 8d390643dc2dcdf457a77ff5985d665d49e22b3a Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a2-pllopez)" Date: Sun, 8 Sep 2019 21:13:29 +0000 Subject: [PATCH 039/191] =?UTF-8?q?=E2=98=94=EF=B8=8F=F0=9F=90=92=20Checkp?= =?UTF-8?q?oint=20./public/css/style.css:6266626/591=20./public/js/scripts?= =?UTF-8?q?.js:6266626/191?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/css/style.css | 7 +++++-- public/js/scripts.js | 5 +++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/public/css/style.css b/public/css/style.css index f3edf040..9ae64e51 100755 --- a/public/css/style.css +++ b/public/css/style.css @@ -36,7 +36,7 @@ body { } .boardsection:first-child{ - animation: next 3s forwards; + animation: next 1s forwards; } .board[data-board] .tasklist { @@ -62,7 +62,7 @@ body { } @keyframes next { - 10% { + 20% { transform: translateX(-150%) translateY(0%); } 25% { @@ -80,6 +80,9 @@ body { } @keyframes nextbody { + 0% { + transform: translateX(0%) translateY(0%); + } 100% { transform: translateX(-100%) translateY(0%); } diff --git a/public/js/scripts.js b/public/js/scripts.js index 9cbf690d..dcd7c57d 100755 --- a/public/js/scripts.js +++ b/public/js/scripts.js @@ -9,5 +9,6 @@ const days = [ //const nextButton = document.querySelector( '#next' ); const nextAction = function() { - document.querySelector( '.boardsection' ).css('transform: 50%' ); -} \ No newline at end of file + document.querySelector( '.boardsection' ).css(); +} + From f6964d2f56366943713c08fe044d4bfeabb71f3b Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a2-pllopez)" Date: Sun, 8 Sep 2019 21:25:31 +0000 Subject: [PATCH 040/191] =?UTF-8?q?=F0=9F=8C=84=F0=9F=93=AE=20Checkpoint?= =?UTF-8?q?=20./public/js/scripts.js:6266626/381=20./public/index.html:626?= =?UTF-8?q?6626/107?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/index.html | 14 +++++++------- public/js/scripts.js | 8 ++++++-- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/public/index.html b/public/index.html index c63ba76b..18f13640 100755 --- a/public/index.html +++ b/public/index.html @@ -11,7 +11,7 @@ Daily Schedule
-
+
Sunday
@@ -19,7 +19,7 @@ thing
-
+
Monday
@@ -27,7 +27,7 @@ thing
-
+
Tuesday
@@ -35,7 +35,7 @@ thing
-
+
Wednesday
@@ -43,7 +43,7 @@ thing
-
+
Thursday
@@ -51,7 +51,7 @@ thing
-
+
Friday
@@ -59,7 +59,7 @@ thing
-
+
Saturday
diff --git a/public/js/scripts.js b/public/js/scripts.js index dcd7c57d..32106a81 100755 --- a/public/js/scripts.js +++ b/public/js/scripts.js @@ -8,7 +8,11 @@ const days = [ //.boardsection[data-board] //const nextButton = document.querySelector( '#next' ); -const nextAction = function() { - document.querySelector( '.boardsection' ).css(); +const nextAction = function(num) { + var day = document.querySelector( '.boardsection[data-board=day_' + num + ']' ); + var body = document.querySelector( ':not(.boardsection[data-board=day_' + num + '])' ); + day.animate('next', '1s', 'forwards'); + body.animate('nextbody', '1s', 'forwards'); + } From 7d5f3f96fb856f25f35f67b6e3a47441957b6de2 Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a2-pllopez)" Date: Sun, 8 Sep 2019 21:37:25 +0000 Subject: [PATCH 041/191] =?UTF-8?q?=F0=9F=90=9A=F0=9F=8F=99=20Checkpoint?= =?UTF-8?q?=20./public/js/scripts.js:6266626/681=20./public/index.html:626?= =?UTF-8?q?6626/214?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/js/scripts.js | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/public/js/scripts.js b/public/js/scripts.js index 32106a81..9a94109d 100755 --- a/public/js/scripts.js +++ b/public/js/scripts.js @@ -9,10 +9,30 @@ const days = [ //const nextButton = document.querySelector( '#next' ); const nextAction = function(num) { + alert("Hello") var day = document.querySelector( '.boardsection[data-board=day_' + num + ']' ); var body = document.querySelector( ':not(.boardsection[data-board=day_' + num + '])' ); - day.animate('next', '1s', 'forwards'); + day.animate([ + + ],{ + duration: 1, + + }, + 'forwards'); body.animate('nextbody', '1s', 'forwards'); } + +/* + +document.getElementById("tunnel").animate([ + // keyframes + { transform: 'translateY(0px)' }, + { transform: 'translateY(-300px)' } +], { + // timing options + duration: 1000, + iterations: Infinity +}) +*/ \ No newline at end of file From 2b581da8562506bdfdf4ec282bd0394fe19c2eb8 Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a2-pllopez)" Date: Sun, 8 Sep 2019 21:48:34 +0000 Subject: [PATCH 042/191] =?UTF-8?q?=F0=9F=97=83=F0=9F=98=84=20Checkpoint?= =?UTF-8?q?=20./public/js/scripts.js:6266626/700=20./public/css/style.css:?= =?UTF-8?q?6266626/96=20./public/index.html:6266626/276?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/css/style.css | 5 ----- public/index.html | 6 +----- public/js/scripts.js | 26 +++++++++++++------------- 3 files changed, 14 insertions(+), 23 deletions(-) diff --git a/public/css/style.css b/public/css/style.css index 9ae64e51..93ae4be2 100755 --- a/public/css/style.css +++ b/public/css/style.css @@ -32,11 +32,6 @@ body { border: 1px solid white; display: flex; flex-direction: column; - animation: nextbody 1s forwards; -} - -.boardsection:first-child{ - animation: next 1s forwards; } .board[data-board] .tasklist { diff --git a/public/index.html b/public/index.html index 18f13640..554d6284 100755 --- a/public/index.html +++ b/public/index.html @@ -4,7 +4,6 @@ CS4241 Assignment 2 -
@@ -77,11 +76,8 @@ - +
diff --git a/public/js/scripts.js b/public/js/scripts.js index a5c4ed8a..16e98d4d 100755 --- a/public/js/scripts.js +++ b/public/js/scripts.js @@ -7,12 +7,14 @@ const days = [ ]; */ - - $('#next').on('click', function() { - alert("Hello"); - $(".boardsection[data-board='day_1']").css({animation: "body 1s forwards"}); +$(document).ready(function () { + $("#next").on('click', function() { + $(".boardsection[data-board='day_0']").css({animation: "next 1s forwards"}); + $("(.boardsection[data-board])").css({animation: "next 1s forwards"}); + //$(':not(.boardsection[data-board=day_' + num + '])').css({animation: "body 1s forwards"}); }) +}) From 1170a79400a48dc09f33eefc6ec946a56fe04097 Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a2-pllopez)" Date: Sun, 8 Sep 2019 22:24:29 +0000 Subject: [PATCH 045/191] =?UTF-8?q?=F0=9F=90=9C=F0=9F=98=8B=20Checkpoint?= =?UTF-8?q?=20./public/js/scripts.js:6266626/1100=20./public/index.html:62?= =?UTF-8?q?66626/93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/index.html | 2 -- public/js/scripts.js | 9 ++++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/public/index.html b/public/index.html index 931640e0..9ba9b054 100755 --- a/public/index.html +++ b/public/index.html @@ -143,8 +143,6 @@ const button = document.querySelector( '#submit' ) button.onclick = submit - const nextButton = document.querySelector( '#next' ) - nextButton.onclick = nextAction } diff --git a/public/js/scripts.js b/public/js/scripts.js index 16e98d4d..f3475e41 100755 --- a/public/js/scripts.js +++ b/public/js/scripts.js @@ -9,11 +9,14 @@ const days = [ $(document).ready(function () { $("#next").on('click', function() { + $(".boardsection[data-board]").css({animation: "nextbody 1s forwards"}); $(".boardsection[data-board='day_0']").css({animation: "next 1s forwards"}); - $("(.boardsection[data-board])").css({animation: "next 1s forwards"}); - - //$(':not(.boardsection[data-board=day_' + num + '])').css({animation: "body 1s forwards"}); }) + $(".boardsection[data-board]").on('animationEnd', function() { + + console.log($(this).order); + }) + }) From 8b70c7dc1d1e7e4f0ebfa5e21a470e8474ca6718 Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a2-pllopez)" Date: Sun, 8 Sep 2019 22:36:32 +0000 Subject: [PATCH 046/191] =?UTF-8?q?=F0=9F=90=83=F0=9F=91=93=20Checkpoint?= =?UTF-8?q?=20./public/js/scripts.js:6266626/1271=20./public/css/style.css?= =?UTF-8?q?:6266626/1169=20./public/index.html:6266626/14?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/css/style.css | 49 ++++++++++++++++++++++++++++++++++++++++++++ public/index.html | 14 ++++++------- public/js/scripts.js | 16 ++++++++------- 3 files changed, 65 insertions(+), 14 deletions(-) diff --git a/public/css/style.css b/public/css/style.css index 93ae4be2..799b0d32 100755 --- a/public/css/style.css +++ b/public/css/style.css @@ -33,6 +33,55 @@ body { display: flex; flex-direction: column; } +.boardsection:nth-child(1){ + width: 15%; + border: 1px solid white; + display: flex; + flex-direction: column; + order:1; +} +.boardsection:nth-child(2){ + width: 15%; + border: 1px solid white; + display: flex; + flex-direction: column; + order:2; +} +.boardsection:nth-child(3){ + width: 15%; + border: 1px solid white; + display: flex; + flex-direction: column; + order:3; +} +.boardsection:nth-child(4){ + width: 15%; + border: 1px solid white; + display: flex; + flex-direction: column; + order:4; +} +.boardsection:nth-child(5){ + width: 15%; + border: 1px solid white; + display: flex; + flex-direction: column; + order:5; +} +.boardsection:nth-child(6){ + width: 15%; + border: 1px solid white; + display: flex; + flex-direction: column; + order:6; +} +.boardsection:nth-child(7){ + width: 15%; + border: 1px solid white; + display: flex; + flex-direction: column; + order:7; +} .board[data-board] .tasklist { width:100%; diff --git a/public/index.html b/public/index.html index 9ba9b054..3d6d06d4 100755 --- a/public/index.html +++ b/public/index.html @@ -11,7 +11,7 @@ Daily Schedule
-
+
Sunday
@@ -19,7 +19,7 @@ thing
-
+
Monday
@@ -27,7 +27,7 @@ thing
-
+
Tuesday
@@ -35,7 +35,7 @@ thing
-
+
Wednesday
@@ -43,7 +43,7 @@ thing
-
+
Thursday
@@ -51,7 +51,7 @@ thing
-
+
Friday
@@ -59,7 +59,7 @@ thing
-
+
Saturday
diff --git a/public/js/scripts.js b/public/js/scripts.js index f3475e41..cc9fb1f1 100755 --- a/public/js/scripts.js +++ b/public/js/scripts.js @@ -9,17 +9,19 @@ const days = [ $(document).ready(function () { $("#next").on('click', function() { - $(".boardsection[data-board]").css({animation: "nextbody 1s forwards"}); - $(".boardsection[data-board='day_0']").css({animation: "next 1s forwards"}); + var tests = $('.boardsection[data]'); + tests.first().insertAfter(tests.last()); + //$(".boardsection[data-board]").css({animation: "nextbody 1s forwards"}); + //$(".boardsection[data-board='day_0']").css({animation: "next 1s forwards"}); + $(".boardsection[data-board='day_1']").css({ + 'order': "1" + }); + console.log($(".boardsection[data-board='day_1']").order) }) - $(".boardsection[data-board]").on('animationEnd', function() { - - console.log($(this).order); - }) - }) +// /$(".boardsection[data-board]").style.order + 1 > 7 ? 7 : $(".boardsection[data-board]").style.order + 1 From 1832c293c35992c10e4bc0dc80a427bbfab445b6 Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a2-pllopez)" Date: Sun, 8 Sep 2019 22:48:25 +0000 Subject: [PATCH 047/191] =?UTF-8?q?=F0=9F=8E=BE=F0=9F=8C=84=20Checkpoint?= =?UTF-8?q?=20./public/js/scripts.js:6266626/667=20./public/css/style.css:?= =?UTF-8?q?6266626/545?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/css/style.css | 14 ++++++++++++-- public/js/scripts.js | 15 ++++++++------- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/public/css/style.css b/public/css/style.css index 799b0d32..82a0b107 100755 --- a/public/css/style.css +++ b/public/css/style.css @@ -105,7 +105,7 @@ body { left: 200px; } -@keyframes next { +@keyframes next-dep { 20% { transform: translateX(-150%) translateY(0%); } @@ -119,7 +119,17 @@ body { transform: translateX(1000%) translateY(0%); } 100% { - transform: translateX(600%) translateY(0%); + transform: translateX(500%) translateY(0%); + } +} + +@keyframes next { + 0% { + transform: translateX(150%) translateY(0%); + } + + 100% { + transform: translateX(-100%) translateY(0%); } } diff --git a/public/js/scripts.js b/public/js/scripts.js index cc9fb1f1..b66a3af7 100755 --- a/public/js/scripts.js +++ b/public/js/scripts.js @@ -9,14 +9,15 @@ const days = [ $(document).ready(function () { $("#next").on('click', function() { - var tests = $('.boardsection[data]'); - tests.first().insertAfter(tests.last()); //$(".boardsection[data-board]").css({animation: "nextbody 1s forwards"}); - //$(".boardsection[data-board='day_0']").css({animation: "next 1s forwards"}); - $(".boardsection[data-board='day_1']").css({ - 'order': "1" - }); - console.log($(".boardsection[data-board='day_1']").order) + $(".boardsection[data-board]:first-child").css({animation: "next 1s forwards"}); + var sections = $('.boardsection[data-board]'); + sections.first().insertAfter(sections.last()).animate({ + + }, 'slow'); + //$(".boardsection[data-board='day_1']").css({ + // 'order': "1" + //}); }) }) From 4712b9d547421bb29629b76307378a354cddeb82 Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a2-pllopez)" Date: Sun, 8 Sep 2019 22:59:30 +0000 Subject: [PATCH 048/191] =?UTF-8?q?=F0=9F=8F=9D=F0=9F=8D=A2=20Checkpoint?= =?UTF-8?q?=20./public/js/scripts.js:6266626/1215=20./public/css/style.css?= =?UTF-8?q?:6266626/11?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/css/style.css | 4 ++-- public/js/scripts.js | 13 +++++++++---- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/public/css/style.css b/public/css/style.css index 82a0b107..af2c3110 100755 --- a/public/css/style.css +++ b/public/css/style.css @@ -125,11 +125,11 @@ body { @keyframes next { 0% { - transform: translateX(150%) translateY(0%); + transform: translateX(300%) translateY(0%); } 100% { - transform: translateX(-100%) translateY(0%); + transform: translateX(200%) translateY(0%); } } diff --git a/public/js/scripts.js b/public/js/scripts.js index b66a3af7..0475d0c3 100755 --- a/public/js/scripts.js +++ b/public/js/scripts.js @@ -10,14 +10,19 @@ const days = [ $(document).ready(function () { $("#next").on('click', function() { //$(".boardsection[data-board]").css({animation: "nextbody 1s forwards"}); - $(".boardsection[data-board]:first-child").css({animation: "next 1s forwards"}); + //$(".boardsection[data-board]:first-child").css({animation: "next 1s forwards"}); var sections = $('.boardsection[data-board]'); - sections.first().insertAfter(sections.last()).animate({ - - }, 'slow'); + sections.css({ + animation: "nextbody 1s forwards" + }); + $.when( sections ).done( function() { + console.log( 'Task finished.' ); +} ); + sections.promise().done.first().insertAfter(sections.last()); //$(".boardsection[data-board='day_1']").css({ // 'order': "1" //}); + }) }) From fb4e900cc65e395058d1f1297e54c6176edb5e59 Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a2-pllopez)" Date: Sun, 8 Sep 2019 23:11:30 +0000 Subject: [PATCH 049/191] =?UTF-8?q?=F0=9F=92=8B=F0=9F=9B=B3=20Checkpoint?= =?UTF-8?q?=20./public/js/scripts.js:6266626/1603=20./public/css/style.css?= =?UTF-8?q?:6266626/28?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/css/style.css | 4 ++-- public/js/scripts.js | 17 +++++++++-------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/public/css/style.css b/public/css/style.css index af2c3110..29cbfae1 100755 --- a/public/css/style.css +++ b/public/css/style.css @@ -125,11 +125,11 @@ body { @keyframes next { 0% { - transform: translateX(300%) translateY(0%); + transform: translateX(100%) translateY(0%); } 100% { - transform: translateX(200%) translateY(0%); + transform: translateX(0%) translateY(0%); } } diff --git a/public/js/scripts.js b/public/js/scripts.js index 0475d0c3..804ece28 100755 --- a/public/js/scripts.js +++ b/public/js/scripts.js @@ -10,15 +10,16 @@ const days = [ $(document).ready(function () { $("#next").on('click', function() { //$(".boardsection[data-board]").css({animation: "nextbody 1s forwards"}); - //$(".boardsection[data-board]:first-child").css({animation: "next 1s forwards"}); var sections = $('.boardsection[data-board]'); - sections.css({ - animation: "nextbody 1s forwards" - }); - $.when( sections ).done( function() { - console.log( 'Task finished.' ); -} ); - sections.promise().done.first().insertAfter(sections.last()); + sections.first().insertAfter(sections.last()); + $(".boardsection[data-board]:first-child").css({animation: "next 1s"}); + $(".boardsection[data-board]:nth-child(2)").css({animation: "next 1s"}); + $(".boardsection[data-board]:nth-child(3)").css({animation: "next 1s"}); + $(".boardsection[data-board]:nth-child(4)").css({animation: "next 1s"}); + $(".boardsection[data-board]:nth-child(5)").css({animation: "next 1s"}); + $(".boardsection[data-board]:nth-child(6)").css({animation: "next 1s"}); + $(".boardsection[data-board]:last-child").css({animation: "next 1s"}); + //$(".boardsection[data-board='day_1']").css({ // 'order': "1" //}); From 91cf707260e7006b537e61d3ffceb6efbe9a4089 Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a2-pllopez)" Date: Sun, 8 Sep 2019 23:23:29 +0000 Subject: [PATCH 050/191] =?UTF-8?q?=E2=9B=84=EF=B8=8F=F0=9F=99=8D=20Checkp?= =?UTF-8?q?oint=20./public/js/scripts.js:6266626/2223=20./public/css/style?= =?UTF-8?q?.css:6266626/527?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/css/style.css | 29 ++------------------- public/js/scripts.js | 62 +++----------------------------------------- 2 files changed, 6 insertions(+), 85 deletions(-) diff --git a/public/css/style.css b/public/css/style.css index 29cbfae1..fff903cf 100755 --- a/public/css/style.css +++ b/public/css/style.css @@ -105,39 +105,14 @@ body { left: 200px; } -@keyframes next-dep { - 20% { - transform: translateX(-150%) translateY(0%); - } - 25% { - transform: translateX(-150%) translateY(-300%); - } - 50% { - transform: translateX(1000%) translateY(-300%); - } - 75% { - transform: translateX(1000%) translateY(0%); - } - 100% { - transform: translateX(500%) translateY(0%); - } -} - @keyframes next { 0% { - transform: translateX(100%) translateY(0%); + transform: translateX(100%) } 100% { - transform: translateX(0%) translateY(0%); + transform: translateX(0%) } } -@keyframes nextbody { - 0% { - transform: translateX(0%) translateY(0%); - } - 100% { - transform: translateX(-100%) translateY(0%); - } } \ No newline at end of file diff --git a/public/js/scripts.js b/public/js/scripts.js index 804ece28..5d5a0d71 100755 --- a/public/js/scripts.js +++ b/public/js/scripts.js @@ -1,66 +1,12 @@ -// Add some Javascript code here, to run on the front end. -/* console.log("Welcome to assignment 2!") -const days = [ - "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday" -]; -*/ $(document).ready(function () { - $("#next").on('click', function() { - //$(".boardsection[data-board]").css({animation: "nextbody 1s forwards"}); + $(document).on('click', "#next", function() { var sections = $('.boardsection[data-board]'); - sections.first().insertAfter(sections.last()); - $(".boardsection[data-board]:first-child").css({animation: "next 1s"}); - $(".boardsection[data-board]:nth-child(2)").css({animation: "next 1s"}); - $(".boardsection[data-board]:nth-child(3)").css({animation: "next 1s"}); - $(".boardsection[data-board]:nth-child(4)").css({animation: "next 1s"}); - $(".boardsection[data-board]:nth-child(5)").css({animation: "next 1s"}); - $(".boardsection[data-board]:nth-child(6)").css({animation: "next 1s"}); - $(".boardsection[data-board]:last-child").css({animation: "next 1s"}); + $(".boardsection[data-board]:first-child").css({animation: "next 1s forwards"}); - //$(".boardsection[data-board='day_1']").css({ - // 'order': "1" - //}); - + sections.first().insertAfter(sections.last()); + $(".boardsection[data-board]").css({animation: "next 1s forwards"}); }) }) - - -// /$(".boardsection[data-board]").style.order + 1 > 7 ? 7 : $(".boardsection[data-board]").style.order + 1 - - - -//.boardsection[data-board] -//const nextButton = document.querySelector( '#next' ); -/* -const nextAction = function() { - var num = 0; - var day = document.getElementById( '.boardsection[data-board=day_' + num + ']' ); - var body = document.getElementById( ':not(.boardsection[data-board=day_' + num + '])' ); - - //day.style.color = "blue"; - body.css({animation: "nextbody 1s forwards"}) -*/ - //day.style.animation = "next 1s forwards"; - //body.css({animation: "nextbody 1s forwards"}); - - - -//animation: nextbody 1s forwards; -//animation: next 1s forwards; - - -/* - -document.getElementById("tunnel").animate([ - // keyframes - { transform: 'translateY(0px)' }, - { transform: 'translateY(-300px)' } -], { - // timing options - duration: 1000, - iterations: Infinity -}) -*/ \ No newline at end of file From 08d37ae54a253cc449f0af75a6ac3253b0227822 Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a2-pllopez)" Date: Sun, 8 Sep 2019 23:35:28 +0000 Subject: [PATCH 051/191] =?UTF-8?q?=F0=9F=8E=87=F0=9F=8F=95=20Checkpoint?= =?UTF-8?q?=20./public/css/style.css:6266626/1334=20./public/js/scripts.js?= =?UTF-8?q?:6266626/367=20./public/index.html:6266626/156?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/css/style.css | 55 +++++--------------------------------------- public/index.html | 16 +++++++------ public/js/scripts.js | 4 +--- 3 files changed, 16 insertions(+), 59 deletions(-) diff --git a/public/css/style.css b/public/css/style.css index fff903cf..9dde2546 100755 --- a/public/css/style.css +++ b/public/css/style.css @@ -33,55 +33,7 @@ body { display: flex; flex-direction: column; } -.boardsection:nth-child(1){ - width: 15%; - border: 1px solid white; - display: flex; - flex-direction: column; - order:1; -} -.boardsection:nth-child(2){ - width: 15%; - border: 1px solid white; - display: flex; - flex-direction: column; - order:2; -} -.boardsection:nth-child(3){ - width: 15%; - border: 1px solid white; - display: flex; - flex-direction: column; - order:3; -} -.boardsection:nth-child(4){ - width: 15%; - border: 1px solid white; - display: flex; - flex-direction: column; - order:4; -} -.boardsection:nth-child(5){ - width: 15%; - border: 1px solid white; - display: flex; - flex-direction: column; - order:5; -} -.boardsection:nth-child(6){ - width: 15%; - border: 1px solid white; - display: flex; - flex-direction: column; - order:6; -} -.boardsection:nth-child(7){ - width: 15%; - border: 1px solid white; - display: flex; - flex-direction: column; - order:7; -} + .board[data-board] .tasklist { width:100%; @@ -102,6 +54,11 @@ body { } #next { + font-size: 30px; + margin-top: .5em; + margin-bottom: .5em; + height: 2em; + width: 50vw; left: 200px; } diff --git a/public/index.html b/public/index.html index 3d6d06d4..66c99b78 100755 --- a/public/index.html +++ b/public/index.html @@ -68,13 +68,15 @@
- -
- - -
+
+ +
+ + +
+
diff --git a/public/js/scripts.js b/public/js/scripts.js index 5d5a0d71..17fcbf7a 100755 --- a/public/js/scripts.js +++ b/public/js/scripts.js @@ -4,9 +4,7 @@ console.log("Welcome to assignment 2!") $(document).ready(function () { $(document).on('click', "#next", function() { var sections = $('.boardsection[data-board]'); - $(".boardsection[data-board]:first-child").css({animation: "next 1s forwards"}); - sections.first().insertAfter(sections.last()); - $(".boardsection[data-board]").css({animation: "next 1s forwards"}); + sections.css({animation: "next 1s 1"}); }) }) From 7840c848da59408db02282e7d163ceafb50d80d2 Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a2-pllopez)" Date: Sun, 8 Sep 2019 23:47:27 +0000 Subject: [PATCH 052/191] =?UTF-8?q?=F0=9F=90=95=F0=9F=8E=A0=20Checkpoint?= =?UTF-8?q?=20./public/css/style.css:6266626/560=20./public/index.html:626?= =?UTF-8?q?6626/785?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/css/style.css | 11 ++++++++--- public/index.html | 37 ++++++++++++++++++++++--------------- 2 files changed, 30 insertions(+), 18 deletions(-) diff --git a/public/css/style.css b/public/css/style.css index 9dde2546..7c79e5e6 100755 --- a/public/css/style.css +++ b/public/css/style.css @@ -3,7 +3,6 @@ body { background: #5A5959; font-family: 'Calibri', sans-serif; - } .title { @@ -53,10 +52,16 @@ body { align-items:center; } +.menu { + display: flex; + flex-direction: row; + justify-content: space-around; + margin: 2em; +} + + #next { font-size: 30px; - margin-top: .5em; - margin-bottom: .5em; height: 2em; width: 50vw; left: 200px; diff --git a/public/index.html b/public/index.html index 66c99b78..47962e97 100755 --- a/public/index.html +++ b/public/index.html @@ -12,58 +12,58 @@
-
+
Sunday
-
+
thing
-
+
Monday
-
+
thing
-
+
Tuesday
-
+
thing
-
+
Wednesday
-
+
thing
-
+
Thursday
-
+
thing
-
+
Friday
-
+
thing
-
+
Saturday
-
+
thing
@@ -72,8 +72,15 @@ + Add to Schedule:
- + Day: + + Task: + + Time: + +
From 89d86533858e0c8c9fe0c4a4b29225443293ad96 Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a2-pllopez)" Date: Sun, 8 Sep 2019 23:59:28 +0000 Subject: [PATCH 053/191] =?UTF-8?q?=F0=9F=9A=8F=F0=9F=8E=93=20Checkpoint?= =?UTF-8?q?=20./public/index.html:6266626/359=20./public/css/style.css:626?= =?UTF-8?q?6626/1106?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/css/style.css | 22 +++++++++++++++------- public/index.html | 9 ++++----- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/public/css/style.css b/public/css/style.css index 7c79e5e6..ef663d3f 100755 --- a/public/css/style.css +++ b/public/css/style.css @@ -54,19 +54,27 @@ body { .menu { display: flex; - flex-direction: row; - justify-content: space-around; - margin: 2em; + + justify-content: space-evenly; + margin-top: 2em; + width: 98vw; } +button { + font-size: 25px; +} #next { - font-size: 30px; - height: 2em; - width: 50vw; - left: 200px; + width: 30vw; } +#submit { + margin-left: 2em; + width: 40vw; +} + + + @keyframes next { 0% { transform: translateX(100%) diff --git a/public/index.html b/public/index.html index 47962e97..d1a0c7e0 100755 --- a/public/index.html +++ b/public/index.html @@ -72,16 +72,15 @@ - Add to Schedule:
Day: - + Task: - + Time: - + - +
From 731b5d29fbe5aa5954526f9e9dc4eb94fb6170b2 Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a2-pllopez)" Date: Mon, 9 Sep 2019 00:11:32 +0000 Subject: [PATCH 054/191] =?UTF-8?q?=F0=9F=8C=BD=F0=9F=9B=8B=20Checkpoint?= =?UTF-8?q?=20./public/css/style.css:6266626/492=20./public/index.html:626?= =?UTF-8?q?6626/449?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/css/style.css | 15 ++++++++++++--- public/index.html | 14 ++++++++------ 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/public/css/style.css b/public/css/style.css index ef663d3f..9d03dd26 100755 --- a/public/css/style.css +++ b/public/css/style.css @@ -54,22 +54,31 @@ body { .menu { display: flex; - - justify-content: space-evenly; + flex-direction: row; + align-content: space-evenly; margin-top: 2em; width: 98vw; } +.menu-data { + background-color: black; + color: white; +} + button { font-size: 25px; } +form { + margin-left: 2em; + +} + #next { width: 30vw; } #submit { - margin-left: 2em; width: 40vw; } diff --git a/public/index.html b/public/index.html index d1a0c7e0..8aba3456 100755 --- a/public/index.html +++ b/public/index.html @@ -73,12 +73,14 @@ Next Day
- Day: - - Task: - - Time: - +
+ Day: + + Task: + + Time: + +
From 54db113ddee02fcfbd198fd5fab6953504a7f0e0 Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a2-pllopez)" Date: Mon, 9 Sep 2019 00:23:27 +0000 Subject: [PATCH 055/191] =?UTF-8?q?=F0=9F=8F=8C=F0=9F=9B=A2=20Checkpoint?= =?UTF-8?q?=20./public/css/style.css:6266626/402?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/css/style.css | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/public/css/style.css b/public/css/style.css index 9d03dd26..c6f2c3a6 100755 --- a/public/css/style.css +++ b/public/css/style.css @@ -55,31 +55,28 @@ body { .menu { display: flex; flex-direction: row; - align-content: space-evenly; - margin-top: 2em; + justify-content: space-between; + margin-top: 1em; + height: 10vmin; width: 98vw; } .menu-data { - background-color: black; + padding-bottom: .25em; color: white; } button { font-size: 25px; -} - -form { - margin-left: 2em; - + border-radius: 5px; } #next { - width: 30vw; + width: 40vw; } #submit { - width: 40vw; + width: 55vw; } From 946410e5817ae6a16a8effdcb22ef7a7699a6651 Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a2-pllopez)" Date: Mon, 9 Sep 2019 00:35:28 +0000 Subject: [PATCH 056/191] =?UTF-8?q?=E2=AD=90=EF=B8=8F=F0=9F=8D=A6=20Checkp?= =?UTF-8?q?oint=20./public/js/scripts.js:6266626/1172=20./public/css/style?= =?UTF-8?q?.css:6266626/322?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/css/style.css | 7 +++++++ public/js/scripts.js | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/public/css/style.css b/public/css/style.css index c6f2c3a6..f2727d04 100755 --- a/public/css/style.css +++ b/public/css/style.css @@ -62,6 +62,10 @@ body { } .menu-data { + display: flex; + flex-direction: row; + justify-content: space-evenly; + align-items: flex-end; padding-bottom: .25em; color: white; } @@ -69,6 +73,9 @@ body { button { font-size: 25px; border-radius: 5px; + border-width: 0; + background-color: #1C1C1D; + color: white; } #next { diff --git a/public/js/scripts.js b/public/js/scripts.js index 17fcbf7a..c0e696d4 100755 --- a/public/js/scripts.js +++ b/public/js/scripts.js @@ -7,4 +7,11 @@ $(document).ready(function () { sections.first().insertAfter(sections.last()); sections.css({animation: "next 1s 1"}); }) + $('button').hover( function() { + $(this).css({'background-color':'#D6DADA'}) + $(this).css({'color':'#1C1C1D'}) + }, function () { + $(this).css({'background-color':'#1C1C1D'}) + $(this).css({'color':'#1C1C1D'}) + }) }) From c13345bfd0ee77a487d9ed42c8788c083e88c72c Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a2-pllopez)" Date: Mon, 9 Sep 2019 00:47:24 +0000 Subject: [PATCH 057/191] =?UTF-8?q?=F0=9F=9A=94=F0=9F=8E=92=20Checkpoint?= =?UTF-8?q?=20./public/js/scripts.js:6266626/50=20./public/css/style.css:6?= =?UTF-8?q?266626/607?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/css/style.css | 17 +++++++++-------- public/js/scripts.js | 2 +- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/public/css/style.css b/public/css/style.css index f2727d04..f0c8ce89 100755 --- a/public/css/style.css +++ b/public/css/style.css @@ -18,6 +18,7 @@ body { } .board { + border: .5px solid #CDD0D0; overflow: hidden; display: flex; flex-direction: row; @@ -26,15 +27,16 @@ body { background: #1C1C1D; } -.boardsection{ +.boardsection { width: 15%; - border: 1px solid white; display: flex; flex-direction: column; + border-right: .5px solid #CDD0D0; + } -.board[data-board] .tasklist { +.boardsection[data-board] .tasklist { width:100%; color: white; padding-top: .5em; @@ -42,14 +44,13 @@ body { padding-left: .25em; } -.board[data-board] .header { +.boardsection[data-board] .header { color: white; text-align: center; background-color: grey; - padding-top: 1em; - padding-bottom: 1em; - justify-content: center; - align-items:center; + padding-top: .75em; + padding-bottom: .75em; + } .menu { diff --git a/public/js/scripts.js b/public/js/scripts.js index c0e696d4..66d53bc4 100755 --- a/public/js/scripts.js +++ b/public/js/scripts.js @@ -12,6 +12,6 @@ $(document).ready(function () { $(this).css({'color':'#1C1C1D'}) }, function () { $(this).css({'background-color':'#1C1C1D'}) - $(this).css({'color':'#1C1C1D'}) + $(this).css({'color':'white'}) }) }) From ce5c51f2d5059fa7d077beb74010a117264982d1 Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a2-pllopez)" Date: Mon, 9 Sep 2019 00:58:28 +0000 Subject: [PATCH 058/191] =?UTF-8?q?=F0=9F=9A=9D=F0=9F=90=A2=20Checkpoint?= =?UTF-8?q?=20./public/css/style.css:6266626/466=20./public/index.html:626?= =?UTF-8?q?6626/7=20./server.improved.js:6266626/320?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/css/style.css | 13 ++++++++++--- public/index.html | 2 +- server.improved.js | 14 +++++++------- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/public/css/style.css b/public/css/style.css index f0c8ce89..66604d1c 100755 --- a/public/css/style.css +++ b/public/css/style.css @@ -18,7 +18,6 @@ body { } .board { - border: .5px solid #CDD0D0; overflow: hidden; display: flex; flex-direction: row; @@ -31,7 +30,14 @@ body { width: 15%; display: flex; flex-direction: column; - border-right: .5px solid #CDD0D0; + border: 1px solid #CDD0D0; +} + +.boardsection:first-child { + border-right: 5px solid white; + + border-left: 5px solid white; + border-right: 5px solid white; } @@ -42,6 +48,7 @@ body { padding-top: .5em; padding-bottom: .5em; padding-left: .25em; + } .boardsection[data-board] .header { @@ -67,7 +74,7 @@ body { flex-direction: row; justify-content: space-evenly; align-items: flex-end; - padding-bottom: .25em; + padding-bottom: .5em; color: white; } diff --git a/public/index.html b/public/index.html index 8aba3456..a2eca4b1 100755 --- a/public/index.html +++ b/public/index.html @@ -75,7 +75,7 @@
Day: - + Task: Time: diff --git a/server.improved.js b/server.improved.js index c673a03e..39055269 100644 --- a/server.improved.js +++ b/server.improved.js @@ -13,8 +13,8 @@ const appdata = [ ] const data = [ - { 'question': 'one', 'answer': '4', response: ''}, - { 'question': 'two', 'answer': '2', response: ''} + { 'day': 'Monday', 'task': 'CS4241 A2 Due', time: '11:59:00'}, + { 'day': 'Tuesday', 'task': 'MA2621 Homework Due', time: '2:00:00'} ] const server = http.createServer( function( request,response ) { @@ -46,15 +46,15 @@ const handlePost = function( request, response ) { request.on( 'end', function() { console.log( JSON.parse( dataString ) ) var info = JSON.parse( dataString ) - var newAnswer = { - 'question': info.question, - 'answer' : info.answer, - 'response': info.response + var newEvent = { + 'day': info.day, + 'task' : info.task, + 'time': info.time } // ... do something with the data here!!! //response.write(JSON.parse( dataString )) - data.push(newAnswer); + data.push(newEvent); //response.write(data.toString()) response.writeHead( 200, "OK", {'Content-Type': 'text/plain' }) From 536c5cccc2be0dbdb6782767a92901be9702bfba Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a2-pllopez)" Date: Mon, 9 Sep 2019 01:09:33 +0000 Subject: [PATCH 059/191] =?UTF-8?q?=F0=9F=9A=80=F0=9F=94=94=20Checkpoint?= =?UTF-8?q?=20./public/css/style.css:6266626/409=20./public/index.html:626?= =?UTF-8?q?6626/539?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/css/style.css | 5 ++--- public/index.html | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/public/css/style.css b/public/css/style.css index 66604d1c..46562270 100755 --- a/public/css/style.css +++ b/public/css/style.css @@ -34,11 +34,10 @@ body { } .boardsection:first-child { - border-right: 5px solid white; - + border-top: 3px solid white; border-left: 5px solid white; border-right: 5px solid white; - + border-bottom: 3px solid white; } diff --git a/public/index.html b/public/index.html index a2eca4b1..311dac50 100755 --- a/public/index.html +++ b/public/index.html @@ -154,6 +154,22 @@ button.onclick = submit } + + const addEvent = function(e) { + e.preventDefault(); + var newEvent = { + day : document.querySelector("#day").value, + task : document.querySelector("#task").value, + time : document.querySelector("#time").value, + }; + + var eventInfo = JSON.stringi + + + + + } + From b31ac35f2143f2fbf709482cc857d7d9fb661e2c Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a2-pllopez)" Date: Mon, 9 Sep 2019 01:21:30 +0000 Subject: [PATCH 060/191] =?UTF-8?q?=F0=9F=8C=96=F0=9F=90=93=20Checkpoint?= =?UTF-8?q?=20./public/index.html:6266626/2132?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/index.html | 42 +++++++++++++++++++++++++++--------------- 1 file changed, 27 insertions(+), 15 deletions(-) diff --git a/public/index.html b/public/index.html index 311dac50..5fa2d438 100755 --- a/public/index.html +++ b/public/index.html @@ -24,7 +24,7 @@ Monday
- thing +
@@ -32,7 +32,7 @@ Tuesday
- thing +
@@ -40,7 +40,7 @@ Wednesday
- thing +
@@ -133,7 +133,7 @@ return false } - const occupyText = function() { + const occupySchedule = function() { fetch( '/information' ) .then( function( response ) { console.log( response ) @@ -142,28 +142,40 @@ .then( function( myJSON ) { var info = myJSON.data answer.innerHTML = info[1].value - + console.log( info[1] ) console.log( JSON.stringify( myJSON ) ) }) } + + const addEvent = function(e) { + e.preventDefault(); + var newEvent = { + day : document.querySelector("#day").value, + task : document.querySelector("#task").value, + time : document.querySelector("#time").value, + }; + var newEventInfo = JSON.stringify( newEvent ); + fetch('/submit',{ + method: 'POST', + body + }).then( function( response ) { + document.querySelector( document.querySelector("#day").value ).appendChild(document.querySelector("#task").value) + + document.querySelector("#day").value = ''; + document.querySelector("#task").value = ''; + document.querySelector("#time").value = ''; + }) window.onload = function() { + occupySchedule() + const button = document.querySelector( '#submit' ) button.onclick = submit - } - const addEvent = function(e) { - e.preventDefault(); - var newEvent = { - day : document.querySelector("#day").value, - task : document.querySelector("#task").value, - time : document.querySelector("#time").value, - }; - - var eventInfo = JSON.stringi + From 38ae768b2db95950bd4d850038c17fe4e818fc0b Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a2-pllopez)" Date: Mon, 9 Sep 2019 01:33:26 +0000 Subject: [PATCH 061/191] =?UTF-8?q?=F0=9F=90=91=E2=8F=B3=20Checkpoint=20./?= =?UTF-8?q?public/index.html:6266626/565=20./server.improved.js:6266626/49?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/index.html | 30 +++++++++++++++++------------- server.improved.js | 2 +- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/public/index.html b/public/index.html index 5fa2d438..eed71140 100755 --- a/public/index.html +++ b/public/index.html @@ -16,7 +16,7 @@ Sunday
- thing +
@@ -48,7 +48,7 @@ Thursday
- thing +
@@ -56,7 +56,7 @@ Friday
- thing +
@@ -64,7 +64,7 @@ Saturday
- thing +
@@ -75,9 +75,9 @@
Day: - + Task: - + Time:
@@ -112,9 +112,7 @@ console.log( response ) //occupyText() - - - /* + fetch(url) .then(function( response ) { //response.json(); @@ -125,7 +123,7 @@ //answer.innerHTML = data //console.log(info) }); - */ + }) @@ -134,13 +132,14 @@ } const occupySchedule = function() { - fetch( '/information' ) + fetch( '/info' ) .then( function( response ) { console.log( response ) return response.json() }) .then( function( myJSON ) { var info = myJSON.data + document.querySelector(".data") answer.innerHTML = info[1].value @@ -151,6 +150,11 @@ const addEvent = function(e) { e.preventDefault(); + var day = document.querySelector("#day").value + var task = document.querySelector("#task").value + var time = document.querySelector("#time").value + console.log("Day: " + day + " Time: " + time + " Task: "+ task); + var newEvent = { day : document.querySelector("#day").value, task : document.querySelector("#task").value, @@ -161,7 +165,7 @@ method: 'POST', body }).then( function( response ) { - document.querySelector( document.querySelector("#day").value ).appendChild(document.querySelector("#task").value) + document.querySelector( day ).appendChild( time + " " + task ); document.querySelector("#day").value = ''; document.querySelector("#task").value = ''; @@ -172,7 +176,7 @@ occupySchedule() const button = document.querySelector( '#submit' ) - button.onclick = submit + button.onclick = addEvent } diff --git a/server.improved.js b/server.improved.js index 39055269..07ed922e 100644 --- a/server.improved.js +++ b/server.improved.js @@ -30,7 +30,7 @@ const handleGet = function( request, response ) { if( request.url === '/' ) { sendFile( response, 'public/index.html' ) - } else if( request.url === '/information') { + } else if( request.url === '/info') { sendData( response, data ) } else{ sendFile( response, filename ) From 2c1fc106ff0954538fc742607d11843f83988673 Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a2-pllopez)" Date: Mon, 9 Sep 2019 01:45:24 +0000 Subject: [PATCH 062/191] =?UTF-8?q?=F0=9F=8D=A5=F0=9F=9A=9E=20Checkpoint?= =?UTF-8?q?=20./public/index.html:6266626/692?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/index.html | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/public/index.html b/public/index.html index eed71140..fdd1a228 100755 --- a/public/index.html +++ b/public/index.html @@ -6,7 +6,7 @@ - +
Daily Schedule
@@ -79,7 +79,7 @@ Task: Time: - +
@@ -132,6 +132,7 @@ } const occupySchedule = function() { + alert("Running"); fetch( '/info' ) .then( function( response ) { console.log( response ) @@ -139,8 +140,9 @@ }) .then( function( myJSON ) { var info = myJSON.data - document.querySelector(".data") - answer.innerHTML = info[1].value + var task = document.createTextNode(info[0].task) + document.querySelector("boardsection[data_board[day='1']") + //answer.innerHTML = info[1].value console.log( info[1] ) @@ -173,7 +175,6 @@ }) window.onload = function() { - occupySchedule() const button = document.querySelector( '#submit' ) button.onclick = addEvent From c5d627a0a6ca717296e3150270769f82ffecec61 Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a2-pllopez)" Date: Mon, 9 Sep 2019 01:57:21 +0000 Subject: [PATCH 063/191] =?UTF-8?q?=F0=9F=8C=BD=F0=9F=8C=97=20Checkpoint?= =?UTF-8?q?=20./public/index.html:6266626/514=20./public/css/style.css:626?= =?UTF-8?q?6626/2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/css/style.css | 2 +- public/index.html | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/public/css/style.css b/public/css/style.css index 46562270..4b25ac44 100755 --- a/public/css/style.css +++ b/public/css/style.css @@ -90,7 +90,7 @@ button { } #submit { - width: 55vw; + width: 50vw; } diff --git a/public/index.html b/public/index.html index fdd1a228..1ac3c905 100755 --- a/public/index.html +++ b/public/index.html @@ -140,8 +140,11 @@ }) .then( function( myJSON ) { var info = myJSON.data - var task = document.createTextNode(info[0].task) - document.querySelector("boardsection[data_board[day='1']") + var textNode = document.createTextNode(info[0].task) + var dayCol = document.querySelector(".boardsection[data-board='day_1'] .tasklist") + dayCol.appendChild(textNode); + + //.appendChild(textnode); //answer.innerHTML = info[1].value @@ -183,8 +186,7 @@ - - + } From 062740cadb092f9cfca40ce169320444d9c7fc22 Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a2-pllopez)" Date: Mon, 9 Sep 2019 02:09:22 +0000 Subject: [PATCH 064/191] =?UTF-8?q?=F0=9F=91=86=F0=9F=9A=85=20Checkpoint?= =?UTF-8?q?=20./public/index.html:6266626/1811=20./public/css/style.css:62?= =?UTF-8?q?66626/323?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/css/style.css | 19 +++++++++---------- public/index.html | 37 ++++++++++++++++++++++++++++++------- 2 files changed, 39 insertions(+), 17 deletions(-) diff --git a/public/css/style.css b/public/css/style.css index 4b25ac44..ec864773 100755 --- a/public/css/style.css +++ b/public/css/style.css @@ -40,16 +40,6 @@ body { border-bottom: 3px solid white; } - -.boardsection[data-board] .tasklist { - width:100%; - color: white; - padding-top: .5em; - padding-bottom: .5em; - padding-left: .25em; - -} - .boardsection[data-board] .header { color: white; text-align: center; @@ -59,6 +49,15 @@ body { } +.boardsection[data-board] .tasklist { + width:100%; + color: white; + padding-top: .5em; + padding-bottom: .5em; + padding-left: .25em; + font-size: 12px; +} + .menu { display: flex; flex-direction: row; diff --git a/public/index.html b/public/index.html index 1ac3c905..3e45aa62 100755 --- a/public/index.html +++ b/public/index.html @@ -140,19 +140,43 @@ }) .then( function( myJSON ) { var info = myJSON.data - var textNode = document.createTextNode(info[0].task) - var dayCol = document.querySelector(".boardsection[data-board='day_1'] .tasklist") - dayCol.appendChild(textNode); + + var i; + for(i = 0; i < info.length; i++){ + var dayNum = dayFinder(info[i].day) + var textNode = document.createTextNode(info[i].task) + var dayCol = document.querySelector(".boardsection[data-board='"+ dayNum +"'] .tasklist") + dayCol.appendChild(textNode); + + } //.appendChild(textnode); //answer.innerHTML = info[1].value - - - console.log( info[1] ) console.log( JSON.stringify( myJSON ) ) }) } + const dayFinder = function(str) { + switch(str.trim().toLowerCase()) { + case 'sunday': + return 'day_1' + case 'monday': + return 'day_2' + case 'tuesday': + return 'day_3' + case 'wednesday': + return 'day_4' + case 'thursday': + return 'day_5' + case 'friday': + return 'day_6' + case 'saturday': + return 'day_7' + default: + return 'error' + } + } + const addEvent = function(e) { e.preventDefault(); var day = document.querySelector("#day").value @@ -178,7 +202,6 @@ }) window.onload = function() { - const button = document.querySelector( '#submit' ) button.onclick = addEvent } From fe39cd50851171f800a821d56308601fe1c5c4ba Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a2-pllopez)" Date: Mon, 9 Sep 2019 02:21:23 +0000 Subject: [PATCH 065/191] =?UTF-8?q?=F0=9F=8C=9E=F0=9F=8F=85=20Checkpoint?= =?UTF-8?q?=20./public/css/style.css:6266626/81=20./public/js/scripts.js:6?= =?UTF-8?q?266626/412?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/css/style.css | 4 +++- public/js/scripts.js | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/public/css/style.css b/public/css/style.css index ec864773..f28a82d4 100755 --- a/public/css/style.css +++ b/public/css/style.css @@ -50,12 +50,14 @@ body { } .boardsection[data-board] .tasklist { + overflow: hidden; + flex-wrap: nowrap; width:100%; color: white; padding-top: .5em; padding-bottom: .5em; padding-left: .25em; - font-size: 12px; + font-size: 10px; } .menu { diff --git a/public/js/scripts.js b/public/js/scripts.js index 66d53bc4..06e834a3 100755 --- a/public/js/scripts.js +++ b/public/js/scripts.js @@ -4,9 +4,10 @@ console.log("Welcome to assignment 2!") $(document).ready(function () { $(document).on('click', "#next", function() { var sections = $('.boardsection[data-board]'); + $('.boardsection[data-board] .tasklist').first().empty(); sections.first().insertAfter(sections.last()); sections.css({animation: "next 1s 1"}); - }) + }) $('button').hover( function() { $(this).css({'background-color':'#D6DADA'}) $(this).css({'color':'#1C1C1D'}) From 6532afceb08915ecc0ec7b04ff07d36745cfc609 Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a2-pllopez)" Date: Mon, 9 Sep 2019 02:33:23 +0000 Subject: [PATCH 066/191] =?UTF-8?q?=F0=9F=90=A0=F0=9F=90=94=20Checkpoint?= =?UTF-8?q?=20./public/js/scripts.js:6266626/410=20./public/css/style.css:?= =?UTF-8?q?6266626/109=20./public/index.html:6266626/401?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/css/style.css | 2 +- public/index.html | 3 ++- public/js/scripts.js | 10 ++++++++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/public/css/style.css b/public/css/style.css index f28a82d4..5e856831 100755 --- a/public/css/style.css +++ b/public/css/style.css @@ -27,6 +27,7 @@ body { } .boardsection { + cursor: default; width: 15%; display: flex; flex-direction: column; @@ -52,7 +53,6 @@ body { .boardsection[data-board] .tasklist { overflow: hidden; flex-wrap: nowrap; - width:100%; color: white; padding-top: .5em; padding-bottom: .5em; diff --git a/public/index.html b/public/index.html index 3e45aa62..79fc83fd 100755 --- a/public/index.html +++ b/public/index.html @@ -144,7 +144,8 @@ var i; for(i = 0; i < info.length; i++){ var dayNum = dayFinder(info[i].day) - var textNode = document.createTextNode(info[i].task) + var textNode = document.createTextNode(info[i].time + " " + info[i].task) + var var dayCol = document.querySelector(".boardsection[data-board='"+ dayNum +"'] .tasklist") dayCol.appendChild(textNode); diff --git a/public/js/scripts.js b/public/js/scripts.js index 06e834a3..5db04717 100755 --- a/public/js/scripts.js +++ b/public/js/scripts.js @@ -15,4 +15,14 @@ $(document).ready(function () { $(this).css({'background-color':'#1C1C1D'}) $(this).css({'color':'white'}) }) + $('.boardsection[data-board] .tasklist').hover( function() { + $(this).css({'background-color':'#FCA0A3'}) + $(this).css({'color':'#1C1C1D'}) + }, function () { + $(this).css({'background-color':'#1C1C1D'}) + $(this).css({'color':'white'}) + $('.boardsection[data-board] .tasklist').on('click', function() { + $(this).remove(); + }) + }) }) From 3df34804689a9affaa41ca33e7f5741ea9fa8d70 Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a2-pllopez)" Date: Mon, 9 Sep 2019 02:45:22 +0000 Subject: [PATCH 067/191] =?UTF-8?q?=F0=9F=8D=8D=F0=9F=8F=85=20Checkpoint?= =?UTF-8?q?=20./public/index.html:6266626/1172?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/index.html | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/public/index.html b/public/index.html index 79fc83fd..caea578f 100755 --- a/public/index.html +++ b/public/index.html @@ -144,10 +144,16 @@ var i; for(i = 0; i < info.length; i++){ var dayNum = dayFinder(info[i].day) - var textNode = document.createTextNode(info[i].time + " " + info[i].task) - var + var timeNode = document.createTextNode(info[i].time) + var textNode = document.createTextNode(info[i].task) + var divNode = document.createElement("div") + var breakNode = document.createElement("br") var dayCol = document.querySelector(".boardsection[data-board='"+ dayNum +"'] .tasklist") - dayCol.appendChild(textNode); + day + dayCol.appendChild(breakNode) + dayCol.appendChild(timeNode) + dayCol.appendChild(breakNode) + dayCol.appendChild(textNode) } From 58949a1f3855b9bbd9d80539ae13fd3e8a1a50fb Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a2-pllopez)" Date: Mon, 9 Sep 2019 02:57:27 +0000 Subject: [PATCH 068/191] =?UTF-8?q?=F0=9F=92=81=F0=9F=92=93=20Checkpoint?= =?UTF-8?q?=20./public/index.html:6266626/174=20./server.improved.js:62666?= =?UTF-8?q?26/115=20./public/js/scripts.js:6266626/42=20./public/css/style?= =?UTF-8?q?.css:6266626/74?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/index.html | 11 +++++------ public/js/scripts.js | 4 ++-- server.improved.js | 4 +++- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/public/index.html b/public/index.html index caea578f..2db7f3a1 100755 --- a/public/index.html +++ b/public/index.html @@ -149,12 +149,11 @@ var divNode = document.createElement("div") var breakNode = document.createElement("br") var dayCol = document.querySelector(".boardsection[data-board='"+ dayNum +"'] .tasklist") - day - dayCol.appendChild(breakNode) - dayCol.appendChild(timeNode) - dayCol.appendChild(breakNode) - dayCol.appendChild(textNode) - + divNode.appendChild(breakNode) + divNode.appendChild(timeNode) + divNode.appendChild(breakNode) + divNode.appendChild(textNode) + dayCol.appendChild(divNode) } //.appendChild(textnode); diff --git a/public/js/scripts.js b/public/js/scripts.js index 5db04717..19643fbb 100755 --- a/public/js/scripts.js +++ b/public/js/scripts.js @@ -15,13 +15,13 @@ $(document).ready(function () { $(this).css({'background-color':'#1C1C1D'}) $(this).css({'color':'white'}) }) - $('.boardsection[data-board] .tasklist').hover( function() { + $('.boardsection[data-board] .tasklist div').hover( function() { $(this).css({'background-color':'#FCA0A3'}) $(this).css({'color':'#1C1C1D'}) }, function () { $(this).css({'background-color':'#1C1C1D'}) $(this).css({'color':'white'}) - $('.boardsection[data-board] .tasklist').on('click', function() { + $('.boardsection[data-board] .tasklist div').on('click', function() { $(this).remove(); }) }) diff --git a/server.improved.js b/server.improved.js index 07ed922e..e76697bc 100644 --- a/server.improved.js +++ b/server.improved.js @@ -14,7 +14,9 @@ const appdata = [ const data = [ { 'day': 'Monday', 'task': 'CS4241 A2 Due', time: '11:59:00'}, - { 'day': 'Tuesday', 'task': 'MA2621 Homework Due', time: '2:00:00'} + { 'day': 'Tuesday', 'task': 'MA2621 Homework Due', time: '2:00:00'}, + { 'day': 'Tuesday', 'task': 'CH1010 Daily Proble', time: '11:00:00'} + ] const server = http.createServer( function( request,response ) { From 160958d366a95785c4588fe63dd0d8947a39dbf3 Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a2-pllopez)" Date: Mon, 9 Sep 2019 03:09:23 +0000 Subject: [PATCH 069/191] =?UTF-8?q?=F0=9F=8F=AB=F0=9F=92=A7=20Checkpoint?= =?UTF-8?q?=20./public/css/style.css:6266626/47=20./public/js/scripts.js:6?= =?UTF-8?q?266626/222=20./public/index.html:6266626/2454=20./server.improv?= =?UTF-8?q?ed.js:6266626/875?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/css/style.css | 4 ++++ public/index.html | 54 ++++++++++++++++++++++++++------------------ public/js/scripts.js | 10 ++++---- server.improved.js | 32 +++++++++++++++----------- 4 files changed, 60 insertions(+), 40 deletions(-) diff --git a/public/css/style.css b/public/css/style.css index 5e856831..5216f626 100755 --- a/public/css/style.css +++ b/public/css/style.css @@ -1,5 +1,9 @@ /*Style your own assignment! This is fun! */ +div{ + border: 1px solid white; +} + body { background: #5A5959; font-family: 'Calibri', sans-serif; diff --git a/public/index.html b/public/index.html index 2db7f3a1..6495e28b 100755 --- a/public/index.html +++ b/public/index.html @@ -116,7 +116,6 @@ fetch(url) .then(function( response ) { //response.json(); - answer.innerHTML = response.body console.log(response) }).then(function(data) { @@ -184,28 +183,40 @@ } const addEvent = function(e) { - e.preventDefault(); - var day = document.querySelector("#day").value - var task = document.querySelector("#task").value - var time = document.querySelector("#time").value - console.log("Day: " + day + " Time: " + time + " Task: "+ task); + e.preventDefault(); + var day = document.querySelector("#day").value + var task = document.querySelector("#task").value + var time = document.querySelector("#time").value + console.log("Day: " + day + " Time: " + time + " Task: "+ task); + + var newEvent = { + day : document.querySelector("#day").value, + task : document.querySelector("#task").value, + time : document.querySelector("#time").value, + }; - var newEvent = { - day : document.querySelector("#day").value, - task : document.querySelector("#task").value, - time : document.querySelector("#time").value, - }; - var newEventInfo = JSON.stringify( newEvent ); - fetch('/submit',{ - method: 'POST', - body - }).then( function( response ) { - document.querySelector( day ).appendChild( time + " " + task ); + var newEventInfo = JSON.stringify( newEvent ); + fetch('/submit',{ + method: 'POST', + body + }).then( function( response ) { + var dayNum = dayFinder(info[i].day) + var dayCol = document.querySelector(".boardsection[data-board='"+ dayNum +"'] .tasklist") + var timeNode = document.createTextNode(info[i].time) + var textNode = document.createTextNode(info[i].task) + var divNode = document.createElement("div") + var breakNode = document.createElement("br") + divNode.appendChild(breakNode) + divNode.appendChild(timeNode) + divNode.appendChild(breakNode) + divNode.appendChild(textNode) + dayCol.appendChild(divNode) - document.querySelector("#day").value = ''; - document.querySelector("#task").value = ''; - document.querySelector("#time").value = ''; - }) + document.querySelector("#day").value = ''; + document.querySelector("#task").value = ''; + document.querySelector("#time").value = ''; + }) + } window.onload = function() { const button = document.querySelector( '#submit' ) @@ -216,7 +227,6 @@ - } diff --git a/public/js/scripts.js b/public/js/scripts.js index 19643fbb..e5287d2d 100755 --- a/public/js/scripts.js +++ b/public/js/scripts.js @@ -7,22 +7,22 @@ $(document).ready(function () { $('.boardsection[data-board] .tasklist').first().empty(); sections.first().insertAfter(sections.last()); sections.css({animation: "next 1s 1"}); - }) + }); $('button').hover( function() { $(this).css({'background-color':'#D6DADA'}) $(this).css({'color':'#1C1C1D'}) }, function () { $(this).css({'background-color':'#1C1C1D'}) $(this).css({'color':'white'}) - }) + }); $('.boardsection[data-board] .tasklist div').hover( function() { $(this).css({'background-color':'#FCA0A3'}) $(this).css({'color':'#1C1C1D'}) }, function () { $(this).css({'background-color':'#1C1C1D'}) $(this).css({'color':'white'}) - $('.boardsection[data-board] .tasklist div').on('click', function() { + }); + $('.boardsection[data-board] .tasklist').on('click', function() { $(this).remove(); - }) - }) + }); }) diff --git a/server.improved.js b/server.improved.js index e76697bc..ab62055e 100644 --- a/server.improved.js +++ b/server.improved.js @@ -47,20 +47,26 @@ const handlePost = function( request, response ) { }) request.on( 'end', function() { console.log( JSON.parse( dataString ) ) - var info = JSON.parse( dataString ) - var newEvent = { - 'day': info.day, - 'task' : info.task, - 'time': info.time + switch(request.url) { + case '/submit': + var info = JSON.parse( dataString ) + var newEvent = { + 'day': info.day, + 'task' : info.task, + 'time': info.time + } + + // ... do something with the data here!!! + //response.write(JSON.parse( dataString )) + data.push(newEvent); + + //response.write(data.toString()) + response.writeHead( 200, "OK", {'Content-Type': 'text/plain' }) + response.end() + break + default: + console.log("error"); } - - // ... do something with the data here!!! - //response.write(JSON.parse( dataString )) - data.push(newEvent); - - //response.write(data.toString()) - response.writeHead( 200, "OK", {'Content-Type': 'text/plain' }) - response.end() }) } From 115d7060a5463947d3cfee57420f73140137da35 Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a2-pllopez)" Date: Mon, 9 Sep 2019 03:21:22 +0000 Subject: [PATCH 070/191] =?UTF-8?q?=F0=9F=8C=B2=F0=9F=8F=AA=20Checkpoint?= =?UTF-8?q?=20./public/index.html:6266626/6194?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/index.html | 97 +++++++++++++++++++++-------------------------- 1 file changed, 44 insertions(+), 53 deletions(-) diff --git a/public/index.html b/public/index.html index 6495e28b..9b5c827b 100755 --- a/public/index.html +++ b/public/index.html @@ -6,7 +6,7 @@ - +
Daily Schedule
@@ -98,9 +98,6 @@ json = { yourresponse: input.value }, body = JSON.stringify( json ), answer = document.querySelector( '#answer') - - //answer.innerHTML = "hi" - fetch( '/submit', { method:'POST', @@ -142,46 +139,13 @@ var i; for(i = 0; i < info.length; i++){ - var dayNum = dayFinder(info[i].day) - var timeNode = document.createTextNode(info[i].time) - var textNode = document.createTextNode(info[i].task) - var divNode = document.createElement("div") - var breakNode = document.createElement("br") - var dayCol = document.querySelector(".boardsection[data-board='"+ dayNum +"'] .tasklist") - divNode.appendChild(breakNode) - divNode.appendChild(timeNode) - divNode.appendChild(breakNode) - divNode.appendChild(textNode) - dayCol.appendChild(divNode) + createEvent(info[i].day, info[i].task, info[i].time); } - - //.appendChild(textnode); - //answer.innerHTML = info[1].value + console.log( JSON.stringify( myJSON ) ) }) } - const dayFinder = function(str) { - switch(str.trim().toLowerCase()) { - case 'sunday': - return 'day_1' - case 'monday': - return 'day_2' - case 'tuesday': - return 'day_3' - case 'wednesday': - return 'day_4' - case 'thursday': - return 'day_5' - case 'friday': - return 'day_6' - case 'saturday': - return 'day_7' - default: - return 'error' - } - } - const addEvent = function(e) { e.preventDefault(); var day = document.querySelector("#day").value @@ -195,15 +159,29 @@ time : document.querySelector("#time").value, }; - var newEventInfo = JSON.stringify( newEvent ); + var body = JSON.stringify( newEvent ); fetch('/submit',{ method: 'POST', body }).then( function( response ) { - var dayNum = dayFinder(info[i].day) + + + + createEvent(day, task, time); + + document.querySelector("#day").value = ''; + document.querySelector("#task").value = ''; + document.querySelector("#time").value = ''; + }) + + return false + } + + const createEvent = function(day, task, time){ + var dayNum = dayFinder(day) var dayCol = document.querySelector(".boardsection[data-board='"+ dayNum +"'] .tasklist") - var timeNode = document.createTextNode(info[i].time) - var textNode = document.createTextNode(info[i].task) + var timeNode = document.createTextNode(time) + var textNode = document.createTextNode(task) var divNode = document.createElement("div") var breakNode = document.createElement("br") divNode.appendChild(breakNode) @@ -211,23 +189,36 @@ divNode.appendChild(breakNode) divNode.appendChild(textNode) dayCol.appendChild(divNode) - - document.querySelector("#day").value = ''; - document.querySelector("#task").value = ''; - document.querySelector("#time").value = ''; - }) + } + + const dayFinder = function(str) { + switch(str.trim().toLowerCase()) { + case 'sunday': + return 'day_1' + case 'monday': + return 'day_2' + case 'tuesday': + return 'day_3' + case 'wednesday': + return 'day_4' + case 'thursday': + return 'day_5' + case 'friday': + return 'day_6' + case 'saturday': + return 'day_7' + default: + return 'error' + } } window.onload = function() { + occupySchedule(); + const button = document.querySelector( '#submit' ) button.onclick = addEvent } - - - - - From 88b9e1d9444a8c8aaf6bc63a04d3885daf834703 Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a2-pllopez)" Date: Mon, 9 Sep 2019 03:33:22 +0000 Subject: [PATCH 071/191] =?UTF-8?q?=F0=9F=8E=86=F0=9F=8E=85=20Checkpoint?= =?UTF-8?q?=20./public/index.html:6266626/1249?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/index.html | 37 +++++++++++++++++++++++++++++++++---- 1 file changed, 33 insertions(+), 4 deletions(-) diff --git a/public/index.html b/public/index.html index 9b5c827b..bbfbbc0e 100755 --- a/public/index.html +++ b/public/index.html @@ -72,7 +72,7 @@ - +
Day: @@ -164,9 +164,6 @@ method: 'POST', body }).then( function( response ) { - - - createEvent(day, task, time); document.querySelector("#day").value = ''; @@ -177,6 +174,35 @@ return false } + const removeEvent = function(e) { + e.preventDefault(); + var day = document.querySelector("#day").value + var task = document.querySelector("#task").value + var time = document.querySelector("#time").value + console.log("Day: " + day + " Time: " + time + " Task: "+ task); + + var eventInfo = { + day : document.querySelector("#day").value, + task : document.querySelector("#task").value, + time : document.querySelector("#time").value, + }; + + var body = JSON.stringify( newEvent ); + fetch('/submit',{ + method: 'POST', + body + }).then( function( response ) { + createEvent(day, task, time); + + document.querySelector("#day").value = ''; + document.querySelector("#task").value = ''; + document.querySelector("#time").value = ''; + }) + + return false + + } + const createEvent = function(day, task, time){ var dayNum = dayFinder(day) var dayCol = document.querySelector(".boardsection[data-board='"+ dayNum +"'] .tasklist") @@ -217,6 +243,9 @@ const button = document.querySelector( '#submit' ) button.onclick = addEvent + + const nextButton = document.querySelector( '#next' ) + button.oncllick = removeEvent } From 1ba9c2005384115bd27158893e29fa2d9b68b3cb Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a2-pllopez)" Date: Mon, 9 Sep 2019 03:45:21 +0000 Subject: [PATCH 072/191] =?UTF-8?q?=F0=9F=90=81=F0=9F=93=BC=20Checkpoint?= =?UTF-8?q?=20./public/index.html:6266626/679=20./server.improved.js:62666?= =?UTF-8?q?26/707=20./public/js/scripts.js:6266626/2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/index.html | 30 ++++++++++++------------------ public/js/scripts.js | 2 +- server.improved.js | 18 +++++++++++------- 3 files changed, 24 insertions(+), 26 deletions(-) diff --git a/public/index.html b/public/index.html index bbfbbc0e..1a624b1f 100755 --- a/public/index.html +++ b/public/index.html @@ -174,35 +174,29 @@ return false } - const removeEvent = function(e) { + const deleteEvent = function( day, task, time) { e.preventDefault(); - var day = document.querySelector("#day").value - var task = document.querySelector("#task").value - var time = document.querySelector("#time").value - console.log("Day: " + day + " Time: " + time + " Task: "+ task); - var eventInfo = { - day : document.querySelector("#day").value, - task : document.querySelector("#task").value, - time : document.querySelector("#time").value, + day : day, + task : task, + time : time, }; - - var body = JSON.stringify( newEvent ); - fetch('/submit',{ + var body = JSON.stringify( eventInfo ); + fetch('/delete',{ method: 'POST', body }).then( function( response ) { - createEvent(day, task, time); - - document.querySelector("#day").value = ''; - document.querySelector("#task").value = ''; - document.querySelector("#time").value = ''; + occupySchedule() }) return false } + const removeEvent = function() { + + } + const createEvent = function(day, task, time){ var dayNum = dayFinder(day) var dayCol = document.querySelector(".boardsection[data-board='"+ dayNum +"'] .tasklist") @@ -245,7 +239,7 @@ button.onclick = addEvent const nextButton = document.querySelector( '#next' ) - button.oncllick = removeEvent + button.oncllick = deleteEvent } diff --git a/public/js/scripts.js b/public/js/scripts.js index e5287d2d..b41b125e 100755 --- a/public/js/scripts.js +++ b/public/js/scripts.js @@ -4,7 +4,7 @@ console.log("Welcome to assignment 2!") $(document).ready(function () { $(document).on('click', "#next", function() { var sections = $('.boardsection[data-board]'); - $('.boardsection[data-board] .tasklist').first().empty(); + //$('.boardsection[data-board] .tasklist').first().empty(); sections.first().insertAfter(sections.last()); sections.css({animation: "next 1s 1"}); }); diff --git a/server.improved.js b/server.improved.js index ab62055e..b79641d4 100644 --- a/server.improved.js +++ b/server.improved.js @@ -46,26 +46,30 @@ const handlePost = function( request, response ) { dataString += data }) request.on( 'end', function() { - console.log( JSON.parse( dataString ) ) + var info = JSON.parse( dataString ) switch(request.url) { case '/submit': - var info = JSON.parse( dataString ) var newEvent = { 'day': info.day, 'task' : info.task, 'time': info.time } - - // ... do something with the data here!!! - //response.write(JSON.parse( dataString )) data.push(newEvent); - - //response.write(data.toString()) response.writeHead( 200, "OK", {'Content-Type': 'text/plain' }) response.end() break + case '/delete': + var delEvent = { + 'day': info.day, + 'task' : info.task, + 'time': info.time + } + console.log(data.indexOf(delEvent)); + break default: console.log("error"); + break + } }) } From 456648313070b2d3363214f26825c26416c7a558 Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a2-pllopez)" Date: Mon, 9 Sep 2019 03:57:29 +0000 Subject: [PATCH 073/191] =?UTF-8?q?=F0=9F=9B=A2=F0=9F=8C=88=20Checkpoint?= =?UTF-8?q?=20./public/index.html:6266626/966=20./public/css/style.css:626?= =?UTF-8?q?6626/32?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/css/style.css | 4 ++++ public/index.html | 23 +++++++++++++++++------ 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/public/css/style.css b/public/css/style.css index 5216f626..c7fdcad6 100755 --- a/public/css/style.css +++ b/public/css/style.css @@ -1,5 +1,9 @@ /*Style your own assignment! This is fun! */ +:active { + background +} + div{ border: 1px solid white; } diff --git a/public/index.html b/public/index.html index 1a624b1f..cd0cab4f 100755 --- a/public/index.html +++ b/public/index.html @@ -173,9 +173,24 @@ return false } + + const removeEvent = function() { + console.log("Something") + var val = document.querySelector('.boardsection:last-child .tasklist').value + if(val !== null) { + var day = document.querySelector('.boardsection:last-child .tasklist').value.task + console.log(day) + } + var day = document.querySelector('.boardsection:last-child .tasklist').value.task + + console.log(day) + + + } const deleteEvent = function( day, task, time) { - e.preventDefault(); + + var eventInfo = { day : day, task : task, @@ -193,10 +208,6 @@ } - const removeEvent = function() { - - } - const createEvent = function(day, task, time){ var dayNum = dayFinder(day) var dayCol = document.querySelector(".boardsection[data-board='"+ dayNum +"'] .tasklist") @@ -239,7 +250,7 @@ button.onclick = addEvent const nextButton = document.querySelector( '#next' ) - button.oncllick = deleteEvent + button.oncllick = removeEvent } From 43581fe5d8538534e00a50157f9b7faedc51e3d5 Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a2-pllopez)" Date: Mon, 9 Sep 2019 04:09:18 +0000 Subject: [PATCH 074/191] =?UTF-8?q?=F0=9F=91=A8=E2=80=8D=E2=9D=A4=EF=B8=8F?= =?UTF-8?q?=E2=80=8D=F0=9F=91=A8=F0=9F=9B=A9=20Checkpoint=20./public/css/s?= =?UTF-8?q?tyle.css:6266626/49=20./public/index.html:6266626/1513=20./serv?= =?UTF-8?q?er.improved.js:6266626/1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/css/style.css | 3 --- public/index.html | 54 +++++++++++++++++++------------------------- server.improved.js | 2 +- 3 files changed, 24 insertions(+), 35 deletions(-) diff --git a/public/css/style.css b/public/css/style.css index c7fdcad6..56d374ae 100755 --- a/public/css/style.css +++ b/public/css/style.css @@ -1,8 +1,5 @@ /*Style your own assignment! This is fun! */ -:active { - background -} div{ border: 1px solid white; diff --git a/public/index.html b/public/index.html index cd0cab4f..ba2a6ec7 100755 --- a/public/index.html +++ b/public/index.html @@ -173,40 +173,32 @@ return false } - - const removeEvent = function() { - console.log("Something") - var val = document.querySelector('.boardsection:last-child .tasklist').value - if(val !== null) { - var day = document.querySelector('.boardsection:last-child .tasklist').value.task - console.log(day) - } - var day = document.querySelector('.boardsection:last-child .tasklist').value.task + + - console.log(day) + const deleteEvent = function( ) { + //var obj = document.querySelector('.boardsection:last-child') + console.log("Hello"); + // var day = obj.day + // var task = obj.task +// var time = obj.time + + var eventInfo = { + day : day, + task : task, + time : time, + } + var body = JSON.stringify( eventInfo ); + fetch('/delete',{ + method: 'POST', + body + }).then( function( response ) { + occupySchedule() + }) - } - const deleteEvent = function( day, task, time) { - - - var eventInfo = { - day : day, - task : task, - time : time, - }; - var body = JSON.stringify( eventInfo ); - fetch('/delete',{ - method: 'POST', - body - }).then( function( response ) { - occupySchedule() - }) - - return false - - } + const createEvent = function(day, task, time){ var dayNum = dayFinder(day) @@ -250,7 +242,7 @@ button.onclick = addEvent const nextButton = document.querySelector( '#next' ) - button.oncllick = removeEvent + button.onclick = deleteEvent } diff --git a/server.improved.js b/server.improved.js index b79641d4..dfbd111f 100644 --- a/server.improved.js +++ b/server.improved.js @@ -15,7 +15,7 @@ const appdata = [ const data = [ { 'day': 'Monday', 'task': 'CS4241 A2 Due', time: '11:59:00'}, { 'day': 'Tuesday', 'task': 'MA2621 Homework Due', time: '2:00:00'}, - { 'day': 'Tuesday', 'task': 'CH1010 Daily Proble', time: '11:00:00'} + { 'day': 'Tuesday', 'task': 'CH1010 Daily Problem', time: '11:00:00'} ] From 643034a02377da5fa2b3ffd16b1aaeab27e1709e Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a2-pllopez)" Date: Mon, 9 Sep 2019 04:21:18 +0000 Subject: [PATCH 075/191] =?UTF-8?q?=F0=9F=98=80=F0=9F=9A=BF=20Checkpoint?= =?UTF-8?q?=20./public/index.html:6266626/845=20./server.improved.js:62666?= =?UTF-8?q?26/177?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/index.html | 30 +++++------------------------- server.improved.js | 13 +++---------- 2 files changed, 8 insertions(+), 35 deletions(-) diff --git a/public/index.html b/public/index.html index ba2a6ec7..8aa49023 100755 --- a/public/index.html +++ b/public/index.html @@ -174,32 +174,12 @@ return false } - - - const deleteEvent = function( ) { - //var obj = document.querySelector('.boardsection:last-child') - console.log("Hello"); - // var day = obj.day - // var task = obj.task -// var time = obj.time - - var eventInfo = { - day : day, - task : task, - time : time, - } - var body = JSON.stringify( eventInfo ); - fetch('/delete',{ - method: 'POST', - body - }).then( function( response ) { - occupySchedule() - }) - + const deleteEvent = function(e) { + e.preventDefault(); + var obj = document.querySelector('.boardsection[data-board]:first-child .tasklist') + console.log(obj) } - - const createEvent = function(day, task, time){ var dayNum = dayFinder(day) var dayCol = document.querySelector(".boardsection[data-board='"+ dayNum +"'] .tasklist") @@ -242,7 +222,7 @@ button.onclick = addEvent const nextButton = document.querySelector( '#next' ) - button.onclick = deleteEvent + nextButton.onclick = deleteEvent } diff --git a/server.improved.js b/server.improved.js index dfbd111f..4fc4a1c5 100644 --- a/server.improved.js +++ b/server.improved.js @@ -6,17 +6,10 @@ const http = require( 'http' ), dir = 'public/', port = 3000 -const appdata = [ - { 'model': 'toyota', 'year': 1999, 'mpg': 23 }, - { 'model': 'honda', 'year': 2004, 'mpg': 30 }, - { 'model': 'ford', 'year': 1987, 'mpg': 14} -] - const data = [ - { 'day': 'Monday', 'task': 'CS4241 A2 Due', time: '11:59:00'}, - { 'day': 'Tuesday', 'task': 'MA2621 Homework Due', time: '2:00:00'}, - { 'day': 'Tuesday', 'task': 'CH1010 Daily Problem', time: '11:00:00'} - + { 'day': 'Monday', 'task': 'CS4241 A2 Due', time: '11:59'}, + { 'day': 'Tuesday', 'task': 'MA2621 Homework Due', time: '2:00'}, + { 'day': 'Tuesday', 'task': 'CH1010 Daily Problem', time: '11:00'} ] const server = http.createServer( function( request,response ) { From 599ae3b2f338f385346ec8426dc4307006800811 Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a2-pllopez)" Date: Mon, 9 Sep 2019 04:33:19 +0000 Subject: [PATCH 076/191] =?UTF-8?q?=F0=9F=8D=AB=F0=9F=8F=A3=20Checkpoint?= =?UTF-8?q?=20./public/index.html:6266626/1251?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/index.html | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/public/index.html b/public/index.html index 8aa49023..a4035ff7 100755 --- a/public/index.html +++ b/public/index.html @@ -176,8 +176,16 @@ const deleteEvent = function(e) { e.preventDefault(); - var obj = document.querySelector('.boardsection[data-board]:first-child .tasklist') - console.log(obj) + var pointer = document.querySelector('.boardsection[data-board]:first-child .tasklist div') + var pointer = document.querySelector('.boardsection[data-board]:first-child .tasklist') + + if(pointer !== null) { + var i; + for(i = 0; i < pointer.childNodes.length; i++){ + pointer.remove(pointer.childNodes[i]) + } + } + console.log(pointer) } const createEvent = function(day, task, time){ @@ -187,11 +195,12 @@ var textNode = document.createTextNode(task) var divNode = document.createElement("div") var breakNode = document.createElement("br") - divNode.appendChild(breakNode) + var breakNode1 = document.createElement("br") divNode.appendChild(timeNode) - divNode.appendChild(breakNode) + divNode.appendChild(breakNode1) divNode.appendChild(textNode) dayCol.appendChild(divNode) + dayCol.appendChild(breakNode) } const dayFinder = function(str) { From 98fa83f0e07022af8b7205543c659a5f448680ca Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a2-pllopez)" Date: Mon, 9 Sep 2019 04:45:19 +0000 Subject: [PATCH 077/191] =?UTF-8?q?=F0=9F=A6=83=F0=9F=8E=8C=20Checkpoint?= =?UTF-8?q?=20./public/index.html:6266626/813?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/index.html | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/public/index.html b/public/index.html index a4035ff7..150990c7 100755 --- a/public/index.html +++ b/public/index.html @@ -176,18 +176,18 @@ const deleteEvent = function(e) { e.preventDefault(); - var pointer = document.querySelector('.boardsection[data-board]:first-child .tasklist div') - var pointer = document.querySelector('.boardsection[data-board]:first-child .tasklist') - - if(pointer !== null) { - var i; - for(i = 0; i < pointer.childNodes.length; i++){ - pointer.remove(pointer.childNodes[i]) + var pointer = document.querySelector('.boardsection[data-board]:first-child .tasklist') + while(pointer.hasChildNodes()){ + pointer.removeChild(pointer.firstChild) + if(pointer.firstChild) { + } } - console.log(pointer) + } + + const createEvent = function(day, task, time){ var dayNum = dayFinder(day) var dayCol = document.querySelector(".boardsection[data-board='"+ dayNum +"'] .tasklist") From fc71c6c39d973d441e581281f159140b006e94f9 Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a2-pllopez)" Date: Mon, 9 Sep 2019 04:57:17 +0000 Subject: [PATCH 078/191] =?UTF-8?q?=F0=9F=8D=9B=F0=9F=9A=9D=20Checkpoint?= =?UTF-8?q?=20./public/index.html:6266626/1515=20./server.improved.js:6266?= =?UTF-8?q?626/40?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/index.html | 14 +++++++++++--- server.improved.js | 6 +++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/public/index.html b/public/index.html index 150990c7..bfb4b8f0 100755 --- a/public/index.html +++ b/public/index.html @@ -151,9 +151,11 @@ var day = document.querySelector("#day").value var task = document.querySelector("#task").value var time = document.querySelector("#time").value + var index = day + task + time console.log("Day: " + day + " Time: " + time + " Task: "+ task); var newEvent = { + index : index, day : document.querySelector("#day").value, task : document.querySelector("#task").value, time : document.querySelector("#time").value, @@ -164,7 +166,7 @@ method: 'POST', body }).then( function( response ) { - createEvent(day, task, time); + createEvent(index, day, task, time); document.querySelector("#day").value = ''; document.querySelector("#task").value = ''; @@ -176,19 +178,23 @@ const deleteEvent = function(e) { e.preventDefault(); + var delEvent; var pointer = document.querySelector('.boardsection[data-board]:first-child .tasklist') while(pointer.hasChildNodes()){ pointer.removeChild(pointer.firstChild) - if(pointer.firstChild) { + if(pointer.firstChild.getAttribute('index')) { + delEvent = pointer.firstChild.getAttribute('index'); + removeEvent() } } + } - const createEvent = function(day, task, time){ + const createEvent = function(index, day, task, time){ var dayNum = dayFinder(day) var dayCol = document.querySelector(".boardsection[data-board='"+ dayNum +"'] .tasklist") var timeNode = document.createTextNode(time) @@ -196,6 +202,7 @@ var divNode = document.createElement("div") var breakNode = document.createElement("br") var breakNode1 = document.createElement("br") + divNode.setAttribute('index', index) divNode.appendChild(timeNode) divNode.appendChild(breakNode1) divNode.appendChild(textNode) @@ -224,6 +231,7 @@ } } + window.onload = function() { occupySchedule(); diff --git a/server.improved.js b/server.improved.js index 4fc4a1c5..fdfdd5ca 100644 --- a/server.improved.js +++ b/server.improved.js @@ -7,9 +7,9 @@ const http = require( 'http' ), port = 3000 const data = [ - { 'day': 'Monday', 'task': 'CS4241 A2 Due', time: '11:59'}, - { 'day': 'Tuesday', 'task': 'MA2621 Homework Due', time: '2:00'}, - { 'day': 'Tuesday', 'task': 'CH1010 Daily Problem', time: '11:00'} + { 'index': 0, 'day': 'Monday', 'task': 'CS4241 A2 Due', time: '11:59'}, + { 'index': 1, 'day': 'Tuesday', 'task': 'MA2621 Homework Due', time: '2:00'}, + { 'index': 2, 'day': 'Tuesday', 'task': 'CH1010 Daily Problem', time: '11:00'} ] const server = http.createServer( function( request,response ) { From 5bf3ee2d4195417e8f173ee38b992c043e07782f Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a2-pllopez)" Date: Mon, 9 Sep 2019 05:09:18 +0000 Subject: [PATCH 079/191] =?UTF-8?q?=F0=9F=8F=81=F0=9F=8D=94=20Checkpoint?= =?UTF-8?q?=20./public/index.html:6266626/490=20./server.improved.js:62666?= =?UTF-8?q?26/269?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/index.html | 27 ++++++++++++++++++++------- server.improved.js | 6 +++--- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/public/index.html b/public/index.html index bfb4b8f0..0747ec34 100755 --- a/public/index.html +++ b/public/index.html @@ -139,7 +139,7 @@ var i; for(i = 0; i < info.length; i++){ - createEvent(info[i].day, info[i].task, info[i].time); + createEvent(info[i].index, info[i].day, info[i].task, info[i].time); } console.log( JSON.stringify( myJSON ) ) @@ -152,7 +152,7 @@ var task = document.querySelector("#task").value var time = document.querySelector("#time").value var index = day + task + time - console.log("Day: " + day + " Time: " + time + " Task: "+ task); + console.log("Index"+ index +"Day: " + day + " Time: " + time + " Task: "+ task); var newEvent = { index : index, @@ -178,14 +178,14 @@ const deleteEvent = function(e) { e.preventDefault(); - var delEvent; + var eventInd; var pointer = document.querySelector('.boardsection[data-board]:first-child .tasklist') while(pointer.hasChildNodes()){ - pointer.removeChild(pointer.firstChild) - if(pointer.firstChild.getAttribute('index')) { - delEvent = pointer.firstChild.getAttribute('index'); + //pointer.removeChild(pointer.firstChild) + if(pointer.firstChild.getAttribute('index') !== null) { + eventInd = pointer.firstChild.getAttribute('index'); - removeEvent() + removeEvent(eventInd) } } @@ -193,6 +193,17 @@ } + const removeEvent = function(index) { + var body = JSON.stringify( index ) + + fetch('/delete',{ + method: 'POST', + body + }).then(function(response) { + //occupySchedule() + }) + } + const createEvent = function(index, day, task, time){ var dayNum = dayFinder(day) @@ -206,6 +217,8 @@ divNode.appendChild(timeNode) divNode.appendChild(breakNode1) divNode.appendChild(textNode) + console.log(dayCol) + dayCol.appendChild(divNode) dayCol.appendChild(breakNode) } diff --git a/server.improved.js b/server.improved.js index fdfdd5ca..5aea7a37 100644 --- a/server.improved.js +++ b/server.improved.js @@ -7,9 +7,9 @@ const http = require( 'http' ), port = 3000 const data = [ - { 'index': 0, 'day': 'Monday', 'task': 'CS4241 A2 Due', time: '11:59'}, - { 'index': 1, 'day': 'Tuesday', 'task': 'MA2621 Homework Due', time: '2:00'}, - { 'index': 2, 'day': 'Tuesday', 'task': 'CH1010 Daily Problem', time: '11:00'} + { 'index': 'MondayCS4241 A2 Due11:59', 'day': 'Monday', 'task': 'CS4241 A2 Due', time: '11:59'}, + { 'index': 'TuesdayMA2621 Homework Due2:00', 'day': 'Tuesday', 'task': 'MA2621 Homework Due', time: '2:00'}, + { 'index': 'TuesdayCH1010 Daily Problem11:00', 'day': 'Tuesday', 'task': 'CH1010 Daily Problem', time: '11:00'} ] const server = http.createServer( function( request,response ) { From a778a79db0362507c0fc8a7425cbb333d4bc3c4b Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a2-pllopez)" Date: Mon, 9 Sep 2019 05:21:17 +0000 Subject: [PATCH 080/191] =?UTF-8?q?=F0=9F=90=9C=F0=9F=8F=AB=20Checkpoint?= =?UTF-8?q?=20./public/index.html:6266626/219?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/index.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/public/index.html b/public/index.html index 0747ec34..c341f1e4 100755 --- a/public/index.html +++ b/public/index.html @@ -180,10 +180,12 @@ e.preventDefault(); var eventInd; var pointer = document.querySelector('.boardsection[data-board]:first-child .tasklist') + var pointerChild = document.querySelector('.boardsection[data-board]:first-child .tasklist:first-child[index]') + while(pointer.hasChildNodes()){ //pointer.removeChild(pointer.firstChild) - if(pointer.firstChild.getAttribute('index') !== null) { - eventInd = pointer.firstChild.getAttribute('index'); + if(pointerChild !== null) { + //eventInd = pointer.firstChild.getAttribute('index'); removeEvent(eventInd) } From 1c36a3fcee8e68153d93de8846f369148f747fe0 Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a2-pllopez)" Date: Mon, 9 Sep 2019 05:32:18 +0000 Subject: [PATCH 081/191] =?UTF-8?q?=F0=9F=92=98=F0=9F=8E=B1=20Checkpoint?= =?UTF-8?q?=20./public/index.html:6266626/427?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/index.html | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/public/index.html b/public/index.html index c341f1e4..45548d62 100755 --- a/public/index.html +++ b/public/index.html @@ -128,7 +128,6 @@ } const occupySchedule = function() { - alert("Running"); fetch( '/info' ) .then( function( response ) { console.log( response ) @@ -180,15 +179,13 @@ e.preventDefault(); var eventInd; var pointer = document.querySelector('.boardsection[data-board]:first-child .tasklist') - var pointerChild = document.querySelector('.boardsection[data-board]:first-child .tasklist:first-child[index]') - + var pointerChild = document.querySelector('.boardsection[data-board]:first-child .tasklist :first-child[index]') while(pointer.hasChildNodes()){ - //pointer.removeChild(pointer.firstChild) if(pointerChild !== null) { - //eventInd = pointer.firstChild.getAttribute('index'); - - removeEvent(eventInd) + removeEvent(pointerChild.getAttribute('index')) } + console.log(pointerChild.getAttribute('index')) + pointer.removeChild(pointer.firstChild) } @@ -203,6 +200,7 @@ body }).then(function(response) { //occupySchedule() + console.log("made it") }) } From 85cd15f8d0427e87e204cc17ac277bb98aacf74b Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a2-pllopez)" Date: Mon, 9 Sep 2019 05:44:19 +0000 Subject: [PATCH 082/191] =?UTF-8?q?=F0=9F=9A=A6=E2=8F=B0=20Checkpoint=20./?= =?UTF-8?q?public/index.html:6266626/563=20./server.improved.js:6266626/10?= =?UTF-8?q?65?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/index.html | 3 ++- server.improved.js | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/public/index.html b/public/index.html index 45548d62..d79ec023 100755 --- a/public/index.html +++ b/public/index.html @@ -138,7 +138,8 @@ var i; for(i = 0; i < info.length; i++){ - createEvent(info[i].index, info[i].day, info[i].task, info[i].time); + if(document.querySelector(".boardsection[data-board]:first-child .tasklist [index='"+info[i].day + info[i].task + info[i].time+"']") === null) + createEvent(info[i].index, info[i].day, info[i].task, info[i].time); } console.log( JSON.stringify( myJSON ) ) diff --git a/server.improved.js b/server.improved.js index 5aea7a37..ccf4fb75 100644 --- a/server.improved.js +++ b/server.improved.js @@ -43,6 +43,7 @@ const handlePost = function( request, response ) { switch(request.url) { case '/submit': var newEvent = { + 'index': info.day+info.task+info.time, 'day': info.day, 'task' : info.task, 'time': info.time @@ -53,10 +54,16 @@ const handlePost = function( request, response ) { break case '/delete': var delEvent = { + 'index': info.day+info.task+info.time, 'day': info.day, 'task' : info.task, 'time': info.time } + var split = data.indexOf(delEvent) + data.splice(split, 1) + + response.writeHead( 200, "OK", {'Content-Type': 'text/plain' }) + response.end() console.log(data.indexOf(delEvent)); break default: From a57e81e190208ba13d6ffdc3e60a7003658dd6d5 Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a2-pllopez)" Date: Mon, 9 Sep 2019 05:56:17 +0000 Subject: [PATCH 083/191] =?UTF-8?q?=F0=9F=8C=BF=E2=9B=B4=20Checkpoint=20./?= =?UTF-8?q?public/index.html:6266626/1309=20./server.improved.js:6266626/3?= =?UTF-8?q?3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/index.html | 54 +++++++++++----------------------------------- server.improved.js | 1 + 2 files changed, 13 insertions(+), 42 deletions(-) diff --git a/public/index.html b/public/index.html index d79ec023..2ed63fe4 100755 --- a/public/index.html +++ b/public/index.html @@ -89,43 +89,6 @@ -
+ Daily Schedule -
-
-
-
- Sunday -
-
- -
-
-
-
- Monday -
-
- -
-
-
-
- Tuesday -
-
- -
-
-
-
- Wednesday -
-
- -
-
-
-
- Thursday -
-
- -
-
-
-
- Friday -
-
- -
-
-
-
- Saturday -
-
- -
-
-
+
- -
- Day: - - Task: - - Time: - -
- +
diff --git a/server.improved.js b/server.improved.js deleted file mode 100644 index 4399ad44..00000000 --- a/server.improved.js +++ /dev/null @@ -1,117 +0,0 @@ -const http = require( 'http' ), - fs = require( 'fs' ), - // IMPORTANT: you must run `npm install` in the directory for this assignment - // to install the mime library used in the following line of code - mime = require( 'mime' ), - dir = 'public/', - express = require('express'), - app = express(), - port = 3000 - - -app.use(express.static('public')) - - -const server = http.createServer( function( request,response ) { - - if( request.method === 'GET' ) { - handleGet( request, response ) - }else if( request.method === 'POST' ){ - handlePost( request, response ) - } -}) - - -const data = [ - { 'index': 'MondayCS4241 A2 Due11:59', 'day': 'Monday', 'task': 'CS4241 A2 Due', time: '11:59'}, - { 'index': 'TuesdayMA2621 Homework Due2:00', 'day': 'Tuesday', 'task': 'MA2621 Homework Due', time: '2:00'}, - { 'index': 'TuesdayCH1010 Daily Problem11:00', 'day': 'Tuesday', 'task': 'CH1010 Daily Problem', time: '11:00'} -] - - - -const handleGet = function( request, response ) { - const filename = dir + request.url.slice( 1 ) - - if( request.url === '/' ) { - sendFile( response, 'public/index.html' ) - } else if( request.url === '/info') { - sendData( response, data ) - } else{ - sendFile( response, filename ) - } -} - -const handlePost = function( request, response ) { - let dataString = '' - - request.on( 'data', function( data ) { - dataString += data - }) - request.on( 'end', function() { - var info = JSON.parse( dataString ) - switch(request.url) { - case '/submit': - var newEvent = { - 'index': info.day+info.task+info.time, - 'day': info.day, - 'task' : info.task, - 'time': info.time - } - data.push(newEvent); - response.writeHead( 200, "OK", {'Content-Type': 'text/plain' }) - response.end() - break - case '/delete': - while(info.length > 0) { - var split = data.findIndex(x => x.index === info[0]) - data.splice(split, 1) - info.shift() - } - response.writeHead( 200, "OK", {'Content-Type': 'text/plain' }) - response.end() - break - default: - console.log("error"); - break - - } - }) -} - -const sendData = function( response, value ) { - const type = mime.getType( value ) - - response.writeHeader( 200, { 'Content-Type': type }) - response.end( JSON.stringify( { data : value } )) - -} - -const sendFile = function( response, filename ) { - const type = mime.getType( filename ) - - fs.readFile( filename, function( err, content ) { - - // if the error = null, then we've loaded the file successfully - if( err === null ) { - - // status code: https://httpstatuses.com - response.writeHeader( 200, { 'Content-Type': type }) - response.end( content ) - - }else{ - - // file not found, error code 404 - response.writeHeader( 404 ) - response.end( '404 Error: File Not Found' ) - - } - } - ) -} - -app.listen(port, () => console.log(`Example app listening on port ${port}!`)) - -//server.listen(process.env.PORT || port ) - - diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml index 86c7048d..80d7f8e1 100644 --- a/shrinkwrap.yaml +++ b/shrinkwrap.yaml @@ -1,15 +1,736 @@ dependencies: - mime: 2.4.4 + cookie-parser: 1.4.4 + debug: 2.6.9 + express: 4.16.4 + http-errors: 1.6.3 + jade: 1.11.0 + morgan: 1.9.1 packages: - /mime/2.4.4: + /accepts/1.3.7: + dependencies: + mime-types: 2.1.24 + negotiator: 0.6.2 dev: false engines: - node: '>=4.0.0' + node: '>= 0.6' + resolution: + integrity: sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA== + /acorn-globals/1.0.9: + dependencies: + acorn: 2.7.0 + dev: false + resolution: + integrity: sha1-VbtemGkVB7dFedBRNBMhfDgMVM8= + /acorn/1.2.2: + dev: false + engines: + node: '>=0.4.0' + hasBin: true + resolution: + integrity: sha1-yM4n3grMdtiW0rH6099YjZ6C8BQ= + /acorn/2.7.0: + dev: false + engines: + node: '>=0.4.0' + hasBin: true + resolution: + integrity: sha1-q259nYhqrKiwhbwzEreaGYQz8Oc= + /align-text/0.1.4: + dependencies: + kind-of: 3.2.2 + longest: 1.0.1 + repeat-string: 1.6.1 + dev: false + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-DNkKVhCT810KmSVsIrcGlDP60Rc= + /amdefine/1.0.1: + dev: false + engines: + node: '>=0.4.2' + resolution: + integrity: sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU= + /array-flatten/1.1.1: + dev: false + resolution: + integrity: sha1-ml9pkFGx5wczKPKgCJaLZOopVdI= + /asap/1.0.0: + dev: false + resolution: + integrity: sha1-sqRdpf36ILBJb8N2jMJ8EvqRan0= + /basic-auth/2.0.1: + dependencies: + safe-buffer: 5.1.2 + dev: false + engines: + node: '>= 0.8' + resolution: + integrity: sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg== + /body-parser/1.18.3: + dependencies: + bytes: 3.0.0 + content-type: 1.0.4 + debug: 2.6.9 + depd: 1.1.2 + http-errors: 1.6.3 + iconv-lite: 0.4.23 + on-finished: 2.3.0 + qs: 6.5.2 + raw-body: 2.3.3 + type-is: 1.6.18 + dev: false + engines: + node: '>= 0.8' + resolution: + integrity: sha1-WykhmP/dVTs6DyDe0FkrlWlVyLQ= + /bytes/3.0.0: + dev: false + engines: + node: '>= 0.8' + resolution: + integrity: sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg= + /camelcase/1.2.1: + dev: false + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk= + /center-align/0.1.3: + dependencies: + align-text: 0.1.4 + lazy-cache: 1.0.4 + dev: false + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-qg0yYptu6XIgBBHL1EYckHvCt60= + /character-parser/1.2.1: + dev: false + resolution: + integrity: sha1-wN3kqxgnE7kZuXCVmhI+zBow/NY= + /clean-css/3.4.28: + dependencies: + commander: 2.8.1 + source-map: 0.4.4 + dev: false + engines: + node: '>=0.10.0' + hasBin: true + resolution: + integrity: sha1-vxlF6C/ICPVWlebd6uwBQA79A/8= + /cliui/2.1.0: + dependencies: + center-align: 0.1.3 + right-align: 0.1.3 + wordwrap: 0.0.2 + dev: false + resolution: + integrity: sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE= + /commander/2.6.0: + dev: false + engines: + node: '>= 0.6.x' + resolution: + integrity: sha1-nfflL7Kgyw+4kFjugMMQQiXzfh0= + /commander/2.8.1: + dependencies: + graceful-readlink: 1.0.1 + dev: false + engines: + node: '>= 0.6.x' + resolution: + integrity: sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ= + /constantinople/3.0.2: + dependencies: + acorn: 2.7.0 + deprecated: Please update to at least constantinople 3.1.1 + dev: false + resolution: + integrity: sha1-S5RdmTeQe82Y7ldRIsOBdRZUQUE= + /content-disposition/0.5.2: + dev: false + engines: + node: '>= 0.6' + resolution: + integrity: sha1-DPaLud318r55YcOoUXjLhdunjLQ= + /content-type/1.0.4: + dev: false + engines: + node: '>= 0.6' + resolution: + integrity: sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA== + /cookie-parser/1.4.4: + dependencies: + cookie: 0.3.1 + cookie-signature: 1.0.6 + dev: false + engines: + node: '>= 0.8.0' + resolution: + integrity: sha512-lo13tqF3JEtFO7FyA49CqbhaFkskRJ0u/UAiINgrIXeRCY41c88/zxtrECl8AKH3B0hj9q10+h3Kt8I7KlW4tw== + /cookie-signature/1.0.6: + dev: false + resolution: + integrity: sha1-4wOogrNCzD7oylE6eZmXNNqzriw= + /cookie/0.3.1: + dev: false + engines: + node: '>= 0.6' + resolution: + integrity: sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s= + /css-parse/1.0.4: + dev: false + resolution: + integrity: sha1-OLBQP7+dqfVOnB29pg4UXHcRe90= + /css-stringify/1.0.5: + dev: false + resolution: + integrity: sha1-sNBClG2ylTu50pKQCmy19tASIDE= + /css/1.0.8: + dependencies: + css-parse: 1.0.4 + css-stringify: 1.0.5 + dev: false + resolution: + integrity: sha1-k4aBHKgrzMnuf7WnMrHioxfIo+c= + /debug/2.6.9: + dependencies: + ms: 2.0.0 + dev: false + resolution: + integrity: sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== + /decamelize/1.2.0: + dev: false + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= + /depd/1.1.2: + dev: false + engines: + node: '>= 0.6' + resolution: + integrity: sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= + /destroy/1.0.4: + dev: false + resolution: + integrity: sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA= + /ee-first/1.1.1: + dev: false + resolution: + integrity: sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= + /encodeurl/1.0.2: + dev: false + engines: + node: '>= 0.8' + resolution: + integrity: sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= + /escape-html/1.0.3: + dev: false + resolution: + integrity: sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg= + /etag/1.8.1: + dev: false + engines: + node: '>= 0.6' + resolution: + integrity: sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc= + /express/4.16.4: + dependencies: + accepts: 1.3.7 + array-flatten: 1.1.1 + body-parser: 1.18.3 + content-disposition: 0.5.2 + content-type: 1.0.4 + cookie: 0.3.1 + cookie-signature: 1.0.6 + debug: 2.6.9 + depd: 1.1.2 + encodeurl: 1.0.2 + escape-html: 1.0.3 + etag: 1.8.1 + finalhandler: 1.1.1 + fresh: 0.5.2 + merge-descriptors: 1.0.1 + methods: 1.1.2 + on-finished: 2.3.0 + parseurl: 1.3.3 + path-to-regexp: 0.1.7 + proxy-addr: 2.0.5 + qs: 6.5.2 + range-parser: 1.2.1 + safe-buffer: 5.1.2 + send: 0.16.2 + serve-static: 1.13.2 + setprototypeof: 1.1.0 + statuses: 1.4.0 + type-is: 1.6.18 + utils-merge: 1.0.1 + vary: 1.1.2 + dev: false + engines: + node: '>= 0.10.0' + resolution: + integrity: sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg== + /finalhandler/1.1.1: + dependencies: + debug: 2.6.9 + encodeurl: 1.0.2 + escape-html: 1.0.3 + on-finished: 2.3.0 + parseurl: 1.3.3 + statuses: 1.4.0 + unpipe: 1.0.0 + dev: false + engines: + node: '>= 0.8' + resolution: + integrity: sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg== + /forwarded/0.1.2: + dev: false + engines: + node: '>= 0.6' + resolution: + integrity: sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ= + /fresh/0.5.2: + dev: false + engines: + node: '>= 0.6' + resolution: + integrity: sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac= + /graceful-readlink/1.0.1: + dev: false + resolution: + integrity: sha1-TK+tdrxi8C+gObL5Tpo906ORpyU= + /http-errors/1.6.3: + dependencies: + depd: 1.1.2 + inherits: 2.0.3 + setprototypeof: 1.1.0 + statuses: 1.5.0 + dev: false + engines: + node: '>= 0.6' + resolution: + integrity: sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0= + /iconv-lite/0.4.23: + dependencies: + safer-buffer: 2.1.2 + dev: false + engines: + node: '>=0.10.0' + resolution: + integrity: sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA== + /inherits/2.0.3: + dev: false + resolution: + integrity: sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= + /ipaddr.js/1.9.0: + dev: false + engines: + node: '>= 0.10' + resolution: + integrity: sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA== + /is-buffer/1.1.6: + dev: false + resolution: + integrity: sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== + /is-promise/1.0.1: + dev: false + resolution: + integrity: sha1-MVc3YcBX4zwukaq56W2gjO++duU= + /is-promise/2.1.0: + dev: false + resolution: + integrity: sha1-eaKp7OfwlugPNtKy87wWwf9L8/o= + /jade/1.11.0: + dependencies: + character-parser: 1.2.1 + clean-css: 3.4.28 + commander: 2.6.0 + constantinople: 3.0.2 + jstransformer: 0.0.2 + mkdirp: 0.5.1 + transformers: 2.1.0 + uglify-js: 2.8.29 + void-elements: 2.0.1 + with: 4.0.3 + deprecated: 'Jade has been renamed to pug, please install the latest version of pug instead of jade' + dev: false hasBin: true resolution: - integrity: sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA== + integrity: sha1-nIDlOMEtP7lcjZu5VZ+gzAQEBf0= + /jstransformer/0.0.2: + dependencies: + is-promise: 2.1.0 + promise: 6.1.0 + dev: false + resolution: + integrity: sha1-eq4pqQPRls+glz2IXT5HlH7Ndqs= + /kind-of/3.2.2: + dependencies: + is-buffer: 1.1.6 + dev: false + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= + /lazy-cache/1.0.4: + dev: false + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-odePw6UEdMuAhF07O24dpJpEbo4= + /longest/1.0.1: + dev: false + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc= + /media-typer/0.3.0: + dev: false + engines: + node: '>= 0.6' + resolution: + integrity: sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g= + /merge-descriptors/1.0.1: + dev: false + resolution: + integrity: sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E= + /methods/1.1.2: + dev: false + engines: + node: '>= 0.6' + resolution: + integrity: sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= + /mime-db/1.40.0: + dev: false + engines: + node: '>= 0.6' + resolution: + integrity: sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA== + /mime-types/2.1.24: + dependencies: + mime-db: 1.40.0 + dev: false + engines: + node: '>= 0.6' + resolution: + integrity: sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ== + /mime/1.4.1: + dev: false + hasBin: true + resolution: + integrity: sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ== + /minimist/0.0.8: + dev: false + resolution: + integrity: sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0= + /mkdirp/0.5.1: + dependencies: + minimist: 0.0.8 + dev: false + hasBin: true + resolution: + integrity: sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM= + /morgan/1.9.1: + dependencies: + basic-auth: 2.0.1 + debug: 2.6.9 + depd: 1.1.2 + on-finished: 2.3.0 + on-headers: 1.0.2 + dev: false + engines: + node: '>= 0.8.0' + resolution: + integrity: sha512-HQStPIV4y3afTiCYVxirakhlCfGkI161c76kKFca7Fk1JusM//Qeo1ej2XaMniiNeaZklMVrh3vTtIzpzwbpmA== + /ms/2.0.0: + dev: false + resolution: + integrity: sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= + /negotiator/0.6.2: + dev: false + engines: + node: '>= 0.6' + resolution: + integrity: sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw== + /on-finished/2.3.0: + dependencies: + ee-first: 1.1.1 + dev: false + engines: + node: '>= 0.8' + resolution: + integrity: sha1-IPEzZIGwg811M3mSoWlxqi2QaUc= + /on-headers/1.0.2: + dev: false + engines: + node: '>= 0.8' + resolution: + integrity: sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA== + /optimist/0.3.7: + dependencies: + wordwrap: 0.0.3 + dev: false + resolution: + integrity: sha1-yQlBrVnkJzMokjB00s8ufLxuwNk= + /parseurl/1.3.3: + dev: false + engines: + node: '>= 0.8' + resolution: + integrity: sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== + /path-to-regexp/0.1.7: + dev: false + resolution: + integrity: sha1-32BBeABfUi8V60SQ5yR6G/qmf4w= + /promise/2.0.0: + dependencies: + is-promise: 1.0.1 + dev: false + resolution: + integrity: sha1-RmSKqdYFr10ucMMCS/WUNtoCuA4= + /promise/6.1.0: + dependencies: + asap: 1.0.0 + dev: false + resolution: + integrity: sha1-LOcp9rlLRcJoka0GAsXJDgTG7vY= + /proxy-addr/2.0.5: + dependencies: + forwarded: 0.1.2 + ipaddr.js: 1.9.0 + dev: false + engines: + node: '>= 0.10' + resolution: + integrity: sha512-t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ== + /qs/6.5.2: + dev: false + engines: + node: '>=0.6' + resolution: + integrity: sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA== + /range-parser/1.2.1: + dev: false + engines: + node: '>= 0.6' + resolution: + integrity: sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg== + /raw-body/2.3.3: + dependencies: + bytes: 3.0.0 + http-errors: 1.6.3 + iconv-lite: 0.4.23 + unpipe: 1.0.0 + dev: false + engines: + node: '>= 0.8' + resolution: + integrity: sha512-9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw== + /repeat-string/1.6.1: + dev: false + engines: + node: '>=0.10' + resolution: + integrity: sha1-jcrkcOHIirwtYA//Sndihtp15jc= + /right-align/0.1.3: + dependencies: + align-text: 0.1.4 + dev: false + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-YTObci/mo1FWiSENJOFMlhSGE+8= + /safe-buffer/5.1.2: + dev: false + resolution: + integrity: sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== + /safer-buffer/2.1.2: + dev: false + resolution: + integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== + /send/0.16.2: + dependencies: + debug: 2.6.9 + depd: 1.1.2 + destroy: 1.0.4 + encodeurl: 1.0.2 + escape-html: 1.0.3 + etag: 1.8.1 + fresh: 0.5.2 + http-errors: 1.6.3 + mime: 1.4.1 + ms: 2.0.0 + on-finished: 2.3.0 + range-parser: 1.2.1 + statuses: 1.4.0 + dev: false + engines: + node: '>= 0.8.0' + resolution: + integrity: sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw== + /serve-static/1.13.2: + dependencies: + encodeurl: 1.0.2 + escape-html: 1.0.3 + parseurl: 1.3.3 + send: 0.16.2 + dev: false + engines: + node: '>= 0.8.0' + resolution: + integrity: sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw== + /setprototypeof/1.1.0: + dev: false + resolution: + integrity: sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ== + /source-map/0.1.43: + dependencies: + amdefine: 1.0.1 + dev: false + engines: + node: '>=0.8.0' + resolution: + integrity: sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y= + /source-map/0.4.4: + dependencies: + amdefine: 1.0.1 + dev: false + engines: + node: '>=0.8.0' + resolution: + integrity: sha1-66T12pwNyZneaAMti092FzZSA2s= + /source-map/0.5.7: + dev: false + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= + /statuses/1.4.0: + dev: false + engines: + node: '>= 0.6' + resolution: + integrity: sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew== + /statuses/1.5.0: + dev: false + engines: + node: '>= 0.6' + resolution: + integrity: sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= + /transformers/2.1.0: + dependencies: + css: 1.0.8 + promise: 2.0.0 + uglify-js: 2.2.5 + deprecated: 'Deprecated, use jstransformer' + dev: false + resolution: + integrity: sha1-XSPLNVYd2F3Gf7hIIwm0fVPM6ac= + /type-is/1.6.18: + dependencies: + media-typer: 0.3.0 + mime-types: 2.1.24 + dev: false + engines: + node: '>= 0.6' + resolution: + integrity: sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g== + /uglify-js/2.2.5: + dependencies: + optimist: 0.3.7 + source-map: 0.1.43 + dev: false + engines: + node: '>=0.4.0' + hasBin: true + resolution: + integrity: sha1-puAqcNg5eSuXgEiLe4sYTAlcmcc= + /uglify-js/2.8.29: + dependencies: + source-map: 0.5.7 + yargs: 3.10.0 + dev: false + engines: + node: '>=0.8.0' + hasBin: true + optionalDependencies: + uglify-to-browserify: 1.0.2 + resolution: + integrity: sha1-KcVzMUgFe7Th913zW3qcty5qWd0= + /uglify-to-browserify/1.0.2: + dev: false + optional: true + resolution: + integrity: sha1-bgkk1r2mta/jSeOabWMoUKD4grc= + /unpipe/1.0.0: + dev: false + engines: + node: '>= 0.8' + resolution: + integrity: sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw= + /utils-merge/1.0.1: + dev: false + engines: + node: '>= 0.4.0' + resolution: + integrity: sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= + /vary/1.1.2: + dev: false + engines: + node: '>= 0.8' + resolution: + integrity: sha1-IpnwLG3tMNSllhsLn3RSShj2NPw= + /void-elements/2.0.1: + dev: false + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-wGavtYK7HLQSjWDqkjkulNXp2+w= + /window-size/0.1.0: + dev: false + engines: + node: '>= 0.8.0' + resolution: + integrity: sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0= + /with/4.0.3: + dependencies: + acorn: 1.2.2 + acorn-globals: 1.0.9 + dev: false + resolution: + integrity: sha1-7v0VTp550sjTQXtkeo8U2f7M4U4= + /wordwrap/0.0.2: + dev: false + engines: + node: '>=0.4.0' + resolution: + integrity: sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8= + /wordwrap/0.0.3: + dev: false + engines: + node: '>=0.4.0' + resolution: + integrity: sha1-o9XabNXAvAAI03I0u68b7WMFkQc= + /yargs/3.10.0: + dependencies: + camelcase: 1.2.1 + cliui: 2.1.0 + decamelize: 1.2.0 + window-size: 0.1.0 + dev: false + resolution: + integrity: sha1-9+572FfdfB0tOMDnTvvWgdFDH9E= registry: 'https://registry.npmjs.org/' shrinkwrapMinorVersion: 9 shrinkwrapVersion: 3 specifiers: - mime: ^2.4.4 + cookie-parser: ~1.4.4 + debug: ~2.6.9 + express: ~4.16.1 + http-errors: ~1.6.3 + jade: ~1.11.0 + morgan: ~1.9.1 From 52b3c913501a33f3c93c91e7c0f22d9c87d69147 Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a3-paris-lopez)" Date: Sat, 14 Sep 2019 22:07:05 +0000 Subject: [PATCH 114/191] =?UTF-8?q?=F0=9F=8D=95=F0=9F=92=93=20Checkpoint?= =?UTF-8?q?=20./public/index.html:6266626/464=20./public/js/scripts.js:626?= =?UTF-8?q?6626/741=20./public/css/style.css:6266626/1630=20./app.js:62666?= =?UTF-8?q?26/4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 + public/css/style.css | 108 ------------------------------------------- public/index.html | 16 +++---- public/js/scripts.js | 25 +--------- 4 files changed, 9 insertions(+), 141 deletions(-) diff --git a/package.json b/package.json index 5d49060c..9637cc06 100755 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ "express": "~4.16.1", "http-errors": "~1.6.3", "jade": "~1.11.0", + "lowdb": "^1.0.0", "morgan": "~1.9.1" } } diff --git a/public/css/style.css b/public/css/style.css index 061a2caf..e69de29b 100755 --- a/public/css/style.css +++ b/public/css/style.css @@ -1,108 +0,0 @@ -/*Style your own assignment! This is fun! */ - - -body { - background: #5A5959; - font-family: 'Calibri', sans-serif; -} - -.title { - overflow: hidden; - background:#1C1C1D; - color: white; - width: 98vw; - text-align: center; - font-size: 30px; - padding-top: 2vh; - padding-bottom: 2vh; - margin-bottom: 2vh; -} - -.board { - overflow: hidden; - display: flex; - flex-direction: row; - width: 98vw; - height: 70vmin; - background: #1C1C1D; -} - -.boardsection { - cursor: default; - width: 15%; - display: flex; - flex-direction: column; - border: 1px solid #CDD0D0; -} - -.boardsection:first-child { - border-top: 3px solid white; - border-left: 5px solid white; - border-right: 5px solid white; - border-bottom: 3px solid white; -} - -.boardsection[data-board] .header { - color: white; - text-align: center; - background-color: grey; - padding-top: .75em; - padding-bottom: .75em; - -} - -.boardsection[data-board] .tasklist { - overflow: hidden; - flex-wrap: nowrap; - color: white; - padding-top: .5em; - padding-bottom: .5em; - padding-left: .25em; - font-size: 14px; -} - -.menu { - display: flex; - flex-direction: row; - justify-content: space-between; - margin-top: 1em; - height: 10vmin; - width: 98vw; -} - -.menu-data { - display: flex; - flex-direction: row; - justify-content: space-evenly; - align-items: flex-end; - padding-bottom: .5em; - color: white; -} - -button { - font-size: 25px; - border-radius: 5px; - border-width: 0; - background-color: #1C1C1D; - color: white; -} - -#next { - width: 35vw; -} - -#submit { - width: 60vw; -} - -@keyframes next { - 0% { - transform: translateX(100%) - } - - 100% { - transform: translateX(0%) - } -} - -} \ No newline at end of file diff --git a/public/index.html b/public/index.html index 6981cb40..62715a49 100755 --- a/public/index.html +++ b/public/index.html @@ -5,17 +5,15 @@ - - Daily Schedule - -
-
+ +
+ +
+ -
-
- - From 44404cd0e1343ed5f01514709a9ae5bcf3220085 Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a3-paris-lopez)" Date: Sun, 15 Sep 2019 21:35:22 +0000 Subject: [PATCH 133/191] =?UTF-8?q?=F0=9F=99=85=F0=9F=8E=A1=20Checkpoint?= =?UTF-8?q?=20./app.js:6266626/2796=20./db.js:6266626/1525?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.js | 46 ------------------------------------ db.js | 28 ++++++++++++++++++++++ db.json | 12 ++++++++++ public/css/style.css | 0 public/js/scripts.js | 1 - public/stylesheets/style.css | 8 ------- 6 files changed, 40 insertions(+), 55 deletions(-) create mode 100644 db.js delete mode 100755 public/css/style.css delete mode 100755 public/js/scripts.js delete mode 100644 public/stylesheets/style.css diff --git a/app.js b/app.js index 1f6f5762..0c90c316 100644 --- a/app.js +++ b/app.js @@ -2,54 +2,8 @@ const express = require('express') const app = express() const port = 3000 -const bodyParser = require('body-parser'); -const passport = require('passport'); -const LocalStrategy = require('passport-local').Strategy; -//var User = require('./models/user') - -const low = require('lowdb') -//const FileAsync = require('lowdb/adapters/FileAsync') -//const adapter = new FileAsync('db.json') -const FileSync = require('lowdb/adapters/FileSync') -const adapter = new FileSync('db.json') -const db = low(adapter) app.use(express.static('public')) -app.use(bodyParser.json()) -app.use(passport.initialize()); -app.use(passport.session()); - -// Data is automatically saved to localStorage -db.defaults({ users: [] }) - .write() - -db.get('users') - .push({ username: 'pllopez' , password: '1234'}) - .write() - -app.post('/login', - passport.authenticate('local', { failureRedirect: '/login' }), - function(req, res) { - res.redirect('/'); - }); - - - - - -//password -passport.use(new LocalStrategy( - function(username, password, done) { - User.findOne({ username: username }, function (err, user) { - if (err) { return done(err); } - if (!user) { return done(null, false); } - if (!user.verifyPassword(password)) { return done(null, false); } - return done(null, user); - }); - } -)); - - app.listen(port, () => console.log(`Example app listening on port ${port}!`)) \ No newline at end of file diff --git a/db.js b/db.js new file mode 100644 index 00000000..6a30d4c4 --- /dev/null +++ b/db.js @@ -0,0 +1,28 @@ +const path = require('path'); +const bodyParser = require('body-parser'); +const LocalStrategy = require('passport-local').Strategy; + +const low = require('lowdb') + +const passport = require('passport'); +const authService = require('./services/authService'); +authService.configurePassport(passport) + +const router = require('express').Router(); + +const db = low('db.json') + +router.get('/', function(req, res) { + res.render('home') +}) + +// display all books +router.get('/books', function(req, res) { + var books = db.get('books').value() + var authors = db.get('authors').value() + + res.render('books', { books: books, authors: authors }) +}) + + +module.exports = router; \ No newline at end of file diff --git a/db.json b/db.json index de00055b..3b242a0e 100644 --- a/db.json +++ b/db.json @@ -1,5 +1,17 @@ { "users": [ + { + "username": "pllopez", + "password": "1234" + }, + { + "username": "pllopez", + "password": "1234" + }, + { + "username": "pllopez", + "password": "1234" + }, { "username": "pllopez", "password": "1234" diff --git a/public/css/style.css b/public/css/style.css deleted file mode 100755 index e69de29b..00000000 diff --git a/public/js/scripts.js b/public/js/scripts.js deleted file mode 100755 index 658308d8..00000000 --- a/public/js/scripts.js +++ /dev/null @@ -1 +0,0 @@ -console.log("Welcome to assignment 3!") \ No newline at end of file diff --git a/public/stylesheets/style.css b/public/stylesheets/style.css deleted file mode 100644 index 9453385b..00000000 --- a/public/stylesheets/style.css +++ /dev/null @@ -1,8 +0,0 @@ -body { - padding: 50px; - font: 14px "Lucida Grande", Helvetica, Arial, sans-serif; -} - -a { - color: #00B7FF; -} From 787c5dc2d53c5557b97faaee129147b21c6db4e8 Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a3-paris-lopez)" Date: Sun, 15 Sep 2019 21:47:22 +0000 Subject: [PATCH 134/191] =?UTF-8?q?=F0=9F=8C=B4=F0=9F=91=B8=20Checkpoint?= =?UTF-8?q?=20./app.js:6266626/433=20./info/authentication.js:6266626/3734?= =?UTF-8?q?=20./db.js:6266626/37?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.js | 14 +++++++- db.js | 2 +- info/authentication.js | 78 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 92 insertions(+), 2 deletions(-) create mode 100644 info/authentication.js diff --git a/app.js b/app.js index 0c90c316..350f9b93 100644 --- a/app.js +++ b/app.js @@ -2,8 +2,20 @@ const express = require('express') const app = express() const port = 3000 +const passport = require('passport'); +const authService = require('./info/authentication'); +authService.configurePassport(passport) -app.use(express.static('public')) +var db = require('./db'); + +// intialize passport +app.use(passport.initialize()); +// use express.session() before passport.session() +app.use(passport.session()); + + +// routes +app.use('/', db); app.listen(port, () => console.log(`Example app listening on port ${port}!`)) \ No newline at end of file diff --git a/db.js b/db.js index 6a30d4c4..4eaa2551 100644 --- a/db.js +++ b/db.js @@ -5,7 +5,7 @@ const LocalStrategy = require('passport-local').Strategy; const low = require('lowdb') const passport = require('passport'); -const authService = require('./services/authService'); +const authService = require('./info/authentication'); authService.configurePassport(passport) const router = require('express').Router(); diff --git a/info/authentication.js b/info/authentication.js new file mode 100644 index 00000000..e252aac0 --- /dev/null +++ b/info/authentication.js @@ -0,0 +1,78 @@ +var low = require('lowdb'); +var path = require('path'); +var LocalStrategy = require('passport-local').Strategy; +var passport = require('passport'); + +var db = low(path.join('data', 'db.json')); + +exports.signup = function signup(options, res) { + // get all values for the username that are in the database + var usernames = db.get('users').map('username').value() + // check if username is already taken + var usernameIsTaken = usernames.includes(options.username) + + // if username is already taken, show error + if (usernameIsTaken) { + return res.render(options.signUpTemplate, {errors: ['This username is already taken']}) + + // else create user + } else { + // save new user to database + db.get('users') + .push({ + username: options.username, + password: options.password + }) + .write() + + // redirect + res.redirect(options.successRedirectUrl) + } +} + +// configure passport +exports.configurePassport = function(passport) { + // Passport serializes and deserializes user instances to and from the session. + + // only the user ID is serialized and added to the session + passport.serializeUser(function(user, done) { + done(null, user.id); + }); + + // for every request, the id is used to find the user, which will be restored + // to req.user. + passport.deserializeUser(function(id, done) { + // find user in database + var user = db.get('users').find({id: id}).value() + + if(!user) { + done({ message: 'Invalid credentials.' }, null); + } else { + // the object is what will be available for 'request.user' + done(null, {id: user.id, username: user.username}) + } + }); + + // configures how to autheticate a user when they log in. + + // LocalStrategy uses username / password in the database for authentication. + passport.use(new LocalStrategy( + function(username, password, done) { + // look for user in database + var user = db.get('users').find({ username: username }).value() + + // if user not found, return error + if(!user) { + return done(null, false, { message: 'Invalid username & password.' }); + } + + // if passowrd don't match, return error + if(!(password === user.password)) { + return done(null, false, { message: 'Invalid username & password.' }); + } + + //else, if username and password match, return the user + return done(null, user) + } + )); +} \ No newline at end of file From 4ff1ac976885d131577e79e59c4f6365fc00888a Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a3-paris-lopez)" Date: Sun, 15 Sep 2019 21:58:43 +0000 Subject: [PATCH 135/191] =?UTF-8?q?=F0=9F=8C=B2=F0=9F=9A=95=20Checkpoint?= =?UTF-8?q?=20./db.js:6266626/1690=20./info/authentication.js:6266626/128?= =?UTF-8?q?=20./app.js:6266626/317?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.js | 6 ++++++ db.js | 7 ++++--- info/authentication.js | 5 ++++- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/app.js b/app.js index 350f9b93..6bcfb000 100644 --- a/app.js +++ b/app.js @@ -8,6 +8,8 @@ authService.configurePassport(passport) var db = require('./db'); +//app.set('view engine', 'ejs'); + // intialize passport app.use(passport.initialize()); // use express.session() before passport.session() @@ -17,5 +19,9 @@ app.use(passport.session()); // routes app.use('/', db); +app.get('/', (req, res) => + res.json({ error: err }) + ) + app.listen(port, () => console.log(`Example app listening on port ${port}!`)) \ No newline at end of file diff --git a/db.js b/db.js index 4eaa2551..c831c238 100644 --- a/db.js +++ b/db.js @@ -3,6 +3,8 @@ const bodyParser = require('body-parser'); const LocalStrategy = require('passport-local').Strategy; const low = require('lowdb') +const FileSync = require('lowdb/adapters/FileSync') +const adapter = new FileSync('db.json') const passport = require('passport'); const authService = require('./info/authentication'); @@ -10,12 +12,11 @@ authService.configurePassport(passport) const router = require('express').Router(); -const db = low('db.json') +const db = low(adapter) router.get('/', function(req, res) { - res.render('home') + res.render('index') }) - // display all books router.get('/books', function(req, res) { var books = db.get('books').value() diff --git a/info/authentication.js b/info/authentication.js index e252aac0..7e142e29 100644 --- a/info/authentication.js +++ b/info/authentication.js @@ -3,7 +3,10 @@ var path = require('path'); var LocalStrategy = require('passport-local').Strategy; var passport = require('passport'); -var db = low(path.join('data', 'db.json')); +const FileSync = require('lowdb/adapters/FileSync') +const adapter = new FileSync('db.json') + +var db = low(adapter); exports.signup = function signup(options, res) { // get all values for the username that are in the database From 6a3e846877b782b22967d0acde8e88327c141459 Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a3-paris-lopez)" Date: Sun, 15 Sep 2019 22:09:49 +0000 Subject: [PATCH 136/191] =?UTF-8?q?=F0=9F=A6=84=F0=9F=91=A1=20Checkpoint?= =?UTF-8?q?=20./app.js:6266626/3253=20./db.js:6266626/750?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.js | 28 +++++++++++++++++----------- db.js | 29 ----------------------------- 2 files changed, 17 insertions(+), 40 deletions(-) diff --git a/app.js b/app.js index 6bcfb000..2a89c0c3 100644 --- a/app.js +++ b/app.js @@ -1,14 +1,27 @@ +//express imports const express = require('express') const app = express() const port = 3000 +//passport imports const passport = require('passport'); -const authService = require('./info/authentication'); -authService.configurePassport(passport) +const bodyParser = require('body-parser'); +const LocalStrategy = require('passport-local').Strategy; + +//lowdb imports +const low = require('lowdb') +const FileSync = require('lowdb/adapters/FileSync') +const adapter = new FileSync('db.json') +const db = low(adapter); + +app.use(passport.initialize()); +app.use(passport.session()); + +app.use(express.static('public')) + + -var db = require('./db'); -//app.set('view engine', 'ejs'); // intialize passport app.use(passport.initialize()); @@ -16,12 +29,5 @@ app.use(passport.initialize()); app.use(passport.session()); -// routes -app.use('/', db); - -app.get('/', (req, res) => - res.json({ error: err }) - ) - app.listen(port, () => console.log(`Example app listening on port ${port}!`)) \ No newline at end of file diff --git a/db.js b/db.js index c831c238..e69de29b 100644 --- a/db.js +++ b/db.js @@ -1,29 +0,0 @@ -const path = require('path'); -const bodyParser = require('body-parser'); -const LocalStrategy = require('passport-local').Strategy; - -const low = require('lowdb') -const FileSync = require('lowdb/adapters/FileSync') -const adapter = new FileSync('db.json') - -const passport = require('passport'); -const authService = require('./info/authentication'); -authService.configurePassport(passport) - -const router = require('express').Router(); - -const db = low(adapter) - -router.get('/', function(req, res) { - res.render('index') -}) -// display all books -router.get('/books', function(req, res) { - var books = db.get('books').value() - var authors = db.get('authors').value() - - res.render('books', { books: books, authors: authors }) -}) - - -module.exports = router; \ No newline at end of file From 2a4e8345d9eb1e7fa85c6aa6e20ec610cf98668d Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a3-paris-lopez)" Date: Sun, 15 Sep 2019 22:21:49 +0000 Subject: [PATCH 137/191] =?UTF-8?q?=F0=9F=9A=B2=F0=9F=A4=96=20Checkpoint?= =?UTF-8?q?=20./server.js:6266626/1174?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db.js | 0 app.js => server.js | 18 ++++++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) delete mode 100644 db.js rename app.js => server.js (83%) diff --git a/db.js b/db.js deleted file mode 100644 index e69de29b..00000000 diff --git a/app.js b/server.js similarity index 83% rename from app.js rename to server.js index 2a89c0c3..5b4b34ab 100644 --- a/app.js +++ b/server.js @@ -1,11 +1,11 @@ //express imports const express = require('express') const app = express() +const bodyParser = require('body-parser'); const port = 3000 //passport imports const passport = require('passport'); -const bodyParser = require('body-parser'); const LocalStrategy = require('passport-local').Strategy; //lowdb imports @@ -14,10 +14,21 @@ const FileSync = require('lowdb/adapters/FileSync') const adapter = new FileSync('db.json') const db = low(adapter); +app.use(express.static('public')); +app.use(bodyParser.json()); + +//DATABASE +db.defaults({ users: [] }).write(); + + + + + + app.use(passport.initialize()); app.use(passport.session()); -app.use(express.static('public')) + @@ -28,6 +39,5 @@ app.use(passport.initialize()); // use express.session() before passport.session() app.use(passport.session()); +app.listen(port, () => console.log(`Example app listening on port ${port}!`)) - -app.listen(port, () => console.log(`Example app listening on port ${port}!`)) \ No newline at end of file From 8fa500da8bebfc1210c34b3f450a893d7d9b44e4 Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a3-paris-lopez)" Date: Sun, 15 Sep 2019 22:33:52 +0000 Subject: [PATCH 138/191] =?UTF-8?q?=F0=9F=8E=85=F0=9F=92=91=20Checkpoint?= =?UTF-8?q?=20./server.js:6266626/1036?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server.js | 38 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/server.js b/server.js index 5b4b34ab..beb6d69f 100644 --- a/server.js +++ b/server.js @@ -7,6 +7,7 @@ const port = 3000 //passport imports const passport = require('passport'); const LocalStrategy = require('passport-local').Strategy; +const session = require('express-session'); //lowdb imports const low = require('lowdb') @@ -15,11 +16,44 @@ const adapter = new FileSync('db.json') const db = low(adapter); app.use(express.static('public')); -app.use(bodyParser.json()); +//app.use(bodyParser.json()); //DATABASE db.defaults({ users: [] }).write(); - +let users = [] +var i; +for(i = 0; i > -1; i++) { + let user = db.get(users[$i]) +} + + + +//Password Authentication +passport.serializeUser((user, done) => done(null, user.username)) +passport.deserializeUser((username, done) => { + const user = users.find(u => u.username === username) + if (user !== undefined) { + done(null, user) + } else { + done(null, false, { message: 'user not found; session not restored' }) + } +}) +app.use(session({ secret: 'secret', resave: false, saveUninitialized: false })) +app.use(passport.initialize()) +app.use(passport.session()) +app.post('/test', function(req, res) { + console.log('authenticate with cookie?', req.user) + res.json({ status: 'success' }) +}) + +app.post( + '/login', + passport.authenticate('local'), + function(req, res) { + you = allUsers.find(__user => __user.username === req.user.username) + res.json({ status: true }) + } +) From d7720abfaf746e586e4dcb8a8623e30bcd6138ce Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a3-paris-lopez)" Date: Sun, 15 Sep 2019 22:45:57 +0000 Subject: [PATCH 139/191] =?UTF-8?q?=F0=9F=90=A3=F0=9F=8E=82=20Checkpoint?= =?UTF-8?q?=20./server.js:6266626/374=20./db.json:6266626/564?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db.json | 29 +++++---------- info/authentication.js | 81 ------------------------------------------ server.js | 16 +++++---- 3 files changed, 19 insertions(+), 107 deletions(-) delete mode 100644 info/authentication.js diff --git a/db.json b/db.json index 3b242a0e..27e645a2 100644 --- a/db.json +++ b/db.json @@ -1,28 +1,17 @@ { + "users": [ { - "username": "pllopez", - "password": "1234" + "username": "admin", + "password": "admin", + "level": "1", + "students": [] }, { - "username": "pllopez", - "password": "1234" - }, - { - "username": "pllopez", - "password": "1234" - }, - { - "username": "pllopez", - "password": "1234" - }, - { - "username": "pllopez", - "password": "1234" - }, - { - "username": "pllopez", - "password": "1234" + "username": "teacher1", + "password": "teacher2", + "level": "1", + "students": [] } ] } \ No newline at end of file diff --git a/info/authentication.js b/info/authentication.js deleted file mode 100644 index 7e142e29..00000000 --- a/info/authentication.js +++ /dev/null @@ -1,81 +0,0 @@ -var low = require('lowdb'); -var path = require('path'); -var LocalStrategy = require('passport-local').Strategy; -var passport = require('passport'); - -const FileSync = require('lowdb/adapters/FileSync') -const adapter = new FileSync('db.json') - -var db = low(adapter); - -exports.signup = function signup(options, res) { - // get all values for the username that are in the database - var usernames = db.get('users').map('username').value() - // check if username is already taken - var usernameIsTaken = usernames.includes(options.username) - - // if username is already taken, show error - if (usernameIsTaken) { - return res.render(options.signUpTemplate, {errors: ['This username is already taken']}) - - // else create user - } else { - // save new user to database - db.get('users') - .push({ - username: options.username, - password: options.password - }) - .write() - - // redirect - res.redirect(options.successRedirectUrl) - } -} - -// configure passport -exports.configurePassport = function(passport) { - // Passport serializes and deserializes user instances to and from the session. - - // only the user ID is serialized and added to the session - passport.serializeUser(function(user, done) { - done(null, user.id); - }); - - // for every request, the id is used to find the user, which will be restored - // to req.user. - passport.deserializeUser(function(id, done) { - // find user in database - var user = db.get('users').find({id: id}).value() - - if(!user) { - done({ message: 'Invalid credentials.' }, null); - } else { - // the object is what will be available for 'request.user' - done(null, {id: user.id, username: user.username}) - } - }); - - // configures how to autheticate a user when they log in. - - // LocalStrategy uses username / password in the database for authentication. - passport.use(new LocalStrategy( - function(username, password, done) { - // look for user in database - var user = db.get('users').find({ username: username }).value() - - // if user not found, return error - if(!user) { - return done(null, false, { message: 'Invalid username & password.' }); - } - - // if passowrd don't match, return error - if(!(password === user.password)) { - return done(null, false, { message: 'Invalid username & password.' }); - } - - //else, if username and password match, return the user - return done(null, user) - } - )); -} \ No newline at end of file diff --git a/server.js b/server.js index beb6d69f..bbd32aec 100644 --- a/server.js +++ b/server.js @@ -21,9 +21,15 @@ app.use(express.static('public')); //DATABASE db.defaults({ users: [] }).write(); let users = [] -var i; -for(i = 0; i > -1; i++) { - let user = db.get(users[$i]) +let i = 0; +while(true) { + let user = db.get('users[${i}]').value; + if(user !== null){ + users.push(user) + i++ + } + else + break } @@ -50,7 +56,7 @@ app.post( '/login', passport.authenticate('local'), function(req, res) { - you = allUsers.find(__user => __user.username === req.user.username) + let currentUser = users.find(usr => usr.username === req.user.username) res.json({ status: true }) } ) @@ -59,8 +65,6 @@ app.post( -app.use(passport.initialize()); -app.use(passport.session()); From 3395b48868fd4f1e420c1a9ff33b19d920e068ed Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a3-paris-lopez)" Date: Sun, 15 Sep 2019 22:57:58 +0000 Subject: [PATCH 140/191] =?UTF-8?q?=F0=9F=93=B7=F0=9F=90=80=20Checkpoint?= =?UTF-8?q?=20./package.json:6266626/9=20./db.json:6266626/1266=20./server?= =?UTF-8?q?.js:6266626/800?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db.json | 28 +++++++++++++++++++++++----- package.json | 8 ++++---- server.js | 34 +++++++--------------------------- 3 files changed, 34 insertions(+), 36 deletions(-) diff --git a/db.json b/db.json index 27e645a2..d159c4a1 100644 --- a/db.json +++ b/db.json @@ -1,17 +1,35 @@ { - "users": [ { "username": "admin", "password": "admin", - "level": "1", - "students": [] + "access": "1", + "students": [ + { + "name": "John Smith" + }, + { + "name": "Jane Doe" + } + ] }, { "username": "teacher1", - "password": "teacher2", - "level": "1", + "password": "teacher1", + "access": "1", "students": [] + }, + { + "username": "student1", + "password": "student1", + "access": "2", + "teacher": "John Smith" + }, + { + "username": "student2", + "password": "student2", + "access": "2", + "teacher": "Jane Doe" } ] } \ No newline at end of file diff --git a/package.json b/package.json index da1d01f5..6ccf8d6e 100755 --- a/package.json +++ b/package.json @@ -3,10 +3,9 @@ "version": "0.0.0", "private": true, "scripts": { - "start": "node app.js" + "start": "node server.js" }, "dependencies": { - "body-parser": "^1.19.0", "cookie-parser": "^1.4.4", "debug": "~2.6.9", "express": "^4.16.4", @@ -15,6 +14,7 @@ "lowdb": "^1.0.0", "morgan": "~1.9.1", "passport": "^0.4.0", - "passport-local": "^1.0.0" + "passport-local": "^1.0.0", + "body-parser": "^1.19.0" } -} +} \ No newline at end of file diff --git a/server.js b/server.js index bbd32aec..edbeac63 100644 --- a/server.js +++ b/server.js @@ -7,7 +7,6 @@ const port = 3000 //passport imports const passport = require('passport'); const LocalStrategy = require('passport-local').Strategy; -const session = require('express-session'); //lowdb imports const low = require('lowdb') @@ -16,13 +15,13 @@ const adapter = new FileSync('db.json') const db = low(adapter); app.use(express.static('public')); -//app.use(bodyParser.json()); +app.use(bodyParser.json()); -//DATABASE +// db.defaults({ users: [] }).write(); let users = [] let i = 0; -while(true) { +for(i = 0; i < 4; i++) { let user = db.get('users[${i}]').value; if(user !== null){ users.push(user) @@ -32,25 +31,19 @@ while(true) { break } - - //Password Authentication +app.use(passport.initialize()); +app.use(passport.session()); + passport.serializeUser((user, done) => done(null, user.username)) passport.deserializeUser((username, done) => { const user = users.find(u => u.username === username) if (user !== undefined) { done(null, user) } else { - done(null, false, { message: 'user not found; session not restored' }) + done(null, false, { message: 'User Not Found' }) } }) -app.use(session({ secret: 'secret', resave: false, saveUninitialized: false })) -app.use(passport.initialize()) -app.use(passport.session()) -app.post('/test', function(req, res) { - console.log('authenticate with cookie?', req.user) - res.json({ status: 'success' }) -}) app.post( '/login', @@ -64,18 +57,5 @@ app.post( - - - - - - - - -// intialize passport -app.use(passport.initialize()); -// use express.session() before passport.session() -app.use(passport.session()); - app.listen(port, () => console.log(`Example app listening on port ${port}!`)) From 3051c84ef62c94351d657bf1bcbd957606d93cdd Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a3-paris-lopez)" Date: Sun, 15 Sep 2019 23:09:09 +0000 Subject: [PATCH 141/191] =?UTF-8?q?=E2=9B=B4=E2=9C=8C=EF=B8=8F=20Checkpoin?= =?UTF-8?q?t=20./server.js:6266626/704=20./public/loginPage/index.js:62666?= =?UTF-8?q?26/865=20./public/loginPage/index.html:6266626/61?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/{app.html => homePage/home.html} | 0 public/{ => loginPage}/index.html | 1 + public/loginPage/index.js | 29 +++++++++++++++++++++++++ server.js | 16 ++++++++++---- 4 files changed, 42 insertions(+), 4 deletions(-) rename public/{app.html => homePage/home.html} (100%) rename public/{ => loginPage}/index.html (89%) create mode 100644 public/loginPage/index.js diff --git a/public/app.html b/public/homePage/home.html similarity index 100% rename from public/app.html rename to public/homePage/home.html diff --git a/public/index.html b/public/loginPage/index.html similarity index 89% rename from public/index.html rename to public/loginPage/index.html index dbf2cde3..cc77749c 100755 --- a/public/index.html +++ b/public/loginPage/index.html @@ -3,6 +3,7 @@ CS4241 Assignment 3 + diff --git a/public/loginPage/index.js b/public/loginPage/index.js new file mode 100644 index 00000000..bd262a86 --- /dev/null +++ b/public/loginPage/index.js @@ -0,0 +1,29 @@ +console.log("/index.js being read"); + +const login = document.getElementById('login') +const username = document.querySelector('#username') +const password = document.querySelector('#password') +const hint = document.getElementById('hint') + +const makeBody = function() { + const json = { username: username.value, password: password.value }; + return JSON.stringify(json); +}; +login.onclick = function(e) { + fetch('/login', { + method: 'POST', + body: makeBody(), + headers: { 'Content-Type': 'application/json' } + }) + .then(res => res.json()) + .then(res => { + console.log(res) + location.href = './tables/overview.html' + }) + .catch(err => { + console.log(err) + hint.innerHTML = 'Invalid Input' + }) + e.preventDefault(); + return false; +}; \ No newline at end of file diff --git a/server.js b/server.js index edbeac63..2f386630 100644 --- a/server.js +++ b/server.js @@ -32,12 +32,23 @@ for(i = 0; i < 4; i++) { } //Password Authentication +const myLocalStrategy = function(username, password, done) { + const user = users.find(usr => usr.username === username); + if (user === undefined) + return done(null, false, { message: 'User Not Found' }); + else if (user.password === password) + return done(null, { username, password }); + else + return done(null, false, { message: 'Password Incorrect' }); +}; + app.use(passport.initialize()); app.use(passport.session()); +passport.use(new LocalStrategy(myLocalStrategy)) passport.serializeUser((user, done) => done(null, user.username)) passport.deserializeUser((username, done) => { - const user = users.find(u => u.username === username) + let user = users.find(u => u.username === username) if (user !== undefined) { done(null, user) } else { @@ -54,8 +65,5 @@ app.post( } ) - - - app.listen(port, () => console.log(`Example app listening on port ${port}!`)) From 8e22771fea9f4391dd1408cd0864ba7b996665ac Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a3-paris-lopez)" Date: Sun, 15 Sep 2019 23:21:10 +0000 Subject: [PATCH 142/191] =?UTF-8?q?=F0=9F=8D=95=F0=9F=9A=A8=20Checkpoint?= =?UTF-8?q?=20./public/loginPage/index.js:6266626/3886=20./server.js:62666?= =?UTF-8?q?26/264=20./public/loginPage/index.html:6266626/66?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/loginPage/index.html | 6 +++--- public/loginPage/index.js | 31 +++++++++++++++---------------- server.js | 3 ++- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/public/loginPage/index.html b/public/loginPage/index.html index cc77749c..9e69929f 100755 --- a/public/loginPage/index.html +++ b/public/loginPage/index.html @@ -3,15 +3,15 @@ CS4241 Assignment 3 - +

-
diff --git a/public/loginPage/index.js b/public/loginPage/index.js index bd262a86..5071a3ff 100644 --- a/public/loginPage/index.js +++ b/public/loginPage/index.js @@ -1,29 +1,28 @@ -console.log("/index.js being read"); +console.log("javascript file: 'index.js' being read"); -const login = document.getElementById('login') const username = document.querySelector('#username') const password = document.querySelector('#password') -const hint = document.getElementById('hint') -const makeBody = function() { - const json = { username: username.value, password: password.value }; - return JSON.stringify(json); -}; -login.onclick = function(e) { - fetch('/login', { - method: 'POST', - body: makeBody(), - headers: { 'Content-Type': 'application/json' } +const loginAction = function(e) { + e.preventDefault() + const json = { username: username.value, password: password.value }; + const body = JSON.stringify(json); + fetch('/login', { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + body }) .then(res => res.json()) .then(res => { console.log(res) - location.href = './tables/overview.html' + location.href = './homePage/home.html' }) .catch(err => { console.log(err) - hint.innerHTML = 'Invalid Input' }) - e.preventDefault(); return false; -}; \ No newline at end of file +}; + + +const loginButton = document.getElementById('login'); +loginButton.onclick = loginAction; \ No newline at end of file diff --git a/server.js b/server.js index 2f386630..c63027f7 100644 --- a/server.js +++ b/server.js @@ -14,7 +14,8 @@ const FileSync = require('lowdb/adapters/FileSync') const adapter = new FileSync('db.json') const db = low(adapter); -app.use(express.static('public')); +const dir = "public/"; +app.use(express.static(dir + "loginPage")); app.use(bodyParser.json()); // From 3d9a6bf06dfd055d6d6dd92639e6fb58f12d9b0d Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a3-paris-lopez)" Date: Sun, 15 Sep 2019 23:32:31 +0000 Subject: [PATCH 143/191] =?UTF-8?q?=E2=9A=BD=EF=B8=8F=F0=9F=8F=81=20Checkp?= =?UTF-8?q?oint=20./public/loginPage/index.js:6266626/4083=20./public/logi?= =?UTF-8?q?nPage/index.html:6266626/4232?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/loginPage/index.html | 9 +++---- public/loginPage/index.js | 54 +++++++++++++++++++------------------ 2 files changed, 31 insertions(+), 32 deletions(-) diff --git a/public/loginPage/index.html b/public/loginPage/index.html index 9e69929f..14991ac3 100755 --- a/public/loginPage/index.html +++ b/public/loginPage/index.html @@ -3,7 +3,7 @@ CS4241 Assignment 3 - + @@ -15,11 +15,8 @@
- diff --git a/public/loginPage/index.js b/public/loginPage/index.js index 5071a3ff..a6075455 100644 --- a/public/loginPage/index.js +++ b/public/loginPage/index.js @@ -1,28 +1,30 @@ -console.log("javascript file: 'index.js' being read"); + const loginAction = function( e ) { + e.preventDefault() + const username = document.querySelector('#username') + const password = document.querySelector('#password') + + let json = { username: username.value, password: password.value }; + let body = JSON.stringify(json); + console.log(body) + fetch('/login', { + method: 'POST', + body: body, + headers: { 'Content-Type': 'application/json' } + }) + .then(res => res.json()) + .then(res => { + console.log(res) + location.href = './homePage/home.html' + }) + .catch(err => { + console.log(err) + }) + return false; + }; -const username = document.querySelector('#username') -const password = document.querySelector('#password') +window.onload = function() { + console.log("javascript file: 'index.js' being read"); -const loginAction = function(e) { - e.preventDefault() - const json = { username: username.value, password: password.value }; - const body = JSON.stringify(json); - fetch('/login', { - method: 'POST', - headers: { 'Content-Type': 'application/json' }, - body - }) - .then(res => res.json()) - .then(res => { - console.log(res) - location.href = './homePage/home.html' - }) - .catch(err => { - console.log(err) - }) - return false; -}; - - -const loginButton = document.getElementById('login'); -loginButton.onclick = loginAction; \ No newline at end of file + const loginButton = document.querySelector('login'); + loginButton.onclick = loginAction; +} \ No newline at end of file From d4a86227aee66df2e21ff1f62546b1d70bc45e60 Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a3-paris-lopez)" Date: Sun, 15 Sep 2019 23:45:20 +0000 Subject: [PATCH 144/191] =?UTF-8?q?=F0=9F=8E=A5=E2=9C=88=EF=B8=8F=20Checkp?= =?UTF-8?q?oint=20./public/loginPage/index.js:6266626/1824=20./public/logi?= =?UTF-8?q?nPage/index.html:6266626/3473?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/loginPage/index.html | 7 ++----- public/loginPage/index.js | 14 ++++++++------ 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/public/loginPage/index.html b/public/loginPage/index.html index 14991ac3..48c699b7 100755 --- a/public/loginPage/index.html +++ b/public/loginPage/index.html @@ -3,7 +3,7 @@ CS4241 Assignment 3 - + @@ -15,8 +15,5 @@
- + diff --git a/public/loginPage/index.js b/public/loginPage/index.js index a6075455..0d0f7ccc 100644 --- a/public/loginPage/index.js +++ b/public/loginPage/index.js @@ -1,5 +1,7 @@ const loginAction = function( e ) { e.preventDefault() + console.log("Button pushed") + const username = document.querySelector('#username') const password = document.querySelector('#password') @@ -22,9 +24,9 @@ return false; }; -window.onload = function() { - console.log("javascript file: 'index.js' being read"); - - const loginButton = document.querySelector('login'); - loginButton.onclick = loginAction; -} \ No newline at end of file + window.onload = function() { + console.log("index.html: javascript loading") + + const loginButton = document.querySelector('#login'); + loginButton.onclick = loginAction; + } \ No newline at end of file From cf079e84aaa421bcc887600120ea7383d6ab13d2 Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a3-paris-lopez)" Date: Sun, 15 Sep 2019 23:56:46 +0000 Subject: [PATCH 145/191] =?UTF-8?q?=F0=9F=A7=80=F0=9F=8D=9B=20Checkpoint?= =?UTF-8?q?=20./public/loginPage/index.js:6266626/13?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/loginPage/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/loginPage/index.js b/public/loginPage/index.js index 0d0f7ccc..bfbcfc5d 100644 --- a/public/loginPage/index.js +++ b/public/loginPage/index.js @@ -10,7 +10,7 @@ console.log(body) fetch('/login', { method: 'POST', - body: body, + body : body, headers: { 'Content-Type': 'application/json' } }) .then(res => res.json()) From 2f859443e08d0652ea37cc58a956aa4c46fb6b28 Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a3-paris-lopez)" Date: Mon, 16 Sep 2019 00:08:48 +0000 Subject: [PATCH 146/191] =?UTF-8?q?=F0=9F=8D=B5=F0=9F=97=BE=20Checkpoint?= =?UTF-8?q?=20./server.js:6266626/47=20./public/loginPage/index.js:6266626?= =?UTF-8?q?/87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/loginPage/index.js | 7 ++++--- server.js | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/public/loginPage/index.js b/public/loginPage/index.js index bfbcfc5d..0914487a 100644 --- a/public/loginPage/index.js +++ b/public/loginPage/index.js @@ -13,9 +13,10 @@ body : body, headers: { 'Content-Type': 'application/json' } }) - .then(res => res.json()) - .then(res => { - console.log(res) + .then(function( response ) { + return response.json()}) + .then(function(response) { + console.log(response) location.href = './homePage/home.html' }) .catch(err => { diff --git a/server.js b/server.js index c63027f7..47c1fc01 100644 --- a/server.js +++ b/server.js @@ -31,6 +31,7 @@ for(i = 0; i < 4; i++) { else break } +console.log("Users" + users) //Password Authentication const myLocalStrategy = function(username, password, done) { @@ -60,9 +61,9 @@ passport.deserializeUser((username, done) => { app.post( '/login', passport.authenticate('local'), - function(req, res) { - let currentUser = users.find(usr => usr.username === req.user.username) - res.json({ status: true }) + function(request, response) { + let currentUser = users.find(usr => usr.username === request.user.username) + response.json({ status: true }) } ) From 4aded974d16f842040063f472fc605e22e0f4267 Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a3-paris-lopez)" Date: Mon, 16 Sep 2019 00:20:47 +0000 Subject: [PATCH 147/191] =?UTF-8?q?=F0=9F=9B=A2=F0=9F=92=A0=20Checkpoint?= =?UTF-8?q?=20./public/loginPage/index.js:6266626/152=20./server.js:626662?= =?UTF-8?q?6/128?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/loginPage/index.js | 9 ++++----- server.js | 6 ++++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/public/loginPage/index.js b/public/loginPage/index.js index 0914487a..b98edf92 100644 --- a/public/loginPage/index.js +++ b/public/loginPage/index.js @@ -5,17 +5,16 @@ const username = document.querySelector('#username') const password = document.querySelector('#password') - let json = { username: username.value, password: password.value }; - let body = JSON.stringify(json); - console.log(body) + let body = { username: username.value, password: password.value }; + console.log(body); fetch('/login', { method: 'POST', - body : body, + body : JSON.stringify(body), headers: { 'Content-Type': 'application/json' } }) .then(function( response ) { return response.json()}) - .then(function(response) { + .then(function( response ) { console.log(response) location.href = './homePage/home.html' }) diff --git a/server.js b/server.js index 47c1fc01..793cce67 100644 --- a/server.js +++ b/server.js @@ -58,10 +58,12 @@ passport.deserializeUser((username, done) => { } }) -app.post( - '/login', +app.post( '/login', passport.authenticate('local'), function(request, response) { + console.log(request) + console.log(response) + let currentUser = users.find(usr => usr.username === request.user.username) response.json({ status: true }) } From 700dfff96e729006d1d71344aff7420319e18676 Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a3-paris-lopez)" Date: Mon, 16 Sep 2019 00:32:47 +0000 Subject: [PATCH 148/191] =?UTF-8?q?=F0=9F=90=87=F0=9F=99=8E=20Checkpoint?= =?UTF-8?q?=20./public/loginPage/index.js:6266626/817=20./public/homePage/?= =?UTF-8?q?home.html:6266626/1=20./server.js:6266626/14=20./public/index.j?= =?UTF-8?q?s:6266626/190?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/homePage/home.html | 1 - public/{loginPage => }/index.html | 0 public/{loginPage => }/index.js | 5 ++++- server.js | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) rename public/{loginPage => }/index.html (100%) rename public/{loginPage => }/index.js (89%) diff --git a/public/homePage/home.html b/public/homePage/home.html index bc39fab7..35984511 100644 --- a/public/homePage/home.html +++ b/public/homePage/home.html @@ -6,6 +6,5 @@ Name of Teacher - \ No newline at end of file diff --git a/public/loginPage/index.html b/public/index.html similarity index 100% rename from public/loginPage/index.html rename to public/index.html diff --git a/public/loginPage/index.js b/public/index.js similarity index 89% rename from public/loginPage/index.js rename to public/index.js index b98edf92..81907a65 100644 --- a/public/loginPage/index.js +++ b/public/index.js @@ -13,13 +13,16 @@ headers: { 'Content-Type': 'application/json' } }) .then(function( response ) { - return response.json()}) + return response.json() + console.log(response.json()) + }) .then(function( response ) { console.log(response) location.href = './homePage/home.html' }) .catch(err => { console.log(err) + }) return false; }; diff --git a/server.js b/server.js index 793cce67..59f1feaf 100644 --- a/server.js +++ b/server.js @@ -15,7 +15,7 @@ const adapter = new FileSync('db.json') const db = low(adapter); const dir = "public/"; -app.use(express.static(dir + "loginPage")); +app.use(express.static(dir)); app.use(bodyParser.json()); // From 8444a3b782ad1c3f6094f51e067bf1bd047f48c9 Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a3-paris-lopez)" Date: Mon, 16 Sep 2019 00:43:53 +0000 Subject: [PATCH 149/191] =?UTF-8?q?=F0=9F=96=90=F0=9F=8D=9D=20Checkpoint?= =?UTF-8?q?=20./public/index.js:6266626/329?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/index.js | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/public/index.js b/public/index.js index 81907a65..64fc1445 100644 --- a/public/index.js +++ b/public/index.js @@ -1,9 +1,7 @@ const loginAction = function( e ) { - e.preventDefault() - console.log("Button pushed") - const username = document.querySelector('#username') const password = document.querySelector('#password') + const state = document.querySelector('#state') let body = { username: username.value, password: password.value }; console.log(body); @@ -12,18 +10,19 @@ body : JSON.stringify(body), headers: { 'Content-Type': 'application/json' } }) - .then(function( response ) { - return response.json() - console.log(response.json()) + .then( response => { + response.json() }) - .then(function( response ) { + .then( response => { console.log(response) location.href = './homePage/home.html' }) .catch(err => { console.log(err) - + state.innerHTML = "Incorrect Username or Password"; }) + e.preventDefault() + return false; }; From 2a183e7fe3921776850339a7707334ae7e3ed9b5 Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a3-paris-lopez)" Date: Mon, 16 Sep 2019 00:55:50 +0000 Subject: [PATCH 150/191] =?UTF-8?q?=F0=9F=90=A2=F0=9F=91=A8=E2=80=8D?= =?UTF-8?q?=F0=9F=91=A8=E2=80=8D=F0=9F=91=A6=20Checkpoint=20./public/index?= =?UTF-8?q?.js:6266626/877=20./server.js:6266626/62?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/index.js | 18 +++++++++++------- server.js | 5 +---- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/public/index.js b/public/index.js index 64fc1445..6c521aca 100644 --- a/public/index.js +++ b/public/index.js @@ -1,9 +1,14 @@ - const loginAction = function( e ) { + + +const loginAction = function( e ) { + e.preventDefault() + console.log("Button pushed") + const username = document.querySelector('#username') const password = document.querySelector('#password') - const state = document.querySelector('#state') + const state = document.querySelector('#state') - let body = { username: username.value, password: password.value }; + const body = { username: username.value, password: password.value }; console.log(body); fetch('/login', { method: 'POST', @@ -11,7 +16,8 @@ headers: { 'Content-Type': 'application/json' } }) .then( response => { - response.json() + console.log(response) + return response.json() }) .then( response => { console.log(response) @@ -21,10 +27,8 @@ console.log(err) state.innerHTML = "Incorrect Username or Password"; }) - e.preventDefault() - return false; - }; +}; window.onload = function() { console.log("index.html: javascript loading") diff --git a/server.js b/server.js index 59f1feaf..af4d4375 100644 --- a/server.js +++ b/server.js @@ -61,10 +61,7 @@ passport.deserializeUser((username, done) => { app.post( '/login', passport.authenticate('local'), function(request, response) { - console.log(request) - console.log(response) - - let currentUser = users.find(usr => usr.username === request.user.username) + const currentUser = users.find(usr => usr.username === request.user.username) response.json({ status: true }) } ) From 165243914b40f2bf86420b8ea822400df2b3b337 Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a3-paris-lopez)" Date: Mon, 16 Sep 2019 01:07:56 +0000 Subject: [PATCH 151/191] =?UTF-8?q?=F0=9F=90=B7=F0=9F=9A=BF=20Checkpoint?= =?UTF-8?q?=20./server.js:6266626/1039=20./public/index.js:6266626/86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db.json | 3 ++- public/index.js | 9 ++++----- server.js | 26 +++++++++++++------------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/db.json b/db.json index d159c4a1..a4ea427e 100644 --- a/db.json +++ b/db.json @@ -31,5 +31,6 @@ "access": "2", "teacher": "Jane Doe" } - ] + ], + "allUsers": [] } \ No newline at end of file diff --git a/public/index.js b/public/index.js index 6c521aca..42116f86 100644 --- a/public/index.js +++ b/public/index.js @@ -2,7 +2,6 @@ const loginAction = function( e ) { e.preventDefault() - console.log("Button pushed") const username = document.querySelector('#username') const password = document.querySelector('#password') @@ -21,7 +20,7 @@ const loginAction = function( e ) { }) .then( response => { console.log(response) - location.href = './homePage/home.html' + response.location.href = './homePage/home.html' }) .catch(err => { console.log(err) @@ -30,9 +29,9 @@ const loginAction = function( e ) { return false; }; - window.onload = function() { +window.onload = function() { console.log("index.html: javascript loading") - + const loginButton = document.querySelector('#login'); loginButton.onclick = loginAction; - } \ No newline at end of file +} \ No newline at end of file diff --git a/server.js b/server.js index af4d4375..ce57a994 100644 --- a/server.js +++ b/server.js @@ -20,18 +20,18 @@ app.use(bodyParser.json()); // db.defaults({ users: [] }).write(); -let users = [] -let i = 0; -for(i = 0; i < 4; i++) { - let user = db.get('users[${i}]').value; - if(user !== null){ - users.push(user) - i++ - } - else - break -} -console.log("Users" + users) +let users +const occupyUsers = function() { + users = []; + let i = 0; + while (true) { + let user = db.get(`users[${i}]`).value(); + if (user) users.push(user) + else break + i++; + } +}; +occupyUsers(); //Password Authentication const myLocalStrategy = function(username, password, done) { @@ -50,7 +50,7 @@ passport.use(new LocalStrategy(myLocalStrategy)) passport.serializeUser((user, done) => done(null, user.username)) passport.deserializeUser((username, done) => { - let user = users.find(u => u.username === username) + let user = users.find(usr => usr.username === username) if (user !== undefined) { done(null, user) } else { From cb2b2ddc1c5f8a9d800eddd7a929f6c3ff2b0592 Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a3-paris-lopez)" Date: Mon, 16 Sep 2019 01:19:50 +0000 Subject: [PATCH 152/191] =?UTF-8?q?=F0=9F=95=B7=F0=9F=8C=94=20Checkpoint?= =?UTF-8?q?=20./server.js:6266626/46=20./public/index.js:6266626/9=20./pub?= =?UTF-8?q?lic/homePage/home.js:6266626/2106=20./public/homePage/home.html?= =?UTF-8?q?:6266626/97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/homePage/home.html | 4 ++++ public/homePage/home.js | 4 ++++ public/index.js | 2 +- server.js | 4 ++-- 4 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 public/homePage/home.js diff --git a/public/homePage/home.html b/public/homePage/home.html index 35984511..2fa9be1b 100644 --- a/public/homePage/home.html +++ b/public/homePage/home.html @@ -3,8 +3,12 @@ CS4241 Assignment 2 + Name of Teacher +

+ Hello +

\ No newline at end of file diff --git a/public/homePage/home.js b/public/homePage/home.js new file mode 100644 index 00000000..ed0648b3 --- /dev/null +++ b/public/homePage/home.js @@ -0,0 +1,4 @@ +window.onload = function() { + console.log("home.html: javascript loading") + +} \ No newline at end of file diff --git a/public/index.js b/public/index.js index 42116f86..4152b7ff 100644 --- a/public/index.js +++ b/public/index.js @@ -20,7 +20,7 @@ const loginAction = function( e ) { }) .then( response => { console.log(response) - response.location.href = './homePage/home.html' + location.href = './homePage/home.html' }) .catch(err => { console.log(err) diff --git a/server.js b/server.js index ce57a994..e2a4ea76 100644 --- a/server.js +++ b/server.js @@ -34,7 +34,7 @@ const occupyUsers = function() { occupyUsers(); //Password Authentication -const myLocalStrategy = function(username, password, done) { +const strategy = function(username, password, done) { const user = users.find(usr => usr.username === username); if (user === undefined) return done(null, false, { message: 'User Not Found' }); @@ -46,7 +46,7 @@ const myLocalStrategy = function(username, password, done) { app.use(passport.initialize()); app.use(passport.session()); -passport.use(new LocalStrategy(myLocalStrategy)) +passport.use(new LocalStrategy(strategy)) passport.serializeUser((user, done) => done(null, user.username)) passport.deserializeUser((username, done) => { From 39a3baa62dd5e913b6c183f687c0ee90ab620d11 Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a3-paris-lopez)" Date: Mon, 16 Sep 2019 01:43:59 +0000 Subject: [PATCH 153/191] =?UTF-8?q?=F0=9F=98=82=F0=9F=92=BC=20Checkpoint?= =?UTF-8?q?=20./public/homePage/home.html:6266626/120?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/homePage/home.html | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/public/homePage/home.html b/public/homePage/home.html index 2fa9be1b..6316b52f 100644 --- a/public/homePage/home.html +++ b/public/homePage/home.html @@ -1,14 +1,13 @@ - CS4241 Assignment 2 + Roster - Name of Teacher

- Hello + Name of Teacher

\ No newline at end of file From 97615726e9e9630364d21f395f24a965e5c01308 Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a3-paris-lopez)" Date: Mon, 16 Sep 2019 01:55:54 +0000 Subject: [PATCH 154/191] =?UTF-8?q?=F0=9F=94=8B=F0=9F=8E=80=20Checkpoint?= =?UTF-8?q?=20./public/homePage/home.html:6266626/856?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/homePage/home.html | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/public/homePage/home.html b/public/homePage/home.html index 6316b52f..2ed1eaed 100644 --- a/public/homePage/home.html +++ b/public/homePage/home.html @@ -3,11 +3,26 @@ Roster + + -

- Name of Teacher -

+ + + Student Name + DOB + Assignments + Final Grade + + + + + Active + Column content + Column content + Column content + + \ No newline at end of file From 6d59b280a1ca5e28d12e452153ceb4e244cac730 Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a3-paris-lopez)" Date: Mon, 16 Sep 2019 02:07:53 +0000 Subject: [PATCH 155/191] =?UTF-8?q?=F0=9F=8F=AF=F0=9F=8D=B4=20Checkpoint?= =?UTF-8?q?=20./public/homePage/home.html:6266626/4948=20./public/index.ht?= =?UTF-8?q?ml:6266626/5193?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/homePage/home.html | 68 +++++++++++++++++++++++++++------------ public/index.html | 30 +++++++++++------ 2 files changed, 69 insertions(+), 29 deletions(-) diff --git a/public/homePage/home.html b/public/homePage/home.html index 2ed1eaed..554128f3 100644 --- a/public/homePage/home.html +++ b/public/homePage/home.html @@ -1,28 +1,56 @@ - Roster + - - - + + + + + + Teacher Page - - - Student Name - DOB - Assignments - Final Grade - - - - - Active - Column content - Column content - Column content - - +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
#FirstLastFinal Grade
1MarkOtto90
2JacobThornton99
3Larrythe Bird100
+
+ + + + + + + + + \ No newline at end of file diff --git a/public/index.html b/public/index.html index 48c699b7..6ab8bd1c 100755 --- a/public/index.html +++ b/public/index.html @@ -1,19 +1,31 @@ - CS4241 Assignment 3 + + + + + + + - -
- -
- -
+
+
+
+ + +
+
+ + +
+
+ +
+
From 23dd7255c8c49bd4428bd609dcdf082bb2540116 Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a3-paris-lopez)" Date: Mon, 16 Sep 2019 02:18:55 +0000 Subject: [PATCH 156/191] =?UTF-8?q?=F0=9F=9A=9B=F0=9F=8C=AA=20Checkpoint?= =?UTF-8?q?=20./public/homePage/home.html:6266626/2541?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/homePage/home.html | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/public/homePage/home.html b/public/homePage/home.html index 554128f3..bbd21f77 100644 --- a/public/homePage/home.html +++ b/public/homePage/home.html @@ -11,9 +11,22 @@ Teacher Page -
- - +
+
+
+
+ +
+
+ +
+
+ + +
+
+
+ @@ -43,6 +56,7 @@
# First
+ From 5266ceb803a52991a2e3acdac9c4625aa2bdef9a Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a3-paris-lopez)" Date: Mon, 16 Sep 2019 02:29:56 +0000 Subject: [PATCH 157/191] =?UTF-8?q?=F0=9F=8E=84=F0=9F=90=99=20Checkpoint?= =?UTF-8?q?=20./public/homePage/home.html:6266626/2326?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/homePage/home.html | 23 +++++++++++++++++++++-- public/infoPage/studentInfo.html | 0 public/infoPage/studentInfo.js | 0 3 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 public/infoPage/studentInfo.html create mode 100644 public/infoPage/studentInfo.js diff --git a/public/homePage/home.html b/public/homePage/home.html index bbd21f77..e9b1ee6d 100644 --- a/public/homePage/home.html +++ b/public/homePage/home.html @@ -11,6 +11,23 @@ Teacher Page + +
@@ -20,15 +37,17 @@
+
+ +
-
- + diff --git a/public/infoPage/studentInfo.html b/public/infoPage/studentInfo.html new file mode 100644 index 00000000..e69de29b diff --git a/public/infoPage/studentInfo.js b/public/infoPage/studentInfo.js new file mode 100644 index 00000000..e69de29b From c8be71d5de0163f1aaed27fdfffe2c305c882fdd Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a3-paris-lopez)" Date: Mon, 16 Sep 2019 02:41:55 +0000 Subject: [PATCH 158/191] =?UTF-8?q?=F0=9F=8C=8F=F0=9F=90=B5=20Checkpoint?= =?UTF-8?q?=20./public/homePage/home.html:6266626/1315=20./public/homePage?= =?UTF-8?q?/home.css:6266626/500=20./public/index.css:6266626/77=20./publi?= =?UTF-8?q?c/index.html:6266626/119?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/homePage/home.css | 4 ++++ public/homePage/home.html | 23 +++++++---------------- public/index.css | 4 ++++ public/index.html | 5 +++-- 4 files changed, 18 insertions(+), 18 deletions(-) create mode 100644 public/homePage/home.css create mode 100644 public/index.css diff --git a/public/homePage/home.css b/public/homePage/home.css new file mode 100644 index 00000000..7c851cd0 --- /dev/null +++ b/public/homePage/home.css @@ -0,0 +1,4 @@ +.container { + margin-top: 10px; +} + diff --git a/public/homePage/home.html b/public/homePage/home.html index e9b1ee6d..6bddfb29 100644 --- a/public/homePage/home.html +++ b/public/homePage/home.html @@ -7,28 +7,17 @@ + Teacher Page - +
+

+ Class Roster +

@@ -43,6 +32,8 @@
+ +
#Student First Last Final Grade
diff --git a/public/index.css b/public/index.css new file mode 100644 index 00000000..968140b5 --- /dev/null +++ b/public/index.css @@ -0,0 +1,4 @@ +.container { + justify-content: center; +} + diff --git a/public/index.html b/public/index.html index 6ab8bd1c..3f6ca56e 100755 --- a/public/index.html +++ b/public/index.html @@ -7,12 +7,13 @@ - + + -
+
From 42fb43299cae01cb565725df774a29f832ed94d9 Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a3-paris-lopez)" Date: Mon, 16 Sep 2019 02:53:55 +0000 Subject: [PATCH 159/191] =?UTF-8?q?=F0=9F=94=91=F0=9F=90=99=20Checkpoint?= =?UTF-8?q?=20./public/index.html:6266626/641=20./public/index.css:6266626?= =?UTF-8?q?/137?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/index.css | 3 ++- public/index.html | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/public/index.css b/public/index.css index 968140b5..bce98ddc 100644 --- a/public/index.css +++ b/public/index.css @@ -1,4 +1,5 @@ .container { - justify-content: center; + align-self: center; + width: 40%; } diff --git a/public/index.html b/public/index.html index 3f6ca56e..302667b7 100755 --- a/public/index.html +++ b/public/index.html @@ -13,7 +13,7 @@ -
+
From da38e0af488a174c68d585a5b0d2d461ea101161 Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a3-paris-lopez)" Date: Mon, 16 Sep 2019 03:05:56 +0000 Subject: [PATCH 160/191] =?UTF-8?q?=F0=9F=94=91=F0=9F=8D=AA=20Checkpoint?= =?UTF-8?q?=20./public/index.css:6266626/42=20./public/index.html:6266626/?= =?UTF-8?q?975=20./public/homePage/home.html:6266626/147=20./public/homePa?= =?UTF-8?q?ge/home.js:6266626/1050?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/homePage/home.html | 9 ++++++--- public/homePage/home.js | 34 +++++++++++++++++++++++++++++++++- public/index.css | 2 +- public/index.html | 13 ++++++++++++- 4 files changed, 52 insertions(+), 6 deletions(-) diff --git a/public/homePage/home.html b/public/homePage/home.html index 6bddfb29..0f56f560 100644 --- a/public/homePage/home.html +++ b/public/homePage/home.html @@ -9,7 +9,10 @@ - Teacher Page + + + + Class Roster @@ -21,10 +24,10 @@

- +
- +
diff --git a/public/homePage/home.js b/public/homePage/home.js index ed0648b3..cb5f5681 100644 --- a/public/homePage/home.js +++ b/public/homePage/home.js @@ -1,4 +1,36 @@ + +const loginAction = function( e ) { + e.preventDefault() + + const username = document.querySelector('#first') + const password = document.querySelector('#last') + + const body = { username: username.value, password: password.value }; + console.log(body); + fetch('/login', { + method: 'POST', + body : JSON.stringify(body), + headers: { 'Content-Type': 'application/json' } + }) + .then( response => { + console.log(response) + return response.json() + }) + .then( response => { + console.log(response) + location.href = './homePage/home.html' + }) + .catch(err => { + console.log(err) + state.innerHTML = "Incorrect Username or Password"; + }) + return false; +}; + + window.onload = function() { - console.log("home.html: javascript loading") + console.log("home.html: javascript loading") + + const addButton = querySelector() } \ No newline at end of file diff --git a/public/index.css b/public/index.css index bce98ddc..549f73d3 100644 --- a/public/index.css +++ b/public/index.css @@ -1,5 +1,5 @@ .container { - align-self: center; width: 40%; + margin-top: 20px; } diff --git a/public/index.html b/public/index.html index 302667b7..36a0ccd6 100755 --- a/public/index.html +++ b/public/index.html @@ -11,10 +11,21 @@ + + Login Page -
+ + +
+ +
+

+ Teacher Login +

+
+
From e732d39345d22ab48c2fe76f6baf7f9423c96dbb Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a3-paris-lopez)" Date: Mon, 16 Sep 2019 03:17:55 +0000 Subject: [PATCH 161/191] =?UTF-8?q?=F0=9F=8D=99=F0=9F=91=9C=20Checkpoint?= =?UTF-8?q?=20./public/homePage/home.js:6266626/3073=20./public/index.js:6?= =?UTF-8?q?266626/13=20./public/homePage/home.html:6266626/1946=20./db.jso?= =?UTF-8?q?n:6266626/571?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db.json | 39 +++++++++++++++++------- public/homePage/home.html | 19 ++++++++++++ public/homePage/home.js | 63 +++++++++++++++++++++++---------------- public/index.js | 2 +- 4 files changed, 86 insertions(+), 37 deletions(-) diff --git a/db.json b/db.json index a4ea427e..d3e831f1 100644 --- a/db.json +++ b/db.json @@ -18,19 +18,36 @@ "password": "teacher1", "access": "1", "students": [] - }, + } + ], + "students": [ { - "username": "student1", - "password": "student1", - "access": "2", - "teacher": "John Smith" + "name": "John Smith", + "assignments": [ + { + "HW1": 90 + }, + { + "HW2": 45 + }, + { + "Test": 100 + } + ] }, { - "username": "student2", - "password": "student2", - "access": "2", - "teacher": "Jane Doe" + "name": "Jane Doe", + "assignments": [ + { + "HW1": 30 + }, + { + "HW2": 25 + }, + { + "Test": 30 + } + ] } - ], - "allUsers": [] + ] } \ No newline at end of file diff --git a/public/homePage/home.html b/public/homePage/home.html index 0f56f560..8de61fd8 100644 --- a/public/homePage/home.html +++ b/public/homePage/home.html @@ -45,6 +45,9 @@

+ + + @@ -53,18 +56,34 @@

+ + + +
First Last Final GradeDelete Student
Mark Otto 90 + +
2 Jacob Thornton 99 + +
3 Larry the Bird 100 + +
diff --git a/public/homePage/home.js b/public/homePage/home.js index cb5f5681..96e85e55 100644 --- a/public/homePage/home.js +++ b/public/homePage/home.js @@ -1,36 +1,49 @@ -const loginAction = function( e ) { + + + + + + +const occupyTable = function() { + +} + + + +const addStudent = function( e ) { e.preventDefault() + console.log("Add Student") - const username = document.querySelector('#first') - const password = document.querySelector('#last') + const firstName = document.querySelector('#first') + const lastName = document.querySelector('#last') + + var start = document.querySelector(".boardsection[data-board='"+ +"'] .tasklist") + + var first = document.createTextNode(firstName) + var last = document.createTextNode(lastName) + var divNode = document.createElement("div") + var breakNode = document.createElement("br") + var breakNode1 = document.createElement("br") + divNode.setAttribute('id', index) + divNode.appendChild(timeNode) + divNode.appendChild(breakNode1) + divNode.appendChild(textNode) + + dayCol.appendChild(divNode) + dayCol.appendChild(breakNode) + - const body = { username: username.value, password: password.value }; - console.log(body); - fetch('/login', { - method: 'POST', - body : JSON.stringify(body), - headers: { 'Content-Type': 'application/json' } - }) - .then( response => { - console.log(response) - return response.json() - }) - .then( response => { - console.log(response) - location.href = './homePage/home.html' - }) - .catch(err => { - console.log(err) - state.innerHTML = "Incorrect Username or Password"; - }) - return false; }; window.onload = function() { - console.log("home.html: javascript loading") + console.log("home.html: javascript loaded") + + occupyTable(); + - const addButton = querySelector() + const addButton = document.querySelector("#addStudent"); + addButton.onclick = addStudent } \ No newline at end of file diff --git a/public/index.js b/public/index.js index 4152b7ff..5437e6a3 100644 --- a/public/index.js +++ b/public/index.js @@ -30,7 +30,7 @@ const loginAction = function( e ) { }; window.onload = function() { - console.log("index.html: javascript loading") + console.log("index.html: javascript loaded") const loginButton = document.querySelector('#login'); loginButton.onclick = loginAction; From 121fe683afee45803745a8819e9d03429b8f0cec Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a3-paris-lopez)" Date: Mon, 16 Sep 2019 03:29:55 +0000 Subject: [PATCH 162/191] =?UTF-8?q?=F0=9F=9A=A5=F0=9F=91=AD=20Checkpoint?= =?UTF-8?q?=20./public/homePage/home.js:6266626/1198=20./db.json:6266626/1?= =?UTF-8?q?6=20./public/homePage/home.html:6266626/956?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/homePage/home.html | 35 +---------------------------------- public/homePage/home.js | 38 +++++++++++++++++++++++++++++++------- 2 files changed, 32 insertions(+), 41 deletions(-) diff --git a/public/homePage/home.html b/public/homePage/home.html index 8de61fd8..3882f495 100644 --- a/public/homePage/home.html +++ b/public/homePage/home.html @@ -51,40 +51,7 @@

- - 1 - Mark - Otto - 90 - - - - - - - 2 - Jacob - Thornton - 99 - - - - - - 3 - Larry - the Bird - 100 - - - - +

diff --git a/public/homePage/home.js b/public/homePage/home.js index 96e85e55..f5eb483b 100644 --- a/public/homePage/home.js +++ b/public/homePage/home.js @@ -18,14 +18,38 @@ const addStudent = function( e ) { const firstName = document.querySelector('#first') const lastName = document.querySelector('#last') - var start = document.querySelector(".boardsection[data-board='"+ +"'] .tasklist") + var start = document.querySelector("thead") + var row = document.createElement("tr") + - var first = document.createTextNode(firstName) - var last = document.createTextNode(lastName) - var divNode = document.createElement("div") - var breakNode = document.createElement("br") - var breakNode1 = document.createElement("br") - divNode.setAttribute('id', index) + var first = document.createTextNode(firstName) + var last = document.createTextNode(lastName) + var grade = document.createTextNode("100") + + var cell_firstName = document.createElement("td").appendChild(first) + var cell_lastName = document.createElement("td").appendChild(last) + var cell_grade = document.createElement("td").appendChild(grade) + var cell_grade = document.createElement("td").appendChild(grade) + + + + + /* + + 1 + Mark + Otto + 90 + + + + + + */ + + divNode.setAttribute('id') divNode.appendChild(timeNode) divNode.appendChild(breakNode1) divNode.appendChild(textNode) From 83e1e19df4556b13480d3bd7a8c5f2e72d3c1114 Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a3-paris-lopez)" Date: Mon, 16 Sep 2019 03:41:53 +0000 Subject: [PATCH 163/191] =?UTF-8?q?=F0=9F=92=B5=F0=9F=9A=93=20Checkpoint?= =?UTF-8?q?=20./public/homePage/home.js:6266626/2115?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/homePage/home.js | 42 +++++++++++++++++++++++++---------------- 1 file changed, 26 insertions(+), 16 deletions(-) diff --git a/public/homePage/home.js b/public/homePage/home.js index f5eb483b..a70bc044 100644 --- a/public/homePage/home.js +++ b/public/homePage/home.js @@ -21,19 +21,36 @@ const addStudent = function( e ) { var start = document.querySelector("thead") var row = document.createElement("tr") - var first = document.createTextNode(firstName) var last = document.createTextNode(lastName) var grade = document.createTextNode("100") - - var cell_firstName = document.createElement("td").appendChild(first) - var cell_lastName = document.createElement("td").appendChild(last) - var cell_grade = document.createElement("td").appendChild(grade) - var cell_grade = document.createElement("td").appendChild(grade) - + var button = document.createElement("button") + button.setAttribute('type', "button") + button.setAttribute('class', "close") + button.setAttribute('aria-label', "close") + var button_content = document.createElement("span") + button_content.setAttribute('aria-hidden', "true") + var button_text = document.createTextNode('×') + button_content.appendChild(button_text) + button.appendChild(button_content) + var cell_fn = document.createElement("td") + var cell_ln = document.createElement("td") + var cell_grd = document.createElement("td") + var cell_btn = document.createElement("td") - + + var cell_firstName = cell_fn.appendChild(first) + var cell_lastName = cell_ln.appendChild(last) + var cell_grade = cell_grd.appendChild(grade) + var cell_button = cell_btn.appendChild(button) + + row.appendChild(cell_firstName) + row.appendChild(cell_lastName) + row.appendChild(cell_grade) + row.appendChild(cell_button) + start.appendChild(row) + /* 1 @@ -48,14 +65,7 @@ const addStudent = function( e ) { */ - - divNode.setAttribute('id') - divNode.appendChild(timeNode) - divNode.appendChild(breakNode1) - divNode.appendChild(textNode) - - dayCol.appendChild(divNode) - dayCol.appendChild(breakNode) + }; From 9382af0faa6da4e0e53815b1de424fefe5a29268 Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a3-paris-lopez)" Date: Mon, 16 Sep 2019 03:52:55 +0000 Subject: [PATCH 164/191] =?UTF-8?q?=F0=9F=8F=B5=F0=9F=92=92=20Checkpoint?= =?UTF-8?q?=20./public/homePage/home.js:6266626/458=20./public/homePage/ho?= =?UTF-8?q?me.html:6266626/2093?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/homePage/home.html | 13 +++++++++++-- public/homePage/home.js | 10 +++++----- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/public/homePage/home.html b/public/homePage/home.html index 3882f495..d6cc482f 100644 --- a/public/homePage/home.html +++ b/public/homePage/home.html @@ -41,16 +41,25 @@

- + - + + + + + +
StudentDelete Student First Last Final GradeDelete Student
+ + MarkOtto90
diff --git a/public/homePage/home.js b/public/homePage/home.js index a70bc044..f03d800e 100644 --- a/public/homePage/home.js +++ b/public/homePage/home.js @@ -15,12 +15,13 @@ const addStudent = function( e ) { e.preventDefault() console.log("Add Student") - const firstName = document.querySelector('#first') - const lastName = document.querySelector('#last') + const firstName = document.querySelector('#first').value + const lastName = document.querySelector('#last').value - var start = document.querySelector("thead") + var start = document.querySelector("tbody") var row = document.createElement("tr") + var del = document.createTextNode("1") var first = document.createTextNode(firstName) var last = document.createTextNode(lastName) var grade = document.createTextNode("100") @@ -34,11 +35,10 @@ const addStudent = function( e ) { button_content.appendChild(button_text) button.appendChild(button_content) + var cell_btn = document.createElement("th") var cell_fn = document.createElement("td") var cell_ln = document.createElement("td") var cell_grd = document.createElement("td") - var cell_btn = document.createElement("td") - var cell_firstName = cell_fn.appendChild(first) var cell_lastName = cell_ln.appendChild(last) From 0218c35058cf9d4628aefb67dae805e7d10544af Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a3-paris-lopez)" Date: Mon, 16 Sep 2019 04:04:53 +0000 Subject: [PATCH 165/191] =?UTF-8?q?=F0=9F=8C=98=E2=9B=91=20Checkpoint=20./?= =?UTF-8?q?public/homePage/home.html:6266626/562=20./public/homePage/home.?= =?UTF-8?q?js:6266626/1173?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/homePage/home.html | 16 +++++++--------- public/homePage/home.js | 26 ++++++++++++-------------- 2 files changed, 19 insertions(+), 23 deletions(-) diff --git a/public/homePage/home.html b/public/homePage/home.html index d6cc482f..9abe75ed 100644 --- a/public/homePage/home.html +++ b/public/homePage/home.html @@ -41,24 +41,22 @@

- - - + - + + + - - + diff --git a/public/homePage/home.js b/public/homePage/home.js index f03d800e..02a8afcb 100644 --- a/public/homePage/home.js +++ b/public/homePage/home.js @@ -29,22 +29,20 @@ const addStudent = function( e ) { button.setAttribute('type', "button") button.setAttribute('class', "close") button.setAttribute('aria-label', "close") - var button_content = document.createElement("span") - button_content.setAttribute('aria-hidden', "true") - var button_text = document.createTextNode('×') - button_content.appendChild(button_text) - button.appendChild(button_content) + button.innerHTML = '×' - var cell_btn = document.createElement("th") - var cell_fn = document.createElement("td") - var cell_ln = document.createElement("td") - var cell_grd = document.createElement("td") - - var cell_firstName = cell_fn.appendChild(first) - var cell_lastName = cell_ln.appendChild(last) - var cell_grade = cell_grd.appendChild(grade) + var cell_firstName = document.createElement("td") + cell_firstName.innerHTML = firstName + cell_firstName.setAttribute("scope", "row") + var cell_lastName = document.createElement("td") + cell_lastName.innerHTML = lastName + var cell_grade = document.createElement("td") + cell_grade.innerHTML = "100" + var cell_button = document.createElement("td") var cell_button = cell_btn.appendChild(button) + + row.appendChild(cell_firstName) row.appendChild(cell_lastName) row.appendChild(cell_grade) @@ -52,7 +50,7 @@ const addStudent = function( e ) { start.appendChild(row) /* - + From 00461d5d856380e8e7be9c905635a128a22c135a Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a3-paris-lopez)" Date: Mon, 16 Sep 2019 04:15:54 +0000 Subject: [PATCH 166/191] =?UTF-8?q?=F0=9F=98=BA=E2=9A=BE=EF=B8=8F=20Checkp?= =?UTF-8?q?oint=20./public/homePage/home.js:6266626/1883=20./public/homePa?= =?UTF-8?q?ge/home.html:6266626/189=20./db.json:6266626/114=20./public/ind?= =?UTF-8?q?ex.js:6266626/24=20./server.js:6266626/773?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db.json | 6 ++- public/homePage/home.html | 6 --- public/homePage/home.js | 94 +++++++++++++++++---------------------- public/index.js | 6 +-- server.js | 31 +++++++++++++ 5 files changed, 79 insertions(+), 64 deletions(-) diff --git a/db.json b/db.json index d3e831f1..b9c13ec8 100644 --- a/db.json +++ b/db.json @@ -22,7 +22,8 @@ ], "students": [ { - "name": "John Smith", + "first": "John", + "last": "Smith", "assignments": [ { "HW1": 90 @@ -36,7 +37,8 @@ ] }, { - "name": "Jane Doe", + "first": "Jane", + "last": "Doe", "assignments": [ { "HW1": 30 diff --git a/public/homePage/home.html b/public/homePage/home.html index 9abe75ed..da73ed5f 100644 --- a/public/homePage/home.html +++ b/public/homePage/home.html @@ -44,7 +44,6 @@

- @@ -52,11 +51,6 @@

- diff --git a/public/homePage/home.js b/public/homePage/home.js index 02a8afcb..42bb9fb7 100644 --- a/public/homePage/home.js +++ b/public/homePage/home.js @@ -6,65 +6,53 @@ const occupyTable = function() { + //const body = { first: first.value, last: last.value, grade: grade.value }; + //console.log(body); + fetch('/update', { + method: 'GET', + headers: { 'Content-Type': 'application/json' } + }) + .then( response => { + console.log(response) + return response.json() + }) + .then( response => { + console.log(response) + location.href = './homePage/home.html' + }) + .catch(err => { + console.log(err) + state.innerHTML = "Incorrect Username or Password"; + }) + return false; + } const addStudent = function( e ) { - e.preventDefault() - console.log("Add Student") - - const firstName = document.querySelector('#first').value - const lastName = document.querySelector('#last').value - - var start = document.querySelector("tbody") - var row = document.createElement("tr") - - var del = document.createTextNode("1") - var first = document.createTextNode(firstName) - var last = document.createTextNode(lastName) - var grade = document.createTextNode("100") - var button = document.createElement("button") - button.setAttribute('type', "button") - button.setAttribute('class', "close") - button.setAttribute('aria-label', "close") - button.innerHTML = '×' - - var cell_firstName = document.createElement("td") - cell_firstName.innerHTML = firstName - cell_firstName.setAttribute("scope", "row") - var cell_lastName = document.createElement("td") - cell_lastName.innerHTML = lastName - var cell_grade = document.createElement("td") - cell_grade.innerHTML = "100" - var cell_button = document.createElement("td") - var cell_button = cell_btn.appendChild(button) - - - - row.appendChild(cell_firstName) - row.appendChild(cell_lastName) - row.appendChild(cell_grade) - row.appendChild(cell_button) - start.appendChild(row) - - /* - - - - - - - - - */ - - + e.preventDefault() + console.log("Add Student") + + const firstName = document.querySelector('#first').value + const lastName = document.querySelector('#last').value + + var start = document.querySelector("tbody") + var row = document.createElement("tr") + + var cell_firstName = document.createElement("td") + cell_firstName.innerHTML = firstName + cell_firstName.setAttribute("scope", "row") + var cell_lastName = document.createElement("td") + cell_lastName.innerHTML = lastName + var cell_grade = document.createElement("td") + cell_grade.innerHTML = "100" + + row.appendChild(cell_firstName) + row.appendChild(cell_lastName) + row.appendChild(cell_grade) + start.appendChild(row) }; diff --git a/public/index.js b/public/index.js index 5437e6a3..f5a8ec9d 100644 --- a/public/index.js +++ b/public/index.js @@ -3,11 +3,11 @@ const loginAction = function( e ) { e.preventDefault() - const username = document.querySelector('#username') - const password = document.querySelector('#password') + const username = document.querySelector('#username').value + const password = document.querySelector('#password').value const state = document.querySelector('#state') - const body = { username: username.value, password: password.value }; + const body = { username: username, password: password }; console.log(body); fetch('/login', { method: 'POST', diff --git a/server.js b/server.js index e2a4ea76..4d14535b 100644 --- a/server.js +++ b/server.js @@ -66,5 +66,36 @@ app.post( '/login', } ) +app.get( '/update', function(request, response) { + let body = request.body + + db.get('students') +} + + passport.authenticate('local'), + function(request, response) { + const currentUser = users.find(usr => usr.username === request.user.username) + response.json({ status: true }) + } +) + + +/* +app.post('/update', function(request, response) { + let body = request.body + + db.get('allUsers') + .find({ username: you.username }) + .assign({ + name: body.name, + age: body.age, + gender: body.gender, + hobby: body.hobby + }).write() + copyAllUsers() + response.writeHead(200, { 'Content-Type': 'application/json' }); + response.end(); +*/ + app.listen(port, () => console.log(`Example app listening on port ${port}!`)) From 870a5dfbdbd8ea6fb5fb40bedfd30d1f4da4e447 Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a3-paris-lopez)" Date: Mon, 16 Sep 2019 04:27:53 +0000 Subject: [PATCH 167/191] =?UTF-8?q?=E2=9B=88=F0=9F=90=9E=20Checkpoint=20./?= =?UTF-8?q?server.js:6266626/802=20./public/homePage/home.js:6266626/3698?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/homePage/home.js | 80 +++++++++++++++++------------------------ server.js | 39 ++++++++++++-------- 2 files changed, 56 insertions(+), 63 deletions(-) diff --git a/public/homePage/home.js b/public/homePage/home.js index 42bb9fb7..988fd57c 100644 --- a/public/homePage/home.js +++ b/public/homePage/home.js @@ -1,66 +1,50 @@ - - - - - - - -const occupyTable = function() { - //const body = { first: first.value, last: last.value, grade: grade.value }; - //console.log(body); - fetch('/update', { - method: 'GET', - headers: { 'Content-Type': 'application/json' } - }) - .then( response => { - console.log(response) - return response.json() - }) - .then( response => { - console.log(response) - location.href = './homePage/home.html' - }) - .catch(err => { - console.log(err) - state.innerHTML = "Incorrect Username or Password"; - }) - return false; - - +const occupyStudents = function( e ) { + fetch('/occupyStudents', { + method: 'GET', + headers: { 'Content-Type': 'application/json' } + }).then(function(response) { + console.log(response) + return response.json(); + }).then(function(data) { + let students = data; + + } - const addStudent = function( e ) { e.preventDefault() console.log("Add Student") + + const firstName = document.querySelector('#first').value + const lastName = document.querySelector('#last').value - const firstName = document.querySelector('#first').value - const lastName = document.querySelector('#last').value + var start = document.querySelector("tbody") + var row = document.createElement("tr") - var start = document.querySelector("tbody") - var row = document.createElement("tr") + var cell_firstName = document.createElement("td") + cell_firstName.innerHTML = firstName + cell_firstName.setAttribute("scope", "row") + var cell_lastName = document.createElement("td") + cell_lastName.innerHTML = lastName + var cell_grade = document.createElement("td") + cell_grade.innerHTML = "100" - var cell_firstName = document.createElement("td") - cell_firstName.innerHTML = firstName - cell_firstName.setAttribute("scope", "row") - var cell_lastName = document.createElement("td") - cell_lastName.innerHTML = lastName - var cell_grade = document.createElement("td") - cell_grade.innerHTML = "100" + row.appendChild(cell_firstName) + row.appendChild(cell_lastName) + row.appendChild(cell_grade) + start.appendChild(row) + +} + + - row.appendChild(cell_firstName) - row.appendChild(cell_lastName) - row.appendChild(cell_grade) - start.appendChild(row) - -}; window.onload = function() { console.log("home.html: javascript loaded") - occupyTable(); + const addButton = document.querySelector("#addStudent"); diff --git a/server.js b/server.js index 4d14535b..7a0caee6 100644 --- a/server.js +++ b/server.js @@ -18,7 +18,7 @@ const dir = "public/"; app.use(express.static(dir)); app.use(bodyParser.json()); -// +//Teacher Users db.defaults({ users: [] }).write(); let users const occupyUsers = function() { @@ -32,6 +32,21 @@ const occupyUsers = function() { } }; occupyUsers(); +//Students +db.defaults({ users: [] }).write(); +let students +const occupyStudents = function() { + students = []; + let i = 0; + while (true) { + let student = db.get(`students[${i}]`).value(); + if (student) users.push(student) + else break + i++; + } +}; +occupyStudents(); + //Password Authentication const strategy = function(username, password, done) { @@ -63,24 +78,18 @@ app.post( '/login', function(request, response) { const currentUser = users.find(usr => usr.username === request.user.username) response.json({ status: true }) - } -) + }) -app.get( '/update', function(request, response) { - let body = request.body - - db.get('students') -} - - passport.authenticate('local'), - function(request, response) { - const currentUser = users.find(usr => usr.username === request.user.username) - response.json({ status: true }) - } -) +app.get( '/occupyStudents', function(request, response) { + response.send(students) +}) /* +app.get('/refreshAll', function(request, response) { + response.send(allUsers); +}); + app.post('/update', function(request, response) { let body = request.body From a8f2ce855a50bc9e2accfaf45e1e7123bb8e521e Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a3-paris-lopez)" Date: Mon, 16 Sep 2019 04:39:53 +0000 Subject: [PATCH 168/191] =?UTF-8?q?=F0=9F=91=A3=E2=9D=A3=EF=B8=8F=20Checkp?= =?UTF-8?q?oint=20./public/homePage/home.js:6266626/1829=20./server.js:626?= =?UTF-8?q?6626/689?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/homePage/home.js | 39 +++++++++++++++++++++++---------------- server.js | 12 +++++++++++- 2 files changed, 34 insertions(+), 17 deletions(-) diff --git a/public/homePage/home.js b/public/homePage/home.js index 988fd57c..af08b52b 100644 --- a/public/homePage/home.js +++ b/public/homePage/home.js @@ -9,6 +9,7 @@ const occupyStudents = function( e ) { let students = data; + }) } @@ -18,22 +19,31 @@ const addStudent = function( e ) { const firstName = document.querySelector('#first').value const lastName = document.querySelector('#last').value + const grade = "100" + + fetch('/addStudent', + + ) + + fillStudentInfo(firstName, lastName, grade); +} - var start = document.querySelector("tbody") - var row = document.createElement("tr") +const fillStudentInfo = function( firstName, lastName, grade ) { + var start = document.querySelector("tbody") + var row = document.createElement("tr") - var cell_firstName = document.createElement("td") - cell_firstName.innerHTML = firstName - cell_firstName.setAttribute("scope", "row") - var cell_lastName = document.createElement("td") - cell_lastName.innerHTML = lastName - var cell_grade = document.createElement("td") - cell_grade.innerHTML = "100" + var cell_firstName = document.createElement("td") + cell_firstName.innerHTML = firstName + cell_firstName.setAttribute("scope", "row") + var cell_lastName = document.createElement("td") + cell_lastName.innerHTML = lastName + var cell_grade = document.createElement("td") + cell_grade.innerHTML = grade - row.appendChild(cell_firstName) - row.appendChild(cell_lastName) - row.appendChild(cell_grade) - start.appendChild(row) + row.appendChild(cell_firstName) + row.appendChild(cell_lastName) + row.appendChild(cell_grade) + start.appendChild(row) } @@ -44,9 +54,6 @@ const addStudent = function( e ) { window.onload = function() { console.log("home.html: javascript loaded") - - - const addButton = document.querySelector("#addStudent"); addButton.onclick = addStudent diff --git a/server.js b/server.js index 7a0caee6..d5627543 100644 --- a/server.js +++ b/server.js @@ -73,6 +73,8 @@ passport.deserializeUser((username, done) => { } }) + +//POST REQUESTS app.post( '/login', passport.authenticate('local'), function(request, response) { @@ -80,6 +82,14 @@ app.post( '/login', response.json({ status: true }) }) +app.post( '/addStudent', function( request, response ) { + db.get('students').push(request.body).write(); + occupyStudents(); + response.writeHead(200, { 'Content-Type': 'application/json' }); + response.end(); +}) + +//GET REQUESTS app.get( '/occupyStudents', function(request, response) { response.send(students) }) @@ -106,5 +116,5 @@ app.post('/update', function(request, response) { response.end(); */ -app.listen(port, () => console.log(`Example app listening on port ${port}!`)) +app.listen(port, () => console.log('Example app listening on port ${port}!')) From 30d5648eabddddc7bb7d3bd40c8898b3b9b6f049 Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a3-paris-lopez)" Date: Mon, 16 Sep 2019 04:51:53 +0000 Subject: [PATCH 169/191] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=E2=98=82=EF=B8=8F=20?= =?UTF-8?q?Checkpoint=20./db.json:6266626/1089=20./server.js:6266626/151?= =?UTF-8?q?=20./public/homePage/home.js:6266626/365?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db.json | 62 +++++++++++++++++++---------------------- public/homePage/home.js | 16 ++++++++--- server.js | 7 +++-- 3 files changed, 44 insertions(+), 41 deletions(-) diff --git a/db.json b/db.json index b9c13ec8..c27a8b0e 100644 --- a/db.json +++ b/db.json @@ -6,10 +6,34 @@ "access": "1", "students": [ { - "name": "John Smith" + "first": "John", + "last": "Smith", + "assignments": [ + { + "HW1": 90 + }, + { + "HW2": 45 + }, + { + "Test": 100 + } + ] }, { - "name": "Jane Doe" + "first": "Jane", + "last": "Doe", + "assignments": [ + { + "HW1": 30 + }, + { + "HW2": 25 + }, + { + "Test": 30 + } + ] } ] }, @@ -20,36 +44,6 @@ "students": [] } ], - "students": [ - { - "first": "John", - "last": "Smith", - "assignments": [ - { - "HW1": 90 - }, - { - "HW2": 45 - }, - { - "Test": 100 - } - ] - }, - { - "first": "Jane", - "last": "Doe", - "assignments": [ - { - "HW1": 30 - }, - { - "HW2": 25 - }, - { - "Test": 30 - } - ] - } - ] + "stud": [], + "students": [] } \ No newline at end of file diff --git a/public/homePage/home.js b/public/homePage/home.js index af08b52b..6f603a88 100644 --- a/public/homePage/home.js +++ b/public/homePage/home.js @@ -19,11 +19,19 @@ const addStudent = function( e ) { const firstName = document.querySelector('#first').value const lastName = document.querySelector('#last').value - const grade = "100" + const grade = 100 - fetch('/addStudent', - - ) + const info = {first: firstName, last: lastName, grade: grade} + const body = JSON.stringify(info) + + fetch('/addStudent', { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + body + }).then(function( response ) { + + }) + fillStudentInfo(firstName, lastName, grade); } diff --git a/server.js b/server.js index d5627543..b88ee66c 100644 --- a/server.js +++ b/server.js @@ -33,6 +33,7 @@ const occupyUsers = function() { }; occupyUsers(); //Students +/* db.defaults({ users: [] }).write(); let students const occupyStudents = function() { @@ -46,6 +47,7 @@ const occupyStudents = function() { } }; occupyStudents(); +*/ //Password Authentication @@ -83,15 +85,14 @@ app.post( '/login', }) app.post( '/addStudent', function( request, response ) { - db.get('students').push(request.body).write(); - occupyStudents(); + db.get('users').push(request.body).write(); + occupyUsers() response.writeHead(200, { 'Content-Type': 'application/json' }); response.end(); }) //GET REQUESTS app.get( '/occupyStudents', function(request, response) { - response.send(students) }) From 0c15b1bb0c09f78b5cabe5244133f9c9672e6781 Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a3-paris-lopez)" Date: Mon, 16 Sep 2019 05:03:55 +0000 Subject: [PATCH 170/191] =?UTF-8?q?=F0=9F=91=9B=E2=9B=A9=20Checkpoint=20./?= =?UTF-8?q?public/homePage/home.js:6266626/139=20./server.js:6266626/38?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/homePage/home.js | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/public/homePage/home.js b/public/homePage/home.js index 6f603a88..1973ed96 100644 --- a/public/homePage/home.js +++ b/public/homePage/home.js @@ -29,11 +29,10 @@ const addStudent = function( e ) { headers: { 'Content-Type': 'application/json' }, body }).then(function( response ) { - + fillStudentInfo(firstName, lastName, grade); }) - - - fillStudentInfo(firstName, lastName, grade); + + return false; } const fillStudentInfo = function( firstName, lastName, grade ) { @@ -55,10 +54,6 @@ const fillStudentInfo = function( firstName, lastName, grade ) { } - - - - window.onload = function() { console.log("home.html: javascript loaded") From 5468d38e28f757186c1836828a13a24bf0684a7d Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a3-paris-lopez)" Date: Mon, 16 Sep 2019 05:15:52 +0000 Subject: [PATCH 171/191] =?UTF-8?q?=F0=9F=8D=88=F0=9F=8D=80=20Checkpoint?= =?UTF-8?q?=20./public/homePage/home.js:6266626/178=20./server.js:6266626/?= =?UTF-8?q?778?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/homePage/home.js | 9 +++++++-- server.js | 7 +++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/public/homePage/home.js b/public/homePage/home.js index 1973ed96..66eb6b92 100644 --- a/public/homePage/home.js +++ b/public/homePage/home.js @@ -7,8 +7,11 @@ const occupyStudents = function( e ) { return response.json(); }).then(function(data) { let students = data; - - + let i + for(i = 0; i < students.length; i++) { + + } + console.log(students) }) } @@ -56,6 +59,8 @@ const fillStudentInfo = function( firstName, lastName, grade ) { window.onload = function() { console.log("home.html: javascript loaded") + occupyStudents() + const addButton = document.querySelector("#addStudent"); addButton.onclick = addStudent diff --git a/server.js b/server.js index b88ee66c..c68fe768 100644 --- a/server.js +++ b/server.js @@ -93,6 +93,13 @@ app.post( '/addStudent', function( request, response ) { //GET REQUESTS app.get( '/occupyStudents', function(request, response) { + var studentList = [] + let i + for(i = 0; i < users.length; i++){ + } + studentList = users[0].students + response.send(studentList) + }) From ac0b55b7b5709a974bd40766eea887288728e0fb Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a3-paris-lopez)" Date: Mon, 16 Sep 2019 05:26:52 +0000 Subject: [PATCH 172/191] =?UTF-8?q?=E2=9A=BE=EF=B8=8F=F0=9F=8D=8B=20Checkp?= =?UTF-8?q?oint=20./public/homePage/home.js:6266626/971?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/homePage/home.js | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/public/homePage/home.js b/public/homePage/home.js index 66eb6b92..74e5bead 100644 --- a/public/homePage/home.js +++ b/public/homePage/home.js @@ -9,12 +9,27 @@ const occupyStudents = function( e ) { let students = data; let i for(i = 0; i < students.length; i++) { - + let student = students[i] + let assignments = student.assignments + var grade = gradeCalc(assignments) + fillStudentInfo(student.first, student.last, grade) } console.log(students) }) } +const gradeCalc = function( assignments ) { + var sum = 0 + var keys = assignments.keys() + console.log(keys[0]) + + let i + for(i = 0; i < assignments.length; i++){ + sum += assignments[i]["HW1"] + } + return sum/assignments.length +} + const addStudent = function( e ) { e.preventDefault() From 28932ae7eb599a098f7ef0bcd0798b7c90b8d734 Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a3-paris-lopez)" Date: Mon, 16 Sep 2019 05:38:52 +0000 Subject: [PATCH 173/191] =?UTF-8?q?=F0=9F=8F=A1=F0=9F=92=84=20Checkpoint?= =?UTF-8?q?=20./public/homePage/home.js:6266626/453=20./public/homePage/ho?= =?UTF-8?q?me.html:6266626/112=20./server.js:6266626/12?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db.json | 15 +++++++++++++++ public/homePage/home.html | 6 ------ public/homePage/home.js | 16 +++++++++------- server.js | 2 +- 4 files changed, 25 insertions(+), 14 deletions(-) diff --git a/db.json b/db.json index c27a8b0e..06a4f489 100644 --- a/db.json +++ b/db.json @@ -34,6 +34,16 @@ "Test": 30 } ] + }, + { + "first": "paris", + "last": "lopez", + "grade": 0 + }, + { + "first": "adam", + "last": "croteau", + "grade": 0 } ] }, @@ -42,6 +52,11 @@ "password": "teacher1", "access": "1", "students": [] + }, + { + "first": "Paris", + "last": "Lopez", + "grade": 100 } ], "stud": [], diff --git a/public/homePage/home.html b/public/homePage/home.html index da73ed5f..247bdc60 100644 --- a/public/homePage/home.html +++ b/public/homePage/home.html @@ -47,12 +47,6 @@

- - - - - -
Delete Student First Last Final GradeDelete Student
+ MarkOtto90 - - MarkOtto90
1 Mark OttoFirst Last Final GradeDelete Student
Mark Otto 90 - -
1MarkOtto90 - -
MarkOtto90

diff --git a/public/homePage/home.js b/public/homePage/home.js index 74e5bead..33b61e9a 100644 --- a/public/homePage/home.js +++ b/public/homePage/home.js @@ -20,14 +20,15 @@ const occupyStudents = function( e ) { const gradeCalc = function( assignments ) { var sum = 0 - var keys = assignments.keys() - console.log(keys[0]) - let i - for(i = 0; i < assignments.length; i++){ - sum += assignments[i]["HW1"] + if(assignments) { + for(i = 0; i < assignments.length; i++){ + sum += parseInt(Object.values(assignments[i])) + } + return (sum/assignments.length).toFixed(2) } - return sum/assignments.length + else + return 0 } @@ -37,7 +38,7 @@ const addStudent = function( e ) { const firstName = document.querySelector('#first').value const lastName = document.querySelector('#last').value - const grade = 100 + const grade = 0 const info = {first: firstName, last: lastName, grade: grade} const body = JSON.stringify(info) @@ -47,6 +48,7 @@ const addStudent = function( e ) { headers: { 'Content-Type': 'application/json' }, body }).then(function( response ) { + console.log(response) fillStudentInfo(firstName, lastName, grade); }) diff --git a/server.js b/server.js index c68fe768..80c7bf49 100644 --- a/server.js +++ b/server.js @@ -85,7 +85,7 @@ app.post( '/login', }) app.post( '/addStudent', function( request, response ) { - db.get('users').push(request.body).write(); + db.get('users[0].students').push(request.body).write(); occupyUsers() response.writeHead(200, { 'Content-Type': 'application/json' }); response.end(); From 015386352a3a4f32456a26c57757ac9e44c2717a Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a3-paris-lopez)" Date: Mon, 16 Sep 2019 05:49:52 +0000 Subject: [PATCH 174/191] =?UTF-8?q?=F0=9F=8F=80=F0=9F=8E=B8=20Checkpoint?= =?UTF-8?q?=20./server.js:6266626/2=20./public/homePage/home.js:6266626/52?= =?UTF-8?q?0=20./public/infoPage/studentInfo.html:6266626/3090=20./public/?= =?UTF-8?q?homePage/home.html:6266626/443?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/homePage/home.html | 5 +++++ public/homePage/home.js | 2 ++ public/infoPage/studentInfo.html | 33 ++++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+) diff --git a/public/homePage/home.html b/public/homePage/home.html index 247bdc60..6c87087f 100644 --- a/public/homePage/home.html +++ b/public/homePage/home.html @@ -60,5 +60,10 @@

+ \ No newline at end of file diff --git a/public/homePage/home.js b/public/homePage/home.js index 33b61e9a..20258b9b 100644 --- a/public/homePage/home.js +++ b/public/homePage/home.js @@ -1,3 +1,5 @@ + + const occupyStudents = function( e ) { fetch('/occupyStudents', { method: 'GET', diff --git a/public/infoPage/studentInfo.html b/public/infoPage/studentInfo.html index e69de29b..95da2657 100644 --- a/public/infoPage/studentInfo.html +++ b/public/infoPage/studentInfo.html @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + Class Roster + + + +

+ Student +

+ + + + + + + + + + + + \ No newline at end of file From 79455f3f2904848e84ee27a5869b6c76bab06da7 Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a3-paris-lopez)" Date: Mon, 16 Sep 2019 06:01:55 +0000 Subject: [PATCH 175/191] =?UTF-8?q?=F0=9F=91=9E=F0=9F=90=9F=20Checkpoint?= =?UTF-8?q?=20./public/homePage/home.html:6266626/743=20./public/homePage/?= =?UTF-8?q?home.js:6266626/1572?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/homePage/home.html | 13 +++++++++---- public/homePage/home.js | 16 ++++++++++++++-- 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/public/homePage/home.html b/public/homePage/home.html index 6c87087f..6d8336ff 100644 --- a/public/homePage/home.html +++ b/public/homePage/home.html @@ -44,6 +44,7 @@

First Last Final Grade + Delete @@ -60,10 +61,14 @@

- \ No newline at end of file diff --git a/public/homePage/home.js b/public/homePage/home.js index 20258b9b..cb9c3f3b 100644 --- a/public/homePage/home.js +++ b/public/homePage/home.js @@ -68,10 +68,20 @@ const fillStudentInfo = function( firstName, lastName, grade ) { cell_lastName.innerHTML = lastName var cell_grade = document.createElement("td") cell_grade.innerHTML = grade - + var cell_del = document.createElement("td") + var button = document.createElement("button") + button.setAttribute('type', 'delete') + button.setAttribute('class', 'btn btn-default btn-sm') + cell_del.appendChild(button) + /* + +

+
+ +
+ +
+ + + + + + + + + +
AssignmentGrade
+
+ From 56f6e5c9a2abb8243731d2522e1649f932f5d233 Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a3-paris-lopez)" Date: Mon, 16 Sep 2019 07:38:00 +0000 Subject: [PATCH 183/191] =?UTF-8?q?=F0=9F=95=B5=F0=9F=91=9A=20Checkpoint?= =?UTF-8?q?=20./public/infoPage/studentInfo.html:6266626/214=20./public/in?= =?UTF-8?q?foPage/studentInfo.js:6266626/2798=20./server.js:6266626/243?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/infoPage/studentInfo.html | 9 +++--- public/infoPage/studentInfo.js | 48 ++++++++++++++++++++++++++++++++ server.js | 13 +++++++-- 3 files changed, 63 insertions(+), 7 deletions(-) diff --git a/public/infoPage/studentInfo.html b/public/infoPage/studentInfo.html index d25fc801..479e5f8f 100644 --- a/public/infoPage/studentInfo.html +++ b/public/infoPage/studentInfo.html @@ -7,7 +7,7 @@ - + @@ -23,13 +23,13 @@

- +
- +
- +
@@ -41,6 +41,7 @@

Assignment Grade + Delete diff --git a/public/infoPage/studentInfo.js b/public/infoPage/studentInfo.js index e69de29b..640feed5 100644 --- a/public/infoPage/studentInfo.js +++ b/public/infoPage/studentInfo.js @@ -0,0 +1,48 @@ + + +const addAssignment = function( e ) { + e.preventDefault() + console.log("Add Assignment") + + const assignment = document.querySelector('#assignment').value + const grade = document.querySelector('#grade').value + + const info = {assignment: assignment, grade: grade} + const body = JSON.stringify(info) + + fetch('/addAssignment', { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + body + }).then(function( response ) { + console.log(response) + fillAssignment(assignment, grade); + }) + + return false; +} + +const fillAssignment = function( assignment, grade ) { + var start = document.querySelector("tbody") + var row = document.createElement("tr") + + var cell_assignment = document.createElement("td") + cell_assignment.innerHTML = assignment + cell_assignment.setAttribute("scope", "row") + var cell_grade = document.createElement("td") + cell_grade.innerHTML = grade + var cell_del = document.createElement("td") + + var button = document.createElement("button") + button.setAttribute('type', 'delete') + button.setAttribute('class', 'btn btn-danger remove') + button.innerHTML = "Delete" + cell_del.appendChild(button) + + row.appendChild(cell_assignment) + row.appendChild(cell_grade) + row.appendChild(cell_del) + + start.appendChild(row) + +} \ No newline at end of file diff --git a/server.js b/server.js index f9677794..55b03792 100644 --- a/server.js +++ b/server.js @@ -79,10 +79,10 @@ passport.deserializeUser((username, done) => { //POST REQUESTS app.post( '/login', passport.authenticate('local'), - function(request, response) { + function( request, response ) { const currentUser = users.find(usr => usr.username === request.user.username) response.json({ status: true }) - }) +}) app.post( '/addStudent', function( request, response ) { db.get('users[0].students').push(request.body).write(); @@ -91,13 +91,20 @@ app.post( '/addStudent', function( request, response ) { response.end(); }) -app.post( '/deleteStudent', function(request, response) { +app.post( '/deleteStudent', function( request, response ) { db.get('users[0].students').remove({ first: request.body.first, last: request.body.last }).write() occupyUsers() response.writeHead(200, { 'Content-Type': 'application/json' }); response.end(); }) +app.post( '/addAssignment', function( request, response ) { + db.get('users[0].students').push(request.body).write(); + occupyUsers() + response.writeHead(200, { 'Content-Type': 'application/json' }); + response.end(); +}) + //GET REQUESTS app.get( '/occupyStudents', function(request, response) { var studentList = [] From 8fa9aadd8686b024bf80e91aa0076a876fa6587c Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a3-paris-lopez)" Date: Mon, 16 Sep 2019 07:50:01 +0000 Subject: [PATCH 184/191] =?UTF-8?q?=F0=9F=8D=8E=F0=9F=90=80=20Checkpoint?= =?UTF-8?q?=20./server.js:6266626/211=20./public/homePage/home.js:6266626/?= =?UTF-8?q?10=20./public/infoPage/studentInfo.js:6266626/2188=20./public/h?= =?UTF-8?q?omePage/home.html:6266626/6=20./README.md:6266626/1316?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 20 ++++++++------------ public/homePage/home.html | 2 +- public/homePage/home.js | 2 -- public/infoPage/studentInfo.js | 29 ++++++++++++++++++++++++++++- server.js | 13 +++++++++++-- 5 files changed, 48 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index face3a02..09ad1229 100755 --- a/README.md +++ b/README.md @@ -1,22 +1,18 @@ Assignment 2 - Short Stack: Basic Two-tier Web Application using HTML/CSS/JS and Node.js === -https://paristhecity-a2-paris-lopez.glitch.me/ +https://paristhecity-a3-paris-lopez.glitch.me/ + +Based on my experience with creating math problems and designs for mathspring.org, an intelligent tutoring system, +I decided to create a login page and roster for a set of teachers. While there are many ways to elaborate on my +origin + ## Technical Achievements - **Tech Achievement 1**: I completed the technical aspect of the assignment by creating an array of objects to alter during the use of the webpage. ### Design/Evaluation Achievements -- **Design Achievement 1**: Shown in `style.css`, there are many style aspects creating a -type of 'dark mode' of a Daily Scheduler. In `style.css` there is formatting necessary to make -the page readable and aesthetically pleasing. Addiotionally there are key frames that allow -the last day of the week to slide in rather than the entire line jerking to the left. -The user can add an event with the Add to Schedule button as well as change the day with the -next day button. This next day button allows the user to line up the day of the week with a white -border to better exemplify the current day. Tasks are deleted as the day resets to the end of the week. +- **Design Achievement 1**: -- **Design Achievement 2**: In my experience, calendars often fail to highlight the priority of -works due to their static format. By creating a sliding calendar, the user can see the current day, -update tasks, and have a better sense of urgency as tasks literally draw closer. As of right now there -is no way to delete tasks individually, but if I had had extra time I would have devoted it to creating that feature. +- **Design Achievement 2**: diff --git a/public/homePage/home.html b/public/homePage/home.html index 740888af..0e55de9b 100644 --- a/public/homePage/home.html +++ b/public/homePage/home.html @@ -74,7 +74,7 @@

}); $(function () { $("table").on("click", ".info", function () { - window.location.href = "public/infoPage/studentInfo.html" + window.location.href = "/infoPage/studentInfo.html" }); }); }); diff --git a/public/homePage/home.js b/public/homePage/home.js index 3799f740..da2a5f1f 100644 --- a/public/homePage/home.js +++ b/public/homePage/home.js @@ -119,6 +119,4 @@ window.onload = function() { addButton.onclick = addStudent } -/* - */ diff --git a/public/infoPage/studentInfo.js b/public/infoPage/studentInfo.js index 640feed5..a28f5217 100644 --- a/public/infoPage/studentInfo.js +++ b/public/infoPage/studentInfo.js @@ -1,4 +1,22 @@ - +const occupyAssignments = function( e ) { + e.preventDefault() + fetch('/occupyAssignments', { + method: 'GET', + headers: { 'Content-Type': 'application/json' } + }).then(function(response) { + console.log(response) + return response.json(); + }).then(function(data) { + let assignments = data; + let i + for(i = 0; i < assignments.length; i++) { + let assignment = assignments[i] + //let assignments = student.assignments + fillAssignment(assignment, assignment.value()) + } + console.log(assignments) + }) +} const addAssignment = function( e ) { e.preventDefault() @@ -45,4 +63,13 @@ const fillAssignment = function( assignment, grade ) { start.appendChild(row) +} + +window.onload = function() { + console.log("home.html: javascript loaded") + //occupyStudents() + + const addButton = document.querySelector("#addAssignment"); + addButton.onclick = addAssignment + } \ No newline at end of file diff --git a/server.js b/server.js index 55b03792..2e1eb48b 100644 --- a/server.js +++ b/server.js @@ -99,14 +99,23 @@ app.post( '/deleteStudent', function( request, response ) { }) app.post( '/addAssignment', function( request, response ) { - db.get('users[0].students').push(request.body).write(); + db.get('users[0].students[0]').push(request.body).write(); occupyUsers() response.writeHead(200, { 'Content-Type': 'application/json' }); response.end(); }) //GET REQUESTS -app.get( '/occupyStudents', function(request, response) { +app.get( '/occupyStudents', function( request, response ) { + var studentList = [] + let i + for(i = 0; i < users.length; i++){ + } + studentList = users[0].students + response.send(studentList) +}) + +app.get( '/occupyAssignments', function( request, response ) { var studentList = [] let i for(i = 0; i < users.length; i++){ From 2de6355d83926556671ee6637b804a8e01e09c82 Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a3-paris-lopez)" Date: Mon, 16 Sep 2019 08:01:03 +0000 Subject: [PATCH 185/191] =?UTF-8?q?=F0=9F=8E=96=F0=9F=8D=9C=20Checkpoint?= =?UTF-8?q?=20./README.md:6266626/1771?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 09ad1229..207fd6f8 100755 --- a/README.md +++ b/README.md @@ -5,14 +5,25 @@ https://paristhecity-a3-paris-lopez.glitch.me/ Based on my experience with creating math problems and designs for mathspring.org, an intelligent tutoring system, I decided to create a login page and roster for a set of teachers. While there are many ways to elaborate on my -origin +original plan, I did not have enough time to explore all of my options for this page. I would have liked to have built +a page where several users could log-in and look at their roster, as well as the grades that accompany each student. +The teacher would be able to remove students from their class and add new students. When the 'information' button +is clicked, the teacher can add grades and assignments to the student chosen. + +Because the database, password serveice, and server required a lot of time to get started, I found myself with less time +than intended to piece together my design. With the remaining time I was able to build a login page, as well +as the beginnings of a student roster and list of assignments. Students can be added and removed from the list, +and the more information button brings the user to the list of assignments. Preferably, there will have been ## Technical Achievements - **Tech Achievement 1**: I completed the technical aspect of the assignment -by creating an array of objects to alter during the use of the webpage. +by creating a lowdb database that stores various information and provides it to the web page when necessary. ### Design/Evaluation Achievements -- **Design Achievement 1**: +- **Design Achievement 1**: Prior to the creation of the web application, I put great thought into my ideas and design. +I found the CSS Template to be greatly limiting, however I was still able to create a clean user interface appropriate +for its purpose. I prepared my web application with some simple drawings to sketch out my ideas on paper. With a +prototype in hand, I moved onto building the web app itself. - **Design Achievement 2**: From 3b159fa4488852e2e4156701fe47bcadccbcd8c9 Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a3-paris-lopez)" Date: Mon, 16 Sep 2019 08:12:59 +0000 Subject: [PATCH 186/191] =?UTF-8?q?=F0=9F=9A=A9=F0=9F=8D=AB=20Checkpoint?= =?UTF-8?q?=20./README.md:6266626/913?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 207fd6f8..59420f9d 100755 --- a/README.md +++ b/README.md @@ -8,12 +8,18 @@ I decided to create a login page and roster for a set of teachers. While there a original plan, I did not have enough time to explore all of my options for this page. I would have liked to have built a page where several users could log-in and look at their roster, as well as the grades that accompany each student. The teacher would be able to remove students from their class and add new students. When the 'information' button -is clicked, the teacher can add grades and assignments to the student chosen. +is clicked, the teacher can add grades and assignments to the student chosen. Preferably, there would have been +a navigation bar at the top of the page to switch between assignments and account information for the target student. Because the database, password serveice, and server required a lot of time to get started, I found myself with less time than intended to piece together my design. With the remaining time I was able to build a login page, as well as the beginnings of a student roster and list of assignments. Students can be added and removed from the list, -and the more information button brings the user to the list of assignments. Preferably, there will have been +and the more information button brings the user to the list of assignments. The teacher can add assignments as well +as remove them. Though, I was unable to complete more of my original ideas beyond these features, the web app still +provides a few options for the user and does so in a responsive and clear manner. + +Username: admin
+Password: admin ## Technical Achievements From f111a88c6cdd1ce63d91c0e750687e1f95bd0424 Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a3-paris-lopez)" Date: Mon, 16 Sep 2019 12:54:50 +0000 Subject: [PATCH 187/191] A3 --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 59420f9d..88b45e8a 100755 --- a/README.md +++ b/README.md @@ -11,13 +11,14 @@ The teacher would be able to remove students from their class and add new studen is clicked, the teacher can add grades and assignments to the student chosen. Preferably, there would have been a navigation bar at the top of the page to switch between assignments and account information for the target student. -Because the database, password serveice, and server required a lot of time to get started, I found myself with less time +Because the database, password service, and server required a lot of time to get started, I found myself with less time than intended to piece together my design. With the remaining time I was able to build a login page, as well as the beginnings of a student roster and list of assignments. Students can be added and removed from the list, and the more information button brings the user to the list of assignments. The teacher can add assignments as well as remove them. Though, I was unable to complete more of my original ideas beyond these features, the web app still provides a few options for the user and does so in a responsive and clear manner. +Login information:
Username: admin
Password: admin From fb0a1cf40c9e1aed44280d33e55924b8f0c637d9 Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a3-paris-lopez)" Date: Mon, 16 Sep 2019 13:03:13 +0000 Subject: [PATCH 188/191] =?UTF-8?q?=F0=9F=97=BD=F0=9F=8E=96=20Checkpoint?= =?UTF-8?q?=20./README.md:6266626/25=20./db.json:6266626/313=20./server.js?= =?UTF-8?q?:6266626/84=20./public/infoPage/studentInfo.js:6266626/170?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db.json | 15 +++++++++++++++ public/infoPage/studentInfo.js | 8 ++++---- server.js | 6 +++--- 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/db.json b/db.json index 5cbd1810..b7288ac0 100644 --- a/db.json +++ b/db.json @@ -19,6 +19,21 @@ "Test": 30 } ] + }, + { + "first": "John", + "last": "Smith", + "assignments": [ + { + "HW1": 100 + }, + { + "HW2": 95 + }, + { + "Test": 70 + } + ] } ] }, diff --git a/public/infoPage/studentInfo.js b/public/infoPage/studentInfo.js index a28f5217..589b46b3 100644 --- a/public/infoPage/studentInfo.js +++ b/public/infoPage/studentInfo.js @@ -1,5 +1,4 @@ -const occupyAssignments = function( e ) { - e.preventDefault() +const occupyAssignments = function( ) { fetch('/occupyAssignments', { method: 'GET', headers: { 'Content-Type': 'application/json' } @@ -12,7 +11,8 @@ const occupyAssignments = function( e ) { for(i = 0; i < assignments.length; i++) { let assignment = assignments[i] //let assignments = student.assignments - fillAssignment(assignment, assignment.value()) + console.log(Object.values(assignment)) + fillAssignment(assignment, Object.values(assignment)) } console.log(assignments) }) @@ -67,7 +67,7 @@ const fillAssignment = function( assignment, grade ) { window.onload = function() { console.log("home.html: javascript loaded") - //occupyStudents() + occupyAssignments() const addButton = document.querySelector("#addAssignment"); addButton.onclick = addAssignment diff --git a/server.js b/server.js index 2e1eb48b..3cb0ec23 100644 --- a/server.js +++ b/server.js @@ -116,12 +116,12 @@ app.get( '/occupyStudents', function( request, response ) { }) app.get( '/occupyAssignments', function( request, response ) { - var studentList = [] + var assignmentList = [] let i for(i = 0; i < users.length; i++){ } - studentList = users[0].students - response.send(studentList) + assignmentList = users[0].students[0].assignments + response.send(assignmentList) }) From af9278d6ddffc39c55bbd2b23877450c20a9caa4 Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a3-paris-lopez)" Date: Mon, 16 Sep 2019 13:14:14 +0000 Subject: [PATCH 189/191] =?UTF-8?q?=F0=9F=93=9F=F0=9F=8F=8C=20Checkpoint?= =?UTF-8?q?=20./public/infoPage/studentInfo.js:6266626/596=20./server.js:6?= =?UTF-8?q?266626/500=20./public/infoPage/studentInfo.html:6266626/840=20.?= =?UTF-8?q?/db.json:6266626/694?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db.json | 18 ++++++++++++------ public/infoPage/studentInfo.html | 13 +++++++++++++ public/infoPage/studentInfo.js | 16 +++++++++++++++- server.js | 9 ++++++++- 4 files changed, 48 insertions(+), 8 deletions(-) diff --git a/db.json b/db.json index b7288ac0..e1121875 100644 --- a/db.json +++ b/db.json @@ -10,13 +10,16 @@ "last": "Doe", "assignments": [ { - "HW1": 30 + "assignment": "HW1", + "grade": 30 }, { - "HW2": 25 + "assignment": "HW2", + "grade": 90 }, { - "Test": 30 + "assignment": "Test", + "grade": 70 } ] }, @@ -25,13 +28,16 @@ "last": "Smith", "assignments": [ { - "HW1": 100 + "assignment": "HW1", + "grade": 40 }, { - "HW2": 95 + "assignment": "HW2", + "grade": 60 }, { - "Test": 70 + "assignment": "Test", + "grade": 90 } ] } diff --git a/public/infoPage/studentInfo.html b/public/infoPage/studentInfo.html index 479e5f8f..a5c5b90a 100644 --- a/public/infoPage/studentInfo.html +++ b/public/infoPage/studentInfo.html @@ -58,5 +58,18 @@

+ + \ No newline at end of file diff --git a/public/infoPage/studentInfo.js b/public/infoPage/studentInfo.js index 589b46b3..fb5604c4 100644 --- a/public/infoPage/studentInfo.js +++ b/public/infoPage/studentInfo.js @@ -12,12 +12,26 @@ const occupyAssignments = function( ) { let assignment = assignments[i] //let assignments = student.assignments console.log(Object.values(assignment)) - fillAssignment(assignment, Object.values(assignment)) + fillAssignment( assignment.assignment, assignment.grade) } console.log(assignments) }) } +const removeAssignment = function( assignment, grade ) { + console.log("Remove Assignment") + const info = {assignment: assignment, grade: grade } + const body = JSON.stringify(info) + fetch('/deleteStudent', { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + body + }).then(function(response) { + console.log(response) + }) +} + + const addAssignment = function( e ) { e.preventDefault() console.log("Add Assignment") diff --git a/server.js b/server.js index 3cb0ec23..86391f96 100644 --- a/server.js +++ b/server.js @@ -99,7 +99,14 @@ app.post( '/deleteStudent', function( request, response ) { }) app.post( '/addAssignment', function( request, response ) { - db.get('users[0].students[0]').push(request.body).write(); + db.get('users[0].students[0].assignments').push(request.body).write(); + occupyUsers() + response.writeHead(200, { 'Content-Type': 'application/json' }); + response.end(); +}) + +app.post( '/delAssignment', function( request, response ) { + db.get('users[0].students[0].assignments').remove({ assignment: request.body.grade, grade: request.body.grade }).write() occupyUsers() response.writeHead(200, { 'Content-Type': 'application/json' }); response.end(); From 20ec51fb2e9accd7bb2c3b0af9fe69bc08848d65 Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a3-paris-lopez)" Date: Mon, 16 Sep 2019 13:26:12 +0000 Subject: [PATCH 190/191] =?UTF-8?q?=F0=9F=8C=A0=F0=9F=99=88=20Checkpoint?= =?UTF-8?q?=20./public/infoPage/studentInfo.js:6266626/26=20./server.js:62?= =?UTF-8?q?66626/327=20./db.json:6266626/53=20./public/homePage/home.js:62?= =?UTF-8?q?66626/133=20./README.md:6266626/255?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 5 ++++- db.json | 4 +++- public/homePage/home.js | 2 +- public/infoPage/studentInfo.js | 2 +- server.js | 19 +------------------ 5 files changed, 10 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index 88b45e8a..77bb4db0 100755 --- a/README.md +++ b/README.md @@ -15,7 +15,10 @@ Because the database, password service, and server required a lot of time to get than intended to piece together my design. With the remaining time I was able to build a login page, as well as the beginnings of a student roster and list of assignments. Students can be added and removed from the list, and the more information button brings the user to the list of assignments. The teacher can add assignments as well -as remove them. Though, I was unable to complete more of my original ideas beyond these features, the web app still +as remove them. Currently, all the information is based on one account of a teacher, and if one were to login as the other +teacher (teacher1, teacher1), the tables would be occupied by only the students of the + +Though, I was unable to complete more of my original ideas beyond these features, the web app still provides a few options for the user and does so in a responsive and clear manner. Login information:
diff --git a/db.json b/db.json index e1121875..caf6dffb 100644 --- a/db.json +++ b/db.json @@ -8,6 +8,7 @@ { "first": "Jane", "last": "Doe", + "active": 0, "assignments": [ { "assignment": "HW1", @@ -26,6 +27,7 @@ { "first": "John", "last": "Smith", + "active": 0, "assignments": [ { "assignment": "HW1", @@ -33,7 +35,7 @@ }, { "assignment": "HW2", - "grade": 60 + "grade": 100 }, { "assignment": "Test", diff --git a/public/homePage/home.js b/public/homePage/home.js index da2a5f1f..20da78a6 100644 --- a/public/homePage/home.js +++ b/public/homePage/home.js @@ -24,7 +24,7 @@ const gradeCalc = function( assignments ) { let i if(assignments) { for(i = 0; i < assignments.length; i++){ - sum += parseInt(Object.values(assignments[i])) + sum += parseInt(assignments[i].grade) } return (sum/assignments.length).toFixed(2) } diff --git a/public/infoPage/studentInfo.js b/public/infoPage/studentInfo.js index fb5604c4..d6de1119 100644 --- a/public/infoPage/studentInfo.js +++ b/public/infoPage/studentInfo.js @@ -22,7 +22,7 @@ const removeAssignment = function( assignment, grade ) { console.log("Remove Assignment") const info = {assignment: assignment, grade: grade } const body = JSON.stringify(info) - fetch('/deleteStudent', { + fetch('/delAssignment', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body diff --git a/server.js b/server.js index 86391f96..d7469e6e 100644 --- a/server.js +++ b/server.js @@ -32,23 +32,6 @@ const occupyUsers = function() { } }; occupyUsers(); -//Students -/* -db.defaults({ users: [] }).write(); -let students -const occupyStudents = function() { - students = []; - let i = 0; - while (true) { - let student = db.get(`students[${i}]`).value(); - if (student) users.push(student) - else break - i++; - } -}; -occupyStudents(); -*/ - //Password Authentication const strategy = function(username, password, done) { @@ -106,7 +89,7 @@ app.post( '/addAssignment', function( request, response ) { }) app.post( '/delAssignment', function( request, response ) { - db.get('users[0].students[0].assignments').remove({ assignment: request.body.grade, grade: request.body.grade }).write() + db.get('users[0].students[0].assignments').remove({ assignment: request.body.assignment, grade: request.body.grade }).write() occupyUsers() response.writeHead(200, { 'Content-Type': 'application/json' }); response.end(); From 857fa25cb51cd15b8223d9417a5022b640612b02 Mon Sep 17 00:00:00 2001 From: "Glitch (paristhecity-a3-paris-lopez)" Date: Mon, 16 Sep 2019 13:33:42 +0000 Subject: [PATCH 191/191] a very incomplete version --- README.md | 13 ++++++++++--- db.json | 5 +++++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 77bb4db0..d8043599 100755 --- a/README.md +++ b/README.md @@ -10,13 +10,18 @@ a page where several users could log-in and look at their roster, as well as the The teacher would be able to remove students from their class and add new students. When the 'information' button is clicked, the teacher can add grades and assignments to the student chosen. Preferably, there would have been a navigation bar at the top of the page to switch between assignments and account information for the target student. +Currently, all the information is based on one account of a teacher, and if one were to login as the other +teacher (teacher1, teacher1), the tables would be occupied by only the students of the admin teacher. This was intentional +to get started. My plan was to add an attribute in each object to track the active person. This attribute would be +set to '0' when the user is not active, and '1' when either a teacher logs on or when a student is chosen and becomes +the 'active' teacher or student. This way all the student information can be gathered from the appropriate sources; +whether it is a list of students, or a single student. Because the database, password service, and server required a lot of time to get started, I found myself with less time than intended to piece together my design. With the remaining time I was able to build a login page, as well as the beginnings of a student roster and list of assignments. Students can be added and removed from the list, and the more information button brings the user to the list of assignments. The teacher can add assignments as well -as remove them. Currently, all the information is based on one account of a teacher, and if one were to login as the other -teacher (teacher1, teacher1), the tables would be occupied by only the students of the +as remove them. Though, I was unable to complete more of my original ideas beyond these features, the web app still provides a few options for the user and does so in a responsive and clear manner. @@ -36,4 +41,6 @@ I found the CSS Template to be greatly limiting, however I was still able to cre for its purpose. I prepared my web application with some simple drawings to sketch out my ideas on paper. With a prototype in hand, I moved onto building the web app itself. -- **Design Achievement 2**: +- **Design Achievement 2**: I utilized a CSS template that provided a majority of the style and the functionality. I +also included a couple of JQuery scripts to make the removal of table rows easier and the connection between multiple +pages. diff --git a/db.json b/db.json index caf6dffb..4e6bc851 100644 --- a/db.json +++ b/db.json @@ -42,6 +42,11 @@ "grade": 90 } ] + }, + { + "first": "Paris", + "last": "Lopez", + "grade": 0 } ] },