hof 22.9.1 → 22.11.0-frontend-v4-beta.1

package/frontend/template-partials/views/partials/navigation.html

@@ -1,8 +1,8 @@
 <div class="govuk-header__content">
   {{#startPageRedirectUrl}}
-    <a href="{{startPageRedirectUrl}}" class="govuk-header__link govuk-header__link--service-name" id="proposition-name">{{$journeyHeader}}{{/journeyHeader}}</a>
+    <a href="{{startPageRedirectUrl}}" class="govuk-header__link govuk-header__service-name" id="proposition-name">{{$journeyHeader}}{{/journeyHeader}}</a>
   {{/startPageRedirectUrl}}
   {{^startPageRedirectUrl}}
-    <a href="{{journeyHeaderURL}}" class="govuk-header__link govuk-header__link--service-name" id="proposition-name">{{$journeyHeader}}{{/journeyHeader}}</a>
+    <a href="{{journeyHeaderURL}}" class="govuk-header__link govuk-header__service-name" id="proposition-name">{{$journeyHeader}}{{/journeyHeader}}</a>
   {{/startPageRedirectUrl}}
 </div>

package/frontend/themes/gov-uk/client-js/cookieSettings.js

@@ -1,22 +1,22 @@
-/* eslint-disable max-len, no-var, vars-on-top, no-undef */
+/* eslint-disable max-len, no-undef */
 'use strict';
 
 // TODO: update package.json(s)
 
 function hideFallbackContent(containerId) {
-  var container = document.getElementById(containerId);
+  const container = document.getElementById(containerId);
   if (container === null) return;
-  var fallbackContent = container.getElementsByClassName('js-disabled');
-  for (var i = 0; i < fallbackContent.length; i++) {
+  const fallbackContent = container.getElementsByClassName('js-disabled');
+  for (let i = 0; i < fallbackContent.length; i++) {
     fallbackContent[i].style.display = 'none';
   }
 }
 
 function showInteractiveContent(containerId) {
-  var container = document.getElementById(containerId);
+  const container = document.getElementById(containerId);
   if (container === null) return;
-  var interactiveContent = container.getElementsByClassName('js-enabled');
-  for (var i = 0; i < interactiveContent.length; i++) {
+  const interactiveContent = container.getElementsByClassName('js-enabled');
+  for (let i = 0; i < interactiveContent.length; i++) {
     interactiveContent[i].style.display = 'block';
   }
 }
@@ -34,41 +34,53 @@ function setCookiePreferences(preferences) {
 function showCookieBannerSubmitted() {
   document.getElementById('cookie-banner-info').style.display = 'none';
   document.getElementById('cookie-banner-actions').style.display = 'none';
-  var cookieBannerSubmitted = document.getElementById('cookie-banner-submitted');
+  let cookieBannerSubmitted;
+  const cookieBannerDiv = document.getElementById('cookie-banner-submitted-accepted');
+  if (cookieBannerDiv.dataset.acceptCookies === 'true') {
+    cookieBannerSubmitted = document.getElementById('cookie-banner-submitted-accepted');
+  } else {
+    cookieBannerSubmitted = document.getElementById('cookie-banner-submitted-rejected');
+  }
   cookieBannerSubmitted.style.display = 'block';
   cookieBannerSubmitted.focus();
 }
 
+function hideCookieBanner() {
+  document.getElementById('cookie-banner').style.display = 'none';
+}
+
 function initialiseBannerButtons() {
+  const acceptedCookieBannerDiv = document.getElementById('cookie-banner-submitted-accepted');
   document.getElementById('accept-cookies-button').addEventListener('click', function () {
-    setCookiePreferences({essential: true, usage: true});
+    setCookiePreferences({ essential: true, usage: true });
     showCookieBannerSubmitted();
     sessionStorage.setItem('reloading', 'true');
     window.location = document.URL;
   });
 
   document.getElementById('reject-cookies-button').addEventListener('click', function () {
-    setCookiePreferences({essential: true, usage: false});
+    setCookiePreferences({ essential: true, usage: false });
+    acceptedCookieBannerDiv.dataset.acceptCookies = 'false';
     showCookieBannerSubmitted();
   });
 
-  document.getElementById('hide-cookie-banner').addEventListener('click', function () {
-    document.getElementById('cookie-banner').style.display = 'none';
-  });
+  document.getElementById('hide-accept-cookie-banner').addEventListener('click', hideCookieBanner);
+
+  document.getElementById('hide-reject-cookie-banner').addEventListener('click', hideCookieBanner);
 }
 
 function initialiseCookieBanner() {
-  var preferences = GOVUK.cookie('cookie_preferences');
+  const preferences = GOVUK.cookie('cookie_preferences');
 
   if (preferences !== null) {
     return;
   }
 
   // the default cookie message container from hof-govuk-template
-  var bannerContainer = document.getElementById('global-cookie-message');
+  const bannerContainer = document.getElementById('global-cookie-message');
 
   // the cookie banner that will replace the container's default content if using google analytics
-  var cookieBanner = document.getElementById('cookie-banner');
+  const cookieBanner = document.getElementById('cookie-banner');
 
   if (bannerContainer !== null && cookieBanner !== null) {
     hideFallbackContent('global-cookie-message');
@@ -82,8 +94,8 @@ function handleSaveSettings(e) {
   e.preventDefault();
   setCookiePreferences({ essential: true, usage: document.getElementById('radio-1').checked });
 
-  var cookieNotification = document.getElementById('cookie-notification');
-  var cookieBanner = document.getElementById('cookie-banner');
+  const cookieNotification = document.getElementById('cookie-notification');
+  const cookieBanner = document.getElementById('cookie-banner');
 
   if (cookieBanner !== null) {
     cookieBanner.style.display = 'none';
@@ -96,8 +108,8 @@ function handleSaveSettings(e) {
 }
 
 function initialiseFormControls() {
-  var preferences = JSON.parse(GOVUK.cookie('cookie_preferences'));
-  var usage;
+  const preferences = JSON.parse(GOVUK.cookie('cookie_preferences'));
+  let usage;
 
   if (preferences !== null && preferences.usage !== undefined && typeof preferences.usage === 'boolean') {
     usage = preferences.usage;
@@ -111,7 +123,7 @@ function initialiseFormControls() {
 }
 
 function initialiseCookiePage() {
-  var shouldDisplayCookieControls = document.getElementById('cookie-settings') !== null;
+  const shouldDisplayCookieControls = document.getElementById('cookie-settings') !== null;
 
   if (shouldDisplayCookieControls) {
     hideFallbackContent('cookie-settings');
@@ -122,12 +134,12 @@ function initialiseCookiePage() {
 
 function onLoad() {
   window.onload = function () {
-    var reloading = sessionStorage.getItem('reloading');
+    const reloading = sessionStorage.getItem('reloading');
     if (reloading) {
       sessionStorage.removeItem('reloading');
 
-      var bannerContainer = document.getElementById('global-cookie-message');
-      var cookieBanner = document.getElementById('cookie-banner');
+      const bannerContainer = document.getElementById('global-cookie-message');
+      const cookieBanner = document.getElementById('cookie-banner');
 
       if (bannerContainer !== null && cookieBanner !== null) {
         bannerContainer.style.display = 'block';

package/frontend/themes/gov-uk/styles/_cookie-banner.scss

@@ -4,9 +4,6 @@
   .js-enabled {
     display: none;
   }
-  p.no-ga-tag {
-    padding: 10px 0;
-  }
 }
 
 #cookie-banner {

package/lib/settings.js

@@ -63,6 +63,8 @@ module.exports = async (app, config) => {
 
   app.use((req, res, next) => {
     res.locals.baseUrl = req.baseUrl;
+    res.locals.showCookiesBanner = config.showCookiesBanner;
+    res.locals.hasGoogleAnalytics = config.hasGoogleAnalytics;
     next();
   });
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hof",
   "description": "A bootstrap for HOF projects",
-  "version": "22.9.1",
+  "version": "22.11.0-frontend-v4-beta.1",
   "license": "MIT",
   "main": "index.js",
   "author": "HomeOffice",
@@ -60,7 +60,7 @@
     "findup": "^0.1.5",
     "glob": "^7.2.0",
     "govuk-elements-sass": "^3.1.3",
-    "govuk-frontend": "3.15",
+    "govuk-frontend": "4.10.1",
     "govuk_template_mustache": "^0.26.0",
     "helmet": "^3.22.0",
     "hogan-express-strict": "^0.5.4",
@@ -82,14 +82,14 @@
     "nodemailer": "^6.6.3",
     "nodemailer-ses-transport": "^1.5.1",
     "nodemailer-stub-transport": "^1.1.0",
-    "notifications-node-client": "^8.2.0",
+    "notifications-node-client": "^8.2.1",
     "redis": "^3.1.2",
     "reqres": "^3.0.1",
     "rimraf": "^3.0.2",
     "sass": "^1.56.2",
     "serve-static": "^1.14.1",
     "uglify-js": "^3.14.3",
-    "underscore": "^1.13.6",
+    "underscore": "^1.13.7",
     "urijs": "^1.19.11",
     "uuid": "^8.3.2",
     "winston": "^3.7.2"
@@ -104,8 +104,8 @@
     "chai-subset": "^1.6.0",
     "concat-stream": "^1.4.7",
     "csv": "^5.3.2",
-    "eslint": "^7.30.0",
-    "eslint-config-hof": "^1.1.0",
+    "eslint": "^8.57.0",
+    "eslint-config-hof": "^1.3.4",
     "funkie": "0.0.5",
     "funkie-phantom": "0.0.1",
     "istanbul": "^0.4.3",
@@ -141,7 +141,6 @@
     "exit": "true"
   },
   "resolutions": {
-    "underscore": "^1.12.1",
     "cached-path-relative": "^1.1.0",
     "shell-quote": "^1.7.3"
   }

package/sandbox/apps/sandbox/translations/en/default.json

@@ -0,0 +1,245 @@
+{
+  "errors": {
+    "service-unavailable": {
+      "contact": "You can email for more information"
+    }
+  },
+  "exit": {
+    "header": "You have left this form",
+    "title": "You have left this form"
+  },
+  "fields": {
+    "landing-page-radio": {
+      "legend": "Which form would you like to explore?",
+      "hint": "Choose one of the options below and press continue.",
+      "options": {
+        "basic-form": {
+          "label": "Basic form"
+        },
+        "complex-form": {
+          "label": "Complex form"
+        },
+        "build-your-own-form": {
+          "label": "Build your own form"
+        }
+      }
+    },
+    "name": {
+      "label": "Full name"
+    },
+    "dateOfBirth": {
+      "legend": "What is your date of birth?",
+      "hint": "For example, 31 10 1990"
+    },
+    "building": {
+      "label": "Building and street"
+    },
+    "street": {
+      "label": "Address line 2"
+    },
+    "townOrCity": {
+      "label": "Town or city"
+    },
+    "postcode": {
+      "label": "Postcode"
+    },
+    "incomeTypes": {
+      "label": "Sources of income",
+      "legend": "Select the options where you receive income from",
+      "hint": "Select all options that apply to you.",
+      "options": {
+        "salary": {
+          "label": "Salary"
+        },
+        "universal_credit": {
+          "label": "Universal Credit"
+        },
+        "child_benefit": {
+          "label": "Child Benefit"
+        },
+        "housing_benefit": {
+          "label": "Housing Benefit"
+        },
+        "other": {
+          "label": "Other"
+        }
+      }
+    },
+    "countryOfHearing": {
+      "legend": "What country was the appeal lodged?",
+      "options": {
+        "englandAndWales": {
+          "label": "England and Wales"
+        },
+        "scotland": {
+          "label": "Scotland"
+        },
+        "northernIreland": {
+          "label": "Northern Ireland"
+        }
+      }
+    },
+    "email": {
+      "label": "Email address"
+    },
+    "phone": {
+      "label": "Phone number",
+      "hint": "International phone numbers require the international dialling code, for example +33235066182"
+    },
+    "int-phone-number": {
+      "legend": "International phone number"
+    },
+    "complaintDetails": {
+      "label": "Complaint details",
+      "hint": "Briefly summarise your complaint. Include anything that can help our investigation."
+    },
+    "whatHappened": {
+      "label": "What happened",
+      "hint": "Briefly summarise what happened."
+    },
+    "countrySelect": {
+      "label": "Which country are you based in?",
+      "hint": "Start to type the country name and options will appear"
+    },
+    "appealStages": {
+      "label": "Appeal stage",
+      "hint": "Choose an appeal stage from the drop down menu",
+      "options": {
+        "null": "Select..."
+      }
+    }
+  },
+  "journey": {
+    "header": "HOF Bootstrap Sandbox Form",
+    "serviceName": "HOF Bootstrap Sandbox Form",
+    "confirmation": {
+      "details": "Your reference number <br><strong>HDJ2123F</strong>"
+    }
+  },
+  "pages": {
+    "landing-page": {
+      "header": "Landing page"
+    },
+    "build-your-own-form": {
+      "title": "Build your own form",
+      "subheader": "Access the build your own form guidance link"
+    },
+    "address": {
+      "header": "What is your address in the UK?",
+      "intro": "If you have no fixed address, enter an address where we can contact you."
+    },
+    "name": {
+      "header": "What is your full name?"
+    },
+    "email": {
+      "header": "Enter your email address"
+    },
+    "phone-number": {
+      "header": "Enter your phone number"
+    },
+    "confirm": {
+      "header": "Check your answers before submitting your application.",
+      "sections": {
+        "applicantsDetails": {
+          "header": "Applicant's details"
+        },
+        "address": {
+          "header": "Address"
+        },
+        "income": {
+          "header": "Income"
+        },
+        "appealDetails": {
+          "header": "Appeal details"
+        },
+        "countrySelect": {
+          "header": "Country of residence"
+        },
+        "contactDetails": {
+          "header": "Contact details"
+        },
+        "complaintDetails": {
+          "header": "Complaint details"
+        },
+        "whatHappened": {
+          "header": "What happened"
+        }
+      }
+    },
+    "confirmation": {
+      "title": "Application sent",
+      "alert": "Application sent",
+      "subheader": "What happens next",
+      "content": "We’ll contact you with the decision of your application or if we need more information from you."
+    },
+    "exit": {
+      "message": "We have cleared your information to keep it secure. Your information has not been saved."
+    },
+    "session-timeout-warning": {
+      "dialog-title": "{{^showSaveAndExit}}Your application will close soon{{/showSaveAndExit}}{{#showSaveAndExit}}You will be signed out soon{{/showSaveAndExit}}",
+      "dialog-text": "{{^showSaveAndExit}}If that happens, your progress will not be saved.{{/showSaveAndExit}}{{#showSaveAndExit}}Any answers you have saved will not be affected, but your progress on this page will not be saved.{{/showSaveAndExit}}",
+      "timeout-continue-button": "{{^showSaveAndExit}}Stay on this page{{/showSaveAndExit}}{{#showSaveAndExit}}Stay signed in{{/showSaveAndExit}}",
+      "dialog-exit-link": "{{^showSaveAndExit}}Exit this form{{/showSaveAndExit}}{{#showSaveAndExit}}Sign out{{/showSaveAndExit}}"
+    },
+    "save-and-exit": {
+      "header": "You have been signed out",
+      "paragraph-1": "Your form doesn't appear to have been worked on for 30 minutes so we closed it for security.",
+      "paragraph-2": "Any answers you saved have not been affected.",
+      "paragraph-3": "You can sign back in to your application at any time by returning to the <a href='/' class='govuk-link'>start page</a>."
+    }
+  },
+  "validation": {
+    "landing-page-radio": {
+      "required": "Select an option below and press continue"
+    },
+    "name": {
+      "default": "Enter your full name"
+    },
+    "dateOfBirth": {
+      "default": "Enter your date of birth in the correct format; for example, 31 10 1990",
+      "after": "Enter a date after 1 1 1900",
+      "before": "Enter a date that is in the past"
+    },
+    "building": {
+      "default": "Enter details of your building and street"
+    },
+    "townOrCity": {
+      "default": "Enter a town or city",
+      "regex": "Enter a town or city without including digits"
+    },
+    "postcode": {
+      "default": "Enter your postcode"
+    },
+    "incomeTypes": {
+      "default": "Select all options that apply to you."
+    },
+    "countryOfHearing": {
+      "default": "Select where the appeal hearing is to be held"
+    },
+    "countrySelect": {
+      "default": "Enter a valid country of residence",
+      "required": "Enter your country of residence"
+    },
+    "email": {
+      "default": "Enter your email address in the correct format"
+    },
+    "phone": {
+      "default": "Enter your phone number"
+    },
+    "int-phone-number": {
+      "required": "Enter an international phone number",
+      "internationalPhoneNumber": "Enter a valid international phone number"
+    },
+    "complaintDetails": {
+      "default": "Enter details about why you are making a complaint",
+      "maxlength": "Keep to the {{maxlength}} character limit"
+    },
+    "whatHappened": {
+      "default": "Enter details about what happened",
+      "maxword": "Keep to the {{maxword}} word limit"
+    },
+    "appealStages": {
+      "required": "Select an appeal stage from the list"
+    }
+  }
+}

package/sandbox/package.json

@@ -15,7 +15,7 @@
   },
   "author": "",
   "dependencies": {
-    "govuk-frontend": "3.14",
+    "govuk-frontend": "4.10.1",
     "jquery": "^3.7.1",
     "sass": "^1.53.0",
     "typeahead-aria": "^1.0.4"