refactor: rename OFFER_URL and PRIVACY_URL to URL_OFFER and URL_PRIVACY

- Updated environment variable names for consistency across the application.
- Modified references in the deployment workflow, bot conversations, and web components to use the new variable names.

.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

apps/bot/src/bot/conversations/add-contact.ts

@@ -26,8 +26,8 @@ export async function addContact(conversation: Conversation<Context, Context>, 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<Context, Context>, 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,
         }),
       ),
     ),

apps/bot/src/bot/conversations/subscription.ts

@@ -99,8 +99,8 @@ export async function subscription(conversation: Conversation<Context, Context>,
 
   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,
     });
   });
 

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,
       }),
     ),
     {

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,

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);

apps/web/app/(documents)/offer/page.mdx

@@ -11,7 +11,7 @@ export const metadata = {
 
 #### 1. Термины и определения
 
-1.1. Оферта — настоящий документ, постоянно размещенный в сети Интернет по адресу <a href={env.OFFER_URL}>{env.OFFER_URL}</a>.
+1.1. Оферта — настоящий документ, постоянно размещенный в сети Интернет по адресу <a href={env.URL_OFFER}>{env.URL_OFFER}</a>.
 
 1.2. Акцепт — полное и безоговорочное принятие условий Оферты Пользователем путем оплаты доступа через встроенный платежный бот ЮKassa в Telegram.
 

apps/web/components/documents/links.tsx

@@ -2,8 +2,8 @@ import { env } from '@/config/env';
 
 export function OfferLink() {
   return (
-    <a href={env.OFFER_URL} rel="noreferrer" target="_blank">
-      {env.OFFER_URL}
+    <a href={env.URL_OFFER} rel="noreferrer" target="_blank">
+      {env.URL_OFFER}
     </a>
   );
 }

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);

turbo.json

@@ -18,8 +18,8 @@
         "REDIS_HOST",
         "REDIS_PORT",
         "REDIS_PASSWORD",
-        "OFFER_URL",
-        "PRIVACY_URL"
+        "URL_OFFER",
+        "URL_PRIVACY"
       ]
     },
     "lint": {