fix: resolve conflict

Author: ArianHamdi

src/components/Task/Task.tsx

@@ -17,7 +17,7 @@ const Task = (props: ITask) => {
 
   const { t } = useTranslation();
 
-  // const { open } = usePopup();
+  const { open } = usePopup();
 
   const toggleHandler = (e: MouseEvent<HTMLElement>) => {
     e.preventDefault();
@@ -26,21 +26,21 @@ const Task = (props: ITask) => {
 
   const deleteHandler = (e: MouseEvent<HTMLElement>) => {
     e.preventDefault();
-    // open({
-    //   message: t('delete_task', { title: title }),
-    //   title: t('delete'),
-    //   buttons: [
-    //     {
-    //       type: 'destructive',
-    //       text: t('delete'),
-    //       id: 'confirm',
-    //     },
-    //     {
-    //       type: 'cancel',
-    //     },
-    //   ],
-    //   onConfirm: () => deleteTask({ id }),
-    // });
+    open({
+      message: t('delete_task', { title: title }),
+      title: t('delete'),
+      buttons: [
+        {
+          type: 'destructive',
+          text: t('delete'),
+          id: 'confirm',
+        },
+        {
+          type: 'cancel',
+        },
+      ],
+      onConfirm: () => deleteTask({ id }),
+    });
   };
 
   return (

src/containers/CategoryForm/CategoryForm.tsx

@@ -17,6 +17,7 @@ import { useMemo } from 'react';
 import { yupResolver } from '@hookform/resolvers/yup';
 import Header from '@/components/Header';
 import { useBackButton } from '@/hooks/useBackButton';
+import NotFound from '@/components/NotFound';
 
 interface IProps {
   type: IFormType;
@@ -70,6 +71,8 @@ const CategoryForm = ({ type }: IProps) => {
 
   if (isLoading) return 'loading...';
 
+  if (!category && type === 'edit') return <NotFound />;
+
   return (
     <div>
       <Header>

src/containers/TaskForm/TaskForm.tsx

@@ -17,6 +17,7 @@ import { yupResolver } from '@hookform/resolvers/yup';
 import { useCreateTask, useEditTask, useTask } from '@/hooks/api/task';
 import Header from '@/components/Header';
 import { useBackButton } from '@/hooks/useBackButton';
+import NotFound from '@/components/NotFound';
 
 interface IProps {
   type: IFormType;
@@ -86,10 +87,16 @@ const TaskForm = ({ type }: IProps) => {
 
   if (isLoading) return 'loading...';
 
+  if (!task && type === 'edit') return <NotFound />;
+
   return (
     <div>
       <Header>
-        <h1>{t('new_task')}</h1>
+        <h1>
+          {type === 'create'
+            ? t('new_task')
+            : t('edit_task', { title: task?.title || '' })}
+        </h1>
       </Header>
       <div className={styles.taskForm}>
         <FormProvider {...methods}>

src/containers/TodoListForm/TodoListForm.tsx

@@ -15,6 +15,7 @@ import {
 } from '@/hooks/api/todo-list';
 import Header from '@/components/Header';
 import { useBackButton } from '@/hooks/useBackButton';
+import NotFound from '@/components/NotFound';
 
 interface IProps {
   type: IFormType;
@@ -69,10 +70,16 @@ const TodoListForm = ({ type }: IProps) => {
 
   if (isLoading) return 'loading...';
 
+  if (!todoList && type === 'edit') return <NotFound />;
+
   return (
     <div>
       <Header>
-        <h1>{t('new_todo_list')}</h1>
+        <h1>
+          {type === 'create'
+            ? t('new_todo_list')
+            : t('edit_todo_list', { title: todoList?.title || '' })}
+        </h1>
       </Header>
       <div className={styles.todoListForm}>
         <FormProvider {...methods}>

src/pages/api/todoList/[id].ts

@@ -29,7 +29,7 @@ export default withAuthorization(async function handler(
 
       case 'PUT':
         // Handle HTTP PUT request (update a todoList)
-        const { title, categoryId } = req.body; // Extract updated todoList data from the request body
+        const { title, categoryId, description } = req.body; // Extract updated todoList data from the request body
 
         // Validate the extracted data using the todoListSchema
         await todoListSchema.validate({
@@ -40,7 +40,7 @@ export default withAuthorization(async function handler(
         // Update the todoList in the database
         await prisma.todoList.update({
           where: { id: idAsString },
-          data: { title, categoryId },
+          data: { title, categoryId, description },
         });
 
         res.status(201).json('success'); // Respond with a success message

src/pages/api/todoList/index.ts

@@ -13,7 +13,7 @@ export default withAuthorization(async function handler(
     switch (req.method) {
       case 'POST':
         // Handle HTTP POST request (create a new todoList)
-        const { title, categoryId } = req.body; // Extract todoList data from the request body
+        const { title, categoryId, description } = req.body; // Extract todoList data from the request body
 
         // Validate the extracted data using the todoListSchema
         await todoListSchema.validate({ title, categoryId });
@@ -24,6 +24,7 @@ export default withAuthorization(async function handler(
             userId,
             title,
             categoryId,
+            description,
           },
         });