From 4e05844dfcc2c5bda798cf3d43d1e70f95f01a00 Mon Sep 17 00:00:00 2001 From: Csaba79-coder Date: Thu, 1 Jun 2023 19:23:48 +0200 Subject: [PATCH 1/2] list users on thymeleaf --- .../littersnap/LitterSnapApplication.java | 8 +- .../model/user/service/UserService.java | 2 + .../littersnap/view/UserViewController.java | 8 ++ src/main/resources/static/style.css | 6 +- src/main/resources/templates/user.html | 99 +++++++++++++++++++ 5 files changed, 121 insertions(+), 2 deletions(-) create mode 100644 src/main/resources/templates/user.html diff --git a/src/main/java/com/csaba79coder/littersnap/LitterSnapApplication.java b/src/main/java/com/csaba79coder/littersnap/LitterSnapApplication.java index 4364c91..3b09fc3 100644 --- a/src/main/java/com/csaba79coder/littersnap/LitterSnapApplication.java +++ b/src/main/java/com/csaba79coder/littersnap/LitterSnapApplication.java @@ -1,13 +1,19 @@ package com.csaba79coder.littersnap; +import org.springframework.boot.ApplicationArguments; +import org.springframework.boot.ApplicationRunner; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication -public class LitterSnapApplication { +public class LitterSnapApplication implements ApplicationRunner { public static void main(String[] args) { SpringApplication.run(LitterSnapApplication.class, args); } + @Override + public void run(ApplicationArguments args) throws Exception { + + } } diff --git a/src/main/java/com/csaba79coder/littersnap/model/user/service/UserService.java b/src/main/java/com/csaba79coder/littersnap/model/user/service/UserService.java index 2ac4e62..3e9417d 100644 --- a/src/main/java/com/csaba79coder/littersnap/model/user/service/UserService.java +++ b/src/main/java/com/csaba79coder/littersnap/model/user/service/UserService.java @@ -15,6 +15,7 @@ import org.springframework.stereotype.Service; import java.time.LocalDateTime; +import java.util.Comparator; import java.util.List; import java.util.Objects; import java.util.UUID; @@ -38,6 +39,7 @@ public List findAllUsers() { return userRepository.findAll() .stream() .map(Mapper::mapUserEntityToModel) + .sorted(Comparator.comparing(UserModel::getFirstName)) .collect(Collectors.toList()); } diff --git a/src/main/java/com/csaba79coder/littersnap/view/UserViewController.java b/src/main/java/com/csaba79coder/littersnap/view/UserViewController.java index 8d47f7c..29b9411 100644 --- a/src/main/java/com/csaba79coder/littersnap/view/UserViewController.java +++ b/src/main/java/com/csaba79coder/littersnap/view/UserViewController.java @@ -3,6 +3,8 @@ import com.csaba79coder.littersnap.model.user.service.UserService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @Controller @@ -11,4 +13,10 @@ public class UserViewController { private final UserService userService; + + @GetMapping + public String renderAllUsers(Model model) { + model.addAttribute("users", userService.findAllUsers()); + return "user"; + } } \ No newline at end of file diff --git a/src/main/resources/static/style.css b/src/main/resources/static/style.css index 695437b..54c038d 100644 --- a/src/main/resources/static/style.css +++ b/src/main/resources/static/style.css @@ -97,5 +97,9 @@ body { /* }*/ /*}*/ - +caption { + caption-side: top; + text-align: center; + color: green; +} diff --git a/src/main/resources/templates/user.html b/src/main/resources/templates/user.html new file mode 100644 index 0000000..0e24f97 --- /dev/null +++ b/src/main/resources/templates/user.html @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + + Litter Snap Users + + + +
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Users of LitterSnap
Id Created At Created By Updated At Updated By Firstname Email Role
No Users Available
Id Created At Created By Updated At Updated By Firstname Email Role
+
+
+
+
+
+ +
+
+ +
+
+
+ Image +
+
+
+ + +
+
+ + + + + + + + + \ No newline at end of file From 38e7adf14448385500d7e8064effe8ebd9b3fc4f Mon Sep 17 00:00:00 2001 From: Csaba79-coder Date: Thu, 1 Jun 2023 21:09:02 +0200 Subject: [PATCH 2/2] update README.md --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 38eb631..874b264 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,6 @@ - Spring Boot Test - Spring Boot Starter Test - Spring Boot Test Autoconfigure -- JUnit 5 ## Basic setup