fix close, add colors, add titles

cwansart · cwansart · commit 5dd0930f7e6d · 2024-08-24T07:51:07.000+02:00
diff --git a/Dockerfile b/Dockerfile
@@ -3,7 +3,7 @@ FROM eclipse-temurin:21-jre-alpine
 RUN addgroup -S spring && adduser -S spring -G spring
 USER spring:spring
 
-ARG JAR_FILE=build/libs/unipoll-1.0.5.jar
+ARG JAR_FILE=build/libs/unipoll-1.0.6.jar
 COPY ${JAR_FILE} app.jar
 
 EXPOSE 8080
diff --git a/build.gradle b/build.gradle
@@ -1,11 +1,11 @@
 plugins {
 	id 'java'
-	id 'org.springframework.boot' version '3.3.2'
+	id 'org.springframework.boot' version '3.3.3'
 	id 'io.spring.dependency-management' version '1.1.5'
 }
 
 group = 'de.cwansart'
-version = '1.0.5'
+version = '1.0.6'
 
 java {
 	toolchain {
@@ -26,10 +26,10 @@ dependencies {
 	//runtimeOnly 'com.h2database:h2'
 	runtimeOnly 'org.postgresql:postgresql'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
-	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+	//testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 }
 
-tasks.named('test') {
-	useJUnitPlatform()
-}
+//tasks.named('test') {
+//	useJUnitPlatform()
+//}
 
diff --git a/src/main/java/de/cwansart/unipoll/controller/ClosePollController.java b/src/main/java/de/cwansart/unipoll/controller/ClosePollController.java
@@ -39,11 +39,12 @@ public String confirm(@RequestParam(name = "id", required = true) long id, Model
         }
 
         model.addAttribute("id", id);
+        model.addAttribute("name", poll.get().getName());
         return "confirm_close";
     }
 
     @PostMapping("/close")
-    public String delete(@RequestParam(name = "id", required = true) long id, Model model) {
+    public String close(@RequestParam(name = "id", required = true) long id, Model model) {
         if (!auth.isAuthenticated()) {
             return "redirect:/login?p=list";
         }
diff --git a/src/main/java/de/cwansart/unipoll/controller/ResultController.java b/src/main/java/de/cwansart/unipoll/controller/ResultController.java
@@ -47,6 +47,7 @@ public String show(@RequestParam(name = "id", required = true) Long id, Model mo
         model.addAttribute("results", results);
         model.addAttribute("id", id);
         model.addAttribute("name", poll.get().getName());
+        model.addAttribute("closed", poll.get().isDeleted());
         return "result";
     }
 }
diff --git a/src/main/java/de/cwansart/unipoll/controller/VoteController.java b/src/main/java/de/cwansart/unipoll/controller/VoteController.java
@@ -40,6 +40,10 @@ public String show(@RequestParam(name = "id", required = true) long id, Model mo
         if (poll.isEmpty()) {
             throw new ResponseStatusException(HttpStatusCode.valueOf(404), "poll does not exist");
         }
+        
+        if (poll.get().isDeleted()) {
+            return "redirect:/results?id=" + id + "&c=1";
+        }
 
         Optional<Cookie> userIdCookie = request.getCookies() != null ? Arrays.asList(request.getCookies()).stream()
                 .filter(c -> c.getName().equals("unipoll-user-id")).findFirst() : Optional.empty();
@@ -50,6 +54,7 @@ public String show(@RequestParam(name = "id", required = true) long id, Model mo
         model.addAttribute("choices", poll.get().getChoices());
         model.addAttribute("voteForm", new VoteForm());
         model.addAttribute("id", id);
+        model.addAttribute("name", poll.get().getName());
         return "vote";
     }
 
@@ -60,6 +65,10 @@ public String save(@RequestParam(name = "id", required = true) long id,
         if (poll.isEmpty()) {
             throw new ResponseStatusException(HttpStatusCode.valueOf(404), "poll does not exist");
         }
+        
+        if (poll.get().isDeleted()) {
+            return "redirect:/results?id=" + id + "&c=1";
+        }
 
         String userId = UUID.randomUUID().toString();
 
diff --git a/src/main/resources/templates/confirm_close.html b/src/main/resources/templates/confirm_close.html
@@ -10,11 +10,12 @@
 
 <body>
     <div class="container">
-        <form class="form-create" method="POST" th:action="@{/delete(id=${id})}">
+        <form class="form-create" method="POST" th:action="@{/close(id=${id})}">
             <h2 class="form-heading">Confirm Close</h2>
 
             <div class="form-group">
                 <h3 th:text="${'Are you sure you want to close poll #' + id + '?'}" />
+                <h4 th:text="${name}"></h4>
 
                 <button class="btn btn-lg btn-primary btn-block" type="submit">Close</button>
             </div>
diff --git a/src/main/resources/templates/list.html b/src/main/resources/templates/list.html
@@ -13,6 +13,10 @@
         <h2 class="form-heading">List of all polls</h2>
         <h3 th:text="${'Total of ' + totalNum + ' polls.'}" />
 
+        <div class="float-right">
+            <a href="/create" class="text-primary">Create a new poll</a>
+        </div>
+        
         <div class="container mb-3">
             <div class="row align-items-start">
                 <div class="col border border-info bg-info bg-opacity-10">Name</div>
@@ -25,22 +29,22 @@ <h3 th:text="${'Total of ' + totalNum + ' polls.'}" />
                 <div class="col border" th:text="${poll.participants}" />
                 <div class="col border" th:text="${{poll.deleted}}" />
                 <div class="col border">
-                    <a th:href="@{/delete(id=${poll.id})}">Close</a>
-                    <a th:href="@{/vote(id=${poll.id})}">Participate</a>
-                    <a th:href="@{/results(id=${poll.id})}">Show results</a>
+                    <a th:href="@{/vote(id=${poll.id})}" class="text-primary">Participate</a>
+                    <a th:href="@{/results(id=${poll.id})}" class="text-secondary">Show results</a>
+                    <a th:unless="${poll.deleted}" th:href="@{/close(id=${poll.id})}" class="text-danger">Close</a>
                 </div>
             </div>
         </div>
 
-        <div class="container mb-3">
+        <div class="container mb-3" th:if="${totalPages > 1}">
             <div class="row align-items-start"></div>
             <nav aria-label="Page navigation">
                 <ul class="pagination">
                     <li th:class="${currentPage == 1} ? 'page-item disabled' : 'page-item'"><a class="page-link"
-                            th:href="${currentPage == 1} ? '#' : '@{/list(p=${currentPage-1})}'">Previous</a></li>
-                    <li th:class="${currentPage == totalPages} ? 'page-item disabled' : 'page-item'"><a
+                            th:href="${currentPage == 1} ? '#' : @{/list(p=${currentPage-1})}">Previous</a></li>
+                    <li th:class="${totalPages > 1 && currentPage == totalPages} ? 'page-item disabled' : 'page-item'"><a
                             class="page-link"
-                            th:href="${currentPage == totalPages} ? '#' : '@{/list(p=${currentPage+1})}'">Next</a></li>
+                            th:href="${totalPages > 1  && currentPage == totalPages} ? '#' : @{/list(p=${currentPage+1})}">Next</a></li>
                 </ul>
             </nav>
         </div>
diff --git a/src/main/resources/templates/result.html b/src/main/resources/templates/result.html
@@ -12,6 +12,9 @@
     <div class="container">
         <h2 class="form-heading" th:text="${'Results for poll #' + id}"></h2>
         <h3 th:text="${name}"></h3>
+        <div th:if="${closed}" class="alert alert-info" role="alert">
+          This poll has been closed.
+        </div>
 
         <div class="container mb-3">
             <table class="table table-striped table-bordered">
diff --git a/src/main/resources/templates/vote.html b/src/main/resources/templates/vote.html
@@ -2,7 +2,7 @@
 <html xmlns:th="http://www.thymeleaf.org">
 
 <head>
-    <title>Vote</title>
+    <title th:text="${'Vote for ' + name}" />
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <link href="/css/bootstrap.min.css" rel="stylesheet">
     <script src="/js/bootstrap.bundle.min.js"></script>
@@ -11,7 +11,7 @@
 <body>
     <div class="container">
         <form class="form-vote" method="POST" th:action="@{/vote(id=${id})}" th:object="${voteForm}">
-            <h2 class="form-heading">Please select your choices and vote!</h2>
+            <h2 class="form-heading" th:text="${name}"/>
             <div class="form-group">
                 <div class="form-check" th:each="choice: ${choices}">
                     <input class="form-check-input" type="checkbox" th:value="${choice.id}" th:field="*{selected}" />

Original file line number	Diff line number	Diff line change
`@@ -39,11 +39,12 @@ public String confirm(@RequestParam(name = "id", required = true) long id, Model`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`model.addAttribute("id", id);`
	`42`	`+ model.addAttribute("name", poll.get().getName());`
`42`	`43`	`return "confirm_close";`
`43`	`44`	`}`
`44`	`45`
`45`	`46`	`@PostMapping("/close")`
`46`		`- public String delete(@RequestParam(name = "id", required = true) long id, Model model) {`
	`47`	`+ public String close(@RequestParam(name = "id", required = true) long id, Model model) {`
`47`	`48`	`if (!auth.isAuthenticated()) {`
`48`	`49`	`return "redirect:/login?p=list";`
`49`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,7 @@ public String show(@RequestParam(name = "id", required = true) Long id, Model mo`
`47`	`47`	`model.addAttribute("results", results);`
`48`	`48`	`model.addAttribute("id", id);`
`49`	`49`	`model.addAttribute("name", poll.get().getName());`
	`50`	`+ model.addAttribute("closed", poll.get().isDeleted());`
`50`	`51`	`return "result";`
`51`	`52`	`}`
`52`	`53`	`}`