Fix Ui Admin & User to Mobile && QC Menu Landing Page, PPID, Desa

Fix Tampilan User & Admin Menu Inovasi & Lingkungan
fix tampilan admin menu inovasi, sisa menu lingkungan
2025-09-24 14:50:53 +08:00 · 2025-09-22 17:15:11 +08:00 · 2025-09-22 10:53:48 +08:00 · 2025-09-20 03:49:20 +08:00 · 2025-09-19 10:41:18 +08:00 · 2025-09-17 17:54:03 +08:00
628 changed files with 38572 additions and 21909 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -48,3 +48,5 @@ next-env.d.ts

 .env.*

+*.tar.gz
+
--- a/bun.lockb
+++ b/bun.lockb
--- a/package.json
+++ b/package.json
@@ -3,11 +3,9 @@
  "version": "0.1.5",
  "private": true,
  "scripts": {
-    "dev": "next dev --turbopack",
-    "build": "next build",
-    "start": "next start",
-    "lint": "next lint",
-    "prisma:seed": "bun run prisma/seed.ts"
+    "dev": "bun --bun next dev",
+    "build": "bun --bun next build",
+    "start": "bun --bun next start"
  },
  "prisma": {
    "seed": "bun run prisma/seed.ts"
@@ -57,6 +55,8 @@
    "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",
@@ -64,7 +64,7 @@
    "lodash": "^4.17.21",
    "motion": "^12.4.1",
    "nanoid": "^5.1.5",
-    "next": "15.1.6",
+    "next": "^15.5.2",
    "next-view-transitions": "^0.3.4",
    "node-fetch": "^3.3.2",
    "p-limit": "^6.2.0",
@@ -73,15 +73,18 @@
    "prisma": "^6.3.1",
    "react": "^19.0.0",
    "react-dom": "^19.0.0",
+    "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",
    "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": {
--- a/prisma/data/ekonomi/jumlah-pengangguran/detail-data-pengangguran.json
+++ b/prisma/data/ekonomi/jumlah-pengangguran/detail-data-pengangguran.json
@@ -1,51 +1,99 @@
 [
-    {
-      "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
-    }
-  ]
+  {
+    "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
+  }
+]
  
--- a/prisma/data/file-storage.json
+++ b/prisma/data/file-storage.json
@@ -0,0 +1,137 @@
+[
+  {
+    "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/landing-page/profile/mediaSosial.json
+++ b/prisma/data/landing-page/profile/mediaSosial.json
@@ -2,31 +2,37 @@
  {
    "id": "cmds8w2q60002vnbe6i8qhkuo",
    "name": "Telephone Desa Darmasaba",
-    "iconUrl": "081239580000"
+    "iconUrl": "081239580000",
+    "imageId": "cmff3nv180003vn6h5jvedidq"
  },
  {
    "id": "cmds8z7u20005vnbegyyvnbk0",
    "name": "Email Desa Darmasaba",
-    "iconUrl": "desadarmasaba@badungkab.go.id"
+    "iconUrl": "desadarmasaba@badungkab.go.id",
+    "imageId": "cmff3ll130001vn6hkhls3f5y"
  },
  {
    "id": "cmds9023u0008vnbe3oxmhwyf",
    "name": "Desa Darmasaba",
-    "iconUrl": "https://www.youtube.com/channel/UCtPw9WOQO7d2HIKzKgel4Xg"
+    "iconUrl": "https://www.youtube.com/channel/UCtPw9WOQO7d2HIKzKgel4Xg",
+    "imageId": "cmff3joae0000vn6h8sgs0ilg"
  },
  {
    "id": "cmds90oul000bvnbe2bqkptoi",
    "name": "Pemerintah Desa Darmasaba",
-    "iconUrl": "https://www.facebook.com/DarmasabaDesaku"
+    "iconUrl": "https://www.facebook.com/DarmasabaDesaku",
+    "imageId": "cmff3mtat0002vn6hs8vyyhdd"
  },
  {
    "id": "cmds91i4e000evnbe8gtf1gub",
    "name": "ddarmasaba",
-    "iconUrl": "https://www.instagram.com/ddarmasaba/"
+    "iconUrl": "https://www.instagram.com/ddarmasaba/",
+    "imageId": "cmff3oouh0004vn6hd94brzv9"
  },
  {
    "id": "cmds92de5000hvnbemlu6sq5x",
    "name": "desa.darmasaba",
-    "iconUrl": "https://www.tiktok.com/@desa.darmasaba?is_from_webapp=1&sender_device=pc"
+    "iconUrl": "https://www.tiktok.com/@desa.darmasaba?is_from_webapp=1&sender_device=pc",
+    "imageId": "cmff3q12g0005vn6h5ojov2qa"
  }
 ]
--- a/prisma/data/landing-page/profile/profile.json
+++ b/prisma/data/landing-page/profile/profile.json
@@ -2,6 +2,7 @@
  {
    "id": "edit",
    "name": "I.B Surya Prabhawa Manuaba, S.H., M.H.",
-    "position": "Perbekel Darmasaba periode 2021-2027"
+    "position": "Perbekel Darmasaba periode 2021-2027",
+    "imageId": "cmff2w5ly000avn0telhct71k"
  }
 ]
--- a/prisma/data/landing-page/profile/programInovasi.json
+++ b/prisma/data/landing-page/profile/programInovasi.json
@@ -1,50 +1,51 @@
 [
-  {
-    "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"
+    "link": "https://darmasaba.desa.id/berita/61452-kader-d-mangan-berhasil-meraih-prestasi-dalam-ajang-lomba-banjar-bali-quis-bbq-tahun-2024",
+    "imageId" : "cmff0z34f0005vn0tjtvq519p"
  },
  {
    "id": "cmdr76nqk0008vn5rdddvcxnr",
    "name": "Bicara Darmasaba",
    "description": "Bicara Darmasaba",
-    "link": "https://darmasaba.desa.id/berita/42506-bicara-darmasaba"
+    "link": "https://darmasaba.desa.id/berita/42506-bicara-darmasaba",
+    "imageId" : "cmff0tnf00003vn0t3kgzi0u0"
  },
  {
    "id": "cmdr77vbw000bvn5rvpmoq31s",
    "name": "Bares",
    "description": "Darmasaba Recycling Stock/Exchange",
-    "link": "http://darmasaba.desa.id/berita/56722-bares"
+    "link": "http://darmasaba.desa.id/berita/56722-bares",
+    "imageId" : "cmff0rr4z0002vn0twp333m2"
  },
  {
    "id": "cmdr7bxtp000evn5rmy85wihx",
    "name": "Sajjana Dharma Raksaka",
    "description": "Sajjana Dharma Raksaka",
-    "link": "https://ppid.badungkab.go.id/storage/dokumen/5RS9dldGkrgzMQq6bKdZsqsVRHI8gffWv4PGfb3r.pdf"
+    "link": "https://ppid.badungkab.go.id/storage/dokumen/5RS9dldGkrgzMQq6bKdZsqsVRHI8gffWv4PGfb3r.pdf",
+    "imageId" : "cmff10cwq0009vn0tse8dzu3j"
  },
  {
    "id": "cmdr7dlnk000hvn5r9lur3z35",
    "name": "PDKT",
    "description": "Perangkat Desa Kuat Teknologi",
-    "link": "https://darmasaba.desa.id/berita/53752-p-d-k-t"
+    "link": "https://darmasaba.desa.id/berita/53752-p-d-k-t",
+    "imageId" : "cmff1013m0008vn0th7t0d64d"
  },
  {
    "id": "cmdr7ftob000mvn5rfhgdtg8v",
    "name": "GM",
    "description": "Galah Melah",
-    "link": "https://darmasaba.desa.id/berita/52880-galah-melah"
+    "link": "https://darmasaba.desa.id/berita/52880-galah-melah",
+    "imageId" : "cmff38cyq000bvn0t9f01cz3f"
  },
  {
    "id": "cmdr7glue000pvn5r6onzslju",
    "name": "Inovasi Desa Darmasaba",
    "description": "Inovasi Desa Darmasaba",
-    "link": "https://darmasaba.desa.id/produk-lokal-desa"
+    "link": "https://darmasaba.desa.id/produk-lokal-desa",
+    "imageId" : "cmff0zqvd0007vn0tv6o5hjcq"
  }
 ]
--- a/prisma/data/user/roles.json
+++ b/prisma/data/user/roles.json
@@ -1,7 +1,7 @@
 [
    {
-      "id": "role_admin_desa",
-      "name": "ADMIN_DESA",
+      "id": "1",
+      "name": "ADMIN DESA",
      "description": "Administrator Desa",
      "permissions": ["manage_users", "manage_content", "view_reports"],
      "isActive": true,
@@ -9,8 +9,8 @@
      "updatedAt": "2025-09-01T00:00:00.000Z"
    },
    {
-      "id": "role_admin_kesehatan",
-      "name": "ADMIN_KESEHATAN",
+      "id": "2",
+      "name": "ADMIN KESEHATAN",
      "description": "Administrator Bidang Kesehatan",
      "permissions": ["manage_health_data", "view_reports"],
      "isActive": true,
@@ -18,8 +18,8 @@
      "updatedAt": "2025-09-01T00:00:00.000Z"
    },
    {
-      "id": "role_admin_sekolah",
-      "name": "ADMIN_SEKOLAH",
+      "id": "3",
+      "name": "ADMIN SEKOLAH",
      "description": "Administrator Sekolah",
      "permissions": ["manage_school_data", "view_reports"],
      "isActive": true,
--- a/prisma/data/user/users.json
+++ b/prisma/data/user/users.json
@@ -1,32 +1,29 @@
 [
    {
-      "id": "user_admin_desa",
+      "id": "1",
      "nama": "Admin Desa",
-      "email": "admin.desa@example.com",
-      "password": "$2b$10$XFDWYOJFxQ7ZM5bA0N4Z0O8u0eKYv58wLsaR7h6XK9bqWJ1YQJQ9q",
-      "roleId": "role_admin_desa",
+      "nomor": "089647037426",
+      "roleId": "1",
      "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",
+      "id": "2",
      "nama": "Admin Kesehatan",
-      "email": "admin.kesehatan@example.com",
-      "password": "$2b$10$XFDWYOJFxQ7ZM5bA0N4Z0O8u0eKYv58wLsaR7h6XK9bqWJ1YQJQ9q",
-      "roleId": "role_admin_kesehatan",
+      "nomor": "082339004198",
+      "roleId": "2",
      "isActive": true,
      "lastLogin": null,
      "createdAt": "2025-09-01T00:00:00.000Z",
      "updatedAt": "2025-09-01T00:00:00.000Z"
    },
    {
-      "id": "user_admin_sekolah",
+      "id": "3",
      "nama": "Admin Sekolah",
-      "email": "admin.sekolah@example.com",
-      "password": "$2b$10$XFDWYOJFxQ7ZM5bA0N4Z0O8u0eKYv58wLsaR7h6XK9bqWJ1YQJQ9q",
-      "roleId": "role_admin_sekolah",
+      "nomor": "085237157222",
+      "roleId": "3",
      "isActive": true,
      "lastLogin": null,
      "createdAt": "2025-09-01T00:00:00.000Z",
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -81,8 +81,6 @@ model FileStorage {
  PelayananSuratKeteranganImage  PelayananSuratKeterangan[] @relation("PelayananSuratKeteranganImage")
  PelayananSuratKeteranganImage2 PelayananSuratKeterangan[] @relation("PelayananSuratKeteranganImage2")
  PasarDesa                      PasarDesa[]
-  KontakDaruratKeamanan          KontakDaruratKeamanan[]
-  KontakItem                     KontakItem[]
  Pegawai                        Pegawai[]
  DesaDigital                    DesaDigital[]
  InfoTekno                      InfoTekno[]
@@ -92,7 +90,7 @@ model FileStorage {
  PejabatDesa                    PejabatDesa[]
  MediaSosial                    MediaSosial[]
  DesaAntiKorupsi                DesaAntiKorupsi[]
-  SDGSDesa                       SDGSDesa[]
+  SDGSDesa                       SdgsDesa[]
  APBDesImage                    APBDes[]                   @relation("APBDesImage")
  APBDesFile                     APBDes[]                   @relation("APBDesFile")
  PrestasiDesa                   PrestasiDesa[]
@@ -101,6 +99,8 @@ model FileStorage {
  PerbekelDariMasaKeMasa         PerbekelDariMasaKeMasa[]

  MitraKolaborasi MitraKolaborasi[]
+
+  ArtikelKesehatan ArtikelKesehatan[]
 }

 //========================================= MENU LANDING PAGE ========================================= //
@@ -168,9 +168,9 @@ model KategoriDesaAntiKorupsi {
 }

 //========================================= SDGS Desa ========================================= //
-model SDGSDesa {
+model SdgsDesa {
  id        String       @id @default(cuid())
-  name      String       @unique
+  name      String
  jumlah    String
  image     FileStorage? @relation(fields: [imageId], references: [id])
  imageId   String?
@@ -183,7 +183,7 @@ model SDGSDesa {
 //========================================= APBDes ========================================= //
 model APBDes {
  id        String       @id @default(cuid())
-  name      String       @unique
+  name      String
  jumlah    String
  image     FileStorage? @relation("APBDesImage", fields: [imageId], references: [id])
  imageId   String?
@@ -198,7 +198,7 @@ model APBDes {
 //========================================= PRESTASI DESA ========================================= //
 model PrestasiDesa {
  id         String               @id @default(cuid())
-  name       String               @unique
+  name       String
  deskripsi  String               @db.Text
  kategori   KategoriPrestasiDesa @relation(fields: [kategoriId], references: [id])
  kategoriId String
@@ -672,17 +672,18 @@ 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)
+  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[]
 }

 model PelayananTelunjukSaktiDesa {
@@ -717,6 +718,20 @@ 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())
@@ -972,8 +987,10 @@ model ArtikelKesehatan {
  id             String       @id @default(cuid())
  title          String
  content        String
-  introduction   Introduction @relation(fields: [introductionId], references: [id])
+  image          FileStorage? @relation(fields: [imageId], references: [id])
+  imageId        String?
  introductionId String
+  introduction   Introduction @relation(fields: [introductionId], references: [id])
  symptom        Symptom      @relation(fields: [symptomId], references: [id])
  symptomId      String
  prevention     Prevention   @relation(fields: [preventionId], references: [id])
@@ -1216,71 +1233,51 @@ model LayananPolsek {

 // ========================================= KONTAK DARURAT ========================================= //
 model KontakDaruratKeamanan {
-  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
+  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)
 }

 model KontakItem {
-  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
+  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())
 }

 // ========================================= PENCEGAHAN KRIMINALITAS ========================================= //
 model PencegahanKriminalitas {
-  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[]
+  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)
 }

 // ========================================= LAPORAN PUBLIK ========================================= //
@@ -1289,11 +1286,13 @@ model LaporanPublik {
  judul        String
  lokasi       String
  tanggalWaktu DateTime
-  status       StatusLaporan
+  status       StatusLaporan             @default(Proses)
  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 {
@@ -1401,6 +1400,9 @@ model PosisiOrganisasi {
  pegawai                Pegawai[]
  strukturOrganisasi     StrukturOrganisasi[] // Relasi balik
  StrukturOrganisasiPPID StrukturOrganisasiPPID[]
+  isActive               Boolean                  @default(true)
+  createdAt              DateTime                 @default(now())
+  updatedAt              DateTime                 @updatedAt

  @@map("posisi_organisasi")
 }
@@ -1469,7 +1471,7 @@ model ProgramKemiskinan {
  id          String               @id @default(uuid())
  nama        String
  deskripsi   String
-  ikonUrl     String?
+  icon        String
  isActive    Boolean              @default(true)
  statistikId String?              @unique
  statistik   StatistikKemiskinan? @relation(fields: [statistikId], references: [id])
@@ -1551,7 +1553,7 @@ model DataDemografiPekerjaan {
 model DetailDataPengangguran {
  id                     String   @id @default(uuid()) @db.Uuid
  month                  String   @db.VarChar(20)
-  year                   DateTime
+  year                   Int
  totalUnemployment      Int
  educatedUnemployment   Int
  uneducatedUnemployment Int
@@ -2103,19 +2105,21 @@ model KategoriBuku {
  DataPerpustakaan DataPerpustakaan[]
 }

+// ========================================= USER ========================================= //
+
 model User {
-  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?
+  id          String       @id @default(cuid())
+  username    String
+  nomor       String       @unique
+  role        Role         @relation(fields: [roleId], references: [id])
+  roleId      String       @default("1")
+  instansi    String?
+  UserSession UserSession? // Nama instansi (Puskesmas, Sekolah, dll)
+  isActive    Boolean      @default(true)
+  lastLogin   DateTime?
+  createdAt   DateTime     @default(now())
+  updatedAt   DateTime     @updatedAt
+  deletedAt   DateTime?
 }

 model Role {
@@ -2132,6 +2136,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
+}
+
 // Tabel untuk menyimpan permission
 model Permission {
  id          String   @id @default(cuid())
@@ -2143,6 +2156,17 @@ model Permission {
  @@map("permissions")
 }

+model UserSession {
+  id        String    @id @default(cuid())
+  token     String
+  expires   DateTime?
+  active    Boolean   @default(true)
+  createdAt DateTime  @default(now())
+  updatedAt DateTime  @default(now()) @updatedAt
+  User      User      @relation(fields: [userId], references: [id])
+  userId    String    @unique
+}
+
 // ========================================= DATA PENDIDIKAN ========================================= //
 model DataPendidikan {
  id        String   @id @default(cuid())
--- a/prisma/seed.ts
+++ b/prisma/seed.ts
@@ -1,3 +1,4 @@
+/* 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";
@@ -15,7 +16,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";
@@ -54,9 +55,13 @@ import programUnggulan from "./data/pendidikan/program-pendidikan-anak/program-u
 import tujuanProgram from "./data/pendidikan/program-pendidikan-anak/tujuan-program.json";
 import roles from "./data/user/roles.json";
 import users from "./data/user/users.json";
+import fileStorage from "./data/file-storage.json";

 (async () => {
  // =========== USER & ROLE ===========
+  // In your seed.ts
+  // =========== ROLES ===========
+  console.log("🔄 Seeding roles...");
  for (const r of roles) {
    await prisma.role.upsert({
      where: { id: r.id },
@@ -64,40 +69,76 @@ import users from "./data/user/users.json";
        name: r.name,
        description: r.description,
        permissions: r.permissions,
-        isActive: true,
+        isActive: r.isActive,
      },
      create: {
        id: r.id,
        name: r.name,
        description: r.description,
        permissions: r.permissions,
-        isActive: true,
+        isActive: r.isActive,
      },
    });
  }
  console.log("✅ Roles seeded");
-  //users
+
+  // =========== USERS ===========
+  console.log("🔄 Seeding users...");
  for (const u of users) {
+    // First verify the role exists
+    const roleExists = await prisma.role.findUnique({
+      where: { id: u.roleId },
+    });
+
+    if (!roleExists) {
+      console.error(`❌ Role with id ${u.roleId} not found for user ${u.nama}`);
+      continue;
+    }
+
    await prisma.user.upsert({
      where: { id: u.id },
      update: {
-        nama: u.nama,
-        email: u.email,
-        password: u.password,
+        username: u.nama,
+        nomor: u.nomor,
        roleId: u.roleId,
-        isActive: true,
+        isActive: u.isActive,
      },
      create: {
        id: u.id,
-        nama: u.nama,
-        email: u.email,
-        password: u.password,
+        username: u.nama,
+        nomor: u.nomor,
        roleId: u.roleId,
-        isActive: true,
+        isActive: u.isActive,
      },
    });
  }
  console.log("✅ Users seeded");
+
+  // =========== FILE STORAGE ===========
+  console.log("🔄 Seeding file storage...");
+  for (const f of fileStorage) {
+    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,
+      },
+    });
+  }
+  console.log("✅ File storage seeded");
  // =========== LANDING PAGE ===========
  // =========== SUBMENU PROFILE ===========
  // =========== PROFILE PEJABAT DESA ===========
@@ -107,11 +148,13 @@ import users from "./data/user/users.json";
      update: {
        name: p.name,
        position: p.position,
+        imageId: p.imageId,
      },
      create: {
        id: p.id,
        name: p.name,
        position: p.position,
+        imageId: p.imageId,
      },
    });
  }
@@ -121,18 +164,35 @@ import users from "./data/user/users.json";

  // =========== 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,
      },
    });
  }
@@ -145,11 +205,13 @@ import users from "./data/user/users.json";
      update: {
        name: p.name,
        iconUrl: p.iconUrl,
+        imageId: p.imageId,
      },
      create: {
        id: p.id,
        name: p.name,
        iconUrl: p.iconUrl,
+        imageId: p.imageId,
      },
    });
  }
@@ -295,11 +357,8 @@ import users from "./data/user/users.json";

  // =========== SDGSDesa ===========
  for (const l of sdgsDesa) {
-    await prisma.sDGSDesa.upsert({
-      where: {
-        name: l.name,
-        jumlah: l.jumlah,
-      },
+    await prisma.sdgsDesa.upsert({
+      where: { id: l.id },
      update: {
        name: l.name,
        jumlah: l.jumlah,
@@ -317,8 +376,7 @@ import users from "./data/user/users.json";
  for (const l of apbdes) {
    await prisma.aPBDes.upsert({
      where: {
-        name: l.name,
-        jumlah: l.jumlah,
+        id: l.id,
      },
      update: {
        name: l.name,
@@ -545,29 +603,29 @@ import users from "./data/user/users.json";
  }
  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({
@@ -836,12 +894,9 @@ import users from "./data/user/users.json";
  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: yearAsDate },
+        month_year: { month: d.month, year: d.year },
      },
      update: {
        totalUnemployment: d.totalUnemployment,
@@ -851,7 +906,7 @@ import users from "./data/user/users.json";
      },
      create: {
        month: d.month,
-        year: yearAsDate,
+        year: d.year,
        totalUnemployment: d.totalUnemployment,
        educatedUnemployment: d.educatedUnemployment,
        uneducatedUnemployment: d.uneducatedUnemployment,
--- 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/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/src/app/_com/SpashScreen.tsx
+++ b/src/app/_com/SpashScreen.tsx
@@ -23,6 +23,7 @@ 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/iconMap.tsx
+++ b/src/app/admin/(dashboard)/_com/iconMap.tsx
@@ -0,0 +1,100 @@
+/* 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,16 +3,24 @@

 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,
@@ -32,13 +40,23 @@ 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}
+  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 },

 };

--- a/src/app/admin/(dashboard)/_com/selectIconEdit.tsx
+++ b/src/app/admin/(dashboard)/_com/selectIconEdit.tsx
@@ -2,22 +2,30 @@

 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 = {
@@ -36,7 +44,17 @@ const iconMap = {
  mencegahBencana: {label: 'Mencegah Bencana', icon: IconShieldFilled},
  rumah: {label: 'Rumah', icon: IconHome},
  pohon: {label: 'Pohon', icon: IconTree},
-  air: {label: 'Air', icon: IconDroplet}
+  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},
 };

 type IconKey = keyof typeof iconMap;
--- a/src/app/admin/(dashboard)/_state/desa/berita.ts
+++ b/src/app/admin/(dashboard)/_state/desa/berita.ts
@@ -74,18 +74,18 @@ const berita = proxy({
    totalPages: 1,
    loading: false,
    search: "",
-   load: async (page = 1, limit = 10, search = "", kategori = "") => {
+    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;
        if (kategori) query.kategori = kategori;
-    
+
        const res = await ApiFetch.api.desa.berita["find-many"].get({ query });
-    
+
        if (res.status === 200 && res.data?.success) {
          berita.findMany.data = res.data.data ?? [];
          berita.findMany.totalPages = res.data.totalPages ?? 1;
@@ -368,11 +368,37 @@ const kategoriBerita = proxy({
        isActive: true;
      };
    }>[],
+    page: 1,
+    totalPages: 1,
    loading: false,
-    async load() {
-      const res = await ApiFetch.api.desa.kategoriberita["findMany"].get();
-      if (res.status === 200) {
-        kategoriBerita.findMany.data = res.data?.data ?? [];
+    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;
      }
    },
  },
--- a/src/app/admin/(dashboard)/_state/desa/layananDesa.ts
+++ b/src/app/admin/(dashboard)/_state/desa/layananDesa.ts
@@ -30,7 +30,6 @@ 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"),
@@ -72,6 +71,21 @@ 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: {
@@ -113,16 +127,21 @@ const suratKeterangan = proxy({
    totalPages: 1,
    total: 0,
    loading: false,
-    load: async (page = 1, limit = 10) => {  // Change to arrow function
-      suratKeterangan.findMany.loading = true;  // Use the full path to access the property
+    search: "",
+    load: async (page = 1, limit = 10, search = "") => {
+      // 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: { page, limit },
+          query,
        });
-  
+
        if (res.status === 200 && res.data?.success) {
          suratKeterangan.findMany.data = res.data.data || [];
          suratKeterangan.findMany.total = res.data.total || 0;
@@ -143,6 +162,30 @@ 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: {
@@ -341,28 +384,34 @@ const pelayananTelunjukSaktiDesa = proxy({
    totalPages: 1,
    total: 0,
    loading: false,
-    load: async (page = 1, limit = 10) => {  // Change to arrow function
-      pelayananTelunjukSaktiDesa.findMany.loading = true;  // Use the full path to access the property
+    search: "",
+    load: async (page = 1, limit = 10, search = "") => {
+      // 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: { page, limit },
+          query,
        });
-  
+
        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 telunjuk sakti desa:", res.data?.message);
+          console.error("Failed to load surat keterangan:", res.data?.message);
          pelayananTelunjukSaktiDesa.findMany.data = [];
-          pelayananTelunjukSaktiDesa.findMany.total = 0;
-          pelayananTelunjukSaktiDesa.findMany.totalPages = 1;
+          suratKeterangan.findMany.total = 0;
+          suratKeterangan.findMany.totalPages = 1;
        }
      } catch (error) {
-        console.error("Error loading telunjuk sakti desa:", error);
+        console.error("Error loading surat keterangan:", error);
        pelayananTelunjukSaktiDesa.findMany.data = [];
        pelayananTelunjukSaktiDesa.findMany.total = 0;
        pelayananTelunjukSaktiDesa.findMany.totalPages = 1;
@@ -410,7 +459,9 @@ 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");
@@ -501,7 +552,9 @@ 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 {
@@ -522,7 +575,7 @@ const pelayananTelunjukSaktiDesa = proxy({
      }
    },
  },
-})
+});

 const pelayananPerizinanBerusaha = proxy({
  findById: {
@@ -596,9 +649,7 @@ 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;
      }
@@ -713,9 +764,7 @@ 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;
      }
@@ -760,11 +809,250 @@ 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
@@ -56,16 +56,21 @@ const penghargaanState = proxy({
    totalPages: 1,
    total: 0,
    loading: false,
-    load: async (page = 1, limit = 10) => {  // Change to arrow function
-      penghargaanState.findMany.loading = true;  // Use the full path to access the property
+    search: "",
+    load: async (page = 1, limit = 10, search = "") => {
+      // 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: { page, limit },
+          query,
        });
-  
+
        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,11 +55,39 @@ const category = proxy({
        pengumumans: number;
      };
    })[],
+    page: 1,
+    totalPages: 1,
+    total: 0,
    loading: false,
-    async load() {
-      const res = await ApiFetch.api.desa.kategoripengumuman["findMany"].get();
-      if (res.status === 200) {
-        category.findMany.data = res.data?.data ?? [];
+    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;
      }
    },
  },
--- a/src/app/admin/(dashboard)/_state/desa/potensi.ts
+++ b/src/app/admin/(dashboard)/_state/desa/potensi.ts
@@ -56,9 +56,11 @@ const potensiDesa = proxy({
    totalPages: 1,
    total: 0,
    loading: false,
-    load: async (page = 1, limit = 10) => {  // Change to arrow function
+    search: "",
+    load: async (page = 1, limit = 10, search = "") => {  // 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"
@@ -298,11 +300,34 @@ const kategoriPotensi = proxy({
        isActive: true;
      };
    }>[],
+    page: 1,
+    totalPages: 1,
    loading: false,
-    async load() {
-      const res = await ApiFetch.api.desa.kategoripotensi["findMany"].get();
-      if (res.status === 200) {
-        kategoriPotensi.findMany.data = res.data?.data ?? [];
+    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;
      }
    },
  },
--- a/src/app/admin/(dashboard)/_state/ekonomi/PADesa.ts
+++ b/src/app/admin/(dashboard)/_state/ekonomi/PADesa.ts
@@ -7,9 +7,13 @@ 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 = {
@@ -54,32 +58,46 @@ const ApbDesa = proxy({
    },
  },
  findMany: {
-    data: null as 
-    | Prisma.ApbDesaGetPayload<{
-      include: {
-        pendapatan: true;
-        belanja: true;
-        pembiayaan: true;
-      };
-    }>[]
-    | null,
+    data: null as
+      | Prisma.ApbDesaGetPayload<{
+          include: {
+            pendapatan: true;
+            belanja: true;
+            pembiayaan: true;
+          };
+        }>[]
+      | null,
+    page: 1,
+    totalPages: 1,
    loading: false,
-    async load() {
+    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 {
-        this.loading = true;
+        const query: any = { page, limit };
+        if (search) query.search = search;
+
        const res = await ApiFetch.api.ekonomi.pendapatanaslidesa.apbdesa[
          "find-many"
-        ].get();
-        if (res.status === 200) {
-          this.data = res.data?.data ?? [];
+        ].get({ query });
+
+        if (res.status === 200 && res.data?.success) {
+          ApbDesa.findMany.data = res.data.data ?? [];
+          ApbDesa.findMany.totalPages =
+            res.data.totalPages ?? 1;
        } else {
-          toast.error(res.data?.message || "Gagal mengambil APB Desa");
+          ApbDesa.findMany.data = [];
+          ApbDesa.findMany.totalPages = 1;
        }
-      } catch (error) {
-        console.error("Find many error:", error);
-        toast.error("Gagal mengambil APB Desa");
+      } catch (err) {
+        console.error("Gagal fetch APB Desa paginated:", err);
+        ApbDesa.findMany.data = [];
+        ApbDesa.findMany.totalPages = 1;
      } finally {
-        this.loading = false;
+        ApbDesa.findMany.loading = false;
      }
    },
  },
@@ -106,13 +124,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,
@@ -120,7 +138,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);
@@ -189,7 +207,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(
@@ -199,11 +217,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) {
@@ -264,34 +282,32 @@ const pendapatan = proxy({
    data: null as any[] | null,
    page: 1,
    totalPages: 1,
-    total: 0,
    loading: false,
-    load: async (page = 1, limit = 10) => {
-      // Change to arrow function
-      pendapatan.findMany.loading = true; // Use the full path to access the property
+    search: "",
+    load: async (page = 1, limit = 10, search = "") => {
+      pendapatan.findMany.loading = true; // ✅ Akses langsung via nama path
      pendapatan.findMany.page = page;
+      pendapatan.findMany.search = search;
+
      try {
-        const res =
-          await ApiFetch.api.ekonomi.pendapatanaslidesa.pendapatanasli[
-            "find-many"
-          ].get({
-            query: { page, limit },
-          });
+        const query: any = { page, limit };
+        if (search) query.search = search;
+
+        const res = await ApiFetch.api.ekonomi.pendapatanaslidesa.pendapatanasli[
+          "find-many"
+        ].get({ query });

        if (res.status === 200 && res.data?.success) {
-          pendapatan.findMany.data = res.data.data || [];
-          pendapatan.findMany.total = res.data.total || 0;
-          pendapatan.findMany.totalPages = res.data.totalPages || 1;
+          pendapatan.findMany.data = res.data.data ?? [];
+          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 (error) {
-        console.error("Error loading pendapatan:", error);
+      } catch (err) {
+        console.error("Gagal fetch pendapatan asli desa paginated:", err);
        pendapatan.findMany.data = [];
-        pendapatan.findMany.total = 0;
        pendapatan.findMany.totalPages = 1;
      } finally {
        pendapatan.findMany.loading = false;
@@ -308,12 +324,15 @@ 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}`);
        }
@@ -349,16 +368,19 @@ 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(
@@ -495,23 +517,37 @@ const belanja = proxy({
      name: string;
      value: number;
    }>,
+    page: 1,
+    totalPages: 1,
    loading: false,
-    async load() {
+    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;
+
      try {
-        this.loading = true;
+        const query: any = { page, limit };
+        if (search) query.search = search;
+
        const res = await ApiFetch.api.ekonomi.pendapatanaslidesa.belanja[
          "find-many"
-        ].get();
-        if (res.status === 200) {
-          this.data = res.data?.data ?? [];
+        ].get({ query });
+
+        if (res.status === 200 && res.data?.success) {
+          belanja.findMany.data = res.data.data ?? [];
+          belanja.findMany.totalPages =
+            res.data.totalPages ?? 1;
        } else {
-          toast.error(res.data?.message || "Gagal mengambil Belanja");
+          belanja.findMany.data = [];
+          belanja.findMany.totalPages = 1;
        }
-      } catch (error) {
-        console.error("Find many error:", error);
-        toast.error("Gagal mengambil Belanja");
+      } catch (err) {
+        console.error("Gagal fetch Belanja paginated:", err);
+        belanja.findMany.data = [];
+        belanja.findMany.totalPages = 1;
      } finally {
-        this.loading = false;
+        belanja.findMany.loading = false;
      }
    },
  },
@@ -525,12 +561,15 @@ 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}`);
        }
@@ -566,16 +605,19 @@ 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(
@@ -710,23 +752,37 @@ const pembiayaan = proxy({
      name: string;
      value: number;
    }>,
+    page: 1,
+    totalPages: 1,
    loading: false,
-    async load() {
+    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;
+
      try {
-        this.loading = true;
+        const query: any = { page, limit };
+        if (search) query.search = search;
+
        const res = await ApiFetch.api.ekonomi.pendapatanaslidesa.pembiayaan[
          "find-many"
-        ].get();
-        if (res.status === 200) {
-          this.data = res.data?.data ?? [];
+        ].get({ query });
+
+        if (res.status === 200 && res.data?.success) {
+          pembiayaan.findMany.data = res.data.data ?? [];
+          pembiayaan.findMany.totalPages =
+            res.data.totalPages ?? 1;
        } else {
-          toast.error(res.data?.message || "Gagal mengambil Pembiayaan");
+          pembiayaan.findMany.data = [];
+          pembiayaan.findMany.totalPages = 1;
        }
-      } catch (error) {
-        console.error("Find many error:", error);
-        toast.error("Gagal mengambil Pembiayaan");
+      } catch (err) {
+        console.error("Gagal fetch Pembiayaan paginated:", err);
+        pembiayaan.findMany.data = [];
+        pembiayaan.findMany.totalPages = 1;
      } finally {
-        this.loading = false;
+        pembiayaan.findMany.loading = false;
      }
    },
  },
@@ -740,12 +796,15 @@ 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}`);
        }
@@ -781,16 +840,19 @@ 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,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 import ApiFetch from "@/lib/api-fetch";
 import { Prisma } from "@prisma/client";
 import { toast } from "react-toastify";
@@ -71,12 +72,37 @@ const demografiPekerjaan = proxy({
          omit: { isActive: true };
        }>[]
      | null,
-    async load() {
-      const res = await ApiFetch.api.ekonomi.demografipekerjaan[
-        "find-many"
-      ].get();
-      if (res.status === 200) {
-        demografiPekerjaan.findMany.data = res.data?.data ?? [];
+    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;
      }
    },
  },
@@ -194,4 +220,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,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 import ApiFetch from "@/lib/api-fetch";
 import { Prisma } from "@prisma/client";
 import { toast } from "react-toastify";
@@ -69,16 +70,37 @@ const jumlahPendudukMiskin = proxy({
          select: { id: true; year: true; totalPoorPopulation: true };
        }>[]
      | null,
-    loading: false,
-    async load() {
-      const res = await ApiFetch.api.ekonomi.jumlahpendudukmiskin[
-        "find-many"
-      ].get();
-      if (res.status === 200) {
-        jumlahPendudukMiskin.findMany.data = res.data?.data ?? [];
-      }
+      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;
+        }
+      },
    },
-  },
  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,7 +15,8 @@ const templateJumlahPengngguran = z.object({
  uneducatedUnemployment: z
    .number()
    .min(1, "Pengangguran tidak pendidikan harus diisi"),
-  percentageChange: z.number().min(0, "Persentase perubahan harus diisi"),
+    percentageChange: z.number({ invalid_type_error: "Persentase perubahan harus angka" }),
+
 });

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

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

        if (res.status === 200) {
-          const id = res.data?.data?.id;
+          const id = res.data?.id;
          if (id) {
            toast.success("Success create");
            jumlahPengangguran.create.form = { ...jumlahPengangguranForm };
@@ -103,16 +112,40 @@ const jumlahPengangguran = proxy({
          omit: { isActive: true };
        }>[]
      | null,
-    async load() {
-      const res =
-        await ApiFetch.api.ekonomi.jumlahpengangguran.detaildatapengangguran[
-          "find-many"
-        ].get();
-      if (res.status === 200) {
-        jumlahPengangguran.findMany.data = res.data?.data ?? [];
-      }
+      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;
+        }
+      },
    },
-  },

  findUnique: {
    data: null as Prisma.DetailDataPengangguranGetPayload<{
--- 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"),
-  ikonUrl: z.string().optional(),
+  icon: z.string().min(1, "Icon minimal 1 karakter"),
  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: "",
-  ikonUrl: "",
+  icon: "",
  statistik: {
    tahun: "",
    jumlah: "",
@@ -148,7 +148,7 @@ const programKemiskinanState = proxy({
          this.form = {
            nama: data.nama,
            deskripsi: data.deskripsi,
-            ikonUrl: data.ikonUrl || "",
+            icon: data.icon,
            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,
-              ikonUrl: this.form.ikonUrl,
+              icon: this.form.icon,
              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,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 import ApiFetch from "@/lib/api-fetch";
 import { Prisma } from "@prisma/client";
 import { toast } from "react-toastify";
@@ -76,13 +77,37 @@ const grafikSektorUnggulan = proxy({
          };
        }>[]
      | null,
+    page: 1,
+    totalPages: 1,
    loading: false,
-    async load() {
-      const res = await ApiFetch.api.ekonomi.sektourunggulandesa[
-        "find-many"
-      ].get();
-      if (res.status === 200) {
-        grafikSektorUnggulan.findMany.data = res.data?.data ?? [];
+    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;
      }
    },
  },
--- a/src/app/admin/(dashboard)/_state/ekonomi/struktur-organisasi/struktur-organisasi.ts
+++ b/src/app/admin/(dashboard)/_state/ekonomi/struktur-organisasi/struktur-organisasi.ts
@@ -161,18 +161,34 @@ const posisiOrganisasi = proxy({
      deskripsi: string | null;
      hierarki: number;
    }>,
-    async load() {
+    page: 1,
+    totalPages: 1,
+    loading: false,
+    search: "",
+    load: async (page = 1, limit = 10, search = "") => {
+      posisiOrganisasi.findMany.loading = true; // ✅ Akses langsung via nama path
+      posisiOrganisasi.findMany.page = page;
+      posisiOrganisasi.findMany.search = search;
+  
      try {
-        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 ?? [];
+        const query: any = { page, limit };
+        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 (error) {
-        console.error("Find many error:", error);
-        this.data = [];
+      } catch (err) {
+        console.error("Gagal fetch posisi organisasi paginated:", err);
+        posisiOrganisasi.findMany.data = [];
+        posisiOrganisasi.findMany.totalPages = 1;
+      } finally {
+        posisiOrganisasi.findMany.loading = false;
      }
    },
  },
--- a/src/app/admin/(dashboard)/_state/ekonomi/usia-kerja-nganggur.ts
+++ b/src/app/admin/(dashboard)/_state/ekonomi/usia-kerja-nganggur.ts
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 import ApiFetch from "@/lib/api-fetch";
 import { Prisma } from "@prisma/client";
 import { toast } from "react-toastify";
@@ -75,16 +76,37 @@ const grafikBerdasarkanUsiaKerjaNganggur = proxy({
          omit: { isActive: true };
        }>[]
      | null,
-    loading: false,
-    async load() {
-      const res = await ApiFetch.api.ekonomi.grafikusiakerjayangmenganggur[
-        "find-many"
-      ].get();
-      if (res.status === 200) {
-        grafikBerdasarkanUsiaKerjaNganggur.findMany.data = res.data?.data ?? [];
-      }
+      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;
+        }
+      },
    },
-  },
  findUnique: {
    data: null as Prisma.GrafikMenganggurBerdasarkanUsiaGetPayload<{
      omit: { isActive: true };
@@ -259,15 +281,36 @@ const grafikBerdasarkanPendidikan = proxy({
          omit: { isActive: true };
        }>[]
      | null,
-    loading: false,
-    async load() {
-      const res = await ApiFetch.api.ekonomi.grafikmenganggurberdasarkanpendidikan[
-        "find-many"
-      ].get();
-      if (res.status === 200) {
-        grafikBerdasarkanPendidikan.findMany.data = res.data?.data ?? [];
-      }
-    },
+      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;
+        }
+      },
  },
  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,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 import ApiFetch from "@/lib/api-fetch";
 import { Prisma } from "@prisma/client";
 import { toast } from "react-toastify";
@@ -61,10 +62,37 @@ const ajukanIdeInovatifState = proxy({
          };
        }>[]
      | null,
-    async load() {
-      const res = await ApiFetch.api.inovasi.ajukanideinovatif["find-many"].get();
-      if (res.status === 200) {
-        ajukanIdeInovatifState.findMany.data = res.data?.data ?? [];
+    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;
      }
    },
  },
@@ -97,16 +125,21 @@ 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/layanan-online-desa.ts
+++ b/src/app/admin/(dashboard)/_state/inovasi/layanan-online-desa.ts
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 import ApiFetch from "@/lib/api-fetch";
 import { Prisma } from "@prisma/client";
 import { toast } from "react-toastify";
@@ -54,19 +55,20 @@ 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,
-
-    async load(page = 1, limit = 10) {
+    search: "",
+    async load(page = 1, limit = 10, search = "") {
      administrasiOnline.findMany.loading = true;
      administrasiOnline.findMany.page = page;
+      administrasiOnline.findMany.search = search;
      try {
        const res =
          await ApiFetch.api.inovasi.layananonlinedesa.administrasionline[
@@ -75,6 +77,7 @@ const administrasiOnline = proxy({
            query: {
              page,
              limit,
+              search,
            },
          });

@@ -91,10 +94,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(
@@ -199,13 +202,37 @@ const jenisLayanan = proxy({
      nama: string;
      deskripsi: string;
    }> | null,
-    async load() {
-      const res =
-        await ApiFetch.api.inovasi.layananonlinedesa.administrasionline.jenislayanan[
-          "find-many"
-        ].get();
-      if (res.status === 200) {
-        jenisLayanan.findMany.data = res.data?.data ?? [];
+    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;
      }
    },
  },
@@ -403,7 +430,9 @@ 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"),
 });
@@ -455,37 +484,42 @@ 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,
-
-    async load(page = 1, limit = 10) {
-      pengaduanMasyarakat.findMany.loading = true;
+    search: "",
+    load: async (page = 1, limit = 10, search = "") => {
+      pengaduanMasyarakat.findMany.loading = true; // ✅ Akses langsung via nama path
      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: {
-              page,
-              limit,
-            },
-          });
+          ].get({ query });

        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;
      }
@@ -493,11 +527,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(
@@ -507,7 +541,10 @@ 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) {
@@ -542,7 +579,9 @@ 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);
@@ -567,7 +606,9 @@ 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(".")}`)
@@ -598,13 +639,37 @@ const jenisPengaduan = proxy({
      id: string;
      nama: string;
    }> | null,
-    async load() {
-      const res =
-        await ApiFetch.api.inovasi.layananonlinedesa.pengaduanmasyarakat.jenispengaduan[
-          "find-many"
-        ].get();
-      if (res.status === 200) {
-        jenisPengaduan.findMany.data = res.data?.data ?? [];
+    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;
      }
    },
  },
@@ -693,7 +758,7 @@ const jenisPengaduan = proxy({
          const data = result.data;
          this.id = data.id;
          this.form = {
-            nama: data.nama
+            nama: data.nama,
          };
          return data;
        } else {
@@ -709,7 +774,9 @@ 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(".")}`)
@@ -759,7 +826,9 @@ 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
@@ -792,7 +861,6 @@ 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
@@ -54,34 +54,32 @@ const programKreatifState = proxy({
    data: null as any[] | null,
    page: 1,
    totalPages: 1,
-    total: 0,
    loading: false,
-    load: async (page = 1, limit = 10) => {
-      // Change to arrow function
-      programKreatifState.findMany.loading = true; // Use the full path to access the property
+    search: "",
+    load: async (page = 1, limit = 10, search = "") => {
+      programKreatifState.findMany.loading = true; // ✅ Akses langsung via nama path
      programKreatifState.findMany.page = page;
+      programKreatifState.findMany.search = search;
+
      try {
-        const res = await ApiFetch.api.inovasi.programkreatif["find-many"].get({
-          query: { page, limit },
-        });
+        const query: any = { page, limit };
+        if (search) query.search = search;
+
+        const res = await ApiFetch.api.inovasi.programkreatif[
+          "find-many"
+        ].get({ query });

        if (res.status === 200 && res.data?.success) {
-          programKreatifState.findMany.data = res.data.data || [];
-          programKreatifState.findMany.total = res.data.total || 0;
-          programKreatifState.findMany.totalPages = res.data.totalPages || 1;
+          programKreatifState.findMany.data = res.data.data ?? [];
+          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 (error) {
-        console.error("Error loading grafik berdasarkan jenis kelamin:", error);
+      } catch (err) {
+        console.error("Gagal fetch program kreatif paginated:", err);
        programKreatifState.findMany.data = [];
-        programKreatifState.findMany.total = 0;
        programKreatifState.findMany.totalPages = 1;
      } finally {
        programKreatifState.findMany.loading = false;
--- a/src/app/admin/(dashboard)/_state/keamanan/kontak-darurat-keamanan.ts
+++ b/src/app/admin/(dashboard)/_state/keamanan/kontak-darurat-keamanan.ts
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 import ApiFetch from "@/lib/api-fetch";
 import { Prisma } from "@prisma/client";
 import { toast } from "react-toastify";
@@ -6,26 +7,14 @@ import { z } from "zod";

 const templateForm = z.object({
  nama: z.string().min(1, "Nama minimal 1 karakter"),
-  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(),
-    })
-  ),
+  icon: z.string().nonempty(),
+  kategoriId: z.array(z.string()).min(1, "Minimal pilih satu kategori"),
 });

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

 const kontakDaruratKeamananState = proxy({
@@ -61,20 +50,49 @@ const kontakDaruratKeamananState = proxy({
    },
  },
  findMany: {
-    data: null as
-      | Prisma.KontakDaruratKeamananGetPayload<{
-          include: {
-            kontakItems: true;
-            image: true;
+    data: null as Array<
+      Prisma.KontakDaruratKeamananGetPayload<{
+        include: {
+          kategori: true;
+          kontakItems: {
+            include: {
+              kontakItem: true;
+            };
          };
-        }>[]
-      | null,
-    async load() {
-      const res = await ApiFetch.api.keamanan.kontakdaruratkeamanan[
-        "find-many"
-      ].get();
-      if (res.status === 200) {
-        kontakDaruratKeamananState.findMany.data = res.data?.data ?? [];
+        };
+      }>
+    > | 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;
      }
    },
  },
@@ -83,10 +101,10 @@ const kontakDaruratKeamananState = proxy({
      include: {
        kontakItems: {
          include: {
-            image: true;
+            kontakItem: true;
          };
        };
-        image: true;
+        kategori: true;
      };
    }> | null,
    loading: false,
@@ -168,14 +186,9 @@ const kontakDaruratKeamananState = proxy({
          this.id = data.id;
          this.form = {
            nama: data.nama,
-            imageId: data.imageId,
-            kontakItems: [
-              {
-                nama: data.kontakItems.nama,
-                nomorTelepon: data.kontakItems.nomorTelepon,
-                imageId: data.kontakItems.imageId,
-              },
-            ],
+            icon: data.icon || "",
+            kategoriId:
+              data.kontakItems?.map((item: any) => item.kontakItemId) || [],
          };
          return data;
        } else {
@@ -212,14 +225,8 @@ const kontakDaruratKeamananState = proxy({
            },
            body: JSON.stringify({
              nama: this.form.nama,
-              imageId: this.form.imageId,
-              kontakItems: [
-                {
-                  nama: this.form.kontakItems[0].nama,
-                  nomorTelepon: this.form.kontakItems[0].nomorTelepon,
-                  imageId: this.form.kontakItems[0].imageId,
-                },
-              ],
+              icon: this.form.icon,
+              kategoriId: this.form.kategoriId,
            }),
          }
        );
@@ -256,4 +263,242 @@ const kontakDaruratKeamananState = proxy({
  },
 });

-export default kontakDaruratKeamananState;
+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("success create");
+        }
+        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;
--- a/src/app/admin/(dashboard)/_state/keamanan/laporan-publik.ts
+++ b/src/app/admin/(dashboard)/_state/keamanan/laporan-publik.ts
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 import ApiFetch from "@/lib/api-fetch";
 import { Prisma } from "@prisma/client";
 import { toast } from "react-toastify";
@@ -10,12 +11,24 @@ 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;
@@ -24,15 +37,16 @@ interface FormData {
  kronologi: string;
 }

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

+
 const laporanPublikState = proxy({
  create: {
    form: { ...defaultForm },
@@ -97,13 +111,37 @@ const laporanPublikState = proxy({
          include: { penanganan: true };
        }>[]
      | null,
-    async load() {
-      const res = await ApiFetch.api.keamanan.laporanpublik["find-many"].get();
-      if (res.status === 200) {
-        laporanPublikState.findMany.data = res.data?.data ?? [];
-      }
+      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;
+        }
+      },
    },
-  },
  findUnique: {
    data: null as Prisma.LaporanPublikGetPayload<{
      include: { penanganan: true };
@@ -160,7 +198,7 @@ const laporanPublikState = proxy({
  },
  edit: {
    id: "",
-    form: { ...defaultForm },
+    form: { ...editForm },
    loading: false,
    async load(id: string) {
      if (!id) {
@@ -266,7 +304,7 @@ const laporanPublikState = proxy({
         },
         reset() {
           laporanPublikState.edit.id = "";
-           laporanPublikState.edit.form = { ...defaultForm };
+           laporanPublikState.edit.form = { ...editForm };
         },
  }
 });
--- a/src/app/admin/(dashboard)/_state/keamanan/pencegahan-kriminalitas.ts
+++ b/src/app/admin/(dashboard)/_state/keamanan/pencegahan-kriminalitas.ts
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 import ApiFetch from "@/lib/api-fetch";
 import { Prisma } from "@prisma/client";
 import { toast } from "react-toastify";
@@ -5,45 +6,17 @@ import { proxy } from "valtio";
 import { z } from "zod";

 const templateForm = z.object({
-  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"),
-    }),
-  }),
+  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"),
 });

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

 const pencegahanKriminalitasState = proxy({
@@ -64,7 +37,7 @@ const pencegahanKriminalitasState = proxy({
        pencegahanKriminalitasState.create.loading = true;
        const res = await ApiFetch.api.keamanan.pencegahankriminalitas[
          "create"
-        ].post(pencegahanKriminalitasState.create.form.pencegahanKriminalitas);
+        ].post(pencegahanKriminalitasState.create.form);
        if (res.status === 200) {
          pencegahanKriminalitasState.findMany.load();
          return toast.success("success create");
@@ -81,29 +54,46 @@ const pencegahanKriminalitasState = proxy({
  findMany: {
    data: null as
      | Prisma.PencegahanKriminalitasGetPayload<{
-          include: {
-            programKeamanan: true;
-            tipsKeamanan: true;
-            videoKeamanan: true;
-          };
+          omit: { isActive: true };
        }>[]
      | null,
-    async load() {
-      const res = await ApiFetch.api.keamanan.pencegahankriminalitas[
-        "find-many"
-      ].get();
-      if (res.status === 200) {
-        pencegahanKriminalitasState.findMany.data = res.data?.data ?? [];
+    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;
      }
    },
  },
  findUnique: {
    data: null as Prisma.PencegahanKriminalitasGetPayload<{
-      include: {
-        programKeamanan: true;
-        tipsKeamanan: true;
-        videoKeamanan: true;
-      };
+      omit: { isActive: true };
    }> | null,
    loading: false,
    async load(id: string) {
@@ -122,6 +112,30 @@ 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) {
@@ -187,24 +201,10 @@ const pencegahanKriminalitasState = proxy({
          const data = result.data;
          pencegahanKriminalitasState.update.id = data.id;
          pencegahanKriminalitasState.update.form = {
-            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,
-              },
-            },
+            judul: data.judul,
+            deskripsi: data.deskripsi,
+            deskripsiSingkat: data.deskripsiSingkat,
+            linkVideo: data.linkVideo,
          };
          return data;
        } else {
@@ -240,40 +240,11 @@ const pencegahanKriminalitasState = proxy({
              "Content-Type": "application/json",
            },
            body: JSON.stringify({
-              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,
-                },
-              },
+              judul: pencegahanKriminalitasState.update.form.judul,
+              deskripsi: pencegahanKriminalitasState.update.form.deskripsi,
+              deskripsiSingkat:
+                pencegahanKriminalitasState.update.form.deskripsiSingkat,
+              linkVideo: pencegahanKriminalitasState.update.form.linkVideo,
            }),
          }
        );
@@ -311,4 +282,4 @@ const pencegahanKriminalitasState = proxy({
    },
  },
 });
-export default pencegahanKriminalitasState;
+export default pencegahanKriminalitasState;
--- 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,11 +31,13 @@ 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: "",
  },
@@ -59,6 +61,7 @@ const defaultForm = {
  doctorSign: {
    content: "",
  },
+
 };

 const artikelKesehatanState = proxy({
@@ -112,30 +115,42 @@ const artikelKesehatanState = proxy({
            firstaid: true;
            mythvsfact: true;
            doctorsign: true;
+            image: true;
          };
        }>[]
      | null,
+    page: 1,
+    totalPages: 1,
    loading: false,
-    async load() {
+    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;
+
      try {
-        this.loading = true;
-        const res = await (ApiFetch.api.kesehatan as any)["artikel-kesehatan"][
+        const query: any = { page, limit };
+        if (search) query.search = search;
+
+        const res = await ApiFetch.api.kesehatan["artikel-kesehatan"][
          "find-many"
-        ].get();
+        ].get({ query });

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

        const res = await fetch(
@@ -280,12 +298,9 @@ 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,27 +116,38 @@ const fasilitasKesehatan = proxy({
          };
        }>[]
      | null,
+    page: 1,
+    totalPages: 1,
    loading: false,
-    async load() {
+    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;
+
      try {
-        this.loading = true;
-        const res = await (ApiFetch.api.kesehatan as any)[
-          "fasilitas-kesehatan"
-        ]["find-many"].get();
+        const query: any = { page, limit };
+        if (search) query.search = search;

-        if (res.status === 200) {
-          this.data = res.data?.data ?? [];
+        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;
        } else {
-          toast.error("Gagal memuat data fasilitas kesehatan");
+          fasilitasKesehatanState.fasilitasKesehatan.findMany.data = [];
+          fasilitasKesehatanState.fasilitasKesehatan.findMany.totalPages = 1;
        }
-
-        return res;
      } catch (err) {
-        toast.error("Terjadi error saat load data");
-        console.error("LOAD ERROR:", err);
-        throw err;
+        console.error("Gagal fetch fasilitas kesehatan paginated:", err);
+        fasilitasKesehatanState.fasilitasKesehatan.findMany.data = [];
+        fasilitasKesehatanState.fasilitasKesehatan.findMany.totalPages = 1;
      } finally {
-        this.loading = false;
+        fasilitasKesehatanState.fasilitasKesehatan.findMany.loading = false;
      }
    },
  },
@@ -558,7 +569,7 @@ const dokter = proxy({

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

 export default fasilitasKesehatanState;
--- a/src/app/admin/(dashboard)/_state/kesehatan/data_kesehatan_warga/jadwalKegiatan.ts
+++ b/src/app/admin/(dashboard)/_state/kesehatan/data_kesehatan_warga/jadwalKegiatan.ts
@@ -120,27 +120,36 @@ const jadwalkegiatanState = proxy({
          };
        }>[]
      | null,
+    page: 1,
+    totalPages: 1,
    loading: false,
-    async load() {
+    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;
+
      try {
-        this.loading = true;
-        const res = await (ApiFetch.api.kesehatan as any)[
-          "jadwal-kegiatan"
-        ]["find-many"].get();
+        const query: any = { page, limit };
+        if (search) query.search = search;

-        if (res.status === 200) {
-          this.data = res.data?.data ?? [];
+        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;
        } else {
-          toast.error("Gagal memuat data jadwal kegiatan");
+          jadwalkegiatanState.findMany.data = [];
+          jadwalkegiatanState.findMany.totalPages = 1;
        }
-
-        return res;
      } catch (err) {
-        toast.error("Terjadi error saat load data");
-        console.error("LOAD ERROR:", err);
-        throw err;
+        console.error("Gagal fetch jadwal kegiatan paginated:", err);
+        jadwalkegiatanState.findMany.data = [];
+        jadwalkegiatanState.findMany.totalPages = 1;
      } finally {
-        this.loading = false;
+        jadwalkegiatanState.findMany.loading = false;
      }
    },
  },
@@ -227,29 +236,42 @@ 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,
+            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,
          },
        };

@@ -286,7 +308,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}`, {
@@ -305,7 +327,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
@@ -0,0 +1,290 @@
+/* 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/landing-page/profile.ts
+++ b/src/app/admin/(dashboard)/_state/landing-page/profile.ts
@@ -23,7 +23,12 @@ type ProgramInovasiForm = Prisma.ProgramInovasiGetPayload<{

 const programInovasi = proxy({
  create: {
-    form: {} as ProgramInovasiForm,
+    form: {
+      name: "",
+      description: "",
+      imageId: "",
+      link: ""
+    } as ProgramInovasiForm,
    loading: false,
    async create() {
      // Ensure all required fields are non-null
--- a/src/app/admin/(dashboard)/_state/landing-page/sdgs-desa.ts
+++ b/src/app/admin/(dashboard)/_state/landing-page/sdgs-desa.ts
@@ -72,7 +72,7 @@ const sdgsDesa = proxy({
        ].get({
          query,
        });
-  
+        
        if (res.status === 200 && res.data?.success) {
          sdgsDesa.findMany.data = res.data.data || [];
          sdgsDesa.findMany.total = res.data.total || 0;
@@ -94,7 +94,7 @@ const sdgsDesa = proxy({
    },
  },
  findUnique: {
-    data: null as Prisma.SDGSDesaGetPayload<{
+    data: null as Prisma.SdgsDesaGetPayload<{
      include: {
        image: true;
      };
--- a/src/app/admin/(dashboard)/_state/lingkungan/gotong-royong.ts
+++ b/src/app/admin/(dashboard)/_state/lingkungan/gotong-royong.ts
@@ -354,14 +354,39 @@ const kategoriKegiatan = proxy({
      id: string;
      nama: string;
    }> | null,
-    async load() {
-      const res = await ApiFetch.api.lingkungan.kategorikegiatan[
-        "find-many"
-      ].get();
-      if (res.status === 200) {
-        kategoriKegiatan.findMany.data = res.data?.data ?? [];
-      }
-    },
+     page: 1,
+        totalPages: 1,
+        loading: false,
+        search: "",
+        load: async (page = 1, limit = 10, search = "") => {
+          kategoriKegiatan.findMany.loading = true; // ✅ Akses langsung via nama path
+          kategoriKegiatan.findMany.page = page;
+          kategoriKegiatan.findMany.search = search;
+    
+          try {
+            const query: any = { page, limit };
+            if (search) query.search = search;
+    
+            const res =
+              await ApiFetch.api.lingkungan.kategorikegiatan[
+                "find-many"
+              ].get({ query });
+    
+            if (res.status === 200 && res.data?.success) {
+              kategoriKegiatan.findMany.data = res.data.data ?? [];
+              kategoriKegiatan.findMany.totalPages = res.data.totalPages ?? 1;
+            } else {
+              kategoriKegiatan.findMany.data = [];
+              kategoriKegiatan.findMany.totalPages = 1;
+            }
+          } catch (err) {
+            console.error("Gagal fetch kategori kegiatan paginated:", err);
+            kategoriKegiatan.findMany.data = [];
+            kategoriKegiatan.findMany.totalPages = 1;
+          } finally {
+            kategoriKegiatan.findMany.loading = false;
+          }
+        },
  },
  findUnique: {
    data: null as Prisma.KategoriKegiatanGetPayload<{
--- a/src/app/admin/(dashboard)/_state/ppid/struktur_ppid/struktur_PPID.ts
+++ b/src/app/admin/(dashboard)/_state/ppid/struktur_ppid/struktur_PPID.ts
@@ -352,17 +352,19 @@ const posisiOrganisasi = proxy({
    totalPages: 1,
    loading: false,
    search: "",
-   load: async (page = 1, limit = 10, search = "") => {
-      posisiOrganisasi.findMany.loading = true; // ✅ Akses langsung via nama path
+    load: async (page = 1, limit?: number, search = "") => {
+      const appliedLimit = limit ?? 10;
      posisiOrganisasi.findMany.page = page;
      posisiOrganisasi.findMany.search = search;
-  
+
      try {
-        const query: any = { page, limit };
+        const query: any = { page, limit: appliedLimit };
        if (search) query.search = search;
-    
-        const res = await ApiFetch.api.ppid.strukturppid.posisiorganisasi["find-many"].get({ query });
-    
+
+        const res = await ApiFetch.api.ppid.strukturppid.posisiorganisasi[
+          "find-many"
+        ].get({ query });
+
        if (res.status === 200 && res.data?.success) {
          posisiOrganisasi.findMany.data = res.data.data ?? [];
          posisiOrganisasi.findMany.totalPages = res.data.totalPages ?? 1;
--- a/src/app/admin/(dashboard)/_state/user/user-state.ts
+++ b/src/app/admin/(dashboard)/_state/user/user-state.ts
@@ -90,6 +90,32 @@ const userState = proxy({
      }
    },
  },
+  updateActive: {
+    loading: false,
+    async submit(id: string, isActive: boolean) {
+      this.loading = true;
+      try {
+        const res = await fetch(`/api/user/updt`, {
+          method: "PUT",
+          headers: { "Content-Type": "application/json" },
+          body: JSON.stringify({ id, isActive }),
+        });
+
+        const data = await res.json();
+        if (res.status === 200 && data.success) {
+          toast.success(data.message);
+          userState.findMany.load(userState.findMany.page, 10, userState.findMany.search);
+        } else {
+          toast.error(data.message || "Gagal update status user");
+        }
+      } catch (e) {
+        console.error(e);
+        toast.error("Gagal update status user");
+      } finally {
+        this.loading = false;
+      }
+    },
+  },
 });

 const templateRole = z.object({
--- a/src/app/admin/(dashboard)/auth/login-admin/page.tsx
+++ b/src/app/admin/(dashboard)/auth/login-admin/page.tsx
@@ -0,0 +1,111 @@
+'use client'
+import { apiFetchLogin } from '@/app/admin/auth/_lib/api_fetch_auth';
+import colors from '@/con/colors';
+import { Box, Button, Center, Flex, Image, Paper, Stack, Text, Title } from '@mantine/core';
+import Link from 'next/link';
+import { useRouter } from 'next/navigation';
+import { useState } from 'react';
+import { PhoneInput } from "react-international-phone";
+import "react-international-phone/style.css";
+import { toast } from 'react-toastify';
+
+
+
+function Login() {
+  const router = useRouter()
+  const [phone, setPhone] = useState("")
+  const [isError, setError] = useState(false)
+  const [loading, setLoading] = useState(false)
+
+  async function onLogin() {
+    const nomor = phone.substring(1);
+    if (nomor.length <= 4) return setError(true)
+
+
+    try {
+      setLoading(true);
+      const response = await apiFetchLogin({ nomor: nomor })
+      if (response && response.success) {
+        localStorage.setItem("hipmi_auth_code_id", response.kodeId);
+        toast.success(response.message);
+        router.push("/validasi", { scroll: false });
+      } else {
+        setLoading(false);
+        toast.error(response?.message);
+      }
+    } catch (error) {
+      setLoading(false)
+      console.log("Error Login", error)
+      toast.error("Terjadi kesalahan saat login")
+    }
+  }
+
+  return (
+    <Stack pos={"relative"} bg={colors.Bg}>
+      <Box px={{ base: 'md', md: 100 }} pb={50}>
+        <Stack align='center' justify='center' h={"100vh"}>
+          <Paper p={'xl'} radius={'md'} bg={colors['white-trans-1']}>
+            <Stack align='center' gap={"lg"}>
+              <Box>
+                <Title ta={"center"} order={2} fw={'bold'} c={colors['blue-button']}>
+                  Login
+                </Title>
+                <Center>
+                  <Image loading="lazy" src={"/darmasaba-icon.png"} alt="" w={80} />
+                </Center>
+              </Box>
+              <Box>
+              {/* <Box mb={10}>
+                <Text c={colors['blue-button']} ta={"center"} fz={"sm"} fw={'bold'}>Masuk Untuk Akses Admin</Text>
+                <TextInput
+                  label='Username'
+                  placeholder='Username'
+                  value={username}
+                  onChange={(e) => setUsername(e.target.value)}
+                  required
+                />
+              </Box> */}
+                <PhoneInput
+                  countrySelectorStyleProps={{
+                    buttonStyle: {
+                      backgroundColor: colors['blue-button'],
+                    },
+                  }}
+                  inputStyle={{ width: "100%"}}
+                  defaultCountry="id"
+                  onChange={(val) => {
+                    setPhone(val);
+                  }}
+                />
+
+                {isError ? (
+                  toast.error("Masukan nomor telepon anda")
+                ) : (
+                  ""
+                )}
+                <Box py={20} >
+                  <Button
+                    fullWidth
+                    bg={colors['blue-button']}
+                    radius={'xl'}
+                    onClick={onLogin}
+                    loading={loading ? true : false}
+                  >Masuk
+                  </Button>
+                </Box>
+                <Flex justify={'center'} align={'center'}>
+                  <Text>Belum punya akun? </Text>
+                  <Button variant='transparent' component={Link} href={'/registrasi'}>
+                    <Text c={colors['blue-button']} fw={'bold'}>Registrasi</Text>
+                  </Button>
+                </Flex>
+              </Box>
+            </Stack>
+          </Paper>
+        </Stack>
+      </Box>
+    </Stack>
+  );
+}
+
+export default Login;
--- a/src/app/admin/(dashboard)/auth/registrasi-admin/page.tsx
+++ b/src/app/admin/(dashboard)/auth/registrasi-admin/page.tsx
@@ -0,0 +1,121 @@
+/* eslint-disable @typescript-eslint/no-unused-expressions */
+'use client'
+import { apiFetchRegister } from '@/app/admin/auth/_lib/api_fetch_auth';
+import BackButton from '@/app/darmasaba/(pages)/desa/layanan/_com/BackButto';
+import colors from '@/con/colors';
+import { Box, Button, Center, Checkbox, Image, Paper, Stack, Text, TextInput, Title } from '@mantine/core';
+import { useRouter } from 'next/navigation';
+import { useState } from 'react';
+import { PhoneInput } from "react-international-phone";
+import "react-international-phone/style.css";
+import { toast } from 'react-toastify';
+
+function Registrasi() {
+  const [phone, setPhone] = useState("")
+  const router = useRouter()
+  const [value, setValue] = useState("")
+  const [isValue, setIsValue] = useState(false);
+  const [loading, setLoading] = useState(false);
+
+  async function onRegistarsi() {
+    if (value.length < 5) {
+      toast.error("Username minimal 5 karakter!");
+      return;
+    }
+  
+    if (value.includes(" ")) {
+      toast.error("Username tidak boleh ada spasi!");
+      return;
+    }
+  
+    if (!phone) {
+      toast.error("Nomor telepon wajib diisi!");
+      return;
+    }
+    
+    try {
+      setLoading(true);
+      const respone = await apiFetchRegister({ nomor: phone, username: value });
+
+      if (respone.success) {
+        router.push("/login", { scroll: false });
+        toast.success(respone.message);
+
+      } else {
+        setLoading(false);
+        toast.error(respone.message);
+      }
+    } catch (error) {
+      setLoading(false);
+      console.log("Error Registrasi", error);
+    }
+  }
+  return (
+    <Stack pos={"relative"} bg={colors.Bg} gap={"22"} py={"xl"} h={"100vh"}>
+      <Box px={{ base: 'md', md: 100 }}>
+        <BackButton />
+      </Box>
+      <Box px={{ base: 'md', md: 100 }}>
+        <Stack justify='center' align='center' h={"80vh"}>
+          <Paper p={'xl'} radius={'md'} bg={colors['white-trans-1']}>
+            <Stack align='center'>
+              <Title order={2} fw={'bold'} c={colors['blue-button']}>
+                Registrasi
+              </Title>
+              <Center>
+                <Image loading="lazy" src={"/darmasaba-icon.png"} alt="" w={80} />
+              </Center>
+              <Box>
+                <TextInput placeholder='Username'
+                  label='Username'
+                  maxLength={50}
+
+                  error={
+                    value.length > 0 && value.length < 5
+                      ? "Minimal 5 karakter !"
+                      : value.includes(" ")
+                      ? "Tidak boleh ada spasi"
+                      : isValue
+                      ? "Masukan username anda"
+                      : ""
+                  }
+                  onChange={(val) => {
+                    val.currentTarget.value.length > 0 ? setIsValue(false) : "";
+                    setValue(val.currentTarget.value);
+                  }}
+                  required
+
+                />
+                <Box py={10}>
+                  <Text fz={"sm"} >Nomor Telepon</Text>
+                  <PhoneInput
+                    countrySelectorStyleProps={{
+                      buttonStyle: {
+                        backgroundColor: colors['blue-button'],
+                      },
+                    }}
+                    inputStyle={{ width: "100%" }}
+                    defaultCountry="id"
+                    onChange={(val) => {
+                      setPhone(val);
+                    }}
+                  />
+                </Box>
+                <Box pb={10}>
+                  <Checkbox
+                    label="Saya menyetujui syarat dan ketentuan yang berlaku"
+                  />
+                </Box>
+                <Box pb={20} >
+                  <Button fullWidth bg={colors['blue-button']} radius={'xl'} onClick={onRegistarsi} loading={loading ? true : false}>Daftar</Button>
+                </Box>
+              </Box>
+            </Stack>
+          </Paper>
+        </Stack>
+      </Box>
+    </Stack>
+  );
+}
+
+export default Registrasi;
--- a/src/app/admin/(dashboard)/auth/validasi-admin/page.tsx
+++ b/src/app/admin/(dashboard)/auth/validasi-admin/page.tsx
@@ -0,0 +1,38 @@
+'use client'
+import colors from '@/con/colors';
+import { Box, Button, Paper, PinInput, Stack, Text, Title } from '@mantine/core';
+import { useRouter } from 'next/navigation';
+
+function Validasi() {
+  const router = useRouter()
+  return (
+    <Stack pos={"relative"} bg={colors.Bg}>
+      <Box px={{ base: 'md', md: 100 }} pb={50}>
+        <Stack align='center' justify='center' h={"100vh"}>
+          <Paper p={'xl'} radius={'md'} bg={colors['white-trans-1']}>
+            <Stack align='center' gap={"lg"}>
+              <Box>
+                <Title ta={"center"} order={2} fw={'bold'} c={colors['blue-button']}>
+                  Kode Verifikasi
+                </Title>
+              </Box>
+              <Box>
+                <Box mb={10}>
+                  <Text c={colors['blue-button']} ta={"center"} fz={"sm"} fw={'bold'}>Masukkan Kode Verifikasi</Text>
+                  <PinInput type={/^[0-9]*$/} inputType="tel" inputMode="numeric" />
+                </Box>
+                <Box py={20} >
+                  <Button onClick={() => router.push("/admin/landing-page/profile/program-inovasi")}>
+                    Page
+                  </Button>
+                </Box>
+              </Box>
+            </Stack>
+          </Paper>
+        </Stack>
+      </Box>
+    </Stack>
+  );
+}
+
+export default Validasi;
--- a/src/app/admin/(dashboard)/desa/_com/layoutTabLayanan.tsx
+++ b/src/app/admin/(dashboard)/desa/_com/layoutTabLayanan.tsx
@@ -1,9 +1,10 @@
 /* eslint-disable react-hooks/exhaustive-deps */
 'use client'
 import colors from '@/con/colors';
-import { Stack, Tabs, TabsList, TabsPanel, TabsTab, Title } from '@mantine/core';
+import { ScrollArea, Stack, Tabs, TabsList, TabsPanel, TabsTab, Title, Tooltip } from '@mantine/core';
 import { usePathname, useRouter } from 'next/navigation';
 import React, { useEffect, useState } from 'react';
+import { IconFileText, IconBuildingStore, IconSparkles, IconUsers, IconUsersPlus } from '@tabler/icons-react';

 function LayoutTabsLayanan({ children }: { children: React.ReactNode }) {
    const router = useRouter()
@@ -12,26 +13,42 @@ function LayoutTabsLayanan({ children }: { children: React.ReactNode }) {
        {
            label: "Pelayanan Surat Keterangan",
            value: "pelayanansuratketerangan",
-            href: "/admin/desa/layanan/pelayanan_surat_keterangan"
+            href: "/admin/desa/layanan/pelayanan_surat_keterangan",
+            icon: <IconFileText size={18} stroke={1.8} />,
+            tooltip: "Layanan terkait surat keterangan resmi desa"
        },
        {
            label: "Pelayanan Perizinan Berusaha",
            value: "pelayananperizinanusaha",
-            href: "/admin/desa/layanan/pelayanan_perizinan_berusaha"
+            href: "/admin/desa/layanan/pelayanan_perizinan_berusaha",
+            icon: <IconBuildingStore size={18} stroke={1.8} />,
+            tooltip: "Layanan untuk izin usaha masyarakat"
        },
        {
            label: "Pelayanan Telunjuk Sakti Desa",
            value: "pelayanantelunjuksaktidesa",
-            href: "/admin/desa/layanan/pelayanan_telunjuk_sakti_desa"
+            href: "/admin/desa/layanan/pelayanan_telunjuk_sakti_desa",
+            icon: <IconSparkles size={18} stroke={1.8} />,
+            tooltip: "Layanan inovasi khusus desa"
        },
        {
            label: "Pelayanan Penduduk Non-Permanent",
-            value: "pelayanantelunjuknonpermanent",
-            href: "/admin/desa/layanan/pelayanan_penduduk_non_permanent"
+            value: "pelayanannonpermanent",
+            href: "/admin/desa/layanan/pelayanan_penduduk_non_permanent",
+            icon: <IconUsers size={18} stroke={1.8} />,
+            tooltip: "Pendataan penduduk non-permanent"
+        },
+        {
+            label: "Ajukan Permohonan",
+            value: "ajukanpermohonan",
+            href: "/admin/desa/layanan/ajukan_permohonan",
+            icon: <IconUsersPlus size={18} stroke={1.8} />,
+            tooltip: "Ajukan permohonan"
        }
    ];
-    const curentTab = tabs.find(tab => tab.href === pathname)
-    const [activeTab, setActiveTab] = useState<string | null>(curentTab?.value || tabs[0].value);
+
+    const currentTab = tabs.find(tab => tab.href === pathname)
+    const [activeTab, setActiveTab] = useState<string | null>(currentTab?.value || tabs[0].value);

    const handleTabChange = (value: string | null) => {
        const tab = tabs.find(t => t.value === value)
@@ -49,24 +66,72 @@ function LayoutTabsLayanan({ children }: { children: React.ReactNode }) {
    }, [pathname])

    return (
-        <Stack>
-            <Title order={3}>Layanan</Title>
-            <Tabs color={colors['blue-button']} variant='pills' value={activeTab} onChange={handleTabChange}>
-                <TabsList p={"xs"} bg={"#BBC8E7FF"}>
-                    {tabs.map((e, i) => (
-                        <TabsTab key={i} value={e.value}>{e.label}</TabsTab>
-                    ))}
-                </TabsList>
-                {tabs.map((e, i) => (
-                    <TabsPanel key={i} value={e.value}>
-                        {/* Konten dummy, bisa diganti tergantung routing */}
-                        <></>
+        <Stack gap="lg">
+            <Title order={3} fw={700} style={{ color: "#1A1B1E" }}>Layanan</Title>
+            <Tabs
+                color={colors["blue-button"]}
+                variant="pills"
+                value={activeTab}
+                onChange={handleTabChange}
+                radius="lg"
+                keepMounted={false}
+            >
+                {/* ✅ Scroll horizontal wrapper */}
+                <ScrollArea type="auto" offsetScrollbars>
+                    <TabsList
+                        p="sm"
+                        style={{
+                            background: "linear-gradient(135deg, #e7ebf7, #f9faff)",
+                            borderRadius: "1rem",
+                            boxShadow: "inset 0 0 10px rgba(0,0,0,0.05)",
+                            display: "flex",
+                            flexWrap: "nowrap",
+                            gap: "0.5rem",
+                            paddingInline: "0.5rem", // ✅ biar nggak nempel ke tepi
+                        }}
+                    >
+                        {tabs.map((tab, i) => (
+                            <Tooltip
+                                key={i}
+                                label={tab.tooltip}
+                                position="bottom"
+                                withArrow
+                                transitionProps={{ transition: 'pop', duration: 200 }}
+                            >
+                                <TabsTab
+                                    value={tab.value}
+                                    leftSection={tab.icon}
+                                    style={{
+                                        fontWeight: 600,
+                                        fontSize: "0.9rem",
+                                        transition: "all 0.2s ease",
+                                    }}
+                                >
+                                    {tab.label}
+                                </TabsTab>
+                            </Tooltip>
+                        ))}
+                    </TabsList>
+                </ScrollArea>
+
+                {tabs.map((tab, i) => (
+                    <TabsPanel
+                        key={i}
+                        value={tab.value}
+                        style={{
+                            padding: "1.5rem",
+                            background: "linear-gradient(180deg, #ffffff, #f5f6fa)",
+                            borderRadius: "1rem",
+                            boxShadow: "0 4px 16px rgba(0,0,0,0.05)",
+                        }}
+                    >
+                        {/* Konten dummy, bisa diganti sesuai routing */}
+                        <>{children}</>
                    </TabsPanel>
                ))}
            </Tabs>
-            {children}
        </Stack>
    );
 }

-export default LayoutTabsLayanan;
+export default LayoutTabsLayanan;
--- a/src/app/admin/(dashboard)/desa/berita/_com/layoutTabs.tsx
+++ b/src/app/admin/(dashboard)/desa/berita/_com/layoutTabs.tsx
@@ -1,63 +1,117 @@
 /* eslint-disable react-hooks/exhaustive-deps */
 'use client'
 import colors from '@/con/colors';
-import { Stack, Tabs, TabsList, TabsPanel, TabsTab, Title } from '@mantine/core';
+import { ScrollArea, Stack, Tabs, TabsList, TabsPanel, TabsTab, Title, Tooltip } from '@mantine/core';
 import { usePathname, useRouter } from 'next/navigation';
 import React, { useEffect, useState } from 'react';
+import { IconNews, IconCategory } from '@tabler/icons-react';

 function LayoutTabsBerita({ children }: { children: React.ReactNode }) {
-    const router = useRouter()
-    const pathname = usePathname()
+    const router = useRouter();
+    const pathname = usePathname();
+
    const tabs = [
        {
            label: "List Berita",
            value: "list_berita",
-            href: "/admin/desa/berita/list-berita"
+            href: "/admin/desa/berita/list-berita",
+            icon: <IconNews size={18} stroke={1.8} />,
+            tooltip: "Lihat dan kelola semua berita desa"
        },
        {
            label: "Kategori Berita",
            value: "kategori_berita",
-            href: "/admin/desa/berita/kategori-berita"
+            href: "/admin/desa/berita/kategori-berita",
+            icon: <IconCategory size={18} stroke={1.8} />,
+            tooltip: "Kelola kategori berita desa"
        },
-        
    ];
-    const curentTab = tabs.find(tab => tab.href === pathname)
-    const [activeTab, setActiveTab] = useState<string | null>(curentTab?.value || tabs[0].value);
+
+    const currentTab = tabs.find(tab => tab.href === pathname);
+    const [activeTab, setActiveTab] = useState<string | null>(currentTab?.value || tabs[0].value);

    const handleTabChange = (value: string | null) => {
-        const tab = tabs.find(t => t.value === value)
+        const tab = tabs.find(t => t.value === value);
        if (tab) {
-            router.push(tab.href)
+            router.push(tab.href);
        }
-        setActiveTab(value)
-    }
+        setActiveTab(value);
+    };

    useEffect(() => {
-        const match = tabs.find(tab => tab.href === pathname)
+        const match = tabs.find(tab => tab.href === pathname);
        if (match) {
-            setActiveTab(match.value)
+            setActiveTab(match.value);
        }
-    }, [pathname])
+    }, [pathname]);

    return (
-        <Stack>
-            <Title order={3}>Gallery</Title>
-            <Tabs color={colors['blue-button']} variant='pills' value={activeTab} onChange={handleTabChange}>
-                <TabsList p={"xs"} bg={"#BBC8E7FF"}>
-                    {tabs.map((e, i) => (
-                        <TabsTab key={i} value={e.value}>{e.label}</TabsTab>
-                    ))}
-                </TabsList>
-                {tabs.map((e, i) => (
-                    <TabsPanel key={i} value={e.value}>
-                        {/* Konten dummy, bisa diganti tergantung routing */}
-                        <></>
+        <Stack gap="lg">
+            <Title order={3} fw={700} style={{ color: "#1A1B1E" }}>Berita Desa</Title>
+            <Tabs
+                color={colors["blue-button"]}
+                variant="pills"
+                value={activeTab}
+                onChange={handleTabChange}
+                radius="lg"
+                keepMounted={false}
+            >
+                {/* ✅ Scroll horizontal wrapper */}
+                <ScrollArea type="auto" offsetScrollbars>
+                    <TabsList
+                        p="sm"
+                        style={{
+                            background: "linear-gradient(135deg, #e7ebf7, #f9faff)",
+                            borderRadius: "1rem",
+                            boxShadow: "inset 0 0 10px rgba(0,0,0,0.05)",
+                            display: "flex",
+                            flexWrap: "nowrap",
+                            gap: "0.5rem",
+                            paddingInline: "0.5rem", // ✅ biar nggak nempel ke tepi
+                        }}
+                    >
+                        {tabs.map((tab, i) => (
+                            <Tooltip
+                                key={i}
+                                label={tab.tooltip}
+                                position="bottom"
+                                withArrow
+                                transitionProps={{ transition: 'pop', duration: 200 }}
+                            >
+                                <TabsTab
+                                    value={tab.value}
+                                    leftSection={tab.icon}
+                                    style={{
+                                        fontWeight: 600,
+                                        fontSize: "0.9rem",
+                                        transition: "all 0.2s ease",
+                                    }}
+                                >
+                                    {tab.label}
+                                </TabsTab>
+                            </Tooltip>
+                        ))}
+                    </TabsList>
+                </ScrollArea>
+
+                {tabs.map((tab, i) => (
+                    <TabsPanel
+                        key={i}
+                        value={tab.value}
+                        style={{
+                            padding: "1.5rem",
+                            background: "linear-gradient(180deg, #ffffff, #f5f6fa)",
+                            borderRadius: "1rem",
+                            boxShadow: "0 4px 16px rgba(0,0,0,0.05)",
+                        }}
+                    >
+                        {/* Konten dummy, bisa diganti sesuai routing */}
+                        <>{children}</>
                    </TabsPanel>
                ))}
            </Tabs>
-            {children}
        </Stack>
    );
 }

-export default LayoutTabsBerita;
+export default LayoutTabsBerita;
--- a/src/app/admin/(dashboard)/desa/berita/kategori-berita/[id]/page.tsx
+++ b/src/app/admin/(dashboard)/desa/berita/kategori-berita/[id]/page.tsx
@@ -2,7 +2,16 @@
 'use client'
 import stateDashboardBerita from '@/app/admin/(dashboard)/_state/desa/berita';
 import colors from '@/con/colors';
-import { Box, Button, Paper, Stack, Text, TextInput, Title } from '@mantine/core';
+import {
+  Box,
+  Button,
+  Group,
+  Paper,
+  Stack,
+  TextInput,
+  Title,
+  Tooltip
+} from '@mantine/core';
 import { IconArrowBack } from '@tabler/icons-react';
 import { useParams, useRouter } from 'next/navigation';
 import { useEffect, useState } from 'react';
@@ -10,67 +19,102 @@ import { toast } from 'react-toastify';
 import { useProxy } from 'valtio/utils';

 function EditKategoriBerita() {
-  const editState = useProxy(stateDashboardBerita.kategoriBerita)
+  const editState = useProxy(stateDashboardBerita.kategoriBerita);
  const router = useRouter();
  const params = useParams();
+
  const [formData, setFormData] = useState({
-      name: editState.update.form.name || '',
-    });
+    name: editState.update.form.name || '',
+  });

  useEffect(() => {
-      const loadKategori = async () => {
-        const id = params?.id as string;
-        if (!id) return;
-  
-        try {
-          const data = await editState.update.load(id); // akses langsung, bukan dari proxy
-          if (data) {
-            setFormData({
-              name: data.name || '',
-            });
-          }
-        } catch (error) {
-          console.error("Error loading kategori Berita:", error);
-          toast.error("Gagal memuat data kategori Berita");
-        }
-      };
-  
-      loadKategori();
-    }, [params?.id]);
+    const loadKategori = async () => {
+      const id = params?.id as string;
+      if (!id) return;

-    const handleSubmit = async () => {
      try {
-        editState.update.form = {
-          ...editState.update.form,
-          name: formData.name,
-        };
-        await editState.update.update();
-        toast.success('Kategori Berita berhasil diperbarui!');
-        router.push('/admin/desa/berita/kategori-berita');
+        const data = await editState.update.load(id);
+        if (data) {
+          setFormData({
+            name: data.name || '',
+          });
+        }
      } catch (error) {
-        console.error('Error updating kategori Berita:', error);
-        toast.error('Terjadi kesalahan saat memperbarui kategori Berita');
+        console.error('Error loading kategori Berita:', error);
+        toast.error('Gagal memuat data kategori Berita');
      }
    };

+    loadKategori();
+  }, [params?.id]);
+
+  const handleSubmit = async () => {
+    try {
+      editState.update.form = {
+        ...editState.update.form,
+        name: formData.name,
+      };
+
+      await editState.update.update();
+      toast.success('Kategori Berita berhasil diperbarui!');
+      router.push('/admin/desa/berita/kategori-berita');
+    } catch (error) {
+      console.error('Error updating kategori Berita:', error);
+      toast.error('Terjadi kesalahan saat memperbarui kategori Berita');
+    }
+  };
+
  return (
-    <Box>
-      <Box mb={10}>
-        <Button variant="subtle" onClick={() => router.back()}>
-          <IconArrowBack color={colors["blue-button"]} size={30} />
-        </Button>
-      </Box>
-      <Paper bg={"white"} p={"md"} w={{ base: "100%", md: "50%" }}>
-        <Stack gap={"xs"}>
-          <Title order={3}>Edit Kategori Berita</Title>
+    <Box px={{ base: 'sm', md: 'lg' }} py="md">
+      {/* Back Button + Title */}
+      <Group mb="md">
+        <Tooltip label="Kembali ke halaman sebelumnya" withArrow>
+          <Button
+            variant="subtle"
+            onClick={() => router.back()}
+            p="xs"
+            radius="md"
+          >
+            <IconArrowBack color={colors['blue-button']} size={24} />
+          </Button>
+        </Tooltip>
+        <Title order={4} ml="sm" c="dark">
+          Edit Kategori Berita
+        </Title>
+      </Group>
+
+      {/* Form Wrapper */}
+      <Paper
+        w={{ base: '100%', md: '50%' }}
+        bg={colors['white-1']}
+        p="lg"
+        radius="md"
+        shadow="sm"
+        style={{ border: '1px solid #e0e0e0' }}
+      >
+        <Stack gap="md">
          <TextInput
+            label="Nama Kategori Berita"
+            placeholder="Masukkan nama kategori berita"
            value={formData.name}
            onChange={(e) => setFormData({ ...formData, name: e.target.value })}
-            label={<Text fz={"sm"} fw={"bold"}>Nama Kategori Berita</Text>}
-            placeholder="masukkan nama kategori Berita"
+            required
          />

-          <Button onClick={handleSubmit}>Simpan</Button>
+          <Group justify="right">
+            <Button
+              onClick={handleSubmit}
+              radius="md"
+              size="md"
+              style={{
+                background: `linear-gradient(135deg, ${colors['blue-button']}, #4facfe)`,
+                color: '#fff',
+                boxShadow: '0 4px 15px rgba(79, 172, 254, 0.4)',
+              }}
+            >
+              Simpan
+            </Button>
+          </Group>
        </Stack>
      </Paper>
    </Box>
--- a/src/app/admin/(dashboard)/desa/berita/kategori-berita/create/page.tsx
+++ b/src/app/admin/(dashboard)/desa/berita/kategori-berita/create/page.tsx
@@ -1,50 +1,87 @@
-'use client'
+'use client';
 import stateDashboardBerita from '@/app/admin/(dashboard)/_state/desa/berita';
 import colors from '@/con/colors';
-import { Box, Button, Group, Paper, Stack, Text, TextInput, Title } from '@mantine/core';
+import {
+  Box,
+  Button,
+  Group,
+  Paper,
+  Stack,
+  Text,
+  TextInput,
+  Title,
+  Tooltip,
+} from '@mantine/core';
 import { IconArrowBack } from '@tabler/icons-react';
 import { useRouter } from 'next/navigation';
 import { useProxy } from 'valtio/utils';

-
-
 function CreateKategoriBerita() {
-  const createState = useProxy(stateDashboardBerita.kategoriBerita)
+  const createState = useProxy(stateDashboardBerita.kategoriBerita);
  const router = useRouter();

  const resetForm = () => {
    createState.create.form = {
-      name: "",
+      name: '',
    };
  };

  const handleSubmit = async () => {
    await createState.create.create();
    resetForm();
-    router.push("/admin/desa/berita/kategori-berita")
+    router.push('/admin/desa/berita/kategori-berita');
  };

  return (
-    <Box>
-      <Box mb={10}>
-        <Button onClick={() => router.back()} variant='subtle' color={'blue'}>
-          <IconArrowBack color={colors['blue-button']} size={25} />
-        </Button>
-      </Box>
+    <Box px={{ base: 'sm', md: 'lg' }} py="md">
+      {/* Header dengan back button */}
+      <Group mb="md">
+        <Tooltip label="Kembali ke halaman sebelumnya" withArrow>
+          <Button
+            variant="subtle"
+            onClick={() => router.back()}
+            p="xs"
+            radius="md"
+          >
+            <IconArrowBack color={colors['blue-button']} size={24} />
+          </Button>
+        </Tooltip>
+        <Title order={4} ml="sm" c="dark">
+          Tambah Kategori Berita
+        </Title>
+      </Group>

-      <Paper w={{ base: '100%', md: '50%' }} bg={colors['white-1']} p={'md'}>
-        <Stack gap={"xs"}>
-          <Title order={4}>Create Kategori Berita</Title>
+      {/* Form utama */}
+      <Paper
+        w={{ base: '100%', md: '50%' }}
+        bg={colors['white-1']}
+        p="lg"
+        radius="md"
+        shadow="sm"
+        style={{ border: '1px solid #e0e0e0' }}
+      >
+        <Stack gap="md">
          <TextInput
-            label={<Text fw={"bold"} fz={"sm"}>Nama Kategori Berita</Text>}
-            placeholder='Masukkan nama kategori Berita'
-            value={createState.create.form.name}
-            onChange={(val) => {
-              createState.create.form.name = val.target.value;
-            }}
+            label={<Text fw="bold" fz="sm">Nama Kategori Berita</Text>}
+            placeholder="Masukkan nama kategori berita"
+            value={createState.create.form.name || ''}
+            onChange={(e) => (createState.create.form.name = e.target.value)}
+            required
          />
-          <Group>
-            <Button onClick={handleSubmit} bg={colors['blue-button']}>Submit</Button>
+
+          <Group justify="right">
+            <Button
+              onClick={handleSubmit}
+              radius="md"
+              size="md"
+              style={{
+                background: `linear-gradient(135deg, ${colors['blue-button']}, #4facfe)`,
+                color: '#fff',
+                boxShadow: '0 4px 15px rgba(79, 172, 254, 0.4)',
+              }}
+            >
+              Simpan
+            </Button>
          </Group>
        </Stack>
      </Paper>
--- a/src/app/admin/(dashboard)/desa/berita/kategori-berita/page.tsx
+++ b/src/app/admin/(dashboard)/desa/berita/kategori-berita/page.tsx
@@ -1,25 +1,40 @@
 /* eslint-disable react-hooks/exhaustive-deps */
 'use client'
 import colors from '@/con/colors';
-import { Box, Button, Paper, Skeleton, Stack, Table, TableTbody, TableTd, TableTh, TableThead, TableTr, Text } from '@mantine/core';
-import { IconEdit, IconSearch, IconTrash } from '@tabler/icons-react';
+import {
+  Box,
+  Button,
+  Center,
+  Group,
+  Pagination,
+  Paper,
+  Skeleton,
+  Stack,
+  Table,
+  TableTbody,
+  TableTd,
+  TableTh,
+  TableThead,
+  TableTr,
+  Text,
+  Title,
+  Tooltip
+} from '@mantine/core';
+import { IconEdit, IconPlus, IconSearch, IconTrash } from '@tabler/icons-react';
 import { useRouter } from 'next/navigation';
 import { useEffect, useState } from 'react';
 import { useProxy } from 'valtio/utils';
 import HeaderSearch from '../../../_com/header';
-import JudulList from '../../../_com/judulList';
 import { ModalKonfirmasiHapus } from '../../../_com/modalKonfirmasiHapus';
 import stateDashboardBerita from '../../../_state/desa/berita';

-
-
 function KategoriBerita() {
  const [search, setSearch] = useState('');
  return (
    <Box>
      <HeaderSearch
-        title='Kategori Berita'
-        placeholder='pencarian'
+        title="Kategori Berita"
+        placeholder="Cari nama kategori berita..."
        searchIcon={<IconSearch size={20} />}
        value={search}
        onChange={(e) => setSearch(e.currentTarget.value)}
@@ -30,99 +45,155 @@ function KategoriBerita() {
 }

 function ListKategoriBerita({ search }: { search: string }) {
-  const listDataState = useProxy(stateDashboardBerita.kategoriBerita)
+  const listDataState = useProxy(stateDashboardBerita.kategoriBerita);
  const router = useRouter();
-  const [modalHapus, setModalHapus] = useState(false)
-  const [selectedId, setSelectedId] = useState<string | null>(null)
+  const [modalHapus, setModalHapus] = useState(false);
+  const [selectedId, setSelectedId] = useState<string | null>(null);
+
+  const {
+    data,
+    loading,
+    load,
+    page,
+    totalPages,
+  } = listDataState.findMany;

  useEffect(() => {
-    listDataState.findMany.load()
-  }, [])
+    load(page, 10, search);
+  }, [page, search]);

  const handleDelete = () => {
    if (selectedId) {
-      listDataState.delete.delete(selectedId)
-      setModalHapus(false)
-      setSelectedId(null)
-
-      listDataState.findMany.load()
+      listDataState.delete.delete(selectedId);
+      setModalHapus(false);
+      setSelectedId(null);
+      load(page, 10, search);
    }
-  }
+  };

-  const filteredData = (listDataState.findMany.data || []).filter(item => {
-    const keyword = search.toLowerCase();
-    return (
-      item.name.toLowerCase().includes(keyword)
-    );
-  });
+  const filteredData = data || [];

-  if (!listDataState.findMany.data) {
+  if (loading || !data) {
    return (
      <Stack py={10}>
-        <Skeleton h={500} />
+        <Skeleton height={600} radius="md" />
      </Stack>
-    )
+    );
  }
+
  return (
    <Box py={10}>
-      <Paper bg={colors['white-1']} p="md">
-        <Stack>
-        <JudulList
-          title='List Kategori Berita'
-          href='/admin/desa/berita/kategori-berita/create'
-        />
-          <Box style={{ overflowX: 'auto' }}>
-            <Table striped withRowBorders withTableBorder style={{ minWidth: '700px' }}>
-              <TableThead>
-                <TableTr>
-                  <TableTh>No</TableTh>
-                  <TableTh>Nama</TableTh>
-                  <TableTh>Edit</TableTh>
-                  <TableTh>Hapus</TableTh>
-                </TableTr>
-              </TableThead>
-              <TableTbody>
-                {filteredData.map((item, index) => (
+      <Paper withBorder bg={colors['white-1']} p="lg" shadow="md" radius="md">
+        <Group justify="space-between" mb="md">
+          <Title order={4}>Daftar Kategori Berita</Title>
+          <Tooltip label="Tambah Kategori Berita" withArrow>
+            <Button
+              leftSection={<IconPlus size={18} />}
+              color="blue"
+              variant="light"
+              onClick={() =>
+                router.push('/admin/desa/berita/kategori-berita/create')
+              }
+            >
+              Tambah Baru
+            </Button>
+          </Tooltip>
+        </Group>
+
+        <Box style={{ overflowX: 'auto' }}>
+          <Table highlightOnHover>
+            <TableThead>
+              <TableTr>
+                <TableTh style={{ width: '10%' }}>No</TableTh>
+                <TableTh style={{ width: '50%' }}>Nama</TableTh>
+                <TableTh style={{ width: '20%' }}>Edit</TableTh>
+                <TableTh style={{ width: '20%' }}>Hapus</TableTh>
+              </TableTr>
+            </TableThead>
+            <TableTbody>
+              {filteredData.length > 0 ? (
+                filteredData.map((item, index) => (
                  <TableTr key={item.id}>
                    <TableTd>
-                      <Box w={100}>
-                        <Text truncate="end" fz={"sm"}>{index + 1}</Text>
-                      </Box>
-                    </TableTd>
-                    <TableTd>{item.name}</TableTd>
-                    <TableTd>
-                      <Button color='green' onClick={() => router.push(`/admin/pendidikan/perpustakaan-digital/kategori-Berita/${item.id}`)}>
-                        <IconEdit size={20} />
-                      </Button>
+                      <Text fz="sm">{index + 1}</Text>
                    </TableTd>
                    <TableTd>
-                      <Button
-                        color='red'
-                        disabled={listDataState.delete.loading}
-                        onClick={() => {
-                          setSelectedId(item.id)
-                          setModalHapus(true)
-                        }}>
-                        <IconTrash size={20} />
-                      </Button>
+                      <Text fw={500} truncate="end" lineClamp={1}>
+                        {item.name}
+                      </Text>
+                    </TableTd>
+                    <TableTd>
+                      <Tooltip label="Edit Kategori Berita" withArrow>
+                        <Button
+                          variant="light"
+                          color="green"
+                          onClick={() =>
+                            router.push(
+                              `/admin/desa/berita/kategori-berita/${item.id}`
+                            )
+                          }
+                        >
+                          <IconEdit size={18} />
+                        </Button>
+                      </Tooltip>
+                    </TableTd>
+                    <TableTd>
+                      <Tooltip label="Hapus Kategori Berita" withArrow>
+                        <Button
+                          variant="light"
+                          color="red"
+                          disabled={listDataState.delete.loading}
+                          onClick={() => {
+                            setSelectedId(item.id);
+                            setModalHapus(true);
+                          }}
+                        >
+                          <IconTrash size={18} />
+                        </Button>
+                      </Tooltip>
                    </TableTd>
                  </TableTr>
-                ))}
-              </TableTbody>
-            </Table>
-          </Box>
-        </Stack>
+                ))
+              ) : (
+                <TableTr>
+                  <TableTd colSpan={4}>
+                    <Center py={20}>
+                      <Text color="dimmed">
+                        Tidak ada data kategori berita yang cocok
+                      </Text>
+                    </Center>
+                  </TableTd>
+                </TableTr>
+              )}
+            </TableTbody>
+          </Table>
+        </Box>
      </Paper>

+      <Center>
+        <Pagination
+          value={page}
+          onChange={(newPage) => {
+            load(newPage, 10, search);
+            window.scrollTo({ top: 0, behavior: 'smooth' });
+          }}
+          total={totalPages}
+          mt="md"
+          mb="md"
+          color="blue"
+          radius="md"
+        />
+      </Center>
+
      {/* Modal Konfirmasi Hapus */}
      <ModalKonfirmasiHapus
        opened={modalHapus}
        onClose={() => setModalHapus(false)}
        onConfirm={handleDelete}
-        text='Apakah anda yakin ingin menghapus kategori Berita ini?'
+        text="Apakah anda yakin ingin menghapus kategori berita ini?"
      />
    </Box>
-  )
+  );
 }

 export default KategoriBerita;
--- a/src/app/admin/(dashboard)/desa/berita/list-berita/[id]/edit/page.tsx
+++ b/src/app/admin/(dashboard)/desa/berita/list-berita/[id]/edit/page.tsx
@@ -15,7 +15,8 @@ import {
  Stack,
  Text,
  TextInput,
-  Title
+  Title,
+  Tooltip,
 } from "@mantine/core";
 import { Dropzone } from "@mantine/dropzone";
 import { IconArrowBack, IconPhoto, IconUpload, IconX } from "@tabler/icons-react";
@@ -24,7 +25,6 @@ import { useEffect, useState } from "react";
 import { toast } from "react-toastify";
 import { useProxy } from "valtio/utils";

-
 function EditBerita() {
  const beritaState = useProxy(stateDashboardBerita);
  const router = useRouter();
@@ -33,29 +33,29 @@ function EditBerita() {
  const [previewImage, setPreviewImage] = useState<string | null>(null);
  const [file, setFile] = useState<File | null>(null);
  const [formData, setFormData] = useState({
-    judul: beritaState.berita.edit.form.judul || '',
-    deskripsi: beritaState.berita.edit.form.deskripsi || '',
-    kategoriBeritaId: beritaState.berita.edit.form.kategoriBeritaId || '',
-    content: beritaState.berita.edit.form.content || '',
-    imageId: beritaState.berita.edit.form.imageId || ''
+    judul: beritaState.berita.edit.form.judul || "",
+    deskripsi: beritaState.berita.edit.form.deskripsi || "",
+    kategoriBeritaId: beritaState.berita.edit.form.kategoriBeritaId || "",
+    content: beritaState.berita.edit.form.content || "",
+    imageId: beritaState.berita.edit.form.imageId || "",
  });

  // Load berita by id saat pertama kali
  useEffect(() => {
-    beritaState.kategoriBerita.findMany.load()
+    beritaState.kategoriBerita.findMany.load();
    const loadBerita = async () => {
      const id = params?.id as string;
      if (!id) return;

      try {
-        const data = await stateDashboardBerita.berita.edit.load(id); // akses langsung, bukan dari proxy
+        const data = await stateDashboardBerita.berita.edit.load(id);
        if (data) {
          setFormData({
-            judul: data.judul || '',
-            deskripsi: data.deskripsi || '',
-            kategoriBeritaId: data.kategoriBeritaId || '',
-            content: data.content || '',
-            imageId: data.imageId || '',
+            judul: data.judul || "",
+            deskripsi: data.deskripsi || "",
+            kategoriBeritaId: data.kategoriBeritaId || "",
+            content: data.content || "",
+            imageId: data.imageId || "",
          });

          if (data?.image?.link) {
@@ -69,31 +69,26 @@ function EditBerita() {
    };

    loadBerita();
-  }, [params?.id]); // ✅ hapus beritaState dari dependency
+  }, [params?.id]);

  const handleSubmit = async () => {
-
    try {
-      // Update global state with form data
      beritaState.berita.edit.form = {
        ...beritaState.berita.edit.form,
-        judul: formData.judul,
-        deskripsi: formData.deskripsi,
-        content: formData.content,
-        kategoriBeritaId: formData.kategoriBeritaId || '',
-        imageId: formData.imageId // Keep existing imageId if not changed
+        ...formData,
      };

-      // Jika ada file baru, upload
      if (file) {
-        const res = await ApiFetch.api.fileStorage.create.post({ file, name: file.name });
+        const res = await ApiFetch.api.fileStorage.create.post({
+          file,
+          name: file.name,
+        });
        const uploaded = res.data?.data;

        if (!uploaded?.id) {
          return toast.error("Gagal upload gambar");
        }

-        // Update imageId in global state
        beritaState.berita.edit.form.imageId = uploaded.id;
      }

@@ -107,87 +102,112 @@ function EditBerita() {
  };

  return (
-    <Box>
-      <Box mb={10}>
-        <Button variant="subtle" onClick={() => router.back()}>
-          <IconArrowBack color={colors["blue-button"]} size={30} />
-        </Button>
-      </Box>
-      <Paper bg={"white"} p={"md"} w={{ base: "100%", md: "50%" }}>
-        <Stack gap={"xs"}>
-          <Title order={3}>Edit Berita</Title>
+    <Box px={{ base: "sm", md: "lg" }} py="md">
+      <Group mb="md">
+        <Tooltip label="Kembali ke halaman sebelumnya" withArrow>
+          <Button
+            variant="subtle"
+            onClick={() => router.back()}
+            p="xs"
+            radius="md"
+          >
+            <IconArrowBack color={colors["blue-button"]} size={24} />
+          </Button>
+        </Tooltip>
+        <Title order={4} ml="sm" c="dark">
+          Edit Berita
+        </Title>
+      </Group>
+
+      <Paper
+        w={{ base: "100%", md: "50%" }}
+        bg={colors["white-1"]}
+        p="lg"
+        radius="md"
+        shadow="sm"
+        style={{ border: "1px solid #e0e0e0" }}
+      >
+        <Stack gap="md">
          <TextInput
+            label="Judul"
+            placeholder="Masukkan judul"
            value={formData.judul}
-            onChange={(e) => setFormData({ ...formData, judul: e.target.value })}
-            label={<Text fz={"sm"} fw={"bold"}>Judul</Text>}
-            placeholder="masukkan judul"
+            onChange={(e) =>
+              setFormData({ ...formData, judul: e.target.value })
+            }
+            required
          />

          <TextInput
+            label="Deskripsi"
+            placeholder="Masukkan deskripsi"
            value={formData.deskripsi}
-            onChange={(e) => setFormData({ ...formData, deskripsi: e.target.value })}
-            label={<Text fz={"sm"} fw={"bold"}>Deskripsi</Text>}
-            placeholder="masukkan deskripsi"
+            onChange={(e) =>
+              setFormData({ ...formData, deskripsi: e.target.value })
+            }
+            required
          />

          <Box>
-            <Text fz={"md"} fw={"bold"}>Gambar</Text>
-            <Box>
-              <Dropzone
-                onDrop={(files) => {
-                  const selectedFile = files[0]; // Ambil file pertama
-                  if (selectedFile) {
-                    setFile(selectedFile);
-                    setPreviewImage(URL.createObjectURL(selectedFile)); // Buat preview
-                  }
-                }}
-                onReject={() => toast.error('File tidak valid.')}
-                maxSize={5 * 1024 ** 2} // Maks 5MB
-                accept={{ 'image/*': [] }}
-              >
-                <Group justify="center" gap="xl" mih={220} style={{ pointerEvents: 'none' }}>
-                  <Dropzone.Accept>
-                    <IconUpload size={52} color="var(--mantine-color-blue-6)" stroke={1.5} />
-                  </Dropzone.Accept>
-                  <Dropzone.Reject>
-                    <IconX size={52} color="var(--mantine-color-red-6)" stroke={1.5} />
-                  </Dropzone.Reject>
-                  <Dropzone.Idle>
-                    <IconPhoto size={52} color="var(--mantine-color-dimmed)" stroke={1.5} />
-                  </Dropzone.Idle>
+            <Text fw="bold" fz="sm" mb={6}>
+              Gambar Berita
+            </Text>
+            <Dropzone
+              onDrop={(files) => {
+                const selectedFile = files[0];
+                if (selectedFile) {
+                  setFile(selectedFile);
+                  setPreviewImage(URL.createObjectURL(selectedFile));
+                }
+              }}
+              onReject={() => toast.error("File tidak valid, gunakan format gambar")}
+              maxSize={5 * 1024 ** 2}
+              accept={{ "image/*": [] }}
+              radius="md"
+              p="xl"
+            >
+              <Group justify="center" gap="xl" mih={180}>
+                <Dropzone.Accept>
+                  <IconUpload size={48} color={colors["blue-button"]} stroke={1.5} />
+                </Dropzone.Accept>
+                <Dropzone.Reject>
+                  <IconX size={48} color="red" stroke={1.5} />
+                </Dropzone.Reject>
+                <Dropzone.Idle>
+                  <IconPhoto size={48} color="#868e96" stroke={1.5} />
+                </Dropzone.Idle>
+                <Stack gap="xs" align="center">
+                  <Text size="md" fw={500}>
+                    Seret gambar atau klik untuk memilih file
+                  </Text>
+                  <Text size="sm" c="dimmed">
+                    Maksimal 5MB, format gambar wajib
+                  </Text>
+                </Stack>
+              </Group>
+            </Dropzone>

-                  <div>
-                    <Text size="xl" inline>
-                      Drag gambar ke sini atau klik untuk pilih file
-                    </Text>
-                    <Text size="sm" c="dimmed" inline mt={7}>
-                      Maksimal 5MB dan harus format gambar
-                    </Text>
-                  </div>
-                </Group>
-              </Dropzone>
-
-              {/* Tampilkan preview kalau ada */}
-              {previewImage && (
-                <Box mt="sm">
-                  <Image
-                    src={previewImage}
-                    alt="Preview"
-                    style={{
-                      maxWidth: '100%',
-                      maxHeight: '200px',
-                      objectFit: 'contain',
-                      borderRadius: '8px',
-                      border: '1px solid #ddd',
-                    }}
-                  />
-                </Box>
-              )}
-
-            </Box>
+            {previewImage && (
+              <Box mt="sm" style={{ display: "flex", justifyContent: "center" }}>
+                <Image
+                  src={previewImage}
+                  alt="Preview Gambar"
+                  radius="md"
+                  style={{
+                    maxHeight: 220,
+                    objectFit: "contain",
+                    border: `1px solid ${colors["blue-button"]}`,
+                  }}
+                  loading="lazy"
+                />
+              </Box>
+            )}
          </Box>
+
          <Box>
-            <Text fz={"sm"} fw={"bold"}>Konten</Text>
+            <Text fz="sm" fw="bold">
+              Konten
+            </Text>
            <EditEditor
              value={formData.content}
              onChange={(htmlContent) => {
@@ -199,13 +219,15 @@ function EditBerita() {

          <Select
            value={formData.kategoriBeritaId}
-            onChange={(val) => setFormData({ ...formData, kategoriBeritaId: val || "" })}
-            label={<Text fw={"bold"} fz={"sm"}>Kategori</Text>}
-            placeholder='Pilih kategori'
+            onChange={(val) =>
+              setFormData({ ...formData, kategoriBeritaId: val || "" })
+            }
+            label="Kategori"
+            placeholder="Pilih kategori"
            data={
              beritaState.kategoriBerita.findMany.data?.map((v) => ({
                value: v.id,
-                label: v.name
+                label: v.name,
              })) || []
            }
            clearable
@@ -214,7 +236,20 @@ function EditBerita() {
            error={!formData.kategoriBeritaId ? "Pilih kategori" : undefined}
          />

-          <Button onClick={handleSubmit}>Edit Berita</Button>
+          <Group justify="right">
+            <Button
+              onClick={handleSubmit}
+              radius="md"
+              size="md"
+              style={{
+                background: `linear-gradient(135deg, ${colors["blue-button"]}, #4facfe)`,
+                color: "#fff",
+                boxShadow: "0 4px 15px rgba(79, 172, 254, 0.4)",
+              }}
+            >
+              Simpan
+            </Button>
+          </Group>
        </Stack>
      </Paper>
    </Box>
--- a/src/app/admin/(dashboard)/desa/berita/list-berita/[id]/page.tsx
+++ b/src/app/admin/(dashboard)/desa/berita/list-berita/[id]/page.tsx
@@ -1,9 +1,8 @@
 'use client'
 import { useProxy } from 'valtio/utils';
-
-import { Box, Button, Flex, Image, Paper, Skeleton, Stack, Text } from '@mantine/core';
+import { Box, Button, Group, Image, Paper, Skeleton, Stack, Text, Tooltip } from '@mantine/core';
 import { useShallowEffect } from '@mantine/hooks';
-import { IconArrowBack, IconEdit, IconX } from '@tabler/icons-react';
+import { IconArrowBack, IconEdit, IconTrash } from '@tabler/icons-react';
 import { useParams, useRouter } from 'next/navigation';
 import { useState } from 'react';

@@ -12,107 +11,147 @@ import { ModalKonfirmasiHapus } from '@/app/admin/(dashboard)/_com/modalKonfirma
 import stateDashboardBerita from '@/app/admin/(dashboard)/_state/desa/berita';

 function DetailBerita() {
-  const beritaState = useProxy(stateDashboardBerita)
-  const [modalHapus, setModalHapus] = useState(false)
-  const [selectedId, setSelectedId] = useState<string | null>(null)
-  const params = useParams()
-  const router = useRouter()
+  const beritaState = useProxy(stateDashboardBerita);
+  const [modalHapus, setModalHapus] = useState(false);
+  const [selectedId, setSelectedId] = useState<string | null>(null);
+  const params = useParams();
+  const router = useRouter();

  useShallowEffect(() => {
-    beritaState.berita.findUnique.load(params?.id as string)
-  }, [])
-
+    beritaState.berita.findUnique.load(params?.id as string);
+  }, []);

  const handleHapus = () => {
    if (selectedId) {
-      beritaState.berita.delete.byId(selectedId)
-      setModalHapus(false)
-      setSelectedId(null)
-      router.push("/admin/desa/berita/list-berita")
+      beritaState.berita.delete.byId(selectedId);
+      setModalHapus(false);
+      setSelectedId(null);
+      router.push("/admin/desa/berita/list-berita");
    }
-  }
+  };

  if (!beritaState.berita.findUnique.data) {
    return (
      <Stack py={10}>
-        <Skeleton h={40} />
+        <Skeleton height={500} radius="md" />
      </Stack>
-    )
+    );
  }

+  const data = beritaState.berita.findUnique.data;
+
  return (
-    <Box>
-      <Box mb={10}>
-        <Button variant="subtle" onClick={() => router.back()}>
-          <IconArrowBack color={colors['blue-button']} size={25} />
-        </Button>
-      </Box>
-      <Paper bg={colors['white-1']} w={{ base: "100%", md: "100%", lg: "50%" }} p={'md'}>
-        <Stack>
-          <Text fz={"xl"} fw={"bold"}>Detail Berita</Text>
-          {beritaState.berita.findUnique.data ? (
-            <Paper key={beritaState.berita.findUnique.data.id} bg={colors['BG-trans']} p={'md'}>
-              <Stack gap={"xs"}>
-                <Box>
-                  <Text fw={"bold"} fz={"lg"}>Kategori</Text>
-                  <Text fz={"lg"}>{beritaState.berita.findUnique.data?.kategoriBerita?.name}</Text>
-                </Box>
-                <Box>
-                  <Text fw={"bold"} fz={"lg"}>Judul</Text>
-                  <Text fz={"lg"}>{beritaState.berita.findUnique.data?.judul}</Text>
-                </Box>
-                <Box>
-                  <Text fw={"bold"} fz={"lg"}>Deskripsi</Text>
-                  <Text fz={"lg"} >{beritaState.berita.findUnique.data?.deskripsi}</Text>
-                </Box>
-                <Box>
-                  <Text fw={"bold"} fz={"lg"}>Gambar</Text>
-                  <Image w={{ base: 150, md: 150, lg: 150 }} src={beritaState.berita.findUnique.data?.image?.link} alt="gambar" />
-                </Box>
-                <Box>
-                  <Text fw={"bold"} fz={"lg"}>Konten</Text>
-                  <Text fz={"lg"} dangerouslySetInnerHTML={{ __html: beritaState.berita.findUnique.data?.content }} />
-                </Box>
-                <Flex gap={"xs"} mt={10}>
+    <Box py={10}>
+      {/* Tombol Back */}
+      <Button
+        variant="subtle"
+        onClick={() => router.back()}
+        leftSection={<IconArrowBack size={24} color={colors['blue-button']} />}
+        mb={15}
+      >
+        Kembali
+      </Button>
+
+      {/* Detail Berita */}
+      <Paper
+        withBorder
+        w={{ base: "100%", md: "70%" }}
+        bg={colors['white-1']}
+        p="lg"
+        radius="md"
+        shadow="sm"
+      >
+        <Stack gap="md">
+          <Text fz="2xl" fw="bold" c={colors['blue-button']}>
+            Detail Berita
+          </Text>
+
+          <Paper bg="#ECEEF8" p="md" radius="md" shadow="xs">
+            <Stack gap="sm">
+              <Box>
+                <Text fz="lg" fw="bold">Kategori</Text>
+                <Text fz="md" c="dimmed">{data.kategoriBerita?.name || '-'}</Text>
+              </Box>
+
+              <Box>
+                <Text fz="lg" fw="bold">Judul</Text>
+                <Text fz="md" c="dimmed">{data.judul || '-'}</Text>
+              </Box>
+
+              <Box>
+                <Text fz="lg" fw="bold">Deskripsi</Text>
+                <Text fz="md" c="dimmed">{data.deskripsi || '-'}</Text>
+              </Box>
+
+              <Box>
+                <Text fz="lg" fw="bold">Gambar</Text>
+                {data.image?.link ? (
+                  <Image
+                    src={data.image.link}
+                    alt={data.judul || 'Gambar Berita'}
+                    w={200}
+                    h={200}
+                    radius="md"
+                    fit="cover"
+                    loading='lazy'
+                  />
+                ) : (
+                  <Text fz="sm" c="dimmed">Tidak ada gambar</Text>
+                )}
+              </Box>
+
+              <Box>
+                <Text fz="lg" fw="bold">Konten</Text>
+                <Text
+                  fz="md"
+                  c="dimmed"
+                  dangerouslySetInnerHTML={{ __html: data.content || '-' }}
+                />
+              </Box>
+
+              {/* Action Button */}
+              <Group gap="sm">
+                <Tooltip label="Hapus Berita" withArrow position="top">
                  <Button
+                    color="red"
                    onClick={() => {
-                      if (beritaState.berita.findUnique.data) {
-                        setSelectedId(beritaState.berita.findUnique.data.id);
-                        setModalHapus(true);
-                      }
+                      setSelectedId(data.id);
+                      setModalHapus(true);
                    }}
-                    disabled={beritaState.berita.delete.loading || !beritaState.berita.findUnique.data}
-                    color={"red"}
+                    variant="light"
+                    radius="md"
+                    size="md"
                  >
-                    <IconX size={20} />
+                    <IconTrash size={20} />
                  </Button>
+                </Tooltip>
+
+                <Tooltip label="Edit Berita" withArrow position="top">
                  <Button
-                    onClick={() => {
-                      if (beritaState.berita.findUnique.data) {
-                        router.push(`/admin/desa/berita/list-berita/${beritaState.berita.findUnique.data.id}/edit`);
-                      }
-                    }}
-                    disabled={!beritaState.berita.findUnique.data}
-                    color={"green"}
+                    color="green"
+                    onClick={() => router.push(`/admin/desa/berita/list-berita/${data.id}/edit`)}
+                    variant="light"
+                    radius="md"
+                    size="md"
                  >
                    <IconEdit size={20} />
                  </Button>
-                </Flex>
-              </Stack>
-            </Paper>
-          ) : null}
+                </Tooltip>
+              </Group>
+            </Stack>
+          </Paper>
        </Stack>
      </Paper>

-      {/* Modal Konfirmasi Hapus */}
+      {/* Modal Hapus */}
      <ModalKonfirmasiHapus
        opened={modalHapus}
        onClose={() => setModalHapus(false)}
        onConfirm={handleHapus}
-        text='Apakah anda yakin ingin menghapus berita ini?'
+        text="Apakah Anda yakin ingin menghapus berita ini?"
      />
    </Box>
  );
 }

-export default DetailBerita;
+export default DetailBerita;
--- a/src/app/admin/(dashboard)/desa/berita/list-berita/create/page.tsx
+++ b/src/app/admin/(dashboard)/desa/berita/list-berita/create/page.tsx
@@ -3,7 +3,19 @@ import CreateEditor from '@/app/admin/(dashboard)/_com/createEditor';
 import stateDashboardBerita from '@/app/admin/(dashboard)/_state/desa/berita';
 import colors from '@/con/colors';
 import ApiFetch from '@/lib/api-fetch';
-import { Box, Button, Group, Image, Paper, Select, Stack, Text, TextInput, Title } from '@mantine/core';
+import {
+  Box,
+  Button,
+  Group,
+  Image,
+  Paper,
+  Select,
+  Stack,
+  Text,
+  TextInput,
+  Title,
+  Tooltip,
+} from '@mantine/core';
 import { Dropzone } from '@mantine/dropzone';
 import { useShallowEffect } from '@mantine/hooks';
 import { IconArrowBack, IconPhoto, IconUpload, IconX } from '@tabler/icons-react';
@@ -12,38 +24,33 @@ import { useState } from 'react';
 import { toast } from 'react-toastify';
 import { useProxy } from 'valtio/utils';

-
 export default function CreateBerita() {
  const beritaState = useProxy(stateDashboardBerita);
  const [previewImage, setPreviewImage] = useState<string | null>(null);
  const [file, setFile] = useState<File | null>(null);
-  const router = useRouter()
+  const router = useRouter();

  useShallowEffect(() => {
-    beritaState.kategoriBerita.findMany.load()
+    beritaState.kategoriBerita.findMany.load();
  }, []);

  const resetForm = () => {
-    // Reset state di valtio
    beritaState.berita.create.form = {
-      judul: "",
-      deskripsi: "",
-      kategoriBeritaId: "",
-      imageId: "",
-      content: "",
+      judul: '',
+      deskripsi: '',
+      kategoriBeritaId: '',
+      imageId: '',
+      content: '',
    };
-
-    // Reset state lokal
    setPreviewImage(null);
    setFile(null);
  };

  const handleSubmit = async () => {
    if (!file) {
-      return toast.warn("Pilih file gambar terlebih dahulu");
+      return toast.warn('Silakan pilih file gambar terlebih dahulu');
    }

-    // Upload gambar dulu
    const res = await ApiFetch.api.fileStorage.create.post({
      file,
      name: file.name,
@@ -51,40 +58,55 @@ export default function CreateBerita() {

    const uploaded = res.data?.data;
    if (!uploaded?.id) {
-      return toast.error("Gagal upload gambar");
+      return toast.error('Gagal mengunggah gambar, silakan coba lagi');
    }

-    // Simpan ID gambar ke form
    beritaState.berita.create.form.imageId = uploaded.id;

-    // Submit data berita
    await beritaState.berita.create.create();

-    // Reset form setelah submit
    resetForm();
-    router.push("/admin/desa/berita/list-berita")
+    router.push('/admin/desa/berita/list-berita');
  };

  return (
-    <Box>
-      <Box mb={10}>
-        <Button variant="subtle" onClick={() => router.back()}>
-          <IconArrowBack color={colors['blue-button']} size={25} />
-        </Button>
-      </Box>
-      <Paper bg={colors["white-1"]} p={"md"} w={{ base: "100%", md: "50%" }}>
-        <Stack gap={"xs"}>
-          <Title order={3}>Create Berita</Title>
+    <Box px={{ base: 'sm', md: 'lg' }} py="md">
+      {/* Header dengan tombol kembali */}
+      <Group mb="md">
+        <Tooltip label="Kembali ke halaman sebelumnya" withArrow>
+          <Button
+            variant="subtle"
+            onClick={() => router.back()}
+            p="xs"
+            radius="md"
+          >
+            <IconArrowBack color={colors['blue-button']} size={24} />
+          </Button>
+        </Tooltip>
+        <Title order={4} ml="sm" c="dark">
+          Tambah Berita
+        </Title>
+      </Group>
+
+      <Paper
+        w={{ base: '100%', md: '50%' }}
+        bg={colors['white-1']}
+        p="lg"
+        radius="md"
+        shadow="sm"
+        style={{ border: '1px solid #e0e0e0' }}
+      >
+        <Stack gap="md">
          <TextInput
+            label="Judul"
+            placeholder="Masukkan judul berita"
            value={beritaState.berita.create.form.judul}
-            onChange={(val) => {
-              beritaState.berita.create.form.judul = val.target.value;
-            }}
-            label={<Text fz={"sm"} fw={"bold"}>Judul</Text>}
-            placeholder="masukkan judul"
+            onChange={(e) => (beritaState.berita.create.form.judul = e.target.value)}
+            required
          />
+
          <Select
-            label={<Text fz={"sm"} fw={"bold"}>Kategori</Text>}
+            label="Kategori"
            placeholder="Pilih kategori"
            data={beritaState.kategoriBerita.findMany.data.map((item) => ({
              label: item.name,
@@ -93,85 +115,84 @@ export default function CreateBerita() {
            value={beritaState.berita.create.form.kategoriBeritaId || null}
            onChange={(val: string | null) => {
              if (val) {
-                const selected = beritaState.kategoriBerita.findMany.data?.find((item) => item.id === val);
+                const selected = beritaState.kategoriBerita.findMany.data?.find(
+                  (item) => item.id === val
+                );
                if (selected) {
                  beritaState.berita.create.form.kategoriBeritaId = selected.id;
                }
              } else {
-                beritaState.berita.create.form.kategoriBeritaId = "";
+                beritaState.berita.create.form.kategoriBeritaId = '';
              }
            }}
            searchable
            clearable
            nothingFoundMessage="Tidak ditemukan"
+            required
          />
+
          <TextInput
+            label="Deskripsi Singkat"
+            placeholder="Masukkan deskripsi berita"
            value={beritaState.berita.create.form.deskripsi}
-            onChange={(val) => {
-              beritaState.berita.create.form.deskripsi = val.target.value;
-            }}
-            label={<Text fz={"sm"} fw={"bold"}>Deskripsi</Text>}
-            placeholder="masukkan deskripsi"
+            onChange={(e) => (beritaState.berita.create.form.deskripsi = e.target.value)}
          />

          <Box>
-            <Text fz={"md"} fw={"bold"}>Gambar</Text>
-            <Box>
-              <Dropzone
-                onDrop={(files) => {
-                  const selectedFile = files[0]; // Ambil file pertama
-                  if (selectedFile) {
-                    setFile(selectedFile);
-                    setPreviewImage(URL.createObjectURL(selectedFile)); // Buat preview
-                  }
-                }}
-                onReject={() => toast.error('File tidak valid.')}
-                maxSize={5 * 1024 ** 2} // Maks 5MB
-                accept={{ 'image/*': [] }}
-              >
-                <Group justify="center" gap="xl" mih={220} style={{ pointerEvents: 'none' }}>
-                  <Dropzone.Accept>
-                    <IconUpload size={52} color="var(--mantine-color-blue-6)" stroke={1.5} />
-                  </Dropzone.Accept>
-                  <Dropzone.Reject>
-                    <IconX size={52} color="var(--mantine-color-red-6)" stroke={1.5} />
-                  </Dropzone.Reject>
-                  <Dropzone.Idle>
-                    <IconPhoto size={52} color="var(--mantine-color-dimmed)" stroke={1.5} />
-                  </Dropzone.Idle>
+            <Text fw="bold" fz="sm" mb={6}>
+              Gambar Berita
+            </Text>
+            <Dropzone
+              onDrop={(files) => {
+                const selectedFile = files[0];
+                if (selectedFile) {
+                  setFile(selectedFile);
+                  setPreviewImage(URL.createObjectURL(selectedFile));
+                }
+              }}
+              onReject={() => toast.error('File tidak valid, gunakan format gambar')}
+              maxSize={5 * 1024 ** 2}
+              accept={{ 'image/*': [] }}
+              radius="md"
+              p="xl"
+            >
+              <Group justify="center" gap="xl" mih={180}>
+                <Dropzone.Accept>
+                  <IconUpload size={48} color="var(--mantine-color-blue-6)" stroke={1.5} />
+                </Dropzone.Accept>
+                <Dropzone.Reject>
+                  <IconX size={48} color="var(--mantine-color-red-6)" stroke={1.5} />
+                </Dropzone.Reject>
+                <Dropzone.Idle>
+                  <IconPhoto size={48} color="var(--mantine-color-dimmed)" stroke={1.5} />
+                </Dropzone.Idle>
+              </Group>
+              <Text ta="center" mt="sm" size="sm" color="dimmed">
+                Seret gambar atau klik untuk memilih file (maks 5MB)
+              </Text>
+            </Dropzone>

-                  <div>
-                    <Text size="xl" inline>
-                      Drag gambar ke sini atau klik untuk pilih file
-                    </Text>
-                    <Text size="sm" c="dimmed" inline mt={7}>
-                      Maksimal 5MB dan harus format gambar
-                    </Text>
-                  </div>
-                </Group>
-              </Dropzone>
-
-              {/* Tampilkan preview kalau ada */}
-              {previewImage && (
-                <Box mt="sm">
-                  <Image
-                    src={previewImage}
-                    alt="Preview"
-                    style={{
-                      maxWidth: '100%',
-                      maxHeight: '200px',
-                      objectFit: 'contain',
-                      borderRadius: '8px',
-                      border: '1px solid #ddd',
-                    }}
-                  />
-                </Box>
-              )}
-
-            </Box>
+            {previewImage && (
+              <Box mt="sm" style={{ textAlign: 'center' }}>
+                <Image
+                  src={previewImage}
+                  alt="Preview Gambar"
+                  radius="md"
+                  style={{
+                    maxHeight: 200,
+                    objectFit: 'contain',
+                    border: '1px solid #ddd',
+                  }}
+                  loading="lazy"
+                />
+              </Box>
+            )}
          </Box>
+
          <Box>
-            <Text fz={"sm"} fw={"bold"}>Konten</Text>
+            <Text fz="sm" fw="bold" mb={6}>
+              Konten
+            </Text>
            <CreateEditor
              value={beritaState.berita.create.form.content}
              onChange={(htmlContent) => {
@@ -179,7 +200,21 @@ export default function CreateBerita() {
              }}
            />
          </Box>
-          <Button bg={colors['blue-button']} onClick={handleSubmit}>Simpan Berita</Button>
+
+          <Group justify="right">
+            <Button
+              onClick={handleSubmit}
+              radius="md"
+              size="md"
+              style={{
+                background: `linear-gradient(135deg, ${colors['blue-button']}, #4facfe)`,
+                color: '#fff',
+                boxShadow: '0 4px 15px rgba(79, 172, 254, 0.4)',
+              }}
+            >
+              Simpan
+            </Button>
+          </Group>
        </Stack>
      </Paper>
    </Box>
--- a/src/app/admin/(dashboard)/desa/berita/list-berita/page.tsx
+++ b/src/app/admin/(dashboard)/desa/berita/list-berita/page.tsx
@@ -1,6 +1,24 @@
 'use client'
 import colors from '@/con/colors';
-import { Box, Button, Center, Grid, GridCol, Image, Pagination, Paper, Skeleton, Stack, Table, TableTbody, TableTd, TableTh, TableThead, TableTr, Text } from '@mantine/core';
+import {
+  Box,
+  Button,
+  Center,
+  Group,
+  Pagination,
+  Paper,
+  Skeleton,
+  Stack,
+  Table,
+  TableTbody,
+  TableTd,
+  TableTh,
+  TableThead,
+  TableTr,
+  Text,
+  Title,
+  Tooltip
+} from '@mantine/core';
 import { useShallowEffect } from '@mantine/hooks';
 import { IconCircleDashedPlus, IconDeviceImacCog, IconSearch } from '@tabler/icons-react';
 import { useRouter } from 'next/navigation';
@@ -9,15 +27,13 @@ import { useProxy } from 'valtio/utils';
 import HeaderSearch from '../../../_com/header';
 import stateDashboardBerita from '../../../_state/desa/berita';

-
-
 function Berita() {
  const [search, setSearch] = useState("");
  return (
    <Box>
      <HeaderSearch
-        title='Berita'
-        placeholder='pencarian'
+        title="Berita"
+        placeholder="Cari judul atau kategori berita..."
        searchIcon={<IconSearch size={20} />}
        value={search}
        onChange={(e) => setSearch(e.currentTarget.value)}
@@ -28,103 +44,113 @@ function Berita() {
 }

 function ListBerita({ search }: { search: string }) {
-  const beritaState = useProxy(stateDashboardBerita)
-  const router = useRouter()
-  const {
-    data,
-    page,
-    totalPages,
-    loading,
-    load,
-  } = beritaState.berita.findMany;
+  const beritaState = useProxy(stateDashboardBerita);
+  const router = useRouter();

+  const { data, page, totalPages, loading, load } = beritaState.berita.findMany;

-  // Fetch data when page or search changes
  useShallowEffect(() => {
    load(page, 10, search);
  }, [page, search]);

  if (loading || !data) {
-    return <Skeleton h={500} />;
+    return (
+      <Stack py={10}>
+        <Skeleton height={600} radius="md" />
+      </Stack>
+    );
  }

  const filteredData = data || [];

  return (
    <Box py={10}>
-      <Paper bg={colors["white-1"]} p={"md"}>
-        <Stack>
-          <Grid>
-            <GridCol span={{ base: 12, md: 11 }}>
-              <Text fz={"xl"} fw={"bold"}>
-                List Berita
-              </Text>
-            </GridCol>
-            <GridCol span={{ base: 12, md: 1 }}>
-              <Button
-                onClick={() => router.push("/admin/desa/berita/list-berita/create")}
-                bg={colors["blue-button"]}
-              >
-                <IconCircleDashedPlus size={25} />
-              </Button>
-            </GridCol>
-          </Grid>
-          <Box style={{ overflowX: "auto" }}>
-            <Table
-              striped
-              withRowBorders
-              withTableBorder
-              style={{ minWidth: "700px" }}
+      <Paper withBorder bg={colors['white-1']} p="lg" shadow="md" radius="md">
+        <Group justify="space-between" mb="md">
+          <Title order={4}>Daftar Berita</Title>
+          <Tooltip label="Tambah Berita" withArrow>
+            <Button
+              leftSection={<IconCircleDashedPlus size={18} />}
+              color="blue"
+              variant="light"
+              onClick={() => router.push('/admin/desa/berita/list-berita/create')}
            >
-              <TableThead>
-                <TableTr>
-                  <TableTh w={250}>Judul</TableTh>
-                  <TableTh w={250}>Kategori</TableTh>
-                  <TableTh w={250}>Image</TableTh>
-                  <TableTh w={200}>Detail</TableTh>
-                </TableTr>
-              </TableThead>
-              <TableTbody>
-                {filteredData.map((item) => (
+              Tambah Baru
+            </Button>
+          </Tooltip>
+        </Group>
+
+        <Box style={{ overflowX: 'auto' }}>
+          <Table highlightOnHover>
+            <TableThead>
+              <TableTr>
+                <TableTh style={{ width: '30%' }}>Judul</TableTh>
+                <TableTh style={{ width: '20%' }}>Kategori</TableTh>
+                <TableTh style={{ width: '15%' }}>Aksi</TableTh>
+              </TableTr>
+            </TableThead>
+            <TableTbody>
+              {filteredData.length > 0 ? (
+                filteredData.map((item) => (
                  <TableTr key={item.id}>
-                    <TableTd>
-                      <Box w={100}>
-                        <Text truncate="end" fz={"sm"}>
+                    <TableTd style={{ width: '30%' }}>
+                      <Box w={150}>
+                        <Text fw={500} truncate="end" lineClamp={1}>
                          {item.judul}
                        </Text>
                      </Box>
                    </TableTd>
-                    <TableTd>{item.kategoriBerita?.name}</TableTd>
-                    <TableTd>
-                      <Image w={100} src={item.image?.link} alt="gambar" />
+                    <TableTd style={{ width: '20%' }}>
+                      <Text fz="sm" c="dimmed">
+                        {item.kategoriBerita?.name || '-'}
+                      </Text>
                    </TableTd>
-                    <TableTd>
+                    <TableTd style={{ width: '15%' }}>
                      <Button
-                        bg={"green"}
+                        variant="light"
+                        color="blue"
                        onClick={() =>
                          router.push(`/admin/desa/berita/list-berita/${item.id}`)
                        }
                      >
-                        <IconDeviceImacCog size={25} />
+                        <IconDeviceImacCog size={20} />
+                        <Text ml={5}>Detail</Text>
                      </Button>
                    </TableTd>
                  </TableTr>
-                ))}
-              </TableTbody>
-            </Table>
-          </Box>
-        </Stack>
+                ))
+              ) : (
+                <TableTr>
+                  <TableTd colSpan={4}>
+                    <Center py={20}>
+                      <Text color="dimmed">
+                        Tidak ada data berita yang cocok
+                      </Text>
+                    </Center>
+                  </TableTd>
+                </TableTr>
+              )}
+            </TableTbody>
+          </Table>
+        </Box>
      </Paper>
+
      <Center>
        <Pagination
          value={page}
-          onChange={(newPage) => load(newPage)} // ini penting!
+          onChange={(newPage) => {
+            load(newPage, 10);
+            window.scrollTo({ top: 0, behavior: 'smooth' });
+          }}
          total={totalPages}
          mt="md"
          mb="md"
+          color="blue"
+          radius="md"
        />
      </Center>
    </Box>
  );
 }
+
 export default Berita;
--- a/src/app/admin/(dashboard)/desa/gallery/foto/[id]/edit/page.tsx
+++ b/src/app/admin/(dashboard)/desa/gallery/foto/[id]/edit/page.tsx
@@ -1,161 +0,0 @@
-'use client'
-/* eslint-disable react-hooks/exhaustive-deps */
-import EditEditor from '@/app/admin/(dashboard)/_com/editEditor';
-import stateGallery from '@/app/admin/(dashboard)/_state/desa/gallery';
-import colors from '@/con/colors';
-import ApiFetch from '@/lib/api-fetch';
-import { Box, Button, Center, Group, Image, Paper, Stack, Text, TextInput, Title } from '@mantine/core';
-import { Dropzone } from '@mantine/dropzone';
-import { IconArrowBack, IconImageInPicture, IconPhoto, IconUpload, IconX } from '@tabler/icons-react';
-import { useParams, useRouter } from 'next/navigation';
-import { useEffect, useState } from 'react';
-import { toast } from 'react-toastify';
-import { useProxy } from 'valtio/utils';
-
-
-function EditFoto() {
-  const fotoState = useProxy(stateGallery.foto)
-  const router = useRouter();
-  const params = useParams();
-  const [previewImage, setPreviewImage] = useState<string | null>(null);
-  const [file, setFile] = useState<File | null>(null);
-  const [formData, setFormData] = useState({
-    name: fotoState.update.form.name || '',
-    deskripsi: fotoState.update.form.deskripsi || '',
-    imagesId: fotoState.update.form.imagesId || ''
-  });
-
-  useEffect(() => {
-    const loadFoto = async () => {
-      const id = params?.id as string;
-      if (!id) return;
-      try {
-        const data = await fotoState.update.load(id);
-        if (data) {
-          setFormData({
-            name: data.name || '',
-            deskripsi: data.deskripsi || '',
-            imagesId: data.imageGalleryFoto?.id || ''
-          });
-          if (data?.imageGalleryFoto?.link) {
-            setPreviewImage(data.imageGalleryFoto.link);
-          }
-        }
-      } catch (error) {
-        console.error('Error loading foto:', error);
-        toast.error('Gagal memuat data foto');
-      }
-    };
-    loadFoto();
-  }, [params?.id]);
-
-  const handleSubmit = async () => {
-    try {
-      fotoState.update.form = {
-        ...fotoState.update.form,
-        name: formData.name,
-        deskripsi: formData.deskripsi,
-        imagesId: formData.imagesId
-      };
-      if (file) {
-        const res = await ApiFetch.api.fileStorage.create.post({
-          file,
-          name: file.name,
-        });
-        const uploaded = res.data?.data;
-        if (!uploaded?.id) {
-          return toast.error("Gagal upload gambar");
-        }
-        fotoState.update.form.imagesId = uploaded.id;
-      }
-      await fotoState.update.update();
-      toast.success('Foto berhasil diperbarui!');
-      router.push('/admin/desa/gallery/foto');
-    } catch (error) {
-      console.error('Error updating foto:', error);
-      toast.error('Terjadi kesalahan saat memperbarui foto');
-    }
-  };
-
-  return (
-    <Box>
-      <Box mb={10}>
-        <Button onClick={() => router.back()} variant='subtle' color={'blue'}>
-          <IconArrowBack color={colors['blue-button']} size={25} />
-        </Button>
-      </Box>
-
-      <Paper w={{ base: '100%', md: '50%' }} bg={colors['white-1']} p={'md'}>
-        <Stack gap={"xs"}>
-          <Title order={4}>Edit Foto</Title>
-          <TextInput
-            label={<Text fw={"bold"} fz={"sm"}>Judul Foto</Text>}
-            placeholder='Masukkan judul foto'
-            value={formData.name}
-            onChange={(e) =>
-              (formData.name = e.target.value)
-            }
-          />
-          <Box>
-            <Text>Upload Foto</Text>
-            <Dropzone
-              onDrop={(files) => {
-                const selectedFile = files[0]; // Ambil file pertama
-                if (selectedFile) {
-                  setFile(selectedFile);
-                  setPreviewImage(URL.createObjectURL(selectedFile)); // Buat preview
-                }
-              }}
-              onReject={() => toast.error('File tidak valid.')}
-              maxSize={5 * 1024 ** 2} // Maks 5MB
-              accept={{ 'image/*': [] }}
-            >
-              <Group justify="center" gap="xl" mih={220} style={{ pointerEvents: 'none' }}>
-                <Dropzone.Accept>
-                  <IconUpload size={52} color="var(--mantine-color-blue-6)" stroke={1.5} />
-                </Dropzone.Accept>
-                <Dropzone.Reject>
-                  <IconX size={52} color="var(--mantine-color-red-6)" stroke={1.5} />
-                </Dropzone.Reject>
-                <Dropzone.Idle>
-                  <IconPhoto size={52} color="var(--mantine-color-dimmed)" stroke={1.5} />
-                </Dropzone.Idle>
-
-                <div>
-                  <Text size="xl" inline>
-                    Drag gambar ke sini atau klik untuk pilih file
-                  </Text>
-                  <Text size="sm" c="dimmed" inline mt={7}>
-                    Maksimal 5MB dan harus format gambar
-                  </Text>
-                </div>
-              </Group>
-            </Dropzone>
-
-            {previewImage ? (
-              <Image alt="" src={previewImage} w={200} h={200} />
-            ) : (
-              <Center w={200} h={200} bg={"gray"}>
-                <IconImageInPicture />
-              </Center>
-            )}
-          </Box>
-          <Box>
-            <Text fw={"bold"} fz={"sm"}>Deskripsi Foto</Text>
-            <EditEditor
-              value={fotoState.update.form.deskripsi}
-              onChange={(val) => {
-                fotoState.update.form.deskripsi = val;
-              }}
-            />
-          </Box>
-          <Group>
-            <Button onClick={handleSubmit} bg={colors['blue-button']}>Submit</Button>
-          </Group>
-        </Stack>
-      </Paper>
-    </Box>
-  );
-}
-
-export default EditFoto;
--- a/src/app/admin/(dashboard)/desa/gallery/foto/[id]/page.tsx
+++ b/src/app/admin/(dashboard)/desa/gallery/foto/[id]/page.tsx
@@ -1,112 +0,0 @@
-'use client'
-import stateGallery from '@/app/admin/(dashboard)/_state/desa/gallery';
-import React from 'react';
-import { useProxy } from 'valtio/utils';
-import { useState } from 'react';
-import { useParams, useRouter } from 'next/navigation';
-import { useShallowEffect } from '@mantine/hooks';
-import { Box, Button, Flex, Image, Paper, Skeleton, Stack, Text } from '@mantine/core';
-import { IconArrowBack, IconEdit, IconX } from '@tabler/icons-react';
-import colors from '@/con/colors';
-import { ModalKonfirmasiHapus } from '@/app/admin/(dashboard)/_com/modalKonfirmasiHapus';
-
-function DetailFoto() {
-  const fotoState = useProxy(stateGallery.foto)
-  const [modalHapus, setModalHapus] = useState(false);
-  const [selectedId, setSelectedId] = useState<string | null>(null)
-  const params = useParams()
-  const router = useRouter()
-
-  useShallowEffect(() => {
-    fotoState.findUnique.load(params?.id as string)
-  }, [])
-
-  const handleHapus = () => {
-    if (selectedId) {
-      fotoState.delete.byId(selectedId)
-      setModalHapus(false)
-      setSelectedId(null)
-      router.push("/admin/desa/gallery/foto")
-    }
-  }
-
-  if (!fotoState.findUnique.data) {
-    return (
-      <Stack py={10}>
-        <Skeleton h={500} />
-      </Stack>
-    )
-  }
-
-  return (
-    <Box>
-      <Box mb={10}>
-        <Button variant="subtle" onClick={() => router.back()}>
-          <IconArrowBack color={colors['blue-button']} size={25} />
-        </Button>
-      </Box>
-      <Paper bg={colors['white-1']} w={{ base: "100%", md: "100%", lg: "50%" }} p={'md'}>
-        <Stack>
-          <Text fz={"xl"} fw={"bold"}>Detail Foto</Text>
-          {fotoState.findUnique.data ? (
-            <Paper key={fotoState.findUnique.data.id} bg={colors['BG-trans']} p={'md'}>
-              <Stack gap={"xs"}>
-                <Box>
-                  <Text fw={"bold"} fz={"lg"}>Judul</Text>
-                  <Text fz={"lg"}>{fotoState.findUnique.data?.name}</Text>
-                </Box>
-                <Box>
-                  <Text fw={"bold"} fz={"lg"}>Tanggal Foto</Text>
-                  <Text fz={"lg"}>{new Date(fotoState.findUnique.data?.createdAt).toDateString()}</Text>
-                </Box>
-                <Box>
-                  <Text fw={"bold"} fz={"lg"}>Deskripsi</Text>
-                  <Text fz={"lg"} dangerouslySetInnerHTML={{ __html: fotoState.findUnique.data?.deskripsi }} />
-                </Box>
-                <Box>
-                  <Text fw={"bold"} fz={"lg"}>Gambar</Text>
-                  <Image w={{ base: 300, md: 350}} src={fotoState.findUnique.data?.imageGalleryFoto?.link} alt="gambar" />
-                </Box>
-                <Flex gap={"xs"} mt={10}>
-                  <Button
-                    onClick={() => {
-                      if (fotoState.findUnique.data) {
-                        setSelectedId(fotoState.findUnique.data.id);
-                        setModalHapus(true);
-                      }
-                    }}
-                    disabled={fotoState.delete.loading || !fotoState.findUnique.data}
-                    color={"red"}
-                  >
-                    <IconX size={20} />
-                  </Button>
-                  <Button
-                    onClick={() => {
-                      if (fotoState.findUnique.data) {
-                        router.push(`/admin/desa/gallery/foto/${fotoState.findUnique.data.id}/edit`);
-                      }
-                    }}
-                    disabled={!fotoState.findUnique.data}
-                    color={"green"}
-                  >
-                    <IconEdit size={20} />
-                  </Button>
-                </Flex>
-              </Stack>
-            </Paper>
-          ) : null}
-        </Stack>
-      </Paper>
-
-      {/* Modal Konfirmasi Hapus */}
-      <ModalKonfirmasiHapus
-        opened={modalHapus}
-        onClose={() => setModalHapus(false)}
-        onConfirm={handleHapus}
-        text='Apakah anda yakin ingin menghapus berita ini?'
-      />
-    </Box>
-  );
-}
-
-export default DetailFoto;
--- a/src/app/admin/(dashboard)/desa/gallery/foto/create/page.tsx
+++ b/src/app/admin/(dashboard)/desa/gallery/foto/create/page.tsx
@@ -1,147 +0,0 @@
-'use client'
-import CreateEditor from '@/app/admin/(dashboard)/_com/createEditor';
-import stateGallery from '@/app/admin/(dashboard)/_state/desa/gallery';
-import colors from '@/con/colors';
-import ApiFetch from '@/lib/api-fetch';
-import { Box, Button, Group, Image, Paper, Stack, Text, TextInput, Title } from '@mantine/core';
-import { Dropzone } from '@mantine/dropzone';
-import { IconArrowBack, IconPhoto, IconUpload, IconX } from '@tabler/icons-react';
-import { useRouter } from 'next/navigation';
-import { useState } from 'react';
-import { toast } from 'react-toastify';
-import { useProxy } from 'valtio/utils';
-
-
-
-function CreateFoto() {
-  const fotoState = useProxy(stateGallery.foto)
-  const router = useRouter();
-  const [previewImage, setPreviewImage] = useState<string | null>(null);
-  const [file, setFile] = useState<File | null>(null);
-
-  const resetForm = () => {
-    fotoState.create.form = {
-      name: "",
-      deskripsi: "",
-      imagesId: "",
-    };
-
-    setPreviewImage(null)
-    setFile(null)
-  };
-
-  const handleSubmit = async () => {
-    if (!file) {
-      return toast.warn("Pilih file gambar terlebih dahulu");
-    }
-
-    const res = await ApiFetch.api.fileStorage.create.post({
-      file,
-      name: file.name,
-    });
-
-    const uploaded = res.data?.data;
-    if (!uploaded?.id) {
-      return toast.error("Gagal upload gambar");
-    }
-
-    fotoState.create.form.imagesId = uploaded.id;
-    await fotoState.create.create();
-    resetForm();
-    router.push("/admin/desa/gallery/foto")
-  };
-
-  return (
-    <Box>
-      <Box mb={10}>
-        <Button onClick={() => router.back()} variant='subtle' color={'blue'}>
-          <IconArrowBack color={colors['blue-button']} size={25} />
-        </Button>
-      </Box>
-
-      <Paper w={{ base: '100%', md: '50%' }} bg={colors['white-1']} p={'md'}>
-        <Stack gap={"xs"}>
-          <Title order={4}>Create Foto</Title>
-          <TextInput
-            label={<Text fw={"bold"} fz={"sm"}>Judul Foto</Text>}
-            placeholder='Masukkan judul foto'
-            value={fotoState.create.form.name}
-            onChange={(val) => {
-              fotoState.create.form.name = val.target.value;
-            }}
-          />
-          <Box>
-            <Text fz={"md"} fw={"bold"}>Gambar</Text>
-            <Box>
-              <Dropzone
-                onDrop={(files) => {
-                  const selectedFile = files[0]; // Ambil file pertama
-                  if (selectedFile) {
-                    setFile(selectedFile);
-                    setPreviewImage(URL.createObjectURL(selectedFile)); // Buat preview
-                  }
-                }}
-                onReject={() => toast.error('File tidak valid.')}
-                maxSize={5 * 1024 ** 2} // Maks 5MB
-                accept={{ 'image/*': [] }}
-              >
-                <Group justify="center" gap="xl" mih={220} style={{ pointerEvents: 'none' }}>
-                  <Dropzone.Accept>
-                    <IconUpload size={52} color="var(--mantine-color-blue-6)" stroke={1.5} />
-                  </Dropzone.Accept>
-                  <Dropzone.Reject>
-                    <IconX size={52} color="var(--mantine-color-red-6)" stroke={1.5} />
-                  </Dropzone.Reject>
-                  <Dropzone.Idle>
-                    <IconPhoto size={52} color="var(--mantine-color-dimmed)" stroke={1.5} />
-                  </Dropzone.Idle>
-
-                  <div>
-                    <Text size="xl" inline>
-                      Drag gambar ke sini atau klik untuk pilih file
-                    </Text>
-                    <Text size="sm" c="dimmed" inline mt={7}>
-                      Maksimal 5MB dan harus format gambar
-                    </Text>
-                  </div>
-                </Group>
-              </Dropzone>
-
-              {/* Tampilkan preview kalau ada */}
-              {previewImage && (
-                <Box mt="sm">
-                  <Image
-                    src={previewImage}
-                    alt="Preview"
-                    style={{
-                      maxWidth: '100%',
-                      maxHeight: '200px',
-                      objectFit: 'contain',
-                      borderRadius: '8px',
-                      border: '1px solid #ddd',
-                    }}
-                  />
-                </Box>
-              )}
-
-            </Box>
-          </Box>
-          <Box>
-            <Text fw={"bold"} fz={"sm"}>Deskripsi Foto</Text>
-            <CreateEditor
-              value={fotoState.create.form.deskripsi}
-              onChange={(val) => {
-                fotoState.create.form.deskripsi = val;
-              }}
-            />
-          </Box>
-          <Group>
-            <Button onClick={handleSubmit} bg={colors['blue-button']}>Submit</Button>
-          </Group>
-        </Stack>
-      </Paper>
-    </Box>
-  );
-}
-
-export default CreateFoto;
--- a/src/app/admin/(dashboard)/desa/gallery/foto/page.tsx
+++ b/src/app/admin/(dashboard)/desa/gallery/foto/page.tsx
@@ -1,9 +1,9 @@
 "use client";
-import colors from "@/con/colors";
 import stateFileStorage from "@/state/state-list-image";
 import {
  ActionIcon,
  Box,
+  Card,
  Flex,
  Group,
  Image,
@@ -13,7 +13,8 @@ import {
  Stack,
  Text,
  TextInput,
-  Title
+  Title,
+  Tooltip,
 } from "@mantine/core";
 import { useShallowEffect } from "@mantine/hooks";
 import { IconSearch, IconTrash, IconX } from "@tabler/icons-react";
@@ -29,95 +30,130 @@ export default function ListImage() {
  }, []);

  let timeOut: NodeJS.Timer;
+
  return (
-    <Stack p={"lg"}>
-      <Flex justify="space-between">
-        <Title order={3}>List Foto</Title>
+    <Stack p="lg" gap="lg">
+      <Flex justify="space-between" align="center" wrap="wrap" gap="md">
+        <Title order={2} fw={700}>
+          Galeri Foto
+        </Title>
        <TextInput
-          radius={"lg"}
-          leftSection={<IconSearch />}
+          radius="xl"
+          size="md"
+          placeholder="Cari foto berdasarkan nama..."
+          leftSection={<IconSearch size={18} />}
          rightSection={
            <ActionIcon
-              variant="transparent"
-              onClick={() => {
-                stateFileStorage.load();
-              }}
+              variant="light"
+              color="gray"
+              radius="xl"
+              onClick={() => stateFileStorage.load()}
            >
-              <IconX />
+              <IconX size={18} />
            </ActionIcon>
          }
-          placeholder="Pencarian"
          onChange={(e) => {
            if (timeOut) clearTimeout(timeOut);
            timeOut = setTimeout(() => {
              stateFileStorage.load({ search: e.target.value });
-            }, 200);
+            }, 300);
          }}
        />
      </Flex>
-      <Paper bg={colors['white-1']} p={'md'}>
-        <SimpleGrid
-          cols={{
-            base: 3,
-            md: 5,
-            lg: 10,
-          }}
-        >
-          {list &&
-            list.map((v, k) => {
-              return (
-                <Paper key={k} shadow="sm">
-                  <Stack pos={"relative"} gap={0} justify="space-between">
-                    <motion.div
-                      onClick={() => {
-                        // copy to clipboard
-                        navigator.clipboard.writeText(v.url);
-                        toast("Berhasil disalin");
-                      }}
-                      whileHover={{ scale: 1.05 }}
-                      whileTap={{ scale: 0.8 }}
-                    >
-                      <Image
-                        h={100}
-                        src={v.url + "?size=100"}
-                        alt={v.name}
-                        fit="cover"
-                        loading="lazy"
-                        style={{
-                          objectFit: "cover",
-                          objectPosition: "center",
-                        }}
-                      />
-                    </motion.div>
-                    <Box p={"md"} h={54}>
-                      <Text lineClamp={2} fz={"xs"}>
-                        {v.name}
-                      </Text>
-                    </Box>
-                    <Group justify="end">
-                        <IconTrash
+
+      <Paper withBorder radius="lg" p="md" shadow="sm">
+        {list && list.length > 0 ? (
+          <SimpleGrid
+            cols={{ base: 2, sm: 3, md: 5, lg: 8 }}
+            spacing="md"
+            verticalSpacing="md"
+          >
+            {list.map((v, k) => (
+              <Card
+                key={k}
+                withBorder
+                radius="md"
+                shadow="sm"
+                className="hover:shadow-md transition-all duration-200"
+              >
+                <Stack gap="xs">
+                  <motion.div
+                    onClick={() => {
+                      navigator.clipboard.writeText(v.url);
+                      toast("Tautan foto berhasil disalin");
+                    }}
+                    whileHover={{ scale: 1.05 }}
+                    whileTap={{ scale: 0.95 }}
+                    style={{ cursor: "pointer" }}
+                  >
+                    <Image
+                      src={`${v.url}?size=200`}
+                      alt={v.name}
+                      radius="md"
+                      h={120}
+                      fit="cover"
+                      loading="lazy"
+                    />
+                  </motion.div>
+
+                  <Box>
+                    <Text size="sm" fw={500} lineClamp={2}>
+                      {v.name}
+                    </Text>
+                  </Box>
+
+                  <Group justify="space-between" align="center" pt="xs">
+                    <Tooltip label="Hapus foto" withArrow>
+                      <ActionIcon
+                        variant="subtle"
                        color="red"
-                          onClick={() => {
-                            stateFileStorage.del({ name: v.name }).finally(() => {
-                              toast("Berhasil dihapus");
-                            });
-                          }}
-                        />
-                    </Group>
-                  </Stack>
-                </Paper>
-              );
-            })}
-        </SimpleGrid>
+                        radius="md"
+                        onClick={() => {
+                          stateFileStorage
+                            .del({ id: v.id })
+                            .finally(() => toast("Foto berhasil dihapus"));
+                        }}
+                      >
+                        <IconTrash size={18} />
+                      </ActionIcon>
+                    </Tooltip>
+                  </Group>
+                </Stack>
+              </Card>
+            ))}
+          </SimpleGrid>
+        ) : (
+          <Stack align="center" justify="center" py="xl" gap="sm">
+            <Image
+              src="https://cdn-icons-png.flaticon.com/512/4076/4076549.png"
+              alt="Kosong"
+              w={120}
+              h={120}
+              fit="contain"
+              opacity={0.7}
+              loading="lazy"
+            />
+            <Text c="dimmed" ta="center">
+              Belum ada foto yang tersedia
+            </Text>
+          </Stack>
+        )}
      </Paper>
-      {total && (
-        <Pagination
-          total={total}
-          onChange={(e) => {
-            stateFileStorage.page = e;
-            stateFileStorage.load();
-          }}
-        />
+
+      {total && total > 1 && (
+        <Flex justify="center">
+          <Pagination
+            total={total}
+            value={stateFileStorage.page}  // Changed from page to value
+            size="md"
+            radius="md"
+            withEdges
+            onChange={(page) => {
+              stateFileStorage.load({ page });
+            }}
+          />
+
+        </Flex>
      )}
    </Stack>
  );
--- a/src/app/admin/(dashboard)/desa/gallery/lib/layoutTabs.tsx
+++ b/src/app/admin/(dashboard)/desa/gallery/lib/layoutTabs.tsx
@@ -1,9 +1,10 @@
 /* eslint-disable react-hooks/exhaustive-deps */
 'use client'
 import colors from '@/con/colors';
-import { Stack, Tabs, TabsList, TabsPanel, TabsTab, Title } from '@mantine/core';
+import { ScrollArea, Stack, Tabs, TabsList, TabsPanel, TabsTab, Title, Tooltip } from '@mantine/core';
 import { usePathname, useRouter } from 'next/navigation';
 import React, { useEffect, useState } from 'react';
+import { IconPhoto, IconVideo } from '@tabler/icons-react';

 function LayoutTabsGallery({ children }: { children: React.ReactNode }) {
    const router = useRouter()
@@ -12,16 +13,21 @@ function LayoutTabsGallery({ children }: { children: React.ReactNode }) {
        {
            label: "Foto",
            value: "foto",
-            href: "/admin/desa/gallery/foto"
+            href: "/admin/desa/gallery/foto",
+            icon: <IconPhoto size={18} stroke={1.8} />,
+            tooltip: "Kelola foto-foto galeri desa"
        },
        {
            label: "Video",
            value: "video",
-            href: "/admin/desa/gallery/video"
+            href: "/admin/desa/gallery/video",
+            icon: <IconVideo size={18} stroke={1.8} />,
+            tooltip: "Kelola video galeri desa"
        },
    ];
-    const curentTab = tabs.find(tab => tab.href === pathname)
-    const [activeTab, setActiveTab] = useState<string | null>(curentTab?.value || tabs[0].value);
+
+    const currentTab = tabs.find(tab => tab.href === pathname)
+    const [activeTab, setActiveTab] = useState<string | null>(currentTab?.value || tabs[0].value);

    const handleTabChange = (value: string | null) => {
        const tab = tabs.find(t => t.value === value)
@@ -39,24 +45,71 @@ function LayoutTabsGallery({ children }: { children: React.ReactNode }) {
    }, [pathname])

    return (
-        <Stack>
-            <Title order={3}>Gallery</Title>
-            <Tabs color={colors['blue-button']} variant='pills' value={activeTab} onChange={handleTabChange}>
-                <TabsList p={"xs"} bg={"#BBC8E7FF"}>
-                    {tabs.map((e, i) => (
-                        <TabsTab key={i} value={e.value}>{e.label}</TabsTab>
-                    ))}
-                </TabsList>
-                {tabs.map((e, i) => (
-                    <TabsPanel key={i} value={e.value}>
-                        {/* Konten dummy, bisa diganti tergantung routing */}
-                        <></>
+        <Stack gap="lg">
+            <Title order={3} fw={700} style={{ color: "#1A1B1E" }}>Gallery</Title>
+            <Tabs
+                color={colors["blue-button"]}
+                variant="pills"
+                value={activeTab}
+                onChange={handleTabChange}
+                radius="lg"
+                keepMounted={false}
+            >
+                {/* ✅ Scroll horizontal wrapper */}
+                <ScrollArea type="auto" offsetScrollbars>
+                    <TabsList
+                        p="sm"
+                        style={{
+                            background: "linear-gradient(135deg, #e7ebf7, #f9faff)",
+                            borderRadius: "1rem",
+                            boxShadow: "inset 0 0 10px rgba(0,0,0,0.05)",
+                            display: "flex",
+                            flexWrap: "nowrap",
+                            gap: "0.5rem",
+                            paddingInline: "0.5rem", // ✅ biar nggak nempel ke tepi
+                        }}
+                    >
+                        {tabs.map((tab, i) => (
+                            <Tooltip
+                                key={i}
+                                label={tab.tooltip}
+                                position="bottom"
+                                withArrow
+                                transitionProps={{ transition: 'pop', duration: 200 }}
+                            >
+                                <TabsTab
+                                    value={tab.value}
+                                    leftSection={tab.icon}
+                                    style={{
+                                        fontWeight: 600,
+                                        fontSize: "0.9rem",
+                                        transition: "all 0.2s ease",
+                                    }}
+                                >
+                                    {tab.label}
+                                </TabsTab>
+                            </Tooltip>
+                        ))}
+                    </TabsList>
+                </ScrollArea>
+
+                {tabs.map((tab, i) => (
+                    <TabsPanel
+                        key={i}
+                        value={tab.value}
+                        style={{
+                            padding: "1.5rem",
+                            background: "linear-gradient(180deg, #ffffff, #f5f6fa)",
+                            borderRadius: "1rem",
+                            boxShadow: "0 4px 16px rgba(0,0,0,0.05)",
+                        }}
+                    >
+                        <>{children}</>
                    </TabsPanel>
                ))}
            </Tabs>
-            {children}
        </Stack>
    );
 }

-export default LayoutTabsGallery;
+export default LayoutTabsGallery;
--- a/src/app/admin/(dashboard)/desa/gallery/video/[id]/edit/page.tsx
+++ b/src/app/admin/(dashboard)/desa/gallery/video/[id]/edit/page.tsx
@@ -3,7 +3,16 @@
 import EditEditor from '@/app/admin/(dashboard)/_com/editEditor';
 import stateGallery from '@/app/admin/(dashboard)/_state/desa/gallery';
 import colors from '@/con/colors';
-import { Box, Button, Group, Paper, Stack, Text, TextInput, Title } from '@mantine/core';
+import {
+  Box,
+  Button,
+  Group,
+  Paper,
+  Stack,
+  TextInput,
+  Title,
+  Tooltip
+} from '@mantine/core';
 import { IconArrowBack } from '@tabler/icons-react';
 import { useParams, useRouter } from 'next/navigation';
 import { useEffect, useState } from 'react';
@@ -12,9 +21,9 @@ import { useProxy } from 'valtio/utils';
 import { convertYoutubeUrlToEmbed } from '../../../lib/youtube-utils';

 function EditVideo() {
-  const router = useRouter(); 
-  const videoState = useProxy(stateGallery.video)
-  const params = useParams()
+  const router = useRouter();
+  const videoState = useProxy(stateGallery.video);
+  const params = useParams();

  const [formData, setFormData] = useState({
    name: '',
@@ -30,7 +39,7 @@ function EditVideo() {
        const data = await videoState.update.load(id);
        if (data) {
          setFormData({
-            name: data.name || '',    
+            name: data.name || '',
            deskripsi: data.deskripsi || '',
            linkVideo: data.linkVideo || '',
          });
@@ -66,27 +75,36 @@ function EditVideo() {
      console.error('Error updating video:', error);
      toast.error('Terjadi kesalahan saat memperbarui video');
    }
-  }
+  };

  return (
-    <Box>
-      <Box mb={10}>
-        <Button onClick={() => router.back()} variant='subtle' color={'blue'}>
-          <IconArrowBack color={colors['blue-button']} size={25} />
-        </Button>
-      </Box>
-
-      <Paper w={{ base: '100%', md: '50%' }} bg={colors['white-1']} p={'md'}>
-        <Stack gap={"xs"}>
-          <Title order={4}>Edit Video</Title>
+    <Box px={{ base: 'sm', md: 'lg' }} py="md">
+      <Group mb="md">
+        <Tooltip label="Kembali ke halaman sebelumnya" withArrow>
+          <Button variant="subtle" onClick={() => router.back()} p="xs" radius="md">
+            <IconArrowBack color={colors['blue-button']} size={24} />
+          </Button>
+        </Tooltip>
+        <Title order={4} ml="sm" c="dark">
+          Edit Video
+        </Title>
+      </Group>

+      <Paper
+        w={{ base: '100%', md: '50%' }}
+        bg={colors['white-1']}
+        p="lg"
+        radius="md"
+        shadow="sm"
+        style={{ border: '1px solid #e0e0e0' }}
+      >
+        <Stack gap="md">
          <TextInput
-            label={<Text fw={"bold"} fz={"sm"}>Judul Video</Text>}
-            placeholder='Masukkan judul video'
+            label="Judul Video"
+            placeholder="Masukkan judul video"
            value={formData.name}
-            onChange={(val) => {
-              setFormData({ ...formData, name: val.target.value });
-            }}
+            onChange={(e) => setFormData({ ...formData, name: e.target.value })}
+            required
          />

          <Box>
@@ -94,36 +112,46 @@ function EditVideo() {
              label="Link Video YouTube"
              placeholder="https://www.youtube.com/watch?v=abc123"
              value={formData.linkVideo}
-              onChange={(e) => {
-                setFormData({ ...formData, linkVideo: e.currentTarget.value });
-              }}
+              onChange={(e) => setFormData({ ...formData, linkVideo: e.currentTarget.value })}
              required
            />
-
            {embedLink && (
-              <iframe
-                className="rounded"
-                width="100%"
-                height="200"
-                src={embedLink}
-                title="Preview Video"
-                allowFullScreen
-              ></iframe>
+              <Box mt="sm" style={{ display: 'flex', justifyContent: 'center' }}>
+                <iframe
+                  className="rounded"
+                  width="100%"
+                  height="220"
+                  src={embedLink}
+                  title="Preview Video"
+                  allowFullScreen
+                ></iframe>
+              </Box>
            )}
          </Box>

          <Box>
-            <Text fw={"bold"} fz={"sm"}>Deskripsi Video</Text>
+            <Title order={6} fw="bold" fz="sm" mb={6}>
+              Deskripsi Video
+            </Title>
            <EditEditor
              value={formData.deskripsi}
-              onChange={(val) => {
-                setFormData({ ...formData, deskripsi: val });
-              }}
+              onChange={(val) => setFormData({ ...formData, deskripsi: val })}
            />
          </Box>

-          <Group>
-            <Button onClick={handleSubmit} bg={colors['blue-button']}>Submit</Button>
+          <Group justify="right">
+            <Button
+              onClick={handleSubmit}
+              radius="md"
+              size="md"
+              style={{
+                background: `linear-gradient(135deg, ${colors['blue-button']}, #4facfe)`,
+                color: '#fff',
+                boxShadow: '0 4px 15px rgba(79, 172, 254, 0.4)',
+              }}
+            >
+              Simpan
+            </Button>
          </Group>
        </Stack>
      </Paper>
--- a/src/app/admin/(dashboard)/desa/gallery/video/[id]/page.tsx
+++ b/src/app/admin/(dashboard)/desa/gallery/video/[id]/page.tsx
@@ -2,107 +2,145 @@
 import { ModalKonfirmasiHapus } from '@/app/admin/(dashboard)/_com/modalKonfirmasiHapus';
 import stateGallery from '@/app/admin/(dashboard)/_state/desa/gallery';
 import colors from '@/con/colors';
-import { Box, Button, Flex, Paper, Skeleton, Stack, Text } from '@mantine/core';
+import { Box, Button, Group, Paper, Skeleton, Stack, Text, Tooltip } from '@mantine/core';
 import { useShallowEffect } from '@mantine/hooks';
-import { IconArrowBack, IconEdit, IconX } from '@tabler/icons-react';
+import { IconArrowBack, IconEdit, IconTrash } from '@tabler/icons-react';
 import { useParams, useRouter } from 'next/navigation';
 import { useState } from 'react';
 import { useProxy } from 'valtio/utils';

-
 function DetailVideo() {
-  const videoState = useProxy(stateGallery.video)
+  const videoState = useProxy(stateGallery.video);
  const [modalHapus, setModalHapus] = useState(false);
-  const [selectedId, setSelectedId] = useState<string | null>(null)
-  const params = useParams()
-  const router = useRouter()
+  const [selectedId, setSelectedId] = useState<string | null>(null);
+  const params = useParams();
+  const router = useRouter();

  useShallowEffect(() => {
-    videoState.findUnique.load(params?.id as string)
-  }, [])
+    videoState.findUnique.load(params?.id as string);
+  }, []);

  const handleHapus = () => {
    if (selectedId) {
-      videoState.delete.byId(selectedId)
-      setModalHapus(false)
-      setSelectedId(null)
-      router.push("/admin/desa/gallery/video")
+      videoState.delete.byId(selectedId);
+      setModalHapus(false);
+      setSelectedId(null);
+      router.push("/admin/desa/gallery/video");
    }
-  }
+  };

  if (!videoState.findUnique.data) {
    return (
      <Stack py={10}>
-        <Skeleton h={500} />
+        <Skeleton height={500} radius="md" />
      </Stack>
-    )
+    );
  }

+  const data = videoState.findUnique.data;
+
  return (
-    <Box>
-      <Box mb={10}>
-        <Button variant="subtle" onClick={() => router.back()}>
-          <IconArrowBack color={colors['blue-button']} size={25} />
-        </Button>
-      </Box>
-      <Paper bg={colors['white-1']} w={{ base: "100%", md: "100%", lg: "50%" }} p={'md'}>
-        <Stack>
-          <Text fz={"xl"} fw={"bold"}>Detail Video</Text>
-          {videoState.findUnique.data ? (
-            <Paper key={videoState.findUnique.data.id} bg={colors['BG-trans']} p={'md'}>
-              <Stack gap={"xs"}>
-                <Box>
-                  <Text fw={"bold"} fz={"lg"}>Judul</Text>
-                  <Text fz={"lg"}>{videoState.findUnique.data?.name}</Text>
-                </Box>
-                <Box>
-                  <Text fw={"bold"} fz={"lg"}>Video</Text>
-                  <Box component="iframe"
-                    src={convertToEmbedUrl(videoState.findUnique.data?.linkVideo)}
+    <Box py={10}>
+      {/* Tombol Kembali */}
+      <Button
+        variant="subtle"
+        onClick={() => router.back()}
+        leftSection={<IconArrowBack size={24} color={colors['blue-button']} />}
+        mb={15}
+      >
+        Kembali
+      </Button>
+
+      {/* Detail Video */}
+      <Paper
+        withBorder
+        w={{ base: "100%", md: "50%" }}
+        bg={colors['white-1']}
+        p="lg"
+        radius="md"
+        shadow="sm"
+      >
+        <Stack gap="md">
+          <Text fz="2xl" fw="bold" c={colors['blue-button']}>
+            Detail Video
+          </Text>
+
+          <Paper bg="#ECEEF8" p="md" radius="md" shadow="xs">
+            <Stack gap="sm">
+              <Box>
+                <Text fz="lg" fw="bold">Judul</Text>
+                <Text fz="md" c="dimmed">{data?.name || '-'}</Text>
+              </Box>
+
+              <Box>
+                <Text fz="lg" fw="bold">Video</Text>
+                {data?.linkVideo ? (
+                  <Box
+                    component="iframe"
+                    src={convertToEmbedUrl(data.linkVideo)}
                    width="100%"
                    height={300}
                    allowFullScreen
                    style={{ borderRadius: 8 }}
                  />
+                ) : (
+                  <Text fz="sm" c="dimmed">Tidak ada video</Text>
+                )}
+              </Box>

-                </Box>
+              <Box>
+                <Text fz="lg" fw="bold">Tanggal Video</Text>
+                <Text fz="md" c="dimmed">
+                  {data?.createdAt ? new Date(data.createdAt).toDateString() : '-'}
+                </Text>
+              </Box>

-                <Box>
-                  <Text fw={"bold"} fz={"lg"}>Tanggal Video</Text>
-                  <Text fz={"lg"}>{new Date(videoState.findUnique.data?.createdAt).toDateString()}</Text>
-                </Box>
-                <Box>
-                  <Text fw={"bold"} fz={"lg"}>Deskripsi</Text>
-                  <Text fz={"lg"} dangerouslySetInnerHTML={{ __html: videoState.findUnique.data?.deskripsi }} />
-                </Box>
-                <Flex gap={"xs"} mt={10}>
+              <Box>
+                <Text fz="lg" fw="bold">Deskripsi</Text>
+                {data?.deskripsi ? (
+                  <Text
+                    fz="md"
+                    c="dimmed"
+                    dangerouslySetInnerHTML={{ __html: data.deskripsi }}
+                  />
+                ) : (
+                  <Text fz="sm" c="dimmed">Tidak ada deskripsi</Text>
+                )}
+              </Box>
+
+              {/* Tombol Aksi */}
+              <Group gap="sm">
+                <Tooltip label="Hapus Video" withArrow position="top">
                  <Button
+                    color="red"
                    onClick={() => {
-                      if (videoState.findUnique.data) {
-                        setSelectedId(videoState.findUnique.data.id);
-                        setModalHapus(true);
-                      }
+                      setSelectedId(data.id);
+                      setModalHapus(true);
                    }}
-                    disabled={videoState.delete.loading || !videoState.findUnique.data}
-                    color={"red"}
+                    variant="light"
+                    radius="md"
+                    size="md"
                  >
-                    <IconX size={20} />
+                    <IconTrash size={20} />
                  </Button>
+                </Tooltip>
+
+                <Tooltip label="Edit Video" withArrow position="top">
                  <Button
-                    onClick={() => {
-                      if (videoState.findUnique.data) {
-                        router.push(`/admin/desa/gallery/video/${videoState.findUnique.data.id}/edit`);
-                      }
-                    }}
-                    disabled={!videoState.findUnique.data}
-                    color={"green"}
+                    color="green"
+                    onClick={() =>
+                      router.push(`/admin/desa/gallery/video/${data.id}/edit`)
+                    }
+                    variant="light"
+                    radius="md"
+                    size="md"
                  >
                    <IconEdit size={20} />
                  </Button>
-                </Flex>
-              </Stack>
-            </Paper>
-          ) : null}
+                </Tooltip>
+              </Group>
+            </Stack>
+          </Paper>
        </Stack>
      </Paper>

@@ -111,17 +149,16 @@ function DetailVideo() {
        opened={modalHapus}
        onClose={() => setModalHapus(false)}
        onConfirm={handleHapus}
-        text='Apakah anda yakin ingin menghapus berita ini?'
+        text="Apakah Anda yakin ingin menghapus video ini?"
      />
    </Box>
-
  );
+
  function convertToEmbedUrl(youtubeUrl: string): string {
    try {
      const url = new URL(youtubeUrl);
      const videoId = url.searchParams.get("v");
      if (!videoId) return youtubeUrl;
-
      return `https://www.youtube.com/embed/${videoId}`;
    } catch (err) {
      console.error("Error converting YouTube URL to embed:", err);
--- a/src/app/admin/(dashboard)/desa/gallery/video/create/page.tsx
+++ b/src/app/admin/(dashboard)/desa/gallery/video/create/page.tsx
@@ -1,8 +1,18 @@
-'use client'
+'use client';
 import CreateEditor from '@/app/admin/(dashboard)/_com/createEditor';
 import stateGallery from '@/app/admin/(dashboard)/_state/desa/gallery';
 import colors from '@/con/colors';
-import { Box, Button, Group, Paper, Stack, Text, TextInput, Title } from '@mantine/core';
+import {
+  Box,
+  Button,
+  Group,
+  Paper,
+  Stack,
+  Text,
+  TextInput,
+  Title,
+  Tooltip,
+} from '@mantine/core';
 import { IconArrowBack } from '@tabler/icons-react';
 import { useRouter } from 'next/navigation';
 import { useState } from 'react';
@@ -10,77 +20,104 @@ import { toast } from 'react-toastify';
 import { useProxy } from 'valtio/utils';
 import { convertYoutubeUrlToEmbed } from '../../lib/youtube-utils';

-
-
 function CreateVideo() {
-  const videoState = useProxy(stateGallery.video)
+  const videoState = useProxy(stateGallery.video);
  const router = useRouter();
-  const [link, setLink] = useState("");
+  const [link, setLink] = useState('');
  const embedLink = convertYoutubeUrlToEmbed(link);

  const resetForm = () => {
    videoState.create.form = {
-      name: "",
-      deskripsi: "",
-      linkVideo: "",
+      name: '',
+      deskripsi: '',
+      linkVideo: '',
    };
+    setLink('');
  };
+
  const handleSubmit = async () => {
    if (!embedLink) {
-      toast.error("Link YouTube tidak valid. Pastikan formatnya benar.");
+      toast.error('Link YouTube tidak valid. Pastikan formatnya benar.');
      return;
    }
-  
-    videoState.create.form.linkVideo = embedLink; // pastikan diset di sini juga (jaga-jaga)
+
+    videoState.create.form.linkVideo = embedLink;
    await videoState.create.create();
    resetForm();
-    router.push("/admin/desa/gallery/video");
+    router.push('/admin/desa/gallery/video');
  };
-  

  return (
-    <Box>
-      <Box mb={10}>
-        <Button onClick={() => router.back()} variant='subtle' color={'blue'}>
-          <IconArrowBack color={colors['blue-button']} size={25} />
-        </Button>
-      </Box>
+    <Box px={{ base: 'sm', md: 'lg' }} py="md">
+      {/* Header Back Button + Title */}
+      <Group mb="md">
+        <Tooltip label="Kembali ke halaman sebelumnya" withArrow>
+          <Button
+            variant="subtle"
+            onClick={() => router.back()}
+            p="xs"
+            radius="md"
+          >
+            <IconArrowBack color={colors['blue-button']} size={24} />
+          </Button>
+        </Tooltip>
+        <Title order={4} ml="sm" c="dark">
+          Tambah Video
+        </Title>
+      </Group>

-      <Paper w={{ base: '100%', md: '50%' }} bg={colors['white-1']} p={'md'}>
-        <Stack gap={"xs"}>
-          <Title order={4}>Create Video</Title>
+      {/* Card Form */}
+      <Paper
+        w={{ base: '100%', md: '50%' }}
+        bg={colors['white-1']}
+        p="lg"
+        radius="md"
+        shadow="sm"
+        style={{ border: '1px solid #e0e0e0' }}
+      >
+        <Stack gap="md">
+          {/* Judul */}
          <TextInput
-            label={<Text fw={"bold"} fz={"sm"}>Judul Video</Text>}
-            placeholder='Masukkan judul video'
+            label="Judul Video"
+            placeholder="Masukkan judul video"
            value={videoState.create.form.name}
-            onChange={(val) => {
-              videoState.create.form.name = val.target.value;
+            onChange={(e) => {
+              videoState.create.form.name = e.currentTarget.value;
            }}
+            required
          />
-          <Box>
-            <Stack gap={"xs"}>
-              <TextInput
-                label="Link Video YouTube"
-                placeholder="https://www.youtube.com/watch?v=abc123"
-                value={link}
-                onChange={(e) => {
-                  setLink(e.currentTarget.value);
-                }}
-                required
-              />

-              {embedLink && (
-                <iframe
-                  style={{ borderRadius: 10, width: "100%", height: 400 }}
-                  src={embedLink}
-                  title="Preview Video"
-                  allowFullScreen
-                ></iframe>
-              )}
-            </Stack>
-          </Box>
+          {/* Link YouTube */}
+          <TextInput
+            label="Link Video YouTube"
+            placeholder="https://www.youtube.com/watch?v=abc123"
+            value={link}
+            onChange={(e) => setLink(e.currentTarget.value)}
+            required
+          />
+
+          {/* Preview Video */}
+          {embedLink && (
+            <Box mt="sm">
+              <iframe
+                style={{
+                  borderRadius: 10,
+                  width: '100%',
+                  height: 400,
+                  border: '1px solid #ddd',
+                }}
+                src={embedLink}
+                title="Preview Video"
+                allowFullScreen
+              ></iframe>
+            </Box>
+          )}
+
+          {/* Deskripsi */}
          <Box>
-            <Text fw={"bold"} fz={"sm"}>Deskripsi Video</Text>
+            <Text fw="bold" fz="sm" mb={6}>
+              Deskripsi Video
+            </Text>
            <CreateEditor
              value={videoState.create.form.deskripsi}
              onChange={(val) => {
@@ -88,8 +125,21 @@ function CreateVideo() {
              }}
            />
          </Box>
-          <Group>
-            <Button onClick={handleSubmit} bg={colors['blue-button']}>Submit</Button>
+
+          {/* Button Submit */}
+          <Group justify="right">
+            <Button
+              onClick={handleSubmit}
+              radius="md"
+              size="md"
+              style={{
+                background: `linear-gradient(135deg, ${colors['blue-button']}, #4facfe)`,
+                color: '#fff',
+                boxShadow: '0 4px 15px rgba(79, 172, 254, 0.4)',
+              }}
+            >
+              Simpan
+            </Button>
          </Group>
        </Stack>
      </Paper>
--- a/src/app/admin/(dashboard)/desa/gallery/video/page.tsx
+++ b/src/app/admin/(dashboard)/desa/gallery/video/page.tsx
@@ -1,13 +1,30 @@
 'use client'
 import colors from '@/con/colors';
-import { Box, Button, Center, Pagination, Paper, Skeleton, Table, TableTbody, TableTd, TableTh, TableThead, TableTr, Text } from '@mantine/core';
+import {
+  Box,
+  Button,
+  Center,
+  Group,
+  Pagination,
+  Paper,
+  Skeleton,
+  Stack,
+  Table,
+  TableTbody,
+  TableTd,
+  TableTh,
+  TableThead,
+  TableTr,
+  Text,
+  Title,
+  Tooltip
+} from '@mantine/core';
 import { useShallowEffect } from '@mantine/hooks';
-import { IconDeviceImac, IconSearch } from '@tabler/icons-react';
+import { IconDeviceImac, IconPlus, IconSearch } from '@tabler/icons-react';
 import { useRouter } from 'next/navigation';
 import { useState } from 'react';
 import { useProxy } from 'valtio/utils';
 import HeaderSearch from '../../../_com/header';
-import JudulList from '../../../_com/judulList';
 import stateGallery from '../../../_state/desa/gallery';

 function Video() {
@@ -15,8 +32,8 @@ function Video() {
  return (
    <Box>
      <HeaderSearch
-        title='Posisi Organisasi'
-        placeholder='pencarian'
+        title='Video'
+        placeholder='Cari judul atau deskripsi video...'
        searchIcon={<IconSearch size={20} />}
        value={search}
        onChange={(e) => setSearch(e.currentTarget.value)}
@@ -29,6 +46,7 @@ function Video() {
 function ListVideo({ search }: { search: string }) {
  const videoState = useProxy(stateGallery.video)
  const router = useRouter();
+
  const {
    data,
    page,
@@ -41,72 +59,104 @@ function ListVideo({ search }: { search: string }) {
    load(page, 10, search)
  }, [page, search])

-  const filteredData = (data || [])
+  const filteredData = data || []

  if (loading || !data) {
    return (
-      <Box py={10}>
-        <Skeleton h={500} />
-      </Box>
+      <Stack py={10}>
+        <Skeleton height={600} radius="md" />
+      </Stack>
    )
  }

  return (
    <Box py={10}>
-      <Paper bg={colors['white-1']} p={'md'}>
-        <JudulList
-          title='List Video'
-          href='/admin/desa/gallery/video/create'
-        />
-        <Table striped withTableBorder withRowBorders>
-          <TableThead>
-            <TableTr>
-              <TableTh>Judul Video</TableTh>
-              <TableTh>Tanggal Video</TableTh>
-              <TableTh>Deskripsi Video</TableTh>
-              <TableTh>Detail</TableTh>
-            </TableTr>
-          </TableThead>
-          <TableTbody>
-            {filteredData.map((item) => (
-              <TableTr key={item.id}>
-                <TableTd>
-                  <Box w={200}>
-                    <Text lineClamp={1}>{item.name}</Text>
-                  </Box>
-                </TableTd>
-                
-                <TableTd>
-                  <Box w={200}>
-                  {new Date(item.createdAt).toLocaleDateString('id-ID', {
-                    day: 'numeric',
-                    month: 'long',
-                    year: 'numeric',
-                  })}
-                  </Box>
-                </TableTd>
-                <TableTd>
-                  <Box w={200}>
-                    <Text lineClamp={1} dangerouslySetInnerHTML={{ __html: item.deskripsi }} />
-                  </Box>
-                </TableTd>
-                <TableTd>
-                  <Button onClick={() => router.push(`/admin/desa/gallery/video/${item.id}`)}>
-                    <IconDeviceImac size={20} />
-                  </Button>
-                </TableTd>
+      <Paper withBorder bg={colors['white-1']} p={'lg'} shadow="md" radius="md">
+        <Group justify="space-between" mb="md">
+          <Title order={4}>Daftar Video</Title>
+          <Tooltip label="Tambah Video Baru" withArrow>
+            <Button
+              leftSection={<IconPlus size={18} />}
+              color="blue"
+              variant="light"
+              onClick={() => router.push('/admin/desa/gallery/video/create')}
+            >
+              Tambah Baru
+            </Button>
+          </Tooltip>
+        </Group>
+        <Box style={{ overflowX: "auto" }}>
+          <Table highlightOnHover>
+            <TableThead>
+              <TableTr>
+                <TableTh style={{ width: '25%' }}>Judul Video</TableTh>
+                <TableTh style={{ width: '20%' }}>Tanggal</TableTh>
+                <TableTh style={{ width: '30%' }}>Deskripsi</TableTh>
+                <TableTh style={{ width: '15%' }}>Aksi</TableTh>
              </TableTr>
-            ))}
-          </TableTbody>
-        </Table>
+            </TableThead>
+            <TableTbody>
+              {filteredData.length > 0 ? (
+                filteredData.map((item) => (
+                  <TableTr key={item.id}>
+                    <TableTd style={{ width: '25%' }}>
+                      <Box w={200}> 
+                        <Text fw={500} truncate="end" lineClamp={1}>{item.name}</Text>
+                      </Box>
+                    </TableTd>
+                    <TableTd style={{ width: '20%' }}>
+                     <Box w={200}>
+                     <Text fz="sm" c="dimmed">
+                        {new Date(item.createdAt).toLocaleDateString('id-ID', {
+                          day: 'numeric',
+                          month: 'long',
+                          year: 'numeric',
+                        })}
+                      </Text>
+                     </Box>
+                    </TableTd>
+                    <TableTd style={{ width: '30%' }}>
+                     <Box w={200}>
+                      <Text fz="sm" truncate="end" lineClamp={1} dangerouslySetInnerHTML={{ __html: item.deskripsi }} />
+                     </Box>
+                    </TableTd>
+                    <TableTd style={{ width: '15%' }}>
+                      <Button
+                        variant="light"
+                        color="blue"
+                        onClick={() => router.push(`/admin/desa/gallery/video/${item.id}`)}
+                      >
+                        <IconDeviceImac size={20} />
+                        <Text ml={5}>Detail</Text>
+                      </Button>
+                    </TableTd>
+                  </TableTr>
+                ))
+              ) : (
+                <TableTr>
+                  <TableTd colSpan={4}>
+                    <Center py={20}>
+                      <Text c="dimmed">Tidak ada video yang cocok</Text>
+                    </Center>
+                  </TableTd>
+                </TableTr>
+              )}
+            </TableTbody>
+          </Table>
+        </Box>
      </Paper>
      <Center>
        <Pagination
          value={page}
-          onChange={(newPage) => load(newPage)} // ini penting!
+          onChange={(newPage) => {
+            load(newPage, 10)
+            window.scrollTo({ top: 0, behavior: 'smooth' })
+          }}
          total={totalPages}
          mt="md"
          mb="md"
+          color="blue"
+          radius="md"
        />
      </Center>
    </Box>
--- a/src/app/admin/(dashboard)/desa/layanan/ajukan_permohonan/[id]/edit/page.tsx
+++ b/src/app/admin/(dashboard)/desa/layanan/ajukan_permohonan/[id]/edit/page.tsx
@@ -0,0 +1,178 @@
+'use client'
+/* eslint-disable react-hooks/exhaustive-deps */
+import stateLayananDesa from '@/app/admin/(dashboard)/_state/desa/layananDesa';
+import colors from '@/con/colors';
+import {
+    Box,
+    Button,
+    Group,
+    Paper,
+    Select,
+    Stack,
+    TextInput,
+    Title,
+    Tooltip
+} from '@mantine/core';
+import { IconArrowBack } from '@tabler/icons-react';
+import { useParams, useRouter } from 'next/navigation';
+import { useEffect, useState } from 'react';
+import { toast } from 'react-toastify';
+import { useProxy } from 'valtio/utils';
+
+function EditAjukanPermohonan() {
+    const router = useRouter();
+    const params = useParams();
+    const stateAjukan = useProxy(stateLayananDesa.ajukanPermohonan);
+
+    const [formData, setFormData] = useState({
+        nama: stateAjukan.edit.form.nama,
+        nik: stateAjukan.edit.form.nik,
+        alamat: stateAjukan.edit.form.alamat,
+        nomorKk: stateAjukan.edit.form.nomorKk,
+        kategoriId: stateAjukan.edit.form.kategoriId,
+    });
+
+    useEffect(() => {
+        stateLayananDesa.suratKeterangan.findManyAll.load();
+        const loadAjukan = async () => {
+            const id = params?.id as string;
+            if (!id) return;
+
+            try {
+                const data = await stateAjukan.edit.load(id);
+                if (data) {
+                    setFormData({
+                        nama: data.nama || '',
+                        nik: data.nik || '',
+                        alamat: data.alamat || '',
+                        nomorKk: data.nomorKk || '',
+                        kategoriId: data.kategoriId || '',
+                    });
+                }
+            } catch (error) {
+                console.error('Error loading ajukan:', error);
+                toast.error('Gagal memuat data ajukan');
+            }
+        };
+
+        loadAjukan();
+    }, [params?.id]);
+
+    const handleSubmit = async () => {
+        try {
+            stateAjukan.edit.form = {
+                ...stateAjukan.edit.form,
+                ...formData,
+            };
+            toast.success('Ajukan berhasil diperbarui!');
+            router.push('/admin/desa/layanan/ajukan_permohonan');
+        } catch (error) {
+            console.error('Error updating ajukan:', error);
+            toast.error('Terjadi kesalahan saat memperbarui ajukan');
+        }
+    };
+
+    return (
+        <Box px={{ base: 'sm', md: 'lg' }} py="md">
+            {/* Back Button */}
+            <Group mb="md">
+                <Tooltip label="Kembali ke halaman sebelumnya" withArrow>
+                    <Button variant="subtle" onClick={() => router.back()} p="xs" radius="md">
+                        <IconArrowBack color={colors['blue-button']} size={24} />
+                    </Button>
+                </Tooltip>
+                <Title order={4} ml="sm" c="dark">
+                    Edit Ajukan Permohonan
+                </Title>
+            </Group>
+
+            <Paper
+                w={{ base: '100%', md: '50%' }}
+                bg={colors['white-1']}
+                p="lg"
+                radius="md"
+                shadow="sm"
+                style={{ border: '1px solid #e0e0e0' }}
+            >
+                <Stack gap="md">
+                    <TextInput
+                        label="Nama"
+                        placeholder="Masukkan nama"
+                        value={formData.nama}
+                        onChange={(e) => setFormData({ ...formData, nama: e.target.value })}
+                        required
+                    />
+
+                    <TextInput
+                        type="number"
+                        label="NIK"
+                        placeholder="Masukkan NIK"
+                        value={formData.nik}
+                        onChange={(e) => setFormData({ ...formData, nik: e.target.value })}
+                        required
+                    />
+
+                    <TextInput
+                        label="Alamat"
+                        placeholder="Masukkan alamat"
+                        value={formData.alamat}
+                        onChange={(e) => setFormData({ ...formData, alamat: e.target.value })}
+                        required
+                    />
+
+                    <TextInput
+                        type="number"
+                        label="Nomor KK"
+                        placeholder="Masukkan nomor KK"
+                        value={formData.nomorKk}
+                        onChange={(e) => setFormData({ ...formData, nomorKk: e.target.value })}
+                        required
+                    />
+
+                    <Select
+                        label="Kategori"
+                        placeholder="Pilih kategori"
+                        data={stateLayananDesa.suratKeterangan.findManyAll.data?.map((item) => ({
+                            label: item.name,
+                            value: item.id,
+                        }))}
+                        value={formData.kategoriId || null}
+                        onChange={(val: string | null) => {
+                            if (val) {
+                                const selected = stateLayananDesa.suratKeterangan.findMany.data?.find(
+                                    (item) => item.id === val
+                                );
+                                if (selected) {
+                                    stateAjukan.edit.form.kategoriId = selected.id;
+                                }
+                            } else {
+                                stateAjukan.edit.form.kategoriId = '';
+                            }
+                        }}
+                        searchable
+                        clearable
+                        nothingFoundMessage="Tidak ditemukan"
+                        required
+                    />
+
+                    <Group justify="right">
+                        <Button
+                            onClick={handleSubmit}
+                            radius="md"
+                            size="md"
+                            style={{
+                                background: `linear-gradient(135deg, ${colors['blue-button']}, #4facfe)`,
+                                color: '#fff',
+                                boxShadow: '0 4px 15px rgba(79, 172, 254, 0.4)',
+                            }}
+                        >
+                            Simpan
+                        </Button>
+                    </Group>
+                </Stack>
+            </Paper>
+        </Box>
+    );
+}
+
+export default EditAjukanPermohonan;
--- a/src/app/admin/(dashboard)/desa/layanan/ajukan_permohonan/[id]/page.tsx
+++ b/src/app/admin/(dashboard)/desa/layanan/ajukan_permohonan/[id]/page.tsx
@@ -0,0 +1,172 @@
+'use client'
+import { ModalKonfirmasiHapus } from '@/app/admin/(dashboard)/_com/modalKonfirmasiHapus';
+import stateLayananDesa from '@/app/admin/(dashboard)/_state/desa/layananDesa';
+import colors from '@/con/colors';
+import {
+    Box,
+    Button,
+    Group,
+    Paper,
+    Skeleton,
+    Stack,
+    Text,
+    Tooltip
+} from '@mantine/core';
+import { useShallowEffect } from '@mantine/hooks';
+import { IconArrowBack, IconEdit, IconTrash } from '@tabler/icons-react';
+import { useParams, useRouter } from 'next/navigation';
+import { useState } from 'react';
+import { useProxy } from 'valtio/utils';
+
+function DetailAjukanPermohonan() {
+  const ajukanPermohonanState = useProxy(stateLayananDesa.ajukanPermohonan);
+  const [modalHapus, setModalHapus] = useState(false);
+  const [selectedId, setSelectedId] = useState<string | null>(null);
+  const params = useParams();
+  const router = useRouter();
+
+  useShallowEffect(() => {
+    ajukanPermohonanState.findUnique.load(params?.id as string);
+  }, []);
+
+  const handleHapus = () => {
+    if (selectedId) {
+      ajukanPermohonanState.delete.byId(selectedId);
+      setModalHapus(false);
+      setSelectedId(null);
+      router.push('/admin/desa/layanan/ajukan_permohonan');
+    }
+  };
+
+  if (!ajukanPermohonanState.findUnique.data) {
+    return (
+      <Stack py={10}>
+        <Skeleton height={500} radius="md" />
+      </Stack>
+    );
+  }
+
+  const data = ajukanPermohonanState.findUnique.data;
+
+  return (
+    <Box py={10}>
+      {/* Tombol Kembali */}
+      <Button
+        variant="subtle"
+        onClick={() => router.back()}
+        leftSection={<IconArrowBack size={24} color={colors['blue-button']} />}
+        mb={15}
+      >
+        Kembali
+      </Button>
+
+      <Paper
+        withBorder
+        w={{ base: '100%', md: '60%' }}
+        bg={colors['white-1']}
+        p="lg"
+        radius="md"
+        shadow="sm"
+      >
+        <Stack gap="md">
+          <Text fz="2xl" fw="bold" c={colors['blue-button']}>
+            Detail Surat Keterangan
+          </Text>
+
+          <Paper bg="#ECEEF8" p="md" radius="md" shadow="xs">
+            <Stack gap="sm">
+              <Box>
+                <Text fz="lg" fw="bold">
+                  Nama
+                </Text>
+                <Text fz="md" c="dimmed">
+                  {data?.nama || '-'}
+                </Text>
+              </Box>
+
+              <Box>
+                <Text fz="lg" fw="bold">
+                  NIK
+                </Text>
+                <Text fz="md" c="dimmed">
+                  {data?.nik || '-'}
+                </Text>
+              </Box>
+
+              <Box>
+                <Text fz="lg" fw="bold">
+                  Alamat
+                </Text>
+                <Text fz="md" c="dimmed">
+                  {data?.alamat || '-'}
+                </Text>
+              </Box>
+
+              <Box>
+                <Text fz="lg" fw="bold">
+                  Nomor KK
+                </Text>
+                <Text fz="md" c="dimmed">
+                  {data?.nomorKk || '-'}
+                </Text>
+              </Box>
+
+              <Box>
+                <Text fz="lg" fw="bold">
+                  Kategori
+                </Text>
+                <Text fz="md" c="dimmed">
+                  {data?.kategori.name || '-'}
+                </Text>
+              </Box>
+
+              <Group gap="sm">
+                <Tooltip label="Hapus Surat" withArrow position="top">
+                  <Button
+                    color="red"
+                    onClick={() => {
+                      setSelectedId(data.id);
+                      setModalHapus(true);
+                    }}
+                    variant="light"
+                    radius="md"
+                    size="md"
+                    disabled={ajukanPermohonanState.delete.loading}
+                  >
+                    <IconTrash size={20} />
+                  </Button>
+                </Tooltip>
+
+                <Tooltip label="Edit Surat" withArrow position="top">
+                  <Button
+                    color="green"
+                    onClick={() =>
+                      router.push(
+                        `/admin/desa/layanan/ajukan_permohonan/${data.id}/edit`
+                      )
+                    }
+                    variant="light"
+                    radius="md"
+                    size="md"
+                  >
+                    <IconEdit size={20} />
+                  </Button>
+                </Tooltip>
+              </Group>
+            </Stack>
+          </Paper>
+        </Stack>
+      </Paper>
+
+      {/* Modal Konfirmasi Hapus */}
+      <ModalKonfirmasiHapus
+        opened={modalHapus}
+        onClose={() => setModalHapus(false)}
+        onConfirm={handleHapus}
+        text="Apakah Anda yakin ingin menghapus ajukan permohonan ini?"
+      />
+    </Box>
+  );
+}
+
+export default DetailAjukanPermohonan;
--- a/src/app/admin/(dashboard)/desa/layanan/ajukan_permohonan/page.tsx
+++ b/src/app/admin/(dashboard)/desa/layanan/ajukan_permohonan/page.tsx
@@ -0,0 +1,155 @@
+/* eslint-disable react-hooks/exhaustive-deps */
+'use client'
+import colors from '@/con/colors';
+import {
+  Box,
+  Button,
+  Center,
+  Pagination,
+  Paper,
+  Skeleton,
+  Stack,
+  Table,
+  TableTbody,
+  TableTd,
+  TableTh,
+  TableThead,
+  TableTr,
+  Text,
+  Title
+} from '@mantine/core';
+import { IconDeviceImacCog, IconSearch } from '@tabler/icons-react';
+import { useRouter } from 'next/navigation';
+import { useEffect, useState } from 'react';
+import { useProxy } from 'valtio/utils';
+import HeaderSearch from '../../../_com/header';
+import stateLayananDesa from '../../../_state/desa/layananDesa';
+
+function AjukanPermohonan() {
+  const [search, setSearch] = useState("");
+  return (
+    <Box>
+      <HeaderSearch
+        title='Pelayanan Ajukan Permohonan'
+        placeholder='Cari nama atau deskripsi...'
+        searchIcon={<IconSearch size={20} />}
+        value={search}
+        onChange={(e) => setSearch(e.currentTarget.value)}
+      />
+      <ListAjukanPermohonan search={search} />
+    </Box>
+  );
+}
+
+function ListAjukanPermohonan({ search }: { search: string }) {
+  const AjukanPermohonanState = useProxy(stateLayananDesa.ajukanPermohonan);
+  const router = useRouter();
+
+  const {
+    data,
+    page,
+    totalPages,
+    loading,
+    load,
+  } = AjukanPermohonanState.findMany;
+
+  useEffect(() => {
+    load(page, 10, search);
+  }, [page, search]);
+
+  // Loading state
+  if (loading || !data) {
+    return (
+      <Stack py={10}>
+        <Skeleton height={600} radius="md" />
+      </Stack>
+    );
+  }
+
+  return (
+    <Box py={10}>
+      <Paper withBorder bg={colors['white-1']} p={'lg'} shadow="md" radius="md">
+        <Title order={4}>List Ajukan Permohonan</Title>
+        <Box style={{ overflowX: "auto" }}>
+          <Table highlightOnHover>
+            <TableThead>
+              <TableTr>
+                <TableTh style={{ width: '30%' }}>Nama</TableTh>
+                <TableTh style={{ width: '45%' }}>Alamat</TableTh>
+                <TableTh style={{ width: '15%' }}>NIK</TableTh>
+                <TableTh style={{ width: '15%' }}>Aksi</TableTh>
+              </TableTr>
+            </TableThead>
+            <TableTbody>
+              {data.length > 0 ? (
+                data.map((item) => (
+                  <TableTr key={item.id}>
+                    <TableTd style={{ width: '30%' }}>
+                      <Box w={200}>
+                        <Text fw={500} truncate="end" lineClamp={1}>
+                          {item.nama}
+                        </Text>
+                      </Box>
+                    </TableTd>
+                    <TableTd style={{ width: '45%' }}>
+                      <Box w={200}>
+                        <Text fw={500} truncate="end" lineClamp={1}>
+                          {item.alamat}
+                        </Text>
+                      </Box>
+                    </TableTd>
+                    <TableTd style={{ width: '45%' }}>
+                      <Box w={200}>
+                        <Text fw={500} truncate="end" lineClamp={1}>
+                          {item.nik}
+                        </Text>
+                      </Box>
+                    </TableTd>
+                    <TableTd style={{ width: '15%' }}>
+                      <Button
+                        size="xs"
+                        radius="md"
+                        variant="light"
+                        color="blue"
+                        leftSection={<IconDeviceImacCog size={16} />}
+                        onClick={() =>
+                          router.push(`/admin/desa/layanan/ajukan_permohonan/${item.id}`)
+                        }
+                      >
+                        Detail
+                      </Button>
+                    </TableTd>
+                  </TableTr>
+                ))
+              ) : (
+                <TableTr>
+                  <TableTd colSpan={3}>
+                    <Center py={20}>
+                      <Text color="dimmed">Tidak ada data ajukan permohonan yang cocok</Text>
+                    </Center>
+                  </TableTd>
+                </TableTr>
+              )}
+            </TableTbody>
+          </Table>
+        </Box>
+      </Paper>
+      <Center>
+        <Pagination
+          value={page}
+          onChange={(newPage) => {
+            load(newPage, 10, search);
+            window.scrollTo({ top: 0, behavior: 'smooth' });
+          }}
+          total={totalPages}
+          mt="md"
+          mb="md"
+          color="blue"
+          radius="md"
+        />
+      </Center>
+    </Box>
+  );
+}
+
+export default AjukanPermohonan;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
nico	3e4a7a1c0a	Fix Ui Admin & User to Mobile && QC Menu Landing Page, PPID, Desa	2025-09-24 14:50:53 +08:00
nico	b5c044df6e	Fix Tampilan User & Admin Menu Inovasi & Lingkungan	2025-09-22 17:15:11 +08:00
nico	0fc47c28ff	fix tampilan admin menu inovasi, sisa menu lingkungan	2025-09-22 10:53:48 +08:00
nico	8e25c91e85	Fix Tampilab DesaAntiKorupsi Landing Page Mobile	2025-09-20 03:49:20 +08:00
nico	068d8b1077	Fix All Image Add Lazy Loading	2025-09-19 10:41:18 +08:00
nico	9f72e94557	Fix Admin - User Menu Keamanan, Submenu Pencegahan Kriminalitas	2025-09-17 17:54:03 +08:00
nico	79ad39fc55	Fix Admin - User Menu Keamanan, Submenu Laporan Kontak Darurat, Laporan Publik	2025-09-17 14:59:46 +08:00
nico	39e1e7b575	QC Tampilan Admin & User, Api berfungsi	2025-09-16 16:47:12 +08:00
nico	4ceea5203f	QC Admin - User Menu Ekonomi : Jumlah Pengangguran	2025-09-16 10:11:54 +08:00
nico	a5d841bb6b	Fix Compres Gambar && seed gambar profile - landing page	2025-09-12 11:55:40 +08:00
nico	6a7bd386ae	Add Layout Kontak Darurat - Admin Menu Keamanan	2025-09-11 12:15:40 +08:00
nico	a9d98895bb	Fix Admin Menu SDGs Desa & APBdes Desa, Fix UI IMage Layanan Landing Page & Layanan Desa	2025-09-09 17:14:28 +08:00
nico	75475dc62e	Fix Package.json Bun	2025-09-08 21:52:17 +08:00
nico	b39800a475	Fix UI Admin Keamanan Lingkungan	2025-09-08 15:45:56 +08:00
nico	797713ef49	Fix UI Admin Menu Kesehatan, Login Admin, OTP	2025-09-08 14:02:21 +08:00
nico	8817b937b1	API Auth	2025-09-04 11:46:08 +08:00
nico	2adf60f9eb	Fix UI Admin menu desa	2025-09-03 15:30:02 +08:00