Fix UI User Menu PPID & Kesehatan

prisma/schema.prisma

@@ -85,7 +85,6 @@ model FileStorage {
   KontakItem                     KontakItem[]
   Pegawai                        Pegawai[]
   DesaDigital                    DesaDigital[]
-  KolaborasiInovasi              KolaborasiInovasi[]
   InfoTekno                      InfoTekno[]
   PengaduanMasyarakat            PengaduanMasyarakat[]
   KegiatanDesa                   KegiatanDesa[]
@@ -100,6 +99,8 @@ model FileStorage {
   DataPerpustakaan               DataPerpustakaan[]
   PegawaiPPID                    PegawaiPPID[]
   PerbekelDariMasaKeMasa         PerbekelDariMasaKeMasa[]
+
+  MitraKolaborasi MitraKolaborasi[]
 }
 
 //========================================= MENU LANDING PAGE ========================================= //
@@ -1644,14 +1645,22 @@ model KolaborasiInovasi {
   slug        String      @db.Text //deskripsi singkat
   deskripsi   String      @db.Text //deskripsi panjang
   kolaborator 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)
 }
 
+model MitraKolaborasi {
+  id        String   @id @default(cuid())
+  name      String
+  image     FileStorage? @relation(fields: [imageId], references: [id])
+  imageId   String?
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+  deletedAt DateTime @default(now())
+  isActive  Boolean  @default(true)
+}
 // ========================================= INFO TEKHNOLOGI TEPAT GUNA ========================================= //
 model InfoTekno {
   id        String      @id @default(cuid())

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

@@ -0,0 +1,62 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+'use client';
+
+import { MapContainer, TileLayer, Marker, Popup } from 'react-leaflet';
+import { LatLngExpression } from 'leaflet';
+import 'leaflet/dist/leaflet.css';
+import L from 'leaflet';
+import { useEffect } from 'react';
+
+type MarkerData = {
+  position: [number, number];
+  popup: string;
+};
+
+type Props = {
+  center: [number, number];
+  markers: MarkerData[];
+  zoom?: number;
+  scrollWheelZoom?: boolean;
+  className?: string;
+  style?: React.CSSProperties;
+};
+
+export default function LeafletMultiMarkerMap({
+  center,
+  markers,
+  zoom = 13,
+  scrollWheelZoom = true,
+  className = '',
+  style = { height: '100%', width: '100%', zIndex: 0 },
+}: Props) {
+  // Fix for default marker icons in Next.js
+  useEffect(() => {
+    delete (L.Icon.Default.prototype as any)._getIconUrl;
+    L.Icon.Default.mergeOptions({
+      iconRetinaUrl: 'https://cdnjs.cloudflare.com/ajax/libs/leaflet/1.7.1/images/marker-icon-2x.png',
+      iconUrl: 'https://cdnjs.cloudflare.com/ajax/libs/leaflet/1.7.1/images/marker-icon.png',
+      shadowUrl: 'https://cdnjs.cloudflare.com/ajax/libs/leaflet/1.7.1/images/marker-shadow.png',
+    });
+  }, []);
+
+  return (
+    <div className={className} style={style}>
+      <MapContainer
+        center={center as LatLngExpression}
+        zoom={zoom}
+        scrollWheelZoom={scrollWheelZoom}
+        style={{ height: '100%', width: '100%' }}
+      >
+        <TileLayer
+          attribution='&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
+          url="https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png"
+        />
+        {markers.map((marker, index) => (
+          <Marker key={index} position={marker.position as LatLngExpression}>
+            <Popup>{marker.popup}</Popup>
+          </Marker>
+        ))}
+      </MapContainer>
+    </div>
+  );
+}

src/app/admin/(dashboard)/_state/inovasi/desa-digital.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";
@@ -55,10 +56,34 @@ const desaDigitalState = proxy({
           };
         }>[]
       | null,
-    async load() {
-      const res = await ApiFetch.api.inovasi.desadigital["find-many"].get();
-      if (res.status === 200) {
-        desaDigitalState.findMany.data = res.data?.data ?? [];
+    page: 1,
+    totalPages: 1,
+    loading: false,
+    search: "",
+   load: async (page = 1, limit = 10, search = "") => {
+      desaDigitalState.findMany.loading = true; // ✅ Akses langsung via nama path
+      desaDigitalState.findMany.page = page;
+      desaDigitalState.findMany.search = search;
+  
+      try {
+        const query: any = { page, limit };
+        if (search) query.search = search;
+    
+        const res = await ApiFetch.api.inovasi.desadigital["find-many"].get({ query });
+    
+        if (res.status === 200 && res.data?.success) {
+          desaDigitalState.findMany.data = res.data.data ?? [];
+          desaDigitalState.findMany.totalPages = res.data.totalPages ?? 1;
+        } else {
+          desaDigitalState.findMany.data = [];
+          desaDigitalState.findMany.totalPages = 1;
+        }
+      } catch (err) {
+        console.error("Gagal fetch desa digital paginated:", err);
+        desaDigitalState.findMany.data = [];
+        desaDigitalState.findMany.totalPages = 1;
+      } finally {
+        desaDigitalState.findMany.loading = false;
       }
     },
   },

src/app/admin/(dashboard)/_state/inovasi/info-tekno.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";
@@ -55,10 +56,34 @@ const infoTeknoState = proxy({
           };
         }>[]
       | null,
-    async load() {
-      const res = await ApiFetch.api.inovasi.infotekno["find-many"].get();
-      if (res.status === 200) {
-        infoTeknoState.findMany.data = res.data?.data ?? [];
+    page: 1,
+    totalPages: 1,
+    loading: false,
+    search: "",
+   load: async (page = 1, limit = 10, search = "") => {
+      infoTeknoState.findMany.loading = true; // ✅ Akses langsung via nama path
+      infoTeknoState.findMany.page = page;
+      infoTeknoState.findMany.search = search;
+  
+      try {
+        const query: any = { page, limit };
+        if (search) query.search = search;
+    
+        const res = await ApiFetch.api.inovasi.infotekno["find-many"].get({ query });
+    
+        if (res.status === 200 && res.data?.success) {
+          infoTeknoState.findMany.data = res.data.data ?? [];
+          infoTeknoState.findMany.totalPages = res.data.totalPages ?? 1;
+        } else {
+          infoTeknoState.findMany.data = [];
+          infoTeknoState.findMany.totalPages = 1;
+        }
+      } catch (err) {
+        console.error("Gagal fetch info teknologi paginated:", err);
+        infoTeknoState.findMany.data = [];
+        infoTeknoState.findMany.totalPages = 1;
+      } finally {
+        infoTeknoState.findMany.loading = false;
       }
     },
   },

src/app/admin/(dashboard)/_state/inovasi/kolaborasi-inovasi.ts

@@ -6,12 +6,11 @@ import { proxy } from "valtio";
 import { z } from "zod";
 
 const templateForm = z.object({
-    name: z.string().min(1, "Nama minimal 1 karakter"),
-    tahun: z.number().min(4, "Tahun minimal 4 karakter"),
-    slug: z.string().min(1, "Deskripsi singkat minimal 1 karakter"),
-    deskripsi: z.string().min(1, "Deskripsi minimal 1 karakter"),
-    kolaborator: z.string().min(1, "Kolaborator minimal 1 karakter"),
-    imageId: z.string().min(1, "Image ID minimal 1 karakter"),
+    name: z.string().min(1, "Nama kolaborasi inovasi harus diisi"),
+    tahun: z.number().min(1900, "Tahun tidak valid").max(new Date().getFullYear() + 1, "Tahun tidak boleh lebih dari tahun depan"),
+    slug: z.string().min(1, "Slug harus dihasilkan otomatis"),
+    deskripsi: z.string().min(1, "Deskripsi harus diisi"),
+    kolaborator: z.string().min(1, "Kolaborator harus diisi"),
 })
 
 const defaultForm = {
@@ -20,7 +19,6 @@ const defaultForm = {
     slug: "",
     deskripsi: "",
     kolaborator: "",
-    imageId: "",
 }
 
 const kolaborasiInovasiState = proxy({
@@ -28,27 +26,37 @@ const kolaborasiInovasiState = proxy({
     form: { ...defaultForm },
     loading: false,
     async create() {
-      const cek = templateForm.safeParse(kolaborasiInovasiState.create.form);
-      if (!cek.success) {
-        const err = `[${cek.error.issues
-          .map((v) => `${v.path.join(".")}`)
-          .join("\n")}] required`;
-        return toast.error(err);
-      }
-
       try {
+        // Validate form
+        const validation = templateForm.safeParse(kolaborasiInovasiState.create.form);
+        if (!validation.success) {
+          const errorMessages = validation.error.issues
+            .map(issue => `- ${issue.path.join('.')}: ${issue.message}`)
+            .join('\n');
+          return toast.error(`Validasi gagal:\n${errorMessages}`);
+        }
+
         kolaborasiInovasiState.create.loading = true;
+        
         const res = await ApiFetch.api.inovasi.kolaborasiinovasi["create"].post(
           kolaborasiInovasiState.create.form
         );
+        
         if (res.status === 200) {
-          kolaborasiInovasiState.findMany.load();
-          return toast.success("success create");
+          await kolaborasiInovasiState.findMany.load();
+          return { success: true, data: res.data };
         }
-        console.log(res);
-        return toast.error("failed create");
+        
+        console.error('Create failed:', res);
+        toast.error(res.data?.message || "Gagal menyimpan data");
+        return { success: false, error: res.data };
       } catch (error) {
-        console.log((error as Error).message);
+        console.error('Error in create:', error);
+        toast.error("Terjadi kesalahan saat menyimpan data");
+        return { 
+          success: false, 
+          error: error instanceof Error ? error.message : 'Unknown error' 
+        };
       } finally {
         kolaborasiInovasiState.create.loading = false;
       }
@@ -60,13 +68,21 @@ const kolaborasiInovasiState = proxy({
     totalPages: 1,
     total: 0,
     loading: false,
-    load: async (page = 1, limit = 10) => {
-      // Change to arrow function
-      kolaborasiInovasiState.findMany.loading = true; // Use the full path to access the property
+    search: "",
+    year: "",
+    load: async (page = 1, limit = 10, search = "", year?: string) => {
+      kolaborasiInovasiState.findMany.loading = true;
       kolaborasiInovasiState.findMany.page = page;
+      kolaborasiInovasiState.findMany.search = search;
+      kolaborasiInovasiState.findMany.year = year || "";
+
       try {
+        const query: any = { page, limit };
+        if (search) query.search = search;
+        if (year) query.year = year;
+        
         const res = await ApiFetch.api.inovasi.kolaborasiinovasi["find-many"].get({
-          query: { page, limit },
+          query,
         });
 
         if (res.status === 200 && res.data?.success) {
@@ -124,7 +140,6 @@ const kolaborasiInovasiState = proxy({
             slug: data.slug,
             deskripsi: data.deskripsi,
             kolaborator: data.kolaborator,
-            imageId: data.imageId,
           };
           return data;
         } else {
@@ -179,7 +194,7 @@ const kolaborasiInovasiState = proxy({
   },
   findUnique: {
     data: null as Prisma.KolaborasiInovasiGetPayload<{
-      include: { image: true };
+      omit: { isActive: true };
     }> | null,
     async load(id: string) {
       try {

src/app/admin/(dashboard)/_state/inovasi/mitra-kolaborasi.ts

@@ -0,0 +1,229 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import ApiFetch from "@/lib/api-fetch";
+import { Prisma } from "@prisma/client";
+import { toast } from "react-toastify";
+import { proxy } from "valtio";
+import { z } from "zod";
+
+const mitraKolaborasiForm = z.object({
+  name: z.string().min(1, { message: "Name is required" }),
+  imageId: z.string().nonempty(),
+});
+
+const defaultForm = {
+  name: "",
+  imageId: "",
+};
+
+const mitraKolaborasi = proxy({
+  create: {
+    form: { ...defaultForm },
+    loading: false,
+    async create() {
+      const cek = mitraKolaborasiForm.safeParse(mitraKolaborasi.create.form);
+      if (!cek.success) {
+        const err = `[${cek.error.issues
+          .map((v) => `${v.path.join(".")}`)
+          .join("\n")}] required`;
+        return toast.error(err);
+      }
+      try {
+        mitraKolaborasi.create.loading = true;
+        const res = await ApiFetch.api.inovasi.mitrakolaborasi["create"].post(
+          mitraKolaborasi.create.form
+        );
+        if (res.status === 200) {
+          mitraKolaborasi.findMany.load();
+          return toast.success("mitraKolaborasi berhasil disimpan!");
+        }
+        return toast.error("Gagal menyimpan mitraKolaborasi");
+      } catch (error) {
+        console.log((error as Error).message);
+      } finally {
+        mitraKolaborasi.create.loading = false;
+      }
+    },
+    resetForm() {
+      mitraKolaborasi.create.form = { ...defaultForm };
+    },
+  },
+  findMany: {
+    data: null as
+      | Prisma.MitraKolaborasiGetPayload<{
+          include: {
+            image: true;
+          };
+        }>[]
+      | null,
+    page: 1,
+    totalPages: 1,
+    loading: false,
+    search: "",
+   load: async (page = 1, limit = 10, search = "") => {
+      mitraKolaborasi.findMany.loading = true; // ✅ Akses langsung via nama path
+      mitraKolaborasi.findMany.page = page;
+      mitraKolaborasi.findMany.search = search;
+  
+      try {
+        const query: any = { page, limit };
+        if (search) query.search = search;
+    
+        const res = await ApiFetch.api.inovasi.mitrakolaborasi["find-many"].get({ query });
+    
+        if (res.status === 200 && res.data?.success) {
+          mitraKolaborasi.findMany.data = res.data.data ?? [];
+          mitraKolaborasi.findMany.totalPages = res.data.totalPages ?? 1;
+        } else {
+          mitraKolaborasi.findMany.data = [];
+          mitraKolaborasi.findMany.totalPages = 1;
+        }
+      } catch (err) {
+        console.error("Gagal fetch mitraKolaborasi paginated:", err);
+        mitraKolaborasi.findMany.data = [];
+        mitraKolaborasi.findMany.totalPages = 1;
+      } finally {
+        mitraKolaborasi.findMany.loading = false;
+      }
+    },
+  },
+  findUnique: {
+    data: null as Prisma.MitraKolaborasiGetPayload<{
+      include: {
+        image: true;
+      };
+    }> | null,
+    async load(id: string) {
+      try {
+        const res = await fetch(`/api/inovasi/mitrakolaborasi/${id}`);
+        if (res.ok) {
+          const data = await res.json();
+          mitraKolaborasi.findUnique.data = data.data ?? null;
+        } else {
+          console.error("Failed to fetch mitraKolaborasi:", res.statusText);
+          mitraKolaborasi.findUnique.data = null;
+        }
+      } catch (error) {
+        console.error("Error fetching mitraKolaborasi:", error);
+        mitraKolaborasi.findUnique.data = null;
+      }
+    },
+  },
+  delete: {
+    loading: false,
+    async byId(id: string) {
+      if (!id) return toast.warn("ID tidak valid");
+      try {
+        mitraKolaborasi.delete.loading = true;
+        const response = await fetch(`/api/inovasi/mitrakolaborasi/del/${id}`, {
+          method: "DELETE",
+          headers: {
+            "Content-Type": "application/json",
+          },
+        });
+        const result = await response.json();
+        if (response.ok) {
+          toast.success(result.message || "mitraKolaborasi berhasil dihapus");
+          await mitraKolaborasi.findMany.load(); // refresh list
+        } else {
+          toast.error(result.message || "Gagal menghapus mitraKolaborasi");
+        }
+      } catch (error) {
+        console.error("Gagal delete:", error);
+        toast.error("Terjadi kesalahan saat menghapus mitraKolaborasi");
+      } finally {
+        mitraKolaborasi.delete.loading = false;
+      }
+    },
+  },
+  update: {
+    id: "",
+    form: { ...defaultForm },
+    loading: false,
+    async load(id: string) {
+      if (!id) {
+        toast.warn("ID tidak valid");
+        return null;
+      }
+      try {
+        const response = await fetch(`/api/inovasi/mitrakolaborasi/${id}`, {
+          method: "GET",
+          headers: {
+            "Content-Type": "application/json",
+          },
+        });
+        if (!response.ok) {
+          throw new Error(`HTTP error! status: ${response.status}`);
+        }
+        const result = await response.json();
+        if (result?.success) {
+          const data = result.data;
+          this.id = data.id;
+          this.form = {
+            name: data.name,
+            imageId: data.imageId,
+          };
+          return data;
+        } else {
+          throw new Error(result.message || "Gagal memuat data");
+        }
+      } catch (error) {
+        console.error("Error loading mitraKolaborasi:", error);
+        toast.error(
+          error instanceof Error ? error.message : "Gagal memuat data"
+        );
+        return null;
+      }
+    },
+    async update() {
+      const cek = mitraKolaborasiForm.safeParse(mitraKolaborasi.update.form);
+      if (!cek.success) {
+        const err = `[${cek.error.issues
+          .map((v) => `${v.path.join(".")}`)
+          .join("\n")}] required`;
+        toast.error(err);
+        return false;
+      }
+      try {
+        mitraKolaborasi.update.loading = true;
+        const response = await fetch(`/api/inovasi/mitrakolaborasi/${this.id}`, {
+          method: "PUT",
+          headers: {
+            "Content-Type": "application/json",
+          },
+          body: JSON.stringify({
+            name: this.form.name,
+            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(result.message || "mitraKolaborasi berhasil diupdate");
+          await mitraKolaborasi.findMany.load(); // refresh list
+          return true;
+        } else {
+          throw new Error(result.message || "Gagal mengupdate mitraKolaborasi");
+        }
+      } catch (error) {
+        console.error("Error updating mitraKolaborasi:", error);
+        toast.error(
+          error instanceof Error ? error.message : "Gagal mengupdate mitraKolaborasi"
+        );
+        return false;
+      } finally {
+        mitraKolaborasi.update.loading = false;
+      }
+    },
+    reset() {
+      mitraKolaborasi.update.id = "";
+      mitraKolaborasi.update.form = { ...defaultForm };
+    },
+  },
+});
+
+export default mitraKolaborasi;

src/app/admin/(dashboard)/_state/lingkungan/data-lingkungan-desa.ts

@@ -56,13 +56,17 @@ const dataLingkunganDesaState = proxy({
     totalPages: 1,
     total: 0,
     loading: false,
-    load: async (page = 1, limit = 10) => {
+    search: "",
+    load: async (page = 1, limit = 10, search = "") => {
       // Change to arrow function
       dataLingkunganDesaState.findMany.loading = true; // Use the full path to access the property
       dataLingkunganDesaState.findMany.page = page;
+      dataLingkunganDesaState.findMany.search = search;
       try {
+        const query: any = { page, limit };
+        if (search) query.search = search;
         const res = await ApiFetch.api.lingkungan.datalingkungandesa["find-many"].get({
-          query: { page, limit },
+          query,
         });
 
         if (res.status === 200 && res.data?.success) {

src/app/admin/(dashboard)/_state/lingkungan/gotong-royong.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";
@@ -67,10 +68,46 @@ const kegiatanDesa = proxy({
         };
       }>
     > | null,
-    async load() {
-      const res = await ApiFetch.api.lingkungan.kegiatandesa["find-many"].get();
-      if (res.status === 200) {
-        kegiatanDesa.findMany.data = res.data?.data ?? [];
+    page: 1,
+    totalPages: 1,
+    total: 0,
+    loading: false,
+    search: "",
+    load: async (page = 1, limit = 10, search = "", kategori = "") => {
+      // Change to arrow function
+      kegiatanDesa.findMany.loading = true; // Use the full path to access the property
+      kegiatanDesa.findMany.page = page;
+      kegiatanDesa.findMany.search = search;
+      try {
+        const query: any = { page, limit };
+        if (search) query.search = search;
+        if (kategori) query.kategori = kategori;
+        const res = await ApiFetch.api.lingkungan.kegiatandesa[
+          "find-many"
+        ].get({
+          query,
+        });
+
+        if (res.status === 200 && res.data?.success) {
+          kegiatanDesa.findMany.data = res.data.data || [];
+          kegiatanDesa.findMany.total = res.data.total || 0;
+          kegiatanDesa.findMany.totalPages = res.data.totalPages || 1;
+        } else {
+          console.error(
+            "Failed to load kegiatan desa:",
+            res.data?.message
+          );
+          kegiatanDesa.findMany.data = [];
+          kegiatanDesa.findMany.total = 0;
+          kegiatanDesa.findMany.totalPages = 1;
+        }
+      } catch (error) {
+        console.error("Error loading kegiatan desa:", error);
+        kegiatanDesa.findMany.data = [];
+        kegiatanDesa.findMany.total = 0;
+        kegiatanDesa.findMany.totalPages = 1;
+      } finally {
+        kegiatanDesa.findMany.loading = false;
       }
     },
   },
@@ -244,6 +281,35 @@ const kegiatanDesa = proxy({
       kegiatanDesa.edit.form = { ...defaultKegiatanDesaForm };
     },
   },
+  findFirst: {
+    data: null as Prisma.KegiatanDesaGetPayload<{
+      include: {
+        image: true;
+        kategoriKegiatan: true;
+      };
+    }> | null,
+    loading: false,
+    // findFirst.load()
+    async load(kategori?: string) {
+      this.loading = true;
+      try {
+        const res = await ApiFetch.api.lingkungan.kegiatandesa["find-first"].get({
+          query: kategori ? { kategori } : {},
+        });
+
+        if (res.status === 200 && res.data?.success) {
+          this.data = res.data.data || null;
+        } else {
+          this.data = null;
+        }
+      } catch (err) {
+        console.error("Gagal fetch kegiatan desa terbaru:", err);
+        this.data = null;
+      } finally {
+        this.loading = false;
+      }
+    },
+  },
 });
 
 // ========================================= KATEGORI kegiatan ========================================= //
@@ -269,9 +335,7 @@ const kategoriKegiatan = proxy({
       }
       try {
         kategoriKegiatan.create.loading = true;
-        const res = await ApiFetch.api.lingkungan.kategorikegiatan[
-          "create"
-        ].post(kategoriKegiatan.create.form);
+        const res = await ApiFetch.api.lingkungan.kategorikegiatan["create"].post(kategoriKegiatan.create.form);
         if (res.status === 200) {
           kategoriKegiatan.findMany.load();
           return toast.success("Data berhasil ditambahkan");
@@ -305,9 +369,7 @@ const kategoriKegiatan = proxy({
     }> | null,
     async load(id: string) {
       try {
-        const res = await fetch(
-          `/api/lingkungan/kategorikegiatan/${id}`
-        );
+        const res = await fetch(`/api/lingkungan/kategorikegiatan/${id}`);
         if (res.ok) {
           const data = await res.json();
           kategoriKegiatan.findUnique.data = data.data ?? null;
@@ -367,15 +429,12 @@ const kategoriKegiatan = proxy({
       }
 
       try {
-        const response = await fetch(
-          `/api/lingkungan/kategorikegiatan/${id}`,
-          {
-            method: "GET",
-            headers: {
-              "Content-Type": "application/json",
-            },
-          }
-        );
+        const response = await fetch(`/api/lingkungan/kategorikegiatan/${id}`, {
+          method: "GET",
+          headers: {
+            "Content-Type": "application/json",
+          },
+        });
         if (!response.ok) {
           throw new Error(`HTTP error! status: ${response.status}`);
         }

src/app/admin/(dashboard)/_state/lingkungan/pengelolaan-sampah.ts

@@ -52,15 +52,19 @@ const pengelolaanSampah = proxy({
     totalPages: 1,
     total: 0,
     loading: false,
-    load: async (page = 1, limit = 10) => {
+    search: "",
+    load: async (page = 1, limit = 10, search = "") => {
       // Change to arrow function
       pengelolaanSampah.findMany.loading = true; // Use the full path to access the property
       pengelolaanSampah.findMany.page = page;
+      pengelolaanSampah.findMany.search = search;
       try {
+        const query: any = { page, limit };
+        if (search) query.search = search;
         const res = await ApiFetch.api.lingkungan.pengelolaansampah[
           "find-many"
         ].get({
-          query: { page, limit },
+          query,
         });
 
         if (res.status === 200 && res.data?.success) {

src/app/admin/(dashboard)/_state/lingkungan/program-penghijauan.ts

@@ -56,13 +56,17 @@ const programPenghijauanState = proxy({
     totalPages: 1,
     total: 0,
     loading: false,
-    load: async (page = 1, limit = 10) => {
+    search: "",
+    load: async (page = 1, limit = 10, search = "") => {
       // Change to arrow function
       programPenghijauanState.findMany.loading = true; // Use the full path to access the property
       programPenghijauanState.findMany.page = page;
+      programPenghijauanState.findMany.search = search;
       try {
+        const query: any = { page, limit };
+        if (search) query.search = search;
         const res = await ApiFetch.api.lingkungan.programpenghijauan["find-many"].get({
-          query: { page, limit },
+          query,
         });
 
         if (res.status === 200 && res.data?.success) {

src/app/admin/(dashboard)/_state/pendidikan/info-sekolah-paud.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";
@@ -51,13 +52,46 @@ const jenjangPendidikan = proxy({
       id: string;
       nama: string;
     }> | null,
-    async load() {
-      const res =
-        await ApiFetch.api.pendidikan.infosekolahpaud.jenjangpendidikan[
-          "find-many"
-        ].get();
-      if (res.status === 200) {
-        jenjangPendidikan.findMany.data = res.data?.data ?? [];
+    page: 1,
+    totalPages: 1,
+    total: 0,
+    loading: false,
+    search: "",
+    load: async (page = 1, limit = 10, search = "") => {
+      // Change to arrow function
+      jenjangPendidikan.findMany.loading = true; // Use the full path to access the property
+      jenjangPendidikan.findMany.page = page;
+      jenjangPendidikan.findMany.search = search;
+      try {
+        const query: any = { page, limit };
+        if (search) query.search = search;
+        const res =
+          await ApiFetch.api.pendidikan.infosekolahpaud.jenjangpendidikan[
+            "find-many"
+          ].get({
+            query,
+          });
+
+        if (res.status === 200 && res.data?.success) {
+          jenjangPendidikan.findMany.data = res.data.data || [];
+          jenjangPendidikan.findMany.total = res.data.total || 0;
+          jenjangPendidikan.findMany.totalPages = res.data.totalPages || 1;
+        } else {
+          console.error(
+            "Failed to load jenjang pendidikan:",
+            res.data?.message
+          );
+          jenjangPendidikan.findMany.data = [];
+          jenjangPendidikan.findMany.total = 0;
+          jenjangPendidikan.findMany.totalPages = 1;
+        }
+      } catch (error) {
+        console.error("Error loading jenjang pendidikan:", error);
+        jenjangPendidikan.findMany.data = [];
+        jenjangPendidikan.findMany.total = 0;
+        jenjangPendidikan.findMany.totalPages = 1;
+      } finally {
+        jenjangPendidikan.findMany.loading = false;
       }
     },
   },
@@ -304,13 +338,46 @@ const lembagaPendidikan = proxy({
         };
       }>
     > | null,
-    async load() {
-      const res =
-        await ApiFetch.api.pendidikan.infosekolahpaud.lembagapendidikan[
-          "find-many"
-        ].get();
-      if (res.status === 200) {
-        lembagaPendidikan.findMany.data = res.data?.data ?? [];
+    page: 1,
+    totalPages: 1,
+    total: 0,
+    loading: false,
+    search: "",
+    load: async (page = 1, limit = 10, search = "") => {
+      // Change to arrow function
+      lembagaPendidikan.findMany.loading = true; // Use the full path to access the property
+      lembagaPendidikan.findMany.page = page;
+      lembagaPendidikan.findMany.search = search;
+      try {
+        const query: any = { page, limit };
+        if (search) query.search = search;
+        const res =
+          await ApiFetch.api.pendidikan.infosekolahpaud.lembagapendidikan[
+            "find-many"
+          ].get({
+            query,
+          });
+
+        if (res.status === 200 && res.data?.success) {
+          lembagaPendidikan.findMany.data = res.data.data || [];
+          lembagaPendidikan.findMany.total = res.data.total || 0;
+          lembagaPendidikan.findMany.totalPages = res.data.totalPages || 1;
+        } else {
+          console.error(
+            "Failed to load lembaga pendidikan:",
+            res.data?.message
+          );
+          lembagaPendidikan.findMany.data = [];
+          lembagaPendidikan.findMany.total = 0;
+          lembagaPendidikan.findMany.totalPages = 1;
+        }
+      } catch (error) {
+        console.error("Error loading lembaga pendidikan:", error);
+        lembagaPendidikan.findMany.data = [];
+        lembagaPendidikan.findMany.total = 0;
+        lembagaPendidikan.findMany.totalPages = 1;
+      } finally {
+        lembagaPendidikan.findMany.loading = false;
       }
     },
   },
@@ -558,12 +625,45 @@ const siswa = proxy({
         };
       }>
     > | null,
-    async load() {
-      const res = await ApiFetch.api.pendidikan.infosekolahpaud.siswa[
-        "find-many"
-      ].get();
-      if (res.status === 200) {
-        siswa.findMany.data = res.data?.data ?? [];
+    page: 1,
+    totalPages: 1,
+    total: 0,
+    loading: false,
+    search: "",
+    load: async (page = 1, limit = 10, search = "") => {
+      // Change to arrow function
+      siswa.findMany.loading = true; // Use the full path to access the property
+      siswa.findMany.page = page;
+      siswa.findMany.search = search;
+      try {
+        const query: any = { page, limit };
+        if (search) query.search = search;
+        const res = await ApiFetch.api.pendidikan.infosekolahpaud.siswa[
+          "find-many"
+        ].get({
+          query,
+        });
+
+        if (res.status === 200 && res.data?.success) {
+          siswa.findMany.data = res.data.data || [];
+          siswa.findMany.total = res.data.total || 0;
+          siswa.findMany.totalPages = res.data.totalPages || 1;
+        } else {
+          console.error(
+            "Failed to load siswa:",
+            res.data?.message
+          );
+          siswa.findMany.data = [];
+          siswa.findMany.total = 0;
+          siswa.findMany.totalPages = 1;
+        }
+      } catch (error) {
+        console.error("Error loading siswa:", error);
+        siswa.findMany.data = [];
+        siswa.findMany.total = 0;
+        siswa.findMany.totalPages = 1;
+      } finally {
+        siswa.findMany.loading = false;
       }
     },
   },
@@ -798,12 +898,45 @@ const pengajar = proxy({
         };
       }>
     > | null,
-    async load() {
-      const res = await ApiFetch.api.pendidikan.infosekolahpaud.pengajar[
-        "find-many"
-      ].get();
-      if (res.status === 200) {
-        pengajar.findMany.data = res.data?.data ?? [];
+    page: 1,
+    totalPages: 1,
+    total: 0,
+    loading: false,
+    search: "",
+    load: async (page = 1, limit = 10, search = "") => {
+      // Change to arrow function
+      pengajar.findMany.loading = true; // Use the full path to access the property
+      pengajar.findMany.page = page;
+      pengajar.findMany.search = search;
+      try {
+        const query: any = { page, limit };
+        if (search) query.search = search;
+        const res = await ApiFetch.api.pendidikan.infosekolahpaud.pengajar[
+          "find-many"
+        ].get({
+          query,
+        });
+
+        if (res.status === 200 && res.data?.success) {
+          pengajar.findMany.data = res.data.data || [];
+          pengajar.findMany.total = res.data.total || 0;
+          pengajar.findMany.totalPages = res.data.totalPages || 1;
+        } else {
+          console.error(
+            "Failed to load pengajar:",
+            res.data?.message
+          );
+          pengajar.findMany.data = [];
+          pengajar.findMany.total = 0;
+          pengajar.findMany.totalPages = 1;
+        }
+      } catch (error) {
+        console.error("Error loading pengajar:", error);
+        pengajar.findMany.data = [];
+        pengajar.findMany.total = 0;
+        pengajar.findMany.totalPages = 1;
+      } finally {
+        pengajar.findMany.loading = false;
       }
     },
   },
@@ -815,7 +948,9 @@ const pengajar = proxy({
     }> | null,
     async load(id: string) {
       try {
-        const res = await fetch(`/api/pendidikan/infosekolahpaud/pengajar/${id}`);
+        const res = await fetch(
+          `/api/pendidikan/infosekolahpaud/pengajar/${id}`
+        );
         if (res.ok) {
           const data = await res.json();
           pengajar.findUnique.data = data.data ?? null;
@@ -948,7 +1083,8 @@ const pengajar = proxy({
               result
             );
             throw new Error(
-              result?.message || `Gagal mengupdate pengajar (${response.status})`
+              result?.message ||
+                `Gagal mengupdate pengajar (${response.status})`
             );
           }
 

src/app/admin/(dashboard)/inovasi/desa-digital-smart-village/page.tsx

@@ -1,6 +1,6 @@
 '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, Paper, Skeleton, Stack, Table, TableTbody, TableTd, TableTh, TableThead, TableTr, Text, Pagination } from '@mantine/core';
 import { useShallowEffect } from '@mantine/hooks';
 import { IconDeviceImac, IconSearch } from '@tabler/icons-react';
 import { useRouter } from 'next/navigation';
@@ -29,19 +29,22 @@ function DesaDigitalSmartVillage() {
 function ListDesaDigitalSmartVillage({ search }: { search: string }) {
   const state = useProxy(desaDigitalState)
   const router = useRouter()
+
+  const {
+    data,
+    page,
+    totalPages,
+    loading,
+    load,
+  } = state.findMany
+
   useShallowEffect(() => {
-    state.findMany.load()
-  }, [])
+    load(page, 10, search)
+  }, [page, search])
 
-  const filteredData = (state.findMany.data || []).filter(item => {
-    const keyword = search.toLowerCase();
-    return (
-      item.name.toLowerCase().includes(keyword) ||
-      item.deskripsi.toLowerCase().includes(keyword)
-    );
-  });
+  const filteredData = data || []
 
-  if (!state.findMany.data) {
+  if (loading || !data) {
     return (
       <Stack py={10}>
         <Skeleton h={500} />
@@ -68,18 +71,27 @@ function ListDesaDigitalSmartVillage({ search }: { search: string }) {
               <TableTr key={item.id}>
                 <TableTd>{item.name}</TableTd>
                 <TableTd>
-                  <Text truncate="end" fz={"sm"} dangerouslySetInnerHTML={{ __html: item.deskripsi }} />
+                  <Text lineClamp={1} truncate="end" fz={"sm"} dangerouslySetInnerHTML={{ __html: item.deskripsi }} />
                 </TableTd>
-              <TableTd>
-                <Button onClick={() => router.push(`/admin/inovasi/desa-digital-smart-village/${item.id}`)}>
-                  <IconDeviceImac size={20} />
-                </Button>
-              </TableTd>
-            </TableTr>
-          ))}
+                <TableTd>
+                  <Button onClick={() => router.push(`/admin/inovasi/desa-digital-smart-village/${item.id}`)}>
+                    <IconDeviceImac size={20} />
+                  </Button>
+                </TableTd>
+              </TableTr>
+            ))}
           </TableTbody>
         </Table>
       </Paper>
+      <Center>
+        <Pagination
+          value={page}
+          onChange={(newPage) => load(newPage)} // ini penting!
+          total={totalPages}
+          mt="md"
+          mb="md"
+        />
+      </Center>
     </Box>
   );
 }

src/app/admin/(dashboard)/inovasi/info-teknologi-tepat-guna/page.tsx

@@ -1,6 +1,6 @@
 '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, Pagination, Paper, Skeleton, Stack, Table, TableTbody, TableTd, TableTh, TableThead, TableTr, Text } from '@mantine/core';
 import { useShallowEffect } from '@mantine/hooks';
 import { IconDeviceImac, IconSearch } from '@tabler/icons-react';
 import { useRouter } from 'next/navigation';
@@ -29,19 +29,22 @@ function InfoTeknologiTepatGuna() {
 function ListInfoTeknologiTepatGuna({ search }: { search: string }) {
   const state = useProxy(infoTeknoState)
   const router = useRouter()
+
+  const {
+    data,
+    page,
+    totalPages,
+    loading,
+    load,
+  } = state.findMany
+
   useShallowEffect(() => {
-    state.findMany.load()
-  }, [])
+    load(page, 10, search)
+  }, [page, search])
 
-  const filteredData = (state.findMany.data || []).filter(item => {
-    const keyword = search.toLowerCase();
-    return (
-      item.name.toLowerCase().includes(keyword) ||
-      item.deskripsi.toLowerCase().includes(keyword)
-    );
-  });
+  const filteredData = data || []
 
-  if (!state.findMany.data) {
+  if (loading || !data) {
     return (
       <Stack py={10}>
         <Skeleton h={500} />
@@ -68,17 +71,25 @@ function ListInfoTeknologiTepatGuna({ search }: { search: string }) {
               <TableTr key={item.id}>
                 <TableTd>{item.name}</TableTd>
                 <TableTd>
-                  <Text truncate="end" fz={"sm"} dangerouslySetInnerHTML={{ __html: item.deskripsi }} />
+                  <Text lineClamp={1} truncate="end" fz={"sm"} dangerouslySetInnerHTML={{ __html: item.deskripsi }} />
                 </TableTd>
-              <TableTd>
-                <Button onClick={() => router.push(`/admin/inovasi/info-teknologi-tepat-guna/${item.id}`)}>
-                  <IconDeviceImac size={20} />
-                </Button>
-              </TableTd>
-            </TableTr>
-          ))}
+                <TableTd>
+                  <Button onClick={() => router.push(`/admin/inovasi/info-teknologi-tepat-guna/${item.id}`)}>
+                    <IconDeviceImac size={20} />
+                  </Button>
+                </TableTd>
+              </TableTr>
+            ))}
           </TableTbody>
         </Table>
+        <Center>
+          <Pagination
+            value={page}
+            onChange={(newPage) => load(newPage)} // ini penting!
+            total={totalPages}
+            my="md"
+          />
+        </Center>
       </Paper>
     </Box>
   );

src/app/admin/(dashboard)/inovasi/kolaborasi-inovasi/_lib/layoutTabs.tsx

@@ -0,0 +1,62 @@
+/* eslint-disable react-hooks/exhaustive-deps */
+'use client'
+import colors from '@/con/colors';
+import { Stack, Tabs, TabsList, TabsPanel, TabsTab, Title } from '@mantine/core';
+import { usePathname, useRouter } from 'next/navigation';
+import React, { useEffect, useState } from 'react';
+
+function LayoutTabsKolaborasi({ children }: { children: React.ReactNode }) {
+    const router = useRouter()
+    const pathname = usePathname()
+    const tabs = [
+        {
+            label: "List Kolaborasi Inovasi",
+            value: "listkolaborasiinovasi",
+            href: "/admin/inovasi/kolaborasi-inovasi/list-kolaborasi-inovasi"
+        },
+        {
+            label: "Mitra Kolaborasi",
+            value: "mitarakolaborasi",
+            href: "/admin/inovasi/kolaborasi-inovasi/mitra-kolaborasi"
+        }
+    ];
+    const curentTab = tabs.find(tab => tab.href === pathname)
+    const [activeTab, setActiveTab] = useState<string | null>(curentTab?.value || tabs[0].value);
+
+    const handleTabChange = (value: string | null) => {
+        const tab = tabs.find(t => t.value === value)
+        if (tab) {
+            router.push(tab.href)
+        }
+        setActiveTab(value)
+    }
+
+    useEffect(() => {
+        const match = tabs.find(tab => tab.href === pathname)
+        if (match) {
+            setActiveTab(match.value)
+        }
+    }, [pathname])
+
+    return (
+        <Stack>
+            <Title order={3}>Kolaborasi Inovasi</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>
+            {children}
+        </Stack>
+    );
+}
+
+export default LayoutTabsKolaborasi;

src/app/admin/(dashboard)/inovasi/kolaborasi-inovasi/create/page.tsx

@@ -1,155 +0,0 @@
-'use client'
-import colors from '@/con/colors';
-import { Box, Button, Center, Group, Image, Paper, Stack, Text, TextInput, Title } from '@mantine/core';
-import { IconArrowBack, IconImageInPicture, IconPhoto, IconUpload, IconX } from '@tabler/icons-react';
-import { useRouter } from 'next/navigation';
-import { useProxy } from 'valtio/utils';
-import CreateEditor from '../../../_com/createEditor';
-import kolaborasiInovasiState from '../../../_state/inovasi/kolaborasi-inovasi';
-import { useState } from 'react';
-import { toast } from 'react-toastify';
-import ApiFetch from '@/lib/api-fetch';
-import { Dropzone } from '@mantine/dropzone';
-
-
-function CreateProgramKreatifDesa() {
-  const stateCreate = useProxy(kolaborasiInovasiState)
-  const router = useRouter();
-  const [previewImage, setPreviewImage] = useState<string | null>(null);
-  const [file, setFile] = useState<File | null>(null);
-
-  const resetForm = () => {
-    stateCreate.create.form = {
-      name: "",
-      tahun: 0,
-      slug: "",
-      deskripsi: "",
-      kolaborator: "",
-      imageId: "",
-    }
-
-    setPreviewImage(null);
-    setFile(null);
-  }
-
-  const handleSubmit = async () => {
-    if (!file) {
-      return toast.warn("Pilih file gambar terlebih dahulu");
-    }
-
-    // Upload gambar dulu
-    const res = await ApiFetch.api.fileStorage.create.post({
-      file,
-      name: file.name,
-    });
-
-    const uploaded = res.data?.data;
-    if (!uploaded?.id) {
-      return toast.error("Gagal upload gambar");
-    }
-
-    // Simpan ID gambar ke form
-    stateCreate.create.form.imageId = uploaded.id;
-
-    // Submit data berita
-    await stateCreate.create.create();
-
-    // Reset form setelah submit
-    resetForm();
-    router.push("/admin/inovasi/kolaborasi-inovasi")
-  }
-  return (
-    <Box>
-      <Box mb={10}>
-        <Button onClick={() => router.back()} variant='subtle' color={'blue'}>
-          <IconArrowBack color={colors['blue-button']} size={25} />
-        </Button>
-      </Box>
-
-      <Paper w={{ base: '100%', md: '50%' }} bg={colors['white-1']} p={'md'}>
-        <Stack gap={"xs"}>
-          <Title order={3}>Create Kolaborasi Inovasi</Title>
-          <TextInput
-            label={<Text fz={"sm"} fw={"bold"}>Nama Kolaborasi Inovasi</Text>}
-            placeholder="masukkan nama kolaborasi inovasi"
-            onChange={(val) => stateCreate.create.form.name = val.target.value}
-          />
-          <TextInput
-            type='number'
-            label={<Text fz={"sm"} fw={"bold"}>Tahun</Text>}
-            placeholder="masukkan tahun"
-            onChange={(val) => stateCreate.create.form.tahun = parseInt(val.target.value)}
-          />
-          <TextInput
-            onChange={(e) => stateCreate.create.form.slug = e.currentTarget.value}
-            label={<Text fw={"bold"} fz={"sm"}>Deskripsi Singkat Kolaborasi Inovasi</Text>}
-            placeholder='Masukkan deskripsi singkat kolaborasi inovasi'
-          />
-          <TextInput
-            onChange={(e) => stateCreate.create.form.kolaborator = e.currentTarget.value}
-            label={<Text fw={"bold"} fz={"sm"}>Kolaborator</Text>}
-            placeholder='Masukkan kolaborator'
-          />
-          <Box>
-            <Stack gap={"xs"}>
-              <Text fz={"md"} fw={"bold"}>Gambar</Text>
-              <Box>
-                <Dropzone
-                  onDrop={(files) => {
-                    const newImages = files.map((file) => ({
-                      file,
-                      preview: URL.createObjectURL(file),
-                      label: '',
-                    }));
-                    setFile(newImages[0].file);
-                    setPreviewImage(newImages[0].preview); // ← ini yang kurang
-                  }}
-
-                >
-                  <Group justify="center" gap="xl" mih={220} style={{ pointerEvents: 'none' }}>
-                    <Dropzone.Accept>
-                      <IconUpload size={52} color="var(--mantine-color-blue-6)" stroke={1.5} />
-                    </Dropzone.Accept>
-                    <Dropzone.Reject>
-                      <IconX size={52} color="var(--mantine-color-red-6)" stroke={1.5} />
-                    </Dropzone.Reject>
-                    <Dropzone.Idle>
-                      <IconPhoto size={52} color="var(--mantine-color-dimmed)" stroke={1.5} />
-                    </Dropzone.Idle>
-                    <div>
-                      <Text size="xl" inline>
-                        Drag images here or click to select files
-                      </Text>
-                      <Text size="sm" c="dimmed" inline mt={7}>
-                        Attach as many files as you like, each file should not exceed 5mb
-                      </Text>
-                    </div>
-                  </Group>
-                </Dropzone>
-              </Box>
-              {previewImage ? (
-                <Image alt="" src={previewImage} w={200} h={200} />
-              ) : (
-                <Center w={200} h={200} bg={"gray"}>
-                  <IconImageInPicture />
-                </Center>
-              )}
-            </Stack>
-          </Box>
-          <Box>
-            <Text fw={"bold"} fz={"sm"}>Deskripsi Kolaborasi Inovasi</Text>
-            <CreateEditor
-              value={stateCreate.create.form.deskripsi}
-              onChange={(htmlContent) => stateCreate.create.form.deskripsi = htmlContent}
-            />
-          </Box>
-          <Group>
-            <Button bg={colors['blue-button']} onClick={handleSubmit}>Submit</Button>
-          </Group>
-        </Stack>
-      </Paper>
-    </Box>
-  );
-}
-
-export default CreateProgramKreatifDesa;

src/app/admin/(dashboard)/inovasi/kolaborasi-inovasi/layout.tsx

@@ -0,0 +1,12 @@
+import React from 'react';
+import LayoutTabsKolaborasi from './_lib/layoutTabs';
+
+function Layout({ children }: { children: React.ReactNode }) {
+  return (
+    <LayoutTabsKolaborasi>
+      {children}
+    </LayoutTabsKolaborasi>
+  );
+}
+
+export default Layout;

src/app/admin/(dashboard)/inovasi/kolaborasi-inovasi/list-kolaborasi-inovasi/[id]/edit/page.tsx

@@ -2,41 +2,34 @@
 "use client";
 
 import EditEditor from "@/app/admin/(dashboard)/_com/editEditor";
+import kolaborasiInovasiState from "@/app/admin/(dashboard)/_state/inovasi/kolaborasi-inovasi";
 import colors from "@/con/colors";
-import ApiFetch from "@/lib/api-fetch";
 import {
   Box,
   Button,
-  Center,
-  FileInput,
-  Image,
   Paper,
   Stack,
   Text,
   TextInput,
   Title
 } from "@mantine/core";
-import { IconArrowBack, IconImageInPicture } from "@tabler/icons-react";
+import { IconArrowBack } from "@tabler/icons-react";
 import { useParams, useRouter } from "next/navigation";
 import { useEffect, useState } from "react";
 import { toast } from "react-toastify";
 import { useProxy } from "valtio/utils";
-import kolaborasiInovasiState from "@/app/admin/(dashboard)/_state/inovasi/kolaborasi-inovasi";
 
 function EditKolaborasiInovasi() {
   const kolaborasiState = useProxy(kolaborasiInovasiState);
   const router = useRouter();
   const params = useParams();
 
-  const [previewImage, setPreviewImage] = useState<string | null>(null);
-  const [file, setFile] = useState<File | null>(null);
   const [formData, setFormData] = useState({
     name: kolaborasiState.update.form.name || '',
     deskripsi: kolaborasiState.update.form.deskripsi || '',
     tahun: kolaborasiState.update.form.tahun || '',
     slug: kolaborasiState.update.form.slug || '',
     kolaborator: kolaborasiState.update.form.kolaborator || '',
-    imageId: kolaborasiState.update.form.imageId || ''
   });
 
   // Load berita by id saat pertama kali
@@ -54,13 +47,7 @@ function EditKolaborasiInovasi() {
             tahun: data.tahun || '',
             slug: data.slug || '',
             kolaborator: data.kolaborator || '',
-            imageId: data.imageId || '',
           });
-          if (data.image) {
-            if (data?.image?.link) {
-              setPreviewImage(data.image.link);
-            }
-          }
         }
       } catch (error) {
         console.error("Error loading berita:", error);
@@ -82,22 +69,7 @@ function EditKolaborasiInovasi() {
         tahun: Number(formData.tahun),
         slug: formData.slug,
         kolaborator: formData.kolaborator,
-        imageId: formData.imageId // Keep existing imageId if not changed
       };
-
-      // Jika ada file baru, upload
-      if (file) {
-        const res = await ApiFetch.api.fileStorage.create.post({ file, name: file.name });
-        const uploaded = res.data?.data;
-
-        if (!uploaded?.id) {
-          return toast.error("Gagal upload gambar");
-        }
-
-        // Update imageId in global state
-        kolaborasiState.update.form.imageId = uploaded.id;
-      }
-
       await kolaborasiState.update.submit();
       toast.success("Berita berhasil diperbarui!");
       router.push("/admin/inovasi/kolaborasi-inovasi");
@@ -144,28 +116,6 @@ function EditKolaborasiInovasi() {
             label={<Text fz={"sm"} fw={"bold"}>Kolaborator</Text>}
             placeholder="masukkan kolaborator"
           />
-
-          <FileInput
-            label={<Text fz={"sm"} fw={"bold"}>Upload Gambar Baru (Opsional)</Text>}
-            value={file}
-            onChange={async (e) => {
-              if (!e) return;
-              setFile(e);
-              const base64 = await e.arrayBuffer().then((buf) =>
-                "data:image/png;base64," + Buffer.from(buf).toString("base64")
-              );
-              setPreviewImage(base64);
-            }}
-          />
-
-          {previewImage ? (
-            <Image alt="" src={previewImage} w={200} h={200} />
-          ) : (
-            <Center w={200} h={200} bg={"gray"}>
-              <IconImageInPicture />
-            </Center>
-          )}
-
           <Box>
             <Text fz={"sm"} fw={"bold"}>Konten</Text>
             <EditEditor

src/app/admin/(dashboard)/inovasi/kolaborasi-inovasi/list-kolaborasi-inovasi/[id]/page.tsx

@@ -1,15 +1,15 @@
 'use client'
 import { useProxy } from 'valtio/utils';
 
-import { Box, Button, Flex, Image, Paper, Skeleton, Stack, Text } from '@mantine/core';
+import { Box, Button, Flex, Paper, Skeleton, Stack, Text } from '@mantine/core';
 import { useShallowEffect } from '@mantine/hooks';
 import { IconArrowBack, IconEdit, IconX } from '@tabler/icons-react';
 import { useParams, useRouter } from 'next/navigation';
 import { useState } from 'react';
 
+import { ModalKonfirmasiHapus } from '@/app/admin/(dashboard)/_com/modalKonfirmasiHapus';
+import kolaborasiInovasiState from '@/app/admin/(dashboard)/_state/inovasi/kolaborasi-inovasi';
 import colors from '@/con/colors';
-import { ModalKonfirmasiHapus } from '../../../_com/modalKonfirmasiHapus';
-import kolaborasiInovasiState from '../../../_state/inovasi/kolaborasi-inovasi';
 
 function DetailKolaborasiInovasi() {
   const kolaborasiState = useProxy(kolaborasiInovasiState)
@@ -69,10 +69,6 @@ function DetailKolaborasiInovasi() {
                   <Text fw={"bold"} fz={"lg"}>Deskripsi</Text>
                   <Text fz={"lg"} dangerouslySetInnerHTML={{ __html: kolaborasiState.findUnique.data?.deskripsi }} />
                 </Box>
-                <Box>
-                  <Text fw={"bold"} fz={"lg"}>Gambar</Text>
-                  <Image w={{ base: 150, md: 150, lg: 150 }} src={kolaborasiState.findUnique.data?.image?.link} alt="gambar" />
-                </Box>
                 <Box>
                   <Text fw={"bold"} fz={"lg"}>Kolaborator</Text>
                   <Text fz={"lg"}>{kolaborasiState.findUnique.data?.kolaborator}</Text>

src/app/admin/(dashboard)/inovasi/kolaborasi-inovasi/list-kolaborasi-inovasi/create/page.tsx

@@ -0,0 +1,113 @@
+/* eslint-disable react-hooks/exhaustive-deps */
+'use client'
+import CreateEditor from '@/app/admin/(dashboard)/_com/createEditor';
+import kolaborasiInovasiState from '@/app/admin/(dashboard)/_state/inovasi/kolaborasi-inovasi';
+import colors from '@/con/colors';
+import { Box, Button, Group, Paper, Stack, Text, TextInput, Title } from '@mantine/core';
+import { YearPickerInput } from '@mantine/dates';
+import { IconArrowBack } from '@tabler/icons-react';
+import { useRouter } from 'next/navigation';
+import { useEffect } from 'react';
+import { toast } from 'react-toastify';
+import { useProxy } from 'valtio/utils';
+
+
+
+function CreateProgramKreatifDesa() {
+  const stateCreate = useProxy(kolaborasiInovasiState)
+  const router = useRouter();
+
+  const resetForm = () => {
+    stateCreate.create.form = {
+      name: "",
+      tahun: 0,
+      slug: "",
+      deskripsi: "",
+      kolaborator: "",
+    }
+  }
+
+  // Generate slug from name
+  useEffect(() => {
+    const { name } = stateCreate.create.form;
+    if (name) {
+      const slug = name
+        .toLowerCase()
+        .replace(/[^\w\s-]/g, '')
+        .replace(/\s+/g, '-')
+        .replace(/-+/g, '-');
+      stateCreate.create.form.slug = slug;
+    }
+  }, [stateCreate.create.form.name]);
+
+  const handleSubmit = async () => {
+    try {
+      // Submit data kolaborasi inovasi
+      await stateCreate.create.create();
+
+      // Reset form setelah submit
+      resetForm();
+      router.push("/admin/inovasi/kolaborasi-inovasi");
+      toast.success("Berhasil menambahkan kolaborasi inovasi");
+    } catch (error) {
+      console.error("Error creating kolaborasi inovasi:", error);
+      toast.error("Terjadi kesalahan saat menyimpan data");
+    }
+  }
+  return (
+    <Box>
+      <Box mb={10}>
+        <Button onClick={() => router.back()} variant='subtle' color={'blue'}>
+          <IconArrowBack color={colors['blue-button']} size={25} />
+        </Button>
+      </Box>
+
+      <Paper w={{ base: '100%', md: '50%' }} bg={colors['white-1']} p={'md'}>
+        <Stack gap={"xs"}>
+          <Title order={3}>Create Kolaborasi Inovasi</Title>
+          <TextInput
+            label={<Text fz={"sm"} fw={"bold"}>Nama Kolaborasi Inovasi</Text>}
+            placeholder="masukkan nama kolaborasi inovasi"
+            onChange={(val) => stateCreate.create.form.name = val.target.value}
+          />
+          <YearPickerInput
+            clearable
+            value={stateCreate.create.form.tahun ? new Date(stateCreate.create.form.tahun, 0, 1) : null}
+            label="Tahun"
+            placeholder="Pilih tahun"
+            onChange={(dateString: string) => {
+              const year = dateString ? new Date(dateString).getFullYear() : 0;
+              stateCreate.create.form.tahun = year;
+            }}
+          />
+          <Box>
+            <Text fw={"bold"} fz={"sm"}>Deskripsi</Text>
+            <CreateEditor
+              value={stateCreate.create.form.deskripsi}
+              onChange={(val) => {
+                stateCreate.create.form.deskripsi = val;
+              }}
+            />
+          </Box>
+          <TextInput
+            onChange={(e) => stateCreate.create.form.kolaborator = e.currentTarget.value}
+            label={<Text fw={"bold"} fz={"sm"}>Kolaborator</Text>}
+            placeholder='Masukkan kolaborator'
+          />
+          <Box>
+            <Text fw={"bold"} fz={"sm"}>Deskripsi Kolaborasi Inovasi</Text>
+            <CreateEditor
+              value={stateCreate.create.form.deskripsi}
+              onChange={(htmlContent) => stateCreate.create.form.deskripsi = htmlContent}
+            />
+          </Box>
+          <Group>
+            <Button bg={colors['blue-button']} onClick={handleSubmit}>Submit</Button>
+          </Group>
+        </Stack>
+      </Paper>
+    </Box>
+  );
+}
+
+export default CreateProgramKreatifDesa;

src/app/admin/(dashboard)/inovasi/kolaborasi-inovasi/list-kolaborasi-inovasi/page.tsx

@@ -3,11 +3,11 @@
 import colors from '@/con/colors';
 import { Box, Button, Center, Pagination, Paper, Skeleton, Stack, Table, TableTbody, TableTd, TableTh, TableThead, TableTr, Text } from '@mantine/core';
 import { IconDeviceImac, IconSearch } from '@tabler/icons-react';
-import HeaderSearch from '../../_com/header';
-import JudulList from '../../_com/judulList';
+import HeaderSearch from '../../../_com/header';
+import JudulList from '../../../_com/judulList';
 import { useRouter } from 'next/navigation';
 import { useEffect, useState } from 'react';
-import kolaborasiInovasiState from '../../_state/inovasi/kolaborasi-inovasi';
+import kolaborasiInovasiState from '../../../_state/inovasi/kolaborasi-inovasi';
 import { useProxy } from 'valtio/utils';
 
 function KolaborasiInovasi() {
@@ -28,22 +28,21 @@ function KolaborasiInovasi() {
 
 function ListKolaborasiInovasi({ search }: { search: string }) {
   const listState = useProxy(kolaborasiInovasiState)
-  const { data, loading, page, totalPages, load } = listState.findMany
   const router = useRouter();
 
-  useEffect(() => {
-    load(page, 10)
-  }, [page])
+  const {
+    data,
+    loading,
+    page,
+    totalPages,
+    load,
+  } = listState.findMany
 
-  const filteredData = (data || []).filter(item => {
-    const keyword = search.toLowerCase();
-    return (
-      item.name.toLowerCase().includes(keyword) ||
-      item.deskripsi.toLowerCase().includes(keyword) ||
-      item.slug.toLowerCase().includes(keyword) ||
-      item.kolaborator.toLowerCase().includes(keyword)
-    );
-  });
+  useEffect(() => {
+    load(page, 10, search)
+  }, [page, search])
+
+  const filteredData = data || []
 
   if (loading || !data) {
     return (
@@ -64,11 +63,11 @@ function ListKolaborasiInovasi({ search }: { search: string }) {
             <Table striped withTableBorder withRowBorders>
               <TableThead>
                 <TableTr>
-                  <TableTh style={{ width: '2%', textAlign: 'center' }}>No</TableTh>
-                  <TableTh style={{ width: '15%' }}>Nama Kolaborasi Inovasi</TableTh>
-                  <TableTh style={{ width: '15%', textAlign: 'center' }}>Tahun</TableTh>
-                  <TableTh style={{ width: '20%' }}>Deskripsi Singkat</TableTh>
-                  <TableTh style={{ width: '5%', textAlign: 'center' }}>Detail</TableTh>
+                  <TableTh>No</TableTh>
+                  <TableTh>Nama Kolaborasi Inovasi</TableTh>
+                  <TableTh>Tahun</TableTh>
+                  <TableTh>Deskripsi Singkat</TableTh>
+                  <TableTh>Detail</TableTh>
                 </TableTr>
               </TableThead>
             </Table>
@@ -89,21 +88,21 @@ function ListKolaborasiInovasi({ search }: { search: string }) {
         <Table striped withTableBorder withRowBorders>
           <TableThead>
             <TableTr>
-              <TableTh style={{ width: '1%', textAlign: 'center' }}>No</TableTh>
-              <TableTh style={{ width: '15%' }}>Nama Kolaborasi Inovasi</TableTh>
-              <TableTh style={{ width: '5%', textAlign: 'center' }}>Tahun</TableTh>
-              <TableTh style={{ width: '20%' }}>Deskripsi Singkat</TableTh>
-              <TableTh style={{ width: '5%', textAlign: 'center' }}>Detail</TableTh>
+              <TableTh>No</TableTh>
+              <TableTh>Nama Kolaborasi Inovasi</TableTh>
+              <TableTh>Tahun</TableTh>
+              <TableTh>Deskripsi Singkat</TableTh>
+              <TableTh>Detail</TableTh>
             </TableTr>
           </TableThead>
           <TableTbody>
             {filteredData.map((item, index) => (
               <TableTr key={item.id}>
-                <TableTd style={{ width: '1%', textAlign: 'center' }}>{index + 1}</TableTd>
-                <TableTd style={{ width: '15%' }}>{item.name}</TableTd>
-                <TableTd style={{ width: '5%', textAlign: 'center' }}>{item.tahun}</TableTd>
-                <TableTd style={{ width: '20%' }}>{item.slug}</TableTd>
-                <TableTd style={{ width: '5%', textAlign: 'center' }}>
+                <TableTd>{index + 1}</TableTd>
+                <TableTd>{item.name}</TableTd>
+                <TableTd>{item.tahun}</TableTd>
+                <TableTd>{item.slug}</TableTd>
+                <TableTd>
                   <Button onClick={() => router.push(`/admin/inovasi/kolaborasi-inovasi/${item.id}`)}>
                     <IconDeviceImac size={20} />
                   </Button>
@@ -116,17 +115,13 @@ function ListKolaborasiInovasi({ search }: { search: string }) {
       <Center>
         <Pagination
           value={page}
-          onChange={(newPage) => {
-            load(newPage, 10);
-            window.scrollTo(0, 0);
-          }}
+          onChange={(newPage) => load(newPage)} // ini penting!
           total={totalPages}
           mt="md"
           mb="md"
         />
       </Center>
-
-    </Box>
+    </Box >
   );
 }
 

src/app/admin/(dashboard)/inovasi/kolaborasi-inovasi/mitra-kolaborasi/[id]/page.tsx

@@ -0,0 +1,148 @@
+'use client'
+/* eslint-disable react-hooks/exhaustive-deps */
+import mitraKolaborasi from '@/app/admin/(dashboard)/_state/inovasi/mitra-kolaborasi';
+import colors from '@/con/colors';
+import ApiFetch from '@/lib/api-fetch';
+import { Box, Button, Center, Group, Image, Paper, Stack, Text, TextInput, Title } from '@mantine/core';
+import { Dropzone } from '@mantine/dropzone';
+import { IconArrowBack, IconImageInPicture, IconPhoto, IconUpload, IconX } from '@tabler/icons-react';
+import { useParams, useRouter } from 'next/navigation';
+import { useEffect, useState } from 'react';
+import { toast } from 'react-toastify';
+import { useProxy } from 'valtio/utils';
+
+
+function EditFoto() {
+  const state = useProxy(mitraKolaborasi)
+  const router = useRouter();
+  const params = useParams();
+  const [previewImage, setPreviewImage] = useState<string | null>(null);
+  const [file, setFile] = useState<File | null>(null);
+  const [formData, setFormData] = useState({
+    name: state.update.form.name || '',
+    imageId: state.update.form.imageId || ''
+  });
+
+  useEffect(() => {
+    const loadFoto = async () => {
+      const id = params?.id as string;
+      if (!id) return;
+      try {
+        const data = await state.update.load(id);
+        if (data) {
+          setFormData({
+            name: data.name || '',
+            imageId: data.imageId || ''
+          });
+          if (data?.image?.link) {
+            setPreviewImage(data.image.link);
+          }
+        }
+      } catch (error) {
+        console.error('Error loading foto:', error);
+        toast.error('Gagal memuat data foto');
+      }
+    };
+    loadFoto();
+  }, [params?.id]);
+
+  const handleSubmit = async () => {
+    try {
+      state.update.form = {
+        ...state.update.form,
+        name: formData.name,
+        imageId: formData.imageId
+      };
+      if (file) {
+        const res = await ApiFetch.api.fileStorage.create.post({
+          file,
+          name: file.name,
+        });
+        const uploaded = res.data?.data;
+        if (!uploaded?.id) {
+          return toast.error("Gagal upload gambar");
+        }
+        state.update.form.imageId = uploaded.id;
+      }
+      await state.update.update();
+      toast.success('Mitra berhasil diperbarui!');
+      router.push('/admin/inovasi/kolaborasi-inovasi/mitra-kolaborasi');
+    } catch (error) {
+      console.error('Error updating mitra:', error);
+      toast.error('Terjadi kesalahan saat memperbarui mitra');
+    }
+  };
+
+  return (
+    <Box>
+      <Box mb={10}>
+        <Button onClick={() => router.back()} variant='subtle' color={'blue'}>
+          <IconArrowBack color={colors['blue-button']} size={25} />
+        </Button>
+      </Box>
+
+      <Paper w={{ base: '100%', md: '50%' }} bg={colors['white-1']} p={'md'}>
+        <Stack gap={"xs"}>
+          <Title order={4}>Edit Mitra</Title>
+          <TextInput
+            label={<Text fw={"bold"} fz={"sm"}>Nama Mitra</Text>}
+            placeholder='Masukkan nama mitra'
+            value={formData.name}
+            onChange={(e) =>
+              (formData.name = e.target.value)
+            }
+          />
+          <Box>
+            <Text>Upload Foto</Text>
+            <Dropzone
+              onDrop={(files) => {
+                const selectedFile = files[0]; // Ambil file pertama
+                if (selectedFile) {
+                  setFile(selectedFile);
+                  setPreviewImage(URL.createObjectURL(selectedFile)); // Buat preview
+                }
+              }}
+              onReject={() => toast.error('File tidak valid.')}
+              maxSize={5 * 1024 ** 2} // Maks 5MB
+              accept={{ 'image/*': [] }}
+            >
+              <Group justify="center" gap="xl" mih={220} style={{ pointerEvents: 'none' }}>
+                <Dropzone.Accept>
+                  <IconUpload size={52} color="var(--mantine-color-blue-6)" stroke={1.5} />
+                </Dropzone.Accept>
+                <Dropzone.Reject>
+                  <IconX size={52} color="var(--mantine-color-red-6)" stroke={1.5} />
+                </Dropzone.Reject>
+                <Dropzone.Idle>
+                  <IconPhoto size={52} color="var(--mantine-color-dimmed)" stroke={1.5} />
+                </Dropzone.Idle>
+
+                <div>
+                  <Text size="xl" inline>
+                    Drag gambar ke sini atau klik untuk pilih file
+                  </Text>
+                  <Text size="sm" c="dimmed" inline mt={7}>
+                    Maksimal 5MB dan harus format gambar
+                  </Text>
+                </div>
+              </Group>
+            </Dropzone>
+
+            {previewImage ? (
+              <Image alt="" src={previewImage} w={200} h={200} />
+            ) : (
+              <Center w={200} h={200} bg={"gray"}>
+                <IconImageInPicture />
+              </Center>
+            )}
+          </Box>
+          <Group>
+            <Button onClick={handleSubmit} bg={colors['blue-button']}>Submit</Button>
+          </Group>
+        </Stack>
+      </Paper>
+    </Box>
+  );
+}
+
+export default EditFoto;

src/app/admin/(dashboard)/inovasi/kolaborasi-inovasi/mitra-kolaborasi/create/page.tsx

@@ -0,0 +1,136 @@
+'use client'
+import mitraKolaborasi from '@/app/admin/(dashboard)/_state/inovasi/mitra-kolaborasi';
+import colors from '@/con/colors';
+import ApiFetch from '@/lib/api-fetch';
+import { Box, Button, Group, Image, Paper, Stack, Text, TextInput, Title } from '@mantine/core';
+import { Dropzone } from '@mantine/dropzone';
+import { IconArrowBack, IconPhoto, IconUpload, IconX } from '@tabler/icons-react';
+import { useRouter } from 'next/navigation';
+import { useState } from 'react';
+import { toast } from 'react-toastify';
+import { useProxy } from 'valtio/utils';
+
+
+
+function CreateFoto() {
+  const state = useProxy(mitraKolaborasi)
+  const router = useRouter();
+  const [previewImage, setPreviewImage] = useState<string | null>(null);
+  const [file, setFile] = useState<File | null>(null);
+
+  const resetForm = () => {
+    state.create.form = {
+      name: "",
+      imageId: "",
+    };
+
+    setPreviewImage(null)
+    setFile(null)
+  };
+
+  const handleSubmit = async () => {
+    if (!file) {
+      return toast.warn("Pilih file gambar terlebih dahulu");
+    }
+
+    const res = await ApiFetch.api.fileStorage.create.post({
+      file,
+      name: file.name,
+    });
+
+    const uploaded = res.data?.data;
+    if (!uploaded?.id) {
+      return toast.error("Gagal upload gambar");
+    }
+
+    state.create.form.imageId = uploaded.id;
+    await state.create.create();
+    resetForm();
+    router.push("/admin/inovasi/kolaborasi-inovasi/mitra-kolaborasi")
+  };
+
+  return (
+    <Box>
+      <Box mb={10}>
+        <Button onClick={() => router.back()} variant='subtle' color={'blue'}>
+          <IconArrowBack color={colors['blue-button']} size={25} />
+        </Button>
+      </Box>
+
+      <Paper w={{ base: '100%', md: '50%' }} bg={colors['white-1']} p={'md'}>
+        <Stack gap={"xs"}>
+          <Title order={4}>Create Mitra</Title>
+          <TextInput
+            label={<Text fw={"bold"} fz={"sm"}>Nama Mitra</Text>}
+            placeholder='Masukkan nama mitra'
+            value={state.create.form.name}
+            onChange={(val) => {
+              state.create.form.name = val.target.value;
+            }}
+          />
+          <Box>
+            <Text fz={"md"} fw={"bold"}>Gambar</Text>
+            <Box>
+              <Dropzone
+                onDrop={(files) => {
+                  const selectedFile = files[0]; // Ambil file pertama
+                  if (selectedFile) {
+                    setFile(selectedFile);
+                    setPreviewImage(URL.createObjectURL(selectedFile)); // Buat preview
+                  }
+                }}
+                onReject={() => toast.error('File tidak valid.')}
+                maxSize={5 * 1024 ** 2} // Maks 5MB
+                accept={{ 'image/*': [] }}
+              >
+                <Group justify="center" gap="xl" mih={220} style={{ pointerEvents: 'none' }}>
+                  <Dropzone.Accept>
+                    <IconUpload size={52} color="var(--mantine-color-blue-6)" stroke={1.5} />
+                  </Dropzone.Accept>
+                  <Dropzone.Reject>
+                    <IconX size={52} color="var(--mantine-color-red-6)" stroke={1.5} />
+                  </Dropzone.Reject>
+                  <Dropzone.Idle>
+                    <IconPhoto size={52} color="var(--mantine-color-dimmed)" stroke={1.5} />
+                  </Dropzone.Idle>
+
+                  <div>
+                    <Text size="xl" inline>
+                      Drag gambar ke sini atau klik untuk pilih file
+                    </Text>
+                    <Text size="sm" c="dimmed" inline mt={7}>
+                      Maksimal 5MB dan harus format gambar
+                    </Text>
+                  </div>
+                </Group>
+              </Dropzone>
+
+              {/* Tampilkan preview kalau ada */}
+              {previewImage && (
+                <Box mt="sm">
+                  <Image
+                    src={previewImage}
+                    alt="Preview"
+                    style={{
+                      maxWidth: '100%',
+                      maxHeight: '200px',
+                      objectFit: 'contain',
+                      borderRadius: '8px',
+                      border: '1px solid #ddd',
+                    }}
+                  />
+                </Box>
+              )}
+
+            </Box>
+          </Box>
+          <Group>
+            <Button onClick={handleSubmit} bg={colors['blue-button']}>Submit</Button>
+          </Group>
+        </Stack>
+      </Paper>
+    </Box>
+  );
+}
+
+export default CreateFoto;

src/app/admin/(dashboard)/inovasi/kolaborasi-inovasi/mitra-kolaborasi/page.tsx

@@ -0,0 +1,187 @@
+/* eslint-disable react-hooks/exhaustive-deps */
+'use client'
+import colors from '@/con/colors';
+import { Box, Button, Center, Image, Pagination, Paper, Skeleton, Stack, Table, TableTbody, TableTd, TableTh, TableThead, TableTr, Text } from '@mantine/core';
+import { IconEdit, IconSearch, IconX } 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 mitraKolaborasi from '../../../_state/inovasi/mitra-kolaborasi';
+import { ModalKonfirmasiHapus } from '../../../_com/modalKonfirmasiHapus';
+
+function MitraKolaborasi() {
+  const [search, setSearch] = useState('');
+  return (
+    <Box>
+      <HeaderSearch
+        title='Mitra Kolaborasi'
+        placeholder='pencarian'
+        searchIcon={<IconSearch size={20} />}
+        value={search}
+        onChange={(e) => setSearch(e.currentTarget.value)}
+      />
+      <ListMitraKolaborasi search={search} />
+    </Box>
+  );
+}
+
+function ListMitraKolaborasi({ search }: { search: string }) {
+  const listState = useProxy(mitraKolaborasi)
+  const router = useRouter();
+  const [modalHapus, setModalHapus] = useState(false)
+  const [selectedId, setSelectedId] = useState<string | null>(null)
+
+  const handleHapus = () => {
+    if (selectedId) {
+      mitraKolaborasi.delete.byId(selectedId)
+      setModalHapus(false)
+      setSelectedId(null)
+      router.push("/admin/inovasi/kolaborasi-inovasi")
+    }
+  }
+
+  const {
+    data,
+    loading,
+    page,
+    totalPages,
+    load,
+  } = listState.findMany
+
+  useEffect(() => {
+    load(page, 10, search)
+  }, [page, search])
+
+  const filteredData = data || []
+
+  if (loading || !data) {
+    return (
+      <Stack py={10}>
+        <Skeleton height={650} />
+      </Stack>
+    );
+  }
+  if (data.length === 0) {
+    return (
+      <Box py={10}>
+        <Paper p="md" >
+          <Stack>
+            <JudulList
+              title='List Mitra Kolaborasi'
+              href='/admin/inovasi/kolaborasi-inovasi/mitra-kolaborasi/create'
+            />
+            <Table striped withTableBorder withRowBorders>
+              <TableThead>
+                <TableTr>
+                  <TableTh>No</TableTh>
+                  <TableTh>Nama Mitra</TableTh>
+                  <TableTh>Image</TableTh>
+                  <TableTh>Delete</TableTh>
+                  <TableTh>Edit</TableTh>
+                </TableTr>
+              </TableThead>
+            </Table>
+            <Text ta="center">Tidak ada data mitra kolaborasi yang tersedia</Text>
+          </Stack>
+        </Paper>
+      </Box >
+    );
+  }
+
+  return (
+    <Box py={10}>
+      <Paper bg={colors['white-1']} p={'md'}>
+        <JudulList
+          title='List Mitra Kolaborasi'
+          href='/admin/inovasi/kolaborasi-inovasi/mitra-kolaborasi/create'
+        />
+        <Table striped withTableBorder withRowBorders>
+          <TableThead>
+            <TableTr>
+              <TableTh>No</TableTh>
+              <TableTh>Nama Mitra</TableTh>
+              <TableTh>Image</TableTh>
+              <TableTh>Delete</TableTh>
+              <TableTh>Edit</TableTh>
+            </TableTr>
+          </TableThead>
+          <TableTbody>
+            {filteredData.map((item, index) => (
+              <TableTr key={item.id}>
+                <TableTd>{index + 1}</TableTd>
+                <TableTd>{item.name}</TableTd>
+                <TableTd>
+                  <Box style={{
+                    width: 100,
+                    height: 100,
+                    position: 'relative',
+                    overflow: 'hidden',
+                    borderRadius: 4
+                  }}>
+                    <Image
+                      src={item.image?.link || ''}
+                      alt={item.name}
+                      style={{
+                        width: '100%',
+                        height: '100%',
+                        objectFit: 'cover',
+                        objectPosition: 'center'
+                      }}
+                    />
+                  </Box>
+                </TableTd>
+                <TableTd>
+                  <Button
+                    onClick={() => {
+                      if (item) {
+                        setSelectedId(item.id);
+                        setModalHapus(true);
+                      }
+                    }}
+                    disabled={mitraKolaborasi.delete.loading || !item}
+                    color={"red"}
+                  >
+                    <IconX size={20} />
+                  </Button>
+                </TableTd>
+                <TableTd>
+                  <Button
+                    onClick={() => {
+                      if (item) {
+                        router.push(`/admin/inovasi/kolaborasi-inovasi/mitra-kolaborasi/${item.id}`);
+                      }
+                    }}
+                    disabled={!item}
+                    color={"green"}
+                  >
+                    <IconEdit size={20} />
+                  </Button>
+                </TableTd>
+              </TableTr>
+            ))}
+          </TableTbody>
+        </Table>
+      </Paper>
+      <Center>
+        <Pagination
+          value={page}
+          onChange={(newPage) => load(newPage)} // ini penting!
+          total={totalPages}
+          mt="md"
+          mb="md"
+        />
+      </Center>
+      {/* Modal Konfirmasi Hapus */}
+      <ModalKonfirmasiHapus
+        opened={modalHapus}
+        onClose={() => setModalHapus(false)}
+        onConfirm={handleHapus}
+        text='Apakah anda yakin ingin menghapus mitra kolaborasi ini?'
+      />
+    </Box >
+  );
+}
+
+export default MitraKolaborasi;

src/app/admin/(dashboard)/lingkungan/data-lingkungan-desa/page.tsx

@@ -42,18 +42,10 @@ function ListDataLingkunganDesa({ search }: { search: string }) {
   const router = useRouter();
 
   useEffect(() => {
-    load(page, 10)
-  }, [page])
+    load(page, 10, search)
+  }, [page, search])
 
-  const filteredData = (data || []).filter(item => {
-    const keyword = search.toLowerCase();
-    return (
-      item.name.toLowerCase().includes(keyword) ||
-      item.deskripsi.toLowerCase().includes(keyword) ||
-      item.jumlah.toLowerCase().includes(keyword) ||
-      item.icon.toLowerCase().includes(keyword)
-    );
-  });
+  const filteredData = data || []
 
   const iconMap: Record<string, React.FC<any>> = {
     ekowisata: IconLeaf,

src/app/admin/(dashboard)/lingkungan/program-penghijauan/page.tsx

@@ -126,7 +126,9 @@ function ListProgramPenghijauan({ search }: { search: string }) {
                 <TableTr key={item.id}>
                   <TableTd style={{ width: '5%', textAlign: 'center' }}>{index + 1}</TableTd>
                   <TableTd style={{ width: '20%', wordWrap: 'break-word' }}>{item.name}</TableTd>
-                  <TableTd style={{ width: '35%', wordWrap: 'break-word' }} dangerouslySetInnerHTML={{ __html: item.judul }}></TableTd>
+                  <TableTd style={{ width: '35%', wordWrap: 'break-word' }}>
+                    <Text lineClamp={1} fz={"sm"} dangerouslySetInnerHTML={{ __html: item.judul }}/>
+                  </TableTd>
                   <TableTd style={{ width: '10%' }}>
                     {iconMap[item.icon] && (
                       <Box title={item.icon}>

src/app/admin/_com/list_PageAdmin.tsx

@@ -286,7 +286,7 @@ export const navBar = [
       {
         id: "Inovasi_4",
         name: "Kolaborasi Inovasi",
-        path: "/admin/inovasi/kolaborasi-inovasi"
+        path: "/admin/inovasi/kolaborasi-inovasi/list-kolaborasi-inovasi"
       },
       {
         id: "Inovasi_5",

src/app/api/[[...slugs]]/_lib/inovasi/desa-digital/findMany.ts

@@ -1,23 +1,54 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 import prisma from "@/lib/prisma";
+import { Context } from "elysia";
 
-export default async function desaDigitalFindMany() {
-    try {
-        const data = await prisma.desaDigital.findMany({
-            include: {
-                image: true,
-            },
-        });
+export default async function desaDigitalFindMany(context: Context) {
+  // Ambil parameter dari query
+  const page = Number(context.query.page) || 1;
+  const limit = Number(context.query.limit) || 10;
+  const search = (context.query.search as string) || '';
+  const skip = (page - 1) * limit;
 
-        return {
-            success: true,
-            message: "Success fetch desa digital",
-            data,
-        };
-    } catch (error) {
-        console.error("Find many error:", error);
-        return {
-            success: false,
-            message: "Failed fetch desa digital",
-        };
-    }
+  // Buat where clause
+  const where: any = { isActive: true };
+
+  // Tambahkan pencarian (jika ada)
+  if (search) {
+    where.OR = [
+      { name: { contains: search, mode: 'insensitive' } },
+      { deskripsi: { contains: search, mode: 'insensitive' } },
+    ];
+  }
+
+  try {
+    // Ambil data dan total count secara paralel
+    const [data, total] = await Promise.all([
+      prisma.desaDigital.findMany({
+        where,
+        include: {
+          image: true,
+        },
+        skip,
+        take: limit,
+        orderBy: { createdAt: 'desc' },
+      }),
+      prisma.desaDigital.count({ where }),
+    ]);
+
+    return {
+      success: true,
+      message: "Berhasil ambil desa digital dengan pagination",
+      data,
+      page,
+      limit,
+      total,
+      totalPages: Math.ceil(total / limit),
+    };
+  } catch (e) {
+    console.error("Error di findMany paginated:", e);
+    return {
+      success: false,
+      message: "Gagal mengambil data desa digital",
+    };
+  }
 }

src/app/api/[[...slugs]]/_lib/inovasi/index.ts

@@ -5,6 +5,7 @@ import KolaborasiInovasi from "./kolaborasi-inovasi";
 import InfoTekno from "./info-teknologi";
 import AjukanIdeInovatif from "./ajukan-ide-inovatif";
 import LayananOnlineDesa from "./layanan-online-desa";
+import MitraKolaborasi from "./kolaborasi-inovasi/mitra-kolaborasi";
 
 const Inovasi = new Elysia({
   prefix: "/api/inovasi",
@@ -16,5 +17,6 @@ const Inovasi = new Elysia({
   .use(InfoTekno)
   .use(AjukanIdeInovatif)
   .use(LayananOnlineDesa)
-
+  .use(MitraKolaborasi)
+  
 export default Inovasi;

src/app/api/[[...slugs]]/_lib/inovasi/info-teknologi/findMany.ts

@@ -1,23 +1,61 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 import prisma from "@/lib/prisma";
+import { Context } from "elysia";
 
-export default async function infoTeknoFindMany() {
-    try {
-        const data = await prisma.infoTekno.findMany({
-            include: {
-                image: true,
-            },
-        });
+// Di findMany.ts
+export default async function infoTeknoFindMany(context: Context) {
+  const page = Number(context.query.page) || 1;
+  const limit = Number(context.query.limit) || 10;
+  const search = (context.query.search as string) || '';
+  const skip = (page - 1) * limit;
 
-        return {
-            success: true,
-            message: "Success fetch info teknologi",
-            data,
-        };
-    } catch (error) {
-        console.error("Find many error:", error);
-        return {
-            success: false,
-            message: "Failed fetch info teknologi",
-        };
-    }
+  // Buat where clause
+  const where: any = { isActive: true };
+
+  // Tambahkan pencarian (jika ada)
+  if (search) {
+    where.OR = [
+      { name: { contains: search, mode: 'insensitive' } },
+      { deskripsi: { contains: search, mode: 'insensitive' } },
+    ];
+  }
+
+
+  try {
+    const [data, total] = await Promise.all([
+      prisma.infoTekno.findMany({
+        where,
+        include: {
+          image: true,
+        },
+        skip,
+        take: limit,
+        orderBy: { createdAt: 'desc' },
+      }),
+      prisma.infoTekno.count({
+        where
+      })
+    ]);
+
+    const totalPages = Math.ceil(total / limit);
+
+    return {
+      success: true,
+      message: "Success fetch info teknologi with pagination",
+      data,
+      page,
+      totalPages,
+      total,
+    };
+  } catch (e) {
+    console.error("Find many paginated error:", e);
+    return {
+      success: false,
+      message: "Failed fetch info teknologi with pagination",
+      data: [],
+      page: 1,
+      totalPages: 1,
+      total: 0,
+    };
+  }
 }

src/app/api/[[...slugs]]/_lib/inovasi/kolaborasi-inovasi/create.ts

@@ -1,34 +1,37 @@
 import prisma from "@/lib/prisma";
 import { Context } from "elysia";
+import { Prisma } from "@prisma/client";
 
-type FormCreateKolaborasiInovasi = {
-    name: string;
-    tahun: number;
-    slug: string;
-    deskripsi: string;
-    kolaborator: string;
-    imageId: string;
+// Define validation schema
+type FormCreateKolaborasiInovasi = Prisma.KolaborasiInovasiGetPayload<{
+  select: {
+    name: true;
+    tahun: true;
+    slug: true;
+    deskripsi: true;
+    kolaborator: true;
+  };
+}>;
+
+export default async function kolaborasiInovasiCreate(context: Context) {
+  const body = context.body as FormCreateKolaborasiInovasi;
+
+  // Create new kolaborasi inovasi
+  await prisma.kolaborasiInovasi.create({
+    data: {
+      name: body.name,
+      tahun: body.tahun,
+      slug: body.slug,
+      deskripsi: body.deskripsi,
+      kolaborator: body.kolaborator,
+    },
+  });
+
+  return {
+    success: true,
+    message: "Berhasil membuat kolaborasi inovasi",
+    data: {
+      ...body,
+    },
+  };
 }
-
-export default async function kolaborasiInovasiCreate(context: Context){
-    const body = context.body as FormCreateKolaborasiInovasi;
-
-    await prisma.kolaborasiInovasi.create({
-        data: {
-            name: body.name,
-            tahun: body.tahun,
-            slug: body.slug,
-            deskripsi: body.deskripsi,
-            kolaborator: body.kolaborator,
-            imageId: body.imageId,
-        }
-    })
-
-    return {
-        success: true,
-        message: "Success create kolaborasi inovasi",
-        data: {
-            ...body,
-        }
-    }
-}

src/app/api/[[...slugs]]/_lib/inovasi/kolaborasi-inovasi/findMany.ts

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 import prisma from "@/lib/prisma";
 import { Context } from "elysia";
 
@@ -5,18 +6,42 @@ import { Context } from "elysia";
 export default async function kolaborasiInovasiFindMany(context: Context) {
   const page = Number(context.query.page) || 1;
   const limit = Number(context.query.limit) || 10;
+  const search = (context.query.search as string) || '';
+  const year = (context.query.year as string) || '';
   const skip = (page - 1) * limit;
 
+  // Buat where clause
+  const where: any = { isActive: true };
+
+  // Tambahkan filter tahun (jika ada)
+  if (year) {
+    const startDate = new Date(parseInt(year), 0, 1); // 1 Januari tahun tersebut
+    const endDate = new Date(parseInt(year) + 1, 0, 1); // 1 Januari tahun berikutnya
+    where.createdAt = {
+      gte: startDate,
+      lt: endDate,
+    };
+  }
+
+  // Tambahkan pencarian (jika ada)
+  if (search) {
+    where.OR = [
+      { name: { contains: search, mode: 'insensitive' } },
+      { slug: { contains: search, mode: 'insensitive' } },
+    ];
+  }
+
+
   try {
     const [data, total] = await Promise.all([
       prisma.kolaborasiInovasi.findMany({
-        where: { isActive: true },
+        where,
         skip,
         take: limit,
         orderBy: { createdAt: 'desc' },
       }),
       prisma.kolaborasiInovasi.count({
-        where: { isActive: true }
+        where
       })
     ]);
 

src/app/api/[[...slugs]]/_lib/inovasi/kolaborasi-inovasi/findUnique.ts

@@ -15,9 +15,6 @@ export default async function kolaborasiInovasiFindUnique(context: Context) {
     try {
         const kolaborasiInovasi = await prisma.kolaborasiInovasi.findUnique({
             where: { id },
-            include: {
-                image: true,
-            }
         });
 
         if (!kolaborasiInovasi) {

src/app/api/[[...slugs]]/_lib/inovasi/kolaborasi-inovasi/index.ts

@@ -21,7 +21,6 @@ const KolaborasiInovasi = new Elysia({
       slug: t.String(),
       deskripsi: t.String(),
       kolaborator: t.String(),
-      imageId: t.String(),
     }),
   })
   .put(
@@ -37,7 +36,7 @@ const KolaborasiInovasi = new Elysia({
         slug: t.String(),
         deskripsi: t.String(),
         kolaborator: t.String(),
-        imageId: t.String(),
+
       }),
     }
   )

src/app/api/[[...slugs]]/_lib/inovasi/kolaborasi-inovasi/mitra-kolaborasi/create.ts

@@ -0,0 +1,26 @@
+import prisma from "@/lib/prisma";
+import { Context } from "elysia";
+
+type FormCreate = {
+  name: string;
+  imageId: string;
+};
+
+export default async function mitraKolaborasiCreate(context: Context) {
+    const body = context.body as FormCreate;
+
+    await prisma.mitraKolaborasi.create({
+        data: {
+            name: body.name,
+            imageId: body.imageId,
+        },
+    });
+
+    return {
+        success: true,
+        message: "Berhasil membuat mitra kolaborasi",
+        data: {
+            ...body,
+        },
+    };
+}

src/app/api/[[...slugs]]/_lib/inovasi/kolaborasi-inovasi/mitra-kolaborasi/del.ts

@@ -0,0 +1,54 @@
+import prisma from "@/lib/prisma";
+import { Context } from "elysia";
+import fs from "fs/promises";
+import path from "path";
+
+export default async function mitraKolaborasiDelete(context: Context) {
+  const id = context.params?.id as string;
+
+  if (!id) {
+    return {
+      status: 400,
+      body: "ID tidak diberikan",
+    };
+  }
+
+  const mitraKolaborasi = await prisma.mitraKolaborasi.findUnique({
+    where: { id },
+    include: {
+      image: true,
+    },
+  });
+
+  if (!mitraKolaborasi) {
+    return {
+      status: 404,
+      body: "Mitra kolaborasi tidak ditemukan",
+    };
+  }
+
+  if (mitraKolaborasi.image) {
+    try {
+      const filePath = path.join(
+        mitraKolaborasi.image.path,
+        mitraKolaborasi.image.name
+      );
+      await fs.unlink(filePath);
+      await prisma.fileStorage.delete({
+        where: { id: mitraKolaborasi.image.id },
+      });
+    } catch (error) {
+      console.error("Gagal hapus file image:", error);
+    }
+  }
+
+  await prisma.mitraKolaborasi.delete({
+    where: { id },
+  });
+
+  return {
+    success: true,
+    message: "Mitra kolaborasi berhasil dihapus",
+    status: 200,
+  };
+}

src/app/api/[[...slugs]]/_lib/inovasi/kolaborasi-inovasi/mitra-kolaborasi/findMany.ts

@@ -0,0 +1,53 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import prisma from "@/lib/prisma";
+import { Context } from "elysia";
+
+export default async function mitraKolaborasiFindMany(context: Context) {
+  // Ambil parameter dari query
+  const page = Number(context.query.page) || 1;
+  const limit = Number(context.query.limit) || 10;
+  const search = (context.query.search as string) || '';
+  const skip = (page - 1) * limit;
+
+  // Buat where clause
+  const where: any = { isActive: true };
+
+  // Tambahkan pencarian (jika ada)
+  if (search) {
+    where.OR = [
+      { name: { contains: search, mode: 'insensitive' } },
+    ];
+  }
+
+  try {
+    // Ambil data dan total count secara paralel
+    const [data, total] = await Promise.all([
+      prisma.mitraKolaborasi.findMany({
+        where,
+        include: {
+          image: true,
+        },
+        skip,
+        take: limit,
+        orderBy: { createdAt: 'desc' },
+      }),
+      prisma.mitraKolaborasi.count({ where }),
+    ]);
+
+    return {
+      success: true,
+      message: "Berhasil ambil mitra kolaborasi dengan pagination",
+      data,
+      page,
+      limit,
+      total,
+      totalPages: Math.ceil(total / limit),
+    };
+  } catch (e) {
+    console.error("Error di findMany paginated:", e);
+    return {
+      success: false,
+      message: "Gagal mengambil data mitra kolaborasi",
+    };
+  }
+}

src/app/api/[[...slugs]]/_lib/inovasi/kolaborasi-inovasi/mitra-kolaborasi/findUnique.ts

@@ -0,0 +1,49 @@
+import prisma from "@/lib/prisma";
+
+export default async function mitraKolaborasiFindUnique(request: Request) {
+    const url = new URL(request.url);
+    const pathSegments = url.pathname.split("/");
+    const id = pathSegments[pathSegments.length - 1];
+
+    if (!id) {
+        return Response.json({
+            success: false,
+            message: "ID tidak ditemukan",
+        }, {status: 400});
+    }
+
+    try {
+        if (typeof id !== 'string') {
+            return Response.json({
+                success: false,
+                message: "ID tidak valid",
+            }, {status: 400});
+        }
+
+        const data = await prisma.mitraKolaborasi.findUnique({
+            where: { id },
+            include: {
+                image: true,
+            },
+        });
+
+        if (!data) {
+            return Response.json({
+                success: false,
+                message: "Mitra kolaborasi tidak ditemukan",
+            }, {status: 404});
+        }
+
+        return Response.json({
+            success: true,
+            message: "Success fetch mitra kolaborasi by ID",
+            data,
+        }, {status: 200});
+    } catch (error) {
+        console.error("Find by ID error:", error);
+        return Response.json({
+            success: false,
+            message: "Gagal mengambil mitra kolaborasi: " + (error instanceof Error ? error.message : 'Unknown error'),
+        }, {status: 500});
+    }
+}

src/app/api/[[...slugs]]/_lib/inovasi/kolaborasi-inovasi/mitra-kolaborasi/index.ts

@@ -0,0 +1,37 @@
+import Elysia, { t } from "elysia";
+import mitraKolaborasiCreate from "./create";
+import mitraKolaborasiDelete from "./del";
+import mitraKolaborasiUpdate from "./updt";
+import mitraKolaborasiFindUnique from "./findUnique";
+import mitraKolaborasiFindMany from "./findMany";
+
+const MitraKolaborasi = new Elysia({
+  prefix: "/mitrakolaborasi",
+  tags: ["Inovasi/Mitra Kolaborasi"],
+})
+  .post("/create", mitraKolaborasiCreate, {
+    body: t.Object({
+      name: t.String(),
+      imageId: t.String(),
+    }),
+  })
+  .get("/find-many", mitraKolaborasiFindMany)
+  .get("/:id", async (context) => {
+    const response = await mitraKolaborasiFindUnique(context.request);
+    return response;
+  })
+  .delete("/del/:id", mitraKolaborasiDelete)
+  .put(
+    "/:id",
+    async (context) => {
+      const response = await mitraKolaborasiUpdate(context);
+      return response;
+    },
+    {
+      body: t.Object({
+        name: t.String(),
+        imageId: t.String(),
+      }),
+    }
+  );
+export default MitraKolaborasi;

src/app/api/[[...slugs]]/_lib/inovasi/kolaborasi-inovasi/mitra-kolaborasi/updt.ts

@@ -0,0 +1,97 @@
+import prisma from "@/lib/prisma";
+import { Context } from "elysia";
+import fs from "fs/promises";
+import path from "path";
+
+type FormUpdate = {
+    id: string;
+    name: string;
+    imageId: string;
+}
+export default async function mitraKolaborasiUpdate(context: Context) {
+    try {
+        const id = context.params?.id as string;
+        const body = (await context.body) as Omit<FormUpdate, "id">;
+    
+        const {
+            name,
+            imageId
+        } = body;
+    
+        if (!id) {
+            return new Response(JSON.stringify({
+                success: false,
+                message: "ID tidak ditemukan",
+            }), {
+                status: 400,
+                headers: {
+                    'Content-Type': 'application/json'
+                }
+            })
+        }
+    
+        const existing = await prisma.mitraKolaborasi.findUnique({
+            where: {id},
+            include: {
+                image: true,
+            }
+        })
+    
+        if (!existing) {
+            return new Response(JSON.stringify({
+                success: false,
+                message: "mitra kolaborasi tidak ditemukan",
+            }), {
+                status: 404,
+                headers: {
+                    'Content-Type': 'application/json'
+                }
+            })
+        }
+    
+        if (existing.imageId && existing.imageId !== imageId) {
+        const oldImage = existing.image;
+        if (oldImage) {
+            try {
+                const filePath = path.join(oldImage.path, oldImage.name);
+                await fs.unlink(filePath);
+                await prisma.fileStorage.delete({
+                    where: { id: oldImage.id },
+                });
+            } catch (error) {
+                console.error("Gagal hapus gambar lama:", error);
+            }
+        }
+        }
+    
+        const updated = await prisma.mitraKolaborasi.update({
+            where: { id },
+            data: {
+                name,
+                imageId,
+            }
+        })
+    
+        return new Response(JSON.stringify({
+            success: true,
+            message: "Mitra kolaborasi berhasil diupdate",
+            data: updated,
+        }), {
+            status: 200,
+            headers: {
+                'Content-Type': 'application/json'
+            }
+        })
+    } catch (error) {
+        console.error("Error updating mitra kolaborasi:", error); 
+        return new Response(JSON.stringify({
+            success: false,
+            message: "Terjadi kesalahan saat mengupdate mitra kolaborasi",
+        }), {
+            status: 500,
+            headers: {
+                'Content-Type': 'application/json'
+            }
+        })
+    }
+    }

src/app/api/[[...slugs]]/_lib/inovasi/kolaborasi-inovasi/updt.ts

@@ -9,7 +9,7 @@ type FormUpdateKolaborasiInovasi = {
     slug?: string;
     deskripsi?: string;
     kolaborator?: string;
-    imageId?: string;
+
 };
 export default async function kolaborasiInovasiUpdate(context: Context) {
     const body = context.body as FormUpdateKolaborasiInovasi;
@@ -31,7 +31,6 @@ export default async function kolaborasiInovasiUpdate(context: Context) {
           slug: body.slug,
           deskripsi: body.deskripsi,
           kolaborator: body.kolaborator,
-          imageId: body.imageId,
         },
       });
   

src/app/api/[[...slugs]]/_lib/lingkungan/data-lingkungan-desa/findMany.ts

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 import prisma from "@/lib/prisma";
 import { Context } from "elysia";
 
@@ -6,17 +7,28 @@ export default async function dataLingkunganDesaFindMany(context: Context) {
   const page = Number(context.query.page) || 1;
   const limit = Number(context.query.limit) || 10;
   const skip = (page - 1) * limit;
+  const search = (context.query.search as string) || '';
+
+  const where: any = { isActive: true };
+
+  // Tambahkan pencarian (jika ada)
+  if (search) {
+    where.OR = [
+      { name: { contains: search, mode: 'insensitive' } },
+      { deskripsi: { contains: search, mode: 'insensitive' } },
+    ];
+  }
 
   try {
     const [data, total] = await Promise.all([
       prisma.dataLingkunganDesa.findMany({
-        where: { isActive: true },
+        where,
         skip,
         take: limit,
         orderBy: { createdAt: 'desc' },
       }),
       prisma.dataLingkunganDesa.count({
-        where: { isActive: true }
+        where,
       })
     ]);
 

src/app/api/[[...slugs]]/_lib/lingkungan/gotong-royong/findFirst.ts

@@ -0,0 +1,38 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import prisma from "@/lib/prisma";
+import { Context } from "elysia";
+
+export default async function KegiatanDesaFindFirst(context: Context) {
+    const kategori = (context.query.kategori as string) || '';
+
+    const where: any = { isActive: true };
+
+    if (kategori) {
+      where.kategoriKegiatan = {
+        name: { equals: kategori, mode: 'insensitive' }
+      };
+    }
+
+    try {
+    const data = await prisma.kegiatanDesa.findFirst({
+      where,
+      include: {
+        image: true,
+        kategoriKegiatan: true,
+      },
+      orderBy: { createdAt: 'desc' },
+    });
+
+    return {
+      success: true,
+      message: "Berhasil ambil gotong royong terbaru",
+      data,
+    };
+  } catch (error) {
+    console.error('Error di findFirst:', error);
+    return {
+      success: false,
+      message: 'Gagal memuat gotong royong terbaru',
+    };
+  }
+}

src/app/api/[[...slugs]]/_lib/lingkungan/gotong-royong/findMany.ts

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 // /api/berita/findManyPaginated.ts
 import prisma from "@/lib/prisma";
 import { Context } from "elysia";
@@ -5,12 +6,38 @@ import { Context } from "elysia";
 async function kegiatanDesaFindMany(context: Context) {
   const page = Number(context.query.page) || 1;
   const limit = Number(context.query.limit) || 10;
+  const search = (context.query.search as string) || '';
+  const kategori = (context.query.kategori as string) || ''; // 🔥 Parameter kategori baru
   const skip = (page - 1) * limit;
 
+  // Buat where clause
+  const where: any = { isActive: true };
+
+  // Filter berdasarkan kategori (jika ada)
+  if (kategori) {
+    where.kategoriKegiatan = {
+      nama: {
+        equals: kategori,
+        mode: 'insensitive' // Tidak case-sensitive
+      }
+    };
+  }
+
+  // Tambahkan pencarian (jika ada)
+  if (search) {
+    where.OR = [
+      { judul: { contains: search, mode: 'insensitive' } },
+      { deskripsiSingkat: { contains: search, mode: 'insensitive' } },
+      { deskripsiLengkap: { contains: search, mode: 'insensitive' } },
+      { kategoriKegiatan: { nama: { contains: search, mode: 'insensitive' } } }
+    ];
+  }
+
+
   try {
     const [data, total] = await Promise.all([
       prisma.kegiatanDesa.findMany({
-        where: { isActive: true },
+        where,
         include: {
           kategoriKegiatan: true,
           image: true,
@@ -20,7 +47,7 @@ async function kegiatanDesaFindMany(context: Context) {
         orderBy: { createdAt: 'desc' }, // opsional, kalau mau urut berdasarkan waktu
       }),
       prisma.kegiatanDesa.count({
-        where: { isActive: true }
+        where,
       })
     ]);
 

src/app/api/[[...slugs]]/_lib/lingkungan/gotong-royong/index.ts

@@ -4,6 +4,7 @@ import KegiatanDesaDelete from "./del";
 import KegiatanDesaFindMany from "./findMany";
 import KegiatanDesaFindUnique from "./findUnique";
 import KegiatanDesaUpdate from "./updt";
+import KegiatanDesaFindFirst from "./findFirst";
 
 const KegiatanDesa = new Elysia({
   prefix: "/kegiatandesa",
@@ -16,6 +17,9 @@ const KegiatanDesa = new Elysia({
   // ✅ Find by ID
   .get("/:id", KegiatanDesaFindUnique)
 
+  // ✅ Find First
+  .get("/find-first", KegiatanDesaFindFirst)
+
   // ✅ Create
   .post("/create", KegiatanDesaCreate, {
     body: t.Object({

src/app/api/[[...slugs]]/_lib/lingkungan/pengelolaan-sampah/findMany.ts

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 import prisma from "@/lib/prisma";
 import { Context } from "elysia";
 
@@ -5,18 +6,28 @@ import { Context } from "elysia";
 export default async function pengelolaanSampahFindMany(context: Context) {
   const page = Number(context.query.page) || 1;
   const limit = Number(context.query.limit) || 10;
+  const search = (context.query.search as string) || '';
   const skip = (page - 1) * limit;
 
+  const where: any = { isActive: true };
+
+  // Tambahkan pencarian (jika ada)
+  if (search) {
+    where.OR = [
+      { name: { contains: search, mode: 'insensitive' } },
+    ];
+  }
+
   try {
     const [data, total] = await Promise.all([
       prisma.pengelolaanSampah.findMany({
-        where: { isActive: true },
+        where,
         skip,
         take: limit,
         orderBy: { createdAt: 'desc' },
       }),
       prisma.pengelolaanSampah.count({
-        where: { isActive: true }
+        where,
       })
     ]);
 

src/app/api/[[...slugs]]/_lib/lingkungan/program-penghijauan/findMany.ts

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 import prisma from "@/lib/prisma";
 import { Context } from "elysia";
 
@@ -6,17 +7,26 @@ export default async function programPenghijauanFindMany(context: Context) {
   const page = Number(context.query.page) || 1;
   const limit = Number(context.query.limit) || 10;
   const skip = (page - 1) * limit;
+  const search = (context.query.search as string) || '';
 
+  const where: any = { isActive: true };
+
+  if (search) {
+    where.OR = [
+      { name: { contains: search, mode: 'insensitive' } },
+      { judul: { contains: search, mode: 'insensitive' } },
+    ];
+  }
   try {
     const [data, total] = await Promise.all([
       prisma.programPenghijauan.findMany({
-        where: { isActive: true },
+        where,
         skip,
         take: limit,
         orderBy: { createdAt: 'desc' },
       }),
       prisma.programPenghijauan.count({
-        where: { isActive: true }
+        where,
       })
     ]);
 

src/app/api/[[...slugs]]/_lib/pendidikan/info-sekolah-paud/jenjang-pendidikan/findMany.ts

@@ -1,15 +1,56 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import prisma from "@/lib/prisma";
+import { Context } from "elysia";
 
-export default async function jenjangPendidikanFindMany() {
-    const data = await prisma.jenjangPendidikan.findMany();
-    return { 
-        success: true,
-        data: data.map((item: any) => {
-            return {
-                id: item.id,
-                nama: item.nama,
-            }
-        }),
+export default async function jenjangPendidikanFindMany(context: Context) {
+  const page = Number(context.query.page) || 1;
+  const limit = Number(context.query.limit) || 10;
+  const search = (context.query.search as string) || "";
+  const skip = (page - 1) * limit;
+
+  // Buat where clause
+  const where: any = { isActive: true };
+
+  // Tambahkan pencarian (jika ada)
+  if (search) {
+    where.OR = [
+      { nama: { contains: search, mode: "insensitive" } },
+      { lembagas: { contains: search, mode: "insensitive" } },
+    ];
+  }
+
+  try {
+    // Ambil data dan total count secara paralel
+    const [data, total] = await Promise.all([
+      prisma.jenjangPendidikan.findMany({
+        where,
+        skip,
+        take: limit,
+        orderBy: { createdAt: "desc" },
+      }),
+      prisma.jenjangPendidikan.count({ where }),
+    ]);
+
+    return {
+      success: true,
+      message: "Berhasil ambil jenjang pendidikan dengan pagination",
+      data: data.map((item: any) => {
+        return {
+          id: item.id,
+          nama: item.nama,
+          lembagas: item.lembagas,
+        };
+      }),
+      page,
+      limit,
+      total,
+      totalPages: Math.ceil(total / limit),
     };
-}
+  } catch (e) {
+    console.error("Error di findMany paginated:", e);
+    return {
+      success: false,
+      message: "Gagal mengambil data jenjang pendidikan",
+    };
+  }
+}

src/app/api/[[...slugs]]/_lib/pendidikan/info-sekolah-paud/lembaga/findMany.ts

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 // /api/berita/findManyPaginated.ts
 import prisma from "@/lib/prisma";
 import { Context } from "elysia";
@@ -5,12 +6,26 @@ import { Context } from "elysia";
 async function lembagaPendidikanFindMany(context: Context) {
   const page = Number(context.query.page) || 1;
   const limit = Number(context.query.limit) || 10;
+  const search = (context.query.search as string) || "";
   const skip = (page - 1) * limit;
 
+  // Buat where clause
+  const where: any = { isActive: true };
+
+  // Tambahkan pencarian (jika ada)
+  if (search) {
+    where.OR = [
+      { nama: { contains: search, mode: "insensitive" } },
+      { siswa: { contains: search, mode: "insensitive" } },
+      { pengajar: { contains: search, mode: "insensitive" } },
+      { jenjangPendidikan: { contains: search, mode: "insensitive" } },
+    ];
+  }
+
   try {
     const [data, total] = await Promise.all([
       prisma.lembaga.findMany({
-        where: { isActive: true },
+        where,
         include: {
           jenjangPendidikan: true,
           siswa: true,
@@ -20,8 +35,8 @@ async function lembagaPendidikanFindMany(context: Context) {
         take: limit,
         orderBy: { createdAt: 'desc' }, // opsional, kalau mau urut berdasarkan waktu
       }),
-      prisma.kegiatanDesa.count({
-        where: { isActive: true }
+      prisma.lembaga.count({
+        where,
       })
     ]);
 
@@ -30,6 +45,7 @@ async function lembagaPendidikanFindMany(context: Context) {
       message: "Success fetch lembaga pendidikan with pagination",
       data,
       page,
+      limit,
       totalPages: Math.ceil(total / limit),
       total,
     };

src/app/api/[[...slugs]]/_lib/pendidikan/info-sekolah-paud/pengajar/findMany.ts

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 // /api/berita/findManyPaginated.ts
 import prisma from "@/lib/prisma";
 import { Context } from "elysia";
@@ -6,11 +7,23 @@ async function pengajarFindMany(context: Context) {
   const page = Number(context.query.page) || 1;
   const limit = Number(context.query.limit) || 10;
   const skip = (page - 1) * limit;
+  const search = (context.query.search as string) || "";
+
+  // Buat where clause
+  const where: any = { isActive: true };
+
+  // Tambahkan pencarian (jika ada)
+  if (search) {
+    where.OR = [
+      { nama: { contains: search, mode: "insensitive" } },
+      { lembaga: { contains: search, mode: "insensitive" } },
+    ];
+  }
 
   try {
     const [data, total] = await Promise.all([
       prisma.pengajar.findMany({
-        where: { isActive: true },
+        where,
         include: {
           lembaga: true,
         },
@@ -19,7 +32,7 @@ async function pengajarFindMany(context: Context) {
         orderBy: { createdAt: 'desc' }, // opsional, kalau mau urut berdasarkan waktu
       }),
       prisma.pengajar.count({
-        where: { isActive: true }
+        where,
       })
     ]);
 
@@ -28,6 +41,7 @@ async function pengajarFindMany(context: Context) {
       message: "Success fetch pengajar with pagination",
       data,
       page,
+      limit,
       totalPages: Math.ceil(total / limit),
       total,
     };

src/app/api/[[...slugs]]/_lib/pendidikan/info-sekolah-paud/siswa/findMany.ts

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 // /api/berita/findManyPaginated.ts
 import prisma from "@/lib/prisma";
 import { Context } from "elysia";
@@ -6,11 +7,23 @@ async function siswaFindMany(context: Context) {
   const page = Number(context.query.page) || 1;
   const limit = Number(context.query.limit) || 10;
   const skip = (page - 1) * limit;
+  const search = (context.query.search as string) || "";
+
+  // Buat where clause
+  const where: any = { isActive: true };
+
+  // Tambahkan pencarian (jika ada)
+  if (search) {
+    where.OR = [
+      { nama: { contains: search, mode: "insensitive" } },
+      { lembaga: { contains: search, mode: "insensitive" } },
+    ];
+  }
 
   try {
     const [data, total] = await Promise.all([
       prisma.siswa.findMany({
-        where: { isActive: true },
+        where,
         include: {
           lembaga: true,
         },
@@ -19,7 +32,7 @@ async function siswaFindMany(context: Context) {
         orderBy: { createdAt: 'desc' }, // opsional, kalau mau urut berdasarkan waktu
       }),
       prisma.siswa.count({
-        where: { isActive: true }
+        where,
       })
     ]);
 
@@ -28,6 +41,7 @@ async function siswaFindMany(context: Context) {
       message: "Success fetch siswa with pagination",
       data,
       page,
+      limit,
       totalPages: Math.ceil(total / limit),
       total,
     };

src/app/darmasaba/(pages)/desa/layanan/[id]/page.tsx

@@ -1,9 +1,9 @@
 /* eslint-disable react-hooks/exhaustive-deps */
 'use client'
-import { useParams } from 'next/navigation';
 import stateLayananDesa from '@/app/admin/(dashboard)/_state/desa/layananDesa';
 import colors from '@/con/colors';
 import { Box, Button, Center, Container, Group, Image, Skeleton, Stack, Text } from '@mantine/core';
+import { useParams } from 'next/navigation';
 import { useEffect, useState } from 'react';
 import { useProxy } from 'valtio/utils';
 import BackButton from '../_com/BackButto';
@@ -34,46 +34,44 @@ function Page() {
   useEffect(() => {
     const loadData = async () => {
       if (!id) return;
-
       try {
         setLoading(true);
         await state.suratKeterangan.findUnique.load(id);
         const result = state.suratKeterangan.findUnique.data as unknown as LayananData;
         setData(result);
       } catch (error) {
-        console.error('Error loading data:', error);
+        console.error('Terjadi kesalahan saat memuat data:', error);
       } finally {
         setLoading(false);
       }
     };
-
     loadData();
   }, [id]);
 
   if (loading) {
     return (
-      <Center>
-        <Skeleton height={500} />
+      <Center h="100vh" bg={colors.Bg}>
+        <Skeleton height={500} radius="md" animate />
       </Center>
     );
   }
 
   if (!data) {
     return (
-      <Center>
-        <Text>Data tidak ditemukan</Text>
+      <Center h="100vh" bg={colors.Bg}>
+        <Text fz="xl" c="dimmed">Maaf, data layanan tidak ditemukan</Text>
       </Center>
     );
   }
 
   return (
-    <Stack pos="relative" bg={colors.Bg} py="xl" gap="22">
+    <Stack pos="relative" bg={colors.Bg} py="xl" gap="xl">
       <Box px={{ base: "md", md: 100 }}>
         <BackButton />
       </Box>
-      <Container w={{ base: "100%", md: "50%" }}>
+      <Container w={{ base: "100%", md: "60%" }}>
         <Text
-          fz={{ base: "2rem", md: "2.5rem", lg: "3rem", xl: "3.4rem" }}
+          fz={{ base: "2rem", md: "2.5rem", lg: "3rem" }}
           ta="center"
           fw="bold"
         >
@@ -81,19 +79,32 @@ function Page() {
         </Text>
       </Container>
       <Box px={{ base: "md", md: 100 }}>
-        <Stack gap={0}>
+        <Stack gap="md">
           <Text
             dangerouslySetInnerHTML={{ __html: data.deskripsi }}
-            fz={{ base: "h4", md: "h2" }}
-            pb={20}
+            fz={{ base: "md", md: "lg" }}
+            c="dark.7"
+            ta="justify"
           />
           {data.image2?.link && (
             <Center>
-              <Image src={data.image2.link} alt={data.name} />
+              <Image
+                src={data.image2.link}
+                alt={data.name}
+                radius="md"
+                maw={500}
+                mx="auto"
+                style={{ boxShadow: '0 0 20px rgba(28,110,164,0.2)' }}
+              />
             </Center>
           )}
-          <Group justify='center' mt="md">
-            <Button radius="lg" fz="h4" bg={colors['blue-button']}>
+          <Group justify="center" mt="md">
+            <Button
+              radius="xl"
+              size="lg"
+              variant="gradient"
+              gradient={{ from: '#1C6EA4', to: '#63B3ED' }}
+            >
               Ajukan Permohonan
             </Button>
           </Group>

src/app/darmasaba/(pages)/desa/layanan/_com/pelayananPendudukNonPermanent.tsx

@@ -1,62 +1,95 @@
 /* eslint-disable react-hooks/exhaustive-deps */
+"use client";
+
 import stateLayananDesa from '@/app/admin/(dashboard)/_state/desa/layananDesa';
 import colors from '@/con/colors';
-import { ActionIcon, Box, Divider, Flex, Skeleton, Text } from '@mantine/core';
+import { ActionIcon, Box, Divider, Flex, Group, Skeleton, Stack, Text, Tooltip } from '@mantine/core';
 import { IconBrandFacebook, IconBrandInstagram, IconBrandTwitter, IconBrandWhatsapp } from '@tabler/icons-react';
-import React, { useEffect, useState } from 'react';
+import { useEffect, useState } from 'react';
 import { useProxy } from 'valtio/utils';
 
 function PelayananPendudukNonPermanent() {
-  const state = useProxy(stateLayananDesa)
-  const [loading, setLoading] = useState(false)
+  const state = useProxy(stateLayananDesa);
+  const [loading, setLoading] = useState(false);
 
   useEffect(() => {
     const loadData = async () => {
       try {
-        setLoading(true)
-        await state.pelayananPendudukNonPermanen.findById.load('1')
+        setLoading(true);
+        await state.pelayananPendudukNonPermanen.findById.load('1');
       } catch (error) {
-        console.error('Error loading data:', error);
+        console.error('Gagal memuat data:', error);
       } finally {
-        setLoading(false)
+        setLoading(false);
       }
-    }
-    loadData()
-  }, [])
+    };
+    loadData();
+  }, []);
+
+  const data = state.pelayananPendudukNonPermanen.findById.data;
 
-  const data = state.pelayananPendudukNonPermanen.findById.data
   return (
-    <Box>
+    <Box py="lg">
       {loading ? (
-        <Skeleton h={500} />
+        <Stack gap="lg">
+          <Skeleton height={40} radius="md" />
+          <Skeleton height={200} radius="md" />
+          <Skeleton height={30} radius="md" />
+        </Stack>
       ) : (
-        <Box>
-          <Box py={15}>
-            <Text fz={{ base: "h4", md: "h3" }} fw={"bold"}>{data?.name}</Text>
+        <Stack gap="xl">
+          <Box>
+            <Text fz={{ base: "xl", md: "2xl" }} fw={700} lh={1.3} c="dark">
+              {data?.name || "Judul belum tersedia"}
+            </Text>
           </Box>
-          <Text pb={20} fz={{ base: "sm", md: 'h3' }} ta={"justify"} dangerouslySetInnerHTML={{__html: data?.deskripsi || ''}} />
-          <Divider color={colors["blue-button"]} />
-          <Flex justify={"space-between"} py={20}>
-            <Text fz={{ base: "sm", md: 'h3' }}>25 May 2021 . Darmasaba</Text>
-            <Box>
-              <Flex gap={"lg"}>
-                <ActionIcon variant='transparent'>
-                  <IconBrandFacebook color={colors["blue-button"]} size={"30"} />
+
+          <Box>
+            {data?.deskripsi ? (
+              <Text
+                fz={{ base: "sm", md: "md" }}
+                lh={1.7}
+                ta="justify"
+                c="dimmed"
+                dangerouslySetInnerHTML={{ __html: data?.deskripsi }}
+              />
+            ) : (
+              <Text fz="sm" c="gray">Deskripsi belum tersedia.</Text>
+            )}
+          </Box>
+
+          <Divider color={colors["blue-button"]} size="sm" />
+
+          <Flex justify="space-between" align="center" wrap="wrap" gap="md">
+            <Text fz={{ base: "xs", md: "sm" }} c="dimmed">
+              25 Mei 2021 • Darmasaba
+            </Text>
+            <Group gap="md">
+              <Tooltip label="Bagikan ke Facebook" withArrow>
+                <ActionIcon size="lg" radius="xl" variant="subtle" color="blue">
+                  <IconBrandFacebook size={24} />
                 </ActionIcon>
-                <ActionIcon variant='transparent'>
-                  <IconBrandInstagram color={colors["blue-button"]} size={"30"} />
+              </Tooltip>
+              <Tooltip label="Bagikan ke Instagram" withArrow>
+                <ActionIcon size="lg" radius="xl" variant="subtle" color="pink">
+                  <IconBrandInstagram size={24} />
                 </ActionIcon>
-                <ActionIcon variant='transparent'>
-                  <IconBrandTwitter color={colors["blue-button"]} size={"30"} />
+              </Tooltip>
+              <Tooltip label="Bagikan ke Twitter" withArrow>
+                <ActionIcon size="lg" radius="xl" variant="subtle" color="blue">
+                  <IconBrandTwitter size={24} />
                 </ActionIcon>
-                <ActionIcon variant='transparent'>
-                  <IconBrandWhatsapp color={colors["blue-button"]} size={"30"} />
+              </Tooltip>
+              <Tooltip label="Bagikan ke WhatsApp" withArrow>
+                <ActionIcon size="lg" radius="xl" variant="subtle" color="green">
+                  <IconBrandWhatsapp size={24} />
                 </ActionIcon>
-              </Flex>
-            </Box>
+              </Tooltip>
+            </Group>
           </Flex>
-          <Divider color={colors["blue-button"]} pb={50} />
-        </Box>
+
+          <Divider color={colors["blue-button"]} size="sm" />
+        </Stack>
       )}
     </Box>
   );

src/app/darmasaba/(pages)/desa/layanan/_com/pelayananPerizinanBerusaha.tsx

@@ -1,7 +1,8 @@
 /* eslint-disable react-hooks/exhaustive-deps */
 'use client'
 import stateLayananDesa from '@/app/admin/(dashboard)/_state/desa/layananDesa';
-import { Box, Button, Center, Group, Skeleton, Stepper, StepperCompleted, StepperStep, Text } from '@mantine/core';
+import { Box, Button, Center, Group, Loader, Stack, Stepper, StepperCompleted, StepperStep, Text, Title } from '@mantine/core';
+import { IconArrowLeft, IconArrowRight, IconCheck } from '@tabler/icons-react';
 import { useEffect, useState } from 'react';
 import { useProxy } from 'valtio/utils';
 
@@ -18,7 +19,7 @@ function PelayananPerizinanBerusaha() {
         setLoading(true);
         await state.pelayananPerizinanBerusaha.findById.load('1')
       } catch (error) {
-        console.error('Error loading data:', error);
+        console.error('Gagal memuat data:', error);
       } finally {
         setLoading(false);
       }
@@ -28,76 +29,87 @@ function PelayananPerizinanBerusaha() {
 
   const data = state.pelayananPerizinanBerusaha.findById.data;
   
-  if (!data) {
+  if (!data && !loading) {
     return (
-      <Center>
-        <Text>Data tidak tersedia</Text>
+      <Center mih={300}>
+        <Stack align="center" gap="sm">
+          <Text fz="lg" fw={500} c="dimmed">Belum ada informasi layanan yang tersedia</Text>
+          <Button component="a" href="https://oss.go.id" target="_blank" radius="xl">Kunjungi OSS</Button>
+        </Stack>
       </Center>
     );
   }
 
   return (
-    <Box>
+    <Box px={{ base: 'md', md: 'xl' }} py="lg">
       {loading ? (
-        <Center>
-          <Skeleton h={250} />
+        <Center mih={300}>
+          <Loader size="lg" color="blue" />
         </Center>
       ) : (
-        <Box>
-          <Box py={15}>
-            <Text fz={{ base: "h4", md: 'h2' }} fw={"bold"}>Pelayanan Perizinan Berusaha Berbasis Risiko Melalui Sistem ONLINE SINGLE SUBMISSION (OSS)</Text>
-          </Box>
-          <Text 
-            py={10} 
-            ta={"justify"} 
-            fz={{ base: "sm", md: 'h3' }} 
-            dangerouslySetInnerHTML={{ __html: data.deskripsi || '' }} 
-          />
-          <Text py={10} fz={{ base: "sm", md: 'h3' }}>Proses pendaftaran NIB melalui OSS mencakup beberapa langkah umum, seperti:</Text>
-          <Box p={"xl"} w={{ base: "100%", md: "100%" }}>
-            <Stepper active={active} onStepClick={setActive} orientation="vertical"
-              styles={{
-                separator: {
-                  marginLeft: 25
-                },
-                step: {
-                  padding: '12px 0'
-                }
-              }}>
-              <StepperStep label="Langkah Pertama" description="Pendaftaran Akun">
-                Pendaftaran akun pada portal OSS
-              </StepperStep>
-              <StepperStep label="Langkah Kedua" description="Pengisian Data Perusahaan">
-                Mengisi informasi perusahaan, termasuk data pemegang saham, alamat perusahaan, dan lainnya
-              </StepperStep>
-              <StepperStep label="Langkah Ketiga" description="Pemilihan KBLI">
-                Memilih KBLI dengan jenis usaha yang akan didaftarkan
-              </StepperStep>
-              <StepperStep label="Langkah Keempat" description="Pengunggahan Dokumen">
-                Mengunggah dokumen-dokumen yang diperlukan, seperti akta pendirian perusahaan, surat izin usaha, dan dokumen lainnya sesuai dengan ketentuan yang berlaku
-              </StepperStep>
-              <StepperStep label="Langkah Kelima" description="Verifikasi dan Persetujuan">
-                Proses verifikasi dan persetujuan oleh instansi terkait
-              </StepperStep>
-              <StepperStep label="Langkah Keenam" description="Penerimaan NIB">
-                Jika proses sebelumnya berhasil, perusahaan akan menerima NIB sebagai identitas resmi usaha anda
-              </StepperStep>
-              <StepperCompleted>
-                Selesai, anda telah mengikuti proses pendaftaran NIB melalui OSS
-              </StepperCompleted>
-            </Stepper>
+          <Stack gap="lg">
+            <Box>
+              <Title order={2} fw={700} fz={{ base: 22, md: 32 }} mb="sm">
+                Perizinan Berusaha Berbasis Risiko melalui OSS
+              </Title>
+              <Text fz={{ base: 'sm', md: 'md' }} c="dimmed">
+                Sistem Online Single Submission (OSS) untuk pendaftaran NIB
+              </Text>
+            </Box>
 
-            <Group justify="center" mt="xl">
-              <Button variant="default" onClick={prevStep}>Back</Button>
-              <Button onClick={nextStep}>Next step</Button>
-            </Group>
-            <Text py={35} ta={"justify"} fz={{ base: "sm", md: 'h3' }}>
-              Penting untuk diingat bahwa prosedur dan persyaratan dapat berubah
-              seiring waktu. Untuk informasi yang lebih akurat dan terkini, saya sarankan untuk mengunjungi situs
-              resmi OSS <a href="https://oss.go.id/" target="_blank" rel="noopener noreferrer">(https://oss.go.id/)</a> atau menghubungi instansi terkait di pemerintah Indonesia yang bertanggung jawab atas urusan perizinan usaha.
+            <Text fz={{ base: 'sm', md: 'md' }} ta="justify" dangerouslySetInnerHTML={{ __html: data?.deskripsi || '' }} />
+
+            <Box>
+              <Text fw={600} mb="sm" fz={{ base: 'sm', md: 'lg' }}>Alur pendaftaran NIB:</Text>
+              <Stepper active={active} onStepClick={setActive} orientation="vertical" color="blue" radius="md"
+                styles={{
+                  step: { padding: '14px 0' },
+                  stepBody: { marginLeft: 8 }
+                }}
+              >
+                <StepperStep label="Langkah 1" description="Daftar Akun">
+                  <Text fz="sm">Membuat akun di portal OSS</Text>
+                </StepperStep>
+                <StepperStep label="Langkah 2" description="Isi Data Perusahaan">
+                  <Text fz="sm">Lengkapi informasi perusahaan, data pemegang saham, dan alamat</Text>
+                </StepperStep>
+                <StepperStep label="Langkah 3" description="Pilih KBLI">
+                  <Text fz="sm">Menentukan kode KBLI sesuai jenis usaha</Text>
+                </StepperStep>
+                <StepperStep label="Langkah 4" description="Unggah Dokumen">
+                  <Text fz="sm">Unggah akta pendirian, surat izin, dan dokumen wajib lainnya</Text>
+                </StepperStep>
+                <StepperStep label="Langkah 5" description="Verifikasi Instansi">
+                  <Text fz="sm">Menunggu verifikasi dan persetujuan dari pihak berwenang</Text>
+                </StepperStep>
+                <StepperStep label="Langkah 6" description="Terbit NIB">
+                  <Text fz="sm">Menerima NIB sebagai identitas resmi usaha</Text>
+                </StepperStep>
+                <StepperCompleted>
+                  <Center>
+                    <Stack align="center" gap="xs">
+                      <IconCheck size={40} color="green" />
+                      <Text fz="sm" fw={500}>Proses pendaftaran selesai</Text>
+                    </Stack>
+                  </Center>
+                </StepperCompleted>
+              </Stepper>
+
+              <Group justify="center" mt="lg">
+                <Button variant="light" leftSection={<IconArrowLeft size={18} />} onClick={prevStep} disabled={active === 0}>
+                  Kembali
+                </Button>
+                <Button rightSection={<IconArrowRight size={18} />} onClick={nextStep}>
+                  Lanjut
+                </Button>
+              </Group>
+            </Box>
+
+            <Text fz="sm" ta="justify" c="dimmed" mt="md">
+              Catatan: Persyaratan dan prosedur dapat berubah sewaktu-waktu. Untuk informasi resmi terbaru, silakan kunjungi situs{" "}
+              <a href="https://oss.go.id/" target="_blank" rel="noopener noreferrer">oss.go.id</a> atau hubungi instansi pemerintah terkait.
             </Text>
-          </Box>
-        </Box>
+          </Stack>
       )}
     </Box>
   );

src/app/darmasaba/(pages)/desa/layanan/_com/pelayananSuratKeterangan.tsx

@@ -1,96 +1,124 @@
 /* eslint-disable react-hooks/exhaustive-deps */
+"use client";
+
 import stateLayananDesa from '@/app/admin/(dashboard)/_state/desa/layananDesa';
 import colors from '@/con/colors';
-import { BackgroundImage, Box, Button, Center, Group, SimpleGrid, Skeleton, Stack, Text } from '@mantine/core';
+import { BackgroundImage, Box, Button, Center, Group, SimpleGrid, Skeleton, Stack, Text, Tooltip } from '@mantine/core';
+import { IconFileDescription, IconInfoCircle } from '@tabler/icons-react';
 import { useRouter } from 'next/navigation';
 import React, { useEffect, useMemo, useState } from 'react';
-
 import { useProxy } from 'valtio/utils';
 
 function PelayananSuratKeterangan({ search }: { search: string }) {
   const [loading, setLoading] = useState(false);
-  const router = useRouter()
-  const state = useProxy(stateLayananDesa)
+  const router = useRouter();
+  const state = useProxy(stateLayananDesa);
+
   const filteredData = useMemo(() => {
     if (!state.suratKeterangan.findMany.data) return [];
-    return state.suratKeterangan.findMany.data.filter(item => {
+    return state.suratKeterangan.findMany.data.filter((item) => {
       const keyword = search.toLowerCase();
-      return (
-        item.name?.toLowerCase().includes(keyword)
-      );
-    })
+      return item.name?.toLowerCase().includes(keyword);
+    });
   }, [state.suratKeterangan.findMany.data, search]);
 
   useEffect(() => {
     const loadData = async () => {
       try {
         setLoading(true);
-        await state.suratKeterangan.findMany.load()
+        await state.suratKeterangan.findMany.load();
       } catch (error) {
-        console.error('Error loading data:', error);
+        console.error('Gagal memuat data:', error);
       } finally {
         setLoading(false);
       }
-    }
-    loadData()
-  }, [])
+    };
+    loadData();
+  }, []);
+
   return (
-    <Box pb={10}>
-      <Text fz={{ base: "h4", md: 'h2' }} fw={"bold"}>Pelayanan Surat Keterangan</Text>
+    <Box pb="xl">
+      <Group justify="space-between" align="center" mb="md">
+        <Group gap="xs">
+          <IconFileDescription size={28} stroke={1.8} color={colors["blue-button"]} />
+          <Text fz={{ base: "h4", md: "h2" }} fw={700}>
+            Layanan Surat Keterangan
+          </Text>
+        </Group>
+        <Tooltip label="Pilih layanan surat keterangan sesuai kebutuhan Anda" withArrow>
+          <IconInfoCircle size={22} stroke={1.8} color={colors["blue-button"]} />
+        </Tooltip>
+      </Group>
+
       <SimpleGrid
-        py={20}
-        cols={{
-          base: 1,
-          sm: 3
-        }}
+        py="lg"
+        cols={{ base: 1, sm: 2, md: 3 }}
+        spacing="lg"
       >
         {loading ? (
-          <Center>
-            <Skeleton h={250} />
+          Array.from({ length: 3 }).map((_, i) => (
+            <Skeleton key={i} h={250} radius="lg" />
+          ))
+        ) : filteredData.length === 0 ? (
+          <Center py="xl">
+            <Stack align="center" gap="xs">
+              <IconFileDescription size={40} stroke={1.5} color={colors["blue-button"]} />
+              <Text c="dimmed" ta="center">
+                Tidak ada layanan surat keterangan yang ditemukan
+              </Text>
+            </Stack>
           </Center>
         ) : (
-          filteredData.map((v, k) => {
-            return (
-              <BackgroundImage
-                key={k}
-                src={v.image?.link || ''}
-                h={250}
-                radius={16}
-                pos={"relative"}
-              >
-                <Box
-                  style={{
-                    borderRadius: 16,
-                    zIndex: 0
-                  }}
-                  pos={"absolute"}
-                  w={"100%"}
-                  h={"100%"}
-                  bg={colors.trans.dark[2]}
-                />
-                <Stack justify='space-between' h={"100%"} gap={0} p={"lg"} pos={"relative"}>
-                  <Box p={"lg"}>
-                    <Text
-                      c={"white"}
-                      size={"1.5rem"}
-                      style={{
-                        textAlign: "center",
-                      }}>{v.name}</Text>
-                  </Box>
-                  <Group justify="center">
-                    <Button px={20} radius={"100"} size="md" bg={colors["blue-button"]}
-                      onClick={() => router.push(`/darmasaba/desa/layanan/${v.id}`)}>
-                      Detail
-                    </Button>
-                  </Group>
-                </Stack>
-              </BackgroundImage>
-            )
-          })
+          filteredData.map((v, k) => (
+            <BackgroundImage
+              key={k}
+              src={v.image?.link || ''}
+              h={250}
+              radius="lg"
+              pos="relative"
+              style={{
+                boxShadow: "0 4px 20px rgba(0,0,0,0.1)",
+                overflow: "hidden",
+              }}
+            >
+              <Box
+                pos="absolute"
+                w="100%"
+                h="100%"
+                bg="rgba(0,0,0,0.45)"
+                style={{ borderRadius: 16 }}
+              />
+              <Stack justify="space-between" h="100%" gap="md" p="lg" pos="relative">
+                <Text
+                  c="white"
+                  fw={600}
+                  fz="lg"
+                  ta="center"
+                  lineClamp={2}
+                >
+                  {v.name}
+                </Text>
+                <Group justify="center">
+                  <Button
+                    size="md"
+                    radius="xl"
+                    bg={colors["blue-button"]}
+                    px="lg"
+                    onClick={() => router.push(`/darmasaba/desa/layanan/${v.id}`)}
+                    style={{
+                      boxShadow: "0 0 12px rgba(59,130,246,0.6)",
+                      transition: "all 0.2s ease",
+                    }}
+                  >
+                    Lihat Detail
+                  </Button>
+                </Group>
+              </Stack>
+            </BackgroundImage>
+          ))
         )}
       </SimpleGrid>
     </Box>
-
   );
 }
 

src/app/darmasaba/(pages)/desa/layanan/_com/pelayananTelunjukSaktiDesa.tsx

@@ -1,6 +1,7 @@
 /* eslint-disable react-hooks/exhaustive-deps */
 import stateLayananDesa from '@/app/admin/(dashboard)/_state/desa/layananDesa';
-import { Box, Flex, Skeleton, Text, Title } from '@mantine/core';
+import { Box, Card, Flex, Grid, Skeleton, Stack, Text, Title } from '@mantine/core';
+import { IconExternalLink } from '@tabler/icons-react';
 import { useEffect, useState } from 'react';
 import { useProxy } from 'valtio/utils';
 
@@ -11,22 +12,22 @@ interface ServiceItem {
 }
 
 function PelayananTelunjukSaktiDesa() {
-  const state = useProxy(stateLayananDesa)
-  const [loading, setLoading] = useState(false)
+  const state = useProxy(stateLayananDesa);
+  const [loading, setLoading] = useState(false);
 
   useEffect(() => {
     const loadData = async () => {
       try {
-        setLoading(true)
-        await state.pelayananTelunjukSaktiDesa.findMany.load()
+        setLoading(true);
+        await state.pelayananTelunjukSaktiDesa.findMany.load();
       } catch (error) {
-        console.error('Error loading data:', error);
+        console.error('Gagal memuat data:', error);
       } finally {
-        setLoading(false)
+        setLoading(false);
       }
-    }
-    loadData()
-  }, [])
+    };
+    loadData();
+  }, []);
 
   const data = (state.pelayananTelunjukSaktiDesa.findMany.data || []) as Array<{
     name: string;
@@ -37,28 +38,63 @@ function PelayananTelunjukSaktiDesa() {
     createdAt: Date;
     updatedAt: Date;
     deletedAt: Date | null;
-  }>
+  }>;
+
   return (
     <Box>
-      <Title fz="h2" py={10} mb="md">Terwujudnya Layanan umum bertajuk Sistim administrasi Kependudukan Terintegrasi di Desa berbasi Elektronik, Smart dan Aman. Layanan Telunjuk Sakti Desa meliputi :</Title>
+      <Title order={2} mb="lg" fz={{ base: 22, md: 28 }} fw={700} style={{ lineHeight: 1.4 }}>
+        Layanan Telunjuk Sakti Desa <br /> 
+        <Text span c="dimmed" fz="lg" fw={400}>
+          Terwujudnya sistem administrasi kependudukan terintegrasi berbasis elektronik, cerdas, dan aman
+        </Text>
+      </Title>
+
       {loading ? (
-        <Skeleton h={500} />
+        <Skeleton h={400} radius="lg" />
+      ) : data.length === 0 ? (
+        <Card shadow="sm" radius="lg" withBorder>
+          <Text c="dimmed" ta="center" py="xl">
+            Belum ada layanan tersedia untuk saat ini
+          </Text>
+        </Card>
       ) : (
-        data.map((v, k) => {
-          return (
-            <Box key={k}>
-              <Box py={10}>
-                <Flex gap={"3"} align={"center"}>
-                  <Text fz={{ base: "h4", md: "h3" }} fw={"bold"}>{v.name}
+        <Grid gutter="lg">
+          {data.map((v, k) => (
+            <Grid.Col span={{ base: 12, sm: 6, lg: 4 }} key={k}>
+              <Card
+                shadow="md"
+                radius="xl"
+                withBorder
+                p="lg"
+                style={{
+                  transition: 'all 0.3s ease',
+                  background: 'linear-gradient(145deg, #ffffff, #f8f9fa)',
+                }}
+              >
+                <Stack gap="sm">
+                  <Text fw={700} fz="lg" lh={1.4}>
+                    {v.name}
                   </Text>
-                  <Text span fz={{ base: "h4", md: "h3" }}>
-                    <a href={v.link} target="_blank" rel="noopener noreferrer" style={{ color: '#228be6' }}>{v.deskripsi}</a>
-                  </Text>
-                </Flex>
-              </Box>
-            </Box>
-          )
-        })
+                  <Flex gap="xs" align="center">
+                    <IconExternalLink size={18} stroke={1.5} />
+                    <Text
+                      component="a"
+                      href={v.link}
+                      target="_blank"
+                      rel="noopener noreferrer"
+                      fz="sm"
+                      c="blue"
+                      td="underline"
+                      style={{ cursor: 'pointer' }}
+                    >
+                      {v.deskripsi}
+                    </Text>
+                  </Flex>
+                </Stack>
+              </Card>
+            </Grid.Col>
+          ))}
+        </Grid>
       )}
     </Box>
   );

src/app/darmasaba/(pages)/desa/layanan/page.tsx

@@ -12,7 +12,7 @@ import PelayananPendudukNonPermanent from "./_com/pelayananPendudukNonPermanent"
 
 export default function Page() {
     const [search, setSearch] = useState("")
-    
+
 
     return (
         <Stack pos={"relative"} bg={colors.Bg} py={"xl"} gap={"22"}>
@@ -40,14 +40,16 @@ export default function Page() {
                 </Stack>
             </Container>
             <Box px={{ base: "md", md: 100 }}>
-                {/* Bagian Pelayanan Surat Keterangan */}
-                <PelayananSuratKeterangan search={search} />
-                {/* Bagian Pelayanan Perizinan Berusaha */}
-                <PelayananPerizinanBerusaha/>
-                {/* Bagian Pelayanan Telunjuk Sakti Desa */}
-                <PelayananTelunjukSaktiDesa/>
-                 {/* Bagian Pelayanan Penduduk Non Permanent */}
-                 <PelayananPendudukNonPermanent/>
+                <Stack gap={"xl"}>
+                    {/* Bagian Pelayanan Surat Keterangan */}
+                    <PelayananSuratKeterangan search={search} />
+                    {/* Bagian Pelayanan Perizinan Berusaha */}
+                    <PelayananPerizinanBerusaha />
+                    {/* Bagian Pelayanan Telunjuk Sakti Desa */}
+                    <PelayananTelunjukSaktiDesa />
+                    {/* Bagian Pelayanan Penduduk Non Permanent */}
+                    <PelayananPendudukNonPermanent />
+                </Stack>
             </Box>
         </Stack>
     )

src/app/darmasaba/(pages)/desa/potensi/[id]/page.tsx

@@ -2,18 +2,18 @@
 'use client'
 import potensiDesaState from '@/app/admin/(dashboard)/_state/desa/potensi';
 import colors from '@/con/colors';
-import { Box, Center, Container, Image, Skeleton, Stack, Text } from '@mantine/core';
+import { Box, Center, Container, Image, Loader, Paper, Stack, Text, Title } from '@mantine/core';
+import { IconMoodSad } from '@tabler/icons-react';
 import { useParams } from 'next/navigation';
 import { useEffect, useState } from 'react';
 import { useProxy } from 'valtio/utils';
 import BackButton from '../../layanan/_com/BackButto';
 
-
 function Page() {
   const params = useParams<{ id: string }>();
   const id = Array.isArray(params.id) ? params.id[0] : params.id;
-  const state = useProxy(potensiDesaState.potensiDesa)
-  const [loading, setLoading] = useState(true)
+  const state = useProxy(potensiDesaState.potensiDesa);
+  const [loading, setLoading] = useState(true);
 
   useEffect(() => {
     const loadData = async () => {
@@ -22,54 +22,66 @@ function Page() {
         setLoading(true);
         await state.findUnique.load(id);
       } catch (error) {
-        console.error('Error loading data:', error);
+        console.error('Gagal memuat data:', error);
       } finally {
         setLoading(false);
       }
-    }
-    loadData()
-  }, [id])
+    };
+    loadData();
+  }, [id]);
 
   if (loading) {
     return (
-      <Center>
-        <Skeleton height={500} />
+      <Center h="80vh">
+        <Stack align="center" gap="md">
+          <Loader size="lg" color="blue" />
+          <Text c="dimmed" fz="sm">Sedang memuat informasi...</Text>
+        </Stack>
       </Center>
     );
   }
 
   if (!state.findUnique.data) {
     return (
-      <Center>
-        <Text>Data tidak ditemukan</Text>
+      <Center h="80vh">
+        <Stack align="center" gap="sm">
+          <IconMoodSad size={64} stroke={1.5} color="var(--mantine-color-blue-6)" />
+          <Title order={3}>Data Tidak Ditemukan</Title>
+          <Text c="dimmed" fz="sm">Mohon periksa kembali atau coba beberapa saat lagi</Text>
+        </Stack>
       </Center>
     );
   }
 
-
   return (
-    <Stack pos={"relative"} bg={colors.Bg} py={"xl"} gap={"22"} px={{ base: "md", md: 0 }}>
-      <Box px={{ base: "md", md: 100 }}><BackButton /></Box>
-      <Container w={{ base: "100%", md: "50%" }} >
-        <Box pb={20}>
-          <Text ta={"center"} fz={"3.4rem"} c={colors["blue-button"]} fw={"bold"}>
-            {state.findUnique.data?.name}
-          </Text>
-          <Text
-            ta={"center"}
-            fw={"bold"}
-            fz={"1.5rem"}
-          >
-            Informasi dan Pelayanan Administrasi Digital
-          </Text>
-        </Box>
-        <Image src={state.findUnique.data?.image?.link || ''} alt='' w={"100%"} />
-      </Container>
+    <Stack pos="relative" bg={colors.Bg} py="xl" gap="xl" px={{ base: "md", md: 0 }}>
       <Box px={{ base: "md", md: 100 }}>
-        <Text py={20} fz={{ base: "sm", md: "lg" }} ta={"justify"}>
-          {state.findUnique.data?.deskripsi || ''}
-        </Text>
+        <BackButton />
       </Box>
+      <Container w={{ base: "100%", md: "60%" }}>
+        <Paper radius="2xl" shadow="lg" p="xl" withBorder>
+          <Stack gap="lg" align="center">
+            <Title ta="center" fz={{ base: "2rem", md: "3rem" }} c={colors["blue-button"]} fw={800}>
+              {state.findUnique.data?.name}
+            </Title>
+            <Text ta="center" fw={600} fz={{ base: "md", md: "lg" }} c="dimmed">
+              Informasi & Pelayanan Potensi Desa Digital
+            </Text>
+            <Image
+              src={state.findUnique.data?.image?.link || ''}
+              alt={state.findUnique.data?.name || 'Potensi Desa'}
+              radius="lg"
+              fit="cover"
+              w="100%"
+              h={{ base: 220, md: 400 }}
+              fallbackSrc="https://placehold.co/800x400?text=Gambar+tidak+tersedia"
+            />
+            <Text py="md" fz={{ base: "sm", md: "md" }} ta="justify" lh={1.8}>
+              {state.findUnique.data?.deskripsi || 'Belum ada deskripsi untuk potensi desa ini.'}
+            </Text>
+          </Stack>
+        </Paper>
+      </Container>
     </Stack>
   );
 }

src/app/darmasaba/(pages)/desa/potensi/page.tsx

@@ -1,27 +1,27 @@
 /* eslint-disable react-hooks/exhaustive-deps */
 'use client'
+import potensiDesaState from '@/app/admin/(dashboard)/_state/desa/potensi';
 import colors from '@/con/colors';
-import { BackgroundImage, Box, Button, Center, Flex, Group, Paper, SimpleGrid, Skeleton, Stack, Text } from '@mantine/core';
+import { BackgroundImage, Box, Button, Center, Flex, Group, Paper, SimpleGrid, Skeleton, Stack, Text, Tooltip } from '@mantine/core';
+import { IconEye } from '@tabler/icons-react';
 import { useTransitionRouter } from 'next-view-transitions';
-import BackButton from '../layanan/_com/BackButto';
 import { useEffect, useState } from 'react';
 import { useProxy } from 'valtio/utils';
-import potensiDesaState from '@/app/admin/(dashboard)/_state/desa/potensi';
-
+import BackButton from '../layanan/_com/BackButto';
 
 function Page() {
   const router = useTransitionRouter()
   const [loading, setLoading] = useState(false)
   const state = useProxy(potensiDesaState)
 
-  useEffect(()=> {
+  useEffect(() => {
     state.kategoriPotensi.findMany.load()
     const loadData = async () => {
       try {
         setLoading(true)
         await state.potensiDesa.findMany.load()
       } catch (error) {
-        console.error('Error loading data:', error);
+        console.error('Gagal memuat data:', error);
       } finally {
         setLoading(false)
       }
@@ -30,104 +30,121 @@ function Page() {
   }, [])
 
   const data = state.potensiDesa.findMany.data
-  // const kategoriData = state.kategoriPotensi.findMany.data
+
   return (
-    <Stack pos={"relative"} bg={colors.Bg} py={"xl"} gap={"22"} >
+    <Stack pos="relative" bg={colors.Bg} py="xl" gap={48}>
       <Box px={{ base: "md", md: 100 }}>
         <BackButton />
       </Box>
+
       <Box px={{ base: "md", md: 100 }}>
-        <Box>
-          <Stack gap={0}>
-            <Flex justify={"space-between"} align={"center"} >
+        <Flex justify="space-between" align="center" direction={{ base: "column", md: "row" }} gap="lg">
+          <Stack gap="sm" maw={600}>
+            <Text fz={{ base: "2rem", md: "3rem" }} fw={900} c={colors["blue-button"]} lh={1.2}>
+              Potensi Desa Darmasaba
+            </Text>
+            <Text fz="lg" c="dimmed" ta="justify">
+              Temukan berbagai potensi unggulan, peluang, dan daya tarik yang menjadikan Desa Darmasaba istimewa.
+            </Text>
+          </Stack>
+          <Paper
+            radius="2xl"
+            px="xl"
+            py="md"
+            bg={colors["blue-button"]}
+            shadow="xl"
+            withBorder
+          >
+            <Flex justify="center" align="center" gap="xl">
               <Box>
-                <Text fz={"3.4rem"} c={colors["blue-button"]} fw={"bold"}>
-                  Potensi Desa
+                <Text ta="center" fz="2rem" fw={800} c="white">
+                  {data?.filter(item => item.kategori?.nama.toLowerCase() !== 'wisata').length || 0}
                 </Text>
-                <Text ta={"justify"} >
-                  Temukan berbagai potensi dan keunggulan yang dimiliki Desa Darmasaba.
+                <Text ta="center" fz="sm" c="white" fw={500}>
+                  Potensi
+                </Text>
+              </Box>
+              <Box>
+                <Text ta="center" fz="2rem" fw={800} c="white">
+                  {data?.filter(item => item.kategori?.nama.toLowerCase() === 'wisata').length || 0}
+                </Text>
+                <Text ta="center" fz="sm" c="white" fw={500}>
+                  Wisata
                 </Text>
               </Box>
-              <Paper radius={"md"} px={"xl"} py={5} bg={colors["blue-button"]} >
-                <Flex justify={"space-between"} align={"center"} gap={"xl"}>
-                  <Box>
-                    <Text ta={"center"} fz={"h2"} fw={"bold"} c={"white"}>
-                      {data?.filter(item => item.kategori?.nama.toLowerCase() !== 'wisata' ).length || 0}
-                    </Text>
-                    <Text ta={"center"} fz={"sm"} c={"white"}>Potensi</Text>
-                  </Box>
-                  <Box>
-                    <Text ta={"center"} fz={"h2"} fw={"bold"} c={"white"}>
-                      {data?.filter(item => item.kategori?.nama.toLowerCase() === 'wisata' ).length || 0}
-                    </Text>
-                    <Text ta={"center"} fz={"sm"} c={"white"}>Wisata</Text>
-                  </Box>
-                </Flex>
-              </Paper>
             </Flex>
-          </Stack>
-        </Box>
+          </Paper>
+        </Flex>
 
-        <SimpleGrid
-          py={20}
-          cols={{
-            base: 1,
-            sm: 3
-          }}
-        >
+        <SimpleGrid py={48} cols={{ base: 1, sm: 2, lg: 3 }} spacing="2xl">
           {loading ? (
-            <Center>
-              <Skeleton h={250} />
-            </Center>
-          ) : (
-            data?.map((v, k) => {
-            return (
+            Array.from({ length: 6 }).map((_, i) => (
+              <Skeleton key={i} h={360} radius="xl" />
+            ))
+          ) : data && data.length > 0 ? (
+            data.map((v, k) => (
               <BackgroundImage
                 key={k}
                 src={v.image?.link || ''}
-                h={350}
-                radius={16}
-                pos={"relative"}
+                h={360}
+                radius="xl"
+                style={{ overflow: 'hidden', position: 'relative' }}
               >
                 <Box
-                  style={{
-                    borderRadius: 16,
-                    zIndex: 0
-                  }}
-                  pos={"absolute"}
-                  w={"100%"}
-                  h={"100%"}
-                  bg={colors.trans.dark[2]}
+                  pos="absolute"
+                  inset={0}
+                  bg="linear-gradient(180deg, rgba(0,0,0,0.25) 0%, rgba(0,0,0,0.7) 100%)"
                 />
-                <Stack justify='space-between' h={"100%"} gap={0} p={"lg"} pos={"relative"}>
+                <Stack justify="space-between" h="100%" gap="md" p="lg" pos="relative">
                   <Group>
-                    <Paper radius={"lg"} py={7} px={10}>
-                      <Text>{v.kategori?.nama}</Text>
+                    <Paper radius="lg" py={6} px={12} shadow="md" withBorder bg="rgba(255,255,255,0.85)">
+                      <Text fz="sm" fw={600}>{v.kategori?.nama}</Text>
                     </Paper>
                   </Group>
-                  <Box p={"lg"}>
+                  <Box>
                     <Text
-                      fw={"bold"}
-                      c={"white"}
-                      size={"1.8rem"}
-                      style={{
-                        textAlign: "center",
-                      }}>{v.name}</Text>
+                      fw={800}
+                      c="white"
+                      fz="xl"
+                      ta="center"
+                      lineClamp={2}
+                      lh={1.3}
+                    >
+                      {v.name}
+                    </Text>
                   </Box>
                   <Group justify="center">
-                    <Button px={20} radius={"100"} size="md" bg={colors["blue-button"]}
-                      onClick={() => router.push(`/darmasaba/desa/potensi/${v.id}`)}>
-                      Detail
-                    </Button>
+                    <Tooltip label="Lihat detail potensi" withArrow>
+                      <Button
+                        radius="xl"
+                        size="md"
+                        leftSection={<IconEye size={18} />}
+                        bg={colors["blue-button"]}
+                        variant="gradient"
+                        gradient={{ from: colors["blue-button"], to: "#4dabf7", deg: 45 }}
+                        onClick={() => router.push(`/darmasaba/desa/potensi/${v.id}`)}
+                      >
+                        Lihat Detail
+                      </Button>
+                    </Tooltip>
                   </Group>
                 </Stack>
               </BackgroundImage>
-            )
-          })
-        )}
+            ))
+          ) : (
+            <Center h={240}>
+              <Stack align="center" gap="xs">
+                <Text fz="lg" fw={600} c="dimmed">
+                  Belum ada potensi desa
+                </Text>
+                <Text fz="sm" c="dimmed">
+                  Data potensi akan tampil di sini setelah tersedia.
+                </Text>
+              </Stack>
+            </Center>
+          )}
         </SimpleGrid>
       </Box>
-
     </Stack>
   );
 }

src/app/darmasaba/(pages)/desa/profile/ui/lambangDesa.tsx

@@ -1,10 +1,10 @@
 /* eslint-disable react-hooks/exhaustive-deps */
 'use client'
-import colors from '@/con/colors';
-import { Box, Stack, Paper, Image, Text, Center, Skeleton } from '@mantine/core';
-import React, { useEffect } from 'react';
-import { useProxy } from 'valtio/utils';
-import stateProfileDesa from '@/app/admin/(dashboard)/_state/desa/profile';
+import stateProfileDesa from '@/app/admin/(dashboard)/_state/desa/profile'
+import colors from '@/con/colors'
+import { Box, Center, Image, Paper, Skeleton, Stack, Text, Tooltip } from '@mantine/core'
+import { useEffect } from 'react'
+import { useProxy } from 'valtio/utils'
 
 function LambangDesa() {
   const state = useProxy(stateProfileDesa.lambangDesa)
@@ -17,26 +17,60 @@ function LambangDesa() {
 
   if (loading || !data) {
     return (
-      <Box py={10}>
-        <Skeleton h={500} />
+      <Box py="lg">
+        <Skeleton h={420} radius="xl" />
       </Box>
     )
   }
+
   return (
-    <Box pb={70}>
-      <Stack align='center' gap={0}>
-        <Box pb={30}>
+    <Box pb={90}>
+      <Stack align="center" gap="lg">
+        <Box pb="lg">
           <Center>
-          <Image src={"/darmasaba-icon.png"} alt="" w={{ base: 200, md: 300 }} />
+            <Image
+              src={"/darmasaba-icon.png"}
+              alt="Lambang resmi desa"
+              w={{ base: 180, md: 280 }}
+              radius="md"
+            />
           </Center>
-          <Text c={colors['blue-button']} ta={"center"} fw={"bold"} fz={"2.5rem"}>Lambang Desa</Text>
+          <Text
+            c={colors['blue-button']}
+            ta="center"
+            fw={800}
+            fz={{ base: 28, md: 40 }}
+            mt="sm"
+            style={{ letterSpacing: '-0.5px' }}
+          >
+            Lambang Desa
+          </Text>
         </Box>
-        <Paper p={"xl"} bg={colors['white-trans-1']} w={{ base: "100%", md: "100%" }}>
-          <Text fz={{ base: "md", md: "h3"}} ta={"justify"} dangerouslySetInnerHTML={{__html: data.deskripsi}} />
+        <Paper
+          p="xl"
+          radius="xl"
+          withBorder
+          shadow="sm"
+          w="100%"
+          style={{
+            background: 'linear-gradient(135deg, #ffffff 0%, #f3f7ff 100%)',
+            borderColor: '#e0e9ff',
+          }}
+        >
+          <Tooltip label="Deskripsi lambang desa" position="top-start" withArrow>
+            <Text
+              fz={{ base: 'md', md: 'lg' }}
+              lh={1.8}
+              c="dark"
+              ta="justify"
+              style={{ fontWeight: 400 }}
+              dangerouslySetInnerHTML={{ __html: data.deskripsi }}
+            />
+          </Tooltip>
         </Paper>
       </Stack>
-    </Box >
-  );
+    </Box>
+  )
 }
 
-export default LambangDesa;
+export default LambangDesa

src/app/darmasaba/(pages)/desa/profile/ui/maskotDesa.tsx

@@ -1,59 +1,95 @@
 /* eslint-disable react-hooks/exhaustive-deps */
 'use client'
 import stateProfileDesa from '@/app/admin/(dashboard)/_state/desa/profile';
-import colors from '@/con/colors';
-import { Box, Card, Center, Group, Image, Paper, Skeleton, Stack, Text } from '@mantine/core';
+import { Box, Card, Center, Group, Image, Loader, Paper, Stack, Text, Tooltip } from '@mantine/core';
 import { useEffect } from 'react';
 import { useProxy } from 'valtio/utils';
+import { IconPhoto } from '@tabler/icons-react';
+import colors from '@/con/colors';
 
 function MaskotDesa() {
-  const state = useProxy(stateProfileDesa.maskotDesa)
+  const state = useProxy(stateProfileDesa.maskotDesa);
 
   useEffect(() => {
-    state.findUnique.load("edit")
-  }, [])
+    state.findUnique.load('edit');
+  }, []);
 
-  const { data, loading } = state.findUnique
+  const { data, loading } = state.findUnique;
 
   if (loading || !data) {
     return (
-      <Box py={10}>
-        <Skeleton h={500} />
-      </Box>
-    )
+      <Center mih={500}>
+        <Stack align="center" gap="sm">
+          <Loader size="lg" color="blue" />
+          <Text c="dimmed" fz="sm">Sedang memuat data maskot desa...</Text>
+        </Stack>
+      </Center>
+    );
   }
+
   return (
-    <Box pb={70}>
-      <Stack align='center' gap={0}>
-        <Box pb={30}>
-          <Center>
-            <Image src={"/pudak-icon.png"} alt="" w={{ base: 200, md: 300 }} />
-          </Center>
-          <Text c={colors['blue-button']} ta={"center"} fw={"bold"} fz={"2.5rem"}>Maskot Desa</Text>
-        </Box>
-        <Paper p={"xl"} bg={colors['white-trans-1']}>
-          <Text fz={{ base: "md", md: "h3" }} ta={"justify"} dangerouslySetInnerHTML={{ __html: data.deskripsi }} />
-          <Group wrap="wrap" gap="md">
-            {data.images.map((img, index) => (
-              <Card key={index} p="xs" w={220}>
-                <Image
-                  src={img.image.link}
-                  alt={img.label}
-                  w={200}
-                  h={200}
-                  fit="cover"
-                  radius="md"
-                  style={{ border: '1px solid #ccc', objectFit: 'cover' }}
-                />
-                <Text ta="center" mt="xs" fw="bold">{img.label}</Text>
-              </Card>
-            ))}
+    <Box pb={80}>
+      <Stack align="center" gap="xl">
+        <Stack align="center" gap={10}>
+          <Image src="/pudak-icon.png" alt="Ikon Desa" w={{ base: 160, md: 240 }} />
+          <Text c={colors['blue-button']} ta="center" fw={700} fz={{ base: 28, md: 36 }}>Maskot Desa</Text>
+        </Stack>
+
+        <Paper
+          p={{ base: 'md', md: 'xl' }}
+          radius="lg"
+          shadow="sm"
+          withBorder
+          style={{ background: 'linear-gradient(145deg, #ffffff, #f8f9fa)' }}
+        >
+          <Text
+            fz={{ base: 'sm', md: 'lg' }}
+            lh={1.7}
+            ta="justify"
+            c="dark"
+            dangerouslySetInnerHTML={{ __html: data.deskripsi }}
+          />
+
+          <Group justify="center" gap="lg" mt="lg">
+            {data.images.length > 0 ? (
+              data.images.map((img, index) => (
+                <Tooltip key={index} label={img.label} position="bottom" withArrow>
+                  <Card
+                    radius="lg"
+                    shadow="md"
+                    withBorder
+                    w={220}
+                    p="sm"
+                    style={{
+                      transition: 'transform 200ms ease, box-shadow 200ms ease',
+                    }}
+                    className="hover:scale-105 hover:shadow-lg"
+                  >
+                    <Image
+                      src={img.image.link}
+                      alt={img.label}
+                      w="100%"
+                      h={200}
+                      fit="cover"
+                      radius="md"
+                    />
+                    <Text ta="center" mt="sm" fw={600} fz="sm" c="dark">
+                      {img.label}
+                    </Text>
+                  </Card>
+                </Tooltip>
+              ))
+            ) : (
+              <Stack align="center" gap="xs" mt="lg">
+                <IconPhoto size={48} stroke={1.5} color="gray" />
+                <Text c="dimmed" fz="sm">Belum ada gambar maskot yang ditambahkan</Text>
+              </Stack>
+            )}
           </Group>
         </Paper>
       </Stack>
-    </Box >
+    </Box>
   );
 }
 
-
 export default MaskotDesa;

src/app/darmasaba/(pages)/desa/profile/ui/motoDesa.tsx

@@ -1,75 +1,133 @@
-import colors from '@/con/colors';
+'use client'
 import { ActionIcon, Box, Flex, Paper, SimpleGrid, Stack, Text } from '@mantine/core';
+import { motion } from 'framer-motion';
+import { IconSparkles } from '@tabler/icons-react';
+import colors from '@/con/colors';
 
 const dataText = [
   {
     id: 1,
-    title: "SANTUN",
-    description: "Memberikan pelayanan yang baik, penuh rasa empati, sopan, dan beretika"
+    title: "Santun",
+    description: "Pelayanan ramah, penuh empati, sopan, dan beretika."
   },
   {
     id: 2,
-    title: "ADAPTIF",
-    description: "Cepat menyesuaikan diri menghadapi perubahan dan bertindak proaktif"
+    title: "Adaptif",
+    description: "Cepat menyesuaikan diri terhadap perubahan dan selalu proaktif."
   },
   {
     id: 3,
-    title: "INOVATIF",
-    description: "Selalu berusaha menciptakan pembaruan atau kreasi baru"
+    title: "Inovatif",
+    description: "Berani menciptakan pembaruan dan ide-ide kreatif."
   },
   {
     id: 4,
-    title: "PROFESIONAL",
-    description: "Memiliki pengetahuan, terampil dan bertanggung jawab"
+    title: "Profesional",
+    description: "Berpengetahuan luas, terampil, dan bertanggung jawab."
   },
   {
     id: 5,
-    title: "GESIT",
-    description: "Inisiatif dan cekatan dalam bekerja"
+    title: "Gesit",
+    description: "Cekatan, sigap, dan penuh inisiatif dalam bekerja."
   },
-]
+];
+
+const letters = ["S", "I", "G", "A", "P"];
+
 function MotoDesa() {
   return (
-    <Box pb={70}>
-      <Stack align='center' gap={0} >
-        <Box pb={30}>
-          <Text c={colors['blue-button']} ta={"center"} fw={"bold"} fz={{ base: "h1", md: "2.5rem" }}>Moto Desa Darmasaba</Text>
-        </Box>
-        <Flex gap={50} pb={50} pt={20} justify={"space-evenly"} align={"center"} >
-          <ActionIcon bg={colors['blue-button']} radius={150} p={{ base: "lg", md: "xl" }}>
-            <Text c={colors['white-1']} ta={"center"} fw={"bold"} fz={{ base: "h2", md: "h1" }}>S</Text>
-          </ActionIcon>
-          <ActionIcon bg={colors['blue-button']} radius={150} p={{ base: "lg", md: "xl" }}>
-            <Text c={colors['white-1']} ta={"center"} fw={"bold"} fz={{ base: "h2", md: "h1" }}>I</Text>
-          </ActionIcon>
-          <ActionIcon bg={colors['blue-button']} radius={150} p={{ base: "lg", md: "xl" }}>
-            <Text c={colors['white-1']} ta={"center"} fw={"bold"} fz={{ base: "h2", md: "h1" }}>G</Text>
-          </ActionIcon>
-          <ActionIcon bg={colors['blue-button']} radius={150} p={{ base: "lg", md: "xl" }}>
-            <Text c={colors['white-1']} ta={"center"} fw={"bold"} fz={{ base: "h2", md: "h1" }}>A</Text>
-          </ActionIcon>
-          <ActionIcon bg={colors['blue-button']} radius={150} p={{ base: "lg", md: "xl" }}>
-            <Text c={colors['white-1']} ta={"center"} fw={"bold"} fz={{ base: "h2", md: "h1" }}>P</Text>
-          </ActionIcon>
-        </Flex>
-        <Paper mb={50} p={"xl"} bg={colors['white-trans-1']} w={{ base: "100%", md: "100%" }}>
-          <SimpleGrid
-            cols={{
-              base: 1,
-              md: 2,
+    <Box pb={80} px={{ base: "md", md: "xl" }}>
+      <Stack align="center" gap="lg">
+        <Box>
+          <Text
+            ta="center"
+            fw={800}
+            fz={{ base: "2rem", md: "2.8rem" }}
+            style={{
+              background: "linear-gradient(90deg, #0D5594FF, #094678FF)",
+              WebkitBackgroundClip: "text",
+              WebkitTextFillColor: "transparent",
             }}
           >
-            {dataText.map((v, k) => {
-              return (
-                <Box key={k}>
-                  <Text fw={"bold"} fz={{ base: "lg", md: "h3" }}>{v.title}</Text>
-                  <Text fz={{ base: "sm", md: "md" }}>{v.description}</Text>
-                </Box>
-              )
-            })}
+            Moto Desa Darmasaba
+          </Text>
+        </Box>
+
+        <Flex gap={30} pb={40} pt={10} wrap="wrap" justify="center">
+          {letters.map((letter, i) => (
+            <motion.div
+              key={i}
+              whileHover={{ scale: 1.15, rotate: 5 }}
+              whileTap={{ scale: 0.95 }}
+              transition={{ type: "spring", stiffness: 300 }}
+            >
+              <ActionIcon
+                radius="xl"
+                size={90}
+                variant="gradient"
+                gradient={{ from: "blue", to: "cyan" }}
+                style={{
+                  boxShadow: `0 0 18px ${colors['blue-button']}`,
+                  backdropFilter: "blur(6px)",
+                }}
+              >
+                <Text c="white" fw={800} fz="xl">
+                  {letter}
+                </Text>
+              </ActionIcon>
+            </motion.div>
+          ))}
+        </Flex>
+
+        <Paper
+          radius="lg"
+          p="xl"
+          withBorder
+          style={{
+            background: "linear-gradient(145deg, #ffffffcc, #f5faffcc)",
+            boxShadow: "0 8px 24px rgba(0,0,0,0.08)",
+          }}
+        >
+          <SimpleGrid cols={{ base: 1, md: 2 }} spacing="xl">
+            {dataText.map((v) => (
+              <motion.div
+                key={v.id}
+                whileHover={{ scale: 1.02 }}
+                transition={{ duration: 0.2 }}
+              >
+                <Stack gap={4}>
+                  <Flex align="center" gap="sm">
+                    <IconSparkles size={20} color={colors['blue-button']} />
+                    <Text fw={700} fz={{ base: "lg", md: "xl" }} c={colors['blue-button']}>
+                      {v.title}
+                    </Text>
+                  </Flex>
+                  <Text fz={{ base: "sm", md: "md" }} c="gray.7">
+                    {v.description}
+                  </Text>
+                </Stack>
+              </motion.div>
+            ))}
           </SimpleGrid>
         </Paper>
-        <Text mb={40} c={colors['blue-button']} ta={"center"} fw={"bold"} fz={{ base: "h4", md: "h3" }}>&quot;Berkomitmen memberikan pelayanan terbaik dengan prinsip SIGAP untuk masyarakat Desa Darmasaba&quot;</Text>
+
+        <Text
+          ta="center"
+          fw={700}
+          fz={{ base: "md", md: "xl" }}
+          c="blue.8"
+          mt="md"
+          style={{
+            maxWidth: 720,
+            lineHeight: 1.6,
+          }}
+        >
+          &quot;Berkomitmen menghadirkan pelayanan terbaik dengan semangat{" "}
+          <Text span fw={800} c="cyan.6">
+            SIGAP
+          </Text>{" "}
+          untuk masyarakat Desa Darmasaba.&quot;
+        </Text>
       </Stack>
     </Box>
   );

src/app/darmasaba/(pages)/desa/profile/ui/profilPerbekel.tsx

@@ -2,9 +2,10 @@
 'use client'
 import stateProfileDesa from '@/app/admin/(dashboard)/_state/desa/profile';
 import colors from '@/con/colors';
-import { Box, Image, Paper, SimpleGrid, Skeleton, Stack, Text } from '@mantine/core';
+import { Box, Image, Paper, SimpleGrid, Skeleton, Stack, Text, Divider, Tooltip } from '@mantine/core';
 import { useEffect } from 'react';
 import { useProxy } from 'valtio/utils';
+import { IconUser, IconBriefcase, IconUsers, IconTargetArrow } from '@tabler/icons-react';
 
 function ProfilPerbekel() {
   const state = useProxy(stateProfileDesa.profilPerbekel)
@@ -17,77 +18,155 @@ function ProfilPerbekel() {
 
   if (loading || !data) {
     return (
-      <Box py={10}>
-        <Skeleton h={500} />
+      <Box py={20} px="md">
+        <Skeleton h={500} radius="lg" />
       </Box>
     )
   }
+
   return (
-    <Box pb={70}>
-      <Stack align='center' gap={0}>
-        <Box pb={30}>
-          <Text c={colors['blue-button']} ta={"center"} fw={"bold"} fz={"2.5rem"}>Profil Perbekel</Text>
-        </Box>
+    <Box pb={80} px="md">
+      <Stack align="center" gap={0} mb={40}>
+        <Text 
+          c={colors['blue-button']} 
+          ta="center" 
+          fw="bold" 
+          fz={{ base: "2rem", md: "2.8rem" }}
+          style={{ letterSpacing: "0.5px" }}
+        >
+          Profil Perbekel
+        </Text>
+        <Divider w={120} size="sm" color={colors['blue-button']} mt={10} />
       </Stack>
-      <SimpleGrid
-        cols={{
-          base: 1,
-          md: 2,
-        }}
-        pb={50}
-      >
+
+      <SimpleGrid cols={{ base: 1, md: 2 }} spacing="xl" pb={50}>
         <Box>
-          <Paper bg={colors['white-trans-1']} w={{ base: "100%", md: "100%" }}>
+          <Paper 
+            bg={colors['white-trans-1']} 
+            w="100%" 
+            radius="xl" 
+            shadow="md" 
+            withBorder
+          >
             <Stack gap={0}>
               <Image
-                pt={{ base: 0, md: 120 }}
-                px={"lg"}
+                pt={{ base: 0, md: 100 }}
+                px="lg"
                 src={data.image?.link || "/perbekel.png"}
-                sizes='100%'
-                alt=''
+                alt="Foto Perbekel"
+                radius="lg"
                 onError={(e) => {
                   e.currentTarget.src = "/perbekel.png";
                 }}
               />
               <Paper
                 bg={colors['blue-button']}
-                px={"lg"}
+                px="lg"
+                radius="0 0 var(--mantine-radius-xl) var(--mantine-radius-xl)"
                 className="glass3"
                 py={{ base: 20, md: 50 }}
-
               >
-                <Text c={colors['white-1']} fz={{ base: "md", md: "h3" }}>Perbekel Desa Darmasaba</Text>
-                <Text c={colors['white-1']} fw={"bolder"} fz={{ base: "md", md: "h2" }}>
-                  I.B. Surya Prabhawa Manuaba, S.H.,M.H.,NL.P.
+                <Text c={colors['white-1']} fz={{ base: "lg", md: "h3" }}>
+                  Perbekel Desa Darmasaba
+                </Text>
+                <Text 
+                  c={colors['white-1']} 
+                  fw="bolder" 
+                  fz={{ base: "xl", md: "h2" }}
+                  mt={8}
+                >
+                  {"I.B. Surya Prabhawa Manuaba, S.H.,M.H.,NL.P."}
                 </Text>
               </Paper>
             </Stack>
           </Paper>
         </Box>
-        <Paper p={"xl"} bg={colors['white-trans-1']} w={{ base: "100%", md: "100%" }}>
-          <Box>
-            <Text fz={{ base: "1.125rem", md: "1.6rem" }} fw={'bold'}>Biodata</Text>
-            <Text fz={{ base: "1rem", md: "1.5rem" }} ta={"justify"} dangerouslySetInnerHTML={{ __html: data.biodata }} />
-          </Box>
-          <Box>
-            <Text fz={{ base: "1.125rem", md: "1.6rem" }} fw={'bold'}>Pengalaman</Text>
-            <Text fz={{ base: "1rem", md: "1.5rem" }} dangerouslySetInnerHTML={{ __html: data.pengalaman }} />
-          </Box>
+
+        <Paper 
+          p="xl" 
+          bg={colors['white-trans-1']} 
+          w="100%" 
+          radius="xl" 
+          shadow="md" 
+          withBorder
+        >
+          <Stack gap="xl">
+            <Box>
+              <Tooltip label="Informasi pribadi perbekel" withArrow>
+                <Stack gap={6}>
+                  <Stack align="center" gap={6}>
+                    <IconUser size={22} color={colors['blue-button']} />
+                    <Text fz={{ base: "1.2rem", md: "1.5rem" }} fw="bold">Biodata</Text>
+                  </Stack>
+                  <Text 
+                    fz={{ base: "1rem", md: "1.2rem" }} 
+                    ta="justify" 
+                    lh={1.6}
+                    dangerouslySetInnerHTML={{ __html: data.biodata }} 
+                  />
+                </Stack>
+              </Tooltip>
+            </Box>
+
+            <Box>
+              <Tooltip label="Pengalaman kerja perbekel" withArrow>
+                <Stack gap={6}>
+                  <Stack align="center" gap={6}>
+                    <IconBriefcase size={22} color={colors['blue-button']} />
+                    <Text fz={{ base: "1.2rem", md: "1.5rem" }} fw="bold">Pengalaman</Text>
+                  </Stack>
+                  <Text 
+                    fz={{ base: "1rem", md: "1.2rem" }} 
+                    ta="justify" 
+                    lh={1.6}
+                    dangerouslySetInnerHTML={{ __html: data.pengalaman }} 
+                  />
+                </Stack>
+              </Tooltip>
+            </Box>
+          </Stack>
         </Paper>
-      </SimpleGrid >
-      <Paper p={"xl"} bg={colors['white-trans-1']} w={{ base: "100%", md: "100%" }}>
-        <Box>
-          <Text fz={{ base: "1.125rem", md: "1.6rem" }} fw={'bold'}>Pengalaman Organisasi</Text>
-          <Text fz={{ base: "1rem", md: "1.5rem" }} ta={"justify"} dangerouslySetInnerHTML={{ __html: data.pengalamanOrganisasi }} />
-        </Box>
-        <Box pb={20}>
-          <Text fz={{ base: "1.125rem", md: "1.6rem" }} fw={'bold'}>Program Kerja Unggulan</Text>
-          <Box px={20}>
-            <Text fz={{ base: "1rem", md: "1.5rem" }} ta={"justify"} dangerouslySetInnerHTML={{ __html: data.programUnggulan }} />
+      </SimpleGrid>
+
+      <Paper 
+        p="xl" 
+        bg={colors['white-trans-1']} 
+        w="100%" 
+        radius="xl" 
+        shadow="md" 
+        withBorder
+      >
+        <Stack gap="xl">
+          <Box>
+            <Stack align="center" gap={6} >
+              <IconUsers size={22} color={colors['blue-button']} />
+              <Text fz={{ base: "1.2rem", md: "1.5rem" }} fw="bold">Pengalaman Organisasi</Text>
+            </Stack>
+            <Text 
+              fz={{ base: "1rem", md: "1.2rem" }} 
+              ta="justify" 
+              lh={1.6}
+              dangerouslySetInnerHTML={{ __html: data.pengalamanOrganisasi }} 
+            />
           </Box>
-        </Box>
+
+          <Box>
+            <Stack align="center" gap={6}  mb={6}>
+              <IconTargetArrow size={22} color={colors['blue-button']} />
+              <Text fz={{ base: "1.2rem", md: "1.5rem" }} fw="bold">Program Kerja Unggulan</Text>
+            </Stack>
+            <Box px={10}>
+              <Text 
+                fz={{ base: "1rem", md: "1.2rem" }} 
+                ta="justify" 
+                lh={1.6}
+                dangerouslySetInnerHTML={{ __html: data.programUnggulan }} 
+              />
+            </Box>
+          </Box>
+        </Stack>
       </Paper>
-    </Box >
+    </Box>
   );
 }
 

src/app/darmasaba/(pages)/desa/profile/ui/sejarahDesa.tsx

@@ -7,39 +7,69 @@ import { useEffect } from 'react';
 import { useProxy } from 'valtio/utils';
 
 function SejarahDesa() {
-  const state = useProxy(stateProfileDesa.sejarahDesa)
+  const state = useProxy(stateProfileDesa.sejarahDesa);
 
   useEffect(() => {
-    state.findUnique.load("edit")
-  }, [])
+    state.findUnique.load('edit');
+  }, []);
 
-  const { data, loading } = state.findUnique
+  const { data, loading } = state.findUnique;
 
   if (loading || !data) {
     return (
-      <Box py={10}>
-        <Skeleton h={500} />
+      <Box py="lg">
+        <Skeleton h={500} radius="lg" />
       </Box>
-    )
+    );
   }
 
   return (
-    <>
-      <Box pb={70}>
-        <Stack align='center' gap={0}>
-          <Box pb={30}>
-            <Center>
-              <Image src={"/darmasaba-icon.png"} alt="" w={{ base: 200, md: 300 }} />
-            </Center>
-            <Text c={colors['blue-button']} ta={"center"} fw={"bold"} fz={"2.5rem"}>Sejarah Desa</Text>
-          </Box>
-          <Paper p={"xl"} bg={colors['white-trans-1']}>
-            <Text fz={{ base: "md", md: "h3" }} ta={"justify"} dangerouslySetInnerHTML={{ __html: data.deskripsi }} />
-          </Paper>
-
+    <Box py="xl">
+      <Stack align="center" gap="xl">
+        <Stack align="center" gap="sm">
+          <Center>
+            <Image
+              src="/darmasaba-icon.png"
+              alt="Ikon Desa Darmasaba"
+              w={{ base: 180, md: 260 }}
+              radius="md"
+              style={{ filter: 'drop-shadow(0 4px 12px rgba(0,0,0,0.15))' }}
+            />
+          </Center>
+          <Center>
+            <Text
+              c={colors['blue-button']}
+              ta="center"
+              fw={700}
+              fz={{ base: '2rem', md: '2.8rem' }}
+              style={{ letterSpacing: '-0.5px' }}
+            >
+              Sejarah Desa
+            </Text>
+          </Center>
         </Stack>
-      </Box >
-    </>
+        <Paper
+          p="xl"
+          radius="lg"
+          bg="white"
+          shadow="sm"
+          style={{
+            background: 'linear-gradient(135deg, #ffffff 0%, #f9fbfd 100%)',
+            border: `1px solid ${colors['blue-button']}20`,
+          }}
+        >
+          <Stack gap="md">
+            <Text
+              fz={{ base: 'md', md: 'lg' }}
+              lh={1.8}
+              ta="justify"
+              style={{ color: '#2a2a2a' }}
+              dangerouslySetInnerHTML={{ __html: data.deskripsi }}
+            />
+          </Stack>
+        </Paper>
+      </Stack>
+    </Box>
   );
 }
 

src/app/darmasaba/(pages)/desa/profile/ui/semuaPerbekel.tsx

@@ -1,59 +1,102 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 'use client'
-import colors from '@/con/colors';
-import { Box, Center, Image, Paper, SimpleGrid, Skeleton, Stack, Text } from '@mantine/core';
 import stateProfileDesa from '@/app/admin/(dashboard)/_state/desa/profile';
-import { useProxy } from 'valtio/utils';
+import { Box, Center, Image, Paper, SimpleGrid, Skeleton, Stack, Text, Title, Tooltip } from '@mantine/core';
 import { useShallowEffect } from '@mantine/hooks';
+import { IconUser } from '@tabler/icons-react';
+import { useProxy } from 'valtio/utils';
+
 function SemuaPerbekel() {
-const state = useProxy(stateProfileDesa.mantanPerbekel)
+  const state = useProxy(stateProfileDesa.mantanPerbekel);
 
-useShallowEffect(() => {
-  state.findMany.load()
-}, [])
+  useShallowEffect(() => {
+    state.findMany.load();
+  }, []);
 
-const {data, loading} = state.findMany
+  const { data, loading } = state.findMany;
 
-if (loading || !data) {
-  return (
-    <Box py={10}>
-      <Skeleton h={500} />
-    </Box>
-  )
-}
+  if (loading || !data) {
+    return (
+      <Box py="xl">
+        <Skeleton h={500} radius="xl" />
+      </Box>
+    );
+  }
+
+  if (data.length === 0) {
+    return (
+      <Center py="xl">
+        <Stack align="center" gap="sm">
+          <IconUser size={48} stroke={1.5} />
+          <Title fw="bold" order={2}>Belum ada data Perbekel</Title>
+          <Text c="dimmed" fz="sm" ta="center">Data mantan Perbekel akan muncul di sini ketika sudah tersedia</Text>
+        </Stack>
+      </Center>
+    );
+  }
 
   return (
-    <Box pb={50}>
-      <Stack align='center'>
-        <Box pb={30}>
-          <Text c={colors['blue-button']} ta={"center"} fw={"bold"} fz={{ base: "h1", md: "2.5rem" }}>Perbekel Dari Masa Ke Masa</Text>
+    <Box pb={80}>
+      <Stack align="center" gap="lg">
+        <Box>
+          <Text
+            ta="center"
+            fw={900}
+            fz={{ base: "2rem", md: "2.5rem" }}
+            variant="gradient"
+            gradient={{ from: "blue", to: "cyan", deg: 45 }}
+          >
+            Perbekel Dari Masa ke Masa
+          </Text>
         </Box>
-        <SimpleGrid
-          cols={{
-            base: 1,
-            md: 3,
-          }}
-        >
-          {data.map((v, k) => {
-            return (
-              <Box key={k}>
-                <Paper h={620} mb={50} radius={26} bg={colors['white-trans-1']} w={{ base: "100%", md: "100%" }}>
-                  <Box>
-                    <Center>
-                      <Image src={v.image?.link} alt='' />
-                    </Center>
-                  </Box>
-                  <Box>
-                    <Stack gap={"sm"} py={10}>
-                      <Text ta={"center"} fw={"bold"} fz={{ base: "h3", md: "h3" }}>{v.nama}</Text>
-                      <Text ta={"center"} fz={{ base: "h5", md: "h4" }}>{v.daerah}</Text>
-                      <Text ta={"center"} fz={{ base: "h5", md: "h4" }}>{v.periode}</Text>
-                    </Stack>
-                  </Box>
-                </Paper>
-              </Box>
-            )
-          })
-          }
+
+        <SimpleGrid cols={{ base: 1, sm: 2, md: 3 }} spacing="xl" w="100%">
+          {data.map((v: any, k: number) => (
+            <Paper
+              key={k}
+              radius="2xl"
+              shadow="md"
+              withBorder
+              p="lg"
+              bg="white"
+              style={{
+                transition: "all 250ms ease",
+              }}
+              className="hover:shadow-xl hover:scale-[1.02]"
+            >
+              <Stack gap="md" align="center">
+                <Box w="100%" h={300} style={{ overflow: "hidden", borderRadius: "1rem" }}>
+                  <Image
+                    src={v.image?.link}
+                    alt={v.nama || "Foto Perbekel"}
+                    fit="cover"
+                    h="100%"
+                    w="100%"
+                  />
+                </Box>
+
+                <Stack gap={4} align="center">
+                  <Tooltip label="Nama Perbekel" withArrow>
+                    <Text fw={700} fz="lg" ta="center">
+                      {v.nama}
+                    </Text>
+                  </Tooltip>
+
+                  <Tooltip label="Wilayah menjabat" withArrow>
+                    <Text c="dimmed" fz="sm" ta="center">
+                      {v.daerah}
+                    </Text>
+                  </Tooltip>
+
+                  <Tooltip label="Periode jabatan" withArrow>
+                    <Text c="blue" fw={600} fz="sm" ta="center">
+                      {v.periode}
+                    </Text>
+                  </Tooltip>
+                </Stack>
+              </Stack>
+            </Paper>
+          ))}
         </SimpleGrid>
       </Stack>
     </Box>

src/app/darmasaba/(pages)/desa/profile/ui/visimisiDesa.tsx

@@ -6,43 +6,90 @@ import { Box, Image, Paper, Skeleton, Stack, Text } from '@mantine/core';
 import { useEffect } from 'react';
 import { useProxy } from 'valtio/utils';
 
-function VisimisiDesa() {
-    const state = useProxy(stateProfileDesa.visiMisiDesa)
+function VisiMisiDesa() {
+  const state = useProxy(stateProfileDesa.visiMisiDesa);
 
-    useEffect(() => {
-        state.findUnique.load("edit")
-    }, [])
+  useEffect(() => {
+    state.findUnique.load('edit');
+  }, []);
 
-    const { data, loading } = state.findUnique
+  const { data, loading } = state.findUnique;
 
-    if (loading || !data) {
-        return (
-            <Box py={10}>
-                <Skeleton h={500} />
-            </Box>
-        )
-    }
+  if (loading || !data) {
     return (
-        <>
-            <Box pb={30}>
-                <Stack align='center' gap={0}>
-                    <Box pb={30}>
-                        <Image src={"/darmasaba-icon.png"} alt="" w={{ base: 200, md: 300 }} />
-                    </Box>
-                    <Paper p={"xl"} bg={colors['white-trans-1']} w={{ base: "100%", md: "100%" }}>
-                        <Text c={colors['blue-button']} ta={"center"} fw={"lighter"} fz={"2.5rem"}>Visi Desa</Text>
-                        <Text fz={"1.5rem"} ta={"center"} fw={"bold"} dangerouslySetInnerHTML={{ __html: data.visi }} />
-                    </Paper>
-                    <Paper my={20} p={"xl"} bg={colors['white-trans-1']} w={{ base: "100%", md: "100%" }}>
-                        <Text c={colors['blue-button']} ta={"center"} fw={"lighter"} fz={"2.5rem"}>Misi Desa</Text>
-                        <Box>
-                            <Text fz={"1.5rem"} fw={"bold"} dangerouslySetInnerHTML={{ __html: data.misi }} />
-                        </Box>
-                    </Paper>
-                </Stack>
-            </Box >
-        </>
+      <Box py="xl">
+        <Skeleton h={500} radius="lg" />
+      </Box>
     );
+  }
+
+  return (
+    <Box py="xl">
+      <Stack align="center" gap="xl">
+        <Image
+          src="/darmasaba-icon.png"
+          alt="Lambang Desa Darmasaba"
+          w={{ base: 160, md: 240 }}
+          radius="md"
+        />
+
+        <Paper
+          p="xl"
+          radius="lg"
+          shadow="md"
+          withBorder
+          w="100%"
+          style={{
+            background: 'linear-gradient(145deg, #ffffff, #f5f7fa)',
+          }}
+        >
+          <Text
+            c={colors['blue-button']}
+            ta="center"
+            fw={700}
+            fz={{ base: '2rem', md: '2.5rem' }}
+            mb="md"
+          >
+            Visi Desa
+          </Text>
+          <Text
+            fz={{ base: '1.125rem', md: '1.375rem' }}
+            ta="center"
+            fw={500}
+            lh={1.6}
+            dangerouslySetInnerHTML={{ __html: data.visi }}
+          />
+        </Paper>
+
+        <Paper
+          p="xl"
+          radius="lg"
+          shadow="md"
+          withBorder
+          w="100%"
+          style={{
+            background: 'linear-gradient(145deg, #ffffff, #f5f7fa)',
+          }}
+        >
+          <Text
+            c={colors['blue-button']}
+            ta="center"
+            fw={700}
+            fz={{ base: '2rem', md: '2.5rem' }}
+            mb="md"
+          >
+            Misi Desa
+          </Text>
+          <Text
+            fz={{ base: '1.125rem', md: '1.375rem' }}
+            fw={500}
+            lh={1.6}
+            dangerouslySetInnerHTML={{ __html: data.misi }}
+          />
+        </Paper>
+      </Stack>
+    </Box>
+  );
 }
 
-export default VisimisiDesa;
+export default VisiMisiDesa;

src/app/darmasaba/(pages)/ekonomi/pasar-desa/page.tsx

@@ -2,7 +2,7 @@
 import pasarDesaState from '@/app/admin/(dashboard)/_state/ekonomi/pasar-desa/pasar-desa';
 import colors from '@/con/colors';
 import { Box, Center, Flex, Grid, GridCol, Image, Pagination, Paper, Select, SimpleGrid, Skeleton, Stack, Text, TextInput } from '@mantine/core';
-import { useShallowEffect } from '@mantine/hooks';
+import { useDebouncedValue, useShallowEffect } from '@mantine/hooks';
 import { IconMapPinFilled, IconSearch, IconShoppingCartFilled, IconStarFilled } from '@tabler/icons-react';
 import { motion } from 'motion/react';
 import { useRouter } from 'next/navigation';
@@ -14,6 +14,7 @@ function Page() {
   const router = useRouter()
   const state = useProxy(pasarDesaState.pasarDesa)
   const [search, setSearch] = useState('');
+  const [debouncedSearch] = useDebouncedValue(search, 500); // 500ms delay
   const [selectedCategory, setSelectedCategory] = useState<string | null>(null);
   const {
     data,
@@ -35,8 +36,8 @@ function Page() {
     : data;
 
   useShallowEffect(() => {
-    load(page, 4, search, selectedCategory || undefined)
-  }, [page, search, selectedCategory])
+    load(page, 4, debouncedSearch, selectedCategory || undefined)
+  }, [page, debouncedSearch, selectedCategory])
 
 
   if (loading || !data) {

src/app/darmasaba/(pages)/ekonomi/program-kemiskinan/page.tsx

@@ -6,7 +6,7 @@ import BackButton from '../../desa/layanan/_com/BackButto';
 import { CartesianGrid, Legend, Line, LineChart as RechartsLineChart, Tooltip, XAxis, YAxis } from 'recharts';
 import { useProxy } from 'valtio/utils';
 import programKemiskinanState from '@/app/admin/(dashboard)/_state/ekonomi/program-kemiskinan';
-import { useShallowEffect } from '@mantine/hooks';
+import { useDebouncedValue, useShallowEffect } from '@mantine/hooks';
 import { IconSearch } from '@tabler/icons-react';
 
 interface StatistikData {
@@ -31,6 +31,7 @@ interface ProgramKemiskinanData {
 
 function Page() {
   const [search, setSearch] = useState('')
+  const [debouncedSearch] = useDebouncedValue(search, 500); // 500ms delay
   const state = useProxy(programKemiskinanState)
 
   const {
@@ -42,8 +43,8 @@ function Page() {
   } = state.findMany
 
   useShallowEffect(() => {
-    load(page, 2, search)
-  }, [page, search])
+    load(page, 2, debouncedSearch)
+  }, [page, debouncedSearch])
 
   if (loading || !data) {
     return (

src/app/darmasaba/(pages)/inovasi/desa-digital-smart-village/page.tsx

@@ -1,79 +1,62 @@
+'use client'
 import colors from '@/con/colors';
-import { Stack, Box, Text, List, ListItem, Paper, SimpleGrid, Image } from '@mantine/core';
-import React from 'react';
+import { Stack, Box, Text, Paper, SimpleGrid, Image, Skeleton, Center, Pagination, Grid, GridCol, TextInput } from '@mantine/core';
+import React, { useState } from 'react';
 import BackButton from '../../desa/layanan/_com/BackButto';
+import { useProxy } from 'valtio/utils';
+import desaDigitalState from '@/app/admin/(dashboard)/_state/inovasi/desa-digital';
+import { useDebouncedValue, useShallowEffect } from '@mantine/hooks';
+import { IconSearch } from '@tabler/icons-react';
 
-const data = [
-  {
-    id: 1,
-    image: '/api/img/administrasi-digital.png',
-    judul: 'Layanan Administrasi Digital',
-    deskripsi: <List>
-      <ListItem ta={'justify'} fz={{ base: 'h4', md: 'lg' }}>Sistem pengurusan dokumen kependudukan online.</ListItem>
-      <ListItem ta={'justify'} fz={{ base: 'h4', md: 'lg' }}>Pembuatan KTP, KK, Surat Keterangan secara daring.</ListItem>
-      <ListItem ta={'justify'} fz={{ base: 'h4', md: 'lg' }}>Antrian dan pembayaran pajak berbasis aplikasi mobile.</ListItem>
-      <ListItem ta={'justify'} fz={{ base: 'h4', md: 'lg' }}>Sistem informasi kependudukan terintegrasi.</ListItem>
-    </List>
-  },
-  {
-    id: 2,
-    image: '/api/img/edukasi-digital.png',
-    judul: 'Edukasi Digital',
-    deskripsi: <List>
-      <ListItem ta={'justify'} fz={{ base: 'h4', md: 'lg' }}>Ruang Belajar Digital dengan akses internet gratis.</ListItem>
-      <ListItem ta={'justify'} fz={{ base: 'h4', md: 'lg' }}>Pelatihan komputer dan literasi digital untuk semua usia.</ListItem>
-      <ListItem ta={'justify'} fz={{ base: 'h4', md: 'lg' }}>Kursus online keterampilan digital (desain, pemrograman, marketing).</ListItem>
-      <ListItem ta={'justify'} fz={{ base: 'h4', md: 'lg' }}>Beasiswa pendidikan teknologi untuk pemuda desa.</ListItem>
-      <ListItem ta={'justify'} fz={{ base: 'h4', md: 'lg' }}>Perpustakaan digital dengan koleksi buku elektronik.</ListItem>
-    </List>
-  },
-  {
-    id: 3,
-    image: '/api/img/ekonomi-digital.png',
-    judul: 'Ekonomi Digital',
-    deskripsi: <List>
-      <ListItem ta={'justify'} fz={{ base: 'h4', md: 'lg' }}>Marketplace produk UMKM Darmasaba.</ListItem>
-      <ListItem ta={'justify'} fz={{ base: 'h4', md: 'lg' }}>Platform pemasaran hasil pertanian dan kerajinan lokal.</ListItem>
-      <ListItem ta={'justify'} fz={{ base: 'h4', md: 'lg' }}>Sistem pembayaran digital untuk pelaku usaha desa.</ListItem>
-      <ListItem ta={'justify'} fz={{ base: 'h4', md: 'lg' }}>Inkubator bisnis digital untuk wirausaha muda.</ListItem>
-      <ListItem ta={'justify'} fz={{ base: 'h4', md: 'lg' }}>Pelatihan e-commerce dan digital marketing.</ListItem>
-    </List>
-  },
-  {
-    id: 4,
-    image: '/api/img/kesehatan-daring.png',
-    judul: 'Kesehatan Daring',
-    deskripsi: <List>
-      <ListItem ta={'justify'} fz={{ base: 'h4', md: 'lg' }}>Telemedicine dengan dokter dan puskesmas.</ListItem>
-      <ListItem ta={'justify'} fz={{ base: 'h4', md: 'lg' }}>Monitoring kesehatan berbasis aplikasi.</ListItem>
-      <ListItem ta={'justify'} fz={{ base: 'h4', md: 'lg' }}>Pendaftaran antrian puskesmas online.</ListItem>
-      <ListItem ta={'justify'} fz={{ base: 'h4', md: 'lg' }}>Edukasi kesehatan melalui platform digital.</ListItem>
-      <ListItem ta={'justify'} fz={{ base: 'h4', md: 'lg' }}>Rekam medis elektronik.</ListItem>
-    </List>
-  },
-  {
-    id: 5,
-    image: '/api/img/pertanian-cerdas.png',
-    judul: 'Pertanian Cerdas',
-    deskripsi: <List>
-      <ListItem ta={'justify'} fz={{ base: 'h4', md: 'lg' }}>Sistem informasi cuaca dan prediksi pertanian.</ListItem>
-      <ListItem ta={'justify'} fz={{ base: 'h4', md: 'lg' }}>Konsultasi pertanian online dengan ahli.</ListItem>
-      <ListItem ta={'justify'} fz={{ base: 'h4', md: 'lg' }}>Penjualan hasil pertanian melalui platform digital.</ListItem>
-      <ListItem ta={'justify'} fz={{ base: 'h4', md: 'lg' }}>Pelatihan pertanian modern berbasis teknologi.</ListItem>
-    </List>
-  },
-]
 function Page() {
+  const [search, setSearch] = useState("")
+  const [debouncedSearch] = useDebouncedValue(search, 500); // 500ms delay
+  const state = useProxy(desaDigitalState)
+  const {
+    data,
+    page,
+    totalPages,
+    loading,
+    load,
+  } = state.findMany
+
+  useShallowEffect(() => {
+    load(page, 3, debouncedSearch)
+  }, [page, debouncedSearch])
+
+  const filteredData = data || []
+
+  if (loading || !data) {
+    return (
+      <Stack py={10}>
+        <Skeleton h={500} />
+      </Stack>
+    )
+  }
   return (
     <Stack pos={"relative"} bg={colors.Bg} py={"xl"} gap={"22"}>
       <Box px={{ base: 'md', md: 100 }}>
         <BackButton />
       </Box>
       <Box px={{ base: 'md', md: 100 }} >
-        <Text ta={"center"} fz={{ base: "h1", md: "2.5rem" }} c={colors["blue-button"]} fw={"bold"}>
-          Desa Digital / Smart Village
-        </Text>
-        <Text ta={'center'} fz={'h4'}>Mewujudkan Desa Darmasaba sebagai pusat inovasi digital yang memberdayakan masyarakat, meningkatkan kesejahteraan, dan menciptakan peluang ekonomi berbasis teknologi.</Text>
+      <Grid align='center'>
+          <GridCol span={{ base: 12, md: 9 }}>
+            <Text fz={{ base: "h1", md: "2.5rem" }} c={colors["blue-button"]} fw={"bold"}>
+            Desa Digital / Smart Village
+            </Text>
+          </GridCol>
+          <GridCol span={{ base: 12, md: 3 }}>
+            <TextInput
+              radius={"lg"}
+              placeholder='Cari Produk'
+              value={search}
+              onChange={(e) => setSearch(e.target.value)}
+              leftSection={<IconSearch size={20} />}
+              w={{ base: "50%", md: "100%" }}
+            />
+          </GridCol>
+        </Grid>
+        <Text fz={'h4'}>Mewujudkan Desa Darmasaba sebagai pusat inovasi digital yang memberdayakan masyarakat, meningkatkan kesejahteraan, dan menciptakan peluang ekonomi berbasis teknologi.</Text>
       </Box>
       <Box px={{ base: "md", md: 100 }}>
         <Stack gap={'lg'} justify='center'>
@@ -84,13 +67,13 @@ function Page() {
               md: 3
             }}
           >
-            {data.map((v, k) => {
+            {filteredData.map((v, k) => {
               return (
                 <Paper p={'xl'} key={k}>
-                  <Image src={v.image} pb={10} radius={10} alt='' />
-                  <Text fz={'h3'} fw={'bold'} c={colors['blue-button']}>{v.judul}</Text>
-                  <Box pr={'lg'}>
-                  {v.deskripsi}
+                  <Image src={v.image.link? v.image.link : ''} pb={10} radius={10} alt='' />
+                  <Text fz={'h3'} fw={'bold'} c={colors['blue-button']}>{v.name}</Text>
+                  <Box>
+                    <Text fz={"md"} dangerouslySetInnerHTML={{ __html: v.deskripsi }} />
                   </Box>
                 </Paper>
               )
@@ -98,6 +81,15 @@ function Page() {
           </SimpleGrid>
         </Stack>
       </Box>
+      <Center>
+        <Pagination
+          value={page}
+          onChange={(newPage) => load(newPage)} // ini penting!
+          total={totalPages}
+          mt="md"
+          mb="md"
+        />
+      </Center>
     </Stack>
   );
 }

src/app/darmasaba/(pages)/inovasi/info-teknologi-tepat-guna/page.tsx

@@ -1,108 +1,63 @@
+'use client'
 import colors from '@/con/colors';
-import { Stack, Box, Text, List, ListItem, Paper, SimpleGrid, Image } from '@mantine/core';
-import React from 'react';
+import { Box, Center, Grid, GridCol, Image, Pagination, Paper, SimpleGrid, Skeleton, Stack, Text, TextInput } from '@mantine/core';
 import BackButton from '../../desa/layanan/_com/BackButto';
+import { useProxy } from 'valtio/utils';
 
-const data = [
-  {
-    id: 1,
-    image: '/api/img/pertanian-cerdas.png',
-    judul: 'Pertanian Cerdas',
-    subjudul1: 'Sistem Irigasi Hemat Air',
-    subjudul2: 'Pengolahan Limbah Pertanian',
-    deskripsi1: <List>
-      <ListItem ta={'justify'} fz={{ base: 'h4', md: 'lg' }}>Penggunaan sensor kelembaban tanah</ListItem>
-      <ListItem ta={'justify'} fz={{ base: 'h4', md: 'lg' }}>Kontrol penyiraman otomatis </ListItem>
-      <ListItem ta={'justify'} fz={{ base: 'h4', md: 'lg' }}>Pengurangan konsumsi air hingga 40%</ListItem>
-    </List>,
-    deskripsi2: <List>
-      <ListItem ta={'justify'} fz={{ base: 'h4', md: 'lg' }}>Mesin pencacah jerami otomatis</ListItem>
-      <ListItem ta={'justify'} fz={{ base: 'h4', md: 'lg' }}>Konversi limbah menjadi pupuk organik</ListItem>
-      <ListItem ta={'justify'} fz={{ base: 'h4', md: 'lg' }}>Mengurangi pembakaran sampah pertanian</ListItem>
-    </List>,
-  },
-  {
-    id: 2,
-    image: '/api/img/energi-terbarukan.png',
-    judul: 'Energi Terbarukan',
-    subjudul1: 'Pembangkit Listrik Mikrohidro',
-    subjudul2: 'Solar Home System',
-    deskripsi1: <List>
-      <ListItem ta={'justify'} fz={{ base: 'h4', md: 'lg' }}>Memanfaatkan aliran sungai sekitar</ListItem>
-      <ListItem ta={'justify'} fz={{ base: 'h4', md: 'lg' }}>Kapasitas 10-50 kW</ListItem>
-      <ListItem ta={'justify'} fz={{ base: 'h4', md: 'lg' }}>Elektrifikasi mandiri desa</ListItem>
-    </List>,
-    deskripsi2: <List>
-      <ListItem ta={'justify'} fz={{ base: 'h4', md: 'lg' }}>Panel surya untuk rumah tangga </ListItem>
-      <ListItem ta={'justify'} fz={{ base: 'h4', md: 'lg' }}>Akses listrik 24 jam</ListItem>
-      <ListItem ta={'justify'} fz={{ base: 'h4', md: 'lg' }}>Hemat biaya energi</ListItem>
-    </List>,
-  },
-  {
-    id: 3,
-    image: '/api/img/pengolahan-pangan.png',
-    judul: 'Pengolahan Pangan',
-    subjudul1: 'Mesin Pengering Hasil Pertanian',
-    subjudul2: 'Alat Pengolah Hasil Pertanian',
-    deskripsi1: <List>
-      <ListItem ta={'justify'} fz={{ base: 'h4', md: 'lg' }}>Teknologi pengering tenaga surya</ListItem>
-      <ListItem ta={'justify'} fz={{ base: 'h4', md: 'lg' }}>Menjaga kualitas hasil panen</ListItem>
-      <ListItem ta={'justify'} fz={{ base: 'h4', md: 'lg' }}>Mencegah kerusakan pasca panen</ListItem>
-    </List>,
-    deskripsi2: <List>
-      <ListItem ta={'justify'} fz={{ base: 'h4', md: 'lg' }}>Mesin pengupas dan pengemas produk</ListItem>
-      <ListItem ta={'justify'} fz={{ base: 'h4', md: 'lg' }}>Meningkatkan nilai jual komoditas</ListItem>
-      <ListItem ta={'justify'} fz={{ base: 'h4', md: 'lg' }}>Standarisasi kualitas produk</ListItem>
-    </List>,
-  },
-  {
-    id: 4,
-    image: '/api/img/pengelolaan-sampah.png',
-    judul: 'Pengelolaan Sampah',
-    subjudul1: 'Sistem Pengolahan Sampah Terpadu',
-    subjudul2: 'Komposter Komunal',
-    deskripsi1: <List>
-      <ListItem ta={'justify'} fz={{ base: 'h4', md: 'lg' }}>Pemilahan otomatis</ListItem>
-      <ListItem ta={'justify'} fz={{ base: 'h4', md: 'lg' }}>Daur ulang sampah organik dan anorganik</ListItem>
-      <ListItem ta={'justify'} fz={{ base: 'h4', md: 'lg' }}>Pembangkit listrik dari sampah</ListItem>
-    </List>,
-    deskripsi2: <List>
-      <ListItem ta={'justify'} fz={{ base: 'h4', md: 'lg' }}>Teknologi pengomposan cepat</ListItem>
-      <ListItem ta={'justify'} fz={{ base: 'h4', md: 'lg' }}>Menghasilkan pupuk organik</ListItem>
-      <ListItem ta={'justify'} fz={{ base: 'h4', md: 'lg' }}>Mengurangi sampah ke TPA</ListItem>
-    </List>,
-  },
-  {
-    id: 5,
-    image: '/api/img/kesehatan-daring.png',
-    judul: 'Kesehatan Masyarakat',
-    subjudul1: 'Alat Deteksi Dini Penyakit',
-    subjudul2: 'Air Bersih Mandiri',
-    deskripsi1: <List>
-      <ListItem ta={'justify'} fz={{ base: 'h4', md: 'lg' }}>Skrining kesehatan portable </ListItem>
-      <ListItem ta={'justify'} fz={{ base: 'h4', md: 'lg' }}>Pemeriksaan tekanan darah dan gula </ListItem>
-      <ListItem ta={'justify'} fz={{ base: 'h4', md: 'lg' }}>Konsultasi medis jarak jauh</ListItem>
-    </List>,
-    deskripsi2: <List>
-      <ListItem ta={'justify'} fz={{ base: 'h4', md: 'lg' }}>Sistem filter air canggih </ListItem>
-      <ListItem ta={'justify'} fz={{ base: 'h4', md: 'lg' }}>Menghilangkan kontaminan </ListItem>
-      <ListItem ta={'justify'} fz={{ base: 'h4', md: 'lg' }}>Jaminan kualitas air minum
+import { useDebouncedValue, useShallowEffect } from '@mantine/hooks';
+import { useState } from 'react';
+import infoTeknoState from '@/app/admin/(dashboard)/_state/inovasi/info-tekno';
+import { IconSearch } from '@tabler/icons-react';
 
-</ListItem>
-    </List>,
-  },
-]
 function Page() {
+  const [search, setSearch] = useState("")
+  const [debouncedSearch] = useDebouncedValue(search, 500); // 500ms delay
+  const state = useProxy(infoTeknoState)
+  const {
+    data,
+    page,
+    totalPages,
+    loading,
+    load,
+  } = state.findMany
+
+  useShallowEffect(() => {
+    load(page, 3, debouncedSearch)
+  }, [page, debouncedSearch])
+
+  const filteredData = data || []
+
+  if (loading || !data) {
+    return (
+      <Stack py={10}>
+        <Skeleton h={500} />
+      </Stack>
+    )
+  }
   return (
     <Stack pos={"relative"} bg={colors.Bg} py={"xl"} gap={"22"}>
       <Box px={{ base: 'md', md: 100 }}>
         <BackButton />
       </Box>
       <Box px={{ base: 'md', md: 100 }} >
-        <Text ta={"center"} fz={{ base: "h1", md: "2.5rem" }} c={colors["blue-button"]} fw={"bold"}>
-          Info Teknologi Tepat Guna
-        </Text>
-        <Text ta={'center'} fz={'h4'}>Desa Darmasaba berkomitmen mengembangkan teknologi tepat guna yang sesuai dengan kebutuhan masyarakat, mendukung pembangunan berkelanjutan, dan meningkatkan kualitas hidup warga.</Text>
+        <Grid align='center'>
+          <GridCol span={{ base: 12, md: 9 }}>
+            <Text fz={{ base: "h1", md: "2.5rem" }} c={colors["blue-button"]} fw={"bold"}>
+              Info Teknologi Tepat Guna
+            </Text>
+          </GridCol>
+          <GridCol span={{ base: 12, md: 3 }}>
+            <TextInput
+              radius={"lg"}
+              placeholder='Cari Info Teknologi'
+              value={search}
+              onChange={(e) => setSearch(e.target.value)}
+              leftSection={<IconSearch size={20} />}
+              w={{ base: "50%", md: "100%" }}
+            />
+          </GridCol>
+        </Grid>
+        <Text fz={'h4'}>Desa Darmasaba berkomitmen mengembangkan teknologi tepat guna yang sesuai dengan kebutuhan masyarakat, mendukung pembangunan berkelanjutan, dan meningkatkan kualitas hidup warga.</Text>
       </Box>
       <Box px={{ base: "md", md: 100 }}>
         <Stack gap={'lg'} p={'lg'}>
@@ -113,18 +68,13 @@ function Page() {
               md: 3
             }}
           >
-            {data.map((v, k) => {
+            {filteredData.map((v, k) => {
               return (
                 <Paper p={'xl'} key={k}>
-                  <Image src={v.image} pb={10} radius={10} alt='' />
-                  <Text fz={'h3'} fw={'bold'} c={colors['blue-button']}>{v.judul}</Text>
+                  <Image src={v.image.link || ''} pb={10} radius={10} alt='' />
+                  <Text fz={'h3'} fw={'bold'} c={colors['blue-button']}>{v.name}</Text>
                   <Box pr={'lg'} pb={10}>
-                  <Text fz={'h4'} fw={'bold'} >{v.subjudul1}</Text>
-                    {v.deskripsi1}
-                  </Box>
-                  <Box pr={'lg'}>
-                  <Text fz={'h4'} fw={'bold'} >{v.subjudul2}</Text>
-                    {v.deskripsi2}
+                    <Text fz={'h4'} fw={'bold'} dangerouslySetInnerHTML={{ __html: v.deskripsi }} />
                   </Box>
                 </Paper>
               )
@@ -132,6 +82,14 @@ function Page() {
           </SimpleGrid>
         </Stack>
       </Box>
+      <Center>
+        <Pagination
+          value={page}
+          onChange={(newPage) => load(newPage)} // ini penting!
+          total={totalPages}
+          my="md"
+        />
+      </Center>
     </Stack>
   );
 }

src/app/darmasaba/(pages)/inovasi/kolaborasi-inovasi/page.tsx

@@ -1,26 +1,51 @@
+'use client'
+import kolaborasiInovasiState from '@/app/admin/(dashboard)/_state/inovasi/kolaborasi-inovasi';
 import colors from '@/con/colors';
-import { Stack, Box, Text, Paper, Flex, Group, SimpleGrid, Button, Image, Center } from '@mantine/core';
-import React from 'react';
+import { Box, Center, Grid, GridCol, Group, Image, Pagination, Paper, Select, SimpleGrid, Skeleton, Stack, Text, TextInput } from '@mantine/core';
+import { useShallowEffect } from '@mantine/hooks';
+import { IconSearch } from '@tabler/icons-react';
+import { useState } from 'react';
+import { useProxy } from 'valtio/utils';
 import BackButton from '../../desa/layanan/_com/BackButto';
-import { IconChevronDown } from '@tabler/icons-react';
-
-const data = [
-  {
-    id: 1,
-    bulan: 'JANUARI 2025',
-    judul: 'Darmasaba Smart Waste',
-    deskripsi: 'Sistem manajemen sampah terpadu yang memudahkan warga untuk memilah dan mendaur ulang sampah.',
-    kolaborator: 'Kolaborator: DLH Kabupaten Badung, Komunitas Peduli Lingkungan, TPS3R Pudak Mesari'
-  },
-  {
-    id: 2,
-    bulan: 'FEBRUARI 2025',
-    judul: 'Darmasaba Digital Market',
-    deskripsi: 'Platform e-commerce untuk produk UMKM desa yang menghubungkan produsen lokal dengan pasar global.',
-    kolaborator: 'Kolaborator: Kementerian Desa PDTT, UMKM Darmasaba'
-  }
-]
 function Page() {
+  const state = useProxy(kolaborasiInovasiState)
+  const [search, setSearch] = useState('');
+  const [selectedYear, setSelectedYear] = useState<string | null>(null);
+
+  // Get unique years from the data
+  const years = Array.from(
+    new Set(
+      state.findMany.data?.map(item => 
+        new Date(item.createdAt).getFullYear().toString()
+      ) || []
+    )
+  )
+  .sort((a, b) => b.localeCompare(a)) // Sort descending (newest first)
+  .map(year => ({
+    value: year,
+    label: year,
+  }));
+
+  const {
+    data,
+    page,
+    totalPages,
+    loading,
+    load,
+  } = state.findMany
+
+  useShallowEffect(() => {
+    load(page, 10, search, selectedYear || '')
+  }, [page, search, selectedYear])
+
+  if (loading || !data) {
+    return (
+      <Stack py={10}>
+        <Skeleton height={650} />
+      </Stack>
+    );
+  }
+
   return (
     <>
       <Stack pos={"relative"} bg={colors.Bg} py={"xl"} gap={"22"}>
@@ -28,27 +53,46 @@ function Page() {
           <BackButton />
         </Box>
         <Box px={{ base: 'md', md: 100 }} >
-          <Text ta={"center"} fz={{ base: "h1", md: "2.5rem" }} c={colors["blue-button"]} fw={"bold"}>
-            Kolaborasi Inovasi
-          </Text>
+          <Grid align='center'>
+            <GridCol span={{ base: 12, md: 9 }}>
+              <Text fz={{ base: "h1", md: "2.5rem" }} c={colors["blue-button"]} fw={"bold"}>
+                Kolaborasi Inovasi
+              </Text>
+            </GridCol>
+            <GridCol span={{ base: 12, md: 3 }}>
+              <TextInput
+                radius={"lg"}
+                placeholder='Cari Kolaborasi Inovasi'
+                value={search}
+                onChange={(e) => setSearch(e.target.value)}
+                leftSection={<IconSearch size={20} />}
+                w={{ base: "50%", md: "100%" }}
+              />
+            </GridCol>
+          </Grid>
         </Box>
         <Box px={{ base: "md", md: 100 }}>
           <Stack gap={'lg'} justify='center'>
             <Group justify='flex-end'>
-              <Paper bg={colors['blue-button']} p={5} w={{ base: 150, md: 300 }}>
-                <Flex px={20} align={'center'} justify={'space-between'}>
-                  <Text fz={'h4'} fw={'bold'} c={colors['white-1']}>Tahun</Text>
-                  <IconChevronDown size={20} color={colors['white-1']} />
-                </Flex>
-              </Paper>
+              <Select
+                value={selectedYear}
+                onChange={setSelectedYear}
+                label={<Text fw={"bold"} fz={"sm"}>Tahun</Text>}
+                placeholder='Semua Tahun'
+                clearable
+                data={[
+                  { value: '', label: 'Semua Tahun' },
+                  ...years
+                ]}
+              />
             </Group>
             <SimpleGrid cols={{ base: 1, md: 2 }} spacing={'lg'}>
               {data.map((v, k) => {
                 return (
                   <Paper p={'xl'} key={k}>
-                    <Text fz={'h3'} fw={'bold'} c={colors['blue-button']}>{v.judul}</Text>
+                    <Text fz={'h3'} fw={'bold'} c={colors['blue-button']}>{v.name}</Text>
                     <Box pr={'lg'} pb={20}>
-                      {v.deskripsi}
+                      {v.slug}
                     </Box>
                     <Box pr={'lg'}>
                       {v.kolaborator}
@@ -57,9 +101,15 @@ function Page() {
                 );
               })}
             </SimpleGrid>
-            <Group py={40} justify='center'>
-              <Button px={80} rightSection={<IconChevronDown />} radius={6} bg={colors["blue-button"]} c={colors["white-1"]}>Lihat Laporan Lainnya</Button>
-            </Group>
+            <Center>
+              <Pagination
+                value={page}
+                onChange={(newPage) => load(newPage)} // ini penting!
+                total={totalPages}
+                mt="md"
+                mb="md"
+              />
+            </Center>
           </Stack>
         </Box>
       </Stack>
@@ -72,7 +122,7 @@ function Page() {
             <Text ta={'center'} fz={'h4'}>Kami berkolaborasi dengan berbagai mitra dari berbagai sektor untuk mewujudkan visi Smart Village Darmasaba.</Text>
           </Box>
           <Center>
-            <Image src={'/api/img/logoukm-kolaborasiinvoasi.png'} alt='' w={{base: 500, md: 650}}/>
+            <Image src={'/api/img/logoukm-kolaborasiinvoasi.png'} alt='' w={{ base: 500, md: 650 }} />
           </Center>
         </Stack>
       </Box>

src/app/darmasaba/(pages)/keamanan/keamanan-lingkungan-pecalang-patwal/page.tsx

@@ -2,7 +2,7 @@
 import keamananLingkunganState from '@/app/admin/(dashboard)/_state/keamanan/keamanan-lingkungan';
 import colors from '@/con/colors';
 import { Box, Center, Grid, GridCol, Image, Pagination, Paper, SimpleGrid, Skeleton, Stack, Text, TextInput } from '@mantine/core';
-import { useShallowEffect } from '@mantine/hooks';
+import { useDebouncedValue, useShallowEffect } from '@mantine/hooks';
 import { IconSearch } from '@tabler/icons-react';
 import { useState } from 'react';
 import { useProxy } from 'valtio/utils';
@@ -12,6 +12,7 @@ import BackButton from '../../desa/layanan/_com/BackButto';
 function Page() {
   const state = useProxy(keamananLingkunganState)
   const [search, setSearch] = useState('')
+  const [debouncedSearch] = useDebouncedValue(search, 500); // 500ms delay
   const {
     data,
     page,
@@ -21,8 +22,8 @@ function Page() {
   } = state.findMany;
 
   useShallowEffect(() => {
-    load(page, 3, search)
-  }, [page, search])
+    load(page, 3, debouncedSearch)
+  }, [page, debouncedSearch])
 
   if (loading || !data) {
     return (

src/app/darmasaba/(pages)/keamanan/pencegahan-kriminalitas/page.tsx

@@ -5,112 +5,130 @@ import { IconArrowRight } from '@tabler/icons-react';
 
 function Page() {
   return (
-    <Stack pos={"relative"} bg={colors.Bg} py={"xl"} gap={"22"}>
+    <Stack pos="relative" bg={colors.Bg} py="xl" gap={22}>
       <Box px={{ base: 'md', md: 100 }}>
         <BackButton />
       </Box>
       <SimpleGrid
         px={{ base: 20, md: 100 }}
-        cols={{
-          base: 1,
-          md: 2
-        }}
+        cols={{ base: 1, md: 2 }}
+        spacing="xl"
       >
-        {/* Content 1 */}
-        <Box pt={{base: 0, md: 35}}>
-          <Text c={colors["blue-button"]} fz={{ base: "h4", md: "h3" }} >
-            Info Keamanan dan Pencegahan Kriminalitas
+        <Box pt={{ base: 0, md: 35 }}>
+          <Text c={colors['blue-button']} fz={{ base: 'h4', md: 'h3' }}>
+            Community Safety & Crime Prevention
           </Text>
-          <Text fz={{ base: "h1", md: "2.5rem" }} c={colors["blue-button"]} fw={"bold"}>
-            Kontak Darurat
+          <Text fz={{ base: 'h1', md: '2.5rem' }} c={colors['blue-button']} fw="bold">
+            Emergency Contacts
           </Text>
           <Group>
-            <Button rightSection={<IconArrowRight />} mt={20} radius={10} bg={colors["blue-button"]} c={colors["white-1"]}>
-              Lihat Detail
+            <Button
+              rightSection={<IconArrowRight />}
+              mt={20}
+              radius="xl"
+              size="md"
+              bg={colors['blue-button']}
+              c={colors['white-1']}
+            >
+              View Details
             </Button>
           </Group>
         </Box>
-        {/* Content 2 */}
-        <SimpleGrid cols={{ base: 1, md: 2 }}>
-          <Paper p={"lg"}>
-            <Text c={colors["blue-button"]} fw={'bold'} fz={{ base: "h4", md: "h3" }} >
-              Tips menjaga keamanan lingkungan
+        <SimpleGrid cols={{ base: 1, md: 2 }} spacing="lg">
+          <Paper p="lg" radius="xl" shadow="md">
+            <Text c={colors['blue-button']} fw="bold" fz={{ base: 'h4', md: 'h3' }}>
+              How to Keep Your Neighborhood Safe
             </Text>
-            <Text fz={{ base: "h5", md: "h4" }} c={colors["blue-button"]} >
-              Lorem Ipsum is simply dummy text of the printing and typesetting industry.
+            <Text fz={{ base: 'h5', md: 'h4' }} c={colors['blue-button']} mt="sm">
+              Practical safety habits everyone can apply daily to reduce risks.
             </Text>
             <Group>
-              <Button rightSection={<IconArrowRight />} mt={20} radius={10} bg={colors["blue-button"]} c={colors["white-1"]}>
-                Lihat Detail
+              <Button
+                rightSection={<IconArrowRight />}
+                mt={20}
+                radius="xl"
+                size="md"
+                bg={colors['blue-button']}
+                c={colors['white-1']}
+              >
+                Learn More
               </Button>
             </Group>
           </Paper>
-          <Paper p={"lg"}>
-            <Text c={colors["blue-button"]} fw={'bold'} fz={{ base: "h4", md: "h3" }} >
-              Mengenali tanda-tanda kegiatan kriminal
+          <Paper p="lg" radius="xl" shadow="md">
+            <Text c={colors['blue-button']} fw="bold" fz={{ base: 'h4', md: 'h3' }}>
+              Recognizing Criminal Activities
             </Text>
-            <Text fz={{ base: "h5", md: "h4" }} c={colors["blue-button"]} >
-              the printing and typesetting industry. the printing and typesetting industry.
+            <Text fz={{ base: 'h5', md: 'h4' }} c={colors['blue-button']} mt="sm">
+              Key warning signs and behavior patterns you should stay aware of.
             </Text>
             <Group>
-              <Button rightSection={<IconArrowRight />} mt={20} radius={10} bg={colors["blue-button"]} c={colors["white-1"]}>
-                Lihat Detail
+              <Button
+                rightSection={<IconArrowRight />}
+                mt={20}
+                radius="xl"
+                size="md"
+                bg={colors['blue-button']}
+                c={colors['white-1']}
+              >
+                Learn More
               </Button>
             </Group>
           </Paper>
         </SimpleGrid>
-        {/* Content 3 */}
-        <Paper p={'xl'}>
-          <Text fz={{ base: "h3", md: "h2" }} c={colors["blue-button"]} fw={"bold"}>
-            Program Keamanan Rutin
+        <Paper p="xl" radius="xl" shadow="lg">
+          <Text fz={{ base: 'h3', md: 'h2' }} c={colors['blue-button']} fw="bold">
+            Ongoing Security Programs
           </Text>
-          <Stack pt={30} gap={'lg'}>
-            <Box>
-              <Paper p={"md"} bg={colors['blue-button']} w={{ base: "100%", md: "100%" }}>
-                <Flex align={'center'} justify={'space-between'}>
-                  <Text fz={'h3'} c={colors['white-1']}>Ronda Malam</Text>
-                  <IconArrowRight size={30} color={colors['white-1']} />
+          <Stack pt={30} gap="lg">
+            {['Night Patrol', 'Neighborhood Watch', 'Emergency Preparedness'].map((program, i) => (
+              <Paper key={i} p="md" bg={colors['blue-button']} radius="md" shadow="sm">
+                <Flex align="center" justify="space-between">
+                  <Text fz="h3" c={colors['white-1']}>
+                    {program}
+                  </Text>
+                  <IconArrowRight size={28} color={colors['white-1']} />
                 </Flex>
               </Paper>
-            </Box>
-            <Box>
-              <Paper p={"md"} bg={colors['blue-button']} w={{ base: "100%", md: "100%" }}>
-                <Flex align={'center'} justify={'space-between'}>
-                  <Text fz={'h3'} c={colors['white-1']}>Ronda Malam</Text>
-                  <IconArrowRight size={30} color={colors['white-1']} />
-                </Flex>
-              </Paper>
-            </Box>
-            <Box>
-              <Paper p={"md"} bg={colors['blue-button']} w={{ base: "100%", md: "100%" }}>
-                <Flex align={'center'} justify={'space-between'}>
-                  <Text fz={'h3'} c={colors['white-1']}>Ronda Malam</Text>
-                  <IconArrowRight size={30} color={colors['white-1']} />
-                </Flex>
-              </Paper>
-            </Box>
+            ))}
             <Box pt={25}>
-              <Button fullWidth rightSection={<IconArrowRight size={20} color={colors['white-1']} />}>Lihat program lainnya</Button>
+              <Button
+                fullWidth
+                radius="xl"
+                size="md"
+                bg={colors['blue-button']}
+                rightSection={<IconArrowRight size={20} color={colors['white-1']} />}
+              >
+                Explore More Programs
+              </Button>
             </Box>
           </Stack>
         </Paper>
-        {/* Content 4 */}
         <Box>
-          <Paper p={'xl'} >
-            <Box style={{ maxWidth: "560px", width: "100%", aspectRatio: "16/9" }}>
-              <iframe width="100%"
+          <Paper p="xl" radius="xl" shadow="lg">
+            <Box style={{ maxWidth: 560, width: '100%', aspectRatio: '16/9' }}>
+              <iframe
+                width="100%"
                 height="100%"
-                src="https://www.youtube.com/embed/p5OkdBgasWA?si=6lFKXeE9LN5zcJQq" title="YouTube video player" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share"  ></iframe>
+                src="https://www.youtube.com/embed/p5OkdBgasWA?si=6lFKXeE9LN5zcJQq"
+                title="Community Safety Patrol"
+                allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share"
+              />
             </Box>
-            <Text py={10} fz={{ base: "h3", md: "h2" }} fw={'bold'} c={colors['blue-button']}>
-              Patroli Malam Darmasaba
+            <Text py={10} fz={{ base: 'h3', md: 'h2' }} fw="bold" c={colors['blue-button']}>
+              Darmasaba Night Patrol
             </Text>
-            <Text fz={'h4'} >
-              Lorem Ipsum is simply dummy text of the printing and typesetting industry.
+            <Text fz="h4" c={colors['blue-button']}>
+              A closer look at how the community works together to maintain safety.
             </Text>
             <Box pt={10}>
-              <Button bg={colors['blue-button']} rightSection={<IconArrowRight size={20} color={colors['white-1']} />}>
-                Lihat Video Lainnya
+              <Button
+                radius="xl"
+                size="md"
+                bg={colors['blue-button']}
+                rightSection={<IconArrowRight size={20} color={colors['white-1']} />}
+              >
+                Watch More Videos
               </Button>
             </Box>
           </Paper>

src/app/darmasaba/(pages)/keamanan/tips-keamanan/page.tsx

@@ -4,7 +4,7 @@ import { Box, Center, Grid, GridCol, Image, Pagination, Paper, SimpleGrid, Skele
 import BackButton from '../../desa/layanan/_com/BackButto';
 import { useProxy } from 'valtio/utils';
 import tipsKeamananState from '@/app/admin/(dashboard)/_state/keamanan/tips-keamanan';
-import { useShallowEffect } from '@mantine/hooks';
+import { useDebouncedValue, useShallowEffect } from '@mantine/hooks';
 import { useState } from 'react';
 import { IconSearch } from '@tabler/icons-react';
 
@@ -12,6 +12,7 @@ import { IconSearch } from '@tabler/icons-react';
 function Page() {
   const state = useProxy(tipsKeamananState)
   const [search, setSearch] = useState('')
+  const [debouncedSearch] = useDebouncedValue(search, 500); // 500ms delay
   const {
     data,
     page,
@@ -21,8 +22,8 @@ function Page() {
   } = state.findMany;
 
   useShallowEffect(() => {
-    load(page, 3, search)
-  }, [page, search])
+    load(page, 3, debouncedSearch)
+  }, [page, debouncedSearch])
 
   if (loading || !data) {
     return (

src/app/darmasaba/(pages)/kesehatan/data-kesehatan-warga/artikel-kesehatan-page/[id]/page.tsx

@@ -2,158 +2,155 @@
 import artikelKesehatanState from '@/app/admin/(dashboard)/_state/kesehatan/data_kesehatan_warga/artikelKesehatan';
 import BackButton from '@/app/darmasaba/(pages)/desa/layanan/_com/BackButto';
 import colors from '@/con/colors';
-import { Box, Button, Center, Divider, Group, Image, List, ListItem, Paper, Skeleton, Stack, Table, TableTbody, TableTd, TableTh, TableThead, TableTr, Text } from '@mantine/core';
+import { Box, Divider, Group, List, ListItem, Paper, Skeleton, Stack, Table, TableTbody, TableTd, TableTh, TableThead, TableTr, Text } from '@mantine/core';
 import { useShallowEffect } from '@mantine/hooks';
+import { IconAlertCircle, IconCalendar, IconInfoCircle } from '@tabler/icons-react';
 import { useParams } from 'next/navigation';
 import { useProxy } from 'valtio/utils';
 
 function Page() {
-  const state = useProxy(artikelKesehatanState)
-  const params = useParams()
+  const state = useProxy(artikelKesehatanState);
+  const params = useParams();
 
   useShallowEffect(() => {
-    state.findUnique.load(params?.id as string)
-  }, [])
+    state.findUnique.load(params?.id as string);
+  }, []);
 
   if (!state.findUnique.data) {
     return (
-      <Stack py={10}>
-        <Skeleton h={500} />
+      <Stack py="xl" px="md">
+        <Skeleton h={420} radius="lg" />
+        <Skeleton h={20} mt="md" w="60%" />
+        <Skeleton h={20} w="40%" />
+        <Skeleton h={200} radius="md" />
       </Stack>
-    )
+    );
   }
+
   return (
-    <Stack pos={"relative"} bg={colors.Bg} py={"xl"} gap={"22"}>
+    <Stack pos="relative" bg={colors.Bg} py="xl" gap="xl">
       <Box px={{ base: 'md', md: 100 }}>
         <BackButton />
       </Box>
-      <Box px={{ base: "md", md: 100 }}>
-        <Stack gap={'lg'}>
-          <Paper radius={10}>
-            <Box style={{ borderTopLeftRadius: 10, borderTopRightRadius: 10 }} bg={colors['blue-button']}>
-              <Text p={'md'} fz={{ base: "h3", md: "h2" }} c={colors['white-1']} fw={"bold"}>
-                Detail Lengkap Fasilitas Kesehatan
+
+      <Box px={{ base: 'md', md: 100 }}>
+        <Stack gap="lg">
+          <Paper radius="xl" shadow="md" withBorder>
+            <Box style={{ borderTopLeftRadius: 16, borderTopRightRadius: 16 }} bg={colors['blue-button']}>
+              <Text p="md" fz={{ base: 'h3', md: 'h2' }} c={colors['white-1']} fw="bold">
+                {state.findUnique.data.title || 'Detail Artikel Kesehatan'}
               </Text>
             </Box>
-            <Box p={'md'} >
-              <Stack gap={'xs'}>
-                <Center bg={'#DEE3E3FF'}>
-                  <Image
-                    w={'100%'}
-                    src={'/api/img/dbd.png'}
-                    alt='' />
-                </Center>
-                <Box>
-                  <Text c={'#9A9D9DFF'} fz={{ base: 'h6', md: 'h5' }}>
-                    {new Date(state.findUnique.data.createdAt).toLocaleDateString('id-ID', { year: 'numeric', month: 'long', day: 'numeric' })}
-                  </Text>
-                </Box>
-                {/* Pendahuluan */}
-                <Text fz={'h4'} fw={"bold"}>
-                  Pendahuluan
-                </Text>
-                <Divider />
-                <Text pb={10} fz={'h4'} ta={'justify'}>
-                  {state.findUnique.data.introduction?.content}
-                </Text>
-                {/* Kenali Gejala DBD */}
-                <Text fz={'h4'} fw={"bold"}>
-                  Kenali Gejala DBD
-                </Text>
-                <Divider />
-                <Text fz={'h4'}>
-                  {state.findUnique.data.symptom?.title}
-                </Text>
-                <Text fz={'h4'} dangerouslySetInnerHTML={{ __html: state.findUnique.data.symptom?.content }} />
-                {/* Cara Mencegah DBD */}
-                <Text fz={'h4'} fw={"bold"}>
-                  {state.findUnique.data.prevention?.title}
-                </Text>
-                <Divider />
-                <Text fz={'h4'} dangerouslySetInnerHTML={{ __html: state.findUnique.data.prevention?.content }} />
-                {/* Pertolongan Pertama Pada Penderita DBD */}
-                <Text fz={'h4'} fw={"bold"}>
-                  {state.findUnique.data.firstaid?.title}
-                </Text>
-                <Divider />
-                <Text fz={'h4'} dangerouslySetInnerHTML={{ __html: state.findUnique.data.firstaid?.content }} />
-                {/* Mitos dan Fakta tentang DBD */}
-                <Text fz={'h4'} fw={"bold"}>
-                  {state.findUnique.data.mythvsfact?.title}
-                </Text>
-                <Divider />
-                <Box pb={10}>
-                  <Table highlightOnHover withTableBorder withColumnBorders>
-                    <TableThead>
-                      <TableTr>
-                        <TableTh fz={'h4'}>Mitos</TableTh>
-                        <TableTh fz={'h4'}>Fakta</TableTh>
-                      </TableTr>
-                    </TableThead>
-                    <TableTbody>
-                      {state.findUnique.data?.mythvsfact ? (
-                        <TableTr>
-                          <TableTd>
-                            <Text fz={'h4'} dangerouslySetInnerHTML={{ __html: state.findUnique.data.mythvsfact.mitos }} />
-                          </TableTd>
-                          <TableTd>
-                            <Text fz={'h4'} dangerouslySetInnerHTML={{ __html: state.findUnique.data.mythvsfact.fakta }} />
-                          </TableTd>
-                        </TableTr>
-                      ) : (
-                        <TableTr>
-                          <TableTd colSpan={3} style={{ textAlign: 'center' }}>Tidak ada data mitos dan fakta</TableTd>
-                        </TableTr>
-                      )}
-                    </TableTbody>
-                  </Table>
-                </Box>
-                {/* Kapan Harus ke Dokter */}
-                <Text fz={'h4'} fw={"bold"}>
-                  Kapan Harus ke Dokter?
-                </Text>
-                <Divider />
-                <Text fz={'h4'}>
-                  Segera bawa penderita ke fasilitas kesehatan jika mengalami:
-                </Text>
-                <Text fz={'h4'} dangerouslySetInnerHTML={{ __html: state.findUnique.data.doctorsign.content }} />
-                {/* Kasus DBD di Wilayah Abiansemal */}
-                <Text fz={'h4'} fw={"bold"}>
-                  Kasus DBD di Wilayah Abiansemal
-                </Text>
-                <Divider />
 
-                <Paper p={'lg'} bg={colors['blue-button-trans']}>
-                  <Text fz={'h3'} c={colors['white-1']} fw={'bold'}>Informasi Lebih Lanjut</Text>
-                  <Text fz={'h4'} c={colors['white-1']} fw={"bold"}>
-                    Hotline DBD : <Text span fz={'h4'}>(0361) 123456</Text>
+            <Box p="lg">
+              <Stack gap="lg">
+                <Group gap="xs">
+                  <IconCalendar size={18} color={colors['blue-button']} />
+                  <Text c="dimmed" fz="sm">
+                    {new Date(state.findUnique.data.createdAt).toLocaleDateString('id-ID', {
+                      year: 'numeric',
+                      month: 'long',
+                      day: 'numeric',
+                    })}
                   </Text>
-                  <Text fz={'h4'} c={colors['white-1']} fw={"bold"}>
-                    WhatsApp Center : <Text span fz={'h4'}>081234567890</Text>
-                  </Text>
-                  <Text fz={'h4'} c={colors['white-1']} fw={"bold"}>
-                    Email : <Text span fz={'h4'}>
-                      p2p@dinkes.badungkab.go.id</Text>
-                  </Text>
-                </Paper>
-                {/* Referensi */}
-                <Text fz={'h4'} fw={"bold"}>
-                  Referensi
-                </Text>
-                <Divider />
-                <List pb={10} type='ordered'>
-                  <ListItem fz={'h4'}>Kementerian Kesehatan RI. (2024). Pedoman Pencegahan dan Pengendalian DBD.</ListItem>
-                  <ListItem fz={'h4'}>World Health Organization. (2024). Dengue Guidelines for Diagnosis, Treatment, Prevention and Control.</ListItem>
-                  <ListItem fz={'h4'}>Dinas Kesehatan Kabupaten Badung. (2025). Laporan Surveilans DBD Triwulan I 2025.</ListItem>
-                </List>
-                <Group>
-                  <Button fz={'lg'} bg={colors['blue-button']}>
-                    Download Infografis Pencegahan DBD (PDF)
-                  </Button>
-                  <Button fz={'lg'} bg={'green'}>
-                    Bagikan Artikel Ini
-                  </Button>
                 </Group>
+
+                <Stack gap="lg">
+                  <Box>
+                    <Text fz="h4" fw="bold">Pendahuluan</Text>
+                    <Divider my="xs" />
+                    <Text fz="md" lh={1.6} ta="justify">
+                      {state.findUnique.data.introduction?.content}
+                    </Text>
+                  </Box>
+
+                  <Box>
+                    <Text fz="h4" fw="bold">Kenali Gejala DBD</Text>
+                    <Divider my="xs" />
+                    <Text fz="md" fw="semibold">{state.findUnique.data.symptom?.title}</Text>
+                    <Text fz="md" lh={1.6} ta="justify" dangerouslySetInnerHTML={{ __html: state.findUnique.data.symptom?.content }} />
+                  </Box>
+
+                  <Box>
+                    <Text fz="h4" fw="bold">{state.findUnique.data.prevention?.title}</Text>
+                    <Divider my="xs" />
+                    <Text fz="md" lh={1.6} ta="justify" dangerouslySetInnerHTML={{ __html: state.findUnique.data.prevention?.content }} />
+                  </Box>
+
+                  <Box>
+                    <Text fz="h4" fw="bold">{state.findUnique.data.firstaid?.title}</Text>
+                    <Divider my="xs" />
+                    <Text fz="md" lh={1.6} ta="justify" dangerouslySetInnerHTML={{ __html: state.findUnique.data.firstaid?.content }} />
+                  </Box>
+
+                  <Box>
+                    <Text fz="h4" fw="bold">{state.findUnique.data.mythvsfact?.title}</Text>
+                    <Divider my="xs" />
+                    <Box pb="md">
+                      <Table highlightOnHover withTableBorder withColumnBorders striped>
+                        <TableThead>
+                          <TableTr>
+                            <TableTh fz="sm" fw="bold">Mitos</TableTh>
+                            <TableTh fz="sm" fw="bold">Fakta</TableTh>
+                          </TableTr>
+                        </TableThead>
+                        <TableTbody>
+                          {state.findUnique.data?.mythvsfact ? (
+                            <TableTr>
+                              <TableTd>
+                                <Text fz="sm" lh={1.6} dangerouslySetInnerHTML={{ __html: state.findUnique.data.mythvsfact.mitos }} />
+                              </TableTd>
+                              <TableTd>
+                                <Text fz="sm" lh={1.6} dangerouslySetInnerHTML={{ __html: state.findUnique.data.mythvsfact.fakta }} />
+                              </TableTd>
+                            </TableTr>
+                          ) : (
+                            <TableTr>
+                              <TableTd colSpan={2} ta="center" c="dimmed">Belum ada data mitos dan fakta</TableTd>
+                            </TableTr>
+                          )}
+                        </TableTbody>
+                      </Table>
+                    </Box>
+                  </Box>
+
+                  <Box>
+                    <Text fz="h4" fw="bold">Kapan Harus ke Dokter?</Text>
+                    <Divider my="xs" />
+                    <Group gap="xs" mb="xs">
+                      <IconAlertCircle size={18} color="red" />
+                      <Text fz="md">Segera bawa penderita ke fasilitas kesehatan jika mengalami:</Text>
+                    </Group>
+                    <Text fz="md" lh={1.6} dangerouslySetInnerHTML={{ __html: state.findUnique.data.doctorsign.content }} />
+                  </Box>
+
+                  <Box>
+                    <Text fz="h4" fw="bold">Kasus DBD di Wilayah Abiansemal</Text>
+                    <Divider my="xs" />
+
+                    <Paper p="lg" radius="md" bg={colors['blue-button-trans']} withBorder>
+                      <Group gap="xs" mb="sm">
+                        <IconInfoCircle size={20} color={colors['white-1']} />
+                        <Text fz="h4" c={colors['white-1']} fw="bold">Informasi Lebih Lanjut</Text>
+                      </Group>
+                      <Stack gap={4}>
+                        <Text fz="sm" c={colors['white-1']}>Hotline DBD: <b>(0361) 123456</b></Text>
+                        <Text fz="sm" c={colors['white-1']}>WhatsApp Center: <b>081234567890</b></Text>
+                        <Text fz="sm" c={colors['white-1']}>Email: <b>p2p@dinkes.badungkab.go.id</b></Text>
+                      </Stack>
+                    </Paper>
+                  </Box>
+
+                  <Box>
+                    <Text fz="h4" fw="bold">Referensi</Text>
+                    <Divider my="xs" />
+                    <List spacing="xs" size="sm" type="ordered">
+                      <ListItem>Kementerian Kesehatan RI. (2024). Pedoman Pencegahan dan Pengendalian DBD.</ListItem>
+                      <ListItem>World Health Organization. (2024). Dengue Guidelines for Diagnosis, Treatment, Prevention and Control.</ListItem>
+                      <ListItem>Dinas Kesehatan Kabupaten Badung. (2025). Laporan Surveilans DBD Triwulan I 2025.</ListItem>
+                    </List>
+                  </Box>
+                </Stack>
               </Stack>
             </Box>
           </Paper>

src/app/darmasaba/(pages)/kesehatan/data-kesehatan-warga/artikel-kesehatan-page/page.tsx

@@ -1,8 +1,9 @@
 'use client'
 import artikelKesehatanState from '@/app/admin/(dashboard)/_state/kesehatan/data_kesehatan_warga/artikelKesehatan';
 import colors from '@/con/colors';
-import { Anchor, Box, Divider, Image, Paper, Skeleton, Stack, Text } from '@mantine/core';
+import { Anchor, Box, Card, Divider, Group, Image, Loader, Paper, Stack, Text, Title, Tooltip } from '@mantine/core';
 import { useShallowEffect } from '@mantine/hooks';
+import { IconCalendar, IconChevronRight } from '@tabler/icons-react';
 import { useRouter } from 'next/navigation';
 import { useProxy } from 'valtio/utils';
 
@@ -16,36 +17,71 @@ function ArtikelKesehatanPage() {
 
   if(!state.findMany.data){
     return (
-      <Box py={10}>
-        <Skeleton h={500}/>
+      <Box py="xl" ta="center">
+        <Loader size="lg" color={colors['blue-button']} />
+        <Text mt="md" c="dimmed" fz="md">Memuat artikel kesehatan...</Text>
       </Box>
     )
   }
+
+  if(state.findMany.data.length === 0){
+    return (
+      <Box py="xl" ta="center">
+        <Image src="/empty-state.svg" alt="Tidak ada data" w={220} mx="auto" />
+        <Text mt="md" fw="bold" fz="lg">Belum ada artikel kesehatan</Text>
+        <Text c="dimmed" fz="sm">Artikel akan tampil di sini setelah tersedia.</Text>
+      </Box>
+    )
+  }
+
   return (
     <Box>
-      <Paper p={'xl'} h={'112vh'} bg={colors['white-trans-1']}>
-        <Stack gap={'xs'}>
-          <Text ta={'center'} fw={"bold"} fz={'h3'} c={colors['blue-button']}>Artikel Kesehatan</Text>
-          {state.findMany.data.map((item) => (
-            <Box key={item.id}>
-              <Image pt={5} src={'/api/img/dbd.png'} alt="" />
-              <Text fz={'h4'} fw={'bold'} >
-                {item.title}
-              </Text>
-            <Text fz={'h6'} pb={10}>
-              Diposting: {new Date(item.createdAt).toLocaleDateString('id-ID', { year: 'numeric', month: 'long', day: 'numeric' })} | Dinas Kesehatan
-            </Text>
-            <Text fz={'h4'} pb={10} lineClamp={2}>
-              {item.content}
-            </Text>
-            <Anchor c={'black'} onClick={()=> router.push(`/darmasaba/kesehatan/data-kesehatan-warga/artikel-kesehatan-page/${item.id}`)} variant='transparent'>
-              <Text c={colors['blue-button']} fz={'h4'} >
-                Baca Selengkapnya {'>>'}
-              </Text>
-            </Anchor>
-          </Box>
-          ))}
-          <Divider color={colors['blue-button']} px={'xl'} />
+      <Paper p="xl" bg={colors['white-trans-1']} radius="xl" shadow="md">
+        <Stack gap="xl">
+          <Title order={2} ta="center" c={colors['blue-button']}>Artikel Kesehatan</Title>
+          <Divider color={colors['blue-button']} />
+          <Stack gap="lg">
+            {state.findMany.data.map((item) => (
+              <Card 
+                key={item.id} 
+                withBorder 
+                radius="lg" 
+                shadow="sm" 
+                p="lg" 
+                style={{ transition: 'transform 200ms ease' }}
+                onMouseEnter={(e) => (e.currentTarget.style.transform = 'translateY(-4px)')}
+                onMouseLeave={(e) => (e.currentTarget.style.transform = 'translateY(0)')}
+              >
+                <Card.Section>
+                  <Image src={'/api/img/dbd.png'} alt={item.title} height={200} fit="cover" />
+                </Card.Section>
+                <Stack gap="xs" mt="md">
+                  <Text fw="bold" fz="xl" c="dark">{item.title}</Text>
+                  <Group gap="xs">
+                    <IconCalendar size={16} color={colors['blue-button']} />
+                    <Text fz="sm" c="dimmed">
+                      {new Date(item.createdAt).toLocaleDateString('id-ID', { year: 'numeric', month: 'long', day: 'numeric' })} • Dinas Kesehatan
+                    </Text>
+                  </Group>
+                  <Text fz="md" c="dark" lineClamp={3}>
+                    {item.content}
+                  </Text>
+                  <Tooltip label="Baca artikel lengkap">
+                    <Anchor 
+                      onClick={()=> router.push(`/darmasaba/kesehatan/data-kesehatan-warga/artikel-kesehatan-page/${item.id}`)} 
+                      variant="light" 
+                      c={colors['blue-button']}
+                    >
+                      <Group gap="xs">
+                        <Text fw="bold" fz="md">Baca Selengkapnya</Text>
+                        <IconChevronRight size={18} />
+                      </Group>
+                    </Anchor>
+                  </Tooltip>
+                </Stack>
+              </Card>
+            ))}
+          </Stack>
         </Stack>
       </Paper>
     </Box>

src/app/darmasaba/(pages)/kesehatan/data-kesehatan-warga/fasilitas-kesehatan-page/[id]/page.tsx

@@ -1,160 +1,353 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 'use client'
 import fasilitasKesehatanState from '@/app/admin/(dashboard)/_state/kesehatan/data_kesehatan_warga/fasilitasKesehatan';
 import BackButton from '@/app/darmasaba/(pages)/desa/layanan/_com/BackButto';
 import colors from '@/con/colors';
-import { Box, Divider, List, ListItem, Paper, Skeleton, Stack, Table, TableTbody, TableTd, TableTh, TableThead, TableTr, Text } from '@mantine/core';
+import { ActionIcon, Anchor, AspectRatio, Badge, Box, Button, Card, Chip, CopyButton, Divider, Grid, Group, List, ListItem, Paper, Skeleton, Stack, Table, TableTbody, TableTd, TableTh, TableThead, TableTr, Text, ThemeIcon, Title, Tooltip } from '@mantine/core';
 import { useShallowEffect } from '@mantine/hooks';
+import { IconArrowRight, IconBrandWhatsapp, IconCheck, IconCopy, IconDeviceLandlinePhone, IconFileDownload, IconHeart, IconInfoCircle, IconMail, IconMapPin, IconMoodEmpty, IconSearch, IconStethoscope, IconUser, IconUsersGroup, IconWallet } from '@tabler/icons-react';
 import { useParams } from 'next/navigation';
+import { useMemo } from 'react';
 import { useProxy } from 'valtio/utils';
 
+interface Kontak {
+  telepon: string;
+  whatsapp: string;
+  email: string;
+}
+
+interface LayananItem {
+  nama: string;
+  keterangan?: string;
+}
+
+interface LayananUnggulan {
+  items: LayananItem[];
+}
+
+interface Lokasi {
+  mapsEmbed: string;
+}
+
+interface TarifDanLayanan {
+  layanan: string;
+  tarif: string | number;
+  gratisBpjs?: boolean;
+}
+
 function Page() {
-  const state = useProxy(fasilitasKesehatanState.fasilitasKesehatan)
-  const params = useParams()
+  const state = useProxy(fasilitasKesehatanState.fasilitasKesehatan);
+  const params = useParams();
 
   useShallowEffect(() => {
-    state.findUnique.load(params?.id as string)
-  }, [])
+    state.findUnique.load(params?.id as string);
+  }, []);
 
-  if (!state.findUnique.data) {
+  const data = state.findUnique.data as any; // Temporary any to fix type issues
+
+  const nama = data?.name || 'Fasilitas Kesehatan';
+  const alamat = data?.informasiumum?.alamat || '-';
+  const jam = data?.informasiumum?.jamOperasional || '-';
+  const layananUnggulan = (data?.layananunggulan as LayananUnggulan)?.items || [];
+  const tenaga = data?.dokterdantenagamedis || null;
+  const fasilitasPendukungHtml = data?.fasilitaspendukung?.content || '';
+  const tarif = (data?.tarifdanlayanan as TarifDanLayanan) || null;
+  const kontak = (data?.kontak as Kontak) || { 
+    telepon: '(0361) 123456', 
+    whatsapp: '081234567890', 
+    email: 'info@fasilitas-kesehatan.id' 
+  };
+  const lokasi = (data?.lokasi as Lokasi) || { 
+    mapsEmbed: 'https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d3945.272172359321!2d115.21836257533302!3d-8.569807186941553!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x2dd23e9d99b9395f%3A0xb002795fdcb33b30!2sUPTD%20Puskesmas%20Abiansemal%20III!5e0!3m2!1sid!2sid!4v1744792682341!5m2!1sid!2sid'
+  };
+  
+  const gratisBpjs = (data?.tarifdanlayanan as TarifDanLayanan)?.gratisBpjs ?? true;
+
+  const formatRupiah = useMemo(
+    () => (v?: number | string) => {
+      if (v === null || v === undefined || v === '') return '-';
+      const n = typeof v === 'string' ? Number(v) : v;
+      if (Number.isNaN(n as number)) return String(v);
+      return new Intl.NumberFormat('id-ID', { style: 'currency', currency: 'IDR', maximumFractionDigits: 0 }).format(n as number);
+    },
+    []
+  );
+
+  if (state.findUnique.loading || !data) {
     return (
-      <Stack py={10}>
-        <Skeleton h={500} />
+      <Stack bg={colors.Bg} mih="100vh" p="lg" gap="lg">
+        <Box px={{ base: 'md', md: 100 }}>
+          <Skeleton h={32} w={220} />
+        </Box>
+        <Box px={{ base: 'md', md: 100 }}>
+          <Skeleton h={64} radius="lg" />
+        </Box>
+        <Box px={{ base: 'md', md: 100 }}>
+          <Grid gutter="lg">
+            <Grid.Col span={{ base: 12, md: 8 }}>
+              <Skeleton h={320} radius="lg" />
+            </Grid.Col>
+            <Grid.Col span={{ base: 12, md: 4 }}>
+              <Skeleton h={320} radius="lg" />
+            </Grid.Col>
+          </Grid>
+        </Box>
+        <Box px={{ base: 'md', md: 100 }}>
+          <Skeleton h={420} radius="lg" />
+        </Box>
       </Stack>
-    )
+    );
   }
 
   return (
-    <Stack pos={"relative"} bg={colors.Bg} py={"xl"} gap={"22"}>
+    <Stack bg={colors.Bg} py="xl" gap="xl">
       <Box px={{ base: 'md', md: 100 }}>
-        <BackButton />
+        <Group justify="space-between">
+          <Group gap="xs">
+            <BackButton />
+          </Group>
+          <Group gap="xs">
+            <Badge variant="gradient" gradient={{ from: 'blue', to: 'cyan' }} radius="xl" size="lg" leftSection={<IconHeart size={16} />}>Pelayanan Aktif</Badge>
+            <Badge variant="light" radius="xl" size="lg" leftSection={<IconInfoCircle size={16} />}>Jam: {jam}</Badge>
+          </Group>
+        </Group>
       </Box>
-      <Box px={{ base: "md", md: 100 }}>
-        <Stack gap={'lg'}>
-          <Paper radius={10}>
-            <Box style={{ borderTopLeftRadius: 10, borderTopRightRadius: 10 }} bg={colors['blue-button']}>
-              <Text p={'md'} fz={{ base: "h3", md: "h2" }} c={colors['white-1']} fw={"bold"}>
-                Detail Lengkap Fasilitas Kesehatan
-              </Text>
-            </Box>
-            <Box p={'md'} >
-              <Stack gap={'xs'}>
-                {/* Informasi Umum */}
-                <Text fz={'h4'} fw={"bold"}>
-                  Informasi Umum
-                </Text>
-                <Divider />
-                <Text fz={'h4'} fw={"bold"}>
-                  Nama Fasilitas : <Text span fz={'h4'}>{state.findUnique.data?.name}</Text>
-                </Text>
-                <Text fz={'h4'} fw={"bold"}>
-                  Alamat : <Text span fz={'h4'}>{state.findUnique.data?.informasiumum.alamat}</Text>
-                </Text>
-                <Text pb={10} fz={'h4'} fw={"bold"}>
-                  Jam Operasional: : <Text span fz={'h4'}>{state.findUnique.data?.informasiumum.jamOperasional}</Text>
-                </Text>
-                {/* Layanan Unggulan */}
-                <Text fz={'h4'} fw={"bold"}>
-                  Layanan Unggulan
-                </Text>
-                <Divider />
 
-                {/* Tenaga Medis */}
-                <Text fz={'h4'} fw={"bold"}>
-                  Dokter & Tenaga Medis
-                </Text>
+      <Box px={{ base: 'md', md: 100 }}>
+        <Card radius="xl" p="lg" withBorder style={{ backdropFilter: 'blur(6px)' }}>
+          <Stack gap="sm">
+            <Title order={2}>{nama}</Title>
+            <Group gap="md" wrap="wrap">
+              <Group gap="xs">
+                <ThemeIcon variant="light" radius="xl"><IconMapPin size={18} /></ThemeIcon>
+                <Text>{alamat}</Text>
+              </Group>
+              <Group gap="xs">
+                <ThemeIcon variant="light" radius="xl"><IconDeviceLandlinePhone size={18} /></ThemeIcon>
+                <Text>{kontak.telepon}</Text>
+                <CopyButton value={kontak.telepon}>
+                  {({ copied, copy }) => (
+                    <Tooltip label={copied ? 'Disalin' : 'Salin nomor'}>
+                      <ActionIcon variant="subtle" onClick={copy}>{copied ? <IconCheck size={18} /> : <IconCopy size={18} />}</ActionIcon>
+                    </Tooltip>
+                  )}
+                </CopyButton>
+              </Group>
+              <Group gap="xs">
+                <ThemeIcon variant="light" radius="xl"><IconBrandWhatsapp size={18} /></ThemeIcon>
+                <Text>{kontak.whatsapp}</Text>
+                <CopyButton value={kontak.whatsapp}>
+                  {({ copied, copy }) => (
+                    <Tooltip label={copied ? 'Disalin' : 'Salin WhatsApp'}>
+                      <ActionIcon variant="subtle" onClick={copy}>{copied ? <IconCheck size={18} /> : <IconCopy size={18} />}</ActionIcon>
+                    </Tooltip>
+                  )}
+                </CopyButton>
+              </Group>
+              <Group gap="xs">
+                <ThemeIcon variant="light" radius="xl"><IconMail size={18} /></ThemeIcon>
+                <Text>{kontak.email}</Text>
+                <CopyButton value={kontak.email}>
+                  {({ copied, copy }) => (
+                    <Tooltip label={copied ? 'Disalin' : 'Salin email'}>
+                      <ActionIcon variant="subtle" onClick={copy}>{copied ? <IconCheck size={18} /> : <IconCopy size={18} />}</ActionIcon>
+                    </Tooltip>
+                  )}
+                </CopyButton>
+              </Group>
+            </Group>
+            <Group gap="xs" mt="sm" wrap="wrap">
+              <Chip defaultChecked radius="xl" variant="light" icon={<IconStethoscope size={16} />}>Layanan Medis</Chip>
+              <Chip radius="xl" variant="light" icon={<IconUsersGroup size={16} />}>Ramah Keluarga</Chip>
+              <Chip radius="xl" variant="light" icon={<IconWallet size={16} />}>Pembayaran Non-Tunai</Chip>
+            </Group>
+          </Stack>
+        </Card>
+      </Box>
+
+      <Box px={{ base: 'md', md: 100 }}>
+        <Grid gutter="lg">
+          <Grid.Col span={{ base: 12, md: 8 }}>
+            <Card radius="xl" p="lg" withBorder>
+              <Stack gap="md">
+                <Group justify="space-between" align="center">
+                  <Title order={3}>Informasi Umum</Title>
+                  <Badge variant="gradient" gradient={{ from: 'cyan', to: 'blue' }} radius="xl">Terverifikasi</Badge>
+                </Group>
                 <Divider />
-                <Box pb={10}>
-                  <Table highlightOnHover withTableBorder withColumnBorders>
+                <Group gap="xl" align="start">
+                  <Stack gap={2}>
+                    <Text c="dimmed" fz="sm">Nama Fasilitas</Text>
+                    <Text fw={600}>{nama}</Text>
+                  </Stack>
+                  <Stack gap={2}>
+                    <Text c="dimmed" fz="sm">Jam Operasional</Text>
+                    <Text fw={600}>{jam}</Text>
+                  </Stack>
+                </Group>
+                <Divider />
+                <Title order={4}>Layanan Unggulan</Title>
+                {Array.isArray(layananUnggulan) && layananUnggulan.length > 0 ? (
+                  <List spacing="xs" icon={<ThemeIcon variant="light" radius="xl"><IconArrowRight size={16} /></ThemeIcon>}>
+                    {layananUnggulan.map((x: any, idx: number) => (
+                      <ListItem key={idx}>
+                        <Group gap="xs" wrap="wrap">
+                          <Text fw={600}>{x?.nama || 'Layanan'}</Text>
+                          {x?.keterangan && <Badge variant="light" radius="sm">{x.keterangan}</Badge>}
+                        </Group>
+                      </ListItem>
+                    ))}
+                  </List>
+                ) : (
+                  <Paper withBorder radius="md" p="md">
+                    <Group gap="sm">
+                      <IconMoodEmpty />
+                      <Text>Tidak ada layanan unggulan yang tercatat.</Text>
+                    </Group>
+                  </Paper>
+                )}
+                <Divider />
+                <Title order={4}>Peta Lokasi</Title>
+                <AspectRatio ratio={16 / 9}>
+                  <iframe src={lokasi.mapsEmbed} style={{ border: 0, width: '100%', height: '100%', borderRadius: 16 }} loading="lazy" aria-label="Peta Lokasi" />
+                </AspectRatio>
+              </Stack>
+            </Card>
+          </Grid.Col>
+
+          <Grid.Col span={{ base: 12, md: 4 }}>
+            <Stack gap="lg">
+              <Card radius="xl" p="lg" withBorder>
+                <Stack gap="md">
+                  <Title order={4}>Kontak Cepat</Title>
+                  <Group gap="sm" wrap="wrap">
+                    <Button variant="light" leftSection={<IconDeviceLandlinePhone size={18} />} component="a" href={`tel:${kontak.telepon}`} aria-label="Hubungi Telepon">Telepon</Button>
+                    <Button variant="light" leftSection={<IconBrandWhatsapp size={18} />} component="a" href={`https://wa.me/${kontak.whatsapp.replace(/\D/g, '')}`} target="_blank" aria-label="Hubungi WhatsApp">WhatsApp</Button>
+                    <Button variant="light" leftSection={<IconMail size={18} />} component="a" href={`mailto:${kontak.email}`} aria-label="Kirim Email">Email</Button>
+                  </Group>
+                  <Anchor target="_blank" underline="hover">Kunjungi situs resmi</Anchor>
+                </Stack>
+              </Card>
+
+              <Card radius="xl" p="lg" withBorder>
+                <Stack gap="md">
+                  <Title order={4}>Dokter & Tenaga Medis</Title>
+                  <Table highlightOnHover withTableBorder withColumnBorders stickyHeader stickyHeaderOffset={0} aria-label="Tabel Dokter">
                     <TableThead>
                       <TableTr>
-                        <TableTh fz={'h4'}>Nama</TableTh>
-                        <TableTh fz={'h4'}>Spesialisasi</TableTh>
-                        <TableTh fz={'h4'}>Jadwal</TableTh>
+                        <TableTh>Nama</TableTh>
+                        <TableTh>Spesialisasi</TableTh>
+                        <TableTh>Jadwal</TableTh>
                       </TableTr>
                     </TableThead>
                     <TableTbody>
-                      {state.findUnique.data?.dokterdantenagamedis ? (
+                      {tenaga ? (
                         <TableTr>
-                          <TableTd>{state.findUnique.data.dokterdantenagamedis.name}</TableTd>
-                          <TableTd>{state.findUnique.data.dokterdantenagamedis.specialist}</TableTd>
-                          <TableTd>{state.findUnique.data.dokterdantenagamedis.jadwal}</TableTd>
+                          <TableTd><Group gap="xs"><IconUser size={16} /><Text>{tenaga?.name || '-'}</Text></Group></TableTd>
+                          <TableTd>{tenaga?.specialist || '-'}</TableTd>
+                          <TableTd>{tenaga?.jadwal || '-'}</TableTd>
                         </TableTr>
                       ) : (
                         <TableTr>
-                          <TableTd colSpan={3} style={{ textAlign: 'center' }}>Tidak ada data dokter/tenaga medis</TableTd>
+                          <TableTd colSpan={3}>
+                            <Group justify="center" gap="xs" c="dimmed">
+                              <IconSearch size={18} />
+                              <Text>Tidak ada data tenaga medis.</Text>
+                            </Group>
+                          </TableTd>
                         </TableTr>
                       )}
                     </TableTbody>
                   </Table>
-                </Box>
-                {/* Fasilitas Pendukung */}
-                <Text fz={'h4'} fw={"bold"}>
-                  Fasilitas Pendukung
-                </Text>
+                </Stack>
+              </Card>
+            </Stack>
+          </Grid.Col>
+        </Grid>
+      </Box>
+
+      <Box px={{ base: 'md', md: 100 }}>
+        <Grid gutter="lg">
+          <Grid.Col span={{ base: 12, md: 8 }}>
+            <Card radius="xl" p="lg" withBorder>
+              <Stack gap="md">
+                <Title order={3}>Fasilitas Pendukung</Title>
                 <Divider />
-                <Text fz={"lg"} dangerouslySetInnerHTML={{ __html: state.findUnique.data?.fasilitaspendukung?.content }} />
-                {/* Dokter */}
-                <Text fz={'h4'} fw={"bold"}>
-                  Layanan & Tarif
-                </Text>
+                {fasilitasPendukungHtml ? (
+                  <Text fz="md" style={{ lineHeight: 1.7 }} dangerouslySetInnerHTML={{ __html: fasilitasPendukungHtml }} />
+                ) : (
+                  <Paper withBorder radius="md" p="md">
+                    <Group gap="sm">
+                      <IconMoodEmpty />
+                      <Text>Belum ada informasi fasilitas pendukung.</Text>
+                    </Group>
+                  </Paper>
+                )}
+              </Stack>
+            </Card>
+          </Grid.Col>
+          <Grid.Col span={{ base: 12, md: 4 }}>
+            <Card radius="xl" p="lg" withBorder>
+              <Stack gap="md">
+                <Title order={3}>Layanan & Tarif</Title>
                 <Divider />
-                <Table highlightOnHover withTableBorder withColumnBorders>
+                <Table highlightOnHover withTableBorder withColumnBorders aria-label="Tabel Layanan dan Tarif">
                   <TableThead>
                     <TableTr>
-                      <TableTh fz={'h4'}>Layanan</TableTh>
-                      <TableTh fz={'h4'}>Tarif</TableTh>
+                      <TableTh>Layanan</TableTh>
+                      <TableTh>Tarif</TableTh>
                     </TableTr>
                   </TableThead>
                   <TableTbody>
-                    <TableTr>
-                      <TableTd>{state.findUnique?.data?.tarifdanlayanan.layanan}</TableTd>
-                      <TableTd>{state.findUnique?.data?.tarifdanlayanan.tarif}</TableTd>
-                    </TableTr>
+                    {tarif ? (
+                      <TableTr>
+                        <TableTd>{tarif?.layanan || '-'}</TableTd>
+                        <TableTd>{formatRupiah(tarif?.tarif)}</TableTd>
+                      </TableTr>
+                    ) : (
+                      <TableTr>
+                        <TableTd colSpan={2}>
+                          <Group justify="center" gap="xs" c="dimmed">
+                            <IconSearch size={18} />
+                            <Text>Tidak ada data tarif.</Text>
+                          </Group>
+                        </TableTd>
+                      </TableTr>
+                    )}
                   </TableTbody>
                 </Table>
-                <Text fz={'h6'} pb={10} fw={"bold"}>
-                  * Gratis dengan BPJS Kesehatan
-                </Text>
-                {/* Prosedur Pendaftaran */}
-                <Text fz={'h4'} fw={"bold"}>
-                  Prosedur Pendaftaran
-                </Text>
-                <Divider />
-                <List type='ordered' pb={10} >
-                  <ListItem fz={'h4'}>Pendaftaran dibuka pukul 07:30 WITA</ListItem>
-                  <ListItem fz={'h4'}>Bawa KTP dan Kartu BPJS (jika ada)</ListItem>
-                  <ListItem fz={'h4'}>Ambil nomor antrian di loket pendaftaran</ListItem>
-                  <ListItem fz={'h4'}>Pengunjung baru wajib mengisi formulir pendaftaran</ListItem>
-                  <ListItem fz={'h4'}>Pendaftaran online tersedia melalui aplikasi S-Sehat</ListItem>
-                </List>
-                <Paper p={'lg'} bg={colors['blue-button-trans']}>
-                  <Text fz={'h3'} c={colors['white-1']} fw={'bold'}>Kontak Darurat</Text>
-                  <Text fz={'h4'} c={colors['white-1']} fw={"bold"}>
-                    Telepon : <Text span fz={'h4'}>(0361) 123456</Text>
-                  </Text>
-                  <Text fz={'h4'} c={colors['white-1']} fw={"bold"}>
-                    WhatsApp : <Text span fz={'h4'}>081234567890</Text>
-                  </Text>
-                  <Text fz={'h4'} c={colors['white-1']} fw={"bold"}>
-                    Email : <Text span fz={'h4'}>puskesmasabiansemal3@gmail.com</Text>
-                  </Text>
-                </Paper>
-                {/* <Paper p={'lg'} w={{ base: "100%", md: "100%" }}>
-                  <iframe src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d3945.272172359321!2d115.21836257533302!3d-8.569807186941553!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x2dd23e9d99b9395f%3A0xb002795fdcb33b30!2sUPTD%20Puskesmas%20Abiansemal%20III!5e0!3m2!1sid!2sid!4v1744792682341!5m2!1sid!2sid" width="600" height="450" style={{ border: 2, width: "100%", borderRadius: 10 }} loading="lazy"></iframe>
-                </Paper>
+                {gratisBpjs && (
+                  <Group gap="xs">
+                    <ThemeIcon variant="light" radius="xl"><IconCheck size={18} /></ThemeIcon>
+                    <Text fw={600}>Gratis dengan BPJS Kesehatan</Text>
+                  </Group>
+                )}
                 <Group>
-                  <Button fz={'lg'} bg={colors['blue-button']}>
-                    Download Brosur Layanan (PDF)
-                  </Button>
-                </Group> */}
+                  <Button variant="gradient" gradient={{ from: 'blue', to: 'cyan' }} leftSection={<IconFileDownload size={18} />}>Unduh Brosur (PDF)</Button>
+                </Group>
               </Stack>
-            </Box>
-          </Paper>
-        </Stack>
+            </Card>
+          </Grid.Col>
+        </Grid>
+      </Box>
+
+      <Box px={{ base: 'md', md: 100 }} pb="xl">
+        <Paper radius="xl" p="lg" withBorder>
+          <Stack gap="md">
+            <Title order={3}>Prosedur Pendaftaran</Title>
+            <Divider />
+            <List type="ordered" spacing="xs" icon={<ThemeIcon variant="light" radius="xl"><IconArrowRight size={16} /></ThemeIcon>}>
+              <ListItem>Pendaftaran dibuka pukul 07.30 WITA</ListItem>
+              <ListItem>Bawa KTP dan Kartu BPJS (jika ada)</ListItem>
+              <ListItem>Ambil nomor antrian di loket pendaftaran</ListItem>
+              <ListItem>Pengunjung baru mengisi formulir pendaftaran</ListItem>
+              <ListItem>Pendaftaran online tersedia melalui aplikasi S-Sehat</ListItem>
+            </List>
+          </Stack>
+        </Paper>
       </Box>
     </Stack>
   );
 }
 
-
 export default Page;

src/app/darmasaba/(pages)/kesehatan/data-kesehatan-warga/fasilitas-kesehatan-page/page.tsx

@@ -1,50 +1,100 @@
 'use client'
 import fasilitasKesehatanState from '@/app/admin/(dashboard)/_state/kesehatan/data_kesehatan_warga/fasilitasKesehatan';
 import colors from '@/con/colors';
-import { Anchor, Box, Divider, Paper, Skeleton, Stack, Text } from '@mantine/core';
+import { Anchor, Badge, Box, Card, Divider, Group, Paper, Skeleton, Stack, Text } from '@mantine/core';
 import { useShallowEffect } from '@mantine/hooks';
 import { useRouter } from 'next/navigation';
 import { useProxy } from 'valtio/utils';
+import { IconMapPin, IconClock, IconArrowRight } from '@tabler/icons-react';
 
 function FasilitasKesehatanPage() {
-  const state = useProxy(fasilitasKesehatanState.fasilitasKesehatan)
+  const state = useProxy(fasilitasKesehatanState.fasilitasKesehatan);
   const router = useRouter();
 
   useShallowEffect(() => {
-    state.findMany.load()
-  }, [])
+    state.findMany.load();
+  }, []);
 
-  if(!state.findMany.data){
+  if (!state.findMany.data) {
     return (
-      <Box py={10}>
-        <Skeleton h={500} />
+      <Box py="xl" px="md">
+        <Stack gap="md">
+          <Skeleton height={80} radius="lg" />
+          <Skeleton height={80} radius="lg" />
+          <Skeleton height={80} radius="lg" />
+        </Stack>
       </Box>
-    )
+    );
   }
+
   return (
     <Box>
-      <Paper p={'xl'} h={'112vh'} bg={colors['white-trans-1']}>
-        <Stack gap={'xs'}>
-          <Text ta={'center'} fw={"bold"} fz={'h3'} c={colors['blue-button']}>Fasilitas Kesehatan</Text>
-          {state.findMany.data.map((item) => (
-            <Box key={item.id}>
-              <Text fz={'h4'} fw={'bold'} c={colors['blue-button']}>
-                {item.name}
-              </Text>
-              <Text fz={'h4'}>
-                {item.informasiumum.alamat}
-              </Text>
-              <Text fz={'h4'}>
-                {item.informasiumum.jamOperasional}
-              </Text>
-              <Anchor onClick={() => router.push(`/darmasaba/kesehatan/data-kesehatan-warga/fasilitas-kesehatan-page/${item.id}`)} c={colors['blue-button']} variant='transparent'>
-                <Text c={colors['blue-button']} fz={'h4'}>
-                  Detail {'>>'}
-                </Text>
-              </Anchor>
-            </Box>
-          ))}
-          <Divider color={colors['blue-button']} px={'xl'} />
+      <Paper p="xl" radius="xl" shadow="md" h="100%" bg="white">
+        <Stack gap="lg">
+          <Text ta="center" fw={700} fz="32px" c={colors['blue-button']}>
+            Fasilitas Kesehatan
+          </Text>
+          <Divider size="sm" color={colors['blue-button']} />
+          <Stack gap="lg">
+            {state.findMany.data.map((item) => (
+              <Card
+                key={item.id}
+                withBorder
+                radius="xl"
+                shadow="sm"
+                p="lg"
+                style={{
+                  background: 'linear-gradient(135deg, #fdfdfd, #f7faff)',
+                  transition: 'transform 0.2s ease, box-shadow 0.2s ease',
+                }}
+                onMouseEnter={(e) => {
+                  (e.currentTarget as HTMLElement).style.transform = 'translateY(-4px)';
+                  (e.currentTarget as HTMLElement).style.boxShadow = '0 8px 20px rgba(0,0,0,0.08)';
+                }}
+                onMouseLeave={(e) => {
+                  (e.currentTarget as HTMLElement).style.transform = 'translateY(0px)';
+                  (e.currentTarget as HTMLElement).style.boxShadow = '0 4px 12px rgba(0,0,0,0.05)';
+                }}
+              >
+                <Stack gap="sm">
+                  <Group justify="space-between" align="center">
+                    <Text fw={700} fz="lg" c={colors['blue-button']}>
+                      {item.name}
+                    </Text>
+                    <Badge color="blue" radius="sm" variant="light" fz="xs">
+                      Aktif
+                    </Badge>
+                  </Group>
+                  <Group gap="xs">
+                    <IconMapPin size={18} stroke={1.5} color={colors['blue-button']} />
+                    <Text fz="sm" c="dimmed">
+                      {item.informasiumum.alamat}
+                    </Text>
+                  </Group>
+                  <Group gap="xs">
+                    <IconClock size={18} stroke={1.5} color={colors['blue-button']} />
+                    <Text fz="sm" c="dimmed">
+                      {item.informasiumum.jamOperasional}
+                    </Text>
+                  </Group>
+                  <Anchor
+                    onClick={() =>
+                      router.push(
+                        `/darmasaba/kesehatan/data-kesehatan-warga/fasilitas-kesehatan-page/${item.id}`
+                      )
+                    }
+                    c={colors['blue-button']}
+                    fz="sm"
+                    fw={600}
+                    style={{ display: 'inline-flex', alignItems: 'center', gap: '4px' }}
+                  >
+                    Lihat Detail
+                    <IconArrowRight size={16} stroke={1.5} />
+                  </Anchor>
+                </Stack>
+              </Card>
+            ))}
+          </Stack>
         </Stack>
       </Paper>
     </Box>

src/app/darmasaba/(pages)/kesehatan/data-kesehatan-warga/jadwal-kegiatan-page/[id]/page.tsx

@@ -2,10 +2,30 @@
 import jadwalkegiatanState from '@/app/admin/(dashboard)/_state/kesehatan/data_kesehatan_warga/jadwalKegiatan';
 import BackButton from '@/app/darmasaba/(pages)/desa/layanan/_com/BackButto';
 import colors from '@/con/colors';
-import { ActionIcon, Box, Button, CheckIcon, Combobox, ComboboxChevron, ComboboxOption, ComboboxOptions, ComboboxTarget, Divider, Group, InputBase, InputPlaceholder, Paper, Skeleton, Stack, Text, Textarea, TextInput, useCombobox } from '@mantine/core';
+import {
+  ActionIcon,
+  Box,
+  Button,
+  Combobox,
+  ComboboxChevron,
+  ComboboxOption,
+  ComboboxOptions,
+  ComboboxTarget,
+  Divider,
+  Group,
+  InputBase,
+  InputPlaceholder,
+  Paper,
+  Skeleton,
+  Stack,
+  Text,
+  Textarea,
+  TextInput,
+  useCombobox
+} from '@mantine/core';
 import { DateInput } from '@mantine/dates';
 import { useShallowEffect } from '@mantine/hooks';
-import { IconCalendar } from '@tabler/icons-react';
+import { IconCalendar, IconDownload, IconPhone, IconMail, IconUser } from '@tabler/icons-react';
 import { useParams } from 'next/navigation';
 import { useState } from 'react';
 import { useProxy } from 'valtio/utils';
@@ -17,6 +37,7 @@ const layanan = [
   'Konsultasi Gizi',
   'Pemeriksaan Kesehatan'
 ];
+
 function Page() {
   const combobox = useCombobox({
     onDropdownClose: () => combobox.resetSelectedOption(),
@@ -30,192 +51,160 @@ function Page() {
   });
 
   const [value, setValue] = useState<string | null>('');
+  const [dateInputOpened, setDateInputOpened] = useState(false);
+  const params = useParams();
+  const state = useProxy(jadwalkegiatanState);
+
+  useShallowEffect(() => {
+    state.findUnique.load(params?.id as string);
+  }, []);
 
   const options = layanan.map((item) => (
     <ComboboxOption value={item} key={item} active={item === value}>
       <Group gap="xs">
-        {item === value && <CheckIcon size={12} />}
+        {item === value && <IconUser size={14} stroke={2} />}
         <span>{item}</span>
       </Group>
     </ComboboxOption>
   ));
-  const [dateInputOpened, setDateInputOpened] = useState(false);
 
   const pickerControl = (
-    <ActionIcon onClick={() => setDateInputOpened(true)} variant="subtle" color="gray">
+    <ActionIcon onClick={() => setDateInputOpened(true)} variant="light" color="blue">
       <IconCalendar size={18} />
     </ActionIcon>
   );
 
-
-  const params = useParams()
-  const state = useProxy(jadwalkegiatanState)
-  useShallowEffect(() => {
-    state.findUnique.load(params?.id as string)
-  }, [])
-
   if (!state.findUnique.data) {
     return (
-      <Stack py={10}>
-        <Skeleton h={500} />
+      <Stack py="xl" px="lg">
+        <Skeleton h={500} radius="lg" />
       </Stack>
-    )
+    );
   }
+
   return (
-    <Stack pos={"relative"} bg={colors.Bg} py={"xl"} gap={"22"}>
+    <Stack pos="relative" bg={colors.Bg} py="xl" gap="lg">
       <Box px={{ base: 'md', md: 100 }}>
         <BackButton />
       </Box>
       <Box px={{ base: "md", md: 100 }}>
-        <Stack gap={'lg'}>
-          <Paper radius={10}>
-            <Box style={{ borderTopLeftRadius: 10, borderTopRightRadius: 10 }} bg={colors['blue-button']}>
-              <Text p={'md'} fz={{ base: "h3", md: "h2" }} c={colors['white-1']} fw={"bold"}>
+        <Stack gap="lg">
+          <Paper radius="xl" shadow="md">
+            <Box
+              style={{ borderTopLeftRadius: 16, borderTopRightRadius: 16 }}
+              bg={colors['blue-button']}
+            >
+              <Text p="md" fz={{ base: "h3", md: "h2" }} c={colors['white-1']} fw="bold">
                 Detail & Pendaftaran Kegiatan
               </Text>
             </Box>
-            <Box p={'md'} >
-              <Stack gap={'xs'}>
-                {/* Informasi Kegiatan */}
-                <Text fz={'h4'} fw={"bold"}>
-                  Informasi Kegiatan
-                </Text>
-                <Divider />
-                <Text fz={'h4'} fw={"bold"}>
-                  Nama Kegiatan : <Text span fz={'h4'}>{state.findUnique.data.informasijadwalkegiatan.name}</Text>
-                </Text>
-                <Text fz={'h4'} fw={"bold"}>
-                  Tanggal : <Text span fz={'h4'}>{state.findUnique.data.informasijadwalkegiatan.tanggal}</Text>
-                </Text>
-                <Text fz={'h4'} fw={"bold"}>
-                  Waktu : <Text span fz={'h4'}>{state.findUnique.data.informasijadwalkegiatan.waktu}</Text>
-                </Text>
-                <Text pb={10} fz={'h4'} fw={"bold"}>
-                  Lokasi : <Text span fz={'h4'}>{state.findUnique.data.informasijadwalkegiatan.lokasi}</Text>
-                </Text>
-                {/* Deskripsi Kegiatan */}
-                <Text fz={'h4'} fw={"bold"}>
-                  Deskripsi Kegiatan
-                </Text>
-                <Divider />
-                <Text pb={10} ta={'justify'} fz={'h4'} dangerouslySetInnerHTML={{ __html: state.findUnique.data.deskripsijadwalkegiatan.deskripsi }} />
-                {/* Layanan Yang Tersedia */}
-                <Text fz={'h4'} fw={"bold"}>
-                  Layanan Yang Tersedia
-                </Text>
-                <Divider />
-                <Text pb={10} ta={'justify'} fz={'h4'} dangerouslySetInnerHTML={{ __html: state.findUnique.data.layananjadwalkegiatan.content }} />
-                {/* Syarat dan Ketentuan */}
-                <Text fz={'h4'} fw={"bold"}>
-                  Syarat dan Ketentuan
-                </Text>
-                <Divider />
-                <Text pb={10} ta={'justify'} fz={'h4'} dangerouslySetInnerHTML={{ __html: state.findUnique.data.syaratketentuanjadwalkegiatan.content }} />
-                {/* Dokumen yang Perlu Dibawa */}
-                <Text fz={'h4'} fw={"bold"}>
-                  Dokumen yang Perlu Dibawa
-                </Text>
-                <Divider />
-                <Text pb={10} ta={'justify'} fz={'h4'} dangerouslySetInnerHTML={{ __html: state.findUnique.data.dokumenjadwalkegiatan.content }} />
-                {/* Pendaftaran */}
-                <Text fz={'h4'} fw={"bold"}>
-                  Pendaftaran
-                </Text>
-                <Divider />
-                <Stack gap={'xs'} pb={20}>
-                  <TextInput
-                    styles={{ label: { fontSize: '16px', fontWeight: 'bold' }, }}
-                    w={{ base: '100%', md: '85%', lg: '75%', xl: '50%' }}
-                    label="Nama Balita"
-                    placeholder='Masukkan nama balita'
-                  />
-                  <DateInput
-                    styles={{ label: { fontSize: '16px', fontWeight: 'bold' }, }}
-                    placeholder='dd/mm/yyyy'
-                    w={{ base: '100%', md: '85%', lg: '75%', xl: '50%' }}
-                    label="Tanggal Lahir"
-                    popoverProps={{ opened: dateInputOpened, onChange: setDateInputOpened }}
-                    rightSection={pickerControl}
-                  />
-                  <TextInput
-                    styles={{ label: { fontSize: '16px', fontWeight: 'bold' }, }}
-                    w={{ base: '100%', md: '85%', lg: '75%', xl: '50%' }}
-                    label="Nama Orang Tua / Wali"
-                    placeholder='Masukkan nama orang tua / wali'
-                  />
-                  <TextInput
-                    styles={{ label: { fontSize: '16px', fontWeight: 'bold' }, }}
-                    w={{ base: '100%', md: '85%', lg: '75%', xl: '50%' }}
-                    label="No. Telepon"
-                    placeholder='Masukkan no. telepon'
-                  />
-                  <TextInput
-                    styles={{ label: { fontSize: '16px', fontWeight: 'bold' }, }}
-                    w={{ base: '100%', md: '85%', lg: '75%', xl: '50%' }}
-                    label="Alamat"
-                    placeholder='Masukkan alamat lengkap'
-                  />
-                  {/* Layanan */}
-                  <Text fz={'16px'} fw={"bold"}>
-                    Layananan Yang Dibutuhkan
-                  </Text>
-                  <Box
-                    w={{ base: '100%', md: '85%', lg: '75%', xl: '50%' }}
-                  >
-                    <Combobox
-                      store={combobox}
-                      resetSelectionOnOptionHover
-                      withinPortal={false}
-                      onOptionSubmit={(val) => {
-                        setValue(val);
-                        combobox.updateSelectedOptionIndex('active');
-                      }}
-                    >
-                      <ComboboxTarget targetType="button">
-                        <InputBase
-                          component="button"
-                          type="button"
-                          pointer
-                          rightSection={<ComboboxChevron />}
-                          rightSectionPointerEvents="none"
-                          onClick={() => combobox.toggleDropdown()}
-                        >
-                          {value || <InputPlaceholder>Layanan</InputPlaceholder>}
-                        </InputBase>
-                      </ComboboxTarget>
-
-                      <Combobox.Dropdown>
-                        <ComboboxOptions>{options}</ComboboxOptions>
-                      </Combobox.Dropdown>
-                    </Combobox>
-                  </Box>
-                  <Textarea
-                    pb={10}
-                    styles={{ label: { fontSize: '16px', fontWeight: 'bold' }, }} w={{ base: '100%', md: '85%', lg: '75%', xl: '50%' }}
-                    label="Catatan Khusus (Opsional)"
-                    placeholder='Masukkan catatan jika ada'
-                  />
-                  <Button
-                    w={{ base: '100%', md: '85%', lg: '75%', xl: '50%' }}
-                    fz={'md'} bg={colors['blue-button']}>
-                    Daftar Sekarang
-                  </Button>
+            <Box p="lg">
+              <Stack gap="xl">
+                <Stack gap="sm">
+                  <Text fz="lg" fw="bold">Informasi Kegiatan</Text>
+                  <Divider />
+                  <Text fz="md" fw="bold">Nama Kegiatan: <Text span>{state.findUnique.data.informasijadwalkegiatan.name}</Text></Text>
+                  <Text fz="md" fw="bold">Tanggal: <Text span>{state.findUnique.data.informasijadwalkegiatan.tanggal}</Text></Text>
+                  <Text fz="md" fw="bold">Waktu: <Text span>{state.findUnique.data.informasijadwalkegiatan.waktu}</Text></Text>
+                  <Text fz="md" fw="bold">Lokasi: <Text span>{state.findUnique.data.informasijadwalkegiatan.lokasi}</Text></Text>
                 </Stack>
-                <Paper p={'lg'} bg={colors['blue-button-trans']}>
-                  <Text fz={'h3'} c={colors['white-1']} fw={'bold'}>Informasi Kontak</Text>
-                  <Text fz={'h4'} c={colors['white-1']} fw={"bold"}>
-                    Penanggung Jawab : <Text span fz={'h4'}>Bidan Komang Ayu</Text>
-                  </Text>
-                  <Text fz={'h4'} c={colors['white-1']} fw={"bold"}>
-                    Telepon : <Text span fz={'h4'}>081234567890</Text>
-                  </Text>
-                  <Text fz={'h4'} c={colors['white-1']} fw={"bold"}>
-                    Email : <Text span fz={'h4'}>puskesmasabiansemal3@gmail.com</Text>
-                  </Text>
+
+                <Stack gap="sm">
+                  <Text fz="lg" fw="bold">Deskripsi Kegiatan</Text>
+                  <Divider />
+                  <Text ta="justify" fz="md" dangerouslySetInnerHTML={{ __html: state.findUnique.data.deskripsijadwalkegiatan.deskripsi }} />
+                </Stack>
+
+                <Stack gap="sm">
+                  <Text fz="lg" fw="bold">Layanan yang Tersedia</Text>
+                  <Divider />
+                  <Text ta="justify" fz="md" dangerouslySetInnerHTML={{ __html: state.findUnique.data.layananjadwalkegiatan.content }} />
+                </Stack>
+
+                <Stack gap="sm">
+                  <Text fz="lg" fw="bold">Syarat & Ketentuan</Text>
+                  <Divider />
+                  <Text ta="justify" fz="md" dangerouslySetInnerHTML={{ __html: state.findUnique.data.syaratketentuanjadwalkegiatan.content }} />
+                </Stack>
+
+                <Stack gap="sm">
+                  <Text fz="lg" fw="bold">Dokumen yang Perlu Dibawa</Text>
+                  <Divider />
+                  <Text ta="justify" fz="md" dangerouslySetInnerHTML={{ __html: state.findUnique.data.dokumenjadwalkegiatan.content }} />
+                </Stack>
+
+                <Stack gap="sm">
+                  <Text fz="lg" fw="bold">Formulir Pendaftaran</Text>
+                  <Divider />
+                  <Stack gap="md">
+                    <TextInput label="Nama Balita" placeholder="Masukkan nama balita" size="md" />
+                    <DateInput
+                      label="Tanggal Lahir"
+                      placeholder="dd/mm/yyyy"
+                      size="md"
+                      w={{ base: '100%', md: '85%', lg: '75%', xl: '50%' }}
+                      popoverProps={{ opened: dateInputOpened, onChange: setDateInputOpened }}
+                      rightSection={pickerControl}
+                    />
+                    <TextInput label="Nama Orang Tua / Wali" placeholder="Masukkan nama orang tua / wali" size="md" />
+                    <TextInput label="Nomor Telepon" placeholder="Masukkan nomor telepon" size="md" />
+                    <TextInput label="Alamat" placeholder="Masukkan alamat lengkap" size="md" />
+                    <Box w={{ base: '100%', md: '85%', lg: '75%', xl: '50%' }}>
+                      <Text fz="sm" fw="bold" pb={4}>Pilih Layanan</Text>
+                      <Combobox
+                        store={combobox}
+                        resetSelectionOnOptionHover
+                        withinPortal={false}
+                        onOptionSubmit={(val) => {
+                          setValue(val);
+                          combobox.updateSelectedOptionIndex('active');
+                        }}
+                      >
+                        <ComboboxTarget targetType="button">
+                          <InputBase
+                            component="button"
+                            type="button"
+                            pointer
+                            rightSection={<ComboboxChevron />}
+                            rightSectionPointerEvents="none"
+                            onClick={() => combobox.toggleDropdown()}
+                          >
+                            {value || <InputPlaceholder>Pilih layanan</InputPlaceholder>}
+                          </InputBase>
+                        </ComboboxTarget>
+                        <Combobox.Dropdown>
+                          <ComboboxOptions>{options}</ComboboxOptions>
+                        </Combobox.Dropdown>
+                      </Combobox>
+                    </Box>
+                    <Textarea label="Catatan Khusus (Opsional)" placeholder="Masukkan catatan jika ada" size="md" />
+                    <Button size="md" radius="lg" bg={colors['blue-button']}>
+                      Daftar Sekarang
+                    </Button>
+                  </Stack>
+                </Stack>
+
+                <Paper p="lg" radius="md" bg={colors['blue-button-trans']} shadow="sm">
+                  <Stack gap="xs">
+                    <Text fz="lg" c={colors['white-1']} fw="bold">Informasi Kontak</Text>
+                    <Group gap="xs">
+                      <IconUser size={18} color="white" />
+                      <Text fz="md" c={colors['white-1']}>Penanggung Jawab: <Text span fw="bold">Bidan Komang Ayu</Text></Text>
+                    </Group>
+                    <Group gap="xs">
+                      <IconPhone size={18} color="white" />
+                      <Text fz="md" c={colors['white-1']}>081234567890</Text>
+                    </Group>
+                    <Group gap="xs">
+                      <IconMail size={18} color="white" />
+                      <Text fz="md" c={colors['white-1']}>puskesmasabiansemal3@gmail.com</Text>
+                    </Group>
+                  </Stack>
                 </Paper>
+
                 <Group>
-                  <Button fz={'lg'} bg={'green'}>
-                    Download Jadwal Posyandu 2025 (PDF)
+                  <Button size="md" radius="lg" leftSection={<IconDownload size={18} />} color="green">
+                    Unduh Jadwal Posyandu 2025 (PDF)
                   </Button>
                 </Group>
               </Stack>
@@ -227,5 +216,4 @@ function Page() {
   );
 }
 
-
 export default Page;

src/app/darmasaba/(pages)/kesehatan/data-kesehatan-warga/jadwal-kegiatan-page/page.tsx

@@ -1,53 +1,101 @@
 'use client'
 import jadwalkegiatanState from '@/app/admin/(dashboard)/_state/kesehatan/data_kesehatan_warga/jadwalKegiatan';
 import colors from '@/con/colors';
-import { Anchor, Box, Divider, Paper, Skeleton, Stack, Text } from '@mantine/core';
+import { Box, Button, Card, Divider, Group, Paper, Skeleton, Stack, Text } from '@mantine/core';
 import { useShallowEffect } from '@mantine/hooks';
+import { IconChevronRight, IconClockHour4, IconMapPin } from '@tabler/icons-react';
 import { useRouter } from 'next/navigation';
 import { useProxy } from 'valtio/utils';
 
 function JadwalKegiatanPage() {
-  const state = useProxy(jadwalkegiatanState)
+  const state = useProxy(jadwalkegiatanState);
   const router = useRouter();
 
-  useShallowEffect(()=> {
-    state.findMany.load()
-  }, [])
+  useShallowEffect(() => {
+    state.findMany.load();
+  }, []);
 
-  if(!state.findMany.data){
+  if (!state.findMany.data) {
     return (
-      <Box py={10}>
-        <Skeleton h={500} />
+      <Box py="lg">
+        <Skeleton h={500} radius="lg" />
       </Box>
-    )
+    );
   }
+
   return (
     <Box>
-      <Paper p={'xl'} h={'112vh'} bg={colors['white-trans-1']}>
-        <Stack gap={'xs'}>
-          <Text ta={'center'} fw={"bold"} fz={'h3'} c={colors['blue-button']}>Jadwal Kegiatan</Text>
-          {state.findMany.data.map((item) => (
-            <Box key={item.id}>
-              <Text fz={'h4'} fw={'bold'}>
-                {item.informasijadwalkegiatan.name}
+      <Paper p="xl" bg={colors['white-trans-1']} radius="xl" shadow="md" h="auto" mih="100vh">
+        <Stack gap="lg">
+          <Text ta="center" fw={700} fz="32px" c={colors['blue-button']}>
+            Jadwal Kegiatan Warga
+          </Text>
+
+          {state.findMany.data.length === 0 ? (
+            <Box py="xl" ta="center">
+              <Text fz="lg" c="dimmed">
+                Belum ada jadwal kegiatan yang tersedia
               </Text>
-              <Text fz={'h4'}>
-                {item.informasijadwalkegiatan.waktu}
-              </Text>
-              <Text fz={'h4'}>
-                {item.informasijadwalkegiatan.lokasi}
-              </Text>
-              <Text fz={'h6'} fw={'bold'} c={colors['blue-button']}>
-                {item.informasijadwalkegiatan.tanggal}
-              </Text>
-              <Anchor onClick={()=> router.push(`/darmasaba/kesehatan/data-kesehatan-warga/jadwal-kegiatan-page/${item.id}`)} c={colors['blue-button']} variant='transparent'>
-                <Text c={colors['blue-button']} fz={'h4'} >
-                  Detail & Pendaftaran
-                </Text>
-              </Anchor>
             </Box>
-          ))}
-          <Divider color={colors['blue-button']} px={'xl'} />
+          ) : (
+            state.findMany.data.map((item) => (
+              <Card
+                key={item.id}
+                withBorder
+                radius="xl"
+                shadow="sm"
+                p="lg"
+                style={{ backdropFilter: 'blur(8px)' }}
+              >
+                <Stack gap="sm">
+                  <Group justify="space-between">
+                    <Text fw={700} fz="xl">
+                      {item.informasijadwalkegiatan.name}
+                    </Text>
+                    <Text fw={600} fz="sm" c={colors['blue-button']}>
+                      {item.informasijadwalkegiatan.tanggal}
+                    </Text>
+                  </Group>
+
+                  <Group gap="xs">
+                    <IconClockHour4 size={18} color={colors['blue-button']} />
+                    <Text fz="sm">{item.informasijadwalkegiatan.waktu}</Text>
+                  </Group>
+
+                  <Group gap="xs">
+                    <IconMapPin size={18} color={colors['blue-button']} />
+                    <Text fz="sm">{item.informasijadwalkegiatan.lokasi}</Text>
+                  </Group>
+
+                  <Divider my="sm" />
+
+                  <Group justify="flex-end">
+                    <Button
+                      variant="light"
+                      radius="lg"
+                      size="sm"
+                      rightSection={<IconChevronRight size={18} />}
+                      onClick={() =>
+                        router.push(
+                          `/darmasaba/kesehatan/data-kesehatan-warga/jadwal-kegiatan-page/${item.id}`
+                        )
+                      }
+                      styles={{
+                        root: {
+                          background: colors['blue-button'],
+                          color: 'white',
+                          boxShadow: '0 0 12px rgba(0, 123, 255, 0.4)',
+                          transition: 'all 0.2s ease',
+                        },
+                      }}
+                    >
+                      Lihat Detail & Daftar
+                    </Button>
+                  </Group>
+                </Stack>
+              </Card>
+            ))
+          )}
         </Stack>
       </Paper>
     </Box>

src/app/darmasaba/(pages)/kesehatan/info-wabah-penyakit/page.tsx

@@ -1,100 +1,169 @@
 'use client'
 import infoWabahPenyakit from '@/app/admin/(dashboard)/_state/kesehatan/info-wabah-penyakit/infoWabahPenyakit';
 import colors from '@/con/colors';
-import { Box, Center, Grid, GridCol, Image, Pagination, Paper, SimpleGrid, Skeleton, Stack, Text, TextInput } from '@mantine/core';
+import {
+  Box,
+  Center,
+  Grid,
+  GridCol,
+  Image,
+  Pagination,
+  Paper,
+  SimpleGrid,
+  Skeleton,
+  Stack,
+  Text,
+  TextInput,
+  Badge,
+  HoverCard,
+  Divider,
+  Group,
+} from '@mantine/core';
 import { useShallowEffect } from '@mantine/hooks';
-import { IconSearch } from '@tabler/icons-react';
+import { IconSearch, IconInfoCircle } from '@tabler/icons-react';
 import { useState } from 'react';
 import { useProxy } from 'valtio/utils';
 import BackButton from '../../desa/layanan/_com/BackButto';
 
 function Page() {
-  const state = useProxy(infoWabahPenyakit)
-  const [search, setSearch] = useState('')
+  const state = useProxy(infoWabahPenyakit);
+  const [search, setSearch] = useState('');
 
-  const {
-    data,
-    page,
-    totalPages,
-    loading,
-    load,
-  } = state.findMany;
+  const { data, page, totalPages, loading, load } = state.findMany;
 
   useShallowEffect(() => {
-    load(page, 3, search)
-  }, [page, search])
+    load(page, 6, search);
+  }, [page, search]);
 
   if (loading || !data) {
     return (
-      <Box py={10}>
-        <Skeleton h={500} />
+      <Box py="xl" px={{ base: 'md', md: 100 }}>
+        <Skeleton h={500} radius="lg" />
       </Box>
-    )
+    );
   }
+
   return (
-    <Stack pos={"relative"} bg={colors.Bg} py={"xl"} gap={"22"}>
+    <Stack pos="relative" bg={colors.Bg} py="xl" gap="lg">
       <Box px={{ base: 'md', md: 100 }}>
         <BackButton />
       </Box>
-      <Grid align='center' px={{ base: 'md', md: 100 }}>
-        <GridCol span={{ base: 12, md: 9 }}>
-          <Text fz={{ base: "h1", md: "2.5rem" }} c={colors["blue-button"]} fw={"bold"}>
-            Info Wabah / Penyakit
+
+      <Grid align="center" px={{ base: 'md', md: 100 }}>
+        <GridCol span={{ base: 12, md: 8 }}>
+          <Text
+            fz={{ base: '1.8rem', md: '2.8rem' }}
+            c={colors['blue-button']}
+            fw="bold"
+            lh={1.2}
+          >
+            Informasi Wabah & Penyakit
+          </Text>
+          <Text fz="md" c="dimmed" mt={4}>
+            Dapatkan informasi terbaru mengenai wabah dan penyakit yang sedang
+            diawasi.
           </Text>
         </GridCol>
-        <GridCol span={{ base: 12, md: 3 }}>
+        <GridCol span={{ base: 12, md: 4 }}>
           <TextInput
-            radius={"lg"}
-            placeholder='Cari Info Wabah / Penyakit'
+            radius="xl"
+            placeholder="Cari nama penyakit atau wabah..."
             value={search}
             onChange={(e) => setSearch(e.target.value)}
             leftSection={<IconSearch size={20} />}
-            w={{ base: "50%", md: "100%" }}
+            w="100%"
+            size="md"
           />
         </GridCol>
       </Grid>
-      <Box px={{ base: "md", md: 100 }}>
-        <Stack gap={'lg'}>
-          <SimpleGrid
-            cols={{
-              base: 1,
-              md: 3,
-            }}
-          >
-            {data.map((v, k) => {
-              return (
-                <Paper key={k} p={'xl'} bg={colors['white-trans-1']}>
-                  <Stack gap={'xs'}>
-                    <Box>
-                      <Text fw={"bold"} fz={'h3'} c={colors['blue-button']}>{v.name}</Text>
-                      <Image w={330} h={200} fit='contain' pt={5} src={v.image.link} alt={v.name} />
-                      <Text fz={'h4'} fw={'bold'} >
-                        {v.name}
+
+      <Box px={{ base: 'md', md: 100 }}>
+        {data.length === 0 ? (
+          <Center py="6xl">
+            <Stack align="center" gap="sm">
+              <IconInfoCircle size={50} color={colors['blue-button']} />
+              <Text fz="lg" fw={500} c="dimmed">
+                Tidak ada data yang cocok dengan pencarian Anda.
+              </Text>
+            </Stack>
+          </Center>
+        ) : (
+          <SimpleGrid cols={{ base: 1, sm: 2, md: 3 }} spacing="lg">
+            {data.map((v, k) => (
+              <Paper
+                key={k}
+                radius="lg"
+                shadow="md"
+                p="lg"
+                withBorder
+                bg={colors['white-trans-1']}
+                style={{
+                  transition: 'transform 200ms ease, box-shadow 200ms ease',
+                }}
+              >
+                <Stack gap="sm">
+                  <Image
+                    radius="md"
+                    h={180}
+                    src={v.image.link}
+                    alt={v.name}
+                    fit="cover"
+                  />
+                  <Group justify="space-between" mt="sm">
+                    <Text fw={700} fz="lg" c={colors['blue-button']}>
+                      {v.name}
+                    </Text>
+                    <Badge color="blue" variant="light" radius="sm">
+                      Wabah
+                    </Badge>
+                  </Group>
+                  <Text fz="sm" c="dimmed">
+                    Diposting: 12 Februari 2025 · Dinas Kesehatan
+                  </Text>
+                  <Divider />
+                  <Text fz="sm" lh={1.5}>
+                    {v.deskripsiSingkat}
+                  </Text>
+                  <HoverCard shadow="md" position="bottom" radius="md" width={300}>
+                    <HoverCard.Target>
+                      <Text
+                        fz="sm"
+                        fw={500}
+                        c={colors['blue-button']}
+                        style={{ cursor: 'pointer' }}
+                      >
+                        Lihat detail lengkap
                       </Text>
-                      <Text fz={'h6'} pb={10}>
-                        Diposting: 12 Februari 2025 | Dinas Kesehatan
-                      </Text>
-                      <Text fz={'h4'} pb={10}>
-                        {v.deskripsiSingkat}
-                      </Text>
-                      <Text fz={'h4'} pb={10} dangerouslySetInnerHTML={{ __html: v.deskripsiLengkap }} />
-                    </Box>
-                  </Stack>
-                </Paper>
-              )
-            })}
+                    </HoverCard.Target>
+                    <HoverCard.Dropdown>
+                      <Text
+                        fz="sm"
+                        lh={1.6}
+                        dangerouslySetInnerHTML={{
+                          __html: v.deskripsiLengkap,
+                        }}
+                      />
+                    </HoverCard.Dropdown>
+                  </HoverCard>
+                </Stack>
+              </Paper>
+            ))}
           </SimpleGrid>
-        </Stack>
+        )}
       </Box>
-      <Center>
-        <Pagination
-          value={page}
-          onChange={(newPage) => load(newPage)} // ini penting!
-          total={totalPages}
-          mt="md"
-          mb="md"
-        />
-      </Center>
+
+      {totalPages > 1 && (
+        <Center>
+          <Pagination
+            value={page}
+            onChange={(newPage) => load(newPage)}
+            total={totalPages}
+            radius="xl"
+            size="md"
+            mt="lg"
+          />
+        </Center>
+      )}
     </Stack>
   );
 }

src/app/darmasaba/(pages)/kesehatan/kontak-darurat/page.tsx

@@ -1,106 +1,150 @@
 'use client'
-import colors from '@/con/colors';
-import { Box, Center, Grid, GridCol, Image, Pagination, Paper, SimpleGrid, Skeleton, Stack, Text, TextInput } from '@mantine/core';
-import BackButton from '../../desa/layanan/_com/BackButto';
-import { useProxy } from 'valtio/utils';
 import { useState } from 'react';
-
+import { useProxy } from 'valtio/utils';
 import { useShallowEffect } from '@mantine/hooks';
+import {
+  Box,
+  Center,
+  Grid,
+  GridCol,
+  Image,
+  Pagination,
+  Paper,
+  SimpleGrid,
+  Skeleton,
+  Stack,
+  Text,
+  TextInput,
+  Tooltip,
+  Badge,
+} from '@mantine/core';
+import { IconSearch, IconPhone } from '@tabler/icons-react';
+import BackButton from '../../desa/layanan/_com/BackButto';
 import kontakDarurat from '@/app/admin/(dashboard)/_state/kesehatan/kontak-darurat/kontakDarurat';
-import { IconSearch } from '@tabler/icons-react';
+import colors from '@/con/colors';
 
 function Page() {
-  const state = useProxy(kontakDarurat)
-  const [search, setSearch] = useState('')
+  const state = useProxy(kontakDarurat);
+  const [search, setSearch] = useState('');
 
-  const {
-    data,
-    page,
-    totalPages,
-    loading,
-    load,
-  } = state.findMany;
+  const { data, page, totalPages, loading, load } = state.findMany;
 
   useShallowEffect(() => {
-    load(page, 3, search)
-  }, [page, search])
+    load(page, 6, search);
+  }, [page, search]);
 
   if (loading || !data) {
     return (
-      <Box py={10}>
-        <Skeleton h={500} />
+      <Box py="xl" px={{ base: 'md', md: 100 }}>
+        <Skeleton height={500} radius="lg" />
       </Box>
-    )
+    );
   }
+
   return (
-    <Stack pos={"relative"} bg={colors.Bg} py={"xl"} gap={"22"}>
+    <Stack pos="relative" bg={colors.Bg} py="xl" gap="lg">
       <Box px={{ base: 'md', md: 100 }}>
         <BackButton />
       </Box>
-      <Grid align='center' px={{ base: 'md', md: 100 }}>
-        <GridCol span={{ base: 12, md: 9 }}>
-          <Text fz={{ base: "h1", md: "2.5rem" }} c={colors["blue-button"]} fw={"bold"}>
-            Penanganan Darurat
+
+      <Grid align="center" px={{ base: 'md', md: 100 }} gutter="lg">
+        <GridCol span={{ base: 12, md: 8 }}>
+          <Text fz={{ base: '2rem', md: '2.8rem' }} c={colors['blue-button']} fw={800}>
+            Kontak Darurat
+          </Text>
+          <Text c="dimmed" fz="md" mt={4}>
+            Hubungi layanan penting dengan cepat dan mudah
           </Text>
         </GridCol>
-        <GridCol span={{ base: 12, md: 3 }}>
-          <TextInput
-            radius={"lg"}
-            placeholder='Cari Penanganan Darurat'
-            value={search}
-            onChange={(e) => setSearch(e.target.value)}
-            leftSection={<IconSearch size={20} />}
-            w={{ base: "50%", md: "100%" }}
-          />
+        <GridCol span={{ base: 12, md: 4 }}>
+          <Tooltip label="Cari berdasarkan nama atau deskripsi" withArrow>
+            <TextInput
+              radius="xl"
+              size="md"
+              placeholder="Cari kontak darurat..."
+              value={search}
+              onChange={(e) => setSearch(e.target.value)}
+              leftSection={<IconSearch size={20} />}
+              w="100%"
+            />
+          </Tooltip>
         </GridCol>
       </Grid>
-      <Box px={{ base: "md", md: 100 }}>
-        <Stack gap={'lg'}>
-          <SimpleGrid
-            pb={10}
-            cols={{
-              base: 1,
-              md: 3,
-            }}>
-            {data.map((v, k) => {
-              return (
-                <Paper radius={10} key={k} bg={colors["white-trans-1"]}>
-                  <Stack gap={'xs'}>
-                    <Center py={40}>
-                      <Image
-                        src={v.image.link}
-                        alt={v.name}
-                        w={200}
-                        h={200}
-                        fit='contain'
-                      />
-                    </Center>
-                    <Box px={'lg'}>
-                      <Box pb={20}>
-                        <Text pb={10} c={colors["blue-button"]} fw={"bold"} fz={"h3"}>
-                          {v.name}
-                        </Text>
-                        <Box px={10}>
-                          <Text fz={"h4"} dangerouslySetInnerHTML={{ __html: v.deskripsi }} />
-                        </Box>
-                      </Box>
-                    </Box>
-                  </Stack>
-                </Paper>
-              )
-            })}
+
+      <Box px={{ base: 'md', md: 100 }}>
+        {data.length === 0 ? (
+          <Center mih={300}>
+            <Stack align="center" gap="xs">
+              <IconSearch size={50} color={colors['blue-button']} />
+              <Text fz="lg" fw={600} c={colors['blue-button']}>
+                Tidak ada kontak ditemukan
+              </Text>
+              <Text fz="sm" c="dimmed">
+                Coba kata kunci lain untuk pencarian
+              </Text>
+            </Stack>
+          </Center>
+        ) : (
+          <SimpleGrid cols={{ base: 1, sm: 2, md: 3 }} spacing="xl" mt="lg">
+            {data.map((v, k) => (
+              <Paper
+                key={k}
+                radius="xl"
+                shadow="md"
+                withBorder
+                p="lg"
+                bg={colors['white-trans-1']}
+                style={{
+                  transition: 'all 200ms ease',
+                  cursor: 'pointer',
+                }}
+              >
+                <Stack align="center" gap="sm">
+                  <Image
+                    src={v.image.link}
+                    alt={v.name}
+                    w={140}
+                    h={140}
+                    fit="contain"
+                    radius="md"
+                  />
+                  <Text ta="center" fw={700} fz="lg" c={colors['blue-button']}>
+                    {v.name}
+                  </Text>
+                  <Text fz="sm" c="dimmed" ta="center" lineClamp={3}>
+                    <span dangerouslySetInnerHTML={{ __html: v.deskripsi }} />
+                  </Text>
+                  <Badge
+                    color="blue"
+                    leftSection={<IconPhone size={14} />}
+                    variant="light"
+                    mt="sm"
+                  >
+                    Panggil Sekarang
+                  </Badge>
+                </Stack>
+              </Paper>
+            ))}
           </SimpleGrid>
-        </Stack>
+        )}
       </Box>
-      <Center>
-        <Pagination
-          value={page}
-          onChange={(newPage) => load(newPage)} // ini penting!
-          total={totalPages}
-          mt="md"
-          mb="md"
-        />
-      </Center>
+
+      {totalPages > 1 && (
+        <Center mt="xl">
+          <Pagination
+            value={page}
+            onChange={(newPage) => load(newPage, 6, search)}
+            total={totalPages}
+            radius="xl"
+            size="md"
+            styles={{
+              control: {
+                borderRadius: '999px',
+              },
+            }}
+          />
+        </Center>
+      )}
     </Stack>
   );
 }

src/app/darmasaba/(pages)/kesehatan/penanganan-darurat/page.tsx

@@ -1,108 +1,162 @@
 'use client'
-import colors from '@/con/colors';
-import { Box, Center, Grid, GridCol, Image, Pagination, Paper, SimpleGrid, Skeleton, Stack, Text, TextInput } from '@mantine/core';
-import BackButton from '../../desa/layanan/_com/BackButto';
-import { useProxy } from 'valtio/utils';
-import { useState } from 'react';
-
-import { useShallowEffect } from '@mantine/hooks';
-import penangananDarurat from '@/app/admin/(dashboard)/_state/kesehatan/penanganan-darurat/penangananDarurat';
-import { IconSearch } from '@tabler/icons-react';
+import penangananDarurat from '@/app/admin/(dashboard)/_state/kesehatan/penanganan-darurat/penangananDarurat'
+import colors from '@/con/colors'
+import {
+  Badge,
+  Box,
+  Center,
+  Grid,
+  GridCol,
+  Image,
+  Pagination,
+  Paper,
+  SimpleGrid,
+  Skeleton,
+  Stack,
+  Text,
+  TextInput,
+  Tooltip
+} from '@mantine/core'
+import { useShallowEffect } from '@mantine/hooks'
+import { IconSearch } from '@tabler/icons-react'
+import { useState } from 'react'
+import { useProxy } from 'valtio/utils'
+import BackButton from '../../desa/layanan/_com/BackButto'
 
 function Page() {
   const state = useProxy(penangananDarurat)
   const [search, setSearch] = useState('')
 
-  const {
-    data,
-    page,
-    totalPages,
-    loading,
-    load,
-  } = state.findMany;
+  const { data, page, totalPages, loading, load } = state.findMany
 
   useShallowEffect(() => {
-    load(page, 3, search)
+    load(page, 6, search)
   }, [page, search])
 
   if (loading || !data) {
     return (
-      <Box py={10}>
-        <Skeleton h={500} />
+      <Box py="xl" px={{ base: 'md', md: 100 }}>
+        <Skeleton h={500} radius="lg" />
       </Box>
     )
   }
+
   return (
-    <Stack pos={"relative"} bg={colors.Bg} py={"xl"} gap={"22"}>
+    <Stack bg={colors.Bg} py="xl" gap="xl" pos="relative">
       <Box px={{ base: 'md', md: 100 }}>
         <BackButton />
       </Box>
-      <Grid align='center' px={{ base: 'md', md: 100 }}>
+
+      <Grid align="center" px={{ base: 'md', md: 100 }} mb="lg">
         <GridCol span={{ base: 12, md: 9 }}>
-          <Text fz={{ base: "h1", md: "2.5rem" }} c={colors["blue-button"]} fw={"bold"}>
+          <Text fz={{ base: 30, md: 40 }} c={colors['blue-button']} fw={800} lh={1.2}>
             Penanganan Darurat
           </Text>
+          <Text fz="md" c="dimmed" mt={4}>
+            Informasi cepat dan jelas untuk situasi darurat kesehatan
+          </Text>
         </GridCol>
         <GridCol span={{ base: 12, md: 3 }}>
-          <TextInput
-            radius={"lg"}
-            placeholder='Cari Penanganan Darurat'
-            value={search}
-            onChange={(e) => setSearch(e.target.value)}
-            leftSection={<IconSearch size={20} />}
-            w={{ base: "50%", md: "100%" }}
-          />
+          <Tooltip label="Ketik kata kunci untuk mencari penanganan darurat">
+            <TextInput
+              radius="lg"
+              placeholder="Cari penanganan darurat..."
+              value={search}
+              onChange={(e) => setSearch(e.target.value)}
+              leftSection={<IconSearch size={20} />}
+              w="100%"
+            />
+          </Tooltip>
         </GridCol>
       </Grid>
-      <Box px={{ base: "md", md: 100 }}>
-        <Stack gap={'lg'}>
+
+      <Box px={{ base: 'md', md: 100 }}>
+        {data.length === 0 ? (
+          <Center py={100}>
+            <Stack align="center" gap="xs">
+              <Text fz="lg" fw={600} c={colors['blue-button']}>
+                Tidak ada data ditemukan
+              </Text>
+              <Text fz="sm" c="dimmed">
+                Coba gunakan kata kunci lain
+              </Text>
+            </Stack>
+          </Center>
+        ) : (
           <SimpleGrid
-            pb={10}
-            cols={{
-              base: 1,
-              md: 3,
-            }}>
-            {data.map((v, k) => {
-              return (
-                <Paper radius={10} key={k} bg={colors["white-trans-1"]}>
-                  <Stack gap={'xs'}>
-                    <Center py={40}>
-                      <Image
-                        src={v.image.link}
-                        alt={v.name}
-                        w={200}
-                        h={200}
-                        fit='contain'
+            cols={{ base: 1, sm: 2, md: 3 }}
+            spacing="xl"
+            verticalSpacing="xl"
+            pb={20}
+          >
+            {data.map((v, k) => (
+              <Paper
+                key={k}
+                radius="xl"
+                p="md"
+                shadow="sm"
+                withBorder
+                bg={colors['white-trans-1']}
+                style={{ transition: 'all 0.3s ease' }}
+              >
+                <Stack align="center" gap="md">
+                  <Center>
+                    <Image
+                      src={v.image.link}
+                      alt={v.name}
+                      w={160}
+                      h={160}
+                      fit="contain"
+                      radius="md"
+                    />
+                  </Center>
+                  <Stack gap={4} w="100%">
+                    <Text
+                      fz="lg"
+                      fw={700}
+                      c={colors['blue-button']}
+                      ta="center"
+                      lineClamp={2}
+                    >
+                      {v.name}
+                    </Text>
+                    <Box>
+                      <Text
+                        fz="sm"
+                        c="dimmed"
+                        lineClamp={4}
+                        dangerouslySetInnerHTML={{ __html: v.deskripsi }}
                       />
-                    </Center>
-                    <Box px={'lg'}>
-                      <Box pb={20}>
-                        <Text pb={10} c={colors["blue-button"]} fw={"bold"} fz={"h3"}>
-                          {v.name}
-                        </Text>
-                        <Box px={10}>
-                          <Text fz={"h4"} dangerouslySetInnerHTML={{ __html: v.deskripsi }} />
-                        </Box>
-                      </Box>
                     </Box>
                   </Stack>
-                </Paper>
-              )
-            })}
+                  <Badge radius="md" color="blue" variant="light" mt="sm">
+                    Darurat
+                  </Badge>
+                </Stack>
+              </Paper>
+            ))}
           </SimpleGrid>
-        </Stack>
+        )}
       </Box>
-      <Center>
-        <Pagination
-          value={page}
-          onChange={(newPage) => load(newPage)} // ini penting!
-          total={totalPages}
-          mt="md"
-          mb="md"
-        />
-      </Center>
+
+      {totalPages > 1 && (
+        <Center mt="xl">
+          <Pagination
+            value={page}
+            onChange={(newPage) => load(newPage, 6, search)}
+            total={totalPages}
+            size="lg"
+            radius="xl"
+            styles={{
+              control: {
+                border: `1px solid ${colors['blue-button']}`,
+              },
+            }}
+          />
+        </Center>
+      )}
     </Stack>
-  );
+  )
 }
 
-export default Page;
+export default Page

src/app/darmasaba/(pages)/kesehatan/posyandu/page.tsx

@@ -1,119 +1,166 @@
 'use client'
-import colors from "@/con/colors";
-import { Box, Center, Flex, Image, List, ListItem, Pagination, Paper, SimpleGrid, Skeleton, Spoiler, Stack, Text, TextInput } from "@mantine/core";
-import BackButton from "../../desa/layanan/_com/BackButto";
-// import { useTransitionRouter } from "next-view-transitions";
 import posyandustate from "@/app/admin/(dashboard)/_state/kesehatan/posyandu/posyandu";
+import colors from "@/con/colors";
+import { Badge, Box, Center, Flex, Image, List, ListItem, Pagination, Paper, SimpleGrid, Skeleton, Spoiler, Stack, Text, TextInput } from "@mantine/core";
 import { useShallowEffect } from "@mantine/hooks";
-import { useProxy } from "valtio/utils";
+import { IconCalendar, IconInfoCircle, IconPhone, IconSearch } from "@tabler/icons-react";
 import { useState } from "react";
-import { IconSearch } from "@tabler/icons-react";
+import { useProxy } from "valtio/utils";
+import BackButton from "../../desa/layanan/_com/BackButto";
 
 export default function Page() {
-    const state = useProxy(posyandustate)
-    // const router = useTransitionRouter()
-    const [search, setSearch] = useState("")
+  const state = useProxy(posyandustate);
+  const [search, setSearch] = useState("");
 
-    const {
-        data,
-        page,
-        totalPages,
-        loading,
-        load,
-    } = state.findMany;
+  const { data, page, totalPages, loading, load } = state.findMany;
 
+  useShallowEffect(() => {
+    load(page, 6, search);
+  }, [page, search]);
 
-    useShallowEffect(() => {
-        load(page, 3, search)
-    }, [page, search])
-
-    if (loading || !data) {
-        return (
-            <Box py={10}>
-                <Skeleton h={500} />
-            </Box>
-        )
-    }
-
+  if (loading || !data) {
     return (
-        <Stack pos={"relative"} bg={colors.Bg} py={"xl"} gap={"22"}>
-            <Box px={{ base: 'md', md: 100 }}>
-                <BackButton />
-                <Flex mt={10} justify={"space-between"} align={"center"}>
-                    <Text ta={"center"} fz={{ base: "h1", md: "2.5rem" }} c={colors["blue-button"]} fw={"bold"}>
-                        Posyandu Darmasaba
-                    </Text>
-                    <TextInput
-                        placeholder="Cari Posyandu"
-                        radius="lg"
-                        leftSection={<IconSearch size={20} />}
-                        w={{ base: "25%", md: "30%" }}
-                        value={search}
-                        onChange={(e) => setSearch(e.currentTarget.value)}
-                    />
-                </Flex>
-            </Box>
-            <Box px={{ base: "md", md: 100 }}>
-                <Stack gap={'lg'}>
-                    <SimpleGrid
-                        pb={10}
-                        cols={{
-                            base: 1,
-                            md: 3,
-                        }}>
-                        {data?.map((v, k) => {
-                            return (
-                                <Paper key={k} p={"xl"} bg={colors["white-trans-1"]}>
-                                    <Stack gap={'xs'}>
-                                        <Text c={colors["blue-button"]} fw={"bold"} fz={"h3"}>
-                                            {v.name}
-                                        </Text>
-                                        <Center>
-                                            <Image src={v.image.link} alt="" />
-                                        </Center>
-                                        <Text fz={'h4'}>
-                                            No.Telp : {v.nomor}
-                                        </Text>
-                                        <Box>
-                                            <Text fz={'h4'}>
-                                                Jadwal Pelayanan
-                                            </Text>
-                                            <Text fz={'h4'} dangerouslySetInnerHTML={{ __html: v.jadwalPelayanan }} />
-                                        </Box>
-                                        <Spoiler
-                                            maxHeight={60} // tinggi maksimum sebelum di-collapse
-                                            showLabel="Read more"
-                                            hideLabel="Read less"
-                                        >
-                                            <Text fz={'h4'} dangerouslySetInnerHTML={{ __html: v.deskripsi }} />
-                                        </Spoiler>
-                                    </Stack>
-                                </Paper>
-                            )
-                        })}
-                    </SimpleGrid>
-                    <Center>
-                        <Pagination
-                            value={page}
-                            onChange={(newPage) => load(newPage)} // ini penting!
-                            total={totalPages}
-                            mt="md"
-                            mb="md"
-                        />
-                    </Center>
-                    <Text fz={'h4'} fw={"bold"}>
-                        Pelayanan Posyandu
-                    </Text>
-                    <List type="ordered">
-                        <ListItem fz={'h4'}>Penimbangan bayi dan balita</ListItem>
-                        <ListItem fz={'h4'}>Pemantuan status gizi</ListItem>
-                        <ListItem fz={'h4'}>Imunisasi dasar lengkap</ListItem>
-                        <ListItem fz={'h4'}>Konseling</ListItem>
-                        <ListItem fz={'h4'}>Pemantuan kesehatan ibu hamil</ListItem>
-                    </List>
-                </Stack>
-            </Box>
-        </Stack>
+      <Box py="xl" px={{ base: "md", md: 100 }}>
+        <Skeleton h={500} radius="lg" />
+      </Box>
+    );
+  }
 
-    )
-}
+  return (
+    <Stack pos="relative" bg={colors.Bg} py="xl" gap="xl">
+      <Box px={{ base: "md", md: 100 }}>
+        <BackButton />
+        <Flex mt="md" justify="space-between" align="center" wrap="wrap" gap="md">
+          <Text
+            ta="left"
+            fz={{ base: "1.8rem", md: "2.5rem" }}
+            c={colors["blue-button"]}
+            fw="bold"
+          >
+            Posyandu Desa Darmasaba
+          </Text>
+          <TextInput
+            placeholder="Cari posyandu berdasarkan nama..."
+            aria-label="Pencarian Posyandu"
+            radius="xl"
+            size="md"
+            leftSection={<IconSearch size={20} />}
+            w={{ base: "100%", md: "35%" }}
+            value={search}
+            onChange={(e) => setSearch(e.currentTarget.value)}
+          />
+        </Flex>
+      </Box>
+
+      <Box px={{ base: "md", md: 100 }}>
+        <Stack gap="xl">
+          <SimpleGrid
+            pb="lg"
+            cols={{ base: 1, sm: 2, md: 3 }}
+            spacing="lg"
+          >
+            {data?.map((v, k) => (
+              <Paper
+                key={k}
+                p="xl"
+                radius="lg"
+                shadow="md"
+                withBorder
+                bg={colors["white-trans-1"]}
+                style={{
+                  transition: "transform 0.2s ease, box-shadow 0.2s ease",
+                }}
+                onMouseEnter={(e) => {
+                  (e.currentTarget as HTMLElement).style.transform = "translateY(-4px)";
+                  (e.currentTarget as HTMLElement).style.boxShadow =
+                    "0 8px 24px rgba(0,0,0,0.12)";
+                }}
+                onMouseLeave={(e) => {
+                  (e.currentTarget as HTMLElement).style.transform = "translateY(0)";
+                  (e.currentTarget as HTMLElement).style.boxShadow =
+                    "0 4px 12px rgba(0,0,0,0.08)";
+                }}
+              >
+                <Stack gap="sm">
+                  <Flex justify="space-between" align="center">
+                    <Text c={colors["blue-button"]} fw="bold" fz="lg" lineClamp={1}>
+                      {v.name}
+                    </Text>
+                    <Badge color="blue" variant="light" size="sm" radius="sm">
+                      Aktif
+                    </Badge>
+                  </Flex>
+                  <Center>
+                    <Image
+                      src={v.image.link}
+                      alt={`Gambar ${v.name}`}
+                      radius="md"
+                      w="100%"
+                      h={180}
+                      fit="cover"
+                    />
+                  </Center>
+                  <Flex align="center" gap="xs">
+                    <IconPhone size={18} stroke={1.5} />
+                    <Text fz="sm" c="dimmed">
+                      {v.nomor || "Tidak tersedia"}
+                    </Text>
+                  </Flex>
+                  <Flex align="center" gap="xs">
+                    <IconCalendar size={18} stroke={1.5} />
+                    <Text fz="sm" c="dimmed">
+                      Jadwal:{" "}
+                      <span dangerouslySetInnerHTML={{ __html: v.jadwalPelayanan }} />
+                    </Text>
+                  </Flex>
+                  <Spoiler
+                    maxHeight={70}
+                    showLabel="Lihat selengkapnya"
+                    hideLabel="Sembunyikan"
+                    transitionDuration={300}
+                  >
+                    <Text
+                      fz="sm"
+                      lh={1.5}
+                      dangerouslySetInnerHTML={{ __html: v.deskripsi }}
+                    />
+                  </Spoiler>
+                </Stack>
+              </Paper>
+            ))}
+          </SimpleGrid>
+
+          {totalPages > 1 && (
+            <Center>
+              <Pagination
+                value={page}
+                onChange={(newPage) => load(newPage)}
+                total={totalPages}
+                radius="lg"
+                size="md"
+                withControls
+                mt="md"
+              />
+            </Center>
+          )}
+
+          <Stack gap="sm">
+            <Flex align="center" gap="xs">
+              <IconInfoCircle size={22} color={colors["blue-button"]} />
+              <Text fz="lg" fw="bold" c={colors["blue-button"]}>
+                Layanan Utama Posyandu
+              </Text>
+            </Flex>
+            <List spacing="xs" size="sm" center>
+              <ListItem>Penimbangan bayi dan balita</ListItem>
+              <ListItem>Pemantauan status gizi</ListItem>
+              <ListItem>Imunisasi dasar lengkap</ListItem>
+              <ListItem>Konseling kesehatan</ListItem>
+              <ListItem>Pemantauan kesehatan ibu hamil</ListItem>
+            </List>
+          </Stack>
+        </Stack>
+      </Box>
+    </Stack>
+  );
+}

src/app/darmasaba/(pages)/kesehatan/program-kesehatan/[id]/page.tsx

@@ -1,7 +1,7 @@
 'use client'
 import programKesehatan from '@/app/admin/(dashboard)/_state/kesehatan/program-kesehatan/programKesehatan';
 import colors from '@/con/colors';
-import { Box, Center, Group, Image, Paper, Skeleton, Stack, Text } from '@mantine/core';
+import { Box, Center, Group, Image, Loader, Paper, Skeleton, Stack, Text, Tooltip } from '@mantine/core';
 import { useShallowEffect } from '@mantine/hooks';
 import { IconCalendar, IconUser } from '@tabler/icons-react';
 import { useParams } from 'next/navigation';
@@ -18,45 +18,75 @@ function Page() {
 
   if (!state.findUnique.data) {
     return (
-      <div>
-        <Skeleton h={500} />
-      </div>
+      <Center mih="60vh">
+        <Stack align="center" gap="sm">
+          <Loader color={colors["blue-button"]} size="lg" />
+          <Text c="dimmed" fz="sm">Memuat data program kesehatan...</Text>
+        </Stack>
+      </Center>
     )
   }
+
   return (
-    <Stack pos={"relative"} bg={colors.Bg} py={"xl"} gap={"22"}>
+    <Stack pos="relative" bg={colors.Bg} py="xl" gap="xl">
       <Box px={{ base: 'md', md: 100 }}>
         <BackButton />
       </Box>
-      <Paper px={{ base: 'md', md: 100 }} radius={10} bg={colors["white-trans-1"]}>
-        <Stack gap={'xs'}>
-          <Center my={20}>
-            <Image radius={"lg"} src={state.findUnique.data.image?.link} alt="" />
+      <Paper
+        px={{ base: 'md', md: 100 }}
+        py="xl"
+        radius="xl"
+        shadow="md"
+        bg={colors["white-trans-1"]}
+      >
+        <Stack gap="lg">
+          <Center>
+            {state.findUnique.data.image?.link ? (
+              <Image
+                radius="xl"
+                src={state.findUnique.data.image?.link}
+                alt={state.findUnique.data.name}
+                w="100%"
+                maw={800}
+                fit="cover"
+              />
+            ) : (
+              <Skeleton h={300} w="100%" radius="xl" />
+            )}
           </Center>
-          <Box px={'lg'}>
-            <Box>
-              <Text pb={10} c={colors["blue-button"]} fw={"bold"} fz={"h3"}>
-                {state.findUnique.data.name}
-              </Text>
-              <Text ta={'justify'} fz={'h4'} dangerouslySetInnerHTML={{ __html: state.findUnique.data.deskripsi }}></Text>
-            </Box>
-            <Group py={20}>
-              <Group gap="xs">
-                <IconCalendar size={18} />
-                <Text size="sm">
-                  {state.findUnique.data.createdAt ? new Date(state.findUnique.data.createdAt).toLocaleDateString('id-ID', {
-                    day: 'numeric',
-                    month: 'long',
-                    year: 'numeric',
-                  }) : 'No date available'}
-                </Text>
-              </Group>
-              <Group gap="xs">
-                <IconUser size={18} />
-                <Text size="sm">Admin Desa</Text>
-              </Group>
-            </Group>
+          <Box>
+            <Text pb="sm" c={colors["blue-button"]} fw="bold" fz={{ base: 24, md: 32 }} lh={1.2}>
+              {state.findUnique.data.name}
+            </Text>
+            <Text
+              ta="justify"
+              fz="md"
+              lh={1.6}
+              dangerouslySetInnerHTML={{ __html: state.findUnique.data.deskripsi }}
+            />
           </Box>
+          <Group gap="xl">
+            <Group gap="xs">
+              <Tooltip label="Tanggal dibuat" withArrow>
+                <IconCalendar size={20} stroke={1.5} />
+              </Tooltip>
+              <Text size="sm" c="dimmed">
+                {state.findUnique.data.createdAt
+                  ? new Date(state.findUnique.data.createdAt).toLocaleDateString('id-ID', {
+                      day: 'numeric',
+                      month: 'long',
+                      year: 'numeric',
+                    })
+                  : 'Tanggal tidak tersedia'}
+              </Text>
+            </Group>
+            <Group gap="xs">
+              <Tooltip label="Dibuat oleh" withArrow>
+                <IconUser size={20} stroke={1.5} />
+              </Tooltip>
+              <Text size="sm" c="dimmed">Admin Desa</Text>
+            </Group>
+          </Group>
         </Stack>
       </Paper>
     </Stack>

src/app/darmasaba/(pages)/kesehatan/program-kesehatan/page.tsx

@@ -1,7 +1,31 @@
 'use client'
 import colors from "@/con/colors";
-import { Box, Button, Center, Grid, GridCol, Group, Image, Pagination, Paper, SimpleGrid, Skeleton, Stack, Text, TextInput } from "@mantine/core";
-import { IconBarbell, IconCalendar, IconOld, IconSearch, IconUser, IconUsersGroup } from "@tabler/icons-react";
+import {
+  Box,
+  Button,
+  Center,
+  Grid,
+  GridCol,
+  Group,
+  Image,
+  Pagination,
+  Paper,
+  SimpleGrid,
+  Skeleton,
+  Stack,
+  Text,
+  TextInput,
+  Tooltip,
+  Transition,
+} from "@mantine/core";
+import {
+  IconBarbell,
+  IconCalendar,
+  IconOld,
+  IconSearch,
+  IconUser,
+  IconUsersGroup,
+} from "@tabler/icons-react";
 import BackButton from "../../desa/layanan/_com/BackButto";
 import { useProxy } from "valtio/utils";
 import programKesehatan from "@/app/admin/(dashboard)/_state/kesehatan/program-kesehatan/programKesehatan";
@@ -9,104 +33,134 @@ import { useState } from "react";
 import { useShallowEffect } from "@mantine/hooks";
 import { useRouter } from "next/navigation";
 
-const data2 = [
+const manfaatProgram = [
   {
     id: 1,
-    icon: <IconBarbell size={50} color={colors['BG-trans']} />,
-    title: "Menjaga Kesehatan Tubuh",
-    desc: "Program kesehatan desa dirancang untuk memelihara kesehatan fisik masyarakat melalui aktivitas rutin, pemeriksaan kesehatan berkala, dan edukasi gaya hidup sehat.",
+    icon: <IconBarbell size={40} color="#fff" />,
+    title: "Menjaga Tubuh Bugar",
+    desc: "Meningkatkan kesehatan fisik masyarakat melalui olahraga rutin, pemeriksaan berkala, dan edukasi gaya hidup sehat.",
   },
   {
     id: 2,
-    icon: <IconUsersGroup size={50} color={colors['BG-trans']} />,
-    title: "Mempererat Kebersamaan",
-    desc: "Kegiatan kesehatan komunal menjadi wadah interaksi sosial yang memperkuat ikatan antar warga desa, menumbuhkan rasa kepedulian dan gotong royong.",
+    icon: <IconUsersGroup size={40} color="#fff" />,
+    title: "Menguatkan Kebersamaan",
+    desc: "Menciptakan interaksi sosial sehat, mempererat solidaritas, dan memperkuat budaya gotong royong antar warga.",
   },
   {
     id: 3,
-    icon: <IconOld size={50} color={colors['BG-trans']} />,
-    title: "Medukung Lansia Aktif",
-    desc: "Program khusus bagi lansia membantu menjaga kebugaran, mengurangi risiko penyakit degeneratif, dan menciptakan komunitas pendukung untuk kehidupan yang sehat dan bahagia.",
+    icon: <IconOld size={40} color="#fff" />,
+    title: "Dukungan untuk Lansia",
+    desc: "Membantu lansia tetap aktif, sehat, dan bahagia melalui kegiatan komunitas yang aman dan menyenangkan.",
   },
-]
+];
+
 export default function Page() {
-  const state = useProxy(programKesehatan)
-  const router = useRouter()
-  const [search, setSearch] = useState('')
-  const {
-    data,
-    page,
-    totalPages,
-    loading,
-    load,
-  } = state.findMany;
+  const state = useProxy(programKesehatan);
+  const router = useRouter();
+  const [search, setSearch] = useState("");
+  const { data, page, totalPages, loading, load } = state.findMany;
 
   useShallowEffect(() => {
-    load(page, 3, search)
-  }, [page, search])
+    load(page, 3, search);
+  }, [page, search]);
 
   if (loading || !data) {
     return (
-      <Box py={10}>
-        <Skeleton h={500} />
+      <Box py="xl" px={{ base: "md", md: 100 }}>
+        <Skeleton h={500} radius="lg" />
       </Box>
-    )
+    );
   }
+
   return (
-    <Stack pos={"relative"} bg={colors.Bg} py={"xl"} gap={"22"}>
-      <Box px={{ base: 'md', md: 100 }}>
+    <Stack bg={colors.Bg} py="xl" gap="xl">
+      <Box px={{ base: "md", md: 100 }}>
         <BackButton />
       </Box>
-      <Grid px={{ base: 'md', md: 100 }} align="center">
-        <GridCol span={{ base: 12, md: 9 }}>
-          <Text fz={{ base: "h1", md: "2.5rem" }} c={colors["blue-button"]} fw={"bold"}>
-            Program Kesehatan Unggulan
+
+      <Grid px={{ base: "md", md: 100 }} align="center" gutter="lg">
+        <GridCol span={{ base: 12, md: 8 }}>
+          <Text
+            fz={{ base: "2rem", md: "2.8rem" }}
+            c={colors["blue-button"]}
+            fw="bold"
+          >
+            Program Kesehatan Desa
+          </Text>
+          <Text fz="lg" c="dimmed" mt="xs">
+            Temukan berbagai program kesehatan untuk mendukung kualitas hidup
+            masyarakat Darmasaba.
           </Text>
         </GridCol>
-        <GridCol span={{ base: 12, md: 3 }}>
+        <GridCol span={{ base: 12, md: 4 }}>
           <TextInput
-            placeholder='Cari Program Kesehatan'
+            placeholder="Cari program kesehatan..."
             value={search}
             onChange={(e) => setSearch(e.target.value)}
             leftSection={<IconSearch size={20} />}
-            w={{ base: "50%", md: "100%" }}
+            radius="lg"
+            size="md"
+            aria-label="Pencarian program kesehatan"
           />
         </GridCol>
       </Grid>
+
       <Box px={{ base: "md", md: 100 }}>
-        <Stack gap={'lg'}>
-          <SimpleGrid
-            pb={10}
-            cols={{
-              base: 1,
-              md: 3,
-            }}>
-            {data.map((v, k) => {
-              return (
-                <Paper radius={10} key={k} bg={colors["white-trans-1"]}>
-                  <Stack gap={'xs'}>
-                    <Center>
-                      <Image src={v.image?.link} alt="" style={{ borderRadius: '14px 14px 0 0' }} />
-                    </Center>
-                    <Box px={'lg'}>
-                      <Box>
-                        <Text pb={10} c={colors["blue-button"]} fw={"bold"} fz={"h3"}>
-                          {v.name}
-                        </Text>
-                        <Text ta={'justify'} fz={'h4'} dangerouslySetInnerHTML={{ __html: v.deskripsi }}></Text>
-                      </Box>
-                      <Box py={15} onClick={() => router.push(`/darmasaba/kesehatan/program-kesehatan/${v.id}`)}>
-                        <Button fw={'bold'} fz={'h5'} c={colors["blue-button"]} bg={colors["BG-trans"]}>Detail Program</Button>
-                      </Box>
-                      <Group py={20}>
+        <SimpleGrid cols={{ base: 1, sm: 2, md: 3 }} spacing="lg" pb="xl">
+          {data.map((v, k) => (
+            <Transition
+              key={k}
+              mounted
+              transition="fade-up"
+              duration={400}
+              timingFunction="ease"
+            >
+              {(styles) => (
+                <Paper
+                  style={styles}
+                  radius="xl"
+                  withBorder
+                  bg="white"
+                  shadow="md"
+                  className="hover-scale"
+                >
+                  <Stack gap="md">
+                    <Image
+                      src={v.image?.link}
+                      alt={v.name}
+                      radius="xl"
+                      height={180}
+                      fit="cover"
+                    />
+                    <Box px="lg" pb="lg">
+                      <Text
+                        fw="bold"
+                        fz="xl"
+                        c={colors["blue-button"]}
+                        mb="xs"
+                      >
+                        {v.name}
+                      </Text>
+                      <Text
+                        fz="sm"
+                        c="dimmed"
+                        lineClamp={3}
+                        dangerouslySetInnerHTML={{ __html: v.deskripsi }}
+                      />
+                      <Group justify="space-between" mt="md">
                         <Group gap="xs">
                           <IconCalendar size={18} />
                           <Text size="sm">
-                            {v.createdAt ? new Date(v.createdAt).toLocaleDateString('id-ID', {
-                              day: 'numeric',
-                              month: 'long',
-                              year: 'numeric',
-                            }) : 'No date available'}
+                            {v.createdAt
+                              ? new Date(v.createdAt).toLocaleDateString(
+                                  "id-ID",
+                                  {
+                                    day: "numeric",
+                                    month: "long",
+                                    year: "numeric",
+                                  }
+                                )
+                              : "Tanggal tidak tersedia"}
                           </Text>
                         </Group>
                         <Group gap="xs">
@@ -114,61 +168,99 @@ export default function Page() {
                           <Text size="sm">Admin Desa</Text>
                         </Group>
                       </Group>
+                      <Tooltip label="Lihat detail program" withArrow>
+                        <Button
+                          mt="lg"
+                          fullWidth
+                          radius="lg"
+                          size="md"
+                          fw="bold"
+                          variant="gradient"
+                          gradient={{ from: colors["blue-button"], to: "#4dabf7" }}
+                          onClick={() =>
+                            router.push(
+                              `/darmasaba/kesehatan/program-kesehatan/${v.id}`
+                            )
+                          }
+                        >
+                          Lihat Detail
+                        </Button>
+                      </Tooltip>
                     </Box>
                   </Stack>
                 </Paper>
-              )
-            })}
-          </SimpleGrid>
+              )}
+            </Transition>
+          ))}
+        </SimpleGrid>
+
+        {totalPages > 1 && (
           <Center>
             <Pagination
               value={page}
-              onChange={(newPage) => load(newPage)} // ini penting!
+              onChange={(newPage) => load(newPage)}
               total={totalPages}
               mt="md"
-              mb="md"
+              size="lg"
+              radius="xl"
+              styles={{
+                control: {
+                  borderRadius: "50%",
+                  boxShadow: "0 0 10px rgba(0,0,0,0.1)",
+                },
+              }}
             />
           </Center>
-        </Stack>
+        )}
       </Box>
-      <Box py={10} px={{ base: "md", md: 100 }}>
-        <Box pb={10}>
-          <Text fz={{ base: "h1", md: "2.5rem" }} c={colors["blue-button"]} fw={"bold"}>
+
+      <Box px={{ base: "md", md: 100 }} py="xl">
+        <Stack gap="sm" mb="lg">
+          <Text
+            fz={{ base: "2rem", md: "2.5rem" }}
+            c={colors["blue-button"]}
+            fw="bold"
+          >
             Manfaat Program Kesehatan
           </Text>
-          <Text fz={{ base: "h4", md: "h3" }} >
-            Program kesehatan di Desa Darmasaba memiliki peran penting dalam meningkatkan kesejahteraan masyarakat.
+          <Text fz="lg" c="dimmed" maw={700}>
+            Program kesehatan Desa Darmasaba berperan penting dalam meningkatkan
+            kesejahteraan dan kualitas hidup warganya.
           </Text>
-        </Box>
-        <SimpleGrid
-          pb={30}
-          cols={{
-            base: 1,
-            md: 3,
-          }}>
-          {data2.map((v, k) => {
-            return (
-              <Paper key={k} px={"xl"} py={80} bg={colors['white-trans-1']} c={colors['blue-button']}>
-                <Stack justify='space-between' >
-                  <Group justify='center'>
-                    <Paper p={'xl'} radius={'100'} bg={colors['blue-button']}>
-                      <Center >
-                        {v.icon}
-                      </Center>
-                    </Paper>
-                  </Group>
-                  <Text ta={"center"} fw={"bold"} fz={"h3"}>
-                    {v.title}
-                  </Text>
-                  <Text ta={"center"} fz={'h4'}>
-                    {v.desc}
-                  </Text>
-                </Stack>
-              </Paper>
-            )
-          })}
+        </Stack>
+        <SimpleGrid cols={{ base: 1, md: 3 }} spacing="lg">
+          {manfaatProgram.map((v) => (
+            <Paper
+              key={v.id}
+              px="xl"
+              py="xl"
+              radius="xl"
+              shadow="sm"
+              withBorder
+              bg="white"
+              className="hover-glow"
+            >
+              <Stack align="center" gap="md">
+                <Paper
+                  p="lg"
+                  radius="50%"
+                  shadow="md"
+                  bg={colors["blue-button"]}
+                  className="pulse-icon"
+                >
+                  <Center>{v.icon}</Center>
+                </Paper>
+                <Text ta="center" fw="bold" fz="xl" c={colors["blue-button"]}>
+                  {v.title}
+                </Text>
+                <Text ta="center" fz="sm" c="dimmed">
+                  {v.desc}
+                </Text>
+              </Stack>
+            </Paper>
+          ))}
         </SimpleGrid>
       </Box>
     </Stack>
-  )
+  );
 }

src/app/darmasaba/(pages)/kesehatan/puskesmas/[id]/page.tsx

@@ -1,10 +1,11 @@
 'use client'
 import puskesmasState from '@/app/admin/(dashboard)/_state/kesehatan/puskesmas/puskesmas';
 import colors from '@/con/colors';
-import { BackgroundImage, Box, Grid, GridCol, Paper, SimpleGrid, Skeleton, Stack, Text, Title } from '@mantine/core';
+import { BackgroundImage, Box, Grid, GridCol, Paper, SimpleGrid, Skeleton, Stack, Text, Title, Tooltip, Badge, Divider, Group } from '@mantine/core';
 import { useShallowEffect } from '@mantine/hooks';
 import { useParams } from 'next/navigation';
 import { useProxy } from 'valtio/utils';
+import { IconClock, IconMapPin, IconPhone, IconMail, IconBuildingHospital } from '@tabler/icons-react';
 import BackButton from '../../../desa/layanan/_com/BackButto';
 
 function Page() {
@@ -17,95 +18,117 @@ function Page() {
 
   if (!state.findUnique.data) {
     return (
-      <Stack py={10}>
-        <Skeleton h={500} />
+      <Stack py="xl" px={{ base: 'md', md: 100 }}>
+        <Skeleton h={500} radius="lg" />
+        <Stack gap="sm">
+          <Skeleton h={20} w="40%" />
+          <Skeleton h={20} w="60%" />
+          <Skeleton h={20} w="50%" />
+        </Stack>
       </Stack>
     )
   }
+
+  const data = state.findUnique.data
+
   return (
-    <Stack pos={"relative"} bg={colors.Bg} py={"xl"} gap={"22"}>
+    <Stack pos="relative" bg={colors.Bg} py="xl" gap={32}>
       <Box px={{ base: 'md', md: 100 }}>
         <BackButton />
       </Box>
-      <Stack gap={'lg'} px={{ base: 'md', md: 100 }}>
-        <Box>
-          <Paper p={"xl"} bg={colors['white-trans-1']}>
-            <Box pb={30}>
-              <BackgroundImage
-                pb={30}
-                radius={16}
-                h={{ base: 250, md: 500 }}
-                src={state.findUnique.data.image.link}
-                style={{ position: 'relative' }}
+
+      <Stack gap="xl" px={{ base: 'md', md: 100 }}>
+        <Paper p="lg" radius="xl" shadow="md" bg={colors['white-trans-1']} withBorder>
+          <Box pb="xl">
+            <BackgroundImage
+              radius="lg"
+              h={{ base: 260, md: 480 }}
+              src={data.image.link}
+              style={{ position: 'relative', overflow: 'hidden' }}
+            >
+              <Box
+                pos="absolute"
+                w="100%"
+                h="100%"
+                bg={colors.trans.dark[2]}
+                style={{ borderRadius: 16 }}
+              />
+              <Stack
+                pos="absolute"
+                bottom={20}
+                left={20}
+                gap={6}
               >
-                <Box
-                  style={{
-                    borderRadius: 16,
-                    zIndex: 0
-                  }}
-                  pos={"absolute"}
-                  w={"100%"}
-                  h={"100%"}
-                  bg={colors.trans.dark[2]}
-                />
-                <Text style={{
-                  position: 'absolute',
-                  bottom: 35,
-                  left: 15,
-                }} fw={'bold'} fz={{ base: 'md', md: 'h3' }} c={colors['white-1']}>{state.findUnique.data.name}</Text>
-                <Text style={{
-                  position: 'absolute',
-                  bottom: 10,
-                  left: 15,
-                }} fw={'bold'} fz={{ base: 'md', md: 'h4' }} c={colors['white-1']}>{state.findUnique.data.alamat}</Text>
-              </BackgroundImage>
-              <Grid
-                py={20}>
-                <GridCol span={{ base: 12, md: 6 }}>
+                <Text fw="bold" fz={{ base: 'lg', md: 'h2' }} c={colors['white-1']}>
+                  {data.name}
+                </Text>
+                <Group gap={6}>
+                  <IconMapPin size={20} color="white" />
+                  <Text fz={{ base: 'sm', md: 'md' }} c={colors['white-1']}>
+                    {data.alamat}
+                  </Text>
+                </Group>
+              </Stack>
+            </BackgroundImage>
+
+            <Grid mt="xl" gutter="xl">
+              <GridCol span={{ base: 12, md: 6 }}>
+                <Stack gap="lg">
                   <Box>
-                    <Stack>
-                      <Title order={3}>Informasi</Title>
-                      <Box>
-                        <Text>Alamat: {state.findUnique.data.alamat}</Text>
-                        <Text>Telepon: {state.findUnique.data.kontak.kontakPuskesmas}</Text>
-                        <Text>Email: {state.findUnique.data.kontak.email}</Text>
-                      </Box>
-                      <Title order={3}>Jam Operasional</Title>
-                      <Box>
-                        <Text pb={10} fz={'h4'} fw={"bold"}>
-                          Senin - Kamis: <Text span fz={'h4'}>{state.findUnique.data?.jam.workDays} - {state.findUnique.data?.jam.weekDays}</Text>
-                        </Text>
-                      </Box>
+                    <Title order={3} mb={10}>Informasi Kontak</Title>
+                    <Stack gap={8}>
+                      <Group gap={8}>
+                        <IconPhone size={18} />
+                        <Text fz="md">{data.kontak.kontakPuskesmas || '-'}</Text>
+                      </Group>
+                      <Group gap={8}>
+                        <IconMail size={18} />
+                        <Text fz="md">{data.kontak.email || '-'}</Text>
+                      </Group>
                     </Stack>
                   </Box>
-                </GridCol>
-                <GridCol span={{ base: 12, md: 6 }}>
-                  <Box>
-                    <Paper p={"xl"} bg={'#B1C5F2'}>
-                      <SimpleGrid
-                        cols={{
-                          base: 1,
-                          md: 2
-                        }}>
-                        <Paper p={"xl"} bg={colors['white-trans-1']}>
-                          <Text fw={"bold"} fz={'h3'} ta={'center'}>Poliklinik Umum</Text>
-                          <Text ta={'center'} fz={{ base: 45, md: 65 }} fw={'bold'} c={colors['blue-button']}>26</Text>
-                        </Paper>
-                        <Paper p={"xl"} bg={colors['white-trans-1']}>
-                          <Text ta={'center'} fz={'h3'} fw={"bold"}>Poli Gigi</Text>
-                          <Text ta={'center'} fz={{ base: 45, md: 65 }} fw={'bold'} c={colors['blue-button']}>26</Text>
-                        </Paper>
-                      </SimpleGrid>
-                    </Paper>
-                  </Box>
-                </GridCol>
-                <Box>
-                </Box>
-              </Grid>
-            </Box>
 
-          </Paper>
-        </Box>
+                  <Divider />
+
+                  <Box>
+                    <Title order={3} mb={10}>Jam Operasional</Title>
+                    <Group gap={8}>
+                      <IconClock size={18} />
+                      <Text fw="bold" fz="md">
+                        {data.jam.workDays} - {data.jam.weekDays}
+                      </Text>
+                      <Tooltip label="Hari aktif pelayanan puskesmas" position="top" withArrow>
+                        <Badge size="sm" variant="light" color="blue">Aktif</Badge>
+                      </Tooltip>
+                    </Group>
+                  </Box>
+                </Stack>
+              </GridCol>
+
+              <GridCol span={{ base: 12, md: 6 }}>
+                <Paper p="xl" radius="lg" bg="linear-gradient(135deg, #EAF0FB, #BFD4F5)" shadow="sm">
+                  <Title order={3} mb="lg" ta="center" c="dark">Layanan Unggulan</Title>
+                  <SimpleGrid cols={{ base: 1, sm: 2 }} spacing="lg">
+                    <Paper p="lg" radius="lg" withBorder bg={colors['white-trans-1']} shadow="xs">
+                      <Stack align="center" gap={8}>
+                        <IconBuildingHospital size={36} color={colors['blue-button']} />
+                        <Text fw="bold" fz="lg">Poliklinik Umum</Text>
+                        <Text fz={{ base: 36, md: 48 }} fw="bold" c={colors['blue-button']}>26</Text>
+                      </Stack>
+                    </Paper>
+                    <Paper p="lg" radius="lg" withBorder bg={colors['white-trans-1']} shadow="xs">
+                      <Stack align="center" gap={8}>
+                        <IconBuildingHospital size={36} color={colors['blue-button']} />
+                        <Text fw="bold" fz="lg">Poli Gigi</Text>
+                        <Text fz={{ base: 36, md: 48 }} fw="bold" c={colors['blue-button']}>26</Text>
+                      </Stack>
+                    </Paper>
+                  </SimpleGrid>
+                </Paper>
+              </GridCol>
+            </Grid>
+          </Box>
+        </Paper>
       </Stack>
     </Stack>
   );

src/app/darmasaba/(pages)/kesehatan/puskesmas/page.tsx

@@ -1,14 +1,13 @@
 'use client'
 import puskesmasState from '@/app/admin/(dashboard)/_state/kesehatan/puskesmas/puskesmas';
 import colors from '@/con/colors';
-import { Anchor, Box, Center, Grid, GridCol, Image, Pagination, Paper, SimpleGrid, Skeleton, Stack, Text, TextInput } from '@mantine/core';
+import { Anchor, Box, Center, Grid, GridCol, Image, Pagination, Paper, SimpleGrid, Skeleton, Stack, Text, TextInput, Badge, Group } from '@mantine/core';
 import { useShallowEffect } from '@mantine/hooks';
-import { IconSearch } from '@tabler/icons-react';
+import { IconSearch, IconMapPin, IconPhone, IconMail } from '@tabler/icons-react';
 import { useState } from 'react';
 import { useProxy } from 'valtio/utils';
 import BackButton from '../../desa/layanan/_com/BackButto';
 
-
 function Page() {
   const state = useProxy(puskesmasState)
   const [search, setSearch] = useState('')
@@ -22,76 +21,122 @@ function Page() {
   } = state.findMany;
 
   useShallowEffect(() => {
-    load(page, 3, search)
+    load(page, 6, search)
   }, [page, search])
 
   if (loading || !data) {
     return (
-      <Box py={10}>
-        <Skeleton h={500} />
+      <Box py="xl" px={{ base: 'md', md: 100 }}>
+        <SimpleGrid cols={{ base: 1, md: 3 }} spacing="lg">
+          {Array.from({ length: 6 }).map((_, i) => (
+            <Skeleton key={i} height={320} radius="lg" />
+          ))}
+        </SimpleGrid>
       </Box>
     )
   }
 
   return (
-    <Stack pos={"relative"} bg={colors.Bg} py={"xl"} gap={"22"}>
+    <Stack pos="relative" bg={colors.Bg} py="xl" gap="lg">
       <Box px={{ base: 'md', md: 100 }}>
         <BackButton />
       </Box>
-      <Grid align='center' px={{ base: 'md', md: 100 }}>
-        <GridCol span={{ base: 12, md: 9 }}>
-          <Text fz={{ base: "h1", md: "2.5rem" }} c={colors["blue-button"]} fw={"bold"}>
-            Puskesmas Darmasaba
+
+      <Grid align="center" px={{ base: 'md', md: 100 }} mb="md">
+        <GridCol span={{ base: 12, md: 8 }}>
+          <Text fz={{ base: "2rem", md: "2.5rem" }} c={colors["blue-button"]} fw="bold">
+            Daftar Puskesmas
+          </Text>
+          <Text fz="sm" c="dimmed">
+            Temukan informasi lengkap mengenai layanan, kontak, dan lokasi Puskesmas Darmasaba
           </Text>
         </GridCol>
-        <GridCol span={{ base: 12, md: 3 }}>
+        <GridCol span={{ base: 12, md: 4 }}>
           <TextInput
-            radius={"lg"}
-            placeholder='Cari Puskesmas'
+            radius="xl"
+            placeholder="Cari nama puskesmas..."
             value={search}
             onChange={(e) => setSearch(e.target.value)}
-            leftSection={<IconSearch size={20} />}
-            w={{ base: "50%", md: "100%" }}
+            leftSection={<IconSearch size={18} />}
+            aria-label="Cari Puskesmas"
           />
         </GridCol>
       </Grid>
-      <Box px={{ base: "md", md: 100 }}>
-        <SimpleGrid
-          cols={{
-            base: 1,
-            md: 3,
-          }}
-        >
-          {data.map((v, k) => {
-            return (
-              <Paper p={"xl"} bg={colors['white-trans-1']} key={k}>
-                <Stack gap={"xs"}>
-                  <Text fw={"bold"} fz={"h3"}>{v.name}</Text>
+
+      <Box px={{ base: 'md', md: 100 }}>
+        {data.length === 0 ? (
+          <Center py="xl">
+            <Stack align="center" gap="xs">
+              <Text fz="lg" fw={500} c="dimmed">Tidak ada data ditemukan</Text>
+              <Text fz="sm" c="dimmed">Coba gunakan kata kunci pencarian yang berbeda</Text>
+            </Stack>
+          </Center>
+        ) : (
+          <SimpleGrid cols={{ base: 1, sm: 2, md: 3 }} spacing="lg">
+            {data.map((v, k) => (
+              <Paper
+                key={k}
+                p="lg"
+                radius="xl"
+                withBorder
+                shadow="md"
+                bg={colors['white-trans-1']}
+                style={{ transition: 'transform 200ms ease' }}
+                className="hover:scale-[1.02]"
+              >
+                <Stack gap="sm">
                   <Image
                     src={v.image.link}
                     alt={v.name}
+                    radius="md"
+                    height={160}
+                    fit="cover"
                   />
-                  <Box>
-                    <Text>Alamat: {v.alamat}</Text>
-                    <Text>Telepon: {v.kontak.kontakPuskesmas}</Text>
-                    <Text>Email: {v.kontak.email}</Text>
-                  </Box>
-                  <Anchor c={colors['blue-button']} href={`/darmasaba/kesehatan/puskesmas/${v.id}`}>Lihat Detail &gt;</Anchor>
+                  <Group justify="space-between">
+                    <Text fw={600} fz="lg" lineClamp={1}>{v.name}</Text>
+                    <Badge color="blue" variant="light" radius="sm" fz="xs">Aktif</Badge>
+                  </Group>
+                  <Stack gap={4}>
+                    <Group gap="xs">
+                      <IconMapPin size={16} />
+                      <Text fz="sm" c="dimmed" lineClamp={2}>{v.alamat}</Text>
+                    </Group>
+                    <Group gap="xs">
+                      <IconPhone size={16} />
+                      <Text fz="sm" c="dimmed">{v.kontak.kontakPuskesmas}</Text>
+                    </Group>
+                    <Group gap="xs">
+                      <IconMail size={16} />
+                      <Text fz="sm" c="dimmed">{v.kontak.email}</Text>
+                    </Group>
+                  </Stack>
+                  <Anchor
+                    href={`/darmasaba/kesehatan/puskesmas/${v.id}`}
+                    fz="sm"
+                    fw={500}
+                    c={colors['blue-button']}
+                  >
+                    Lihat detail →
+                  </Anchor>
                 </Stack>
               </Paper>
-            )
-          })}
-        </SimpleGrid>
+            ))}
+          </SimpleGrid>
+        )}
       </Box>
-      <Center>
-        <Pagination
-          value={page}
-          onChange={(newPage) => load(newPage)} // ini penting!
-          total={totalPages}
-          mt="md"
-          mb="md"
-        />
-      </Center>
+
+      {totalPages > 1 && (
+        <Center>
+          <Pagination
+            value={page}
+            onChange={(newPage) => load(newPage, 6, search)}
+            total={totalPages}
+            size="md"
+            radius="xl"
+            mt="lg"
+          />
+        </Center>
+      )}
     </Stack>
   );
 }

src/app/darmasaba/(pages)/lingkungan/data-lingkungan-desa/page.tsx

@@ -1,85 +1,126 @@
+'use client'
+import dataLingkunganDesaState from '@/app/admin/(dashboard)/_state/lingkungan/data-lingkungan-desa';
 import colors from '@/con/colors';
-import { Box, Paper, SimpleGrid, Stack, Text } from '@mantine/core';
-import { IconChristmasTree, IconDroplet, IconHome, IconLeaf, IconTrash } from '@tabler/icons-react';
+import { Badge, Box, Center, Group, Pagination, Paper, SimpleGrid, Skeleton, Stack, Text, TextInput, Tooltip } from '@mantine/core';
+import { useDebouncedValue, useShallowEffect } from '@mantine/hooks';
+import { Icon, IconChartLine, IconChristmasTreeFilled, IconClipboardTextFilled, IconDroplet, IconHome, IconHomeEco, IconLeaf, IconRecycle, IconScale, IconSearch, IconShieldFilled, IconTent, IconTrashFilled, IconTree, IconTrendingUp, IconTrophy, IconTruckFilled } from '@tabler/icons-react';
+import React, { useState } from 'react';
+import { useProxy } from 'valtio/utils';
 import BackButton from '../../desa/layanan/_com/BackButto';
 
-const data = [
-  {
-    id: 1,
-    icon: <IconLeaf size={100} color={colors['blue-button']} />,
-    title: 'Luas Lahan Hijau',
-    jumlah: '± 25 hektar',
-    deskripsi: 'tersebar di area persawahan, kebun, dan taman desa.'
-  },
-  {
-    id: 2,
-    icon: <IconHome size={100} color={colors['blue-button']} />,
-    title: 'Jumlah Rumah Tangga',
-    jumlah: '± 1.500 rumah tangga',
-    deskripsi: 'yang mayoritas sudah memiliki fasilitas pengelolaan sampah mandiri.'
-  },
-  {
-    id: 3,
-    icon: <IconDroplet size={100} color={colors['blue-button']} />,
-    title: 'Jumlah Sungai dan Saluran Air',
-    jumlah: '± 3 Sungai Besar',
-    deskripsi: 'dan beberapa saluran irigasi tradisional (subak) yang masih aktif digunakan.'
-  },
-  {
-    id: 4,
-    icon: <IconChristmasTree size={100} color={colors['blue-button']} />,
-    title: 'Program Penghijauan',
-    jumlah: '± 1000 Pohon',
-    deskripsi: 'Dilaksanakan secara berkala melalui kegiatan menanam pohon di area umum dan perbukitan.'
-  },
-  {
-    id: 5,
-    icon: <IconTrash size={100} color={colors['blue-button']} />,
-    title: 'Pengelolaan Sampah',
-    jumlah: '± 5 Bank Sampah',
-    deskripsi: 'Didukung oleh Bank Sampah dan sistem pemilahan sampah rumah tangga.'
-  },
-]
 function Page() {
+  const state = useProxy(dataLingkunganDesaState.findMany)
+  const [search, setSearch] = useState('')
+  const [debouncedSearch] = useDebouncedValue(search, 500); // 500ms delay
+
+  const {
+    data,
+    load,
+    page,
+    totalPages,
+  } = state
+
+  const iconMap: Record<string, Icon> = {
+    ekowisata: IconLeaf,
+    kompetisi: IconTrophy,
+    wisata: IconTent,
+    ekonomi: IconChartLine,
+    sampah: IconRecycle,
+    truck: IconTruckFilled,
+    scale: IconScale,
+    clipboard: IconClipboardTextFilled,
+    trash: IconTrashFilled,
+    lingkunganSehat: IconHomeEco,
+    sumberOksigen: IconChristmasTreeFilled,
+    ekonomiBerkelanjutan: IconTrendingUp,
+    mencegahBencana: IconShieldFilled,
+    rumah: IconHome,
+    pohon: IconTree,
+    air: IconDroplet
+
+  };
+
+  useShallowEffect(() => {
+    load(page, 6, debouncedSearch)
+  }, [page, debouncedSearch])
+
+  if (state.loading || !data) {
+    return (
+      <Stack pos={"relative"} bg={colors.Bg} py={"xl"} gap={"22"}>
+        <Skeleton h={500} />
+      </Stack>
+    )
+  }
+
   return (
-    <Stack pos={"relative"} bg={colors.Bg} py={"xl"} gap={"22"}>
+    <Stack pos="relative" bg={colors.Bg} py="xl" gap="28px">
       <Box px={{ base: 'md', md: 100 }}>
         <BackButton />
       </Box>
-      <Box px={{ base: 'md', md: 100 }} >
-        <Text ta={"center"} fz={{ base: "h1", md: "2.5rem" }} c={colors["blue-button"]} fw={"bold"}>
-          Data Lingkungan Desa
+      <Box px={{ base: 'md', md: 100 }}>
+        <Group justify="space-between" align='center' mt="md">
+          <Text ta="center" fz={{ base: "h1", md: "2.5rem" }} c={colors["blue-button"]} fw="bold">
+            Data Lingkungan Desa
+          </Text>
+          <TextInput
+            radius="xl"
+            w={'30%'}
+            placeholder="Cari Data Lingkungan Desa"
+            leftSection={<IconSearch size={20} />}
+            value={search}
+            onChange={(e) => setSearch(e.currentTarget.value)}
+          />
+        </Group>
+        <Text fz="lg" c={'black'}>
+          Desa Darmasaba menjaga dan mengembangkan lingkungan demi kesejahteraan warganya. Fokus utama meliputi penghijauan, pengelolaan sampah, dan perlindungan kawasan hijau.
         </Text>
-        <Text px={20} ta={'center'} fz={'h4'}>Desa Darmasaba memiliki lingkungan yang terus dijaga dan dikembangkan demi kesejahteraan warganya. Upaya pelestarian lingkungan difokuskan pada penghijauan, pengelolaan sampah, serta perlindungan kawasan hijau.</Text>
       </Box>
-      <Box px={{ base: 'md', md: 100 }} >
-        <SimpleGrid
-          cols={{
-            base: 1,
-            md: 2,
-          }}>
-          {data.map((v, k) => {
-            return (
-              <Box key={k}>
-                <Paper p={20} bg={colors['white-trans-1']}>
-                  <Text fw={'bold'} c={colors['blue-button']} fz={{ base: "lg", md: "xl" }} >
-                    {v.title}
-                  </Text>
-                  <Box>
-                    {v.icon}
-                    <Text c={colors['blue-button']} fz={'h4'} fw={'bold'}>
-                      {v.jumlah}
-                    </Text>
-                  </Box>
-                  <Text fz={{ base: "lg", md: "xl" }} >
-                    {v.deskripsi}
-                  </Text>
-
-                </Paper>
-              </Box>
-            )
-          })}
+      <Box px={{ base: 'md', md: 100 }}>
+        <SimpleGrid cols={{ base: 1, md: 2 }} spacing="lg">
+          {data.map((item) => (
+            <Paper
+              key={item.id}
+              p="lg"
+              bg={colors['white-trans-2']}
+              radius="md"
+              shadow="xl"
+              style={{ transition: 'all 0.3s', '&:hover': { transform: 'translateY(-5px)', boxShadow: `0 0 20px ${colors['blue-button']}` } }}
+            >
+              <Stack align="center" gap="md">
+                <Tooltip label={item.name} position="top" withArrow>
+                  <Center>
+                    {iconMap[item.icon] ? (
+                      React.createElement(iconMap[item.icon], { 
+                        size: 55, 
+                        color: colors['blue-button'],
+                        style: { 
+                          transition: 'all 0.3s',
+                          filter: 'drop-shadow(0 2px 4px rgba(0,0,0,0.1))'
+                        }
+                      })
+                    ) : null}
+                  </Center>
+                </Tooltip>
+                <Text fw="bold" fz="xl" c={colors['blue-button']}>
+                ± {item.jumlah}
+                </Text>
+                <Text ta="center" fz="md" c={"black"} dangerouslySetInnerHTML={{ __html: item.deskripsi }} />
+                <Badge variant="gradient" gradient={{ from: '#1C6EA4', to: '#69C0FF' }} size="sm">
+                  {item.name}
+                </Badge>
+              </Stack>
+            </Paper>
+          ))}
         </SimpleGrid>
+        <Center mt="xl">
+          <Pagination
+            value={page}
+            onChange={(newPage) => load(newPage)}
+            total={totalPages}
+            color="blue"
+            radius="xl"
+          />
+        </Center>
       </Box>
     </Stack>
   );

src/app/darmasaba/(pages)/lingkungan/edukasi-lingkungan/page.tsx

@@ -1,100 +1,87 @@
+'use client'
 import colors from '@/con/colors';
-import { Box, List, ListItem, Paper, SimpleGrid, Stack, Text } from '@mantine/core';
+import { Box, List, ListItem, Paper, SimpleGrid, Stack, Text, Tooltip } from '@mantine/core';
+import { IconLeaf, IconPlant2, IconRecycle } from '@tabler/icons-react';
 import BackButton from '../../desa/layanan/_com/BackButto';
 
 const data = [
   {
     id: 1,
     title: 'Tujuan Edukasi Lingkungan',
-    listDeskripsi: <List fz={'h4'} pr={20} ta={'justify'}>
-      <ListItem>
-        Meningkatkan kesadaran masyarakat tentang pentingnya lingkungan bersih dan sehat
-      </ListItem>
-      <ListItem>
-        Mendorong partisipasi warga dalam kegiatan pengelolaan sampah, penghijauan, dan konservasi
-      </ListItem>
-      <ListItem>
-        Mengurangi dampak negatif terhadap lingkungan dari kegiatan manusia
-      </ListItem>
-      <ListItem>
-        Membentuk generasi muda yang peduli terhadap isu-isu lingkungan
-      </ListItem>
-    </List>
+    icon: <IconLeaf size={28} color={colors['blue-button']} />,
+    listDeskripsi: [
+      'Meningkatkan kesadaran masyarakat akan pentingnya lingkungan bersih dan sehat',
+      'Mendorong partisipasi warga dalam pengelolaan sampah, penghijauan, dan konservasi',
+      'Mengurangi dampak negatif kegiatan manusia terhadap lingkungan',
+      'Membentuk generasi muda peduli isu-isu lingkungan',
+    ],
   },
   {
     id: 2,
     title: 'Materi Edukasi yang Diberikan',
-    listDeskripsi: <List fz={'h4'} pr={20} ta={'justify'}>
-      <ListItem>
-        Pengelolaan Sampah (Pilah sampah organik dan anorganik)
-      </ListItem>
-      <ListItem>
-        Pencegahan pencemaran lingkungan (air, udara, dan tanah)
-      </ListItem>
-      <ListItem>
-        Pemanfaatan lahan hijau dan penghijauan desa
-      </ListItem>
-      <ListItem>
-        Daur ulang dan kreatifitas dari sampah
-      </ListItem>
-      <ListItem>
-        Bahaya pembakaran sampah sembarangan
-      </ListItem>
-    </List>
+    icon: <IconRecycle size={28} color={colors['blue-button']} />,
+    listDeskripsi: [
+      'Pengelolaan sampah: pilah organik & anorganik',
+      'Pencegahan pencemaran lingkungan (air, udara, tanah)',
+      'Pemanfaatan lahan hijau dan penghijauan desa',
+      'Daur ulang dan kreativitas dari sampah',
+      'Bahaya pembakaran sampah sembarangan',
+    ],
   },
-  
   {
     id: 3,
     title: 'Contoh Kegiatan di Desa Darmasaba',
-    listDeskripsi: <List fz={'h4'} pr={20} ta={'justify'}>
-      <ListItem>
-        Pelatihan membuat kompos dari sampah rumah tangga
-      </ListItem>
-      <ListItem>
-        Gerakan &quot;Jumat Bersih&quot; rutin
-      </ListItem>
-      <ListItem>
-        Workshop membuat ecobrick
-      </ListItem>
-      <ListItem>
-        Lomba kebersihan antar banjar
-      </ListItem>
-      <ListItem>
-        Sosialisasi lingkungan di sekolah dan posyandu
-      </ListItem>
-    </List>
+    icon: <IconPlant2 size={28} color={colors['blue-button']} />,
+    listDeskripsi: [
+      'Pelatihan membuat kompos dari sampah rumah tangga',
+      'Gerakan "Jumat Bersih" rutin',
+      'Workshop pembuatan ecobrick',
+      'Lomba kebersihan antar banjar',
+      'Sosialisasi lingkungan di sekolah dan posyandu',
+    ],
   },
-]
+];
+
 function Page() {
   return (
-    <Stack pos={"relative"} bg={colors.Bg} py={"xl"} gap={"22"}>
+    <Stack pos="relative" bg={colors.Bg} py="xl" gap="22">
       <Box px={{ base: 'md', md: 100 }}>
         <BackButton />
       </Box>
+
       <Box px={{ base: 'md', md: 100 }} pb={20}>
-        <Text ta={"center"} fz={{ base: "h1", md: "2.5rem" }} c={colors["blue-button"]} fw={"bold"}>
+        <Text ta={'center'} fz={{ base: "h1", md: "2.5rem" }} c={colors["blue-button"]} fw="bold">
           Edukasi Lingkungan
         </Text>
-        <Text px={20} ta={'center'} fz={'h4'}>
-          Edukasi Lingkungan adalah bagian penting dalam membentuk perilaku masyarakat yang peduli dan bertanggung jawab terhadap kelestarian alam. Melalui program ini, masyarakat diajak untuk memahami pentingnya menjaga lingkungan demi kesehatan, kenyamanan, dan keberlanjutan hidup bersama.
+        <Text ta={'center'} fz="h4" c="black">
+          Program edukasi ini membimbing masyarakat untuk peduli dan bertanggung jawab terhadap alam,
+          meningkatkan kesehatan, kenyamanan, dan keberlanjutan hidup bersama.
         </Text>
       </Box>
-      <Box px={{ base: 'md', md: 100 }} >
-        <SimpleGrid
-          cols={{
-            base: 1,
-            md: 3,
-          }}>
-          {data.map((v, k) => {
-            return (
-              <Box key={k}>
-                <Paper h={{base: 0, md: 350}} p={20} bg={colors['white-trans-1']}>
-                  <Text  fz={'h3'} fw={'bold'} c={colors['blue-button']}>{v.title}</Text>
-                  {v.listDeskripsi}
-                </Paper>
-              </Box>
-            )
-          })}
+
+      <Box px={{ base: 'md', md: 100 }}>
+        <SimpleGrid cols={{ base: 1, md: 3 }} spacing="lg">
+          {data.map((item) => (
+            <Paper key={item.id} p={20} bg={colors['white-trans-1']} shadow="md" radius="md">
+              <Stack gap="md">
+                <Box>
+                  <Tooltip label={item.title} position="top" withArrow>
+                    <Stack gap={4} align="center">
+                      {item.icon}
+                      <Text fz="h3" fw="bold" c={colors['blue-button']} ta="center">
+                        {item.title}
+                      </Text>
+                    </Stack>
+                  </Tooltip>
+                </Box>
+                <List fz="h4" spacing="sm" withPadding>
+                  {item.listDeskripsi.map((desc, idx) => (
+                    <ListItem key={idx}>{desc}</ListItem>
+                  ))}
+                </List>
+              </Stack>
+            </Paper>
+          ))}
         </SimpleGrid>
       </Box>
     </Stack>

src/app/darmasaba/(pages)/lingkungan/gotong-royong/[kategori]/[id]/page.tsx

@@ -0,0 +1,80 @@
+/* eslint-disable react-hooks/exhaustive-deps */
+'use client'
+
+import gotongRoyongState from '@/app/admin/(dashboard)/_state/lingkungan/gotong-royong';
+import BackButton from '@/app/darmasaba/(pages)/desa/layanan/_com/BackButto';
+import colors from '@/con/colors';
+import { Box, Center, Container, Image, Skeleton, Stack, Text } from '@mantine/core';
+import { useParams } from 'next/navigation';
+import { useEffect, useState } from 'react';
+import { useProxy } from 'valtio/utils';
+
+
+
+
+function Page() {
+  const params = useParams<{ id: string }>();
+  const id = Array.isArray(params.id) ? params.id[0] : params.id;
+  const state = useProxy(gotongRoyongState.kegiatanDesa)
+  const [loading, setLoading] = useState(true)
+
+  useEffect(() => {
+    const loadData = async () => {
+      if (!id) return;
+      try {
+        setLoading(true);
+        await state.findUnique.load(id);
+      } catch (error) {
+        console.error('Error loading data:', error);
+      } finally {
+        setLoading(false);
+      }
+    }
+    loadData()
+  }, [id])
+
+  if (loading) {
+    return (
+      <Center>
+        <Skeleton height={500} />
+      </Center>
+    );
+  }
+
+  if (!state.findUnique.data) {
+    return (
+      <Center>
+        <Text>Data tidak ditemukan</Text>
+      </Center>
+    );
+  }
+
+
+  return (
+    <Stack pos={"relative"} bg={colors.Bg} py={"xl"} gap={"22"} px={{ base: "md", md: 0 }}>
+      <Box px={{ base: "md", md: 100 }}><BackButton /></Box>
+      <Container w={{ base: "100%", md: "50%" }} >
+        <Box pb={20}>
+          <Text ta={"center"} fz={"2.4rem"} c={colors["blue-button"]} fw={"bold"}>
+            {state.findUnique.data?.judul}
+          </Text>
+          <Text
+            ta={"center"}
+            fw={"bold"}
+            fz={"1.5rem"}
+          >
+            Informasi Kegiatan Gotong Royong
+          </Text>
+        </Box>
+        <Image src={state.findUnique.data?.image?.link || ''} alt='' w={"100%"} />
+      </Container>
+      <Box px={{ base: "md", md: 100 }}>
+        <Stack gap={"xs"}>
+          <Text py={20} fz={{ base: "sm", md: "lg" }} ta={"justify"} dangerouslySetInnerHTML={{ __html: state.findUnique.data?.deskripsiLengkap || '' }} />
+        </Stack>
+      </Box>
+    </Stack>
+  );
+}
+
+export default Page;

src/app/darmasaba/(pages)/lingkungan/gotong-royong/[kategori]/content.tsx

@@ -0,0 +1,168 @@
+/* eslint-disable react-hooks/exhaustive-deps */
+'use client'
+import gotongRoyongState from '@/app/admin/(dashboard)/_state/lingkungan/gotong-royong';
+import {
+  Badge,
+  Box,
+  Button,
+  Card,
+  Center,
+  Container,
+  Divider,
+  Grid,
+  GridCol,
+  Group,
+  Image,
+  Pagination,
+  Paper,
+  SimpleGrid,
+  Skeleton,
+  Stack,
+  Text,
+  Title,
+} from '@mantine/core';
+import { IconArrowRight, IconCalendar } from '@tabler/icons-react';
+import { useTransitionRouter } from 'next-view-transitions';
+import { useEffect, useState } from 'react';
+import { useProxy } from 'valtio/utils';
+
+export default function Content({ kategori }: { kategori: string }) {
+  const router = useTransitionRouter();
+  const [page, setPage] = useState(1);
+
+  const state = useProxy(gotongRoyongState.kegiatanDesa);
+  const featuredState = useProxy(gotongRoyongState.kegiatanDesa.findFirst);
+
+  const featured = featuredState.data;
+  const paginatedNews = state.findMany.data || [];
+  const totalPages = state.findMany.totalPages || 1;
+
+  // Load data
+  useEffect(() => {
+    gotongRoyongState.kegiatanDesa.findFirst.load(kategori);
+  }, [kategori]);
+
+  useEffect(() => {
+    state.findMany.load(page, 3, '', kategori);
+  }, [page, kategori]);
+
+  return (
+    <Box py={20}>
+      <Container size="xl" px={{ base: 'md', md: 'xl' }}>
+        {/* === Gotong Royong Utama === */}
+        {featuredState.loading ? (
+          <Center><Skeleton h={400} /></Center>
+        ) : featured ? (
+          <Box mb={50}>
+            <Text fz="h2" fw={700} mb="md">Gotong Royong Utama</Text>
+            <Paper shadow="md" radius="md" withBorder>
+              <Grid gutter={0}>
+                <GridCol span={{ base: 12, md: 6 }}>
+                  <Image
+                    src={featured.image?.link}
+                    alt={featured.judul || 'Berita Utama'}
+                    height={400}
+                    fit="cover"
+                    radius="md"
+                    style={{ borderBottomRightRadius: 0, borderTopRightRadius: 0 }}
+                  />
+                </GridCol>
+                <GridCol span={{ base: 12, md: 6 }} p="xl">
+                  <Stack h="100%" justify="space-between">
+                    <div>
+                      <Badge color="blue" variant="light" mb="md">
+                        {featured.kategoriKegiatan?.nama || kategori}
+                      </Badge>
+                      <Title order={2} mb="md">{featured.judul}</Title>
+                      <Text color="dimmed" lineClamp={3} mb="md">{featured.deskripsiLengkap}</Text>
+                    </div>
+                    <Group justify="apart" mt="auto">
+                      <Group gap="xs">
+                        <IconCalendar size={18} />
+                        <Text size="sm">
+                          {new Date(featured.createdAt).toLocaleDateString('id-ID', {
+                            day: 'numeric',
+                            month: 'long',
+                            year: 'numeric',
+                          })}
+                        </Text>
+                      </Group>
+                      <Button
+                        variant="light"
+                        rightSection={<IconArrowRight size={16} />}
+                        onClick={() => router.push(`/darmasaba/lingkungan/gotong-royong/${kategori}/${featured.id}`)}
+                      >
+                        Baca Selengkapnya
+                      </Button>
+                    </Group>
+                  </Stack>
+                </GridCol>
+              </Grid>
+            </Paper>
+          </Box>
+        ) : null}
+
+        {/* === Daftar Gotong Royong === */}
+        <Box mt={50}>
+          <Title order={2} mb="md">Daftar Gotong Royong</Title>
+          <Divider mb="xl" />
+
+          {state.findMany.loading ? (
+            <SimpleGrid cols={{ base: 1, sm: 2, lg: 3 }} spacing="xl">
+              {Array(3).fill(0).map((_, i) => (
+                <Skeleton key={i} h={300} radius="md" />
+              ))}
+            </SimpleGrid>
+          ) : paginatedNews.length === 0 ? (
+            <Text c="dimmed" ta="center">Belum ada gotong royong di kategori &quot;{kategori}&quot;.</Text>
+          ) : (
+            <SimpleGrid cols={{ base: 1, sm: 2, lg: 3 }} spacing="xl" verticalSpacing="xl">
+              {paginatedNews.map((item) => (
+                <Card
+                  key={item.id}
+                  shadow="sm"
+                  p="lg"
+                  radius="md"
+                  withBorder
+                  onClick={() => router.push(`/darmasaba/lingkungan/gotong-royong/${kategori}/${item.id}`)}
+                  style={{ cursor: 'pointer' }}
+                >
+                  <Card.Section>
+                    <Image src={item.image?.link} height={200} alt={item.judul} fit="cover" />
+                  </Card.Section>
+                  <Badge color="blue" variant="light" mt="md">
+                    {item.kategoriKegiatan?.nama || kategori}
+                  </Badge>
+                  <Text fw={600} size="lg" mt="sm" lineClamp={2}>{item.judul}</Text>
+                  <Text size="sm" color="dimmed" lineClamp={3} mt="xs" dangerouslySetInnerHTML={{ __html: item.deskripsiLengkap }} />
+                  <Group justify="apart" mt="md" gap="xs">
+                    <Text size="xs" color="dimmed">
+                      {new Date(item.createdAt).toLocaleDateString('id-ID', {
+                        day: 'numeric',
+                        month: 'short',
+                        year: 'numeric',
+                      })}
+                    </Text>
+                    <Badge color="gray" variant="outline">Baca Selengkapnya</Badge>
+                  </Group>
+                </Card>
+              ))}
+            </SimpleGrid>
+          )}
+
+          {/* Pagination */}
+          <Center mt="xl">
+            <Pagination
+              total={totalPages}
+              value={page}
+              onChange={(newPage) => setPage(newPage)}
+              siblings={1}
+              boundaries={1}
+              withEdges
+            />
+          </Center>
+        </Box>
+      </Container>
+    </Box>
+  );
+}

src/app/darmasaba/(pages)/lingkungan/gotong-royong/[kategori]/page.tsx

@@ -0,0 +1,14 @@
+// src/app/darmasaba/(pages)/desa/berita/[kategori]/page.tsx
+import { Suspense } from "react";
+import Content from "./content";
+
+
+export default async function Page({ params }: { params: Promise<{ kategori: string }> }) {
+  const { kategori } = await params;
+
+  return (
+    <Suspense fallback={<div>Loading...</div>}>
+      <Content kategori={kategori} />
+    </Suspense>
+  );
+}

src/app/darmasaba/(pages)/lingkungan/gotong-royong/_lib/layoutTabs.tsx

@@ -0,0 +1,171 @@
+'use client'
+import colors from '@/con/colors';
+import { Box, Container, Grid, GridCol, Stack, Tabs, TabsList, TabsTab, Text, TextInput } from '@mantine/core';
+import { IconSearch } from '@tabler/icons-react';
+import { usePathname, useRouter, useSearchParams } from 'next/navigation';
+import React, { useEffect, useState } from 'react';
+import BackButton from '../../../desa/layanan/_com/BackButto';
+
+
+type HeaderSearchProps = {
+  placeholder?: string;
+  searchIcon?: React.ReactNode;
+  value?: string;
+  onChange?: (event: React.ChangeEvent<HTMLInputElement>) => void;
+  children?: React.ReactNode;
+};
+
+function LayoutTabsGotongRoyong({
+  children,
+  placeholder = "pencarian",
+  searchIcon = <IconSearch size={20} />
+}: HeaderSearchProps) {
+  const router = useRouter();
+  const pathname = usePathname();
+  const searchParams = useSearchParams();
+  
+  // Get active tab from URL path
+  const activeTab = pathname.split('/').pop() || 'semua';
+  
+  // Get initial search value from URL
+  const initialSearch = searchParams.get('search') || '';
+  const [searchValue, setSearchValue] = useState(initialSearch);
+  const [searchTimeout, setSearchTimeout] = useState<number | null>(null);
+  
+  // Update active tab state when pathname changes
+  const [activeTabState, setActiveTabState] = useState(activeTab);
+  useEffect(() => {
+    setActiveTabState(activeTab);
+  }, [activeTab]);
+
+  // Clean up timeouts on unmount
+  useEffect(() => {
+    return () => {
+      if (searchTimeout !== null) {
+        clearTimeout(searchTimeout);
+      }
+    };
+  }, [searchTimeout]);
+
+  // Handle search input change with debounce
+  const handleSearchChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+    const value = event.target.value;
+    setSearchValue(value);
+    
+    // Clear previous timeout
+    if (searchTimeout !== null) {
+      clearTimeout(searchTimeout);
+    }
+    
+    // Set new timeout
+    const newTimeout = window.setTimeout(() => {
+      const params = new URLSearchParams(searchParams.toString());
+      
+      if (value) {
+        params.set('search', value);
+      } else {
+        params.delete('search');
+      }
+      
+      // Only update URL if the search value has actually changed
+      if (params.toString() !== searchParams.toString()) {
+        router.push(`/darmasaba/lingkungan/gotong-royong/${activeTab}?${params.toString()}`);
+      }
+    }, 500); // 500ms debounce delay
+    
+    setSearchTimeout(newTimeout);
+  };
+  const tabs = [
+    {
+      label: "Semua",
+      value: "semua",
+      href: "/darmasaba/lingkungan/gotong-royong/semua"
+    },
+    {
+      label: "Kebersihan",
+      value: "kebersihan",
+      href: "/darmasaba/lingkungan/gotong-royong/kebersihan"
+    },
+    {
+      label: "Infrasturktur",
+      value: "infrasturktur",
+      href: "/darmasaba/lingkungan/gotong-royong/infrasturktur"
+    },
+    {
+      label: "Sosial",
+      value: "sosial",
+      href: "/darmasaba/lingkungan/gotong-royong/sosial"
+    },
+    {
+      label: "Lingkungan",
+      value: "lingkungan",
+      href: "/darmasaba/lingkungan/gotong-royong/lingkungan"
+    }
+  ];
+  const handleTabChange = (value: string | null) => {
+    if (!value) return;
+    const tab = tabs.find(t => t.value === value);
+    if (tab) {
+      const params = new URLSearchParams(searchParams.toString());
+      router.push(`/darmasaba/lingkungan/gotong-royong/${value}${params.toString() ? `?${params.toString()}` : ''}`);
+    }
+  };
+
+  return (
+    <Stack pos="relative" bg={colors.Bg} py="xl" gap="22">
+      {/* Header */}
+      <Box px={{ base: "md", md: 100 }}>
+        <BackButton />
+      </Box>
+      <Container size="lg" px="md">
+        <Stack align="center" gap="0" >
+          <Text fz={{ base: "2rem", md: "3.4rem" }} c={colors["blue-button"]} fw="bold" ta="center">
+            Gotong Royong Desa Darmasaba
+          </Text>
+          <Text ta="center" px="md">
+            Gotong royong rutin dilakukan oleh warga desa untuk meningkatkan kualitas hidup dan kesejahteraan masyarakat Desa Darmasaba
+          </Text>
+        </Stack>
+      </Container>
+
+      <Tabs
+        color={colors['blue-button']}
+        variant="pills"
+        value={activeTabState}
+        onChange={handleTabChange}
+      >
+        <Box px={{ base: "md", md: 100 }} py="md" bg={colors['BG-trans']}>
+          <Grid>
+            <GridCol span={{ base: 12, md: 9, lg: 8, xl: 9 }}>
+              <TabsList>
+                {tabs.map((tab, index) => (
+                  <TabsTab
+                    key={index}
+                    value={tab.value}
+                    onClick={() => router.push(tab.href)}
+                  >
+                    {tab.label}
+                  </TabsTab>
+                ))}
+              </TabsList>
+            </GridCol>
+            <GridCol span={{ base: 12, md: 3, lg: 4, xl: 3 }}>
+              <TextInput
+                radius="lg"
+                placeholder={placeholder}
+                leftSection={searchIcon}
+                w="100%"
+                value={searchValue}
+                onChange={handleSearchChange}
+              />
+            </GridCol>
+          </Grid>
+        </Box>
+
+        {children}
+      </Tabs>
+    </Stack>
+  );
+}
+
+export default LayoutTabsGotongRoyong;

src/app/darmasaba/(pages)/lingkungan/gotong-royong/layout.tsx

@@ -0,0 +1,12 @@
+// app/desa/berita/BeritaLayoutClient.tsx
+'use client'
+import dynamic from 'next/dynamic';
+
+const LayoutTabsGotongRoyong = dynamic(
+  () => import('./_lib/layoutTabs'),
+  { ssr: false }
+);
+
+export default function GotongRoyongLayoutClient({ children }: { children: React.ReactNode }) {
+  return <LayoutTabsGotongRoyong>{children}</LayoutTabsGotongRoyong>;
+}

src/app/darmasaba/(pages)/lingkungan/gotong-royong/page.tsx

@@ -1,89 +0,0 @@
-import colors from '@/con/colors';
-import { Stack, Box, Container, Grid, GridCol, Group, Paper, TextInput, Text, Image, Flex, Button } from '@mantine/core';
-import { IconCalendar, IconMapPin, IconSearch, IconUsersGroup } from '@tabler/icons-react';
-import React from 'react';
-import BackButton from '../../desa/layanan/_com/BackButto';
-import Link from 'next/link';
-
-function Page() {
-  return (
-    <Stack pos="relative" bg={colors.Bg} py="xl" gap="md">
-      {/* Header */}
-      <Box px={{ base: "md", md: 100 }}>
-        <BackButton />
-      </Box>
-      <Container size="lg" px="md">
-        <Stack align="center" gap={0} mb="xl">
-          <Text fz={{ base: "2rem", md: "3.4rem" }} c={colors["blue-button"]} fw="bold" ta="center">
-            Program Gotong Royong
-          </Text>
-          <Text fz={{ base: "2rem", md: "3.4rem" }} c={colors["blue-button"]} fw="bold" ta="center">
-            Desa Darmasaba
-          </Text>
-        </Stack>
-      </Container>
-
-      {/* Tabs Menu */}
-      <Box px={{ base: "md", md: "xl" }} py="md" bg={colors['BG-trans']} mb="md">
-        <Grid align="center" justify="space-between" mb={20}>
-          <GridCol span={{ base: 12, md: 8 }}>
-            <Group gap="md" wrap="wrap">
-              <Paper bg={colors['blue-button']} radius="xl" py={5} px={20}>
-                <Text c={colors['white-1']} size="sm">
-                  Semua
-                </Text>
-              </Paper>
-              {['Kebersihan', 'Infrastruktur', 'Sosial', 'Lingkungan'].map((kategori) => (
-                <Paper key={kategori} bg={colors['blue-button-trans']} radius="xl" py={5} px={20}>
-                  <Text size="sm">
-                    {kategori}
-                  </Text>
-                </Paper>
-              ))}
-            </Group>
-          </GridCol>
-          <GridCol span={{ base: 12, md: 4 }}>
-            <TextInput
-              radius="lg"
-              placeholder="Cari Program Gotong Royong"
-              leftSection={<IconSearch size={18} />}
-              w="100%"
-            />
-          </GridCol>
-        </Grid>
-        <Paper p={"xl"} bg={colors['white-trans-1']} w={{ base: "100%", md: "100%" }}>
-          <Stack gap={'xs'}>
-            <Image radius={20} src={'/api/img/gotong-royong.png'} w={'100%'} alt='' />
-            <Text fw={"bold"} fz={{ base: "h2", md: "h1" }}>Membangun Fasilitas Desa</Text>
-            <Group>
-              <Paper py={5} px={20} bg={colors['blue-button-trans']} radius={20}>
-                <Text c={colors['white-1']}>Sosial</Text>
-              </Paper>
-            </Group>
-            <Text fz={{ base: "h4", md: "h3" }}>
-              Program Pembangunan Fasilitas Desa Maju, Masyarakat Sejahtera.
-            </Text>
-            <Flex gap={5} align={'center'}>
-              <IconCalendar color={colors['blue-button-trans']} size={45} />
-              <Text fz={{ base: "h4", md: "h3" }}>1 April 2025</Text>
-            </Flex>
-            <Flex gap={5} align={'center'}>
-              <IconMapPin color={colors['blue-button-trans']} size={45} />
-              <Text fz={{ base: "h4", md: "h3" }}>Banjar Desa Darmasaba</Text>
-            </Flex>
-            <Flex gap={5} align={'center'}>
-              <IconUsersGroup color={colors['blue-button-trans']} size={45} />
-              <Text fz={{ base: "h4", md: "h3" }}>30 Partisipan</Text>
-            </Flex>
-            <Text fw={'bold'} fz={'md'}>Deskripsi : Program pembangunan Pura sebagai pusat spiritual dan budaya desa, melibatkan gotong royong masyarakat dalam pembangunan struktur utama serta ornamen tradisional.</Text>
-            <Group py={20} justify='center'>
-              <Button component={Link} href={'https://www.whatsapp.com/?lang=id'} bg={colors['blue-button']} >Daftar Sebagai Relawan</Button>
-            </Group>
-          </Stack>
-        </Paper>
-      </Box>
-    </Stack>
-  );
-}
-
-export default Page;

src/app/darmasaba/(pages)/lingkungan/gotong-royong/semua/page.tsx

@@ -0,0 +1,183 @@
+/* eslint-disable react-hooks/exhaustive-deps */
+'use client'
+import gotongRoyongState from '@/app/admin/(dashboard)/_state/lingkungan/gotong-royong';
+import { Badge, Box, Button, Card, Center, Container, Divider, Flex, Grid, GridCol, Group, Image, Pagination, Paper, SimpleGrid, Skeleton, Stack, Text, Title } from '@mantine/core';
+import { IconArrowRight, IconCalendar } from '@tabler/icons-react';
+import { useTransitionRouter } from 'next-view-transitions';
+import { useSearchParams } from 'next/navigation';
+import { useEffect, useState } from 'react';
+import { useProxy } from 'valtio/utils';
+
+function Page() {
+  const searchParams = useSearchParams();
+  const router = useTransitionRouter();
+
+  // Parameter URL
+  const search = searchParams.get('search') || '';
+  const currentPage = parseInt(searchParams.get('page') || '1');
+  const [page, setPage] = useState(currentPage);
+
+  // Gunakan proxy untuk state
+  const state = useProxy(gotongRoyongState.kegiatanDesa);
+  const featured = useProxy(gotongRoyongState.kegiatanDesa.findFirst); // ✅ Berita utama
+  const loadingGrid = state.findMany.loading;
+  const loadingFeatured = featured.loading;
+
+  // Load berita utama (hanya sekali)
+  useEffect(() => {
+    if (!featured.data && !loadingFeatured) {
+      gotongRoyongState.kegiatanDesa.findFirst.load();
+    }
+  }, [featured.data, loadingFeatured]);
+
+  // Load berita terbaru (untuk grid) saat page/search berubah
+  useEffect(() => {
+    const limit = 3; // Sesuaikan dengan tampilan grid
+    state.findMany.load(page, limit, search);
+  }, [page, search]);
+
+  // Update URL saat page berubah
+  useEffect(() => {
+    const url = new URLSearchParams();
+    if (search) url.set('search', search);
+    if (page > 1) url.set('page', page.toString());
+    router.replace(`?${url.toString()}`);
+  }, [page, search]);
+
+  const featuredData = featured.data;
+  const paginatedNews = state.findMany.data || [];
+  const totalPages = state.findMany.totalPages || 1;
+
+  return (
+    <Box py={20}>
+      <Container size="xl" px={{ base: "md", md: "xl" }}>
+        {/* === Gotong royong Utama (Tetap) === */}
+        {loadingFeatured ? (
+          <Center><Skeleton h={400} /></Center>
+        ) : featuredData ? (
+          <Box mb={50}>
+            <Text fz="h2" fw={700} mb="md">Gotong royong Utama</Text>
+            <Paper shadow="md" radius="md" withBorder>
+              <Grid gutter={0}>
+                <GridCol span={{ base: 12, md: 6 }}>
+                  <Image
+                    src={featuredData.image?.link || '/images/placeholder.jpg'}
+                    alt={featuredData.judul || 'Gotong royong Utama'}
+                    height={400}
+                    fit="cover"
+                    radius="md"
+                    style={{ borderBottomRightRadius: 0, borderTopRightRadius: 0 }}
+                  />
+                </GridCol>
+                <GridCol span={{ base: 12, md: 6 }} p="xl">
+                  <Stack h="100%" justify="space-between">
+                    <div>
+                      <Badge color="blue" variant="light" mb="md">
+                        {featuredData.kategoriKegiatan?.nama || 'Gotong royong'}
+                      </Badge>
+                      <Title order={2} mb="md">{featuredData.judul}</Title>
+                      <Text c="dimmed" lineClamp={3} mb="md">
+                        {featuredData.deskripsiSingkat}
+                      </Text>
+                    </div>
+                    <Group justify="apart" mt="auto">
+                      <Group gap="xs">
+                        <IconCalendar size={18} />
+                        <Text size="sm">
+                          {new Date(featuredData.createdAt).toLocaleDateString('id-ID', {
+                            day: 'numeric',
+                            month: 'long',
+                            year: 'numeric'
+                          })}
+                        </Text>
+                      </Group>
+                      <Button
+                        variant="light"
+                        rightSection={<IconArrowRight size={16} />}
+                        onClick={() => router.push(`/darmasaba/lingkungan/gotong-royong/${featuredData.kategoriKegiatan?.nama}/${featuredData.id}`)}
+                      >
+                        Baca Selengkapnya
+                      </Button>
+                    </Group>
+                  </Stack>
+                </GridCol>
+              </Grid>
+            </Paper>
+          </Box>
+        ) : null}
+
+        {/* === Gotong royong Terbaru (Berubah Saat Pagination) === */}
+        <Box mt={50}>
+          <Title order={2} mb="md">Gotong royong Terbaru</Title>
+          <Divider mb="xl" />
+
+          {loadingGrid ? (
+            <SimpleGrid cols={{ base: 1, sm: 2, lg: 3 }} spacing="xl">
+              {Array(3).fill(0).map((_, i) => (
+                <Skeleton key={i} h={300} radius="md" />
+              ))}
+            </SimpleGrid>
+          ) : paginatedNews.length === 0 ? (
+            <Text c="dimmed" ta="center">Tidak ada gotong royong ditemukan.</Text>
+          ) : (
+            <SimpleGrid cols={{ base: 1, sm: 2, lg: 3 }} spacing="xl" verticalSpacing="xl">
+              {paginatedNews.map((item) => (
+                <Card
+                  key={item.id}
+                  shadow="sm"
+                  p="lg"
+                  radius="md"
+                  withBorder
+                >
+                  <Card.Section>
+                    <Image
+                      src={item.image?.link || '/images/placeholder-small.jpg'}
+                      height={200}
+                      alt={item.judul}
+                      fit="cover"
+                    />
+                  </Card.Section>
+
+                  <Badge color="blue" variant="light" mt="md">
+                    {item.kategoriKegiatan?.nama || 'Gotong royong'}
+                  </Badge>
+
+                  <Text fw={600} size="lg" mt="sm" lineClamp={2}>{item.judul}</Text>
+
+                  <Text size="sm" c="dimmed" lineClamp={3} mt="xs">{item.deskripsiSingkat}</Text>
+
+                  <Flex align="center" justify="apart" mt="md" gap="xs">
+                    <Text size="xs" c="dimmed">
+                      {new Date(item.createdAt).toLocaleDateString('id-ID', {
+                        day: 'numeric',
+                        month: 'short',
+                        year: 'numeric'
+                      })}
+                    </Text>
+                    
+                    <Button p="xs" variant="light" rightSection={<IconArrowRight size={16} />} onClick={() => router.push(`/darmasaba/lingkungan/gotong-royong/${item.kategoriKegiatan?.nama}/${item.id}`)}>Baca Selengkapnya</Button>
+                  </Flex>
+                </Card>
+              ))}
+            </SimpleGrid>
+          )}
+
+          {/* Pagination hanya untuk berita terbaru */}
+          <Center mt="xl">
+            <Pagination
+              total={totalPages}
+              value={page}
+              onChange={setPage}
+              siblings={1}
+              boundaries={1}
+              withEdges
+            />
+          </Center>
+        </Box>
+      </Container>
+    </Box>
+  );
+}
+
+export default Page;
+

src/app/darmasaba/(pages)/lingkungan/konservasi-adat-bali/page.tsx

@@ -1,93 +1,79 @@
 import colors from '@/con/colors';
-import { Box, List, ListItem, Paper, SimpleGrid, Stack, Text } from '@mantine/core';
+import { Box, Center, List, ListItem, Paper, SimpleGrid, Stack, Text } from '@mantine/core';
 import BackButton from '../../desa/layanan/_com/BackButto';
 
 const data = [
   {
     id: 1,
     title: 'Filosofi Tri Hita Karana',
-    listDeskripsi: <List fz={'h4'} pr={20} ta={'justify'}>
-      <ListItem>
-        Parahyangan: Hubungan manusia dengan Tuhan
-      </ListItem>
-      <ListItem>
-        Pawongan: Hubungan antar manusia
-      </ListItem>
-      <ListItem>
-        Palemahan: Hubungan manusia dengan alam
-      </ListItem>
-    </List>
+    listDeskripsi: (
+      <List fz={'lg'} spacing="sm" ta={'justify'}>
+        <ListItem>Parahyangan: Hubungan manusia dengan Tuhan yang dijaga penuh kesadaran spiritual</ListItem>
+        <ListItem>Pawongan: Harmoni dan kerja sama antar manusia dalam masyarakat</ListItem>
+        <ListItem>Palemahan: Pelestarian lingkungan dan hubungan manusia dengan alam</ListItem>
+      </List>
+    ),
   },
   {
     id: 2,
     title: 'Bentuk Konservasi Berdasarkan Adat',
-    listDeskripsi: <List fz={'h4'} pr={20} ta={'justify'}>
-      <ListItem>
-        Pelestarian Hutan Adat seperti Alas Pala Sangeh atau Wana Kerthi
-      </ListItem>
-      <ListItem>
-        Subak: Sistem pengelolaan irigasi tradisional yang menjunjung kebersamaan dan keberlanjutan
-      </ListItem>
-      <ListItem>
-        Hari Raya Tumpek Uduh: Perayaan khusus untuk menghormati pohon dan tumbuhan
-      </ListItem>
-      <ListItem>
-        Perarem dan Awig-Awig: Aturan adat desa yang mengatur larangan menebang pohon sembarangan, membuang limbah ke sungai, dll.
-      </ListItem>
-      <ListItem>
-        Ritual penyucian alam seperti Melasti, Piodalan Segara, dan lainnya
-      </ListItem>
-    </List>
+    listDeskripsi: (
+      <List fz={'lg'} spacing="sm" ta={'justify'}>
+        <ListItem>Pelestarian Hutan Adat seperti Alas Pala Sangeh dan Wana Kerthi</ListItem>
+        <ListItem>Subak: Sistem irigasi tradisional yang menekankan kebersamaan dan keberlanjutan</ListItem>
+        <ListItem>Hari Raya Tumpek Uduh: Perayaan untuk menghormati pohon dan tumbuhan</ListItem>
+        <ListItem>Perarem & Awig-Awig: Aturan adat untuk menjaga lingkungan dari kerusakan</ListItem>
+        <ListItem>Ritual penyucian alam seperti Melasti dan Piodalan Segara</ListItem>
+      </List>
+    ),
   },
   {
     id: 3,
     title: 'Nilai Konservasi Adat',
-    listDeskripsi: <List fz={'h4'} pr={20} ta={'justify'}>
-      <ListItem>
-        Menjaga keseimbangan ekosistem
-      </ListItem>
-      <ListItem>
-        Melestarikan spiritualitas lokal dan kesucian alam
-      </ListItem>
-      <ListItem>
-        Menumbuhkan kesadaran kolektif untuk hidup selaras dengan lingkungan
-      </ListItem>
-      <ListItem>
-        Menjaga keberlangsungan sumber daya alam untuk generasi mendatang
-      </ListItem>
-    </List>
+    listDeskripsi: (
+      <List fz={'lg'} spacing="sm" ta={'justify'}>
+        <ListItem>Menjaga keseimbangan ekosistem dan lingkungan hidup</ListItem>
+        <ListItem>Melestarikan spiritualitas lokal dan kesucian alam</ListItem>
+        <ListItem>Meningkatkan kesadaran kolektif untuk hidup selaras dengan alam</ListItem>
+        <ListItem>Menjamin keberlanjutan sumber daya alam untuk generasi mendatang</ListItem>
+      </List>
+    ),
   },
-]
+];
+
 function Page() {
   return (
-    <Stack pos={"relative"} bg={colors.Bg} py={"xl"} gap={"22"}>
+    <Stack pos="relative" bg={colors.Bg} py="xl" gap="24">
       <Box px={{ base: 'md', md: 100 }}>
         <BackButton />
       </Box>
-      <Box px={{ base: 'md', md: 100 }} pb={20}>
-        <Text ta={"center"} fz={{ base: "h1", md: "2.5rem" }} c={colors["blue-button"]} fw={"bold"}>
+      <Box px={{ base: 'md', md: 100 }} pb={30}>
+        <Text ta="center" fz={{ base: '2xl', md: '3rem' }} c={colors['blue-button']} fw="bold">
           Konservasi Adat Bali
         </Text>
-        <Text px={20} ta={'center'} fz={'h4'}>
-          Konservasi Adat Bali adalah upaya pelestarian lingkungan yang berpijak pada kearifan lokal masyarakat Bali, di mana alam dan budaya dianggap sebagai satu kesatuan yang harus dijaga secara harmonis.
+        <Text px={20} ta="center" fz="lg" c="black">
+          Pelestarian lingkungan di Bali yang berpijak pada kearifan lokal, menjaga harmoni antara alam, budaya, dan manusia.
         </Text>
       </Box>
-      <Box px={{ base: 'md', md: 100 }} >
-        <SimpleGrid
-          cols={{
-            base: 1,
-            md: 3,
-          }}>
-          {data.map((v, k) => {
-            return (
-              <Box key={k}>
-                <Paper h={{ base: 0, md: 450 }} p={20} bg={colors['white-trans-1']}>
-                  <Text fz={'h3'} fw={'bold'} c={colors['blue-button']}>{v.title}</Text>
-                  {v.listDeskripsi}
-                </Paper>
-              </Box>
-            )
-          })}
+      <Box px={{ base: 'md', md: 100 }}>
+        <SimpleGrid cols={{ base: 1, md: 3 }} spacing="lg">
+          {data.map((item) => (
+            <Paper
+              key={item.id}
+              p="lg"
+              bg="linear-gradient(145deg, #DFE3E8FF 0%, #EFF1F4FF 100%)"
+              style={{ borderRadius: 16, boxShadow: '0 0 20px rgba(28, 110, 164, 0.5)' }}
+            >
+              <Stack gap="md" px={20}>
+                <Center>
+                  <Text fz="xl" fw="bold" c="black">
+                    {item.title}
+                  </Text>
+                </Center>
+                {item.listDeskripsi}
+              </Stack>
+            </Paper>
+          ))}
         </SimpleGrid>
       </Box>
     </Stack>

src/app/darmasaba/(pages)/lingkungan/pengelolaan-sampah-bank-sampah/page.tsx

@@ -1,63 +1,60 @@
+'use client'
+import pengelolaanSampahState from '@/app/admin/(dashboard)/_state/lingkungan/pengelolaan-sampah';
 import colors from '@/con/colors';
-import { Box, Flex, Paper, SimpleGrid, Stack, Text, TextInput } from '@mantine/core';
-import { IconClipboardTextFilled, IconMapPin, IconRecycle, IconScale, IconSearch, IconTrashFilled, IconTruckFilled } from '@tabler/icons-react';
+import { Box, Flex, Paper, SimpleGrid, Skeleton, Stack, Text, TextInput } from '@mantine/core';
+import { useShallowEffect } from '@mantine/hooks';
+import { Icon, IconChartLine, IconClipboardTextFilled, IconLeaf, IconRecycle, IconScale, IconSearch, IconTent, IconTrashFilled, IconTrophy, IconTruckFilled } from '@tabler/icons-react';
+import React from 'react';
+import { useProxy } from 'valtio/utils';
 import BackButton from '../../desa/layanan/_com/BackButto';
+import dynamic from 'next/dynamic';
+
+// Dynamically import the map component to avoid SSR issues with Leaflet
+const LeafletMultiMarkerMap = dynamic(
+  () => import('@/app/admin/(dashboard)/_com/LeafletMultiMarkerMap'),
+  { ssr: false }
+);
 
-const data = [
-  {
-    id: 1,
-    icon: <IconRecycle size={50} color={colors['blue-button']} />,
-    deskripsi: '1. Pilah sampah sesuai jenisnya'
-  },
-  {
-    id: 2,
-    icon: <IconTruckFilled size={50} color={colors["blue-button"]} />,
-    deskripsi: '2. Bawa sampah ke Bank Sampah'
-  },
-  {
-    id: 3,
-    icon: <IconScale size={50} color={colors["blue-button"]} />,
-    deskripsi: '3. Timbang sampah di Bank Sampah'
-  },
-  {
-    id: 4,
-    icon: <IconClipboardTextFilled size={50} color={colors["blue-button"]} />,
-    deskripsi: '4. Catat hasil timbangan di buku tabungan'
-  },
-  {
-    id: 5,
-    icon: <IconTrashFilled size={50} color={colors["blue-button"]} />,
-    deskripsi: '5. Sampah didaur ulang oleh petugas Bank Sampah'
-  },
-]
 
-const bankSampah = [
-  {
-    id: 1,
-    icon: <IconMapPin size={50} color={colors['blue-button']} />,
-    deskripsi: 'Bank Sampah Sarana Gathi',
-    alamat: 'Jl. Ahmad Yani Utara No.453, Peguyangan, Kec. Denpasar Utara, Kota Denpasar, Bali 80115'
-  },
-  {
-    id: 2,
-    icon: <IconMapPin size={50} color={colors['blue-button']} />,
-    deskripsi: 'Bank Sampah BALI WASTU LESTARI',
-    alamat: 'Jl. Ahmad Yani Utara Gg. Garuda No.1, Peguyangan, Kec. Denpasar Utara, Kota Denpasar, Bali 80115'
-  },
-  {
-    id: 3,
-    icon: <IconMapPin size={50} color={colors['blue-button']} />,
-    deskripsi: 'Bank Sampah Jempiring Sari',
-    alamat: 'Jl. Gn. Lebah I No.9, Tegal Harum, Kec. Denpasar Bar., Kota Denpasar, Bali 80119'
-  },
-  {
-    id: 4,
-    icon: <IconMapPin size={50} color={colors['blue-button']} />,
-    deskripsi: 'Bank Sampah Sarana Gathi',
-    alamat: 'Jl. Ahmad Yani Utara No.453, Peguyangan, Kec. Denpasar Utara, Kota Denpasar, Bali 80115'
-  },
-]
 function Page() {
+  const state = useProxy(pengelolaanSampahState.pengelolaanSampah)
+  const state2 = useProxy(pengelolaanSampahState.keteranganSampah)
+
+  const {
+    data,
+    load
+  } = state.findMany
+
+  const {
+    data: data2,
+    load: load2
+  } = state2.findMany
+
+  useShallowEffect(() => {
+    load()
+    load2()
+  }, [])
+
+  const iconMap: Record<string, Icon> = {
+    ekowisata: IconLeaf,
+    kompetisi: IconTrophy,
+    wisata: IconTent,
+    ekonomi: IconChartLine,
+    sampah: IconRecycle,
+    truck: IconTruckFilled,
+    scale: IconScale,
+    clipboard: IconClipboardTextFilled,
+    trash: IconTrashFilled,
+  };
+
+  if (state.findMany.loading || !data) {
+    return (
+      <Stack py={10}>
+        <Skeleton h={500} />
+      </Stack>
+    )
+  }
+
   return (
     <Stack pos={"relative"} bg={colors.Bg} py={"xl"} gap={"22"}>
       <Box px={{ base: 'md', md: 100 }}>
@@ -84,10 +81,10 @@ function Page() {
               <Box key={k} px={28}>
                 <Paper p={20} bg={colors['white-trans-1']}>
                   <Flex gap={20} align={'center'}>
-                    <Box>
-                      {v.icon}
+                    <Box style={{ alignContent: 'center', alignItems: 'center' }}>
+                      {k + 1} {iconMap[v.icon] ? React.createElement(iconMap[v.icon]) : null}
                     </Box>
-                    <Text fw={'bold'} fz={{ base: "lg", md: "xl" }} c={'black'}>{v.deskripsi}</Text>
+                    <Text fw={'bold'} fz={{ base: "lg", md: "xl" }} c={'black'}>{v.name}</Text>
                   </Flex>
                 </Paper>
               </Box>
@@ -96,7 +93,7 @@ function Page() {
         </SimpleGrid>
       </Box>
 
-      <Box px={{ base: 'md', md: 100 }} >
+      <Box px={{ base: 'md', md: 100 }}>
         <Text ta={"center"} fz={{ base: "h1", md: "2.5rem" }} c={colors["blue-button"]} fw={"bold"}>
           Keterangan Bank Sampah Terdekat
         </Text>
@@ -107,66 +104,64 @@ function Page() {
           leftSection={<IconSearch size={20} />}
           placeholder='Cari Bank Sampah Terdekat'
         />
-        <SimpleGrid
-          cols={{
-            base: 1,
-            md: 2,
-          }}>
+        
+        <SimpleGrid cols={{ base: 1, md: 2 }} spacing="lg">
+          {/* Left side - List of bank locations */}
           <Box>
-            <SimpleGrid
-              cols={{
-                base: 1,
-                md: 1,
-              }}
-            >
-              {bankSampah.map((v, k) => {
-                return (
-                  <Box key={k} px={20}>
-                    <Paper p={20} bg={colors['white-trans-1']} radius={'lg'}>
-                      <Flex gap={20} align={'center'}>
-                        <Box>
-                          {v.icon}
-                        </Box>
-                        <Box>
-                          <Text fw={'bold'} fz={{ base: "lg", md: "xl" }} c={'black'}>
-                            {v.deskripsi}
-                          </Text>
-                          <Text fz={{ base: "md", md: "lg" }} c={'black'}>
-                            {v.alamat}
-                          </Text>
-                        </Box>
-                      </Flex>
-                    </Paper>
-                  </Box>
-                )
-              })}
-            </SimpleGrid>
+            <Paper p="md" bg={colors['white-trans-1']} radius="lg">
+              <Text fz="xl" fw="bold" mb="md">Daftar Bank Sampah</Text>
+              <Stack gap="md">
+                {data2?.map((v, k) => (
+                  <Paper key={k} p="md" withBorder radius="md">
+                    <Text fw="bold" fz="lg">{v.namaTempatMaps}</Text>
+                    <Text c="dimmed" fz="sm" mb="sm">{v.alamat}</Text>
+                    {v.lat && v.lng ? (
+                      <a
+                        href={`https://www.google.com/maps/dir/?api=1&destination=${v.lat},${v.lng}`}
+                        target="_blank"
+                        rel="noopener noreferrer"
+                        style={{ color: colors['blue-button'], textDecoration: 'none' }}
+                      >
+                        <Text fz="sm">📌 Buka di Google Maps</Text>
+                      </a>
+                    ) : (
+                      <Text c="dimmed" fz="sm">Koordinat belum tersedia</Text>
+                    )}
+                  </Paper>
+                ))}
+              </Stack>
+            </Paper>
           </Box>
-          <Box style={{
-            position: 'relative',
-            width: '100%',
-            paddingBottom: '90.5%', // Aspek rasio 16:9 (atau gunakan '100%' untuk aspek rasio 1:1)
-            height: 0,
-            overflow: 'hidden'
-          }}>
-            <iframe
-              src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d31558.578355337635!2d115.18413781150647!3d-8.613053599999985!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x2dd23ff3a9d0f0ab%3A0xb6bb54a820adbae6!2sBank%20Sampah%20Sarana%20Gathi!5e0!3m2!1sid!2sid!4v1743994947623!5m2!1sid!2sid"
-              style={{
-                position: 'absolute',
-                top: 0,
-                left: 0,
-                width: '100%',
-                height: '100%',
-                border: 0
-              }}
-              loading="lazy"
-              allowFullScreen
-            ></iframe>
+          
+          {/* Right side - Single map showing all locations */}
+          <Box style={{ position: 'sticky', top: '20px' }}>
+            <Paper p="md" bg={colors['white-trans-1']} radius="lg" h="100%">
+              <Text fz="xl" fw="bold" mb="md">Peta Lokasi</Text>
+              {data2?.some(v => v.lat && v.lng) ? (
+                <Box style={{ height: '600px', width: '100%', borderRadius: '8px', overflow: 'hidden' }}>
+                  <LeafletMultiMarkerMap
+                    center={[
+                      data2[0]?.lat || -8.3405,
+                      data2[0]?.lng || 115.0920
+                    ]}
+                    markers={data2
+                      .filter(v => v.lat && v.lng)
+                      .map(v => ({
+                        position: [v.lat, v.lng],
+                        popup: v.namaTempatMaps
+                      }))}
+                  />
+                </Box>
+              ) : (
+                <Text c="dimmed" fz="sm">Tidak ada koordinat yang tersedia</Text>
+              )}
+            </Paper>
           </Box>
         </SimpleGrid>
       </Box>
-    </Stack>
+    </Stack >
   );
 }
 
 export default Page;
+

src/app/darmasaba/(pages)/lingkungan/program-penghijauan/page.tsx

@@ -1,71 +1,131 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+'use client'
 import colors from '@/con/colors';
-import { Box, Button, Center, Group, Paper, SimpleGrid, Stack, Text } from '@mantine/core';
-import { IconChristmasTreeFilled, IconHomeEco, IconShieldFilled, IconTrendingUp } from '@tabler/icons-react';
+import { Box, Button, Center, Group, Pagination, Paper, SimpleGrid, Skeleton, Stack, Text, TextInput, Title, Tooltip } from '@mantine/core';
+import { IconSearch, IconLeaf, IconTrophy, IconTent, IconChartLine, IconRecycle, IconTruckFilled, IconScale, IconClipboardTextFilled, IconTrashFilled, IconHomeEco, IconChristmasTreeFilled, IconTrendingUp, IconShieldFilled } from '@tabler/icons-react';
 import BackButton from '../../desa/layanan/_com/BackButto';
+import programPenghijauanState from '@/app/admin/(dashboard)/_state/lingkungan/program-penghijauan';
+import { useProxy } from 'valtio/utils';
+import { useDebouncedValue, useShallowEffect } from '@mantine/hooks';
+import { useState } from 'react';
+import React from 'react';
 
-const data = [
-  {
-    id: 1,
-    deskripsi: 'Lingkungan Sehat',
-    icon: <IconHomeEco size={80} color={colors['blue-button']} />,
-  },
-  {
-    id: 2,
-    deskripsi: 'Sumber Oksigen',
-    icon: <IconChristmasTreeFilled size={80} color={colors['blue-button']} />,
-  },
-  {
-    id: 3,
-    deskripsi: 'Ekonomi Berkelanjutan',
-    icon: <IconTrendingUp size={80} color={colors['blue-button']} />,
-  },
-  {
-    id: 4,
-    deskripsi: 'Mencegah Bencana',
-    icon: <IconShieldFilled size={80} color={colors['blue-button']} />,
-  },
-]
 function Page() {
+  const state = useProxy(programPenghijauanState);
+  const [search, setSearch] = useState("");
+  const [debouncedSearch] = useDebouncedValue(search, 500);
+  const { data, load, page, totalPages, loading } = state.findMany;
+
+  useShallowEffect(() => {
+    load(page, 10, debouncedSearch);
+  }, [page, debouncedSearch]);
+
+  const iconMap: Record<string, any> = {
+    ekowisata: IconLeaf,
+    kompetisi: IconTrophy,
+    wisata: IconTent,
+    ekonomi: IconChartLine,
+    sampah: IconRecycle,
+    truck: IconTruckFilled,
+    scale: IconScale,
+    clipboard: IconClipboardTextFilled,
+    trash: IconTrashFilled,
+    lingkunganSehat: IconHomeEco,
+    sumberOksigen: IconChristmasTreeFilled,
+    ekonomiBerkelanjutan: IconTrendingUp,
+    mencegahBencana: IconShieldFilled,
+  };
+
+  if (loading || !data) {
+    return (
+      <Stack py={20}>
+        <Skeleton h={500} radius="xl" />
+      </Stack>
+    );
+  }
+
   return (
-    <Stack pos={"relative"} bg={colors.Bg} py={"xl"} gap={"22"}>
+    <Stack pos="relative" bg={colors.Bg} py="xl" gap="xl">
       <Box px={{ base: 'md', md: 100 }}>
         <BackButton />
       </Box>
-      <Box px={{ base: 'md', md: 100 }} >
-        <Text ta={"center"} fz={{ base: "h1", md: "2.5rem" }} c={colors["blue-button"]} fw={"bold"}>
-          Program Penghijauan Desa
+      <Box px={{ base: 'md', md: 100 }}>
+        <Box>
+          <Group justify="space-between" align='center' mt="md">
+            <Text ta="center" fz={{ base: "h1", md: "2.5rem" }} c={colors["blue-button"]} fw="bold">
+              Program Penghijauan Desa
+            </Text>
+            <TextInput
+              radius="xl"
+              w={'30%'}
+              placeholder="Cari program atau kegiatan"
+              leftSection={<IconSearch size={20} />}
+              value={search}
+              onChange={(e) => setSearch(e.currentTarget.value)}
+            />
+          </Group>
+        </Box>
+        <Text c="dimmed" fz={{ base: 'sm', md: 'lg' }} mt="sm">
+          Mari berpartisipasi menanam dan merawat pohon untuk menciptakan lingkungan hijau, sehat, dan seimbang bagi seluruh warga desa.
         </Text>
-        <Text px={20} ta={'center'} fz={'h4'}>Program Penghijauan Desa bertujuan untuk meningkatkan kesadaran masyarakat akan pentingnya lingkungan hijau melalui penanaman pohon dan perawatan tanaman.</Text>
       </Box>
       <Box px={{ base: 'md', md: 100 }} pb={60}>
-        <Text c={colors['blue-button']} fw={'bold'} py={10} px={28} fz={{ base: "lg", md: "xl" }} ta={"justify"}>
-          Manfaat Program Penghijauan
-        </Text>
-        <SimpleGrid
-          cols={{
-            base: 1,
-            md: 4
-          }}>
-          {data.map((v, k) => {
-            return (
-              <Box key={k}>
-                <Paper p={20} bg={colors['white-trans-1']}>
-                  <Stack flex={5}>
-                    <Center>
-                      {v.icon}
-                    </Center>
-                    <Box>
-                      <Text fz={{ base: "lg", md: "xl" }} ta={'center'} c={colors['blue-button']} fw={'bold'}>{v.deskripsi}</Text>
-                    </Box>
-                    <Group justify='center'>
-                    <Button bg={colors['blue-button']}>Detail</Button>
-                    </Group>
-                  </Stack>
-                </Paper>
-              </Box>
-            )
-          })}
+        <Title order={2} c={colors['blue-button']} fw="bold" py={10} px={28} fz={{ base: 'lg', md: 'xl' }}>
+          Manfaat Program
+        </Title>
+        <SimpleGrid cols={{ base: 1, md: 4 }} spacing="lg" mt="md">
+          {data.map((v) => (
+            <Paper
+              key={v.id}
+              p="xl"
+              radius="xl"
+              bg={colors['white-trans-1']}
+              withBorder
+              style={{
+                backdropFilter: 'blur(10px)',
+                border: `1px solid rgba(255,255,255,0.2)`,
+                transition: 'transform 0.3s, box-shadow 0.3s',
+                cursor: 'pointer',
+              }}
+              onMouseEnter={(e) => {
+                const el = e.currentTarget;
+                el.style.transform = 'translateY(-8px)';
+                el.style.boxShadow = '0 15px 30px rgba(28,110,164,0.5)';
+              }}
+              onMouseLeave={(e) => {
+                const el = e.currentTarget;
+                el.style.transform = 'translateY(0)';
+                el.style.boxShadow = '0 4px 10px rgba(0,0,0,0.1)';
+              }}
+            >
+              <Stack align="center" gap="sm">
+                <Center>
+                  {iconMap[v.icon] && React.createElement(iconMap[v.icon], { size: 50, stroke: 1.5, color: colors['blue-button'] })}
+                </Center>
+                <Tooltip label={v.judul} withArrow position="bottom">
+                  <Text fz={{ base: 'md', md: 'lg' }} ta="center" c={colors['blue-button']} fw="bold">
+                    {v.name}
+                  </Text>
+                </Tooltip>
+                <Text fz="sm" ta="center" c="dimmed">
+                  {v.judul}
+                </Text>
+                <Button variant="gradient" gradient={{ from: colors['blue-button'], to: 'cyan' }} size="sm" radius="xl" mt="sm">
+                  Pelajari Lebih Lanjut
+                </Button>
+              </Stack>
+            </Paper>
+          ))}
         </SimpleGrid>
+        <Center mt="xl">
+          <Pagination
+            value={page}
+            onChange={(newPage) => load(newPage)}
+            total={totalPages}
+            color="blue"
+            radius="xl"
+          />
+        </Center>
       </Box>
     </Stack>
   );

src/app/darmasaba/(pages)/pendidikan/info-sekolah-paud/page.tsx

@@ -1,105 +1,363 @@
+/* eslint-disable react-hooks/exhaustive-deps */
 'use client'
-import colors from '@/con/colors';
-import { Box, Button, Center, Group, Paper, SimpleGrid, Stack, Text, TextInput } from '@mantine/core';
-import { IconChalkboard, IconMicroscope, IconSchool, IconSearch } from '@tabler/icons-react';
-import BackButton from '../../desa/layanan/_com/BackButto';
+import React, { useMemo, useState } from 'react';
+import {
+  ActionIcon,
+  Badge,
+  Box,
+  Button,
+  Center,
+  Container,
+  Group,
+  Paper,
+  Progress,
+  SimpleGrid,
+  Stack,
+  Text,
+  TextInput,
+  Tooltip,
+  VisuallyHidden,
+} from '@mantine/core';
+import {
+  IconChalkboard,
+  IconInfoCircle,
+  IconMicroscope,
+  IconSchool,
+  IconSearch,
+  IconArrowLeft,
+} from '@tabler/icons-react';
 import { motion } from 'framer-motion';
+import type { IconProps } from '@tabler/icons-react';
 
+type Stat = {
+  id: number;
+  icon: React.ComponentType<IconProps>;
+  jumlah: number;
+  nama: string;
+  helper?: string;
+};
 
-const dataSekolah = [
+const dataSekolah: Stat[] = [
   {
     id: 1,
-    icon: <IconChalkboard size={55} color={colors["blue-button"]} />,
+    icon: IconChalkboard,
     jumlah: 15,
-    nama: 'Lembaga Pendidikan'
+    nama: 'Lembaga Pendidikan',
+    helper: 'Jumlah institusi pendidikan resmi di wilayah ini',
   },
   {
     id: 2,
-    icon: <IconSchool size={55} color={colors["blue-button"]} />,
+    icon: IconSchool,
     jumlah: 3209,
-    nama: 'Siswa Terdaftar'
+    nama: 'Siswa Terdaftar',
+    helper: 'Total siswa aktif di semua jenjang',
   },
   {
     id: 3,
-    icon: <IconMicroscope size={55} color={colors["blue-button"]} />,
+    icon: IconMicroscope,
     jumlah: 285,
-    nama: 'Tenaga Pengajar'
+    nama: 'Tenaga Pengajar',
+    helper: 'Jumlah guru dan staf pengajar aktif',
   },
-]
+];
 
+export default function SekolahPage() {
+  const [query, setQuery] = useState('');
+  const [kategoriAktif, setKategoriAktif] = useState('Semua');
+  const kategoriList = ['Semua', 'TK/PAUD', 'SD', 'SMP', 'SMA/SMK'];
+  const maxJumlah = useMemo(() => Math.max(...dataSekolah.map((d) => d.jumlah)), []);
+  const filtered = useMemo(() => {
+    const q = query.trim().toLowerCase();
+    return dataSekolah.filter((d) => {
+      const teks = `${d.nama} ${d.jumlah}`.toLowerCase();
+      const matchQuery = q ? teks.includes(q) : true;
+      return matchQuery;
+    });
+  }, [query, kategoriAktif]);
+
+  const hasilCount = filtered.length;
 
-function Page() {
   return (
-    <Stack pos={"relative"} bg={colors.Bg} py={"xl"} gap={"22"}>
-      <Box px={{ base: 'md', md: 100 }}>
-        <BackButton />
-      </Box>
-      <Box px={{ base: 'md', md: 100 }} pb={20}>
-        <Text ta={"center"} fz={{ base: "h1", md: "2.5rem" }} c={colors["blue-button"]} fw={"bold"}>
-          Cari Informasi Sekolah
-        </Text>
-        <Group justify='center' pb={20}>
-          <TextInput
-            w={{ base: "50%", md: "70%" }}
-            placeholder='Cari Sekolah...'
-            rightSection={
-              <Button
-                size="xs"
-                style={{ height: '80%', marginRight: '5px' }}
-                bg={colors["blue-button"]}
-              >
-                Cari
-              </Button>
-            }
-            rightSectionWidth={70}
-            leftSection={<IconSearch size={20} />}
-          />
-        </Group>
-        <Group mb={20} gap="md" justify='center' wrap="wrap">
-          <Paper bg={colors['blue-button']} radius="xl" py={5} px={20}>
-            <Text c={colors['white-1']} size="sm">
-              Semua
-            </Text>
-          </Paper>
-          {['TK/PAUD', 'SD', 'SMP', 'SMA/SMK'].map((kategori) => (
-            <Paper key={kategori} bg={'gray'} radius="xl" py={5} px={20}>
-              <Text c={colors['white-1']} size="sm">
-                {kategori}
-              </Text>
-            </Paper>
-          ))}
-        </Group>
-        <SimpleGrid
-          cols={{
-            base: 1,
-            md: 3
-          }}
-        >
-          {dataSekolah.map((v, k) => {
-            return (
-              <Box key={k}>
+    <Box style={{ minHeight: '100vh', background: '#f8fafc', paddingBottom: 48 }}>
+      <Container size="xl" py={{ base: 'md', md: 'xl' }}>
+        <Stack gap="lg">
+          <Box>
+            <ActionIcon
+              aria-label="Kembali"
+              onClick={() => window.history.back()}
+              size="lg"
+              radius="md"
+              variant="light"
+              style={{
+                color: '#1e293b',
+                background: 'white',
+                boxShadow: '0 2px 12px rgba(0,0,0,0.06)',
+              }}
+            >
+              <IconArrowLeft size={20} stroke={2} />
+              <VisuallyHidden>Tombol kembali</VisuallyHidden>
+            </ActionIcon>
+          </Box>
+
+          <Paper
+            radius="lg"
+            p={{ base: 'md', md: 'xl' }}
+            style={{
+              background: 'linear-gradient(180deg, #ffffff 0%, #f1f5f9 100%)',
+              border: '1px solid #e2e8f0',
+              boxShadow: '0 6px 24px rgba(0,0,0,0.06)',
+            }}
+            role="search"
+            aria-label="Pencarian sekolah"
+          >
+            <Stack gap="md">
+              <Center>
                 <motion.div
-                  whileHover={{ scale: 1.05 }}
-                  whileTap={{ scale: 0.8 }}
-                  style={{ width: '100%', height: '100%' }}
+                  initial={{ opacity: 0, y: -8 }}
+                  animate={{ opacity: 1, y: 0 }}
+                  transition={{ duration: 0.45, ease: 'easeOut' }}
                 >
-                  <Paper p={"xl"} bg={colors['white-trans-1']} w={{ base: "100%", md: "100%" }}>
-                    <Stack>
-                      <Center>
-                        {v.icon}
-                      </Center>
-                      <Text c={colors["blue-button"]} ta={'center'} fw={'bold'} fz={{ base: "h2", md: "h1" }}>{v.jumlah}</Text>
-                      <Text c={colors["blue-button"]} ta={'center'} fw={'bold'}>{v.nama}</Text>
-                    </Stack>
-                  </Paper>
+                  <Text
+                    ta="center"
+                    c="#0f172a"
+                    fz={{ base: 22, md: 30 }}
+                    fw={800}
+                    style={{ letterSpacing: -0.3 }}
+                  >
+                    Cari Informasi Sekolah
+                  </Text>
+                  <Text ta="center" c="dimmed" fz="sm" mt={6}>
+                    Masukkan nama, jenjang, atau alamat sekolah untuk hasil lebih spesifik.
+                  </Text>
                 </motion.div>
-              </Box>
-            )
-          })}
-        </SimpleGrid>
-      </Box>
-    </Stack>
+              </Center>
+
+              <Group align="center" justify="center" gap="sm" style={{ width: '100%' }}>
+                <TextInput
+                  value={query}
+                  onChange={(e) => setQuery(e.currentTarget.value)}
+                  placeholder="Contoh: SMP Negeri, SD 01, Kelurahan..."
+                  leftSection={<IconSearch size={18} aria-hidden />}
+                  aria-label="Masukkan kata kunci pencarian"
+                  radius="xl"
+                  size="md"
+                  rightSection={
+                    <Button
+                      radius="xl"
+                      size="sm"
+                      aria-label="Telusuri"
+                      onClick={() => {}}
+                      style={{
+                        height: 38,
+                        minWidth: 110,
+                        background: 'linear-gradient(90deg, #3b82f6 0%, #60a5fa 100%)',
+                        color: 'white',
+                        boxShadow: '0 4px 16px rgba(59,130,246,0.3)',
+                      }}
+                    >
+                      Telusuri
+                    </Button>
+                  }
+                  rightSectionWidth={120}
+                  style={{
+                    width: '100%',
+                    maxWidth: 920,
+                  }}
+                />
+              </Group>
+
+              <Group justify="center" gap="xs" wrap="wrap" style={{ marginTop: 4 }}>
+                {kategoriList.map((k) => {
+                  const aktif = k === kategoriAktif;
+                  return (
+                    <motion.div
+                      key={k}
+                      initial={{ scale: 0.98, opacity: 0.9 }}
+                      animate={{ scale: 1, opacity: 1 }}
+                      whileHover={{ scale: 1.02 }}
+                    >
+                      <Button
+                        onClick={() => setKategoriAktif(k)}
+                        radius="xl"
+                        size="sm"
+                        variant={aktif ? 'filled' : 'light'}
+                        style={{
+                          background: aktif
+                            ? 'linear-gradient(135deg, #3b82f6 0%, #60a5fa 100%)'
+                            : 'white',
+                          color: aktif ? 'white' : '#2563eb',
+                          boxShadow: aktif ? '0 4px 16px rgba(59,130,246,0.25)' : 'none',
+                          border: '1px solid #e2e8f0',
+                        }}
+                      >
+                        {k}
+                      </Button>
+                    </motion.div>
+                  );
+                })}
+              </Group>
+            </Stack>
+          </Paper>
+
+          <Box aria-live="polite" aria-atomic>
+            <Text fz="sm" c="dimmed">
+              Menampilkan <Text component="span" c="#0f172a" fw={700}>{hasilCount}</Text> hasil.
+            </Text>
+          </Box>
+
+          <SimpleGrid cols={{ base: 1, md: 3 }} spacing="lg">
+            {filtered.length === 0 ? (
+              <Paper
+                p="xl"
+                radius="md"
+                style={{
+                  background: '#f9fafb',
+                  border: '1px dashed #e2e8f0',
+                  minHeight: 220,
+                }}
+                role="status"
+                aria-label="Tidak ada hasil"
+              >
+                <Center style={{ minHeight: 180, flexDirection: 'column' }}>
+                  <Text fz="lg" fw={800} c="#2563eb">
+                    Tidak ditemukan
+                  </Text>
+                  <Text c="dimmed" mt="6px">
+                    Coba gunakan kata kunci lain atau setel ulang filter.
+                  </Text>
+                  <Button
+                    mt="md"
+                    radius="xl"
+                    onClick={() => {
+                      setQuery('');
+                      setKategoriAktif('Semua');
+                    }}
+                    style={{
+                      background: 'linear-gradient(90deg, #3b82f6 0%, #60a5fa 100%)',
+                      color: 'white',
+                      boxShadow: '0 6px 18px rgba(59,130,246,0.25)',
+                    }}
+                    aria-label="Tampilkan semua"
+                  >
+                    Tampilkan Semua
+                  </Button>
+                </Center>
+              </Paper>
+            ) : (
+              filtered.map((v) => {
+                const percent = Math.round((v.jumlah / maxJumlah) * 100) || 0;
+                return (
+                  <motion.div
+                    key={v.id}
+                    whileHover={{ scale: 1.025 }}
+                    whileTap={{ scale: 0.995 }}
+                    style={{ width: '100%' }}
+                  >
+                    <Paper
+                      p="lg"
+                      radius="lg"
+                      style={{
+                        background: 'white',
+                        border: '1px solid #e2e8f0',
+                        boxShadow: '0 8px 28px rgba(0,0,0,0.06)',
+                        minHeight: 260,
+                        display: 'flex',
+                        flexDirection: 'column',
+                        justifyContent: 'space-between',
+                      }}
+                      role="article"
+                      aria-label={`${v.nama} kartu statistik`}
+                    >
+                      <Stack gap="sm">
+                        <Center>
+                          <Box
+                            style={{
+                              width: 80,
+                              height: 80,
+                              borderRadius: 16,
+                              display: 'flex',
+                              alignItems: 'center',
+                              justifyContent: 'center',
+                              background: '#eff6ff',
+                              boxShadow: 'inset 0 1px 0 rgba(255,255,255,0.6)',
+                            }}
+                            aria-hidden
+                          >
+                            {React.createElement(v.icon, {
+                              color: '#2563eb',
+                              size: 34,
+                              stroke: 1.6,
+                            })}
+                          </Box>
+                        </Center>
+
+                        <Group justify="apart" align="center" gap="xs">
+                          <Stack gap={0}>
+                            <Text fz={{ base: 18, md: 22 }} fw={800} c="#0f172a">
+                              {v.jumlah.toLocaleString()}
+                            </Text>
+                            <Group gap={6} align="center">
+                              <Text fz="sm" fw={700} c="#2563eb">
+                                {v.nama}
+                              </Text>
+                              <Tooltip label={v.helper ?? ''} position="right" withArrow>
+                                <ActionIcon aria-label={`Info ${v.nama}`} variant="transparent" size="xs">
+                                  <IconInfoCircle size={16} style={{ color: '#2563eb' }} />
+                                </ActionIcon>
+                              </Tooltip>
+                            </Group>
+                          </Stack>
+
+                          <Badge
+                            radius="md"
+                            variant="light"
+                            style={{
+                              background: '#eff6ff',
+                              color: '#2563eb',
+                              border: '1px solid #e2e8f0',
+                            }}
+                          >
+                            Statistik
+                          </Badge>
+                        </Group>
+
+                        <Box>
+                          <Progress
+                            value={percent}
+                            size="sm"
+                            radius="xl"
+                            aria-label={`${v.nama} progres ${percent} persen`}
+                          />
+                          <Text fz="xs" c="dimmed" mt="6px">
+                            Perbandingan dengan jumlah terbesar.
+                          </Text>
+                        </Box>
+                      </Stack>
+
+                      <Group justify="right" mt="8px">
+                        <Button
+                          radius="xl"
+                          variant="outline"
+                          onClick={() => {}}
+                          aria-label={`Lihat detail ${v.nama}`}
+                          style={{
+                            borderColor: '#e2e8f0',
+                            color: '#2563eb',
+                            paddingLeft: 20,
+                            paddingRight: 20,
+                          }}
+                        >
+                          Lihat Detail
+                        </Button>
+                      </Group>
+                    </Paper>
+                  </motion.div>
+                );
+              })
+            )}
+          </SimpleGrid>
+        </Stack>
+      </Container>
+    </Box>
   );
 }
-
-export default Page;