QC Tampilan Admin & User, Api berfungsi

.gitignore

@@ -48,3 +48,5 @@ next-env.d.ts
 
 .env.*
 
+*.tar.gz
+

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": {

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
+  }
+]
   

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"
+  }
+]

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"
   }
 ]

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"
   }
 ]

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"
   }
 ]

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,

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",

prisma/schema.prisma

@@ -92,7 +92,7 @@ model FileStorage {
   PejabatDesa                    PejabatDesa[]
   MediaSosial                    MediaSosial[]
   DesaAntiKorupsi                DesaAntiKorupsi[]
-  SDGSDesa                       SDGSDesa[]
+  SDGSDesa                       SdgsDesa[]
   APBDesImage                    APBDes[]                   @relation("APBDesImage")
   APBDesFile                     APBDes[]                   @relation("APBDesFile")
   PrestasiDesa                   PrestasiDesa[]
@@ -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
@@ -1216,25 +1216,40 @@ 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])
+  id          String                @id @default(uuid())
+  nama        String
+  image       FileStorage?          @relation(fields: [imageId], references: [id])
   imageId     String?
-  kontakItems KontakItem[]
-  createdAt   DateTime     @default(now())
-  updatedAt   DateTime     @updatedAt
+  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
+  image                 FileStorage?            @relation(fields: [imageId], references: [id])
+  imageId               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 ========================================= //
@@ -1401,6 +1416,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 +1487,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 +1569,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 +2121,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 +2152,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 +2172,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())

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,

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}

src/app/admin/(dashboard)/_com/iconMap.tsx

@@ -0,0 +1,83 @@
+/* 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,
+} 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'
+
+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,
+}
+
+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} />
+}

src/app/admin/(dashboard)/_com/selectIcon.tsx

@@ -3,16 +3,20 @@
 
 import { Box, rem, Select } from '@mantine/core';
 import {
+  IconCash,
   IconChartLine,
   IconChristmasTreeFilled,
   IconClipboardTextFilled,
   IconDroplet,
   IconHome,
   IconHomeEco,
+  IconHospital,
   IconLeaf,
   IconRecycle,
   IconScale,
+  IconSchool,
   IconShieldFilled,
+  IconShoppingCart,
   IconTent,
   IconTrashFilled,
   IconTree,
@@ -32,13 +36,17 @@ 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 },
 
 };
 

src/app/admin/(dashboard)/_com/selectIconEdit.tsx

@@ -2,16 +2,20 @@
 
 import { Box, rem, Select } from '@mantine/core';
 import {
+  IconCash,
   IconChartLine,
   IconChristmasTreeFilled,
   IconClipboardTextFilled,
   IconDroplet,
   IconHome,
   IconHomeEco,
+  IconHospital,
   IconLeaf,
   IconRecycle,
   IconScale,
+  IconSchool,
   IconShieldFilled,
+  IconShoppingCart,
   IconTent,
   IconTrashFilled,
   IconTree,
@@ -36,7 +40,11 @@ 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},
 };
 
 type IconKey = keyof typeof iconMap;

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(

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;

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 };

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<{

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,

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;
       }
     },
   },

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;
       }
     },
   },

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<{

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";
@@ -7,25 +8,13 @@ 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(),
-    })
-  ),
+  kategoriId: z.array(z.string()).min(1, "Minimal pilih satu kategori"),
 });
 
 const defaultForm = {
   nama: "",
   imageId: "",
-  kontakItems: [
-    {
-      nama: "",
-      nomorTelepon: "",
-      imageId: "",
-    },
-  ],
+  kategoriId: [] as string[],
 };
 
 const kontakDaruratKeamananState = proxy({
@@ -61,20 +50,50 @@ const kontakDaruratKeamananState = proxy({
     },
   },
   findMany: {
-    data: null as
-      | Prisma.KontakDaruratKeamananGetPayload<{
-          include: {
-            kontakItems: true;
-            image: true;
+    data: null as Array<
+      Prisma.KontakDaruratKeamananGetPayload<{
+        include: {
+          kategori: true;
+          image: 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 +102,15 @@ const kontakDaruratKeamananState = proxy({
       include: {
         kontakItems: {
           include: {
-            image: true;
+            kontakItem: {
+              include: {
+                image: true;
+              }
+            };
           };
         };
         image: true;
+        kategori: true;
       };
     }> | null,
     loading: false,
@@ -168,14 +192,8 @@ 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,
-              },
-            ],
+            imageId: data.imageId || '',
+            kategoriId: data.kontakItems?.map((item: any) => item.kontakItemId) || []
           };
           return data;
         } else {
@@ -213,13 +231,7 @@ 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,
-                },
-              ],
+              kategoriId: this.form.kategoriId,
             }),
           }
         );
@@ -256,4 +268,257 @@ 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"),
+  imageId: z.string().nonempty(),
+});
+
+const defaultFormItem = {
+  nama: "",
+  nomorTelepon: "",
+  imageId: "",
+};
+
+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<{
+        include: {
+          image: 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<{
+      include: {
+        kategori: true;
+        image: 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,
+            imageId: data.imageId,
+          };
+          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,
+              imageId: this.form.imageId,
+            }),
+          }
+        );
+        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;

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";
@@ -97,13 +98,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 };

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";
@@ -88,12 +89,37 @@ const pencegahanKriminalitasState = proxy({
           };
         }>[]
       | 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;
       }
     },
   },
@@ -311,4 +337,4 @@ const pencegahanKriminalitasState = proxy({
     },
   },
 });
-export default pencegahanKriminalitasState;
+export default pencegahanKriminalitasState;

src/app/admin/(dashboard)/_state/kesehatan/data_kesehatan_warga/artikelKesehatan.ts

@@ -115,27 +115,38 @@ const artikelKesehatanState = proxy({
           };
         }>[]
       | 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;
       }
     },
   },
@@ -280,12 +291,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) {

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;

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;
       }
-    }
+    },
   },
 });
 

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

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;
       };

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({

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 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;

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 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;

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;

src/app/admin/(dashboard)/desa/_com/layoutTabLayanan.tsx

@@ -1,7 +1,7 @@
 /* eslint-disable react-hooks/exhaustive-deps */
 'use client'
 import colors from '@/con/colors';
-import { Stack, Tabs, TabsList, TabsPanel, TabsTab, Title, Tooltip } 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 } from '@tabler/icons-react';
@@ -62,43 +62,50 @@ function LayoutTabsLayanan({ children }: { children: React.ReactNode }) {
         <Stack gap="lg">
             <Title order={3} fw={700} style={{ color: "#1A1B1E" }}>Layanan</Title>
             <Tabs
-                color={colors['blue-button']}
-                variant='pills'
+                color={colors["blue-button"]}
+                variant="pills"
                 value={activeTab}
                 onChange={handleTabChange}
                 radius="lg"
                 keepMounted={false}
             >
-                <TabsList
-                    p="sm"
-                    style={{
-                        background: "linear-gradient(135deg, #e7ebf7, #f9faff)",
-                        borderRadius: "1rem",
-                        boxShadow: "inset 0 0 10px rgba(0,0,0,0.05)",
-                    }}
-                >
-                    {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",
-                                }}
+                {/* ✅ 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 }}
                             >
-                                {tab.label}
-                            </TabsTab>
-                        </Tooltip>
-                    ))}
-                </TabsList>
+                                <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

src/app/admin/(dashboard)/desa/berita/_com/layoutTabs.tsx

@@ -1,7 +1,7 @@
 /* eslint-disable react-hooks/exhaustive-deps */
 'use client'
 import colors from '@/con/colors';
-import { Stack, Tabs, TabsList, TabsPanel, TabsTab, Title, Tooltip } 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';
@@ -49,43 +49,50 @@ function LayoutTabsBerita({ children }: { children: React.ReactNode }) {
         <Stack gap="lg">
             <Title order={3} fw={700} style={{ color: "#1A1B1E" }}>Berita Desa</Title>
             <Tabs
-                color={colors['blue-button']}
+                color={colors["blue-button"]}
                 variant="pills"
                 value={activeTab}
                 onChange={handleTabChange}
                 radius="lg"
                 keepMounted={false}
             >
-                <TabsList
-                    p="sm"
-                    style={{
-                        background: "linear-gradient(135deg, #e7ebf7, #f9faff)",
-                        borderRadius: "1rem",
-                        boxShadow: "inset 0 0 10px rgba(0,0,0,0.05)",
-                    }}
-                >
-                    {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",
-                                }}
+                {/* ✅ 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 }}
                             >
-                                {tab.label}
-                            </TabsTab>
-                        </Tooltip>
-                    ))}
-                </TabsList>
+                                <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

src/app/admin/(dashboard)/desa/berita/list-berita/page.tsx

@@ -96,9 +96,11 @@ function ListBerita({ search }: { search: string }) {
                 filteredData.map((item) => (
                   <TableTr key={item.id}>
                     <TableTd style={{ width: '30%' }}>
-                      <Text fw={500} truncate="end" lineClamp={1}>
-                        {item.judul}
-                      </Text>
+                      <Box w={200}>
+                        <Text fw={500} truncate="end" lineClamp={1}>
+                          {item.judul}
+                        </Text>
+                      </Box>
                     </TableTd>
                     <TableTd style={{ width: '20%' }}>
                       <Text fz="sm" c="dimmed">

src/app/admin/(dashboard)/desa/gallery/foto/page.tsx

@@ -110,7 +110,7 @@ export default function ListImage() {
                         radius="md"
                         onClick={() => {
                           stateFileStorage
-                            .del({ name: v.name })
+                            .del({ id: v.id })
                             .finally(() => toast("Foto berhasil dihapus"));
                         }}
                       >
@@ -143,14 +143,15 @@ export default function ListImage() {
         <Flex justify="center">
           <Pagination
             total={total}
+            value={stateFileStorage.page}  // Changed from page to value
             size="md"
             radius="md"
             withEdges
             onChange={(page) => {
-              stateFileStorage.page = page;
-              stateFileStorage.load();
+              stateFileStorage.load({ page });
             }}
           />
+
         </Flex>
       )}
     </Stack>

src/app/admin/(dashboard)/desa/gallery/lib/layoutTabs.tsx

@@ -1,7 +1,7 @@
 /* eslint-disable react-hooks/exhaustive-deps */
 'use client'
 import colors from '@/con/colors';
-import { Stack, Tabs, TabsList, TabsPanel, TabsTab, Title, Tooltip } 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';
@@ -48,43 +48,50 @@ function LayoutTabsGallery({ children }: { children: React.ReactNode }) {
         <Stack gap="lg">
             <Title order={3} fw={700} style={{ color: "#1A1B1E" }}>Gallery</Title>
             <Tabs
-                color={colors['blue-button']}
-                variant='pills'
+                color={colors["blue-button"]}
+                variant="pills"
                 value={activeTab}
                 onChange={handleTabChange}
                 radius="lg"
                 keepMounted={false}
             >
-                <TabsList
-                    p="sm"
-                    style={{
-                        background: "linear-gradient(135deg, #e7ebf7, #f9faff)",
-                        borderRadius: "1rem",
-                        boxShadow: "inset 0 0 10px rgba(0,0,0,0.05)",
-                    }}
-                >
-                    {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",
-                                }}
+                {/* ✅ 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 }}
                             >
-                                {tab.label}
-                            </TabsTab>
-                        </Tooltip>
-                    ))}
-                </TabsList>
+                                <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

src/app/admin/(dashboard)/desa/layanan/pelayanan_surat_keterangan/[id]/edit/page.tsx

@@ -140,7 +140,7 @@ function EditSuratKeterangan() {
           {/* Upload Gambar 1 */}
           <Box>
             <Text fw="bold" fz="sm" mb={6}>
-              Gambar 1
+            Gambar Konten Pelayanan
             </Text>
             <Dropzone
               onDrop={(files) => {
@@ -196,7 +196,7 @@ function EditSuratKeterangan() {
           {/* Upload Gambar 2 */}
           <Box>
             <Text fw="bold" fz="sm" mb={6}>
-              Gambar 2
+              Gambar Alur Pelayanan Surat
             </Text>
             <Dropzone
               onDrop={(files) => {

src/app/admin/(dashboard)/desa/layanan/pelayanan_surat_keterangan/[id]/page.tsx

@@ -100,7 +100,7 @@ function DetailSuratKeterangan() {
 
               <Box>
                 <Text fz="lg" fw="bold">
-                  Gambar
+                Gambar Konten Pelayanan
                 </Text>
                 {data?.image?.link ? (
                   <Image
@@ -120,7 +120,7 @@ function DetailSuratKeterangan() {
 
               <Box>
                 <Text fz="lg" fw="bold">
-                  Gambar 2
+                Gambar Alur Pelayanan Surat
                 </Text>
                 {data?.image2?.link ? (
                   <Image

src/app/admin/(dashboard)/desa/layanan/pelayanan_surat_keterangan/create/page.tsx

@@ -126,10 +126,10 @@ function CreateSuratKeterangan() {
             />
           </Box>
 
-          {/* Gambar Utama */}
+          {/* Gambar Konten Pelayanan */}
           <Box>
             <Text fw="bold" fz="sm" mb={6}>
-              Gambar Utama
+              Gambar Konten Pelayanan
             </Text>
             <Dropzone
               onDrop={(files) => {
@@ -175,10 +175,10 @@ function CreateSuratKeterangan() {
             )}
           </Box>
 
-          {/* Gambar Tambahan */}
+          {/* Gambar Alur Pelayanan Surat */}
           <Box>
             <Text fw="bold" fz="sm" mb={6}>
-              Gambar Tambahan (Opsional)
+              Gambar Alur Pelayanan Surat
             </Text>
             <Dropzone
               onDrop={(files) => {

src/app/admin/(dashboard)/desa/pengumuman/_com/layoutTabs.tsx

@@ -1,7 +1,7 @@
 /* eslint-disable react-hooks/exhaustive-deps */
 'use client'
 import colors from '@/con/colors';
-import { Stack, Tabs, TabsList, TabsPanel, TabsTab, Title, Tooltip } 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 { IconListDetails, IconCategory } from '@tabler/icons-react';
@@ -48,37 +48,44 @@ function LayoutTabsLayanan({ children }: { children: React.ReactNode }) {
         <Stack gap="lg">
             <Title order={3} fw={700} style={{ color: "#1A1B1E" }}>Pengumuman</Title>
             <Tabs
-                color={colors['blue-button']}
-                variant='pills'
+                color={colors["blue-button"]}
+                variant="pills"
                 value={activeTab}
                 onChange={handleTabChange}
                 radius="lg"
                 keepMounted={false}
             >
-                <TabsList
-                    p="sm"
-                    style={{
-                        background: "linear-gradient(135deg, #e7ebf7, #f9faff)",
-                        borderRadius: "1rem",
-                        boxShadow: "inset 0 0 10px rgba(0,0,0,0.05)",
-                    }}
-                >
-                    {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>
+                {/* ✅ 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

src/app/admin/(dashboard)/desa/potensi/_lib/layoutTabs.tsx

@@ -1,7 +1,7 @@
 /* eslint-disable react-hooks/exhaustive-deps */
 'use client'
 import colors from '@/con/colors';
-import { Stack, Tabs, TabsList, TabsPanel, TabsTab, Title, Tooltip } from '@mantine/core';
+import { ScrollArea, Stack, Tabs, TabsList, TabsPanel, TabsTab, Title, Tooltip } from '@mantine/core';
 import { IconCategory, IconListCheck } from '@tabler/icons-react';
 import { usePathname, useRouter } from 'next/navigation';
 import React, { useEffect, useState } from 'react';
@@ -48,37 +48,44 @@ function LayoutTabsPotensi({ children }: { children: React.ReactNode }) {
         <Stack gap="lg">
             <Title order={3} fw={700} style={{ color: "#1A1B1E" }}>Potensi</Title>
             <Tabs
-                color={colors['blue-button']}
-                variant='pills'
+                color={colors["blue-button"]}
+                variant="pills"
                 value={activeTab}
                 onChange={handleTabChange}
                 radius="lg"
                 keepMounted={false}
             >
-                <TabsList
-                    p="sm"
-                    style={{
-                        background: "linear-gradient(135deg, #e7ebf7, #f9faff)",
-                        borderRadius: "1rem",
-                        boxShadow: "inset 0 0 10px rgba(0,0,0,0.05)",
-                    }}
-                >
-                    {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>
+                {/* ✅ 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

src/app/admin/(dashboard)/desa/profile/_lib/layoutTabsDetail.tsx

@@ -1,7 +1,7 @@
 /* eslint-disable react-hooks/exhaustive-deps */
 'use client'
 import colors from '@/con/colors';
-import { Stack, Tabs, TabsList, TabsPanel, TabsTab, Title, Tooltip } 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 { IconUser, IconUsers, IconCalendar } from '@tabler/icons-react';
@@ -55,56 +55,63 @@ function LayoutTabsDetail({ children }: { children: React.ReactNode }) {
         <Stack gap="lg">
             <Title order={3} fw={700} style={{ color: "#1A1B1E" }}>Profile Desa</Title>
             <Tabs
-                color={colors['blue-button']}
-                variant='pills'
+                color={colors["blue-button"]}
+                variant="pills"
                 value={activeTab}
                 onChange={handleTabChange}
                 radius="lg"
                 keepMounted={false}
             >
-                <TabsList
-                    p="sm"
-                    style={{
-                        background: "linear-gradient(135deg, #e7ebf7, #f9faff)",
-                        borderRadius: "1rem",
-                        boxShadow: "inset 0 0 10px rgba(0,0,0,0.05)",
-                    }}
-                >
-                    {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>
-
-                {tabs.map((tab, i) => (
-                    <TabsPanel
-                        key={i}
-                        value={tab.value}
+                {/* ✅ Scroll horizontal wrapper */}
+                <ScrollArea type="auto" offsetScrollbars>
+                    <TabsList
+                        p="sm"
                         style={{
-                            padding: "1.5rem",
-                            background: "linear-gradient(180deg, #ffffff, #f5f6fa)",
+                            background: "linear-gradient(135deg, #e7ebf7, #f9faff)",
                             borderRadius: "1rem",
-                            boxShadow: "0 4px 16px rgba(0,0,0,0.05)",
+                            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
                         }}
                     >
-                        {/* Konten dummy, bisa diganti sesuai routing */}
-                        <>{children}</>
-                    </TabsPanel>
-                ))}
-            </Tabs>
-        </Stack>
-    );
+                            {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>
+                </Stack>
+                );
 }
 
-export default LayoutTabsDetail;
+                export default LayoutTabsDetail;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

src/app/admin/(dashboard)/ekonomi/demografi-pekerjaan/[id]/page.tsx

@@ -1,8 +1,17 @@
 /* eslint-disable react-hooks/exhaustive-deps */
-'use client'
+'use client';
 
 import colors from '@/con/colors';
-import { Box, Button, Paper, Stack, 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 } from 'react';
@@ -11,33 +20,33 @@ import { useProxy } from 'valtio/utils';
 import demografiPekerjaan from '../../../_state/ekonomi/demografi-pekerjaan';
 
 function EditDemografiPekerjaan() {
-  const router = useRouter()
-  const params = useParams() as { id: string }
-  const stateDemografi = useProxy(demografiPekerjaan)
+  const router = useRouter();
+  const params = useParams() as { id: string };
+  const stateDemografi = useProxy(demografiPekerjaan);
 
-  const id = params.id
+  const id = params.id;
 
   useEffect(() => {
     if (!id) return;
     stateDemografi.update.id = id;
-    stateDemografi.findUnique.load(id)
+    stateDemografi.findUnique
+      .load(id)
       .then(() => {
         const data = stateDemografi.findUnique.data;
         if (data) {
           stateDemografi.update.form = {
             pekerjaan: String(data.pekerjaan || ''),
             lakiLaki: Number(data.lakiLaki || 0),
-            perempuan: Number(data.perempuan || 0)
+            perempuan: Number(data.perempuan || 0),
           };
         }
       })
-      .catch(error => {
+      .catch((error) => {
         console.error('Error loading data:', error);
         toast.error('Gagal memuat data');
       });
   }, [id]);
 
-  // Di handleSubmit, ubah menjadi:
   const handleSubmit = async () => {
     try {
       stateDemografi.update.id = id;
@@ -51,52 +60,88 @@ function EditDemografiPekerjaan() {
   };
 
   return (
-    <Box>
-      <Box mb={10}>
-        <Button variant="subtle" onClick={() => router.back()}>
-          <IconArrowBack size={20} />
-        </Button>
-      </Box>
-      <Paper bg={colors['white-1']} w={{ base: '100%', md: '50%' }} p={'md'}>
-        <Stack>
-          <Title order={3}>Edit Demografi Pekerjaan</Title>
+    <Box px={{ base: 'sm', md: 'lg' }} py="md">
+      {/* Header */}
+      <Group mb="md">
+        <Tooltip label="Kembali ke halaman sebelumnya" withArrow>
+          <Button
+            variant="subtle"
+            onClick={() => router.back()}
+            p="xs"
+            radius="md"
+          >
+            <IconArrowBack color={colors['blue-button']} size={24} />
+          </Button>
+        </Tooltip>
+        <Title order={4} ml="sm" c="dark">
+          Edit Demografi Pekerjaan
+        </Title>
+      </Group>
+
+      {/* Form Card */}
+      <Paper
+        w={{ base: '100%', md: '50%' }}
+        bg={colors['white-1']}
+        p="lg"
+        radius="md"
+        shadow="sm"
+        style={{ border: '1px solid #e0e0e0' }}
+      >
+        <Stack gap="md">
           <TextInput
             label="Pekerjaan"
-            placeholder="masukkan pekerjaan"
+            placeholder="Masukkan jenis pekerjaan"
             value={stateDemografi.update.form.pekerjaan}
-            onChange={(val) => {
-              stateDemografi.update.form.pekerjaan = val.currentTarget.value;
-            }}
+            onChange={(e) =>
+              (stateDemografi.update.form.pekerjaan = e.currentTarget.value)
+            }
+            required
           />
+
           <TextInput
-            label="Jumlah Pekerja Laki - Laki"
+            label="Jumlah Pekerja Laki-laki"
             type="number"
-            placeholder="masukkan jumlah pekerja laki - laki"
+            placeholder="Masukkan jumlah pekerja laki-laki"
             value={stateDemografi.update.form.lakiLaki}
-            onChange={(val) => {
-              stateDemografi.update.form.lakiLaki = Number(val.currentTarget.value);
-            }}
+            onChange={(e) =>
+              (stateDemografi.update.form.lakiLaki = Number(
+                e.currentTarget.value
+              ))
+            }
+            required
           />
+
           <TextInput
             label="Jumlah Pekerja Perempuan"
             type="number"
-            placeholder="masukkan jumlah pekerja perempuan"
+            placeholder="Masukkan jumlah pekerja perempuan"
             value={stateDemografi.update.form.perempuan}
-            onChange={(val) => {
-              stateDemografi.update.form.perempuan = Number(val.currentTarget.value);
-            }}
+            onChange={(e) =>
+              (stateDemografi.update.form.perempuan = Number(
+                e.currentTarget.value
+              ))
+            }
+            required
           />
-          <Button
-            mt={10}
-            bg={colors['blue-button']}
-            onClick={handleSubmit}
-          >
-            Simpan Perubahan
-          </Button>
+
+          <Group justify="flex-end">
+            <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 EditDemografiPekerjaan;

src/app/admin/(dashboard)/ekonomi/demografi-pekerjaan/create/page.tsx

@@ -1,8 +1,18 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 /* eslint-disable @typescript-eslint/no-explicit-any */
-'use client'
+'use client';
+
 import colors from '@/con/colors';
-import { Box, Button, Group, Paper, Stack, TextInput, Title } from '@mantine/core';
+import {
+  Box,
+  Button,
+  Group,
+  Paper,
+  Stack,
+  TextInput,
+  Title,
+  Tooltip,
+} from '@mantine/core';
 import { IconArrowBack } from '@tabler/icons-react';
 import { useRouter } from 'next/navigation';
 import { useState } from 'react';
@@ -12,15 +22,15 @@ import demografiPekerjaan from '../../../_state/ekonomi/demografi-pekerjaan';
 function CreateDemografiPekerjaan() {
   const stateDemografi = useProxy(demografiPekerjaan);
   const [chartData, setChartData] = useState<any[]>([]);
-  const router = useRouter()
+  const router = useRouter();
 
   const resetForm = () => {
     stateDemografi.create.form = {
-      pekerjaan: "",
+      pekerjaan: '',
       lakiLaki: 0,
       perempuan: 0,
-    }
-  }
+    };
+  };
 
   const handleSubmit = async () => {
     const id = await stateDemografi.create.create();
@@ -32,58 +42,85 @@ function CreateDemografiPekerjaan() {
       }
     }
     resetForm();
-    router.push("/admin/ekonomi/demografi-pekerjaan");
-  }
+    router.push('/admin/ekonomi/demografi-pekerjaan');
+  };
+
   return (
-    <Box>
-      <Box mb={10}>
-        <Button variant="subtle" onClick={() => router.back()}>
-          <IconArrowBack size={20} />
-        </Button>
-      </Box>
-      <Box>
-        <Paper w={{ base: '100%', md: '50%' }} bg={colors['white-1']} p={'md'}>
-          <Title order={4}>Tambah Demografi Pekerjaan</Title>
-          <Stack gap={"xs"}>
-            <TextInput
-              label="Pekerjaan"
-              type="text"
-              value={stateDemografi.create.form.pekerjaan}
-              placeholder="Masukkan pekerjaan"
-              onChange={(val) => {
-                stateDemografi.create.form.pekerjaan = val.currentTarget.value;
+    <Box px={{ base: 'sm', md: 'lg' }} py="md">
+      {/* Header */}
+      <Group mb="md">
+        <Tooltip label="Kembali ke halaman sebelumnya" withArrow>
+          <Button
+            variant="subtle"
+            onClick={() => router.back()}
+            p="xs"
+            radius="md"
+          >
+            <IconArrowBack color={colors['blue-button']} size={24} />
+          </Button>
+        </Tooltip>
+        <Title order={4} ml="sm" c="dark">
+          Tambah Demografi Pekerjaan
+        </Title>
+      </Group>
+
+      {/* Form */}
+      <Paper
+        w={{ base: '100%', md: '50%' }}
+        bg={colors['white-1']}
+        p="lg"
+        radius="md"
+        shadow="sm"
+        style={{ border: '1px solid #e0e0e0' }}
+      >
+        <Stack gap="md">
+          <TextInput
+            label="Pekerjaan"
+            type="text"
+            value={stateDemografi.create.form.pekerjaan}
+            placeholder="Masukkan pekerjaan"
+            onChange={(val) => {
+              stateDemografi.create.form.pekerjaan = val.currentTarget.value;
+            }}
+            required
+          />
+          <TextInput
+            label="Jumlah Pekerja Laki-Laki"
+            type="number"
+            value={stateDemografi.create.form.lakiLaki}
+            placeholder="Masukkan jumlah pekerja laki-laki"
+            onChange={(val) => {
+              stateDemografi.create.form.lakiLaki = Number(val.currentTarget.value);
+            }}
+            required
+          />
+          <TextInput
+            label="Jumlah Pekerja Perempuan"
+            type="number"
+            value={stateDemografi.create.form.perempuan}
+            placeholder="Masukkan jumlah pekerja perempuan"
+            onChange={(val) => {
+              stateDemografi.create.form.perempuan = Number(val.currentTarget.value);
+            }}
+            required
+          />
+
+          <Group justify="right">
+            <Button
+              onClick={handleSubmit}
+              radius="md"
+              size="md"
+              style={{
+                background: `linear-gradient(135deg, ${colors['blue-button']}, #4facfe)`,
+                color: '#fff',
+                boxShadow: '0 4px 15px rgba(79, 172, 254, 0.4)',
               }}
-            />
-            <TextInput
-              label="Jumlah Pekerja Laki - Laki"
-              type="number"
-              value={stateDemografi.create.form.lakiLaki}
-              placeholder="Masukkan jumlah pekerja laki - laki"
-              onChange={(val) => {
-                stateDemografi.create.form.lakiLaki = Number(val.currentTarget.value);
-              }}
-            />
-            <TextInput
-              label="Jumlah Pekerja Perempuan"
-              type="number"
-              value={stateDemografi.create.form.perempuan}
-              placeholder="Masukkan jumlah pekerja perempuan"
-              onChange={(val) => {
-                stateDemografi.create.form.perempuan = Number(val.currentTarget.value);
-              }}
-            />
-            <Group>
-              <Button
-                bg={colors['blue-button']}
-                mt={10}
-                onClick={handleSubmit}
-              >
-                Submit
-              </Button>
-            </Group>
-          </Stack>
-        </Paper>
-      </Box>
+            >
+              Simpan
+            </Button>
+          </Group>
+        </Stack>
+      </Paper>
     </Box>
   );
 }

src/app/admin/(dashboard)/ekonomi/demografi-pekerjaan/page.tsx

@@ -1,14 +1,32 @@
 'use client'
 import colors from '@/con/colors';
 import { BarChart } from '@mantine/charts';
-import { Box, Button, Paper, Table, TableTbody, TableTd, TableTh, TableThead, TableTr, Text, Title } from '@mantine/core';
+import {
+  Box,
+  Button,
+  Center,
+  Group,
+  Paper,
+  Skeleton,
+  Stack,
+  Table,
+  TableTbody,
+  TableTd,
+  TableTh,
+  TableThead,
+  TableTr,
+  Text,
+  Title,
+  Tooltip,
+  Pagination,
+  Flex,
+} from '@mantine/core';
 import { useShallowEffect } from '@mantine/hooks';
-import { IconEdit, IconSearch, IconTrash } from '@tabler/icons-react';
+import { IconEdit, IconPlus, IconSearch, IconTrash } from '@tabler/icons-react';
 import { useRouter } from 'next/navigation';
 import { 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 demografiPekerjaan from '../../_state/ekonomi/demografi-pekerjaan';
 
@@ -18,7 +36,7 @@ function DemografiPekerjaan() {
     <Box>
       <HeaderSearch
         title='Demografi Pekerjaan'
-        placeholder='pencarian'
+        placeholder='Cari pekerjaan atau jumlah pekerja...'
         searchIcon={<IconSearch size={20} />}
         value={search}
         onChange={(e) => setSearch(e.currentTarget.value)}
@@ -34,131 +52,193 @@ function ListDemografiPekerjaan({ search }: { search: string }) {
     pekerjaan: string;
     lakiLaki: number;
     perempuan: number;
-  }
+  };
 
   const router = useRouter();
-  const stateDemografi = useProxy(demografiPekerjaan)
+  const stateDemografi = useProxy(demografiPekerjaan);
   const [chartData, setChartData] = useState<DemografiPekerjaan[]>([]);
-  const [mounted, setMounted] = useState(false); // untuk memastikan DOM sudah ready
-  const [modalHapus, setModalHapus] = useState(false)
-  const [selectedId, setSelectedId] = useState<string | null>(null)
+  const [mounted, setMounted] = useState(false);
+  const [modalHapus, setModalHapus] = useState(false);
+  const [selectedId, setSelectedId] = useState<string | null>(null);
+
+  const {
+    data,
+    page,
+    totalPages,
+    loading,
+    load,
+  } = stateDemografi.findMany;
 
   const handleDelete = () => {
     if (selectedId) {
-      stateDemografi.delete.byId(selectedId)
-      setModalHapus(false)
-      setSelectedId(null)
-
-      stateDemografi.findMany.load()
+      stateDemografi.delete.byId(selectedId);
+      setModalHapus(false);
+      setSelectedId(null);
     }
-  }
+  };
 
   useShallowEffect(() => {
-    setMounted(true)
-    stateDemografi.findMany.load()
-  }, [])
+    setMounted(true);
+    load(page, 10, search);
+  }, [page, search]);
 
   useEffect(() => {
-    setMounted(true);
-    if (stateDemografi.findMany.data) {
-      setChartData(stateDemografi.findMany.data.map((item) => ({
-        id: item.id,
-        pekerjaan: item.pekerjaan,
-        lakiLaki: Number(item.lakiLaki),
-        perempuan: Number(item.perempuan),
-      })));
+    if (data) {
+      setChartData(
+        data.map((item) => ({
+          id: item.id,
+          pekerjaan: item.pekerjaan,
+          lakiLaki: Number(item.lakiLaki),
+          perempuan: Number(item.perempuan),
+        }))
+      );
     }
-  }, [stateDemografi.findMany.data]);
+  }, [data]);
 
-  const filteredData = (stateDemografi.findMany.data || []).filter(item => {
-    const keyword = search.toLowerCase();
+  const filteredData = data || [];
+
+  if (loading || !data) {
     return (
-      item.pekerjaan.toLowerCase().includes(keyword) ||
-      item.lakiLaki.toString().toLowerCase().includes(keyword) ||
-      item.perempuan.toString().toLowerCase().includes(keyword)
+      <Stack py={10}>
+        <Skeleton height={600} radius="md" />
+      </Stack>
     );
-  });
+  }
+
   return (
     <Box py={10}>
-      <Paper bg={colors['white-1']} p={'md'}>
-        <JudulList
-          title='List Demografi Pekerjaan'
-          href='/admin/ekonomi/demografi-pekerjaan/create'
-        />
-        <Table striped withTableBorder withRowBorders>
-          <TableThead>
-            <TableTr>
-              <TableTh>Pekerjaan</TableTh>
-              <TableTh>Jumlah Pekerja Laki - Laki</TableTh>
-              <TableTh>Jumlah Pekerja Perempuan</TableTh>
-              <TableTh>Edit</TableTh>
-              <TableTh>Delete</TableTh>
-            </TableTr>
-          </TableThead>
-          <TableTbody>
-            {filteredData.map((item) => (
-              <TableTr key={item.id}>
-                <TableTd>{item.pekerjaan}</TableTd>
-                <TableTd>{item.lakiLaki}</TableTd>
-                <TableTd>{item.perempuan}</TableTd>
-                <TableTd>
-                  <Button color='green' onClick={() => router.push(`/admin/ekonomi/demografi-pekerjaan/${item.id}`)}>
-                    <IconEdit size={20} />
-                  </Button>
-                </TableTd>
-                <TableTd>
-                  <Button
-                    color='red'
-                    disabled={stateDemografi.delete.loading}
-                    onClick={() => {
-                      setSelectedId(item.id)
-                      setModalHapus(true)
-                    }}>
-                    <IconTrash size={20} />
-                  </Button>
-                </TableTd>
+      <Paper withBorder bg={colors['white-1']} p="lg" shadow="md" radius="md">
+        <Group justify="space-between" mb="md">
+          <Title order={4}>List Demografi Pekerjaan</Title>
+          <Tooltip label="Tambah Data Pekerjaan" withArrow>
+            <Button
+              leftSection={<IconPlus size={18} />}
+              color="blue"
+              variant="light"
+              onClick={() => router.push('/admin/ekonomi/demografi-pekerjaan/create')}
+            >
+              Tambah Baru
+            </Button>
+          </Tooltip>
+        </Group>
+
+        <Box style={{ overflowX: 'auto' }}>
+          <Table highlightOnHover>
+            <TableThead>
+              <TableTr>
+                <TableTh>Pekerjaan</TableTh>
+                <TableTh>Laki - Laki</TableTh>
+                <TableTh>Perempuan</TableTh>
+                <TableTh>Edit</TableTh>
+                <TableTh>Hapus</TableTh>
               </TableTr>
-            ))}
-          </TableTbody>
-        </Table>
+            </TableThead>
+            <TableTbody>
+              {filteredData.length > 0 ? (
+                filteredData.map((item) => (
+                  <TableTr key={item.id}>
+                    <TableTd>{item.pekerjaan}</TableTd>
+                    <TableTd>{item.lakiLaki}</TableTd>
+                    <TableTd>{item.perempuan}</TableTd>
+                    <TableTd>
+                      <Button
+                        variant="light"
+                        color="green"
+                        onClick={() =>
+                          router.push(`/admin/ekonomi/demografi-pekerjaan/${item.id}`)
+                        }
+                      >
+                        <IconEdit size={18} />
+                      </Button>
+                    </TableTd>
+                    <TableTd>
+                      <Button
+                        variant="light"
+                        color="red"
+                        disabled={stateDemografi.delete.loading}
+                        onClick={() => {
+                          setSelectedId(item.id);
+                          setModalHapus(true);
+                        }}
+                      >
+                        <IconTrash size={18} />
+                      </Button>
+                    </TableTd>
+                  </TableTr>
+                ))
+              ) : (
+                <TableTr>
+                  <TableTd colSpan={4}>
+                    <Center py={20}>
+                      <Text color="dimmed">Tidak ada data demografi pekerjaan yang cocok</Text>
+                    </Center>
+                  </TableTd>
+                </TableTr>
+              )}
+            </TableTbody>
+          </Table>
+        </Box>
       </Paper>
 
+      {/* Pagination */}
+      <Center>
+        <Pagination
+          value={page}
+          onChange={(newPage) => {
+            load(newPage, 10, search);
+            window.scrollTo({ top: 0, behavior: 'smooth' });
+          }}
+          total={totalPages}
+          mt="md"
+          mb="md"
+          color="blue"
+          radius="md"
+        />
+      </Center>
+
       {/* Chart */}
-      {!mounted && !chartData ? (
-        <Box style={{ width: '100%', minWidth: 300, height: 400, minHeight: 300 }}>
-          <Paper bg={colors['white-1']} p={'md'}>
-            <Title pb={10} order={3}>Data Kelahiran & Kematian</Title>
-            <Text c='dimmed'>Belum ada data untuk ditampilkan dalam grafik</Text>
-          </Paper>
-        </Box>
-      ) : (
-        <Box style={{ width: '100%', minWidth: 300, height: 400, minHeight: 300 }}>
-          <Paper bg={colors['white-1']} p={'md'}>
-            <Title pb={10} order={4}>Data Kelahiran & Kematian</Title>
-            {mounted && chartData.length > 0 && (
-              <Box w={{ base: '100%', md: '30%' }}>
-                <BarChart
-                  h={450}
-                  data={chartData}
-                  dataKey="pekerjaan"
-                  type="stacked"
-                  series={[
-                    { name: 'lakiLaki', color: '#5082EE', label: 'Laki - Laki' },
-                    { name: 'perempuan', color: '#6EDF9C', label: 'Perempuan' },
-                  ]}
-                />
-              </Box>
+      <Box mt={30} style={{ width: '100%', minHeight: 400 }}>
+        <Paper bg={colors['white-1']} p="md" radius="md" withBorder>
+          <Stack gap={"xs"}>
+            <Title pb={10} order={4}>
+              Grafik Demografi Pekerjaan
+            </Title>
+            {mounted && chartData.length > 0 ? (
+              <BarChart
+                h={450}
+                data={chartData}
+                dataKey="pekerjaan"
+                type="stacked"
+                series={[
+                  { name: 'lakiLaki', color: '#5082EE', label: 'Laki - Laki' },
+                  { name: 'perempuan', color: '#6EDF9C', label: 'Perempuan' },
+                ]}
+              />
+            ) : (
+              <Text c="dimmed">Belum ada data untuk ditampilkan dalam grafik</Text>
             )}
-          </Paper>
-        </Box>
-      )}
+            <Box py={10}>
+              <Group justify='center'>
+                <Flex align="center" gap={10}>
+                  <Box bg="#5082EE" w={20} h={20} />
+                  <Text>Laki - Laki</Text>
+                </Flex>
+                <Flex align="center" gap={10}>
+                  <Box bg="#6EDF9C" w={20} h={20} />
+                  <Text>Perempuan</Text>
+                </Flex>
+              </Group>
+            </Box>
+          </Stack>
+        </Paper>
+      </Box>
 
       {/* Modal Konfirmasi Hapus */}
       <ModalKonfirmasiHapus
         opened={modalHapus}
         onClose={() => setModalHapus(false)}
         onConfirm={handleDelete}
-        text='Apakah anda yakin ingin menghapus demografi pekerjaan ini?'
+        text="Apakah anda yakin ingin menghapus demografi pekerjaan ini?"
       />
     </Box>
   );

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

@@ -3,78 +3,116 @@
 
 import jumlahPendudukMiskin from '@/app/admin/(dashboard)/_state/ekonomi/jumlah-penduduk-miskin';
 import colors from '@/con/colors';
-import { Box, Button, Paper, Stack, TextInput, Title } from '@mantine/core';
+import { Box, Button, Paper, Stack, TextInput, Title, Group, Tooltip } from '@mantine/core';
 import { IconArrowBack } from '@tabler/icons-react';
 import { useParams, useRouter } from 'next/navigation';
 import { useEffect } from 'react';
 import { useProxy } from 'valtio/utils';
+import { toast } from 'react-toastify';
 
 function EditJumlahPendudukMiskin() {
-  const router = useRouter()
-  const params = useParams() as { id: string }
-  const stateJPM = useProxy(jumlahPendudukMiskin)
+  const router = useRouter();
+  const params = useParams() as { id: string };
+  const stateJPM = useProxy(jumlahPendudukMiskin);
 
-  const id = params.id
+  const id = params.id;
 
-  // Load data saat komponen mount
   useEffect(() => {
-    if (id) {
-      stateJPM.findUnique.load(id).then(() => {
-        const data = stateJPM.findUnique.data
+    if (!id) return;
+
+    const loadData = async () => {
+      try {
+        await stateJPM.findUnique.load(id);
+        const data = stateJPM.findUnique.data;
         if (data) {
           stateJPM.update.form = {
             year: data.year || 0,
             totalPoorPopulation: data.totalPoorPopulation || 0,
-          }
+          };
         }
-      })
-    }
-  }, [id])
+      } catch (error) {
+        console.error('Gagal memuat data:', error);
+        toast.error('Gagal memuat data jumlah penduduk miskin');
+      }
+    };
+
+    loadData();
+  }, [id]);
 
   const handleSubmit = async () => {
-    // Set the ID before submitting
-    stateJPM.update.id = id;
-    await stateJPM.update.submit();
-    router.push('/admin/ekonomi/jumlah-penduduk-miskin')
-  }
-return (
-    <Box>
-      <Box mb={10}>
-        <Button variant="subtle" onClick={() => router.back()}>
-          <IconArrowBack size={20} />
-        </Button>
-      </Box>
-      <Paper bg={colors['white-1']} w={{ base: '100%', md: '50%' }} p={'md'}>
-        <Stack>
-          <Title order={3}>Edit Jumlah Penduduk Miskin</Title>
+    try {
+      stateJPM.update.id = id;
+      await stateJPM.update.submit();
+      toast.success('Data jumlah penduduk miskin berhasil diperbarui!');
+      router.push('/admin/ekonomi/jumlah-penduduk-miskin');
+    } catch (error) {
+      console.error('Gagal menyimpan data:', error);
+      toast.error('Terjadi kesalahan saat menyimpan data');
+    }
+  };
+
+  return (
+    <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 Jumlah Penduduk Miskin
+        </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="Tahun"
-            placeholder="masukkan tahun"
+            placeholder="Masukkan tahun"
+            type="number"
+            required
             value={stateJPM.update.form.year}
             onChange={(val) => {
               stateJPM.update.form.year = Number(val.currentTarget.value);
             }}
           />
+
           <TextInput
             label="Jumlah Penduduk Miskin"
+            placeholder="Masukkan jumlah penduduk miskin"
             type="number"
-            placeholder="masukkan jumlah penduduk miskin"
+            required
             value={stateJPM.update.form.totalPoorPopulation}
             onChange={(val) => {
               stateJPM.update.form.totalPoorPopulation = Number(val.currentTarget.value);
             }}
           />
-          <Button
-            mt={10}
-            bg={colors['blue-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>
-  )
+  );
 }
 
 export default EditJumlahPendudukMiskin;

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

@@ -1,26 +1,25 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 /* eslint-disable @typescript-eslint/no-explicit-any */
-'use client'
-import grafikkepuasan from '@/app/admin/(dashboard)/_state/kesehatan/data_kesehatan_warga/grafikKepuasan';
-import colors from '@/con/colors';
-import { Box, Button, Group, Paper, Stack, TextInput, Title } from '@mantine/core';
+'use client';
+import { Box, Button, Group, Paper, Stack, TextInput, Title, Tooltip } from '@mantine/core';
 import { IconArrowBack } from '@tabler/icons-react';
 import { useRouter } from 'next/navigation';
 import { useState } from 'react';
 import { useProxy } from 'valtio/utils';
+import colors from '@/con/colors';
 import jumlahPendudukMiskin from '../../../_state/ekonomi/jumlah-penduduk-miskin';
 
-function CreateJumlahPendudukMiskin() {
+export default function CreateJumlahPendudukMiskin() {
   const stateJPM = useProxy(jumlahPendudukMiskin);
   const [chartData, setChartData] = useState<any[]>([]);
-  const router = useRouter()
+  const router = useRouter();
 
   const resetForm = () => {
     stateJPM.create.form = {
-      year: 0,
+      year: new Date().getFullYear(),
       totalPoorPopulation: 0,
-    }
-  }
+    };
+  };
 
   const handleSubmit = async () => {
     const id = await stateJPM.create.create();
@@ -32,51 +31,72 @@ function CreateJumlahPendudukMiskin() {
       }
     }
     resetForm();
-    router.push("/admin/ekonomi/jumlah-penduduk-miskin");
-  }
+    router.push('/admin/ekonomi/jumlah-penduduk-miskin');
+  };
+
   return (
-    <Box>
-      <Box mb={10}>
-        <Button variant="subtle" onClick={() => router.back()}>
-          <IconArrowBack size={20} />
-        </Button>
-      </Box>
-      <Box>
-        <Paper w={{ base: '100%', md: '50%' }} bg={colors['white-1']} p={'md'}>
-          <Title order={4}>Tambah Grafik Hasil Kepuasan Masyarakat</Title>
-          <Stack gap={"xs"}>
-            <TextInput
-              label="Tahun"
-              type="number"
-              value={stateJPM.create.form.year}
-              placeholder="Masukkan tahun"
-              onChange={(val) => {
-                stateJPM.create.form.year = Number(val.currentTarget.value);
+    <Box px={{ base: 'sm', md: 'lg' }} py="md">
+      {/* Header */}
+      <Group mb="md">
+        <Tooltip label="Kembali ke halaman sebelumnya" withArrow>
+          <Button variant="subtle" onClick={() => router.back()} p="xs" radius="md">
+            <IconArrowBack color={colors['blue-button']} size={24} />
+          </Button>
+        </Tooltip>
+        <Title order={4} ml="sm" c="dark">
+          Tambah Jumlah Penduduk Miskin
+        </Title>
+      </Group>
+
+      {/* Form Paper */}
+      <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="Tahun"
+            type="number"
+            value={stateJPM.create.form.year || ''}
+            placeholder="Masukkan tahun"
+            onChange={(e) => {
+              const value = e.currentTarget.value;
+              stateJPM.create.form.year = value ? Number(value) : 0;
+            }}
+            required
+          />
+
+          <TextInput
+            label="Jumlah Penduduk Miskin"
+            type="number"
+            value={stateJPM.create.form.totalPoorPopulation}
+            placeholder="Masukkan jumlah penduduk miskin"
+            onChange={(e) => {
+              stateJPM.create.form.totalPoorPopulation = Number(e.currentTarget.value);
+            }}
+            required
+          />
+
+          <Group justify="right">
+            <Button
+              onClick={handleSubmit}
+              radius="md"
+              size="md"
+              style={{
+                background: `linear-gradient(135deg, ${colors['blue-button']}, #4facfe)`,
+                color: '#fff',
+                boxShadow: '0 4px 15px rgba(79, 172, 254, 0.4)',
               }}
-            />
-            <TextInput
-              label="Jumlah Penduduk Miskin"
-              type="number"
-              value={stateJPM.create.form.totalPoorPopulation}
-              placeholder="Masukkan jumlah penduduk miskin"
-              onChange={(val) => {
-                stateJPM.create.form.totalPoorPopulation = Number(val.currentTarget.value);
-              }}
-            />
-            <Group>
-              <Button
-                bg={colors['blue-button']}
-                mt={10}
-                onClick={handleSubmit}
-              >
-                Submit
-              </Button>
-            </Group>
-          </Stack>
-        </Paper>
-      </Box>
+            >
+              Simpan
+            </Button>
+          </Group>
+        </Stack>
+      </Paper>
     </Box>
   );
 }
-
-export default CreateJumlahPendudukMiskin;

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

@@ -1,15 +1,14 @@
 'use client'
 import colors from '@/con/colors';
-import { Box, Button, Paper, Skeleton, Stack, Table, TableTbody, TableTd, TableTh, TableThead, TableTr, Text, Title } 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 { IconEdit, IconSearch, IconTrash } from '@tabler/icons-react';
 import HeaderSearch from '../../_com/header';
-import JudulList from '../../_com/judulList';
 import { useRouter } from 'next/navigation';
 import { useEffect, useState } from 'react';
-import { useMediaQuery, useShallowEffect } from '@mantine/hooks';
+import { useShallowEffect, useMediaQuery } from '@mantine/hooks';
 import { useProxy } from 'valtio/utils';
 import jumlahPendudukMiskin from '../../_state/ekonomi/jumlah-penduduk-miskin';
-import { Bar, BarChart, Legend, XAxis, YAxis, Tooltip } from 'recharts';
+import { Bar, BarChart, Legend, XAxis, YAxis, Tooltip as RechartsTooltip } from 'recharts';
 import { ModalKonfirmasiHapus } from '../../_com/modalKonfirmasiHapus';
 
 function JumlahPendudukMiskin() {
@@ -18,7 +17,7 @@ function JumlahPendudukMiskin() {
     <Box>
       <HeaderSearch
         title='Jumlah Penduduk Miskin'
-        placeholder='pencarian'
+        placeholder='Cari tahun atau jumlah penduduk miskin...'
         searchIcon={<IconSearch size={20} />}
         value={search}
         onChange={(e) => setSearch(e.currentTarget.value)}
@@ -29,138 +28,158 @@ function JumlahPendudukMiskin() {
 }
 
 function ListJumlahPendudukMiskin({ search }: { search: string }) {
-  type JPMGrafik = {
-    id: string;
-    year: number;
-    totalPoorPopulation: number;
-  }
+  type JPMGrafik = { id: string; year: number; totalPoorPopulation: number }
   const stateJPM = useProxy(jumlahPendudukMiskin);
   const [chartData, setChartData] = useState<JPMGrafik[]>([]);
-  const [mounted, setMounted] = useState(false); // untuk memastikan DOM sudah ready
-  const isTablet = useMediaQuery('(max-width: 1024px)')
-  const isMobile = useMediaQuery('(max-width: 768px)')
-  const [modalHapus, setModalHapus] = useState(false)
-  const [selectedId, setSelectedId] = useState<string | null>(null)
+  const [mounted, setMounted] = useState(false);
+  const [modalHapus, setModalHapus] = useState(false);
+  const [selectedId, setSelectedId] = useState<string | null>(null);
   const router = useRouter();
 
-  const handleDelete = () => {
-    if (selectedId) {
-      stateJPM.delete.byId(selectedId)
-      setModalHapus(false)
-      setSelectedId(null)
-
-      stateJPM.findMany.load()
-    }
-  }
+  const isTablet = useMediaQuery('(max-width:1024px)');
+  const isMobile = useMediaQuery('(max-width:768px)');
 
+  const {
+    data,
+    page,
+    loading,
+    load,
+    totalPages,
+  } = stateJPM.findMany;
+  // Load data
   useShallowEffect(() => {
-    setMounted(true)
-    stateJPM.findMany.load()
-  }, [])
+    setMounted(true);
+    load(page, 10, search);
+  }, [page, search]);
 
   useEffect(() => {
-    setMounted(true);
     if (stateJPM.findMany.data) {
-      setChartData(stateJPM.findMany.data.map((item) => ({
+      setChartData(stateJPM.findMany.data.map(item => ({
         id: item.id,
         year: Number(item.year),
-        totalPoorPopulation: Number(item.totalPoorPopulation),
+        totalPoorPopulation: Number(item.totalPoorPopulation)
       })));
     }
   }, [stateJPM.findMany.data]);
 
-  const filteredData = (stateJPM.findMany.data || []).filter(item => {
-    const keyword = search.toLowerCase();
-    return (
-      item.year.toString().toLowerCase().includes(keyword) ||
-      item.totalPoorPopulation.toString().toLowerCase().includes(keyword)
-    );
-  });
+  const filteredData = data || []
 
-  if (!stateJPM.findMany.data) {
+  const handleDelete = () => {
+    if (selectedId) {
+      stateJPM.delete.byId(selectedId);
+      setModalHapus(false);
+      setSelectedId(null);
+      stateJPM.findMany.load();
+    }
+  }
+
+  if (loading || !data) {
     return (
-      <Stack>
-        <Skeleton h={500} />
+      <Stack py={10}>
+        <Skeleton height={500} radius="md" />
       </Stack>
-    )
+    );
   }
 
   return (
     <Box py={10}>
-      <Stack gap={'xs'}>
-        <Paper bg={colors['white-1']} p={'md'}>
-          <JudulList
-            title='List Jumlah Penduduk Miskin'
-            href='/admin/ekonomi/jumlah-penduduk-miskin/create'
-          />
-          <Table striped withTableBorder withRowBorders>
+      <Paper withBorder bg={colors['white-1']} p="lg" shadow="md" radius="md">
+        <Group justify="space-between" mb="md">
+          <Title order={4}>Daftar Jumlah Penduduk Miskin</Title>
+          <Tooltip label="Tambah Data" withArrow>
+            <Button
+              leftSection={<IconEdit size={18} />}
+              color="blue"
+              variant="light"
+              onClick={() => router.push('/admin/ekonomi/jumlah-penduduk-miskin/create')}
+            >
+              Tambah Baru
+            </Button>
+          </Tooltip>
+        </Group>
+
+        <Box style={{ overflowX: 'auto' }}>
+          <Table highlightOnHover>
             <TableThead>
               <TableTr>
-                <TableTh>Tahun</TableTh>
-                <TableTh>Jumlah Penduduk Miskin</TableTh>
-                <TableTh>Edit</TableTh>
-                <TableTh>Delete</TableTh>
+                <TableTh style={{ width: '25%' }}>Tahun</TableTh>
+                <TableTh style={{ width: '35%' }}>Jumlah Penduduk Miskin</TableTh>
+                <TableTh style={{ width: '20%' }}>Edit</TableTh>
+                <TableTh style={{ width: '20%' }}>Delete</TableTh>
               </TableTr>
             </TableThead>
             <TableTbody>
-              {filteredData.map((item) => (
+              {filteredData.length > 0 ? filteredData.map(item => (
                 <TableTr key={item.id}>
                   <TableTd>{item.year}</TableTd>
                   <TableTd>{item.totalPoorPopulation}</TableTd>
                   <TableTd>
-                    <Button color='green' onClick={() => router.push(`/admin/ekonomi/jumlah-penduduk-miskin/${item.id}`)}>
+                    <Button variant='light' color="green" onClick={() => router.push(`/admin/ekonomi/jumlah-penduduk-miskin/${item.id}`)}>
                       <IconEdit size={20} />
                     </Button>
                   </TableTd>
                   <TableTd>
-                    <Button
-                      color='red'
-                      disabled={stateJPM.delete.loading}
-                      onClick={() => {
-                        setSelectedId(item.id)
-                        setModalHapus(true)
-                      }}>
+                    <Button variant='light' color="red" disabled={stateJPM.delete.loading} onClick={() => { setSelectedId(item.id); setModalHapus(true) }}>
                       <IconTrash size={20} />
                     </Button>
                   </TableTd>
                 </TableTr>
-              ))}
+              )) : (
+                <TableTr>
+                  <TableTd colSpan={4}>
+                    <Center py={20}>
+                      <Text color="dimmed">Tidak ada data yang cocok</Text>
+                    </Center>
+                  </TableTd>
+                </TableTr>
+              )}
             </TableTbody>
           </Table>
-        </Paper>
+        </Box>
+      </Paper>
 
-        {/* Chart */}
-        {!mounted && !chartData ? (
-          <Box style={{ width: '100%', minWidth: 300, height: 400, minHeight: 300 }}>
-            <Paper bg={colors['white-1']} p={'md'}>
-              <Title pb={10} order={3}>Grafik Jumlah Penduduk Miskin</Title>
-              <Text c='dimmed'>Belum ada data untuk ditampilkan dalam grafik</Text>
-            </Paper>
-          </Box>
-        ) : (
-          <Box style={{ width: '100%', minWidth: 300, height: 400, minHeight: 300 }}>
-            <Paper bg={colors['white-1']} p={'md'}>
-              <Title pb={10} order={4}>Grafik Jumlah Penduduk Miskin</Title>
-              {mounted && chartData.length > 0 && (
-                <BarChart width={isMobile ? 450 : isTablet ? 500 : 550} height={350} data={chartData} >
-                  <XAxis dataKey="year" />
-                  <YAxis />
-                  <Tooltip />
-                  <Legend />
-                  <Bar dataKey="totalPoorPopulation" fill={colors['blue-button']} name="Jumlah Penduduk Miskin" />
-                </BarChart>
-              )}
-            </Paper>
-          </Box>
-        )}
-      </Stack>
+      <Center>
+        <Pagination
+          value={page}
+          onChange={(newPage) => {
+            load(newPage, 10);
+            window.scrollTo({ top: 0, behavior: 'smooth' });
+          }}
+          total={totalPages}
+          mt="md"
+          mb="md"
+          color="blue"
+          radius="md"
+        />
+      </Center>
 
-      {/* Modal Konfirmasi Hapus */}
+      {/* Chart */}
+      <Paper bg={colors['white-1']} p="md" mt="lg" withBorder radius="md">
+        <Stack>
+          <Box mt="lg" style={{ width: '100%', minHeight: 350 }}>
+            <Title order={4} mb="sm">Grafik Jumlah Penduduk Miskin</Title>
+            {mounted && chartData.length > 0 ? (
+              <BarChart width={isMobile ? 450 : isTablet ? 500 : 550} height={350} data={chartData}>
+                <XAxis dataKey="year" />
+                <YAxis />
+                <RechartsTooltip />
+                <Legend />
+                <Bar dataKey="totalPoorPopulation" fill={colors['blue-button']} name="Jumlah Penduduk Miskin" />
+              </BarChart>
+            ) : (
+              <Text c="dimmed">Belum ada data untuk ditampilkan dalam grafik</Text>
+            )}
+          </Box>
+        </Stack>
+      </Paper>
+
+
+      {/* Modal Hapus */}
       <ModalKonfirmasiHapus
         opened={modalHapus}
         onClose={() => setModalHapus(false)}
         onConfirm={handleDelete}
-        text='Apakah anda yakin ingin menghapus grafik jumlah penduduk miskin ini?'
+        text='Apakah anda yakin ingin menghapus data ini?'
       />
     </Box>
   );

src/app/admin/(dashboard)/ekonomi/jumlah-penduduk-usia-kerja-yang-menganggur/_lib/layoutTabs.tsx

@@ -1,62 +1,124 @@
 /* eslint-disable react-hooks/exhaustive-deps */
 'use client'
 import colors from '@/con/colors';
-import { Stack, Tabs, TabsList, TabsPanel, TabsTab, Title } from '@mantine/core';
+import {
+  Stack,
+  Tabs,
+  TabsList,
+  TabsPanel,
+  TabsTab,
+  Title,
+  Tooltip,
+  ScrollArea,
+} from '@mantine/core';
 import { usePathname, useRouter } from 'next/navigation';
 import React, { useEffect, useState } from 'react';
+import { IconUsers, IconSchool } from '@tabler/icons-react';
 
 function LayoutTabs({ children }: { children: React.ReactNode }) {
-    const router = useRouter()
-    const pathname = usePathname()
-    const tabs = [
-        {
-            label: "Pengangguran Berdasarkan Usia",
-            value: "pengangguranberdasarkanusia",
-            href: "/admin/ekonomi/jumlah-penduduk-usia-kerja-yang-menganggur/pengangguran_berdasarkan_usia"
-        },
-        {
-            label: "Pengangguran Berdasarkan Pendidikan",
-            value: "pengangguranberdasarkanpendidikan",
-            href: "/admin/ekonomi/jumlah-penduduk-usia-kerja-yang-menganggur/pengangguran_berdasarkan_pendidikan"
-        },
-    ];
-    const curentTab = tabs.find(tab => tab.href === pathname)
-    const [activeTab, setActiveTab] = useState<string | null>(curentTab?.value || tabs[0].value);
+  const router = useRouter();
+  const pathname = usePathname();
 
-    const handleTabChange = (value: string | null) => {
-        const tab = tabs.find(t => t.value === value)
-        if (tab) {
-            router.push(tab.href)
-        }
-        setActiveTab(value)
-    }
+  const tabs = [
+    {
+      label: "Pengangguran Berdasarkan Usia",
+      value: "pengangguranberdasarkanusia",
+      href: "/admin/ekonomi/jumlah-penduduk-usia-kerja-yang-menganggur/pengangguran_berdasarkan_usia",
+      icon: <IconUsers size={18} stroke={1.8} />,
+      tooltip: "Data pengangguran menurut kelompok usia",
+    },
+    {
+      label: "Pengangguran Berdasarkan Pendidikan",
+      value: "pengangguranberdasarkanpendidikan",
+      href: "/admin/ekonomi/jumlah-penduduk-usia-kerja-yang-menganggur/pengangguran_berdasarkan_pendidikan",
+      icon: <IconSchool size={18} stroke={1.8} />,
+      tooltip: "Data pengangguran menurut tingkat pendidikan",
+    },
+  ];
 
-    useEffect(() => {
-        const match = tabs.find(tab => tab.href === pathname)
-        if (match) {
-            setActiveTab(match.value)
-        }
-    }, [pathname])
+  const currentTab = tabs.find(tab => tab.href === pathname);
+  const [activeTab, setActiveTab] = useState<string | null>(currentTab?.value || tabs[0].value);
 
-    return (
-        <Stack>
-            <Title order={3}>Jumlah Penduduk Usia Kerja yang Menganggur</Title>
-            <Tabs color={colors['blue-button']} variant='pills' value={activeTab} onChange={handleTabChange}>
-                <TabsList p={"xs"} bg={"#BBC8E7FF"}>
-                    {tabs.map((e, i) => (
-                        <TabsTab key={i} value={e.value}>{e.label}</TabsTab>
-                    ))}
-                </TabsList>
-                {tabs.map((e, i) => (
-                    <TabsPanel key={i} value={e.value}>
-                        {/* Konten dummy, bisa diganti tergantung routing */}
-                        <></>
-                    </TabsPanel>
-                ))}
-            </Tabs>
+  const handleTabChange = (value: string | null) => {
+    const tab = tabs.find(t => t.value === value);
+    if (tab) router.push(tab.href);
+    setActiveTab(value);
+  };
+
+  useEffect(() => {
+    const match = tabs.find(tab => tab.href === pathname);
+    if (match) setActiveTab(match.value);
+  }, [pathname]);
+
+  return (
+    <Stack gap="lg">
+      <Title order={2} fw={700} style={{ color: "#1A1B1E" }}>
+        Jumlah Penduduk Usia Kerja yang Menganggur
+      </Title>
+
+      <Tabs
+        color={colors['blue-button']}
+        variant="pills"
+        value={activeTab}
+        onChange={handleTabChange}
+        radius="lg"
+        keepMounted={false}
+      >
+        <ScrollArea type="auto" offsetScrollbars>
+          <TabsList
+            p="sm"
+            style={{
+              background: "linear-gradient(135deg, #e7ebf7, #f9faff)",
+              borderRadius: "1rem",
+              boxShadow: "inset 0 0 10px rgba(0,0,0,0.05)",
+              display: "flex",
+              flexWrap: "nowrap",
+              gap: "0.5rem",
+              paddingInline: "0.5rem",
+            }}
+          >
+            {tabs.map((tab, i) => (
+              <Tooltip
+                key={i}
+                label={tab.tooltip}
+                position="bottom"
+                withArrow
+                transitionProps={{ transition: "pop", duration: 200 }}
+              >
+                <TabsTab
+                  value={tab.value}
+                  leftSection={tab.icon}
+                  style={{
+                    fontWeight: 600,
+                    fontSize: "0.9rem",
+                    transition: "all 0.2s ease",
+                    flexShrink: 0,
+                  }}
+                >
+                  {tab.label}
+                </TabsTab>
+              </Tooltip>
+            ))}
+          </TabsList>
+        </ScrollArea>
+
+        {tabs.map((tab, i) => (
+          <TabsPanel
+            key={i}
+            value={tab.value}
+            style={{
+              padding: "1.5rem",
+              background: "linear-gradient(180deg, #ffffff, #f5f6fa)",
+              borderRadius: "1rem",
+              boxShadow: "0 4px 16px rgba(0,0,0,0.05)",
+            }}
+          >
             {children}
-        </Stack>
-    );
+          </TabsPanel>
+        ))}
+      </Tabs>
+    </Stack>
+  );
 }
 
-export default LayoutTabs;
+export default LayoutTabs;

src/app/admin/(dashboard)/ekonomi/jumlah-penduduk-usia-kerja-yang-menganggur/pengangguran_berdasarkan_pendidikan/[id]/page.tsx

@@ -1,108 +1,117 @@
-'use client'
+'use client';
 import grafikNganggur from '@/app/admin/(dashboard)/_state/ekonomi/usia-kerja-nganggur';
 /* eslint-disable react-hooks/exhaustive-deps */
-
 import colors from '@/con/colors';
-import { Box, Button, Paper, Stack, 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 } from 'react';
 import { useProxy } from 'valtio/utils';
 
 function EditGrafikBerdasarkanPendidikan() {
-  const router = useRouter()
-  const params = useParams() as { id: string }
-  const stategrafik = useProxy(grafikNganggur.grafikBerdasarkanPendidikan)
-  const id = params.id
+  const router = useRouter();
+  const params = useParams() as { id: string };
+  const stategrafik = useProxy(grafikNganggur.grafikBerdasarkanPendidikan);
+  const id = params.id;
 
   useEffect(() => {
-    if(id){
+    if (id) {
       stategrafik.findUnique.load(id).then(() => {
-        const data = stategrafik.findUnique.data
-        if(data){
+        const data = stategrafik.findUnique.data;
+        if (data) {
           stategrafik.update.form = {
             SD: data.SD || '',
             SMP: data.SMP || '',
             SMA: data.SMA || '',
             D3: data.D3 || '',
             S1: data.S1 || '',
-          }
+          };
         }
-      })
+      });
     }
-  }, [id])
+  }, [id]);
 
   const handleSubmit = async () => {
     stategrafik.update.id = id;
     await stategrafik.update.submit();
-    router.push('/admin/ekonomi/jumlah-penduduk-usia-kerja-yang-menganggur/pengangguran_berdasarkan_pendidikan')
-  }
+    router.push('/admin/ekonomi/jumlah-penduduk-usia-kerja-yang-menganggur/pengangguran_berdasarkan_pendidikan');
+  };
 
   return (
-    <Box>
-    <Box mb={10}>
-      <Button variant="subtle" onClick={() => router.back()}>
-        <IconArrowBack size={20} />
-      </Button>
+    <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 Grafik Pengangguran Berdasarkan Pendidikan
+        </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="SD"
+            type="number"
+            placeholder="Masukkan jumlah"
+            value={stategrafik.update.form.SD}
+            onChange={(val) => (stategrafik.update.form.SD = val.currentTarget.value)}
+          />
+          <TextInput
+            label="SMP"
+            type="number"
+            placeholder="Masukkan jumlah"
+            value={stategrafik.update.form.SMP}
+            onChange={(val) => (stategrafik.update.form.SMP = val.currentTarget.value)}
+          />
+          <TextInput
+            label="SMA"
+            type="number"
+            placeholder="Masukkan jumlah"
+            value={stategrafik.update.form.SMA}
+            onChange={(val) => (stategrafik.update.form.SMA = val.currentTarget.value)}
+          />
+          <TextInput
+            label="D3"
+            type="number"
+            placeholder="Masukkan jumlah"
+            value={stategrafik.update.form.D3}
+            onChange={(val) => (stategrafik.update.form.D3 = val.currentTarget.value)}
+          />
+          <TextInput
+            label="S1"
+            type="number"
+            placeholder="Masukkan jumlah"
+            value={stategrafik.update.form.S1}
+            onChange={(val) => (stategrafik.update.form.S1 = val.currentTarget.value)}
+          />
+
+          <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>
-    <Paper bg={colors['white-1']} w={{ base: '100%', md: '50%' }} p={'md'}>
-      <Stack>
-        <Title order={3}>Edit Grafik Pengangguran Berdasarkan Pendidikan</Title>
-        <TextInput
-          label="SD"
-          type='number'
-          placeholder="masukkan jumlah"
-          value={stategrafik.update.form.SD}
-          onChange={(val) => {
-            stategrafik.update.form.SD = val.currentTarget.value;
-          }}
-        />
-        <TextInput
-          label="SMP"
-          type="number"
-          placeholder="masukkan jumlah"
-          value={stategrafik.update.form.SMP}
-          onChange={(val) => {
-            stategrafik.update.form.SMP = val.currentTarget.value;
-          }}
-        />
-        <TextInput
-          label="SMA"
-          type="number"
-          placeholder="masukkan jumlah"
-          value={stategrafik.update.form.SMA}
-          onChange={(val) => {
-            stategrafik.update.form.SMA = val.currentTarget.value;
-          }}
-        />
-        <TextInput
-          label="D3"
-          type="number"
-          placeholder="masukkan jumlah"
-          value={stategrafik.update.form.D3}
-          onChange={(val) => {
-            stategrafik.update.form.D3 = val.currentTarget.value;
-          }}
-        />
-        <TextInput
-          label="S1"
-          type="number"
-          placeholder="masukkan jumlah"
-          value={stategrafik.update.form.S1}
-          onChange={(val) => {
-            stategrafik.update.form.S1 = val.currentTarget.value;
-          }}
-        />
-        <Button
-          mt={10}
-          bg={colors['blue-button']}
-          onClick={handleSubmit}
-        >
-          Submit
-        </Button>
-      </Stack>
-    </Paper>
-  </Box>
   );
 }