From 2249b1bd56a897ebf092e0f4ae7446124d1576b1 Mon Sep 17 00:00:00 2001
From: Rostislav Raykov <rostislav.raykov@infinno.eu>
Date: Sun, 8 Dec 2024 17:14:39 +0200
Subject: [PATCH] fix

---
 .../controller/AdminViewController.java       | 20 +++++++++----------
 src/main/resources/templates/dashboard.html   |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/main/java/org/rostislav/quickdrop/controller/AdminViewController.java b/src/main/java/org/rostislav/quickdrop/controller/AdminViewController.java
index c8efc4c..6412402 100644
--- a/src/main/java/org/rostislav/quickdrop/controller/AdminViewController.java
+++ b/src/main/java/org/rostislav/quickdrop/controller/AdminViewController.java
@@ -37,7 +37,7 @@ public class AdminViewController {
     @GetMapping("/dashboard")
     public String getDashboardPage(Model model, HttpServletRequest request) {
         if (!applicationSettingsService.checkForAdminPassword(request)) {
-            return "redirect:/admin/password";
+            return "redirect:password";
         }
 
         List<FileEntityView> files = fileService.getAllFilesWithDownloadCounts();
@@ -52,7 +52,7 @@ public class AdminViewController {
     @GetMapping("/setup")
     public String showSetupPage() {
         if (applicationSettingsService.isAdminPasswordSet()) {
-            return "redirect:/admin/dashboard";
+            return "redirect:dashboard";
         }
         return "welcome";
     }
@@ -60,13 +60,13 @@ public class AdminViewController {
     @PostMapping("/setup")
     public String setAdminPassword(String adminPassword) {
         applicationSettingsService.setAdminPassword(adminPassword);
-        return "redirect:/admin/dashboard";
+        return "redirect:dashboard";
     }
 
     @GetMapping("/settings")
     public String getSettingsPage(Model model, HttpServletRequest request) {
         if (!applicationSettingsService.checkForAdminPassword(request)) {
-            return "redirect:/admin/password";
+            return "redirect:password";
         }
 
         ApplicationSettingsEntity settings = applicationSettingsService.getApplicationSettings();
@@ -75,19 +75,19 @@ public class AdminViewController {
         applicationSettingsViewModel.setMaxFileSize(bytesToMegabytes(settings.getMaxFileSize()));
 
         model.addAttribute("settings", applicationSettingsViewModel);
-        return "admin/settings";
+        return "settings";
     }
 
     @PostMapping("/save")
     public String saveSettings(ApplicationSettingsViewModel settings, HttpServletRequest request) {
         if (!applicationSettingsService.checkForAdminPassword(request)) {
-            return "redirect:/admin/password";
+            return "redirect:password";
         }
         settings.setMaxFileSize(megabytesToBytes(settings.getMaxFileSize()));
 
 
         applicationSettingsService.updateApplicationSettings(settings, settings.getAppPassword());
-        return "redirect:/admin/dashboard";
+        return "redirect:dashboard";
     }
 
     @PostMapping("/password")
@@ -95,14 +95,14 @@ public class AdminViewController {
         String adminPasswordHash = applicationSettingsService.getAdminPasswordHash();
         if (BCrypt.checkpw(password, adminPasswordHash)) {
             request.getSession().setAttribute("adminPassword", adminPasswordHash);
-            return "redirect:/admin/dashboard";
+            return "redirect:dashboard";
         } else {
-            return "redirect:/admin/password";
+            return "redirect:password";
         }
     }
 
     @GetMapping("/password")
     public String showAdminPasswordPage() {
-        return "/admin-password";
+        return "admin-password";
     }
 }
diff --git a/src/main/resources/templates/dashboard.html b/src/main/resources/templates/dashboard.html
index b9fd9bd..d14fcc8 100644
--- a/src/main/resources/templates/dashboard.html
+++ b/src/main/resources/templates/dashboard.html
@@ -24,7 +24,7 @@
                     <a class="nav-link" href="/admin/settings">Settings</a>
                 </li>
                 <li class="nav-item">
-                    <a class="nav-link" href="/static">Home</a>
+                    <a class="nav-link" href="/">Home</a>
                 </li>
             </ul>
         </div>