feat: add tomorrow filter for tasks

paolojulian · Sep 15, 2024 · 57f2d86 · 57f2d86
1 parent 2cd655f
commit 57f2d86
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 3 deletions.
diff --git a/components/tasks/TaskFilters/TaskFilters.tsx b/components/tasks/TaskFilters/TaskFilters.tsx
@@ -10,6 +10,10 @@ const TASK_FILTERS: TabItem<TaskFilterTypes>[] = [
     key: 'Today',
     value: 'Today',
   },
+  {
+    key: 'Tomorrow',
+    value: 'Tomorrow',
+  },
   {
     key: 'All',
     value: 'All',

diff --git a/components/tasks/TaskList/EmptyTaskList/EmptyTaskList.tsx b/components/tasks/TaskList/EmptyTaskList/EmptyTaskList.tsx
@@ -36,6 +36,8 @@ function RenderEmptyText({ filterType }: { filterType: TaskFilterTypes }) {
   switch (filterType) {
     case 'Completed':
       return <NoCompletedTasks />;
+    case 'Tomorrow':
+      return <NoTasksTomorrow />;
     case 'Scheduled':
       return <NoScheduledTasks />;
     case 'Today':
@@ -74,7 +76,26 @@ function NoTasksToday() {
           variant="body-md"
           style={{ textAlign: 'center', color: colors.v2.grayLight, maxWidth: 300 }}
         >
-          You can now relax or add additional hustles.
+          You're all clear for today! Enjoy your free time or feel free to plan ahead.
+        </ThemedText>
+      </Stack>
+
+      <TapToCreateTask />
+    </Stack>
+  );
+}
+
+function NoTasksTomorrow() {
+  return (
+    <Stack style={{ alignItems: 'center', gap: 24 }}>
+      <Stack style={{ alignItems: 'center', gap: 8 }}>
+        <ThemedText variant="header-md">No Task Due Tomorrow</ThemedText>
+        <ThemedText
+          variant="body-md"
+          style={{ textAlign: 'center', color: colors.v2.grayLight, maxWidth: 300 }}
+        >
+          Looks like you're all set for tomorrow! Feel free to kick back and relax, or get a head
+          start on future tasks.
         </ThemedText>
       </Stack>
 

diff --git a/hooks/services/task/task.types.ts b/hooks/services/task/task.types.ts
@@ -26,7 +26,7 @@ export enum TaskQueryKeys {
   tasksDueTomorrow = 'task-due-tomorrow',
 }
 
-export type TaskFilterTypes = 'Today' | 'All' | 'Scheduled' | 'Completed';
+export type TaskFilterTypes = 'Today' | 'Tomorrow' | 'All' | 'Scheduled' | 'Completed';
 
 export type TaskQueryFilters = {
   filterType: TaskFilterTypes;

diff --git a/hooks/services/task/useTasks.ts b/hooks/services/task/useTasks.ts
@@ -30,6 +30,13 @@ function buildQuery(filters: TaskQueryFilters) {
           AND is_completed = 0
         ORDER BY reminder_date ASC
       `;
+    case 'Tomorrow':
+      return /* sql */ `
+        SELECT * FROM task
+        WHERE reminder_date BETWEEN $startOfDayEpoch AND $endOfDayEpoch
+          AND is_completed = 0
+        ORDER BY reminder_date ASC
+      `;
     case 'All':
       return /* sql */ `
         SELECT * FROM task
@@ -55,9 +62,17 @@ function buildQuery(filters: TaskQueryFilters) {
 }
 
 function buildVariables(filters: TaskQueryFilters): SQLiteBindParams {
+  const today = dayjs();
   if (filters.filterType === 'Today') {
     return {
-      $end: convertDateToEpoch(dayjs().endOf('day').toDate()),
+      $end: convertDateToEpoch(today.endOf('day').toDate()),
+    };
+  }
+
+  if (filters.filterType === 'Tomorrow') {
+    return {
+      $startOfDayEpoch: convertDateToEpoch(today.add(1, 'day').startOf('day').toDate()),
+      $endOfDayEpoch: convertDateToEpoch(today.add(1, 'day').endOf('day').toDate()),
     };
   }