Skip to content

armgit / kaneo

Public Imported from GitHub
0

⚡ Project management that doesn't become the project. Boards, Gantt charts, and GitHub integration. Self-host it or use Kaneo Cloud.

feat: making tasks editable (#97)

Andrej67448aa550e1
diff --git a/apps/api/drizzle/0000_colorful_leech.sql b/apps/api/drizzle/0000_cool_mattie_franklin.sql
similarity index 70%
rename from apps/api/drizzle/0000_colorful_leech.sql
rename to apps/api/drizzle/0000_cool_mattie_franklin.sql
index 1d92caeea..0aa894b91 100644
--- a/apps/api/drizzle/0000_colorful_leech.sql
+++ b/apps/api/drizzle/0000_cool_mattie_franklin.sql
@@ -1,3 +1,14 @@
+CREATE TABLE `activity` (
+ `id` text PRIMARY KEY NOT NULL,
+ `task_id` text NOT NULL,
+ `type` text NOT NULL,
+ `created_at` integer DEFAULT '"2025-02-28T19:33:25.542Z"' NOT NULL,
+ `user_email` text NOT NULL,
+ `content` text,
+ FOREIGN KEY (`task_id`) REFERENCES `task`(`id`) ON UPDATE cascade ON DELETE cascade,
+ FOREIGN KEY (`user_email`) REFERENCES `user`(`email`) ON UPDATE cascade ON DELETE cascade
+);
+--> statement-breakpoint
CREATE TABLE `project` (
`id` text PRIMARY KEY NOT NULL,
`workspace_id` text NOT NULL,
@@ -5,7 +16,7 @@ CREATE TABLE `project` (
`icon` text DEFAULT 'Layout',
`name` text NOT NULL,
`description` text,
- `created_at` integer DEFAULT '"2025-02-18T21:46:28.196Z"' NOT NULL,
+ `created_at` integer DEFAULT '"2025-02-28T19:33:25.542Z"' NOT NULL,
FOREIGN KEY (`workspace_id`) REFERENCES `workspace`(`id`) ON UPDATE cascade ON DELETE cascade
);
--> statement-breakpoint
@@ -26,7 +37,7 @@ CREATE TABLE `task` (
`status` text DEFAULT 'to-do' NOT NULL,
`priority` text DEFAULT 'low',
`due_date` integer,
- `created_at` integer DEFAULT '"2025-02-18T21:46:28.196Z"' NOT NULL,
+ `created_at` integer DEFAULT '"2025-02-28T19:33:25.542Z"' NOT NULL,
FOREIGN KEY (`project_id`) REFERENCES `project`(`id`) ON UPDATE cascade ON DELETE cascade,
FOREIGN KEY (`assignee_email`) REFERENCES `user`(`email`) ON UPDATE cascade ON DELETE cascade
);
@@ -36,7 +47,7 @@ CREATE TABLE `user` (
`name` text NOT NULL,
`password` text NOT NULL,
`email` text NOT NULL,
- `created_at` integer DEFAULT '"2025-02-18T21:46:28.196Z"' NOT NULL
+ `created_at` integer DEFAULT '"2025-02-28T19:33:25.541Z"' NOT NULL
);
--> statement-breakpoint
CREATE UNIQUE INDEX `user_email_unique` ON `user` (`email`);--> statement-breakpoint
@@ -45,7 +56,7 @@ CREATE TABLE `workspace` (
`name` text NOT NULL,
`description` text,
`owner_email` text NOT NULL,
- `created_at` integer DEFAULT '"2025-02-18T21:46:28.196Z"' NOT NULL,
+ `created_at` integer DEFAULT '"2025-02-28T19:33:25.542Z"' NOT NULL,
FOREIGN KEY (`owner_email`) REFERENCES `user`(`email`) ON UPDATE cascade ON DELETE cascade
);
--> statement-breakpoint
@@ -54,8 +65,8 @@ CREATE TABLE `workspace_member` (
`workspace_id` text NOT NULL,
`user_email` text NOT NULL,
`role` text DEFAULT 'member' NOT NULL,
- `joined_at` integer DEFAULT '"2025-02-18T21:46:28.196Z"' NOT NULL,
- `status` text DEFAULT 'active' NOT NULL,
+ `joined_at` integer DEFAULT '"2025-02-28T19:33:25.542Z"' NOT NULL,
+ `status` text DEFAULT 'pending' NOT NULL,
FOREIGN KEY (`workspace_id`) REFERENCES `workspace`(`id`) ON UPDATE cascade ON DELETE cascade,
FOREIGN KEY (`user_email`) REFERENCES `user`(`email`) ON UPDATE cascade ON DELETE cascade
);
diff --git a/apps/api/drizzle/0001_sparkling_jane_foster.sql b/apps/api/drizzle/0001_sparkling_jane_foster.sql
deleted file mode 100644
index 8688f5707..000000000
--- a/apps/api/drizzle/0001_sparkling_jane_foster.sql
+++ /dev/null
@@ -1,72 +0,0 @@
-PRAGMA foreign_keys=OFF;--> statement-breakpoint
-CREATE TABLE `__new_project` (
- `id` text PRIMARY KEY NOT NULL,
- `workspace_id` text NOT NULL,
- `slug` text NOT NULL,
- `icon` text DEFAULT 'Layout',
- `name` text NOT NULL,
- `description` text,
- `created_at` integer DEFAULT '"2025-02-18T21:46:39.855Z"' NOT NULL,
- FOREIGN KEY (`workspace_id`) REFERENCES `workspace`(`id`) ON UPDATE cascade ON DELETE cascade
-);
---> statement-breakpoint
-INSERT INTO `__new_project`("id", "workspace_id", "slug", "icon", "name", "description", "created_at") SELECT "id", "workspace_id", "slug", "icon", "name", "description", "created_at" FROM `project`;--> statement-breakpoint
-DROP TABLE `project`;--> statement-breakpoint
-ALTER TABLE `__new_project` RENAME TO `project`;--> statement-breakpoint
-PRAGMA foreign_keys=ON;--> statement-breakpoint
-CREATE TABLE `__new_task` (
- `id` text PRIMARY KEY NOT NULL,
- `project_id` text NOT NULL,
- `number` integer DEFAULT 1,
- `assignee_email` text,
- `title` text NOT NULL,
- `description` text,
- `status` text DEFAULT 'to-do' NOT NULL,
- `priority` text DEFAULT 'low',
- `due_date` integer,
- `created_at` integer DEFAULT '"2025-02-18T21:46:39.856Z"' NOT NULL,
- FOREIGN KEY (`project_id`) REFERENCES `project`(`id`) ON UPDATE cascade ON DELETE cascade,
- FOREIGN KEY (`assignee_email`) REFERENCES `user`(`email`) ON UPDATE cascade ON DELETE cascade
-);
---> statement-breakpoint
-INSERT INTO `__new_task`("id", "project_id", "number", "assignee_email", "title", "description", "status", "priority", "due_date", "created_at") SELECT "id", "project_id", "number", "assignee_email", "title", "description", "status", "priority", "due_date", "created_at" FROM `task`;--> statement-breakpoint
-DROP TABLE `task`;--> statement-breakpoint
-ALTER TABLE `__new_task` RENAME TO `task`;--> statement-breakpoint
-CREATE TABLE `__new_user` (
- `id` text PRIMARY KEY NOT NULL,
- `name` text NOT NULL,
- `password` text NOT NULL,
- `email` text NOT NULL,
- `created_at` integer DEFAULT '"2025-02-18T21:46:39.855Z"' NOT NULL
-);
---> statement-breakpoint
-INSERT INTO `__new_user`("id", "name", "password", "email", "created_at") SELECT "id", "name", "password", "email", "created_at" FROM `user`;--> statement-breakpoint
-DROP TABLE `user`;--> statement-breakpoint
-ALTER TABLE `__new_user` RENAME TO `user`;--> statement-breakpoint
-CREATE UNIQUE INDEX `user_email_unique` ON `user` (`email`);--> statement-breakpoint
-CREATE TABLE `__new_workspace` (
- `id` text PRIMARY KEY NOT NULL,
- `name` text NOT NULL,
- `description` text,
- `owner_email` text NOT NULL,
- `created_at` integer DEFAULT '"2025-02-18T21:46:39.855Z"' NOT NULL,
- FOREIGN KEY (`owner_email`) REFERENCES `user`(`email`) ON UPDATE cascade ON DELETE cascade
-);
---> statement-breakpoint
-INSERT INTO `__new_workspace`("id", "name", "description", "owner_email", "created_at") SELECT "id", "name", "description", "owner_email", "created_at" FROM `workspace`;--> statement-breakpoint
-DROP TABLE `workspace`;--> statement-breakpoint
-ALTER TABLE `__new_workspace` RENAME TO `workspace`;--> statement-breakpoint
-CREATE TABLE `__new_workspace_member` (
- `id` text PRIMARY KEY NOT NULL,
- `workspace_id` text NOT NULL,
- `user_email` text NOT NULL,
- `role` text DEFAULT 'member' NOT NULL,
- `joined_at` integer DEFAULT '"2025-02-18T21:46:39.855Z"' NOT NULL,
- `status` text DEFAULT 'active' NOT NULL,
- FOREIGN KEY (`workspace_id`) REFERENCES `workspace`(`id`) ON UPDATE cascade ON DELETE cascade,
- FOREIGN KEY (`user_email`) REFERENCES `user`(`email`) ON UPDATE cascade ON DELETE cascade
-);
---> statement-breakpoint
-INSERT INTO `__new_workspace_member`("id", "workspace_id", "user_email", "role", "joined_at", "status") SELECT "id", "workspace_id", "user_email", "role", "joined_at", "status" FROM `workspace_member`;--> statement-breakpoint
-DROP TABLE `workspace_member`;--> statement-breakpoint
-ALTER TABLE `__new_workspace_member` RENAME TO `workspace_member`;
\ No newline at end of file
diff --git a/apps/api/drizzle/meta/0000_snapshot.json b/apps/api/drizzle/meta/0000_snapshot.json
index 5b1b3e9ed..3adf5eea7 100644
--- a/apps/api/drizzle/meta/0000_snapshot.json
+++ b/apps/api/drizzle/meta/0000_snapshot.json
@@ -1,9 +1,81 @@
{
"version": "6",
"dialect": "sqlite",
- "id": "b293274e-7c85-4fc2-b89c-16dc01c10984",
+ "id": "f146a115-68e7-4707-b858-8d9029a87136",
"prevId": "00000000-0000-0000-0000-000000000000",
"tables": {
+ "activity": {
+ "name": "activity",
+ "columns": {
+ "id": {
+ "name": "id",
+ "type": "text",
+ "primaryKey": true,
+ "notNull": true,
+ "autoincrement": false
+ },
+ "task_id": {
+ "name": "task_id",
+ "type": "text",
+ "primaryKey": false,
+ "notNull": true,
+ "autoincrement": false
+ },
+ "type": {
+ "name": "type",
+ "type": "text",
+ "primaryKey": false,
+ "notNull": true,
+ "autoincrement": false
+ },
+ "created_at": {
+ "name": "created_at",
+ "type": "integer",
+ "primaryKey": false,
+ "notNull": true,
+ "autoincrement": false,
+ "default": "'\"2025-02-28T19:33:25.542Z\"'"
+ },
+ "user_email": {
+ "name": "user_email",
+ "type": "text",
+ "primaryKey": false,
+ "notNull": true,
+ "autoincrement": false
+ },
+ "content": {
+ "name": "content",
+ "type": "text",
+ "primaryKey": false,
+ "notNull": false,
+ "autoincrement": false
+ }
+ },
+ "indexes": {},
+ "foreignKeys": {
+ "activity_task_id_task_id_fk": {
+ "name": "activity_task_id_task_id_fk",
+ "tableFrom": "activity",
+ "tableTo": "task",
+ "columnsFrom": ["task_id"],
+ "columnsTo": ["id"],
+ "onDelete": "cascade",
+ "onUpdate": "cascade"
+ },
+ "activity_user_email_user_email_fk": {
+ "name": "activity_user_email_user_email_fk",
+ "tableFrom": "activity",
+ "tableTo": "user",
+ "columnsFrom": ["user_email"],
+ "columnsTo": ["email"],
+ "onDelete": "cascade",
+ "onUpdate": "cascade"
+ }
+ },
+ "compositePrimaryKeys": {},
+ "uniqueConstraints": {},
+ "checkConstraints": {}
+ },
"project": {
"name": "project",
"columns": {
@@ -56,7 +128,7 @@
"primaryKey": false,
"notNull": true,
"autoincrement": false,
- "default": "'\"2025-02-18T21:46:28.196Z\"'"
+ "default": "'\"2025-02-28T19:33:25.542Z\"'"
}
},
"indexes": {},
@@ -191,7 +263,7 @@
"primaryKey": false,
"notNull": true,
"autoincrement": false,
- "default": "'\"2025-02-18T21:46:28.196Z\"'"
+ "default": "'\"2025-02-28T19:33:25.542Z\"'"
}
},
"indexes": {},
@@ -256,7 +328,7 @@
"primaryKey": false,
"notNull": true,
"autoincrement": false,
- "default": "'\"2025-02-18T21:46:28.196Z\"'"
+ "default": "'\"2025-02-28T19:33:25.541Z\"'"
}
},
"indexes": {
@@ -308,7 +380,7 @@
"primaryKey": false,
"notNull": true,
"autoincrement": false,
- "default": "'\"2025-02-18T21:46:28.196Z\"'"
+ "default": "'\"2025-02-28T19:33:25.542Z\"'"
}
},
"indexes": {},
@@ -365,7 +437,7 @@
"primaryKey": false,
"notNull": true,
"autoincrement": false,
- "default": "'\"2025-02-18T21:46:28.196Z\"'"
+ "default": "'\"2025-02-28T19:33:25.542Z\"'"
},
"status": {
"name": "status",
@@ -373,7 +445,7 @@
"primaryKey": false,
"notNull": true,
"autoincrement": false,
- "default": "'active'"
+ "default": "'pending'"
}
},
"indexes": {},
diff --git a/apps/api/drizzle/meta/0001_snapshot.json b/apps/api/drizzle/meta/0001_snapshot.json
deleted file mode 100644
index 377c4ed91..000000000
--- a/apps/api/drizzle/meta/0001_snapshot.json
+++ /dev/null
@@ -1,415 +0,0 @@
-{
- "version": "6",
- "dialect": "sqlite",
- "id": "6058e5ae-5394-46de-b3a1-edd4f121bb0d",
- "prevId": "b293274e-7c85-4fc2-b89c-16dc01c10984",
- "tables": {
- "project": {
- "name": "project",
- "columns": {
- "id": {
- "name": "id",
- "type": "text",
- "primaryKey": true,
- "notNull": true,
- "autoincrement": false
- },
- "workspace_id": {
- "name": "workspace_id",
- "type": "text",
- "primaryKey": false,
- "notNull": true,
- "autoincrement": false
- },
- "slug": {
- "name": "slug",
- "type": "text",
- "primaryKey": false,
- "notNull": true,
- "autoincrement": false
- },
- "icon": {
- "name": "icon",
- "type": "text",
- "primaryKey": false,
- "notNull": false,
- "autoincrement": false,
- "default": "'Layout'"
- },
- "name": {
- "name": "name",
- "type": "text",
- "primaryKey": false,
- "notNull": true,
- "autoincrement": false
- },
- "description": {
- "name": "description",
- "type": "text",
- "primaryKey": false,
- "notNull": false,
- "autoincrement": false
- },
- "created_at": {
- "name": "created_at",
- "type": "integer",
- "primaryKey": false,
- "notNull": true,
- "autoincrement": false,
- "default": "'\"2025-02-18T21:46:39.855Z\"'"
- }
- },
- "indexes": {},
- "foreignKeys": {
- "project_workspace_id_workspace_id_fk": {
- "name": "project_workspace_id_workspace_id_fk",
- "tableFrom": "project",
- "tableTo": "workspace",
- "columnsFrom": ["workspace_id"],
- "columnsTo": ["id"],
- "onDelete": "cascade",
- "onUpdate": "cascade"
- }
- },
- "compositePrimaryKeys": {},
- "uniqueConstraints": {},
- "checkConstraints": {}
- },
- "session": {
- "name": "session",
- "columns": {
- "id": {
- "name": "id",
- "type": "text",
- "primaryKey": true,
- "notNull": true,
- "autoincrement": false
- },
- "user_id": {
- "name": "user_id",
- "type": "text",
- "primaryKey": false,
- "notNull": true,
- "autoincrement": false
- },
- "expires_at": {
- "name": "expires_at",
- "type": "integer",
- "primaryKey": false,
- "notNull": true,
- "autoincrement": false
- }
- },
- "indexes": {},
- "foreignKeys": {
- "session_user_id_user_id_fk": {
- "name": "session_user_id_user_id_fk",
- "tableFrom": "session",
- "tableTo": "user",
- "columnsFrom": ["user_id"],
- "columnsTo": ["id"],
- "onDelete": "cascade",
- "onUpdate": "cascade"
- }
- },
- "compositePrimaryKeys": {},
- "uniqueConstraints": {},
- "checkConstraints": {}
- },
- "task": {
- "name": "task",
- "columns": {
- "id": {
- "name": "id",
- "type": "text",
- "primaryKey": true,
- "notNull": true,
- "autoincrement": false
- },
- "project_id": {
- "name": "project_id",
- "type": "text",
- "primaryKey": false,
- "notNull": true,
- "autoincrement": false
- },
- "number": {
- "name": "number",
- "type": "integer",
- "primaryKey": false,
- "notNull": false,
- "autoincrement": false,
- "default": 1
- },
- "assignee_email": {
- "name": "assignee_email",
- "type": "text",
- "primaryKey": false,
- "notNull": false,
- "autoincrement": false
- },
- "title": {
- "name": "title",
- "type": "text",
- "primaryKey": false,
- "notNull": true,
- "autoincrement": false
- },
- "description": {
- "name": "description",
- "type": "text",
- "primaryKey": false,
- "notNull": false,
- "autoincrement": false
- },
- "status": {
- "name": "status",
- "type": "text",
- "primaryKey": false,
- "notNull": true,
- "autoincrement": false,
- "default": "'to-do'"
- },
- "priority": {
- "name": "priority",
- "type": "text",
- "primaryKey": false,
- "notNull": false,
- "autoincrement": false,
- "default": "'low'"
- },
- "due_date": {
- "name": "due_date",
- "type": "integer",
- "primaryKey": false,
- "notNull": false,
- "autoincrement": false
- },
- "created_at": {
- "name": "created_at",
- "type": "integer",
- "primaryKey": false,
- "notNull": true,
- "autoincrement": false,
- "default": "'\"2025-02-18T21:46:39.856Z\"'"
- }
- },
- "indexes": {},
- "foreignKeys": {
- "task_project_id_project_id_fk": {
- "name": "task_project_id_project_id_fk",
- "tableFrom": "task",
- "tableTo": "project",
- "columnsFrom": ["project_id"],
- "columnsTo": ["id"],
- "onDelete": "cascade",
- "onUpdate": "cascade"
- },
- "task_assignee_email_user_email_fk": {
- "name": "task_assignee_email_user_email_fk",
- "tableFrom": "task",
- "tableTo": "user",
- "columnsFrom": ["assignee_email"],
- "columnsTo": ["email"],
- "onDelete": "cascade",
- "onUpdate": "cascade"
- }
- },
- "compositePrimaryKeys": {},
- "uniqueConstraints": {},
- "checkConstraints": {}
- },
- "user": {
- "name": "user",
- "columns": {
- "id": {
- "name": "id",
- "type": "text",
- "primaryKey": true,
- "notNull": true,
- "autoincrement": false
- },
- "name": {
- "name": "name",
- "type": "text",
- "primaryKey": false,
- "notNull": true,
- "autoincrement": false
- },
- "password": {
- "name": "password",
- "type": "text",
- "primaryKey": false,
- "notNull": true,
- "autoincrement": false
- },
- "email": {
- "name": "email",
- "type": "text",
- "primaryKey": false,
- "notNull": true,
- "autoincrement": false
- },
- "created_at": {
- "name": "created_at",
- "type": "integer",
- "primaryKey": false,
- "notNull": true,
- "autoincrement": false,
- "default": "'\"2025-02-18T21:46:39.855Z\"'"
- }
- },
- "indexes": {
- "user_email_unique": {
- "name": "user_email_unique",
- "columns": ["email"],
- "isUnique": true
- }
- },
- "foreignKeys": {},
- "compositePrimaryKeys": {},
- "uniqueConstraints": {},
- "checkConstraints": {}
- },
- "workspace": {
- "name": "workspace",
- "columns": {
- "id": {
- "name": "id",
- "type": "text",
- "primaryKey": true,
- "notNull": true,
- "autoincrement": false
- },
- "name": {
- "name": "name",
- "type": "text",
- "primaryKey": false,
- "notNull": true,
- "autoincrement": false
- },
- "description": {
- "name": "description",
- "type": "text",
- "primaryKey": false,
- "notNull": false,
- "autoincrement": false
- },
- "owner_email": {
- "name": "owner_email",
- "type": "text",
- "primaryKey": false,
- "notNull": true,
- "autoincrement": false
- },
- "created_at": {
- "name": "created_at",
- "type": "integer",
- "primaryKey": false,
- "notNull": true,
- "autoincrement": false,
- "default": "'\"2025-02-18T21:46:39.855Z\"'"
- }
- },
- "indexes": {},
- "foreignKeys": {
- "workspace_owner_email_user_email_fk": {
- "name": "workspace_owner_email_user_email_fk",
- "tableFrom": "workspace",
- "tableTo": "user",
- "columnsFrom": ["owner_email"],
- "columnsTo": ["email"],
- "onDelete": "cascade",
- "onUpdate": "cascade"
- }
- },
- "compositePrimaryKeys": {},
- "uniqueConstraints": {},
- "checkConstraints": {}
- },
- "workspace_member": {
- "name": "workspace_member",
- "columns": {
- "id": {
- "name": "id",
- "type": "text",
- "primaryKey": true,
- "notNull": true,
- "autoincrement": false
- },
- "workspace_id": {
- "name": "workspace_id",
- "type": "text",
- "primaryKey": false,
- "notNull": true,
- "autoincrement": false
- },
- "user_email": {
- "name": "user_email",
- "type": "text",
- "primaryKey": false,
- "notNull": true,
- "autoincrement": false
- },
- "role": {
- "name": "role",
- "type": "text",
- "primaryKey": false,
- "notNull": true,
- "autoincrement": false,
- "default": "'member'"
- },
- "joined_at": {
- "name": "joined_at",
- "type": "integer",
- "primaryKey": false,
- "notNull": true,
- "autoincrement": false,
- "default": "'\"2025-02-18T21:46:39.855Z\"'"
- },
- "status": {
- "name": "status",
- "type": "text",
- "primaryKey": false,
- "notNull": true,
- "autoincrement": false,
- "default": "'active'"
- }
- },
- "indexes": {},
- "foreignKeys": {
- "workspace_member_workspace_id_workspace_id_fk": {
- "name": "workspace_member_workspace_id_workspace_id_fk",
- "tableFrom": "workspace_member",
- "tableTo": "workspace",
- "columnsFrom": ["workspace_id"],
- "columnsTo": ["id"],
- "onDelete": "cascade",
- "onUpdate": "cascade"
- },
- "workspace_member_user_email_user_email_fk": {
- "name": "workspace_member_user_email_user_email_fk",
- "tableFrom": "workspace_member",
- "tableTo": "user",
- "columnsFrom": ["user_email"],
- "columnsTo": ["email"],
- "onDelete": "cascade",
- "onUpdate": "cascade"
- }
- },
- "compositePrimaryKeys": {},
- "uniqueConstraints": {},
- "checkConstraints": {}
- }
- },
- "views": {},
- "enums": {},
- "_meta": {
- "schemas": {},
- "tables": {},
- "columns": {}
- },
- "internal": {
- "indexes": {}
- }
-}
diff --git a/apps/api/drizzle/meta/_journal.json b/apps/api/drizzle/meta/_journal.json
index f8eeafa1a..d32ca5c06 100644
--- a/apps/api/drizzle/meta/_journal.json
+++ b/apps/api/drizzle/meta/_journal.json
@@ -5,15 +5,8 @@
{
"idx": 0,
"version": "6",
- "when": 1739915188203,
- "tag": "0000_colorful_leech",
- "breakpoints": true
- },
- {
- "idx": 1,
- "version": "6",
- "when": 1739915199865,
- "tag": "0001_sparkling_jane_foster",
+ "when": 1740771205551,
+ "tag": "0000_cool_mattie_franklin",
"breakpoints": true
}
]
diff --git a/apps/api/src/activity/controllers/create-activity.ts b/apps/api/src/activity/controllers/create-activity.ts
new file mode 100644
index 000000000..eb7e6d7cf
--- /dev/null
+++ b/apps/api/src/activity/controllers/create-activity.ts
@@ -0,0 +1,14 @@
+import db from "../../database";
+import { activityTable } from "../../database/schema";
+
+async function createActivity(body: {
+ taskId: string;
+ type: string;
+ userEmail: string;
+ content: string;
+}) {
+ const activity = await db.insert(activityTable).values(body);
+ return activity;
+}
+
+export default createActivity;
diff --git a/apps/api/src/activity/controllers/create-comment.ts b/apps/api/src/activity/controllers/create-comment.ts
new file mode 100644
index 000000000..fbe85841c
--- /dev/null
+++ b/apps/api/src/activity/controllers/create-comment.ts
@@ -0,0 +1,16 @@
+import db from "../../database";
+import { activityTable } from "../../database/schema";
+
+async function createComment(data: {
+ taskId: string;
+ content: string;
+ userEmail: string;
+}) {
+ const activity = await db.insert(activityTable).values({
+ ...data,
+ type: "comment",
+ });
+ return activity;
+}
+
+export default createComment;
diff --git a/apps/api/src/activity/controllers/get-activities.ts b/apps/api/src/activity/controllers/get-activities.ts
new file mode 100644
index 000000000..2f20169f1
--- /dev/null
+++ b/apps/api/src/activity/controllers/get-activities.ts
@@ -0,0 +1,13 @@
+import { desc, eq } from "drizzle-orm";
+import db from "../../database";
+import { activityTable } from "../../database/schema";
+
+async function getActivitiesFromTaskId(taskId: string) {
+ const activities = await db.query.activityTable.findMany({
+ where: eq(activityTable.taskId, taskId),
+ orderBy: [desc(activityTable.createdAt), desc(activityTable.id)],
+ });
+ return activities;
+}
+
+export default getActivitiesFromTaskId;
diff --git a/apps/api/src/activity/events/index.ts b/apps/api/src/activity/events/index.ts
new file mode 100644
index 000000000..1ef528272
--- /dev/null
+++ b/apps/api/src/activity/events/index.ts
@@ -0,0 +1,23 @@
+import { subscribeToEvent } from "../../events";
+import createActivity from "../controllers/create-activity";
+
+subscribeToEvent(
+ "task.created",
+ async (data: {
+ taskId: string;
+ userEmail: string;
+ type: string;
+ content: string;
+ }) => {
+ if (!data.userEmail) {
+ return;
+ }
+
+ await createActivity({
+ taskId: data.taskId,
+ userEmail: data.userEmail,
+ type: data.type,
+ content: data.content,
+ });
+ },
+);
diff --git a/apps/api/src/activity/index.ts b/apps/api/src/activity/index.ts
new file mode 100644
index 000000000..cb9f206f1
--- /dev/null
+++ b/apps/api/src/activity/index.ts
@@ -0,0 +1,42 @@
+import Elysia, { t } from "elysia";
+import createActivity from "./controllers/create-activity";
+import createComment from "./controllers/create-comment";
+import getActivitiesFromTaskId from "./controllers/get-activities";
+import "./events";
+
+const activity = new Elysia({ prefix: "/activity" })
+ .get("/list/:taskId", async ({ params }) => {
+ const activities = await getActivitiesFromTaskId(params.taskId);
+ return activities;
+ })
+ .post(
+ "/create",
+ async ({ body }) => {
+ const activity = await createActivity(body);
+ return activity;
+ },
+ {
+ body: t.Object({
+ taskId: t.String(),
+ type: t.String(),
+ userEmail: t.String(),
+ content: t.String(),
+ }),
+ },
+ )
+ .post(
+ "/comment",
+ async ({ body }) => {
+ const activity = await createComment(body);
+ return activity;
+ },
+ {
+ body: t.Object({
+ taskId: t.String(),
+ content: t.String(),
+ userEmail: t.String(),
+ }),
+ },
+ );
+
+export default activity;
diff --git a/apps/api/src/database/schema.ts b/apps/api/src/database/schema.ts
index 7884fad4c..9f126585f 100644
--- a/apps/api/src/database/schema.ts
+++ b/apps/api/src/database/schema.ts
@@ -109,3 +109,26 @@ export const taskTable = sqliteTable("task", {
.default(new Date())
.notNull(),
});
+
+export const activityTable = sqliteTable("activity", {
+ id: text("id")
+ .$defaultFn(() => createId())
+ .primaryKey(),
+ taskId: text("task_id")
+ .notNull()
+ .references(() => taskTable.id, {
+ onDelete: "cascade",
+ onUpdate: "cascade",
+ }),
+ type: text("type").notNull(),
+ createdAt: integer("created_at", { mode: "timestamp" })
+ .default(new Date())
+ .notNull(),
+ userEmail: text("user_email")
+ .notNull()
+ .references(() => userTable.email, {
+ onDelete: "cascade",
+ onUpdate: "cascade",
+ }),
+ content: text("content"),
+});
diff --git a/apps/api/src/index.ts b/apps/api/src/index.ts
index ab8e17848..ad6e5c71d 100644
--- a/apps/api/src/index.ts
+++ b/apps/api/src/index.ts
@@ -3,6 +3,7 @@ import { cors } from "@elysiajs/cors";
import { cron } from "@elysiajs/cron";
import { migrate } from "drizzle-orm/bun-sqlite/migrator";
import { Elysia } from "elysia";
+import activity from "./activity";
import db from "./database";
import project from "./project";
import task from "./task";
@@ -92,6 +93,7 @@ const app = new Elysia()
.use(project)
.use(task)
.use(workspaceUser)
+ .use(activity)
.onError(({ code, error }) => {
switch (code) {
case "VALIDATION":
diff --git a/apps/api/src/task/controllers/create-task.ts b/apps/api/src/task/controllers/create-task.ts
index 482ce0e57..dc8d62817 100644
--- a/apps/api/src/task/controllers/create-task.ts
+++ b/apps/api/src/task/controllers/create-task.ts
@@ -1,6 +1,7 @@
import { count, eq } from "drizzle-orm";
import db from "../../database";
import { taskTable, userTable } from "../../database/schema";
+import { publishEvent } from "../../events";
async function getNextTaskNumber(projectId: string) {
const [task] = await db
@@ -35,6 +36,13 @@ async function createTask(body: {
})
.returning();
+ await publishEvent("task.created", {
+ taskId: createdTask.id,
+ userEmail: createdTask.userEmail ?? "",
+ type: "create",
+ content: "created the task",
+ });
+
return {
...createdTask,
assigneeName: assignee?.name,
diff --git a/apps/api/src/task/controllers/get-task.ts b/apps/api/src/task/controllers/get-task.ts
new file mode 100644
index 000000000..507447a80
--- /dev/null
+++ b/apps/api/src/task/controllers/get-task.ts
@@ -0,0 +1,17 @@
+import { eq } from "drizzle-orm";
+import db from "../../database";
+import { taskTable } from "../../database/schema";
+
+async function getTask(taskId: string) {
+ const task = await db.query.taskTable.findFirst({
+ where: eq(taskTable.id, taskId),
+ });
+
+ if (!task) {
+ throw new Error("Task not found");
+ }
+
+ return task;
+}
+
+export default getTask;
diff --git a/apps/api/src/task/controllers/update-task.ts b/apps/api/src/task/controllers/update-task.ts
index 46c880b33..9ee8a789b 100644
--- a/apps/api/src/task/controllers/update-task.ts
+++ b/apps/api/src/task/controllers/update-task.ts
@@ -1,27 +1,23 @@
-import { and, eq } from "drizzle-orm";
+import { eq } from "drizzle-orm";
import db from "../../database";
import { taskTable } from "../../database/schema";
-async function updateTask({
- id,
- projectId,
- title,
- status,
- dueDate,
- description,
-}: {
- id: string;
- projectId: string;
- assigneeId: string;
- title: string;
- status: string;
- dueDate: Date;
- description: string;
-}) {
+async function updateTask(
+ taskId: string,
+ body: {
+ projectId: string;
+ assigneeId: string | null;
+ title: string;
+ status: string;
+ dueDate: Date | null;
+ description: string;
+ priority: string;
+ },
+) {
const [existingTask] = await db
.select()
.from(taskTable)
- .where(and(eq(taskTable.id, id), eq(taskTable.projectId, projectId)));
+ .where(eq(taskTable.id, taskId));
const isTaskExisting = Boolean(existingTask);
@@ -29,18 +25,19 @@ async function updateTask({
throw new Error("Task doesn't exist");
}
- const [updatedWorkspace] = await db
+ const [updatedTask] = await db
.update(taskTable)
.set({
- title,
- description,
- status,
- dueDate,
+ title: body.title,
+ description: body.description,
+ status: body.status,
+ dueDate: new Date(body.dueDate ?? ""),
+ priority: body.priority,
})
- .where(and(eq(taskTable.id, id), eq(taskTable.projectId, projectId)))
+ .where(eq(taskTable.id, taskId))
.returning();
- return updatedWorkspace;
+ return updatedTask;
}
export default updateTask;
diff --git a/apps/api/src/task/index.ts b/apps/api/src/task/index.ts
index df024c9a4..7be54fef2 100644
--- a/apps/api/src/task/index.ts
+++ b/apps/api/src/task/index.ts
@@ -1,9 +1,10 @@
import Elysia, { t } from "elysia";
import createTask from "./controllers/create-task";
+import getTask from "./controllers/get-task";
import getTasks from "./controllers/get-tasks";
+import updateTask from "./controllers/update-task";
import updateTaskStatus from "./controllers/update-task-status";
-
const connections = new Map();
const task = new Elysia({ prefix: "/task" })
@@ -26,6 +27,36 @@ const task = new Elysia({ prefix: "/task" })
}),
},
)
+ .get(
+ "/:taskId",
+ async ({ params }) => {
+ const task = await getTask(params.taskId);
+
+ return task;
+ },
+ {
+ params: t.Object({
+ taskId: t.String(),
+ }),
+ },
+ )
+ .put("/:taskId/update", async ({ params, body }) => {
+ const updatedTask = await updateTask(
+ params.taskId,
+ // TODO: Fix this casting
+ body as {
+ projectId: string;
+ assigneeId: string | null;
+ title: string;
+ status: string;
+ dueDate: Date | null;
+ description: string;
+ priority: string;
+ },
+ );
+
+ return updatedTask;
+ })
.ws("/ws/:projectId", {
async open(ws) {
const projectId = ws.data.params.projectId;
diff --git a/apps/web/package.json b/apps/web/package.json
index 4d8a24175..11ebf2c71 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -18,8 +18,9 @@
"@radix-ui/react-dialog": "^1.1.5",
"@radix-ui/react-dropdown-menu": "^2.1.5",
"@radix-ui/react-label": "^2.1.1",
+ "@radix-ui/react-popover": "^1.1.6",
"@radix-ui/react-select": "^2.1.6",
- "@radix-ui/react-slot": "^1.1.1",
+ "@radix-ui/react-slot": "^1.1.2",
"@radix-ui/react-switch": "^1.1.3",
"@radix-ui/react-tooltip": "^1.1.7",
"@tanstack/react-query": "^5.64.2",
@@ -27,6 +28,14 @@
"@tanstack/react-router": "^1.97.14",
"@tanstack/router-devtools": "^1.97.14",
"@tanstack/router-plugin": "^1.97.7",
+ "@tiptap/extension-highlight": "^2.11.5",
+ "@tiptap/extension-link": "^2.11.5",
+ "@tiptap/extension-placeholder": "^2.11.5",
+ "@tiptap/extension-task-item": "^2.11.5",
+ "@tiptap/extension-task-list": "^2.11.5",
+ "@tiptap/pm": "^2.11.5",
+ "@tiptap/react": "^2.11.5",
+ "@tiptap/starter-kit": "^2.11.5",
"@vitejs/plugin-react": "^4.3.4",
"babel-plugin-react-compiler": "^19.0.0-beta-21e868a-20250216",
"class-variance-authority": "^0.7.1",
@@ -36,6 +45,7 @@
"immer": "^10.1.1",
"lucide-react": "^0.476.0",
"react": "^19.0.0",
+ "react-day-picker": "8.10.1",
"react-dom": "^19.0.0",
"react-hook-form": "^7.54.2",
"react-use-websocket": "^4.11.1",
diff --git a/apps/web/src/components/common/editor.tsx b/apps/web/src/components/common/editor.tsx
new file mode 100644
index 000000000..6b1a6fe57
--- /dev/null
+++ b/apps/web/src/components/common/editor.tsx
@@ -0,0 +1,297 @@
+import { cn } from "@/lib/cn";
+import Highlight from "@tiptap/extension-highlight";
+import Placeholder from "@tiptap/extension-placeholder";
+import TaskItem from "@tiptap/extension-task-item";
+import TaskList from "@tiptap/extension-task-list";
+import {
+ EditorContent,
+ type Editor as TiptapEditor,
+ useEditor,
+} from "@tiptap/react";
+import StarterKit from "@tiptap/starter-kit";
+import {
+ Bold,
+ CheckSquare,
+ ChevronDown,
+ Code,
+ HighlighterIcon,
+ Italic,
+ List,
+ ListOrdered,
+ Quote,
+ Strikethrough,
+ Type,
+} from "lucide-react";
+import { useEffect, useRef, useState } from "react";
+
+interface EditorProps {
+ value: string;
+ onChange: (value: string) => void;
+ placeholder?: string;
+}
+
+const TEXT_OPTIONS = [
+ {
+ label: "Normal text",
+ value: "paragraph",
+ icon: <Type className="w-4 h-4" />,
+ },
+ {
+ label: "Heading 1",
+ value: "h1",
+ icon: <span className="text-sm">H1</span>,
+ },
+ {
+ label: "Heading 2",
+ value: "h2",
+ icon: <span className="text-sm">H2</span>,
+ },
+];
+
+export function Editor({
+ value,
+ onChange,
+ placeholder = "Write something...",
+}: EditorProps) {
+ const [isTextMenuOpen, setIsTextMenuOpen] = useState(false);
+ const menuRef = useRef<HTMLDivElement>(null);
+
+ const editor = useEditor({
+ extensions: [
+ StarterKit.configure({
+ heading: {
+ levels: [1, 2],
+ HTMLAttributes: {
+ class: "text-zinc-900 dark:text-zinc-100",
+ },
+ },
+ codeBlock: {
+ HTMLAttributes: {
+ class:
+ "block rounded-md bg-zinc-950 dark:bg-zinc-900 p-4 font-mono text-sm text-zinc-100 dark:text-zinc-200 my-4",
+ },
+ },
+ blockquote: {
+ HTMLAttributes: {
+ class: "border-l-4 border-zinc-300 dark:border-zinc-700 pl-4",
+ },
+ },
+ orderedList: {
+ HTMLAttributes: {
+ class: "list-decimal pl-6",
+ },
+ },
+ bulletList: {
+ HTMLAttributes: {
+ class: "list-disc pl-6",
+ },
+ },
+ }),
+ Highlight.configure({
+ HTMLAttributes: {
+ class: "bg-yellow-100 dark:bg-yellow-900/50 rounded-sm px-1",
+ },
+ }),
+ TaskList.configure({
+ HTMLAttributes: {
+ class: "not-prose pl-2",
+ },
+ }),
+ TaskItem.configure({
+ nested: true,
+ HTMLAttributes: {
+ class: "flex gap-2 items-start",
+ },
+ }),
+
+ Placeholder.configure({
+ placeholder,
+ }),
+ ],
+ onSelectionUpdate: ({ editor }) => {
+ editor.commands.focus();
+ },
+ content: value,
+ onUpdate: ({ editor }: { editor: TiptapEditor }) => {
+ onChange(editor.getHTML());
+ },
+ });
+
+ useEffect(() => {
+ function handleClickOutside(event: MouseEvent) {
+ if (menuRef.current && !menuRef.current.contains(event.target as Node)) {
+ setIsTextMenuOpen(false);
+ }
+ }
+
+ document.addEventListener("mousedown", handleClickOutside);
+ return () => document.removeEventListener("mousedown", handleClickOutside);
+ }, []);
+
+ const getCurrentTextStyle = () => {
+ if (!editor) return TEXT_OPTIONS[0];
+ if (editor.isActive("heading", { level: 1 })) return TEXT_OPTIONS[1];
+ if (editor.isActive("heading", { level: 2 })) return TEXT_OPTIONS[2];
+ return TEXT_OPTIONS[0];
+ };
+
+ if (!editor) {
+ return null;
+ }
+
+ return (
+ <div className="prose prose-zinc dark:prose-invert max-w-none [&_.is-editor-empty]:text-zinc-500 [&_h1]:text-2xl [&_h1]:font-bold [&_h1]:mt-8 [&_h1]:mb-4 [&_h2]:text-xl [&_h2]:font-semibold [&_h2]:mt-6 [&_h2]:mb-3">
+ <div className="flex flex-wrap gap-1 mb-4 p-2 -mx-1 border-b border-zinc-200 dark:border-zinc-800">
+ <div className="relative" ref={menuRef}>
+ <button
+ type="button"
+ onClick={() => setIsTextMenuOpen(!isTextMenuOpen)}
+ className={cn(
+ "flex items-center gap-2 p-1.5 rounded-md hover:bg-zinc-100 dark:hover:bg-zinc-800 transition-colors",
+ isTextMenuOpen && "bg-zinc-100 dark:bg-zinc-800",
+ )}
+ >
+ {getCurrentTextStyle().icon}
+ <span className="text-sm text-zinc-600 dark:text-zinc-400">
+ {getCurrentTextStyle().label}
+ </span>
+ <ChevronDown className="w-4 h-4 text-zinc-500 dark:text-zinc-400" />
+ </button>
+
+ {isTextMenuOpen && (
+ <div className="absolute z-50 w-40 mt-1 py-1 rounded-md shadow-lg bg-white dark:bg-zinc-800 border border-zinc-200 dark:border-zinc-700">
+ {TEXT_OPTIONS.map((option) => (
+ <button
+ key={option.value}
+ type="button"
+ onClick={() => {
+ if (option.value === "paragraph") {
+ editor.chain().focus().setParagraph().run();
+ } else if (option.value === "h1") {
+ editor.chain().focus().toggleHeading({ level: 1 }).run();
+ } else if (option.value === "h2") {
+ editor.chain().focus().toggleHeading({ level: 2 }).run();
+ }
+ setIsTextMenuOpen(false);
+ }}
+ className={cn(
+ "w-full flex items-center gap-2 px-3 py-1.5 text-sm",
+ "hover:bg-zinc-100 dark:hover:bg-zinc-700",
+ (option.value === "paragraph" &&
+ editor.isActive("paragraph")) ||
+ (option.value === "h1" &&
+ editor.isActive("heading", { level: 1 })) ||
+ (option.value === "h2" &&
+ editor.isActive("heading", { level: 2 }))
+ ? "bg-indigo-50 text-indigo-600 dark:bg-indigo-500/10 dark:text-indigo-400"
+ : "text-zinc-600 dark:text-zinc-300",
+ )}
+ >
+ {option.icon}
+ <span className="flex-1 text-left">{option.label}</span>
+ </button>
+ ))}
+ </div>
+ )}
+ </div>
+ <div className="w-px h-6 mx-1 bg-zinc-200 dark:bg-zinc-800" />
+ <button
+ type="button"
+ onClick={() => editor.chain().focus().toggleBold().run()}
+ className={cn(
+ "p-1.5 rounded-lg hover:bg-zinc-100 dark:hover:bg-zinc-800",
+ editor.isActive("bold") && "bg-zinc-100 dark:bg-zinc-800",
+ )}
+ >
+ <Bold className="w-4 h-4 text-zinc-600 dark:text-zinc-400" />
+ </button>
+ <button
+ type="button"
+ onClick={() => editor.chain().focus().toggleItalic().run()}
+ className={cn(
+ "p-1.5 rounded-lg hover:bg-zinc-100 dark:hover:bg-zinc-800",
+ editor.isActive("italic") && "bg-zinc-100 dark:bg-zinc-800",
+ )}
+ >
+ <Italic className="w-4 h-4 text-zinc-600 dark:text-zinc-400" />
+ </button>
+ <button
+ type="button"
+ onClick={() => editor.chain().focus().toggleStrike().run()}
+ className={cn(
+ "p-1.5 rounded-lg hover:bg-zinc-100 dark:hover:bg-zinc-800",
+ editor.isActive("strike") && "bg-zinc-100 dark:bg-zinc-800",
+ )}
+ >
+ <Strikethrough className="w-4 h-4 text-zinc-600 dark:text-zinc-400" />
+ </button>
+ <button
+ type="button"
+ onClick={() => editor.chain().focus().toggleHighlight().run()}
+ className={cn(
+ "p-1.5 rounded-lg hover:bg-zinc-100 dark:hover:bg-zinc-800",
+ editor.isActive("highlight") && "bg-zinc-100 dark:bg-zinc-800",
+ )}
+ >
+ <HighlighterIcon className="w-4 h-4 text-zinc-600 dark:text-zinc-400" />
+ </button>
+ <div className="w-px h-6 mx-1 bg-zinc-200 dark:bg-zinc-800" />
+ <button
+ type="button"
+ onClick={() => editor.chain().focus().toggleBulletList().run()}
+ className={cn(
+ "p-1.5 rounded-lg hover:bg-zinc-100 dark:hover:bg-zinc-800",
+ editor.isActive("bulletList") && "bg-zinc-100 dark:bg-zinc-800",
+ )}
+ >
+ <List className="w-4 h-4 text-zinc-600 dark:text-zinc-400" />
+ </button>
+ <button
+ type="button"
+ onClick={() => editor.chain().focus().toggleOrderedList().run()}
+ className={cn(
+ "p-1.5 rounded-lg hover:bg-zinc-100 dark:hover:bg-zinc-800",
+ editor.isActive("orderedList") && "bg-zinc-100 dark:bg-zinc-800",
+ )}
+ >
+ <ListOrdered className="w-4 h-4 text-zinc-600 dark:text-zinc-400" />
+ </button>
+ <button
+ type="button"
+ onClick={() => editor.chain().focus().toggleTaskList().run()}
+ className={cn(
+ "p-1.5 rounded-lg hover:bg-zinc-100 dark:hover:bg-zinc-800",
+ editor.isActive("taskList") && "bg-zinc-100 dark:bg-zinc-800",
+ )}
+ >
+ <CheckSquare className="w-4 h-4 text-zinc-600 dark:text-zinc-400" />
+ </button>
+ <div className="w-px h-6 mx-1 bg-zinc-200 dark:bg-zinc-800" />
+ <button
+ type="button"
+ onClick={() => editor.chain().focus().toggleBlockquote().run()}
+ className={cn(
+ "p-1.5 rounded-lg hover:bg-zinc-100 dark:hover:bg-zinc-800",
+ editor.isActive("blockquote") && "bg-zinc-100 dark:bg-zinc-800",
+ )}
+ >
+ <Quote className="w-4 h-4 text-zinc-600 dark:text-zinc-400" />
+ </button>
+ <button
+ type="button"
+ onClick={() => editor.chain().focus().toggleCode().run()}
+ className={cn(
+ "p-1.5 rounded-lg hover:bg-zinc-100 dark:hover:bg-zinc-800",
+ editor.isActive("code") && "bg-zinc-100 dark:bg-zinc-800",
+ )}
+ >
+ <Code className="w-4 h-4 text-zinc-600 dark:text-zinc-400" />
+ </button>
+ </div>
+ <EditorContent
+ editor={editor}
+ className="min-h-[200px] [&_*]:focus:outline-none px-2"
+ />
+ </div>
+ );
+}
diff --git a/apps/web/src/components/common/logo.tsx b/apps/web/src/components/common/logo.tsx
index 74b7deff0..ea071823c 100644
--- a/apps/web/src/components/common/logo.tsx
+++ b/apps/web/src/components/common/logo.tsx
@@ -1,3 +1,4 @@
+import { Link } from "@tanstack/react-router";
import { LayoutGrid } from "lucide-react";
interface LogoProps {
@@ -6,13 +7,13 @@ interface LogoProps {
export function Logo({ className = "" }: LogoProps) {
return (
- <div className={`flex items-center gap-2 ${className}`}>
+ <Link to="/dashboard" className={`flex items-center gap-2 ${className}`}>
<div className="p-1.5">
<LayoutGrid className="w-5 h-5 text-indigo-600 dark:text-indigo-400" />
</div>
<span className="text-lg text-zinc-900 dark:text-white font-semibold">
Kaneo
</span>
- </div>
+ </Link>
);
}
diff --git a/apps/web/src/components/kanban-board/task-card.tsx b/apps/web/src/components/kanban-board/task-card.tsx
index cbf6da2e2..d73eb7799 100644
--- a/apps/web/src/components/kanban-board/task-card.tsx
+++ b/apps/web/src/components/kanban-board/task-card.tsx
@@ -98,7 +98,7 @@ function TaskCard({ task }: TaskCardProps) {
<div className="flex items-center gap-1.5 px-2 py-1 rounded-md bg-zinc-100/50 dark:bg-zinc-800/50 group-hover:bg-zinc-100 dark:group-hover:bg-zinc-800/80 transition-colors">
<Calendar className="w-3 h-3 text-zinc-400 dark:text-zinc-500" />
<span className="text-xs text-zinc-600 dark:text-zinc-400">
- {format(new Date(task.dueDate), "MMM d")}
+ {format(new Date(task.dueDate), "MMM d, yyyy")}
</span>
</div>
)}
diff --git a/apps/web/src/components/task/task-activities.tsx b/apps/web/src/components/task/task-activities.tsx
new file mode 100644
index 000000000..ad8c4c6f7
--- /dev/null
+++ b/apps/web/src/components/task/task-activities.tsx
@@ -0,0 +1,65 @@
+import { Avatar, AvatarFallback } from "@/components/ui/avatar";
+import useGetActivitiesByTaskId from "@/hooks/queries/activity/use-get-activities-by-task-id";
+import { cn } from "@/lib/cn";
+import { Route } from "@/routes/dashboard/workspace/$workspaceId/project/$projectId/task/$taskId";
+import { formatDistanceToNow } from "date-fns";
+import { History, MessageSquare, Pencil, PlusCircle } from "lucide-react";
+
+function TaskActivities() {
+ const { taskId } = Route.useParams();
+ const { data: activities } = useGetActivitiesByTaskId(taskId);
+
+ return (
+ <div className="space-y-3">
+ {activities?.map((activity) => (
+ <div key={activity.id} className="flex items-start gap-3">
+ <div className="relative">
+ <Avatar className="w-8 h-8">
+ <AvatarFallback>{activity.userEmail.charAt(0)}</AvatarFallback>
+ </Avatar>
+ <div
+ className={cn(
+ "absolute -bottom-1 -right-1 w-4 h-4 rounded-full flex items-center justify-center",
+ activity.type === "create" &&
+ "bg-green-100 text-green-600 dark:bg-green-500/20 dark:text-green-400",
+ activity.type === "update" &&
+ "bg-blue-100 text-blue-600 dark:bg-blue-500/20 dark:text-blue-400",
+ activity.type === "status" &&
+ "bg-purple-100 text-purple-600 dark:bg-purple-500/20 dark:text-purple-400",
+ activity.type === "comment" &&
+ "bg-yellow-100 text-yellow-600 dark:bg-yellow-500/20 dark:text-yellow-400",
+ )}
+ >
+ {activity.type === "create" && <PlusCircle className="w-3 h-3" />}
+ {activity.type === "update" && <Pencil className="w-3 h-3" />}
+ {activity.type === "status" && <History className="w-3 h-3" />}
+ {activity.type === "comment" && (
+ <MessageSquare className="w-3 h-3" />
+ )}
+ </div>
+ </div>
+ <div className="flex-1">
+ <div className="flex items-center gap-2">
+ <span className="text-sm font-medium text-zinc-900 dark:text-zinc-100">
+ {activity.userEmail}
+ </span>
+ <span className="text-xs text-zinc-500 dark:text-zinc-400">
+ {formatDistanceToNow(activity.createdAt)} ago
+ </span>
+ </div>
+ <div className="mt-1.5">
+ <div className="text-sm text-zinc-600 dark:text-zinc-400">
+ {activity.type === "create" && activity.content}
+ {activity.type === "update" && activity.content}
+ {activity.type === "status" && activity.content}
+ {activity.type === "comment" && activity.content}
+ </div>
+ </div>
+ </div>
+ </div>
+ ))}
+ </div>
+ );
+}
+
+export default TaskActivities;
diff --git a/apps/web/src/components/task/task-calendar.tsx b/apps/web/src/components/task/task-calendar.tsx
new file mode 100644
index 000000000..654023b77
--- /dev/null
+++ b/apps/web/src/components/task/task-calendar.tsx
@@ -0,0 +1,68 @@
+import { Calendar } from "@/components/ui/calendar";
+import { cn } from "@/lib/cn";
+import { format } from "date-fns";
+import { Calendar as CalendarIcon } from "lucide-react";
+import type { ControllerRenderProps } from "react-hook-form";
+import type { z } from "zod";
+import { Popover, PopoverContent, PopoverTrigger } from "../ui/popover";
+import type { taskInfoSchema } from "./task-info";
+
+type SelectSingleEventHandler = (date: Date | undefined) => void;
+
+function TaskCalendar({
+ field,
+ onChange,
+}: {
+ field: ControllerRenderProps<z.infer<typeof taskInfoSchema>, "dueDate">;
+ onChange: SelectSingleEventHandler;
+}) {
+ const { value } = field;
+
+ return (
+ <div className="w-full">
+ <h3 className="text-sm font-medium text-zinc-900 dark:text-zinc-300 mb-2">
+ Due Date
+ </h3>
+ <Popover>
+ <PopoverTrigger asChild>
+ <button
+ type="button"
+ className={cn(
+ "w-full flex items-center justify-between rounded-md border px-3 py-2 text-sm",
+ "bg-white dark:bg-zinc-800/50",
+ "border-zinc-200 dark:border-zinc-700/50",
+ "text-zinc-900 dark:text-zinc-100",
+ "focus:outline-none focus:ring-2 focus:ring-indigo-500 dark:focus:ring-indigo-400",
+ "hover:border-zinc-300 dark:hover:border-zinc-600",
+ )}
+ >
+ <span>
+ {value ? (
+ format(new Date(value), "PPP")
+ ) : (
+ <span className="text-zinc-500 dark:text-zinc-400">
+ Pick a date
+ </span>
+ )}
+ </span>
+ <CalendarIcon className="w-4 h-4 text-zinc-500 dark:text-zinc-400" />
+ </button>
+ </PopoverTrigger>
+ <PopoverContent
+ className="w-auto p-0 bg-zinc-100 dark:bg-zinc-800 border-none"
+ align="start"
+ >
+ <Calendar
+ mode="single"
+ selected={value ? new Date(value) : undefined}
+ onSelect={onChange}
+ className="w-auto border-none"
+ initialFocus
+ />
+ </PopoverContent>
+ </Popover>
+ </div>
+ );
+}
+
+export default TaskCalendar;
diff --git a/apps/web/src/components/task/task-comment.tsx b/apps/web/src/components/task/task-comment.tsx
new file mode 100644
index 000000000..f6ba14d19
--- /dev/null
+++ b/apps/web/src/components/task/task-comment.tsx
@@ -0,0 +1,100 @@
+import useAuth from "@/components/providers/auth-provider/hooks/use-auth";
+import { Avatar, AvatarFallback } from "@/components/ui/avatar";
+import { Button } from "@/components/ui/button";
+import {
+ Form,
+ FormControl,
+ FormField,
+ FormItem,
+ FormLabel,
+} from "@/components/ui/form";
+import useCreateActivity from "@/hooks/mutations/activity/use-create-activity";
+import { Route } from "@/routes/dashboard/workspace/$workspaceId/project/$projectId/task/$taskId";
+import { zodResolver } from "@hookform/resolvers/zod";
+import { useQueryClient } from "@tanstack/react-query";
+import { MessageSquare } from "lucide-react";
+import { useEffect } from "react";
+import { useForm } from "react-hook-form";
+import { z } from "zod";
+
+const commentSchema = z.object({
+ comment: z.string().min(1),
+});
+
+function TaskComment() {
+ const { taskId } = Route.useParams();
+ const { user } = useAuth();
+ const { mutateAsync: createComment } = useCreateActivity();
+ const queryClient = useQueryClient();
+
+ const form = useForm<z.infer<typeof commentSchema>>({
+ resolver: zodResolver(commentSchema),
+ defaultValues: {
+ comment: "",
+ },
+ shouldUnregister: true,
+ });
+
+ async function onSubmit(data: z.infer<typeof commentSchema>) {
+ if (!user?.email) {
+ return;
+ }
+
+ await createComment({
+ taskId: taskId,
+ content: data.comment,
+ userEmail: user?.email,
+ });
+
+ queryClient.invalidateQueries({
+ queryKey: ["activities", taskId],
+ });
+ }
+
+ useEffect(() => {
+ return () => {
+ form.reset();
+ };
+ }, [form]);
+
+ return (
+ <div className="flex items-start gap-3">
+ <Avatar className="w-8 h-8">
+ <AvatarFallback>{user?.name.charAt(0)}</AvatarFallback>
+ </Avatar>
+ <div className="flex-1">
+ <Form {...form}>
+ <form onSubmit={form.handleSubmit(onSubmit)}>
+ <FormField
+ control={form.control}
+ name="comment"
+ render={({ field }) => (
+ <FormItem>
+ <FormLabel>Comment</FormLabel>
+ <FormControl>
+ <textarea
+ placeholder="Add a comment..."
+ {...field}
+ className="w-full rounded-xl border border-zinc-200/50 dark:border-zinc-800/50 bg-white dark:bg-zinc-900 shadow-sm px-4 py-3 text-sm text-zinc-900 dark:text-zinc-100 placeholder:text-zinc-500 dark:placeholder:text-zinc-400 focus:outline-none focus:ring-2 focus:ring-indigo-500 dark:focus:ring-indigo-400 min-h-[100px]"
+ />
+ </FormControl>
+ </FormItem>
+ )}
+ />
+ <div className="flex justify-end mt-2">
+ <Button
+ type="submit"
+ className="bg-indigo-600/10 text-indigo-600 hover:bg-indigo-600/20 dark:bg-indigo-400/10 dark:text-indigo-400 dark:hover:bg-indigo-400/20"
+ >
+ <MessageSquare className="w-4 h-4 mr-2" />
+ Comment
+ </Button>
+ </div>
+ </form>
+ </Form>
+ </div>
+ </div>
+ );
+}
+
+export default TaskComment;
diff --git a/apps/web/src/components/task/task-description.tsx b/apps/web/src/components/task/task-description.tsx
new file mode 100644
index 000000000..c7f86518e
--- /dev/null
+++ b/apps/web/src/components/task/task-description.tsx
@@ -0,0 +1,69 @@
+import useUpdateTask from "@/hooks/mutations/task/use-update-task";
+import useGetTask from "@/hooks/queries/task/use-get-task";
+import debounce from "@/lib/debounce";
+import { Route } from "@/routes/dashboard/workspace/$workspaceId/project/$projectId/task/$taskId";
+import { useEffect } from "react";
+import { useForm } from "react-hook-form";
+import { Editor } from "../common/editor";
+import { Form, FormField } from "../ui/form";
+
+interface TaskDescriptionProps {
+ setIsSaving: (isSaving: boolean) => void;
+}
+
+function TaskDescription({ setIsSaving }: TaskDescriptionProps) {
+ const { taskId } = Route.useParams();
+ const { data: task } = useGetTask(taskId);
+ const { mutateAsync: updateTask } = useUpdateTask();
+
+ const form = useForm<{
+ description: string;
+ }>({
+ shouldUnregister: true,
+ values: {
+ description: task?.description || "",
+ },
+ });
+
+ const debouncedUpdate = debounce(async (value: string) => {
+ if (!task) return;
+
+ setIsSaving(true);
+ await updateTask({
+ ...task,
+ description: value,
+ assigneeName: task.userEmail || "",
+ });
+ setIsSaving(false);
+ }, 1000);
+
+ async function handleDescriptionChange(value: string) {
+ debouncedUpdate(value);
+ }
+
+ useEffect(() => {
+ return () => {
+ form.reset();
+ };
+ }, [form]);
+
+ return (
+ <div className="bg-white dark:bg-zinc-900 rounded-xl shadow-sm border border-zinc-200/50 dark:border-zinc-800/50 pb-1 px-1">
+ <Form {...form}>
+ <FormField
+ control={form.control}
+ name="description"
+ render={({ field }) => (
+ <Editor
+ value={field.value || ""}
+ onChange={(value) => handleDescriptionChange(value)}
+ placeholder="Use the toolbar to format your description..."
+ />
+ )}
+ />
+ </Form>
+ </div>
+ );
+}
+
+export default TaskDescription;
diff --git a/apps/web/src/components/task/task-info.tsx b/apps/web/src/components/task/task-info.tsx
new file mode 100644
index 000000000..54ffecfdb
--- /dev/null
+++ b/apps/web/src/components/task/task-info.tsx
@@ -0,0 +1,172 @@
+import { Form, FormField, FormItem, FormLabel } from "@/components/ui/form";
+import { Select } from "@/components/ui/select";
+import useUpdateTask from "@/hooks/mutations/task/use-update-task";
+import useGetTask from "@/hooks/queries/task/use-get-task";
+import useGetWorkspaceUsers from "@/hooks/queries/workspace-users/use-get-workspace-users";
+import { Route } from "@/routes/dashboard/workspace/$workspaceId/project/$projectId/task/$taskId";
+import useProjectStore from "@/store/project";
+import { Flag } from "lucide-react";
+import { useEffect } from "react";
+import { useForm } from "react-hook-form";
+import { z } from "zod";
+import TaskCalendar from "./task-calendar";
+
+export const taskInfoSchema = z.object({
+ status: z.string(),
+ assigneeName: z.string(),
+ priority: z.string(),
+ dueDate: z.date(),
+});
+
+function TaskInfo({
+ setIsSaving,
+}: { setIsSaving: (isSaving: boolean) => void }) {
+ const { taskId, workspaceId } = Route.useParams();
+ const { project } = useProjectStore();
+ const { data: task } = useGetTask(taskId);
+ const { data: workspaceUsers } = useGetWorkspaceUsers({ workspaceId });
+ const { mutateAsync: updateTask } = useUpdateTask();
+
+ const form = useForm<z.infer<typeof taskInfoSchema>>({
+ values: {
+ status: task?.status || "",
+ assigneeName: task?.userEmail || "",
+ priority: task?.priority || "",
+ dueDate: task?.dueDate || new Date(),
+ },
+ shouldUnregister: true,
+ mode: "onChange",
+ });
+
+ const handleChange = async (data: z.infer<typeof taskInfoSchema>) => {
+ if (!task) return;
+
+ setIsSaving(true);
+ await updateTask({
+ ...task,
+ ...data,
+ });
+ setIsSaving(false);
+ };
+
+ useEffect(() => {
+ return () => {
+ form.reset();
+ };
+ }, [form]);
+
+ return (
+ <div className="w-full md:w-80 flex-shrink-0 overflow-y-auto border-b border-zinc-200 dark:border-zinc-800 p-4 gap-4 flex flex-col">
+ <Form {...form}>
+ <FormField
+ control={form.control}
+ name="status"
+ render={({ field }) => (
+ <FormItem>
+ <FormLabel>Status</FormLabel>
+ <Select
+ value={field.value}
+ placeholder="Select status"
+ onChange={(value) => {
+ field.onChange(value);
+ handleChange({ ...form.getValues(), status: value });
+ }}
+ options={
+ project?.columns?.map((col) => ({
+ value: col.id,
+ label: col.name,
+ })) || []
+ }
+ />
+ </FormItem>
+ )}
+ />
+
+ <FormField
+ control={form.control}
+ name="assigneeName"
+ render={({ field }) => (
+ <FormItem>
+ <FormLabel>Assign to</FormLabel>
+ <Select
+ value={field.value}
+ placeholder="Assign to"
+ onChange={(value) => {
+ field.onChange(value);
+ handleChange({ ...form.getValues(), assigneeName: value });
+ }}
+ options={[
+ {
+ value: "",
+ label: "Unassigned",
+ },
+ ...(workspaceUsers?.map((user) => ({
+ value: user.userEmail,
+ label: user.userName || "",
+ })) || []),
+ ]}
+ />
+ </FormItem>
+ )}
+ />
+ <FormField
+ control={form.control}
+ name="priority"
+ render={({ field }) => (
+ <FormItem>
+ <FormLabel>Priority</FormLabel>
+ <Select
+ value={field.value || ""}
+ placeholder="Select priority"
+ onChange={(value) => {
+ field.onChange(value);
+ handleChange({ ...form.getValues(), priority: value });
+ }}
+ options={[
+ {
+ value: "low",
+ label: "Low",
+ icon: <Flag className="w-4 h-4 text-blue-500" />,
+ },
+ {
+ value: "medium",
+ label: "Medium",
+ icon: <Flag className="w-4 h-4 text-yellow-500" />,
+ },
+ {
+ value: "high",
+ label: "High",
+ icon: <Flag className="w-4 h-4 text-red-500" />,
+ },
+ {
+ value: "critical",
+ label: "Critical",
+ icon: <Flag className="w-4 h-4 text-red-500" />,
+ },
+ ]}
+ />
+ </FormItem>
+ )}
+ />
+ <FormField
+ control={form.control}
+ name="dueDate"
+ render={({ field }) => (
+ <TaskCalendar
+ field={field}
+ onChange={(value) => {
+ field.onChange(value);
+ handleChange({
+ ...form.getValues(),
+ dueDate: value ?? new Date(),
+ });
+ }}
+ />
+ )}
+ />
+ </Form>
+ </div>
+ );
+}
+
+export default TaskInfo;
diff --git a/apps/web/src/components/task/task-title.tsx b/apps/web/src/components/task/task-title.tsx
new file mode 100644
index 000000000..ca42df9ab
--- /dev/null
+++ b/apps/web/src/components/task/task-title.tsx
@@ -0,0 +1,64 @@
+import useUpdateTask from "@/hooks/mutations/task/use-update-task";
+import useGetTask from "@/hooks/queries/task/use-get-task";
+import debounce from "@/lib/debounce";
+import { Route } from "@/routes/dashboard/workspace/$workspaceId/project/$projectId/task/$taskId";
+import { useForm } from "react-hook-form";
+import { z } from "zod";
+import { Form, FormField } from "../ui/form";
+
+const taskTitleSchema = z.object({
+ title: z.string().min(1),
+});
+
+function TaskTitle({
+ setIsSaving,
+}: { setIsSaving: (isSaving: boolean) => void }) {
+ const { taskId } = Route.useParams();
+ const { data: task } = useGetTask(taskId);
+ const { mutateAsync: updateTask } = useUpdateTask();
+ const form = useForm<z.infer<typeof taskTitleSchema>>({
+ values: {
+ title: task?.title || "",
+ },
+ });
+
+ const debouncedUpdate = debounce(async (value: string) => {
+ if (!task) return;
+
+ setIsSaving(true);
+ await updateTask({
+ ...task,
+ title: value,
+ assigneeName: task.userEmail || "",
+ });
+ setIsSaving(false);
+ }, 1000);
+
+ async function handleTitleChange(value: string) {
+ debouncedUpdate(value);
+ }
+
+ return (
+ <div className="flex items-center gap-2">
+ <Form {...form}>
+ <FormField
+ control={form.control}
+ name="title"
+ render={({ field }) => (
+ <input
+ type="text"
+ className="w-full text-sm font-medium bg-transparent border-none focus:outline-none focus:ring-0 text-zinc-900 dark:text-zinc-100 p-0"
+ {...field}
+ onChange={(e) => {
+ field.onChange(e);
+ handleTitleChange(e.target.value);
+ }}
+ />
+ )}
+ />
+ </Form>
+ </div>
+ );
+}
+
+export default TaskTitle;
diff --git a/apps/web/src/components/ui/calendar.tsx b/apps/web/src/components/ui/calendar.tsx
new file mode 100644
index 000000000..107c3ab56
--- /dev/null
+++ b/apps/web/src/components/ui/calendar.tsx
@@ -0,0 +1,65 @@
+import { cn } from "@/lib/cn";
+import { ChevronLeft, ChevronRight } from "lucide-react";
+import type * as React from "react";
+import { DayPicker } from "react-day-picker";
+
+export type CalendarProps = React.ComponentProps<typeof DayPicker>;
+
+function Calendar({
+ className,
+ classNames,
+ showOutsideDays = true,
+ ...props
+}: CalendarProps) {
+ return (
+ <DayPicker
+ showOutsideDays={showOutsideDays}
+ className={cn("p-3", className)}
+ classNames={{
+ months: "flex flex-col sm:flex-row space-y-4 sm:space-x-4 sm:space-y-0",
+ month: "space-y-4",
+ caption: "flex justify-center pt-1 relative items-center",
+ caption_label: "text-sm font-medium",
+ nav: "space-x-1 flex items-center",
+ nav_button: cn(
+ "h-7 w-7 bg-transparent p-0 opacity-50 hover:opacity-100",
+ "text-zinc-800 dark:text-zinc-100",
+ "hover:bg-zinc-100 dark:hover:bg-zinc-800 rounded-md transition-colors",
+ ),
+ nav_button_previous: "absolute left-1",
+ nav_button_next: "absolute right-1",
+ table: "w-full border-collapse space-y-1",
+ head_row: "flex",
+ head_cell:
+ "text-zinc-500 dark:text-zinc-400 rounded-md w-9 font-normal text-[0.8rem]",
+ row: "flex w-full mt-2",
+ cell: "h-9 w-9 text-center text-sm p-0 relative [&:has([aria-selected].day-range-end)]:rounded-r-md [&:has([aria-selected].day-outside)]:bg-zinc-100/50 [&:has([aria-selected])]:bg-zinc-100 dark:[&:has([aria-selected].day-outside)]:bg-zinc-800/50 dark:[&:has([aria-selected])]:bg-zinc-800 first:[&:has([aria-selected])]:rounded-l-md last:[&:has([aria-selected])]:rounded-r-md focus-within:relative focus-within:z-20",
+ day: cn(
+ "h-9 w-9 p-0 font-normal",
+ "aria-selected:opacity-100",
+ "hover:bg-zinc-100 dark:hover:bg-zinc-800 rounded-md transition-colors",
+ "focus:outline-none focus:ring-2 focus:ring-indigo-500 dark:focus:ring-indigo-400",
+ ),
+ day_range_end: "day-range-end",
+ day_selected:
+ "bg-indigo-600 dark:bg-indigo-500 text-white hover:bg-indigo-600 dark:hover:bg-indigo-500 hover:text-white focus:bg-indigo-600 dark:focus:bg-indigo-500 focus:text-white",
+ day_today: "bg-zinc-100 dark:bg-zinc-800",
+ day_outside:
+ "day-outside text-zinc-500 dark:text-zinc-400 opacity-50 aria-selected:bg-zinc-100/50 dark:aria-selected:bg-zinc-800/50 aria-selected:text-zinc-500 dark:aria-selected:text-zinc-400",
+ day_disabled: "text-zinc-500 dark:text-zinc-400 opacity-50",
+ day_range_middle:
+ "aria-selected:bg-zinc-100 dark:aria-selected:bg-zinc-800 aria-selected:text-zinc-900 dark:aria-selected:text-zinc-50",
+ day_hidden: "invisible",
+ ...classNames,
+ }}
+ components={{
+ IconLeft: () => <ChevronLeft className="h-4 w-4" />,
+ IconRight: () => <ChevronRight className="h-4 w-4" />,
+ }}
+ {...props}
+ />
+ );
+}
+Calendar.displayName = "Calendar";
+
+export { Calendar };
diff --git a/apps/web/src/components/ui/popover.tsx b/apps/web/src/components/ui/popover.tsx
new file mode 100644
index 000000000..9b4b9e03f
--- /dev/null
+++ b/apps/web/src/components/ui/popover.tsx
@@ -0,0 +1,46 @@
+import * as PopoverPrimitive from "@radix-ui/react-popover";
+import type * as React from "react";
+
+import { cn } from "@/lib/cn";
+
+function Popover({
+ ...props
+}: React.ComponentProps<typeof PopoverPrimitive.Root>) {
+ return <PopoverPrimitive.Root data-slot="popover" {...props} />;
+}
+
+function PopoverTrigger({
+ ...props
+}: React.ComponentProps<typeof PopoverPrimitive.Trigger>) {
+ return <PopoverPrimitive.Trigger data-slot="popover-trigger" {...props} />;
+}
+
+function PopoverContent({
+ className,
+ align = "center",
+ sideOffset = 4,
+ ...props
+}: React.ComponentProps<typeof PopoverPrimitive.Content>) {
+ return (
+ <PopoverPrimitive.Portal>
+ <PopoverPrimitive.Content
+ data-slot="popover-content"
+ align={align}
+ sideOffset={sideOffset}
+ className={cn(
+ "bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 w-72 rounded-md border p-4 shadow-md outline-hidden",
+ className,
+ )}
+ {...props}
+ />
+ </PopoverPrimitive.Portal>
+ );
+}
+
+function PopoverAnchor({
+ ...props
+}: React.ComponentProps<typeof PopoverPrimitive.Anchor>) {
+ return <PopoverPrimitive.Anchor data-slot="popover-anchor" {...props} />;
+}
+
+export { Popover, PopoverTrigger, PopoverContent, PopoverAnchor };
diff --git a/apps/web/src/fetchers/activity/create-activity.ts b/apps/web/src/fetchers/activity/create-activity.ts
new file mode 100644
index 000000000..1e6eed1c4
--- /dev/null
+++ b/apps/web/src/fetchers/activity/create-activity.ts
@@ -0,0 +1,21 @@
+import { api } from "@kaneo/libs";
+
+async function createActivity(data: {
+ taskId: string;
+ content: string;
+ userEmail: string;
+}) {
+ const response = await api.activity.comment.post({
+ taskId: data.taskId,
+ content: data.content,
+ userEmail: data.userEmail,
+ });
+
+ if (response.error) {
+ throw new Error(response.error.value.message);
+ }
+
+ return response.data;
+}
+
+export default createActivity;
diff --git a/apps/web/src/fetchers/activity/get-activites-by-task-id.ts b/apps/web/src/fetchers/activity/get-activites-by-task-id.ts
new file mode 100644
index 000000000..6c8539ca4
--- /dev/null
+++ b/apps/web/src/fetchers/activity/get-activites-by-task-id.ts
@@ -0,0 +1,13 @@
+import { api } from "@kaneo/libs";
+
+async function getActivitesByTaskId(taskId: string) {
+ const response = await api.activity.list({ taskId }).get();
+
+ if (response.error) {
+ throw new Error(response.error.value.message);
+ }
+
+ return response.data;
+}
+
+export default getActivitesByTaskId;
diff --git a/apps/web/src/fetchers/task/get-task.ts b/apps/web/src/fetchers/task/get-task.ts
new file mode 100644
index 000000000..49bb26dec
--- /dev/null
+++ b/apps/web/src/fetchers/task/get-task.ts
@@ -0,0 +1,13 @@
+import { api } from "@kaneo/libs";
+
+async function getTask(taskId: string) {
+ const response = await api.task({ taskId }).get();
+
+ if (response.error) {
+ throw new Error(response.error.value.message);
+ }
+
+ return response.data;
+}
+
+export default getTask;
diff --git a/apps/web/src/fetchers/task/update-task.ts b/apps/web/src/fetchers/task/update-task.ts
new file mode 100644
index 000000000..7c31d5c53
--- /dev/null
+++ b/apps/web/src/fetchers/task/update-task.ts
@@ -0,0 +1,14 @@
+import type { Task } from "@/types/project";
+import { api } from "@kaneo/libs";
+
+async function updateTask(taskId: string, task: Task) {
+ const response = await api.task({ taskId }).update.put(task);
+
+ if (response.status !== 200) {
+ throw new Error("Failed to update task");
+ }
+
+ return response.data;
+}
+
+export default updateTask;
diff --git a/apps/web/src/hooks/mutations/activity/use-create-activity.ts b/apps/web/src/hooks/mutations/activity/use-create-activity.ts
new file mode 100644
index 000000000..cac69f608
--- /dev/null
+++ b/apps/web/src/hooks/mutations/activity/use-create-activity.ts
@@ -0,0 +1,10 @@
+import createActivity from "@/fetchers/activity/create-activity";
+import { useMutation } from "@tanstack/react-query";
+
+function useCreateActivity() {
+ return useMutation({
+ mutationFn: createActivity,
+ });
+}
+
+export default useCreateActivity;
diff --git a/apps/web/src/hooks/mutations/task/use-update-task.ts b/apps/web/src/hooks/mutations/task/use-update-task.ts
new file mode 100644
index 000000000..63f8ed0b3
--- /dev/null
+++ b/apps/web/src/hooks/mutations/task/use-update-task.ts
@@ -0,0 +1,11 @@
+import updateTask from "@/fetchers/task/update-task";
+import type { Task } from "@/types/project";
+import { useMutation } from "@tanstack/react-query";
+
+function useUpdateTask() {
+ return useMutation({
+ mutationFn: (task: Task) => updateTask(task.id, task),
+ });
+}
+
+export default useUpdateTask;
diff --git a/apps/web/src/hooks/queries/activity/use-get-activities-by-task-id.ts b/apps/web/src/hooks/queries/activity/use-get-activities-by-task-id.ts
new file mode 100644
index 000000000..d32f10499
--- /dev/null
+++ b/apps/web/src/hooks/queries/activity/use-get-activities-by-task-id.ts
@@ -0,0 +1,11 @@
+import getActivitesByTaskId from "@/fetchers/activity/get-activites-by-task-id";
+import { useQuery } from "@tanstack/react-query";
+
+function useGetActivitiesByTaskId(taskId: string) {
+ return useQuery({
+ queryKey: ["activities", taskId],
+ queryFn: () => getActivitesByTaskId(taskId),
+ });
+}
+
+export default useGetActivitiesByTaskId;
diff --git a/apps/web/src/hooks/queries/task/use-get-task.ts b/apps/web/src/hooks/queries/task/use-get-task.ts
new file mode 100644
index 000000000..99afeda41
--- /dev/null
+++ b/apps/web/src/hooks/queries/task/use-get-task.ts
@@ -0,0 +1,13 @@
+import getTask from "@/fetchers/task/get-task";
+import { useQuery } from "@tanstack/react-query";
+
+function useGetTask(taskId: string) {
+ return useQuery({
+ queryKey: ["task", taskId],
+ queryFn: () => getTask(taskId),
+ refetchOnMount: true,
+ refetchOnWindowFocus: true,
+ });
+}
+
+export default useGetTask;
diff --git a/apps/web/src/lib/debounce.ts b/apps/web/src/lib/debounce.ts
new file mode 100644
index 000000000..0096705a8
--- /dev/null
+++ b/apps/web/src/lib/debounce.ts
@@ -0,0 +1,12 @@
+function debounce<Args extends unknown[], R>(
+ func: (...args: Args) => Promise<R> | R,
+ delay: number,
+) {
+ let timeout: ReturnType<typeof setTimeout>;
+ return (...args: Args) => {
+ clearTimeout(timeout);
+ timeout = setTimeout(() => func(...args), delay);
+ };
+}
+
+export default debounce;
diff --git a/apps/web/src/routes/dashboard/workspace/$workspaceId/project/$projectId/task/$taskId.tsx b/apps/web/src/routes/dashboard/workspace/$workspaceId/project/$projectId/task/$taskId.tsx
index f2c3b5ff6..87033efb9 100644
--- a/apps/web/src/routes/dashboard/workspace/$workspaceId/project/$projectId/task/$taskId.tsx
+++ b/apps/web/src/routes/dashboard/workspace/$workspaceId/project/$projectId/task/$taskId.tsx
@@ -1,4 +1,14 @@
-import { createFileRoute } from "@tanstack/react-router";
+import TaskActivities from "@/components/task/task-activities";
+import TaskComment from "@/components/task/task-comment";
+import TaskDescription from "@/components/task/task-description";
+import TaskInfo from "@/components/task/task-info";
+import TaskTitle from "@/components/task/task-title";
+import useGetTask from "@/hooks/queries/task/use-get-task";
+import useProjectStore from "@/store/project";
+import { Link, Navigate, createFileRoute } from "@tanstack/react-router";
+import { motion } from "framer-motion";
+import { X } from "lucide-react";
+import { useState } from "react";
export const Route = createFileRoute(
"/dashboard/workspace/$workspaceId/project/$projectId/task/$taskId",
@@ -7,5 +17,88 @@ export const Route = createFileRoute(
});
function TaskEditPage() {
- return <div>Task edit</div>;
+ const { taskId, workspaceId, projectId } = Route.useParams();
+ const { data: task } = useGetTask(taskId);
+ const { project } = useProjectStore();
+ const [isSaving, setIsSaving] = useState(false);
+
+ if (!task || !project) {
+ return (
+ <Navigate
+ to="/dashboard/workspace/$workspaceId/project/$projectId/board"
+ params={{
+ workspaceId,
+ projectId,
+ }}
+ />
+ );
+ }
+
+ return (
+ <motion.div
+ initial={{ opacity: 0 }}
+ animate={{ opacity: 1 }}
+ className="h-full flex flex-col bg-white dark:bg-zinc-900 overflow-hidden"
+ >
+ <header className="sticky top-0 z-10 flex items-center px-4 h-[65px] bg-white dark:bg-zinc-900 border-b border-zinc-200 dark:border-zinc-800">
+ <div className="flex items-center gap-2 flex-1 min-w-0">
+ <Link
+ to="/dashboard/workspace/$workspaceId/project/$projectId/board"
+ params={{
+ workspaceId,
+ projectId,
+ }}
+ className="p-1.5 rounded-md hover:bg-zinc-100 dark:hover:bg-zinc-800 transition-colors"
+ >
+ <X className="w-4 h-4 text-zinc-500 dark:text-zinc-400" />
+ </Link>
+ <div className="flex-1 min-w-0">
+ <div className="text-xs font-mono text-zinc-500 dark:text-zinc-400 mb-0.5">
+ {project?.slug}-{task.number}
+ </div>
+ <TaskTitle setIsSaving={setIsSaving} />
+ </div>
+ </div>
+ <div className="flex items-center gap-1.5 ml-4">
+ {isSaving && (
+ <span className="text-xs text-zinc-500 dark:text-zinc-400">
+ Saving...
+ </span>
+ )}
+ </div>
+ </header>
+
+ <div className="flex-1 min-h-0 md:flex-row">
+ <div className="flex-1 min-w-0 overflow-y-auto border-r border-zinc-200 dark:border-zinc-800 flex flex-col-reverse md:flex-row">
+ <div className="px-6 py-6 space-y-6">
+ <div className="space-y-8">
+ <TaskDescription setIsSaving={setIsSaving} />
+
+ <div className="space-y-4">
+ <div className="flex items-center justify-between">
+ <h2 className="text-base font-medium text-zinc-900 dark:text-zinc-100">
+ Comments & Activity
+ </h2>
+ <div className="flex items-center gap-2">
+ <button
+ type="button"
+ className="text-xs text-zinc-500 dark:text-zinc-400 hover:text-zinc-900 dark:hover:text-zinc-100"
+ >
+ Show all
+ </button>
+ </div>
+ </div>
+ </div>
+
+ <div className="space-y-6">
+ <TaskComment />
+ <TaskActivities />
+ </div>
+ </div>
+ </div>
+ <TaskInfo setIsSaving={setIsSaving} />
+ </div>
+ </div>
+ </motion.div>
+ );
}
diff --git a/bun.lockb b/bun.lockb
index 19b65d5e2..7c7cb7d55 100755
Binary files a/bun.lockb and b/bun.lockb differ