From 38bc72d75b8b334729bba7154652d4e2d616604f Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Fri, 15 May 2026 03:54:09 +0000
Subject: [PATCH 1/4] Show active tasks list on Dashboard when day is in
 progress

Replaces the "N tasks tracked today" count card with a full TaskItem
list so users can see task details, active status, and duration without
navigating to the Tasks page. The "Add Task" button still routes to
/tasks where the NewTaskForm lives.

https://claude.ai/code/session_01Az2638DrX4j3RrixD4yz6Y
---
 src/pages/Index.tsx | 55 +++++++++++++++++++++++++++++++--------------
 1 file changed, 38 insertions(+), 17 deletions(-)

diff --git a/src/pages/Index.tsx b/src/pages/Index.tsx
index 8c77fe0..4c66af7 100644
--- a/src/pages/Index.tsx
+++ b/src/pages/Index.tsx
@@ -1,7 +1,7 @@
-import { TimeTrackingProvider } from "@/contexts/TimeTrackingContext";
 import { useTimeTracking } from "@/hooks/useTimeTracking";
 import { DaySummary } from "@/components/DaySummary";
 import { StartDayDialog } from "@/components/StartDayDialog";
+import { TaskItem } from "@/components/TaskItem";
 import { Button } from "@/components/ui/button";
 import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
 import { CirclePlay, CircleStop, Archive as Play, ClipboardList } from "lucide-react";
@@ -18,13 +18,16 @@ const TimeTrackerContent = () => {
 	const {
 		isDayStarted,
 		dayStartTime,
+		currentTask,
 		tasks,
 		archivedDays,
 		startDay,
 		endDay,
 		postDay,
+		deleteTask,
 		getTotalDayDuration,
-		getTotalHoursForPeriod
+		getTotalHoursForPeriod,
+		getCurrentTaskDuration,
 	} = useTimeTracking();
 
 	const navigate = useNavigate();
@@ -141,30 +144,48 @@ const TimeTrackerContent = () => {
 							<>
 								<Card className="bg-muted border-border">
 									<CardHeader>
-										<CardTitle className="flex items-center space-x-2 text-primary">
-											<ClipboardList className="w-5 h-5" />
-											<span>Day In Progress</span>
+										<CardTitle className="flex items-center justify-between text-primary">
+											<span className="flex items-center space-x-2">
+												<ClipboardList className="w-5 h-5" />
+												<span>Day In Progress</span>
+											</span>
+											{dayStartTime && (
+												<span className="text-sm font-normal text-muted-foreground">
+													Started at {dayStartTime.toLocaleTimeString()}
+												</span>
+											)}
 										</CardTitle>
 									</CardHeader>
-									<CardContent className="space-y-4">
-										{dayStartTime && (
-											<p className="text-sm text-muted-foreground">
-												Started at {dayStartTime.toLocaleTimeString()}
-											</p>
-										)}
-										<p className="text-foreground">
-											{tasks.length === 0
-												? "No tasks tracked yet — go to Tasks to start your first task."
-												: `${tasks.length} task${tasks.length === 1 ? "" : "s"} tracked today.`}
-										</p>
+									<CardContent>
 										<Button asChild className="w-full">
 											<Link to="/tasks" className="flex items-center justify-center space-x-2">
 												<ClipboardList className="w-4 h-4" />
-												<span>View Tasks</span>
+												<span>Add Task</span>
 											</Link>
 										</Button>
 									</CardContent>
 								</Card>
+
+								{tasks.length === 0 ? (
+									<div className="text-center py-8 text-muted-foreground">
+										<ClipboardList className="w-10 h-10 mx-auto mb-3 opacity-40" />
+										<p className="font-medium">No tasks yet</p>
+										<p className="text-sm mt-1">Use the button above to start tracking your first task.</p>
+									</div>
+								) : (
+									<div className="space-y-3">
+										{tasks.map((task) => (
+											<TaskItem
+												key={task.id}
+												task={task}
+												isActive={currentTask?.id === task.id}
+												currentDuration={currentTask?.id === task.id ? getCurrentTaskDuration() : 0}
+												onDelete={deleteTask}
+											/>
+										))}
+									</div>
+								)}
+
 								<Button
 									variant="outline"
 									onClick={handleEndDay}

From a92c22a8965312c35d50b24b6e1dd184fc43aac0 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Fri, 15 May 2026 04:01:24 +0000
Subject: [PATCH 2/4] Show Add Task form on Dashboard when no tasks exist yet

When a day is started but no tasks have been added, the Dashboard now
renders the NewTaskForm (defaultOpen) inline so the user can start their
first task immediately without clicking through to the Tasks page.

https://claude.ai/code/session_01Az2638DrX4j3RrixD4yz6Y
---
 src/pages/Index.tsx | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/pages/Index.tsx b/src/pages/Index.tsx
index 4c66af7..b39d1e9 100644
--- a/src/pages/Index.tsx
+++ b/src/pages/Index.tsx
@@ -2,6 +2,7 @@ import { useTimeTracking } from "@/hooks/useTimeTracking";
 import { DaySummary } from "@/components/DaySummary";
 import { StartDayDialog } from "@/components/StartDayDialog";
 import { TaskItem } from "@/components/TaskItem";
+import { NewTaskForm } from "@/components/NewTaskForm";
 import { Button } from "@/components/ui/button";
 import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
 import { CirclePlay, CircleStop, Archive as Play, ClipboardList } from "lucide-react";
@@ -25,6 +26,7 @@ const TimeTrackerContent = () => {
 		endDay,
 		postDay,
 		deleteTask,
+		startNewTask,
 		getTotalDayDuration,
 		getTotalHoursForPeriod,
 		getCurrentTaskDuration,
@@ -50,6 +52,16 @@ const TimeTrackerContent = () => {
 		postDay();
 	};
 
+	const handleNewTask = (
+		title: string,
+		description?: string,
+		project?: string,
+		client?: string,
+		category?: string
+	) => {
+		startNewTask(title, description, project, client, category);
+	};
+
 	const totalHours = useMemo(
 		() => archivedDays.length > 0 ? getTotalHoursForPeriod(EPOCH, new Date()) : 0,
 		[archivedDays, getTotalHoursForPeriod]
@@ -167,11 +179,7 @@ const TimeTrackerContent = () => {
 								</Card>
 
 								{tasks.length === 0 ? (
-									<div className="text-center py-8 text-muted-foreground">
-										<ClipboardList className="w-10 h-10 mx-auto mb-3 opacity-40" />
-										<p className="font-medium">No tasks yet</p>
-										<p className="text-sm mt-1">Use the button above to start tracking your first task.</p>
-									</div>
+									<NewTaskForm onSubmit={handleNewTask} defaultOpen={true} />
 								) : (
 									<div className="space-y-3">
 										{tasks.map((task) => (

From 13f10b639b5a4c1501d879d4818084f3bc307826 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Fri, 15 May 2026 04:04:37 +0000
Subject: [PATCH 3/4] Stay on Dashboard after starting day to show Add Task
 form

Removed the navigate("/tasks") call from handleStartDayWithDateTime so
the user remains on the Dashboard where the NewTaskForm is rendered
inline when no tasks exist yet.

https://claude.ai/code/session_01Az2638DrX4j3RrixD4yz6Y
---
 src/pages/Index.tsx | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/pages/Index.tsx b/src/pages/Index.tsx
index b39d1e9..64cbb1a 100644
--- a/src/pages/Index.tsx
+++ b/src/pages/Index.tsx
@@ -10,7 +10,7 @@ import { DashboardIcon } from "@radix-ui/react-icons";
 import { PageLayout } from "@/components/PageLayout";
 import { TaskTrackingPanel } from "@/components/TaskTrackingPanel";
 import { useState, useMemo } from "react";
-import { Link, useNavigate } from "react-router-dom";
+import { Link } from "react-router-dom";
 
 // Stable epoch constant — avoids creating new Date(0) on every render
 const EPOCH = new Date(0);
@@ -32,7 +32,6 @@ const TimeTrackerContent = () => {
 		getCurrentTaskDuration,
 	} = useTimeTracking();
 
-	const navigate = useNavigate();
 	const [showStartDayDialog, setShowStartDayDialog] = useState(false);
 
 	const handleStartDay = () => {
@@ -41,7 +40,6 @@ const TimeTrackerContent = () => {
 
 	const handleStartDayWithDateTime = (startDateTime: Date) => {
 		startDay(startDateTime);
-		navigate("/tasks");
 	};
 
 	const handleEndDay = () => {

From ae790e9cd6e2c8a62be9be025acfd405930c2299 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Fri, 15 May 2026 04:09:36 +0000
Subject: [PATCH 4/4] Open Add Task form inline on Dashboard instead of
 navigating away

The "Add Task" button in the Day In Progress card now toggles a
showAddTaskForm flag, rendering NewTaskForm inline below the card.
After submission the form is dismissed. The form also auto-opens when
no tasks exist yet (existing behaviour).

https://claude.ai/code/session_01Az2638DrX4j3RrixD4yz6Y
---
 src/pages/Index.tsx | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/pages/Index.tsx b/src/pages/Index.tsx
index 64cbb1a..376a442 100644
--- a/src/pages/Index.tsx
+++ b/src/pages/Index.tsx
@@ -10,7 +10,6 @@ import { DashboardIcon } from "@radix-ui/react-icons";
 import { PageLayout } from "@/components/PageLayout";
 import { TaskTrackingPanel } from "@/components/TaskTrackingPanel";
 import { useState, useMemo } from "react";
-import { Link } from "react-router-dom";
 
 // Stable epoch constant — avoids creating new Date(0) on every render
 const EPOCH = new Date(0);
@@ -33,6 +32,7 @@ const TimeTrackerContent = () => {
 	} = useTimeTracking();
 
 	const [showStartDayDialog, setShowStartDayDialog] = useState(false);
+	const [showAddTaskForm, setShowAddTaskForm] = useState(false);
 
 	const handleStartDay = () => {
 		setShowStartDayDialog(true);
@@ -58,6 +58,7 @@ const TimeTrackerContent = () => {
 		category?: string
 	) => {
 		startNewTask(title, description, project, client, category);
+		setShowAddTaskForm(false);
 	};
 
 	const totalHours = useMemo(
@@ -167,18 +168,22 @@ const TimeTrackerContent = () => {
 										</CardTitle>
 									</CardHeader>
 									<CardContent>
-										<Button asChild className="w-full">
-											<Link to="/tasks" className="flex items-center justify-center space-x-2">
-												<ClipboardList className="w-4 h-4" />
-												<span>Add Task</span>
-											</Link>
+										<Button
+											className="w-full"
+											onClick={() => setShowAddTaskForm(true)}
+											disabled={showAddTaskForm}
+										>
+											<ClipboardList className="w-4 h-4" />
+											Add Task
 										</Button>
 									</CardContent>
 								</Card>
 
-								{tasks.length === 0 ? (
+								{(tasks.length === 0 || showAddTaskForm) && (
 									<NewTaskForm onSubmit={handleNewTask} defaultOpen={true} />
-								) : (
+								)}
+
+								{tasks.length > 0 && (
 									<div className="space-y-3">
 										{tasks.map((task) => (
 											<TaskItem