Merge branch 'join' into lukman/15-agustus-2024

src/app/(application)/division/[id]/(fitur-division)/task/create/page.tsx

@@ -1,16 +1,11 @@
-import { ViewCreateTaskDivision } from "@/module/division_new";
-import { ViewDateEndTask, CreateUsersProject, ViewFileSave } from "@/module/project";
+import { CreateTask, FileSave } from "@/module/task";
 
 function Page({ searchParams }: { searchParams: any }) {
-   if (searchParams.page == "task")
-      return <ViewDateEndTask kategori="task"/>;
-   if (searchParams.page == "create-users")
-      return <CreateUsersProject kategori="task"/>
-   if (searchParams.page == "file-save")
-      return <ViewFileSave kategori="task"/>
 
-   return <ViewCreateTaskDivision searchParams={searchParams} />
+   if (searchParams.page == "file-save")
+      return <FileSave kategori="task" />
+
+   return <CreateTask />
 }
 
-export default Page
-// onClick={() => router.push('/document?page=list-document')}
+export default Page

src/app/api/calender/[id]/route.ts

@@ -1,3 +1,4 @@
+
 import { prisma } from "@/module/_global";
 import { funGetUserByCookies } from "@/module/auth";
 import _, { result } from "lodash";
@@ -91,3 +92,4 @@ export async function GET(request: Request, context: { params: { id: string } })
         );
     }
 }
+

src/app/api/task/route.ts

@@ -67,9 +67,6 @@ export async function GET(request: Request) {
          member: v.DivisionProjectMember.length
       }))
 
-      console.log('amalia', formatData)
-
-
       return NextResponse.json({ success: true, message: "Berhasil mendapatkan divisi", data, }, { status: 200 });
 
    } catch (error) {