From 35680d93ed28b61b521b25117d2685130ead2ae7 Mon Sep 17 00:00:00 2001 From: Emma Ogden Date: Fri, 21 Sep 2018 13:10:36 +0100 Subject: [PATCH 1/3] makes whole challenge cliclickable Relates #93 --- .gitignore | 3 ++ private/sass/challenges.scss | 31 +++++++++--------- private/sass/inventory.scss | 8 ++++- private/sass/style.scss | 2 +- public/css/challenges.css | 14 ++++++++ public/css/challenges.css.map | 2 +- public/css/inventory.css | 8 ++++- public/css/inventory.css.map | 2 +- public/css/style.css | 2 +- public/css/style.css.map | 2 +- public/imgs/checked.svg | 45 ++++++++++++++++++++++++++ public/js/challenges.js | 61 ++++++++++++++++++----------------- src/views/dashboard.hbs | 24 +++++++------- 13 files changed, 140 insertions(+), 64 deletions(-) create mode 100644 public/imgs/checked.svg diff --git a/.gitignore b/.gitignore index a775fbd..1cf9d16 100644 --- a/.gitignore +++ b/.gitignore @@ -62,3 +62,6 @@ typings/ #DS store .DS_Store + +#VS Code settings +.vscode \ No newline at end of file diff --git a/private/sass/challenges.scss b/private/sass/challenges.scss index 2e3dfc0..bebf8d1 100644 --- a/private/sass/challenges.scss +++ b/private/sass/challenges.scss @@ -8,6 +8,7 @@ border: 1px solid #ccc; border-top: none; border-radius: 10px; + margin-bottom: $smallest; } .tab { @@ -24,21 +25,21 @@ cursor: pointer; } -// .tab button:hover { -// background-color: #ddd; -// border-radius: 3px; -// } - -// .tab button:focus, -// .tab button:active, -// // .tab li:active -// { -// background-color: $orange1; -// color: $black; -// border: none; -// // padding: $smallest; -// border-radius: 3px; -// } +.tab button:hover { + background-color: #ddd; + border-radius: 3px; +} + +.tab button:focus, + .tab button:active, +// .tab li:active + { + background-color: $orange1; + color: $black; + border: none; + // padding: $smallest; + border-radius: 3px; +} .tab nav ul { list-style: none; diff --git a/private/sass/inventory.scss b/private/sass/inventory.scss index bcd28fa..97c5880 100644 --- a/private/sass/inventory.scss +++ b/private/sass/inventory.scss @@ -7,11 +7,17 @@ } .items-overview { + display: block; display: flex; flex-direction: row; align-items: center; justify-content: space-between; - margin: 0; + border: 2px $navy1 solid; + border-top: 1px $navy1 solid; + border-right: 1px $navy1 solid; + border-radius: 10px; + padding: $smallest; + margin-bottom: $small; } .bought-icon, diff --git a/private/sass/style.scss b/private/sass/style.scss index e7414d2..eb68fa8 100644 --- a/private/sass/style.scss +++ b/private/sass/style.scss @@ -16,7 +16,7 @@ main { margin-top: $larger; - margin-bottom: $large; + margin-bottom: $large + 1rem; } body { diff --git a/public/css/challenges.css b/public/css/challenges.css index 06dbd4d..a135dda 100644 --- a/public/css/challenges.css +++ b/public/css/challenges.css @@ -9,6 +9,7 @@ border: 1px solid #ccc; border-top: none; border-radius: 10px; + margin-bottom: 0.25rem; } .tab { @@ -25,6 +26,19 @@ cursor: pointer; } +.tab button:hover { + background-color: #ddd; + border-radius: 3px; +} + +.tab button:focus, +.tab button:active { + background-color: #ff9b71; + color: #1d2425; + border: none; + border-radius: 3px; +} + .tab nav ul { list-style: none; display: flex; diff --git a/public/css/challenges.css.map b/public/css/challenges.css.map index c718803..26a3cb1 100644 --- a/public/css/challenges.css.map +++ b/public/css/challenges.css.map @@ -1 +1 @@ -{"version":3,"sourceRoot":"","sources":["../../private/sass/_fonts.scss","../../private/sass/challenges.scss"],"names":[],"mappings":"AAKQ;AALR;EACE;EACA;;ACEF;EACE;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;;;AAmBF;EACE;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA;;;AAGF;EACE","file":"challenges.css"} \ No newline at end of file +{"version":3,"sourceRoot":"","sources":["../../private/sass/_fonts.scss","../../private/sass/challenges.scss","../../private/sass/_sizes.scss","../../private/sass/_colors.scss"],"names":[],"mappings":"AAKQ;AALR;EACE;EACA;;ACEF;EACE;EACA;EACA;EACA;EACA;EACA,eCVS;;;ADaX;EACE;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;EACA;;;AAGF;AAAA;EAIE,kBE1BQ;EF2BR,OEvBM;EFwBN;EAEA;;;AAGF;EACE;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA;;;AAGF;EACE","file":"challenges.css"} \ No newline at end of file diff --git a/public/css/inventory.css b/public/css/inventory.css index b597b6a..618726b 100644 --- a/public/css/inventory.css +++ b/public/css/inventory.css @@ -8,11 +8,17 @@ } .items-overview { + display: block; display: flex; flex-direction: row; align-items: center; justify-content: space-between; - margin: 0; + border: 2px #404973 solid; + border-top: 1px #404973 solid; + border-right: 1px #404973 solid; + border-radius: 10px; + padding: 0.25rem; + margin-bottom: 0.5rem; } .bought-icon, diff --git a/public/css/inventory.css.map b/public/css/inventory.css.map index c2f4fbf..8172895 100644 --- a/public/css/inventory.css.map +++ b/public/css/inventory.css.map @@ -1 +1 @@ -{"version":3,"sourceRoot":"","sources":["../../private/sass/_fonts.scss","../../private/sass/inventory.scss","../../private/sass/_sizes.scss"],"names":[],"mappings":"AAKQ;AALR;EACE;EACA;;ACEF;EACE,QCHO;;;ADMT;EACE;EACA;EACA;EACA;EACA;;;AAGF;AAAA;EAEE;EAEA,QCpBS;EDqBT;;;AAGF;EACE;EACA;;;AAGF;EAEE;EACA;EACA;EACA;EACA;EACA,QCpCS;EDqCT;EACA;;;AAGF;EACE;;;AAGF;EACE;EACA;;;AAGF;EAEE;EACA;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;EACA","file":"inventory.css"} \ No newline at end of file +{"version":3,"sourceRoot":"","sources":["../../private/sass/_fonts.scss","../../private/sass/inventory.scss","../../private/sass/_sizes.scss"],"names":[],"mappings":"AAKQ;AALR;EACE;EACA;;ACEF;EACE,QCHO;;;ADMT;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,SClBS;EDmBT,eClBM;;;ADqBR;AAAA;EAEE;EAEA,QC1BS;ED2BT;;;AAGF;EACE;EACA;;;AAGF;EAEE;EACA;EACA;EACA;EACA;EACA,QC1CS;ED2CT;EACA;;;AAGF;EACE;;;AAGF;EACE;EACA;;;AAGF;EAEE;EACA;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;EACA","file":"inventory.css"} \ No newline at end of file diff --git a/public/css/style.css b/public/css/style.css index e4a7bb0..f079815 100644 --- a/public/css/style.css +++ b/public/css/style.css @@ -148,7 +148,7 @@ table { main { margin-top: 4rem; - margin-bottom: 2rem; + margin-bottom: 3rem; } body { diff --git a/public/css/style.css.map b/public/css/style.css.map index d15a679..38a8e26 100644 --- a/public/css/style.css.map +++ b/public/css/style.css.map @@ -1 +1 @@ -{"version":3,"sourceRoot":"","sources":["../../private/sass/_fonts.scss","../../private/sass/_reset.scss","../../private/sass/style.scss","../../private/sass/_sizes.scss","../../private/sass/_colors.scss"],"names":[],"mappings":"AAKQ;AALR;EACE;EACA;;ACFF;AAAA;AAAA;AAAA;AAKA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EAiFE;EACA;EACA;EACA;EACA;EACA;;;AAEF;AACA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EAWE;;;AAEF;EACE;;;AAEF;AAAA;EAEE;;;AAEF;AAAA;EAEE;;;AAEF;AAAA;AAAA;AAAA;EAIE;EACA;;;AAEF;EACE;EACA;;;ACvHF;EACE;;;AAGF;EACE;;;AAGF;EACE,YCZO;EDaP,eCdM;;;ADiBR;EACE;EACA;EACA,OEVM;EFWN,kBEZM;;;AFeR;EACE;EACA,WCzBO;ED0BP,eC7BO;;;ADgCT;EACE,WC/BM;EDgCN;EACA,eCnCO;EDoCP,YCpCO;;;ADuCT;EACE,WCvCQ;EDwCR;EACA,eC1CO;;;AD6CT;EACE,eC/CM;;;ADoDR;EACE,kBErCU;EFsCV;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA,aC/DO;;;ADkET;EACE;EACA;EACA,OE7DM;EF8DN,eCvEM;;;AD0ER;EACE;EACA,eC5EM;ED6EN;;;AAGF;EACE;EACA;EACA;EACA,kBE9EQ;EF+ER;EACA;EACA,eCvFM;EDwFN,SC3FM;ED4FN;EACA,OEjFM;EFkFN;;;AAGF;EACE,eCjGO;;;ADoGT;EACE,OE7FQ;EF8FR,kBE3FM;;;AF8FR;EACE,OElGQ;EFmGR,kBEhGM;;;AFmGR;EACE,aFxGU;EEyGV;EACA;;;AAKF;EACE;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA,eCjIO;EDkIP,eChIM;EDiIN;EACA,kBEzHM;;;AF4HR;EACE;;;AAGF;EACE;EACA;EACA;EACA,eC7IM;ED8IN,kBErIM;EFsIN,eCjJO;EDkJP;EACA,SCrJS;EDsJT,cCrJM","file":"style.css"} \ No newline at end of file +{"version":3,"sourceRoot":"","sources":["../../private/sass/_fonts.scss","../../private/sass/_reset.scss","../../private/sass/style.scss","../../private/sass/_sizes.scss","../../private/sass/_colors.scss"],"names":[],"mappings":"AAKQ;AALR;EACE;EACA;;ACFF;AAAA;AAAA;AAAA;AAKA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EAiFE;EACA;EACA;EACA;EACA;EACA;;;AAEF;AACA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EAWE;;;AAEF;EACE;;;AAEF;AAAA;EAEE;;;AAEF;AAAA;EAEE;;;AAEF;AAAA;AAAA;AAAA;EAIE;EACA;;;AAEF;EACE;EACA;;;ACvHF;EACE;;;AAGF;EACE;;;AAGF;EACE,YCZO;EDaP;;;AAGF;EACE;EACA;EACA,OEVM;EFWN,kBEZM;;;AFeR;EACE;EACA,WCzBO;ED0BP,eC7BO;;;ADgCT;EACE,WC/BM;EDgCN;EACA,eCnCO;EDoCP,YCpCO;;;ADuCT;EACE,WCvCQ;EDwCR;EACA,eC1CO;;;AD6CT;EACE,eC/CM;;;ADoDR;EACE,kBErCU;EFsCV;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA,aC/DO;;;ADkET;EACE;EACA;EACA,OE7DM;EF8DN,eCvEM;;;AD0ER;EACE;EACA,eC5EM;ED6EN;;;AAGF;EACE;EACA;EACA;EACA,kBE9EQ;EF+ER;EACA;EACA,eCvFM;EDwFN,SC3FM;ED4FN;EACA,OEjFM;EFkFN;;;AAGF;EACE,eCjGO;;;ADoGT;EACE,OE7FQ;EF8FR,kBE3FM;;;AF8FR;EACE,OElGQ;EFmGR,kBEhGM;;;AFmGR;EACE,aFxGU;EEyGV;EACA;;;AAKF;EACE;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA,eCjIO;EDkIP,eChIM;EDiIN;EACA,kBEzHM;;;AF4HR;EACE;;;AAGF;EACE;EACA;EACA;EACA,eC7IM;ED8IN,kBErIM;EFsIN,eCjJO;EDkJP;EACA,SCrJS;EDsJT,cCrJM","file":"style.css"} \ No newline at end of file diff --git a/public/imgs/checked.svg b/public/imgs/checked.svg new file mode 100644 index 0000000..09ca45f --- /dev/null +++ b/public/imgs/checked.svg @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/js/challenges.js b/public/js/challenges.js index 4e49bc4..a6355d0 100644 --- a/public/js/challenges.js +++ b/public/js/challenges.js @@ -1,40 +1,41 @@ -let challengePage = document.querySelector(".challenge-page"); -let url = window.location.href.split("/")[3]; -let h3id = document.querySelector(".accept-challenge-section"); +/* eslint-disable */ +let challengePage = document.querySelector('.challenge-page'); +let url = window.location.href.split('/')[3]; +let h3id = document.querySelector('.accept-challenge-section'); (function checkUrlandCreateForm(url) { - let f = document.createElement("form"); - let s = document.createElement("input"); //input element, Submit button - let id = document.createElement("input"); - let h3 = document.createElement("h3"); + let f = document.createElement('form'); + let s = document.createElement('input'); //input element, Submit button + let id = document.createElement('input'); + let h3 = document.createElement('h3'); - if (url === "new-challenges") { - f.setAttribute("method", "post"); - f.setAttribute("action", "/challenge/accepted"); - f.classList.add("action-section"); - s.classList.add("single-page-button", "acceptBtn"); - s.setAttribute("type", "submit"); - s.setAttribute("value", "Yes I am! Accept that Challenge!!"); - id.setAttribute("name", "challenge_id"); - id.setAttribute("type", "hidden"); - id.classList.add("id-hidden"); - id.setAttribute("value", h3id.innerHTML); - h3.innerHTML = "Are you brave enough to accept this challenge?"; + if (url === 'new-challenges') { + f.setAttribute('method', 'post'); + f.setAttribute('action', '/challenge/accepted'); + f.classList.add('action-section'); + s.classList.add('single-page-button', 'acceptBtn'); + s.setAttribute('type', 'submit'); + s.setAttribute('value', 'Yes I am! Accept that Challenge!!'); + id.setAttribute('name', 'challenge_id'); + id.setAttribute('type', 'hidden'); + id.classList.add('id-hidden'); + id.setAttribute('value', h3id.innerHTML); + h3.innerHTML = 'Are you brave enough to accept this challenge?'; f.appendChild(h3); f.appendChild(s); f.appendChild(id); challengePage.appendChild(f); - } else if (url === "acc-challenges") { - f.setAttribute("method", "post"); - f.setAttribute("action", "/challenge/completed"); - f.classList.add("action-section"); - s.classList.add("single-page-button", "complBtn"); - s.setAttribute("type", "submit"); - s.setAttribute("value", "complete challenge"); - id.setAttribute("name", "challenge_id"); - id.setAttribute("type", "hidden"); - id.setAttribute("value", h3id.innerHTML); - h3.innerHTML = "Complete Challenge"; + } else if (url === 'acc-challenges') { + f.setAttribute('method', 'post'); + f.setAttribute('action', '/challenge/completed'); + f.classList.add('action-section'); + s.classList.add('single-page-button', 'complBtn'); + s.setAttribute('type', 'submit'); + s.setAttribute('value', 'complete challenge'); + id.setAttribute('name', 'challenge_id'); + id.setAttribute('type', 'hidden'); + id.setAttribute('value', h3id.innerHTML); + h3.innerHTML = 'Complete Challenge'; f.appendChild(h3); f.appendChild(s); f.appendChild(id); diff --git a/src/views/dashboard.hbs b/src/views/dashboard.hbs index 80339c3..434df41 100644 --- a/src/views/dashboard.hbs +++ b/src/views/dashboard.hbs @@ -2,17 +2,17 @@ {{!-- --}} - + + -
@@ -22,7 +22,7 @@
{{#each newChallenges}} -
+
{{!--

{{this.title}} : {{this.id}}

--}}

{{this.title}}

@@ -43,7 +43,7 @@
{{#each acceptedChallenges}} -
+

{{this.title}}

@@ -63,7 +63,7 @@
{{#each completedChallenges}} -
+

{{this.title}}

@@ -71,7 +71,7 @@
-
- {{/each}} +
+ {{/each}}
\ No newline at end of file From 18b39b9b6d6285fefbe9437fdcbaf0ede3f97102 Mon Sep 17 00:00:00 2001 From: Emma Ogden Date: Fri, 21 Sep 2018 13:18:53 +0100 Subject: [PATCH 2/3] removes bought/suggested item titles --- src/views/inventory.hbs | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/src/views/inventory.hbs b/src/views/inventory.hbs index e0b0cba..bbdfda6 100644 --- a/src/views/inventory.hbs +++ b/src/views/inventory.hbs @@ -1,16 +1,16 @@
- + -
+
-

Bought Items

{{#each boughtItems}} @@ -24,17 +24,15 @@
-
+
- {{/each}} + {{/each}}
-

Suggested Items

-
{{#each suggestedItems}} From bf03ab778365df3048d7cdec089b16f13fda23a8 Mon Sep 17 00:00:00 2001 From: Emma Ogden Date: Fri, 21 Sep 2018 13:23:11 +0100 Subject: [PATCH 3/3] makes inventory items fully clickable too Relates #93 --- src/views/dashboard.hbs | 4 ++-- src/views/inventory.hbs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/dashboard.hbs b/src/views/dashboard.hbs index 434df41..2fde355 100644 --- a/src/views/dashboard.hbs +++ b/src/views/dashboard.hbs @@ -43,7 +43,7 @@
{{#each acceptedChallenges}} -
+

{{this.title}}

@@ -63,7 +63,7 @@
{{#each completedChallenges}} -
+

{{this.title}}

diff --git a/src/views/inventory.hbs b/src/views/inventory.hbs index bbdfda6..3269a6c 100644 --- a/src/views/inventory.hbs +++ b/src/views/inventory.hbs @@ -15,7 +15,7 @@ {{#each boughtItems}} -
+

{{this.title}}

@@ -37,7 +37,7 @@ {{#each suggestedItems}} -
+

{{this.title}}