Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions apps/backend/src/config/dependencyConfigDLS.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
26 changes: 17 additions & 9 deletions apps/backend/src/config/dls/configureDLSEnvironment.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -16,7 +17,7 @@ function getBaseURL() {
return url;
}

async function setDLSColourTheme() {
async function setDLSColourTheme(primaryMainColour: string) {
const db = container.resolve<AdminDataSource>(Tokens.AdminDataSource);

await db.waitForDBUpgrade();
Expand All @@ -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,
Expand Down Expand Up @@ -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 };
Loading