From 2b4e1dbc57e0db69b3d9ab5110c98ee0fea3824e Mon Sep 17 00:00:00 2001 From: Anya Tokugawa Date: Sun, 31 May 2026 23:07:15 +0900 Subject: [PATCH] add i18n for system/home nav editor, improve link manager --- cmd/pageswiki/main.go | 6 + internal/server/i18n.go | 88 ++++++++----- internal/server/link_manager.go | 118 +++++++++++++++++- internal/server/routes/ui.go | 3 +- internal/store/path_links.go | 138 +++++++++++++++++++++ internal/store/recent_objects.go | 22 ++-- templates/pages/config.gohtml | 8 +- templates/pages/editor.gohtml | 2 +- templates/pages/link_manager.gohtml | 184 ++++++++++++++++++++++++++++ 9 files changed, 517 insertions(+), 52 deletions(-) create mode 100644 internal/store/path_links.go create mode 100644 templates/pages/link_manager.gohtml diff --git a/cmd/pageswiki/main.go b/cmd/pageswiki/main.go index 56453f5..fe4d8a3 100644 --- a/cmd/pageswiki/main.go +++ b/cmd/pageswiki/main.go @@ -61,6 +61,12 @@ func main() { log.Fatal(err) } + err = st.EnsurePathLinkColumns() + + if err != nil { + log.Fatal(err) + } + srv := server.New(st) err = srv.Run(":3000") diff --git a/internal/server/i18n.go b/internal/server/i18n.go index ca45692..d312987 100644 --- a/internal/server/i18n.go +++ b/internal/server/i18n.go @@ -6,40 +6,64 @@ import ( var translations = map[string]map[string]string{ "en": { - "config.title": "Config", - "config.home": "Home", - "config.wiki_name": "Wiki name", - "config.locale": "Language", - "config.home_path": "Home semantic path", - "config.save": "Save", - "config.nav": "Navigation", - "config.objects": "Recent Objects", - "config.primary": "Primary Link", - "config.size": "Size", - "config.updated": "Updated", - "config.object": "Object", - "config.nav_label": "Label", - "config.nav_href": "Href", - "config.nav_order": "Order", - "config.nav_save": "Save Navigation", + "config.title": "Config", + "config.home": "Home", + "config.wiki_name": "Wiki name", + "config.locale": "Language", + "config.home_path": "Home semantic path", + "config.save": "Save", + "config.nav": "Navigation", + "config.objects": "Recent Objects", + "config.primary": "Primary Link", + "config.size": "Size", + "config.updated": "Updated", + "config.object": "Object", + "config.nav_label": "Label", + "config.nav_href": "Href", + "config.nav_order": "Order", + "config.nav_save": "Save Navigation", + "config.nav_home": "Home Navigation", + "config.nav_system": "System Navigation", + "link.title": "Link Manager", + "link.object": "Object", + "link.primary": "Primary", + "link.path": "Path", + "link.linked_at": "Linked At", + "link.action": "Action", + "link.delete": "Delete", + "link.add": "Add", + "link.add_path": "Add Link", + "link.placeholder": "/pageswiki/example", }, "ja": { - "config.title": "設定", - "config.home": "ホーム", - "config.wiki_name": "Wiki名称", - "config.locale": "言語", - "config.home_path": "トップページ", - "config.save": "保存", - "config.nav": "ナビゲーション", - "config.objects": "最近のオブジェクト", - "config.primary": "主なリンク", - "config.size": "サイズ", - "config.updated": "最終更新", - "config.object": "オブジェクト", - "config.nav_label": "表示名", - "config.nav_href": "リンク先", - "config.nav_order": "順序", - "config.nav_save": "ナビゲーションを保存", + "config.title": "設定", + "config.home": "ホーム", + "config.wiki_name": "Wiki名称", + "config.locale": "言語", + "config.home_path": "トップページ", + "config.save": "保存", + "config.nav": "ナビゲーション", + "config.nav_home": "ホームナビゲーション", + "config.nav_system": "システムナビゲーション", + "config.objects": "最近のオブジェクト", + "link.title": "リンク管理", + "link.object": "オブジェクト", + "link.primary": "主リンク", + "link.path": "パス", + "link.linked_at": "リンクされた日時", + "link.action": "操作", + "link.delete": "削除", + "link.add": "追加", + "link.add_path": "リンクを追加", + "link.placeholder": "/pageswiki/example", + "config.primary": "主なリンク", + "config.size": "サイズ", + "config.updated": "最終更新", + "config.object": "オブジェクト", + "config.nav_label": "表示名", + "config.nav_href": "リンク先", + "config.nav_order": "順序", + "config.nav_save": "ナビゲーションを保存", }, } diff --git a/internal/server/link_manager.go b/internal/server/link_manager.go index f98b6b6..37b13ee 100644 --- a/internal/server/link_manager.go +++ b/internal/server/link_manager.go @@ -2,6 +2,7 @@ package server import ( "net/http" + "strings" ) func (s *Server) handleLinkManager( @@ -9,14 +10,123 @@ func (s *Server) handleLinkManager( r *http.Request, ) { - objects, _ := s.store.ListObjects() + objectUUID := "" + + if strings.HasPrefix(r.URL.Path, "/l/uuid:") { + + objectUUID = + strings.TrimPrefix( + r.URL.Path, + "/l/uuid:", + ) + } + + if objectUUID == "" { + + http.NotFound( + w, + r, + ) + + return + } + + if r.Method == http.MethodPost { + + err := r.ParseForm() + + if err != nil { + http.Error(w, err.Error(), 400) + return + } + + action := + r.FormValue( + "action", + ) + + path := + strings.TrimSpace( + r.FormValue("path"), + ) + + switch action { + + case "add": + + if path == "" { + http.Error(w, "path is required", 400) + return + } + + if !strings.HasPrefix(path, "/") { + path = "/" + path + } + + err = s.store.AddPathLink( + objectUUID, + path, + ) + + case "delete": + + err = s.store.DeletePathLink( + objectUUID, + path, + ) + + case "primary": + + err = s.store.SetPrimaryPathLink( + objectUUID, + path, + ) + + default: + + http.Error(w, "unknown action", 400) + return + } + + if err != nil { + http.Error(w, err.Error(), 500) + return + } + + http.Redirect( + w, + r, + "/l/uuid:"+objectUUID, + http.StatusFound, + ) + + return + } + + links, err := + s.store.ListPathLinks( + objectUUID, + ) + + if err != nil { + http.Error(w, err.Error(), 500) + return + } s.render( w, - "links.gohtml", + "link_manager.gohtml", map[string]any{ - "Title": "Link Manager", - "Objects": objects, + "NavItems": resolveNavItems( + s.getSystemNavItems(), + NavContext{ + ObjectUUID: objectUUID, + ObjectURI: "uuid:" + objectUUID, + }, + ), + "ObjectUUID": objectUUID, + "ObjectURI": "uuid:" + objectUUID, + "Links": links, }, ) } diff --git a/internal/server/routes/ui.go b/internal/server/routes/ui.go index ddeff52..d8c2112 100644 --- a/internal/server/routes/ui.go +++ b/internal/server/routes/ui.go @@ -58,9 +58,8 @@ func RegisterUIRoutes( "/raw/", h.RawView, ) - mux.HandleFunc( - "/l", + "/l/", h.LinkManager, ) diff --git a/internal/store/path_links.go b/internal/store/path_links.go new file mode 100644 index 0000000..56f2c84 --- /dev/null +++ b/internal/store/path_links.go @@ -0,0 +1,138 @@ +package store + +type PathLink struct { + Path string + CreatedAt int64 + IsPrimary bool +} + +func (s *Store) EnsurePathLinkColumns() error { + + _, _ = s.DB.Exec(` + ALTER TABLE paths + ADD COLUMN is_primary INTEGER NOT NULL DEFAULT 0 + `) + + return nil +} + +func (s *Store) ListPathLinks( + objectUUID string, +) ([]PathLink, error) { + + rows, err := s.DB.Query(` + SELECT + path, + created_at, + COALESCE(is_primary, 0) + FROM paths + WHERE object_uuid = ? + ORDER BY + is_primary DESC, + path ASC + `, objectUUID) + + if err != nil { + return nil, err + } + + defer rows.Close() + + var out []PathLink + + for rows.Next() { + + var p PathLink + var primary int + + err := rows.Scan( + &p.Path, + &p.CreatedAt, + &primary, + ) + + if err != nil { + return nil, err + } + + p.IsPrimary = primary != 0 + + out = append(out, p) + } + + return out, nil +} + +func (s *Store) AddPathLink( + objectUUID string, + path string, +) error { + + _, err := s.DB.Exec(` + INSERT INTO paths ( + path, + object_uuid, + created_at, + is_primary + ) + VALUES ( + ?, + ?, + strftime('%s','now'), + 0 + ) + `, path, objectUUID) + + return err +} + +func (s *Store) DeletePathLink( + objectUUID string, + path string, +) error { + + _, err := s.DB.Exec(` + DELETE FROM paths + WHERE object_uuid = ? + AND path = ? + `, objectUUID, path) + + return err +} + +func (s *Store) SetPrimaryPathLink( + objectUUID string, + path string, +) error { + + tx, err := s.DB.Begin() + + if err != nil { + return err + } + + _, err = tx.Exec(` + UPDATE paths + SET is_primary = 0 + WHERE object_uuid = ? + `, objectUUID) + + if err != nil { + tx.Rollback() + return err + } + + _, err = tx.Exec(` + UPDATE paths + SET is_primary = 1 + WHERE object_uuid = ? + AND path = ? + `, objectUUID, path) + + if err != nil { + tx.Rollback() + return err + } + + return tx.Commit() +} diff --git a/internal/store/recent_objects.go b/internal/store/recent_objects.go index a3c2a64..8bdc268 100644 --- a/internal/store/recent_objects.go +++ b/internal/store/recent_objects.go @@ -27,30 +27,34 @@ func (s *Store) ListRecentObjects( ) AS rn FROM revisions r ), - primary_path AS ( + ranked_path AS ( SELECT p.object_uuid, - MIN(p.path) AS path + p.path, + ROW_NUMBER() OVER ( + PARTITION BY p.object_uuid + ORDER BY + COALESCE(p.is_primary, 0) DESC, + p.path ASC + ) AS rn FROM paths p - GROUP BY p.object_uuid ) SELECT o.uuid, - COALESCE(primary_path.path, ''), + COALESCE(ranked_path.path, ''), COALESCE(LENGTH(latest.body), 0), COALESCE(latest.created_at, o.created_at) FROM objects o LEFT JOIN latest ON latest.object_uuid = o.uuid AND latest.rn = 1 - LEFT JOIN primary_path - ON primary_path.object_uuid = o.uuid + LEFT JOIN ranked_path + ON ranked_path.object_uuid = o.uuid + AND ranked_path.rn = 1 ORDER BY COALESCE(latest.created_at, o.created_at) DESC LIMIT ? - `, - limit, - ) + `, limit) if err != nil { return nil, err diff --git a/templates/pages/config.gohtml b/templates/pages/config.gohtml index c1f12d2..eb0a43b 100644 --- a/templates/pages/config.gohtml +++ b/templates/pages/config.gohtml @@ -50,11 +50,11 @@ -Home Navigation +{{ T "config.nav_home" }} -System Navigation +{{ T "config.nav_system" }} @@ -196,7 +196,7 @@ Save class="config-section config-panel" > -

Home Navigation

+

{{ T "config.nav_home" }}

-

System Navigation

+

{{ T "config.nav_system" }}

- + Links diff --git a/templates/pages/link_manager.gohtml b/templates/pages/link_manager.gohtml new file mode 100644 index 0000000..f0eff16 --- /dev/null +++ b/templates/pages/link_manager.gohtml @@ -0,0 +1,184 @@ +{{ define "link_manager.gohtml" }} + + + + +{{ T "link.title" }} + + + + + + +
+ + + + + +
+ +
+ +
+ +

{{ T "link.title" }}

+ +

+{{ T "link.object" }}: +{{ .ObjectURI }} +

+ + + + + + + + + + + + + + +{{ range .Links }} + + + + + + + + + + + + + +{{ end }} + + + + + +

{{ T "link.add_path" }}

+ + + +
+ +
+ + + + + +{{ end }}