Login & User Role - 1

2025-09-02 11:28:48 +08:00
1071 changed files with 36639 additions and 78554 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -41,9 +41,6 @@ next-env.d.ts
 # uploads
 /uploads

-# download
-/download
-
 # cache
 /cache

@@ -51,5 +48,3 @@ next-env.d.ts

 .env.*

-*.tar.gz
-
--- a/bun.lockb
+++ b/bun.lockb
--- a/next.config.ts
+++ b/next.config.ts
@@ -1,25 +1,49 @@
 import type { NextConfig } from "next";

 const nextConfig: NextConfig = {
-  experimental: {},
-  allowedDevOrigins: [
-    "http://192.168.1.82:3000", // buat akses dari HP/device lain
-    "http://localhost:3000",   // akses lokal
-  ],
  async headers() {
    return [
      {
-        source: '/assets/:path*', // Path ke folder gambar
+        source: '/assets/:path*',
        headers: [
          {
            key: 'Cache-Control',
-            value: 'public, max-age=3600, stale-while-revalidate=600', // Cache selama 1 jam, validasi ulang setelah 10 menit
+            value: 'public, max-age=3600, stale-while-revalidate=600',
+          },
+        ],
+      },
+      // Security headers
+      {
+        source: '/(.*)',
+        headers: [
+          {
+            key: 'X-Content-Type-Options',
+            value: 'nosniff',
+          },
+          {
+            key: 'X-Frame-Options',
+            value: 'DENY',
+          },
+          {
+            key: 'X-XSS-Protection',
+            value: '1; mode=block',
          },
        ],
      },
    ];
  },
-
+  // Enable React Strict Mode for development
+  reactStrictMode: true,
+  // Enable experimental features
+  experimental: {
+    serverActions: {
+      bodySizeLimit: '2mb',
+    },
+  },
+  // Configure images
+  images: {
+    domains: ['localhost'],
+  },
 };

 export default nextConfig;
--- a/package.json
+++ b/package.json
@@ -3,14 +3,17 @@
  "version": "0.1.5",
  "private": true,
  "scripts": {
-    "dev": "next dev",
+    "dev": "next dev --turbopack",
    "build": "next build",
-    "start": "next start"
+    "start": "next start",
+    "lint": "next lint",
+    "prisma:seed": "bun run prisma/seed.ts"
  },
  "prisma": {
    "seed": "bun run prisma/seed.ts"
  },
  "dependencies": {
+    "@auth/prisma-adapter": "^2.10.0",
    "@cubejs-client/core": "^0.31.0",
    "@elysiajs/cookie": "^0.8.0",
    "@elysiajs/cors": "^1.2.0",
@@ -19,7 +22,6 @@
    "@elysiajs/static": "^1.3.0",
    "@elysiajs/stream": "^1.1.0",
    "@elysiajs/swagger": "^1.2.0",
-    "@emotion/react": "^11.14.0",
    "@mantine/carousel": "^7.16.2",
    "@mantine/charts": "^7.17.1",
    "@mantine/core": "^7.17.4",
@@ -27,10 +29,10 @@
    "@mantine/dropzone": "^8.1.1",
    "@mantine/form": "^8.1.0",
    "@mantine/hooks": "^7.17.4",
-    "@mantine/modals": "^8.3.6",
    "@mantine/tiptap": "^7.17.4",
+    "@next-auth/prisma-adapter": "^1.0.7",
    "@paljs/types": "^8.1.0",
-    "@prisma/client": "^6.3.1",
+    "@prisma/client": "^6.15.0",
    "@tabler/icons-react": "^3.30.0",
    "@tiptap/extension-highlight": "^2.11.7",
    "@tiptap/extension-link": "^2.11.7",
@@ -41,32 +43,24 @@
    "@tiptap/pm": "^2.11.7",
    "@tiptap/react": "^2.11.7",
    "@tiptap/starter-kit": "^2.11.7",
-    "@types/adm-zip": "^0.5.7",
+    "@types/bcrypt": "^6.0.0",
    "@types/bun": "^1.2.2",
    "@types/leaflet": "^1.9.20",
    "@types/lodash": "^4.17.16",
-    "@types/nodemailer": "^7.0.2",
    "add": "^2.0.6",
-    "adm-zip": "^0.5.16",
    "animate.css": "^4.1.1",
+    "bcrypt": "^6.0.0",
    "bcryptjs": "^3.0.2",
    "bun": "^1.2.2",
    "chart.js": "^4.4.8",
    "classnames": "^2.5.1",
-    "colors": "^1.4.0",
-    "date-fns": "^4.1.0",
    "dayjs": "^1.11.13",
-    "dotenv": "^17.2.3",
    "elysia": "^1.3.5",
-    "embla-carousel": "^8.6.0",
-    "embla-carousel-autoplay": "^8.6.0",
-    "embla-carousel-react": "^8.6.0",
-    "extract-zip": "^2.0.1",
+    "embla-carousel-autoplay": "^8.5.2",
+    "embla-carousel-react": "^7.1.0",
    "form-data": "^4.0.2",
    "framer-motion": "^12.23.5",
    "get-port": "^7.1.0",
-    "iron-session": "^8.0.4",
-    "jose": "^6.1.0",
    "jotai": "^2.12.3",
    "jsonwebtoken": "^9.0.2",
    "leaflet": "^1.9.4",
@@ -74,37 +68,32 @@
    "lodash": "^4.17.21",
    "motion": "^12.4.1",
    "nanoid": "^5.1.5",
-    "next": "^15.5.2",
+    "next": "15.1.6",
+    "next-auth": "^4.24.11",
    "next-view-transitions": "^0.3.4",
    "node-fetch": "^3.3.2",
-    "nodemailer": "^7.0.10",
    "p-limit": "^6.2.0",
    "primeicons": "^7.0.0",
    "primereact": "^10.9.6",
    "prisma": "^6.3.1",
    "react": "^19.0.0",
    "react-dom": "^19.0.0",
-    "react-exif-orientation-img": "^0.1.5",
-    "react-international-phone": "^4.6.0",
    "react-leaflet": "^5.0.0",
    "react-simple-toasts": "^6.1.0",
    "react-toastify": "^11.0.5",
    "react-transition-group": "^4.4.5",
-    "react-zoom-pan-pinch": "^3.7.0",
    "readdirp": "^4.1.1",
    "recharts": "^2.15.3",
-    "sharp": "^0.34.3",
    "swr": "^2.3.2",
    "uuid": "^11.1.0",
    "valtio": "^2.1.3",
-    "zlib": "^1.0.5",
    "zod": "^3.24.3"
  },
  "devDependencies": {
    "@eslint/eslintrc": "^3",
    "@types/jsonwebtoken": "^9.0.10",
-    "@types/node": "^20",
-    "@types/react": "^19",
+    "@types/node": "^24.3.0",
+    "@types/react": "^19.1.12",
    "@types/react-dom": "^19",
    "eslint": "^9",
    "eslint-config-next": "15.1.6",
--- a/prisma/data/desa/layanan/pelayanaPendudukNonPermanen.json
+++ b/prisma/data/desa/layanan/pelayanaPendudukNonPermanen.json
@@ -1,6 +1,6 @@
 [
    {
-      "id": "edit",
+      "id": "1",
      "name": "Pelayanan Penduduk Non-Permanent",
      "deskripsi": "<p>Surat Keterangan Penduduk Non-Permanent adalah dokumen yang dikeluarkan oleh pihak berwenang untuk memberikan keterangan bahwa seseorang atau kelompok orang memiliki status penduduk non-permanent di suatu wilayah. Dokumen ini biasanya digunakan untuk keperluan administratif atau legal, seperti mendapatkan akses ke layanan kesehatan, pendidikan, atau pelayanan publik lainnya.</p>"
    }
--- a/prisma/data/desa/layanan/pelayananPerizinanBerusaha.json
+++ b/prisma/data/desa/layanan/pelayananPerizinanBerusaha.json
@@ -1,6 +1,6 @@
 [
    {
-      "id": "edit",
+      "id": "1",
      "name": "Pelayanan Perizinan Berusaha Berbasis Risiko Melalui Sistem ONLINE SINGLE SUBMISSION (OSS)",
      "deskripsi": "<p>Penyelenggaraan Perizinan Berusaha Berbasis Risiko melalui Sistem Online Single Submission (OSS) merupakan pelaksanaan Undang-Undang Nomor 11 Tahun 2020 Tentang Cipta Kerja. OSS Berbasis Risiko wajib digunakan oleh Pelaku Usaha, Kementerian/Lembaga, Pemerintah Daerah, Administrator Kawasan Ekonomi Khusus (KEK), dan Badan Pengusahaan Kawasan Perdagangan Bebas Pelabuhan Bebas (KPBPB).Berdasarkan Peraturan Pemerintah Nomor 5 Tahun 2021 terdapat 1.702 kegiatan usaha yang terdiri atas 1.349 Klasifikasi Baku Lapangan Usaha Indonesia (KBLI) yang sudah diimplementasikan dalam Sistem OSS Berbasis Risiko.</p>",
      "link" : "https://oss.go.id/"
--- a/prisma/data/ekonomi/jumlah-pengangguran/detail-data-pengangguran.json
+++ b/prisma/data/ekonomi/jumlah-pengangguran/detail-data-pengangguran.json
@@ -1,99 +1,51 @@
 [
-  {
-    "month": "Jan",
-    "year": 2025,
-    "totalUnemployment": 160,
-    "educatedUnemployment": 95,
-    "uneducatedUnemployment": 65,
-    "percentageChange": 0.0
-  },
-  {
-    "month": "Feb",
-    "year": 2025,
-    "totalUnemployment": 158,
-    "educatedUnemployment": 93,
-    "uneducatedUnemployment": 65,
-    "percentageChange": -1.25
-  },
-  {
-    "month": "Mar",
-    "year": 2025,
-    "totalUnemployment": 155,
-    "educatedUnemployment": 91,
-    "uneducatedUnemployment": 64,
-    "percentageChange": -1.90
-  },
-  {
-    "month": "Apr",
-    "year": 2025,
-    "totalUnemployment": 152,
-    "educatedUnemployment": 89,
-    "uneducatedUnemployment": 63,
-    "percentageChange": -1.94
-  },
-  {
-    "month": "Mei",
-    "year": 2025,
-    "totalUnemployment": 150,
-    "educatedUnemployment": 88,
-    "uneducatedUnemployment": 62,
-    "percentageChange": -1.32
-  },
-  {
-    "month": "Jun",
-    "year": 2025,
-    "totalUnemployment": 148,
-    "educatedUnemployment": 87,
-    "uneducatedUnemployment": 61,
-    "percentageChange": -1.33
-  },
-  {
-    "month": "Jul",
-    "year": 2025,
-    "totalUnemployment": 145,
-    "educatedUnemployment": 85,
-    "uneducatedUnemployment": 60,
-    "percentageChange": -2.03
-  },
-  {
-    "month": "Agu",
-    "year": 2025,
-    "totalUnemployment": 142,
-    "educatedUnemployment": 84,
-    "uneducatedUnemployment": 58,
-    "percentageChange": -2.07
-  },
-  {
-    "month": "Sep",
-    "year": 2025,
-    "totalUnemployment": 140,
-    "educatedUnemployment": 83,
-    "uneducatedUnemployment": 57,
-    "percentageChange": -1.41
-  },
-  {
-    "month": "Okt",
-    "year": 2025,
-    "totalUnemployment": 138,
-    "educatedUnemployment": 82,
-    "uneducatedUnemployment": 56,
-    "percentageChange": -1.43
-  },
-  {
-    "month": "Nov",
-    "year": 2025,
-    "totalUnemployment": 135,
-    "educatedUnemployment": 80,
-    "uneducatedUnemployment": 55,
-    "percentageChange": -2.17
-  },
-  {
-    "month": "Des",
-    "year": 2025,
-    "totalUnemployment": 132,
-    "educatedUnemployment": 78,
-    "uneducatedUnemployment": 54,
-    "percentageChange": -2.22
-  }
-]
+    {
+      "month": "Jan",
+      "year": 2025,
+      "totalUnemployment": 160,
+      "educatedUnemployment": 95,
+      "uneducatedUnemployment": 65,
+      "percentageChange": null
+    },
+    {
+      "month": "Feb",
+      "year": 2025,
+      "totalUnemployment": 155,
+      "educatedUnemployment": 90,
+      "uneducatedUnemployment": 65,
+      "percentageChange": -3.1
+    },
+    {
+      "month": "Mar",
+      "year": 2025,
+      "totalUnemployment": 150,
+      "educatedUnemployment": 88,
+      "uneducatedUnemployment": 62,
+      "percentageChange": -3.2
+    },
+    {
+      "month": "Apr",
+      "year": 2025,
+      "totalUnemployment": 148,
+      "educatedUnemployment": 85,
+      "uneducatedUnemployment": 63,
+      "percentageChange": -1.3
+    },
+    {
+      "month": "Mei",
+      "year": 2025,
+      "totalUnemployment": 145,
+      "educatedUnemployment": 82,
+      "uneducatedUnemployment": 63,
+      "percentageChange": -2.0
+    },
+    {
+      "month": "Jun",
+      "year": 2025,
+      "totalUnemployment": 140,
+      "educatedUnemployment": 80,
+      "uneducatedUnemployment": 60,
+      "percentageChange": -3.4
+    }
+  ]
  
--- a/prisma/data/ekonomi/struktur-organisasi/hubungan-organisasi.json
+++ b/prisma/data/ekonomi/struktur-organisasi/hubungan-organisasi.json
@@ -0,0 +1,8 @@
+[
+  {
+    "id": "650e8400-e29b-41d4-a716-446655440001",
+    "atasanId": "550e8400-e29b-41d4-a716-446655440001", 
+    "bawahanId": "550e8400-e29b-41d4-a716-446655440002",
+    "tipe": "Langsung Melapor"
+  }
+]
--- a/prisma/data/ekonomi/struktur-organisasi/pegawai-bumdes.json
+++ b/prisma/data/ekonomi/struktur-organisasi/pegawai-bumdes.json
@@ -1,91 +0,0 @@
-[
-  {
-    "id": "cmgewz4gt000704ib91i3f169",
-    "namaLengkap": "Ida Bagus Surya Prabhawa Manuaba, S.H.,M.H., NL.P.",
-    "gelarAkademik": "S.H.,M.H.,NL.P.",
-    "tanggalMasuk": "2020-01-01T00:00:00.000Z",
-    "email": "bagus@desa.id",
-    "telepon": "081234567891",
-    "alamat": "Jl. Raya Desa No. 1",
-    "posisiId": "kepala_desa",
-    "isActive": true
-  },
-  {
-    "id": "cmgewxfvw000004ibee5013f4",
-    "namaLengkap": "I Ketut Suwanta",
-    "gelarAkademik": "S.Pt",
-    "tanggalMasuk": "2020-02-01T00:00:00.000Z",
-    "email": "suwanta@desa.id",
-    "telepon": "081234567892",
-    "alamat": "Jl. Raya Desa No. 2",
-    "posisiId": "sekretaris_desa",
-    "isActive": true
-  },
-  {
-    "id": "cmgewxvqw000104ibgm5l8fzs",
-    "namaLengkap": "Ni Wayan Supardiati",
-    "gelarAkademik": "S.Pd",
-    "tanggalMasuk": "2020-02-01T00:00:00.000Z",
-    "email": "supardiati@desa.id",
-    "telepon": "081234567892",
-    "alamat": "Jl. Raya Desa No. 2",
-    "posisiId": "kaur_keuangan",
-    "isActive": true
-  },
-  {
-    "id": "cmgewy1g9000204ib2n7hbx0i",
-    "namaLengkap": "I Wayan Agus Juni Artha Saputra",
-    "gelarAkademik": "S.T.",
-    "tanggalMasuk": "2020-02-01T00:00:00.000Z",
-    "email": "agus@desa.id",
-    "telepon": "081234567892",
-    "alamat": "Jl. Raya Desa No. 2",
-    "posisiId": "kadus_banjar_dinas_menesa",
-    "isActive": true
-  },
-  {
-    "id": "cmgewybah000304ibgqhn1gm2",
-    "namaLengkap": "I Wayan Sueca",
-    "gelarAkademik": "S.H.",
-    "tanggalMasuk": "2020-02-01T00:00:00.000Z",
-    "email": "sueca@desa.id",
-    "telepon": "081234567893",
-    "alamat": "Jl. Raya Desa No. 2",
-    "posisiId": "kadus_banjar_dinas_darmasaba",
-    "isActive": true
-  },
-  {
-    "id": "cmgewygqz000404ib20sv8nvg",
-    "namaLengkap": "Si Gede Ketut Astawa",
-    "gelarAkademik": "S.T.",
-    "tanggalMasuk": "2020-02-01T00:00:00.000Z",
-    "email": "astawa@desa.id",
-    "telepon": "081234567893",
-    "alamat": "Jl. Raya Desa No. 2",
-    "posisiId": "kadus_banjar_dinas_bucu",
-    "isActive": true
-  },
-  {
-    "id": "cmgewyos1000504ibcu8o2gyk",
-    "namaLengkap": "I Kadek Arya Minarta",
-    "gelarAkademik": "S.T.",
-    "tanggalMasuk": "2020-02-01T00:00:00.000Z",
-    "email": "minarta@desa.id",
-    "telepon": "081234567893",
-    "alamat": "Jl. Raya Desa No. 2",
-    "posisiId": "kadus_banjar_dinas_gulingan",
-    "isActive": true
-  },
-  {
-    "id": "cmgewyxk7000604ib8djs3i6c",
-    "namaLengkap": "I Gede Andika Pradnya Diputra",
-    "gelarAkademik": "S.E.",
-    "tanggalMasuk": "2020-02-01T00:00:00.000Z",
-    "email": "diputra@desa.id",
-    "telepon": "081234567893",
-    "alamat": "Jl. Raya Desa No. 2",
-    "posisiId": "kadus_banjar_dinas_taman",
-    "isActive": true
-  }
-
-]
--- a/prisma/data/ekonomi/struktur-organisasi/pegawai.json
+++ b/prisma/data/ekonomi/struktur-organisasi/pegawai.json
@@ -0,0 +1,24 @@
+[
+    {
+      "id": "550e8400-e29b-41d4-a716-446655440001",
+      "namaLengkap": "Budi Santoso",
+      "gelarAkademik": "S.IP",
+      "tanggalMasuk": "2020-01-01T00:00:00.000Z",
+      "email": "budi@desa.id",
+      "telepon": "081234567891",
+      "alamat": "Jl. Raya Desa No. 1",
+      "posisiId": "kepala_desa",
+      "isActive": true
+    },
+    {
+      "id": "550e8400-e29b-41d4-a716-446655440002",
+      "namaLengkap": "Ani Lestari",
+      "gelarAkademik": "S.Pd",
+      "tanggalMasuk": "2020-02-01T00:00:00.000Z",
+      "email": "ani@desa.id",
+      "telepon": "081234567892",
+      "alamat": "Jl. Raya Desa No. 2",
+      "posisiId": "sekretaris_desa",
+      "isActive": true
+    }
+  ]
--- a/prisma/data/ekonomi/struktur-organisasi/posisi-organisasi-bumdes.json
+++ b/prisma/data/ekonomi/struktur-organisasi/posisi-organisasi-bumdes.json
@@ -1,159 +0,0 @@
-[
-    [
-      {
-        "id": "kepala_desa",
-        "nama": "Kepala Desa",
-        "deskripsi": "Pemimpin desa Darmasaba",
-        "hierarki": 1,
-        "parentId": null
-      },
-      {
-        "id": "kepala_urusan",
-        "nama": "Kepala Urusan",
-        "deskripsi": "Pemimpin urusan desa Darmasaba",
-        "hierarki": 2,
-        "parentId": "kepala_desa"
-      },
-      {
-        "id": "sekretaris_desa",
-        "nama": "Sekretaris Desa",
-        "deskripsi": "Pengelola administrasi desa",
-        "hierarki": 2,
-        "parentId": "kepala_desa"
-      },
-      {
-        "id": "kaur_keuangan",
-        "nama": "Kaur Keuangan",
-        "deskripsi": "Pengelola keuangan desa",
-        "hierarki": 3,
-        "parentId": "kaur_umum"
-      },
-      {
-        "id": "kaur_perencanaan",
-        "nama": "Kaur Perencanaan",
-        "deskripsi": "Penyusun program kerja desa",
-        "hierarki": 3,
-        "parentId": "kaur_umum"
-      },
-      {
-        "id": "kaur_umum",
-        "nama": "Kaur Umum & TU",
-        "deskripsi": "Pelayanan umum dan administrasi",
-        "hierarki": 2,
-        "parentId": "kepala_desa"
-      },
-      {
-        "id": "kasi_pemerintahan",
-        "nama": "Kasi Pemerintahan",
-        "deskripsi": "Urusan pemerintahan dan keamanan",
-        "hierarki": 2,
-        "parentId": "kepala_desa"
-      },
-      {
-        "id": "kasi_pelayanan",
-        "nama": "Kasi Pelayanan",
-        "deskripsi": "Urusan pelayanan masyarakat",
-        "hierarki": 2,
-        "parentId": "kepala_desa"
-      },
-      {
-        "id": "kasi_kesejahteraan",
-        "nama": "Kasi Kesejahteraan",
-        "deskripsi": "Urusan sosial dan kesejahteraan",
-        "hierarki": 2,
-        "parentId": "kepala_desa"
-      },
-      {
-        "id": "kadus_banjar_dinas_cabe",
-        "nama": "Kepala Dusun Banjar Dinas Cabe",
-        "deskripsi": "Pimpinan wilayah Banjar Dinas Cabe",
-        "hierarki": 3,
-        "parentId": "sekretaris_desa"
-      },
-      {
-        "id": "kadus_banjar_dinas_menesa",
-        "nama": "Kepala Dusun Banjar Dinas Menesa",
-        "deskripsi": "Pimpinan wilayah Banjar Menesa",
-        "hierarki": 3,
-        "parentId": "sekretaris_desa"
-      },
-      {
-        "id": "kadus_banjar_dinas_penenjoan",
-        "nama": "Kepala Dusun Banjar Dinas Penenjoan",
-        "deskripsi": "Pimpinan wilayah Banjar Dinas Penenjoan",
-        "hierarki": 3,
-        "parentId": "sekretaris_desa"
-      },
-      {
-        "id": "kadus_banjar_dinas_telanga",
-        "nama": "Kepala Dusun Banjar Dinas Telanga",
-        "deskripsi": "Pimpinan wilayah Banjar Dinas Telanga",
-        "hierarki": 3,
-        "parentId": "sekretaris_desa"
-      },
-      {
-        "id": "kadus_banjar_dinas_tengah",
-        "nama": "Kepala Dusun Banjar Dinas Tengah",
-        "deskripsi": "Pimpinan wilayah Banjar Dinas Tengah",
-        "hierarki": 3,
-        "parentId": "sekretaris_desa"
-      },
-      {
-        "id": "kadus_banjar_dinas_baler_pasar",
-        "nama": "Kepala Dusun Banjar Dinas Baler Pasar",
-        "deskripsi": "Pimpinan wilayah Banjar Dinas Baler Pasar",
-        "hierarki": 3,
-        "parentId": "sekretaris_desa"
-      },
-      {
-        "id": "kadus_banjar_dinas_bucu",
-        "nama": "Kepala Dusun Banjar Dinas Bucu",
-        "deskripsi": "Pimpinan wilayah Banjar Dinas Bucu",
-        "hierarki": 3,
-        "parentId": "sekretaris_desa"
-      },
-      {
-        "id": "kadus_banjar_dinas_gulingan",
-        "nama": "Kepala Dusun Banjar Dinas Gulingan",
-        "deskripsi": "Pimpinan wilayah Banjar Dinas Gulingan",
-        "hierarki": 3,
-        "parentId": "sekretaris_desa"
-      },
-      {
-        "id": "kadus_banjar_dinas_bersih",
-        "nama": "Kepala Dusun Banjar Dinas Bersih",
-        "deskripsi": "Pimpinan wilayah Banjar Dinas Bersih",
-        "hierarki": 3,
-        "parentId": "sekretaris_desa"
-      },
-      {
-        "id": "kadus_banjar_dinas_umahanyar",
-        "nama": "Kepala Dusun Banjar Dinas Umahanyar",
-        "deskripsi": "Pimpinan wilayah Banjar Dinas Umahanyar",
-        "hierarki": 3,
-        "parentId": "sekretaris_desa"
-      },
-      {
-        "id": "kadus_banjar_dinas_taman",
-        "nama": "Kepala Dusun Banjar Dinas Taman",
-        "deskripsi": "Pimpinan wilayah Banjar Dinas Taman",
-        "hierarki": 3,
-        "parentId": "sekretaris_desa"
-      },
-      {
-        "id": "kadus_banjar_dinas_darmasaba",
-        "nama": "Kepala Dusun Banjar Dinas Darmasaba",
-        "deskripsi": "Pimpinan wilayah Banjar Dinas Darmasaba",
-        "hierarki": 3,
-        "parentId": "sekretaris_desa"
-      },
-      {
-        "id": "staf_desa",
-        "nama": "Staf Desa",
-        "deskripsi": "Staf Desa",
-        "hierarki": 3,
-        "parentId": "sekretaris_desa"
-      }
-    ]
-  ]
-  
--- a/prisma/data/ekonomi/struktur-organisasi/posisi-organisasi.json
+++ b/prisma/data/ekonomi/struktur-organisasi/posisi-organisasi.json
@@ -0,0 +1,27 @@
+[
+    {
+        "id": "kepala_desa",
+        "nama": "Kepala Desa",
+        "deskripsi": "Kepala Desa",
+        "hierarki": 1
+    },
+    {
+        "id": "sekretaris_desa",
+        "nama": "Sekretaris Desa",
+        "deskripsi": "Sekretaris Desa",
+        "hierarki": 2
+    },
+    {
+        "id": "bendahara_desa",
+        "nama": "Bendahara Desa",
+        "deskripsi": "Bendahara Desa",
+        "hierarki": 3
+    },
+    {
+        "id": "staff_umum",
+        "nama": "Staff Umum",
+        "deskripsi": "Staff Umum",
+        "hierarki": 4
+    }
+ ]
+ 
--- a/prisma/data/file-storage.json
+++ b/prisma/data/file-storage.json
@@ -1,137 +0,0 @@
-[
-  {
-    "id": "cmff0rr4z0002vn0twp333m2",
-    "name": "S6RIjFaPvdQm3oq4rM4X9-desktop.webp",
-    "realName": "bares.png",
-    "path": "uploads/images",
-    "mimeType": "image/webp",
-    "link": "/api/fileStorage/findUnique/S6RIjFaPvdQm3oq4rM4X9-desktop.webp",
-    "category": "image"
-  },
-  {
-    "id": "cmff0tnf00003vn0t3kgzi0u0",
-    "name": "_pVNEmThU5ICGa8gv3gh_-desktop.webp",
-    "realName": "bicara-darma.png",
-    "path": "uploads/images",
-    "mimeType": "image/webp",
-    "link": "/api/fileStorage/findUnique/_pVNEmThU5ICGa8gv3gh_-desktop.webp",
-    "category": "image"
-  },
-  {
-    "id": "cmff0uykf0004vn0trmmxpgfh",
-    "name": "bv6rdKvjxkkjUSGLQ0lvB-desktop.webp",
-    "realName": "daves.png",
-    "path": "uploads/images",
-    "mimeType": "image/webp",
-    "link": "/api/fileStorage/findUnique/bv6rdKvjxkkjUSGLQ0lvB-desktop.webp",
-    "category": "image"
-  },
-  {
-    "id": "cmff0z34f0005vn0tjtvq519p",
-    "name": "Z4hWaV04CvoE20MjccQsV-desktop.webp",
-    "realName": "mangan.png",
-    "path": "uploads/images",
-    "mimeType": "image/webp",
-    "link": "/api/fileStorage/findUnique/Z4hWaV04CvoE20MjccQsV-desktop.webp",
-    "category": "image"
-  },
-  {
-    "id": "cmff38cyq000bvn0t9f01cz3f",
-    "name": "LvLAtOqWojx4sn6NjJWB9-desktop.webp",
-    "realName": "gelah-melah.png",
-    "path": "uploads/images",
-    "mimeType": "image/webp",
-    "link": "/api/fileStorage/findUnique/LvLAtOqWojx4sn6NjJWB9-desktop.webp",
-    "category": "image"
-  },
-  {
-    "id": "cmff0zqvd0007vn0tv6o5hjcq",
-    "name": "gR2mcvAQVgJ2-rM5coYJj-desktop.webp",
-    "realName": "inovasi-desa-darmasaba.png",
-    "path": "uploads/images",
-    "mimeType": "image/webp",
-    "link": "/api/fileStorage/findUnique/gR2mcvAQVgJ2-rM5coYJj-desktop.webp",
-    "category": "image"
-  },
-  {
-    "id": "cmff1013m0008vn0th7t0d64d",
-    "name": "JpL-9F8-IGztMn8E2ce02-desktop.webp",
-    "realName": "pdkt.png",
-    "path": "uploads/images",
-    "mimeType": "image/webp",
-    "link": "/api/fileStorage/findUnique/JpL-9F8-IGztMn8E2ce02-desktop.webp",
-    "category": "image"
-  },
-  {
-    "id": "cmff10cwq0009vn0tse8dzu3j",
-    "name": "bxAk4AsGbJTC705_IVdes-desktop.webp",
-    "realName": "sajjiana-dharma-raksaka.png",
-    "path": "uploads/images",
-    "mimeType": "image/webp",
-    "link": "/api/fileStorage/findUnique/bxAk4AsGbJTC705_IVdes-desktop.webp",
-    "category": "image"
-  },
-  {
-    "id": "cmff2w5ly000avn0telhct71k",
-    "name": "Vbj_osnMJUkGEQGDTLwV--desktop.webp",
-    "realName": "perbekel.png",
-    "path": "uploads/images",
-    "mimeType": "image/webp",
-    "link": "/api/fileStorage/findUnique/Vbj_osnMJUkGEQGDTLwV--desktop.webp",
-    "category": "image"
-  },
-  {
-    "id": "cmff3joae0000vn6h8sgs0ilg",
-    "name": "7hox9spUxj56hY_EBYLnj-desktop.webp",
-    "realName": "youtube.png",
-    "path": "uploads/images",
-    "mimeType": "image/webp",
-    "link": "/api/fileStorage/findUnique/7hox9spUxj56hY_EBYLnj-desktop.webp",
-    "category": "image"
-  },
-  {
-    "id": "cmff3ll130001vn6hkhls3f5y",
-    "name": "ChihV7_1eS-AGtSg9UwMv-desktop.webp",
-    "realName": "gmail.png",
-    "path": "uploads/images",
-    "mimeType": "image/webp",
-    "link": "/api/fileStorage/findUnique/ChihV7_1eS-AGtSg9UwMv-desktop.webp",
-    "category": "image"
-  },
-  {
-    "id": "cmff3mtat0002vn6hs8vyyhdd",
-    "name": "z8v9ZREwOJHKGIRYauROt-desktop.webp",
-    "realName": "facebook.png",
-    "path": "uploads/images",
-    "mimeType": "image/webp",
-    "link": "/api/fileStorage/findUnique/z8v9ZREwOJHKGIRYauROt-desktop.webp",
-    "category": "image"
-  },
-  {
-    "id": "cmff3nv180003vn6h5jvedidq",
-    "name": "BLjMxTKoCNE31uOURR3IU-desktop.webp",
-    "realName": "telephone-call.png",
-    "path": "uploads/images",
-    "mimeType": "image/webp",
-    "link": "/api/fileStorage/findUnique/BLjMxTKoCNE31uOURR3IU-desktop.webp",
-    "category": "image"
-  },
-  {
-    "id": "cmff3oouh0004vn6hd94brzv9",
-    "name": "hkJYAeTNWK_vYaYS20w3I-desktop.webp",
-    "realName": "instagram.png",
-    "path": "uploads/images",
-    "mimeType": "image/webp",
-    "link": "/api/fileStorage/findUnique/hkJYAeTNWK_vYaYS20w3I-desktop.webp",
-    "category": "image"
-  },
-  {
-    "id": "cmff3q12g0005vn6h5ojov2qa",
-    "name": "6XEoZ9SFu59COpil03Gya-desktop.webp",
-    "realName": "tiktok.png",
-    "path": "uploads/images",
-    "mimeType": "image/webp",
-    "link": "/api/fileStorage/findUnique/6XEoZ9SFu59COpil03Gya-desktop.webp",
-    "category": "image"
-  }
-]
--- a/prisma/data/desa/berita/kategori-berita.json
+++ b/prisma/data/desa/berita/kategori-berita.json
@@ -1,4 +1,5 @@
 [
+  { "name": "Semua" },
  { "name": "Pemerintahan" },
  { "name": "Pembangunan" },
  { "name": "Ekonomi" },
--- a/prisma/data/landing-page/profile/mediaSosial.json
+++ b/prisma/data/landing-page/profile/mediaSosial.json
@@ -1,26 +1,32 @@
 [
+  {
+    "id": "cmds8w2q60002vnbe6i8qhkuo",
+    "name": "Telephone Desa Darmasaba",
+    "iconUrl": "081239580000"
+  },
+  {
+    "id": "cmds8z7u20005vnbegyyvnbk0",
+    "name": "Email Desa Darmasaba",
+    "iconUrl": "desadarmasaba@badungkab.go.id"
+  },
  {
    "id": "cmds9023u0008vnbe3oxmhwyf",
    "name": "Desa Darmasaba",
-    "iconUrl": "https://www.youtube.com/channel/UCtPw9WOQO7d2HIKzKgel4Xg",
-    "imageId": "cmff3joae0000vn6h8sgs0ilg"
+    "iconUrl": "https://www.youtube.com/channel/UCtPw9WOQO7d2HIKzKgel4Xg"
  },
  {
    "id": "cmds90oul000bvnbe2bqkptoi",
    "name": "Pemerintah Desa Darmasaba",
-    "iconUrl": "https://www.facebook.com/DarmasabaDesaku",
-    "imageId": "cmff3mtat0002vn6hs8vyyhdd"
+    "iconUrl": "https://www.facebook.com/DarmasabaDesaku"
  },
  {
    "id": "cmds91i4e000evnbe8gtf1gub",
    "name": "ddarmasaba",
-    "iconUrl": "https://www.instagram.com/ddarmasaba/",
-    "imageId": "cmff3oouh0004vn6hd94brzv9"
+    "iconUrl": "https://www.instagram.com/ddarmasaba/"
  },
  {
    "id": "cmds92de5000hvnbemlu6sq5x",
    "name": "desa.darmasaba",
-    "iconUrl": "https://www.tiktok.com/@desa.darmasaba?is_from_webapp=1&sender_device=pc",
-    "imageId": "cmff3q12g0005vn6h5ojov2qa"
+    "iconUrl": "https://www.tiktok.com/@desa.darmasaba?is_from_webapp=1&sender_device=pc"
  }
 ]
--- a/prisma/data/landing-page/profile/profile.json
+++ b/prisma/data/landing-page/profile/profile.json
@@ -2,7 +2,6 @@
  {
    "id": "edit",
    "name": "I.B Surya Prabhawa Manuaba, S.H., M.H.",
-    "position": "Perbekel Darmasaba periode 2021-2027",
-    "imageId": "cmff2w5ly000avn0telhct71k"
+    "position": "Perbekel Darmasaba periode 2021-2027"
  }
 ]
--- a/prisma/data/landing-page/profile/programInovasi.json
+++ b/prisma/data/landing-page/profile/programInovasi.json
@@ -1,51 +1,50 @@
 [
+  {
+    "id": "cmdr7039z0002vn5rttctt9hn",
+    "name": "Davest",
+    "description": "Darmasaba Village Festval",
+    "link": "https://darmasaba.desa.id/berita/55862-rakor-davest-2024"
+  },
  {
    "id": "cmdr755pf0005vn5rp8tyuubw",
    "name": "Dmangan",
    "description": "Darmasaba Aman Pangan",
-    "link": "https://darmasaba.desa.id/berita/61452-kader-d-mangan-berhasil-meraih-prestasi-dalam-ajang-lomba-banjar-bali-quis-bbq-tahun-2024",
-    "imageId" : "cmff0z34f0005vn0tjtvq519p"
+    "link": "https://darmasaba.desa.id/berita/61452-kader-d-mangan-berhasil-meraih-prestasi-dalam-ajang-lomba-banjar-bali-quis-bbq-tahun-2024"
  },
  {
    "id": "cmdr76nqk0008vn5rdddvcxnr",
    "name": "Bicara Darmasaba",
    "description": "Bicara Darmasaba",
-    "link": "https://darmasaba.desa.id/berita/42506-bicara-darmasaba",
-    "imageId" : "cmff0tnf00003vn0t3kgzi0u0"
+    "link": "https://darmasaba.desa.id/berita/42506-bicara-darmasaba"
  },
  {
    "id": "cmdr77vbw000bvn5rvpmoq31s",
    "name": "Bares",
    "description": "Darmasaba Recycling Stock/Exchange",
-    "link": "http://darmasaba.desa.id/berita/56722-bares",
-    "imageId" : "cmff0rr4z0002vn0twp333m2"
+    "link": "http://darmasaba.desa.id/berita/56722-bares"
  },
  {
    "id": "cmdr7bxtp000evn5rmy85wihx",
    "name": "Sajjana Dharma Raksaka",
    "description": "Sajjana Dharma Raksaka",
-    "link": "https://ppid.badungkab.go.id/storage/dokumen/5RS9dldGkrgzMQq6bKdZsqsVRHI8gffWv4PGfb3r.pdf",
-    "imageId" : "cmff10cwq0009vn0tse8dzu3j"
+    "link": "https://ppid.badungkab.go.id/storage/dokumen/5RS9dldGkrgzMQq6bKdZsqsVRHI8gffWv4PGfb3r.pdf"
  },
  {
    "id": "cmdr7dlnk000hvn5r9lur3z35",
    "name": "PDKT",
    "description": "Perangkat Desa Kuat Teknologi",
-    "link": "https://darmasaba.desa.id/berita/53752-p-d-k-t",
-    "imageId" : "cmff1013m0008vn0th7t0d64d"
+    "link": "https://darmasaba.desa.id/berita/53752-p-d-k-t"
  },
  {
    "id": "cmdr7ftob000mvn5rfhgdtg8v",
    "name": "GM",
    "description": "Galah Melah",
-    "link": "https://darmasaba.desa.id/berita/52880-galah-melah",
-    "imageId" : "cmff38cyq000bvn0t9f01cz3f"
+    "link": "https://darmasaba.desa.id/berita/52880-galah-melah"
  },
  {
    "id": "cmdr7glue000pvn5r6onzslju",
    "name": "Inovasi Desa Darmasaba",
    "description": "Inovasi Desa Darmasaba",
-    "link": "https://darmasaba.desa.id/produk-lokal-desa",
-    "imageId" : "cmff0zqvd0007vn0tv6o5hjcq"
+    "link": "https://darmasaba.desa.id/produk-lokal-desa"
  }
 ]
--- a/prisma/data/lingkungan/gotong-royong/kategori-gotong-royong.json
+++ b/prisma/data/lingkungan/gotong-royong/kategori-gotong-royong.json
@@ -1,6 +0,0 @@
-[
-    { "nama": "Kebersihan" },
-    { "nama": "Infrastruktur" },
-    { "nama": "Sosial" },
-    { "nama": "Lingkungan" }
-  ]
--- a/prisma/data/pendidikan/info-sekolah/jenjang-pendidikan.json
+++ b/prisma/data/pendidikan/info-sekolah/jenjang-pendidikan.json
@@ -1,9 +0,0 @@
-[
-    { "id": "cmghqwjs4000404l8c5uvc300", "nama": "PAUD" },
-    { "id": "cmghqwjs4000404l8c5uvc301", "nama": "TK" },
-    { "id": "cmghqwjs4000404l8c5uvc302", "nama": "SD" },
-    { "id": "cmghqwjs4000404l8c5uvc303", "nama": "SMP" },
-    { "id": "cmghqwjs4000404l8c5uvc304", "nama": "SMA" },
-    { "id": "cmghqwjs4000404l8c5uvc305", "nama": "SMK" }
-  ]
-  
--- a/prisma/data/ppid/struktur-ppid/pegawai-PPID.json
+++ b/prisma/data/ppid/struktur-ppid/pegawai-PPID.json
@@ -1,6 +1,6 @@
 [
    {
-      "id": "cmgewz4gt000704ib91i3f169",
+      "id": "550e8400-e29b-41d4-a716-446655440001",
      "namaLengkap": "Ida Bagus Surya Prabhawa Manuaba, S.H.,M.H., NL.P.",
      "gelarAkademik": "S.H.,M.H.,NL.P.",
      "tanggalMasuk": "2020-01-01T00:00:00.000Z",
@@ -11,7 +11,7 @@
      "isActive": true
    },
    {
-      "id": "cmgewxfvw000004ibee5013f4",
+      "id": "550e8400-e29b-41d4-a716-446655440002",
      "namaLengkap": "I Ketut Suwanta",
      "gelarAkademik": "S.Pt",
      "tanggalMasuk": "2020-02-01T00:00:00.000Z",
@@ -22,7 +22,7 @@
      "isActive": true
    },
    {
-      "id": "cmgewxvqw000104ibgm5l8fzs",
+      "id": "550e8400-e29b-41d4-a716-446655440006",
      "namaLengkap": "Ni Wayan Supardiati",
      "gelarAkademik": "S.Pd",
      "tanggalMasuk": "2020-02-01T00:00:00.000Z",
@@ -33,7 +33,7 @@
      "isActive": true
    },
    {
-      "id": "cmgewy1g9000204ib2n7hbx0i",
+      "id": "550e8400-e29b-41d4-a716-446655440011",
      "namaLengkap": "I Wayan Agus Juni Artha Saputra",
      "gelarAkademik": "S.T.",
      "tanggalMasuk": "2020-02-01T00:00:00.000Z",
@@ -44,7 +44,7 @@
      "isActive": true
    },
    {
-      "id": "cmgewybah000304ibgqhn1gm2",
+      "id": "550e8400-e29b-41d4-a716-446655440012",
      "namaLengkap": "I Wayan Sueca",
      "gelarAkademik": "S.H.",
      "tanggalMasuk": "2020-02-01T00:00:00.000Z",
@@ -55,7 +55,7 @@
      "isActive": true
    },
    {
-      "id": "cmgewygqz000404ib20sv8nvg",
+      "id": "550e8400-e29b-41d4-a716-446655440017",
      "namaLengkap": "Si Gede Ketut Astawa",
      "gelarAkademik": "S.T.",
      "tanggalMasuk": "2020-02-01T00:00:00.000Z",
@@ -66,7 +66,7 @@
      "isActive": true
    },
    {
-      "id": "cmgewyos1000504ibcu8o2gyk",
+      "id": "550e8400-e29b-41d4-a716-446655440018",
      "namaLengkap": "I Kadek Arya Minarta",
      "gelarAkademik": "S.T.",
      "tanggalMasuk": "2020-02-01T00:00:00.000Z",
@@ -77,7 +77,7 @@
      "isActive": true
    },
    {
-      "id": "cmgewyxk7000604ib8djs3i6c",
+      "id": "550e8400-e29b-41d4-a716-446655440021",
      "namaLengkap": "I Gede Andika Pradnya Diputra",
      "gelarAkademik": "S.E.",
      "tanggalMasuk": "2020-02-01T00:00:00.000Z",
--- a/prisma/data/user/roles.json
+++ b/prisma/data/user/roles.json
@@ -1,32 +1,30 @@
 [
-  {
-    "id": "0",
-    "name": "DEVELOPER",
-    "description": "Developer",
-    "isActive": true
-  },
-  {
-    "id": "1",
-    "name": "SUPER ADMIN",
-    "description": "Administrator",
-    "isActive": true
-  },
-  {
-    "id": "2",
-    "name": "ADMIN DESA",
-    "description": "Administrator Desa",
-    "isActive": true
-  },
-  {
-    "id": "3",
-    "name": "ADMIN KESEHATAN",
-    "description": "Administrator Bidang Kesehatan",
-    "isActive": true
-  },
-  {
-    "id": "4",
-    "name": "ADMIN PENDIDIKAN",
-    "description": "Administrator Bidang Pendidikan",
-    "isActive": true
-  }
-]
+    {
+      "id": "role_admin_desa",
+      "name": "ADMIN_DESA",
+      "description": "Administrator Desa",
+      "permissions": ["manage_users", "manage_content", "view_reports"],
+      "isActive": true,
+      "createdAt": "2025-09-01T00:00:00.000Z",
+      "updatedAt": "2025-09-01T00:00:00.000Z"
+    },
+    {
+      "id": "role_admin_kesehatan",
+      "name": "ADMIN_KESEHATAN",
+      "description": "Administrator Bidang Kesehatan",
+      "permissions": ["manage_health_data", "view_reports"],
+      "isActive": true,
+      "createdAt": "2025-09-01T00:00:00.000Z",
+      "updatedAt": "2025-09-01T00:00:00.000Z"
+    },
+    {
+      "id": "role_admin_sekolah",
+      "name": "ADMIN_SEKOLAH",
+      "description": "Administrator Sekolah",
+      "permissions": ["manage_school_data", "view_reports"],
+      "isActive": true,
+      "createdAt": "2025-09-01T00:00:00.000Z",
+      "updatedAt": "2025-09-01T00:00:00.000Z"
+    }
+  ]
+  
--- a/prisma/data/user/users.json
+++ b/prisma/data/user/users.json
@@ -1,10 +1,36 @@
 [
-  {
-    "id": "cmie1o0zh0002vn132vtzg7hh",
-    "username": "SuperAdmin-Nico",
-    "nomor": "6289647037426",
-    "roleId": 0,
-    "isActive": true,
-    "sessionInvalid": false
-  }
-]
+    {
+      "id": "user_admin_desa",
+      "nama": "Admin Desa",
+      "email": "admin.desa@example.com",
+      "password": "$2b$10$XFDWYOJFxQ7ZM5bA0N4Z0O8u0eKYv58wLsaR7h6XK9bqWJ1YQJQ9q",
+      "roleId": "role_admin_desa",
+      "isActive": true,
+      "lastLogin": "2025-08-31T10:00:00.000Z",
+      "createdAt": "2025-09-01T00:00:00.000Z",
+      "updatedAt": "2025-09-01T00:00:00.000Z"
+    },
+    {
+      "id": "user_admin_puskesmas",
+      "nama": "Admin Kesehatan",
+      "email": "admin.kesehatan@example.com",
+      "password": "$2b$10$XFDWYOJFxQ7ZM5bA0N4Z0O8u0eKYv58wLsaR7h6XK9bqWJ1YQJQ9q",
+      "roleId": "role_admin_kesehatan",
+      "isActive": true,
+      "lastLogin": null,
+      "createdAt": "2025-09-01T00:00:00.000Z",
+      "updatedAt": "2025-09-01T00:00:00.000Z"
+    },
+    {
+      "id": "user_admin_sekolah",
+      "nama": "Admin Sekolah",
+      "email": "admin.sekolah@example.com",
+      "password": "$2b$10$XFDWYOJFxQ7ZM5bA0N4Z0O8u0eKYv58wLsaR7h6XK9bqWJ1YQJQ9q",
+      "roleId": "role_admin_sekolah",
+      "isActive": true,
+      "lastLogin": null,
+      "createdAt": "2025-09-01T00:00:00.000Z",
+      "updatedAt": "2025-09-01T00:00:00.000Z"
+    }
+  ]
+  
--- a/prisma/migrations/20251119062255_add_unique_username/migration.sql
+++ b/prisma/migrations/20251119062255_add_unique_username/migration.sql
--- a/prisma/safeseedUnique.ts
+++ b/prisma/safeseedUnique.ts
@@ -1,30 +0,0 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-// helpers/safeSeedUnique.ts
-import { PrismaClient } from "@prisma/client";
-
-const prisma = new PrismaClient();
-
-/**
- * Helper generic buat seed dengan upsert aman
- */
-export async function safeSeedUnique<T extends keyof PrismaClient>(
-  model: T,
-  where: Record<string, any>,
-  data: Record<string, any>
-) {
-  const m = prisma[model];
-
-  if (!m) throw new Error(`Model ${String(model)} tidak ditemukan di PrismaClient`);
-
-  try {
-    // @ts-expect-error upsert dynamic
-    await m.upsert({
-      where,
-      update: data,
-      create: { ...where, ...data },
-    });
-    console.log(`✅ Seeded ${String(model)} -> ${JSON.stringify(where)}`);
-  } catch (err) {
-    console.error(`❌ Gagal seed ${String(model)} -> ${JSON.stringify(where)}`, err);
-  }
-}
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -81,7 +81,9 @@ model FileStorage {
  PelayananSuratKeteranganImage  PelayananSuratKeterangan[] @relation("PelayananSuratKeteranganImage")
  PelayananSuratKeteranganImage2 PelayananSuratKeterangan[] @relation("PelayananSuratKeteranganImage2")
  PasarDesa                      PasarDesa[]
-  PegawaiBumDes                  PegawaiBumDes[]
+  KontakDaruratKeamanan          KontakDaruratKeamanan[]
+  KontakItem                     KontakItem[]
+  Pegawai                        Pegawai[]
  DesaDigital                    DesaDigital[]
  InfoTekno                      InfoTekno[]
  PengaduanMasyarakat            PengaduanMasyarakat[]
@@ -90,7 +92,7 @@ model FileStorage {
  PejabatDesa                    PejabatDesa[]
  MediaSosial                    MediaSosial[]
  DesaAntiKorupsi                DesaAntiKorupsi[]
-  SDGSDesa                       SdgsDesa[]
+  SDGSDesa                       SDGSDesa[]
  APBDesImage                    APBDes[]                   @relation("APBDesImage")
  APBDesFile                     APBDes[]                   @relation("APBDesFile")
  PrestasiDesa                   PrestasiDesa[]
@@ -99,9 +101,6 @@ model FileStorage {
  PerbekelDariMasaKeMasa         PerbekelDariMasaKeMasa[]

  MitraKolaborasi MitraKolaborasi[]
-
-  ArtikelKesehatan ArtikelKesehatan[]
-  StrukturBumDes   StrukturBumDes[]
 }

 //========================================= MENU LANDING PAGE ========================================= //
@@ -143,7 +142,7 @@ model MediaSosial {
  isActive  Boolean      @default(true)
 }

-//========================================= DESA ANTI KORUPSI ========================================= //
+//========================================= PROFILE ========================================= //
 model DesaAntiKorupsi {
  id         String                  @id @default(cuid())
  name       String                  @unique
@@ -169,9 +168,9 @@ model KategoriDesaAntiKorupsi {
 }

 //========================================= SDGS Desa ========================================= //
-model SdgsDesa {
+model SDGSDesa {
  id        String       @id @default(cuid())
-  name      String
+  name      String       @unique
  jumlah    String
  image     FileStorage? @relation(fields: [imageId], references: [id])
  imageId   String?
@@ -184,54 +183,26 @@ model SdgsDesa {
 //========================================= APBDes ========================================= //
 model APBDes {
  id        String       @id @default(cuid())
-  tahun     Int?
-  name      String? // misalnya: "APBDes Tahun 2025"
-  deskripsi String?
-  jumlah    String? // total keseluruhan (opsional, bisa juga dihitung dari items)
-  items     APBDesItem[]
+  name      String       @unique
+  jumlah    String
  image     FileStorage? @relation("APBDesImage", fields: [imageId], references: [id])
  imageId   String?
  file      FileStorage? @relation("APBDesFile", fields: [fileId], references: [id])
  fileId    String?
  createdAt DateTime     @default(now())
  updatedAt DateTime     @updatedAt
-  deletedAt DateTime? // opsional, tidak perlu default now()
+  deletedAt DateTime     @default(now())
  isActive  Boolean      @default(true)
 }

-model APBDesItem {
-  id         String       @id @default(cuid())
-  kode       String // contoh: "4", "4.1", "4.1.2"
-  uraian     String // nama item, contoh: "Pendapatan Asli Desa", "Hasil Usaha"
-  anggaran   Float // dalam satuan Rupiah (bisa DECIMAL di DB, tapi Float umum di TS/JS)
-  realisasi  Float
-  selisih    Float // realisasi - anggaran
-  persentase Float
-  tipe       String? // (realisasi / anggaran) * 100
-  level      Int // 1 = kelompok utama, 2 = sub-kelompok, 3 = detail
-  parentId   String? // untuk relasi hierarki
-  parent     APBDesItem?  @relation("APBDesItemParent", fields: [parentId], references: [id])
-  children   APBDesItem[] @relation("APBDesItemParent")
-  apbdesId   String
-  apbdes     APBDes       @relation(fields: [apbdesId], references: [id])
-  createdAt  DateTime     @default(now())
-  updatedAt  DateTime     @updatedAt
-  deletedAt  DateTime?
-  isActive   Boolean      @default(true)
-
-  @@index([kode])
-  @@index([level])
-  @@index([apbdesId])
-}
-
 //========================================= PRESTASI DESA ========================================= //
 model PrestasiDesa {
  id         String               @id @default(cuid())
-  name       String
+  name       String               @unique
  deskripsi  String               @db.Text
  kategori   KategoriPrestasiDesa @relation(fields: [kategoriId], references: [id])
  kategoriId String
-  image      FileStorage?         @relation(fields: [imageId], references: [id])
+  image      FileStorage?          @relation(fields: [imageId], references: [id])
  imageId    String?
  createdAt  DateTime             @default(now())
  updatedAt  DateTime             @updatedAt
@@ -315,51 +286,49 @@ model StrukturPPID {
 }

 model PosisiOrganisasiPPID {
-  id                     String                   @id @default(cuid())
-  nama                   String                   @db.VarChar(100)
-  deskripsi              String?                  @db.Text
-  hierarki               Int
-  pegawai                PegawaiPPID[]
-  strukturOrganisasi     StrukturPPID[] // Relasi balik
-  parentId               String?
-  isActive               Boolean                  @default(true)
-  createdAt              DateTime                 @default(now())
-  updatedAt              DateTime                 @updatedAt
-  parent                 PosisiOrganisasiPPID?    @relation("Parent", fields: [parentId], references: [id])
-  children               PosisiOrganisasiPPID[]   @relation("Parent")
-  StrukturOrganisasiPPID StrukturOrganisasiPPID[]
+  id                 String                 @id @default(cuid())
+  nama               String                 @db.VarChar(100)
+  deskripsi          String?                @db.Text
+  hierarki           Int
+  pegawai            PegawaiPPID[]
+  strukturOrganisasi StrukturPPID[] // Relasi balik
+  parentId           String?
+  isActive           Boolean              @default(true)
+  createdAt          DateTime             @default(now())
+  updatedAt          DateTime             @updatedAt
+  parent             PosisiOrganisasiPPID?  @relation("Parent", fields: [parentId], references: [id])
+  children           PosisiOrganisasiPPID[] @relation("Parent")
 }

 model PegawaiPPID {
-  id                     String                   @id @default(cuid())
-  namaLengkap            String                   @db.VarChar(255)
-  gelarAkademik          String?                  @db.VarChar(100)
-  image                  FileStorage?             @relation(fields: [imageId], references: [id])
-  imageId                String?
-  tanggalMasuk           DateTime?                @db.Date
-  email                  String?                  @unique @db.VarChar(255)
-  telepon                String?                  @db.VarChar(20)
-  alamat                 String?                  @db.Text
-  posisiId               String                   @db.VarChar(50)
-  isActive               Boolean                  @default(true)
-  createdAt              DateTime                 @default(now())
-  updatedAt              DateTime                 @updatedAt
-  posisi                 PosisiOrganisasiPPID     @relation(fields: [posisiId], references: [id])
-  strukturOrganisasi     StrukturPPID[] // Relasi balik
-  StrukturOrganisasiPPID StrukturOrganisasiPPID[]
+  id                 String               @id @default(cuid())
+  namaLengkap        String               @db.VarChar(255)
+  gelarAkademik      String?              @db.VarChar(100)
+  image              FileStorage?         @relation(fields: [imageId], references: [id])
+  imageId            String?
+  tanggalMasuk       DateTime?            @db.Date
+  email              String?              @unique @db.VarChar(255)
+  telepon            String?              @db.VarChar(20)
+  alamat             String?              @db.Text
+  posisiId           String               @db.VarChar(50)
+  isActive           Boolean              @default(true)
+  createdAt          DateTime             @default(now())
+  updatedAt          DateTime             @updatedAt
+  posisi             PosisiOrganisasiPPID @relation(fields: [posisiId], references: [id])
+  strukturOrganisasi StrukturPPID[] // Relasi balik
 }

 model StrukturOrganisasiPPID {
-  id                   String               @id @default(uuid())
-  posisiOrganisasiId   String               @db.VarChar(50)
-  pegawaiId            String
-  hubunganOrganisasiId String
-  posisiOrganisasi     PosisiOrganisasiPPID @relation(fields: [posisiOrganisasiId], references: [id])
-  pegawai              PegawaiPPID          @relation(fields: [pegawaiId], references: [id])
-  createdAt            DateTime             @default(now())
-  updatedAt            DateTime             @updatedAt
+  id                   String           @id @default(uuid())
+  posisiOrganisasiId   String           @db.VarChar(50)
+  pegawaiId            String           @db.Uuid
+  hubunganOrganisasiId String           @db.Uuid
+  posisiOrganisasi     PosisiOrganisasi @relation(fields: [posisiOrganisasiId], references: [id])
+  pegawai              Pegawai          @relation(fields: [pegawaiId], references: [id])
+  createdAt            DateTime         @default(now())
+  updatedAt            DateTime         @updatedAt
  deletedAt            DateTime?
-  isActive             Boolean              @default(true)
+  isActive             Boolean          @default(true)
 }

 // ========================================= VISI MISI PPID ========================================= //
@@ -703,18 +672,17 @@ model GalleryVideo {

 // ========================================= LAYANAN DESA ========================================= //
 model PelayananSuratKeterangan {
-  id               String             @id @default(cuid())
-  name             String
-  deskripsi        String             @db.Text
-  image            FileStorage?       @relation("PelayananSuratKeteranganImage", fields: [imageId], references: [id])
-  imageId          String?
-  image2           FileStorage?       @relation("PelayananSuratKeteranganImage2", fields: [image2Id], references: [id])
-  image2Id         String?
-  createdAt        DateTime           @default(now())
-  updatedAt        DateTime           @updatedAt
-  deletedAt        DateTime           @default(now())
-  isActive         Boolean            @default(true)
-  AjukanPermohonan AjukanPermohonan[]
+  id        String       @id @default(cuid())
+  name      String
+  deskripsi String       @db.Text
+  image     FileStorage? @relation("PelayananSuratKeteranganImage", fields: [imageId], references: [id])
+  imageId   String?
+  image2    FileStorage? @relation("PelayananSuratKeteranganImage2", fields: [image2Id], references: [id])
+  image2Id  String?
+  createdAt DateTime     @default(now())
+  updatedAt DateTime     @updatedAt
+  deletedAt DateTime     @default(now())
+  isActive  Boolean      @default(true)
 }

 model PelayananTelunjukSaktiDesa {
@@ -749,20 +717,6 @@ model PelayananPendudukNonPermanen {
  isActive  Boolean  @default(true)
 }

-model AjukanPermohonan {
-  id         String                   @id @default(cuid())
-  nama       String
-  nik        String
-  alamat     String
-  nomorKk    String
-  kategori   PelayananSuratKeterangan @relation(fields: [kategoriId], references: [id])
-  kategoriId String
-  createdAt  DateTime                 @default(now())
-  updatedAt  DateTime                 @updatedAt
-  deletedAt  DateTime                 @default(now())
-  isActive   Boolean                  @default(true)
-}
-
 // ========================================= PENGHARGAAN ========================================= //
 model Penghargaan {
  id        String       @id @default(cuid())
@@ -881,8 +835,8 @@ model JadwalKegiatan {
  syaratKetentuanJadwalKegiatanId String
  dokumenjadwalkegiatan           DokumenJadwalKegiatan         @relation(fields: [dokumenJadwalKegiatanId], references: [id])
  dokumenJadwalKegiatanId         String
-  pendaftaranjadwalkegiatan       PendaftaranJadwalKegiatan?    @relation(fields: [pendaftaranJadwalKegiatanId], references: [id])
-  pendaftaranJadwalKegiatanId     String?
+  pendaftaranjadwalkegiatan       PendaftaranJadwalKegiatan     @relation(fields: [pendaftaranJadwalKegiatanId], references: [id])
+  pendaftaranJadwalKegiatanId     String
  createdAt                       DateTime                      @default(now())
  updatedAt                       DateTime                      @updatedAt
  deletedAt                       DateTime                      @default(now())
@@ -1018,10 +972,8 @@ model ArtikelKesehatan {
  id             String       @id @default(cuid())
  title          String
  content        String
-  image          FileStorage? @relation(fields: [imageId], references: [id])
-  imageId        String?
-  introductionId String
  introduction   Introduction @relation(fields: [introductionId], references: [id])
+  introductionId String
  symptom        Symptom      @relation(fields: [symptomId], references: [id])
  symptomId      String
  prevention     Prevention   @relation(fields: [preventionId], references: [id])
@@ -1198,7 +1150,6 @@ model KontakDarurat {
  deskripsi String
  image     FileStorage @relation(fields: [imageId], references: [id])
  imageId   String
-  whatsapp  String
  createdAt DateTime    @default(now())
  updatedAt DateTime    @updatedAt
  deletedAt DateTime    @default(now())
@@ -1265,51 +1216,71 @@ model LayananPolsek {

 // ========================================= KONTAK DARURAT ========================================= //
 model KontakDaruratKeamanan {
-  id          String                @id @default(uuid())
-  nama        String
-  icon        String
-  kategori    KontakItem            @relation(fields: [kategoriId], references: [id])
-  kategoriId  String
-  kontakItems KontakDaruratToItem[]
-  createdAt   DateTime              @default(now())
-  updatedAt   DateTime              @updatedAt
-  deletedAt   DateTime?
-  isActive    Boolean               @default(true)
+  id          String       @id @default(uuid())
+  nama        String // contoh: "Layanan Darurat", "Fasilitas Kesehatan"
+  image       FileStorage? @relation(fields: [imageId], references: [id])
+  imageId     String?
+  kontakItems KontakItem[]
+  createdAt   DateTime     @default(now())
+  updatedAt   DateTime     @updatedAt
 }

 model KontakItem {
-  id                    String                  @id @default(uuid())
-  nama                  String
-  nomorTelepon          String
-  icon                  String
-  createdAt             DateTime                @default(now())
-  updatedAt             DateTime                @updatedAt
-  deletedAt             DateTime                @default(now())
-  isActive              Boolean                 @default(true)
-  KontakDaruratToItem   KontakDaruratToItem[]
-  KontakDaruratKeamanan KontakDaruratKeamanan[]
-}
-
-model KontakDaruratToItem {
-  id              String                @id @default(uuid())
-  kontakDaruratId String
-  kontakItemId    String
-  kontakDarurat   KontakDaruratKeamanan @relation(fields: [kontakDaruratId], references: [id])
-  kontakItem      KontakItem            @relation(fields: [kontakItemId], references: [id])
-  createdAt       DateTime              @default(now())
+  id           String                @id @default(uuid())
+  nama         String // contoh: "Polisi", "Ambulans", "Puskesmas Darmasaba"
+  nomorTelepon String
+  image        FileStorage?          @relation(fields: [imageId], references: [id])
+  imageId      String?
+  kategori     KontakDaruratKeamanan @relation(fields: [kategoriId], references: [id])
+  kategoriId   String
+  createdAt    DateTime              @default(now())
+  updatedAt    DateTime              @updatedAt
 }

 // ========================================= PENCEGAHAN KRIMINALITAS ========================================= //
 model PencegahanKriminalitas {
-  id               String   @id @default(cuid())
-  judul            String
-  deskripsi        String
-  deskripsiSingkat String
-  linkVideo        String
-  createdAt        DateTime @default(now())
-  updatedAt        DateTime @updatedAt
-  deletedAt        DateTime @default(now())
-  isActive         Boolean  @default(true)
+  id                String          @id @default(cuid())
+  programKeamanan   ProgramKeamanan @relation(fields: [programKeamananId], references: [id])
+  programKeamananId String
+  tipsKeamanan      TipsKeamanan    @relation(fields: [tipsKeamananId], references: [id])
+  tipsKeamananId    String
+  videoKeamanan     VideoKeamanan   @relation(fields: [videoKeamananId], references: [id])
+  videoKeamananId   String
+  createdAt         DateTime        @default(now())
+  updatedAt         DateTime        @updatedAt
+  deletedAt         DateTime        @default(now())
+  isActive          Boolean         @default(true)
+}
+
+model ProgramKeamanan {
+  id                     String                   @id @default(cuid())
+  nama                   String // contoh: "Ronda Malam"
+  deskripsi              String? // jika mau tambahkan info detail
+  slug                   String                   @unique
+  createdAt              DateTime                 @default(now())
+  updatedAt              DateTime                 @updatedAt
+  PencegahanKriminalitas PencegahanKriminalitas[]
+}
+
+model TipsKeamanan {
+  id                     String                   @id @default(cuid())
+  judul                  String
+  konten                 String
+  slug                   String
+  createdAt              DateTime                 @default(now())
+  updatedAt              DateTime                 @updatedAt
+  PencegahanKriminalitas PencegahanKriminalitas[]
+}
+
+model VideoKeamanan {
+  id                     String                   @id @default(cuid())
+  judul                  String
+  deskripsi              String?
+  videoUrl               String // link youtube atau embed url
+  slug                   String
+  createdAt              DateTime                 @default(now())
+  updatedAt              DateTime                 @updatedAt
+  PencegahanKriminalitas PencegahanKriminalitas[]
 }

 // ========================================= LAPORAN PUBLIK ========================================= //
@@ -1318,13 +1289,11 @@ model LaporanPublik {
  judul        String
  lokasi       String
  tanggalWaktu DateTime
-  status       StatusLaporan             @default(Proses)
+  status       StatusLaporan
  penanganan   PenangananLaporanPublik[]
  kronologi    String? // Optional, bisa diisi detail kronologi
  createdAt    DateTime                  @default(now())
  updatedAt    DateTime                  @updatedAt
-  deletedAt    DateTime                  @default(now())
-  isActive     Boolean                   @default(true)
 }

 model PenangananLaporanPublik {
@@ -1372,7 +1341,6 @@ model PasarDesa {
  harga            Int
  rating           Float
  alamatUsaha      String
-  kontak           String
  createdAt        DateTime          @default(now())
  updatedAt        DateTime          @updatedAt
  deletedAt        DateTime          @default(now())
@@ -1415,7 +1383,6 @@ model LowonganPekerjaan {
  gaji           String
  deskripsi      String
  kualifikasi    String
-  notelp         String
  tanggalPosting DateTime @default(now())
  isActive       Boolean  @default(true)
  createdAt      DateTime @default(now())
@@ -1425,67 +1392,76 @@ model LowonganPekerjaan {

 // ========================================= STRUKTUR ORGANISASI ========================================= //

-model StrukturBumDes {
-  id                       String                  @id @default(cuid())
-  name                     String                  @db.Text
-  image                    FileStorage?            @relation(fields: [imageId], references: [id])
-  imageId                  String?
-  createdAt                DateTime                @default(now())
-  updatedAt                DateTime                @updatedAt
-  deletedAt                DateTime                @default(now())
-  isActive                 Boolean                 @default(true)
-  PosisiOrganisasiBumDes   PosisiOrganisasiBumDes? @relation(fields: [posisiOrganisasiBumDesId], references: [id])
-  posisiOrganisasiBumDesId String?
-  PegawaiBumDes            PegawaiBumDes?          @relation(fields: [pegawaiBumDesId], references: [id])
-  pegawaiBumDesId          String?
+model PosisiOrganisasi {
+  id        String  @id @default(uuid()) @db.VarChar(50)
+  nama      String  @db.VarChar(100)
+  deskripsi String? @db.Text
+  hierarki  Int
+
+  pegawai                Pegawai[]
+  strukturOrganisasi     StrukturOrganisasi[] // Relasi balik
+  StrukturOrganisasiPPID StrukturOrganisasiPPID[]
+
+  @@map("posisi_organisasi")
 }

-model PosisiOrganisasiBumDes {
-  id                       String                     @id @default(cuid())
-  nama                     String                     @db.VarChar(100)
-  deskripsi                String?                    @db.Text
-  hierarki                 Int
-  pegawai                  PegawaiBumDes[]
-  strukturOrganisasi       StrukturBumDes[] // Relasi balik
-  parentId                 String?
-  isActive                 Boolean                    @default(true)
-  createdAt                DateTime                   @default(now())
-  updatedAt                DateTime                   @updatedAt
-  parent                   PosisiOrganisasiBumDes?    @relation("Parent", fields: [parentId], references: [id])
-  children                 PosisiOrganisasiBumDes[]   @relation("Parent")
-  StrukturOrganisasiBumDes StrukturOrganisasiBumDes[]
+model Pegawai {
+  id            String       @id @default(uuid()) @db.Uuid
+  namaLengkap   String       @db.VarChar(255)
+  gelarAkademik String?      @db.VarChar(100)
+  image         FileStorage? @relation(fields: [imageId], references: [id])
+  imageId       String?
+  tanggalMasuk  DateTime?    @db.Date
+  email         String?      @unique @db.VarChar(255)
+  telepon       String?      @db.VarChar(20)
+  alamat        String?      @db.Text
+  posisiId      String       @db.VarChar(50)
+  isActive      Boolean      @default(true)
+  createdAt     DateTime     @default(now())
+  updatedAt     DateTime     @updatedAt
+
+  posisi PosisiOrganisasi @relation(fields: [posisiId], references: [id])
+
+  sebagaiAtasan  HubunganOrganisasi[] @relation("AtasanToBawahan")
+  sebagaiBawahan HubunganOrganisasi[] @relation("BawahanToAtasan")
+
+  strukturOrganisasi     StrukturOrganisasi[] // Relasi balik
+  StrukturOrganisasiPPID StrukturOrganisasiPPID[]
+
+  @@map("pegawai")
 }

-model PegawaiBumDes {
-  id                       String                     @id @default(cuid())
-  namaLengkap              String                     @db.VarChar(255)
-  gelarAkademik            String?                    @db.VarChar(100)
-  image                    FileStorage?               @relation(fields: [imageId], references: [id])
-  imageId                  String?
-  tanggalMasuk             DateTime?                  @db.Date
-  email                    String?                    @unique @db.VarChar(255)
-  telepon                  String?                    @db.VarChar(20)
-  alamat                   String?                    @db.Text
-  posisiId                 String                     @db.VarChar(50)
-  isActive                 Boolean                    @default(true)
-  createdAt                DateTime                   @default(now())
-  updatedAt                DateTime                   @updatedAt
-  posisi                   PosisiOrganisasiBumDes     @relation(fields: [posisiId], references: [id])
-  strukturOrganisasi       StrukturBumDes[] // Relasi balik
-  StrukturOrganisasiBumDes StrukturOrganisasiBumDes[]
+model HubunganOrganisasi {
+  id        String  @id @default(uuid()) @db.Uuid
+  atasanId  String  @db.Uuid
+  bawahanId String  @db.Uuid
+  tipe      String? @db.VarChar(50)
+
+  atasan  Pegawai @relation("AtasanToBawahan", fields: [atasanId], references: [id])
+  bawahan Pegawai @relation("BawahanToAtasan", fields: [bawahanId], references: [id])
+
+  strukturOrganisasi StrukturOrganisasi[] // Relasi balik
+
+  @@unique([atasanId, bawahanId])
+  @@map("hubungan_organisasi")
 }

-model StrukturOrganisasiBumDes {
-  id                   String                 @id @default(uuid())
-  posisiOrganisasiId   String                 @db.VarChar(50)
-  pegawaiId            String
-  hubunganOrganisasiId String
-  posisiOrganisasi     PosisiOrganisasiBumDes @relation(fields: [posisiOrganisasiId], references: [id])
-  pegawai              PegawaiBumDes          @relation(fields: [pegawaiId], references: [id])
-  createdAt            DateTime               @default(now())
-  updatedAt            DateTime               @updatedAt
-  deletedAt            DateTime?
-  isActive             Boolean                @default(true)
+model StrukturOrganisasi {
+  id                   String @id @default(uuid())
+  posisiOrganisasiId   String @db.VarChar(50)
+  pegawaiId            String @db.Uuid
+  hubunganOrganisasiId String @db.Uuid
+
+  posisiOrganisasi   PosisiOrganisasi   @relation(fields: [posisiOrganisasiId], references: [id])
+  pegawai            Pegawai            @relation(fields: [pegawaiId], references: [id])
+  hubunganOrganisasi HubunganOrganisasi @relation(fields: [hubunganOrganisasiId], references: [id])
+
+  createdAt DateTime  @default(now())
+  updatedAt DateTime  @updatedAt
+  deletedAt DateTime?
+  isActive  Boolean   @default(true)
+
+  @@map("struktur_organisasi")
 }

 // ========================================= PROGRAM KEMISKINAN ========================================= //
@@ -1493,7 +1469,7 @@ model ProgramKemiskinan {
  id          String               @id @default(uuid())
  nama        String
  deskripsi   String
-  icon        String
+  ikonUrl     String?
  isActive    Boolean              @default(true)
  statistikId String?              @unique
  statistik   StatistikKemiskinan? @relation(fields: [statistikId], references: [id])
@@ -1575,7 +1551,7 @@ model DataDemografiPekerjaan {
 model DetailDataPengangguran {
  id                     String   @id @default(uuid()) @db.Uuid
  month                  String   @db.VarChar(20)
-  year                   Int
+  year                   DateTime
  totalUnemployment      Int
  educatedUnemployment   Int
  uneducatedUnemployment Int
@@ -1634,7 +1610,7 @@ model Pembiayaan {
  ApbDesa   ApbDesa[] @relation("ApbDesaPembiayaan")
 }

-// ========================================= MENU INOVASI ========================================= //
+// ========================================= INOVASI ========================================= //
 // ========================================= DESA DIGITAL / SMART VILLAGE ========================================= //
 model DesaDigital {
  id        String      @id @default(cuid())
@@ -1663,29 +1639,28 @@ model ProgramKreatif {

 // ========================================= KOLABORASI INOVASI ========================================= //
 model KolaborasiInovasi {
-  id          String   @id @default(cuid())
+  id          String      @id @default(cuid())
  name        String
  tahun       Int
-  slug        String   @db.Text //deskripsi singkat
-  deskripsi   String   @db.Text //deskripsi panjang
+  slug        String      @db.Text //deskripsi singkat
+  deskripsi   String      @db.Text //deskripsi panjang
  kolaborator String
-  createdAt   DateTime @default(now())
-  updatedAt   DateTime @updatedAt
-  deletedAt   DateTime @default(now())
-  isActive    Boolean  @default(true)
+  createdAt   DateTime    @default(now())
+  updatedAt   DateTime    @updatedAt
+  deletedAt   DateTime    @default(now())
+  isActive    Boolean     @default(true)
 }

 model MitraKolaborasi {
-  id        String       @id @default(cuid())
+  id        String   @id @default(cuid())
  name      String
  image     FileStorage? @relation(fields: [imageId], references: [id])
  imageId   String?
-  createdAt DateTime     @default(now())
-  updatedAt DateTime     @updatedAt
-  deletedAt DateTime     @default(now())
-  isActive  Boolean      @default(true)
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+  deletedAt DateTime @default(now())
+  isActive  Boolean  @default(true)
 }
-
 // ========================================= INFO TEKHNOLOGI TEPAT GUNA ========================================= //
 model InfoTekno {
  id        String      @id @default(cuid())
@@ -1970,28 +1945,23 @@ model KeunggulanProgram {
 }

 model BeasiswaPendaftar {
-  id               String            @id @default(cuid())
+  id               String           @id @default(cuid())
  namaLengkap      String
-  nis              String?
-  kelas            String?
-  jenisKelamin     JenisKelamin
-  alamatDomisili   String?
+  nik              String           @unique
  tempatLahir      String
  tanggalLahir     DateTime
-  namaOrtu         String?
-  nik              String            @unique
-  pekerjaanOrtu    String?
-  penghasilan      String?
+  jenisKelamin     JenisKelamin
+  kewarganegaraan  String
+  agama            Agama
+  alamatKTP        String
+  alamatDomisili   String?
  noHp             String
-  kewarganegaraan  String?
-  agama            Agama?
-  alamatKTP        String?
-  email            String?           @unique
-  statusPernikahan StatusPernikahan?
+  email            String           @unique
+  statusPernikahan StatusPernikahan
  ukuranBaju       UkuranBaju?
-  isActive         Boolean           @default(true)
-  createdAt        DateTime          @default(now())
-  updatedAt        DateTime          @updatedAt
+  isActive         Boolean          @default(true)
+  createdAt        DateTime         @default(now())
+  updatedAt        DateTime         @updatedAt
 }

 enum JenisKelamin {
@@ -2120,9 +2090,6 @@ model DataPerpustakaan {
  updatedAt  DateTime     @updatedAt
  deletedAt  DateTime     @default(now())
  isActive   Boolean      @default(true)
-
-  // relasi baru ke peminjaman
-  peminjamanBuku PeminjamanBuku[]
 }

 model KategoriBuku {
@@ -2135,56 +2102,26 @@ model KategoriBuku {
  DataPerpustakaan DataPerpustakaan[]
 }

-model PeminjamanBuku {
-  id             String           @id @default(cuid())
-  nama           String
-  noTelp         String
-  alamat         String
-  bukuId         String
-  tanggalPinjam  DateTime         @default(now())
-  batasKembali   DateTime // tenggat waktu pengembalian
-  tanggalKembali DateTime? // diisi saat dikembalikan
-  status         StatusPeminjaman @default(Dipinjam)
-  catatan        String? // opsional, misal: kondisi buku
-  buku           DataPerpustakaan @relation(fields: [bukuId], references: [id])
-  createdAt      DateTime         @default(now())
-  updatedAt      DateTime         @updatedAt
-  deletedAt      DateTime         @default(now())
-  isActive       Boolean          @default(true)
-}
-
-enum StatusPeminjaman {
-  Dipinjam
-  Dikembalikan
-  Terlambat
-  Dibatalkan
-}
-
-// ========================================= USER ========================================= //
-
 model User {
-  id             String           @id @default(cuid())
-  username       String
-  nomor          String           @unique
-  roleId         String           @default("2")
-  isActive       Boolean          @default(false)
-  sessionInvalid Boolean          @default(false)
-  lastLogin      DateTime?
-  createdAt      DateTime         @default(now())
-  updatedAt      DateTime         @default(now()) @updatedAt
-  permissions    Json?
-  sessions       UserSession[] // ✅ Relasi one-to-many
-  role           Role             @relation(fields: [roleId], references: [id])
-  menuAccesses   UserMenuAccess[]
-
-  @@map("users")
+  id          String    @id @default(cuid())
+  nama        String
+  email       String    @unique
+  password    String
+  role        Role      @relation(fields: [roleId], references: [id])
+  roleId      String
+  instansi    String?   // Nama instansi (Puskesmas, Sekolah, dll)
+  isActive    Boolean   @default(true)
+  lastLogin   DateTime?
+  createdAt   DateTime  @default(now())
+  updatedAt   DateTime  @updatedAt
+  deletedAt   DateTime?
 }

 model Role {
  id          String    @id @default(cuid())
  name        String    @unique // ADMIN_DESA, ADMIN_KESEHATAN, ADMIN_SEKOLAH
  description String?
-  permissions Json?
+  permissions Json      // Menyimpan permission dalam format JSON
  isActive    Boolean   @default(true)
  createdAt   DateTime  @default(now())
  updatedAt   DateTime  @updatedAt
@@ -2194,41 +2131,15 @@ model Role {
  @@map("roles")
 }

-model KodeOtp {
-  id        String   @id @default(cuid())
-  isActive  Boolean  @default(true)
-  createdAt DateTime @default(now())
-  updatedAt DateTime @updatedAt
-  nomor     String
-  otp       Int
-}
-
-model UserSession {
-  id        String   @id @default(cuid())
-  token     String   @db.Text // ✅ JWT bisa panjang
-  expiresAt DateTime // ✅ Ubah jadi expiresAt (konsisten)
-  active    Boolean  @default(true)
-  createdAt DateTime @default(now())
-  updatedAt DateTime @default(now()) @updatedAt
-
-  user   User   @relation(fields: [userId], references: [id], onDelete: Cascade)
-  userId String // ✅ HAPUS @unique - user bisa punya multiple sessions
-
-  @@index([userId]) // ✅ Index untuk query cepat
-  @@index([token]) // ✅ Index untuk verify cepat
-  @@map("user_sessions")
-}
-
-model UserMenuAccess {
-  id        String   @id @default(cuid())
-  userId    String
-  menuId    String // ID menu (misal: "Landing Page", "Kesehatan")
-  createdAt DateTime @default(now())
-  updatedAt DateTime @updatedAt
-
-  user User @relation(fields: [userId], references: [id])
-
-  @@unique([userId, menuId]) // Satu user tidak bisa punya akses menu yang sama dua kali
+// Tabel untuk menyimpan permission
+model Permission {
+  id          String    @id @default(cuid())
+  name        String    @unique
+  description String?
+  createdAt   DateTime  @default(now())
+  updatedAt   DateTime  @updatedAt
+  
+  @@map("permissions")
 }

 // ========================================= DATA PENDIDIKAN ========================================= //
--- a/prisma/seed.ts
+++ b/prisma/seed.ts
@@ -1,5 +1,3 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-/* eslint-disable @typescript-eslint/no-unused-vars */
 import prisma from "@/lib/prisma";
 import profilePejabatDesa from "./data/landing-page/profile/profile.json";
 import programInovasi from "./data/landing-page/profile/programInovasi.json";
@@ -17,7 +15,7 @@ import posisiOrganisasiPPID from "./data/ppid/struktur-ppid/posisi-organisasi-PP
 import visiMisiPPID from "./data/ppid/visi-misi-ppid/visimisiPPID.json";
 import dasarHukumPPID from "./data/ppid/dasar-hukum-ppid/dasarhukumPPID.json";
 import jenisKelamin from "./data/ppid/ikm/jenis-kelamin/jenis-kelamin.json";
-import daftarInformasiPublik from "./data/ppid/daftar-informasi-publik-desa-darmasaba/daftarInformasi.json";
+import daftarInformasiPublik from "./data/ppid/daftar-informasi-publik-desa-darmasaba/daftarInformasi.json"
 import pilihanRatingResponden from "./data/ppid/ikm/pilihan-rating-responden/rating-responden.json";
 import umurResponden from "./data/ppid/ikm/umur-responden/umur-responden.json";
 import categoryPengumuman from "./data/category-pengumuman.json";
@@ -32,14 +30,14 @@ import sejarahDesa from "./data/desa/profile/sejarah_desa.json";
 import visiMisiDesa from "./data/desa/profile/visi_misi_desa.json";
 import detailDataPengangguran from "./data/ekonomi/jumlah-pengangguran/detail-data-pengangguran.json";
 import kategoriProduk from "./data/ekonomi/pasar-desa/kategori-produk.json";
-import pegawai from "./data/ekonomi/struktur-organisasi/pegawai-bumdes.json";
-import posisiOrganisasi from "./data/ekonomi/struktur-organisasi/posisi-organisasi-bumdes.json";
-import kategoriBerita from "./data/desa/berita/kategori-berita.json";
+import hubunganOrganisasi from "./data/ekonomi/struktur-organisasi/hubungan-organisasi.json";
+import pegawai from "./data/ekonomi/struktur-organisasi/pegawai.json";
+import posisiOrganisasi from "./data/ekonomi/struktur-organisasi/posisi-organisasi.json";
+import kategoriBerita from "./data/kategori-berita.json";
 import contohEdukasiLingkungan from "./data/lingkungan/edukasi-lingkungan/contoh-kegiatan-di-desa-darmasaba.json";
 import materiEdukasiLingkungan from "./data/lingkungan/edukasi-lingkungan/materi-edukasi-yang-diberikan.json";
 import tujuanEdukasiLingkungan from "./data/lingkungan/edukasi-lingkungan/tujuan-edukasi-lingkungan.json";
 import bentukKonservasiBerdasarkanAdat from "./data/lingkungan/konservasi-adat-bali/bentuk-konservasi.json";
-import kategoriKegiatanData from "./data/lingkungan/gotong-royong/kategori-gotong-royong.json";
 import filosofiTriHita from "./data/lingkungan/konservasi-adat-bali/filosofi-tri-hita.json";
 import nilaiKonservasiAdat from "./data/lingkungan/konservasi-adat-bali/nilai-konservasi-adat.json";
 import caraMemperolehInformasi from "./data/list-caraMemperolehInformasi.json";
@@ -55,112 +53,54 @@ import tujuanProgram2 from "./data/pendidikan/pendidikan-non-formal/tujuan-progr
 import programUnggulan from "./data/pendidikan/program-pendidikan-anak/program-unggulan.json";
 import tujuanProgram from "./data/pendidikan/program-pendidikan-anak/tujuan-program.json";
 import roles from "./data/user/roles.json";
-import fileStorage from "./data/file-storage.json";
-import jenjangPendidikan from "./data/pendidikan/info-sekolah/jenjang-pendidikan.json";
-import seedAssets from "./seed_assets";
 import users from "./data/user/users.json";
-import { safeSeedUnique } from "./safeseedUnique";

 (async () => {
-  console.log("🔄 Seeding roles...");
-
+  //roles
  for (const r of roles) {
-    try {
-      // ✅ Destructure to remove permissions if exists
-      const { permissions, ...roleData } = r as any;
-
-      await safeSeedUnique(
-        "role",
-        { name: roleData.name },
-        {
-          id: roleData.id,
-          name: roleData.name,
-          description: roleData.description,
-          permissions: roleData.permissions || {}, // ✅ Include permissions
-          isActive: roleData.isActive,
-        }
-      );
-      console.log(`✅ Seeded role -> ${roleData.name}`);
-    } catch (error: any) {
-      if (error.code === "P2002") {
-        console.warn(`⚠️ Role already exists (skipping): ${r.name}`);
-      } else {
-        console.error(`❌ Failed to seed role ${r.name}:`, error.message);
-      }
-    }
+    await prisma.role.upsert({
+      where: { id: r.id },
+      update: {
+        name: r.name,
+        description: r.description,
+        permissions: r.permissions,
+        isActive: true,
+      },
+      create: {
+        id: r.id,
+        name: r.name,
+        description: r.description,
+        permissions: r.permissions,
+        isActive: true,
+      },
+    });
  }
-  console.log("✅ Roles seeding completed");
+  console.log("✅ Roles seeded");

-  // =========== USER ===========
-  console.log("🔄 Seeding users...");
+  //users
  for (const u of users) {
-    try {
-      // Verify role exists first
-      const roleExists = await prisma.role.findUnique({
-        where: { id: u.roleId.toString() },
-        select: { id: true }, // Only select id to minimize query
-      });
-
-      if (!roleExists) {
-        console.error(
-          `❌ Role with id ${u.roleId} not found for user ${u.username}`
-        );
-        continue;
-      }
-
-      await safeSeedUnique(
-        "user",
-        { id: u.id },
-        {
-          username: u.username,
-          nomor: u.nomor,
-          roleId: u.roleId.toString(),
-          isActive: u.isActive,
-          sessionInvalid: false,
-        }
-      );
-      console.log(`✅ Seeded user -> ${u.username}`);
-    } catch (error: any) {
-      if (error.code === "P2003") {
-        console.error(
-          `❌ Foreign key constraint failed for user ${u.username}: Role ${u.roleId} does not exist`
-        );
-      } else {
-        console.error(`❌ Failed to seed user ${u.username}:`, error.message);
-      }
-    }
+    await prisma.user.upsert({
+      where: { id: u.id },
+      update: {
+        nama: u.nama,
+        email: u.email,
+        password: u.password,
+        roleId: u.roleId,
+        isActive: true,
+      },
+      create: {
+        id: u.id,
+        nama: u.nama,
+        email: u.email,
+        password: u.password,
+        roleId: u.roleId,
+        isActive: true,
+      },
+    });
  }
-  console.log("✅ Users seeding completed");
+  console.log("✅ Users seeded");
+

-  // =========== FILE STORAGE ===========
-  console.log("🔄 Seeding file storage...");
-  for (const f of fileStorage) {
-    try {
-      await prisma.fileStorage.upsert({
-        where: { id: f.id },
-        update: {
-          name: f.name,
-          realName: f.realName,
-          path: f.path,
-          mimeType: f.mimeType,
-          link: f.link,
-          category: f.category,
-        },
-        create: {
-          id: f.id,
-          name: f.name,
-          realName: f.realName,
-          path: f.path,
-          mimeType: f.mimeType,
-          link: f.link,
-          category: f.category,
-        },
-      });
-    } catch (error: any) {
-      console.error(`❌ Failed to seed file storage ${f.name}:`, error.message);
-    }
-  }
-  console.log("✅ File storage seeded");
  // =========== LANDING PAGE ===========
  // =========== SUBMENU PROFILE ===========
  // =========== PROFILE PEJABAT DESA ===========
@@ -170,13 +110,11 @@ import { safeSeedUnique } from "./safeseedUnique";
      update: {
        name: p.name,
        position: p.position,
-        imageId: p.imageId,
      },
      create: {
        id: p.id,
        name: p.name,
        position: p.position,
-        imageId: p.imageId,
      },
    });
  }
@@ -186,35 +124,18 @@ import { safeSeedUnique } from "./safeseedUnique";

  // =========== PROGRAM INOVASI ===========
  for (const p of programInovasi) {
-    let imageId: string | null = null;
-
-    if (p.imageId) {
-      const imageExists = await prisma.fileStorage.findUnique({
-        where: { id: p.imageId },
-      });
-
-      if (imageExists) {
-        imageId = p.imageId;
-      } else {
-        console.warn(
-          `⚠️ imageId ${p.imageId} tidak ditemukan untuk ProgramInovasi ${p.name}`
-        );
-      }
-    }
    await prisma.programInovasi.upsert({
      where: { id: p.id },
      update: {
        name: p.name,
        description: p.description,
        link: p.link,
-        imageId: p.imageId,
      },
      create: {
        id: p.id,
        name: p.name,
        description: p.description,
        link: p.link,
-        imageId: p.imageId,
      },
    });
  }
@@ -227,13 +148,11 @@ import { safeSeedUnique } from "./safeseedUnique";
      update: {
        name: p.name,
        iconUrl: p.iconUrl,
-        imageId: p.imageId,
      },
      create: {
        id: p.id,
        name: p.name,
        iconUrl: p.iconUrl,
-        imageId: p.imageId,
      },
    });
  }
@@ -379,14 +298,16 @@ import { safeSeedUnique } from "./safeseedUnique";

  // =========== SDGSDesa ===========
  for (const l of sdgsDesa) {
-    await prisma.sdgsDesa.upsert({
-      where: { id: l.id },
+    await prisma.sDGSDesa.upsert({
+      where: {
+        name: l.name,
+        jumlah: l.jumlah,
+      },
      update: {
        name: l.name,
        jumlah: l.jumlah,
      },
      create: {
-        id: l.id,
        name: l.name,
        jumlah: l.jumlah,
      },
@@ -399,7 +320,8 @@ import { safeSeedUnique } from "./safeseedUnique";
  for (const l of apbdes) {
    await prisma.aPBDes.upsert({
      where: {
-        id: l.id,
+        name: l.name,
+        jumlah: l.jumlah,
      },
      update: {
        name: l.name,
@@ -577,40 +499,15 @@ import { safeSeedUnique } from "./safeseedUnique";
  console.log("posisi organisasi berhasil");

  // =========== PEGAWAI PPID ===========
-  console.log("🔄 Seeding pegawai PPID...");
  const flattenedPegawai = pegawaiPPID.flat();
-
-  // Check for duplicate emails
-  const emails = new Set();
  for (const p of flattenedPegawai) {
-    if (emails.has(p.email)) {
-      console.warn(`⚠️ Duplicate email found in pegawaiPPID: ${p.email}`);
-    }
-    emails.add(p.email);
+    await prisma.pegawaiPPID.upsert({
+      where: { id: p.id },
+      update: p,
+      create: p,
+    });
  }
-
-  for (const p of flattenedPegawai) {
-    try {
-      await prisma.pegawaiPPID.upsert({
-        where: { id: p.id },
-        update: p,
-        create: p,
-      });
-      console.log(`✅ Seeded pegawai PPID -> ${p.namaLengkap}`);
-    } catch (error: any) {
-      if (error.code === "P2002") {
-        console.warn(
-          `⚠️ Pegawai PPID with duplicate email (skipping): ${p.email}`
-        );
-      } else {
-        console.error(
-          `❌ Failed to seed pegawai PPID ${p.namaLengkap}:`,
-          error.message
-        );
-      }
-    }
-  }
-  console.log("✅ pegawai PPID seeding completed");
+  console.log("pegawai berhasil");

  // =========== SUBMENU VISI MISI PPID ===========

@@ -651,29 +548,29 @@ import { safeSeedUnique } from "./safeseedUnique";
  }
  console.log("dasar hukum PPID success ...");

-  // =========== SUBMENU DAFTAR INFORMASI PUBLIK PPID ===========
-  for (const v of daftarInformasiPublik) {
-    // Convert string date to Date object
-    const tanggal = new Date(v.tanggal);
-
-    await prisma.daftarInformasiPublik.upsert({
-      where: {
-        id: v.id,
-      },
-      update: {
-        jenisInformasi: v.jenisInformasi,
-        deskripsi: v.deskripsi,
-        tanggal: tanggal,
-      },
-      create: {
-        id: v.id,
-        jenisInformasi: v.jenisInformasi,
-        deskripsi: v.deskripsi,
-        tanggal: tanggal,
-      },
-    });
-  }
-  console.log("daftar informasi publik PPID success ...");
+    // =========== SUBMENU DAFTAR INFORMASI PUBLIK PPID ===========
+    for (const v of daftarInformasiPublik) {
+      // Convert string date to Date object
+      const tanggal = new Date(v.tanggal);
+      
+      await prisma.daftarInformasiPublik.upsert({
+        where: {
+          id: v.id,
+        },
+        update: {
+          jenisInformasi: v.jenisInformasi,
+          deskripsi: v.deskripsi,
+          tanggal: tanggal,
+        },
+        create: {
+          id: v.id,
+          jenisInformasi: v.jenisInformasi,
+          deskripsi: v.deskripsi,
+          tanggal: tanggal,
+        },
+      });
+    }
+    console.log("daftar informasi publik PPID success ...");

  for (const l of pelayananPerizinanBerusaha) {
    await prisma.pelayananPerizinanBerusaha.upsert({
@@ -871,36 +768,28 @@ import { safeSeedUnique } from "./safeseedUnique";
  }
  console.log("kategori produk success ...");

-  const flattenedPosisiBumdes = posisiOrganisasi.flat();
-
-  // ✅ Urutkan berdasarkan hierarki
-  const sortedPosisiBumdes = flattenedPosisiBumdes.sort(
-    (a, b) => a.hierarki - b.hierarki
-  );
-
-  for (const p of sortedPosisiBumdes) {
-    console.log(`Seeding: ${p.nama} (id: ${p.id}, parent: ${p.parentId})`);
-
-    if (p.parentId) {
-      const parentExists = flattenedPosisi.some((pos) => pos.id === p.parentId);
-      if (!parentExists) {
-        console.warn(
-          `⚠️ Parent tidak ditemukan: ${p.parentId} untuk ${p.nama}`
-        );
-        continue;
-      }
-    }
-
-    await prisma.posisiOrganisasiBumDes.upsert({
-      where: { id: p.id },
-      update: p,
-      create: p,
+  for (const p of posisiOrganisasi) {
+    await prisma.posisiOrganisasi.upsert({
+      where: {
+        id: p.id,
+      },
+      update: {
+        nama: p.nama,
+        deskripsi: p.deskripsi,
+        hierarki: p.hierarki,
+      },
+      create: {
+        id: p.id,
+        nama: p.nama,
+        deskripsi: p.deskripsi,
+        hierarki: p.hierarki,
+      },
    });
  }
-  console.log("posisi organisasi berhasil");
+  console.log("posisi organisasi success ...");

  for (const p of pegawai) {
-    await prisma.pegawaiBumDes.upsert({
+    await prisma.pegawai.upsert({
      where: {
        id: p.id,
      },
@@ -929,10 +818,33 @@ import { safeSeedUnique } from "./safeseedUnique";
  }
  console.log("pegawai success ...");

+  for (const p of hubunganOrganisasi) {
+    await prisma.hubunganOrganisasi.upsert({
+      where: {
+        atasanId_bawahanId: {
+          atasanId: p.atasanId,
+          bawahanId: p.bawahanId,
+        },
+      },
+      update: {
+        tipe: p.tipe,
+      },
+      create: {
+        atasanId: p.atasanId,
+        bawahanId: p.bawahanId,
+        tipe: p.tipe,
+      },
+    });
+  }
+  console.log("hubungan organisasi success ...");
+
  for (const d of detailDataPengangguran) {
+    // Convert the year to a Date object (using January 1st of the year as the date)
+    const yearAsDate = new Date(d.year, 0, 1);
+
    await prisma.detailDataPengangguran.upsert({
      where: {
-        month_year: { month: d.month, year: d.year },
+        month_year: { month: d.month, year: yearAsDate },
      },
      update: {
        totalUnemployment: d.totalUnemployment,
@@ -942,7 +854,7 @@ import { safeSeedUnique } from "./safeseedUnique";
      },
      create: {
        month: d.month,
-        year: d.year,
+        year: yearAsDate,
        totalUnemployment: d.totalUnemployment,
        educatedUnemployment: d.educatedUnemployment,
        uneducatedUnemployment: d.uneducatedUnemployment,
@@ -952,30 +864,6 @@ import { safeSeedUnique } from "./safeseedUnique";
  }
  console.log("📊 detailDataPengangguran success ...");

-  // =========== KATEGORI GOTONG ROYONG ===========
-  // Add IDs to the kategoriKegiatan data
-  const kategoriKegiatan = kategoriKegiatanData.map((k, index) => ({
-    ...k,
-    id: `kategori-${index + 1}`,
-  }));
-
-  for (const k of kategoriKegiatan) {
-    await prisma.kategoriKegiatan.upsert({
-      where: {
-        id: k.id,
-      },
-      update: {
-        nama: k.nama,
-      },
-      create: {
-        id: k.id,
-        nama: k.nama,
-      },
-    });
-  }
-
-  console.log("kategori kegiatan success ...");
-
  for (const e of tujuanEdukasiLingkungan) {
    await prisma.tujuanEdukasiLingkungan.upsert({
      where: {
@@ -1229,25 +1117,6 @@ import { safeSeedUnique } from "./safeseedUnique";
  console.log(
    "✅ fasilitas bimbingan belajar desa seeded (editable later via UI)"
  );
-
-  for (const j of jenjangPendidikan) {
-    await prisma.jenjangPendidikan.upsert({
-      where: {
-        id: j.id || undefined,
-      },
-      update: {
-        nama: j.nama,
-      },
-      create: {
-        nama: j.nama,
-      },
-    });
-  }
-
-  console.log("✅ Jenjang Pendidikan seeded successfully");
-
-  // seed assets
-  await seedAssets();
 })()
  .then(() => prisma.$disconnect())
  .catch((e) => {
--- a/prisma/seed_assets.ts
+++ b/prisma/seed_assets.ts
@@ -1,118 +0,0 @@
-// prisma/seedAssets.ts
-import fs from "fs/promises";
-import path from "path";
-import sharp from "sharp";
-import fetch from "node-fetch";
-import AdmZip from "adm-zip";
-import prisma from "@/lib/prisma";
-
-const UPLOADS_DIR =
-  process.env.WIBU_UPLOAD_DIR || path.join(process.cwd(), "uploads");
-
-// --- Helper: deteksi kategori file ---
-function detectCategory(filename: string): "image" | "document" | "other" {
-  const ext = path.extname(filename).toLowerCase();
-  if ([".jpg", ".jpeg", ".png", ".webp"].includes(ext)) return "image";
-  if ([".pdf", ".doc", ".docx"].includes(ext)) return "document";
-  return "other";
-}
-
-// --- Helper: recursive walk dir ---
-async function walkDir(dir: string, fileList: string[] = []): Promise<string[]> {
-  const entries = await fs.readdir(dir, { withFileTypes: true });
-
-  for (const entry of entries) {
-    const fullPath = path.join(dir, entry.name);
-
-    if (entry.isDirectory()) {
-      if (entry.name === "__MACOSX") continue; // skip folder sampah
-      await walkDir(fullPath, fileList);
-    } else {
-      if (entry.name.startsWith(".") || entry.name === ".DS_Store") continue; // skip file sampah
-      fileList.push(fullPath);
-    }
-  }
-
-  return fileList;
-}
-
-export default async function seedAssets() {
-  console.log("🚀 Seeding assets...");
-
-  // 1. Download zip
-  const url =
-    "https://cld-dkr-makuro-seafile.wibudev.com/f/ffd5a548a04f47939474/?dl=1";
-  const res = await fetch(url);
-  if (!res.ok) throw new Error(`Gagal download assets: ${res.statusText}`);
-  const buffer = Buffer.from(await res.arrayBuffer());
-
-  // 2. Extract zip ke folder tmp
-  const extractDir = path.join(process.cwd(), "tmp_assets");
-  await fs.rm(extractDir, { recursive: true, force: true });
-  await fs.mkdir(extractDir, { recursive: true });
-
-  const zip = new AdmZip(buffer);
-  zip.extractAllTo(extractDir, true);
-
-  // 3. Cari semua file valid (recursive)
-  const files = await walkDir(extractDir);
-
-  // 4. Loop tiap file & simpan
-  for (const filePath of files) {
-    const entryName = path.basename(filePath);
-    const category = detectCategory(entryName);
-
-    let finalName = entryName;
-    let mimeType = "application/octet-stream";
-    let targetPath = "";
-
-    if (category === "image") {
-      const fileBaseName = path.parse(entryName).name;
-      finalName = `${fileBaseName}.webp`;
-      targetPath = path.join(UPLOADS_DIR, "images", finalName);
-      await fs.mkdir(path.dirname(targetPath), { recursive: true });
-      await sharp(filePath).webp({ quality: 80 }).toFile(targetPath);
-      mimeType = "image/webp";
-    } else if (category === "document") {
-      targetPath = path.join(UPLOADS_DIR, "documents", entryName);
-      await fs.mkdir(path.dirname(targetPath), { recursive: true });
-      await fs.copyFile(filePath, targetPath);
-      mimeType = "application/pdf";
-    } else {
-      targetPath = path.join(UPLOADS_DIR, "other", entryName);
-      await fs.mkdir(path.dirname(targetPath), { recursive: true });
-      await fs.copyFile(filePath, targetPath);
-    }
-
-    // 5. Simpan ke DB
-    await prisma.fileStorage.create({
-      data: {
-        name: finalName,
-        realName: entryName,
-        path: targetPath,
-        mimeType,
-        link: `/uploads/${category}/${finalName}`,
-        category,
-      },
-    });
-
-    console.log(`📂 saved: ${category}/${finalName}`);
-  }
-
-  // 6. Cleanup
-  await fs.rm(extractDir, { recursive: true, force: true });
-
-  console.log("✅ Selesai seed assets!");
-}
-
-// --- Auto run kalau dipanggil langsung ---
-if (import.meta.main) {
-  seedAssets()
-    .catch((err) => {
-      console.error("❌ Error seeding assets:", err);
-      process.exit(1);
-    })
-    .finally(async () => {
-      await prisma.$disconnect();
-    });
-}
--- a/public/assets/images/perbekel.png
+++ b/public/assets/images/perbekel.png
--- a/public/assets/images/ppid/profile-ppid/1585618b-aec2-4b6c-a8a6-08e9c6eefa79_perbekel.png
+++ b/public/assets/images/ppid/profile-ppid/1585618b-aec2-4b6c-a8a6-08e9c6eefa79_perbekel.png
--- a/public/assets/images/ppid/profile-ppid/1_1747971309851_perbekel.png
+++ b/public/assets/images/ppid/profile-ppid/1_1747971309851_perbekel.png
--- a/public/assets/images/ppid/profile-ppid/4bd7c413-c88b-487d-8572-9b61df6c1251_perbekel.png
+++ b/public/assets/images/ppid/profile-ppid/4bd7c413-c88b-487d-8572-9b61df6c1251_perbekel.png
--- a/public/assets/images/ppid/profile-ppid/77004be4-0ec0-4ed2-a0a1-4e4ea6a9f4ad_perbekel.png
+++ b/public/assets/images/ppid/profile-ppid/77004be4-0ec0-4ed2-a0a1-4e4ea6a9f4ad_perbekel.png
--- a/public/assets/images/ppid/profile-ppid/7ede98a1-a154-480c-a0f6-5dca983fdef3_perbekel.png
+++ b/public/assets/images/ppid/profile-ppid/7ede98a1-a154-480c-a0f6-5dca983fdef3_perbekel.png
--- a/public/beasiswa-siswa.png
+++ b/public/beasiswa-siswa.png
--- a/public/chatbot-removebg-preview.png
+++ b/public/chatbot-removebg-preview.png
--- a/public/perbekel.png
+++ b/public/perbekel.png
--- a/public/pudak-icon.png
+++ b/public/pudak-icon.png
--- a/public/uploads/seeded-images/profile-ppid/021b212f-097f-4c2a-a5e5-273d7458c8da_perbekel.png
+++ b/public/uploads/seeded-images/profile-ppid/021b212f-097f-4c2a-a5e5-273d7458c8da_perbekel.png
--- a/public/uploads/seeded-images/profile-ppid/0fa03608-2d76-4dd8-be1b-01a5f2588645_perbekel.png
+++ b/public/uploads/seeded-images/profile-ppid/0fa03608-2d76-4dd8-be1b-01a5f2588645_perbekel.png
--- a/public/uploads/seeded-images/profile-ppid/152d35e6-f125-4c70-ba0b-21a8395658c4_perbekel.png
+++ b/public/uploads/seeded-images/profile-ppid/152d35e6-f125-4c70-ba0b-21a8395658c4_perbekel.png
--- a/public/uploads/seeded-images/profile-ppid/20202f69-857c-463a-b524-c407e50401c8_perbekel.png
+++ b/public/uploads/seeded-images/profile-ppid/20202f69-857c-463a-b524-c407e50401c8_perbekel.png
--- a/public/uploads/seeded-images/profile-ppid/2513dd3c-256d-4f15-9e35-75e9819acdf4_perbekel.png
+++ b/public/uploads/seeded-images/profile-ppid/2513dd3c-256d-4f15-9e35-75e9819acdf4_perbekel.png
--- a/public/uploads/seeded-images/profile-ppid/2ee01665-bf74-44b8-b851-c71b00007436_perbekel.png
+++ b/public/uploads/seeded-images/profile-ppid/2ee01665-bf74-44b8-b851-c71b00007436_perbekel.png
--- a/public/uploads/seeded-images/profile-ppid/47ef008b-bf7f-467f-8c8e-bf9259a08656_perbekel.png
+++ b/public/uploads/seeded-images/profile-ppid/47ef008b-bf7f-467f-8c8e-bf9259a08656_perbekel.png
--- a/public/uploads/seeded-images/profile-ppid/53b002b4-8a00-40ae-bde5-612b00fe2eb7_perbekel.png
+++ b/public/uploads/seeded-images/profile-ppid/53b002b4-8a00-40ae-bde5-612b00fe2eb7_perbekel.png
--- a/public/uploads/seeded-images/profile-ppid/54ad4911-4752-413b-8242-b8fbd0309df4_perbekel.png
+++ b/public/uploads/seeded-images/profile-ppid/54ad4911-4752-413b-8242-b8fbd0309df4_perbekel.png
--- a/public/uploads/seeded-images/profile-ppid/64ed4abc-9a5a-40d8-afd4-042c408ec092_perbekel.png
+++ b/public/uploads/seeded-images/profile-ppid/64ed4abc-9a5a-40d8-afd4-042c408ec092_perbekel.png
--- a/public/uploads/seeded-images/profile-ppid/664e4fbc-af1e-4e5f-aecd-4fdbf728c74d_perbekel.png
+++ b/public/uploads/seeded-images/profile-ppid/664e4fbc-af1e-4e5f-aecd-4fdbf728c74d_perbekel.png
--- a/public/uploads/seeded-images/profile-ppid/66f8e9e5-838e-4aaf-bbf2-9a31a6fc060e_perbekel.png
+++ b/public/uploads/seeded-images/profile-ppid/66f8e9e5-838e-4aaf-bbf2-9a31a6fc060e_perbekel.png
--- a/public/uploads/seeded-images/profile-ppid/728a144f-2167-41c5-822c-9e11322b4988_perbekel.png
+++ b/public/uploads/seeded-images/profile-ppid/728a144f-2167-41c5-822c-9e11322b4988_perbekel.png
--- a/public/uploads/seeded-images/profile-ppid/82fd837b-fd2d-440e-8207-35c65f1022c7_perbekel.png
+++ b/public/uploads/seeded-images/profile-ppid/82fd837b-fd2d-440e-8207-35c65f1022c7_perbekel.png
--- a/public/uploads/seeded-images/profile-ppid/8e492234-e95e-4672-9041-d5c4f611d7fb_perbekel.png
+++ b/public/uploads/seeded-images/profile-ppid/8e492234-e95e-4672-9041-d5c4f611d7fb_perbekel.png
--- a/public/uploads/seeded-images/profile-ppid/90db5197-b0c1-441a-8585-bc33758cc3a9_perbekel.png
+++ b/public/uploads/seeded-images/profile-ppid/90db5197-b0c1-441a-8585-bc33758cc3a9_perbekel.png
--- a/public/uploads/seeded-images/profile-ppid/9e891f51-e57c-4d5d-8b38-87022e88b0dd_perbekel.png
+++ b/public/uploads/seeded-images/profile-ppid/9e891f51-e57c-4d5d-8b38-87022e88b0dd_perbekel.png
--- a/public/uploads/seeded-images/profile-ppid/a146af5a-e48d-4c19-8350-2383a3e3be22_perbekel.png
+++ b/public/uploads/seeded-images/profile-ppid/a146af5a-e48d-4c19-8350-2383a3e3be22_perbekel.png
--- a/public/uploads/seeded-images/profile-ppid/a85625e1-cbd4-4869-b809-6f27bc4979b2_perbekel.png
+++ b/public/uploads/seeded-images/profile-ppid/a85625e1-cbd4-4869-b809-6f27bc4979b2_perbekel.png
--- a/public/uploads/seeded-images/profile-ppid/bbfed5d8-a1f1-4087-a542-d7f7c9935bd8_perbekel.png
+++ b/public/uploads/seeded-images/profile-ppid/bbfed5d8-a1f1-4087-a542-d7f7c9935bd8_perbekel.png
--- a/public/uploads/seeded-images/profile-ppid/bc2afe55-9121-4523-b1ae-1a75956bd0dc_perbekel.png
+++ b/public/uploads/seeded-images/profile-ppid/bc2afe55-9121-4523-b1ae-1a75956bd0dc_perbekel.png
--- a/public/uploads/seeded-images/profile-ppid/cdd3cd52-c9c4-4c96-a29d-728a774b5955_perbekel.png
+++ b/public/uploads/seeded-images/profile-ppid/cdd3cd52-c9c4-4c96-a29d-728a774b5955_perbekel.png
--- a/public/uploads/seeded-images/profile-ppid/e658ba55-fa8a-4f0d-bcbd-78de12b2ce33_perbekel.png
+++ b/public/uploads/seeded-images/profile-ppid/e658ba55-fa8a-4f0d-bcbd-78de12b2ce33_perbekel.png
--- a/scripts/list-users.ts
+++ b/scripts/list-users.ts
@@ -0,0 +1,33 @@
+import { PrismaClient } from '@prisma/client';
+
+const prisma = new PrismaClient();
+
+async function listUsers() {
+  try {
+    const users = await prisma.user.findMany({
+      include: {
+        role: true
+      }
+    });
+
+    console.log('Daftar Pengguna:');
+    console.log('================');
+    
+    users.forEach((user, index) => {
+      console.log(`\n[${index + 1}] ${user.nama} (${user.email})`);
+      console.log(`  Role: ${user.role.name} (${user.role.id})`);
+      console.log(`  Status: ${user.isActive ? 'Aktif' : 'Tidak Aktif'}`);
+      console.log(`  Terakhir Login: ${user.lastLogin || 'Belum pernah login'}`);
+      console.log(`  Dibuat pada: ${user.createdAt}`);
+    });
+    
+    console.log('\nTotal pengguna:', users.length);
+    
+  } catch (error) {
+    console.error('Error:', error);
+  } finally {
+    await prisma.$disconnect();
+  }
+}
+
+listUsers();
--- a/scripts/reset-passwords.ts
+++ b/scripts/reset-passwords.ts
@@ -0,0 +1,39 @@
+import { PrismaClient } from '@prisma/client';
+import bcrypt from 'bcryptjs';
+
+const prisma = new PrismaClient();
+
+async function resetPasswords() {
+  try {
+    // Password to set for all users
+    const newPassword = 'password123';
+    const hashedPassword = await bcrypt.hash(newPassword, 10);
+    
+    // Get all users
+    const users = await prisma.user.findMany();
+    
+    console.log('Resetting passwords for all users...');
+    
+    // Update each user's password
+    for (const user of users) {
+      await prisma.user.update({
+        where: { id: user.id },
+        data: {
+          password: hashedPassword,
+          isActive: true // Ensure all users are active
+        }
+      });
+      console.log(`✅ Reset password for ${user.email}`);
+    }
+    
+    console.log('\nSemua password telah direset ke: password123');
+    console.log('Silakan login dengan email yang ada dan password: password123');
+    
+  } catch (error) {
+    console.error('Error:', error);
+  } finally {
+    await prisma.$disconnect();
+  }
+}
+
+resetPasswords();
--- a/src/app/_com/SpashScreen.tsx
+++ b/src/app/_com/SpashScreen.tsx
@@ -23,7 +23,6 @@ export default function SpashScreen() {
      <Paper p={"md"} miw={320}>
        <Flex>
          <Image
-            loading="lazy"
            src={images["darmasaba-icon"]}
            alt="darmasaba"
            w={100}
--- a/src/app/admin/(dashboard)/_com/createEditor.tsx
+++ b/src/app/admin/(dashboard)/_com/createEditor.tsx
@@ -7,7 +7,6 @@ import Underline from '@tiptap/extension-underline';
 import TextAlign from '@tiptap/extension-text-align';
 import Superscript from '@tiptap/extension-superscript';
 import SubScript from '@tiptap/extension-subscript';
-import { useEffect } from 'react';

 type CreateEditorProps = {
  value: string;
@@ -33,13 +32,6 @@ export default function CreateEditor({ value, onChange }: CreateEditorProps) {
    },
  });

-  // 👇 Tambahkan efek untuk sinkronisasi value dari luar (resetForm)
-  useEffect(() => {
-    if (editor && value !== editor.getHTML()) {
-      editor.commands.setContent(value || '');
-    }
-  }, [value, editor]);
-
  return (
    <RichTextEditor editor={editor}>
      <RichTextEditor.Toolbar sticky stickyOffset="var(--docs-header-height)">
--- a/src/app/admin/(dashboard)/_com/editEditor.tsx
+++ b/src/app/admin/(dashboard)/_com/editEditor.tsx
@@ -47,7 +47,6 @@ export default function EditEditor({ value, onChange }: EditEditorProps) {
      editor.off('update', updateHandler);
    };
  }, [editor, onChange]);
-  

  return (
    <RichTextEditor editor={editor}>
--- a/src/app/admin/(dashboard)/_com/iconMap.tsx
+++ b/src/app/admin/(dashboard)/_com/iconMap.tsx
@@ -1,100 +0,0 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-'use client'
-
-import React from 'react'
-import {
-  IconLeaf,
-  IconTrophy,
-  IconTent,
-  IconChartLine,
-  IconRecycle,
-  IconTruck,
-  IconScale,
-  IconClipboard,
-  IconTrash,
-  IconHomeEco,
-  IconChristmasTreeFilled,
-  IconTrendingUp,
-  IconShieldFilled,
-  IconHome,
-  IconTree,
-  IconDroplet,
-  IconCash,
-  IconSchool,
-  IconShoppingCart,
-  IconHospital,
-  IconAmbulance,
-  IconFiretruck,
-  IconBuilding,
-  IconAlertTriangle,
-} from '@tabler/icons-react'
-
-export type IconKey =
-  | 'ekowisata'
-  | 'kompetisi'
-  | 'wisata'
-  | 'ekonomi'
-  | 'sampah'
-  | 'truck'
-  | 'scale'
-  | 'clipboard'
-  | 'trash'
-  | 'lingkunganSehat'
-  | 'sumberOksigen'
-  | 'ekonomiBerkelanjutan'
-  | 'mencegahBencana'
-  | 'rumah'
-  | 'pohon'
-  | 'air'
-  | 'bantuan'
-  | 'pelatihan'
-  | 'subsidi'
-  | 'layananKesehatan'
-  | 'polisi'
-  | 'ambulans'
-  | 'pemadam'
-  | 'rumahSakit'
-  | 'bangunan'
-  | 'darurat'
-
-
-const iconMap: Record<IconKey, React.FC<any>> = {
-  ekowisata: IconLeaf,
-  kompetisi: IconTrophy,
-  wisata: IconTent,
-  ekonomi: IconChartLine,
-  sampah: IconRecycle,
-  truck: IconTruck,
-  scale: IconScale,
-  clipboard: IconClipboard,
-  trash: IconTrash,
-  lingkunganSehat: IconHomeEco,
-  sumberOksigen: IconChristmasTreeFilled,
-  ekonomiBerkelanjutan: IconTrendingUp,
-  mencegahBencana: IconShieldFilled,
-  rumah: IconHome,
-  pohon: IconTree,
-  air: IconDroplet,
-  bantuan: IconCash,
-  pelatihan: IconSchool,
-  subsidi: IconShoppingCart,
-  layananKesehatan: IconHospital,
-  polisi: IconShieldFilled,
-  ambulans: IconAmbulance,
-  pemadam: IconFiretruck,
-  rumahSakit: IconHospital,
-  bangunan: IconBuilding,
-  darurat: IconAlertTriangle
-}
-
-type Props = {
-  name: IconKey
-  size?: number
-  color?: string
-}
-
-export const IconMapper: React.FC<Props> = ({ name, size = 24, color }) => {
-  const IconComponent = iconMap[name]
-  if (!IconComponent) return null
-  return <IconComponent size={size} color={color} />
-}
--- a/src/app/admin/(dashboard)/_com/selectIcon.tsx
+++ b/src/app/admin/(dashboard)/_com/selectIcon.tsx
@@ -3,24 +3,16 @@

 import { Box, rem, Select } from '@mantine/core';
 import {
-  IconAlertTriangle,
-  IconAmbulance,
-  IconBuilding,
-  IconCash,
  IconChartLine,
  IconChristmasTreeFilled,
  IconClipboardTextFilled,
  IconDroplet,
-  IconFiretruck,
  IconHome,
  IconHomeEco,
-  IconHospital,
  IconLeaf,
  IconRecycle,
  IconScale,
-  IconSchool,
  IconShieldFilled,
-  IconShoppingCart,
  IconTent,
  IconTrashFilled,
  IconTree,
@@ -40,23 +32,13 @@ const iconMap = {
  scale: { label: 'Scale', icon: IconScale },
  clipboard: { label: 'Clipboard', icon: IconClipboardTextFilled },
  trash: { label: 'Trash', icon: IconTrashFilled },
-  lingkunganSehat: { label: 'Lingkungan Sehat', icon: IconHomeEco },
-  sumberOksigen: { label: 'Sumber Oksigen', icon: IconChristmasTreeFilled },
-  ekonomiBerkelanjutan: { label: 'Ekonomi Berkelanjutan', icon: IconTrendingUp },
-  mencegahBencana: { label: 'Mencegah Bencana', icon: IconShieldFilled },
-  rumah: { label: 'Rumah', icon: IconHome },
-  pohon: { label: 'Pohon', icon: IconTree },
-  air: { label: 'Air', icon: IconDroplet },
-  bantuan: { label: 'Bantuan', icon: IconCash },
-  pelatihan: { label: 'Pelatihan', icon: IconSchool },
-  subsidi: { label: 'Subsidi', icon: IconShoppingCart },
-  layananKesehatan: { label: 'Layanan Kesehatan', icon: IconHospital },
-  polisi: { label: 'Polisi', icon: IconShieldFilled },
-  ambulans: { label: 'Ambulans', icon: IconAmbulance },
-  pemadam: { label: 'Pemadam', icon: IconFiretruck },
-  rumahSakit: { label: 'Rumah Sakit', icon: IconHospital },
-  bangunan: { label: 'Bangunan', icon: IconBuilding },
-  darurat: { label: 'Darurat', icon: IconAlertTriangle },
+  lingkunganSehat: {label: 'Lingkungan Sehat', icon: IconHomeEco},
+  sumberOksigen: {label: 'Sumber Oksigen', icon: IconChristmasTreeFilled},
+  ekonomiBerkelanjutan: {label: 'Ekonomi Berkelanjutan', icon: IconTrendingUp},
+  mencegahBencana: {label: 'Mencegah Bencana', icon: IconShieldFilled},
+  rumah: {label: 'Rumah', icon: IconHome},
+  pohon: {label: 'Pohon', icon: IconTree},
+  air: {label: 'Air', icon: IconDroplet}

 };

--- a/src/app/admin/(dashboard)/_com/selectIconEdit.tsx
+++ b/src/app/admin/(dashboard)/_com/selectIconEdit.tsx
@@ -1,31 +1,23 @@
-'use client';
+'use client'

-import { Box, Group, rem, Select, SelectProps } from '@mantine/core';
+import { Box, rem, Select } from '@mantine/core';
 import {
-  IconAmbulance,
-  IconCash,
  IconChartLine,
  IconChristmasTreeFilled,
  IconClipboardTextFilled,
  IconDroplet,
-  IconFiretruck,
  IconHome,
  IconHomeEco,
-  IconHospital,
  IconLeaf,
  IconRecycle,
  IconScale,
-  IconSchool,
  IconShieldFilled,
-  IconShoppingCart,
  IconTent,
  IconTrashFilled,
  IconTree,
  IconTrendingUp,
  IconTrophy,
  IconTruckFilled,
-  IconBuilding,
-  IconAlertTriangle,
 } from '@tabler/icons-react';

 const iconMap = {
@@ -38,26 +30,16 @@ const iconMap = {
  scale: { label: 'Scale', icon: IconScale },
  clipboard: { label: 'Clipboard', icon: IconClipboardTextFilled },
  trash: { label: 'Trash', icon: IconTrashFilled },
-  lingkunganSehat: { label: 'Lingkungan Sehat', icon: IconHomeEco },
-  sumberOksigen: { label: 'Sumber Oksigen', icon: IconChristmasTreeFilled },
-  ekonomiBerkelanjutan: { label: 'Ekonomi Berkelanjutan', icon: IconTrendingUp },
-  mencegahBencana: { label: 'Mencegah Bencana', icon: IconShieldFilled },
-  rumah: { label: 'Rumah', icon: IconHome },
-  pohon: { label: 'Pohon', icon: IconTree },
-  air: { label: 'Air', icon: IconDroplet },
-  bantuan: { label: 'Bantuan', icon: IconCash },
-  pelatihan: { label: 'Pelatihan', icon: IconSchool },
-  subsidi: { label: 'Subsidi', icon: IconShoppingCart },
-  layananKesehatan: { label: 'Layanan Kesehatan', icon: IconHospital },
-  polisi: { label: 'Polisi', icon: IconShieldFilled },
-  ambulans: { label: 'Ambulans', icon: IconAmbulance },
-  pemadam: { label: 'Pemadam', icon: IconFiretruck },
-  rumahSakit: { label: 'Rumah Sakit', icon: IconHospital },
-  bangunan: { label: 'Bangunan', icon: IconBuilding },
-  darurat: { label: 'Darurat', icon: IconAlertTriangle },
+  lingkunganSehat: {label: 'Lingkungan Sehat', icon: IconHomeEco},
+  sumberOksigen: {label: 'Sumber Oksigen', icon: IconChristmasTreeFilled},
+  ekonomiBerkelanjutan: {label: 'Ekonomi Berkelanjutan', icon: IconTrendingUp},
+  mencegahBencana: {label: 'Mencegah Bencana', icon: IconShieldFilled},
+  rumah: {label: 'Rumah', icon: IconHome},
+  pohon: {label: 'Pohon', icon: IconTree},
+  air: {label: 'Air', icon: IconDroplet}
 };

-export type IconKey = keyof typeof iconMap;
+type IconKey = keyof typeof iconMap;

 const iconList = Object.entries(iconMap).map(([value, data]) => ({
  value,
@@ -67,52 +49,44 @@ const iconList = Object.entries(iconMap).map(([value, data]) => ({
 export default function SelectIconProgramEdit({
  onChange,
  value,
-  ...props
 }: {
-  onChange: (value: IconKey | '') => void;
-  value: IconKey | '';
-} & Omit<SelectProps, 'onChange' | 'value' | 'data'>) {
+  onChange: (value: IconKey) => void;
+  value: IconKey;
+}) {
+  const IconComponent = iconMap[value]?.icon || null;
+
  return (
    <Box maw={300}>
      <Select
        placeholder="Pilih ikon"
-        value={value || ''}
-        onChange={(val: string | null) => {
-          if (val) {
-            onChange(val as IconKey);
-          } else {
-            onChange('');
-          }
+        value={value}
+        onChange={(value) => {
+          if (value) onChange(value as IconKey);
        }}
        data={iconList}
-        renderOption={({ option }) => {
-          const Icon = iconMap[option.value as IconKey]?.icon;
-          return (
-            <Group gap="sm">
-              {Icon && <Icon size={18} stroke={1.5} />}
-              {option.label}
-            </Group>
-          );
-        }}
        leftSection={
-          value && iconMap[value as IconKey] ? (
-            <Box ml={-4}>
-              {(() => {
-                const Icon = iconMap[value as IconKey].icon;
-                return <Icon size={20} stroke={1.5} />;
-              })()}
+          IconComponent && (
+            <Box>
+              <IconComponent size={24} stroke={1.5} />
            </Box>
-          ) : null
+          )
        }
-        searchable
+        withCheckIcon={false}
+        searchable={false}
+        rightSectionWidth={0}
        styles={{
          input: {
-            paddingLeft: 40,
+            textAlign: 'left',
            fontSize: rem(16),
+            paddingLeft: 40,
+          },
+          section: {
+            left: 10,
+            right: 'auto',
          },
        }}
-        {...props}
      />
    </Box>
  );
-}
+}
+
--- a/src/app/admin/(dashboard)/_state/desa/berita.ts
+++ b/src/app/admin/(dashboard)/_state/desa/berita.ts
@@ -74,12 +74,11 @@ const berita = proxy({
    totalPages: 1,
    loading: false,
    search: "",
-    load: async (page = 1, limit = 10, search = "", kategori = "") => {
-      const startTime = Date.now();
-      berita.findMany.loading = true;
+   load: async (page = 1, limit = 10, search = "", kategori = "") => {
+      berita.findMany.loading = true; // ✅ Akses langsung via nama path
      berita.findMany.page = page;
      berita.findMany.search = search;
-    
+  
      try {
        const query: any = { page, limit };
        if (search) query.search = search;
@@ -99,16 +98,9 @@ const berita = proxy({
        berita.findMany.data = [];
        berita.findMany.totalPages = 1;
      } finally {
-        // pastikan minimal 300ms sebelum loading = false (biar UX smooth)
-        const elapsed = Date.now() - startTime;
-        const minDelay = 300;
-        const delay = elapsed < minDelay ? minDelay - elapsed : 0;
-    
-        setTimeout(() => {
-          berita.findMany.loading = false;
-        }, delay);
+        berita.findMany.loading = false;
      }
-    },    
+    },
  },

  findUnique: {
@@ -376,37 +368,11 @@ const kategoriBerita = proxy({
        isActive: true;
      };
    }>[],
-    page: 1,
-    totalPages: 1,
    loading: false,
-    search: "",
-    load: async (page = 1, limit = 10, search = "") => {
-      kategoriBerita.findMany.loading = true; // ✅ Akses langsung via nama path
-      kategoriBerita.findMany.page = page;
-      kategoriBerita.findMany.search = search;
-
-      try {
-        const query: any = { page, limit };
-        if (search) query.search = search;
-
-        const res = await ApiFetch.api.desa.kategoriberita[
-          "findMany"
-        ].get({ query });
-
-        if (res.status === 200 && res.data?.success) {
-          kategoriBerita.findMany.data = res.data.data ?? [];
-          kategoriBerita.findMany.totalPages =
-            res.data.totalPages ?? 1;
-        } else {
-          kategoriBerita.findMany.data = [];
-          kategoriBerita.findMany.totalPages = 1;
-        }
-      } catch (err) {
-        console.error("Gagal fetch kategori berita paginated:", err);
-        kategoriBerita.findMany.data = [];
-        kategoriBerita.findMany.totalPages = 1;
-      } finally {
-        kategoriBerita.findMany.loading = false;
+    async load() {
+      const res = await ApiFetch.api.desa.kategoriberita["findMany"].get();
+      if (res.status === 200) {
+        kategoriBerita.findMany.data = res.data?.data ?? [];
      }
    },
  },
--- a/src/app/admin/(dashboard)/_state/desa/layananDesa.ts
+++ b/src/app/admin/(dashboard)/_state/desa/layananDesa.ts
@@ -30,6 +30,7 @@ const templateTelunjukSaktiDesaForm = z.object({
  deskripsi: z.string().min(3, "Deskripsi minimal 3 karakter"),
 });

+
 const templatePelayananPerizinanBerusaha = z.object({
  name: z.string().min(3, "Nama minimal 3 karakter"),
  deskripsi: z.string().min(3, "Deskripsi minimal 3 karakter"),
@@ -71,21 +72,6 @@ const pelayananPendudukNonPermanenForm = {
  deskripsi: "",
 };

-const templateAjukanForm = z.object({
-  nama: z.string().min(1).max(5000),
-  nik: z.string().min(1).max(5000),
-  alamat: z.string().min(1).max(5000),
-  nomorKk: z.string().min(1).max(5000),
-  kategoriId: z.string().min(1).max(5000),
-});
-
-const defaultAjukanForm = {
-  nama: "",
-  nik: "",
-  alamat: "",
-  nomorKk: "",
-  kategoriId: "",
-};

 const suratKeterangan = proxy({
  create: {
@@ -127,21 +113,16 @@ const suratKeterangan = proxy({
    totalPages: 1,
    total: 0,
    loading: false,
-    search: "",
-    load: async (page = 1, limit = 10, search = "") => {
-      // Change to arrow function
-      suratKeterangan.findMany.loading = true; // Use the full path to access the property
+    load: async (page = 1, limit = 10) => {  // Change to arrow function
+      suratKeterangan.findMany.loading = true;  // Use the full path to access the property
      suratKeterangan.findMany.page = page;
-      suratKeterangan.findMany.search = search;
      try {
-        const query: any = { page, limit };
-        if (search) query.search = search;
        const res = await ApiFetch.api.desa.layanan.pelayanansuratketerangan[
          "find-many"
        ].get({
-          query,
+          query: { page, limit },
        });
-
+  
        if (res.status === 200 && res.data?.success) {
          suratKeterangan.findMany.data = res.data.data || [];
          suratKeterangan.findMany.total = res.data.total || 0;
@@ -162,30 +143,6 @@ const suratKeterangan = proxy({
      }
    },
  },
-  findManyAll: {
-    data: null as Prisma.PelayananSuratKeteranganGetPayload<{
-      omit: { isActive: true };
-    }>[] | null,
-    loading: false,
-    load: async () => {
-      suratKeterangan.findManyAll.loading = true;
-      try {
-        const res = await ApiFetch.api.desa.layanan.pelayanansuratketerangan["findManyAll"].get();
-
-        if (res.status === 200 && res.data?.success) {
-          suratKeterangan.findManyAll.data = res.data.data || [];
-        } else {
-          suratKeterangan.findManyAll.data = [];
-          console.error("Failed to load surat keterangan all:", res.data?.message);
-        }
-      } catch (error) {
-        console.error("Error loading surat keterangan all:", error);
-        suratKeterangan.findManyAll.data = [];
-      } finally {
-        suratKeterangan.findManyAll.loading = false;
-      }
-    },
-  },
  findUnique: {
    data: null as Prisma.PelayananSuratKeteranganGetPayload<{
      include: {
@@ -384,34 +341,28 @@ const pelayananTelunjukSaktiDesa = proxy({
    totalPages: 1,
    total: 0,
    loading: false,
-    search: "",
-    load: async (page = 1, limit = 10, search = "") => {
-      // Change to arrow function
-      pelayananTelunjukSaktiDesa.findMany.loading = true; // Use the full path to access the property
+    load: async (page = 1, limit = 10) => {  // Change to arrow function
+      pelayananTelunjukSaktiDesa.findMany.loading = true;  // Use the full path to access the property
      pelayananTelunjukSaktiDesa.findMany.page = page;
-      pelayananTelunjukSaktiDesa.findMany.search = search;
      try {
-        const query: any = { page, limit };
-        if (search) query.search = search;
        const res = await ApiFetch.api.desa.layanan.pelayanantelunjuksaktidesa[
          "find-many"
        ].get({
-          query,
+          query: { page, limit },
        });
-
+  
        if (res.status === 200 && res.data?.success) {
          pelayananTelunjukSaktiDesa.findMany.data = res.data.data || [];
          pelayananTelunjukSaktiDesa.findMany.total = res.data.total || 0;
-          pelayananTelunjukSaktiDesa.findMany.totalPages =
-            res.data.totalPages || 1;
+          pelayananTelunjukSaktiDesa.findMany.totalPages = res.data.totalPages || 1;
        } else {
-          console.error("Failed to load surat keterangan:", res.data?.message);
+          console.error("Failed to load telunjuk sakti desa:", res.data?.message);
          pelayananTelunjukSaktiDesa.findMany.data = [];
-          suratKeterangan.findMany.total = 0;
-          suratKeterangan.findMany.totalPages = 1;
+          pelayananTelunjukSaktiDesa.findMany.total = 0;
+          pelayananTelunjukSaktiDesa.findMany.totalPages = 1;
        }
      } catch (error) {
-        console.error("Error loading surat keterangan:", error);
+        console.error("Error loading telunjuk sakti desa:", error);
        pelayananTelunjukSaktiDesa.findMany.data = [];
        pelayananTelunjukSaktiDesa.findMany.total = 0;
        pelayananTelunjukSaktiDesa.findMany.totalPages = 1;
@@ -459,9 +410,7 @@ const pelayananTelunjukSaktiDesa = proxy({
        );
        const result = await response.json();
        if (response.ok) {
-          toast.success(
-            result.message || "Telunjuk Sakti Desa berhasil dihapus"
-          );
+          toast.success(result.message || "Telunjuk Sakti Desa berhasil dihapus");
          await pelayananTelunjukSaktiDesa.findMany.load(); // refresh list
        } else {
          toast.error(result.message || "Gagal menghapus telunjuk sakti desa");
@@ -552,9 +501,7 @@ const pelayananTelunjukSaktiDesa = proxy({
        }
        const result = await response.json();
        if (result.success) {
-          toast.success(
-            result.message || "Telunjuk Sakti Desa berhasil diupdate"
-          );
+          toast.success(result.message || "Telunjuk Sakti Desa berhasil diupdate");
          await pelayananTelunjukSaktiDesa.findMany.load(); // refresh list
          return true;
        } else {
@@ -575,30 +522,39 @@ const pelayananTelunjukSaktiDesa = proxy({
      }
    },
  },
-});
+})

 const pelayananPerizinanBerusaha = proxy({
  findById: {
    data: null as pelayananPerizinanBerusahaForm | null,
    loading: false,
+    initialize() {
+      pelayananPerizinanBerusaha.findById.data = {
+        id: "",
+        name: "",
+        deskripsi: "",
+        link: "",
+      } as pelayananPerizinanBerusahaForm;
+    },
    async load(id: string) {
      try {
-        this.loading = true;
-        const response = await fetch(`/api/desa/layanan/pelayananperizinanberusaha/${id}`);
-        if (!response.ok) {
-          throw new Error(`HTTP error! status: ${response.status}`);
+        pelayananPerizinanBerusaha.findById.loading = true;
+        const res = await fetch(
+          `/api/desa/layanan/pelayananperizinanberusaha/${id}`
+        );
+        if (res.ok) {
+          const data = await res.json();
+          pelayananPerizinanBerusaha.findById.data = data.data ?? null;
+        } else {
+          console.error(
+            "Failed to fetch pelayanan perizinan berusaha:",
+            res.statusText
+          );
+          pelayananPerizinanBerusaha.findById.data = null;
        }
-        const result = await response.json();
-        if (result?.success) {
-          this.data = result.data;  // Make sure this matches your API response structure
-        }
-        return result?.data || null;
      } catch (error) {
-        console.error('Error loading data:', error);
-        toast.error('Gagal memuat data');
-        return null;
-      } finally {
-        this.loading = false;
+        console.error("Error fetching pelayanan perizinan berusaha:", error);
+        pelayananPerizinanBerusaha.findById.data = null;
      }
    },
  },
@@ -640,7 +596,9 @@ const pelayananPerizinanBerusaha = proxy({
      } catch (error) {
        console.error("Error fetching pelayanan perizinan berusaha:", error);
        toast.error(
-          error instanceof Error ? error.message : "Gagal memuat data"
+          error instanceof Error
+            ? error.message
+            : "Gagal memuat data"
        );
        return null;
      }
@@ -755,7 +713,9 @@ const pelayananPendudukNonPermanen = proxy({
      } catch (error) {
        console.error("Error fetching pelayanan penduduk non permanen:", error);
        toast.error(
-          error instanceof Error ? error.message : "Gagal memuat data"
+          error instanceof Error
+            ? error.message
+            : "Gagal memuat data"
        );
        return null;
      }
@@ -800,250 +760,11 @@ const pelayananPendudukNonPermanen = proxy({
  },
 });

-const ajukanPermohonan = proxy({
-  create: {
-    form: { ...defaultAjukanForm },
-    loading: false,
-    async create() {
-      const cek = templateAjukanForm.safeParse(
-        ajukanPermohonan.create.form
-      );
-      if (!cek.success) {
-        const err = `[${cek.error.issues
-          .map((v) => `${v.path.join(".")}`)
-          .join("\n")}] required`;
-        return toast.error(err);
-      }
-      try {
-        ajukanPermohonan.create.loading = true;
-        const res = await ApiFetch.api.desa.ajukanpermohonan[
-          "create"
-        ].post(ajukanPermohonan.create.form);
-        if (res.status === 200) {
-          ajukanPermohonan.findMany.load();
-          return toast.success("Ajukan permohonan berhasil disimpan!");
-        }
-        return toast.error("Gagal menyimpan ajukan permohonan");
-      } catch (error) {
-        console.log((error as Error).message);
-      } finally {
-        ajukanPermohonan.create.loading = false;
-      }
-    },
-    resetForm() {
-      ajukanPermohonan.create.form = { ...defaultAjukanForm };
-    },
-  },
-  findMany: {
-    data: null as Prisma.AjukanPermohonanGetPayload<{
-      include: {
-        kategori: true;
-      };
-    }>[] | null,
-    page: 1,
-    totalPages: 1,
-    total: 0,
-    loading: false,
-    search: "",
-    load: async (page = 1, limit = 10, search = "") => {
-      // Change to arrow function
-      ajukanPermohonan.findMany.loading = true; // Use the full path to access the property
-      ajukanPermohonan.findMany.page = page;
-      ajukanPermohonan.findMany.search = search;
-      try {
-        const query: any = { page, limit };
-        if (search) query.search = search;
-        const res = await ApiFetch.api.desa.ajukanpermohonan[
-          "findMany"
-        ].get({
-          query,
-        });
-
-        if (res.status === 200 && res.data?.success) {
-          ajukanPermohonan.findMany.data = res.data.data || [];
-          ajukanPermohonan.findMany.total = res.data.total || 0;
-          ajukanPermohonan.findMany.totalPages = res.data.totalPages || 1;
-        } else {
-          console.error("Failed to load ajukan permohonan:", res.data?.message);
-          ajukanPermohonan.findMany.data = [];
-          ajukanPermohonan.findMany.total = 0;
-          ajukanPermohonan.findMany.totalPages = 1;
-        }
-      } catch (error) {
-        console.error("Error loading ajukan permohonan:", error);
-        ajukanPermohonan.findMany.data = [];
-        ajukanPermohonan.findMany.total = 0;
-        ajukanPermohonan.findMany.totalPages = 1;
-      } finally {
-        ajukanPermohonan.findMany.loading = false;
-      }
-    },
-  },
-  findUnique: {
-    data: null as Prisma.AjukanPermohonanGetPayload<{
-      include: {
-        kategori: true;
-      }
-    }> | null,
-    async load(id: string) {
-      try {
-        const res = await fetch(
-          `/api/desa/ajukanpermohonan/${id}`
-        );
-        if (res.ok) {
-          const data = await res.json();
-          ajukanPermohonan.findUnique.data = data.data ?? null;
-        } else {
-          console.error("Failed to fetch ajukan permohonan:", res.statusText);
-          ajukanPermohonan.findUnique.data = null;
-        }
-      } catch (error) {
-        console.error("Error fetching ajukan permohonan:", error);
-        ajukanPermohonan.findUnique.data = null;
-      }
-    },
-  },
-  delete: {
-    loading: false,
-    async byId(id: string) {
-      if (!id) return toast.warn("ID tidak valid");
-      try {
-        ajukanPermohonan.delete.loading = true;
-        const response = await fetch(
-          `/api/desa/ajukanpermohonan/del/${id}`,
-          {
-            method: "DELETE",
-            headers: {
-              "Content-Type": "application/json",
-            },
-          }
-        );
-        const result = await response.json();
-        if (response.ok) {
-          toast.success(result.message || "Ajukan permohonan berhasil dihapus");
-          await ajukanPermohonan.findMany.load(); // refresh list
-        } else {
-          toast.error(result.message || "Gagal menghapus ajukan permohonan");
-        }
-      } catch (error) {
-        console.error("Gagal delete:", error);
-        toast.error("Terjadi kesalahan saat menghapus ajukan permohonan");
-      } finally {
-        ajukanPermohonan.delete.loading = false;
-      }
-    },
-  },
-  edit: {
-    id: "",
-    form: { ...defaultAjukanForm },
-    loading: false,
-
-    async load(id: string) {
-      if (!id) {
-        toast.warn("ID tidak valid");
-        return null;
-      }
-      try {
-        const response = await fetch(
-          `/api/desa/ajukanpermohonan/${id}`,
-          {
-            method: "GET",
-            headers: {
-              "Content-Type": "application/json",
-            },
-          }
-        );
-        if (!response.ok) {
-          throw new Error(`HTTP error! status: ${response.status}`);
-        }
-        const result = await response.json();
-        if (result?.success) {
-          const data = result.data;
-          this.id = data.id;
-          this.form = {
-            nama: data.nama,
-            nik: data.nik,
-            alamat: data.alamat,
-            nomorKk: data.nomorKk,
-            kategoriId: data.kategoriId,
-          };
-          return data;
-        } else {
-          throw new Error(result.message || "Gagal memuat data");
-        }
-      } catch (error) {
-        console.error("Error fetching ajukan permohonan:", error);
-        toast.error(
-          error instanceof Error ? error.message : "Gagal memuat data"
-        );
-        return null;
-      }
-    },
-    async update() {
-      const cek = templateAjukanForm.safeParse(
-        ajukanPermohonan.edit.form
-      );
-      if (!cek.success) {
-        const err = `[${cek.error.issues
-          .map((v) => `${v.path.join(".")}`)
-          .join("\n")}] required`;
-        return toast.error(err);
-      }
-      try {
-        ajukanPermohonan.edit.loading = true;
-        const response = await fetch(
-          `/api/desa/ajukanpermohonan/${this.id}`,
-          {
-            method: "PUT",
-            headers: {
-              "Content-Type": "application/json",
-            },
-            body: JSON.stringify({
-              nama: this.form.nama,
-              nik: this.form.nik,
-              alamat: this.form.alamat,
-              nomorKk: this.form.nomorKk,
-              kategoriId: this.form.kategoriId,
-            }),
-          }
-        );
-        if (!response.ok) {
-          const errorData = await response.json().catch(() => ({}));
-          throw new Error(
-            errorData.message || `HTTP error! status: ${response.status}`
-          );
-        }
-        const result = await response.json();
-        if (result.success) {
-          toast.success(result.message || "Ajukan permohonan berhasil diupdate");
-          await ajukanPermohonan.findMany.load(); // refresh list
-          return true;
-        } else {
-          throw new Error(
-            result.message || "Gagal mengupdate ajukan permohonan"
-          );
-        }
-      } catch (error) {
-        console.error("Error updating ajukan permohonan:", error);
-        toast.error(
-          error instanceof Error
-            ? error.message
-            : "Terjadi kesalahan saat update ajukan permohonan"
-        );
-        return false;
-      } finally {
-        ajukanPermohonan.edit.loading = false;
-      }
-    },
-  },
-});
-
 const stateLayananDesa = proxy({
  suratKeterangan,
  pelayananPerizinanBerusaha,
  pelayananTelunjukSaktiDesa,
  pelayananPendudukNonPermanen,
-  ajukanPermohonan,
 });

 export default stateLayananDesa;
--- a/src/app/admin/(dashboard)/_state/desa/penghargaan.ts
+++ b/src/app/admin/(dashboard)/_state/desa/penghargaan.ts
@@ -39,7 +39,7 @@ const penghargaanState = proxy({
        );
        if (res.status === 200) {
          penghargaanState.findMany.load();
-          return toast.success("Sukses menambahkan");
+          return toast.success("success create");
        }
        console.log(res);
        return toast.error("failed create");
@@ -56,21 +56,16 @@ const penghargaanState = proxy({
    totalPages: 1,
    total: 0,
    loading: false,
-    search: "",
-    load: async (page = 1, limit = 10, search = "") => {
-      // Change to arrow function
-      penghargaanState.findMany.loading = true; // Use the full path to access the property
+    load: async (page = 1, limit = 10) => {  // Change to arrow function
+      penghargaanState.findMany.loading = true;  // Use the full path to access the property
      penghargaanState.findMany.page = page;
-      penghargaanState.findMany.search = search;
      try {
-        const query: any = { page, limit };
-        if (search) query.search = search;
        const res = await ApiFetch.api.desa.penghargaan[
          "find-many"
        ].get({
-          query,
+          query: { page, limit },
        });
-
+  
        if (res.status === 200 && res.data?.success) {
          penghargaanState.findMany.data = res.data.data || [];
          penghargaanState.findMany.total = res.data.total || 0;
--- a/src/app/admin/(dashboard)/_state/desa/pengumuman.ts
+++ b/src/app/admin/(dashboard)/_state/desa/pengumuman.ts
@@ -55,39 +55,11 @@ const category = proxy({
        pengumumans: number;
      };
    })[],
-    page: 1,
-    totalPages: 1,
-    total: 0,
    loading: false,
-    search: "",
-    load: async (page = 1, limit = 10, search = "") => {  // Change to arrow function
-      category.findMany.loading = true;  // Use the full path to access the property
-      category.findMany.page = page;
-      category.findMany.search = search;
-      try {
-        const res = await ApiFetch.api.desa.kategoripengumuman[
-          "findMany"
-        ].get({
-          query: { page, limit },
-        });
-  
-        if (res.status === 200 && res.data?.success) {
-          category.findMany.data = res.data.data || [];
-          category.findMany.total = res.data.total || 0;
-          category.findMany.totalPages = res.data.totalPages || 1;
-        } else {
-          console.error("Failed to load potensi desa:", res.data?.message);
-          category.findMany.data = [];
-          category.findMany.total = 0;
-          category.findMany.totalPages = 1;
-        }
-      } catch (error) {
-        console.error("Error loading potensi desa:", error);
-        category.findMany.data = [];
-        category.findMany.total = 0;
-        category.findMany.totalPages = 1;
-      } finally {
-        category.findMany.loading = false;
+    async load() {
+      const res = await ApiFetch.api.desa.kategoripengumuman["findMany"].get();
+      if (res.status === 200) {
+        category.findMany.data = res.data?.data ?? [];
      }
    },
  },
@@ -287,7 +259,7 @@ const pengumuman = proxy({
        );
        if (res.status === 200) {
          pengumuman.findMany.load();
-          return toast.success("Sukses menambahkan");
+          return toast.success("success create");
        }
        console.log(res);
        return toast.error("failed create");
--- a/src/app/admin/(dashboard)/_state/desa/potensi.ts
+++ b/src/app/admin/(dashboard)/_state/desa/potensi.ts
@@ -56,11 +56,9 @@ const potensiDesa = proxy({
    totalPages: 1,
    total: 0,
    loading: false,
-    search: "",
-    load: async (page = 1, limit = 10, search = "") => {  // Change to arrow function
+    load: async (page = 1, limit = 10) => {  // Change to arrow function
      potensiDesa.findMany.loading = true;  // Use the full path to access the property
      potensiDesa.findMany.page = page;
-      potensiDesa.findMany.search = search;
      try {
        const res = await ApiFetch.api.desa.potensi[
          "find-many"
@@ -300,34 +298,11 @@ const kategoriPotensi = proxy({
        isActive: true;
      };
    }>[],
-    page: 1,
-    totalPages: 1,
    loading: false,
-    search: "",
-   load: async (page = 1, limit = 10, search = "") => {
-      kategoriPotensi.findMany.loading = true; // ✅ Akses langsung via nama path
-      kategoriPotensi.findMany.page = page;
-      kategoriPotensi.findMany.search = search;
-  
-      try {
-        const query: any = { page, limit };
-        if (search) query.search = search;
-    
-        const res = await ApiFetch.api.desa.kategoripotensi["findMany"].get({ query });
-    
-        if (res.status === 200 && res.data?.success) {
-          kategoriPotensi.findMany.data = res.data.data ?? [];
-          kategoriPotensi.findMany.totalPages = res.data.totalPages ?? 1;
-        } else {
-          kategoriPotensi.findMany.data = [];
-          kategoriPotensi.findMany.totalPages = 1;
-        }
-      } catch (err) {
-        console.error("Gagal fetch kategori potensi paginated:", err);
-        kategoriPotensi.findMany.data = [];
-        kategoriPotensi.findMany.totalPages = 1;
-      } finally {
-        kategoriPotensi.findMany.loading = false;
+    async load() {
+      const res = await ApiFetch.api.desa.kategoripotensi["findMany"].get();
+      if (res.status === 200) {
+        kategoriPotensi.findMany.data = res.data?.data ?? [];
      }
    },
  },
--- a/src/app/admin/(dashboard)/_state/ekonomi/PADesa.ts
+++ b/src/app/admin/(dashboard)/_state/ekonomi/PADesa.ts
@@ -7,13 +7,9 @@ import { z } from "zod";

 const templateApbDesa = z.object({
  tahun: z.number().min(4, "Tahun minimal 4 karakter"),
-  pembiayaanIds: z
-    .array(z.string().uuid())
-    .nonempty("Pilih minimal 1 pembiayaan"),
+  pembiayaanIds: z.array(z.string().uuid()).nonempty("Pilih minimal 1 pembiayaan"),
  belanjaIds: z.array(z.string().uuid()).nonempty("Pilih minimal 1 belanja"),
-  pendapatanIds: z
-    .array(z.string().uuid())
-    .nonempty("Pilih minimal 1 pendapatan"),
+  pendapatanIds: z.array(z.string().uuid()).nonempty("Pilih minimal 1 pendapatan"),
 });

 const ApbDesaDefaultForm = {
@@ -58,81 +54,35 @@ const ApbDesa = proxy({
    },
  },
  findMany: {
-    data: null as
-      | Prisma.ApbDesaGetPayload<{
-          include: {
-            pendapatan: true;
-            belanja: true;
-            pembiayaan: true;
-          };
-        }>[]
-      | null,
-    page: 1,
-    totalPages: 1,
+    data: null as 
+    | Prisma.ApbDesaGetPayload<{
+      include: {
+        pendapatan: true;
+        belanja: true;
+        pembiayaan: true;
+      };
+    }>[]
+    | null,
    loading: false,
-    search: "",
-    load: async (page = 1, limit = 10, search = "") => {
-      ApbDesa.findMany.loading = true; // ✅ Akses langsung via nama path
-      ApbDesa.findMany.page = page;
-      ApbDesa.findMany.search = search;
-
-      try {
-        const query: any = { page, limit };
-        if (search) query.search = search;
-
-        const res = await ApiFetch.api.ekonomi.pendapatanaslidesa.apbdesa[
-          "find-many"
-        ].get({ query });
-
-        if (res.status === 200 && res.data?.success) {
-          ApbDesa.findMany.data = res.data.data ?? [];
-          ApbDesa.findMany.totalPages =
-            res.data.totalPages ?? 1;
-        } else {
-          ApbDesa.findMany.data = [];
-          ApbDesa.findMany.totalPages = 1;
-        }
-      } catch (err) {
-        console.error("Gagal fetch APB Desa paginated:", err);
-        ApbDesa.findMany.data = [];
-        ApbDesa.findMany.totalPages = 1;
-      } finally {
-        ApbDesa.findMany.loading = false;
-      }
-    },
-  },
-  findFirst: {
-    data: null as Prisma.ApbDesaGetPayload<{
-      include: { pendapatan: true; belanja: true; pembiayaan: true };
-    }> | null,
-    loading: false,
-    async load(params?: Record<string, any>) {
+    async load() {
      try {
        this.loading = true;
-  
-        // ✅ request ke endpoint find-first
        const res = await ApiFetch.api.ekonomi.pendapatanaslidesa.apbdesa[
-          "find-first"
-        ].get({ query: params || {} });
-  
-        if (res.status === 200 && res.data?.success) {
-          this.data = res.data.data ?? null;
+          "find-many"
+        ].get();
+        if (res.status === 200) {
+          this.data = res.data?.data ?? [];
        } else {
-          this.data = null;
-          toast.error(res.data?.message || "Gagal memuat data pertama APB Desa");
+          toast.error(res.data?.message || "Gagal mengambil APB Desa");
        }
      } catch (error) {
-        console.error("Error findFirst APB Desa:", error);
-        toast.error("Gagal memuat data APB Desa pertama");
-        this.data = null;
+        console.error("Find many error:", error);
+        toast.error("Gagal mengambil APB Desa");
      } finally {
        this.loading = false;
      }
    },
-    reset() {
-      this.data = null;
-    },
-  },  
+  },
  update: {
    id: "",
    form: { ...ApbDesaDefaultForm },
@@ -156,13 +106,13 @@ const ApbDesa = proxy({
          throw new Error("Gagal mengambil APB Desa");
        }
        const result = await response.json();
-
+    
        if (!result.success) {
          throw new Error(result.message || "Gagal memuat APB Desa");
        }
-
+    
        const data = result.data;
-
+    
        this.id = id;
        this.form = {
          tahun: data.tahun || 0,
@@ -170,7 +120,7 @@ const ApbDesa = proxy({
          belanjaIds: data.belanja?.map((b: any) => b.id) || [],
          pembiayaanIds: data.pembiayaan?.map((p: any) => p.id) || [],
        };
-
+    
        return data;
      } catch (error) {
        console.error("Error loading APB Desa:", error);
@@ -239,7 +189,7 @@ const ApbDesa = proxy({
    data: null as Prisma.ApbDesaGetPayload<{
      include: { pendapatan: true; belanja: true; pembiayaan: true };
    }> | null,
-
+  
    async load(id: string) {
      try {
        const response = await fetch(
@@ -249,11 +199,11 @@ const ApbDesa = proxy({
          throw new Error("Gagal mengambil detail APB Desa");
        }
        const result = await response.json();
-
+  
        if (!result.success) {
          throw new Error(result.message || "Gagal mengambil data");
        }
-
+  
        this.data = result.data; // ✅ fix utama di sini
        return result.data;
      } catch (error) {
@@ -314,32 +264,34 @@ const pendapatan = proxy({
    data: null as any[] | null,
    page: 1,
    totalPages: 1,
+    total: 0,
    loading: false,
-    search: "",
-    load: async (page = 1, limit = 10, search = "") => {
-      pendapatan.findMany.loading = true; // ✅ Akses langsung via nama path
+    load: async (page = 1, limit = 10) => {
+      // Change to arrow function
+      pendapatan.findMany.loading = true; // Use the full path to access the property
      pendapatan.findMany.page = page;
-      pendapatan.findMany.search = search;
-
      try {
-        const query: any = { page, limit };
-        if (search) query.search = search;
-
-        const res = await ApiFetch.api.ekonomi.pendapatanaslidesa.pendapatanasli[
-          "find-many"
-        ].get({ query });
+        const res =
+          await ApiFetch.api.ekonomi.pendapatanaslidesa.pendapatanasli[
+            "find-many"
+          ].get({
+            query: { page, limit },
+          });

        if (res.status === 200 && res.data?.success) {
-          pendapatan.findMany.data = res.data.data ?? [];
-          pendapatan.findMany.totalPages =
-            res.data.totalPages ?? 1;
+          pendapatan.findMany.data = res.data.data || [];
+          pendapatan.findMany.total = res.data.total || 0;
+          pendapatan.findMany.totalPages = res.data.totalPages || 1;
        } else {
+          console.error("Failed to load pendapatan:", res.data?.message);
          pendapatan.findMany.data = [];
+          pendapatan.findMany.total = 0;
          pendapatan.findMany.totalPages = 1;
        }
-      } catch (err) {
-        console.error("Gagal fetch pendapatan asli desa paginated:", err);
+      } catch (error) {
+        console.error("Error loading pendapatan:", error);
        pendapatan.findMany.data = [];
+        pendapatan.findMany.total = 0;
        pendapatan.findMany.totalPages = 1;
      } finally {
        pendapatan.findMany.loading = false;
@@ -356,15 +308,12 @@ const pendapatan = proxy({
        return null;
      }
      try {
-        const response = await fetch(
-          `/api/ekonomi/pendapatanaslidesa/pendapatanasli/${id}`,
-          {
-            method: "GET",
-            headers: {
-              "Content-Type": "application/json",
-            },
-          }
-        );
+        const response = await fetch(`/api/ekonomi/pendapatanaslidesa/pendapatanasli/${id}`, {
+          method: "GET",
+          headers: {
+            "Content-Type": "application/json",
+          },
+        });
        if (!response.ok) {
          throw new Error(`HTTP error! status: ${response.status}`);
        }
@@ -400,19 +349,16 @@ const pendapatan = proxy({

      try {
        pendapatan.update.loading = true;
-        const response = await fetch(
-          `/api/ekonomi/pendapatanaslidesa/pendapatanasli/${this.id}`,
-          {
-            method: "PUT",
-            headers: {
-              "Content-Type": "application/json",
-            },
-            body: JSON.stringify({
-              name: this.form.name,
-              value: this.form.value,
-            }),
-          }
-        );
+        const response = await fetch(`/api/ekonomi/pendapatanaslidesa/pendapatanasli/${this.id}`, {
+          method: "PUT",
+          headers: {
+            "Content-Type": "application/json",
+          },
+          body: JSON.stringify({
+            name: this.form.name,
+            value: this.form.value,
+          }),
+        });
        if (!response.ok) {
          const errorData = await response.json().catch(() => ({}));
          throw new Error(
@@ -549,37 +495,23 @@ const belanja = proxy({
      name: string;
      value: number;
    }>,
-    page: 1,
-    totalPages: 1,
    loading: false,
-    search: "",
-    load: async (page = 1, limit = 10, search = "") => {
-      belanja.findMany.loading = true; // ✅ Akses langsung via nama path
-      belanja.findMany.page = page;
-      belanja.findMany.search = search;
-
+    async load() {
      try {
-        const query: any = { page, limit };
-        if (search) query.search = search;
-
+        this.loading = true;
        const res = await ApiFetch.api.ekonomi.pendapatanaslidesa.belanja[
          "find-many"
-        ].get({ query });
-
-        if (res.status === 200 && res.data?.success) {
-          belanja.findMany.data = res.data.data ?? [];
-          belanja.findMany.totalPages =
-            res.data.totalPages ?? 1;
+        ].get();
+        if (res.status === 200) {
+          this.data = res.data?.data ?? [];
        } else {
-          belanja.findMany.data = [];
-          belanja.findMany.totalPages = 1;
+          toast.error(res.data?.message || "Gagal mengambil Belanja");
        }
-      } catch (err) {
-        console.error("Gagal fetch Belanja paginated:", err);
-        belanja.findMany.data = [];
-        belanja.findMany.totalPages = 1;
+      } catch (error) {
+        console.error("Find many error:", error);
+        toast.error("Gagal mengambil Belanja");
      } finally {
-        belanja.findMany.loading = false;
+        this.loading = false;
      }
    },
  },
@@ -593,15 +525,12 @@ const belanja = proxy({
        return null;
      }
      try {
-        const response = await fetch(
-          `/api/ekonomi/pendapatanaslidesa/belanja/${id}`,
-          {
-            method: "GET",
-            headers: {
-              "Content-Type": "application/json",
-            },
-          }
-        );
+        const response = await fetch(`/api/ekonomi/pendapatanaslidesa/belanja/${id}`, {
+          method: "GET",
+          headers: {
+            "Content-Type": "application/json",
+          },
+        });
        if (!response.ok) {
          throw new Error(`HTTP error! status: ${response.status}`);
        }
@@ -637,19 +566,16 @@ const belanja = proxy({

      try {
        belanja.update.loading = true;
-        const response = await fetch(
-          `/api/ekonomi/pendapatanaslidesa/belanja/${this.id}`,
-          {
-            method: "PUT",
-            headers: {
-              "Content-Type": "application/json",
-            },
-            body: JSON.stringify({
-              name: this.form.name,
-              value: this.form.value,
-            }),
-          }
-        );
+        const response = await fetch(`/api/ekonomi/pendapatanaslidesa/belanja/${this.id}`, {
+          method: "PUT",
+          headers: {
+            "Content-Type": "application/json",
+          },
+          body: JSON.stringify({
+            name: this.form.name,
+            value: this.form.value,
+          }),
+        });
        if (!response.ok) {
          const errorData = await response.json().catch(() => ({}));
          throw new Error(
@@ -784,37 +710,23 @@ const pembiayaan = proxy({
      name: string;
      value: number;
    }>,
-    page: 1,
-    totalPages: 1,
    loading: false,
-    search: "",
-    load: async (page = 1, limit = 10, search = "") => {
-      pembiayaan.findMany.loading = true; // ✅ Akses langsung via nama path
-      pembiayaan.findMany.page = page;
-      pembiayaan.findMany.search = search;
-
+    async load() {
      try {
-        const query: any = { page, limit };
-        if (search) query.search = search;
-
+        this.loading = true;
        const res = await ApiFetch.api.ekonomi.pendapatanaslidesa.pembiayaan[
          "find-many"
-        ].get({ query });
-
-        if (res.status === 200 && res.data?.success) {
-          pembiayaan.findMany.data = res.data.data ?? [];
-          pembiayaan.findMany.totalPages =
-            res.data.totalPages ?? 1;
+        ].get();
+        if (res.status === 200) {
+          this.data = res.data?.data ?? [];
        } else {
-          pembiayaan.findMany.data = [];
-          pembiayaan.findMany.totalPages = 1;
+          toast.error(res.data?.message || "Gagal mengambil Pembiayaan");
        }
-      } catch (err) {
-        console.error("Gagal fetch Pembiayaan paginated:", err);
-        pembiayaan.findMany.data = [];
-        pembiayaan.findMany.totalPages = 1;
+      } catch (error) {
+        console.error("Find many error:", error);
+        toast.error("Gagal mengambil Pembiayaan");
      } finally {
-        pembiayaan.findMany.loading = false;
+        this.loading = false;
      }
    },
  },
@@ -828,15 +740,12 @@ const pembiayaan = proxy({
        return null;
      }
      try {
-        const response = await fetch(
-          `/api/ekonomi/pendapatanaslidesa/pembiayaan/${id}`,
-          {
-            method: "GET",
-            headers: {
-              "Content-Type": "application/json",
-            },
-          }
-        );
+        const response = await fetch(`/api/ekonomi/pendapatanaslidesa/pembiayaan/${id}`, {
+          method: "GET",
+          headers: {
+            "Content-Type": "application/json",
+          },
+        });
        if (!response.ok) {
          throw new Error(`HTTP error! status: ${response.status}`);
        }
@@ -872,19 +781,16 @@ const pembiayaan = proxy({

      try {
        pembiayaan.update.loading = true;
-        const response = await fetch(
-          `/api/ekonomi/pendapatanaslidesa/pembiayaan/${this.id}`,
-          {
-            method: "PUT",
-            headers: {
-              "Content-Type": "application/json",
-            },
-            body: JSON.stringify({
-              name: this.form.name,
-              value: this.form.value,
-            }),
-          }
-        );
+        const response = await fetch(`/api/ekonomi/pendapatanaslidesa/pembiayaan/${this.id}`, {
+          method: "PUT",
+          headers: {
+            "Content-Type": "application/json",
+          },
+          body: JSON.stringify({
+            name: this.form.name,
+            value: this.form.value,
+          }),
+        });
        if (!response.ok) {
          const errorData = await response.json().catch(() => ({}));
          throw new Error(
--- a/src/app/admin/(dashboard)/_state/ekonomi/demografi-pekerjaan.ts
+++ b/src/app/admin/(dashboard)/_state/ekonomi/demografi-pekerjaan.ts
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
 import ApiFetch from "@/lib/api-fetch";
 import { Prisma } from "@prisma/client";
 import { toast } from "react-toastify";
@@ -49,7 +48,7 @@ const demografiPekerjaan = proxy({
        if (res.status === 200) {
          const id = res.data?.data?.id;
          if (id) {
-            toast.success("Sukses menambahkan");
+            toast.success("Success create");
            demografiPekerjaan.create.form = { ...defaultForm };
            demografiPekerjaan.findMany.load();
            return id;
@@ -72,37 +71,12 @@ const demografiPekerjaan = proxy({
          omit: { isActive: true };
        }>[]
      | null,
-    page: 1,
-    totalPages: 1,
-    loading: false,
-    search: "",
-    load: async (page = 1, limit = 10, search = "") => {
-      demografiPekerjaan.findMany.loading = true; // ✅ Akses langsung via nama path
-      demografiPekerjaan.findMany.page = page;
-      demografiPekerjaan.findMany.search = search;
-
-      try {
-        const query: any = { page, limit };
-        if (search) query.search = search;
-
-        const res = await ApiFetch.api.ekonomi.demografipekerjaan[
-          "find-many"
-        ].get({ query });
-
-        if (res.status === 200 && res.data?.success) {
-          demografiPekerjaan.findMany.data = res.data.data ?? [];
-          demografiPekerjaan.findMany.totalPages =
-            res.data.totalPages ?? 1;
-        } else {
-          demografiPekerjaan.findMany.data = [];
-          demografiPekerjaan.findMany.totalPages = 1;
-        }
-      } catch (err) {
-        console.error("Gagal fetch demografi pekerjaan paginated:", err);
-        demografiPekerjaan.findMany.data = [];
-        demografiPekerjaan.findMany.totalPages = 1;
-      } finally {
-        demografiPekerjaan.findMany.loading = false;
+    async load() {
+      const res = await ApiFetch.api.ekonomi.demografipekerjaan[
+        "find-many"
+      ].get();
+      if (res.status === 200) {
+        demografiPekerjaan.findMany.data = res.data?.data ?? [];
      }
    },
  },
@@ -220,4 +194,4 @@ const demografiPekerjaan = proxy({
    },
  },
 });
-export default demografiPekerjaan;
+export default demografiPekerjaan
--- a/src/app/admin/(dashboard)/_state/ekonomi/jumlah-penduduk-miskin.ts
+++ b/src/app/admin/(dashboard)/_state/ekonomi/jumlah-penduduk-miskin.ts
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
 import ApiFetch from "@/lib/api-fetch";
 import { Prisma } from "@prisma/client";
 import { toast } from "react-toastify";
@@ -47,7 +46,7 @@ const jumlahPendudukMiskin = proxy({
        if (res.status === 200) {
          const id = res.data?.data?.id;
          if (id) {
-            toast.success("Sukses menambahkan");
+            toast.success("Success create");
            jumlahPendudukMiskin.create.form = {
              year: 0,
              totalPoorPopulation: 0,
@@ -70,37 +69,16 @@ const jumlahPendudukMiskin = proxy({
          select: { id: true; year: true; totalPoorPopulation: true };
        }>[]
      | null,
-      page: 1,
-      totalPages: 1,
-      loading: false,
-      search: "",
-     load: async (page = 1, limit = 10, search = "") => {
-        jumlahPendudukMiskin.findMany.loading = true; // ✅ Akses langsung via nama path
-        jumlahPendudukMiskin.findMany.page = page;
-        jumlahPendudukMiskin.findMany.search = search;
-    
-        try {
-          const query: any = { page, limit };
-          if (search) query.search = search;
-      
-          const res = await ApiFetch.api.ekonomi.jumlahpendudukmiskin["find-many"].get({ query });
-      
-          if (res.status === 200 && res.data?.success) {
-            jumlahPendudukMiskin.findMany.data = res.data.data ?? [];
-            jumlahPendudukMiskin.findMany.totalPages = res.data.totalPages ?? 1;
-          } else {
-            jumlahPendudukMiskin.findMany.data = [];
-            jumlahPendudukMiskin.findMany.totalPages = 1;
-          }
-        } catch (err) {
-          console.error("Gagal fetch jumlah penduduk miskin paginated:", err);
-          jumlahPendudukMiskin.findMany.data = [];
-          jumlahPendudukMiskin.findMany.totalPages = 1;
-        } finally {
-          jumlahPendudukMiskin.findMany.loading = false;
-        }
-      },
+    loading: false,
+    async load() {
+      const res = await ApiFetch.api.ekonomi.jumlahpendudukmiskin[
+        "find-many"
+      ].get();
+      if (res.status === 200) {
+        jumlahPendudukMiskin.findMany.data = res.data?.data ?? [];
+      }
    },
+  },
  findUnique: {
    data: null as Prisma.GrafikJumlahPendudukMiskinGetPayload<{
      select: { id: true; year: true; totalPoorPopulation: true };
--- a/src/app/admin/(dashboard)/_state/ekonomi/jumlah-pengangguran.ts
+++ b/src/app/admin/(dashboard)/_state/ekonomi/jumlah-pengangguran.ts
@@ -15,8 +15,7 @@ const templateJumlahPengngguran = z.object({
  uneducatedUnemployment: z
    .number()
    .min(1, "Pengangguran tidak pendidikan harus diisi"),
-    percentageChange: z.number({ invalid_type_error: "Persentase perubahan harus angka" }),
-
+  percentageChange: z.number().min(0, "Persentase perubahan harus diisi"),
 });

 type JumlahPengangguran = {
@@ -30,7 +29,7 @@ type JumlahPengangguran = {

 const jumlahPengangguranForm: JumlahPengangguran = {
  month: "",
-  year: new Date().getFullYear(), // Default to current year
+  year: 0,
  totalUnemployment: 0,
  educatedUnemployment: 0,
  uneducatedUnemployment: 0,
@@ -61,21 +60,13 @@ const jumlahPengangguran = proxy({
    form: jumlahPengangguranForm,
    loading: false,
    async create() {
-      // Ensure all number fields are actual numbers
-      const formData = {
-        ...jumlahPengangguran.create.form,
-        year: Number(jumlahPengangguran.create.form.year) || new Date().getFullYear(),
-        totalUnemployment: Number(jumlahPengangguran.create.form.totalUnemployment) || 0,
-        educatedUnemployment: Number(jumlahPengangguran.create.form.educatedUnemployment) || 0,
-        uneducatedUnemployment: Number(jumlahPengangguran.create.form.uneducatedUnemployment) || 0,
-        percentageChange: Number(jumlahPengangguran.create.form.percentageChange) || 0,
-      };
-
-      const cek = templateJumlahPengngguran.safeParse(formData);
+      const cek = templateJumlahPengngguran.safeParse(
+        jumlahPengangguran.create.form
+      );
      if (!cek.success) {
        const err = `[${cek.error.issues
-          .map((v) => `${v.path.join(".")} (${v.message})`)
-          .join("\n")}]`;
+          .map((v) => `${v.path.join(".")}`)
+          .join("\n")}] required`;
        toast.error(err);
        return null;
      }
@@ -87,9 +78,9 @@ const jumlahPengangguran = proxy({
          ].post(jumlahPengangguran.create.form);

        if (res.status === 200) {
-          const id = res.data?.id;
+          const id = res.data?.data?.id;
          if (id) {
-            toast.success("Sukses menambahkan");
+            toast.success("Success create");
            jumlahPengangguran.create.form = { ...jumlahPengangguranForm };
            jumlahPengangguran.findMany.load();
            return id;
@@ -112,40 +103,16 @@ const jumlahPengangguran = proxy({
          omit: { isActive: true };
        }>[]
      | null,
-      page: 1,
-      totalPages: 1,
-      loading: false,
-      search: "",
-      load: async (page = 1, limit = 10, search = "") => {
-        jumlahPengangguran.findMany.loading = true; // ✅ Akses langsung via nama path
-        jumlahPengangguran.findMany.page = page;
-        jumlahPengangguran.findMany.search = search;
-  
-        try {
-          const query: any = { page, limit };
-          if (search) query.search = search;
-  
-          const res = await ApiFetch.api.ekonomi.jumlahpengangguran.detaildatapengangguran[
-            "find-many"
-          ].get({ query });
-  
-          if (res.status === 200 && res.data?.success) {
-            jumlahPengangguran.findMany.data = res.data.data ?? [];
-            jumlahPengangguran.findMany.totalPages =
-              res.data.totalPages ?? 1;
-          } else {
-            jumlahPengangguran.findMany.data = [];
-            jumlahPengangguran.findMany.totalPages = 1;
-          }
-        } catch (err) {
-          console.error("Gagal fetch jumlah pengangguran paginated:", err);
-          jumlahPengangguran.findMany.data = [];
-          jumlahPengangguran.findMany.totalPages = 1;
-        } finally {
-          jumlahPengangguran.findMany.loading = false;
-        }
-      },
+    async load() {
+      const res =
+        await ApiFetch.api.ekonomi.jumlahpengangguran.detaildatapengangguran[
+          "find-many"
+        ].get();
+      if (res.status === 200) {
+        jumlahPengangguran.findMany.data = res.data?.data ?? [];
+      }
    },
+  },

  findUnique: {
    data: null as Prisma.DetailDataPengangguranGetPayload<{
--- a/src/app/admin/(dashboard)/_state/ekonomi/lowongan-kerja.ts
+++ b/src/app/admin/(dashboard)/_state/ekonomi/lowongan-kerja.ts
@@ -13,7 +13,6 @@ const templateForm = z.object({
  gaji: z.string(),
  deskripsi: z.string(),
  kualifikasi: z.string(),
-  notelp: z.string(),
 });

 const defaultForm = {
@@ -24,7 +23,6 @@ const defaultForm = {
  gaji: "",
  deskripsi: "",
  kualifikasi: "",
-  notelp: "",
 };

 const lowonganKerjaState = proxy({
@@ -47,7 +45,7 @@ const lowonganKerjaState = proxy({
        );
        if (res.status === 200) {
          lowonganKerjaState.create.loading = false;
-          return toast.success("Sukses menambahkan");
+          return toast.success("success create");
        }
        console.log(res);
        return toast.error("failed create");
@@ -181,7 +179,6 @@ const lowonganKerjaState = proxy({
            gaji: data.gaji,
            deskripsi: data.deskripsi,
            kualifikasi: data.kualifikasi,
-            notelp: data.notelp,
          };
          return data;
        } else {
@@ -221,7 +218,6 @@ const lowonganKerjaState = proxy({
            gaji: this.form.gaji,
            deskripsi: this.form.deskripsi,
            kualifikasi: this.form.kualifikasi,
-            notelp: this.form.notelp,
          }),
        });
        if (!response.ok) {
--- a/src/app/admin/(dashboard)/_state/ekonomi/pasar-desa/pasar-desa.ts
+++ b/src/app/admin/(dashboard)/_state/ekonomi/pasar-desa/pasar-desa.ts
@@ -12,7 +12,6 @@ const templatePasarDesaForm = z.object({
  imageId: z.string().min(1, "Gambar wajib dipilih"),
  rating: z.number().min(1, "Rating minimal 1"),
  kategoriId: z.array(z.string()).min(1, "Minimal pilih satu kategori"),
-  kontak: z.string().min(1, "Kontak wajib diisi"),
 });

 const defaultPasarDesaForm = {
@@ -22,7 +21,6 @@ const defaultPasarDesaForm = {
  imageId: "",
  rating: 0,
  kategoriId: [] as string[],
-  kontak: "",
 };

 const pasarDesa = proxy({
@@ -190,7 +188,6 @@ const pasarDesa = proxy({
            imageId: data.imageId,
            rating: data.rating,
            kategoriId: data.kategoriId,
-            kontak: data.kontak,
          };
          return data;
        } else {
@@ -228,7 +225,6 @@ const pasarDesa = proxy({
            imageId: this.form.imageId,
            rating: this.form.rating,
            kategoriId: this.form.kategoriId,
-            kontak: this.form.kontak,
          }),
        });
        if (!response.ok) {
@@ -340,40 +336,6 @@ const kategoriProduk = proxy({
      }
    },
  },
-  // ✅ Versi findManyAll (ambil semua tanpa pagination)
-  findManyAll: {
-    data: null as
-      | Prisma.KategoriProdukGetPayload<{
-          omit: { isActive: true };
-        }>[]
-      | null,
-    loading: false,
-    search: "",
-    load: async (search = "") => {
-      kategoriProduk.findManyAll.loading = true;
-      kategoriProduk.findManyAll.search = search;
-
-      try {
-        const query: any = {};
-        if (search) query.search = search;
-
-        const res = await ApiFetch.api.ekonomi.kategoriproduk["find-many-all"].get({
-          query,
-        });
-
-        if (res.status === 200 && res.data?.success) {
-          kategoriProduk.findManyAll.data = res.data.data ?? [];
-        } else {
-          kategoriProduk.findManyAll.data = [];
-        }
-      } catch (err) {
-        console.error("Gagal fetch kategori produk (all):", err);
-        kategoriProduk.findManyAll.data = [];
-      } finally {
-        kategoriProduk.findManyAll.loading = false;
-      }
-    },
-  },
  findUnique: {
    data: null as Prisma.KategoriProdukGetPayload<{
      omit: { isActive: true };
--- a/src/app/admin/(dashboard)/_state/ekonomi/program-kemiskinan.ts
+++ b/src/app/admin/(dashboard)/_state/ekonomi/program-kemiskinan.ts
@@ -8,7 +8,7 @@ import { z } from "zod";
 const templateForm = z.object({
  nama: z.string().min(1, "Nama minimal 1 karakter"),
  deskripsi: z.string().min(1, "Deskripsi minimal 1 karakter"),
-  icon: z.string().min(1, "Icon minimal 1 karakter"),
+  ikonUrl: z.string().optional(),
  statistik: z.object({
    tahun: z.string().min(1, "Tahun minimal 1 karakter"),
    jumlah: z.string().min(1, "Jumlah minimal 1 karakter"),
@@ -18,7 +18,7 @@ const templateForm = z.object({
 const defaultForm = {
  nama: "",
  deskripsi: "",
-  icon: "",
+  ikonUrl: "",
  statistik: {
    tahun: "",
    jumlah: "",
@@ -45,7 +45,7 @@ const programKemiskinanState = proxy({
        );
        if (res.status === 200) {
          programKemiskinanState.findMany.load();
-          return toast.success("Sukses menambahkan");
+          return toast.success("success create");
        }
        console.log(res);
        return toast.error("failed create");
@@ -148,7 +148,7 @@ const programKemiskinanState = proxy({
          this.form = {
            nama: data.nama,
            deskripsi: data.deskripsi,
-            icon: data.icon,
+            ikonUrl: data.ikonUrl || "",
            statistik: {
              tahun: data.statistik.tahun,
              jumlah: data.statistik.jumlah,
@@ -189,7 +189,7 @@ const programKemiskinanState = proxy({
            body: JSON.stringify({
              nama: this.form.nama,
              deskripsi: this.form.deskripsi,
-              icon: this.form.icon,
+              ikonUrl: this.form.ikonUrl,
              statistik: {
                tahun: this.form.statistik.tahun,
                jumlah: this.form.statistik.jumlah,
--- a/src/app/admin/(dashboard)/_state/ekonomi/sektor-unggulan-desa.ts
+++ b/src/app/admin/(dashboard)/_state/ekonomi/sektor-unggulan-desa.ts
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
 import ApiFetch from "@/lib/api-fetch";
 import { Prisma } from "@prisma/client";
 import { toast } from "react-toastify";
@@ -46,7 +45,7 @@ const grafikSektorUnggulan = proxy({
        if (res.status === 200) {
          const id = res.data?.data?.id;
          if (id) {
-            toast.success("Sukses menambahkan");
+            toast.success("Success create");
            grafikSektorUnggulan.create.form = {
              name: "",
              description: "",
@@ -77,37 +76,13 @@ const grafikSektorUnggulan = proxy({
          };
        }>[]
      | null,
-    page: 1,
-    totalPages: 1,
    loading: false,
-    search: "",
-    load: async (page = 1, limit = 10, search = "") => {
-      grafikSektorUnggulan.findMany.loading = true; // ✅ Akses langsung via nama path
-      grafikSektorUnggulan.findMany.page = page;
-      grafikSektorUnggulan.findMany.search = search;
-
-      try {
-        const query: any = { page, limit };
-        if (search) query.search = search;
-
-        const res = await ApiFetch.api.ekonomi.sektourunggulandesa[
-          "find-many"
-        ].get({ query });
-
-        if (res.status === 200 && res.data?.success) {
-          grafikSektorUnggulan.findMany.data = res.data.data ?? [];
-          grafikSektorUnggulan.findMany.totalPages =
-            res.data.totalPages ?? 1;
-        } else {
-          grafikSektorUnggulan.findMany.data = [];
-          grafikSektorUnggulan.findMany.totalPages = 1;
-        }
-      } catch (err) {
-        console.error("Gagal fetch sektor unggulan desa paginated:", err);
-        grafikSektorUnggulan.findMany.data = [];
-        grafikSektorUnggulan.findMany.totalPages = 1;
-      } finally {
-        grafikSektorUnggulan.findMany.loading = false;
+    async load() {
+      const res = await ApiFetch.api.ekonomi.sektourunggulandesa[
+        "find-many"
+      ].get();
+      if (res.status === 200) {
+        grafikSektorUnggulan.findMany.data = res.data?.data ?? [];
      }
    },
  },
--- a/src/app/admin/(dashboard)/_state/ekonomi/struktur-organisasi/struktur-organisasi.ts
+++ b/src/app/admin/(dashboard)/_state/ekonomi/struktur-organisasi/struktur-organisasi.ts
@@ -1,173 +1,9 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import ApiFetch from "@/lib/api-fetch";
-import { Prisma } from "@prisma/client";
-import { toast } from "react-toastify";
 import { proxy } from "valtio";
 import { z } from "zod";
-
-const templateForm = z.object({
-  name: z.string().min(3, "Nama minimal 3 karakter"),
-  imageId: z.string().min(1, "Gambar wajib dipilih"),
-});
-
-const defaultForm = {
-  name: "",
-  imageId: "",
-};
-
-type StrukturBumDesForm = Prisma.StrukturBumDesGetPayload<{
-  select: {
-    id: true;
-    name: true;
-    imageId: true;
-    image?: {
-      select: {
-        link: true;
-      };
-    };
-  };
-}>;
-
-const stateStruktur = proxy({
-  struktur: {
-    data: null as StrukturBumDesForm | null,
-    loading: false,
-    error: null as string | null,
-
-    async load(id: string) {
-      if (!id) {
-        toast.warn("ID tidak valid");
-        return null;
-      }
-
-      this.loading = true;
-      this.error = null;
-
-      try {
-        const response = await fetch(`/api/ekonomi/struktur-organisasi/${id}`);
-
-        if (!response.ok) {
-          throw new Error(`HTTP error! status: ${response.status}`);
-        }
-
-        const result = await response.json();
-
-        if (result.success) {
-          this.data = result.data;
-          return result.data;
-        } else {
-          throw new Error(result.message || "Gagal mengambil data struktur");
-        }
-      } catch (error) {
-        const errorMessage = (error as Error).message;
-        this.error = errorMessage;
-        console.error("Load struktur error:", errorMessage);
-        toast.error("Terjadi kesalahan saat mengambil data struktur");
-        return null;
-      } finally {
-        this.loading = false;
-      }
-    },
-
-    reset() {
-      this.data = null;
-      this.error = null;
-      this.loading = false;
-    },
-  },
-
-  editStruktur: {
-    id: "",
-    form: { ...defaultForm },
-    loading: false,
-    error: null as string | null,
-    isReadOnly: false,
-
-    initialize(strukturData: StrukturBumDesForm) {
-      this.id = strukturData.id;
-      this.isReadOnly = false;
-      this.form = {
-        name: strukturData.name || "",
-        imageId: strukturData.imageId || "",
-      };
-    },
-
-    updateField(field: keyof typeof defaultForm, value: string) {
-      this.form[field] = value;
-    },
-
-    async submit() {
-      const validation = templateForm.safeParse(this.form);
-
-      if (!validation.success) {
-        const errors = validation.error.issues
-          .map((issue) => `${issue.path.join(".")}: ${issue.message}`)
-          .join(", ");
-        toast.error(`Form tidak valid: ${errors}`);
-        return false;
-      }
-
-      this.loading = true;
-      this.error = null;
-
-      try {
-        const response = await fetch(`/api/ekonomi/struktur-organisasi/${this.id}`, {
-          method: "PUT",
-          headers: {
-            "Content-Type": "application/json",
-          },
-          body: JSON.stringify(this.form),
-        });
-
-        if (!response.ok) {
-          const errorData = await response.json().catch(() => ({}));
-          throw new Error(
-            errorData.message || `HTTP error! status: ${response.status}`
-          );
-        }
-
-        const result = await response.json();
-
-        if (result.success) {
-          toast.success("Berhasil update struktur");
-          await stateStruktur.struktur.load(this.id);
-          return true;
-        } else {
-          throw new Error(result.message || "Gagal update struktur");
-        }
-      } catch (error) {
-        const errorMessage = (error as Error).message;
-        this.error = errorMessage;
-        console.error("Update struktur error:", errorMessage);
-        toast.error("Terjadi kesalahan saat update struktur");
-        return false;
-      } finally {
-        this.loading = false;
-      }
-    },
-
-    reset() {
-      this.id = "";
-      this.form = { ...defaultForm };
-      this.error = null;
-      this.loading = false;
-      this.isReadOnly = false;
-    },
-  },
-
-  async loadForEdit(id: string) {
-    const strukturData = await this.struktur.load(id);
-    if (strukturData) {
-      this.editStruktur.initialize(strukturData);
-    }
-    return strukturData;
-  },
-
-  reset() {
-    this.struktur.reset();
-    this.editStruktur.reset();
-  },
-});
+import { toast } from "react-toastify";
+import ApiFetch from "@/lib/api-fetch";
+import { Prisma } from "@prisma/client";

 const templatePosisiOrganisasi = z.object({
  nama: z.string().min(1, "Nama harus diisi"),
@@ -194,7 +30,9 @@ const posisiOrganisasi = proxy({

      try {
        this.loading = true;
-        const res = await ApiFetch.api.ekonomi['struktur-organisasi']['posisi-organisasi']['create'].post(this.form);
+        const res = await ApiFetch.api.ekonomi["struktur-organisasi"][
+          "posisi-organisasi"
+        ]["create"].post(this.form);
        if (res.status === 200) {
          toast.success("Berhasil menambahkan posisi organisasi");
          posisiOrganisasi.findMany.load();
@@ -214,29 +52,6 @@ const posisiOrganisasi = proxy({
    },
  },

-  findUnique: {
-    data: null as Prisma.StrukturOrganisasiBumDesGetPayload<{
-      omit: { isActive: true };
-    }> | null,
-    async load(id: string) {
-      try {
-        const res = await fetch(
-          `/api/ekonomi/struktur-organisasi/posisi-organisasi/${id}`
-        );
-        if (res.ok) {
-          const data = await res.json();
-          posisiOrganisasi.findUnique.data = data.data ?? null;
-        } else {
-          console.error("Failed to fetch posisiOrganisasi:", res.statusText);
-          posisiOrganisasi.findUnique.data = null;
-        }
-      } catch (error) {
-        console.error("Error fetching posisiOrganisasi:", error);
-        posisiOrganisasi.findUnique.data = null;
-      }
-    },
-  },
-
  edit: {
    id: "",
    form: { ...posisiOrganisasiDefaultForm },
@@ -346,73 +161,22 @@ const posisiOrganisasi = proxy({
      deskripsi: string | null;
      hierarki: number;
    }>,
-    page: 1,
-    totalPages: 1,
-    loading: false,
-    search: "",
-    load: async (page = 1, limit?: number, search = "") => {
-      const appliedLimit = limit ?? 10;
-      posisiOrganisasi.findMany.page = page;
-      posisiOrganisasi.findMany.search = search;
-
+    async load() {
      try {
-        const query: any = { page, limit: appliedLimit };
-        if (search) query.search = search;
-
-        const res = await ApiFetch.api.ekonomi['struktur-organisasi']['posisi-organisasi']['find-many'].get({ query });
-
-        if (res.status === 200 && res.data?.success) {
-          posisiOrganisasi.findMany.data = res.data.data ?? [];
-          posisiOrganisasi.findMany.totalPages = res.data.totalPages ?? 1;
-        } else {
-          posisiOrganisasi.findMany.data = [];
-          posisiOrganisasi.findMany.totalPages = 1;
-        }
-      } catch (err) {
-        console.error("Gagal fetch posisi organisasi paginated:", err);
-        posisiOrganisasi.findMany.data = [];
-        posisiOrganisasi.findMany.totalPages = 1;
-      } finally {
-        posisiOrganisasi.findMany.loading = false;
-      }
-    },
-  },
-  findManyAll: {
-    data: [] as Array<{
-      id: string;
-      nama: string;
-      deskripsi: string | null;
-      hierarki: number;
-    }>,
-    loading: false,
-    search: "",
-    load: async (search = "") => {
-      // Change to arrow function
-      posisiOrganisasi.findManyAll.loading = true; // Use the full path to access the property
-      posisiOrganisasi.findManyAll.search = search;
-      try {
-        const query: any = { search };
-        if (search) query.search = search;
-
-        const res = await ApiFetch.api.ekonomi['struktur-organisasi']['posisi-organisasi']['find-many-all'].get({
-          query,
-        });
-
-        if (res.status === 200 && res.data?.success) {
-          posisiOrganisasi.findManyAll.data = res.data.data || [];
-
-        } else {
-          console.error("Failed to load posisiOrganisasi:", res.data?.message);
-          posisiOrganisasi.findManyAll.data = [];
+        const res = await ApiFetch.api.ekonomi["struktur-organisasi"][
+          "posisi-organisasi"
+        ]["find-many"].get();
+        if (res.status === 200) {
+          // The API now returns the id field, so we can use it directly
+          this.data = res.data?.data ?? [];
        }
      } catch (error) {
-        console.error("Error loading posisiOrganisasi:", error);
-        posisiOrganisasi.findManyAll.data = [];
-      } finally {
-        posisiOrganisasi.findManyAll.loading = false;
+        console.error("Find many error:", error);
+        this.data = [];
      }
    },
  },
+
  delete: {
    loading: false,
    async byId(id: string) {
@@ -451,12 +215,12 @@ const posisiOrganisasi = proxy({

 const templatePegawai = z.object({
  namaLengkap: z.string().min(1, "Nama wajib diisi"),
-  gelarAkademik: z.string().min(1, "Gelar Akademik wajib diisi"),
-  imageId: z.string().min(1, "Gambar wajib dipilih"),
-  tanggalMasuk: z.string().min(1, "Tanggal masuk wajib diisi"), // ISO format
+  gelarAkademik: z.string().optional(),
+  imageId: z.string().nullable().optional(),
+  tanggalMasuk: z.string().optional(), // ISO format
  email: z.string().email("Email tidak valid").optional(),
-  telepon: z.string().min(1, "Telepom wajib diisi"),
-  alamat: z.string().min(1, "Alamat wajib diisi"),
+  telepon: z.string().optional(),
+  alamat: z.string().optional(),
  posisiId: z.string().min(1, "Posisi wajib diisi"),
  isActive: z.boolean().default(true),
 });
@@ -487,9 +251,9 @@ const pegawai = proxy({

      try {
        pegawai.create.loading = true;
-        const res = await ApiFetch.api.ekonomi['struktur-organisasi'].pegawai['create'].post(
-          pegawai.create.form
-        );
+        const res = await ApiFetch.api.ekonomi["struktur-organisasi"][
+          "pegawai"
+        ]["create"].post(pegawai.create.form);
        if (res.status === 200) {
          toast.success("Pegawai berhasil ditambahkan");
          await pegawai.findMany.load();
@@ -506,56 +270,45 @@ const pegawai = proxy({
  },

  // In struktur-organisasi.ts
-  findMany: {
-    data: null as
-      | Prisma.PegawaiBumDesGetPayload<{
-          include: {
-            image: true;
-            posisi: true;
-          };
-        }>[]
-      | null,
-    page: 1,
-    totalPages: 1,
-    total: 0,
-    loading: false,
-    search: "",
-    load: async (page = 1, limit = 10, search = "") => {
-      // Change to arrow function
-      pegawai.findMany.loading = true; // Use the full path to access the property
-      pegawai.findMany.page = page;
-      pegawai.findMany.search = search;
-      try {
-        const query: any = { page, limit };
-        if (search) query.search = search;
+findMany: {
+  data: null as any[] | null,
+  page: 1,
+  totalPages: 1,
+  total: 0,
+  loading: false,
+  load: async (page = 1, limit = 10) => {  // Change to arrow function
+    pegawai.findMany.loading = true;  // Use the full path to access the property
+    pegawai.findMany.page = page;
+    try {
+      const res = await ApiFetch.api.ekonomi["struktur-organisasi"][
+        "pegawai"
+      ]["find-many"].get({
+        query: { page, limit },
+      });

-        const res = await ApiFetch.api.ekonomi['struktur-organisasi'].pegawai['find-many'].get({
-          query,
-        });
-
-        if (res.status === 200 && res.data?.success) {
-          pegawai.findMany.data = res.data.data || [];
-          pegawai.findMany.total = res.data.total || 0;
-          pegawai.findMany.totalPages = res.data.totalPages || 1;
-        } else {
-          console.error("Failed to load pegawai:", res.data?.message);
-          pegawai.findMany.data = [];
-          pegawai.findMany.total = 0;
-          pegawai.findMany.totalPages = 1;
-        }
-      } catch (error) {
-        console.error("Error loading pegawai:", error);
+      if (res.status === 200 && res.data?.success) {
+        pegawai.findMany.data = res.data.data || [];
+        pegawai.findMany.total = res.data.total || 0;
+        pegawai.findMany.totalPages = res.data.totalPages || 1;
+      } else {
+        console.error("Failed to load pegawai:", res.data?.message);
        pegawai.findMany.data = [];
        pegawai.findMany.total = 0;
        pegawai.findMany.totalPages = 1;
-      } finally {
-        pegawai.findMany.loading = false;
      }
-    },
+    } catch (error) {
+      console.error("Error loading pegawai:", error);
+      pegawai.findMany.data = [];
+      pegawai.findMany.total = 0;
+      pegawai.findMany.totalPages = 1;
+    } finally {
+      pegawai.findMany.loading = false;
+    }
  },
+},
  findUnique: {
    data: null as
-      | (Prisma.PegawaiBumDesGetPayload<{
+      | (Prisma.PegawaiGetPayload<{
          include: { posisi: true; image: true };
        }> & { isActive: boolean })
      | null,
@@ -581,9 +334,12 @@ const pegawai = proxy({
      if (!id) return toast.warn("ID tidak valid");
      try {
        pegawai.delete.loading = true;
-        const res = await fetch(`/api/ekonomi/struktur-organisasi/pegawai/del/${id}`, {
-          method: "DELETE",
-        });
+        const res = await fetch(
+          `/api/ekonomi/struktur-organisasi/pegawai/del/${id}`,
+          {
+            method: "DELETE",
+          }
+        );
        const json = await res.json();
        if (res.ok) {
          toast.success(json.message ?? "Berhasil hapus pegawai");
@@ -600,31 +356,6 @@ const pegawai = proxy({
    },
  },

-  nonActive: {
-    loading: false,
-    async byId(id: string) {
-      if (!id) return toast.warn("ID tidak valid");
-      try {
-        pegawai.nonActive.loading = true;
-        const res = await fetch(`/api/ekonomi/struktur-organisasi/pegawai/non-active/${id}`, {
-          method: "DELETE", // biasanya nonActive pakai PATCH
-        });
-        const json = await res.json();
-        if (res.ok) {
-          toast.success(json.message ?? "Pegawai berhasil dinonaktifkan");
-          await pegawai.findMany.load(); // refresh data
-        } else {
-          toast.error(json.message ?? "Gagal menonaktifkan pegawai");
-        }
-      } catch (error) {
-        console.error("Gagal nonActive:", error);
-        toast.error("Terjadi kesalahan saat menonaktifkan pegawai");
-      } finally {
-        pegawai.nonActive.loading = false;
-      }
-    },
-  },
-
  edit: {
    id: "",
    form: { ...pegawaiDefaultForm },
@@ -637,12 +368,15 @@ const pegawai = proxy({
      }

      try {
-        const response = await fetch(`/api/ekonomi/struktur-organisasi/pegawai/${id}`, {
-          method: "GET",
-          headers: {
-            "Content-Type": "application/json",
-          },
-        });
+        const response = await fetch(
+          `/api/ekonomi/struktur-organisasi/pegawai/${id}`,
+          {
+            method: "GET",
+            headers: {
+              "Content-Type": "application/json",
+            },
+          }
+        );

        if (!response.ok) {
          throw new Error(`HTTP error! status: ${response.status}`);
@@ -753,10 +487,299 @@ const pegawai = proxy({
  },
 });

-const stateStrukturBumDes = proxy({
-  stateStruktur,
-  posisiOrganisasi,
-  pegawai,
+// Schema Zod untuk form validasi
+const templateHubunganOrganisasiForm = z.object({
+  atasanId: z.string().min(1, "Atasan wajib dipilih"),
+  bawahanId: z.string().min(1, "Bawahan wajib dipilih"),
+  tipe: z.string().optional(),
 });

-export default stateStrukturBumDes;
+// Default form state
+const defaultHubunganOrganisasiForm = {
+  atasanId: "",
+  bawahanId: "",
+  tipe: "",
+};
+
+// ====================== STATE ===========================
+const hubunganOrganisasi = proxy({
+  create: {
+    form: { ...defaultHubunganOrganisasiForm },
+    loading: false,
+    async create() {
+      const cek = templateHubunganOrganisasiForm.safeParse(
+        hubunganOrganisasi.create.form
+      );
+      if (!cek.success) {
+        const err = `[${cek.error.issues
+          .map((v) => `${v.path.join(".")}: ${v.message}`)
+          .join("\n")}]`;
+        return toast.error(err);
+      }
+
+      try {
+        hubunganOrganisasi.create.loading = true;
+        const res = await ApiFetch.api.ekonomi["struktur-organisasi"][
+          "hubungan-organisasi"
+        ]["create"].post(hubunganOrganisasi.create.form);
+
+        if (res.status === 200 && res.data?.success) {
+          hubunganOrganisasi.findMany.load();
+          return toast.success("Berhasil menambahkan hubungan organisasi");
+        } else {
+          return toast.error(res.data?.message || "Gagal menambahkan data");
+        }
+      } catch (error) {
+        console.error("Gagal create:", error);
+        toast.error("Terjadi kesalahan saat menambahkan");
+      } finally {
+        hubunganOrganisasi.create.loading = false;
+      }
+    },
+  },
+  findMany: {
+    data: null as Array<{
+      id: string;
+      atasanId: string;
+      bawahanId: string;
+      tipe?: string | null;
+      atasan: {
+        id: string;
+        namaLengkap: string;
+        gelarAkademik: string | null;
+        imageId: string | null;
+        tanggalMasuk: Date | null;
+        email: string | null;
+        telepon: string | null;
+        alamat: string | null;
+        posisiId: string;
+        isActive: boolean;
+        createdAt: Date;
+        updatedAt: Date;
+      };
+      bawahan: {
+        id: string;
+        namaLengkap: string;
+        gelarAkademik: string | null;
+        imageId: string | null;
+        tanggalMasuk: Date | null;
+        email: string | null;
+        telepon: string | null;
+        alamat: string | null;
+        posisiId: string;
+        isActive: boolean;
+        createdAt: Date;
+        updatedAt: Date;
+      };
+    }> | null,
+
+    async load() {
+      try {
+        const res = await ApiFetch.api.ekonomi["struktur-organisasi"][
+          "hubungan-organisasi"
+        ]["find-many"].get();
+
+        if (res.status === 200) {
+          hubunganOrganisasi.findMany.data = (res.data?.data ?? []).map(
+            (item: any) => ({
+              ...item,
+              atasan: item.atasan
+                ? {
+                    ...item.atasan,
+                    isActive: item.atasan.isActive ?? item.atasan.aktif ?? true,
+                  }
+                : null,
+              bawahan: item.bawahan
+                ? {
+                    ...item.bawahan,
+                    isActive:
+                      item.bawahan.isActive ?? item.bawahan.aktif ?? true,
+                  }
+                : null,
+            })
+          );
+        } else {
+          hubunganOrganisasi.findMany.data = [];
+        }
+      } catch (error) {
+        console.error("Fetch list error:", error);
+        toast.error("Gagal memuat data hubungan organisasi");
+        hubunganOrganisasi.findMany.data = [];
+      }
+    },
+  },
+
+  findUnique: {
+    data: null as {
+      id: string;
+      atasanId: string;
+      bawahanId: string;
+      tipe?: string | null;
+      atasan?: {
+        id: string;
+        namaLengkap: string;
+        gelarAkademik: string | null;
+        imageId: string;
+        tanggalMasuk: Date | null;
+        email: string | null;
+        telepon: string | null;
+        alamat: string | null;
+        posisiId: string;
+        aktif: boolean;
+        createdAt: Date;
+        updatedAt: Date;
+      };
+      bawahan?: {
+        id: string;
+        namaLengkap: string;
+        gelarAkademik: string | null;
+        imageId: string;
+        tanggalMasuk: Date | null;
+        email: string | null;
+        telepon: string | null;
+        alamat: string | null;
+        posisiId: string;
+        aktif: boolean;
+        createdAt: Date;
+        updatedAt: Date;
+      };
+    } | null,
+
+    async load(id: string) {
+      try {
+        const res = await fetch(
+          `/api/ekonomi/struktur-organisasi/hubungan-organisasi/${id}`
+        );
+        const result = await res.json();
+
+        if (res.ok && result?.success) {
+          hubunganOrganisasi.findUnique.data = result.data;
+        } else {
+          hubunganOrganisasi.findUnique.data = null;
+          toast.error(result?.message || "Gagal mengambil data");
+        }
+      } catch (error) {
+        console.error("Find unique error:", error);
+        hubunganOrganisasi.findUnique.data = null;
+      }
+    },
+  },
+
+  edit: {
+    id: "",
+    form: { ...defaultHubunganOrganisasiForm },
+    loading: false,
+
+    async load(id: string) {
+      if (!id) return toast.warn("ID tidak valid");
+
+      try {
+        const res = await fetch(
+          `/api/ekonomi/struktur-organisasi/hubungan-organisasi/${id}`
+        );
+        const result = await res.json();
+
+        if (res.ok && result?.success) {
+          const data = result.data;
+          this.id = data.id;
+          this.form = {
+            atasanId: data.atasanId,
+            bawahanId: data.bawahanId,
+            tipe: data.tipe || "",
+          };
+          return data;
+        } else {
+          throw new Error(result?.message || "Gagal memuat data");
+        }
+      } catch (error) {
+        console.error("Error loading:", error);
+        toast.error(
+          error instanceof Error ? error.message : "Gagal memuat data"
+        );
+        return null;
+      }
+    },
+
+    async update() {
+      const cek = templateHubunganOrganisasiForm.safeParse(this.form);
+      if (!cek.success) {
+        const err = `[${cek.error.issues
+          .map((v) => `${v.path.join(".")}: ${v.message}`)
+          .join("\n")}]`;
+        return toast.error(err);
+      }
+
+      try {
+        this.loading = true;
+        const res = await fetch(
+          `/api/ekonomi/struktur-organisasi/hubungan-organisasi/${this.id}`,
+          {
+            method: "PUT",
+            headers: {
+              "Content-Type": "application/json",
+            },
+            body: JSON.stringify(this.form),
+          }
+        );
+
+        const result = await res.json();
+        if (res.ok && result.success) {
+          await hubunganOrganisasi.findMany.load();
+          toast.success("Berhasil mengupdate hubungan organisasi");
+          return true;
+        } else {
+          throw new Error(result?.message || "Gagal mengupdate");
+        }
+      } catch (error) {
+        console.error("Update error:", error);
+        toast.error(error instanceof Error ? error.message : "Gagal update");
+        return false;
+      } finally {
+        this.loading = false;
+      }
+    },
+
+    reset() {
+      hubunganOrganisasi.edit.id = "";
+      hubunganOrganisasi.edit.form = { ...defaultHubunganOrganisasiForm };
+    },
+  },
+
+  delete: {
+    loading: false,
+    async byId(id: string) {
+      if (!id) return toast.warn("ID tidak valid");
+
+      try {
+        hubunganOrganisasi.delete.loading = true;
+        const res = await fetch(
+          `/api/ekonomi/struktur-organisasi/hubungan-organisasi/del/${id}`,
+          {
+            method: "DELETE",
+          }
+        );
+
+        const result = await res.json();
+        if (res.ok && result?.success) {
+          toast.success("Hubungan organisasi berhasil dihapus");
+          hubunganOrganisasi.findMany.load();
+        } else {
+          toast.error(result?.message || "Gagal menghapus hubungan organisasi");
+        }
+      } catch (error) {
+        console.error("Delete error:", error);
+        toast.error("Terjadi kesalahan saat menghapus");
+      } finally {
+        hubunganOrganisasi.delete.loading = false;
+      }
+    },
+  },
+});
+
+const strukturorganisasiState = proxy({
+  posisiOrganisasi,
+  pegawai,
+  hubunganOrganisasi,
+});
+
+export default strukturorganisasiState;
--- a/src/app/admin/(dashboard)/_state/ekonomi/usia-kerja-nganggur.ts
+++ b/src/app/admin/(dashboard)/_state/ekonomi/usia-kerja-nganggur.ts
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
 import ApiFetch from "@/lib/api-fetch";
 import { Prisma } from "@prisma/client";
 import { toast } from "react-toastify";
@@ -51,7 +50,7 @@ const grafikBerdasarkanUsiaKerjaNganggur = proxy({
        if (res.status === 200) {
          const id = res.data?.data?.id;
          if (id) {
-            toast.success("Sukses menambahkan");
+            toast.success("Success create");
            grafikBerdasarkanUsiaKerjaNganggur.create.form = {
              usia18_25: "",
              usia26_35: "",
@@ -76,37 +75,16 @@ const grafikBerdasarkanUsiaKerjaNganggur = proxy({
          omit: { isActive: true };
        }>[]
      | null,
-      page: 1,
-      totalPages: 1,
-      loading: false,
-      search: "",
-     load: async (page = 1, limit = 10, search = "") => {
-        grafikBerdasarkanUsiaKerjaNganggur.findMany.loading = true; // ✅ Akses langsung via nama path
-        grafikBerdasarkanUsiaKerjaNganggur.findMany.page = page;
-        grafikBerdasarkanUsiaKerjaNganggur.findMany.search = search;
-    
-        try {
-          const query: any = { page, limit };
-          if (search) query.search = search;
-      
-          const res = await ApiFetch.api.ekonomi.grafikusiakerjayangmenganggur["find-many"].get({ query });
-      
-          if (res.status === 200 && res.data?.success) {
-            grafikBerdasarkanUsiaKerjaNganggur.findMany.data = res.data.data ?? [];
-            grafikBerdasarkanUsiaKerjaNganggur.findMany.totalPages = res.data.totalPages ?? 1;
-          } else {
-            grafikBerdasarkanUsiaKerjaNganggur.findMany.data = [];
-            grafikBerdasarkanUsiaKerjaNganggur.findMany.totalPages = 1;
-          }
-        } catch (err) {
-          console.error("Gagal fetch grafik berdasarkan usia kerja yang menganggur paginated:", err);
-          grafikBerdasarkanUsiaKerjaNganggur.findMany.data = [];
-          grafikBerdasarkanUsiaKerjaNganggur.findMany.totalPages = 1;
-        } finally {
-          grafikBerdasarkanUsiaKerjaNganggur.findMany.loading = false;
-        }
-      },
+    loading: false,
+    async load() {
+      const res = await ApiFetch.api.ekonomi.grafikusiakerjayangmenganggur[
+        "find-many"
+      ].get();
+      if (res.status === 200) {
+        grafikBerdasarkanUsiaKerjaNganggur.findMany.data = res.data?.data ?? [];
+      }
    },
+  },
  findUnique: {
    data: null as Prisma.GrafikMenganggurBerdasarkanUsiaGetPayload<{
      omit: { isActive: true };
@@ -255,7 +233,7 @@ const grafikBerdasarkanPendidikan = proxy({
        if (res.status === 200) {
          const id = res.data?.data?.id;
          if (id) {
-            toast.success("Sukses menambahkan");
+            toast.success("Success create");
            grafikBerdasarkanPendidikan.create.form = {
              SD: "",
              SMP: "",
@@ -281,36 +259,15 @@ const grafikBerdasarkanPendidikan = proxy({
          omit: { isActive: true };
        }>[]
      | null,
-      page: 1,
-      totalPages: 1,
-      loading: false,
-      search: "",
-     load: async (page = 1, limit = 10, search = "") => {
-        grafikBerdasarkanPendidikan.findMany.loading = true; // ✅ Akses langsung via nama path
-        grafikBerdasarkanPendidikan.findMany.page = page;
-        grafikBerdasarkanPendidikan.findMany.search = search;
-    
-        try {
-          const query: any = { page, limit };
-          if (search) query.search = search;
-      
-          const res = await ApiFetch.api.ekonomi.grafikmenganggurberdasarkanpendidikan["find-many"].get({ query });
-      
-          if (res.status === 200 && res.data?.success) {
-            grafikBerdasarkanPendidikan.findMany.data = res.data.data ?? [];
-            grafikBerdasarkanPendidikan.findMany.totalPages = res.data.totalPages ?? 1;
-          } else {
-            grafikBerdasarkanPendidikan.findMany.data = [];
-            grafikBerdasarkanPendidikan.findMany.totalPages = 1;
-          }
-        } catch (err) {
-          console.error("Gagal fetch grafik berdasarkan pendidikan paginated:", err);
-          grafikBerdasarkanPendidikan.findMany.data = [];
-          grafikBerdasarkanPendidikan.findMany.totalPages = 1;
-        } finally {
-          grafikBerdasarkanPendidikan.findMany.loading = false;
-        }
-      },
+    loading: false,
+    async load() {
+      const res = await ApiFetch.api.ekonomi.grafikmenganggurberdasarkanpendidikan[
+        "find-many"
+      ].get();
+      if (res.status === 200) {
+        grafikBerdasarkanPendidikan.findMany.data = res.data?.data ?? [];
+      }
+    },
  },
  findUnique: {
    data: null as Prisma.GrafikMenganggurBerdasarkanPendidikanGetPayload<{
--- a/src/app/admin/(dashboard)/_state/inovasi/ajukan-ide-inovatif.ts
+++ b/src/app/admin/(dashboard)/_state/inovasi/ajukan-ide-inovatif.ts
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
 import ApiFetch from "@/lib/api-fetch";
 import { Prisma } from "@prisma/client";
 import { toast } from "react-toastify";
@@ -62,37 +61,10 @@ const ajukanIdeInovatifState = proxy({
          };
        }>[]
      | null,
-    page: 1,
-    totalPages: 1,
-    loading: false,
-    search: "",
-    load: async (page = 1, limit = 10, search = "") => {
-      ajukanIdeInovatifState.findMany.loading = true; // ✅ Akses langsung via nama path
-      ajukanIdeInovatifState.findMany.page = page;
-      ajukanIdeInovatifState.findMany.search = search;
-
-      try {
-        const query: any = { page, limit };
-        if (search) query.search = search;
-
-        const res =
-          await ApiFetch.api.inovasi.ajukanideinovatif[
-            "find-many"
-          ].get({ query });
-
-        if (res.status === 200 && res.data?.success) {
-          ajukanIdeInovatifState.findMany.data = res.data.data ?? [];
-          ajukanIdeInovatifState.findMany.totalPages = res.data.totalPages ?? 1;
-        } else {
-          ajukanIdeInovatifState.findMany.data = [];
-          ajukanIdeInovatifState.findMany.totalPages = 1;
-        }
-      } catch (err) {
-        console.error("Gagal fetch ajukan ide inovatif paginated:", err);
-        ajukanIdeInovatifState.findMany.data = [];
-        ajukanIdeInovatifState.findMany.totalPages = 1;
-      } finally {
-        ajukanIdeInovatifState.findMany.loading = false;
+    async load() {
+      const res = await ApiFetch.api.inovasi.ajukanideinovatif["find-many"].get();
+      if (res.status === 200) {
+        ajukanIdeInovatifState.findMany.data = res.data?.data ?? [];
      }
    },
  },
@@ -125,21 +97,16 @@ const ajukanIdeInovatifState = proxy({

      try {
        ajukanIdeInovatifState.delete.loading = true;
-        const response = await fetch(
-          `/api/inovasi/ajukanideinovatif/del/${id}`,
-          {
-            method: "DELETE",
-            headers: {
-              "Content-Type": "application/json",
-            },
-          }
-        );
+        const response = await fetch(`/api/inovasi/ajukanideinovatif/del/${id}`, {
+          method: "DELETE",
+          headers: {
+            "Content-Type": "application/json",
+          },
+        });
        const result = await response.json();

        if (response.ok) {
-          toast.success(
-            result.message || "Ajukan Ide Inovatif berhasil dihapus"
-          );
+          toast.success(result.message || "Ajukan Ide Inovatif berhasil dihapus");
          await ajukanIdeInovatifState.findMany.load();
        } else {
          toast.error(result?.message || "Gagal menghapus ajukan ide inovatif");
--- a/src/app/admin/(dashboard)/_state/inovasi/desa-digital.ts
+++ b/src/app/admin/(dashboard)/_state/inovasi/desa-digital.ts
@@ -37,7 +37,7 @@ const desaDigitalState = proxy({
        );
        if (res.status === 200) {
          desaDigitalState.findMany.load();
-          return toast.success("Sukses menambahkan");
+          return toast.success("success create");
        }
        console.log(res);
        return toast.error("failed create");
--- a/src/app/admin/(dashboard)/_state/inovasi/info-tekno.ts
+++ b/src/app/admin/(dashboard)/_state/inovasi/info-tekno.ts
@@ -37,7 +37,7 @@ const infoTeknoState = proxy({
        );
        if (res.status === 200) {
          infoTeknoState.findMany.load();
-          return toast.success("Sukses menambahkan");
+          return toast.success("success create");
        }
        console.log(res);
        return toast.error("failed create");
--- a/src/app/admin/(dashboard)/_state/inovasi/layanan-online-desa.ts
+++ b/src/app/admin/(dashboard)/_state/inovasi/layanan-online-desa.ts
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
 import ApiFetch from "@/lib/api-fetch";
 import { Prisma } from "@prisma/client";
 import { toast } from "react-toastify";
@@ -55,20 +54,19 @@ const administrasiOnline = proxy({
  },
  findMany: {
    data: null as Array<
-      Prisma.AdministrasiOnlineGetPayload<{
-        include: {
-          jenisLayanan: true;
-        };
-      }>
-    > | null,
+    Prisma.AdministrasiOnlineGetPayload<{
+      include: {
+        jenisLayanan: true;
+      };
+    }>
+  > | null,
    page: 1,
    totalPages: 1,
    loading: false,
-    search: "",
-    async load(page = 1, limit = 10, search = "") {
+
+    async load(page = 1, limit = 10) {
      administrasiOnline.findMany.loading = true;
      administrasiOnline.findMany.page = page;
-      administrasiOnline.findMany.search = search;
      try {
        const res =
          await ApiFetch.api.inovasi.layananonlinedesa.administrasionline[
@@ -77,7 +75,6 @@ const administrasiOnline = proxy({
            query: {
              page,
              limit,
-              search,
            },
          });

@@ -94,10 +91,10 @@ const administrasiOnline = proxy({
  },
  findUnique: {
    data: null as Prisma.AdministrasiOnlineGetPayload<{
-      include: {
-        jenisLayanan: true;
-      };
-    }> | null,
+        include: {
+          jenisLayanan: true;
+        };
+      }> | null,
    async load(id: string) {
      try {
        const res = await fetch(
@@ -202,37 +199,13 @@ const jenisLayanan = proxy({
      nama: string;
      deskripsi: string;
    }> | null,
-    page: 1,
-    totalPages: 1,
-    loading: false,
-    search: "",
-    load: async (page = 1, limit = 10, search = "") => {
-      jenisLayanan.findMany.loading = true; // ✅ Akses langsung via nama path
-      jenisLayanan.findMany.page = page;
-      jenisLayanan.findMany.search = search;
-
-      try {
-        const query: any = { page, limit };
-        if (search) query.search = search;
-
-        const res =
-          await ApiFetch.api.inovasi.layananonlinedesa.administrasionline.jenislayanan[
-            "find-many"
-          ].get({ query });
-
-        if (res.status === 200 && res.data?.success) {
-          jenisLayanan.findMany.data = res.data.data ?? [];
-          jenisLayanan.findMany.totalPages = res.data.totalPages ?? 1;
-        } else {
-          jenisLayanan.findMany.data = [];
-          jenisLayanan.findMany.totalPages = 1;
-        }
-      } catch (err) {
-        console.error("Gagal fetch jenis layanan paginated:", err);
-        jenisLayanan.findMany.data = [];
-        jenisLayanan.findMany.totalPages = 1;
-      } finally {
-        jenisLayanan.findMany.loading = false;
+    async load() {
+      const res =
+        await ApiFetch.api.inovasi.layananonlinedesa.administrasionline.jenislayanan[
+          "find-many"
+        ].get();
+      if (res.status === 200) {
+        jenisLayanan.findMany.data = res.data?.data ?? [];
      }
    },
  },
@@ -430,9 +403,7 @@ const templatePengaduanMasyarakatForm = z.object({
  nik: z.string().min(1, "NIK minimal 1 karakter"),
  judulPengaduan: z.string().min(1, "Judul pengaduan minimal 1 karakter"),
  lokasiKejadian: z.string().min(1, "Lokasi kejadian minimal 1 karakter"),
-  deskripsiPengaduan: z
-    .string()
-    .min(1, "Deskripsi pengaduan minimal 1 karakter"),
+  deskripsiPengaduan: z.string().min(1, "Deskripsi pengaduan minimal 1 karakter"),
  jenisPengaduanId: z.string().min(1, "Jenis pengaduan minimal 1 karakter"),
  imageId: z.string().min(1, "Image minimal 1 karakter"),
 });
@@ -484,42 +455,37 @@ const pengaduanMasyarakat = proxy({
  },
  findMany: {
    data: null as Array<
-      Prisma.PengaduanMasyarakatGetPayload<{
-        include: {
-          jenisPengaduan: true;
-          image: true;
-        };
-      }>
-    > | null,
+    Prisma.PengaduanMasyarakatGetPayload<{
+      include: {
+        jenisPengaduan: true;
+        image: true;
+      };
+    }>
+  > | null,
    page: 1,
    totalPages: 1,
    loading: false,
-    search: "",
-    load: async (page = 1, limit = 10, search = "") => {
-      pengaduanMasyarakat.findMany.loading = true; // ✅ Akses langsung via nama path
+
+    async load(page = 1, limit = 10) {
+      pengaduanMasyarakat.findMany.loading = true;
      pengaduanMasyarakat.findMany.page = page;
-      pengaduanMasyarakat.findMany.search = search;
-
      try {
-        const query: any = { page, limit };
-        if (search) query.search = search;
-
        const res =
          await ApiFetch.api.inovasi.layananonlinedesa.pengaduanmasyarakat[
            "find-many"
-          ].get({ query });
+          ].get({
+            query: {
+              page,
+              limit,
+            },
+          });

        if (res.status === 200 && res.data?.success) {
          pengaduanMasyarakat.findMany.data = res.data.data ?? [];
          pengaduanMasyarakat.findMany.totalPages = res.data.totalPages ?? 1;
-        } else {
-          pengaduanMasyarakat.findMany.data = [];
-          pengaduanMasyarakat.findMany.totalPages = 1;
        }
      } catch (err) {
        console.error("Gagal fetch pengaduan masyarakat paginated:", err);
-        pengaduanMasyarakat.findMany.data = [];
-        pengaduanMasyarakat.findMany.totalPages = 1;
      } finally {
        pengaduanMasyarakat.findMany.loading = false;
      }
@@ -527,11 +493,11 @@ const pengaduanMasyarakat = proxy({
  },
  findUnique: {
    data: null as Prisma.PengaduanMasyarakatGetPayload<{
-      include: {
-        jenisPengaduan: true;
-        image: true;
-      };
-    }> | null,
+        include: {
+          jenisPengaduan: true;
+          image: true;
+        };
+      }> | null,
    async load(id: string) {
      try {
        const res = await fetch(
@@ -541,10 +507,7 @@ const pengaduanMasyarakat = proxy({
          const data = await res.json();
          pengaduanMasyarakat.findUnique.data = data.data ?? null;
        } else {
-          console.error(
-            "Failed to fetch pengaduan masyarakat:",
-            res.statusText
-          );
+          console.error("Failed to fetch pengaduan masyarakat:", res.statusText);
          pengaduanMasyarakat.findUnique.data = null;
        }
      } catch (error) {
@@ -579,9 +542,7 @@ const pengaduanMasyarakat = proxy({
          );
          await pengaduanMasyarakat.findMany.load(); // refresh list
        } else {
-          toast.error(
-            result?.message || "Gagal menghapus pengaduan masyarakat"
-          );
+          toast.error(result?.message || "Gagal menghapus pengaduan masyarakat");
        }
      } catch (error) {
        console.error("Gagal delete:", error);
@@ -606,9 +567,7 @@ const jenisPengaduan = proxy({
    form: { ...defaultJenisPengaduanForm },
    loading: false,
    async create() {
-      const cek = templateJenisPengaduanForm.safeParse(
-        jenisPengaduan.create.form
-      );
+      const cek = templateJenisPengaduanForm.safeParse(jenisPengaduan.create.form);
      if (!cek.success) {
        const err = `[${cek.error.issues
          .map((v) => `${v.path.join(".")}`)
@@ -639,37 +598,13 @@ const jenisPengaduan = proxy({
      id: string;
      nama: string;
    }> | null,
-    page: 1,
-    totalPages: 1,
-    loading: false,
-    search: "",
-    load: async (page = 1, limit = 10, search = "") => {
-      jenisPengaduan.findMany.loading = true; // ✅ Akses langsung via nama path
-      jenisPengaduan.findMany.page = page;
-      jenisPengaduan.findMany.search = search;
-
-      try {
-        const query: any = { page, limit };
-        if (search) query.search = search;
-
-        const res =
-          await ApiFetch.api.inovasi.layananonlinedesa.pengaduanmasyarakat.jenispengaduan[
-            "find-many"
-          ].get({ query });
-
-        if (res.status === 200 && res.data?.success) {
-          jenisPengaduan.findMany.data = res.data.data ?? [];
-          jenisPengaduan.findMany.totalPages = res.data.totalPages ?? 1;
-        } else {
-          jenisPengaduan.findMany.data = [];
-          jenisPengaduan.findMany.totalPages = 1;
-        }
-      } catch (err) {
-        console.error("Gagal fetch jenis pengaduan paginated:", err);
-        jenisPengaduan.findMany.data = [];
-        jenisPengaduan.findMany.totalPages = 1;
-      } finally {
-        jenisPengaduan.findMany.loading = false;
+    async load() {
+      const res =
+        await ApiFetch.api.inovasi.layananonlinedesa.pengaduanmasyarakat.jenispengaduan[
+          "find-many"
+        ].get();
+      if (res.status === 200) {
+        jenisPengaduan.findMany.data = res.data?.data ?? [];
      }
    },
  },
@@ -758,7 +693,7 @@ const jenisPengaduan = proxy({
          const data = result.data;
          this.id = data.id;
          this.form = {
-            nama: data.nama,
+            nama: data.nama
          };
          return data;
        } else {
@@ -774,9 +709,7 @@ const jenisPengaduan = proxy({
    },

    async update() {
-      const cek = templateJenisPengaduanForm.safeParse(
-        jenisPengaduan.edit.form
-      );
+      const cek = templateJenisPengaduanForm.safeParse(jenisPengaduan.edit.form);
      if (!cek.success) {
        const err = `[${cek.error.issues
          .map((v) => `${v.path.join(".")}`)
@@ -826,9 +759,7 @@ const jenisPengaduan = proxy({
            await jenisPengaduan.findMany.load(); // refresh list
            return true;
          } else {
-            throw new Error(
-              result.message || "Gagal mengupdate jenis pengaduan"
-            );
+            throw new Error(result.message || "Gagal mengupdate jenis pengaduan");
          }
        } catch (error) {
          // If JSON parsing fails, try to get the response text for better error messages
@@ -861,6 +792,7 @@ const jenisPengaduan = proxy({
  },
 });

+
 const layananonlineDesa = proxy({
  administrasiOnline,
  jenisLayanan,
--- a/src/app/admin/(dashboard)/_state/inovasi/program-kreatif.ts
+++ b/src/app/admin/(dashboard)/_state/inovasi/program-kreatif.ts
@@ -6,9 +6,9 @@ import { proxy } from "valtio";
 import { z } from "zod";

 const templateForm = z.object({
-  name: z.string().min(5, "Nama minimal 5 karakter"),
-  deskripsi: z.string().min(5, "Deskripsi minimal 5 karakter"),
-  slug: z.string().min(5, "Deskripsi singkat minimal 5 karakter"),
+  name: z.string().min(1, "Nama minimal 1 karakter"),
+  deskripsi: z.string().min(1, "Deskripsi minimal 1 karakter"),
+  slug: z.string().min(1, "Deskripsi singkat minimal 1 karakter"),
  icon: z.string().min(1, "Icon minimal 1 karakter"),
 });

@@ -29,64 +29,59 @@ const programKreatifState = proxy({
        const err = `[${cek.error.issues
          .map((v) => `${v.path.join(".")}`)
          .join("\n")}] required`;
-        toast.error(err);
-        return false; // ⬅️ ini penting
+        return toast.error(err);
      }
-    
+
      try {
        programKreatifState.create.loading = true;
        const res = await ApiFetch.api.inovasi.programkreatif["create"].post(
          programKreatifState.create.form
        );
-    
        if (res.status === 200) {
          programKreatifState.findMany.load();
-          toast.success("Sukses menambahkan");
-          return true;
+          return toast.success("success create");
        }
-    
-        toast.error("failed create");
-        return false;
+        console.log(res);
+        return toast.error("failed create");
      } catch (error) {
-        console.error((error as Error).message);
-        toast.error("Terjadi kesalahan saat create");
-        return false;
+        console.log((error as Error).message);
      } finally {
        programKreatifState.create.loading = false;
      }
-    }
-    
+    },
  },
  findMany: {
    data: null as any[] | null,
    page: 1,
    totalPages: 1,
+    total: 0,
    loading: false,
-    search: "",
-    load: async (page = 1, limit = 10, search = "") => {
-      programKreatifState.findMany.loading = true; // ✅ Akses langsung via nama path
+    load: async (page = 1, limit = 10) => {
+      // Change to arrow function
+      programKreatifState.findMany.loading = true; // Use the full path to access the property
      programKreatifState.findMany.page = page;
-      programKreatifState.findMany.search = search;
-
      try {
-        const query: any = { page, limit };
-        if (search) query.search = search;
-
-        const res = await ApiFetch.api.inovasi.programkreatif[
-          "find-many"
-        ].get({ query });
+        const res = await ApiFetch.api.inovasi.programkreatif["find-many"].get({
+          query: { page, limit },
+        });

        if (res.status === 200 && res.data?.success) {
-          programKreatifState.findMany.data = res.data.data ?? [];
-          programKreatifState.findMany.totalPages =
-            res.data.totalPages ?? 1;
+          programKreatifState.findMany.data = res.data.data || [];
+          programKreatifState.findMany.total = res.data.total || 0;
+          programKreatifState.findMany.totalPages = res.data.totalPages || 1;
        } else {
+          console.error(
+            "Failed to load grafik berdasarkan jenis kelamin:",
+            res.data?.message
+          );
          programKreatifState.findMany.data = [];
+          programKreatifState.findMany.total = 0;
          programKreatifState.findMany.totalPages = 1;
        }
-      } catch (err) {
-        console.error("Gagal fetch program kreatif paginated:", err);
+      } catch (error) {
+        console.error("Error loading grafik berdasarkan jenis kelamin:", error);
        programKreatifState.findMany.data = [];
+        programKreatifState.findMany.total = 0;
        programKreatifState.findMany.totalPages = 1;
      } finally {
        programKreatifState.findMany.loading = false;
--- a/src/app/admin/(dashboard)/_state/keamanan/keamanan-lingkungan.ts
+++ b/src/app/admin/(dashboard)/_state/keamanan/keamanan-lingkungan.ts
@@ -37,7 +37,7 @@ const keamananLingkunganState = proxy({
        ].post(keamananLingkunganState.create.form);
        if (res.status === 200) {
          keamananLingkunganState.findMany.load();
-          return toast.success("Sukses menambahkan");
+          return toast.success("success create");
        }
        console.log(res);
        return toast.error("failed create");
--- a/src/app/admin/(dashboard)/_state/keamanan/kontak-darurat-keamanan.ts
+++ b/src/app/admin/(dashboard)/_state/keamanan/kontak-darurat-keamanan.ts
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
 import ApiFetch from "@/lib/api-fetch";
 import { Prisma } from "@prisma/client";
 import { toast } from "react-toastify";
@@ -7,14 +6,26 @@ import { z } from "zod";

 const templateForm = z.object({
  nama: z.string().min(1, "Nama minimal 1 karakter"),
-  icon: z.string().nonempty(),
-  kategoriId: z.array(z.string()).min(1, "Minimal pilih satu kategori"),
+  imageId: z.string().nonempty(),
+  kontakItems: z.array(
+    z.object({
+      nama: z.string().min(1, "Nama minimal 1 karakter"),
+      nomorTelepon: z.string().min(1, "Nomor Telepon minimal 1 karakter"),
+      imageId: z.string().nonempty(),
+    })
+  ),
 });

 const defaultForm = {
  nama: "",
-  icon: "",
-  kategoriId: [] as string[],
+  imageId: "",
+  kontakItems: [
+    {
+      nama: "",
+      nomorTelepon: "",
+      imageId: "",
+    },
+  ],
 };

 const kontakDaruratKeamananState = proxy({
@@ -38,7 +49,7 @@ const kontakDaruratKeamananState = proxy({
        ].post(kontakDaruratKeamananState.create.form);
        if (res.status === 200) {
          kontakDaruratKeamananState.findMany.load();
-          return toast.success("Sukses menambahkan");
+          return toast.success("success create");
        }
        console.log(res);
        return toast.error("failed create");
@@ -50,49 +61,20 @@ const kontakDaruratKeamananState = proxy({
    },
  },
  findMany: {
-    data: null as Array<
-      Prisma.KontakDaruratKeamananGetPayload<{
-        include: {
-          kategori: true;
-          kontakItems: {
-            include: {
-              kontakItem: true;
-            };
+    data: null as
+      | Prisma.KontakDaruratKeamananGetPayload<{
+          include: {
+            kontakItems: true;
+            image: true;
          };
-        };
-      }>
-    > | null,
-    page: 1,
-    totalPages: 1,
-    loading: false,
-    search: "",
-    load: async (page = 1, limit = 10, search = "") => {
-      kontakDaruratKeamananState.findMany.loading = true; // ✅ Akses langsung via nama path
-      kontakDaruratKeamananState.findMany.page = page;
-      kontakDaruratKeamananState.findMany.search = search;
-
-      try {
-        const query: any = { page, limit };
-        if (search) query.search = search;
-
-        const res = await ApiFetch.api.keamanan.kontakdaruratkeamanan[
-          "findMany"
-        ].get({ query });
-
-        if (res.status === 200 && res.data?.success) {
-          kontakDaruratKeamananState.findMany.data = res.data.data ?? [];
-          kontakDaruratKeamananState.findMany.totalPages =
-            res.data.totalPages ?? 1;
-        } else {
-          kontakDaruratKeamananState.findMany.data = [];
-          kontakDaruratKeamananState.findMany.totalPages = 1;
-        }
-      } catch (err) {
-        console.error("Gagal fetch kontak darurat paginated:", err);
-        kontakDaruratKeamananState.findMany.data = [];
-        kontakDaruratKeamananState.findMany.totalPages = 1;
-      } finally {
-        kontakDaruratKeamananState.findMany.loading = false;
+        }>[]
+      | null,
+    async load() {
+      const res = await ApiFetch.api.keamanan.kontakdaruratkeamanan[
+        "find-many"
+      ].get();
+      if (res.status === 200) {
+        kontakDaruratKeamananState.findMany.data = res.data?.data ?? [];
      }
    },
  },
@@ -101,10 +83,10 @@ const kontakDaruratKeamananState = proxy({
      include: {
        kontakItems: {
          include: {
-            kontakItem: true;
+            image: true;
          };
        };
-        kategori: true;
+        image: true;
      };
    }> | null,
    loading: false,
@@ -186,9 +168,14 @@ const kontakDaruratKeamananState = proxy({
          this.id = data.id;
          this.form = {
            nama: data.nama,
-            icon: data.icon || "",
-            kategoriId:
-              data.kontakItems?.map((item: any) => item.kontakItemId) || [],
+            imageId: data.imageId,
+            kontakItems: [
+              {
+                nama: data.kontakItems.nama,
+                nomorTelepon: data.kontakItems.nomorTelepon,
+                imageId: data.kontakItems.imageId,
+              },
+            ],
          };
          return data;
        } else {
@@ -225,8 +212,14 @@ const kontakDaruratKeamananState = proxy({
            },
            body: JSON.stringify({
              nama: this.form.nama,
-              icon: this.form.icon,
-              kategoriId: this.form.kategoriId,
+              imageId: this.form.imageId,
+              kontakItems: [
+                {
+                  nama: this.form.kontakItems[0].nama,
+                  nomorTelepon: this.form.kontakItems[0].nomorTelepon,
+                  imageId: this.form.kontakItems[0].imageId,
+                },
+              ],
            }),
          }
        );
@@ -263,242 +256,4 @@ const kontakDaruratKeamananState = proxy({
  },
 });

-const templateFormItem = z.object({
-  nama: z.string().min(1, "Nama minimal 1 karakter"),
-  nomorTelepon: z.string().min(1, "Nomor Telepon minimal 1 karakter"),
-  icon: z.string().nonempty(),
-});
-
-const defaultFormItem = {
-  nama: "",
-  nomorTelepon: "",
-  icon: "",
-};
-
-const kontakDaruratItem = proxy({
-  create: {
-    form: { ...defaultFormItem },
-    loading: false,
-    async create() {
-      const cek = templateFormItem.safeParse(kontakDaruratItem.create.form);
-      if (!cek.success) {
-        const err = `[${cek.error.issues
-          .map((v) => `${v.path.join(".")}`)
-          .join("\n")}] required`;
-        return toast.error(err);
-      }
-      try {
-        kontakDaruratItem.create.loading = true;
-        const res = await ApiFetch.api.keamanan.kontakitem["create"].post(
-          kontakDaruratItem.create.form
-        );
-        if (res.status === 200) {
-          kontakDaruratItem.findMany.load();
-          return toast.success("Sukses menambahkan");
-        }
-        console.log(res);
-        return toast.error("failed create");
-      } catch (error) {
-        console.log((error as Error).message);
-      } finally {
-        kontakDaruratItem.create.loading = false;
-      }
-    },
-  },
-  findMany: {
-    data: null as Array<
-      Prisma.KontakItemGetPayload<{
-        omit: {
-          isActive: true;
-        };
-      }>
-    > | null,
-    page: 1,
-    totalPages: 1,
-    loading: false,
-    search: "",
-    load: async (page = 1, limit = 10, search = "") => {
-      kontakDaruratItem.findMany.loading = true; // ✅ Akses langsung via nama path
-      kontakDaruratItem.findMany.page = page;
-      kontakDaruratItem.findMany.search = search;
-
-      try {
-        const query: any = { page, limit };
-        if (search) query.search = search;
-
-        const res = await ApiFetch.api.keamanan.kontakitem["find-many"].get({
-          query,
-        });
-
-        if (res.status === 200 && res.data?.success) {
-          kontakDaruratItem.findMany.data = res.data.data ?? [];
-          kontakDaruratItem.findMany.totalPages = res.data.totalPages ?? 1;
-        } else {
-          kontakDaruratItem.findMany.data = [];
-          kontakDaruratItem.findMany.totalPages = 1;
-        }
-      } catch (err) {
-        console.error("Gagal fetch kontak darurat paginated:", err);
-        kontakDaruratItem.findMany.data = [];
-        kontakDaruratItem.findMany.totalPages = 1;
-      } finally {
-        kontakDaruratItem.findMany.loading = false;
-      }
-    },
-  },
-  findUnique: {
-    data: null as Prisma.KontakItemGetPayload<{
-      omit: {
-        isActive: true;
-      };
-    }> | null,
-    loading: false,
-    async load(id: string) {
-      try {
-        const res = await fetch(`/api/keamanan/kontakitem/${id}`);
-        if (res.ok) {
-          const data = await res.json();
-          kontakDaruratItem.findUnique.data = data.data ?? null;
-        } else {
-          console.error("Failed to fetch data", res.status, res.statusText);
-          kontakDaruratItem.findUnique.data = null;
-        }
-      } catch (error) {
-        console.error("Error fetching data:", error);
-        kontakDaruratItem.findUnique.data = null;
-      }
-    },
-  },
-  delete: {
-    loading: false,
-    async byId(id: string) {
-      if (!id) return toast.warn("ID tidak valid");
-      try {
-        kontakDaruratItem.delete.loading = true;
-        const response = await fetch(`/api/keamanan/kontakitem/del/${id}`, {
-          method: "DELETE",
-          headers: {
-            "Content-Type": "application/json",
-          },
-        });
-
-        const result = await response.json();
-
-        if (response.ok && result?.success) {
-          toast.success(result.message || "Kontak item berhasil dihapus");
-          await kontakDaruratItem.findMany.load(); // refresh list
-        } else {
-          toast.error(result?.message || "Gagal menghapus kontak item");
-        }
-      } catch (error) {
-        console.error("Gagal delete:", error);
-        toast.error("Terjadi kesalahan saat menghapus kontak item");
-      } finally {
-        kontakDaruratItem.delete.loading = false;
-      }
-    },
-  },
-  update: {
-    id: "",
-    form: { ...defaultFormItem },
-    loading: false,
-
-    async load(id: string) {
-      if (!id) {
-        toast.warn("ID tidak valid");
-        return null;
-      }
-
-      try {
-        const response = await fetch(`/api/keamanan/kontakitem/${id}`, {
-          method: "GET",
-          headers: {
-            "Content-Type": "application/json",
-          },
-        });
-        if (!response.ok) {
-          throw new Error(`HTTP error! status: ${response.status}`);
-        }
-        const result = await response.json();
-        if (result?.success) {
-          const data = result.data;
-          this.id = data.id;
-          this.form = {
-            nama: data.nama,
-            nomorTelepon: data.nomorTelepon,
-            icon: data.icon,
-          };
-          return data;
-        } else {
-          throw new Error(result?.message || "Gagal memuat data");
-        }
-      } catch (error) {
-        console.error("Error loading kontak darurat:", error);
-        toast.error(
-          error instanceof Error ? error.message : "Gagal memuat data"
-        );
-        return null;
-      }
-    },
-
-    async update() {
-      const cek = templateFormItem.safeParse(kontakDaruratItem.update.form);
-      if (!cek.success) {
-        const err = `[${cek.error.issues
-          .map((v) => `${v.path.join(".")}`)
-          .join("\n")}] required`;
-        return toast.error(err);
-      }
-
-      try {
-        kontakDaruratItem.update.loading = true;
-        const response = await fetch(`/api/keamanan/kontakitem/${this.id}`, {
-          method: "PUT",
-          headers: {
-            "Content-Type": "application/json",
-          },
-          body: JSON.stringify({
-            nama: this.form.nama,
-            nomorTelepon: this.form.nomorTelepon,
-            icon: this.form.icon,
-          }),
-        });
-        if (!response.ok) {
-          const errorData = await response.json().catch(() => ({}));
-          throw new Error(
-            errorData.message || `HTTP error! status: ${response.status}`
-          );
-        }
-        const result = await response.json();
-        if (result.success) {
-          toast.success("Berhasil update kontak item");
-          await kontakDaruratItem.findMany.load(); // refresh list
-          return true;
-        } else {
-          throw new Error(result.message || "Gagal mengupdate kontak item");
-        }
-      } catch (error) {
-        console.error("Error updating kontak item:", error);
-        toast.error(
-          error instanceof Error
-            ? error.message
-            : "Gagal mengupdate kontak item"
-        );
-        return false;
-      } finally {
-        kontakDaruratItem.update.loading = false;
-      }
-    },
-    reset() {
-      kontakDaruratItem.update.id = "";
-      kontakDaruratItem.update.form = { ...defaultFormItem };
-    },
-  },
-});
-
-const kontakDarurat = proxy({
-  kontakDaruratKeamananState,
-  kontakDaruratItem,
-});
-
-export default kontakDarurat;
+export default kontakDaruratKeamananState;
--- a/src/app/admin/(dashboard)/_state/keamanan/laporan-publik.ts
+++ b/src/app/admin/(dashboard)/_state/keamanan/laporan-publik.ts
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
 import ApiFetch from "@/lib/api-fetch";
 import { Prisma } from "@prisma/client";
 import { toast } from "react-toastify";
@@ -11,24 +10,12 @@ const templateForm = z.object({
  judul: z.string().min(3, "Judul minimal 3 karakter"),
  lokasi: z.string().min(3, "Lokasi minimal 3 karakter"),
  tanggalWaktu: z.string().min(3, "Tanggal Waktu minimal 3 karakter"),
+  status: z.enum(["Selesai", "Proses", "Gagal"]),
+  penanganan: z.string(),
  kronologi: z.string().optional(),
 });

 interface FormData {
-  judul: string;
-  lokasi: string;
-  tanggalWaktu: string;
-  kronologi: string;
-}
-
-const defaultForm: FormData = {
-  judul: "",
-  lokasi: "",
-  tanggalWaktu: new Date().toISOString(),
-  kronologi: "",
-};
-
-interface FormEditData {
  judul: string;
  lokasi: string;
  tanggalWaktu: string;
@@ -37,16 +24,15 @@ interface FormEditData {
  kronologi: string;
 }

-const editForm: FormEditData = {
+const defaultForm: FormData = {
  judul: "",
  lokasi: "",
  tanggalWaktu: new Date().toISOString(),
-  kronologi: "",
  status: "Proses",
  penanganan: "",
+  kronologi: "",
 };

-
 const laporanPublikState = proxy({
  create: {
    form: { ...defaultForm },
@@ -88,7 +74,7 @@ const laporanPublikState = proxy({
        
        if (res.status === 200) {
          laporanPublikState.findMany.load();
-          return toast.success("Sukses menambahkan");
+          return toast.success("success create");
        }
        
        console.log(res);
@@ -111,37 +97,13 @@ const laporanPublikState = proxy({
          include: { penanganan: true };
        }>[]
      | null,
-      page: 1,
-      totalPages: 1,
-      loading: false,
-      search: "",
-     load: async (page = 1, limit = 10, search = "") => {
-        laporanPublikState.findMany.loading = true; // ✅ Akses langsung via nama path
-        laporanPublikState.findMany.page = page;
-        laporanPublikState.findMany.search = search;
-    
-        try {
-          const query: any = { page, limit };
-          if (search) query.search = search;
-      
-          const res = await ApiFetch.api.keamanan.laporanpublik["find-many"].get({ query });
-      
-          if (res.status === 200 && res.data?.success) {
-            laporanPublikState.findMany.data = res.data.data ?? [];
-            laporanPublikState.findMany.totalPages = res.data.totalPages ?? 1;
-          } else {
-            laporanPublikState.findMany.data = [];
-            laporanPublikState.findMany.totalPages = 1;
-          }
-        } catch (err) {
-          console.error("Gagal fetch laporan publik paginated:", err);
-          laporanPublikState.findMany.data = [];
-          laporanPublikState.findMany.totalPages = 1;
-        } finally {
-          laporanPublikState.findMany.loading = false;
-        }
-      },
+    async load() {
+      const res = await ApiFetch.api.keamanan.laporanpublik["find-many"].get();
+      if (res.status === 200) {
+        laporanPublikState.findMany.data = res.data?.data ?? [];
+      }
    },
+  },
  findUnique: {
    data: null as Prisma.LaporanPublikGetPayload<{
      include: { penanganan: true };
@@ -198,7 +160,7 @@ const laporanPublikState = proxy({
  },
  edit: {
    id: "",
-    form: { ...editForm },
+    form: { ...defaultForm },
    loading: false,
    async load(id: string) {
      if (!id) {
@@ -304,7 +266,7 @@ const laporanPublikState = proxy({
         },
         reset() {
           laporanPublikState.edit.id = "";
-           laporanPublikState.edit.form = { ...editForm };
+           laporanPublikState.edit.form = { ...defaultForm };
         },
  }
 });
--- a/src/app/admin/(dashboard)/_state/keamanan/pencegahan-kriminalitas.ts
+++ b/src/app/admin/(dashboard)/_state/keamanan/pencegahan-kriminalitas.ts
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
 import ApiFetch from "@/lib/api-fetch";
 import { Prisma } from "@prisma/client";
 import { toast } from "react-toastify";
@@ -6,17 +5,45 @@ import { proxy } from "valtio";
 import { z } from "zod";

 const templateForm = z.object({
-  judul: z.string().min(1, "Judul minimal 1 karakter"),
-  deskripsi: z.string().min(1, "Deskripsi minimal 1 karakter"),
-  deskripsiSingkat: z.string().min(1, "Deskripsi singkat minimal 1 karakter"),
-  linkVideo: z.string().min(1, "Link video minimal 1 karakter"),
+  pencegahanKriminalitas: z.object({
+    programKeamanan: z.object({
+      nama: z.string().min(1, "Nama minimal 1 karakter"),
+      deskripsi: z.string().min(1, "Deskripsi minimal 1 karakter"),
+      slug: z.string().min(1, "Slug minimal 1 karakter"),
+    }),
+    tipsKeamanan: z.object({
+      judul: z.string().min(1, "Judul minimal 1 karakter"),
+      konten: z.string().min(1, "Konten minimal 1 karakter"),
+      slug: z.string().min(1, "Slug minimal 1 karakter"),
+    }),
+    videoKeamanan: z.object({
+      judul: z.string().min(1, "Judul minimal 1 karakter"),
+      deskripsi: z.string().min(1, "Deskripsi minimal 1 karakter"),
+      videoUrl: z.string().min(1, "Video URL minimal 1 karakter"),
+      slug: z.string().min(1, "Slug minimal 1 karakter"),
+    }),
+  }),
 });

 const defaultForm = {
-  judul: "",
-  deskripsi: "",
-  deskripsiSingkat: "",
-  linkVideo: "",
+  pencegahanKriminalitas: {
+    programKeamanan: {
+      nama: "",
+      deskripsi: "",
+      slug: "",
+    },
+    tipsKeamanan: {
+      judul: "",
+      konten: "",
+      slug: "",
+    },
+    videoKeamanan: {
+      judul: "",
+      deskripsi: "",
+      videoUrl: "",
+      slug: "",
+    },
+  },
 };

 const pencegahanKriminalitasState = proxy({
@@ -37,10 +64,10 @@ const pencegahanKriminalitasState = proxy({
        pencegahanKriminalitasState.create.loading = true;
        const res = await ApiFetch.api.keamanan.pencegahankriminalitas[
          "create"
-        ].post(pencegahanKriminalitasState.create.form);
+        ].post(pencegahanKriminalitasState.create.form.pencegahanKriminalitas);
        if (res.status === 200) {
          pencegahanKriminalitasState.findMany.load();
-          return toast.success("Sukses menambahkan");
+          return toast.success("success create");
        }
        console.log(res);
        return toast.error("failed create");
@@ -54,46 +81,29 @@ const pencegahanKriminalitasState = proxy({
  findMany: {
    data: null as
      | Prisma.PencegahanKriminalitasGetPayload<{
-          omit: { isActive: true };
+          include: {
+            programKeamanan: true;
+            tipsKeamanan: true;
+            videoKeamanan: true;
+          };
        }>[]
      | null,
-    page: 1,
-    totalPages: 1,
-    loading: false,
-    search: "",
-    load: async (page = 1, limit = 10, search = "") => {
-      pencegahanKriminalitasState.findMany.loading = true; // ✅ Akses langsung via nama path
-      pencegahanKriminalitasState.findMany.page = page;
-      pencegahanKriminalitasState.findMany.search = search;
-
-      try {
-        const query: any = { page, limit };
-        if (search) query.search = search;
-
-        const res = await ApiFetch.api.keamanan.pencegahankriminalitas[
-          "find-many"
-        ].get({ query });
-
-        if (res.status === 200 && res.data?.success) {
-          pencegahanKriminalitasState.findMany.data = res.data.data ?? [];
-          pencegahanKriminalitasState.findMany.totalPages =
-            res.data.totalPages ?? 1;
-        } else {
-          pencegahanKriminalitasState.findMany.data = [];
-          pencegahanKriminalitasState.findMany.totalPages = 1;
-        }
-      } catch (err) {
-        console.error("Gagal fetch pencegahan kriminalitas paginated:", err);
-        pencegahanKriminalitasState.findMany.data = [];
-        pencegahanKriminalitasState.findMany.totalPages = 1;
-      } finally {
-        pencegahanKriminalitasState.findMany.loading = false;
+    async load() {
+      const res = await ApiFetch.api.keamanan.pencegahankriminalitas[
+        "find-many"
+      ].get();
+      if (res.status === 200) {
+        pencegahanKriminalitasState.findMany.data = res.data?.data ?? [];
      }
    },
  },
  findUnique: {
    data: null as Prisma.PencegahanKriminalitasGetPayload<{
-      omit: { isActive: true };
+      include: {
+        programKeamanan: true;
+        tipsKeamanan: true;
+        videoKeamanan: true;
+      };
    }> | null,
    loading: false,
    async load(id: string) {
@@ -112,30 +122,6 @@ const pencegahanKriminalitasState = proxy({
      }
    },
  },
-  findFirst: {
-    data: null as Prisma.PencegahanKriminalitasGetPayload<{
-      omit: { isActive: true };
-    }> | null,
-    loading: false,
-    // findFirst.load()
-    async load() {
-      this.loading = true;
-      try {
-        const res = await ApiFetch.api.keamanan.pencegahankriminalitas["find-first"].get();
-
-        if (res.status === 200 && res.data?.success) {
-          this.data = res.data.data || null;
-        } else {
-          this.data = null;
-        }
-      } catch (err) {
-        console.error("Gagal fetch pencegahan kriminalitas terbaru:", err);
-        this.data = null;
-      } finally {
-        this.loading = false;
-      }
-    },
-  },
  delete: {
    loading: false,
    async byId(id: string) {
@@ -201,10 +187,24 @@ const pencegahanKriminalitasState = proxy({
          const data = result.data;
          pencegahanKriminalitasState.update.id = data.id;
          pencegahanKriminalitasState.update.form = {
-            judul: data.judul,
-            deskripsi: data.deskripsi,
-            deskripsiSingkat: data.deskripsiSingkat,
-            linkVideo: data.linkVideo,
+            pencegahanKriminalitas: {
+              programKeamanan: {
+                nama: data.programKeamanan.nama,
+                deskripsi: data.programKeamanan.deskripsi,
+                slug: data.programKeamanan.slug,
+              },
+              tipsKeamanan: {
+                judul: data.tipsKeamanan.judul,
+                konten: data.tipsKeamanan.konten,
+                slug: data.tipsKeamanan.slug,
+              },
+              videoKeamanan: {
+                judul: data.videoKeamanan.judul,
+                deskripsi: data.videoKeamanan.deskripsi,
+                videoUrl: data.videoKeamanan.videoUrl,
+                slug: data.videoKeamanan.slug,
+              },
+            },
          };
          return data;
        } else {
@@ -240,11 +240,40 @@ const pencegahanKriminalitasState = proxy({
              "Content-Type": "application/json",
            },
            body: JSON.stringify({
-              judul: pencegahanKriminalitasState.update.form.judul,
-              deskripsi: pencegahanKriminalitasState.update.form.deskripsi,
-              deskripsiSingkat:
-                pencegahanKriminalitasState.update.form.deskripsiSingkat,
-              linkVideo: pencegahanKriminalitasState.update.form.linkVideo,
+              pencegahanKriminalitas: {
+                programKeamanan: {
+                  nama: pencegahanKriminalitasState.update.form
+                    .pencegahanKriminalitas.programKeamanan.nama,
+                  deskripsi:
+                    pencegahanKriminalitasState.update.form
+                      .pencegahanKriminalitas.programKeamanan.deskripsi,
+                  slug: pencegahanKriminalitasState.update.form
+                    .pencegahanKriminalitas.programKeamanan.slug,
+                },
+                tipsKeamanan: {
+                  judul:
+                    pencegahanKriminalitasState.update.form
+                      .pencegahanKriminalitas.tipsKeamanan.judul,
+                  konten:
+                    pencegahanKriminalitasState.update.form
+                      .pencegahanKriminalitas.tipsKeamanan.konten,
+                  slug: pencegahanKriminalitasState.update.form
+                    .pencegahanKriminalitas.tipsKeamanan.slug,
+                },
+                videoKeamanan: {
+                  judul:
+                    pencegahanKriminalitasState.update.form
+                      .pencegahanKriminalitas.videoKeamanan.judul,
+                  deskripsi:
+                    pencegahanKriminalitasState.update.form
+                      .pencegahanKriminalitas.videoKeamanan.deskripsi,
+                  videoUrl:
+                    pencegahanKriminalitasState.update.form
+                      .pencegahanKriminalitas.videoKeamanan.videoUrl,
+                  slug: pencegahanKriminalitasState.update.form
+                    .pencegahanKriminalitas.videoKeamanan.slug,
+                },
+              },
            }),
          }
        );
@@ -282,4 +311,4 @@ const pencegahanKriminalitasState = proxy({
    },
  },
 });
-export default pencegahanKriminalitasState;
+export default pencegahanKriminalitasState;
--- a/src/app/admin/(dashboard)/_state/keamanan/tips-keamanan.ts
+++ b/src/app/admin/(dashboard)/_state/keamanan/tips-keamanan.ts
@@ -37,7 +37,7 @@ const tipsKeamananState = proxy({
        );
        if (res.status === 200) {
          tipsKeamananState.findMany.load();
-          return toast.success("Sukses menambahkan");
+          return toast.success("success create");
        }
        console.log(res);
        return toast.error("failed create");
--- a/src/app/admin/(dashboard)/_state/kesehatan/data_kesehatan_warga/artikelKesehatan.ts
+++ b/src/app/admin/(dashboard)/_state/kesehatan/data_kesehatan_warga/artikelKesehatan.ts
@@ -31,13 +31,11 @@ const templateForm = z.object({
  doctorSign: z.object({
    content: z.string().min(1, "Content harus diisi"),
  }),
-  imageId: z.string().min(1, "Image ID harus diisi"),
 });

 const defaultForm = {
  title: "",
  content: "",
-  imageId: "",
  introduction: {
    content: "",
  },
@@ -61,7 +59,6 @@ const defaultForm = {
  doctorSign: {
    content: "",
  },
-
 };

 const artikelKesehatanState = proxy({
@@ -115,42 +112,30 @@ const artikelKesehatanState = proxy({
            firstaid: true;
            mythvsfact: true;
            doctorsign: true;
-            image: true;
          };
        }>[]
      | null,
-    page: 1,
-    totalPages: 1,
    loading: false,
-    search: "",
-    load: async (page = 1, limit = 10, search = "") => {
-      artikelKesehatanState.findMany.loading = true; // ✅ Akses langsung via nama path
-      artikelKesehatanState.findMany.page = page;
-      artikelKesehatanState.findMany.search = search;
-
+    async load() {
      try {
-        const query: any = { page, limit };
-        if (search) query.search = search;
-
-        const res = await ApiFetch.api.kesehatan["artikel-kesehatan"][
+        this.loading = true;
+        const res = await (ApiFetch.api.kesehatan as any)["artikel-kesehatan"][
          "find-many"
-        ].get({ query });
+        ].get();

-        if (res.status === 200 && res.data?.success) {
-          artikelKesehatanState.findMany.data =
-            res.data.data ?? [];
-          artikelKesehatanState.findMany.totalPages =
-            res.data.totalPages ?? 1;
+        if (res.status === 200) {
+          this.data = res.data?.data ?? [];
        } else {
-          artikelKesehatanState.findMany.data = [];
-          artikelKesehatanState.findMany.totalPages = 1;
+          toast.error("Gagal memuat data artikel kesehatan");
        }
+
+        return res;
      } catch (err) {
-        console.error("Gagal fetch artikel kesehatan paginated:", err);
-        artikelKesehatanState.findMany.data = [];
-        artikelKesehatanState.findMany.totalPages = 1;
+        toast.error("Terjadi error saat load data");
+        console.error("LOAD ERROR:", err);
+        throw err;
      } finally {
-        artikelKesehatanState.findMany.loading = false;
+        this.loading = false;
      }
    },
  },
@@ -163,7 +148,6 @@ const artikelKesehatanState = proxy({
        firstaid: true;
        mythvsfact: true;
        doctorsign: true;
-        image: true;
      };
    }> | null,
    loading: false,
@@ -218,7 +202,6 @@ const artikelKesehatanState = proxy({
        doctorSign: {
          content: data.doctorsign.content,
        },
-        imageId: data.imageId,
      };
    },
    async submit() {
@@ -259,7 +242,6 @@ const artikelKesehatanState = proxy({
          doctorSign: {
            content: artikelKesehatanState.edit.form.doctorSign.content,
          },
-          imageId: artikelKesehatanState.edit.form.imageId,
        };

        const res = await fetch(
@@ -298,9 +280,12 @@ const artikelKesehatanState = proxy({
    async byId(id: string) {
      try {
        artikelKesehatanState.delete.loading = true;
-        const res = await fetch(`/api/kesehatan/artikel-kesehatan/del/${id}`, {
-          method: "DELETE",
-        });
+        const res = await fetch(
+          `/api/kesehatan/artikel-kesehatan/del/${id}`,
+          {
+            method: "DELETE",
+          }
+        );

        const result = await res.json();
        if (res.ok && result.success) {
--- a/src/app/admin/(dashboard)/_state/kesehatan/data_kesehatan_warga/fasilitasKesehatan.ts
+++ b/src/app/admin/(dashboard)/_state/kesehatan/data_kesehatan_warga/fasilitasKesehatan.ts
@@ -116,38 +116,27 @@ const fasilitasKesehatan = proxy({
          };
        }>[]
      | null,
-    page: 1,
-    totalPages: 1,
    loading: false,
-    search: "",
-    load: async (page = 1, limit = 10, search = "") => {
-      fasilitasKesehatanState.fasilitasKesehatan.findMany.loading = true; // ✅ Akses langsung via nama path
-      fasilitasKesehatanState.fasilitasKesehatan.findMany.page = page;
-      fasilitasKesehatanState.fasilitasKesehatan.findMany.search = search;
-
+    async load() {
      try {
-        const query: any = { page, limit };
-        if (search) query.search = search;
+        this.loading = true;
+        const res = await (ApiFetch.api.kesehatan as any)[
+          "fasilitas-kesehatan"
+        ]["find-many"].get();

-        const res = await ApiFetch.api.kesehatan["fasilitas-kesehatan"][
-          "find-many"
-        ].get({ query });
-
-        if (res.status === 200 && res.data?.success) {
-          fasilitasKesehatanState.fasilitasKesehatan.findMany.data =
-            res.data.data ?? [];
-          fasilitasKesehatanState.fasilitasKesehatan.findMany.totalPages =
-            res.data.totalPages ?? 1;
+        if (res.status === 200) {
+          this.data = res.data?.data ?? [];
        } else {
-          fasilitasKesehatanState.fasilitasKesehatan.findMany.data = [];
-          fasilitasKesehatanState.fasilitasKesehatan.findMany.totalPages = 1;
+          toast.error("Gagal memuat data fasilitas kesehatan");
        }
+
+        return res;
      } catch (err) {
-        console.error("Gagal fetch fasilitas kesehatan paginated:", err);
-        fasilitasKesehatanState.fasilitasKesehatan.findMany.data = [];
-        fasilitasKesehatanState.fasilitasKesehatan.findMany.totalPages = 1;
+        toast.error("Terjadi error saat load data");
+        console.error("LOAD ERROR:", err);
+        throw err;
      } finally {
-        fasilitasKesehatanState.fasilitasKesehatan.findMany.loading = false;
+        this.loading = false;
      }
    },
  },
@@ -351,7 +340,7 @@ const dokter = proxy({
          if (res.status === 200) {
            const id = res.data?.data;
            if (id) {
-              toast.success("Sukses menambahkan");
+              toast.success("Success create");
              dokter.create.create.form = { ...defaultDokterForm };
              dokter.findMany.load();
              return id;
@@ -569,7 +558,7 @@ const dokter = proxy({

 const fasilitasKesehatanState = proxy({
  fasilitasKesehatan,
-  dokter,
+  dokter
 });

 export default fasilitasKesehatanState;
--- a/src/app/admin/(dashboard)/_state/kesehatan/data_kesehatan_warga/grafikKepuasan.ts
+++ b/src/app/admin/(dashboard)/_state/kesehatan/data_kesehatan_warga/grafikKepuasan.ts
@@ -43,7 +43,7 @@ const grafikkepuasan = proxy({
        if (res.status === 200) {
          const id = res.data?.data;
          if (id) {
-            toast.success("Sukses menambahkan");
+            toast.success("Success create");
            grafikkepuasan.create.form = { ...defaultForm };
            grafikkepuasan.findMany.load();
            return id;
--- a/src/app/admin/(dashboard)/_state/kesehatan/data_kesehatan_warga/jadwalKegiatan.ts
+++ b/src/app/admin/(dashboard)/_state/kesehatan/data_kesehatan_warga/jadwalKegiatan.ts
@@ -26,6 +26,14 @@ const templateForm = z.object({
  dokumenJadwalKegiatan: z.object({
    content: z.string().min(1, "Content minimal 1 karakter"),
  }),
+  pendaftaranJadwalKegiatan: z.object({
+    name: z.string().min(1, "Name minimal 1 karakter"),
+    tanggal: z.string().min(1, "Tanggal minimal 1 karakter"),
+    namaOrangtua: z.string().min(1, "Nama Orangtua minimal 1 karakter"),
+    nomor: z.string().min(1, "Nomor minimal 1 karakter"),
+    alamat: z.string().min(1, "Alamat minimal 1 karakter"),
+    catatan: z.string().min(1, "Catatan minimal 1 karakter"),
+  }),
 });

 const defaultForm = {
@@ -47,7 +55,15 @@ const defaultForm = {
  },
  dokumenJadwalKegiatan: {
    content: "",
-  }
+  },
+  pendaftaranJadwalKegiatan: {
+    name: "",
+    tanggal: "",
+    namaOrangtua: "",
+    nomor: "",
+    alamat: "",
+    catatan: "",
+  },
 };

 const jadwalkegiatanState = proxy({
@@ -100,39 +116,31 @@ const jadwalkegiatanState = proxy({
            deskripsijadwalkegiatan: true;
            layananjadwalkegiatan: true;
            dokumenjadwalkegiatan: true;
+            pendaftaranjadwalkegiatan: true;
          };
        }>[]
      | null,
-    page: 1,
-    totalPages: 1,
    loading: false,
-    search: "",
-    load: async (page = 1, limit = 10, search = "") => {
-      jadwalkegiatanState.findMany.loading = true; // ✅ Akses langsung via nama path
-      jadwalkegiatanState.findMany.page = page;
-      jadwalkegiatanState.findMany.search = search;
-
+    async load() {
      try {
-        const query: any = { page, limit };
-        if (search) query.search = search;
+        this.loading = true;
+        const res = await (ApiFetch.api.kesehatan as any)[
+          "jadwal-kegiatan"
+        ]["find-many"].get();

-        const res = await ApiFetch.api.kesehatan["jadwal-kegiatan"][
-          "find-many"
-        ].get({ query });
-
-        if (res.status === 200 && res.data?.success) {
-          jadwalkegiatanState.findMany.data = res.data.data ?? [];
-          jadwalkegiatanState.findMany.totalPages = res.data.totalPages ?? 1;
+        if (res.status === 200) {
+          this.data = res.data?.data ?? [];
        } else {
-          jadwalkegiatanState.findMany.data = [];
-          jadwalkegiatanState.findMany.totalPages = 1;
+          toast.error("Gagal memuat data jadwal kegiatan");
        }
+
+        return res;
      } catch (err) {
-        console.error("Gagal fetch jadwal kegiatan paginated:", err);
-        jadwalkegiatanState.findMany.data = [];
-        jadwalkegiatanState.findMany.totalPages = 1;
+        toast.error("Terjadi error saat load data");
+        console.error("LOAD ERROR:", err);
+        throw err;
      } finally {
-        jadwalkegiatanState.findMany.loading = false;
+        this.loading = false;
      }
    },
  },
@@ -144,6 +152,7 @@ const jadwalkegiatanState = proxy({
        layananjadwalkegiatan: true;
        syaratketentuanjadwalkegiatan: true;
        dokumenjadwalkegiatan: true;
+        pendaftaranjadwalkegiatan: true;
      };
    }> | null,
    loading: false,
@@ -191,7 +200,15 @@ const jadwalkegiatanState = proxy({
        },
        dokumenJadwalKegiatan: {
          content: data.dokumenjadwalkegiatan.content,
-        }
+        },
+        pendaftaranJadwalKegiatan: {
+          name: data.pendaftaranjadwalkegiatan.name,
+          tanggal: data.pendaftaranjadwalkegiatan.tanggal,
+          namaOrangtua: data.pendaftaranjadwalkegiatan.namaOrangtua,
+          nomor: data.pendaftaranjadwalkegiatan.nomor,
+          alamat: data.pendaftaranjadwalkegiatan.alamat,
+          catatan: data.pendaftaranjadwalkegiatan.catatan,
+        },
      };
    },
    async submit() {
@@ -210,28 +227,29 @@ const jadwalkegiatanState = proxy({
          content: jadwalkegiatanState.edit.form.content,
          informasiJadwalKegiatan: {
            name: jadwalkegiatanState.edit.form.informasiJadwalKegiatan.name,
-            tanggal:
-              jadwalkegiatanState.edit.form.informasiJadwalKegiatan.tanggal,
+            tanggal: jadwalkegiatanState.edit.form.informasiJadwalKegiatan.tanggal,
            waktu: jadwalkegiatanState.edit.form.informasiJadwalKegiatan.waktu,
-            lokasi:
-              jadwalkegiatanState.edit.form.informasiJadwalKegiatan.lokasi,
+            lokasi: jadwalkegiatanState.edit.form.informasiJadwalKegiatan.lokasi,
          },
          layananJadwalKegiatan: {
-            content:
-              jadwalkegiatanState.edit.form.layananJadwalKegiatan.content,
+            content: jadwalkegiatanState.edit.form.layananJadwalKegiatan.content,
          },
          deskripsiJadwalKegiatan: {
-            deskripsi:
-              jadwalkegiatanState.edit.form.deskripsiJadwalKegiatan.deskripsi,
+            deskripsi: jadwalkegiatanState.edit.form.deskripsiJadwalKegiatan.deskripsi,
          },
          syaratKetentuanJadwalKegiatan: {
-            content:
-              jadwalkegiatanState.edit.form.syaratKetentuanJadwalKegiatan
-                .content,
+            content: jadwalkegiatanState.edit.form.syaratKetentuanJadwalKegiatan.content,
          },
          dokumenJadwalKegiatan: {
-            content:
-              jadwalkegiatanState.edit.form.dokumenJadwalKegiatan.content,
+            content: jadwalkegiatanState.edit.form.dokumenJadwalKegiatan.content,
+          },
+          pendaftaranJadwalKegiatan: {
+            name: jadwalkegiatanState.edit.form.pendaftaranJadwalKegiatan.name,
+            tanggal: jadwalkegiatanState.edit.form.pendaftaranJadwalKegiatan.tanggal,
+            namaOrangtua: jadwalkegiatanState.edit.form.pendaftaranJadwalKegiatan.namaOrangtua,
+            nomor: jadwalkegiatanState.edit.form.pendaftaranJadwalKegiatan.nomor,
+            alamat: jadwalkegiatanState.edit.form.pendaftaranJadwalKegiatan.alamat,
+            catatan: jadwalkegiatanState.edit.form.pendaftaranJadwalKegiatan.catatan,
          },
        };

@@ -268,7 +286,7 @@ const jadwalkegiatanState = proxy({
  },
  delete: {
    loading: false,
-    async byId(id: string) {
+    async byId(id: string){
      try {
        jadwalkegiatanState.delete.loading = true;
        const res = await fetch(`/api/kesehatan/jadwal-kegiatan/del/${id}`, {
@@ -287,7 +305,7 @@ const jadwalkegiatanState = proxy({
      } finally {
        jadwalkegiatanState.delete.loading = false;
      }
-    },
+    }
  },
 });

--- a/src/app/admin/(dashboard)/_state/kesehatan/data_kesehatan_warga/pendafataranJadwalKegiatan.ts
+++ b/src/app/admin/(dashboard)/_state/kesehatan/data_kesehatan_warga/pendafataranJadwalKegiatan.ts
@@ -1,290 +0,0 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-import ApiFetch from "@/lib/api-fetch";
-import { Prisma } from "@prisma/client";
-import { toast } from "react-toastify";
-import { proxy } from "valtio";
-import { z } from "zod";
-
-const templateForm = z.object({
-  name: z.string().min(1, "Name minimal 1 karakter"),
-  tanggal: z.string().min(1, "Tanggal minimal 1 karakter"),
-  namaOrangtua: z.string().min(1, "Nama Orangtua minimal 1 karakter"),
-  nomor: z.string().min(1, "Nomor minimal 1 karakter"),
-  alamat: z.string().min(1, "Alamat minimal 1 karakter"),
-  catatan: z.string().min(1, "Catatan minimal 1 karakter"),
-});
-
-const defaultForm = {
-  name: "",
-  tanggal: "",
-  namaOrangtua: "",
-  nomor: "",
-  alamat: "",
-  catatan: "",
-};
-
-const pendaftaranJadwalKegiatanState = proxy({
-  create: {
-    form: { ...defaultForm },
-    loading: false,
-    async submit() {
-      const cek = templateForm.safeParse(this.form);
-      if (!cek.success) {
-        const errMsg = cek.error.issues
-          .map((v) => `${v.path.join(".")}: ${v.message}`)
-          .join("\n");
-        toast.error(errMsg);
-        return null;
-      }
-
-      try {
-        this.loading = true;
-        const payload = { ...this.form };
-
-        const res = await (ApiFetch.api.kesehatan as any)[
-          "pendaftaran-jadwal-kegiatan"
-        ].create.post(payload);
-
-        if (res.status === 200) {
-          toast.success("Berhasil menambahkan jadwal kegiatan");
-          this.resetForm();
-          await pendaftaranJadwalKegiatanState.findMany.load();
-          return res.data;
-        }
-      } catch (err: any) {
-        const msg = err?.message || "Terjadi kesalahan saat mengirim data";
-        toast.error(msg);
-        console.error("SUBMIT ERROR:", err);
-        return null;
-      } finally {
-        this.loading = false;
-      }
-    },
-    resetForm() {
-      this.form = { ...defaultForm };
-    },
-  },
-  findMany: {
-    data: null as
-      | Prisma.PendaftaranJadwalKegiatanGetPayload<{
-          omit: {
-            isActive: true;
-          };
-        }>[]
-      | null,
-    page: 1,
-    totalPages: 1,
-    loading: false,
-    search: "",
-    load: async (page = 1, limit = 10, search = "") => {
-      pendaftaranJadwalKegiatanState.findMany.loading = true; // ✅ Akses langsung via nama path
-      pendaftaranJadwalKegiatanState.findMany.page = page;
-      pendaftaranJadwalKegiatanState.findMany.search = search;
-
-      try {
-        const query: any = { page, limit };
-        if (search) query.search = search;
-
-        const res = await ApiFetch.api.kesehatan["pendaftaran-jadwal-kegiatan"][
-          "find-many"
-        ].get({ query });
-
-        if (res.status === 200 && res.data?.success) {
-          pendaftaranJadwalKegiatanState.findMany.data = res.data.data ?? [];
-          pendaftaranJadwalKegiatanState.findMany.totalPages =
-            res.data.totalPages ?? 1;
-        } else {
-          pendaftaranJadwalKegiatanState.findMany.data = [];
-          pendaftaranJadwalKegiatanState.findMany.totalPages = 1;
-        }
-      } catch (err) {
-        console.error(
-          "Gagal fetch pendaftaran jadwal kegiatan paginated:",
-          err
-        );
-        pendaftaranJadwalKegiatanState.findMany.data = [];
-        pendaftaranJadwalKegiatanState.findMany.totalPages = 1;
-      } finally {
-        pendaftaranJadwalKegiatanState.findMany.loading = false;
-      }
-    },
-  },
-  findUnique: {
-    data: null as Prisma.PendaftaranJadwalKegiatanGetPayload<{
-      omit: {
-        isActive: true;
-      };
-    }> | null,
-    async load(id: string) {
-      try {
-        const res = await fetch(
-          `/api/kesehatan/pendaftaran-jadwal-kegiatan/${id}`
-        );
-        if (res.ok) {
-          const data = await res.json();
-          pendaftaranJadwalKegiatanState.findUnique.data = data.data ?? null;
-        } else {
-          console.error("Failed to fetch data", res.status, res.statusText);
-          pendaftaranJadwalKegiatanState.findUnique.data = null;
-        }
-      } catch (error) {
-        console.error("Error fetching data:", error);
-        pendaftaranJadwalKegiatanState.findUnique.data = null;
-      }
-    },
-  },
-  delete: {
-    loading: false,
-    async byId(id: string) {
-      if (!id) return toast.warn("ID tidak valid");
-
-      try {
-        pendaftaranJadwalKegiatanState.delete.loading = true;
-
-        const response = await fetch(
-          `/api/kesehatan/pendaftaran-jadwal-kegiatan/del/${id}`,
-          {
-            method: "DELETE",
-            headers: {
-              "Content-Type": "application/json",
-            },
-          }
-        );
-
-        const result = await response.json();
-
-        if (response.ok && result?.success) {
-          toast.success(
-            result.message || "Pendaftaran jadwal kegiatan berhasil dihapus"
-          );
-          await pendaftaranJadwalKegiatanState.findMany.load(); // refresh list
-        } else {
-          toast.error(
-            result?.message || "Gagal menghapus pendaftaran jadwal kegiatan"
-          );
-        }
-      } catch (error) {
-        console.error("Gagal delete:", error);
-        toast.error(
-          "Terjadi kesalahan saat menghapus pendaftaran jadwal kegiatan"
-        );
-      } finally {
-        pendaftaranJadwalKegiatanState.delete.loading = false;
-      }
-    },
-  },
-   edit: {
-      id: "",
-      form: { ...defaultForm },
-      loading: false,
-  
-      async load(id: string) {
-        if (!id) {
-          toast.warn("ID tidak valid");
-          return null;
-        }
-  
-        try {
-          const response = await fetch(`/api/kesehatan/pendaftaran-jadwal-kegiatan/${id}`, {
-            method: "GET",
-            headers: {
-              "Content-Type": "application/json",
-            },
-          });
-          if (!response.ok) {
-            throw new Error(`HTTP error! status: ${response.status}`);
-          }
-  
-          const result = await response.json();
-  
-          if (result?.success) {
-            const data = result.data;
-            this.id = data.id;
-            this.form = {
-              name: data.name,
-              tanggal: data.tanggal,
-              namaOrangtua: data.namaOrangtua,
-              nomor: data.nomor,
-              alamat: data.alamat,
-              catatan: data.catatan,
-            };
-            return data; // Return the loaded data
-          } else {
-            throw new Error(result?.message || "Gagal memuat data");
-          }
-        } catch (error) {
-          console.error("Error loading pendaftaran jadwal kegiatan:", error);
-          toast.error(
-            error instanceof Error ? error.message : "Gagal memuat data"
-          );
-          return null;
-        }
-      },
-  
-      async update() {
-        const cek = templateForm.safeParse(pendaftaranJadwalKegiatanState.edit.form);
-        if (!cek.success) {
-          const err = `[${cek.error.issues
-            .map((v) => `${v.path.join(".")}`)
-            .join("\n")}] required`;
-          toast.error(err);
-          return false;
-        }
-  
-        try {
-          pendaftaranJadwalKegiatanState.edit.loading = true;
-  
-          const response = await fetch(
-            `/api/kesehatan/pendaftaran-jadwal-kegiatan/${this.id}`,
-            {
-              method: "PUT",
-              headers: {
-                "Content-Type": "application/json",
-              },
-              body: JSON.stringify({
-                name: this.form.name,
-                tanggal: this.form.tanggal,
-                namaOrangtua: this.form.namaOrangtua,
-                nomor: this.form.nomor,
-                alamat: this.form.alamat,
-                catatan: this.form.catatan,
-              }),
-            }
-          );
-  
-          if (!response.ok) {
-            const errorData = await response.json().catch(() => ({}));
-            throw new Error(
-              errorData.message || `HTTP error! status: ${response.status}`
-            );
-          }
-  
-          const result = await response.json();
-  
-          if (result.success) {
-            toast.success("Berhasil update pendaftaran jadwal kegiatan");
-            await pendaftaranJadwalKegiatanState.findMany.load(); // refresh list
-            return true;
-          } else {
-            throw new Error(result.message || "Gagal update pendaftaran jadwal kegiatan");
-          }
-        } catch (error) {
-          console.error("Error updating pendaftaran jadwal kegiatan:", error);
-          toast.error(
-            error instanceof Error
-              ? error.message
-              : "Terjadi kesalahan saat update pendaftaran jadwal kegiatan"
-          );
-          return false;
-        } finally {
-          pendaftaranJadwalKegiatanState.edit.loading = false;
-        }
-      },
-      reset() {
-        pendaftaranJadwalKegiatanState.edit.id = "";
-        pendaftaranJadwalKegiatanState.edit.form = { ...defaultForm };
-      },
-    },
-});
-
-export default pendaftaranJadwalKegiatanState;
--- a/src/app/admin/(dashboard)/_state/kesehatan/data_kesehatan_warga/persentaseKelahiran.ts
+++ b/src/app/admin/(dashboard)/_state/kesehatan/data_kesehatan_warga/persentaseKelahiran.ts
@@ -50,7 +50,7 @@ const persentasekelahiran = proxy({
        if (res.status === 200) {
          const id = res.data?.data;
          if (id) {
-            toast.success("Sukses menambahkan");
+            toast.success("Success create");
            persentasekelahiran.create.form = { ...defaultForm };
            persentasekelahiran.findMany.load();
            return id;
--- a/src/app/admin/(dashboard)/_state/kesehatan/kontak-darurat/kontakDarurat.ts
+++ b/src/app/admin/(dashboard)/_state/kesehatan/kontak-darurat/kontakDarurat.ts
@@ -9,14 +9,12 @@ const templateForm = z.object({
  name: z.string().min(3, "Judul minimal 3 karakter"),
  deskripsi: z.string().min(3, "Deskripsi minimal 3 karakter"),
  imageId: z.string().nonempty(),
-  whatsapp: z.string().min(10, "Whatsapp minimal 10 karakter"),
 });

 const defaultForm = {
  name: "",
  deskripsi: "",
  imageId: "",
-  whatsapp: "",
 };

 const kontakDarurat = proxy({
@@ -173,7 +171,6 @@ const kontakDarurat = proxy({
            name: data.name,
            deskripsi: data.deskripsi,
            imageId: data.imageId,
-            whatsapp: data.whatsapp,
          };
          return data; // Return the loaded data
        } else {
@@ -210,7 +207,6 @@ const kontakDarurat = proxy({
              name: this.form.name,
              deskripsi: this.form.deskripsi,
              imageId: this.form.imageId,
-              whatsapp: this.form.whatsapp,
            }),
          }
        );
--- a/Show More
+++ b/Show More