diff --git a/src/app/(application)/announcement/page.tsx b/src/app/(application)/announcement/page.tsx index 4551abb..2aef08e 100644 --- a/src/app/(application)/announcement/page.tsx +++ b/src/app/(application)/announcement/page.tsx @@ -1,8 +1,11 @@ +import { ViewFilter } from "@/module/_global"; import { ViewListAnnouncement } from "@/module/announcement"; -function Page() { +function Page({ searchParams }: { searchParams: { page: string } }) { + if (searchParams.page == 'filter') + return return ( - + ) } diff --git a/src/app/(application)/detail-feature/page.tsx b/src/app/(application)/detail-feature/page.tsx deleted file mode 100644 index 7838a54..0000000 --- a/src/app/(application)/detail-feature/page.tsx +++ /dev/null @@ -1,10 +0,0 @@ -import { ViewDetailFeature } from '@/module/home'; -import React from 'react'; - -function Page() { - return ( - - ); -} - -export default Page; \ No newline at end of file diff --git a/src/app/(application)/home/page.tsx b/src/app/(application)/home/page.tsx index f1e2ec6..7aa3ca1 100644 --- a/src/app/(application)/home/page.tsx +++ b/src/app/(application)/home/page.tsx @@ -1,9 +1,13 @@ -import LayoutNavbarHome from '@/module/_global/layout/layout_navbar_home'; -import { ViewHome } from '@/module/home'; -import { Flex, Group, Text } from '@mantine/core'; +import { ViewDetailFeature, ViewHome, ViewNotification, ViewSearch } from '@/module/home'; import React from 'react'; -function Page() { +function Page({ searchParams }: { searchParams: { cat: string } }) { + if (searchParams.cat == "notification") + return + if (searchParams.cat == "search") + return + if (searchParams.cat == "fitur") + return return ( <> diff --git a/src/app/(application)/member/page.tsx b/src/app/(application)/member/page.tsx index 8b49914..3bdaf36 100644 --- a/src/app/(application)/member/page.tsx +++ b/src/app/(application)/member/page.tsx @@ -1,6 +1,10 @@ +import { ViewFilter } from "@/module/_global"; import { ViewListMember } from "@/module/user/member"; -function Page() { +function Page({ searchParams }: { searchParams: { page: string } }) { + if (searchParams.page == "filter") + return + return ( ) diff --git a/src/app/(application)/notification/page.tsx b/src/app/(application)/notification/page.tsx deleted file mode 100644 index 67c880a..0000000 --- a/src/app/(application)/notification/page.tsx +++ /dev/null @@ -1,10 +0,0 @@ -import { ViewNotification } from '@/module/notification'; -import React from 'react'; - -function Page() { - return ( - - ); -} - -export default Page; diff --git a/src/app/(application)/search/page.tsx b/src/app/(application)/search/page.tsx deleted file mode 100644 index 198a79b..0000000 --- a/src/app/(application)/search/page.tsx +++ /dev/null @@ -1,10 +0,0 @@ -import { ViewSearch } from '@/module/search'; -import React from 'react'; - -function Page() { - return ( - - ); -} - -export default Page; diff --git a/src/module/_global/index.ts b/src/module/_global/index.ts index ef95e3c..60a43da 100644 --- a/src/module/_global/index.ts +++ b/src/module/_global/index.ts @@ -5,6 +5,7 @@ import LoadingPage from "./layout/layout_loading_page"; import LayoutLogin from "./layout/layout_login"; import LayoutNavbarHome from "./layout/layout_navbar_home"; import LayoutNavbarNew from "./layout/layout_navbar_new"; +import ViewFilter from "./view/view_filter"; export { WARNA } export { LayoutLogin } @@ -12,4 +13,5 @@ export { LayoutNavbarHome } export { LayoutIconBack } export { LoadingPage } export { LayoutDrawer } -export { LayoutNavbarNew } \ No newline at end of file +export { LayoutNavbarNew } +export { ViewFilter } \ No newline at end of file diff --git a/src/module/_global/view/view_filter.tsx b/src/module/_global/view/view_filter.tsx new file mode 100644 index 0000000..9bf3048 --- /dev/null +++ b/src/module/_global/view/view_filter.tsx @@ -0,0 +1,76 @@ +'use client' +import { Box, Group, Divider, Button, Text } from "@mantine/core"; +import { useState } from "react"; +import { FaCheck } from "react-icons/fa6"; +import { WARNA } from "../fun/WARNA"; +import LayoutNavbarNew from "../layout/layout_navbar_new"; +import { useRouter } from "next/navigation"; + +const dataFilter = [ + { + id: 1, + name: 'Dinas' + }, + { + id: 2, + name: 'Adat' + }, + { + id: 3, + name: 'LPD' + }, + { + id: 4, + name: 'Karang Taruna' + }, + { + id: 5, + name: 'BPD' + }, + { + id: 6, + name: 'LPM' + }, +] +export default function ViewFilter() { + const [selectedFilter, setSelectedFilter] = useState(null); + + const handleFilterClick = (filterName: string) => { + setSelectedFilter(filterName); + }; + + const router = useRouter() + + return ( + + + + {dataFilter.map((filter) => ( + + handleFilterClick(filter.name)} + > + + {filter.name} + + {selectedFilter === filter.name && } + + + + ))} + + + + ); +} \ No newline at end of file diff --git a/src/module/announcement/component/ui/drawer_announcement.tsx b/src/module/announcement/component/ui/drawer_announcement.tsx index 42161fb..2d7d6d5 100644 --- a/src/module/announcement/component/ui/drawer_announcement.tsx +++ b/src/module/announcement/component/ui/drawer_announcement.tsx @@ -15,6 +15,9 @@ export default function DrawerAnnouncement() { cols={{ base: 3, sm: 3, lg: 3 }} > { router.push('/announcement/create') }} @@ -27,7 +30,14 @@ export default function DrawerAnnouncement() { - + { + router.push('/announcement?page=filter') + }} + > diff --git a/src/module/announcement/component/ui/navbar_create_announcement.tsx b/src/module/announcement/component/ui/navbar_create_announcement.tsx deleted file mode 100644 index cb25c3e..0000000 --- a/src/module/announcement/component/ui/navbar_create_announcement.tsx +++ /dev/null @@ -1,21 +0,0 @@ -'use client' -import { LayoutIconBack, LayoutNavbarHome } from "@/module/_global"; -import { Box, Grid, Text } from "@mantine/core"; - -export default function NavbarCreateAnnouncement() { - return ( - - - - - - - - Tambah Pengumuman - - - - - - ) -} \ No newline at end of file diff --git a/src/module/announcement/component/ui/navbar_edit_announcement.tsx b/src/module/announcement/component/ui/navbar_edit_announcement.tsx deleted file mode 100644 index 3add416..0000000 --- a/src/module/announcement/component/ui/navbar_edit_announcement.tsx +++ /dev/null @@ -1,21 +0,0 @@ -'use client' -import { LayoutIconBack, LayoutNavbarHome } from "@/module/_global"; -import { Box, Grid, Text } from "@mantine/core"; - -export default function NavbarEditAnnouncement() { - return ( - - - - - - - - Edit Pengumuman - - - - - - ) -} \ No newline at end of file diff --git a/src/module/announcement/view/view_create_announcement.tsx b/src/module/announcement/view/view_create_announcement.tsx index 7b62cda..3c4e803 100644 --- a/src/module/announcement/view/view_create_announcement.tsx +++ b/src/module/announcement/view/view_create_announcement.tsx @@ -1,14 +1,12 @@ import { LayoutNavbarNew, WARNA } from "@/module/_global"; -import { Box, Stack, TextInput, Button, Textarea } from "@mantine/core"; -import { HiOutlineChevronRight, HiUser } from "react-icons/hi2"; +import { Box } from "@mantine/core"; import CreateAnnouncement from "../component/create_announcement"; export default function ViewCreateAnnouncement() { return ( - {/* */} } /> - + ) } \ No newline at end of file diff --git a/src/module/announcement/view/view_edit_announcement.tsx b/src/module/announcement/view/view_edit_announcement.tsx index 22114c3..39e0c16 100644 --- a/src/module/announcement/view/view_edit_announcement.tsx +++ b/src/module/announcement/view/view_edit_announcement.tsx @@ -1,12 +1,10 @@ -import { Box, Button, Stack, Textarea, TextInput } from "@mantine/core"; -import { LayoutNavbarNew, WARNA } from "@/module/_global"; -import { HiOutlineChevronRight } from "react-icons/hi2"; +import { Box } from "@mantine/core"; +import { LayoutNavbarNew } from "@/module/_global"; import EditAnnouncement from "../component/edit_announcement"; export default function ViewEditAnnouncement({ data }: { data: string }) { return ( - {/* */} } /> diff --git a/src/module/home/components/features.tsx b/src/module/home/components/features.tsx index 5a842d5..e9ead7f 100644 --- a/src/module/home/components/features.tsx +++ b/src/module/home/components/features.tsx @@ -56,7 +56,7 @@ export default function Features() { Pengumuman - router.push('detail-feature')}> + router.push('/home?cat=fitur')}>
- router.push('/search')} variant="light" bg={WARNA.bgIcon} size="lg" radius="lg" aria-label="Settings"> + router.push('/home?cat=search')} variant="light" bg={WARNA.bgIcon} size="lg" radius="lg" aria-label="Settings"> - router.push('/notification')} variant="light" bg={WARNA.bgIcon} size="lg" radius="lg" aria-label="Settings"> + router.push('/home?cat=notification')} variant="light" bg={WARNA.bgIcon} size="lg" radius="lg" aria-label="Settings"> - router.push('/profile')} variant="light" bg={WARNA.bgIcon} size="lg" radius="lg" aria-label="Settings"> + router.push('/profile')} variant="light" bg={WARNA.bgIcon} size="lg" radius="lg" aria-label="Settings"> diff --git a/src/module/home/index.ts b/src/module/home/index.ts index 0a599af..7b242dd 100644 --- a/src/module/home/index.ts +++ b/src/module/home/index.ts @@ -1,5 +1,9 @@ import ViewDetailFeature from "./view/view_detail_feature"; import ViewHome from "./view/view_home"; +import ViewNotification from "./view/view_notification"; +import ViewSearch from "./view/view_search"; export { ViewHome } -export {ViewDetailFeature} \ No newline at end of file +export { ViewDetailFeature } +export { ViewSearch } +export { ViewNotification } \ No newline at end of file diff --git a/src/module/home/view/view_detail_feature.tsx b/src/module/home/view/view_detail_feature.tsx index 71e4880..bddfed1 100644 --- a/src/module/home/view/view_detail_feature.tsx +++ b/src/module/home/view/view_detail_feature.tsx @@ -1,28 +1,17 @@ 'use client' -import { LayoutNavbarHome, WARNA } from '@/module/_global'; -import { ActionIcon, Box, Center, Grid, Group, SimpleGrid, Text } from '@mantine/core'; +import { LayoutNavbarNew, WARNA } from '@/module/_global'; +import { ActionIcon, Box, Center, SimpleGrid, Text } from '@mantine/core'; import React from 'react'; import { HiMiniUserGroup, HiMiniPresentationChartBar, HiMegaphone, HiSquares2X2, HiChevronLeft, HiUserGroup, HiUsers } from "react-icons/hi2"; import { PiUsersFourFill } from "react-icons/pi"; -import { FaUsersRays, FaUserTie } from "react-icons/fa6"; import { useRouter } from 'next/navigation'; -import LayoutIconBack from '@/module/_global/layout/layout_icon_back'; +import { FaUserTie } from 'react-icons/fa6'; export default function ViewDetailFeature() { const router = useRouter() return ( <> - - - - - - - SEMUA FITUR - - - - + } /> Perbekal Darmasaba - + diff --git a/src/module/notification/view/view_notification.tsx b/src/module/home/view/view_notification.tsx similarity index 100% rename from src/module/notification/view/view_notification.tsx rename to src/module/home/view/view_notification.tsx diff --git a/src/module/search/view/view_search.tsx b/src/module/home/view/view_search.tsx similarity index 100% rename from src/module/search/view/view_search.tsx rename to src/module/home/view/view_search.tsx diff --git a/src/module/notification/index.ts b/src/module/notification/index.ts deleted file mode 100644 index 46ca4d0..0000000 --- a/src/module/notification/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -import ViewNotification from "./view/view_notification"; - -export {ViewNotification} \ No newline at end of file diff --git a/src/module/search/index.ts b/src/module/search/index.ts deleted file mode 100644 index c9195cd..0000000 --- a/src/module/search/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -import ViewSearch from "./view/view_search"; - -export {ViewSearch} \ No newline at end of file diff --git a/src/module/user/member/component/ui/drawer_list_member.tsx b/src/module/user/member/component/ui/drawer_list_member.tsx index 0715ad2..92a79fa 100644 --- a/src/module/user/member/component/ui/drawer_list_member.tsx +++ b/src/module/user/member/component/ui/drawer_list_member.tsx @@ -32,6 +32,9 @@ export default function DrawerListMember() { { + router.push('/member?page=filter') + }} >