Merge remote-tracking branch 'origin/main' into invalidateFormFields

index.js

@@ -65,7 +65,7 @@ app.use('/', formWizard)
 
 // file not found handler
 app.use((req, res, next) => {
-  res.status(404).render('pages/file-not-found')
+  res.status(404).render('file-not-found')
 })
 
 // error handler
@@ -74,7 +74,7 @@ app.use((err, req, res, next) => {
 
   // handle session expired
   if (err.code === 'SESSION_TIMEOUT') {
-    err.template = 'pages/session-expired'
+    err.template = 'session-expired'
   }
 
   // handle errors with automatic redirects
@@ -84,7 +84,7 @@ app.use((err, req, res, next) => {
 
   // show error page
   err.status = err.status || 500
-  err.template = err.template || 'pages/error'
+  err.template = err.template || 'error'
   res.status(err.status).render(err.template, { err })
 })
 

src/views/error.html

@@ -0,0 +1,20 @@
+
+{% from "govuk/components/button/macro.njk" import govukButton %}
+
+{% set pageName = "Error" %}
+
+{% extends "layouts/main.html" %}
+
+{% block content %}
+    <h1 class="govuk-heading-xl">Error</h1>
+
+    <h2>{{err.code + " - " if err.code}}{{err.message}}</h2>
+    {%if err.stack %}
+        <pre>{{err.stack | safe}}</pre>
+    {% endif %}
+
+    {{ govukButton({
+        text: "Start again",
+        href: "/"
+    }) }}
+{% endblock %}

src/views/file-not-found.html

@@ -0,0 +1,15 @@
+
+{% from "govuk/components/button/macro.njk" import govukButton %}
+
+{% set pageName = "File not found" %}
+
+{% extends "layouts/main.html" %}
+
+{% block content %}
+    <h2>Error: File not found</h2>
+
+    {{ govukButton({
+        text: "Start again",
+        href: "/"
+    }) }}
+{% endblock %}

src/views/session-expired.html

@@ -0,0 +1,22 @@
+{% extends "layouts/main.html" %}
+
+{% from "govuk/components/button/macro.njk" import govukButton %}
+
+{% set pageName = 'Session Expired: ' + serviceName %}
+
+{% block content %}
+    <div class="govuk-grid-row">
+        <div class="govuk-grid-column-two-thirds">
+        <h1 class="govuk-heading-xl">
+            Session Expired
+        </h1>
+        </div>
+    </div>
+
+    <form method="POST">
+        {{ govukButton({
+          text: "Start over",
+          href: "/"
+        }) }}
+    </form>
+{% endblock %}