Merge branch 'main' into use-govuk-service-navigation

app/assets/sass/_helpers.scss

@@ -15,5 +15,6 @@ body:not(.js-enabled) .app-js-only {
 .app-destructive-link {
   &.govuk-link, &.govuk-link:visited {
     color: govuk-colour("red");
+    font-weight: normal;
   }
 }

app/assets/sass/application.scss

@@ -13,13 +13,8 @@ $govuk-assets-path: "/dist/govuk/assets/";
 @import "node_modules/@ministryofjustice/frontend/moj/all";
 
 // Patterns that aren't in Frontend
-@import "components/autocomplete";
-@import "components/footer";
-@import "components/summary-card";
-@import "components/task-list";
 @import "patterns/related-items";
 @import "patterns/start-page";
-@import "patterns/task-list";
 
 // Misc
 @import "helpers";
@@ -36,9 +31,11 @@ $govuk-assets-path: "/dist/govuk/assets/";
 @import "components/all-records-header";
 @import "components/all-records-search";
 @import "components/application-card";
+@import "components/autocomplete";
 @import "components/banner";
 @import "components/button-as-link";
 @import "components/cookie-banner";
+@import "components/footer";
 @import "components/invalid-answer";
 @import "components/markdown";
 @import "components/organisation-switcher";
@@ -63,7 +60,6 @@ $govuk-assets-path: "/dist/govuk/assets/";
 @import "overrides/moj-filter";
 @import "overrides/moj-pagination";
 @import "overrides/status-grid";
-@import "overrides/summary-card";
 @import "overrides/tabs";
 
 // Add extra styles here, or re-organise the Sass files in whichever way makes most sense to you

app/routes.js

@@ -18,6 +18,12 @@ router.all('*', (req, res, next) => {
     res.locals.referrer = req.query.referrer.split(',')
   }
 
+  if (req.query?.page) {
+    res.locals.page = req.query.page
+    res.locals.nextPage = parseInt(req.query.page) + 1
+    res.locals.prevPage = parseInt(req.query.page) - 1
+  }
+
   // Only search by the query if there is one
   // (and get "undefined" instead of "{}" if there is no query)
   const hasQuery = !_.isEmpty(req.query)