From 3b91e6b823b50fadc43e5091b739027693e8d303 Mon Sep 17 00:00:00 2001 From: Dominic Coelho Date: Fri, 14 Sep 2018 12:04:01 +0100 Subject: [PATCH] make moreinfo route /more-info > relates #26 --- public/js/splashtimeout.js | 2 +- public/stylesheets/main.css | 158 ++++++++++++++++++++++++++++++++ public/stylesheets/main.css.map | 2 +- public/stylesheets/main.scss | 1 + src/controllers/index.js | 12 ++- src/controllers/moreinfo.js | 5 + src/views/background.hbs | 2 +- src/views/moreinfo.hbs | 17 ++++ src/views/resources.hbs | 2 +- src/views/welcome.hbs | 2 +- 10 files changed, 193 insertions(+), 10 deletions(-) create mode 100644 src/controllers/moreinfo.js create mode 100644 src/views/moreinfo.hbs diff --git a/public/js/splashtimeout.js b/public/js/splashtimeout.js index 3f08085..1a24f0e 100644 --- a/public/js/splashtimeout.js +++ b/public/js/splashtimeout.js @@ -7,7 +7,7 @@ setTimeout(function(){ form.classList.add('centered-content'); bottomSection.appendChild(form); var btn = document.createElement('BUTTON'); - btn.classList.add('big-btn', 'fade-in'); + btn.classList.add('govuk-button', 'govuk-button--start', 'fade-in'); btn.textContent = 'Get Started!'; form.appendChild(btn) }, 3000); \ No newline at end of file diff --git a/public/stylesheets/main.css b/public/stylesheets/main.css index 53448ae..c79b0a1 100644 --- a/public/stylesheets/main.css +++ b/public/stylesheets/main.css @@ -577,6 +577,164 @@ margin-bottom: 0; } +.govuk-button { + font-family: "nta", Arial, sans-serif; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + font-weight: 400; + font-size: 16px; + font-size: 1rem; + line-height: 1.1875; + -webkit-box-sizing: border-box; + box-sizing: border-box; + display: inline-block; + position: relative; + width: 100%; + margin-top: 0; + margin-bottom: 22px; + 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; + text-align: center; + vertical-align: top; + cursor: pointer; + -webkit-appearance: none; +} +@media print { + .govuk-button { + font-family: sans-serif; + } +} +@media (min-width: 40.0625em) { + .govuk-button { + font-size: 19px; + font-size: 1.1875rem; + line-height: 1; + } +} +@media print { + .govuk-button { + font-size: 14pt; + line-height: 19px; + } +} +.govuk-button:focus { + outline: 3px solid #ffbf47; + outline-offset: 0; +} +@media (min-width: 40.0625em) { + .govuk-button { + margin-bottom: 32px; + } +} +@media (min-width: 40.0625em) { + .govuk-button { + width: auto; + } +} +.govuk-button:link, .govuk-button:visited, .govuk-button:active, .govuk-button:hover { + color: #ffffff; + text-decoration: none; +} +.govuk-button::-moz-focus-inner { + padding: 0; + border: 0; +} +.govuk-button:hover, .govuk-button:focus { + background-color: #00692f; +} +.govuk-button:active { + top: 2px; + -webkit-box-shadow: none; + box-shadow: none; +} +.govuk-button::before { + content: ""; + display: block; + position: absolute; + top: -2px; + right: -2px; + bottom: -4px; + left: -2px; + background: transparent; +} +.govuk-button:active::before { + top: -4px; +} + +.govuk-button--disabled, +.govuk-button[disabled=disabled], +.govuk-button[disabled] { + opacity: 0.5; + background: #00823b; +} +.govuk-button--disabled:hover, +.govuk-button[disabled=disabled]:hover, +.govuk-button[disabled]:hover { + background-color: #00823b; + cursor: default; +} +.govuk-button--disabled:focus, +.govuk-button[disabled=disabled]:focus, +.govuk-button[disabled]:focus { + outline: none; +} +.govuk-button--disabled:active, +.govuk-button[disabled=disabled]:active, +.govuk-button[disabled]:active { + top: 0; + -webkit-box-shadow: 0 2px 0 #003618; + box-shadow: 0 2px 0 #003618; +} + +.govuk-button--start { + font-weight: 700; + font-size: 18px; + font-size: 1.125rem; + line-height: 1; + min-height: auto; + padding-top: 8px; + padding-right: 40px; + padding-bottom: 8px; + padding-left: 15px; + background-image: url("/assets/images/icon-pointer.png"); + background-repeat: no-repeat; + background-position: 100% 50%; +} +@media (min-width: 40.0625em) { + .govuk-button--start { + font-size: 24px; + font-size: 1.5rem; + line-height: 1; + } +} +@media print { + .govuk-button--start { + font-size: 18pt; + line-height: 1; + } +} +@media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) { + .govuk-button--start { + background-image: url("/assets/images/icon-pointer-2x.png"); + background-size: 30px 19px; + } +} + +.govuk-button { + padding-top: 9px; + padding-bottom: 6px; +} + +.govuk-button--start { + padding-top: 9px; + padding-bottom: 6px; +} + .full-viewport { min-height: 100vh; width: 100vw; diff --git a/public/stylesheets/main.css.map b/public/stylesheets/main.css.map index 2102779..1e792ab 100644 --- a/public/stylesheets/main.css.map +++ b/public/stylesheets/main.css.map @@ -1 +1 @@ -{"version":3,"sourceRoot":"","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-families.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/settings/_typography-font.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","bower_components/o-grid/src/scss/_main.scss"],"names":[],"mappings":"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","file":"main.css"} \ No newline at end of file +{"version":3,"sourceRoot":"","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-families.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/settings/_typography-font.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"],"names":[],"mappings":"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","file":"main.css"} \ No newline at end of file diff --git a/public/stylesheets/main.scss b/public/stylesheets/main.scss index f85653b..9f5f471 100644 --- a/public/stylesheets/main.scss +++ b/public/stylesheets/main.scss @@ -10,6 +10,7 @@ @import 'bower_components/o-grid/main'; @import '../../node_modules/govuk-frontend/components/checkboxes/checkboxes'; +@import '../../node_modules/govuk-frontend/components/button/button'; @import url('https://fonts.googleapis.com/css?family=Montserrat:900|Source+Sans+Pro'); // FONT VARIABLES diff --git a/src/controllers/index.js b/src/controllers/index.js index 39bf471..c36ac82 100644 --- a/src/controllers/index.js +++ b/src/controllers/index.js @@ -1,17 +1,19 @@ const express = require('express'); const router = express.Router(); const bodyParser = require('body-parser'); -const home = require('./home') -const welcome = require('./welcome') -const background = require('./background') -const resources = require('./resources') -const error = require('./error') +const home = require('./home'); +const welcome = require('./welcome'); +const background = require('./background'); +const resources = require('./resources'); +const error = require('./error'); +const moreinfo = require('./moreinfo'); router.use(bodyParser.urlencoded({extended: true})); router.get('/', home.get); router.get('/welcome', welcome.get); router.get('/background', background.get); router.get('/resources', resources.get); +router.get('/more-info', moreinfo.get); // trigger 500 error for testing diff --git a/src/controllers/moreinfo.js b/src/controllers/moreinfo.js new file mode 100644 index 0000000..feb299d --- /dev/null +++ b/src/controllers/moreinfo.js @@ -0,0 +1,5 @@ +exports.get = (req, res) => { + res.render('moreinfo', { + layout: 'scrollable' + }); +} \ No newline at end of file diff --git a/src/views/background.hbs b/src/views/background.hbs index 78a2e53..121a54b 100644 --- a/src/views/background.hbs +++ b/src/views/background.hbs @@ -84,7 +84,7 @@
- +
diff --git a/src/views/moreinfo.hbs b/src/views/moreinfo.hbs new file mode 100644 index 0000000..1eb58c9 --- /dev/null +++ b/src/views/moreinfo.hbs @@ -0,0 +1,17 @@ + +
+
+

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/views/resources.hbs b/src/views/resources.hbs index 38a8765..8543edd 100644 --- a/src/views/resources.hbs +++ b/src/views/resources.hbs @@ -48,7 +48,7 @@
- +
diff --git a/src/views/welcome.hbs b/src/views/welcome.hbs index 940c00c..2ad8c70 100644 --- a/src/views/welcome.hbs +++ b/src/views/welcome.hbs @@ -11,7 +11,7 @@
- +
\ No newline at end of file