From bf03534f1b995900e8140d2cba05faba3acb46cd Mon Sep 17 00:00:00 2001 From: Egor fureunoir Gorbunov Date: Tue, 11 Nov 2025 17:27:26 +0300 Subject: [PATCH] Features: 1) Add fallback to environment variable for BASE_DOMAIN in middleware redirects; 2) Introduce new "Taskboard" link to Jazzmin settings; Fixes: 1) Correct import of BASE_DOMAIN in DRF settings; Extra: 1) Adjust "GraphQL Docs" and "REST Docs" labels to remove translation; 2) Reorganize Jazzmin settings links for consistency. --- evibes/middleware.py | 3 +-- evibes/settings/drf.py | 3 +-- evibes/settings/jazzmin.py | 7 ++++--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/evibes/middleware.py b/evibes/middleware.py index 5532ac60..b8cf4e40 100644 --- a/evibes/middleware.py +++ b/evibes/middleware.py @@ -1,7 +1,6 @@ import logging from os import getenv -from django.conf import settings from django.contrib.auth.models import AnonymousUser from django.core.exceptions import BadRequest, DisallowedHost, PermissionDenied, ValidationError from django.http import HttpResponseForbidden @@ -21,7 +20,7 @@ class CustomCommonMiddleware(CommonMiddleware): try: return super().process_request(request) except DisallowedHost: - return redirect(f"https://api.{settings.BASE_DOMAIN}") + return redirect(f"https://api.{getenv("EVIBES_BASE_DOMAIN", "localhost")}") class CustomLocaleMiddleware(LocaleMiddleware): diff --git a/evibes/settings/drf.py b/evibes/settings/drf.py index e2571cc9..901da1d1 100644 --- a/evibes/settings/drf.py +++ b/evibes/settings/drf.py @@ -3,8 +3,7 @@ from os import getenv from django.utils.translation import gettext_lazy as _ -from evibes.settings import BASE_DOMAIN -from evibes.settings.base import DEBUG, EVIBES_VERSION, SECRET_KEY +from evibes.settings.base import DEBUG, EVIBES_VERSION, SECRET_KEY, BASE_DOMAIN from evibes.settings.constance import CONSTANCE_CONFIG REST_FRAMEWORK: dict[str, str | int | list[str] | tuple[str, ...] | dict[str, bool]] = { diff --git a/evibes/settings/jazzmin.py b/evibes/settings/jazzmin.py index d664499c..f513c3ce 100644 --- a/evibes/settings/jazzmin.py +++ b/evibes/settings/jazzmin.py @@ -19,17 +19,18 @@ JAZZMIN_SETTINGS = { "topmenu_links": [ {"name": _("Home"), "url": "admin:index"}, {"name": _("Storefront"), "url": f"https://{STOREFRONT_DOMAIN}", "new_window": True}, # type: ignore [index] - {"name": "GitLab", "url": "https://gitlab.com/wiseless/evibes", "new_window": True}, { - "name": _("GraphQL Docs"), + "name": "GraphQL Docs", "url": f"https://api.{BASE_DOMAIN}/graphql", # type: ignore [index] "new_window": True, }, { - "name": _("REST Docs"), + "name": "REST Docs", "url": f"https://api.{BASE_DOMAIN}/docs/swagger", # type: ignore [index] "new_window": True, }, + {"name": _("Taskboard"), "url": "https://gitlab.com/wiseless/evibes", "new_window": True}, + {"name": "GitLab", "url": "https://gitlab.com/wiseless/evibes", "new_window": True}, {"name": _("Support"), "url": "https://t.me/fureunoir", "new_window": True}, ], "usermenu_links": [],