diff --git a/apps/client/src/externals.ts b/apps/client/src/externals.ts index 720f44907..ec771ba29 100644 --- a/apps/client/src/externals.ts +++ b/apps/client/src/externals.ts @@ -1,3 +1,4 @@ +import { version } from '../../../package.json'; /** * This file contains a list of constants that may need to be resolved at runtime */ @@ -5,11 +6,13 @@ export const githubUrl = 'https://www.github.com/cpvalente/ontime'; export const apiRepoLatest = 'https://api.github.com/repos/cpvalente/ontime/releases/latest'; export const websiteUrl = 'https://www.getontime.no'; +export const discordUrl = 'https://discord.com/invite/eje3CSUEXm'; export const documentationUrl = 'https://docs.getontime.no'; export const customFieldsDocsUrl = 'https://docs.getontime.no/features/custom-fields/'; // resolve environment +export const appVersion = version; export const isProduction = import.meta.env.MODE === 'production'; export const isDev = !isProduction; export const isLocalhost = window.location.hostname === 'localhost' || window.location.hostname === '127.0.0.1'; diff --git a/apps/client/src/features/app-settings/panel/about-panel/AboutPanel.tsx b/apps/client/src/features/app-settings/panel/about-panel/AboutPanel.tsx index 0a1452f72..17e195c68 100644 --- a/apps/client/src/features/app-settings/panel/about-panel/AboutPanel.tsx +++ b/apps/client/src/features/app-settings/panel/about-panel/AboutPanel.tsx @@ -1,5 +1,5 @@ import ExternalLink from '../../../../common/components/external-link/ExternalLink'; -import { documentationUrl, githubUrl, websiteUrl } from '../../../../externals'; +import { discordUrl, documentationUrl, githubUrl, websiteUrl } from '../../../../externals'; import * as Panel from '../../panel-utils/PanelUtils'; import AppVersion from './AppVersion'; @@ -19,6 +19,7 @@ export default function AboutPanel() { Links Read the docs Follow the project on GitHub + Discord serverf Current version diff --git a/apps/client/src/features/app-settings/panel/about-panel/AppVersion.tsx b/apps/client/src/features/app-settings/panel/about-panel/AppVersion.tsx index 12a202b0a..6096a7b1f 100644 --- a/apps/client/src/features/app-settings/panel/about-panel/AppVersion.tsx +++ b/apps/client/src/features/app-settings/panel/about-panel/AppVersion.tsx @@ -1,6 +1,6 @@ -import { version } from '../../../../../package.json'; import ExternalLink from '../../../../common/components/external-link/ExternalLink'; import useAppVersion from '../../../../common/hooks-query/useAppVersion'; +import { appVersion } from '../../../../externals'; import * as Panel from '../../panel-utils/PanelUtils'; export default function AppVersion() { @@ -9,7 +9,7 @@ export default function AppVersion() { if (isError) { return ( - {`You are currently using Ontime version ${version}`} + {`You are currently using Ontime version ${appVersion}`} {`Could not fetch version information: ${isError}`} ); @@ -18,7 +18,7 @@ export default function AppVersion() { if (data.hasUpdates) { return ( <> - {`You are currently using Ontime version ${version}.`} + {`You are currently using Ontime version ${appVersion}.`} {`A new version ${data.version} is available.`} Please visit the release page to download @@ -27,5 +27,5 @@ export default function AppVersion() { ); } - return {`You are currently using the latest version of Ontime: ${version}`}; + return {`You are currently using the latest version of Ontime: ${appVersion}`}; }