Job application tracker and AI-powered job search assistant. Helps job seekers manage their search journey with AI resume review, job matching, task logging, and application analytics, all while keeping your data private.
TypeScript ai-agentai-resume-analyzerapplication-trackerapplication-tracking-systematscareerjob-applicationjob-automationjob-huntingjob-searchjob-seeker-toolsjob-trackerjob-trackingjobsearchjobseekersmcpollamaresumeresume-reviewself-hosted
add task management
Khuram Niaz8612c1abdcbf
diff --git a/.gitignore b/.gitignoreindex bfa1709..dadbb0b 100644--- a/.gitignore+++ b/.gitignore@@ -46,4 +46,9 @@ dev.db-journal/playwright/.cache/data/files/resumesCLAUDE.md-/docs\ No newline at end of file+/docs+.github+.claude+.specify+/specs+.vscode\ No newline at end of filediff --git a/.vscode/settings.json b/.vscode/settings.jsonindex fd2c8bb..c843b7e 100644--- a/.vscode/settings.json+++ b/.vscode/settings.json@@ -1,4 +1,15 @@{- "editor.fontVariations": false,- "css.lint.unknownAtRules": "ignore"-}\ No newline at end of file+ "editor.fontVariations": false,+ "css.lint.unknownAtRules": "ignore",+ "chat.promptFilesRecommendations": {+ "speckit.constitution": true,+ "speckit.specify": true,+ "speckit.plan": true,+ "speckit.tasks": true,+ "speckit.implement": true+ },+ "chat.tools.terminal.autoApprove": {+ ".specify/scripts/bash/": true,+ ".specify/scripts/powershell/": true+ }+}diff --git a/package-lock.json b/package-lock.jsonindex fa5a08d..3e21484 100644--- a/package-lock.json+++ b/package-lock.json@@ -25,6 +25,7 @@"@radix-ui/react-radio-group": "^1.2.2","@radix-ui/react-scroll-area": "^1.2.2","@radix-ui/react-select": "^2.1.3",+ "@radix-ui/react-slider": "^1.3.6","@radix-ui/react-slot": "^1.2.4","@radix-ui/react-switch": "^1.1.2","@radix-ui/react-tabs": "^1.1.2",@@ -3849,6 +3850,39 @@}}},+ "node_modules/@radix-ui/react-slider": {+ "version": "1.3.6",+ "resolved": "https://registry.npmjs.org/@radix-ui/react-slider/-/react-slider-1.3.6.tgz",+ "integrity": "sha512-JPYb1GuM1bxfjMRlNLE+BcmBC8onfCi60Blk7OBqi2MLTFdS+8401U4uFjnwkOr49BLmXxLC6JHkvAsx5OJvHw==",+ "license": "MIT",+ "dependencies": {+ "@radix-ui/number": "1.1.1",+ "@radix-ui/primitive": "1.1.3",+ "@radix-ui/react-collection": "1.1.7",+ "@radix-ui/react-compose-refs": "1.1.2",+ "@radix-ui/react-context": "1.1.2",+ "@radix-ui/react-direction": "1.1.1",+ "@radix-ui/react-primitive": "2.1.3",+ "@radix-ui/react-use-controllable-state": "1.2.2",+ "@radix-ui/react-use-layout-effect": "1.1.1",+ "@radix-ui/react-use-previous": "1.1.1",+ "@radix-ui/react-use-size": "1.1.1"+ },+ "peerDependencies": {+ "@types/react": "*",+ "@types/react-dom": "*",+ "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",+ "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"+ },+ "peerDependenciesMeta": {+ "@types/react": {+ "optional": true+ },+ "@types/react-dom": {+ "optional": true+ }+ }+ },"node_modules/@radix-ui/react-slot": {"version": "1.2.4","resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.2.4.tgz",diff --git a/package.json b/package.jsonindex 096e0a5..0ab9e2f 100644--- a/package.json+++ b/package.json@@ -30,6 +30,7 @@"@radix-ui/react-radio-group": "^1.2.2","@radix-ui/react-scroll-area": "^1.2.2","@radix-ui/react-select": "^2.1.3",+ "@radix-ui/react-slider": "^1.3.6","@radix-ui/react-slot": "^1.2.4","@radix-ui/react-switch": "^1.1.2","@radix-ui/react-tabs": "^1.1.2",diff --git a/prisma/migrations/20260113163354_add_task_model/migration.sql b/prisma/migrations/20260113163354_add_task_model/migration.sqlnew file mode 100644index 0000000..31228c7--- /dev/null+++ b/prisma/migrations/20260113163354_add_task_model/migration.sql@@ -0,0 +1,54 @@+-- CreateTable+CREATE TABLE "Task" (+ "id" TEXT NOT NULL PRIMARY KEY,+ "userId" TEXT NOT NULL,+ "title" TEXT NOT NULL,+ "description" TEXT,+ "status" TEXT NOT NULL DEFAULT 'in-progress',+ "priority" INTEGER NOT NULL DEFAULT 5,+ "percentComplete" INTEGER NOT NULL DEFAULT 0,+ "dueDate" DATETIME,+ "activityTypeId" TEXT,+ "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,+ "updatedAt" DATETIME NOT NULL,+ CONSTRAINT "Task_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User" ("id") ON DELETE RESTRICT ON UPDATE CASCADE,+ CONSTRAINT "Task_activityTypeId_fkey" FOREIGN KEY ("activityTypeId") REFERENCES "ActivityType" ("id") ON DELETE SET NULL ON UPDATE CASCADE+);++-- RedefineTables+PRAGMA defer_foreign_keys=ON;+PRAGMA foreign_keys=OFF;+CREATE TABLE "new_Activity" (+ "id" TEXT NOT NULL PRIMARY KEY,+ "userId" TEXT NOT NULL,+ "activityName" TEXT NOT NULL,+ "startTime" DATETIME NOT NULL,+ "endTime" DATETIME,+ "duration" INTEGER,+ "description" TEXT,+ "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,+ "updatedAt" DATETIME NOT NULL,+ "activityTypeId" TEXT NOT NULL,+ "taskId" TEXT,+ CONSTRAINT "Activity_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User" ("id") ON DELETE RESTRICT ON UPDATE CASCADE,+ CONSTRAINT "Activity_activityTypeId_fkey" FOREIGN KEY ("activityTypeId") REFERENCES "ActivityType" ("id") ON DELETE RESTRICT ON UPDATE CASCADE,+ CONSTRAINT "Activity_taskId_fkey" FOREIGN KEY ("taskId") REFERENCES "Task" ("id") ON DELETE SET NULL ON UPDATE CASCADE+);+INSERT INTO "new_Activity" ("activityName", "activityTypeId", "createdAt", "description", "duration", "endTime", "id", "startTime", "updatedAt", "userId") SELECT "activityName", "activityTypeId", "createdAt", "description", "duration", "endTime", "id", "startTime", "updatedAt", "userId" FROM "Activity";+DROP TABLE "Activity";+ALTER TABLE "new_Activity" RENAME TO "Activity";+CREATE UNIQUE INDEX "Activity_taskId_key" ON "Activity"("taskId");+PRAGMA foreign_keys=ON;+PRAGMA defer_foreign_keys=OFF;++-- CreateIndex+CREATE INDEX "Task_userId_idx" ON "Task"("userId");++-- CreateIndex+CREATE INDEX "Task_userId_status_idx" ON "Task"("userId", "status");++-- CreateIndex+CREATE INDEX "Task_userId_activityTypeId_idx" ON "Task"("userId", "activityTypeId");++-- CreateIndex+CREATE INDEX "Task_userId_dueDate_idx" ON "Task"("userId", "dueDate");diff --git a/prisma/migrations/migration_lock.toml b/prisma/migrations/migration_lock.tomlindex e5e5c47..2a5a444 100644--- a/prisma/migrations/migration_lock.toml+++ b/prisma/migrations/migration_lock.toml@@ -1,3 +1,3 @@# Please do not edit this file manually-# It should be added in your version-control system (i.e. Git)-provider = "sqlite"\ No newline at end of file+# It should be added in your version-control system (e.g., Git)+provider = "sqlite"diff --git a/prisma/prisma.config.ts b/prisma/prisma.config.tsnew file mode 100644index 0000000..0ba145b--- /dev/null+++ b/prisma/prisma.config.ts@@ -0,0 +1,8 @@+import { defineConfig } from "prisma/config";++export default defineConfig({+ schema: "./schema.prisma",+ migrations: {+ path: "./migrations",+ },+});diff --git a/prisma/schema.prisma b/prisma/schema.prismaindex 8c9cc54..f490b17 100644--- a/prisma/schema.prisma+++ b/prisma/schema.prisma@@ -26,6 +26,7 @@ model User {Profile Profile[]Activity Activity[]ActivityType ActivityType[]+ Task Task[]}model Profile {@@ -253,6 +254,7 @@ model ActivityType {updatedAt DateTime @updatedAtActivities Activity[]+ Tasks Task[]}model Activity {@@ -269,4 +271,33 @@ model Activity {activityType ActivityType @relation(fields: [activityTypeId], references: [id])activityTypeId String++ taskId String? @unique+ task Task? @relation(fields: [taskId], references: [id])+}++model Task {+ id String @id @default(uuid())+ userId String+ user User @relation(fields: [userId], references: [id])++ title String+ description String?+ status String @default("in-progress")+ priority Int @default(5)+ percentComplete Int @default(0)+ dueDate DateTime?++ activityTypeId String?+ activityType ActivityType? @relation(fields: [activityTypeId], references: [id])++ activity Activity?++ createdAt DateTime @default(now())+ updatedAt DateTime @updatedAt++ @@index([userId])+ @@index([userId, status])+ @@index([userId, activityTypeId])+ @@index([userId, dueDate])}diff --git a/src/actions/task.actions.ts b/src/actions/task.actions.tsnew file mode 100644index 0000000..e476303--- /dev/null+++ b/src/actions/task.actions.ts@@ -0,0 +1,374 @@+"use server";+import prisma from "@/lib/db";+import { handleError } from "@/lib/utils";+import { Task, TaskStatus } from "@/models/task.model";+import { AddTaskFormSchema } from "@/models/addTaskForm.schema";+import { getCurrentUser } from "@/utils/user.utils";+import { z } from "zod";++export const getTasksList = async (+ page: number = 1,+ limit: number = 10,+ filter?: string,+ statusFilter?: TaskStatus[]+): Promise<any | undefined> => {+ try {+ const user = await getCurrentUser();++ if (!user) {+ throw new Error("Not authenticated");+ }++ const offset = (page - 1) * limit;++ const whereClause: any = {+ userId: user.id,+ };++ if (filter) {+ whereClause.activityTypeId = filter;+ }++ if (statusFilter && statusFilter.length > 0) {+ whereClause.status = { in: statusFilter };+ }++ const [data, total] = await Promise.all([+ prisma.task.findMany({+ where: whereClause,+ include: {+ activityType: true,+ activity: {+ select: { id: true },+ },+ },+ orderBy: [{ dueDate: "asc" }, { createdAt: "desc" }],+ skip: offset,+ take: limit,+ }),+ prisma.task.count({+ where: whereClause,+ }),+ ]);++ return {+ success: true,+ data,+ total,+ };+ } catch (error) {+ const msg = "Failed to fetch tasks list.";+ return handleError(error, msg);+ }+};++export const getTaskById = async (+ taskId: string+): Promise<any | undefined> => {+ try {+ const user = await getCurrentUser();++ if (!user) {+ throw new Error("Not authenticated");+ }++ const task = await prisma.task.findFirst({+ where: {+ id: taskId,+ userId: user.id,+ },+ include: {+ activityType: true,+ activity: {+ select: { id: true },+ },+ },+ });++ if (!task) {+ return { success: false, message: "Task not found" };+ }++ return {+ success: true,+ data: task,+ };+ } catch (error) {+ const msg = "Failed to fetch task.";+ return handleError(error, msg);+ }+};++export const createTask = async (+ data: z.infer<typeof AddTaskFormSchema>+): Promise<any | undefined> => {+ try {+ const user = await getCurrentUser();++ if (!user) {+ throw new Error("Not authenticated");+ }++ const validatedData = AddTaskFormSchema.parse(data);++ const task = await prisma.task.create({+ data: {+ title: validatedData.title,+ description: validatedData.description,+ status: validatedData.status,+ priority: validatedData.priority,+ percentComplete: validatedData.percentComplete,+ dueDate: validatedData.dueDate,+ activityTypeId: validatedData.activityTypeId,+ userId: user.id,+ },+ include: {+ activityType: true,+ },+ });++ return { success: true, data: task };+ } catch (error) {+ const msg = "Failed to create task.";+ return handleError(error, msg);+ }+};++export const updateTask = async (+ data: z.infer<typeof AddTaskFormSchema>+): Promise<any | undefined> => {+ try {+ const user = await getCurrentUser();++ if (!user) {+ throw new Error("Not authenticated");+ }++ if (!data.id) {+ throw new Error("Task ID is required for update");+ }++ const validatedData = AddTaskFormSchema.parse(data);++ const task = await prisma.task.update({+ where: {+ id: data.id,+ userId: user.id,+ },+ data: {+ title: validatedData.title,+ description: validatedData.description,+ status: validatedData.status,+ priority: validatedData.priority,+ percentComplete: validatedData.percentComplete,+ dueDate: validatedData.dueDate,+ activityTypeId: validatedData.activityTypeId,+ },+ include: {+ activityType: true,+ },+ });++ return { success: true, data: task };+ } catch (error) {+ const msg = "Failed to update task.";+ return handleError(error, msg);+ }+};++export const updateTaskStatus = async (+ taskId: string,+ status: TaskStatus+): Promise<any | undefined> => {+ try {+ const user = await getCurrentUser();++ if (!user) {+ throw new Error("Not authenticated");+ }++ const task = await prisma.task.update({+ where: {+ id: taskId,+ userId: user.id,+ },+ data: {+ status,+ },+ include: {+ activityType: true,+ },+ });++ return { success: true, data: task };+ } catch (error) {+ const msg = "Failed to update task status.";+ return handleError(error, msg);+ }+};++export const deleteTaskById = async (+ taskId: string+): Promise<any | undefined> => {+ try {+ const user = await getCurrentUser();++ if (!user) {+ throw new Error("Not authenticated");+ }++ const task = await prisma.task.findFirst({+ where: {+ id: taskId,+ userId: user.id,+ },+ include: {+ activity: true,+ },+ });++ if (!task) {+ return { success: false, message: "Task not found" };+ }++ if (task.activity) {+ return {+ success: false,+ message:+ "Cannot delete task with linked activity. Remove the activity first.",+ };+ }++ await prisma.task.delete({+ where: {+ id: taskId,+ userId: user.id,+ },+ });++ return { success: true };+ } catch (error) {+ const msg = "Failed to delete task.";+ return handleError(error, msg);+ }+};++export const startActivityFromTask = async (+ taskId: string+): Promise<any | undefined> => {+ try {+ const user = await getCurrentUser();++ if (!user) {+ throw new Error("Not authenticated");+ }++ const task = await prisma.task.findFirst({+ where: {+ id: taskId,+ userId: user.id,+ },+ include: {+ activity: true,+ },+ });++ if (!task) {+ return { success: false, message: "Task not found" };+ }++ if (task.activity) {+ return {+ success: false,+ message: "Task already has a linked activity.",+ };+ }++ if (!task.activityTypeId) {+ return {+ success: false,+ message: "Task must have an activity type to start an activity.",+ };+ }++ if (task.status === "complete" || task.status === "cancelled") {+ return {+ success: false,+ message: "Cannot start an activity from a completed or cancelled task.",+ };+ }++ const runningActivity = await prisma.activity.findFirst({+ where: {+ userId: user.id,+ endTime: null,+ },+ });++ if (runningActivity) {+ return {+ success: false,+ message:+ "You already have a running activity. Please stop it before starting a new one.",+ };+ }++ const activity = await prisma.activity.create({+ data: {+ activityName: task.title,+ activityTypeId: task.activityTypeId,+ userId: user.id,+ startTime: new Date(),+ endTime: null,+ taskId: task.id,+ },+ include: {+ activityType: true,+ },+ });++ return { success: true, data: activity };+ } catch (error) {+ const msg = "Failed to start activity from task.";+ return handleError(error, msg);+ }+};++export const getActivityTypesWithTaskCounts = async (): Promise<+ any | undefined+> => {+ try {+ const user = await getCurrentUser();++ if (!user) {+ throw new Error("Not authenticated");+ }++ const activityTypes = await prisma.activityType.findMany({+ where: {+ createdBy: user.id,+ },+ include: {+ _count: {+ select: { Tasks: true },+ },+ },+ });++ const data = activityTypes.map((type) => ({+ id: type.id,+ label: type.label,+ value: type.value,+ taskCount: type._count.Tasks,+ }));++ const totalTasks = await prisma.task.count({+ where: { userId: user.id },+ });++ return { success: true, data, totalTasks };+ } catch (error) {+ const msg = "Failed to fetch activity types with task counts.";+ return handleError(error, msg);+ }+};diff --git a/src/app/dashboard/tasks/TasksPageClient.tsx b/src/app/dashboard/tasks/TasksPageClient.tsxnew file mode 100644index 0000000..0c0048d--- /dev/null+++ b/src/app/dashboard/tasks/TasksPageClient.tsx@@ -0,0 +1,50 @@+"use client";+import TasksContainer from "@/components/tasks/TasksContainer";+import TasksSidebar from "@/components/tasks/TasksSidebar";+import { ActivityType } from "@/models/activity.model";+import { useState } from "react";++type ActivityTypeWithCount = {+ id: string;+ label: string;+ value: string;+ taskCount: number;+};++type TasksPageClientProps = {+ activityTypes: ActivityType[];+ activityTypesWithCounts: ActivityTypeWithCount[];+ totalTasks: number;+};++function TasksPageClient({+ activityTypes,+ activityTypesWithCounts,+ totalTasks,+}: TasksPageClientProps) {+ const [filterKey, setFilterKey] = useState<string | undefined>(undefined);++ const onFilterChange = (filter: string | undefined) => {+ setFilterKey(filter);+ };++ return (+ <div className="col-span-3 flex">+ <TasksSidebar+ activityTypes={activityTypesWithCounts}+ totalTasks={totalTasks}+ selectedFilter={filterKey}+ onFilterChange={onFilterChange}+ />+ <div className="flex-1">+ <TasksContainer+ activityTypes={activityTypes}+ filterKey={filterKey}+ onFilterChange={onFilterChange}+ />+ </div>+ </div>+ );+}++export default TasksPageClient;diff --git a/src/app/dashboard/tasks/page.tsx b/src/app/dashboard/tasks/page.tsxnew file mode 100644index 0000000..7c7a81a--- /dev/null+++ b/src/app/dashboard/tasks/page.tsx@@ -0,0 +1,21 @@+import TasksPageClient from "./TasksPageClient";+import { getAllActivityTypes } from "@/actions/activity.actions";+import { getActivityTypesWithTaskCounts } from "@/actions/task.actions";+import React from "react";++async function Tasks() {+ const [activityTypes, activityTypesWithCounts] = await Promise.all([+ getAllActivityTypes(),+ getActivityTypesWithTaskCounts(),+ ]);++ return (+ <TasksPageClient+ activityTypes={activityTypes || []}+ activityTypesWithCounts={activityTypesWithCounts?.data || []}+ totalTasks={activityTypesWithCounts?.totalTasks || 0}+ />+ );+}++export default Tasks;diff --git a/src/components/Header.tsx b/src/components/Header.tsxindex 7659443..4f36407 100644--- a/src/components/Header.tsx+++ b/src/components/Header.tsx@@ -21,6 +21,7 @@ import {Sheet,SheetClose,SheetContent,+ SheetTitle,SheetTrigger,} from "@/components/ui/sheet";import { SIDEBAR_LINKS } from "@/lib/constants";@@ -42,6 +43,7 @@ async function Header() {</Button></SheetTrigger><SheetContent side="left" className="sm:max-w-xs">+ <SheetTitle className="sr-only">Navigation Menu</SheetTitle><nav className="grid gap-6 text-lg font-medium"><SheetClose asChild><Linkdiff --git a/src/components/Select.tsx b/src/components/Select.tsxindex fd9a37e..695a547 100644--- a/src/components/Select.tsx+++ b/src/components/Select.tsx@@ -9,12 +9,11 @@ import {} from "./ui/select";import { FormControl } from "./ui/form";import { ControllerRenderProps } from "react-hook-form";-import { JobForm } from "@/models/job.model";interface SelectProps {label: string;options: any[];- field: ControllerRenderProps<JobForm, any>;+ field: ControllerRenderProps<any, any>;}function SelectFormCtrl({ label, options, field }: SelectProps) {diff --git a/src/components/activities/ActivitiesTable.tsx b/src/components/activities/ActivitiesTable.tsxindex 770a897..cf5961d 100644--- a/src/components/activities/ActivitiesTable.tsx+++ b/src/components/activities/ActivitiesTable.tsx@@ -76,7 +76,7 @@ function ActivitiesTable({<TableRow><TableHead className="hidden md:table-cell">Date</TableHead><TableHead>Activity</TableHead>- <TableHead>Activity Type</TableHead>+ <TableHead>Project(Activity Type)</TableHead><TableHead className="hidden md:table-cell">Start Time</TableHead><TableHead className="hidden md:table-cell">End Time</TableHead><TableHead>Duration</TableHead>diff --git a/src/components/tasks/TaskForm.tsx b/src/components/tasks/TaskForm.tsxnew file mode 100644index 0000000..a0b1c11--- /dev/null+++ b/src/components/tasks/TaskForm.tsx@@ -0,0 +1,332 @@+"use client";+import {+ Dialog,+ DialogContent,+ DialogHeader,+ DialogOverlay,+ DialogTitle,+ DialogFooter,+} from "@/components/ui/dialog";+import { createTask, updateTask } from "@/actions/task.actions";+import { Loader, PlusCircle } from "lucide-react";+import { Button } from "../ui/button";+import { useForm } from "react-hook-form";+import { useEffect, useTransition } from "react";+import { AddTaskFormSchema } from "@/models/addTaskForm.schema";+import { zodResolver } from "@hookform/resolvers/zod";+import { Task, TASK_STATUSES, TaskStatus } from "@/models/task.model";+import { z } from "zod";+import { toast } from "../ui/use-toast";+import {+ Form,+ FormControl,+ FormField,+ FormItem,+ FormLabel,+ FormMessage,+} from "../ui/form";+import SelectFormCtrl from "../Select";+import { DatePicker } from "../DatePicker";+import TiptapEditor from "../TiptapEditor";+import { Input } from "../ui/input";+import { Combobox } from "../ComboBox";+import { Slider } from "../ui/slider";+import { ActivityType } from "@/models/activity.model";++type TaskFormProps = {+ activityTypes: ActivityType[];+ editTask?: Task | null;+ resetEditTask: () => void;+ onTaskSaved: () => void;+ dialogOpen: boolean;+ setDialogOpen: (open: boolean) => void;+};++const statusOptions = Object.entries(TASK_STATUSES).map(([value, label]) => ({+ id: value,+ label,+ value,+}));++export function TaskForm({+ activityTypes,+ editTask,+ resetEditTask,+ onTaskSaved,+ dialogOpen,+ setDialogOpen,+}: TaskFormProps) {+ const [isPending, startTransition] = useTransition();+ const form = useForm<z.infer<typeof AddTaskFormSchema>>({+ resolver: zodResolver(AddTaskFormSchema),+ defaultValues: {+ title: "",+ description: "",+ status: "in-progress" as TaskStatus,+ priority: 5,+ percentComplete: 0,+ dueDate: undefined,+ activityTypeId: undefined,+ },+ });++ const { reset, watch } = form;++ const priorityValue = watch("priority");+ const percentCompleteValue = watch("percentComplete");++ useEffect(() => {+ if (editTask) {+ reset({+ id: editTask.id,+ userId: editTask.userId,+ title: editTask.title,+ description: editTask.description || "",+ status: editTask.status,+ priority: editTask.priority,+ percentComplete: editTask.percentComplete,+ dueDate: editTask.dueDate ? new Date(editTask.dueDate) : undefined,+ activityTypeId: editTask.activityTypeId || undefined,+ });+ } else {+ reset({+ title: "",+ description: "",+ status: "in-progress",+ priority: 5,+ percentComplete: 0,+ dueDate: undefined,+ activityTypeId: undefined,+ });+ }+ }, [editTask, reset]);++ function onSubmit(data: z.infer<typeof AddTaskFormSchema>) {+ startTransition(async () => {+ const { success, message } = editTask+ ? await updateTask(data)+ : await createTask(data);++ if (success) {+ toast({+ variant: "success",+ description: `Task has been ${editTask ? "updated" : "created"} successfully`,+ });+ reset();+ setDialogOpen(false);+ resetEditTask();+ onTaskSaved();+ } else {+ toast({+ variant: "destructive",+ title: "Error!",+ description: message,+ });+ }+ });+ }++ const pageTitle = editTask ? "Edit Task" : "Add Task";++ const closeDialog = () => {+ reset();+ resetEditTask();+ setDialogOpen(false);+ };++ return (+ <Dialog open={dialogOpen} onOpenChange={setDialogOpen}>+ <DialogOverlay>+ <DialogContent className="sm:max-w-[725px] max-h-[90vh] overflow-y-auto">+ <DialogHeader>+ <DialogTitle data-testid="task-form-dialog-title">+ {pageTitle}+ </DialogTitle>+ </DialogHeader>+ <Form {...form}>+ <form+ onSubmit={form.handleSubmit(onSubmit)}+ className="grid grid-cols-1 md:grid-cols-2 gap-4 p-4"+ >+ {/* Title */}+ <div className="md:col-span-2">+ <FormField+ control={form.control}+ name="title"+ render={({ field }) => (+ <FormItem className="flex flex-col">+ <FormLabel>Title *</FormLabel>+ <FormControl>+ <Input+ placeholder="Enter task title"+ {...field}+ />+ </FormControl>+ <FormMessage />+ </FormItem>+ )}+ />+ </div>++ {/* Activity Type */}+ <div>+ <FormField+ control={form.control}+ name="activityTypeId"+ render={({ field }) => (+ <FormItem className="flex flex-col">+ <FormLabel>Activity Type</FormLabel>+ <FormControl>+ <Combobox+ options={activityTypes}+ field={{+ ...field,+ name: "activityType",+ }}+ creatable+ />+ </FormControl>+ <FormMessage />+ </FormItem>+ )}+ />+ </div>++ {/* Status */}+ <div>+ <FormField+ control={form.control}+ name="status"+ render={({ field }) => (+ <FormItem className="flex flex-col [&>button]:capitalize">+ <FormLabel>Status</FormLabel>+ <SelectFormCtrl+ label="Task Status"+ options={statusOptions}+ field={field}+ />+ <FormMessage />+ </FormItem>+ )}+ />+ </div>++ {/* Priority */}+ <div>+ <FormField+ control={form.control}+ name="priority"+ render={({ field }) => (+ <FormItem className="flex flex-col">+ <FormLabel>Priority: {priorityValue}</FormLabel>+ <FormControl>+ <Slider+ min={0}+ max={10}+ step={1}+ value={[field.value]}+ onValueChange={(value) => field.onChange(value[0])}+ className="mt-2"+ />+ </FormControl>+ <div className="flex justify-between text-xs text-muted-foreground">+ <span>Low (0)</span>+ <span>High (10)</span>+ </div>+ <FormMessage />+ </FormItem>+ )}+ />+ </div>++ {/* Percent Complete */}+ <div>+ <FormField+ control={form.control}+ name="percentComplete"+ render={({ field }) => (+ <FormItem className="flex flex-col">+ <FormLabel>% Complete: {percentCompleteValue}%</FormLabel>+ <FormControl>+ <Slider+ min={0}+ max={100}+ step={5}+ value={[field.value]}+ onValueChange={(value) => field.onChange(value[0])}+ className="mt-2"+ />+ </FormControl>+ <div className="flex justify-between text-xs text-muted-foreground">+ <span>0%</span>+ <span>100%</span>+ </div>+ <FormMessage />+ </FormItem>+ )}+ />+ </div>++ {/* Due Date */}+ <div className="md:col-span-2">+ <FormField+ control={form.control}+ name="dueDate"+ render={({ field }) => (+ <FormItem className="flex flex-col">+ <FormLabel>Due Date</FormLabel>+ <DatePicker+ field={field}+ presets={true}+ isEnabled={true}+ />+ <FormMessage />+ </FormItem>+ )}+ />+ </div>++ {/* Description */}+ <div className="md:col-span-2">+ <FormField+ control={form.control}+ name="description"+ render={({ field }) => (+ <FormItem className="flex flex-col">+ <FormLabel>Description</FormLabel>+ <FormControl>+ <TiptapEditor field={field} />+ </FormControl>+ <FormMessage />+ </FormItem>+ )}+ />+ </div>++ <div className="md:col-span-2">+ <DialogFooter>+ <div>+ <Button+ type="reset"+ variant="outline"+ className="mt-2 md:mt-0 w-full"+ onClick={closeDialog}+ >+ Cancel+ </Button>+ </div>+ <Button type="submit" data-testid="save-task-btn">+ Save+ {isPending && (+ <Loader className="h-4 w-4 shrink-0 spinner ml-2" />+ )}+ </Button>+ </DialogFooter>+ </div>+ </form>+ </Form>+ </DialogContent>+ </DialogOverlay>+ </Dialog>+ );+}diff --git a/src/components/tasks/TasksContainer.tsx b/src/components/tasks/TasksContainer.tsxnew file mode 100644index 0000000..5d8299e--- /dev/null+++ b/src/components/tasks/TasksContainer.tsx@@ -0,0 +1,318 @@+"use client";+import { useCallback, useEffect, useState } from "react";+import {+ Card,+ CardContent,+ CardFooter,+ CardHeader,+ CardTitle,+} from "../ui/card";+import { Button } from "../ui/button";+import { ListFilter, PlusCircle, Filter } from "lucide-react";+import {+ deleteTaskById,+ getTaskById,+ getTasksList,+ updateTaskStatus,+ startActivityFromTask,+} from "@/actions/task.actions";+import { toast } from "../ui/use-toast";+import { Task, TaskStatus, TASK_STATUSES } from "@/models/task.model";+import {+ Select,+ SelectContent,+ SelectGroup,+ SelectItem,+ SelectLabel,+ SelectSeparator,+ SelectTrigger,+ SelectValue,+} from "../ui/select";+import {+ DropdownMenu,+ DropdownMenuCheckboxItem,+ DropdownMenuContent,+ DropdownMenuLabel,+ DropdownMenuSeparator,+ DropdownMenuTrigger,+} from "../ui/dropdown-menu";+import { APP_CONSTANTS } from "@/lib/constants";+import Loading from "../Loading";+import { useRouter } from "next/navigation";+import TasksTable from "./TasksTable";+import { TaskForm } from "./TaskForm";+import { ActivityType } from "@/models/activity.model";++type TasksContainerProps = {+ activityTypes: ActivityType[];+ filterKey?: string;+ onFilterChange?: (filter: string | undefined) => void;+};++const DEFAULT_STATUS_FILTER: TaskStatus[] = ["in-progress", "needs-attention"];++function TasksContainer({+ activityTypes,+ filterKey,+ onFilterChange,+}: TasksContainerProps) {+ const router = useRouter();+ const [tasks, setTasks] = useState<Task[]>([]);+ const [page, setPage] = useState(1);+ const [totalTasks, setTotalTasks] = useState(0);+ const [editTask, setEditTask] = useState<Task | null>(null);+ const [loading, setLoading] = useState(false);+ const [groupBy, setGroupBy] = useState<"none" | "date" | "activityType">(+ "none"+ );+ const [dialogOpen, setDialogOpen] = useState(false);+ const [statusFilter, setStatusFilter] = useState<TaskStatus[]>(+ DEFAULT_STATUS_FILTER+ );++ const tasksPerPage = APP_CONSTANTS.RECORDS_PER_PAGE;++ const loadTasks = useCallback(+ async (pageNum: number, filter?: string, statuses?: TaskStatus[]) => {+ setLoading(true);+ const { success, data, total, message } = await getTasksList(+ pageNum,+ tasksPerPage,+ filter,+ statuses+ );+ if (success && data) {+ setTasks((prev) => (pageNum === 1 ? data : [...prev, ...data]));+ setTotalTasks(total);+ setPage(pageNum);+ setLoading(false);+ } else {+ toast({+ variant: "destructive",+ title: "Error!",+ description: message,+ });+ setLoading(false);+ }+ },+ [tasksPerPage]+ );++ const reloadTasks = useCallback(async () => {+ await loadTasks(1, filterKey, statusFilter);+ }, [loadTasks, filterKey, statusFilter]);++ const onDeleteTask = async (taskId: string) => {+ const { success, message } = await deleteTaskById(taskId);+ if (success) {+ toast({+ variant: "success",+ description: "Task has been deleted successfully",+ });+ reloadTasks();+ } else {+ toast({+ variant: "destructive",+ title: "Error!",+ description: message,+ });+ }+ };++ const onEditTask = async (taskId: string) => {+ const { data, success, message } = await getTaskById(taskId);+ if (!success) {+ toast({+ variant: "destructive",+ title: "Error!",+ description: message,+ });+ return;+ }+ setEditTask(data);+ setDialogOpen(true);+ };++ const addTaskForm = () => {+ resetEditTask();+ setDialogOpen(true);+ };++ const onChangeTaskStatus = async (taskId: string, status: TaskStatus) => {+ const originalTasks = [...tasks];+ setTasks((prev) =>+ prev.map((task) => (task.id === taskId ? { ...task, status } : task))+ );++ const { success, message } = await updateTaskStatus(taskId, status);+ if (success) {+ toast({+ variant: "success",+ description: "Task status updated successfully",+ });+ } else {+ setTasks(originalTasks);+ toast({+ variant: "destructive",+ title: "Error!",+ description: message,+ });+ }+ };++ const onStartActivity = async (taskId: string) => {+ const { success, message } = await startActivityFromTask(taskId);+ if (success) {+ toast({+ variant: "success",+ description: "Activity started from task",+ });+ router.push("/dashboard/activities");+ } else {+ toast({+ variant: "destructive",+ title: "Error!",+ description: message,+ });+ }+ };++ const resetEditTask = () => {+ setEditTask(null);+ };++ useEffect(() => {+ (async () => await loadTasks(1, filterKey, statusFilter))();+ }, [loadTasks, filterKey, statusFilter]);++ const onGroupByChange = (value: string) => {+ setGroupBy(value as "none" | "date" | "activityType");+ };++ const toggleStatusFilter = (status: TaskStatus) => {+ setStatusFilter((prev) =>+ prev.includes(status)+ ? prev.filter((s) => s !== status)+ : [...prev, status]+ );+ };++ return (+ <>+ <Card x-chunk="dashboard-tasks-chunk-0">+ <CardHeader className="flex-row justify-between items-center">+ <CardTitle>My Tasks</CardTitle>+ <div className="flex items-center">+ <div className="ml-auto flex items-center gap-2">+ <DropdownMenu>+ <DropdownMenuTrigger asChild>+ <Button variant="outline" size="sm" className="h-8 gap-1">+ <Filter className="h-3.5 w-3.5" />+ <span className="sr-only sm:not-sr-only sm:whitespace-nowrap">+ Status+ </span>+ </Button>+ </DropdownMenuTrigger>+ <DropdownMenuContent align="end">+ <DropdownMenuLabel>Filter by Status</DropdownMenuLabel>+ <DropdownMenuSeparator />+ {(Object.keys(TASK_STATUSES) as TaskStatus[]).map(+ (status) => (+ <DropdownMenuCheckboxItem+ key={status}+ checked={statusFilter.includes(status)}+ onCheckedChange={() => toggleStatusFilter(status)}+ >+ {TASK_STATUSES[status]}+ </DropdownMenuCheckboxItem>+ )+ )}+ </DropdownMenuContent>+ </DropdownMenu>+ <Select value={groupBy} onValueChange={onGroupByChange}>+ <SelectTrigger className="w-[140px] h-8">+ <ListFilter className="h-3.5 w-3.5" />+ <SelectValue placeholder="Group by" />+ </SelectTrigger>+ <SelectContent>+ <SelectGroup>+ <SelectLabel>Group by</SelectLabel>+ <SelectSeparator />+ <SelectItem value="none">None</SelectItem>+ <SelectItem value="date">Due Date</SelectItem>+ <SelectItem value="activityType">Activity Type</SelectItem>+ </SelectGroup>+ </SelectContent>+ </Select>+ <Button+ size="sm"+ variant="outline"+ className="h-8 gap-1"+ onClick={addTaskForm}+ data-testid="add-task-btn"+ >+ <PlusCircle className="h-3.5 w-3.5" />+ <span className="sr-only sm:not-sr-only sm:whitespace-nowrap">+ Add Task+ </span>+ </Button>+ </div>+ </div>+ </CardHeader>+ <CardContent>+ {loading && <Loading />}+ {!loading && tasks.length > 0 && (+ <>+ <TasksTable+ tasks={tasks}+ deleteTask={onDeleteTask}+ editTask={onEditTask}+ onChangeTaskStatus={onChangeTaskStatus}+ onStartActivity={onStartActivity}+ groupBy={groupBy}+ />+ <div className="text-xs text-muted-foreground mt-4">+ Showing{" "}+ <strong>+ {1} to {tasks.length}+ </strong>{" "}+ of+ <strong> {totalTasks}</strong> tasks+ </div>+ </>+ )}+ {!loading && tasks.length === 0 && (+ <div className="text-center py-8 text-muted-foreground">+ No tasks found. Create your first task to get started.+ </div>+ )}+ {tasks.length < totalTasks && (+ <div className="flex justify-center p-4">+ <Button+ size="sm"+ variant="outline"+ onClick={() => loadTasks(page + 1, filterKey, statusFilter)}+ disabled={loading}+ className="btn btn-primary"+ >+ {loading ? "Loading..." : "Load More"}+ </Button>+ </div>+ )}+ </CardContent>+ <CardFooter></CardFooter>+ </Card>+ <TaskForm+ activityTypes={activityTypes}+ editTask={editTask}+ resetEditTask={resetEditTask}+ onTaskSaved={reloadTasks}+ dialogOpen={dialogOpen}+ setDialogOpen={setDialogOpen}+ />+ </>+ );+}++export default TasksContainer;+export type { TasksContainerProps };diff --git a/src/components/tasks/TasksSidebar.tsx b/src/components/tasks/TasksSidebar.tsxnew file mode 100644index 0000000..d91324a--- /dev/null+++ b/src/components/tasks/TasksSidebar.tsx@@ -0,0 +1,65 @@+"use client";+import { cn } from "@/lib/utils";++type ActivityTypeWithCount = {+ id: string;+ label: string;+ value: string;+ taskCount: number;+};++type TasksSidebarProps = {+ activityTypes: ActivityTypeWithCount[];+ totalTasks: number;+ selectedFilter?: string;+ onFilterChange: (filter: string | undefined) => void;+};++function TasksSidebar({+ activityTypes,+ totalTasks,+ selectedFilter,+ onFilterChange,+}: TasksSidebarProps) {+ return (+ <div className="w-48 border-r p-4 hidden md:block">+ <h3 className="font-semibold mb-4 text-sm">Activity Types</h3>+ <ul className="space-y-1">+ <li>+ <button+ onClick={() => onFilterChange(undefined)}+ className={cn(+ "w-full text-left px-3 py-2 rounded-md text-sm transition-colors",+ "hover:bg-accent hover:text-accent-foreground",+ !selectedFilter && "bg-accent text-accent-foreground font-medium"+ )}+ >+ <span className="flex justify-between items-center">+ <span>All</span>+ <span className="text-muted-foreground text-xs">{totalTasks}</span>+ </span>+ </button>+ </li>+ {activityTypes.map((type) => (+ <li key={type.id}>+ <button+ onClick={() => onFilterChange(type.id)}+ className={cn(+ "w-full text-left px-3 py-2 rounded-md text-sm transition-colors",+ "hover:bg-accent hover:text-accent-foreground",+ selectedFilter === type.id && "bg-accent text-accent-foreground font-medium"+ )}+ >+ <span className="flex justify-between items-center">+ <span className="truncate">{type.label}</span>+ <span className="text-muted-foreground text-xs">{type.taskCount}</span>+ </span>+ </button>+ </li>+ ))}+ </ul>+ </div>+ );+}++export default TasksSidebar;diff --git a/src/components/tasks/TasksTable.tsx b/src/components/tasks/TasksTable.tsxnew file mode 100644index 0000000..8ff1f2f--- /dev/null+++ b/src/components/tasks/TasksTable.tsx@@ -0,0 +1,375 @@+"use client";+import {+ Table,+ TableBody,+ TableCell,+ TableHead,+ TableHeader,+ TableRow,+} from "../ui/table";+import { MoreHorizontal, Pencil, Tags, Trash, CirclePlay, Check } from "lucide-react";+import { cn } from "@/lib/utils";+import { Badge } from "../ui/badge";+import { format, isToday, isTomorrow, isPast, isThisWeek } from "date-fns";+import {+ DropdownMenu,+ DropdownMenuContent,+ DropdownMenuGroup,+ DropdownMenuItem,+ DropdownMenuLabel,+ DropdownMenuPortal,+ DropdownMenuSeparator,+ DropdownMenuSub,+ DropdownMenuSubContent,+ DropdownMenuSubTrigger,+ DropdownMenuTrigger,+} from "../ui/dropdown-menu";+import { Button } from "../ui/button";+import { useState } from "react";+import { Task, TASK_STATUSES, TaskStatus } from "@/models/task.model";+import { DeleteAlertDialog } from "../DeleteAlertDialog";++type TasksTableProps = {+ tasks: Task[];+ deleteTask: (id: string) => void;+ editTask: (id: string) => void;+ onChangeTaskStatus: (id: string, status: TaskStatus) => void;+ onStartActivity: (id: string) => void;+ groupBy?: "none" | "date" | "activityType";+};++const statusColors: Record<TaskStatus, string> = {+ "in-progress": "bg-blue-500",+ complete: "bg-green-500",+ "needs-attention": "bg-orange-500",+ cancelled: "bg-gray-500",+};++type DateGroup =+ | "Overdue"+ | "Today"+ | "Tomorrow"+ | "This Week"+ | "Later"+ | "No Due Date";++function getDateGroup(dueDate: Date | null | undefined): DateGroup {+ if (!dueDate) return "No Due Date";+ const date = new Date(dueDate);+ if (isPast(date) && !isToday(date)) return "Overdue";+ if (isToday(date)) return "Today";+ if (isTomorrow(date)) return "Tomorrow";+ if (isThisWeek(date)) return "This Week";+ return "Later";+}++function groupTasksByDate(tasks: Task[]): Record<DateGroup, Task[]> {+ const groups: Record<DateGroup, Task[]> = {+ Overdue: [],+ Today: [],+ Tomorrow: [],+ "This Week": [],+ Later: [],+ "No Due Date": [],+ };++ tasks.forEach((task) => {+ const group = getDateGroup(task.dueDate);+ groups[group].push(task);+ });++ return groups;+}++function groupTasksByActivityType(tasks: Task[]): Record<string, Task[]> {+ const groups: Record<string, Task[]> = {};++ tasks.forEach((task) => {+ const key = task.activityType?.label || "No Activity Type";+ if (!groups[key]) {+ groups[key] = [];+ }+ groups[key].push(task);+ });++ return groups;+}++function TasksTable({+ tasks,+ deleteTask,+ editTask,+ onChangeTaskStatus,+ onStartActivity,+ groupBy = "none",+}: TasksTableProps) {+ const [alertOpen, setAlertOpen] = useState(false);+ const [taskIdToDelete, setTaskIdToDelete] = useState("");++ const onDeleteTask = (taskId: string) => {+ setAlertOpen(true);+ setTaskIdToDelete(taskId);+ };++ const renderTaskRow = (task: Task) => (+ <TableRow+ key={task.id}+ className={cn("group relative", task.status === "complete" && "opacity-60")}+ >+ <TableCell className="w-[24px] pl-1">+ <button+ onClick={() =>+ onChangeTaskStatus(+ task.id,+ task.status === "complete" ? "in-progress" : "complete"+ )+ }+ className={cn(+ "h-5 w-5 rounded border flex items-center justify-center transition-colors",+ task.status === "complete"+ ? "bg-green-500 border-green-500 text-white"+ : "border-gray-300 hover:border-gray-400"+ )}+ aria-label={+ task.status === "complete"+ ? "Mark as in progress"+ : "Mark as complete"+ }+ >+ {task.status === "complete" && <Check className="h-3 w-3" />}+ </button>+ </TableCell>+ <TableCell+ className={cn(+ "font-medium",+ task.status === "complete" && "line-through"+ )}+ >+ {task.title}+ </TableCell>+ <TableCell>{task.activityType?.label || "—"}</TableCell>+ <TableCell className="hidden md:table-cell">+ <Badge+ className={cn(+ "min-w-[120px] whitespace-nowrap justify-center",+ statusColors[task.status]+ )}+ >+ {TASK_STATUSES[task.status]}+ </Badge>+ </TableCell>+ <TableCell className="hidden md:table-cell text-center">+ {task.priority}+ </TableCell>+ <TableCell className="hidden md:table-cell text-center">+ {task.percentComplete}%+ </TableCell>+ <TableCell>+ <DropdownMenu>+ <DropdownMenuTrigger asChild>+ <Button+ aria-haspopup="true"+ size="icon"+ variant="ghost"+ data-testid="task-actions-menu-btn"+ >+ <MoreHorizontal className="h-4 w-4" />+ <span className="sr-only">Toggle menu</span>+ </Button>+ </DropdownMenuTrigger>+ <DropdownMenuContent align="end" className="w-[200px]">+ <DropdownMenuLabel>Actions</DropdownMenuLabel>+ <DropdownMenuGroup>+ <DropdownMenuItem+ className="cursor-pointer"+ onClick={() => editTask(task.id)}+ >+ <Pencil className="mr-2 h-4 w-4" />+ Edit Task+ </DropdownMenuItem>+ <DropdownMenuSeparator />+ <DropdownMenuSub>+ <DropdownMenuSubTrigger>+ <Tags className="mr-2 h-4 w-4" />+ Change Status+ </DropdownMenuSubTrigger>+ <DropdownMenuPortal>+ <DropdownMenuSubContent className="p-0">+ {(Object.keys(TASK_STATUSES) as TaskStatus[]).map(+ (status) => (+ <DropdownMenuItem+ className="cursor-pointer"+ key={status}+ onSelect={() => onChangeTaskStatus(task.id, status)}+ disabled={status === task.status}+ >+ <span>{TASK_STATUSES[status]}</span>+ </DropdownMenuItem>+ )+ )}+ </DropdownMenuSubContent>+ </DropdownMenuPortal>+ </DropdownMenuSub>+ <DropdownMenuSeparator />+ <DropdownMenuItem+ className="cursor-pointer text-green-600"+ onClick={() => onStartActivity(task.id)}+ disabled={!!task.activity}+ >+ <CirclePlay className="mr-2 h-4 w-4" />+ Start Activity+ </DropdownMenuItem>+ <DropdownMenuSeparator />+ <DropdownMenuItem+ className="text-red-600 cursor-pointer"+ onClick={() => onDeleteTask(task.id)}+ >+ <Trash className="mr-2 h-4 w-4" />+ Delete+ </DropdownMenuItem>+ </DropdownMenuGroup>+ </DropdownMenuContent>+ </DropdownMenu>+ </TableCell>+ <TableCell>+ {!task.activity && (+ <Button+ title="Start Activity"+ aria-haspopup="true"+ size="icon"+ variant="ghost"+ onClick={() => onStartActivity(task.id)}+ data-testid="task-start-activity-btn"+ className="opacity-0 group-hover:opacity-100 group-hover:pointer-events-auto transition-opacity duration-300"+ >+ <span>+ <CirclePlay className="text-green-600" />+ </span>+ </Button>+ )}+ </TableCell>+ </TableRow>+ );++ const renderTableHeader = () => (+ <TableHeader>+ <TableRow>+ <TableHead className="w-[24px] pl-1">+ <span className="sr-only">Complete</span>+ </TableHead>+ <TableHead>Title</TableHead>+ <TableHead>Activity Type</TableHead>+ <TableHead className="hidden md:table-cell">Status</TableHead>+ <TableHead className="hidden md:table-cell text-center">+ Priority+ </TableHead>+ <TableHead className="hidden md:table-cell text-center">+ % Complete+ </TableHead>+ <TableHead>+ <span className="sr-only">Actions</span>+ </TableHead>+ <TableHead>+ <span className="sr-only">Start Activity</span>+ </TableHead>+ </TableRow>+ </TableHeader>+ );++ if (tasks.length === 0) {+ return (+ <div className="text-center py-8 text-muted-foreground">+ No tasks found. Create your first task to get started.+ </div>+ );+ }++ if (groupBy === "date") {+ const groupedTasks = groupTasksByDate(tasks);+ const groupOrder: DateGroup[] = [+ "Overdue",+ "Today",+ "Tomorrow",+ "This Week",+ "Later",+ "No Due Date",+ ];++ return (+ <>+ {groupOrder.map((group) => {+ const groupTasks = groupedTasks[group];+ if (groupTasks.length === 0) return null;++ return (+ <div key={group} className="mb-6">+ <h3+ className={cn(+ "text-sm font-semibold mb-2 px-2 py-1",+ group === "Overdue",+ group === "Today",+ group === "Tomorrow"+ )}+ >+ {group} ({groupTasks.length})+ </h3>+ <Table>+ {renderTableHeader()}+ <TableBody>{groupTasks.map(renderTaskRow)}</TableBody>+ </Table>+ </div>+ );+ })}+ <DeleteAlertDialog+ pageTitle="task"+ open={alertOpen}+ onOpenChange={setAlertOpen}+ onDelete={() => deleteTask(taskIdToDelete)}+ />+ </>+ );+ }++ if (groupBy === "activityType") {+ const groupedTasks = groupTasksByActivityType(tasks);++ return (+ <>+ {Object.entries(groupedTasks).map(([activityType, groupTasks]) => (+ <div key={activityType} className="mb-6">+ <h3 className="text-sm font-semibold mb-2 px-2 py-1">+ {activityType} ({groupTasks.length})+ </h3>+ <Table>+ {renderTableHeader()}+ <TableBody>{groupTasks.map(renderTaskRow)}</TableBody>+ </Table>+ </div>+ ))}+ <DeleteAlertDialog+ pageTitle="task"+ open={alertOpen}+ onOpenChange={setAlertOpen}+ onDelete={() => deleteTask(taskIdToDelete)}+ />+ </>+ );+ }++ return (+ <>+ <Table>+ {renderTableHeader()}+ <TableBody>{tasks.map(renderTaskRow)}</TableBody>+ </Table>+ <DeleteAlertDialog+ pageTitle="task"+ open={alertOpen}+ onOpenChange={setAlertOpen}+ onDelete={() => deleteTask(taskIdToDelete)}+ />+ </>+ );+}++export default TasksTable;diff --git a/src/components/ui/slider.tsx b/src/components/ui/slider.tsxnew file mode 100644index 0000000..c31c2b3--- /dev/null+++ b/src/components/ui/slider.tsx@@ -0,0 +1,28 @@+"use client"++import * as React from "react"+import * as SliderPrimitive from "@radix-ui/react-slider"++import { cn } from "@/lib/utils"++const Slider = React.forwardRef<+ React.ElementRef<typeof SliderPrimitive.Root>,+ React.ComponentPropsWithoutRef<typeof SliderPrimitive.Root>+>(({ className, ...props }, ref) => (+ <SliderPrimitive.Root+ ref={ref}+ className={cn(+ "relative flex w-full touch-none select-none items-center",+ className+ )}+ {...props}+ >+ <SliderPrimitive.Track className="relative h-2 w-full grow overflow-hidden rounded-full bg-secondary">+ <SliderPrimitive.Range className="absolute h-full bg-primary" />+ </SliderPrimitive.Track>+ <SliderPrimitive.Thumb className="block h-5 w-5 rounded-full border-2 border-primary bg-background ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50" />+ </SliderPrimitive.Root>+))+Slider.displayName = SliderPrimitive.Root.displayName++export { Slider }diff --git a/src/lib/constants.ts b/src/lib/constants.tsindex e694b7d..5384734 100644--- a/src/lib/constants.ts+++ b/src/lib/constants.ts@@ -1,5 +1,6 @@import {LayoutDashboard,+ SquareCheckBig,BriefcaseBusiness,CalendarClock,UserRound,@@ -23,6 +24,11 @@ export const SIDEBAR_LINKS = [route: "/dashboard/myjobs",label: "My Jobs",},+ {+ icon: SquareCheckBig,+ route: "/dashboard/tasks",+ label: "Tasks",+ },{icon: CalendarClock,route: "/dashboard/activities",diff --git a/src/models/activity.model.ts b/src/models/activity.model.tsindex 63de0e1..1583bc3 100644--- a/src/models/activity.model.ts+++ b/src/models/activity.model.ts@@ -19,4 +19,5 @@ export interface Activity {endTime?: Date;duration?: number;description?: string;+ taskId?: string | null;}diff --git a/src/models/addTaskForm.schema.ts b/src/models/addTaskForm.schema.tsnew file mode 100644index 0000000..8741986--- /dev/null+++ b/src/models/addTaskForm.schema.ts@@ -0,0 +1,31 @@+import { z } from "zod";++export const AddTaskFormSchema = z.object({+ id: z.string().optional(),+ userId: z.string().optional(),+ title: z+ .string({ required_error: "Title is required." })+ .min(2, { message: "Title must be at least 2 characters." }),+ description: z+ .string()+ .max(2000, { message: "Description cannot exceed 2000 characters." })+ .optional()+ .nullable(),+ status: z.enum(["in-progress", "complete", "needs-attention", "cancelled"]),+ priority: z.number().min(0).max(10),+ percentComplete: z.number().min(0).max(100),+ dueDate: z+ .date()+ .optional()+ .nullable()+ .refine(+ (date) => {+ if (!date) return true;+ const today = new Date();+ today.setHours(0, 0, 0, 0);+ return date >= today;+ },+ { message: "Due date cannot be in the past." }+ ),+ activityTypeId: z.string().optional().nullable(),+});diff --git a/src/models/task.model.ts b/src/models/task.model.tsnew file mode 100644index 0000000..4908880--- /dev/null+++ b/src/models/task.model.ts@@ -0,0 +1,30 @@+import { ActivityType } from "./activity.model";++export const TASK_STATUSES = {+ "in-progress": "In Progress",+ "complete": "Complete",+ "needs-attention": "Needs Attention",+ "cancelled": "Cancelled",+} as const;++export type TaskStatus = keyof typeof TASK_STATUSES;++export interface Task {+ id: string;+ userId: string;+ title: string;+ description?: string | null;+ status: TaskStatus;+ priority: number;+ percentComplete: number;+ dueDate?: Date | null;+ activityTypeId?: string | null;+ activityType?: ActivityType | null;+ activity?: { id: string } | null;+ createdAt: Date;+ updatedAt: Date;+}++export interface TaskWithActivityType extends Task {+ activityType: ActivityType | null;+}