From 3f7f60dd279db344242ba1f69edfb78f5bb03293 Mon Sep 17 00:00:00 2001 From: Francesco Date: Fri, 24 Nov 2023 16:39:54 +0100 Subject: [PATCH] Moving templates in subfolder (#40) --- .../external/controller/GlobalController.java | 4 +-- .../controller/SnapAdminController.java | 26 +++++++++---------- .../templates/{ => snapadmin}/console.html | 0 .../{ => snapadmin}/fragments/data_row.html | 0 .../{ => snapadmin}/fragments/forms.html | 0 .../fragments/generic_data_row.html | 0 .../fragments/generic_table.html | 0 .../{ => snapadmin}/fragments/inputs.html | 0 .../{ => snapadmin}/fragments/resources.html | 0 .../fragments/search_inputs.html | 0 .../{ => snapadmin}/fragments/table.html | 0 .../fragments/table_selectable.html | 0 .../templates/{ => snapadmin}/help.html | 0 .../templates/{ => snapadmin}/home.html | 0 .../templates/{ => snapadmin}/logs.html | 0 .../{ => snapadmin}/model/create.html | 0 .../templates/{ => snapadmin}/model/list.html | 0 .../{ => snapadmin}/model/schema.html | 0 .../templates/{ => snapadmin}/model/show.html | 0 .../{ => snapadmin}/other/error.html | 0 .../{ => snapadmin}/settings/appearance.html | 0 .../{ => snapadmin}/settings/settings.html | 0 22 files changed, 15 insertions(+), 15 deletions(-) rename src/main/resources/templates/{ => snapadmin}/console.html (100%) rename src/main/resources/templates/{ => snapadmin}/fragments/data_row.html (100%) rename src/main/resources/templates/{ => snapadmin}/fragments/forms.html (100%) rename src/main/resources/templates/{ => snapadmin}/fragments/generic_data_row.html (100%) rename src/main/resources/templates/{ => snapadmin}/fragments/generic_table.html (100%) rename src/main/resources/templates/{ => snapadmin}/fragments/inputs.html (100%) rename src/main/resources/templates/{ => snapadmin}/fragments/resources.html (100%) rename src/main/resources/templates/{ => snapadmin}/fragments/search_inputs.html (100%) rename src/main/resources/templates/{ => snapadmin}/fragments/table.html (100%) rename src/main/resources/templates/{ => snapadmin}/fragments/table_selectable.html (100%) rename src/main/resources/templates/{ => snapadmin}/help.html (100%) rename src/main/resources/templates/{ => snapadmin}/home.html (100%) rename src/main/resources/templates/{ => snapadmin}/logs.html (100%) rename src/main/resources/templates/{ => snapadmin}/model/create.html (100%) rename src/main/resources/templates/{ => snapadmin}/model/list.html (100%) rename src/main/resources/templates/{ => snapadmin}/model/schema.html (100%) rename src/main/resources/templates/{ => snapadmin}/model/show.html (100%) rename src/main/resources/templates/{ => snapadmin}/other/error.html (100%) rename src/main/resources/templates/{ => snapadmin}/settings/appearance.html (100%) rename src/main/resources/templates/{ => snapadmin}/settings/settings.html (100%) diff --git a/src/main/java/tech/ailef/snapadmin/external/controller/GlobalController.java b/src/main/java/tech/ailef/snapadmin/external/controller/GlobalController.java index 26422f0..f50d988 100644 --- a/src/main/java/tech/ailef/snapadmin/external/controller/GlobalController.java +++ b/src/main/java/tech/ailef/snapadmin/external/controller/GlobalController.java @@ -61,7 +61,7 @@ public class GlobalController { model.addAttribute("snapadmin_baseUrl", getBaseUrl()); model.addAttribute("snapadmin_version", snapAdmin.getVersion()); model.addAttribute("snapadmin_properties", props); - return "other/error"; + return "snapadmin/other/error"; } @ExceptionHandler(SnapAdminNotFoundException.class) @@ -74,7 +74,7 @@ public class GlobalController { model.addAttribute("snapadmin_version", snapAdmin.getVersion()); model.addAttribute("snapadmin_properties", props); response.setStatus(404); - return "other/error"; + return "snapadmin/other/error"; } @ModelAttribute("snapadmin_version") diff --git a/src/main/java/tech/ailef/snapadmin/external/controller/SnapAdminController.java b/src/main/java/tech/ailef/snapadmin/external/controller/SnapAdminController.java index 4360228..254b26b 100644 --- a/src/main/java/tech/ailef/snapadmin/external/controller/SnapAdminController.java +++ b/src/main/java/tech/ailef/snapadmin/external/controller/SnapAdminController.java @@ -134,7 +134,7 @@ public class SnapAdminController { model.addAttribute("activePage", "entities"); model.addAttribute("title", "Entities | Index"); - return "home"; + return "snapadmin/home"; } /** @@ -222,7 +222,7 @@ public class SnapAdminController { model.addAttribute("query", query); model.addAttribute("sortOrder", sortOrder); model.addAttribute("activeFilters", queryFilters); - return "model/list"; + return "snapadmin/model/list"; } catch (InvalidPageException e) { return "redirect:/" + properties.getBaseUrl() + "/model/" + className; @@ -235,7 +235,7 @@ public class SnapAdminController { model.addAttribute("query", query); model.addAttribute("sortOrder", sortOrder); model.addAttribute("activeFilters", queryFilters); - return "model/list"; + return "snapadmin/model/list"; } } @@ -252,7 +252,7 @@ public class SnapAdminController { model.addAttribute("activePage", "entities"); model.addAttribute("schema", schema); - return "model/schema"; + return "snapadmin/model/schema"; } /** @@ -279,7 +279,7 @@ public class SnapAdminController { model.addAttribute("activePage", "entities"); model.addAttribute("schema", schema); - return "model/show"; + return "snapadmin/model/show"; } @@ -299,7 +299,7 @@ public class SnapAdminController { model.addAttribute("activePage", "entities"); model.addAttribute("create", true); - return "model/create"; + return "snapadmin/model/create"; } @GetMapping("/model/{className}/edit/{id}") @@ -327,7 +327,7 @@ public class SnapAdminController { model.addAttribute("activePage", "entities"); model.addAttribute("create", false); - return "model/create"; + return "snapadmin/model/create"; } @PostMapping(value="/model/{className}/delete/{id}") @@ -543,7 +543,7 @@ public class SnapAdminController { model.addAttribute("title", "Action logs"); model.addAttribute("schemas", snapAdmin.getSchemas()); model.addAttribute("searchRequest", searchRequest); - return "logs"; + return "snapadmin/logs"; } @@ -551,14 +551,14 @@ public class SnapAdminController { public String settings(Model model) { model.addAttribute("title", "Settings"); model.addAttribute("activePage", "settings"); - return "settings/settings"; + return "snapadmin/settings/settings"; } @GetMapping("/help") public String help(Model model) { model.addAttribute("title", "Help"); model.addAttribute("activePage", "help"); - return "help"; + return "snapadmin/help"; } @GetMapping("/console/new") @@ -664,14 +664,14 @@ public class SnapAdminController { model.addAttribute("title", "SQL Console | " + activeQuery.getTitle()); double elapsedTime = (System.currentTimeMillis() - startTime) / 1000.0; model.addAttribute("elapsedTime", new DecimalFormat("0.0#").format(elapsedTime)); - return "console"; + return "snapadmin/console"; } @GetMapping("/settings/appearance") public String settingsAppearance(Model model) { model.addAttribute("activePage", "settings"); - return "settings/appearance"; + return "snapadmin/settings/appearance"; } @GetMapping("/forbidden") @@ -679,7 +679,7 @@ public class SnapAdminController { model.addAttribute("error", "Forbidden"); model.addAttribute("status", "403"); model.addAttribute("message", "You don't have the privileges to perform this action"); - return "other/error"; + return "snapadmin/other/error"; } @PostMapping("/settings") diff --git a/src/main/resources/templates/console.html b/src/main/resources/templates/snapadmin/console.html similarity index 100% rename from src/main/resources/templates/console.html rename to src/main/resources/templates/snapadmin/console.html diff --git a/src/main/resources/templates/fragments/data_row.html b/src/main/resources/templates/snapadmin/fragments/data_row.html similarity index 100% rename from src/main/resources/templates/fragments/data_row.html rename to src/main/resources/templates/snapadmin/fragments/data_row.html diff --git a/src/main/resources/templates/fragments/forms.html b/src/main/resources/templates/snapadmin/fragments/forms.html similarity index 100% rename from src/main/resources/templates/fragments/forms.html rename to src/main/resources/templates/snapadmin/fragments/forms.html diff --git a/src/main/resources/templates/fragments/generic_data_row.html b/src/main/resources/templates/snapadmin/fragments/generic_data_row.html similarity index 100% rename from src/main/resources/templates/fragments/generic_data_row.html rename to src/main/resources/templates/snapadmin/fragments/generic_data_row.html diff --git a/src/main/resources/templates/fragments/generic_table.html b/src/main/resources/templates/snapadmin/fragments/generic_table.html similarity index 100% rename from src/main/resources/templates/fragments/generic_table.html rename to src/main/resources/templates/snapadmin/fragments/generic_table.html diff --git a/src/main/resources/templates/fragments/inputs.html b/src/main/resources/templates/snapadmin/fragments/inputs.html similarity index 100% rename from src/main/resources/templates/fragments/inputs.html rename to src/main/resources/templates/snapadmin/fragments/inputs.html diff --git a/src/main/resources/templates/fragments/resources.html b/src/main/resources/templates/snapadmin/fragments/resources.html similarity index 100% rename from src/main/resources/templates/fragments/resources.html rename to src/main/resources/templates/snapadmin/fragments/resources.html diff --git a/src/main/resources/templates/fragments/search_inputs.html b/src/main/resources/templates/snapadmin/fragments/search_inputs.html similarity index 100% rename from src/main/resources/templates/fragments/search_inputs.html rename to src/main/resources/templates/snapadmin/fragments/search_inputs.html diff --git a/src/main/resources/templates/fragments/table.html b/src/main/resources/templates/snapadmin/fragments/table.html similarity index 100% rename from src/main/resources/templates/fragments/table.html rename to src/main/resources/templates/snapadmin/fragments/table.html diff --git a/src/main/resources/templates/fragments/table_selectable.html b/src/main/resources/templates/snapadmin/fragments/table_selectable.html similarity index 100% rename from src/main/resources/templates/fragments/table_selectable.html rename to src/main/resources/templates/snapadmin/fragments/table_selectable.html diff --git a/src/main/resources/templates/help.html b/src/main/resources/templates/snapadmin/help.html similarity index 100% rename from src/main/resources/templates/help.html rename to src/main/resources/templates/snapadmin/help.html diff --git a/src/main/resources/templates/home.html b/src/main/resources/templates/snapadmin/home.html similarity index 100% rename from src/main/resources/templates/home.html rename to src/main/resources/templates/snapadmin/home.html diff --git a/src/main/resources/templates/logs.html b/src/main/resources/templates/snapadmin/logs.html similarity index 100% rename from src/main/resources/templates/logs.html rename to src/main/resources/templates/snapadmin/logs.html diff --git a/src/main/resources/templates/model/create.html b/src/main/resources/templates/snapadmin/model/create.html similarity index 100% rename from src/main/resources/templates/model/create.html rename to src/main/resources/templates/snapadmin/model/create.html diff --git a/src/main/resources/templates/model/list.html b/src/main/resources/templates/snapadmin/model/list.html similarity index 100% rename from src/main/resources/templates/model/list.html rename to src/main/resources/templates/snapadmin/model/list.html diff --git a/src/main/resources/templates/model/schema.html b/src/main/resources/templates/snapadmin/model/schema.html similarity index 100% rename from src/main/resources/templates/model/schema.html rename to src/main/resources/templates/snapadmin/model/schema.html diff --git a/src/main/resources/templates/model/show.html b/src/main/resources/templates/snapadmin/model/show.html similarity index 100% rename from src/main/resources/templates/model/show.html rename to src/main/resources/templates/snapadmin/model/show.html diff --git a/src/main/resources/templates/other/error.html b/src/main/resources/templates/snapadmin/other/error.html similarity index 100% rename from src/main/resources/templates/other/error.html rename to src/main/resources/templates/snapadmin/other/error.html diff --git a/src/main/resources/templates/settings/appearance.html b/src/main/resources/templates/snapadmin/settings/appearance.html similarity index 100% rename from src/main/resources/templates/settings/appearance.html rename to src/main/resources/templates/snapadmin/settings/appearance.html diff --git a/src/main/resources/templates/settings/settings.html b/src/main/resources/templates/snapadmin/settings/settings.html similarity index 100% rename from src/main/resources/templates/settings/settings.html rename to src/main/resources/templates/snapadmin/settings/settings.html