From 480fa10a06a89ebcdfb830e6628e16f6ff005f3a Mon Sep 17 00:00:00 2001
From: PauI Ostrovckij <pavel.ostrovskij@onlyoffice.com>
Date: Mon, 29 Sep 2025 11:54:25 +0300
Subject: [PATCH] [fix] Logout button

---
 AdminPanel/client/src/components/Menu/Menu.js       | 13 +++----------
 .../client/src/components/Menu/Menu.module.scss     |  2 +-
 .../client/src/components/Menu/MenuItem/MenuItem.js |  5 ++---
 3 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/AdminPanel/client/src/components/Menu/Menu.js b/AdminPanel/client/src/components/Menu/Menu.js
index d4afc213..c9d9bf85 100644
--- a/AdminPanel/client/src/components/Menu/Menu.js
+++ b/AdminPanel/client/src/components/Menu/Menu.js
@@ -7,12 +7,12 @@ import MenuItem from './MenuItem/MenuItem';
 import AppMenuLogo from '../../assets/AppMenuLogo.svg';
 import {menuItems} from '../../config/menuItems';
 import styles from './Menu.module.scss';
+import FileIcon from '../../assets/File.svg';
 
 function Menu() {
   const location = useLocation();
   const navigate = useNavigate();
   const dispatch = useDispatch();
-  const isAuthenticated = useSelector(selectIsAuthenticated);
 
   const handleLogout = async () => {
     try {
@@ -49,17 +49,10 @@ function Menu() {
 
         <div className={styles['menu__menuItems']}>
           {menuItems.map(item => (
-            <MenuItem key={item.key} label={item.label} isActive={isActiveItem(item.path)} onClick={() => handleMenuItemClick(item)} />
+            <MenuItem key={item.key} label={item.label} isActive={isActiveItem(item.path)} onClick={() => handleMenuItemClick(item)} icon={FileIcon}/>
           ))}
+          <MenuItem label='Logout' isActive={false} onClick={handleLogout} />
         </div>
-
-        {isAuthenticated && (
-          <div className={styles['menu__logoutContainer']}>
-            <button onClick={handleLogout} className={styles['menu__logoutButton']}>
-              Logout
-            </button>
-          </div>
-        )}
       </div>
     </div>
   );
diff --git a/AdminPanel/client/src/components/Menu/Menu.module.scss b/AdminPanel/client/src/components/Menu/Menu.module.scss
index 10e36d3e..731c36d6 100644
--- a/AdminPanel/client/src/components/Menu/Menu.module.scss
+++ b/AdminPanel/client/src/components/Menu/Menu.module.scss
@@ -60,7 +60,7 @@
   }
 
   &__logoutContainer {
-    margin-top: auto;
+    margin-left: 48px;
   }
 
   &__logoutButton {
diff --git a/AdminPanel/client/src/components/Menu/MenuItem/MenuItem.js b/AdminPanel/client/src/components/Menu/MenuItem/MenuItem.js
index aef29477..c914cbdc 100644
--- a/AdminPanel/client/src/components/Menu/MenuItem/MenuItem.js
+++ b/AdminPanel/client/src/components/Menu/MenuItem/MenuItem.js
@@ -1,10 +1,9 @@
-import FileIcon from '../../../assets/File.svg';
 import styles from './MenuItem.module.scss';
 
-function MenuItem({label, isActive, onClick}) {
+function MenuItem({label, isActive, onClick, icon}) {
   return (
     <div className={`${styles.menuItem} ${isActive ? styles['menuItem--active'] : ''}`} onClick={onClick}>
-      <img src={FileIcon} alt='' className={styles['menuItem__icon']} />
+      {icon ? <img src={icon} alt='' className={styles['menuItem__icon']} /> : <div className={styles['menuItem__icon']} />}
       <span className={styles['menuItem__label']}>{label}</span>
     </div>
   );