feat(web): update TaskItem and TaskList for single-screen design
TaskItem: remove onClick navigation, wrap in SwipeAction for swipe-to-complete, update priority colors (H=red, M=amber, L=gray, default=hidden), add due-today amber color. TaskList: accept activeReport prop for context-aware empty states, replace onToggle/onTaskClick with onComplete, make scrollable with flex:1 and overflow-y:auto. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -1,5 +1,7 @@
|
|||||||
<script>
|
<script>
|
||||||
|
import { isToday as isTodayFn } from 'date-fns';
|
||||||
import { formatRelative, isOverdue } from '$lib/utils/dates.js';
|
import { formatRelative, isOverdue } from '$lib/utils/dates.js';
|
||||||
|
import SwipeAction from './SwipeAction.svelte';
|
||||||
import Checkbox from './ui/Checkbox.svelte';
|
import Checkbox from './ui/Checkbox.svelte';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -10,56 +12,55 @@
|
|||||||
/**
|
/**
|
||||||
* @type {(uuid: string) => void}
|
* @type {(uuid: string) => void}
|
||||||
*/
|
*/
|
||||||
export let onToggle;
|
export let onComplete;
|
||||||
|
|
||||||
/**
|
$: overdue = task.due && isOverdue(task.due);
|
||||||
* @type {(uuid: string) => void}
|
$: dueToday = task.due && isTodayFn(new Date(task.due * 1000));
|
||||||
*/
|
|
||||||
export let onClick;
|
|
||||||
|
|
||||||
$: isDue = task.due && isOverdue(task.due);
|
|
||||||
$: priorityLabel = ['Low', 'Default', 'Medium', 'High'][task.priority];
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<div class="task-item" on:click={() => onClick(task.uuid)} role="button" tabindex="0">
|
<SwipeAction onSwipe={() => onComplete(task.uuid)}>
|
||||||
<div class="task-checkbox" on:click|stopPropagation={() => onToggle(task.uuid)}>
|
<div class="task-item">
|
||||||
<Checkbox checked={task.status === 'C'} />
|
<div class="task-checkbox" on:click|stopPropagation={() => onComplete(task.uuid)} role="button" tabindex="-1">
|
||||||
</div>
|
<Checkbox checked={task.status === 'C'} />
|
||||||
|
|
||||||
<div class="task-content">
|
|
||||||
<div class="task-header">
|
|
||||||
<span class="task-description" class:completed={task.status === 'C'}>
|
|
||||||
{task.description}
|
|
||||||
</span>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="task-meta">
|
<div class="task-content">
|
||||||
{#if task.project}
|
<div class="task-header">
|
||||||
<span class="meta-item project">{task.project}</span>
|
<span class="task-description" class:completed={task.status === 'C'}>
|
||||||
{/if}
|
{task.description}
|
||||||
|
|
||||||
{#if task.priority > 1}
|
|
||||||
<span class="meta-item priority priority-{task.priority}">
|
|
||||||
{priorityLabel}
|
|
||||||
</span>
|
</span>
|
||||||
{/if}
|
</div>
|
||||||
|
|
||||||
{#if task.due}
|
<div class="task-meta">
|
||||||
<span class="meta-item due" class:overdue={isDue}>
|
{#if task.project}
|
||||||
{formatRelative(task.due)}
|
<span class="meta-item project">{task.project}</span>
|
||||||
</span>
|
{/if}
|
||||||
{/if}
|
|
||||||
|
|
||||||
{#if task.tags && task.tags.length > 0}
|
{#if task.priority === 3}
|
||||||
<div class="tags">
|
<span class="meta-item priority-high">High</span>
|
||||||
{#each task.tags as tag}
|
{:else if task.priority === 2}
|
||||||
<span class="tag">{tag}</span>
|
<span class="meta-item priority-medium">Med</span>
|
||||||
{/each}
|
{:else if task.priority === 0}
|
||||||
</div>
|
<span class="meta-item priority-low">Low</span>
|
||||||
{/if}
|
{/if}
|
||||||
|
|
||||||
|
{#if task.due}
|
||||||
|
<span class="meta-item due" class:overdue class:due-today={dueToday}>
|
||||||
|
{formatRelative(task.due)}
|
||||||
|
</span>
|
||||||
|
{/if}
|
||||||
|
|
||||||
|
{#if task.tags && task.tags.length > 0}
|
||||||
|
<div class="tags">
|
||||||
|
{#each task.tags as tag}
|
||||||
|
<span class="tag">{tag}</span>
|
||||||
|
{/each}
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</SwipeAction>
|
||||||
|
|
||||||
<style>
|
<style>
|
||||||
.task-item {
|
.task-item {
|
||||||
@@ -68,24 +69,15 @@
|
|||||||
padding: var(--spacing-md);
|
padding: var(--spacing-md);
|
||||||
background-color: var(--bg-primary);
|
background-color: var(--bg-primary);
|
||||||
border-bottom: 1px solid var(--border-color);
|
border-bottom: 1px solid var(--border-color);
|
||||||
cursor: pointer;
|
|
||||||
transition: background-color 0.2s;
|
|
||||||
-webkit-tap-highlight-color: transparent;
|
-webkit-tap-highlight-color: transparent;
|
||||||
}
|
}
|
||||||
|
|
||||||
.task-item:hover {
|
|
||||||
background-color: var(--bg-secondary);
|
|
||||||
}
|
|
||||||
|
|
||||||
.task-item:active {
|
|
||||||
background-color: var(--bg-tertiary);
|
|
||||||
}
|
|
||||||
|
|
||||||
.task-checkbox {
|
.task-checkbox {
|
||||||
flex-shrink: 0;
|
flex-shrink: 0;
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: flex-start;
|
align-items: flex-start;
|
||||||
padding-top: 0.125rem;
|
padding-top: 0.125rem;
|
||||||
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
|
|
||||||
.task-content {
|
.task-content {
|
||||||
@@ -127,14 +119,19 @@
|
|||||||
color: #4338ca;
|
color: #4338ca;
|
||||||
}
|
}
|
||||||
|
|
||||||
.priority {
|
.priority-high {
|
||||||
|
background-color: #fee2e2;
|
||||||
|
color: #991b1b;
|
||||||
|
}
|
||||||
|
|
||||||
|
.priority-medium {
|
||||||
background-color: #fef3c7;
|
background-color: #fef3c7;
|
||||||
color: #92400e;
|
color: #92400e;
|
||||||
}
|
}
|
||||||
|
|
||||||
.priority-3 {
|
.priority-low {
|
||||||
background-color: #fee2e2;
|
background-color: var(--bg-tertiary);
|
||||||
color: #991b1b;
|
color: var(--text-tertiary);
|
||||||
}
|
}
|
||||||
|
|
||||||
.due {
|
.due {
|
||||||
@@ -142,6 +139,11 @@
|
|||||||
color: #1e40af;
|
color: #1e40af;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.due.due-today {
|
||||||
|
background-color: #fef3c7;
|
||||||
|
color: #92400e;
|
||||||
|
}
|
||||||
|
|
||||||
.due.overdue {
|
.due.overdue {
|
||||||
background-color: #fee2e2;
|
background-color: #fee2e2;
|
||||||
color: #991b1b;
|
color: #991b1b;
|
||||||
|
|||||||
@@ -9,15 +9,27 @@
|
|||||||
/**
|
/**
|
||||||
* @type {(uuid: string) => void}
|
* @type {(uuid: string) => void}
|
||||||
*/
|
*/
|
||||||
export let onToggle;
|
export let onComplete;
|
||||||
|
|
||||||
/**
|
|
||||||
* @type {(uuid: string) => void}
|
|
||||||
*/
|
|
||||||
export let onTaskClick;
|
|
||||||
|
|
||||||
export let loading = false;
|
export let loading = false;
|
||||||
export let emptyMessage = 'No tasks found';
|
export let activeReport = 'list';
|
||||||
|
|
||||||
|
/** @type {Record<string, string>} */
|
||||||
|
const emptyMessages = {
|
||||||
|
list: 'No pending tasks. Add one below!',
|
||||||
|
completed: 'No completed tasks yet.',
|
||||||
|
overdue: 'Nothing overdue. Nice work!',
|
||||||
|
waiting: 'No waiting tasks.',
|
||||||
|
active: 'No active tasks.',
|
||||||
|
next: 'No next tasks.',
|
||||||
|
ready: 'No ready tasks.',
|
||||||
|
recurring: 'No recurring tasks.',
|
||||||
|
template: 'No template tasks.',
|
||||||
|
newest: 'No tasks found.',
|
||||||
|
oldest: 'No tasks found.'
|
||||||
|
};
|
||||||
|
|
||||||
|
$: emptyMessage = emptyMessages[activeReport] || 'No tasks found';
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<div class="task-list">
|
<div class="task-list">
|
||||||
@@ -37,8 +49,7 @@
|
|||||||
{#each tasks as task (task.uuid)}
|
{#each tasks as task (task.uuid)}
|
||||||
<TaskItem
|
<TaskItem
|
||||||
{task}
|
{task}
|
||||||
onToggle={onToggle}
|
{onComplete}
|
||||||
onClick={onTaskClick}
|
|
||||||
/>
|
/>
|
||||||
{/each}
|
{/each}
|
||||||
{/if}
|
{/if}
|
||||||
@@ -46,10 +57,10 @@
|
|||||||
|
|
||||||
<style>
|
<style>
|
||||||
.task-list {
|
.task-list {
|
||||||
|
flex: 1;
|
||||||
|
overflow-y: auto;
|
||||||
|
-webkit-overflow-scrolling: touch;
|
||||||
background-color: var(--bg-primary);
|
background-color: var(--bg-primary);
|
||||||
border-radius: var(--border-radius);
|
|
||||||
overflow: hidden;
|
|
||||||
box-shadow: var(--shadow-sm);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.loading-container {
|
.loading-container {
|
||||||
@@ -68,6 +79,7 @@
|
|||||||
justify-content: center;
|
justify-content: center;
|
||||||
padding: var(--spacing-xl);
|
padding: var(--spacing-xl);
|
||||||
text-align: center;
|
text-align: center;
|
||||||
|
height: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
.empty-icon {
|
.empty-icon {
|
||||||
|
|||||||
Reference in New Issue
Block a user