diff --git a/apps/web/src/app/(authenticated)/calendar/page.test.tsx b/apps/web/src/app/(authenticated)/calendar/page.test.tsx
new file mode 100644
index 0000000..098b21a
--- /dev/null
+++ b/apps/web/src/app/(authenticated)/calendar/page.test.tsx
@@ -0,0 +1,46 @@
+import { describe, it, expect, vi } from "vitest";
+import { render, screen, waitFor } from "@testing-library/react";
+import CalendarPage from "./page";
+
+// Mock the Calendar component
+vi.mock("@/components/calendar/Calendar", () => ({
+  Calendar: ({
+    events,
+    isLoading,
+  }: {
+    events: unknown[];
+    isLoading: boolean;
+  }): React.JSX.Element => (
+    <div data-testid="calendar">{isLoading ? "Loading" : `${String(events.length)} events`}</div>
+  ),
+}));
+
+describe("CalendarPage", (): void => {
+  it("should render the page title", (): void => {
+    render(<CalendarPage />);
+    expect(screen.getByRole("heading", { level: 1 })).toHaveTextContent("Calendar");
+  });
+
+  it("should show loading state initially", (): void => {
+    render(<CalendarPage />);
+    expect(screen.getByTestId("calendar")).toHaveTextContent("Loading");
+  });
+
+  it("should render the Calendar with events after loading", async (): Promise<void> => {
+    render(<CalendarPage />);
+    await waitFor((): void => {
+      expect(screen.getByTestId("calendar")).toHaveTextContent("3 events");
+    });
+  });
+
+  it("should have proper layout structure", (): void => {
+    const { container } = render(<CalendarPage />);
+    const main = container.querySelector("main");
+    expect(main).toBeInTheDocument();
+  });
+
+  it("should render the subtitle text", (): void => {
+    render(<CalendarPage />);
+    expect(screen.getByText("View your schedule at a glance")).toBeInTheDocument();
+  });
+});
diff --git a/apps/web/src/app/(authenticated)/calendar/page.tsx b/apps/web/src/app/(authenticated)/calendar/page.tsx
index d1c6d13..101231a 100644
--- a/apps/web/src/app/(authenticated)/calendar/page.tsx
+++ b/apps/web/src/app/(authenticated)/calendar/page.tsx
@@ -1,18 +1,39 @@
 "use client";
 
+import { useState, useEffect } from "react";
 import type { ReactElement } from "react";
 import { Calendar } from "@/components/calendar/Calendar";
 import { mockEvents } from "@/lib/api/events";
+import type { Event } from "@mosaic/shared";
 
 export default function CalendarPage(): ReactElement {
-  // TODO: Replace with real API call when backend is ready
-  // const { data: events, isLoading } = useQuery({
-  //   queryKey: ["events"],
-  //   queryFn: fetchEvents,
-  // });
+  const [events, setEvents] = useState<Event[]>([]);
+  const [isLoading, setIsLoading] = useState(true);
+  const [error, setError] = useState<string | null>(null);
 
-  const events = mockEvents;
-  const isLoading = false;
+  useEffect(() => {
+    void loadEvents();
+  }, []);
+
+  async function loadEvents(): Promise<void> {
+    setIsLoading(true);
+    setError(null);
+
+    try {
+      // TODO: Replace with real API call when backend is ready
+      // const data = await fetchEvents();
+      await new Promise((resolve) => setTimeout(resolve, 300));
+      setEvents(mockEvents);
+    } catch (err) {
+      setError(
+        err instanceof Error
+          ? err.message
+          : "We had trouble loading your calendar. Please try again when you're ready."
+      );
+    } finally {
+      setIsLoading(false);
+    }
+  }
 
   return (
     <main className="container mx-auto px-4 py-8">
@@ -20,7 +41,20 @@ export default function CalendarPage(): ReactElement {
         <h1 className="text-3xl font-bold text-gray-900">Calendar</h1>
         <p className="text-gray-600 mt-2">View your schedule at a glance</p>
       </div>
-      <Calendar events={events} isLoading={isLoading} />
+
+      {error !== null ? (
+        <div className="rounded-lg border border-amber-200 bg-amber-50 p-6 text-center">
+          <p className="text-amber-800">{error}</p>
+          <button
+            onClick={() => void loadEvents()}
+            className="mt-4 rounded-md bg-amber-600 px-4 py-2 text-sm font-medium text-white hover:bg-amber-700 transition-colors"
+          >
+            Try again
+          </button>
+        </div>
+      ) : (
+        <Calendar events={events} isLoading={isLoading} />
+      )}
     </main>
   );
 }
diff --git a/apps/web/src/app/(authenticated)/page.test.tsx b/apps/web/src/app/(authenticated)/page.test.tsx
new file mode 100644
index 0000000..4702f0d
--- /dev/null
+++ b/apps/web/src/app/(authenticated)/page.test.tsx
@@ -0,0 +1,85 @@
+import { describe, it, expect, vi } from "vitest";
+import { render, screen, waitFor } from "@testing-library/react";
+import DashboardPage from "./page";
+
+// Mock dashboard widgets
+vi.mock("@/components/dashboard/RecentTasksWidget", () => ({
+  RecentTasksWidget: ({
+    tasks,
+    isLoading,
+  }: {
+    tasks: unknown[];
+    isLoading: boolean;
+  }): React.JSX.Element => (
+    <div data-testid="recent-tasks">
+      {isLoading ? "Loading tasks" : `${String(tasks.length)} tasks`}
+    </div>
+  ),
+}));
+
+vi.mock("@/components/dashboard/UpcomingEventsWidget", () => ({
+  UpcomingEventsWidget: ({
+    events,
+    isLoading,
+  }: {
+    events: unknown[];
+    isLoading: boolean;
+  }): React.JSX.Element => (
+    <div data-testid="upcoming-events">
+      {isLoading ? "Loading events" : `${String(events.length)} events`}
+    </div>
+  ),
+}));
+
+vi.mock("@/components/dashboard/QuickCaptureWidget", () => ({
+  QuickCaptureWidget: (): React.JSX.Element => <div data-testid="quick-capture">Quick Capture</div>,
+}));
+
+vi.mock("@/components/dashboard/DomainOverviewWidget", () => ({
+  DomainOverviewWidget: ({
+    tasks,
+    isLoading,
+  }: {
+    tasks: unknown[];
+    isLoading: boolean;
+  }): React.JSX.Element => (
+    <div data-testid="domain-overview">
+      {isLoading ? "Loading overview" : `${String(tasks.length)} tasks overview`}
+    </div>
+  ),
+}));
+
+describe("DashboardPage", (): void => {
+  it("should render the page title", (): void => {
+    render(<DashboardPage />);
+    expect(screen.getByRole("heading", { level: 1 })).toHaveTextContent("Dashboard");
+  });
+
+  it("should show loading state initially", (): void => {
+    render(<DashboardPage />);
+    expect(screen.getByTestId("recent-tasks")).toHaveTextContent("Loading tasks");
+    expect(screen.getByTestId("upcoming-events")).toHaveTextContent("Loading events");
+    expect(screen.getByTestId("domain-overview")).toHaveTextContent("Loading overview");
+  });
+
+  it("should render all widgets with data after loading", async (): Promise<void> => {
+    render(<DashboardPage />);
+    await waitFor((): void => {
+      expect(screen.getByTestId("recent-tasks")).toHaveTextContent("4 tasks");
+      expect(screen.getByTestId("upcoming-events")).toHaveTextContent("3 events");
+      expect(screen.getByTestId("domain-overview")).toHaveTextContent("4 tasks overview");
+      expect(screen.getByTestId("quick-capture")).toBeInTheDocument();
+    });
+  });
+
+  it("should have proper layout structure", (): void => {
+    const { container } = render(<DashboardPage />);
+    const main = container.querySelector("main");
+    expect(main).toBeInTheDocument();
+  });
+
+  it("should render the welcome subtitle", (): void => {
+    render(<DashboardPage />);
+    expect(screen.getByText(/Welcome back/)).toBeInTheDocument();
+  });
+});
diff --git a/apps/web/src/app/(authenticated)/page.tsx b/apps/web/src/app/(authenticated)/page.tsx
index 532c87d..8d637f7 100644
--- a/apps/web/src/app/(authenticated)/page.tsx
+++ b/apps/web/src/app/(authenticated)/page.tsx
@@ -1,3 +1,6 @@
+"use client";
+
+import { useState, useEffect } from "react";
 import type { ReactElement } from "react";
 import { RecentTasksWidget } from "@/components/dashboard/RecentTasksWidget";
 import { UpcomingEventsWidget } from "@/components/dashboard/UpcomingEventsWidget";
@@ -5,43 +8,71 @@ import { QuickCaptureWidget } from "@/components/dashboard/QuickCaptureWidget";
 import { DomainOverviewWidget } from "@/components/dashboard/DomainOverviewWidget";
 import { mockTasks } from "@/lib/api/tasks";
 import { mockEvents } from "@/lib/api/events";
+import type { Task, Event } from "@mosaic/shared";
 
 export default function DashboardPage(): ReactElement {
-  // TODO: Replace with real API call when backend is ready
-  // const { data: tasks, isLoading: tasksLoading } = useQuery({
-  //   queryKey: ["tasks"],
-  //   queryFn: fetchTasks,
-  // });
-  // const { data: events, isLoading: eventsLoading } = useQuery({
-  //   queryKey: ["events"],
-  //   queryFn: fetchEvents,
-  // });
+  const [tasks, setTasks] = useState<Task[]>([]);
+  const [events, setEvents] = useState<Event[]>([]);
+  const [isLoading, setIsLoading] = useState(true);
+  const [error, setError] = useState<string | null>(null);
 
-  const tasks = mockTasks;
-  const events = mockEvents;
-  const tasksLoading = false;
-  const eventsLoading = false;
+  useEffect(() => {
+    void loadDashboardData();
+  }, []);
+
+  async function loadDashboardData(): Promise<void> {
+    setIsLoading(true);
+    setError(null);
+
+    try {
+      // TODO: Replace with real API calls when backend is ready
+      // const [tasksData, eventsData] = await Promise.all([fetchTasks(), fetchEvents()]);
+      await new Promise((resolve) => setTimeout(resolve, 300));
+      setTasks(mockTasks);
+      setEvents(mockEvents);
+    } catch (err) {
+      setError(
+        err instanceof Error
+          ? err.message
+          : "We had trouble loading your dashboard. Please try again when you're ready."
+      );
+    } finally {
+      setIsLoading(false);
+    }
+  }
 
   return (
     <main className="container mx-auto px-4 py-8">
       <div className="mb-8">
         <h1 className="text-3xl font-bold text-gray-900">Dashboard</h1>
-        <p className="text-gray-600 mt-2">Welcome back! Here's your overview</p>
+        <p className="text-gray-600 mt-2">Welcome back! Here&apos;s your overview</p>
       </div>
 
-      <div className="grid grid-cols-1 lg:grid-cols-2 gap-6">
-        {/* Top row: Domain Overview and Quick Capture */}
-        <div className="lg:col-span-2">
-          <DomainOverviewWidget tasks={tasks} isLoading={tasksLoading} />
+      {error !== null ? (
+        <div className="rounded-lg border border-amber-200 bg-amber-50 p-6 text-center">
+          <p className="text-amber-800">{error}</p>
+          <button
+            onClick={() => void loadDashboardData()}
+            className="mt-4 rounded-md bg-amber-600 px-4 py-2 text-sm font-medium text-white hover:bg-amber-700 transition-colors"
+          >
+            Try again
+          </button>
         </div>
+      ) : (
+        <div className="grid grid-cols-1 lg:grid-cols-2 gap-6">
+          {/* Top row: Domain Overview and Quick Capture */}
+          <div className="lg:col-span-2">
+            <DomainOverviewWidget tasks={tasks} isLoading={isLoading} />
+          </div>
 
-        <RecentTasksWidget tasks={tasks} isLoading={tasksLoading} />
-        <UpcomingEventsWidget events={events} isLoading={eventsLoading} />
+          <RecentTasksWidget tasks={tasks} isLoading={isLoading} />
+          <UpcomingEventsWidget events={events} isLoading={isLoading} />
 
-        <div className="lg:col-span-2">
-          <QuickCaptureWidget />
+          <div className="lg:col-span-2">
+            <QuickCaptureWidget />
+          </div>
         </div>
-      </div>
+      )}
     </main>
   );
 }
diff --git a/apps/web/src/app/(authenticated)/tasks/page.test.tsx b/apps/web/src/app/(authenticated)/tasks/page.test.tsx
index a317f18..a0c9966 100644
--- a/apps/web/src/app/(authenticated)/tasks/page.test.tsx
+++ b/apps/web/src/app/(authenticated)/tasks/page.test.tsx
@@ -1,5 +1,5 @@
 import { describe, it, expect, vi } from "vitest";
-import { render, screen } from "@testing-library/react";
+import { render, screen, waitFor } from "@testing-library/react";
 import TasksPage from "./page";
 
 // Mock the TaskList component
@@ -15,9 +15,16 @@ describe("TasksPage", (): void => {
     expect(screen.getByRole("heading", { level: 1 })).toHaveTextContent("Tasks");
   });
 
-  it("should render the TaskList component", (): void => {
+  it("should show loading state initially", (): void => {
     render(<TasksPage />);
-    expect(screen.getByTestId("task-list")).toBeInTheDocument();
+    expect(screen.getByTestId("task-list")).toHaveTextContent("Loading");
+  });
+
+  it("should render the TaskList with tasks after loading", async (): Promise<void> => {
+    render(<TasksPage />);
+    await waitFor((): void => {
+      expect(screen.getByTestId("task-list")).toHaveTextContent("4 tasks");
+    });
   });
 
   it("should have proper layout structure", (): void => {
@@ -25,4 +32,9 @@ describe("TasksPage", (): void => {
     const main = container.querySelector("main");
     expect(main).toBeInTheDocument();
   });
+
+  it("should render the subtitle text", (): void => {
+    render(<TasksPage />);
+    expect(screen.getByText("Organize your work at your own pace")).toBeInTheDocument();
+  });
 });
diff --git a/apps/web/src/app/(authenticated)/tasks/page.tsx b/apps/web/src/app/(authenticated)/tasks/page.tsx
index 373409b..6873ce1 100644
--- a/apps/web/src/app/(authenticated)/tasks/page.tsx
+++ b/apps/web/src/app/(authenticated)/tasks/page.tsx
@@ -1,19 +1,40 @@
 "use client";
 
+import { useState, useEffect } from "react";
 import type { ReactElement } from "react";
 
 import { TaskList } from "@/components/tasks/TaskList";
 import { mockTasks } from "@/lib/api/tasks";
+import type { Task } from "@mosaic/shared";
 
 export default function TasksPage(): ReactElement {
-  // TODO: Replace with real API call when backend is ready
-  // const { data: tasks, isLoading } = useQuery({
-  //   queryKey: ["tasks"],
-  //   queryFn: fetchTasks,
-  // });
+  const [tasks, setTasks] = useState<Task[]>([]);
+  const [isLoading, setIsLoading] = useState(true);
+  const [error, setError] = useState<string | null>(null);
 
-  const tasks = mockTasks;
-  const isLoading = false;
+  useEffect(() => {
+    void loadTasks();
+  }, []);
+
+  async function loadTasks(): Promise<void> {
+    setIsLoading(true);
+    setError(null);
+
+    try {
+      // TODO: Replace with real API call when backend is ready
+      // const data = await fetchTasks();
+      await new Promise((resolve) => setTimeout(resolve, 300));
+      setTasks(mockTasks);
+    } catch (err) {
+      setError(
+        err instanceof Error
+          ? err.message
+          : "We had trouble loading your tasks. Please try again when you're ready."
+      );
+    } finally {
+      setIsLoading(false);
+    }
+  }
 
   return (
     <main className="container mx-auto px-4 py-8">
@@ -21,7 +42,20 @@ export default function TasksPage(): ReactElement {
         <h1 className="text-3xl font-bold text-gray-900">Tasks</h1>
         <p className="text-gray-600 mt-2">Organize your work at your own pace</p>
       </div>
-      <TaskList tasks={tasks} isLoading={isLoading} />
+
+      {error !== null ? (
+        <div className="rounded-lg border border-amber-200 bg-amber-50 p-6 text-center">
+          <p className="text-amber-800">{error}</p>
+          <button
+            onClick={() => void loadTasks()}
+            className="mt-4 rounded-md bg-amber-600 px-4 py-2 text-sm font-medium text-white hover:bg-amber-700 transition-colors"
+          >
+            Try again
+          </button>
+        </div>
+      ) : (
+        <TaskList tasks={tasks} isLoading={isLoading} />
+      )}
     </main>
   );
 }