From 14284e1d357c25d1da6cbe1f76791a1cee3113d2 Mon Sep 17 00:00:00 2001 From: Andrew Trieu Date: Sat, 23 Nov 2024 17:19:09 +0200 Subject: [PATCH] feat: Update task and project ID formats, add populateSeedData function, and enhance user ID handling --- .../src/app/components/ModalNewTask/index.tsx | 22 +- .../src/app/components/Sidebar/index.tsx | 5 +- .../src/app/components/TaskCard/index.tsx | 2 +- tasker-client/src/app/home/page.tsx | 7 +- .../priority/reusablePriorityPage/index.tsx | 6 +- .../src/app/projects/BoardView/index.tsx | 46 +- .../src/app/projects/ListView/index.tsx | 12 +- .../src/app/projects/TableView/index.tsx | 13 +- .../src/app/projects/TimelineView/index.tsx | 12 +- tasker-client/src/app/projects/[id]/page.tsx | 11 +- tasker-client/src/app/search/page.tsx | 4 +- tasker-client/src/app/teams/page.tsx | 3 +- tasker-client/src/app/timeline/page.tsx | 2 +- tasker-server/seed/populateSeedData.ts | 1181 +++++++++++++++++ tasker-server/serverless.yml | 5 + tasker-server/src/handlers/createProject.ts | 2 +- tasker-server/src/handlers/createTask.ts | 2 +- tasker-server/src/handlers/createUser.ts | 5 +- tasker-server/src/handlers/postSignUp.ts | 44 - tasker-server/src/lib/util.ts | 14 +- tasker-server/terraform/s3.tf | 19 +- 21 files changed, 1299 insertions(+), 118 deletions(-) create mode 100644 tasker-server/seed/populateSeedData.ts delete mode 100644 tasker-server/src/handlers/postSignUp.ts diff --git a/tasker-client/src/app/components/ModalNewTask/index.tsx b/tasker-client/src/app/components/ModalNewTask/index.tsx index 6ce89d5..9748383 100644 --- a/tasker-client/src/app/components/ModalNewTask/index.tsx +++ b/tasker-client/src/app/components/ModalNewTask/index.tsx @@ -23,7 +23,14 @@ const ModalNewTask = ({ isOpen, onClose, id = null }: Props) => { const [projectId, setProjectId] = useState(""); const handleSubmit = async () => { - if (!title || !authorUserId || !(id !== null || projectId)) return; + console.log(title, authorUserId, id, projectId); + + console.log("Creating task 1.."); + if ( + !(title && authorUserId && assignedUserId && (id !== null || projectId)) + ) + return; + console.log("Creating task 2..."); const formattedStartDate = formatISO(new Date(startDate), { representation: "complete", @@ -40,14 +47,17 @@ const ModalNewTask = ({ isOpen, onClose, id = null }: Props) => { tags, startDate: formattedStartDate, dueDate: formattedDueDate, - authorUserId: parseInt(authorUserId), - assignedUserId: parseInt(assignedUserId), - projectId: id !== null ? Number(id) : Number(projectId), + authorUserId: authorUserId, + assignedUserId: assignedUserId, + projectId: id !== null ? id : projectId, }); }; const isFormValid = () => { - return title && authorUserId && !(id !== null || projectId); + console.log(title, authorUserId, id, projectId); + return ( + title && authorUserId && assignedUserId && (id !== null || projectId) + ); }; const selectStyles = @@ -87,7 +97,7 @@ const ModalNewTask = ({ isOpen, onClose, id = null }: Props) => { } > - + diff --git a/tasker-client/src/app/components/Sidebar/index.tsx b/tasker-client/src/app/components/Sidebar/index.tsx index 419cf34..928b23b 100644 --- a/tasker-client/src/app/components/Sidebar/index.tsx +++ b/tasker-client/src/app/components/Sidebar/index.tsx @@ -93,7 +93,6 @@ const Sidebar = () => {