diff --git a/.env.example b/.env.example index 859b66f..88f9c59 100644 --- a/.env.example +++ b/.env.example @@ -1,5 +1,6 @@ APP_ENV=production APP_SECRET_KEY=change-me +ADMIN_SITE_TITLE=Редакторская ADMIN_APP_TITLE=Редакторская ADMIN_BOOTSTRAP_LOGIN=admin ADMIN_BOOTSTRAP_PASSWORD=change-me-long-password diff --git a/src/vk_parser_app/admin.py b/src/vk_parser_app/admin.py index 734cc1c..98c3e92 100644 --- a/src/vk_parser_app/admin.py +++ b/src/vk_parser_app/admin.py @@ -45,7 +45,7 @@ BASE_DIR = Path(__file__).resolve().parent PROJECT_ROOT = BASE_DIR.parents[1] FAVICON_PATH = PROJECT_ROOT / "favi.png" templates = Jinja2Templates(directory=str(BASE_DIR / "templates")) -app = FastAPI(title=settings.display_admin_title) +app = FastAPI(title=settings.display_site_title) LOCAL_TZ = ZoneInfo("Asia/Yekaterinburg") MODEL_CACHE: dict[str, Any] = {"key": "", "at": 0.0, "models": []} UPLOAD_ROOT = Path("uploads").resolve() @@ -444,7 +444,13 @@ def require_csrf(user: dict, csrf_token: str) -> None: def base_context(request: Request, user: dict | None, **extra: Any) -> dict[str, Any]: - ctx = {"request": request, "user": user, "app_env": settings.app_env, "app_title": settings.display_admin_title} + ctx = { + "request": request, + "user": user, + "app_env": settings.app_env, + "app_title": settings.display_admin_title, + "site_title": settings.display_site_title, + } ctx.update(extra) return ctx diff --git a/src/vk_parser_app/config.py b/src/vk_parser_app/config.py index df23e7a..d83bda6 100644 --- a/src/vk_parser_app/config.py +++ b/src/vk_parser_app/config.py @@ -6,6 +6,7 @@ from pydantic_settings import BaseSettings, SettingsConfigDict class Settings(BaseSettings): app_env: str = "production" app_secret_key: str = "change-me" + admin_site_title: str = "" admin_app_title: str = "Редакторская" admin_bootstrap_login: str = "admin" admin_bootstrap_password: str = "" @@ -42,6 +43,10 @@ class Settings(BaseSettings): def display_admin_title(self) -> str: return self.admin_app_title.strip() or "Редакторская" + @property + def display_site_title(self) -> str: + return self.admin_site_title.strip() or "Редакторская" + @property def vk_storage_owner_id(self) -> int: return -abs(int(self.vk_storage_group_id)) diff --git a/src/vk_parser_app/templates/base.html b/src/vk_parser_app/templates/base.html index 77d6b2e..2d2646c 100644 --- a/src/vk_parser_app/templates/base.html +++ b/src/vk_parser_app/templates/base.html @@ -4,7 +4,7 @@ - {{ title or app_title or "Редакторская" }} + {{ title or site_title or "Редакторская" }} @@ -106,6 +106,10 @@ :root:not(.dark) .hover\:bg-app-error:hover.hover\:text-white { color: #fff !important; } + :root:not(.dark) .media-gallery-layer .text-white, + :root:not(.dark) .media-gallery-layer .hover\:text-app-primary:hover { + color: #fff !important; + }