diff --git a/src/app/(application)/position/page.tsx b/src/app/(application)/position/page.tsx index 9dd2f1a..c377930 100644 --- a/src/app/(application)/position/page.tsx +++ b/src/app/(application)/position/page.tsx @@ -1,7 +1,11 @@ +import { ViewFilter } from '@/module/_global'; import { ViewListPosition } from '@/module/position'; import React from 'react'; -function Page() { +function Page({ searchParams }: { searchParams: { page: string } }) { + if (searchParams.page == "filter") + return + return ( ); diff --git a/src/module/group/components/ui/edit_drawer_group.tsx b/src/module/group/components/ui/edit_drawer_group.tsx index 17de722..cea9bf4 100644 --- a/src/module/group/components/ui/edit_drawer_group.tsx +++ b/src/module/group/components/ui/edit_drawer_group.tsx @@ -3,6 +3,7 @@ import { LayoutDrawer, WARNA } from '@/module/_global'; import LayoutModal from '@/module/_global/layout/layout_modal'; import { Box, Button, Center, Flex, Group, SimpleGrid, Stack, Text, TextInput } from '@mantine/core'; import React, { useState } from 'react'; +import { FaPencil, FaToggleOff } from 'react-icons/fa6'; import { IoAddCircle, IoCloseCircleOutline } from "react-icons/io5"; export default function EditDrawerGroup({ onUpdated }: { onUpdated: (val: boolean) => void }) { @@ -27,15 +28,15 @@ export default function EditDrawerGroup({ onUpdated }: { onUpdated: (val: boolea setModal(true)} style={{ cursor: 'pointer' }}> - + - Tidak Aktif + Non Aktifkan setOpenDrawerGroup(true)} style={{ cursor: 'pointer' }}> - + Edit diff --git a/src/module/home/components/list_notification.tsx b/src/module/home/components/list_notification.tsx index fec0182..4295857 100644 --- a/src/module/home/components/list_notification.tsx +++ b/src/module/home/components/list_notification.tsx @@ -3,7 +3,7 @@ import { WARNA } from '@/module/_global'; import { ActionIcon, Box, Center, Grid, Group, Text } from '@mantine/core'; import { useRouter } from 'next/navigation'; import React from 'react'; -import { HiUser } from 'react-icons/hi2'; +import { FaBell } from 'react-icons/fa6'; const dataNotification = [ { @@ -69,23 +69,21 @@ export default function ListNotification() { {dataNotification.map((v, i) => { return ( - - - - - - - - + + + + + + {v.title} - {v.description} - - - + + {v.description} + + ) })} diff --git a/src/module/home/view/view_detail_feature.tsx b/src/module/home/view/view_detail_feature.tsx index 08608ca..e17dc1a 100644 --- a/src/module/home/view/view_detail_feature.tsx +++ b/src/module/home/view/view_detail_feature.tsx @@ -5,7 +5,7 @@ import React from 'react'; import { HiMiniUserGroup, HiMiniPresentationChartBar, HiMegaphone, HiSquares2X2, HiChevronLeft, HiUserGroup, HiUsers } from "react-icons/hi2"; import { PiUsersFourFill } from "react-icons/pi"; import { useRouter } from 'next/navigation'; -import { FaUserTie } from 'react-icons/fa6'; +import { FaUserTag, FaUserTie } from 'react-icons/fa6'; export default function ViewDetailFeature() { const router = useRouter() @@ -73,20 +73,6 @@ export default function ViewDetailFeature() { Anggota - router.push('/group')}> -
- - - -
-
- Group -
- router.push('/position')}>
Jabatan
+ router.push('/group')}> +
+ + + +
+
+ Group +
+ diff --git a/src/module/position/component/ui/drawer_detail_position.tsx b/src/module/position/component/ui/drawer_detail_position.tsx index 315337b..af32c71 100644 --- a/src/module/position/component/ui/drawer_detail_position.tsx +++ b/src/module/position/component/ui/drawer_detail_position.tsx @@ -2,8 +2,7 @@ import { LayoutDrawer, WARNA } from "@/module/_global" import LayoutModal from "@/module/_global/layout/layout_modal" import { Box, Stack, SimpleGrid, Flex, Text, Select, TextInput, Button } from "@mantine/core" import { useState } from "react" -import { FaPencil } from "react-icons/fa6" -import { ImUserCheck } from "react-icons/im" +import { FaPencil, FaToggleOff } from "react-icons/fa6" export default function DrawerDetailPosition({ onUpdated }: { onUpdated: (val: boolean) => void }) { const [openDrawerGroup, setOpenDrawerGroup] = useState(false) @@ -32,10 +31,10 @@ export default function DrawerDetailPosition({ onUpdated }: { onUpdated: (val: b onClick={() => setModal(true)} > - + - Status + Non Aktifkan diff --git a/src/module/position/component/ui/drawer_list_position.tsx b/src/module/position/component/ui/drawer_list_position.tsx index 6270588..a26221a 100644 --- a/src/module/position/component/ui/drawer_list_position.tsx +++ b/src/module/position/component/ui/drawer_list_position.tsx @@ -1,10 +1,13 @@ import { WARNA, LayoutDrawer } from "@/module/_global"; import { Box, Stack, SimpleGrid, Flex, TextInput, Button, Text, Select } from "@mantine/core"; +import { useRouter } from "next/navigation"; import { useState } from "react"; import { IoAddCircle } from "react-icons/io5"; +import { RiFilter2Line } from "react-icons/ri"; export default function DrawerListPosition({ onCreated }: { onCreated: (val: boolean) => void }) { const [openDrawerGroup, setOpenDrawerGroup] = useState(false) + const router = useRouter() function onCLose() { setOpenDrawerGroup(false) @@ -25,6 +28,14 @@ export default function DrawerListPosition({ onCreated }: { onCreated: (val: boo Tambah Jabatan + router.push('/position?page=filter')}> + + + + + Filter + + setOpenDrawerGroup(false)} title={'Tambah Jabatan'} size="lg"> diff --git a/src/module/position/component/ui/list_position_active.tsx b/src/module/position/component/ui/list_position_active.tsx index 46db1f1..2938316 100644 --- a/src/module/position/component/ui/list_position_active.tsx +++ b/src/module/position/component/ui/list_position_active.tsx @@ -9,35 +9,43 @@ import toast from 'react-hot-toast'; const dataGroup = [ { id: 1, - name: 'Kepala' + name: 'Kepala', + grup: 'Dinas' }, { id: 2, - name: 'Sekretaris' + name: 'Sekretaris', + grup: 'LPD' }, { id: 3, - name: 'Bendahara' + name: 'Bendahara', + grup: 'Dinas' }, { id: 4, - name: 'Anggota' + name: 'Anggota', + grup: 'Karang Taruna' }, { id: 5, - name: 'Kepala Urusan Kemasyarakatan' + name: 'Kepala Urusan Kemasyarakatan', + grup: 'Dinas' }, { id: 6, - name: 'Kepala Urusan Pemerintahan' + name: 'Kepala Urusan Pemerintahan', + grup: 'Dinas' }, { id: 7, - name: 'Kepala Urusan Kependudukan' + name: 'Kepala Urusan Kependudukan', + grup: 'Dinas' }, { id: 8, - name: 'Anggota' + name: 'Anggota', + grup: 'Dinas' }, ] @@ -78,6 +86,7 @@ export default function ListPositionActive() { {v.name} + {v.grup} diff --git a/src/module/position/component/ui/list_position_nonactive.tsx b/src/module/position/component/ui/list_position_nonactive.tsx index de941fc..c9954bf 100644 --- a/src/module/position/component/ui/list_position_nonactive.tsx +++ b/src/module/position/component/ui/list_position_nonactive.tsx @@ -9,35 +9,43 @@ import toast from 'react-hot-toast'; const dataGroup = [ { id: 1, - name: 'Anggota' + name: 'Kepala', + grup: 'Dinas' }, { id: 2, - name: 'Anggota' + name: 'Sekretaris', + grup: 'LPD' }, { id: 3, - name: 'Anggota' + name: 'Bendahara', + grup: 'Dinas' }, { id: 4, - name: 'Anggota' + name: 'Anggota', + grup: 'Karang Taruna' }, { id: 5, - name: 'Anggota' + name: 'Kepala Urusan Kemasyarakatan', + grup: 'Dinas' }, { id: 6, - name: 'Anggota' + name: 'Kepala Urusan Pemerintahan', + grup: 'Dinas' }, { id: 7, - name: 'Anggota' + name: 'Kepala Urusan Kependudukan', + grup: 'Dinas' }, { id: 8, - name: 'Anggota' + name: 'Anggota', + grup: 'Dinas' }, ] @@ -78,6 +86,7 @@ export default function ListPositionNonActive() { {v.name} + {v.grup} diff --git a/src/module/user/member/component/create_member.tsx b/src/module/user/member/component/create_member.tsx index a45d4b2..5acea0d 100644 --- a/src/module/user/member/component/create_member.tsx +++ b/src/module/user/member/component/create_member.tsx @@ -1,7 +1,7 @@ 'use client' import { WARNA } from "@/module/_global"; import LayoutModal from "@/module/_global/layout/layout_modal"; -import { Box, Button, Stack, TextInput } from "@mantine/core"; +import { Box, Button, Select, Stack, TextInput } from "@mantine/core"; import { useState } from "react"; import toast from "react-hot-toast"; import { HiUser } from "react-icons/hi2"; @@ -31,6 +31,28 @@ export default function CreateMember() { }}> + +