diff --git a/apps/backend/src/config/dependencyConfigDLS.ts b/apps/backend/src/config/dependencyConfigDLS.ts index d942f98755..0e506f2ec2 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'; diff --git a/apps/backend/src/config/dls/configureDLSEnvironment.ts b/apps/backend/src/config/dls/configureDLSEnvironment.ts index cff8fe28e9..640993ac0a 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: '#202945', + 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('#b3022b'); + } + if (isStaging) { + await setDLSColourTheme('#8B008B'); + } + if (isDevelopment) { + await Promise.all([ + enableDefaultDLSFeatures(), + setTimezone(), + setDateTimeFormats(), + updateOIDCSettings(), + ]); + } } export { configureDLSEnvironment, getBaseURL };