Merge pull request 'Fix SDGs Desa Barchart sudah responsive, tabel dan bar progress di menu apbdes sudah sesuai dengan data' (#11) from nico/18-nov-25 into staging

Reviewed-on: http://wibugit.wibudev.com/wibu/desa-darmasaba/pulls/11

prisma/schema.prisma

@@ -184,18 +184,46 @@ model SdgsDesa {
 //========================================= APBDes ========================================= //
 model APBDes {
   id          String        @id @default(cuid())
-  name      String
+  tahun       Int?
-  jumlah    String
+  name        String?       // misalnya: "APBDes Tahun 2025"
+  deskripsi   String?
+  jumlah      String?       // total keseluruhan (opsional, bisa juga dihitung dari items)
+  items       APBDesItem[]
   image       FileStorage?  @relation("APBDesImage", fields: [imageId], references: [id])
   imageId     String?
   file        FileStorage?  @relation("APBDesFile", fields: [fileId], references: [id])
   fileId      String?
   createdAt   DateTime      @default(now())
   updatedAt   DateTime      @updatedAt
-  deletedAt DateTime     @default(now())
+  deletedAt   DateTime?     // opsional, tidak perlu default now()
   isActive    Boolean       @default(true)
 }
 
+model APBDesItem {
+  id          String        @id @default(cuid())
+  kode        String        // contoh: "4", "4.1", "4.1.2"
+  uraian      String        // nama item, contoh: "Pendapatan Asli Desa", "Hasil Usaha"
+  anggaran    Float         // dalam satuan Rupiah (bisa DECIMAL di DB, tapi Float umum di TS/JS)
+  realisasi   Float
+  selisih     Float         // realisasi - anggaran
+  persentase  Float  
+  tipe        String?       // (realisasi / anggaran) * 100
+  level       Int           // 1 = kelompok utama, 2 = sub-kelompok, 3 = detail
+  parentId    String?       // untuk relasi hierarki
+  parent      APBDesItem?   @relation("APBDesItemParent", fields: [parentId], references: [id])
+  children    APBDesItem[]  @relation("APBDesItemParent")
+  apbdesId    String
+  apbdes      APBDes        @relation(fields: [apbdesId], references: [id])
+  createdAt   DateTime      @default(now())
+  updatedAt   DateTime      @updatedAt
+  deletedAt   DateTime?     
+  isActive    Boolean       @default(true)
+
+  @@index([kode])
+  @@index([level])
+  @@index([apbdesId])
+}
+
 //========================================= PRESTASI DESA ========================================= //
 model PrestasiDesa {
   id         String               @id @default(cuid())
@@ -1944,17 +1972,22 @@ model KeunggulanProgram {
 model BeasiswaPendaftar {
   id               String            @id @default(cuid())
   namaLengkap      String
-  nik              String           @unique
+  nis              String?
+  kelas            String?
+  jenisKelamin     JenisKelamin
+  alamatDomisili   String?
   tempatLahir      String
   tanggalLahir     DateTime
-  jenisKelamin     JenisKelamin
+  namaOrtu         String?
-  kewarganegaraan  String
+  nik              String            @unique
-  agama            Agama
+  pekerjaanOrtu    String?
-  alamatKTP        String
+  penghasilan      String?
-  alamatDomisili   String?
   noHp             String
-  email            String           @unique
+  kewarganegaraan  String?
-  statusPernikahan StatusPernikahan
+  agama            Agama?
+  alamatKTP        String?
+  email            String?           @unique
+  statusPernikahan StatusPernikahan?
   ukuranBaju       UkuranBaju?
   isActive         Boolean           @default(true)
   createdAt        DateTime          @default(now())

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

@@ -5,58 +5,166 @@ import { toast } from "react-toastify";
 import { proxy } from "valtio";
 import { z } from "zod";
 
-const templateapbDesaForm = z.object({
+// --- Zod Schema ---
-  name: z.string().min(1, "Judul minimal 1 karakter"),
+const ApbdesItemSchema = z.object({
-  jumlah: z.string().min(1, "Deskripsi minimal 1 karakter"),
+  kode: z.string().min(1),
-  imageId: z.string().min(1, "File minimal 1"),
+  uraian: z.string().min(1),
-  fileId: z.string().min(1, "File minimal 1"),
+  anggaran: z.number().min(0),
+  realisasi: z.number().min(0),
+  selisih: z.number(),
+  persentase: z.number().min(0).max(1000), // allow >100% if overbudget
+  level: z.number().int().min(1).max(3),
+  tipe: z.string().min(1), // "pendapatan" | "belanja"
 });
 
-const defaultapbdesForm = {
+const ApbdesFormSchema = z.object({
-  name: "",
+  tahun: z.number().int().min(2000, "Tahun tidak valid"),
-  jumlah: "",
+  imageId: z.string().min(1, "Gambar wajib diunggah"),
+  fileId: z.string().min(1, "File wajib diunggah"),
+  items: z.array(ApbdesItemSchema).min(1, "Minimal ada 1 item"),
+});
+
+// --- Default Form ---
+const defaultApbdesForm = {
+  tahun: new Date().getFullYear(),
   imageId: "",
   fileId: "",
+  items: [] as z.infer<typeof ApbdesItemSchema>[],
 };
 
-const apbdes = proxy({
+// --- Helper: hitung selisih & persentase otomatis (opsional di frontend) ---
-  create: {
+// --- Helper: hitung selisih & persentase otomatis (opsional di frontend) ---
-    form: { ...defaultapbdesForm },
+function normalizeItem(item: Partial<z.infer<typeof ApbdesItemSchema>>): z.infer<typeof ApbdesItemSchema> {
-    loading: false,
+  const anggaran = item.anggaran ?? 0;
-    async create() {
+  const realisasi = item.realisasi ?? 0;
-      const cek = templateapbDesaForm.safeParse(apbdes.create.form);
-      if (!cek.success) {
-        const err = `[${cek.error.issues
-          .map((v) => `${v.path.join(".")}`)
-          .join("\n")}] required`;
-        return toast.error(err);
-      }
-      try {
-        apbdes.create.loading = true;
-        const res = await ApiFetch.api.landingpage.apbdes["create"].post({
-          ...apbdes.create.form,
-        });
   
-        if (res.status === 200) {
+  // ✅ Formula yang benar
+  const selisih = anggaran - realisasi; // positif = sisa anggaran, negatif = over budget
+  const persentase = anggaran > 0 ? (realisasi / anggaran) * 100 : 0; // persentase realisasi terhadap anggaran
+
+  return {
+    kode: item.kode || "",
+    uraian: item.uraian || "",
+    anggaran,
+    realisasi,
+    selisih,
+    persentase,
+    level: item.level || 1,
+    tipe: item.tipe || "pendapatan",
+  };
+}
+
+// --- State Utama ---
+const apbdes = proxy({
+  // create: {
+  //   form: { ...defaultApbdesForm },
+  //   loading: false,
+
+  //   addItem(item: Partial<z.infer<typeof ApbdesItemSchema>>) {
+  //     const normalized = normalizeItem(item);
+  //     this.form.items.push(normalized);
+  //   },
+
+  //   removeItem(index: number) {
+  //     this.form.items.splice(index, 1);
+  //   },
+
+  //   updateItem(index: number, updates: Partial<z.infer<typeof ApbdesItemSchema>>) {
+  //     const current = this.form.items[index];
+  //     if (current) {
+  //       const updated = normalizeItem({ ...current, ...updates });
+  //       this.form.items[index] = updated;
+  //     }
+  //   },
+
+  //   reset() {
+  //     this.form = { ...defaultApbdesForm };
+  //   },
+
+  //   async create() {
+  //     const parsed = ApbdesFormSchema.safeParse(this.form);
+  //     if (!parsed.success) {
+  //       const errors = parsed.error.issues.map((issue) => `${issue.path.join(".")} - ${issue.message}`);
+  //       toast.error(`Validasi gagal:\n${errors.join("\n")}`);
+  //       return;
+  //     }
+
+  //     try {
+  //       this.loading = true;
+  //       const res = await ApiFetch.api.landingpage.apbdes["create"].post(parsed.data);
+
+  //       if (res.data?.success) {
+  //         toast.success("APBDes berhasil dibuat");
+  //         apbdes.findMany.load();
+  //         this.reset();
+  //       } else {
+  //         toast.error(res.data?.message || "Gagal membuat APBDes");
+  //       }
+  //     } catch (error: any) {
+  //       console.error("Create APBDes error:", error);
+  //       toast.error(error?.message || "Terjadi kesalahan saat membuat APBDes");
+  //     } finally {
+  //       this.loading = false;
+  //     }
+  //   },
+  // },
+  create: {
+    form: { ...defaultApbdesForm },
+    loading: false,
+
+    addItem(item: Partial<z.infer<typeof ApbdesItemSchema>>) {
+      const normalized = normalizeItem(item);
+      this.form.items.push(normalized);
+    },
+
+    removeItem(index: number) {
+      this.form.items.splice(index, 1);
+    },
+
+    updateItem(index: number, updates: Partial<z.infer<typeof ApbdesItemSchema>>) {
+      const current = this.form.items[index];
+      if (current) {
+        const updated = normalizeItem({ ...current, ...updates });
+        this.form.items[index] = updated;
+      }
+    },
+
+    reset() {
+      this.form = { ...defaultApbdesForm };
+    },
+
+    async create() {
+      const parsed = ApbdesFormSchema.safeParse(this.form);
+      if (!parsed.success) {
+        const errors = parsed.error.issues.map((issue) => `${issue.path.join(".")} - ${issue.message}`);
+        toast.error(`Validasi gagal:\n${errors.join("\n")}`);
+        return;
+      }
+
+      try {
+        this.loading = true;
+        const res = await ApiFetch.api.landingpage.apbdes["create"].post(parsed.data);
+
+        if (res.data?.success) {
+          toast.success("APBDes berhasil dibuat");
           apbdes.findMany.load();
-          return toast.success("Data berhasil ditambahkan");
+          this.reset();
+        } else {
+          toast.error(res.data?.message || "Gagal membuat APBDes");
         }
-        return toast.error("Gagal menambahkan data");
+      } catch (error: any) {
-      } catch (error) {
+        console.error("Create APBDes error:", error);
-        console.log(error);
+        toast.error(error?.message || "Terjadi kesalahan saat membuat APBDes");
-        toast.error("Gagal menambahkan data");
       } finally {
-        apbdes.create.loading = false;
+        this.loading = false;
       }
     },
   },
+
   findMany: {
     data: null as
       | Prisma.APBDesGetPayload<{
-          include: {
+          include: { image: true; file: true; items: true };
-            image: true;
-            file: true;
-          };
         }>[]
       | null,
     page: 1,
@@ -64,192 +172,200 @@ const apbdes = proxy({
     total: 0,
     loading: false,
     search: "",
-    load: async (page = 1, limit = 10, search = "") => {  // Change to arrow function
+
-      apbdes.findMany.loading = true;  // Use the full path to access the property
+    load: async (page = 1, limit = 10, search = "") => {
+      apbdes.findMany.loading = true;
       apbdes.findMany.page = page;
       apbdes.findMany.search = search;
+    
       try {
-        const query: any = { page, limit };
+        const query: Record<string, string> = { page: String(page), limit: String(limit) };
         if (search) query.search = search;
     
-        const res = await ApiFetch.api.landingpage.apbdes[
+        const res = await ApiFetch.api.landingpage.apbdes["findMany"].get({ query });
-          "findMany"
-        ].get({
-          query
-        });
     
-        if (res.status === 200 && res.data?.success) {
+        if (res.data?.success) {
           apbdes.findMany.data = res.data.data || [];
-          apbdes.findMany.total = res.data.total || 0;
+          apbdes.findMany.total = res.data.meta?.total || 0;
-          apbdes.findMany.totalPages = res.data.totalPages || 1;
+          apbdes.findMany.totalPages = res.data.meta?.totalPages || 1;
         } else {
-          console.error("Failed to load pegawai:", res.data?.message);
           apbdes.findMany.data = [];
           apbdes.findMany.total = 0;
           apbdes.findMany.totalPages = 1;
+          toast.error(res.data?.message || "Gagal memuat data");
         }
       } catch (error) {
-        console.error("Error loading pegawai:", error);
+        console.error("FindMany error:", error);
         apbdes.findMany.data = [];
         apbdes.findMany.total = 0;
         apbdes.findMany.totalPages = 1;
+        toast.error("Gagal memuat daftar APBDes");
       } finally {
         apbdes.findMany.loading = false;
       }
     },
   },
+
   findUnique: {
-    data: null as Prisma.APBDesGetPayload<{
+    data: null as
-      include: {
+      | Prisma.APBDesGetPayload<{
-        image: true;
+          include: { image: true; file: true; items: true };
-        file: true;
+        }>
-      };
+      | null,
-    }> | null,
+    loading: false,
+    error: null as string | null,
+  
     async load(id: string) {
+      if (!id || id.trim() === '') {
+        this.data = null;
+        this.error = "ID tidak valid";
+        return;
+      }
+  
+      this.loading = true;
+      this.error = null;
+  
       try {
-        const res = await fetch(`/api/landingpage/apbdes/${id}`);
+        // Pastikan URL-nya benar
-        if (res.ok) {
+        const url = `/api/landingpage/apbdes/${id}`;
-          const data = await res.json();
+        console.log("🌐 Fetching:", url);
-          apbdes.findUnique.data = data.data ?? null;
+  
+        // Gunakan fetch biasa atau ApiFetch dengan cara yang benar
+        const response = await fetch(url);
+        const res = await response.json();
+  
+        console.log("📦 Response:", res);
+  
+        if (res.success && res.data) {
+          this.data = res.data;
         } else {
-          console.error("Failed to fetch data", res.status, res.statusText);
+          this.data = null;
-          apbdes.findUnique.data = null;
+          this.error = res.message || "Gagal memuat detail APBDes";
+          toast.error(this.error);
         }
       } catch (error) {
-        console.error("Error fetching data:", error);
+        console.error("❌ FindUnique error:", error);
-        apbdes.findUnique.data = null;
+        this.data = null;
+        this.error = "Gagal memuat detail APBDes";
+        toast.error(this.error);
+      } finally {
+        this.loading = false;
+      }
     }
   },
-  },
+
   delete: {
     loading: false,
     async byId(id: string) {
       if (!id) return toast.warn("ID tidak valid");
 
       try {
-        apbdes.delete.loading = true;
+        this.loading = true;
+        const res = await (ApiFetch.api.landingpage.apbdes as any)["del"][id].delete();
 
-        const response = await fetch(`/api/landingpage/apbdes/del/${id}`, {
+        if (res.data?.success) {
-          method: "DELETE",
+          toast.success("APBDes berhasil dihapus");
-          headers: {
+          apbdes.findMany.load();
-            "Content-Type": "application/json",
-          },
-        });
-
-        const result = await response.json();
-
-        if (response.ok && result?.success) {
-          toast.success(result.message || "apbdes berhasil dihapus");
-          await apbdes.findMany.load(); // refresh list
         } else {
-          toast.error(result?.message || "Gagal menghapus apbdes");
+          toast.error(res.data?.message || "Gagal menghapus APBDes");
         }
-      } catch (error) {
+      } catch (error: any) {
-        console.error("Gagal delete:", error);
+        console.error("Delete error:", error);
-        toast.error("Terjadi kesalahan saat menghapus apbdes");
+        toast.error(error?.message || "Terjadi kesalahan saat menghapus");
       } finally {
-        apbdes.delete.loading = false;
+        this.loading = false;
       }
     },
   },
+
   edit: {
     id: "",
-    form: { ...defaultapbdesForm },
+    form: { ...defaultApbdesForm },
     loading: false,
 
     async load(id: string) {
-      if (!id) {
+      if (!id) return toast.warn("ID tidak valid");
-        toast.warn("ID tidak valid");
-        return null;
-      }
 
       try {
-        apbdes.edit.loading = true;
+        this.loading = true;
+        const res = await (ApiFetch.api.landingpage.apbdes as any)[id].get();
 
-        const response = await fetch(`/api/landingpage/apbdes/${id}`, {
+        if (res.data?.success) {
-          method: "GET",
+          const data = res.data.data;
-          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,
+            tahun: data.tahun || new Date().getFullYear(),
-            jumlah: data.jumlah,
+            imageId: data.imageId || "",
-            imageId: data.imageId,
+            fileId: data.fileId || "",
-            fileId: data.fileId,
+            items: (data.items || []).map((item: any) => ({
+              kode: item.kode,
+              uraian: item.uraian,
+              anggaran: item.anggaran,
+              realisasi: item.realisasi,
+              selisih: item.selisih,
+              persentase: item.persentase,
+              level: item.level,
+              tipe: item.tipe,
+            })),
           };
           return data;
         } else {
-          throw new Error(result?.message || "Gagal memuat data");
+          throw new Error(res.data?.message || "Gagal memuat data");
         }
-      } catch (error) {
+      } catch (error: any) {
-        console.error("Error loading apbdes:", error);
+        console.error("Edit load error:", error);
-        toast.error(
+        toast.error(error.message || "Gagal memuat data untuk diedit");
-          error instanceof Error ? error.message : "Gagal memuat data"
-        );
-        return null;
       } finally {
-        apbdes.edit.loading = false;
+        this.loading = false;
       }
     },
 
     async update() {
-      const cek = templateapbDesaForm.safeParse(apbdes.edit.form);
+      const parsed = ApbdesFormSchema.safeParse(this.form);
-      if (!cek.success) {
+      if (!parsed.success) {
-        const err = `[${cek.error.issues
+        const errors = parsed.error.issues.map((issue) => `${issue.path.join(".")} - ${issue.message}`);
-          .map((v) => `${v.path.join(".")}`)
+        toast.error(`Validasi gagal:\n${errors.join("\n")}`);
-          .join("\n")}] required`;
+        return false;
-        return toast.error(err);
       }
 
       try {
-        apbdes.edit.loading = true;
+        this.loading = true;
-        const response = await fetch(`/api/landingpage/apbdes/${this.id}`, {
+        // Include the ID in the request body
-          method: "PUT",
+        const requestData = {
-          headers: {
+          ...parsed.data,
-            "Content-Type": "application/json",
+          id: this.id, // Add the ID to the request body
-          },
+        };
-          body: JSON.stringify({
+        
-            name: this.form.name,
+        const res = await (ApiFetch.api.landingpage.apbdes as any)[this.id].put(requestData);
-            jumlah: this.form.jumlah,
+
-            imageId: this.form.imageId,
+        if (res.data?.success) {
-            fileId: this.form.fileId,
+          toast.success("APBDes berhasil diperbarui");
-          }),
+          apbdes.findMany.load();
-        });
-        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 apbdes");
-          await apbdes.findMany.load(); // refresh list
           return true;
         } else {
-          throw new Error(result.message || "Gagal mengupdate apbdes");
+          throw new Error(res.data?.message || "Gagal memperbarui APBDes");
         }
-      } catch (error) {
+      } catch (error: any) {
-        console.error("Error updating apbdes:", error);
+        console.error("Update error:", error);
-        toast.error(
+        toast.error(error.message || "Gagal memperbarui APBDes");
-          error instanceof Error ? error.message : "Gagal mengupdate apbdes"
-        );
         return false;
       } finally {
-        apbdes.edit.loading = false;
+        this.loading = false;
       }
     },
+
+    addItem(item: Partial<z.infer<typeof ApbdesItemSchema>>) {
+      const normalized = normalizeItem(item);
+      this.form.items.push(normalized);
+    },
+
+    removeItem(index: number) {
+      this.form.items.splice(index, 1);
+    },
+
     reset() {
-      apbdes.edit.id = "";
+      this.id = "";
-      apbdes.edit.form = { ...defaultapbdesForm };
+      this.form = { ...defaultApbdesForm };
     },
   },
 });

src/app/admin/(dashboard)/_state/pendidikan/beasiswa-desa.ts

@@ -9,34 +9,32 @@ import { z } from "zod";
 
 const templateBeasiswaPendaftar = z.object({
   namaLengkap: z.string().min(1, "Nama harus diisi"),
-  nik: z.string().min(1, "NIK harus diisi"),
+  nis: z.string().min(1, "NIS harus diisi"),
+  kelas: z.string().min(1, "Kelas harus diisi"),
+  jenisKelamin: z.string().min(1, "Jenis kelamin harus diisi"),
+  alamatDomisili: z.string().min(1, "Alamat domisili harus diisi"),
   tempatLahir: z.string().min(1, "Tempat lahir harus diisi"),
   tanggalLahir: z.string().min(1, "Tanggal lahir harus diisi"),
-  jenisKelamin: z.string().min(1, "Jenis kelamin harus diisi"),
+  namaOrtu: z.string().min(1, "Nama ortu harus diisi"),
-  kewarganegaraan: z.string().min(1, "Kewarganegaraan harus diisi"),
+  nik: z.string().min(1, "NIK harus diisi"),
-  agama: z.string().min(1, "Agama harus diisi"),
+  pekerjaanOrtu: z.string().min(1, "Pekerjaan ortu harus diisi"),
-  alamatKTP: z.string().min(1, "Alamat KTP harus diisi"),
+  penghasilan: z.string().min(1, "Penghasilan ortu harus diisi"),
-  alamatDomisili: z.string().min(1, "Alamat domisili harus diisi"),
   noHp: z.string().min(1, "No HP harus diisi"),
-  email: z.string().min(1, "Email harus diisi"),
-  statusPernikahan: z.string().min(1, "Status pernikahan harus diisi"),
-  ukuranBaju: z.string().min(1, "Ukuran baju harus diisi"),
 });
 
 const defaultBeasiswaPendaftar = {
   namaLengkap: "",
-  nik: "",
+  nis: "",
+  kelas: "",
+  jenisKelamin: "",
+  alamatDomisili: "",
   tempatLahir: "",
   tanggalLahir: "",
-  jenisKelamin: "",
+  namaOrtu: "",
-  kewarganegaraan: "",
+  nik: "",
-  agama: "",
+  pekerjaanOrtu: "",
-  alamatKTP: "",
+  penghasilan: "",
-  alamatDomisili: "",
   noHp: "",
-  email: "",
-  statusPernikahan: "",
-  ukuranBaju: "",
 };
 
 const beasiswaPendaftar = proxy({
@@ -200,18 +198,17 @@ const beasiswaPendaftar = proxy({
           this.id = data.id;
           this.form = {
             namaLengkap: data.namaLengkap,
-            nik: data.nik,
+            nis: data.nis,
+            kelas: data.kelas,
+            jenisKelamin: data.jenisKelamin,
+            alamatDomisili: data.alamatDomisili,
             tempatLahir: data.tempatLahir,
             tanggalLahir: data.tanggalLahir,
-            jenisKelamin: data.jenisKelamin,
+            namaOrtu: data.namaOrtu,
-            kewarganegaraan: data.kewarganegaraan,
+            nik: data.nik,
-            agama: data.agama,
+            pekerjaanOrtu: data.pekerjaanOrtu,
-            alamatKTP: data.alamatKTP,
+            penghasilan: data.penghasilan,
-            alamatDomisili: data.alamatDomisili,
             noHp: data.noHp,
-            email: data.email,
-            statusPernikahan: data.statusPernikahan,
-            ukuranBaju: data.ukuranBaju,
           };
           return data; // Return the loaded data
         } else {
@@ -249,17 +246,17 @@ const beasiswaPendaftar = proxy({
             },
             body: JSON.stringify({
               namaLengkap: this.form.namaLengkap,
-              nik: this.form.nik,
+              nis: this.form.nis,
-              tanggalLahir: this.form.tanggalLahir,
+              kelas: this.form.kelas,
               jenisKelamin: this.form.jenisKelamin,
-              kewarganegaraan: this.form.kewarganegaraan,
-              agama: this.form.agama,
-              alamatKTP: this.form.alamatKTP,
               alamatDomisili: this.form.alamatDomisili,
+              tempatLahir: this.form.tempatLahir,
+              tanggalLahir: this.form.tanggalLahir,
+              namaOrtu: this.form.namaOrtu,
+              nik: this.form.nik,
+              pekerjaanOrtu: this.form.pekerjaanOrtu,
+              penghasilan: this.form.penghasilan,
               noHp: this.form.noHp,
-              email: this.form.email,
-              statusPernikahan: this.form.statusPernikahan,
-              ukuranBaju: this.form.ukuranBaju,
             }),
           }
         );

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

@@ -1,94 +1,102 @@
 /* eslint-disable react-hooks/exhaustive-deps */
+/* eslint-disable @typescript-eslint/no-explicit-any */
+
 'use client';
 
 import apbdes from '@/app/admin/(dashboard)/_state/landing-page/apbdes';
 import colors from '@/con/colors';
 import ApiFetch from '@/lib/api-fetch';
 import {
+  ActionIcon,
+  Badge,
   Box,
   Button,
   Group,
   Image,
+  Loader,
+  NumberInput,
   Paper,
+  Select,
   Stack,
+  Table,
   Text,
   TextInput,
   Title,
-  Loader,
-  ActionIcon
 } from '@mantine/core';
 import { Dropzone } from '@mantine/dropzone';
-import { IconArrowBack, IconFile, IconPhoto, IconUpload, IconX } from '@tabler/icons-react';
+import {
+  IconArrowBack,
+  IconFile,
+  IconPhoto,
+  IconPlus,
+  IconTrash,
+  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';
 
+// Tipe untuk form item
+type ItemForm = {
+  kode: string;
+  uraian: string;
+  anggaran: number;
+  realisasi: number;
+  level: number;
+  tipe: 'pendapatan' | 'belanja' | 'pembiayaan';
+};
+
 function EditAPBDes() {
   const apbdesState = useProxy(apbdes);
   const router = useRouter();
   const params = useParams();
 
-  const [formData, setFormData] = useState({
-    name: '',
-    jumlah: '',
-    imageId: '',
-    fileId: ''
-  });
-
   const [isSubmitting, setIsSubmitting] = useState(false);
-
-  const [originalData, setOriginalData] = useState({
-    name: "",
-    jumlah: "",
-    imageId: "",
-    fileId: "",
-    imageUrl: "",
-    docUrl: "",
-  });
-
   const [previewImage, setPreviewImage] = useState<string | null>(null);
   const [previewDoc, setPreviewDoc] = useState<string | null>(null);
   const [imageFile, setImageFile] = useState<File | null>(null);
   const [docFile, setDocFile] = useState<File | null>(null);
 
-  // Load data on mount
+  // Form input untuk item baru
-  useEffect(() => {
+  const [newItem, setNewItem] = useState<ItemForm>({
-    const loadData = async () => {
+    kode: '',
-      const id = params?.id as string;
+    uraian: '',
-      if (!id) return;
+    anggaran: 0,
-
+    realisasi: 0,
-      try {
+    level: 1,
-        const data = await apbdesState.edit.load(id);
+    tipe: 'pendapatan',
-        if (data) {
-          const newForm = {
-            name: data.name || "",
-            jumlah: data.jumlah || "",
-            imageId: data.imageId || "",
-            fileId: data.fileId || "",
-          };
-          setFormData(newForm);
-
-          // simpan juga versi original
-          setOriginalData({
-            ...newForm,
-            imageUrl: data.image?.link || "",
-            docUrl: data.file?.link || "",
   });
 
+  // Type for the API response
+  interface APBDesResponse {
+    id: string;
+    image?: {
+      link: string;
+      id: string;
+    };
+    file?: {
+      link: string;
+      id: string;
+    };
+    // Add other properties as needed
+  }
+
+  // Load data saat pertama kali
+  useEffect(() => {
+    const id = params?.id as string;
+    if (id) {
+      apbdesState.edit.load(id).then((response) => {
+        const data = response as unknown as APBDesResponse;
+        if (data) {
+          // ✅ Ambil link langsung dari response
           setPreviewImage(data.image?.link || null);
           setPreviewDoc(data.file?.link || null);
         }
-      } catch (err) {
+      });
-        console.error(err);
-        toast.error('Gagal memuat data APBDes');
     }
-    };
-
-    loadData();
   }, [params?.id]);
 
-  // Generic Dropzone handler
   const handleDrop = (fileType: 'image' | 'doc') => (files: File[]) => {
     const file = files[0];
     if (!file) return;
@@ -102,51 +110,95 @@ function EditAPBDes() {
     }
   };
 
-  const handleSubmit = async () => {
+  const handleAddItem = () => {
-    try {
+    const { kode, uraian, anggaran, realisasi, level, tipe } = newItem;
-      setIsSubmitting(true);
+    if (!kode || !uraian) {
-      // Update global state with local form data first
+      return toast.warn('Kode dan uraian wajib diisi');
-      apbdesState.edit.form = { ...apbdesState.edit.form, ...formData };
+    }
 
-      // Helper function for uploading file
+    const selisih = realisasi - anggaran;
-      const uploadFile = async (file: File | null) => {
+    const persentase = anggaran > 0 ? (realisasi / anggaran) * 100 : 0;
-        if (!file) return null;
+
-        const res = await ApiFetch.api.fileStorage.create.post({ file, name: file.name });
+    apbdesState.edit.addItem({
-        const uploaded = res.data?.data;
+      kode,
-        if (!uploaded?.id) throw new Error('Upload gagal');
+      uraian,
-        return uploaded.id;
+      anggaran,
+      realisasi,
+      selisih,
+      persentase,
+      level,
+      tipe,
+    });
+
+    setNewItem({
+      kode: '',
+      uraian: '',
+      anggaran: 0,
+      realisasi: 0,
+      level: 1,
+      tipe: 'pendapatan',
+    });
   };
 
-      // Upload files if selected
+  const handleRemoveItem = (index: number) => {
-      const uploadedImageId = await uploadFile(imageFile);
+    apbdesState.edit.removeItem(index);
-      const uploadedDocId = await uploadFile(docFile);
+  };
 
-      if (uploadedImageId) apbdesState.edit.form.imageId = uploadedImageId;
+  const handleSubmit = async () => {
-      if (uploadedDocId) apbdesState.edit.form.fileId = uploadedDocId;
+    if (apbdesState.edit.form.items.length === 0) {
+      return toast.warn('Minimal harus ada 1 item APBDes');
+    }
 
-      await apbdesState.edit.update();
+    try {
-      toast.success('APBDes berhasil diperbarui!');
+      setIsSubmitting(true);
+
+      // Upload file baru jika ada
+      if (imageFile) {
+        const res = await ApiFetch.api.fileStorage.create.post({
+          file: imageFile,
+          name: imageFile.name,
+        });
+        const imageId = res.data?.data?.id;
+        if (imageId) apbdesState.edit.form.imageId = imageId;
+      }
+
+      if (docFile) {
+        const res = await ApiFetch.api.fileStorage.create.post({
+          file: docFile,
+          name: docFile.name,
+        });
+        const fileId = res.data?.data?.id;
+        if (fileId) apbdesState.edit.form.fileId = fileId;
+      }
+
+      const success = await apbdesState.edit.update();
+      if (success) {
         router.push('/admin/landing-page/APBDes');
+      }
     } catch (err) {
-      console.error(err);
+      console.error('Update error:', err);
-      toast.error('Terjadi kesalahan saat memperbarui APBDes');
+      toast.error('Gagal memperbarui APBDes');
     } finally {
       setIsSubmitting(false);
     }
   };
 
-  const handleResetForm = () => {
+  const handleReset = () => {
-    setFormData({
+    const id = params?.id as string;
-      name: originalData.name,
+    if (id) {
-      jumlah: originalData.jumlah,
+      apbdesState.edit.load(id);
-      imageId: originalData.imageId,
-      fileId: originalData.fileId,
-    });
-    setPreviewImage(originalData.imageUrl || null);
       setImageFile(null);
-    setPreviewDoc(originalData.docUrl || null);
       setDocFile(null);
-    toast.info("Form dikembalikan ke data awal");
+      setNewItem({
+        kode: '',
+        uraian: '',
+        anggaran: 0,
+        realisasi: 0,
+        level: 1,
+        tipe: 'pendapatan',
+      });
+      toast.info('Form dikembalikan ke data awal');
+    }
   };
 
   return (
@@ -160,43 +212,49 @@ function EditAPBDes() {
         </Title>
       </Group>
 
-      <Paper w={{ base: '100%', md: '50%' }} bg={colors['white-1']} p="lg" radius="md" shadow="sm" style={{ border: '1px solid #e0e0e0' }}>
+      <Paper
+        w={{ base: '100%', md: '100%' }}
+        bg={colors['white-1']}
+        p="lg"
+        radius="md"
+        shadow="sm"
+        style={{ border: '1px solid #e0e0e0' }}
+      >
         <Stack gap="md">
-          {/* Controlled Inputs */}
+          {/* Header Form */}
-          <TextInput
+          <NumberInput
-            label="Nama APBDes"
+            label="Tahun"
-            placeholder="Masukkan nama APBDes"
+            value={apbdesState.edit.form.tahun || new Date().getFullYear()}
-            value={formData.name}
+            onChange={(val) =>
-            onChange={(e) => setFormData({ ...formData, name: e.target.value })}
+              (apbdesState.edit.form.tahun = Number(val) || new Date().getFullYear())
+            }
+            min={2000}
+            max={2100}
             required
           />
 
-          <TextInput
+          {/* Gambar & Dokumen */}
-            label="Jumlah Anggaran"
+          <Stack gap="xs">
-            placeholder="Masukkan jumlah anggaran"
-            value={formData.jumlah}
-            onChange={(e) => setFormData({ ...formData, jumlah: e.target.value })}
-            required
-          />
-
-          {/* Image Dropzone */}
             <Box>
-            <Text fw="bold" fz="sm" mb={6}>Gambar APBDes</Text>
+              <Text fw="bold" fz="sm" mb={6}>
+                Gambar APBDes
+              </Text>
               <Dropzone
                 onDrop={handleDrop('image')}
-              onReject={() => toast.error('File tidak valid, gunakan format gambar')}
+                onReject={() => toast.error('File gambar 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.Idle>
-                <Dropzone.Reject><IconX size={48} color="red" stroke={1.5} /></Dropzone.Reject>
+                    <IconPhoto size={48} color="#868e96" stroke={1.5} />
-                <Dropzone.Idle><IconPhoto size={48} color="#868e96" stroke={1.5} /></Dropzone.Idle>
+                  </Dropzone.Idle>
                   <Stack gap="xs" align="center">
-                  <Text size="md" fw={500}>Seret gambar atau klik untuk memilih file</Text>
+                    <Text size="md" fw={500}>
-                  <Text size="sm" c="dimmed">Maksimal 5MB, format gambar .png, .jpg, .jpeg, webp</Text>
+                      {previewImage ? 'Ganti gambar' : 'Unggah gambar'}
+                    </Text>
                   </Stack>
                 </Group>
               </Dropzone>
@@ -204,17 +262,10 @@ function EditAPBDes() {
                 <Box mt="sm" pos="relative" style={{ textAlign: 'center' }}>
                   <Image
                     src={previewImage}
-                  alt="Preview Gambar"
+                    alt="Preview"
                     radius="md"
-                  style={{
+                    style={{ maxHeight: 200, objectFit: 'contain', border: '1px solid #ddd' }}
-                    maxHeight: 200,
-                    objectFit: 'contain',
-                    border: '1px solid #ddd',
-                  }}
-                  loading="lazy"
                   />
-
-                {/* Tombol hapus (pojok kanan atas) */}
                   <ActionIcon
                     variant="filled"
                     color="red"
@@ -227,9 +278,6 @@ function EditAPBDes() {
                       setPreviewImage(null);
                       setImageFile(null);
                     }}
-                  style={{
-                    boxShadow: '0 2px 6px rgba(0,0,0,0.15)',
-                  }}
                   >
                     <IconX size={14} />
                   </ActionIcon>
@@ -237,12 +285,13 @@ function EditAPBDes() {
               )}
             </Box>
 
-          {/* Document Dropzone */}
             <Box>
-            <Text fw="bold" fz="sm" mb={6}>Dokumen APBDes</Text>
+              <Text fw="bold" fz="sm" mb={6}>
+                Dokumen APBDes
+              </Text>
               <Dropzone
                 onDrop={handleDrop('doc')}
-              onReject={() => toast.error('File tidak valid, gunakan format dokumen')}
+                onReject={() => toast.error('File dokumen tidak valid')}
                 maxSize={10 * 1024 ** 2}
                 accept={{
                   'application/pdf': ['.pdf'],
@@ -254,69 +303,181 @@ function EditAPBDes() {
                 radius="md"
                 p="xl"
               >
-              <Group justify="center" gap="xl" mih={150}>
+                <Group justify="center" gap="xl" mih={180}>
-                <Dropzone.Accept><IconUpload size={48} color={colors['blue-button']} stroke={1.5} /></Dropzone.Accept>
+                  <Dropzone.Idle>
-                <Dropzone.Reject><IconX size={48} color="red" stroke={1.5} /></Dropzone.Reject>
+                    <IconFile size={48} color="#868e96" stroke={1.5} />
-                <Dropzone.Idle><IconFile size={48} color="#868e96" stroke={1.5} /></Dropzone.Idle>
+                  </Dropzone.Idle>
                   <Stack gap="xs" align="center">
-                  <Text size="md" fw={500}>Seret dokumen atau klik untuk memilih file</Text>
+                    <Text size="md" fw={500}>
-                  <Text size="sm" c="dimmed">Maksimal 10MB, format PDF/DOC/DOCX/XLS/XLSX</Text>
+                      {previewDoc ? 'Ganti dokumen' : 'Unggah dokumen'}
+                    </Text>
                   </Stack>
                 </Group>
               </Dropzone>
               {previewDoc && (
-              <Box mt="sm" pos="relative" style={{ textAlign: 'center' }}>
+                <Box mt="sm">
-                <Text size="sm" c="dimmed" mb="xs">Dokumen terpilih: {docFile?.name || 'Dokumen'}</Text>
+                  <Button
-                <Button component="a" href={previewDoc} target="_blank" rel="noopener noreferrer" variant="light" leftSection={<IconFile size={16} />} size="sm">
+                    component="a"
+                    href={previewDoc}
+                    target="_blank"
+                    rel="noopener noreferrer"
+                    variant="light"
+                    size="xs"
+                    leftSection={<IconFile size={14} />}
+                  >
                     Lihat Dokumen
                   </Button>
-                {/* Tombol hapus (pojok kanan atas) */}
                   <ActionIcon
                     variant="filled"
                     color="red"
                     radius="xl"
                     size="sm"
-                  pos="absolute"
+                    ml="sm"
-                  top={5}
-                  right={5}
                     onClick={() => {
                       setPreviewDoc(null);
                       setDocFile(null);
                     }}
-                  style={{
-                    boxShadow: '0 2px 6px rgba(0,0,0,0.15)',
-                  }}
                   >
                     <IconX size={14} />
                   </ActionIcon>
                 </Box>
               )}
             </Box>
+          </Stack>
 
-          <Group justify="right">
+          {/* Input Item Baru */}
-            {/* Tombol Batal */}
+          <Paper withBorder p="md" radius="md">
+            <Title order={6} mb="sm">
+              Tambah Item Pendapatan/Belanja
+            </Title>
+            <Stack gap="xs">
+              <Group grow>
+                <TextInput
+                  label="Kode"
+                  placeholder="Contoh: 4.1.2"
+                  value={newItem.kode}
+                  onChange={(e) => setNewItem({ ...newItem, kode: e.target.value })}
+                  required
+                />
+                <Select
+                  label="Level"
+                  data={[
+                    { value: '1', label: 'Level 1 (Kelompok)' },
+                    { value: '2', label: 'Level 2 (Sub-kelompok)' },
+                    { value: '3', label: 'Level 3 (Detail)' },
+                  ]}
+                  value={String(newItem.level)}
+                  onChange={(val) => setNewItem({ ...newItem, level: Number(val) || 1 })}
+                />
+                <Select
+                  label="Tipe"
+                  data={[
+                    { value: 'pendapatan', label: 'Pendapatan' },
+                    { value: 'belanja', label: 'Belanja' },
+                  ]}
+                  value={newItem.tipe}
+                  onChange={(val) => setNewItem({ ...newItem, tipe: (val as any) || 'pendapatan' })}
+                />
+              </Group>
+              <TextInput
+                label="Uraian"
+                placeholder="Contoh: Dana Desa"
+                value={newItem.uraian}
+                onChange={(e) => setNewItem({ ...newItem, uraian: e.target.value })}
+                required
+              />
+              <Group grow>
+                <NumberInput
+                  label="Anggaran (Rp)"
+                  value={newItem.anggaran}
+                  onChange={(val) => setNewItem({ ...newItem, anggaran: Number(val) || 0 })}
+                  thousandSeparator
+                  min={0}
+                />
+                <NumberInput
+                  label="Realisasi (Rp)"
+                  value={newItem.realisasi}
+                  onChange={(val) => setNewItem({ ...newItem, realisasi: Number(val) || 0 })}
+                  thousandSeparator
+                  min={0}
+                />
+              </Group>
               <Button
-              variant="outline"
+                leftSection={<IconPlus size={16} />}
-              color="gray"
+                onClick={handleAddItem}
-              radius="md"
+                disabled={!newItem.kode || !newItem.uraian}
-              size="md"
-              onClick={handleResetForm}
               >
+                Tambah Item
+              </Button>
+            </Stack>
+          </Paper>
+
+          {/* Tabel Items */}
+          {apbdesState.edit.form.items.length > 0 && (
+            <Paper withBorder p="md" radius="md">
+              <Title order={6} mb="sm">
+                Daftar Item ({apbdesState.edit.form.items.length})
+              </Title>
+              <Table striped highlightOnHover>
+                <thead>
+                  <tr>
+                    <th>Kode</th>
+                    <th>Uraian</th>
+                    <th>Anggaran</th>
+                    <th>Realisasi</th>
+                    <th>Level</th>
+                    <th>Tipe</th>
+                    <th style={{ width: '50px' }}>Aksi</th>
+                  </tr>
+                </thead>
+                <tbody>
+                  {apbdesState.edit.form.items.map((item, idx) => (
+                    <tr key={idx}>
+                      <td>
+                        <Text size="sm" fw={500}>
+                          {item.kode}
+                        </Text>
+                      </td>
+                      <td>{item.uraian}</td>
+                      <td>{item.anggaran.toLocaleString('id-ID')}</td>
+                      <td>{item.realisasi.toLocaleString('id-ID')}</td>
+                      <td>
+                        <Badge size="sm" color={item.level === 1 ? 'blue' : item.level === 2 ? 'green' : 'grape'}>
+                          L{item.level}
+                        </Badge>
+                      </td>
+                      <td>
+                        <Badge size="sm" color={item.tipe === 'pendapatan' ? 'teal' : 'red'}>
+                          {item.tipe}
+                        </Badge>
+                      </td>
+                      <td>
+                        <ActionIcon color="red" onClick={() => handleRemoveItem(idx)}>
+                          <IconTrash size={16} />
+                        </ActionIcon>
+                      </td>
+                    </tr>
+                  ))}
+                </tbody>
+              </Table>
+            </Paper>
+          )}
+
+          {/* Tombol Aksi */}
+          <Group justify="right">
+            <Button variant="outline" color="gray" radius="md" onClick={handleReset}>
               Batal
             </Button>
-
-            {/* Tombol Simpan */}
             <Button
               onClick={handleSubmit}
               radius="md"
-              size="md"
+              disabled={apbdesState.edit.form.items.length === 0 || apbdesState.edit.loading}
               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'}
+              {isSubmitting ? <Loader size="sm" color="white" /> : 'Simpan Perubahan'}
             </Button>
           </Group>
         </Stack>

src/app/admin/(dashboard)/landing-page/apbdes/[id]/page.tsx

@@ -1,36 +1,53 @@
-'use client'
+/* eslint-disable react-hooks/exhaustive-deps */
+'use client';
 import { useProxy } from 'valtio/utils';
 
-import { Box, Button, Group, Image, Paper, Skeleton, Stack, Text } from '@mantine/core';
+import {
-import { useShallowEffect } from '@mantine/hooks';
+  Box,
+  Button,
+  Group,
+  Image,
+  Paper,
+  Skeleton,
+  Stack,
+  Table,
+  TableTbody,
+  TableTd,
+  TableTh,
+  TableThead,
+  TableTr,
+  Text
+} from '@mantine/core';
 import { IconArrowBack, IconEdit, IconFile, IconTrash } from '@tabler/icons-react';
 import { useParams, useRouter } from 'next/navigation';
-import { useState } from 'react';
+import { useEffect, useState } from 'react';
 
 import colors from '@/con/colors';
 import { ModalKonfirmasiHapus } from '../../../_com/modalKonfirmasiHapus';
 import apbdes from '../../../_state/landing-page/apbdes';
 
+
+
 function DetailAPBDes() {
-  const apbdesState = useProxy(apbdes)
+  const apbdesState = useProxy(apbdes);
-  const [modalHapus, setModalHapus] = useState(false)
+  const [modalHapus, setModalHapus] = useState(false);
-  const [selectedId, setSelectedId] = useState<string | null>(null)
+  const [selectedId, setSelectedId] = useState<string | null>(null);
-  const params = useParams()
+  const params = useParams();
-  const router = useRouter()
+  const router = useRouter();
-
-  useShallowEffect(() => {
-    apbdesState.findUnique.load(params?.id as string)
-  }, [])
 
+  useEffect(() => {
+    if (!params?.id) return;
+    apbdesState.findUnique.load(params.id as string);
+  }, [params?.id]);
 
   const handleHapus = () => {
     if (selectedId) {
-      apbdesState.delete.byId(selectedId)
+      apbdesState.delete.byId(selectedId);
-      setModalHapus(false)
+      setModalHapus(false);
-      setSelectedId(null)
+      setSelectedId(null);
-      router.push("/admin/landing-page/APBDes")
+      router.push('/admin/landing-page/APBDes');
-    }
     }
+  };
 
   if (!apbdesState.findUnique.data) {
     return (
@@ -42,6 +59,11 @@ function DetailAPBDes() {
 
   const data = apbdesState.findUnique.data;
 
+  // Helper: indentasi berdasarkan level
+  const getIndent = (level: number) => ({
+    paddingLeft: `${(level - 1) * 20}px`,
+  });
+
   return (
     <Box py={10}>
       <Button
@@ -55,7 +77,7 @@ function DetailAPBDes() {
 
       <Paper
         withBorder
-        w={{ base: "100%", md: "60%" }}
+        w={{ base: '100%', md: '100%' }}
         bg={colors['white-1']}
         p="lg"
         radius="md"
@@ -66,16 +88,21 @@ function DetailAPBDes() {
             Detail APBDes
           </Text>
 
+          {/* Info Header */}
           <Paper bg="#ECEEF8" p="md" radius="md" shadow="xs">
             <Stack gap="md">
               <Box>
                 <Text fz="lg" fw="bold">Nama APBDes</Text>
-                <Text fz="md" c="dimmed">{data.name || '-'}</Text>
+                <Text fz="md" c="dimmed">
+                  {data.name || '-'}
+                </Text>
               </Box>
 
               <Box>
-                <Text fz="lg" fw="bold">Jumlah Anggaran</Text>
+                <Text fz="lg" fw="bold">Tahun</Text>
-                <Text fz="md" c="dimmed">Rp. {data.jumlah || '-'}</Text>
+                <Text fz="md" c="dimmed">
+                  {data.tahun || '-'}
+                </Text>
               </Box>
 
               <Box>
@@ -143,6 +170,54 @@ function DetailAPBDes() {
               </Group>
             </Stack>
           </Paper>
+
+          {/* Tabel Items */}
+          {data.items && data.items.length > 0 ? (
+            <Paper withBorder p="md" radius="md">
+              <Text fz="lg" fw="bold" mb="sm">
+                Rincian Pendapatan & Belanja ({data.items.length} item)
+              </Text>
+              <Box style={{ overflowX: 'auto' }}>
+                <Table striped highlightOnHover>
+                  <TableThead>
+                    <TableTr>
+                      <TableTh>Uraian</TableTh>
+                      <TableTh>Anggaran (Rp)</TableTh>
+                      <TableTh>Realisasi (Rp)</TableTh>
+                      <TableTh>Selisih (Rp)</TableTh>
+                      <TableTh>Persentase (%)</TableTh>
+                    </TableTr>
+                  </TableThead>
+                  <TableTbody>
+                    {[...data.items] // Create a new array before sorting
+                      .sort((a, b) => a.kode.localeCompare(b.kode))
+                      .map((item) => (
+                        <TableTr key={item.id}>
+                          <TableTd style={getIndent(item.level)}>
+                            <Group>
+                              <Text fw={item.level === 1 ? 'bold' : 'normal'}>{item.kode}</Text>
+                              <Text fz="sm" c="dimmed">{item.uraian}</Text>
+                            </Group>
+                          </TableTd>
+                          <TableTd>{item.anggaran.toLocaleString('id-ID')}</TableTd>
+                          <TableTd>{item.realisasi.toLocaleString('id-ID')}</TableTd>
+                          <TableTd>
+                            <Text c={item.selisih >= 0 ? 'green' : 'red'}>
+                              {item.selisih.toLocaleString('id-ID')}
+                            </Text>
+                          </TableTd>
+                          <TableTd>
+                            <Text fw={500}>{item.persentase.toFixed(2)}%</Text>
+                          </TableTd>
+                        </TableTr>
+                      ))}
+                  </TableTbody>
+                </Table>
+              </Box>
+            </Paper>
+          ) : (
+            <Text>Belum ada data item</Text>
+          )}
         </Stack>
       </Paper>
 

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

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable react-hooks/exhaustive-deps */
 'use client';
 import colors from '@/con/colors';
@@ -13,46 +14,76 @@ import {
   TextInput,
   Title,
   Loader,
-  ActionIcon
+  ActionIcon,
+  NumberInput,
+  Select,
+  Table,
+  Badge,
 } from '@mantine/core';
 import { Dropzone } from '@mantine/dropzone';
-import { IconArrowBack, IconFile, IconPhoto, IconUpload, IconX } from '@tabler/icons-react';
+import { IconArrowBack, IconFile, IconPhoto, IconUpload, IconX, IconPlus, IconTrash } from '@tabler/icons-react';
 import { useRouter } from 'next/navigation';
 import { useEffect, useState } from 'react';
 import { toast } from 'react-toastify';
 import { useProxy } from 'valtio/utils';
 import apbdes from '../../../_state/landing-page/apbdes';
 
+// Tipe item untuk form
+type ItemForm = {
+  kode: string;
+  uraian: string;
+  anggaran: number;
+  realisasi: number;
+  level: number;
+  tipe: 'pendapatan' | 'belanja' | 'pembiayaan';
+};
 
 function CreateAPBDes() {
   const router = useRouter();
-  const stateAPBDes = useProxy(apbdes)
+  const stateAPBDes = useProxy(apbdes);
   const [previewImage, setPreviewImage] = useState<string | null>(null);
   const [previewDoc, setPreviewDoc] = useState<string | null>(null);
   const [imageFile, setImageFile] = useState<File | null>(null);
   const [docFile, setDocFile] = useState<File | null>(null);
   const [isSubmitting, setIsSubmitting] = useState(false);
 
+  // Form sementara untuk input item baru
+  const [newItem, setNewItem] = useState<ItemForm>({
+    kode: '',
+    uraian: '',
+    anggaran: 0,
+    realisasi: 0,
+    level: 1,
+    tipe: 'pendapatan',
+  });
 
   useEffect(() => {
     stateAPBDes.findMany.load();
   }, []);
 
   const resetForm = () => {
-    stateAPBDes.create.form = {
+    stateAPBDes.create.reset();
-      name: "",
-      jumlah: "",
-      imageId: "",
-      fileId: "",
-    };
     setImageFile(null);
     setDocFile(null);
     setPreviewImage(null);
+    setPreviewDoc(null);
+    setNewItem({
+      kode: '',
+      uraian: '',
+      anggaran: 0,
+      realisasi: 0,
+      level: 1,
+      tipe: 'pendapatan',
+    });
   };
+
   const handleSubmit = async () => {
     if (!imageFile || !docFile) {
       return toast.warn("Pilih gambar dan dokumen terlebih dahulu");
     }
+    if (stateAPBDes.create.form.items.length === 0) {
+      return toast.warn("Minimal tambahkan 1 item APBDes");
+    }
 
     try {
       setIsSubmitting(true);
@@ -68,6 +99,7 @@ function CreateAPBDes() {
         return toast.error("Gagal mengupload file");
       }
 
+      // Update form dengan ID file
       stateAPBDes.create.form.imageId = imageId;
       stateAPBDes.create.form.fileId = fileId;
 
@@ -84,6 +116,43 @@ function CreateAPBDes() {
     }
   };
 
+  // Tambahkan item ke state
+  const handleAddItem = () => {
+    const { kode, uraian, anggaran, realisasi, level, tipe } = newItem;
+    if (!kode || !uraian) {
+      return toast.warn("Kode dan uraian wajib diisi");
+    }
+
+    const selisih = realisasi - anggaran;
+    const persentase = anggaran > 0 ? (realisasi / anggaran) * 100 : 0;
+
+    stateAPBDes.create.addItem({
+      kode,
+      uraian,
+      anggaran,
+      realisasi,
+      selisih,
+      persentase,
+      level,
+      tipe,
+    });
+
+    // Reset form input
+    setNewItem({
+      kode: '',
+      uraian: '',
+      anggaran: 0,
+      realisasi: 0,
+      level: 1,
+      tipe: 'pendapatan',
+    });
+  };
+
+  // Hapus item
+  const handleRemoveItem = (index: number) => {
+    stateAPBDes.create.removeItem(index);
+  };
+
   return (
     <Box px={{ base: 'sm', md: 'lg' }} py="md">
       <Group mb="md">
@@ -104,10 +173,12 @@ function CreateAPBDes() {
         style={{ border: '1px solid #e0e0e0' }}
       >
         <Stack gap="md">
+          {/* Gambar & Dokumen (dipendekkan untuk fokus pada items) */}
+          <Stack gap={"xs"}>
             {/* Gambar APBDes */}
             <Box>
               <Text fw="bold" fz="sm" mb={6}>
-              Gambar Program Inovasi
+                Gambar APBDes
               </Text>
               <Dropzone
                 onDrop={(files) => {
@@ -125,26 +196,21 @@ function CreateAPBDes() {
               >
                 <Group justify="center" gap="xl" mih={180}>
                   <Dropzone.Accept>
-                  <IconUpload size={48} color={colors['blue-button']} stroke={1.5} />
+                    <IconUpload size={48} color="var(--mantine-color-blue-6)" stroke={1.5} />
                   </Dropzone.Accept>
                   <Dropzone.Reject>
-                  <IconX size={48} color="red" stroke={1.5} />
+                    <IconX size={48} color="var(--mantine-color-red-6)" 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
+                      Seret gambar atau klik untuk memilih
-                  </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
@@ -195,7 +261,7 @@ function CreateAPBDes() {
                     setPreviewDoc(URL.createObjectURL(selectedFile));
                   }
                 }}
-              onReject={() => toast.error('File tidak valid, gunakan format PDF, DOC, atau DOCX')}
+                onReject={() => toast.error('File tidak valid')}
                 maxSize={5 * 1024 ** 2}
                 accept={{
                   'application/pdf': ['.pdf'],
@@ -213,19 +279,15 @@ function CreateAPBDes() {
                     <IconX size={48} color="var(--mantine-color-red-6)" stroke={1.5} />
                   </Dropzone.Reject>
                   <Dropzone.Idle>
-                  <IconFile size={48} color="var(--mantine-color-dimmed)" stroke={1.5} />
+                    <IconFile size={48} color="#868e96" stroke={1.5} />
                   </Dropzone.Idle>
-                <Box>
+                  <Stack gap="xs" align="center">
-                  <Text size="xl" inline>
+                    <Text size="md" fw={500}>
-                    Seret dokumen atau klik untuk memilih file
+                      Seret dokumen atau klik untuk memilih
                     </Text>
-                  <Text size="sm" c="dimmed" inline display="block" mt={7}>
+                  </Stack>
-                    Maksimal 5MB (format: PDF, DOC, DOCX)
-                  </Text>
-                </Box>
                 </Group>
               </Dropzone>
-
               {previewDoc && (
                 <Box mt="md" pos="relative" style={{ textAlign: 'center' }}>
                   <Text fw="bold" fz="sm" mb={6}>
@@ -259,44 +321,140 @@ function CreateAPBDes() {
                 </Box>
               )}
             </Box>
+          </Stack>
 
-          {/* Form Input */}
+          {/* Form Header */}
-          <TextInput
+          <NumberInput
-            label="Nama APBDes"
+            label="Tahun"
-            placeholder="Masukkan nama APBDes"
+            value={stateAPBDes.create.form.tahun || new Date().getFullYear()}
-            value={stateAPBDes.create.form.name || ''}
+            onChange={(val) => (stateAPBDes.create.form.tahun = Number(val) || new Date().getFullYear())}
-            onChange={(e) => (stateAPBDes.create.form.name = e.target.value)}
+            min={2000}
-            required
+            max={2100}
-          />
-          <TextInput
-            label="Jumlah Anggaran"
-            placeholder="14 M / 1 T / 200 JT / 900 RB"
-            value={stateAPBDes.create.form.jumlah || ''}
-            onChange={(e) => (stateAPBDes.create.form.jumlah = e.target.value)}
             required
           />
 
-          <Group justify="right">
+          {/* Input Item Baru */}
-            {/* Tombol Batal */}
+          <Paper withBorder p="md" radius="md">
+            <Title order={6} mb="sm">Tambah Item Pendapatan/Belanja</Title>
+            <Stack gap="xs">
+              <Group grow>
+                <TextInput
+                  label="Kode"
+                  placeholder="Contoh: 4.1.2"
+                  value={newItem.kode}
+                  onChange={(e) => setNewItem({ ...newItem, kode: e.target.value })}
+                  required
+                />
+                <Select
+                  label="Level"
+                  data={[
+                    { value: '1', label: 'Level 1 (Kelompok)' },
+                    { value: '2', label: 'Level 2 (Sub-kelompok)' },
+                    { value: '3', label: 'Level 3 (Detail)' },
+                  ]}
+                  value={String(newItem.level)}
+                  onChange={(val) => setNewItem({ ...newItem, level: Number(val) || 1 })}
+                />
+                <Select
+                  label="Tipe"
+                  data={[
+                    { value: 'pendapatan', label: 'Pendapatan' },
+                    { value: 'belanja', label: 'Belanja' },
+                  ]}
+                  value={newItem.tipe}
+                  onChange={(val) => setNewItem({ ...newItem, tipe: val as any })}
+                />
+              </Group>
+              <TextInput
+                label="Uraian"
+                placeholder="Contoh: Dana Desa"
+                value={newItem.uraian}
+                onChange={(e) => setNewItem({ ...newItem, uraian: e.target.value })}
+                required
+              />
+              <Group grow>
+                <NumberInput
+                  label="Anggaran (Rp)"
+                  value={newItem.anggaran}
+                  onChange={(val) => setNewItem({ ...newItem, anggaran: Number(val) || 0 })}
+                  thousandSeparator
+                  min={0}
+                />
+                <NumberInput
+                  label="Realisasi (Rp)"
+                  value={newItem.realisasi}
+                  onChange={(val) => setNewItem({ ...newItem, realisasi: Number(val) || 0 })}
+                  thousandSeparator
+                  min={0}
+                />
+              </Group>
               <Button
-              variant="outline"
+                leftSection={<IconPlus size={16} />}
-              color="gray"
+                onClick={handleAddItem}
-              radius="md"
+                disabled={!newItem.kode || !newItem.uraian}
-              size="md"
-              onClick={resetForm}
               >
+                Tambah Item
+              </Button>
+            </Stack>
+          </Paper>
+
+          {/* Tabel Items */}
+          {stateAPBDes.create.form.items.length > 0 && (
+            <Paper withBorder p="md" radius="md">
+              <Title order={6} mb="sm">Daftar Item ({stateAPBDes.create.form.items.length})</Title>
+              <Table striped highlightOnHover>
+                <thead>
+                  <tr>
+                    <th>Kode</th>
+                    <th>Uraian</th>
+                    <th>Anggaran</th>
+                    <th>Realisasi</th>
+                    <th>Level</th>
+                    <th>Tipe</th>
+                    <th style={{ width: 50 }}>Aksi</th>
+                  </tr>
+                </thead>
+                <tbody>
+                  {stateAPBDes.create.form.items.map((item, idx) => (
+                    <tr key={idx}>
+                      <td><Text size="sm" fw={500}>{item.kode}</Text></td>
+                      <td>{item.uraian}</td>
+                      <td>{item.anggaran.toLocaleString('id-ID')}</td>
+                      <td>{item.realisasi.toLocaleString('id-ID')}</td>
+                      <td>
+                        <Badge size="sm" color={item.level === 1 ? 'blue' : item.level === 2 ? 'green' : 'grape'}>
+                          L{item.level}
+                        </Badge>
+                      </td>
+                      <td>
+                        <Badge size="sm" color={item.tipe === 'pendapatan' ? 'teal' : 'red'}>
+                          {item.tipe}
+                        </Badge>
+                      </td>
+                      <td>
+                        <ActionIcon color="red" onClick={() => handleRemoveItem(idx)}>
+                          <IconTrash size={16} />
+                        </ActionIcon>
+                      </td>
+                    </tr>
+                  ))}
+                </tbody>
+              </Table>
+            </Paper>
+          )}
+
+          {/* Tombol Aksi */}
+          <Group justify="right">
+            <Button variant="outline" color="gray" radius="md" onClick={resetForm}>
               Reset
             </Button>
-
-            {/* Tombol Simpan */}
             <Button
               onClick={handleSubmit}
               radius="md"
-              size="md"
+              disabled={stateAPBDes.create.form.items.length === 0}
               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'}

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

@@ -1,6 +1,23 @@
-'use client'
+'use client';
 import colors from '@/con/colors';
-import { Box, Button, Center, Group, Pagination, Paper, Skeleton, Stack, Table, TableTbody, TableTd, TableTh, TableThead, TableTr, Text, Title } from '@mantine/core';
+import {
+  Box,
+  Button,
+  Center,
+  Group,
+  Pagination,
+  Paper,
+  Skeleton,
+  Stack,
+  Table,
+  TableTbody,
+  TableTd,
+  TableTh,
+  TableThead,
+  TableTr,
+  Text,
+  Title,
+} from '@mantine/core';
 import { useShallowEffect } from '@mantine/hooks';
 import { IconDeviceImacCog, IconFile, IconPlus, IconSearch } from '@tabler/icons-react';
 import { useRouter } from 'next/navigation';
@@ -9,14 +26,13 @@ import { useProxy } from 'valtio/utils';
 import HeaderSearch from '../../_com/header';
 import apbdes from '../../_state/landing-page/apbdes';
 
-
 function APBDes() {
   const [search, setSearch] = useState('');
   return (
     <Box>
       <HeaderSearch
-        title='APBDes'
+        title="APBDes"
-        placeholder='Cari APBDes...'
+        placeholder="Cari APBDes..."
         searchIcon={<IconSearch size={20} />}
         value={search}
         onChange={(e) => setSearch(e.currentTarget.value)}
@@ -27,22 +43,16 @@ function APBDes() {
 }
 
 function ListAPBDes({ search }: { search: string }) {
-  const listState = useProxy(apbdes)
+  const listState = useProxy(apbdes);
   const router = useRouter();
 
-  const {
+  const { data, page, totalPages, loading, load } = listState.findMany;
-    data,
-    page,
-    totalPages,
-    loading,
-    load,
-  } = listState.findMany
 
   useShallowEffect(() => {
-    load(page, 10, search)
+    load(page, 10, search);
-  }, [page, search])
+  }, [page, search]);
 
-  const filteredData = data || []
+  const filteredData = data || [];
 
   if (loading || !data) {
     return (
@@ -71,8 +81,8 @@ function ListAPBDes({ search }: { search: string }) {
           <Table highlightOnHover>
             <TableThead>
               <TableTr>
-                <TableTh style={{ width: '30%'}}>Nama APBDes</TableTh>
+                <TableTh style={{ width: '25%' }}>APBDes</TableTh>
-                <TableTh style={{ width: '30%' }}>Jumlah</TableTh>
+                <TableTh style={{ width: '25%' }}>Tahun</TableTh>
                 <TableTh style={{ width: '25%' }}>Dokumen</TableTh>
                 <TableTh style={{ width: '25%' }}>Aksi</TableTh>
               </TableTr>
@@ -81,16 +91,15 @@ function ListAPBDes({ search }: { search: string }) {
               {filteredData.length > 0 ? (
                 filteredData.map((item) => (
                   <TableTr key={item.id}>
-                    <TableTd style={{ width: '30%' }}>
+                    <TableTd style={{ width: '25%' }}>
-                      <Text fw={500} truncate="end">{item.name}</Text>
+                      <Text fw={500} lineClamp={1}>
-                    </TableTd>
+                        APBDes {item.tahun}
-                    <TableTd style={{ width: '30%' }}>
+                      </Text>
-                      <Box w={150}>
+                    </TableTd>
-                        <Text>Rp. {item.jumlah}</Text>
+                    <TableTd style={{ width: '25%' }}>
-                      </Box>
+                      <Text fw={500}>{item.tahun || '-'}</Text>
                     </TableTd>
                     <TableTd style={{ width: '25%' }}>
-                      <Box w={150}>
                       {item.file?.link ? (
                         <Button
                           component="a"
@@ -98,24 +107,26 @@ function ListAPBDes({ search }: { search: string }) {
                           target="_blank"
                           rel="noopener noreferrer"
                           variant="light"
-                            leftSection={<IconFile size={18} />}
+                          leftSection={<IconFile size={16} />}
-                            size="sm"
+                          size="xs"
+                          radius="sm"
                         >
                           Lihat Dokumen
                         </Button>
                       ) : (
-                          <Text c="dimmed" fz="sm">Tidak ada dokumen</Text>
+                        <Text c="dimmed" fz="sm">
+                          Tidak ada dokumen
+                        </Text>
                       )}
-                      </Box>
                     </TableTd>
                     <TableTd style={{ width: '25%' }}>
-                     <Box w={80}>
+                      <Box w={100}>
                         <Button
                           size="xs"
                           radius="md"
                           variant="light"
                           color="blue"
-                        leftSection={<IconDeviceImacCog size={16} />}
+                          leftSection={<IconDeviceImacCog size={14} />}
                           onClick={() => router.push(`/admin/landing-page/APBDes/${item.id}`)}
                           fullWidth
                         >
@@ -127,7 +138,7 @@ function ListAPBDes({ search }: { search: string }) {
                 ))
               ) : (
                 <TableTr>
-                  <TableTd colSpan={4}>
+                  <TableTd colSpan={5}>
                     <Center py={20}>
                       <Text color="dimmed">Tidak ada data APBDes yang cocok</Text>
                     </Center>
@@ -152,7 +163,7 @@ function ListAPBDes({ search }: { search: string }) {
         />
       </Center>
     </Box>
-  )
+  );
 }
 
 export default APBDes;

src/app/api/[[...slugs]]/_lib/landing_page/apbdes/create.ts

@@ -1,36 +1,137 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 import prisma from "@/lib/prisma";
 import { Context } from "elysia";
+import { assignParentIdsToApbdesItems } from "./lib/getParentsID";
+
+
+type APBDesItemInput = {
+  kode: string;
+  uraian: string;
+  anggaran: number;
+  realisasi: number;
+  selisih: number;
+  persentase: number;
+  level: number;
+  tipe: string;
+};
 
 type FormCreate = {
-  name: string;
+  tahun: number;
-  jumlah: string;
   imageId: string;
   fileId: string;
+  items: APBDesItemInput[];
 };
 
 export default async function apbdesCreate(context: Context) {
   const body = context.body as FormCreate;
   
+  // Log the incoming request for debugging
+  console.log('Incoming request body:', JSON.stringify(body, null, 2));
+
   try {
-    const result = await prisma.aPBDes.create({
+    // Validate required fields
+    if (!body.tahun) {
+      throw new Error('Tahun is required');
+    }
+    if (!body.imageId) {
+      throw new Error('Image ID is required');
+    }
+    if (!body.fileId) {
+      throw new Error('File ID is required');
+    }
+    if (!body.items || body.items.length === 0) {
+      throw new Error('At least one item is required');
+    }
+
+    // 1. Buat APBDes + items (tanpa parentId dulu)
+    const created = await prisma.$transaction(async (prisma) => {
+      const apbdes = await prisma.aPBDes.create({
         data: {
-        name: body.name,
+          tahun: body.tahun,
-        jumlah: body.jumlah,
+          name: `APBDes Tahun ${body.tahun}`,
           imageId: body.imageId,
           fileId: body.fileId,
         },
+      });
+
+      // Create items in a batch
+      const items = await Promise.all(
+        body.items.map(item => {
+          // Create a new object with only the fields that exist in the APBDesItem model
+          const itemData = {
+            kode: item.kode,
+            uraian: item.uraian,
+            anggaran: item.anggaran,
+            realisasi: item.realisasi,
+            selisih: item.selisih,
+            persentase: item.persentase,
+            level: item.level,
+            apbdesId: apbdes.id,
+            // Note: tipe field is not included as it doesn't exist in the model
+          };
+          
+          return prisma.aPBDesItem.create({
+            data: itemData,
+            select: { id: true, kode: true },
+          });
+        })
+      );
+
+      return { ...apbdes, items };
+    });
+
+    try {
+      // 2. Isi parentId berdasarkan kode
+      await assignParentIdsToApbdesItems(created.items);
+
+      // 3. Ambil ulang data lengkap untuk response
+      const result = await prisma.aPBDes.findUnique({
+        where: { id: created.id },
         include: {
           image: true,
           file: true,
+          items: {
+            orderBy: { kode: 'asc' },
+          },
         },
       });
+
+      console.log('APBDes created successfully:', JSON.stringify(result, null, 2));
+      
       return {
         success: true,
-      message: "Berhasil membuat APB Des",
+        message: "Berhasil membuat APBDes",
         data: result,
       };
-  } catch (error) {
+    } catch (innerError) {
-    console.error("Error creating APB Des:", error);
+      console.error('Error in post-creation steps:', innerError);
-    throw new Error("Gagal membuat APB Des: " + (error as Error).message);
+      // Even if post-creation steps fail, we still return success since the main record was created
+      return {
+        success: true,
+        message: "APBDes berhasil dibuat, tetapi ada masalah dengan pemrosesan tambahan",
+        data: created,
+        warning: process.env.NODE_ENV === 'development' ? String(innerError) : undefined,
+      };
+    }
+  } catch (error: any) {
+    console.error("Error creating APBDes:", error);
+    
+    // Log the full error for debugging
+    if (error.code) console.error('Prisma error code:', error.code);
+    if (error.meta) console.error('Prisma error meta:', error.meta);
+    
+    const errorMessage = error.message || 'Unknown error';
+    
+    context.set.status = 500;
+    return {
+      success: false,
+      message: `Gagal membuat APBDes: ${errorMessage}`,
+      error: process.env.NODE_ENV === 'development' ? {
+        message: error.message,
+        code: error.code,
+        meta: error.meta,
+        stack: error.stack
+      } : undefined
+    };
   }
 }

src/app/api/[[...slugs]]/_lib/landing_page/apbdes/del.ts

@@ -2,20 +2,59 @@ import prisma from "@/lib/prisma";
 import { Context } from "elysia";
 
 export default async function apbdesDelete(context: Context) {
-  const { params } = context;
+  const { id } = context.params as { id: string };
-  const id = params?.id as string;
 
   if (!id) {
-    throw new Error("ID tidak ditemukan dalam parameter");
+    context.set.status = 400;
+    return {
+      success: false,
+      message: "ID APBDes diperlukan",
+    };
   }
 
-  const deleted = await prisma.aPBDes.delete({
+  try {
+    // Cek apakah ada
+    const existing = await prisma.aPBDes.findUnique({
       where: { id },
     });
 
+    if (!existing) {
+      context.set.status = 404;
+      return {
+        success: false,
+        message: "APBDes tidak ditemukan",
+      };
+    }
+
+    // Soft delete: set isActive = false & isi deletedAt
+    const result = await prisma.aPBDes.update({
+      where: { id },
+      data: {
+        isActive: false,
+        deletedAt: new Date(),
+      },
+    });
+
+    // Opsional: juga soft delete semua item terkait
+    await prisma.aPBDesItem.updateMany({
+      where: { apbdesId: id },
+      data: { 
+        isActive: false, 
+        deletedAt: new Date() 
+      },
+    });
+
     return {
       success: true,
-    message: "Berhasil menghapus APB Des",
+      message: "APBDes berhasil dihapus",
-    data: deleted,
+data: result,
     };
+  } catch (error) {
+    console.error("Error deleting APBDes:", error);
+    context.set.status = 500;
+    return {
+      success: false,
+      message: "Gagal menghapus APBDes",
+    };
+  }
 }

src/app/api/[[...slugs]]/_lib/landing_page/apbdes/findMany.ts

@@ -1,56 +1,57 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-// /api/berita/findManyPaginated.ts
+// src/app/api/.../apbdes/findMany.ts
 import prisma from "@/lib/prisma";
 import { Context } from "elysia";
 
-async function apbdesFindMany(context: Context) {
+export default async function apbdesFindMany(context: Context) {
-  const page = Number(context.query.page) || 1;
+  const { page = "1", limit = "10", tahun } = context.query as {
-  const limit = Number(context.query.limit) || 10;
+    page?: string;
-  const search = (context.query.search as string) || '';
+    limit?: string;
-  const skip = (page - 1) * limit;
+    tahun?: string;
+  };
 
-  // Buat where clause
+  const pageNumber = Math.max(1, parseInt(page, 10) || 1);
-  const where: any = { isActive: true };
+  const limitNumber = Math.min(100, Math.max(1, parseInt(limit, 10) || 10));
 
-  // Tambahkan pencarian (jika ada)
+  const skip = (pageNumber - 1) * limitNumber;
-  if (search) {
-    where.OR = [
-      { name: { contains: search, mode: 'insensitive' } },
-    ];
-  }
 
   try {
+    const where: any = { isActive: true };
+    if (tahun) {
+      where.tahun = parseInt(tahun, 10);
+    }
+
     const [data, total] = await Promise.all([
       prisma.aPBDes.findMany({
         where,
+        skip,
+        take: limitNumber,
+        orderBy: { createdAt: "desc" },
         include: {
           image: true,
           file: true,
+          items: true,
         },
-        skip,
-        take: limit,
-        orderBy: { name: "asc" }, // opsional, kalau mau urut berdasarkan waktu
-      }),
-      prisma.aPBDes.count({
-        where,
       }),
+      prisma.aPBDes.count({ where }),
     ]);
 
     return {
       success: true,
-      message: "Success fetch APB Des with pagination",
       data,
-      page,
+      meta: {
-      totalPages: Math.ceil(total / limit),
+        page: pageNumber,
+        limit: limitNumber,
         total,
+        totalPages: Math.ceil(total / limitNumber),
+      },
     };
-  } catch (e) {
+  } catch (error) {
-    console.error("Find many paginated error:", e);
+    console.error("Error fetching APBDes list:", error);
+    context.set.status = 500;
     return {
       success: false,
-      message: "Failed fetch APB Des with pagination",
+      message: "Gagal mengambil daftar APBDes",
     };
   }
 }
-
-export default apbdesFindMany;

src/app/api/[[...slugs]]/_lib/landing_page/apbdes/findUnique.ts

@@ -2,28 +2,78 @@ import prisma from "@/lib/prisma";
 import { Context } from "elysia";
 
 export default async function apbdesFindUnique(context: Context) {
-  const { params } = context;
+  // ✅ Parse URL secara manual
-  const id = params?.id as string;
+  const url = new URL(context.request.url);
+  const pathSegments = url.pathname.split('/').filter(Boolean);
   
-  if (!id) {
+  console.log("🔍 DEBUG INFO:");
-    throw new Error("ID tidak ditemukan dalam parameter");
+  console.log("- Full URL:", context.request.url);
+  console.log("- Pathname:", url.pathname);
+  console.log("- Path segments:", pathSegments);
+  
+  // Expected: ['api', 'landingpage', 'apbdes', 'ID']
+  if (pathSegments.length < 4) {
+    context.set.status = 400;
+    return {
+      success: false,
+      message: "Route tidak valid. Format: /api/landingpage/apbdes/:id",
+      debug: { pathSegments }
+    };
   }
   
-  const data = await prisma.aPBDes.findUnique({
+  if (pathSegments[0] !== 'api' || 
+      pathSegments[1] !== 'landingpage' || 
+      pathSegments[2] !== 'apbdes') {
+    context.set.status = 400;
+    return {
+      success: false,
+      message: "Route tidak valid",
+      debug: { pathSegments }
+    };
+  }
+  
+  const id = pathSegments[3]; // ✅ ID ada di index ke-3
+  
+  if (!id || id.trim() === '') {
+    context.set.status = 400;
+    return {
+      success: false,
+      message: "ID APBDes diperlukan",
+    };
+  }
+
+  try {
+    const result = await prisma.aPBDes.findUnique({
       where: { id },
       include: {
-      image: true,
+        items: {
-      file: true,
+          where: { isActive: true },
+          orderBy: { kode: 'asc' }
         },
+        image: true,
+        file: true
+      }
     });
 
-  if (!data) {
+    if (!result || !result.isActive) {
-    throw new Error("APB Des tidak ditemukan");
+      context.set.status = 404;
+      return {
+        success: false,
+        message: "Data APBDes tidak ditemukan atau tidak aktif",
+      };
     }
 
     return {
       success: true,
-    message: "Data APB Des ditemukan",
+      data: result,
-    data,
     };
+  } catch (error) {
+    console.error("❌ Error in apbdesFindUnique:", error);
+    context.set.status = 500;
+    return {
+      success: false,
+      message: "Terjadi kesalahan saat mengambil data APBDes",
+      error: process.env.NODE_ENV === 'development' ? String(error) : undefined
+    };
+  }
 }

src/app/api/[[...slugs]]/_lib/landing_page/apbdes/index.ts

@@ -1,3 +1,4 @@
+// src/app/api/[[...slugs]]/_lib/landing_page/apbdes/index.ts
 import Elysia, { t } from "elysia";
 import apbdesCreate from "./create";
 import apbdesDelete from "./del";
@@ -5,12 +6,24 @@ import apbdesFindMany from "./findMany";
 import apbdesFindUnique from "./findUnique";
 import apbdesUpdate from "./updt";
 
+// Definisikan skema untuk item APBDes
+const ApbdesItemSchema = t.Object({
+  kode: t.String(),
+  uraian: t.String(),
+  anggaran: t.Number(),
+  realisasi: t.Number(),
+  selisih: t.Number(),
+  persentase: t.Number(),
+  level: t.Number(),
+  tipe: t.String(), // misal: "pendapatan" atau "belanja"
+});
+
 const APBDes = new Elysia({
   prefix: "/apbdes",
   tags: ["Landing Page/Profile/APB Des"],
 })
 
-  // ✅ Find all
+  // ✅ Find all (dengan query opsional: page, limit, tahun)
   .get("/findMany", apbdesFindMany)
 
   // ✅ Find by ID
@@ -19,23 +32,27 @@ const APBDes = new Elysia({
   // ✅ Create
   .post("/create", apbdesCreate, {
     body: t.Object({
-      name: t.String(),
+      tahun: t.Number(),
       imageId: t.String(),
       fileId: t.String(),
-      jumlah: t.String(),
+      items: t.Array(ApbdesItemSchema),
     }),
   })
 
   // ✅ Update
   .put("/:id", apbdesUpdate, {
+    params: t.Object({ id: t.String() }),
     body: t.Object({
-      name: t.String(),
+      tahun: t.Number(),
-      imageId: t.Optional(t.String()),
+      imageId: t.String(),
-      fileId: t.Optional(t.String()),
+      fileId: t.String(),
-      jumlah: t.Optional(t.String()),
+      items: t.Array(ApbdesItemSchema),
     }),
   })
+
   // ✅ Delete
-  .delete("/del/:id", apbdesDelete);
+  .delete("/del/:id", apbdesDelete, {
+    params: t.Object({ id: t.String() }),
+  });
 
 export default APBDes;

src/app/api/[[...slugs]]/_lib/landing_page/apbdes/lib/getParentsID.tsx

@@ -0,0 +1,54 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import prisma from "@/lib/prisma";
+
+/**
+ * Helper untuk mengisi parentId pada item APBDes berdasarkan struktur kode.
+ * Harus dipanggil setelah semua item berhasil dibuat (dengan id yang valid).
+ *
+ * @param items - Array item yang sudah punya { id, kode }
+ */
+export async function assignParentIdsToApbdesItems(
+  items: { id: string; kode: string }[]
+): Promise<void> {
+  // Buat lookup berdasarkan kode → id
+  const kodeToId = new Map<string, string>();
+  for (const item of items) {
+    kodeToId.set(item.kode, item.id);
+  }
+
+  // Siapkan batch update
+  const updates: Promise<any>[] = [];
+
+  for (const item of items) {
+    const { id, kode } = item;
+
+    // Skip jika kode tidak memiliki parent (level 1, misal "4")
+    if (!kode.includes(".")) {
+      // Pastikan parentId null untuk akar
+      updates.push(
+        prisma.aPBDesItem.update({
+          where: { id },
+          data: { parentId: null },
+        })
+      );
+      continue;
+    }
+
+    // Ambil kode parent: "4.1.2" → "4.1"
+    const parts = kode.split(".");
+    parts.pop(); // hapus bagian terakhir
+    const parentKode = parts.join(".");
+
+    const parentID = kodeToId.get(parentKode) || null;
+
+    updates.push(
+      prisma.aPBDesItem.update({
+        where: { id },
+        data: { parentId: parentID },
+      })
+    );
+  }
+
+  // Jalankan semua update secara paralel
+  await Promise.all(updates);
+}

src/app/api/[[...slugs]]/_lib/landing_page/apbdes/updt.ts

@@ -1,51 +1,113 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
 import prisma from "@/lib/prisma";
 import { Context } from "elysia";
+import { assignParentIdsToApbdesItems } from "./lib/getParentsID";
 
-type FormUpdateAPBDes = {
+type APBDesItemInput = {
-  name?: string;
+  kode: string;
-  imageId?: string;
+  uraian: string;
-  fileId?: string;
+  anggaran: number;
-  jumlah?: string;
+  realisasi: number;
+  selisih: number;
+  persentase: number;
+  level: number;
+  tipe: string;
+};
+
+type FormUpdateBody = {
+  tahun: number;
+  imageId: string;
+  fileId: string;
+  items: APBDesItemInput[];
 };
 
 export default async function apbdesUpdate(context: Context) {
-  const body = context.body as FormUpdateAPBDes;
+  const body = context.body as FormUpdateBody;
+  const { id } = context.params as { id: string };
 
-  const id = context.params.id;
+  try {
+    // 1. Pastikan APBDes ada
+    const existing = await prisma.aPBDes.findUnique({
+      where: { id },
+    });
 
-  if (!id) {
+    if (!existing) {
+      context.set.status = 404;
       return {
         success: false,
-      message: "ID APB Des wajib diisi",
+        message: "APBDes tidak ditemukan",
       };
     }
 
-  try {
+    // 2. Hapus semua item lama
-    const updated = await prisma.aPBDes.update({
+    await prisma.aPBDesItem.deleteMany({
+      where: { apbdesId: id },
+    });
+
+    // 3. Buat item baru tanpa parentId terlebih dahulu
+    await prisma.aPBDesItem.createMany({
+      data: body.items.map((item) => ({
+        apbdesId: id,
+        kode: item.kode,
+        uraian: item.uraian,
+        anggaran: item.anggaran,
+        realisasi: item.realisasi,
+        selisih: item.anggaran - item.realisasi,
+        persentase: item.anggaran > 0 ? (item.realisasi / item.anggaran) * 100 : 0,
+        level: item.level,
+        tipe: item.tipe,
+        isActive: true,
+      })),
+    });
+
+    // 4. Dapatkan semua item yang baru dibuat untuk mendapatkan ID-nya
+    const allItems = await prisma.aPBDesItem.findMany({
+      where: { apbdesId: id },
+      select: { id: true, kode: true },
+    });
+
+    // 5. Update parentId untuk setiap item
+    // Pastikan allItems memiliki tipe yang benar
+    const itemsForParentUpdate = allItems.map(item => ({
+      id: item.id,
+      kode: item.kode,
+    }));
+    
+    await assignParentIdsToApbdesItems(itemsForParentUpdate);
+
+    // 6. Update data APBDes
+    await prisma.aPBDes.update({
       where: { id },
       data: {
-        name: body.name,
+        tahun: body.tahun,
         imageId: body.imageId,
         fileId: body.fileId,
-        jumlah: body.jumlah,
       },
+    });
+
+    // 5. Ambil data lengkap untuk response
+    const result = await prisma.aPBDes.findUnique({
+      where: { id },
       include: {
+        items: {
+          where: { isActive: true },
+          orderBy: { kode: 'asc' }
+        },
         image: true,
+        file: true,
       },
     });
 
     return {
       success: true,
-      message: "APB Des berhasil diperbarui",
+      message: "Berhasil memperbarui APBDes",
-      data: updated,
+      data: result,
     };
-  } catch (error: any) {
+  } catch (error) {
-    console.error("❌ Error update APB Des:", error);
+    console.error("Error updating APBDes:", error);
+    context.set.status = 500;
     return {
       success: false,
-      message: "Gagal memperbarui data APB Des",
+      message: "Gagal memperbarui APBDes",
-      error: error.message,
     };
   }
 }

src/app/api/[[...slugs]]/_lib/pendidikan/beasiswa-desa/beasiswa-pendaftar/create.ts

@@ -3,18 +3,17 @@ import { Context } from "elysia";
 
 type FormCreate = {
   namaLengkap: string;
-  nik: string;
+  nis: string;
+  kelas: string;
+  jenisKelamin: "LAKI_LAKI" | "PEREMPUAN";
+  alamatDomisili?: string;
   tempatLahir: string;
   tanggalLahir: string; // ISO date string
-  jenisKelamin: "LAKI_LAKI" | "PEREMPUAN";
+  namaOrtu?: string;
-  kewarganegaraan: string;
+  nik: string;
-  agama: "ISLAM" | "KRISTEN_PROTESTAN" | "KRISTEN_KATOLIK" | "HINDU" | "BUDDHA" | "KONGHUCU" | "LAINNYA";
+  pekerjaanOrtu?: string;
-  alamatKTP: string;
+  penghasilan?: string;
-  alamatDomisili?: string;
   noHp: string;
-  email: string;
-  statusPernikahan: "BELUM_MENIKAH" | "MENIKAH" | "JANDA_DUDA";
-  ukuranBaju?: "S" | "M" | "L" | "XL" | "XXL" | "LAINNYA";
 };
 
 export default async function beasiswaPendaftarCreate(context: Context) {
@@ -24,18 +23,17 @@ export default async function beasiswaPendaftarCreate(context: Context) {
     const result = await prisma.beasiswaPendaftar.create({
       data: {
         namaLengkap: body.namaLengkap,
-        nik: body.nik,
+        nis: body.nis,
+        kelas: body.kelas,
+        jenisKelamin: body.jenisKelamin,
+        alamatDomisili: body.alamatDomisili,
         tempatLahir: body.tempatLahir,
         tanggalLahir: new Date(body.tanggalLahir),
-        jenisKelamin: body.jenisKelamin,
+        namaOrtu: body.namaOrtu,
-        kewarganegaraan: body.kewarganegaraan,
+        nik: body.nik,
-        agama: body.agama,
+        pekerjaanOrtu: body.pekerjaanOrtu,
-        alamatKTP: body.alamatKTP,
+        penghasilan: body.penghasilan,
-        alamatDomisili: body.alamatDomisili,
         noHp: body.noHp,
-        email: body.email,
-        statusPernikahan: body.statusPernikahan,
-        ukuranBaju: body.ukuranBaju,
       },
     });
 

src/app/api/[[...slugs]]/_lib/pendidikan/beasiswa-desa/beasiswa-pendaftar/index.ts

@@ -13,18 +13,17 @@ const BeasiswaPendaftar = new Elysia({
   .post("/create", beasiswaPendaftarCreate, {
     body: t.Object({
       namaLengkap: t.String(),
-      nik: t.String(),
+      nis: t.String(),
+      kelas: t.String(),
+      jenisKelamin: t.String(),
+      alamatDomisili: t.String(),
       tempatLahir: t.String(),
       tanggalLahir: t.String(),
-      jenisKelamin: t.String(),
+      namaOrtu: t.String(),
-      kewarganegaraan: t.String(),
+      nik: t.String(),
-      agama: t.String(),
+      pekerjaanOrtu: t.String(),
-      alamatKTP: t.String(),
+      penghasilan: t.String(),
-      alamatDomisili: t.String(),
       noHp: t.String(),
-      email: t.String(),
-      statusPernikahan: t.String(),
-      ukuranBaju: t.String(),
     }),
   })
   .get("/findMany", beasiswaPendaftarFindMany)
@@ -43,18 +42,17 @@ const BeasiswaPendaftar = new Elysia({
     {
       body: t.Object({
         namaLengkap: t.String(),
-        nik: t.String(),
+        nis: t.String(),
+        kelas: t.String(),
+        jenisKelamin: t.String(),
+        alamatDomisili: t.String(),
         tempatLahir: t.String(),
         tanggalLahir: t.String(),
-        jenisKelamin: t.String(),
+        namaOrtu: t.String(),
-        kewarganegaraan: t.String(),
+        nik: t.String(),
-        agama: t.String(),
+        pekerjaanOrtu: t.String(),
-        alamatKTP: t.String(),
+        penghasilan: t.String(),
-        alamatDomisili: t.String(),
         noHp: t.String(),
-        email: t.String(),
-        statusPernikahan: t.String(),
-        ukuranBaju: t.String(),
       }),
     }
   )

src/app/api/[[...slugs]]/_lib/pendidikan/beasiswa-desa/beasiswa-pendaftar/updt.ts

@@ -3,25 +3,17 @@ import { Context } from "elysia";
 
 type FormUpdate = {
   namaLengkap: string;
-  nik: string;
+  nis: string;
+  kelas: string;
+  jenisKelamin: "LAKI_LAKI" | "PEREMPUAN";
+  alamatDomisili?: string;
   tempatLahir: string;
   tanggalLahir: string; // ISO date string
-  jenisKelamin: "LAKI_LAKI" | "PEREMPUAN";
+  namaOrtu?: string;
-  kewarganegaraan: string;
+  nik: string;
-  agama:
+  pekerjaanOrtu?: string;
-    | "ISLAM"
+  penghasilan?: string;
-    | "KRISTEN_PROTESTAN"
-    | "KRISTEN_KATOLIK"
-    | "HINDU"
-    | "BUDDHA"
-    | "KONGHUCU"
-    | "LAINNYA";
-  alamatKTP: string;
-  alamatDomisili?: string;
   noHp: string;
-  email: string;
-  statusPernikahan: "BELUM_MENIKAH" | "MENIKAH" | "JANDA_DUDA";
-  ukuranBaju?: "S" | "M" | "L" | "XL" | "XXL" | "LAINNYA";
 };
 
 export default async function beasiswaPendaftarUpdate(context: Context) {
@@ -40,18 +32,17 @@ export default async function beasiswaPendaftarUpdate(context: Context) {
       where: { id },
       data: {
         namaLengkap: body.namaLengkap,
-        nik: body.nik,
+        nis: body.nis,
+        kelas: body.kelas,
+        jenisKelamin: body.jenisKelamin,
+        alamatDomisili: body.alamatDomisili,
         tempatLahir: body.tempatLahir,
         tanggalLahir: new Date(body.tanggalLahir),
-        jenisKelamin: body.jenisKelamin,
+        namaOrtu: body.namaOrtu,
-        kewarganegaraan: body.kewarganegaraan,
+        nik: body.nik,
-        agama: body.agama,
+        pekerjaanOrtu: body.pekerjaanOrtu,
-        alamatKTP: body.alamatKTP,
+        penghasilan: body.penghasilan,
-        alamatDomisili: body.alamatDomisili,
         noHp: body.noHp,
-        email: body.email,
-        statusPernikahan: body.statusPernikahan,
-        ukuranBaju: body.ukuranBaju,
       },
     });
 

src/app/darmasaba/(pages)/pendidikan/beasiswa-desa/page.tsx

@@ -1,7 +1,7 @@
 'use client'
 import beasiswaDesaState from '@/app/admin/(dashboard)/_state/pendidikan/beasiswa-desa';
 import colors from '@/con/colors';
-import { Box, Button, Center, Group, Image, Modal, Pagination, Paper, Select, SimpleGrid, Skeleton, Stack, Stepper, Text, TextInput, Title } from '@mantine/core';
+import { Box, Button, Center, Divider, Group, Image, Modal, Pagination, Paper, Select, SimpleGrid, Skeleton, Stack, Stepper, Text, TextInput, Title } from '@mantine/core';
 import { useDisclosure, useShallowEffect } from '@mantine/hooks';
 import { IconArrowRight, IconCoin, IconInfoCircle, IconSchool, IconUsers } from '@tabler/icons-react';
 import { useTransitionRouter } from 'next-view-transitions';
@@ -23,18 +23,17 @@ function Page() {
   const resetForm = () => {
     beasiswaDesa.create.form = {
       namaLengkap: "",
-      nik: "",
+      nis: "",
+      kelas: "",
+      jenisKelamin: "",
+      alamatDomisili: "",
       tempatLahir: "",
       tanggalLahir: "",
-      jenisKelamin: "",
+      namaOrtu: "",
-      kewarganegaraan: "WNI",
+      nik: "",
-      agama: "",
+      pekerjaanOrtu: "",
-      alamatKTP: "",
+      penghasilan: "",
-      alamatDomisili: "",
       noHp: "",
-      email: "",
-      statusPernikahan: "",
-      ukuranBaju: "",
     };
   };
 
@@ -189,9 +188,22 @@ function Page() {
               onChange={(val) => { beasiswaDesa.create.form.namaLengkap = val.target.value }} />
             <TextInput
               type="number"
-              label="NIK"
+              label="NIS"
-              placeholder="Masukkan NIK"
+              placeholder="Masukkan NIS"
-              onChange={(val) => { beasiswaDesa.create.form.nik = val.target.value }} />
+              onChange={(val) => { beasiswaDesa.create.form.nis = val.target.value }} />
+            <TextInput
+              label="Kelas"
+              placeholder="Masukkan kelas"
+              onChange={(val) => { beasiswaDesa.create.form.kelas = val.target.value }} />
+            <Select
+              label="Jenis Kelamin"
+              placeholder="Pilih jenis kelamin"
+              data={[{ value: "LAKI_LAKI", label: "Laki-laki" }, { value: "PEREMPUAN", label: "Perempuan" }]}
+              onChange={(val) => { if (val) beasiswaDesa.create.form.jenisKelamin = val }} />
+            <TextInput
+              label="Alamat Domisili"
+              placeholder="Masukkan alamat domisili"
+              onChange={(val) => { beasiswaDesa.create.form.alamatDomisili = val.target.value }} />
             <TextInput
               label="Tempat Lahir"
               placeholder="Masukkan tempat lahir"
@@ -201,52 +213,29 @@ function Page() {
               label="Tanggal Lahir"
               placeholder="Pilih tanggal lahir"
               onChange={(val) => { beasiswaDesa.create.form.tanggalLahir = val.target.value }} />
-            <Select
+            <Box pt={15} pb={10}>
-              label="Jenis Kelamin"
+              <Divider />
-              placeholder="Pilih jenis kelamin"
+            </Box>
-              data={[{ value: "LAKI_LAKI", label: "Laki-laki" }, { value: "PEREMPUAN", label: "Perempuan" }]}
-              onChange={(val) => { if (val) beasiswaDesa.create.form.jenisKelamin = val }} />
             <TextInput
-              label="Kewarganegaraan"
+              label="Nama Orang Tua / Wali"
-              placeholder="Masukkan kewarganegaraan"
+              placeholder="Masukkan nama orang tua / wali"
-              value={beasiswaDesa.create.form.kewarganegaraan || "WNI"} // tampilkan WNI kalau kosong
+              onChange={(val) => { beasiswaDesa.create.form.namaOrtu = val.target.value }} />
-              onChange={(e) => {
-                beasiswaDesa.create.form.kewarganegaraan = e.target.value;
-              }}
-            />
-            <Select
-              label="Agama"
-              placeholder="Pilih agama"
-              data={[{ value: "ISLAM", label: "Islam" }, { value: "KRISTEN_PROTESTAN", label: "Kristen Protestan" }, { value: "KRISTEN_KATOLIK", label: "Kristen Katolik" }, { value: "HINDU", label: "Hindu" }, { value: "BUDDHA", label: "Buddha" }, { value: "KONGHUCU", label: "Konghucu" }, { value: "LAINNYA", label: "Lainnya" }]}
-              onChange={(val) => { if (val) beasiswaDesa.create.form.agama = val }} />
             <TextInput
-              label="Alamat KTP"
+              label="NIK Orang Tua / Wali"
-              placeholder="Masukkan alamat sesuai KTP"
+              placeholder="Masukkan NIK orang tua / wali"
-              onChange={(val) => { beasiswaDesa.create.form.alamatKTP = val.target.value }} />
+              onChange={(val) => { beasiswaDesa.create.form.nik = val.target.value }} />
             <TextInput
-              label="Alamat Domisili"
+              label="Pekerjaan Orang Tua / Wali"
-              placeholder="Masukkan alamat domisili"
+              placeholder="Masukkan pekerjaan orang tua / wali"
-              onChange={(val) => { beasiswaDesa.create.form.alamatDomisili = val.target.value }} />
+              onChange={(val) => { beasiswaDesa.create.form.pekerjaanOrtu = val.target.value }} />
             <TextInput
-              type="number"
+              label="Penghasilan Orang Tua / Wali"
-              label="Nomor HP"
+              placeholder="Masukkan penghasilan orang tua / wali"
-              placeholder="Masukkan nomor HP"
+              onChange={(val) => { beasiswaDesa.create.form.penghasilan = val.target.value }} />
+            <TextInput
+              label="No HP"
+              placeholder="Masukkan no hp"
               onChange={(val) => { beasiswaDesa.create.form.noHp = val.target.value }} />
-            <TextInput
-              type="email"
-              label="Email"
-              placeholder="Masukkan alamat email"
-              onChange={(val) => { beasiswaDesa.create.form.email = val.target.value }} />
-            <Select
-              label="Status Pernikahan"
-              placeholder="Pilih status pernikahan"
-              data={[{ value: "BELUM_MENIKAH", label: "Belum Menikah" }, { value: "MENIKAH", label: "Menikah" }, { value: "JANDA_DUDA", label: "Janda/Duda" }]}
-              onChange={(val) => { if (val) beasiswaDesa.create.form.statusPernikahan = val }} />
-            <Select
-              label="Ukuran Baju"
-              placeholder="Pilih ukuran baju"
-              data={[{ value: "S", label: "S" }, { value: "M", label: "M" }, { value: "L", label: "L" }, { value: "XL", label: "XL" }, { value: "XXL", label: "XXL" }, { value: "LAINNYA", label: "Lainnya" }]}
-              onChange={(val) => { if (val) beasiswaDesa.create.form.ukuranBaju = val }} />
             <Group justify="flex-end" mt="md">
               <Button variant="default" radius="xl" onClick={close}>Batal</Button>
               <Button radius="xl" bg={colors['blue-button']} onClick={handleSubmit}>Kirim</Button>

src/app/darmasaba/(pages)/pendidikan/beasiswa-desa/pelajari-lebih-lanjut/page.tsx

@@ -4,6 +4,7 @@ import {
   Box,
   Button,
   Container,
+  Divider,
   Group,
   Modal,
   Paper,
@@ -30,18 +31,17 @@ export default function BeasiswaPage() {
   const resetForm = () => {
     beasiswaDesa.create.form = {
       namaLengkap: "",
-      nik: "",
+      nis: "",
+      kelas: "",
+      jenisKelamin: "",
+      alamatDomisili: "",
       tempatLahir: "",
       tanggalLahir: "",
-      jenisKelamin: "",
+      namaOrtu: "",
-      kewarganegaraan: "WNI",
+      nik: "",
-      agama: "",
+      pekerjaanOrtu: "",
-      alamatKTP: "",
+      penghasilan: "",
-      alamatDomisili: "",
       noHp: "",
-      email: "",
-      statusPernikahan: "",
-      ukuranBaju: "",
     };
   };
 
@@ -248,9 +248,22 @@ export default function BeasiswaPage() {
               onChange={(val) => { beasiswaDesa.create.form.namaLengkap = val.target.value }} />
             <TextInput
               type="number"
-              label="NIK"
+              label="NIS"
-              placeholder="Masukkan NIK"
+              placeholder="Masukkan NIS"
-              onChange={(val) => { beasiswaDesa.create.form.nik = val.target.value }} />
+              onChange={(val) => { beasiswaDesa.create.form.nis = val.target.value }} />
+            <TextInput
+              label="Kelas"
+              placeholder="Masukkan kelas"
+              onChange={(val) => { beasiswaDesa.create.form.kelas = val.target.value }} />
+            <Select
+              label="Jenis Kelamin"
+              placeholder="Pilih jenis kelamin"
+              data={[{ value: "LAKI_LAKI", label: "Laki-laki" }, { value: "PEREMPUAN", label: "Perempuan" }]}
+              onChange={(val) => { if (val) beasiswaDesa.create.form.jenisKelamin = val }} />
+            <TextInput
+              label="Alamat Domisili"
+              placeholder="Masukkan alamat domisili"
+              onChange={(val) => { beasiswaDesa.create.form.alamatDomisili = val.target.value }} />
             <TextInput
               label="Tempat Lahir"
               placeholder="Masukkan tempat lahir"
@@ -260,52 +273,29 @@ export default function BeasiswaPage() {
               label="Tanggal Lahir"
               placeholder="Pilih tanggal lahir"
               onChange={(val) => { beasiswaDesa.create.form.tanggalLahir = val.target.value }} />
-            <Select
+            <Box pt={15} pb={10}>
-              label="Jenis Kelamin"
+              <Divider />
-              placeholder="Pilih jenis kelamin"
+            </Box>
-              data={[{ value: "LAKI_LAKI", label: "Laki-laki" }, { value: "PEREMPUAN", label: "Perempuan" }]}
-              onChange={(val) => { if (val) beasiswaDesa.create.form.jenisKelamin = val }} />
             <TextInput
-              label="Kewarganegaraan"
+              label="Nama Orang Tua / Wali"
-              placeholder="Masukkan kewarganegaraan"
+              placeholder="Masukkan nama orang tua / wali"
-              value={beasiswaDesa.create.form.kewarganegaraan || "WNI"} // tampilkan WNI kalau kosong
+              onChange={(val) => { beasiswaDesa.create.form.namaOrtu = val.target.value }} />
-              onChange={(e) => {
-                beasiswaDesa.create.form.kewarganegaraan = e.target.value;
-              }}
-            />
-            <Select
-              label="Agama"
-              placeholder="Pilih agama"
-              data={[{ value: "ISLAM", label: "Islam" }, { value: "KRISTEN_PROTESTAN", label: "Kristen Protestan" }, { value: "KRISTEN_KATOLIK", label: "Kristen Katolik" }, { value: "HINDU", label: "Hindu" }, { value: "BUDDHA", label: "Buddha" }, { value: "KONGHUCU", label: "Konghucu" }, { value: "LAINNYA", label: "Lainnya" }]}
-              onChange={(val) => { if (val) beasiswaDesa.create.form.agama = val }} />
             <TextInput
-              label="Alamat KTP"
+              label="NIK Orang Tua / Wali"
-              placeholder="Masukkan alamat sesuai KTP"
+              placeholder="Masukkan NIK orang tua / wali"
-              onChange={(val) => { beasiswaDesa.create.form.alamatKTP = val.target.value }} />
+              onChange={(val) => { beasiswaDesa.create.form.nik = val.target.value }} />
             <TextInput
-              label="Alamat Domisili"
+              label="Pekerjaan Orang Tua / Wali"
-              placeholder="Masukkan alamat domisili"
+              placeholder="Masukkan pekerjaan orang tua / wali"
-              onChange={(val) => { beasiswaDesa.create.form.alamatDomisili = val.target.value }} />
+              onChange={(val) => { beasiswaDesa.create.form.pekerjaanOrtu = val.target.value }} />
             <TextInput
-              type="number"
+              label="Penghasilan Orang Tua / Wali"
-              label="Nomor HP"
+              placeholder="Masukkan penghasilan orang tua / wali"
-              placeholder="Masukkan nomor HP"
+              onChange={(val) => { beasiswaDesa.create.form.penghasilan = val.target.value }} />
+            <TextInput
+              label="No HP"
+              placeholder="Masukkan no hp"
               onChange={(val) => { beasiswaDesa.create.form.noHp = val.target.value }} />
-            <TextInput
-              type="email"
-              label="Email"
-              placeholder="Masukkan alamat email"
-              onChange={(val) => { beasiswaDesa.create.form.email = val.target.value }} />
-            <Select
-              label="Status Pernikahan"
-              placeholder="Pilih status pernikahan"
-              data={[{ value: "BELUM_MENIKAH", label: "Belum Menikah" }, { value: "MENIKAH", label: "Menikah" }, { value: "JANDA_DUDA", label: "Janda/Duda" }]}
-              onChange={(val) => { if (val) beasiswaDesa.create.form.statusPernikahan = val }} />
-            <Select
-              label="Ukuran Baju"
-              placeholder="Pilih ukuran baju"
-              data={[{ value: "S", label: "S" }, { value: "M", label: "M" }, { value: "L", label: "L" }, { value: "XL", label: "XL" }, { value: "XXL", label: "XXL" }, { value: "LAINNYA", label: "Lainnya" }]}
-              onChange={(val) => { if (val) beasiswaDesa.create.form.ukuranBaju = val }} />
             <Group justify="flex-end" mt="md">
               <Button variant="default" radius="xl" onClick={close}>Batal</Button>
               <Button radius="xl" bg={colors['blue-button']} onClick={handleSubmit}>Kirim</Button>

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

@@ -0,0 +1,208 @@
+/* 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';
+
+
+
+function formatRupiah(value: number) {
+  return new Intl.NumberFormat('id-ID', {
+    style: 'currency',
+    currency: 'IDR',
+    minimumFractionDigits: 2,
+  }).format(value);
+}
+
+function APBDesProgress() {
+  const state = useProxy(apbdes);
+  const data = state.findMany.data || [];
+
+  // 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>
+    );
+  }
+
+  const items = apbdesItem.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
+
+  // Hitung total per kategori
+  const calcTotal = (items: any[]) => {
+    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;
+    return { anggaran, realisasi, persen };
+  };
+
+  const pendapatan = calcTotal(pendapatanItems);
+  const belanja = calcTotal(belanjaItems);
+  const pembiayaan = calcTotal(pembiayaanItems); // bisa kosong
+
+  // Render satu progress bar
+  const renderProgress = (label: string, dataset: any) => {
+    const isPembiayaan = label.includes('Pembiayaan');
+
+    return (
+      <Box key={label}>
+        <Text fw={600} fz="sm">{label}</Text>
+        <Text fw={700} mb="xs">
+          {formatRupiah(dataset.realisasi)} | {formatRupiah(dataset.anggaran)}
+        </Text>
+        <Progress
+          value={dataset.persen}
+          size="xl"
+          radius="xl"
+          striped={false}
+          styles={{
+            root: { backgroundColor: '#d7e3f1' },
+            section: {
+              backgroundColor: isPembiayaan
+                ? 'green' // warna hijau untuk pembiayaan
+                : colors['blue-button'], // biru untuk pendapatan/belanja
+              position: 'relative',
+              '&::after': {
+                content: `'${dataset.persen.toFixed(2)}%'`,
+                position: 'absolute',
+                right: 10,
+                top: '50%',
+                transform: 'translateY(-50%)',
+                color: 'white',
+                fontWeight: 700,
+                fontSize: '0.8rem',
+              },
+            },
+          }}
+        />
+      </Box>
+    );
+  };
+
+  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">
+          Realisasi | Anggaran
+        </Text>
+
+        {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;

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

@@ -0,0 +1,160 @@
+// 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;
+}
+
+// Helper: Format Rupiah, tapi jika 0 → tampilkan '-'
+function formatRupiahOrEmpty(value: number): string {
+  if (value === 0 || value === null || value === undefined) {
+    return '-';
+  }
+  return new Intl.NumberFormat('id-ID', {
+    minimumFractionDigits: 2,
+    style: 'decimal',
+  }).format(value);
+}
+
+// Helper: Format Persentase, tapi jika 0 → tampilkan '-'
+function formatPersentaseOrEmpty(value: number): string {
+  if (value === 0 || value === null || value === undefined) {
+    return '-';
+  }
+  return `${value.toFixed(2)}%`;
+}
+
+function getIndent(level: number) {
+  return {
+    paddingLeft: `${(level - 1) * 20}px`,
+  };
+}
+
+function APBDesTable() {
+  const state = useProxy(apbdes);
+  const data = state.findMany.data || [];
+
+  // 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 : [];
+  const sortedItems = [...items].sort((a, b) => a.kode.localeCompare(b.kode));
+
+  // Calculate totals
+  const totalAnggaran = items.reduce((sum, item) => sum + (item.anggaran || 0), 0);
+  const totalRealisasi = items.reduce((sum, item) => sum + (item.realisasi || 0), 0);
+  const totalSelisih = totalAnggaran - totalRealisasi;
+  const totalPersentase = totalAnggaran > 0 ? (totalRealisasi / totalAnggaran) * 100 : 0;
+
+  return (
+    <Box py="md" px={{ base: 'md', md: 100 }}>
+      <Title order={4} c={colors['blue-button']} mb="sm">
+        Rincian APBDes Tahun {apbdesItem.tahun}
+      </Title>
+
+      <Paper withBorder radius="md" shadow="xs" p="md">
+        <Box style={{overflowY: 'auto' }}>
+          <Table withColumnBorders highlightOnHover>
+            <Table.Thead bg="#2c5f78">
+              <Table.Tr>
+                <Table.Th c="white" style={{ width: '40%' }}>
+                  Uraian
+                </Table.Th>
+                <Table.Th c="white" ta="right" style={{ width: '15%' }}>
+                  Anggaran (Rp)
+                </Table.Th>
+                <Table.Th c="white" ta="right" style={{ width: '15%' }}>
+                  Realisasi (Rp)
+                </Table.Th>
+                <Table.Th c="white" ta="right" style={{ width: '15%' }}>
+                  Lebih/(Kurang) (Rp)
+                </Table.Th>
+                <Table.Th c="white" ta="center" style={{ width: '15%' }}>
+                  Persentase (%)
+                </Table.Th>
+              </Table.Tr>
+            </Table.Thead>
+            <Table.Tbody>
+              {sortedItems.map((item) => (
+                <Table.Tr key={item.id}>
+                  <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>
+                    </Group>
+                  </Table.Td>
+                  <Table.Td ta="right">{formatRupiahOrEmpty(item.anggaran)}</Table.Td>
+                  <Table.Td ta="right">{formatRupiahOrEmpty(item.realisasi)}</Table.Td>
+                  <Table.Td ta="right">
+                    <Text c={item.selisih >= 0 ? 'green' : 'red'}>
+                      {formatRupiahOrEmpty(item.selisih)}
+                    </Text>
+                  </Table.Td>
+                  <Table.Td ta="center">
+                    <Badge color={item.persentase >= 100 ? 'teal' : 'yellow'} size="sm">
+                      {formatPersentaseOrEmpty(item.persentase)}
+                    </Badge>
+                  </Table.Td>
+                </Table.Tr>
+              ))}
+            </Table.Tbody>
+            <Table.Tfoot bg="#e6f0f7">
+              <Table.Tr>
+                <Table.Th colSpan={1}>
+                  <Text fw={700}>JUMLAH PENDAPATAN</Text>
+                </Table.Th>
+                <Table.Th ta="right">
+                  <Text fw={700}>{formatRupiahOrEmpty(totalAnggaran)}</Text>
+                </Table.Th>
+                <Table.Th ta="right">
+                  <Text fw={700}>{formatRupiahOrEmpty(totalRealisasi)}</Text>
+                </Table.Th>
+                <Table.Th ta="right">
+                  <Text fw={700} c={totalSelisih >= 0 ? 'green' : 'red'}>
+                    {formatRupiahOrEmpty(totalSelisih)}
+                  </Text>
+                </Table.Th>
+                <Table.Th ta="center">
+                  <Text fw={700}>{formatPersentaseOrEmpty(totalPersentase)}</Text>
+                </Table.Th>
+              </Table.Tr>
+            </Table.Tfoot>
+          </Table>
+        </Box>
+      </Paper>
+    </Box>
+  );
+}
+
+export default APBDesTable;

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

@@ -4,12 +4,14 @@
 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, Paper, Progress, SimpleGrid, Stack, Table, Text, Title } from '@mantine/core'
+import { ActionIcon, BackgroundImage, Box, Center, Container, Group, Loader, 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'
 
 function Page() {
   const state = useProxy(apbdes)
@@ -92,200 +94,10 @@ function Page() {
           ))}
         </SimpleGrid>
       )}
-      <DetailAPBDesaTable />
+      <APBDesTable />
-      <APBDesaProgress />
+      <APBDesProgress />
     </Stack>
   )
 }
 
-function DetailAPBDesaTable() {
-  // 🔹 Dummy data
-  const data = {
-    tahun: 2024,
-    pendapatan: [
-      { id: 1, nama: 'Pendapatan Asli Desa', anggaran: 32000000, realisasi: 6500000 },
-      { id: 2, nama: 'Dana Desa', anggaran: 125000000, realisasi: 120000000 },
-      { id: 3, nama: 'Bagi Hasil Pajak dan Retribusi', anggaran: 10000000, realisasi: 9000000 },
-    ],
-    belanja: [
-      { id: 1, nama: 'Belanja Pegawai', anggaran: 80000000, realisasi: 75000000 },
-      { id: 2, nama: 'Belanja Barang & Jasa', anggaran: 50000000, realisasi: 42000000 },
-    ],
-    pembiayaan: [
-      { id: 1, nama: 'Penerimaan Pembiayaan', anggaran: 15000000, realisasi: 15000000 },
-      { id: 2, nama: 'Pengeluaran Pembiayaan', anggaran: 10000000, realisasi: 8000000 },
-    ],
-  };
-
-  const formatRupiah = (value: number) =>
-    new Intl.NumberFormat('id-ID', {
-      minimumFractionDigits: 2,
-      style: 'decimal',
-    }).format(value);
-
-  // 🔹 Helper buat render satu kategori (Pendapatan, Belanja, Pembiayaan)
-  const renderSection = (title: string, items: any[]) => {
-    const totalAnggaran = items.reduce((sum, i) => sum + Number(i.anggaran || 0), 0);
-    const totalRealisasi = items.reduce((sum, i) => sum + Number(i.realisasi || 0), 0);
-    const totalSelisih = totalAnggaran - totalRealisasi;
-    const totalPersen = totalAnggaran
-      ? (totalRealisasi / totalAnggaran) * 100
-      : 0;
-
-    return (
-      <Paper withBorder radius="md" shadow="xs" p="md">
-        <Title order={5} mb="sm" c={colors['blue-button']}>
-          {title.toUpperCase()}
-        </Title>
-        <Table withColumnBorders highlightOnHover>
-          <Table.Thead bg={colors['blue-button']}>
-            <Table.Tr>
-              <Table.Th c="white">Uraian</Table.Th>
-              <Table.Th c="white" ta="right">
-                Anggaran (Rp)
-              </Table.Th>
-              <Table.Th c="white" ta="right">
-                Realisasi (Rp)
-              </Table.Th>
-              <Table.Th c="white" ta="right">
-                Lebih/(Kurang) (Rp)
-              </Table.Th>
-              <Table.Th c="white" ta="center">
-                Persentase (%)
-              </Table.Th>
-            </Table.Tr>
-          </Table.Thead>
-          <Table.Tbody>
-            {items.map((item, index) => {
-              const selisih = Number(item.anggaran) - Number(item.realisasi);
-              const persen = item.anggaran
-                ? (item.realisasi / item.anggaran) * 100
-                : 0;
-              return (
-                <Table.Tr key={item.id || index}>
-                  <Table.Td>
-                    <strong>{`${index + 1}. ${item.nama}`}</strong>
-                  </Table.Td>
-                  <Table.Td ta="right">{formatRupiah(item.anggaran)}</Table.Td>
-                  <Table.Td ta="right">{formatRupiah(item.realisasi)}</Table.Td>
-                  <Table.Td ta="right">{formatRupiah(selisih)}</Table.Td>
-                  <Table.Td ta="center">{persen.toFixed(2)}</Table.Td>
-                </Table.Tr>
-              );
-            })}
-          </Table.Tbody>
-          <Table.Tfoot bg="#f1f5fb">
-            <Table.Tr>
-              <Table.Th>Total {title}</Table.Th>
-              <Table.Th ta="right">{formatRupiah(totalAnggaran)}</Table.Th>
-              <Table.Th ta="right">{formatRupiah(totalRealisasi)}</Table.Th>
-              <Table.Th ta="right">{formatRupiah(totalSelisih)}</Table.Th>
-              <Table.Th ta="center">{totalPersen.toFixed(2)}</Table.Th>
-            </Table.Tr>
-          </Table.Tfoot>
-        </Table>
-      </Paper>
-    );
-  };
-
-  return (
-    <Box py="md" px={{ base: 'md', md: 100 }}>
-      <Stack gap="xl">
-        <Title order={4} c={colors['blue-button']}>
-          APB Desa Tahun {data.tahun}
-        </Title>
-
-        {renderSection('Pendapatan', data.pendapatan)}
-        {renderSection('Belanja', data.belanja)}
-        {renderSection('Pembiayaan', data.pembiayaan)}
-      </Stack>
-    </Box>
-  );
-}
-
-function APBDesaProgress() {
-  const data = {
-    tahun: 2024,
-    pendapatan: [
-      { id: 1, nama: 'Pendapatan Asli Desa', anggaran: 32000000, realisasi: 6500000 },
-      { id: 2, nama: 'Dana Desa', anggaran: 125000000, realisasi: 120000000 },
-      { id: 3, nama: 'Bagi Hasil Pajak dan Retribusi', anggaran: 10000000, realisasi: 9000000 },
-    ],
-    belanja: [
-      { id: 1, nama: 'Belanja Pegawai', anggaran: 80000000, realisasi: 75000000 },
-      { id: 2, nama: 'Belanja Barang & Jasa', anggaran: 50000000, realisasi: 42000000 },
-    ],
-    pembiayaan: [
-      { id: 1, nama: 'Penerimaan Pembiayaan', anggaran: 15000000, realisasi: 15000000 },
-      { id: 2, nama: 'Pengeluaran Pembiayaan', anggaran: 10000000, realisasi: 8000000 },
-    ],
-  };
-
-  const formatRupiah = (value: number) =>
-    new Intl.NumberFormat('id-ID', {
-      style: 'currency',
-      currency: 'IDR',
-      minimumFractionDigits: 2,
-    }).format(value);
-
-  const calcProgress = (items: any[]) => {
-    const anggaran = items.reduce((sum, i) => sum + i.anggaran, 0);
-    const realisasi = items.reduce((sum, i) => sum + i.realisasi, 0);
-    const persen = anggaran ? (realisasi / anggaran) * 100 : 0;
-    return { anggaran, realisasi, persen };
-  };
-
-  const pendapatan = calcProgress(data.pendapatan);
-  const belanja = calcProgress(data.belanja);
-  const pembiayaan = calcProgress(data.pembiayaan);
-
-  const renderProgress = (label: string, dataset: any) => (
-    <Box>
-      <Text fw={600}>{label}</Text>
-      <Text fw={700} mb="xs">
-        {formatRupiah(dataset.realisasi)} | {formatRupiah(dataset.anggaran)}
-      </Text>
-      <Progress
-        value={dataset.persen}
-        size="xl"
-        radius="xl"
-        striped={false}
-        styles={{
-          root: { backgroundColor: '#d7e3f1' },
-          section: { 
-            backgroundColor: colors['blue-button'],
-            position: 'relative',
-            '&::after': {
-              content: `'${dataset.persen.toFixed(2)}%'`,
-              position: 'absolute',
-              right: 10,
-              top: '50%',
-              transform: 'translateY(-50%)',
-              color: 'white',
-              fontWeight: 700,
-              fontSize: '0.8rem',
-            }
-          },
-        }}
-      />
-    </Box>
-  );
-
-  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']}>
-          Grafik APB Desa Tahun {data.tahun}
-        </Title>
-
-        {renderProgress('Pendapatan Desa', pendapatan)}
-        {renderProgress('Belanja Desa', belanja)}
-        {renderProgress('Pembiayaan Desa', pembiayaan)}
-      </Stack>
-    </Paper>
-  );
-}
-
-
-
 export default Page

src/app/darmasaba/(tambahan)/sdgs-desa/page.tsx

@@ -209,16 +209,28 @@ function Page() {
           ) : null}
 
           {/* Chart */}
-          <Box mt={30} style={{ width: '100%', minHeight: 400 }}>
+          <Box mt={30} style={{ width: '100%' }}>
-            <Paper bg={colors['white-1']} pt={50} pb={170} px={90} mb={"xl"} radius="md" withBorder>
+            <Paper
-              <Stack gap={"xs"}>
+              bg={colors['white-1']}
-                <Title ta={"center"} pb={10} order={2}>
+              py={90}
-                  Grafik APBDes
+              px={{ base: 12, sm: 24, md: 50 }}
-                </Title>
+              radius="md"
+              withBorder
+            >
+              <Stack gap="lg">
+                <Title ta="center" order={2}>Grafik SDGs Desa</Title>
+
                 {mounted && chartData.length > 0 ? (
-                  <Box style={{ padding: '0 30px' }}> {/* Tambahkan padding horizontal agar label tidak keluar */}
+                  <Box
+                    style={{
+                      width: "100%",
+                      overflowX: "auto",
+                      paddingBottom: 185,
+                    }}
+                  >
+                    <Box style={{ minWidth: 900 }}> {/* ⭐ batas minimum biar bisa scroll */}
                       <BarChart
-                      h={500}
+                        h={350}
                         data={chartData}
                         dataKey="name"
                         type="stacked"
@@ -227,7 +239,6 @@ function Page() {
                           {
                             name: 'jumlah',
                             color: colors['blue-button'],
-                          // label: 'Jumlah', → HAPUS INI AGAR LEGEND TIDAK MUNCUL
                           },
                         ]}
                         withTooltip
@@ -246,20 +257,17 @@ function Page() {
                           domain: [0, 100],
                           tickCount: 6,
                         }}
-                      style={{
+                        withLegend={false}
-                        overflowX: 'visible',
-                        paddingBottom: 40, // Tambahkan ruang di bawah untuk label
-                      }}
-                      // Hilangkan legend secara eksplisit
-                      withLegend={false} // ⭐ Ini yang menghilangkan kotak biru + teks "Jumlah"
                       />
                     </Box>
+                  </Box>
                 ) : (
                   <Text c="dimmed">Belum ada data untuk ditampilkan dalam grafik</Text>
                 )}
               </Stack>
             </Paper>
           </Box>
+
         </Box>
       </Box>
     </Stack>

src/app/darmasaba/_com/ModernNeewsNotification.tsx

@@ -125,7 +125,6 @@ export default function ModernNewsNotification({
               position: "fixed",
               bottom: "24px",
               right: "24px",
-              zIndex: 1000,
             }}
           >
             <ActionIcon
@@ -152,8 +151,8 @@ export default function ModernNewsNotification({
                 color="red"
                 style={{
                   position: "absolute",
-                    top: "-5px",
+                  top: "6px",
-                    right: "-5px",
+                  right: "6px",
                   minWidth: "22px",
                   height: "22px",
                   padding: "0 6px",
@@ -178,7 +177,6 @@ export default function ModernNewsNotification({
               right: "24px",
               width: "380px",
               maxHeight: "500px",
-              zIndex: 999,
               boxShadow: "0 8px 32px rgba(0,0,0,0.12)",
               borderRadius: "16px",
               overflow: "hidden",
@@ -274,7 +272,6 @@ export default function ModernNewsNotification({
               bottom: "100px",
               right: "24px",
               width: "380px",
-              zIndex: 1001,
               boxShadow: "0 8px 32px rgba(0,0,0,0.15)",
               borderRadius: "12px",
               overflow: "hidden",

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

@@ -1,8 +1,7 @@
-import { Box, Card, Image, Stack, Text, Tooltip } from '@mantine/core';
-import { IconUserCircle } from '@tabler/icons-react';
-import React from 'react';
-import { Prisma } from '@prisma/client';
 import colors from '@/con/colors';
+import { Box, Card, Image, Stack, Text } from '@mantine/core';
+import { Prisma } from '@prisma/client';
+import { IconUserCircle } from '@tabler/icons-react';
 
 interface ProfileViewProps {
   data: Prisma.PejabatDesaGetPayload<{ include: { image: true } }> | null;
@@ -95,7 +94,6 @@ export default function ProfileView({ data }: ProfileViewProps) {
             backgroundColor: 'rgba(255, 255, 255, 0.95)',
           }}
         >
-          <Tooltip label="Jabatan Resmi" withArrow>
             <Text
               fz={{ base: 'xs', sm: 'sm' }}
               c="dimmed"
@@ -103,7 +101,6 @@ export default function ProfileView({ data }: ProfileViewProps) {
             >
               {data.position || 'Tidak ada jabatan'}
             </Text>
-          </Tooltip>
           <Text
             c={colors['blue-button']}
             fw={700}