diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index c1787a0..d1d0c48 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -48,8 +48,8 @@ jobs: echo "BOT_URL=http://localhost:3000" >> .env echo "REDIS_PASSWORD=fake" >> .env echo "BOT_PROVIDER_TOKEN=fake" >> .env - echo "OFFER_URL=${{ secrets.OFFER_URL }}" >> .env - echo "PRIVACY_URL=${{ secrets.PRIVACY_URL }}" >> .env + echo "URL_OFFER=${{ secrets.URL_OFFER }}" >> .env + echo "URL_PRIVACY=${{ secrets.URL_PRIVACY }}" >> .env echo "SUPPORT_TELEGRAM_URL=${{ secrets.SUPPORT_TELEGRAM_URL }}" >> .env - name: Set image tags @@ -129,8 +129,8 @@ jobs: echo "REDIS_PASSWORD=${{ secrets.REDIS_PASSWORD }}" >> .env echo "BOT_PROVIDER_TOKEN=${{ secrets.BOT_PROVIDER_TOKEN }}" >> .env echo "SUPPORT_TELEGRAM_URL=${{ secrets.SUPPORT_TELEGRAM_URL }}" >> .env - echo "OFFER_URL=${{ secrets.OFFER_URL }}" >> .env - echo "PRIVACY_URL=${{ secrets.PRIVACY_URL }}" >> .env + echo "URL_OFFER=${{ secrets.URL_OFFER }}" >> .env + echo "URL_PRIVACY=${{ secrets.URL_PRIVACY }}" >> .env # --- НОВОЕ: Шаг 3: Создание файлов тегов (.project.env) --- - name: Create Project Tag Env Files diff --git a/apps/bot/src/bot/conversations/add-contact.ts b/apps/bot/src/bot/conversations/add-contact.ts index ac48f29..a228ab6 100644 --- a/apps/bot/src/bot/conversations/add-contact.ts +++ b/apps/bot/src/bot/conversations/add-contact.ts @@ -26,8 +26,8 @@ export async function addContact(conversation: Conversation, c combine( t('msg-need-phone'), t('share-phone-agreement', { - offerUrl: env.OFFER_URL, - privacyUrl: env.PRIVACY_URL, + offerUrl: env.URL_OFFER, + privacyUrl: env.URL_PRIVACY, }), ), ), @@ -42,8 +42,8 @@ export async function addContact(conversation: Conversation, c t('msg-send-client-contact-or-phone'), t('msg-cancel-operation'), t('share-contact-agreement', { - offerUrl: env.OFFER_URL, - privacyUrl: env.PRIVACY_URL, + offerUrl: env.URL_OFFER, + privacyUrl: env.URL_PRIVACY, }), ), ), diff --git a/apps/bot/src/bot/conversations/subscription.ts b/apps/bot/src/bot/conversations/subscription.ts index 701474d..b4249da 100644 --- a/apps/bot/src/bot/conversations/subscription.ts +++ b/apps/bot/src/bot/conversations/subscription.ts @@ -99,8 +99,8 @@ export async function subscription(conversation: Conversation, const agreementText = await conversation.external(({ t }) => { return t('payment-agreement', { - offerUrl: env.OFFER_URL, - privacyUrl: env.PRIVACY_URL, + offerUrl: env.URL_OFFER, + privacyUrl: env.URL_PRIVACY, }); }); diff --git a/apps/bot/src/bot/features/welcome.ts b/apps/bot/src/bot/features/welcome.ts index b884782..3f18ed2 100644 --- a/apps/bot/src/bot/features/welcome.ts +++ b/apps/bot/src/bot/features/welcome.ts @@ -28,8 +28,8 @@ feature.command('start', logHandle('command-start'), async (ctx) => { combine( ctx.t('msg-welcome'), ctx.t('share-phone-agreement', { - offerUrl: env.OFFER_URL, - privacyUrl: env.PRIVACY_URL, + offerUrl: env.URL_OFFER, + privacyUrl: env.URL_PRIVACY, }), ), { diff --git a/apps/bot/src/bot/handlers/documents.ts b/apps/bot/src/bot/handlers/documents.ts index df3f756..648fafd 100644 --- a/apps/bot/src/bot/handlers/documents.ts +++ b/apps/bot/src/bot/handlers/documents.ts @@ -5,8 +5,8 @@ import { KEYBOARD_REMOVE } from '@/config/keyboards'; async function handler(ctx: Context) { await ctx.reply( ctx.t('agreement-links', { - offerUrl: env.OFFER_URL, - privacyUrl: env.PRIVACY_URL, + offerUrl: env.URL_OFFER, + privacyUrl: env.URL_PRIVACY, }), { ...KEYBOARD_REMOVE, diff --git a/apps/bot/src/config/env.ts b/apps/bot/src/config/env.ts index de8a2da..2a78ad6 100644 --- a/apps/bot/src/config/env.ts +++ b/apps/bot/src/config/env.ts @@ -4,8 +4,6 @@ export const envSchema = z.object({ BOT_PROVIDER_TOKEN: z.string(), BOT_TOKEN: z.string(), BOT_URL: z.string(), - OFFER_URL: z.string(), - PRIVACY_URL: z.string(), RATE_LIMIT: z .string() .transform((value) => Number.parseInt(value, 10)) @@ -20,6 +18,8 @@ export const envSchema = z.object({ .string() .transform((value) => Number.parseInt(value, 10)) .default('6379'), + URL_OFFER: z.string(), + URL_PRIVACY: z.string(), }); export const env = envSchema.parse(process.env); diff --git a/apps/web/app/(documents)/offer/page.mdx b/apps/web/app/(documents)/offer/page.mdx index 5124921..6f91d83 100644 --- a/apps/web/app/(documents)/offer/page.mdx +++ b/apps/web/app/(documents)/offer/page.mdx @@ -11,7 +11,7 @@ export const metadata = { #### 1. Термины и определения -1.1. Оферта — настоящий документ, постоянно размещенный в сети Интернет по адресу {env.OFFER_URL}. +1.1. Оферта — настоящий документ, постоянно размещенный в сети Интернет по адресу {env.URL_OFFER}. 1.2. Акцепт — полное и безоговорочное принятие условий Оферты Пользователем путем оплаты доступа через встроенный платежный бот ЮKassa в Telegram. diff --git a/apps/web/components/documents/links.tsx b/apps/web/components/documents/links.tsx index 51af51c..a452953 100644 --- a/apps/web/components/documents/links.tsx +++ b/apps/web/components/documents/links.tsx @@ -2,8 +2,8 @@ import { env } from '@/config/env'; export function OfferLink() { return ( - - {env.OFFER_URL} + + {env.URL_OFFER} ); } diff --git a/apps/web/config/env.ts b/apps/web/config/env.ts index f9c8b87..b09d5a3 100644 --- a/apps/web/config/env.ts +++ b/apps/web/config/env.ts @@ -4,8 +4,8 @@ import { z } from 'zod'; export const envSchema = z.object({ __DEV_TELEGRAM_ID: z.string().default(''), BOT_URL: z.string(), - OFFER_URL: z.string(), SUPPORT_TELEGRAM_URL: z.string(), + URL_OFFER: z.string(), }); export const env = envSchema.parse(process.env); diff --git a/turbo.json b/turbo.json index 8fa4a4f..041f0cd 100644 --- a/turbo.json +++ b/turbo.json @@ -18,8 +18,8 @@ "REDIS_HOST", "REDIS_PORT", "REDIS_PASSWORD", - "OFFER_URL", - "PRIVACY_URL" + "URL_OFFER", + "URL_PRIVACY" ] }, "lint": {