diff --git a/.gitignore b/.gitignore index ebc7d7d..87f3435 100644 --- a/.gitignore +++ b/.gitignore @@ -185,3 +185,5 @@ nbdist/ !.vscode/extensions.json /build/ /logs/ +/src/main/resources/version.properties +/src/main/resources/webroot/ diff --git a/frontend/src/components/Layout/AppLayout.vue b/frontend/src/components/Layout/AppLayout.vue index da78c24..0b41c97 100644 --- a/frontend/src/components/Layout/AppLayout.vue +++ b/frontend/src/components/Layout/AppLayout.vue @@ -169,8 +169,8 @@ -
- {{ versionStore.getFormattedVersion(t) }} +
+ {{ versionStore.getShortVersion(t) }}
diff --git a/frontend/src/stores/version.ts b/frontend/src/stores/version.ts index 89f4b26..f34c58f 100644 --- a/frontend/src/stores/version.ts +++ b/frontend/src/stores/version.ts @@ -45,11 +45,18 @@ export const useVersionStore = defineStore('version', () => { // Полная строка версии: "Версия: 1.2.3 (build abc1234 от 2025-04-03)" // Принимает функцию перевода для слова "от"/"from" const getFormattedVersion = (t: (key: string) => string) => { - if (!version.value) return t('common.version') + ': ...' + if (!version.value) return t('common.version') + '...' const { version: ver, commitHash } = version.value const datePart = buildDateFormatted.value ? ` ${t('common.versionFrom')} ${buildDateFormatted.value}` : '' return `${t('common.version')}: ${ver} (build ${commitHash}${datePart})` } - return { version, loading, error, fetchVersion, buildDateFormatted, getFormattedVersion } + const getShortVersion = () => { + if (!version.value) return '...' + const { version: ver, commitHash } = version.value + const datePart = buildDateFormatted.value ? ` ${buildDateFormatted.value}` : '' + return `${ver} (build ${commitHash}${datePart})` + } + + return { version, loading, error, fetchVersion, buildDateFormatted, getFormattedVersion, getShortVersion } }) diff --git a/src/main/resources/version.properties b/src/main/resources/version.properties deleted file mode 100644 index bd4c394..0000000 --- a/src/main/resources/version.properties +++ /dev/null @@ -1,3 +0,0 @@ -version=1.0.0-beta -commit.hash=debf1b1 -build.time=2026-05-09T11:03:39.671956300Z \ No newline at end of file