From 6ba30bc9f4ae4a8b53b909ebe6597eb8f52fa0ef Mon Sep 17 00:00:00 2001 From: Anya Tokugawa Date: Wed, 4 Nov 2026 00:05:16 +0900 Subject: [PATCH] Unify organizer navigation and add personal widget dashboard --- docs/design/README.md | 2 + docs/design/implementation-roadmap.md | 9 + docs/design/ja/index.md | 2 + docs/design/ja/organizer-dashboard.md | 72 +++++++ docs/design/ja/roadmap.md | 2 + docs/design/ja/task-productivity-contacts.md | 4 +- internal/server/calendar_upcoming.go | 3 + internal/server/calendar_upcoming_test.go | 11 ++ internal/server/config_handler.go | 4 + internal/server/config_panels.go | 1 + internal/server/endpoint_policy.go | 3 + internal/server/organizer_dashboard.go | 119 ++++++++++++ internal/server/organizer_dashboard_test.go | 176 ++++++++++++++++++ internal/server/productivity_browser_test.go | 10 +- internal/server/request_context.go | 2 + internal/server/task_productivity.go | 10 +- internal/server/tasks_handler.go | 6 +- .../server/testdata/productivity-browser.js | 11 +- .../server/testdata/vim-browser-smoke.mjs | 14 ++ internal/store/organizer_dashboard.go | 134 +++++++++++++ internal/store/schema_modules_test.go | 24 +++ internal/store/task_productivity.go | 4 +- static/css/home.css | 4 +- static/css/organizer.css | 23 +++ static/js/calendar.js | 20 +- static/js/contacts.js | 2 +- static/js/organizer-dashboard.js | 132 +++++++++++++ static/js/organizer-settings.js | 15 ++ static/js/task-productivity.js | 13 +- static/js/tasks.js | 2 - templates/pages/calendar.gohtml | 4 +- templates/pages/config.gohtml | 2 +- templates/pages/contacts.gohtml | 6 +- templates/pages/home.gohtml | 3 +- templates/pages/organizer_dashboard.gohtml | 7 + templates/pages/organizer_settings.gohtml | 8 + templates/pages/page.gohtml | 2 +- templates/pages/periodical.gohtml | 2 +- templates/pages/search_home.gohtml | 3 +- templates/pages/task_productivity.gohtml | 4 - templates/pages/task_schedule.gohtml | 2 +- templates/pages/tasks.gohtml | 4 +- templates/partials/auth_menu.gohtml | 4 +- templates/partials/organizer_nav.gohtml | 12 ++ 44 files changed, 843 insertions(+), 54 deletions(-) create mode 100644 docs/design/ja/organizer-dashboard.md create mode 100644 internal/server/organizer_dashboard.go create mode 100644 internal/server/organizer_dashboard_test.go create mode 100644 internal/store/organizer_dashboard.go create mode 100644 static/css/organizer.css create mode 100644 static/js/organizer-dashboard.js create mode 100644 static/js/organizer-settings.js create mode 100644 templates/pages/organizer_dashboard.gohtml create mode 100644 templates/pages/organizer_settings.gohtml delete mode 100644 templates/pages/task_productivity.gohtml create mode 100644 templates/partials/organizer_nav.gohtml diff --git a/docs/design/README.md b/docs/design/README.md index a052544..0581be4 100644 --- a/docs/design/README.md +++ b/docs/design/README.md @@ -9,6 +9,8 @@ language-neutral; existing English source documents remain here for traceability and future aligned translations, not as automatically current English editions. - Concepts and boundaries: chapters 1–6. +- [Organizer navigation and personal dashboard](ja/organizer-dashboard.md): shared navigation, + personal settings, resizable widgets, owner-scoped layout storage and extension boundaries. - [Task capture, work reporting and private address book](ja/task-productivity-contacts.md): shared Web/CLI API, neomutt, defaults, daily digest and home search commands. - Existing product and runtime: chapters 7–11. diff --git a/docs/design/implementation-roadmap.md b/docs/design/implementation-roadmap.md index cf98b3b..38cb5ae 100644 --- a/docs/design/implementation-roadmap.md +++ b/docs/design/implementation-roadmap.md @@ -1,5 +1,14 @@ # Architecture Implementation Roadmap +## Organizer dashboard (2026-11-02) + +- [x] Common navigation for tasks, calendars, contacts and dashboard; home/navbar contacts entry. +- [x] Owner-only personal settings at `/-/sys/config?panel=organizer`, without expanding admin permissions. +- [x] Task tabs, today/tomorrow tasks, daily completion, calendar and activity widgets; reorder/resize and versioned layout persistence. +- [ ] Shared dashboards, multiple widget instances and sandboxed third-party widgets. + +See [dashboard contracts](ja/organizer-dashboard.md). Production rollout is a separate gate. + ## Task productivity and private contacts (2026-11-01) - [x] Add idempotent task capture API and neomutt configuration reference. diff --git a/docs/design/ja/index.md b/docs/design/ja/index.md index 95661ea..4ffe2aa 100644 --- a/docs/design/ja/index.md +++ b/docs/design/ja/index.md @@ -4,6 +4,8 @@ ## この設計書の読み方 +2026-11-02追加:[オーガナイザーの共通ナビゲーションと個人ダッシュボード](organizer-dashboard.md)。配置可能なウィジェット、個人設定への統合、保存・認可・読込負荷の契約。 + 2026-11-01追加:[タスク作成・作業記録・達成度レポート・日次メール・個人アドレス帳](task-productivity-contacts.md)。[neomuttとCLIの操作リファレンス](../../operations/neomutt-tasks.md)も参照。 - **実装済み**:利用できる機能の範囲。関連する制約や未監査部分も併記します。 diff --git a/docs/design/ja/organizer-dashboard.md b/docs/design/ja/organizer-dashboard.md new file mode 100644 index 0000000..40055b3 --- /dev/null +++ b/docs/design/ja/organizer-dashboard.md @@ -0,0 +1,72 @@ +# オーガナイザーのナビゲーションと個人ダッシュボード + +タスク・カレンダー・連絡先の入口を共通化し、個人設定と日々の振り返りを分離する。ダッシュボードは本人の作業を見る画面であり、サーバーの実行状態・リソース監視画面とは別に扱う。以下は2026-11-02のソース実装範囲。本番への反映は別途行う。 + +## 入口と設定の配置 + +各オーガナイザー画面に、ダッシュボード・タスク・カレンダー・連絡先・個人設定の共通ナビゲーションを置く。有効な拡張機能だけを表示し、現在の画面を強調する。トップ画面とログイン中のナビバーに、ダッシュボードと連絡先を直接開くアイコンを追加する。 + +| 入口 | 役割 | +| --- | --- | +| `/v/plan/dashboard` | ウィジェット形式の個人ダッシュボード | +| `/v/plan/tasks` | 既存のインライン編集可能なタスク一覧 | +| `/v/plan` | 既存のカレンダー表示。保存されたビューを尊重 | +| `/v/plan/contacts` | 個人アドレス帳・履歴・CardDAV接続 | +| `/-/sys/config?panel=organizer` | タスクの既定値、日次メール、既定のカレンダー | + +旧 `/v/plan/tasks/report` はダッシュボードの達成度ウィジェットへ、旧 `/v/plan/tasks/settings` は個人設定へ303リダイレクトする。カレンダーの表示選択ダイアログはその場の表示変更に使い、既定値の永続化は個人設定へ移す。 + +個人設定は通常の設定画面と同じURI体系・テーマを使うが、専用の軽量な画面として返す。GET/HEADかつ正確な `panel=organizer` の場合だけ個人向けハンドラーに振り分け、管理用設定やアカウント一覧は取得・描画しない。POSTの管理者チェックは緩和しない。保存先は既存の本人用APIであり、一般利用者に管理権限を付与しない。 + +## ウィジェット + +初期構成は次の6種類。任意のHTML・iframe・外部URL・スクリプトを登録する機能ではなく、サーバーが許可する組み込みIDを使う。 + +| ID | 内容 | +| --- | --- | +| `progress` | 今日に計画したタスクの完了数と達成率 | +| `today` | 今日の計画と今日までの期限超過を含む未完了タスク | +| `tomorrow` | 明日の計画または期限の未完了タスク | +| `tasks` | Inbox / Backlog / Someday / Review / Incomplete / Done タブ付き一覧 | +| `schedule` | 既定カレンダーにある今日の予定 | +| `activity` | 完了数・ポイント・作業時間・集中時間、日別ヒートマップ | + +タブはウィジェットの枠内で内容を切り替える。iframeを使わず、ページやブラウザ履歴を移動しない。タスク件名や右上の矢印は既存の詳細・一覧へ移動する。タスクの編集操作は従来の一覧・詳細画面を利用する。 + +達成率の分母は `planned_on=今日`、分子はそのうち `status=done` の件数。取りやめ・アーカイブ・プロジェクトを除く。日付はドメインのタイムゾーンで判定する。対象0件は100%でなく「—」を表示する。期限超過を含む「本日のタスク」の件数とは意図的に異なり、画面に定義を明記する。ヒートマップのポイント計算は[タスクの集計契約](task-productivity-contacts.md)に従う。 + +## 配置と保存 + +デスクトップは12列グリッド。幅は3〜12列、高さは2〜10単位、1単位の表示基準は72pxと12pxの間隔。順序に従ってグリッドへ配置するため、幅の組み合わせによって空白が生じる。任意の絶対座標を保持するレイアウトではない。 + +歯車で配置モードを開き、ハンドルのドラッグで並べ替え、右下のハンドルでサイズを変える。矢印ボタンと幅・高さの選択欄でも同じ操作が可能。追加・除去・初期配置への復帰に対応し、「配置を保存」で確定する。タブの選択も配置の一部として保存できる。未保存の離脱を警告し、保存失敗・競合時には編集中の配置を残す。ブラウザ再起動をまたぐ未保存レイアウトの下書きは持たない。 + +スマホは1列とタッチ向け操作へ切り替え、デスクトップ用の幅を上書きしない。カード内の長い一覧はスクロールする。並べ替えは矢印でも行える。幅指定とドラッグリサイズはスマホでは非表示。 + +保存は `organizer_dashboard_layouts` のDomain・本人を複合キーにし、JSONにウィジェットID・幅・高さ・選択タブだけを持つ。`task-productivity` managed migration v2でテーブルを追加する。既存v1の定義を変更しない。タスク既定値・メール同意とは別のversionを使い、配置保存が配信時刻や送信直前の同意チェックに影響しないようにする。 + +APIは `/_/api/v1/extension/organizer.tasks/` 配下。 + +| 操作 | 契約 | +| --- | --- | +| GET `dashboard` | `{version, widgets}`。未保存なら初期配置 | +| PUT `dashboard` | GETしたversionとwidgetsを送る。競合412、不正422、読み取り専用403 | +| GET `progress` | `{date, total, done}`。一覧の表示上限とは無関係にSQL集計 | + +空配列は空のダッシュボードとして保持する。同じウィジェットの重複、未知ID、不正なタブやサイズは拒否する。新規APIは通常のセッション認証を使い、CalDAV資格情報を受け付けない。匿名には返さず、レスポンスは `private, no-store`。ダッシュボードは `organizer.tasks` の有効化に従い、カレンダー無効時は予定を取得しない。 + +## 読み込み負荷 + +ウィジェットの初期読込・全更新は最大2ジョブを並行実行し、定期ポーリングしない。タブ切替では旧リクエストを中断し、後から到着した古い応答を採用しない。タスクは1回20件のカーソルページング。予定は既存upcoming APIに `period=day` を追加し、ドメインの当日0時から翌日0時までだけを問い合わせ、最大20件を表示する。続きはカレンダー本体へ移動する。達成度は既存report APIの期間・件数上限を引き継ぐ。 + +## 検証と後続範囲 + +合成データで、所有者分離、CAS、読み取り専用、匿名拒否、管理設定への権限拡大がないこと、空配置、禁止ウィジェット、メール設定の不変、今日の集計・予定範囲を検証する。ブラウザではデスクトップとスマホの導線、タブ、設定保存、配置保存、横はみ出しを確認し、デスクトップのドラッグ・リサイズには実ポインター入力を使う。本番の外部取り込みカレンダーは検証に使わない。 + +次段階は以下を別途設計する。 + +- ウィジェットの複数インスタンス、プロジェクト等の個別フィルターと保存スキーマversion。 +- 共有ダッシュボード。個人の配置やタスク権限を暗黙に共有しない。 +- 外部プラグインウィジェットの権限宣言・実行制限・障害隔離・リソース観測。 +- 画面外ウィジェットの遅延読込と、必要時だけの変更通知による更新。 +- データ移行後の切戻し手順。旧イメージのschema checkに新しいversionを無視させず、バックアップ保全と移行検証を伴ってリリースする。 diff --git a/docs/design/ja/roadmap.md b/docs/design/ja/roadmap.md index 6d6cd28..f1be196 100644 --- a/docs/design/ja/roadmap.md +++ b/docs/design/ja/roadmap.md @@ -4,6 +4,8 @@ ## 優先順 +2026-11-02:[共通ナビゲーション・個人設定・ウィジェットダッシュボード](organizer-dashboard.md)を実装。タスク/カレンダー/連絡先の導線統一、トップ・ナビバーの連絡先、個人別の配置・サイズ保存。ソース実装と本番反映は区別し、共有・外部ウィジェットは後続。 + 2026-11-02:[個人CardDAV提供と履歴復元・一括export](../../operations/carddav-contacts.md)を実装。専用資格情報、条件付き更新、変更tokenと削除tombstone、bounded REPORTを追加。09:04:17 JSTに[v0.6.0として本番2系統へ反映](../../operations/deployments/2026-11-02-v0.6.0.md)。共有アドレス帳・外部CardDAV connector・実機互換確認は同資料の後続範囲。 2026-11-01:[タスク作成・作業記録・達成度・日次メール・個人アドレス帳](task-productivity-contacts.md)を追加。Web/CLI/neomuttの共通capture、時間記録、既定値、検索コマンドを接続。作業記録の事後訂正、日次メールの再送・保持期間は同設計の後続範囲へ集約する。 diff --git a/docs/design/ja/task-productivity-contacts.md b/docs/design/ja/task-productivity-contacts.md index 4418b9f..60e7da5 100644 --- a/docs/design/ja/task-productivity-contacts.md +++ b/docs/design/ja/task-productivity-contacts.md @@ -28,13 +28,13 @@ calendar-captureも同じUIDを再利用し、再送で既存予定を上書き Webのタスク行の▶から開始し、上部の作業記録欄で終了する。CLIは `task start UUID` / `task stop`。タイマーはサーバーで継続するので、ブラウザや端末を閉じても止まらない。停止はタスク完了とは別操作。忘れずに終了すること。同一人物で同時に開始できる記録は1件。 -`/v/plan/tasks/report` は完了数、ポイント、作業時間、Pomodoro集中時間を表示する。ポイントは `1 + ceil(見積分数 / 30) × 複雑度`。複雑度は1〜5、未設定の旧タスクは1。見積なしは1ポイント。完了の取消は集計から除外し、再完了するとその日の実績になる。完了済みタスクの見積変更も現在のポイントへ反映される。これは個人の振り返り指標であり、人事評価や客観的生産性の尺度ではない。 +`/v/plan/dashboard` の達成度ウィジェットは完了数、ポイント、作業時間、Pomodoro集中時間を表示する。旧 `/v/plan/tasks/report` はここへ移動する。[配置・保存の契約](organizer-dashboard.md)を参照。ポイントは `1 + ceil(見積分数 / 30) × 複雑度`。複雑度は1〜5、未設定の旧タスクは1。見積なしは1ポイント。完了の取消は集計から除外し、再完了するとその日の実績になる。完了済みタスクの見積変更も現在のポイントへ反映される。これは個人の振り返り指標であり、人事評価や客観的生産性の尺度ではない。 深夜をまたぐ作業はローカル日付境界で分割し、夏時間の日も24時間固定にしない。Pomodoroと手動記録は別集計で、両者を合算しない。各系列は最大10,000件で、上限到達時はpartialを返して期間の絞り込みを促す。 ## 毎日のメール -`/v/plan/tasks/settings` で本人が有効化する。送信先は現在の本人のアカウントメールアドレスのみ。管理者のSMTP設定が必要。時刻はHH:mmとIANA timezoneを保存する。`task.digest.deliver` イベントが60秒周期で期限到来設定を最大20件ずつ処理する。キュー停止・負荷・SMTP遅延で配信時刻が遅れる場合がある。 +`/-/sys/config?panel=organizer` の個人設定で本人が有効化する。旧 `/v/plan/tasks/settings` もここへ移動する。送信先は現在の本人のアカウントメールアドレスのみ。管理者のSMTP設定が必要。時刻はHH:mmとIANA timezoneを保存する。`task.digest.deliver` イベントが60秒周期で期限到来設定を最大20件ずつ処理する。キュー停止・負荷・SMTP遅延で配信時刻が遅れる場合がある。 当日の計画・期限到来タスクを最大100件送る。件名、期限、取り組む日、見積、タスクURLを含め、メモは送らない。送信直前にアカウント状態・同意のversion・送信先を再確認する。メールによる保存・転送の可能性があるため、既定は無効。 diff --git a/internal/server/calendar_upcoming.go b/internal/server/calendar_upcoming.go index bcdd880..64fd2ed 100644 --- a/internal/server/calendar_upcoming.go +++ b/internal/server/calendar_upcoming.go @@ -60,6 +60,9 @@ func (s *Server) handleCalendarUpcoming(w http.ResponseWriter, r *http.Request, start = day } end := start.AddDate(0, 0, 31) + if r.URL.Query().Get("period") == "day" { + end = start.AddDate(0, 0, 1) + } for _, c := range cs { if !selected[c.ID] { continue diff --git a/internal/server/calendar_upcoming_test.go b/internal/server/calendar_upcoming_test.go index 1659271..61d6a8b 100644 --- a/internal/server/calendar_upcoming_test.go +++ b/internal/server/calendar_upcoming_test.go @@ -61,6 +61,17 @@ func TestCalendarUpcomingDefaultsAndBounds(t *testing.T) { if !strings.Contains(w.Header().Get("Cache-Control"), "no-store") { t.Fatal("private response cached") } + w = calendarRequest(s, token, "GET", calendarAPI+"upcoming?period=day", "", "") + if w.Code != 200 || json.Unmarshal(w.Body.Bytes(), &result) != nil { + t.Fatal(w.Code, w.Body) + } + now := time.Now().In(s.getLocation(domain)) + end := time.Date(now.Year(), now.Month(), now.Day()+1, 0, 0, 0, 0, s.getLocation(domain)) + for _, event := range result.Events { + if !event.Start.Before(end) { + t.Fatal("tomorrow event in today's widget", event.Start) + } + } if w = calendarRequest(s, "", "GET", calendarAPI+"upcoming", "", ""); w.Code != 403 { t.Fatal("anonymous access", w.Code) } diff --git a/internal/server/config_handler.go b/internal/server/config_handler.go index ac794d2..98cec9e 100644 --- a/internal/server/config_handler.go +++ b/internal/server/config_handler.go @@ -98,6 +98,10 @@ func (s *Server) handleConfig( w http.ResponseWriter, r *http.Request, ) { + if personalOrganizerSettings(r) { + s.handleOrganizerSettings(w, r) + return + } domainUUID := s.domainUUIDForRequest(r) principal := s.requestPrincipal(r) currentDomain := s.domainForRequest(r) diff --git a/internal/server/config_panels.go b/internal/server/config_panels.go index 37c9fe4..2e682bb 100644 --- a/internal/server/config_panels.go +++ b/internal/server/config_panels.go @@ -22,5 +22,6 @@ func configPanelGroups(locale string, plugins []adapterPlugin) []configPanelGrou groups[4].Panels = append(groups[4].Panels, configPanelLink{"adapter-" + plugin.ID, plugin.Name}) } groups = append(groups, configPanelGroup{"extensions", translate(locale, "extension.title"), []configPanelLink{link("extensions", "extension.catalog"), link("diary", "periodical.diary"), link("blog", "periodical.blog")}}) + groups = append(groups, configPanelGroup{"organizer", translate(locale, "organizer.title"), []configPanelLink{link("organizer", "organizer.settings")}}) return groups } diff --git a/internal/server/endpoint_policy.go b/internal/server/endpoint_policy.go index 730f119..10a7479 100644 --- a/internal/server/endpoint_policy.go +++ b/internal/server/endpoint_policy.go @@ -100,6 +100,9 @@ var mutationPrefixPolicies = []struct { } func policyForRequest(r *http.Request) endpointPolicy { + if personalOrganizerSettings(r) { + return endpointPolicy{Name: "organizer.settings", Capability: "read", Target: targetDomain, Resolver: resolveHandler} + } if taskRoute(r.URL.Path) { return endpointPolicy{Name: "tasks.handler", Capability: "read", Target: targetDomain, Resolver: resolveHandler} } diff --git a/internal/server/organizer_dashboard.go b/internal/server/organizer_dashboard.go new file mode 100644 index 0000000..b466695 --- /dev/null +++ b/internal/server/organizer_dashboard.go @@ -0,0 +1,119 @@ +package server + +import ( + "net/http" + "strings" + "time" + + "pageswiki/internal/store" +) + +func personalOrganizerSettings(r *http.Request) bool { + return r.URL.Path == "/-/sys/config" && r.URL.Query().Get("panel") == "organizer" && (r.Method == "GET" || r.Method == "HEAD") +} + +func (s *Server) handleOrganizerDashboard(w http.ResponseWriter, r *http.Request) { + if r.Method != "GET" && r.Method != "HEAD" { + w.Header().Set("Allow", "GET, HEAD") + w.WriteHeader(405) + return + } + _, active, ok := s.taskReady(w, r) + if !ok { + return + } + domain := s.domainUUIDForRequest(r) + s.renderWithContext(w, r, "organizer_dashboard.gohtml", map[string]any{"TaskWritable": active, "Today": time.Now().In(s.getLocation(domain)).Format("2006-01-02"), "Timezone": s.getTimezoneName(domain)}) +} + +func (s *Server) handleOrganizerSettings(w http.ResponseWriter, r *http.Request) { + w.Header().Set("Cache-Control", "private, no-store") + actor, active := s.calendarActor(r) + if actor == "" { + s.authRequired(w, r) + return + } + s.renderWithContext(w, r, "organizer_settings.gohtml", map[string]any{"TaskWritable": active}) +} + +func (s *Server) handleDashboardData(w http.ResponseWriter, r *http.Request, actor string, active bool, kind string) { + domain := s.domainUUIDForRequest(r) + if kind == "progress" { + if r.Method != "GET" { + w.Header().Set("Allow", "GET") + w.WriteHeader(405) + return + } + p, err := s.store.DashboardProgress(r.Context(), domain, actor, time.Now().In(s.getLocation(domain)).Format("2006-01-02")) + if err != nil { + taskError(w, err) + return + } + writeEventJSON(w, 200, p) + return + } + if r.Method != "GET" && r.Method != "PUT" { + w.Header().Set("Allow", "GET, PUT") + w.WriteHeader(405) + return + } + p, err := s.store.Dashboard(r.Context(), domain, actor) + if err != nil { + taskError(w, err) + return + } + if r.Method == "PUT" { + if !active { + taskError(w, store.ErrAccessDenied) + return + } + var input struct { + Version int64 `json:"version"` + Widgets []store.DashboardWidget `json:"widgets"` + } + if !taskJSON(w, r, &input) { + return + } + if input.Version != p.Version { + taskError(w, store.ErrTaskConflict) + return + } + // An empty dashboard is valid; nil means the initial default layout. + if input.Widgets == nil { + input.Widgets = []store.DashboardWidget{} + } + p, err = s.store.SaveDashboard(r.Context(), domain, actor, input.Version, input.Widgets) + if err != nil { + taskError(w, err) + return + } + } + writeEventJSON(w, 200, p) +} + +func organizerSection(path string) string { + switch { + case path == "/v/plan/dashboard": + return "dashboard" + case strings.HasPrefix(path, "/-/sys/config"): + return "settings" + case path == "/v/plan/contacts": + return "contacts" + case taskRoute(path): + return "tasks" + case calendarRoute(path): + return "calendar" + } + return "" +} + +func init() { + for lang, entries := range map[string]map[string]string{ + "en": {"organizer.title": "Organizer", "organizer.dashboard": "Dashboard", "organizer.settings": "Personal settings", "organizer.contacts": "Contacts", "organizer.private": "Preferences apply only to you in this Domain. System administration is separate.", "organizer.calendar_defaults": "Default calendars", "organizer.open": "Open"}, + "ja": {"organizer.title": "オーガナイザー", "organizer.dashboard": "ダッシュボード", "organizer.settings": "個人設定", "organizer.contacts": "連絡先", "organizer.private": "このドメイン内の自分だけに適用する設定です。システムの管理設定とは別です。", "organizer.calendar_defaults": "既定のカレンダー", "organizer.open": "開く"}, + } { + for k, v := range entries { + translations[lang][k] = v + } + } +} diff --git a/internal/server/organizer_dashboard_test.go b/internal/server/organizer_dashboard_test.go new file mode 100644 index 0000000..0605e0b --- /dev/null +++ b/internal/server/organizer_dashboard_test.go @@ -0,0 +1,176 @@ +package server + +import ( + "context" + "encoding/json" + "net/url" + "pageswiki/internal/store" + "strings" + "testing" + "time" +) + +func TestOrganizerDashboardLayoutIsolationAndCAS(t *testing.T) { + s, token, domain, actor := taskFixture(t) + w := taskRequest(s, token, "GET", "dashboard", nil, "") + if w.Code != 200 { + t.Fatal(w.Code, w.Body) + } + var layout struct { + Version int64 `json:"version"` + Widgets []store.DashboardWidget `json:"widgets"` + } + if err := json.Unmarshal(w.Body.Bytes(), &layout); err != nil || len(layout.Widgets) != 6 { + t.Fatal(layout, err) + } + widgets := []store.DashboardWidget{{ID: "tasks", Width: 7, Height: 4, Tab: "review"}} + w = taskRequest(s, token, "PUT", "dashboard", map[string]any{"version": 0, "widgets": widgets}, "") + if w.Code != 200 { + t.Fatal(w.Code, w.Body) + } + if w = taskRequest(s, token, "PUT", "dashboard", map[string]any{"version": 0, "widgets": widgets}, ""); w.Code != 412 { + t.Fatal("stale layout", w.Code) + } + p, err := s.store.TaskPreferences(context.Background(), domain, actor) + if err != nil || p.Version != 0 { + t.Fatal(p, err) + } + // A legacy CLI preferences write must preserve dashboard metadata. + p.Estimate = 90 + w = taskRequest(s, token, "PUT", "preferences", p, "") + if w.Code != 200 { + t.Fatal(w.Code, w.Body) + } + p, err = s.store.TaskPreferences(context.Background(), domain, actor) + if err != nil || p.Estimate != 90 { + t.Fatal(p, err) + } + l, err := s.store.Dashboard(context.Background(), domain, actor) + if err != nil || len(l.Widgets) != 1 || l.Version != 1 { + t.Fatal(l, err) + } + // Layout updates cannot postpone the digest scheduler. + if _, err = s.store.DB.Exec(`UPDATE organizer_task_preferences SET next_digest_ms=123 WHERE domain_uuid=? AND owner_uuid=?`, domain, actor); err != nil { + t.Fatal(err) + } + w = taskRequest(s, token, "PUT", "dashboard", map[string]any{"version": l.Version, "widgets": []store.DashboardWidget{}}, "") + if w.Code != 200 { + t.Fatal(w.Code, w.Body) + } + var next int64 + if err = s.store.DB.QueryRow(`SELECT next_digest_ms FROM organizer_task_preferences WHERE domain_uuid=? AND owner_uuid=?`, domain, actor).Scan(&next); err != nil || next != 123 { + t.Fatal(next, err) + } + after, err := s.store.TaskPreferences(context.Background(), domain, actor) + if err != nil || after.Version != p.Version || after.Estimate != 90 { + t.Fatal("layout changed mail consent", after, err) + } + w = taskRequest(s, token, "GET", "dashboard", nil, "") + if err = json.Unmarshal(w.Body.Bytes(), &layout); err != nil || len(layout.Widgets) != 0 { + t.Fatal("empty layout reset", layout, err) + } + for _, invalid := range [][]store.DashboardWidget{{{ID: "iframe", Width: 4, Height: 3}}, {{ID: "tasks", Width: 13, Height: 3, Tab: "inbox"}}, {{ID: "tasks", Width: 4, Height: 3, Tab: "secret"}}, {{ID: "progress", Width: 4, Height: 3}, {ID: "progress", Width: 4, Height: 3}}} { + w = taskRequest(s, token, "PUT", "dashboard", map[string]any{"version": layout.Version, "widgets": invalid}, "") + if w.Code != 422 { + t.Fatal("invalid accepted", w.Code, w.Body) + } + } + other, err := s.store.CreatePasswordAccount(domain, "dashboardother", "long test password", "Other", "") + if err != nil { + t.Fatal(err) + } + otherToken, err := s.store.CreateAuthSession(domain, other.UUID) + if err != nil { + t.Fatal(err) + } + w = taskRequest(s, otherToken, "GET", "dashboard", nil, "") + if err = json.Unmarshal(w.Body.Bytes(), &layout); err != nil || layout.Version != 0 || len(layout.Widgets) != 6 { + t.Fatal("owner leakage", layout, err) + } + if err = s.store.SetPrincipalState(domain, actor, "readonly"); err != nil { + t.Fatal(err) + } + token, err = s.store.CreateAuthSession(domain, actor) + if err != nil { + t.Fatal(err) + } + if w = taskRequest(s, token, "PUT", "dashboard", map[string]any{"version": 3, "widgets": widgets}, ""); w.Code != 403 { + t.Fatal("readonly write", w.Code) + } + if w = taskRequest(s, token, "GET", "dashboard", nil, ""); w.Code != 200 { + t.Fatal("readonly read", w.Code) + } + if w = taskRequest(s, "", "GET", "dashboard", nil, ""); w.Code == 200 { + t.Fatal("anonymous dashboard") + } + if err = s.store.SetConfigInDomain(domain, "system_extension_states", `{"organizer.tasks":false}`); err != nil { + t.Fatal(err) + } + if w = taskRequest(s, token, "GET", "dashboard", nil, ""); w.Code != 404 { + t.Fatal("disabled dashboard", w.Code) + } +} + +func TestOrganizerPersonalSettingsAreNotAdminAccess(t *testing.T) { + s, _, domain, _ := taskFixture(t) + u, err := s.store.CreatePasswordAccount(domain, "organizer", "long test password", "Organizer", "") + if err != nil { + t.Fatal(err) + } + token, err := s.store.CreateAuthSession(domain, u.UUID) + if err != nil { + t.Fatal(err) + } + w := configRequest(s, token, "GET", "/-/sys/config?panel=organizer", nil) + if w.Code != 200 || !strings.Contains(w.Body.String(), `id="task-productivity"`) { + t.Fatal(w.Code, w.Body) + } + if strings.Contains(w.Body.String(), `id="panel-auth"`) || strings.Contains(w.Body.String(), `id="panel-campus`) { + t.Fatal("admin data in personal settings") + } + if w = configRequest(s, token, "GET", "/-/sys/config?panel=auth", nil); w.Code != 403 { + t.Fatal("admin access", w.Code) + } + if w = configRequest(s, token, "POST", "/-/sys/config?panel=organizer", url.Values{"section": {"home"}}); w.Code != 403 { + t.Fatal("config mutation", w.Code) + } + for path, target := range map[string]string{"/v/plan/tasks/settings": "/-/sys/config?panel=organizer", "/v/plan/tasks/report": "/v/plan/dashboard#activity"} { + w = configRequest(s, token, "GET", path, nil) + if w.Code != 303 || w.Header().Get("Location") != target { + t.Fatal(path, w.Code, w.Header()) + } + } + for _, path := range []string{"/v/plan/dashboard", "/v/plan/tasks", "/v/plan/contacts", "/v/plan"} { + w = configRequest(s, token, "GET", path, nil) + if w.Code != 200 || !strings.Contains(w.Body.String(), `class="organizer-nav"`) { + t.Fatal(path, w.Code, w.Body) + } + } +} + +func TestOrganizerProgressExactAndPrivate(t *testing.T) { + s, token, domain, actor := taskFixture(t) + today := time.Now().In(s.getLocation(domain)).Format("2006-01-02") + for i, status := range []string{"todo", "done", "cancelled", "done"} { + item := newTaskRecord("task", "Progress test") + item.Status = status + item.PlannedOn = today + item.Archived = i == 3 + if _, err := s.store.SaveTask(context.Background(), domain, actor, item, 0); err != nil { + t.Fatal(err) + } + } + w := taskRequest(s, token, "GET", "progress", nil, "") + var p store.DashboardProgress + if err := json.Unmarshal(w.Body.Bytes(), &p); err != nil || w.Code != 200 || p.Total != 2 || p.Done != 1 || p.Date != today { + t.Fatal(w.Code, p, err, w.Body) + } + other, err := s.store.CreatePasswordAccount(domain, "progressother", "long test password", "Other", "") + if err != nil { + t.Fatal(err) + } + p, err = s.store.DashboardProgress(context.Background(), domain, other.UUID, today) + if err != nil || p.Total != 0 { + t.Fatal("progress leak", p, err) + } +} diff --git a/internal/server/productivity_browser_test.go b/internal/server/productivity_browser_test.go index 6e35064..c769ca0 100644 --- a/internal/server/productivity_browser_test.go +++ b/internal/server/productivity_browser_test.go @@ -38,10 +38,10 @@ func TestProductivityChromium(t *testing.T) { if e != nil { t.Fatal(e) } - path := map[string]string{"contacts": "/v/plan/contacts", "settings": "/v/plan/tasks/settings", "report": "/v/plan/tasks/report", "tasks": "/v/plan/tasks", "home": "/"}[view] + path := map[string]string{"contacts": "/v/plan/contacts", "settings": "/-/sys/config?panel=organizer", "report": "/v/plan/dashboard", "tasks": "/v/plan/tasks", "home": "/"}[view] server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { r.Header.Set("Authorization", "Bearer "+token) - if r.Method == "GET" && r.URL.Path == path { + if r.Method == "GET" && r.URL.RequestURI() == path { rec := httptest.NewRecorder() s.withAuthorization(s.mux).ServeHTTP(rec, r) for k, v := range rec.Header() { @@ -70,7 +70,11 @@ func TestProductivityChromium(t *testing.T) { if prefix := os.Getenv("PAGESWIKI_PRODUCTIVITY_SCREENSHOT"); prefix != "" { shot = prefix + "-" + view + "-" + size + ".png" } - out, e := exec.CommandContext(ctx, "node", "internal/server/testdata/vim-browser-smoke.mjs", strings.Replace(server.URL, "127.0.0.1", "localhost", 1)+path, t.TempDir(), shot, width, height).CombinedOutput() + command := exec.CommandContext(ctx, "node", "internal/server/testdata/vim-browser-smoke.mjs", strings.Replace(server.URL, "127.0.0.1", "localhost", 1)+path, t.TempDir(), shot, width, height) + if view == "report" && size == "desktop" { + command.Env = append(os.Environ(), "PAGESWIKI_DASHBOARD_DRAG=1") + } + out, e := command.CombinedOutput() if e != nil { t.Fatalf("%v: %s", e, out) } diff --git a/internal/server/request_context.go b/internal/server/request_context.go index 3d06c55..c66e98d 100644 --- a/internal/server/request_context.go +++ b/internal/server/request_context.go @@ -67,6 +67,8 @@ func (s *Server) renderWithContext( w.Header().Add("Vary", "Cookie") data["CalendarEnabled"] = s.systemExtensionEnabled(domainUUID, "organizer.calendar") data["TasksEnabled"] = s.systemExtensionEnabled(domainUUID, "organizer.tasks") + data["ContactsEnabled"] = s.systemExtensionEnabled(domainUUID, "organizer.contacts") + data["OrganizerSection"] = organizerSection(r.URL.Path) if r.URL.Path == "/" { data["IsHome"] = true data["BookmarkSections"] = s.bookmarkSections(r) diff --git a/internal/server/task_productivity.go b/internal/server/task_productivity.go index 1c87a09..b002b17 100644 --- a/internal/server/task_productivity.go +++ b/internal/server/task_productivity.go @@ -58,6 +58,9 @@ func (s *Server) handleTaskProductivity(w http.ResponseWriter, r *http.Request, return } switch kind { + case "dashboard", "progress": + s.handleDashboardData(w, r, actor, active, kind) + return case "calendar-capture": if r.Method == "POST" { if !s.systemExtensionEnabled(domain, "organizer.calendar") { @@ -263,6 +266,9 @@ func (s *Server) handleTaskProductivity(w http.ResponseWriter, r *http.Request, } func (s *Server) handleTaskProductivityPage(w http.ResponseWriter, r *http.Request, active bool) { - view := strings.TrimPrefix(r.URL.Path, "/v/plan/tasks/") - s.renderWithContext(w, r, "task_productivity.gohtml", map[string]any{"Title": "Tasks", "ProductivityView": view, "TaskWritable": active, "Path": r.URL.Path}) + if strings.HasSuffix(r.URL.Path, "/settings") { + http.Redirect(w, r, "/-/sys/config?panel=organizer", http.StatusSeeOther) + return + } + http.Redirect(w, r, "/v/plan/dashboard#activity", http.StatusSeeOther) } diff --git a/internal/server/tasks_handler.go b/internal/server/tasks_handler.go index 800bb3b..7a7e95f 100644 --- a/internal/server/tasks_handler.go +++ b/internal/server/tasks_handler.go @@ -20,6 +20,9 @@ import ( const tasksAPI = "/_/api/v1/extension/organizer.tasks/" func taskRoute(p string) bool { + if p == "/v/plan/dashboard" { + return true + } if contactRoute(p) { return true } @@ -27,6 +30,7 @@ func taskRoute(p string) bool { } func (s *Server) registerTaskRoutes() { + s.mux.HandleFunc("/v/plan/dashboard", s.handleOrganizerDashboard) s.mux.HandleFunc(contactDAV, s.handleContactDAV) s.mux.HandleFunc(strings.TrimSuffix(contactDAV, "/"), s.handleContactDAV) s.mux.HandleFunc("/.well-known/carddav", s.handleContactDAV) @@ -208,7 +212,7 @@ func (s *Server) handleTasksAPI(w http.ResponseWriter, r *http.Request) { r = r.WithContext(ctx) domain := s.domainUUIDForRequest(r) parts := strings.Split(strings.TrimPrefix(r.URL.Path, tasksAPI), "/") - if len(parts) == 1 && (parts[0] == "calendar-capture" || parts[0] == "capture" || parts[0] == "preferences" || parts[0] == "work" || parts[0] == "report") { + if len(parts) == 1 && (parts[0] == "dashboard" || parts[0] == "progress" || parts[0] == "calendar-capture" || parts[0] == "capture" || parts[0] == "preferences" || parts[0] == "work" || parts[0] == "report") { s.handleTaskProductivity(w, r, actor, active, parts[0]) return } diff --git a/internal/server/testdata/productivity-browser.js b/internal/server/testdata/productivity-browser.js index 9c9ecbd..5caf78e 100644 --- a/internal/server/testdata/productivity-browser.js +++ b/internal/server/testdata/productivity-browser.js @@ -7,10 +7,15 @@ window.addEventListener('load',async()=>{const wait=async(fn)=>{for(let i=0;i<12 window.confirm=()=>true;document.querySelectorAll('.contact-history-row')[1].querySelectorAll('button')[1].click();await wait(()=>document.querySelector('#contacts-list button')?.textContent.includes('ブラウザ')); const exported=await fetch('/_/api/v1/extension/organizer.contacts/export.vcf').then(r=>r.text());if(!exported.includes('ブラウザ連絡先'))throw Error('Export missing'); document.querySelector('#tasks-dav-open').click();await wait(()=>document.querySelector('#tasks-dav-dialog').open);const dav=document.querySelector('#tasks-dav-dialog');if(getComputedStyle(dav.querySelector('.dav-compat-toggle')).display!=='none')throw Error('CalDAV-only compatibility visible');fill(dav.querySelector('form>input'),'Browser contact client');dav.querySelector('form').requestSubmit();await wait(()=>!dav.querySelector('section').hidden);const credentials=await fetch('/_/api/v1/caldav-credentials').then(r=>r.json());if(credentials.items.length!==1||credentials.items[0].scope!=='contacts')throw Error('Wrong credential scope');dav.querySelector('tbody button').click();await wait(()=>!dav.querySelector('tbody button'));dav.querySelector('header button').click(); - }else if(path.endsWith('/settings')){ + }else if(path==='/-/sys/config'){ await wait(()=>document.querySelector('[name=due_days]'));fill(document.querySelector('[name=due_days]'),'2');document.querySelector('.productivity-settings').requestSubmit();await wait(()=>document.querySelector('#productivity-status').textContent.includes('保存'));const d=await fetch('/_/api/v1/extension/organizer.tasks/preferences').then(r=>r.json());if(d.preferences.due_days!==2)throw Error('Preferences missing'); - }else if(path.endsWith('/report')){ + }else if(path==='/v/plan/dashboard'){ await wait(()=>document.querySelectorAll('.productivity-day').length>300);if(!document.querySelector('.productivity-day[data-level="2"]'))throw Error('Seven-point completion missing'); + if(document.querySelectorAll('[data-widget]').length!==6)throw Error('Widget registry missing'); + const tab=document.querySelector('[data-tab=done]');tab.click();await wait(()=>document.querySelector('#widget-panel-tasks').textContent.includes('Browser work task'));if(location.pathname!=='/v/plan/dashboard'||document.querySelector('#organizer-dashboard iframe'))throw Error('Tab navigation escaped widget'); + document.querySelector('#dashboard-controls button[aria-pressed]').click();const width=document.querySelector('[data-widget=tasks] [data-size=width]');width.value='6';width.dispatchEvent(new Event('change'));const height=document.querySelector('[data-widget=tasks] [data-size=height]');height.value='5';height.dispatchEvent(new Event('change')); + document.querySelector('[data-widget=tasks] .widget-arrange button').click();document.querySelector('#dashboard-controls button:last-child').click();await wait(()=>document.querySelector('#dashboard-status').textContent.includes('保存しました'));const layout=await fetch('/_/api/v1/extension/organizer.tasks/dashboard').then(r=>r.json());if(layout.widgets[2].id!=='tasks'||layout.widgets[2].width!==6||layout.widgets[2].height!==5||layout.widgets[2].tab!=='done')throw Error('Layout did not persist'); + if(!document.querySelector('.organizer-nav a[href="/v/plan/contacts"]')||!document.querySelector('.organizer-nav a[aria-current="page"]'))throw Error('Shared navigation missing'); }else if(path==='/v/plan/tasks'){ const prefs=await fetch('/_/api/v1/extension/organizer.tasks/preferences').then(r=>r.json());await fetch('/_/api/v1/extension/organizer.tasks/preferences',{method:'PUT',headers:{'Content-Type':'application/json'},body:JSON.stringify({...prefs.preferences,due_days:2,estimate_minutes:60})}); await wait(()=>document.querySelector('#tasks-quick-title'));fill(document.querySelector('#tasks-quick-title'),'Recording task');document.querySelector('#tasks-capture').requestSubmit();await wait(()=>document.querySelector('[data-action=work]'));document.querySelector('[data-action=work]').click();await wait(()=>document.querySelector('.task-work-bar a').textContent.includes('Recording task'));document.querySelector('.task-work-bar button').click();await wait(()=>document.querySelector('.task-work-bar').hidden); @@ -18,5 +23,5 @@ window.addEventListener('load',async()=>{const wait=async(fn)=>{for(let i=0;i<12 }else{ const input=document.querySelector('[data-home-type-search]');fill(input,'add task 検証 cost:2h complexity:3');input.closest('form').requestSubmit();await wait(()=>document.querySelector('.home-command-panel button'));document.querySelector('.home-command-panel button').click();await wait(()=>document.querySelector('.home-command-panel a'));const d=await fetch('/_/api/v1/extension/organizer.tasks/items?q='+encodeURIComponent('検証')).then(r=>r.json());if(d.items[0].estimate_minutes!==120)throw Error('Command cost missing');fill(input,'add cal 会議 from:2026-11-02T09:00 to:2026-11-02T10:00');input.closest('form').requestSubmit();await wait(()=>document.querySelector('.home-command-panel button'));document.querySelector('.home-command-panel button').click();await wait(()=>document.querySelector('.home-command-panel a')?.href.includes('/event/')); } - if(document.documentElement.scrollWidth>innerWidth+2)throw Error('Page horizontal overflow');document.body.dataset.vimReady='true'; +if(document.documentElement.scrollWidth>innerWidth+2)throw Error('Page horizontal overflow: '+[...document.querySelectorAll('body *')].filter(n=>{const r=n.getBoundingClientRect();return r.width&&r.right>innerWidth+2;}).slice(0,15).map(n=>n.tagName+'.'+n.className+':'+Math.round(n.getBoundingClientRect().right)).join(', '));document.body.dataset.vimReady='true'; }catch(e){const n=document.createElement('pre');n.id='error';n.textContent=(e.stack||String(e))+'\n'+(document.querySelector('.home-command-panel')?.textContent||'');document.body.append(n);}}); diff --git a/internal/server/testdata/vim-browser-smoke.mjs b/internal/server/testdata/vim-browser-smoke.mjs index 89cf789..a0957e0 100644 --- a/internal/server/testdata/vim-browser-smoke.mjs +++ b/internal/server/testdata/vim-browser-smoke.mjs @@ -44,6 +44,20 @@ try { if (state.ready) { ready = true; break; } await delay(200); } + if(ready && process.env.PAGESWIKI_DASHBOARD_DRAG==='1'){ + const evaluate=async expression=>{const r=await call('Runtime.evaluate',{expression,returnByValue:true,awaitPromise:true});if(r.exceptionDetails)throw Error(JSON.stringify(r.exceptionDetails));return r.result.value;}; + const rect=async selector=>evaluate(`(()=>{const n=document.querySelector(${JSON.stringify(selector)});n.scrollIntoView({block:'center',behavior:'instant'});const r=n.getBoundingClientRect();return {x:r.x+r.width/2,y:r.y+r.height/2};})()`); + const drag=async(from,to)=>{await call('Input.dispatchMouseEvent',{type:'mouseMoved',...from});await call('Input.dispatchMouseEvent',{type:'mousePressed',...from,button:'left',buttons:1,clickCount:1});for(let n=1;n<=8;n++)await call('Input.dispatchMouseEvent',{type:'mouseMoved',x:from.x+(to.x-from.x)*n/8,y:from.y+(to.y-from.y)*n/8,buttons:1});await call('Input.dispatchMouseEvent',{type:'mouseReleased',...to,button:'left',buttons:0,clickCount:1});}; + await evaluate(`scrollTo({top:0,behavior:'instant'})`); + const coordinates=await evaluate(`(()=>{const point=s=>{const r=document.querySelector(s).getBoundingClientRect();return {x:r.x+r.width/2,y:r.y+r.height/2};};return {from:point('[data-widget=progress] .widget-drag'),to:point('[data-widget=today] .widget-header')};})()`);await drag(coordinates.from,coordinates.to); + if(await evaluate(`document.querySelector('#dashboard-grid').firstElementChild.dataset.widget`)!=='today')throw Error('Pointer reorder failed: '+JSON.stringify(coordinates)); + const grip=await rect('[data-widget=tasks] .widget-resize');await drag(grip,{x:grip.x,y:grip.y-84}); + if(await evaluate(`document.querySelector('[data-widget=tasks] [data-size=height]').value`)!=='4')throw Error('Pointer resize failed'); + await evaluate(`document.querySelector('#dashboard-controls button:last-child').click()`); + let saved=false;for(let n=0;n<50;n++){if(await evaluate(`document.querySelector('#dashboard-status').textContent.includes('保存しました')`)){saved=true;break;}await delay(100);}if(!saved)throw Error('Pointer layout save failed'); + const layout=await evaluate(`fetch('/_/api/v1/extension/organizer.tasks/dashboard').then(r=>r.json())`);if(layout.widgets[0].id!=='today'||layout.widgets.find(w=>w.id==='tasks').height!==4)throw Error('Pointer layout persistence failed'); + await evaluate(`document.querySelector('#dashboard-controls button[aria-pressed]').click();scrollTo(0,0)`); + } if (screenshot) { const {data} = await call('Page.captureScreenshot', {format: 'png'}); await writeFile(screenshot, Buffer.from(data, 'base64')); diff --git a/internal/store/organizer_dashboard.go b/internal/store/organizer_dashboard.go new file mode 100644 index 0000000..973ad62 --- /dev/null +++ b/internal/store/organizer_dashboard.go @@ -0,0 +1,134 @@ +package store + +import ( + "context" + "database/sql" + "encoding/json" + "errors" +) + +// Dashboard is owner-scoped presentation metadata. It never contains executable +// widgets, URLs or private task content, and is versioned separately from mail. +type DashboardWidget struct { + ID string `json:"id"` + Width int `json:"width"` + Height int `json:"height"` + Tab string `json:"tab,omitempty"` +} + +func DefaultDashboard() []DashboardWidget { + return []DashboardWidget{{ID: "progress", Width: 4, Height: 3}, {ID: "today", Width: 4, Height: 3}, {ID: "tomorrow", Width: 4, Height: 3}, {ID: "tasks", Width: 8, Height: 4, Tab: "inbox"}, {ID: "schedule", Width: 4, Height: 4}, {ID: "activity", Width: 12, Height: 5}} +} + +func ValidateDashboard(items []DashboardWidget) error { + if len(items) > 6 { + return ErrTaskInvalid + } + seen := map[string]bool{} + for _, item := range items { + switch item.ID { + case "progress", "today", "tomorrow", "tasks", "schedule", "activity": + default: + return ErrTaskInvalid + } + if seen[item.ID] || item.Width < 3 || item.Width > 12 || item.Height < 2 || item.Height > 10 { + return ErrTaskInvalid + } + seen[item.ID] = true + if item.ID == "tasks" { + switch item.Tab { + case "inbox", "backlog", "someday", "review", "all", "done": + default: + return ErrTaskInvalid + } + } else if item.Tab != "" { + return ErrTaskInvalid + } + } + return nil +} + +type DashboardLayout struct { + Version int64 `json:"version"` + Widgets []DashboardWidget `json:"widgets"` +} + +func (s *Store) Dashboard(ctx context.Context, domain, actor string) (DashboardLayout, error) { + p := DashboardLayout{Widgets: DefaultDashboard()} + if err := taskActor(ctx, s.DB, domain, actor, false); err != nil { + return p, err + } + var raw string + err := s.DB.QueryRowContext(ctx, `SELECT version,data FROM organizer_dashboard_layouts WHERE domain_uuid=? AND owner_uuid=?`, domain, actor).Scan(&p.Version, &raw) + if errors.Is(err, sql.ErrNoRows) { + return p, nil + } + if err != nil { + return p, err + } + err = json.Unmarshal([]byte(raw), &p.Widgets) + return p, err +} + +// Layout updates do not invalidate in-flight email delivery consent/version. +func (s *Store) SaveDashboard(ctx context.Context, domain, actor string, version int64, widgets []DashboardWidget) (DashboardLayout, error) { + p := DashboardLayout{} + if s.ReadOnly { + return p, ErrReadOnly + } + if version < 0 { + return p, ErrTaskInvalid + } + if err := ValidateDashboard(widgets); err != nil { + return p, err + } + tx, err := s.DB.BeginTx(ctx, nil) + if err != nil { + return p, err + } + defer tx.Rollback() + if err = taskProductivityWriter(ctx, tx, domain, actor); err != nil { + return p, err + } + err = tx.QueryRowContext(ctx, `SELECT version FROM organizer_dashboard_layouts WHERE domain_uuid=? AND owner_uuid=?`, domain, actor).Scan(&p.Version) + if err != nil && !errors.Is(err, sql.ErrNoRows) { + return p, err + } + if p.Version != version { + return p, ErrTaskConflict + } + p.Version++ + p.Widgets = widgets + if p.Widgets == nil { + p.Widgets = []DashboardWidget{} + } + data, err := json.Marshal(p.Widgets) + if err != nil { + return p, err + } + _, err = tx.ExecContext(ctx, `INSERT INTO organizer_dashboard_layouts(domain_uuid,owner_uuid,version,data) VALUES(?,?,?,?) ON CONFLICT(domain_uuid,owner_uuid) DO UPDATE SET version=excluded.version,data=excluded.data`, domain, actor, p.Version, string(data)) + if err != nil { + return p, err + } + return p, tx.Commit() +} + +type DashboardProgress struct { + Date string `json:"date"` + Total int `json:"total"` + Done int `json:"done"` +} + +// Deliberately count all rows, not a truncated list response. Cancelled and +// archived items are excluded from both numerator and denominator. +func (s *Store) DashboardProgress(ctx context.Context, domain, actor, day string) (DashboardProgress, error) { + p := DashboardProgress{Date: day} + if !validTaskDate(day) || day == "" { + return p, ErrTaskInvalid + } + if err := taskActor(ctx, s.DB, domain, actor, false); err != nil { + return p, err + } + err := s.DB.QueryRowContext(ctx, `SELECT count(*),COALESCE(sum(status='done'),0) FROM organizer_items WHERE domain_uuid=? AND owner_uuid=? AND kind='task' AND archived=0 AND status!='cancelled' AND planned_on=?`, domain, actor, day).Scan(&p.Total, &p.Done) + return p, err +} diff --git a/internal/store/schema_modules_test.go b/internal/store/schema_modules_test.go index 574f0c2..299e4d9 100644 --- a/internal/store/schema_modules_test.go +++ b/internal/store/schema_modules_test.go @@ -86,6 +86,30 @@ func TestTaskProductivityMigrationBackfillsOnce(t *testing.T) { } } +func TestDashboardUpgradePreservesTaskPreferences(t *testing.T) { + st := newSchemaTestStore(t) + if err := db.ApplySQLiteMigrations(context.Background(), st.DB, "task-productivity", taskProductivityMigrations[:1]); err != nil { + t.Fatal(err) + } + if _, err := st.DB.Exec(`INSERT INTO organizer_task_preferences VALUES('domain','owner',7,'{"estimate_minutes":90}',123)`); err != nil { + t.Fatal(err) + } + for range 2 { + if err := st.ensureSchemaComponent("task-productivity"); err != nil { + t.Fatal(err) + } + } + var version, next int64 + var raw string + if err := st.DB.QueryRow(`SELECT version,data,next_digest_ms FROM organizer_task_preferences`).Scan(&version, &raw, &next); err != nil || version != 7 || next != 123 || raw != `{"estimate_minutes":90}` { + t.Fatal(version, raw, next, err) + } + var count int + if err := st.DB.QueryRow(`SELECT count(*) FROM organizer_dashboard_layouts`).Scan(&count); err != nil || count != 0 { + t.Fatal(count, err) + } +} + func TestManagedSchemasFreshRepeatAndReadOnly(t *testing.T) { for component := range managedStoreSchemas { t.Run(component, func(t *testing.T) { diff --git a/internal/store/task_productivity.go b/internal/store/task_productivity.go index 7d34f24..27e05f5 100644 --- a/internal/store/task_productivity.go +++ b/internal/store/task_productivity.go @@ -26,7 +26,9 @@ var taskProductivityMigrations = []db.SQLMigration{{Version: 1, Name: "task_capt schemaColumns("organizer_task_preferences", "domain_uuid,owner_uuid,version,data,next_digest_ms"), schemaUnique("organizer_capture_receipts", "domain_uuid,owner_uuid,request_uuid"), schemaIndex("organizer_work_sessions", "organizer_work_period", "domain_uuid,owner_uuid,start_ms,uuid"), -}}} +}}, {Version: 2, Name: "personal_dashboard_layout", Statements: []string{ + `CREATE TABLE organizer_dashboard_layouts(domain_uuid TEXT NOT NULL,owner_uuid TEXT NOT NULL,version INTEGER NOT NULL,data TEXT NOT NULL,PRIMARY KEY(domain_uuid,owner_uuid))`, +}, Assertions: []string{schemaColumns("organizer_dashboard_layouts", "domain_uuid,owner_uuid,version,data"), schemaUnique("organizer_dashboard_layouts", "domain_uuid,owner_uuid")}}} type TaskPreferences struct { Version int64 `json:"version"` diff --git a/static/css/home.css b/static/css/home.css index f692999..fbc9b22 100644 --- a/static/css/home.css +++ b/static/css/home.css @@ -56,7 +56,7 @@ body.periodical-top:has(> .home-wallpaper) .periodical-shell dialog header { bac body:has(> .home-wallpaper) :is(.notification-dialog,.calendar-upcoming-dialog,.city-map-dialog,dialog.home-bookmark-manager,.auth-menu-popover), body.periodical-top:has(> .home-wallpaper) .periodical-shell dialog { background:color-mix(in srgb,var(--bg) 92%,transparent); } } -.home-shortcuts { display:flex; width:max-content; max-width:100%; margin:1.35rem auto 0; gap:.25rem; } +.home-shortcuts { display:flex; flex-wrap:wrap; justify-content:center; width:max-content; max-width:100%; margin:1.35rem auto 0; gap:.25rem; } .home-shortcuts a { display:grid; place-items:center; width:2.45rem; height:2.45rem; border-radius:50%; color:var(--fg); } .home-shortcuts a:hover,.home-shortcuts a:focus-visible { background:color-mix(in srgb,var(--accent) 17%,transparent); color:var(--accent); outline:2px solid color-mix(in srgb,var(--accent) 42%,transparent); outline-offset:-2px; } .home-shortcuts svg { width:1.35rem; height:1.35rem; fill:none; stroke:currentColor; stroke-width:1.65; stroke-linecap:round; stroke-linejoin:round; } @@ -84,7 +84,7 @@ body.periodical-top:has(> .home-wallpaper) .periodical-shell dialog header { bac .home-bookmark { display: flex; gap: .8rem; align-items: center; padding: 1.25rem; border: 1px solid var(--border); border-radius: .65rem; overflow-wrap: anywhere; } .home-bookmark:hover { background: var(--button-hover-bg); border-color: var(--accent); } .home-empty { color: var(--muted); } -.home-layout-search .home-main { min-height: 100vh; min-height: 100svh; display: grid; align-items: center; padding-block: 5rem; } +.home-layout-search .home-main { min-height: 100vh; min-height: 100svh; display: grid; grid-template-columns:minmax(0,1fr); align-items: center; padding-block: 5rem; } .home-layout-directory .home-main { padding-top: max(7rem, 18vh); } @media (max-width: 600px) { .home-layout-directory .home-main { padding-top: 7rem; } .home-search ~ .home-bookmarks { margin-top: 2.5rem; } } .home-paged { height:100vh; height:100dvh; overflow:hidden; overscroll-behavior:none; } diff --git a/static/css/organizer.css b/static/css/organizer.css new file mode 100644 index 0000000..c829ad5 --- /dev/null +++ b/static/css/organizer.css @@ -0,0 +1,23 @@ +.organizer-nav{display:flex;flex-shrink:0;gap:.25rem;align-items:center;flex-wrap:wrap;padding:.45rem 1rem;border-bottom:1px solid var(--border,#8885);color:var(--fg);background:var(--bg)} +.organizer-nav a{display:flex;align-items:center;gap:.4rem;padding:.4rem .7rem;border-radius:.4rem;color:var(--link,var(--accent));text-decoration:none;white-space:nowrap;font-size:.9rem} +.organizer-nav a[aria-current=page]{background:color-mix(in srgb,var(--accent,#478ddd) 15%,transparent);box-shadow:inset 0 -2px var(--accent,#478ddd);color:var(--fg)} +.organizer-nav a:hover{background:var(--row-hover,var(--border-soft,#8882))} +.organizer-nav-icons{display:flex;align-items:center;gap:.15rem}.organizer-launch{display:inline-flex;align-items:center;justify-content:center;color:var(--fg);width:2.1rem;height:2.1rem;box-sizing:border-box;padding:.35rem;border-radius:50%} +.organizer-launch svg{width:100%;height:100%;fill:none;stroke:currentColor;stroke-width:1.6;stroke-linecap:round;stroke-linejoin:round}.organizer-launch:hover{color:var(--accent)} +.organizer-page .topbar{flex-wrap:wrap;gap:.2rem}.organizer-settings-content{min-width:0;padding:.75rem 1rem}.organizer-settings-content #task-productivity{margin:0;padding:0}.organizer-calendar-options{display:grid;gap:.4rem}.organizer-calendar-options label{display:flex;align-items:center;gap:.5rem;min-height:2rem} +#organizer-dashboard{max-width:1800px;margin:auto;padding:1rem;box-sizing:border-box;color:var(--fg)} +.dashboard-toolbar{display:flex;justify-content:space-between;align-items:center;gap:.75rem;flex-wrap:wrap}.dashboard-toolbar h1{margin:0;font-size:1.5rem}#dashboard-controls{display:flex;gap:.35rem;align-items:center;flex-wrap:wrap} +#organizer-dashboard button,#organizer-dashboard select,#organizer-calendar-defaults button{font:inherit;color:var(--fg);background:var(--input-bg,var(--bg));border:1px solid var(--border,#8885);border-radius:.35rem;padding:.3rem .5rem;cursor:pointer} +#organizer-dashboard button:disabled{opacity:.5;cursor:default}#organizer-dashboard a{color:var(--link,var(--accent))}#dashboard-status{min-height:1.3em;margin:.4rem 0;font-size:.85rem} +#dashboard-grid{display:grid;grid-template-columns:repeat(12,minmax(0,1fr));grid-auto-rows:72px;gap:12px;align-items:stretch} +.dashboard-widget{grid-column:span var(--widget-width,4);grid-row:span var(--widget-height,3);min-width:0;min-height:0;display:flex;flex-direction:column;position:relative;border:1px solid var(--border,#8885);border-radius:.65rem;background:var(--panel-bg,var(--bg));overflow:hidden;box-shadow:0 2px 8px #0001} +.widget-header{display:flex;align-items:center;gap:.5rem;min-width:0;padding:.55rem .7rem;border-bottom:1px solid var(--border,#8883)}.widget-header h2{font-size:.95rem;margin:0;flex:1;min-width:0}.widget-header>a{text-decoration:none;padding:.1rem .3rem} +.widget-body{flex:1;min-height:0;overflow:auto;overscroll-behavior:contain;padding:.65rem;contain:layout style}.widget-body p{margin:.4rem 0}.widget-body small{font-size:.8rem;opacity:.8} +.widget-arrange{display:none;gap:.3rem;align-items:center;flex-wrap:wrap;padding:.35rem;border-bottom:1px dashed var(--border,#8885);font-size:.8rem}.widget-arrange label{display:flex;align-items:center;gap:.2rem} +#organizer-dashboard .widget-drag,#organizer-dashboard .widget-resize{display:none;touch-action:none}.is-arranging .widget-arrange{display:flex}#organizer-dashboard.is-arranging .widget-drag,#organizer-dashboard.is-arranging .widget-resize{display:inline-flex}.widget-drag{cursor:grab!important}.widget-resize{position:absolute;right:0;bottom:0;z-index:2;cursor:nwse-resize!important}.widget-moving{outline:2px solid var(--accent);box-shadow:0 5px 20px #0004} +.widget-tabs{display:flex;gap:.2rem;overflow-x:auto;white-space:nowrap;margin-bottom:.4rem;padding-bottom:.25rem}#organizer-dashboard .widget-tabs button{border:0;border-radius:0;padding:.4rem .5rem}#organizer-dashboard .widget-tabs button[aria-selected=true]{box-shadow:inset 0 -2px var(--accent);color:var(--accent)} +.dashboard-list{list-style:none;margin:0;padding:0}.dashboard-list li{display:flex;align-items:baseline;gap:.45rem;padding:.4rem 0;border-bottom:1px solid var(--border,#8883);font-size:.88rem}.dashboard-list a{flex:1;min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.dashboard-list time{font-size:.8rem;white-space:nowrap;opacity:.8}.dashboard-progress{display:grid;place-items:center;width:100px;height:100px;border-radius:50%;margin:.2rem auto;font-size:1.6rem;font-weight:600;background:radial-gradient(closest-side,var(--bg) 80%,transparent 81%),conic-gradient(var(--accent,#478ddd) var(--progress),var(--border,#8883) 0)}[data-widget=progress] .widget-body{text-align:center} +.dashboard-widget #task-productivity{margin:0;padding:0;max-width:none}.dashboard-widget .productivity-stats{margin:.5rem 0}.dashboard-widget .productivity-stat strong{font-size:1.25rem}.dashboard-widget .productivity-note{margin:.3rem 0}.visually-hidden{position:absolute;width:1px;height:1px;overflow:hidden;clip-path:inset(50%)} +[data-widget=progress] .dashboard-progress{width:84px;height:84px;font-size:1.4rem}[data-widget=progress] .widget-body small{display:block;line-height:1.4} +@media(max-width:700px){.home-account{top:3rem;max-width:calc(100vw - 1rem);box-sizing:border-box;flex-wrap:wrap;justify-content:flex-end}.home-wiki-title{max-width:calc(100vw - 2rem)}.home-paged .home-bookmarks-page{padding-top:6.5rem}.home-account .organizer-launch{width:1.8rem;height:1.8rem}.organizer-page .config-sidebar{width:auto;min-width:0;padding:.4rem}.organizer-page .config-sidebar .sidebar-nav{display:flex;flex-wrap:wrap;gap:.25rem}.organizer-page .config-sidebar .sidebar-nav a{padding:.5rem}.organizer-page .config-layout{gap:.5rem}} +@media(max-width:700px){.organizer-nav{padding:.3rem;gap:.15rem}.organizer-nav a{padding:.5rem .45rem;font-size:.8rem}.organizer-page .topbar>.brand{flex:1}.organizer-page .topbar{padding:.5rem}#organizer-dashboard{padding:.6rem}#dashboard-grid{grid-template-columns:minmax(0,1fr);grid-auto-rows:auto}.dashboard-widget{grid-column:1;grid-row:auto;min-height:180px;max-height:480px}.dashboard-widget[data-widget=activity]{max-height:650px}.widget-body{max-height:440px}#organizer-dashboard button,#organizer-dashboard select{min-height:40px}.widget-arrange [data-size=width]{display:none}.widget-arrange label:has([data-size=width]){display:none}#organizer-dashboard .widget-resize{display:none!important}.dashboard-list li{padding:.65rem 0}.organizer-settings-content{padding:.5rem}.organizer-settings-content .productivity-setting{grid-template-columns:1fr}.organizer-nav-icons{gap:0}.organizer-launch{width:1.9rem;height:1.9rem}} diff --git a/static/js/calendar.js b/static/js/calendar.js index bcc96d0..0329932 100644 --- a/static/js/calendar.js +++ b/static/js/calendar.js @@ -1954,13 +1954,11 @@ "checkbox", enabled.some((e) => e.id === c.id), ); - if (actor) - field( - t("自分のデフォルトとして保存", "Save as my defaults"), - "save-defaults", - "checkbox", - false, - ); + if (actor) { + const settingsLink=node('a',t('既定のカレンダーは個人設定で変更','Change default calendars in personal settings')); + settingsLink.href='/-/sys/config?panel=organizer#organizer-calendar-defaults'; + $("calendar-fields").append(settingsLink); + } $("calendar-fields").append( node( "p", @@ -1980,13 +1978,7 @@ const base = ["detail", "edit", "new"].includes(route().view) ? "/v/plan" : location.pathname; - if (form.has("save-defaults")) { - await api("preferences", "PUT", { - calendars: selected.map((c) => c.id), - }); - navigate(base); - } else - navigate( + navigate( base + "?calendar=" + selected.map((c) => encodeURIComponent(c.pretty_name)).join(","), diff --git a/static/js/contacts.js b/static/js/contacts.js index 8f6d291..9663de2 100644 --- a/static/js/contacts.js +++ b/static/js/contacts.js @@ -1,5 +1,5 @@ (()=>{'use strict';const app=document.getElementById('contacts-app');if(!app)return;const ja=document.documentElement.lang.startsWith('ja'),t=(en,jp)=>ja?jp:en,api='/_/api/v1/extension/organizer.contacts/',writable=app.dataset.writable==='true',status=document.getElementById('contacts-status'),list=document.getElementById('contacts-list'),editor=document.getElementById('contact-editor'),controls=document.getElementById('contacts-controls'); -const el=(tag,text)=>{const n=document.createElement(tag);if(text!==undefined)n.textContent=text;return n;},button=(text,fn)=>{const b=el('button',text);b.type='button';b.onclick=fn;return b;};app.querySelector('h1').textContent=t('Private contacts','個人アドレス帳');app.querySelector('nav a').textContent=t('Tasks','タスク');app.querySelector('nav a+a').textContent=t('Settings','設定'); +const el=(tag,text)=>{const n=document.createElement(tag);if(text!==undefined)n.textContent=text;return n;},button=(text,fn)=>{const b=el('button',text);b.type='button';b.onclick=fn;return b;};app.querySelector('h1').textContent=t('Private contacts','個人アドレス帳'); async function request(path,options={}){const r=await fetch(api+path,{credentials:'same-origin',signal:AbortSignal.timeout(15000),...options,headers:{'Content-Type':'application/json',...options.headers}});const d=await r.json().catch(()=>({}));if(!r.ok||r.redirected)throw Error(r.status===412?t('Changed or duplicate UID. Your input is retained.','競合または同じUIDの連絡先があります。入力は保持しています。'):t('Unable to save/load. Check your login, permissions and input.','保存・読込できません。ログイン、権限、入力を確認してください。'));return d;} let dirty=false,busy=false,ticket=0;const search=el('input');search.type='search';search.placeholder=search.ariaLabel=t('Name, email, phone, organization','名前・メール・電話・所属');controls.append(search);const trash=el('select');trash.ariaLabel=t('Contacts or trash','連絡先・削除済み');for(const [value,label]of [['0',t('Contacts','連絡先')],['1',t('Deleted contacts','削除済み')]]){const o=el('option',label);o.value=value;trash.append(o);}controls.append(trash);trash.onchange=()=>load();const allowLeave=()=>!dirty||confirm(t('Discard unsaved edits?','未保存の変更を破棄しますか?')); function show(c){dirty=false;editor.replaceChildren();const form=el('form'),inputs={};for(const [key,label,multi] of [['name',t('Name','名前'),false],['emails',t('Emails (one per line)','メール(1行1件)'),true],['phones',t('Phones (one per line)','電話(1行1件)'),true],['organization',t('Organization','所属'),false],['notes',t('Notes','メモ'),true]]){const l=el('label',label),n=el(multi?'textarea':'input');n.value=Array.isArray(c[key])?c[key].join('\n'):c[key]||'';n.disabled=!writable;n.name=key;if(key==='name'){n.required=true;n.maxLength=300;}l.append(n);form.append(l);inputs[key]=n;n.oninput=()=>{dirty=true;};} diff --git a/static/js/organizer-dashboard.js b/static/js/organizer-dashboard.js new file mode 100644 index 0000000..e6e4131 --- /dev/null +++ b/static/js/organizer-dashboard.js @@ -0,0 +1,132 @@ +(() => { + 'use strict'; + const root=document.getElementById('organizer-dashboard');if(!root)return; + const ja=document.documentElement.lang.startsWith('ja'),t=(en,jp)=>ja?jp:en; + const api='/_/api/v1/extension/organizer.tasks/',calendarAPI='/_/api/v1/extension/organizer.calendar/'; + const grid=document.getElementById('dashboard-grid'),status=document.getElementById('dashboard-status'),controls=document.getElementById('dashboard-controls'); + const writable=root.dataset.writable==='true',today=root.dataset.today,zone=root.dataset.timezone; + const names={progress:t('Today’s completion','本日の達成率'),today:t('Today’s tasks','本日のタスク'),tomorrow:t('Tomorrow’s tasks','明日のタスク'),tasks:t('Tasks','タスク'),schedule:t('Today’s schedule','本日のスケジュール'),activity:t('Activity report','達成度・作業レポート')}; + const defaults=[['progress',4,3],['today',4,3],['tomorrow',4,3],['tasks',8,4],['schedule',4,4],['activity',12,5]].map(([id,width,height])=>({id,width,height,...(id==='tasks'?{tab:'inbox'}:{})})); + const tabs={inbox:'Inbox',backlog:'Backlog',someday:'Someday',review:'Review',all:'Incomplete',done:'Done'}; + const el=(tag,text,cls)=>{const n=document.createElement(tag);if(text!==undefined)n.textContent=text;if(cls)n.className=cls;return n;}; + function button(text,label,fn){const b=el('button',text);b.type='button';b.title=b.ariaLabel=label;b.onclick=fn;return b;} + function link(text,href){const a=el('a',text);a.href=href;return a;} + let widgets=[],version=0,dirty=false,saving=false,editing=false,loaded=false; + const cards=new Map();let active=0;const queue=[]; + // No timer polling. At most two widget jobs run concurrently; obsolete tab + // requests are aborted. Errors remain confined to the affected widget. + function schedule(job){queue.push(job);pump();} + function pump(){while(active<2&&queue.length){active++;Promise.resolve().then(queue.shift()).catch(e=>{status.textContent=e.message;}).finally(()=>{active--;pump();});}} + async function request(url,options={}){ + const response=await fetch(url,{credentials:'same-origin',cache:'no-store',...options,headers:{'Content-Type':'application/json',...options.headers}}); + if(response.status===401||response.redirected)throw Error(t('Sign in again. Unsaved layout is retained.','再度ログインしてください。未保存の配置は保持しています。')); + const data=await response.json().catch(()=>({})); + if(!response.ok)throw Error(response.status===412?t('Settings changed elsewhere. Reload to review; your layout has not been overwritten.','別の画面で設定が更新されました。再読み込みして確認してください。配置は上書きしていません。'):t('Request failed. Try again.','取得・保存に失敗しました。再度お試しください。')); + return data; + } + const save=button(t('Save layout','配置を保存'),t('Save layout','配置を保存'),async()=>{ + if(saving||!loaded)return;saving=true;updateControls(); + try{const data=await request(api+'dashboard',{method:'PUT',signal:AbortSignal.timeout(15000),body:JSON.stringify({version,widgets})});version=data.version;dirty=false;status.textContent=t('Layout saved','配置を保存しました');} + catch(e){status.textContent=e.message;}finally{saving=false;updateControls();} + }); + const edit=button('⚙',t('Arrange widgets','ウィジェットを配置'),()=>{editing=!editing;root.classList.toggle('is-arranging',editing);edit.setAttribute('aria-pressed',String(editing));});edit.setAttribute('aria-pressed','false'); + const refresh=button('↻',t('Refresh visible widgets','ウィジェットを更新'),()=>{for(const item of widgets){const card=cards.get(item.id);if(card)loadWidget(item,card);}}); + const add=el('select');add.ariaLabel=t('Add widget','ウィジェットを追加');add.onchange=()=>{const item=defaults.find(w=>w.id===add.value);if(item){widgets.push({...item});render();changed();}}; + const reset=button(t('Reset layout','初期配置'),t('Reset layout','初期配置'),()=>{if(confirm(t('Replace this layout with the default layout? Save to apply.','初期配置に戻しますか? 保存するまでは確定しません。'))){widgets=defaults.map(x=>({...x}));render();changed();}}); + controls.append(refresh);if(writable)controls.append(edit,add,reset,save); + function updateControls(){save.disabled=!dirty||saving||!loaded;edit.disabled=add.disabled=reset.disabled=saving||!loaded;refresh.disabled=!loaded;root.classList.toggle('dashboard-saving',saving);for(const card of cards.values())card.querySelectorAll('.widget-arrange button,.widget-arrange select,.widget-drag,.widget-resize').forEach(n=>n.disabled=saving);add.replaceChildren();const option=el('option',t('+ Add widget','+ ウィジェットを追加'));option.value='';add.append(option);for(const [id,name] of Object.entries(names)){if(widgets.some(w=>w.id===id)||id==='schedule'&&root.dataset.calendar!=='true')continue;const o=el('option',name);o.value=id;add.append(o);}} + function changed(){dirty=true;status.textContent=t('Unsaved layout changes','配置は未保存です');updateControls();} + window.addEventListener('beforeunload',event=>{if(dirty){event.preventDefault();event.returnValue='';}}); + function applySize(item,card){card.style.setProperty('--widget-width',String(item.width));card.style.setProperty('--widget-height',String(item.height));} + function move(item,delta){if(saving)return;const index=widgets.indexOf(item),target=index+delta;if(target<0||target>=widgets.length)return;widgets.splice(index,1);widgets.splice(target,0,item);for(const w of widgets)grid.append(cards.get(w.id));changed();} + function render(){ + for(const card of cards.values()){card._controller?.abort();card._gesture?.abort();}cards.clear();grid.replaceChildren(); + for(const item of widgets){ + const card=el('section',undefined,'dashboard-widget');card.id=item.id;card.dataset.widget=item.id;applySize(item,card); + const header=el('header',undefined,'widget-header'),heading=el('h2',names[item.id]);heading.id='widget-title-'+item.id;card.setAttribute('aria-labelledby',heading.id); + header.append(heading);const destinations={progress:'/v/plan/today',today:'/v/plan/today',tomorrow:'/v/plan/tasks/tomorrow',tasks:'/v/plan/tasks',schedule:'/v/plan',activity:'/v/plan/dashboard#activity'}; + const open=link('↗',destinations[item.id]);open.title=open.ariaLabel=t('Open ','開く: ')+names[item.id];header.append(open); + const arrange=el('div',undefined,'widget-arrange'); + if(writable){ + const drag=button('⠿',t('Drag to move; use arrow buttons to reorder','ドラッグで移動。矢印ボタンでも並べ替えできます'),()=>{});drag.className='widget-drag';header.prepend(drag); + arrange.append(button('←',t('Move earlier','前に移動'),()=>move(item,-1)),button('→',t('Move later','後ろに移動'),()=>move(item,1))); + for(const [key,label,min,max] of [['width',t('Width','幅'),3,12],['height',t('Height','高さ'),2,10]]){ + const field=el('label',label),select=el('select');select.dataset.size=key; + for(let n=min;n<=max;n++){const option=el('option',key==='width'?n+'/12':String(n));option.value=String(n);select.append(option);}select.value=String(item[key]); + select.onchange=()=>{item[key]=Number(select.value);applySize(item,card);changed();};field.append(select);arrange.append(field); + } + arrange.append(button('×',t('Remove widget','ウィジェットを外す'),()=>{widgets=widgets.filter(w=>w!==item);render();changed();})); + let action; + function start(event,mode){if(!editing||saving||event.button!==0)return;event.preventDefault();event.currentTarget.setPointerCapture(event.pointerId);action={mode,x:event.clientX,y:event.clientY,width:item.width,height:item.height,pointer:event.pointerId};card.classList.add('widget-moving');card._gesture?.abort();card._gesture=new AbortController();const options={signal:card._gesture.signal};document.addEventListener('pointermove',moving,options);document.addEventListener('pointerup',finish,options);document.addEventListener('pointercancel',cancel,options);} + function moving(event){if(!action||event.pointerId!==action.pointer||action.mode!=='resize')return;const unit=(grid.clientWidth+12)/12;item.width=Math.max(3,Math.min(12,Math.round(action.width+(event.clientX-action.x)/unit)));item.height=Math.max(2,Math.min(10,Math.round(action.height+(event.clientY-action.y)/84)));applySize(item,card);} + function finish(event){if(!action||event.pointerId!==action.pointer)return;const previous=action;action=null;card._gesture?.abort();card.classList.remove('widget-moving');if(previous.mode==='move'){const target=document.elementFromPoint(event.clientX,event.clientY)?.closest('[data-widget]');if(target&&target!==card&&grid.contains(target)){const from=widgets.indexOf(item),to=widgets.findIndex(w=>w.id===target.dataset.widget);widgets.splice(from,1);widgets.splice(to,0,item);for(const w of widgets)grid.append(cards.get(w.id));changed();}}else{arrange.querySelector('[data-size=width]').value=String(item.width);arrange.querySelector('[data-size=height]').value=String(item.height);changed();}} + function cancel(event){if(!action||event.pointerId!==action.pointer)return;if(action.mode==='resize'){item.width=action.width;item.height=action.height;applySize(item,card);}action=null;card._gesture?.abort();card.classList.remove('widget-moving');} + const resize=button('◢',t('Drag to resize; size controls are also available','ドラッグでサイズ変更。幅・高さの選択欄でも変更できます'),()=>{});resize.className='widget-resize'; + for(const [handle,mode] of [[drag,'move'],[resize,'resize']])handle.onpointerdown=e=>start(e,mode); + card.append(resize); + } + const body=el('div',undefined,'widget-body');body.setAttribute('role','region');body.setAttribute('aria-labelledby',heading.id);body.tabIndex=0; + card.append(header,arrange,body);grid.append(card);cards.set(item.id,card);loadWidget(item,card); + } + if(!widgets.length)grid.append(el('p',t('Add a widget to get started.','ウィジェットを追加してください。'))); + updateControls(); + } + function loadWidget(item,card){ + card._controller?.abort();const controller=new AbortController();card._controller=controller; + const body=card.querySelector('.widget-body');body.replaceChildren(el('p',t('Loading…','読み込み中…'))); + schedule(async()=>{ + if(controller.signal.aborted||!card.isConnected)return; + const signal=AbortSignal.any([controller.signal,AbortSignal.timeout(15000)]); + try{ + if(item.id==='activity'){ + body.replaceChildren();const report=el('section');report.id='task-productivity';report.dataset.view='report';const h=el('h3');h.className='visually-hidden';const message=el('p');message.id='productivity-status';message.role='status';const content=el('div');content.id='productivity-content';report.append(h,message,content);body.append(report);await window.PagesWikiProductivityMount(report,controller.signal);return; + } + if(item.id==='progress'){ + const data=await request(api+'progress',{signal});if(controller.signal.aborted)return;body.replaceChildren();const percentage=data.total?Math.round(data.done*100/data.total):null; + const ring=el('div',percentage===null?'—':percentage+'%','dashboard-progress');ring.style.setProperty('--progress',(percentage||0)+'%'); + body.append(ring,el('p',data.done+' / '+data.total),el('small',t('Completed / tasks planned for today. Cancelled and archived tasks are excluded.','今日に計画したタスクの完了数/総数。取りやめ・アーカイブは除きます。')));return; + } + if(item.id==='schedule'){ + if(root.dataset.calendar!=='true'){body.replaceChildren(el('p',t('Calendar extension is disabled.','カレンダー拡張は無効です。')));return;} + const data=await request(calendarAPI+'upcoming?period=day',{signal});if(controller.signal.aborted)return; + const list=el('ul',undefined,'dashboard-list'),format=new Intl.DateTimeFormat(ja?'ja-JP':'en-GB',{hour:'2-digit',minute:'2-digit',timeZone:zone}); + for(const event of data.events){const row=el('li'),a=link(event.summary||t('(Untitled)','(無題)'),event.href);row.append(el('time',event.all_day?t('All day','終日'):format.format(new Date(event.start))),a);list.append(row);} + body.replaceChildren(list);if(!data.events.length)body.append(el('p',t('No events today.','本日の予定はありません。')));body.append(link(t('Open calendar →','カレンダーで確認 →'),'/v/plan'));return; + } + const tabbar=el('div',undefined,'widget-tabs');tabbar.setAttribute('role','tablist');tabbar.ariaLabel=names.tasks; + const list=el('div');list.id='widget-panel-'+item.id;list.setAttribute('role','tabpanel');list.tabIndex=0; + const panel=el('div');panel.append(list);body.replaceChildren();if(item.id==='tasks')body.append(tabbar);body.append(panel); + let sequence=0,tabController; + async function tasks(tab,append=false,cursor=''){ + const ticket=++sequence;tabController?.abort();tabController=new AbortController(); + const q=new URLSearchParams({kind:'task',view:tab,limit:'20'}); + if(item.id==='tomorrow'){const date=new Date(today+'T12:00:00Z');date.setUTCDate(date.getUTCDate()+1);q.set('date',date.toISOString().slice(0,10));} + if(cursor)q.set('before',cursor); + list.setAttribute('aria-busy','true'); + const notice=el('p',t('Loading…','読み込み中…'));if(!append)list.replaceChildren(notice); + try{ + const data=await request(api+'items?'+q,{signal:AbortSignal.any([controller.signal,tabController.signal,AbortSignal.timeout(15000)])});if(ticket!==sequence||controller.signal.aborted)return; + if(!append)list.replaceChildren();panel.querySelector('[data-more]')?.remove(); + const ul=el('ul',undefined,'dashboard-list'); + for(const task of data.items){const row=el('li');row.dataset.task=task.uuid; + const title=link(task.title,'/v/plan/task/'+encodeURIComponent(task.uuid));title.title=task.title; + row.append(el('span',task.status==='done'?'✓':task.status==='cancelled'?'−':task.status==='doing'?'◐':'○'),title); + if(task.due_on)row.append(el('time',task.due_on));ul.append(row); + } + list.append(ul);if(!data.items.length&&!append)list.append(el('p',t('No matching tasks.','該当するタスクはありません。'))); + if(data.next){const more=button(t('Load more','続きを表示'),t('Load more','続きを表示'),()=>{more.disabled=true;tasks(tab,true,data.next).finally(()=>{more.disabled=false;});});more.dataset.more='true';panel.append(more);} + }catch(e){if(e.name!=='AbortError'&&ticket===sequence){if(!append)list.replaceChildren();list.append(el('p',e.message));}}finally{if(ticket===sequence)list.setAttribute('aria-busy','false');} + } + if(item.id==='tasks'){ + for(const [key,label] of Object.entries(tabs)){const b=button(label,label,()=>{if(saving||item.tab===key)return;item.tab=key;selectTabs();if(writable)changed();tasks(key);});b.dataset.tab=key;b.id='dashboard-tab-'+key;b.setAttribute('role','tab');b.setAttribute('aria-controls',list.id);tabbar.append(b);} + function selectTabs(){for(const b of tabbar.children){b.setAttribute('aria-selected',String(b.dataset.tab===item.tab));b.tabIndex=b.dataset.tab===item.tab?0:-1;}list.setAttribute('aria-labelledby','dashboard-tab-'+item.tab);} + tabbar.onkeydown=event=>{const keys=Object.keys(tabs),index=keys.indexOf(item.tab);let next;if(event.key==='ArrowRight')next=(index+1)%keys.length;else if(event.key==='ArrowLeft')next=(index+keys.length-1)%keys.length;else if(event.key==='Home')next=0;else if(event.key==='End')next=keys.length-1;else return;event.preventDefault();tabbar.children[next].click();tabbar.children[next].focus();};selectTabs(); + } + await tasks(item.id==='tasks'?item.tab:item.id==='tomorrow'?'day':'today'); + }catch(e){if(!controller.signal.aborted)body.replaceChildren(el('p',e.message),button('↻',t('Retry','再試行'),()=>loadWidget(item,card)));} + }); + } + updateControls(); + function initialize(){status.textContent=t('Loading…','読み込み中…');request(api+'dashboard',{signal:AbortSignal.timeout(15000)}).then(data=>{version=data.version;widgets=data.widgets;loaded=true;status.textContent='';render();if(location.hash==='#activity')requestAnimationFrame(()=>document.getElementById('activity')?.scrollIntoView({block:'start'}));}).catch(e=>{status.replaceChildren(document.createTextNode(e.message+' '),button('↻',t('Retry','再試行'),initialize));});} + initialize(); +})(); diff --git a/static/js/organizer-settings.js b/static/js/organizer-settings.js new file mode 100644 index 0000000..3a020a5 --- /dev/null +++ b/static/js/organizer-settings.js @@ -0,0 +1,15 @@ +(() => { + 'use strict'; + const root=document.getElementById('organizer-calendar-defaults');if(!root)return; + const ja=document.documentElement.lang.startsWith('ja'),t=(en,jp)=>ja?jp:en,api='/_/api/v1/extension/organizer.calendar/'; + const status=root.querySelector('[role=status]'),content=root.querySelector('[data-calendar-defaults]'); + const el=(tag,text)=>{const n=document.createElement(tag);if(text!==undefined)n.textContent=text;return n;}; + async function request(path,options={}){const r=await fetch(api+path,{credentials:'same-origin',cache:'no-store',signal:AbortSignal.timeout(15000),...options,headers:{'Content-Type':'application/json'}});if(!r.ok||r.redirected)throw Error(t('Unable to save or load settings. Check your session and try again.','取得・保存できません。ログイン状態を確認して再度お試しください。'));return r.json();} + request('calendars').then(data=>{ + const form=el('form'),list=el('div');list.className='organizer-calendar-options'; + for(const calendar of data.calendars){const label=el('label'),input=el('input');input.type='checkbox';input.name='calendar';input.value=calendar.id;input.checked=data.defaults.includes(calendar.id);input.disabled=root.dataset.writable!=='true';label.append(input,document.createTextNode(calendar.name));list.append(label);} + const help=el('p',t('Used for calendar navigation and upcoming events, including the dashboard. If none are selected, the first available calendar is used.','カレンダー表示と直近の予定、ダッシュボードに使用します。未選択なら最初の利用可能なカレンダーを使用します。')); + const save=el('button',t('Save','保存'));save.type='submit';save.disabled=root.dataset.writable!=='true';form.append(list,help,save);content.append(form); + form.onsubmit=async event=>{event.preventDefault();const calendars=[...form.querySelectorAll('input:checked')].map(n=>n.value);if(calendars.length>32){status.textContent=t('Select at most 32 calendars.','32個以内で選択してください。');return;}save.disabled=true;try{await request('preferences',{method:'PUT',body:JSON.stringify({calendars})});status.textContent=t('Saved','保存しました');}catch(e){status.textContent=e.message;}finally{save.disabled=false;}}; + }).catch(e=>{status.textContent=e.message;}); +})(); diff --git a/static/js/task-productivity.js b/static/js/task-productivity.js index c7fbbea..7b688a3 100644 --- a/static/js/task-productivity.js +++ b/static/js/task-productivity.js @@ -1,12 +1,12 @@ (() => { 'use strict'; - const root=document.getElementById('task-productivity');if(!root)return; + function mount(root,signal){if(!root||root.dataset.mounted)return;root.dataset.mounted='true'; const ja=document.documentElement.lang.startsWith('ja'), api='/_/api/v1/extension/organizer.tasks/'; const word={tasks:['Tasks','タスク'],report:['Activity report','達成度・作業レポート'],settings:['Task defaults and email','タスクの既定値・メール'],contacts:['Contacts','連絡先'],completed:['Completed','完了件数'],points:['Points','ポイント'],work:['Work hours','作業時間'],focus:['Pomodoro hours','集中時間'],save:['Save','保存'],saved:['Saved','保存しました'],refresh:['Refresh','更新'],project_uuid:['Default project','既定のプロジェクト'],assignee_uuid:['Assignee UUID (annotation only)','担当者UUID(管理用メモ)'],due_days:['Due in days','期限までの日数'],start_days:['Start in days','着手までの日数'],planned_days:['Plan in days','取り組む日までの日数'],review_days:['Review in days','見直しまでの日数'],estimate_minutes:['Estimated minutes','見込み工数(分)'],complexity:['Complexity (1–5)','複雑度(1〜5)'],digest_enabled:['Email daily task list to my account email','毎日のやることリストを自分のメールに送る'],digest_time:['Delivery time','配信時刻'],timezone:['IANA timezone','タイムゾーン(IANA)'],none:['None','なし'],empty:['No records in this period.','この期間の記録はありません。'],partial:['Partial results: narrow the period.','件数上限に達しました。期間を狭めてください。'],error:['Request failed. Input is retained.','処理に失敗しました。入力は保持しています。'],email_required:['Set your account email first.','先にプロフィールにメールアドレスを設定してください。'],smtp_unavailable:['Ask an administrator to configure SMTP.','管理者によるSMTP設定が必要です。']}; const t=k=>(word[k]||[k,k])[ja?1:0],el=(tag,text)=>{const n=document.createElement(tag);if(text!==undefined)n.textContent=text;return n;}; - const status=document.getElementById('productivity-status'),content=document.getElementById('productivity-content'); - root.querySelectorAll('[data-word]').forEach(n=>n.textContent=t(n.dataset.word));root.querySelector('h1').textContent=t(root.dataset.view==='settings'?'settings':'report'); - async function request(path,options={}){const r=await fetch(api+path,{credentials:'same-origin',cache:'no-store',signal:AbortSignal.timeout(15000),...options,headers:{'Content-Type':'application/json',...options.headers}});const d=await r.json().catch(()=>({}));if(!r.ok||r.redirected)throw Error(t(d.error||'error'));return d;} + const status=root.querySelector('#productivity-status'),content=root.querySelector('#productivity-content'); + root.querySelectorAll('[data-word]').forEach(n=>n.textContent=t(n.dataset.word));root.querySelector('h1,h2,h3').textContent=t(root.dataset.view==='settings'?'settings':'report'); + async function request(path,options={}){const timeout=AbortSignal.timeout(15000);const r=await fetch(api+path,{credentials:'same-origin',cache:'no-store',signal:signal?AbortSignal.any([signal,timeout]):timeout,...options,headers:{'Content-Type':'application/json',...options.headers}});const d=await r.json().catch(()=>({}));if(!r.ok||r.redirected)throw Error(t(d.error||'error'));return d;} const error=e=>{status.textContent=e.message||t('error');}; async function settings(){ const data=await request('preferences'),p=data.preferences;const form=el('form');form.className='productivity-settings';const fields={}; @@ -39,5 +39,8 @@ }catch(e){error(e);}finally{refresh.disabled=false;}} controls.onsubmit=e=>{e.preventDefault();load();};await load(); } - (root.dataset.view==='settings'?settings():report()).catch(error); + return (root.dataset.view==='settings'?settings():report()).catch(error); + } + window.PagesWikiProductivityMount=mount; + mount(document.getElementById('task-productivity')); })(); diff --git a/static/js/tasks.js b/static/js/tasks.js index 346791d..5d7c1ca 100644 --- a/static/js/tasks.js +++ b/static/js/tasks.js @@ -34,8 +34,6 @@ const icons = {carryover:'↶',today:'☀',tomorrow:'⇢',inbox:'↓',backlog:'≡',someday:'◇',review:'↻',all:'☷',projects:'▱',done:'✓',archived:'▣'}; Object.keys(icons).forEach(key => { const a = el('a'); a.href = routes[key] || '/v/plan/tasks/' + key; a.append(el('span',icons[key]),el('span',t(key))); if(view===key||(key==='tomorrow'&&view==='day'&&selectedDate===nextDay(today)))a.setAttribute('aria-current','page'); $('nav').append(a); }); const schedule=el('a','▦ '+t('schedule'));schedule.href='/v/plan/tasks/schedule'+(projectID?'?project='+projectID:'');$('nav').append(schedule); - for(const [route,label] of [['report',ja?'▥ 達成度・作業レポート':'▥ Activity report'],['settings',ja?'⚙ 既定値・メール':'⚙ Defaults and email']]){const a=el('a',label);a.href='/v/plan/tasks/'+route;$('nav').append(a);} - const contacts=el('a',ja?'♧ 連絡先':'♧ Contacts');contacts.href='/v/plan/contacts';$('nav').append(contacts); $('date').textContent = view==='day'?selectedDate:today; $('heading').textContent = t(view === 'project' ? 'project' : view === 'detail' || view === 'new' ? 'all' : view); $('help').textContent = t(view==='today'?'todayHelp':view==='review'?'reviewHelp':'private'); $('search-label').textContent=t('search');$('quick-title').placeholder=t('quick');$('quick-title').setAttribute('aria-label',t('title')); diff --git a/templates/pages/calendar.gohtml b/templates/pages/calendar.gohtml index 929f5df..e974385 100644 --- a/templates/pages/calendar.gohtml +++ b/templates/pages/calendar.gohtml @@ -1,9 +1,9 @@ {{ define "calendar.gohtml" }} {{ .Title }} · {{ .WikiName }} -
{{ template "auth-menu" . }}
+
{{ template "auth-menu" . }}
{{ template "organizer-nav" . }}

Calendar

+

-
{{ end }} +{{ end }} diff --git a/templates/pages/config.gohtml b/templates/pages/config.gohtml index 6d076c2..b6baae8 100644 --- a/templates/pages/config.gohtml +++ b/templates/pages/config.gohtml @@ -56,7 +56,7 @@ {{ range .ConfigGroups }}
{{ .Label }} -{{ range .Panels }}{{ .Label }}{{ end }} +{{ range .Panels }}{{ .Label }}{{ end }}
{{ end }} diff --git a/templates/pages/contacts.gohtml b/templates/pages/contacts.gohtml index a5c9abc..0865457 100644 --- a/templates/pages/contacts.gohtml +++ b/templates/pages/contacts.gohtml @@ -4,13 +4,13 @@ {{ .Title }} - {{ .WikiName }} - +
{{ template "auth-menu" . }}
+{{ template "organizer-nav" . }}
-

- + {{ end }} diff --git a/templates/pages/home.gohtml b/templates/pages/home.gohtml index 6d49be1..0426bae 100644 --- a/templates/pages/home.gohtml +++ b/templates/pages/home.gohtml @@ -10,7 +10,7 @@ - + @@ -39,6 +39,7 @@ {{ template "auth-menu" . }}
+{{ template "organizer-nav" . }} {{ template "home-bookmarks" . }}
diff --git a/templates/pages/organizer_dashboard.gohtml b/templates/pages/organizer_dashboard.gohtml new file mode 100644 index 0000000..e0ee849 --- /dev/null +++ b/templates/pages/organizer_dashboard.gohtml @@ -0,0 +1,7 @@ +{{ define "organizer_dashboard.gohtml" }} +{{ T "organizer.dashboard" }} · {{ .WikiName }} +
{{ template "auth-menu" . }}
+{{ template "organizer-nav" . }} +
+

{{ T "organizer.dashboard" }}

{{ .Today }} · {{ .Timezone }}

+
{{ end }} diff --git a/templates/pages/organizer_settings.gohtml b/templates/pages/organizer_settings.gohtml new file mode 100644 index 0000000..69297fe --- /dev/null +++ b/templates/pages/organizer_settings.gohtml @@ -0,0 +1,8 @@ +{{ define "organizer_settings.gohtml" }} +{{ T "organizer.settings" }} · {{ .WikiName }} +
{{ template "auth-menu" . }}
{{ template "organizer-nav" . }} +
+

{{ T "organizer.settings" }}

{{ T "organizer.private" }}

+{{ if .TasksEnabled }}

{{ end }} +{{ if .CalendarEnabled }}

{{ T "organizer.calendar_defaults" }}

{{ end }} +
{{ end }} diff --git a/templates/pages/page.gohtml b/templates/pages/page.gohtml index ed68d57..a1ed1f7 100644 --- a/templates/pages/page.gohtml +++ b/templates/pages/page.gohtml @@ -13,7 +13,7 @@ -{{ if .IsHome }}{{ end }} +{{ if .IsHome }}{{ end }} {{ if eq .ContentView.Kind "code" }} diff --git a/templates/pages/periodical.gohtml b/templates/pages/periodical.gohtml index 8294faa..dbd75b3 100644 --- a/templates/pages/periodical.gohtml +++ b/templates/pages/periodical.gohtml @@ -1,4 +1,4 @@ -{{ define "periodical.gohtml" }}{{ .Title }} · {{ .WikiName }} +{{ define "periodical.gohtml" }}{{ .Title }} · {{ .WikiName }} {{ if .HomeWallpaperURL }}{{ end }}
{{ .WikiName }}{{ if not .Public }}{{ template "auth-menu" . }}{{ end }}

{{ .Title }}

{{ if not .Public }}

{{ T "periodical.scope_help" }}

{{ end }} {{ if not .Enabled }}

{{ T "periodical.disabled" }}

{{ else }} diff --git a/templates/pages/search_home.gohtml b/templates/pages/search_home.gohtml index 844b3eb..a5f08b8 100644 --- a/templates/pages/search_home.gohtml +++ b/templates/pages/search_home.gohtml @@ -8,7 +8,7 @@ {{ template "social-metadata" . }} - + {{ if .HomeWallpaperURL }}{{ end }} @@ -26,6 +26,7 @@
{{ end }} diff --git a/templates/partials/auth_menu.gohtml b/templates/partials/auth_menu.gohtml index 3eb9b2b..23f68f6 100644 --- a/templates/partials/auth_menu.gohtml +++ b/templates/partials/auth_menu.gohtml @@ -13,6 +13,7 @@ +
{{ T "city.map" }}↗
{{ if .AuthUser }}

{{ T "notification.title" }}

{{ end }} @@ -25,6 +26,7 @@ {{ end }}{{ end }} +{{ if .AuthUser }}{{ template "organizer-shortcuts" . }}{{ end }} {{ if .QuickThemes }}
◐ @@ -39,7 +41,7 @@
{{ if .AuthUser }}
{{ if .AuthUser.HasAvatar }}{{ else }}{{ printf "%.1s" .AuthUser.DisplayName }}{{ end }}{{ .AuthUser.DisplayName }} -
{{ T "auth.profile" }}{{ if .CalendarEnabled }}{{ T "calendar.title" }}{{ end }}{{ if .TasksEnabled }}{{ T "tasks.title" }}{{ end }}{{ if .AuthIsAdmin }}{{ T "config.title" }}{{ end }}
+
{{ T "auth.profile" }}{{ if .CalendarEnabled }}{{ T "calendar.title" }}{{ end }}{{ if .TasksEnabled }}{{ T "tasks.title" }}{{ end }}{{ if .ContactsEnabled }}{{ T "organizer.contacts" }}{{ end }}{{ T "organizer.settings" }}{{ if .AuthIsAdmin }}{{ T "config.title" }}{{ end }}
{{ else }}{{ end }} diff --git a/templates/partials/organizer_nav.gohtml b/templates/partials/organizer_nav.gohtml new file mode 100644 index 0000000..d9f8754 --- /dev/null +++ b/templates/partials/organizer_nav.gohtml @@ -0,0 +1,12 @@ +{{ define "organizer-nav" }} + +{{ end }} +{{ define "organizer-shortcuts" }} +{{ if .TasksEnabled }}{{ end }} +{{ if .ContactsEnabled }}{{ end }} +{{ end }}