Add a scrollable calendar view to the tasks page for drag and drop scheduling

Refactors the `TasksWithCalendar` component to display a 7-day calendar view at the bottom of the tasks page, enabling drag-and-drop functionality for task scheduling. Removes the tabbed view toggle and updates date navigation logic to use `startOfToday` and a new `navigateCalendar` function.

Replit-Commit-Author: Agent
Replit-Commit-Session-Id: ceced2fc-aa46-458d-ba87-ddd4b7bb1518
Replit-Commit-Checkpoint-Type: full_checkpoint
Replit-Commit-Screenshot-Url: https://storage.googleapis.com/screenshot-production-us-central1/659922a9-0087-461c-90dd-6d9a58b81d4d/ceced2fc-aa46-458d-ba87-ddd4b7bb1518/sqJIbnU
This commit is contained in:
paul-nothaft
2025-09-11 09:47:35 +00:00
parent edd02e0693
commit b6d187d477
2 changed files with 120 additions and 147 deletions
-4
View File
@@ -14,10 +14,6 @@ run = ["npm", "run", "start"]
localPort = 5000 localPort = 5000
externalPort = 80 externalPort = 80
[[ports]]
localPort = 39317
externalPort = 3000
[env] [env]
PORT = "5000" PORT = "5000"
+120 -143
View File
@@ -4,12 +4,11 @@ import { Button } from '@/components/ui/button';
import { Badge } from '@/components/ui/badge'; import { Badge } from '@/components/ui/badge';
import { Input } from '@/components/ui/input'; import { Input } from '@/components/ui/input';
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select'; import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select';
import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/components/ui/tabs'; import { Search, Filter, SortAsc, Calendar, ChevronLeft, ChevronRight } from 'lucide-react';
import { Search, Filter, SortAsc, Calendar, List, ChevronLeft, ChevronRight } from 'lucide-react';
import { Task } from './TaskCard'; import { Task } from './TaskCard';
import TaskCard from './TaskCard'; import TaskCard from './TaskCard';
import TimeCompletionModal from './TimeCompletionModal'; import TimeCompletionModal from './TimeCompletionModal';
import { addDays, format, isSameDay, startOfWeek } from 'date-fns'; import { addDays, format, isSameDay, startOfToday } from 'date-fns';
interface TasksWithCalendarProps { interface TasksWithCalendarProps {
tasks: Task[]; tasks: Task[];
@@ -24,17 +23,15 @@ export default function TasksWithCalendar({ tasks, onTaskUpdate, onTaskEdit }: T
const [searchQuery, setSearchQuery] = useState(''); const [searchQuery, setSearchQuery] = useState('');
const [sortBy, setSortBy] = useState<SortOption>('dueDate'); const [sortBy, setSortBy] = useState<SortOption>('dueDate');
const [filterBy, setFilterBy] = useState<FilterOption>('all'); const [filterBy, setFilterBy] = useState<FilterOption>('all');
const [currentDate, setCurrentDate] = useState(new Date()); const [calendarStartDate, setCalendarStartDate] = useState(startOfToday());
const [draggedTask, setDraggedTask] = useState<string | null>(null); const [draggedTask, setDraggedTask] = useState<string | null>(null);
const [activeView, setActiveView] = useState<'list' | 'calendar'>('list');
const [completionModal, setCompletionModal] = useState<{ isOpen: boolean; task: Task | null }>({ const [completionModal, setCompletionModal] = useState<{ isOpen: boolean; task: Task | null }>({
isOpen: false, isOpen: false,
task: null task: null
}); });
// Get two weeks starting from current week for calendar // Get 7 days starting from today for calendar
const startDate = startOfWeek(currentDate); const dates = Array.from({ length: 7 }, (_, i) => addDays(calendarStartDate, i));
const dates = Array.from({ length: 14 }, (_, i) => addDays(startDate, i));
const isOverdue = (task: Task) => { const isOverdue = (task: Task) => {
if (!task.dueDate) return false; if (!task.dueDate) return false;
@@ -127,10 +124,10 @@ export default function TasksWithCalendar({ tasks, onTaskUpdate, onTaskEdit }: T
e.dataTransfer.dropEffect = 'move'; e.dataTransfer.dropEffect = 'move';
}; };
const navigateWeek = (direction: 'prev' | 'next') => { const navigateCalendar = (direction: 'prev' | 'next') => {
const newDate = addDays(currentDate, direction === 'next' ? 7 : -7); const newDate = addDays(calendarStartDate, direction === 'next' ? 7 : -7);
setCurrentDate(newDate); setCalendarStartDate(newDate);
console.log(`Navigating to week of ${newDate.toLocaleDateString()}`); console.log(`Navigating calendar to ${newDate.toLocaleDateString()}`);
}; };
const handleTaskComplete = (task: Task) => { const handleTaskComplete = (task: Task) => {
@@ -216,112 +213,99 @@ export default function TasksWithCalendar({ tasks, onTaskUpdate, onTaskEdit }: T
</div> </div>
</div> </div>
{/* View Toggle */} {/* Unscheduled Task List */}
<Tabs value={activeView} onValueChange={(value) => setActiveView(value as 'list' | 'calendar')}> <div className="space-y-3">
<TabsList className="grid w-full grid-cols-2"> {unscheduledTasks.length === 0 ? (
<TabsTrigger value="list" data-testid="tab-list-view"> <div className="text-center py-8">
<List className="w-4 h-4 mr-2" /> <p className="text-muted-foreground" data-testid="text-no-tasks">
List View {searchQuery || filterBy !== 'all'
</TabsTrigger> ? 'No unscheduled tasks match your filters'
<TabsTrigger value="calendar" data-testid="tab-calendar-view"> : 'No unscheduled tasks. Drag tasks to the calendar below to schedule them!'
<Calendar className="w-4 h-4 mr-2" /> }
Calendar View </p>
</TabsTrigger> </div>
</TabsList> ) : (
<>
<TabsContent value="list" className="space-y-4"> <div className="text-sm font-medium text-muted-foreground mb-2">
{/* Task List */} Unscheduled Tasks - Drag to calendar below to schedule
<div className="space-y-3"> </div>
{unscheduledTasks.length === 0 ? ( {unscheduledTasks.map((task) => (
<div className="text-center py-8"> <div
<p className="text-muted-foreground" data-testid="text-no-tasks"> key={task.id}
{searchQuery || filterBy !== 'all' draggable
? 'No unscheduled tasks match your filters' onDragStart={(e) => handleDragStart(task.id, e)}
: 'No unscheduled tasks. Drag tasks to the calendar to schedule them!' onDragEnd={handleDragEnd}
} className={`cursor-move transition-transform ${
</p> draggedTask === task.id ? 'opacity-50 scale-95' : 'hover:scale-[1.02]'
}`}
>
<TaskCard
task={task}
onPlay={() => {
onTaskUpdate?.(task.id, { isTracking: true, timeTracked: task.timeTracked });
console.log(`Timer started for ${task.title}`);
}}
onPause={() => {
onTaskUpdate?.(task.id, { isTracking: false });
console.log(`Timer paused for ${task.title}`);
}}
onEdit={() => {
onTaskEdit?.(task);
console.log(`Edit task ${task.title}`);
}}
onStatusChange={(newStatus) => {
if (newStatus === 'done') {
handleTaskComplete(task);
} else {
onTaskUpdate?.(task.id, { status: newStatus });
}
console.log(`Task ${task.title} status changed to ${newStatus}`);
}}
isDragging={draggedTask === task.id}
/>
</div> </div>
) : ( ))}
<> </>
<div className="text-sm font-medium text-muted-foreground mb-2"> )}
Unscheduled Tasks - Drag to calendar to schedule </div>
</div>
{unscheduledTasks.map((task) => (
<div
key={task.id}
draggable
onDragStart={(e) => handleDragStart(task.id, e)}
onDragEnd={handleDragEnd}
className={`cursor-move transition-transform ${
draggedTask === task.id ? 'opacity-50 scale-95' : 'hover:scale-[1.02]'
}`}
>
<TaskCard
task={task}
onPlay={() => {
onTaskUpdate?.(task.id, { isTracking: true, timeTracked: task.timeTracked });
console.log(`Timer started for ${task.title}`);
}}
onPause={() => {
onTaskUpdate?.(task.id, { isTracking: false });
console.log(`Timer paused for ${task.title}`);
}}
onEdit={() => {
onTaskEdit?.(task);
console.log(`Edit task ${task.title}`);
}}
onStatusChange={(newStatus) => {
if (newStatus === 'done') {
handleTaskComplete(task);
} else {
onTaskUpdate?.(task.id, { status: newStatus });
}
console.log(`Task ${task.title} status changed to ${newStatus}`);
}}
isDragging={draggedTask === task.id}
/>
</div>
))}
</>
)}
</div>
</TabsContent>
<TabsContent value="calendar" className="space-y-4"> {/* Calendar Section */}
{/* Calendar Header */} <div className="space-y-3 border-t pt-4">
<div className="flex items-center justify-between"> {/* Calendar Header */}
<div className="flex items-center gap-2"> <div className="flex items-center justify-between">
<Calendar className="w-5 h-5 text-primary" /> <div className="flex items-center gap-2">
<h3 className="text-lg font-semibold" data-testid="text-calendar-title"> <Calendar className="w-5 h-5 text-primary" />
Next Two Weeks <h3 className="text-base font-semibold" data-testid="text-calendar-title">
</h3> Next 7 Days
</div> </h3>
</div>
<div className="flex items-center gap-2">
<Button
variant="outline"
size="icon"
onClick={() => navigateCalendar('prev')}
data-testid="button-prev-week"
className="w-8 h-8"
>
<ChevronLeft className="w-4 h-4" />
</Button>
<div className="flex items-center gap-2"> <Button
<Button variant="outline"
variant="outline" size="icon"
size="icon" onClick={() => navigateCalendar('next')}
onClick={() => navigateWeek('prev')} data-testid="button-next-week"
data-testid="button-prev-week" className="w-8 h-8"
className="w-8 h-8" >
> <ChevronRight className="w-4 h-4" />
<ChevronLeft className="w-4 h-4" /> </Button>
</Button>
<Button
variant="outline"
size="icon"
onClick={() => navigateWeek('next')}
data-testid="button-next-week"
className="w-8 h-8"
>
<ChevronRight className="w-4 h-4" />
</Button>
</div>
</div> </div>
</div>
{/* Calendar Grid */} {/* Horizontal Scrollable Calendar */}
<div className="grid grid-cols-2 sm:grid-cols-7 gap-3"> <div className="overflow-x-auto pb-2">
<div className="flex gap-3 min-w-max">
{dates.map((date, index) => { {dates.map((date, index) => {
const dayTasks = getTasksForDate(date); const dayTasks = getTasksForDate(date);
const isToday = isSameDay(date, new Date()); const isToday = isSameDay(date, new Date());
@@ -330,7 +314,7 @@ export default function TasksWithCalendar({ tasks, onTaskUpdate, onTaskEdit }: T
return ( return (
<Card <Card
key={index} key={index}
className={`p-3 min-h-[140px] transition-all ${ className={`flex-shrink-0 w-32 p-3 min-h-[120px] transition-all ${
isToday ? 'ring-2 ring-primary' : '' isToday ? 'ring-2 ring-primary' : ''
} ${ } ${
isWeekend ? 'bg-muted/30' : '' isWeekend ? 'bg-muted/30' : ''
@@ -344,19 +328,19 @@ export default function TasksWithCalendar({ tasks, onTaskUpdate, onTaskEdit }: T
}} }}
data-testid={`calendar-date-${format(date, 'yyyy-MM-dd')}`} data-testid={`calendar-date-${format(date, 'yyyy-MM-dd')}`}
> >
<div className="text-center mb-3"> <div className="text-center mb-2">
<div className="text-xs text-muted-foreground font-medium"> <div className="text-xs text-muted-foreground font-medium">
{format(date, 'EEE')} {format(date, 'EEE')}
</div> </div>
<div className={`text-sm font-semibold ${ <div className={`text-sm font-semibold ${
isToday ? 'text-primary' : '' isToday ? 'text-primary' : ''
}`}> }`}>
{format(date, 'd')} {format(date, 'MMM d')}
</div> </div>
</div> </div>
<div className="space-y-2"> <div className="space-y-1">
{dayTasks.slice(0, 3).map((task) => ( {dayTasks.slice(0, 2).map((task) => (
<div <div
key={task.id} key={task.id}
draggable draggable
@@ -367,24 +351,28 @@ export default function TasksWithCalendar({ tasks, onTaskUpdate, onTaskEdit }: T
> >
<Badge <Badge
variant="outline" variant="outline"
className="w-full justify-start text-xs p-2 h-auto" className="w-full justify-start text-xs p-1 h-auto text-left"
> >
<div className="truncate flex-1 text-left"> <div className="truncate">
{task.title} {task.title}
</div> </div>
</Badge> </Badge>
</div> </div>
))} ))}
{dayTasks.length > 3 && ( {dayTasks.length > 2 && (
<Badge variant="secondary" className="w-full justify-center text-xs"> <Badge variant="secondary" className="w-full justify-center text-xs">
+{dayTasks.length - 3} more +{dayTasks.length - 2}
</Badge> </Badge>
)} )}
{dayTasks.length === 0 && draggedTask && ( {dayTasks.length === 0 && (
<div className="text-center text-xs text-muted-foreground py-4 border-2 border-dashed border-primary/30 rounded"> <div className={`text-center text-xs py-4 rounded border-2 border-dashed transition-colors ${
Drop task here draggedTask
? 'border-primary/50 text-primary/70 bg-primary/5'
: 'border-muted text-muted-foreground'
}`}>
{draggedTask ? 'Drop here' : 'No tasks'}
</div> </div>
)} )}
</div> </div>
@@ -392,24 +380,13 @@ export default function TasksWithCalendar({ tasks, onTaskUpdate, onTaskEdit }: T
); );
})} })}
</div> </div>
</div>
{/* Calendar Legend */}
<div className="flex items-center gap-4 text-xs text-muted-foreground"> {/* Calendar Instructions */}
<div className="flex items-center gap-2"> <div className="text-xs text-muted-foreground text-center">
<div className="w-3 h-3 rounded-full bg-primary"></div> Drag tasks from above to schedule them Use arrow buttons to see more days
<span>Today</span> </div>
</div> </div>
<div className="flex items-center gap-2">
<div className="w-3 h-3 rounded-full bg-muted"></div>
<span>Weekend</span>
</div>
<div className="flex items-center gap-2">
<div className="w-3 h-3 border-2 border-dashed border-primary/30 rounded"></div>
<span>Drop zone</span>
</div>
</div>
</TabsContent>
</Tabs>
{/* Time Completion Modal */} {/* Time Completion Modal */}
<TimeCompletionModal <TimeCompletionModal