From a28e35797bf9f6d1c46c578b449dfded1e3aee6c Mon Sep 17 00:00:00 2001
From: "ns.potapov" <ns.potapov@yandex.ru>
Date: Thu, 20 Jun 2024 11:09:31 +0400
Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE?=
 =?UTF-8?q?=D1=80=D0=B8=D0=BD=D0=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../example/nekontakte/users/api/AdminUserController.java | 6 +++---
 .../templates/{user-edit.html => admin/user.html}         | 4 ++--
 .../resources/templates/{user.html => admin/users.html}   | 8 ++++----
 nekontakte/src/main/resources/templates/index.html        | 5 ++---
 4 files changed, 11 insertions(+), 12 deletions(-)
 rename nekontakte/src/main/resources/templates/{user-edit.html => admin/user.html} (90%)
 rename nekontakte/src/main/resources/templates/{user.html => admin/users.html} (86%)
diff --git a/nekontakte/src/main/java/com/example/nekontakte/users/api/AdminUserController.java b/nekontakte/src/main/java/com/example/nekontakte/users/api/AdminUserController.java
index d67622a..f088490 100644
--- a/nekontakte/src/main/java/com/example/nekontakte/users/api/AdminUserController.java
+++ b/nekontakte/src/main/java/com/example/nekontakte/users/api/AdminUserController.java
@@ -26,9 +26,9 @@ import java.util.Objects;
 
 @RequestMapping(AdminUserController.URL)
 public class AdminUserController {
-    public static final String URL = Constants.ADMIN_PREFIX + "/user";
-    private static final String USER_VIEW = "user";
-    private static final String USER_EDIT_VIEW = "user-edit";
+    public static final String URL = Constants.ADMIN_PREFIX + "/users";
+    private static final String USER_VIEW = "admin/users";
+    private static final String USER_EDIT_VIEW = "admin/user";
     private static final String PAGE_ATTRIBUTE = "page";
     private static final String USER_ATTRIBUTE = "user";
 
diff --git a/nekontakte/src/main/resources/templates/user-edit.html b/nekontakte/src/main/resources/templates/admin/user.html
similarity index 90%
rename from nekontakte/src/main/resources/templates/user-edit.html
rename to nekontakte/src/main/resources/templates/admin/user.html
index 28b8ebe..71532c4 100644
--- a/nekontakte/src/main/resources/templates/user-edit.html
+++ b/nekontakte/src/main/resources/templates/admin/user.html
@@ -7,7 +7,7 @@
 
 <body>
     <main layout:fragment="content">
-        <form action="#" th:action="@{/admin/user/edit(page=${page})}" th:object="${user}" method="post">
+        <form action="#" th:action="@{/admin/users/edit(page=${page})}" th:object="${user}" method="post">
             <input type="hidden" th:field="*{id}" id="id" class="form-control" readonly>
             <div class="mb-3">
                 <label for="username" class="form-label">Имя пользователя</label>
@@ -35,7 +35,7 @@
                 <div th:if="${#fields.hasErrors('passwordConfirm')}" th:errors="*{passwordConfirm}" class="invalid-feedback"></div>
             </div>
             <button class="btn btn-success me-3" type="submit">Применить</button>
-            <a th:href="@{/admin/user(page=${page})}" class="btn btn-danger" >Отмена</a>
+            <a th:href="@{/admin/users(page=${page})}" class="btn btn-danger" >Отмена</a>
         </form>
     </main>
 </body>
diff --git a/nekontakte/src/main/resources/templates/user.html b/nekontakte/src/main/resources/templates/admin/users.html
similarity index 86%
rename from nekontakte/src/main/resources/templates/user.html
rename to nekontakte/src/main/resources/templates/admin/users.html
index d381168..ba33476 100644
--- a/nekontakte/src/main/resources/templates/user.html
+++ b/nekontakte/src/main/resources/templates/admin/users.html
@@ -12,7 +12,7 @@
             <th:block th:case="*">
                 <h2>Пользователи</h2>
                 <div>
-                    <a th:href="@{/admin/user/create}" class="btn btn-primary">Добавить пользователя</a>
+                    <a th:href="@{/admin/users/create}" class="btn btn-primary">Добавить пользователя</a>
                 </div>
                 <table class="table">
                     <caption></caption>
@@ -29,7 +29,7 @@
                             <th scope="row" th:text="${user.id}"></th>
                             <td th:text="${user.username}"></td>
                             <td>
-                                <form th:action="@{/admin/user/edit/{id}(id=${user.id})}" method="get">
+                                <form th:action="@{/admin/users/edit/{id}(id=${user.id})}" method="get">
                                     <input type="hidden" th:name="page" th:value="${page}">
                                     <button type="submit" class="btn btn-link button-link">
                                         <i class="bi bi-pencil text-warning-emphasis"></i>
@@ -37,7 +37,7 @@
                                 </form>
                             </td>
                             <td>
-                                <form th:action="@{/admin/user/delete/{id}(id=${user.id})}" method="post">
+                                <form th:action="@{/admin/users/delete/{id}(id=${user.id})}" method="post">
                                     <input type="hidden" th:name="page" th:value="${page}">
                                     <button type="submit" class="btn btn-link button-link"
                                         onclick="return confirm('Вы уверены?')">
@@ -50,7 +50,7 @@
                 </table>
             </th:block>
             <th:block th:replace="~{ pagination :: pagination (
-                    url=${'admin/user'},
+                    url=${'admin/users'},
                     totalPages=${totalPages},
                     currentPage=${currentPage}) }" />
         </th:block>
diff --git a/nekontakte/src/main/resources/templates/index.html b/nekontakte/src/main/resources/templates/index.html
index 122ed26..c428d91 100644
--- a/nekontakte/src/main/resources/templates/index.html
+++ b/nekontakte/src/main/resources/templates/index.html
@@ -32,8 +32,7 @@
                 <div class="collapse navbar-collapse" id="main-navbar">
                     <ul class="navbar-nav me-auto link" th:with="activeLink=${#objects.nullSafe(servletPath, '')}">
                         <th:block sec:authorize="hasRole('ADMIN')">
-                            <a class="nav-link" href="/admin/user"
-                                th:classappend="${activeLink.startsWith('/admin/user') ? 'active' : ''}">
+                            <a class="nav-link" href="/admin/users" th:classappend="${activeLink.startsWith('/admin/users') ? 'active' : ''}">
                                 Пользователи
                             </a>
                             <a class="nav-link" href="/h2-console/" target="_blank">Консоль H2</a>
@@ -53,7 +52,7 @@
     <main class="container-fluid p-2 d-flex flex-column flex-fill" layout:fragment="content">
     </main>
     <footer class="my-footer mt-auto d-flex flex-shrink-0 justify-content-center align-items-center">
-        Автор, [[${#dates.year(#dates.createNow())}]]
+        Потапов Н.С. ПИбд-21, [[${#dates.year(#dates.createNow())}]]
     </footer>
 </body>
 
