From f5fdb731605bbca74c13c2f320c9e6ba5c4fbc54 Mon Sep 17 00:00:00 2001 From: Francesco Date: Sat, 30 Sep 2023 10:21:49 +0200 Subject: [PATCH] WIP --- .../controller/DefaultDbAdminController.java | 20 +++++++- src/main/resources/templates/about.html | 23 +++++++++ .../templates/fragments/resources.html | 5 +- src/main/resources/templates/logs.html | 13 ++--- .../templates/settings/appearance.html | 50 +++++++++++++++++++ .../templates/{ => settings}/settings.html | 8 +-- 6 files changed, 104 insertions(+), 15 deletions(-) create mode 100644 src/main/resources/templates/about.html create mode 100644 src/main/resources/templates/settings/appearance.html rename src/main/resources/templates/{ => settings}/settings.html (89%) diff --git a/src/main/java/tech/ailef/dbadmin/external/controller/DefaultDbAdminController.java b/src/main/java/tech/ailef/dbadmin/external/controller/DefaultDbAdminController.java index a0d741e..dbeb90f 100644 --- a/src/main/java/tech/ailef/dbadmin/external/controller/DefaultDbAdminController.java +++ b/src/main/java/tech/ailef/dbadmin/external/controller/DefaultDbAdminController.java @@ -453,16 +453,32 @@ public class DefaultDbAdminController { @GetMapping("/settings") public String settings(Model model) { model.addAttribute("activePage", "settings"); - return "settings"; + return "settings/settings"; + } + + @GetMapping("/about") + public String about(Model model) { + model.addAttribute("activePage", "about"); + return "about"; + } + + @GetMapping("/settings/appearance") + public String settingsAppearance(Model model) { + model.addAttribute("activePage", "settings"); + return "settings/appearance"; } @PostMapping("/settings") public String settings(@RequestParam Map params, Model model) { + String next = params.getOrDefault("next", "settings/settings"); + for (String paramName : params.keySet()) { + if (paramName.equals("next")) continue; + userSettingsRepo.save(new UserSetting(paramName, params.get(paramName))); } model.addAttribute("activePage", "settings"); - return "settings"; + return next; } private UserAction saveAction(UserAction action) { diff --git a/src/main/resources/templates/about.html b/src/main/resources/templates/about.html new file mode 100644 index 0000000..774b570 --- /dev/null +++ b/src/main/resources/templates/about.html @@ -0,0 +1,23 @@ + + + + + +
+ +
+
+
+

Entities

+
+
+
+

About

+
+
+
+
+
+
+ + diff --git a/src/main/resources/templates/fragments/resources.html b/src/main/resources/templates/fragments/resources.html index 293640a..84d8c1e 100644 --- a/src/main/resources/templates/fragments/resources.html +++ b/src/main/resources/templates/fragments/resources.html @@ -16,6 +16,9 @@ + @@ -111,7 +114,7 @@