Merge branch 'main' into landing-page

docs/Middleware Guidelines.md

@@ -2,10 +2,13 @@
 
 This document outlines convetions/rules of thumb for adding new routes/middleware to the app.
 
-Relevant modules: 
-- [controllers/middleware.js](../src/controllers/middleware.js)
+Relevant modules:
+- [middleware/*](../src/middleware)
+  - [common.middleware.js](../src/middleware/common.middleware.js) (common middlewares that are used by more than one middleware chain)
+  - [middleware.builders.js](../src/middleware/middleware.builders.js) (Middleware builders for data fetching, conditional execution, and template rendering.)
+  - middleware chains and any middleware that is used by only that chain should be put into its own file for example [middleware/issueDetails.middleware.js](../src/middleware/issueDetails.middleware.js)
 - [routes/schemas.js](../src/routes/schemas.js)
-- [OrganisationsController.js](../src/controllers/OrganisationsController.js) - contains usage examples of the two above
+
 
 ## Middleware chains
 

package.json

@@ -71,11 +71,12 @@
     "dotenv": "^16.4.5",
     "express": "^4.19.2",
     "express-session": "^1.18.0",
-    "govuk-frontend": "^5.4.0",
+    "govuk-frontend": "^5.6.0",
     "hmpo-config": "^3.0.0",
     "hmpo-form-wizard": "^13.0.0",
     "hmpo-i18n": "^6.0.1",
     "js-yaml": "^4.1.0",
+    "json5": "^2.2.3",
     "lodash": "^4.17.21",
     "maplibre-gl": "^4.1.0",
     "multer": "^1.4.5-lts.1",

src/assets/js/map.js

@@ -3,7 +3,8 @@ import maplibregl from 'maplibre-gl'
 
 const fillColor = '#008'
 const lineColor = '#000000'
-const boundaryLineColor = '#000000'
+const boundaryLineColor = '#f00'
+const boundaryLineOpacity = 1
 const opacity = 0.4
 
 /**
@@ -161,7 +162,7 @@ class Map {
       paint: {
         'line-color': boundaryLineColor,
         'line-width': 2,
-        'line-opacity': opacity
+        'line-opacity': boundaryLineOpacity
       }
     }, this.firstMapLayerId)
   }

src/assets/scss/components/_dataset-navigation.scss

@@ -0,0 +1,16 @@
+$badgeBgColour: govuk-colour('red');
+
+.app-c-dataset-navigation {
+  background-color: govuk-colour('white');
+  border-top: 1px solid govuk-colour('mid-grey');
+}
+
+.app-c-dataset-navigation__notification-badge {
+  background-color: $badgeBgColour;
+  border-radius: 10%;
+  color: govuk-colour('white');
+  text-align: center;
+  padding: 2px 6px;
+  font-size: 1rem;
+  margin-left: 5px;
+}

src/assets/scss/index.scss

@@ -4,6 +4,7 @@ $govuk-global-styles: true;
 @import "node_modules/@x-govuk/govuk-prototype-components/x-govuk/all";
 @import "src/assets/scss/_scrollable-container.scss";
 @import "./step-by-step-nav.scss";
+@import "./components/dataset-navigation";
 
 
 .app-inset-text---error {
@@ -25,7 +26,7 @@ $govuk-global-styles: true;
 
 
 }
-  
+
 .app-inset-text---warning {
   border-left: 5px solid govuk-colour('blue');
   padding: govuk-spacing(1) govuk-spacing(2);
@@ -164,4 +165,8 @@ code * {
     width: 100%;
     margin-top: govuk-spacing(3);
   }
-}
+}
+
+.padding-top {
+  padding-top: 40px;
+}