diff --git a/src/module/_global/bin/api_address.ts b/src/module/_global/bin/api_address.ts deleted file mode 100644 index f240546..0000000 --- a/src/module/_global/bin/api_address.ts +++ /dev/null @@ -1,45 +0,0 @@ -export const API_ADDRESS = { - // Group - "apiGetAllGroup": "/api/group/get?path=get-all-group", - "apiGetOneGroup": "/api/group/get?path=get-one-group", - "apiCreateGroup": "/api/group/post?path=create-group", - "apiUpdateGroup": "/api/group/post?path=update-group", - "apiDeleteGroup": "/api/group/post?path=delete-group", - - // User - "apiGetAllUser": "/api/user/get?path=get-all-users", - "apiGetOneUser": "/api/user/get?path=get-one-users", - "apiCreateUser": "/api/user/post?path=create-users", - "apiUpdateUser": "/api/user/post?path=update-users", - "apiDeleteUser": "/api/user/post?path=delete-users", - "apiGetRoleUser": "/api/user/get?path=get-role-user", - - // Announcement - "apiGetAllAnnouncement": "/api/announcement/get?path=get-all-announcement", - "apiGetOneAnnouncement": "/api/announcement/get?path=get-one-announcement", - "apiGetUserAnnouncement": "/api/announcement/get?path=get-user-announcement", - "apiCreateAnnouncement": "/api/announcement/post?path=create-announcement", - "apiUpdateAnnouncement": "/api/announcement/post?path=update-announcement", - "apiDeleteAnnouncement": "/api/announcement/post?path=delete-announcement", - - // Village - "apiGetAllVillage": "/api/village/get?path=get-all-village", - "apiGetOneVillage": "/api/village/get?path=get-one-village", - "apiCreateVillage": "/api/village/post?path=create-village", - "apiUpdateVillage": "/api/village/post?path=update-village", - "apiDeleteVillage": "/api/village/post?path=delete-village", - - // Position - "apiGetAllPosition": "/api/position/get?path=get-all-position", - "apiGetOnePosition": "/api/position/get?path=get-one-position", - "apiCreatePosition": "/api/position/post?path=create-position", - "apiUpdatePosition": "/api/position/post?path=update-position", - "apiDeletePosition": "/api/position/post?path=delete-position", - - - // Division - "apiGetAllDivision": "/api/division/get?path=get-all-division", - "apiGetOneDivision": "/api/division/get?path=get-one-division", - "apiGetOneDetailDivision": "/api/division/get?path=get-one-detail-division", - "apiCreateDivision": "/api/division/post?path=create-division", -} \ No newline at end of file diff --git a/src/module/_global/index.ts b/src/module/_global/index.ts index b047a14..58ce0d8 100644 --- a/src/module/_global/index.ts +++ b/src/module/_global/index.ts @@ -1,4 +1,3 @@ -import { API_ADDRESS } from "./bin/api_address"; import prisma from "./bin/prisma"; import { pwd_key_config } from "./bin/val_global"; import SkeletonSingle from "./components/skeleton_single"; @@ -21,5 +20,4 @@ export { LayoutNavbarNew }; export { ViewFilter }; export { prisma }; export { pwd_key_config }; -export { API_ADDRESS }; export {SkeletonSingle} \ No newline at end of file diff --git a/src/module/announcement/ui/detail_announcement.tsx b/src/module/announcement/ui/detail_announcement.tsx index 2dffc49..bac0836 100644 --- a/src/module/announcement/ui/detail_announcement.tsx +++ b/src/module/announcement/ui/detail_announcement.tsx @@ -1,5 +1,4 @@ "use client" -import { API_ADDRESS } from "@/module/_global"; import { Box, Flex, Grid, Group, Spoiler, Stack, Text } from "@mantine/core"; import { useShallowEffect } from "@mantine/hooks"; import { useState } from "react"; diff --git a/src/module/announcement/ui/list_announcement.tsx b/src/module/announcement/ui/list_announcement.tsx index abd8691..bc1cf55 100644 --- a/src/module/announcement/ui/list_announcement.tsx +++ b/src/module/announcement/ui/list_announcement.tsx @@ -1,5 +1,5 @@ 'use client' -import { API_ADDRESS, WARNA } from '@/module/_global'; +import { WARNA } from '@/module/_global'; import { ActionIcon, Box, Center, Divider, Grid, Group, Spoiler, Text, TextInput } from '@mantine/core'; import React, { useState } from 'react'; import { TfiAnnouncement } from "react-icons/tfi"; diff --git a/src/module/division_new/ui/create_anggota_division.tsx b/src/module/division_new/ui/create_anggota_division.tsx index b0614d6..99a7424 100644 --- a/src/module/division_new/ui/create_anggota_division.tsx +++ b/src/module/division_new/ui/create_anggota_division.tsx @@ -1,53 +1,18 @@ "use client" -import { API_ADDRESS, LayoutNavbarNew, WARNA } from '@/module/_global'; +import { LayoutNavbarNew, WARNA } from '@/module/_global'; import LayoutModal from '@/module/_global/layout/layout_modal'; import { funGetUserByCookies } from '@/module/auth'; -import { TypeUser } from '@/module/user'; -import { useHookstate } from '@hookstate/core'; +import { funGetAllmember, TypeUser } from '@/module/user'; import { Avatar, Box, Button, Divider, Group, Stack, Text, TextInput } from '@mantine/core'; import { useParams, useRouter } from 'next/navigation'; import React, { useState } from 'react'; import toast from 'react-hot-toast'; import { FaCheck } from 'react-icons/fa6'; import { HiMagnifyingGlass } from 'react-icons/hi2'; -import { globalMemberDivision } from '../lib/val_division'; import { useShallowEffect } from '@mantine/hooks'; -import { funGetAllmember } from '@/module/user/member/lib/api_member'; import { IDataMemberDivision } from '../lib/type_division'; import { funAddDivisionMember, funGetDivisionById } from '../lib/api_division'; -const dataUser = [ - { - id: 1, - img: "https://i.pravatar.cc/1000?img=3", - name: "Doni Setiawan", - }, - { - id: 2, - img: "https://i.pravatar.cc/1000?img=10", - name: "Ilham Udin", - }, - { - id: 3, - img: "https://i.pravatar.cc/1000?img=11", - name: "Didin Anang", - }, - { - id: 4, - img: "https://i.pravatar.cc/1000?img=21", - name: "Angga Saputra", - }, - { - id: 5, - img: "https://i.pravatar.cc/1000?img=32", - name: "Marcel Widianto", - }, - { - id: 6, - img: "https://i.pravatar.cc/1000?img=37", - name: "Bagas Nusantara", - }, -]; export default function CreateAnggotaDivision() { const router = useRouter() diff --git a/src/module/division_new/ui/create_division.tsx b/src/module/division_new/ui/create_division.tsx index d5ef1d9..ee44afb 100644 --- a/src/module/division_new/ui/create_division.tsx +++ b/src/module/division_new/ui/create_division.tsx @@ -1,5 +1,5 @@ "use client"; -import { API_ADDRESS, LayoutNavbarNew, WARNA } from "@/module/_global"; +import { LayoutNavbarNew, WARNA } from "@/module/_global"; import { useHookstate } from "@hookstate/core"; import { Avatar, diff --git a/src/module/division_new/ui/list_division.tsx b/src/module/division_new/ui/list_division.tsx index 48492b5..518b7fe 100644 --- a/src/module/division_new/ui/list_division.tsx +++ b/src/module/division_new/ui/list_division.tsx @@ -1,5 +1,5 @@ 'use client' -import { API_ADDRESS, LayoutDrawer, LayoutNavbarNew, WARNA } from '@/module/_global'; +import { LayoutDrawer, LayoutNavbarNew, WARNA } from '@/module/_global'; import { ActionIcon, Avatar, Box, Card, Center, Divider, Flex, Grid, Group, Text, TextInput, Title } from '@mantine/core'; import { useRouter, useSearchParams } from 'next/navigation'; import React, { useState } from 'react'; diff --git a/src/module/division_new/ui/navbar_admin_division.tsx b/src/module/division_new/ui/navbar_admin_division.tsx index 864b876..915c660 100644 --- a/src/module/division_new/ui/navbar_admin_division.tsx +++ b/src/module/division_new/ui/navbar_admin_division.tsx @@ -1,5 +1,5 @@ "use client" -import { API_ADDRESS, LayoutNavbarNew, WARNA } from '@/module/_global'; +import { LayoutNavbarNew, WARNA } from '@/module/_global'; import { useHookstate } from '@hookstate/core'; import { Avatar, Box, Button, Checkbox, Divider, Flex, Group, Stack, Text, TextInput } from '@mantine/core'; import { useRouter } from 'next/navigation'; diff --git a/src/module/division_new/ui/navbar_create_users.tsx b/src/module/division_new/ui/navbar_create_users.tsx index 4eea828..a134077 100644 --- a/src/module/division_new/ui/navbar_create_users.tsx +++ b/src/module/division_new/ui/navbar_create_users.tsx @@ -1,12 +1,12 @@ "use client" -import { API_ADDRESS, LayoutNavbarNew, WARNA } from '@/module/_global'; +import { LayoutNavbarNew, WARNA } from '@/module/_global'; import { useHookstate } from '@hookstate/core'; import { Avatar, Box, Button, Center, Input, SimpleGrid, Stack, Text, TextInput } from '@mantine/core'; import { useShallowEffect } from '@mantine/hooks'; import { useRouter } from 'next/navigation'; import React, { useState } from 'react'; import { HiMagnifyingGlass } from 'react-icons/hi2'; -import { TypeUser } from '@/module/user'; +import { funGetAllmember, TypeUser } from '@/module/user'; import { funGetUserByCookies } from '@/module/auth'; import toast from 'react-hot-toast'; import { globalMemberDivision } from '../lib/val_division'; @@ -22,21 +22,26 @@ export default function NavbarCreateUsers({ grup, onClose }: { grup?: string, on if (selectedFiles.some((i: any) => i.id == dataMember[index].id)) { setSelectedFiles(selectedFiles.filter((i: any) => i.id != dataMember[index].id)) } else { - setSelectedFiles([...selectedFiles, {idUser: dataMember[index].id, name: dataMember[index].name}]) + setSelectedFiles([...selectedFiles, { idUser: dataMember[index].id, name: dataMember[index].name }]) } }; - async function loadData() { - const loadMember = await fetch(API_ADDRESS.apiGetAllUser + '&active=true&groupID=' + grup); + async function loadData(search: string) { + const res = await funGetAllmember('?active=true&group=' + grup + '&search=' + search); const user = await funGetUserByCookies(); - const hasil = await loadMember.json() - setDataMember(hasil.filter((i: any) => i.id != user.id)) - // cek data member sebelumnya - if (member.length > 0) { - setSelectedFiles(JSON.parse(JSON.stringify(member.get()))) + if (res.success) { + setDataMember(res.data.filter((i: any) => i.id != user.id)) + + // cek data member sebelumnya + if (member.length > 0) { + setSelectedFiles(JSON.parse(JSON.stringify(member.get()))) + } + } else { + toast.error(res.message) } + } @@ -49,7 +54,7 @@ export default function NavbarCreateUsers({ grup, onClose }: { grup?: string, on } useShallowEffect(() => { - loadData() + loadData("") }, []); return ( @@ -69,6 +74,7 @@ export default function NavbarCreateUsers({ grup, onClose }: { grup?: string, on radius={30} leftSection={} placeholder="Pencarian" + onChange={(e) => loadData(e.target.value)} /> ([]) @@ -47,7 +47,7 @@ export default function EditMember({ id }: { id: string}) { async function getOneData() { try { - const res = await funGetOneMember(id) + const res = await funGetOneMember(id) setData(res.data) getAllPosition(res.data?.idGroup) } catch (error) { @@ -59,8 +59,8 @@ export default function EditMember({ id }: { id: string}) { try { const res = await funGetAllPosition( "?active=true" + "&group=" + `${val}` - ); - setListPosition(res.data); + ); + setListPosition(res.data); } catch (error) { console.error(error) @@ -96,7 +96,7 @@ export default function EditMember({ id }: { id: string}) { async function onSubmit(val: boolean) { try { - const res = await funEditMember(id,{ + const res = await funEditMember(id, { id: data.id, nik: data.nik, name: data.name, diff --git a/src/module/user/member/ui/navbar_detail_member.tsx b/src/module/user/member/ui/navbar_detail_member.tsx index d1ac836..4fc6f3e 100644 --- a/src/module/user/member/ui/navbar_detail_member.tsx +++ b/src/module/user/member/ui/navbar_detail_member.tsx @@ -1,5 +1,5 @@ 'use client' -import { LayoutNavbarHome, LayoutIconBack, WARNA, LayoutDrawer, API_ADDRESS } from "@/module/_global"; +import { LayoutNavbarHome, LayoutIconBack, WARNA, LayoutDrawer } from "@/module/_global"; import { Box, Group, ActionIcon, Stack, Text, Center, Avatar } from "@mantine/core"; import { HiMenu } from "react-icons/hi"; import { HiUser } from "react-icons/hi2"; diff --git a/src/module/user/member/ui/tab_list_member.tsx b/src/module/user/member/ui/tab_list_member.tsx index 60cca68..a7add71 100644 --- a/src/module/user/member/ui/tab_list_member.tsx +++ b/src/module/user/member/ui/tab_list_member.tsx @@ -1,5 +1,5 @@ -import { API_ADDRESS, WARNA } from "@/module/_global" +import { WARNA } from "@/module/_global" import { Box, Group, ActionIcon, Text, TextInput } from "@mantine/core" import { useShallowEffect } from "@mantine/hooks" import { useRouter, useSearchParams } from "next/navigation"