From 5ada406f43171adf6ab3731878f5d7a3504760ec Mon Sep 17 00:00:00 2001 From: zachary Date: Thu, 2 Jul 2026 16:16:15 +0100 Subject: [PATCH 1/3] fix --- apps/backend/src/config/dependencyConfigDLS.ts | 12 ++++++++---- .../src/config/dls/configureDLSEnvironment.ts | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/apps/backend/src/config/dependencyConfigDLS.ts b/apps/backend/src/config/dependencyConfigDLS.ts index d942f98755..da1f38ac3a 100644 --- a/apps/backend/src/config/dependencyConfigDLS.ts +++ b/apps/backend/src/config/dependencyConfigDLS.ts @@ -1,15 +1,15 @@ import { ConsoleLogger, setLogger } from '@user-office-software/duo-logger'; import 'reflect-metadata'; +import { getSecondsFromAllocationTimeUnits } from './base/allocationTimeUnitConverter'; +import { configureDLSEnvironment } from './dls/configureDLSEnvironment'; import { Tokens } from './Tokens'; +import { mapClass, mapValue } from './utils'; import { DataAccessUsersAuthorization } from '../auth/DataAccessUsersAuthorization'; import { DLSUserAuthorization } from '../auth/DLSUserAuthorization'; -import { getSecondsFromAllocationTimeUnits } from './base/allocationTimeUnitConverter'; import { ProposalAuthorization } from '../auth/ProposalAuthorization'; import { VisitAuthorization } from '../auth/VisitAuthorization'; import { VisitRegistrationAuthorization } from '../auth/VisitRegistrationAuthorization'; -import { configureDLSEnvironment } from './dls/configureDLSEnvironment'; -import { mapClass, mapValue } from './utils'; import { PostgresAdminDataSourceWithAutoUpgrade } from '../datasources/postgres/AdminDataSource'; import PostgresCallDataSource from '../datasources/postgres/CallDataSource'; import PostgresCoProposerClaimDataSource from '../datasources/postgres/CoProposerClaimDataSource'; @@ -63,6 +63,7 @@ import { } from '../factory/xlsx/FapDataRow'; import BasicUserDetailsLoader from '../loaders/BasicUserDetailsLoader'; import { SkipAssetRegistrar } from '../services/assetRegistrar/skip/SkipAssetRegistrar'; +import { isDevelopment } from '../utils/helperFunctions'; mapClass(Tokens.AdminDataSource, PostgresAdminDataSourceWithAutoUpgrade); mapClass(Tokens.CoProposerClaimDataSource, PostgresCoProposerClaimDataSource); @@ -140,7 +141,10 @@ mapValue(Tokens.LoggingHandler, createLoggingHandler()); mapValue(Tokens.EventBus, createApplicationEventBus()); mapValue(Tokens.ListenToMessageQueue, createListenToRabbitMQHandler()); -mapValue(Tokens.ConfigureEnvironment, configureDLSEnvironment); +mapValue( + Tokens.ConfigureEnvironment, + isDevelopment ? configureDLSEnvironment : () => {} +); mapValue(Tokens.ConfigureLogger, () => setLogger(new ConsoleLogger())); mapClass(Tokens.BasicUserDetailsLoader, BasicUserDetailsLoader); diff --git a/apps/backend/src/config/dls/configureDLSEnvironment.ts b/apps/backend/src/config/dls/configureDLSEnvironment.ts index cff8fe28e9..acd04eac8c 100644 --- a/apps/backend/src/config/dls/configureDLSEnvironment.ts +++ b/apps/backend/src/config/dls/configureDLSEnvironment.ts @@ -28,7 +28,7 @@ async function setDLSColourTheme() { }), db.updateSettings({ settingsId: SettingsId.PALETTE_PRIMARY_MAIN, - settingsValue: '#202945', + settingsValue: '#8B008B', }), db.updateSettings({ settingsId: SettingsId.PALETTE_PRIMARY_LIGHT, From ab11f5229582ae8b1171795e2cd7c5d6bad3706f Mon Sep 17 00:00:00 2001 From: zachary Date: Thu, 2 Jul 2026 16:44:34 +0100 Subject: [PATCH 2/3] make work --- .../backend/src/config/dependencyConfigDLS.ts | 6 +---- .../src/config/dls/configureDLSEnvironment.ts | 26 ++++++++++++------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/apps/backend/src/config/dependencyConfigDLS.ts b/apps/backend/src/config/dependencyConfigDLS.ts index da1f38ac3a..0e506f2ec2 100644 --- a/apps/backend/src/config/dependencyConfigDLS.ts +++ b/apps/backend/src/config/dependencyConfigDLS.ts @@ -63,7 +63,6 @@ import { } from '../factory/xlsx/FapDataRow'; import BasicUserDetailsLoader from '../loaders/BasicUserDetailsLoader'; import { SkipAssetRegistrar } from '../services/assetRegistrar/skip/SkipAssetRegistrar'; -import { isDevelopment } from '../utils/helperFunctions'; mapClass(Tokens.AdminDataSource, PostgresAdminDataSourceWithAutoUpgrade); mapClass(Tokens.CoProposerClaimDataSource, PostgresCoProposerClaimDataSource); @@ -141,10 +140,7 @@ mapValue(Tokens.LoggingHandler, createLoggingHandler()); mapValue(Tokens.EventBus, createApplicationEventBus()); mapValue(Tokens.ListenToMessageQueue, createListenToRabbitMQHandler()); -mapValue( - Tokens.ConfigureEnvironment, - isDevelopment ? configureDLSEnvironment : () => {} -); +mapValue(Tokens.ConfigureEnvironment, configureDLSEnvironment); mapValue(Tokens.ConfigureLogger, () => setLogger(new ConsoleLogger())); mapClass(Tokens.BasicUserDetailsLoader, BasicUserDetailsLoader); diff --git a/apps/backend/src/config/dls/configureDLSEnvironment.ts b/apps/backend/src/config/dls/configureDLSEnvironment.ts index acd04eac8c..d544bf37af 100644 --- a/apps/backend/src/config/dls/configureDLSEnvironment.ts +++ b/apps/backend/src/config/dls/configureDLSEnvironment.ts @@ -3,6 +3,7 @@ import { container } from 'tsyringe'; import { AdminDataSource } from '../../datasources/AdminDataSource'; import { FeatureId } from '../../models/Feature'; import { SettingsId } from '../../models/Settings'; +import { isDevelopment, isStaging } from '../../utils/helperFunctions'; import { setTimezone, setDateTimeFormats } from '../setTimezoneAndFormat'; import { Tokens } from '../Tokens'; import { updateOIDCSettings } from '../updateOIDCSettings'; @@ -16,7 +17,7 @@ function getBaseURL() { return url; } -async function setDLSColourTheme() { +async function setDLSColourTheme(primaryMainColour: string) { const db = container.resolve(Tokens.AdminDataSource); await db.waitForDBUpgrade(); @@ -28,7 +29,7 @@ async function setDLSColourTheme() { }), db.updateSettings({ settingsId: SettingsId.PALETTE_PRIMARY_MAIN, - settingsValue: '#8B008B', + settingsValue: primaryMainColour, }), db.updateSettings({ settingsId: SettingsId.PALETTE_PRIMARY_LIGHT, @@ -142,13 +143,20 @@ async function enableDefaultDLSFeatures() { } async function configureDLSEnvironment() { - await Promise.all([ - setDLSColourTheme(), - enableDefaultDLSFeatures(), - setTimezone(), - setDateTimeFormats(), - updateOIDCSettings(), - ]); + if (isDevelopment) { + await setDLSColourTheme('#d4225d'); + } + if (isStaging) { + await setDLSColourTheme('#8B008B'); + } + if (isDevelopment) { + await Promise.all([ + enableDefaultDLSFeatures(), + setTimezone(), + setDateTimeFormats(), + updateOIDCSettings(), + ]); + } } export { configureDLSEnvironment, getBaseURL }; From de364be7b80b816e4de54824247bb50ad5ab9684 Mon Sep 17 00:00:00 2001 From: zachary Date: Mon, 6 Jul 2026 09:15:08 +0100 Subject: [PATCH 3/3] change to red --- apps/backend/src/config/dls/configureDLSEnvironment.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/backend/src/config/dls/configureDLSEnvironment.ts b/apps/backend/src/config/dls/configureDLSEnvironment.ts index d544bf37af..640993ac0a 100644 --- a/apps/backend/src/config/dls/configureDLSEnvironment.ts +++ b/apps/backend/src/config/dls/configureDLSEnvironment.ts @@ -144,7 +144,7 @@ async function enableDefaultDLSFeatures() { async function configureDLSEnvironment() { if (isDevelopment) { - await setDLSColourTheme('#d4225d'); + await setDLSColourTheme('#b3022b'); } if (isStaging) { await setDLSColourTheme('#8B008B');