From 7a73496c4f89889ae7f9e8e2e7911eb1d09b9cbe Mon Sep 17 00:00:00 2001 From: Kirill Buslovskii Date: Sun, 15 Feb 2026 15:36:51 +0300 Subject: [PATCH 1/5] Create personal commit on Git --- .../com/javarush/{khmelov => buslovskii}/cmd/Command.java | 2 +- .../javarush/{khmelov => buslovskii}/cmd/EditUser.java | 8 ++++---- .../javarush/{khmelov => buslovskii}/cmd/ListUser.java | 6 +++--- .../javarush/{khmelov => buslovskii}/cmd/StartPage.java | 2 +- .../javarush/{khmelov => buslovskii}/config/Winter.java | 2 +- .../controller/FrontController.java | 8 ++++---- .../{khmelov => buslovskii}/controller/HttpResolver.java | 6 +++--- .../com/javarush/{khmelov => buslovskii}/entity/Role.java | 2 +- .../com/javarush/{khmelov => buslovskii}/entity/User.java | 2 +- .../{khmelov => buslovskii}/repository/Repository.java | 4 ++-- .../repository/UserRepository.java | 6 +++--- .../{khmelov => buslovskii}/service/UserService.java | 6 +++--- 12 files changed, 27 insertions(+), 27 deletions(-) rename src/main/java/com/javarush/{khmelov => buslovskii}/cmd/Command.java (96%) rename src/main/java/com/javarush/{khmelov => buslovskii}/cmd/EditUser.java (88%) rename src/main/java/com/javarush/{khmelov => buslovskii}/cmd/ListUser.java (78%) rename src/main/java/com/javarush/{khmelov => buslovskii}/cmd/StartPage.java (67%) rename src/main/java/com/javarush/{khmelov => buslovskii}/config/Winter.java (95%) rename src/main/java/com/javarush/{khmelov => buslovskii}/controller/FrontController.java (88%) rename src/main/java/com/javarush/{khmelov => buslovskii}/controller/HttpResolver.java (90%) rename src/main/java/com/javarush/{khmelov => buslovskii}/entity/Role.java (52%) rename src/main/java/com/javarush/{khmelov => buslovskii}/entity/User.java (90%) rename src/main/java/com/javarush/{khmelov => buslovskii}/repository/Repository.java (73%) rename src/main/java/com/javarush/{khmelov => buslovskii}/repository/UserRepository.java (89%) rename src/main/java/com/javarush/{khmelov => buslovskii}/service/UserService.java (82%) diff --git a/src/main/java/com/javarush/khmelov/cmd/Command.java b/src/main/java/com/javarush/buslovskii/cmd/Command.java similarity index 96% rename from src/main/java/com/javarush/khmelov/cmd/Command.java rename to src/main/java/com/javarush/buslovskii/cmd/Command.java index fd4035b..1bbf988 100644 --- a/src/main/java/com/javarush/khmelov/cmd/Command.java +++ b/src/main/java/com/javarush/buslovskii/cmd/Command.java @@ -1,4 +1,4 @@ -package com.javarush.khmelov.cmd; +package com.javarush.buslovskii.cmd; import jakarta.servlet.http.HttpServletRequest; diff --git a/src/main/java/com/javarush/khmelov/cmd/EditUser.java b/src/main/java/com/javarush/buslovskii/cmd/EditUser.java similarity index 88% rename from src/main/java/com/javarush/khmelov/cmd/EditUser.java rename to src/main/java/com/javarush/buslovskii/cmd/EditUser.java index ae191b4..e373f9e 100644 --- a/src/main/java/com/javarush/khmelov/cmd/EditUser.java +++ b/src/main/java/com/javarush/buslovskii/cmd/EditUser.java @@ -1,8 +1,8 @@ -package com.javarush.khmelov.cmd; +package com.javarush.buslovskii.cmd; -import com.javarush.khmelov.entity.Role; -import com.javarush.khmelov.entity.User; -import com.javarush.khmelov.service.UserService; +import com.javarush.buslovskii.entity.Role; +import com.javarush.buslovskii.entity.User; +import com.javarush.buslovskii.service.UserService; import jakarta.servlet.http.HttpServletRequest; import java.util.Optional; diff --git a/src/main/java/com/javarush/khmelov/cmd/ListUser.java b/src/main/java/com/javarush/buslovskii/cmd/ListUser.java similarity index 78% rename from src/main/java/com/javarush/khmelov/cmd/ListUser.java rename to src/main/java/com/javarush/buslovskii/cmd/ListUser.java index 9257917..3a15bee 100644 --- a/src/main/java/com/javarush/khmelov/cmd/ListUser.java +++ b/src/main/java/com/javarush/buslovskii/cmd/ListUser.java @@ -1,7 +1,7 @@ -package com.javarush.khmelov.cmd; +package com.javarush.buslovskii.cmd; -import com.javarush.khmelov.entity.User; -import com.javarush.khmelov.service.UserService; +import com.javarush.buslovskii.entity.User; +import com.javarush.buslovskii.service.UserService; import jakarta.servlet.http.HttpServletRequest; import java.util.Collection; diff --git a/src/main/java/com/javarush/khmelov/cmd/StartPage.java b/src/main/java/com/javarush/buslovskii/cmd/StartPage.java similarity index 67% rename from src/main/java/com/javarush/khmelov/cmd/StartPage.java rename to src/main/java/com/javarush/buslovskii/cmd/StartPage.java index d268f93..a75f630 100644 --- a/src/main/java/com/javarush/khmelov/cmd/StartPage.java +++ b/src/main/java/com/javarush/buslovskii/cmd/StartPage.java @@ -1,4 +1,4 @@ -package com.javarush.khmelov.cmd; +package com.javarush.buslovskii.cmd; @SuppressWarnings("unused") public class StartPage implements Command { diff --git a/src/main/java/com/javarush/khmelov/config/Winter.java b/src/main/java/com/javarush/buslovskii/config/Winter.java similarity index 95% rename from src/main/java/com/javarush/khmelov/config/Winter.java rename to src/main/java/com/javarush/buslovskii/config/Winter.java index 48bd8a7..df95b44 100644 --- a/src/main/java/com/javarush/khmelov/config/Winter.java +++ b/src/main/java/com/javarush/buslovskii/config/Winter.java @@ -1,4 +1,4 @@ -package com.javarush.khmelov.config; +package com.javarush.buslovskii.config; import lombok.SneakyThrows; diff --git a/src/main/java/com/javarush/khmelov/controller/FrontController.java b/src/main/java/com/javarush/buslovskii/controller/FrontController.java similarity index 88% rename from src/main/java/com/javarush/khmelov/controller/FrontController.java rename to src/main/java/com/javarush/buslovskii/controller/FrontController.java index 33242b2..5b615a4 100644 --- a/src/main/java/com/javarush/khmelov/controller/FrontController.java +++ b/src/main/java/com/javarush/buslovskii/controller/FrontController.java @@ -1,8 +1,8 @@ -package com.javarush.khmelov.controller; +package com.javarush.buslovskii.controller; -import com.javarush.khmelov.cmd.Command; -import com.javarush.khmelov.config.Winter; -import com.javarush.khmelov.entity.Role; +import com.javarush.buslovskii.cmd.Command; +import com.javarush.buslovskii.config.Winter; +import com.javarush.buslovskii.entity.Role; import jakarta.servlet.ServletConfig; import jakarta.servlet.ServletException; import jakarta.servlet.annotation.WebServlet; diff --git a/src/main/java/com/javarush/khmelov/controller/HttpResolver.java b/src/main/java/com/javarush/buslovskii/controller/HttpResolver.java similarity index 90% rename from src/main/java/com/javarush/khmelov/controller/HttpResolver.java rename to src/main/java/com/javarush/buslovskii/controller/HttpResolver.java index 18bb761..3e005a0 100644 --- a/src/main/java/com/javarush/khmelov/controller/HttpResolver.java +++ b/src/main/java/com/javarush/buslovskii/controller/HttpResolver.java @@ -1,7 +1,7 @@ -package com.javarush.khmelov.controller; +package com.javarush.buslovskii.controller; -import com.javarush.khmelov.cmd.Command; -import com.javarush.khmelov.config.Winter; +import com.javarush.buslovskii.cmd.Command; +import com.javarush.buslovskii.config.Winter; import jakarta.servlet.http.HttpServletRequest; public class HttpResolver { diff --git a/src/main/java/com/javarush/khmelov/entity/Role.java b/src/main/java/com/javarush/buslovskii/entity/Role.java similarity index 52% rename from src/main/java/com/javarush/khmelov/entity/Role.java rename to src/main/java/com/javarush/buslovskii/entity/Role.java index 5ae365f..b607b63 100644 --- a/src/main/java/com/javarush/khmelov/entity/Role.java +++ b/src/main/java/com/javarush/buslovskii/entity/Role.java @@ -1,4 +1,4 @@ -package com.javarush.khmelov.entity; +package com.javarush.buslovskii.entity; public enum Role { USER, ADMIN, GUEST diff --git a/src/main/java/com/javarush/khmelov/entity/User.java b/src/main/java/com/javarush/buslovskii/entity/User.java similarity index 90% rename from src/main/java/com/javarush/khmelov/entity/User.java rename to src/main/java/com/javarush/buslovskii/entity/User.java index f7fa2d6..d41d16e 100644 --- a/src/main/java/com/javarush/khmelov/entity/User.java +++ b/src/main/java/com/javarush/buslovskii/entity/User.java @@ -1,4 +1,4 @@ -package com.javarush.khmelov.entity; +package com.javarush.buslovskii.entity; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/javarush/khmelov/repository/Repository.java b/src/main/java/com/javarush/buslovskii/repository/Repository.java similarity index 73% rename from src/main/java/com/javarush/khmelov/repository/Repository.java rename to src/main/java/com/javarush/buslovskii/repository/Repository.java index f1abdac..9ac4bf9 100644 --- a/src/main/java/com/javarush/khmelov/repository/Repository.java +++ b/src/main/java/com/javarush/buslovskii/repository/Repository.java @@ -1,6 +1,6 @@ -package com.javarush.khmelov.repository; +package com.javarush.buslovskii.repository; -import com.javarush.khmelov.entity.User; +import com.javarush.buslovskii.entity.User; import java.util.Collection; import java.util.Optional; diff --git a/src/main/java/com/javarush/khmelov/repository/UserRepository.java b/src/main/java/com/javarush/buslovskii/repository/UserRepository.java similarity index 89% rename from src/main/java/com/javarush/khmelov/repository/UserRepository.java rename to src/main/java/com/javarush/buslovskii/repository/UserRepository.java index 58b32ea..fbf5d01 100644 --- a/src/main/java/com/javarush/khmelov/repository/UserRepository.java +++ b/src/main/java/com/javarush/buslovskii/repository/UserRepository.java @@ -1,7 +1,7 @@ -package com.javarush.khmelov.repository; +package com.javarush.buslovskii.repository; -import com.javarush.khmelov.entity.Role; -import com.javarush.khmelov.entity.User; +import com.javarush.buslovskii.entity.Role; +import com.javarush.buslovskii.entity.User; import java.util.Collection; import java.util.HashMap; diff --git a/src/main/java/com/javarush/khmelov/service/UserService.java b/src/main/java/com/javarush/buslovskii/service/UserService.java similarity index 82% rename from src/main/java/com/javarush/khmelov/service/UserService.java rename to src/main/java/com/javarush/buslovskii/service/UserService.java index b17527c..d48b246 100644 --- a/src/main/java/com/javarush/khmelov/service/UserService.java +++ b/src/main/java/com/javarush/buslovskii/service/UserService.java @@ -1,7 +1,7 @@ -package com.javarush.khmelov.service; +package com.javarush.buslovskii.service; -import com.javarush.khmelov.entity.User; -import com.javarush.khmelov.repository.UserRepository; +import com.javarush.buslovskii.entity.User; +import com.javarush.buslovskii.repository.UserRepository; import java.util.Collection; import java.util.Optional; From 1586e09e8ccda27d689a9de647fbcbf27a965676 Mon Sep 17 00:00:00 2001 From: Kirill Buslovskii Date: Sun, 15 Feb 2026 16:49:42 +0300 Subject: [PATCH 2/5] ADD Bootstrap --- src/main/webapp/WEB-INF/parts/header.jsp | 31 ++++++++++++++++++++++++ src/main/webapp/WEB-INF/start-page.jsp | 2 +- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 src/main/webapp/WEB-INF/parts/header.jsp diff --git a/src/main/webapp/WEB-INF/parts/header.jsp b/src/main/webapp/WEB-INF/parts/header.jsp new file mode 100644 index 0000000..fcb4742 --- /dev/null +++ b/src/main/webapp/WEB-INF/parts/header.jsp @@ -0,0 +1,31 @@ +<%-- + Created by IntelliJ IDEA. + User: russa + Date: 15.02.2026 + Time: 16:03 + To change this template use File | Settings | File Templates. +--%> +<%@ page contentType="text/html;charset=UTF-8" language="java" %> + + + + + + + + diff --git a/src/main/webapp/WEB-INF/start-page.jsp b/src/main/webapp/WEB-INF/start-page.jsp index 0531c1c..3bb7f10 100644 --- a/src/main/webapp/WEB-INF/start-page.jsp +++ b/src/main/webapp/WEB-INF/start-page.jsp @@ -1,5 +1,5 @@ <%@ page contentType="text/html;charset=UTF-8" language="java" %> -<%@include file="head.jsp"%> +<%@include file="parts/header.jsp"%>

<%= "Hello World!" %>

From dae6dd2bb9ff08404357c0485f36e167be3b1d18 Mon Sep 17 00:00:00 2001 From: Kirill Buslovskii Date: Sun, 15 Feb 2026 17:22:50 +0300 Subject: [PATCH 3/5] ADD Bootstrap --- src/main/webapp/WEB-INF/list-user.jsp | 5 ++++- src/main/webapp/WEB-INF/parts/header.jsp | 9 ++++++--- src/main/webapp/assets/style.min.css | 12 ++++++++++++ 3 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 src/main/webapp/assets/style.min.css diff --git a/src/main/webapp/WEB-INF/list-user.jsp b/src/main/webapp/WEB-INF/list-user.jsp index dd52c55..43e94e3 100644 --- a/src/main/webapp/WEB-INF/list-user.jsp +++ b/src/main/webapp/WEB-INF/list-user.jsp @@ -1,5 +1,8 @@ <%@ page contentType="text/html;charset=UTF-8" language="java" %> -<%@include file="head.jsp"%> +<%@include file="parts/header.jsp"%> + + + ${user.login} diff --git a/src/main/webapp/WEB-INF/parts/header.jsp b/src/main/webapp/WEB-INF/parts/header.jsp index fcb4742..e92d7ec 100644 --- a/src/main/webapp/WEB-INF/parts/header.jsp +++ b/src/main/webapp/WEB-INF/parts/header.jsp @@ -8,6 +8,7 @@ <%@ page contentType="text/html;charset=UTF-8" language="java" %> +