Fix QC Kak Inno Tgl 4 & 5 Desember

Fix QC Kak Ayu Tgl 4 & 5 Desember
Fix QC Pak Jun Tgl 5 Desember

prisma/schema.prisma

@@ -136,6 +136,7 @@ model MediaSosial {
   name      String
   image     FileStorage? @relation(fields: [imageId], references: [id])
   imageId   String?
+  icon      String?
   iconUrl   String?      @db.VarChar(255)
   createdAt DateTime     @default(now())
   updatedAt DateTime     @updatedAt
@@ -782,24 +783,22 @@ model Penghargaan {
 
 // ========================================= FASILITAS KESEHATAN ========================================= //
 model FasilitasKesehatan {
-  id                     String               @id @default(cuid())
-  name                   String
-  createdAt              DateTime             @default(now())
-  updatedAt              DateTime             @updatedAt
-  deletedAt              DateTime             @default(now())
-  isActive               Boolean              @default(true)
-  informasiumum          InformasiUmum        @relation(fields: [informasiUmumId], references: [id])
-  informasiUmumId        String
-  layananunggulan        LayananUnggulan      @relation(fields: [layananUnggulanId], references: [id])
-  layananUnggulanId      String
-  dokterdantenagamedis   DokterdanTenagaMedis @relation(fields: [dokterdanTenagaMedisId], references: [id])
-  dokterdanTenagaMedisId String
-  fasilitaspendukung     FasilitasPendukung   @relation(fields: [fasilitasPendukungId], references: [id])
-  fasilitasPendukungId   String
-  prosedurpendaftaran    ProsedurPendaftaran  @relation(fields: [prosedurPendaftaranId], references: [id])
-  prosedurPendaftaranId  String
-  tarifdanlayanan        TarifDanLayanan      @relation(fields: [tarifDanLayananId], references: [id])
-  tarifDanLayananId      String
+  id                    String                 @id @default(cuid())
+  name                  String
+  createdAt             DateTime               @default(now())
+  updatedAt             DateTime               @updatedAt
+  deletedAt             DateTime               @default(now())
+  isActive              Boolean                @default(true)
+  informasiumum         InformasiUmum          @relation(fields: [informasiUmumId], references: [id])
+  informasiUmumId       String
+  layananunggulan       LayananUnggulan        @relation(fields: [layananUnggulanId], references: [id])
+  layananUnggulanId     String
+  dokterdantenagamedis  DokterdanTenagaMedis[] @relation("Dokter")
+  fasilitaspendukung    FasilitasPendukung     @relation(fields: [fasilitasPendukungId], references: [id])
+  fasilitasPendukungId  String
+  prosedurpendaftaran   ProsedurPendaftaran    @relation(fields: [prosedurPendaftaranId], references: [id])
+  prosedurPendaftaranId String
+  tarifdanlayanan       TarifDanLayanan[]      @relation("Tarif")
 }
 
 model InformasiUmum {
@@ -825,15 +824,20 @@ model LayananUnggulan {
 }
 
 model DokterdanTenagaMedis {
-  id                 String               @id @default(cuid())
-  name               String
-  specialist         String
-  jadwal             String
-  createdAt          DateTime             @default(now())
-  updatedAt          DateTime             @updatedAt
-  deletedAt          DateTime             @default(now())
-  isActive           Boolean              @default(true)
-  FasilitasKesehatan FasilitasKesehatan[]
+  id                  String               @id @default(cuid())
+  name                String
+  specialist          String
+  jadwal              String
+  jadwalLibur         String?
+  jamBukaOperasional  String?
+  jamTutupOperasional String?
+  jamBukaLibur        String?
+  jamTutupLibur       String?
+  createdAt           DateTime             @default(now())
+  updatedAt           DateTime             @updatedAt
+  deletedAt           DateTime             @default(now())
+  isActive            Boolean              @default(true)
+  FasilitasKesehatan  FasilitasKesehatan[] @relation("Dokter")
 }
 
 model FasilitasPendukung {
@@ -864,7 +868,7 @@ model TarifDanLayanan {
   updatedAt          DateTime             @updatedAt
   deletedAt          DateTime             @default(now())
   isActive           Boolean              @default(true)
-  FasilitasKesehatan FasilitasKesehatan[]
+  FasilitasKesehatan FasilitasKesehatan[] @relation("Tarif")
 }
 
 // ========================================= JADWAL KEGIATAN ========================================= //

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

@@ -0,0 +1,76 @@
+'use client';
+
+import { Box, Image, Select, rem } from '@mantine/core';
+
+const sosmedMap = {
+  facebook: { label: 'Facebook', src: '/assets/images/sosmed/facebook.png' },
+  instagram: { label: 'Instagram', src: '/assets/images/sosmed/instagram.png' },
+  tiktok: { label: 'Tiktok', src: '/assets/images/sosmed/tiktok.png' },
+  youtube: { label: 'YouTube', src: '/assets/images/sosmed/youtube.png' },
+  whatsapp: { label: 'WhatsApp', src: '/assets/images/sosmed/whatsapp.png' },
+  gmail: { label: 'Gmail', src: '/assets/images/sosmed/gmail.png' },
+  telegram: { label: 'Telegram', src: '/assets/images/sosmed/telegram.png' },
+  x: { label: 'X (Twitter)', src: '/assets/images/sosmed/x-twitter.png' },
+  telephone: { label: 'Telephone', src: '/assets/images/sosmed/telephone-call.png' },
+  custom: { label: 'Custom Icon', src: null },
+};
+
+type SosmedKey = keyof typeof sosmedMap;
+
+const sosmedList = Object.entries(sosmedMap).map(([value, item]) => ({
+  value,
+  label: item.label,
+}));
+
+export default function SelectSosialMedia({
+  value,
+  onChange,
+}: {
+  value: SosmedKey;
+  onChange: (value: SosmedKey) => void;
+}) {
+  const selected = value;
+  const selectedImage = sosmedMap[selected]?.src;
+
+  return (
+    <Box maw={300}>
+      <Select
+        placeholder="Pilih sosial media"
+        value={selected}
+        data={sosmedList}
+        searchable={false}
+        withCheckIcon={false}
+        onChange={(val) => val && onChange(val as SosmedKey)}
+        styles={{
+          input: {
+            textAlign: 'left',
+            fontSize: rem(16),
+            paddingLeft: 36,
+          },
+          section: {
+            left: 10,
+            right: 'auto',
+          },
+        }}
+      />
+
+      {/* 🔥 PREVIEW DIPISAH DI LUAR SELECT */}
+      {selectedImage && (
+        <Box mt="md">
+          <Image
+            alt=""
+            src={selectedImage}
+            radius="md"
+            style={{
+              width: 120,
+              height: 120,
+              objectFit: 'contain',
+              border: '1px solid #eee',
+              padding: 8,
+            }}
+          />
+        </Box>
+      )}
+    </Box>
+  );
+}

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

@@ -0,0 +1,56 @@
+'use client';
+
+import { Box, Select } from '@mantine/core';
+import { useEffect, useState } from 'react';
+
+export const sosmedMap = {
+  facebook: { label: 'Facebook', src: '/assets/images/sosmed/facebook.png' },
+  instagram: { label: 'Instagram', src: '/assets/images/sosmed/instagram.png' },
+  tiktok: { label: 'Tiktok', src: '/assets/images/sosmed/tiktok.png' },
+  youtube: { label: 'YouTube', src: '/assets/images/sosmed/youtube.png' },
+  whatsapp: { label: 'WhatsApp', src: '/assets/images/sosmed/whatsapp.png' },
+  gmail: { label: 'Gmail', src: '/assets/images/sosmed/gmail.png' },
+  telegram: { label: 'Telegram', src: '/assets/images/sosmed/telegram.png' },
+  x: { label: 'X (Twitter)', src: '/assets/images/sosmed/x-twitter.png' },
+  telephone: { label: 'Telephone', src: '/assets/images/sosmed/telephone-call.png' },
+  custom: { label: 'Custom Icon', src: null },
+};
+
+type SosmedKey = keyof typeof sosmedMap;
+
+const sosmedList = Object.entries(sosmedMap).map(([value, item]) => ({
+  value,
+  label: item.label,
+}));
+
+export default function SelectSocialMediaEdit({
+  value,
+  onChange,
+}: {
+  value: string;
+  onChange: (val: SosmedKey) => void;
+}) {
+  const [selected, setSelected] = useState<SosmedKey>('facebook');
+
+  useEffect(() => {
+    if (value && sosmedMap[value as SosmedKey]) {
+      setSelected(value as SosmedKey);
+    }
+  }, [value]);
+
+  return (
+    <Box>
+      <Select
+        label="Jenis Media Sosial"
+        value={selected}
+        data={sosmedList}
+        searchable={false}
+        onChange={(val) => {
+          if (!val) return;
+          setSelected(val as SosmedKey);
+          onChange(val as SosmedKey);
+        }}
+      />
+    </Box>
+  );
+}

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

@@ -9,29 +9,30 @@ import { z } from "zod";
 // Validasi form
 const templateForm = z.object({
   name: z.string().min(1, "Nama harus diisi"),
+
   informasiUmum: z.object({
-    fasilitas: z.string().min(1, "Fasilitas harus diisi"),
-    alamat: z.string().min(1, "Alamat harus diisi"),
-    jamOperasional: z.string().min(1, "Jam operasional harus diisi"),
+    fasilitas: z.string().min(1),
+    alamat: z.string().min(1),
+    jamOperasional: z.string().min(1),
   }),
+
   layananUnggulan: z.object({
-    content: z.string().min(1, "Layanan unggulan harus diisi"),
-  }),
-  dokterdanTenagaMedis: z.object({
-    name: z.string().min(1, "Nama dokter harus diisi"),
-    specialist: z.string().min(1, "Spesialis harus diisi"),
-    jadwal: z.string().min(1, "Jadwal harus diisi"),
+    content: z.string().min(1),
   }),
+
+  // NOW ARRAY OF STRING (ID)
+  dokterdanTenagaMedis: z.array(z.string()).min(1, "Minimal pilih 1 dokter"),
+
   fasilitasPendukung: z.object({
-    content: z.string().min(1, "Fasilitas pendukung harus diisi"),
+    content: z.string().min(1),
   }),
+
   prosedurPendaftaran: z.object({
-    content: z.string().min(1, "Prosedur pendaftaran harus diisi"),
-  }),
-  tarifDanLayanan: z.object({
-    layanan: z.string().min(1, "Layanan harus diisi"),
-    tarif: z.string().min(1, "Tarif harus diisi"),
+    content: z.string().min(1),
   }),
+
+  // NOW ARRAY OF STRING (ID)
+  tarifDanLayanan: z.array(z.string()).min(1, "Minimal pilih 1 tarif"),
 });
 
 // Default form kosong
@@ -45,21 +46,34 @@ const defaultForm = {
   layananUnggulan: {
     content: "",
   },
-  dokterdanTenagaMedis: {
-    name: "",
-    specialist: "",
-    jadwal: "",
-  },
+
+  dokterdanTenagaMedis: [] as string[], // ← array kosong
+  tarifDanLayanan: [] as string[], // ← array kosong
+
   fasilitasPendukung: {
     content: "",
   },
   prosedurPendaftaran: {
     content: "",
   },
-  tarifDanLayanan: {
-    layanan: "",
-    tarif: "",
-  },
+};
+
+type DokterItem = {
+  id: string;
+  name: string;
+  specialist: string;
+  jadwal: string;
+  jadwalLibur: string;
+  jamBukaOperasional: string;
+  jamTutupOperasional: string;
+  jamBukaLibur: string;
+  jamTutupLibur: string;
+};
+
+type TarifItem = {
+  id: string;
+  layanan: string;
+  tarif: string;
 };
 
 const fasilitasKesehatan = proxy({
@@ -186,33 +200,26 @@ const fasilitasKesehatan = proxy({
 
       const result = await res.json();
       const data = result.data;
-
-      fasilitasKesehatan.edit.id = data.id;
-      fasilitasKesehatan.edit.form = {
+      this.id = data.id;
+      this.form = {
         name: data.name,
         informasiUmum: {
           fasilitas: data.informasiumum.fasilitas,
           alamat: data.informasiumum.alamat,
           jamOperasional: data.informasiumum.jamOperasional,
         },
-        layananUnggulan: {
-          content: data.layananunggulan.content,
-        },
-        dokterdanTenagaMedis: {
-          name: data.dokterdantenagamedis.name,
-          specialist: data.dokterdantenagamedis.specialist,
-          jadwal: data.dokterdantenagamedis.jadwal,
-        },
         fasilitasPendukung: {
           content: data.fasilitaspendukung.content,
         },
         prosedurPendaftaran: {
           content: data.prosedurpendaftaran.content,
         },
-        tarifDanLayanan: {
-          layanan: data.tarifdanlayanan.layanan,
-          tarif: data.tarifdanlayanan.tarif,
+        // map relasi -> array of IDs
+        layananUnggulan: {
+          content: data.layananunggulan.content,
         },
+        dokterdanTenagaMedis: data.dokterdantenagamedis?.map((v: DokterItem) => v.id) ?? [],
+        tarifDanLayanan: data.tarifdanlayanan?.map((v: TarifItem) => v.id) ?? [],
       };
     },
     async submit() {
@@ -238,22 +245,15 @@ const fasilitasKesehatan = proxy({
           layananUnggulan: {
             content: fasilitasKesehatan.edit.form.layananUnggulan.content,
           },
-          dokterdanTenagaMedis: {
-            name: fasilitasKesehatan.edit.form.dokterdanTenagaMedis.name,
-            specialist:
-              fasilitasKesehatan.edit.form.dokterdanTenagaMedis.specialist,
-            jadwal: fasilitasKesehatan.edit.form.dokterdanTenagaMedis.jadwal,
-          },
+          dokterdanTenagaMedis:
+            fasilitasKesehatan.edit.form.dokterdanTenagaMedis,
           fasilitasPendukung: {
             content: fasilitasKesehatan.edit.form.fasilitasPendukung.content,
           },
           prosedurPendaftaran: {
             content: fasilitasKesehatan.edit.form.prosedurPendaftaran.content,
           },
-          tarifDanLayanan: {
-            layanan: fasilitasKesehatan.edit.form.tarifDanLayanan.layanan,
-            tarif: fasilitasKesehatan.edit.form.tarifDanLayanan.tarif,
-          },
+          tarifDanLayanan: fasilitasKesehatan.edit.form.tarifDanLayanan,
         };
 
         const res = await fetch(
@@ -320,12 +320,26 @@ const templateDokterForm = z.object({
   name: z.string().min(1, "Nama tidak boleh kosong"),
   specialist: z.string().min(1, "Spesialis tidak boleh kosong"),
   jadwal: z.string().min(1, "Jadwal tidak boleh kosong"),
+  jadwalLibur: z.string().min(1, "Jadwal libur tidak boleh kosong"),
+  jamBukaOperasional: z
+    .string()
+    .min(1, "Jam buka operasional tidak boleh kosong"),
+  jamTutupOperasional: z
+    .string()
+    .min(1, "Jam tutup operasional tidak boleh kosong"),
+  jamBukaLibur: z.string().min(1, "Jam buka libur tidak boleh kosong"),
+  jamTutupLibur: z.string().min(1, "Jam tutup libur tidak boleh kosong"),
 });
 
 const defaultDokterForm = {
   name: "",
   specialist: "",
   jadwal: "",
+  jadwalLibur: "",
+  jamBukaOperasional: "",
+  jamTutupOperasional: "",
+  jamBukaLibur: "",
+  jamTutupLibur: "",
 };
 
 const dokter = proxy({
@@ -463,6 +477,11 @@ const dokter = proxy({
             name: data.name,
             specialist: data.specialist,
             jadwal: data.jadwal,
+            jadwalLibur: data.jadwalLibur,
+            jamBukaOperasional: data.jamBukaOperasional,
+            jamTutupOperasional: data.jamTutupOperasional,
+            jamBukaLibur: data.jamBukaLibur,
+            jamTutupLibur: data.jamTutupLibur,
           };
           return data; // Return the loaded data
         } else {
@@ -487,6 +506,11 @@ const dokter = proxy({
         name: this.form.name,
         specialist: this.form.specialist,
         jadwal: this.form.jadwal,
+        jadwalLibur: this.form.jadwalLibur,
+        jamBukaOperasional: this.form.jamBukaOperasional,
+        jamTutupOperasional: this.form.jamTutupOperasional,
+        jamBukaLibur: this.form.jamBukaLibur,
+        jamTutupLibur: this.form.jamTutupLibur,
       };
 
       const cek = templateDokterForm.safeParse(formData);
@@ -567,9 +591,255 @@ const dokter = proxy({
   },
 });
 
+const templateTarifForm = z.object({
+  tarif: z.string().min(1, "Tarif tidak boleh kosong"),
+  layanan: z.string().min(1, "Layanan tidak boleh kosong"),
+});
+
+const defaultTarifForm = {
+  tarif: "",
+  layanan: "",
+};
+
+const tarif = proxy({
+  create: {
+    form: defaultTarifForm,
+    loading: false,
+    async create() {
+      const cek = templateTarifForm.safeParse(tarif.create.form);
+      if (!cek.success) {
+        const err = `[${cek.error.issues
+          .map((v) => `${v.path.join(".")}`)
+          .join("\n")}] required`;
+        toast.error(err);
+        return null;
+      }
+      try {
+        tarif.create.loading = true;
+        const res = await ApiFetch.api.kesehatan.tarifdanlayanan["create"].post(
+          tarif.create.form
+        );
+
+        if (res.status === 200) {
+          const id = res.data?.data;
+          if (id) {
+            toast.success("Sukses menambahkan");
+            tarif.create.form = { ...defaultTarifForm };
+            tarif.findMany.load();
+            return id;
+          }
+        }
+        toast.error("failed create");
+        return null;
+      } catch (error) {
+        console.log((error as Error).message);
+        return null;
+      } finally {
+        tarif.create.loading = false;
+      }
+    },
+  },
+  findMany: {
+    data: null as
+      | Prisma.TarifDanLayananGetPayload<{
+          omit: {
+            isActive: true;
+          };
+        }>[]
+      | null,
+    page: 1,
+    totalPages: 1,
+    loading: false,
+    search: "",
+    load: async (page = 1, limit = 10, search = "") => {
+      tarif.findMany.loading = true; // ✅ Akses langsung via nama path
+      tarif.findMany.page = page;
+      tarif.findMany.search = search;
+
+      try {
+        const query: any = { page, limit };
+        if (search) query.search = search;
+
+        const res = await ApiFetch.api.kesehatan.tarifdanlayanan[
+          "findMany"
+        ].get({ query });
+
+        if (res.status === 200 && res.data?.success) {
+          tarif.findMany.data = res.data.data ?? [];
+          tarif.findMany.totalPages = res.data.totalPages ?? 1;
+        } else {
+          tarif.findMany.data = [];
+          tarif.findMany.totalPages = 1;
+        }
+      } catch (err) {
+        console.error("Gagal fetch tarif dan layanan paginated:", err);
+        tarif.findMany.data = [];
+        tarif.findMany.totalPages = 1;
+      } finally {
+        tarif.findMany.loading = false;
+      }
+    },
+  },
+  findUnique: {
+    data: null as Prisma.TarifDanLayananGetPayload<{
+      omit: { isActive: true };
+    }> | null,
+    async load(id: string) {
+      try {
+        const res = await fetch(`/api/kesehatan/tarifdanlayanan/${id}`);
+        if (res.ok) {
+          const data = await res.json();
+          tarif.findUnique.data = data.data ?? null;
+        } else {
+          console.error(
+            "Failed to fetch tarif dan layanan",
+            res.statusText
+          );
+          tarif.findUnique.data = null;
+        }
+      } catch (error) {
+        console.error("Error fetching tarif dan layanan", error);
+        tarif.findUnique.data = null;
+      }
+    },
+  },
+  update: {
+    id: "",
+    form: { ...defaultTarifForm },
+    loading: false,
+    async load(id: string) {
+      if (!id) {
+        toast.warn("ID tidak valid");
+        return null;
+      }
+
+      try {
+        const response = await fetch(`/api/kesehatan/tarifdanlayanan/${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 = {
+            tarif: data.tarif,
+            layanan: data.layanan
+          };
+          return data; // Return the loaded data
+        } else {
+          throw new Error(result?.message || "Gagal memuat data");
+        }
+      } catch (error) {
+        console.error("Error loading tarif dan layanan:", error);
+        toast.error(
+          error instanceof Error ? error.message : "Gagal memuat data"
+        );
+        return null;
+      }
+    },
+    async submit() {
+      const id = this.id;
+      if (!id) {
+        toast.warn("ID tidak valid");
+        return null;
+      }
+
+      const formData = {
+        tarif: this.form.tarif,
+        layanan: this.form.layanan
+      };
+
+      const cek = templateTarifForm.safeParse(formData);
+      if (!cek.success) {
+        const err = `[${cek.error.issues
+          .map((v: any) => `${v.path.join(".")}`)
+          .join("\n")}] required`;
+        toast.error(err);
+        return null;
+      }
+
+      try {
+        this.loading = true;
+        const res = await fetch(`/api/kesehatan/tarifdanlayanan/${id}`, {
+          method: "PUT",
+          headers: {
+            "Content-Type": "application/json",
+          },
+          body: JSON.stringify(formData),
+        });
+
+        const result = await res.json();
+
+        if (!res.ok || !result?.success) {
+          throw new Error(result?.message || "Gagal update data");
+        }
+
+        toast.success("Berhasil update data!");
+        await tarif.findMany.load();
+        return result.data;
+      } catch (error) {
+        console.error("Update error:", error);
+        toast.error("Gagal update data tarif dan layanan");
+        throw error;
+      } finally {
+        this.loading = false;
+      }
+    },
+  },
+  delete: {
+    loading: false,
+    async byId(id: string) {
+      if (!id) {
+        return toast.warn("ID tidak valid");
+      }
+      try {
+        tarif.delete.loading = true;
+
+        const response = await fetch(
+          `/api/kesehatan/tarifdanlayanan/del/${id}`,
+          {
+            method: "DELETE",
+            headers: {
+              "Content-Type": "application/json",
+            },
+          }
+        );
+
+        const result = await response.json();
+
+        if (response.ok && result?.success) {
+          toast.success(
+            result.message || "tarif dan layanan berhasil dihapus"
+          );
+          await tarif.findMany.load(); // refresh list
+        } else {
+          toast.error(
+            result?.message || "Gagal menghapus tarif dan layanan"
+          );
+        }
+      } catch (error) {
+        console.error("Gagal delete:", error);
+        toast.error("Terjadi kesalahan saat menghapus tarif dan layanan");
+      } finally {
+        tarif.delete.loading = false;
+      }
+    },
+  },
+});
+
 const fasilitasKesehatanState = proxy({
   fasilitasKesehatan,
   dokter,
+  tarif
 });
 
 export default fasilitasKesehatanState;

src/app/admin/(dashboard)/_state/landing-page/profile.ts

@@ -27,7 +27,7 @@ const programInovasi = proxy({
       name: "",
       description: "",
       imageId: "",
-      link: ""
+      link: "",
     } as ProgramInovasiForm,
     loading: false,
     async create() {
@@ -71,20 +71,21 @@ const programInovasi = proxy({
     total: 0,
     loading: false,
     search: "",
-    load: async (page = 1, limit = 10, search = "") => {  // Change to arrow function
-      programInovasi.findMany.loading = true;  // Use the full path to access the property
+    load: async (page = 1, limit = 10, search = "") => {
+      // Change to arrow function
+      programInovasi.findMany.loading = true; // Use the full path to access the property
       programInovasi.findMany.page = page;
       programInovasi.findMany.search = search;
       try {
         const query: any = { page, limit };
         if (search) query.search = search;
-        
+
         const res = await ApiFetch.api.landingpage.programinovasi[
           "findMany"
         ].get({
-          query
+          query,
         });
-  
+
         if (res.status === 200 && res.data?.success) {
           programInovasi.findMany.data = res.data.data || [];
           programInovasi.findMany.total = res.data.total || 0;
@@ -389,7 +390,10 @@ const pejabatDesa = proxy({
 
       try {
         // Ensure ID is properly encoded in the URL
-        const url = new URL(`/api/landingpage/pejabatdesa/${encodeURIComponent(this.id)}`, window.location.origin);
+        const url = new URL(
+          `/api/landingpage/pejabatdesa/${encodeURIComponent(this.id)}`,
+          window.location.origin
+        );
         const response = await fetch(url.toString(), {
           method: "PUT",
           headers: {
@@ -438,16 +442,19 @@ const pejabatDesa = proxy({
 
 const templateMediaSosial = z.object({
   name: z.string().min(3, "Nama minimal 3 karakter"),
-  imageId: z.string().min(1, "Gambar wajib dipilih"),
+  imageId: z.string().nullable().optional(),
   iconUrl: z.string().min(3, "Icon URL minimal 3 karakter"),
+  icon: z.string().nullable().optional(),
 });
 
 type MediaSosialForm = {
   name: string;
-  imageId: string;
+  imageId: string | null; // boleh null
   iconUrl: string;
+  icon: string | null; // boleh null
 };
 
+
 const mediaSosial = proxy({
   create: {
     form: {} as MediaSosialForm,
@@ -455,9 +462,10 @@ const mediaSosial = proxy({
     async create() {
       // Ensure all required fields are non-null
       const formData = {
-        name: mediaSosial.create.form.name || "",
-        imageId: mediaSosial.create.form.imageId || "",
-        iconUrl: mediaSosial.create.form.iconUrl || "",
+        name: mediaSosial.create.form.name ?? "",
+        imageId: mediaSosial.create.form.imageId ?? null, // FIXED
+        iconUrl: mediaSosial.create.form.iconUrl ?? "",
+        icon: mediaSosial.create.form.icon ?? null, // FIXED
       };
 
       const cek = templateMediaSosial.safeParse(formData);
@@ -492,20 +500,19 @@ const mediaSosial = proxy({
     total: 0,
     loading: false,
     search: "",
-    load: async (page = 1, limit = 10, search = "") => {  // Change to arrow function
-      mediaSosial.findMany.loading = true;  // Use the full path to access the property
+    load: async (page = 1, limit = 10, search = "") => {
+      // Change to arrow function
+      mediaSosial.findMany.loading = true; // Use the full path to access the property
       mediaSosial.findMany.page = page;
       mediaSosial.findMany.search = search;
-      try { 
+      try {
         const query: any = { page, limit };
         if (search) query.search = search;
-        
-        const res = await ApiFetch.api.landingpage.mediasosial[
-          "findMany"
-        ].get({
+
+        const res = await ApiFetch.api.landingpage.mediasosial["findMany"].get({
           query,
         });
-  
+
         if (res.status === 200 && res.data?.success) {
           mediaSosial.findMany.data = res.data.data || [];
           mediaSosial.findMany.total = res.data.total || 0;
@@ -537,7 +544,7 @@ const mediaSosial = proxy({
         toast.warn("ID tidak valid");
         return null;
       }
-    
+
       mediaSosial.update.loading = true;
       try {
         const res = await fetch(`/api/landingpage/mediasosial/${id}`);
@@ -586,66 +593,72 @@ const mediaSosial = proxy({
     },
   },
   update: {
-      id: "",
-      form: {} as MediaSosialForm,
-      loading: false,
-  
-      async load(id: string) {
-        if (!id) {
-          toast.warn("ID tidak valid");
-          return null;
+    id: "",
+    form: {} as MediaSosialForm,
+    loading: false,
+
+    async load(id: string) {
+      if (!id) {
+        toast.warn("ID tidak valid");
+        return null;
+      }
+
+      mediaSosial.update.loading = true; // ✅ Tambahkan ini di awal
+
+      try {
+        const response = await fetch(`/api/landingpage/mediasosial/${id}`, {
+          method: "GET",
+          headers: {
+            "Content-Type": "application/json",
+          },
+        });
+
+        if (!response.ok) {
+          throw new Error(`HTTP error! status: ${response.status}`);
         }
-      
-        mediaSosial.update.loading = true; // ✅ Tambahkan ini di awal
-      
-        try {
-          const response = await fetch(`/api/landingpage/mediasosial/${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 || "",
-              iconUrl: data.iconUrl || "",
-            };
-            return data;
-          } else {
-            throw new Error(result?.message || "Gagal mengambil data media sosial");
-          }
-        } catch (error) {
-          console.error((error as Error).message);
-          toast.error("Terjadi kesalahan saat mengambil data media sosial");
-        } finally {
-          mediaSosial.update.loading = false; // ✅ Supaya berhenti loading walau error
+
+        const result = await response.json();
+
+        if (result?.success) {
+          const data = result.data;
+          this.id = data.id;
+          this.form = {
+            name: data.name || "",
+            imageId: data.imageId || null,
+            iconUrl: data.iconUrl || "",
+            icon: data.icon || null,
+            
+          };
+          return data;
+        } else {
+          throw new Error(
+            result?.message || "Gagal mengambil data media sosial"
+          );
         }
-      },
-      
-      async update() {
-        const cek = templateMediaSosial.safeParse(mediaSosial.update.form);
-        if (!cek.success) {
-          const err = `[${cek.error.issues
-            .map((v) => `${v.path.join(".")}`)
-            .join("\n")}] required`;
-          toast.error(err);
-          return false;
-        }
-  
-        try {
-          mediaSosial.update.loading = true;
-  
-          const response = await fetch(`/api/landingpage/mediasosial/${this.id}`, {
+      } catch (error) {
+        console.error((error as Error).message);
+        toast.error("Terjadi kesalahan saat mengambil data media sosial");
+      } finally {
+        mediaSosial.update.loading = false; // ✅ Supaya berhenti loading walau error
+      }
+    },
+
+    async update() {
+      const cek = templateMediaSosial.safeParse(mediaSosial.update.form);
+      if (!cek.success) {
+        const err = `[${cek.error.issues
+          .map((v) => `${v.path.join(".")}`)
+          .join("\n")}] required`;
+        toast.error(err);
+        return false;
+      }
+
+      try {
+        mediaSosial.update.loading = true;
+
+        const response = await fetch(
+          `/api/landingpage/mediasosial/${this.id}`,
+          {
             method: "PUT",
             headers: {
               "Content-Type": "application/json",
@@ -654,38 +667,40 @@ const mediaSosial = proxy({
               name: this.form.name,
               imageId: this.form.imageId,
               iconUrl: this.form.iconUrl,
+              icon: this.form.icon,
             }),
-          });
-  
-          if (!response.ok) {
-            const errorData = await response.json().catch(() => ({}));
-            throw new Error(
-              errorData.message || `HTTP error! status: ${response.status}`
-            );
           }
-  
-          const result = await response.json();
-  
-          if (result.success) {
-            toast.success("Berhasil update media sosial");
-            await mediaSosial.findMany.load(); // refresh list
-            return true;
-          } else {
-            throw new Error(result.message || "Gagal update media sosial");
-          }
-        } catch (error) {
-          console.error("Error updating media sosial:", error);
-          toast.error(
-            error instanceof Error
-              ? error.message
-              : "Terjadi kesalahan saat update media sosial"
+        );
+
+        if (!response.ok) {
+          const errorData = await response.json().catch(() => ({}));
+          throw new Error(
+            errorData.message || `HTTP error! status: ${response.status}`
           );
-          return false;
-        } finally {
-          mediaSosial.update.loading = false;
         }
-      },
+
+        const result = await response.json();
+
+        if (result.success) {
+          toast.success("Berhasil update media sosial");
+          await mediaSosial.findMany.load(); // refresh list
+          return true;
+        } else {
+          throw new Error(result.message || "Gagal update media sosial");
+        }
+      } catch (error) {
+        console.error("Error updating media sosial:", error);
+        toast.error(
+          error instanceof Error
+            ? error.message
+            : "Terjadi kesalahan saat update media sosial"
+        );
+        return false;
+      } finally {
+        mediaSosial.update.loading = false;
+      }
     },
+  },
 });
 
 const profileLandingPageState = proxy({

src/app/admin/(dashboard)/_state/ppid/permohonan_informasi_publik/permohonanInformasiPublik.ts

@@ -6,145 +6,176 @@ import { z } from "zod";
 
 const templateForm = z.object({
   name: z.string().min(3, "Nama minimal 3 karakter"),
-  nik: z.string().min(3, "NIK minimal 3 karakter"),
-  notelp: z.string().min(3, "Nomor Telepon minimal 3 karakter"),
+  nik: z
+    .string()
+    .min(3, "NIK minimal 3 karakter")
+    .max(16, "NIK maksimal 16 angka"),
+  notelp: z
+    .string()
+    .min(3, "Nomor Telepon minimal 3 karakter")
+    .max(15, "Nomor Telepon maksimal 15 angka"),
   alamat: z.string().min(3, "Alamat minimal 3 karakter"),
   email: z.string().min(3, "Email minimal 3 karakter"),
   jenisInformasiDimintaId: z.string().nonempty(),
   caraMemperolehInformasiId: z.string().nonempty(),
   caraMemperolehSalinanInformasiId: z.string().nonempty(),
-})
+});
 
 const jenisInformasiDiminta = proxy({
-    findMany: {
-        data: null as
-        | null
-        | Prisma.JenisInformasiDimintaGetPayload<{ omit: { isActive: true } }>[],
-        async load(){
-            const res = await ApiFetch.api.ppid.permohonaninformasipublik.jenisInformasi["find-many"].get();
-            if (res.status === 200) {
-                jenisInformasiDiminta.findMany.data = res.data?.data ?? [];
-            }
-        }
-    }
-})
+  findMany: {
+    data: null as
+      | null
+      | Prisma.JenisInformasiDimintaGetPayload<{ omit: { isActive: true } }>[],
+    async load() {
+      const res =
+        await ApiFetch.api.ppid.permohonaninformasipublik.jenisInformasi[
+          "find-many"
+        ].get();
+      if (res.status === 200) {
+        jenisInformasiDiminta.findMany.data = res.data?.data ?? [];
+      }
+    },
+  },
+});
 
 const caraMemperolehInformasi = proxy({
-    findMany: {
-        data: null as
-        | null
-        | Prisma.CaraMemperolehInformasiGetPayload<{ omit: { isActive: true } }>[],
-        async load() {
-            const res = await ApiFetch.api.ppid.permohonaninformasipublik.memperolehInformasi["find-many"].get();
-            if (res.status === 200) {
-                caraMemperolehInformasi.findMany.data = res.data?.data ?? [];
-            }
-        }
-    }
-})
+  findMany: {
+    data: null as
+      | null
+      | Prisma.CaraMemperolehInformasiGetPayload<{
+          omit: { isActive: true };
+        }>[],
+    async load() {
+      const res =
+        await ApiFetch.api.ppid.permohonaninformasipublik.memperolehInformasi[
+          "find-many"
+        ].get();
+      if (res.status === 200) {
+        caraMemperolehInformasi.findMany.data = res.data?.data ?? [];
+      }
+    },
+  },
+});
 
 const caraMemperolehSalinanInformasi = proxy({
-    findMany: {
-        data: null as
-        | null
-        | Prisma.CaraMemperolehSalinanInformasiGetPayload<{ omit: { isActive: true } }>[],
-        async load() {
-            const res = await ApiFetch.api.ppid.permohonaninformasipublik.salinanInformasi["find-many"].get();
-            if (res.status === 200) {
-                caraMemperolehSalinanInformasi.findMany.data = res.data?.data ?? [];
-            }
-        }
-    }
-})
-console.log(caraMemperolehSalinanInformasi)
+  findMany: {
+    data: null as
+      | null
+      | Prisma.CaraMemperolehSalinanInformasiGetPayload<{
+          omit: { isActive: true };
+        }>[],
+    async load() {
+      const res =
+        await ApiFetch.api.ppid.permohonaninformasipublik.salinanInformasi[
+          "find-many"
+        ].get();
+      if (res.status === 200) {
+        caraMemperolehSalinanInformasi.findMany.data = res.data?.data ?? [];
+      }
+    },
+  },
+});
+console.log(caraMemperolehSalinanInformasi);
 
-type PermohonanInformasiPublikForm = Prisma.PermohonanInformasiPublikGetPayload<{
+type PermohonanInformasiPublikForm =
+  Prisma.PermohonanInformasiPublikGetPayload<{
     select: {
-        name: true;
-        nik: true;
-        notelp: true;
-        alamat: true;
-        email: true;
-        jenisInformasiDimintaId: true;
-        caraMemperolehInformasiId: true;
-        caraMemperolehSalinanInformasiId: true;
+      name: true;
+      nik: true;
+      notelp: true;
+      alamat: true;
+      email: true;
+      jenisInformasiDimintaId: true;
+      caraMemperolehInformasiId: true;
+      caraMemperolehSalinanInformasiId: true;
     };
-}>;
+  }>;
 
 const statepermohonanInformasiPublik = proxy({
-    create: {
-        form: {} as PermohonanInformasiPublikForm,
-        loading: false,
-        async create(){
-            const cek = templateForm.safeParse(statepermohonanInformasiPublik.create.form);
-            if(!cek.success) {
-                const err = `[${cek.error.issues
-                    .map((v) => `${v.path.join(".")}`)
-                    .join("\n")}] required`;
-                return toast.error(err);
-            }
-            try {
-                statepermohonanInformasiPublik.create.loading = true;
-                const res = await ApiFetch.api.ppid.permohonaninformasipublik["create"].post(statepermohonanInformasiPublik.create.form);
-                if (res.status === 200) {
-                    statepermohonanInformasiPublik.findMany.load();
-                    return toast.success("Sukses menambahkan");
-                }
-                return toast.error("failed create");
-            } catch (error) {
-                console.log((error as Error).message);
-            } finally {
-                statepermohonanInformasiPublik.create.loading = false;
-            }
+  create: {
+    form: {} as PermohonanInformasiPublikForm,
+    loading: false,
+    async create() {
+      const cek = templateForm.safeParse(
+        statepermohonanInformasiPublik.create.form
+      );
+
+      if (!cek.success) {
+        toast.error(cek.error.issues.map((i) => i.message).join("\n"));
+        return false; // ⬅️ tambahkan return false
+      }
+
+      try {
+        statepermohonanInformasiPublik.create.loading = true;
+        const res = await ApiFetch.api.ppid.permohonaninformasipublik[
+          "create"
+        ].post(statepermohonanInformasiPublik.create.form);
+
+        if (res.data?.success === false) {
+          toast.error(res.data?.message);
+          return false; // ⬅️ gagal
         }
+
+        toast.success("Sukses menambahkan");
+        return true; // ⬅️ sukses
+      } catch {
+        toast.error("Terjadi kesalahan server");
+        return false;
+      } finally {
+        statepermohonanInformasiPublik.create.loading = false;
+      }
     },
-    findMany: {
-        data: null as
-        | Prisma.PermohonanInformasiPublikGetPayload<{ include: {
-            caraMemperolehSalinanInformasi: true,
-            jenisInformasiDiminta: true,
-            caraMemperolehInformasi: true,
-        } }>[]
-        | null,
-        async load() {
-            const res = await ApiFetch.api.ppid.permohonaninformasipublik["find-many"].get();
-            if (res.status === 200) {
-                statepermohonanInformasiPublik.findMany.data = res.data?.data ?? [];
-            }
-        }
-    },
-    findUnique: {
-        data: null as Prisma.PermohonanInformasiPublikGetPayload<{
+  },
+  findMany: {
+    data: null as
+      | Prisma.PermohonanInformasiPublikGetPayload<{
           include: {
-            jenisInformasiDiminta: true,
-            caraMemperolehInformasi: true,
-            caraMemperolehSalinanInformasi: true,
+            caraMemperolehSalinanInformasi: true;
+            jenisInformasiDiminta: true;
+            caraMemperolehInformasi: true;
           };
-        }> | null,
-        async load(id: string) {
-          try {
-            const res = await fetch(`/api/ppid/permohonaninformasipublik/${id}`);
-            if (res.ok) {
-              const data = await res.json();
-              statepermohonanInformasiPublik.findUnique.data = data.data ?? null;
-            } else {
-              console.error("Failed to fetch program inovasi:", res.statusText);
-              statepermohonanInformasiPublik.findUnique.data = null;
-            }
-          } catch (error) {
-            console.error("Error fetching program inovasi:", error);
-            statepermohonanInformasiPublik.findUnique.data = null;
-          }
-        },
-      },
-    
-})
+        }>[]
+      | null,
+    async load() {
+      const res = await ApiFetch.api.ppid.permohonaninformasipublik[
+        "find-many"
+      ].get();
+      if (res.status === 200) {
+        statepermohonanInformasiPublik.findMany.data = res.data?.data ?? [];
+      }
+    },
+  },
+  findUnique: {
+    data: null as Prisma.PermohonanInformasiPublikGetPayload<{
+      include: {
+        jenisInformasiDiminta: true;
+        caraMemperolehInformasi: true;
+        caraMemperolehSalinanInformasi: true;
+      };
+    }> | null,
+    async load(id: string) {
+      try {
+        const res = await fetch(`/api/ppid/permohonaninformasipublik/${id}`);
+        if (res.ok) {
+          const data = await res.json();
+          statepermohonanInformasiPublik.findUnique.data = data.data ?? null;
+        } else {
+          console.error("Failed to fetch program inovasi:", res.statusText);
+          statepermohonanInformasiPublik.findUnique.data = null;
+        }
+      } catch (error) {
+        console.error("Error fetching program inovasi:", error);
+        statepermohonanInformasiPublik.findUnique.data = null;
+      }
+    },
+  },
+});
 
 const statepermohonanInformasiPublikForm = proxy({
-    statepermohonanInformasiPublik,
-    jenisInformasiDiminta,
-    caraMemperolehInformasi,
-    caraMemperolehSalinanInformasi,
-})
+  statepermohonanInformasiPublik,
+  jenisInformasiDiminta,
+  caraMemperolehInformasi,
+  caraMemperolehSalinanInformasi,
+});
 
 export default statepermohonanInformasiPublikForm;

src/app/admin/(dashboard)/_state/ppid/permohonan_keberatan_informasi_publik/permohonanKeberatanInformasi.ts

@@ -5,82 +5,99 @@ import { proxy } from "valtio";
 import { z } from "zod";
 
 const templateForm = z.object({
-    name: z.string().min(3, "Nama minimal 3 karakter"),
-    email: z.string().min(3, "Email minimal 3 karakter"),
-    notelp: z.string().min(3, "Nomor Telepon minimal 3 karakter"),
-    alasan: z.string().min(3, "Alasan minimal 3 karakter"),
-})
+  name: z.string().min(3, "Nama minimal 3 karakter"),
+  email: z.string().min(3, "Email minimal 3 karakter"),
+  notelp: z
+    .string()
+    .min(3, "Nomor Telepon minimal 3 karakter")
+    .max(15, "Nomor Telepon maksimal 15 angka"),
+  alasan: z.string().min(3, "Alasan minimal 3 karakter"),
+});
 
-type PermohonanKeberatanInformasiForm = Prisma.FormulirPermohonanKeberatanGetPayload<{
+type PermohonanKeberatanInformasiForm =
+  Prisma.FormulirPermohonanKeberatanGetPayload<{
     select: {
-        name: true;
-        email: true;
-        notelp: true;
-        alasan: true;
+      name: true;
+      email: true;
+      notelp: true;
+      alasan: true;
     };
-}>;
+  }>;
 
 const permohonanKeberatanInformasi = proxy({
-    create: {
-        form: {} as PermohonanKeberatanInformasiForm,
-        loading: false,
-        async create(){
-            const cek = templateForm.safeParse(permohonanKeberatanInformasi.create.form);
-            if(!cek.success) {
-                const err = `[${cek.error.issues
-                    .map((v) => `${v.path.join(".")}`)
-                    .join("\n")}] required`;
-                return toast.error(err);
-            }
-            try {
-                permohonanKeberatanInformasi.create.loading = true;
-                const res = await ApiFetch.api.ppid.permohonankeberataninformasipublik["create"].post(permohonanKeberatanInformasi.create.form);
-                if (res.status === 200) {
-                    permohonanKeberatanInformasi.findMany.load();
-                    return toast.success("Sukses menambahkan");
-                }
-                return toast.error("failed create");
-            } catch (error) {
-                console.log((error as Error).message);
-            } finally {
-                permohonanKeberatanInformasi.create.loading = false;
-            }
-        },
-    },
-    findMany: {
-        data: null as
-        | Prisma.FormulirPermohonanKeberatanGetPayload<{omit: {isActive: true}}>[]
-        | null,
-        async load() {
-            const res = await ApiFetch.api.ppid.permohonankeberataninformasipublik["find-many"].get();
-            if (res.status === 200) {
-                permohonanKeberatanInformasi.findMany.data = res.data?.data ?? [];
-            }
-        }
-    },
-    findUnique: {
-        data: null as Prisma.FormulirPermohonanKeberatanGetPayload<{
-          omit: {
-            isActive: true;
-          };
-        }> | null,
-        async load(id: string) {
-          try {
-            const res = await fetch(`/api/ppid/permohonankeberataninformasipublik/${id}`);
-            if (res.ok) {
-              const data = await res.json();
-              permohonanKeberatanInformasi.findUnique.data = data.data ?? null;
-            } else {
-              console.error("Failed to fetch permohonan keberatan informasi:", res.statusText);
-              permohonanKeberatanInformasi.findUnique.data = null;
-            }
-          } catch (error) {
-            console.error("Error fetching permohonan keberatan informasi:", error);
-            permohonanKeberatanInformasi.findUnique.data = null;
-          }
-        },
+  create: {
+    form: {} as PermohonanKeberatanInformasiForm,
+    loading: false,
+    async create() {
+      const cek = templateForm.safeParse(
+        permohonanKeberatanInformasi.create.form
+      );
+      if (!cek.success) {
+        toast.error(cek.error.issues.map((i) => i.message).join("\n"));
+        return false; // ⬅️ tambahkan return false
       }
+      try {
+        permohonanKeberatanInformasi.create.loading = true;
+        const res = await ApiFetch.api.ppid.permohonankeberataninformasipublik[
+          "create"
+        ].post(permohonanKeberatanInformasi.create.form);
+        if (res.data?.success === false) {
+            toast.error(res.data?.message);
+            return false; // ⬅️ gagal
+        }
+
+        toast.success("Sukses menambahkan");
+        return true; // ⬅️ sukses
+      } catch {
+        toast.error("Terjadi kesalahan server");
+        return false;
+      } finally {
+        permohonanKeberatanInformasi.create.loading = false;
+      }
+    },
+  },
+  findMany: {
+    data: null as
+      | Prisma.FormulirPermohonanKeberatanGetPayload<{
+          omit: { isActive: true };
+        }>[]
+      | null,
+    async load() {
+      const res = await ApiFetch.api.ppid.permohonankeberataninformasipublik[
+        "find-many"
+      ].get();
+      if (res.status === 200) {
+        permohonanKeberatanInformasi.findMany.data = res.data?.data ?? [];
+      }
+    },
+  },
+  findUnique: {
+    data: null as Prisma.FormulirPermohonanKeberatanGetPayload<{
+      omit: {
+        isActive: true;
+      };
+    }> | null,
+    async load(id: string) {
+      try {
+        const res = await fetch(
+          `/api/ppid/permohonankeberataninformasipublik/${id}`
+        );
+        if (res.ok) {
+          const data = await res.json();
+          permohonanKeberatanInformasi.findUnique.data = data.data ?? null;
+        } else {
+          console.error(
+            "Failed to fetch permohonan keberatan informasi:",
+            res.statusText
+          );
+          permohonanKeberatanInformasi.findUnique.data = null;
+        }
+      } catch (error) {
+        console.error("Error fetching permohonan keberatan informasi:", error);
+        permohonanKeberatanInformasi.findUnique.data = null;
+      }
+    },
+  },
 });
 
 export default permohonanKeberatanInformasi;
-

src/app/admin/(dashboard)/auth/registrasi-admin/page.tsx

@@ -18,6 +18,7 @@ export default function Registrasi() {
   const [username, setUsername] = useState('');
   const [loading, setLoading] = useState(false);
   const [phone, setPhone] = useState(''); // ✅ tambahkan state untuk phone
+  const [agree, setAgree] = useState(false)
 
   // Ambil data dari localStorage (dari login)
   useEffect(() => {
@@ -46,6 +47,11 @@ export default function Registrasi() {
       return;
     }
 
+    if (!agree) {
+      toast.error("Anda harus menyetujui syarat dan ketentuan!");
+      return;
+    }
+
     try {
       setLoading(true);
       // ✅ Hanya kirim username & nomor → dapat kodeId
@@ -92,8 +98,8 @@ export default function Registrasi() {
                     username.length > 0 && username.length < 5
                       ? 'Minimal 5 karakter!'
                       : username.includes(' ')
-                      ? 'Tidak boleh ada spasi'
-                      : ''
+                        ? 'Tidak boleh ada spasi'
+                        : ''
                   }
                   required
                 />
@@ -108,9 +114,29 @@ export default function Registrasi() {
                 </Box>
 
                 <Box pt="md">
-                  <Checkbox label="Saya menyetujui syarat dan ketentuan" defaultChecked />
+                  <Checkbox
+                    checked={agree}
+                    onChange={(e) => setAgree(e.currentTarget.checked)}
+                    label={
+                      <Text fz="sm">
+                        Saya menyetujui{" "}
+                        <a
+                          href="/terms-of-service"
+                          target="_blank"
+                          style={{
+                            color: colors["blue-button"],
+                            textDecoration: "underline",
+                            fontWeight: 500,
+                          }}
+                        >
+                          syarat dan ketentuan
+                        </a>
+                      </Text>
+                    }
+                  />
                 </Box>
 
+
                 <Box pt="xl">
                   <Button
                     fullWidth

src/app/admin/(dashboard)/auth/validasi-admin/page.tsx

@@ -19,7 +19,7 @@ import { authStore } from '@/store/authStore';
 
 export default function Validasi() {
   const router = useRouter();
-  
+
   const [nomor, setNomor] = useState<string | null>(null);
   const [otp, setOtp] = useState('');
   const [loading, setLoading] = useState(false);
@@ -35,7 +35,7 @@ export default function Validasi() {
           credentials: 'include'
         });
         const data = await res.json();
-        
+
         if (data.success) {
           setIsRegistrationFlow(data.flow === 'register');
           console.log('🔍 Flow detected from cookie:', data.flow);
@@ -45,7 +45,7 @@ export default function Validasi() {
         setIsRegistrationFlow(false);
       }
     };
-    
+
     checkFlow();
   }, []);
 
@@ -110,6 +110,7 @@ export default function Validasi() {
       return;
     }
 
+    // ✅ Verify OTP
     const verifyRes = await fetch('/api/auth/verify-otp-register', {
       method: 'POST',
       headers: { 'Content-Type': 'application/json' },
@@ -123,19 +124,25 @@ export default function Validasi() {
       return;
     }
 
+    // ✅ Finalize registration
     const finalizeRes = await fetch('/api/auth/finalize-registration', {
       method: 'POST',
       headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify({ nomor, username, kodeId }),
+      body: JSON.stringify({ nomor: cleanNomor, username, kodeId }),
       credentials: 'include'
     });
 
     const data = await finalizeRes.json();
-    
-    if (data.success || finalizeRes.redirected) {
-      // ✅ Cleanup setelah registrasi sukses
+
+    // ✅ Check JSON response (bukan redirect)
+    if (data.success) {
+      toast.success('Registrasi berhasil! Menunggu persetujuan admin.');
       await cleanupStorage();
-      window.location.href = '/waiting-room';
+
+      // ✅ Client-side redirect
+      setTimeout(() => {
+        window.location.href = '/waiting-room';
+      }, 1000);
     } else {
       toast.error(data.message || 'Registrasi gagal');
     }
@@ -197,7 +204,7 @@ export default function Validasi() {
     localStorage.removeItem('auth_kodeId');
     localStorage.removeItem('auth_nomor');
     localStorage.removeItem('auth_username');
-    
+
     // Clear cookie
     try {
       await fetch('/api/auth/clear-flow', {

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

@@ -111,7 +111,7 @@ function EditKategoriBerita() {
       {/* Form Wrapper */}
       <Paper
         w={{ base: '100%', md: '50%' }}
-        bg={colors['white-1']}
+        bg={colors['white-1']}  
         p="lg"
         radius="md"
         shadow="sm"

src/app/admin/(dashboard)/desa/gallery/foto/[id]/edit/page.tsx

@@ -0,0 +1,303 @@
+/* eslint-disable react-hooks/exhaustive-deps */
+"use client";
+
+import EditEditor from "@/app/admin/(dashboard)/_com/editEditor";
+import stateGallery from "@/app/admin/(dashboard)/_state/desa/gallery";
+import colors from "@/con/colors";
+import ApiFetch from "@/lib/api-fetch";
+import {
+  ActionIcon,
+  Box,
+  Button,
+  Group,
+  Image,
+  Loader,
+  Paper,
+  Stack,
+  Text,
+  TextInput,
+  Title
+} from "@mantine/core";
+import { Dropzone } from "@mantine/dropzone";
+import {
+  IconArrowBack,
+  IconPhoto,
+  IconUpload,
+  IconX,
+} from "@tabler/icons-react";
+import { useParams, useRouter } from "next/navigation";
+import { useEffect, useState } from "react";
+import { toast } from "react-toastify";
+import { useProxy } from "valtio/utils";
+
+function EditFoto() {
+  const FotoState = useProxy(stateGallery.foto);
+  const router = useRouter();
+  const params = useParams();
+
+  const [previewImage, setPreviewImage] = useState<string | null>(null);
+  const [file, setFile] = useState<File | null>(null);
+  const [formData, setFormData] = useState({
+    name: "",
+    deskripsi: "",
+    imagesId: "",
+  });
+
+  const [isSubmitting, setIsSubmitting] = useState(false);
+
+  const [originalData, setOriginalData] = useState({
+    name: "",
+    deskripsi: "",
+    imagesId: "",
+    imageUrl: "",
+  });
+
+  // Load kategori + Foto
+  useEffect(() => {
+    FotoState.findMany.load();
+
+    const loadFoto = async () => {
+      const id = params?.id as string;
+      if (!id) return;
+
+      try {
+        const data = await FotoState.update.load(id);
+        if (data) {
+          setFormData({
+            name: data.name || "",
+            deskripsi: data.deskripsi || "",
+            imagesId: data.imagesId || "",
+          });
+
+          setOriginalData({
+            name: data.name || "",
+            deskripsi: data.deskripsi || "",
+            imagesId: data.imagesId || "",
+            imageUrl: data.imageGalleryFoto?.link || ""
+          });
+
+          if (data?.imageGalleryFoto?.link) {
+            setPreviewImage(data.imageGalleryFoto.link);
+          }
+        }
+      } catch (error) {
+        console.error("Error loading Foto:", error);
+        toast.error("Gagal memuat data Foto");
+      }
+    };
+
+    loadFoto();
+  }, [params?.id]);
+
+  const handleChange = (field: string, value: string) => {
+    setFormData((prev) => ({ ...prev, [field]: value }));
+  };
+
+  const handleSubmit = async () => {
+    try {
+      setIsSubmitting(true);
+      // Update global state hanya sekali di sini
+      FotoState.update.form = {
+        ...FotoState.update.form,
+        ...formData,
+      };
+
+      if (file) {
+        const res = await ApiFetch.api.fileStorage.create.post({
+          file,
+          name: file.name,
+        });
+        const uploaded = res.data?.data;
+
+        if (!uploaded?.id) {
+          return toast.error("Gagal upload gambar");
+        }
+
+        FotoState.update.form.imagesId = uploaded.id;
+      }
+
+      await FotoState.update.update();
+      toast.success("Foto berhasil diperbarui!");
+      router.push("/admin/desa/gallery/foto");
+    } catch (error) {
+      console.error("Error updating foto:", error);
+      toast.error("Terjadi kesalahan saat memperbarui foto");
+    } finally {
+      setIsSubmitting(false);
+    }
+  };
+
+  const handleResetForm = () => {
+    setFormData({
+      name: originalData.name,
+      deskripsi: originalData.deskripsi,
+      imagesId: originalData.imagesId,
+    });
+    setPreviewImage(originalData.imageUrl || null);
+    setFile(null);
+    toast.info("Form dikembalikan ke data awal");
+  };
+
+  return (
+    <Box px={{ base: "sm", md: "lg" }} py="md">
+      {/* Header */}
+      <Group mb="md">
+        <Button
+          variant="subtle"
+          onClick={() => router.back()}
+          p="xs"
+          radius="md"
+        >
+          <IconArrowBack color={colors["blue-button"]} size={24} />
+        </Button>
+        <Title order={4} ml="sm" c="dark">
+          Edit Foto
+        </Title>
+      </Group>
+
+      {/* Form */}
+      <Paper
+        w={{ base: "100%", md: "50%" }}
+        bg={colors["white-1"]}
+        p="lg"
+        radius="md"
+        shadow="sm"
+        style={{ border: "1px solid #e0e0e0" }}
+      >
+        <Stack gap="md">
+          <TextInput
+            label="Judul Foto"
+            placeholder="Masukkan judul foto"
+            value={formData.name}
+            onChange={(e) => handleChange("name", e.target.value)}
+            required
+          />
+
+          {/* Upload Gambar */}
+          <Box>
+            <Text fw="bold" fz="sm" mb={6}>
+              Gambar Foto
+            </Text>
+            <Dropzone
+              onDrop={(files) => {
+                const selectedFile = files[0];
+                if (selectedFile) {
+                  setFile(selectedFile);
+                  setPreviewImage(URL.createObjectURL(selectedFile));
+                }
+              }}
+              onReject={() =>
+                toast.error("File tidak valid, gunakan format gambar")
+              }
+              maxSize={5 * 1024 ** 2}
+              accept={{ "image/*": [] }}
+              radius="md"
+              p="xl"
+            >
+              <Group justify="center" gap="xl" mih={180}>
+                <Dropzone.Accept>
+                  <IconUpload
+                    size={48}
+                    color={colors["blue-button"]}
+                    stroke={1.5}
+                  />
+                </Dropzone.Accept>
+                <Dropzone.Reject>
+                  <IconX size={48} color="red" stroke={1.5} />
+                </Dropzone.Reject>
+                <Dropzone.Idle>
+                  <IconPhoto size={48} color="#868e96" stroke={1.5} />
+                </Dropzone.Idle>
+                <Stack gap="xs" align="center">
+                  <Text size="md" fw={500}>
+                    Seret gambar atau klik untuk memilih file
+                  </Text>
+                  <Text size="sm" c="dimmed">
+                    Maksimal 5MB, format gambar .png, .jpg, .jpeg, webp
+                  </Text>
+                </Stack>
+              </Group>
+            </Dropzone>
+
+            {previewImage && (
+              <Box mt="sm" pos="relative" style={{ textAlign: 'center' }}>
+                <Image
+                  src={previewImage}
+                  alt="Preview Gambar"
+                  radius="md"
+                  style={{
+                    maxHeight: 220,
+                    objectFit: "contain",
+                    border: `1px solid ${colors["blue-button"]}`,
+                  }}
+                  loading="lazy"
+                />
+                <ActionIcon
+                  variant="filled"
+                  color="red"
+                  radius="xl"
+                  size="sm"
+                  pos="absolute"
+                  top={5}
+                  right={5}
+                  onClick={() => {
+                    setPreviewImage(null);
+                    setFile(null);
+                  }}
+                  style={{
+                    boxShadow: '0 2px 6px rgba(0,0,0,0.15)',
+                  }}
+                >
+                  <IconX size={14} />
+                </ActionIcon>
+              </Box>
+            )}
+          </Box>
+
+          {/* Deskripsi */}
+          <Box>
+            <Text fz="sm" fw="bold">
+              Deskripsi Foto
+            </Text>
+            <EditEditor
+              value={formData.deskripsi}
+              onChange={(htmlContent) =>
+                setFormData((prev) => ({ ...prev, deskripsi: htmlContent }))
+              }
+            />
+          </Box>
+
+          {/* Action */}
+          <Group justify="right">
+            {/* Tombol Batal */}
+            <Button
+              variant="outline"
+              color="gray"
+              radius="md"
+              size="md"
+              onClick={handleResetForm}
+            >
+              Batal
+            </Button>
+
+            {/* Tombol Simpan */}
+            <Button
+              onClick={handleSubmit}
+              radius="md"
+              size="md"
+              style={{
+                background: `linear-gradient(135deg, ${colors['blue-button']}, #4facfe)`,
+                color: '#fff',
+                boxShadow: '0 4px 15px rgba(79, 172, 254, 0.4)',
+              }}
+            >
+              {isSubmitting ? <Loader size="sm" color="white" /> : 'Simpan'}
+            </Button>
+          </Group>
+        </Stack>
+      </Paper>
+    </Box>
+  );
+}
+
+export default EditFoto;

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

@@ -0,0 +1,175 @@
+'use client';
+
+import { Box, Button, Group, Paper, Skeleton, Stack, Text, Alert } from '@mantine/core';
+import Image from 'next/image';
+import { useShallowEffect } from '@mantine/hooks';
+import { IconArrowBack, IconEdit, IconTrash, IconPhoto } from '@tabler/icons-react';
+import { useParams, useRouter } from 'next/navigation';
+import { useState } from 'react';
+import { useProxy } from 'valtio/utils';
+
+import { ModalKonfirmasiHapus } from '@/app/admin/(dashboard)/_com/modalKonfirmasiHapus';
+import colors from '@/con/colors';
+import stateGallery from '@/app/admin/(dashboard)/_state/desa/gallery';
+
+function DetailFoto() {
+  const FotoState = useProxy(stateGallery.foto);
+  const [modalHapus, setModalHapus] = useState(false);
+  const [selectedId, setSelectedId] = useState<string | null>(null);
+  const [imageError, setImageError] = useState(false);
+  const params = useParams();
+  const router = useRouter();
+
+  useShallowEffect(() => {
+    FotoState.findUnique.load(params?.id as string);
+  }, []);
+
+  const handleHapus = () => {
+    if (selectedId) {
+      FotoState.delete.byId(selectedId);
+      setModalHapus(false);
+      setSelectedId(null);
+      router.push("/admin/desa/gallery/foto");
+    }
+  };
+
+  if (!FotoState.findUnique.data) {
+    return (
+      <Stack py={10}>
+        <Skeleton height={500} radius="md" />
+      </Stack>
+    );
+  }
+
+  const data = FotoState.findUnique.data;
+  const imageUrl = data.imageGalleryFoto?.link;
+
+  return (
+    <Box py={10}>
+      <Button
+        variant="subtle"
+        onClick={() => router.back()}
+        leftSection={<IconArrowBack size={24} color={colors['blue-button']} />}
+        mb={15}
+      >
+        Kembali
+      </Button>
+
+      <Paper
+        withBorder
+        // Gunakan max-width agar tidak terlalu lebar di desktop
+        maw={800}
+        w="100%"
+        bg={colors['white-1']}
+        p="lg"
+        radius="md"
+        shadow="sm"
+      >
+        <Stack gap="md">
+          <Text fz={{ base: 'xl', md: '2xl' }} fw="bold" c={colors['blue-button']}>
+            Detail Foto
+          </Text>
+
+          <Paper bg="#ECEEF8" p="md" radius="md" shadow="xs">
+            <Stack gap="sm">
+              <Box>
+                <Text fz="lg" fw="bold">Judul Foto</Text>
+                <Text fz="md" c="dimmed">{data.name || '-'}</Text>
+              </Box>
+
+              <Box>
+                <Text fz="lg" fw="bold">Deskripsi</Text>
+                <Text
+                  fz="md"
+                  c="dimmed"
+                  style={{ wordBreak: "break-word", whiteSpace: "normal" }}
+                  dangerouslySetInnerHTML={{ __html: data.deskripsi || '-' }}
+                />
+              </Box>
+
+              <Box>
+                <Text fz="lg" fw="bold">Gambar</Text>
+                {imageUrl ? (
+                  <Box
+                    pos="relative"
+                    style={{
+                      width: '100%',
+                      maxWidth: '600px', // Set a maximum width
+                      margin: '0 auto',  // Center the container
+                      aspectRatio: '16/9', // Use 16:9 aspect ratio
+                      borderRadius: 8,
+                      overflow: 'hidden',
+                      position: 'relative'
+                    }}
+                  >
+                    <Image
+                      src={imageUrl}
+                      alt={data.name || 'Gambar Foto'}
+                      fill
+                      style={{
+                        objectFit: 'contain', // Changed from 'cover' to 'contain' to show full image
+                        width: '100%',
+                        height: '100%',
+                        position: 'absolute',
+                        top: 0,
+                        left: 0
+                      }}
+                      loading="lazy"
+                      onError={() => setImageError(true)}
+                    />
+                  </Box>
+                ) : imageError ? (
+                  <Alert
+                    color="orange"
+                    icon={<IconPhoto size={16} />}
+                    title="Gagal memuat gambar"
+                    radius="md"
+                  >
+                    Gambar tidak dapat ditampilkan.
+                  </Alert>
+                ) : (
+                  <Text fz="sm" c="dimmed">Tidak ada gambar</Text>
+                )}
+              </Box>
+
+              {/* Action Buttons */}
+              <Group gap="sm" justify="flex-start">
+                <Button
+                  color="red"
+                  onClick={() => {
+                    setSelectedId(data.id);
+                    setModalHapus(true);
+                  }}
+                  variant="light"
+                  radius="md"
+                  size="md"
+                >
+                  <IconTrash size={20} />
+                </Button>
+
+                <Button
+                  color="green"
+                  onClick={() => router.push(`/admin/desa/gallery/foto/${data.id}/edit`)}
+                  variant="light"
+                  radius="md"
+                  size="md"
+                >
+                  <IconEdit size={20} />
+                </Button>
+              </Group>
+            </Stack>
+          </Paper>
+        </Stack>
+      </Paper>
+
+      <ModalKonfirmasiHapus
+        opened={modalHapus}
+        onClose={() => setModalHapus(false)}
+        onConfirm={handleHapus}
+        text="Apakah Anda yakin ingin menghapus foto ini?"
+      />
+    </Box>
+  );
+}
+
+export default DetailFoto;

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

@@ -0,0 +1,228 @@
+'use client';
+import CreateEditor from '@/app/admin/(dashboard)/_com/createEditor';
+import stateGallery from '@/app/admin/(dashboard)/_state/desa/gallery';
+import colors from '@/con/colors';
+import ApiFetch from '@/lib/api-fetch';
+import {
+  ActionIcon,
+  Box,
+  Button,
+  Group,
+  Paper,
+  Stack,
+  Text,
+  TextInput,
+  Title,
+  Loader,
+  Image
+} from '@mantine/core';
+import { Dropzone } from '@mantine/dropzone';
+import { IconArrowBack, IconPhoto, IconUpload, IconX } from '@tabler/icons-react';
+import { useRouter } from 'next/navigation';
+import { useState } from 'react';
+import { toast } from 'react-toastify';
+import { useProxy } from 'valtio/utils';
+
+function CreateFoto() {
+  const FotoState = useProxy(stateGallery.foto);
+  const router = useRouter();
+  const [isSubmitting, setIsSubmitting] = useState(false);
+  const [previewImage, setPreviewImage] = useState<string | null>(null);
+  const [file, setFile] = useState<File | null>(null);
+
+  const resetForm = () => {
+    FotoState.create.form = {
+      name: '',
+      deskripsi: '',
+      imagesId: '',
+    };
+    setPreviewImage(null);
+    setFile(null);
+  };
+
+  const handleSubmit = async () => {
+    try {
+      setIsSubmitting(true);
+      if (!file) {
+        return toast.warn('Silakan pilih file gambar terlebih dahulu');
+      }
+
+      const res = await ApiFetch.api.fileStorage.create.post({
+        file,
+        name: file.name,
+      });
+
+      const uploaded = res.data?.data;
+      if (!uploaded?.id) {
+        return toast.error('Gagal mengunggah gambar, silakan coba lagi');
+      }
+
+      FotoState.create.form.imagesId = uploaded.id;
+
+      await FotoState.create.create();
+
+      resetForm();
+      router.push('/admin/desa/gallery/foto');
+    } catch (error) {
+      console.error('Error creating foto:', error);
+      toast.error('Terjadi kesalahan saat membuat foto');
+    } finally {
+      setIsSubmitting(false);
+    }
+  };
+
+  return (
+    <Box px={{ base: 'sm', md: 'lg' }} py="md">
+      {/* Header Back Button + Title */}
+      <Group mb="md">
+        <Button
+          variant="subtle"
+          onClick={() => router.back()}
+          p="xs"
+          radius="md"
+        >
+          <IconArrowBack color={colors['blue-button']} size={24} />
+        </Button>
+        <Title order={4} ml="sm" c="dark">
+          Tambah Foto
+        </Title>
+      </Group>
+
+      {/* Card Form */}
+      <Paper
+        w={{ base: '100%', md: '50%' }}
+        bg={colors['white-1']}
+        p="lg"
+        radius="md"
+        shadow="sm"
+        style={{ border: '1px solid #e0e0e0' }}
+      >
+        <Stack gap="md">
+          {/* Judul */}
+          <TextInput
+            label="Judul Foto"
+            placeholder="Masukkan judul Foto"
+            value={FotoState.create.form.name}
+            onChange={(e) => {
+              FotoState.create.form.name = e.currentTarget.value;
+            }}
+            required
+          />
+
+          <Box>
+            <Text fw="bold" fz="sm" mb={6}>
+              Gambar Berita
+            </Text>
+            <Dropzone
+              onDrop={(files) => {
+                const selectedFile = files[0];
+                if (selectedFile) {
+                  setFile(selectedFile);
+                  setPreviewImage(URL.createObjectURL(selectedFile));
+                }
+              }}
+              onReject={() => toast.error('File tidak valid, gunakan format gambar')}
+              maxSize={5 * 1024 ** 2}
+              accept={{ 'image/*': ['.jpeg', '.jpg', '.png', '.webp'] }}
+              radius="md"
+              p="xl"
+            >
+              <Group justify="center" gap="xl" mih={180}>
+                <Dropzone.Accept>
+                  <IconUpload size={48} color="var(--mantine-color-blue-6)" stroke={1.5} />
+                </Dropzone.Accept>
+                <Dropzone.Reject>
+                  <IconX size={48} color="var(--mantine-color-red-6)" stroke={1.5} />
+                </Dropzone.Reject>
+                <Dropzone.Idle>
+                  <IconPhoto size={48} color="var(--mantine-color-dimmed)" stroke={1.5} />
+                </Dropzone.Idle>
+              </Group>
+              <Text ta="center" mt="sm" size="sm" color="dimmed">
+                Seret gambar atau klik untuk memilih file (maks 5MB)
+              </Text>
+            </Dropzone>
+
+            {previewImage && (
+              <Box mt="sm" pos="relative" style={{ textAlign: 'center' }}>
+                <Image
+                  src={previewImage}
+                  alt="Preview Gambar"
+                  radius="md"
+                  style={{
+                    maxHeight: 200,
+                    objectFit: 'contain',
+                    border: '1px solid #ddd',
+                  }}
+                  loading="lazy"
+                />
+
+                {/* Tombol hapus (pojok kanan atas) */}
+                <ActionIcon
+                  variant="filled"
+                  color="red"
+                  radius="xl"
+                  size="sm"
+                  pos="absolute"
+                  top={5}
+                  right={5}
+                  onClick={() => {
+                    setPreviewImage(null);
+                    setFile(null);
+                  }}
+                  style={{
+                    boxShadow: '0 2px 6px rgba(0,0,0,0.15)',
+                  }}
+                >
+                  <IconX size={14} />
+                </ActionIcon>
+              </Box>
+            )}
+          </Box>
+
+          {/* Deskripsi */}
+          <Box>
+            <Text fw="bold" fz="sm" mb={6}>
+              Deskripsi Foto
+            </Text>
+            <CreateEditor
+              value={FotoState.create.form.deskripsi}
+              onChange={(val) => {
+                FotoState.create.form.deskripsi = val;
+              }}
+            />
+          </Box>
+
+          {/* Button Submit */}
+          <Group justify="right">
+            <Button
+              variant="outline"
+              color="gray"
+              radius="md"
+              size="md"
+              onClick={resetForm}
+            >
+              Reset
+            </Button>
+
+            {/* Tombol Simpan */}
+            <Button
+              onClick={handleSubmit}
+              radius="md"
+              size="md"
+              style={{
+                background: `linear-gradient(135deg, ${colors['blue-button']}, #4facfe)`,
+                color: '#fff',
+                boxShadow: '0 4px 15px rgba(79, 172, 254, 0.4)',
+              }}
+            >
+              {isSubmitting ? <Loader size="sm" color="white" /> : 'Simpan'}
+            </Button>
+          </Group>
+        </Stack>
+      </Paper>
+    </Box>
+  );
+}
+
+export default CreateFoto;

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

@@ -1,157 +1,163 @@
-"use client";
-import stateFileStorage from "@/state/state-list-image";
+'use client'
+import colors from '@/con/colors';
 import {
-  ActionIcon,
   Box,
-  Card,
-  Flex,
+  Button,
+  Center,
   Group,
-  Image,
   Pagination,
   Paper,
-  SimpleGrid,
+  Skeleton,
   Stack,
+  Table,
+  TableTbody,
+  TableTd,
+  TableTh,
+  TableThead,
+  TableTr,
   Text,
-  TextInput,
   Title
-} from "@mantine/core";
-import { useShallowEffect } from "@mantine/hooks";
-import { IconSearch, IconTrash, IconX } from "@tabler/icons-react";
-import { motion } from "framer-motion";
-import toast from "react-simple-toasts";
-import { useSnapshot } from "valtio";
-
-export default function ListImage() {
-  const { list, total } = useSnapshot(stateFileStorage);
-
-  useShallowEffect(() => {
-    stateFileStorage.load();
-  }, []);
-
-  let timeOut: NodeJS.Timer;
+} from '@mantine/core';
+import { useShallowEffect } from '@mantine/hooks';
+import { IconDeviceImac, IconPlus, IconSearch } from '@tabler/icons-react';
+import { useRouter } from 'next/navigation';
+import { useState } from 'react';
+import { useProxy } from 'valtio/utils';
+import HeaderSearch from '../../../_com/header';
+import stateGallery from '../../../_state/desa/gallery';
 
+function Foto() {
+  const [search, setSearch] = useState("");
   return (
-    <Stack p="lg" gap="lg">
-      <Flex justify="space-between" align="center" wrap="wrap" gap="md">
-        <Title order={2} fw={700}>
-          Galeri Foto
-        </Title>
-        <TextInput
-          radius="xl"
-          size="md"
-          placeholder="Cari foto berdasarkan nama..."
-          leftSection={<IconSearch size={18} />}
-          rightSection={
-            <ActionIcon
-              variant="light"
-              color="gray"
-              radius="xl"
-              onClick={() => stateFileStorage.load()}
-            >
-              <IconX size={18} />
-            </ActionIcon>
-          }
-          onChange={(e) => {
-            if (timeOut) clearTimeout(timeOut);
-            timeOut = setTimeout(() => {
-              stateFileStorage.load({ search: e.target.value });
-            }, 300);
-          }}
-        />
-      </Flex>
-
-      <Paper withBorder radius="lg" p="md" shadow="sm">
-        {list && list.length > 0 ? (
-          <SimpleGrid
-            cols={{ base: 2, sm: 3, md: 5, lg: 8 }}
-            spacing="md"
-            verticalSpacing="md"
-          >
-            {list.map((v, k) => (
-              <Card
-                key={k}
-                withBorder
-                radius="md"
-                shadow="sm"
-                className="hover:shadow-md transition-all duration-200"
-              >
-                <Stack gap="xs">
-                  <motion.div
-                    onClick={() => {
-                      navigator.clipboard.writeText(v.url);
-                      toast("Tautan foto berhasil disalin");
-                    }}
-                    whileHover={{ scale: 1.05 }}
-                    whileTap={{ scale: 0.95 }}
-                    style={{ cursor: "pointer" }}
-                  >
-                    <Image
-                      src={`${v.url}?size=200`}
-                      alt={v.name}
-                      radius="md"
-                      h={120}
-                      fit="cover"
-                      loading="lazy"
-                    />
-                  </motion.div>
-
-                  <Box>
-                    <Text size="sm" fw={500} lineClamp={2}>
-                      {v.name}
-                    </Text>
-                  </Box>
-
-                  <Group justify="space-between" align="center" pt="xs">
-                      <ActionIcon
-                        variant="subtle"
-                        color="red"
-                        radius="md"
-                        onClick={() => {
-                          stateFileStorage
-                            .del({ id: v.id })
-                            .finally(() => toast("Foto berhasil dihapus"));
-                        }}
-                      >
-                        <IconTrash size={18} />
-                      </ActionIcon>
-                  </Group>
-                </Stack>
-              </Card>
-            ))}
-          </SimpleGrid>
-        ) : (
-          <Stack align="center" justify="center" py="xl" gap="sm">
-            <Image
-              src="https://cdn-icons-png.flaticon.com/512/4076/4076549.png"
-              alt="Kosong"
-              w={120}
-              h={120}
-              fit="contain"
-              opacity={0.7}
-              loading="lazy"
-            />
-            <Text c="dimmed" ta="center">
-              Belum ada foto yang tersedia
-            </Text>
-          </Stack>
-        )}
-      </Paper>
-
-      {total && total > 1 && (
-        <Flex justify="center">
-          <Pagination
-            total={total}
-            value={stateFileStorage.page}  // Changed from page to value
-            size="md"
-            radius="md"
-            withEdges
-            onChange={(page) => {
-              stateFileStorage.load({ page });
-            }}
-          />
-
-        </Flex>
-      )}
-    </Stack>
+    <Box>
+      <HeaderSearch
+        title='Foto'
+        placeholder='Cari judul atau deskripsi foto...'
+        searchIcon={<IconSearch size={20} />}
+        value={search}
+        onChange={(e) => setSearch(e.currentTarget.value)}
+      />
+      <ListFoto search={search} />
+    </Box>
   );
 }
+
+function ListFoto({ search }: { search: string }) {
+  const FotoState = useProxy(stateGallery.foto)
+  const router = useRouter();
+
+  const {
+    data,
+    page,
+    totalPages,
+    loading,
+    load,
+  } = FotoState.findMany;
+
+  useShallowEffect(() => {
+    load(page, 10, search)
+  }, [page, search])
+
+  const filteredData = data || []
+
+  if (loading || !data) {
+    return (
+      <Stack py={10}>
+        <Skeleton height={600} radius="md" />
+      </Stack>
+    )
+  }
+
+  return (
+    <Box py={10}>
+      <Paper withBorder bg={colors['white-1']} p={'lg'} shadow="md" radius="md">
+        <Group justify="space-between" mb="md">
+          <Title order={4}>Daftar Foto</Title>
+            <Button
+              leftSection={<IconPlus size={18} />}
+              color="blue"
+              variant="light"
+              onClick={() => router.push('/admin/desa/gallery/foto/create')}
+            >
+              Tambah Baru
+            </Button>
+        </Group>
+        <Box style={{ overflowX: "auto" }}>
+          <Table highlightOnHover>
+            <TableThead>
+              <TableTr>
+                <TableTh style={{ width: '25%' }}>Judul Foto</TableTh>
+                <TableTh style={{ width: '20%' }}>Tanggal</TableTh>
+                <TableTh style={{ width: '30%' }}>Deskripsi</TableTh>
+                <TableTh style={{ width: '15%' }}>Aksi</TableTh>
+              </TableTr>
+            </TableThead>
+            <TableTbody>
+              {filteredData.length > 0 ? (
+                filteredData.map((item) => (
+                  <TableTr key={item.id}>
+                    <TableTd style={{ width: '25%' }}>
+                      <Box w={200}> 
+                        <Text fw={500} truncate="end" lineClamp={1}>{item.name}</Text>
+                      </Box>
+                    </TableTd>
+                    <TableTd style={{ width: '20%' }}>
+                     <Box w={200}>
+                     <Text fz="sm" c="dimmed">
+                        {new Date(item.createdAt).toLocaleDateString('id-ID', {
+                          day: 'numeric',
+                          month: 'long',
+                          year: 'numeric',
+                        })}
+                      </Text>
+                     </Box>
+                    </TableTd>
+                    <TableTd style={{ width: '30%' }}>
+                     <Box w={200}>
+                      <Text fz="sm" truncate="end" lineClamp={1} dangerouslySetInnerHTML={{ __html: item.deskripsi }} />
+                     </Box>
+                    </TableTd>
+                    <TableTd style={{ width: '15%' }}>
+                      <Button
+                        variant="light"
+                        color="blue"
+                        onClick={() => router.push(`/admin/desa/gallery/foto/${item.id}`)}
+                      >
+                        <IconDeviceImac size={20} />
+                        <Text ml={5}>Detail</Text>
+                      </Button>
+                    </TableTd>
+                  </TableTr>
+                ))
+              ) : (
+                <TableTr>
+                  <TableTd colSpan={4}>
+                    <Center py={20}>
+                      <Text c="dimmed">Tidak ada foto yang cocok</Text>
+                    </Center>
+                  </TableTd>
+                </TableTr>
+              )}
+            </TableTbody>
+          </Table>
+        </Box>
+      </Paper>
+      <Center>
+        <Pagination
+          value={page}
+          onChange={(newPage) => {
+            load(newPage, 10)
+            window.scrollTo({ top: 0, behavior: 'smooth' })
+          }}
+          total={totalPages}
+          mt="md"
+          mb="md"
+          color="blue"
+          radius="md"
+        />
+      </Center>
+    </Box>
+  );
+}
+
+export default Foto;

src/app/admin/(dashboard)/kesehatan/data-kesehatan-warga/fasilitas_kesehatan/[id]/edit/page.tsx

@@ -1,5 +1,3 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-/* eslint-disable react-hooks/exhaustive-deps */
 'use client';
 
 import EditEditor from '@/app/admin/(dashboard)/_com/editEditor';
@@ -10,19 +8,22 @@ import {
   Button,
   Group,
   Loader,
+  MultiSelect,
   Paper,
   Stack,
   Text,
   TextInput,
-  Title
+  Title,
 } from '@mantine/core';
+import { useShallowEffect } from '@mantine/hooks';
 import { IconArrowBack } from '@tabler/icons-react';
 import { useParams, useRouter } from 'next/navigation';
-import { useEffect, useState } from 'react';
+import { useState } from 'react';
 import { toast } from 'react-toastify';
 import { useProxy } from 'valtio/utils';
 
-interface FasilitasKesehatanFormBase {
+// Tipe form yang SESUAI dengan logika relasi (array ID)
+interface EditFasilitasKesehatanForm {
   name: string;
   informasiUmum: {
     fasilitas: string;
@@ -30,128 +31,92 @@ interface FasilitasKesehatanFormBase {
     jamOperasional: string;
   };
   layananUnggulan: { content: string };
-  dokterdanTenagaMedis: {
-    name: string;
-    specialist: string;
-    jadwal: string;
-  };
+  dokterdanTenagaMedis: string[]; // ← ARRAY ID
   fasilitasPendukung: { content: string };
   prosedurPendaftaran: { content: string };
-  tarifDanLayanan: {
-    layanan: string;
-    tarif: string;
-  };
+  tarifDanLayanan: string[]; // ← ARRAY ID
 }
 
 function EditFasilitasKesehatan() {
   const state = useProxy(fasilitasKesehatanState.fasilitasKesehatan);
+  const dokterState = useProxy(fasilitasKesehatanState.dokter);
+  const tarifState = useProxy(fasilitasKesehatanState.tarif);
   const router = useRouter();
-  const params = useParams();
+  const params = useParams<{ id: string }>();
   const [isSubmitting, setIsSubmitting] = useState(false);
 
-  const [formData, setFormData] = useState<FasilitasKesehatanFormBase>({
+  const [formData, setFormData] = useState<EditFasilitasKesehatanForm>({
     name: '',
     informasiUmum: { fasilitas: '', alamat: '', jamOperasional: '' },
     layananUnggulan: { content: '' },
-    dokterdanTenagaMedis: { name: '', specialist: '', jadwal: '' },
+    dokterdanTenagaMedis: [],
     fasilitasPendukung: { content: '' },
     prosedurPendaftaran: { content: '' },
-    tarifDanLayanan: { layanan: '', tarif: '' },
+    tarifDanLayanan: [],
   });
 
-  const [originalData, setOriginalData] = useState<FasilitasKesehatanFormBase>({
-    name: '',
-    informasiUmum: { fasilitas: '', alamat: '', jamOperasional: '' },
-    layananUnggulan: { content: '' },
-    dokterdanTenagaMedis: { name: '', specialist: '', jadwal: '' },
-    fasilitasPendukung: { content: '' },
-    prosedurPendaftaran: { content: '' },
-    tarifDanLayanan: { layanan: '', tarif: '' },
-  });
+  // Load data fasilitas & daftar dokter/tarif
+  useShallowEffect(() => {
+    const loadAll = async () => {
+      const id = params?.id;
+      if (!id) return;
 
-  // Helper untuk update nested state
-  const updateForm = <K extends keyof FasilitasKesehatanFormBase>(
-    key: K,
-    value: FasilitasKesehatanFormBase[K]
-  ) => setFormData(prev => ({ ...prev, [key]: value }));
+      // Load dokter & tarif (untuk opsi MultiSelect)
+      await Promise.all([
+        dokterState.findMany.load(),
+        tarifState.findMany.load(),
+      ]);
 
-  const updateNested = <
-    K extends keyof FasilitasKesehatanFormBase,
-    N extends keyof FasilitasKesehatanFormBase[K]
-  >(key: K, nestedKey: N, value: FasilitasKesehatanFormBase[K][N]) =>
-    setFormData(prev => ({
-      ...prev,
-      [key]: { ...prev[key] as object, [nestedKey]: value },
-    }));
+      // Load data fasilitas
+      await state.edit.load(id);
+      const loaded = state.edit.form;
+      if (loaded) {
+        setFormData({
+          name: loaded.name,
+          informasiUmum: loaded.informasiUmum,
+          layananUnggulan: loaded.layananUnggulan,
+          dokterdanTenagaMedis: loaded.dokterdanTenagaMedis || [],
+          fasilitasPendukung: loaded.fasilitasPendukung,
+          prosedurPendaftaran: loaded.prosedurPendaftaran,
+          tarifDanLayanan: loaded.tarifDanLayanan || [],
+        });
+      }
+    };
 
-  const deepClone = (obj: any): any => {
-    try {
-      return JSON.parse(JSON.stringify(obj));
-    } catch (error) {
-      console.warn('Gagal deep clone dengan JSON fallback:', error);
-      return obj; // fallback (berisiko shared reference)
+    loadAll();
+  }, [params?.id]);
+
+  const updateForm = <K extends keyof EditFasilitasKesehatanForm>(
+    field: K,
+    value: EditFasilitasKesehatanForm[K]
+  ) => {
+    setFormData(prev => ({ ...prev, [field]: value }));
+  };
+
+  const handleReset = () => {
+    const loaded = state.edit.form;
+    if (loaded) {
+      setFormData({
+        name: loaded.name,
+        informasiUmum: loaded.informasiUmum,
+        layananUnggulan: loaded.layananUnggulan,
+        dokterdanTenagaMedis: loaded.dokterdanTenagaMedis || [],
+        fasilitasPendukung: loaded.fasilitasPendukung,
+        prosedurPendaftaran: loaded.prosedurPendaftaran,
+        tarifDanLayanan: loaded.tarifDanLayanan || [],
+      });
+      toast.info('Form dikembalikan ke data awal');
     }
   };
 
-  // Load data
-  useEffect(() => {
-    const load = async () => {
-      const id = params?.id as string;
-      if (!id) return;
-  
-      try {
-        await state.edit.load(id);
-        const loadedData = state.edit.form;
-  
-        if (!loadedData) {
-          toast.error('Data tidak ditemukan');
-          return;
-        }
-  
-        // Gunakan JSON fallback untuk deep clone
-        const clonedData = deepClone(loadedData) as FasilitasKesehatanFormBase;
-  
-        setFormData(clonedData);
-        setOriginalData(clonedData);
-      } catch (err) {
-        console.error(err);
-        toast.error('Gagal memuat data fasilitas kesehatan');
-      }
-    };
-  
-    load();
-  }, [params?.id]);
-
-  const handleResetForm = () => {
-    setFormData({
-      name: originalData.name,
-      informasiUmum:
-      {
-        fasilitas: originalData.informasiUmum.fasilitas,
-        alamat: originalData.informasiUmum.alamat,
-        jamOperasional: originalData.informasiUmum.jamOperasional
-      },
-      layananUnggulan: { content: originalData.layananUnggulan.content },
-      dokterdanTenagaMedis: {
-        name: originalData.dokterdanTenagaMedis.name,
-        specialist: originalData.dokterdanTenagaMedis.specialist,
-        jadwal: originalData.dokterdanTenagaMedis.jadwal
-      },
-      fasilitasPendukung: { content: originalData.fasilitasPendukung.content },
-      prosedurPendaftaran: { content: originalData.prosedurPendaftaran.content },
-      tarifDanLayanan: {
-        layanan: originalData.tarifDanLayanan.layanan,
-        tarif: originalData.tarifDanLayanan.tarif
-      },
-    });
-    toast.info("Form dikembalikan ke data awal");
-  };
-
-  // Submit
-  const handleSubmit = async () => {
+  const handleSubmit = async (e: React.FormEvent) => {
+    e.preventDefault();
     try {
       setIsSubmitting(true);
-      state.edit.form = { ...state.edit.form, ...formData };
+
+      // Update state Valtio
+      state.edit.form = { ...formData };
+
       const success = await state.edit.submit();
       if (success) {
         toast.success('Fasilitas kesehatan berhasil diperbarui!');
@@ -159,14 +124,14 @@ function EditFasilitasKesehatan() {
       }
     } catch (err) {
       console.error(err);
-      toast.error('Terjadi kesalahan saat memperbarui data fasilitas kesehatan');
+      toast.error('Gagal memperbarui data');
     } finally {
       setIsSubmitting(false);
     }
   };
 
   return (
-    <Box px={{ base: 'sm', md: 'lg' }} py="md">
+    <Box px={{ base: 'sm', md: 'lg' }} py="md" component="form" onSubmit={handleSubmit}>
       {/* Header */}
       <Group mb="md">
         <Button variant="subtle" onClick={() => router.back()} p="xs" radius="md">
@@ -189,7 +154,7 @@ function EditFasilitasKesehatan() {
         <Stack gap="md">
           <TextInput
             label="Nama Fasilitas Kesehatan"
-            placeholder="Masukkan nama fasilitas kesehatan"
+            placeholder="Masukkan nama"
             value={formData.name}
             onChange={(e) => updateForm('name', e.target.value)}
             required
@@ -197,118 +162,108 @@ function EditFasilitasKesehatan() {
 
           {/* Informasi Umum */}
           <Box>
-            <Text fw="bold" mb={5}>
-              Informasi Umum
-            </Text>
+            <Text fw="bold" mb={5}>Informasi Umum</Text>
             <TextInput
               label="Fasilitas"
               value={formData.informasiUmum.fasilitas}
-              onChange={(e) => updateNested('informasiUmum', 'fasilitas', e.target.value)}
+              onChange={(e) =>
+                updateForm('informasiUmum', {
+                  ...formData.informasiUmum,
+                  fasilitas: e.target.value,
+                })
+              }
             />
             <TextInput
               label="Alamat"
               value={formData.informasiUmum.alamat}
-              onChange={(e) => updateNested('informasiUmum', 'alamat', e.target.value)}
+              onChange={(e) =>
+                updateForm('informasiUmum', {
+                  ...formData.informasiUmum,
+                  alamat: e.target.value,
+                })
+              }
             />
             <TextInput
               label="Jam Operasional"
               value={formData.informasiUmum.jamOperasional}
-              onChange={(e) => updateNested('informasiUmum', 'jamOperasional', e.target.value)}
+              onChange={(e) =>
+                updateForm('informasiUmum', {
+                  ...formData.informasiUmum,
+                  jamOperasional: e.target.value,
+                })
+              }
             />
           </Box>
 
           {/* Layanan Unggulan */}
           <Box>
-            <Text fw="bold" mb={5}>
-              Layanan Unggulan
-            </Text>
+            <Text fw="bold" mb={5}>Layanan Unggulan</Text>
             <EditEditor
               value={formData.layananUnggulan.content}
-              onChange={(v) => updateNested('layananUnggulan', 'content', v)}
+              onChange={(v) => updateForm('layananUnggulan', { content: v })}
             />
           </Box>
 
-          {/* Dokter dan Tenaga Medis */}
-          <Box>
-            <Text fw="bold" mb={5}>
-              Dokter dan Tenaga Medis
-            </Text>
-            <TextInput
-              label="Nama Dokter"
-              value={formData.dokterdanTenagaMedis.name}
-              onChange={(e) => updateNested('dokterdanTenagaMedis', 'name', e.target.value)}
-            />
-            <TextInput
-              label="Specialist"
-              value={formData.dokterdanTenagaMedis.specialist}
-              onChange={(e) =>
-                updateNested('dokterdanTenagaMedis', 'specialist', e.target.value)
-              }
-            />
-            <TextInput
-              label="Jadwal"
-              value={formData.dokterdanTenagaMedis.jadwal}
-              onChange={(e) => updateNested('dokterdanTenagaMedis', 'jadwal', e.target.value)}
-            />
-          </Box>
+          {/* Dokter & Tenaga Medis — MultiSelect */}
+          <MultiSelect
+            label="Dokter & Tenaga Medis"
+            placeholder="Pilih dokter/tenaga medis"
+            data={
+              dokterState.findMany.data?.map((d) => ({
+                value: d.id,
+                label: `${d.name} (${d.specialist})`,
+              })) || []
+            }
+            value={formData.dokterdanTenagaMedis}
+            onChange={(val) => updateForm('dokterdanTenagaMedis', val)}
+            searchable
+            clearable
+            required
+          />
 
           {/* Fasilitas Pendukung */}
           <Box>
-            <Text fw="bold" mb={5}>
-              Fasilitas Pendukung
-            </Text>
+            <Text fw="bold" mb={5}>Fasilitas Pendukung</Text>
             <EditEditor
               value={formData.fasilitasPendukung.content}
-              onChange={(v) => updateNested('fasilitasPendukung', 'content', v)}
+              onChange={(v) => updateForm('fasilitasPendukung', { content: v })}
             />
           </Box>
 
           {/* Prosedur Pendaftaran */}
           <Box>
-            <Text fw="bold" mb={5}>
-              Prosedur Pendaftaran
-            </Text>
+            <Text fw="bold" mb={5}>Prosedur Pendaftaran</Text>
             <EditEditor
               value={formData.prosedurPendaftaran.content}
-              onChange={(v) => updateNested('prosedurPendaftaran', 'content', v)}
+              onChange={(v) => updateForm('prosedurPendaftaran', { content: v })}
             />
           </Box>
 
-          {/* Tarif dan Layanan */}
-          <Box>
-            <Text fw="bold" mb={5}>
-              Tarif dan Layanan
-            </Text>
-            <TextInput
-              label="Tarif"
-              value={formData.tarifDanLayanan.tarif}
-              onChange={(e) => updateNested('tarifDanLayanan', 'tarif', e.target.value)}
-            />
-            <TextInput
-              label="Layanan"
-              value={formData.tarifDanLayanan.layanan}
-              onChange={(e) => updateNested('tarifDanLayanan', 'layanan', e.target.value)}
-            />
-          </Box>
+          {/* Tarif & Layanan — MultiSelect */}
+          <MultiSelect
+            label="Tarif & Layanan"
+            placeholder="Pilih layanan"
+            data={
+              tarifState.findMany.data?.map((t) => ({
+                value: t.id,
+                label: `${t.layanan} - ${t.tarif}`,
+              })) || []
+            }
+            value={formData.tarifDanLayanan}
+            onChange={(val) => updateForm('tarifDanLayanan', val)}
+            searchable
+            clearable
+            required
+          />
 
-          {/* Tombol Simpan */}
+          {/* Aksi */}
           <Group justify="right">
-            {/* Tombol Batal */}
-            <Button
-              variant="outline"
-              color="gray"
-              radius="md"
-              size="md"
-              onClick={handleResetForm}
-            >
+            <Button variant="outline" color="gray" radius="md" onClick={handleReset}>
               Batal
             </Button>
-
-            {/* Tombol Simpan */}
             <Button
-              onClick={handleSubmit}
+              type="submit"
               radius="md"
-              size="md"
               style={{
                 background: `linear-gradient(135deg, ${colors['blue-button']}, #4facfe)`,
                 color: '#fff',
@@ -324,4 +279,4 @@ function EditFasilitasKesehatan() {
   );
 }
 
-export default EditFasilitasKesehatan;
+export default EditFasilitasKesehatan;

src/app/admin/(dashboard)/kesehatan/data-kesehatan-warga/fasilitas_kesehatan/[id]/page.tsx

@@ -9,6 +9,12 @@ import {
   Paper,
   Skeleton,
   Stack,
+  Table,
+  TableTbody,
+  TableTd,
+  TableTh,
+  TableThead,
+  TableTr,
   Text
 } from '@mantine/core';
 import { useShallowEffect } from '@mantine/hooks';
@@ -108,21 +114,79 @@ function DetailFasilitasKesehatan() {
               </Box>
 
               <Box>
-                <Text fz="lg" fw="bold">Dokter & Tenaga Medis</Text>
-                <Text fz="md" fw="bold">Nama</Text>
-                <Text fz="md" c="dimmed">{data.dokterdantenagamedis?.name || '-'}</Text>
-                <Text fz="md" fw="bold">Spesialis</Text>
-                <Text fz="md" c="dimmed">{data.dokterdantenagamedis?.specialist || '-'}</Text>
-                <Text fz="md" fw="bold">Jadwal</Text>
-                <Text fz="md" c="dimmed">{data.dokterdantenagamedis?.jadwal || '-'}</Text>
+                <Text fz="lg" fw="bold" mb="sm">Dokter & Tenaga Medis</Text>
+                {Array.isArray(data.dokterdantenagamedis) && data.dokterdantenagamedis.length > 0 ? (
+                  <Box style={{ overflowX: 'auto', width: '100%' }}>
+                    <Table striped highlightOnHover withTableBorder>
+                      <TableThead>
+                        <TableTr>
+                          <TableTh style={{ whiteSpace: 'nowrap' }}>Nama</TableTh>
+                          <TableTh style={{ whiteSpace: 'nowrap' }}>Spesialis</TableTh>
+                          <TableTh style={{ whiteSpace: 'nowrap' }}>Jadwal</TableTh>
+                          <TableTh style={{ whiteSpace: 'nowrap' }}>Jam Operasional</TableTh>
+                        </TableTr>
+                      </TableThead>
+                      <TableTbody>
+                        {data.dokterdantenagamedis.map((dokter) => (
+                          <TableTr key={dokter.id}>
+                            <TableTd style={{ whiteSpace: 'normal', wordBreak: 'break-word' }}>
+                              {dokter.name || '-'}
+                            </TableTd>
+                            <TableTd style={{ whiteSpace: 'normal', wordBreak: 'break-word' }}>
+                              {dokter.specialist || '-'}
+                            </TableTd>
+                            <TableTd style={{ whiteSpace: 'normal', wordBreak: 'break-word' }}>
+                              {dokter.jadwal || '-'}
+                            </TableTd>
+                            <TableTd style={{ whiteSpace: 'normal', wordBreak: 'break-word' }}>
+                              {dokter.jamBukaOperasional} – {dokter.jamTutupOperasional}
+                              {dokter.jadwalLibur && (
+                                <>
+                                  <br />
+                                  <Text span c="dimmed" fz="xs">
+                                    Libur: {dokter.jadwalLibur} ({dokter.jamBukaLibur}–{dokter.jamTutupLibur})
+                                  </Text>
+                                </>
+                              )}
+                            </TableTd>
+                          </TableTr>
+                        ))}
+                      </TableTbody>
+                    </Table>
+                  </Box>
+                ) : (
+                  <Text c="dimmed">Tidak ada dokter atau tenaga medis terdaftar.</Text>
+                )}
               </Box>
 
-              <Box>
-                <Text fz="lg" fw="bold">Tarif & Layanan</Text>
-                <Text fz="md" fw="bold">Layanan</Text>
-                <Text fz="md" c="dimmed">{data.tarifdanlayanan?.layanan || '-'}</Text>
-                <Text fz="md" fw="bold">Tarif</Text>
-                <Text fz="md" c="dimmed">{data.tarifdanlayanan?.tarif || '-'}</Text>
+              <Box mt="xl">
+                <Text fz="lg" fw="bold" mb="sm">Tarif & Layanan</Text>
+                {Array.isArray(data.tarifdanlayanan) && data.tarifdanlayanan.length > 0 ? (
+                  <Box style={{ overflowX: 'auto', width: '100%' }}>
+                    <Table striped highlightOnHover withTableBorder>
+                      <TableThead>
+                        <TableTr>
+                          <TableTh style={{ whiteSpace: 'nowrap' }}>Layanan</TableTh>
+                          <TableTh style={{ whiteSpace: 'nowrap' }}>Tarif</TableTh>
+                        </TableTr>
+                      </TableThead>
+                      <TableTbody>
+                        {data.tarifdanlayanan.map((tarif) => (
+                          <TableTr key={tarif.id}>
+                            <TableTd style={{ whiteSpace: 'normal', wordBreak: 'break-word' }}>
+                              {tarif.layanan || '-'}
+                            </TableTd>
+                            <TableTd style={{ whiteSpace: 'normal', wordBreak: 'break-word' }}>
+                              {tarif.tarif || '-'}
+                            </TableTd>
+                          </TableTr>
+                        ))}
+                      </TableTbody>
+                    </Table>
+                  </Box>
+                ) : (
+                  <Text c="dimmed">Tidak ada tarif atau layanan terdaftar.</Text>
+                )}
               </Box>
 
               {/* Aksi */}

src/app/admin/(dashboard)/kesehatan/data-kesehatan-warga/fasilitas_kesehatan/create/page.tsx

@@ -7,19 +7,20 @@ import {
   Button,
   Group,
   Loader,
+  MultiSelect,
   Paper,
   Stack,
   Text,
   TextInput,
   Title
 } from '@mantine/core';
+import { useShallowEffect } from '@mantine/hooks';
 import { IconArrowBack } from '@tabler/icons-react';
 import { useRouter } from 'next/navigation';
 import { useState } from 'react';
 import { toast } from 'react-toastify';
 import { useProxy } from 'valtio/utils';
 
-
 function CreateFasilitasKesehatan() {
   const stateFasilitasKesehatan = useProxy(fasilitasKesehatanState.fasilitasKesehatan);
   const router = useRouter();
@@ -34,23 +35,16 @@ function CreateFasilitasKesehatan() {
         jamOperasional: '',
       },
       layananUnggulan: {
-        content: '',
-      },
-      dokterdanTenagaMedis: {
-        name: '',
-        specialist: '',
-        jadwal: '',
+        content: ''
       },
+      dokterdanTenagaMedis: [] as string[],
       fasilitasPendukung: {
         content: '',
       },
       prosedurPendaftaran: {
         content: '',
       },
-      tarifDanLayanan: {
-        layanan: '',
-        tarif: '',
-      },
+      tarifDanLayanan: [] as string[],
     };
   };
 
@@ -70,6 +64,11 @@ function CreateFasilitasKesehatan() {
     }
   };
 
+  useShallowEffect(() => {
+    fasilitasKesehatanState.dokter.findMany.load();
+    fasilitasKesehatanState.tarif.findMany.load();
+  }, []);
+
   return (
     <Box px={{ base: 'sm', md: 'lg' }} py="md" component="form" onSubmit={handleSubmit}>
       {/* Header */}
@@ -140,31 +139,25 @@ function CreateFasilitasKesehatan() {
             />
           </Box>
 
+
           {/* Dokter dan Tenaga Medis */}
-          <Box>
-            <Text fz="md" fw="bold" mb={5}>Dokter dan Tenaga Medis</Text>
-            <TextInput
-              label="Nama Dokter"
-              placeholder="Masukkan nama dokter"
-              value={stateFasilitasKesehatan.create.form.dokterdanTenagaMedis.name}
-              onChange={(e) => (stateFasilitasKesehatan.create.form.dokterdanTenagaMedis.name = e.target.value)}
-              required
-            />
-            <TextInput
-              label="Spesialis"
-              placeholder="Masukkan spesialis"
-              value={stateFasilitasKesehatan.create.form.dokterdanTenagaMedis.specialist}
-              onChange={(e) => (stateFasilitasKesehatan.create.form.dokterdanTenagaMedis.specialist = e.target.value)}
-              required
-            />
-            <TextInput
-              label="Jadwal"
-              placeholder="Masukkan jadwal"
-              value={stateFasilitasKesehatan.create.form.dokterdanTenagaMedis.jadwal}
-              onChange={(e) => (stateFasilitasKesehatan.create.form.dokterdanTenagaMedis.jadwal = e.target.value)}
-              required
-            />
-          </Box>
+          <MultiSelect
+            label="Dokter & Tenaga Medis"
+            placeholder="Pilih dokter / tenaga medis"
+            data={
+              fasilitasKesehatanState.dokter.findMany.data?.map((item) => ({
+                label: item.name,
+                value: item.id,
+              })) || []
+            }
+            value={stateFasilitasKesehatan.create.form.dokterdanTenagaMedis}
+            onChange={(val: string[]) => {
+              stateFasilitasKesehatan.create.form.dokterdanTenagaMedis = val;
+            }}
+            searchable
+            clearable
+            required
+          />
 
           {/* Fasilitas Pendukung */}
           <Box>
@@ -175,6 +168,24 @@ function CreateFasilitasKesehatan() {
             />
           </Box>
 
+          <MultiSelect
+            label="Layanan"
+            placeholder="Pilih layanan"
+            data={
+              fasilitasKesehatanState.tarif.findMany.data?.map((item) => ({
+                label: item.layanan,
+                value: item.id,
+              })) || []
+            }
+            value={stateFasilitasKesehatan.create.form.tarifDanLayanan} // string[]
+            onChange={(val: string[]) => {
+              stateFasilitasKesehatan.create.form.tarifDanLayanan = val;
+            }}
+            searchable
+            clearable
+            required
+          />
+
           {/* Prosedur Pendaftaran */}
           <Box>
             <Text fz="md" fw="bold" mb={5}>Prosedur Pendaftaran</Text>
@@ -184,24 +195,6 @@ function CreateFasilitasKesehatan() {
             />
           </Box>
 
-          {/* Tarif dan Layanan */}
-          <Box>
-            <Text fz="md" fw="bold" mb={5}>Tarif dan Layanan</Text>
-            <TextInput
-              label="Tarif"
-              placeholder="Masukkan tarif"
-              value={stateFasilitasKesehatan.create.form.tarifDanLayanan.tarif}
-              onChange={(e) => (stateFasilitasKesehatan.create.form.tarifDanLayanan.tarif = e.target.value)}
-              required
-            />
-            <TextInput
-              label="Layanan"
-              placeholder="Masukkan layanan"
-              value={stateFasilitasKesehatan.create.form.tarifDanLayanan.layanan}
-              onChange={(e) => (stateFasilitasKesehatan.create.form.tarifDanLayanan.layanan = e.target.value)}
-              required
-            />
-          </Box>
 
           {/* Submit */}
           <Group justify="right">

src/app/admin/(dashboard)/kesehatan/data-kesehatan-warga/fasilitas_kesehatan/dokter-tenaga-medis/[id]/edit/page.tsx

@@ -1,11 +1,241 @@
-import React from 'react';
+/* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable react-hooks/exhaustive-deps */
+'use client';
+
+import fasilitasKesehatanState from '@/app/admin/(dashboard)/_state/kesehatan/data_kesehatan_warga/fasilitasKesehatan';
+import colors from '@/con/colors';
+import {
+  ActionIcon,
+  Box,
+  Button,
+  Group,
+  Loader,
+  Paper,
+  Stack,
+  TextInput,
+  Title
+} from '@mantine/core';
+import { TimeInput } from '@mantine/dates';
+import { IconArrowBack, IconClock } from '@tabler/icons-react';
+import { useParams, useRouter } from 'next/navigation';
+import { useEffect, useRef, useState } from 'react';
+import { toast } from 'react-toastify';
+import { useProxy } from 'valtio/utils';
+
+
+function EditDokterTenagaMedis() {
+  const state = useProxy(fasilitasKesehatanState.dokter);
+  const router = useRouter();
+  const params = useParams();
+  const [isSubmitting, setIsSubmitting] = useState(false);
+
+  const [formData, setFormData] = useState({
+    name: '',
+    specialist: '',
+    jadwal: '',
+    jadwalLibur: '',
+    jamBukaOperasional: '',
+    jamTutupOperasional: '',
+    jamBukaLibur: '',
+    jamTutupLibur: '',
+  });
+
+  const [originalData, setOriginalData] = useState({
+    name: '',
+    specialist: '',
+    jadwal: '',
+    jadwalLibur: '',
+    jamBukaOperasional: '',
+    jamTutupOperasional: '',
+    jamBukaLibur: '',
+    jamTutupLibur: '',
+  });
+
+  // Load data
+  useEffect(() => {
+    const load = async () => {
+      const id = params?.id as string;
+      if (!id) return;
+
+      try {
+        await state.update.load(id);
+        const loadedData = state.update.form;
+
+        if (!loadedData) {
+          toast.error('Data tidak ditemukan');
+          return;
+        }
+
+        setFormData(loadedData);
+        setOriginalData(loadedData);
+      } catch (err) {
+        console.error(err);
+        toast.error('Gagal memuat data fasilitas kesehatan');
+      }
+    };
+
+    load();
+  }, [params?.id]);
+
+  const handleResetForm = () => {
+    setFormData({
+      name: originalData.name,
+      specialist: originalData.specialist,
+      jadwal: originalData.jadwal,
+      jadwalLibur: originalData.jadwalLibur,
+      jamBukaOperasional: originalData.jamBukaOperasional,
+      jamTutupOperasional: originalData.jamTutupOperasional,
+      jamBukaLibur: originalData.jamBukaLibur,
+      jamTutupLibur: originalData.jamTutupLibur,
+    });
+    toast.info("Form dikembalikan ke data awal");
+  };
+
+  const refBuka = useRef<HTMLInputElement>(null);
+  const refTutup = useRef<HTMLInputElement>(null);
+  const refBukaLibur = useRef<HTMLInputElement>(null);
+  const refTutupLibur = useRef<HTMLInputElement>(null);
+
+  const picker = (ref: any) => (
+    <ActionIcon variant="subtle" color="gray" onClick={() => ref.current?.showPicker()}>
+      <IconClock size={16} stroke={1.5} />
+    </ActionIcon>
+  );
+
+  const handleChange = (field: string, value: string) => {
+    setFormData((prev) => ({ ...prev, [field]: value }));
+  };
+
+  // Submit
+  const handleSubmit = async () => {
+    try {
+      setIsSubmitting(true);
+      state.update.form = { ...state.update.form, ...formData };
+      const success = await state.update.submit();
+      if (success) {
+        toast.success('Data berhasil diperbarui!');
+        router.push('/admin/kesehatan/data-kesehatan-warga/fasilitas_kesehatan/dokter-tenaga-medis');
+      }
+    } catch (err) {
+      console.error(err);
+      toast.error('Terjadi kesalahan saat memperbarui data');
+    } finally {
+      setIsSubmitting(false);
+    }
+  };
 
-function Page() {
   return (
-    <div>
-      Page
-    </div>
+    <Box px={{ base: 'sm', md: 'lg' }} py="md">
+      {/* Header */}
+      <Group mb="md">
+        <Button variant="subtle" onClick={() => router.back()} p="xs" radius="md">
+          <IconArrowBack color={colors['blue-button']} size={24} />
+        </Button>
+        <Title order={4} ml="sm" c="dark">
+          Edit Fasilitas Kesehatan
+        </Title>
+      </Group>
+
+      {/* Form */}
+      <Paper
+        w={{ base: '100%', md: '50%' }}
+        bg={colors['white-1']}
+        p="lg"
+        radius="md"
+        shadow="sm"
+        style={{ border: '1px solid #e0e0e0' }}
+      >
+        <Stack gap="md">
+          <TextInput
+            label="Nama Dokter"
+            placeholder="Masukkan nama dokter"
+            value={formData.name}
+            onChange={(e) => handleChange("name", e.target.value)}
+            required
+          />
+
+          <TextInput
+            label="Jadwal"
+            placeholder="Masukkan jadwal"
+            value={formData.jadwal}
+            onChange={(e) => handleChange("jadwal", e.target.value)}
+            required
+          />
+
+          <TextInput
+            label="Jadwal Libur"
+            placeholder="Masukkan jadwal libur"
+            value={formData.jadwalLibur}
+            onChange={(e) => handleChange("jadwalLibur", e.target.value)}
+            required
+          />
+
+          <TimeInput
+            label="Jam Buka Operasional"
+            ref={refBuka}
+            rightSection={picker(refBuka)}
+            value={formData.jamBukaOperasional}
+            onChange={(e) => handleChange("jamBukaOperasional", e.target.value)}
+            required
+          />
+
+          <TimeInput
+            label="Jam Tutup Operasional"
+            ref={refTutup}
+            rightSection={picker(refTutup)}
+            value={formData.jamTutupOperasional}
+            onChange={(e) => handleChange("jamTutupOperasional", e.target.value)}
+            required
+          />
+
+          <TimeInput
+            label="Jam Buka Hari Libur"
+            ref={refBukaLibur}
+            rightSection={picker(refBukaLibur)}
+            value={formData.jamBukaLibur}
+            onChange={(e) => handleChange("jamBukaLibur", e.target.value)}
+            required
+          />
+
+          <TimeInput
+            label="Jam Tutup Hari Libur"
+            ref={refTutupLibur}
+            rightSection={picker(refTutupLibur)}
+            value={formData.jamTutupLibur}
+            onChange={(e) => handleChange("jamTutupLibur", e.target.value)}
+            required
+          />
+          {/* Tombol Simpan */}
+          <Group justify="right">
+            {/* Tombol Batal */}
+            <Button
+              variant="outline"
+              color="gray"
+              radius="md"
+              size="md"
+              onClick={handleResetForm}
+            >
+              Batal
+            </Button>
+
+            {/* Tombol Simpan */}
+            <Button
+              onClick={handleSubmit}
+              radius="md"
+              size="md"
+              style={{
+                background: `linear-gradient(135deg, ${colors['blue-button']}, #4facfe)`,
+                color: '#fff',
+                boxShadow: '0 4px 15px rgba(79, 172, 254, 0.4)',
+              }}
+            >
+              {isSubmitting ? <Loader size="sm" color="white" /> : 'Simpan'}
+            </Button>
+          </Group>
+        </Stack>
+      </Paper>
+    </Box>
   );
 }
 
-export default Page;
+export default EditDokterTenagaMedis;

src/app/admin/(dashboard)/kesehatan/data-kesehatan-warga/fasilitas_kesehatan/dokter-tenaga-medis/[id]/page.tsx

@@ -1,11 +1,165 @@
-import React from 'react';
+'use client'
+import { ModalKonfirmasiHapus } from '@/app/admin/(dashboard)/_com/modalKonfirmasiHapus';
+import fasilitasKesehatanState from '@/app/admin/(dashboard)/_state/kesehatan/data_kesehatan_warga/fasilitasKesehatan';
+import colors from '@/con/colors';
+import {
+  Box,
+  Button,
+  Group,
+  Paper,
+  Skeleton,
+  Stack,
+  Text
+} from '@mantine/core';
+import { useShallowEffect } from '@mantine/hooks';
+import { IconArrowBack, IconEdit, IconTrash } from '@tabler/icons-react';
+import { useParams, useRouter } from 'next/navigation';
+import { useState } from 'react';
+import { useProxy } from 'valtio/utils';
+
+function DetailDokterTenagaMedis() {
+  const params = useParams();
+  const router = useRouter();
+  const state = useProxy(fasilitasKesehatanState.dokter);
+  const [modalHapus, setModalHapus] = useState(false);
+  const [selectedId, setSelectedId] = useState<string | null>(null);
+
+  useShallowEffect(() => {
+    state.findUnique.load(params?.id as string);
+  }, []);
+
+  const handleHapus = () => {
+    if (selectedId) {
+      state.delete.byId(selectedId);
+      setModalHapus(false);
+      setSelectedId(null);
+      router.push(
+        '/admin/kesehatan/data-kesehatan-warga/fasilitas_kesehatan/dokter-tenaga-medis'
+      );
+    }
+  };
+
+  if (!state.findUnique.data) {
+    return (
+      <Stack py={10}>
+        <Skeleton height={500} radius="md" />
+      </Stack>
+    );
+  }
+
+  const data = state.findUnique.data;
 
-function Page() {
   return (
-    <div>
-      Page
-    </div>
+    <Box py={10}>
+      {/* Tombol Back */}
+      <Button
+        variant="subtle"
+        onClick={() => router.back()}
+        leftSection={<IconArrowBack size={24} color={colors['blue-button']} />}
+        mb={15}
+      >
+        Kembali
+      </Button>
+
+      {/* Wrapper Detail */}
+      <Paper
+        withBorder
+        w={{ base: '100%', md: '70%' }}
+        bg={colors['white-1']}
+        p="lg"
+        radius="md"
+        shadow="sm"
+      >
+        <Stack gap="md">
+          <Text fz="2xl" fw="bold" c={colors['blue-button']}>
+            Detail Dokter & Tenaga Medis
+          </Text>
+
+          <Paper bg="#ECEEF8" p="md" radius="md" shadow="xs">
+            <Stack gap="sm">
+              <Box>
+                <Text fz="lg" fw="bold">Nama Dokter</Text>
+                <Text fz="md" c="dimmed">{data.name || '-'}</Text>
+              </Box>
+
+              <Box>
+                <Text fz="md" fw="bold">Specialist</Text>
+                <Text fz="md" c="dimmed">{data.specialist || '-'}</Text>
+              </Box>
+
+              <Box>
+                <Text fz="lg" fw="bold">Jadwal</Text>
+                <Text fz="md" c="dimmed" style={{ wordBreak: "break-word", whiteSpace: "normal" }} dangerouslySetInnerHTML={{ __html: data.jadwal || '-' }} />
+              </Box>
+
+              <Box>
+                <Text fz="lg" fw="bold">Jadwal Libur</Text>
+                <Text fz="md" c="dimmed" style={{ wordBreak: "break-word", whiteSpace: "normal" }} dangerouslySetInnerHTML={{ __html: data.jadwalLibur || '-' }} />
+              </Box>
+
+              <Box>
+                <Text fz="lg" fw="bold">Jam Buka Operasional</Text>
+                <Text fz="md" c="dimmed" style={{ wordBreak: "break-word", whiteSpace: "normal" }} dangerouslySetInnerHTML={{ __html: data.jamBukaOperasional || '-' }} />
+              </Box>
+
+              <Box>
+                <Text fz="lg" fw="bold">Jam Tutup Operasional</Text>
+                <Text fz="md" c="dimmed" style={{ wordBreak: "break-word", whiteSpace: "normal" }} dangerouslySetInnerHTML={{ __html: data.jamTutupOperasional || '-' }} />
+              </Box>
+
+              <Box>
+                <Text fz="lg" fw="bold">Jam Buka Libur</Text>
+                <Text fz="md" c="dimmed" style={{ wordBreak: "break-word", whiteSpace: "normal" }} dangerouslySetInnerHTML={{ __html: data.jamBukaLibur || '-' }} />
+              </Box>
+
+              <Box>
+                <Text fz="lg" fw="bold">Jam Tutup Libur</Text>
+                <Text fz="md" c="dimmed" style={{ wordBreak: "break-word", whiteSpace: "normal" }} dangerouslySetInnerHTML={{ __html: data.jamTutupLibur || '-' }} />
+              </Box>
+
+              {/* Aksi */}
+              <Group gap="sm">
+                <Button
+                  color="red"
+                  onClick={() => {
+                    setSelectedId(data.id);
+                    setModalHapus(true);
+                  }}
+                  variant="light"
+                  radius="md"
+                  size="md"
+                >
+                  <IconTrash size={20} />
+                </Button>
+
+                <Button
+                  color="green"
+                  onClick={() =>
+                    router.push(
+                      `/admin/kesehatan/data-kesehatan-warga/fasilitas_kesehatan/dokter-tenaga-medis/${data.id}/edit`
+                    )
+                  }
+                  variant="light"
+                  radius="md"
+                  size="md"
+                >
+                  <IconEdit size={20} />
+                </Button>
+              </Group>
+            </Stack>
+          </Paper>
+        </Stack>
+      </Paper>
+
+      {/* Modal Konfirmasi Hapus */}
+      <ModalKonfirmasiHapus
+        opened={modalHapus}
+        onClose={() => setModalHapus(false)}
+        onConfirm={handleHapus}
+        text="Apakah anda yakin ingin menghapus dokter & tenaga medis ini?"
+      />
+    </Box>
   );
 }
 
-export default Page;
+export default DetailDokterTenagaMedis;

src/app/admin/(dashboard)/kesehatan/data-kesehatan-warga/fasilitas_kesehatan/dokter-tenaga-medis/create/page.tsx

@@ -1,71 +1,184 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 'use client'
-import CreateEditor from '@/app/admin/(dashboard)/_com/createEditor';
 import fasilitasKesehatanState from '@/app/admin/(dashboard)/_state/kesehatan/data_kesehatan_warga/fasilitasKesehatan';
 import colors from '@/con/colors';
-import { Box, Button, Paper, Stack, Text, TextInput, Title } from '@mantine/core';
-import { IconArrowBack } from '@tabler/icons-react';
-import { useParams, useRouter } from 'next/navigation';
+import { ActionIcon, Box, Button, Group, Loader, Paper, Stack, TextInput, Title } from '@mantine/core';
+import { TimeInput } from '@mantine/dates';
+import { IconArrowBack, IconClock } from '@tabler/icons-react';
+import { useRouter } from 'next/navigation';
+import { useRef, useState } from 'react';
+import { toast } from 'react-toastify';
 import { useProxy } from 'valtio/utils';
 
 
 function CreateDokter() {
-  const params = useParams()
   const createState = useProxy(fasilitasKesehatanState.dokter)
   const router = useRouter();
+  const [isSubmitting, setIsSubmitting] = useState(false);
 
   const resetForm = () => {
     createState.create.create.form = {
       name: "",
       specialist: "",
       jadwal: "",
+      jadwalLibur: "",
+      jamBukaOperasional: "",
+      jamTutupOperasional: "",
+      jamBukaLibur: "",
+      jamTutupLibur: "",
     };
   };
 
+  const refBuka = useRef<HTMLInputElement>(null);
+  const refTutup = useRef<HTMLInputElement>(null);
+  const refBukaLibur = useRef<HTMLInputElement>(null);
+  const refTutupLibur = useRef<HTMLInputElement>(null);
+
+  const picker = (ref: any) => (
+    <ActionIcon variant="subtle" color="gray" onClick={() => ref.current?.showPicker()}>
+      <IconClock size={16} stroke={1.5} />
+    </ActionIcon>
+  );
+
+
   const handleSubmit = async () => {
-    await createState.create.create.create();
-    resetForm();
-    router.push(`/admin/kesehatan/fasilitas-kesehatan/${params?.id}/dokter-tenaga-medis`)
+    try {
+      setIsSubmitting(true);
+      await createState.create.create.create();
+      toast.success('Data berhasil disimpan');
+      resetForm();
+      router.push(`/admin/kesehatan/data-kesehatan-warga/fasilitas_kesehatan/dokter-tenaga-medis`)
+    } catch (error) {
+      console.error(error);
+      toast.error('Gagal menyimpan data');
+    } finally {
+      setIsSubmitting(false);
+    }
   };
   return (
-    <Box component="form" onSubmit={handleSubmit}>
-      <Box mb={10}>
-        <Button variant="subtle" onClick={() => router.back()}>
-          <IconArrowBack color={colors['blue-button']} size={25} />
+    <Box px={{ base: 'sm', md: 'lg' }} py="md" component="form" onSubmit={handleSubmit}>
+      {/* Header */}
+      <Group mb="md">
+        <Button
+          variant="subtle"
+          onClick={() => router.back()}
+          p="xs"
+          radius="md"
+        >
+          <IconArrowBack color={colors['blue-button']} size={24} />
         </Button>
-      </Box>
+        <Title order={4} ml="sm" c="dark">
+          Tambah Data Dokter & Tenaga Medis
+        </Title>
+      </Group>
 
-      <Paper bg={colors['white-1']} p="md" w={{ base: '100%', md: '50%' }}>
-        <Stack gap="xs">
-          <Title order={3}>Create Dokter</Title>
+      {/* Form */}
+      <Paper
+        w={{ base: '100%', md: '50%' }}
+        bg={colors['white-1']}
+        p="lg"
+        radius="md"
+        shadow="sm"
+        style={{ border: '1px solid #e0e0e0' }}
+      >
+        <Stack gap="md">
           <TextInput
-            label={<Text fz="sm" fw="bold">Nama Dokter</Text>}
-            placeholder="masukkan nama dokter"
+            label={"Nama Dokter"}
+            placeholder="Masukkan nama dokter"
             value={createState.create.create.form.name}
-            onChange={(e) => {
-              createState.create.create.form.name = e.target.value;
-            }}
+            onChange={(e) => (createState.create.create.form.name = e.target.value)}
+            required
           />
-          <Text fz="md" fw="bold">Specialist</Text>
+
+          {/* Informasi Umum */}
+
           <TextInput
-            label={<Text fz="sm" fw="bold">Specialist</Text>}
-            placeholder="masukkan specialist"
+            label="Specialist"
+            placeholder="Masukkan specialist"
             value={createState.create.create.form.specialist}
-            onChange={(e) => {
-              createState.create.create.form.specialist = e.target.value;
-            }}
+            onChange={(e) => (createState.create.create.form.specialist = e.target.value)}
+            required
           />
-          <Box>
-            <Text fz="md" fw="bold">Jadwal</Text>
-            <CreateEditor
-              value={createState.create.create.form.jadwal}
-              onChange={(htmlContent) => {
-                createState.create.create.form.jadwal = htmlContent;
+
+          <TextInput
+            label="Jadwal"
+            placeholder="Masukkan jadwal"
+            value={createState.create.create.form.jadwal}
+            onChange={(e) => (createState.create.create.form.jadwal = e.target.value)}
+            required
+          />
+
+          <TextInput
+            label="Jadwal Libur"
+            placeholder="Masukkan jadwal libur"
+            value={createState.create.create.form.jadwalLibur}
+            onChange={(e) => (createState.create.create.form.jadwalLibur = e.target.value)}
+            required
+          />
+
+          <TimeInput
+            label="Jam Buka Operasional"
+            ref={refBuka}
+            rightSection={picker(refBuka)}
+            value={createState.create.create.form.jamBukaOperasional}
+            onChange={(e) => (createState.create.create.form.jamBukaOperasional = e.target.value)}
+            required
+          />
+
+          <TimeInput
+            label="Jam Tutup Operasional"
+            ref={refTutup}
+            rightSection={picker(refTutup)}
+            value={createState.create.create.form.jamTutupOperasional}
+            onChange={(e) => (createState.create.create.form.jamTutupOperasional = e.target.value)}
+            required
+          />
+
+          <TimeInput
+            label="Jam Buka Hari Libur"
+            ref={refBukaLibur}
+            rightSection={picker(refBukaLibur)}
+            value={createState.create.create.form.jamBukaLibur}
+            onChange={(e) => (createState.create.create.form.jamBukaLibur = e.target.value)}
+            required
+          />
+
+          <TimeInput
+            label="Jam Tutup Hari Libur"
+            ref={refTutupLibur}
+            rightSection={picker(refTutupLibur)}
+            value={createState.create.create.form.jamTutupLibur}
+            onChange={(e) => (createState.create.create.form.jamTutupLibur = e.target.value)}
+            required
+          />
+
+          {/* Submit */}
+          <Group justify="right">
+            {/* Tombol Batal */}
+            <Button
+              variant="outline"
+              color="gray"
+              radius="md"
+              size="md"
+              onClick={resetForm}
+            >
+              Reset
+            </Button>
+
+            {/* Tombol Simpan */}
+            <Button
+              onClick={handleSubmit}
+              radius="md"
+              size="md"
+              style={{
+                background: `linear-gradient(135deg, ${colors['blue-button']}, #4facfe)`,
+                color: '#fff',
+                boxShadow: '0 4px 15px rgba(79, 172, 254, 0.4)',
               }}
-            />
-          </Box>
-          <Button onClick={handleSubmit} bg={colors['blue-button']}>
-            Simpan
-          </Button>
+            >
+              {isSubmitting ? <Loader size="sm" color="white" /> : 'Simpan'}
+            </Button>
+          </Group>
         </Stack>
       </Paper>
     </Box>

src/app/admin/(dashboard)/kesehatan/data-kesehatan-warga/fasilitas_kesehatan/dokter-tenaga-medis/page.tsx

@@ -1,13 +1,12 @@
 'use client'
 import colors from '@/con/colors';
-import { Box, Button, Center, Pagination, Paper, Skeleton, Stack, Table, TableTbody, TableTd, TableTh, TableThead, TableTr, Text } from '@mantine/core';
+import { Box, Button, Center, Group, Pagination, Paper, Skeleton, Table, TableTbody, TableTd, TableTh, TableThead, TableTr, Text, Title } from '@mantine/core';
 import { useShallowEffect } from '@mantine/hooks';
-import { IconArrowBack, IconDeviceImacCog, IconSearch } from '@tabler/icons-react';
+import { IconArrowBack, IconDeviceImacCog, IconPlus, IconSearch } from '@tabler/icons-react';
 import { useRouter } from 'next/navigation';
 import { useProxy } from 'valtio/utils';
 
 import HeaderSearch from '@/app/admin/(dashboard)/_com/header';
-import JudulList from '@/app/admin/(dashboard)/_com/judulList';
 import fasilitasKesehatanState from '@/app/admin/(dashboard)/_state/kesehatan/data_kesehatan_warga/fasilitasKesehatan';
 import { useState } from 'react';
 
@@ -18,7 +17,7 @@ function DokterTenagaMedis() {
   return (
     <Box>
       <Box mb={10}>
-        <Button variant="subtle" onClick={() => router.back()}>
+        <Button variant="subtle" onClick={() => router.push('/admin/kesehatan/data-kesehatan-warga/fasilitas_kesehatan')}>
           <IconArrowBack color={colors['blue-button']} size={25} />
         </Button>
       </Box>
@@ -60,49 +59,101 @@ function ListDokterTenagaMedis({ search }: { search: string }) {
   }
   return (
     <Box py={10}>
-      <Paper bg={colors['white-1']} p={'md'}>
-        <Stack>
-          <JudulList
-            title='List Fasilitas Kesehatan'
-            href={`/admin/kesehatan/data-kesehatan-warga/fasilitas_kesehatan/dokter-tenaga-medis/create`}
-          />
-          <Box style={{ overflowX: "auto" }}>
-            <Table striped withRowBorders withTableBorder style={{ minWidth: '700px' }}>
-              <TableThead>
-                <TableTr>
-                  <TableTh>Fasilitas Kesehatan</TableTh>
-                  <TableTh>Alamat</TableTh>
-                  <TableTh>Jam Operasional</TableTh>
-                  <TableTh>Detail</TableTh>
-                </TableTr>
-              </TableThead>
-              <TableTbody>
-                {filteredData.map((item) => (
+      <Paper withBorder bg={colors['white-1']} p={'lg'} shadow="md" radius="md">
+        {/* Judul + Tombol Tambah */}
+        <Group justify="space-between" mb="md">
+          <Title order={4}>Daftar Dokter dan Tenaga Medis</Title>
+          <Button
+            leftSection={<IconPlus size={18} />}
+            color="blue"
+            variant="light"
+            onClick={() =>
+              router.push(
+                '/admin/kesehatan/data-kesehatan-warga/fasilitas_kesehatan/dokter-tenaga-medis/create'
+              )
+            }
+          >
+            Tambah Baru
+          </Button>
+        </Group>
+
+        {/* Tabel */}
+        <Box style={{ overflowX: "auto" }}>
+          <Table highlightOnHover>
+            <TableThead>
+              <TableTr>
+                <TableTh>Nama Dokter</TableTh>
+                <TableTh>Spesialis</TableTh>
+                <TableTh>Jadwal</TableTh>
+                <TableTh>Aksi</TableTh>
+              </TableTr>
+            </TableThead>
+            <TableTbody>
+              {filteredData.length > 0 ? (
+                filteredData.map((item) => (
                   <TableTr key={item.id}>
-                    <TableTd>{item.name}</TableTd>
-                    <TableTd>{item.specialist}</TableTd>
                     <TableTd>
-                      <Text dangerouslySetInnerHTML={{ __html: item.jadwal }} />
+                      <Box w={150}>
+                        <Text fw={500} truncate="end" lineClamp={1}>
+                          {item.name}
+                        </Text>
+                      </Box>
                     </TableTd>
                     <TableTd>
-                      <Button onClick={() => router.push(`/admin/kesehatan/data-kesehatan-warga/fasilitas_kesehatan/${item.id}`)}>
-                        <IconDeviceImacCog size={25} />
+                      <Box w={150}>
+                        {item.specialist || '-'}
+                      </Box>
+                    </TableTd>
+                    <TableTd>
+                      <Box w={150}>
+                        <Text dangerouslySetInnerHTML={{ __html: item.jadwal || '-' }} />
+                      </Box>
+                    </TableTd>
+                    <TableTd>
+                      <Button
+                        variant="light"
+                        color="blue"
+                        onClick={() =>
+                          router.push(
+                            `/admin/kesehatan/data-kesehatan-warga/fasilitas_kesehatan/dokter-tenaga-medis/${item.id}`
+                          )
+                        }
+                      >
+                        <IconDeviceImacCog size={20} />
+                        <Text ml={5}>Detail</Text>
                       </Button>
                     </TableTd>
                   </TableTr>
-                ))}
-              </TableTbody>
-            </Table>
-          </Box>
-        </Stack>
+                ))
+              ) : (
+                <TableTr>
+                  <TableTd colSpan={4}>
+                    <Center py={20}>
+                      <Text c="dimmed">
+                        Tidak ada fasilitas kesehatan yang cocok
+                      </Text>
+                    </Center>
+                  </TableTd>
+                </TableTr>
+              )}
+            </TableTbody>
+          </Table>
+        </Box>
       </Paper>
+
+      {/* Pagination */}
       <Center>
         <Pagination
           value={page}
-          onChange={(newPage) => load(newPage)} // ini penting!
+          onChange={(newPage) => {
+            load(newPage, 10, search);
+            window.scrollTo({ top: 0, behavior: 'smooth' });
+          }}
           total={totalPages}
           mt="md"
           mb="md"
+          color="blue"
+          radius="md"
         />
       </Center>
     </Box>

src/app/admin/(dashboard)/kesehatan/data-kesehatan-warga/fasilitas_kesehatan/page.tsx

@@ -1,9 +1,12 @@
 'use client'
 import colors from '@/con/colors';
 import {
+  ActionIcon,
   Box,
   Button,
   Center,
+  Grid,
+  GridCol,
   Group,
   Pagination,
   Paper,
@@ -16,30 +19,52 @@ import {
   TableThead,
   TableTr,
   Text,
-  Title
+  TextInput,
+  Title,
+  Tooltip
 } from '@mantine/core';
 import { useShallowEffect } from '@mantine/hooks';
-import { IconDeviceImacCog, IconPlus, IconSearch } from '@tabler/icons-react';
+import { IconCoin, IconDeviceImacCog, IconPlus, IconReportMedical, IconSearch } from '@tabler/icons-react';
 import { useRouter } from 'next/navigation';
 import { useState } from 'react';
 import { useProxy } from 'valtio/utils';
-import HeaderSearch from '../../../_com/header';
 import fasilitasKesehatanState from '../../../_state/kesehatan/data_kesehatan_warga/fasilitasKesehatan';
 
 
 function FasilitasKesehatan() {
   const [search, setSearch] = useState("");
-
+  const router = useRouter()
   return (
     <Box>
-      {/* Header Search */}
-      <HeaderSearch
-        title='Fasilitas Kesehatan'
-        placeholder='Cari nama, alamat, atau jam operasional...'
-        searchIcon={<IconSearch size={20} />}
-        value={search}
-        onChange={(e) => setSearch(e.currentTarget.value)}
-      />
+      <Grid mb={10}>
+        <GridCol span={{ base: 12, md: 8 }}>
+          <Title order={3}>Fasilitas Kesehatan</Title>
+        </GridCol>
+        <GridCol span={{ base: 12, md: 4 }}>
+          <Group gap={"xs"}>
+            <Tooltip label="List Dokter" withArrow>
+              <ActionIcon onClick={() => router.push('/admin/kesehatan/data-kesehatan-warga/fasilitas_kesehatan/dokter-tenaga-medis')} size="lg" radius="xl" color="green.6">
+                <IconReportMedical size={20} />
+              </ActionIcon>
+            </Tooltip>
+            <Tooltip label="List Tarif Layanan" withArrow>
+              <ActionIcon onClick={()=> router.push('/admin/kesehatan/data-kesehatan-warga/fasilitas_kesehatan/tarif-layanan')} size="lg" radius="xl" color="blue.6">
+                <IconCoin size={20} />
+              </ActionIcon>
+            </Tooltip>
+            <Paper radius="lg" bg={colors['white-1']}>
+              <TextInput
+                radius="lg"
+                placeholder='Cari nama, alamat, atau jam operasional...'
+                leftSection={<IconSearch size={20} />}
+                w="133%"
+                value={search}
+                onChange={(e) => setSearch(e.currentTarget.value)}
+              />
+            </Paper>
+          </Group>
+        </GridCol>
+      </Grid>
 
       <ListFasilitasKesehatan search={search} />
     </Box>
@@ -54,6 +79,7 @@ function ListFasilitasKesehatan({ search }: { search: string }) {
   const { data, page, totalPages, loading, load } = stateFasilitasKesehatan.findMany;
 
   useShallowEffect(() => {
+
     load(page, 10, search);
   }, [page, search]);
 
@@ -93,8 +119,8 @@ function ListFasilitasKesehatan({ search }: { search: string }) {
             <TableThead>
               <TableTr>
                 <TableTh>Fasilitas Kesehatan</TableTh>
-                <TableTh>Dokter</TableTh>
-                <TableTh>Layanan</TableTh>
+                <TableTh>Jumlah Dokter</TableTh>
+                <TableTh>Jumlah Layanan</TableTh>
                 <TableTh>Aksi</TableTh>
               </TableTr>
             </TableThead>
@@ -111,13 +137,17 @@ function ListFasilitasKesehatan({ search }: { search: string }) {
                     </TableTd>
                     <TableTd>
                       <Box w={150}>
-                        {item.dokterdantenagamedis?.name || '-'}
+                        {item.dokterdantenagamedis?.length
+                          ? `${item.dokterdantenagamedis.length} dokter`
+                          : '-'}
                       </Box>
                     </TableTd>
                     <TableTd>
                       <Box w={150}>
                         <Text truncate="end" lineClamp={1}>
-                          {item.tarifdanlayanan?.layanan || '-'}
+                          {item.tarifdanlayanan?.length
+                            ? `${item.tarifdanlayanan.length} layanan`
+                            : '-'}
                         </Text>
                       </Box>
                     </TableTd>
@@ -141,7 +171,7 @@ function ListFasilitasKesehatan({ search }: { search: string }) {
                 <TableTr>
                   <TableTd colSpan={4}>
                     <Center py={20}>
-                      <Text color="dimmed">
+                      <Text c="dimmed">
                         Tidak ada fasilitas kesehatan yang cocok
                       </Text>
                     </Center>

src/app/admin/(dashboard)/kesehatan/data-kesehatan-warga/fasilitas_kesehatan/tarif-layanan/[id]/page.tsx

@@ -0,0 +1,173 @@
+/* eslint-disable react-hooks/exhaustive-deps */
+'use client'
+
+import fasilitasKesehatanState from '@/app/admin/(dashboard)/_state/kesehatan/data_kesehatan_warga/fasilitasKesehatan';
+import colors from '@/con/colors';
+import {
+  Box,
+  Button,
+  Group,
+  Loader,
+  Paper,
+  Stack,
+  TextInput,
+  Title
+} from '@mantine/core';
+import { IconArrowBack } from '@tabler/icons-react';
+import { useParams, useRouter } from 'next/navigation';
+import { useEffect, useState } from 'react';
+import { toast } from 'react-toastify';
+import { useProxy } from 'valtio/utils';
+
+function EditTarifLayanan() {
+  const editState = useProxy(fasilitasKesehatanState.tarif);
+  const router = useRouter();
+  const params = useParams();
+  const [isSubmitting, setIsSubmitting] = useState(false);
+
+  const [originalData, setOriginalData] = useState({
+    tarif: '',
+    layanan: ''
+  });
+
+  const [formData, setFormData] = useState({
+    tarif: '',
+    layanan: ''
+  });
+
+  useEffect(() => {
+    const loadTarifLayanan = async () => {
+      const id = params?.id as string;
+      if (!id) return;
+
+      try {
+        const data = await editState.update.load(id);
+        if (data) {
+          setFormData({
+            tarif: data.tarif || '',
+            layanan: data.layanan || '',
+          });
+          setOriginalData({
+            tarif: data.tarif || '',
+            layanan: data.layanan || '',
+          });
+        }
+      } catch (error) {
+        console.error('Error loading tarif layanan:', error);
+        toast.error('Gagal memuat data tarif layanan');
+      }
+    };
+
+    loadTarifLayanan();
+  }, [params?.id]);
+
+  const handleChange = (field: string, value: string) => {
+    setFormData((prev) => ({ ...prev, [field]: value }));
+  };
+
+  const handleResetForm = () => {
+    setFormData({
+      tarif: originalData.tarif,
+      layanan: originalData.layanan,
+    });
+    toast.info('Form dikembalikan ke data awal');
+  };
+
+  const handleSubmit = async () => {
+    try {
+      setIsSubmitting(true);
+      // update global state hanya saat submit
+      editState.update.form = {
+        ...editState.update.form,
+        tarif: formData.tarif,
+        layanan: formData.layanan,
+      };
+
+      await editState.update.submit();
+      toast.success('Tarif Layanan berhasil diperbarui!');
+      router.push('/admin/kesehatan/data-kesehatan-warga/fasilitas_kesehatan/tarif-layanan');
+    } catch (error) {
+      console.error('Error updating tarif layanan:', error);
+      toast.error('Terjadi kesalahan saat memperbarui tarif layanan');
+    } finally {
+      setIsSubmitting(false);
+    }
+  };
+
+  return (
+    <Box px={{ base: 'sm', md: 'lg' }} py="md">
+      {/* Back Button + Title */}
+      <Group mb="md">
+        <Button
+          variant="subtle"
+          onClick={() => router.back()}
+          p="xs"
+          radius="md"
+        >
+          <IconArrowBack color={colors['blue-button']} size={24} />
+        </Button>
+        <Title order={4} ml="sm" c="dark">
+          Edit Tarif Layanan
+        </Title>
+      </Group>
+
+      {/* Form Wrapper */}
+      <Paper
+        w={{ base: '100%', md: '50%' }}
+        bg={colors['white-1']}
+        p="lg"
+        radius="md"
+        shadow="sm"
+        style={{ border: '1px solid #e0e0e0' }}
+      >
+        <Stack gap="md">
+          <TextInput
+            name="layanan"
+            label="Layanan"
+            placeholder="Masukkan nama layanan"
+            value={formData.layanan}
+            onChange={(e) => handleChange('layanan', e.target.value)}
+            required
+          />
+
+          <TextInput
+            name="tarif"
+            label="Tarif"
+            placeholder="Masukkan tarif layanan"
+            value={formData.tarif}
+            onChange={(e) => handleChange('tarif', e.target.value)}
+            required
+          />
+
+          <Group justify="right">
+            <Button
+              variant="outline"
+              color="gray"
+              radius="md"
+              size="md"
+              onClick={handleResetForm}
+            >
+              Batal
+            </Button>
+
+            {/* Tombol Simpan */}
+            <Button
+              onClick={handleSubmit}
+              radius="md"
+              size="md"
+              style={{
+                background: `linear-gradient(135deg, ${colors['blue-button']}, #4facfe)`,
+                color: '#fff',
+                boxShadow: '0 4px 15px rgba(79, 172, 254, 0.4)',
+              }}
+            >
+              {isSubmitting ? <Loader size="sm" color="white" /> : 'Simpan'}
+            </Button>
+          </Group>
+        </Stack>
+      </Paper>
+    </Box>
+  );
+}
+
+export default EditTarifLayanan;

src/app/admin/(dashboard)/kesehatan/data-kesehatan-warga/fasilitas_kesehatan/tarif-layanan/create/page.tsx

@@ -0,0 +1,119 @@
+'use client';
+import fasilitasKesehatanState from '@/app/admin/(dashboard)/_state/kesehatan/data_kesehatan_warga/fasilitasKesehatan';
+import colors from '@/con/colors';
+import {
+  Box,
+  Button,
+  Group,
+  Loader,
+  Paper,
+  Stack,
+  TextInput,
+  Title
+} from '@mantine/core';
+import { IconArrowBack } from '@tabler/icons-react';
+import { useRouter } from 'next/navigation';
+import { useState } from 'react';
+import { toast } from 'react-toastify';
+import { useProxy } from 'valtio/utils';
+
+function CreateTarifLayanan() {
+  const createState = useProxy(fasilitasKesehatanState.tarif);
+  const router = useRouter();
+  const [isSubmitting, setIsSubmitting] = useState(false);
+
+  const resetForm = () => {
+    createState.create.form = {
+      tarif: '',
+      layanan: '',
+    };
+  };
+
+  const handleSubmit = async () => {
+    setIsSubmitting(true);
+    try {
+      await createState.create.create();
+      resetForm();
+      router.push('/admin/kesehatan/data-kesehatan-warga/fasilitas_kesehatan/tarif-layanan');
+    } catch (error) {
+      console.error('Error creating tarif layanan:', error);
+      toast.error('Gagal menambahkan tarif layanan');
+    } finally {
+      setIsSubmitting(false);
+    }
+  };
+
+  return (
+    <Box px={{ base: 'sm', md: 'lg' }} py="md">
+      {/* Header dengan back button */}
+      <Group mb="md">
+          <Button
+            variant="subtle"
+            onClick={() => router.back()}
+            p="xs"
+            radius="md"
+          >
+            <IconArrowBack color={colors['blue-button']} size={24} />
+          </Button>
+        <Title order={4} ml="sm" c="dark">
+          Tambah Tarif Layanan
+        </Title>
+      </Group>
+
+      {/* Form utama */}
+      <Paper
+        w={{ base: '100%', md: '50%' }}
+        bg={colors['white-1']}
+        p="lg"
+        radius="md"
+        shadow="sm"
+        style={{ border: '1px solid #e0e0e0' }}
+      >
+        <Stack gap="md">
+          <TextInput
+            label="Layanan"
+            placeholder="Masukkan nama layanan"
+            value={createState.create.form.layanan || ''}
+            onChange={(e) => (createState.create.form.layanan = e.target.value)}
+            required
+          />
+          <TextInput
+            label="Tarif"
+            placeholder="Masukkan tarif"
+            value={createState.create.form.tarif || ''}
+            onChange={(e) => (createState.create.form.tarif = e.target.value)}
+            required
+          />
+
+          <Group justify="right">
+            <Button
+              variant="outline"
+              color="gray"
+              radius="md"
+              size="md"
+              onClick={resetForm}
+            >
+              Reset
+            </Button>
+
+            {/* Tombol Simpan */}
+            <Button
+              onClick={handleSubmit}
+              radius="md"
+              size="md"
+              style={{
+                background: `linear-gradient(135deg, ${colors['blue-button']}, #4facfe)`,
+                color: '#fff',
+                boxShadow: '0 4px 15px rgba(79, 172, 254, 0.4)',
+              }}
+            >
+              {isSubmitting ? <Loader size="sm" color="white" /> : 'Simpan'}
+            </Button>
+          </Group>
+        </Stack>
+      </Paper>
+    </Box>
+  );
+}
+
+export default CreateTarifLayanan;

src/app/admin/(dashboard)/kesehatan/data-kesehatan-warga/fasilitas_kesehatan/tarif-layanan/page.tsx

@@ -1,13 +1,13 @@
 'use client'
 import colors from '@/con/colors';
-import { Box, Button, Center, Pagination, Paper, Skeleton, Stack, Table, TableTbody, TableTd, TableTh, TableThead, TableTr, Text } from '@mantine/core';
+import { Box, Button, Center, Group, Pagination, Paper, Skeleton, Table, TableTbody, TableTd, TableTh, TableThead, TableTr, Text, Title } from '@mantine/core';
 import { useShallowEffect } from '@mantine/hooks';
-import { IconArrowBack, IconDeviceImacCog, IconSearch } from '@tabler/icons-react';
+import { IconArrowBack, IconEdit, IconPlus, IconSearch, IconTrash } from '@tabler/icons-react';
 import { useRouter } from 'next/navigation';
 import { useProxy } from 'valtio/utils';
 
 import HeaderSearch from '@/app/admin/(dashboard)/_com/header';
-import JudulList from '@/app/admin/(dashboard)/_com/judulList';
+import { ModalKonfirmasiHapus } from '@/app/admin/(dashboard)/_com/modalKonfirmasiHapus';
 import fasilitasKesehatanState from '@/app/admin/(dashboard)/_state/kesehatan/data_kesehatan_warga/fasilitasKesehatan';
 import { useState } from 'react';
 
@@ -18,12 +18,12 @@ function TarifLayanan() {
   return (
     <Box>
       <Box mb={10}>
-        <Button variant="subtle" onClick={() => router.back()}>
+        <Button variant="subtle" onClick={() => router.push('/admin/kesehatan/data-kesehatan-warga/fasilitas_kesehatan')}>
           <IconArrowBack color={colors['blue-button']} size={25} />
         </Button>
       </Box>
       <HeaderSearch
-        title='Dokter dan Tenaga Medis'
+        title='Tarif dan Layanan'
         placeholder='pencarian'
         searchIcon={<IconSearch size={20} />}
         value={search}
@@ -35,8 +35,11 @@ function TarifLayanan() {
 }
 
 function ListTarifLayanan({ search }: { search: string }) {
-  const stateFasilitasKesehatan = useProxy(fasilitasKesehatanState.dokter)
+  const stateFasilitasKesehatan = useProxy(fasilitasKesehatanState.tarif);
   const router = useRouter();
+  const [modalHapus, setModalHapus] = useState(false);
+  const [selectedId, setSelectedId] = useState<string | null>(null);
+
   const {
     data,
     loading,
@@ -49,6 +52,15 @@ function ListTarifLayanan({ search }: { search: string }) {
     load(page, 10, search)
   }, [page, search])
 
+  const handleDelete = () => {
+    if (selectedId) {
+      stateFasilitasKesehatan.delete.byId(selectedId);
+      setModalHapus(false);
+      setSelectedId(null);
+      load(page, 10, search);
+    }
+  };
+
   const filteredData = data || []
 
   if (loading || !data) {
@@ -60,51 +72,116 @@ function ListTarifLayanan({ search }: { search: string }) {
   }
   return (
     <Box py={10}>
-      <Paper bg={colors['white-1']} p={'md'}>
-        <Stack>
-          <JudulList
-            title='List Fasilitas Kesehatan'
-            href={`/admin/kesehatan/data-kesehatan-warga/fasilitas_kesehatan/dokter-tenaga-medis/create`}
-          />
-          <Box style={{ overflowX: "auto" }}>
-            <Table striped withRowBorders withTableBorder style={{ minWidth: '700px' }}>
-              <TableThead>
-                <TableTr>
-                  <TableTh>Fasilitas Kesehatan</TableTh>
-                  <TableTh>Alamat</TableTh>
-                  <TableTh>Jam Operasional</TableTh>
-                  <TableTh>Detail</TableTh>
-                </TableTr>
-              </TableThead>
-              <TableTbody>
-                {filteredData.map((item) => (
+      <Paper withBorder bg={colors['white-1']} p={'lg'} shadow="md" radius="md">
+        {/* Judul + Tombol Tambah */}
+        <Group justify="space-between" mb="md">
+          <Title order={4}>Daftar Tarif dan Layanan</Title>
+          <Button
+            leftSection={<IconPlus size={18} />}
+            color="blue"
+            variant="light"
+            onClick={() =>
+              router.push(
+                '/admin/kesehatan/data-kesehatan-warga/fasilitas_kesehatan/tarif-layanan/create'
+              )
+            }
+          >
+            Tambah Baru
+          </Button>
+        </Group>
+
+        {/* Tabel */}
+        <Box style={{ overflowX: "auto" }}>
+          <Table highlightOnHover>
+            <TableThead>
+              <TableTr>
+                <TableTh>Layanan</TableTh>
+                <TableTh>Tarif</TableTh>
+                <TableTh>Edit</TableTh>
+                <TableTh>Hapus</TableTh>
+              </TableTr>
+            </TableThead>
+            <TableTbody>
+              {filteredData.length > 0 ? (
+                filteredData.map((item) => (
                   <TableTr key={item.id}>
-                    <TableTd>{item.name}</TableTd>
-                    <TableTd>{item.specialist}</TableTd>
                     <TableTd>
-                      <Text dangerouslySetInnerHTML={{ __html: item.jadwal }} />
+                      <Box w={150}>
+                        {item.layanan || '-'}
+                      </Box>
                     </TableTd>
                     <TableTd>
-                      <Button onClick={() => router.push(`/admin/kesehatan/data-kesehatan-warga/fasilitas_kesehatan/${item.id}`)}>
-                        <IconDeviceImacCog size={25} />
+                      <Box w={150}>
+                        <Text fw={500} truncate="end" lineClamp={1}>
+                          {item.tarif}
+                        </Text>
+                      </Box>
+                    </TableTd>
+                    <TableTd>
+                      <Button
+                        variant="light"
+                        color="green"
+                        onClick={() =>
+                          router.push(
+                            `/admin/kesehatan/data-kesehatan-warga/fasilitas_kesehatan/tarif-layanan/${item.id}`
+                          )
+                        }
+                      >
+                        <IconEdit size={18} />
+                      </Button>
+                    </TableTd>
+                    <TableTd>
+                      <Button
+                        variant="light"
+                        color="red"
+                        disabled={stateFasilitasKesehatan.delete.loading}
+                        onClick={() => {
+                          setSelectedId(item.id);
+                          setModalHapus(true);
+                        }}
+                      >
+                        <IconTrash size={18} />
                       </Button>
                     </TableTd>
                   </TableTr>
-                ))}
-              </TableTbody>
-            </Table>
-          </Box>
-        </Stack>
+                ))
+              ) : (
+                <TableTr>
+                  <TableTd colSpan={4}>
+                    <Center py={20}>
+                      <Text c="dimmed">
+                        Tidak ada fasilitas kesehatan yang cocok
+                      </Text>
+                    </Center>
+                  </TableTd>
+                </TableTr>
+              )}
+            </TableTbody>
+          </Table>
+        </Box>
       </Paper>
+
+      {/* Pagination */}
       <Center>
         <Pagination
           value={page}
-          onChange={(newPage) => load(newPage)} // ini penting!
+          onChange={(newPage) => {
+            load(newPage, 10, search);
+            window.scrollTo({ top: 0, behavior: 'smooth' });
+          }}
           total={totalPages}
           mt="md"
           mb="md"
+          color="blue"
+          radius="md"
         />
       </Center>
+      <ModalKonfirmasiHapus
+        opened={modalHapus}
+        onClose={() => setModalHapus(false)}
+        onConfirm={handleDelete}
+        text="Apakah anda yakin ingin menghapus tarif layanan ini?"
+      />
     </Box>
   )
 }

src/app/admin/(dashboard)/landing-page/apbdes/create/page.tsx

@@ -361,6 +361,7 @@ function CreateAPBDes() {
                   data={[
                     { value: 'pendapatan', label: 'Pendapatan' },
                     { value: 'belanja', label: 'Belanja' },
+                    { value: 'pembiayaan', label: 'Pembiayaan' },
                   ]}
                   value={newItem.level === 1 ? null : newItem.tipe}
                   onChange={(val) => setNewItem({ ...newItem, tipe: val as any })}

src/app/admin/(dashboard)/landing-page/profil/_lib/sosmed.ts

@@ -0,0 +1,12 @@
+export const sosmedMap = {
+  facebook: { label: 'Facebook', src: '/assets/images/sosmed/facebook.png' },
+  instagram: { label: 'Instagram', src: '/assets/images/sosmed/instagram.png' },
+  tiktok: { label: 'Tiktok', src: '/assets/images/sosmed/tiktok.png' },
+  youtube: { label: 'YouTube', src: '/assets/images/sosmed/youtube.png' },
+  whatsapp: { label: 'WhatsApp', src: '/assets/images/sosmed/whatsapp.png' },
+  gmail: { label: 'Gmail', src: '/assets/images/sosmed/gmail.png' },
+  telegram: { label: 'Telegram', src: '/assets/images/sosmed/telegram.png' },
+  x: { label: 'X (Twitter)', src: '/assets/images/sosmed/x-twitter.png' },
+  telephone: { label: 'Telephone', src: '/assets/images/sosmed/telephone-call.png' },
+  custom: { label: 'Custom Icon', src: null },
+};

src/app/admin/(dashboard)/landing-page/profil/media-sosial/[id]/edit/page.tsx

@@ -1,5 +1,7 @@
 /* eslint-disable react-hooks/exhaustive-deps */
 'use client';
+
+import SelectSocialMediaEdit from '@/app/admin/(dashboard)/_com/selectSocialMediaEdit';
 import profileLandingPageState from '@/app/admin/(dashboard)/_state/landing-page/profile';
 import colors from '@/con/colors';
 import ApiFetch from '@/lib/api-fetch';
@@ -14,7 +16,7 @@ import {
   Text,
   TextInput,
   Title,
-  Loader
+  Loader,
 } from '@mantine/core';
 import { Dropzone } from '@mantine/dropzone';
 import { IconArrowBack, IconPhoto, IconUpload, IconX } from '@tabler/icons-react';
@@ -23,15 +25,45 @@ import { useEffect, useState } from 'react';
 import { toast } from 'react-toastify';
 import { useProxy } from 'valtio/utils';
 
+type SosmedKey =
+  | 'none'
+  | 'facebook'
+  | 'instagram'
+  | 'tiktok'
+  | 'youtube'
+  | 'whatsapp'
+  | 'gmail'
+  | 'telegram'
+  | 'x'
+  | 'telephone'
+  | 'custom';
+
+const sosmedMap: Record<SosmedKey, { label: string; src: string | null }> = {
+  none: { label: "None", src: '/no-image.jpg' },
+  facebook: { label: 'Facebook', src: '/assets/images/sosmed/facebook.png' },
+  instagram: { label: 'Instagram', src: '/assets/images/sosmed/instagram.png' },
+  tiktok: { label: 'Tiktok', src: '/assets/images/sosmed/tiktok.png' },
+  youtube: { label: 'YouTube', src: '/assets/images/sosmed/youtube.png' },
+  whatsapp: { label: 'WhatsApp', src: '/assets/images/sosmed/whatsapp.png' },
+  gmail: { label: 'Gmail', src: '/assets/images/sosmed/gmail.png' },
+  telegram: { label: 'Telegram', src: '/assets/images/sosmed/telegram.png' },
+  x: { label: 'X (Twitter)', src: '/assets/images/sosmed/x-twitter.png' },
+  telephone: { label: 'Telephone', src: '/assets/images/sosmed/telephone-call.png' },
+  custom: { label: 'Custom Icon', src: null },
+};
+
 function EditMediaSosial() {
   const stateMediaSosial = useProxy(profileLandingPageState.mediaSosial);
   const router = useRouter();
   const params = useParams();
 
+  const [selectedSosmed, setSelectedSosmed] = useState<SosmedKey>('facebook');
   const [previewImage, setPreviewImage] = useState<string | null>(null);
   const [file, setFile] = useState<File | null>(null);
+
   const [formData, setFormData] = useState({
     name: '',
+    icon: '',
     iconUrl: '',
     imageId: '',
   });
@@ -39,13 +71,14 @@ function EditMediaSosial() {
   const [isSubmitting, setIsSubmitting] = useState(false);
 
   const [originalData, setOriginalData] = useState({
-    name: "",
-    iconUrl: "",
-    imageId: "",
-    imageUrl: "",
+    name: '',
+    icon: '',
+    iconUrl: '',
+    imageId: '',
+    imageUrl: '',
   });
 
-  // Load data by ID
+  // Load Data by ID
   useEffect(() => {
     const id = params?.id as string;
     if (!id) return;
@@ -54,81 +87,97 @@ function EditMediaSosial() {
       try {
         const data = await stateMediaSosial.update.load(id);
 
-        if (data) {
-          // isi form awal
-          const newForm = {
-            name: data.name || "",
-            iconUrl: data.iconUrl || "",
-            imageId: data.imageId || "",
-          };
-          setFormData(newForm);
+        if (!data) return;
 
-          // simpan juga versi original
-          setOriginalData({
-            ...newForm,
-            imageUrl: data.image?.link || "",
-          });
-
-          setPreviewImage(data.image?.link || null);
+        // Tentukan default/custom icon
+        // Tentukan default/custom icon
+        if (data.imageId) {
+          setSelectedSosmed('custom');
+        } else {
+          // ✅ Gunakan langsung data.icon jika ada dan valid
+          if (data.icon && sosmedMap[data.icon as SosmedKey]) {
+            setSelectedSosmed(data.icon as SosmedKey);
+          } else {
+            setSelectedSosmed('none'); // fallback
+          }
         }
-      } catch (error) {
-        console.error('Error loading media sosial:', error);
-        toast.error(
-          error instanceof Error ? error.message : 'Gagal mengambil data media sosial'
-        );
+
+        const newForm = {
+          name: data.name || '',
+          icon: data.icon || '',
+          iconUrl: data.iconUrl || '',
+          imageId: data.imageId || '',
+        };
+
+        setFormData(newForm);
+
+        setOriginalData({
+          ...newForm,
+          imageUrl: data.image?.link || '',
+        });
+
+        setPreviewImage(data.image?.link || null);
+      } catch {
+        toast.error('Gagal mengambil data media sosial');
       }
     };
 
     loadData();
   }, [params?.id]);
 
-  const handleChange = (field: string, value: string) => {
+  const handleChange = (field: keyof typeof formData, value: string) => {
     setFormData((prev) => ({ ...prev, [field]: value }));
   };
 
   const handleSubmit = async () => {
     setIsSubmitting(true);
+
     try {
-      // update global state hanya saat submit
       stateMediaSosial.update.form = { ...stateMediaSosial.update.form, ...formData };
 
       if (file) {
-        const res = await ApiFetch.api.fileStorage.create.post({ file, name: file.name });
+        const res = await ApiFetch.api.fileStorage.create.post({
+          file,
+          name: file.name,
+        });
         const uploaded = res.data?.data;
 
-        if (!uploaded?.id) return toast.error('Gagal upload gambar');
+        if (!uploaded?.id) {
+          toast.error('Gagal upload gambar');
+          return;
+        }
 
         stateMediaSosial.update.form.imageId = uploaded.id;
       }
 
+      // 🚨 Tambahkan ini untuk debugging
+      console.log("Data yang akan dikirim ke backend:", stateMediaSosial.update.form);
+
       await stateMediaSosial.update.update();
       toast.success('Media sosial berhasil diperbarui!');
       router.push('/admin/landing-page/profil/media-sosial');
     } catch (error) {
-      console.error('Error updating media sosial:', error);
+      console.error("Error di handleSubmit:", error); // 🚨 Tambahkan ini juga
       toast.error('Terjadi kesalahan saat memperbarui media sosial');
     } finally {
       setIsSubmitting(false);
     }
   };
 
-  // ✅ Tombol Batal → balikin ke data original
   const handleResetForm = () => {
     setFormData({
       name: originalData.name,
+      icon: originalData.icon,
       iconUrl: originalData.iconUrl,
       imageId: originalData.imageId,
     });
     setPreviewImage(originalData.imageUrl || null);
     setFile(null);
-    toast.info("Form dikembalikan ke data awal");
+    toast.info('Form dikembalikan ke data awal');
   };
 
   return (
-    <Box
-      px={{ base: 'sm', md: 'lg' }}
-      py="md"
-    >
+    <Box px={{ base: 'sm', md: 'lg' }} py="md">
       <Group mb="md">
         <Button variant="subtle" onClick={() => router.back()} p="xs" radius="md">
           <IconArrowBack color={colors['blue-button']} size={24} />
@@ -147,80 +196,119 @@ function EditMediaSosial() {
         style={{ border: '1px solid #e0e0e0' }}
       >
         <Stack gap="md">
-          {/* Upload Gambar */}
+          {/* Upload / Icon */}
           <Box>
             <Text fw="bold" fz="sm" mb={6}>
-              Gambar Program Inovasi
+              Icon / Gambar Media Sosial
             </Text>
-            <Dropzone
-              onDrop={(files) => {
-                const selectedFile = files[0];
-                if (selectedFile) {
-                  setFile(selectedFile);
-                  setPreviewImage(URL.createObjectURL(selectedFile));
+
+            {/* Custom Upload */}
+            {/* PILIH ICON */}
+            <SelectSocialMediaEdit
+              value={selectedSosmed}
+              onChange={(key) => {
+                setSelectedSosmed(key);
+
+                if (key === 'custom') {
+                  // custom → gunakan Dropzone
+                  setFormData((prev) => ({
+                    ...prev,
+                    icon: '',
+                    imageId: '',
+                  }));
+                  return;
                 }
+
+                // default → pakai icon bawaan
+                setFormData((prev) => ({
+                  ...prev,
+                  icon: key, // <-- simpan 'facebook', bukan path
+                  imageId: '',
+                }));
               }}
-              onReject={() => toast.error('File tidak valid, gunakan format gambar')}
-              maxSize={5 * 1024 ** 2}
-              accept={{ 'image/*': ['.jpeg', '.jpg', '.png', '.webp'] }}
-              radius="md"
-              p="xl"
-            >
-              <Group justify="center" gap="xl" mih={180}>
-                <Dropzone.Accept>
-                  <IconUpload size={48} color={colors['blue-button']} stroke={1.5} />
-                </Dropzone.Accept>
-                <Dropzone.Reject>
-                  <IconX size={48} color="red" stroke={1.5} />
-                </Dropzone.Reject>
-                <Dropzone.Idle>
-                  <IconPhoto size={48} color="#868e96" stroke={1.5} />
-                </Dropzone.Idle>
-                <Stack gap="xs" align="center">
-                  <Text size="md" fw={500}>
-                    Seret gambar atau klik untuk memilih file
-                  </Text>
-                  <Text size="sm" c="dimmed">
-                  Maksimal 5MB, format gambar .png, .jpg, .jpeg, webp
-                  </Text>
-                </Stack>
-              </Group>
-            </Dropzone>
+            />
 
-            {/* ✅ Preview gambar + tombol X */}
-            {previewImage && (
-              <Box mt="sm" pos="relative" style={{ textAlign: 'center' }}>
-                <Image
-                  src={previewImage}
-                  alt="Preview Gambar"
+            {selectedSosmed === 'custom' ? (
+              <>
+                <Dropzone
+                  onDrop={(files) => {
+                    const selectedFile = files[0];
+                    if (selectedFile) {
+                      setFile(selectedFile);
+                      setPreviewImage(URL.createObjectURL(selectedFile));
+                      handleChange('imageId', '');
+                    }
+                  }}
+                  onReject={() => toast.error('File tidak valid')}
+                  maxSize={5 * 1024 ** 2}
+                  accept={{ 'image/*': ['.jpeg', '.jpg', '.png', '.webp'] }}
                   radius="md"
-                  style={{
-                    maxHeight: 200,
-                    objectFit: 'contain',
-                    border: '1px solid #ddd',
-                  }}
-                  loading="lazy"
-                />
-
-                {/* Tombol hapus (pojok kanan atas) */}
-                <ActionIcon
-                  variant="filled"
-                  color="red"
-                  radius="xl"
-                  size="sm"
-                  pos="absolute"
-                  top={5}
-                  right={5}
-                  onClick={() => {
-                    setPreviewImage(null);
-                    setFile(null);
-                  }}
-                  style={{
-                    boxShadow: '0 2px 6px rgba(0,0,0,0.15)',
-                  }}
+                  p="xl"
                 >
-                  <IconX size={14} />
-                </ActionIcon>
+                  <Group justify="center" gap="xl" mih={180}>
+                    <Dropzone.Accept>
+                      <IconUpload size={48} color={colors['blue-button']} stroke={1.5} />
+                    </Dropzone.Accept>
+                    <Dropzone.Reject>
+                      <IconX size={48} color="red" stroke={1.5} />
+                    </Dropzone.Reject>
+                    <Dropzone.Idle>
+                      <IconPhoto size={48} color="#868e96" stroke={1.5} />
+                    </Dropzone.Idle>
+
+                    <Stack align="center" gap="xs">
+                      <Text fw={500}>Seret gambar atau klik untuk pilih</Text>
+                      <Text size="sm" c="dimmed">
+                        Maksimal 5MB, format: .png, .jpg, .jpeg, .webp
+                      </Text>
+                    </Stack>
+                  </Group>
+                </Dropzone>
+
+                {previewImage && (
+                  <Box mt="sm" pos="relative" style={{ textAlign: 'center' }}>
+                    <Image
+                      src={previewImage}
+                      alt="Preview"
+                      radius="md"
+                      style={{
+                        maxHeight: 200,
+                        objectFit: 'contain',
+                        border: '1px solid #ddd',
+                      }}
+                    />
+
+                    <ActionIcon
+                      variant="filled"
+                      color="red"
+                      radius="xl"
+                      size="sm"
+                      pos="absolute"
+                      top={5}
+                      right={5}
+                      onClick={() => {
+                        setFile(null);
+                        setPreviewImage(null);
+                        handleChange('imageId', '');
+                      }}
+                      style={{ boxShadow: '0 2px 6px rgba(0,0,0,0.15)' }}
+                    >
+                      <IconX size={14} />
+                    </ActionIcon>
+                  </Box>
+                )}
+              </>
+            ) : (
+              // Default icon
+              <Box mt="xs">
+                <Image
+                  src={sosmedMap[selectedSosmed].src || ''}
+                  alt="Icon bawaan"
+                  width={40}
+                  height={40}
+                  radius="md"
+                  style={{ border: '1px solid #ddd', padding: 4, background: '#fff' }}
+                />
               </Box>
             )}
           </Box>
@@ -237,25 +325,17 @@ function EditMediaSosial() {
           {/* Link Media Sosial */}
           <TextInput
             label="Link Media Sosial / Nomor Telepon"
-            placeholder="Masukkan link media sosial atau nomor telepon"
+            placeholder="Masukkan link atau nomor telepon"
             value={formData.iconUrl}
             onChange={(e) => handleChange('iconUrl', e.target.value)}
             required
           />
 
-<Group justify="right">
-            {/* Tombol Batal */}
-            <Button
-              variant="outline"
-              color="gray"
-              radius="md"
-              size="md"
-              onClick={handleResetForm}
-            >
+          <Group justify="right">
+            <Button variant="outline" color="gray" radius="md" size="md" onClick={handleResetForm}>
               Batal
             </Button>
 
-            {/* Tombol Simpan */}
             <Button
               onClick={handleSubmit}
               radius="md"

src/app/admin/(dashboard)/landing-page/profil/media-sosial/[id]/page.tsx

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 'use client'
 import { ModalKonfirmasiHapus } from '@/app/admin/(dashboard)/_com/modalKonfirmasiHapus';
 import profileLandingPageState from '@/app/admin/(dashboard)/_state/landing-page/profile';
@@ -8,6 +9,7 @@ import { IconArrowBack, IconEdit, IconTrash } from '@tabler/icons-react';
 import { useParams, useRouter } from 'next/navigation';
 import { useState } from 'react';
 import { useProxy } from 'valtio/utils';
+import { sosmedMap } from '../../_lib/sosmed';
 
 function DetailMediaSosial() {
   const stateMediaSosial = useProxy(profileLandingPageState.mediaSosial);
@@ -16,6 +18,14 @@ function DetailMediaSosial() {
   const params = useParams();
   const router = useRouter();
 
+  const getIconSource = (item: any) => {
+    if (item.image?.link) return item.image.link;
+    if (item.icon && sosmedMap[item.icon as keyof typeof sosmedMap]?.src) {
+      return sosmedMap[item.icon as keyof typeof sosmedMap].src;
+    }
+    return null;
+  };
+
   useShallowEffect(() => {
     stateMediaSosial.findUnique.load(params?.id as string);
   }, []);
@@ -77,46 +87,47 @@ function DetailMediaSosial() {
 
               <Box>
                 <Text fz="lg" fw="bold">Gambar</Text>
-                {data.image?.link ? (
-                  <Image
-                    src={data.image.link}
-                    alt={data.name || 'Gambar Media Sosial'}
-                    w="100%"
-                    maw={120} // max width biar tidak keluar layar
-                    h="auto"
-                    radius="md"
-                    fit="cover"
-                    loading="lazy"
-                  />
+                {(() => {
+                  const src = getIconSource(data);
 
-                ) : (
-                  <Text fz="sm" c="dimmed">Tidak ada gambar</Text>
-                )}
+                  if (src) {
+                    return (
+                      <Image
+                        loading="lazy"
+                        src={src}
+                        alt={data.name}
+                        fit={data.image?.link ? "cover" : "contain"}
+                      />
+                    );
+                  }
+
+                  return <Box bg={colors['blue-button']} w="100%" h="100%" />;
+                })()}
               </Box>
 
               <Group gap="sm">
-                  <Button
-                    color="red"
-                    onClick={() => {
-                      setSelectedId(data.id);
-                      setModalHapus(true);
-                    }}
-                    variant="light"
-                    radius="md"
-                    size="md"
-                  >
-                    <IconTrash size={20} />
-                  </Button>
+                <Button
+                  color="red"
+                  onClick={() => {
+                    setSelectedId(data.id);
+                    setModalHapus(true);
+                  }}
+                  variant="light"
+                  radius="md"
+                  size="md"
+                >
+                  <IconTrash size={20} />
+                </Button>
 
-                  <Button
-                    color="green"
-                    onClick={() => router.push(`/admin/landing-page/profil/media-sosial/${data.id}/edit`)}
-                    variant="light"
-                    radius="md"
-                    size="md"
-                  >
-                    <IconEdit size={20} />
-                  </Button>
+                <Button
+                  color="green"
+                  onClick={() => router.push(`/admin/landing-page/profil/media-sosial/${data.id}/edit`)}
+                  variant="light"
+                  radius="md"
+                  size="md"
+                >
+                  <IconEdit size={20} />
+                </Button>
               </Group>
             </Stack>
           </Paper>

src/app/admin/(dashboard)/landing-page/profil/media-sosial/create/page.tsx

@@ -1,5 +1,6 @@
 /* eslint-disable react-hooks/exhaustive-deps */
 'use client';
+
 import colors from '@/con/colors';
 import ApiFetch from '@/lib/api-fetch';
 import {
@@ -22,10 +23,41 @@ import { useEffect, useState } from 'react';
 import { toast } from 'react-toastify';
 import { useProxy } from 'valtio/utils';
 import profileLandingPageState from '../../../../_state/landing-page/profile';
+import SelectSosialMedia from '@/app/admin/(dashboard)/_com/selectSocialMedia';
+
+
+// ⭐ Tambah type SosmedKey
+type SosmedKey =
+  | 'facebook'
+  | 'instagram'
+  | 'tiktok'
+  | 'youtube'
+  | 'whatsapp'
+  | 'gmail'
+  | 'telegram'
+  | 'x'
+  | 'telephone'
+  | 'custom';
+
+// ⭐ mapping icon sosmed bawaan
+const sosmedMap: Record<SosmedKey, { label: string; src: string | null }> = {
+  facebook: { label: 'Facebook', src: '/assets/images/sosmed/facebook.png' },
+  instagram: { label: 'Instagram', src: '/assets/images/sosmed/instagram.png' },
+  tiktok: { label: 'Tiktok', src: '/assets/images/sosmed/tiktok.png' },
+  youtube: { label: 'YouTube', src: '/assets/images/sosmed/youtube.png' },
+  whatsapp: { label: 'WhatsApp', src: '/assets/images/sosmed/whatsapp.png' },
+  gmail: { label: 'Gmail', src: '/assets/images/sosmed/gmail.png' },
+  telegram: { label: 'Telegram', src: '/assets/images/sosmed/telegram.png' },
+  x: { label: 'X (Twitter)', src: '/assets/images/sosmed/x-twitter.png' },
+  telephone: { label: 'Telephone', src: '/assets/images/sosmed/telephone-call.png' },
+  custom: { label: 'Custom Icon', src: null },
+};
 
 export default function CreateMediaSosial() {
   const router = useRouter();
   const stateMediaSosial = useProxy(profileLandingPageState.mediaSosial);
+
+  const [selectedSosmed, setSelectedSosmed] = useState<SosmedKey>('facebook');
   const [previewImage, setPreviewImage] = useState<string | null>(null);
   const [file, setFile] = useState<File | null>(null);
   const [isSubmitting, setIsSubmitting] = useState(false);
@@ -39,16 +71,34 @@ export default function CreateMediaSosial() {
       name: '',
       imageId: '',
       iconUrl: '',
+      icon: ''
     };
-    setPreviewImage(null);
+
     setFile(null);
+    setPreviewImage(null);
+    setSelectedSosmed('facebook');
   };
 
   const handleSubmit = async () => {
     setIsSubmitting(true);
+
     try {
+      // ──────────────── ⭐ CASE 1: PAKAI ICON DEFAULT ────────────────
+      if (selectedSosmed !== 'custom') {
+        stateMediaSosial.create.form.imageId = null;
+        stateMediaSosial.create.form.icon = sosmedMap[selectedSosmed].src!;
+
+
+        await stateMediaSosial.create.create();
+        resetForm();
+        router.push('/admin/landing-page/profil/media-sosial');
+        return;
+      }
+
+      // ──────────────── ⭐ CASE 2: CUSTOM ICON → WAJIB UPLOAD ────────────────
       if (!file) {
-        return toast.warn('Silakan pilih file gambar terlebih dahulu');
+        toast.warn('Silakan upload icon custom terlebih dahulu');
+        return;
       }
 
       const res = await ApiFetch.api.fileStorage.create.post({
@@ -59,10 +109,12 @@ export default function CreateMediaSosial() {
       const uploaded = res.data?.data;
 
       if (!uploaded?.id) {
-        return toast.error('Gagal mengunggah gambar, silakan coba lagi');
+        toast.error('Gagal mengunggah icon custom');
+        return;
       }
 
       stateMediaSosial.create.form.imageId = uploaded.id;
+      stateMediaSosial.create.form.icon = null;
 
       await stateMediaSosial.create.create();
 
@@ -78,6 +130,7 @@ export default function CreateMediaSosial() {
 
   return (
     <Box px={{ base: 'sm', md: 'lg' }} py="md">
+      {/* Header */}
       <Group mb="md">
         <Button variant="subtle" onClick={() => router.back()} p="xs" radius="md">
           <IconArrowBack color={colors['blue-button']} size={24} />
@@ -96,112 +149,110 @@ export default function CreateMediaSosial() {
         style={{ border: '1px solid #e0e0e0' }}
       >
         <Stack gap="md">
-          <Box>
-            <Text fw="bold" fz="sm" mb={6}>
-              Gambar Program Inovasi
-            </Text>
-            <Dropzone
-              onDrop={(files) => {
-                const selectedFile = files[0];
-                if (selectedFile) {
-                  setFile(selectedFile);
-                  setPreviewImage(URL.createObjectURL(selectedFile));
-                }
-              }}
-              onReject={() => toast.error('File tidak valid, gunakan format gambar')}
-              maxSize={5 * 1024 ** 2}
-              accept={{ 'image/*': ['.jpeg', '.jpg', '.png', '.webp'] }}
-              radius="md"
-              p="xl"
-            >
-              <Group justify="center" gap="xl" mih={180}>
-                <Dropzone.Accept>
-                  <IconUpload size={48} color={colors['blue-button']} stroke={1.5} />
-                </Dropzone.Accept>
-                <Dropzone.Reject>
-                  <IconX size={48} color="red" stroke={1.5} />
-                </Dropzone.Reject>
-                <Dropzone.Idle>
-                  <IconPhoto size={48} color="#868e96" stroke={1.5} />
-                </Dropzone.Idle>
-                <Stack gap="xs" align="center">
-                  <Text size="md" fw={500}>
-                    Seret gambar atau klik untuk memilih file
-                  </Text>
-                  <Text size="sm" c="dimmed">
-                  Maksimal 5MB, format gambar .png, .jpg, .jpeg, webp
-                  </Text>
-                </Stack>
-              </Group>
-            </Dropzone>
+          {/* Select Sosmed */}
+          <SelectSosialMedia value={selectedSosmed} onChange={setSelectedSosmed} />
 
-            {/* ✅ Preview gambar + tombol X */}
-            {previewImage && (
-              <Box mt="sm" pos="relative" style={{ textAlign: 'center' }}>
-                <Image
-                  src={previewImage}
-                  alt="Preview Gambar"
-                  radius="md"
-                  style={{
-                    maxHeight: 200,
-                    objectFit: 'contain',
-                    border: '1px solid #ddd',
-                  }}
-                  loading="lazy"
-                />
+          {/* Custom icon uploader */}
+          {selectedSosmed === 'custom' && (
+            <Box>
+              <Text fw="bold" fz="sm" mb={6}>
+                Upload Custom Icon
+              </Text>
 
-                {/* Tombol hapus (pojok kanan atas) */}
-                <ActionIcon
-                  variant="filled"
-                  color="red"
-                  radius="xl"
-                  size="sm"
-                  pos="absolute"
-                  top={5}
-                  right={5}
-                  onClick={() => {
-                    setPreviewImage(null);
-                    setFile(null);
-                  }}
-                  style={{
-                    boxShadow: '0 2px 6px rgba(0,0,0,0.15)',
-                  }}
-                >
-                  <IconX size={14} />
-                </ActionIcon>
-              </Box>
-            )}
-          </Box>
+              <Dropzone
+                onDrop={(files) => {
+                  const selectedFile = files[0];
+                  if (selectedFile) {
+                    setFile(selectedFile);
+                    setPreviewImage(URL.createObjectURL(selectedFile));
+                  }
+                }}
+                onReject={() => toast.error('File tidak valid')}
+                maxSize={5 * 1024 ** 2}
+                accept={{ 'image/*': ['.jpeg', '.jpg', '.png', '.webp'] }}
+                radius="md"
+                p="xl"
+              >
+                <Group justify="center" gap="xl" mih={180}>
+                  <Dropzone.Accept>
+                    <IconUpload size={48} color={colors['blue-button']} stroke={1.5} />
+                  </Dropzone.Accept>
+                  <Dropzone.Reject>
+                    <IconX size={48} color="red" stroke={1.5} />
+                  </Dropzone.Reject>
+                  <Dropzone.Idle>
+                    <IconPhoto size={48} color="#868e96" stroke={1.5} />
+                  </Dropzone.Idle>
 
+                  <Stack align="center" gap="xs">
+                    <Text fw={500}>Seret gambar atau klik untuk pilih</Text>
+                    <Text size="sm" c="dimmed">
+                      Maksimal 5MB, format .png, .jpg, .jpeg, webp
+                    </Text>
+                  </Stack>
+                </Group>
+              </Dropzone>
+
+              {previewImage && (
+                <Box mt="sm" pos="relative" style={{ textAlign: 'center' }}>
+                  <Image
+                    src={previewImage}
+                    alt="Preview"
+                    radius="md"
+                    style={{
+                      maxHeight: 200,
+                      objectFit: 'contain',
+                      border: '1px solid #ddd',
+                    }}
+                  />
+
+                  <ActionIcon
+                    variant="filled"
+                    color="red"
+                    radius="xl"
+                    size="sm"
+                    pos="absolute"
+                    top={5}
+                    right={5}
+                    onClick={() => {
+                      setFile(null);
+                      setPreviewImage(null);
+                    }}
+                    style={{ boxShadow: '0 2px 6px rgba(0,0,0,0.15)' }}
+                  >
+                    <IconX size={14} />
+                  </ActionIcon>
+                </Box>
+              )}
+            </Box>
+          )}
+
+          {/* Input name */}
           <TextInput
-            label="Nama Media Sosial / Kontak"
-            placeholder="Masukkan nama media sosial atau kontak"
-            value={stateMediaSosial.create.form.name || ''}
+            label="Nama Media Sosial"
+            placeholder="Masukkan nama media sosial"
+            value={stateMediaSosial.create.form.name ?? ''}
             onChange={(e) => (stateMediaSosial.create.form.name = e.target.value)}
             required
           />
+
+          {/* Input link */}
           <TextInput
-            label="Link Media Sosial / Nomor Telepon"
-            placeholder="Masukkan link media sosial atau nomor telepon"
-            value={stateMediaSosial.create.form.iconUrl || ''}
+            label="Link / Kontak"
+            placeholder="Masukkan link atau nomor"
+            value={stateMediaSosial.create.form.iconUrl ?? ''}
             onChange={(e) => (stateMediaSosial.create.form.iconUrl = e.target.value)}
             required
           />
 
+          {/* Actions */}
           <Group justify="right">
-            <Button
-              variant="outline"
-              color="gray"
-              radius="md"
-              size="md"
-              onClick={resetForm}
-            >
+            <Button variant="outline" color="gray" radius="md" onClick={resetForm}>
               Reset
             </Button>
             <Button
-              onClick={handleSubmit}
               radius="md"
-              size="md"
+              onClick={handleSubmit}
               style={{
                 background: `linear-gradient(135deg, ${colors['blue-button']}, #4facfe)`,
                 color: '#fff',

src/app/admin/(dashboard)/landing-page/profil/media-sosial/page.tsx

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 'use client'
 import colors from '@/con/colors';
 import { Box, Button, Center, Group, Image, Pagination, Paper, Skeleton, Stack, Table, TableTbody, TableTd, TableTh, TableThead, TableTr, Text, Title } from '@mantine/core';
@@ -8,6 +9,7 @@ import { useState } from 'react';
 import { useProxy } from 'valtio/utils';
 import HeaderSearch from '../../../_com/header';
 import profileLandingPageState from '../../../_state/landing-page/profile';
+import { sosmedMap } from '../_lib/sosmed';
 
 function MediaSosial() {
   const [search, setSearch] = useState("");
@@ -29,6 +31,14 @@ function ListMediaSosial({ search }: { search: string }) {
   const stateMediaSosial = useProxy(profileLandingPageState.mediaSosial)
   const router = useRouter();
 
+  const getIconSource = (item: any) => {
+    if (item.image?.link) return item.image.link; 
+    if (item.icon && sosmedMap[item.icon as keyof typeof sosmedMap]?.src) {
+      return sosmedMap[item.icon as keyof typeof sosmedMap].src;
+    }
+    return null;
+  };
+
   const {
     data,
     page,
@@ -56,9 +66,9 @@ function ListMediaSosial({ search }: { search: string }) {
       <Paper withBorder bg={colors['white-1']} p={'lg'} shadow="md" radius="md">
         <Group justify="space-between" mb="md">
           <Title order={4}>Daftar Media Sosial</Title>
-            <Button leftSection={<IconPlus size={18} />} color="blue" variant="light" onClick={() => router.push('/admin/landing-page/profil/media-sosial/create')}>
-              Tambah Baru
-            </Button>
+          <Button leftSection={<IconPlus size={18} />} color="blue" variant="light" onClick={() => router.push('/admin/landing-page/profil/media-sosial/create')}>
+            Tambah Baru
+          </Button>
         </Group>
         <Box style={{ overflowX: "auto" }}>
           <Table highlightOnHover>
@@ -77,13 +87,26 @@ function ListMediaSosial({ search }: { search: string }) {
                     <TableTd style={{ width: '25%', }}>
                       <Text fw={500} truncate="end" lineClamp={1}>{item.name}</Text>
                     </TableTd>
-                    <TableTd style={{ width: '20%', }}>
-                      <Box w={50} h={50} style={{ borderRadius: 8, overflow: 'hidden', }}>
-                        {item.image?.link ? (
-                          <Image loading='lazy' src={item.image.link} alt={item.name} fit="cover" />
-                        ) : (
-                          <Box bg={colors['blue-button']} w="100%" h="100%" />
-                        )}
+                    <TableTd style={{ width: '20%' }}>
+                      <Box w={50} h={50} style={{ borderRadius: 8, overflow: 'hidden' }}>
+
+                        {(() => {
+                          const src = getIconSource(item);
+
+                          if (src) {
+                            return (
+                              <Image
+                                loading="lazy"
+                                src={src}
+                                alt={item.name}
+                                fit={item.image?.link ? "cover" : "contain"}
+                              />
+                            );
+                          }
+
+                          return <Box bg={colors['blue-button']} w="100%" h="100%" />;
+                        })()}
+
                       </Box>
                     </TableTd>
                     <TableTd style={{ width: '20%', }}>

src/app/admin/(dashboard)/ppid/profil-ppid/page.tsx

@@ -30,12 +30,13 @@ function Page() {
   return (
     <Paper bg={colors['white-1']} p="lg" radius="md" shadow="sm">
       <Stack gap="md">
-        <Grid align="center">
+        <Grid>
           <GridCol span={{ base: 12, md: 11 }}>
             <Title order={3} c={colors['blue-button']}>Preview Profil PPID</Title>
           </GridCol>
           <GridCol span={{ base: 12, md: 1 }}>
               <Button
+                w={{base: '100%', md: "110%"}}
                 c="green"
                 variant="light"
                 leftSection={<IconEdit size={18} stroke={2} />}

src/app/admin/(dashboard)/user&role/user/page.tsx

@@ -93,6 +93,7 @@ function ListUser({ search }: { search: string }) {
     const success = await stateUser.update.submit({
       id: userId,
       roleId: newRoleId,
+
     });
 
     if (success) {
@@ -136,9 +137,10 @@ function ListUser({ search }: { search: string }) {
     }
   };
 
-  const filteredData = (data || []).filter(
-    (item) => item.roleId !== "0" // asumsikan id role SUPERADMIN = "0"
-  );
+  const filteredData = (data || []).filter((item) => {
+    return item.roleId !== "0" && item.roleId !== "1";
+  });
+
 
   if (loading || !data) {
     return (
@@ -183,7 +185,7 @@ function ListUser({ search }: { search: string }) {
                       <Select
                         placeholder="Pilih role"
                         data={stateRole.findMany.data
-                          .filter(r => r.id !== "0") // ❌ Sembunyikan SUPERADMIN
+                          .filter(r => r.id !== "0" && r.id !== "1") // ❌ Sembunyikan SUPERADMIN dan DEVELOPER
                           .map(r => ({
                             label: r.name,
                             value: r.id,

src/app/admin/layout.tsx

@@ -1,3 +1,399 @@
+// 'use client'
+
+// import colors from "@/con/colors";
+// import { authStore } from "@/store/authStore";
+// import {
+//   ActionIcon,
+//   AppShell,
+//   AppShellHeader,
+//   AppShellMain,
+//   AppShellNavbar,
+//   Burger,
+//   Center,
+//   Flex,
+//   Group,
+//   Image,
+//   Loader,
+//   NavLink,
+//   ScrollArea,
+//   Text,
+//   Tooltip,
+//   rem
+// } from "@mantine/core";
+// import { useDisclosure } from "@mantine/hooks";
+// import {
+//   IconChevronLeft,
+//   IconChevronRight,
+//   IconLogout2
+// } from "@tabler/icons-react";
+// import _ from "lodash";
+// import Link from "next/link";
+// import { useRouter, useSelectedLayoutSegments } from "next/navigation";
+// import { useEffect, useState } from "react";
+// // import { useSnapshot } from "valtio";
+// import { getNavbar } from "./(dashboard)/user&role/_com/dynamicNavbar";
+
+// export default function Layout({ children }: { children: React.ReactNode }) {
+//   const [opened, { toggle }] = useDisclosure();
+//   const [loading, setLoading] = useState(true);
+//   const [isLoggingOut, setIsLoggingOut] = useState(false);
+//   const [desktopOpened, { toggle: toggleDesktop }] = useDisclosure(true);
+//   const router = useRouter();
+//   const segments = useSelectedLayoutSegments().map((s) => _.lowerCase(s));
+
+//   // const { user } = useSnapshot(authStore);
+
+//   // console.log("Current user in store:", user);
+
+//   // ✅ FIX: Selalu fetch user data setiap kali komponen mount
+//   useEffect(() => {
+//     const fetchUser = async () => {
+//       try {
+//         const res = await fetch('/api/auth/me');
+//         const data = await res.json();
+
+//         if (data.user) {
+//           // ✅ Check if user is NOT active → redirect to waiting room
+//           if (!data.user.isActive) {
+//             authStore.setUser(null);
+//             router.replace('/waiting-room');
+//             return;
+//           }
+
+//           // ✅ Fetch menuIds
+//           const menuRes = await fetch(`/api/admin/user-menu-access?userId=${data.user.id}`);
+//           const menuData = await menuRes.json();
+
+//           const menuIds = menuData.success && Array.isArray(menuData.menuIds)
+//             ? [...menuData.menuIds]
+//             : null;
+
+//           // ✅ Set user dengan menuIds yang fresh
+//           authStore.setUser({
+//             id: data.user.id,
+//             name: data.user.name,
+//             roleId: Number(data.user.roleId),
+//             menuIds,
+//             isActive: data.user.isActive
+//           });
+
+//           // ✅ TAMBAHKAN INI: Redirect ke dashboard sesuai roleId
+//           const currentPath = window.location.pathname;
+//           const expectedPath = getRedirectPath(Number(data.user.roleId));
+
+//           // Jika user di halaman /admin tapi bukan di path yang sesuai roleId
+//           if (currentPath === '/admin' || !currentPath.startsWith(expectedPath)) {
+//             router.replace(expectedPath);
+//           }
+
+//         } else {
+//           authStore.setUser(null);
+//           router.replace('/login');
+//         }
+//       } catch (error) {
+//         console.error('Gagal memuat data pengguna:', error);
+//         authStore.setUser(null);
+//         router.replace('/login');
+//       } finally {
+//         setLoading(false);
+//       }
+//     };
+
+//     fetchUser();
+//   }, [router]);
+
+//   // ✅ Fungsi helper untuk get redirect path
+//   const getRedirectPath = (roleId: number): string => {
+//     switch (roleId) {
+//       case 0: // DEVELOPER
+//       case 1: // SUPERADMIN
+//       case 2: // ADMIN_DESA
+//         return '/admin/landing-page/profil/program-inovasi';
+//       case 3: // ADMIN_KESEHATAN
+//         return '/admin/kesehatan/posyandu';
+//       case 4: // ADMIN_PENDIDIKAN
+//         return '/admin/pendidikan/info-sekolah/jenjang-pendidikan';
+//       default:
+//         return '/admin';
+//     }
+//   };
+
+//   if (loading) {
+//     return (
+//       <AppShell>
+//         <AppShellMain>
+//           <Center h="100vh">
+//             <Loader />
+//           </Center>
+//         </AppShellMain>
+//       </AppShell>
+//     );
+//   }
+
+//   // ✅ Ambil menu berdasarkan roleId dan menuIds
+//   const currentNav = authStore.user
+//     ? getNavbar({ roleId: authStore.user.roleId, menuIds: authStore.user.menuIds })
+//     : [];
+
+//   const handleLogout = async () => {
+//     try {
+//       setIsLoggingOut(true);
+
+//       // ✅ Panggil API logout untuk clear session di server
+//       const response = await fetch('/api/auth/logout', { method: 'POST' });
+//       const result = await response.json();
+
+//       if (result.success) {
+//         // Clear user data dari store
+//         authStore.setUser(null);
+
+//         // Clear localStorage
+//         localStorage.removeItem('auth_nomor');
+//         localStorage.removeItem('auth_kodeId');
+
+//         // Force reload untuk reset semua state
+//         window.location.href = '/login';
+//       } else {
+//         console.error('Logout failed:', result.message);
+//         // Tetap redirect meskipun gagal
+//         authStore.setUser(null);
+//         window.location.href = '/login';
+//       }
+//     } catch (error) {
+//       console.error('Error during logout:', error);
+//       // Tetap clear store dan redirect jika error
+//       authStore.setUser(null);
+//       window.location.href = '/login';
+//     } finally {
+//       setIsLoggingOut(false);
+//     }
+//   };
+
+//   return (
+//     <AppShell
+//       suppressHydrationWarning
+//       header={{ height: 64 }}
+//       navbar={{
+//         width: { base: 260, sm: 280, lg: 300 },
+//         breakpoint: 'sm',
+//         collapsed: {
+//           mobile: !opened,
+//           desktop: !desktopOpened,
+//         },
+//       }}
+//       padding="md"
+//     >
+//       <AppShellHeader
+//         style={{
+//           background: "linear-gradient(90deg, #ffffff, #f9fbff)",
+//           borderBottom: `1px solid ${colors["blue-button"]}20`,
+//           padding: '0 16px',
+//         }}
+//         px={{ base: 'sm', sm: 'md' }}
+//         py={{ base: 'xs', sm: 'sm' }}
+//       >
+//         <Group w="100%" h="100%" justify="space-between" wrap="nowrap">
+//           <Flex align="center" gap="sm">
+//             <Image
+//               src="/assets/images/darmasaba-icon.png"
+//               alt="Logo Darmasaba"
+//               w={{ base: 32, sm: 40 }}
+//               h={{ base: 32, sm: 40 }}
+//               radius="md"
+//               loading="lazy"
+//               style={{
+//                 minWidth: '32px',
+//                 height: 'auto',
+//               }}
+//             />
+//             <Text
+//               fw={700}
+//               c={colors["blue-button"]}
+//               fz={{ base: 'md', sm: 'xl' }}
+//             >
+//               Admin Darmasaba
+//             </Text>
+//           </Flex>
+
+//           <Group gap="xs">
+//             {!desktopOpened && (
+//               <Tooltip label="Buka Navigasi" position="bottom" withArrow>
+//                 <ActionIcon
+//                   variant="light"
+//                   radius="xl"
+//                   size="lg"
+//                   onClick={toggleDesktop}
+//                   color={colors["blue-button"]}
+//                 >
+//                   <IconChevronRight />
+//                 </ActionIcon>
+//               </Tooltip>
+//             )}
+
+//             <Burger
+//               opened={opened}
+//               onClick={toggle}
+//               hiddenFrom="sm"
+//               size="md"
+//               color={colors["blue-button"]}
+//               mr="xs"
+//             />
+
+//             <Tooltip label="Kembali ke Website Desa" position="bottom" withArrow>
+//               <ActionIcon
+//                 onClick={() => {
+//                   router.push("/darmasaba");
+//                 }}
+//                 color={colors["blue-button"]}
+//                 radius="xl"
+//                 size="lg"
+//                 variant="gradient"
+//                 gradient={{ from: colors["blue-button"], to: "#228be6" }}
+//               >
+//                 <Image
+//                   src="/assets/images/darmasaba-icon.png"
+//                   alt="Logo Darmasaba"
+//                   w={20}
+//                   h={20}
+//                   radius="md"
+//                   loading="lazy"
+//                   style={{
+//                     minWidth: '20px',
+//                     height: 'auto',
+//                   }}
+//                 />
+//               </ActionIcon>
+//             </Tooltip>
+//             <Tooltip label="Keluar" position="bottom" withArrow>
+//               <ActionIcon
+//                 onClick={handleLogout}
+//                 color={colors["blue-button"]}
+//                 radius="xl"
+//                 size="lg"
+//                 variant="gradient"
+//                 gradient={{ from: colors["blue-button"], to: "#228be6" }}
+//                 loading={isLoggingOut}
+//                 disabled={isLoggingOut}
+//               >
+//                 <IconLogout2 size={22} />
+//               </ActionIcon>
+//             </Tooltip>
+//           </Group>
+//         </Group>
+//       </AppShellHeader>
+
+//       <AppShellNavbar
+//         component={ScrollArea}
+//         style={{
+//           background: "#ffffff",
+//           borderRight: `1px solid ${colors["blue-button"]}20`,
+//         }}
+//         p={{ base: 'xs', sm: 'sm' }}
+//       >
+//         <AppShell.Section p="sm">
+//           {currentNav.map((v, k) => {
+//             const isParentActive = segments.includes(_.lowerCase(v.name));
+
+//             return (
+//               <NavLink
+//                 key={k}
+//                 defaultOpened={isParentActive}
+//                 c={isParentActive ? colors["blue-button"] : "gray"}
+//                 label={
+//                   <Text fw={isParentActive ? 600 : 400} fz="sm">
+//                     {v.name}
+//                   </Text>
+//                 }
+//                 style={{
+//                   borderRadius: rem(10),
+//                   marginBottom: rem(4),
+//                   transition: "background 150ms ease",
+//                 }}
+//                 styles={{
+//                   root: {
+//                     '&:hover': {
+//                       backgroundColor: 'rgba(25, 113, 194, 0.05)',
+//                     },
+//                   },
+//                 }}
+//                 variant="light"
+//                 active={isParentActive}
+//               >
+//                 {v.children.map((child, key) => {
+//                   const isChildActive = segments.includes(
+//                     _.lowerCase(child.name)
+//                   );
+
+//                   return (
+//                     <NavLink
+//                       key={key}
+//                       href={child.path}
+//                       c={isChildActive ? colors["blue-button"] : "gray"}
+//                       label={
+//                         <Text fw={isChildActive ? 600 : 400} fz="sm">
+//                           {child.name}
+//                         </Text>
+//                       }
+//                       styles={{
+//                         root: {
+//                           borderRadius: rem(8),
+//                           marginBottom: rem(2),
+//                           transition: 'background 150ms ease',
+//                           padding: '6px 12px',
+//                           '&:hover': {
+//                             backgroundColor: isChildActive ? 'rgba(25, 113, 194, 0.15)' : 'rgba(25, 113, 194, 0.05)',
+//                           },
+//                           ...(isChildActive && {
+//                             backgroundColor: 'rgba(25, 113, 194, 0.1)',
+//                           }),
+//                         },
+//                       }}
+//                       active={isChildActive}
+//                       component={Link}
+//                     />
+//                   );
+//                 })}
+//               </NavLink>
+//             );
+//           })}
+//         </AppShell.Section>
+
+//         <AppShell.Section py="md">
+//           <Group justify="end" pr="sm">
+//             <Tooltip
+//               label={desktopOpened ? "Tutup Navigasi" : "Buka Navigasi"}
+//               position="top"
+//               withArrow
+//             >
+//               <ActionIcon
+//                 variant="light"
+//                 radius="xl"
+//                 size="lg"
+//                 onClick={toggleDesktop}
+//                 color={colors["blue-button"]}
+//               >
+//                 <IconChevronLeft />
+//               </ActionIcon>
+//             </Tooltip>
+//           </Group>
+//         </AppShell.Section>
+//       </AppShellNavbar>
+
+//       <AppShellMain
+//         style={{
+//           background: "linear-gradient(180deg, #fdfdfd, #f6f9fc)",
+//           minHeight: "100vh",
+//         }}
+//       >
+//         {children}
+//       </AppShellMain>
+//     </AppShell>
+//   );
+// }
+
+
+// app/admin/layout.tsx
+
 'use client'
 
 import colors from "@/con/colors";
@@ -30,7 +426,6 @@ import _ from "lodash";
 import Link from "next/link";
 import { useRouter, useSelectedLayoutSegments } from "next/navigation";
 import { useEffect, useState } from "react";
-// import { useSnapshot } from "valtio";
 import { getNavbar } from "./(dashboard)/user&role/_com/dynamicNavbar";
 
 export default function Layout({ children }: { children: React.ReactNode }) {
@@ -40,42 +435,53 @@ export default function Layout({ children }: { children: React.ReactNode }) {
   const [desktopOpened, { toggle: toggleDesktop }] = useDisclosure(true);
   const router = useRouter();
   const segments = useSelectedLayoutSegments().map((s) => _.lowerCase(s));
+  
 
-  // const { user } = useSnapshot(authStore);
-
-  // console.log("Current user in store:", user);
-
-  // ✅ FIX: Selalu fetch user data setiap kali komponen mount
   useEffect(() => {
     const fetchUser = async () => {
       try {
-        const res = await fetch('/api/auth/me');
+        const res = await fetch('/api/auth/me', {
+          credentials: 'include' // ✅ ADD credentials
+        });
         const data = await res.json();
 
         if (data.user) {
-          // Check if user is active
+          // ✅ Check if user is NOT active → redirect to waiting room
           if (!data.user.isActive) {
             authStore.setUser(null);
             router.replace('/waiting-room');
             return;
           }
 
-          // ✅ PENTING: Selalu fetch menuIds terbaru setiap login
-          const menuRes = await fetch(`/api/admin/user-menu-access?userId=${data.user.id}`);
+          // ✅ Fetch menuIds
+          const menuRes = await fetch(`/api/admin/user-menu-access?userId=${data.user.id}`, {
+            credentials: 'include' // ✅ ADD credentials
+          });
           const menuData = await menuRes.json();
 
           const menuIds = menuData.success && Array.isArray(menuData.menuIds)
             ? [...menuData.menuIds]
             : null;
 
-          // ✅ Set user dengan menuIds yang fresh dari database
+          // ✅ Set user dengan menuIds yang fresh
           authStore.setUser({
             id: data.user.id,
             name: data.user.name,
             roleId: Number(data.user.roleId),
-            menuIds, // menuIds terbaru
+            menuIds,
             isActive: data.user.isActive
           });
+
+          // ✅ IMPROVED: Redirect ONLY if di root /admin
+          const currentPath = window.location.pathname;
+          
+          if (currentPath === '/admin') {
+            const expectedPath = getRedirectPath(Number(data.user.roleId));
+            console.log('🔄 Redirecting from /admin to:', expectedPath);
+            router.replace(expectedPath);
+          }
+          // ✅ Jangan redirect jika user sudah di path yang valid
+
         } else {
           authStore.setUser(null);
           router.replace('/login');
@@ -90,7 +496,22 @@ export default function Layout({ children }: { children: React.ReactNode }) {
     };
 
     fetchUser();
-  }, [router]); // ✅ Hapus dependency pada authStore.user
+  }, [router]); // ✅ Only depend on router
+
+  const getRedirectPath = (roleId: number): string => {
+    switch (roleId) {
+      case 0: // DEVELOPER
+      case 1: // SUPERADMIN
+      case 2: // ADMIN_DESA
+        return '/admin/landing-page/profil/program-inovasi';
+      case 3: // ADMIN_KESEHATAN
+        return '/admin/kesehatan/posyandu';
+      case 4: // ADMIN_PENDIDIKAN
+        return '/admin/pendidikan/info-sekolah/jenjang-pendidikan';
+      default:
+        return '/admin';
+    }
+  };
 
   if (loading) {
     return (
@@ -104,7 +525,6 @@ export default function Layout({ children }: { children: React.ReactNode }) {
     );
   }
 
-  // ✅ Ambil menu berdasarkan roleId dan menuIds
   const currentNav = authStore.user
     ? getNavbar({ roleId: authStore.user.roleId, menuIds: authStore.user.menuIds })
     : [];
@@ -112,30 +532,26 @@ export default function Layout({ children }: { children: React.ReactNode }) {
   const handleLogout = async () => {
     try {
       setIsLoggingOut(true);
-      
-      // ✅ Panggil API logout untuk clear session di server
-      const response = await fetch('/api/auth/logout', { method: 'POST' });
+
+      const response = await fetch('/api/auth/logout', { 
+        method: 'POST',
+        credentials: 'include' // ✅ ADD credentials
+      });
       const result = await response.json();
-      
+
       if (result.success) {
-        // Clear user data dari store
         authStore.setUser(null);
-        
-        // Clear localStorage
         localStorage.removeItem('auth_nomor');
         localStorage.removeItem('auth_kodeId');
-        
-        // Force reload untuk reset semua state
+        localStorage.removeItem('auth_username');
         window.location.href = '/login';
       } else {
         console.error('Logout failed:', result.message);
-        // Tetap redirect meskipun gagal
         authStore.setUser(null);
         window.location.href = '/login';
       }
     } catch (error) {
       console.error('Error during logout:', error);
-      // Tetap clear store dan redirect jika error
       authStore.setUser(null);
       window.location.href = '/login';
     } finally {
@@ -157,6 +573,7 @@ export default function Layout({ children }: { children: React.ReactNode }) {
       }}
       padding="md"
     >
+      {/* ... rest of your JSX (Header, Navbar, Main) sama seperti sebelumnya ... */}
       <AppShellHeader
         style={{
           background: "linear-gradient(90deg, #ffffff, #f9fbff)",
@@ -175,16 +592,9 @@ export default function Layout({ children }: { children: React.ReactNode }) {
               h={{ base: 32, sm: 40 }}
               radius="md"
               loading="lazy"
-              style={{
-                minWidth: '32px',
-                height: 'auto',
-              }}
+              style={{ minWidth: '32px', height: 'auto' }}
             />
-            <Text
-              fw={700}
-              c={colors["blue-button"]}
-              fz={{ base: 'md', sm: 'xl' }}
-            >
+            <Text fw={700} c={colors["blue-button"]} fz={{ base: 'md', sm: 'xl' }}>
               Admin Darmasaba
             </Text>
           </Flex>
@@ -192,63 +602,22 @@ export default function Layout({ children }: { children: React.ReactNode }) {
           <Group gap="xs">
             {!desktopOpened && (
               <Tooltip label="Buka Navigasi" position="bottom" withArrow>
-                <ActionIcon
-                  variant="light"
-                  radius="xl"
-                  size="lg"
-                  onClick={toggleDesktop}
-                  color={colors["blue-button"]}
-                >
+                <ActionIcon variant="light" radius="xl" size="lg" onClick={toggleDesktop} color={colors["blue-button"]}>
                   <IconChevronRight />
                 </ActionIcon>
               </Tooltip>
             )}
 
-            <Burger
-              opened={opened}
-              onClick={toggle}
-              hiddenFrom="sm"
-              size="md"
-              color={colors["blue-button"]}
-              mr="xs"
-            />
+            <Burger opened={opened} onClick={toggle} hiddenFrom="sm" size="md" color={colors["blue-button"]} mr="xs" />
 
             <Tooltip label="Kembali ke Website Desa" position="bottom" withArrow>
-              <ActionIcon
-                onClick={() => {
-                  router.push("/darmasaba");
-                }}
-                color={colors["blue-button"]}
-                radius="xl"
-                size="lg"
-                variant="gradient"
-                gradient={{ from: colors["blue-button"], to: "#228be6" }}
-              >
-                <Image
-                  src="/assets/images/darmasaba-icon.png"
-                  alt="Logo Darmasaba"
-                  w={20}
-                  h={20}
-                  radius="md"
-                  loading="lazy"
-                  style={{
-                    minWidth: '20px',
-                    height: 'auto',
-                  }}
-                />
+              <ActionIcon onClick={() => router.push("/darmasaba")} color={colors["blue-button"]} radius="xl" size="lg" variant="gradient" gradient={{ from: colors["blue-button"], to: "#228be6" }}>
+                <Image src="/assets/images/darmasaba-icon.png" alt="Logo Darmasaba" w={20} h={20} radius="md" loading="lazy" style={{ minWidth: '20px', height: 'auto' }} />
               </ActionIcon>
             </Tooltip>
+
             <Tooltip label="Keluar" position="bottom" withArrow>
-              <ActionIcon
-                onClick={handleLogout}
-                color={colors["blue-button"]}
-                radius="xl"
-                size="lg"
-                variant="gradient"
-                gradient={{ from: colors["blue-button"], to: "#228be6" }}
-                loading={isLoggingOut}
-                disabled={isLoggingOut}
-              >
+              <ActionIcon onClick={handleLogout} color={colors["blue-button"]} radius="xl" size="lg" variant="gradient" gradient={{ from: colors["blue-button"], to: "#228be6" }} loading={isLoggingOut} disabled={isLoggingOut}>
                 <IconLogout2 size={22} />
               </ActionIcon>
             </Tooltip>
@@ -256,75 +625,17 @@ export default function Layout({ children }: { children: React.ReactNode }) {
         </Group>
       </AppShellHeader>
 
-      <AppShellNavbar
-        component={ScrollArea}
-        style={{
-          background: "#ffffff",
-          borderRight: `1px solid ${colors["blue-button"]}20`,
-        }}
-        p={{ base: 'xs', sm: 'sm' }}
-      >
+      <AppShellNavbar component={ScrollArea} style={{ background: "#ffffff", borderRight: `1px solid ${colors["blue-button"]}20` }} p={{ base: 'xs', sm: 'sm' }}>
+        {/* ... Navbar content sama seperti sebelumnya ... */}
         <AppShell.Section p="sm">
           {currentNav.map((v, k) => {
             const isParentActive = segments.includes(_.lowerCase(v.name));
-
             return (
-              <NavLink
-                key={k}
-                defaultOpened={isParentActive}
-                c={isParentActive ? colors["blue-button"] : "gray"}
-                label={
-                  <Text fw={isParentActive ? 600 : 400} fz="sm">
-                    {v.name}
-                  </Text>
-                }
-                style={{
-                  borderRadius: rem(10),
-                  marginBottom: rem(4),
-                  transition: "background 150ms ease",
-                }}
-                styles={{
-                  root: {
-                    '&:hover': {
-                      backgroundColor: 'rgba(25, 113, 194, 0.05)',
-                    },
-                  },
-                }}
-                variant="light"
-                active={isParentActive}
-              >
+              <NavLink key={k} defaultOpened={isParentActive} c={isParentActive ? colors["blue-button"] : "gray"} label={<Text fw={isParentActive ? 600 : 400} fz="sm">{v.name}</Text>} style={{ borderRadius: rem(10), marginBottom: rem(4), transition: "background 150ms ease" }} styles={{ root: { '&:hover': { backgroundColor: 'rgba(25, 113, 194, 0.05)' } } }} variant="light" active={isParentActive}>
                 {v.children.map((child, key) => {
-                  const isChildActive = segments.includes(
-                    _.lowerCase(child.name)
-                  );
-
+                  const isChildActive = segments.includes(_.lowerCase(child.name));
                   return (
-                    <NavLink
-                      key={key}
-                      href={child.path}
-                      c={isChildActive ? colors["blue-button"] : "gray"}
-                      label={
-                        <Text fw={isChildActive ? 600 : 400} fz="sm">
-                          {child.name}
-                        </Text>
-                      }
-                      styles={{
-                        root: {
-                          borderRadius: rem(8),
-                          marginBottom: rem(2),
-                          transition: 'background 150ms ease',
-                          padding: '6px 12px',
-                          '&:hover': {
-                            backgroundColor: isChildActive ? 'rgba(25, 113, 194, 0.15)' : 'rgba(25, 113, 194, 0.05)',
-                          },
-                          ...(isChildActive && {
-                            backgroundColor: 'rgba(25, 113, 194, 0.1)',
-                          }),
-                        },
-                      }}
-                      active={isChildActive}
-                      component={Link}
-                    />
+                    <NavLink key={key} href={child.path} c={isChildActive ? colors["blue-button"] : "gray"} label={<Text fw={isChildActive ? 600 : 400} fz="sm">{child.name}</Text>} styles={{ root: { borderRadius: rem(8), marginBottom: rem(2), transition: 'background 150ms ease', padding: '6px 12px', '&:hover': { backgroundColor: isChildActive ? 'rgba(25, 113, 194, 0.15)' : 'rgba(25, 113, 194, 0.05)' }, ...(isChildActive && { backgroundColor: 'rgba(25, 113, 194, 0.1)' }) } }} active={isChildActive} component={Link} />
                   );
                 })}
               </NavLink>
@@ -334,18 +645,8 @@ export default function Layout({ children }: { children: React.ReactNode }) {
 
         <AppShell.Section py="md">
           <Group justify="end" pr="sm">
-            <Tooltip
-              label={desktopOpened ? "Tutup Navigasi" : "Buka Navigasi"}
-              position="top"
-              withArrow
-            >
-              <ActionIcon
-                variant="light"
-                radius="xl"
-                size="lg"
-                onClick={toggleDesktop}
-                color={colors["blue-button"]}
-              >
+            <Tooltip label={desktopOpened ? "Tutup Navigasi" : "Buka Navigasi"} position="top" withArrow>
+              <ActionIcon variant="light" radius="xl" size="lg" onClick={toggleDesktop} color={colors["blue-button"]}>
                 <IconChevronLeft />
               </ActionIcon>
             </Tooltip>
@@ -353,12 +654,7 @@ export default function Layout({ children }: { children: React.ReactNode }) {
         </AppShell.Section>
       </AppShellNavbar>
 
-      <AppShellMain
-        style={{
-          background: "linear-gradient(180deg, #fdfdfd, #f6f9fc)",
-          minHeight: "100vh",
-        }}
-      >
+      <AppShellMain style={{ background: "linear-gradient(180deg, #fdfdfd, #f6f9fc)", minHeight: "100vh" }}>
         {children}
       </AppShellMain>
     </AppShell>

src/app/api/[[...slugs]]/_lib/desa/berita/del.ts

@@ -6,33 +6,24 @@ import path from "path";
 const beritaDelete = async (context: Context) => {
   const id = context.params?.id as string;
 
-  if (!id) {
-    return {
-      status: 400,
-      body: "ID tidak diberikan",
-    };
-  }
+  if (!id) return { status: 400, body: "ID tidak diberikan" };
 
   const berita = await prisma.berita.findUnique({
     where: { id },
-    include: {
-      image: true,
-      kategoriBerita: true, // pastikan relasi image sudah ada di prisma schema
-    },
+    include: { image: true, kategoriBerita: true },
   });
 
-  if (!berita) {
-    return {
-      status: 404,
-      body: "Berita tidak ditemukan",
-    };
-  }
+  if (!berita) return { status: 404, body: "Berita tidak ditemukan" };
 
-  // Hapus file gambar dari filesystem jika ada
+  // 1. HAPUS BERITA DULU
+  await prisma.berita.delete({ where: { id } });
+
+  // 2. BARU HAPUS FILE
   if (berita.image) {
     try {
       const filePath = path.join(berita.image.path, berita.image.name);
       await fs.unlink(filePath);
+
       await prisma.fileStorage.delete({
         where: { id: berita.image.id },
       });
@@ -41,15 +32,11 @@ const beritaDelete = async (context: Context) => {
     }
   }
 
-  // Hapus berita dari DB
-  await prisma.berita.delete({
-    where: { id },
-  });
-
   return {
     success: true,
     message: "Berita dan file terkait berhasil dihapus",
   };
 };
 
+
 export default beritaDelete;

src/app/api/[[...slugs]]/_lib/kesehatan/data_kesehatan_warga/fasilitas_kesehatan/create.ts

@@ -1,18 +1,16 @@
 import prisma from "@/lib/prisma";
 import { Context } from "elysia";
 
-type FasilitasKesehatanInput = {
-  name: string;
-  informasiUmum: { fasilitas: string; alamat: string; jamOperasional: string };
-  layananUnggulan: { content: string };
-  dokterdanTenagaMedis: { name: string; specialist: string; jadwal: string };
-  fasilitasPendukung: { content: string };
-  prosedurPendaftaran: { content: string };
-  tarifDanLayanan: { layanan: string; tarif: string };
-};
-
 const fasilitasKesehatanCreate = async (context: Context) => {
-  const body = await context.body as FasilitasKesehatanInput;
+  const body = (await context.body) as {
+    name: string;
+    informasiUmum: { fasilitas: string; alamat: string; jamOperasional: string };
+    layananUnggulan: { content: string };
+    dokterdanTenagaMedis: string[]; // ← ARRAY OF ID
+    fasilitasPendukung: { content: string };
+    prosedurPendaftaran: { content: string };
+    tarifDanLayanan: string[]; // ← ARRAY OF ID
+  };
 
   const {
     name,
@@ -24,25 +22,30 @@ const fasilitasKesehatanCreate = async (context: Context) => {
     tarifDanLayanan,
   } = body;
 
-  // Buat masing-masing relasi terlebih dahulu
-  const [createdInformasiUmum, createdLayananUnggulan, createdDokter, createdPendukung, createdProsedur, createdTarif] = await Promise.all([
-    prisma.informasiUmum.create({ data: informasiUmum }),
-    prisma.layananUnggulan.create({ data: layananUnggulan }),
-    prisma.dokterdanTenagaMedis.create({ data: dokterdanTenagaMedis }),
-    prisma.fasilitasPendukung.create({ data: fasilitasPendukung }),
-    prisma.prosedurPendaftaran.create({ data: prosedurPendaftaran }),
-    prisma.tarifDanLayanan.create({ data: tarifDanLayanan }),
-  ]);
+  // CREATE SINGLE DATA
+  const [createdInformasi, createdUnggulan, createdPendukung, createdProsedur] =
+    await Promise.all([
+      prisma.informasiUmum.create({ data: informasiUmum }),
+      prisma.layananUnggulan.create({ data: layananUnggulan }),
+      prisma.fasilitasPendukung.create({ data: fasilitasPendukung }),
+      prisma.prosedurPendaftaran.create({ data: prosedurPendaftaran }),
+    ]);
 
+  // ✅ CUKUP CONNECT KE ID YANG SUDAH ADA
   const fasilitas = await prisma.fasilitasKesehatan.create({
     data: {
       name,
-      informasiUmumId: createdInformasiUmum.id,
-      layananUnggulanId: createdLayananUnggulan.id,
-      dokterdanTenagaMedisId: createdDokter.id,
+      informasiUmumId: createdInformasi.id,
+      layananUnggulanId: createdUnggulan.id,
       fasilitasPendukungId: createdPendukung.id,
       prosedurPendaftaranId: createdProsedur.id,
-      tarifDanLayananId: createdTarif.id,
+
+      dokterdantenagamedis: {
+        connect: dokterdanTenagaMedis.map(id => ({ id })), // ← langsung dari input
+      },
+      tarifdanlayanan: {
+        connect: tarifDanLayanan.map(id => ({ id })), // ← langsung dari input
+      },
     },
     include: {
       informasiumum: true,

src/app/api/[[...slugs]]/_lib/kesehatan/data_kesehatan_warga/fasilitas_kesehatan/del.ts

@@ -2,42 +2,14 @@ import prisma from "@/lib/prisma";
 import { Context } from "elysia";
 
 const fasilitasKesehatanDelete = async (context: Context) => {
-    const id = context.params?.id as string;
+  const id = context.params?.id as string;
 
-    if (!id) {
-        return {
-            status: 400,
-            message: "ID tidak ditemukan",
-        }
-    }
+  const data = await prisma.fasilitasKesehatan.findUnique({ where: { id } });
+  if (!data) return { status: 404, message: "Data tidak ditemukan" };
 
-    const fasilitasKesehatan = await prisma.fasilitasKesehatan.findUnique({
-        where: { id },
-        include: {
-            informasiumum: true,
-            layananunggulan: true,
-            dokterdantenagamedis: true,
-            fasilitaspendukung: true,
-            prosedurpendaftaran: true,
-            tarifdanlayanan: true,
-        }
-    })
+  await prisma.fasilitasKesehatan.delete({ where: { id } });
 
-    if (!fasilitasKesehatan) {
-        return {
-            status: 404,
-            message: "Fasilitas kesehatan tidak ditemukan",
-        }
-    }
+  return { success: true, message: "Berhasil dihapus" };
+};
 
-    await prisma.fasilitasKesehatan.delete({
-        where: { id },
-    })
-
-    return {
-        status: 200,
-        success: true,
-        message: "Fasilitas kesehatan berhasil dihapus",
-    }
-}
-export default fasilitasKesehatanDelete
+export default fasilitasKesehatanDelete;

src/app/api/[[...slugs]]/_lib/kesehatan/data_kesehatan_warga/fasilitas_kesehatan/dokter-tenaga-medis/create.ts

@@ -5,6 +5,11 @@ type FormCreate = {
   name: string;
   specialist: string;
   jadwal: string;
+  jadwalLibur: string;
+  jamBukaOperasional: string;
+  jamTutupOperasional: string;
+  jamBukaLibur: string;
+  jamTutupLibur: string;
 };
 
 export default async function dokterTenagaMedisCreate(context: Context) {
@@ -15,11 +20,21 @@ export default async function dokterTenagaMedisCreate(context: Context) {
       name: body.name,
       specialist: body.specialist,
       jadwal: body.jadwal,
+      jadwalLibur: body.jadwalLibur,
+      jamBukaOperasional: body.jamBukaOperasional,
+      jamTutupOperasional: body.jamTutupOperasional,
+      jamBukaLibur: body.jamBukaLibur,
+      jamTutupLibur: body.jamTutupLibur,
     },
     select: {
       name: true,
       specialist: true,
       jadwal: true,
+      jadwalLibur: true,
+      jamBukaOperasional: true,
+      jamTutupOperasional: true,
+      jamBukaLibur: true,
+      jamTutupLibur: true,
     }
   });
 

src/app/api/[[...slugs]]/_lib/kesehatan/data_kesehatan_warga/fasilitas_kesehatan/dokter-tenaga-medis/findMany.ts

@@ -19,6 +19,7 @@ async function dokterTenagaMedisFindMany(context: Context) {
       { name: { contains: search, mode: 'insensitive' } },
       { specialist: { contains: search, mode: 'insensitive' } },
       { jadwal: { contains: search, mode: 'insensitive' } },
+      { jadwalLibur: { contains: search, mode: 'insensitive' } },
     ];
   }
 

src/app/api/[[...slugs]]/_lib/kesehatan/data_kesehatan_warga/fasilitas_kesehatan/dokter-tenaga-medis/index.ts

@@ -19,6 +19,11 @@ const DokterTenagaMedis = new Elysia({
             name: t.String(),
             specialist: t.String(),
             jadwal: t.String(),
+            jadwalLibur: t.String(),
+            jamBukaOperasional: t.String(),
+            jamTutupOperasional: t.String(),
+            jamBukaLibur: t.String(),
+            jamTutupLibur: t.String(),
         }),
     })
     .put("/:id", dokterTenagaMedisUpdate, {
@@ -26,6 +31,11 @@ const DokterTenagaMedis = new Elysia({
             name: t.String(),
             specialist: t.String(),
             jadwal: t.String(),
+            jadwalLibur: t.String(),
+            jamBukaOperasional: t.String(),
+            jamTutupOperasional: t.String(),
+            jamBukaLibur: t.String(),
+            jamTutupLibur: t.String(),
         }),
     })
     .delete("/del/:id", dokterTenagaMedisDelete)

src/app/api/[[...slugs]]/_lib/kesehatan/data_kesehatan_warga/fasilitas_kesehatan/dokter-tenaga-medis/updt.ts

@@ -5,6 +5,11 @@ type FormUpdate = {
     name: string;
     specialist: string;
     jadwal: string;
+    jadwalLibur: string;
+    jamBukaOperasional: string;
+    jamTutupOperasional: string;
+    jamBukaLibur: string;
+    jamTutupLibur: string;
 }
 
 export default async function dokterTenagaMedisUpdate(context: Context) {
@@ -18,6 +23,12 @@ export default async function dokterTenagaMedisUpdate(context: Context) {
                 name: body.name,
                 specialist: body.specialist,
                 jadwal: body.jadwal,
+                jadwalLibur: body.jadwalLibur,
+                jamBukaOperasional: body.jamBukaOperasional,
+                jamTutupOperasional: body.jamTutupOperasional,
+                jamBukaLibur: body.jamBukaLibur,
+                jamTutupLibur: body.jamTutupLibur,
+                
             },
         });
         return {

src/app/api/[[...slugs]]/_lib/kesehatan/data_kesehatan_warga/fasilitas_kesehatan/index.ts

@@ -1,6 +1,6 @@
 import { Elysia, t } from "elysia";
 import fasilitasKesehatanCreate from "./create";
-import findManyFasilitasKesehatan from "./findMany";
+import fasilitasKesehatanFindMany from "./findMany";
 import findUniqueFasilitasKesehatan from "./findUnique";
 import fasilitasKesehatanUpdate from "./updt";
 import fasilitasKesehatanDelete from "./del";
@@ -9,42 +9,61 @@ const FasilitasKesehatan = new Elysia({
   prefix: "fasilitas-kesehatan",
   tags: ["Kesehatan/Fasilitas Kesehatan"],
 })
+
+  // ==========================
+  //        CREATE
+  // ==========================
   .post("/create", fasilitasKesehatanCreate, {
     body: t.Object({
       name: t.String(),
+
       informasiUmum: t.Object({
         fasilitas: t.String(),
         alamat: t.String(),
         jamOperasional: t.String(),
       }),
+
       layananUnggulan: t.Object({
         content: t.String(),
       }),
-      dokterdanTenagaMedis: t.Object({
-        name: t.String(),
-        specialist: t.String(),
-        jadwal: t.String(),
-      }),
+
+      dokterdanTenagaMedis: t.Array(t.String()), // FIX karena create pakai array of string
+
       fasilitasPendukung: t.Object({
         content: t.String(),
       }),
+
       prosedurPendaftaran: t.Object({
         content: t.String(),
       }),
-      tarifDanLayanan: t.Object({
-        layanan: t.String(),
-        tarif: t.String(),
-      }),
+
+      tarifDanLayanan: t.Array(t.String()), // FIX karena create pakai array of string
     }),
   })
-  .get("/find-many", findManyFasilitasKesehatan)
+
+  // ==========================
+  //        FIND MANY
+  // ==========================
+  .get("/find-many", fasilitasKesehatanFindMany)
+
+  // ==========================
+  //        DELETE
+  // ==========================
   .delete("/del/:id", fasilitasKesehatanDelete)
+
+  // ==========================
+  //        FIND UNIQUE
+  // ==========================
   .get("/:id", async (context) => {
     const response = await findUniqueFasilitasKesehatan(
       new Request(context.request)
     );
     return response;
   })
+
+  // ==========================
+  //        UPDATE
+  // ==========================
   .put(
     "/:id",
     async (context) => {
@@ -54,29 +73,30 @@ const FasilitasKesehatan = new Elysia({
     {
       body: t.Object({
         name: t.String(),
+
         informasiUmum: t.Object({
           fasilitas: t.String(),
           alamat: t.String(),
           jamOperasional: t.String(),
         }),
+
         layananUnggulan: t.Object({
           content: t.String(),
         }),
-        dokterdanTenagaMedis: t.Object({
-          name: t.String(),
-          specialist: t.String(),
-          jadwal: t.String(),
-        }),
+
+        // FIX → harus array of string (ID dokter)
+        dokterdanTenagaMedis: t.Array(t.String()),
+
         fasilitasPendukung: t.Object({
           content: t.String(),
         }),
+
         prosedurPendaftaran: t.Object({
           content: t.String(),
         }),
-        tarifDanLayanan: t.Object({
-          layanan: t.String(),
-          tarif: t.String(),
-        }),
+
+        // FIX → harus array of string (ID tarif)
+        tarifDanLayanan: t.Array(t.String()),
       }),
     }
   );

src/app/api/[[...slugs]]/_lib/kesehatan/data_kesehatan_warga/fasilitas_kesehatan/tarif-layanan/create.ts

@@ -0,0 +1,28 @@
+import prisma from "@/lib/prisma";
+import { Context } from "elysia";
+
+type FormCreate = {
+  layanan: string;
+  tarif: string;
+};
+
+export default async function tarifLayananCreate(context: Context) {
+  const body = context.body as FormCreate;
+
+  const created = await prisma.tarifDanLayanan.create({
+    data: {
+      layanan: body.layanan,
+      tarif: body.tarif,
+    },
+    select: {
+      layanan: true,
+      tarif: true,
+    }
+  });
+
+  return {
+    success: true,
+    message: "Sukses menambahkan dokter tenaga medis",
+    data: created,
+  };
+}

src/app/api/[[...slugs]]/_lib/kesehatan/data_kesehatan_warga/fasilitas_kesehatan/tarif-layanan/del.ts

@@ -0,0 +1,37 @@
+import prisma from "@/lib/prisma";
+import { Context } from "elysia";
+
+export default async function tarifLayananDelete(context: Context) {
+
+  const id = context.params?.id;
+
+  if (!id) {
+    return {
+      success: false,
+      message: "ID tidak ditemukan",
+    };
+  }
+
+  const existing = await prisma.tarifDanLayanan.findUnique({
+    where: {
+      id: id,
+    },
+  });
+
+  if (!existing) {
+    return {
+      success: false,
+      message: "Data tidak ditemukan",
+    };
+  }
+
+  const deleted = await prisma.tarifDanLayanan.delete({
+    where: { id },
+  });
+
+  return {
+    success: true,
+    message: "Data berhasil dihapus",
+    data: deleted,
+  };
+}

src/app/api/[[...slugs]]/_lib/kesehatan/data_kesehatan_warga/fasilitas_kesehatan/tarif-layanan/findMany.ts

@@ -0,0 +1,54 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+// /api/berita/findManyPaginated.ts
+import prisma from "@/lib/prisma";
+import { Context } from "elysia";
+
+async function tarifLayananFindMany(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 = [
+      { layanan: { contains: search, mode: 'insensitive' } },
+      { tarif: { contains: search, mode: 'insensitive' } },
+    ];
+  }
+
+  try {
+    // Ambil data dan total count secara paralel
+    const [data, total] = await Promise.all([
+      prisma.tarifDanLayanan.findMany({
+        where,
+        skip,
+        take: limit,
+        orderBy: { layanan: 'asc' },
+      }),
+      prisma.tarifDanLayanan.count({ where }),
+    ]);
+
+    return {
+      success: true,
+      message: "Berhasil ambil data tarif layanan 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 tarif layanan",
+    };
+  }
+}
+
+export default tarifLayananFindMany;

src/app/api/[[...slugs]]/_lib/kesehatan/data_kesehatan_warga/fasilitas_kesehatan/tarif-layanan/findUnique.ts

@@ -0,0 +1,47 @@
+import prisma from "@/lib/prisma";
+
+export default async function tarifLayananFindUnique(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 boleh kosong',
+        }, {status: 400})
+    }
+
+    try {
+        if (typeof id !== 'string') {
+            return Response.json({
+                success: false,
+                message: "ID tidak valid",
+            }, { status: 400 });
+        }
+
+        const data = await prisma.tarifDanLayanan.findUnique({
+            where: { id },
+        });
+
+        if (!data) {
+            return Response.json({
+                success: false,
+                message: "Data tidak ditemukan",
+            }, { status: 404 });
+        }
+
+        return Response.json({
+            success: true,
+            message: "Berhasil mengambil data berdasarkan ID",
+            data,
+        }, { status: 200 });
+    } catch (error) {
+        console.error("Error fetching data:", error);
+        return Response.json({
+            success: false,
+            message: "Terjadi kesalahan saat mengambil data",
+        }, { status: 500 });
+    }
+}

src/app/api/[[...slugs]]/_lib/kesehatan/data_kesehatan_warga/fasilitas_kesehatan/tarif-layanan/index.ts

@@ -0,0 +1,30 @@
+import Elysia, { t } from "elysia";
+import tarifLayananCreate from "./create";
+import tarifLayananFindMany from "./findMany";
+import tarifLayananFindUnique from "./findUnique";
+import tarifLayananDelete from "./del";
+import tarifLayananUpdate from "./updt";
+
+const TarifLayanan = new Elysia({
+    prefix: "/tarifdanlayanan",
+    tags: ["Data Kesehatan/Fasilitas Kesehatan/Tarif Layanan"]
+})
+    .get("/:id", async (context) => {
+        const response = await tarifLayananFindUnique(new Request(context.request));
+        return response;
+    })
+    .get("/findMany", tarifLayananFindMany)
+    .post("/create", tarifLayananCreate, {
+        body: t.Object({
+            tarif: t.String(),
+            layanan: t.String()
+        }),
+    })
+    .put("/:id", tarifLayananUpdate, {
+        body: t.Object({
+            tarif: t.String(),
+            layanan: t.String(),
+        }),
+    })
+    .delete("/del/:id", tarifLayananDelete)
+export default TarifLayanan

src/app/api/[[...slugs]]/_lib/kesehatan/data_kesehatan_warga/fasilitas_kesehatan/tarif-layanan/updt.ts

@@ -0,0 +1,32 @@
+import prisma from "@/lib/prisma";
+import { Context } from "elysia";
+
+type FormUpdate = {
+  layanan: string;
+  tarif: string;
+};
+
+export default async function tarifLayananUpdate(context: Context) {
+  const body = (await context.body) as FormUpdate;
+  const id = context.params.id as string;
+
+  try {
+    const result = await prisma.tarifDanLayanan.update({
+      where: { id },
+      data: {
+        layanan: body.layanan,
+        tarif: body.tarif,
+      },
+    });
+    return {
+      success: true,
+      message: "Berhasil mengupdate data tarif layanan",
+      data: result,
+    };
+  } catch (error) {
+    console.error("Error updating data tarif layanan:", error);
+    throw new Error(
+      "Gagal mengupdate data tarif layanan: " + (error as Error).message
+    );
+  }
+}

src/app/api/[[...slugs]]/_lib/kesehatan/data_kesehatan_warga/fasilitas_kesehatan/updt.ts

@@ -5,32 +5,26 @@ type FasilitasKesehatanInput = {
   name: string;
   informasiUmum: { fasilitas: string; alamat: string; jamOperasional: string };
   layananUnggulan: { content: string };
-  dokterdanTenagaMedis: { name: string; specialist: string; jadwal: string };
+  dokterdanTenagaMedis: string[]; // ← ID saja
   fasilitasPendukung: { content: string };
   prosedurPendaftaran: { content: string };
-  tarifDanLayanan: { layanan: string; tarif: string };
+  tarifDanLayanan: string[]; // ← ID saja
 };
 
 const fasilitasKesehatanUpdate = async (context: Context) => {
   const id = context.params?.id as string;
-  const body = await context.body as FasilitasKesehatanInput;
-
-  if (!id) {
-    return new Response(
-      JSON.stringify({ success: false, message: "ID is required" }),
-      { status: 400, headers: { "Content-Type": "application/json" } }
-    );
-  }
+  const body = (await context.body) as FasilitasKesehatanInput;
 
   const existing = await prisma.fasilitasKesehatan.findUnique({
     where: { id },
+    include: {
+      dokterdantenagamedis: true,
+      tarifdanlayanan: true,
+    },
   });
 
   if (!existing) {
-    return new Response(
-      JSON.stringify({ success: false, message: "Data not found" }),
-      { status: 404, headers: { "Content-Type": "application/json" } }
-    );
+    return { success: false, message: "Data tidak ditemukan" };
   }
 
   const {
@@ -43,38 +37,46 @@ const fasilitasKesehatanUpdate = async (context: Context) => {
     tarifDanLayanan,
   } = body;
 
-  // Update data masing-masing relasi
+  // update relasi 1-1
   await Promise.all([
     prisma.informasiUmum.update({
       where: { id: existing.informasiUmumId },
       data: informasiUmum,
     }),
+
     prisma.layananUnggulan.update({
       where: { id: existing.layananUnggulanId },
       data: layananUnggulan,
     }),
-    prisma.dokterdanTenagaMedis.update({
-      where: { id: existing.dokterdanTenagaMedisId },
-      data: dokterdanTenagaMedis,
-    }),
+
     prisma.fasilitasPendukung.update({
       where: { id: existing.fasilitasPendukungId },
       data: fasilitasPendukung,
     }),
+
     prisma.prosedurPendaftaran.update({
       where: { id: existing.prosedurPendaftaranId },
       data: prosedurPendaftaran,
     }),
-    prisma.tarifDanLayanan.update({
-      where: { id: existing.tarifDanLayananId },
-      data: tarifDanLayanan,
-    }),
   ]);
 
-  // Update main record
+  // update m2m
   const updated = await prisma.fasilitasKesehatan.update({
     where: { id },
-    data: { name },
+
+    data: {
+      name,
+
+      // reset dokter lama → ganti baru
+      dokterdantenagamedis: {
+        set: dokterdanTenagaMedis.map((id) => ({ id })),
+      },
+
+      tarifdanlayanan: {
+        set: tarifDanLayanan.map((id) => ({ id })),
+      },
+    },
+
     include: {
       informasiumum: true,
       layananunggulan: true,
@@ -87,7 +89,7 @@ const fasilitasKesehatanUpdate = async (context: Context) => {
 
   return {
     success: true,
-    message: "Fasilitas berhasil diupdate",
+    message: "Fasilitas diupdate",
     data: updated,
   };
 };

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

@@ -20,6 +20,7 @@ import Kelahiran from "./data_kesehatan_warga/persentase_kelahiran_kematian/kela
 import Kematian from "./data_kesehatan_warga/persentase_kelahiran_kematian/kematian";
 import DokterTenagaMedis from "./data_kesehatan_warga/fasilitas_kesehatan/dokter-tenaga-medis";
 import PendaftaranJadwalKegiatan from "./data_kesehatan_warga/jadwal_kegiatan/pendaftaran";
+import TarifLayanan from "./data_kesehatan_warga/fasilitas_kesehatan/tarif-layanan";
 
 
 const Kesehatan = new Elysia({
@@ -46,5 +47,6 @@ const Kesehatan = new Elysia({
 .use(Kelahiran)
 .use(Kematian)
 .use(DokterTenagaMedis)
+.use(TarifLayanan)
 .use(PendaftaranJadwalKegiatan)
 export default Kesehatan;

src/app/api/[[...slugs]]/_lib/landing_page/profile/media-sosial/create.ts

@@ -5,6 +5,7 @@ type FormCreate = {
   name: string;
   imageId: string;
   iconUrl: string;
+  icon: string;
 };
 
 export default async function mediaSosialCreate(context: Context) {
@@ -14,8 +15,9 @@ export default async function mediaSosialCreate(context: Context) {
     const result = await prisma.mediaSosial.create({
       data: {
         name: body.name,
-        imageId: body.imageId,
+        imageId: body.imageId || null,
         iconUrl: body.iconUrl,
+        icon: body.icon || null,
       },
       include: {
         image: true,
@@ -29,8 +31,6 @@ export default async function mediaSosialCreate(context: Context) {
     };
   } catch (error) {
     console.error("Error creating media sosial:", error);
-    throw new Error(
-      "Gagal membuat media sosial: " + (error as Error).message
-    );
+    throw new Error("Gagal membuat media sosial: " + (error as Error).message);
   }
 }

src/app/api/[[...slugs]]/_lib/landing_page/profile/media-sosial/index.ts

@@ -20,8 +20,9 @@ const MediaSosial = new Elysia({
   .post("/create", MediaSosialCreate, {
     body: t.Object({
       name: t.String(),
-      imageId: t.String(),
-      iconUrl: t.String(),
+      imageId: t.Union([t.String(), t.Null()]),
+      iconUrl: t.Union([t.String(), t.Null()]),
+      icon: t.Union([t.String(), t.Null()]),
     }),
   })
 
@@ -29,8 +30,9 @@ const MediaSosial = new Elysia({
   .put("/:id", MediaSosialUpdate, {
     body: t.Object({
       name: t.String(),
-      imageId: t.Optional(t.String()),
-      iconUrl: t.Optional(t.String()),
+      imageId: t.Optional(t.Union([t.String(), t.Null()])),
+      iconUrl: t.Optional(t.Union([t.String(), t.Null()])),
+      icon: t.Optional(t.Union([t.String(), t.Null()])),
     }),
   })
   // ✅ Delete

src/app/api/[[...slugs]]/_lib/landing_page/profile/media-sosial/updt.ts

@@ -6,6 +6,7 @@ type FormUpdateMediaSosial = {
   name?: string;
   imageId?: string;
   iconUrl?: string;
+  icon?: string;
 };
 
 export default async function mediaSosialUpdate(context: Context) {
@@ -20,13 +21,29 @@ export default async function mediaSosialUpdate(context: Context) {
     };
   }
 
+  // 🚨 Tambahkan validasi di sini
+  if (!body.name || body.name.trim().length < 3) {
+    return {
+      success: false,
+      message: "Nama media sosial minimal 3 karakter",
+    };
+  }
+
+  if (!body.iconUrl || body.iconUrl.trim().length < 3) {
+    return {
+      success: false,
+      message: "Icon URL minimal 3 karakter",
+    };
+  }
+
   try {
     const updated = await prisma.mediaSosial.update({
       where: { id },
       data: {
         name: body.name,
-        imageId: body.imageId,
+        imageId: body.imageId || null, // pastikan null jika kosong
         iconUrl: body.iconUrl,
+        icon: body.icon || null, // pastikan null jika kosong
       },
       include: {
         image: true,

src/app/api/[[...slugs]]/_lib/ppid/permohonan_informasi_publik/create.ts

@@ -3,39 +3,55 @@ import { Prisma } from "@prisma/client";
 import { Context } from "elysia";
 
 type FormCreate = Prisma.PermohonanInformasiPublikGetPayload<{
-    select: {
-        name: true;
-        nik: true;
-        email: true;
-        notelp: true;
-        alamat: true;
-        jenisInformasiDimintaId: true;
-        caraMemperolehInformasiId: true;
-        caraMemperolehSalinanInformasiId: true;
-    }
-}>
-export default async function permohonanInformasiPublikCreate(context: Context) {
-    const body = context.body as FormCreate;
-    
-    await prisma.permohonanInformasiPublik.create({
-        data: {
-            name: body.name,
-            nik: body.nik,
-            email: body.email,
-            notelp: body.notelp,
-            alamat: body.alamat,
-            jenisInformasiDimintaId: body.jenisInformasiDimintaId,
-            caraMemperolehInformasiId: body.caraMemperolehInformasiId,
-            caraMemperolehSalinanInformasiId: body.caraMemperolehSalinanInformasiId,
-        }
-    })
+  select: {
+    name: true;
+    nik: true;
+    email: true;
+    notelp: true;
+    alamat: true;
+    jenisInformasiDimintaId: true;
+    caraMemperolehInformasiId: true;
+    caraMemperolehSalinanInformasiId: true;
+  };
+}>;
 
+export default async function permohonanInformasiPublikCreate(context: Context) {
+  const body = context.body as FormCreate;
+
+  // ========== VALIDASI NIK ==========
+  if (body.nik && body.nik.length > 16) {
     return {
-        success: true,
-        message: "Permohonan Informasi Publik Berhasil Dibuat",
-        data: {
-            ...body,
-        }
-    }
+      success: false,
+      status: 400,
+      message: "Maksimal NIK adalah 16 angka",
+    };
+  }
+
+  // ========== VALIDASI NOMOR TELEPON ==========
+  if (body.notelp && body.notelp.length > 15) {
+    return {
+      success: false,
+      status: 400,
+      message: "Maksimal nomor telepon adalah 15 angka",
+    };
+  }
+
+  await prisma.permohonanInformasiPublik.create({
+    data: {
+      name: body.name,
+      nik: body.nik,
+      email: body.email,
+      notelp: body.notelp,
+      alamat: body.alamat,
+      jenisInformasiDimintaId: body.jenisInformasiDimintaId,
+      caraMemperolehInformasiId: body.caraMemperolehInformasiId,
+      caraMemperolehSalinanInformasiId: body.caraMemperolehSalinanInformasiId,
+    },
+  });
+
+  return {
+    success: true,
+    message: "Permohonan Informasi Publik Berhasil Dibuat",
+    data: { ...body },
+  };
 }
-    

src/app/api/[[...slugs]]/_lib/ppid/permohonan_keberatan_informasi_publik/create.ts

@@ -3,31 +3,42 @@ import { Prisma } from "@prisma/client";
 import { Context } from "elysia";
 
 type FormCreate = Prisma.FormulirPermohonanKeberatanGetPayload<{
-    select: {
-        name: true;
-        email: true;
-        notelp: true;
-        alasan: true;
-    }
-}>
+  select: {
+    name: true;
+    email: true;
+    notelp: true;
+    alasan: true;
+  };
+}>;
 
-export default async function permohonanKeberatanInformasiPublikCreate(context: Context) {
-    const body = context.body as FormCreate;
-
-    await prisma.formulirPermohonanKeberatan.create({
-        data: {
-            name: body.name,
-            email: body.email,
-            notelp: body.notelp,
-            alasan: body.alasan,
-        }
-    })
+export default async function permohonanKeberatanInformasiPublikCreate(
+  context: Context
+) {
+  const body = context.body as FormCreate;
 
+  // ========== VALIDASI NOMOR TELEPON ==========
+  if (body.notelp && body.notelp.length > 15) {
     return {
-        success: true,
-        message: "Permohonan Keberatan Informasi Publik Berhasil Dibuat",
-        data: {
-            ...body,
-        }
-    }
-}
+      success: false,
+      status: 400,
+      message: "Maksimal nomor telepon adalah 15 angka",
+    };
+  }
+
+  await prisma.formulirPermohonanKeberatan.create({
+    data: {
+      name: body.name,
+      email: body.email,
+      notelp: body.notelp,
+      alasan: body.alasan,
+    },
+  });
+
+  return {
+    success: true,
+    message: "Permohonan Keberatan Informasi Publik Berhasil Dibuat",
+    data: {
+      ...body,
+    },
+  };
+}

src/app/api/[[...slugs]]/_lib/search/findMany.ts

@@ -557,25 +557,37 @@ export default async function searchFindMany(context: Context) {
           ],
         },
         layananunggulan: { content: { contains: query, mode: "insensitive" } },
-        dokterdantenagamedis: {
-          OR: [
-            { name: { contains: query, mode: "insensitive" } },
-            { specialist: { contains: query, mode: "insensitive" } },
-            { jadwal: { contains: query, mode: "insensitive" } },
-          ],
-        },
+
         fasilitaspendukung: {
           content: { contains: query, mode: "insensitive" },
         },
         prosedurpendaftaran: {
           content: { contains: query, mode: "insensitive" },
         },
-        tarifdanlayanan: {
-          OR: [
-            { layanan: { contains: query, mode: "insensitive" } },
-            { tarif: { contains: query, mode: "insensitive" } },
-          ],
-        },
+      },
+      skip,
+      take: limitNum,
+    });
+    return { data, nextPage: data.length < limitNum ? null : pageNum + 1 };
+  }
+
+  if (type === "doktertenagamedis") {
+    const data = await prisma.dokterdanTenagaMedis.findMany({
+      where: {
+        name: { contains: query, mode: "insensitive" },
+        specialist: { contains: query, mode: "insensitive" },
+      },
+      skip,
+      take: limitNum,
+    });
+    return { data, nextPage: data.length < limitNum ? null : pageNum + 1 };
+  }
+
+  if (type === "tarifdanlayanan") {
+    const data = await prisma.tarifDanLayanan.findMany({
+      where: {
+        layanan: { contains: query, mode: "insensitive" },
+        tarif: { contains: query, mode: "insensitive" },
       },
       skip,
       take: limitNum,
@@ -1567,6 +1579,8 @@ export default async function searchFindMany(context: Context) {
     jenisProgramYangDiselenggarakan,
     dataPerpustakaan,
     dataPendidikan,
+    dokterDanTenagaMedis,
+    tarifDanLayanan 
   ] = await Promise.all([
     prisma.pejabatDesa.findMany({
       where: { name: { contains: query, mode: "insensitive" } },
@@ -1894,25 +1908,27 @@ export default async function searchFindMany(context: Context) {
           ],
         },
         layananunggulan: { content: { contains: query, mode: "insensitive" } },
-        dokterdantenagamedis: {
-          OR: [
-            { name: { contains: query, mode: "insensitive" } },
-            { specialist: { contains: query, mode: "insensitive" } },
-            { jadwal: { contains: query, mode: "insensitive" } },
-          ],
-        },
+
         fasilitaspendukung: {
           content: { contains: query, mode: "insensitive" },
         },
         prosedurpendaftaran: {
           content: { contains: query, mode: "insensitive" },
         },
-        tarifdanlayanan: {
-          OR: [
-            { layanan: { contains: query, mode: "insensitive" } },
-            { tarif: { contains: query, mode: "insensitive" } },
-          ],
-        },
+      },
+      take: limitNum,
+    }),
+    prisma.dokterdanTenagaMedis.findMany({
+      where: {
+        name: { contains: query, mode: "insensitive" },
+        specialist: { contains: query, mode: "insensitive" },
+      },
+      take: limitNum,
+    }),
+    prisma.tarifDanLayanan.findMany({
+      where: {
+        tarif: { contains: query, mode: "insensitive" },
+        layanan: { contains: query, mode: "insensitive" },
       },
       take: limitNum,
     }),
@@ -2316,7 +2332,7 @@ export default async function searchFindMany(context: Context) {
           { judul: { contains: query, mode: "insensitive" } },
           { deskripsiSingkat: { contains: query, mode: "insensitive" } },
           { deskripsiLengkap: { contains: query, mode: "insensitive" } },
-           { lokasi: { contains: query, mode: "insensitive" } },
+          { lokasi: { contains: query, mode: "insensitive" } },
           {
             kategoriKegiatan: {
               nama: { contains: query, mode: "insensitive" },
@@ -2559,6 +2575,8 @@ export default async function searchFindMany(context: Context) {
       ...penghargaan.map((b) => ({ type: "penghargaan", ...b })),
       ...posyandu.map((b) => ({ type: "posyandu", ...b })),
       ...fasilitasKesehatan.map((b) => ({ type: "fasilitasKesehatan", ...b })),
+      ...dokterDanTenagaMedis.map((b) => ({ type: "dokterdanTenagaMedis", ...b })),
+      ...tarifDanLayanan.map((b) => ({ type: "tarifDanLayanan", ...b })),
       ...jadwalKegiatan.map((b) => ({ type: "jadwalKegiatan", ...b })),
       ...artikelKesehatan.map((b) => ({ type: "artikelKesehatan", ...b })),
       ...puskesmas.map((b) => ({ type: "puskesmas", ...b })),

src/app/api/[[...slugs]]/_lib/user/updt.ts

@@ -23,7 +23,7 @@ export default async function userUpdate(context: Context) {
 
     const currentUser = await prisma.user.findUnique({
       where: { id },
-      select: { roleId: true, isActive: true }
+      select: { roleId: true, isActive: true },
     });
 
     if (!currentUser) {
@@ -31,7 +31,15 @@ export default async function userUpdate(context: Context) {
     }
 
     const isRoleChanged = roleId && currentUser.roleId !== roleId;
-    const isActiveChanged = isActive !== undefined && currentUser.isActive !== isActive;
+    const isActiveChanged =
+      isActive !== undefined && currentUser.isActive !== isActive;
+
+    // ✅ Jika role berubah, hapus semua akses menu yang ada
+    if (isRoleChanged) {
+      await prisma.userMenuAccess.deleteMany({
+        where: { userId: id }
+      });
+    }
 
     // Update user
     const updatedUser = await prisma.user.update({
@@ -48,10 +56,11 @@ export default async function userUpdate(context: Context) {
         nomor: true,
         isActive: true,
         roleId: true,
-        role: { select: { name: true } }
-      }
+        role: { select: { name: true } },
+      },
     });
 
+    
     // ✅ HAPUS SEMUA SESI USER DI DATABASE
     if (isRoleChanged) {
       await prisma.userSession.deleteMany({ where: { userId: id } });
@@ -62,11 +71,13 @@ export default async function userUpdate(context: Context) {
       roleChanged: isRoleChanged,
       isActiveChanged,
       data: updatedUser,
-      message: isRoleChanged 
+      message: isRoleChanged
         ? `Role ${updatedUser.username} diubah. User akan logout otomatis.`
         : isActiveChanged
-        ? `${updatedUser.username} ${isActive ? 'diaktifkan' : 'dinonaktifkan'}.`
-        : "User berhasil diupdate"
+        ? `${updatedUser.username} ${
+            isActive ? "diaktifkan" : "dinonaktifkan"
+          }.`
+        : "User berhasil diupdate",
     };
   } catch (e: any) {
     console.error("❌ Error update user:", e);
@@ -75,4 +86,4 @@ export default async function userUpdate(context: Context) {
       message: "Gagal mengupdate user: " + (e.message || "Unknown error"),
     };
   }
-}
+}

src/app/api/auth/finalize-registration/route.ts

@@ -30,7 +30,12 @@ export async function POST(req: Request) {
       );
     }
 
-    const otpRecord = await prisma.kodeOtp.findUnique({ where: { id: kodeId } });
+    // Verify OTP
+    const otpRecord = await prisma.kodeOtp.findUnique({ 
+      where: { id: kodeId },
+      select: { nomor: true, isActive: true }
+    });
+
     if (!otpRecord?.isActive || otpRecord.nomor !== cleanNomor) {
       return NextResponse.json(
         { success: false, message: "OTP tidak valid" },
@@ -38,6 +43,7 @@ export async function POST(req: Request) {
       );
     }
 
+    // Check duplicate username
     if (await prisma.user.findFirst({ where: { username } })) {
       return NextResponse.json(
         { success: false, message: "Username sudah digunakan" },
@@ -45,12 +51,20 @@ export async function POST(req: Request) {
       );
     }
 
-    // 🔥 Tentukan roleId sebagai STRING
-    const targetRoleId = "1"; // ✅ string, bukan number
+    // Check duplicate nomor
+    if (await prisma.user.findUnique({ where: { nomor: cleanNomor } })) {
+      return NextResponse.json(
+        { success: false, message: "Nomor sudah terdaftar" },
+        { status: 409 }
+      );
+    }
 
-    // Validasi role (gunakan string)
+    // 🔥 Tentukan roleId sebagai STRING
+    const targetRoleId = "2"; // ✅ Default ADMIN_DESA (roleId "2")
+
+    // Validasi role exists
     const roleExists = await prisma.role.findUnique({
-      where: { id: targetRoleId }, // ✅ id bertipe string
+      where: { id: targetRoleId },
       select: { id: true }
     });
 
@@ -61,17 +75,17 @@ export async function POST(req: Request) {
       );
     }
 
-    // Buat user dengan roleId string
+    // ✅ Create user (inactive, waiting approval)
     const newUser = await prisma.user.create({
       data: {
         username,
-        nomor,
-        roleId: targetRoleId, // ✅ string
-        isActive: false,
+        nomor: cleanNomor,
+        roleId: targetRoleId,
+        isActive: false, // Waiting for admin approval
       },
     });
 
-    // Berikan akses menu
+    // ✅ Berikan akses menu default based on role
     const menuIds = DEFAULT_MENUS_BY_ROLE[targetRoleId] || [];
     if (menuIds.length > 0) {
       await prisma.userMenuAccess.createMany({
@@ -79,14 +93,17 @@ export async function POST(req: Request) {
           userId: newUser.id,
           menuId,
         })),
+        skipDuplicates: true, // ✅ Avoid duplicate errors
       });
     }
 
+    // ✅ Mark OTP as used
     await prisma.kodeOtp.update({
       where: { id: kodeId },
       data: { isActive: false },
     });
 
+    // ✅ Create session token
     const token = await sessionCreate({
       sessionKey: process.env.BASE_SESSION_KEY!,
       jwtSecret: process.env.BASE_TOKEN_KEY!,
@@ -95,25 +112,35 @@ export async function POST(req: Request) {
         id: newUser.id,
         nomor: newUser.nomor,
         username: newUser.username,
-        roleId: newUser.roleId, // string
-        isActive: false,
+        roleId: newUser.roleId,
+        isActive: false, // User belum aktif
       },
       invalidatePrevious: false,
     });
 
-    const response = NextResponse.redirect(new URL('/waiting-room', req.url));
-    response.cookies.set(process.env.BASE_SESSION_KEY!, token, {
+    // ✅ PENTING: Return JSON response (bukan redirect)
+    const response = NextResponse.json({
+      success: true,
+      message: "Registrasi berhasil. Menunggu persetujuan admin.",
+      userId: newUser.id,
+    });
+
+    // ✅ Set session cookie
+    const cookieName = process.env.BASE_SESSION_KEY || 'session';
+    response.cookies.set(cookieName, token, {
       httpOnly: true,
       secure: process.env.NODE_ENV === "production",
+      sameSite: 'lax',
       path: "/",
-      maxAge: 30 * 24 * 60 * 60,
+      maxAge: 30 * 24 * 60 * 60, // 30 days
     });
 
     return response;
+
   } catch (error) {
     console.error("❌ Finalize Registration Error:", error);
     return NextResponse.json(
-      { success: false, message: "Registrasi gagal" },
+      { success: false, message: "Registrasi gagal. Silakan coba lagi." },
       { status: 500 }
     );
   } finally {

src/app/api/auth/me/route.ts

@@ -12,6 +12,7 @@ export async function GET() {
         { status: 401 }
       );
     }
+    
 
     const [dbUser, menuAccess] = await Promise.all([
       prisma.user.findUnique({

src/app/api/news/latest/route.ts

@@ -0,0 +1,43 @@
+// app/api/news/latest/route.ts
+import { NextResponse } from "next/server";
+import prisma from "@/lib/prisma";
+
+export async function GET() {
+  try {
+    const berita = await prisma.berita.findMany({
+      take: 3,
+      orderBy: { createdAt: "desc" },
+      include: { kategoriBerita: true },
+    });
+
+    const pengumuman = await prisma.pengumuman.findMany({
+      take: 3,
+      orderBy: { createdAt: "desc" },
+      include: { CategoryPengumuman: true },
+    });
+
+    const news = [
+      ...berita.map((b) => ({
+        id: b.id,
+        type: "berita" as const,
+        title: b.judul,
+        content: b.content,
+        timestamp: b.createdAt,
+        kategoriBerita: b.kategoriBerita || undefined,
+      })),
+      ...pengumuman.map((p) => ({
+        id: p.id,
+        type: "pengumuman" as const,
+        title: p.judul,
+        content: p.content,
+        timestamp: p.createdAt,
+        kategoriPengumuman: p.CategoryPengumuman || undefined,
+      })),
+    ];
+
+    return NextResponse.json({ success: true, news }); // ✅ ganti 'data' jadi 'news'
+  } catch (error) {
+    console.error("API Error:", error);
+    return NextResponse.json({ success: false, error: "Gagal memuat data" }, { status: 500 });
+  }
+}

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

@@ -49,7 +49,7 @@ function Page() {
 
 
   return (
-    <Stack pos={"relative"} bg={colors.Bg} py={"xl"} gap={"22"} px={{ base: "md", md: 0 }}>
+    <Stack pos={"relative"} bg={colors.Bg} pb={"xl"} gap={"xs"} px={{ base: "md", md: 0 }}>
       <Group px={{ base: "md", md: 100 }}>
         <NewsReader />
       </Group>

src/app/darmasaba/(pages)/desa/berita/layout.tsx

@@ -1,12 +1,44 @@
-// app/desa/berita/BeritaLayoutClient.tsx
-'use client'
-import dynamic from 'next/dynamic';
+// app/darmasaba/(pages)/desa/berita/layout.tsx
+'use client';
 
+import { usePathname } from 'next/navigation';
+import { ReactNode } from 'react';
+import dynamic from 'next/dynamic';
+import { Box } from '@mantine/core';
+import BackButton from '../layanan/_com/BackButto';
+import colors from '@/con/colors';
 const LayoutTabsBerita = dynamic(
   () => import('./_lib/layoutTabs'),
   { ssr: false }
 );
 
-export default function BeritaLayoutClient({ children }: { children: React.ReactNode }) {
+export default function BeritaLayoutClient({
+  children,
+}: {
+  children: ReactNode;
+}) {
+  const pathname = usePathname();
+
+  // Contoh path:
+  // - /darmasaba/desa/berita/semua → panjang 5 → list
+  // - /darmasaba/desa/berita/Pemerintahan → panjang 5 → list
+  // - /darmasaba/desa/berita/Pemerintahan/123 → panjang 6 → detail
+
+  const segments = pathname.split('/').filter(Boolean);
+  const isDetailPage = segments.length === 5; // [darmasaba, desa, berita, kategori, id]
+
+  if (isDetailPage) {
+    // Tampilkan tanpa tab menu
+    return (
+      <Box bg={colors.Bg}>
+        <Box pt={33} px={{ base: 'md', md: 100 }}>
+          <BackButton />
+        </Box>
+        {children}
+      </Box>
+    );
+  }
+
+  // Tampilkan dengan tab menu (untuk /semua atau /kategori)
   return <LayoutTabsBerita>{children}</LayoutTabsBerita>;
 }

src/app/darmasaba/(pages)/desa/galery/foto/Content.tsx

@@ -1,150 +0,0 @@
-'use client';
-
-import colors from '@/con/colors';
-import { Box, Center, Image, Pagination, Paper, SimpleGrid, Stack, Text } from '@mantine/core';
-import { useCallback, useEffect, useState } from 'react';
-import ApiFetch from '@/lib/api-fetch';
-
-interface FileItem {
-  id: string;
-  name: string;
-  link: string;
-  realName: string;
-  createdAt: string | Date;
-  category: string;
-  path: string;
-  mimeType: string;
-}
-
-export default function FotoContent() {
-  const [files, setFiles] = useState<FileItem[]>([]);
-  const [loading, setLoading] = useState(true);
-  const [search, setSearch] = useState('');
-  const [page, setPage] = useState(1);
-  const [totalPages, setTotalPages] = useState(1);
-  const limit = 9; // ✅ ambil 12 data per page
-
-  const loadData = useCallback(async (pageNum: number, searchTerm: string) => {
-    setLoading(true);
-    try {
-      const query: Record<string, string> = {
-        category: 'image',
-        page: pageNum.toString(),
-        limit: limit.toString(),
-      };
-      if (searchTerm) query.search = searchTerm;
-
-      const response = await ApiFetch.api.fileStorage.findMany.get({ query });
-
-      if (response.status === 200 && response.data) {
-        setFiles(response.data.data || []);
-        setTotalPages(response.data.meta?.totalPages || 1);
-      } else {
-        setFiles([]);
-      }
-    } catch (err) {
-      console.error('Load error:', err);
-      setFiles([]);
-    } finally {
-      setLoading(false);
-    }
-  }, []);
-
-  // ✅ Initial load + update when URL/search changes
-  useEffect(() => {
-    const handleRouteChange = () => {
-      const urlParams = new URLSearchParams(window.location.search);
-      const urlSearch = urlParams.get('search') || '';
-      const urlPage = parseInt(urlParams.get('page') || '1');
-      setSearch(urlSearch);
-      setPage(urlPage);
-      loadData(urlPage, urlSearch);
-    };
-
-    const handleSearchUpdate = (e: Event) => {
-      const { search } = (e as CustomEvent).detail;
-      setSearch(search);
-      setPage(1);
-      loadData(1, search);
-    };
-
-    handleRouteChange();
-    window.addEventListener('popstate', handleRouteChange);
-    window.addEventListener('searchUpdate', handleSearchUpdate as EventListener);
-
-    return () => {
-      window.removeEventListener('popstate', handleRouteChange);
-      window.removeEventListener('searchUpdate', handleSearchUpdate as EventListener);
-    };
-  }, [loadData]);
-
-  // ✅ Update when page/search changes
-  useEffect(() => {
-    loadData(page, search);
-  }, [page, search, loadData]);
-
-  const updateURL = (newSearch: string, newPage: number) => {
-    const url = new URL(window.location.href);
-    if (newSearch) url.searchParams.set('search', newSearch);
-    else url.searchParams.delete('search');
-    if (newPage > 1) url.searchParams.set('page', newPage.toString());
-    else url.searchParams.delete('page');
-    window.history.pushState({}, '', url);
-  };
-
-  const handlePageChange = (newPage: number) => {
-    setPage(newPage);
-    updateURL(search, newPage);
-  };
-
-  if (loading && files.length === 0) {
-    return <Center>Memuat data...</Center>;
-  }
-
-  if (files.length === 0) {
-    return <Center>Tidak ada foto ditemukan</Center>;
-  }
-
-  return (
-    <Box pt={20} px={{ base: 'md', md: 100 }}>
-      <SimpleGrid cols={{ base: 1, md: 3 }}>
-        {files.map((file) => (
-          <Paper
-            key={file.id}
-            mb={50}
-            p="md"
-            radius={26}
-            bg={colors['white-trans-1']}
-            style={{ height: '100%' }}
-          >
-            <Box style={{ height: '250px', overflow: 'hidden', borderRadius: '12px' }}>
-              <Image
-                src={file.link}
-                alt={file.realName || file.name}
-                height={250}
-                width="100%"
-                style={{ objectFit: 'cover', height: '100%', width: '100%' }}
-                loading="lazy"
-              />
-            </Box>
-            <Stack gap="sm" py={10}>
-              <Text fw="bold" fz={{ base: 'h4', md: 'h3' }}>
-                {file.realName || file.name}
-              </Text>
-              <Text fz="sm" c="dimmed">
-                {new Date(file.createdAt).toLocaleDateString('id-ID', {
-                  day: 'numeric',
-                  month: 'long',
-                  year: 'numeric',
-                })}
-              </Text>
-            </Stack>
-          </Paper>
-        ))}
-      </SimpleGrid>
-      <Center mt="xl">
-        <Pagination total={totalPages} value={page} onChange={handlePageChange} />
-      </Center>
-    </Box>
-  );
-}

src/app/darmasaba/(pages)/desa/galery/foto/page.tsx

@@ -1,25 +1,168 @@
-'use client'
+/* eslint-disable @typescript-eslint/no-explicit-any */
+'use client';
 
-import dynamic from 'next/dynamic';
-import { Suspense } from 'react';
+import stateGallery from '@/app/admin/(dashboard)/_state/desa/gallery';
+import colors from '@/con/colors';
+import {
+  Box,
+  Center,
+  Grid,
+  Image,
+  Pagination,
+  Paper,
+  Skeleton,
+  Stack,
+  Text,
+  Title,
+} from '@mantine/core';
+import { useShallowEffect } from '@mantine/hooks';
+import { IconPhoto } from '@tabler/icons-react';
+import { useRouter } from 'next/navigation';
+import { useState } from 'react';
+import { useProxy } from 'valtio/utils';
 
-// ✅ Load komponen tanpa SSR
-const FotoContent = dynamic(
-  () => import('./Content'),
-  { 
-    ssr: false, 
-    loading: () => <div>Memuat konten...</div> 
-  }
-);
+// Komponen kartu foto
+function FotoCard({ item }: { item: any }) {
+  const router = useRouter();
+
+  const handleClick = () => {
+    router.push(`/darmasaba/galeri/foto/${item.id}`);
+  };
 
-function PageContent() {
   return (
-    <Suspense fallback={<div>Memuat...</div>}>
-      <FotoContent />
-    </Suspense>
+    <Grid.Col span={{ base: 12, xs: 6, md: 4 }}>
+      <Paper
+        shadow="sm"
+        radius="md"
+        p={0}
+        onClick={handleClick}
+        style={{ cursor: 'pointer', transition: 'transform 0.2s' }}
+        onMouseEnter={(e) => (e.currentTarget.style.transform = 'scale(1.02)')}
+        onMouseLeave={(e) => (e.currentTarget.style.transform = 'scale(1)')}
+      >
+        {item.imageGalleryFoto?.link ? (
+          <Box
+            pos="relative"
+            style={{
+              paddingBottom: '100%', // ✅ Ubah ke 1:1 (square) — atau sesuaikan
+              overflow: 'hidden',
+              borderRadius: '4px 4px 0 0',
+              backgroundColor: '#f9f9f9', // ✅ background netral
+            }}
+          >
+            <Image
+              radius="lg"
+              src={item.imageGalleryFoto.link}
+              alt={item.name || 'Foto Galeri'}
+              p={10}
+              style={{
+                position: 'absolute',
+                top: 0,
+                left: 0,
+                width: '100%',
+                height: '100%',
+                objectFit: 'contain', // ✅ Tampilkan utuh, jangan crop
+                objectPosition: 'center', // rata tengah
+              }}
+              loading="lazy"
+            />
+          </Box>
+        ) : (
+          <Center h={180} bg="gray.1">
+            <IconPhoto size={40} color="gray" />
+          </Center>
+        )}
+
+        <Stack p="md" gap={4}>
+          <Text fw={600} lineClamp={1}>
+            {item.name || 'Tanpa Judul'}
+          </Text>
+          {item.deskripsi && (
+            <Text fz="sm" c="dimmed" lineClamp={2} dangerouslySetInnerHTML={{ __html: item.deskripsi }} />
+          )}
+          <Text fz="xs" c="dimmed">
+            {new Date(item.createdAt).toLocaleDateString('id-ID', {
+              day: 'numeric',
+              month: 'short',
+              year: 'numeric',
+            })}
+          </Text>
+        </Stack>
+      </Paper>
+    </Grid.Col>
   );
 }
 
-export default function Page() {
-  return <PageContent />;
+// Komponen utama
+export default function GaleriFotoUser() {
+  const [search] = useState('');
+  return (
+    <Box py="xl" px={{ base: 'md', md: 'lg' }}>
+      {/* Header */}
+      <Title order={2} c={colors['blue-button']} mb="lg">
+        Galeri Foto Desa Darmasaba
+      </Title>
+
+      {/* Daftar Foto */}
+      <FotoList search={search} />
+    </Box>
+  );
+}
+
+function FotoList({ search }: { search: string }) {
+  const FotoState = useProxy(stateGallery.foto);
+
+  const { data, page, totalPages, loading, load } = FotoState.findMany;
+
+  useShallowEffect(() => {
+    load(page, 3, search); // ✅ 9 item per halaman
+  }, [page, search]);
+
+  if (loading) {
+    return (
+      <Grid mt="md">
+        {Array.from({ length: 3 }).map((_, i) => (
+          <Grid.Col key={i} span={{ base: 12, xs: 6, md: 4 }}>
+            <Skeleton height={280} radius="md" />
+          </Grid.Col>
+        ))}
+      </Grid>
+    );
+  }
+
+  if (!data || data.length === 0) {
+    return (
+      <Center py="xl">
+        <Stack align="center" c="dimmed">
+          <IconPhoto size={48} />
+          <Text>Tidak ada foto ditemukan</Text>
+        </Stack>
+      </Center>
+    );
+  }
+
+  return (
+    <Stack mt="md" gap="xl">
+      <Grid>
+        {data.map((item) => (
+          <FotoCard key={item.id} item={item} />
+        ))}
+      </Grid>
+
+      {/* Pagination */}
+      
+        <Center>
+          <Pagination
+            value={page}
+            onChange={(newPage) => {
+              load(newPage, 3, search);
+              window.scrollTo({ top: 0, behavior: 'smooth' });
+            }}
+            total={totalPages}
+            color="blue"
+            radius="md"
+          />
+        </Center>
+    </Stack>
+  );
 }

src/app/darmasaba/(pages)/desa/galery/layout.tsx

@@ -1,9 +1,36 @@
+'use client'
+import { usePathname } from "next/navigation";
+import { ReactNode } from "react";
 import LayoutTabsGalery from "./_lib/layoutTabs";
 
-export default function LayoutGalery({ children }: { children: React.ReactNode }) {
-    return (
-        <LayoutTabsGalery>
-            {children}
-        </LayoutTabsGalery>
-    )
+// export default function LayoutGalery({ children }: { children: React.ReactNode }) {
+//     return (
+//         <LayoutTabsGalery>
+//             {children}
+//         </LayoutTabsGalery>
+//     )
+// }
+
+export default function BeritaLayoutClient({
+  children,
+}: {
+  children: ReactNode;
+}) {
+  const pathname = usePathname();
+
+  // Contoh path:
+  // - /darmasaba/desa/berita/semua → panjang 5 → list
+  // - /darmasaba/desa/berita/Pemerintahan → panjang 5 → list
+  // - /darmasaba/desa/berita/Pemerintahan/123 → panjang 6 → detail
+
+  const segments = pathname.split('/').filter(Boolean);
+  const isDetailPage = segments.length === 5; // [darmasaba, desa, berita, kategori, id]
+
+  if (isDetailPage) {
+    // Tampilkan tanpa tab menu
+    return <>{children}</>
+  }
+
+  // Tampilkan dengan tab menu (untuk /semua atau /kategori)
+  return <LayoutTabsGalery>{children}</LayoutTabsGalery>;
 }

src/app/darmasaba/(pages)/desa/galery/video/Content.tsx

@@ -4,26 +4,27 @@ import stateGallery from '@/app/admin/(dashboard)/_state/desa/gallery';
 import colors from '@/con/colors';
 import {
   Box,
+  Button,
   Center,
+  Group,
   Pagination,
   Paper,
   SimpleGrid,
-  Spoiler,
   Stack,
-  Text,
+  Text
 } from '@mantine/core';
-import { useCallback, useEffect, useState } from 'react';
+import { useTransitionRouter } from 'next-view-transitions';
+import { useCallback, useEffect } from 'react';
 import { useSnapshot } from 'valtio';
 
 export default function VideoContent() {
-  // ✅ expanded state per index
-  const [expandedMap, setExpandedMap] = useState<Record<number, boolean>>({});
   const videoState = useSnapshot(stateGallery.video);
+  const router = useTransitionRouter()
   const { data, page, totalPages, loading } = videoState.findMany;
 
   // Handle search and pagination changes
   const loadData = useCallback((pageNum: number, searchTerm: string) => {
-    stateGallery.video.findMany.load(pageNum, 10, searchTerm.trim());
+    stateGallery.video.findMany.load(pageNum, 3, searchTerm.trim());
   }, []);
 
   // Initial load and URL change handler
@@ -56,12 +57,6 @@ export default function VideoContent() {
     loadData(newPage, search);
   };
 
-  const toggleExpanded = (index: number, value: boolean) => {
-    setExpandedMap((prev) => ({
-      ...prev,
-      [index]: value,
-    }));
-  };
 
   const dataVideo = data || [];
 
@@ -110,27 +105,22 @@ export default function VideoContent() {
                   <Text fw="bold" fz="sm" lineClamp={1}>
                     {v.name}
                   </Text>
-                  <Spoiler
-                    showLabel={
-                      <Text fw="bold" fz="sm" c={colors['blue-button']}>
-                        Show more
-                      </Text>
-                    }
-                    hideLabel={
-                      <Text fw="bold" fz="sm" c={colors['blue-button']}>
-                        Hide details
-                      </Text>
-                    }
-                    expanded={expandedMap[k] || false}
-                    onExpandedChange={(val) => toggleExpanded(k, val)}
+                  <Text
+                    ta="justify"
+                    fz="sm"
+                    dangerouslySetInnerHTML={{ __html: v.deskripsi }}
+                    style={{ wordBreak: "break-word", whiteSpace: "normal" }}
+                    lineClamp={3}
+                    truncate="end"
+                  />
+                  <Group justify={"right"}>
+                    <Button
+                    onClick={() => router.push(`/darmasaba/desa/galery/video/${v.id}`)}
+                    bg={colors['blue-button']}
                   >
-                    <Text
-                      ta="justify"
-                      fz="sm"
-                      dangerouslySetInnerHTML={{ __html: v.deskripsi }}
-                      style={{wordBreak: "break-word", whiteSpace: "normal"}}
-                    />
-                  </Spoiler>
+                    Detail
+                  </Button>
+                  </Group>
                 </Stack>
               </Box>
             </Paper>

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

@@ -0,0 +1,197 @@
+'use client';
+
+import colors from '@/con/colors';
+import {
+  Alert,
+  Box,
+  Button,
+  Card,
+  Group,
+  Paper,
+  Skeleton,
+  Stack,
+  Text,
+  ThemeIcon,
+} from '@mantine/core';
+import { useShallowEffect } from '@mantine/hooks';
+import { IconArrowBack, IconInfoCircle, IconVideo } from '@tabler/icons-react';
+import { useParams, useRouter } from 'next/navigation';
+import { useState } from 'react';
+import { useProxy } from 'valtio/utils';
+import stateGallery from '@/app/admin/(dashboard)/_state/desa/gallery'; // pastikan state bisa dipakai di publik
+import BackButton from '../../../layanan/_com/BackButto';
+
+// Fungsi helper: aman dan tanpa spasi
+function convertToEmbedUrl(youtubeUrl: string): string {
+  try {
+    const url = new URL(youtubeUrl);
+    let videoId = '';
+
+    if (url.hostname === 'youtu.be') {
+      videoId = url.pathname.slice(1);
+    } else if (url.hostname.includes('youtube.com')) {
+      videoId = url.searchParams.get('v') || '';
+    }
+
+    return videoId ? `https://www.youtube.com/embed/${videoId}` : youtubeUrl;
+  } catch {
+    return youtubeUrl;
+  }
+}
+
+export default function DetailVideoUser() {
+  const params = useParams<{ id: string }>();
+  const router = useRouter();
+  const videoState = useProxy(stateGallery.video);
+  const [videoError, setVideoError] = useState(false);
+
+  const id = Array.isArray(params.id) ? params.id[0] : params.id;
+
+  useShallowEffect(() => {
+    if (id) {
+      videoState.findUnique.load(id);
+    }
+  }, [id]);
+
+  const data = videoState.findUnique.data;
+
+  if (!videoState.findUnique && !id) {
+    return (
+      <Box py="xl" px={{ base: 'md', md: 'lg' }}>
+        <Skeleton height={400} radius="md" />
+      </Box>
+    );
+  }
+
+  if (!data) {
+    return (
+      <Box py="xl" px={{ base: 'md', md: 'lg' }}>
+        <Alert
+          icon={<IconInfoCircle size={20} />}
+          title="Video tidak ditemukan"
+          color="red"
+          radius="md"
+        >
+          Video yang Anda cari tidak tersedia.
+        </Alert>
+        <Button
+          leftSection={<IconArrowBack size={16} />}
+          mt="md"
+          onClick={() => router.push('/darmasaba/galeri/video')}
+          variant="outline"
+        >
+          Kembali ke Galeri
+        </Button>
+      </Box>
+    );
+  }
+
+  const embedUrl = data.linkVideo ? convertToEmbedUrl(data.linkVideo) : null;
+
+  return (
+    <Box py="xl" px={{ base: 'md', md: 100 }}>
+      {/* Tombol Kembali */}
+      <Box >
+        <BackButton />
+      </Box>
+
+      {/* Header */}
+      <Text
+        ta="center"
+        fz={{ base: 'xl', md: '2xl' }}
+        fw={700}
+        c={colors['blue-button']}
+        mb="lg"
+      >
+        {data.name || 'Video Galeri Desa'}
+      </Text>
+
+      {/* Konten Utama */}
+      <Card
+        shadow="sm"
+        radius="md"
+        p={{ base: 'md', md: 'xl' }}
+        bg={colors['white-1']}
+      >
+        <Stack gap="lg">
+          {/* Video */}
+          {embedUrl ? (
+            <Box
+              pos="relative"
+              style={{ paddingBottom: '56.25%', height: 0, overflow: 'hidden' }} // 16:9 aspect ratio
+            >
+              <iframe
+                src={embedUrl}
+                title={data.name}
+                allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
+                allowFullScreen
+                style={{
+                  position: 'absolute',
+                  top: 0,
+                  left: 0,
+                  width: '100%',
+                  height: '100%',
+                  borderRadius: 8,
+                  border: 'none',
+                }}
+                onError={() => setVideoError(true)}
+              />
+            </Box>
+          ) : videoError ? (
+            <Alert
+              color="orange"
+              icon={<IconVideo size={20} />}
+              title="Gagal memuat video"
+              radius="md"
+            >
+              Mohon maaf, video tidak dapat diputar.
+            </Alert>
+          ) : (
+            <Alert
+              color="gray"
+              icon={<IconInfoCircle size={20} />}
+              title="Tidak ada video"
+              radius="md"
+            >
+              Konten video belum tersedia.
+            </Alert>
+          )}
+
+          {/* Informasi Tambahan */}
+          {data.createdAt && (
+            <Group gap="xs" justify="center" wrap="nowrap">
+              <ThemeIcon variant="light" size="sm" radius="xl">
+                <IconInfoCircle size={14} />
+              </ThemeIcon>
+              <Text fz="sm" c="dimmed">
+                Diunggah pada{' '}
+                {new Date(data.createdAt).toLocaleDateString('id-ID', {
+                  weekday: 'long',
+                  year: 'numeric',
+                  month: 'long',
+                  day: 'numeric',
+                })}
+              </Text>
+            </Group>
+          )}
+
+          {/* Deskripsi */}
+          {data.deskripsi && (
+            <Paper p="md" bg="gray.0" radius="md">
+              <Text
+                fz="md"
+                c="dark"
+                dangerouslySetInnerHTML={{ __html: data.deskripsi }}
+                style={{
+                  wordBreak: 'break-word',
+                  whiteSpace: 'normal',
+                  lineHeight: 1.6,
+                }}
+              />
+            </Paper>
+          )}
+        </Stack>
+      </Card>
+    </Box>
+  );
+}

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

@@ -100,7 +100,7 @@ function Page() {
           {data.name}
         </Text>
       </Container>
-      <Box px={{ base: "md", md: 100 }}>
+      <Box px={{ base: "35", md: 100 }}>
         <Stack gap="md">
           <Text
             dangerouslySetInnerHTML={{ __html: data.deskripsi }}

src/app/darmasaba/(pages)/desa/pengumuman/(kategori)/adat-&-budaya/page.tsx

@@ -1,96 +0,0 @@
-import colors from '@/con/colors';
-import { Stack, Box, Container, Text, Paper, Group } from '@mantine/core';
-import React from 'react';
-import BackButton from '../../../layanan/_com/BackButto';
-import { IconCalendar, IconClock, IconMapPin } from '@tabler/icons-react';
-
-const dataPengumuman = [
-  {
-    id: 1,
-    judul: 'Sosialisasi Perarem Konservasi Adat di Darmasaba',
-    tanggal: 'Jumat, 26 April 2025',
-    jam: '16:00 WITA',
-    lokasi: 'Wantilan Adat Desa',
-    deskripsi: 'Para krama diundang hadir dalam sosialisasi perarem (aturan adat) baru yang berkaitan dengan konservasi lingkungan berbasis budaya, termasuk larangan alih fungsi lahan pekarangan suci.'
-  },
-  {
-    id: 2,
-    judul: 'Sosialisasi Perarem Konservasi Adat di Darmasaba',
-    tanggal: 'Jumat, 26 April 2025',
-    jam: '16:00 WITA',
-    lokasi: 'Wantilan Adat Desa',
-    deskripsi: 'Para krama diundang hadir dalam sosialisasi perarem (aturan adat) baru yang berkaitan dengan konservasi lingkungan berbasis budaya, termasuk larangan alih fungsi lahan pekarangan suci.'
-  },
-  {
-    id: 3,
-    judul: 'Sosialisasi Perarem Konservasi Adat di Darmasaba',
-    tanggal: 'Jumat, 26 April 2025',
-    jam: '16:00 WITA',
-    lokasi: 'Wantilan Adat Desa',
-    deskripsi: 'Para krama diundang hadir dalam sosialisasi perarem (aturan adat) baru yang berkaitan dengan konservasi lingkungan berbasis budaya, termasuk larangan alih fungsi lahan pekarangan suci.'
-  },
-  {
-    id: 4,
-    judul: 'Sosialisasi Perarem Konservasi Adat di Darmasaba',
-    tanggal: 'Jumat, 26 April 2025',
-    jam: '16:00 WITA',
-    lokasi: 'Wantilan Adat Desa',
-    deskripsi: 'Para krama diundang hadir dalam sosialisasi perarem (aturan adat) baru yang berkaitan dengan konservasi lingkungan berbasis budaya, termasuk larangan alih fungsi lahan pekarangan suci.'
-  },
-  {
-    id: 5,
-    judul: 'Sosialisasi Perarem Konservasi Adat di Darmasaba',
-    tanggal: 'Jumat, 26 April 2025',
-    jam: '16:00 WITA',
-    lokasi: 'Wantilan Adat Desa',
-    deskripsi: 'Para krama diundang hadir dalam sosialisasi perarem (aturan adat) baru yang berkaitan dengan konservasi lingkungan berbasis budaya, termasuk larangan alih fungsi lahan pekarangan suci.'
-  },
-]
-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" >
-          <Text fz={{ base: "2rem", md: "3.4rem" }} c={colors["blue-button"]} fw="bold" ta="center">
-            Pengumuman Adat & Budaya
-          </Text>
-          <Text ta="center" px="md" pb={10}>
-            Informasi dan pengumuman resmi terkait pengumuman adat & budaya di Desa Darmasaba.
-          </Text>
-        </Stack>
-      </Container>
-      <Box px={{ base: 'md', md: 100 }}>
-        {dataPengumuman.map((v, k) => {
-          return (
-            <Paper mb={10} key={k} withBorder p="lg" radius="md" shadow="md" bg={colors["white-1"]}>
-              <Text fz={'h3'}>{v.judul}</Text>
-              <Group style={{ color: 'black' }} pb={20}>
-                <Group gap="xs">
-                  <IconCalendar size={18} />
-                  <Text size="sm">{v.tanggal}</Text>
-                </Group>
-                <Group gap="xs">
-                  <IconClock size={18} />
-                  <Text size="sm">{v.jam}</Text>
-                </Group>
-                <Group gap="xs">
-                  <IconMapPin size={18} />
-                  <Text size="sm">{v.lokasi}</Text>
-                </Group>
-              </Group>
-              <Text ta={'justify'}>
-                {v.deskripsi}
-              </Text>
-            </Paper>
-          )
-        })}
-      </Box>
-    </Stack>
-  );
-}
-
-export default Page;

src/app/darmasaba/(pages)/desa/pengumuman/(kategori)/digitalisasi-desa/page.tsx

@@ -1,96 +0,0 @@
-import colors from '@/con/colors';
-import { Stack, Box, Container, Text, Paper, Group } from '@mantine/core';
-import React from 'react';
-import BackButton from '../../../layanan/_com/BackButto';
-import { IconCalendar, IconClock, IconMapPin } from '@tabler/icons-react';
-
-const dataPengumuman = [
-  {
-    id: 1,
-    judul: 'Pelatihan Dasar Komputer untuk Lansia dan Ibu Rumah Tangga',
-    tanggal: 'Selasa, 30 April 2025',
-    jam: '09:00 WITA',
-    lokasi: 'Perpustakaan Desa',
-    deskripsi: 'Belajar dari nol: cara menyalakan komputer, menulis di Word, membuat email, dan dasar penggunaan HP Android untuk komunikasi dan akses layanan desa online. Terbuka untuk 20 peserta.'
-  },
-  {
-    id: 2,
-    judul: 'Pelatihan Dasar Komputer untuk Lansia dan Ibu Rumah Tangga',
-    tanggal: 'Selasa, 30 April 2025',
-    jam: '09:00 WITA',
-    lokasi: 'Perpustakaan Desa',
-    deskripsi: 'Belajar dari nol: cara menyalakan komputer, menulis di Word, membuat email, dan dasar penggunaan HP Android untuk komunikasi dan akses layanan desa online. Terbuka untuk 20 peserta.'
-  },
-  {
-    id: 3,
-    judul: 'Pelatihan Dasar Komputer untuk Lansia dan Ibu Rumah Tangga',
-    tanggal: 'Selasa, 30 April 2025',
-    jam: '09:00 WITA',
-    lokasi: 'Perpustakaan Desa',
-    deskripsi: 'Belajar dari nol: cara menyalakan komputer, menulis di Word, membuat email, dan dasar penggunaan HP Android untuk komunikasi dan akses layanan desa online. Terbuka untuk 20 peserta.'
-  },
-  {
-    id: 4,
-    judul: 'Pelatihan Dasar Komputer untuk Lansia dan Ibu Rumah Tangga',
-    tanggal: 'Selasa, 30 April 2025',
-    jam: '09:00 WITA',
-    lokasi: 'Perpustakaan Desa',
-    deskripsi: 'Belajar dari nol: cara menyalakan komputer, menulis di Word, membuat email, dan dasar penggunaan HP Android untuk komunikasi dan akses layanan desa online. Terbuka untuk 20 peserta.'
-  },
-  {
-    id: 5,
-    judul: 'Pelatihan Dasar Komputer untuk Lansia dan Ibu Rumah Tangga',
-    tanggal: 'Selasa, 30 April 2025',
-    jam: '09:00 WITA',
-    lokasi: 'Perpustakaan Desa',
-    deskripsi: 'Belajar dari nol: cara menyalakan komputer, menulis di Word, membuat email, dan dasar penggunaan HP Android untuk komunikasi dan akses layanan desa online. Terbuka untuk 20 peserta.'
-  },
-]
-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" >
-          <Text fz={{ base: "2rem", md: "3.4rem" }} c={colors["blue-button"]} fw="bold" ta="center">
-            Pengumuman Digitalisasi Desa
-          </Text>
-          <Text ta="center" px="md" pb={10}>
-            Informasi dan pengumuman resmi terkait pengumuman digitalisasi desa
-          </Text>
-        </Stack>
-      </Container>
-      <Box px={{ base: 'md', md: 100 }}>
-        {dataPengumuman.map((v, k) => {
-          return (
-            <Paper mb={10} key={k} withBorder p="lg" radius="md" shadow="md" bg={colors["white-1"]}>
-              <Text fz={'h3'}>{v.judul}</Text>
-              <Group style={{ color: 'black' }} pb={20}>
-                <Group gap="xs">
-                  <IconCalendar size={18} />
-                  <Text size="sm">{v.tanggal}</Text>
-                </Group>
-                <Group gap="xs">
-                  <IconClock size={18} />
-                  <Text size="sm">{v.jam}</Text>
-                </Group>
-                <Group gap="xs">
-                  <IconMapPin size={18} />
-                  <Text size="sm">{v.lokasi}</Text>
-                </Group>
-              </Group>
-              <Text ta={'justify'}>
-                {v.deskripsi}
-              </Text>
-            </Paper>
-          )
-        })}
-      </Box>
-    </Stack>
-  );
-}
-
-export default Page;

src/app/darmasaba/(pages)/desa/pengumuman/(kategori)/ekonomi-&-umkm/page.tsx

@@ -1,96 +0,0 @@
-import colors from '@/con/colors';
-import { Stack, Box, Container, Text, Paper, Group } from '@mantine/core';
-import React from 'react';
-import BackButton from '../../../layanan/_com/BackButto';
-import { IconCalendar, IconClock, IconMapPin } from '@tabler/icons-react';
-
-const dataPengumuman = [
-  {
-    id: 1,
-    judul: 'Pelatihan Digital Marketing untuk UMKM Desa',
-    tanggal: 'Rabu, 23 April 2025',
-    jam: '13:00 WITA',
-    lokasi: 'Aula Kantor Desa',
-    deskripsi: 'Para pelaku UMKM diundang untuk mengikuti pelatihan dasar digital marketing: mulai dari membuat akun bisnis, copywriting produk, hingga promosi melalui media sosial. Peserta akan mendapat sertifikat dan materi pelatihan.'
-  },
-  {
-    id: 2,
-    judul: 'Pelatihan Digital Marketing untuk UMKM Desa',
-    tanggal: 'Rabu, 23 April 2025',
-    jam: '13:00 WITA',
-    lokasi: 'Aula Kantor Desa',
-    deskripsi: 'Para pelaku UMKM diundang untuk mengikuti pelatihan dasar digital marketing: mulai dari membuat akun bisnis, copywriting produk, hingga promosi melalui media sosial. Peserta akan mendapat sertifikat dan materi pelatihan.'
-  },
-  {
-    id: 3,
-    judul: 'Pelatihan Digital Marketing untuk UMKM Desa',
-    tanggal: 'Rabu, 23 April 2025',
-    jam: '13:00 WITA',
-    lokasi: 'Aula Kantor Desa',
-    deskripsi: 'Para pelaku UMKM diundang untuk mengikuti pelatihan dasar digital marketing: mulai dari membuat akun bisnis, copywriting produk, hingga promosi melalui media sosial. Peserta akan mendapat sertifikat dan materi pelatihan.'
-  },
-  {
-    id: 4,
-    judul: 'Pelatihan Digital Marketing untuk UMKM Desa',
-    tanggal: 'Rabu, 23 April 2025',
-    jam: '13:00 WITA',
-    lokasi: 'Aula Kantor Desa',
-    deskripsi: 'Para pelaku UMKM diundang untuk mengikuti pelatihan dasar digital marketing: mulai dari membuat akun bisnis, copywriting produk, hingga promosi melalui media sosial. Peserta akan mendapat sertifikat dan materi pelatihan.'
-  },
-  {
-    id: 5,
-    judul: 'Pelatihan Digital Marketing untuk UMKM Desa',
-    tanggal: 'Rabu, 23 April 2025',
-    jam: '13:00 WITA',
-    lokasi: 'Aula Kantor Desa',
-    deskripsi: 'Para pelaku UMKM diundang untuk mengikuti pelatihan dasar digital marketing: mulai dari membuat akun bisnis, copywriting produk, hingga promosi melalui media sosial. Peserta akan mendapat sertifikat dan materi pelatihan.'
-  },
-]
-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" >
-          <Text fz={{ base: "2rem", md: "3.4rem" }} c={colors["blue-button"]} fw="bold" ta="center">
-            Pengumuman Ekonomi & UMKM
-          </Text>
-          <Text ta="center" px="md" pb={10}>
-            Informasi dan pengumuman resmi terkait pengumuman ekonomi & umkm
-          </Text>
-        </Stack>
-      </Container>
-      <Box px={{ base: 'md', md: 100 }}>
-        {dataPengumuman.map((v, k) => {
-          return (
-            <Paper mb={10} key={k} withBorder p="lg" radius="md" shadow="md" bg={colors["white-1"]}>
-              <Text fz={'h3'}>{v.judul}</Text>
-              <Group style={{ color: 'black' }} pb={20}>
-                <Group gap="xs">
-                  <IconCalendar size={18} />
-                  <Text size="sm">{v.tanggal}</Text>
-                </Group>
-                <Group gap="xs">
-                  <IconClock size={18} />
-                  <Text size="sm">{v.jam}</Text>
-                </Group>
-                <Group gap="xs">
-                  <IconMapPin size={18} />
-                  <Text size="sm">{v.lokasi}</Text>
-                </Group>
-              </Group>
-              <Text ta={'justify'}>
-                {v.deskripsi}
-              </Text>
-            </Paper>
-          )
-        })}
-      </Box>
-    </Stack>
-  );
-}
-
-export default Page;

src/app/darmasaba/(pages)/desa/pengumuman/(kategori)/lingkungan-&-bencana/page.tsx

@@ -1,96 +0,0 @@
-import colors from '@/con/colors';
-import { Stack, Box, Container, Text, Paper, Group } from '@mantine/core';
-import React from 'react';
-import BackButton from '../../../layanan/_com/BackButto';
-import { IconCalendar, IconClock, IconMapPin } from '@tabler/icons-react';
-
-const dataPengumuman = [
-  {
-    id: 1,
-    judul: 'Gotong Royong Bersih Sungai dan Drainase',
-    tanggal: 'Minggu, 21 April 2025',
-    jam: '06:30 WITA',
-    lokasi: 'Titik Kumpul: Poskamling RW 02',
-    deskripsi: 'Seluruh warga RW 02 diimbau ikut serta dalam kegiatan bersih-bersih aliran sungai dan saluran air untuk mencegah banjir saat musim hujan. Disediakan alat kebersihan dan konsumsi ringan.'
-  },
-  {
-    id: 2,
-    judul: 'Gotong Royong Bersih Sungai dan Drainase',
-    tanggal: 'Minggu, 21 April 2025',
-    jam: '06:30 WITA',
-    lokasi: 'Titik Kumpul: Poskamling RW 02',
-    deskripsi: 'Seluruh warga RW 02 diimbau ikut serta dalam kegiatan bersih-bersih aliran sungai dan saluran air untuk mencegah banjir saat musim hujan. Disediakan alat kebersihan dan konsumsi ringan.'
-  },
-  {
-    id: 3,
-    judul: 'Gotong Royong Bersih Sungai dan Drainase',
-    tanggal: 'Minggu, 21 April 2025',
-    jam: '06:30 WITA',
-    lokasi: 'Titik Kumpul: Poskamling RW 02',
-    deskripsi: 'Seluruh warga RW 02 diimbau ikut serta dalam kegiatan bersih-bersih aliran sungai dan saluran air untuk mencegah banjir saat musim hujan. Disediakan alat kebersihan dan konsumsi ringan.'
-  },
-  {
-    id: 4,
-    judul: 'Gotong Royong Bersih Sungai dan Drainase',
-    tanggal: 'Minggu, 21 April 2025',
-    jam: '06:30 WITA',
-    lokasi: 'Titik Kumpul: Poskamling RW 02',
-    deskripsi: 'Seluruh warga RW 02 diimbau ikut serta dalam kegiatan bersih-bersih aliran sungai dan saluran air untuk mencegah banjir saat musim hujan. Disediakan alat kebersihan dan konsumsi ringan.'
-  },
-  {
-    id: 5,
-    judul: 'Gotong Royong Bersih Sungai dan Drainase',
-    tanggal: 'Minggu, 21 April 2025',
-    jam: '06:30 WITA',
-    lokasi: 'Titik Kumpul: Poskamling RW 02',
-    deskripsi: 'Seluruh warga RW 02 diimbau ikut serta dalam kegiatan bersih-bersih aliran sungai dan saluran air untuk mencegah banjir saat musim hujan. Disediakan alat kebersihan dan konsumsi ringan.'
-  },
-]
-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" >
-          <Text fz={{ base: "2rem", md: "3.4rem" }} c={colors["blue-button"]} fw="bold" ta="center">
-            Pengumuman Lingkungan & Bencana
-          </Text>
-          <Text ta="center" px="md" pb={10}>
-            Informasi dan pengumuman resmi terkait pengumuman lingkungan & bencana
-          </Text>
-        </Stack>
-      </Container>
-      <Box px={{ base: 'md', md: 100 }}>
-        {dataPengumuman.map((v, k) => {
-          return (
-            <Paper mb={10} key={k} withBorder p="lg" radius="md" shadow="md" bg={colors["white-1"]}>
-              <Text fz={'h3'}>{v.judul}</Text>
-              <Group style={{ color: 'black' }} pb={20}>
-                <Group gap="xs">
-                  <IconCalendar size={18} />
-                  <Text size="sm">{v.tanggal}</Text>
-                </Group>
-                <Group gap="xs">
-                  <IconClock size={18} />
-                  <Text size="sm">{v.jam}</Text>
-                </Group>
-                <Group gap="xs">
-                  <IconMapPin size={18} />
-                  <Text size="sm">{v.lokasi}</Text>
-                </Group>
-              </Group>
-              <Text ta={'justify'}>
-                {v.deskripsi}
-              </Text>
-            </Paper>
-          )
-        })}
-      </Box>
-    </Stack>
-  );
-}
-
-export default Page;

src/app/darmasaba/(pages)/desa/pengumuman/(kategori)/pendidikan-&-kepemudaan/page.tsx

@@ -1,96 +0,0 @@
-import colors from '@/con/colors';
-import { Stack, Box, Container, Text, Paper, Group } from '@mantine/core';
-import React from 'react';
-import BackButton from '../../../layanan/_com/BackButto';
-import { IconCalendar, IconClock, IconMapPin } from '@tabler/icons-react';
-
-const dataPengumuman = [
-  {
-    id: 1,
-    judul: 'Pendaftaran Bimbingan Belajar Gratis untuk Pelajar',
-    tanggal: 'Sabtu, 20 April 2025',
-    jam: '08:00 WITA',
-    lokasi: 'Balai Banjar Desa Darmasaba',
-    deskripsi: 'Dalam rangka meningkatkan kesadaran kesehatan, Pemerintah Desa Darmasaba bekerja sama dengan Puskesmas Abiansemal akan mengadakan pemeriksaan kesehatan gratis meliputi cek tekanan darah, kolesterol, gula darah, dan konsultasi gizi.'
-  },
-  {
-    id: 2,
-    judul: 'Lomba Video Pendek Hari Lingkungan',
-    tanggal: 'Deadline: 28 April 2025',
-    jam: '08:00 WITA',
-    lokasi: 'Online Submission',
-    deskripsi: 'Karang Taruna Desa mengadakan lomba video pendek bertema "Lingkunganku, Tanggung Jawabku". Pemenang akan diumumkan saat acara Hari Desa Hijau. Total hadiah Rp1.000.000.'
-  },
-  {
-    id: 3,
-    judul: 'Pendaftaran Bimbingan Belajar Gratis untuk Pelajar',
-    tanggal: 'Sabtu, 20 April 2025',
-    jam: '08:00 WITA',
-    lokasi: 'Balai Banjar Desa Darmasaba',
-    deskripsi: 'Dalam rangka meningkatkan kesadaran kesehatan, Pemerintah Desa Darmasaba bekerja sama dengan Puskesmas Abiansemal akan mengadakan pemeriksaan kesehatan gratis meliputi cek tekanan darah, kolesterol, gula darah, dan konsultasi gizi.'
-  },
-  {
-    id: 4,
-    judul: 'Lomba Video Pendek Hari Lingkungan',
-    tanggal: 'Deadline: 28 April 2025',
-    jam: '08:00 WITA',
-    lokasi: 'Online Submission',
-    deskripsi: 'Karang Taruna Desa mengadakan lomba video pendek bertema "Lingkunganku, Tanggung Jawabku". Pemenang akan diumumkan saat acara Hari Desa Hijau. Total hadiah Rp1.000.000.'
-  },
-  {
-    id: 5,
-    judul: 'Pendaftaran Bimbingan Belajar Gratis untuk Pelajar',
-    tanggal: 'Sabtu, 20 April 2025',
-    jam: '08:00 WITA',
-    lokasi: 'Balai Banjar Desa Darmasaba',
-    deskripsi: 'Dalam rangka meningkatkan kesadaran kesehatan, Pemerintah Desa Darmasaba bekerja sama dengan Puskesmas Abiansemal akan mengadakan pemeriksaan kesehatan gratis meliputi cek tekanan darah, kolesterol, gula darah, dan konsultasi gizi.'
-  },
-]
-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" >
-          <Text fz={{ base: "2rem", md: "3.4rem" }} c={colors["blue-button"]} fw="bold" ta="center">
-            Pengumuman Pendidikan & Kepemudaan
-          </Text>
-          <Text ta="center" px="md" pb={10}>
-            Informasi dan pengumuman resmi terkait pengumuman pendidikan & kepemudaan
-          </Text>
-        </Stack>
-      </Container>
-      <Box px={{ base: 'md', md: 100 }}>
-        {dataPengumuman.map((v, k) => {
-          return (
-            <Paper mb={10} key={k} withBorder p="lg" radius="md" shadow="md" bg={colors["white-1"]}>
-              <Text fz={'h3'}>{v.judul}</Text>
-              <Group style={{ color: 'black' }} pb={20}>
-                <Group gap="xs">
-                  <IconCalendar size={18} />
-                  <Text size="sm">{v.tanggal}</Text>
-                </Group>
-                <Group gap="xs">
-                  <IconClock size={18} />
-                  <Text size="sm">{v.jam}</Text>
-                </Group>
-                <Group gap="xs">
-                  <IconMapPin size={18} />
-                  <Text size="sm">{v.lokasi}</Text>
-                </Group>
-              </Group>
-              <Text ta={'justify'}>
-                {v.deskripsi}
-              </Text>
-            </Paper>
-          )
-        })}
-      </Box>
-    </Stack>
-  );
-}
-
-export default Page;

src/app/darmasaba/(pages)/desa/pengumuman/(kategori)/sosial-&-kesehatan/page.tsx

@@ -1,96 +0,0 @@
-import colors from '@/con/colors';
-import { Stack, Box, Container, Text, Paper, Group } from '@mantine/core';
-import React from 'react';
-import BackButton from '../../../layanan/_com/BackButto';
-import { IconCalendar, IconClock, IconMapPin } from '@tabler/icons-react';
-
-const dataPengumuman = [
-  {
-    id: 1,
-    judul: 'Pemeriksaan Kesehatan Gratis Untuk Warga Desa',
-    tanggal: 'Sabtu, 20 April 2025',
-    jam: '08:00 WITA',
-    lokasi: 'Balai Banjar Desa Darmasaba',
-    deskripsi: 'Dalam rangka meningkatkan kesadaran kesehatan, Pemerintah Desa Darmasaba bekerja sama dengan Puskesmas Abiansemal akan mengadakan pemeriksaan kesehatan gratis meliputi cek tekanan darah, kolesterol, gula darah, dan konsultasi gizi.'
-  },
-  {
-    id: 2,
-    judul: 'Pemeriksaan Kesehatan Gratis Untuk Warga Desa',
-    tanggal: 'Sabtu, 20 April 2025',
-    jam: '08:00 WITA',
-    lokasi: 'Balai Banjar Desa Darmasaba',
-    deskripsi: 'Dalam rangka meningkatkan kesadaran kesehatan, Pemerintah Desa Darmasaba bekerja sama dengan Puskesmas Abiansemal akan mengadakan pemeriksaan kesehatan gratis meliputi cek tekanan darah, kolesterol, gula darah, dan konsultasi gizi.'
-  },
-  {
-    id: 3,
-    judul: 'Pemeriksaan Kesehatan Gratis Untuk Warga Desa',
-    tanggal: 'Sabtu, 20 April 2025',
-    jam: '08:00 WITA',
-    lokasi: 'Balai Banjar Desa Darmasaba',
-    deskripsi: 'Dalam rangka meningkatkan kesadaran kesehatan, Pemerintah Desa Darmasaba bekerja sama dengan Puskesmas Abiansemal akan mengadakan pemeriksaan kesehatan gratis meliputi cek tekanan darah, kolesterol, gula darah, dan konsultasi gizi.'
-  },
-  {
-    id: 4,
-    judul: 'Pemeriksaan Kesehatan Gratis Untuk Warga Desa',
-    tanggal: 'Sabtu, 20 April 2025',
-    jam: '08:00 WITA',
-    lokasi: 'Balai Banjar Desa Darmasaba',
-    deskripsi: 'Dalam rangka meningkatkan kesadaran kesehatan, Pemerintah Desa Darmasaba bekerja sama dengan Puskesmas Abiansemal akan mengadakan pemeriksaan kesehatan gratis meliputi cek tekanan darah, kolesterol, gula darah, dan konsultasi gizi.'
-  },
-  {
-    id: 5,
-    judul: 'Pemeriksaan Kesehatan Gratis Untuk Warga Desa',
-    tanggal: 'Sabtu, 20 April 2025',
-    jam: '08:00 WITA',
-    lokasi: 'Balai Banjar Desa Darmasaba',
-    deskripsi: 'Dalam rangka meningkatkan kesadaran kesehatan, Pemerintah Desa Darmasaba bekerja sama dengan Puskesmas Abiansemal akan mengadakan pemeriksaan kesehatan gratis meliputi cek tekanan darah, kolesterol, gula darah, dan konsultasi gizi.'
-  },
-]
-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" >
-          <Text fz={{ base: "2rem", md: "3.4rem" }} c={colors["blue-button"]} fw="bold" ta="center">
-            Pengumuman Sosial & Kesehatan
-          </Text>
-          <Text ta="center" px="md" pb={10}>
-            Informasi dan pengumuman resmi terkait pengumuman sosial & kesehatan
-          </Text>
-        </Stack>
-      </Container>
-      <Box px={{ base: 'md', md: 100 }}>
-        {dataPengumuman.map((v, k) => {
-          return (
-            <Paper mb={10} key={k} withBorder p="lg" radius="md" shadow="md" bg={colors["white-1"]}>
-              <Text fz={'h3'}>{v.judul}</Text>
-              <Group style={{ color: 'black' }} pb={20}>
-                <Group gap="xs">
-                  <IconCalendar size={18} />
-                  <Text size="sm">{v.tanggal}</Text>
-                </Group>
-                <Group gap="xs">
-                  <IconClock size={18} />
-                  <Text size="sm">{v.jam}</Text>
-                </Group>
-                <Group gap="xs">
-                  <IconMapPin size={18} />
-                  <Text size="sm">{v.lokasi}</Text>
-                </Group>
-              </Group>
-              <Text ta={'justify'}>
-                {v.deskripsi}
-              </Text>
-            </Paper>
-          )
-        })}
-      </Box>
-    </Stack>
-  );
-}
-
-export default Page;

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

@@ -46,8 +46,8 @@ function Page() {
               </Group>
             </Group>
           <Paper bg={colors["white-1"]} p="md">
-            <Text id='news-content' fz={"md"} style={{wordBreak: "break-word", whiteSpace: "normal"}} dangerouslySetInnerHTML={{ __html: detail.data?.content }} />
-            <Text fz={"md"} c={colors["blue-button"]} fw="bold" >
+            <Text px="lg" id='news-content' fz={"md"} style={{wordBreak: "break-word", whiteSpace: "normal"}} dangerouslySetInnerHTML={{ __html: detail.data?.content }} />
+            <Text px="lg" fz={"md"} c={colors["blue-button"]} fw="bold" >
               {new Date(detail.data?.createdAt).toLocaleDateString('id-ID', {
                 weekday: 'long',
                 day: 'numeric',

src/app/darmasaba/(pages)/desa/profile/struktur-perangkat-desa/page.tsx

@@ -14,6 +14,9 @@ import {
   Loader,
   Paper,
   Stack,
+  Tabs,
+  TabsList,
+  TabsTab,
   Text,
   TextInput,
   Title,
@@ -35,6 +38,7 @@ import { useEffect, useRef, useState } from 'react'
 import { useProxy } from 'valtio/utils'
 import './struktur.css'
 import BackButton from '../_com/BackButto'
+import { useMediaQuery } from '@mantine/hooks'
 
 export default function StrukturPerangkatDesa() {
   return (
@@ -231,87 +235,121 @@ function StrukturPerangkatDesaNode() {
         p="md"
         radius="md"
         style={{
-          background: colors['blue-button']
+          background: colors['blue-button'],
+          width: '100%',       // ⬅️ penting
+          maxWidth: '100%',    // ⬅️ penting
+          overflowX: 'auto'    // ⬅️ untuk mencegah overflow
         }}
       >
-        <Group gap="sm" wrap="wrap" justify="center">
-          <TextInput
-            placeholder="Cari nama atau jabatan..."
-            leftSection={<IconSearch size={16} />}
-            onChange={(e) => debouncedSearch(e.target.value)}
+
+        <Stack gap="sm">
+          <Group justify='center'>
+            <TextInput
+              placeholder="Cari nama atau jabatan..."
+              leftSection={<IconSearch size={16} />}
+              onChange={(e) => debouncedSearch(e.target.value)}
+              styles={{
+                input: {
+                  minWidth: 250,
+                },
+              }}
+            />
+          </Group>
+          <Tabs
+            defaultValue="zoom-out"
+            variant="outline"
+            radius="md"
             styles={{
-              input: {
-                minWidth: 250,
+              panel: { display: 'none' },
+              tab: {
+                color: colors['blue-button'],
+                backgroundColor: colors['blue-button-2'],
+                border: 'none',
+                fontWeight: 600,
+                fontSize: '0.875rem',
+                padding: '6px 12px',
+                minHeight: 'auto',
+                flexShrink: 0, // 👈 PENTING: mencegah tab mengecil
               },
             }}
-          />
-
-          <Group gap="xs">
-            <Button
-              variant="light"
-              bg={colors['blue-button-2']}
-              size="sm"
-              onClick={handleZoomOut}
-              leftSection={<IconZoomOut size={16} />}
-              c={colors['blue-button']}
-            >
-              Zoom Out
-            </Button>
-
-            <Box
-              bg={colors['blue-button-2']}
-              c={colors['blue-button']}
-              px={16}
-              py={8}
+          >
+            <TabsList
               style={{
-                fontSize: 14,
-                fontWeight: 700,
-                borderRadius: '8px',
-                minWidth: 70,
-                textAlign: 'center',
+                display: 'flex',
+                overflowX: 'auto',
+                overflowY: 'hidden', // 👈 tambahkan ini
+                gap: '4px',
+                paddingBottom: '4px',
+                flexWrap: 'nowrap',
+                WebkitOverflowScrolling: 'touch', // 👈 smooth scroll di iOS
+                scrollbarWidth: 'thin', // 👈 scrollbar tipis di Firefox
+                msOverflowStyle: '-ms-autohiding-scrollbar', // 👈 untuk IE/Edge
               }}
             >
-              {Math.round(scale * 100)}%
-            </Box>
+              <TabsTab
+                value="zoom-out"
+                onClick={handleZoomOut}
+                leftSection={<IconZoomOut size={16} />}
+                style={{ flexShrink: 0 }} // 👈 pastikan tidak mengecil
+              >
+                Zoom Out
+              </TabsTab>
 
-            <Button
-              bg={colors['blue-button-2']}
-              c={colors['blue-button']}
-              variant="light"
-              size="sm"
-              onClick={handleZoomIn}
-              leftSection={<IconZoomIn size={16} />}
-            >
-              Zoom In
-            </Button>
+              <Box
+                bg={colors['blue-button-2']}
+                c={colors['blue-button']}
+                px={12}
+                py={6}
+                style={{
+                  fontSize: 14,
+                  fontWeight: 700,
+                  borderRadius: '6px',
+                  minWidth: 60,
+                  textAlign: 'center',
+                  display: 'flex',
+                  alignItems: 'center',
+                  justifyContent: 'center',
+                  flexShrink: 0,
+                  whiteSpace: 'nowrap', // 👈 mencegah text wrap
+                }}
+              >
+                {Math.round(scale * 100)}%
+              </Box>
 
-            <Button
-              bg={colors['blue-button-2']}
-              c={colors['blue-button']}
-              variant="light"
-              size="sm"
-              onClick={resetZoom}
-            >
-              Reset
-            </Button>
+              <TabsTab
+                value="zoom-in"
+                onClick={handleZoomIn}
+                leftSection={<IconZoomIn size={16} />}
+                style={{ flexShrink: 0 }}
+              >
+                Zoom In
+              </TabsTab>
 
-            <Button
-              bg={colors['blue-button-2']}
-              c={colors['blue-button']}
-              size="sm"
-              onClick={toggleFullscreen}
-              leftSection={
-                isFullscreen ? (
-                  <IconArrowsMinimize size={16} />
-                ) : (
-                  <IconArrowsMaximize size={16} />
-                )
-              }
-            >
-              Fullscreen
-            </Button>
-          </Group>
-        </Group>
+              <TabsTab
+                value="reset"
+                onClick={resetZoom}
+                style={{ flexShrink: 0 }}
+              >
+                Reset
+              </TabsTab>
+
+              <TabsTab
+                value="fullscreen"
+                onClick={toggleFullscreen}
+                leftSection={
+                  isFullscreen ? (
+                    <IconArrowsMinimize size={16} />
+                  ) : (
+                    <IconArrowsMaximize size={16} />
+                  )
+                }
+                style={{ flexShrink: 0 }}
+              >
+                {isFullscreen ? 'Exit' : 'Fullscreen'}
+              </TabsTab>
+            </TabsList>
+          </Tabs>
+        </Stack>
       </Paper>
 
       {/* 🧩 Chart Container */}
@@ -325,15 +363,20 @@ function StrukturPerangkatDesaNode() {
             maxWidth: '100%',
             padding: '32px 16px',
             transition: 'transform 0.2s ease',
-            transform: `scale(${scale})`,
-            transformOrigin: 'center top',
           }}
         >
-          <OrganizationChart
-            value={chartData}
-            nodeTemplate={(node) => <NodeCard node={node} router={router} />}
-            className="p-organizationchart p-organizationchart-horizontal"
-          />
+          <Box style={{
+            transform: `scale(${scale})`,
+            transformOrigin: 'center top',
+            display: 'inline-block', // 👈 agar tidak memenuhi lebar parent
+            minWidth: 'min-content', // 👈 penting agar chart tidak dipaksa muat di width 100%
+          }}>
+            <OrganizationChart
+              value={chartData}
+              nodeTemplate={(node) => <NodeCard node={node} router={router} />}
+              className="p-organizationchart p-organizationchart-horizontal"
+            />
+          </Box>
         </Box>
       </Center>
     </Stack>
@@ -345,6 +388,7 @@ function NodeCard({ node, router }: any) {
   const name = node?.data?.name || 'Tanpa Nama'
   const title = node?.data?.title || 'Tanpa Jabatan'
   const hasId = Boolean(node?.data?.id)
+  const isMobile = useMediaQuery("(max-width: 768px)");
 
   return (
     <Transition mounted transition="pop" duration={300}>
@@ -355,9 +399,10 @@ function NodeCard({ node, router }: any) {
           withBorder
           style={{
             ...styles,
-            width: 240,
-            minHeight: 280,
-            padding: 20,
+            width: '100%',
+            maxWidth: isMobile ? 200 : 240, // lebih kecil di mobile
+            minHeight: isMobile ? 240 : 280,
+            padding: isMobile ? 16 : 20,
             background: 'linear-gradient(135deg, rgba(28,110,164,0.15) 0%, rgba(255,255,255,0.95) 100%)',
             borderColor: 'rgba(28, 110, 164, 0.3)',
             borderWidth: 2,

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

@@ -42,9 +42,7 @@ function Page() {
   const alamat = data?.informasiumum?.alamat || '-';
   const jam = data?.informasiumum?.jamOperasional || '-';
   const layananUnggulan = data?.layananunggulan?.content || '';
-  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: '6289647037426',
@@ -177,7 +175,9 @@ function Page() {
                 <Title order={4}>Layanan Unggulan</Title>
                 <Divider />
                 {layananUnggulan ? (
-                  <Text fz="md" style={{ lineHeight: 1.7, wordBreak: "break-word", whiteSpace: "normal" }} dangerouslySetInnerHTML={{ __html: layananUnggulan }} />
+                  <Box pl={"lg"}>
+                    <Text fz="md" style={{ lineHeight: 1.7, wordBreak: "break-word", whiteSpace: "normal" }} dangerouslySetInnerHTML={{ __html: layananUnggulan }} />
+                  </Box>
                 ) : (
                   <Paper withBorder radius="md" p="md">
                     <Group gap="sm">
@@ -211,7 +211,7 @@ function Page() {
               <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">
+                  <Table highlightOnHover withTableBorder withColumnBorders aria-label="Tabel Dokter">
                     <TableThead>
                       <TableTr>
                         <TableTh>Nama</TableTh>
@@ -220,12 +220,19 @@ function Page() {
                       </TableTr>
                     </TableThead>
                     <TableTbody>
-                      {tenaga ? (
-                        <TableTr>
-                          <TableTd><Group gap="xs"><IconUser size={16} /><Text>{tenaga?.name || '-'}</Text></Group></TableTd>
-                          <TableTd>{tenaga?.specialist || '-'}</TableTd>
-                          <TableTd>{tenaga?.jadwal || '-'}</TableTd>
-                        </TableTr>
+                      {Array.isArray(data?.dokterdantenagamedis) && data.dokterdantenagamedis.length > 0 ? (
+                        data.dokterdantenagamedis.map((dokter: any) => (
+                          <TableTr key={dokter.id}>
+                            <TableTd>
+                              <Group gap="xs">
+                                <IconUser size={16} />
+                                <Text>{dokter.name || '-'}</Text>
+                              </Group>
+                            </TableTd>
+                            <TableTd>{dokter.specialist || '-'}</TableTd>
+                            <TableTd>{dokter.jadwal || '-'}</TableTd>
+                          </TableTr>
+                        ))
                       ) : (
                         <TableTr>
                           <TableTd colSpan={3}>
@@ -241,72 +248,76 @@ function Page() {
                 </Stack>
               </Card>
 
-             <Card radius="xl" p="lg" withBorder>
-              <Stack gap="md">
-                <Title order={3}>Fasilitas Pendukung</Title>
-                <Divider />
-                {fasilitasPendukungHtml ? (
-                  <Text fz="md" style={{wordBreak: "break-word", whiteSpace: "normal", 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>
+              <Card radius="xl" p="lg" withBorder>
+                <Stack gap="md">
+                  <Title order={3}>Fasilitas Pendukung</Title>
+                  <Divider />
+                  {fasilitasPendukungHtml ? (
+                    <Box pl="lg">
+                      <Text fz="md" style={{ wordBreak: "break-word", whiteSpace: "normal", lineHeight: 1.7 }} dangerouslySetInnerHTML={{ __html: fasilitasPendukungHtml }} />
+                    </Box>
+                  ) : (
+                    <Paper withBorder radius="md" p="md">
+                      <Group gap="sm">
+                        <IconMoodEmpty />
+                        <Text>Belum ada informasi fasilitas pendukung.</Text>
+                      </Group>
+                    </Paper>
+                  )}
+                </Stack>
+              </Card>
 
-            <Card radius="xl" p="lg" withBorder>
-              <Stack gap="md">
-                <Title order={3}>Layanan & Tarif</Title>
-                <Divider />
-                <Table highlightOnHover withTableBorder withColumnBorders aria-label="Tabel Layanan dan Tarif">
-                  <TableThead>
-                    <TableTr>
-                      <TableTh>Layanan</TableTh>
-                      <TableTh>Tarif</TableTh>
-                    </TableTr>
-                  </TableThead>
-                  <TableTbody>
-                    {tarif ? (
+              <Card radius="xl" p="lg" withBorder>
+                <Stack gap="md">
+                  <Title order={3}>Layanan & Tarif</Title>
+                  <Divider />
+                  <Table highlightOnHover withTableBorder withColumnBorders aria-label="Tabel Layanan dan Tarif">
+                    <TableThead>
                       <TableTr>
-                        <TableTd>{tarif?.layanan || '-'}</TableTd>
-                        <TableTd>{formatRupiah(tarif?.tarif)}</TableTd>
+                        <TableTh>Layanan</TableTh>
+                        <TableTh>Tarif</TableTh>
                       </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>
-                {gratisBpjs && (
-                  <Group gap="xs">
-                    <ThemeIcon variant="light" radius="xl"><IconCheck size={18} /></ThemeIcon>
-                    <Text fw={600}>Gratis dengan BPJS Kesehatan</Text>
-                  </Group>
-                )}
-              </Stack>
-            </Card>
+                    </TableThead>
+                    <TableTbody>
+                      {Array.isArray(data?.tarifdanlayanan) && data.tarifdanlayanan.length > 0 ? (
+                        data.tarifdanlayanan.map((item: any) => (
+                          <TableTr key={item.id}>
+                            <TableTd>{item.layanan || '-'}</TableTd>
+                            <TableTd>{formatRupiah(item.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>
+                  {gratisBpjs && (
+                    <Group gap="xs">
+                      <ThemeIcon variant="light" radius="xl"><IconCheck size={18} /></ThemeIcon>
+                      <Text fw={600}>Gratis dengan BPJS Kesehatan</Text>
+                    </Group>
+                  )}
+                </Stack>
+              </Card>
             </Stack>
           </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 />
             {prosedur ? (
-              <Text fz="md" style={{wordBreak: "break-word", whiteSpace: "normal", lineHeight: 1.7 }} dangerouslySetInnerHTML={{ __html: prosedur }} />
+              <Box pl="lg"><Text fz="md" style={{ wordBreak: "break-word", whiteSpace: "normal", lineHeight: 1.7 }} dangerouslySetInnerHTML={{ __html: prosedur }} /></Box>
             ) : (
               <Text fz="md" c="dimmed">Belum ada prosedur pendaftaran</Text>
             )}

src/app/darmasaba/(pages)/ppid/daftar-informasi-publik/[id]/page.tsx

@@ -87,7 +87,7 @@ export default function DetailInformasiPublikUser() {
           <Divider />
 
           <Stack gap="lg">
-            <Box>
+            <Box px="lg">
               <Text fz={{ base: 'md', md: 'lg' }} fw="bold" mb={4}>
                 Jenis Informasi
               </Text>
@@ -96,7 +96,7 @@ export default function DetailInformasiPublikUser() {
               </Text>
             </Box>
 
-            <Box>
+            <Box px="lg">
               <Text fz={{ base: 'md', md: 'lg' }} fw="bold" mb={4}>
                 Tanggal Publikasi
               </Text>
@@ -111,15 +111,19 @@ export default function DetailInformasiPublikUser() {
               </Text>
             </Box>
 
-            <Box>
+            <Box px="lg">
               <Text fz={{ base: 'md', md: 'lg' }} fw="bold" mb={4}>
                 Deskripsi
               </Text>
-              <Box
-                className="prose max-w-none leading-relaxed"
-                dangerouslySetInnerHTML={{ __html: data.deskripsi || '-' }}
-                style={{wordBreak: "break-word", whiteSpace: "normal"}}
-              />
+              <Box>
+                <Text
+                  ta={"justify"}
+                  className="prose max-w-none leading-relaxed"
+                  dangerouslySetInnerHTML={{ __html: data.deskripsi || '-' }}
+                  style={{ wordBreak: "break-word", whiteSpace: "normal" }}
+                  fz={{ base: 'md', md: 'lg' }}
+                />
+              </Box>
             </Box>
           </Stack>
         </Stack>

src/app/darmasaba/(pages)/ppid/daftar-informasi-publik/page.tsx

@@ -151,7 +151,7 @@ function Page() {
                               variant="light"
                               color="blue"
                               leftSection={<IconDeviceImacCog size={16} />}
-                              onClick={() => router.push(`/darmasaba/ppid/daftar-informasi-publik-desa-darmasaba/${item.id}`)}
+                              onClick={() => router.push(`/darmasaba/ppid/daftar-informasi-publik/${item.id}`)}
                             >
                               Detail
                             </Button>

src/app/darmasaba/(pages)/ppid/dasar-hukum/page.tsx

@@ -31,7 +31,11 @@ function Page() {
       <Box px={{ base: 'md', md: 100 }}>
         <BackButton />
       </Box>
-      <Stack align="center" gap="xs">
+      <Stack
+        align="center"
+        gap="xs"
+        px={{ base: 'md', md: 100 }}
+      >
         <IconBook2 size={42} stroke={1.5} color={colors["blue-button"]} />
         <Text
           ta="center"
@@ -42,7 +46,7 @@ function Page() {
         >
           Dasar Hukum
         </Text>
-        <Text ta="center" fz="md" >
+        <Text ta="center" fz="md" c={"black"}>
           Informasi regulasi dan kebijakan resmi yang menjadi dasar hukum
         </Text>
       </Stack>
@@ -71,12 +75,15 @@ function Page() {
                   <Stack gap="md">
                     <Text
                       ta="center"
+                      c={"black"}
                       fw="bold"
                       fz={{ base: 'lg', md: 'xl' }}
                       style={{ lineHeight: 1.4 }}
                       dangerouslySetInnerHTML={{ __html: item.judul }}
                     />
                     <Text
+                      c={"black"}
+                      ta={"justify"}
                       fz={{ base: 'sm', md: 'md' }}
                       style={{ lineHeight: 1.7, wordBreak: "break-word", whiteSpace: "normal" }}
                       dangerouslySetInnerHTML={{ __html: item.content }}

src/app/darmasaba/(pages)/ppid/indeks-kepuasan-masyarakat/page.tsx

@@ -598,7 +598,7 @@ const state = useProxy(indeksKepuasanState.responden);
             <TextInput
               label="Nama"
               type='text'
-              placeholder="masukkan nama"
+              placeholder="Masukkan nama"
               value={state.create.form.name}
               onChange={(val) => {
                 state.create.form.name = val.currentTarget.value;
@@ -607,7 +607,7 @@ const state = useProxy(indeksKepuasanState.responden);
             <TextInput
               label="Tanggal Pengisian"
               type="date"
-              placeholder="masukkan tanggal"
+              placeholder="Masukkan tanggal"
               value={state.create.form.tanggal}
               onChange={(val) => {
                 state.create.form.tanggal = val.currentTarget.value;

src/app/darmasaba/(pages)/ppid/permohonan-informasi-publik/page.tsx

@@ -53,23 +53,11 @@ function Page() {
   const permohonanInformasiPublikState = useProxy(statePermohonanInformasi);
   const router = useRouter();
 
-  const submitForms = () => {
+  const submitForms = async () => {
     const { create } = permohonanInformasiPublikState.statepermohonanInformasiPublik;
-
-    if (
-      create.form.name &&
-      create.form.nik &&
-      create.form.notelp &&
-      create.form.alamat &&
-      create.form.email &&
-      create.form.jenisInformasiDimintaId &&
-      create.form.caraMemperolehInformasiId &&
-      create.form.caraMemperolehSalinanInformasiId
-    ) {
-      create.create();
+    const hasil = await create.create(); // tunggu hasilnya
+    if (hasil) {
       router.push('/darmasaba/permohonan/berhasil');
-    } else {
-      console.log('Validasi gagal, form tidak lengkap');
     }
   };
 

src/app/darmasaba/(pages)/ppid/permohonan-keberatan-informasi-publik/page.tsx

@@ -55,17 +55,13 @@ function Page() {
   const stateKeberatan = useProxy(permohonanKeberatanInformasi);
   const router = useRouter();
 
-  const submit = () => {
-    if (
-      stateKeberatan.create.form.name &&
-      stateKeberatan.create.form.email &&
-      stateKeberatan.create.form.notelp &&
-      stateKeberatan.create.form.alasan
-    ) {
-      stateKeberatan.create.create();
+  const submit = async () => {
+    const { create } = stateKeberatan;
+
+    const hasil = await create.create(); // tunggu hasilnya
+
+    if (hasil) {
       router.push('/darmasaba/permohonan/berhasil');
-    } else {
-      console.log('Formulir belum lengkap');
     }
   };
 
@@ -190,7 +186,7 @@ function Page() {
 
                   <TextInput
                     label="Nomor Telepon"
-                    placeholder="Contoh: 0812-3456-7890"
+                    placeholder="Contoh: 081234567890"
                     radius="md"
                     size="md"
                     withAsterisk

src/app/darmasaba/(pages)/ppid/profile-ppid/page.tsx

@@ -96,14 +96,20 @@ function Page() {
                           <IconUser size={28} />
                           <Text fz={{ base: "1.25rem", md: "1.5rem" }} fw="bold">Biografi</Text>
                         </Flex>
-                        <Text fz={{ base: "1rem", md: "1.125rem", lg: "1.25rem" }} ta="justify" dangerouslySetInnerHTML={{ __html: item.biodata }} style={{ wordBreak: "break-word", whiteSpace: "normal" }} />
+                        <Box px={20}>
+                          <Text fz={{ base: "1rem", md: "1.125rem", lg: "1.25rem" }} ta="justify" dangerouslySetInnerHTML={{ __html: item.biodata }} style={{ wordBreak: "break-word", whiteSpace: "normal" }} />
+                        </Box>
                       </Box>
                       <Box>
                         <Flex align="center" gap="sm" mb="sm">
                           <IconTimeline size={28} />
                           <Text fz={{ base: "1.25rem", md: "1.5rem" }} fw="bold">Riwayat Karir</Text>
                         </Flex>
-                        <Text fz={{ base: "1rem", md: "1.125rem", lg: "1.25rem" }} dangerouslySetInnerHTML={{ __html: item.riwayat }} style={{ wordBreak: "break-word", whiteSpace: "normal" }} />
+                        <List spacing="xs" size="sm">
+                          <Box px={20}>
+                            <Text fz={{ base: "1rem", md: "1.125rem", lg: "1.25rem" }} dangerouslySetInnerHTML={{ __html: item.riwayat }} style={{ wordBreak: "break-word", whiteSpace: "normal" }} />
+                          </Box>
+                        </List>
                       </Box>
                     </Stack>
                   </Box>

src/app/darmasaba/(pages)/ppid/struktur-ppid/page.tsx

@@ -14,6 +14,9 @@ import {
   Loader,
   Paper,
   Stack,
+  Tabs,
+  TabsList,
+  TabsTab,
   Text,
   TextInput,
   Title,
@@ -35,6 +38,7 @@ import { useEffect, useRef, useState } from 'react'
 import { useProxy } from 'valtio/utils'
 import BackButton from '../../desa/layanan/_com/BackButto'
 import './struktur.css'
+import { useMediaQuery } from '@mantine/hooks'
 
 export default function Page() {
   return (
@@ -231,87 +235,121 @@ function StrukturOrganisasiPPID() {
         p="md"
         radius="md"
         style={{
-          background: colors['blue-button']
+          background: colors['blue-button'],
+          width: '100%',       // ⬅️ penting
+          maxWidth: '100%',    // ⬅️ penting
+          overflowX: 'auto'    // ⬅️ untuk mencegah overflow
         }}
       >
-        <Group gap="sm" wrap="wrap" justify="center">
-          <TextInput
-            placeholder="Cari nama atau jabatan..."
-            leftSection={<IconSearch size={16} />}
-            onChange={(e) => debouncedSearch(e.target.value)}
+
+        <Stack gap="sm">
+          <Group justify='center'>
+            <TextInput
+              placeholder="Cari nama atau jabatan..."
+              leftSection={<IconSearch size={16} />}
+              onChange={(e) => debouncedSearch(e.target.value)}
+              styles={{
+                input: {
+                  minWidth: 250,
+                },
+              }}
+            />
+          </Group>
+          <Tabs
+            defaultValue="zoom-out"
+            variant="outline"
+            radius="md"
             styles={{
-              input: {
-                minWidth: 250,
+              panel: { display: 'none' },
+              tab: {
+                color: colors['blue-button'],
+                backgroundColor: colors['blue-button-2'],
+                border: 'none',
+                fontWeight: 600,
+                fontSize: '0.875rem',
+                padding: '6px 12px',
+                minHeight: 'auto',
+                flexShrink: 0, // 👈 PENTING: mencegah tab mengecil
               },
             }}
-          />
-
-          <Group gap="xs">
-            <Button
-              variant="light"
-              bg={colors['blue-button-2']}
-              size="sm"
-              onClick={handleZoomOut}
-              leftSection={<IconZoomOut size={16} />}
-              c={colors['blue-button']}
-            >
-              Zoom Out
-            </Button>
-
-            <Box
-              bg={colors['blue-button-2']}
-              c={colors['blue-button']}
-              px={16}
-              py={8}
+          >
+            <TabsList
               style={{
-                fontSize: 14,
-                fontWeight: 700,
-                borderRadius: '8px',
-                minWidth: 70,
-                textAlign: 'center',
+                display: 'flex',
+                overflowX: 'auto',
+                overflowY: 'hidden', // 👈 tambahkan ini
+                gap: '4px',
+                paddingBottom: '4px',
+                flexWrap: 'nowrap',
+                WebkitOverflowScrolling: 'touch', // 👈 smooth scroll di iOS
+                scrollbarWidth: 'thin', // 👈 scrollbar tipis di Firefox
+                msOverflowStyle: '-ms-autohiding-scrollbar', // 👈 untuk IE/Edge
               }}
             >
-              {Math.round(scale * 100)}%
-            </Box>
+              <TabsTab
+                value="zoom-out"
+                onClick={handleZoomOut}
+                leftSection={<IconZoomOut size={16} />}
+                style={{ flexShrink: 0 }} // 👈 pastikan tidak mengecil
+              >
+                Zoom Out
+              </TabsTab>
 
-            <Button
-              bg={colors['blue-button-2']}
-              c={colors['blue-button']}
-              variant="light"
-              size="sm"
-              onClick={handleZoomIn}
-              leftSection={<IconZoomIn size={16} />}
-            >
-              Zoom In
-            </Button>
+              <Box
+                bg={colors['blue-button-2']}
+                c={colors['blue-button']}
+                px={12}
+                py={6}
+                style={{
+                  fontSize: 14,
+                  fontWeight: 700,
+                  borderRadius: '6px',
+                  minWidth: 60,
+                  textAlign: 'center',
+                  display: 'flex',
+                  alignItems: 'center',
+                  justifyContent: 'center',
+                  flexShrink: 0,
+                  whiteSpace: 'nowrap', // 👈 mencegah text wrap
+                }}
+              >
+                {Math.round(scale * 100)}%
+              </Box>
 
-            <Button
-              bg={colors['blue-button-2']}
-              c={colors['blue-button']}
-              variant="light"
-              size="sm"
-              onClick={resetZoom}
-            >
-              Reset
-            </Button>
+              <TabsTab
+                value="zoom-in"
+                onClick={handleZoomIn}
+                leftSection={<IconZoomIn size={16} />}
+                style={{ flexShrink: 0 }}
+              >
+                Zoom In
+              </TabsTab>
 
-            <Button
-              bg={colors['blue-button-2']}
-              c={colors['blue-button']}
-              size="sm"
-              onClick={toggleFullscreen}
-              leftSection={
-                isFullscreen ? (
-                  <IconArrowsMinimize size={16} />
-                ) : (
-                  <IconArrowsMaximize size={16} />
-                )
-              }
-            >
-              Fullscreen
-            </Button>
-          </Group>
-        </Group>
+              <TabsTab
+                value="reset"
+                onClick={resetZoom}
+                style={{ flexShrink: 0 }}
+              >
+                Reset
+              </TabsTab>
+
+              <TabsTab
+                value="fullscreen"
+                onClick={toggleFullscreen}
+                leftSection={
+                  isFullscreen ? (
+                    <IconArrowsMinimize size={16} />
+                  ) : (
+                    <IconArrowsMaximize size={16} />
+                  )
+                }
+                style={{ flexShrink: 0 }}
+              >
+                {isFullscreen ? 'Exit' : 'Fullscreen'}
+              </TabsTab>
+            </TabsList>
+          </Tabs>
+        </Stack>
       </Paper>
 
       {/* 🧩 Chart Container */}
@@ -325,15 +363,20 @@ function StrukturOrganisasiPPID() {
             maxWidth: '100%',
             padding: '32px 16px',
             transition: 'transform 0.2s ease',
-            transform: `scale(${scale})`,
-            transformOrigin: 'center top',
           }}
         >
-          <OrganizationChart
-            value={chartData}
-            nodeTemplate={(node) => <NodeCard node={node} router={router} />}
-            className="p-organizationchart p-organizationchart-horizontal"
-          />
+          <Box style={{
+            transform: `scale(${scale})`,
+            transformOrigin: 'center top',
+            display: 'inline-block', // 👈 agar tidak memenuhi lebar parent
+            minWidth: 'min-content', // 👈 penting agar chart tidak dipaksa muat di width 100%
+          }}>
+            <OrganizationChart
+              value={chartData}
+              nodeTemplate={(node) => <NodeCard node={node} router={router} />}
+              className="p-organizationchart p-organizationchart-horizontal"
+            />
+          </Box>
         </Box>
       </Center>
     </Stack>
@@ -345,6 +388,7 @@ function NodeCard({ node, router }: any) {
   const name = node?.data?.name || 'Tanpa Nama'
   const title = node?.data?.title || 'Tanpa Jabatan'
   const hasId = Boolean(node?.data?.id)
+  const isMobile = useMediaQuery("(max-width: 768px)");
 
   return (
     <Transition mounted transition="pop" duration={300}>
@@ -355,9 +399,10 @@ function NodeCard({ node, router }: any) {
           withBorder
           style={{
             ...styles,
-            width: 240,
-            minHeight: 280,
-            padding: 20,
+            width: '100%',
+            maxWidth: isMobile ? 200 : 240, // lebih kecil di mobile
+            minHeight: isMobile ? 240 : 280,
+            padding: isMobile ? 16 : 20,
             background: 'linear-gradient(135deg, rgba(28,110,164,0.15) 0%, rgba(255,255,255,0.95) 100%)',
             borderColor: 'rgba(28, 110, 164, 0.3)',
             borderWidth: 2,
@@ -411,6 +456,7 @@ function NodeCard({ node, router }: any) {
               c={colors['blue-button']}
               lineClamp={2}
               style={{
+                // fontSize: 'clamp(12px, 4vw, 16px)', // 👈 responsif font size
                 minHeight: 40,
                 display: 'flex',
                 alignItems: 'center',

src/app/darmasaba/(pages)/ppid/visi-misi-ppid/page.tsx

@@ -75,7 +75,7 @@ function Page() {
                       lh={1.7}
                       ta="center"
                       dangerouslySetInnerHTML={{ __html: item.visi }}
-                      style={{wordBreak: "break-word", whiteSpace: "normal"}}
+                      style={{ wordBreak: "break-word", whiteSpace: "normal" }}
                     />
                   </Box>
 
@@ -86,12 +86,15 @@ function Page() {
                       c={colors['blue-button']} mb="sm">
                       Misi PPID
                     </Text>
-                    <Text
-                      fz={{ base: 'md', md: 'lg' }}
-                      lh={1.7}
-                      dangerouslySetInnerHTML={{ __html: item.misi }}
-                      style={{wordBreak: "break-word", whiteSpace: "normal"}}
-                    />
+                    <Box px={{ base: 'md', md: 100 }}>
+                      <Text
+                        ta={"justify"}
+                        fz={{ base: 'md', md: 'lg' }}
+                        lh={1.7}
+                        dangerouslySetInnerHTML={{ __html: item.misi }}
+                        style={{ wordBreak: "break-word", whiteSpace: "normal" }}
+                      />
+                    </Box>
                   </Box>
                 </Stack>
               </Paper>

src/app/darmasaba/(tambahan)/apbdes/lib/apbDesaProgress.tsx

@@ -1,13 +1,8 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-// src/app/admin/(dashboard)/landing-page/APBDes/APBDesProgress.tsx
 'use client';
 
-import { Box, Paper, Progress, Stack, Text, Title } from '@mantine/core';
-import { useProxy } from 'valtio/utils';
-import apbdes from '@/app/admin/(dashboard)/_state/landing-page/apbdes';
 import colors from '@/con/colors';
-
-
+import { Box, Paper, Progress, Stack, Text, Title } from '@mantine/core';
+import { APBDesData } from './types';
 
 function formatRupiah(value: number) {
   return new Intl.NumberFormat('id-ID', {
@@ -17,31 +12,33 @@ function formatRupiah(value: number) {
   }).format(value);
 }
 
-function APBDesProgress() {
-  const state = useProxy(apbdes);
-  const data = state.findMany.data || [];
+interface APBDesProgressProps {
+  apbdesData: APBDesData;
+}
 
-  // Ambil APBDes pertama (misalnya, jika hanya satu tahun ditampilkan)
-  const apbdesItem = data[0]; // 👈 sesuaikan logika jika ada banyak APBDes
-
-  if (!apbdesItem) {
-    return (
-      <Box py="md" px={{ base: 'md', md: 100 }}>
-        <Text c="dimmed">Belum ada data APBDes untuk ditampilkan.</Text>
-      </Box>
-    );
+function APBDesProgress({ apbdesData }: APBDesProgressProps) {
+  // Return null if apbdesData is not available yet
+  if (!apbdesData) {
+    return null;
   }
 
-  const items = apbdesItem.items || [];
+  const items = apbdesData.items || [];
   const sortedItems = [...items].sort((a, b) => a.kode.localeCompare(b.kode));
 
   // Kelompokkan berdasarkan tipe
   const pendapatanItems = sortedItems.filter(item => item.tipe === 'pendapatan');
   const belanjaItems = sortedItems.filter(item => item.tipe === 'belanja');
-  const pembiayaanItems = sortedItems.filter(item => item.tipe === 'pembiayaan'); // jika ada
+  const pembiayaanItems = sortedItems.filter(item => item.tipe === 'pembiayaan');
+  
+  // Items without a type (should be filtered out from calculations)
+  const untypedItems = sortedItems.filter(item => !item.tipe);
+  
+  if (untypedItems.length > 0) {
+    console.warn(`Found ${untypedItems.length} items without a type. These will be excluded from calculations.`);
+  }
 
   // Hitung total per kategori
-  const calcTotal = (items: any[]) => {
+  const calcTotal = (items: { anggaran: number; realisasi: number }[]) => {
     const anggaran = items.reduce((sum, item) => sum + item.anggaran, 0);
     const realisasi = items.reduce((sum, item) => sum + item.realisasi, 0);
     const persen = anggaran > 0 ? (realisasi / anggaran) * 100 : 0;
@@ -50,10 +47,10 @@ function APBDesProgress() {
 
   const pendapatan = calcTotal(pendapatanItems);
   const belanja = calcTotal(belanjaItems);
-  const pembiayaan = calcTotal(pembiayaanItems); // bisa kosong
+  const pembiayaan = calcTotal(pembiayaanItems);
 
   // Render satu progress bar
-  const renderProgress = (label: string, dataset: any) => {
+  const renderProgress = (label: string, dataset: { realisasi: number; anggaran: number; persen: number }) => {
     const isPembiayaan = label.includes('Pembiayaan');
 
     return (
@@ -71,8 +68,8 @@ function APBDesProgress() {
             root: { backgroundColor: '#d7e3f1' },
             section: {
               backgroundColor: isPembiayaan
-                ? 'green' // warna hijau untuk pembiayaan
-                : colors['blue-button'], // biru untuk pendapatan/belanja
+                ? 'green'
+                : colors['blue-button'],
               position: 'relative',
               '&::after': {
                 content: `'${dataset.persen.toFixed(2)}%'`,
@@ -102,7 +99,7 @@ function APBDesProgress() {
     >
       <Stack gap="lg">
         <Title order={4} c={colors['blue-button']} ta="center">
-          Grafik Pelaksanaan APBDes Tahun {apbdesItem.tahun}
+          Grafik Pelaksanaan APBDes Tahun {apbdesData.tahun}
         </Title>
 
         <Text ta="center" fw="bold" fz="sm" c="dimmed">
@@ -112,97 +109,9 @@ function APBDesProgress() {
         {renderProgress('Pendapatan Desa', pendapatan)}
         {renderProgress('Belanja Desa', belanja)}
         {renderProgress('Pembiayaan Desa', pembiayaan)}
-        {pembiayaanItems.length > 0 && renderProgress('Pembiayaan Desa', pembiayaan)}
       </Stack>
     </Paper>
   );
 }
 
-export default APBDesProgress;
-
-// /* eslint-disable @typescript-eslint/no-explicit-any */
-// 'use client';
-
-// import { Box, Paper, Stack, Text, Title } from '@mantine/core';
-// import { BarChart } from '@mantine/charts';
-// import { useProxy } from 'valtio/utils';
-// import apbdes from '@/app/admin/(dashboard)/_state/landing-page/apbdes';
-// import colors from '@/con/colors';
-
-// function APBDesProgress() {
-//   const state = useProxy(apbdes);
-//   const data = state.findMany.data || [];
-
-//   const apbdesItem = data[0];
-//   if (!apbdesItem) {
-//     return (
-//       <Box py="md" px={{ base: 'md', md: 100 }}>
-//         <Text c="dimmed">Belum ada data APBDes untuk ditampilkan.</Text>
-//       </Box>
-//     );
-//   }
-
-//   const items = apbdesItem.items || [];
-//   const sortedItems = [...items].sort((a, b) => a.kode.localeCompare(b.kode));
-
-//   const pendapatanItems = sortedItems.filter(i => i.tipe === 'pendapatan');
-//   const belanjaItems = sortedItems.filter(i => i.tipe === 'belanja');
-//   const pembiayaanItems = sortedItems.filter(i => i.tipe === 'pembiayaan');
-
-//   const total = (rows: any[]) => {
-//     const anggaran = rows.reduce((s, i) => s + i.anggaran, 0);
-//     const realisasi = rows.reduce((s, i) => s + i.realisasi, 0);
-//     return anggaran === 0 ? 0 : (realisasi / anggaran) * 100;
-//   };
-
-//   const chartData = [
-//     { name: 'Pendapatan', persen: total(pendapatanItems) },
-//     { name: 'Belanja', persen: total(belanjaItems) },
-//   ];
-
-//   if (pembiayaanItems.length > 0) {
-//     chartData.push({ name: 'Pembiayaan', persen: total(pembiayaanItems) });
-//   }
-
-//   return (
-//     <Paper
-//       mx={{ base: 'md', md: 100 }}
-//       p="xl"
-//       radius="md"
-//       shadow="sm"
-//       withBorder
-//       bg={colors['white-1']}
-//     >
-//       <Stack gap="lg">
-//         <Title order={4} c={colors['blue-button']} ta="center">
-//           Grafik Pelaksanaan APBDes Tahun {apbdesItem.tahun}
-//         </Title>
-
-//         <Text ta="center" fw="bold" fz="sm" c="dimmed">
-//           Persentase Realisasi (%) dari Anggaran
-//         </Text>
-
-//         <BarChart
-//           h={200}
-//           data={chartData}
-//           orientation="vertical"
-//           dataKey="name"
-//           barProps={{ radius: 6 }}
-//           series={[
-//             {
-//               name: 'persen',
-//               label: 'Persentase',
-//               color: colors['blue-button'],
-//             },
-//           ]}
-//           yAxisProps={{
-//             domain: [0, 100],
-//           }}
-//           valueFormatter={(v) => `${v.toFixed(1)}%`}
-//         />
-//       </Stack>
-//     </Paper>
-//   );
-// }
-
-// export default APBDesProgress;
+export default APBDesProgress;

src/app/darmasaba/(tambahan)/apbdes/lib/apbDesaTable.tsx

@@ -1,30 +1,8 @@
-// src/app/admin/(dashboard)/landing-page/APBDes/APBDesTable.tsx
 'use client';
 
 import { Box, Paper, Table, Text, Title, Badge, Group } from '@mantine/core';
-import { useProxy } from 'valtio/utils';
-import apbdes from '@/app/admin/(dashboard)/_state/landing-page/apbdes';
 import colors from '@/con/colors';
-
-interface APBDesItem {
-  id: string;
-  kode: string;
-  uraian: string;
-  anggaran: number;
-  realisasi: number;
-  selisih: number;
-  persentase: number;
-  level: number;
-  tipe: 'pendapatan' | 'belanja' | 'pembiayaan';
-}
-
-interface APBDesData {
-  id: string;
-  tahun: number;
-  items: APBDesItem[];
-  image?: { id: string; url: string } | null;
-  file?: { id: string; url: string } | null;
-}
+import { APBDesData } from './types';
 
 // Helper: Format Rupiah, tapi jika 0 → tampilkan '-'
 function formatRupiahOrEmpty(value: number): string {
@@ -51,22 +29,12 @@ function getIndent(level: number) {
   };
 }
 
-function APBDesTable() {
-  const state = useProxy(apbdes);
-  const data = state.findMany.data || [];
+interface APBDesTableProps {
+  apbdesData: APBDesData;
+}
 
-  // Get the first APBDes item
-  const apbdesItem = data[0] as unknown as APBDesData | undefined;
-
-  if (!apbdesItem) {
-    return (
-      <Box py="md" px={{ base: 'md', md: 100 }}>
-        <Text c="dimmed">Belum ada data APBDes untuk ditampilkan.</Text>
-      </Box>
-    );
-  }
-
-  const items = Array.isArray(apbdesItem.items) ? apbdesItem.items : [];
+function APBDesTable({ apbdesData }: APBDesTableProps) {
+  const items = Array.isArray(apbdesData.items) ? apbdesData.items : [];
   const sortedItems = [...items].sort((a, b) => a.kode.localeCompare(b.kode));
 
   // Calculate totals
@@ -76,13 +44,13 @@ function APBDesTable() {
   const totalPersentase = totalAnggaran > 0 ? (totalRealisasi / totalAnggaran) * 100 : 0;
 
   return (
-    <Box py="md" px={{ base: 'md', md: 100 }}>
+    <Box pt={"xs"} pb="md" px={{ base: 'md', md: 100 }}>
       <Title order={4} c={colors['blue-button']} mb="sm">
-        Rincian APBDes Tahun {apbdesItem.tahun}
+        Rincian APBDes Tahun {apbdesData.tahun}
       </Title>
 
       <Paper withBorder radius="md" shadow="xs" p="md">
-        <Box style={{overflowY: 'auto' }}>
+        <Box style={{ overflowY: 'auto' }}>
           <Table withColumnBorders highlightOnHover>
             <Table.Thead bg="#2c5f78">
               <Table.Tr>
@@ -109,9 +77,7 @@ function APBDesTable() {
                   <Table.Td style={getIndent(item.level)}>
                     <Group gap="xs" align="flex-start">
                       <Text fw={item.level === 1 ? 'bold' : 'normal'}>{item.kode}</Text>
-                      <Text fz="sm" >
-                        {item.uraian}
-                      </Text>
+                      <Text fz="sm">{item.uraian}</Text>
                     </Group>
                   </Table.Td>
                   <Table.Td ta="right">{formatRupiahOrEmpty(item.anggaran)}</Table.Td>

src/app/darmasaba/(tambahan)/apbdes/lib/types.ts

@@ -0,0 +1,42 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+export type APBDesTipe = 'pendapatan' | 'belanja' | 'pembiayaan';
+
+export function isAPBDesTipe(tipe: string | null | undefined): tipe is APBDesTipe {
+  return tipe === 'pendapatan' || tipe === 'belanja' || tipe === 'pembiayaan';
+}
+
+export interface APBDesItem {
+  id: string;
+  kode: string;
+  uraian: string;
+  anggaran: number;
+  realisasi: number;
+  selisih: number;
+  persentase: number;
+  level: number;
+  tipe?: APBDesTipe | null;
+  // Additional fields from API
+  createdAt?: Date;
+  updatedAt?: Date;
+  deletedAt?: Date | null;
+  isActive?: boolean;
+  apbdesId?: string;
+}
+
+export interface APBDesData {
+  id: string;
+  tahun: number | null;
+  items: APBDesItem[];
+  image?: { id: string; url: string } | null;
+  file?: { id: string; url: string } | null;
+}
+
+export function transformAPBDesData(data: any): APBDesData {
+  return {
+    ...data,
+    items: data.items.map((item: any) => ({
+      ...item,
+      tipe: isAPBDesTipe(item.tipe) ? item.tipe : null
+    }))
+  };
+}

src/app/darmasaba/(tambahan)/apbdes/page.tsx

@@ -4,19 +4,21 @@
 import PendapatanAsliDesa from '@/app/admin/(dashboard)/_state/ekonomi/PADesa'
 import apbdes from '@/app/admin/(dashboard)/_state/landing-page/apbdes'
 import colors from '@/con/colors'
-import { ActionIcon, BackgroundImage, Box, Center, Container, Group, Loader, SimpleGrid, Stack, Text, Title } from '@mantine/core'
+import { ActionIcon, BackgroundImage, Box, Center, Container, Group, Loader, Select, SimpleGrid, Stack, Text, Title } from '@mantine/core'
 import { IconDownload } from '@tabler/icons-react'
 import { Link } from 'next-view-transitions'
 import { useEffect, useState } from 'react'
 import { useProxy } from 'valtio/utils'
 import BackButton from '../../(pages)/desa/layanan/_com/BackButto'
-import APBDesProgress from './lib/apbDesaProgress'
 import APBDesTable from './lib/apbDesaTable'
+import APBDesProgress from './lib/apbDesaProgress'
+import { transformAPBDesData } from './lib/types'
 
 function Page() {
   const state = useProxy(apbdes)
   const paDesaState = useProxy(PendapatanAsliDesa.ApbDesa)
   const [loading, setLoading] = useState(false)
+  const [selectedYear, setSelectedYear] = useState<string | null>(null)
   useEffect(() => {
     const loadData = async () => {
       try {
@@ -34,6 +36,23 @@ function Page() {
 
   const dataAPBDes = state.findMany.data || []
 
+  // Buat daftar tahun unik dari data
+  const years = Array.from(new Set(dataAPBDes.map((item: any) => item.tahun)))
+    .sort((a, b) => b - a) // urutkan descending
+    .map(year => ({ value: year.toString(), label: `Tahun ${year}` }))
+
+  // Pilih tahun pertama sebagai default jika belum ada yang dipilih
+  useEffect(() => {
+    if (years.length > 0 && !selectedYear) {
+      setSelectedYear(years[0].value)
+    }
+  }, [years, selectedYear])
+
+  // Transform and filter data based on selected year
+  const currentApbdes = dataAPBDes.length > 0
+    ? transformAPBDesData(dataAPBDes.find(item => item?.tahun?.toString() === selectedYear) || dataAPBDes[0])
+    : null
+
   return (
     <Stack pos="relative" bg={colors.Bg} py="xl" gap={32}>
       <Box px={{ base: 'md', md: 100 }}>
@@ -94,8 +113,31 @@ function Page() {
           ))}
         </SimpleGrid>
       )}
-      <APBDesTable />
-      <APBDesProgress />
+      {/* 🔥 COMBOBOX UNTUK PILIH TAHUN */}
+      <Box px={{ base: 'md', md: 100 }}>
+        <Select
+          label="Pilih Tahun APBDes"
+          placeholder="Pilih tahun"
+          value={selectedYear}
+          onChange={setSelectedYear}
+          data={years}
+          w={{ base: '100%', sm: 200 }}
+          searchable
+          clearable
+          nothingFoundMessage="Tidak ada tahun tersedia"
+        />
+      </Box>
+      {/* ❗ Pass currentApbdes ke komponen anak */}
+      {currentApbdes ? (
+        <>
+          <APBDesTable apbdesData={currentApbdes} />
+          <APBDesProgress apbdesData={currentApbdes} />
+        </>
+      ) : (
+        <Box px={{ base: 'md', md: 100 }} py="md">
+          <Text c="dimmed">Tidak ada data APBDes untuk tahun yang dipilih.</Text>
+        </Box>
+      )}
     </Stack>
   )
 }

src/app/darmasaba/_com/ModernNewsNotification.tsx

@@ -1,85 +1,117 @@
 "use client";
 
-import { useState, useEffect } from "react";
-import { Box, Paper, Text, Group, CloseButton, Badge, ActionIcon, Stack, Transition } from "@mantine/core";
+import {
+  ActionIcon,
+  Badge,
+  Box,
+  CloseButton,
+  Group,
+  Paper,
+  Stack,
+  Text,
+  Transition,
+} from "@mantine/core";
 import { IconBell, IconChevronRight } from "@tabler/icons-react";
 import { usePathname, useRouter } from "next/navigation";
+import { useEffect, useState } from "react";
 
-interface NewsItem {
-  id: string | number;
+// === Tipe yang bisa diimpor di tempat lain ===
+export interface KategoriBerita {
+  id: string;
+  name: string;
+}
+
+export interface KategoriPengumuman {
+  id: string;
+  name: string;
+}
+
+export interface NewsItem {
+  id: string;
   type: "berita" | "pengumuman";
   title: string;
   content: string;
   timestamp?: string | Date;
+  kategoriBerita?: KategoriBerita;
+  kategoriPengumuman?: KategoriPengumuman;
 }
 
-interface ModernNewsNotificationProps {
+export interface ModernNewsNotificationProps {
   news: NewsItem[];
+  hasNewContent?: boolean;
+  newItemCount?: number;
+  onSeen?: () => void;
   autoShowDelay?: number;
 }
 
+// === Helper ===
 function stripHtml(html: string): string {
   return html
-    .replace(/<[^>]+>/g, '')
-    .replace(/&nbsp;/gi, ' ')
-    .replace(/&amp;/gi, '&')
-    .replace(/\s+/g, ' ')
+    .replace(/<[^>]+>/g, "")
+    .replace(/&nbsp;/gi, " ")
+    .replace(/&amp;/gi, "&")
+    .replace(/\s+/g, " ")
     .trim();
 }
 
+// === Komponen Utama ===
 export default function ModernNewsNotification({
   news = [],
-  autoShowDelay = 2000
+  hasNewContent = false,
+  newItemCount = 0,
+  onSeen,
+  autoShowDelay = 2000,
 }: ModernNewsNotificationProps) {
   const router = useRouter();
-  const [toastVisible, setToastVisible] = useState(false);
-  const [widgetOpen, setWidgetOpen] = useState(false);
-  const [hasNewNotifications, setHasNewNotifications] = useState(true);
-  const [hasShownToast, setHasShownToast] = useState(false);
-  const [iconVisible, setIconVisible] = useState(true);
   const pathname = usePathname();
 
-  // Auto show toast on page load
+  const [toastVisible, setToastVisible] = useState(false);
+  const [widgetOpen, setWidgetOpen] = useState(false);
+  const [hasNewNotifications, setHasNewNotifications] = useState(hasNewContent);
+  const [hasShownToast, setHasShownToast] = useState(false);
+  const [iconVisible, setIconVisible] = useState(true);
+
+  // Sinkronisasi prop eksternal
+  useEffect(() => {
+    setHasNewNotifications(hasNewContent);
+  }, [hasNewContent]);
+
+  // Tampilkan toast pertama kali
   useEffect(() => {
     if (news.length > 0 && !toastVisible && !hasShownToast) {
       const timer = setTimeout(() => {
         setToastVisible(true);
         setHasShownToast(true);
+        if (hasNewNotifications) onSeen?.();
       }, autoShowDelay);
       return () => clearTimeout(timer);
     }
-  }, [news.length, autoShowDelay, toastVisible, hasShownToast]);
+  }, [news.length, autoShowDelay, toastVisible, hasShownToast, hasNewNotifications, onSeen]);
 
-  // Auto hide toast after 8 seconds
+  // Sembunyikan toast otomatis
   useEffect(() => {
     if (toastVisible) {
-      const timer = setTimeout(() => {
-        setToastVisible(false);
-      }, 8000);
+      const timer = setTimeout(() => setToastVisible(false), 8000);
       return () => clearTimeout(timer);
     }
   }, [toastVisible]);
 
-  // Enhanced scroll handler with better thresholds
+  // Kontrol visibilitas ikon saat scroll
   useEffect(() => {
     let lastScrollY = window.scrollY;
-    const HIDE_THRESHOLD = 100; // Mulai hide saat scroll > 100px
-    const SHOW_THRESHOLD = 50; // Hanya show ketika benar-benar di atas (< 50px)
+    const HIDE_THRESHOLD = 100;
+    const SHOW_THRESHOLD = 50;
 
     const handleScroll = () => {
       const currentScrollY = window.scrollY;
-      const scrollDirection = currentScrollY > lastScrollY ? 'down' : 'up';
+      const scrollDirection = currentScrollY > lastScrollY ? "down" : "up";
 
-      // Logic untuk hide/show icon
-      if (scrollDirection === 'down' && currentScrollY > HIDE_THRESHOLD) {
-        // Scroll ke bawah dan sudah melewati threshold → hide
+      if (scrollDirection === "down" && currentScrollY > HIDE_THRESHOLD) {
         setIconVisible(false);
-      } else if (scrollDirection === 'up' && currentScrollY < SHOW_THRESHOLD) {
-        // Scroll ke atas dan sudah di posisi paling atas → show
+      } else if (scrollDirection === "up" && currentScrollY < SHOW_THRESHOLD) {
         setIconVisible(true);
       }
 
-      // Hide toast saat scroll ke bawah melewati 150px
       if (currentScrollY > 150 && toastVisible) {
         setToastVisible(false);
       }
@@ -87,19 +119,25 @@ export default function ModernNewsNotification({
       lastScrollY = currentScrollY;
     };
 
-    window.addEventListener('scroll', handleScroll, { passive: true });
-    return () => window.removeEventListener('scroll', handleScroll);
+    window.addEventListener("scroll", handleScroll, { passive: true });
+    return () => window.removeEventListener("scroll", handleScroll);
   }, [toastVisible]);
 
   const currentNews = news[0];
 
-  // Handle notification click
+  // 🔗 Arahkan ke detail dengan kategori aman
   const handleNotificationClick = (item: NewsItem) => {
     setWidgetOpen(false);
+    onSeen?.();
+
     if (item.type === "berita") {
-      router.push("/darmasaba/desa/berita/semua");
+      const kategori = item.kategoriBerita?.name || "umum";
+      const safeKategori = encodeURIComponent(kategori);
+      router.push(`/darmasaba/desa/berita/${safeKategori}/${item.id}`);
     } else if (item.type === "pengumuman") {
-      router.push("/darmasaba/desa/pengumuman");
+      const kategori = item.kategoriPengumuman?.name || "umum";
+      const safeKategori = encodeURIComponent(kategori);
+      router.push(`/darmasaba/desa/pengumuman/${safeKategori}/${item.id}`);
     }
   };
 
@@ -107,12 +145,17 @@ export default function ModernNewsNotification({
     setToastVisible(false);
     setWidgetOpen(true);
     setHasNewNotifications(false);
+    onSeen?.();
   };
 
-  // Only show on landing page
-  if (pathname !== '/darmasaba') {
-    return null;
-  }
+  const handleDismissToast = (e: React.MouseEvent) => {
+    e.stopPropagation();
+    setToastVisible(false);
+    onSeen?.();
+  };
+
+  // Hanya tampilkan di landing page
+  if (pathname !== "/darmasaba") return null;
 
   return (
     <>
@@ -133,8 +176,9 @@ export default function ModernNewsNotification({
               variant="filled"
               color="#1e5a7e"
               onClick={() => {
-                setWidgetOpen(!widgetOpen);
+                setWidgetOpen((open) => !open);
                 setHasNewNotifications(false);
+                onSeen?.();
               }}
               style={{
                 width: "60px",
@@ -146,20 +190,22 @@ export default function ModernNewsNotification({
               <IconBell size={28} />
               {hasNewNotifications && news.length > 0 && (
                 <Badge
-                size="sm"
-                variant="filled"
-                color="red"
-                style={{
-                  position: "absolute",
-                  top: "6px",
-                  right: "6px",
-                  minWidth: "22px",
-                  height: "22px",
-                  padding: "0 6px",
-                }}
-              >
-                {news.length}
-              </Badge>
+                  size="sm"
+                  variant="filled"
+                  color="red"
+                  style={{
+                    position: "absolute",
+                    top: "6px",
+                    right: "6px",
+                    minWidth: "22px",
+                    height: "22px",
+                    display: "flex",
+                    alignItems: "center",
+                    justifyContent: "center",
+                  }}
+                >
+                  {newItemCount || news.length}
+                </Badge>
               )}
             </ActionIcon>
           </Box>
@@ -174,8 +220,9 @@ export default function ModernNewsNotification({
               ...styles,
               position: "fixed",
               bottom: "100px",
-              right: "24px",
-              width: "380px",
+              left: "24px",
+              width: "90vw",
+              maxWidth: 380,
               maxHeight: "500px",
               boxShadow: "0 8px 32px rgba(0,0,0,0.12)",
               borderRadius: "16px",
@@ -192,32 +239,33 @@ export default function ModernNewsNotification({
               <Group justify="space-between">
                 <Group gap="xs">
                   <IconBell size={20} />
-                  <Text c="white" fw={600} size="md">Berita & Pengumuman</Text>
+                  <Text c="white" fw={600} size="md">
+                    Berita & Pengumuman
+                  </Text>
                 </Group>
                 <CloseButton
-                  onClick={() => setWidgetOpen(false)}
+                  onClick={() => {
+                    setWidgetOpen(false);
+                    onSeen?.();
+                  }}
                   variant="transparent"
                   c="white"
                 />
               </Group>
             </Box>
 
-            <Box
-              style={{
-                maxHeight: "400px",
-                overflowY: "auto",
-                padding: "12px",
-              }}
-            >
+            <Box style={{ maxHeight: "400px", overflowY: "auto", padding: "12px" }}>
               {news.length === 0 ? (
                 <Box p="xl" style={{ textAlign: "center" }}>
-                  <Text c="dimmed" size="sm">Tidak ada berita terbaru</Text>
+                  <Text c="dimmed" size="sm">
+                    Tidak ada berita terbaru
+                  </Text>
                 </Box>
               ) : (
                 <Stack gap="xs">
-                  {news.map((item, index) => (
+                  {news.map((item) => (
                     <Paper
-                      key={item.id || index}
+                      key={item.id}
                       p="md"
                       radius="md"
                       style={{
@@ -243,7 +291,7 @@ export default function ModernNewsNotification({
                           color={item.type === "berita" ? "blue" : "orange"}
                           variant="light"
                         >
-                          {item.type === "berita" ? "📰 Berita" : "📢 Pengumuman"}
+                          {item.type === "berita" ? "Berita" : "Pengumuman"}
                         </Badge>
                         <IconChevronRight size={16} color="#adb5bd" />
                       </Group>
@@ -263,15 +311,20 @@ export default function ModernNewsNotification({
       </Transition>
 
       {/* Toast Notification */}
-      <Transition mounted={toastVisible && !!currentNews} transition="slide-left" duration={300}>
+      <Transition
+        mounted={toastVisible && !!currentNews}
+        transition="slide-left"
+        duration={300}
+      >
         {(styles) => (
           <Paper
             style={{
               ...styles,
               position: "fixed",
               bottom: "100px",
-              right: "24px",
-              width: "380px",
+              left: "24px",
+              width: "90vw",
+              maxWidth: 380,
               boxShadow: "0 8px 32px rgba(0,0,0,0.15)",
               borderRadius: "12px",
               overflow: "hidden",
@@ -299,17 +352,12 @@ export default function ModernNewsNotification({
                   size="md"
                   color={currentNews?.type === "berita" ? "blue" : "orange"}
                   variant="light"
-                  leftSection={currentNews?.type === "berita" ? "📰" : "📢"}
                 >
-                  {currentNews?.type === "berita" ? "Berita Terbaru" : "Pengumuman"}
+                  {currentNews?.type === "berita"
+                    ? "Berita Terbaru"
+                    : "Pengumuman"}
                 </Badge>
-                <CloseButton
-                  onClick={(e) => {
-                    e.stopPropagation();
-                    setToastVisible(false);
-                  }}
-                  size="sm"
-                />
+                <CloseButton onClick={handleDismissToast} size="sm" />
               </Group>
 
               <Text fw={600} size="sm" mb={6}>
@@ -322,7 +370,7 @@ export default function ModernNewsNotification({
 
               <Group justify="space-between" mt="md">
                 <Text size="xs" c="dimmed">
-                  {news.length > 1 ? `${news.length} berita tersedia` : '1 berita'}
+                  {news.length > 1 ? `${news.length} berita tersedia` : "1 berita"}
                 </Text>
                 <Text
                   size="xs"

src/app/darmasaba/_com/main-page/apbdes/index.tsx

@@ -1,9 +1,11 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable react-hooks/exhaustive-deps */
 'use client'
 import apbdes from '@/app/admin/(dashboard)/_state/landing-page/apbdes'
 import APBDesProgress from '@/app/darmasaba/(tambahan)/apbdes/lib/apbDesaProgress'
+import { transformAPBDesData } from '@/app/darmasaba/(tambahan)/apbdes/lib/types'
 import colors from '@/con/colors'
-import { ActionIcon, BackgroundImage, Box, Button, Center, Flex, Group, Loader, SimpleGrid, Stack, Text } from '@mantine/core'
+import { ActionIcon, BackgroundImage, Box, Button, Center, Group, Loader, Select, SimpleGrid, Stack, Text } from '@mantine/core'
 import { IconDownload } from '@tabler/icons-react'
 import Link from 'next/link'
 import { useEffect, useState } from 'react'
@@ -12,6 +14,7 @@ import { useProxy } from 'valtio/utils'
 function Apbdes() {
   const state = useProxy(apbdes)
   const [loading, setLoading] = useState(false)
+  const [selectedYear, setSelectedYear] = useState<string | null>(null)
 
   const textHeading = {
     title: 'APBDes',
@@ -32,6 +35,24 @@ function Apbdes() {
     loadData()
   }, [])
 
+  const dataAPBDes = state.findMany.data || []
+
+  const years = Array.from(new Set(dataAPBDes.map((item: any) => item.tahun)))
+    .sort((a, b) => b - a) // urutkan descending
+    .map(year => ({ value: year.toString(), label: `Tahun ${year}` }))
+
+  // Pilih tahun pertama sebagai default jika belum ada yang dipilih
+  useEffect(() => {
+    if (years.length > 0 && !selectedYear) {
+      setSelectedYear(years[0].value)
+    }
+  }, [years, selectedYear])
+
+  // Transform and filter data based on selected year
+  const currentApbdes = dataAPBDes.length > 0
+    ? transformAPBDesData(dataAPBDes.find(item => item?.tahun?.toString() === selectedYear) || dataAPBDes[0])
+    : null
+
   const data = (state.findMany.data || []).slice(0, 3)
 
   return (
@@ -60,8 +81,30 @@ function Apbdes() {
         </Button>
       </Group>
 
-      {/* Chart */}
-      <APBDesProgress />
+      {/* 🔥 COMBOBOX UNTUK PILIH TAHUN */}
+      <Box px={{ base: 'md', md: 100 }}>
+        <Select
+          label="Pilih Tahun APBDes"
+          placeholder="Pilih tahun"
+          value={selectedYear}
+          onChange={setSelectedYear}
+          data={years}
+          w={{ base: '100%', sm: 200 }}
+          searchable
+          clearable
+          nothingFoundMessage="Tidak ada tahun tersedia"
+        />
+      </Box>
+
+      {currentApbdes ? (
+        <>
+          <APBDesProgress apbdesData={currentApbdes} />
+        </>
+      ) : (
+        <Box px={{ base: 'md', md: 100 }} py="md">
+          <Text c="dimmed">Tidak ada data APBDes untuk tahun yang dipilih.</Text>
+        </Box>
+      )}
 
       <SimpleGrid mx={{ base: 'md', md: 100 }} cols={{ base: 1, sm: 3 }} spacing="lg" pb={"xl"}>
         {loading ? (
@@ -90,7 +133,7 @@ function Apbdes() {
               style={{ overflow: 'hidden' }}
             >
               <Box pos="absolute" inset={0} bg="rgba(0,0,0,0.45)" style={{ borderRadius: 16 }} />
-              <Stack justify="space-between" h="100%" p="xl" pos="relative">
+              <Stack gap={"xs"} justify="space-between" h="100%" p="xl" pos="relative">
                 <Text
                   c="white"
                   fw={600}
@@ -109,7 +152,20 @@ function Apbdes() {
                 >
                   {v.jumlah}
                 </Text>
-                <Group justify="center">
+                <Center>
+                  <ActionIcon
+                    component={Link}
+                    href={v.file?.link || ''}
+                    radius="xl"
+                    size="xl"
+                    variant="gradient"
+                    gradient={{ from: '#1C6EA4', to: '#1C6EA4' }}
+                  >
+                    <IconDownload size={20} color="white" />
+                  </ActionIcon>
+
+                </Center>
+                {/* <Group justify="center">
                   <ActionIcon
                     component={Link}
                     href={v.file?.link || ''}
@@ -118,18 +174,18 @@ function Apbdes() {
                     variant="gradient"
                     gradient={{ from: '#1C6EA4', to: '#1C6EA4' }}
                   >
-                    <Flex align="center" gap="xs" px="md" py={6}>
-                      <IconDownload size={18} color="white" />
-                    </Flex>
+                    <Group align="center" gap="xs" px="md" py={6}>
+                      <IconDownload size={25} color="white" />
+                    </Group>
                   </ActionIcon>
-                </Group>
+                </Group> */}
               </Stack>
             </BackgroundImage>
           ))
         )}
       </SimpleGrid>
 
-      
+
     </Stack>
   )
 }

src/app/darmasaba/_com/main-page/kepuasan/index.tsx

@@ -4,7 +4,7 @@ import indeksKepuasanState from "@/app/admin/(dashboard)/_state/landing-page/ind
 import colors from "@/con/colors";
 import { BarChart, PieChart } from '@mantine/charts';
 import { Box, Button, Center, Container, Flex, Modal, Paper, Select, SimpleGrid, Skeleton, Stack, Text, TextInput, Title } from "@mantine/core";
-import { useDisclosure, useShallowEffect } from "@mantine/hooks";
+import { useDisclosure, useMediaQuery, useShallowEffect } from "@mantine/hooks";
 import { useState } from "react";
 import { useProxy } from "valtio/utils";
 
@@ -25,6 +25,7 @@ function Kepuasan() {
   const [donutDataKelompokUmur, setDonutDataKelompokUmur] = useState<ChartDataItem[]>([]);
   const [barChartData, setBarChartData] = useState<Array<{ month: string; Responden: number }>>([]);
   const [opened, { open, close }] = useDisclosure(false)
+  const isMobile = useMediaQuery("(max-width: 768px)");
 
   const resetForm = () => {
     state.create.form = {
@@ -41,7 +42,7 @@ function Kepuasan() {
     indeksKepuasanState.jenisKelaminResponden.findMany.load()
     indeksKepuasanState.pilihanRatingResponden.findMany.load()
     indeksKepuasanState.kelompokUmurResponden.findMany.load()
-  },[])
+  }, [])
 
   const handleSubmit = async () => {
     try {
@@ -82,13 +83,13 @@ function Kepuasan() {
 
       // Update gender chart data
       setDonutDataJenisKelamin([
-        { name: 'Laki-laki', value: totalLaki, color: colors['blue-button'] },
+        { name: 'Laki-laki', value: totalLaki, color: '#52ABE3FF' },
         { name: 'Perempuan', value: totalPerempuan, color: '#10A85AFF' },
       ]);
 
       // Update rating chart data
       setDonutDataRating([
-        { name: 'Sangat Baik', value: totalSangatBaik, color: colors['blue-button'] },
+        { name: 'Sangat Baik', value: totalSangatBaik, color: '#52ABE3FF' },
         { name: 'Baik', value: totalBaik, color: '#10A85AFF' },
         { name: 'Kurang Baik', value: totalKurangBaik, color: '#FFA500' },
         { name: 'Sangat Kurang Baik', value: totalSangatKurangBaik, color: '#FF4500' },
@@ -96,7 +97,7 @@ function Kepuasan() {
 
       // Update age group chart data
       setDonutDataKelompokUmur([
-        { name: 'Muda', value: totalMuda, color: colors['blue-button'] },
+        { name: 'Muda', value: totalMuda, color: '#52ABE3FF' },
         { name: 'Dewasa', value: totalDewasa, color: '#10A85AFF' },
         { name: 'Lansia', value: totalLansia, color: '#FFA500' },
       ]);
@@ -220,10 +221,13 @@ function Kepuasan() {
                           <Box style={{ position: 'relative', width: '100%' }}>
                             <Center>
                               <PieChart
-                                withLabels
                                 withTooltip
+                                tooltipAnimationDuration={200}
+                                withLabels
+                                labelsPosition="inside" // 👈 ini yang penting!
                                 labelsType="percent"
-                                size={250} // Fixed size in pixels
+                                withLabelsLine
+                                size={isMobile ? 180 : 250} // 👈 kecilkan ukuran di mobile
                                 data={donutDataJenisKelamin}
                               />
                             </Center>
@@ -259,10 +263,10 @@ function Kepuasan() {
                                 withTooltip
                                 tooltipAnimationDuration={200}
                                 withLabels
-                                labelsPosition="outside"
+                                labelsPosition="inside" // 👈 ini yang penting!
                                 labelsType="percent"
                                 withLabelsLine
-                                size={250}
+                                size={isMobile ? 180 : 250} // 👈 kecilkan ukuran di mobile
                                 data={donutDataRating}
                               />
                             </Center>
@@ -302,10 +306,10 @@ function Kepuasan() {
                                 withTooltip
                                 tooltipAnimationDuration={200}
                                 withLabels
-                                labelsPosition="outside"
+                                labelsPosition="inside"// 👈 ini yang penting!
                                 labelsType="percent"
                                 withLabelsLine
-                                size={250}
+                                size={isMobile ? 180 : 250} // 👈 kecilkan ukuran di mobile
                                 data={donutDataKelompokUmur}
                               />
                             </Center>
@@ -494,6 +498,8 @@ function Kepuasan() {
                             <PieChart
                               withLabels
                               withTooltip
+                              labelsPosition="inside"
+                          
                               labelsType="percent"
                               size={200}
                               data={donutDataJenisKelamin}
@@ -531,7 +537,8 @@ function Kepuasan() {
                               withTooltip
                               tooltipAnimationDuration={200}
                               withLabels
-                              labelsPosition="outside"
+                          
+                              labelsPosition="inside"
                               labelsType="percent"
                               withLabelsLine
                               size={200}
@@ -574,7 +581,8 @@ function Kepuasan() {
                               withTooltip
                               tooltipAnimationDuration={200}
                               withLabels
-                              labelsPosition="outside"
+                              
+                              labelsPosition="inside"
                               labelsType="percent"
                               withLabelsLine
                               size={190}
@@ -610,7 +618,7 @@ function Kepuasan() {
             <TextInput
               label="Nama"
               type='text'
-              placeholder="masukkan nama"
+              placeholder="Masukkan nama"
               value={state.create.form.name}
               onChange={(val) => {
                 state.create.form.name = val.currentTarget.value;
@@ -619,7 +627,7 @@ function Kepuasan() {
             <TextInput
               label="Tanggal Pengisian"
               type="date"
-              placeholder="masukkan tanggal"
+              placeholder="Masukkan tanggal"
               value={state.create.form.tanggal}
               onChange={(val) => {
                 state.create.form.tanggal = val.currentTarget.value;

src/app/darmasaba/_com/main-page/landing-page/SosmedView.tsx

@@ -1,7 +1,9 @@
-import { ActionIcon, Card, Flex, Image, Text, Tooltip } from "@mantine/core";
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import { sosmedMap } from "@/app/admin/(dashboard)/landing-page/profil/_lib/sosmed";
+import colors from "@/con/colors";
+import { ActionIcon, Box, Card, Flex, Image, Text, Tooltip } from "@mantine/core";
 import { Prisma } from "@prisma/client";
 import { useTransitionRouter } from "next-view-transitions";
-import { IconBrandInstagram, IconBrandFacebook, IconBrandTwitter, IconWorld } from "@tabler/icons-react";
 
 function SosmedView({
   data,
@@ -10,17 +12,12 @@ function SosmedView({
 }) {
   const router = useTransitionRouter();
 
-  const fallbackIcon = (platform?: string) => {
-    switch (platform?.toLowerCase()) {
-      case "instagram":
-        return <IconBrandInstagram size={22} />;
-      case "facebook":
-        return <IconBrandFacebook size={22} />;
-      case "twitter":
-        return <IconBrandTwitter size={22} />;
-      default:
-        return <IconWorld size={22} />;
+  const getIconSource = (item: any) => {
+    if (item.image?.link) return item.image.link;
+    if (item.icon && sosmedMap[item.icon as keyof typeof sosmedMap]?.src) {
+      return sosmedMap[item.icon as keyof typeof sosmedMap].src;
     }
+    return null;
   };
 
   return (
@@ -44,18 +41,24 @@ function SosmedView({
                 boxShadow: "0 0 12px rgba(28, 110, 164, 0.6)",
               }}
             >
-              {item.image?.link ? (
-                <Image
-                  src={item.image.link}
-                  alt={item.name || "ikon"}
-                  w={24}
-                  h={24}
-                  fit="contain"
-                  loading="lazy"
-                />
-              ) : (
-                fallbackIcon(item.name)
-              )}
+              {(() => {
+                const src = getIconSource(item);
+
+                if (src) {
+                  return (
+                    <Image
+                      loading="lazy"
+                      src={src}
+                      alt={item.name}
+                      w={24}
+                      h={24}
+                      fit="contain"
+                    />
+                  );
+                }
+
+                return <Box bg={colors['blue-button']} w="100%" h="100%" />;
+              })()}
             </ActionIcon>
           </Tooltip>
         ))

src/app/darmasaba/_com/main-page/landing-page/index.tsx

@@ -154,7 +154,7 @@ function LandingPage() {
 
   return (
     <Stack bg={colors.Bg} p="md" gap="lg">
-      <Flex gap="lg" wrap={{ base: "wrap", md: "nowrap" }}>
+      <Flex gap="lg" wrap={{ base: "wrap", md: "nowrap" }} pb={30}>
         <Stack w={{ base: "100%", md: "65%" }} gap="lg">
           <Card radius="xl" bg={colors.grey[1]} p="lg" mt={10} shadow="xl">
             <Stack gap="xl">

src/app/darmasaba/_com/main-page/penghargaan/index.tsx

@@ -1,10 +1,10 @@
 /* eslint-disable react-hooks/exhaustive-deps */
 'use client';
 import penghargaanState from "@/app/admin/(dashboard)/_state/desa/penghargaan";
-import { Stack, Box, Container, Button, Text, Loader, Paper } from "@mantine/core";
-import { IconAward, IconArrowRight } from "@tabler/icons-react";
+import { Stack, Box, Container, Button, Text, Loader, Paper, Center, ActionIcon } from "@mantine/core";
+import { IconAward, IconArrowRight, IconPlayerPlay } from "@tabler/icons-react";
 import { useTransitionRouter } from 'next-view-transitions';
-import { useEffect, useState } from "react";
+import { useEffect, useState, useRef } from "react";
 import { useProxy } from "valtio/utils";
 import { useMediaQuery } from "@mantine/hooks";
 
@@ -13,6 +13,37 @@ function Penghargaan() {
   const state = useProxy(penghargaanState);
   const [loading, setLoading] = useState(false);
   const isMobile = useMediaQuery('(max-width: 768px)');
+  const [isVideoLoaded, setIsVideoLoaded] = useState(false);
+  const [showVideo, setShowVideo] = useState(true);
+  const [videoError, setVideoError] = useState(false);
+  const videoRef = useRef<HTMLVideoElement>(null);
+
+  // Deteksi iOS dengan lebih akurat
+  const isIOS = typeof window !== 'undefined' && (
+    /iPad|iPhone|iPod/.test(navigator.userAgent) ||
+    (navigator.platform === 'MacIntel' && navigator.maxTouchPoints > 1) // iPad dengan iPadOS 13+
+  );
+
+  useEffect(() => {
+    // Di iOS, coba autoplay dulu, kalau gagal tampilkan fallback
+    if (isIOS && videoRef.current) {
+      const playPromise = videoRef.current.play();
+      
+      if (playPromise !== undefined) {
+        playPromise
+          .then(() => {
+            // Autoplay berhasil
+            setShowVideo(true);
+            setIsVideoLoaded(true);
+          })
+          .catch(() => {
+            // Autoplay gagal, tampilkan fallback
+            setShowVideo(false);
+            setVideoError(true);
+          });
+      }
+    }
+  }, [isIOS]);
 
   useEffect(() => {
     const loadData = async () => {
@@ -26,28 +57,99 @@ function Penghargaan() {
     loadData();
   }, []);
 
+  const handlePlayVideo = () => {
+    setShowVideo(true);
+    setVideoError(false);
+    
+    // Paksa play video setelah user interaction
+    setTimeout(() => {
+      if (videoRef.current) {
+        videoRef.current.play().catch(err => {
+          console.error("Video play error:", err);
+          setVideoError(true);
+        });
+      }
+    }, 100);
+  };
+
   // kalau mobile ambil 1 data aja, kalau desktop ambil 3
   const data = state.findMany.data?.slice(0, isMobile ? 1 : 3);
 
   return (
-    <Stack pos="relative" h="auto" mih={{ base: 500, md: 720 }}>
-      <video
-        loop
-        autoPlay
-        muted
-        style={{
-          width: "100%",
-          height: "100%",
-          objectFit: "cover",
-          position: "absolute",
-          top: 0,
-          left: 0,
-          zIndex: 0,
-        }}
-      >
-        <source src="/assets/videos/award.mp4" type="video/mp4" />
-      </video>
+    <Stack pos="relative" h="auto" mih={{ base: 500, md: 720 }} style={{ overflow: 'hidden' }}>
+      {/* Video Layer */}
+      {showVideo && !videoError && (
+        <video
+          ref={videoRef}
+          autoPlay
+          muted
+          loop
+          playsInline
+          preload="auto"
+          onLoadedData={() => setIsVideoLoaded(true)}
+          onError={() => {
+            console.error("Video load error");
+            setVideoError(true);
+            setShowVideo(false);
+          }}
+          style={{
+            position: 'absolute',
+            top: 0,
+            left: 0,
+            width: '100%',
+            height: '100%',
+            objectFit: 'cover',
+            opacity: isVideoLoaded ? 1 : 0,
+            transition: 'opacity 0.5s ease',
+            zIndex: 0,
+          }}
+        >
+          <source src="/assets/videos/award.mp4" type="video/mp4" />
+        </video>
+      )}
 
+      {/* Fallback Image + Play Button */}
+      {(!showVideo || videoError) && (
+        <Box
+          onClick={handlePlayVideo}
+          style={{
+            position: 'absolute',
+            top: 0,
+            left: 0,
+            width: '100%',
+            height: '100%',
+            backgroundImage: "url('/mangupuraaward.jpeg')",
+            backgroundSize: 'cover',
+            backgroundPosition: 'center',
+            backgroundRepeat: 'no-repeat',
+            cursor: 'pointer',
+            zIndex: 0,
+          }}
+        >
+          <Center 
+            style={{ 
+              width: '100%', 
+              height: '100%',
+              background: 'rgba(0,0,0,0.3)', // overlay gelap agar icon terlihat
+            }}
+          >
+            <ActionIcon 
+              size={80} 
+              radius="xl" 
+              variant="filled"
+              color="blue"
+              style={{
+                backgroundColor: 'rgba(255,255,255,0.9)',
+                boxShadow: '0 8px 32px rgba(0,0,0,0.3)',
+              }}
+            >
+              <IconPlayerPlay size={40} color="var(--mantine-color-blue-6)" />
+            </ActionIcon>
+          </Center>
+        </Box>
+      )}
+
+      {/* Overlay Gradient + Content */}
       <Box
         style={{
           width: "100%",
@@ -126,4 +228,4 @@ function Penghargaan() {
   );
 }
 
-export default Penghargaan;
+export default Penghargaan;

src/app/darmasaba/_com/searchUrl.tsx

@@ -1,4 +1,4 @@
-const getDetailUrl = (item: { type?: string; id: string | number; [key: string]: unknown }) => {
+const getDetailUrl = (item: { type?: string; id: string | number;[key: string]: unknown }) => {
   const { type, id, kategori } = item;
   const map: Record<string, (id: string | number, kategori?: string) => string> = {
     programinovasi: (id) => `/darmasaba/program-inovasi/${id}`,
@@ -30,6 +30,8 @@ const getDetailUrl = (item: { type?: string; id: string | number; [key: string]:
     penghargaan: () => '/darmasaba/desa/penghargaan',
     posyandu: (id) => `/darmasaba/kesehatan/posyandu/${id}`,
     fasilitasKesehatan: () => '/darmasaba/kesehatan/data-kesehatan-warga',
+    dokterDanTenagaMedis: () => '/darmasaba/kesehatan/data-kesehatan-warga',
+    tarifDanLayanan: () => '/darmasaba/kesehatan/data-kesehatan-warga',
     jadwalKegiatan: () => '/darmasaba/kesehatan/data-kesehatan-warga',
     artikelKesehatan: () => '/darmasaba/kesehatan/data-kesehatan-warga',
     puskesmas: () => '/darmasaba/kesehatan/puskesmas',
@@ -82,7 +84,7 @@ const getDetailUrl = (item: { type?: string; id: string | number; [key: string]:
     jenisProgramYangDiselenggarakan: () => '/darmasaba/pendidikan/pendidikan-non-formal',
     dataPerpustakaan: () => '/darmasaba/pendidikan/perpustakaan-digital/semua',
     dataPendidikan: () => '/darmasaba/pendidikan/data-pendidikan',
-    
+
   };
 
   if (type && map[type]) return map[type](id, kategori as string | undefined);

src/app/darmasaba/_com/term-of-service.html

@@ -0,0 +1,173 @@
+<!DOCTYPE html>
+<html lang="id">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Syarat & Ketentuan Penggunaan HIPMI Badung Connect</title>
+    <style>
+        * {
+            margin: 0;
+            padding: 0;
+            box-sizing: border-box;
+        }
+
+        body {
+            font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif;
+            line-height: 1.6;
+            color: #1e293b;
+            background-color: #f8fafc;
+        }
+
+        .container {
+            max-width: 800px;
+            margin: 0 auto;
+            padding: 40px 20px;
+            background-color: white;
+            min-height: 100vh;
+        }
+
+        h1 {
+            font-size: 2rem;
+            font-weight: 700;
+            color: #1e3a5f;
+            margin-bottom: 1.5rem;
+            line-height: 1.3;
+        }
+
+        h2 {
+            font-size: 1.5rem;
+            font-weight: 700;
+            color: #1e3a5f;
+            margin-top: 2.5rem;
+            margin-bottom: 1rem;
+        }
+
+        p {
+            margin-bottom: 1rem;
+            color: #334155;
+        }
+
+        strong {
+            font-weight: 600;
+            color: #1e293b;
+        }
+
+        ul {
+            margin-left: 1.5rem;
+            margin-bottom: 1.5rem;
+        }
+
+        li {
+            margin-bottom: 0.5rem;
+            color: #334155;
+        }
+
+        .intro {
+            margin-bottom: 2rem;
+            padding: 1.25rem;
+            background-color: #f1f5f9;
+            border-radius: 8px;
+            border-left: 4px solid #1e3a5f;
+        }
+
+        .footer {
+            margin-top: 3rem;
+            padding-top: 2rem;
+            border-top: 1px solid #e2e8f0;
+            text-align: center;
+            color: #64748b;
+            font-size: 0.875rem;
+        }
+
+        @media (max-width: 768px) {
+            .container {
+                padding: 24px 16px;
+            }
+
+            h1 {
+                font-size: 1.5rem;
+            }
+
+            h2 {
+                font-size: 1.25rem;
+                margin-top: 2rem;
+            }
+        }
+
+        @media (max-width: 480px) {
+            h1 {
+                font-size: 1.25rem;
+            }
+
+            h2 {
+                font-size: 1.125rem;
+            }
+
+            ul {
+                margin-left: 1.25rem;
+            }
+        }
+    </style>
+</head>
+<body>
+    <div class="container">
+        <h1>Syarat & Ketentuan Penggunaan HIPMI Badung Connect</h1>
+        
+        <div class="intro">
+            <p>Dengan menggunakan aplikasi <strong>HIPMI Badung Connect</strong> ("Aplikasi"), Anda setuju untuk mematuhi dan terikat oleh syarat dan ketentuan berikut. Jika Anda tidak setuju dengan ketentuan ini, harap jangan gunakan Aplikasi.</p>
+        </div>
+
+        <h2>1. Definisi</h2>
+        <p><strong>HIPMI Badung Connect</strong> adalah platform digital resmi untuk anggota Himpunan Pengusaha Muda Indonesia (HIPMI) Kabupaten Badung, yang bertujuan memfasilitasi jaringan, kolaborasi, dan pertumbuhan bisnis para pengusaha muda.</p>
+
+        <h2>2. Larangan Konten Tidak Pantas</h2>
+        <p>Anda <strong>dilarang keras</strong> memposting, mengirim, membagikan, atau mengunggah konten apa pun yang mengandung:</p>
+        <ul>
+            <li>Ujaran kebencian, diskriminasi, atau konten SARA (Suku, Agama, Ras, Antar-golongan)</li>
+            <li>Pornografi, konten seksual eksplisit, atau gambar tidak senonoh</li>
+            <li>Ancaman, pelecehan, bullying, atau perilaku melecehkan</li>
+            <li>Informasi palsu, hoaks, spam, atau konten menyesatkan</li>
+            <li>Konten ilegal, melanggar hukum, atau melanggar hak kekayaan intelektual pihak lain</li>
+            <li>Promosi narkoba, perjudian, atau aktivitas ilegal lainnya</li>
+        </ul>
+
+        <h2>3. Tanggung Jawab Pengguna</h2>
+        <p>Anda bertanggung jawab penuh atas setiap konten yang Anda unggah atau bagikan melalui fitur-fitur berikut:</p>
+        <ul>
+            <li>Profil (bio, foto, portofolio)</li>
+            <li>Forum diskusi</li>
+            <li>Chat pribadi atau grup</li>
+            <li>Lowongan kerja, investasi, dan donasi</li>
+        </ul>
+        <p>Konten yang melanggar ketentuan ini dapat dihapus kapan saja tanpa pemberitahuan.</p>
+
+        <h2>4. Tindakan terhadap Pelanggaran</h2>
+        <p>Jika kami menerima laporan atau menemukan konten yang melanggar ketentuan ini, kami akan:</p>
+        <ul>
+            <li>Segera menghapus konten tersebut</li>
+            <li>Memberikan peringatan atau memblokir akun pengguna</li>
+            <li>Dalam kasus berat, melaporkan ke pihak berwajib sesuai hukum yang berlaku</li>
+        </ul>
+        <p>Tim kami berkomitmen untuk menanggapi laporan konten tidak pantas <strong>dalam waktu 24 jam</strong>.</p>
+
+        <h2>5. Mekanisme Pelaporan</h2>
+        <p>Anda dapat melaporkan konten atau pengguna yang mencurigakan melalui:</p>
+        <ul>
+            <li>Tombol <strong>"Laporkan"</strong> di setiap posting forum atau pesan chat</li>
+            <li>Tombol <strong>"Blokir Pengguna"</strong> di profil pengguna</li>
+        </ul>
+        <p>Setiap laporan akan ditangani secara rahasia dan segera.</p>
+
+        <h2>6. Perubahan Ketentuan</h2>
+        <p>Kami berhak memperbarui Syarat & Ketentuan ini sewaktu-waktu. Versi terbaru akan dipublikasikan di halaman ini dengan tanggal revisi yang diperbarui.</p>
+
+        <h2>7. Kontak</h2>
+        <p>Jika Anda memiliki pertanyaan tentang ketentuan ini, silakan hubungi kami di:<br>
+        <strong>bip.baliinteraktifperkasa@gmail.com</strong></p>
+
+        <div class="footer">
+            © 2025 Bali Interaktif Perkasa. All rights reserved.
+        </div>
+    </div>
+</body>
+</html>

src/app/darmasaba/page.tsx

@@ -1,5 +1,6 @@
 /* eslint-disable react-hooks/exhaustive-deps */
-'use client'
+'use client';
+
 import DesaAntiKorupsi from "@/app/darmasaba/_com/main-page/desaantikorupsi";
 import Kepuasan from "@/app/darmasaba/_com/main-page/kepuasan";
 import LandingPage from "@/app/darmasaba/_com/main-page/landing-page";
@@ -14,23 +15,41 @@ import Apbdes from "./_com/main-page/apbdes";
 import Prestasi from "./_com/main-page/prestasi";
 import ScrollToTopButton from "./_com/scrollToTopButton";
 
-import { useEffect, useMemo } from "react";
+import { useEffect, useRef, useState } from "react";
 import { useSnapshot } from "valtio";
 import stateDashboardBerita from "../admin/(dashboard)/_state/desa/berita";
 import stateDesaPengumuman from "../admin/(dashboard)/_state/desa/pengumuman";
-import ModernNewsNotification from "./_com/ModernNeewsNotification";
-import NewsReaderLanding from "./_com/NewsReaderalanding";
 
+import NewsReaderLanding from "./_com/NewsReaderalanding";
+import ModernNewsNotification from "./_com/ModernNewsNotification";
+import type { NewsItem } from "./_com/ModernNewsNotification"; // pastikan tipe ini diekspor
 
 export default function Page() {
+  // Tetap gunakan Valtio untuk card utama (NewsReaderLanding)
   const snap1 = useSnapshot(stateDashboardBerita.berita.findFirst);
   const snap2 = useSnapshot(stateDesaPengumuman.pengumuman.findFirst);
-
   const featured = snap1;
   const pengumuman = snap2;
   const loadingFeatured = featured.loading;
   const loadingPengumuman = pengumuman.loading;
 
+  // State untuk notifikasi
+  const [notificationNews, setNotificationNews] = useState<NewsItem[]>([]);
+  const [hasNewContent, setHasNewContent] = useState(false);
+  const [newItemCount, setNewItemCount] = useState(0);
+
+  const lastBeritaTimestamp = useRef<string | null>(null);
+  const lastPengumumanTimestamp = useRef<string | null>(null);
+
+  // Inisialisasi dari localStorage
+  useEffect(() => {
+    const savedBeritaTs = localStorage.getItem("lastSeenBeritaTs");
+    const savedPengumumanTs = localStorage.getItem("lastSeenPengumumanTs");
+    if (savedBeritaTs) lastBeritaTimestamp.current = savedBeritaTs;
+    if (savedPengumumanTs) lastPengumumanTimestamp.current = savedPengumumanTs;
+  }, []);
+
+  // Load data utama (untuk card)
   useEffect(() => {
     if (!featured.data && !loadingFeatured) {
       stateDashboardBerita.berita.findFirst.load();
@@ -43,49 +62,93 @@ export default function Page() {
     }
   }, []);
 
+  // 🔁 Fetch berita & pengumuman lengkap untuk notifikasi
+  const fetchNotificationData = async () => {
+    try {
+      const res = await fetch("/api/news/latest");
+      const result = await res.json();
+      if (result.success && Array.isArray(result.news)) {
+        const news = result.news as NewsItem[];
 
-  const newsData = useMemo(() => {
-    const items = [];
+        const latestBerita = news.find((n) => n.type === "berita");
+        const latestPengumuman = news.find((n) => n.type === "pengumuman");
 
-    if (featured.data) {
-      items.push({
-        id: String(featured.data.id || "berita-1"),
-        type: "berita" as const,
-        title: String(featured.data.judul || "Berita Terbaru"),
-        content: String(featured.data.content || ""),
-        timestamp: featured.data.createdAt
-          ? (typeof featured.data.createdAt === 'string'
-            ? featured.data.createdAt
-            : new Date(featured.data.createdAt).toISOString())
-          : new Date().toISOString(),
-      });
+        const latestBeritaTs = latestBerita?.timestamp
+          ? new Date(latestBerita.timestamp).toISOString()
+          : null;
+        const latestPengumumanTs = latestPengumuman?.timestamp
+          ? new Date(latestPengumuman.timestamp).toISOString()
+          : null;
+
+        // Inisialisasi flag
+        let isNewBerita = false;
+        let isNewPengumuman = false;
+
+        // Deteksi berita baru
+        if (latestBeritaTs) {
+          if (lastBeritaTimestamp.current === null) {
+            // Pertama kali: simpan tanpa notifikasi
+            lastBeritaTimestamp.current = latestBeritaTs;
+            localStorage.setItem("lastSeenBeritaTs", latestBeritaTs);
+          } else if (latestBeritaTs > lastBeritaTimestamp.current) {
+            isNewBerita = true;
+            lastBeritaTimestamp.current = latestBeritaTs;
+          }
+        }
+
+        // Deteksi pengumuman baru
+        if (latestPengumumanTs) {
+          if (lastPengumumanTimestamp.current === null) {
+            // Pertama kali: simpan tanpa notifikasi
+            lastPengumumanTimestamp.current = latestPengumumanTs;
+            localStorage.setItem("lastSeenPengumumanTs", latestPengumumanTs);
+          } else if (latestPengumumanTs > lastPengumumanTimestamp.current) {
+            isNewPengumuman = true;
+            lastPengumumanTimestamp.current = latestPengumumanTs;
+          }
+        }
+
+        // 🔔 Trigger notifikasi hanya jika ada yang benar-benar BARU
+        if (isNewBerita || isNewPengumuman) {
+          const count = (isNewBerita ? 1 : 0) + (isNewPengumuman ? 1 : 0);
+          setNewItemCount(count);
+          setHasNewContent(true); // ✅ INI YANG KAMU LUPA!
+        }
+
+        setNotificationNews(news);
+      }
+    } catch (err) {
+      console.error("Gagal fetch data notifikasi:", err);
     }
+  };
 
-    if (pengumuman.data) {
-      items.push({
-        id: String(pengumuman.data.id || "pengumuman-1"),
-        type: "pengumuman" as const,
-        title: String(pengumuman.data.judul || "Pengumuman Penting"),
-        content: String(pengumuman.data.content || ""),
-        timestamp: pengumuman.data.createdAt
-          ? (typeof pengumuman.data.createdAt === 'string'
-            ? pengumuman.data.createdAt
-            : new Date(pengumuman.data.createdAt).toISOString())
-          : new Date().toISOString(),
-      });
+  // Load data notifikasi pertama kali
+  useEffect(() => {
+    fetchNotificationData();
+  }, []);
+
+  // Polling setiap 30 detik
+  useEffect(() => {
+    const interval = setInterval(fetchNotificationData, 30_000);
+    return () => clearInterval(interval);
+  }, []);
+
+  const handleSeen = () => {
+    setHasNewContent(false);
+    setNewItemCount(0);
+    const latestBerita = notificationNews.find(n => n.type === "berita");
+    const latestPengumuman = notificationNews.find(n => n.type === "pengumuman");
+    if (latestBerita) {
+      localStorage.setItem("lastSeenBeritaTs", new Date(latestBerita.timestamp!).toISOString());
     }
-
-    return items;
-  }, [featured.data, pengumuman.data]);
-
+    if (latestPengumuman) {
+      localStorage.setItem("lastSeenPengumumanTs", new Date(latestPengumuman.timestamp!).toISOString());
+    }
+  };
 
   return (
     <Box id="page-root">
-      <Stack
-        bg={colors.grey[1]}
-        gap={0}
-      >
-        {/* HAPUS RUNNING TEXT, GANTI DENGAN MODERN NOTIFICATION */}
+      <Stack bg={colors.grey[1]} gap={0}>
         <LandingPage />
         <Penghargaan />
         <Layanan />
@@ -97,13 +160,15 @@ export default function Page() {
         <Prestasi />
       </Stack>
 
-      {/* Tombol Scroll ke Atas */}
       <ScrollToTopButton />
-
       <NewsReaderLanding />
+
       <ModernNewsNotification
-        news={newsData}
-        autoShowDelay={2000} // Muncul 2 detik setelah load
+        news={notificationNews}
+        hasNewContent={hasNewContent}
+        newItemCount={newItemCount}
+        onSeen={handleSeen}
+        autoShowDelay={2000}
       />
     </Box>
   );