Merge branch 'main' into storefront-nuxt

# Conflicts:
#	evibes/settings/jazzmin.py
This commit is contained in:
Egor Pavlovich Gorbunov 2025-11-11 17:08:51 +03:00
commit 53425b855d
2 changed files with 4 additions and 4 deletions

View file

@ -3,6 +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.constance import CONSTANCE_CONFIG
@ -136,7 +137,7 @@ SPECTACULAR_SETTINGS = {
},
"SERVERS": [
{
"url": f"https://api.{CONSTANCE_CONFIG.get('BASE_DOMAIN')[0]}/", # type: ignore [index]
"url": f"https://api.{BASE_DOMAIN}/", # type: ignore [index]
"description": "Production Server",
},
{"url": "http://api.localhost:8000/", "description": "Development Server"},

View file

@ -1,7 +1,6 @@
from django.utils.translation import gettext_lazy as _
from evibes.settings import BASE_DOMAIN, STOREFRONT_DOMAIN
from evibes.settings.base import EVIBES_VERSION
from evibes.settings.base import EVIBES_VERSION, BASE_DOMAIN, STOREFRONT_DOMAIN
from evibes.settings.constance import CONSTANCE_CONFIG
JAZZMIN_SETTINGS = {
@ -28,7 +27,7 @@ JAZZMIN_SETTINGS = {
},
{
"name": _("REST Docs"),
"url": f"https://api.{CONSTANCE_CONFIG.get('BASE_DOMAIN')[0]}/docs/swagger", # type: ignore [index]
"url": f"https://api.{BASE_DOMAIN}/docs/swagger", # type: ignore [index]
"new_window": True,
},
{"name": _("Support"), "url": "https://t.me/fureunoir", "new_window": True},