diff --git a/.env.example b/.env.example index a15da1fc..77f05953 100644 --- a/.env.example +++ b/.env.example @@ -290,7 +290,6 @@ CONNECT_BUTTON_MODE=guide # URL для режима miniapp_custom (обязателен при CONNECT_BUTTON_MODE=miniapp_custom) MINIAPP_CUSTOM_URL= -MINIAPP_SUBSCRIPTION_PURCHASE_URL= MINIAPP_SERVICE_NAME_EN=Bedolaga VPN MINIAPP_SERVICE_NAME_RU=Bedolaga VPN MINIAPP_SERVICE_DESCRIPTION_EN=Secure & Fast Connection diff --git a/README.md b/README.md index c97c466d..c1fdb9f1 100644 --- a/README.md +++ b/README.md @@ -535,7 +535,6 @@ CONNECT_BUTTON_MODE=guide # URL для режима miniapp_custom (обязателен при CONNECT_BUTTON_MODE=miniapp_custom) MINIAPP_CUSTOM_URL= -MINIAPP_SUBSCRIPTION_PURCHASE_URL= MINIAPP_SERVICE_NAME_EN=Bedolaga VPN MINIAPP_SERVICE_NAME_RU=Bedolaga VPN MINIAPP_SERVICE_DESCRIPTION_EN=Secure & Fast Connection diff --git a/app/config.py b/app/config.py index 7ab0198b..773f4f45 100644 --- a/app/config.py +++ b/app/config.py @@ -213,7 +213,6 @@ class Settings(BaseSettings): CONNECT_BUTTON_MODE: str = "guide" MINIAPP_CUSTOM_URL: str = "" - MINIAPP_SUBSCRIPTION_PURCHASE_URL: str = "" MINIAPP_SERVICE_NAME_EN: str = "Bedolaga VPN" MINIAPP_SERVICE_NAME_RU: str = "Bedolaga VPN" MINIAPP_SERVICE_DESCRIPTION_EN: str = "Secure & Fast Connection" @@ -551,13 +550,6 @@ class Settings(BaseSettings): "ru": desc_ru, }, } - - def get_miniapp_purchase_url(self) -> Optional[str]: - value = getattr(self, "MINIAPP_SUBSCRIPTION_PURCHASE_URL", "") - if value is None: - return None - purchase_url = str(value).strip() - return purchase_url or None def get_app_config_cache_ttl(self) -> int: return self.APP_CONFIG_CACHE_TTL diff --git a/app/webapi/routes/miniapp.py b/app/webapi/routes/miniapp.py index eded3fa6..64bc7bd4 100644 --- a/app/webapi/routes/miniapp.py +++ b/app/webapi/routes/miniapp.py @@ -24,8 +24,6 @@ from app.utils.telegram_webapp import ( from ..dependencies import get_db_session from ..schemas.miniapp import ( - MiniAppBranding, - MiniAppConfigResponse, MiniAppConnectedServer, MiniAppDevice, MiniAppPromoGroup, @@ -260,16 +258,6 @@ async def _load_subscription_links( return payload -@router.get("/config", response_model=MiniAppConfigResponse) -async def get_miniapp_config() -> MiniAppConfigResponse: - branding_data = settings.get_miniapp_branding() - branding = MiniAppBranding(**branding_data) if branding_data else None - return MiniAppConfigResponse( - branding=branding, - subscription_purchase_url=settings.get_miniapp_purchase_url(), - ) - - @router.post("/subscription", response_model=MiniAppSubscriptionResponse) async def get_subscription_details( payload: MiniAppSubscriptionRequest, @@ -395,7 +383,6 @@ async def get_subscription_details( else None, subscription_type="trial" if subscription.is_trial else "paid", autopay_enabled=bool(subscription.autopay_enabled), - subscription_purchase_url=settings.get_miniapp_purchase_url(), branding=settings.get_miniapp_branding(), ) diff --git a/app/webapi/schemas/miniapp.py b/app/webapi/schemas/miniapp.py index 8effe4bb..a0d5cb1a 100644 --- a/app/webapi/schemas/miniapp.py +++ b/app/webapi/schemas/miniapp.py @@ -11,11 +11,6 @@ class MiniAppBranding(BaseModel): service_description: Dict[str, Optional[str]] = Field(default_factory=dict) -class MiniAppConfigResponse(BaseModel): - branding: Optional[MiniAppBranding] = None - subscription_purchase_url: Optional[str] = None - - class MiniAppSubscriptionRequest(BaseModel): init_data: str = Field(..., alias="initData") @@ -79,7 +74,6 @@ class MiniAppSubscriptionResponse(BaseModel): user: MiniAppSubscriptionUser subscription_url: Optional[str] = None subscription_crypto_link: Optional[str] = None - subscription_purchase_url: Optional[str] = None links: List[str] = Field(default_factory=list) ss_conf_links: Dict[str, str] = Field(default_factory=dict) connected_squads: List[str] = Field(default_factory=list) diff --git a/miniapp/index.html b/miniapp/index.html index 9e1fed9b..27253b84 100644 --- a/miniapp/index.html +++ b/miniapp/index.html @@ -314,16 +314,6 @@ line-height: 1.6; } - .error-actions { - margin-top: 24px; - display: flex; - justify-content: center; - } - - .error-actions .btn { - min-width: 200px; - } - /* Cards */ .card { background: var(--bg-secondary); @@ -1196,9 +1186,6 @@