diff --git a/internal/server/config_handler.go b/internal/server/config_handler.go index 759d264..4668068 100644 --- a/internal/server/config_handler.go +++ b/internal/server/config_handler.go @@ -3,7 +3,9 @@ package server import ( "encoding/json" "net/http" + "strconv" "strings" + "time" ) func parseNavItemsFromForm( @@ -132,6 +134,87 @@ func (s *Server) handleConfig( return } + timezoneName := + strings.TrimSpace( + r.FormValue("timezone"), + ) + + if timezoneName == "" { + timezoneName = "UTC" + } + + _, err = time.LoadLocation( + timezoneName, + ) + + if err != nil { + http.Error(w, "invalid timezone", http.StatusBadRequest) + return + } + + err = s.store.SetConfig( + "timezone", + timezoneName, + ) + + if err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + + theme := + s.getTheme() + + if v := strings.TrimSpace(r.FormValue("theme")); v != "" { + switch v { + case "dark", "light", "monokai", "solarized-dark", "solarized-light": + theme = v + default: + http.Error(w, "invalid theme", http.StatusBadRequest) + return + } + } + + err = s.store.SetConfig( + "theme", + theme, + ) + + if err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + + graceHours := + strings.TrimSpace( + r.FormValue("zombie_grace_hours"), + ) + + if graceHours == "" { + graceHours = "24" + } + + _, err = strconv.ParseInt( + graceHours, + 10, + 64, + ) + + if err != nil { + http.Error(w, "invalid zombie grace hours", http.StatusBadRequest) + return + } + + err = s.store.SetConfig( + "zombie_grace_hours", + graceHours, + ) + + if err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + case "nav-home": err = s.saveNavConfig( @@ -156,6 +239,18 @@ func (s *Server) handleConfig( return } + case "zombie-purge": + + _, err = s.store.PurgeZombieObjects( + s.getZombieGraceSeconds(), + 100, + ) + + if err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + default: http.Error( @@ -167,10 +262,16 @@ func (s *Server) handleConfig( return } + panel := section + + if section == "zombie-purge" { + panel = "objects" + } + http.Redirect( w, r, - "/-/sys/config?panel="+section, + "/-/sys/config?panel="+panel, http.StatusFound, ) @@ -201,6 +302,9 @@ func (s *Server) handleConfig( wikiName = "Pages Wiki" } + zombieGraceHours := + s.getZombieGraceHours() + recent, err := s.store.ListRecentObjects( 50, @@ -211,6 +315,16 @@ func (s *Server) handleConfig( return } + zombies, err := + s.store.ListZombieObjects( + s.getZombieGraceSeconds(), + ) + + if err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + s.render( w, "config.gohtml", @@ -222,7 +336,11 @@ func (s *Server) handleConfig( "HomePath": homePath, "WikiName": wikiName, "Locale": s.getLocale(), + "Timezone": s.getTimezoneName(), + "Theme": s.getTheme(), + "ZombieGraceHours": zombieGraceHours, "Objects": recent, + "ZombieObjects": zombies, "HomeNavItemsConfig": s.getHomeNavItems(), "SystemNavItemsConfig": s.getSystemNavItems(), }, diff --git a/internal/server/gc_worker.go b/internal/server/gc_worker.go index 8bcdca4..7b2607f 100644 --- a/internal/server/gc_worker.go +++ b/internal/server/gc_worker.go @@ -20,7 +20,7 @@ func (s *Server) startGCWorker() { deleted, err := s.store.PurgeZombieObjects( - 24*60*60, + s.getZombieGraceSeconds(), 100, ) diff --git a/internal/server/i18n.go b/internal/server/i18n.go index d312987..5a82be2 100644 --- a/internal/server/i18n.go +++ b/internal/server/i18n.go @@ -6,64 +6,68 @@ 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.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", + "config.title": "Config", + "config.home": "Home", + "config.wiki_name": "Wiki name", + "config.locale": "Language", + "config.timezone": "Timezone", + "config.zombie_grace_hours": "Zombie grace period (hours)", + "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.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": "ナビゲーションを保存", + "config.title": "設定", + "config.home": "ホーム", + "config.wiki_name": "Wiki名称", + "config.locale": "言語", + "config.timezone": "タイムゾーン", + "config.zombie_grace_hours": "ゾンビ判定猶予時間(時間)", + "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/render.go b/internal/server/render.go index 1325a26..09623ca 100644 --- a/internal/server/render.go +++ b/internal/server/render.go @@ -7,10 +7,12 @@ import ( func mergeTemplateData( data any, wikiName string, + theme string, ) map[string]any { out := map[string]any{ "WikiName": wikiName, + "Theme": theme, } if data == nil { @@ -43,6 +45,7 @@ func (s *Server) render( mergeTemplateData( data, s.getWikiName(), + s.getTheme(), ), ) diff --git a/internal/server/server.go b/internal/server/server.go index 9194582..e28f585 100644 --- a/internal/server/server.go +++ b/internal/server/server.go @@ -139,7 +139,10 @@ func (s *Server) mustLoadTemplates() { return "-" } - return time.Unix(ts, 0).Format("2006-01-02 15:04") + return time. + Unix(ts, 0). + In(s.getLocation()). + Format("2006-01-02 15:04") }, } diff --git a/internal/server/theme.go b/internal/server/theme.go new file mode 100644 index 0000000..7d5f810 --- /dev/null +++ b/internal/server/theme.go @@ -0,0 +1,20 @@ +package server + +func (s *Server) getTheme() string { + + theme, err := + s.store.GetConfig( + "theme", + ) + + if err != nil || theme == "" { + return "dark" + } + + switch theme { + case "dark", "light", "monokai", "solarized-dark", "solarized-light": + return theme + default: + return "dark" + } +} diff --git a/internal/server/timezone.go b/internal/server/timezone.go new file mode 100644 index 0000000..f6e9246 --- /dev/null +++ b/internal/server/timezone.go @@ -0,0 +1,37 @@ +package server + +import "time" + +func (s *Server) getTimezoneName() string { + + tz, err := + s.store.GetConfig( + "timezone", + ) + + if err != nil || tz == "" { + return "UTC" + } + + _, err = time.LoadLocation(tz) + + if err != nil { + return "UTC" + } + + return tz +} + +func (s *Server) getLocation() *time.Location { + + loc, err := + time.LoadLocation( + s.getTimezoneName(), + ) + + if err != nil { + return time.UTC + } + + return loc +} diff --git a/internal/server/zombie_config.go b/internal/server/zombie_config.go new file mode 100644 index 0000000..1b5d951 --- /dev/null +++ b/internal/server/zombie_config.go @@ -0,0 +1,33 @@ +package server + +import "strconv" + +func (s *Server) getZombieGraceHours() int64 { + + raw, err := + s.store.GetConfig( + "zombie_grace_hours", + ) + + if err != nil || raw == "" { + return 24 + } + + n, err := + strconv.ParseInt( + raw, + 10, + 64, + ) + + if err != nil || n < 0 { + return 24 + } + + return n +} + +func (s *Server) getZombieGraceSeconds() int64 { + + return s.getZombieGraceHours() * 60 * 60 +} diff --git a/static/css/theme/base.css b/static/css/theme/base.css new file mode 100644 index 0000000..81d9c7b --- /dev/null +++ b/static/css/theme/base.css @@ -0,0 +1,97 @@ +:root { + --bg: #111; + --fg: #e8e8e8; + --muted: #888; + --panel: transparent; + --border: rgba(255,255,255,0.10); + --border-soft: rgba(255,255,255,0.05); + --link: #8ecbff; + --link-hover: #d8efff; + --input-bg: #0b0b0b; + --input-fg: #f0f0f0; + --input-border: rgba(255,255,255,0.16); + --button-bg: #161616; + --button-fg: #eee; + --button-border: rgba(255,255,255,0.18); + --button-hover-bg: #222; + --danger: #ff6d6d; + --accent: #b077ff; +} + +html, +body { + background: var(--bg); + color: var(--fg); +} + +a { + color: var(--link); +} + +a:hover { + color: var(--link-hover); +} + +input, +select, +textarea, +button { + background: var(--input-bg); + color: var(--input-fg); + border: 1px solid var(--input-border); + border-radius: 0.2rem; + font: inherit; +} + +input, +select, +textarea { + padding: 0.45rem 0.55rem; +} + +button, +input[type="button"], +input[type="submit"] { + background: var(--button-bg); + color: var(--button-fg); + border: 1px solid var(--button-border); + padding: 0.38rem 0.75rem; + cursor: pointer; +} + +button:hover, +input[type="button"]:hover, +input[type="submit"]:hover { + background: var(--button-hover-bg); +} + +input:focus, +select:focus, +textarea:focus, +button:focus { + outline: none; + border-color: var(--accent); + box-shadow: 0 0 0.45rem color-mix(in srgb, var(--accent) 28%, transparent); +} + +table { + color: var(--fg); +} + +th { + color: var(--muted); +} + +td, +th { + border-color: var(--border-soft); +} + +.topbar { + background: var(--bg); + border-bottom: 1px solid var(--border-soft); +} + +.muted { + color: var(--muted); +} diff --git a/static/css/theme/dark.css b/static/css/theme/dark.css new file mode 100644 index 0000000..947d028 --- /dev/null +++ b/static/css/theme/dark.css @@ -0,0 +1,17 @@ +:root { + --bg: #0d0f10; + --fg: #e8e8e8; + --muted: #8a8f98; + --border: rgba(255,255,255,0.10); + --border-soft: rgba(255,255,255,0.045); + --link: #84c7ff; + --link-hover: #d5eeff; + --input-bg: #090b0c; + --input-fg: #f0f0f0; + --input-border: rgba(255,255,255,0.15); + --button-bg: #15191c; + --button-fg: #e8e8e8; + --button-border: rgba(255,255,255,0.18); + --button-hover-bg: #20262a; + --accent: #a879ff; +} diff --git a/static/css/theme/light.css b/static/css/theme/light.css new file mode 100644 index 0000000..d31867e --- /dev/null +++ b/static/css/theme/light.css @@ -0,0 +1,17 @@ +:root { + --bg: #f7f7f7; + --fg: #202020; + --muted: #666; + --border: rgba(0,0,0,0.16); + --border-soft: rgba(0,0,0,0.08); + --link: #075fb0; + --link-hover: #003f7a; + --input-bg: #ffffff; + --input-fg: #202020; + --input-border: rgba(0,0,0,0.22); + --button-bg: #ffffff; + --button-fg: #202020; + --button-border: rgba(0,0,0,0.24); + --button-hover-bg: #efefef; + --accent: #006cc9; +} diff --git a/static/css/theme/monokai.css b/static/css/theme/monokai.css new file mode 100644 index 0000000..e909287 --- /dev/null +++ b/static/css/theme/monokai.css @@ -0,0 +1,18 @@ +:root { + --bg: #272822; + --fg: #f8f8f2; + --muted: #aaa; + --border: rgba(248,248,242,0.16); + --border-soft: rgba(248,248,242,0.07); + --link: #66d9ef; + --link-hover: #a6e9f4; + --input-bg: #1e1f1c; + --input-fg: #f8f8f2; + --input-border: rgba(248,248,242,0.18); + --button-bg: #33342d; + --button-fg: #f8f8f2; + --button-border: rgba(248,248,242,0.22); + --button-hover-bg: #3e3f36; + --danger: #f92672; + --accent: #a6e22e; +} diff --git a/static/css/theme/solarized-dark.css b/static/css/theme/solarized-dark.css new file mode 100644 index 0000000..f8d3225 --- /dev/null +++ b/static/css/theme/solarized-dark.css @@ -0,0 +1,17 @@ +:root { + --bg: #002b36; + --fg: #eee8d5; + --muted: #839496; + --border: rgba(238,232,213,0.16); + --border-soft: rgba(238,232,213,0.07); + --link: #268bd2; + --link-hover: #6cbeff; + --input-bg: #073642; + --input-fg: #eee8d5; + --input-border: rgba(238,232,213,0.18); + --button-bg: #073642; + --button-fg: #eee8d5; + --button-border: rgba(238,232,213,0.22); + --button-hover-bg: #0b4655; + --accent: #b58900; +} diff --git a/static/css/theme/solarized-light.css b/static/css/theme/solarized-light.css new file mode 100644 index 0000000..2ba936a --- /dev/null +++ b/static/css/theme/solarized-light.css @@ -0,0 +1,17 @@ +:root { + --bg: #fdf6e3; + --fg: #586e75; + --muted: #839496; + --border: rgba(88,110,117,0.18); + --border-soft: rgba(88,110,117,0.09); + --link: #268bd2; + --link-hover: #0066a8; + --input-bg: #fffdf2; + --input-fg: #586e75; + --input-border: rgba(88,110,117,0.24); + --button-bg: #eee8d5; + --button-fg: #586e75; + --button-border: rgba(88,110,117,0.24); + --button-hover-bg: #e5dec8; + --accent: #b58900; +} diff --git a/templates/pages/config.gohtml b/templates/pages/config.gohtml index eb0a43b..6f0e0d1 100644 --- a/templates/pages/config.gohtml +++ b/templates/pages/config.gohtml @@ -6,6 +6,9 @@ {{ T "config.title" }} + + + @@ -117,6 +120,51 @@ English

+ + + + +
+
+ + + + + +
+
+ + + + + +
+
+ @@ -188,6 +236,70 @@ Save +

Zombie Objects

+ +

+Unlinked and empty objects older than the grace period. +

+ + + + + + + + + + + + + + +{{ range .ZombieObjects }} + + + + + + + + + + + +{{ end }} + + + +
UUIDCreatedRevisionsMax Body
+{{ .UUID }} + +{{ formatUnix .CreatedAt }} + +{{ .RevisionCount }} + +{{ formatBytes .MaxBodyLength }} +
+ +
+ + + + + +
+ + diff --git a/templates/pages/editor.gohtml b/templates/pages/editor.gohtml index eb3f9da..93b8480 100644 --- a/templates/pages/editor.gohtml +++ b/templates/pages/editor.gohtml @@ -18,6 +18,9 @@ href="/o/path:/system/static/css/modes.css" > + + + diff --git a/templates/pages/home.gohtml b/templates/pages/home.gohtml index 2cd40bd..7f51ce0 100644 --- a/templates/pages/home.gohtml +++ b/templates/pages/home.gohtml @@ -6,6 +6,9 @@ {{ .WikiName }} + + + diff --git a/templates/pages/link_manager.gohtml b/templates/pages/link_manager.gohtml index f0eff16..2b7149c 100644 --- a/templates/pages/link_manager.gohtml +++ b/templates/pages/link_manager.gohtml @@ -6,6 +6,9 @@ {{ T "link.title" }} + + + diff --git a/templates/pages/links.gohtml b/templates/pages/links.gohtml index 7da34da..5a20b8d 100644 --- a/templates/pages/links.gohtml +++ b/templates/pages/links.gohtml @@ -18,6 +18,9 @@ href="/o/path:/system/static/css/modes.css" > + + + diff --git a/templates/pages/object_editor.gohtml b/templates/pages/object_editor.gohtml index 2fa3901..526e577 100644 --- a/templates/pages/object_editor.gohtml +++ b/templates/pages/object_editor.gohtml @@ -6,6 +6,9 @@ {{ .Title }} + + + diff --git a/templates/pages/object_view.gohtml b/templates/pages/object_view.gohtml index 14f2842..7837819 100644 --- a/templates/pages/object_view.gohtml +++ b/templates/pages/object_view.gohtml @@ -6,6 +6,9 @@ {{ .Title }} + + + diff --git a/templates/pages/page.gohtml b/templates/pages/page.gohtml index e74b800..c6a115a 100644 --- a/templates/pages/page.gohtml +++ b/templates/pages/page.gohtml @@ -7,6 +7,9 @@ {{ .Name }} + + + diff --git a/templates/pages/revision_diff.gohtml b/templates/pages/revision_diff.gohtml index bf26fc9..b914bfd 100644 --- a/templates/pages/revision_diff.gohtml +++ b/templates/pages/revision_diff.gohtml @@ -10,6 +10,9 @@ + + + diff --git a/templates/pages/revision_view.gohtml b/templates/pages/revision_view.gohtml index b567f13..c208e2b 100644 --- a/templates/pages/revision_view.gohtml +++ b/templates/pages/revision_view.gohtml @@ -18,6 +18,9 @@ href="/o/path:/system/static/css/revisions.css" > + + + diff --git a/templates/pages/revisions.gohtml b/templates/pages/revisions.gohtml index 12a5245..e2e570e 100644 --- a/templates/pages/revisions.gohtml +++ b/templates/pages/revisions.gohtml @@ -18,6 +18,9 @@ href="/o/path:/system/static/css/revisions.css" > + + + diff --git a/templates/pages/tree.gohtml b/templates/pages/tree.gohtml index 24e5436..e758d80 100644 --- a/templates/pages/tree.gohtml +++ b/templates/pages/tree.gohtml @@ -544,6 +544,9 @@ body { + + +