Unify organizer navigation and add personal widget dashboard
Build and publish container images / images (push) Successful in 12m38s
Release container images / release (push) Successful in 23s

This commit is contained in:
Anya Tokugawa committed 2026-11-04 00:05:16 +09:00
1 parent a9249009f0
commit 6ba30bc9f4
44 files changed
+843 -54

No files matched your search

+2 -2
View File
@@ -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; }
+23
View File
@@ -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}}
+6 -14
View File
@@ -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(","),
+1 -1
View File
@@ -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;};}
+132
View File
@@ -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();
})();
+15
View File
@@ -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;});
})();
+8 -5
View File
@@ -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'));
})();
-2
View File
@@ -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'));