From 0e1176b44cf63ee3b87631a0e3b38f67e6c67c55 Mon Sep 17 00:00:00 2001 From: "Zed A. Shaw" Date: Tue, 17 Mar 2026 23:55:50 -0400 Subject: [PATCH] Moved admin to a feature. --- admin/init.go | 10 ---------- {admin/table => features/admin}/api.go | 2 +- {admin/table => features/admin}/db.go | 2 +- {admin/table => features/admin}/init.go | 2 +- admin/table/pages.go => features/admin/views.go | 5 +++-- features/init.go | 2 ++ main.go | 2 -- tests/{ => admin}/admin_test.go | 4 ++-- tests/{ => admin}/admin_ui_test.go | 2 +- views/admin/index.html | 8 ++++++++ 10 files changed, 19 insertions(+), 20 deletions(-) delete mode 100644 admin/init.go rename {admin/table => features/admin}/api.go (99%) rename {admin/table => features/admin}/db.go (99%) rename {admin/table => features/admin}/init.go (82%) rename admin/table/pages.go => features/admin/views.go (88%) rename tests/{ => admin}/admin_test.go (96%) rename tests/{ => admin}/admin_ui_test.go (96%) create mode 100644 views/admin/index.html diff --git a/admin/init.go b/admin/init.go deleted file mode 100644 index 0b1993d..0000000 --- a/admin/init.go +++ /dev/null @@ -1,10 +0,0 @@ -package admin - -import ( - "github.com/gofiber/fiber/v2" - "MY/webapp/admin/table" -) - -func Setup(app *fiber.App) { - admin_table.Setup(app) -} diff --git a/admin/table/api.go b/features/admin/api.go similarity index 99% rename from admin/table/api.go rename to features/admin/api.go index 331fcc3..27fefec 100644 --- a/admin/table/api.go +++ b/features/admin/api.go @@ -1,4 +1,4 @@ -package admin_table +package features_admin import ( "maps" diff --git a/admin/table/db.go b/features/admin/db.go similarity index 99% rename from admin/table/db.go rename to features/admin/db.go index fa3e305..3fb25b1 100644 --- a/admin/table/db.go +++ b/features/admin/db.go @@ -1,4 +1,4 @@ -package admin_table +package features_admin import ( "reflect" diff --git a/admin/table/init.go b/features/admin/init.go similarity index 82% rename from admin/table/init.go rename to features/admin/init.go index 760292a..a7b44ae 100644 --- a/admin/table/init.go +++ b/features/admin/init.go @@ -1,4 +1,4 @@ -package admin_table +package features_admin import ( "github.com/gofiber/fiber/v2" diff --git a/admin/table/pages.go b/features/admin/views.go similarity index 88% rename from admin/table/pages.go rename to features/admin/views.go index c4beb21..465a910 100644 --- a/admin/table/pages.go +++ b/features/admin/views.go @@ -1,4 +1,4 @@ -package admin_table +package features_admin import ( "github.com/gofiber/fiber/v2" @@ -36,7 +36,8 @@ func GetPageContent(c *fiber.Ctx) error { func SetupPages(app *fiber.App) { AddAuthedPage(app, true, "admin/table/", "admin/table/index") AddAuthedPage(app, true, "admin/table/new/:table/", "admin/table/new") + AddPage(app, "admin/", "admin/index") - app.Get("admin/table/:table/", GetPageContent) + app.Get("/admin/table/:table/", GetPageContent) app.Get("/admin/table/:table/:id/", GetPageSelectOne) } diff --git a/features/init.go b/features/init.go index a283162..c166307 100644 --- a/features/init.go +++ b/features/init.go @@ -6,6 +6,7 @@ import ( "MY/webapp/features/paypal" "MY/webapp/features/shopping" "MY/webapp/features/fakepay" + "MY/webapp/features/admin" ) func Setup(app *fiber.App) { @@ -13,4 +14,5 @@ func Setup(app *fiber.App) { features_paypal.Setup(app) features_shopping.Setup(app) features_fakepay.Setup(app) + features_admin.Setup(app) } diff --git a/main.go b/main.go index 5c9098b..abd4d65 100644 --- a/main.go +++ b/main.go @@ -16,7 +16,6 @@ import ( "MY/webapp/data" "MY/webapp/config" - "MY/webapp/admin" "MY/webapp/common" "MY/webapp/auth" "MY/webapp/features" @@ -50,7 +49,6 @@ func main() { data.Setup(config.Settings.Database.Driver, config.Settings.Database.Url) auth.Setup(app) - admin.Setup(app) features.Setup(app) // this sets up graceful shutdown diff --git a/tests/admin_test.go b/tests/admin/admin_test.go similarity index 96% rename from tests/admin_test.go rename to tests/admin/admin_test.go index 3deb552..5720e90 100644 --- a/tests/admin_test.go +++ b/tests/admin/admin_test.go @@ -1,4 +1,4 @@ -package tests +package tests_admin import ( "testing" @@ -7,7 +7,7 @@ import ( "reflect" "github.com/stretchr/testify/require" "MY/webapp/data" - admin "MY/webapp/admin/table" + admin "MY/webapp/features/admin" sq "github.com/Masterminds/squirrel" ) diff --git a/tests/admin_ui_test.go b/tests/admin/admin_ui_test.go similarity index 96% rename from tests/admin_ui_test.go rename to tests/admin/admin_ui_test.go index 674b1ff..197504d 100644 --- a/tests/admin_ui_test.go +++ b/tests/admin/admin_ui_test.go @@ -1,4 +1,4 @@ -package tests +package tests_admin import ( "testing" diff --git a/views/admin/index.html b/views/admin/index.html new file mode 100644 index 0000000..17fe39a --- /dev/null +++ b/views/admin/index.html @@ -0,0 +1,8 @@ +

Admin

+ +

You have to be logged in:

+ +
    +
  1. Admin the Database
  2. +
  3. Your Admin Here
  4. +