feat(DTFS2-NONE): update favicon to tudor crown

UK-Export-Finance · Apr 3, 2024 · 3c8b7f2 · 3c8b7f2
1 parent 38fa9a1
commit 3c8b7f2
Show file tree

Hide file tree

Showing 17 changed files with 33 additions and 33 deletions.
diff --git a/gef-ui/package.json b/gef-ui/package.json
@@ -53,7 +53,7 @@
     "express-session": "1.17.3",
     "filesize": "9.0.11",
     "form-data": "4.0.0",
-    "govuk-frontend": "4.6.0",
+    "govuk-frontend": "^4.8.0",
     "http-errors": "^2.0.0",
     "imask": "^6.6.3",
     "joi": "^17.12.2",

diff --git a/gef-ui/public/css/styles.css b/gef-ui/public/css/styles.css
diff --git a/gef-ui/public/js/govukFrontend.js b/gef-ui/public/js/govukFrontend.js
diff --git a/gef-ui/public/js/govukFrontend.js.map b/gef-ui/public/js/govukFrontend.js.map
diff --git a/gef-ui/server/generateApp.js b/gef-ui/server/generateApp.js
@@ -13,13 +13,7 @@ const routes = require('./routes');
 const supportingInformationUploadRoutes = require('./routes/supporting-information-upload');
 const healthcheck = require('./healthcheck');
 const configureNunjucks = require('./nunjucks-configuration');
-const {
-  csrfToken,
-  copyCsrfTokenFromQueryToBody,
-  security,
-  seo,
-  createRateLimit,
-} = require('./middleware');
+const { csrfToken, copyCsrfTokenFromQueryToBody, security, seo, createRateLimit } = require('./middleware');
 
 dotenv.config();
 
@@ -104,11 +98,17 @@ const generateApp = () => {
     watch: true,
   });
 
-  app.use(morgan('dev', {
-    skip: (req) => req.url.startsWith('/assets') || req.url.startsWith('/main.js'),
-  }));
-
-  app.use('/assets', express.static(path.join(__dirname, '..', 'public')));
+  app.use(
+    morgan('dev', {
+      skip: (req) => req.url.startsWith('/assets') || req.url.startsWith('/main.js'),
+    }),
+  );
+
+  app.use(
+    '/assets',
+    express.static(path.join(__dirname, '..', 'node_modules', 'govuk-frontend', 'govuk', 'assets')),
+    express.static(path.join(__dirname, '..', 'public')),
+  );
 
   app.use(createRateLimit());
 

diff --git a/gef-ui/webpack.common.config.js b/gef-ui/webpack.common.config.js
@@ -26,7 +26,7 @@ module.exports = {
   resolve: {
     // resolves paths in library files that we don't control, pointing them to the root hoisted dependencies
     alias: {
-      'node_modules/govuk-frontend': path.resolve(__dirname, '../node_modules/govuk-frontend/dist'),
+      'node_modules/govuk-frontend': path.resolve(__dirname, '../node_modules/govuk-frontend'),
       'node_modules/@ministryofjustice': path.resolve(__dirname, '../node_modules/@ministryofjustice'),
     },
   },

diff --git a/package-lock.json b/package-lock.json
diff --git a/portal/package.json b/portal/package.json
@@ -49,7 +49,7 @@
     "express-rate-limit": "^6.11.2",
     "express-session": "1.17.3",
     "form-data": "4.0.0",
-    "govuk-frontend": "4.6.0",
+    "govuk-frontend": "^4.8.0",
     "http-errors": "^2.0.0",
     "imask": "^6.6.3",
     "joi": "^17.12.2",

diff --git a/portal/public/css/styles.css b/portal/public/css/styles.css
diff --git a/portal/public/js/govukFrontend.js b/portal/public/js/govukFrontend.js
diff --git a/portal/public/js/govukFrontend.js.map b/portal/public/js/govukFrontend.js.map
diff --git a/portal/webpack.common.config.js b/portal/webpack.common.config.js
@@ -32,7 +32,7 @@ module.exports = {
   resolve: {
     // resolves paths in library files that we don't control, pointing them to the root hoisted dependencies
     alias: {
-      'node_modules/govuk-frontend': path.resolve(__dirname, '../node_modules/govuk-frontend/dist'),
+      'node_modules/govuk-frontend': path.resolve(__dirname, '../node_modules/govuk-frontend'),
       'node_modules/@ministryofjustice': path.resolve(__dirname, '../node_modules/@ministryofjustice'),
     },
   },

diff --git a/trade-finance-manager-ui/package.json b/trade-finance-manager-ui/package.json
@@ -52,7 +52,7 @@
     "express-session": "1.17.3",
     "express-validator": "7.0.1",
     "express-xss-sanitizer": "^1.1.9",
-    "govuk-frontend": "4.6.0",
+    "govuk-frontend": "^4.8.0",
     "imask": "^6.6.3",
     "joi": "^17.12.2",
     "jquery": "3.6.4",

diff --git a/trade-finance-manager-ui/public/css/styles.css b/trade-finance-manager-ui/public/css/styles.css
diff --git a/trade-finance-manager-ui/public/js/govukFrontend.js b/trade-finance-manager-ui/public/js/govukFrontend.js
diff --git a/trade-finance-manager-ui/public/js/govukFrontend.js.map b/trade-finance-manager-ui/public/js/govukFrontend.js.map
diff --git a/trade-finance-manager-ui/webpack.common.config.js b/trade-finance-manager-ui/webpack.common.config.js
@@ -27,7 +27,7 @@ module.exports = {
   resolve: {
     // resolves paths in library files that we don't control, pointing them to the root hoisted dependencies
     alias: {
-      'node_modules/govuk-frontend': path.resolve(__dirname, '../node_modules/govuk-frontend/dist'),
+      'node_modules/govuk-frontend': path.resolve(__dirname, '../node_modules/govuk-frontend'),
       'node_modules/@ministryofjustice': path.resolve(__dirname, '../node_modules/@ministryofjustice'),
     },
   },