hof 19.14.3 → 20.0.0-beta.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (92) hide show
  1. package/.nyc_output/65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4.json +1 -0
  2. package/.nyc_output/processinfo/65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4.json +1 -0
  3. package/.nyc_output/processinfo/index.json +1 -0
  4. package/.vscode/settings.json +6 -0
  5. package/build/lib/mkdir.js +2 -2
  6. package/components/date/index.js +26 -35
  7. package/components/date/templates/date.html +15 -12
  8. package/components/emailer/index.js +41 -49
  9. package/components/emailer/transports/debug.js +2 -1
  10. package/components/summary/index.js +0 -18
  11. package/config/hof-defaults.js +2 -4
  12. package/controller/base-controller.js +8 -26
  13. package/controller/controller.js +45 -2
  14. package/frontend/govuk-template/build/config.js +3 -3
  15. package/frontend/govuk-template/build/govuk_template.html +104 -0
  16. package/frontend/govuk-template/build/index.js +2 -2
  17. package/frontend/govuk-template/govuk_template_generated.html +104 -0
  18. package/frontend/govuk-template/index.js +4 -4
  19. package/frontend/template-mixins/mixins/template-mixins.js +20 -9
  20. package/frontend/template-mixins/partials/forms/checkbox-group.html +38 -0
  21. package/frontend/template-mixins/partials/forms/checkbox.html +4 -4
  22. package/frontend/template-mixins/partials/forms/input-submit.html +1 -1
  23. package/frontend/template-mixins/partials/forms/input-text-date.html +37 -0
  24. package/frontend/template-mixins/partials/forms/input-text-group.html +12 -9
  25. package/frontend/template-mixins/partials/forms/option-group.html +33 -26
  26. package/frontend/template-mixins/partials/forms/select.html +10 -5
  27. package/frontend/template-mixins/partials/forms/textarea-group.html +15 -6
  28. package/frontend/template-mixins/partials/mixins/panel.html +4 -4
  29. package/frontend/template-partials/translations/src/en/errors.json +0 -12
  30. package/frontend/template-partials/views/accessibility.html +4 -4
  31. package/frontend/template-partials/views/cookies.html +1 -1
  32. package/frontend/template-partials/views/layout.html +22 -22
  33. package/frontend/template-partials/views/partials/back.html +1 -1
  34. package/frontend/template-partials/views/partials/bullet-list.html +1 -1
  35. package/frontend/template-partials/views/partials/confirmation-alert.html +4 -3
  36. package/frontend/template-partials/views/partials/continue.html +1 -1
  37. package/frontend/template-partials/views/partials/cookie-banner.html +27 -24
  38. package/frontend/template-partials/views/partials/cookie-settings-radio.html +6 -6
  39. package/frontend/template-partials/views/partials/external-link.html +1 -1
  40. package/frontend/template-partials/views/partials/form.html +1 -1
  41. package/frontend/template-partials/views/partials/maincontent-left.html +4 -4
  42. package/frontend/template-partials/views/partials/navigation.html +7 -6
  43. package/frontend/template-partials/views/partials/session-cookies-table.html +6 -6
  44. package/frontend/template-partials/views/partials/table.html +7 -7
  45. package/frontend/template-partials/views/partials/validation-list.html +2 -2
  46. package/frontend/template-partials/views/partials/validation-summary.html +14 -13
  47. package/frontend/template-partials/views/session-timeout.html +1 -1
  48. package/frontend/themes/gov-uk/client-js/cookieSettings.js +1 -1
  49. package/frontend/themes/gov-uk/client-js/govuk-cookies.js +122 -0
  50. package/frontend/themes/gov-uk/client-js/index.js +5 -0
  51. package/frontend/themes/gov-uk/client-js/skip-to-main.js +18 -0
  52. package/frontend/themes/gov-uk/styles/_cookie-banner.scss +51 -1
  53. package/frontend/themes/gov-uk/styles/modules/_validation.scss +3 -3
  54. package/frontend/toolkit/assets/javascript/character-count.js +4 -4
  55. package/frontend/toolkit/assets/stylesheets/modules/_validation.scss +3 -3
  56. package/index.js +5 -5
  57. package/lib/router.js +1 -2
  58. package/lib/settings.js +17 -2
  59. package/middleware/errors.js +0 -32
  60. package/middleware/index.js +1 -2
  61. package/package.json +8 -6
  62. package/sandbox/.env +1 -0
  63. package/sandbox/apps/sandbox/fields.js +24 -11
  64. package/sandbox/apps/sandbox/index.js +5 -1
  65. package/sandbox/apps/sandbox/translations/en/default.json +203 -0
  66. package/sandbox/apps/sandbox/translations/src/en/fields.json +9 -6
  67. package/sandbox/apps/sandbox/translations/src/en/journey.json +4 -1
  68. package/sandbox/apps/sandbox/translations/src/en/pages.json +2 -29
  69. package/sandbox/apps/sandbox/translations/src/en/validation.json +1 -1
  70. package/sandbox/assets/js/index.js +1 -1
  71. package/sandbox/assets/scss/app.scss +68 -16
  72. package/sandbox/package.json +4 -1
  73. package/sandbox/public/css/app.css +9444 -0
  74. package/sandbox/public/images/icons/icon-caret-left.png +0 -0
  75. package/sandbox/public/images/icons/icon-complete.png +0 -0
  76. package/sandbox/public/images/icons/icon-cross-remove-sign.png +0 -0
  77. package/sandbox/public/js/bundle.js +35644 -0
  78. package/sandbox/server.js +0 -5
  79. package/sandbox/yarn.lock +767 -0
  80. package/transpiler/lib/write-files.js +2 -1
  81. package/utilities/helpers/index.js +1 -16
  82. package/wizard/index.js +0 -1
  83. package/config/rate-limits.js +0 -20
  84. package/config/sanitisation-rules.js +0 -29
  85. package/frontend/govuk-template/govuk_template.html +0 -109
  86. package/frontend/template-partials/views/rate-limit-error.html +0 -10
  87. package/frontend/themes/gov-uk/views/partials/form.html +0 -9
  88. package/frontend/themes/gov-uk/views/partials/forms/option-group.html +0 -28
  89. package/frontend/themes/gov-uk/views/partials/mixins/panel.html +0 -3
  90. package/frontend/themes/gov-uk/views/partials/validation-summary.html +0 -24
  91. package/middleware/rate-limiter.js +0 -96
  92. package/sandbox/apps/sandbox/views/confirmation.html +0 -15
@@ -0,0 +1 @@
1
+ {"parent":null,"pid":50639,"argv":["/Users/sulthan/.nvm/versions/node/v16.14.0/bin/node","/Users/sulthan/development/HO/hof/node_modules/.bin/_mocha","test/**/*.spec.js","sandbox/test/**/*.spec.js"],"execArgv":[],"cwd":"/Users/sulthan/development/HO/hof","time":1649843631953,"ppid":50638,"coverageFilename":"/Users/sulthan/development/HO/hof/.nyc_output/65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4.json","externalId":"","uuid":"65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4","files":["/Users/sulthan/development/HO/hof/model/index.js","/Users/sulthan/development/HO/hof/components/index.js","/Users/sulthan/development/HO/hof/components/address-lookup/index.js","/Users/sulthan/development/HO/hof/components/address-lookup/default-model.js","/Users/sulthan/development/HO/hof/components/address-lookup/defaults.js","/Users/sulthan/development/HO/hof/components/clear-session/index.js","/Users/sulthan/development/HO/hof/components/date/index.js","/Users/sulthan/development/HO/hof/components/date/fields.js","/Users/sulthan/development/HO/hof/components/emailer/index.js","/Users/sulthan/development/HO/hof/components/emailer/email-service.js","/Users/sulthan/development/HO/hof/components/emailer/emailer.js","/Users/sulthan/development/HO/hof/components/emailer/transports/index.js","/Users/sulthan/development/HO/hof/components/emailer/transports/smtp.js","/Users/sulthan/development/HO/hof/components/emailer/transports/ses.js","/Users/sulthan/development/HO/hof/components/emailer/transports/stub.js","/Users/sulthan/development/HO/hof/components/emailer/transports/debug.js","/Users/sulthan/development/HO/hof/components/summary/index.js","/Users/sulthan/development/HO/hof/controller/base-controller.js","/Users/sulthan/development/HO/hof/controller/formatting/index.js","/Users/sulthan/development/HO/hof/controller/validation/index.js","/Users/sulthan/development/HO/hof/controller/validation/validators.js","/Users/sulthan/development/HO/hof/controller/validation/email.js","/Users/sulthan/development/HO/hof/controller/validation-error.js","/Users/sulthan/development/HO/hof/controller/formatting/formatters.js","/Users/sulthan/development/HO/hof/controller/index.js","/Users/sulthan/development/HO/hof/controller/behaviour-session.js","/Users/sulthan/development/HO/hof/controller/behaviour-hooks.js","/Users/sulthan/development/HO/hof/controller/controller.js","/Users/sulthan/development/HO/hof/sandbox/apps/sandbox/behaviours/country-select.js","/Users/sulthan/development/HO/hof/frontend/template-mixins/mixins/index.js","/Users/sulthan/development/HO/hof/frontend/template-mixins/mixins/template-mixins.js","/Users/sulthan/development/HO/hof/frontend/template-mixins/mixins/render.js","/Users/sulthan/development/HO/hof/frontend/template-mixins/mixins/helpers.js","/Users/sulthan/development/HO/hof/index.js","/Users/sulthan/development/HO/hof/frontend/index.js","/Users/sulthan/development/HO/hof/frontend/govuk-template/index.js","/Users/sulthan/development/HO/hof/frontend/govuk-template/build/index.js","/Users/sulthan/development/HO/hof/frontend/govuk-template/build/config.js","/Users/sulthan/development/HO/hof/frontend/template-partials/index.js","/Users/sulthan/development/HO/hof/frontend/template-partials/translations/index.js","/Users/sulthan/development/HO/hof/frontend/themes/index.js","/Users/sulthan/development/HO/hof/frontend/themes/gov-uk/index.js","/Users/sulthan/development/HO/hof/frontend/toolkit/index.js","/Users/sulthan/development/HO/hof/frontend/toolkit/assets/javascript/helpers.js","/Users/sulthan/development/HO/hof/frontend/toolkit/assets/javascript/form-focus.js","/Users/sulthan/development/HO/hof/frontend/toolkit/assets/javascript/progressive-reveal.js","/Users/sulthan/development/HO/hof/frontend/toolkit/assets/javascript/validation.js","/Users/sulthan/development/HO/hof/frontend/toolkit/assets/javascript/character-count.js","/Users/sulthan/development/HO/hof/middleware/index.js","/Users/sulthan/development/HO/hof/middleware/cookies.js","/Users/sulthan/development/HO/hof/middleware/errors.js","/Users/sulthan/development/HO/hof/middleware/not-found.js","/Users/sulthan/development/HO/hof/middleware/deep-translate.js","/Users/sulthan/development/HO/hof/lib/markdown.js","/Users/sulthan/development/HO/hof/lib/router.js","/Users/sulthan/development/HO/hof/wizard/index.js","/Users/sulthan/development/HO/hof/wizard/behaviours/index.js","/Users/sulthan/development/HO/hof/wizard/behaviours/complete.js","/Users/sulthan/development/HO/hof/wizard/util/constants.js","/Users/sulthan/development/HO/hof/lib/helpers.js","/Users/sulthan/development/HO/hof/lib/health.js","/Users/sulthan/development/HO/hof/lib/serve-static.js","/Users/sulthan/development/HO/hof/lib/ga-tag.js","/Users/sulthan/development/HO/hof/lib/sessions.js","/Users/sulthan/development/HO/hof/lib/settings.js","/Users/sulthan/development/HO/hof/config/hof-defaults.js","/Users/sulthan/development/HO/hof/lib/logger.js","/Users/sulthan/development/HO/hof/build/index.js","/Users/sulthan/development/HO/hof/config/builder-defaults.js","/Users/sulthan/development/HO/hof/transpiler/index.js","/Users/sulthan/development/HO/hof/transpiler/lib/compile.js","/Users/sulthan/development/HO/hof/transpiler/lib/build.js","/Users/sulthan/development/HO/hof/transpiler/lib/expand-dirs.js","/Users/sulthan/development/HO/hof/transpiler/lib/aggregate.js","/Users/sulthan/development/HO/hof/transpiler/lib/write-files.js","/Users/sulthan/development/HO/hof/model/apis/index.js","/Users/sulthan/development/HO/hof/model/apis/html-to-pdf-converter.js","/Users/sulthan/development/HO/hof/utilities/index.js","/Users/sulthan/development/HO/hof/utilities/autofill/index.js","/Users/sulthan/development/HO/hof/utilities/autofill/inputs.js","/Users/sulthan/development/HO/hof/utilities/test-data/index.js","/Users/sulthan/development/HO/hof/utilities/countries.js","/Users/sulthan/development/HO/hof/utilities/helpers/index.js","/Users/sulthan/development/HO/hof/utilities/reqres/index.js","/Users/sulthan/development/HO/hof/wizard/model.js","/Users/sulthan/development/HO/hof/wizard/middleware/back-links.js","/Users/sulthan/development/HO/hof/wizard/util/helpers.js","/Users/sulthan/development/HO/hof/wizard/middleware/check-complete.js","/Users/sulthan/development/HO/hof/wizard/middleware/check-progress.js","/Users/sulthan/development/HO/hof/wizard/middleware/check-session.js","/Users/sulthan/development/HO/hof/wizard/middleware/csrf.js","/Users/sulthan/development/HO/hof/sandbox/test/_unit/example_app/sections/summary-data-sections.spec.js","/Users/sulthan/development/HO/hof/sandbox/apps/sandbox/sections/summary-data-sections.js","/Users/sulthan/development/HO/hof/sandbox/apps/sandbox/lib/staticAppealStages.js","/Users/sulthan/development/HO/hof/sandbox/apps/sandbox/fields.js","/Users/sulthan/development/HO/hof/sandbox/test/helpers/utilities.js","/Users/sulthan/development/HO/hof/sandbox/apps/sandbox/behaviours/international-number.js","/Users/sulthan/development/HO/hof/lib/encryption.js"]}
@@ -0,0 +1 @@
1
+ {"processes":{"65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4":{"parent":null,"children":[]}},"files":{"/Users/sulthan/development/HO/hof/model/index.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/components/index.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/components/address-lookup/index.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/components/address-lookup/default-model.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/components/address-lookup/defaults.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/components/clear-session/index.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/components/date/index.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/components/date/fields.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/components/emailer/index.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/components/emailer/email-service.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/components/emailer/emailer.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/components/emailer/transports/index.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/components/emailer/transports/smtp.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/components/emailer/transports/ses.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/components/emailer/transports/stub.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/components/emailer/transports/debug.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/components/summary/index.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/controller/base-controller.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/controller/formatting/index.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/controller/validation/index.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/controller/validation/validators.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/controller/validation/email.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/controller/validation-error.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/controller/formatting/formatters.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/controller/index.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/controller/behaviour-session.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/controller/behaviour-hooks.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/controller/controller.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/sandbox/apps/sandbox/behaviours/country-select.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/frontend/template-mixins/mixins/index.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/frontend/template-mixins/mixins/template-mixins.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/frontend/template-mixins/mixins/render.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/frontend/template-mixins/mixins/helpers.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/index.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/frontend/index.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/frontend/govuk-template/index.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/frontend/govuk-template/build/index.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/frontend/govuk-template/build/config.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/frontend/template-partials/index.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/frontend/template-partials/translations/index.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/frontend/themes/index.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/frontend/themes/gov-uk/index.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/frontend/toolkit/index.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/frontend/toolkit/assets/javascript/helpers.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/frontend/toolkit/assets/javascript/form-focus.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/frontend/toolkit/assets/javascript/progressive-reveal.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/frontend/toolkit/assets/javascript/validation.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/frontend/toolkit/assets/javascript/character-count.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/middleware/index.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/middleware/cookies.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/middleware/errors.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/middleware/not-found.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/middleware/deep-translate.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/lib/markdown.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/lib/router.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/wizard/index.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/wizard/behaviours/index.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/wizard/behaviours/complete.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/wizard/util/constants.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/lib/helpers.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/lib/health.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/lib/serve-static.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/lib/ga-tag.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/lib/sessions.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/lib/settings.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/config/hof-defaults.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/lib/logger.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/build/index.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/config/builder-defaults.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/transpiler/index.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/transpiler/lib/compile.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/transpiler/lib/build.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/transpiler/lib/expand-dirs.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/transpiler/lib/aggregate.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/transpiler/lib/write-files.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/model/apis/index.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/model/apis/html-to-pdf-converter.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/utilities/index.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/utilities/autofill/index.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/utilities/autofill/inputs.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/utilities/test-data/index.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/utilities/countries.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/utilities/helpers/index.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/utilities/reqres/index.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/wizard/model.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/wizard/middleware/back-links.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/wizard/util/helpers.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/wizard/middleware/check-complete.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/wizard/middleware/check-progress.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/wizard/middleware/check-session.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/wizard/middleware/csrf.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/sandbox/test/_unit/example_app/sections/summary-data-sections.spec.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/sandbox/apps/sandbox/sections/summary-data-sections.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/sandbox/apps/sandbox/lib/staticAppealStages.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/sandbox/apps/sandbox/fields.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/sandbox/test/helpers/utilities.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/sandbox/apps/sandbox/behaviours/international-number.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"],"/Users/sulthan/development/HO/hof/lib/encryption.js":["65af88d9-aebe-4d1b-a21d-6fbf7f2bbda4"]},"externalIds":{}}
@@ -0,0 +1,6 @@
1
+ {
2
+ "search.exclude": {
3
+ "": true,
4
+ "**/node_modules": false
5
+ }
6
+ }
@@ -1,9 +1,9 @@
1
1
  'use strict';
2
2
 
3
3
  const path = require('path');
4
- const fs = require('fs');
4
+ const mkdirp = require('mkdirp');
5
5
 
6
6
  module.exports = file => new Promise((resolve, reject) => {
7
7
  const dir = path.dirname(file);
8
- fs.mkdir(dir, {recursive: true}, err => err ? reject(err) : resolve());
8
+ mkdirp(dir, err => err ? reject(err) : resolve());
9
9
  });
@@ -40,6 +40,7 @@ const conditionalTranslate = (key, translate) => {
40
40
  };
41
41
 
42
42
  const getLegendClassName = field => field && field.legend && field.legend.className || '';
43
+ const getNoHeading = field => field && field.noHeading || '';
43
44
 
44
45
  module.exports = (key, opts) => {
45
46
  if (!key) {
@@ -60,37 +61,6 @@ module.exports = (key, opts) => {
60
61
  dayOptional = true;
61
62
  }
62
63
 
63
- // take the 3 date parts, padding or defaulting
64
- // to '01' if applic, then create a date value in the
65
- // format YYYY-MM-DD. Save to req.body for processing
66
- const preProcess = (req, res, next) => {
67
- const parts = getParts(req.body, fields, key);
68
- if (_.some(parts, part => part !== '')) {
69
- if (dayOptional && parts.day === '') {
70
- parts.day = '01';
71
- } else {
72
- parts.day = pad(parts.day);
73
- }
74
- if (monthOptional && parts.month === '') {
75
- parts.month = '01';
76
- } else {
77
- parts.month = pad(parts.month);
78
- }
79
- req.body[key] = `${parts.year}-${parts.month}-${parts.day}`;
80
- }
81
- next();
82
- };
83
-
84
- // defaultFormatters on the base controller replace '--' with '-' on the process step.
85
- // This ensures having the correct number of hyphens, so values do not jump from year to month.
86
- // This should only be done on a partially completed date field otherwise the validation messages break.
87
- const postProcess = (req, res, next) => {
88
- const value = req.form.values[key];
89
- if (value) {
90
- req.form.values[key] = req.body[key];
91
- }
92
- next();
93
- };
94
64
  // if date field is included in errorValues, extend
95
65
  // errorValues with the individual components
96
66
  const preGetErrors = (req, res, next) => {
@@ -144,8 +114,9 @@ module.exports = (key, opts) => {
144
114
  const legend = conditionalTranslate(`fields.${key}.legend`, req.translate);
145
115
  const hint = conditionalTranslate(`fields.${key}.hint`, req.translate);
146
116
  const legendClassName = getLegendClassName(options);
117
+ const noHeading = getNoHeading(options);
147
118
  const error = req.form.errors && req.form.errors[key];
148
- res.render(template, { key, legend, legendClassName, hint, error }, (err, html) => {
119
+ res.render(template, { key, legend, legendClassName, noHeading, hint, error }, (err, html) => {
149
120
  if (err) {
150
121
  next(err);
151
122
  } else {
@@ -156,15 +127,35 @@ module.exports = (key, opts) => {
156
127
  });
157
128
  };
158
129
 
130
+ // take the 3 date parts, padding or defaulting
131
+ // to '01' if applic, then create a date value in the
132
+ // format YYYY-MM-DD. Save to req.body for processing
133
+ const preProcess = (req, res, next) => {
134
+ const parts = getParts(req.body, fields, key);
135
+ if (_.some(parts, part => part !== '')) {
136
+ if (dayOptional && parts.day === '') {
137
+ parts.day = '01';
138
+ } else {
139
+ parts.day = pad(parts.day);
140
+ }
141
+ if (monthOptional && parts.month === '') {
142
+ parts.month = '01';
143
+ } else {
144
+ parts.month = pad(parts.month);
145
+ }
146
+ req.body[key] = `${parts.year}-${parts.month}-${parts.day}`;
147
+ }
148
+ next();
149
+ };
150
+
159
151
  // return config extended with hooks
160
152
  return Object.assign({}, options, {
161
153
  hooks: {
162
- 'pre-process': preProcess,
163
- 'post-process': postProcess,
164
154
  'pre-getErrors': preGetErrors,
165
155
  'post-getErrors': postGetErrors,
166
156
  'post-getValues': postGetValues,
167
- 'pre-render': preRender
157
+ 'pre-render': preRender,
158
+ 'pre-process': preProcess
168
159
  }
169
160
  });
170
161
  };
@@ -1,17 +1,20 @@
1
- <fieldset id="{{key}}-group" class="{{#className}}{{className}}{{/className}} {{#error}}validation-error{{/error}}">
2
- <legend>
3
- {{#error}}
4
- <span id="{{key}}-error" class="error-message">{{error.message}}</span>
5
- {{/error}}
6
- <span{{#legendClassName}} class="{{legendClassName}}"{{/legendClassName}}>{{legend}}</span>
1
+ <div class="govuk-form-group {{#error}}govuk-form-group--error{{/error}}">
2
+ <fieldset id="{{key}}-group" class="govuk-fieldset{{#className}} {{className}}{{/className}}" role="group">
3
+ <legend class="govuk-fieldset__legend {{^noHeading}}govuk-fieldset__legend--l{{/noHeading}}{{#legendClassName}} {{legendClassName}}{{/legendClassName}}">
4
+ {{^noHeading}}<h1 class="govuk-fieldset__heading">{{/noHeading}}
5
+ {{legend}}
6
+ {{^noHeading}}</h1>{{/noHeading}}
7
+ </legend>
7
8
  {{#hint}}
8
- <span id="{{key}}-hint" class="form-hint">{{hint}}</span>
9
+ <span id="{{key}}-hint" class="govuk-hint">{{hint}}</span>
9
10
  {{/hint}}
10
- </legend>
11
-
12
- <input type="hidden" name="{{key}}" />
13
-
14
- <div class="form-group form-date">
11
+ {{#error}}
12
+ <p id="{{key}}-error" class="govuk-error-message">
13
+ <span class="govuk-visually-hidden">Error:</span> {{error.message}}
14
+ </p>
15
+ {{/error}}
16
+ <div class="govuk-date-input">
15
17
  {{#input-date}}{{key}}{{/input-date}}
16
18
  </div>
17
19
  </fieldset>
20
+ </div>
@@ -17,56 +17,48 @@ module.exports = config => {
17
17
  }
18
18
 
19
19
  return superclass => class EmailBehaviour extends superclass {
20
- async successHandler(req, res, next) {
21
- req.sessionModel.unset('nodemailer-error');
22
-
23
- try {
24
- debug(`Loading email template from ${config.template}`);
25
-
26
- const template = await new Promise((resolve, reject) => {
27
- return fs.readFile(config.template, (err, resolvedTemplate) => {
28
- return err ? reject(err) : resolve(resolvedTemplate.toString('utf8'));
20
+ successHandler(req, res, callback) {
21
+ Promise.resolve()
22
+ .then(() => {
23
+ debug(`Loading email template from ${config.template}`);
24
+ return new Promise((resolve, reject) => {
25
+ fs.readFile(config.template, (err, template) => err ? reject(err) : resolve(template.toString('utf8')));
29
26
  });
30
- });
31
-
32
- debug('Rendering email content');
33
-
34
- const data = config.parse(req.sessionModel.toJSON(), req.translate);
35
-
36
- debug('Building email settings');
37
-
38
- const settings = { body: Hogan.compile(template).render(data) };
39
-
40
- if (typeof config.recipient === 'function') {
41
- settings.recipient = config.recipient(req.sessionModel.toJSON());
42
- } else {
43
- settings.recipient = req.sessionModel.get(config.recipient) || config.recipient;
44
- }
45
- if (typeof settings.recipient !== 'string' || !settings.recipient.includes('@')) {
46
- return next(new Error('hof-behaviour-emailer: invalid recipient'));
47
- }
48
-
49
- if (typeof config.subject === 'function') {
50
- settings.subject = config.subject(req.sessionModel.toJSON(), req.translate);
51
- } else {
52
- settings.subject = config.subject;
53
- }
54
-
55
- debug('Sending email', settings);
56
-
57
- await emailer.send(settings);
58
-
59
- debug('Email sent successfully');
60
-
61
- return super.successHandler(req, res, next);
62
- } catch (e) {
63
- if (config.emailerFallback) {
64
- req.log('error', e.message || e);
65
- req.sessionModel.set('nodemailer-error', true);
66
- return super.successHandler(req, res, next);
67
- }
68
- return next(e);
69
- }
27
+ })
28
+ .then(template => {
29
+ debug('Rendering email content');
30
+ const data = config.parse(req.sessionModel.toJSON(), req.translate);
31
+ return Hogan.compile(template).render(data);
32
+ })
33
+ .then(body => {
34
+ debug('Building email settings');
35
+ const settings = { body };
36
+
37
+ if (typeof config.recipient === 'function') {
38
+ settings.recipient = config.recipient(req.sessionModel.toJSON());
39
+ } else {
40
+ settings.recipient = req.sessionModel.get(config.recipient) || config.recipient;
41
+ }
42
+ if (typeof settings.recipient !== 'string' || !settings.recipient.includes('@')) {
43
+ throw new Error('hof-behaviour-emailer: invalid recipient');
44
+ }
45
+
46
+ if (typeof config.subject === 'function') {
47
+ settings.subject = config.subject(req.sessionModel.toJSON(), req.translate);
48
+ } else {
49
+ settings.subject = config.subject;
50
+ }
51
+
52
+ return settings;
53
+ })
54
+ .then(settings => {
55
+ debug('Sending email', settings);
56
+ return emailer.send(settings);
57
+ })
58
+ .then(() => {
59
+ debug('Email sent successfully');
60
+ super.successHandler(req, res, callback);
61
+ }, callback);
70
62
  }
71
63
  };
72
64
  };
@@ -4,6 +4,7 @@
4
4
  const fs = require('fs');
5
5
  const path = require('path');
6
6
  const cp = require('child_process');
7
+ const mkdirp = require('mkdirp');
7
8
 
8
9
  const mimes = {
9
10
  '.gif': 'image/gif',
@@ -11,7 +12,7 @@ const mimes = {
11
12
  };
12
13
 
13
14
  const mkdir = dir => new Promise((resolve, reject) => {
14
- fs.mkdir(dir, {recursive: true}, err => err ? reject(err) : resolve());
15
+ mkdirp(dir, err => err ? reject(err) : resolve());
15
16
  });
16
17
 
17
18
  const cidToBase64 = (h, attachments) => {
@@ -1,9 +1,6 @@
1
1
 
2
2
  'use strict';
3
3
 
4
- const config = require('../../config/rate-limits');
5
- const rateLimiter = require('../../middleware/rate-limiter');
6
-
7
4
  const concat = (x, y) => x.concat(y);
8
5
  const flatMap = (f, xs) => xs.map(f).reduce(concat, []);
9
6
 
@@ -218,19 +215,4 @@ module.exports = SuperClass => class extends SuperClass {
218
215
  rows
219
216
  });
220
217
  }
221
-
222
- validate(req, res, next) {
223
- if (!config.rateLimits.submissions.active) {
224
- return super.validate(req, res, next);
225
- }
226
- // how do we stop this ballsing up our tests??????
227
- const options = Object.assign({}, config, { logger: req });
228
-
229
- return rateLimiter(options, 'submissions')(req, res, err => {
230
- if (err) {
231
- return next(err);
232
- }
233
- return super.validate(req, res, next);
234
- });
235
- }
236
218
  };
@@ -1,6 +1,5 @@
1
1
  'use strict';
2
2
  /* eslint no-process-env: "off" */
3
- const rateLimits = require('./rate-limits');
4
3
 
5
4
  const defaults = {
6
5
  appName: process.env.APP_NAME || 'HOF Application',
@@ -32,8 +31,7 @@ const defaults = {
32
31
  session: {
33
32
  ttl: process.env.SESSION_TTL || 1800,
34
33
  secret: process.env.SESSION_SECRET || 'changethis',
35
- name: process.env.SESSION_NAME || 'hod.sid',
36
- sanitiseInputs: false
34
+ name: process.env.SESSION_NAME || 'hod.sid'
37
35
  },
38
36
  apis: {
39
37
  pdfConverter: process.env.PDF_CONVERTER_URL
@@ -41,4 +39,4 @@ const defaults = {
41
39
  serveStatic: process.env.SERVE_STATIC_FILES !== 'false'
42
40
  };
43
41
 
44
- module.exports = Object.assign({}, defaults, rateLimits);
42
+ module.exports = defaults;
@@ -8,8 +8,6 @@ const debug = require('debug')('hmpo:form');
8
8
  const dataFormatter = require('./formatting');
9
9
  const dataValidator = require('./validation');
10
10
  const ErrorClass = require('./validation-error');
11
- const Helpers = require('../utilities').helpers;
12
- const sanitisationBlacklistArray = require('../config/sanitisation-rules');
13
11
 
14
12
  module.exports = class BaseController extends EventEmitter {
15
13
  constructor(options) {
@@ -71,7 +69,6 @@ module.exports = class BaseController extends EventEmitter {
71
69
  this._configure.bind(this),
72
70
  this._process.bind(this),
73
71
  this._validate.bind(this),
74
- this._sanitize.bind(this),
75
72
  this._getHistoricalValues.bind(this),
76
73
  this.saveValues.bind(this),
77
74
  this.successHandler.bind(this),
@@ -165,28 +162,6 @@ module.exports = class BaseController extends EventEmitter {
165
162
  return validator(key, req.form.values[key], req.form.values, emptyValue);
166
163
  }
167
164
 
168
- _sanitize(req, res, callback) {
169
- // Sanitisation could be disabled in the config
170
- if(!this.options.sanitiseInputs) return callback();
171
-
172
- // If we don't have any data, no need to progress
173
- if(!_.isEmpty(req.form.values)) {
174
- Object.keys(req.form.values).forEach(function (property, propertyIndex) {
175
- // If it's not a string, don't sanitise it
176
- if(_.isString(req.form.values[property])) {
177
- // For each property in our form data
178
- Object.keys(sanitisationBlacklistArray).forEach(function (blacklisted, blacklistedIndex) {
179
- const blacklistedDetail = sanitisationBlacklistArray[blacklisted];
180
- const regexQuery = new RegExp(blacklistedDetail.regex, 'gi');
181
- // Will perform the required replace based on our passed in regex and the replace string
182
- req.form.values[property] = req.form.values[property].replace(regexQuery, blacklistedDetail.replace);
183
- });
184
- }
185
- });
186
- }
187
- return callback();
188
- }
189
-
190
165
  _process(req, res, callback) {
191
166
  req.form.values = req.form.values || {};
192
167
  const formatter = dataFormatter(
@@ -238,9 +213,16 @@ module.exports = class BaseController extends EventEmitter {
238
213
  }
239
214
 
240
215
  _getForkTarget(req, res) {
216
+ function evalCondition(condition) {
217
+ return _.isFunction(condition) ?
218
+ condition(req, res) :
219
+ condition.value === (req.form.values[condition.field] ||
220
+ (req.form.historicalValues && req.form.historicalValues[condition.field]));
221
+ }
222
+
241
223
  // If a fork condition is met, its target supercedes the next property
242
224
  return req.form.options.forks.reduce((result, value) =>
243
- Helpers.isFieldValueInPageOrSessionValid(req, res, value.condition) ?
225
+ evalCondition(value.condition) ?
244
226
  value.target :
245
227
  result
246
228
  , req.form.options.next);
@@ -4,7 +4,6 @@ const _ = require('lodash');
4
4
  const i18nLookup = require('i18n-lookup');
5
5
  const Mustache = require('mustache');
6
6
  const BaseController = require('./base-controller');
7
- const Helpers = require('../utilities').helpers;
8
7
 
9
8
  const omitField = (field, req) => field.useWhen && (typeof field.useWhen === 'string'
10
9
  ? req.sessionModel.get(field.useWhen) !== 'true'
@@ -55,7 +54,12 @@ module.exports = class Controller extends BaseController {
55
54
 
56
55
  // If a form condition is met, its target supercedes the next property
57
56
  next = _.reduce(forks, (result, value) => {
58
- if (Helpers.isFieldValueInPageOrSessionValid(req, res, value.condition)) {
57
+ const evalCondition = condition => _.isFunction(condition) ?
58
+ condition(req, res) :
59
+ condition.value === (req.form.values[condition.field] ||
60
+ (req.form.historicalValues && req.form.historicalValues[condition.field]));
61
+
62
+ if (evalCondition(value.condition)) {
59
63
  if (value.continueOnEdit) {
60
64
  req.form.options.continueOnEdit = true;
61
65
  }
@@ -111,7 +115,11 @@ module.exports = class Controller extends BaseController {
111
115
  fields,
112
116
  route,
113
117
  baseUrl: req.baseUrl,
118
+ skipToMain: this.getFirstFormItem(req.form.options.fields),
114
119
  title: this.getTitle(route, lookup, req.form.options.fields, res.locals),
120
+ header: this.getHeader(route, lookup, res.locals),
121
+ captionHeading: this.getCaptionHeading(route, lookup, res.locals),
122
+ subHeading: this.getSubHeading(route, lookup, res.locals),
115
123
  intro: this.getIntro(route, lookup, res.locals),
116
124
  backLink: this.getBackLink(req, res),
117
125
  nextPage: this.getNextStep(req, res),
@@ -119,6 +127,26 @@ module.exports = class Controller extends BaseController {
119
127
  }, stepLocals);
120
128
  }
121
129
 
130
+ getFirstFormItem(fields) {
131
+ let firstFieldKey
132
+ if (_.size(fields)) {
133
+ firstFieldKey = Object.keys(fields)[0]
134
+ }
135
+ return firstFieldKey | 'main-content';
136
+ }
137
+
138
+ getHeader(route, lookup, locals){
139
+ return lookup(`pages.${route}.header`, locals);
140
+ }
141
+
142
+ getCaptionHeading(route, lookup, locals){
143
+ return lookup(`pages.${route}.captionHeading`, locals);
144
+ }
145
+
146
+ getSubHeading(route, lookup, locals){
147
+ return lookup(`pages.${route}.subHeading`, locals);
148
+ }
149
+
122
150
  getTitle(route, lookup, fields, locals) {
123
151
  let fieldName = '';
124
152
  if (_.size(fields)) {
@@ -140,6 +168,21 @@ module.exports = class Controller extends BaseController {
140
168
  _getErrors(req, res, callback) {
141
169
  super._getErrors(req, res, () => {
142
170
  Object.keys(req.form.errors).forEach(key => {
171
+ if (req.form && req.form.options && req.form.options.fields) {
172
+ const field = req.form.options.fields[key];
173
+ // get first option for radios
174
+ if(field.mixin === 'radio-group') {
175
+ req.form.errors[key].errorLinkId = key + "-" + field.options[0];
176
+ }
177
+ // get first field for date input control
178
+ else if (field && field.controlType === 'date-input') {
179
+ req.form.errors[key].errorLinkId = key + '-day';
180
+ }
181
+ else {
182
+ req.form.errors[key].errorLinkId = key;
183
+ }
184
+ }
185
+
143
186
  req.form.errors[key].message = this.getErrorMessage(req.form.errors[key], req, res);
144
187
  });
145
188
  callback();
@@ -4,7 +4,8 @@ module.exports = {
4
4
  htmlLang: '{{htmlLang}}',
5
5
  assetPath: '{{govukAssetPath}}',
6
6
  afterHeader: '{{$afterHeader}}{{/afterHeader}}',
7
- bodyClasses: '{{$bodyClasses}}{{/bodyClasses}}',
7
+ bodyClasses: '{{$bodyClasses}}{{/bodyClasses}}',
8
+ bodyStart: '{{$bodyStart}}{{/bodyStart}}',
8
9
  bodyEnd: '{{$bodyEnd}}{{/bodyEnd}}',
9
10
  content: '{{$main}}{{/main}}',
10
11
  cookieMessage: '{{$cookieMessage}}{{/cookieMessage}}',
@@ -17,8 +18,7 @@ module.exports = {
17
18
  insideHeader: '{{$insideHeader}}{{/insideHeader}}',
18
19
  pageTitle: '{{$pageTitle}}{{/pageTitle}}',
19
20
  propositionHeader: '{{$propositionHeader}}{{/propositionHeader}}',
20
- skipLinkMessage: '{{$skipLinkMessage}}Skip to main content{{/skipLinkMessage}}',
21
21
  globalHeaderText: '{{$globalHeaderText}}GOV.UK{{/globalHeaderText}}',
22
- licenceMessage: '{{$licenceMessage}}<p>All content is available under the <a href="https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/" rel="license">Open Government Licence v3.0</a>, except where otherwise stated</p>{{/licenceMessage}}',
22
+ licenceMessage: '{{$licenceMessage}}All content is available under the <a href="https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/" id="open-government-licence" class="govuk-footer__link" target="_blank" rel="license">Open Government Licence v3.0</a>, except where otherwise stated{{/licenceMessage}}',
23
23
  crownCopyrightMessage: '{{$crownCopyrightMessage}}© Crown copyright{{/crownCopyrightMessage}}'
24
24
  };