From 89374f2db92f43f4630dcbdd7f3608c251a9802e Mon Sep 17 00:00:00 2001 From: bboysoul Date: Tue, 8 Sep 2026 20:05:42 +0800 Subject: [PATCH] refactor: focus habit completion feedback --- frontend/src/MvpPanel.vue | 19 +++++++++++++++++-- frontend/src/style.css | 7 ++++--- frontend/src/style.test.ts | 28 ++++++++++++++++++++++------ 3 files changed, 43 insertions(+), 11 deletions(-) diff --git a/frontend/src/MvpPanel.vue b/frontend/src/MvpPanel.vue index 5321894..5ea6e45 100644 --- a/frontend/src/MvpPanel.vue +++ b/frontend/src/MvpPanel.vue @@ -188,6 +188,17 @@ function habitProgressMax(h: Habit) { function habitProgressValue(h: Habit) { return Math.min(Math.max(Number(logFor(h, todayKey.value)?.value ?? 0), 0), habitProgressMax(h)) } +function habitWeekday(day: string) { + const [year, month, date] = day.split('-').map(Number) + return new Intl.DateTimeFormat('zh-CN', { weekday: 'narrow' }).format(new Date(year, month - 1, date)) +} +function habitCellDone(h: Habit, cell: NonNullable[number]) { + return isHabitComplete(h.kind, cell.value, h.target ?? 1) +} +function habitCellLabel(h: Habit, cell: NonNullable[number]) { + const state = !cell.scheduled ? '未安排' : cell.paused ? '已暂停' : habitCellDone(h, cell) ? '已完成' : '未完成' + return `${cell.day} ${habitWeekday(cell.day)}:${state}` +} function setLocalHabitValue(h: Habit, next: number | boolean) { habits.value = habits.value.map((item) => item.id !== h.id @@ -424,8 +435,7 @@ onBeforeUnmount(() => {
-
- +
{{ h.name }} @@ -458,6 +468,11 @@ onBeforeUnmount(() => { {{ h.name }} {{ habitProgressText(h) }} +
+ + {{ habitWeekday(cell.day) }} + +
还没有习惯,从一件容易坚持的小事开始。
diff --git a/frontend/src/style.css b/frontend/src/style.css index 0e93932..70a2e62 100644 --- a/frontend/src/style.css +++ b/frontend/src/style.css @@ -18,9 +18,10 @@ main{min-width:0;padding:27px 34px 50px;overflow:auto;background:linear-gradient .habit-row.swipeable:not([style*="0px"]){transition:none} .habit-main{flex:1;min-width:0;display:grid;grid-template-columns:minmax(0,1fr) auto;align-items:center;gap:7px 10px;border:0;background:transparent;padding:11px 4px;text-align:left;border-radius:10px} .habit-name{font-size:15px;font-weight:700;color:#3c372f;overflow:hidden;text-overflow:ellipsis;white-space:nowrap} -.habit-progress{margin-left:auto;flex:0 0 auto;font-size:11px;color:var(--muted);white-space:nowrap} +.habit-progress{margin-left:auto;flex:0 0 auto;font-size:16px;line-height:1;font-weight:760;color:#4d463d;white-space:nowrap;font-variant-numeric:tabular-nums} .habit-progress-bar{grid-column:1/-1;width:100%;height:5px;border:0;border-radius:999px;overflow:hidden;background:#eee6db;appearance:none;-webkit-appearance:none}.habit-progress-bar::-webkit-progress-bar{background:#eee6db;border-radius:999px}.habit-progress-bar::-webkit-progress-value{background:linear-gradient(90deg,#f7a066,var(--accent));border-radius:999px;transition:width .2s ease}.habit-progress-bar::-moz-progress-bar{background:linear-gradient(90deg,#f7a066,var(--accent));border-radius:999px} -.habit-row.done .habit-name{color:var(--accent);text-decoration:line-through;text-decoration-thickness:1.5px;text-decoration-color:#b99a89} +.habit-week{grid-column:1/-1;display:grid;grid-template-columns:repeat(7,minmax(24px,1fr));gap:6px;padding-top:3px}.habit-week-cell{display:grid;justify-items:center;gap:4px;color:#a1978a}.habit-week-day{font-size:10px;line-height:1;color:inherit}.habit-week-cell i{display:block;width:9px;height:9px;border:1px solid #d8cdbd;border-radius:50%;background:#fff}.habit-week-cell.done{color:#71856b}.habit-week-cell.done i{border-color:#71856b;background:#71856b}.habit-week-cell.unscheduled{opacity:.35}.habit-week-cell.today{color:var(--accent);font-weight:750}.habit-week-cell.today i{box-shadow:0 0 0 2px #fbe6dc} +.habit-row.done .habit-name{color:#756c61;text-decoration:line-through;text-decoration-thickness:1px;text-decoration-color:#d8c8bb} .habit-row .icon.ghost{color:#b3a795;margin-left:4px} .habit-row .icon.ghost:hover{color:var(--danger)} .numeric-habit>span:first-child{display:grid;gap:3px}.numeric-habit small{font-size:11px;color:var(--muted)} @@ -28,7 +29,7 @@ main{min-width:0;padding:27px 34px 50px;overflow:auto;background:linear-gradient .habit-row>.icon.ghost{width:44px;height:44px;flex:0 0 44px}.habit-check{margin-left:-4px}.habit-row.done .habit-check .task-check-mark{background:#71856b;border-color:#71856b;color:#fff}.habit-toolbar{display:flex;align-items:center;gap:12px;justify-content:flex-end;color:var(--muted);font-size:12px}.habit-toolbar label{display:inline-flex;align-items:center;gap:6px}.habit-toolbar input{margin:0}.habit-toolbar-today{justify-content:flex-start;margin:0 0 2px 2px}.habit-detail-mask{position:fixed;z-index:85;inset:0;background:rgba(45,38,31,.36);display:grid;place-items:end center;padding:20px}.habit-detail-sheet{width:min(500px,100%);background:#fffdf8;border:1px solid var(--line);border-radius:20px;box-shadow:0 12px 36px rgba(56,40,24,.18);padding:18px;display:grid;gap:16px}.habit-detail-sheet header{display:flex;align-items:center;justify-content:space-between;gap:10px}.habit-detail-sheet header small{color:var(--muted);font-size:11px}.habit-detail-sheet header h3{margin:2px 0 0;font-size:19px}.habit-detail-sheet header button{width:44px;height:44px;border:0;background:transparent;display:grid;place-items:center}.habit-detail-progress{display:flex;justify-content:space-between;align-items:center;padding:14px 0;border-block:1px solid var(--line);font-size:12px;color:var(--muted)}.habit-detail-progress strong{font-size:14px;color:#3c372f}.habit-detail-sheet footer{display:flex;justify-content:flex-end} .empty-panel{text-align:center;color:var(--muted);display:grid;place-items:center;gap:10px}.today-empty-panel{min-height:130px}.empty-action{margin-top:4px;color:#655d52}.empty-action svg{width:15px;height:15px} .settings-grid{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:12px}.tool-card{display:flex;flex-direction:column;align-items:flex-start;gap:10px}.tool-card>svg{color:var(--accent);width:25px;height:25px}.tool-card p{margin:0;color:var(--muted);font-size:13px}.tool-card.wide{grid-column:1/-1}.password-form{width:100%;display:grid;gap:10px}.password-form label{display:grid;gap:6px;color:#675f54;font-size:12px;font-weight:650}.password-form input{width:100%;border:1px solid var(--line);background:#fff;border-radius:10px;padding:11px 12px;outline:none}.password-form input:focus{border-color:var(--accent);box-shadow:0 0 0 3px rgba(241,90,41,.1)}.password-form button{justify-self:start}.file-button input{display:none}.tool-card pre{width:100%;max-height:180px;overflow:auto;background:#f8f3e8;padding:10px;border-radius:8px;font-size:10px}.session-row,.audit-row{width:100%;display:flex;justify-content:space-between;align-items:center;border-top:1px solid var(--line);padding:9px 0}.session-row span{display:grid}.session-row small,.audit-row small{color:var(--muted);font-size:11px}.inline-error{padding:9px;border-radius:8px;color:var(--danger);background:#fff0ed}.settings.active{background:var(--accent-soft);color:#b7421e;font-weight:700} -@media(max-width:930px){.task-row,.habit-row,.countdown-row{min-height:62px;background:#fff;border:1px solid var(--line);border-radius:13px;box-shadow:none}.task-list,.habit-list,.countdown-timeline{display:grid;gap:8px}.task-row{padding:4px 7px}.task-row:hover,.task-row.selected{background:#fffaf5}.habit-row{padding:4px 7px}.countdown-row,.countdown-row:first-of-type{border:1px solid var(--line)}.countdown-row{grid-template-columns:minmax(0,1fr) 72px;padding:8px 9px;gap:8px}.task-main strong,.habit-name,.countdown-main>b{font-size:14px;font-weight:650}.meta,.habit-progress,.countdown-main>small,.countdown-state small{font-size:11px;color:var(--muted)}.drag-handle{width:36px;flex-basis:36px}.task-check{width:44px;flex-basis:44px}.countdown-icon{width:36px;height:36px;border-radius:10px}.countdown-state strong{font-size:24px}.countdown-group{gap:8px}.countdown-group>h3{padding-left:3px}.habit-detail-mask{padding:0}.habit-detail-sheet{width:100%;border-radius:22px 22px 0 0;padding:18px 16px calc(18px + env(safe-area-inset-bottom))}} +@media(max-width:930px){.task-row,.habit-row,.countdown-row{min-height:62px;background:#fff;border:1px solid var(--line);border-radius:13px;box-shadow:none}.task-list,.habit-list,.countdown-timeline{display:grid;gap:8px}.task-row{padding:4px 7px}.task-row:hover,.task-row.selected{background:#fffaf5}.habit-row{padding:4px 7px}.countdown-row,.countdown-row:first-of-type{border:1px solid var(--line)}.countdown-row{grid-template-columns:minmax(0,1fr) 72px;padding:8px 9px;gap:8px}.task-main strong,.habit-name,.countdown-main>b{font-size:14px;font-weight:650}.meta,.countdown-main>small,.countdown-state small{font-size:11px;color:var(--muted)}.habit-progress{font-size:16px}.drag-handle{width:36px;flex-basis:36px}.task-check{width:44px;flex-basis:44px}.countdown-icon{width:36px;height:36px;border-radius:10px}.countdown-state strong{font-size:24px}.countdown-group{gap:8px}.countdown-group>h3{padding-left:3px}.habit-detail-mask{padding:0}.habit-detail-sheet{width:100%;border-radius:22px 22px 0 0;padding:18px 16px calc(18px + env(safe-area-inset-bottom))}} @media(max-width:800px){.settings-grid{grid-template-columns:1fr}.tool-card.wide{grid-column:auto}.habit-main{padding:10px 2px}.numeric-action input{width:62px}} .unified-fab{display:grid;place-items:center;position:fixed;z-index:60;right:20px;bottom:22px;width:56px;height:56px;border:0;border-radius:50%;background:var(--accent);color:#fff;box-shadow:0 8px 20px rgba(241,90,41,.28);transition:transform .16s ease,box-shadow .16s ease;touch-action:none;user-select:none}.unified-fab svg{width:25px;height:25px}.unified-fab:hover{transform:translateY(-2px);box-shadow:0 10px 24px rgba(241,90,41,.32)}.unified-fab:active{transform:scale(.96)}.unified-fab.dragging{transform:scale(1.06);box-shadow:0 12px 28px rgba(241,90,41,.36)}.task-compose-mask{position:fixed;z-index:70;inset:0;background:rgba(45,38,31,.34);display:flex;align-items:flex-end;padding:0}.task-compose-sheet{width:100%;max-height:min(88dvh,720px);overflow:auto;background:#fffdf8;border-radius:24px 24px 0 0;padding:18px 18px calc(20px + env(safe-area-inset-bottom));box-shadow:0 -16px 42px rgba(56,40,24,.2);display:grid;gap:14px;transform-origin:var(--fab-origin-x,calc(100% - 44px)) var(--fab-origin-y,100%)}.task-compose-sheet header{display:flex;align-items:center;justify-content:space-between}.task-compose-sheet header small{color:var(--accent);font-size:10px;font-weight:800;letter-spacing:.12em}.task-compose-sheet h2{margin:2px 0 0;font-size:22px}.task-compose-sheet label{display:grid;gap:6px;color:#675f54;font-size:12px;font-weight:650}.task-compose-sheet input,.task-compose-sheet select,.task-compose-sheet textarea{width:100%;border:1px solid var(--line);background:#fff;border-radius:11px;padding:12px;outline:none;resize:vertical}.task-compose-sheet input:focus,.task-compose-sheet select:focus,.task-compose-sheet textarea:focus{border-color:var(--accent);box-shadow:0 0 0 3px rgba(241,90,41,.1)}.task-compose-row{display:grid;grid-template-columns:minmax(0,1fr) 105px;gap:10px}.task-compose-date-actions{display:flex;flex-wrap:wrap;align-items:center;gap:8px}.task-compose-date-control{display:flex;align-items:center;min-width:0}.task-compose-date-chip{position:relative;display:inline-flex!important;grid-template-columns:none!important;align-items:center;flex-direction:row!important;gap:7px!important;width:auto;min-height:40px;padding:0 12px;border:1px solid var(--line);border-radius:999px;background:#fffaf3;color:#776e62!important;font-size:13px!important;font-weight:700!important;overflow:hidden;cursor:pointer}.task-compose-date-chip.selected{border-color:#f3b18f;background:var(--accent-soft);color:#b7421e!important}.task-compose-date-chip svg{width:16px;height:16px;flex:none}.task-compose-native-picker{position:absolute;inset:0;opacity:0;cursor:pointer;padding:0!important;border:0!important}.task-compose-date-clear{display:grid;place-items:center;width:34px;height:34px;margin-left:2px;border:0;border-radius:50%;background:transparent;color:var(--muted)}.task-compose-date-clear:hover{background:#f5eee5;color:var(--text)}.task-compose-date-clear svg{width:15px;height:15px}.task-compose-time-add{min-width:0;height:40px;padding:0 13px;border:1px dashed #e5b89d;border-radius:999px;background:transparent;color:var(--accent);font-weight:700}.task-compose-time-add:hover{border-color:var(--accent);background:#fff4e8}.task-compose-time-chip{display:inline-flex!important;grid-template-columns:none!important;align-items:center;flex-direction:row!important;gap:5px!important;width:auto;color:var(--muted)!important;font-size:12px!important}.task-compose-time-chip input{width:102px!important;min-width:0;padding:9px 8px!important;border-radius:999px!important}.task-compose-time-remove{display:grid;place-items:center;flex:0 0 34px;width:34px;height:34px;border:0;border-radius:50%;background:transparent;color:var(--muted)}.task-compose-time-remove:hover{background:#f5eee5;color:var(--text)}.task-compose-time-remove svg{width:15px;height:15px}.task-compose-sheet footer{display:flex;justify-content:flex-end;gap:9px;padding-top:4px}.task-compose-sheet button:disabled{opacity:.45}.task-compose-enter-active,.task-compose-leave-active{transition:background .22s ease}.task-compose-enter-active .task-compose-sheet,.task-compose-leave-active .task-compose-sheet{transition:transform .28s cubic-bezier(.2,.9,.25,1.08),opacity .2s ease}.task-compose-enter-from,.task-compose-leave-to{background:rgba(45,38,31,0)}.task-compose-enter-from .task-compose-sheet,.task-compose-leave-to .task-compose-sheet{transform:translateY(36px) scale(.86);opacity:0} .countdown-compose-enter-active,.countdown-compose-leave-active{transition:background .24s ease}.countdown-compose-enter-active .countdown-modal,.countdown-compose-leave-active .countdown-modal{transition:transform .34s cubic-bezier(.18,.9,.28,1.16),opacity .22s ease,filter .22s ease;transform-origin:var(--fab-origin-x,calc(100% - 43px)) var(--fab-origin-y,calc(100% - 104px))}.countdown-compose-enter-from,.countdown-compose-leave-to{background:rgba(45,38,31,0)}.countdown-compose-enter-from .countdown-modal,.countdown-compose-leave-to .countdown-modal{transform:translate(20px,28px) scale(.18) rotate(8deg);opacity:0;filter:blur(5px)}@media(max-width:930px){.unified-fab{bottom:calc(82px + env(safe-area-inset-bottom))}}@media(prefers-reduced-motion:reduce){*,*:before,*:after{scroll-behavior:auto!important;animation-duration:.01ms!important;transition-duration:.01ms!important}} diff --git a/frontend/src/style.test.ts b/frontend/src/style.test.ts index 14405bd..6820cbf 100644 --- a/frontend/src/style.test.ts +++ b/frontend/src/style.test.ts @@ -39,7 +39,8 @@ describe('mobile list row language', () => { expect(css).not.toContain('grid-template-columns:44px minmax(0,1fr) 72px') expect(css).not.toContain('grid-template-columns:40px minmax(0,1fr) 76px') expect(css).toContain('.task-main strong,.habit-name,.countdown-main>b{font-size:14px;') - expect(css).toContain('.meta,.habit-progress,.countdown-main>small,.countdown-state small{font-size:11px;') + expect(css).toContain('.meta,.countdown-main>small,.countdown-state small{font-size:11px;') + expect(css).toContain('.habit-progress{font-size:16px}') }) it('keeps destructive habit actions in a detail sheet instead of the list row', () => { @@ -65,7 +66,8 @@ describe('task and habit row decoration', () => { expect(app).toContain('@pointerdown.stop="startTaskReorder') expect(app).toContain('@pointerup.stop="finishTaskReorder') expect(app).toContain("api('/tasks/reorder'") - expect(mvpPanel.match(/class="drag-handle habit-drag-handle"/g)?.length).toBe(2) + expect(mvpPanel.match(/class="drag-handle habit-drag-handle"/g)?.length).toBe(1) + expect(mvpPanel).not.toMatch(/today-habit-list[\s\S]*?habit-drag-handle[\s\S]*?/) expect(mvpPanel).toContain('@pointerdown.stop="startHabitReorder') expect(mvpPanel).toContain('@pointerup.stop="finishHabitReorder') expect(mvpPanel).toContain("request('/habits/reorder'") @@ -73,7 +75,7 @@ describe('task and habit row decoration', () => { expect(css).toContain('.reordering{') expect(css).toContain('var(--reorder-y,0px)') expect(app).toContain("'--reorder-y': `${taskReorder?.id === node.task.id ? taskReorder.offsetY : 0}px`") - expect(mvpPanel.match(/'--reorder-y': `\$\{habitReorder\?\.id === h\.id \? habitReorder\.offsetY : 0\}px`/g)?.length).toBe(2) + expect(mvpPanel.match(/'--reorder-y': `\$\{habitReorder\?\.id === h\.id \? habitReorder\.offsetY : 0\}px`/g)?.length).toBe(1) }) it('supports pointer dragging for desktop task and subtask completion', () => { @@ -160,10 +162,21 @@ describe('task and habit row decoration', () => { expect(css).toContain('.habit-progress{margin-left:auto;') }) - it('shows an accessible progress bar for numeric habits in both habit views', () => { + it('keeps Today focused and adds the weekly grid only to the full habits view', () => { + expect(mvpPanel.match(/class="habit-week"/g)?.length).toBe(1) + expect(mvpPanel).toContain('v-for="cell in h.cells"') + expect(mvpPanel).toContain('class="habit-week-cell"') + expect(mvpPanel).toContain('class="habit-week-day"') + expect(mvpPanel).not.toMatch(/today-habit-list[\s\S]*?class="habit-week"[\s\S]*?/) + expect(mvpPanel).not.toMatch(/today-habit-list[\s\S]*?habit-drag-handle[\s\S]*?/) + }) + + it('uses numeric progress as the main feedback and omits it for boolean habits', () => { expect(mvpPanel.match(/ { expect(css).toContain('.password-form{width:100%;display:grid;gap:10px}') }) - it('strikes through completed habit names', () => { - expect(css).toContain('.habit-row.done .habit-name{color:var(--accent);text-decoration:line-through') + it('uses a gentle completion treatment instead of a discarded-task strike', () => { + expect(css).toContain('.habit-row.done .habit-name{color:#756c61;') + expect(css).toContain('text-decoration-color:#d8c8bb') + expect(css).toContain('text-decoration-thickness:1px') + expect(css).not.toContain('.habit-row.done .habit-name{color:var(--accent);text-decoration:line-through') }) it('keeps habit cards borderless so the rounded left edge has no visual gap', () => {