From 7ead1ffe22edf34bdee3b6353c9d896bb29eeb31 Mon Sep 17 00:00:00 2001
From: Niko Abeler <niko@rerere.org>
Date: Thu, 27 Jul 2023 21:18:09 +0200
Subject: [PATCH] restructure admin area

---
 render/templates/views/admin.tmpl             | 22 ++++++++--
 render/templates/views/admin_config.tmpl      |  4 +-
 render/templates/views/editor.tmpl            |  2 +-
 render/templates/views/editor_list.tmpl       | 24 -----------
 render/templates/views/site_config.tmpl       | 11 +----
 render/templates/views/site_config_list.tmpl  | 11 +----
 render/templates/views/site_config_me.tmpl    | 11 +----
 render/templates/views/site_config_menus.tmpl | 11 +----
 web/admin_handler.go                          | 36 +++++++++++++++-
 web/app.go                                    |  4 +-
 web/editor_list_handler.go                    | 41 -------------------
 11 files changed, 61 insertions(+), 116 deletions(-)
 delete mode 100644 render/templates/views/editor_list.tmpl
 delete mode 100644 web/editor_list_handler.go

diff --git a/render/templates/views/admin.tmpl b/render/templates/views/admin.tmpl
index 439ea17..a7fdb81 100644
--- a/render/templates/views/admin.tmpl
+++ b/render/templates/views/admin.tmpl
@@ -1,9 +1,25 @@
 {{define "title"}}Admin{{end}}
 
 {{define "main"}}
+<h2>Write</h2>
+
 <ul>
-    {{ range . }}
-        <li><a href="/admin/config/{{.Name}}">{{.Name}}</a></li>
-    {{ end }}
+    {{range .Types}}
+    <li><a href="/editor/new/{{.}}/">{{.}}</a></li>
+    {{end}}
+</ul>
+
+<h2>Configurations</h2>
+<ul>
+    <li><a href="/site-config">Site Settings</a></li>
+    <li><a href="/site-config/me">Me Links</a></li>
+    <li><a href="/site-config/lists">Lists</a></li>
+    <li><a href="/site-config/menus">Menus</a></li>
+    <li>Modules</li>
+    <ul>
+        {{ range .Configs }}
+            <li><a href="/admin/config/{{.Name}}">{{.Name}}</a></li>
+        {{ end }}
+    </ul>
 </ul>
 {{end}}
\ No newline at end of file
diff --git a/render/templates/views/admin_config.tmpl b/render/templates/views/admin_config.tmpl
index 4a9f3fa..a32fbd1 100644
--- a/render/templates/views/admin_config.tmpl
+++ b/render/templates/views/admin_config.tmpl
@@ -1,8 +1,8 @@
-{{define "title"}}Editor{{end}}
+{{define "title"}}Configuration{{end}}
 
 {{define "main"}}
 
-<a href="/editor">Back</a>
+<a href="/admin">Back</a>
 <br>
 <br>
 
diff --git a/render/templates/views/editor.tmpl b/render/templates/views/editor.tmpl
index 4a9f3fa..32ca98b 100644
--- a/render/templates/views/editor.tmpl
+++ b/render/templates/views/editor.tmpl
@@ -2,7 +2,7 @@
 
 {{define "main"}}
 
-<a href="/editor">Back</a>
+<a href="/admin">Back</a>
 <br>
 <br>
 
diff --git a/render/templates/views/editor_list.tmpl b/render/templates/views/editor_list.tmpl
deleted file mode 100644
index 5c21f62..0000000
--- a/render/templates/views/editor_list.tmpl
+++ /dev/null
@@ -1,24 +0,0 @@
-{{define "title"}}Editor List{{end}}
-
-{{define "main"}}
-
-
-<nav>
-    <ul>
-        <li><a href="/">Home</a></li>
-        <li><a href="/editor">Editor</a></li>
-        <li><a href="/site-config">Site Settings</a></li>
-        <li><a href="/site-config/me">Me Links</a></li>
-        <li><a href="/site-config/lists">Lists</a></li>
-        <li><a href="/site-config/menus">Menus</a></li>
-    </ul>
-</nav>
-
-<h1>Editor List</h1>
-
-<ul>
-{{range .Types}}
-<li><a href="/editor/new/{{.}}/">{{.}}</a></li>
-{{end}}
-
-{{end}}
\ No newline at end of file
diff --git a/render/templates/views/site_config.tmpl b/render/templates/views/site_config.tmpl
index 6715d8f..61350e3 100644
--- a/render/templates/views/site_config.tmpl
+++ b/render/templates/views/site_config.tmpl
@@ -2,16 +2,7 @@
 
 {{define "main"}}
 
-<nav>
-    <ul>
-        <li><a href="/">Home</a></li>
-        <li><a href="/editor">Editor</a></li>
-        <li><a href="/site-config">Site Settings</a></li>
-        <li><a href="/site-config/me">Me Links</a></li>
-        <li><a href="/site-config/lists">Lists</a></li>
-        <li><a href="/site-config/menus">Menus</a></li>
-    </ul>
-</nav>
+<a href="/admin">Back</a>
 
 <h2>Site Settings</h2>
 
diff --git a/render/templates/views/site_config_list.tmpl b/render/templates/views/site_config_list.tmpl
index 5d65823..f24a725 100644
--- a/render/templates/views/site_config_list.tmpl
+++ b/render/templates/views/site_config_list.tmpl
@@ -2,16 +2,7 @@
 
 {{define "main"}}
 
-<nav>
-    <ul>
-        <li><a href="/">Home</a></li>
-        <li><a href="/editor">Editor</a></li>
-        <li><a href="/site-config">Site Settings</a></li>
-        <li><a href="/site-config/me">Me Links</a></li>
-        <li><a href="/site-config/lists">Lists</a></li>
-        <li><a href="/site-config/menus">Menus</a></li>
-    </ul>
-</nav>
+<a href="/admin">Back</a>
 
 <h2>Create a List</h2>
 <form action="/site-config/lists/create" method="post" enctype="multipart/form-data">
diff --git a/render/templates/views/site_config_me.tmpl b/render/templates/views/site_config_me.tmpl
index 0c5a8d4..b7289ad 100644
--- a/render/templates/views/site_config_me.tmpl
+++ b/render/templates/views/site_config_me.tmpl
@@ -2,16 +2,7 @@
 
 {{define "main"}}
 
-<nav>
-    <ul>
-        <li><a href="/">Home</a></li>
-        <li><a href="/editor">Editor</a></li>
-        <li><a href="/site-config">Site Settings</a></li>
-        <li><a href="/site-config/me">Me Links</a></li>
-        <li><a href="/site-config/lists">Lists</a></li>
-        <li><a href="/site-config/menus">Menus</a></li>
-    </ul>
-</nav>
+<a href="/admin">Back</a>
 
 <h2>Create a Me Link</h2>
 <form action="/site-config/me/create" method="post" enctype="multipart/form-data">
diff --git a/render/templates/views/site_config_menus.tmpl b/render/templates/views/site_config_menus.tmpl
index 1e1ccef..30d41d5 100644
--- a/render/templates/views/site_config_menus.tmpl
+++ b/render/templates/views/site_config_menus.tmpl
@@ -2,16 +2,7 @@
 
 {{define "main"}}
 
-<nav>
-    <ul>
-        <li><a href="/">Home</a></li>
-        <li><a href="/editor">Editor</a></li>
-        <li><a href="/site-config">Site Settings</a></li>
-        <li><a href="/site-config/me">Me Links</a></li>
-        <li><a href="/site-config/lists">Lists</a></li>
-        <li><a href="/site-config/menus">Menus</a></li>
-    </ul>
-</nav>
+<a href="/admin">Back</a>
 
 <h2>Create a List</h2>
 <form action="/site-config/menus/create" method="post" enctype="multipart/form-data">
diff --git a/web/admin_handler.go b/web/admin_handler.go
index eb17420..126a750 100644
--- a/web/admin_handler.go
+++ b/web/admin_handler.go
@@ -5,6 +5,7 @@ import (
 	"owl-blogs/app/repository"
 	"owl-blogs/render"
 	"owl-blogs/web/forms"
+	"sort"
 
 	"github.com/gofiber/fiber/v2"
 )
@@ -12,12 +13,23 @@ import (
 type adminHandler struct {
 	configRepo     repository.ConfigRepository
 	configRegister *app.ConfigRegister
+	typeRegistry   *app.EntryTypeRegistry
 }
 
-func NewAdminHandler(configRepo repository.ConfigRepository, configRegister *app.ConfigRegister) *adminHandler {
+type adminContet struct {
+	Configs []app.RegisteredConfig
+	Types   []string
+}
+
+func NewAdminHandler(
+	configRepo repository.ConfigRepository,
+	configRegister *app.ConfigRegister,
+	typeRegistry *app.EntryTypeRegistry,
+) *adminHandler {
 	return &adminHandler{
 		configRepo:     configRepo,
 		configRegister: configRegister,
+		typeRegistry:   typeRegistry,
 	}
 }
 
@@ -26,7 +38,27 @@ func (h *adminHandler) Handle(c *fiber.Ctx) error {
 
 	siteConfig := getSiteConfig(h.configRepo)
 	configs := h.configRegister.Configs()
-	return render.RenderTemplateWithBase(c, siteConfig, "views/admin", configs)
+
+	types := h.typeRegistry.Types()
+	typeNames := []string{}
+
+	for _, t := range types {
+		name, _ := h.typeRegistry.TypeName(t)
+		typeNames = append(typeNames, name)
+	}
+
+	// sort names to have a consistent order
+	sort.Slice(typeNames, func(i, j int) bool {
+		return typeNames[i] < typeNames[j]
+	})
+
+	return render.RenderTemplateWithBase(
+		c, siteConfig,
+		"views/admin", &adminContet{
+			Configs: configs,
+			Types:   typeNames,
+		},
+	)
 }
 
 func (h *adminHandler) HandleConfigGet(c *fiber.Ctx) error {
diff --git a/web/app.go b/web/app.go
index 7cd03a3..a2b41a0 100644
--- a/web/app.go
+++ b/web/app.go
@@ -44,7 +44,6 @@ func NewWebApp(
 	mediaHandler := NewMediaHandler(binService)
 	rssHandler := NewRSSHandler(entryService, configRepo)
 	loginHandler := NewLoginHandler(authorService, configRepo)
-	editorListHandler := NewEditorListHandler(typeRegistry, configRepo)
 	editorHandler := NewEditorHandler(entryService, typeRegistry, binService, configRepo)
 
 	// Login
@@ -52,7 +51,7 @@ func NewWebApp(
 	app.Post("/auth/login", loginHandler.HandlePost)
 
 	// admin
-	adminHandler := NewAdminHandler(configRepo, configRegister)
+	adminHandler := NewAdminHandler(configRepo, configRegister, typeRegistry)
 	admin := app.Group("/admin")
 	admin.Use(middleware.NewAuthMiddleware(authorService).Handle)
 	admin.Get("/", adminHandler.Handle)
@@ -62,7 +61,6 @@ func NewWebApp(
 	// Editor
 	editor := app.Group("/editor")
 	editor.Use(middleware.NewAuthMiddleware(authorService).Handle)
-	editor.Get("/", editorListHandler.Handle)
 	editor.Get("/new/:editor/", editorHandler.HandleGetNew)
 	editor.Post("/new/:editor/", editorHandler.HandlePostNew)
 	editor.Get("/edit/:id/", editorHandler.HandleGetEdit)
diff --git a/web/editor_list_handler.go b/web/editor_list_handler.go
deleted file mode 100644
index dc66a0d..0000000
--- a/web/editor_list_handler.go
+++ /dev/null
@@ -1,41 +0,0 @@
-package web
-
-import (
-	"owl-blogs/app"
-	"owl-blogs/app/repository"
-	"owl-blogs/render"
-
-	"github.com/gofiber/fiber/v2"
-)
-
-type EditorListHandler struct {
-	configRepo repository.ConfigRepository
-	registry   *app.EntryTypeRegistry
-}
-
-type EditorListContext struct {
-	Types []string
-}
-
-func NewEditorListHandler(registry *app.EntryTypeRegistry,
-	configRepo repository.ConfigRepository) *EditorListHandler {
-	return &EditorListHandler{
-		registry:   registry,
-		configRepo: configRepo,
-	}
-
-}
-
-func (h *EditorListHandler) Handle(c *fiber.Ctx) error {
-	c.Set(fiber.HeaderContentType, fiber.MIMETextHTML)
-
-	types := h.registry.Types()
-	typeNames := []string{}
-
-	for _, t := range types {
-		name, _ := h.registry.TypeName(t)
-		typeNames = append(typeNames, name)
-	}
-
-	return render.RenderTemplateWithBase(c, getSiteConfig(h.configRepo), "views/editor_list", &EditorListContext{Types: typeNames})
-}