QC Admin - User Menu Ekonomi : Jumlah Pengangguran

src/app/admin/(dashboard)/ekonomi/PADesa-pendapatan-asli-desa/_lib/layoutTabs.tsx

@@ -1,73 +1,150 @@
 /* eslint-disable react-hooks/exhaustive-deps */
 'use client'
 import colors from '@/con/colors';
-import { Stack, Tabs, TabsList, TabsPanel, TabsTab, Title } from '@mantine/core';
+import {
+  Stack,
+  Tabs,
+  TabsList,
+  TabsPanel,
+  TabsTab,
+  Title,
+  Tooltip,
+  ScrollArea,
+} from '@mantine/core';
 import { usePathname, useRouter } from 'next/navigation';
 import React, { useEffect, useState } from 'react';
+import {
+  IconFileAnalytics,
+  IconCoins,
+  IconShoppingCart,
+  IconWallet,
+} from '@tabler/icons-react';
 
 function LayoutTabs({ children }: { children: React.ReactNode }) {
-  const router = useRouter()
-  const pathname = usePathname()
+  const router = useRouter();
+  const pathname = usePathname();
+
   const tabs = [
     {
       label: "APB Desa",
       value: "apbdesa",
-      href: "/admin/ekonomi/PADesa-pendapatan-asli-desa/apbdesa"
+      href: "/admin/ekonomi/PADesa-pendapatan-asli-desa/apbdesa",
+      icon: <IconFileAnalytics size={18} stroke={1.8} />,
+      tooltip: "Lihat ringkasan Anggaran Pendapatan dan Belanja Desa",
     },
     {
       label: "Pendapatan",
       value: "pendapatan",
-      href: "/admin/ekonomi/PADesa-pendapatan-asli-desa/pendapatan"
+      href: "/admin/ekonomi/PADesa-pendapatan-asli-desa/pendapatan",
+      icon: <IconCoins size={18} stroke={1.8} />,
+      tooltip: "Kelola data pendapatan desa",
     },
     {
       label: "Belanja",
       value: "belanja",
-      href: "/admin/ekonomi/PADesa-pendapatan-asli-desa/belanja"
+      href: "/admin/ekonomi/PADesa-pendapatan-asli-desa/belanja",
+      icon: <IconShoppingCart size={18} stroke={1.8} />,
+      tooltip: "Atur data belanja desa",
     },
     {
       label: "Pembiayaan",
       value: "pembiayaan",
-      href: "/admin/ekonomi/PADesa-pendapatan-asli-desa/pembiayaan"
+      href: "/admin/ekonomi/PADesa-pendapatan-asli-desa/pembiayaan",
+      icon: <IconWallet size={18} stroke={1.8} />,
+      tooltip: "Kelola data pembiayaan desa",
     },
-    
   ];
-  const curentTab = tabs.find(tab => tab.href === pathname)
-  const [activeTab, setActiveTab] = useState<string | null>(curentTab?.value || tabs[0].value);
+
+  const currentTab = tabs.find((tab) => tab.href === pathname);
+  const [activeTab, setActiveTab] = useState<string | null>(
+    currentTab?.value || tabs[0].value
+  );
 
   const handleTabChange = (value: string | null) => {
-    const tab = tabs.find(t => t.value === value)
+    const tab = tabs.find((t) => t.value === value);
     if (tab) {
-      router.push(tab.href)
+      router.push(tab.href);
     }
-    setActiveTab(value)
-  }
+    setActiveTab(value);
+  };
 
   useEffect(() => {
-    const match = tabs.find(tab => tab.href === pathname)
+    const match = tabs.find((tab) => tab.href === pathname);
     if (match) {
-      setActiveTab(match.value)
+      setActiveTab(match.value);
     }
-  }, [pathname])
+  }, [pathname]);
 
   return (
-    <Stack>
-      <Title order={3}>Pendapatan Asli Desa</Title>
-      <Tabs color={colors['blue-button']} variant='pills' value={activeTab} onChange={handleTabChange}>
-        <TabsList p={"xs"} bg={"#BBC8E7FF"}>
-          {tabs.map((e, i) => (
-            <TabsTab key={i} value={e.value}>{e.label}</TabsTab>
-          ))}
-        </TabsList>
-        {tabs.map((e, i) => (
-          <TabsPanel key={i} value={e.value}>
-            {/* Konten dummy, bisa diganti tergantung routing */}
-            <></>
+    <Stack gap="lg">
+      <Title order={2} fw={700} style={{ color: "#1A1B1E" }}>
+        Pendapatan Asli Desa
+      </Title>
+
+      <Tabs
+        color={colors['blue-button']}
+        variant="pills"
+        value={activeTab}
+        onChange={handleTabChange}
+        radius="lg"
+        keepMounted={false}
+      >
+        {/* ✅ Scroll horizontal wrapper */}
+        <ScrollArea type="auto" offsetScrollbars>
+          <TabsList
+            p="sm"
+            style={{
+              background: "linear-gradient(135deg, #e7ebf7, #f9faff)",
+              borderRadius: "1rem",
+              boxShadow: "inset 0 0 10px rgba(0,0,0,0.05)",
+              display: "flex",
+              flexWrap: "nowrap",
+              gap: "0.5rem",
+              paddingInline: "0.5rem",
+            }}
+          >
+            {tabs.map((tab, i) => (
+              <Tooltip
+                key={i}
+                label={tab.tooltip}
+                position="bottom"
+                withArrow
+                transitionProps={{ transition: "pop", duration: 200 }}
+              >
+                <TabsTab
+                  value={tab.value}
+                  leftSection={tab.icon}
+                  style={{
+                    fontWeight: 600,
+                    fontSize: "0.9rem",
+                    transition: "all 0.2s ease",
+                    flexShrink: 0,
+                  }}
+                >
+                  {tab.label}
+                </TabsTab>
+              </Tooltip>
+            ))}
+          </TabsList>
+        </ScrollArea>
+
+        {tabs.map((tab, i) => (
+          <TabsPanel
+            key={i}
+            value={tab.value}
+            style={{
+              padding: "1.5rem",
+              background: "linear-gradient(180deg, #ffffff, #f5f6fa)",
+              borderRadius: "1rem",
+              boxShadow: "0 4px 16px rgba(0,0,0,0.05)",
+            }}
+          >
+            {children}
           </TabsPanel>
         ))}
       </Tabs>
-      {children}
     </Stack>
   );
 }
 
-export default LayoutTabs;
+export default LayoutTabs;

src/app/admin/(dashboard)/ekonomi/PADesa-pendapatan-asli-desa/apbdesa/[id]/edit/page.tsx

@@ -3,7 +3,19 @@
 /* eslint-disable react-hooks/exhaustive-deps */
 import PendapatanAsliDesa from '@/app/admin/(dashboard)/_state/ekonomi/PADesa';
 import colors from '@/con/colors';
-import { Box, Button, MultiSelect, Paper, Skeleton, Stack, Text, TextInput, Title } from '@mantine/core';
+import {
+  Box,
+  Button,
+  MultiSelect,
+  Paper,
+  Skeleton,
+  Stack,
+  Text,
+  TextInput,
+  Title,
+  Tooltip,
+  Group,
+} from '@mantine/core';
 import { useShallowEffect } from '@mantine/hooks';
 import { IconArrowBack } from '@tabler/icons-react';
 import { useParams, useRouter } from 'next/navigation';
@@ -23,7 +35,7 @@ function EditAPBDesa() {
     pembiayaanIds: apbState.update.form.pembiayaanIds || [],
   });
 
-  // Load APB desa by id saat pertama kali
+  // Load APB desa by id
   useEffect(() => {
     const loadAPBdesa = async () => {
       const id = params?.id as string;
@@ -46,12 +58,10 @@ function EditAPBDesa() {
     };
 
     loadAPBdesa();
-  }, [params?.id]); // ✅ hapus beritaState dari dependency
+  }, [params?.id]);
 
   const handleSubmit = async () => {
-
     try {
-      // Update global state with form data
       apbState.update.form = {
         ...apbState.update.form,
         tahun: Number(formData.tahun),
@@ -70,65 +80,95 @@ function EditAPBDesa() {
   };
 
   return (
-    <Box>
-      <Box mb={10}>
-        <Button variant="subtle" onClick={() => router.back()}>
-          <IconArrowBack color={colors["blue-button"]} size={30} />
-        </Button>
-      </Box>
-      <Paper bg={"white"} p={"md"} w={{ base: "100%", md: "50%" }}>
-        <Stack gap={"xs"}>
-          <Title order={3}>Edit APB Desa</Title>
+    <Box px={{ base: 'sm', md: 'lg' }} py="md">
+      {/* Header */}
+      <Group mb="md">
+        <Tooltip label="Kembali ke halaman sebelumnya" withArrow>
+          <Button
+            variant="subtle"
+            onClick={() => router.back()}
+            p="xs"
+            radius="md"
+          >
+            <IconArrowBack color={colors['blue-button']} size={24} />
+          </Button>
+        </Tooltip>
+        <Title order={4} ml="sm" c="dark">
+          Edit APB Desa
+        </Title>
+      </Group>
+
+      {/* Form Card */}
+      <Paper
+        w={{ base: '100%', md: '50%' }}
+        bg={colors['white-1']}
+        p="lg"
+        radius="md"
+        shadow="sm"
+        style={{ border: '1px solid #e0e0e0' }}
+      >
+        <Stack gap="md">
+          {/* Tahun */}
           <TextInput
-            type='number'
+            type="number"
             value={formData.tahun}
-            onChange={(val) => {
-              setFormData({ ...formData, tahun: val.target.value });
-            }}
-            label={<Text fz={"sm"} fw={"bold"}>Tahun</Text>}
-            placeholder="masukkan tahun"
+            onChange={(e) =>
+              setFormData({ ...formData, tahun: e.target.value })
+            }
+            label={<Text fz="sm" fw="bold">Tahun</Text>}
+            placeholder="Masukkan tahun anggaran"
+            required
           />
+
+          {/* Selects */}
           <SelectPendapatan
             selectedIds={formData.pendapatanIds}
-            onSelectionChange={(ids) => {
-              setFormData({ ...formData, pendapatanIds: ids });
-            }}
+            onSelectionChange={(ids) =>
+              setFormData({ ...formData, pendapatanIds: ids })
+            }
           />
+
           <SelectBelanja
             selectedIds={formData.belanjaIds}
-            onSelectionChange={(ids) => {
-              setFormData({ ...formData, belanjaIds: ids });
-            }}
+            onSelectionChange={(ids) =>
+              setFormData({ ...formData, belanjaIds: ids })
+            }
           />
+
           <SelectPembiayaan
             selectedIds={formData.pembiayaanIds}
-            onSelectionChange={(ids) => {
-              setFormData({ ...formData, pembiayaanIds: ids });
-            }}
+            onSelectionChange={(ids) =>
+              setFormData({ ...formData, pembiayaanIds: ids })
+            }
           />
-          <Button onClick={handleSubmit}>Simpan</Button>
+
+          {/* Save Button */}
+          <Group justify="right">
+            <Button
+              onClick={handleSubmit}
+              radius="md"
+              size="md"
+              style={{
+                background: `linear-gradient(135deg, ${colors['blue-button']}, #4facfe)`,
+                color: '#fff',
+                boxShadow: '0 4px 15px rgba(79, 172, 254, 0.4)',
+              }}
+            >
+              Simpan
+            </Button>
+          </Group>
         </Stack>
       </Paper>
     </Box>
   );
 
+  /* --- Sub Components --- */
 
-  /* Select Pendapatan */
-  interface SelectPendapatanProps {
-    selectedIds: string[];
-    onSelectionChange: (ids: string[]) => void;
-  }
-
-  function SelectPendapatan({
-    selectedIds = [],
-    onSelectionChange,
-  }: SelectPendapatanProps) {
+  function SelectPendapatan({ selectedIds, onSelectionChange }: { selectedIds: string[]; onSelectionChange: (ids: string[]) => void }) {
     const pendapatanState = useProxy(PendapatanAsliDesa.pendapatan);
 
     useShallowEffect(() => {
-      pendapatanState.findMany.load().then(() => {
-        console.log("Pendapatan berhasil dimuat:", pendapatanState.findMany.data);
-      });
+      pendapatanState.findMany.load();
     }, []);
 
     if (!pendapatanState.findMany.data) {
@@ -137,10 +177,10 @@ function EditAPBDesa() {
 
     return (
       <MultiSelect
-        label={<Text fz={"sm"} fw={"bold"}>Pendapatan</Text>}
-        data={pendapatanState.findMany.data.map(p => ({
+        label={<Text fz="sm" fw="bold">Pendapatan</Text>}
+        data={pendapatanState.findMany.data.map((p: any) => ({
           value: p.id,
-          label: p.name
+          label: p.name,
         }))}
         value={selectedIds}
         onChange={onSelectionChange}
@@ -152,22 +192,11 @@ function EditAPBDesa() {
     );
   }
 
-  /* Select Belanja */
-  interface SelectBelanjaProps {
-    selectedIds: string[];
-    onSelectionChange: (ids: string[]) => void;
-  }
-
-  function SelectBelanja({
-    selectedIds = [],
-    onSelectionChange,
-  }: SelectBelanjaProps) {
+  function SelectBelanja({ selectedIds, onSelectionChange }: { selectedIds: string[]; onSelectionChange: (ids: string[]) => void }) {
     const belanjaState = useProxy(PendapatanAsliDesa.belanja);
 
     useShallowEffect(() => {
-      belanjaState.findMany.load().then(() => {
-        console.log("Belanja berhasil dimuat:", belanjaState.findMany.data);
-      });
+      belanjaState.findMany.load();
     }, []);
 
     if (!belanjaState.findMany.data) {
@@ -176,10 +205,10 @@ function EditAPBDesa() {
 
     return (
       <MultiSelect
-        label={<Text fz={"sm"} fw={"bold"}>Belanja</Text>}
-        data={belanjaState.findMany.data.map(b => ({
+        label={<Text fz="sm" fw="bold">Belanja</Text>}
+        data={belanjaState.findMany.data.map((b: any) => ({
           value: b.id,
-          label: b.name
+          label: b.name,
         }))}
         value={selectedIds}
         onChange={onSelectionChange}
@@ -191,22 +220,11 @@ function EditAPBDesa() {
     );
   }
 
-  /* Select Pembiayaan */
-  interface SelectPembiayaanProps {
-    selectedIds: string[];
-    onSelectionChange: (ids: string[]) => void;
-  }
-
-  function SelectPembiayaan({
-    selectedIds = [],
-    onSelectionChange,
-  }: SelectPembiayaanProps) {
+  function SelectPembiayaan({ selectedIds, onSelectionChange }: { selectedIds: string[]; onSelectionChange: (ids: string[]) => void }) {
     const pembiayaanState = useProxy(PendapatanAsliDesa.pembiayaan);
 
     useShallowEffect(() => {
-      pembiayaanState.findMany.load().then(() => {
-        console.log("Pembiayaan berhasil dimuat:", pembiayaanState.findMany.data);
-      });
+      pembiayaanState.findMany.load();
     }, []);
 
     if (!pembiayaanState.findMany.data) {
@@ -215,10 +233,10 @@ function EditAPBDesa() {
 
     return (
       <MultiSelect
-        label={<Text fz={"sm"} fw={"bold"}>Pembiayaan</Text>}
-        data={pembiayaanState.findMany.data.map(b => ({
-          value: b.id,
-          label: b.name
+        label={<Text fz="sm" fw="bold">Pembiayaan</Text>}
+        data={pembiayaanState.findMany.data.map((p: any) => ({
+          value: p.id,
+          label: p.name,
         }))}
         value={selectedIds}
         onChange={onSelectionChange}

src/app/admin/(dashboard)/ekonomi/PADesa-pendapatan-asli-desa/apbdesa/[id]/page.tsx

@@ -2,148 +2,204 @@
 import { ModalKonfirmasiHapus } from '@/app/admin/(dashboard)/_com/modalKonfirmasiHapus';
 import PendapatanAsliDesa from '@/app/admin/(dashboard)/_state/ekonomi/PADesa';
 import colors from '@/con/colors';
-import { Box, Button, Flex, Paper, Skeleton, Stack, Text } from '@mantine/core';
+import {
+  Box,
+  Button,
+  Group,
+  Paper,
+  Skeleton,
+  Stack,
+  Text,
+  Tooltip
+} from '@mantine/core';
 import { useShallowEffect } from '@mantine/hooks';
-import { IconArrowBack, IconEdit, IconX } from '@tabler/icons-react';
+import { IconArrowBack, IconEdit, IconTrash } from '@tabler/icons-react';
 import { useParams, useRouter } from 'next/navigation';
 import { useState } from 'react';
 import { useProxy } from 'valtio/utils';
 
-
-
 function DetailAPBDesa() {
-  const apbState = useProxy(PendapatanAsliDesa.ApbDesa)
-  const [modalHapus, setModalHapus] = useState(false)
-  const [selectedId, setSelectedId] = useState<string | null>(null)
-  const params = useParams()
-  const router = useRouter()
+  const apbState = useProxy(PendapatanAsliDesa.ApbDesa);
+  const [modalHapus, setModalHapus] = useState(false);
+  const [selectedId, setSelectedId] = useState<string | null>(null);
+  const params = useParams();
+  const router = useRouter();
 
   useShallowEffect(() => {
-    console.log("PARAM ID:", params?.id)
-    apbState.findUnique.load(params?.id as string)
-  }, [])
+    apbState.findUnique.load(params?.id as string);
+  }, []);
 
-  const formatRupiah = (value: number) => {
-    return new Intl.NumberFormat('id-ID', {
+  const formatRupiah = (value: number) =>
+    new Intl.NumberFormat('id-ID', {
       style: 'currency',
       currency: 'IDR',
       minimumFractionDigits: 0,
     }).format(value);
-  };
 
   const handleHapus = () => {
     if (selectedId) {
-      apbState.delete.byId(selectedId)
-      setModalHapus(false)
-      setSelectedId(null)
-      router.push("/admin/ekonomi/PADesa-pendapatan-asli-desa/apbdesa")
+      apbState.delete.byId(selectedId);
+      setModalHapus(false);
+      setSelectedId(null);
+      router.push(
+        '/admin/ekonomi/PADesa-pendapatan-asli-desa/apbdesa'
+      );
     }
-  }
+  };
 
   if (!apbState.findUnique.data) {
     return (
       <Stack py={10}>
-        <Skeleton h={40} />
+        <Skeleton height={500} radius="md" />
       </Stack>
-    )
+    );
   }
 
+  const data = apbState.findUnique.data;
+
   return (
-    <Box>
-      <Box mb={10}>
-        <Button variant="subtle" onClick={() => router.back()}>
-          <IconArrowBack color={colors['blue-button']} size={25} />
-        </Button>
-      </Box>
-      <Paper bg={colors['white-1']} w={{ base: "100%", md: "100%", lg: "50%" }} p={'md'}>
-        <Stack>
-          <Text fz={"xl"} fw={"bold"}>Detail APB Desa</Text>
-          {apbState.findUnique.data ? (
-            <Paper key={apbState.findUnique.data.id} bg={colors['BG-trans']} p={'md'}>
-              <Stack gap={"xs"}>
-                <Box>
-                  <Text fw={"bold"} fz={"lg"}>Tahun</Text>
-                  <Text fz={"lg"}>{apbState.findUnique.data?.tahun}</Text>
-                </Box>
-                <Box>
-                  <Stack gap={"xs"}>
-                    <Text fw={"bold"} fz={"lg"}>Detail Pembiayaan</Text>
-                    {(apbState.findUnique.data?.pembiayaan || []).map((item) => (
-                      <Text fz={"lg"} key={item.id}>
-                        {item.name}: {formatRupiah(Number(item.value))}
-                      </Text>
-                    ))}
-                    <Text fz={"lg"} fw={"bold"}>
-                      Total: {formatRupiah((apbState.findUnique.data?.pembiayaan || [])
-                        .reduce((sum, item) => sum + Number(item.value), 0))}
+    <Box py={10}>
+      <Button
+        variant="subtle"
+        onClick={() => router.back()}
+        leftSection={<IconArrowBack size={24} color={colors['blue-button']} />}
+        mb={15}
+      >
+        Kembali
+      </Button>
+
+      <Paper
+        withBorder
+        w={{ base: '100%', md: '70%', lg: '50%' }}
+        bg={colors['white-1']}
+        p="lg"
+        radius="md"
+        shadow="sm"
+      >
+        <Stack gap="md">
+          <Text fz="2xl" fw="bold" c={colors['blue-button']}>
+            Detail APB Desa
+          </Text>
+
+          <Paper bg={colors['BG-trans']} p="md" radius="md" shadow="xs">
+            <Stack gap="sm">
+              <Box>
+                <Text fz="lg" fw="bold">
+                  Tahun
+                </Text>
+                <Text fz="md" c="dimmed">
+                  {data.tahun}
+                </Text>
+              </Box>
+
+              <Box>
+                <Stack gap="xs">
+                  <Text fw="bold" fz="lg">
+                    Detail Pembiayaan
+                  </Text>
+                  {(data?.pembiayaan || []).map((item) => (
+                    <Text fz="md" c="dimmed" key={item.id}>
+                      {item.name}: {formatRupiah(Number(item.value))}
                     </Text>
-                  </Stack>
-                </Box>
-                <Box>
-                  <Stack gap={"xs"}>
-                    <Text fw={"bold"} fz={"lg"}>Detail Belanja</Text>
-                    {(apbState.findUnique.data?.belanja || []).map((item) => (
-                      <Text fz={"lg"} key={item.id}>
-                        {item.name}: {formatRupiah(Number(item.value))}
-                      </Text>
-                    ))}
-                    <Text fz={"lg"} fw={"bold"}>
-                      Total: {formatRupiah((apbState.findUnique.data?.belanja || [])
-                        .reduce((sum, item) => sum + Number(item.value), 0))}
+                  ))}
+                  <Text fz="md" fw="bold">
+                    Total:{' '}
+                    {formatRupiah(
+                      (data?.pembiayaan || []).reduce(
+                        (sum, item) => sum + Number(item.value),
+                        0
+                      )
+                    )}
+                  </Text>
+                </Stack>
+              </Box>
+
+              <Box>
+                <Stack gap="xs">
+                  <Text fw="bold" fz="lg">
+                    Detail Belanja
+                  </Text>
+                  {(data?.belanja || []).map((item) => (
+                    <Text fz="md" c="dimmed" key={item.id}>
+                      {item.name}: {formatRupiah(Number(item.value))}
                     </Text>
-                  </Stack>
-                </Box>
-                <Box>
-                  <Stack gap={"xs"}>
-                    <Text fw={"bold"} fz={"lg"}>Detail Pendapatan</Text>
-                    {(apbState.findUnique.data?.pendapatan || []).map((item) => (
-                      <Text fz={"lg"} key={item.id}>
-                        {item.name}: {formatRupiah(Number(item.value))}
-                      </Text>
-                    ))}
-                    <Text fz={"lg"} fw={"bold"}>
-                      Total: {formatRupiah((apbState.findUnique.data?.pendapatan || [])
-                        .reduce((sum, item) => sum + Number(item.value), 0))}
+                  ))}
+                  <Text fz="md" fw="bold">
+                    Total:{' '}
+                    {formatRupiah(
+                      (data?.belanja || []).reduce(
+                        (sum, item) => sum + Number(item.value),
+                        0
+                      )
+                    )}
+                  </Text>
+                </Stack>
+              </Box>
+
+              <Box>
+                <Stack gap="xs">
+                  <Text fw="bold" fz="lg">
+                    Detail Pendapatan
+                  </Text>
+                  {(data?.pendapatan || []).map((item) => (
+                    <Text fz="md" c="dimmed" key={item.id}>
+                      {item.name}: {formatRupiah(Number(item.value))}
                     </Text>
-                  </Stack>
-                </Box>
-                <Flex gap={"xs"} mt={10}>
+                  ))}
+                  <Text fz="md" fw="bold">
+                    Total:{' '}
+                    {formatRupiah(
+                      (data?.pendapatan || []).reduce(
+                        (sum, item) => sum + Number(item.value),
+                        0
+                      )
+                    )}
+                  </Text>
+                </Stack>
+              </Box>
+
+              <Group gap="sm" mt={10}>
+                <Tooltip label="Hapus APB Desa" withArrow position="top">
                   <Button
+                    color="red"
                     onClick={() => {
-                      if (apbState.findUnique.data) {
-                        setSelectedId(apbState.findUnique.data.id);
-                        setModalHapus(true);
-                      }
+                      setSelectedId(data.id);
+                      setModalHapus(true);
                     }}
-                    disabled={apbState.delete.loading || !apbState.findUnique.data}
-                    color={"red"}
+                    variant="light"
+                    radius="md"
+                    size="md"
                   >
-                    <IconX size={20} />
+                    <IconTrash size={20} />
                   </Button>
+                </Tooltip>
+
+                <Tooltip label="Edit APB Desa" withArrow position="top">
                   <Button
-                    onClick={() => {
-                      if (apbState.findUnique.data) {
-                        router.push(`/admin/ekonomi/PADesa-pendapatan-asli-desa/apbdesa/${apbState.findUnique.data.id}/edit`);
-                      }
-                    }}
-                    disabled={!apbState.findUnique.data}
-                    color={"green"}
+                    color="green"
+                    onClick={() =>
+                      router.push(
+                        `/admin/ekonomi/PADesa-pendapatan-asli-desa/apbdesa/${data.id}/edit`
+                      )
+                    }
+                    variant="light"
+                    radius="md"
+                    size="md"
                   >
                     <IconEdit size={20} />
                   </Button>
-                </Flex>
-              </Stack>
-            </Paper>
-          ) : null}
+                </Tooltip>
+              </Group>
+            </Stack>
+          </Paper>
         </Stack>
       </Paper>
 
-      {/* Modal Konfirmasi Hapus */}
       <ModalKonfirmasiHapus
         opened={modalHapus}
         onClose={() => setModalHapus(false)}
         onConfirm={handleHapus}
-        text='Apakah anda yakin ingin menghapus APB Desa ini?'
+        text="Apakah Anda yakin ingin menghapus APB Desa ini?"
       />
     </Box>
   );

src/app/admin/(dashboard)/ekonomi/PADesa-pendapatan-asli-desa/apbdesa/create/page.tsx

@@ -1,15 +1,28 @@
-'use client'
+'use client';
+
 import PendapatanAsliDesa from '@/app/admin/(dashboard)/_state/ekonomi/PADesa';
 import colors from '@/con/colors';
-import { Box, Button, MultiSelect, Paper, Skeleton, Stack, Text, TextInput, Title } from '@mantine/core';
+import {
+  Box,
+  Button,
+  Group,
+  MultiSelect,
+  Paper,
+  Skeleton,
+  Stack,
+  Text,
+  TextInput,
+  Title,
+  Tooltip,
+} from '@mantine/core';
 import { useShallowEffect } from '@mantine/hooks';
 import { IconArrowBack } from '@tabler/icons-react';
 import { useRouter } from 'next/navigation';
 import { useProxy } from 'valtio/utils';
 
 function CreateAPBDesa() {
-  const apbDesaState = useProxy(PendapatanAsliDesa.ApbDesa)
-  const router = useRouter()
+  const apbDesaState = useProxy(PendapatanAsliDesa.ApbDesa);
+  const router = useRouter();
 
   const resetForm = () => {
     apbDesaState.create.form = {
@@ -17,74 +30,101 @@ function CreateAPBDesa() {
       pendapatanIds: [],
       belanjaIds: [],
       pembiayaanIds: [],
-    }
-  }
+    };
+  };
 
   const handleSubmit = async () => {
-    await apbDesaState.create.submit()
-    resetForm()
-    router.push("/admin/ekonomi/PADesa-pendapatan-asli-desa/apbdesa")
-  }
+    await apbDesaState.create.submit();
+    resetForm();
+    router.push('/admin/ekonomi/PADesa-pendapatan-asli-desa/apbdesa');
+  };
 
   return (
-    <Box>
-      <Box mb={10}>
-        <Button variant="subtle" onClick={() => router.back()}>
-          <IconArrowBack color={colors['blue-button']} size={25} />
-        </Button>
-      </Box>
-      <Paper bg={colors["white-1"]} p={"md"} w={{ base: "100%", md: "50%" }}>
-        <Stack gap={"xs"}>
-          <Title order={3}>Create APB Desa</Title>
+    <Box px={{ base: 'sm', md: 'lg' }} py="md">
+      {/* Header */}
+      <Group mb="md">
+        <Tooltip label="Kembali ke halaman sebelumnya" withArrow>
+          <Button variant="subtle" onClick={() => router.back()} p="xs" radius="md">
+            <IconArrowBack color={colors['blue-button']} size={24} />
+          </Button>
+        </Tooltip>
+        <Title order={4} ml="sm" c="dark">
+          Tambah APB Desa
+        </Title>
+      </Group>
+
+      {/* Form */}
+      <Paper
+        w={{ base: '100%', md: '50%' }}
+        bg={colors['white-1']}
+        p="lg"
+        radius="md"
+        shadow="sm"
+        style={{ border: '1px solid #e0e0e0' }}
+      >
+        <Stack gap="md">
           <TextInput
-            type='number'
+            type="number"
             value={apbDesaState.create.form.tahun}
             onChange={(val) => {
               apbDesaState.create.form.tahun = Number(val.target.value);
             }}
-            label={<Text fz={"sm"} fw={"bold"}>Tahun</Text>}
-            placeholder="masukkan tahun"
+            label={<Text fz="sm" fw="bold">Tahun</Text>}
+            placeholder="Masukkan tahun anggaran"
+            required
           />
+
           <SelectPendapatan
             selectedIds={apbDesaState.create.form.pendapatanIds}
             onSelectionChange={(ids) => {
               apbDesaState.create.form.pendapatanIds = ids;
             }}
           />
+
           <SelectBelanja
             selectedIds={apbDesaState.create.form.belanjaIds}
             onSelectionChange={(ids) => {
               apbDesaState.create.form.belanjaIds = ids;
             }}
           />
+
           <SelectPembiayaan
             selectedIds={apbDesaState.create.form.pembiayaanIds}
             onSelectionChange={(ids) => {
               apbDesaState.create.form.pembiayaanIds = ids;
             }}
           />
-          <Button bg={colors['blue-button']} onClick={handleSubmit}>Simpan</Button>
+
+          {/* Action */}
+          <Group justify="right">
+            <Button
+              onClick={handleSubmit}
+              radius="md"
+              size="md"
+              style={{
+                background: `linear-gradient(135deg, ${colors['blue-button']}, #4facfe)`,
+                color: '#fff',
+                boxShadow: '0 4px 15px rgba(79, 172, 254, 0.4)',
+              }}
+            >
+              Simpan
+            </Button>
+          </Group>
         </Stack>
       </Paper>
     </Box>
   );
 
-/* Select Pendapatan */
+  /* ---------- Select Pendapatan ---------- */
   interface SelectPendapatanProps {
     selectedIds: string[];
     onSelectionChange: (ids: string[]) => void;
   }
-
-  function SelectPendapatan({
-    selectedIds = [],
-    onSelectionChange,
-  }: SelectPendapatanProps) {
+  function SelectPendapatan({ selectedIds = [], onSelectionChange }: SelectPendapatanProps) {
     const pendapatanState = useProxy(PendapatanAsliDesa.pendapatan);
 
     useShallowEffect(() => {
-      pendapatanState.findMany.load().then(() => {
-        console.log("Pendapatan berhasil dimuat:", pendapatanState.findMany.data);
-      });
+      pendapatanState.findMany.load();
     }, []);
 
     if (!pendapatanState.findMany.data) {
@@ -93,10 +133,10 @@ function CreateAPBDesa() {
 
     return (
       <MultiSelect
-        label={<Text fz={"sm"} fw={"bold"}>Pendapatan</Text>}
-        data={pendapatanState.findMany.data.map(p => ({
+        label={<Text fz="sm" fw="bold">Pendapatan</Text>}
+        data={pendapatanState.findMany.data.map((p) => ({
           value: p.id,
-          label: p.name
+          label: p.name,
         }))}
         value={selectedIds}
         onChange={onSelectionChange}
@@ -108,22 +148,16 @@ function CreateAPBDesa() {
     );
   }
 
-  /* Select Belanja */
+  /* ---------- Select Belanja ---------- */
   interface SelectBelanjaProps {
     selectedIds: string[];
     onSelectionChange: (ids: string[]) => void;
   }
-
-  function SelectBelanja({
-    selectedIds = [],
-    onSelectionChange,
-  }: SelectBelanjaProps) {
+  function SelectBelanja({ selectedIds = [], onSelectionChange }: SelectBelanjaProps) {
     const belanjaState = useProxy(PendapatanAsliDesa.belanja);
 
     useShallowEffect(() => {
-      belanjaState.findMany.load().then(() => {
-        console.log("Belanja berhasil dimuat:", belanjaState.findMany.data);
-      });
+      belanjaState.findMany.load();
     }, []);
 
     if (!belanjaState.findMany.data) {
@@ -132,10 +166,10 @@ function CreateAPBDesa() {
 
     return (
       <MultiSelect
-        label={<Text fz={"sm"} fw={"bold"}>Belanja</Text>}
-        data={belanjaState.findMany.data.map(b => ({
+        label={<Text fz="sm" fw="bold">Belanja</Text>}
+        data={belanjaState.findMany.data.map((b) => ({
           value: b.id,
-          label: b.name
+          label: b.name,
         }))}
         value={selectedIds}
         onChange={onSelectionChange}
@@ -147,22 +181,16 @@ function CreateAPBDesa() {
     );
   }
 
-  /* Select Pembiayaan */
+  /* ---------- Select Pembiayaan ---------- */
   interface SelectPembiayaanProps {
     selectedIds: string[];
     onSelectionChange: (ids: string[]) => void;
   }
-
-  function SelectPembiayaan({
-    selectedIds = [],
-    onSelectionChange,
-  }: SelectPembiayaanProps) {
+  function SelectPembiayaan({ selectedIds = [], onSelectionChange }: SelectPembiayaanProps) {
     const pembiayaanState = useProxy(PendapatanAsliDesa.pembiayaan);
 
     useShallowEffect(() => {
-      pembiayaanState.findMany.load().then(() => {
-        console.log("Pembiayaan berhasil dimuat:", pembiayaanState.findMany.data);
-      });
+      pembiayaanState.findMany.load();
     }, []);
 
     if (!pembiayaanState.findMany.data) {
@@ -171,10 +199,10 @@ function CreateAPBDesa() {
 
     return (
       <MultiSelect
-        label={<Text fz={"sm"} fw={"bold"}>Pembiayaan</Text>}
-        data={pembiayaanState.findMany.data.map(b => ({
+        label={<Text fz="sm" fw="bold">Pembiayaan</Text>}
+        data={pembiayaanState.findMany.data.map((b) => ({
           value: b.id,
-          label: b.name
+          label: b.name,
         }))}
         value={selectedIds}
         onChange={onSelectionChange}

src/app/admin/(dashboard)/ekonomi/PADesa-pendapatan-asli-desa/apbdesa/page.tsx

@@ -1,23 +1,38 @@
 'use client'
 import colors from '@/con/colors';
-import { Box, Button, Paper, Skeleton, Stack, Table, TableTbody, TableTd, TableTh, TableThead, TableTr } from '@mantine/core';
+import {
+  Box,
+  Button,
+  Center,
+  Group,
+  Paper,
+  Pagination,
+  Skeleton,
+  Stack,
+  Table,
+  TableTbody,
+  TableTd,
+  TableTh,
+  TableThead,
+  TableTr,
+  Text,
+  Tooltip,
+} from '@mantine/core';
 import { useShallowEffect } from '@mantine/hooks';
-import { IconDeviceImacCog, IconSearch } from '@tabler/icons-react';
+import { IconDeviceImacCog, IconPlus, IconSearch } from '@tabler/icons-react';
 import { useRouter } from 'next/navigation';
 import { useState } from 'react';
 import { useProxy } from 'valtio/utils';
 import HeaderSearch from '../../../_com/header';
-import JudulList from '../../../_com/judulList';
 import PendapatanAsliDesa from '../../../_state/ekonomi/PADesa';
 
-
 function APBDesa() {
   const [search, setSearch] = useState("");
   return (
     <Box>
       <HeaderSearch
-        title='APB Desa'
-        placeholder='pencarian'
+        title="APB Desa"
+        placeholder="Cari tahun atau nominal..."
         searchIcon={<IconSearch size={20} />}
         value={search}
         onChange={(e) => setSearch(e.currentTarget.value)}
@@ -28,77 +43,147 @@ function APBDesa() {
 }
 
 function ListAPBDesa({ search }: { search: string }) {
-  const apbDesaState = useProxy(PendapatanAsliDesa.ApbDesa)
+  const apbDesaState = useProxy(PendapatanAsliDesa.ApbDesa);
   const router = useRouter();
 
-  const formatRupiah = (value: number) => {
-    return new Intl.NumberFormat('id-ID', {
-      style: 'currency',
-      currency: 'IDR',
+  const {
+    data,
+    page,
+    totalPages,
+    loading,
+    load,
+  } = apbDesaState.findMany;
+
+  const formatRupiah = (value: number) =>
+    new Intl.NumberFormat("id-ID", {
+      style: "currency",
+      currency: "IDR",
       minimumFractionDigits: 0,
     }).format(value);
-  };
 
   useShallowEffect(() => {
-    apbDesaState.findMany.load();
-  }, [])
+    load(page, 10, search);
+  }, [page, search]);
 
-  const filteredData = (apbDesaState.findMany.data || []).filter(item => {
-    const keyword = search.toLowerCase();
-    return (
-      item.tahun.toString().toLowerCase().includes(keyword) ||
-      item.pembiayaan.map((item) => item.value.toString()).includes(keyword) ||
-      item.belanja.map((item) => item.value.toString()).includes(keyword) ||
-      item.pendapatan.map((item) => item.value.toString()).includes(keyword)
-    );
-  });
+  const filteredData = data || [];
 
-  if (!apbDesaState.findMany.data) {
+  if (loading || !data) {
     return (
       <Stack py={10}>
-        <Skeleton h={500} />
+        <Skeleton height={500} radius="md" />
       </Stack>
-    )
+    );
   }
+
   return (
     <Box py={10}>
-      <Paper bg={colors['white-1']} p={'md'}>
-        <JudulList
-          title='List APB Desa'
-          href='/admin/ekonomi/PADesa-pendapatan-asli-desa/apbdesa/create'
-        />
-        <Table striped withTableBorder withRowBorders>
-          <TableThead>
-            <TableTr>
-              <TableTh>Tahun</TableTh>
-              <TableTh>Pembiayaan</TableTh>
-              <TableTh>Belanja</TableTh>
-              <TableTh>Pendapatan</TableTh>
-              <TableTh>Detail</TableTh>
-            </TableTr>
-          </TableThead>
-          <TableTbody>
-            {filteredData.map((item) => (
-              <TableTr key={item.id}>
-                <TableTd>{item.tahun}</TableTd>
-                <TableTd>{formatRupiah(item.pembiayaan.reduce((sum, item) => sum + Number(item.value), 0))}</TableTd>
-                <TableTd>{formatRupiah(item.belanja.reduce((sum, item) => sum + Number(item.value), 0))}</TableTd>
-                <TableTd>{formatRupiah(item.pendapatan.reduce((sum, item) => sum + Number(item.value), 0))}</TableTd>
-                <TableTd>
-                  <Button
-                    bg={"green"}
-                    onClick={() =>
-                      router.push(`/admin/ekonomi/PADesa-pendapatan-asli-desa/apbdesa/${item.id}`)
-                    }
-                  >
-                    <IconDeviceImacCog size={25} />
-                  </Button>
-                </TableTd>
+      <Paper withBorder bg={colors["white-1"]} p="lg" shadow="md" radius="md">
+        <Group justify="space-between" mb="md">
+          <Text fw={600} fz="lg">
+            List APB Desa
+          </Text>
+          <Tooltip label="Tambah APB Desa" withArrow>
+            <Button
+              leftSection={<IconPlus size={18} />}
+              color="blue"
+              variant="light"
+              onClick={() =>
+                router.push(
+                  "/admin/ekonomi/PADesa-pendapatan-asli-desa/apbdesa/create"
+                )
+              }
+            >
+              Tambah Baru
+            </Button>
+          </Tooltip>
+        </Group>
+        <Box style={{ overflowX: "auto" }}>
+          <Table highlightOnHover>
+            <TableThead>
+              <TableTr>
+                <TableTh style={{ width: "15%" }}>Tahun</TableTh>
+                <TableTh style={{ width: "25%" }}>Pembiayaan</TableTh>
+                <TableTh style={{ width: "25%" }}>Belanja</TableTh>
+                <TableTh style={{ width: "25%" }}>Pendapatan</TableTh>
+                <TableTh style={{ width: "10%" }}>Aksi</TableTh>
               </TableTr>
-            ))}
-          </TableTbody>
-        </Table>
+            </TableThead>
+            <TableTbody>
+              {filteredData.length > 0 ? (
+                filteredData.map((item) => (
+                  <TableTr key={item.id}>
+                    <TableTd>{item.tahun}</TableTd>
+                    <TableTd>
+                      {formatRupiah(
+                        item.pembiayaan.reduce(
+                          (sum, val) => sum + Number(val.value),
+                          0
+                        )
+                      )}
+                    </TableTd>
+                    <TableTd>
+                      {formatRupiah(
+                        item.belanja.reduce(
+                          (sum, val) => sum + Number(val.value),
+                          0
+                        )
+                      )}
+                    </TableTd>
+                    <TableTd>
+                      {formatRupiah(
+                        item.pendapatan.reduce(
+                          (sum, val) => sum + Number(val.value),
+                          0
+                        )
+                      )}
+                    </TableTd>
+                    <TableTd>
+                      <Tooltip label="Lihat Detail" withArrow>
+                        <Button
+                          variant="light"
+                          color="green"
+                          onClick={() =>
+                            router.push(
+                              `/admin/ekonomi/PADesa-pendapatan-asli-desa/apbdesa/${item.id}`
+                            )
+                          }
+                        >
+                          <IconDeviceImacCog size={20} />
+                          <Text ml={5}>Detail</Text>
+                        </Button>
+                      </Tooltip>
+                    </TableTd>
+                  </TableTr>
+                ))
+              ) : (
+                <TableTr>
+                  <TableTd colSpan={5}>
+                    <Center py={20}>
+                      <Text color="dimmed">
+                        Tidak ada data APB Desa yang cocok
+                      </Text>
+                    </Center>
+                  </TableTd>
+                </TableTr>
+              )}
+            </TableTbody>
+          </Table>
+        </Box>
       </Paper>
+      <Center>
+        <Pagination
+          value={page}
+          onChange={(newPage) => {
+            load(newPage, 10);
+            window.scrollTo({ top: 0, behavior: "smooth" });
+          }}
+          total={totalPages}
+          mt="md"
+          mb="md"
+          color="blue"
+          radius="md"
+        />
+      </Center>
     </Box>
   );
 }

src/app/admin/(dashboard)/ekonomi/PADesa-pendapatan-asli-desa/belanja/[id]/page.tsx

@@ -2,7 +2,16 @@
 'use client'
 import PendapatanAsliDesa from '@/app/admin/(dashboard)/_state/ekonomi/PADesa';
 import colors from '@/con/colors';
-import { Box, Button, Group, Paper, Stack, Text, TextInput, Title } from '@mantine/core';
+import {
+  Box,
+  Button,
+  Group,
+  Paper,
+  Stack,
+  TextInput,
+  Title,
+  Tooltip
+} from '@mantine/core';
 import { IconArrowBack } from '@tabler/icons-react';
 import { useParams, useRouter } from 'next/navigation';
 import { useEffect, useState } from 'react';
@@ -72,41 +81,72 @@ function EditBelanja() {
   }
 
   return (
-    <Box>
-    <Box mb={10}>
-      <Button onClick={() => router.back()} variant='subtle' color={'blue'}>
-        <IconArrowBack color={colors['blue-button']} size={25} />
-      </Button>
-    </Box>
+    <Box px={{ base: 'sm', md: 'lg' }} py="md">
+      {/* Header */}
+      <Group mb="md">
+        <Tooltip label="Kembali ke halaman sebelumnya" withArrow>
+          <Button
+            variant="subtle"
+            onClick={() => router.back()}
+            p="xs"
+            radius="md"
+          >
+            <IconArrowBack color={colors['blue-button']} size={24} />
+          </Button>
+        </Tooltip>
+        <Title order={4} ml="sm" c="dark">
+          Edit Jenis Belanja
+        </Title>
+      </Group>
 
-    <Paper w={{ base: '100%', md: '50%' }} bg={colors['white-1']} p={'md'}>
-      <Stack gap={"xs"}>
-        <Title order={4}>Edit Jenis Pendapatan</Title>
-        <TextInput
-          value={formData.name}
-          onChange={(val) => {
-            setFormData({ ...formData, name: val.target.value });
-          }}
-          label={<Text fw={"bold"} fz={"sm"}>Nama Jenis Pendapatan</Text>}
-          placeholder='Masukkan nama Jenis Pendapatan'
-        />
-        <TextInput
-          label={<Text fw={"bold"} fz={"sm"}>Nilai</Text>}
-          placeholder='Masukkan nilai'
-          value={formatRupiah(formData.value)}
-          onChange={(val) => {
-            const raw = val.currentTarget.value;
-            const cleanValue = unformatRupiah(raw);
-            setFormData({ ...formData, value: cleanValue });
-          }}
-        />
-        <Group>
-          <Button bg={colors['blue-button']} onClick={handleSubmit}>Submit</Button>
-        </Group>
-      </Stack>
-    </Paper>
-  </Box>
+      {/* Card */}
+      <Paper
+        w={{ base: '100%', md: '50%' }}
+        bg={colors['white-1']}
+        p="lg"
+        radius="md"
+        shadow="sm"
+        style={{ border: '1px solid #e0e0e0' }}
+      >
+        <Stack gap="md">
+          <TextInput
+            label="Nama Jenis Belanja"
+            placeholder="Masukkan nama jenis belanja"
+            value={formData.name}
+            onChange={(e) => setFormData({ ...formData, name: e.target.value })}
+            required
+          />
+
+          <TextInput
+            label="Nilai"
+            placeholder="Masukkan nilai"
+            value={formatRupiah(formData.value)}
+            onChange={(e) => {
+              const raw = e.currentTarget.value;
+              const cleanValue = unformatRupiah(raw);
+              setFormData({ ...formData, value: cleanValue });
+            }}
+            required
+          />
+
+          <Group justify="right">
+            <Button
+              onClick={handleSubmit}
+              radius="md"
+              size="md"
+              style={{
+                background: `linear-gradient(135deg, ${colors['blue-button']}, #4facfe)`,
+                color: '#fff',
+                boxShadow: '0 4px 15px rgba(79, 172, 254, 0.4)',
+              }}
+            >
+              Simpan
+            </Button>
+          </Group>
+        </Stack>
+      </Paper>
+    </Box>
   );
 }
 
-export default EditBelanja;
+export default EditBelanja;

src/app/admin/(dashboard)/ekonomi/PADesa-pendapatan-asli-desa/belanja/create/page.tsx

@@ -1,17 +1,30 @@
-'use client'
+'use client';
+
 import PendapatanAsliDesa from '@/app/admin/(dashboard)/_state/ekonomi/PADesa';
 import colors from '@/con/colors';
-import { Box, Button, Group, Paper, Stack, Text, TextInput, Title } from '@mantine/core';
+import {
+  Box,
+  Button,
+  Group,
+  Paper,
+  Stack,
+  Text,
+  TextInput,
+  Title,
+  Tooltip,
+} from '@mantine/core';
 import { IconArrowBack } from '@tabler/icons-react';
 import { useRouter } from 'next/navigation';
 import { useProxy } from 'valtio/utils';
+import { toast } from 'react-toastify';
 
 function CreateBelanja() {
-  const belanjaState = useProxy(PendapatanAsliDesa.belanja)
-  const router = useRouter()
+  const belanjaState = useProxy(PendapatanAsliDesa.belanja);
+  const router = useRouter();
 
   const formatRupiah = (value: number | string) => {
-    const number = typeof value === 'number' ? value : Number(value.replace(/\D/g, ''));
+    const number =
+      typeof value === 'number' ? value : Number(value.replace(/\D/g, ''));
     return new Intl.NumberFormat('id-ID', {
       style: 'currency',
       currency: 'IDR',
@@ -25,48 +38,83 @@ function CreateBelanja() {
 
   const resetForm = () => {
     belanjaState.create.form = {
-      name: "",
+      name: '',
       value: 0,
-    }
-  }
+    };
+  };
 
   const handleSubmit = async () => {
-    await belanjaState.create.submit();
-    resetForm()
-    router.push("/admin/ekonomi/PADesa-pendapatan-asli-desa/belanja")
-  }
-  return (
-    <Box>
-      <Box mb={10}>
-        <Button onClick={() => router.back()} variant='subtle' color={'blue'}>
-          <IconArrowBack color={colors['blue-button']} size={25} />
-        </Button>
-      </Box>
+    if (!belanjaState.create.form.name || !belanjaState.create.form.value) {
+      return toast.warn('Lengkapi semua field terlebih dahulu');
+    }
 
-      <Paper w={{ base: '100%', md: '50%' }} bg={colors['white-1']} p={'md'}>
-        <Stack gap={"xs"}>
-          <Title order={4}>Create Jenis Belanja</Title>
+    await belanjaState.create.submit();
+    resetForm();
+    router.push('/admin/ekonomi/PADesa-pendapatan-asli-desa/belanja');
+  };
+
+  return (
+    <Box px={{ base: 'sm', md: 'lg' }} py="md">
+      {/* Header dengan back button */}
+      <Group mb="md">
+        <Tooltip label="Kembali ke halaman sebelumnya" withArrow>
+          <Button
+            variant="subtle"
+            onClick={() => router.back()}
+            p="xs"
+            radius="md"
+          >
+            <IconArrowBack color={colors['blue-button']} size={24} />
+          </Button>
+        </Tooltip>
+        <Title order={4} ml="sm" c="dark">
+          Tambah Jenis Belanja
+        </Title>
+      </Group>
+
+      {/* Card Form */}
+      <Paper
+        w={{ base: '100%', md: '50%' }}
+        bg={colors['white-1']}
+        p="lg"
+        radius="md"
+        shadow="sm"
+        style={{ border: '1px solid #e0e0e0' }}
+      >
+        <Stack gap="md">
           <TextInput
+            label={<Text fw="bold" fz="sm">Nama Jenis Belanja</Text>}
+            placeholder="Masukkan nama jenis belanja"
             value={belanjaState.create.form.name}
-            onChange={(val) => {
-              belanjaState.create.form.name = val.target.value;
-            }}
-            label={<Text fw={"bold"} fz={"sm"}>Nama Jenis Belanja</Text>}
-            placeholder='Masukkan nama jenis belanja'
+            onChange={(e) => (belanjaState.create.form.name = e.target.value)}
+            required
           />
+
           <TextInput
-            type='text'
+            type="text"
+            label={<Text fw="bold" fz="sm">Nilai</Text>}
+            placeholder="Masukkan nilai belanja"
             value={formatRupiah(belanjaState.create.form.value)}
-            onChange={(val) => {
-              const raw = val.currentTarget.value;
-              const cleanValue = unformatRupiah(raw);
-              belanjaState.create.form.value = cleanValue;
+            onChange={(e) => {
+              const raw = e.currentTarget.value;
+              belanjaState.create.form.value = unformatRupiah(raw);
             }}
-            label={<Text fw={"bold"} fz={"sm"}>Nilai</Text>}
-            placeholder='Masukkan nilai'
+            required
           />
-          <Group>
-            <Button bg={colors['blue-button']} onClick={handleSubmit}>Submit</Button>
+
+          <Group justify="right">
+            <Button
+              onClick={handleSubmit}
+              radius="md"
+              size="md"
+              style={{
+                background: `linear-gradient(135deg, ${colors['blue-button']}, #4facfe)`,
+                color: '#fff',
+                boxShadow: '0 4px 15px rgba(79, 172, 254, 0.4)',
+              }}
+            >
+              Simpan
+            </Button>
           </Group>
         </Stack>
       </Paper>

src/app/admin/(dashboard)/ekonomi/PADesa-pendapatan-asli-desa/belanja/page.tsx

@@ -1,24 +1,41 @@
 'use client'
+
 import colors from '@/con/colors';
-import { Box, Button, Paper, Skeleton, Stack, Table, TableTbody, TableTd, TableTh, TableThead, TableTr, Text } from '@mantine/core';
+import {
+  Box,
+  Button,
+  Center,
+  Group,
+  Pagination,
+  Paper,
+  Skeleton,
+  Stack,
+  Table,
+  TableTbody,
+  TableTd,
+  TableTh,
+  TableThead,
+  TableTr,
+  Text,
+  Title,
+  Tooltip
+} from '@mantine/core';
 import { useShallowEffect } from '@mantine/hooks';
-import { IconEdit, IconSearch, IconTrash } from '@tabler/icons-react';
+import { IconEdit, IconPlus, IconSearch, IconTrash } from '@tabler/icons-react';
 import { useRouter } from 'next/navigation';
 import { useState } from 'react';
 import { useProxy } from 'valtio/utils';
+import HeaderSearch from '../../../_com/header';
 import { ModalKonfirmasiHapus } from '../../../_com/modalKonfirmasiHapus';
 import PendapatanAsliDesa from '../../../_state/ekonomi/PADesa';
-import HeaderSearch from '../../../_com/header';
-import JudulList from '../../../_com/judulList';
-
 
 function Belanja() {
   const [search, setSearch] = useState("");
   return (
     <Box>
       <HeaderSearch
-        title='Belanja'
-        placeholder='pencarian'
+        title="Belanja"
+        placeholder="Cari belanja berdasarkan nama atau nilai..."
         searchIcon={<IconSearch size={20} />}
         value={search}
         onChange={(e) => setSearch(e.currentTarget.value)}
@@ -29,108 +46,175 @@ function Belanja() {
 }
 
 function ListBelanja({ search }: { search: string }) {
-  const belanjaState = useProxy(PendapatanAsliDesa.belanja)
+  const belanjaState = useProxy(PendapatanAsliDesa.belanja);
   const router = useRouter();
-  const [modalHapus, setModalHapus] = useState(false)
-  const [selectedId, setSelectedId] = useState<string | null>(null)
-  
-  const formatRupiah = (value: number) => {
-    return new Intl.NumberFormat('id-ID', {
+  const [modalHapus, setModalHapus] = useState(false);
+  const [selectedId, setSelectedId] = useState<string | null>(null);
+
+  const {
+    data,
+    loading,
+    load,
+    page,
+    totalPages,
+  } = belanjaState.findMany;
+
+  const formatRupiah = (value: number) =>
+    new Intl.NumberFormat('id-ID', {
       style: 'currency',
       currency: 'IDR',
       minimumFractionDigits: 0,
     }).format(value);
-  };
 
-  const totalBelanja = belanjaState.findMany.data.reduce((sum, item) => sum + item.value, 0);
+  const totalBelanja = data?.reduce((sum, item) => sum + item.value, 0) || 0;
 
   const handleDelete = () => {
     if (selectedId) {
-      belanjaState.delete.byId(selectedId)
-      setModalHapus(false)
-      setSelectedId(null)
-      belanjaState.findMany.load()
+      belanjaState.delete.byId(selectedId);
+      setModalHapus(false);
+      setSelectedId(null);
+      load(page, 10, search);
     }
-  }
+  };
 
   useShallowEffect(() => {
-    belanjaState.findMany.load();
-  }, [])
+    load(page, 10, search);
+  }, [page, search]);
 
-  const filteredData = (belanjaState.findMany.data || []).filter(item => {
-    const keyword = search.toLowerCase();
-    return (
-      item.name.toLowerCase().includes(keyword) ||
-      item.value.toString().toLowerCase().includes(keyword)
-    );
-  });
+  const filteredData = data || [];
 
-  if (!belanjaState.findMany.data) {
+  if (loading || !data) {
     return (
       <Stack py={10}>
-        <Skeleton h={500} />
+        <Skeleton height={600} radius="md" />
       </Stack>
-    )
+    );
   }
+
   return (
     <Box py={10}>
-      <Paper bg={colors['white-1']} p={'md'}>
-        <JudulList
-          title='List Belanja'
-          href='/admin/ekonomi/PADesa-pendapatan-asli-desa/belanja/create'
-        />
-        <Table striped withTableBorder withRowBorders>
-          <TableThead>
-            <TableTr>
-              <TableTh>Nama</TableTh>
-              <TableTh>Nilai</TableTh>
-              <TableTh>Persentase</TableTh>
-              <TableTh>Edit</TableTh>
-              <TableTh>Delete</TableTh>
-            </TableTr>
-          </TableThead>
-          <TableTbody>
-            {filteredData.map((item) => (
-              <TableTr key={item.id}>
-                <TableTd>{item.name}</TableTd>
-                <TableTd>{formatRupiah(item.value)}</TableTd>
-                <TableTd>{((item.value / totalBelanja) * 100).toFixed(0)}%</TableTd>
-                <TableTd>
-                  <Button color='green' onClick={() => router.push(`/admin/ekonomi/PADesa-pendapatan-asli-desa/belanja/${item.id}`)}>
-                    <IconEdit size={20} />
-                  </Button>
-                </TableTd>
-                <TableTd>
-                  <Button
-                    color='red'
-                    disabled={belanjaState.delete.loading}
-                    onClick={() => {
-                      setSelectedId(item.id)
-                      setModalHapus(true)
-                    }}>
-                    <IconTrash size={20} />
-                  </Button>
-                </TableTd>
+      <Paper withBorder bg={colors['white-1']} p="lg" shadow="md" radius="md">
+        <Group justify="space-between" mb="md">
+          <Title order={4}>Daftar Belanja</Title>
+          <Tooltip label="Tambah Belanja" withArrow>
+            <Button
+              leftSection={<IconPlus size={18} />}
+              color="blue"
+              variant="light"
+              onClick={() =>
+                router.push('/admin/ekonomi/PADesa-pendapatan-asli-desa/belanja/create')
+              }
+            >
+              Tambah Baru
+            </Button>
+          </Tooltip>
+        </Group>
+
+        <Box style={{ overflowX: 'auto' }}>
+          <Table highlightOnHover striped withTableBorder withRowBorders>
+            <TableThead>
+              <TableTr>
+                <TableTh>Nama</TableTh>
+                <TableTh>Nilai</TableTh>
+                <TableTh>Persentase</TableTh>
+                <TableTh>Aksi</TableTh>
               </TableTr>
-            ))}
-            <TableTr>
-              <TableTd colSpan={4}>
-                <Text fw={'bold'}>Total</Text>
-              </TableTd>
-              <TableTd>
-                {formatRupiah(belanjaState.findMany.data.reduce((total, item) => total + item.value, 0))}
-              </TableTd>
-            </TableTr>
-          </TableTbody>
-        </Table>
+            </TableThead>
+            <TableTbody>
+              {filteredData.length > 0 ? (
+                <>
+                  {filteredData.map((item) => (
+                    <TableTr key={item.id}>
+                      <TableTd>
+                        <Text fw={500} truncate="end" lineClamp={1}>
+                          {item.name}
+                        </Text>
+                      </TableTd>
+                      <TableTd>{formatRupiah(item.value)}</TableTd>
+                      <TableTd>
+                        {totalBelanja > 0
+                          ? ((item.value / totalBelanja) * 100).toFixed(0) + '%'
+                          : '0%'}
+                      </TableTd>
+                      <TableTd>
+                        <Group gap="xs">
+                          <Tooltip label="Edit" withArrow>
+                            <Button
+                              size="xs"
+                              variant="light"
+                              color="green"
+                              onClick={() =>
+                                router.push(
+                                  `/admin/ekonomi/PADesa-pendapatan-asli-desa/belanja/${item.id}`
+                                )
+                              }
+                            >
+                              <IconEdit size={16} />
+                            </Button>
+                          </Tooltip>
+                          <Tooltip label="Hapus" withArrow>
+                            <Button
+                              size="xs"
+                              variant="light"
+                              color="red"
+                              disabled={belanjaState.delete.loading}
+                              onClick={() => {
+                                setSelectedId(item.id);
+                                setModalHapus(true);
+                              }}
+                            >
+                              <IconTrash size={16} />
+                            </Button>
+                          </Tooltip>
+                        </Group>
+                      </TableTd>
+                    </TableTr>
+                  ))}
+                  <TableTr>
+                    <TableTd colSpan={2}>
+                      <Text fw="bold">Total</Text>
+                    </TableTd>
+                    <TableTd colSpan={2}>
+                      <Text fw="bold">{formatRupiah(totalBelanja)}</Text>
+                    </TableTd>
+                  </TableTr>
+                </>
+              ) : (
+                <TableTr>
+                  <TableTd colSpan={4}>
+                    <Center py={20}>
+                      <Text c="dimmed">Tidak ada data belanja yang cocok</Text>
+                    </Center>
+                  </TableTd>
+                </TableTr>
+              )}
+            </TableTbody>
+          </Table>
+        </Box>
       </Paper>
 
+      {/* Pagination */}
+      <Center>
+        <Pagination
+          value={page}
+          onChange={(newPage) => {
+            load(newPage, 10, search);
+            window.scrollTo({ top: 0, behavior: 'smooth' });
+          }}
+          total={totalPages}
+          mt="md"
+          mb="md"
+          color="blue"
+          radius="md"
+        />
+      </Center>
+
       {/* Modal Konfirmasi Hapus */}
       <ModalKonfirmasiHapus
         opened={modalHapus}
         onClose={() => setModalHapus(false)}
         onConfirm={handleDelete}
-        text='Apakah anda yakin ingin menghapus belanja ini?'
+        text="Apakah anda yakin ingin menghapus belanja ini?"
       />
     </Box>
   );

src/app/admin/(dashboard)/ekonomi/PADesa-pendapatan-asli-desa/pembiayaan/[id]/page.tsx

@@ -2,7 +2,16 @@
 'use client'
 import PendapatanAsliDesa from '@/app/admin/(dashboard)/_state/ekonomi/PADesa';
 import colors from '@/con/colors';
-import { Box, Button, Group, Paper, Stack, Text, TextInput, Title } from '@mantine/core';
+import {
+  Box,
+  Button,
+  Group,
+  Paper,
+  Stack,
+  TextInput,
+  Title,
+  Tooltip
+} from '@mantine/core';
 import { IconArrowBack } from '@tabler/icons-react';
 import { useParams, useRouter } from 'next/navigation';
 import { useEffect, useState } from 'react';
@@ -20,7 +29,7 @@ function EditPembiayaan() {
   });
 
   const formatRupiah = (value: number | string) => {
-    const number = typeof value === 'number' ? value : Number(value.replace(/\D/g, ''));
+    const number = typeof value === 'number' ? value : Number(value.toString().replace(/\D/g, ''));
     return new Intl.NumberFormat('id-ID', {
       style: 'currency',
       currency: 'IDR',
@@ -46,8 +55,8 @@ function EditPembiayaan() {
           });
         }
       } catch (error) {
-        console.error("Error loading pembiayaan:", error);
-        toast.error("Gagal memuat data pembiayaan");
+        console.error('Error loading pembiayaan:', error);
+        toast.error('Gagal memuat data pembiayaan');
       }
     };
 
@@ -60,53 +69,84 @@ function EditPembiayaan() {
         ...pembiayaanState.update.form,
         name: formData.name,
         value: Number(formData.value),
-      }
+      };
 
       await pembiayaanState.update.update();
-      toast.success("Jenis Pembiayaan berhasil diperbarui!");
-      router.push("/admin/ekonomi/PADesa-pendapatan-asli-desa/pembiayaan");
+      toast.success('Jenis Pembiayaan berhasil diperbarui!');
+      router.push('/admin/ekonomi/PADesa-pendapatan-asli-desa/pembiayaan');
     } catch (error) {
-      console.error("Error updating jenis pembiayaan:", error);
-      toast.error("Terjadi kesalahan saat memperbarui jenis pembiayaan");
+      console.error('Error updating jenis pembiayaan:', error);
+      toast.error('Terjadi kesalahan saat memperbarui jenis pembiayaan');
     }
-  }
+  };
 
   return (
-    <Box>
-    <Box mb={10}>
-      <Button onClick={() => router.back()} variant='subtle' color={'blue'}>
-        <IconArrowBack color={colors['blue-button']} size={25} />
-      </Button>
-    </Box>
+    <Box px={{ base: 'sm', md: 'lg' }} py="md">
+      {/* Header dengan Back Button */}
+      <Group mb="md">
+        <Tooltip label="Kembali ke halaman sebelumnya" withArrow>
+          <Button
+            variant="subtle"
+            onClick={() => router.back()}
+            p="xs"
+            radius="md"
+          >
+            <IconArrowBack color={colors['blue-button']} size={24} />
+          </Button>
+        </Tooltip>
+        <Title order={4} ml="sm" c="dark">
+          Edit Jenis Pembiayaan
+        </Title>
+      </Group>
 
-    <Paper w={{ base: '100%', md: '50%' }} bg={colors['white-1']} p={'md'}>
-      <Stack gap={"xs"}>
-        <Title order={4}>Edit Jenis Pembiayaan</Title>
-        <TextInput
-          value={formData.name}
-          onChange={(val) => {
-            setFormData({ ...formData, name: val.target.value });
-          }}
-          label={<Text fw={"bold"} fz={"sm"}>Nama Jenis Pembiayaan</Text>}
-          placeholder='Masukkan nama Jenis Pembiayaan'
-        />
-        <TextInput
-          label={<Text fw={"bold"} fz={"sm"}>Nilai</Text>}
-          placeholder='Masukkan nilai'
-          value={formatRupiah(formData.value)}
-          onChange={(val) => {
-            const raw = val.currentTarget.value;
-            const cleanValue = unformatRupiah(raw);
-            setFormData({ ...formData, value: cleanValue });
-          }}
-        />
-        <Group>
-          <Button bg={colors['blue-button']} onClick={handleSubmit}>Submit</Button>
-        </Group>
-      </Stack>
-    </Paper>
-  </Box>
+      {/* Card Form */}
+      <Paper
+        w={{ base: '100%', md: '50%' }}
+        bg={colors['white-1']}
+        p="lg"
+        radius="md"
+        shadow="sm"
+        style={{ border: '1px solid #e0e0e0' }}
+      >
+        <Stack gap="md">
+          <TextInput
+            label="Nama Jenis Pembiayaan"
+            placeholder="Masukkan nama jenis pembiayaan"
+            value={formData.name}
+            onChange={(e) => setFormData({ ...formData, name: e.target.value })}
+            required
+          />
+
+          <TextInput
+            label="Nilai"
+            placeholder="Masukkan nilai"
+            value={formatRupiah(formData.value)}
+            onChange={(e) => {
+              const raw = e.currentTarget.value;
+              const cleanValue = unformatRupiah(raw);
+              setFormData({ ...formData, value: cleanValue });
+            }}
+            required
+          />
+
+          <Group justify="right">
+            <Button
+              onClick={handleSubmit}
+              radius="md"
+              size="md"
+              style={{
+                background: `linear-gradient(135deg, ${colors['blue-button']}, #4facfe)`,
+                color: '#fff',
+                boxShadow: '0 4px 15px rgba(79, 172, 254, 0.4)',
+              }}
+            >
+              Simpan
+            </Button>
+          </Group>
+        </Stack>
+      </Paper>
+    </Box>
   );
 }
 
-export default EditPembiayaan;
+export default EditPembiayaan;

src/app/admin/(dashboard)/ekonomi/PADesa-pendapatan-asli-desa/pembiayaan/create/page.tsx

@@ -1,18 +1,30 @@
-'use client'
+'use client';
 import React from 'react';
 import { useProxy } from 'valtio/utils';
 import PendapatanAsliDesa from '@/app/admin/(dashboard)/_state/ekonomi/PADesa';
 import { useRouter } from 'next/navigation';
 import colors from '@/con/colors';
-import { Box, Button, Paper, Stack, Title, TextInput, Group, Text } from '@mantine/core';
+import {
+  Box,
+  Button,
+  Group,
+  Paper,
+  Stack,
+  Title,
+  TextInput,
+  Text,
+  Tooltip,
+} from '@mantine/core';
 import { IconArrowBack } from '@tabler/icons-react';
+import { toast } from 'react-toastify';
 
 function CreatePembiayaan() {
-  const pembiayaanState = useProxy(PendapatanAsliDesa.pembiayaan)
-  const router = useRouter()
+  const pembiayaanState = useProxy(PendapatanAsliDesa.pembiayaan);
+  const router = useRouter();
 
   const formatRupiah = (value: number | string) => {
-    const number = typeof value === 'number' ? value : Number(value.replace(/\D/g, ''));
+    const number =
+      typeof value === 'number' ? value : Number(value.replace(/\D/g, ''));
     return new Intl.NumberFormat('id-ID', {
       style: 'currency',
       currency: 'IDR',
@@ -26,48 +38,85 @@ function CreatePembiayaan() {
 
   const resetForm = () => {
     pembiayaanState.create.form = {
-      name: "",
+      name: '',
       value: 0,
-    }
-  }
+    };
+  };
 
   const handleSubmit = async () => {
-    await pembiayaanState.create.submit();
-    resetForm()
-    router.push("/admin/ekonomi/PADesa-pendapatan-asli-desa/pembiayaan")
-  }
-  return (
-    <Box>
-      <Box mb={10}>
-        <Button onClick={() => router.back()} variant='subtle' color={'blue'}>
-          <IconArrowBack color={colors['blue-button']} size={25} />
-        </Button>
-      </Box>
+    if (!pembiayaanState.create.form.name || !pembiayaanState.create.form.value) {
+      return toast.warn('Nama dan nilai wajib diisi');
+    }
 
-      <Paper w={{ base: '100%', md: '50%' }} bg={colors['white-1']} p={'md'}>
-        <Stack gap={"xs"}>
-          <Title order={4}>Create Jenis Pembiayaan</Title>
+    await pembiayaanState.create.submit();
+    resetForm();
+    router.push('/admin/ekonomi/PADesa-pendapatan-asli-desa/pembiayaan');
+  };
+
+  return (
+    <Box px={{ base: 'sm', md: 'lg' }} py="md">
+      {/* Header */}
+      <Group mb="md">
+        <Tooltip label="Kembali ke halaman sebelumnya" withArrow>
+          <Button
+            variant="subtle"
+            onClick={() => router.back()}
+            p="xs"
+            radius="md"
+          >
+            <IconArrowBack color={colors['blue-button']} size={24} />
+          </Button>
+        </Tooltip>
+        <Title order={4} ml="sm" c="dark">
+          Tambah Jenis Pembiayaan
+        </Title>
+      </Group>
+
+      {/* Form Card */}
+      <Paper
+        w={{ base: '100%', md: '50%' }}
+        bg={colors['white-1']}
+        p="lg"
+        radius="md"
+        shadow="sm"
+        style={{ border: '1px solid #e0e0e0' }}
+      >
+        <Stack gap="md">
           <TextInput
+            label={<Text fw="bold" fz="sm">Nama Jenis Pembiayaan</Text>}
+            placeholder="Masukkan nama jenis pembiayaan"
             value={pembiayaanState.create.form.name}
-            onChange={(val) => {
-              pembiayaanState.create.form.name = val.target.value;
+            onChange={(e) => {
+              pembiayaanState.create.form.name = e.currentTarget.value;
             }}
-            label={<Text fw={"bold"} fz={"sm"}>Nama Jenis Pembiayaan</Text>}
-            placeholder='Masukkan nama jenis pembiayaan'
+            required
           />
+
           <TextInput
-            type='text'
+            type="text"
+            label={<Text fw="bold" fz="sm">Nilai</Text>}
+            placeholder="Masukkan nilai"
             value={formatRupiah(pembiayaanState.create.form.value)}
-            onChange={(val) => {
-              const raw = val.currentTarget.value;
-              const cleanValue = unformatRupiah(raw);
-              pembiayaanState.create.form.value = cleanValue;
+            onChange={(e) => {
+              const raw = e.currentTarget.value;
+              pembiayaanState.create.form.value = unformatRupiah(raw);
             }}
-            label={<Text fw={"bold"} fz={"sm"}>Nilai</Text>}
-            placeholder='Masukkan nilai'
+            required
           />
-          <Group>
-            <Button bg={colors['blue-button']} onClick={handleSubmit}>Submit</Button>
+
+          <Group justify="right">
+            <Button
+              onClick={handleSubmit}
+              radius="md"
+              size="md"
+              style={{
+                background: `linear-gradient(135deg, ${colors['blue-button']}, #4facfe)`,
+                color: '#fff',
+                boxShadow: '0 4px 15px rgba(79, 172, 254, 0.4)',
+              }}
+            >
+              Simpan
+            </Button>
           </Group>
         </Stack>
       </Paper>

src/app/admin/(dashboard)/ekonomi/PADesa-pendapatan-asli-desa/pembiayaan/page.tsx

@@ -1,14 +1,31 @@
 'use client'
-import { Box, Button, Paper, Skeleton, Stack, Table, TableTbody, TableTd, TableTh, TableThead, TableTr, Text } from '@mantine/core';
+import {
+  Box,
+  Button,
+  Center,
+  Group,
+  Paper,
+  Skeleton,
+  Stack,
+  Table,
+  TableTbody,
+  TableTd,
+  TableTh,
+  TableThead,
+  TableTr,
+  Text,
+  Title,
+  Tooltip,
+  Pagination,
+} from '@mantine/core';
 import React, { useState } from 'react';
 import HeaderSearch from '../../../_com/header';
-import { IconEdit, IconSearch, IconTrash } from '@tabler/icons-react';
+import { IconEdit, IconPlus, IconSearch, IconTrash } from '@tabler/icons-react';
 import PendapatanAsliDesa from '../../../_state/ekonomi/PADesa';
 import { useProxy } from 'valtio/utils';
 import { useRouter } from 'next/navigation';
 import { useShallowEffect } from '@mantine/hooks';
 import colors from '@/con/colors';
-import JudulList from '../../../_com/judulList';
 import { ModalKonfirmasiHapus } from '../../../_com/modalKonfirmasiHapus';
 
 function Pembiayaan() {
@@ -16,8 +33,8 @@ function Pembiayaan() {
   return (
     <Box>
       <HeaderSearch
-        title='Pembiayaan'
-        placeholder='pencarian'
+        title="Pembiayaan"
+        placeholder="Cari nama pembiayaan..."
         searchIcon={<IconSearch size={20} />}
         value={search}
         onChange={(e) => setSearch(e.currentTarget.value)}
@@ -28,111 +45,171 @@ function Pembiayaan() {
 }
 
 function ListPembiayaan({ search }: { search: string }) {
-  const pembiayaanState = useProxy(PendapatanAsliDesa.pembiayaan)
+  const pembiayaanState = useProxy(PendapatanAsliDesa.pembiayaan);
   const router = useRouter();
-  const [modalHapus, setModalHapus] = useState(false)
-  const [selectedId, setSelectedId] = useState<string | null>(null)
+  const [modalHapus, setModalHapus] = useState(false);
+  const [selectedId, setSelectedId] = useState<string | null>(null);
 
-  const formatRupiah = (value: number) => {
-    return new Intl.NumberFormat('id-ID', {
+  const {
+    data,
+    page,
+    totalPages,
+    loading,
+    load,
+  } = pembiayaanState.findMany;
+
+  const formatRupiah = (value: number) =>
+    new Intl.NumberFormat('id-ID', {
       style: 'currency',
       currency: 'IDR',
       minimumFractionDigits: 0,
     }).format(value);
-  };
 
-  const totalPembiayaan = pembiayaanState.findMany.data.reduce((sum, item) => sum + item.value, 0);
+  const totalPembiayaan = (data || []).reduce((sum, item) => sum + item.value, 0);
 
   const handleDelete = () => {
     if (selectedId) {
-      pembiayaanState.delete.byId(selectedId)
-      setModalHapus(false)
-      setSelectedId(null)
-      pembiayaanState.findMany.load()
+      pembiayaanState.delete.byId(selectedId);
+      setModalHapus(false);
+      setSelectedId(null);
+      load(page, 10, search);
     }
-  }
+  };
 
   useShallowEffect(() => {
-    pembiayaanState.findMany.load();
-  }, [])
+    load(page, 10, search);
+  }, [page, search]);
 
-  const filteredData = (pembiayaanState.findMany.data || []).filter(item => {
-    const keyword = search.toLowerCase();
-    return (
-      item.name.toLowerCase().includes(keyword) ||
-      item.value.toString().toLowerCase().includes(keyword)
-    );
-  });
-
-  if (!pembiayaanState.findMany.data) {
+  if (loading || !data) {
     return (
       <Stack py={10}>
-        <Skeleton h={500} />
+        <Skeleton height={500} radius="md" />
       </Stack>
-    )
+    );
   }
+
+  const filteredData = data || [];
+
   return (
     <Box py={10}>
-      <Paper bg={colors['white-1']} p={'md'}>
-        <JudulList
-          title='List Pembiayaan'
-          href='/admin/ekonomi/PADesa-pendapatan-asli-desa/pembiayaan/create'
-        />
-        <Table striped withTableBorder withRowBorders>
-          <TableThead>
-            <TableTr>
-              <TableTh>Nama</TableTh>
-              <TableTh>Nilai</TableTh>
-              <TableTh>Persentase</TableTh>
-              <TableTh>Edit</TableTh>
-              <TableTh>Delete</TableTh>
-            </TableTr>
-          </TableThead>
-          <TableTbody>
-            {filteredData.map((item) => (
-              <TableTr key={item.id}>
-                <TableTd>{item.name}</TableTd>
-                <TableTd>{formatRupiah(item.value)}</TableTd>
-                <TableTd>{((item.value / totalPembiayaan) * 100).toFixed(0)}%</TableTd>
-                <TableTd>
-                  <Button color='green' onClick={() => router.push(`/admin/ekonomi/PADesa-pendapatan-asli-desa/pembiayaan/${item.id}`)}>
-                    <IconEdit size={20} />
-                  </Button>
-                </TableTd>
-                <TableTd>
-                  <Button
-                    color='red'
-                    disabled={pembiayaanState.delete.loading}
-                    onClick={() => {
-                      setSelectedId(item.id)
-                      setModalHapus(true)
-                    }}>
-                    <IconTrash size={20} />
-                  </Button>
-                </TableTd>
+      <Paper withBorder bg={colors['white-1']} p="lg" shadow="md" radius="md">
+        <Group justify="space-between" mb="md">
+          <Title order={4}>Daftar Pembiayaan</Title>
+          <Tooltip label="Tambah Pembiayaan" withArrow>
+            <Button
+              leftSection={<IconPlus size={18} />}
+              color="blue"
+              variant="light"
+              onClick={() =>
+                router.push('/admin/ekonomi/PADesa-pendapatan-asli-desa/pembiayaan/create')
+              }
+            >
+              Tambah Baru
+            </Button>
+          </Tooltip>
+        </Group>
+
+        <Box style={{ overflowX: 'auto' }}>
+          <Table highlightOnHover striped withTableBorder withRowBorders>
+            <TableThead>
+              <TableTr>
+                <TableTh>Nama</TableTh>
+                <TableTh>Nilai</TableTh>
+                <TableTh>Persentase</TableTh>
+                <TableTh style={{ width: '20%' }}>Aksi</TableTh>
               </TableTr>
-            ))}
-            <TableTr>
-              <TableTd colSpan={4}>
-                <Text fw={'bold'}>Total</Text>
-              </TableTd>
-              <TableTd>
-                {formatRupiah(pembiayaanState.findMany.data.reduce((total, item) => total + item.value, 0))}
-              </TableTd>
-            </TableTr>
-          </TableTbody>
-        </Table>
+            </TableThead>
+            <TableTbody>
+              {filteredData.length > 0 ? (
+                <>
+                  {filteredData.map((item) => (
+                    <TableTr key={item.id}>
+                      <TableTd>
+                        <Text fw={500} truncate="end" lineClamp={1}>
+                          {item.name}
+                        </Text>
+                      </TableTd>
+                      <TableTd>{formatRupiah(item.value)}</TableTd>
+                      <TableTd>
+                        {totalPembiayaan > 0
+                          ? ((item.value / totalPembiayaan) * 100).toFixed(0) + '%'
+                          : '0%'}
+                      </TableTd>
+                      <TableTd>
+                        <Group gap="xs">
+                          <Button
+                            color="green"
+                            variant="light"
+                            onClick={() =>
+                              router.push(
+                                `/admin/ekonomi/PADesa-pendapatan-asli-desa/pembiayaan/${item.id}`
+                              )
+                            }
+                          >
+                            <IconEdit size={18} />
+                          </Button>
+                          <Button
+                            color="red"
+                            variant="light"
+                            disabled={pembiayaanState.delete.loading}
+                            onClick={() => {
+                              setSelectedId(item.id);
+                              setModalHapus(true);
+                            }}
+                          >
+                            <IconTrash size={18} />
+                          </Button>
+                        </Group>
+                      </TableTd>
+                    </TableTr>
+                  ))}
+                  {/* Total Row */}
+                  <TableTr>
+                    <TableTd colSpan={2}>
+                      <Text fw="bold">Total</Text>
+                    </TableTd>
+                    <TableTd colSpan={2}>{formatRupiah(totalPembiayaan)}</TableTd>
+                  </TableTr>
+                </>
+              ) : (
+                <TableTr>
+                  <TableTd colSpan={4}>
+                    <Center py={20}>
+                      <Text c="dimmed">Tidak ada data pembiayaan yang cocok</Text>
+                    </Center>
+                  </TableTd>
+                </TableTr>
+              )}
+            </TableTbody>
+          </Table>
+        </Box>
       </Paper>
 
+      {/* Pagination */}
+      <Center>
+        <Pagination
+          value={page}
+          onChange={(newPage) => {
+            load(newPage, 10, search);
+            window.scrollTo({ top: 0, behavior: 'smooth' });
+          }}
+          total={totalPages}
+          mt="md"
+          mb="md"
+          color="blue"
+          radius="md"
+        />
+      </Center>
+
       {/* Modal Konfirmasi Hapus */}
       <ModalKonfirmasiHapus
         opened={modalHapus}
         onClose={() => setModalHapus(false)}
         onConfirm={handleDelete}
-        text='Apakah anda yakin ingin menghapus pembiayaan ini?'
+        text="Apakah anda yakin ingin menghapus pembiayaan ini?"
       />
     </Box>
-  )
+  );
 }
 
 export default Pembiayaan;

src/app/admin/(dashboard)/ekonomi/PADesa-pendapatan-asli-desa/pendapatan/[id]/page.tsx

@@ -2,7 +2,16 @@
 'use client'
 import PendapatanAsliDesa from '@/app/admin/(dashboard)/_state/ekonomi/PADesa';
 import colors from '@/con/colors';
-import { Box, Button, Group, Paper, Stack, Text, TextInput, Title } from '@mantine/core';
+import {
+  Box,
+  Button,
+  Group,
+  Paper,
+  Stack,
+  TextInput,
+  Title,
+  Tooltip
+} from '@mantine/core';
 import { IconArrowBack } from '@tabler/icons-react';
 import { useParams, useRouter } from 'next/navigation';
 import { useEffect, useState } from 'react';
@@ -20,7 +29,7 @@ function EditPendapatan() {
   });
 
   const formatRupiah = (value: number | string) => {
-    const number = typeof value === 'number' ? value : Number(value.replace(/\D/g, ''));
+    const number = typeof value === 'number' ? value : Number(value.toString().replace(/\D/g, ''));
     return new Intl.NumberFormat('id-ID', {
       style: 'currency',
       currency: 'IDR',
@@ -28,15 +37,13 @@ function EditPendapatan() {
     }).format(number);
   };
 
-  const unformatRupiah = (value: string) => {
-    return Number(value.replace(/\D/g, ''));
-  };
+  const unformatRupiah = (value: string) => Number(value.replace(/\D/g, ''));
 
   useEffect(() => {
-    const loadPendapatan = async () => {
-      const id = params?.id as string;
-      if (!id) return;
+    const id = params?.id as string;
+    if (!id) return;
 
+    const loadPendapatan = async () => {
       try {
         const data = await pendapatanState.update.load(id);
         if (data) {
@@ -46,8 +53,8 @@ function EditPendapatan() {
           });
         }
       } catch (error) {
-        console.error("Error loading pendapatan:", error);
-        toast.error("Gagal memuat data pendapatan");
+        console.error('Error loading pendapatan:', error);
+        toast.error('Gagal memuat data pendapatan');
       }
     };
 
@@ -60,53 +67,84 @@ function EditPendapatan() {
         ...pendapatanState.update.form,
         name: formData.name,
         value: Number(formData.value),
-      }
+      };
 
       await pendapatanState.update.update();
-      toast.success("Jenis Pendapatan berhasil diperbarui!");
-      router.push("/admin/ekonomi/PADesa-pendapatan-asli-desa/pendapatan");
+      toast.success('Jenis Pendapatan berhasil diperbarui!');
+      router.push('/admin/ekonomi/PADesa-pendapatan-asli-desa/pendapatan');
     } catch (error) {
-      console.error("Error updating jenis pendapatan:", error);
-      toast.error("Terjadi kesalahan saat memperbarui jenis pendapatan");
+      console.error('Error updating jenis pendapatan:', error);
+      toast.error('Terjadi kesalahan saat memperbarui jenis pendapatan');
     }
-  }
+  };
 
   return (
-    <Box>
-    <Box mb={10}>
-      <Button onClick={() => router.back()} variant='subtle' color={'blue'}>
-        <IconArrowBack color={colors['blue-button']} size={25} />
-      </Button>
-    </Box>
+    <Box px={{ base: 'sm', md: 'lg' }} py="md">
+      {/* Header with Back Button */}
+      <Group mb="md">
+        <Tooltip label="Kembali ke halaman sebelumnya" withArrow>
+          <Button
+            variant="subtle"
+            onClick={() => router.back()}
+            p="xs"
+            radius="md"
+          >
+            <IconArrowBack color={colors['blue-button']} size={24} />
+          </Button>
+        </Tooltip>
+        <Title order={4} ml="sm" c="dark">
+          Edit Jenis Pendapatan
+        </Title>
+      </Group>
 
-    <Paper w={{ base: '100%', md: '50%' }} bg={colors['white-1']} p={'md'}>
-      <Stack gap={"xs"}>
-        <Title order={4}>Edit Jenis Pendapatan</Title>
-        <TextInput
-          value={formData.name}
-          onChange={(val) => {
-            setFormData({ ...formData, name: val.target.value });
-          }}
-          label={<Text fw={"bold"} fz={"sm"}>Nama Jenis Pendapatan</Text>}
-          placeholder='Masukkan nama Jenis Pendapatan'
-        />
-        <TextInput
-          label={<Text fw={"bold"} fz={"sm"}>Nilai</Text>}
-          placeholder='Masukkan nilai'
-          value={formatRupiah(formData.value)}
-          onChange={(val) => {
-            const raw = val.currentTarget.value;
-            const cleanValue = unformatRupiah(raw);
-            setFormData({ ...formData, value: cleanValue });
-          }}
-        />
-        <Group>
-          <Button bg={colors['blue-button']} onClick={handleSubmit}>Submit</Button>
-        </Group>
-      </Stack>
-    </Paper>
-  </Box>
+      {/* Card Form */}
+      <Paper
+        w={{ base: '100%', md: '50%' }}
+        bg={colors['white-1']}
+        p="lg"
+        radius="md"
+        shadow="sm"
+        style={{ border: '1px solid #e0e0e0' }}
+      >
+        <Stack gap="md">
+          <TextInput
+            label="Nama Jenis Pendapatan"
+            placeholder="Masukkan nama jenis pendapatan"
+            value={formData.name}
+            onChange={(e) => setFormData({ ...formData, name: e.target.value })}
+            required
+          />
+
+          <TextInput
+            label="Nilai"
+            placeholder="Masukkan nilai"
+            value={formatRupiah(formData.value)}
+            onChange={(e) => {
+              const raw = e.currentTarget.value;
+              const cleanValue = unformatRupiah(raw);
+              setFormData({ ...formData, value: cleanValue });
+            }}
+            required
+          />
+
+          <Group justify="right">
+            <Button
+              onClick={handleSubmit}
+              radius="md"
+              size="md"
+              style={{
+                background: `linear-gradient(135deg, ${colors['blue-button']}, #4facfe)`,
+                color: '#fff',
+                boxShadow: '0 4px 15px rgba(79, 172, 254, 0.4)',
+              }}
+            >
+              Simpan
+            </Button>
+          </Group>
+        </Stack>
+      </Paper>
+    </Box>
   );
 }
 
-export default EditPendapatan;
+export default EditPendapatan;

src/app/admin/(dashboard)/ekonomi/PADesa-pendapatan-asli-desa/pendapatan/create/page.tsx

@@ -1,14 +1,24 @@
-'use client'
+'use client';
 import PendapatanAsliDesa from '@/app/admin/(dashboard)/_state/ekonomi/PADesa';
 import colors from '@/con/colors';
-import { Box, Button, Group, Paper, Stack, Text, TextInput, Title } from '@mantine/core';
+import {
+  Box,
+  Button,
+  Group,
+  Paper,
+  Stack,
+  Text,
+  TextInput,
+  Title,
+  Tooltip,
+} from '@mantine/core';
 import { IconArrowBack } from '@tabler/icons-react';
 import { useRouter } from 'next/navigation';
 import { useProxy } from 'valtio/utils';
 
 function CreatePendapatan() {
-  const pendapatanState = useProxy(PendapatanAsliDesa.pendapatan)
-  const router = useRouter()
+  const pendapatanState = useProxy(PendapatanAsliDesa.pendapatan);
+  const router = useRouter();
 
   const formatRupiah = (value: number | string) => {
     const number = typeof value === 'number' ? value : Number(value.replace(/\D/g, ''));
@@ -25,48 +35,90 @@ function CreatePendapatan() {
 
   const resetForm = () => {
     pendapatanState.create.form = {
-      name: "",
+      name: '',
       value: 0,
-    }
-  }
+    };
+  };
 
   const handleSubmit = async () => {
     await pendapatanState.create.submit();
-    resetForm()
-    router.push("/admin/ekonomi/PADesa-pendapatan-asli-desa/pendapatan")
-  }
-  return (
-    <Box>
-      <Box mb={10}>
-        <Button onClick={() => router.back()} variant='subtle' color={'blue'}>
-          <IconArrowBack color={colors['blue-button']} size={25} />
-        </Button>
-      </Box>
+    resetForm();
+    router.push('/admin/ekonomi/PADesa-pendapatan-asli-desa/pendapatan');
+  };
 
-      <Paper w={{ base: '100%', md: '50%' }} bg={colors['white-1']} p={'md'}>
-        <Stack gap={"xs"}>
-          <Title order={4}>Create Jenis Pendapatan</Title>
+  return (
+    <Box px={{ base: 'sm', md: 'lg' }} py="md">
+      {/* Header dengan tombol back + judul */}
+      <Group mb="md">
+        <Tooltip label="Kembali ke halaman sebelumnya" withArrow>
+          <Button
+            variant="subtle"
+            onClick={() => router.back()}
+            p="xs"
+            radius="md"
+          >
+            <IconArrowBack color={colors['blue-button']} size={24} />
+          </Button>
+        </Tooltip>
+        <Title order={4} ml="sm" c="dark">
+          Tambah Jenis Pendapatan
+        </Title>
+      </Group>
+
+      {/* Card Form */}
+      <Paper
+        w={{ base: '100%', md: '50%' }}
+        bg={colors['white-1']}
+        p="lg"
+        radius="md"
+        shadow="sm"
+        style={{ border: '1px solid #e0e0e0' }}
+      >
+        <Stack gap="md">
           <TextInput
             value={pendapatanState.create.form.name}
             onChange={(val) => {
               pendapatanState.create.form.name = val.target.value;
             }}
-            label={<Text fw={"bold"} fz={"sm"}>Nama Jenis Pendapatan</Text>}
-            placeholder='Masukkan nama jenis pendapatan'
+            label={
+              <Text fw="bold" fz="sm">
+                Nama Jenis Pendapatan
+              </Text>
+            }
+            placeholder="Masukkan nama jenis pendapatan"
+            required
           />
+
           <TextInput
-            type='text'
+            type="text"
             value={formatRupiah(pendapatanState.create.form.value)}
             onChange={(val) => {
               const raw = val.currentTarget.value;
               const cleanValue = unformatRupiah(raw);
               pendapatanState.create.form.value = cleanValue;
             }}
-            label={<Text fw={"bold"} fz={"sm"}>Nilai</Text>}
-            placeholder='Masukkan nilai'
+            label={
+              <Text fw="bold" fz="sm">
+                Nilai
+              </Text>
+            }
+            placeholder="Masukkan nilai"
+            required
           />
-          <Group>
-            <Button bg={colors['blue-button']} onClick={handleSubmit}>Submit</Button>
+
+          <Group justify="right">
+            <Button
+              onClick={handleSubmit}
+              radius="md"
+              size="md"
+              style={{
+                background: `linear-gradient(135deg, ${colors['blue-button']}, #4facfe)`,
+                color: '#fff',
+                boxShadow: '0 4px 15px rgba(79, 172, 254, 0.4)',
+              }}
+            >
+              Simpan
+            </Button>
           </Group>
         </Stack>
       </Paper>

src/app/admin/(dashboard)/ekonomi/PADesa-pendapatan-asli-desa/pendapatan/page.tsx

@@ -1,16 +1,33 @@
 'use client'
+
 import colors from '@/con/colors';
-import { Box, Button, Paper, Skeleton, Stack, Table, TableTbody, TableTd, TableTh, TableThead, TableTr, Text } from '@mantine/core';
+import {
+  Box,
+  Button,
+  Center,
+  Group,
+  Pagination,
+  Paper,
+  Skeleton,
+  Stack,
+  Table,
+  TableTbody,
+  TableTd,
+  TableTh,
+  TableThead,
+  TableTr,
+  Text,
+  Title,
+  Tooltip
+} from '@mantine/core';
 import { useShallowEffect } from '@mantine/hooks';
-import { IconEdit, IconSearch, IconTrash } from '@tabler/icons-react';
+import { IconEdit, IconPlus, IconSearch, IconTrash } from '@tabler/icons-react';
 import { useRouter } from 'next/navigation';
 import { useState } from 'react';
 import { useProxy } from 'valtio/utils';
+import HeaderSearch from '../../../_com/header';
 import { ModalKonfirmasiHapus } from '../../../_com/modalKonfirmasiHapus';
 import PendapatanAsliDesa from '../../../_state/ekonomi/PADesa';
-import HeaderSearch from '../../../_com/header';
-import JudulList from '../../../_com/judulList';
-
 
 function Pendapatan() {
   const [search, setSearch] = useState("");
@@ -18,7 +35,7 @@ function Pendapatan() {
     <Box>
       <HeaderSearch
         title='Pendapatan'
-        placeholder='pencarian'
+        placeholder='Cari pendapatan...'
         searchIcon={<IconSearch size={20} />}
         value={search}
         onChange={(e) => setSearch(e.currentTarget.value)}
@@ -29,105 +46,166 @@ function Pendapatan() {
 }
 
 function ListPendapatan({ search }: { search: string }) {
-  const pendapatanState = useProxy(PendapatanAsliDesa.pendapatan)
+  const pendapatanState = useProxy(PendapatanAsliDesa.pendapatan);
   const router = useRouter();
-  const [modalHapus, setModalHapus] = useState(false)
-  const [selectedId, setSelectedId] = useState<string | null>(null)
-  
-  const formatRupiah = (value: number) => {
-    return new Intl.NumberFormat('id-ID', {
+  const [modalHapus, setModalHapus] = useState(false);
+  const [selectedId, setSelectedId] = useState<string | null>(null);
+
+  const {
+    data,
+    page,
+    totalPages,
+    loading,
+    load,
+  } = pendapatanState.findMany;
+
+  const formatRupiah = (value: number) =>
+    new Intl.NumberFormat('id-ID', {
       style: 'currency',
       currency: 'IDR',
       minimumFractionDigits: 0,
     }).format(value);
-  };
-  
 
   const handleDelete = () => {
     if (selectedId) {
-      pendapatanState.delete.byId(selectedId)
-      setModalHapus(false)
-      setSelectedId(null)
-      pendapatanState.findMany.load()
+      pendapatanState.delete.byId(selectedId);
+      setModalHapus(false);
+      setSelectedId(null);
+      load(page, 10, search);
     }
-  }
+  };
 
   useShallowEffect(() => {
-    pendapatanState.findMany.load();
-  }, [])
+    load(page, 10, search);
+  }, [page, search]);
 
-  const filteredData = (pendapatanState.findMany.data || []).filter(item => {
-    const keyword = search.toLowerCase();
-    return (
-      item.name.toLowerCase().includes(keyword) ||
-      item.value.toString().toLowerCase().includes(keyword)
-    );
-  });
+  const filteredData = data || [];
 
-  if (!pendapatanState.findMany.data) {
+  if (loading || !data) {
     return (
       <Stack py={10}>
-        <Skeleton h={500} />
+        <Skeleton height={600} radius="md" />
       </Stack>
-    )
+    );
   }
+
+  const totalValue = filteredData.reduce((total, item) => total + item.value, 0);
+
   return (
     <Box py={10}>
-      <Paper bg={colors['white-1']} p={'md'}>
-        <JudulList
-          title='List Pendapatan'
-          href='/admin/ekonomi/PADesa-pendapatan-asli-desa/pendapatan/create'
-        />
-        <Table striped withTableBorder withRowBorders>
-          <TableThead>
-            <TableTr>
-              <TableTh>Nama</TableTh>
-              <TableTh>Nilai</TableTh>
-              <TableTh>Edit</TableTh>
-              <TableTh>Delete</TableTh>
-            </TableTr>
-          </TableThead>
-          <TableTbody>
-            {filteredData.map((item) => (
-              <TableTr key={item.id}>
-                <TableTd>{item.name}</TableTd>
-                <TableTd>{formatRupiah(item.value)}</TableTd>
-                <TableTd>
-                  <Button color='green' onClick={() => router.push(`/admin/ekonomi/PADesa-pendapatan-asli-desa/pendapatan/${item.id}`)}>
-                    <IconEdit size={20} />
-                  </Button>
-                </TableTd>
-                <TableTd>
-                  <Button
-                    color='red'
-                    disabled={pendapatanState.delete.loading}
-                    onClick={() => {
-                      setSelectedId(item.id)
-                      setModalHapus(true)
-                    }}>
-                    <IconTrash size={20} />
-                  </Button>
-                </TableTd>
+      <Paper withBorder bg={colors['white-1']} p={'lg'} shadow="md" radius="md">
+        <Group justify="space-between" mb="md">
+          <Title order={4}>Daftar Pendapatan</Title>
+          <Tooltip label="Tambah Pendapatan Baru" withArrow>
+            <Button
+              leftSection={<IconPlus size={18} />}
+              color="blue"
+              variant="light"
+              onClick={() =>
+                router.push('/admin/ekonomi/PADesa-pendapatan-asli-desa/pendapatan/create')
+              }
+            >
+              Tambah Baru
+            </Button>
+          </Tooltip>
+        </Group>
+
+        <Box style={{ overflowX: 'auto' }}>
+          <Table highlightOnHover striped withTableBorder withRowBorders>
+            <TableThead>
+              <TableTr>
+                <TableTh style={{ width: '40%' }}>Nama</TableTh>
+                <TableTh style={{ width: '25%' }}>Nilai</TableTh>
+                <TableTh style={{ width: '15%' }}>Edit</TableTh>
+                <TableTh style={{ width: '15%' }}>Delete</TableTh>
               </TableTr>
-            ))}
-            <TableTr>
-              <TableTd colSpan={4}>
-                <Text fw={'bold'}>Total</Text>
-              </TableTd>
-              <TableTd>
-                {formatRupiah(pendapatanState.findMany.data.reduce((total, item) => total + item.value, 0))}
-              </TableTd>
-            </TableTr>
-          </TableTbody>
-        </Table>
+            </TableThead>
+            <TableTbody>
+              {filteredData.length > 0 ? (
+                <>
+                  {filteredData.map((item) => (
+                    <TableTr key={item.id}>
+                      <TableTd>
+                        <Text fw={500} truncate="end" lineClamp={1}>
+                          {item.name}
+                        </Text>
+                      </TableTd>
+                      <TableTd>{formatRupiah(item.value)}</TableTd>
+                      <TableTd>
+                        <Button
+                          variant="light"
+                          color="green"
+                          onClick={() =>
+                            router.push(`/admin/ekonomi/PADesa-pendapatan-asli-desa/pendapatan/${item.id}`)
+                          }
+                        >
+                          <IconEdit size={18} />
+                          <Text ml={5}>Edit</Text>
+                        </Button>
+                      </TableTd>
+                      <TableTd>
+                        <Button
+                          variant="light"
+                          color="red"
+                          disabled={pendapatanState.delete.loading}
+                          onClick={() => {
+                            setSelectedId(item.id);
+                            setModalHapus(true);
+                          }}
+                        >
+                          <IconTrash size={18} />
+                          <Text ml={5}>Hapus</Text>
+                        </Button>
+                      </TableTd>
+                    </TableTr>
+                  ))}
+
+                  {/* Row total */}
+                  <TableTr>
+                    <TableTd colSpan={1}>
+                      <Text fw={'bold'}>Total</Text>
+                    </TableTd>
+                    <TableTd colSpan={3}>
+                      <Text fw={'bold'}>{formatRupiah(totalValue)}</Text>
+                    </TableTd>
+                  </TableTr>
+                </>
+              ) : (
+                <TableTr>
+                  <TableTd colSpan={4}>
+                    <Center py={20}>
+                      <Text color="dimmed">Tidak ada data pendapatan yang cocok</Text>
+                    </Center>
+                  </TableTd>
+                </TableTr>
+              )}
+            </TableTbody>
+          </Table>
+        </Box>
       </Paper>
 
+      {/* Pagination */}
+      <Center>
+        <Pagination
+          value={page}
+          onChange={(newPage) => {
+            load(newPage, 10, search);
+            window.scrollTo({ top: 0, behavior: 'smooth' });
+          }}
+          total={totalPages}
+          mt="md"
+          mb="md"
+          color="blue"
+          radius="md"
+        />
+      </Center>
+
       {/* Modal Konfirmasi Hapus */}
       <ModalKonfirmasiHapus
         opened={modalHapus}
         onClose={() => setModalHapus(false)}
         onConfirm={handleDelete}
-        text='Apakah anda yakin ingin menghapus pendapatan ini?'
+        text="Apakah anda yakin ingin menghapus pendapatan ini?"
       />
     </Box>
   );

src/app/admin/(dashboard)/ekonomi/jumlah-penduduk-miskin/create/page.tsx

@@ -17,7 +17,7 @@ function CreateJumlahPendudukMiskin() {
 
   const resetForm = () => {
     stateJPM.create.form = {
-      year: 0,
+      year: new Date().getFullYear(), // Default to current year
       totalPoorPopulation: 0,
     }
   }
@@ -48,10 +48,11 @@ function CreateJumlahPendudukMiskin() {
             <TextInput
               label="Tahun"
               type="number"
-              value={stateJPM.create.form.year}
+              value={stateJPM.create.form.year || ''}
               placeholder="Masukkan tahun"
               onChange={(val) => {
-                stateJPM.create.form.year = Number(val.currentTarget.value);
+                const value = val.currentTarget.value;
+                stateJPM.create.form.year = value ? Number(value) : 0;
               }}
             />
             <TextInput

src/app/admin/(dashboard)/ekonomi/jumlah-pengangguran/[id]/edit/page.tsx

@@ -2,7 +2,7 @@
 'use client'
 import jumlahPengangguranState from '@/app/admin/(dashboard)/_state/ekonomi/jumlah-pengangguran';
 import colors from '@/con/colors';
-import { Box, Button, Group, Paper, Stack, Text, TextInput, Title } from '@mantine/core';
+import { Box, Button, Group, Paper, Stack, Text, TextInput, Title, Select, NumberInput } from '@mantine/core';
 import { IconArrowBack } from '@tabler/icons-react';
 import { useParams, useRouter } from 'next/navigation';
 import { useEffect, useState } from 'react';
@@ -14,45 +14,65 @@ function EditDetailDataPengangguran() {
   const router = useRouter();
   const params = useParams()
 
-  const [formData, setFormData] = useState({
-    month: stateDetail.update.form.month,
-    year: stateDetail.update.form.year,
-    totalUnemployment: stateDetail.update.form.totalUnemployment,
-    educatedUnemployment: stateDetail.update.form.educatedUnemployment,
-    uneducatedUnemployment: stateDetail.update.form.uneducatedUnemployment,
-    percentageChange: stateDetail.update.form.percentageChange || 0, // Ensure it's always a number
-  })
-
-  const calculateTotalAndChange = async () => {
-    const total = formData.educatedUnemployment + formData.uneducatedUnemployment;
-
-    // Ambil data bulan sebelumnya
-    const monthOrder = ['Jan', 'Feb', 'Mar', 'Apr', 'Mei', 'Jun', 'Jul', 'Agu', 'Sep', 'Okt', 'Nov', 'Des'];
-    const currentIndex = monthOrder.findIndex(
-      (m) => m.toLowerCase() === formData.month.toLowerCase()
-    );
-
-    let percentageChange = 0;
-    if (currentIndex > 0) {
-      const prevMonth = monthOrder[currentIndex - 1];
-      const prev = await stateDetail.findByMonthYear.load({
-        month: prevMonth,
-        year: formData.year,
-      });
-
-      if (prev?.totalUnemployment) {
-        percentageChange = Number(
-          (((total - prev.totalUnemployment) / prev.totalUnemployment) * 100).toFixed(1)
-        );
-      }
-    }
+  const [formData, setFormData] = useState<{
+    month: string;
+    year: number;
+    educatedUnemployment: number;
+    uneducatedUnemployment: number;
+    totalUnemployment: number;
+    percentageChange: number | null;
+  }>({
+    month: "",
+    year: new Date().getFullYear(),
+    educatedUnemployment: 0,
+    uneducatedUnemployment: 0,
+    totalUnemployment: 0,
+    percentageChange: 0,
+  });
 
+  // Update form data and recalculate totals
+  const updateFormData = async (updates: Partial<typeof formData>) => {
+    const newData = { ...formData, ...updates };
+    const { total, percentageChange } = await calculateTotalAndChange();
+    
     setFormData({
-      ...formData,
+      ...newData,
       totalUnemployment: total,
       percentageChange,
     });
+  };
 
+  const calculateTotalAndChange = async () => {
+    const total = formData.educatedUnemployment + formData.uneducatedUnemployment;
+    
+    // Calculate percentage change based on previous month's data
+    let percentageChange = 0;
+    const monthOrder = ["Jan", "Feb", "Mar", "Apr", "Mei", "Jun", "Jul", "Agu", "Sep", "Okt", "Nov", "Des"];
+    const currentMonthIndex = monthOrder.indexOf(formData.month);
+    
+    if (currentMonthIndex !== -1) {
+      let prevMonthIndex = currentMonthIndex - 1;
+      let prevYear = formData.year;
+      
+      if (prevMonthIndex < 0) {
+        prevMonthIndex = 11;
+        prevYear--;
+      }
+      
+      const prevMonth = monthOrder[prevMonthIndex];
+      
+      // Get previous month's data
+      const prevData = await stateDetail.findByMonthYear.load({
+        month: prevMonth,
+        year: prevYear,
+      });
+
+      if (prevData && prevData.totalUnemployment > 0) {
+        const change = ((total - prevData.totalUnemployment) / prevData.totalUnemployment) * 100;
+        percentageChange = parseFloat(change.toFixed(1));
+      }
+    }
+    
     return { total, percentageChange };
   };
 
@@ -60,25 +80,28 @@ function EditDetailDataPengangguran() {
     const loadDetail = async () => {
       const id = params?.id as string;
       if (!id) return;
-  
+
       try {
         await stateDetail.findUnique.load(id); // ambil by ID
         const data = stateDetail.findUnique.data;
-  
+
         if (data) {
-          // Convert year from Date to number
-          const yearValue = data.year instanceof Date ? data.year.getFullYear() : data.year;
-          
+
+          // Convert year from Date to number if needed
+          const yearValue = data.year && typeof data.year === 'object' && 'getFullYear' in data.year
+            ? (data.year as Date).getFullYear()
+            : Number(data.year);
+
           // Set the ID for update
           stateDetail.update.id = id;
-          
+
           // Update Valtio state with converted year
-          stateDetail.update.form = { 
+          stateDetail.update.form = {
             ...data,
             year: yearValue,
             percentageChange: data.percentageChange || 0 // Ensure it's always a number
           };
-  
+
           // Update local formData with converted year
           setFormData({
             month: data.month,
@@ -94,10 +117,9 @@ function EditDetailDataPengangguran() {
         toast.error("Gagal memuat data detail");
       }
     };
-  
+
     loadDetail();
   }, [params?.id]);
-  
 
   const handleSubmit = async () => {
     const { total, percentageChange } = await calculateTotalAndChange();
@@ -107,11 +129,11 @@ function EditDetailDataPengangguran() {
         totalUnemployment: total,
         percentageChange,
       };
-  
+
       const success = await stateDetail.update.submit();
       if (success) {
         toast.success("Detail data pengangguran berhasil diperbarui!");
-        router.push("/admin/ekonomi/jumlah-pengangguran/detail-data-pengangguran");
+        router.push("/admin/ekonomi/jumlah-pengangguran");
       }
     } catch (error) {
       console.error("Error updating:", error);
@@ -130,41 +152,38 @@ function EditDetailDataPengangguran() {
       <Paper w={{ base: '100%', md: '50%' }} bg={colors['white-1']} p={'md'}>
         <Title order={4}>Edit Detail Data Pengangguran</Title>
         <Stack gap="xs">
-          <TextInput
+          <Select
             label="Bulan"
+            data={["Jan", "Feb", "Mar", "Apr", "Mei", "Jun", "Jul", "Agu", "Sep", "Okt", "Nov", "Des"]}
             value={formData.month}
-            placeholder="Contoh: Jan, Feb, Mar"
-            onChange={(val) => (setFormData({
-              ...formData,
-              month: val.currentTarget.value
-            }))}
+            onChange={async (val) => {
+              await updateFormData({ month: val || "" });
+            }}
           />
-          <TextInput
+          <NumberInput
             label="Tahun"
-            type="number"
             value={formData.year}
-            onChange={(val) => (setFormData({
-              ...formData,
-              year: Number(val.currentTarget.value)
-            }))}
+            onChange={async (val) => {
+              await updateFormData({ year: Number(val) });
+            }}
           />
           <TextInput
             label="Pengangguran Terdidik"
             type="number"
             value={formData.educatedUnemployment}
-            onChange={(val) => (setFormData({
-              ...formData,
-              educatedUnemployment: Number(val.currentTarget.value)
-            }))}
+            onChange={async (val) => {
+              const value = Number(val.currentTarget.value) || 0;
+              await updateFormData({ educatedUnemployment: value });
+            }}
           />
           <TextInput
             label="Pengangguran Tidak Terdidik"
             type="number"
             value={formData.uneducatedUnemployment}
-            onChange={(val) => (setFormData({
-              ...formData,
-              uneducatedUnemployment: Number(val.currentTarget.value)
-            }))}
+            onChange={async (val) => {
+              const value = Number(val.currentTarget.value) || 0;
+              await updateFormData({ uneducatedUnemployment: value });
+            }}
           />
           <Text fz="sm" fw={500}>
             Total Otomatis: {formData.totalUnemployment}

src/app/admin/(dashboard)/ekonomi/jumlah-pengangguran/[id]/page.tsx

@@ -59,11 +59,16 @@ function DetailJumlahPengangguran() {
               </Box>
               <Box>
                 <Text fw={"bold"}>Perubahan</Text>
-                <Text>{stateDetail.findUnique.data?.percentageChange}</Text>
+                <Text>
+                  {stateDetail.findUnique.data?.percentageChange !== null &&
+                    stateDetail.findUnique.data?.percentageChange !== undefined
+                    ? `${stateDetail.findUnique.data.percentageChange}%`
+                    : 'Tidak ada data perubahan'}
+                </Text>
               </Box>
               <Box>
                 <Text fw={"bold"}>Tahun</Text>
-                <Text>{stateDetail.findUnique.data?.year ? new Date(stateDetail.findUnique.data.year).getFullYear() : ''}</Text>
+                <Text>{stateDetail.findUnique.data?.year || ''}</Text>
               </Box>
               <Box>
                 <Text fw={"bold"}>Bulan</Text>
@@ -76,14 +81,14 @@ function DetailJumlahPengangguran() {
               <Box>
                 <Flex gap={"xs"}>
                   <Button
-                  onClick={() => {
-                    if (stateDetail.findUnique.data) {
-                      setSelectedId(stateDetail.findUnique.data.id);
-                      setModalHapus(true);
-                    }
-                  }}
-                  disabled={stateDetail.delete.loading || !stateDetail.findUnique.data}
-                  color={"red"}>
+                    onClick={() => {
+                      if (stateDetail.findUnique.data) {
+                        setSelectedId(stateDetail.findUnique.data.id);
+                        setModalHapus(true);
+                      }
+                    }}
+                    disabled={stateDetail.delete.loading || !stateDetail.findUnique.data}
+                    color={"red"}>
                     <IconX size={20} />
                   </Button>
                   <Button onClick={() => router.push(`/admin/ekonomi/jumlah-pengangguran/${stateDetail.findUnique.data?.id}/edit`)} color="green">

src/app/admin/(dashboard)/ekonomi/jumlah-pengangguran/create/page.tsx

@@ -3,7 +3,7 @@
 'use client'
 import jumlahPengangguranState from '@/app/admin/(dashboard)/_state/ekonomi/jumlah-pengangguran';
 import colors from '@/con/colors';
-import { Box, Button, Group, Paper, Stack, Text, TextInput, Title } from '@mantine/core';
+import { Box, Button, Group, Paper, Stack, Text, TextInput, Title, Select, NumberInput } from '@mantine/core';
 import { IconArrowBack } from '@tabler/icons-react';
 import { useRouter } from 'next/navigation';
 import { useState } from 'react';
@@ -14,10 +14,15 @@ function CreateJumlahPengangguran() {
   const [chartData, setChartData] = useState<any[]>([]);
   const router = useRouter();
 
+  const monthOptions = [
+    'Jan', 'Feb', 'Mar', 'Apr', 'Mei', 'Jun',
+    'Jul', 'Agu', 'Sep', 'Okt', 'Nov', 'Des'
+  ];
+
   const resetForm = () => {
     stateDetail.create.form = {
-      month: "",
-      year: 0,
+      month: monthOptions[new Date().getMonth()], // Default to current month
+      year: new Date().getFullYear(), // Default to current year
       totalUnemployment: 0,
       educatedUnemployment: 0,
       uneducatedUnemployment: 0,
@@ -68,7 +73,7 @@ function CreateJumlahPengangguran() {
         setChartData([stateDetail.findUnique.data]);
       }
       resetForm();
-      router.push('/admin/ekonomi/jumlah-pengangguran/detail-data-pengangguran');
+      router.push('/admin/ekonomi/jumlah-pengangguran');
     }
   };
 
@@ -76,58 +81,66 @@ function CreateJumlahPengangguran() {
     <Box>
       <Box mb={10}>
         <Button onClick={() => router.back()} variant='subtle' color={'blue'}>
-          <IconArrowBack color={colors['blue-button']} size={25}/>
+          <IconArrowBack color={colors['blue-button']} size={25} />
         </Button>
       </Box>
       <Paper w={{ base: '100%', md: '50%' }} bg={colors['white-1']} p={'md'}>
-        <Title order={4}>Tambah Detail Data Pengangguran</Title>
-        <Stack gap="xs">
-          <TextInput
+        <Title order={4}>Tambah Data Pengangguran</Title>
+        <Stack gap="xs" mt="md">
+          <Select
             label="Bulan"
+            placeholder="Pilih bulan"
+            data={monthOptions}
             value={stateDetail.create.form.month}
-            placeholder="Contoh: Jan, Feb, Mar"
-            onChange={(e) => (stateDetail.create.form.month = e.currentTarget.value)}
+            onChange={(value) => {
+              stateDetail.create.form.month = value || '';
+              calculateTotalAndChange();
+            }}
+            required
           />
-          <TextInput
+          <NumberInput
             label="Tahun"
-            type="date"
             value={stateDetail.create.form.year}
-            onChange={(e) =>
-              (stateDetail.create.form.year = Number(e.currentTarget.value))
-            }
+            onChange={(value) => {
+              stateDetail.create.form.year = Number(value) || new Date().getFullYear();
+              calculateTotalAndChange();
+            }}
+            min={2000}
+            max={2100}
+            required
           />
-          <TextInput
+          <NumberInput
             label="Pengangguran Terdidik"
-            type="number"
             value={stateDetail.create.form.educatedUnemployment}
-            onChange={(e) => {
-              stateDetail.create.form.educatedUnemployment = Number(
-                e.currentTarget.value,
-              );
+            onChange={(value) => {
+              stateDetail.create.form.educatedUnemployment = Number(value) || 0;
+              calculateTotalAndChange();
             }}
+            min={0}
+            required
           />
-          <TextInput
+          <NumberInput
             label="Pengangguran Tidak Terdidik"
-            type="number"
             value={stateDetail.create.form.uneducatedUnemployment}
-            onChange={(e) => {
-              stateDetail.create.form.uneducatedUnemployment = Number(
-                e.currentTarget.value,
-              );
+            onChange={(value) => {
+              stateDetail.create.form.uneducatedUnemployment = Number(value) || 0;
+              calculateTotalAndChange();
             }}
+            min={0}
+            required
           />
           <Text fz="sm" fw={500}>
-            Total Otomatis: {stateDetail.create.form.totalUnemployment}
+            Total Otomatis: {stateDetail.create.form.totalUnemployment.toLocaleString()}
           </Text>
           <Text fz="sm" fw={500}>
-            Perubahan Otomatis:{" "}
-            {stateDetail.create.form.percentageChange !== null
-              ? `${stateDetail.create.form.percentageChange}%`
-              : '-'}
+            Perubahan Otomatis: {stateDetail.create.form.percentageChange.toFixed(1)}%
           </Text>
-          <Group>
-            <Button bg={colors['blue-button']} mt={10} onClick={handleSubmit}>
-              Submit
+          <Group mt="md">
+            <Button
+              onClick={handleSubmit}
+              disabled={!stateDetail.create.form.month || !stateDetail.create.form.year}
+            >
+              Simpan
             </Button>
           </Group>
         </Stack>

src/app/admin/(dashboard)/ekonomi/jumlah-pengangguran/page.tsx

@@ -57,7 +57,7 @@ function ListDetailDataPengangguran({search}: {search: string}) {
       setChartData(stateDetail.findMany.data.map((item) => ({
         id: item.id,
         month: item.month,
-        year: item.year instanceof Date ? item.year.getFullYear() : Number(item.year),
+        year: item.year && typeof item.year === 'object' && 'getFullYear' in item.year ? (item.year as Date).getFullYear() : Number(item.year),
         educatedUnemployment: Number(item.educatedUnemployment),
         uneducatedUnemployment: Number(item.uneducatedUnemployment),
         percentageChange: Number(item.percentageChange),

src/app/admin/(dashboard)/ekonomi/lowongan-kerja-lokal/[id]/edit/page.tsx

@@ -3,16 +3,25 @@
 import EditEditor from '@/app/admin/(dashboard)/_com/editEditor';
 import lowonganKerjaState from '@/app/admin/(dashboard)/_state/ekonomi/lowongan-kerja';
 import colors from '@/con/colors';
-import { Box, Button, Group, Paper, Stack, Text, TextInput, Title } from '@mantine/core';
+import {
+  Box,
+  Button,
+  Group,
+  Paper,
+  Stack,
+  Text,
+  TextInput,
+  Title,
+  Tooltip,
+} from '@mantine/core';
 import { IconArrowBack } from '@tabler/icons-react';
 import { useParams, useRouter } from 'next/navigation';
 import { useEffect, useState } from 'react';
 import { toast } from 'react-toastify';
 import { useProxy } from 'valtio/utils';
 
-
 function EditLowonganKerja() {
-  const lowonganState = useProxy(lowonganKerjaState)
+  const lowonganState = useProxy(lowonganKerjaState);
   const router = useRouter();
   const params = useParams();
 
@@ -24,7 +33,7 @@ function EditLowonganKerja() {
     gaji: lowonganKerjaState.update.form.gaji,
     deskripsi: lowonganKerjaState.update.form.deskripsi,
     kualifikasi: lowonganKerjaState.update.form.kualifikasi,
-  })
+  });
 
   useEffect(() => {
     const loadLowongan = async () => {
@@ -32,7 +41,7 @@ function EditLowonganKerja() {
       if (!id) return;
 
       try {
-        const data = await lowonganState.update.load(id); // akses langsung, bukan dari proxy
+        const data = await lowonganState.update.load(id);
         if (data) {
           setFormData({
             posisi: data.posisi || '',
@@ -51,20 +60,17 @@ function EditLowonganKerja() {
     };
 
     loadLowongan();
-  }, [params?.id])
+  }, [params?.id]);
 
   const handleSubmit = async () => {
     try {
-      // Set the ID for the update
       lowonganState.update.id = params?.id as string;
-      
-      // Update the form state
+
       lowonganState.update.form = {
         ...lowonganState.update.form,
-        ...formData
+        ...formData,
       };
-      
-      // Call the update function
+
       await lowonganState.update.update();
       toast.success("Lowongan kerja berhasil diperbarui!");
       router.push("/admin/ekonomi/lowongan-kerja-lokal");
@@ -72,79 +78,105 @@ function EditLowonganKerja() {
       console.error("Error updating lowongan kerja:", error);
       toast.error("Terjadi kesalahan saat memperbarui lowongan kerja");
     }
-  }
+  };
 
   return (
-    <Box>
-      <Box mb={10}>
-        <Button onClick={() => router.back()} variant='subtle' color={'blue'}>
-          <IconArrowBack color={colors['blue-button']} size={25} />
-        </Button>
-      </Box>
+    <Box px={{ base: 'sm', md: 'lg' }} py="md">
+      {/* Header dengan tombol back */}
+      <Group mb="md">
+        <Tooltip label="Kembali ke halaman sebelumnya" withArrow>
+          <Button variant="subtle" onClick={() => router.back()} p="xs" radius="md">
+            <IconArrowBack color={colors['blue-button']} size={24} />
+          </Button>
+        </Tooltip>
+        <Title order={4} ml="sm" c="dark">
+          Edit Lowongan Kerja Lokal
+        </Title>
+      </Group>
 
-      <Paper w={{ base: '100%', md: '50%' }} bg={colors['white-1']} p={'md'}>
-        <Stack gap={"xs"}>
-          <Title order={4}>Edit Lowongan Kerja Lokal</Title>
+      {/* Card Form */}
+      <Paper
+        w={{ base: '100%', md: '60%' }}
+        bg={colors['white-1']}
+        p="lg"
+        radius="md"
+        shadow="sm"
+        style={{ border: '1px solid #e0e0e0' }}
+      >
+        <Stack gap="md">
           <TextInput
+            label="Posisi"
+            placeholder="Masukkan posisi"
             value={formData.posisi}
-            onChange={(val) => {
-              setFormData(prev => ({ ...prev, posisi: val.target.value }));
-            }}
-            label={<Text fw={"bold"} fz={"sm"}>Posisi</Text>}
-            placeholder='Masukkan posisi'
+            onChange={(e) => setFormData({ ...formData, posisi: e.target.value })}
+            required
           />
+
           <TextInput
+            label="Nama Perusahaan"
+            placeholder="Masukkan nama perusahaan"
             value={formData.namaPerusahaan}
-            onChange={(val) => {
-              setFormData(prev => ({ ...prev, namaPerusahaan: val.target.value }));
-            }}
-            label={<Text fw={"bold"} fz={"sm"}>Nama Perusahaan</Text>}
-            placeholder='Masukkan nama perusahaan'
+            onChange={(e) => setFormData({ ...formData, namaPerusahaan: e.target.value })}
+            required
           />
+
           <TextInput
+            label="Lokasi"
+            placeholder="Masukkan lokasi"
             value={formData.lokasi}
-            onChange={(val) => {
-              setFormData(prev => ({ ...prev, lokasi: val.target.value }));
-            }}
-            label={<Text fw={"bold"} fz={"sm"}>Lokasi</Text>}
-            placeholder='Masukkan lokasi'
+            onChange={(e) => setFormData({ ...formData, lokasi: e.target.value })}
+            required
           />
+
           <TextInput
+            label="Tipe Pekerjaan"
+            placeholder="Masukkan tipe pekerjaan"
             value={formData.tipePekerjaan}
-            onChange={(val) => {
-              setFormData(prev => ({ ...prev, tipePekerjaan: val.target.value }));
-            }}
-            label={<Text fw={"bold"} fz={"sm"}>Tipe Pekerjaan</Text>}
-            placeholder='Masukkan tipe pekerjaan'
+            onChange={(e) => setFormData({ ...formData, tipePekerjaan: e.target.value })}
+            required
           />
+
           <TextInput
+            label="Gaji (per bulan)"
+            placeholder="Masukkan gaji"
             value={formData.gaji}
-            onChange={(val) => {
-              setFormData(prev => ({ ...prev, gaji: val.target.value }));
-            }}
-            label={<Text fw={"bold"} fz={"sm"}>Gaji selama 1 bulan</Text>}
-            placeholder='Masukkan gaji'
+            onChange={(e) => setFormData({ ...formData, gaji: e.target.value })}
+            required
           />
+
           <Box>
-            <Text fw={"bold"} fz={"sm"}>Deskripsi Lowongan Kerja</Text>
+            <Text fw="bold" fz="sm" mb={6}>
+              Deskripsi Lowongan Kerja
+            </Text>
             <EditEditor
               value={formData.deskripsi}
-              onChange={(val) => {
-                setFormData(prev => ({ ...prev, deskripsi: val }));
-              }}
+              onChange={(val) => setFormData({ ...formData, deskripsi: val })}
             />
           </Box>
+
           <Box>
-            <Text fw={"bold"} fz={"sm"}>Kualifikasi Lowongan Kerja</Text>
+            <Text fw="bold" fz="sm" mb={6}>
+              Kualifikasi Lowongan Kerja
+            </Text>
             <EditEditor
               value={formData.kualifikasi}
-              onChange={(val) => {
-                setFormData(prev => ({ ...prev, kualifikasi: val }));
-              }}
+              onChange={(val) => setFormData({ ...formData, kualifikasi: val })}
             />
           </Box>
-          <Group>
-            <Button onClick={handleSubmit} bg={colors['blue-button']}>Submit</Button>
+
+          <Group justify="right">
+            <Button
+              onClick={handleSubmit}
+              radius="md"
+              size="md"
+              style={{
+                background: `linear-gradient(135deg, ${colors['blue-button']}, #4facfe)`,
+                color: '#fff',
+                boxShadow: '0 4px 15px rgba(79, 172, 254, 0.4)',
+              }}
+            >
+              Simpan
+            </Button>
           </Group>
         </Stack>
       </Paper>

src/app/admin/(dashboard)/ekonomi/lowongan-kerja-lokal/[id]/page.tsx

@@ -1,128 +1,148 @@
 'use client'
-import { useProxy } from 'valtio/utils';
 
-import { Box, Button, Flex, Paper, Skeleton, Stack, Text } from '@mantine/core';
+import { Box, Button, Group, Paper, Skeleton, Stack, Text, Tooltip } from '@mantine/core';
 import { useShallowEffect } from '@mantine/hooks';
-import { IconArrowBack, IconEdit, IconX } from '@tabler/icons-react';
+import { IconArrowBack, IconEdit, IconTrash } from '@tabler/icons-react';
 import { useParams, useRouter } from 'next/navigation';
 import { useState } from 'react';
+import { useProxy } from 'valtio/utils';
 
 import colors from '@/con/colors';
 import { ModalKonfirmasiHapus } from '../../../_com/modalKonfirmasiHapus';
 import lowonganKerjaState from '../../../_state/ekonomi/lowongan-kerja';
 
-
-
 function DetailLowonganKerjaLokal() {
-  const lowonganState = useProxy(lowonganKerjaState)
-  const [modalHapus, setModalHapus] = useState(false)
-  const [selectedId, setSelectedId] = useState<string | null>(null)
-  const params = useParams()
-  const router = useRouter()
+  const lowonganState = useProxy(lowonganKerjaState);
+  const [modalHapus, setModalHapus] = useState(false);
+  const [selectedId, setSelectedId] = useState<string | null>(null);
+  const params = useParams();
+  const router = useRouter();
 
   useShallowEffect(() => {
-    lowonganState.findUnique.load(params?.id as string)
-  }, [])
-
+    lowonganState.findUnique.load(params?.id as string);
+  }, []);
 
   const handleHapus = () => {
     if (selectedId) {
-      lowonganState.delete.byId(selectedId)
-      setModalHapus(false)
-      setSelectedId(null)
-      router.push("/admin/ekonomi/lowongan-kerja-lokal")
+      lowonganState.delete.byId(selectedId);
+      setModalHapus(false);
+      setSelectedId(null);
+      router.push("/admin/ekonomi/lowongan-kerja-lokal");
     }
-  }
+  };
 
   if (!lowonganState.findUnique.data) {
     return (
       <Stack py={10}>
-        <Skeleton h={40} />
+        <Skeleton height={500} radius="md" />
       </Stack>
-    )
+    );
   }
 
+  const data = lowonganState.findUnique.data;
+
   return (
-    <Box>
-      <Box mb={10}>
-        <Button variant="subtle" onClick={() => router.back()}>
-          <IconArrowBack color={colors['blue-button']} size={25} />
-        </Button>
-      </Box>
-      <Paper bg={colors['white-1']} w={{ base: "100%", md: "100%", lg: "50%" }} p={'md'}>
-        <Stack>
-          <Text fz={"xl"} fw={"bold"}>Detail Lowongan Kerja Lokal</Text>
-          {lowonganState.findUnique.data ? (
-            <Paper key={lowonganState.findUnique.data.id} bg={colors['BG-trans']} p={'md'}>
-              <Stack gap={"xs"}>
-                <Box>
-                  <Text fw={"bold"} fz={"lg"}>Bekerja Sebagai</Text>
-                  <Text fz={"lg"}>{lowonganState.findUnique.data?.posisi}</Text>
-                </Box>
-                <Box>
-                  <Text fw={"bold"} fz={"lg"}>Nama Usaha</Text>
-                  <Text fz={"lg"}>{lowonganState.findUnique.data?.namaPerusahaan}</Text>
-                </Box>
-                <Box>
-                  <Text fw={"bold"} fz={"lg"}>Lokasi</Text>
-                  <Text fz={"lg"}>{lowonganState.findUnique.data?.lokasi}</Text>
-                </Box>
-                <Box>
-                  <Text fw={"bold"} fz={"lg"}>Tipe Pekerjaan</Text>
-                  <Text fz={"lg"}>{lowonganState.findUnique.data?.tipePekerjaan}</Text>
-                </Box>
-                <Box>
-                  <Text fw={"bold"} fz={"lg"}>Gaji</Text>
-                  <Text fz={"lg"}>{lowonganState.findUnique.data?.gaji}</Text>
-                </Box>
-                <Box>
-                  <Text fw={"bold"} fz={"lg"}>Deskripsi</Text>
-                  <Text fz={"lg"} dangerouslySetInnerHTML={{ __html: lowonganState.findUnique.data?.deskripsi }} />
-                </Box>
-                <Box>
-                  <Text fw={"bold"} fz={"lg"}>Kualifikasi</Text>
-                  <Text fz={"lg"} dangerouslySetInnerHTML={{ __html: lowonganState.findUnique.data?.kualifikasi }} />
-                </Box>
-                <Flex gap={"xs"} mt={10}>
+    <Box py={10}>
+      <Button
+        variant="subtle"
+        onClick={() => router.back()}
+        leftSection={<IconArrowBack size={24} color={colors['blue-button']} />}
+        mb={15}
+      >
+        Kembali
+      </Button>
+
+      <Paper
+        withBorder
+        w={{ base: "100%", md: "70%" }}
+        bg={colors['white-1']}
+        p="lg"
+        radius="md"
+        shadow="sm"
+      >
+        <Stack gap="md">
+          <Text fz="2xl" fw="bold" c={colors['blue-button']}>
+            Detail Lowongan Kerja Lokal
+          </Text>
+
+          <Paper bg="#ECEEF8" p="md" radius="md" shadow="xs">
+            <Stack gap="sm">
+              <Box>
+                <Text fz="lg" fw="bold">Bekerja Sebagai</Text>
+                <Text fz="md" c="dimmed">{data.posisi || '-'}</Text>
+              </Box>
+
+              <Box>
+                <Text fz="lg" fw="bold">Nama Usaha</Text>
+                <Text fz="md" c="dimmed">{data.namaPerusahaan || '-'}</Text>
+              </Box>
+
+              <Box>
+                <Text fz="lg" fw="bold">Lokasi</Text>
+                <Text fz="md" c="dimmed">{data.lokasi || '-'}</Text>
+              </Box>
+
+              <Box>
+                <Text fz="lg" fw="bold">Tipe Pekerjaan</Text>
+                <Text fz="md" c="dimmed">{data.tipePekerjaan || '-'}</Text>
+              </Box>
+
+              <Box>
+                <Text fz="lg" fw="bold">Gaji</Text>
+                <Text fz="md" c="dimmed">{data.gaji || '-'}</Text>
+              </Box>
+
+              <Box>
+                <Text fz="lg" fw="bold">Deskripsi</Text>
+                <Text fz="md" c="dimmed" dangerouslySetInnerHTML={{ __html: data.deskripsi || '-' }} />
+              </Box>
+
+              <Box>
+                <Text fz="lg" fw="bold">Kualifikasi</Text>
+                <Text fz="md" c="dimmed" dangerouslySetInnerHTML={{ __html: data.kualifikasi || '-' }} />
+              </Box>
+
+              <Group gap="sm" mt="sm">
+                <Tooltip label="Hapus Lowongan" withArrow position="top">
                   <Button
+                    color="red"
                     onClick={() => {
-                      if (lowonganState.findUnique.data) {
-                        setSelectedId(lowonganState.findUnique.data.id);
-                        setModalHapus(true);
-                      }
+                      setSelectedId(data.id);
+                      setModalHapus(true);
                     }}
-                    disabled={lowonganState.delete.loading || !lowonganState.findUnique.data}
-                    color={"red"}
+                    variant="light"
+                    radius="md"
+                    size="md"
                   >
-                    <IconX size={20} />
+                    <IconTrash size={20} />
                   </Button>
+                </Tooltip>
+
+                <Tooltip label="Edit Lowongan" withArrow position="top">
                   <Button
-                    onClick={() => {
-                      if (lowonganState.findUnique.data) {
-                        router.push(`/admin/ekonomi/lowongan-kerja-lokal/${lowonganState.findUnique.data.id}/edit`);
-                      }
-                    }}
-                    disabled={!lowonganState.findUnique.data}
-                    color={"green"}
+                    color="green"
+                    onClick={() => router.push(`/admin/ekonomi/lowongan-kerja-lokal/${data.id}/edit`)}
+                    variant="light"
+                    radius="md"
+                    size="md"
                   >
                     <IconEdit size={20} />
                   </Button>
-                </Flex>
-              </Stack>
-            </Paper>
-          ) : null}
+                </Tooltip>
+              </Group>
+            </Stack>
+          </Paper>
         </Stack>
       </Paper>
 
-      {/* Modal Konfirmasi Hapus */}
       <ModalKonfirmasiHapus
         opened={modalHapus}
         onClose={() => setModalHapus(false)}
         onConfirm={handleHapus}
-        text='Apakah anda yakin ingin menghapus lowongan kerja ini?'
+        text="Apakah Anda yakin ingin menghapus lowongan kerja ini?"
       />
     </Box>
   );
 }
 
-export default DetailLowonganKerjaLokal;
+export default DetailLowonganKerjaLokal;

src/app/admin/(dashboard)/ekonomi/lowongan-kerja-lokal/create/page.tsx

@@ -1,88 +1,123 @@
-'use client'
+'use client';
 import colors from '@/con/colors';
-import { Box, Button, Group, Paper, Stack, Text, TextInput, Title } from '@mantine/core';
+import {
+  Box,
+  Button,
+  Group,
+  Paper,
+  Stack,
+  Text,
+  TextInput,
+  Title,
+  Tooltip,
+} from '@mantine/core';
 import { IconArrowBack } from '@tabler/icons-react';
 import { useRouter } from 'next/navigation';
 import { useProxy } from 'valtio/utils';
 import CreateEditor from '../../../_com/createEditor';
 import lowonganKerjaState from '../../../_state/ekonomi/lowongan-kerja';
 
-
 function CreateLowonganKerja() {
-  const lowonganState = useProxy(lowonganKerjaState)
+  const lowonganState = useProxy(lowonganKerjaState);
   const router = useRouter();
 
   const resetForm = () => {
     lowonganState.create.form = {
-      posisi: "",
-      namaPerusahaan: "",
-      lokasi: "",
-      tipePekerjaan: "",
-      gaji: "",
-      deskripsi: "",
-      kualifikasi: "",
-    }
-  }
+      posisi: '',
+      namaPerusahaan: '',
+      lokasi: '',
+      tipePekerjaan: '',
+      gaji: '',
+      deskripsi: '',
+      kualifikasi: '',
+    };
+  };
 
   const handleSubmit = async () => {
-    await lowonganState.create.create()
-    resetForm()
-    router.push("/admin/ekonomi/lowongan-kerja-lokal")
-  }
+    await lowonganState.create.create();
+    resetForm();
+    router.push('/admin/ekonomi/lowongan-kerja-lokal');
+  };
 
   return (
-    <Box>
-      <Box mb={10}>
-        <Button onClick={() => router.back()} variant='subtle' color={'blue'}>
-          <IconArrowBack color={colors['blue-button']} size={25}/>
-        </Button>
-      </Box>
+    <Box px={{ base: 'sm', md: 'lg' }} py="md">
+      {/* Header dengan tombol kembali */}
+      <Group mb="md">
+        <Tooltip label="Kembali ke halaman sebelumnya" withArrow>
+          <Button
+            variant="subtle"
+            onClick={() => router.back()}
+            p="xs"
+            radius="md"
+          >
+            <IconArrowBack color={colors['blue-button']} size={24} />
+          </Button>
+        </Tooltip>
+        <Title order={4} ml="sm" c="dark">
+          Tambah Lowongan Kerja Lokal
+        </Title>
+      </Group>
 
-      <Paper w={{base: '100%', md: '50%'}} bg={colors['white-1']} p={'md'}>
-        <Stack gap={"xs"}>
-          <Title order={4}>Create Lowongan Kerja Lokal</Title>
+      {/* Card Form */}
+      <Paper
+        w={{ base: '100%', md: '50%' }}
+        bg={colors['white-1']}
+        p="lg"
+        radius="md"
+        shadow="sm"
+        style={{ border: '1px solid #e0e0e0' }}
+      >
+        <Stack gap="md">
           <TextInput
-          value={lowonganState.create.form.posisi}
-          onChange={(val) => {
-            lowonganState.create.form.posisi = val.target.value;
-          }}
-          label={<Text fw={"bold"} fz={"sm"}>Posisi</Text>}
-          placeholder='Masukkan posisi'
+            value={lowonganState.create.form.posisi}
+            onChange={(val) =>
+              (lowonganState.create.form.posisi = val.target.value)
+            }
+            label="Posisi"
+            placeholder="Masukkan posisi"
+            required
           />
           <TextInput
-          value={lowonganState.create.form.namaPerusahaan}
-          onChange={(val) => {
-            lowonganState.create.form.namaPerusahaan = val.target.value;
-          }}
-          label={<Text fw={"bold"} fz={"sm"}>Nama Perusahaan</Text>}
-          placeholder='Masukkan nama perusahaan'
+            value={lowonganState.create.form.namaPerusahaan}
+            onChange={(val) =>
+              (lowonganState.create.form.namaPerusahaan = val.target.value)
+            }
+            label="Nama Perusahaan"
+            placeholder="Masukkan nama perusahaan"
+            required
           />
           <TextInput
-          value={lowonganState.create.form.lokasi}
-          onChange={(val) => {
-            lowonganState.create.form.lokasi = val.target.value;
-          }}
-          label={<Text fw={"bold"} fz={"sm"}>Lokasi</Text>}
-          placeholder='Masukkan lokasi'
+            value={lowonganState.create.form.lokasi}
+            onChange={(val) =>
+              (lowonganState.create.form.lokasi = val.target.value)
+            }
+            label="Lokasi"
+            placeholder="Masukkan lokasi"
+            required
           />
           <TextInput
-          value={lowonganState.create.form.tipePekerjaan}
-          onChange={(val) => {
-            lowonganState.create.form.tipePekerjaan = val.target.value;
-          }}
-          label={<Text fw={"bold"} fz={"sm"}>Tipe Pekerjaan</Text>}
-          placeholder='Masukkan tipe pekerjaan'
+            value={lowonganState.create.form.tipePekerjaan}
+            onChange={(val) =>
+              (lowonganState.create.form.tipePekerjaan = val.target.value)
+            }
+            label="Tipe Pekerjaan"
+            placeholder="Masukkan tipe pekerjaan"
+            required
           />
           <TextInput
-          value={lowonganState.create.form.gaji}
-          onChange={(val) => {
-            lowonganState.create.form.gaji = val.target.value;
-          }}
-          label={<Text fw={"bold"} fz={"sm"}>Gaji selama 1 bulan</Text>}
-          placeholder='Masukkan gaji'
+            value={lowonganState.create.form.gaji}
+            onChange={(val) =>
+              (lowonganState.create.form.gaji = val.target.value)
+            }
+            label="Gaji (per bulan)"
+            placeholder="Masukkan gaji"
+            required
           />
+
           <Box>
-            <Text fw={"bold"} fz={"sm"}>Deskripsi Lowongan Kerja</Text>
+            <Text fw="bold" fz="sm" mb={6}>
+              Deskripsi Lowongan Kerja
+            </Text>
             <CreateEditor
               value={lowonganState.create.form.deskripsi}
               onChange={(val) => {
@@ -90,8 +125,11 @@ function CreateLowonganKerja() {
               }}
             />
           </Box>
+
           <Box>
-            <Text fw={"bold"} fz={"sm"}>Kualifikasi Lowongan Kerja</Text>
+            <Text fw="bold" fz="sm" mb={6}>
+              Kualifikasi Lowongan Kerja
+            </Text>
             <CreateEditor
               value={lowonganState.create.form.kualifikasi}
               onChange={(val) => {
@@ -99,12 +137,25 @@ function CreateLowonganKerja() {
               }}
             />
           </Box>
-          <Group>
-            <Button bg={colors['blue-button']} onClick={handleSubmit}>Submit</Button>
+
+          {/* Tombol Simpan */}
+          <Group justify="right">
+            <Button
+              onClick={handleSubmit}
+              radius="md"
+              size="md"
+              style={{
+                background: `linear-gradient(135deg, ${colors['blue-button']}, #4facfe)`,
+                color: '#fff',
+                boxShadow: '0 4px 15px rgba(79, 172, 254, 0.4)',
+              }}
+            >
+              Simpan
+            </Button>
           </Group>
-       </Stack>
+        </Stack>
       </Paper>
-   </Box>
+    </Box>
   );
 }
 

src/app/admin/(dashboard)/ekonomi/lowongan-kerja-lokal/page.tsx

@@ -1,22 +1,40 @@
 'use client'
 import colors from '@/con/colors';
-import { Box, Button, Center, Pagination, Paper, Skeleton, Stack, Table, TableTbody, TableTd, TableTh, TableThead, TableTr, Text } from '@mantine/core';
-import { IconDeviceImac, IconSearch } from '@tabler/icons-react';
-import HeaderSearch from '../../_com/header';
-import JudulList from '../../_com/judulList';
-import { useRouter } from 'next/navigation';
-import lowonganKerjaState from '../../_state/ekonomi/lowongan-kerja';
-import { useProxy } from 'valtio/utils';
+import {
+  Box,
+  Button,
+  Center,
+  Group,
+  Pagination,
+  Paper,
+  Skeleton,
+  Stack,
+  Table,
+  TableTbody,
+  TableTd,
+  TableTh,
+  TableThead,
+  TableTr,
+  Text,
+  Title,
+  Tooltip
+} from '@mantine/core';
 import { useShallowEffect } from '@mantine/hooks';
+import { IconDeviceImac, IconPlus, IconSearch } from '@tabler/icons-react';
+import { useRouter } from 'next/navigation';
 import { useState } from 'react';
+import { useProxy } from 'valtio/utils';
+import HeaderSearch from '../../_com/header';
+import lowonganKerjaState from '../../_state/ekonomi/lowongan-kerja';
 
 function LowonganKerjaLokal() {
   const [search, setSearch] = useState("");
+
   return (
     <Box>
       <HeaderSearch
-        title='Lowongan Kerja Lokal'
-        placeholder='pencarian'
+        title="Lowongan Kerja Lokal"
+        placeholder="Cari pekerjaan atau perusahaan..."
         searchIcon={<IconSearch size={20} />}
         value={search}
         onChange={(e) => setSearch(e.currentTarget.value)}
@@ -27,74 +45,117 @@ function LowonganKerjaLokal() {
 }
 
 function ListLowonganKerjaLokal({ search }: { search: string }) {
-  const lowonganState = useProxy(lowonganKerjaState)
+  const stateLowongan = useProxy(lowonganKerjaState);
   const router = useRouter();
 
-  const {
-    data,
-    page,
-    totalPages,
-    loading,
-    load,
-  } = lowonganState.findMany
+  const { data, page, totalPages, loading, load } = stateLowongan.findMany;
 
   useShallowEffect(() => {
-    load(page, 10, search)
-  }, [page, search])
+    load(page, 10, search);
+  }, [page, search]);
 
-  const filteredData = data || []
+  const filteredData = data || [];
 
   if (loading || !data) {
     return (
       <Stack py={10}>
-        <Skeleton h={500} />
+        <Skeleton height={600} radius="md" />
       </Stack>
-    )
+    );
   }
+
   return (
     <Box py={10}>
-      <Paper bg={colors['white-1']} p={'md'}>
-        <JudulList
-          title='List Lowongan Kerja Lokal'
-          href='/admin/ekonomi/lowongan-kerja-lokal/create'
-        />
-        <Table striped withTableBorder withRowBorders>
-          <TableThead>
-            <TableTr>
-              <TableTh>Pekerjaan</TableTh>
-              <TableTh>Nama Perusahaan</TableTh>
-              <TableTh>Lokasi</TableTh>
-              <TableTh>Detail</TableTh>
+      <Paper withBorder bg={colors['white-1']} p="lg" shadow="md" radius="md">
+        <Group justify="space-between" mb="md">
+          <Title order={4}>Daftar Lowongan Kerja Lokal</Title>
+          <Tooltip label="Tambah Lowongan Kerja" withArrow>
+            <Button
+              leftSection={<IconPlus size={18} />}
+              color="blue"
+              variant="light"
+              onClick={() =>
+                router.push('/admin/ekonomi/lowongan-kerja-lokal/create')
+              }
+            >
+              Tambah Baru
+            </Button>
+          </Tooltip>
+        </Group>
+
+        <Box style={{ overflowX: 'auto' }}>
+          <Table highlightOnHover>
+            <TableThead>
+              <TableTr>
+                <TableTh style={{ width: '25%' }}>Pekerjaan</TableTh>
+                <TableTh style={{ width: '25%' }}>Nama Perusahaan</TableTh>
+                <TableTh style={{ width: '20%' }}>Lokasi</TableTh>
+                <TableTh style={{ width: '15%' }}>Aksi</TableTh>
               </TableTr>
-          </TableThead>
-          <TableTbody>
-            {filteredData.map((item) => (
-              <TableTr key={item.id}>
-                <TableTd>
-                  <Text fz={"md"}>{item.posisi}</Text>
-                </TableTd>
-                <TableTd>
-                  <Text fz={"md"}>{item.namaPerusahaan}</Text>
-                </TableTd>
-                <TableTd>
-                  <Text fz={"md"}>{item.lokasi}</Text>
-                </TableTd>
-                <TableTd>
-                  <Button onClick={() => router.push(`/admin/ekonomi/lowongan-kerja-lokal/${item.id}`)}>
-                  <IconDeviceImac size={20} />
-                </Button>
-              </TableTd>
-            </TableTr>
-          ))}
-          </TableTbody>
-        </Table>  
+            </TableThead>
+            <TableTbody>
+              {filteredData.length > 0 ? (
+                filteredData.map((item) => (
+                  <TableTr key={item.id}>
+                    <TableTd style={{ width: '25%' }}>
+                      <Text fw={500} truncate="end" lineClamp={1}>
+                        {item.posisi}
+                      </Text>
+                    </TableTd>
+                    <TableTd style={{ width: '25%' }}>
+                      <Text truncate fz="sm" c="dimmed">
+                        {item.namaPerusahaan}
+                      </Text>
+                    </TableTd>
+                    <TableTd style={{ width: '20%' }}>
+                      <Text truncate fz="sm" c="dimmed">
+                        {item.lokasi}
+                      </Text>
+                    </TableTd>
+                    <TableTd style={{ width: '15%' }}>
+                      <Button
+                        variant="light"
+                        color="blue"
+                        onClick={() =>
+                          router.push(
+                            `/admin/ekonomi/lowongan-kerja-lokal/${item.id}`
+                          )
+                        }
+                      >
+                        <IconDeviceImac size={20} />
+                        <Text ml={5}>Detail</Text>
+                      </Button>
+                    </TableTd>
+                  </TableTr>
+                ))
+              ) : (
+                <TableTr>
+                  <TableTd colSpan={4}>
+                    <Center py={20}>
+                      <Text color="dimmed">
+                        Tidak ada data lowongan kerja yang cocok
+                      </Text>
+                    </Center>
+                  </TableTd>
+                </TableTr>
+              )}
+            </TableTbody>
+          </Table>
+        </Box>
       </Paper>
+
       <Center>
         <Pagination
           value={page}
-          onChange={(newPage) => load(newPage)}
+          onChange={(newPage) => {
+            load(newPage, 10);
+            window.scrollTo({ top: 0, behavior: 'smooth' });
+          }}
           total={totalPages}
-          my="md"
+          mt="md"
+          mb="md"
+          color="blue"
+          radius="md"
         />
       </Center>
     </Box>

src/app/admin/(dashboard)/ekonomi/pasar-desa/_lib/layoutTabs.tsx

@@ -1,62 +1,131 @@
 /* eslint-disable react-hooks/exhaustive-deps */
 'use client'
 import colors from '@/con/colors';
-import { Stack, Tabs, TabsList, TabsPanel, TabsTab, Title } from '@mantine/core';
+import {
+  Stack,
+  Tabs,
+  TabsList,
+  TabsPanel,
+  TabsTab,
+  Title,
+  Tooltip,
+  ScrollArea,
+} from '@mantine/core';
 import { usePathname, useRouter } from 'next/navigation';
 import React, { useEffect, useState } from 'react';
+import { IconShoppingBag, IconCategory } from '@tabler/icons-react';
 
 function LayoutTabs({ children }: { children: React.ReactNode }) {
-    const router = useRouter()
-    const pathname = usePathname()
-    const tabs = [
-        {
-            label: "Produk Pasar Desa",
-            value: "produkpasardesa",
-            href: "/admin/ekonomi/pasar-desa/produk-pasar-desa"
-        },
-        {
-            label: "Kategori Produk",
-            value: "kategoriproduk",
-            href: "/admin/ekonomi/pasar-desa/kategori-produk"
-        },
-    ];
-    const curentTab = tabs.find(tab => tab.href === pathname)
-    const [activeTab, setActiveTab] = useState<string | null>(curentTab?.value || tabs[0].value);
+  const router = useRouter();
+  const pathname = usePathname();
 
-    const handleTabChange = (value: string | null) => {
-        const tab = tabs.find(t => t.value === value)
-        if (tab) {
-            router.push(tab.href)
-        }
-        setActiveTab(value)
+  const tabs = [
+    {
+      label: "Produk Pasar Desa",
+      value: "produkpasardesa",
+      href: "/admin/ekonomi/pasar-desa/produk-pasar-desa",
+      icon: <IconShoppingBag size={18} stroke={1.8} />,
+      tooltip: "Kelola data produk yang ada di pasar desa",
+    },
+    {
+      label: "Kategori Produk",
+      value: "kategoriproduk",
+      href: "/admin/ekonomi/pasar-desa/kategori-produk",
+      icon: <IconCategory size={18} stroke={1.8} />,
+      tooltip: "Atur kategori produk pasar desa",
+    },
+  ];
+
+  const currentTab = tabs.find((tab) => tab.href === pathname);
+  const [activeTab, setActiveTab] = useState<string | null>(
+    currentTab?.value || tabs[0].value
+  );
+
+  const handleTabChange = (value: string | null) => {
+    const tab = tabs.find((t) => t.value === value);
+    if (tab) {
+      router.push(tab.href);
     }
+    setActiveTab(value);
+  };
 
-    useEffect(() => {
-        const match = tabs.find(tab => tab.href === pathname)
-        if (match) {
-            setActiveTab(match.value)
-        }
-    }, [pathname])
+  useEffect(() => {
+    const match = tabs.find((tab) => tab.href === pathname);
+    if (match) {
+      setActiveTab(match.value);
+    }
+  }, [pathname]);
 
-    return (
-        <Stack>
-            <Title order={3}>Pasar Desa</Title>
-            <Tabs color={colors['blue-button']} variant='pills' value={activeTab} onChange={handleTabChange}>
-                <TabsList p={"xs"} bg={"#BBC8E7FF"}>
-                    {tabs.map((e, i) => (
-                        <TabsTab key={i} value={e.value}>{e.label}</TabsTab>
-                    ))}
-                </TabsList>
-                {tabs.map((e, i) => (
-                    <TabsPanel key={i} value={e.value}>
-                        {/* Konten dummy, bisa diganti tergantung routing */}
-                        <></>
-                    </TabsPanel>
-                ))}
-            </Tabs>
+  return (
+    <Stack gap="lg">
+      <Title order={2} fw={700} style={{ color: "#1A1B1E" }}>
+        Pasar Desa
+      </Title>
+
+      <Tabs
+        color={colors['blue-button']}
+        variant="pills"
+        value={activeTab}
+        onChange={handleTabChange}
+        radius="lg"
+        keepMounted={false}
+      >
+        {/* ✅ Scroll horizontal wrapper */}
+        <ScrollArea type="auto" offsetScrollbars>
+          <TabsList
+            p="sm"
+            style={{
+              background: "linear-gradient(135deg, #e7ebf7, #f9faff)",
+              borderRadius: "1rem",
+              boxShadow: "inset 0 0 10px rgba(0,0,0,0.05)",
+              display: "flex",
+              flexWrap: "nowrap",
+              gap: "0.5rem",
+              paddingInline: "0.5rem",
+            }}
+          >
+            {tabs.map((tab, i) => (
+              <Tooltip
+                key={i}
+                label={tab.tooltip}
+                position="bottom"
+                withArrow
+                transitionProps={{ transition: "pop", duration: 200 }}
+              >
+                <TabsTab
+                  value={tab.value}
+                  leftSection={tab.icon}
+                  style={{
+                    fontWeight: 600,
+                    fontSize: "0.9rem",
+                    transition: "all 0.2s ease",
+                    flexShrink: 0,
+                  }}
+                >
+                  {tab.label}
+                </TabsTab>
+              </Tooltip>
+            ))}
+          </TabsList>
+        </ScrollArea>
+
+        {tabs.map((tab, i) => (
+          <TabsPanel
+            key={i}
+            value={tab.value}
+            style={{
+              padding: "1.5rem",
+              background: "linear-gradient(180deg, #ffffff, #f5f6fa)",
+              borderRadius: "1rem",
+              boxShadow: "0 4px 16px rgba(0,0,0,0.05)",
+            }}
+          >
             {children}
-        </Stack>
-    );
+          </TabsPanel>
+        ))}
+      </Tabs>
+    </Stack>
+  );
 }
 
-export default LayoutTabs;
+export default LayoutTabs;

src/app/admin/(dashboard)/ekonomi/pasar-desa/kategori-produk/[id]/page.tsx

@@ -5,7 +5,17 @@ import { useParams, useRouter } from 'next/navigation';
 import { useProxy } from 'valtio/utils';
 import pasarDesaState from '../../../../_state/ekonomi/pasar-desa/pasar-desa';
 import colors from '@/con/colors';
-import { Box, Button, Paper, Stack, Title, TextInput, Group, Text } from '@mantine/core';
+import {
+  Box,
+  Button,
+  Group,
+  Paper,
+  Stack,
+  Title,
+  TextInput,
+  Tooltip,
+  Text,
+} from '@mantine/core';
 import { IconArrowBack } from '@tabler/icons-react';
 import { toast } from 'react-toastify';
 
@@ -16,7 +26,7 @@ function EditKategoriProduk() {
   const statePasar = useProxy(pasarDesaState.kategoriProduk);
 
   const [formData, setFormData] = useState({
-    nama: "",
+    nama: '',
   });
 
   useEffect(() => {
@@ -34,8 +44,8 @@ function EditKategoriProduk() {
           });
         }
       } catch (error) {
-        console.error("Error loading kategori produk:", error);
-        toast.error("Gagal memuat data kategori produk");
+        console.error('Error loading kategori produk:', error);
+        toast.error('Gagal memuat data kategori produk');
       }
     };
 
@@ -53,7 +63,6 @@ function EditKategoriProduk() {
         nama: formData.nama.trim(),
       };
 
-      // Safety check tambahan: pastikan ID tidak kosong
       if (!statePasar.edit.id) {
         statePasar.edit.id = id; // fallback
       }
@@ -61,33 +70,60 @@ function EditKategoriProduk() {
       const success = await statePasar.edit.update();
 
       if (success) {
-        router.push("/admin/ekonomi/pasar-desa/kategori-produk");
+        toast.success('Kategori produk berhasil diperbarui!');
+        router.push('/admin/ekonomi/pasar-desa/kategori-produk');
       }
     } catch (error) {
-      console.error("Error updating kategori produk:", error);
-      // toast akan ditampilkan dari fungsi update
+      console.error('Error updating kategori produk:', error);
+      toast.error('Terjadi kesalahan saat memperbarui kategori produk');
     }
   };
 
   return (
-    <Box>
-      <Box mb={10}>
-        <Button onClick={() => router.back()} variant='subtle' color={'blue'}>
-          <IconArrowBack color={colors['blue-button']} size={25} />
-        </Button>
-      </Box>
+    <Box px={{ base: 'sm', md: 'lg' }} py="md">
+      {/* Header dengan tombol back */}
+      <Group mb="md">
+        <Tooltip label="Kembali ke halaman sebelumnya" withArrow>
+          <Button variant="subtle" onClick={() => router.back()} p="xs" radius="md">
+            <IconArrowBack color={colors['blue-button']} size={24} />
+          </Button>
+        </Tooltip>
+        <Title order={4} ml="sm" c="dark">
+          Edit Kategori Produk
+        </Title>
+      </Group>
 
-      <Paper w={{ base: '100%', md: '50%' }} bg={colors['white-1']} p={'md'}>
-        <Stack gap={"xs"}>
-          <Title order={4}>Edit Kategori Produk</Title>
+      {/* Card form */}
+      <Paper
+        w={{ base: '100%', md: '50%' }}
+        bg={colors['white-1']}
+        p="lg"
+        radius="md"
+        shadow="sm"
+        style={{ border: '1px solid #e0e0e0' }}
+      >
+        <Stack gap="md">
           <TextInput
+            label={<Text fw="bold" fz="sm">Nama Kategori Produk</Text>}
+            placeholder="Masukkan nama kategori produk"
             value={formData.nama}
             onChange={(e) => setFormData({ ...formData, nama: e.target.value })}
-            label={<Text fw={"bold"} fz={"sm"}>Nama Kategori Produk</Text>}
-            placeholder='Masukkan nama kategori produk'
+            required
           />
-          <Group>
-            <Button bg={colors['blue-button']} onClick={handleSubmit}>Submit</Button>
+
+          <Group justify="right">
+            <Button
+              onClick={handleSubmit}
+              radius="md"
+              size="md"
+              style={{
+                background: `linear-gradient(135deg, ${colors['blue-button']}, #4facfe)`,
+                color: '#fff',
+                boxShadow: '0 4px 15px rgba(79, 172, 254, 0.4)',
+              }}
+            >
+              Simpan
+            </Button>
           </Group>
         </Stack>
       </Paper>

src/app/admin/(dashboard)/ekonomi/pasar-desa/kategori-produk/create/page.tsx

@@ -1,16 +1,26 @@
 /* eslint-disable react-hooks/exhaustive-deps */
-'use client'
-import React, { useEffect } from 'react';
+'use client';
+import colors from '@/con/colors';
+import {
+  Box,
+  Button,
+  Group,
+  Paper,
+  Stack,
+  TextInput,
+  Title,
+  Tooltip
+} from '@mantine/core';
+import { IconArrowBack } from '@tabler/icons-react';
 import { useRouter } from 'next/navigation';
+import { useEffect } from 'react';
+import { toast } from 'react-toastify';
 import { useProxy } from 'valtio/utils';
 import pasarDesaState from '../../../../_state/ekonomi/pasar-desa/pasar-desa';
-import colors from '@/con/colors';
-import { Box, Button, Paper, Stack, Title, TextInput, Group, Text } from '@mantine/core';
-import { IconArrowBack } from '@tabler/icons-react';
 
 function CreateKategoriProduk() {
   const router = useRouter();
-  const statePasar = useProxy(pasarDesaState.kategoriProduk)
+  const statePasar = useProxy(pasarDesaState.kategoriProduk);
 
   useEffect(() => {
     statePasar.findMany.load();
@@ -18,42 +28,73 @@ function CreateKategoriProduk() {
 
   const resetForm = () => {
     statePasar.create.form = {
-      nama: "",
+      nama: '',
     };
-  }
+  };
 
   const handleSubmit = async () => {
+    if (!statePasar.create.form.nama) {
+      return toast.warn('Nama kategori produk wajib diisi');
+    }
+
     await statePasar.create.create();
     resetForm();
-    router.push("/admin/ekonomi/pasar-desa/kategori-produk")
-  }
+    router.push('/admin/ekonomi/pasar-desa/kategori-produk');
+  };
 
   return (
-    <Box>
-      <Box>
-        <Box mb={10}>
-          <Button onClick={() => router.back()} variant='subtle' color={'blue'}>
-            <IconArrowBack color={colors['blue-button']} size={25} />
+    <Box px={{ base: 'sm', md: 'lg' }} py="md">
+      {/* Header dengan tombol kembali */}
+      <Group mb="md">
+        <Tooltip label="Kembali ke halaman sebelumnya" withArrow>
+          <Button
+            variant="subtle"
+            onClick={() => router.back()}
+            p="xs"
+            radius="md"
+          >
+            <IconArrowBack color={colors['blue-button']} size={24} />
           </Button>
-        </Box>
+        </Tooltip>
+        <Title order={4} ml="sm" c="dark">
+          Tambah Kategori Produk
+        </Title>
+      </Group>
 
-        <Paper w={{ base: '100%', md: '50%' }} bg={colors['white-1']} p={'md'}>
-          <Stack gap={"xs"}>
-            <Title order={4}>Create Kategori Produk</Title>
-            <TextInput
-              value={statePasar.create.form.nama}
-              onChange={(val) => {
-                statePasar.create.form.nama = val.target.value;
+      {/* Card form */}
+      <Paper
+        w={{ base: '100%', md: '50%' }}
+        bg={colors['white-1']}
+        p="lg"
+        radius="md"
+        shadow="sm"
+        style={{ border: '1px solid #e0e0e0' }}
+      >
+        <Stack gap="md">
+          <TextInput
+            label="Nama Kategori Produk"
+            placeholder="Masukkan nama kategori produk"
+            value={statePasar.create.form.nama || ''}
+            onChange={(e) => (statePasar.create.form.nama = e.target.value)}
+            required
+          />
+
+          <Group justify="right">
+            <Button
+              onClick={handleSubmit}
+              radius="md"
+              size="md"
+              style={{
+                background: `linear-gradient(135deg, ${colors['blue-button']}, #4facfe)`,
+                color: '#fff',
+                boxShadow: '0 4px 15px rgba(79, 172, 254, 0.4)',
               }}
-              label={<Text fw={"bold"} fz={"sm"}>Nama Kategori Produk</Text>}
-              placeholder='Masukkan nama kategori produk'
-            />
-            <Group>
-              <Button bg={colors['blue-button']} onClick={handleSubmit}>Submit</Button>
-            </Group>
-          </Stack>
-        </Paper>
-      </Box>
+            >
+              Simpan
+            </Button>
+          </Group>
+        </Stack>
+      </Paper>
     </Box>
   );
 }

src/app/admin/(dashboard)/ekonomi/pasar-desa/kategori-produk/page.tsx

@@ -1,38 +1,36 @@
 'use client'
 import colors from '@/con/colors';
-import { Box, Button, Center, Pagination, Paper, Skeleton, Stack, Table, TableTbody, TableTd, TableTh, TableThead, TableTr } from '@mantine/core';
+import { Box, Button, Center, Group, Pagination, Paper, Skeleton, Stack, Table, TableTbody, TableTd, TableTh, TableThead, TableTr, Text, Title, Tooltip } from '@mantine/core';
 import { useShallowEffect } from '@mantine/hooks';
-import { IconEdit, IconSearch, IconX } from '@tabler/icons-react';
+import { IconEdit, IconPlus, IconSearch, IconX } from '@tabler/icons-react';
 import { useRouter } from 'next/navigation';
 import { useState } from 'react';
 import { useProxy } from 'valtio/utils';
 import HeaderSearch from '../../../_com/header';
-import JudulList from '../../../_com/judulList';
 import { ModalKonfirmasiHapus } from '../../../_com/modalKonfirmasiHapus';
 import pasarDesaState from '../../../_state/ekonomi/pasar-desa/pasar-desa';
 
 
-function PasarDesa() {
+function KategoriProduk() {
   const [search2, setSearch2] = useState("")
   return (
     <Box>
       <HeaderSearch
         title='Kategori Produk'
-        placeholder='pencarian'
+        placeholder='Cari nama kategori produk...'
         searchIcon={<IconSearch size={20} />}
         value={search2}
         onChange={(e) => setSearch2(e.currentTarget.value)}
       />
-      <ListPasarDesa search2={search2} />
+      <ListKategoriProduk search2={search2} />
     </Box>
   );
 }
 
-function ListPasarDesa({ search2 }: { search2: string }) {
+function ListKategoriProduk({ search2 }: { search2: string }) {
   const statePasar = useProxy(pasarDesaState.kategoriProduk)
   const [modalHapus, setModalHapus] = useState(false)
   const [selectedId, setSelectedId] = useState<string | null>(null)
-  // const params = useParams()
   const router = useRouter()
 
   const {
@@ -60,56 +58,102 @@ function ListPasarDesa({ search2 }: { search2: string }) {
   if (loading || !data) {
     return (
       <Stack py={10}>
-        <Skeleton h={500} />
+        <Skeleton height={500} radius="md" />
       </Stack>
     )
   }
 
   return (
     <Box py={10}>
-      <Paper bg={colors['white-1']} p={'md'}>
-        <JudulList
-          title='List Produk Pasar Desa'
-          href='/admin/ekonomi/pasar-desa/kategori-produk/create'
-        />
-        <Table striped withTableBorder withRowBorders>
-          <TableThead>
-            <TableTr>
-              <TableTh>Nama Kategori</TableTh>
-              <TableTh>Edit</TableTh>
-              <TableTh>Delete</TableTh>
-            </TableTr>
-          </TableThead>
-          <TableTbody>
-            {filteredData.map((item) => (
-              <TableTr key={item.id}>
-                <TableTd>{item.nama}</TableTd>
-                <TableTd>
-                  <Button color="green" onClick={() => router.push(`/admin/ekonomi/pasar-desa/kategori-produk/${item.id}`)}>
-                    <IconEdit size={20} />
-                  </Button>
-                </TableTd>
-                <TableTd>
-                  <Button color="red" onClick={() => {
-                    setSelectedId(item.id)
-                    setModalHapus(true)
-                  }}>
-                    <IconX size={20} />
-                  </Button>
-                </TableTd>
+      <Paper withBorder bg={colors['white-1']} p="lg" shadow="md" radius="md">
+        <Group justify="space-between" mb="md">
+          <Title order={4}>Daftar Kategori Produk</Title>
+          <Tooltip label="Tambah Kategori Produk" withArrow>
+            <Button
+              leftSection={<IconPlus size={18} />}
+              color="blue"
+              variant="light"
+              onClick={() => router.push('/admin/ekonomi/pasar-desa/kategori-produk/create')}
+            >
+              Tambah Baru
+            </Button>
+          </Tooltip>
+        </Group>
+
+        <Box style={{ overflowX: 'auto' }}>
+          <Table highlightOnHover>
+            <TableThead>
+              <TableTr>
+                <TableTh style={{ width: '60%' }}>Nama Kategori</TableTh>
+                <TableTh style={{ width: '20%' }}>Edit</TableTh>
+                <TableTh style={{ width: '20%' }}>Delete</TableTh>
               </TableTr>
-            ))}
-          </TableTbody>
-        </Table>
+            </TableThead>
+            <TableTbody>
+              {filteredData.length > 0 ? (
+                filteredData.map((item) => (
+                  <TableTr key={item.id}>
+                    <TableTd>
+                      <Text fw={500} truncate="end" lineClamp={1}>
+                        {item.nama}
+                      </Text>
+                    </TableTd>
+                    <TableTd>
+                      <Tooltip label="Edit Kategori Produk" withArrow>
+                        <Button
+                          color="green"
+                          variant="light"
+                          onClick={() => router.push(`/admin/ekonomi/pasar-desa/kategori-produk/${item.id}`)}
+                        >
+                          <IconEdit size={18} />
+                        </Button>
+                      </Tooltip>
+                    </TableTd>
+                    <TableTd>
+                      <Tooltip label="Hapus Kategori Produk" withArrow>
+                        <Button
+                          color="red"
+                          variant="light"
+                          onClick={() => {
+                            setSelectedId(item.id)
+                            setModalHapus(true)
+                          }}
+                        >
+                          <IconX size={18} />
+                        </Button>
+                      </Tooltip>
+                    </TableTd>
+                  </TableTr>
+                ))
+              ) : (
+                <TableTr>
+                  <TableTd colSpan={3}>
+                    <Center py={20}>
+                      <Text color="dimmed">Tidak ada data kategori produk yang cocok</Text>
+                    </Center>
+                  </TableTd>
+                </TableTr>
+              )}
+            </TableTbody>
+          </Table>
+        </Box>
       </Paper>
+
       <Center>
         <Pagination
           value={page}
-          onChange={(newPage) => load(newPage)}
+          onChange={(newPage) => {
+            load(newPage, 10)
+            window.scrollTo({ top: 0, behavior: 'smooth' })
+          }}
           total={totalPages}
-          my={"md"}
+          mt="md"
+          mb="md"
+          color="blue"
+          radius="md"
         />
       </Center>
+
       {/* Modal Konfirmasi Hapus */}
       <ModalKonfirmasiHapus
         opened={modalHapus}
@@ -118,7 +162,7 @@ function ListPasarDesa({ search2 }: { search2: string }) {
         text='Apakah anda yakin ingin menghapus kategori produk ini?'
       />
     </Box>
-  );
+  )
 }
 
-export default PasarDesa;
+export default KategoriProduk;

src/app/admin/(dashboard)/ekonomi/pasar-desa/produk-pasar-desa/[id]/edit/page.tsx

@@ -1,10 +1,22 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable react-hooks/exhaustive-deps */
-'use client'
+'use client';
 import pasarDesaState from '@/app/admin/(dashboard)/_state/ekonomi/pasar-desa/pasar-desa';
 import colors from '@/con/colors';
 import ApiFetch from '@/lib/api-fetch';
-import { Box, Button, Group, Image, MultiSelect, Paper, Stack, Text, TextInput, Title } from '@mantine/core';
+import {
+  Box,
+  Button,
+  Group,
+  Image,
+  MultiSelect,
+  Paper,
+  Stack,
+  Text,
+  TextInput,
+  Title,
+  Tooltip,
+} from '@mantine/core';
 import { Dropzone } from '@mantine/dropzone';
 import { IconArrowBack, IconPhoto, IconUpload, IconX } from '@tabler/icons-react';
 import { useParams, useRouter } from 'next/navigation';
@@ -13,20 +25,20 @@ import { toast } from 'react-toastify';
 import { useProxy } from 'valtio/utils';
 
 function EditPasarDesa() {
-  const pasarState = useProxy(pasarDesaState)
+  const pasarState = useProxy(pasarDesaState);
   const router = useRouter();
   const params = useParams();
 
   const [previewImage, setPreviewImage] = useState<string | null>(null);
   const [file, setFile] = useState<File | null>(null);
   const [formData, setFormData] = useState({
-    nama: pasarState.pasarDesa.edit.form.nama || "",
+    nama: pasarState.pasarDesa.edit.form.nama || '',
     harga: pasarState.pasarDesa.edit.form.harga || 0,
-    alamatUsaha: pasarState.pasarDesa.edit.form.alamatUsaha || "",
-    imageId: pasarState.pasarDesa.edit.form.imageId || "",
+    alamatUsaha: pasarState.pasarDesa.edit.form.alamatUsaha || '',
+    imageId: pasarState.pasarDesa.edit.form.imageId || '',
     rating: pasarState.pasarDesa.edit.form.rating || 0,
     kategoriId: pasarState.pasarDesa.edit.form.kategoriId || [],
-  })
+  });
 
   useEffect(() => {
     pasarState.kategoriProduk.findMany.load();
@@ -38,184 +50,192 @@ function EditPasarDesa() {
         const data = await pasarState.pasarDesa.edit.load(id);
         if (data) {
           setFormData({
-            nama: data.nama || "",
+            nama: data.nama || '',
             harga: data.harga || 0,
-            alamatUsaha: data.alamatUsaha || "",
-            imageId: data.imageId || "",
+            alamatUsaha: data.alamatUsaha || '',
+            imageId: data.imageId || '',
             rating: data.rating || 0,
-            // Use the IDs from KategoriToPasar relationship
             kategoriId: data.KategoriToPasar?.map((k: any) => k.kategoriId) || [],
           });
-          // Tampilkan preview gambar
-          if (data.image?.link) {
-            setPreviewImage(data.image.link);
-          }
+          if (data.image?.link) setPreviewImage(data.image.link);
         }
       } catch (error) {
-        console.error("Error loading pasar desa:", error);
+        console.error('Error loading pasar desa:', error);
         toast.error(
-          error instanceof Error ? error.message : "Gagal mengambil data pasar desa"
+          error instanceof Error ? error.message : 'Gagal mengambil data pasar desa'
         );
       }
-    }
+    };
 
     loadPasarDesa();
   }, [params?.id]);
 
   const handleSubmit = async () => {
     try {
-      pasarState.pasarDesa.edit.form = {
-        ...pasarState.pasarDesa.edit.form,
-        nama: formData.nama,
-        harga: formData.harga,
-        alamatUsaha: formData.alamatUsaha,
-        imageId: formData.imageId,
-        rating: formData.rating,
-        kategoriId: formData.kategoriId,
-      }
+      pasarState.pasarDesa.edit.form = { ...pasarState.pasarDesa.edit.form, ...formData };
+
       if (file) {
         const res = await ApiFetch.api.fileStorage.create.post({ file, name: file.name });
         const uploaded = res.data?.data;
 
-        if (!uploaded?.id) {
-          return toast.error("Gagal upload gambar");
-        }
+        if (!uploaded?.id) return toast.error('Gagal upload gambar');
 
-        // Update imageId in global state
         pasarState.pasarDesa.edit.form.imageId = uploaded.id;
       }
 
       await pasarState.pasarDesa.edit.update();
-      toast.success("Tips Keamanan berhasil diperbarui!");
-      router.push("/admin/ekonomi/pasar-desa/produk-pasar-desa");
+      toast.success('Pasar desa berhasil diperbarui!');
+      router.push('/admin/ekonomi/pasar-desa/produk-pasar-desa');
     } catch (error) {
-      console.error("Error updating pasar desa:", error);
-      toast.error("Terjadi kesalahan saat memperbarui pasar desa");
+      console.error('Error updating pasar desa:', error);
+      toast.error('Terjadi kesalahan saat memperbarui pasar desa');
     }
   };
 
   return (
-    <Box>
-      <Box mb={10}>
-        <Button onClick={() => router.back()} variant='subtle' color={'blue'}>
-          <IconArrowBack color={colors['blue-button']} size={25} />
-        </Button>
-      </Box>
+    <Box px={{ base: 'sm', md: 'lg' }} py="md">
+      <Group mb="md">
+        <Tooltip label="Kembali ke halaman sebelumnya" withArrow>
+          <Button variant="subtle" onClick={() => router.back()} p="xs" radius="md">
+            <IconArrowBack color={colors['blue-button']} size={24} />
+          </Button>
+        </Tooltip>
+        <Title order={4} ml="sm" c="dark">
+          Edit Pasar Desa
+        </Title>
+      </Group>
 
-      <Paper w={{ base: '100%', md: '50%' }} bg={colors['white-1']} p={'md'}>
-        <Stack gap={"xs"}>
-          <Title order={4}>Edit Pasar Desa</Title>
+      <Paper
+        w={{ base: '100%', md: '50%' }}
+        bg={colors['white-1']}
+        p="lg"
+        radius="md"
+        shadow="sm"
+        style={{ border: '1px solid #e0e0e0' }}
+      >
+        <Stack gap="md">
           <Box>
-            <Text fz={"md"} fw={"bold"}>Gambar</Text>
-            <Box>
-              <Dropzone
-                onDrop={(files) => {
-                  const selectedFile = files[0]; // Ambil file pertama
-                  if (selectedFile) {
-                    setFile(selectedFile);
-                    setPreviewImage(URL.createObjectURL(selectedFile)); // Buat preview
-                  }
-                }}
-                onReject={() => toast.error('File tidak valid.')}
-                maxSize={5 * 1024 ** 2} // Maks 5MB
-                accept={{ 'image/*': [] }}
-              >
-                <Group justify="center" gap="xl" mih={220} style={{ pointerEvents: 'none' }}>
-                  <Dropzone.Accept>
-                    <IconUpload size={52} color="var(--mantine-color-blue-6)" stroke={1.5} />
-                  </Dropzone.Accept>
-                  <Dropzone.Reject>
-                    <IconX size={52} color="var(--mantine-color-red-6)" stroke={1.5} />
-                  </Dropzone.Reject>
-                  <Dropzone.Idle>
-                    <IconPhoto size={52} color="var(--mantine-color-dimmed)" stroke={1.5} />
-                  </Dropzone.Idle>
+            <Text fw="bold" fz="sm" mb={6}>
+              Gambar Produk
+            </Text>
+            <Dropzone
+              onDrop={(files) => {
+                const selectedFile = files[0];
+                if (selectedFile) {
+                  setFile(selectedFile);
+                  setPreviewImage(URL.createObjectURL(selectedFile));
+                }
+              }}
+              onReject={() => toast.error('File tidak valid, gunakan format gambar')}
+              maxSize={5 * 1024 ** 2}
+              accept={{ 'image/*': [] }}
+              radius="md"
+              p="xl"
+            >
+              <Group justify="center" gap="xl" mih={180}>
+                <Dropzone.Accept>
+                  <IconUpload size={48} color={colors['blue-button']} stroke={1.5} />
+                </Dropzone.Accept>
+                <Dropzone.Reject>
+                  <IconX size={48} color="red" stroke={1.5} />
+                </Dropzone.Reject>
+                <Dropzone.Idle>
+                  <IconPhoto size={48} color="#868e96" stroke={1.5} />
+                </Dropzone.Idle>
+                <Stack gap="xs" align="center">
+                  <Text size="md" fw={500}>
+                    Seret gambar atau klik untuk memilih file
+                  </Text>
+                  <Text size="sm" c="dimmed">
+                    Maksimal 5MB, format gambar wajib
+                  </Text>
+                </Stack>
+              </Group>
+            </Dropzone>
 
-                  <div>
-                    <Text size="xl" inline>
-                      Drag gambar ke sini atau klik untuk pilih file
-                    </Text>
-                    <Text size="sm" c="dimmed" inline mt={7}>
-                      Maksimal 5MB dan harus format gambar
-                    </Text>
-                  </div>
-                </Group>
-              </Dropzone>
-
-              {/* Tampilkan preview kalau ada */}
-              {previewImage && (
-                <Box mt="sm">
-                  <Image
-                    src={previewImage}
-                    alt="Preview"
-                    style={{
-                      maxWidth: '100%',
-                      maxHeight: '200px',
-                      objectFit: 'contain',
-                      borderRadius: '8px',
-                      border: '1px solid #ddd',
-                    }}
-                  />
-                </Box>
-              )}
-
-            </Box>
+            {previewImage && (
+              <Box mt="sm" style={{ display: 'flex', justifyContent: 'center' }}>
+                <Image
+                  src={previewImage}
+                  alt="Preview Gambar"
+                  radius="md"
+                  style={{
+                    maxHeight: 220,
+                    objectFit: 'contain',
+                    border: `1px solid ${colors['blue-button']}`,
+                  }}
+                />
+              </Box>
+            )}
           </Box>
+
           <TextInput
+            label="Nama Produk"
+            placeholder="Masukkan nama produk"
             value={formData.nama}
             onChange={(e) => setFormData({ ...formData, nama: e.target.value })}
-            label={<Text fw={"bold"} fz={"sm"}>Nama Produk</Text>}
-            placeholder='Masukkan nama produk'
+            required
           />
+
           <TextInput
+            type="number"
+            label="Harga Produk"
+            placeholder="Masukkan harga produk"
             value={formData.harga}
             onChange={(e) => setFormData({ ...formData, harga: Number(e.target.value) })}
-            label={<Text fw={"bold"} fz={"sm"}>Harga Produk</Text>}
-            placeholder='Masukkan harga produk'
+            required
           />
+
           <TextInput
             type="number"
             min={0}
             max={5}
-            step={0.1} // bisa pakai 0.1 biar support desimal
+            step={0.1}
+            label="Rating Produk"
+            placeholder="Masukkan rating produk (0-5)"
             value={formData.rating}
             onChange={(e) => setFormData({ ...formData, rating: Number(e.target.value) })}
-            label={<Text fw={"bold"} fz={"sm"}>Rating Produk</Text>}
-            placeholder='Masukkan rating produk (0-5)'
+            required
           />
 
           <TextInput
+            label="Alamat Usaha"
+            placeholder="Masukkan alamat usaha"
             value={formData.alamatUsaha}
             onChange={(e) => setFormData({ ...formData, alamatUsaha: e.target.value })}
-            label={<Text fw={"bold"} fz={"sm"}>Alamat Usaha</Text>}
-            placeholder='Masukkan alamat usaha'
+            required
           />
 
-          <TextInput
-            value={formData.alamatUsaha}
-            onChange={(e) => setFormData({ ...formData, alamatUsaha: e.target.value })}
-            label={<Text fw={"bold"} fz={"sm"}>Alamat Usaha</Text>}
-            placeholder='Masukkan alamat usaha'
-          />
           <MultiSelect
+            label="Kategori Produk"
+            placeholder="Pilih kategori produk"
             value={formData.kategoriId}
             onChange={(val) => setFormData({ ...formData, kategoriId: val })}
-            label={<Text fw={"bold"} fz={"sm"}>Kategori Produk</Text>}
-            placeholder='Pilih kategori produk'
             data={
               pasarState.kategoriProduk.findMany.data?.map((v) => ({
-                value: v.id,  // Make sure this is using the ID
-                label: v.nama
+                value: v.id,
+                label: v.nama,
               })) || []
             }
             clearable
             searchable
             required
-            error={!formData.kategoriId.length ? "Pilih minimal satu kategori" : undefined}
+            error={!formData.kategoriId.length ? 'Pilih minimal satu kategori' : undefined}
           />
 
-          <Group>
-            <Button bg={colors['blue-button']} onClick={handleSubmit}>Submit</Button>
+          <Group justify="right">
+            <Button
+              onClick={handleSubmit}
+              radius="md"
+              size="md"
+              style={{
+                background: `linear-gradient(135deg, ${colors['blue-button']}, #4facfe)`,
+                color: '#fff',
+                boxShadow: '0 4px 15px rgba(79, 172, 254, 0.4)',
+              }}
+            >
+              Simpan
+            </Button>
           </Group>
         </Stack>
       </Paper>

src/app/admin/(dashboard)/ekonomi/pasar-desa/produk-pasar-desa/[id]/page.tsx

@@ -1,7 +1,7 @@
 'use client'
 import colors from '@/con/colors';
-import { Box, Button, Paper, Stack, Flex, Text, Image, Skeleton } from '@mantine/core';
-import { IconArrowBack, IconX, IconEdit } from '@tabler/icons-react';
+import { Box, Button, Paper, Stack, Text, Image, Skeleton, Group, Tooltip } from '@mantine/core';
+import { IconArrowBack, IconTrash, IconEdit } from '@tabler/icons-react';
 import { useRouter, useParams } from 'next/navigation';
 import React, { useState } from 'react';
 import { useProxy } from 'valtio/utils';
@@ -10,119 +10,150 @@ import { useShallowEffect } from '@mantine/hooks';
 import { ModalKonfirmasiHapus } from '@/app/admin/(dashboard)/_com/modalKonfirmasiHapus';
 
 function DetailPasarDesa() {
-  const statePasar = useProxy(pasarDesaState)
-  const [modalHapus, setModalHapus] = useState(false)
-  const [selectedId, setSelectedId] = useState<string | null>(null)
-  const params = useParams()
+  const statePasar = useProxy(pasarDesaState);
+  const [modalHapus, setModalHapus] = useState(false);
+  const [selectedId, setSelectedId] = useState<string | null>(null);
+  const params = useParams();
   const router = useRouter();
 
   useShallowEffect(() => {
-    statePasar.pasarDesa.findUnique.load(params?.id as string)
-  }, [])
+    statePasar.pasarDesa.findUnique.load(params?.id as string);
+  }, []);
 
   const handleHapus = () => {
     if (selectedId) {
-      statePasar.pasarDesa.delete.byId(selectedId)
-      setModalHapus(false)
-      setSelectedId(null)
-      router.push("/admin/ekonomi/pasar-desa/produk-pasar-desa")
+      statePasar.pasarDesa.delete.byId(selectedId);
+      setModalHapus(false);
+      setSelectedId(null);
+      router.push("/admin/ekonomi/pasar-desa/produk-pasar-desa");
     }
-  }
+  };
 
   if (!statePasar.pasarDesa.findUnique.data) {
     return (
       <Stack py={10}>
-        <Skeleton h={500} />
+        <Skeleton height={500} radius="md" />
       </Stack>
-    )
+    );
   }
 
+  const data = statePasar.pasarDesa.findUnique.data;
+
   return (
-    <Box>
-      <Box mb={10}>
-        <Button variant="subtle" onClick={() => router.back()}>
-          <IconArrowBack color={colors['blue-button']} size={25} />
-        </Button>
-      </Box>
-      <Paper w={{ base: "100%", md: "50%" }} bg={colors['white-1']} p={'md'}>
-        <Stack>
-          <Text fz={"xl"} fw={"bold"}>Detail Pasar Desa</Text>
-          <Paper bg={colors['BG-trans']} p={'md'}>
-            <Stack gap={"xs"}>
+    <Box py={10}>
+      <Button
+        variant="subtle"
+        onClick={() => router.back()}
+        leftSection={<IconArrowBack size={24} color={colors['blue-button']} />}
+        mb={15}
+      >
+        Kembali
+      </Button>
+
+      <Paper
+        withBorder
+        w={{ base: "100%", md: "60%" }}
+        bg={colors['white-1']}
+        p="lg"
+        radius="md"
+        shadow="sm"
+      >
+        <Stack gap="md">
+          <Text fz="2xl" fw="bold" c={colors['blue-button']}>
+            Detail Pasar Desa
+          </Text>
+
+          <Paper bg="#ECEEF8" p="md" radius="md" shadow="xs">
+            <Stack gap="sm">
               <Box>
-                <Text fz={"lg"} fw={"bold"}>Nama Produk</Text>
-                <Text fz={"lg"}>{statePasar.pasarDesa.findUnique.data?.nama}</Text>
+                <Text fz="lg" fw="bold">Nama Produk</Text>
+                <Text fz="md" c="dimmed">{data.nama || '-'}</Text>
               </Box>
+
               <Box>
-                <Text fz={"lg"} fw={"bold"}>Harga Produk</Text>
-                <Text fz={"lg"}>Rp.{statePasar.pasarDesa.findUnique.data?.harga}</Text>
+                <Text fz="lg" fw="bold">Harga Produk</Text>
+                <Text fz="md" c="dimmed">Rp. {data.harga || '-'}</Text>
               </Box>
+
               <Box>
-                <Text fz={"lg"} fw={"bold"}>Rating Produk</Text>
-                <Text fz={"lg"}>{statePasar.pasarDesa.findUnique.data?.rating}</Text>
+                <Text fz="lg" fw="bold">Rating Produk</Text>
+                <Text fz="md" c="dimmed">{data.rating || '-'}</Text>
               </Box>
+
               <Box>
-                <Text fz={"lg"} fw={"bold"}>Alamat Usaha</Text>
-                <Text fz={"lg"}>{statePasar.pasarDesa.findUnique.data?.alamatUsaha}</Text>
+                <Text fz="lg" fw="bold">Alamat Usaha</Text>
+                <Text fz="md" c="dimmed">{data.alamatUsaha || '-'}</Text>
               </Box>
+
               <Box>
-                <Text fz={"lg"} fw={"bold"}>Gambar</Text>
-                <Image src={statePasar.pasarDesa.findUnique.data?.image?.link} alt="gambar" />
+                <Text fz="lg" fw="bold">Gambar</Text>
+                {data.image?.link ? (
+                  <Image
+                    src={data.image.link}
+                    alt={data.nama || 'Gambar Produk'}
+                    w={120}
+                    h={120}
+                    radius="md"
+                    fit="cover"
+                  />
+                ) : (
+                  <Text fz="sm" c="dimmed">Tidak ada gambar</Text>
+                )}
               </Box>
+
               <Box>
-                <Text fz={"lg"} fw={"bold"}>Kategori</Text>
+                <Text fz="lg" fw="bold">Kategori</Text>
                 <Stack gap={4}>
-                  {statePasar.pasarDesa.findUnique.data?.KategoriToPasar &&
-                    statePasar.pasarDesa.findUnique.data.KategoriToPasar.length > 0 ? (
-                    statePasar.pasarDesa.findUnique.data.KategoriToPasar.map((kategori) => (
-                      <Text fz={"lg"} key={kategori.id}>
+                  {data.KategoriToPasar && data.KategoriToPasar.length > 0 ? (
+                    data.KategoriToPasar.map((kategori) => (
+                      <Text fz="md" c="dimmed" key={kategori.id}>
                         • {kategori.kategori.nama}
                       </Text>
                     ))
                   ) : (
-                    <Text fz={"lg"} c="dimmed">
-                      Tidak ada kategori
-                    </Text>
+                    <Text fz="sm" c="dimmed">Tidak ada kategori</Text>
                   )}
                 </Stack>
               </Box>
 
-              <Box>
-                <Flex gap={"xs"}>
+              <Group gap="sm">
+                <Tooltip label="Hapus Produk" withArrow position="top">
                   <Button
+                    color="red"
                     onClick={() => {
-                      if (statePasar.pasarDesa.findUnique.data) {
-                        setSelectedId(statePasar.pasarDesa.findUnique.data.id);
-                        setModalHapus(true);
-                      }
+                      setSelectedId(data.id);
+                      setModalHapus(true);
                     }}
-                    disabled={!statePasar.pasarDesa.findUnique.data}
-                    color="red">
-                    <IconX size={20} />
+                    variant="light"
+                    radius="md"
+                    size="md"
+                  >
+                    <IconTrash size={20} />
                   </Button>
+                </Tooltip>
+
+                <Tooltip label="Edit Produk" withArrow position="top">
                   <Button
-                    onClick={() => {
-                      if (statePasar.pasarDesa.findUnique.data) {
-                        router.push(`/admin/ekonomi/pasar-desa/produk-pasar-desa/${statePasar.pasarDesa.findUnique.data.id}/edit`);
-                      }
-                    }}
-                    disabled={!statePasar.pasarDesa.findUnique.data}
-                    color="green">
+                    color="green"
+                    onClick={() => router.push(`/admin/ekonomi/pasar-desa/produk-pasar-desa/${data.id}/edit`)}
+                    variant="light"
+                    radius="md"
+                    size="md"
+                  >
                     <IconEdit size={20} />
                   </Button>
-                </Flex>
-              </Box>
+                </Tooltip>
+              </Group>
             </Stack>
           </Paper>
         </Stack>
       </Paper>
 
-      {/* Modal Hapus */}
       <ModalKonfirmasiHapus
         opened={modalHapus}
         onClose={() => setModalHapus(false)}
         onConfirm={handleHapus}
-        text="Apakah anda yakin ingin menghapus produk ini?"
+        text="Apakah Anda yakin ingin menghapus produk ini?"
       />
     </Box>
   );

src/app/admin/(dashboard)/ekonomi/pasar-desa/produk-pasar-desa/create/page.tsx

@@ -1,8 +1,20 @@
 /* eslint-disable react-hooks/exhaustive-deps */
-'use client'
+'use client';
 import colors from '@/con/colors';
 import ApiFetch from '@/lib/api-fetch';
-import { Box, Button, Group, Image, MultiSelect, Paper, Stack, Text, TextInput, Title } from '@mantine/core';
+import {
+  Box,
+  Button,
+  Group,
+  Image,
+  MultiSelect,
+  Paper,
+  Stack,
+  Text,
+  TextInput,
+  Title,
+  Tooltip,
+} from '@mantine/core';
 import { Dropzone } from '@mantine/dropzone';
 import { IconArrowBack, IconPhoto, IconUpload, IconX } from '@tabler/icons-react';
 import { useRouter } from 'next/navigation';
@@ -11,9 +23,9 @@ import { toast } from 'react-toastify';
 import { useProxy } from 'valtio/utils';
 import pasarDesaState from '../../../../_state/ekonomi/pasar-desa/pasar-desa';
 
-function CreatePasarDesa() {
+export default function CreatePasarDesa() {
   const router = useRouter();
-  const statePasar = useProxy(pasarDesaState)
+  const statePasar = useProxy(pasarDesaState);
   const [previewImage, setPreviewImage] = useState<string | null>(null);
   const [file, setFile] = useState<File | null>(null);
 
@@ -23,170 +35,185 @@ function CreatePasarDesa() {
 
   const resetForm = () => {
     statePasar.pasarDesa.create.form = {
-      nama: "",
+      nama: '',
       harga: 0,
-      alamatUsaha: "",
-      imageId: "",
+      alamatUsaha: '',
+      imageId: '',
       rating: 0,
       kategoriId: [],
     };
     setPreviewImage(null);
     setFile(null);
   };
+
   const handleSubmit = async () => {
     if (!file) {
-      return toast.warn("Pilih file gambar terlebih dahulu");
+      return toast.warn('Silakan pilih file gambar terlebih dahulu');
     }
 
     const res = await ApiFetch.api.fileStorage.create.post({
       file,
       name: file.name,
-    })
+    });
 
     const uploaded = res.data?.data;
-
     if (!uploaded?.id) {
-      return toast.error("Gagal mengupload file");
+      return toast.error('Gagal mengunggah gambar, silakan coba lagi');
     }
 
     statePasar.pasarDesa.create.form.imageId = uploaded.id;
-
     await statePasar.pasarDesa.create.create();
 
     resetForm();
-    router.push("/admin/ekonomi/pasar-desa/produk-pasar-desa")
-  }
+    router.push('/admin/ekonomi/pasar-desa/produk-pasar-desa');
+  };
+
   return (
-    <Box>
-      <Box mb={10}>
-        <Button onClick={() => router.back()} variant='subtle' color={'blue'}>
-          <IconArrowBack color={colors['blue-button']} size={25} />
-        </Button>
-      </Box>
+    <Box px={{ base: 'sm', md: 'lg' }} py="md">
+      {/* Header dengan tombol kembali */}
+      <Group mb="md">
+        <Tooltip label="Kembali ke halaman sebelumnya" withArrow>
+          <Button variant="subtle" onClick={() => router.back()} p="xs" radius="md">
+            <IconArrowBack color={colors['blue-button']} size={24} />
+          </Button>
+        </Tooltip>
+        <Title order={4} ml="sm" c="dark">
+          Tambah Produk Pasar Desa
+        </Title>
+      </Group>
 
-      <Paper w={{ base: '100%', md: '50%' }} bg={colors['white-1']} p={'md'}>
-        <Stack gap={"xs"}>
-          <Title order={4}>Create Pasar Desa</Title>
+      {/* Card Form */}
+      <Paper
+        w={{ base: '100%', md: '50%' }}
+        bg={colors['white-1']}
+        p="lg"
+        radius="md"
+        shadow="sm"
+        style={{ border: '1px solid #e0e0e0' }}
+      >
+        <Stack gap="md">
+          {/* Upload Gambar */}
           <Box>
-            <Text fz={"md"} fw={"bold"}>Gambar</Text>
-            <Box>
-              <Dropzone
-                onDrop={(files) => {
-                  const selectedFile = files[0]; // Ambil file pertama
-                  if (selectedFile) {
-                    setFile(selectedFile);
-                    setPreviewImage(URL.createObjectURL(selectedFile)); // Buat preview
-                  }
-                }}
-                onReject={() => toast.error('File tidak valid.')}
-                maxSize={5 * 1024 ** 2} // Maks 5MB
-                accept={{ 'image/*': [] }}
-              >
-                <Group justify="center" gap="xl" mih={220} style={{ pointerEvents: 'none' }}>
-                  <Dropzone.Accept>
-                    <IconUpload size={52} color="var(--mantine-color-blue-6)" stroke={1.5} />
-                  </Dropzone.Accept>
-                  <Dropzone.Reject>
-                    <IconX size={52} color="var(--mantine-color-red-6)" stroke={1.5} />
-                  </Dropzone.Reject>
-                  <Dropzone.Idle>
-                    <IconPhoto size={52} color="var(--mantine-color-dimmed)" stroke={1.5} />
-                  </Dropzone.Idle>
+            <Text fw="bold" fz="sm" mb={6}>
+              Gambar Produk
+            </Text>
+            <Dropzone
+              onDrop={(files) => {
+                const selectedFile = files[0];
+                if (selectedFile) {
+                  setFile(selectedFile);
+                  setPreviewImage(URL.createObjectURL(selectedFile));
+                }
+              }}
+              onReject={() => toast.error('File tidak valid, gunakan format gambar')}
+              maxSize={5 * 1024 ** 2}
+              accept={{ 'image/*': [] }}
+              radius="md"
+              p="xl"
+            >
+              <Group justify="center" gap="xl" mih={180}>
+                <Dropzone.Accept>
+                  <IconUpload size={48} color="var(--mantine-color-blue-6)" stroke={1.5} />
+                </Dropzone.Accept>
+                <Dropzone.Reject>
+                  <IconX size={48} color="var(--mantine-color-red-6)" stroke={1.5} />
+                </Dropzone.Reject>
+                <Dropzone.Idle>
+                  <IconPhoto size={48} color="var(--mantine-color-dimmed)" stroke={1.5} />
+                </Dropzone.Idle>
+              </Group>
+              <Text ta="center" mt="sm" size="sm" color="dimmed">
+                Seret gambar atau klik untuk memilih file (maks 5MB)
+              </Text>
+            </Dropzone>
 
-                  <div>
-                    <Text size="xl" inline>
-                      Drag gambar ke sini atau klik untuk pilih file
-                    </Text>
-                    <Text size="sm" c="dimmed" inline mt={7}>
-                      Maksimal 5MB dan harus format gambar
-                    </Text>
-                  </div>
-                </Group>
-              </Dropzone>
-
-              {/* Tampilkan preview kalau ada */}
-              {previewImage && (
-                <Box mt="sm">
-                  <Image
-                    src={previewImage}
-                    alt="Preview"
-                    style={{
-                      maxWidth: '100%',
-                      maxHeight: '200px',
-                      objectFit: 'contain',
-                      borderRadius: '8px',
-                      border: '1px solid #ddd',
-                    }}
-                  />
-                </Box>
-              )}
-
-            </Box>
+            {previewImage && (
+              <Box mt="sm" style={{ textAlign: 'center' }}>
+                <Image
+                  src={previewImage}
+                  alt="Preview Gambar"
+                  radius="md"
+                  style={{ maxHeight: 200, objectFit: 'contain', border: '1px solid #ddd' }}
+                />
+              </Box>
+            )}
           </Box>
+
+          {/* Nama Produk */}
           <TextInput
+            label="Nama Produk"
+            placeholder="Masukkan nama produk"
             value={statePasar.pasarDesa.create.form.nama}
-            onChange={(val) => {
-              statePasar.pasarDesa.create.form.nama = val.target.value;
-            }}
-            label={<Text fw={"bold"} fz={"sm"}>Nama Produk</Text>}
-            placeholder='Masukkan nama produk'
+            onChange={(e) => (statePasar.pasarDesa.create.form.nama = e.target.value)}
+            required
           />
+
+          {/* Harga Produk */}
           <TextInput
+            type="number"
+            label="Harga Produk"
+            placeholder="Masukkan harga produk"
             value={statePasar.pasarDesa.create.form.harga}
-            onChange={(val) => {
-              statePasar.pasarDesa.create.form.harga = Number(val.target.value);
-            }}
-            label={<Text fw={"bold"} fz={"sm"}>Harga Produk</Text>}
-            placeholder='Masukkan harga produk'
+            onChange={(e) => (statePasar.pasarDesa.create.form.harga = Number(e.target.value))}
+            required
           />
+
+          {/* Rating */}
           <TextInput
             type="number"
             min={0}
             max={5}
-            step={0.1} // bisa pakai 0.1 biar support desimal
+            step={0.1}
+            label="Rating Produk (0–5)"
+            placeholder="Masukkan rating produk"
             value={statePasar.pasarDesa.create.form.rating}
-            onChange={(val) => {
-              const value = Number(val.target.value);
-
-              // Validasi manual juga boleh (jaga-jaga)
+            onChange={(e) => {
+              const value = Number(e.target.value);
               if (value >= 0 && value <= 5) {
                 statePasar.pasarDesa.create.form.rating = value;
               }
             }}
-            label={<Text fw={"bold"} fz={"sm"}>Rating Produk</Text>}
-            placeholder='Masukkan rating produk (0-5)'
           />
 
+          {/* Alamat Usaha */}
           <TextInput
+            label="Alamat Usaha"
+            placeholder="Masukkan alamat usaha"
             value={statePasar.pasarDesa.create.form.alamatUsaha}
-            onChange={(val) => {
-              statePasar.pasarDesa.create.form.alamatUsaha = val.target.value;
-            }}
-            label={<Text fw={"bold"} fz={"sm"}>Alamat Usaha</Text>}
-            placeholder='Masukkan alamat usaha'
+            onChange={(e) => (statePasar.pasarDesa.create.form.alamatUsaha = e.target.value)}
           />
+
+          {/* Kategori Produk */}
           <MultiSelect
+            label="Kategori Produk"
+            placeholder="Pilih kategori produk"
             value={statePasar.pasarDesa.create.form.kategoriId}
-            onChange={(val) => {
-              statePasar.pasarDesa.create.form.kategoriId = val;
-            }}
-            label={<Text fw={"bold"} fz={"sm"}>Kategori Produk</Text>}
-            placeholder='Pilih kategori produk'
+            onChange={(val) => (statePasar.pasarDesa.create.form.kategoriId = val)}
             data={
               statePasar.kategoriProduk.findMany.data?.map((v) => ({
                 value: v.id,
-                label: v.nama
+                label: v.nama,
               })) || []
             }
           />
 
-          <Group>
-            <Button bg={colors['blue-button']} onClick={handleSubmit}>Submit</Button>
+          {/* Tombol Submit */}
+          <Group justify="right">
+            <Button
+              onClick={handleSubmit}
+              radius="md"
+              size="md"
+              style={{
+                background: `linear-gradient(135deg, ${colors['blue-button']}, #4facfe)`,
+                color: '#fff',
+                boxShadow: '0 4px 15px rgba(79, 172, 254, 0.4)',
+              }}
+            >
+              Simpan
+            </Button>
           </Group>
         </Stack>
       </Paper>
     </Box>
   );
 }
-
-export default CreatePasarDesa;

src/app/admin/(dashboard)/ekonomi/pasar-desa/produk-pasar-desa/page.tsx

@@ -1,22 +1,39 @@
 'use client'
 import colors from '@/con/colors';
-import { Box, Button, Center, Pagination, Paper, Skeleton, Stack, Table, TableTbody, TableTd, TableTh, TableThead, TableTr } from '@mantine/core';
-import { IconDeviceImac, IconSearch } from '@tabler/icons-react';
+import {
+  Box,
+  Button,
+  Center,
+  Group,
+  Pagination,
+  Paper,
+  Skeleton,
+  Stack,
+  Table,
+  TableTbody,
+  TableTd,
+  TableTh,
+  TableThead,
+  TableTr,
+  Text,
+  Title,
+  Tooltip
+} from '@mantine/core';
 import { useShallowEffect } from '@mantine/hooks';
+import { IconDeviceImac, IconPlus, IconSearch } from '@tabler/icons-react';
 import { useRouter } from 'next/navigation';
+import { useState } from 'react';
 import { useProxy } from 'valtio/utils';
 import HeaderSearch from '../../../_com/header';
-import JudulList from '../../../_com/judulList';
 import pasarDesaState from '../../../_state/ekonomi/pasar-desa/pasar-desa';
-import { useState } from 'react';
 
 function PasarDesa() {
   const [search, setSearch] = useState("");
   return (
     <Box>
       <HeaderSearch
-        title='Produk Pasar Desa'
-        placeholder='pencarian'
+        title="Produk Pasar Desa"
+        placeholder="Cari produk pasar desa..."
         searchIcon={<IconSearch size={20} />}
         value={search}
         onChange={(e) => setSearch(e.currentTarget.value)}
@@ -27,71 +44,119 @@ function PasarDesa() {
 }
 
 function ListPasarDesa({ search }: { search: string }) {
-  const statePasar = useProxy(pasarDesaState.pasarDesa)
+  const statePasar = useProxy(pasarDesaState.pasarDesa);
   const router = useRouter();
 
-  const {
-    data,
-    page,
-    totalPages,
-    loading,
-    load,
-  } = statePasar.findMany
+  const { data, page, totalPages, loading, load } = statePasar.findMany;
 
   useShallowEffect(() => {
-    load(page, 10, search)
-  }, [page, search])
+    load(page, 10, search);
+  }, [page, search]);
 
-  const filteredData = data || []
+  const filteredData = data || [];
 
   if (loading || !data) {
     return (
       <Stack py={10}>
-        <Skeleton h={500} />
+        <Skeleton height={600} radius="md" />
       </Stack>
-    )
+    );
   }
 
   return (
     <Box py={10}>
-      <Paper bg={colors['white-1']} p={'md'}>
-        <JudulList
-          title='List Produk Pasar Desa'
-          href='/admin/ekonomi/pasar-desa/produk-pasar-desa/create'
-        />
-        <Table striped withTableBorder withRowBorders>
-          <TableThead>
-            <TableTr>
-              <TableTh>Nama Produk</TableTh>
-              <TableTh>Harga Produk</TableTh>
-              <TableTh>Rating Produk</TableTh>
-              <TableTh>Alamat Usaha</TableTh>
-              <TableTh>Detail</TableTh>
-            </TableTr>
-          </TableThead>
-          <TableTbody>
-            {filteredData.map((item) => (
-              <TableTr key={item.id}>
-                <TableTd>{item.nama}</TableTd>
-                <TableTd>Rp.{item.harga}</TableTd>
-                <TableTd>{item.rating}</TableTd>
-                <TableTd>{item.alamatUsaha}</TableTd>
-                <TableTd>
-                  <Button onClick={() => router.push(`/admin/ekonomi/pasar-desa/produk-pasar-desa/${item.id}`)}>
-                    <IconDeviceImac size={20} />
-                  </Button>
-                </TableTd>
+      <Paper withBorder bg={colors['white-1']} p="lg" shadow="md" radius="md">
+        <Group justify="space-between" mb="md">
+          <Title order={4}>Daftar Produk Pasar Desa</Title>
+          <Tooltip label="Tambah Produk Baru" withArrow>
+            <Button
+              leftSection={<IconPlus size={18} />}
+              color="blue"
+              variant="light"
+              onClick={() =>
+                router.push('/admin/ekonomi/pasar-desa/produk-pasar-desa/create')
+              }
+            >
+              Tambah Baru
+            </Button>
+          </Tooltip>
+        </Group>
+
+        <Box style={{ overflowX: 'auto' }}>
+          <Table highlightOnHover>
+            <TableThead>
+              <TableTr>
+                <TableTh style={{ width: '25%' }}>Nama Produk</TableTh>
+                <TableTh style={{ width: '20%' }}>Harga Produk</TableTh>
+                <TableTh style={{ width: '15%' }}>Rating</TableTh>
+                <TableTh style={{ width: '25%' }}>Alamat Usaha</TableTh>
+                <TableTh style={{ width: '15%' }}>Aksi</TableTh>
               </TableTr>
-            ))}
-          </TableTbody>
-        </Table>
+            </TableThead>
+            <TableTbody>
+              {filteredData.length > 0 ? (
+                filteredData.map((item) => (
+                  <TableTr key={item.id}>
+                    <TableTd>
+                      <Text fw={500} truncate="end" lineClamp={1}>
+                        {item.nama}
+                      </Text>
+                    </TableTd>
+                    <TableTd>
+                      <Text>Rp.{item.harga}</Text>
+                    </TableTd>
+                    <TableTd>
+                      <Text>{item.rating || '-'}</Text>
+                    </TableTd>
+                    <TableTd>
+                      <Text truncate fz="sm" c="dimmed">
+                        {item.alamatUsaha || '-'}
+                      </Text>
+                    </TableTd>
+                    <TableTd>
+                      <Button
+                        variant="light"
+                        color="blue"
+                        onClick={() =>
+                          router.push(
+                            `/admin/ekonomi/pasar-desa/produk-pasar-desa/${item.id}`
+                          )
+                        }
+                      >
+                        <IconDeviceImac size={20} />
+                        <Text ml={5}>Detail</Text>
+                      </Button>
+                    </TableTd>
+                  </TableTr>
+                ))
+              ) : (
+                <TableTr>
+                  <TableTd colSpan={5}>
+                    <Center py={20}>
+                      <Text color="dimmed">
+                        Tidak ada produk pasar desa yang cocok
+                      </Text>
+                    </Center>
+                  </TableTd>
+                </TableTr>
+              )}
+            </TableTbody>
+          </Table>
+        </Box>
       </Paper>
+
       <Center>
         <Pagination
           value={page}
-          onChange={(newPage) => load(newPage)}
+          onChange={(newPage) => {
+            load(newPage, 10);
+            window.scrollTo({ top: 0, behavior: 'smooth' });
+          }}
           total={totalPages}
-          my={"md"}
+          mt="md"
+          mb="md"
+          color="blue"
+          radius="md"
         />
       </Center>
     </Box>

src/app/admin/(dashboard)/ekonomi/struktur-organisasi-dan-sk-pengurus-bumdesa/_lib/layoutTabs.tsx

@@ -1,67 +1,142 @@
 /* eslint-disable react-hooks/exhaustive-deps */
 'use client'
 import colors from '@/con/colors';
-import { Stack, Tabs, TabsList, TabsPanel, TabsTab, Title } from '@mantine/core';
+import {
+  Stack,
+  Tabs,
+  TabsList,
+  TabsPanel,
+  TabsTab,
+  Title,
+  Tooltip,
+  ScrollArea,
+} from '@mantine/core';
 import { usePathname, useRouter } from 'next/navigation';
 import React, { useEffect, useState } from 'react';
+import {
+  IconHierarchy,
+  IconUsers,
+  IconGitBranch,
+} from '@tabler/icons-react';
 
 function LayoutTabs({ children }: { children: React.ReactNode }) {
-  const router = useRouter()
-  const pathname = usePathname()
+  const router = useRouter();
+  const pathname = usePathname();
+
   const tabs = [
     {
       label: "Posisi Organisasi",
       value: "posisiorganisasi",
-      href: "/admin/ekonomi/Struktur-Organisasi-dan-SK-Pengurus-BUMDesa/posisi-organisasi"
+      href: "/admin/ekonomi/struktur-organisasi-dan-sk-pengurus-bumdesa/posisi-organisasi",
+      icon: <IconHierarchy size={18} stroke={1.8} />,
+      tooltip: "Kelola daftar posisi organisasi",
     },
     {
       label: "Pegawai",
       value: "pegawai",
-      href: "/admin/ekonomi/Struktur-Organisasi-dan-SK-Pengurus-BUMDesa/pegawai"
+      href: "/admin/ekonomi/struktur-organisasi-dan-sk-pengurus-bumdesa/pegawai",
+      icon: <IconUsers size={18} stroke={1.8} />,
+      tooltip: "Kelola data pegawai BUMDesa",
     },
     {
       label: "Hubungan Organisasi",
       value: "hubunganorganisasi",
-      href: "/admin/ekonomi/Struktur-Organisasi-dan-SK-Pengurus-BUMDesa/hubungan-organisasi"
+      href: "/admin/ekonomi/struktur-organisasi-dan-sk-pengurus-bumdesa/hubungan-organisasi",
+      icon: <IconGitBranch size={18} stroke={1.8} />,
+      tooltip: "Atur hubungan antar posisi organisasi",
     },
   ];
-  const curentTab = tabs.find(tab => tab.href === pathname)
-  const [activeTab, setActiveTab] = useState<string | null>(curentTab?.value || tabs[0].value);
+
+  const currentTab = tabs.find((tab) => tab.href === pathname);
+  const [activeTab, setActiveTab] = useState<string | null>(
+    currentTab?.value || tabs[0].value
+  );
 
   const handleTabChange = (value: string | null) => {
-    const tab = tabs.find(t => t.value === value)
+    const tab = tabs.find((t) => t.value === value);
     if (tab) {
-      router.push(tab.href)
+      router.push(tab.href);
     }
-    setActiveTab(value)
-  }
+    setActiveTab(value);
+  };
 
   useEffect(() => {
-    const match = tabs.find(tab => tab.href === pathname)
+    const match = tabs.find((tab) => tab.href === pathname);
     if (match) {
-      setActiveTab(match.value)
+      setActiveTab(match.value);
     }
-  }, [pathname])
+  }, [pathname]);
 
   return (
-    <Stack>
-      <Title order={3}>Struktur Organisasi & SK Pengurus BUMDesa</Title>
-      <Tabs color={colors['blue-button']} variant='pills' value={activeTab} onChange={handleTabChange}>
-        <TabsList p={"xs"} bg={"#BBC8E7FF"}>
-          {tabs.map((e, i) => (
-            <TabsTab key={i} value={e.value}>{e.label}</TabsTab>
-          ))}
-        </TabsList>
-        {tabs.map((e, i) => (
-          <TabsPanel key={i} value={e.value}>
-            {/* Konten dummy, bisa diganti tergantung routing */}
-            <></>
+    <Stack gap="lg">
+      <Title order={2} fw={700} style={{ color: "#1A1B1E" }}>
+        Struktur Organisasi & SK Pengurus BUMDesa
+      </Title>
+
+      <Tabs
+        color={colors["blue-button"]}
+        variant="pills"
+        value={activeTab}
+        onChange={handleTabChange}
+        radius="lg"
+        keepMounted={false}
+      >
+        {/* ✅ Scroll horizontal biar rapi kalau label panjang */}
+        <ScrollArea type="auto" offsetScrollbars>
+          <TabsList
+            p="sm"
+            style={{
+              background: "linear-gradient(135deg, #e7ebf7, #f9faff)",
+              borderRadius: "1rem",
+              boxShadow: "inset 0 0 10px rgba(0,0,0,0.05)",
+              display: "flex",
+              flexWrap: "nowrap",
+              gap: "0.5rem",
+              paddingInline: "0.5rem",
+            }}
+          >
+            {tabs.map((tab, i) => (
+              <Tooltip
+                key={i}
+                label={tab.tooltip}
+                position="bottom"
+                withArrow
+                transitionProps={{ transition: "pop", duration: 200 }}
+              >
+                <TabsTab
+                  value={tab.value}
+                  leftSection={tab.icon}
+                  style={{
+                    fontWeight: 600,
+                    fontSize: "0.9rem",
+                    transition: "all 0.2s ease",
+                    flexShrink: 0,
+                  }}
+                >
+                  {tab.label}
+                </TabsTab>
+              </Tooltip>
+            ))}
+          </TabsList>
+        </ScrollArea>
+
+        {tabs.map((tab, i) => (
+          <TabsPanel
+            key={i}
+            value={tab.value}
+            style={{
+              padding: "1.5rem",
+              background: "linear-gradient(180deg, #ffffff, #f5f6fa)",
+              borderRadius: "1rem",
+              boxShadow: "0 4px 16px rgba(0,0,0,0.05)",
+            }}
+          >
+            {children}
           </TabsPanel>
         ))}
       </Tabs>
-      {children}
     </Stack>
   );
 }
 
-export default LayoutTabs;
+export default LayoutTabs;

src/app/admin/(dashboard)/ekonomi/struktur-organisasi-dan-sk-pengurus-bumdesa/pegawai/[id]/edit/page.tsx

@@ -126,7 +126,7 @@ export default function EditPegawai() {
       const success = await stateOrganisasi.edit.submit();
 
       if (success) {
-        router.push("/admin/ekonomi/Struktur-Organisasi-dan-SK-Pengurus-BUMDesa/pegawai");
+        router.push("/admin/ekonomi/struktur-organisasi-dan-sk-pengurus-bumdesa/pegawai");
       }
     } catch (error) {
       console.error("Error updating pegawai:", error);

src/app/admin/(dashboard)/ekonomi/struktur-organisasi-dan-sk-pengurus-bumdesa/pegawai/[id]/page.tsx

@@ -25,7 +25,7 @@ function DetailPegawai() {
       statePegawai.delete.byId(selectedId)
       setModalHapus(false)
       setSelectedId(null)
-      router.push("/admin/ekonomi/Struktur-Organisasi-dan-SK-Pengurus-BUMDesa/pegawai")
+      router.push("/admin/ekonomi/struktur-organisasi-dan-sk-pengurus-bumdesa/pegawai")
     }
   }
 
@@ -120,7 +120,7 @@ function DetailPegawai() {
                   <Button
                     onClick={() => {
                       if (statePegawai.findUnique.data) {
-                        router.push(`/admin/ekonomi/Struktur-Organisasi-dan-SK-Pengurus-BUMDesa/pegawai/${statePegawai.findUnique.data.id}/edit`);
+                        router.push(`/admin/ekonomi/struktur-organisasi-dan-sk-pengurus-bumdesa/pegawai/${statePegawai.findUnique.data.id}/edit`);
                       }
                     }}
                     disabled={!statePegawai.findUnique.data}

src/app/admin/(dashboard)/ekonomi/struktur-organisasi-dan-sk-pengurus-bumdesa/pegawai/create/page.tsx

@@ -64,7 +64,7 @@ function CreatePegawai() {
       // Reset form dan redirect
       resetForm();
       toast.success("Data pegawai berhasil ditambahkan");
-      router.push("/admin/ekonomi/Struktur-Organisasi-dan-SK-Pengurus-BUMDesa/pegawai");
+      router.push("/admin/ekonomi/struktur-organisasi-dan-sk-pengurus-bumdesa/pegawai");
     } catch (error) {
       console.error("Error creating pegawai:", error);
       toast.error("Terjadi kesalahan saat menambahkan pegawai");

src/app/admin/(dashboard)/ekonomi/struktur-organisasi-dan-sk-pengurus-bumdesa/pegawai/page.tsx

@@ -78,7 +78,7 @@ function ListPegawai({ search }: { search: string }) {
       <Paper bg={colors['white-1']} p={'md'} h={{base: 770, md: 650}}>
         <JudulList
           title='List Pegawai'
-          href='/admin/ekonomi/Struktur-Organisasi-dan-SK-Pengurus-BUMDesa/pegawai/create'
+          href='/admin/ekonomi/struktur-organisasi-dan-sk-pengurus-bumdesa/pegawai/create'
         />
         <Box style={{ overflowX: "auto" }}>
           <Table striped withTableBorder withRowBorders>
@@ -131,7 +131,7 @@ function ListPegawai({ search }: { search: string }) {
                     </Group>
                   </TableTd>
                   <TableTd>
-                    <Button bg={"green"} onClick={() => router.push(`/admin/ekonomi/Struktur-Organisasi-dan-SK-Pengurus-BUMDesa/pegawai/${item.id}`)}>
+                    <Button bg={"green"} onClick={() => router.push(`/admin/ekonomi/struktur-organisasi-dan-sk-pengurus-bumdesa/pegawai/${item.id}`)}>
                       <IconDeviceImacCog size={25} />
                     </Button>
                   </TableTd>

src/app/admin/(dashboard)/ekonomi/struktur-organisasi-dan-sk-pengurus-bumdesa/posisi-organisasi/[id]/page.tsx

@@ -3,7 +3,17 @@
 import EditEditor from '@/app/admin/(dashboard)/_com/editEditor';
 import strukturorganisasiState from '@/app/admin/(dashboard)/_state/ekonomi/struktur-organisasi/struktur-organisasi';
 import colors from '@/con/colors';
-import { Box, Button, Group, Paper, Stack, Text, TextInput, Title } from '@mantine/core';
+import {
+  Box,
+  Button,
+  Group,
+  Paper,
+  Stack,
+  Text,
+  TextInput,
+  Title,
+  Tooltip,
+} from '@mantine/core';
 import { IconArrowBack } from '@tabler/icons-react';
 import { useParams, useRouter } from 'next/navigation';
 import { useEffect, useState } from 'react';
@@ -17,8 +27,8 @@ function EditPosisiOrganisasi() {
   const stateOrganisasi = useProxy(strukturorganisasiState.posisiOrganisasi);
 
   const [formData, setFormData] = useState({
-    nama: "",
-    deskripsi: "",
+    nama: '',
+    deskripsi: '',
     hierarki: 0,
   });
 
@@ -30,7 +40,6 @@ function EditPosisiOrganisasi() {
         const data = await stateOrganisasi.edit.load(id);
 
         if (data) {
-          // pastikan id-nya masuk ke state edit
           stateOrganisasi.edit.id = id;
           setFormData({
             nama: data.nama || '',
@@ -39,8 +48,8 @@ function EditPosisiOrganisasi() {
           });
         }
       } catch (error) {
-        console.error("Error loading posisi organisasi:", error);
-        toast.error("Gagal memuat data posisi organisasi");
+        console.error('Error loading posisi organisasi:', error);
+        toast.error('Gagal memuat data posisi organisasi');
       }
     };
 
@@ -60,7 +69,6 @@ function EditPosisiOrganisasi() {
         hierarki: formData.hierarki,
       };
 
-      // Safety check tambahan: pastikan ID tidak kosong
       if (!stateOrganisasi.edit.id) {
         stateOrganisasi.edit.id = id; // fallback
       }
@@ -68,45 +76,92 @@ function EditPosisiOrganisasi() {
       const success = await stateOrganisasi.edit.update();
 
       if (success) {
-        router.push("/admin/ekonomi/Struktur-Organisasi-dan-SK-Pengurus-BUMDesa/posisi-organisasi");
+        toast.success('Posisi organisasi berhasil diperbarui!');
+        router.push(
+          '/admin/ekonomi/struktur-organisasi-dan-sk-pengurus-bumdesa/posisi-organisasi'
+        );
       }
     } catch (error) {
-      console.error("Error updating posisi organisasi:", error);
-      // toast akan ditampilkan dari fungsi update
+      console.error('Error updating posisi organisasi:', error);
     }
   };
 
   return (
-    <Box>
-      <Box mb={10}>
-        <Button onClick={() => router.back()} variant='subtle' color={'blue'}>
-          <IconArrowBack color={colors['blue-button']} size={25} />
-        </Button>
-      </Box>
+    <Box px={{ base: 'sm', md: 'lg' }} py="md">
+      <Group mb="md">
+        <Tooltip label="Kembali ke halaman sebelumnya" withArrow>
+          <Button
+            variant="subtle"
+            onClick={() => router.back()}
+            p="xs"
+            radius="md"
+          >
+            <IconArrowBack color={colors['blue-button']} size={24} />
+          </Button>
+        </Tooltip>
+        <Title order={4} ml="sm" c="dark">
+          Edit Posisi Organisasi
+        </Title>
+      </Group>
 
-      <Paper w={{ base: '100%', md: '50%' }} bg={colors['white-1']} p={'md'}>
-        <Stack gap={"xs"}>
-          <Title order={4}>Edit Posisi Organisasi</Title>
+      <Paper
+        w={{ base: '100%', md: '50%' }}
+        bg={colors['white-1']}
+        p="lg"
+        radius="md"
+        shadow="sm"
+        style={{ border: '1px solid #e0e0e0' }}
+      >
+        <Stack gap="md">
           <TextInput
             value={formData.nama}
-            onChange={(e) => setFormData({ ...formData, nama: e.target.value })}
-            label={<Text fw={"bold"} fz={"sm"}>Nama Posisi Organisasi</Text>}
-            placeholder='Masukkan nama posisi organisasi'
-          />
-          <EditEditor
-            value={formData.deskripsi}
-            onChange={(htmlContent) => {
-              setFormData({ ...formData, deskripsi: htmlContent });
-            }}
+            onChange={(e) =>
+              setFormData({ ...formData, nama: e.target.value })
+            }
+            label="Nama Posisi Organisasi"
+            placeholder="Masukkan nama posisi organisasi"
+            required
           />
+
+          <Box>
+            <Text fz="sm" mb={6}>
+              Deskripsi
+            </Text>
+            <EditEditor
+              value={formData.deskripsi}
+              onChange={(htmlContent) =>
+                setFormData({ ...formData, deskripsi: htmlContent })
+              }
+            />
+          </Box>
+
           <TextInput
+            type="number"
             value={formData.hierarki}
-            onChange={(e) => setFormData({ ...formData, hierarki: parseInt(e.target.value) })}
-            label={<Text fw={"bold"} fz={"sm"}>Hierarki</Text>}
-            placeholder='Masukkan hierarki'
+            onChange={(e) =>
+              setFormData({
+                ...formData,
+                hierarki: parseInt(e.target.value) || 0,
+              })
+            }
+            label="Hierarki"
+            placeholder="Masukkan hierarki"
+            required
           />
-          <Group>
-            <Button bg={colors['blue-button']} onClick={handleSubmit}>Submit</Button>
+
+          <Group justify="right">
+            <Button
+              onClick={handleSubmit}
+              radius="md"
+              size="md"
+              style={{
+                background: `linear-gradient(135deg, ${colors['blue-button']}, #4facfe)`,
+                color: '#fff',
+                boxShadow: '0 4px 15px rgba(79, 172, 254, 0.4)',
+              }}
+            >
+              Simpan
+            </Button>
           </Group>
         </Stack>
       </Paper>

src/app/admin/(dashboard)/ekonomi/struktur-organisasi-dan-sk-pengurus-bumdesa/posisi-organisasi/create/page.tsx

@@ -1,9 +1,19 @@
 /* eslint-disable react-hooks/exhaustive-deps */
-'use client'
+'use client';
 import CreateEditor from '@/app/admin/(dashboard)/_com/createEditor';
 import strukturorganisasiState from '@/app/admin/(dashboard)/_state/ekonomi/struktur-organisasi/struktur-organisasi';
 import colors from '@/con/colors';
-import { Box, Button, Paper, Stack, TextInput, Title } from '@mantine/core';
+import {
+    Box,
+    Button,
+    Group,
+    Paper,
+    Stack,
+    Text,
+    TextInput,
+    Title,
+    Tooltip,
+} from '@mantine/core';
 import { IconArrowBack } from '@tabler/icons-react';
 import { useRouter } from 'next/navigation';
 import { useEffect } from 'react';
@@ -11,47 +21,75 @@ import { useProxy } from 'valtio/utils';
 
 function CreatePosisiOrganisasi() {
     const router = useRouter();
-    const stateOrganisasi = useProxy(strukturorganisasiState.posisiOrganisasi)
+    const stateOrganisasi = useProxy(strukturorganisasiState.posisiOrganisasi);
+
     useEffect(() => {
         stateOrganisasi.findMany.load();
     }, []);
 
     const resetForm = () => {
         stateOrganisasi.create.form = {
-            nama: "",
-            deskripsi: "",
-            hierarki: 0, // Initialize as 0 to allow any number input
+            nama: '',
+            deskripsi: '',
+            hierarki: 0,
         };
     };
 
     const handleSubmit = async () => {
         await stateOrganisasi.create.submit();
         resetForm();
-        router.push("/admin/ekonomi/Struktur-Organisasi-dan-SK-Pengurus-BUMDesa/posisi-organisasi")
+        router.push(
+            '/admin/ekonomi/struktur-organisasi-dan-sk-pengurus-bumdesa/posisi-organisasi'
+        );
     };
 
     return (
-        <Box>
-            <Box mb={10}>
-                <Button variant="subtle" onClick={() => router.back()}>
-                    <IconArrowBack color={colors['blue-button']} size={25} />
-                </Button>
-            </Box>
-            <Paper bg={colors["white-1"]} p={"md"} w={{ base: "100%", md: "50%" }}>
-                <Stack gap={"xs"}>
-                    <Title order={3}>Create Posisi Organisasi</Title>
+        <Box px={{ base: 'sm', md: 'lg' }} py="md">
+            {/* Header Back + Title */}
+            <Group mb="md">
+                <Tooltip label="Kembali ke halaman sebelumnya" withArrow>
+                    <Button
+                        variant="subtle"
+                        onClick={() => router.back()}
+                        p="xs"
+                        radius="md"
+                    >
+                        <IconArrowBack color={colors['blue-button']} size={24} />
+                    </Button>
+                </Tooltip>
+                <Title order={4} ml="sm" c="dark">
+                    Tambah Posisi Organisasi
+                </Title>
+            </Group>
+
+            {/* Form Card */}
+            <Paper
+                w={{ base: '100%', md: '50%' }}
+                bg={colors['white-1']}
+                p="lg"
+                radius="md"
+                shadow="sm"
+                style={{ border: '1px solid #e0e0e0' }}
+            >
+                <Stack gap="md">
                     <TextInput
                         label="Nama Posisi"
                         placeholder="Contoh: Kepala Desa"
                         value={stateOrganisasi.create.form.nama}
                         onChange={(e) => (stateOrganisasi.create.form.nama = e.currentTarget.value)}
+                        required
                     />
-                    <CreateEditor
-                        value={stateOrganisasi.create.form.deskripsi}
-                        onChange={(htmlContent) => {
-                            stateOrganisasi.create.form.deskripsi = htmlContent;
-                        }}
-                    />
+
+                    <Box>
+                        <Text fz={"sm"} mb={6}>Deskripsi</Text>
+                        <CreateEditor
+                            value={stateOrganisasi.create.form.deskripsi}
+                            onChange={(htmlContent) => {
+                                stateOrganisasi.create.form.deskripsi = htmlContent;
+                            }}
+                        />
+                    </Box>
+
                     <TextInput
                         label="Hierarki"
                         type="number"
@@ -63,13 +101,24 @@ function CreatePosisiOrganisasi() {
                                 stateOrganisasi.create.form.hierarki = value;
                             }
                         }}
+                        required
                     />
-                    <Button
-                        onClick={handleSubmit}
-                        color="blue"
-                    >
-                        Simpan
-                    </Button>
+
+                    {/* Action Button */}
+                    <Group justify="right">
+                        <Button
+                            onClick={handleSubmit}
+                            radius="md"
+                            size="md"
+                            style={{
+                                background: `linear-gradient(135deg, ${colors['blue-button']}, #4facfe)`,
+                                color: '#fff',
+                                boxShadow: '0 4px 15px rgba(79, 172, 254, 0.4)',
+                            }}
+                        >
+                            Simpan
+                        </Button>
+                    </Group>
                 </Stack>
             </Paper>
         </Box>

src/app/admin/(dashboard)/ekonomi/struktur-organisasi-dan-sk-pengurus-bumdesa/posisi-organisasi/page.tsx

@@ -1,13 +1,30 @@
-/* eslint-disable react-hooks/exhaustive-deps */
 'use client'
 import colors from '@/con/colors';
-import { Box, Button, Paper, Skeleton, Stack, Table, TableTbody, TableTd, TableTh, TableThead, TableTr, Text } from '@mantine/core';
-import { IconEdit, IconSearch, IconTrash } from '@tabler/icons-react';
+import {
+  Box,
+  Button,
+  Center,
+  Group,
+  Paper,
+  Pagination,
+  Skeleton,
+  Stack,
+  Table,
+  TableTbody,
+  TableTd,
+  TableTh,
+  TableThead,
+  TableTr,
+  Text,
+  Title,
+  Tooltip,
+} from '@mantine/core';
+import { IconEdit, IconPlus, IconSearch, IconTrash } from '@tabler/icons-react';
 import { useRouter } from 'next/navigation';
-import { useEffect, useState } from 'react';
+import { useShallowEffect } from '@mantine/hooks';
+import { useState } from 'react';
 import { useProxy } from 'valtio/utils';
 import HeaderSearch from '../../../_com/header';
-import JudulList from '../../../_com/judulList';
 import { ModalKonfirmasiHapus } from '../../../_com/modalKonfirmasiHapus';
 import strukturorganisasiState from '../../../_state/ekonomi/struktur-organisasi/struktur-organisasi';
 
@@ -15,108 +32,161 @@ function PosisiOrganisasi() {
   const [search, setSearch] = useState("");
   return (
     <Box>
+      {/* Search Bar */}
       <HeaderSearch
-        title='Posisi Organisasi'
-        placeholder='pencarian'
+        title="Posisi Organisasi"
+        placeholder="Cari nama, deskripsi, atau hierarki..."
         searchIcon={<IconSearch size={20} />}
         value={search}
         onChange={(e) => setSearch(e.currentTarget.value)}
       />
+
+      {/* List Table */}
       <ListPosisiOrganisasi search={search} />
     </Box>
   );
 }
 
 function ListPosisiOrganisasi({ search }: { search: string }) {
-  const stateOrganisasi = useProxy(strukturorganisasiState.posisiOrganisasi)
+  const stateOrganisasi = useProxy(strukturorganisasiState.posisiOrganisasi);
   const router = useRouter();
-  const [modalHapus, setModalHapus] = useState(false)
-  const [selectedId, setSelectedId] = useState<string | null>(null)
 
-  useEffect(() => {
-    stateOrganisasi.findMany.load()
-  }, [])
+  const [modalHapus, setModalHapus] = useState(false);
+  const [selectedId, setSelectedId] = useState<string | null>(null);
+
+  const {
+    data,
+    page,
+    totalPages,
+    loading,
+    load,
+  } = stateOrganisasi.findMany;
+
+  useShallowEffect(() => {
+    load(page, 10, search);
+  }, [page, search]);
+
+  const filteredData = data || [];
 
   const handleHapus = async () => {
     if (selectedId) {
       await stateOrganisasi.delete.byId(selectedId);
-      setModalHapus(false)
-      setSelectedId(null)
+      setModalHapus(false);
+      setSelectedId(null);
+      load(page, 10, search); // refresh
     }
-  }
+  };
 
-  const filteredData = (stateOrganisasi.findMany.data || []).filter(item => {
-    const keyword = search.toLowerCase();
-    return (
-      item.nama?.toLowerCase().includes(keyword) ||
-      item.deskripsi?.toLowerCase().includes(keyword) ||
-      item.hierarki?.toString().toLowerCase().includes(keyword)
-    );
-  });
-
-  if (!stateOrganisasi.findMany.data) {
+  if (loading || !data) {
     return (
       <Stack py={10}>
-        <Skeleton h={500} />
+        <Skeleton height={500} radius="md" />
       </Stack>
-    )
+    );
   }
 
   return (
     <Box py={10}>
-      <Paper bg={colors['white-1']} p={'md'}>
-        <JudulList
-          title='List Posisi Organisasi'
-          href='/admin/ekonomi/Struktur-Organisasi-dan-SK-Pengurus-BUMDesa/posisi-organisasi/create'
-        />
-        <Table striped withTableBorder withRowBorders>
-          <TableThead>
-            <TableTr>
-              <TableTh>Nama Posisi</TableTh>
-              <TableTh>Deskripsi</TableTh>
-              <TableTh>Hierarki</TableTh>
-              <TableTh>Edit</TableTh>
-              <TableTh>Hapus</TableTh>
-            </TableTr>
-          </TableThead>
-          <TableTbody>
-            {filteredData.map((item) => (
-              <TableTr key={item.id}>
-                <TableTd>{item.nama}</TableTd>
-                <TableTd>
-                  <Text truncate dangerouslySetInnerHTML={{ __html: item.deskripsi ?? "" }} />
-                </TableTd>
-                <TableTd>{item.hierarki}</TableTd>
-                <TableTd>
-                  <Button color="green" 
-                   onClick={() => {
-                    if (item) {
-                      router.push(`/admin/ekonomi/Struktur-Organisasi-dan-SK-Pengurus-BUMDesa/posisi-organisasi/${item.id}`);
-                    }
-                  }}
-                   >
-                    <IconEdit size={20} />
-                  </Button>
-                </TableTd>
-                <TableTd>
-                  <Button color="red"
-                    onClick={() => {
-                      if (item) {
-                        setSelectedId(item.id);
-                        setModalHapus(true);
-                      }
-                    }}
-                    disabled={!item}
+      <Paper withBorder bg={colors['white-1']} p="lg" shadow="md" radius="md">
+        <Group justify="space-between" mb="md">
+          <Title order={4}>Daftar Posisi Organisasi</Title>
+          <Tooltip label="Tambah Posisi Baru" withArrow>
+            <Button
+              leftSection={<IconPlus size={18} />}
+              color="blue"
+              variant="light"
+              onClick={() =>
+                router.push(
+                  '/admin/ekonomi/struktur-organisasi-dan-sk-pengurus-bumdesa/posisi-organisasi/create'
+                )
+              }
+            >
+              Tambah Baru
+            </Button>
+          </Tooltip>
+        </Group>
 
-                  >
-                    <IconTrash size={20} />
-                  </Button>
-                </TableTd>
+        <Box style={{ overflowX: 'auto' }}>
+          <Table highlightOnHover>
+            <TableThead>
+              <TableTr>
+                <TableTh style={{ width: '25%' }}>Nama Posisi</TableTh>
+                <TableTh style={{ width: '15%' }}>Hierarki</TableTh>
+                <TableTh style={{ width: '25%' }}>Edit</TableTh>
+                <TableTh style={{ width: '25%' }}>Hapus</TableTh>
               </TableTr>
-            ))}
-          </TableTbody>
-        </Table>
+            </TableThead>
+            <TableTbody>
+              {filteredData.length > 0 ? (
+                filteredData.map((item) => (
+                  <TableTr key={item.id}>
+                    <TableTd style={{ width: '25%' }}>
+                      <Text fw={500} truncate="end" lineClamp={1}>{item.nama}</Text>
+                    </TableTd>
+                    <TableTd style={{ width: '15%' }}>
+                      <Text fz="sm">{item.hierarki ?? '-'}</Text>
+                    </TableTd>
+                    <TableTd style={{ width: '25%' }}>
+                      <Tooltip label="Ubah Posisi Organisasi" withArrow>
+                        <Button
+                          variant="light"
+                          color="green"
+                          onClick={() =>
+                            router.push(
+                              `/admin/ekonomi/struktur-organisasi-dan-sk-pengurus-bumdesa/posisi-organisasi/${item.id}`
+                            )
+                          }
+                        >
+                          <IconEdit size={18} />
+                        </Button>
+                      </Tooltip>
+                    </TableTd>
+                    <TableTd style={{ width: '25%' }}>
+                      <Tooltip label="Hapus Posisi Organisasi" withArrow>
+                        <Button
+                          variant="light"
+                          color="red"
+                          onClick={() => {
+                            setSelectedId(item.id);
+                            setModalHapus(true);
+                          }}
+                        >
+                          <IconTrash size={18} />
+                        </Button>
+                      </Tooltip>
+                    </TableTd>
+                  </TableTr>
+                ))
+              ) : (
+                <TableTr>
+                  <TableTd colSpan={4}>
+                    <Center py={20}>
+                      <Text color="dimmed">Tidak ada data posisi organisasi yang cocok</Text>
+                    </Center>
+                  </TableTd>
+                </TableTr>
+              )}
+            </TableTbody>
+          </Table>
+        </Box>
       </Paper>
+
+      {/* Pagination */}
+      <Center>
+        <Pagination
+          value={page}
+          onChange={(newPage) => {
+            load(newPage, 10, search);
+            window.scrollTo({ top: 0, behavior: 'smooth' });
+          }}
+          total={totalPages}
+          mt="md"
+          mb="md"
+          color="blue"
+          radius="md"
+        />
+      </Center>
+
       {/* Modal Hapus */}
       <ModalKonfirmasiHapus
         opened={modalHapus}