diff --git a/public/images/left-arrow.svg b/public/images/left-arrow.svg new file mode 100644 index 0000000..132dfa8 --- /dev/null +++ b/public/images/left-arrow.svg @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/js/checkboxlocalstoragebackground.js b/public/js/checkboxlocalstoragebackground.js new file mode 100644 index 0000000..9915185 --- /dev/null +++ b/public/js/checkboxlocalstoragebackground.js @@ -0,0 +1,18 @@ +var checkboxes = document.querySelectorAll('.govuk-checkboxes__input'); + +checkboxes.forEach(function (i) { + i.addEventListener('click', clickFunc); + if(sessionStorage.hasOwnProperty(i.value)){ + i.checked = true; + } +}) + +function clickFunc() { + if(this.checked){ + sessionStorage.setItem(this.value + '-background', this.value); + } else { + if(sessionStorage.hasOwnProperty(this.value)){ + sessionStorage.removeItem(this.value); + } + } +} \ No newline at end of file diff --git a/public/js/checkboxlocalstorage.js b/public/js/checkboxlocalstorageresources.js similarity index 85% rename from public/js/checkboxlocalstorage.js rename to public/js/checkboxlocalstorageresources.js index cebe0e2..f0b37fa 100644 --- a/public/js/checkboxlocalstorage.js +++ b/public/js/checkboxlocalstorageresources.js @@ -9,7 +9,7 @@ checkboxes.forEach(function (i) { function clickFunc() { if(this.checked){ - sessionStorage.setItem(this.value, this.value); + sessionStorage.setItem(this.value + '-resource', this.value); } else { if(sessionStorage.hasOwnProperty(this.value)){ sessionStorage.removeItem(this.value); diff --git a/public/stylesheets/main.css b/public/stylesheets/main.css index d5cae24..d820bf4 100644 --- a/public/stylesheets/main.css +++ b/public/stylesheets/main.css @@ -473,10 +473,10 @@ padding: 7px 10px; border: 2px solid transparent; border-radius: 0; - color: #ffffff; - background-color: #00823b; - -webkit-box-shadow: 0 2px 0 #003618; - box-shadow: 0 2px 0 #003618; + color: #0b0c0c; + background-color: #FFFF81; + -webkit-box-shadow: 0 2px 0 #ffff35; + box-shadow: 0 2px 0 #ffff35; text-align: center; vertical-align: top; cursor: pointer; @@ -503,13 +503,13 @@ .govuk-button { width: auto; } } .govuk-button:link, .govuk-button:visited, .govuk-button:active, .govuk-button:hover { - color: #ffffff; + color: #0b0c0c; text-decoration: none; } .govuk-button::-moz-focus-inner { padding: 0; border: 0; } .govuk-button:hover, .govuk-button:focus { - background-color: #00692f; } + background-color: #ffff68; } .govuk-button:active { top: 2px; -webkit-box-shadow: none; @@ -530,11 +530,11 @@ .govuk-button[disabled="disabled"], .govuk-button[disabled] { opacity: 0.5; - background: #00823b; } + background: #FFFF81; } .govuk-button--disabled:hover, .govuk-button[disabled="disabled"]:hover, .govuk-button[disabled]:hover { - background-color: #00823b; + background-color: #FFFF81; cursor: default; } .govuk-button--disabled:focus, .govuk-button[disabled="disabled"]:focus, @@ -544,8 +544,8 @@ .govuk-button[disabled="disabled"]:active, .govuk-button[disabled]:active { top: 0; - -webkit-box-shadow: 0 2px 0 #003618; - box-shadow: 0 2px 0 #003618; } + -webkit-box-shadow: 0 2px 0 #ffff35; + box-shadow: 0 2px 0 #ffff35; } .govuk-button--start { font-weight: 700; @@ -591,20 +591,47 @@ body { font-family: "Source Sans Pro", sans-serif; color: #222; font-weight: 400; - font-size: 1em; } + font-size: 1.5rem; } h1 { - font-size: 3.375em; } + font-size: 3.375rem; } + +progress[value] { + appearance: none; + -webkit-appearance: none; + -moz-apperance: none; + width: 100%; + height: 100%; } + +progress[value]::-webkit-progress-bar { + background: #BFD4DF; + box-shadow: 0 2px 5px #8FA3AD inset; } + +progress[value]::-webkit-progress-value { + background-color: #FDC925; } + +progress { + appearance: none; + -webkit-appearance: none; + -moz-apperance: none; + width: 100%; + height: 100%; + background: #BFD4DF; + box-shadow: 0 2px 5px #8FA3AD inset; } + +progress[value]::-moz-progress-bar { + background-color: #FDC925; + box-shadow: 0 2px 5px #8FA3AD inset; } .full-viewport { - min-height: 100vh; + min-height: 95vh; width: 100vw; } .full-height { - height: calc(100vh - (4 * 3.375em)); } + height: calc(100vh - (4 * 3.375rem)); } .fixed-height-double-h1 { - height: 6.75em; } + height: 6.75rem; } .flex-even-spacing { display: flex; @@ -670,6 +697,11 @@ h1 { justify-content: center; padding-right: 10px; } +.centered-content-no-padding { + display: flex; + align-items: center; + justify-content: center; } + .eight-padding { padding: 8px; } @@ -679,6 +711,14 @@ h1 { .thirtytwo-padding { padding: 32px; } +.progressbar { + position: fixed; + width: 100%; + height: 5%; + left: 0; + bottom: 0; + background: white; } + .grid-row { clear: both; flex-wrap: wrap; @@ -703,15 +743,14 @@ h1 { .big-btn { width: 50%; - height: 4.5em; } + height: 4.5rem; } form { width: 100%; } img { border-radius: 50%; - width: 200px; - height: 200px; + width: 75%; max-width: 90%; } .fade-in { diff --git a/public/stylesheets/main.css.map b/public/stylesheets/main.css.map index fab016b..0e1ab88 100644 --- a/public/stylesheets/main.css.map +++ b/public/stylesheets/main.css.map @@ -1,6 +1,6 @@ { "version": 3, -"mappings": "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", +"mappings": "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", "sources": ["main.scss","../../node_modules/govuk-frontend/components/error-message/_error-message.scss","../../node_modules/govuk-frontend/helpers/_typography.scss","../../node_modules/govuk-frontend/settings/_typography-font.scss","../../node_modules/govuk-frontend/settings/_spacing.scss","../../node_modules/govuk-frontend/settings/_colours-applied.scss","../../node_modules/govuk-frontend/helpers/_font-faces.scss","../../node_modules/govuk-frontend/vendor/_sass-mq.scss","../../node_modules/govuk-frontend/components/fieldset/_fieldset.scss","../../node_modules/govuk-frontend/helpers/_clearfix.scss","../../node_modules/govuk-frontend/components/hint/_hint.scss","../../node_modules/govuk-frontend/components/label/_label.scss","../../node_modules/govuk-frontend/components/checkboxes/_checkboxes.scss","../../node_modules/govuk-frontend/settings/_measurements.scss","../../node_modules/govuk-frontend/helpers/_spacing.scss","../../node_modules/govuk-frontend/components/button/_button.scss","../../node_modules/govuk-frontend/helpers/_focusable.scss","../../node_modules/govuk-frontend/helpers/_device-pixels.scss","bower_components/o-grid/src/scss/_main.scss","bower_components/o-grid/src/scss/_variables.scss"], "names": [], "file": "main.css" diff --git a/public/stylesheets/main.scss b/public/stylesheets/main.scss index 4a81728..ae14184 100644 --- a/public/stylesheets/main.scss +++ b/public/stylesheets/main.scss @@ -20,11 +20,11 @@ $body-font: 'Source Sans Pro', sans-serif; $bold-font: 900; $regular-font: 400; // $heading-1: 5.063em; -$heading-1: 3.375em; -$heading-2: 2.25em; -$base-font-size: 1em; -$smaller-font-size: 0.667em; -$larger-font-size: 1.5em; +$heading-1: 3.375rem; +$heading-2: 2.25rem; +$base-font-size: 1.5rem; +$smaller-font-size: 0.667rem; +$larger-font-size: 1.5rem; // COLOR VARIABLES @@ -42,7 +42,8 @@ $accent-colour-dark: #C8A415; $o-grid-is-silent: false; $round-image: 50%; -$small-image: 200px; +$small-image: 75%; +$very-small-image: 20px; // MIX-INS @@ -73,10 +74,42 @@ h1 { font-size: $heading-1; } +progress[value] { + appearance: none; + -webkit-appearance: none; + -moz-apperance: none; + width: 100%; + height: 100%; +} + +progress[value]::-webkit-progress-bar { + background: $primary-bg-colour-light; + box-shadow: 0 2px 5px $primary-bg-colour inset; +} + +progress[value]::-webkit-progress-value { + background-color: $accent-colour; +} + +progress { + appearance: none; + -webkit-appearance: none; + -moz-apperance: none; + width: 100%; + height: 100%; + background: $primary-bg-colour-light; + box-shadow: 0 2px 5px $primary-bg-colour inset; +} + +progress[value]::-moz-progress-bar { + background-color: $accent-colour; + box-shadow: 0 2px 5px $primary-bg-colour inset; +} + // CLASSES .full-viewport { - min-height: 100vh; + min-height: 95vh; width: 100vw; } @@ -114,6 +147,12 @@ h1 { padding-right: 10px; } +.centered-content-no-padding { + display: flex; + align-items: center; + justify-content: center; +} + .eight-padding { padding: 8px; } @@ -126,8 +165,18 @@ h1 { padding: 32px; } +.progressbar { + position: fixed; + width: 100%; + height: 5%; + left: 0; + bottom: 0; + background: white; +} + // IDS + // #test-container { // @include oGridContainer(); // } @@ -156,7 +205,6 @@ img { radius: $round-image; } width: $small-image; - height: $small-image; max-width: 90%; } diff --git a/src/controllers/background.js b/src/controllers/background.js index af99c8b..790312d 100644 --- a/src/controllers/background.js +++ b/src/controllers/background.js @@ -1,5 +1,8 @@ exports.get = (req, res) => { res.render('background', { - layout: 'scrollable' + layout: 'scrollable', + progressamt: '40', + title: 'Background', + pageInfo: 'Please check all the boxes you feel are things holding you back from getting into tech.' }); } \ No newline at end of file diff --git a/src/controllers/home.js b/src/controllers/home.js index bdcd66a..e0cb1ba 100644 --- a/src/controllers/home.js +++ b/src/controllers/home.js @@ -1,3 +1,8 @@ exports.get = (req, res) => { - res.render('home', {activePage:{home: true}}) + res.render('home', + { + activePage:{home: true}, + progressamt: '0', + title: 'Tech Access App' + }) } \ No newline at end of file diff --git a/src/controllers/moreinfo.js b/src/controllers/moreinfo.js index feb299d..1189a79 100644 --- a/src/controllers/moreinfo.js +++ b/src/controllers/moreinfo.js @@ -1,5 +1,8 @@ exports.get = (req, res) => { res.render('moreinfo', { - layout: 'scrollable' + layout: 'moreinfo', + progressamt: '80', + title: 'More Info', + pageInfo: 'If you\'d like to, you can give us more detail about your background. We can\'t use these to tailor your results yet, but we hope to use this infromation to improve our service down the line.' }); } \ No newline at end of file diff --git a/src/controllers/resources.js b/src/controllers/resources.js index 07942be..2469821 100644 --- a/src/controllers/resources.js +++ b/src/controllers/resources.js @@ -1,5 +1,7 @@ exports.get = (req, res) => { res.render('resources', { - layout: 'scrollable' + progressamt: '60', + title: 'Resources', + pageInfo: 'Please check all the boxes of the types of resources you feel would be most helpful to get you into tech.' }); } \ No newline at end of file diff --git a/src/controllers/results.js b/src/controllers/results.js index 1274f95..c90cb19 100644 --- a/src/controllers/results.js +++ b/src/controllers/results.js @@ -1,9 +1,8 @@ exports.get = (req, res) => { - res.render('results', - { - layout: 'scrollable', - progressamt: '100', - title: 'Results', - pageInfo: 'Based on the checkboxes you have selected, here are your results.' - }); + res.render('results', { + layout: 'scrollable', + progressamt: '100', + title: 'Results', + pageInfo: 'Based on the checkboxes you have selected, here are your results.' + }); } \ No newline at end of file diff --git a/src/controllers/welcome.js b/src/controllers/welcome.js index 960e0d0..14f7c48 100644 --- a/src/controllers/welcome.js +++ b/src/controllers/welcome.js @@ -1,3 +1,7 @@ exports.get = (req, res) => { - res.render('welcome'); + res.render('welcome', + { + progressamt: '20', + title: 'Tech Access App' + }); } \ No newline at end of file diff --git a/src/views/background.hbs b/src/views/background.hbs index 121a54b..7432662 100644 --- a/src/views/background.hbs +++ b/src/views/background.hbs @@ -1,8 +1,3 @@ -
@@ -89,4 +84,4 @@
- \ No newline at end of file + \ No newline at end of file diff --git a/src/views/home.hbs b/src/views/home.hbs index 320f440..65d2dec 100644 --- a/src/views/home.hbs +++ b/src/views/home.hbs @@ -1,6 +1,3 @@ -
image of people coding diff --git a/src/views/layouts/main.hbs b/src/views/layouts/main.hbs index d2f92f6..870c8b5 100644 --- a/src/views/layouts/main.hbs +++ b/src/views/layouts/main.hbs @@ -2,8 +2,11 @@ {{>htmlhead}} -
+
+ {{>heading}} + {{>pageinformation}} {{{body}}} + {{>progressbar}}
\ No newline at end of file diff --git a/src/views/layouts/moreinfo.hbs b/src/views/layouts/moreinfo.hbs new file mode 100644 index 0000000..6eb0a16 --- /dev/null +++ b/src/views/layouts/moreinfo.hbs @@ -0,0 +1,13 @@ + + +{{>htmlhead}} + +
+ {{>heading}} + {{>pageinformation}} + {{>getmoreinfo}} + {{{body}}} + {{>progressbar}} +
+ + \ No newline at end of file diff --git a/src/views/layouts/scrollable.hbs b/src/views/layouts/scrollable.hbs index d446583..cf82d42 100644 --- a/src/views/layouts/scrollable.hbs +++ b/src/views/layouts/scrollable.hbs @@ -2,8 +2,11 @@ {{>htmlhead}} -
+
+ {{>heading}} + {{>pageinformation}} {{{body}}} + {{>progressbar}}
\ No newline at end of file diff --git a/src/views/moreinfo.hbs b/src/views/moreinfo.hbs index 26a2403..5697443 100644 --- a/src/views/moreinfo.hbs +++ b/src/views/moreinfo.hbs @@ -1,13 +1,3 @@ - -
-
-

If you'd like to, you can give us more detail about your background. We can't use these to tailor your results yet, but we hope to use this infromation to improve our service down the line.

-
-
diff --git a/src/views/partials/getmoreinfo.hbs b/src/views/partials/getmoreinfo.hbs new file mode 100644 index 0000000..86df8a8 --- /dev/null +++ b/src/views/partials/getmoreinfo.hbs @@ -0,0 +1,5 @@ +
+
+ {{getMoreInfo}} +
+
\ No newline at end of file diff --git a/src/views/partials/heading.hbs b/src/views/partials/heading.hbs new file mode 100644 index 0000000..52458f2 --- /dev/null +++ b/src/views/partials/heading.hbs @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/src/views/partials/pageinformation.hbs b/src/views/partials/pageinformation.hbs new file mode 100644 index 0000000..5171150 --- /dev/null +++ b/src/views/partials/pageinformation.hbs @@ -0,0 +1,7 @@ +{{#if pageInfo}} +
+
+ {{pageInfo}} +
+
+{{/if}} \ No newline at end of file diff --git a/src/views/partials/progressbar.hbs b/src/views/partials/progressbar.hbs new file mode 100644 index 0000000..37f746b --- /dev/null +++ b/src/views/partials/progressbar.hbs @@ -0,0 +1,3 @@ +
+ +
\ No newline at end of file diff --git a/src/views/resources.hbs b/src/views/resources.hbs index 1d9bb4c..d5a5192 100644 --- a/src/views/resources.hbs +++ b/src/views/resources.hbs @@ -1,10 +1,5 @@ -
-
+
@@ -36,12 +31,6 @@ Mentors
-
- - -
@@ -53,4 +42,4 @@
- \ No newline at end of file + \ No newline at end of file diff --git a/src/views/results.hbs b/src/views/results.hbs index 29c51cc..c82eb62 100644 --- a/src/views/results.hbs +++ b/src/views/results.hbs @@ -1,8 +1,3 @@ -

WE GOT NUTHIN

diff --git a/src/views/welcome.hbs b/src/views/welcome.hbs index 2ad8c70..aeadced 100644 --- a/src/views/welcome.hbs +++ b/src/views/welcome.hbs @@ -1,8 +1,3 @@ -

Welcome! We're going to ask you a few questions about your background, identity, and other things to make sure we can offer your the best resources.