upd: list kegiatan

Deskripsi:
- update api berdasarkan kategori data
- update tampilan untuk role user dan coadmin di kasih filter berdasarkan data
- tulisan filter by menjadi filter

No Issues

src/module/project/ui/list_project.tsx

@@ -20,6 +20,7 @@ export default function ListProject() {
   const searchParams = useSearchParams()
   const status = searchParams.get('status')
   const group = searchParams.get('group')
+  const kategori = searchParams.get('cat')
   const [searchQuery, setSearchQuery] = useState('')
   const roleLogin = useHookstate(globalRole)
   const [nameGroup, setNameGroup] = useState('')
@@ -43,7 +44,7 @@ export default function ListProject() {
       if (isPage == 1) {
         setData([])
       }
-      const response = await funGetAllProject('?status=' + status + '&search=' + searchQuery + '&group=' + group + '&page=' + isPage)
+      const response = await funGetAllProject('?status=' + status + '&search=' + searchQuery + '&group=' + group + '&page=' + isPage + '&cat=' + kategori);
       if (response.success) {
         setNameGroup(response.filter.name)
         setTotalData(response.total)
@@ -67,7 +68,7 @@ export default function ListProject() {
   useShallowEffect(() => {
     setPage(1)
     fetchData(true);
-  }, [status, searchQuery]);
+  }, [status, searchQuery, kategori]);
 
 
   useShallowEffect(() => {
@@ -152,7 +153,8 @@ export default function ListProject() {
         </Grid.Col>
       </Grid>
       <Box pt={20}>
-        {roleLogin.get() == 'supadmin' && <Text mb={5}>Filter by: {nameGroup}</Text>}
+        {roleLogin.get() == 'supadmin' && <Text mb={5}>Filter : {nameGroup}</Text>}
+        {(roleLogin.get() == 'user' || roleLogin.get() == 'coadmin') && <Text mb={5}>Filter : {(kategori == null || kategori == undefined || kategori == '') ? 'Kegiatan Saya' : 'Semua Kegiatan'}</Text>}
         <Box bg={tema.get().bgTotalKegiatan} p={10} style={{ borderRadius: 10 }}>
           <Text fw={'bold'} c={tema.get().utama}>Total Kegiatan</Text>
           <Flex justify={'center'} align={'center'} h={'100%'}>

src/module/project/ui/menu_drawer_project.tsx

@@ -1,8 +1,7 @@
-import { globalRole, TEMA, WARNA } from '@/module/_global';
+import { globalRole, TEMA } from '@/module/_global';
 import { useHookstate } from '@hookstate/core';
 import { Box, Flex, SimpleGrid, Stack, Text } from '@mantine/core';
 import { useSearchParams } from 'next/navigation';
-import React, { useState } from 'react';
 import { HiOutlineFilter } from 'react-icons/hi';
 import { IoAddCircle } from 'react-icons/io5';
 
@@ -10,6 +9,7 @@ export default function MenuDrawerProject() {
   const roleLogin = useHookstate(globalRole)
   const searchParams = useSearchParams()
   const group = searchParams.get('group')
+  const kategori = searchParams.get('cat')
   const tema = useHookstate(TEMA)
 
   return (
@@ -37,6 +37,18 @@ export default function MenuDrawerProject() {
               </Box>
             </Flex>
           }
+
+          {
+            (roleLogin.get() == "user" || roleLogin.get() == "coadmin") &&
+            <Flex onClick={() => window.location.href = "/project?page=filter-data&cat=" + kategori} justify={'center'} align={'center'} direction={'column'} >
+              <Box>
+                <HiOutlineFilter size={30} color={tema.get().utama} />
+              </Box>
+              <Box>
+                <Text c={tema.get().utama}>Filter</Text>
+              </Box>
+            </Flex>
+          }
         </SimpleGrid>
       </Stack>
     </Box>

src/module/project/ui/tab_project.tsx

@@ -1,16 +1,16 @@
 "use client"
-import { globalRole, LayoutDrawer, LayoutNavbarNew, TEMA } from '@/module/_global';
+import { LayoutDrawer, LayoutNavbarNew, TEMA } from '@/module/_global';
+import { useHookstate } from '@hookstate/core';
 import { ActionIcon, Box, Button, Flex, rem } from '@mantine/core';
-import React, { useState } from 'react';
-import { HiMenu } from 'react-icons/hi';
-import { RiProgress3Line } from "react-icons/ri";
 import { useRouter, useSearchParams } from 'next/navigation';
-import { TbClockPause } from 'react-icons/tb';
+import { useState } from 'react';
+import { HiMenu } from 'react-icons/hi';
 import { IoIosCheckmarkCircleOutline } from 'react-icons/io';
 import { IoCloseCircleOutline } from 'react-icons/io5';
+import { RiProgress3Line } from "react-icons/ri";
+import { TbClockPause } from 'react-icons/tb';
 import ListProject from './list_project';
 import MenuDrawerProject from './menu_drawer_project';
-import { useHookstate } from '@hookstate/core';
 
 export default function TabProject() {
   const [openDrawer, setOpenDrawer] = useState(false)
@@ -18,8 +18,8 @@ export default function TabProject() {
   const searchParams = useSearchParams()
   const status = searchParams.get('status')
   const group = searchParams.get("group");
+  const kategori = searchParams.get("cat");
   const iconStyle = { width: rem(20), height: rem(20) };
-  const roleLogin = useHookstate(globalRole)
   const tema = useHookstate(TEMA)
 
   const dataStatus = [
@@ -48,11 +48,10 @@ export default function TabProject() {
   return (
     <Box>
       <LayoutNavbarNew back='/home' title='Kegiatan'
-        menu={(roleLogin.get() != "user" && roleLogin.get() != "coadmin") ?
+        menu={
           <ActionIcon variant="light" onClick={() => setOpenDrawer(true)} bg={tema.get().bgIcon} size="lg" radius="lg" aria-label="Settings">
             <HiMenu size={20} color='white' />
           </ActionIcon>
-          : <></>
         } />
 
       <Box p={20}>
@@ -76,7 +75,7 @@ export default function TabProject() {
                     : (status == null && item.id == "0") ? "white" : tema.get().utama
                 }
                 key={index}
-                onClick={() => { router.push("?status=" + item.id + "&group=" + group) }}
+                onClick={() => { router.push("?status=" + item.id + "&group=" + group+"&cat="+kategori) }}
                 defaultValue={(status == "1" || status == "2" || status == "3") ? status : "0"}
                 radius={"xl"}
                 bg={
@@ -92,7 +91,6 @@ export default function TabProject() {
           </Flex>
         </Box>
         <ListProject />
-
       </Box>
 
       <LayoutDrawer opened={openDrawer} title={'Menu'} onClose={() => setOpenDrawer(false)}>