diff --git a/src/app/(application)/(detail-division)/document/page.tsx b/src/app/(application)/(detail-division)/document/page.tsx index ad59b92..e0730cc 100644 --- a/src/app/(application)/(detail-division)/document/page.tsx +++ b/src/app/(application)/(detail-division)/document/page.tsx @@ -1,7 +1,11 @@ import { ViewDocumentDivision } from '@/module/division_new'; +import ListDocumentsDivision from '@/module/division_new/_division_fitur/document/components/list_documents_division'; import React from 'react'; -function Page() { +function Page({ searchParams }: { searchParams: any }) { + if (searchParams.page == "list-document") + return ; + return ( ); diff --git a/src/app/(application)/(detail-division)/task/create/page.tsx b/src/app/(application)/(detail-division)/task/create/page.tsx index 973c6f4..e5660a0 100644 --- a/src/app/(application)/(detail-division)/task/create/page.tsx +++ b/src/app/(application)/(detail-division)/task/create/page.tsx @@ -12,4 +12,5 @@ function Page({ searchParams }: { searchParams: any }) { return } -export default Page \ No newline at end of file +export default Page +// onClick={() => router.push('/document?page=list-document')} \ No newline at end of file diff --git a/src/module/division_new/_division_fitur/document/components/list_documents_division.tsx b/src/module/division_new/_division_fitur/document/components/list_documents_division.tsx index 0f719f5..a91f975 100644 --- a/src/module/division_new/_division_fitur/document/components/list_documents_division.tsx +++ b/src/module/division_new/_division_fitur/document/components/list_documents_division.tsx @@ -1,89 +1,80 @@ -import { ActionIcon, Box, Checkbox, Divider, Flex, Grid, Group, Text } from '@mantine/core'; -import React from 'react'; +"use client"; +import { LayoutNavbarNew } from "@/module/_global"; +import { + ActionIcon, + Box, + Checkbox, + Divider, + Flex, + Grid, + Group, + Text, +} from "@mantine/core"; +import React from "react"; import { FcDocument, FcFolder, FcImageFile } from "react-icons/fc"; const dataDocuments = [ { - id: 1, - name: 'Administrasi', - date: '18/06/2024 14.00 PM', - icon: - }, - { - id: 2, - name: 'Administrasi', - date: '18/06/2024 14.00 PM', - icon: + id: 3, + name: "Berkas Kerja", + date: "18/06/2024 14.00 PM", + icon: , }, { id: 3, - name: 'Administrasi', - date: '18/06/2024 14.00 PM', - icon: + name: "Berkas Kerja", + date: "18/06/2024 14.00 PM", + icon: , }, { id: 3, - name: 'Berkas Kerja', - date: '18/06/2024 14.00 PM', - icon: + name: "Image Kegiatan", + date: "18/06/2024 14.00 PM", + icon: , }, { id: 3, - name: 'Berkas Kerja', - date: '18/06/2024 14.00 PM', - icon: + name: "Image Pelaksanaan", + date: "18/06/2024 14.00 PM", + icon: , }, - { - id: 3, - name: 'Image Kegiatan', - date: '18/06/2024 14.00 PM', - icon: - }, - { - id: 3, - name: 'Image Pelaksanaan', - date: '18/06/2024 14.00 PM', - icon: - }, -] +]; export default function ListDocumentsDivision() { return ( + {dataDocuments.map((v, i) => { return ( - + - - {v.icon} - - + {v.icon} + {v.name} {v.date} - - + + - ) + ); })} ); } - diff --git a/src/module/division_new/_division_fitur/document/components/ui/navbar_document_division.tsx b/src/module/division_new/_division_fitur/document/components/ui/navbar_document_division.tsx index a6a42cd..52100a6 100644 --- a/src/module/division_new/_division_fitur/document/components/ui/navbar_document_division.tsx +++ b/src/module/division_new/_division_fitur/document/components/ui/navbar_document_division.tsx @@ -14,6 +14,7 @@ import { MdOutlineMoreHoriz } from 'react-icons/md'; import LayoutModal from '@/module/_global/layout/layout_modal'; import toast from 'react-hot-toast'; import DrawerMore from './drawer_more'; +import { useRouter } from 'next/navigation'; const dataDocuments = [ { @@ -68,6 +69,7 @@ const dataDocuments = [ export default function NavbarDocumentDivision() { const [isChecked, setIsChecked] = useState(false); + const router = useRouter() const handleCheckboxChange = () => { setIsChecked(!isChecked); @@ -147,8 +149,8 @@ export default function NavbarDocumentDivision() { return ( - - + + router.push('/document?page=list-document')}> {v.icon} diff --git a/src/module/division_new/components/detail_division/list_discussion.tsx b/src/module/division_new/components/detail_division/list_discussion.tsx index f4485dd..2f8926b 100644 --- a/src/module/division_new/components/detail_division/list_discussion.tsx +++ b/src/module/division_new/components/detail_division/list_discussion.tsx @@ -1,76 +1,88 @@ -import { WARNA } from "@/module/_global" -import { Box, Group, Text } from "@mantine/core" -import { CiUser, CiClock2 } from "react-icons/ci" -import { GoDiscussionClosed } from "react-icons/go" - +"use client" +import { WARNA } from "@/module/_global"; +import { Box, Group, Text } from "@mantine/core"; +import { useRouter } from "next/navigation"; +import { CiUser, CiClock2 } from "react-icons/ci"; +import { GoDiscussionClosed } from "react-icons/go"; const dataDiskusi = [ - { - id: 1, - judul: 'Mengatasi Limbah Makanan ', - user: 'Fibra Marcell', - date: '21 Juni 2024' - }, - { - id: 2, - judul: 'Pentingnya Menjaga Kelestarian Hutan ', - user: 'Bayu Tegar', - date: '15 Juni 2024' - }, - { - id: 3, - judul: 'Mengatasi Limbah Industri ', - user: 'Nian Putri', - date: '11 Mei 2024' - }, - { - id: 4, - judul: 'Manfaat Sampah Plastik', - user: 'Budi Prasetyo', - date: '10 Mei 2024' - }, -] + { + id: 1, + judul: "Mengatasi Limbah Makanan ", + user: "Fibra Marcell", + date: "21 Juni 2024", + }, + { + id: 2, + judul: "Pentingnya Menjaga Kelestarian Hutan ", + user: "Bayu Tegar", + date: "15 Juni 2024", + }, + { + id: 3, + judul: "Mengatasi Limbah Industri ", + user: "Nian Putri", + date: "11 Mei 2024", + }, + { + id: 4, + judul: "Manfaat Sampah Plastik", + user: "Budi Prasetyo", + date: "10 Mei 2024", + }, +]; export default function ListDiscussionOnDetailDivision() { - return ( - <> - - Diskusi Terbaru - - { - dataDiskusi.map((v, i) => { - return ( - - - - - {v.judul} - - - - - - {v.user} - - - - {v.date} - - - - ) - }) - } - - - - ) -} \ No newline at end of file + const router = useRouter(); + return ( + <> + + + Diskusi Terbaru + + + {dataDiskusi.map((v, i) => { + return ( + router.push(`/discussion/${v.id}`)} + > + + + + + {v.judul} + + + + + + + {v.user} + + + + {v.date} + + + + ); + })} + + + + ); +} diff --git a/src/module/division_new/components/detail_division/list_document.tsx b/src/module/division_new/components/detail_division/list_document.tsx index c1456cc..4498727 100644 --- a/src/module/division_new/components/detail_division/list_document.tsx +++ b/src/module/division_new/components/detail_division/list_document.tsx @@ -3,6 +3,7 @@ import { WARNA } from "@/module/_global"; import { Carousel } from "@mantine/carousel"; import { Box, Image, Text, Center, Paper, Stack, UnstyledButton } from "@mantine/core"; import * as ICON from '../../../division/lib/file_icon' +import { useRouter } from "next/navigation"; const iconContainer = (icon: string) => 'data:image/svg+xml;base64,' + btoa(icon) @@ -41,13 +42,14 @@ const listDocument = [ ] export default function ListDocumentOnDetailDivision() { + const router = useRouter() return ( Dokumen Terbaru { listDocument.map((v) => - + router.push(`/document`)}>
diff --git a/src/module/division_new/components/detail_division/list_task.tsx b/src/module/division_new/components/detail_division/list_task.tsx index ddcf318..c8e8cfd 100644 --- a/src/module/division_new/components/detail_division/list_task.tsx +++ b/src/module/division_new/components/detail_division/list_task.tsx @@ -2,6 +2,7 @@ import { WARNA } from "@/module/_global"; import { Carousel } from "@mantine/carousel"; import { Avatar, Box, Group, Text } from "@mantine/core"; +import { useRouter } from "next/navigation"; import { CiClock2 } from "react-icons/ci"; import { MdAccountCircle } from "react-icons/md"; @@ -33,13 +34,14 @@ const dataTask = [ ] export default function ListTaskOnDetailDivision() { + const router = useRouter() return ( Tugas Hari Ini {dataTask.map((v, i) => - + router.push(`/task/${v.id}`)} bg={WARNA.biruTua} style={{ borderRadius: 10, border: `1px solid ${"#D6D8F6"}` }}> {v.title}