Enhance UI/UX of time-tracker

apps/db/supabase/migrations/20250618000000_add_was_resumed_field.sql

@@ -0,0 +1,43 @@
+-- Add was_resumed field to time_tracking_sessions table
+-- This field tracks whether a session was created by resuming a previous session
+
+ALTER TABLE public.time_tracking_sessions 
+ADD COLUMN was_resumed boolean DEFAULT false;
+
+-- Back-fill existing rows to ensure no NULL values
+UPDATE public.time_tracking_sessions 
+SET was_resumed = false 
+WHERE was_resumed IS NULL;
+
+-- Add NOT NULL constraint to prevent tri-state logic
+ALTER TABLE public.time_tracking_sessions 
+ALTER COLUMN was_resumed SET NOT NULL;
+
+-- Add index for analytics queries that filter by was_resumed
+CREATE INDEX idx_time_tracking_sessions_was_resumed 
+ON public.time_tracking_sessions USING btree (was_resumed) 
+WHERE was_resumed = true;
+
+drop view time_tracking_session_analytics;
+
+-- Update the time_tracking_session_analytics view to include was_resumed
+CREATE OR REPLACE VIEW time_tracking_session_analytics AS
+SELECT 
+    tts.*,
+    ttc.name as category_name,
+    ttc.color as category_color,
+    t.name as task_name,
+    EXTRACT(HOUR FROM tts.start_time) as start_hour,
+    EXTRACT(DOW FROM tts.start_time) as day_of_week,
+    DATE_TRUNC('day', tts.start_time) as session_date,
+    DATE_TRUNC('week', tts.start_time) as session_week,
+    DATE_TRUNC('month', tts.start_time) as session_month,
+    CASE 
+        WHEN tts.duration_seconds >= 7200 THEN 'long'    -- 2+ hours
+        WHEN tts.duration_seconds >= 1800 THEN 'medium'  -- 30min - 2 hours  
+        WHEN tts.duration_seconds >= 300 THEN 'short'    -- 5-30 minutes
+        ELSE 'micro'                                      -- < 5 minutes
+    END as session_length_category
+FROM time_tracking_sessions tts
+LEFT JOIN time_tracking_categories ttc ON tts.category_id = ttc.id
+LEFT JOIN tasks t ON tts.task_id = t.id; 

apps/web/src/app/[locale]/(dashboard)/[wsId]/calendar/components/tasks-sidebar-content.tsx

@@ -2,6 +2,7 @@
 
 import Chat from '../../chat/chat';
 import { TaskBoardForm } from '../../tasks/boards/form';
+import type { ExtendedWorkspaceTask } from '../../time-tracker/types';
 import QuickTaskTimer from './quick-task-timer';
 import { TaskForm } from './task-form';
 import { TaskListForm } from './task-list-form';
@@ -186,11 +187,59 @@ export default function TasksSidebarContent({
 
   // Get all tasks from all boards for time tracker
   const allTasks = useMemo(() => {
-    const tasks: Partial<WorkspaceTask>[] = [];
+    const tasks: ExtendedWorkspaceTask[] = [];
     initialTaskBoards.forEach((board) => {
       board.lists?.forEach((list) => {
         if (list.tasks) {
-          tasks.push(...list.tasks);
+          // Transform Partial<WorkspaceTask> to ExtendedWorkspaceTask
+          interface TaskWithAssigneeMeta extends Partial<WorkspaceTask> {
+            assignee_name?: string;
+            assignee_avatar?: string;
+            is_assigned_to_current_user?: boolean;
+            assignees?: ExtendedWorkspaceTask['assignees'];
+          }
+
+          const extendedTasks = list.tasks.map(
+            (task): ExtendedWorkspaceTask => {
+              const taskMeta = task as TaskWithAssigneeMeta;
+
+              // Type-safe conversion from Partial<WorkspaceTask> to ExtendedWorkspaceTask
+              // Convert undefined values to null to match the expected type constraints
+              const extendedTask: ExtendedWorkspaceTask = {
+                // Required fields (these should always be present)
+                id: task.id!,
+                name: task.name!,
+                list_id: task.list_id!,
+
+                // Optional fields with proper null conversion
+                description: task.description ?? null,
+                priority: task.priority ?? null,
+                start_date: task.start_date ?? null,
+                end_date: task.end_date ?? null,
+                created_at: task.created_at ?? null,
+                creator_id: task.creator_id ?? null,
+
+                // Boolean fields that should be boolean | null (not undefined)
+                archived: task.archived ?? null,
+                completed: task.completed ?? null,
+                deleted: task.deleted ?? null,
+
+                // Extended fields for context
+                board_name: board.name ?? undefined,
+                list_name: list.name ?? undefined,
+
+                // Keep existing assignee metadata if present
+                assignee_name: taskMeta.assignee_name || undefined,
+                assignee_avatar: taskMeta.assignee_avatar || undefined,
+                is_assigned_to_current_user:
+                  taskMeta.is_assigned_to_current_user || undefined,
+                assignees: taskMeta.assignees || undefined,
+              };
+
+              return extendedTask;
+            }
+          );
+          tasks.push(...extendedTasks);
         }
       });
     });

apps/web/src/app/[locale]/(dashboard)/[wsId]/calendar/components/time-tracker.tsx

@@ -1,10 +1,11 @@
 'use client';
 
 import type {
-  TimeTrackingCategory,
-  TimeTrackingSession,
-  WorkspaceTask,
-} from '@tuturuuu/types/db';
+  ExtendedWorkspaceTask,
+  SessionWithRelations,
+  TimerStats,
+} from '../../time-tracker/types';
+import type { TimeTrackingCategory, WorkspaceTask } from '@tuturuuu/types/db';
 import {
   AlertDialog,
   AlertDialogAction,
@@ -71,28 +72,11 @@ import { Textarea } from '@tuturuuu/ui/textarea';
 import { cn } from '@tuturuuu/utils/format';
 import { useCallback, useEffect, useState } from 'react';
 
-interface ExtendedWorkspaceTask extends Partial<WorkspaceTask> {
-  board_name?: string;
-  list_name?: string;
-}
-
 interface TimeTrackerProps {
   wsId: string;
   tasks?: ExtendedWorkspaceTask[];
 }
 
-interface TimerStats {
-  todayTime: number;
-  weekTime: number;
-  monthTime: number;
-  streak: number;
-}
-
-interface SessionWithRelations extends TimeTrackingSession {
-  category?: TimeTrackingCategory;
-  task?: WorkspaceTask;
-}
-
 interface SessionTemplate {
   title: string;
   description?: string;
@@ -1131,7 +1115,7 @@ export default function TimeTracker({ wsId, tasks = [] }: TimeTrackerProps) {
                             <Button
                               onClick={startTimer}
                               disabled={isLoading}
-                              className="w-full"
+                              className="w-full border border-border bg-muted text-foreground hover:border-accent hover:bg-muted/80 dark:bg-muted dark:text-foreground dark:hover:bg-accent"
                               size="lg"
                             >
                               <Play className="mr-2 h-4 w-4" />
@@ -1309,7 +1293,7 @@ export default function TimeTracker({ wsId, tasks = [] }: TimeTrackerProps) {
                             <Button
                               onClick={startTimer}
                               disabled={!newSessionTitle.trim() || isLoading}
-                              className="w-full"
+                              className="w-full border border-border bg-muted text-foreground hover:border-accent hover:bg-muted/80 dark:bg-muted dark:text-foreground dark:hover:bg-accent"
                               size="lg"
                             >
                               <Play className="mr-2 h-4 w-4" />
@@ -1976,7 +1960,7 @@ export default function TimeTracker({ wsId, tasks = [] }: TimeTrackerProps) {
                 disabled={
                   isCreatingTask || !newTaskName.trim() || !selectedListId
                 }
-                className="flex-1"
+                className="flex-1 border border-border bg-muted text-foreground hover:border-accent hover:bg-muted/80 dark:bg-muted dark:text-foreground dark:hover:bg-accent"
               >
                 {isCreatingTask ? (
                   <>