From 9c3a8b1e38dedbf16c3686fa9e4a20322906469d Mon Sep 17 00:00:00 2001
From: Daniil <kazancevdanila2015@yandex.ru>
Date: Wed, 14 Oct 2026 20:52:15 +0300
Subject: [PATCH 1/7] feat: add UserCreate form and controller

---
 .../controllers/UserCreateFormController.java | 94 +++++++++++++++++++
 src/main/resources/fxml/UserCreateForm.fxml   | 53 +++++++++++
 2 files changed, 147 insertions(+)
 create mode 100644 src/main/java/com/DesktopApplicationClientJava/controllers/UserCreateFormController.java
 create mode 100644 src/main/resources/fxml/UserCreateForm.fxml

diff --git a/src/main/java/com/DesktopApplicationClientJava/controllers/UserCreateFormController.java b/src/main/java/com/DesktopApplicationClientJava/controllers/UserCreateFormController.java
new file mode 100644
index 0000000..83312d3
--- /dev/null
+++ b/src/main/java/com/DesktopApplicationClientJava/controllers/UserCreateFormController.java
@@ -0,0 +1,94 @@
+package com.DesktopApplicationClientJava.controllers;
+
+import com.DesktopApplicationClientJava.controllers.utils.Controller;
+import com.DesktopApplicationClientJava.entities.Role;
+import com.DesktopApplicationClientJava.entities.User;
+import com.DesktopApplicationClientJava.services.ServiceException;
+import com.DesktopApplicationClientJava.services.data.RegisterData;
+import com.DesktopApplicationClientJava.validation.EmailValidator;
+import javafx.collections.FXCollections;
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+import javafx.scene.control.*;
+
+import java.util.Arrays;
+
+public class UserCreateFormController extends Controller {
+
+    @FXML
+    private TextField emailField;
+    @FXML private PasswordField passwordField;
+    @FXML private Label errorLabel;
+    @FXML private Button submitButton;
+    @FXML private ChoiceBox<String> rolesChoiceBox;
+    @FXML private TextField firstNameField;
+    @FXML private TextField lastNameField;
+
+    @FXML
+    public void initialize() {
+        // Способ 1: через setItems
+        rolesChoiceBox.setItems(FXCollections.observableArrayList(
+                Role.USER.toString(),
+                Role.MODER.toString(),
+                Role.ADMIN.toString()
+        ));
+        // Установить значение по умолчанию (опционально)
+        rolesChoiceBox.setValue(Role.USER.toString());
+
+        System.out.println(rolesChoiceBox.getValue());
+
+    }
+
+    @FXML
+    private void onSubmit(ActionEvent event) {
+        String email = emailField.getText() == null ? "" : emailField.getText().trim();
+        String password = passwordField.getText() == null ? "" : passwordField.getText();
+        String roleStirng = rolesChoiceBox.getValue() == null ? "" : rolesChoiceBox.getValue();
+        String firstName = firstNameField.getText() == null ? "" : firstNameField.getText().trim();
+        String lastName = lastNameField.getText() == null ? "" : lastNameField.getText().trim();
+
+        if (email.isBlank() || password.isBlank() || roleStirng.isBlank() || firstName.isBlank() || lastName.isBlank()) {
+            showError("Заполните все поля");
+            return;
+        }
+
+        if (!(roleStirng.equals(Role.USER.toString()) || roleStirng.equals(Role.MODER.toString())
+                || roleStirng.equals(Role.ADMIN.toString()))) {
+            showError("Роль не определена");
+            return;
+        }
+
+
+
+        Role role = Role.valueOf(roleStirng);
+
+        String emailError = EmailValidator.validate(email);
+        if (emailError != null) {
+            showError(emailError);
+            return;
+        }
+
+        try {
+            RegisterData registerData = new RegisterData(email, password, role, firstName, lastName);
+            User user = services.getUsersService().create(registerData);
+            if (user == null) {
+                return;
+            }
+            hideError();
+        } catch (ServiceException e) {
+            showError(e.getMessage());
+        }
+    }
+
+    private void showError(String message) {
+        errorLabel.setText(message);
+        errorLabel.setVisible(true);
+        errorLabel.setManaged(true);
+    }
+
+    private void hideError() {
+        errorLabel.setText("");
+        errorLabel.setVisible(false);
+        errorLabel.setManaged(false);
+    }
+}
diff --git a/src/main/resources/fxml/UserCreateForm.fxml b/src/main/resources/fxml/UserCreateForm.fxml
new file mode 100644
index 0000000..752ce6a
--- /dev/null
+++ b/src/main/resources/fxml/UserCreateForm.fxml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+
+<?import javafx.collections.FXCollections?>
+<?import java.lang.String?>
+<VBox fx:id="root" alignment="CENTER" prefHeight="259.0" prefWidth="410.0" xmlns="http://javafx.com/javafx/17.0.12" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.DesktopApplicationClientJava.controllers.UserCreateFormController">
+   <padding>
+      <Insets bottom="20" left="20" right="20" top="20" />
+   </padding>
+
+   <VBox maxWidth="420" styleClass="panel, panel-primary">
+      <VBox styleClass="panel-heading">
+         <Label styleClass="panel-title" text="Госхрон" />
+      </VBox>
+
+      <VBox spacing="8" styleClass="panel-body">
+         <padding>
+            <Insets bottom="12" left="12" right="12" top="12" />
+         </padding>
+
+         <Label text="Почта" />
+         <TextField fx:id="emailField" promptText="youremail@example.com" />
+
+         <Label text="Пароль" />
+         <PasswordField fx:id="passwordField" />
+
+         <Label text="Роль" />
+         <ChoiceBox fx:id="rolesChoiceBox" prefWidth="150.0">
+            <items>
+               <FXCollections fx:factory="observableArrayList">
+                  <String fx:value="Значение 1"/>
+                  <String fx:value="Значение 2"/>
+                  <String fx:value="Значение 3"/>
+               </FXCollections>
+            </items>
+         </ChoiceBox>
+
+         <Label text="Имя" />
+         <TextField fx:id="firstNameField" promptText="Иван" />
+
+         <Label text="Фамилия" />
+         <TextField fx:id="lastNameField" promptText="Иванов" />
+
+         <Label fx:id="errorLabel" managed="false" maxWidth="Infinity" styleClass="alert, alert-danger" visible="false" wrapText="true" />
+
+
+         <Button fx:id="submitButton" maxWidth="Infinity" onAction="#onSubmit" styleClass="btn, btn-primary, btn-block" text="Войти" />
+      </VBox>
+   </VBox>
+</VBox>

From b5dce16b4c67b6e62daec5bac63deb4663ea12fa Mon Sep 17 00:00:00 2001
From: Daniil <kazancevdanila2015@yandex.ru>
Date: Fri, 16 Oct 2026 02:28:25 +0300
Subject: [PATCH 2/7] feat: admin pages

---
 .../controllers/ResourceListController.java   |  13 +-
 .../controllers/UserCreateFormController.java |   6 +
 .../controllers/UserDetailsController.java    | 248 +++++++++++++
 .../controllers/UserUpdateFormController.java | 218 +++++++++++
 .../controllers/UsersListController.java      | 341 ++++++++++++++++++
 src/main/resources/fxml/ResourceList.fxml     |   4 +
 src/main/resources/fxml/UserCreateForm.fxml   | 112 ++++--
 src/main/resources/fxml/UserDetails.fxml      |  73 ++++
 src/main/resources/fxml/UserList.fxml         | 110 ++++++
 src/main/resources/fxml/UserUpdateForm.fxml   |  95 +++++
 src/main/resources/styles.css                 |  18 +
 11 files changed, 1207 insertions(+), 31 deletions(-)
 create mode 100644 src/main/java/com/DesktopApplicationClientJava/controllers/UserDetailsController.java
 create mode 100644 src/main/java/com/DesktopApplicationClientJava/controllers/UserUpdateFormController.java
 create mode 100644 src/main/java/com/DesktopApplicationClientJava/controllers/UsersListController.java
 create mode 100644 src/main/resources/fxml/UserDetails.fxml
 create mode 100644 src/main/resources/fxml/UserList.fxml
 create mode 100644 src/main/resources/fxml/UserUpdateForm.fxml

diff --git a/src/main/java/com/DesktopApplicationClientJava/controllers/ResourceListController.java b/src/main/java/com/DesktopApplicationClientJava/controllers/ResourceListController.java
index e187096..f82e2d4 100644
--- a/src/main/java/com/DesktopApplicationClientJava/controllers/ResourceListController.java
+++ b/src/main/java/com/DesktopApplicationClientJava/controllers/ResourceListController.java
@@ -47,6 +47,7 @@ public class ResourceListController extends Controller {
   @FXML private Button prevButton;
   @FXML private Button nextButton;
   @FXML private Button logoutButton;
+  @FXML private Button usersButton;
 
   private final ObservableList<Resource> rows = FXCollections.observableArrayList();
   private long offset = 0;
@@ -67,7 +68,6 @@ private void initialize() {
     sortCombo.setOnAction(e -> reloadFromStart());
     resourceTable.setColumnResizePolicy(TableView.CONSTRAINED_RESIZE_POLICY_FLEX_LAST_COLUMN);
 
-    // Initial load on open. Guarded for FXML tooling previews where no services are wired.
     if (services != null && services.getResourceService() != null) {
       reloadFromStart();
     }
@@ -126,6 +126,11 @@ private void setupRbac() {
     deleteButton.setVisible(canModify);
     deleteButton.setManaged(canModify);
     updateDeleteButtonState();
+
+    // Кнопка «Пользователи» доступна только администраторам.
+    boolean isAdmin = authService != null && authService.isAdmin();
+    usersButton.setVisible(isAdmin);
+    usersButton.setManaged(isAdmin);
   }
 
   private void updateDeleteButtonState() {
@@ -134,6 +139,12 @@ private void updateDeleteButtonState() {
     deleteButton.setDisable(!(canModify && hasSelection));
   }
 
+  @FXML
+  private void onOpenUsers(ActionEvent e) {
+    navigator.goTo("/fxml/UserList.fxml");
+  }
+  }
+
   // ===== Data loading =====
 
   private void reloadFromStart() {
diff --git a/src/main/java/com/DesktopApplicationClientJava/controllers/UserCreateFormController.java b/src/main/java/com/DesktopApplicationClientJava/controllers/UserCreateFormController.java
index 83312d3..c872f0a 100644
--- a/src/main/java/com/DesktopApplicationClientJava/controllers/UserCreateFormController.java
+++ b/src/main/java/com/DesktopApplicationClientJava/controllers/UserCreateFormController.java
@@ -75,11 +75,17 @@ private void onSubmit(ActionEvent event) {
                 return;
             }
             hideError();
+            navigator.goTo("/fxml/UserList.fxml");
         } catch (ServiceException e) {
             showError(e.getMessage());
         }
     }
 
+    @FXML
+    void onCancel(ActionEvent event) {
+        navigator.goTo("/fxml/UserList.fxml");
+    }
+
     private void showError(String message) {
         errorLabel.setText(message);
         errorLabel.setVisible(true);
diff --git a/src/main/java/com/DesktopApplicationClientJava/controllers/UserDetailsController.java b/src/main/java/com/DesktopApplicationClientJava/controllers/UserDetailsController.java
new file mode 100644
index 0000000..9e94814
--- /dev/null
+++ b/src/main/java/com/DesktopApplicationClientJava/controllers/UserDetailsController.java
@@ -0,0 +1,248 @@
+package com.DesktopApplicationClientJava.controllers;
+
+import com.DesktopApplicationClientJava.controllers.utils.Controller;
+import com.DesktopApplicationClientJava.entities.User;
+import com.DesktopApplicationClientJava.services.ServiceException;
+import java.util.UUID;
+import javafx.concurrent.Task;
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+import javafx.scene.control.Alert;
+import javafx.scene.control.Button;
+import javafx.scene.control.ButtonBar;
+import javafx.scene.control.ButtonType;
+import javafx.scene.control.Label;
+
+public class UserDetailsController extends Controller {
+
+    @FXML private Label fullNameLabel;
+    @FXML private Label emailLabel;
+    @FXML private Label roleLabel;
+    @FXML private Label enabledLabel;
+    @FXML private Label uuidLabel;
+    @FXML private Label errorLabel;
+    @FXML private Label statusLabel;
+    @FXML private Button backButton;
+    @FXML private Button editButton;
+    @FXML private Button deleteButton;
+
+    private UUID userId;
+    private User current;
+
+    // ===== Lifecycle =====
+
+    @FXML
+    private void initialize() {
+        hideError();
+
+        // Кнопки редактирования и удаления доступны только администраторам.
+        var authService = services == null ? null : services.getAuthService();
+        boolean isAdmin = authService != null && authService.isAdmin();
+
+        editButton.setVisible(isAdmin);
+        editButton.setManaged(isAdmin);
+
+        deleteButton.setVisible(isAdmin);
+        deleteButton.setManaged(isAdmin);
+    }
+
+    /** Navigator sets the id after FXML load, so the setter triggers loading. */
+    public void setUserId(UUID userId) {
+        this.userId = userId;
+        if (fullNameLabel != null && userId != null && services != null) {
+            load();
+        }
+    }
+
+    // ===== Loading =====
+
+    private void load() {
+        hideError();
+        statusLabel.setText("Загрузка…");
+        setContentVisible(false);
+
+        var task =
+                new Task<User>() {
+                    @Override
+                    protected User call() {
+                        return services.getUsersService().getById(userId);
+                    }
+                };
+
+        task.setOnSucceeded(
+                e -> {
+                    current = task.getValue();
+                    statusLabel.setText("");
+                    if (current == null) {
+                        showError("Пользователь не найден");
+                        return;
+                    }
+                    showUser(current);
+                    setContentVisible(true);
+                });
+
+        task.setOnFailed(
+                e -> {
+                    statusLabel.setText("");
+                    var ex = task.getException();
+                    String msg =
+                            ex instanceof ServiceException se
+                                    ? se.getMessage()
+                                    : "Не удалось загрузить пользователя";
+                    showError(msg);
+                });
+
+        startDaemon(task, "user-details-load");
+    }
+
+    private void showUser(User user) {
+        String first = user.getFirstName() == null ? "" : user.getFirstName();
+        String last = user.getLastName() == null ? "" : user.getLastName();
+        String full = (first + " " + last).trim();
+        fullNameLabel.setText(full.isEmpty() ? "Без имени" : full);
+
+        emailLabel.setText(user.getEmail() == null ? "" : user.getEmail());
+        roleLabel.setText(user.getRole() == null ? "" : user.getRole().name());
+        enabledLabel.setText(Boolean.TRUE.equals(user.getEnabled()) ? "Да" : "Нет");
+        uuidLabel.setText(user.getUuid() == null ? "" : user.getUuid().toString());
+
+        updateDeleteButtonState(user);
+    }
+
+    /**
+     * Админ не может удалить собственную учётную запись. Кнопка видна только
+     * администраторам (см. initialize), но дополнительно гасится, если
+     * просматривается именно текущий пользователь.
+     */
+    private void updateDeleteButtonState(User user) {
+        var authService = services == null ? null : services.getAuthService();
+        var me = authService == null ? null : authService.getCurrentUser();
+        boolean isSelf =
+                me != null
+                        && user != null
+                        && user.getUuid() != null
+                        && user.getUuid().equals(me.getUuid());
+        deleteButton.setDisable(isSelf);
+    }
+
+    // ===== Event handlers =====
+
+    @FXML
+    private void onBack(ActionEvent e) {
+        navigator.goTo("/fxml/UserList.fxml");
+    }
+
+    @FXML
+    private void onEdit(ActionEvent e) {
+        if (current == null || current.getUuid() == null) {
+            return;
+        }
+        navigator.goTo(
+                "/fxml/UserUpdateForm.fxml",
+                c -> ((UserUpdateFormController) c).setUserId(current.getUuid()));
+    }
+
+    @FXML
+    private void onDelete(ActionEvent e) {
+        if (current == null || current.getUuid() == null) {
+            return;
+        }
+
+        // Двойная защита: даже если кнопку как-то активировали, себя удалить нельзя.
+        var authService = services == null ? null : services.getAuthService();
+        var me = authService == null ? null : authService.getCurrentUser();
+        if (me != null && current.getUuid().equals(me.getUuid())) {
+            showError("Нельзя удалить собственную учётную запись");
+            return;
+        }
+
+        if (!confirmDelete(current)) {
+            return;
+        }
+
+        hideError();
+        setBusy(true);
+
+        var uuid = current.getUuid();
+        var task =
+                new Task<Void>() {
+                    @Override
+                    protected Void call() {
+                        services.getUsersService().delete(uuid);
+                        return null;
+                    }
+                };
+
+        task.setOnSucceeded(
+                ev -> {
+                    setBusy(false);
+                    navigator.goTo("/fxml/UserList.fxml");
+                });
+
+        task.setOnFailed(
+                ev -> {
+                    setBusy(false);
+                    var ex = task.getException();
+                    String msg =
+                            ex instanceof ServiceException se
+                                    ? se.getMessage()
+                                    : "Не удалось удалить пользователя";
+                    showError(msg);
+                });
+
+        startDaemon(task, "user-delete");
+    }
+
+    // ===== Confirmation dialog =====
+
+    private boolean confirmDelete(User user) {
+        var alert = new Alert(Alert.AlertType.CONFIRMATION);
+        alert.setTitle("Удаление пользователя");
+        alert.setHeaderText(null);
+        alert.setContentText(
+                "Удалить пользователя \""
+                        + (user.getEmail() == null ? user.getUuid().toString() : user.getEmail())
+                        + "\"? Действие необратимо.");
+
+        var ok = new ButtonType("Удалить", ButtonBar.ButtonData.OK_DONE);
+        var cancel = new ButtonType("Отмена", ButtonBar.ButtonData.CANCEL_CLOSE);
+        alert.getButtonTypes().setAll(ok, cancel);
+
+        return alert.showAndWait().filter(ok::equals).isPresent();
+    }
+
+    // ===== UI helpers =====
+
+    private void setContentVisible(boolean visible) {
+        fullNameLabel.setVisible(visible);
+        emailLabel.setVisible(visible);
+        roleLabel.setVisible(visible);
+        enabledLabel.setVisible(visible);
+        uuidLabel.setVisible(visible);
+    }
+
+    private void setBusy(boolean busy) {
+        deleteButton.setDisable(busy);
+        editButton.setDisable(busy);
+        backButton.setDisable(busy);
+        statusLabel.setText(busy ? "Удаление…" : "");
+    }
+
+    private void showError(String message) {
+        errorLabel.setText(message);
+        errorLabel.setVisible(true);
+        errorLabel.setManaged(true);
+    }
+
+    private void hideError() {
+        errorLabel.setText("");
+        errorLabel.setVisible(false);
+        errorLabel.setManaged(false);
+    }
+
+    private static void startDaemon(Task<?> task, String name) {
+        var thread = new Thread(task, name);
+        thread.setDaemon(true);
+        thread.start();
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/DesktopApplicationClientJava/controllers/UserUpdateFormController.java b/src/main/java/com/DesktopApplicationClientJava/controllers/UserUpdateFormController.java
new file mode 100644
index 0000000..13c2fe8
--- /dev/null
+++ b/src/main/java/com/DesktopApplicationClientJava/controllers/UserUpdateFormController.java
@@ -0,0 +1,218 @@
+package com.DesktopApplicationClientJava.controllers;
+
+import com.DesktopApplicationClientJava.controllers.utils.Controller;
+import com.DesktopApplicationClientJava.entities.Role;
+import com.DesktopApplicationClientJava.entities.User;
+import com.DesktopApplicationClientJava.services.ServiceException;
+import com.DesktopApplicationClientJava.services.data.UpdateUserData;
+import java.util.UUID;
+import javafx.application.Platform;
+import javafx.collections.FXCollections;
+import javafx.concurrent.Task;
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.CheckBox;
+import javafx.scene.control.ChoiceBox;
+import javafx.scene.control.Label;
+import javafx.scene.control.PasswordField;
+import javafx.scene.control.TextField;
+
+public class UserUpdateFormController extends Controller {
+
+    @FXML private Label subtitleLabel;
+    @FXML private TextField emailField;
+    @FXML private ChoiceBox<Role> roleChoiceBox;
+    @FXML private TextField firstNameField;
+    @FXML private TextField lastNameField;
+    @FXML private CheckBox enabledCheckBox;
+    @FXML private Label errorLabel;
+    @FXML private Button saveButton;
+    @FXML private Button cancelButton;
+
+    private UUID userId;
+    private User current;
+
+    // ===== Lifecycle =====
+
+    @FXML
+    private void initialize() {
+        hideError();
+        roleChoiceBox.setItems(FXCollections.observableArrayList(Role.values()));
+    }
+
+    /** Вызывается навигатором при переходе на форму. */
+    public void setUserId(UUID userId) {
+        this.userId = userId;
+        loadUser();
+    }
+
+    // ===== Loading =====
+
+    private void loadUser() {
+        if (userId == null || services == null || services.getUsersService() == null) {
+            return;
+        }
+        hideError();
+        setFormDisabled(true);
+
+        var task =
+                new Task<User>() {
+                    @Override
+                    protected User call() {
+                        return services.getUsersService().getById(userId);
+                    }
+                };
+
+        task.setOnSucceeded(
+                e -> {
+                    current = task.getValue();
+                    if (current == null) {
+                        showError("Пользователь не найден");
+                        setFormDisabled(true);
+                        return;
+                    }
+                    populateForm(current);
+                    setFormDisabled(false);
+                });
+
+        task.setOnFailed(
+                e -> {
+                    var ex = task.getException();
+                    String msg =
+                            ex instanceof ServiceException se ? se.getMessage() : "Не удалось загрузить пользователя";
+                    showError(msg);
+                    setFormDisabled(true);
+                });
+
+        startDaemon(task, "user-update-load");
+    }
+
+    private void populateForm(User user) {
+        emailField.setText(user.getEmail() == null ? "" : user.getEmail());
+        firstNameField.setText(user.getFirstName() == null ? "" : user.getFirstName());
+        lastNameField.setText(user.getLastName() == null ? "" : user.getLastName());
+        roleChoiceBox.getSelectionModel().select(user.getRole());
+        enabledCheckBox.setSelected(Boolean.TRUE.equals(user.getEnabled()));
+        subtitleLabel.setText(user.getEmail() == null ? "" : user.getEmail());
+    }
+
+    // ===== Event handlers =====
+
+    @FXML
+    private void onSave(ActionEvent e) {
+        if (current == null) {
+            return;
+        }
+        var data = collectAndValidate();
+        if (data == null) {
+            return;
+        }
+
+        hideError();
+        setFormDisabled(true);
+
+        var task =
+                new Task<User>() {
+                    @Override
+                    protected User call() {
+                        return services.getUsersService().update(current.getUuid(), data);
+                    }
+                };
+
+        task.setOnSucceeded(
+                ev -> {
+                    setFormDisabled(false);
+                    navigator.goTo("/fxml/UserList.fxml");
+                });
+
+        task.setOnFailed(
+                ev -> {
+                    setFormDisabled(false);
+                    var ex = task.getException();
+                    String msg =
+                            ex instanceof ServiceException se ? se.getMessage() : "Не удалось сохранить изменения";
+                    showError(msg);
+                });
+
+        startDaemon(task, "user-update-save");
+    }
+
+    @FXML
+    private void onCancel(ActionEvent e) {
+        navigator.goTo("/fxml/UserList.fxml");
+    }
+
+    // ===== Validation / data =====
+
+    /**
+     * Собирает данные формы. Если валидация не прошла — показывает ошибку
+     * и возвращает {@code null}.
+     */
+    private UpdateUserData collectAndValidate() {
+        String email = safeTrim(emailField.getText());
+        String firstName = safeTrim(firstNameField.getText());
+        String lastName = safeTrim(lastNameField.getText());
+        Role role = roleChoiceBox.getValue();
+        boolean enabled = enabledCheckBox.isSelected();
+
+        if (email == null || email.isBlank()) {
+            showError("Укажите почту");
+            return null;
+        }
+        if (!email.contains("@")) {
+            showError("Почта указана некорректно");
+            return null;
+        }
+        if (firstName == null || firstName.isBlank()) {
+            showError("Укажите имя");
+            return null;
+        }
+        if (lastName == null || lastName.isBlank()) {
+            showError("Укажите фамилию");
+            return null;
+        }
+        if (role == null) {
+            showError("Выберите роль");
+            return null;
+        }
+
+        // NB: UpdateUserData не содержит пароль — смена пароля выполняется отдельно.
+        // Поле passwordField оставлено в форме для будущей поддержки, но сейчас
+        // в UpdateUserData не передаётся.
+        return new UpdateUserData(email, role, firstName, lastName, enabled);
+    }
+
+    // ===== UI helpers =====
+
+    private void setFormDisabled(boolean disabled) {
+        emailField.setDisable(disabled);
+        roleChoiceBox.setDisable(disabled);
+        firstNameField.setDisable(disabled);
+        lastNameField.setDisable(disabled);
+        enabledCheckBox.setDisable(disabled);
+        saveButton.setDisable(disabled);
+    }
+
+    private void showError(String message) {
+        errorLabel.setText(message);
+        errorLabel.setVisible(true);
+        errorLabel.setManaged(true);
+    }
+
+    private void hideError() {
+        errorLabel.setText("");
+        errorLabel.setVisible(false);
+        errorLabel.setManaged(false);
+    }
+
+    private static String safeTrim(String value) {
+        return value == null ? null : value.trim();
+    }
+
+    private static void startDaemon(Task<?> task, String name) {
+        var thread = new Thread(task, name);
+        thread.setDaemon(true);
+        thread.start();
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/DesktopApplicationClientJava/controllers/UsersListController.java b/src/main/java/com/DesktopApplicationClientJava/controllers/UsersListController.java
new file mode 100644
index 0000000..65b1d0a
--- /dev/null
+++ b/src/main/java/com/DesktopApplicationClientJava/controllers/UsersListController.java
@@ -0,0 +1,341 @@
+package com.DesktopApplicationClientJava.controllers;
+
+import com.DesktopApplicationClientJava.controllers.utils.Controller;
+import com.DesktopApplicationClientJava.entities.User;
+import com.DesktopApplicationClientJava.services.ServiceException;
+import com.DesktopApplicationClientJava.services.filter.UserFilter;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.concurrent.Task;
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.ComboBox;
+import javafx.scene.control.Label;
+import javafx.scene.control.TableColumn;
+import javafx.scene.control.TableRow;
+import javafx.scene.control.TableView;
+import javafx.scene.control.TextField;
+import javafx.scene.control.cell.PropertyValueFactory;
+
+public class UsersListController extends Controller {
+
+    private static final int PAGE_SIZE = 20;
+    /** Насколько широко тянем список при активном поиске (клиентская фильтрация). */
+    private static final int SEARCH_LIMIT = 500;
+
+    @FXML private Label userInfoLabel;
+    @FXML private Label errorLabel;
+    @FXML private Label pageInfoLabel;
+    @FXML private Label statusLabel;
+    @FXML private TextField searchField;
+    @FXML private ComboBox<String> sortCombo;
+    @FXML private TableView<User> usersTable;
+    @FXML private TableColumn<User, String> emailColumn;
+    @FXML private TableColumn<User, String> firstNameColumn;
+    @FXML private TableColumn<User, String> lastNameColumn;
+    @FXML private TableColumn<User, String> roleColumn;
+    @FXML private TableColumn<User, String> enabledColumn;
+    @FXML private Button createButton;
+    @FXML private Button prevButton;
+    @FXML private Button nextButton;
+    @FXML private Button logoutButton;
+    @FXML private Button resourcesButton;
+
+    private final ObservableList<User> rows = FXCollections.observableArrayList();
+    private long offset = 0;
+
+    // ===== Lifecycle =====
+
+    @FXML
+    private void initialize() {
+        hideError();
+        setupUser();
+        setupSort();
+        setupTable();
+        setupRbac();
+
+        searchField.setOnAction(e -> reloadFromStart());
+        sortCombo.setOnAction(e -> reloadFromStart());
+        usersTable.setColumnResizePolicy(TableView.CONSTRAINED_RESIZE_POLICY_FLEX_LAST_COLUMN);
+
+        if (services != null && services.getUsersService() != null) {
+            reloadFromStart();
+        }
+    }
+
+    // ===== UI setup =====
+
+    private void setupUser() {
+        var authService = services == null ? null : services.getAuthService();
+        var me = authService == null ? null : authService.getCurrentUser();
+        userInfoLabel.setText(
+                me == null ? "" : me.getFirstName() + " " + me.getLastName() + " · " + me.getRole());
+    }
+
+    private void setupSort() {
+        sortCombo
+                .getItems()
+                .setAll("По email (А-Я)", "По email (Я-А)", "По имени (А-Я)", "По фамилии (А-Я)");
+        sortCombo.getSelectionModel().selectFirst();
+    }
+
+    @FXML
+    private void onOpenResources(ActionEvent e) {
+        navigator.goTo("/fxml/ResourceList.fxml");
+    }
+
+    private void setupTable() {
+        emailColumn.setCellValueFactory(new PropertyValueFactory<>("email"));
+        firstNameColumn.setCellValueFactory(new PropertyValueFactory<>("firstName"));
+        lastNameColumn.setCellValueFactory(new PropertyValueFactory<>("lastName"));
+        roleColumn.setCellValueFactory(
+                c -> new SimpleStringProperty(
+                        c.getValue().getRole() == null ? "" : c.getValue().getRole().name()));
+        enabledColumn.setCellValueFactory(
+                c -> new SimpleStringProperty(
+                        Boolean.TRUE.equals(c.getValue().getEnabled()) ? "Да" : "Нет"));
+
+        usersTable.setItems(rows);
+        usersTable.setPlaceholder(new Label("Пользователей пока нет"));
+
+        usersTable.setRowFactory(
+                tv -> {
+                    var row = new TableRow<User>();
+                    row.setOnMouseClicked(
+                            e -> {
+                                if (e.getClickCount() == 2 && !row.isEmpty()) {
+                                    openDetails(row.getItem());
+                                }
+                            });
+                    return row;
+                });
+    }
+
+    private void setupRbac() {
+        var authService = services == null ? null : services.getAuthService();
+        boolean canCreate = authService != null && authService.isAdmin();
+        createButton.setVisible(canCreate);
+        createButton.setManaged(canCreate);
+    }
+
+    // ===== Data loading =====
+
+    private void reloadFromStart() {
+        offset = 0;
+        loadAsync();
+    }
+
+    private void loadAsync() {
+        hideError();
+        statusLabel.setText("Загрузка…");
+
+        final String query = currentQuery();
+        final boolean searching = query != null;
+        final UserFilter filter = buildFilter(query);
+        final SortSpec sort = resolveSort();
+        final long currentOffset = offset;
+        // При активном поиске тянем широкую выборку и фильтруем локально,
+        // чтобы не потерять совпадения по имени/фамилии.
+        final long fetchCount = searching ? SEARCH_LIMIT : PAGE_SIZE;
+        final long fetchOffset = searching ? 0 : currentOffset;
+
+        var task =
+                new Task<List<User>>() {
+                    @Override
+                    protected List<User> call() {
+                        return services
+                                .getUsersService()
+                                .search(filter, fetchOffset, fetchCount);
+                    }
+                };
+
+        task.setOnSucceeded(
+                e -> {
+                    List<User> page = task.getValue();
+                    if (page == null) {
+                        page = List.of();
+                    }
+                    var list = new ArrayList<>(page);
+
+                    // Клиентская фильтрация по подстроке (email + имя + фамилия).
+                    if (searching) {
+                        list.removeIf(u -> !matchesQuery(u, query));
+                    }
+
+                    sort.sort(list);
+                    rows.setAll(list);
+
+                    updatePaginationUi(searching ? list.size() : page.size(), searching);
+                    statusLabel.setText(
+                            searching ? "Найдено: " + list.size() : "");
+                });
+
+        task.setOnFailed(
+                e -> {
+                    var ex = task.getException();
+                    String msg =
+                            ex instanceof ServiceException se
+                                    ? se.getMessage()
+                                    : "Не удалось загрузить список";
+                    showError(msg);
+                    rows.clear();
+                    updatePaginationUi(0, searching);
+                    statusLabel.setText("");
+                });
+
+        var thread = new Thread(task, "users-list-load");
+        thread.setDaemon(true);
+        thread.start();
+    }
+
+    private String currentQuery() {
+        String raw = searchField.getText();
+        if (raw == null) {
+            return null;
+        }
+        String trimmed = raw.trim();
+        return trimmed.isEmpty() ? null : trimmed;
+    }
+
+    /**
+     * Различные бэкенды по-разному комбинируют поля фильтра. Чтобы поиск
+     * работал предсказуемо, на сервер отправляем только email-фильтр
+     * (когда запрос похож на email), а имя/фамилию фильтруем локально.
+     */
+    private UserFilter buildFilter(String query) {
+        if (query == null) {
+            return UserFilter.empty();
+        }
+        boolean looksLikeEmail = query.contains("@");
+        return looksLikeEmail
+                ? new UserFilter(query, null, null, null, null)
+                : UserFilter.empty();
+    }
+
+    private static boolean matchesQuery(User u, String query) {
+        if (u == null) {
+            return false;
+        }
+        String needle = query.toLowerCase(Locale.ROOT);
+        return containsIgnoreCase(u.getEmail(), needle)
+                || containsIgnoreCase(u.getFirstName(), needle)
+                || containsIgnoreCase(u.getLastName(), needle);
+    }
+
+    private static boolean containsIgnoreCase(String value, String lowerNeedle) {
+        return value != null && value.toLowerCase(Locale.ROOT).contains(lowerNeedle);
+    }
+
+    private record SortSpec(java.util.Comparator<User> comparator) {
+        void sort(List<User> list) {
+            if (comparator != null) {
+                list.sort(comparator);
+            }
+        }
+    }
+
+    private SortSpec resolveSort() {
+        String choice = sortCombo.getValue();
+        if (choice == null) {
+            return new SortSpec(null);
+        }
+        return switch (choice) {
+            case "По email (А-Я)" ->
+                    new SortSpec(java.util.Comparator.comparing(
+                            u -> u.getEmail() == null ? "" : u.getEmail(),
+                            String.CASE_INSENSITIVE_ORDER));
+            case "По email (Я-А)" ->
+                    new SortSpec(java.util.Comparator.comparing(
+                                    (User u) -> u.getEmail() == null ? "" : u.getEmail(),
+                                    String.CASE_INSENSITIVE_ORDER)
+                            .reversed());
+            case "По имени (А-Я)" ->
+                    new SortSpec(java.util.Comparator.comparing(
+                            u -> u.getFirstName() == null ? "" : u.getFirstName(),
+                            String.CASE_INSENSITIVE_ORDER));
+            case "По фамилии (А-Я)" ->
+                    new SortSpec(java.util.Comparator.comparing(
+                            u -> u.getLastName() == null ? "" : u.getLastName(),
+                            String.CASE_INSENSITIVE_ORDER));
+            default -> new SortSpec(null);
+        };
+    }
+
+    private void updatePaginationUi(int pageSize, boolean searching) {
+        if (searching) {
+            // При активном поиске мы показываем «плоский» отфильтрованный список
+            // без серверной пагинации — кнопки не имеют смысла.
+            pageInfoLabel.setText("Показано " + rows.size());
+            prevButton.setDisable(true);
+            nextButton.setDisable(true);
+            return;
+        }
+        long from = rows.isEmpty() ? 0 : offset + 1;
+        long to = offset + pageSize;
+        pageInfoLabel.setText("Показано " + from + "–" + to);
+        prevButton.setDisable(offset == 0);
+        nextButton.setDisable(pageSize < PAGE_SIZE);
+    }
+
+    // ===== Event handlers =====
+
+    @FXML
+    private void onCreate(ActionEvent e) {
+        navigator.goTo("/fxml/UserCreateForm.fxml");
+    }
+
+    @FXML
+    private void onLogout(ActionEvent e) {
+        services.getAuthService().logout();
+        navigator.goTo("/fxml/LoginForm.fxml");
+    }
+
+    @FXML
+    private void onSearch(ActionEvent e) {
+        offset = 0;
+        loadAsync();
+    }
+
+    @FXML
+    private void onSort(ActionEvent e) {
+        offset = 0;
+        loadAsync();
+    }
+
+    @FXML
+    private void onNext(ActionEvent e) {
+        offset += PAGE_SIZE;
+        loadAsync();
+    }
+
+    @FXML
+    private void onPrev(ActionEvent e) {
+        offset = Math.max(0, offset - PAGE_SIZE);
+        loadAsync();
+    }
+
+    private void openDetails(User user) {
+        navigator.goTo(
+                "/fxml/UserDetails.fxml",
+                c -> ((UserDetailsController) c).setUserId(user.getUuid()));
+    }
+
+    // ===== helpers =====
+
+    private void showError(String message) {
+        errorLabel.setText(message);
+        errorLabel.setVisible(true);
+        errorLabel.setManaged(true);
+    }
+
+    private void hideError() {
+        errorLabel.setText("");
+        errorLabel.setVisible(false);
+        errorLabel.setManaged(false);
+    }
+}
\ No newline at end of file
diff --git a/src/main/resources/fxml/ResourceList.fxml b/src/main/resources/fxml/ResourceList.fxml
index f693b35..797ba3d 100644
--- a/src/main/resources/fxml/ResourceList.fxml
+++ b/src/main/resources/fxml/ResourceList.fxml
@@ -25,6 +25,10 @@
                 <Label text="Архив документов" styleClass="card-subtitle"/>
             </VBox>
             <Region HBox.hgrow="ALWAYS"/>
+            <Button fx:id="usersButton"
+                    text="Пользователи"
+                    onAction="#onOpenUsers"
+                    styleClass="btn-ghost"/>
             <Label fx:id="userInfoLabel" styleClass="user-chip"/>
             <Button fx:id="logoutButton"
                     text="Выйти"
diff --git a/src/main/resources/fxml/UserCreateForm.fxml b/src/main/resources/fxml/UserCreateForm.fxml
index 752ce6a..bd65f99 100644
--- a/src/main/resources/fxml/UserCreateForm.fxml
+++ b/src/main/resources/fxml/UserCreateForm.fxml
@@ -1,34 +1,56 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.geometry.*?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ChoiceBox?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.PasswordField?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
 
 <?import javafx.collections.FXCollections?>
 <?import java.lang.String?>
-<VBox fx:id="root" alignment="CENTER" prefHeight="259.0" prefWidth="410.0" xmlns="http://javafx.com/javafx/17.0.12" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.DesktopApplicationClientJava.controllers.UserCreateFormController">
-   <padding>
-      <Insets bottom="20" left="20" right="20" top="20" />
-   </padding>
 
-   <VBox maxWidth="420" styleClass="panel, panel-primary">
-      <VBox styleClass="panel-heading">
-         <Label styleClass="panel-title" text="Госхрон" />
-      </VBox>
+<VBox xmlns="http://javafx.com/javafx/17.0.12"
+      xmlns:fx="http://javafx.com/fxml/1"
+      fx:id="root"
+      fx:controller="com.DesktopApplicationClientJava.controllers.UserCreateFormController"
+      styleClass="auth-bg"
+      alignment="TOP_CENTER">
+
+   <VBox styleClass="card-lg"
+         spacing="18"
+         maxWidth="480">
 
-      <VBox spacing="8" styleClass="panel-body">
-         <padding>
-            <Insets bottom="12" left="12" right="12" top="12" />
-         </padding>
+      <!-- Заголовок -->
+      <VBox spacing="4">
+         <Label styleClass="card-title" text="Госхрон"/>
+         <Label styleClass="card-subtitle" text="Создание нового пользователя"/>
+      </VBox>
 
-         <Label text="Почта" />
-         <TextField fx:id="emailField" promptText="youremail@example.com" />
+      <!-- Почта -->
+      <VBox spacing="6">
+         <Label styleClass="field-label" text="Почта" labelFor="$emailField"/>
+         <TextField fx:id="emailField"
+                    styleClass="text-input"
+                    promptText="youremail@example.com"/>
+      </VBox>
 
-         <Label text="Пароль" />
-         <PasswordField fx:id="passwordField" />
+      <!-- Пароль -->
+      <VBox spacing="6">
+         <Label styleClass="field-label" text="Пароль" labelFor="$passwordField"/>
+         <PasswordField fx:id="passwordField"
+                        styleClass="text-input"
+                        promptText="Введите пароль"/>
+      </VBox>
 
-         <Label text="Роль" />
-         <ChoiceBox fx:id="rolesChoiceBox" prefWidth="150.0">
+      <!-- Роль -->
+      <VBox spacing="6">
+         <Label styleClass="field-label" text="Роль" labelFor="$rolesChoiceBox"/>
+         <ChoiceBox fx:id="rolesChoiceBox"
+                    styleClass="combo"
+                    maxWidth="Infinity">
             <items>
                <FXCollections fx:factory="observableArrayList">
                   <String fx:value="Значение 1"/>
@@ -37,17 +59,47 @@
                </FXCollections>
             </items>
          </ChoiceBox>
+      </VBox>
 
-         <Label text="Имя" />
-         <TextField fx:id="firstNameField" promptText="Иван" />
-
-         <Label text="Фамилия" />
-         <TextField fx:id="lastNameField" promptText="Иванов" />
+      <!-- Имя -->
+      <VBox spacing="6">
+         <Label styleClass="field-label" text="Имя" labelFor="$firstNameField"/>
+         <TextField fx:id="firstNameField"
+                    styleClass="text-input"
+                    promptText="Иван"/>
+      </VBox>
 
-         <Label fx:id="errorLabel" managed="false" maxWidth="Infinity" styleClass="alert, alert-danger" visible="false" wrapText="true" />
+      <!-- Фамилия -->
+      <VBox spacing="6">
+         <Label styleClass="field-label" text="Фамилия" labelFor="$lastNameField"/>
+         <TextField fx:id="lastNameField"
+                    styleClass="text-input"
+                    promptText="Иванов"/>
+      </VBox>
 
+      <!-- Ошибка -->
+      <Label fx:id="errorLabel"
+             styleClass="alert-danger"
+             visible="false"
+             managed="false"
+             wrapText="true"
+             maxWidth="Infinity"/>
 
-         <Button fx:id="submitButton" maxWidth="Infinity" onAction="#onSubmit" styleClass="btn, btn-primary, btn-block" text="Войти" />
-      </VBox>
+      <!-- Кнопки -->
+      <HBox spacing="12" alignment="CENTER_RIGHT">
+         <Button fx:id="cancelButton"
+                 text="Отмена"
+                 onAction="#onCancel"
+                 styleClass="btn-ghost"/>
+         <Button fx:id="submitButton"
+                 text="Создать"
+                 onAction="#onSubmit"
+                 styleClass="btn-primary"
+                 defaultButton="true"/>
+      </HBox>
    </VBox>
-</VBox>
+
+   <padding>
+      <Insets top="24" right="24" bottom="24" left="24"/>
+   </padding>
+</VBox>
\ No newline at end of file
diff --git a/src/main/resources/fxml/UserDetails.fxml b/src/main/resources/fxml/UserDetails.fxml
new file mode 100644
index 0000000..71345f9
--- /dev/null
+++ b/src/main/resources/fxml/UserDetails.fxml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.Region?>
+<?import javafx.scene.layout.VBox?>
+
+<VBox xmlns:fx="http://javafx.com/fxml/1"
+      fx:id="root"
+      styleClass="auth-bg"
+      alignment="TOP_CENTER"
+      fx:controller="com.DesktopApplicationClientJava.controllers.UserDetailsController">
+
+    <VBox styleClass="card-lg"
+          spacing="16"
+          maxWidth="720">
+
+        <!-- Верхняя панель: назад / редактировать / статус -->
+        <HBox alignment="CENTER_LEFT" spacing="12">
+            <Button fx:id="backButton"
+                    text="← Назад"
+                    onAction="#onBack"
+                    styleClass="btn-ghost"/>
+            <Button fx:id="editButton"
+                    text="Редактировать"
+                    onAction="#onEdit"
+                    styleClass="btn-ghost"/>
+            <Button fx:id="deleteButton"
+                    text="Удалить"
+                    onAction="#onDelete"
+                    styleClass="btn-danger"/>
+            <Region HBox.hgrow="ALWAYS"/>
+            <Label fx:id="statusLabel" styleClass="pagination-info"/>
+        </HBox>
+
+        <!-- Заголовок -->
+        <VBox spacing="6">
+            <Label fx:id="fullNameLabel" styleClass="card-title" text="..."/>
+            <Label fx:id="emailLabel" styleClass="card-subtitle" wrapText="true"/>
+        </VBox>
+
+        <!-- Мета-блок -->
+        <VBox spacing="6" styleClass="meta-block">
+            <HBox spacing="8">
+                <Label text="Роль:" styleClass="field-label" minWidth="90"/>
+                <Label fx:id="roleLabel" styleClass="meta-value"/>
+            </HBox>
+            <HBox spacing="8">
+                <Label text="Активен:" styleClass="field-label" minWidth="90"/>
+                <Label fx:id="enabledLabel" styleClass="meta-value"/>
+            </HBox>
+            <HBox spacing="8">
+                <Label text="UUID:" styleClass="field-label" minWidth="90"/>
+                <Label fx:id="uuidLabel" styleClass="meta-uuid"/>
+            </HBox>
+        </VBox>
+
+        <!-- Ошибка -->
+        <Label fx:id="errorLabel"
+               styleClass="alert-danger"
+               visible="false"
+               managed="false"
+               wrapText="true"
+               maxWidth="Infinity"/>
+
+    </VBox>
+
+    <padding>
+        <Insets top="24" right="24" bottom="24" left="24"/>
+    </padding>
+</VBox>
\ No newline at end of file
diff --git a/src/main/resources/fxml/UserList.fxml b/src/main/resources/fxml/UserList.fxml
new file mode 100644
index 0000000..011bffe
--- /dev/null
+++ b/src/main/resources/fxml/UserList.fxml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ComboBox?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.TableColumn?>
+<?import javafx.scene.control.TableView?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.Region?>
+<?import javafx.scene.layout.StackPane?>
+<?import javafx.scene.layout.VBox?>
+
+<StackPane xmlns:fx="http://javafx.com/fxml/1"
+           fx:id="root"
+           styleClass="auth-bg"
+           fx:controller="com.DesktopApplicationClientJava.controllers.UsersListController">
+
+    <VBox styleClass="page-shell" spacing="18" maxWidth="1080" maxHeight="Infinity">
+
+        <!-- Шапка -->
+        <HBox alignment="CENTER_LEFT" spacing="12">
+            <VBox spacing="2">
+                <Label text="Госхрон" styleClass="card-title"/>
+                <Label text="Управление пользователями" styleClass="card-subtitle"/>
+            </VBox>
+            <Region HBox.hgrow="ALWAYS"/>
+            <Button fx:id="resourcesButton"
+                    text="Документы"
+                    onAction="#onOpenResources"
+                    styleClass="btn-ghost"/>
+            <Label fx:id="userInfoLabel" styleClass="user-chip"/>
+            <Button fx:id="logoutButton"
+                    text="Выйти"
+                    onAction="#onLogout"
+                    styleClass="btn-ghost"/>
+        </HBox>
+
+        <VBox styleClass="card-lg" spacing="16" VBox.vgrow="ALWAYS">
+
+            <HBox alignment="CENTER_LEFT" spacing="12">
+                <VBox spacing="2">
+                    <Label text="Пользователи" styleClass="card-title"/>
+                    <Label text="Список всех зарегистрированных пользователей" styleClass="card-subtitle"/>
+                </VBox>
+                <Region HBox.hgrow="ALWAYS"/>
+                <Button fx:id="createButton"
+                        text="+ Создать пользователя"
+                        onAction="#onCreate"
+                        styleClass="btn-primary"/>
+            </HBox>
+
+            <!-- Поиск и сортировка -->
+            <HBox spacing="12" alignment="CENTER_LEFT">
+                <TextField fx:id="searchField"
+                           promptText="Поиск по email, имени или фамилии..."
+                           onAction="#onSearch"
+                           styleClass="text-input"
+                           HBox.hgrow="ALWAYS"/>
+                <ComboBox fx:id="sortCombo"
+                          onAction="#onSort"
+                          styleClass="combo"
+                          prefWidth="220"/>
+            </HBox>
+
+            <!-- Ошибка -->
+            <Label fx:id="errorLabel"
+                   styleClass="alert-danger"
+                   visible="false"
+                   managed="false"
+                   wrapText="true"
+                   maxWidth="Infinity"/>
+
+            <!-- Таблица -->
+            <TableView fx:id="usersTable"
+                       styleClass="modern-table"
+                       VBox.vgrow="ALWAYS"
+                       prefHeight="380">
+                <columns>
+                    <TableColumn fx:id="emailColumn"     text="Почта"    prefWidth="240"/>
+                    <TableColumn fx:id="firstNameColumn" text="Имя"      prefWidth="140"/>
+                    <TableColumn fx:id="lastNameColumn"  text="Фамилия"  prefWidth="160"/>
+                    <TableColumn fx:id="roleColumn"      text="Роль"     prefWidth="130"/>
+                    <TableColumn fx:id="enabledColumn"   text="Активен"  prefWidth="90"/>
+                </columns>
+            </TableView>
+
+            <!-- Пагинация -->
+            <HBox alignment="CENTER_LEFT" spacing="12" styleClass="pagination">
+                <Button fx:id="prevButton"
+                        text="← Назад"
+                        onAction="#onPrev"
+                        styleClass="btn-ghost"/>
+                <Label fx:id="pageInfoLabel" styleClass="pagination-info"/>
+                <Region HBox.hgrow="ALWAYS"/>
+                <Label fx:id="statusLabel" styleClass="pagination-info"/>
+                <Button fx:id="nextButton"
+                        text="Вперёд →"
+                        onAction="#onNext"
+                        styleClass="btn-ghost"/>
+            </HBox>
+
+        </VBox>
+    </VBox>
+
+    <padding>
+        <Insets top="20" right="24" bottom="20" left="24"/>
+    </padding>
+</StackPane>
\ No newline at end of file
diff --git a/src/main/resources/fxml/UserUpdateForm.fxml b/src/main/resources/fxml/UserUpdateForm.fxml
new file mode 100644
index 0000000..52ddfb8
--- /dev/null
+++ b/src/main/resources/fxml/UserUpdateForm.fxml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.CheckBox?>
+<?import javafx.scene.control.ChoiceBox?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.PasswordField?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+
+<VBox xmlns="http://javafx.com/javafx/17.0.12"
+      xmlns:fx="http://javafx.com/fxml/1"
+      fx:id="root"
+      fx:controller="com.DesktopApplicationClientJava.controllers.UserUpdateFormController"
+      styleClass="auth-bg"
+      alignment="TOP_CENTER">
+
+    <VBox styleClass="card-lg"
+          spacing="18"
+          maxWidth="480">
+
+        <!-- Заголовок -->
+        <VBox spacing="4">
+            <Label styleClass="card-title" text="Редактирование пользователя"/>
+            <Label fx:id="subtitleLabel" styleClass="card-subtitle" text=""/>
+        </VBox>
+
+        <!-- Почта -->
+        <VBox spacing="6">
+            <Label styleClass="field-label" text="Почта" labelFor="$emailField"/>
+            <TextField fx:id="emailField"
+                       styleClass="text-input"
+                       promptText="youremail@example.com"/>
+        </VBox>
+
+        <!-- Роль -->
+        <VBox spacing="6">
+            <Label styleClass="field-label" text="Роль" labelFor="$roleChoiceBox"/>
+            <ChoiceBox fx:id="roleChoiceBox"
+                       styleClass="combo"
+                       maxWidth="Infinity"/>
+        </VBox>
+
+        <!-- Имя -->
+        <VBox spacing="6">
+            <Label styleClass="field-label" text="Имя" labelFor="$firstNameField"/>
+            <TextField fx:id="firstNameField"
+                       styleClass="text-input"
+                       promptText="Иван"/>
+        </VBox>
+
+        <!-- Фамилия -->
+        <VBox spacing="6">
+            <Label styleClass="field-label" text="Фамилия" labelFor="$lastNameField"/>
+            <TextField fx:id="lastNameField"
+                       styleClass="text-input"
+                       promptText="Иванов"/>
+        </VBox>
+
+        <!-- Активен -->
+        <VBox spacing="6">
+            <CheckBox fx:id="enabledCheckBox"
+                      text="Учётная запись активна"
+                      styleClass="field-label"/>
+        </VBox>
+
+        <!-- Ошибка -->
+        <Label fx:id="errorLabel"
+               styleClass="alert-danger"
+               visible="false"
+               managed="false"
+               wrapText="true"
+               maxWidth="Infinity"/>
+
+        <!-- Кнопки -->
+        <HBox spacing="12" alignment="CENTER_RIGHT">
+            <Button fx:id="cancelButton"
+                    text="Отмена"
+                    onAction="#onCancel"
+                    styleClass="btn-ghost"/>
+            <Button fx:id="saveButton"
+                    text="Сохранить"
+                    onAction="#onSave"
+                    styleClass="btn-primary"
+                    defaultButton="true"/>
+        </HBox>
+
+    </VBox>
+
+    <padding>
+        <Insets top="24" right="24" bottom="24" left="24"/>
+    </padding>
+</VBox>
\ No newline at end of file
diff --git a/src/main/resources/styles.css b/src/main/resources/styles.css
index ef8674e..e236317 100644
--- a/src/main/resources/styles.css
+++ b/src/main/resources/styles.css
@@ -408,4 +408,22 @@
 
 .text-area .scroll-pane .viewport {
     -fx-background-color: transparent;
+}
+
+
+.btn-danger {
+    -fx-background-color: transparent;
+    -fx-border-color: -danger-fg;
+    -fx-border-radius: 10px;
+    -fx-background-radius: 10px;
+    -fx-text-fill: -danger-fg;
+    -fx-font-size: 13px;
+    -fx-padding: 8px 14px;
+    -fx-cursor: hand;
+}
+.btn-danger:hover   { -fx-background-color: -danger-bg; }
+.btn-danger:pressed { -fx-background-color: derive(-danger-bg, -10%); }
+.btn-danger:disabled {
+    -fx-opacity: 0.45;
+    -fx-cursor: default;
 }
\ No newline at end of file

From fa0077787b36a6e9f16d695ab1dce003f3d10df0 Mon Sep 17 00:00:00 2001
From: Daniil <kazancevdanila2015@yandex.ru>
Date: Fri, 16 Oct 2026 02:31:03 +0300
Subject: [PATCH 3/7] feat: admin pages

---
 src/main/resources/styles.css | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/src/main/resources/styles.css b/src/main/resources/styles.css
index e236317..ef8674e 100644
--- a/src/main/resources/styles.css
+++ b/src/main/resources/styles.css
@@ -408,22 +408,4 @@
 
 .text-area .scroll-pane .viewport {
     -fx-background-color: transparent;
-}
-
-
-.btn-danger {
-    -fx-background-color: transparent;
-    -fx-border-color: -danger-fg;
-    -fx-border-radius: 10px;
-    -fx-background-radius: 10px;
-    -fx-text-fill: -danger-fg;
-    -fx-font-size: 13px;
-    -fx-padding: 8px 14px;
-    -fx-cursor: hand;
-}
-.btn-danger:hover   { -fx-background-color: -danger-bg; }
-.btn-danger:pressed { -fx-background-color: derive(-danger-bg, -10%); }
-.btn-danger:disabled {
-    -fx-opacity: 0.45;
-    -fx-cursor: default;
 }
\ No newline at end of file

From f06a4c13361693ced6863f1885c6fd780cda8ad5 Mon Sep 17 00:00:00 2001
From: Daniil <kazancevdanila2015@yandex.ru>
Date: Fri, 16 Oct 2026 02:38:19 +0300
Subject: [PATCH 4/7] feat: danger button styles

---
 src/main/resources/styles.css | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/src/main/resources/styles.css b/src/main/resources/styles.css
index ef8674e..7466fae 100644
--- a/src/main/resources/styles.css
+++ b/src/main/resources/styles.css
@@ -408,4 +408,25 @@
 
 .text-area .scroll-pane .viewport {
     -fx-background-color: transparent;
+}
+
+/* ============================================================
+   Опасное действие (удаление)
+   ============================================================ */
+
+.btn-danger {
+    -fx-background-color: transparent;
+    -fx-border-color: -danger-fg;
+    -fx-border-radius: 10px;
+    -fx-background-radius: 10px;
+    -fx-text-fill: -danger-fg;
+    -fx-font-size: 13px;
+    -fx-padding: 8px 14px;
+    -fx-cursor: hand;
+}
+.btn-danger:hover   { -fx-background-color: -danger-bg; }
+.btn-danger:pressed { -fx-background-color: derive(-danger-bg, -10%); }
+.btn-danger:disabled {
+    -fx-opacity: 0.45;
+    -fx-cursor: default;
 }
\ No newline at end of file

From 0ddd21e51e8d8459ca5aa87ffc7ba8a745cb0962 Mon Sep 17 00:00:00 2001
From: Daniil <kazancevdanila2015@yandex.ru>
Date: Fri, 16 Oct 2026 11:43:50 +0300
Subject: [PATCH 5/7] fix: code style

---
 .../controllers/UserCreateFormController.java                   | 1 -
 .../controllers/UserUpdateFormController.java                   | 2 --
 2 files changed, 3 deletions(-)

diff --git a/src/main/java/com/DesktopApplicationClientJava/controllers/UserCreateFormController.java b/src/main/java/com/DesktopApplicationClientJava/controllers/UserCreateFormController.java
index c872f0a..5a6f2ab 100644
--- a/src/main/java/com/DesktopApplicationClientJava/controllers/UserCreateFormController.java
+++ b/src/main/java/com/DesktopApplicationClientJava/controllers/UserCreateFormController.java
@@ -11,7 +11,6 @@
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
 
-import java.util.Arrays;
 
 public class UserCreateFormController extends Controller {
 
diff --git a/src/main/java/com/DesktopApplicationClientJava/controllers/UserUpdateFormController.java b/src/main/java/com/DesktopApplicationClientJava/controllers/UserUpdateFormController.java
index 13c2fe8..aa01c9a 100644
--- a/src/main/java/com/DesktopApplicationClientJava/controllers/UserUpdateFormController.java
+++ b/src/main/java/com/DesktopApplicationClientJava/controllers/UserUpdateFormController.java
@@ -6,7 +6,6 @@
 import com.DesktopApplicationClientJava.services.ServiceException;
 import com.DesktopApplicationClientJava.services.data.UpdateUserData;
 import java.util.UUID;
-import javafx.application.Platform;
 import javafx.collections.FXCollections;
 import javafx.concurrent.Task;
 import javafx.event.ActionEvent;
@@ -15,7 +14,6 @@
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.ChoiceBox;
 import javafx.scene.control.Label;
-import javafx.scene.control.PasswordField;
 import javafx.scene.control.TextField;
 
 public class UserUpdateFormController extends Controller {

From c51669c40ee5559a95a10e3de1a41ce7f7fa4b2a Mon Sep 17 00:00:00 2001
From: Daniil <kazancevdanila2015@yandex.ru>
Date: Fri, 16 Oct 2026 11:47:40 +0300
Subject: [PATCH 6/7] fix: format

---
 .../controllers/UserCreateFormController.java | 148 +++--
 .../controllers/UserDetailsController.java    | 440 +++++++------
 .../controllers/UserUpdateFormController.java | 373 +++++------
 .../controllers/UsersListController.java      | 606 +++++++++---------
 4 files changed, 781 insertions(+), 786 deletions(-)

diff --git a/src/main/java/com/DesktopApplicationClientJava/controllers/UserCreateFormController.java b/src/main/java/com/DesktopApplicationClientJava/controllers/UserCreateFormController.java
index 5a6f2ab..e5a15f2 100644
--- a/src/main/java/com/DesktopApplicationClientJava/controllers/UserCreateFormController.java
+++ b/src/main/java/com/DesktopApplicationClientJava/controllers/UserCreateFormController.java
@@ -11,89 +11,87 @@
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
 
-
 public class UserCreateFormController extends Controller {
 
-    @FXML
-    private TextField emailField;
-    @FXML private PasswordField passwordField;
-    @FXML private Label errorLabel;
-    @FXML private Button submitButton;
-    @FXML private ChoiceBox<String> rolesChoiceBox;
-    @FXML private TextField firstNameField;
-    @FXML private TextField lastNameField;
-
-    @FXML
-    public void initialize() {
-        // Способ 1: через setItems
-        rolesChoiceBox.setItems(FXCollections.observableArrayList(
-                Role.USER.toString(),
-                Role.MODER.toString(),
-                Role.ADMIN.toString()
-        ));
-        // Установить значение по умолчанию (опционально)
-        rolesChoiceBox.setValue(Role.USER.toString());
-
-        System.out.println(rolesChoiceBox.getValue());
-
+  @FXML private TextField emailField;
+  @FXML private PasswordField passwordField;
+  @FXML private Label errorLabel;
+  @FXML private Button submitButton;
+  @FXML private ChoiceBox<String> rolesChoiceBox;
+  @FXML private TextField firstNameField;
+  @FXML private TextField lastNameField;
+
+  @FXML
+  public void initialize() {
+    // Способ 1: через setItems
+    rolesChoiceBox.setItems(
+        FXCollections.observableArrayList(
+            Role.USER.toString(), Role.MODER.toString(), Role.ADMIN.toString()));
+    // Установить значение по умолчанию (опционально)
+    rolesChoiceBox.setValue(Role.USER.toString());
+
+    System.out.println(rolesChoiceBox.getValue());
+  }
+
+  @FXML
+  private void onSubmit(ActionEvent event) {
+    String email = emailField.getText() == null ? "" : emailField.getText().trim();
+    String password = passwordField.getText() == null ? "" : passwordField.getText();
+    String roleStirng = rolesChoiceBox.getValue() == null ? "" : rolesChoiceBox.getValue();
+    String firstName = firstNameField.getText() == null ? "" : firstNameField.getText().trim();
+    String lastName = lastNameField.getText() == null ? "" : lastNameField.getText().trim();
+
+    if (email.isBlank()
+        || password.isBlank()
+        || roleStirng.isBlank()
+        || firstName.isBlank()
+        || lastName.isBlank()) {
+      showError("Заполните все поля");
+      return;
     }
 
-    @FXML
-    private void onSubmit(ActionEvent event) {
-        String email = emailField.getText() == null ? "" : emailField.getText().trim();
-        String password = passwordField.getText() == null ? "" : passwordField.getText();
-        String roleStirng = rolesChoiceBox.getValue() == null ? "" : rolesChoiceBox.getValue();
-        String firstName = firstNameField.getText() == null ? "" : firstNameField.getText().trim();
-        String lastName = lastNameField.getText() == null ? "" : lastNameField.getText().trim();
-
-        if (email.isBlank() || password.isBlank() || roleStirng.isBlank() || firstName.isBlank() || lastName.isBlank()) {
-            showError("Заполните все поля");
-            return;
-        }
-
-        if (!(roleStirng.equals(Role.USER.toString()) || roleStirng.equals(Role.MODER.toString())
-                || roleStirng.equals(Role.ADMIN.toString()))) {
-            showError("Роль не определена");
-            return;
-        }
-
-
-
-        Role role = Role.valueOf(roleStirng);
-
-        String emailError = EmailValidator.validate(email);
-        if (emailError != null) {
-            showError(emailError);
-            return;
-        }
-
-        try {
-            RegisterData registerData = new RegisterData(email, password, role, firstName, lastName);
-            User user = services.getUsersService().create(registerData);
-            if (user == null) {
-                return;
-            }
-            hideError();
-            navigator.goTo("/fxml/UserList.fxml");
-        } catch (ServiceException e) {
-            showError(e.getMessage());
-        }
+    if (!(roleStirng.equals(Role.USER.toString())
+        || roleStirng.equals(Role.MODER.toString())
+        || roleStirng.equals(Role.ADMIN.toString()))) {
+      showError("Роль не определена");
+      return;
     }
 
-    @FXML
-    void onCancel(ActionEvent event) {
-        navigator.goTo("/fxml/UserList.fxml");
-    }
+    Role role = Role.valueOf(roleStirng);
 
-    private void showError(String message) {
-        errorLabel.setText(message);
-        errorLabel.setVisible(true);
-        errorLabel.setManaged(true);
+    String emailError = EmailValidator.validate(email);
+    if (emailError != null) {
+      showError(emailError);
+      return;
     }
 
-    private void hideError() {
-        errorLabel.setText("");
-        errorLabel.setVisible(false);
-        errorLabel.setManaged(false);
+    try {
+      RegisterData registerData = new RegisterData(email, password, role, firstName, lastName);
+      User user = services.getUsersService().create(registerData);
+      if (user == null) {
+        return;
+      }
+      hideError();
+      navigator.goTo("/fxml/UserList.fxml");
+    } catch (ServiceException e) {
+      showError(e.getMessage());
     }
+  }
+
+  @FXML
+  void onCancel(ActionEvent event) {
+    navigator.goTo("/fxml/UserList.fxml");
+  }
+
+  private void showError(String message) {
+    errorLabel.setText(message);
+    errorLabel.setVisible(true);
+    errorLabel.setManaged(true);
+  }
+
+  private void hideError() {
+    errorLabel.setText("");
+    errorLabel.setVisible(false);
+    errorLabel.setManaged(false);
+  }
 }
diff --git a/src/main/java/com/DesktopApplicationClientJava/controllers/UserDetailsController.java b/src/main/java/com/DesktopApplicationClientJava/controllers/UserDetailsController.java
index 9e94814..35af61c 100644
--- a/src/main/java/com/DesktopApplicationClientJava/controllers/UserDetailsController.java
+++ b/src/main/java/com/DesktopApplicationClientJava/controllers/UserDetailsController.java
@@ -15,234 +15,230 @@
 
 public class UserDetailsController extends Controller {
 
-    @FXML private Label fullNameLabel;
-    @FXML private Label emailLabel;
-    @FXML private Label roleLabel;
-    @FXML private Label enabledLabel;
-    @FXML private Label uuidLabel;
-    @FXML private Label errorLabel;
-    @FXML private Label statusLabel;
-    @FXML private Button backButton;
-    @FXML private Button editButton;
-    @FXML private Button deleteButton;
-
-    private UUID userId;
-    private User current;
-
-    // ===== Lifecycle =====
-
-    @FXML
-    private void initialize() {
-        hideError();
-
-        // Кнопки редактирования и удаления доступны только администраторам.
-        var authService = services == null ? null : services.getAuthService();
-        boolean isAdmin = authService != null && authService.isAdmin();
-
-        editButton.setVisible(isAdmin);
-        editButton.setManaged(isAdmin);
-
-        deleteButton.setVisible(isAdmin);
-        deleteButton.setManaged(isAdmin);
+  @FXML private Label fullNameLabel;
+  @FXML private Label emailLabel;
+  @FXML private Label roleLabel;
+  @FXML private Label enabledLabel;
+  @FXML private Label uuidLabel;
+  @FXML private Label errorLabel;
+  @FXML private Label statusLabel;
+  @FXML private Button backButton;
+  @FXML private Button editButton;
+  @FXML private Button deleteButton;
+
+  private UUID userId;
+  private User current;
+
+  // ===== Lifecycle =====
+
+  @FXML
+  private void initialize() {
+    hideError();
+
+    // Кнопки редактирования и удаления доступны только администраторам.
+    var authService = services == null ? null : services.getAuthService();
+    boolean isAdmin = authService != null && authService.isAdmin();
+
+    editButton.setVisible(isAdmin);
+    editButton.setManaged(isAdmin);
+
+    deleteButton.setVisible(isAdmin);
+    deleteButton.setManaged(isAdmin);
+  }
+
+  /** Navigator sets the id after FXML load, so the setter triggers loading. */
+  public void setUserId(UUID userId) {
+    this.userId = userId;
+    if (fullNameLabel != null && userId != null && services != null) {
+      load();
     }
-
-    /** Navigator sets the id after FXML load, so the setter triggers loading. */
-    public void setUserId(UUID userId) {
-        this.userId = userId;
-        if (fullNameLabel != null && userId != null && services != null) {
-            load();
-        }
-    }
-
-    // ===== Loading =====
-
-    private void load() {
-        hideError();
-        statusLabel.setText("Загрузка…");
-        setContentVisible(false);
-
-        var task =
-                new Task<User>() {
-                    @Override
-                    protected User call() {
-                        return services.getUsersService().getById(userId);
-                    }
-                };
-
-        task.setOnSucceeded(
-                e -> {
-                    current = task.getValue();
-                    statusLabel.setText("");
-                    if (current == null) {
-                        showError("Пользователь не найден");
-                        return;
-                    }
-                    showUser(current);
-                    setContentVisible(true);
-                });
-
-        task.setOnFailed(
-                e -> {
-                    statusLabel.setText("");
-                    var ex = task.getException();
-                    String msg =
-                            ex instanceof ServiceException se
-                                    ? se.getMessage()
-                                    : "Не удалось загрузить пользователя";
-                    showError(msg);
-                });
-
-        startDaemon(task, "user-details-load");
-    }
-
-    private void showUser(User user) {
-        String first = user.getFirstName() == null ? "" : user.getFirstName();
-        String last = user.getLastName() == null ? "" : user.getLastName();
-        String full = (first + " " + last).trim();
-        fullNameLabel.setText(full.isEmpty() ? "Без имени" : full);
-
-        emailLabel.setText(user.getEmail() == null ? "" : user.getEmail());
-        roleLabel.setText(user.getRole() == null ? "" : user.getRole().name());
-        enabledLabel.setText(Boolean.TRUE.equals(user.getEnabled()) ? "Да" : "Нет");
-        uuidLabel.setText(user.getUuid() == null ? "" : user.getUuid().toString());
-
-        updateDeleteButtonState(user);
-    }
-
-    /**
-     * Админ не может удалить собственную учётную запись. Кнопка видна только
-     * администраторам (см. initialize), но дополнительно гасится, если
-     * просматривается именно текущий пользователь.
-     */
-    private void updateDeleteButtonState(User user) {
-        var authService = services == null ? null : services.getAuthService();
-        var me = authService == null ? null : authService.getCurrentUser();
-        boolean isSelf =
-                me != null
-                        && user != null
-                        && user.getUuid() != null
-                        && user.getUuid().equals(me.getUuid());
-        deleteButton.setDisable(isSelf);
-    }
-
-    // ===== Event handlers =====
-
-    @FXML
-    private void onBack(ActionEvent e) {
-        navigator.goTo("/fxml/UserList.fxml");
-    }
-
-    @FXML
-    private void onEdit(ActionEvent e) {
-        if (current == null || current.getUuid() == null) {
+  }
+
+  // ===== Loading =====
+
+  private void load() {
+    hideError();
+    statusLabel.setText("Загрузка…");
+    setContentVisible(false);
+
+    var task =
+        new Task<User>() {
+          @Override
+          protected User call() {
+            return services.getUsersService().getById(userId);
+          }
+        };
+
+    task.setOnSucceeded(
+        e -> {
+          current = task.getValue();
+          statusLabel.setText("");
+          if (current == null) {
+            showError("Пользователь не найден");
             return;
-        }
-        navigator.goTo(
-                "/fxml/UserUpdateForm.fxml",
-                c -> ((UserUpdateFormController) c).setUserId(current.getUuid()));
+          }
+          showUser(current);
+          setContentVisible(true);
+        });
+
+    task.setOnFailed(
+        e -> {
+          statusLabel.setText("");
+          var ex = task.getException();
+          String msg =
+              ex instanceof ServiceException se
+                  ? se.getMessage()
+                  : "Не удалось загрузить пользователя";
+          showError(msg);
+        });
+
+    startDaemon(task, "user-details-load");
+  }
+
+  private void showUser(User user) {
+    String first = user.getFirstName() == null ? "" : user.getFirstName();
+    String last = user.getLastName() == null ? "" : user.getLastName();
+    String full = (first + " " + last).trim();
+    fullNameLabel.setText(full.isEmpty() ? "Без имени" : full);
+
+    emailLabel.setText(user.getEmail() == null ? "" : user.getEmail());
+    roleLabel.setText(user.getRole() == null ? "" : user.getRole().name());
+    enabledLabel.setText(Boolean.TRUE.equals(user.getEnabled()) ? "Да" : "Нет");
+    uuidLabel.setText(user.getUuid() == null ? "" : user.getUuid().toString());
+
+    updateDeleteButtonState(user);
+  }
+
+  /**
+   * Админ не может удалить собственную учётную запись. Кнопка видна только администраторам (см.
+   * initialize), но дополнительно гасится, если просматривается именно текущий пользователь.
+   */
+  private void updateDeleteButtonState(User user) {
+    var authService = services == null ? null : services.getAuthService();
+    var me = authService == null ? null : authService.getCurrentUser();
+    boolean isSelf =
+        me != null && user != null && user.getUuid() != null && user.getUuid().equals(me.getUuid());
+    deleteButton.setDisable(isSelf);
+  }
+
+  // ===== Event handlers =====
+
+  @FXML
+  private void onBack(ActionEvent e) {
+    navigator.goTo("/fxml/UserList.fxml");
+  }
+
+  @FXML
+  private void onEdit(ActionEvent e) {
+    if (current == null || current.getUuid() == null) {
+      return;
     }
-
-    @FXML
-    private void onDelete(ActionEvent e) {
-        if (current == null || current.getUuid() == null) {
-            return;
-        }
-
-        // Двойная защита: даже если кнопку как-то активировали, себя удалить нельзя.
-        var authService = services == null ? null : services.getAuthService();
-        var me = authService == null ? null : authService.getCurrentUser();
-        if (me != null && current.getUuid().equals(me.getUuid())) {
-            showError("Нельзя удалить собственную учётную запись");
-            return;
-        }
-
-        if (!confirmDelete(current)) {
-            return;
-        }
-
-        hideError();
-        setBusy(true);
-
-        var uuid = current.getUuid();
-        var task =
-                new Task<Void>() {
-                    @Override
-                    protected Void call() {
-                        services.getUsersService().delete(uuid);
-                        return null;
-                    }
-                };
-
-        task.setOnSucceeded(
-                ev -> {
-                    setBusy(false);
-                    navigator.goTo("/fxml/UserList.fxml");
-                });
-
-        task.setOnFailed(
-                ev -> {
-                    setBusy(false);
-                    var ex = task.getException();
-                    String msg =
-                            ex instanceof ServiceException se
-                                    ? se.getMessage()
-                                    : "Не удалось удалить пользователя";
-                    showError(msg);
-                });
-
-        startDaemon(task, "user-delete");
+    navigator.goTo(
+        "/fxml/UserUpdateForm.fxml",
+        c -> ((UserUpdateFormController) c).setUserId(current.getUuid()));
+  }
+
+  @FXML
+  private void onDelete(ActionEvent e) {
+    if (current == null || current.getUuid() == null) {
+      return;
     }
 
-    // ===== Confirmation dialog =====
-
-    private boolean confirmDelete(User user) {
-        var alert = new Alert(Alert.AlertType.CONFIRMATION);
-        alert.setTitle("Удаление пользователя");
-        alert.setHeaderText(null);
-        alert.setContentText(
-                "Удалить пользователя \""
-                        + (user.getEmail() == null ? user.getUuid().toString() : user.getEmail())
-                        + "\"? Действие необратимо.");
-
-        var ok = new ButtonType("Удалить", ButtonBar.ButtonData.OK_DONE);
-        var cancel = new ButtonType("Отмена", ButtonBar.ButtonData.CANCEL_CLOSE);
-        alert.getButtonTypes().setAll(ok, cancel);
-
-        return alert.showAndWait().filter(ok::equals).isPresent();
+    // Двойная защита: даже если кнопку как-то активировали, себя удалить нельзя.
+    var authService = services == null ? null : services.getAuthService();
+    var me = authService == null ? null : authService.getCurrentUser();
+    if (me != null && current.getUuid().equals(me.getUuid())) {
+      showError("Нельзя удалить собственную учётную запись");
+      return;
     }
 
-    // ===== UI helpers =====
-
-    private void setContentVisible(boolean visible) {
-        fullNameLabel.setVisible(visible);
-        emailLabel.setVisible(visible);
-        roleLabel.setVisible(visible);
-        enabledLabel.setVisible(visible);
-        uuidLabel.setVisible(visible);
+    if (!confirmDelete(current)) {
+      return;
     }
 
-    private void setBusy(boolean busy) {
-        deleteButton.setDisable(busy);
-        editButton.setDisable(busy);
-        backButton.setDisable(busy);
-        statusLabel.setText(busy ? "Удаление…" : "");
-    }
-
-    private void showError(String message) {
-        errorLabel.setText(message);
-        errorLabel.setVisible(true);
-        errorLabel.setManaged(true);
-    }
-
-    private void hideError() {
-        errorLabel.setText("");
-        errorLabel.setVisible(false);
-        errorLabel.setManaged(false);
-    }
-
-    private static void startDaemon(Task<?> task, String name) {
-        var thread = new Thread(task, name);
-        thread.setDaemon(true);
-        thread.start();
-    }
-}
\ No newline at end of file
+    hideError();
+    setBusy(true);
+
+    var uuid = current.getUuid();
+    var task =
+        new Task<Void>() {
+          @Override
+          protected Void call() {
+            services.getUsersService().delete(uuid);
+            return null;
+          }
+        };
+
+    task.setOnSucceeded(
+        ev -> {
+          setBusy(false);
+          navigator.goTo("/fxml/UserList.fxml");
+        });
+
+    task.setOnFailed(
+        ev -> {
+          setBusy(false);
+          var ex = task.getException();
+          String msg =
+              ex instanceof ServiceException se
+                  ? se.getMessage()
+                  : "Не удалось удалить пользователя";
+          showError(msg);
+        });
+
+    startDaemon(task, "user-delete");
+  }
+
+  // ===== Confirmation dialog =====
+
+  private boolean confirmDelete(User user) {
+    var alert = new Alert(Alert.AlertType.CONFIRMATION);
+    alert.setTitle("Удаление пользователя");
+    alert.setHeaderText(null);
+    alert.setContentText(
+        "Удалить пользователя \""
+            + (user.getEmail() == null ? user.getUuid().toString() : user.getEmail())
+            + "\"? Действие необратимо.");
+
+    var ok = new ButtonType("Удалить", ButtonBar.ButtonData.OK_DONE);
+    var cancel = new ButtonType("Отмена", ButtonBar.ButtonData.CANCEL_CLOSE);
+    alert.getButtonTypes().setAll(ok, cancel);
+
+    return alert.showAndWait().filter(ok::equals).isPresent();
+  }
+
+  // ===== UI helpers =====
+
+  private void setContentVisible(boolean visible) {
+    fullNameLabel.setVisible(visible);
+    emailLabel.setVisible(visible);
+    roleLabel.setVisible(visible);
+    enabledLabel.setVisible(visible);
+    uuidLabel.setVisible(visible);
+  }
+
+  private void setBusy(boolean busy) {
+    deleteButton.setDisable(busy);
+    editButton.setDisable(busy);
+    backButton.setDisable(busy);
+    statusLabel.setText(busy ? "Удаление…" : "");
+  }
+
+  private void showError(String message) {
+    errorLabel.setText(message);
+    errorLabel.setVisible(true);
+    errorLabel.setManaged(true);
+  }
+
+  private void hideError() {
+    errorLabel.setText("");
+    errorLabel.setVisible(false);
+    errorLabel.setManaged(false);
+  }
+
+  private static void startDaemon(Task<?> task, String name) {
+    var thread = new Thread(task, name);
+    thread.setDaemon(true);
+    thread.start();
+  }
+}
diff --git a/src/main/java/com/DesktopApplicationClientJava/controllers/UserUpdateFormController.java b/src/main/java/com/DesktopApplicationClientJava/controllers/UserUpdateFormController.java
index aa01c9a..41a1672 100644
--- a/src/main/java/com/DesktopApplicationClientJava/controllers/UserUpdateFormController.java
+++ b/src/main/java/com/DesktopApplicationClientJava/controllers/UserUpdateFormController.java
@@ -18,199 +18,202 @@
 
 public class UserUpdateFormController extends Controller {
 
-    @FXML private Label subtitleLabel;
-    @FXML private TextField emailField;
-    @FXML private ChoiceBox<Role> roleChoiceBox;
-    @FXML private TextField firstNameField;
-    @FXML private TextField lastNameField;
-    @FXML private CheckBox enabledCheckBox;
-    @FXML private Label errorLabel;
-    @FXML private Button saveButton;
-    @FXML private Button cancelButton;
-
-    private UUID userId;
-    private User current;
-
-    // ===== Lifecycle =====
-
-    @FXML
-    private void initialize() {
-        hideError();
-        roleChoiceBox.setItems(FXCollections.observableArrayList(Role.values()));
+  @FXML private Label subtitleLabel;
+  @FXML private TextField emailField;
+  @FXML private ChoiceBox<Role> roleChoiceBox;
+  @FXML private TextField firstNameField;
+  @FXML private TextField lastNameField;
+  @FXML private CheckBox enabledCheckBox;
+  @FXML private Label errorLabel;
+  @FXML private Button saveButton;
+  @FXML private Button cancelButton;
+
+  private UUID userId;
+  private User current;
+
+  // ===== Lifecycle =====
+
+  @FXML
+  private void initialize() {
+    hideError();
+    roleChoiceBox.setItems(FXCollections.observableArrayList(Role.values()));
+  }
+
+  /** Вызывается навигатором при переходе на форму. */
+  public void setUserId(UUID userId) {
+    this.userId = userId;
+    loadUser();
+  }
+
+  // ===== Loading =====
+
+  private void loadUser() {
+    if (userId == null || services == null || services.getUsersService() == null) {
+      return;
     }
-
-    /** Вызывается навигатором при переходе на форму. */
-    public void setUserId(UUID userId) {
-        this.userId = userId;
-        loadUser();
-    }
-
-    // ===== Loading =====
-
-    private void loadUser() {
-        if (userId == null || services == null || services.getUsersService() == null) {
-            return;
-        }
-        hideError();
-        setFormDisabled(true);
-
-        var task =
-                new Task<User>() {
-                    @Override
-                    protected User call() {
-                        return services.getUsersService().getById(userId);
-                    }
-                };
-
-        task.setOnSucceeded(
-                e -> {
-                    current = task.getValue();
-                    if (current == null) {
-                        showError("Пользователь не найден");
-                        setFormDisabled(true);
-                        return;
-                    }
-                    populateForm(current);
-                    setFormDisabled(false);
-                });
-
-        task.setOnFailed(
-                e -> {
-                    var ex = task.getException();
-                    String msg =
-                            ex instanceof ServiceException se ? se.getMessage() : "Не удалось загрузить пользователя";
-                    showError(msg);
-                    setFormDisabled(true);
-                });
-
-        startDaemon(task, "user-update-load");
-    }
-
-    private void populateForm(User user) {
-        emailField.setText(user.getEmail() == null ? "" : user.getEmail());
-        firstNameField.setText(user.getFirstName() == null ? "" : user.getFirstName());
-        lastNameField.setText(user.getLastName() == null ? "" : user.getLastName());
-        roleChoiceBox.getSelectionModel().select(user.getRole());
-        enabledCheckBox.setSelected(Boolean.TRUE.equals(user.getEnabled()));
-        subtitleLabel.setText(user.getEmail() == null ? "" : user.getEmail());
-    }
-
-    // ===== Event handlers =====
-
-    @FXML
-    private void onSave(ActionEvent e) {
-        if (current == null) {
-            return;
-        }
-        var data = collectAndValidate();
-        if (data == null) {
+    hideError();
+    setFormDisabled(true);
+
+    var task =
+        new Task<User>() {
+          @Override
+          protected User call() {
+            return services.getUsersService().getById(userId);
+          }
+        };
+
+    task.setOnSucceeded(
+        e -> {
+          current = task.getValue();
+          if (current == null) {
+            showError("Пользователь не найден");
+            setFormDisabled(true);
             return;
-        }
-
-        hideError();
-        setFormDisabled(true);
-
-        var task =
-                new Task<User>() {
-                    @Override
-                    protected User call() {
-                        return services.getUsersService().update(current.getUuid(), data);
-                    }
-                };
-
-        task.setOnSucceeded(
-                ev -> {
-                    setFormDisabled(false);
-                    navigator.goTo("/fxml/UserList.fxml");
-                });
-
-        task.setOnFailed(
-                ev -> {
-                    setFormDisabled(false);
-                    var ex = task.getException();
-                    String msg =
-                            ex instanceof ServiceException se ? se.getMessage() : "Не удалось сохранить изменения";
-                    showError(msg);
-                });
-
-        startDaemon(task, "user-update-save");
+          }
+          populateForm(current);
+          setFormDisabled(false);
+        });
+
+    task.setOnFailed(
+        e -> {
+          var ex = task.getException();
+          String msg =
+              ex instanceof ServiceException se
+                  ? se.getMessage()
+                  : "Не удалось загрузить пользователя";
+          showError(msg);
+          setFormDisabled(true);
+        });
+
+    startDaemon(task, "user-update-load");
+  }
+
+  private void populateForm(User user) {
+    emailField.setText(user.getEmail() == null ? "" : user.getEmail());
+    firstNameField.setText(user.getFirstName() == null ? "" : user.getFirstName());
+    lastNameField.setText(user.getLastName() == null ? "" : user.getLastName());
+    roleChoiceBox.getSelectionModel().select(user.getRole());
+    enabledCheckBox.setSelected(Boolean.TRUE.equals(user.getEnabled()));
+    subtitleLabel.setText(user.getEmail() == null ? "" : user.getEmail());
+  }
+
+  // ===== Event handlers =====
+
+  @FXML
+  private void onSave(ActionEvent e) {
+    if (current == null) {
+      return;
     }
-
-    @FXML
-    private void onCancel(ActionEvent e) {
-        navigator.goTo("/fxml/UserList.fxml");
+    var data = collectAndValidate();
+    if (data == null) {
+      return;
     }
 
-    // ===== Validation / data =====
-
-    /**
-     * Собирает данные формы. Если валидация не прошла — показывает ошибку
-     * и возвращает {@code null}.
-     */
-    private UpdateUserData collectAndValidate() {
-        String email = safeTrim(emailField.getText());
-        String firstName = safeTrim(firstNameField.getText());
-        String lastName = safeTrim(lastNameField.getText());
-        Role role = roleChoiceBox.getValue();
-        boolean enabled = enabledCheckBox.isSelected();
-
-        if (email == null || email.isBlank()) {
-            showError("Укажите почту");
-            return null;
-        }
-        if (!email.contains("@")) {
-            showError("Почта указана некорректно");
-            return null;
-        }
-        if (firstName == null || firstName.isBlank()) {
-            showError("Укажите имя");
-            return null;
-        }
-        if (lastName == null || lastName.isBlank()) {
-            showError("Укажите фамилию");
-            return null;
-        }
-        if (role == null) {
-            showError("Выберите роль");
-            return null;
-        }
-
-        // NB: UpdateUserData не содержит пароль — смена пароля выполняется отдельно.
-        // Поле passwordField оставлено в форме для будущей поддержки, но сейчас
-        // в UpdateUserData не передаётся.
-        return new UpdateUserData(email, role, firstName, lastName, enabled);
+    hideError();
+    setFormDisabled(true);
+
+    var task =
+        new Task<User>() {
+          @Override
+          protected User call() {
+            return services.getUsersService().update(current.getUuid(), data);
+          }
+        };
+
+    task.setOnSucceeded(
+        ev -> {
+          setFormDisabled(false);
+          navigator.goTo("/fxml/UserList.fxml");
+        });
+
+    task.setOnFailed(
+        ev -> {
+          setFormDisabled(false);
+          var ex = task.getException();
+          String msg =
+              ex instanceof ServiceException se
+                  ? se.getMessage()
+                  : "Не удалось сохранить изменения";
+          showError(msg);
+        });
+
+    startDaemon(task, "user-update-save");
+  }
+
+  @FXML
+  private void onCancel(ActionEvent e) {
+    navigator.goTo("/fxml/UserList.fxml");
+  }
+
+  // ===== Validation / data =====
+
+  /**
+   * Собирает данные формы. Если валидация не прошла — показывает ошибку и возвращает {@code null}.
+   */
+  private UpdateUserData collectAndValidate() {
+    String email = safeTrim(emailField.getText());
+    String firstName = safeTrim(firstNameField.getText());
+    String lastName = safeTrim(lastNameField.getText());
+    Role role = roleChoiceBox.getValue();
+    boolean enabled = enabledCheckBox.isSelected();
+
+    if (email == null || email.isBlank()) {
+      showError("Укажите почту");
+      return null;
     }
-
-    // ===== UI helpers =====
-
-    private void setFormDisabled(boolean disabled) {
-        emailField.setDisable(disabled);
-        roleChoiceBox.setDisable(disabled);
-        firstNameField.setDisable(disabled);
-        lastNameField.setDisable(disabled);
-        enabledCheckBox.setDisable(disabled);
-        saveButton.setDisable(disabled);
+    if (!email.contains("@")) {
+      showError("Почта указана некорректно");
+      return null;
     }
-
-    private void showError(String message) {
-        errorLabel.setText(message);
-        errorLabel.setVisible(true);
-        errorLabel.setManaged(true);
+    if (firstName == null || firstName.isBlank()) {
+      showError("Укажите имя");
+      return null;
     }
-
-    private void hideError() {
-        errorLabel.setText("");
-        errorLabel.setVisible(false);
-        errorLabel.setManaged(false);
+    if (lastName == null || lastName.isBlank()) {
+      showError("Укажите фамилию");
+      return null;
     }
-
-    private static String safeTrim(String value) {
-        return value == null ? null : value.trim();
+    if (role == null) {
+      showError("Выберите роль");
+      return null;
     }
 
-    private static void startDaemon(Task<?> task, String name) {
-        var thread = new Thread(task, name);
-        thread.setDaemon(true);
-        thread.start();
-    }
-}
\ No newline at end of file
+    // NB: UpdateUserData не содержит пароль — смена пароля выполняется отдельно.
+    // Поле passwordField оставлено в форме для будущей поддержки, но сейчас
+    // в UpdateUserData не передаётся.
+    return new UpdateUserData(email, role, firstName, lastName, enabled);
+  }
+
+  // ===== UI helpers =====
+
+  private void setFormDisabled(boolean disabled) {
+    emailField.setDisable(disabled);
+    roleChoiceBox.setDisable(disabled);
+    firstNameField.setDisable(disabled);
+    lastNameField.setDisable(disabled);
+    enabledCheckBox.setDisable(disabled);
+    saveButton.setDisable(disabled);
+  }
+
+  private void showError(String message) {
+    errorLabel.setText(message);
+    errorLabel.setVisible(true);
+    errorLabel.setManaged(true);
+  }
+
+  private void hideError() {
+    errorLabel.setText("");
+    errorLabel.setVisible(false);
+    errorLabel.setManaged(false);
+  }
+
+  private static String safeTrim(String value) {
+    return value == null ? null : value.trim();
+  }
+
+  private static void startDaemon(Task<?> task, String name) {
+    var thread = new Thread(task, name);
+    thread.setDaemon(true);
+    thread.start();
+  }
+}
diff --git a/src/main/java/com/DesktopApplicationClientJava/controllers/UsersListController.java b/src/main/java/com/DesktopApplicationClientJava/controllers/UsersListController.java
index 65b1d0a..5caa1e6 100644
--- a/src/main/java/com/DesktopApplicationClientJava/controllers/UsersListController.java
+++ b/src/main/java/com/DesktopApplicationClientJava/controllers/UsersListController.java
@@ -24,318 +24,316 @@
 
 public class UsersListController extends Controller {
 
-    private static final int PAGE_SIZE = 20;
-    /** Насколько широко тянем список при активном поиске (клиентская фильтрация). */
-    private static final int SEARCH_LIMIT = 500;
-
-    @FXML private Label userInfoLabel;
-    @FXML private Label errorLabel;
-    @FXML private Label pageInfoLabel;
-    @FXML private Label statusLabel;
-    @FXML private TextField searchField;
-    @FXML private ComboBox<String> sortCombo;
-    @FXML private TableView<User> usersTable;
-    @FXML private TableColumn<User, String> emailColumn;
-    @FXML private TableColumn<User, String> firstNameColumn;
-    @FXML private TableColumn<User, String> lastNameColumn;
-    @FXML private TableColumn<User, String> roleColumn;
-    @FXML private TableColumn<User, String> enabledColumn;
-    @FXML private Button createButton;
-    @FXML private Button prevButton;
-    @FXML private Button nextButton;
-    @FXML private Button logoutButton;
-    @FXML private Button resourcesButton;
-
-    private final ObservableList<User> rows = FXCollections.observableArrayList();
-    private long offset = 0;
-
-    // ===== Lifecycle =====
-
-    @FXML
-    private void initialize() {
-        hideError();
-        setupUser();
-        setupSort();
-        setupTable();
-        setupRbac();
-
-        searchField.setOnAction(e -> reloadFromStart());
-        sortCombo.setOnAction(e -> reloadFromStart());
-        usersTable.setColumnResizePolicy(TableView.CONSTRAINED_RESIZE_POLICY_FLEX_LAST_COLUMN);
-
-        if (services != null && services.getUsersService() != null) {
-            reloadFromStart();
-        }
+  private static final int PAGE_SIZE = 20;
+
+  /** Насколько широко тянем список при активном поиске (клиентская фильтрация). */
+  private static final int SEARCH_LIMIT = 500;
+
+  @FXML private Label userInfoLabel;
+  @FXML private Label errorLabel;
+  @FXML private Label pageInfoLabel;
+  @FXML private Label statusLabel;
+  @FXML private TextField searchField;
+  @FXML private ComboBox<String> sortCombo;
+  @FXML private TableView<User> usersTable;
+  @FXML private TableColumn<User, String> emailColumn;
+  @FXML private TableColumn<User, String> firstNameColumn;
+  @FXML private TableColumn<User, String> lastNameColumn;
+  @FXML private TableColumn<User, String> roleColumn;
+  @FXML private TableColumn<User, String> enabledColumn;
+  @FXML private Button createButton;
+  @FXML private Button prevButton;
+  @FXML private Button nextButton;
+  @FXML private Button logoutButton;
+  @FXML private Button resourcesButton;
+
+  private final ObservableList<User> rows = FXCollections.observableArrayList();
+  private long offset = 0;
+
+  // ===== Lifecycle =====
+
+  @FXML
+  private void initialize() {
+    hideError();
+    setupUser();
+    setupSort();
+    setupTable();
+    setupRbac();
+
+    searchField.setOnAction(e -> reloadFromStart());
+    sortCombo.setOnAction(e -> reloadFromStart());
+    usersTable.setColumnResizePolicy(TableView.CONSTRAINED_RESIZE_POLICY_FLEX_LAST_COLUMN);
+
+    if (services != null && services.getUsersService() != null) {
+      reloadFromStart();
     }
-
-    // ===== UI setup =====
-
-    private void setupUser() {
-        var authService = services == null ? null : services.getAuthService();
-        var me = authService == null ? null : authService.getCurrentUser();
-        userInfoLabel.setText(
-                me == null ? "" : me.getFirstName() + " " + me.getLastName() + " · " + me.getRole());
-    }
-
-    private void setupSort() {
-        sortCombo
-                .getItems()
-                .setAll("По email (А-Я)", "По email (Я-А)", "По имени (А-Я)", "По фамилии (А-Я)");
-        sortCombo.getSelectionModel().selectFirst();
-    }
-
-    @FXML
-    private void onOpenResources(ActionEvent e) {
-        navigator.goTo("/fxml/ResourceList.fxml");
-    }
-
-    private void setupTable() {
-        emailColumn.setCellValueFactory(new PropertyValueFactory<>("email"));
-        firstNameColumn.setCellValueFactory(new PropertyValueFactory<>("firstName"));
-        lastNameColumn.setCellValueFactory(new PropertyValueFactory<>("lastName"));
-        roleColumn.setCellValueFactory(
-                c -> new SimpleStringProperty(
-                        c.getValue().getRole() == null ? "" : c.getValue().getRole().name()));
-        enabledColumn.setCellValueFactory(
-                c -> new SimpleStringProperty(
-                        Boolean.TRUE.equals(c.getValue().getEnabled()) ? "Да" : "Нет"));
-
-        usersTable.setItems(rows);
-        usersTable.setPlaceholder(new Label("Пользователей пока нет"));
-
-        usersTable.setRowFactory(
-                tv -> {
-                    var row = new TableRow<User>();
-                    row.setOnMouseClicked(
-                            e -> {
-                                if (e.getClickCount() == 2 && !row.isEmpty()) {
-                                    openDetails(row.getItem());
-                                }
-                            });
-                    return row;
-                });
-    }
-
-    private void setupRbac() {
-        var authService = services == null ? null : services.getAuthService();
-        boolean canCreate = authService != null && authService.isAdmin();
-        createButton.setVisible(canCreate);
-        createButton.setManaged(canCreate);
-    }
-
-    // ===== Data loading =====
-
-    private void reloadFromStart() {
-        offset = 0;
-        loadAsync();
-    }
-
-    private void loadAsync() {
-        hideError();
-        statusLabel.setText("Загрузка…");
-
-        final String query = currentQuery();
-        final boolean searching = query != null;
-        final UserFilter filter = buildFilter(query);
-        final SortSpec sort = resolveSort();
-        final long currentOffset = offset;
-        // При активном поиске тянем широкую выборку и фильтруем локально,
-        // чтобы не потерять совпадения по имени/фамилии.
-        final long fetchCount = searching ? SEARCH_LIMIT : PAGE_SIZE;
-        final long fetchOffset = searching ? 0 : currentOffset;
-
-        var task =
-                new Task<List<User>>() {
-                    @Override
-                    protected List<User> call() {
-                        return services
-                                .getUsersService()
-                                .search(filter, fetchOffset, fetchCount);
-                    }
-                };
-
-        task.setOnSucceeded(
-                e -> {
-                    List<User> page = task.getValue();
-                    if (page == null) {
-                        page = List.of();
-                    }
-                    var list = new ArrayList<>(page);
-
-                    // Клиентская фильтрация по подстроке (email + имя + фамилия).
-                    if (searching) {
-                        list.removeIf(u -> !matchesQuery(u, query));
-                    }
-
-                    sort.sort(list);
-                    rows.setAll(list);
-
-                    updatePaginationUi(searching ? list.size() : page.size(), searching);
-                    statusLabel.setText(
-                            searching ? "Найдено: " + list.size() : "");
-                });
-
-        task.setOnFailed(
-                e -> {
-                    var ex = task.getException();
-                    String msg =
-                            ex instanceof ServiceException se
-                                    ? se.getMessage()
-                                    : "Не удалось загрузить список";
-                    showError(msg);
-                    rows.clear();
-                    updatePaginationUi(0, searching);
-                    statusLabel.setText("");
-                });
-
-        var thread = new Thread(task, "users-list-load");
-        thread.setDaemon(true);
-        thread.start();
-    }
-
-    private String currentQuery() {
-        String raw = searchField.getText();
-        if (raw == null) {
-            return null;
-        }
-        String trimmed = raw.trim();
-        return trimmed.isEmpty() ? null : trimmed;
-    }
-
-    /**
-     * Различные бэкенды по-разному комбинируют поля фильтра. Чтобы поиск
-     * работал предсказуемо, на сервер отправляем только email-фильтр
-     * (когда запрос похож на email), а имя/фамилию фильтруем локально.
-     */
-    private UserFilter buildFilter(String query) {
-        if (query == null) {
-            return UserFilter.empty();
-        }
-        boolean looksLikeEmail = query.contains("@");
-        return looksLikeEmail
-                ? new UserFilter(query, null, null, null, null)
-                : UserFilter.empty();
-    }
-
-    private static boolean matchesQuery(User u, String query) {
-        if (u == null) {
-            return false;
-        }
-        String needle = query.toLowerCase(Locale.ROOT);
-        return containsIgnoreCase(u.getEmail(), needle)
-                || containsIgnoreCase(u.getFirstName(), needle)
-                || containsIgnoreCase(u.getLastName(), needle);
-    }
-
-    private static boolean containsIgnoreCase(String value, String lowerNeedle) {
-        return value != null && value.toLowerCase(Locale.ROOT).contains(lowerNeedle);
-    }
-
-    private record SortSpec(java.util.Comparator<User> comparator) {
-        void sort(List<User> list) {
-            if (comparator != null) {
-                list.sort(comparator);
-            }
-        }
-    }
-
-    private SortSpec resolveSort() {
-        String choice = sortCombo.getValue();
-        if (choice == null) {
-            return new SortSpec(null);
-        }
-        return switch (choice) {
-            case "По email (А-Я)" ->
-                    new SortSpec(java.util.Comparator.comparing(
-                            u -> u.getEmail() == null ? "" : u.getEmail(),
-                            String.CASE_INSENSITIVE_ORDER));
-            case "По email (Я-А)" ->
-                    new SortSpec(java.util.Comparator.comparing(
-                                    (User u) -> u.getEmail() == null ? "" : u.getEmail(),
-                                    String.CASE_INSENSITIVE_ORDER)
-                            .reversed());
-            case "По имени (А-Я)" ->
-                    new SortSpec(java.util.Comparator.comparing(
-                            u -> u.getFirstName() == null ? "" : u.getFirstName(),
-                            String.CASE_INSENSITIVE_ORDER));
-            case "По фамилии (А-Я)" ->
-                    new SortSpec(java.util.Comparator.comparing(
-                            u -> u.getLastName() == null ? "" : u.getLastName(),
-                            String.CASE_INSENSITIVE_ORDER));
-            default -> new SortSpec(null);
+  }
+
+  // ===== UI setup =====
+
+  private void setupUser() {
+    var authService = services == null ? null : services.getAuthService();
+    var me = authService == null ? null : authService.getCurrentUser();
+    userInfoLabel.setText(
+        me == null ? "" : me.getFirstName() + " " + me.getLastName() + " · " + me.getRole());
+  }
+
+  private void setupSort() {
+    sortCombo
+        .getItems()
+        .setAll("По email (А-Я)", "По email (Я-А)", "По имени (А-Я)", "По фамилии (А-Я)");
+    sortCombo.getSelectionModel().selectFirst();
+  }
+
+  @FXML
+  private void onOpenResources(ActionEvent e) {
+    navigator.goTo("/fxml/ResourceList.fxml");
+  }
+
+  private void setupTable() {
+    emailColumn.setCellValueFactory(new PropertyValueFactory<>("email"));
+    firstNameColumn.setCellValueFactory(new PropertyValueFactory<>("firstName"));
+    lastNameColumn.setCellValueFactory(new PropertyValueFactory<>("lastName"));
+    roleColumn.setCellValueFactory(
+        c ->
+            new SimpleStringProperty(
+                c.getValue().getRole() == null ? "" : c.getValue().getRole().name()));
+    enabledColumn.setCellValueFactory(
+        c ->
+            new SimpleStringProperty(
+                Boolean.TRUE.equals(c.getValue().getEnabled()) ? "Да" : "Нет"));
+
+    usersTable.setItems(rows);
+    usersTable.setPlaceholder(new Label("Пользователей пока нет"));
+
+    usersTable.setRowFactory(
+        tv -> {
+          var row = new TableRow<User>();
+          row.setOnMouseClicked(
+              e -> {
+                if (e.getClickCount() == 2 && !row.isEmpty()) {
+                  openDetails(row.getItem());
+                }
+              });
+          return row;
+        });
+  }
+
+  private void setupRbac() {
+    var authService = services == null ? null : services.getAuthService();
+    boolean canCreate = authService != null && authService.isAdmin();
+    createButton.setVisible(canCreate);
+    createButton.setManaged(canCreate);
+  }
+
+  // ===== Data loading =====
+
+  private void reloadFromStart() {
+    offset = 0;
+    loadAsync();
+  }
+
+  private void loadAsync() {
+    hideError();
+    statusLabel.setText("Загрузка…");
+
+    final String query = currentQuery();
+    final boolean searching = query != null;
+    final UserFilter filter = buildFilter(query);
+    final SortSpec sort = resolveSort();
+    final long currentOffset = offset;
+    // При активном поиске тянем широкую выборку и фильтруем локально,
+    // чтобы не потерять совпадения по имени/фамилии.
+    final long fetchCount = searching ? SEARCH_LIMIT : PAGE_SIZE;
+    final long fetchOffset = searching ? 0 : currentOffset;
+
+    var task =
+        new Task<List<User>>() {
+          @Override
+          protected List<User> call() {
+            return services.getUsersService().search(filter, fetchOffset, fetchCount);
+          }
         };
-    }
-
-    private void updatePaginationUi(int pageSize, boolean searching) {
-        if (searching) {
-            // При активном поиске мы показываем «плоский» отфильтрованный список
-            // без серверной пагинации — кнопки не имеют смысла.
-            pageInfoLabel.setText("Показано " + rows.size());
-            prevButton.setDisable(true);
-            nextButton.setDisable(true);
-            return;
-        }
-        long from = rows.isEmpty() ? 0 : offset + 1;
-        long to = offset + pageSize;
-        pageInfoLabel.setText("Показано " + from + "–" + to);
-        prevButton.setDisable(offset == 0);
-        nextButton.setDisable(pageSize < PAGE_SIZE);
-    }
-
-    // ===== Event handlers =====
 
-    @FXML
-    private void onCreate(ActionEvent e) {
-        navigator.goTo("/fxml/UserCreateForm.fxml");
+    task.setOnSucceeded(
+        e -> {
+          List<User> page = task.getValue();
+          if (page == null) {
+            page = List.of();
+          }
+          var list = new ArrayList<>(page);
+
+          // Клиентская фильтрация по подстроке (email + имя + фамилия).
+          if (searching) {
+            list.removeIf(u -> !matchesQuery(u, query));
+          }
+
+          sort.sort(list);
+          rows.setAll(list);
+
+          updatePaginationUi(searching ? list.size() : page.size(), searching);
+          statusLabel.setText(searching ? "Найдено: " + list.size() : "");
+        });
+
+    task.setOnFailed(
+        e -> {
+          var ex = task.getException();
+          String msg =
+              ex instanceof ServiceException se ? se.getMessage() : "Не удалось загрузить список";
+          showError(msg);
+          rows.clear();
+          updatePaginationUi(0, searching);
+          statusLabel.setText("");
+        });
+
+    var thread = new Thread(task, "users-list-load");
+    thread.setDaemon(true);
+    thread.start();
+  }
+
+  private String currentQuery() {
+    String raw = searchField.getText();
+    if (raw == null) {
+      return null;
     }
-
-    @FXML
-    private void onLogout(ActionEvent e) {
-        services.getAuthService().logout();
-        navigator.goTo("/fxml/LoginForm.fxml");
-    }
-
-    @FXML
-    private void onSearch(ActionEvent e) {
-        offset = 0;
-        loadAsync();
-    }
-
-    @FXML
-    private void onSort(ActionEvent e) {
-        offset = 0;
-        loadAsync();
+    String trimmed = raw.trim();
+    return trimmed.isEmpty() ? null : trimmed;
+  }
+
+  /**
+   * Различные бэкенды по-разному комбинируют поля фильтра. Чтобы поиск работал предсказуемо, на
+   * сервер отправляем только email-фильтр (когда запрос похож на email), а имя/фамилию фильтруем
+   * локально.
+   */
+  private UserFilter buildFilter(String query) {
+    if (query == null) {
+      return UserFilter.empty();
     }
+    boolean looksLikeEmail = query.contains("@");
+    return looksLikeEmail ? new UserFilter(query, null, null, null, null) : UserFilter.empty();
+  }
 
-    @FXML
-    private void onNext(ActionEvent e) {
-        offset += PAGE_SIZE;
-        loadAsync();
+  private static boolean matchesQuery(User u, String query) {
+    if (u == null) {
+      return false;
     }
-
-    @FXML
-    private void onPrev(ActionEvent e) {
-        offset = Math.max(0, offset - PAGE_SIZE);
-        loadAsync();
+    String needle = query.toLowerCase(Locale.ROOT);
+    return containsIgnoreCase(u.getEmail(), needle)
+        || containsIgnoreCase(u.getFirstName(), needle)
+        || containsIgnoreCase(u.getLastName(), needle);
+  }
+
+  private static boolean containsIgnoreCase(String value, String lowerNeedle) {
+    return value != null && value.toLowerCase(Locale.ROOT).contains(lowerNeedle);
+  }
+
+  private record SortSpec(java.util.Comparator<User> comparator) {
+    void sort(List<User> list) {
+      if (comparator != null) {
+        list.sort(comparator);
+      }
     }
+  }
 
-    private void openDetails(User user) {
-        navigator.goTo(
-                "/fxml/UserDetails.fxml",
-                c -> ((UserDetailsController) c).setUserId(user.getUuid()));
+  private SortSpec resolveSort() {
+    String choice = sortCombo.getValue();
+    if (choice == null) {
+      return new SortSpec(null);
     }
-
-    // ===== helpers =====
-
-    private void showError(String message) {
-        errorLabel.setText(message);
-        errorLabel.setVisible(true);
-        errorLabel.setManaged(true);
-    }
-
-    private void hideError() {
-        errorLabel.setText("");
-        errorLabel.setVisible(false);
-        errorLabel.setManaged(false);
+    return switch (choice) {
+      case "По email (А-Я)" ->
+          new SortSpec(
+              java.util.Comparator.comparing(
+                  u -> u.getEmail() == null ? "" : u.getEmail(), String.CASE_INSENSITIVE_ORDER));
+      case "По email (Я-А)" ->
+          new SortSpec(
+              java.util.Comparator.comparing(
+                      (User u) -> u.getEmail() == null ? "" : u.getEmail(),
+                      String.CASE_INSENSITIVE_ORDER)
+                  .reversed());
+      case "По имени (А-Я)" ->
+          new SortSpec(
+              java.util.Comparator.comparing(
+                  u -> u.getFirstName() == null ? "" : u.getFirstName(),
+                  String.CASE_INSENSITIVE_ORDER));
+      case "По фамилии (А-Я)" ->
+          new SortSpec(
+              java.util.Comparator.comparing(
+                  u -> u.getLastName() == null ? "" : u.getLastName(),
+                  String.CASE_INSENSITIVE_ORDER));
+      default -> new SortSpec(null);
+    };
+  }
+
+  private void updatePaginationUi(int pageSize, boolean searching) {
+    if (searching) {
+      // При активном поиске мы показываем «плоский» отфильтрованный список
+      // без серверной пагинации — кнопки не имеют смысла.
+      pageInfoLabel.setText("Показано " + rows.size());
+      prevButton.setDisable(true);
+      nextButton.setDisable(true);
+      return;
     }
-}
\ No newline at end of file
+    long from = rows.isEmpty() ? 0 : offset + 1;
+    long to = offset + pageSize;
+    pageInfoLabel.setText("Показано " + from + "–" + to);
+    prevButton.setDisable(offset == 0);
+    nextButton.setDisable(pageSize < PAGE_SIZE);
+  }
+
+  // ===== Event handlers =====
+
+  @FXML
+  private void onCreate(ActionEvent e) {
+    navigator.goTo("/fxml/UserCreateForm.fxml");
+  }
+
+  @FXML
+  private void onLogout(ActionEvent e) {
+    services.getAuthService().logout();
+    navigator.goTo("/fxml/LoginForm.fxml");
+  }
+
+  @FXML
+  private void onSearch(ActionEvent e) {
+    offset = 0;
+    loadAsync();
+  }
+
+  @FXML
+  private void onSort(ActionEvent e) {
+    offset = 0;
+    loadAsync();
+  }
+
+  @FXML
+  private void onNext(ActionEvent e) {
+    offset += PAGE_SIZE;
+    loadAsync();
+  }
+
+  @FXML
+  private void onPrev(ActionEvent e) {
+    offset = Math.max(0, offset - PAGE_SIZE);
+    loadAsync();
+  }
+
+  private void openDetails(User user) {
+    navigator.goTo(
+        "/fxml/UserDetails.fxml", c -> ((UserDetailsController) c).setUserId(user.getUuid()));
+  }
+
+  // ===== helpers =====
+
+  private void showError(String message) {
+    errorLabel.setText(message);
+    errorLabel.setVisible(true);
+    errorLabel.setManaged(true);
+  }
+
+  private void hideError() {
+    errorLabel.setText("");
+    errorLabel.setVisible(false);
+    errorLabel.setManaged(false);
+  }
+}

From 18f613a20eb11f3c99a0407073579c2aefedd1ca Mon Sep 17 00:00:00 2001
From: Vladimir Valekzhanin <valdemarcheck@yandex.ru>
Date: Fri, 16 Oct 2026 18:05:40 +0300
Subject: [PATCH 7/7] =?UTF-8?q?fix:=20=D1=83=D0=B1=D1=80=D0=B0=D1=82=D1=8C?=
 =?UTF-8?q?=20=D0=BB=D0=B8=D1=88=D0=BD=D1=8E=D1=8E=20=D1=81=D0=BA=D0=BE?=
 =?UTF-8?q?=D0=B1=D0=BA=D1=83=20=D0=BF=D0=BE=D1=81=D0=BB=D0=B5=20=D1=80?=
 =?UTF-8?q?=D0=B0=D0=B7=D1=80=D0=B5=D1=88=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BA?=
 =?UTF-8?q?=D0=BE=D0=BD=D1=84=D0=BB=D0=B8=D0=BA=D1=82=D0=B0=20=D1=81=D0=BB?=
 =?UTF-8?q?=D0=B8=D1=8F=D0=BD=D0=B8=D1=8F=20=D0=B2=20ResourceListControlle?=
 =?UTF-8?q?r?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controllers/ResourceListController.java                      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/com/DesktopApplicationClientJava/controllers/ResourceListController.java b/src/main/java/com/DesktopApplicationClientJava/controllers/ResourceListController.java
index f82e2d4..29fec53 100644
--- a/src/main/java/com/DesktopApplicationClientJava/controllers/ResourceListController.java
+++ b/src/main/java/com/DesktopApplicationClientJava/controllers/ResourceListController.java
@@ -143,7 +143,6 @@ private void updateDeleteButtonState() {
   private void onOpenUsers(ActionEvent e) {
     navigator.goTo("/fxml/UserList.fxml");
   }
-  }
 
   // ===== Data loading =====