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 @@
-
+
@@ -35,7 +35,7 @@
- Отмена + Отмена
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 @@

Пользователи

- Добавить пользователя + Добавить пользователя
@@ -29,7 +29,7 @@
-
+
-
+
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 @@