Calendar Popup fix, enabled Cache

Author: JadnK

src/main/java/de/jadenk/springcloud/controller/CalendarController.java

@@ -78,7 +78,30 @@ public String viewCalendar(@RequestParam(defaultValue = "#{T(java.time.Year).now
         return "calendar";
     }
 
-
+    @PostMapping("/toggle-visibility")
+    public String toggleVisibility(@RequestParam Long id) {
+        Optional<CalendarEntry> entryOpt = entryRepo.findById(id);
+        if (entryOpt.isPresent()) {
+            CalendarEntry entry = entryOpt.get();
+            User currentUser = getCurrentUser();
+
+            boolean isCreator = entry.getUser().equals(currentUser);
+            boolean isAdmin = SecurityContextHolder.getContext().getAuthentication()
+                    .getAuthorities().stream()
+                    .anyMatch(auth -> auth.getAuthority().endsWith("ADMIN"));
+
+            if (isCreator || isAdmin) {
+                if (entry.getVisibility() == CalendarEntry.Visibility.PUBLIC) {
+                    entry.setVisibility(CalendarEntry.Visibility.PRIVATE);
+                } else {
+                    entry.setVisibility(CalendarEntry.Visibility.PUBLIC);
+                }
+                entryRepo.save(entry);
+            }
+        }
+        // zurück zum Kalender (aktuelles Jahr/Monat)
+        return "redirect:/calendar";
+    }
 
     @GetMapping("/entry/{id}")
     @ResponseBody

src/main/java/de/jadenk/springcloud/service/VersionService.java

@@ -4,7 +4,7 @@
 
 @Service
 public class VersionService {
-    private final String currentVersion = "2.2";
+    private final String currentVersion = "3.0";
 
     public String getCurrentVersion() {
         return currentVersion;

src/main/resources/application.properties

@@ -5,8 +5,11 @@ spring.datasource.username=${SPRING_DATASOURCE_USERNAME}
 spring.datasource.password=${SPRING_DATASOURCE_PASSWORD}
 spring.datasource.driver-class-name=org.mariadb.jdbc.Driver
 
-#logging.level.org.springframework.security=DEBUG
+logging.level.org.springframework=INFO
+logging.level.org.hibernate.SQL=WARN
+logging.level.org.hibernate.type.descriptor.sql.BasicBinder=ERROR
 spring.thymeleaf.extras.springsecurity.enabled=true
+spring.thymeleaf.cache=true
 
 
 spring.servlet.multipart.enabled=true

src/main/resources/templates/calendar.html

@@ -142,7 +142,9 @@ <h2 class="text-2xl font-bold text-[var(--color-primary)] text-center mb-2">New
     </div>
 </div>
 
-<div id="viewModal" class="modal hidden fixed inset-0 z-50 flex items-center justify-center bg-[rgba(15,15,30,0.9)]"></div>
+<div id="viewModal" class="hidden popup-overlay">
+
+</div>
 
 
 <!-- Scripts -->

src/main/resources/templates/fragments/modal.html

@@ -1,23 +1,34 @@
-<div class="modal-content" th:fragment="modal-content">
-    <h2 th:text="${entry.title}">Entry</h2>
-    <p th:text="${entry.description}"></p>
-    <p><strong>Creator:</strong> <span th:text="${entry.user.username}"></span></p>
-    <p><strong>Time:</strong> <span th:text="${entry.time}"></span></p>
-    <p><strong>Date:</strong> <span th:text="${entry.date}"></span></p>
-    <p><strong>Visibility:</strong> <span th:text="${entry.visibility}"></span></p>
+<div class="popup-container" th:fragment="modal-content">
+    <!-- Titel -->
+    <h2 class="text-xl font-bold text-[var(--color-primary)] mb-4" th:text="${entry.title}">Entry</h2>
 
-    <div class="button-row" th:if="${canEdit}">
-        <form method="post" th:action="@{/calendar/toggle-visibility}">
+    <!-- Details -->
+    <p class="mb-2 text-[var(--color-text-light)]" th:text="${entry.description}">Description</p>
+    <p class="mb-1"><strong>Creator:</strong> <span th:text="${entry.user.username}">User</span></p>
+    <p class="mb-1"><strong>Time:</strong> <span th:text="${entry.time}">12:00</span></p>
+    <p class="mb-1"><strong>Date:</strong> <span th:text="${entry.date}">01.01.2025</span></p>
+    <p class="mb-4"><strong>Visibility:</strong> <span th:text="${entry.visibility}">PUBLIC</span></p>
+
+    <!-- Buttons nur wenn editierbar -->
+    <div class="flex gap-2 mb-3" th:if="${canEdit}">
+        <form method="post" th:action="@{/calendar/toggle-visibility}" class="flex-1">
             <input type="hidden" name="id" th:value="${entry.id}">
-            <button type="submit">Change Visibility</button>
+            <button type="submit" class="w-full py-2 bg-blue-600 text-white rounded hover:bg-blue-700 transition">
+                Change Visibility
+            </button>
         </form>
 
-        <form method="get" th:action="@{'/calendar/delete/' + ${entry.id}}">
-            <button type="submit">Delete</button>
+        <form method="get" th:action="@{'/calendar/delete/' + ${entry.id}}" class="flex-1">
+            <button type="submit" class="w-full py-2 bg-red-600 text-white rounded hover:bg-red-700 transition">
+                Delete
+            </button>
         </form>
+        <input type="hidden" name="id" th:value="${entry.id}">
     </div>
 
-    <div class="button-row">
-        <button onclick="closeModal('viewModal')" class="close-btn">Close</button>
-    </div>
+    <!-- Close -->
+    <button onclick="closeModal('viewModal')"
+            class="w-full py-2 bg-gray-600 text-white rounded hover:bg-gray-700 transition">
+        Close
+    </button>
 </div>