diff --git a/.cursor/rules/git-push.mdc b/.cursor/rules/git-push.mdc new file mode 100644 index 0000000..2edf51a --- /dev/null +++ b/.cursor/rules/git-push.mdc @@ -0,0 +1,15 @@ +--- +description: Commit local changes and push them to Gitea immediately +alwaysApply: true +--- + +# Git workflow + +After any local change to this project, commit and push to Gitea immediately. + +- Remote: `https://git.myunion.pro/Alex/Moniki_uslugi.git` +- Branch: `main` +- Do not wait for a separate "commit" request +- Do not commit `.env`, `.env.local`, passwords, tokens, or other secrets +- Do not force-push `main` +- For user-visible releases, bump `package.json` versions, update `CHANGELOG.md`, and push an annotated tag `vX.Y.Z` diff --git a/.gitignore b/.gitignore index bf7e683..1d26243 100644 --- a/.gitignore +++ b/.gitignore @@ -13,7 +13,9 @@ media uploads apps/cms/src/app/(payload)/admin/importMap.js apps/cms/src/payload-types.ts -.cursor +.cursor/* +!.cursor/rules/ +!.cursor/rules/** *.pem *.key credentials.json diff --git a/CHANGELOG.md b/CHANGELOG.md index c22f21d..82f6b86 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ Формат основан на [Keep a Changelog](https://keepachangelog.com/ru/1.1.0/), версии — [SemVer](https://semver.org/lang/ru/). +## [1.0.1] — 2026-09-16 + +### Сайт + +- В подвале отображается версия сайта (`v1.0.1`) + ## [1.0.0] — 2026-09-16 Первый публикуемый снимок проекта **Moniki_uslugi**. @@ -25,4 +31,5 @@ - Docker Compose для локальной БД - Секреты и логины в git не входят +[1.0.1]: https://git.myunion.pro/Alex/Moniki_uslugi/src/tag/v1.0.1 [1.0.0]: https://git.myunion.pro/Alex/Moniki_uslugi/src/tag/v1.0.0 diff --git a/README.md b/README.md index 0793120..dbef1b9 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Репозиторий: [Moniki_uslugi](https://git.myunion.pro/Alex/Moniki_uslugi) на [git.myunion.pro](https://git.myunion.pro/). -Текущая версия: **v1.0.0** (см. [CHANGELOG.md](CHANGELOG.md)). +Текущая версия: **v1.0.1** (см. [CHANGELOG.md](CHANGELOG.md)). ## Что внутри diff --git a/apps/cms/package.json b/apps/cms/package.json index d0cde15..5883df0 100644 --- a/apps/cms/package.json +++ b/apps/cms/package.json @@ -1,6 +1,6 @@ { "name": "@moniki/cms", - "version": "1.0.0", + "version": "1.0.1", "private": true, "type": "module", "scripts": { diff --git a/apps/web/package.json b/apps/web/package.json index 7dd8793..77fc47c 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -1,6 +1,6 @@ { "name": "@moniki/web", - "version": "1.0.0", + "version": "1.0.1", "private": true, "scripts": { "dev": "next dev -p 3000", diff --git a/apps/web/src/components/layout/Footer.tsx b/apps/web/src/components/layout/Footer.tsx index 0880340..3b9ab9e 100644 --- a/apps/web/src/components/layout/Footer.tsx +++ b/apps/web/src/components/layout/Footer.tsx @@ -3,6 +3,7 @@ import { Link } from "@/i18n/routing"; import { getBranches, getSiteNav } from "@/lib/api"; import { legalPages } from "@/lib/legal"; import { organizationPages } from "@/lib/organization"; +import { APP_VERSION } from "@/lib/version"; import { getLocale, getTranslations } from "next-intl/server"; const socials = [ @@ -182,8 +183,15 @@ export async function Footer() { ))} -

{footer("rights")}

-

{t("meta.fullName")}

+

{t("meta.fullName")}

+ + +
+
+

{footer("rights")}

+

+ {footer("version", { version: APP_VERSION })} +

diff --git a/apps/web/src/lib/version.ts b/apps/web/src/lib/version.ts new file mode 100644 index 0000000..0cafb74 --- /dev/null +++ b/apps/web/src/lib/version.ts @@ -0,0 +1,3 @@ +import pkg from "../../package.json"; + +export const APP_VERSION = pkg.version; diff --git a/apps/web/src/messages/be.json b/apps/web/src/messages/be.json index 47ab359..8dc30e9 100644 --- a/apps/web/src/messages/be.json +++ b/apps/web/src/messages/be.json @@ -364,6 +364,7 @@ "useful": "Карыснае", "social": "Мы ў сацсетках", "rights": "© МОНІКІ. Усе правы абаронены.", + "version": "Версія сайта v{version}", "vk": "УКантакце", "max": "Макс" }, diff --git a/apps/web/src/messages/en.json b/apps/web/src/messages/en.json index b9e08d4..22c556f 100644 --- a/apps/web/src/messages/en.json +++ b/apps/web/src/messages/en.json @@ -364,6 +364,7 @@ "useful": "Useful", "social": "Social media", "rights": "© MONIKI. All rights reserved.", + "version": "Site version v{version}", "vk": "VK", "max": "Max" }, diff --git a/apps/web/src/messages/ky.json b/apps/web/src/messages/ky.json index 4cf2bb8..ca7758a 100644 --- a/apps/web/src/messages/ky.json +++ b/apps/web/src/messages/ky.json @@ -364,6 +364,7 @@ "useful": "Пайдалуу", "social": "Соцтармактарда", "rights": "© МОНИКИ. Бардык укуктар корголгон.", + "version": "Сайттын версиясы v{version}", "vk": "ВКонтакте", "max": "Макс" }, diff --git a/apps/web/src/messages/ru.json b/apps/web/src/messages/ru.json index 402839a..a19ef4b 100644 --- a/apps/web/src/messages/ru.json +++ b/apps/web/src/messages/ru.json @@ -364,6 +364,7 @@ "useful": "Полезное", "social": "Мы в соцсетях", "rights": "© МОНИКИ. Все права защищены.", + "version": "Версия сайта v{version}", "vk": "ВКонтакте", "max": "Макс" }, diff --git a/apps/web/src/messages/tg.json b/apps/web/src/messages/tg.json index 5005c10..8759509 100644 --- a/apps/web/src/messages/tg.json +++ b/apps/web/src/messages/tg.json @@ -364,6 +364,7 @@ "useful": "Фоиданок", "social": "Мо дар шабакаҳои иҷтимоӣ", "rights": "© МОНИКИ. Ҳамаи ҳуқуқҳо ҳифз шудаанд.", + "version": "Версияи сайт v{version}", "vk": "ВКонтакте", "max": "Макс" }, diff --git a/apps/web/src/messages/zh.json b/apps/web/src/messages/zh.json index 148d485..b267287 100644 --- a/apps/web/src/messages/zh.json +++ b/apps/web/src/messages/zh.json @@ -364,6 +364,7 @@ "useful": "实用信息", "social": "社交媒体", "rights": "© МОНИКИ。保留所有权利。", + "version": "网站版本 v{version}", "vk": "VK", "max": "Max" }, diff --git a/package.json b/package.json index da9d28a..8abbcce 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "moniki-platnye-uslugi", - "version": "1.0.0", + "version": "1.0.1", "private": true, "scripts": { "dev": "pnpm -r --parallel dev",