From 5d63b37928e495139f8e14ee5b8cf8a77e58fd5a Mon Sep 17 00:00:00 2001
From: TronoSfera <119615520+TronoSfera@users.noreply.github.com>
Date: Mon, 2 Mar 2026 19:39:14 +0300
Subject: [PATCH] fix user modal form

---
 app/web/admin.css |  6 ++++++
 app/web/admin.jsx | 45 ++++++++++++++++++++++++++-------------------
 2 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/app/web/admin.css b/app/web/admin.css
index 819261a..f1ddb8a 100644
--- a/app/web/admin.css
+++ b/app/web/admin.css
@@ -2740,6 +2740,12 @@
       margin-bottom: 0.65rem;
     }
 
+    .modal-head-actions {
+      display: inline-flex;
+      align-items: center;
+      gap: 0.45rem;
+    }
+
     .modal-head h3 {
       margin: 0;
       font-family: "Prata", serif;
diff --git a/app/web/admin.jsx b/app/web/admin.jsx
index 4deb61b..ec16e06 100644
--- a/app/web/admin.jsx
+++ b/app/web/admin.jsx
@@ -594,6 +594,8 @@ const NEW_REQUEST_CLIENT_OPTION = "__new_client__";
     profileLoading,
     saveLoading,
     form,
+    currentEmail,
+    currentRoleLabel,
     totpStatus,
     onFieldChange,
     onClose,
@@ -601,6 +603,7 @@ const NEW_REQUEST_CLIENT_OPTION = "__new_client__";
     onSetupTotp,
     onRegenerateBackupCodes,
     onDisableTotp,
+    onLogout,
   }) {
     if (!open) return null;
     return (
@@ -613,14 +616,31 @@ const NEW_REQUEST_CLIENT_OPTION = "__new_client__";
                 Профиль и безопасность аккаунта.
               </p>
             </div>
-            <button className="close" type="button" onClick={onClose}>
-              ×
-            </button>
+            <div className="modal-head-actions">
+              <button className="icon-btn" type="button" data-tooltip="Выйти из аккаунта" aria-label="Выйти из аккаунта" onClick={onLogout}>
+                <svg viewBox="0 0 24 24" width="16" height="16" aria-hidden="true" focusable="false">
+                  <path
+                    d="M15.4 5.4a1 1 0 0 1 1.4 0l5.2 5.2a1 1 0 0 1 0 1.4l-5.2 5.2a1 1 0 1 1-1.4-1.4l3.5-3.4H9a1 1 0 1 1 0-2h9.9l-3.5-3.4a1 1 0 0 1 0-1.4zM3 4a1 1 0 0 1 1-1h7a1 1 0 1 1 0 2H5v14h6a1 1 0 1 1 0 2H4a1 1 0 0 1-1-1V4z"
+                    fill="currentColor"
+                  />
+                </svg>
+              </button>
+              <button className="close" type="button" onClick={onClose}>
+                ×
+              </button>
+            </div>
           </div>
           {profileLoading ? (
             <p className="muted">Загрузка профиля...</p>
           ) : (
             <form className="stack" onSubmit={onSubmit}>
+              <div className="account-security-box">
+                Пользователь: <b>{currentEmail || "-"}</b>
+                <br />
+                Роль: <b>{currentRoleLabel || "-"}</b>
+                <br />
+                2FA: <b>{totpStatus.enabled ? "Включена" : "Выключена"}</b>
+              </div>
               <div className="account-modal-grid">
                 <div className="field">
                   <label htmlFor="account-name">Имя</label>
@@ -3469,26 +3489,10 @@ const NEW_REQUEST_CLIENT_OPTION = "__new_client__";
                 </>
               ) : null}
             </nav>
-            <div className="auth-box">
-              {token && role ? (
-                <>
-                  Пользователь: <b>{email}</b>
-                  <br />
-                  Роль: <b>{roleLabel(role)}</b>
-                  <br />
-                  2FA: <b>{totpStatus.enabled ? "Включена" : "Выключена"}</b>
-                </>
-              ) : (
-                "Не авторизован"
-              )}
-            </div>
             <div style={{ marginTop: "0.75rem", display: "flex", gap: "0.5rem", flexWrap: "wrap" }}>
               <button className="btn secondary" type="button" onClick={refreshAll}>
                 Обновить
               </button>
-              <button className="btn danger" type="button" onClick={logout}>
-                Выйти
-              </button>
             </div>
           </aside>
 
@@ -3912,6 +3916,8 @@ const NEW_REQUEST_CLIENT_OPTION = "__new_client__";
           profileLoading={accountModal.loading}
           saveLoading={accountModal.saving}
           form={accountModal.form}
+          currentEmail={email}
+          currentRoleLabel={roleLabel(role)}
           totpStatus={totpStatus}
           onFieldChange={updateAccountField}
           onClose={closeAccountModal}
@@ -3919,6 +3925,7 @@ const NEW_REQUEST_CLIENT_OPTION = "__new_client__";
           onSetupTotp={setupTotp}
           onRegenerateBackupCodes={regenerateTotpBackupCodes}
           onDisableTotp={disableTotp}
+          onLogout={logout}
         />
 
         {!token || !role ? <LoginScreen onSubmit={login} status={getStatus("login")} /> : null}