diff --git a/src/app/(application)/(detail-division)/task/create/page.tsx b/src/app/(application)/(detail-division)/task/create/page.tsx new file mode 100644 index 0000000..973c6f4 --- /dev/null +++ b/src/app/(application)/(detail-division)/task/create/page.tsx @@ -0,0 +1,15 @@ +import { ViewCreateTaskDivision } from "@/module/division_new"; +import { ViewDateEndTask, CreateUsersProject, ViewFileSave } from "@/module/project"; + +function Page({ searchParams }: { searchParams: any }) { + if (searchParams.page == "task") + return ; + if (searchParams.page == "create-users") + return + if (searchParams.page == "file-save") + return + + return +} + +export default Page \ No newline at end of file diff --git a/src/app/(application)/(detail-division)/task/update/[id]/page.tsx b/src/app/(application)/(detail-division)/task/update/[id]/page.tsx index 54f7920..ba41d90 100644 --- a/src/app/(application)/(detail-division)/task/update/[id]/page.tsx +++ b/src/app/(application)/(detail-division)/task/update/[id]/page.tsx @@ -2,13 +2,13 @@ import { ViewUpdateProgressDivisionTask } from "@/module/division_new" import { DetailCreateUserProject, DetailDateEndTask, FileUploadProgres } from "@/module/project"; function Page({ searchParams }: { searchParams: any }) { - if (searchParams.page == "upload-progres") return ; + if (searchParams.page == "upload-progres") return ; if (searchParams.page == "detail-create-user") - return ; - if (searchParams.page == "detail-date-task") return ; - + return ; + if (searchParams.page == "detail-date-task") return ; + return ( - + ) } diff --git a/src/app/(application)/project/create/page.tsx b/src/app/(application)/project/create/page.tsx index 488ef99..41b26fa 100644 --- a/src/app/(application)/project/create/page.tsx +++ b/src/app/(application)/project/create/page.tsx @@ -3,11 +3,11 @@ import React from "react"; function Page({ searchParams }: { searchParams: any }) { if (searchParams.page == "task") - return ; + return ; if (searchParams.page == "create-users") - return + return if (searchParams.page == "file-save") - return + return return ; } diff --git a/src/app/(application)/project/update-detail/page.tsx b/src/app/(application)/project/update/[id]/page.tsx similarity index 79% rename from src/app/(application)/project/update-detail/page.tsx rename to src/app/(application)/project/update/[id]/page.tsx index 053ef42..e63311a 100644 --- a/src/app/(application)/project/update-detail/page.tsx +++ b/src/app/(application)/project/update/[id]/page.tsx @@ -8,10 +8,10 @@ import { import React from "react"; function Page({ searchParams }: { searchParams: any }) { - if (searchParams.page == "upload-progres") return ; + if (searchParams.page == "upload-progres") return ; if (searchParams.page == "detail-create-user") - return ; - if (searchParams.page == "detail-date-task") return ; + return ; + if (searchParams.page == "detail-date-task") return ; return ; } diff --git a/src/module/division_new/_division_fitur/task/component/create_task.tsx b/src/module/division_new/_division_fitur/task/component/create_task.tsx new file mode 100644 index 0000000..a55aa96 --- /dev/null +++ b/src/module/division_new/_division_fitur/task/component/create_task.tsx @@ -0,0 +1,130 @@ +"use client"; +import { LayoutDrawer, LayoutNavbarNew, WARNA } from "@/module/_global"; +import { Box, Button, Center, Flex, Group, Input, Stack, Text } from "@mantine/core"; +import { useRouter } from "next/navigation"; +import React, { useState } from "react"; +import { IoIosArrowDropright } from "react-icons/io"; +import { BsFiletypeCsv } from "react-icons/bs"; +import ResultsDateAndTask from "@/module/project/components/results_date-and_task"; +import ResultsFile from "@/module/project/components/results_file"; + +export default function CreateTask({ searchParams }: { searchParams: any }) { + const router = useRouter(); + const [openDrawer, setOpenDrawer] = useState(false); + return ( + + + + + + router.push("/task/create?page=task")}> + + Tambah Tanggal & Tugas + + + + setOpenDrawer(true)} + > + Upload File + + + + { + (searchParams.anggota == 'yes') && + <> + + + } + + {(searchParams.files == 'yes') && + <> + + + } + + { + (searchParams.button == 'yes') && + <> + + + + + } + + + + + + + setOpenDrawer(false)} + title={"Pilih File"} + > + + ""}> + +
+ +
+ + + Pilih file + + diperangkat + + router.push("/task/create?page=file-save")}> + +
+ +
+ + + Pilih file yang + + sudah ada + + + + + ); +} diff --git a/src/module/division_new/_division_fitur/task/view/view_create_division_task.tsx b/src/module/division_new/_division_fitur/task/view/view_create_division_task.tsx new file mode 100644 index 0000000..da3acf8 --- /dev/null +++ b/src/module/division_new/_division_fitur/task/view/view_create_division_task.tsx @@ -0,0 +1,7 @@ +import CreateTask from "../component/create_task"; + +export default function ViewCreateTaskDivision({ searchParams }: { searchParams: any }) { + return ( + + ); +} \ No newline at end of file diff --git a/src/module/division_new/index.ts b/src/module/division_new/index.ts index b97d315..9681368 100644 --- a/src/module/division_new/index.ts +++ b/src/module/division_new/index.ts @@ -1,5 +1,6 @@ import ViewCreateDivisionCalender from "./_division_fitur/calender/view/view_create_division_calender"; import ViewDivisionCalender from "./_division_fitur/calender/view/view_division_calender"; +import ViewCreateTaskDivision from "./_division_fitur/task/view/view_create_division_task"; import ViewDetailDivisionTask from "./_division_fitur/task/view/view_detail_division_task"; import ViewDivisionTask from "./_division_fitur/task/view/view_division_task"; import ViewUpdateProgressDivisionTask from "./_division_fitur/task/view/view_update_progress_division_task"; @@ -20,4 +21,5 @@ export { ViewDivisionTask } export { ViewDetailDivisionTask } export { ViewUpdateProgressDivisionTask } export { ViewDivisionCalender } -export { ViewCreateDivisionCalender } \ No newline at end of file +export { ViewCreateDivisionCalender } +export { ViewCreateTaskDivision } \ No newline at end of file diff --git a/src/module/project/components/create_date_end_task.tsx b/src/module/project/components/create_date_end_task.tsx index f769f14..60392be 100644 --- a/src/module/project/components/create_date_end_task.tsx +++ b/src/module/project/components/create_date_end_task.tsx @@ -50,13 +50,13 @@ const dataTugas = [ }, ]; -export default function ViewDateEndTask() { +export default function ViewDateEndTask({ kategori }: { kategori: string }) { const [value, setValue] = useState<[Date | null, Date | null]>([null, null]); const router = useRouter() return ( - + - router.push('/project/create?page=create-users')}> + router.push(`/${kategori}/create?page=create-users`)}> router.push('/project/create?anggota=yes')} + onClick={() => router.push(`/${kategori}/create?anggota=yes`)} > Simpan diff --git a/src/module/project/components/create_users_project.tsx b/src/module/project/components/create_users_project.tsx index 028bc17..f996ec5 100644 --- a/src/module/project/components/create_users_project.tsx +++ b/src/module/project/components/create_users_project.tsx @@ -43,12 +43,12 @@ const DateUsers = [ }, ]; -export default function CreateUsersProject() { +export default function CreateUsersProject({ kategori }: { kategori: string }) { const router = useRouter() return ( @@ -103,7 +103,7 @@ export default function CreateUsersProject() { size="lg" radius={30} fullWidth - onClick={() => router.push('/project/create?page=task')} + onClick={() => router.push(`/${kategori}/create?page=task`)} > Simpan diff --git a/src/module/project/components/detail_project/detail_create_user_project.tsx b/src/module/project/components/detail_project/detail_create_user_project.tsx index f694bc2..f31f282 100644 --- a/src/module/project/components/detail_project/detail_create_user_project.tsx +++ b/src/module/project/components/detail_project/detail_create_user_project.tsx @@ -43,13 +43,13 @@ const DateUsers = [ }, ]; -export default function DetailCreateUserProject() { +export default function DetailCreateUserProject({ kategori }: { kategori: string }) { const router = useRouter(); return ( @@ -104,7 +104,7 @@ export default function DetailCreateUserProject() { size="lg" radius={30} fullWidth - onClick={() => router.push("/project/update-detail?page=detail-date-task")} + onClick={() => router.push(`/${kategori}/update/1?page=detail-date-task`)} > Simpan diff --git a/src/module/project/components/detail_project/detail_date_end_task.tsx b/src/module/project/components/detail_project/detail_date_end_task.tsx index 06e9237..3a33740 100644 --- a/src/module/project/components/detail_project/detail_date_end_task.tsx +++ b/src/module/project/components/detail_project/detail_date_end_task.tsx @@ -50,138 +50,138 @@ const dataTugas = [ }, ]; -export default function DetailDateEndTask() { +export default function DetailDateEndTask({ kategori }: { kategori: string }) { const [value, setValue] = useState<[Date | null, Date | null]>([null, null]); const router = useRouter() return ( - - - - - - - - Tanggal Mulai - - {value[0] ? `${value[0].toLocaleDateString()}` : ""} - - - - Tanggal Berakhir - - {value[1] ? `${value[1].toLocaleDateString()}` : ""} - - - - - - router.push('/project/update-detail?page=detail-create-user')}> - - Tambah Anggota - - - - - - - Anggota Terpilih - Total 10 Anggota + + + + - - - + + Tanggal Mulai + + {value[0] ? `${value[0].toLocaleDateString()}` : ""} + + + + Tanggal Berakhir + + {value[1] ? `${value[1].toLocaleDateString()}` : ""} + + + + + + router.push(`/${kategori}/update/1?page=detail-create-user`)}> + - - Divisi Kerohanian - - {dataTugas.map((v, i) => { - return ( - - - - - - {v.name} - - - {v.email} - - - - - Anggota - - - ); - })} + Tambah Anggota + + + + + + + Anggota Terpilih + Total 10 Anggota + + + + + + Divisi Kerohanian + + {dataTugas.map((v, i) => { + return ( + + + + + + {v.name} + + + {v.email} + + + + + Anggota + + + ); + })} + - - - + + + - ); } diff --git a/src/module/project/components/detail_project/detail_project.tsx b/src/module/project/components/detail_project/detail_project.tsx index dea41a3..6e0837f 100644 --- a/src/module/project/components/detail_project/detail_project.tsx +++ b/src/module/project/components/detail_project/detail_project.tsx @@ -69,7 +69,7 @@ export default function DetailProject() { size="lg" radius="lg" aria-label="Settings" - onClick={() => router.push("/project/update-detail")} + onClick={() => router.push("/project/update/1")} > diff --git a/src/module/project/components/detail_project/file_upload_progres.tsx b/src/module/project/components/detail_project/file_upload_progres.tsx index b9f043b..7732344 100644 --- a/src/module/project/components/detail_project/file_upload_progres.tsx +++ b/src/module/project/components/detail_project/file_upload_progres.tsx @@ -33,7 +33,7 @@ const dataFile = [ ]; -export default function FileUploadProgres() { +export default function FileUploadProgres({ kategori }: { kategori: string }) { const router = useRouter() const [selectedFiles, setSelectedFiles] = useState>({}); @@ -46,7 +46,7 @@ export default function FileUploadProgres() { return ( - + - diff --git a/src/module/project/components/detail_project/update_progres.tsx b/src/module/project/components/detail_project/update_progres.tsx index 2210556..a402e4f 100644 --- a/src/module/project/components/detail_project/update_progres.tsx +++ b/src/module/project/components/detail_project/update_progres.tsx @@ -49,7 +49,7 @@ export default function UpdateProgres({ searchParams }: { searchParams: any }) { borderRadius: 10, }} onClick={() => - router.push("/project/update-detail?page=detail-date-task") + router.push("/project/update/1?page=detail-date-task") } > Tambah Tanggal & Tugas @@ -256,7 +256,7 @@ export default function UpdateProgres({ searchParams }: { searchParams: any }) { - router.push("/project/update-detail?page=upload-progres") + router.push("/project/update/1?page=upload-progres") } > >({}); @@ -46,7 +46,7 @@ export default function FileSave() { return ( - + - diff --git a/src/module/project/view/view_file_save.tsx b/src/module/project/view/view_file_save.tsx index 6949a64..a9f58aa 100644 --- a/src/module/project/view/view_file_save.tsx +++ b/src/module/project/view/view_file_save.tsx @@ -1,9 +1,9 @@ import React from 'react'; import FileSave from '../components/file_save'; -export default function ViewFileSave() { +export default function ViewFileSave({ kategori }: { kategori: string }) { return ( - + ); }