diff --git a/backend/backend/utils.py b/backend/backend/utils.py index 042aba3..e63b430 100644 --- a/backend/backend/utils.py +++ b/backend/backend/utils.py @@ -7,12 +7,14 @@ from django.conf import settings def get_backend_url(): """Получить базовый URL backend из настроек""" - return getattr(settings, 'BACKEND_URL', 'http://localhost:8000') + protocol = os.getenv('DJANGO_BACKEND_PROTOCOL', 'https') + domain = os.getenv('DJANGO_BACKEND_DOMAIN', 'links.shareon.kr') + return f"{protocol}://{domain}" def get_media_base_url(): """Получить базовый URL для медиа файлов""" - return getattr(settings, 'MEDIA_BASE_URL', 'http://localhost:8000') + return get_backend_url() # Используем тот же базовый URL def build_absolute_url(path): @@ -48,7 +50,8 @@ def normalize_file_url(file_url): 'http://web:8000', 'http://links-web-1:8000', 'http://backend:8000', - 'http://localhost:8000' + 'http://localhost:8000', + 'http://links.shareon.kr' # Заменяем HTTP на HTTPS ] # Заменяем все внутренние URL на внешний diff --git a/frontend/linktree-frontend/src/app/(protected)/dashboard/DashboardClient.tsx b/frontend/linktree-frontend/src/app/(protected)/dashboard/DashboardClient.tsx index d0e0a1b..8f921b8 100644 --- a/frontend/linktree-frontend/src/app/(protected)/dashboard/DashboardClient.tsx +++ b/frontend/linktree-frontend/src/app/(protected)/dashboard/DashboardClient.tsx @@ -210,7 +210,7 @@ export default function DashboardClient() { fetch('/api/auth/user', { headers: { Authorization: `Bearer ${token}` } }), fetch('/api/groups', { headers: { Authorization: `Bearer ${token}` } }), fetch('/api/links', { headers: { Authorization: `Bearer ${token}` } }), - fetch('/api/customization/settings', { headers: { Authorization: `Bearer ${token}` } }), + fetch('/api/customization/settings/', { headers: { Authorization: `Bearer ${token}` } }), ]) .then(async ([uRes, gRes, lRes, dRes]) => { if (!uRes.ok) throw new Error('Не удалось получить профиль') diff --git a/frontend/linktree-frontend/src/app/[username]/page.tsx b/frontend/linktree-frontend/src/app/[username]/page.tsx index b218add..ce2f461 100644 --- a/frontend/linktree-frontend/src/app/[username]/page.tsx +++ b/frontend/linktree-frontend/src/app/[username]/page.tsx @@ -563,10 +563,274 @@ export default function UserPage({ ) - // Заглушки для остальных макетов - const renderMasonryLayout = () => renderGridLayout() - const renderTimelineLayout = () => renderListLayout() - const renderMagazineLayout = () => renderCardsLayout() + // Кладка макет + const renderMasonryLayout = () => ( +
{group.description}
+ )} + {group.links.map(link => ( + +{group.description}
+ )} + {group.links.slice(0, 5).map(link => ( + ++ {group.description || `${group.links.length} ссылок в этой группе`} +
+