From 5b332caf359166a18d48bec9bdfed7d55599e99e Mon Sep 17 00:00:00 2001 From: amel Date: Mon, 19 Aug 2024 13:39:50 +0800 Subject: [PATCH] refactor: folder manager task --- .../task/update/[detail]/page.tsx | 15 - .../view_update_progress_division_task.tsx | 273 ------------------ src/module/division_new/index.ts | 2 - .../task/ui/navbar_detail_division_task.tsx | 78 ++++- 4 files changed, 63 insertions(+), 305 deletions(-) delete mode 100644 src/app/(application)/division/[id]/(fitur-division)/task/update/[detail]/page.tsx delete mode 100644 src/module/division_new/_division_fitur/task/view/view_update_progress_division_task.tsx diff --git a/src/app/(application)/division/[id]/(fitur-division)/task/update/[detail]/page.tsx b/src/app/(application)/division/[id]/(fitur-division)/task/update/[detail]/page.tsx deleted file mode 100644 index ba41d90..0000000 --- a/src/app/(application)/division/[id]/(fitur-division)/task/update/[detail]/page.tsx +++ /dev/null @@ -1,15 +0,0 @@ -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 == "detail-create-user") - return ; - if (searchParams.page == "detail-date-task") return ; - - return ( - - ) -} - -export default Page \ No newline at end of file diff --git a/src/module/division_new/_division_fitur/task/view/view_update_progress_division_task.tsx b/src/module/division_new/_division_fitur/task/view/view_update_progress_division_task.tsx deleted file mode 100644 index 5cf7f9e..0000000 --- a/src/module/division_new/_division_fitur/task/view/view_update_progress_division_task.tsx +++ /dev/null @@ -1,273 +0,0 @@ -'use client' -import { LayoutNavbarNew, WARNA, LayoutDrawer } from "@/module/_global"; -import { Box, Group, Grid, Center, Checkbox, SimpleGrid, Button, Flex, Text } from "@mantine/core"; -import { useRouter } from "next/navigation"; -import { useState } from "react"; -import { AiOutlineFileSync } from "react-icons/ai"; -import { BsFiletypeCsv } from "react-icons/bs"; -import { IoIosArrowDropright } from "react-icons/io"; - -export default function ViewUpdateProgressDivisionTask({ searchParams }: { searchParams: any }) { - const router = useRouter(); - const [openDrawer, setOpenDrawer] = useState(false); - return ( - - - - - setOpenDrawer(true)} - > - Upload File - - - - - - router.push("/task/update/1?page=detail-date-task") - } - > - Tambah Tanggal & Tugas - - - - - Tanggal & Tugas - - - - -
- -
- - - - - - Laporan Permasyarakatan - - - - - - Tanggal Mulai - - 16 Juni 2024 - - - - Tanggal Berakhir - - 20 Juni 2024 - - - - - - - {searchParams.tugas == "yes" && ( - <> - - -
- -
- - - - - - Laporan Dua - - - - - - Tanggal Mulai - - 21 Juni 2024 - - - - Tanggal Berakhir - - 30 Juni 2024 - - - - - - - - )} - - - - File - - - - - - Proyek Laporan Permasyarakatan - - - - - - Proyek Laporan Permasyarakatan - - - - - - - - - setOpenDrawer(false)} - title={"Pilih File"} - > - - ""}> - -
- -
- - - Pilih file - - diperangkat - - - router.push("/task/update/1?page=upload-progres") - } - > - -
- -
- - - Pilih file yang - - sudah ada - - - - - ) -} \ No newline at end of file diff --git a/src/module/division_new/index.ts b/src/module/division_new/index.ts index 744d897..49adb78 100644 --- a/src/module/division_new/index.ts +++ b/src/module/division_new/index.ts @@ -9,7 +9,6 @@ import ViewDivisionCalender from "./_division_fitur/calender/view/view_division_ import ViewHistoryDivisionCalender from "./_division_fitur/calender/view/view_history_division_calender"; import ViewUpdateDivisionCalender from "./_division_fitur/calender/view/view_update_division_calender"; import ViewDocumentDivision from "./_division_fitur/document/view/view_document_division"; -import ViewUpdateProgressDivisionTask from "./_division_fitur/task/view/view_update_progress_division_task"; import CreateAdminDivision from "./ui/create_admin_division"; import CreateUsers from "./ui/create_users"; import ListDivision from './ui/list_division'; @@ -29,7 +28,6 @@ import { funGetDivisionById } from './lib/api_division'; export { CreateUsers }; export { CreateAdminDivision }; -export { ViewUpdateProgressDivisionTask }; export { ViewDivisionCalender }; export { ViewCreateDivisionCalender }; export { UlangiEvent }; diff --git a/src/module/task/ui/navbar_detail_division_task.tsx b/src/module/task/ui/navbar_detail_division_task.tsx index 512d4da..6e39331 100644 --- a/src/module/task/ui/navbar_detail_division_task.tsx +++ b/src/module/task/ui/navbar_detail_division_task.tsx @@ -1,17 +1,20 @@ 'use client' -import { LayoutNavbarNew, WARNA } from "@/module/_global"; -import { ActionIcon } from "@mantine/core"; +import { LayoutDrawer, LayoutNavbarNew, WARNA } from "@/module/_global"; +import { ActionIcon, Box, Flex, SimpleGrid, Stack, Text } from "@mantine/core"; import { useParams, useRouter } from "next/navigation"; import { useState } from "react"; import toast from "react-hot-toast"; -import { LuClipboardEdit } from "react-icons/lu"; import { funGetTaskDivisionById } from "../lib/api_task"; import { useShallowEffect } from "@mantine/hooks"; +import { HiMenu } from "react-icons/hi"; +import { IoAddCircle } from "react-icons/io5"; +import { RiFilter2Line } from "react-icons/ri"; export default function NavbarDetailDivisionTask() { const router = useRouter() const param = useParams<{ id: string, detail: string }>() const [name, setName] = useState('') + const [isOpen, setOpen] = useState(false) async function getOneData() { try { @@ -34,17 +37,62 @@ export default function NavbarDetailDivisionTask() { return ( - router.push("update/clzwclyjc00072sqq4sbr5iz4")} - > - - - } /> + <> + { }} + > + + + } /> + + + setOpen(false)}> + + + + { + router.push('/announcement/create') + }} + > + + + + + Tambah Pengumuman + + + + { + router.push('/announcement?page=filter') + }} + > + + + + + Filter + + + + + + + ) } \ No newline at end of file