From 14a57b19b7c71808693e9c6317ac50eb0544f035 Mon Sep 17 00:00:00 2001
From: "Vaka.pro" <vakabunga@proton.me>
Date: Sun, 26 Apr 2026 23:44:06 +0300
Subject: [PATCH] fix: improve friend wishlist navigation layout

---
 apps/frontend/src/components/Layout/Header.tsx | 12 ++++++------
 apps/frontend/src/i18n/i18n.tsx                |  2 ++
 apps/frontend/src/pages/PublicProfilePage.tsx  | 16 ++++++++++++++--
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/apps/frontend/src/components/Layout/Header.tsx b/apps/frontend/src/components/Layout/Header.tsx
index fefc8e5..83b101d 100644
--- a/apps/frontend/src/components/Layout/Header.tsx
+++ b/apps/frontend/src/components/Layout/Header.tsx
@@ -45,20 +45,20 @@ export function Header() {
 
   return (
     <header className="container-page pt-6">
-      <div className="flex flex-wrap items-center justify-between gap-3 rounded-lg border border-border bg-surface/80 px-4 py-3 backdrop-blur">
-        <Link to="/" className="flex items-center gap-2">
+      <div className="grid grid-cols-1 items-center gap-3 rounded-lg border border-border bg-surface/80 px-4 py-3 backdrop-blur lg:grid-cols-[auto_minmax(0,1fr)_auto]">
+        <Link to="/" className="flex min-w-0 items-center gap-2">
           <span className="inline-flex h-9 w-9 items-center justify-center rounded-md bg-primary text-primary-foreground shadow-card">
             <Gift className="h-4 w-4" />
           </span>
-          <div>
+          <div className="min-w-0">
             <div className="font-display text-lg leading-tight">{t('app.name')}</div>
-            <div className="text-xs text-muted">
+            <div className="truncate text-xs text-muted">
               {t('header.signedInAs', { name: user.displayName })}
             </div>
           </div>
         </Link>
 
-        <nav className="flex flex-wrap items-center gap-1">
+        <nav className="flex min-w-0 items-center gap-1 overflow-x-auto whitespace-nowrap lg:justify-center">
           {links.map((l) => (
             <NavLink
               key={l.to}
@@ -91,7 +91,7 @@ export function Header() {
           )}
         </nav>
 
-        <div className="flex items-center gap-1">
+        <div className="flex shrink-0 items-center gap-1 justify-self-start lg:justify-self-end">
           <LanguageSwitcher />
           <Button
             variant="ghost"
diff --git a/apps/frontend/src/i18n/i18n.tsx b/apps/frontend/src/i18n/i18n.tsx
index 4d259f2..2b59f0c 100644
--- a/apps/frontend/src/i18n/i18n.tsx
+++ b/apps/frontend/src/i18n/i18n.tsx
@@ -80,6 +80,7 @@ const translations = {
     'public.loadingWishes': 'Загрузка желаний...',
     'public.notFoundTitle': 'Профиль не найден',
     'public.notFoundText': 'Проверьте ссылку и попробуйте ещё раз. Slug чувствителен к регистру.',
+    'public.backToMine': 'Вернуться к моим желаниям',
     'public.wishlistTitle': 'Список желаний {name}',
     'public.emptyTitle': 'Желаний пока нет',
     'public.emptyText': 'Загляните позже!',
@@ -196,6 +197,7 @@ const translations = {
     'public.loadingWishes': 'Loading wishes...',
     'public.notFoundTitle': 'Profile not found',
     'public.notFoundText': 'Check the link and try again. Slugs are case-sensitive.',
+    'public.backToMine': 'Back to my wishlist',
     'public.wishlistTitle': "{name}'s wishlist",
     'public.emptyTitle': 'No wishes yet',
     'public.emptyText': 'Check back later!',
diff --git a/apps/frontend/src/pages/PublicProfilePage.tsx b/apps/frontend/src/pages/PublicProfilePage.tsx
index a81ddf6..752eb32 100644
--- a/apps/frontend/src/pages/PublicProfilePage.tsx
+++ b/apps/frontend/src/pages/PublicProfilePage.tsx
@@ -1,5 +1,5 @@
 import { useEffect, useRef } from 'react';
-import { useParams } from 'react-router-dom';
+import { Link, useParams } from 'react-router-dom';
 import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
 import type {
   PublicProfile,
@@ -11,9 +11,12 @@ import { Footer } from '@/components/Layout/Footer';
 import { Gift } from 'lucide-react';
 import { LanguageSwitcher } from '@/components/LanguageSwitcher';
 import { useI18n } from '@/i18n/i18n';
+import { useAuthStore } from '@/features/auth/authStore';
+import { Button } from '@/components/ui/Button';
 
 export function PublicProfilePage() {
   const { t } = useI18n();
+  const user = useAuthStore((s) => s.user);
   const { slug = '' } = useParams<{ slug: string }>();
   const queryClient = useQueryClient();
 
@@ -56,7 +59,16 @@ export function PublicProfilePage() {
 
   return (
     <div className="flex min-h-screen flex-col">
-      <div className="container-page flex justify-end pt-6">
+      <div className="container-page flex items-center justify-between gap-3 pt-6">
+        {user ? (
+          <Link to="/">
+            <Button variant="secondary" size="sm">
+              {t('public.backToMine')}
+            </Button>
+          </Link>
+        ) : (
+          <span />
+        )}
         <LanguageSwitcher />
       </div>
       <main className="container-page flex-1 py-10">
-- 
2.49.1