From 74bca20a3c149a08d77e826dbd4e218578169963 Mon Sep 17 00:00:00 2001
From: Leonid Pershin <lpershin@syntellect.ru>
Date: Sun, 26 Jul 2026 15:25:18 +0300
Subject: [PATCH] Refactor user settings access in navigation: replace direct
 settings link with username display for logged-in users, enhancing mobile and
 desktop menu experiences. Update logout button placement and styling for
 improved usability.

---
 frontend/src/routes/__root.tsx | 37 +++++++++++++++++++++++-----------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --git a/frontend/src/routes/__root.tsx b/frontend/src/routes/__root.tsx
index 4db16c4..950ae04 100644
--- a/frontend/src/routes/__root.tsx
+++ b/frontend/src/routes/__root.tsx
@@ -48,9 +48,6 @@ function RootLayout() {
                 <Link to="/dashboard" className="hover:text-primary" activeProps={{ className: 'text-primary' }}>
                   {t('nav.dashboard')}
                 </Link>
-                <Link to="/settings" className="hover:text-primary" activeProps={{ className: 'text-primary' }}>
-                  {t('nav.settings')}
-                </Link>
                 {user.role === 'admin' && (
                   <Link to="/admin" className="hover:text-primary" activeProps={{ className: 'text-primary' }}>
                     {t('nav.admin')}
@@ -80,12 +77,23 @@ function RootLayout() {
             </select>
 
             {user ? (
-              <button
-                className="hidden rounded-sm border border-border px-3 py-1 text-xs uppercase tracking-wide hover:bg-muted md:block"
-                onClick={() => void handleLogout()}
-              >
-                {t('nav.logout')}
-              </button>
+              <>
+                {/* Имя пользователя — вход в настройки аккаунта: отдельный пункт меню под это не нужен. */}
+                <Link
+                  to="/settings"
+                  title={t('nav.settings')}
+                  className="hidden max-w-40 truncate rounded-sm border border-border px-3 py-1 text-xs uppercase tracking-wide hover:bg-muted md:block"
+                  activeProps={{ className: 'border-primary text-primary' }}
+                >
+                  {user.userName}
+                </Link>
+                <button
+                  className="hidden rounded-sm border border-border px-3 py-1 text-xs uppercase tracking-wide hover:bg-muted md:block"
+                  onClick={() => void handleLogout()}
+                >
+                  {t('nav.logout')}
+                </button>
+              </>
             ) : (
               <Link
                 to="/login"
@@ -112,14 +120,19 @@ function RootLayout() {
                 <Link to="/dashboard" onClick={() => setMenuOpen(false)}>
                   {t('nav.dashboard')}
                 </Link>
-                <Link to="/settings" onClick={() => setMenuOpen(false)}>
-                  {t('nav.settings')}
-                </Link>
                 {user.role === 'admin' && (
                   <Link to="/admin" onClick={() => setMenuOpen(false)}>
                     {t('nav.admin')}
                   </Link>
                 )}
+                {/* В мобильном меню тот же принцип: настройки открываются по имени пользователя. */}
+                <Link
+                  to="/settings"
+                  className="truncate border-t border-border pt-2"
+                  onClick={() => setMenuOpen(false)}
+                >
+                  {user.userName}
+                </Link>
                 <button className="py-1 text-left" onClick={() => void handleLogout()}>
                   {t('nav.logout')}
                 </button>