From dd13eb31d80815fa664fcbcceac56b06fff031c3 Mon Sep 17 00:00:00 2001 From: Carlos Valente Date: Sun, 20 Oct 2024 22:26:31 +0200 Subject: [PATCH] refactor: expose public dir --- apps/client/src/common/models/Info.ts | 2 +- .../app-settings/panel/general-panel/ViewSettingsForm.tsx | 4 ++-- apps/server/src/api-data/session/session.service.ts | 4 ++-- .../types/src/api/ontime-controller/BackendResponse.type.ts | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/client/src/common/models/Info.ts b/apps/client/src/common/models/Info.ts index 481d059910..1cec492a80 100644 --- a/apps/client/src/common/models/Info.ts +++ b/apps/client/src/common/models/Info.ts @@ -7,5 +7,5 @@ export const ontimePlaceholderInfo: GetInfo = { version: '2.0.0', serverPort: 4001, osc: oscPlaceholderSettings, - cssOverride: '', + publicDir: '', }; diff --git a/apps/client/src/features/app-settings/panel/general-panel/ViewSettingsForm.tsx b/apps/client/src/features/app-settings/panel/general-panel/ViewSettingsForm.tsx index 3dd12f14d6..9764ab74f8 100644 --- a/apps/client/src/features/app-settings/panel/general-panel/ViewSettingsForm.tsx +++ b/apps/client/src/features/app-settings/panel/general-panel/ViewSettingsForm.tsx @@ -84,8 +84,8 @@ export default function ViewSettingsForm() { - You can override the styles of the viewers with a custom CSS file.
- {info?.cssOverride && `In your installation the file is at ${info?.cssOverride}`} + You can the Ontime views or customise its styles by modifying the provided CSS file.
+ The CSS file is in the user directory at {`${info.publicDir}/user/styles/override.css`}

See the docs diff --git a/apps/server/src/api-data/session/session.service.ts b/apps/server/src/api-data/session/session.service.ts index 6165ab1d17..ab6ae35bbb 100644 --- a/apps/server/src/api-data/session/session.service.ts +++ b/apps/server/src/api-data/session/session.service.ts @@ -1,7 +1,7 @@ import { GetInfo, SessionStats } from 'ontime-types'; import { getDataProvider } from '../../classes/data-provider/DataProvider.js'; -import { publicFiles } from '../../setup/index.js'; +import { publicDir } from '../../setup/index.js'; import { getNetworkInterfaces } from '../../utils/networkInterfaces.js'; import { socket } from '../../adapters/WebsocketAdapter.js'; import { getLastRequest } from '../../api-integration/integration.controller.js'; @@ -44,6 +44,6 @@ export async function getInfo(): Promise { version, serverPort, osc, - cssOverride: publicFiles.cssOverride, + publicDir: publicDir.root, }; } diff --git a/packages/types/src/api/ontime-controller/BackendResponse.type.ts b/packages/types/src/api/ontime-controller/BackendResponse.type.ts index ed4dd3b281..f548832ef4 100644 --- a/packages/types/src/api/ontime-controller/BackendResponse.type.ts +++ b/packages/types/src/api/ontime-controller/BackendResponse.type.ts @@ -23,7 +23,7 @@ export interface GetInfo { version: string; serverPort: number; osc: OSCSettings; - cssOverride: string; + publicDir: string; } export type ProjectFile = {