'some' changes

app/(tabs)/index.tsx

@@ -1,9 +1,10 @@
 import {
-  GetActiveSprint,
+  GetActiveSession,
-  RemoveActiveSprint,
+  RemoveActiveSession,
-  type ActiveSprint,
+  type ActiveSession,
 } from '@/lib/asyncStorage';
-import { formatDate } from '@/lib/date';
+import type { SessionType } from '@/lib/types';
+import { formatDate, formatDateTime } from '@/lib/date';
 import { RegisterForLocalNotificationsAsync } from '@/lib/notifications';
 import { CheckAssignmentCompletion } from '@/lib/progress';
 import { supabase } from "@/lib/supabase";
@@ -30,6 +31,29 @@ type UpcomingDeadlineTask = {
   deadline: string;
 };
 
+type DashboardProgressSummary = {
+  completedFocusSessionsToday: number;
+  minutesStudiedToday: number;
+  minutesStudiedThisWeek: number;
+};
+
+type RecentSession = {
+  sessionId: string;
+  taskTitle: string | null;
+  sessionType: SessionType;
+  elapsedSeconds: number;
+  status: string;
+  startedAt: string | null;
+  endedAt: string | null;
+};
+
+type RecentlyCompletedTask = {
+  tId: string;
+  title: string;
+  assignmentTitle: string;
+  lastChanged: string;
+};
+
 const FLOW_STEPS = [
   {
     label: '1',
@@ -60,18 +84,88 @@ function formatTime(totalSeconds: number) {
   return `${minutes.toString().padStart(2, '0')}:${seconds.toString().padStart(2, '0')}`;
 }
 
+function getSessionLabel(sessionType: SessionType) {
+  switch (sessionType) {
+    case 'short_break':
+      return 'Short Break';
+    case 'long_break':
+      return 'Long Break';
+    default:
+      return 'Active Sprint';
+  }
+}
+
+function formatTrackedMinutes(totalSeconds: number) {
+  return Math.floor(totalSeconds / 60);
+}
+
+function formatTrackedDuration(totalSeconds: number) {
+  if (totalSeconds <= 0) {
+    return '0m';
+  }
+
+  const hours = Math.floor(totalSeconds / 3600);
+  const minutes = Math.floor((totalSeconds % 3600) / 60);
+
+  if (hours === 0) {
+    return `${minutes}m`;
+  }
+
+  if (minutes === 0) {
+    return `${hours}h`;
+  }
+
+  return `${hours}h ${minutes}m`;
+}
+
+function getSessionStatusLabel(status: string) {
+  switch (status) {
+    case 'completed':
+      return 'Completed';
+    case 'cancelled':
+      return 'Cancelled';
+    case 'expired':
+      return 'Timed out';
+    default:
+      return status;
+  }
+}
+
+function getStartOfToday() {
+  const now = new Date();
+  return new Date(now.getFullYear(), now.getMonth(), now.getDate());
+}
+
+function getStartOfWeek() {
+  const today = getStartOfToday();
+  const currentDay = today.getDay();
+  const daysSinceMonday = (currentDay + 6) % 7;
+
+  const startOfWeek = new Date(today);
+  startOfWeek.setDate(today.getDate() - daysSinceMonday);
+  return startOfWeek;
+}
+
 export default function HomeScreen() {
   const [session, SetSession] = useState<Session | null>(null);
-  const [activeSprint, setActiveSprint] = useState<ActiveSprint | null>(null);
+  const [activeSprint, setActiveSprint] = useState<ActiveSession | null>(null);
   const [activeSprintTaskTitle, setActiveSprintTaskTitle] = useState<string | null>(null);
   const [activeSprintTaskDesc, setActiveSprintTaskDesc] = useState<string | null>(null);
   const [remainingSeconds, setRemainingSeconds] = useState(0);
+  const [dashboardSummary, setDashboardSummary] = useState<DashboardProgressSummary>({
+    completedFocusSessionsToday: 0,
+    minutesStudiedToday: 0,
+    minutesStudiedThisWeek: 0,
+  });
+  const [recentSessions, setRecentSessions] = useState<RecentSession[]>([]);
+  const [recentlyCompletedTasks, setRecentlyCompletedTasks] = useState<RecentlyCompletedTask[]>([]);
   const [upcomingDeadlineTasks, setUpcomingDeadlineTasks] = useState<UpcomingDeadlineTask[]>([]);
   const [isFlowInfoVisible, setIsFlowInfoVisible] = useState(false);
   const [completingTaskId, setCompletingTaskId] = useState<string | null>(null);
+  const [subjectCount, setSubjectCount] = useState(0);
 
   const loadActiveSprint = useCallback(async () => {
-    const storedSprint = await GetActiveSprint();
+    const storedSprint = await GetActiveSession();
 
     if (!storedSprint) {
       setActiveSprint(null);
@@ -87,7 +181,7 @@ export default function HomeScreen() {
     );
 
     if (secondsLeft <= 0) {
-      await RemoveActiveSprint();
+      await RemoveActiveSession();
       setActiveSprint(null);
       setActiveSprintTaskTitle(null);
       setActiveSprintTaskDesc(null);
@@ -98,6 +192,12 @@ export default function HomeScreen() {
     setActiveSprint(storedSprint);
     setRemainingSeconds(secondsLeft);
 
+    if (!storedSprint.taskId) {
+      setActiveSprintTaskTitle(getSessionLabel(storedSprint.sessionType));
+      setActiveSprintTaskDesc('Take the break before you jump into the next focus session.');
+      return;
+    }
+
     const { data: dbTitle } = await supabase
       .from('tasks')
       .select('title')
@@ -204,6 +304,160 @@ export default function HomeScreen() {
     setUpcomingDeadlineTasks(enrichedTasks);
   }, [session?.user.id]);
 
+  const loadDashboardProgress = useCallback(async () => {
+    if (!session?.user.id) {
+      setDashboardSummary({
+        completedFocusSessionsToday: 0,
+        minutesStudiedToday: 0,
+        minutesStudiedThisWeek: 0,
+      });
+      setRecentSessions([]);
+      setRecentlyCompletedTasks([]);
+      return;
+    }
+
+    const startOfToday = getStartOfToday().toISOString();
+    const startOfWeek = getStartOfWeek().toISOString();
+
+    const [
+      { data: weeklySessions, error: weeklySessionsError },
+      { data: rawRecentSessions, error: recentSessionsError },
+      { data: completedTasks, error: completedTasksError },
+      { count: fetchedSubjectCount, error: subjectCountError },
+    ] = await Promise.all([
+      supabase
+        .from('sprint_sessions')
+        .select('sessionId, sessionType, elapsedSeconds, status, startedAt, endedAt')
+        .eq('userId', session.user.id)
+        .eq('sessionType', 'focus')
+        .not('endedAt', 'is', null)
+        .gte('endedAt', startOfWeek),
+      supabase
+        .from('sprint_sessions')
+        .select('sessionId, taskId, sessionType, elapsedSeconds, status, startedAt, endedAt')
+        .eq('userId', session.user.id)
+        .not('endedAt', 'is', null)
+        .order('endedAt', { ascending: false })
+        .limit(6),
+      supabase
+        .from('tasks')
+        .select('tId, title, aId, lastChanged')
+        .eq('uId', session.user.id)
+        .eq('isCompleted', true)
+        .order('lastChanged', { ascending: false })
+        .limit(3),
+      supabase
+        .from('subjects')
+        .select('sId', { count: 'exact', head: true })
+        .eq('uId', session.user.id),
+    ]);
+
+    if (weeklySessionsError || recentSessionsError || completedTasksError || subjectCountError) {
+      setDashboardSummary({
+        completedFocusSessionsToday: 0,
+        minutesStudiedToday: 0,
+        minutesStudiedThisWeek: 0,
+      });
+      setRecentSessions([]);
+      setRecentlyCompletedTasks([]);
+      setSubjectCount(0);
+      return;
+    }
+
+    setSubjectCount(fetchedSubjectCount ?? 0);
+
+    const weeklySessionRows = weeklySessions ?? [];
+    const todaySummary = weeklySessionRows.reduce(
+      (summary, currentSession) => {
+        const endedAt = currentSession.endedAt ? new Date(currentSession.endedAt) : null;
+
+        if (!endedAt || Number.isNaN(endedAt.getTime())) {
+          return summary;
+        }
+
+        const elapsedSeconds = currentSession.elapsedSeconds ?? 0;
+
+        summary.minutesStudiedThisWeek += formatTrackedMinutes(elapsedSeconds);
+
+        if (endedAt >= new Date(startOfToday)) {
+          summary.minutesStudiedToday += formatTrackedMinutes(elapsedSeconds);
+
+          if (currentSession.status === 'completed') {
+            summary.completedFocusSessionsToday += 1;
+          }
+        }
+
+        return summary;
+      },
+      {
+        completedFocusSessionsToday: 0,
+        minutesStudiedToday: 0,
+        minutesStudiedThisWeek: 0,
+      } satisfies DashboardProgressSummary
+    );
+
+    setDashboardSummary(todaySummary);
+
+    const recentSessionRows = rawRecentSessions ?? [];
+    const recentTaskIds = [
+      ...new Set(
+        recentSessionRows
+          .map((recentSession) => recentSession.taskId)
+          .filter((taskId): taskId is string => Boolean(taskId))
+      ),
+    ];
+
+    const completedTaskRows = completedTasks ?? [];
+    const completedAssignmentIds = [
+      ...new Set(
+        completedTaskRows
+          .map((task) => task.aId)
+          .filter((assignmentId): assignmentId is string => Boolean(assignmentId))
+      ),
+    ];
+
+    const [{ data: recentTasks }, { data: completedAssignments }] = await Promise.all([
+      recentTaskIds.length > 0
+        ? supabase
+            .from('tasks')
+            .select('tId, title')
+            .in('tId', recentTaskIds)
+        : Promise.resolve({ data: [], error: null }),
+      completedAssignmentIds.length > 0
+        ? supabase
+            .from('assignments')
+            .select('aId, title')
+            .in('aId', completedAssignmentIds)
+        : Promise.resolve({ data: [], error: null }),
+    ]);
+
+    const tasksById = new Map((recentTasks ?? []).map((task) => [task.tId, task.title]));
+    const assignmentsById = new Map(
+      (completedAssignments ?? []).map((assignment) => [assignment.aId, assignment.title])
+    );
+
+    setRecentSessions(
+      recentSessionRows.map((recentSession) => ({
+        sessionId: recentSession.sessionId,
+        taskTitle: recentSession.taskId ? (tasksById.get(recentSession.taskId) ?? null) : null,
+        sessionType: recentSession.sessionType,
+        elapsedSeconds: recentSession.elapsedSeconds ?? 0,
+        status: recentSession.status,
+        startedAt: recentSession.startedAt,
+        endedAt: recentSession.endedAt,
+      }))
+    );
+
+    setRecentlyCompletedTasks(
+      completedTaskRows.map((task) => ({
+        tId: task.tId,
+        title: task.title,
+        assignmentTitle: assignmentsById.get(task.aId) ?? 'Unknown Assignment',
+        lastChanged: task.lastChanged,
+      }))
+    );
+  }, [session?.user.id]);
+
   useEffect(() => {
     supabase.auth
       .getSession()
@@ -227,8 +481,9 @@ export default function HomeScreen() {
   useFocusEffect(
     useCallback(() => {
       void loadActiveSprint();
+      void loadDashboardProgress();
       void loadUpcomingDeadlineTasks();
-    }, [loadActiveSprint, loadUpcomingDeadlineTasks])
+    }, [loadActiveSprint, loadDashboardProgress, loadUpcomingDeadlineTasks])
   );
 
   useEffect(() => {
@@ -245,9 +500,10 @@ export default function HomeScreen() {
       setRemainingSeconds(secondsLeft);
 
       if (secondsLeft <= 0) {
-        void RemoveActiveSprint();
+        void RemoveActiveSession();
         setActiveSprint(null);
         setActiveSprintTaskTitle(null);
+        setActiveSprintTaskDesc(null);
       }
     }, 1000);
 
@@ -324,7 +580,11 @@ export default function HomeScreen() {
         }}
       />
 
-      <View className="m-1 flex-1 p-6">
+      <ScrollView
+        className="m-1 flex-1"
+        contentContainerStyle={{ padding: 24, paddingBottom: 40 }}
+        showsVerticalScrollIndicator={false}
+      >
         <Modal
           animationType="fade"
           transparent
@@ -408,9 +668,35 @@ export default function HomeScreen() {
           </View>
         </Modal>
 
+        {subjectCount === 0 ? (
+          <View className="mb-6 rounded-3xl border border-app-border bg-app-surface p-5">
+            <Text className="text-xs font-bold uppercase tracking-[0.8px] text-text-muted">
+              First step
+            </Text>
+            <Text className="mt-2 text-2xl font-bold text-text-main">
+              Build your first study path
+            </Text>
+            <Text className="mt-2 text-sm leading-5 text-text-secondary">
+              Start with one subject, then add one assignment and one task so you
+              can reach your first sprint without guessing what to do next.
+            </Text>
+
+            <Pressable
+              className="mt-5 h-14 items-center justify-center rounded-2xl bg-accent"
+              onPress={() => router.push('/setup')}
+            >
+              <Text className="text-base font-bold text-text-inverse">
+                Start Guided Setup
+              </Text>
+            </Pressable>
+          </View>
+        ) : null}
+
         {activeSprint ? (
           <View className="gap-2 rounded-2xl border border-[#D5D9DF] bg-[#F7F9FC] p-4">
-            <Text className="text-[13px] font-semibold text-[#5D6B7A]">Active Sprint</Text>
+            <Text className="text-[13px] font-semibold text-[#5D6B7A]">
+              {getSessionLabel(activeSprint.sessionType)}
+            </Text>
             <Text className="text-[20px] font-bold text-[#1F2933]">
               {activeSprintTaskTitle ?? 'Selected task'}
             </Text>
@@ -428,11 +714,16 @@ export default function HomeScreen() {
               onPress={() =>
                 router.push({
                   pathname: '/task/timer',
-                  params: { tId: activeSprint.taskId },
+                  params: activeSprint.taskId
+                    ? { tId: activeSprint.taskId }
+                    : {
+                        sessionType: activeSprint.sessionType,
+                        durationMinutes: String(Math.max(1, Math.round(activeSprint.durationSeconds / 60))),
+                      },
                 })
               }
             >
-              <Text className="text-[15px] font-bold text-white">Open Sprint</Text>
+              <Text className="text-[15px] font-bold text-white">Open Session</Text>
             </Pressable>
           </View>
         ) : (
@@ -441,10 +732,51 @@ export default function HomeScreen() {
           </Text>
         )}
 
+        <View className="mt-6 gap-3">
+          <Text className="text-lg font-bold text-[#1F2933]">
+            Study progress
+          </Text>
+          <Text className="text-sm leading-[20px] text-[#6B7580]">
+            A quick view of today&apos;s and this week&apos;s focused study effort.
+          </Text>
+
+          <View className="flex-row gap-3">
+            <View className="flex-1 rounded-2xl border border-[#D5D9DF] bg-white p-4">
+              <Text className="text-[12px] font-semibold uppercase tracking-[0.6px] text-[#7B8794]">
+                Focus sessions today
+              </Text>
+              <Text className="mt-2 text-[24px] font-extrabold text-[#1F2933]">
+                {dashboardSummary.completedFocusSessionsToday}
+              </Text>
+            </View>
+
+            <View className="flex-1 rounded-2xl border border-[#D5D9DF] bg-white p-4">
+              <Text className="text-[12px] font-semibold uppercase tracking-[0.6px] text-[#7B8794]">
+                Minutes today
+              </Text>
+              <Text className="mt-2 text-[24px] font-extrabold text-[#1F2933]">
+                {dashboardSummary.minutesStudiedToday}
+              </Text>
+            </View>
+          </View>
+
+          <View className="rounded-2xl border border-[#D5D9DF] bg-[#F7F9FC] p-4">
+            <Text className="text-[12px] font-semibold uppercase tracking-[0.6px] text-[#7B8794]">
+              Minutes this week
+            </Text>
+            <Text className="mt-2 text-[24px] font-extrabold text-[#1F2933]">
+              {dashboardSummary.minutesStudiedThisWeek}
+            </Text>
+          </View>
+        </View>
+
         <View className="mt-6 gap-3">
           <Text className="text-lg font-bold text-[#1F2933]">
             Tasks with upcoming deadlines
           </Text>
+          <Text className="text-sm leading-[20px] text-[#6B7580]">
+            The next concrete work items that are most likely to matter soon.
+          </Text>
 
           {upcomingDeadlineTasks.length > 0 ? (
             upcomingDeadlineTasks.map((task) => (
@@ -503,7 +835,82 @@ export default function HomeScreen() {
             <Text className="text-sm text-[#7B8794]">No upcoming task deadlines.</Text>
           )}
         </View>
-      </View>
+
+        <View className="mt-6 gap-6 md:flex-row">
+          <View className="gap-3 md:flex-1">
+            <Text className="text-lg font-bold text-[#1F2933]">
+              Recent sessions
+            </Text>
+            <Text className="text-sm leading-[20px] text-[#6B7580]">
+              The latest recorded sprints and breaks.
+            </Text>
+
+            {recentSessions.length > 0 ? (
+              recentSessions.map((recentSession) => (
+                <View
+                  key={recentSession.sessionId}
+                  className="gap-[6px] rounded-2xl border border-[#D5D9DF] bg-white p-4"
+                >
+                  <View className="flex-row items-start justify-between gap-3">
+                    <View className="flex-1">
+                      <Text className="text-base font-bold text-[#1F2933]">
+                        {recentSession.taskTitle ?? getSessionLabel(recentSession.sessionType)}
+                      </Text>
+                      <Text className="mt-1 text-sm text-[#52606D]">
+                        {getSessionLabel(recentSession.sessionType)} • {formatTrackedDuration(recentSession.elapsedSeconds)}
+                      </Text>
+                    </View>
+
+                    <View className="rounded-full bg-[#EFF3F8] px-3 py-[6px]">
+                      <Text className="text-[12px] font-bold text-[#52606D]">
+                        {getSessionStatusLabel(recentSession.status)}
+                      </Text>
+                    </View>
+                  </View>
+
+                  <Text className="text-[13px] font-semibold text-[#7B8794]">
+                    {formatDateTime(recentSession.endedAt ?? recentSession.startedAt)}
+                  </Text>
+                </View>
+              ))
+            ) : (
+              <Text className="text-sm text-[#7B8794]">No recent sessions yet.</Text>
+            )}
+          </View>
+
+          <View className="gap-3 md:flex-1">
+            <Text className="text-lg font-bold text-[#1F2933]">
+              Recently completed tasks
+            </Text>
+            <Text className="text-sm leading-[20px] text-[#6B7580]">
+              Tasks you have recently finished and moved out of the queue.
+            </Text>
+
+            {recentlyCompletedTasks.length > 0 ? (
+              recentlyCompletedTasks.map((task) => (
+                <Pressable
+                  key={task.tId}
+                  className="gap-[6px] rounded-2xl border border-[#D5D9DF] bg-white p-4"
+                  onPress={() =>
+                    router.push({
+                      pathname: '/task/viewDetailsTask',
+                      params: { tId: task.tId },
+                    })
+                  }
+                >
+                  <Text className="text-base font-bold text-[#1F2933]">{task.title}</Text>
+                  <Text className="text-sm text-[#52606D]">{task.assignmentTitle}</Text>
+                  <Text className="text-[13px] font-semibold text-[#7B8794]">
+                    Completed {formatDateTime(task.lastChanged)}
+                  </Text>
+                </Pressable>
+              ))
+            ) : (
+              <Text className="text-sm text-[#7B8794]">No completed tasks yet.</Text>
+            )}
+          </View>
+        </View>
+      </ScrollView>
     </View>
   );
 }

app/(tabs)/subjects.tsx

@@ -51,7 +51,7 @@ export default function Subjects() {
     return () => sub.subscription.unsubscribe();
   }, []);
 
-  const GetSubjects = async () => {
+  const GetSubjects = useCallback(async () => {
     if (!session?.user.id) return;
 
     const { data, error } = await supabase
@@ -66,14 +66,14 @@ export default function Subjects() {
     }
 
     SetSubjects((data as Subject[]) ?? []);
-  };
+  }, [session?.user.id]);
 
   useFocusEffect(
     useCallback(() => {
       if (session) {
-        GetSubjects();
+        void GetSubjects();
       }
-    }, [session])
+    }, [GetSubjects, session])
   );
 
   return (
@@ -212,12 +212,22 @@ export default function Subjects() {
 
         {subjects.length === 0 ? (
           <View className="rounded-3xl border border-app-border bg-app-surface p-5">
-            <Text className="text-center text-base font-semibold text-text-secondary">
+            <Text className="text-center text-xl font-bold text-text-main">
               No subjects yet
             </Text>
-            <Text className="mt-1 text-center text-sm text-text-muted">
+            <Text className="mt-2 text-center text-sm leading-5 text-text-secondary">
-              Create your first subject to get started.
+              Start with one subject so the rest of your study path has a clear
+              place to live.
             </Text>
+
+            <Pressable
+              className="mt-5 h-14 items-center justify-center rounded-2xl bg-accent"
+              onPress={() => router.push('/setup')}
+            >
+              <Text className="text-base font-bold text-text-inverse">
+                Start Guided Setup
+              </Text>
+            </Pressable>
           </View>
         ) : (
           <View>
@@ -292,14 +302,16 @@ export default function Subjects() {
           </View>
         )}
 
-        <Pressable
+        {subjects.length > 0 ? (
-          className="mt-2 h-14 items-center justify-center rounded-2xl bg-accent"
+          <Pressable
-          onPress={() => router.push('/subject/upsertSubject')}
+            className="mt-2 h-14 items-center justify-center rounded-2xl bg-accent"
-        >
+            onPress={() => router.push('/subject/upsertSubject')}
-          <Text className="text-base font-bold text-text-inverse">
+          >
-            Create Subject
+            <Text className="text-base font-bold text-text-inverse">
-          </Text>
+              Create Subject
-        </Pressable>
+            </Text>
+          </Pressable>
+        ) : null}
       </ScrollView>
     </View>
   );

app/_layout.tsx

@@ -5,10 +5,11 @@ export default function RootLayout() {
   return (
     <Stack>
       <Stack.Screen name="(tabs)" options={{ headerShown: false }} />
+      <Stack.Screen name="setup" options={{ headerShown: true }} />
       <Stack.Screen name="subject" options={{ headerShown: false }} />
       <Stack.Screen name="assignment" options={{ headerShown: false }} />
       <Stack.Screen name="task" options={{ headerShown: false }} />
-      <Stack.Screen name="createUser" options={{ headerShown: false }} />
+      <Stack.Screen name="createUser" options={{ headerShown: true, title: "" }} />
       <Stack.Screen name="login" options={{ headerShown: false }} />
     </Stack>
   );

app/assignment/upsertAssignment.tsx

@@ -20,12 +20,14 @@ import {
 } from 'react-native';
 
 export default function UpsertAssignment() {
-  const { aId, sId: routeSId } = useLocalSearchParams<{
+  const { aId, sId: routeSId, flow } = useLocalSearchParams<{
     aId?: string;
     sId?: string;
+    flow?: string;
   }>();
 
   const isEditMode = Boolean(aId);
+  const isSetupFlow = flow === 'setup';
 
   const [title, SetTitle] = useState('');
   const [description, SetDescription] = useState('');
@@ -195,6 +197,17 @@ export default function UpsertAssignment() {
 
     SetIsSaving(false);
 
+    if (!isEditMode && isSetupFlow) {
+      router.replace({
+        pathname: '/task/upsertTask',
+        params: {
+          aId: savedAssignment.aId,
+          flow: 'setup',
+        },
+      });
+      return;
+    }
+
     Alert.alert(
       isEditMode
         ? 'Assignment successfully updated!'
@@ -258,7 +271,9 @@ export default function UpsertAssignment() {
                 <Text className={labelClassName}>Title</Text>
                 <TextInput
                   className={inputClassName}
-                  placeholder="Enter assignment title"
+                  placeholder={
+                    isSetupFlow ? 'e.g. Weekly problem set 3' : 'Enter assignment title'
+                  }
                   placeholderTextColor="#9CA3AF"
                   value={title}
                   onChangeText={SetTitle}
@@ -270,7 +285,11 @@ export default function UpsertAssignment() {
                 <Text className={labelClassName}>Description</Text>
                 <TextInput
                   className={`${inputClassName} min-h-28`}
-                  placeholder="Add a short description"
+                  placeholder={
+                    isSetupFlow
+                      ? 'e.g. Finish the next exercise set before Friday'
+                      : 'Add a short description'
+                  }
                   placeholderTextColor="#9CA3AF"
                   value={description}
                   onChangeText={SetDescription}
@@ -283,7 +302,7 @@ export default function UpsertAssignment() {
                 <Text className={labelClassName}>Deadline</Text>
                 <TextInput
                   className={inputClassName}
-                  placeholder="YYYY-MM-DD"
+                  placeholder={isSetupFlow ? 'e.g. 2026-05-14' : 'YYYY-MM-DD'}
                   placeholderTextColor="#9CA3AF"
                   value={deadline}
                   onChangeText={SetDeadline}

app/assignment/viewDetailsAssignment.tsx

@@ -295,7 +295,7 @@ export default function ViewDetailsAssignment() {
                  <View className="mt-5">
                   <View className="mb-2 flex-row items-center justify-between">
                     <Text className="text-sm font-semibold text-text-secondary">
-                      Task Progress
+                      Tasks completed
                     </Text>
 
                     <Text className="text-sm font-bold text-text-main">
@@ -318,6 +318,10 @@ export default function ViewDetailsAssignment() {
                       ? 'All tasks complete'
                       : `${remainingTasks} task${remainingTasks === 1 ? '' : 's'} remaining`}
                   </Text>
+
+                  <Text className="mt-1 text-xs text-text-muted">
+                    Based only on completed tasks in this assignment.
+                  </Text>
                 </View>
 
                 <Text className="mt-4 text-sm text-text-muted">
@@ -463,7 +467,9 @@ export default function ViewDetailsAssignment() {
                 {section.emptyMessage}
               </Text>
               <Text className="mt-1 text-center text-sm text-text-muted">
-                Tasks for this assignment will show up here.
+                {tasks.length === 0
+                  ? 'Create the first task so this assignment turns into one clear next action.'
+                  : 'Tasks for this assignment will show up here.'}
               </Text>
             </View>
           ) : (

app/createUser.tsx

@@ -1,10 +1,12 @@
 import { supabase } from '@/lib/supabase';
 import { router } from 'expo-router';
-import { useState } from 'react';
+import { useEffect, useRef, useState } from 'react';
 import {
   Alert,
+  Animated,
   Keyboard,
   KeyboardAvoidingView,
+  KeyboardEvent,
   Platform,
   Pressable,
   ScrollView,
@@ -18,6 +20,48 @@ export default function CreateUser() {
   const [email, SetEmail] = useState('');
   const [password, SetPassword] = useState('');
   const [isLoading, SetIsLoading] = useState(false);
+  const [isKeyboardVisible, setIsKeyboardVisible] = useState(false);
+  const scrollViewRef = useRef<ScrollView>(null);
+  const cardLift = useRef(new Animated.Value(0)).current;
+
+  useEffect(() => {
+    const showEvent = Platform.OS === 'ios' ? 'keyboardWillShow' : 'keyboardDidShow';
+    const hideEvent = Platform.OS === 'ios' ? 'keyboardWillHide' : 'keyboardDidHide';
+
+    const handleKeyboardShow = (event: KeyboardEvent) => {
+      setIsKeyboardVisible(true);
+
+      const keyboardHeight = event.endCoordinates.height;
+      const liftAmount = Math.min(
+        Platform.OS === 'ios' ? keyboardHeight * 0.5 : keyboardHeight * 0.6,
+        260
+      );
+
+      Animated.timing(cardLift, {
+        toValue: -liftAmount,
+        duration: event.duration ?? 220,
+        useNativeDriver: true,
+      }).start();
+    };
+
+    const handleKeyboardHide = () => {
+      setIsKeyboardVisible(false);
+
+      Animated.timing(cardLift, {
+        toValue: 0,
+        duration: 220,
+        useNativeDriver: true,
+      }).start();
+    };
+
+    const showSubscription = Keyboard.addListener(showEvent, handleKeyboardShow);
+    const hideSubscription = Keyboard.addListener(hideEvent, handleKeyboardHide);
+
+    return () => {
+      showSubscription.remove();
+      hideSubscription.remove();
+    };
+  }, [cardLift]);
 
   const SignUp = async () => {
     if (email.trim() === '' || password.trim() === '') {
@@ -47,7 +91,7 @@ export default function CreateUser() {
       router.replace('/login');
       return;
     }
-    router.replace('/');
+    router.replace('/setup');
   };
 
   const inputClassName =
@@ -57,88 +101,111 @@ export default function CreateUser() {
     <KeyboardAvoidingView
       className="flex-1 bg-app-bg"
       behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
+      keyboardVerticalOffset={Platform.OS === 'ios' ? 0 : 24}
     >
       <TouchableWithoutFeedback onPress={Keyboard.dismiss}>
         <ScrollView
+          ref={scrollViewRef}
           className="flex-1"
           keyboardShouldPersistTaps="handled"
+          keyboardDismissMode="on-drag"
+          automaticallyAdjustKeyboardInsets={Platform.OS === 'ios'}
           contentContainerStyle={{
             flexGrow: 1,
-            justifyContent: 'center',
+            justifyContent: isKeyboardVisible ? 'flex-start' : 'center',
             paddingHorizontal: 20,
-            paddingTop: 64,
+            paddingTop: isKeyboardVisible ? 24 : 64,
-            paddingBottom: 32,
+            paddingBottom: isKeyboardVisible ? 96 : 32,
           }}
         >
-          <View className="mb-10">
+          <Animated.View style={{ transform: [{ translateY: cardLift }] }}>
-            <Text className="mt-5 text-4xl font-bold text-text-main">
+            <View className="mb-10">
-              Study Sprint
+              <Text className="mt-5 text-4xl font-bold text-text-main">
-            </Text>
+                Study Sprint
-
+              </Text>
-            <Text className="mt-3 text-base leading-6 text-text-secondary">
+
-              Organize subjects, assignments, and tasks in one calm workflow.
+              <Text className="mt-3 text-base leading-6 text-text-secondary">
-            </Text>
+                Organize subjects, assignments, and tasks in one calm workflow.
-          </View>
-
-          <View className="rounded-3xl border border-app-border bg-app-surface p-5">
-            <Text className="text-2xl font-bold text-text-main">
-              Create account
-            </Text>
-            <Text className="mt-2 text-sm leading-5 text-text-secondary">
-              Start your next study sprint.
-            </Text>
-
-            <View className="mt-6 mb-5">
-              <Text className="mb-2 text-sm font-semibold text-text-secondary">
-                Email
               </Text>
-              <TextInput
-                className={inputClassName}
-                placeholder="you@example.com"
-                placeholderTextColor="#9CA3AF"
-                keyboardType="email-address"
-                autoCapitalize="none"
-                autoCorrect={false}
-                value={email}
-                onChangeText={SetEmail}
-              />
             </View>
 
-            <View className="mb-6">
+            <View className="rounded-3xl border border-app-border bg-app-surface p-5">
-              <Text className="mb-2 text-sm font-semibold text-text-secondary">
+              <Text className="text-2xl font-bold text-text-main">
-                Password
+                Create account
               </Text>
-              <TextInput
+              <Text className="mt-2 text-sm leading-5 text-text-secondary">
-                className={inputClassName}
+                Start your next study sprint.
-                placeholder="Create a password"
+              </Text>
-                placeholderTextColor="#9CA3AF"
+
-                secureTextEntry
+              <View className="mt-5 rounded-2xl border border-app-border bg-app-subtle p-4">
-                value={password}
+                <Text className="text-sm font-bold text-text-main">
-                onChangeText={SetPassword}
+                  What this app does
-              />
+                </Text>
+                <Text className="mt-1 text-sm leading-5 text-text-secondary">
+                  Study Sprint helps you move from subject to assignment to task,
+                  then into a focused sprint.
+                </Text>
+                <Text className="mt-3 text-sm font-bold text-text-main">
+                  Why an account exists
+                </Text>
+                <Text className="mt-1 text-sm leading-5 text-text-secondary">
+                  Your account keeps that structure and your tracked study
+                  progress attached to you.
+                </Text>
+              </View>
+
+              <View className="mt-6 mb-5">
+                <Text className="mb-2 text-sm font-semibold text-text-secondary">
+                  Email
+                </Text>
+                <TextInput
+                  className={inputClassName}
+                  placeholder="you@example.com"
+                  placeholderTextColor="#9CA3AF"
+                  keyboardType="email-address"
+                  autoCapitalize="none"
+                  autoCorrect={false}
+                  value={email}
+                  onChangeText={SetEmail}
+                />
+              </View>
+
+              <View className="mb-6">
+                <Text className="mb-2 text-sm font-semibold text-text-secondary">
+                  Password
+                </Text>
+                <TextInput
+                  className={inputClassName}
+                  placeholder="Create a password so your progress follows you"
+                  placeholderTextColor="#9CA3AF"
+                  secureTextEntry
+                  value={password}
+                  onChangeText={SetPassword}
+                />
+              </View>
+
+              <Pressable
+                className={`h-14 items-center justify-center rounded-2xl ${
+                  isLoading ? 'bg-accent-disabled' : 'bg-accent'
+                }`}
+                onPress={SignUp}
+                disabled={isLoading}
+              >
+                <Text className="text-base font-bold text-text-inverse">
+                  {isLoading ? 'Creating account...' : 'Create account'}
+                </Text>
+              </Pressable>
+
+              <Pressable
+                className="mt-4 h-12 items-center justify-center rounded-2xl border border-app-border bg-app-subtle"
+                onPress={() => router.push('/login')}
+              >
+                <Text className="text-sm font-semibold text-text-secondary">
+                  Already have an account? Log in
+                </Text>
+              </Pressable>
             </View>
-
+          </Animated.View>
-            <Pressable
-              className={`h-14 items-center justify-center rounded-2xl ${
-                isLoading ? 'bg-accent-disabled' : 'bg-accent'
-              }`}
-              onPress={SignUp}
-              disabled={isLoading}
-            >
-              <Text className="text-base font-bold text-text-inverse">
-                {isLoading ? 'Creating account...' : 'Create account'}
-              </Text>
-            </Pressable>
-
-            <Pressable
-              className="mt-4 h-12 items-center justify-center rounded-2xl border border-app-border bg-app-subtle"
-              onPress={() => router.push('/login')}
-            >
-              <Text className="text-sm font-semibold text-text-secondary">
-                Already have an account? Log in
-              </Text>
-          </Pressable>
-          </View>
         </ScrollView>
       </TouchableWithoutFeedback>
     </KeyboardAvoidingView>

app/login.tsx

@@ -1,12 +1,45 @@
 import { supabase } from "@/lib/supabase";
 import { router } from "expo-router";
-import { useState } from "react";
+import { useEffect, useRef, useState } from "react";
-import { Alert, Keyboard, KeyboardAvoidingView, Platform, Pressable, ScrollView, Text, TextInput, TouchableWithoutFeedback, View } from "react-native";
+import { Alert, Keyboard, KeyboardAvoidingView, KeyboardEvent, Platform, Pressable, ScrollView, Text, TextInput, TouchableWithoutFeedback, View } from "react-native";
 
 export default function Login() {
   const [email, SetEmail] = useState('');
   const [password, SetPassword] = useState('');  
   const [isLoading, SetIsLoading] = useState(false);
+  const [isKeyboardVisible, setIsKeyboardVisible] = useState(false);
+  const scrollViewRef = useRef<ScrollView>(null);
+
+  useEffect(() => {
+    const showEvent = Platform.OS === 'ios' ? 'keyboardWillShow' : 'keyboardDidShow';
+    const hideEvent = Platform.OS === 'ios' ? 'keyboardWillHide' : 'keyboardDidHide';
+
+    const handleKeyboardShow = (event: KeyboardEvent) => {
+      setIsKeyboardVisible(true);
+
+      const keyboardHeight = event.endCoordinates.height;
+      const offsetBaseline = Platform.OS === 'ios' ? 180 : 140;
+      const nextScrollOffset = Math.max(0, keyboardHeight - offsetBaseline);
+
+      scrollViewRef.current?.scrollTo({
+        y: nextScrollOffset,
+        animated: true,
+      });
+    };
+
+    const handleKeyboardHide = () => {
+      setIsKeyboardVisible(false);
+      scrollViewRef.current?.scrollTo({ y: 0, animated: true });
+    };
+
+    const showSubscription = Keyboard.addListener(showEvent, handleKeyboardShow);
+    const hideSubscription = Keyboard.addListener(hideEvent, handleKeyboardHide);
+
+    return () => {
+      showSubscription.remove();
+      hideSubscription.remove();
+    };
+  }, []);
 
   const login = async () => {
     if(email.trim() === '' || password.trim() === '') {
@@ -38,17 +71,21 @@ export default function Login() {
   <KeyboardAvoidingView
     className="flex-1 bg-app-bg"
     behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
+    keyboardVerticalOffset={Platform.OS === 'ios' ? 0 : 24}
   >
     <TouchableWithoutFeedback onPress={Keyboard.dismiss}>
       <ScrollView
+        ref={scrollViewRef}
         className="flex-1"
         keyboardShouldPersistTaps="handled"
+        keyboardDismissMode="on-drag"
+        automaticallyAdjustKeyboardInsets={Platform.OS === 'ios'}
         contentContainerStyle={{
           flexGrow: 1,
-          justifyContent: 'center',
+          justifyContent: isKeyboardVisible ? 'flex-start' : 'center',
           paddingHorizontal: 20,
-          paddingTop: 64,
+          paddingTop: isKeyboardVisible ? 24 : 64,
-          paddingBottom: 32,
+          paddingBottom: isKeyboardVisible ? 96 : 32,
         }}
       >
         <View className="mb-10">
@@ -70,6 +107,16 @@ export default function Login() {
             Continue your study workflow.
           </Text>
 
+          <View className="mt-5 rounded-2xl border border-app-border bg-app-subtle p-4">
+            <Text className="text-sm font-bold text-text-main">
+              Your study path stays with your account
+            </Text>
+            <Text className="mt-1 text-sm leading-5 text-text-secondary">
+              Subjects, assignments, tasks, and tracked sprint progress follow
+              you after you sign in.
+            </Text>
+          </View>
+
           <View className="mb-5 mt-6">
             <Text className="mb-2 text-sm font-semibold text-text-secondary">
               Email
@@ -97,6 +144,9 @@ export default function Login() {
               secureTextEntry
               value={password}
               onChangeText={SetPassword}
+              onFocus={() => {
+                scrollViewRef.current?.scrollToEnd({ animated: true });
+              }}
             />
           </View>
 

app/setup.tsx

@@ -0,0 +1,356 @@
+import { GetActiveSession, RemoveActiveSession, type ActiveSession } from '@/lib/asyncStorage';
+import { supabase } from '@/lib/supabase';
+import { Session } from '@supabase/supabase-js';
+import { Redirect, Stack, router, useFocusEffect, useLocalSearchParams } from 'expo-router';
+import { useCallback, useEffect, useMemo, useState } from 'react';
+import { Pressable, ScrollView, Text, View } from 'react-native';
+
+type SetupState = {
+  subjectId: string | null;
+  assignmentId: string | null;
+  taskId: string | null;
+  completedFocusSessions: number;
+};
+
+const SETUP_STEPS = [
+  {
+    key: 'subject',
+    title: 'Create your first subject',
+    description:
+      'Start with one course or study area so the rest of the structure has a clear home.',
+  },
+  {
+    key: 'assignment',
+    title: 'Create your first assignment',
+    description:
+      'Add one project, exercise set, or exam-prep block inside that subject.',
+  },
+  {
+    key: 'task',
+    title: 'Create your first task',
+    description:
+      'Break the assignment into one concrete thing you can actually sit down and do.',
+  },
+  {
+    key: 'sprint',
+    title: 'Start your first sprint',
+    description:
+      'Begin one focused study session so the app immediately turns into action instead of setup.',
+  },
+] as const;
+
+type SetupStepKey = (typeof SETUP_STEPS)[number]['key'];
+
+export default function SetupScreen() {
+  const {
+    subjectId: subjectIdParam,
+    assignmentId: assignmentIdParam,
+    taskId: taskIdParam,
+  } = useLocalSearchParams<{
+    subjectId?: string;
+    assignmentId?: string;
+    taskId?: string;
+  }>();
+
+  const [session, setSession] = useState<Session | null>(null);
+  const [isAuthLoading, setIsAuthLoading] = useState(true);
+  const [setupState, setSetupState] = useState<SetupState>({
+    subjectId: subjectIdParam ?? null,
+    assignmentId: assignmentIdParam ?? null,
+    taskId: taskIdParam ?? null,
+    completedFocusSessions: 0,
+  });
+  const [activeSession, setActiveSession] = useState<ActiveSession | null>(null);
+
+  useEffect(() => {
+    supabase.auth.getSession().then(({ data }) => {
+      setSession(data.session ?? null);
+      setIsAuthLoading(false);
+    });
+
+    const { data: sub } = supabase.auth.onAuthStateChange((_event, newSession) => {
+      setSession(newSession);
+      setIsAuthLoading(false);
+    });
+
+    return () => sub.subscription.unsubscribe();
+  }, []);
+
+  const loadSetupState = useCallback(async () => {
+    if (!session?.user.id) {
+      setSetupState({
+        subjectId: null,
+        assignmentId: null,
+        taskId: null,
+        completedFocusSessions: 0,
+      });
+      setActiveSession(null);
+      return;
+    }
+
+    const [storedActiveSession, subjectResult, assignmentResult, taskResult, focusSessionResult] =
+      await Promise.all([
+        GetActiveSession(),
+        supabase
+          .from('subjects')
+          .select('sId')
+          .eq('uId', session.user.id)
+          .order('lastChanged', { ascending: false })
+          .limit(1)
+          .maybeSingle(),
+        supabase
+          .from('assignments')
+          .select('aId')
+          .eq('uId', session.user.id)
+          .order('lastChanged', { ascending: false })
+          .limit(1)
+          .maybeSingle(),
+        supabase
+          .from('tasks')
+          .select('tId')
+          .eq('uId', session.user.id)
+          .order('lastChanged', { ascending: false })
+          .limit(1)
+          .maybeSingle(),
+        supabase
+          .from('sprint_sessions')
+          .select('sessionId', { count: 'exact', head: true })
+          .eq('userId', session.user.id)
+          .eq('sessionType', 'focus')
+          .eq('status', 'completed'),
+      ]);
+
+    if (storedActiveSession && storedActiveSession.endTime <= Date.now()) {
+      await RemoveActiveSession();
+      setActiveSession(null);
+    } else {
+      setActiveSession(storedActiveSession);
+    }
+
+    setSetupState({
+      subjectId: subjectIdParam ?? subjectResult.data?.sId ?? null,
+      assignmentId: assignmentIdParam ?? assignmentResult.data?.aId ?? null,
+      taskId: taskIdParam ?? taskResult.data?.tId ?? null,
+      completedFocusSessions: focusSessionResult.count ?? 0,
+    });
+  }, [assignmentIdParam, session?.user.id, subjectIdParam, taskIdParam]);
+
+  useFocusEffect(
+    useCallback(() => {
+      void loadSetupState();
+    }, [loadSetupState])
+  );
+
+  const currentStep = useMemo<SetupStepKey>(() => {
+    if (!setupState.subjectId) {
+      return 'subject';
+    }
+
+    if (!setupState.assignmentId) {
+      return 'assignment';
+    }
+
+    if (!setupState.taskId) {
+      return 'task';
+    }
+
+    return 'sprint';
+  }, [setupState]);
+
+  const isSetupComplete =
+    setupState.taskId !== null && setupState.completedFocusSessions > 0;
+
+  const handlePrimaryAction = useCallback(async () => {
+    if (isSetupComplete) {
+      router.replace('/');
+      return;
+    }
+
+    if (currentStep === 'subject') {
+      router.push({
+        pathname: '/subject/upsertSubject',
+        params: { flow: 'setup' },
+      });
+      return;
+    }
+
+    if (currentStep === 'assignment' && setupState.subjectId) {
+      router.push({
+        pathname: '/assignment/upsertAssignment',
+        params: {
+          sId: setupState.subjectId,
+          flow: 'setup',
+        },
+      });
+      return;
+    }
+
+    if (currentStep === 'task' && setupState.assignmentId) {
+      router.push({
+        pathname: '/task/upsertTask',
+        params: {
+          aId: setupState.assignmentId,
+          flow: 'setup',
+        },
+      });
+      return;
+    }
+
+    if (!setupState.taskId) {
+      return;
+    }
+
+    const freshActiveSession = await GetActiveSession();
+
+    if (freshActiveSession && freshActiveSession.endTime > Date.now()) {
+      router.push({
+        pathname: '/task/timer',
+        params: freshActiveSession.taskId
+          ? { tId: freshActiveSession.taskId }
+          : {
+              sessionType: freshActiveSession.sessionType,
+              durationMinutes: String(
+                Math.max(1, Math.round(freshActiveSession.durationSeconds / 60))
+              ),
+            },
+      });
+      return;
+    }
+
+    if (freshActiveSession) {
+      await RemoveActiveSession();
+      setActiveSession(null);
+    }
+
+    router.push({
+      pathname: '/task/timer',
+      params: {
+        tId: setupState.taskId,
+        durationSeconds: '5',
+      },
+    });
+  }, [currentStep, isSetupComplete, setupState]);
+
+  const primaryLabel = isSetupComplete
+    ? 'Go to dashboard'
+    : currentStep === 'subject'
+      ? 'Create first subject'
+      : currentStep === 'assignment'
+        ? 'Create first assignment'
+        : currentStep === 'task'
+          ? 'Create first task'
+          : activeSession
+            ? 'Open active sprint'
+            : 'Start first sprint';
+
+  if (isAuthLoading) {
+    return null;
+  }
+
+  if (!session) {
+    return <Redirect href="/login" />;
+  }
+
+  return (
+    <View className="flex-1 bg-app-bg">
+      <Stack.Screen
+        options={{
+          title: 'Guided Setup',
+          headerTitleAlign: 'center',
+        }}
+      />
+
+      <ScrollView
+        className="flex-1"
+        contentContainerStyle={{
+          paddingHorizontal: 20,
+          paddingTop: 20,
+          paddingBottom: 32,
+        }}
+        showsVerticalScrollIndicator={false}
+      >
+        <View className="rounded-3xl border border-app-border bg-app-surface p-5">
+          <Text className="text-xs font-bold uppercase tracking-[0.8px] text-text-muted">
+            First-time setup
+          </Text>
+          <Text className="mt-2 text-3xl font-bold text-text-main">
+            Build one simple study path
+          </Text>
+          <Text className="mt-3 text-base leading-6 text-text-secondary">
+            You only need one subject, one assignment, one task, and one sprint to
+            make the app useful.
+          </Text>
+        </View>
+
+        <View className="mt-6 gap-3">
+          {SETUP_STEPS.map((step, index) => {
+            const isDone =
+              step.key === 'subject'
+                ? Boolean(setupState.subjectId)
+                : step.key === 'assignment'
+                  ? Boolean(setupState.assignmentId)
+                  : step.key === 'task'
+                    ? Boolean(setupState.taskId)
+                    : isSetupComplete;
+            const isCurrent = !isDone && currentStep === step.key;
+
+            return (
+              <View
+                key={step.key}
+                className={`rounded-3xl border p-4 ${
+                  isCurrent
+                    ? 'border-accent bg-accent-soft'
+                    : 'border-app-border bg-app-surface'
+                }`}
+              >
+                <View className="flex-row items-start">
+                  <View
+                    className={`mr-3 h-8 w-8 items-center justify-center rounded-full ${
+                      isDone ? 'bg-accent' : isCurrent ? 'bg-text-main' : 'bg-app-subtle'
+                    }`}
+                  >
+                    <Text
+                      className={`text-sm font-bold ${
+                        isDone || isCurrent ? 'text-text-inverse' : 'text-text-secondary'
+                      }`}
+                    >
+                      {isDone ? '✓' : index + 1}
+                    </Text>
+                  </View>
+
+                  <View className="flex-1">
+                    <Text className="text-lg font-bold text-text-main">
+                      {step.title}
+                    </Text>
+                    <Text className="mt-1 text-sm leading-5 text-text-secondary">
+                      {step.description}
+                    </Text>
+                  </View>
+                </View>
+              </View>
+            );
+          })}
+        </View>
+
+        <View className="mt-6 rounded-3xl border border-app-border bg-app-surface p-5">
+          <Text className="text-sm font-semibold text-text-secondary">
+            {isSetupComplete
+              ? 'You have already completed at least one focus sprint.'
+              : currentStep === 'sprint'
+                ? 'The structure is ready. The next step is to actually begin a sprint.'
+                : 'Follow the next step below. The rest of the app will make more sense once that path exists.'}
+          </Text>
+
+          <Pressable
+            className="mt-5 h-14 items-center justify-center rounded-2xl bg-accent"
+            onPress={handlePrimaryAction}
+          >
+            <Text className="text-base font-bold text-text-inverse">
+              {primaryLabel}
+            </Text>
+          </Pressable>
+        </View>
+      </ScrollView>
+    </View>
+  );
+}

app/subject/upsertSubject.tsx

@@ -20,8 +20,9 @@ import {
 
 
 export default function UpsertSubject() {
-    const { sId } = useLocalSearchParams<{ sId?: string }>();
+    const { sId, flow } = useLocalSearchParams<{ sId?: string; flow?: string }>();
     const isEditMode = Boolean(sId);
+    const isSetupFlow = flow === 'setup';
 
     const [title, setTitle] = useState('');
     const [description, setDescription] = useState('');
@@ -88,7 +89,7 @@ export default function UpsertSubject() {
 
         const result = isEditMode && sId
             ? await supabase.from('subjects').update(payload).eq('sId', sId)
-            : await supabase.from('subjects').insert(payload);
+            : await supabase.from('subjects').insert(payload).select().single();
         
         setIsSaving(false);
 
@@ -101,6 +102,17 @@ export default function UpsertSubject() {
             return;
         }
 
+        if (!isEditMode && isSetupFlow && result.data?.sId) {
+            router.replace({
+                pathname: '/assignment/upsertAssignment',
+                params: {
+                    sId: result.data.sId,
+                    flow: 'setup',
+                },
+            });
+            return;
+        }
+
         Alert.alert(
             isEditMode ? 'Subject updated successfully!' : 'Subject created successfully!'
         );
@@ -154,7 +166,7 @@ export default function UpsertSubject() {
                             </Text>
                             <Text className="mt-2 text-base leading-6 text-text-secondary">
                                 {isEditMode? ' Update this subject and keep your study structure organized.'
-                                : 'Add a subject to organize your assignments and studyt tasks.'}
+                                : 'Add a subject to organize your assignments and study tasks.'}
                             </Text>
                         </View>
 
@@ -162,7 +174,7 @@ export default function UpsertSubject() {
                             <View className="mb-5">
                                 <Text className={labelClassName}>Title</Text>
                                 <TextInput className={inputClassName}
-                                    placeholder="Enter subject title"
+                                    placeholder={isSetupFlow ? 'e.g. Algorithms' : 'Enter subject title'}
                                     placeholderTextColor="#9CA3AF"
                                     value={title}
                                     onChangeText={setTitle}
@@ -174,7 +186,7 @@ export default function UpsertSubject() {
                                 <Text className={labelClassName}>Description</Text>
                                 <TextInput 
                                     className={`${inputClassName} min-h-28`}
-                                    placeholder="Add a short description"
+                                    placeholder={isSetupFlow ? 'e.g. Lectures, problem sets, and exam prep' : 'Add a short description'}
                                     placeholderTextColor="#9CA3AF"
                                     value={description}
                                     onChangeText={setDescription}

app/subject/viewDetailsSubject.tsx

@@ -288,7 +288,7 @@ export default function ViewDetailsSubject() {
               <View className="mt-5">
                 <View className="mb-2 flex-row items-center justify-between">
                   <Text className="text-sm font-semibold text-text-secondary">
-                    Assignment Progress
+                    Assignments completed
                   </Text>
 
                   <Text className="text-sm font-bold text-text-main">
@@ -313,6 +313,10 @@ export default function ViewDetailsSubject() {
                         remainingAssignments === 1 ? '' : 's'
                       } remaining`}
                 </Text>
+
+                <Text className="mt-1 text-xs text-text-muted">
+                  Based only on completed assignments in this subject.
+                </Text>
               </View>
 
               <Text className="mt-4 text-sm text-text-muted">
@@ -451,7 +455,9 @@ export default function ViewDetailsSubject() {
                 {section.emptyMessage}
               </Text>
               <Text className="mt-1 text-center text-sm text-text-muted">
-                Assignments for this subject will show up here.
+                {assignments.length === 0
+                  ? 'Create the first assignment to give this subject a real study path.'
+                  : 'Assignments for this subject will show up here.'}
               </Text>
             </View>
           ) : (

app/task/timer.tsx

@@ -1,12 +1,12 @@
 import {
-  GetActiveSprint,
+  GetActiveSession,
-  RemoveActiveSprint,
+  RemoveActiveSession,
-  SaveActiveSprint,
+  SaveActiveSession,
 } from '@/lib/asyncStorage';
 import { supabase } from '@/lib/supabase';
-import type { Task } from '@/lib/types';
+import type { SessionType, Task } from '@/lib/types';
 import * as Haptics from 'expo-haptics';
-import { Stack, useLocalSearchParams } from 'expo-router';
+import { router, Stack, useLocalSearchParams } from 'expo-router';
 import * as React from 'react';
 import {
   Alert,
@@ -48,6 +48,12 @@ const HOLD_TO_CANCEL_MS = 2000;
 const CANCEL_ANIMATION_DELAY_MS = 250;
 const BUTTON_PRESS_IN_MS = 80;
 const BUTTON_PRESS_OUT_MS = 140;
+const SHORT_BREAK_DURATION_MINUTES = 5;
+
+type PostSessionPrompt = {
+  completedSessionType: SessionType;
+  returnTaskId: string | null;
+};
 
 function formatTime(totalSeconds: number) {
   const minutes = Math.floor(totalSeconds / 60);
@@ -69,6 +75,23 @@ function getSessionId(sessionData: unknown) {
   return maybeSession.sessionId ?? maybeSession.sessionid ?? null;
 }
 
+function getSessionLabel(sessionType: SessionType) {
+  switch (sessionType) {
+    case 'short_break':
+      return 'Short Break';
+    case 'long_break':
+      return 'Long Break';
+    default:
+      return 'Sprint';
+  }
+}
+
+type StartSessionInput = {
+  sessionType: SessionType;
+  taskId: string | null;
+  durationSeconds: number;
+};
+
 export default function TimerScreen() {
   const [containerHeight, setContainerHeight] = React.useState(0);
   const [duration, setDuration] = React.useState(TIMER_OPTIONS[0]);
@@ -76,6 +99,8 @@ export default function TimerScreen() {
   const [timerOverlayVisible, setTimerOverlayVisible] = React.useState(false);
   const [timeRemaining, setTimeRemaining] = React.useState(0);
   const [task, setTask] = React.useState<Task | null>(null);
+  const [currentSessionType, setCurrentSessionType] = React.useState<SessionType>('focus');
+  const [postSessionPrompt, setPostSessionPrompt] = React.useState<PostSessionPrompt | null>(null);
 
   const scrollX = React.useRef(new Animated.Value(0)).current;
   const timerAnimation = React.useRef(new Animated.Value(0)).current;
@@ -100,9 +125,44 @@ export default function TimerScreen() {
   const cancelHoldIdRef = React.useRef(0);
   const cancelHoldStartedAtRef = React.useRef(0);
 
-  const { tId } = useLocalSearchParams<{ tId?: string}>();
+  const { tId, sessionType: sessionTypeParam, durationMinutes, durationSeconds, returnTaskId } = useLocalSearchParams<{
+    tId?: string;
+    sessionType?: SessionType;
+    durationMinutes?: string;
+    durationSeconds?: string;
+    returnTaskId?: string;
+  }>();
   const timerOverlayHeight = Math.max(containerHeight, 1);
   const timerOverlayOffscreenY = timerOverlayHeight + 1000;
+  const selectedSessionType: SessionType = sessionTypeParam ?? 'focus';
+  const showDurationPicker =
+    selectedSessionType === 'focus' && durationMinutes == null && durationSeconds == null;
+  const selectedDurationMinutes = React.useMemo(() => {
+    if (!durationMinutes) {
+      return null;
+    }
+
+    const parsedDuration = Number(durationMinutes);
+
+    if (!Number.isFinite(parsedDuration) || parsedDuration <= 0) {
+      return null;
+    }
+
+    return parsedDuration;
+  }, [durationMinutes]);
+  const selectedDurationSeconds = React.useMemo(() => {
+    if (!durationSeconds) {
+      return null;
+    }
+
+    const parsedDuration = Number(durationSeconds);
+
+    if (!Number.isFinite(parsedDuration) || parsedDuration <= 0) {
+      return null;
+    }
+
+    return parsedDuration;
+  }, [durationSeconds]);
 
   React.useEffect(() => {
     if (containerHeight > 0 && !timerIsRunning) {
@@ -190,16 +250,16 @@ export default function TimerScreen() {
   });
 
   const finalizeSprintSession = React.useCallback(async (finalStatus: 'completed' | 'cancelled' | 'expired') => {
-    const activeSprint = await GetActiveSprint();
+    const activeSession = await GetActiveSession();
 
-    if (!activeSprint) {
+    if (!activeSession) {
       return;
     }
 
-    await RemoveActiveSprint();
+    await RemoveActiveSession();
 
     const { error } = await supabase.rpc('finalize_sprint_session', {
-      p_session_id: activeSprint.sessionId,
+      p_session_id: activeSession.sessionId,
       p_final_status: finalStatus,
       p_ended_at: new Date().toISOString(),
     });
@@ -271,11 +331,16 @@ export default function TimerScreen() {
     cancelOverlayAnimation.setValue(0);
     setTimerOverlayVisible(false);
     setTimeRemaining(0);
+    setCurrentSessionType(selectedSessionType);
     setIsRunning(false);
-  }, [cancelOverlayAnimation, timerAnimation, timerOverlayOffscreenY]);
+  }, [cancelOverlayAnimation, selectedSessionType, timerAnimation, timerOverlayOffscreenY]);
 
   const finishTimer = React.useCallback(() => {
     clearCountdownInterval();
+    const completedSessionType = currentSessionType;
+    const completedReturnTaskId =
+      completedSessionType === 'focus' ? (tId ?? null) : (returnTaskId ?? null);
+
     void finalizeSprintSession('completed');
 
     Animated.parallel([
@@ -308,12 +373,11 @@ export default function TimerScreen() {
         }),
       ]).start(() => {
         setIsRunning(false);
-        /* TODO
-          Implement store and send of ellapsed time value in seconds to DB
-          for total time spent statistic
-        */
-
         resetSessionValues();
+        setPostSessionPrompt({
+          completedSessionType,
+          returnTaskId: completedReturnTaskId,
+        });
       });
     });
   }, [
@@ -321,10 +385,13 @@ export default function TimerScreen() {
     cancelButtonAnimation,
     clearCountdownInterval,
     countdownAnimation,
+    currentSessionType,
     finalizeSprintSession,
     focusModeAnimation,
     resetSessionValues,
     taskDetailsAnimation,
+    returnTaskId,
+    tId,
   ]);
 
   // This picks up the timer overlay animation from the current Y position and
@@ -416,31 +483,40 @@ export default function TimerScreen() {
   );
 
   React.useEffect(() => {
-    if (!tId || timerIsRunning || containerHeight === 0) {
+    if (timerIsRunning || containerHeight === 0) {
       return;
     }
 
     const restoreSprint = async () => {
-      const activeSprint = await GetActiveSprint();
+      const activeSession = await GetActiveSession();
 
-      if (!activeSprint || activeSprint.taskId !== tId) {
+      if (!activeSession) {
         return;
       }
 
-      const remainingMs = activeSprint.endTime - Date.now();
+      if (activeSession.sessionType === 'focus' && activeSession.taskId !== tId) {
+        return;
+      }
+
+      if (activeSession.sessionType !== 'focus' && selectedSessionType !== activeSession.sessionType) {
+        return;
+      }
+
+      const remainingMs = activeSession.endTime - Date.now();
 
       if (remainingMs <= 0) {
         await finalizeSprintSession('expired');
         return;
       }
 
-      const totalMs = activeSprint.durationSeconds * 1000;
+      const totalMs = activeSession.durationSeconds * 1000;
       const elapsedMs = totalMs - remainingMs;
       const elapsedRatio = Math.max(0, Math.min(elapsedMs / totalMs, 1));
       const restoredY = timerOverlayHeight * elapsedRatio;
 
       setIsRunning(true);
       setTimerOverlayVisible(true);
+      setCurrentSessionType(activeSession.sessionType);
       sessionStartedAtRef.current = Date.now() - elapsedMs;
       sessionDurationMsRef.current = totalMs;
 
@@ -451,7 +527,7 @@ export default function TimerScreen() {
       taskDetailsAnimation.setValue(1);
       cancelOverlayAnimation.setValue(0);
 
-      startCountdown(activeSprint.endTime);
+      startCountdown(activeSession.endTime);
       startProgressAnimation(restoredY);
     };
 
@@ -467,29 +543,39 @@ export default function TimerScreen() {
     startCountdown,
     startProgressAnimation,
     taskDetailsAnimation,
+    selectedSessionType,
     tId,
     timerOverlayHeight,
     timerIsRunning,
   ]);
 
-  const startTimerSession = React.useCallback(async () => {
+  const startSession = React.useCallback(async ({
-    if (!tId || timerIsRunning || containerHeight === 0) {
+    sessionType,
+    taskId,
+    durationSeconds,
+  }: StartSessionInput) => {
+    if (timerIsRunning || containerHeight === 0) {
       return;
     }
 
-    const totalSeconds = duration * TIMER_UNIT_IN_SECONDS;
+    if (sessionType === 'focus' && !taskId) {
-    const endTime = Date.now() + totalSeconds * 1000;
+      Alert.alert('Could not start session', 'Focus sessions must be linked to a task.');
+      return;
+    }
+
+    const endTime = Date.now() + durationSeconds * 1000;
     const { data: userData, error: userError } = await supabase.auth.getUser();
 
     if (userError || !userData.user?.id) {
-      Alert.alert('Could not start sprint', 'Missing signed-in user for sprint session.');
+      Alert.alert('Could not start session', 'Missing signed-in user.');
       return;
     }
 
     const { data: sessionData, error: sessionError } = await supabase.rpc('start_sprint_session', {
-      p_task_id: tId,
+      p_task_id: taskId,
       p_user_id: userData.user.id,
-      p_planned_duration: totalSeconds,
+      p_session_type: sessionType,
+      p_planned_duration: durationSeconds,
       p_started_at: new Date().toISOString(),
     });
 
@@ -497,8 +583,8 @@ export default function TimerScreen() {
 
     if (sessionError || !sessionId) {
       Alert.alert(
-        'Could not start sprint',
+        'Could not start session',
-        sessionError?.message ?? 'Sprint session could not be created.'
+        sessionError?.message ?? 'Session could not be created.'
       );
       return;
     }
@@ -506,18 +592,20 @@ export default function TimerScreen() {
     Haptics.notificationAsync(Haptics.NotificationFeedbackType.Success);
     setIsRunning(true);
     setTimerOverlayVisible(true);
+    setCurrentSessionType(sessionType);
 
     taskDetailsAnimation.setValue(0);
     countdownAnimation.setValue(0);
     cancelOverlayAnimation.setValue(0);
 
     sessionStartedAtRef.current = Date.now();
-    sessionDurationMsRef.current = totalSeconds * 1000;
+    sessionDurationMsRef.current = durationSeconds * 1000;
 
-    void SaveActiveSprint({
+    void SaveActiveSession({
       sessionId,
-      taskId: tId,
+      sessionType,
-      durationSeconds: totalSeconds,
+      taskId,
+      durationSeconds,
       endTime,
     });
 
@@ -531,10 +619,54 @@ export default function TimerScreen() {
     runStartSequence,
     startCountdown,
     taskDetailsAnimation,
-    tId,
     timerIsRunning,
   ]);
 
+  const startTimerSession = React.useCallback(async () => {
+    if (selectedSessionType === 'focus' && !tId) {
+      return;
+    }
+
+    const totalSeconds =
+      selectedDurationSeconds ?? (selectedDurationMinutes ?? duration) * TIMER_UNIT_IN_SECONDS;
+
+    await startSession({
+      sessionType: selectedSessionType,
+      taskId: selectedSessionType === 'focus' ? (tId ?? null) : null,
+      durationSeconds: totalSeconds,
+    });
+  }, [duration, selectedDurationMinutes, selectedDurationSeconds, selectedSessionType, startSession, tId]);
+
+  const handleStartShortBreak = React.useCallback(() => {
+    setPostSessionPrompt(null);
+    router.replace({
+      pathname: '/task/timer',
+      params: {
+        sessionType: 'short_break',
+        durationMinutes: String(SHORT_BREAK_DURATION_MINUTES),
+        returnTaskId: tId ?? undefined,
+      },
+    });
+  }, [tId]);
+
+  const handleContinueSameTask = React.useCallback(() => {
+    if (!postSessionPrompt?.returnTaskId) {
+      router.replace('/');
+      return;
+    }
+
+    setPostSessionPrompt(null);
+    router.replace({
+      pathname: '/task/timer',
+      params: { tId: postSessionPrompt.returnTaskId },
+    });
+  }, [postSessionPrompt]);
+
+  const handleBackToDashboard = React.useCallback(() => {
+    setPostSessionPrompt(null);
+    router.replace('/');
+  }, []);
+
   const cancelTimer = React.useCallback(() => {
     if (!timerIsRunning) {
       return;
@@ -745,7 +877,7 @@ export default function TimerScreen() {
       
       <Stack.Screen 
       options={{
-        title: timerIsRunning ? '' : 'Sprint duration',
+        title: timerIsRunning ? '' : `${getSessionLabel(selectedSessionType)} duration`,
         headerTransparent: true,
         headerTintColor: colors.text,
         headerTitleAlign: 'center',
@@ -790,7 +922,9 @@ export default function TimerScreen() {
             ]}
           >
             <Text className="text-text-main text-xl">Start</Text>
-            <Text className="text-text-main text-xl">Sprint</Text>
+            {selectedSessionType === 'focus' ? (
+              <Text className="text-text-main text-xl">Sprint</Text>
+            ) : null}
           </Animated.View>
         </TouchableOpacity>
       </Animated.View>
@@ -814,7 +948,7 @@ export default function TimerScreen() {
               },
             ]}
           >
-            <Text className="text-text-main text-xl">Hold to end sprint</Text>
+            <Text className="text-text-main text-xl">Hold to end session</Text>
           </Animated.View>
         </TouchableOpacity>
       </Animated.View>
@@ -836,32 +970,45 @@ export default function TimerScreen() {
         <Text style={styles.countdownText}>{formatTime(timeRemaining)}</Text>
       </Animated.View>
 
-      <View
+      {!timerIsRunning && showDurationPicker ? (
-        style={[
+        <View
-          styles.timerPickerWrapper,
+          style={[
-          {
+            styles.timerPickerWrapper,
-            top: containerHeight / 3,
+            {
-          },
+              top: containerHeight / 3,
-        ]}
+            },
-      >
+          ]}
-        <Animated.FlatList
+        >
-          data={TIMER_OPTIONS}
+          <Animated.FlatList
-          scrollEnabled={!timerIsRunning}
+            data={TIMER_OPTIONS}
-          keyExtractor={(item) => item.toString()}
+            scrollEnabled={!timerIsRunning}
-          horizontal
+            keyExtractor={(item) => item.toString()}
-          bounces={false}
+            horizontal
-          onScroll={Animated.event([{ nativeEvent: { contentOffset: { x: scrollX } } }], {
+            bounces={false}
-            useNativeDriver: true,
+            onScroll={Animated.event([{ nativeEvent: { contentOffset: { x: scrollX } } }], {
-          })}
+              useNativeDriver: true,
-          showsHorizontalScrollIndicator={false}
+            })}
-          onMomentumScrollEnd={handleTimerPickerMomentumEnd}
+            showsHorizontalScrollIndicator={false}
-          snapToInterval={ITEM_SIZE}
+            onMomentumScrollEnd={handleTimerPickerMomentumEnd}
-          decelerationRate="fast"
+            snapToInterval={ITEM_SIZE}
-          style={styles.timerPickerList}
+            decelerationRate="fast"
-          contentContainerStyle={styles.timerPickerContent}
+            style={styles.timerPickerList}
-          renderItem={renderTimerItem}
+            contentContainerStyle={styles.timerPickerContent}
-        />
+            renderItem={renderTimerItem}
-      </View>
+          />
+        </View>
+      ) : !timerIsRunning ? (
+        <View style={styles.fixedDurationBlock}>
+          <Text style={styles.fixedDurationLabel}>
+            {selectedDurationSeconds != null
+              ? `${selectedDurationSeconds} sec`
+              : `${selectedDurationMinutes ?? SHORT_BREAK_DURATION_MINUTES} min`}
+          </Text>
+          <Text style={styles.fixedDurationDescription}>
+            This session uses a fixed duration so you can move straight into the next step.
+          </Text>
+        </View>
+      ) : null}
 
       <Animated.View
         pointerEvents="none"
@@ -873,9 +1020,53 @@ export default function TimerScreen() {
           },
         ]}
       >
-        <Text style={styles.taskName}>{task?.title ?? 'Sprint'}</Text>
+        <Text style={styles.taskName}>
-        <Text style={styles.taskDescription}>{task?.description || 'Focus on this task until the timer ends.'}</Text>
+          {currentSessionType === 'focus' ? task?.title ?? 'Sprint' : getSessionLabel(currentSessionType)}
+        </Text>
+        <Text style={styles.taskDescription}>
+          {currentSessionType === 'focus'
+            ? task?.description || 'Focus on this task until the timer ends.'
+            : 'Use this timer as a real break before starting the next focus session.'}
+        </Text>
       </Animated.View>
+
+      {postSessionPrompt ? (
+        <View style={styles.postSessionOverlay}>
+          <View style={styles.postSessionCard}>
+            <Text style={styles.postSessionEyebrow}>Session complete</Text>
+            <Text style={styles.postSessionTitle}>
+              {postSessionPrompt.completedSessionType === 'focus'
+                ? 'What do you want to do next?'
+                : 'Break finished'}
+            </Text>
+            <Text style={styles.postSessionBody}>
+              {postSessionPrompt.completedSessionType === 'focus'
+                ? 'Start a short break now or skip it and return to your dashboard.'
+                : 'Jump back into the same task or head back to the dashboard.'}
+            </Text>
+
+            {postSessionPrompt.completedSessionType === 'focus' ? (
+              <>
+                <TouchableOpacity onPress={handleStartShortBreak} style={styles.postSessionPrimaryButton}>
+                  <Text style={styles.postSessionPrimaryButtonText}>Start short break</Text>
+                </TouchableOpacity>
+                <TouchableOpacity onPress={handleBackToDashboard} style={styles.postSessionSecondaryButton}>
+                  <Text style={styles.postSessionSecondaryButtonText}>Skip break</Text>
+                </TouchableOpacity>
+              </>
+            ) : (
+              <>
+                <TouchableOpacity onPress={handleContinueSameTask} style={styles.postSessionPrimaryButton}>
+                  <Text style={styles.postSessionPrimaryButtonText}>Continue with same task</Text>
+                </TouchableOpacity>
+                <TouchableOpacity onPress={handleBackToDashboard} style={styles.postSessionSecondaryButton}>
+                  <Text style={styles.postSessionSecondaryButtonText}>Back to dashboard</Text>
+                </TouchableOpacity>
+              </>
+            )}
+          </View>
+        </View>
+      ) : null}
     </View>
   );
 }
@@ -915,6 +1106,27 @@ const styles = StyleSheet.create({
   timerPickerList: {
     flexGrow: 0,
   },
+  fixedDurationBlock: {
+    position: 'absolute',
+    top: height * 0.28,
+    left: 32,
+    right: 32,
+    alignItems: 'center',
+  },
+  fixedDurationLabel: {
+    color: colors.text,
+    fontSize: 56,
+    fontFamily: 'Menlo',
+    fontWeight: '900',
+    textAlign: 'center',
+  },
+  fixedDurationDescription: {
+    color: colors.text,
+    fontSize: 18,
+    lineHeight: 26,
+    marginTop: 16,
+    textAlign: 'center',
+  },
   timerPickerContent: {
     paddingHorizontal: ITEM_SPACING,
   },
@@ -984,4 +1196,66 @@ const styles = StyleSheet.create({
     right: 0,
     alignItems: 'center',
   },
+  postSessionOverlay: {
+    ...StyleSheet.absoluteFillObject,
+    backgroundColor: 'rgba(20, 26, 34, 0.94)',
+    justifyContent: 'center',
+    paddingHorizontal: 24,
+    zIndex: 10,
+  },
+  postSessionCard: {
+    borderRadius: 28,
+    backgroundColor: '#F7F4EA',
+    paddingHorizontal: 24,
+    paddingVertical: 28,
+  },
+  postSessionEyebrow: {
+    color: '#7A6F5A',
+    fontSize: 13,
+    fontWeight: '700',
+    letterSpacing: 0.8,
+    textTransform: 'uppercase',
+  },
+  postSessionTitle: {
+    color: '#323F4E',
+    fontSize: 30,
+    fontWeight: '800',
+    marginTop: 10,
+  },
+  postSessionBody: {
+    color: '#52606D',
+    fontSize: 17,
+    lineHeight: 25,
+    marginTop: 12,
+    marginBottom: 24,
+  },
+  postSessionPrimaryButton: {
+    minHeight: 54,
+    borderRadius: 18,
+    backgroundColor: '#323F4E',
+    alignItems: 'center',
+    justifyContent: 'center',
+    paddingHorizontal: 20,
+  },
+  postSessionPrimaryButtonText: {
+    color: '#FFFFFF',
+    fontSize: 16,
+    fontWeight: '800',
+  },
+  postSessionSecondaryButton: {
+    minHeight: 54,
+    borderRadius: 18,
+    borderWidth: 1,
+    borderColor: '#C2B8A3',
+    backgroundColor: '#EFE7D8',
+    alignItems: 'center',
+    justifyContent: 'center',
+    paddingHorizontal: 20,
+    marginTop: 12,
+  },
+  postSessionSecondaryButtonText: {
+    color: '#323F4E',
+    fontSize: 16,
+    fontWeight: '700',
+  },
 });

app/task/upsertTask.tsx

@@ -19,12 +19,14 @@ import {
 } from 'react-native';
 
 export default function UpsertTask() {
-  const { tId, aId: routeAId } = useLocalSearchParams<{
+  const { tId, aId: routeAId, flow } = useLocalSearchParams<{
     tId?: string;
     aId?: string;
+    flow?: string;
   }>();
 
   const isEditMode = Boolean(tId);
+  const isSetupFlow = flow === 'setup';
 
   const [title, SetTitle] = useState('');
   const [description, SetDescription] = useState('');
@@ -100,7 +102,7 @@ export default function UpsertTask() {
     const result =
       isEditMode && tId
         ? await supabase.from('tasks').update(payload).eq('tId', tId)
-        : await supabase.from('tasks').insert(payload);
+        : await supabase.from('tasks').insert(payload).select().single();
 
     if (result.error) {
       SetIsSaving(false);
@@ -122,6 +124,14 @@ export default function UpsertTask() {
 
     SetIsSaving(false);
 
+    if (!isEditMode && isSetupFlow && result.data?.tId) {
+      router.replace({
+        pathname: '/task/timer',
+        params: { tId: result.data.tId },
+      });
+      return;
+    }
+
     Alert.alert(
       isEditMode ? 'Task successfully updated!' : 'Task successfully created!'
     );
@@ -183,7 +193,7 @@ export default function UpsertTask() {
                 <Text className={labelClassName}>Title</Text>
                 <TextInput
                   className={inputClassName}
-                  placeholder="Enter task title"
+                  placeholder={isSetupFlow ? 'e.g. Solve questions 1-3' : 'Enter task title'}
                   placeholderTextColor="#9CA3AF"
                   value={title}
                   onChangeText={SetTitle}
@@ -195,7 +205,11 @@ export default function UpsertTask() {
                 <Text className={labelClassName}>Description</Text>
                 <TextInput
                   className={`${inputClassName} min-h-28`}
-                  placeholder="Add a short description"
+                  placeholder={
+                    isSetupFlow
+                      ? 'e.g. Work through the first three tasks without notes'
+                      : 'Add a short description'
+                  }
                   placeholderTextColor="#9CA3AF"
                   value={description}
                   onChangeText={SetDescription}

app/task/viewDetailsTask.tsx

@@ -1,4 +1,4 @@
-import { GetActiveSprint, RemoveActiveSprint } from '@/lib/asyncStorage';
+import { GetActiveSession, RemoveActiveSession } from '@/lib/asyncStorage';
 import { formatDateTime } from '@/lib/date';
 import { CheckAssignmentCompletion } from '@/lib/progress';
 import { getSubjectColorSet, type SubjectColor } from '@/lib/subjectColors';
@@ -33,6 +33,7 @@ const { tId } = useLocalSearchParams<{ tId: string }>();
 
 const [task, SetTask] = useState<Task | null>(null);
 const [session, SetSession] = useState<Session | null>(null);
+const [completedFocusSessions, setCompletedFocusSessions] = useState(0);
 const [contextMeta, setContextMeta] = useState({
   subjectTitle: 'No Subject',
   assignmentTitle: 'No Assignment',
@@ -49,7 +50,24 @@ useEffect(() => {
   return () => sub.subscription.unsubscribe();
 }, []);
 
-const GetTask = async (taskId: string) => {
+const loadTaskStudyActivity = useCallback(async (taskId: string, userId: string) => {
+  const { count, error } = await supabase
+    .from('sprint_sessions')
+    .select('sessionId', { count: 'exact', head: true })
+    .eq('taskId', taskId)
+    .eq('userId', userId)
+    .eq('sessionType', 'focus')
+    .eq('status', 'completed');
+
+  if (error) {
+    setCompletedFocusSessions(0);
+    return;
+  }
+
+  setCompletedFocusSessions(count ?? 0);
+}, []);
+
+const GetTask = useCallback(async (taskId: string) => {
   const { data, error } = await supabase
     .from('tasks')
     .select('*')
@@ -62,6 +80,7 @@ const GetTask = async (taskId: string) => {
   }
 
   SetTask(data);
+  await loadTaskStudyActivity(taskId, data.uId);
 
   if (data.aId) {
     const { data: assignmentData, error: assignmentError } = await supabase
@@ -102,20 +121,20 @@ const GetTask = async (taskId: string) => {
       });
     }
   }
-};
+}, [loadTaskStudyActivity]);
 
 useFocusEffect(
   useCallback(() => {
     if (session && tId) {
       GetTask(tId);
     }
-  }, [session, tId])
+  }, [GetTask, session, tId])
 );
 
 const handleSprintStart = async () => {
-  const activeSprint = await GetActiveSprint();
+  const activeSession = await GetActiveSession();
 
-  if (!activeSprint) {
+  if (!activeSession) {
     router.push({
       pathname: '/task/timer',
       params: { tId: task?.tId},
@@ -125,10 +144,10 @@ const handleSprintStart = async () => {
 
 
   
-  const secondsLeft = Math.ceil((activeSprint.endTime - Date.now()) / 1000)
+  const secondsLeft = Math.ceil((activeSession.endTime - Date.now()) / 1000)
 
   if (secondsLeft <= 0) {
-    await RemoveActiveSprint();
+    await RemoveActiveSession();
     router.push({
       pathname: '/task/timer',
       params: { tId: task?.tId}
@@ -137,23 +156,23 @@ const handleSprintStart = async () => {
     }
     
 
-  if (activeSprint!.taskId === task?.tId) {
+  if (activeSession.taskId === task?.tId) {
     router.push({
     pathname: '/task/timer',
-    params: { tId: activeSprint!.taskId}});
+    params: { tId: activeSession.taskId ?? undefined }});
     return;
     }
 
     Alert.alert(
-      'Active sprint in progress', 
+      'Active session in progress', 
-      'Starting a new sprint will end the current active sprint', 
+      'Starting a new sprint will end the current active session', 
       [
         { text: 'Cancel', style: 'cancel',  },
         {
           text: 'Start new sprint',
           style: 'destructive',
           onPress: async () => {
-            await RemoveActiveSprint();
+            await RemoveActiveSession();
             router.push({
               pathname: '/task/timer',
               params: { tId: task?.tId },
@@ -332,14 +351,46 @@ return (
                 {contextMeta.assignmentTitle}
               </Text>
             </View>
+
+            <View className="mr-2 mb-2 rounded-full bg-app-subtle px-3 py-1">
+              <Text className="text-xs font-semibold text-text-secondary">
+                Status: {task.isCompleted ? 'Completed' : 'Not completed'}
+              </Text>
+            </View>
+          </View>
+
+          <View className="mt-5 rounded-2xl bg-app-subtle p-4">
+            <Text className="text-sm font-semibold text-text-secondary">
+              Study activity
+            </Text>
+            <Text className="mt-1 text-xs leading-5 text-text-muted">
+              This tracks focused work on the task separately from whether the task is marked completed.
+            </Text>
+
+            <View className="mt-4 flex-row gap-3">
+              <View className="flex-1 rounded-2xl bg-app-surface px-4 py-3">
+                <Text className="text-xs font-semibold uppercase tracking-[0.6px] text-text-muted">
+                  Focus time
+                </Text>
+                <Text className="mt-1 text-lg font-bold text-text-main">
+                  {formatTrackedTime(task.totalTimeInSeconds ?? 0)}
+                </Text>
+              </View>
+
+              <View className="flex-1 rounded-2xl bg-app-surface px-4 py-3">
+                <Text className="text-xs font-semibold uppercase tracking-[0.6px] text-text-muted">
+                  Completed sessions
+                </Text>
+                <Text className="mt-1 text-lg font-bold text-text-main">
+                  {completedFocusSessions}
+                </Text>
+              </View>
+            </View>
           </View>
 
           <Text className="mt-2 text-sm text-text-muted">
             Last changed: {formatDateTime(task.lastChanged)}
           </Text>
-          <Text className="mt-1 text-sm text-text-muted">
-            Time spent: {formatTrackedTime(task.totalTimeInSeconds ?? 0)}
-          </Text>
         </View>
       </View>
 

deploy/signup-confirmation/README.md

@@ -0,0 +1,21 @@
+# Signup Confirmation Page
+
+This serves a very small static confirmation page with `nginx`.
+
+## Run
+
+```bash
+docker compose up -d
+```
+
+It will be available on port `8080` on the VPS.
+
+## Files
+
+- `docker-compose.yml`: starts `nginx:alpine`
+- `site/index.html`: the page shown after email confirmation
+
+## Notes
+
+- If you already have a reverse proxy on the VPS, point your domain or subdomain to `http://localhost:8080`.
+- If you want this container to bind directly to port `80`, change `8080:80` to `80:80` in `docker-compose.yml`.

deploy/signup-confirmation/docker-compose.yml

@@ -0,0 +1,9 @@
+services:
+  signup-confirmation:
+    image: nginx:alpine
+    container_name: study-sprint-signup-confirmation
+    restart: unless-stopped
+    ports:
+      - "8080:80"
+    volumes:
+      - ./site:/usr/share/nginx/html:ro

deploy/signup-confirmation/site/index.html

@@ -0,0 +1,75 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Study Sprint</title>
+    <style>
+      :root {
+        color-scheme: light;
+        --bg: #f4f7fb;
+        --card: #ffffff;
+        --text: #1f2937;
+        --muted: #5b6472;
+        --accent: #3b82f6;
+        --border: #d9e2ec;
+      }
+
+      * {
+        box-sizing: border-box;
+      }
+
+      body {
+        margin: 0;
+        min-height: 100vh;
+        display: grid;
+        place-items: center;
+        padding: 24px;
+        background:
+          radial-gradient(circle at top, #e6f1ff 0%, transparent 45%),
+          linear-gradient(180deg, var(--bg) 0%, #eef3f8 100%);
+        font-family: Arial, sans-serif;
+        color: var(--text);
+      }
+
+      .card {
+        width: min(100%, 560px);
+        padding: 40px 28px;
+        border: 1px solid var(--border);
+        border-radius: 24px;
+        background: var(--card);
+        box-shadow: 0 24px 60px rgba(15, 23, 42, 0.08);
+        text-align: center;
+      }
+
+      .eyebrow {
+        margin: 0 0 12px;
+        font-size: 0.85rem;
+        font-weight: 700;
+        letter-spacing: 0.08em;
+        text-transform: uppercase;
+        color: var(--accent);
+      }
+
+      h1 {
+        margin: 0;
+        font-size: clamp(2rem, 5vw, 2.7rem);
+        line-height: 1.1;
+      }
+
+      p {
+        margin: 16px 0 0;
+        font-size: 1rem;
+        line-height: 1.6;
+        color: var(--muted);
+      }
+    </style>
+  </head>
+  <body>
+    <main class="card">
+      <p class="eyebrow">Study Sprint</p>
+      <h1>Thank you for signing up.</h1>
+      <p>Your email has been confirmed. You can now sign in to your account in the Study Sprint app.</p>
+    </main>
+  </body>
+</html>

lib/asyncStorage.ts

@@ -1,11 +1,13 @@
 import AsyncStorage from '@react-native-async-storage/async-storage';
+import type { SessionType } from '@/lib/types';
 
 const notificationKey = (aId: string) => `assignment_notification_${aId}`;
 const activeSprintKey = 'active_sprint';
 
-export type ActiveSprint = {
+export type ActiveSession = {
-  sessionId: string,
+  sessionId: string;
-  taskId: string;
+  sessionType: SessionType;
+  taskId: string | null;
   durationSeconds: number;
   endTime: number;
 };
@@ -22,20 +24,20 @@ export async function RemoveAssignmentNotificationId(aId: string) {
   await AsyncStorage.removeItem(notificationKey(aId));
 }
 
-export async function SaveActiveSprint(activeSprint: ActiveSprint) {
+export async function SaveActiveSession(activeSession: ActiveSession) {
-  await AsyncStorage.setItem(activeSprintKey, JSON.stringify(activeSprint));
+  await AsyncStorage.setItem(activeSprintKey, JSON.stringify(activeSession));
 }
 
-export async function GetActiveSprint() {
+export async function GetActiveSession() {
-  const activeSprint = await AsyncStorage.getItem(activeSprintKey);
+  const activeSession = await AsyncStorage.getItem(activeSprintKey);
 
-  if (!activeSprint) {
+  if (!activeSession) {
     return null;
   }
 
-  return JSON.parse(activeSprint) as ActiveSprint;
+  return JSON.parse(activeSession) as ActiveSession;
 }
 
-export async function RemoveActiveSprint() {
+export async function RemoveActiveSession() {
   await AsyncStorage.removeItem(activeSprintKey);
 }

lib/types.ts

@@ -1,5 +1,7 @@
 import type { SubjectColor } from '@/lib/subjectColors';
 
+export type SessionType = 'focus' | 'short_break' | 'long_break';
+
 export type Task = {
   tId: string;
   title: string;

notes/vision-gap-closure-plan-2026-05-03.md

@@ -0,0 +1,257 @@
+# Study Sprint Project Vision Gap Closure Plan
+
+## #Overview
+This document turns the remaining gaps between the current app and the project vision into a concrete implementation plan.
+
+Each section below covers one gap between the current version of Study Sprint and the product vision described in `notes/projectVision/AppDev_Project_Vision.pdf`.
+
+The goal is not to expand the app into a large productivity platform. The goal is to close the remaining vision gaps while keeping the product small, student-focused, and realistic to complete.
+
+The app direction assumes the current backend-based architecture remains in place. The report can explain that the project moved from a local-storage-first idea to a database-backed model because authentication and cross-device persistence would otherwise provide little practical value.
+
+---
+
+## #Gap1FocusSessionsAndBreaks
+
+### #VisionGap
+The vision describes a study app built around focus sessions and breaks.
+
+The current app supports task-linked focus sprints, but it does not yet complete the full study loop with a real break flow.
+
+### #WhyThisMatters
+Without break handling, the timer is only a session starter and stopper.
+
+That means the app is missing part of the core study pattern the vision promises.
+
+### #Plan
+1. Add a lightweight session model that distinguishes between `focus`, `short break`, and `long break`.
+2. Keep task linkage only on `focus` sessions so break sessions stay simple.
+3. After a completed focus sprint, show a post-session choice screen with:
+   - `Start short break`
+   - `Skip break`
+4. After a completed short break, show:
+   - `Continue with same task`
+   - `Back to dashboard`
+5. Add a simple cycle rule:
+   - after a chosen number of completed focus sessions, offer `long break` instead of `short break`
+6. Keep the first implementation minimal by using fixed default durations before considering user customization.
+
+### #DoneWhen
+- The app supports a full `focus -> break -> continue` flow.
+- Breaks are treated as real app states, not just something the user has to manage manually.
+- The timer flow now matches the vision wording about focus sessions and breaks.
+
+---
+
+## #Gap2DashboardProgressAndHistory
+
+### #VisionGap
+The vision says the app should make progress visible through completed sessions, study time, or simple statistics.
+
+The current app already shows active sprint state, upcoming deadline tasks, and task time data, but the dashboard still needs to work more clearly as a progress overview.
+
+### #WhyThisMatters
+The app should answer the question: `Am I actually making progress?`
+
+If that answer is not obvious from the dashboard, the motivational part of the vision is only partially fulfilled.
+
+### #Plan
+1. Add a compact dashboard progress summary near the top of the screen.
+2. Show at least these values:
+   - `Focus sessions completed today`
+   - `Minutes studied today`
+   - `Minutes studied this week`
+3. Add a `Recent sessions` section below the summary.
+4. Show for each recent session:
+   - task title if present
+   - session type
+   - duration
+   - completed or cancelled state
+   - time or date
+5. If there is room and it stays visually simple, add a small `Recently completed tasks` section after recent sessions.
+6. Keep the dashboard layout compact so it still feels like a low-friction home screen rather than a report page.
+
+### #DoneWhen
+- The dashboard gives immediate visibility into recent study effort.
+- Session history is visible without needing a dedicated analytics screen.
+- Progress feels tied to real study behavior, not only to planning structure.
+
+---
+
+## #Gap3ConsistentProgressModel
+
+### #VisionGap
+The vision expects progress to feel simple and understandable.
+
+Right now, progress exists in multiple places, but it should be made more consistent so the user can understand what each screen is measuring.
+
+### #WhyThisMatters
+If `progress` means one thing on one screen and something unrelated on another, the app feels less clear and less intentional.
+
+### #Plan
+1. Define one clear meaning of progress per layer:
+   - `Subject`: completed assignments out of total assignments
+   - `Assignment`: completed tasks out of total tasks
+   - `Task`: total study time plus completed focus sessions
+   - `Dashboard`: today's and this week's study activity
+2. Review the labels on each screen so they match those meanings exactly.
+3. Make sure no screen mixes planning progress and session progress without clearly separating them.
+4. Re-check the database queries and UI labels so each metric comes from the right source of truth.
+5. If needed, add small helper text where a metric could otherwise be ambiguous.
+
+### #DoneWhen
+- Each screen communicates one clear type of progress.
+- The app feels easier to understand from first use.
+- Progress presentation supports the vision goal of simplicity.
+
+---
+
+## #Gap4FirstTimeUserFriction
+
+### #VisionGap
+The vision emphasizes low friction and ease of use from the first launch.
+
+The current app uses authentication and a structured hierarchy, which is reasonable for the chosen architecture, but it still needs a smoother first-run experience.
+
+### #WhyThisMatters
+The app can still meet the low-friction goal even with auth, but only if the user is guided quickly into the first meaningful action.
+
+### #Plan
+1. Add a short explanation on the login or signup flow that says:
+   - what the app does
+   - why an account exists
+   - that progress follows the user
+2. After the first successful signup, route the user into a guided setup flow instead of a generic empty dashboard.
+3. Build the setup flow as a strict sequence:
+   - create first subject
+   - create first assignment
+   - create first task
+   - start first sprint
+4. Add clear empty states on key screens so each one gives only one obvious next action.
+5. Use prefilled examples or short placeholder hints where that reduces thinking for the user.
+6. Avoid giving the user too many choices before they have created their first workable study path.
+
+### #DoneWhen
+- A new user can reach their first sprint with minimal confusion.
+- The app no longer feels empty or directionless after authentication.
+- The structured hierarchy feels guided instead of heavy.
+
+---
+
+## #Gap5MainFlowFriction
+
+### #VisionGap
+The vision promises a fast and focused experience that reduces procrastination rather than adding more friction.
+
+The current app already has the right hierarchy, but the main flow should be tightened so starting real work feels faster.
+
+### #WhyThisMatters
+Even a good feature set can feel wrong if the path to action is too slow or too fragmented.
+
+### #Plan
+1. Make `Start Sprint` the strongest action on task-level screens.
+2. Use a sensible default sprint duration so the user can begin immediately without extra setup.
+3. Review the number of taps from dashboard to active study session and remove unnecessary detours.
+4. Ensure that post-sprint actions are explicit and simple:
+   - start break
+   - continue same task
+   - return to dashboard
+5. Keep the dashboard focused on next actions rather than loading it with too many management controls.
+6. Re-check labels, button wording, and action order so the app always pushes the user toward concrete study work.
+
+### #DoneWhen
+- Starting a study sprint feels fast.
+- The app consistently guides the user toward focused work.
+- The product behavior matches the vision goal of low-friction use.
+
+---
+
+## #Gap6ReliabilityAndSessionState
+
+### #VisionGap
+The vision identifies reliability as critical.
+
+The app already has a stronger session model than before, but reliability work should explicitly close the loop for running, finishing, cancelling, resuming, and displaying sessions.
+
+### #WhyThisMatters
+If the timer or sprint state feels inconsistent, the app loses trust very quickly.
+
+### #Plan
+1. Review the full sprint lifecycle and make sure every session ends in a valid final state:
+   - `completed`
+   - `cancelled`
+   - `expired`
+   - break equivalents if breaks are added
+2. Make sure dashboard history, task totals, and active sprint state all reflect the same underlying session truth.
+3. Confirm that reopening the app after a session should have ended produces the correct finalization behavior.
+4. Confirm that cancelled sessions do not accidentally remain active in local resume storage.
+5. Test the edge cases around:
+   - app backgrounding
+   - app reopen
+   - expired sprint reopen
+   - switching between timer and dashboard
+6. Document any remaining non-ideal behavior clearly if platform limitations prevent a perfect solution.
+
+### #DoneWhen
+- Session state transitions are predictable.
+- History, task totals, and active sprint status stay in sync.
+- The timer feels dependable enough to support the vision's reliability requirement.
+
+---
+
+## #Gap7ScopeDisciplineAndVisionAlignment
+
+### #VisionGap
+The vision values a realistic scope and a smaller polished product over a larger unfinished one.
+
+To stay aligned with that, the remaining work needs to focus only on the features that directly close the vision gaps.
+
+### #WhyThisMatters
+The fastest way to miss the vision now is to expand sideways into extra features instead of finishing the core loop properly.
+
+### #Plan
+1. Treat these as the remaining priority set:
+   - focus and break flow
+   - dashboard progress summary
+   - session history visibility
+   - onboarding and empty-state friction reduction
+   - reliability and session-state cleanup
+2. Explicitly avoid adding large optional features during this phase, such as:
+   - social login
+   - advanced analytics
+   - calendar systems
+   - collaboration tools
+   - broad gamification
+3. Update the report wording so the architectural shift to DB/auth is explained as a pragmatic decision, not as a contradiction left unresolved.
+4. Re-check the final app against the vision using product outcomes rather than older implementation assumptions like strictly local persistence.
+
+### #DoneWhen
+- The team is working only on features that directly close vision gaps.
+- The report and the final app tell the same story.
+- The product remains small, focused, and polished enough for the project scope.
+
+---
+
+## #SuggestedImplementationOrder
+1. Implement the focus and break session flow.
+2. Add dashboard progress summary and recent session history.
+3. Make progress definitions consistent across subject, assignment, task, and dashboard screens.
+4. Build the first-time setup flow and improve empty states.
+5. Tighten the main sprint-start flow and post-session actions.
+6. Run reliability testing across active sprint, cancelled sprint, expired sprint, and restored sprint paths.
+7. Update the report so the DB/auth decision and final scope are explained clearly.
+
+---
+
+## #FinalGoal
+When this plan is complete, Study Sprint should feel like a finished small study app rather than a partly connected prototype.
+
+A user should be able to:
+- sign in and understand the app quickly
+- create a simple study structure without confusion
+- start a focus session tied to a task
+- continue naturally into a break
+- return and continue studying
+- see visible proof of progress on the dashboard
+
+That is the point where the current app most clearly matches the project vision.

notes/work-report-timer-2026-05-03.md

@@ -0,0 +1,392 @@
+# Focus, Dashboard, And Progress Model Work Report
+
+## #Overview
+Today the timer work moved from a sprint-only model toward a more general session flow that can support both focused work and breaks.
+
+The main goal was to start closing the vision gap around `focus -> break -> continue`, while keeping the implementation local to the existing timer route instead of introducing a larger navigation or state-management rewrite.
+
+The work therefore covered both app-side session-model changes and the Supabase function updates needed to make the new flow actually start and finalize sessions correctly.
+
+Later in the same work session, the scope also expanded into the dashboard and the progress presentation on the detail screens so the app better matches the remaining vision-gap plan.
+
+The scope then expanded one step further into first-time-user friction, so the work also covered a guided onboarding path and clearer empty states for new accounts.
+
+Later still, the work expanded beyond the app itself into the signup-confirmation path around account creation. That included auth-screen behavior fixes, a shorter guided-setup timer for quick verification, a minimal confirmation landing page for VPS deployment, Caddy routing, and a less boilerplate-looking confirmation email template.
+
+---
+
+## #ImplementedFeatures
+
+### #GeneralSessionModel
+Changed the local timer model from a sprint-specific structure into a more general session structure:
+- added `SessionType` in `lib/types.ts`
+- introduced the session types:
+  - `focus`
+  - `short_break`
+  - `long_break`
+- replaced the old `ActiveSprint` shape with `ActiveSession` in `lib/asyncStorage.ts`
+- stored `sessionType` together with `sessionId`, `taskId`, `durationSeconds`, and `endTime`
+
+This means the active timer is no longer assumed to always be a task-linked focus sprint.
+
+---
+
+### #TimerSessionStartAndRestore
+Updated the timer screen so it can start and restore different session types:
+- replaced sprint-specific storage calls with `GetActiveSession(...)`, `SaveActiveSession(...)`, and `RemoveActiveSession(...)`
+- generalized the timer start path into `startSession(...)`
+- passed `p_session_type` into the Supabase `start_sprint_session(...)` RPC
+- kept task linkage only for `focus` sessions
+- updated the restore logic so a focus session restores by `tId`, while break sessions restore by `sessionType`
+
+This gives the existing timer screen enough information to behave differently for focus sessions and break sessions without creating a second timer screen.
+
+---
+
+### #DashboardAndTaskIntegration
+Updated the surrounding screens so they understand the new active-session shape:
+- updated `app/task/viewDetailsTask.tsx` to read the new active session model
+- updated `app/(tabs)/index.tsx` so the dashboard card can describe either a focus session or a break session
+- made the dashboard open the timer with either a task id or a break-session configuration, depending on what is active
+
+This keeps the rest of the app aligned with the timer change, instead of leaving the new session model isolated to one file.
+
+---
+
+### #DashboardProgressAndHistory
+Extended the dashboard so it works more clearly as a study-activity overview:
+- added a compact `Study progress` summary near the top of the dashboard
+- showed:
+  - `Focus sessions today`
+  - `Minutes today`
+  - `Minutes this week`
+- loaded the summary from `sprint_sessions` instead of from planning data
+- added a `Recent sessions` section showing:
+  - task title when available
+  - session type
+  - duration
+  - final status
+  - date and time
+- added a small `Recently completed tasks` section based on recent task completion updates
+
+This moved the dashboard closer to the vision requirement that progress should reflect actual study behavior rather than only task structure.
+
+---
+
+### #DashboardLayoutRestructure
+Reworked the order of the dashboard sections so the screen reads more clearly as a home surface:
+- kept the active-session card at the top when relevant
+- placed `Study progress` before the task lists
+- moved `Tasks with upcoming deadlines` directly under the progress summary
+- pushed `Recent sessions` and `Recently completed tasks` lower as secondary context
+- made the lower history area work as a side-by-side layout when screen width allows it
+- changed the dashboard body to a scrollable layout so the extra sections still fit without clipping
+
+The result is a dashboard that moves from orientation, to next action, to history instead of feeling like a stacked report page.
+
+---
+
+### #ConsistentProgressModel
+Aligned the progress language across the detail screens so each layer measures one clear thing:
+- on the subject details screen, changed the progress label from `Assignment Progress` to `Assignments completed`
+- added helper text clarifying that subject progress is based only on completed assignments
+- on the assignment details screen, changed the progress label from `Task Progress` to `Tasks completed`
+- added helper text clarifying that assignment progress is based only on completed tasks
+- on the task details screen, separated completion state from study activity
+- added a dedicated `Study activity` block showing:
+  - tracked focus time from `tasks.totalTimeInSeconds`
+  - completed focus-session count from `sprint_sessions`
+- added an explicit task status label so completion state is not confused with study effort
+
+This made the meaning of progress more consistent:
+- `Subject` now reads as assignment completion
+- `Assignment` now reads as task completion
+- `Task` now reads as study effort plus completion state
+- `Dashboard` now reads as recent study activity
+
+---
+
+### #FirstTimeSetupAndEmptyStates
+Added the first guided setup flow so new users are pushed into one clear study path instead of landing in an empty app:
+- added a dedicated `app/setup.tsx` route for first-time setup
+- changed signup so a newly authenticated user is routed to setup instead of directly to the dashboard
+- built the setup flow as a strict sequence:
+  - create first subject
+  - create first assignment
+  - create first task
+  - start first sprint
+- updated the subject, assignment, and task creation screens so they can advance automatically to the next setup step
+- removed the setup-breaking success popups between those guided creation steps
+- added short auth-screen explanations describing:
+  - what the app does
+  - why an account exists
+  - that study structure and progress follow the user
+- added clearer empty states on the dashboard and subjects screen that point the user into guided setup
+- tightened the empty-state copy on subject and assignment details so each one points toward the next required object in the hierarchy
+
+This closes a large part of the first-run friction gap without introducing a separate onboarding system or broader navigation rewrite.
+
+---
+
+### #AuthScreenKeyboardHandling
+Adjusted the auth screens so text inputs do not stay buried behind the on-screen keyboard:
+- updated `app/login.tsx` so the login content scrolls and shifts upward when the keyboard opens
+- updated `app/createUser.tsx` so the entire create-account content block lifts upward with the keyboard instead of only trying to scroll one input into view
+- kept the changes local to the auth screens instead of introducing a broader shared keyboard abstraction
+
+This was aimed specifically at the real usability problem where the password field could end up hidden during login or signup.
+
+---
+
+### #SignupNavigationAndHeaderAlignment
+Adjusted the signup screen navigation so it matches the rest of the app more closely:
+- removed the temporary in-screen back button experiment from the signup page
+- re-enabled the normal stack header for `createUser` in `app/_layout.tsx`
+- kept signup navigation on the default app-style back arrow instead of a one-off local control
+
+This kept the auth flow visually more consistent with the rest of the route stack.
+
+---
+
+### #GuidedSetupFiveSecondSprint
+Changed guided setup so the first sprint can be tested almost immediately:
+- updated `app/setup.tsx` so the setup flow opens the timer with a fixed `5` second duration
+- extended `app/task/timer.tsx` so it can also accept an explicit `durationSeconds` route param
+- kept the rest of the timer behavior unchanged, so the setup-specific shortcut still runs through the same session start, storage, and completion flow as normal timers
+
+This made the first-run path quicker to test without changing the broader timer model back to a special-case setup implementation.
+
+---
+
+### #SignupConfirmationDeployment
+Built the first deployable confirmation landing page outside the Expo app:
+- added `deploy/signup-confirmation/site/index.html` as a minimal static confirmation page
+- added `deploy/signup-confirmation/docker-compose.yml` so the page can be served with `nginx:alpine`
+- added a small README for VPS deployment notes and port mapping
+- verified the page deployment path together with the external VPS/domain setup already in use
+
+This created a concrete destination URL for signup confirmation emails instead of leaving the email to resolve into a blank or undefined endpoint.
+
+---
+
+### #CaddyAndEmailConfirmationPolish
+Finished the external confirmation flow around signup:
+- corrected the Caddy reverse-proxy target from container port `8080` to `80` for the `nginx` confirmation container
+- confirmed that the confirmation page then resolved correctly behind the existing Caddy-plus-Docker setup
+- replaced the original bare confirmation email body with a cleaner branded HTML email using the existing `{{ .ConfirmationURL }}` placeholder
+
+This moved the signup confirmation flow from a functional but rough setup into something that is both deployable and presentable.
+
+---
+
+### #PostSessionBreakFlow
+Added the first real post-session flow in the timer UI:
+- after a completed focus session, the timer now shows:
+  - `Start short break`
+  - `Skip break`
+- starting the break reopens the same timer route in `short_break` mode
+- after a completed short break, the timer now shows:
+  - `Continue with same task`
+  - `Back to dashboard`
+- passed `returnTaskId` through the route so the timer can return the user to the original task after the break
+
+This is the first implementation of an actual study loop rather than a timer that simply ends and disappears.
+
+---
+
+### #BreakTimerPresentation
+Adjusted the timer UI so break sessions read more clearly:
+- added a fixed-duration block for break sessions instead of showing the normal duration picker
+- used a fixed 5-minute short-break duration for the first implementation
+- kept the focus-session picker unchanged
+- made the break start button match the existing `Start Sprint` button styling, but show only `Start`
+- removed the bug where picker or pre-start break elements remained visible on top of the running break session
+
+This keeps the first break flow minimal and visually consistent with the existing timer screen.
+
+---
+
+### #SupabaseFunctionAlignment
+Adjusted the Supabase side so the new app flow could actually run:
+- updated `start_sprint_session(...)` to accept `p_session_type`
+- allowed break sessions to start with `taskId = null`
+- aligned the SQL with the real table schema using:
+  - `sessionId`
+  - `taskId`
+  - `userId`
+  - `sessionType`
+  - `countedIntoTaskTotal`
+- corrected function-return behavior so the app receives the created session id in the shape it expects
+- kept finalize logic so only `focus` sessions contribute to `tasks.totalTimeInSeconds`
+
+Without this database alignment, the app-side session model would compile but still fail when starting real sessions.
+
+---
+
+## #ProblemsAndSetbacks
+
+### #SchemaMismatch
+The main blocker today was that the first SQL version assumed table columns that did not exist in the real Supabase schema.
+
+The actual `sprint_sessions` table already contained:
+- `sessionId`
+- `taskId`
+- `userId`
+- `plannedDuration`
+- `startedAt`
+- `endedAt`
+- `elapsedSeconds`
+- `status`
+- `countedIntoTaskTotal`
+- `sessionType`
+
+But it did not contain `createdAt` or `updatedAt`, so the first function version failed at runtime.
+
+---
+
+### #FunctionReturnShape
+Another blocker was the shape of the return value from `start_sprint_session(...)`.
+
+Even after the insert worked, the app still showed:
+- `Session could not be created.`
+
+The issue was not the insert itself, but that the returned value shape did not match what `getSessionId(...)` was looking for on the app side.
+
+This had to be corrected so the RPC returned the created session id in a directly readable object shape.
+
+---
+
+### #PauseUIScreenOverlap
+The first version of the break UI had presentation bugs:
+- the pause start button text looked cramped and awkward
+- pre-start pause UI stayed visible after the break actually started
+- picker or fixed-duration elements overlapped the running break session
+
+This was corrected by hiding pre-start break UI while the timer is running and by reverting the pause start button back to the same visual model as the existing sprint start button.
+
+---
+
+### #ConfirmationRoutePortMismatch
+The external signup-confirmation deployment initially failed behind Caddy with `HTTP ERROR 502`.
+
+The actual issue was not the Docker network arrangement itself, but that the reverse proxy was targeting `signup-confirmation:8080` even though the `nginx` container listens internally on port `80`.
+
+Changing the upstream target to the real container port fixed the route.
+
+---
+
+## #CurrentState
+
+The timer flow now goes further than the previous sprint-only model.
+
+The app now supports:
+- starting a `focus` session tied to a task
+- starting a `short_break` session with no task linkage
+- storing and restoring the active session with its type
+- showing a post-focus decision between taking a break or skipping it
+- returning from a completed short break into the same task flow or back to the dashboard
+- keeping break sessions out of task time totals
+
+At this point, the app has the first working version of the focus-and-break loop described in the vision plan, even though the cycle logic and long-break offer are not implemented yet.
+
+The dashboard also now gives a clearer answer to:
+- `What have I done today?`
+- `What should I work on next?`
+
+And the detail screens now separate planning completion from study activity more explicitly, which makes the app easier to read without having to infer what each progress bar means.
+
+For a brand-new user, the app also no longer drops straight into a generic empty state after account creation. There is now a clearer route from signup to:
+- first subject
+- first assignment
+- first task
+- first sprint
+
+That makes the hierarchy feel more guided and less like a blank structure the user has to interpret alone.
+
+The signup path also now has a more complete confirmation loop around it:
+- the auth screens behave more safely when the mobile keyboard opens
+- guided setup can launch a very short first sprint for fast verification
+- the confirmation email can point to a real public landing page
+- that landing page has a working Docker/Caddy deployment path on the VPS
+- the email itself no longer looks like a raw boilerplate template
+
+---
+
+## #Verification
+
+During today's work, the following behaviors were verified through implementation checks and runtime iteration:
+- the new session model compiles across timer, dashboard, task details, and local storage
+- `start_sprint_session(...)` now succeeds after the Supabase function updates
+- the timer can start using the new session-based flow
+- break sessions no longer leave the picker or fixed-duration setup visible on top of the running timer
+- the dashboard compiles with the new progress-summary, recent-session, and recent-completion sections
+- the task details screen compiles with a new `sprint_sessions`-based completed-session count
+- the subject and assignment detail screens now label completion metrics more explicitly
+- the new guided setup route compiles and links correctly with the subject, assignment, and task creation flow
+- the login and signup screens compile after the keyboard-handling adjustments
+- the guided setup route now opens the timer with an explicit 5-second fixed duration
+- the deployable signup-confirmation page was brought up behind the VPS Caddy setup after correcting the upstream container port from `8080` to `80`
+- the confirmation email template was updated to a cleaner HTML version while keeping `{{ .ConfirmationURL }}` as the actual confirmation link placeholder
+
+Static verification also passed:
+
+```text
+npx tsc --noEmit
+exited successfully
+
+npm run lint
+exited with existing warning only in:
+- app/task/timer.tsx
+```
+
+I did not run a live interactive app test for the later dashboard and progress-model changes. That part of the verification is static rather than runtime-confirmed.
+
+---
+
+## #FilesChanged
+
+Main app files worked on:
+
+```text
+app/task/timer.tsx
+app/task/viewDetailsTask.tsx
+app/(tabs)/index.tsx
+app/(tabs)/subjects.tsx
+app/setup.tsx
+app/subject/viewDetailsSubject.tsx
+app/subject/upsertSubject.tsx
+app/assignment/viewDetailsAssignment.tsx
+app/assignment/upsertAssignment.tsx
+app/task/upsertTask.tsx
+app/createUser.tsx
+app/login.tsx
+app/_layout.tsx
+lib/asyncStorage.ts
+lib/types.ts
+deploy/signup-confirmation/docker-compose.yml
+deploy/signup-confirmation/site/index.html
+deploy/signup-confirmation/README.md
+```
+
+New note added:
+
+```text
+notes/work-report-timer-2026-05-03.md
+```
+
+---
+
+## #Conclusion
+
+The main result today was not just a timer change, but a broader step toward closing the remaining vision gaps around study flow and progress clarity.
+
+The app now has:
+- a session model that can represent both focused work and breaks
+- the first concrete `focus -> break -> continue` path from the vision plan
+- a dashboard that reflects recent study effort more directly
+- detail screens that use more explicit and consistent progress meanings
+- a first guided onboarding path that leads a new user from signup to their first workable sprint path
+- more usable auth screens when entering credentials on mobile
+- a complete basic signup-confirmation flow that now reaches a real deployed landing page and a cleaner confirmation email
+
+The remaining work in this area is now less about inventing the model from scratch and more about extending, polishing, and live-validating the pieces that are already in place.