Test Hapus Auth

src/app/admin/(dashboard)/auth/login-admin/page.tsx

@@ -1,5 +1,6 @@
 'use client';
-import { apiFetchLogin } from '@/app/api/auth/_lib/api_fetch_auth';
+
+import { apiFetchLogin } from '@/app/api/[auth]/_lib/api_fetch_auth';
 import colors from '@/con/colors';
 import { Box, Button, Center, Image, Paper, Stack, Title } from '@mantine/core';
 import { useRouter } from 'next/navigation';

src/app/admin/(dashboard)/auth/registrasi-admin/page.tsx

@@ -1,7 +1,7 @@
 // app/registrasi/page.tsx
 'use client';
 
-import { apiFetchRegister } from '@/app/api/auth/_lib/api_fetch_auth';
+import { apiFetchRegister } from '@/app/api/[auth]/_lib/api_fetch_auth';
 import BackButton from '@/app/darmasaba/(pages)/desa/layanan/_com/BackButto';
 import colors from '@/con/colors';
 import {
@@ -18,7 +18,6 @@ export default function Registrasi() {
   const [username, setUsername] = useState('');
   const [loading, setLoading] = useState(false);
   const [phone, setPhone] = useState(''); // ✅ tambahkan state untuk phone
-  const [agree, setAgree] = useState(false)
 
   // Ambil data dari localStorage (dari login)
   useEffect(() => {
@@ -47,11 +46,6 @@ export default function Registrasi() {
       return;
     }
 
-    if (!agree) {
-      toast.error("Anda harus menyetujui syarat dan ketentuan!");
-      return;
-    }
-
     try {
       setLoading(true);
       // ✅ Hanya kirim username & nomor → dapat kodeId
@@ -98,8 +92,8 @@ export default function Registrasi() {
                     username.length > 0 && username.length < 5
                       ? 'Minimal 5 karakter!'
                       : username.includes(' ')
-                        ? 'Tidak boleh ada spasi'
-                        : ''
+                      ? 'Tidak boleh ada spasi'
+                      : ''
                   }
                   required
                 />
@@ -114,29 +108,9 @@ export default function Registrasi() {
                 </Box>
 
                 <Box pt="md">
-                  <Checkbox
-                    checked={agree}
-                    onChange={(e) => setAgree(e.currentTarget.checked)}
-                    label={
-                      <Text fz="sm">
-                        Saya menyetujui{" "}
-                        <a
-                          href="/terms-of-service"
-                          target="_blank"
-                          style={{
-                            color: colors["blue-button"],
-                            textDecoration: "underline",
-                            fontWeight: 500,
-                          }}
-                        >
-                          syarat dan ketentuan
-                        </a>
-                      </Text>
-                    }
-                  />
+                  <Checkbox label="Saya menyetujui syarat dan ketentuan" defaultChecked />
                 </Box>
 
-
                 <Box pt="xl">
                   <Button
                     fullWidth

src/app/admin/(dashboard)/auth/validasi-admin/page.tsx

@@ -19,7 +19,7 @@ import { authStore } from '@/store/authStore';
 
 export default function Validasi() {
   const router = useRouter();
-
+  
   const [nomor, setNomor] = useState<string | null>(null);
   const [otp, setOtp] = useState('');
   const [loading, setLoading] = useState(false);
@@ -31,11 +31,11 @@ export default function Validasi() {
   useEffect(() => {
     const checkFlow = async () => {
       try {
-        const res = await fetch('/api/auth/get-flow', {
+        const res = await fetch('/api/get-flow', {
           credentials: 'include'
         });
         const data = await res.json();
-
+        
         if (data.success) {
           setIsRegistrationFlow(data.flow === 'register');
           console.log('🔍 Flow detected from cookie:', data.flow);
@@ -45,7 +45,7 @@ export default function Validasi() {
         setIsRegistrationFlow(false);
       }
     };
-
+    
     checkFlow();
   }, []);
 
@@ -60,7 +60,7 @@ export default function Validasi() {
     setKodeId(storedKodeId);
     const loadOtpData = async () => {
       try {
-        const res = await fetch(`/api/auth/otp-data?kodeId=${encodeURIComponent(storedKodeId)}`);
+        const res = await fetch(`/api/otp-data?kodeId=${encodeURIComponent(storedKodeId)}`);
         const result = await res.json();
 
         if (res.ok && result.data?.nomor) {
@@ -110,8 +110,7 @@ export default function Validasi() {
       return;
     }
 
-    // ✅ Verify OTP
-    const verifyRes = await fetch('/api/auth/verify-otp-register', {
+    const verifyRes = await fetch('/api/verify-otp-register', {
       method: 'POST',
       headers: { 'Content-Type': 'application/json' },
       body: JSON.stringify({ nomor: cleanNomor, otp, kodeId }),
@@ -124,32 +123,26 @@ export default function Validasi() {
       return;
     }
 
-    // ✅ Finalize registration
-    const finalizeRes = await fetch('/api/auth/finalize-registration', {
+    const finalizeRes = await fetch('/api/finalize-registration', {
       method: 'POST',
       headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify({ nomor: cleanNomor, username, kodeId }),
+      body: JSON.stringify({ nomor, username, kodeId }),
       credentials: 'include'
     });
 
     const data = await finalizeRes.json();
-
-    // ✅ Check JSON response (bukan redirect)
-    if (data.success) {
-      toast.success('Registrasi berhasil! Menunggu persetujuan admin.');
+    
+    if (data.success || finalizeRes.redirected) {
+      // ✅ Cleanup setelah registrasi sukses
       await cleanupStorage();
-
-      // ✅ Client-side redirect
-      setTimeout(() => {
-        window.location.href = '/waiting-room';
-      }, 1000);
+      window.location.href = '/waiting-room';
     } else {
       toast.error(data.message || 'Registrasi gagal');
     }
   };
 
   const handleLoginVerification = async () => {
-    const loginRes = await fetch('/api/auth/verify-otp-login', {
+    const loginRes = await fetch('/api/verify-otp-login', {
       method: 'POST',
       headers: { 'Content-Type': 'application/json' },
       body: JSON.stringify({ nomor, otp, kodeId }),
@@ -204,10 +197,10 @@ export default function Validasi() {
     localStorage.removeItem('auth_kodeId');
     localStorage.removeItem('auth_nomor');
     localStorage.removeItem('auth_username');
-
+    
     // Clear cookie
     try {
-      await fetch('/api/auth/clear-flow', {
+      await fetch('/api/clear-flow', {
         method: 'POST',
         credentials: 'include'
       });
@@ -219,7 +212,7 @@ export default function Validasi() {
   const handleResend = async () => {
     if (!nomor) return;
     try {
-      const res = await fetch('/api/auth/resend', {
+      const res = await fetch('/api/resend', {
         method: 'POST',
         headers: { 'Content-Type': 'application/json' },
         body: JSON.stringify({ nomor }),

src/app/admin/(dashboard)/landing-page/apbdes/create/page.tsx

@@ -361,7 +361,6 @@ function CreateAPBDes() {
                   data={[
                     { value: 'pendapatan', label: 'Pendapatan' },
                     { value: 'belanja', label: 'Belanja' },
-                    { value: 'pembiayaan', label: 'Pembiayaan' },
                   ]}
                   value={newItem.level === 1 ? null : newItem.tipe}
                   onChange={(val) => setNewItem({ ...newItem, tipe: val as any })}

src/app/admin/(dashboard)/user&role/user/page.tsx

@@ -93,7 +93,6 @@ function ListUser({ search }: { search: string }) {
     const success = await stateUser.update.submit({
       id: userId,
       roleId: newRoleId,
-
     });
 
     if (success) {
@@ -137,10 +136,9 @@ function ListUser({ search }: { search: string }) {
     }
   };
 
-  const filteredData = (data || []).filter((item) => {
-    return item.roleId !== "0" && item.roleId !== "1";
-  });
-
+  const filteredData = (data || []).filter(
+    (item) => item.roleId !== "0" // asumsikan id role SUPERADMIN = "0"
+  );
 
   if (loading || !data) {
     return (
@@ -185,7 +183,7 @@ function ListUser({ search }: { search: string }) {
                       <Select
                         placeholder="Pilih role"
                         data={stateRole.findMany.data
-                          .filter(r => r.id !== "0" && r.id !== "1") // ❌ Sembunyikan SUPERADMIN dan DEVELOPER
+                          .filter(r => r.id !== "0") // ❌ Sembunyikan SUPERADMIN
                           .map(r => ({
                             label: r.name,
                             value: r.id,

src/app/admin/layout.tsx

@@ -1,399 +1,3 @@
-// 'use client'
-
-// import colors from "@/con/colors";
-// import { authStore } from "@/store/authStore";
-// import {
-//   ActionIcon,
-//   AppShell,
-//   AppShellHeader,
-//   AppShellMain,
-//   AppShellNavbar,
-//   Burger,
-//   Center,
-//   Flex,
-//   Group,
-//   Image,
-//   Loader,
-//   NavLink,
-//   ScrollArea,
-//   Text,
-//   Tooltip,
-//   rem
-// } from "@mantine/core";
-// import { useDisclosure } from "@mantine/hooks";
-// import {
-//   IconChevronLeft,
-//   IconChevronRight,
-//   IconLogout2
-// } from "@tabler/icons-react";
-// import _ from "lodash";
-// import Link from "next/link";
-// import { useRouter, useSelectedLayoutSegments } from "next/navigation";
-// import { useEffect, useState } from "react";
-// // import { useSnapshot } from "valtio";
-// import { getNavbar } from "./(dashboard)/user&role/_com/dynamicNavbar";
-
-// export default function Layout({ children }: { children: React.ReactNode }) {
-//   const [opened, { toggle }] = useDisclosure();
-//   const [loading, setLoading] = useState(true);
-//   const [isLoggingOut, setIsLoggingOut] = useState(false);
-//   const [desktopOpened, { toggle: toggleDesktop }] = useDisclosure(true);
-//   const router = useRouter();
-//   const segments = useSelectedLayoutSegments().map((s) => _.lowerCase(s));
-
-//   // const { user } = useSnapshot(authStore);
-
-//   // console.log("Current user in store:", user);
-
-//   // ✅ FIX: Selalu fetch user data setiap kali komponen mount
-//   useEffect(() => {
-//     const fetchUser = async () => {
-//       try {
-//         const res = await fetch('/api/auth/me');
-//         const data = await res.json();
-
-//         if (data.user) {
-//           // ✅ Check if user is NOT active → redirect to waiting room
-//           if (!data.user.isActive) {
-//             authStore.setUser(null);
-//             router.replace('/waiting-room');
-//             return;
-//           }
-
-//           // ✅ Fetch menuIds
-//           const menuRes = await fetch(`/api/admin/user-menu-access?userId=${data.user.id}`);
-//           const menuData = await menuRes.json();
-
-//           const menuIds = menuData.success && Array.isArray(menuData.menuIds)
-//             ? [...menuData.menuIds]
-//             : null;
-
-//           // ✅ Set user dengan menuIds yang fresh
-//           authStore.setUser({
-//             id: data.user.id,
-//             name: data.user.name,
-//             roleId: Number(data.user.roleId),
-//             menuIds,
-//             isActive: data.user.isActive
-//           });
-
-//           // ✅ TAMBAHKAN INI: Redirect ke dashboard sesuai roleId
-//           const currentPath = window.location.pathname;
-//           const expectedPath = getRedirectPath(Number(data.user.roleId));
-
-//           // Jika user di halaman /admin tapi bukan di path yang sesuai roleId
-//           if (currentPath === '/admin' || !currentPath.startsWith(expectedPath)) {
-//             router.replace(expectedPath);
-//           }
-
-//         } else {
-//           authStore.setUser(null);
-//           router.replace('/login');
-//         }
-//       } catch (error) {
-//         console.error('Gagal memuat data pengguna:', error);
-//         authStore.setUser(null);
-//         router.replace('/login');
-//       } finally {
-//         setLoading(false);
-//       }
-//     };
-
-//     fetchUser();
-//   }, [router]);
-
-//   // ✅ Fungsi helper untuk get redirect path
-//   const getRedirectPath = (roleId: number): string => {
-//     switch (roleId) {
-//       case 0: // DEVELOPER
-//       case 1: // SUPERADMIN
-//       case 2: // ADMIN_DESA
-//         return '/admin/landing-page/profil/program-inovasi';
-//       case 3: // ADMIN_KESEHATAN
-//         return '/admin/kesehatan/posyandu';
-//       case 4: // ADMIN_PENDIDIKAN
-//         return '/admin/pendidikan/info-sekolah/jenjang-pendidikan';
-//       default:
-//         return '/admin';
-//     }
-//   };
-
-//   if (loading) {
-//     return (
-//       <AppShell>
-//         <AppShellMain>
-//           <Center h="100vh">
-//             <Loader />
-//           </Center>
-//         </AppShellMain>
-//       </AppShell>
-//     );
-//   }
-
-//   // ✅ Ambil menu berdasarkan roleId dan menuIds
-//   const currentNav = authStore.user
-//     ? getNavbar({ roleId: authStore.user.roleId, menuIds: authStore.user.menuIds })
-//     : [];
-
-//   const handleLogout = async () => {
-//     try {
-//       setIsLoggingOut(true);
-
-//       // ✅ Panggil API logout untuk clear session di server
-//       const response = await fetch('/api/auth/logout', { method: 'POST' });
-//       const result = await response.json();
-
-//       if (result.success) {
-//         // Clear user data dari store
-//         authStore.setUser(null);
-
-//         // Clear localStorage
-//         localStorage.removeItem('auth_nomor');
-//         localStorage.removeItem('auth_kodeId');
-
-//         // Force reload untuk reset semua state
-//         window.location.href = '/login';
-//       } else {
-//         console.error('Logout failed:', result.message);
-//         // Tetap redirect meskipun gagal
-//         authStore.setUser(null);
-//         window.location.href = '/login';
-//       }
-//     } catch (error) {
-//       console.error('Error during logout:', error);
-//       // Tetap clear store dan redirect jika error
-//       authStore.setUser(null);
-//       window.location.href = '/login';
-//     } finally {
-//       setIsLoggingOut(false);
-//     }
-//   };
-
-//   return (
-//     <AppShell
-//       suppressHydrationWarning
-//       header={{ height: 64 }}
-//       navbar={{
-//         width: { base: 260, sm: 280, lg: 300 },
-//         breakpoint: 'sm',
-//         collapsed: {
-//           mobile: !opened,
-//           desktop: !desktopOpened,
-//         },
-//       }}
-//       padding="md"
-//     >
-//       <AppShellHeader
-//         style={{
-//           background: "linear-gradient(90deg, #ffffff, #f9fbff)",
-//           borderBottom: `1px solid ${colors["blue-button"]}20`,
-//           padding: '0 16px',
-//         }}
-//         px={{ base: 'sm', sm: 'md' }}
-//         py={{ base: 'xs', sm: 'sm' }}
-//       >
-//         <Group w="100%" h="100%" justify="space-between" wrap="nowrap">
-//           <Flex align="center" gap="sm">
-//             <Image
-//               src="/assets/images/darmasaba-icon.png"
-//               alt="Logo Darmasaba"
-//               w={{ base: 32, sm: 40 }}
-//               h={{ base: 32, sm: 40 }}
-//               radius="md"
-//               loading="lazy"
-//               style={{
-//                 minWidth: '32px',
-//                 height: 'auto',
-//               }}
-//             />
-//             <Text
-//               fw={700}
-//               c={colors["blue-button"]}
-//               fz={{ base: 'md', sm: 'xl' }}
-//             >
-//               Admin Darmasaba
-//             </Text>
-//           </Flex>
-
-//           <Group gap="xs">
-//             {!desktopOpened && (
-//               <Tooltip label="Buka Navigasi" position="bottom" withArrow>
-//                 <ActionIcon
-//                   variant="light"
-//                   radius="xl"
-//                   size="lg"
-//                   onClick={toggleDesktop}
-//                   color={colors["blue-button"]}
-//                 >
-//                   <IconChevronRight />
-//                 </ActionIcon>
-//               </Tooltip>
-//             )}
-
-//             <Burger
-//               opened={opened}
-//               onClick={toggle}
-//               hiddenFrom="sm"
-//               size="md"
-//               color={colors["blue-button"]}
-//               mr="xs"
-//             />
-
-//             <Tooltip label="Kembali ke Website Desa" position="bottom" withArrow>
-//               <ActionIcon
-//                 onClick={() => {
-//                   router.push("/darmasaba");
-//                 }}
-//                 color={colors["blue-button"]}
-//                 radius="xl"
-//                 size="lg"
-//                 variant="gradient"
-//                 gradient={{ from: colors["blue-button"], to: "#228be6" }}
-//               >
-//                 <Image
-//                   src="/assets/images/darmasaba-icon.png"
-//                   alt="Logo Darmasaba"
-//                   w={20}
-//                   h={20}
-//                   radius="md"
-//                   loading="lazy"
-//                   style={{
-//                     minWidth: '20px',
-//                     height: 'auto',
-//                   }}
-//                 />
-//               </ActionIcon>
-//             </Tooltip>
-//             <Tooltip label="Keluar" position="bottom" withArrow>
-//               <ActionIcon
-//                 onClick={handleLogout}
-//                 color={colors["blue-button"]}
-//                 radius="xl"
-//                 size="lg"
-//                 variant="gradient"
-//                 gradient={{ from: colors["blue-button"], to: "#228be6" }}
-//                 loading={isLoggingOut}
-//                 disabled={isLoggingOut}
-//               >
-//                 <IconLogout2 size={22} />
-//               </ActionIcon>
-//             </Tooltip>
-//           </Group>
-//         </Group>
-//       </AppShellHeader>
-
-//       <AppShellNavbar
-//         component={ScrollArea}
-//         style={{
-//           background: "#ffffff",
-//           borderRight: `1px solid ${colors["blue-button"]}20`,
-//         }}
-//         p={{ base: 'xs', sm: 'sm' }}
-//       >
-//         <AppShell.Section p="sm">
-//           {currentNav.map((v, k) => {
-//             const isParentActive = segments.includes(_.lowerCase(v.name));
-
-//             return (
-//               <NavLink
-//                 key={k}
-//                 defaultOpened={isParentActive}
-//                 c={isParentActive ? colors["blue-button"] : "gray"}
-//                 label={
-//                   <Text fw={isParentActive ? 600 : 400} fz="sm">
-//                     {v.name}
-//                   </Text>
-//                 }
-//                 style={{
-//                   borderRadius: rem(10),
-//                   marginBottom: rem(4),
-//                   transition: "background 150ms ease",
-//                 }}
-//                 styles={{
-//                   root: {
-//                     '&:hover': {
-//                       backgroundColor: 'rgba(25, 113, 194, 0.05)',
-//                     },
-//                   },
-//                 }}
-//                 variant="light"
-//                 active={isParentActive}
-//               >
-//                 {v.children.map((child, key) => {
-//                   const isChildActive = segments.includes(
-//                     _.lowerCase(child.name)
-//                   );
-
-//                   return (
-//                     <NavLink
-//                       key={key}
-//                       href={child.path}
-//                       c={isChildActive ? colors["blue-button"] : "gray"}
-//                       label={
-//                         <Text fw={isChildActive ? 600 : 400} fz="sm">
-//                           {child.name}
-//                         </Text>
-//                       }
-//                       styles={{
-//                         root: {
-//                           borderRadius: rem(8),
-//                           marginBottom: rem(2),
-//                           transition: 'background 150ms ease',
-//                           padding: '6px 12px',
-//                           '&:hover': {
-//                             backgroundColor: isChildActive ? 'rgba(25, 113, 194, 0.15)' : 'rgba(25, 113, 194, 0.05)',
-//                           },
-//                           ...(isChildActive && {
-//                             backgroundColor: 'rgba(25, 113, 194, 0.1)',
-//                           }),
-//                         },
-//                       }}
-//                       active={isChildActive}
-//                       component={Link}
-//                     />
-//                   );
-//                 })}
-//               </NavLink>
-//             );
-//           })}
-//         </AppShell.Section>
-
-//         <AppShell.Section py="md">
-//           <Group justify="end" pr="sm">
-//             <Tooltip
-//               label={desktopOpened ? "Tutup Navigasi" : "Buka Navigasi"}
-//               position="top"
-//               withArrow
-//             >
-//               <ActionIcon
-//                 variant="light"
-//                 radius="xl"
-//                 size="lg"
-//                 onClick={toggleDesktop}
-//                 color={colors["blue-button"]}
-//               >
-//                 <IconChevronLeft />
-//               </ActionIcon>
-//             </Tooltip>
-//           </Group>
-//         </AppShell.Section>
-//       </AppShellNavbar>
-
-//       <AppShellMain
-//         style={{
-//           background: "linear-gradient(180deg, #fdfdfd, #f6f9fc)",
-//           minHeight: "100vh",
-//         }}
-//       >
-//         {children}
-//       </AppShellMain>
-//     </AppShell>
-//   );
-// }
-
-
-// app/admin/layout.tsx
-
 'use client'
 
 import colors from "@/con/colors";
@@ -426,6 +30,7 @@ import _ from "lodash";
 import Link from "next/link";
 import { useRouter, useSelectedLayoutSegments } from "next/navigation";
 import { useEffect, useState } from "react";
+// import { useSnapshot } from "valtio";
 import { getNavbar } from "./(dashboard)/user&role/_com/dynamicNavbar";
 
 export default function Layout({ children }: { children: React.ReactNode }) {
@@ -435,53 +40,42 @@ export default function Layout({ children }: { children: React.ReactNode }) {
   const [desktopOpened, { toggle: toggleDesktop }] = useDisclosure(true);
   const router = useRouter();
   const segments = useSelectedLayoutSegments().map((s) => _.lowerCase(s));
-  
 
+  // const { user } = useSnapshot(authStore);
+
+  // console.log("Current user in store:", user);
+
+  // ✅ FIX: Selalu fetch user data setiap kali komponen mount
   useEffect(() => {
     const fetchUser = async () => {
       try {
-        const res = await fetch('/api/auth/me', {
-          credentials: 'include' // ✅ ADD credentials
-        });
+        const res = await fetch('/api/me');
         const data = await res.json();
 
         if (data.user) {
-          // ✅ Check if user is NOT active → redirect to waiting room
+          // Check if user is active
           if (!data.user.isActive) {
             authStore.setUser(null);
             router.replace('/waiting-room');
             return;
           }
 
-          // ✅ Fetch menuIds
-          const menuRes = await fetch(`/api/admin/user-menu-access?userId=${data.user.id}`, {
-            credentials: 'include' // ✅ ADD credentials
-          });
+          // ✅ PENTING: Selalu fetch menuIds terbaru setiap login
+          const menuRes = await fetch(`/api/admin/user-menu-access?userId=${data.user.id}`);
           const menuData = await menuRes.json();
 
           const menuIds = menuData.success && Array.isArray(menuData.menuIds)
             ? [...menuData.menuIds]
             : null;
 
-          // ✅ Set user dengan menuIds yang fresh
+          // ✅ Set user dengan menuIds yang fresh dari database
           authStore.setUser({
             id: data.user.id,
             name: data.user.name,
             roleId: Number(data.user.roleId),
-            menuIds,
+            menuIds, // menuIds terbaru
             isActive: data.user.isActive
           });
-
-          // ✅ IMPROVED: Redirect ONLY if di root /admin
-          const currentPath = window.location.pathname;
-          
-          if (currentPath === '/admin') {
-            const expectedPath = getRedirectPath(Number(data.user.roleId));
-            console.log('🔄 Redirecting from /admin to:', expectedPath);
-            router.replace(expectedPath);
-          }
-          // ✅ Jangan redirect jika user sudah di path yang valid
-
         } else {
           authStore.setUser(null);
           router.replace('/login');
@@ -496,22 +90,7 @@ export default function Layout({ children }: { children: React.ReactNode }) {
     };
 
     fetchUser();
-  }, [router]); // ✅ Only depend on router
-
-  const getRedirectPath = (roleId: number): string => {
-    switch (roleId) {
-      case 0: // DEVELOPER
-      case 1: // SUPERADMIN
-      case 2: // ADMIN_DESA
-        return '/admin/landing-page/profil/program-inovasi';
-      case 3: // ADMIN_KESEHATAN
-        return '/admin/kesehatan/posyandu';
-      case 4: // ADMIN_PENDIDIKAN
-        return '/admin/pendidikan/info-sekolah/jenjang-pendidikan';
-      default:
-        return '/admin';
-    }
-  };
+  }, [router]); // ✅ Hapus dependency pada authStore.user
 
   if (loading) {
     return (
@@ -525,6 +104,7 @@ export default function Layout({ children }: { children: React.ReactNode }) {
     );
   }
 
+  // ✅ Ambil menu berdasarkan roleId dan menuIds
   const currentNav = authStore.user
     ? getNavbar({ roleId: authStore.user.roleId, menuIds: authStore.user.menuIds })
     : [];
@@ -532,26 +112,30 @@ export default function Layout({ children }: { children: React.ReactNode }) {
   const handleLogout = async () => {
     try {
       setIsLoggingOut(true);
-
-      const response = await fetch('/api/auth/logout', { 
-        method: 'POST',
-        credentials: 'include' // ✅ ADD credentials
-      });
+      
+      // ✅ Panggil API logout untuk clear session di server
+      const response = await fetch('/api/logout', { method: 'POST' });
       const result = await response.json();
-
+      
       if (result.success) {
+        // Clear user data dari store
         authStore.setUser(null);
+        
+        // Clear localStorage
         localStorage.removeItem('auth_nomor');
         localStorage.removeItem('auth_kodeId');
-        localStorage.removeItem('auth_username');
+        
+        // Force reload untuk reset semua state
         window.location.href = '/login';
       } else {
         console.error('Logout failed:', result.message);
+        // Tetap redirect meskipun gagal
         authStore.setUser(null);
         window.location.href = '/login';
       }
     } catch (error) {
       console.error('Error during logout:', error);
+      // Tetap clear store dan redirect jika error
       authStore.setUser(null);
       window.location.href = '/login';
     } finally {
@@ -573,7 +157,6 @@ export default function Layout({ children }: { children: React.ReactNode }) {
       }}
       padding="md"
     >
-      {/* ... rest of your JSX (Header, Navbar, Main) sama seperti sebelumnya ... */}
       <AppShellHeader
         style={{
           background: "linear-gradient(90deg, #ffffff, #f9fbff)",
@@ -592,9 +175,16 @@ export default function Layout({ children }: { children: React.ReactNode }) {
               h={{ base: 32, sm: 40 }}
               radius="md"
               loading="lazy"
-              style={{ minWidth: '32px', height: 'auto' }}
+              style={{
+                minWidth: '32px',
+                height: 'auto',
+              }}
             />
-            <Text fw={700} c={colors["blue-button"]} fz={{ base: 'md', sm: 'xl' }}>
+            <Text
+              fw={700}
+              c={colors["blue-button"]}
+              fz={{ base: 'md', sm: 'xl' }}
+            >
               Admin Darmasaba
             </Text>
           </Flex>
@@ -602,22 +192,63 @@ export default function Layout({ children }: { children: React.ReactNode }) {
           <Group gap="xs">
             {!desktopOpened && (
               <Tooltip label="Buka Navigasi" position="bottom" withArrow>
-                <ActionIcon variant="light" radius="xl" size="lg" onClick={toggleDesktop} color={colors["blue-button"]}>
+                <ActionIcon
+                  variant="light"
+                  radius="xl"
+                  size="lg"
+                  onClick={toggleDesktop}
+                  color={colors["blue-button"]}
+                >
                   <IconChevronRight />
                 </ActionIcon>
               </Tooltip>
             )}
 
-            <Burger opened={opened} onClick={toggle} hiddenFrom="sm" size="md" color={colors["blue-button"]} mr="xs" />
+            <Burger
+              opened={opened}
+              onClick={toggle}
+              hiddenFrom="sm"
+              size="md"
+              color={colors["blue-button"]}
+              mr="xs"
+            />
 
             <Tooltip label="Kembali ke Website Desa" position="bottom" withArrow>
-              <ActionIcon onClick={() => router.push("/darmasaba")} color={colors["blue-button"]} radius="xl" size="lg" variant="gradient" gradient={{ from: colors["blue-button"], to: "#228be6" }}>
-                <Image src="/assets/images/darmasaba-icon.png" alt="Logo Darmasaba" w={20} h={20} radius="md" loading="lazy" style={{ minWidth: '20px', height: 'auto' }} />
+              <ActionIcon
+                onClick={() => {
+                  router.push("/darmasaba");
+                }}
+                color={colors["blue-button"]}
+                radius="xl"
+                size="lg"
+                variant="gradient"
+                gradient={{ from: colors["blue-button"], to: "#228be6" }}
+              >
+                <Image
+                  src="/assets/images/darmasaba-icon.png"
+                  alt="Logo Darmasaba"
+                  w={20}
+                  h={20}
+                  radius="md"
+                  loading="lazy"
+                  style={{
+                    minWidth: '20px',
+                    height: 'auto',
+                  }}
+                />
               </ActionIcon>
             </Tooltip>
-
             <Tooltip label="Keluar" position="bottom" withArrow>
-              <ActionIcon onClick={handleLogout} color={colors["blue-button"]} radius="xl" size="lg" variant="gradient" gradient={{ from: colors["blue-button"], to: "#228be6" }} loading={isLoggingOut} disabled={isLoggingOut}>
+              <ActionIcon
+                onClick={handleLogout}
+                color={colors["blue-button"]}
+                radius="xl"
+                size="lg"
+                variant="gradient"
+                gradient={{ from: colors["blue-button"], to: "#228be6" }}
+                loading={isLoggingOut}
+                disabled={isLoggingOut}
+              >
                 <IconLogout2 size={22} />
               </ActionIcon>
             </Tooltip>
@@ -625,17 +256,75 @@ export default function Layout({ children }: { children: React.ReactNode }) {
         </Group>
       </AppShellHeader>
 
-      <AppShellNavbar component={ScrollArea} style={{ background: "#ffffff", borderRight: `1px solid ${colors["blue-button"]}20` }} p={{ base: 'xs', sm: 'sm' }}>
-        {/* ... Navbar content sama seperti sebelumnya ... */}
+      <AppShellNavbar
+        component={ScrollArea}
+        style={{
+          background: "#ffffff",
+          borderRight: `1px solid ${colors["blue-button"]}20`,
+        }}
+        p={{ base: 'xs', sm: 'sm' }}
+      >
         <AppShell.Section p="sm">
           {currentNav.map((v, k) => {
             const isParentActive = segments.includes(_.lowerCase(v.name));
+
             return (
-              <NavLink key={k} defaultOpened={isParentActive} c={isParentActive ? colors["blue-button"] : "gray"} label={<Text fw={isParentActive ? 600 : 400} fz="sm">{v.name}</Text>} style={{ borderRadius: rem(10), marginBottom: rem(4), transition: "background 150ms ease" }} styles={{ root: { '&:hover': { backgroundColor: 'rgba(25, 113, 194, 0.05)' } } }} variant="light" active={isParentActive}>
+              <NavLink
+                key={k}
+                defaultOpened={isParentActive}
+                c={isParentActive ? colors["blue-button"] : "gray"}
+                label={
+                  <Text fw={isParentActive ? 600 : 400} fz="sm">
+                    {v.name}
+                  </Text>
+                }
+                style={{
+                  borderRadius: rem(10),
+                  marginBottom: rem(4),
+                  transition: "background 150ms ease",
+                }}
+                styles={{
+                  root: {
+                    '&:hover': {
+                      backgroundColor: 'rgba(25, 113, 194, 0.05)',
+                    },
+                  },
+                }}
+                variant="light"
+                active={isParentActive}
+              >
                 {v.children.map((child, key) => {
-                  const isChildActive = segments.includes(_.lowerCase(child.name));
+                  const isChildActive = segments.includes(
+                    _.lowerCase(child.name)
+                  );
+
                   return (
-                    <NavLink key={key} href={child.path} c={isChildActive ? colors["blue-button"] : "gray"} label={<Text fw={isChildActive ? 600 : 400} fz="sm">{child.name}</Text>} styles={{ root: { borderRadius: rem(8), marginBottom: rem(2), transition: 'background 150ms ease', padding: '6px 12px', '&:hover': { backgroundColor: isChildActive ? 'rgba(25, 113, 194, 0.15)' : 'rgba(25, 113, 194, 0.05)' }, ...(isChildActive && { backgroundColor: 'rgba(25, 113, 194, 0.1)' }) } }} active={isChildActive} component={Link} />
+                    <NavLink
+                      key={key}
+                      href={child.path}
+                      c={isChildActive ? colors["blue-button"] : "gray"}
+                      label={
+                        <Text fw={isChildActive ? 600 : 400} fz="sm">
+                          {child.name}
+                        </Text>
+                      }
+                      styles={{
+                        root: {
+                          borderRadius: rem(8),
+                          marginBottom: rem(2),
+                          transition: 'background 150ms ease',
+                          padding: '6px 12px',
+                          '&:hover': {
+                            backgroundColor: isChildActive ? 'rgba(25, 113, 194, 0.15)' : 'rgba(25, 113, 194, 0.05)',
+                          },
+                          ...(isChildActive && {
+                            backgroundColor: 'rgba(25, 113, 194, 0.1)',
+                          }),
+                        },
+                      }}
+                      active={isChildActive}
+                      component={Link}
+                    />
                   );
                 })}
               </NavLink>
@@ -645,8 +334,18 @@ export default function Layout({ children }: { children: React.ReactNode }) {
 
         <AppShell.Section py="md">
           <Group justify="end" pr="sm">
-            <Tooltip label={desktopOpened ? "Tutup Navigasi" : "Buka Navigasi"} position="top" withArrow>
-              <ActionIcon variant="light" radius="xl" size="lg" onClick={toggleDesktop} color={colors["blue-button"]}>
+            <Tooltip
+              label={desktopOpened ? "Tutup Navigasi" : "Buka Navigasi"}
+              position="top"
+              withArrow
+            >
+              <ActionIcon
+                variant="light"
+                radius="xl"
+                size="lg"
+                onClick={toggleDesktop}
+                color={colors["blue-button"]}
+              >
                 <IconChevronLeft />
               </ActionIcon>
             </Tooltip>
@@ -654,7 +353,12 @@ export default function Layout({ children }: { children: React.ReactNode }) {
         </AppShell.Section>
       </AppShellNavbar>
 
-      <AppShellMain style={{ background: "linear-gradient(180deg, #fdfdfd, #f6f9fc)", minHeight: "100vh" }}>
+      <AppShellMain
+        style={{
+          background: "linear-gradient(180deg, #fdfdfd, #f6f9fc)",
+          minHeight: "100vh",
+        }}
+      >
         {children}
       </AppShellMain>
     </AppShell>

src/app/api/[[...slugs]]/_lib/user/updt.ts

@@ -23,7 +23,7 @@ export default async function userUpdate(context: Context) {
 
     const currentUser = await prisma.user.findUnique({
       where: { id },
-      select: { roleId: true, isActive: true },
+      select: { roleId: true, isActive: true }
     });
 
     if (!currentUser) {
@@ -31,15 +31,7 @@ export default async function userUpdate(context: Context) {
     }
 
     const isRoleChanged = roleId && currentUser.roleId !== roleId;
-    const isActiveChanged =
-      isActive !== undefined && currentUser.isActive !== isActive;
-
-    // ✅ Jika role berubah, hapus semua akses menu yang ada
-    if (isRoleChanged) {
-      await prisma.userMenuAccess.deleteMany({
-        where: { userId: id }
-      });
-    }
+    const isActiveChanged = isActive !== undefined && currentUser.isActive !== isActive;
 
     // Update user
     const updatedUser = await prisma.user.update({
@@ -56,11 +48,10 @@ export default async function userUpdate(context: Context) {
         nomor: true,
         isActive: true,
         roleId: true,
-        role: { select: { name: true } },
-      },
+        role: { select: { name: true } }
+      }
     });
 
-    
     // ✅ HAPUS SEMUA SESI USER DI DATABASE
     if (isRoleChanged) {
       await prisma.userSession.deleteMany({ where: { userId: id } });
@@ -71,13 +62,11 @@ export default async function userUpdate(context: Context) {
       roleChanged: isRoleChanged,
       isActiveChanged,
       data: updatedUser,
-      message: isRoleChanged
+      message: isRoleChanged 
         ? `Role ${updatedUser.username} diubah. User akan logout otomatis.`
         : isActiveChanged
-        ? `${updatedUser.username} ${
-            isActive ? "diaktifkan" : "dinonaktifkan"
-          }.`
-        : "User berhasil diupdate",
+        ? `${updatedUser.username} ${isActive ? 'diaktifkan' : 'dinonaktifkan'}.`
+        : "User berhasil diupdate"
     };
   } catch (e: any) {
     console.error("❌ Error update user:", e);
@@ -86,4 +75,4 @@ export default async function userUpdate(context: Context) {
       message: "Gagal mengupdate user: " + (e.message || "Unknown error"),
     };
   }
-}
+}

src/app/api/[auth]/_lib/api_fetch_auth.ts

@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
-// app/api/auth/_lib/api_fetch_auth.ts
+// app/api/_lib/api_fetch_auth.ts
 
-// app/api/auth/_lib/api_fetch_auth.ts
+// app/api/_lib/api_fetch_auth.ts
 
 export const apiFetchLogin = async ({ nomor }: { nomor: string }) => {
   if (!nomor || nomor.replace(/\D/g, '').length < 10) {
@@ -10,7 +10,7 @@ export const apiFetchLogin = async ({ nomor }: { nomor: string }) => {
 
   const cleanPhone = nomor.replace(/\D/g, '');
 
-  const response = await fetch("/api/auth/login", {
+  const response = await fetch("/api/login", {
     method: "POST",
     headers: { "Content-Type": "application/json" },
     body: JSON.stringify({ nomor: cleanPhone }),
@@ -22,7 +22,7 @@ export const apiFetchLogin = async ({ nomor }: { nomor: string }) => {
   try {
     data = await response.json();
   } catch (e) {
-    console.error("Non-JSON response from /api/auth/login:", await response.text());
+    console.error("Non-JSON response from /api/login:", await response.text());
     throw new Error('Respons server tidak valid');
   }
 
@@ -55,7 +55,7 @@ export const apiFetchRegister = async ({
   const cleanPhone = nomor.replace(/\D/g, '');
   if (cleanPhone.length < 10) throw new Error('Nomor tidak valid');
 
-  const response = await fetch("/api/auth/register", {
+  const response = await fetch("/api/register", {
     method: "POST",
     headers: { "Content-Type": "application/json" },
     body: JSON.stringify({ username: username.trim(), nomor: cleanPhone }),
@@ -73,7 +73,7 @@ export const apiFetchOtpData = async ({ kodeId }: { kodeId: string }) => {
     throw new Error('Kode ID tidak valid');
   }
 
-  const response = await fetch("/api/auth/otp-data", {
+  const response = await fetch("/api/otp-data", {
     method: "POST",
     headers: { "Content-Type": "application/json" },
     body: JSON.stringify({ kodeId }),
@@ -90,7 +90,7 @@ export const apiFetchOtpData = async ({ kodeId }: { kodeId: string }) => {
 
 // Ganti endpoint ke verify-otp-login
 export const apiFetchVerifyOtp = async ({ nomor, otp, kodeId }: { nomor: string; otp: string; kodeId: string }) => {
-  const response = await fetch('/api/auth/verify-otp-login', {
+  const response = await fetch('/api/verify-otp-login', {
     method: 'POST',
     headers: { 'Content-Type': 'application/json' },
     body: JSON.stringify({ nomor, otp, kodeId }),

src/app/api/[auth]/finalize-registration/route.ts

@@ -30,12 +30,7 @@ export async function POST(req: Request) {
       );
     }
 
-    // Verify OTP
-    const otpRecord = await prisma.kodeOtp.findUnique({ 
-      where: { id: kodeId },
-      select: { nomor: true, isActive: true }
-    });
-
+    const otpRecord = await prisma.kodeOtp.findUnique({ where: { id: kodeId } });
     if (!otpRecord?.isActive || otpRecord.nomor !== cleanNomor) {
       return NextResponse.json(
         { success: false, message: "OTP tidak valid" },
@@ -43,7 +38,6 @@ export async function POST(req: Request) {
       );
     }
 
-    // Check duplicate username
     if (await prisma.user.findFirst({ where: { username } })) {
       return NextResponse.json(
         { success: false, message: "Username sudah digunakan" },
@@ -51,20 +45,12 @@ export async function POST(req: Request) {
       );
     }
 
-    // Check duplicate nomor
-    if (await prisma.user.findUnique({ where: { nomor: cleanNomor } })) {
-      return NextResponse.json(
-        { success: false, message: "Nomor sudah terdaftar" },
-        { status: 409 }
-      );
-    }
-
     // 🔥 Tentukan roleId sebagai STRING
-    const targetRoleId = "2"; // ✅ Default ADMIN_DESA (roleId "2")
+    const targetRoleId = "1"; // ✅ string, bukan number
 
-    // Validasi role exists
+    // Validasi role (gunakan string)
     const roleExists = await prisma.role.findUnique({
-      where: { id: targetRoleId },
+      where: { id: targetRoleId }, // ✅ id bertipe string
       select: { id: true }
     });
 
@@ -75,17 +61,17 @@ export async function POST(req: Request) {
       );
     }
 
-    // ✅ Create user (inactive, waiting approval)
+    // Buat user dengan roleId string
     const newUser = await prisma.user.create({
       data: {
         username,
-        nomor: cleanNomor,
-        roleId: targetRoleId,
-        isActive: false, // Waiting for admin approval
+        nomor,
+        roleId: targetRoleId, // ✅ string
+        isActive: false,
       },
     });
 
-    // ✅ Berikan akses menu default based on role
+    // Berikan akses menu
     const menuIds = DEFAULT_MENUS_BY_ROLE[targetRoleId] || [];
     if (menuIds.length > 0) {
       await prisma.userMenuAccess.createMany({
@@ -93,17 +79,14 @@ export async function POST(req: Request) {
           userId: newUser.id,
           menuId,
         })),
-        skipDuplicates: true, // ✅ Avoid duplicate errors
       });
     }
 
-    // ✅ Mark OTP as used
     await prisma.kodeOtp.update({
       where: { id: kodeId },
       data: { isActive: false },
     });
 
-    // ✅ Create session token
     const token = await sessionCreate({
       sessionKey: process.env.BASE_SESSION_KEY!,
       jwtSecret: process.env.BASE_TOKEN_KEY!,
@@ -112,35 +95,25 @@ export async function POST(req: Request) {
         id: newUser.id,
         nomor: newUser.nomor,
         username: newUser.username,
-        roleId: newUser.roleId,
-        isActive: false, // User belum aktif
+        roleId: newUser.roleId, // string
+        isActive: false,
       },
       invalidatePrevious: false,
     });
 
-    // ✅ PENTING: Return JSON response (bukan redirect)
-    const response = NextResponse.json({
-      success: true,
-      message: "Registrasi berhasil. Menunggu persetujuan admin.",
-      userId: newUser.id,
-    });
-
-    // ✅ Set session cookie
-    const cookieName = process.env.BASE_SESSION_KEY || 'session';
-    response.cookies.set(cookieName, token, {
+    const response = NextResponse.redirect(new URL('/waiting-room', req.url));
+    response.cookies.set(process.env.BASE_SESSION_KEY!, token, {
       httpOnly: true,
       secure: process.env.NODE_ENV === "production",
-      sameSite: 'lax',
       path: "/",
-      maxAge: 30 * 24 * 60 * 60, // 30 days
+      maxAge: 30 * 24 * 60 * 60,
     });
 
     return response;
-
   } catch (error) {
     console.error("❌ Finalize Registration Error:", error);
     return NextResponse.json(
-      { success: false, message: "Registrasi gagal. Silakan coba lagi." },
+      { success: false, message: "Registrasi gagal" },
       { status: 500 }
     );
   } finally {

src/app/api/[auth]/me/route.ts

@@ -12,7 +12,6 @@ export async function GET() {
         { status: 401 }
       );
     }
-    
 
     const [dbUser, menuAccess] = await Promise.all([
       prisma.user.findUnique({
@@ -51,7 +50,7 @@ export async function GET() {
       },
     });
   } catch (error) {
-    console.error("❌ Error in /api/auth/me:", error);
+    console.error("❌ Error in /api/me:", error);
     return NextResponse.json(
       { success: false, message: "Internal server error", user: null },
       { status: 500 }

src/app/darmasaba/(pages)/ppid/daftar-informasi-publik/page.tsx

@@ -151,7 +151,7 @@ function Page() {
                               variant="light"
                               color="blue"
                               leftSection={<IconDeviceImacCog size={16} />}
-                              onClick={() => router.push(`/darmasaba/ppid/daftar-informasi-publik/${item.id}`)}
+                              onClick={() => router.push(`/darmasaba/ppid/daftar-informasi-publik-desa-darmasaba/${item.id}`)}
                             >
                               Detail
                             </Button>

src/app/darmasaba/(tambahan)/apbdes/lib/apbDesaProgress.tsx

@@ -1,8 +1,13 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+// src/app/admin/(dashboard)/landing-page/APBDes/APBDesProgress.tsx
 'use client';
 
-import colors from '@/con/colors';
 import { Box, Paper, Progress, Stack, Text, Title } from '@mantine/core';
-import { APBDesData } from './types';
+import { useProxy } from 'valtio/utils';
+import apbdes from '@/app/admin/(dashboard)/_state/landing-page/apbdes';
+import colors from '@/con/colors';
+
+
 
 function formatRupiah(value: number) {
   return new Intl.NumberFormat('id-ID', {
@@ -12,33 +17,31 @@ function formatRupiah(value: number) {
   }).format(value);
 }
 
-interface APBDesProgressProps {
-  apbdesData: APBDesData;
-}
+function APBDesProgress() {
+  const state = useProxy(apbdes);
+  const data = state.findMany.data || [];
 
-function APBDesProgress({ apbdesData }: APBDesProgressProps) {
-  // Return null if apbdesData is not available yet
-  if (!apbdesData) {
-    return null;
+  // Ambil APBDes pertama (misalnya, jika hanya satu tahun ditampilkan)
+  const apbdesItem = data[0]; // 👈 sesuaikan logika jika ada banyak APBDes
+
+  if (!apbdesItem) {
+    return (
+      <Box py="md" px={{ base: 'md', md: 100 }}>
+        <Text c="dimmed">Belum ada data APBDes untuk ditampilkan.</Text>
+      </Box>
+    );
   }
 
-  const items = apbdesData.items || [];
+  const items = apbdesItem.items || [];
   const sortedItems = [...items].sort((a, b) => a.kode.localeCompare(b.kode));
 
   // Kelompokkan berdasarkan tipe
   const pendapatanItems = sortedItems.filter(item => item.tipe === 'pendapatan');
   const belanjaItems = sortedItems.filter(item => item.tipe === 'belanja');
-  const pembiayaanItems = sortedItems.filter(item => item.tipe === 'pembiayaan');
-  
-  // Items without a type (should be filtered out from calculations)
-  const untypedItems = sortedItems.filter(item => !item.tipe);
-  
-  if (untypedItems.length > 0) {
-    console.warn(`Found ${untypedItems.length} items without a type. These will be excluded from calculations.`);
-  }
+  const pembiayaanItems = sortedItems.filter(item => item.tipe === 'pembiayaan'); // jika ada
 
   // Hitung total per kategori
-  const calcTotal = (items: { anggaran: number; realisasi: number }[]) => {
+  const calcTotal = (items: any[]) => {
     const anggaran = items.reduce((sum, item) => sum + item.anggaran, 0);
     const realisasi = items.reduce((sum, item) => sum + item.realisasi, 0);
     const persen = anggaran > 0 ? (realisasi / anggaran) * 100 : 0;
@@ -47,10 +50,10 @@ function APBDesProgress({ apbdesData }: APBDesProgressProps) {
 
   const pendapatan = calcTotal(pendapatanItems);
   const belanja = calcTotal(belanjaItems);
-  const pembiayaan = calcTotal(pembiayaanItems);
+  const pembiayaan = calcTotal(pembiayaanItems); // bisa kosong
 
   // Render satu progress bar
-  const renderProgress = (label: string, dataset: { realisasi: number; anggaran: number; persen: number }) => {
+  const renderProgress = (label: string, dataset: any) => {
     const isPembiayaan = label.includes('Pembiayaan');
 
     return (
@@ -68,8 +71,8 @@ function APBDesProgress({ apbdesData }: APBDesProgressProps) {
             root: { backgroundColor: '#d7e3f1' },
             section: {
               backgroundColor: isPembiayaan
-                ? 'green'
-                : colors['blue-button'],
+                ? 'green' // warna hijau untuk pembiayaan
+                : colors['blue-button'], // biru untuk pendapatan/belanja
               position: 'relative',
               '&::after': {
                 content: `'${dataset.persen.toFixed(2)}%'`,
@@ -99,7 +102,7 @@ function APBDesProgress({ apbdesData }: APBDesProgressProps) {
     >
       <Stack gap="lg">
         <Title order={4} c={colors['blue-button']} ta="center">
-          Grafik Pelaksanaan APBDes Tahun {apbdesData.tahun}
+          Grafik Pelaksanaan APBDes Tahun {apbdesItem.tahun}
         </Title>
 
         <Text ta="center" fw="bold" fz="sm" c="dimmed">
@@ -109,9 +112,97 @@ function APBDesProgress({ apbdesData }: APBDesProgressProps) {
         {renderProgress('Pendapatan Desa', pendapatan)}
         {renderProgress('Belanja Desa', belanja)}
         {renderProgress('Pembiayaan Desa', pembiayaan)}
+        {pembiayaanItems.length > 0 && renderProgress('Pembiayaan Desa', pembiayaan)}
       </Stack>
     </Paper>
   );
 }
 
-export default APBDesProgress;
+export default APBDesProgress;
+
+// /* eslint-disable @typescript-eslint/no-explicit-any */
+// 'use client';
+
+// import { Box, Paper, Stack, Text, Title } from '@mantine/core';
+// import { BarChart } from '@mantine/charts';
+// import { useProxy } from 'valtio/utils';
+// import apbdes from '@/app/admin/(dashboard)/_state/landing-page/apbdes';
+// import colors from '@/con/colors';
+
+// function APBDesProgress() {
+//   const state = useProxy(apbdes);
+//   const data = state.findMany.data || [];
+
+//   const apbdesItem = data[0];
+//   if (!apbdesItem) {
+//     return (
+//       <Box py="md" px={{ base: 'md', md: 100 }}>
+//         <Text c="dimmed">Belum ada data APBDes untuk ditampilkan.</Text>
+//       </Box>
+//     );
+//   }
+
+//   const items = apbdesItem.items || [];
+//   const sortedItems = [...items].sort((a, b) => a.kode.localeCompare(b.kode));
+
+//   const pendapatanItems = sortedItems.filter(i => i.tipe === 'pendapatan');
+//   const belanjaItems = sortedItems.filter(i => i.tipe === 'belanja');
+//   const pembiayaanItems = sortedItems.filter(i => i.tipe === 'pembiayaan');
+
+//   const total = (rows: any[]) => {
+//     const anggaran = rows.reduce((s, i) => s + i.anggaran, 0);
+//     const realisasi = rows.reduce((s, i) => s + i.realisasi, 0);
+//     return anggaran === 0 ? 0 : (realisasi / anggaran) * 100;
+//   };
+
+//   const chartData = [
+//     { name: 'Pendapatan', persen: total(pendapatanItems) },
+//     { name: 'Belanja', persen: total(belanjaItems) },
+//   ];
+
+//   if (pembiayaanItems.length > 0) {
+//     chartData.push({ name: 'Pembiayaan', persen: total(pembiayaanItems) });
+//   }
+
+//   return (
+//     <Paper
+//       mx={{ base: 'md', md: 100 }}
+//       p="xl"
+//       radius="md"
+//       shadow="sm"
+//       withBorder
+//       bg={colors['white-1']}
+//     >
+//       <Stack gap="lg">
+//         <Title order={4} c={colors['blue-button']} ta="center">
+//           Grafik Pelaksanaan APBDes Tahun {apbdesItem.tahun}
+//         </Title>
+
+//         <Text ta="center" fw="bold" fz="sm" c="dimmed">
+//           Persentase Realisasi (%) dari Anggaran
+//         </Text>
+
+//         <BarChart
+//           h={200}
+//           data={chartData}
+//           orientation="vertical"
+//           dataKey="name"
+//           barProps={{ radius: 6 }}
+//           series={[
+//             {
+//               name: 'persen',
+//               label: 'Persentase',
+//               color: colors['blue-button'],
+//             },
+//           ]}
+//           yAxisProps={{
+//             domain: [0, 100],
+//           }}
+//           valueFormatter={(v) => `${v.toFixed(1)}%`}
+//         />
+//       </Stack>
+//     </Paper>
+//   );
+// }
+
+// export default APBDesProgress;

src/app/darmasaba/(tambahan)/apbdes/lib/apbDesaTable.tsx

@@ -1,8 +1,30 @@
+// src/app/admin/(dashboard)/landing-page/APBDes/APBDesTable.tsx
 'use client';
 
 import { Box, Paper, Table, Text, Title, Badge, Group } from '@mantine/core';
+import { useProxy } from 'valtio/utils';
+import apbdes from '@/app/admin/(dashboard)/_state/landing-page/apbdes';
 import colors from '@/con/colors';
-import { APBDesData } from './types';
+
+interface APBDesItem {
+  id: string;
+  kode: string;
+  uraian: string;
+  anggaran: number;
+  realisasi: number;
+  selisih: number;
+  persentase: number;
+  level: number;
+  tipe: 'pendapatan' | 'belanja' | 'pembiayaan';
+}
+
+interface APBDesData {
+  id: string;
+  tahun: number;
+  items: APBDesItem[];
+  image?: { id: string; url: string } | null;
+  file?: { id: string; url: string } | null;
+}
 
 // Helper: Format Rupiah, tapi jika 0 → tampilkan '-'
 function formatRupiahOrEmpty(value: number): string {
@@ -29,12 +51,22 @@ function getIndent(level: number) {
   };
 }
 
-interface APBDesTableProps {
-  apbdesData: APBDesData;
-}
+function APBDesTable() {
+  const state = useProxy(apbdes);
+  const data = state.findMany.data || [];
 
-function APBDesTable({ apbdesData }: APBDesTableProps) {
-  const items = Array.isArray(apbdesData.items) ? apbdesData.items : [];
+  // Get the first APBDes item
+  const apbdesItem = data[0] as unknown as APBDesData | undefined;
+
+  if (!apbdesItem) {
+    return (
+      <Box py="md" px={{ base: 'md', md: 100 }}>
+        <Text c="dimmed">Belum ada data APBDes untuk ditampilkan.</Text>
+      </Box>
+    );
+  }
+
+  const items = Array.isArray(apbdesItem.items) ? apbdesItem.items : [];
   const sortedItems = [...items].sort((a, b) => a.kode.localeCompare(b.kode));
 
   // Calculate totals
@@ -44,13 +76,13 @@ function APBDesTable({ apbdesData }: APBDesTableProps) {
   const totalPersentase = totalAnggaran > 0 ? (totalRealisasi / totalAnggaran) * 100 : 0;
 
   return (
-    <Box pt={"xs"} pb="md" px={{ base: 'md', md: 100 }}>
+    <Box py="md" px={{ base: 'md', md: 100 }}>
       <Title order={4} c={colors['blue-button']} mb="sm">
-        Rincian APBDes Tahun {apbdesData.tahun}
+        Rincian APBDes Tahun {apbdesItem.tahun}
       </Title>
 
       <Paper withBorder radius="md" shadow="xs" p="md">
-        <Box style={{ overflowY: 'auto' }}>
+        <Box style={{overflowY: 'auto' }}>
           <Table withColumnBorders highlightOnHover>
             <Table.Thead bg="#2c5f78">
               <Table.Tr>
@@ -77,7 +109,9 @@ function APBDesTable({ apbdesData }: APBDesTableProps) {
                   <Table.Td style={getIndent(item.level)}>
                     <Group gap="xs" align="flex-start">
                       <Text fw={item.level === 1 ? 'bold' : 'normal'}>{item.kode}</Text>
-                      <Text fz="sm">{item.uraian}</Text>
+                      <Text fz="sm" >
+                        {item.uraian}
+                      </Text>
                     </Group>
                   </Table.Td>
                   <Table.Td ta="right">{formatRupiahOrEmpty(item.anggaran)}</Table.Td>

src/app/darmasaba/(tambahan)/apbdes/lib/types.ts

@@ -1,42 +0,0 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-export type APBDesTipe = 'pendapatan' | 'belanja' | 'pembiayaan';
-
-export function isAPBDesTipe(tipe: string | null | undefined): tipe is APBDesTipe {
-  return tipe === 'pendapatan' || tipe === 'belanja' || tipe === 'pembiayaan';
-}
-
-export interface APBDesItem {
-  id: string;
-  kode: string;
-  uraian: string;
-  anggaran: number;
-  realisasi: number;
-  selisih: number;
-  persentase: number;
-  level: number;
-  tipe?: APBDesTipe | null;
-  // Additional fields from API
-  createdAt?: Date;
-  updatedAt?: Date;
-  deletedAt?: Date | null;
-  isActive?: boolean;
-  apbdesId?: string;
-}
-
-export interface APBDesData {
-  id: string;
-  tahun: number | null;
-  items: APBDesItem[];
-  image?: { id: string; url: string } | null;
-  file?: { id: string; url: string } | null;
-}
-
-export function transformAPBDesData(data: any): APBDesData {
-  return {
-    ...data,
-    items: data.items.map((item: any) => ({
-      ...item,
-      tipe: isAPBDesTipe(item.tipe) ? item.tipe : null
-    }))
-  };
-}

src/app/darmasaba/(tambahan)/apbdes/page.tsx

@@ -4,21 +4,19 @@
 import PendapatanAsliDesa from '@/app/admin/(dashboard)/_state/ekonomi/PADesa'
 import apbdes from '@/app/admin/(dashboard)/_state/landing-page/apbdes'
 import colors from '@/con/colors'
-import { ActionIcon, BackgroundImage, Box, Center, Container, Group, Loader, Select, SimpleGrid, Stack, Text, Title } from '@mantine/core'
+import { ActionIcon, BackgroundImage, Box, Center, Container, Group, Loader, SimpleGrid, Stack, Text, Title } from '@mantine/core'
 import { IconDownload } from '@tabler/icons-react'
 import { Link } from 'next-view-transitions'
 import { useEffect, useState } from 'react'
 import { useProxy } from 'valtio/utils'
 import BackButton from '../../(pages)/desa/layanan/_com/BackButto'
-import APBDesTable from './lib/apbDesaTable'
 import APBDesProgress from './lib/apbDesaProgress'
-import { transformAPBDesData } from './lib/types'
+import APBDesTable from './lib/apbDesaTable'
 
 function Page() {
   const state = useProxy(apbdes)
   const paDesaState = useProxy(PendapatanAsliDesa.ApbDesa)
   const [loading, setLoading] = useState(false)
-  const [selectedYear, setSelectedYear] = useState<string | null>(null)
   useEffect(() => {
     const loadData = async () => {
       try {
@@ -36,23 +34,6 @@ function Page() {
 
   const dataAPBDes = state.findMany.data || []
 
-  // Buat daftar tahun unik dari data
-  const years = Array.from(new Set(dataAPBDes.map((item: any) => item.tahun)))
-    .sort((a, b) => b - a) // urutkan descending
-    .map(year => ({ value: year.toString(), label: `Tahun ${year}` }))
-
-  // Pilih tahun pertama sebagai default jika belum ada yang dipilih
-  useEffect(() => {
-    if (years.length > 0 && !selectedYear) {
-      setSelectedYear(years[0].value)
-    }
-  }, [years, selectedYear])
-
-  // Transform and filter data based on selected year
-  const currentApbdes = dataAPBDes.length > 0
-    ? transformAPBDesData(dataAPBDes.find(item => item?.tahun?.toString() === selectedYear) || dataAPBDes[0])
-    : null
-
   return (
     <Stack pos="relative" bg={colors.Bg} py="xl" gap={32}>
       <Box px={{ base: 'md', md: 100 }}>
@@ -113,31 +94,8 @@ function Page() {
           ))}
         </SimpleGrid>
       )}
-      {/* 🔥 COMBOBOX UNTUK PILIH TAHUN */}
-      <Box px={{ base: 'md', md: 100 }}>
-        <Select
-          label="Pilih Tahun APBDes"
-          placeholder="Pilih tahun"
-          value={selectedYear}
-          onChange={setSelectedYear}
-          data={years}
-          w={{ base: '100%', sm: 200 }}
-          searchable
-          clearable
-          nothingFoundMessage="Tidak ada tahun tersedia"
-        />
-      </Box>
-      {/* ❗ Pass currentApbdes ke komponen anak */}
-      {currentApbdes ? (
-        <>
-          <APBDesTable apbdesData={currentApbdes} />
-          <APBDesProgress apbdesData={currentApbdes} />
-        </>
-      ) : (
-        <Box px={{ base: 'md', md: 100 }} py="md">
-          <Text c="dimmed">Tidak ada data APBDes untuk tahun yang dipilih.</Text>
-        </Box>
-      )}
+      <APBDesTable />
+      <APBDesProgress />
     </Stack>
   )
 }

src/app/darmasaba/_com/main-page/apbdes/index.tsx

@@ -1,11 +1,9 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable react-hooks/exhaustive-deps */
 'use client'
 import apbdes from '@/app/admin/(dashboard)/_state/landing-page/apbdes'
 import APBDesProgress from '@/app/darmasaba/(tambahan)/apbdes/lib/apbDesaProgress'
-import { transformAPBDesData } from '@/app/darmasaba/(tambahan)/apbdes/lib/types'
 import colors from '@/con/colors'
-import { ActionIcon, BackgroundImage, Box, Button, Center, Flex, Group, Loader, Select, SimpleGrid, Stack, Text } from '@mantine/core'
+import { ActionIcon, BackgroundImage, Box, Button, Center, Flex, Group, Loader, SimpleGrid, Stack, Text } from '@mantine/core'
 import { IconDownload } from '@tabler/icons-react'
 import Link from 'next/link'
 import { useEffect, useState } from 'react'
@@ -14,7 +12,6 @@ import { useProxy } from 'valtio/utils'
 function Apbdes() {
   const state = useProxy(apbdes)
   const [loading, setLoading] = useState(false)
-  const [selectedYear, setSelectedYear] = useState<string | null>(null)
 
   const textHeading = {
     title: 'APBDes',
@@ -35,24 +32,6 @@ function Apbdes() {
     loadData()
   }, [])
 
-  const dataAPBDes = state.findMany.data || []
-
-  const years = Array.from(new Set(dataAPBDes.map((item: any) => item.tahun)))
-    .sort((a, b) => b - a) // urutkan descending
-    .map(year => ({ value: year.toString(), label: `Tahun ${year}` }))
-
-  // Pilih tahun pertama sebagai default jika belum ada yang dipilih
-  useEffect(() => {
-    if (years.length > 0 && !selectedYear) {
-      setSelectedYear(years[0].value)
-    }
-  }, [years, selectedYear])
-
-  // Transform and filter data based on selected year
-  const currentApbdes = dataAPBDes.length > 0
-    ? transformAPBDesData(dataAPBDes.find(item => item?.tahun?.toString() === selectedYear) || dataAPBDes[0])
-    : null
-
   const data = (state.findMany.data || []).slice(0, 3)
 
   return (
@@ -81,30 +60,8 @@ function Apbdes() {
         </Button>
       </Group>
 
-      {/* 🔥 COMBOBOX UNTUK PILIH TAHUN */}
-      <Box px={{ base: 'md', md: 100 }}>
-        <Select
-          label="Pilih Tahun APBDes"
-          placeholder="Pilih tahun"
-          value={selectedYear}
-          onChange={setSelectedYear}
-          data={years}
-          w={{ base: '100%', sm: 200 }}
-          searchable
-          clearable
-          nothingFoundMessage="Tidak ada tahun tersedia"
-        />
-      </Box>
-
-      {currentApbdes ? (
-        <>
-          <APBDesProgress apbdesData={currentApbdes} />
-        </>
-      ) : (
-        <Box px={{ base: 'md', md: 100 }} py="md">
-          <Text c="dimmed">Tidak ada data APBDes untuk tahun yang dipilih.</Text>
-        </Box>
-      )}
+      {/* Chart */}
+      <APBDesProgress />
 
       <SimpleGrid mx={{ base: 'md', md: 100 }} cols={{ base: 1, sm: 3 }} spacing="lg" pb={"xl"}>
         {loading ? (
@@ -172,7 +129,7 @@ function Apbdes() {
         )}
       </SimpleGrid>
 
-
+      
     </Stack>
   )
 }

src/app/darmasaba/_com/term-of-service.html

@@ -1,173 +0,0 @@
-<!DOCTYPE html>
-<html lang="id">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Syarat & Ketentuan Penggunaan HIPMI Badung Connect</title>
-    <style>
-        * {
-            margin: 0;
-            padding: 0;
-            box-sizing: border-box;
-        }
-
-        body {
-            font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif;
-            line-height: 1.6;
-            color: #1e293b;
-            background-color: #f8fafc;
-        }
-
-        .container {
-            max-width: 800px;
-            margin: 0 auto;
-            padding: 40px 20px;
-            background-color: white;
-            min-height: 100vh;
-        }
-
-        h1 {
-            font-size: 2rem;
-            font-weight: 700;
-            color: #1e3a5f;
-            margin-bottom: 1.5rem;
-            line-height: 1.3;
-        }
-
-        h2 {
-            font-size: 1.5rem;
-            font-weight: 700;
-            color: #1e3a5f;
-            margin-top: 2.5rem;
-            margin-bottom: 1rem;
-        }
-
-        p {
-            margin-bottom: 1rem;
-            color: #334155;
-        }
-
-        strong {
-            font-weight: 600;
-            color: #1e293b;
-        }
-
-        ul {
-            margin-left: 1.5rem;
-            margin-bottom: 1.5rem;
-        }
-
-        li {
-            margin-bottom: 0.5rem;
-            color: #334155;
-        }
-
-        .intro {
-            margin-bottom: 2rem;
-            padding: 1.25rem;
-            background-color: #f1f5f9;
-            border-radius: 8px;
-            border-left: 4px solid #1e3a5f;
-        }
-
-        .footer {
-            margin-top: 3rem;
-            padding-top: 2rem;
-            border-top: 1px solid #e2e8f0;
-            text-align: center;
-            color: #64748b;
-            font-size: 0.875rem;
-        }
-
-        @media (max-width: 768px) {
-            .container {
-                padding: 24px 16px;
-            }
-
-            h1 {
-                font-size: 1.5rem;
-            }
-
-            h2 {
-                font-size: 1.25rem;
-                margin-top: 2rem;
-            }
-        }
-
-        @media (max-width: 480px) {
-            h1 {
-                font-size: 1.25rem;
-            }
-
-            h2 {
-                font-size: 1.125rem;
-            }
-
-            ul {
-                margin-left: 1.25rem;
-            }
-        }
-    </style>
-</head>
-<body>
-    <div class="container">
-        <h1>Syarat & Ketentuan Penggunaan HIPMI Badung Connect</h1>
-        
-        <div class="intro">
-            <p>Dengan menggunakan aplikasi <strong>HIPMI Badung Connect</strong> ("Aplikasi"), Anda setuju untuk mematuhi dan terikat oleh syarat dan ketentuan berikut. Jika Anda tidak setuju dengan ketentuan ini, harap jangan gunakan Aplikasi.</p>
-        </div>
-
-        <h2>1. Definisi</h2>
-        <p><strong>HIPMI Badung Connect</strong> adalah platform digital resmi untuk anggota Himpunan Pengusaha Muda Indonesia (HIPMI) Kabupaten Badung, yang bertujuan memfasilitasi jaringan, kolaborasi, dan pertumbuhan bisnis para pengusaha muda.</p>
-
-        <h2>2. Larangan Konten Tidak Pantas</h2>
-        <p>Anda <strong>dilarang keras</strong> memposting, mengirim, membagikan, atau mengunggah konten apa pun yang mengandung:</p>
-        <ul>
-            <li>Ujaran kebencian, diskriminasi, atau konten SARA (Suku, Agama, Ras, Antar-golongan)</li>
-            <li>Pornografi, konten seksual eksplisit, atau gambar tidak senonoh</li>
-            <li>Ancaman, pelecehan, bullying, atau perilaku melecehkan</li>
-            <li>Informasi palsu, hoaks, spam, atau konten menyesatkan</li>
-            <li>Konten ilegal, melanggar hukum, atau melanggar hak kekayaan intelektual pihak lain</li>
-            <li>Promosi narkoba, perjudian, atau aktivitas ilegal lainnya</li>
-        </ul>
-
-        <h2>3. Tanggung Jawab Pengguna</h2>
-        <p>Anda bertanggung jawab penuh atas setiap konten yang Anda unggah atau bagikan melalui fitur-fitur berikut:</p>
-        <ul>
-            <li>Profil (bio, foto, portofolio)</li>
-            <li>Forum diskusi</li>
-            <li>Chat pribadi atau grup</li>
-            <li>Lowongan kerja, investasi, dan donasi</li>
-        </ul>
-        <p>Konten yang melanggar ketentuan ini dapat dihapus kapan saja tanpa pemberitahuan.</p>
-
-        <h2>4. Tindakan terhadap Pelanggaran</h2>
-        <p>Jika kami menerima laporan atau menemukan konten yang melanggar ketentuan ini, kami akan:</p>
-        <ul>
-            <li>Segera menghapus konten tersebut</li>
-            <li>Memberikan peringatan atau memblokir akun pengguna</li>
-            <li>Dalam kasus berat, melaporkan ke pihak berwajib sesuai hukum yang berlaku</li>
-        </ul>
-        <p>Tim kami berkomitmen untuk menanggapi laporan konten tidak pantas <strong>dalam waktu 24 jam</strong>.</p>
-
-        <h2>5. Mekanisme Pelaporan</h2>
-        <p>Anda dapat melaporkan konten atau pengguna yang mencurigakan melalui:</p>
-        <ul>
-            <li>Tombol <strong>"Laporkan"</strong> di setiap posting forum atau pesan chat</li>
-            <li>Tombol <strong>"Blokir Pengguna"</strong> di profil pengguna</li>
-        </ul>
-        <p>Setiap laporan akan ditangani secara rahasia dan segera.</p>
-
-        <h2>6. Perubahan Ketentuan</h2>
-        <p>Kami berhak memperbarui Syarat & Ketentuan ini sewaktu-waktu. Versi terbaru akan dipublikasikan di halaman ini dengan tanggal revisi yang diperbarui.</p>
-
-        <h2>7. Kontak</h2>
-        <p>Jika Anda memiliki pertanyaan tentang ketentuan ini, silakan hubungi kami di:<br>
-        <strong>bip.baliinteraktifperkasa@gmail.com</strong></p>
-
-        <div class="footer">
-            © 2025 Bali Interaktif Perkasa. All rights reserved.
-        </div>
-    </div>
-</body>
-</html>

src/app/globals.css

@@ -1,105 +1,31 @@
 /* styles/globals.css */
-
-/* ===================================
-   1. IMPORT CSS LIBRARIES
-   =================================== */
-@import "@mantine/carousel/styles.css";
-@import "@mantine/dropzone/styles.css";
-@import "@mantine/charts/styles.css";
-@import "@mantine/dates/styles.css";
-@import "@mantine/tiptap/styles.css";
-@import "animate.css";
-@import "react-simple-toasts/dist/style.css";
-@import "react-simple-toasts/dist/theme/dark.css";
-@import "primereact/resources/themes/lara-light-blue/theme.css";
-@import "primereact/resources/primereact.min.css";
-@import "primeicons/primeicons.css";
-
-/* ===================================
-   2. FONT FACE - OPTIMIZED
-   =================================== */
 @font-face {
   font-family: 'San Francisco';
   src: url('/assets/fonts/font.otf') format('opentype');
   font-weight: normal;
   font-style: normal;
-  font-display: swap; /* ✅ TAMBAHKAN INI - Penting untuk PageSpeed! */
 }
 
-/* ===================================
-   3. RESET & BASE STYLES
-   =================================== */
-* {
-  margin: 0;
-  padding: 0;
-  box-sizing: border-box;
-}
-
-html {
-  -webkit-text-size-adjust: 100%; /* Prevent font scaling in landscape */
-  -moz-text-size-adjust: 100%;
-  text-size-adjust: 100%;
-}
-
-body {
-  margin: 0;
-  font-family: 'San Francisco', -apple-system, BlinkMacSystemFont, 'Segoe UI', 
-               Roboto, Helvetica, Arial, sans-serif;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-
-/* ===================================
-   4. GLASS EFFECTS - OPTIMIZED
-   =================================== */
 .glass {
   background: rgba(255, 255, 255, 0.2);
-  backdrop-filter: blur(40px);
   -webkit-backdrop-filter: blur(40px);
+  backdrop-filter: blur(40px);
   position: fixed;
   z-index: 50;
   width: 100%;
   height: 100vh;
-  will-change: transform; /* ✅ Hardware acceleration */
 }
 
 .glass2 {
   background: rgba(255, 255, 255, 0.3);
-  backdrop-filter: blur(40px);
   -webkit-backdrop-filter: blur(40px);
+  backdrop-filter: blur(40px);
   position: fixed;
   z-index: 1;
-  will-change: transform; /* ✅ Hardware acceleration */
 }
 
 .glass3 {
   background: rgba(255, 255, 255, 0.3);
-  backdrop-filter: blur(40px);
   -webkit-backdrop-filter: blur(40px);
-  will-change: transform; /* ✅ Hardware acceleration */
+  backdrop-filter: blur(40px);
 }
-
-/* ===================================
-   5. PERFORMANCE OPTIMIZATION
-   =================================== */
-img, 
-picture, 
-video, 
-canvas, 
-svg {
-  display: block;
-  max-width: 100%;
-  height: auto;
-}
-
-/* Reduce motion for accessibility */
-@media (prefers-reduced-motion: reduce) {
-  *,
-  *::before,
-  *::after {
-    animation-duration: 0.01ms !important;
-    animation-iteration-count: 1 !important;
-    transition-duration: 0.01ms !important;
-    scroll-behavior: auto !important;
-  }
-}

src/app/layout.tsx

@@ -1,5 +1,20 @@
+// Import styles of packages that you've installed.
+// All packages except `@mantine/hooks` require styles imports
+import "@mantine/carousel/styles.css";
 import "@mantine/core/styles.css";
+import '@mantine/dropzone/styles.css';
+import "animate.css";
+import 'react-simple-toasts/dist/style.css';
+import 'react-simple-toasts/dist/theme/dark.css';
 import "./globals.css";
+import '@mantine/charts/styles.css';
+import '@mantine/dates/styles.css';
+import '@mantine/tiptap/styles.css';
+import "primereact/resources/themes/lara-light-blue/theme.css";
+import "primereact/resources/primereact.min.css";
+import "primeicons/primeicons.css";
+
+
 
 import LoadDataFirstClient from "@/app/darmasaba/_com/LoadDataFirstClient";
 import {
@@ -8,83 +23,19 @@ import {
   createTheme,
   mantineHtmlProps,
 } from "@mantine/core";
-import { Metadata, Viewport } from "next";
 import { ViewTransitions } from "next-view-transitions";
 import { ToastContainer } from "react-toastify";
 
-// ✅ Pisahkan viewport ke export tersendiri
-export const viewport: Viewport = {
-  width: "device-width",
-  initialScale: 1,
-  maximumScale: 5,
-};
-
-
-export const metadata: Metadata = {
-  // ✅ Tambahkan metadataBase
-  metadataBase: new URL("https://cld-dkr-staging-desa-darmasaba.wibudev.com"),
-  
-  title: {
-    default: "Desa Darmasaba",
-    template: "%s | Desa Darmasaba",
-  },
-  description: "Website resmi Desa Darmasaba, Kabupaten Badung, Bali. Informasi layanan publik, berita, dan profil desa.",
-  // ❌ HAPUS viewport dari sini
-  keywords: [
-    "desa darmasaba",
-    "darmasaba",
-    "badung",
-    "bali",
-    "desa",
-    "pemerintah desa",
-    "layanan publik",
-    "abang batan desa",
-  ],
-  authors: [{ name: "Pemerintah Desa Darmasaba" }],
-  creator: "Desa Darmasaba",
-  publisher: "Desa Darmasaba",
-  robots: {
-    index: true,
-    follow: true,
-    googleBot: {
-      index: true,
-      follow: true,
-      "max-video-preview": -1,
-      "max-image-preview": "large",
-      "max-snippet": -1,
-    },
-  },
-  icons: {
-    icon: "/assets/images/darmasaba-icon.png",
-    apple: "/assets/images/darmasaba-icon.png",
-  },
-  manifest: "/manifest.json",
-  openGraph: {
-    type: "website",
-    locale: "id_ID",
-    url: "https://cld-dkr-staging-desa-darmasaba.wibudev.com",
-    siteName: "Desa Darmasaba",
-    title: "Desa Darmasaba - Kabupaten Badung, Bali",
-    description: "Website resmi Desa Darmasaba, Kabupaten Badung, Bali. Informasi layanan publik, berita, dan profil desa.",
-    images: [
-      {
-        url: "/assets/images/darmasaba-icon.png",
-        width: 1200,
-        height: 630,
-        alt: "Desa Darmasaba",
-      },
-    ],
-  },
-  category: "government",
-  other: {
-    "msapplication-TileColor": "#ffffff",
-    "theme-color": "#ffffff",
-  },
+export const metadata = {
+  title: "Desa Darmasaba",
+  description: "Desa Darmasaba Kabupaten Badung",
 };
 
 const theme = createTheme({
-  fontFamily: "San Francisco, -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, sans-serif",
-  fontFamilyMonospace: "SFMono-Regular, Menlo, Monaco, Consolas, monospace",
+  fontFamily:
+    "San Francisco, -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Helvetica, Arial, sans-serif",
+  fontFamilyMonospace:
+    "SFMono-Regular, Menlo, Monaco, Consolas, Liberation Mono, Courier New, monospace",
   headings: { fontFamily: "San Francisco, sans-serif" },
 });
 
@@ -95,23 +46,26 @@ export default function RootLayout({
 }) {
   return (
     <ViewTransitions>
-      <html lang="id" {...mantineHtmlProps}>
+      <html lang="en" {...mantineHtmlProps}>
         <head>
-          <meta charSet="utf-8" />
           <ColorSchemeScript />
+          <link
+            rel="icon"
+            href="/assets/images/darmasaba-icon.png"
+            sizes="any"
+          />
         </head>
         <body>
           <MantineProvider theme={theme}>
             {children}
-            <LoadDataFirstClient />
-            <ToastContainer 
-              position="bottom-center" 
-              hideProgressBar 
-              style={{ zIndex: 9999 }} 
-            />
+
           </MantineProvider>
+          <ToastContainer position="bottom-center" hideProgressBar style={{
+          zIndex: 9999
+        }} />
         </body>
+        <LoadDataFirstClient />
       </html>
     </ViewTransitions>
   );
-}
+}

src/app/terms-of-service/page.tsx

@@ -1,102 +0,0 @@
-import { Box, Container, Divider, List, ListItem, Paper, Stack, Text, Title } from '@mantine/core';
-import React from 'react';
-
-function Page() {
-  return (
-    <Container size="md" py={40}>
-      <Stack gap="xl">
-        <Title order={1} size="h1" fw={700} c="blue.9">
-          Syarat & Ketentuan Penggunaan Admin Desa Darmasaba
-        </Title>
-
-        <Paper p="lg" radius="md" withBorder bg="gray.0" style={{ borderLeft: '4px solid #1e3a5f' }}>
-          <Text c="gray.8">
-            Dengan menggunakan website <Text component="span" fw={600}>Admin Desa Darmasaba</Text> (&quot;Website&quot;),
-            Anda setuju untuk mematuhi dan terikat oleh syarat dan ketentuan berikut. Jika Anda tidak setuju
-            dengan ketentuan ini, harap jangan gunakan Website.
-          </Text>
-        </Paper>
-
-        <Box>
-          <Title order={2} size="h2" fw={700} c="blue.9" mb="md">
-            1. Definisi
-          </Title>
-          <Text c="gray.7">
-            <Text component="span" fw={600}>Admin Desa Darmasaba</Text> adalah website resmi untuk Admin Desa Darmasaba, yang bertujuan
-            menambahkan, menghapus, dan mengedit konten desa ke dalam website.
-          </Text>
-        </Box>
-
-        <Box>
-          <Title order={2} size="h2" fw={700} c="blue.9" mb="md">
-            2. Larangan Konten Tidak Pantas
-          </Title>
-          <Text c="gray.7" mb="md">
-            Anda <Text component="span" fw={600}>dilarang keras</Text> menambahkan, menghapus, dan mengedit konten desa apa pun yang mengandung:
-          </Text>
-          <List spacing="xs" c="gray.7">
-            <ListItem>Ujaran kebencian, diskriminasi, atau konten SARA (Suku, Agama, Ras, Antar-golongan)</ListItem>
-            <ListItem>Pornografi, konten seksual eksplisit, atau gambar tidak senonoh</ListItem>
-            <ListItem>Ancaman, pelecehan, bullying, atau perilaku melecehkan</ListItem>
-            <ListItem>Informasi palsu, hoaks, spam, atau konten menyesatkan</ListItem>
-            <ListItem>Konten ilegal, melanggar hukum, atau melanggar hak kekayaan intelektual pihak lain</ListItem>
-            <ListItem>Promosi narkoba, perjudian, atau aktivitas ilegal lainnya</ListItem>
-          </List>
-        </Box>
-
-        <Box>
-          <Title order={2} size="h2" fw={700} c="blue.9" mb="md">
-            3. Tanggung Jawab Pengguna
-          </Title>
-          <List spacing="xs" c="gray.7">
-            <ListItem>Anda bertanggung jawab penuh atas setiap konten yang Anda unggah atau bagikan.</ListItem>
-            <ListItem>Konten yang melanggar ketentuan ini dapat dihapus kapan saja tanpa pemberitahuan.</ListItem>
-          </List>
-        </Box>
-
-        <Box>
-          <Title order={2} size="h2" fw={700} c="blue.9" mb="md">
-            4. Tindakan terhadap Pelanggaran
-          </Title>
-          <Text c="gray.7" mb="md">
-            Jika kami menerima laporan atau menemukan konten yang melanggar ketentuan ini, kami akan:
-          </Text>
-          <List spacing="xs" c="gray.7">
-            <ListItem>Segera menghapus konten tersebut</ListItem>
-            <ListItem>Menghapus akun pengguna</ListItem>
-            <ListItem>Dalam kasus berat, melaporkan ke pihak berwajib sesuai hukum yang berlaku</ListItem>
-          </List>
-        </Box>
-        <Box>
-          <Title order={2} size="h2" fw={700} c="blue.9" mb="md">
-            5. Perubahan Ketentuan
-          </Title>
-          <Text c="gray.7">
-            Kami berhak memperbarui Syarat & Ketentuan ini sewaktu-waktu. Versi terbaru akan dipublikasikan di
-            halaman ini dengan tanggal revisi yang diperbarui.
-          </Text>
-        </Box>
-
-        <Box>
-          <Title order={2} size="h2" fw={700} c="blue.9" mb="md">
-            6. Kontak
-          </Title>
-          <Text c="gray.7">
-            Jika Anda memiliki pertanyaan tentang ketentuan ini, silakan hubungi kami di:
-          </Text>
-          <Text c="gray.7" fw={600} mt="xs">
-            bip.baliinteraktifperkasa@gmail.com
-          </Text>
-        </Box>
-
-        <Divider my="xl" />
-
-        <Text ta="center" c="gray.6" size="sm">
-          © 2025 Bali Interaktif Perkasa. All rights reserved.
-        </Text>
-      </Stack>
-    </Container>
-  );
-}
-
-export default Page;

src/app/waiting-room/page.tsx

@@ -16,9 +16,7 @@ import { useEffect, useState } from 'react';
 import { authStore } from '@/store/authStore'; // ✅ integrasi authStore
 
 async function fetchUser() {
-  const res = await fetch('/api/auth/me', {
-    credentials: 'include'
-  });
+  const res = await fetch('/api/me');
   if (!res.ok) {
     const text = await res.text();
     throw new Error(`HTTP ${res.status}: ${text}`);
@@ -34,7 +32,6 @@ export default function WaitingRoom() {
   const [retryCount, setRetryCount] = useState(0);
   const MAX_RETRIES = 2;
 
-
   useEffect(() => {
     let isMounted = true;
     let interval: ReturnType<typeof setInterval>;
@@ -80,7 +77,7 @@ export default function WaitingRoom() {
 
           // Force a session refresh
           try {
-            const res = await fetch('/api/auth/refresh-session', {
+            const res = await fetch('/api/refresh-session', {
               method: 'POST',
               credentials: 'include'
             });