From 12decb78620f95553e50f1508d0bf714c73bab34 Mon Sep 17 00:00:00 2001 From: Anya Tokugawa Date: Sun, 31 May 2026 21:10:01 +0900 Subject: [PATCH] add configuration: top nav order and settings --- internal/server/config_handler.go | 115 +++++++++++++++--- internal/server/nav.go | 57 +++++++++ internal/server/render.go | 50 +++++--- templates/pages/config.gohtml | 174 ++++++++++++++++++++++++++- templates/pages/home.gohtml | 8 +- templates/pages/object_editor.gohtml | 8 +- templates/pages/object_view.gohtml | 9 +- templates/pages/page.gohtml | 26 +--- templates/pages/tree.gohtml | 10 +- 9 files changed, 386 insertions(+), 71 deletions(-) create mode 100644 internal/server/nav.go diff --git a/internal/server/config_handler.go b/internal/server/config_handler.go index c8ecf8a..8922d0d 100644 --- a/internal/server/config_handler.go +++ b/internal/server/config_handler.go @@ -1,7 +1,9 @@ package server import ( + "encoding/json" "net/http" + "strings" ) func (s *Server) handleConfig( @@ -11,22 +13,102 @@ func (s *Server) handleConfig( if r.Method == http.MethodPost { - homePath := r.FormValue("home_path") - - err := s.store.SetConfig( - "home_path", - homePath, - ) + err := r.ParseForm() if err != nil { - http.Error(w, err.Error(), 500) + http.Error(w, err.Error(), http.StatusBadRequest) + return + } + + section := + r.FormValue("section") + + switch section { + + case "home": + + err = s.store.SetConfig( + "home_path", + r.FormValue("home_path"), + ) + + if err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + + case "nav": + + labels := + r.Form["nav_label"] + + hrefs := + r.Form["nav_href"] + + var items []NavItem + + for i := range labels { + + label := + strings.TrimSpace(labels[i]) + + if label == "" { + continue + } + + if i >= len(hrefs) { + continue + } + + href := + strings.TrimSpace(hrefs[i]) + + if href == "" { + continue + } + + items = append( + items, + NavItem{ + Label: label, + Href: href, + }, + ) + } + + raw, err := + json.Marshal(items) + + if err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + + err = s.store.SetConfig( + "nav_items", + string(raw), + ) + + if err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + + default: + + http.Error( + w, + "unknown config section", + http.StatusBadRequest, + ) + return } http.Redirect( w, r, - "/-/sys/config", + "/-/sys/config?panel="+section, http.StatusFound, ) @@ -34,22 +116,18 @@ func (s *Server) handleConfig( } homePath, err := - s.store.GetConfig( - "home_path", - ) + s.store.GetConfig("home_path") if err != nil { - http.Error(w, err.Error(), 500) + http.Error(w, err.Error(), http.StatusInternalServerError) return } recent, err := - s.store.ListRecentObjects( - 50, - ) + s.store.ListRecentObjects(50) if err != nil { - http.Error(w, err.Error(), 500) + http.Error(w, err.Error(), http.StatusInternalServerError) return } @@ -57,8 +135,9 @@ func (s *Server) handleConfig( w, "config.gohtml", map[string]any{ - "HomePath": homePath, - "Objects": recent, + "HomePath": homePath, + "Objects": recent, + "NavItemsConfig": s.getNavItems(), }, ) } diff --git a/internal/server/nav.go b/internal/server/nav.go new file mode 100644 index 0000000..62da393 --- /dev/null +++ b/internal/server/nav.go @@ -0,0 +1,57 @@ +package server + +import ( + "encoding/json" +) + +type NavItem struct { + Label string `json:"label"` + Href string `json:"href"` +} + +func defaultNavItems() []NavItem { + + return []NavItem{ + { + Label: "Home", + Href: "/", + }, + { + Label: "Tree", + Href: "/v/tree", + }, + { + Label: "Config", + Href: "/-/sys/config", + }, + } +} + +func (s *Server) getNavItems() []NavItem { + + raw, err := + s.store.GetConfig( + "nav_items", + ) + + if err != nil || + raw == "" { + + return defaultNavItems() + } + + var items []NavItem + + err = json.Unmarshal( + []byte(raw), + &items, + ) + + if err != nil || + len(items) == 0 { + + return defaultNavItems() + } + + return items +} diff --git a/internal/server/render.go b/internal/server/render.go index 30c5095..20a4afc 100644 --- a/internal/server/render.go +++ b/internal/server/render.go @@ -1,29 +1,51 @@ package server import ( - "html/template" "net/http" ) +func mergeTemplateData( + data any, + nav []NavItem, +) map[string]any { + + out := map[string]any{ + "NavItems": nav, + } + + if data == nil { + return out + } + + m, ok := data.(map[string]any) + + if !ok { + out["Data"] = data + return out + } + + for k, v := range m { + out[k] = v + } + + return out +} + func (s *Server) render( w http.ResponseWriter, name string, data any, ) { - s.templates.Funcs( - template.FuncMap{ - "sub": func(a, b int) int { - return a - b - }, - }, - ) - - err := s.templates.ExecuteTemplate( - w, - name, - data, - ) + err := + s.templates.ExecuteTemplate( + w, + name, + mergeTemplateData( + data, + s.getNavItems(), + ), + ) if err != nil { diff --git a/templates/pages/config.gohtml b/templates/pages/config.gohtml index 2405431..3dae4ed 100644 --- a/templates/pages/config.gohtml +++ b/templates/pages/config.gohtml @@ -15,10 +15,13 @@ Pages Wiki + +
@@ -46,6 +49,10 @@ Home Recent Objects + +Navigation + + @@ -66,6 +73,12 @@ Recent Objects action="/-/sys/config" > + + @@ -143,6 +156,124 @@ Save +
+ +

Navigation

+ +
+ + + + + + + + + + + + + + + + +{{ range .NavItemsConfig }} + + + + + + + + + + +{{ end }} + + + + + + + + + + + + + +
LabelHrefOrder
+ + + + + + + +
+ + + + + + + +
+ + + +
+ +
+
@@ -220,6 +351,45 @@ document.addEventListener( ) }, ) + +function moveNavRow(button, direction) { + + const row = + button.closest( + "tr" + ) + + const tbody = + row.parentElement + + if (direction < 0) { + + const prev = + row.previousElementSibling + + if (prev) { + + tbody.insertBefore( + row, + prev + ) + } + + return + } + + const next = + row.nextElementSibling + + if (next) { + + tbody.insertBefore( + next, + row + ) + } +} +