hof 20.3.6-timeout-beta → 20.3.6

package/README.md

@@ -311,7 +311,7 @@ my-application/translations/en/default.json
 }
 ```
 
-# HOF Controller
+#HOF Controller
 
 Implements a request pipeline for GET and POST of forms, with input cleaning/formatting and validation.
 
@@ -482,13 +482,13 @@ let error = new ErrorClass(this.missingDoB, {
 });
 ```
 
-## hof-behaviour-session
+##hof-behaviour-session
 
 HOF Behaviour for reading and writing to the session
 
-## Usage
+##Usage
 
-### With [mixwith.js](https://github.com/justinfagnani/mixwith.js)
+###With [mixwith.js](https://github.com/justinfagnani/mixwith.js)
 
 ```js
 const mix = require('mixwith').mix;
@@ -502,7 +502,7 @@ class MyController extends mix(BaseController).with(Session) {
 
 `MyController` now extends `hof-form-controller` and has `hof-behaviour-session` functionality mixed in.
 
-## Functionality
+##Functionality
 
 This mixin extends `hof-form-controller` by persisting the form data to the `sessionModel` - assuming the [session-model](https://github.com/UKHomeOfficeForms/hof-form-wizard/blob/master/lib/middleware/session-model.js) middleware has been applied.
 
@@ -516,13 +516,13 @@ The following form controller methods are used:
 - `missingPrereqHandler(req, res)` - Error handler called when a `MISSING_PREREQ` error is thrown from the [check-progress](https://github.com/UKHomeOfficeForms/hof-form-wizard/blob/master/lib/middleware/check-progress.js) middleware. This occurs if a step is visited out of sequence. This error handler causes the user to be redirected to the last completed step, or the first step if none have been completed.
 - `errorHandler(err, req, res, next)` - checks if `err.code` is `MISSING_PREREQ`, if so calls `missingPrereqHandler`, if not calls `super` to hand over to parent error handler.
 
-## Behaviour-hooks
+##behaviour-hooks
 
 HOF Behaviour enabling lifecycle hooks for extending functionality in main form pipeline.
 
-## Usage
+##Usage
 
-### With [mixwith.js](https://github.com/justinfagnani/mixwith.js)
+###With [mixwith.js](https://github.com/justinfagnani/mixwith.js)
 
 ```js
 const mix = require('mixwith').mix;
@@ -536,25 +536,25 @@ class MyController extends mix(BaseController).with(Hooks) {
 
 `MyController` now extends `hof-form-controller` and has `hof-behaviour-hooks` functionality mixed in.
 
-## Functionality
+##Functionality
 
 The following hooks are currently supported, the methods are GET/POST pipeline methods from `hof-form-controller`:
 
-#### GET
+####GET
 
 - `_getErrors` - `'pre-getErrors', 'post-getErrors'`
 - `_getValues` - `'pre-getValues', 'post-getValues'`
 - `_locals` - `'pre-locals', 'post-locals'`
 - `render` - `'pre-render', 'post-render'`
 
-#### POST
+####POST
 
 - `_process` - `'pre-process', 'post-process'`
 - `_validate` - `'pre-validate', 'post-validate'`
 - `saveValues` - `'pre-saveValues', 'post-saveValues'`
 - `successHandler` - `'pre-successHandler', 'post-successHandler'`
 
-### In field config
+###In field config
 
 fields.js
 

package/frontend/template-partials/translations/src/en/buttons.json

@@ -1,6 +1,5 @@
 {
   "continue": "Continue",
-  "stay-on-page": "Stay on this page",
   "send": "Send",
   "change": "Change",
   "close": "Close",

package/frontend/template-partials/translations/src/en/errors.json

@@ -3,10 +3,6 @@
     "title": "Sorry, something went wrong",
     "message": "A server exception occurred. Please try again."
   },
-  "session-warning": {
-    "title": "Your page will time out soon",
-    "message": "To protect your information, this page will time out in 5 minutes.\n\nIf that happens, your progress will not be saved."
-  },
   "session": {
     "title": "Sorry, you'll have to start again",
     "message": "You haven't entered any details for 30 minutes, so we have cleared your information to keep it secure."

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

@@ -19,7 +19,7 @@
 				<span  class="govuk-phase-banner__text">This is a new service – your <a href="{{feedbackUrl}}{{^feedbackUrl}}https://eforms.homeoffice.gov.uk/outreach/feedback.ofml{{/feedbackUrl}}" class="govuk-link" id="feedback-link" target="_blank">feedback</a> will help us to improve it.</span>
 				</p>
 			</div>
-		{{/feedbackUrl}}
+		{{/feedbackUrl}}      
       <span id="step">
         {{> partials-back}} <span>{{$step}}{{/step}}</span>
       </span>
@@ -29,7 +29,6 @@
 		  </div>
 	  </main>
       {{> partials-continue}}
-      {{> partials-session-timeout-warning}}
       <script type="text/javascript" src="{{assetPath}}/js/bundle.js"></script>
 	  </div>
   {{/main}}

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

@@ -0,0 +1,7 @@
+<div class="govuk-warning-text">
+    <span class="govuk-warning-text__icon" aria-hidden="true">!</span>
+    <strong class="govuk-warning-text__text">
+    <span class="govuk-warning-text__assistive">Warning</span>
+        {{warning}}
+    </strong>
+</div>

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

@@ -11,7 +11,6 @@ var validation = toolkit.validation;
 var GOVUK = require('govuk-frontend');
 GOVUK.initAll();
 window.GOVUK = GOVUK;
-var dialog = require('./dialog');
 var skipToMain = require('./skip-to-main');
 var cookie = require('./govuk-cookies');
 var cookieSettings = require('./cookieSettings');

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hof",
   "description": "A bootstrap for HOF projects",
-  "version": "20.3.6-timeout-beta",
+  "version": "20.3.6",
   "license": "MIT",
   "main": "index.js",
   "author": "HomeOffice",

package/sandbox/assets/scss/app.scss

@@ -7,7 +7,7 @@
     border: 1px solid #ccc;
     width: 65%;
   }
-
+  
 .tt-suggestion {
   padding: 0.5em;
 
@@ -25,117 +25,3 @@
 .twitter-typeahead {
   width: 100%;
 }
-
-.hidden {
-  display: none;
-}
-
-[role="dialog"] {
-  box-sizing: border-box;
-  padding: 15px;
-  border: 1px solid #000;
-  background-color: #fff;
-  min-height: 100vh;
-}
-
-@media screen and (min-width: 640px) {
-  [role="dialog"] {
-    position: absolute;
-    top: 25vh;
-    left: 50vw; /* move to the middle of the screen (assumes relative parent is the body/viewport) */
-    transform: translateX(
-        -50%
-    ); /* move backwards 50% of this element's width */
-    min-width: calc(640px - (15px * 2)); /* == breakpoint - left+right margin */
-    min-height: auto;
-    box-shadow: 0 19px 38px rgb(0 0 0 / 12%), 0 15px 12px rgb(0 0 0 / 22%);
-  }
-}
-
-.dialog_form {
-  margin: 15px;
-}
-
-.dialog_form .label_text {
-  box-sizing: border-box;
-  padding-right: 0.5em;
-  display: inline-block;
-  font-size: 16px;
-  font-weight: bold;
-  width: 30%;
-  text-align: right;
-}
-
-.dialog_form .label_info {
-  box-sizing: border-box;
-  padding-right: 0.5em;
-  font-size: 12px;
-  width: 30%;
-  text-align: right;
-  display: inline-block;
-}
-
-.dialog_form_item {
-  margin: 10px 0;
-  font-size: 0;
-}
-
-.dialog_form_item .wide_input {
-  box-sizing: border-box;
-  max-width: 70%;
-  width: 27em;
-}
-
-.dialog_form_actions {
-  text-align: right;
-  padding: 0 20px 20px;
-}
-
-.dialog_close_button {
-  float: right;
-  position: absolute;
-  top: 10px;
-  left: 92%;
-  height: 25px;
-}
-
-.dialog_close_button img {
-  border: 0;
-}
-
-.dialog_desc {
-  padding: 10px 20px;
-}
-
-/* native <dialog> element uses the ::backdrop pseudo-element */
-
-/* dialog::backdrop, */
-.dialog-backdrop {
-  display: none;
-  position: fixed;
-  overflow-y: auto;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  z-index: 1;
-}
-
-@media screen and (min-width: 640px) {
-  .dialog-backdrop {
-    background: rgb(0 0 0 / 30%);
-  }
-}
-
-.dialog-backdrop.active {
-  display: block;
-}
-
-.no-scroll {
-  overflow-y: auto !important;
-}
-
-/* this is added to the body when a dialog is open */
-.has-dialog {
-  overflow: hidden;
-}

package/sandbox/package.json

@@ -16,7 +16,7 @@
   "author": "",
   "dependencies": {
     "govuk-frontend": "3.14",
-    "jquery": "^3.6.1",
+    "jquery": "^3.6.0",
     "sass": "^1.53.0",
     "typeahead-aria": "^1.0.4"
   },

package/sandbox/yarn.lock

@@ -130,16 +130,11 @@ is-number@^7.0.0:
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
   integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
 
-jquery@>=1.11:
+jquery@>=1.11, jquery@^3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz#c72a09f15c1bdce142f49dbf1170bdf8adac2470"
   integrity sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==
 
-jquery@^3.6.1:
-  version "3.7.1"
-  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.7.1.tgz#083ef98927c9a6a74d05a6af02806566d16274de"
-  integrity sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==
-
 minimatch@^3.0.4:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"