Bagian Berita Di Admin Sudah Bisa Upload Di Bun Dev atau Bun Start

prisma/data/ppid/profile-ppid/profilePPid.json

@@ -6,6 +6,6 @@
     "riwayat": "<ul> <li>2021 - 2027: Perbekel Desa Darmasaba</li> <li>2015 - Sekarang: Founder & Managing Director Mantra Legal Consultants & Advocates</li> <li>2020 - Sekarang: Founder Ugawa Record Music Studio</li> <li>2010 - 2016: Dosen Fakultas Hukum Universitas Mahasaraswati Denpasar</li> </ul>",
     "pengalaman": "<ul> <li>1996 – 1997: Ketua OSIS SMP Negeri 1 Abiansemal</li><li>1999 – 2000: Ketua OSIS SMA Negeri 1 Mengwi</li> <li>2008 – 2009: Ketua BEM Universitas Mahasaraswati Denpasar</li> <li>2008 – 2010: Ketua Sekaa Taruna Sila Dharma, Banjar Tengah, Desa Adat Tegal, Darmasaba</li> <li>2020 – Sekarang: Pengurus Young Lawyer Committee Peradi Denpasar</li> <li>2021 – Sekarang: Dewan Kehormatan Himpunan Pengusaha Muda Indonesia (HIPMI) Badung</li> <li>2023 – 2028: Komite Tetap Advokasi – Bidang Hukum dan Regulasi Kamar Dagang dan Industri Badung</li> </ul>",
     "unggulan": "<h3>Pemberdayaan Ekonomi dan UMKM</h3> <ul> <li>Pelatihan dan pendampingan UMKM lokal</li> <li>Program bantuan modal usaha bagi pelaku usaha kecil</li><li>Digitalisasi UMKM untuk meningkatkan pemasaran produk lokal</li></ul>",
-    "imageUrl": "/assets/images/ppid/profile-ppid/perbekel.png"
+    "imageUrl": "/uploads/seeded-images/profile-ppid/perbekel.png"
   }
 ]

prisma/schema.prisma

@@ -242,17 +242,18 @@ model Berita {
   id               String          @id @default(cuid())
   judul            String
   deskripsi        String
-  image            String
+  image            FileStorage     @relation(fields: [imageId], references: [id])
+  imageId          String
   content          String          @db.Text
   createdAt        DateTime        @default(now())
   updatedAt        DateTime        @updatedAt
   deletedAt        DateTime        @default(now())
   isActive         Boolean         @default(true)
-  KatagoryBerita   KatagoryBerita? @relation(fields: [katagoryBeritaId], references: [id])
-  katagoryBeritaId String?
+  kategoriBerita   KategoriBerita? @relation(fields: [kategoriBeritaId], references: [id])
+  kategoriBeritaId String?
 }
 
-model KatagoryBerita {
+model KategoriBerita {
   id        String   @id @default(cuid())
   name      String   @unique
   beritas   Berita[]
@@ -593,7 +594,8 @@ model FileStorage {
   mimeType  String
   createdAt DateTime  @default(now())
   updatedAt DateTime  @updatedAt
-  deletedAt DateTime? // nullable agar bisa menandakan belum dihapus
+  deletedAt DateTime? 
   isActive  Boolean   @default(true)
   link      String
+  Berita Berita[]
 }

prisma/seed.ts

@@ -1,277 +1,277 @@
-import prisma from '@/lib/prisma'
-import categoryPengumuman from './data/category-pengumuman.json'
-import katagoryBerita from './data/katagory-berita.json'
-import caraMemperolehInformasi from './data/list-caraMemperolehInformasi.json'
-import caraMemperolehSalinanInformasi from './data/list-caraMemperolehSalinanInformasi.json'
-import jenisInformasiDiminta from './data/list-jenisInfromasi.json'
-import layanan from './data/list-layanan.json'
-import potensi from './data/list-potensi.json'
-import visiMisiPPID from './data/ppid/visi-misi-ppid/visimisiPPID.json'
-import dasarHukumPPID from './data/ppid/dasar-hukum-ppid/dasarhukumPPID.json'
-import profileDesa from './data/desa/profile/profile_desa.json'
-import profilePerbekel from './data/desa/profile/profil_perbekel.json'
-import profilePPID from './data/ppid/profile-ppid/profilePPid.json'
-import path from 'path'
-import fs from 'fs'
-import { mkdir, writeFile } from 'fs/promises'
-import { v4 as uuid } from 'uuid'
+import prisma from "@/lib/prisma";
+import categoryPengumuman from "./data/category-pengumuman.json";
+import kategoriBerita from "./data/kategori-berita.json";
+import caraMemperolehInformasi from "./data/list-caraMemperolehInformasi.json";
+import caraMemperolehSalinanInformasi from "./data/list-caraMemperolehSalinanInformasi.json";
+import jenisInformasiDiminta from "./data/list-jenisInfromasi.json";
+import layanan from "./data/list-layanan.json";
+import potensi from "./data/list-potensi.json";
+import visiMisiPPID from "./data/ppid/visi-misi-ppid/visimisiPPID.json";
+import dasarHukumPPID from "./data/ppid/dasar-hukum-ppid/dasarhukumPPID.json";
+import profileDesa from "./data/desa/profile/profile_desa.json";
+import profilePerbekel from "./data/desa/profile/profil_perbekel.json";
+import profilePPID from "./data/ppid/profile-ppid/profilePPid.json";
+import path from "path";
+import fs from "fs";
+import { mkdir, writeFile } from "fs/promises";
+import { v4 as uuid } from "uuid";
 
 (async () => {
-    for (const l of layanan) {
-        await prisma.layanan.upsert({
-            where: {
-                name: l.name
-            },
-            update: {
-                name: l.name
-            },
-            create: {
-                name: l.name
-            }
-        })
+  for (const l of layanan) {
+    await prisma.layanan.upsert({
+      where: {
+        name: l.name,
+      },
+      update: {
+        name: l.name,
+      },
+      create: {
+        name: l.name,
+      },
+    });
+  }
+
+  console.log("layanan success ...");
+
+  for (const p of potensi) {
+    await prisma.potensi.upsert({
+      where: {
+        name: p.name,
+      },
+      update: {
+        name: p.name,
+      },
+      create: {
+        name: p.name,
+      },
+    });
+  }
+
+  console.log("potensi success ...");
+
+  for (const k of kategoriBerita) {
+    await prisma.kategoriBerita.upsert({
+      where: {
+        name: k.name,
+      },
+      update: {
+        name: k.name,
+      },
+      create: {
+        name: k.name,
+      },
+    });
+  }
+
+  console.log("kategori berita success ...");
+
+  for (const c of categoryPengumuman) {
+    await prisma.categoryPengumuman.upsert({
+      where: {
+        name: c.name,
+      },
+      update: {
+        name: c.name,
+      },
+      create: {
+        name: c.name,
+      },
+    });
+  }
+
+  console.log("category pengumuman success ...");
+
+  for (const j of jenisInformasiDiminta) {
+    await prisma.jenisInformasiDiminta.upsert({
+      where: {
+        name: j.name,
+      },
+      update: {
+        name: j.name,
+      },
+      create: {
+        name: j.name,
+      },
+    });
+  }
+  console.log("jenis informasi diminta success ...");
+
+  for (const c of caraMemperolehInformasi) {
+    await prisma.caraMemperolehInformasi.upsert({
+      where: {
+        name: c.name,
+      },
+      update: {
+        name: c.name,
+      },
+      create: {
+        name: c.name,
+      },
+    });
+  }
+  console.log("cara memperoleh informasi success ...");
+
+  for (const c of caraMemperolehSalinanInformasi) {
+    await prisma.caraMemperolehSalinanInformasi.upsert({
+      where: {
+        name: c.name,
+      },
+      update: {
+        name: c.name,
+      },
+      create: {
+        name: c.name,
+      },
+    });
+  }
+  console.log("cara memperoleh salinan informasi success ...");
+
+  const seedProfilePPID = async () => {
+    const targetDir = path.resolve("public", "uploads", "seeded-images", "profile-ppid")
+  
+    // Buat folder hanya jika belum ada
+    if (!fs.existsSync(targetDir)) {
+      await mkdir(targetDir, { recursive: true })
     }
-
-    console.log("layanan success ...")
-
-    for (const p of potensi) {
-        await prisma.potensi.upsert({
-            where: {
-                name: p.name
-            },
-            update: {
-                name: p.name
-            },
-            create: {
-                name: p.name
-            }
-        })
-    }
-
-    console.log("potensi success ...")
-
-    for (const k of katagoryBerita) {
-        await prisma.katagoryBerita.upsert({
-            where: {
-                name: k.name
-            },
-            update: {
-                name: k.name
-            },
-            create: {
-                name: k.name
-            }
-        })
-    }
-
-    console.log("katagory berita success ...")
-
-    for (const c of categoryPengumuman) {
-        await prisma.categoryPengumuman.upsert({
-            where: {
-                name: c.name
-            },
-            update: {
-                name: c.name
-            },
-            create: {
-                name: c.name
-            }
-        })
-    }
-
-    console.log("category pengumuman success ...")
-
-    for (const j of jenisInformasiDiminta) {
-        await prisma.jenisInformasiDiminta.upsert({
-            where: {
-                name: j.name
-            },
-            update: {
-                name: j.name
-            },
-            create: {
-                name: j.name
-            }
-        })
-    }
-    console.log("jenis informasi diminta success ...")
-
-    for (const c of caraMemperolehInformasi) {
-        await prisma.caraMemperolehInformasi.upsert({
-            where: {
-                name: c.name
-            },
-            update: {
-                name: c.name
-            },
-            create: {
-                name: c.name
-            }
-        })
-    }
-    console.log("cara memperoleh informasi success ...")
-
-    for (const c of caraMemperolehSalinanInformasi) {
-        await prisma.caraMemperolehSalinanInformasi.upsert({
-            where: {
-                name: c.name
-            },
-            update: {
-                name: c.name
-            },
-            create: {
-                name: c.name
-            }
-        })
-    }
-    console.log("cara memperoleh salinan informasi success ...")
-
-    const seedProfilePPID = async () => {
-        const targetDir = path.resolve("public", "assets", "images", "ppid", "profile-ppid")
-        await mkdir(targetDir, { recursive: true })
-      
-        for (const c of profilePPID) {
-          let finalImageUrl = c.imageUrl
-      
-          // kalau imageUrl diawali dengan "/assets/images", artinya kita harus copy file dari seed-images
-          if (c.imageUrl.startsWith("/assets/images/")) {
-            const filename = path.basename(c.imageUrl) // misal "perbekel.png"
-            const seedImagePath = path.resolve("prisma", "seed-images", filename)
-      
-            // Buat nama baru yang unik agar tidak bentrok
-            const targetFilename = `${uuid()}_${filename}`
-            const targetPath = path.join(targetDir, targetFilename)
-      
-            // Salin file dari prisma/seed-images ke public/
-            const buffer = fs.readFileSync(seedImagePath)
-            await writeFile(targetPath, buffer)
-      
-            finalImageUrl = `/assets/images/ppid/profile-ppid/${targetFilename}`
-          }
-      
-          // Upsert ke database
-          await prisma.profilePPID.upsert({
-            where: { id: c.id },
-            update: {
-              name: c.name,
-              biodata: c.biodata,
-              riwayat: c.riwayat,
-              pengalaman: c.pengalaman,
-              unggulan: c.unggulan,
-              imageUrl: finalImageUrl,
-            },
-            create: {
-              id: c.id,
-              name: c.name,
-              biodata: c.biodata,
-              riwayat: c.riwayat,
-              pengalaman: c.pengalaman,
-              unggulan: c.unggulan,
-              imageUrl: finalImageUrl,
-            },
-          })
-        }
-      
-        console.log("✅ profilePPID seeded from JSON with image copying")
+  
+    for (const c of profilePPID) {
+      let finalImageUrl = c.imageUrl
+  
+      if (c.imageUrl.startsWith("/uploads/seeded-images/")) {
+        const filename = path.basename(c.imageUrl)
+        const seedImagePath = path.resolve("prisma", "seed-images", filename)
+  
+        const targetFilename = `${uuid()}_${filename}`
+        const targetPath = path.join(targetDir, targetFilename)
+  
+        const buffer = fs.readFileSync(seedImagePath)
+        await writeFile(targetPath, buffer)
+  
+        finalImageUrl = `/uploads/seeded-images/profile-ppid/${targetFilename}`
       }
-      
-      await seedProfilePPID()
-
-    
-    for (const v of visiMisiPPID) {
-        await prisma.visiMisiPPID.upsert({
-            where: {
-                id: v.id,
-            },
-            update: {
-                misi: v.misi,
-                visi: v.visi
-            },
-            create: {
-                id: v.id,
-                misi: v.misi,
-                visi: v.visi
-            }
-        })
+  
+      await prisma.profilePPID.upsert({
+        where: { id: c.id },
+        update: {
+          name: c.name,
+          biodata: c.biodata,
+          riwayat: c.riwayat,
+          pengalaman: c.pengalaman,
+          unggulan: c.unggulan,
+          imageUrl: finalImageUrl,
+        },
+        create: {
+          id: c.id,
+          name: c.name,
+          biodata: c.biodata,
+          riwayat: c.riwayat,
+          pengalaman: c.pengalaman,
+          unggulan: c.unggulan,
+          imageUrl: finalImageUrl,
+        },
+      })
     }
-    console.log("visi misi PPID success ...")
+  
+    console.log("✅ profilePPID seeded from JSON with image copying")
+  }
+  
+  await seedProfilePPID()
 
-    for (const v of dasarHukumPPID) {
-        await prisma.dasarHukumPPID.upsert({
-            where: {
-                id: v.id,
-            },
-            update: {
-                judul: v.judul,
-                content: v.content
-            },
-            create: {
-                id: v.id,
-                judul: v.judul,
-                content: v.content
-            }
-        })
-    }
-    console.log("dasar hukum PPID success ...")
+  for (const v of visiMisiPPID) {
+    await prisma.visiMisiPPID.upsert({
+      where: {
+        id: v.id,
+      },
+      update: {
+        misi: v.misi,
+        visi: v.visi,
+      },
+      create: {
+        id: v.id,
+        misi: v.misi,
+        visi: v.visi,
+      },
+    });
+  }
+  console.log("visi misi PPID success ...");
 
-    for (const v of profileDesa) {
-        await prisma.profileDesa.upsert({
-            where: {
-                id: v.id,
-            },
-            update: {
-                sejarah: v.sejarah,
-                visi: v.visi,
-                misi: v.misi,
-                lambang: v.lambang,
-                maskot: v.maskot,
-                profilPerbekelId: v.profilPerbekelId
-            },
-            create: {
-                id: v.id,
-                sejarah: v.sejarah,
-                visi: v.visi,
-                misi: v.misi,
-                lambang: v.lambang,
-                maskot: v.maskot,
-                profilPerbekelId: v.profilPerbekelId
-            }
-        })
-    }
-    console.log("profile desa success ...")
+  for (const v of dasarHukumPPID) {
+    await prisma.dasarHukumPPID.upsert({
+      where: {
+        id: v.id,
+      },
+      update: {
+        judul: v.judul,
+        content: v.content,
+      },
+      create: {
+        id: v.id,
+        judul: v.judul,
+        content: v.content,
+      },
+    });
+  }
+  console.log("dasar hukum PPID success ...");
 
-    for (const v of profilePerbekel) {
-        await prisma.profilPerbekel.upsert({
-            where: {
-                id: v.id,
-            },
-            update: {
-                biodata: v.biodata,
-                pengalaman: v.pengalaman,
-                pengalamanOrganisasi: v.pengalamanOrganisasi,
-                programUnggulan: v.programUnggulan
-            },
-            create: {
-                id: v.id,
-                biodata: v.biodata,
-                pengalaman: v.pengalaman,
-                pengalamanOrganisasi: v.pengalamanOrganisasi,
-                programUnggulan: v.programUnggulan
-            }
-        })
-    }
-    console.log("profile perbekel success ...")
+  for (const v of profileDesa) {
+    await prisma.profileDesa.upsert({
+      where: {
+        id: v.id,
+      },
+      update: {
+        sejarah: v.sejarah,
+        visi: v.visi,
+        misi: v.misi,
+        lambang: v.lambang,
+        maskot: v.maskot,
+        profilPerbekelId: v.profilPerbekelId,
+      },
+      create: {
+        id: v.id,
+        sejarah: v.sejarah,
+        visi: v.visi,
+        misi: v.misi,
+        lambang: v.lambang,
+        maskot: v.maskot,
+        profilPerbekelId: v.profilPerbekelId,
+      },
+    });
+  }
+  console.log("profile desa success ...");
 
-})().then(() => prisma.$disconnect()).catch((e) => {
-    console.error(e)
-    prisma.$disconnect()
+  for (const v of profilePerbekel) {
+    await prisma.profilPerbekel.upsert({
+      where: {
+        id: v.id,
+      },
+      update: {
+        biodata: v.biodata,
+        pengalaman: v.pengalaman,
+        pengalamanOrganisasi: v.pengalamanOrganisasi,
+        programUnggulan: v.programUnggulan,
+      },
+      create: {
+        id: v.id,
+        biodata: v.biodata,
+        pengalaman: v.pengalaman,
+        pengalamanOrganisasi: v.pengalamanOrganisasi,
+        programUnggulan: v.programUnggulan,
+      },
+    });
+  }
+  console.log("profile perbekel success ...");
+})()
+  .then(() => prisma.$disconnect())
+  .catch((e) => {
+    console.error(e);
+    prisma.$disconnect();
+  });
+
+process.on("exit", () => {
+  prisma.$disconnect();
 });
 
-process.on('exit', () => {
-    prisma.$disconnect()
-})
-
-process.on('SIGINT', () => {
-    prisma.$disconnect()
-    process.exit(0)
-})
+process.on("SIGINT", () => {
+  prisma.$disconnect();
+  process.exit(0);
+});

src/app/admin/(dashboard)/_state/desa/berita.ts

@@ -8,16 +8,16 @@ import { z } from "zod";
 const templateForm = z.object({
   judul: z.string().min(3, "Judul minimal 3 karakter"),
   deskripsi: z.string().min(3, "Deskripsi minimal 3 karakter"),
-  image: z.string().url().min(3, "Image minimal 3 karakter"),
   content: z.string().min(3, "Content minimal 3 karakter"),
-  katagoryBeritaId: z.string().nonempty(),
+  kategoriBeritaId: z.string().nonempty(),
+  imageId: z.string().nonempty(),
 });
 
 const category = proxy({
   findMany: {
     data: null as
       | null
-      | Prisma.KatagoryBeritaGetPayload<{ omit: { isActive: true } }>[],
+      | Prisma.KategoriBeritaGetPayload<{ omit: { isActive: true } }>[],
     async load() {
       const res = await ApiFetch.api.desa.berita.category["find-many"].get();
       if (res.status === 200) {
@@ -31,9 +31,9 @@ type BeritaForm = Prisma.BeritaGetPayload<{
   select: {
     judul: true;
     deskripsi: true;
-    image: true;
+    imageId: true;
     content: true;
-    katagoryBeritaId: true;
+    kategoriBeritaId: true;
   };
 }>;
 
@@ -42,8 +42,6 @@ const berita = proxy({
     form: {} as BeritaForm,
     loading: false,
     async create() {
-      berita.create.form.image =
-        "https://www.shutterstock.com/image-vector/lower-news-live-streaming-breaking-600nw-2535984111.jpg";
       const cek = templateForm.safeParse(berita.create.form);
       if (!cek.success) {
         const err = `[${cek.error.issues
@@ -71,7 +69,12 @@ const berita = proxy({
   },
   findMany: {
     data: null as
-      | Prisma.BeritaGetPayload<{ omit: { isActive: true } }>[]
+      | Prisma.BeritaGetPayload<{ 
+        include: {
+          image: true,
+          kategoriBerita: true
+        }
+      }>[]
       | null,
     async load() {
       const res = await ApiFetch.api.desa.berita["find-many"].get();

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

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 'use client'
 import { RichTextEditor, Link } from '@mantine/tiptap';
 import { useEditor } from '@tiptap/react';
@@ -8,28 +9,38 @@ import TextAlign from '@tiptap/extension-text-align';
 import Superscript from '@tiptap/extension-superscript';
 import SubScript from '@tiptap/extension-subscript';
 import { Button, Stack } from '@mantine/core';
+import { useEffect } from 'react';
 
-const content =
-  '<h2 style="text-align: center;">Welcome to Mantine rich text editor</h2><p><code>RichTextEditor</code> component focuses on usability and is designed to be as simple as possible to bring a familiar editing experience to regular users. <code>RichTextEditor</code> is based on <a href="https://tiptap.dev/" rel="noopener noreferrer" target="_blank">Tiptap.dev</a> and supports all of its features:</p><ul><li>General text formatting: <strong>bold</strong>, <em>italic</em>, <u>underline</u>, <s>strike-through</s> </li><li>Headings (h1-h6)</li><li>Sub and super scripts (<sup>&lt;sup /&gt;</sup> and <sub>&lt;sub /&gt;</sub> tags)</li><li>Ordered and bullet lists</li><li>Text align&nbsp;</li><li>And all <a href="https://tiptap.dev/extensions" target="_blank" rel="noopener noreferrer">other extensions</a></li></ul>';
+// const content =
+//   '<h2 style="text-align: center;">Welcome to Mantine rich text editor</h2><p><code>RichTextEditor</code> component focuses on usability and is designed to be as simple as possible to bring a familiar editing experience to regular users. <code>RichTextEditor</code> is based on <a href="https://tiptap.dev/" rel="noopener noreferrer" target="_blank">Tiptap.dev</a> and supports all of its features:</p><ul><li>General text formatting: <strong>bold</strong>, <em>italic</em>, <u>underline</u>, <s>strike-through</s> </li><li>Headings (h1-h6)</li><li>Sub and super scripts (<sup>&lt;sup /&gt;</sup> and <sub>&lt;sub /&gt;</sub> tags)</li><li>Ordered and bullet lists</li><li>Text align&nbsp;</li><li>And all <a href="https://tiptap.dev/extensions" target="_blank" rel="noopener noreferrer">other extensions</a></li></ul>';
 
-export function BeritaEditor({ onSubmit }: { onSubmit: (val: string) => void }) {
-  const editor = useEditor({
-    extensions: [
-      StarterKit,
-      Underline,
-      Link,
-      Superscript,
-      SubScript,
-      Highlight,
-      TextAlign.configure({ types: ['heading', 'paragraph'] }),
-    ],
-    content,
-    immediatelyRender: false
-  });
-
-  if (!editor) {
-    return null;
-  }
+  export function BeritaEditor({
+    onEditorReady,
+    showSubmit = true,
+    onSubmit,
+  }: {
+    onEditorReady?: (editor: any | null) => void;
+    onSubmit?: (val: string) => void;
+    showSubmit?: boolean;
+  }) {
+    const editor = useEditor({
+      extensions: [
+        StarterKit,
+        Underline,
+        Link,
+        Superscript,
+        SubScript,
+        Highlight,
+        TextAlign.configure({ types: ['heading', 'paragraph'] }),
+      ],
+      content: '',
+    });
+  
+    useEffect(() => {
+      onEditorReady?.(editor);
+    }, [editor, onEditorReady] );
+  
+    if (!editor) return null;
 
 
   return (
@@ -82,10 +93,12 @@ export function BeritaEditor({ onSubmit }: { onSubmit: (val: string) => void })
 
         <RichTextEditor.Content />
       </RichTextEditor>
-      <Button onClick={() => {
-        if (!editor) return
-        onSubmit(editor?.getHTML())
-      }}>Submit</Button>
+      {showSubmit && (
+        <Button onClick={() => {
+          if (!editor) return
+          onSubmit?.(editor?.getHTML())
+        }}>Submit</Button>
+      )}
     </Stack>
   );
 }

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

@@ -1,5 +1,6 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 'use client'
-import { Box, Center, Group, Paper, Select, SimpleGrid, Skeleton, Stack, Text, TextInput, Title } from '@mantine/core';
+import { Box, Button, Center, FileInput, Group, Image, Paper, Select, SimpleGrid, Skeleton, Stack, Text, TextInput, Title } from '@mantine/core';
 import { useShallowEffect } from '@mantine/hooks';
 import { Prisma } from '@prisma/client';
 import { IconImageInPicture } from '@tabler/icons-react';
@@ -7,48 +8,232 @@ import { useProxy } from 'valtio/utils';
 import stateDashboardBerita from '../../_state/desa/berita';
 import { BeritaEditor } from './_com/BeritaEditor';
 import colors from '@/con/colors';
+import { useState } from 'react';
+import { toast } from 'react-toastify';
+import ApiFetch from '@/lib/api-fetch';
 
 function Page() {
   return (
     <Box>
       <Title order={3}>Berita</Title>
-      <SimpleGrid cols={{ base: 1, md: 2 }}>
-        <BeritaCreate />
-        <BeritaList />
-      </SimpleGrid>
+      <BeritaCreate />
+      <BeritaList />
     </Box>
   );
 }
 
+// function BeritaCreate() {
+//   const beritaState = useProxy(stateDashboardBerita);
+//   const [previewImage, setPreviewImage] = useState<string | null>(null);
+//   const [file, setFile] = useState<File | null>(null);
+//   const [editorInstance, setEditorInstance] = useState<any>(null);
+
+
+
+//   const handleSubmit = async () => {
+//     if (!file) {
+//       return toast.warn("Pilih file gambar terlebih dahulu");
+//     }
+//     if (!editorInstance) return toast.error("Editor belum siap");
+
+//     const htmlContent = editorInstance.getHTML();
+//     if (!htmlContent || htmlContent === '<p></p>') return toast.warn("Konten tidak boleh kosong");
+
+//     beritaState.berita.create.form.content = htmlContent;
+//     console.log(beritaState.berita.create.form)
+//     // Upload gambar dulu
+//     const res = await ApiFetch.api.fileStorage.create.post({
+//       file,
+//       name: file.name,
+//     });
+
+//     const uploaded = res.data?.data;
+//     if (!uploaded?.id) {
+//       return toast.error("Gagal upload gambar");
+//     }
+
+//     // Simpan ID gambar ke form
+//     beritaState.berita.create.form.imageId = uploaded.id;
+
+//     // Submit data berita
+//     await beritaState.berita.create.create();
+//   };
+
+//   return (
+//     <Box py={10}>
+//       <Paper bg={colors["white-1"]} p={"md"}>
+//         <Stack gap={"xs"}>
+//           <SelectCategory
+//             onChange={(val) => {
+//               beritaState.berita.create.form.kategoriBeritaId = val.id;
+//             }}
+//           />
+//           <TextInput
+//             onChange={(val) => {
+//               beritaState.berita.create.form.judul = val.target.value;
+//             }}
+//             label={"Judul"}
+//             placeholder="masukkan judul"
+//           />
+//           <TextInput
+//             onChange={(val) => {
+//               beritaState.berita.create.form.deskripsi = val.target.value;
+//             }}
+//             label={"Deskripsi"}
+//             placeholder="masukkan deskripsi"
+//           />
+
+//           <FileInput
+//             label="Upload Gambar"
+//             onChange={async (e) => {
+//               if (!e) return;
+//               setFile(e);
+//               const base64 = await e.arrayBuffer().then((buf) =>
+//                 "data:image/png;base64," + Buffer.from(buf).toString("base64")
+//               );
+//               setPreviewImage(base64);
+//             }}
+//           />
+//           {previewImage ? (
+//             <Image alt="" src={previewImage} w={200} h={200} />
+//           ) : (
+//             <Center w={200} h={200} bg={"gray"}>
+//               <IconImageInPicture />
+//             </Center>
+//           )}
+
+//           <BeritaEditor
+//             showSubmit={false}
+//             onEditorReady={(ed) => setEditorInstance(ed)}
+//           />
+
+
+//           <Button onClick={handleSubmit}>Simpan Berita</Button>
+//         </Stack>
+//       </Paper>
+//     </Box>
+//   );
+// }
+
 function BeritaCreate() {
-  const beritaState = useProxy(stateDashboardBerita)
+  const beritaState = useProxy(stateDashboardBerita);
+  const [previewImage, setPreviewImage] = useState<string | null>(null);
+  const [file, setFile] = useState<File | null>(null);
+  const [editorInstance, setEditorInstance] = useState<any>(null);
+
+  const resetForm = () => {
+    // Reset state di valtio
+    beritaState.berita.create.form = {
+      judul: "",
+      deskripsi: "",
+      kategoriBeritaId: "",
+      imageId: "",
+      content: "",
+    };
+
+    // Reset state lokal
+    setPreviewImage(null);
+    setFile(null);
+    if (editorInstance) {
+      editorInstance.commands.setContent(""); // Kosongkan editor
+    }
+  };
+
+  const handleSubmit = async () => {
+    if (!file) {
+      return toast.warn("Pilih file gambar terlebih dahulu");
+    }
+    if (!editorInstance) return toast.error("Editor belum siap");
+
+    const htmlContent = editorInstance.getHTML();
+    if (!htmlContent || htmlContent === "<p></p>") return toast.warn("Konten tidak boleh kosong");
+
+    beritaState.berita.create.form.content = htmlContent;
+
+    // Upload gambar dulu
+    const res = await ApiFetch.api.fileStorage.create.post({
+      file,
+      name: file.name,
+    });
+
+    const uploaded = res.data?.data;
+    if (!uploaded?.id) {
+      return toast.error("Gagal upload gambar");
+    }
+
+    // Simpan ID gambar ke form
+    beritaState.berita.create.form.imageId = uploaded.id;
+
+    // Submit data berita
+    await beritaState.berita.create.create();
+
+    toast.success("Berita berhasil disimpan!");
+
+    // Reset form setelah submit
+    resetForm();
+  };
+
   return (
     <Box py={10}>
-      <Paper bg={colors['white-1']} p={'md'}>
+      <Paper bg={colors["white-1"]} p={"md"} w={{base: "100%", md: "50%"}}>
         <Stack gap={"xs"}>
-          <SelectCategory onChange={(val) => {
-            beritaState.berita.create.form.katagoryBeritaId = val.id
-          }} />
-          <TextInput onChange={(val) => {
-            beritaState.berita.create.form.judul = val.target.value
-          }} label={"Judul"} placeholder='masukkan judul' />
-          <TextInput onChange={(val) => {
-            beritaState.berita.create.form.deskripsi = val.target.value
-          }} label={"Deskripsi"} placeholder='masukkan deskripsi' />
-          <Center w={200} h={200} bg={"gray"}>
-            <IconImageInPicture />
-          </Center>
-          <BeritaEditor onSubmit={(val) => {
+          <SelectCategory
+            onChange={(val) => {
+              beritaState.berita.create.form.kategoriBeritaId = val.id;
+            }}
+          />
+          <TextInput
+            value={beritaState.berita.create.form.judul}
+            onChange={(val) => {
+              beritaState.berita.create.form.judul = val.target.value;
+            }}
+            label={"Judul"}
+            placeholder="masukkan judul"
+          />
+          <TextInput
+            value={beritaState.berita.create.form.deskripsi}
+            onChange={(val) => {
+              beritaState.berita.create.form.deskripsi = val.target.value;
+            }}
+            label={"Deskripsi"}
+            placeholder="masukkan deskripsi"
+          />
 
-            beritaState.berita.create.form.content = val
-            beritaState.berita.create.create()
-          }} />
+          <FileInput
+            label="Upload Gambar"
+            value={file}
+            onChange={async (e) => {
+              if (!e) return;
+              setFile(e);
+              const base64 = await e.arrayBuffer().then((buf) =>
+                "data:image/png;base64," + Buffer.from(buf).toString("base64")
+              );
+              setPreviewImage(base64);
+            }}
+          />
+          {previewImage ? (
+            <Image alt="" src={previewImage} w={200} h={200} />
+          ) : (
+            <Center w={200} h={200} bg={"gray"}>
+              <IconImageInPicture />
+            </Center>
+          )}
+
+          <BeritaEditor
+            showSubmit={false}
+            onEditorReady={(ed) => setEditorInstance(ed)}
+          />
+
+          <Button onClick={handleSubmit}>Simpan Berita</Button>
         </Stack>
       </Paper>
     </Box>
-  )
+  );
 }
 
+
+
+
 function BeritaList() {
   const beritaState = useProxy(stateDashboardBerita)
   useShallowEffect(() => {
@@ -63,9 +248,30 @@ function BeritaList() {
       <Paper bg={colors['white-1']} p={'md'}>
         <Stack>
           <Text fz={"xl"} fw={"bold"}>List Berita</Text>
+          <SimpleGrid cols={{ base: 1, md: 4 }}>
           {beritaState.berita.findMany.data?.map((item) => (
-            <Text key={item.id}>{item.judul}</Text>
+            <Paper key={item.id} bg={colors['BG-trans']} p={'md'}>
+            <Box >
+              <Text fw={"bold"} fz={"sm"}>
+                Kategori
+              </Text>
+              <Text>{item.kategoriBerita?.name}</Text>
+              <Text fw={"bold"} fz={"sm"}>
+                Judul
+              </Text>
+              <Text>{item.judul}</Text>
+              <Text lineClamp={1} fw={"bold"} fz={"sm"}>
+                Deskripsi
+              </Text>
+              <Text size='sm' lineClamp={2}>{item.deskripsi}</Text>
+              <Text fw={"bold"} fz={"sm"}>
+                Gambar
+              </Text>
+              <Image w={200} src={item.image?.link} alt="gambar" />
+            </Box>
+            </Paper>
           ))}
+          </SimpleGrid>
         </Stack>
       </Paper>
     </Box>
@@ -73,7 +279,7 @@ function BeritaList() {
 }
 
 function SelectCategory({ onChange }: {
-  onChange: (value: Prisma.KatagoryBeritaGetPayload<{
+  onChange: (value: Prisma.KategoriBeritaGetPayload<{
     select: {
       name: true,
       id: true
@@ -87,7 +293,7 @@ function SelectCategory({ onChange }: {
 
   if (!beritaState.category.findMany.data) return <Skeleton h={40} />
   return <Group>
-    <Select placeholder='pilih katagori' label={<Text fz={"sm"} fw={"bold"}>Pilih Kategori</Text>} data={beritaState.category.findMany.data.map((item) => ({
+    <Select placeholder='pilih kategori' label={<Text fz={"sm"} fw={"bold"}>Pilih Kategori</Text>} data={beritaState.category.findMany.data.map((item) => ({
       value: item.id,
       label: item.name
     }))} onChange={(v) => {

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

@@ -1,11 +1,31 @@
-import React from 'react';
+import colors from "@/con/colors";
+import { Box, Stack, Tabs, TabsList, TabsPanel, TabsTab, Title } from "@mantine/core";
+import PengangguranBerdasarkanUsia from "./ui/pengangguranBerdasarkanUsia/page";
+import PengangguranBerdasarkanPendidikan from "./ui/pengangguranBerdasarkanPendidikan/page";
 
-function Page() {
+export default function Page() {
   return (
-    <div>
-      jumlah-penduduk-usia-kerja-yang-menganggur
-    </div>
-  );
-}
+    <Box>
+      <Stack gap={"xs"}>
+        <Title order={3}>Jumlah Penduduk Usia Kerja yang Menganggur</Title>
+        <Tabs color={colors['blue-button']} variant='pills' defaultValue={"Pengangguran Bredasarkan Usia"}>
+          <TabsList p={"xs"} bg={"#BBC8E7FF"}>
+            <TabsTab value={"Pengangguran Bredasarkan Usia"}>
+              Pengangguran Bredasarkan Usia
+            </TabsTab>
+            <TabsTab value={"Pengangguran Bredasarkan Pendidikan"}>
+              Pengangguran Bredasarkan Pendidikan
+            </TabsTab>
+          </TabsList>
 
-export default Page;
+          <TabsPanel value={"Pengangguran Bredasarkan Usia"}>
+            <PengangguranBerdasarkanUsia />
+          </TabsPanel>
+          <TabsPanel value={"Pengangguran Bredasarkan Pendidikan"}>
+            <PengangguranBerdasarkanPendidikan/>
+          </TabsPanel>
+        </Tabs>
+      </Stack>
+    </Box>
+  );
+}

src/app/admin/(dashboard)/ekonomi/jumlah-penduduk-usia-kerja-yang-menganggur/ui/pengangguranBerdasarkanPendidikan/page.tsx

@@ -0,0 +1,47 @@
+import colors from '@/con/colors';
+import { Box, Button, Group, Paper, Stack, Text, TextInput, Title } from '@mantine/core';
+import React from 'react';
+
+function PengangguranBerdasarkanPendidikan() {
+  return (
+    <Box>
+      <Box py={15}>
+      <Paper w={{ base: '100%', md: '50%' }} bg={colors['white-1']} p={'md'} radius={10}>
+        <Stack gap={"xs"}>
+          <Title order={3}>Pengangguran Berdasarkan Pendidikan</Title>
+          <TextInput
+            label={<Text fz={"sm"} fw={"bold"}>Pendidikan SD</Text>}
+            placeholder="masukkan jumlah penduduk Pendidikan SD yang menganggur"
+          />
+          <TextInput
+            label={<Text fz={"sm"} fw={"bold"}>Pendidikan SMP</Text>}
+            placeholder="masukkan jumlah penduduk Pendidikan SMP yang menganggur"
+          />
+          <TextInput
+            label={<Text fz={"sm"} fw={"bold"}>Pendidikan SMA / SMK</Text>}
+            placeholder="masukkan jumlah penduduk Pendidikan SMA / SMK yang menganggur"
+          />
+          <TextInput
+            label={<Text fz={"sm"} fw={"bold"}>Pendidikan D1-D3 / S1</Text>}
+            placeholder="masukkan jumlah penduduk Pendidikan D1-D3 yang menganggur"
+          />
+          <Group>
+            <Button mt={10} bg={colors['blue-button']}>
+              Submit
+            </Button>
+          </Group>
+        </Stack>
+      </Paper>
+      </Box>
+      <Box>
+        <Paper bg={colors['white-1']} w={{ base: '100%', md: '50%' }} p={'md'}>
+          <Stack>
+            <Title pb={10} order={3}>Grafik Pengangguran Berdasarkan Pendidikan</Title>
+          </Stack>
+        </Paper>
+      </Box>
+    </Box>
+  );
+}
+
+export default PengangguranBerdasarkanPendidikan;

src/app/admin/(dashboard)/ekonomi/jumlah-penduduk-usia-kerja-yang-menganggur/ui/pengangguranBerdasarkanUsia/page.tsx

@@ -0,0 +1,47 @@
+import colors from '@/con/colors';
+import { Box, Button, Group, Paper, Stack, Text, TextInput, Title } from '@mantine/core';
+import React from 'react';
+
+function PengangguranBerdasarkanUsia() {
+  return (
+    <Box>
+      <Box py={15}>
+      <Paper w={{ base: '100%', md: '50%' }} bg={colors['white-1']} p={'md'} radius={10}>
+        <Stack gap={"xs"}>
+          <Title order={3}>Pengangguran Berdasarkan Usia</Title>
+          <TextInput
+            label={<Text fz={"sm"} fw={"bold"}>Usia 18 - 25 tahun</Text>}
+            placeholder="masukkan jumlah penduduk usia 18 - 25 tahun yang menganggur"
+          />
+          <TextInput
+            label={<Text fz={"sm"} fw={"bold"}>Usia 26 - 35 tahun</Text>}
+            placeholder="masukkan jumlah penduduk usia 26 - 35 tahun yang menganggur"
+          />
+          <TextInput
+            label={<Text fz={"sm"} fw={"bold"}>Usia 36 - 45 tahun</Text>}
+            placeholder="masukkan jumlah penduduk usia 36 - 45 tahun yang menganggur"
+          />
+          <TextInput
+            label={<Text fz={"sm"} fw={"bold"}>Usia 46+</Text>}
+            placeholder="masukkan jumlah penduduk usia 46+ yang menganggur"
+          />
+          <Group>
+            <Button mt={10} bg={colors['blue-button']}>
+              Submit
+            </Button>
+          </Group>
+        </Stack>
+      </Paper>
+      </Box>
+      <Box>
+        <Paper bg={colors['white-1']} w={{ base: '100%', md: '50%' }} p={'md'}>
+          <Stack>
+            <Title pb={10} order={3}>Grafik Pengangguran Berdasarkan Usia</Title>
+          </Stack>
+        </Paper>
+      </Box>
+    </Box>
+  );
+}
+
+export default PengangguranBerdasarkanUsia;

src/app/admin/(dashboard)/ekonomi/lowongan-kerja-lokal/create/createLowongan.tsx

@@ -0,0 +1,29 @@
+import { Box, Stack, Text, TextInput, Title } from '@mantine/core';
+
+function CreateLowongan() {
+  return (
+    <Box>
+      <Stack gap={"xs"}>
+        <Title order={4}>Lowongan Kerja Lokal</Title>
+        <TextInput
+          label={<Text fz={"sm"} fw={"bold"}>Bekerja Sebagai</Text>}
+          placeholder="masukkan bekerja sebagai"
+        />
+        <TextInput
+          label={<Text fz={"sm"} fw={"bold"}>Alamat Usaha</Text>}
+          placeholder="masukkan alamat usaha"
+        />
+         <TextInput
+          label={<Text fz={"sm"} fw={"bold"}>Waktu Kerja</Text>}
+          placeholder="masukkan waktu kerja"
+        />
+        <TextInput
+          label={<Text fz={"sm"} fw={"bold"}>Gaji selama 1 bulan</Text>}
+          placeholder="masukkan gaji selama 1 bulan"
+        />
+      </Stack>
+    </Box>
+  );
+}
+
+export default CreateLowongan;

src/app/admin/(dashboard)/ekonomi/lowongan-kerja-lokal/listData/page.tsx

@@ -0,0 +1,25 @@
+import colors from '@/con/colors';
+import { Box, Paper, Stack, Title, Text } from '@mantine/core';
+import React from 'react';
+
+function ListDataLowongan() {
+  return (
+    <Paper bg={colors['white-1']} p={'md'} radius={10}>
+      <Stack gap={"xs"}>
+        <Title order={3}>List Data Lowongan Kerja Lokal</Title>
+        <Box>
+          <Text fw={"bold"}>Bekerja Sebagai</Text>
+          <Text> </Text>
+          <Text fw={"bold"}>Alamat Usaha</Text>
+          <Text> </Text>
+          <Text fw={"bold"}>Waktu Kerja</Text>
+          <Text> </Text>
+          <Text fw={"bold"}>Gaji selama 1 bulan</Text>
+          <Text> </Text>
+        </Box>
+      </Stack>
+    </Paper>
+  );
+}
+
+export default ListDataLowongan;

src/app/admin/(dashboard)/ekonomi/lowongan-kerja-lokal/page.tsx

@@ -1,10 +1,31 @@
+import colors from '@/con/colors';
+import { Box, Button, Group, Paper, SimpleGrid, Stack, Title } from '@mantine/core';
 import React from 'react';
+import CreateLowongan from './create/createLowongan';
+import ListDataLowongan from './listData/page';
 
 function Page() {
   return (
-    <div>
-     lowongan-kerja-lokal
-    </div>
+    <Stack gap={"xs"}>
+      <SimpleGrid cols={{ base: 1, md: 2 }}>
+        <Box>
+          <Paper bg={colors['white-1']} p={'md'} radius={10}>
+            <Title order={3}>Lowongan Kerja Lokal</Title>
+            <CreateLowongan/>
+            <Group>
+              <Button mt={10} bg={colors['blue-button']}>
+                Submit
+              </Button>
+            </Group>
+          </Paper>
+        </Box>
+        <Box>
+          <Paper bg={colors['white-1']} p={'md'} radius={10}>
+            <ListDataLowongan/>
+          </Paper>
+        </Box>
+      </SimpleGrid>
+    </Stack>
   );
 }
 

src/app/admin/(dashboard)/ekonomi/pasar-desa/create/createPasarDesa.tsx

@@ -0,0 +1,36 @@
+import colors from '@/con/colors';
+import { Box, Stack, Text, TextInput, Title } from '@mantine/core';
+import { IconImageInPicture } from '@tabler/icons-react';
+import React from 'react';
+
+function CreatePasarDesa() {
+  return (
+    <Box>
+      <Stack gap={"xs"}>
+        <Title order={4}>Produk Pasar Desa</Title>
+        <Box>
+          <Text fz={"sm"} fw={"bold"}>Masukkan Foto Produk</Text>
+          <IconImageInPicture size={24} color={colors['blue-button']} />
+        </Box>
+        <TextInput
+          label={<Text fz={"sm"} fw={"bold"}>Nama Produk</Text>}
+          placeholder="masukkan nama produk"
+        />
+        <TextInput
+          label={<Text fz={"sm"} fw={"bold"}>Harga Produk</Text>}
+          placeholder="masukkan harga produk"
+        />
+         <TextInput
+          label={<Text fz={"sm"} fw={"bold"}>Rating Produk</Text>}
+          placeholder="masukkan rating produk"
+        />
+         <TextInput
+          label={<Text fz={"sm"} fw={"bold"}>Alamat Usaha</Text>}
+          placeholder="masukkan alamat usaha"
+        />
+      </Stack>
+    </Box>
+  );
+}
+
+export default CreatePasarDesa;

src/app/admin/(dashboard)/ekonomi/pasar-desa/listData/page.tsx

@@ -0,0 +1,32 @@
+import colors from '@/con/colors';
+import { Box, Paper, Stack, Text, Title } from '@mantine/core';
+import { IconImageInPicture } from '@tabler/icons-react';
+import React from 'react';
+
+function ListDataUsaha() {
+  return (
+    <Box>
+      <Stack gap={"xs"}>
+        <Paper bg={colors['white-1']} p={'md'} radius={10}>
+          <Box>
+            <Title mb={10} order={4}>List Produk Pasar Desa</Title>
+            <Box>
+              <Text fz={"sm"} fw={"bold"}>Foto Produk</Text>
+              <IconImageInPicture size={24} color={colors['blue-button']} />
+            </Box>
+            <Text fz={"sm"} fw={"bold"}>Nama Produk</Text> 
+            <Text></Text>
+            <Text fz={"sm"} fw={"bold"}>Harga Produk</Text>
+            <Text></Text>
+            <Text fz={"sm"} fw={"bold"}>Rating Produk</Text>
+            <Text></Text>
+            <Text fz={"sm"} fw={"bold"}>Alamat Usaha</Text>
+            <Text></Text>
+          </Box>
+        </Paper>
+      </Stack>
+    </Box>
+  );
+}
+
+export default ListDataUsaha;

src/app/admin/(dashboard)/ekonomi/pasar-desa/page.tsx

@@ -1,10 +1,30 @@
+import colors from '@/con/colors';
+import { Box, Button, Group, Paper, Stack, Title } from '@mantine/core';
 import React from 'react';
+import CreatePasarDesa from './create/createPasarDesa';
+import ListDataUsaha from './listData/page';
 
 function Page() {
   return (
-    <div>
-      pasar-desa
-    </div>
+    <Stack gap={'xs'}>
+      <Box>
+        <Paper w={{ base: '100%', md: '50%' }} bg={colors['white-1']} p={'md'} radius={10}>
+          <Stack gap={'xs'}>
+            <Title order={3}>Pasar Desa</Title>
+            <CreatePasarDesa />
+            <Group>
+              <Button
+                mt={10}
+                bg={colors['blue-button']}
+              >
+                Submit
+              </Button>
+            </Group>
+          </Stack>
+        </Paper>
+      </Box>
+      <ListDataUsaha />
+    </Stack>
   );
 }
 

src/app/admin/(dashboard)/keamanan/kontak-darurat/create/createKontak.tsx

@@ -0,0 +1,28 @@
+import colors from '@/con/colors';
+import { Box, Stack, Text, TextInput } from '@mantine/core';
+import { IconImageInPicture } from '@tabler/icons-react';
+
+function CreateKontakDarurat() {
+  return (
+    <Box>
+     <Stack gap={"xs"}>
+      <TextInput 
+      label={<Text fz={"sm"} fw={"bold"}>Judul Kontak Darurat</Text>}
+      placeholder="masukkan judul kontak darurat"
+      />
+      <IconImageInPicture size={24} color={colors['blue-button']} />
+      <TextInput 
+      label={<Text fz={"sm"} fw={"bold"}>Nama Kontak Darurat</Text>}
+      placeholder="masukkan nama kontak darurat"
+      />
+      <IconImageInPicture size={24} color={colors['blue-button']} />
+      <TextInput 
+      label={<Text fz={"sm"} fw={"bold"}>Nomor Kontak Darurat</Text>}
+      placeholder="masukkan nomor kontak darurat"
+      />
+     </Stack>
+    </Box>
+  );
+}
+
+export default CreateKontakDarurat;

src/app/admin/(dashboard)/keamanan/kontak-darurat/listData/page.tsx

@@ -0,0 +1,23 @@
+import colors from '@/con/colors';
+import { Box, Paper, Stack, Text, Title } from '@mantine/core';
+import React from 'react';
+
+function ListDataKontakDarurat() {
+  return (
+    <Paper bg={colors['white-1']} p={'md'} radius={10}>
+      <Stack gap={"xs"}>
+        <Title order={3}>List Data Kontak Darurat</Title>
+        <Box>
+          <Text fw={"bold"}>Judul Kontak Darurat</Text>
+          <Text> </Text>
+          <Text fw={"bold"}>Nama Kontak Darurat</Text>
+          <Text> </Text>
+          <Text fw={"bold"}>Nomor Kontak Darurat</Text>
+          <Text> </Text>
+        </Box>
+      </Stack>
+    </Paper>
+  );
+}
+
+export default ListDataKontakDarurat;

src/app/admin/(dashboard)/keamanan/kontak-darurat/page.tsx

@@ -1,10 +1,30 @@
+import colors from '@/con/colors';
+import { Box, Button, Group, Paper, SimpleGrid, Stack, Title } from '@mantine/core';
 import React from 'react';
+import CreateKontakDarurat from './create/createKontak';
+import ListDataKontakDarurat from './listData/page';
 
 function Page() {
   return (
-    <div>
-      kontak-darurat
-    </div>
+    <Stack gap={"xs"}>
+      <SimpleGrid cols={{ base: 1, md: 2 }}>
+        <Box>
+          <Paper bg={colors['white-1']} p={'md'} radius={10}>
+            <Title order={3}>Kontak Darurat</Title>
+          <CreateKontakDarurat/>
+          <Group>
+            <Button
+              mt={10}
+              bg={colors['blue-button']}
+            >
+              Submit
+            </Button>
+          </Group>
+          </Paper>
+        </Box>
+        <ListDataKontakDarurat/>
+      </SimpleGrid>
+    </Stack>
   );
 }
 

src/app/admin/(dashboard)/keamanan/laporan-publik/create/createLaporan.tsx

@@ -0,0 +1,27 @@
+import { Box, Stack, Text, TextInput } from '@mantine/core';
+import React from 'react';
+import { KeamananEditor } from '../../_com/keamananEditor';
+
+
+function CreateLaporanPublik() {
+  return (
+    <Box>
+      <Stack gap={"xs"}>
+        <TextInput
+          label={<Text fz={"sm"} fw={"bold"}>Judul Laporan Publik</Text>}
+          placeholder="masukkan judul laporan publik"
+        />
+        <TextInput
+          label={<Text fz={"sm"} fw={"bold"}>Tanggal Laporan Publik</Text>}
+          placeholder="masukkan tanggal laporan publik"
+        />
+        <Box>
+          <Text fz={"sm"} fw={"bold"}>Deskripsi Laporan Publik</Text>
+          <KeamananEditor showSubmit={false} />
+        </Box>
+      </Stack>
+    </Box>
+  );
+}
+
+export default CreateLaporanPublik;

src/app/admin/(dashboard)/keamanan/laporan-publik/listData/page.tsx

@@ -0,0 +1,23 @@
+import React from 'react';
+import { Box, Paper, Stack, Text, Title } from '@mantine/core';
+import colors from '@/con/colors';
+
+function ListDataLaporanPublik() {
+  return (
+    <Paper bg={colors['white-1']} p={'md'} radius={10}>
+      <Stack gap={"xs"}>
+        <Title order={3}>List Data Laporan Publik</Title>
+        <Box>
+          <Text fw={"bold"}>Judul Laporan Publik</Text>
+          <Text></Text>
+          <Text fw={"bold"}>Tanggal Laporan Publik</Text>
+          <Text></Text>
+          <Text fw={"bold"}>Deskripsi Laporan Publik</Text>
+          <Text></Text>
+        </Box>
+      </Stack>
+    </Paper>
+  );
+}
+
+export default ListDataLaporanPublik;

src/app/admin/(dashboard)/keamanan/laporan-publik/page.tsx

@@ -1,11 +1,28 @@
-import React from 'react';
+import colors from "@/con/colors";
+import { Box, Button, Group, Paper, SimpleGrid, Stack, Title } from "@mantine/core";
+import CreateLaporanPublik from "./create/createLaporan";
+import ListDataLaporanPublik from "./listData/page";
 
-function Page() {
+export default function Page() {
   return (
-    <div>
-     laporan-publik
-    </div>
-  );
-}
-
-export default Page;
+    <Stack gap={"xs"}>
+      <SimpleGrid cols={{ base: 1, md: 2 }}>  
+        <Box>
+          <Paper bg={colors['white-1']} p={'md'} radius={10}>
+            <Title order={3}>Laporan Publik</Title>
+            <CreateLaporanPublik/>
+            <Group>
+              <Button
+              mt={10}
+              bg={colors['blue-button']}
+              >
+                Submit
+              </Button>
+            </Group>
+          </Paper>
+        </Box>
+        <ListDataLaporanPublik/>
+      </SimpleGrid>
+    </Stack>
+  )
+}

src/app/admin/(dashboard)/keamanan/pencegahan-kriminalitas/create/createPencegahan.tsx

@@ -0,0 +1,25 @@
+import colors from '@/con/colors';
+import { Box, Stack, Text, TextInput } from '@mantine/core';
+import { IconImageInPicture } from '@tabler/icons-react';
+import React from 'react';
+
+function CreatePencegahan() {
+  return (
+    <Box>
+      <Stack gap={"xs"}>
+        <TextInput
+          label={<Text fz={"sm"} fw={"bold"}>Judul Pencegahan Kriminalitas</Text>}
+          placeholder="masukkan judul pencegahan kriminalitas"
+        />
+        <TextInput
+          label={<Text fz={"sm"} fw={"bold"}>Deskripsi Pencegahan Kriminalitas</Text>}
+          placeholder="masukkan deskripsi pencegahan kriminalitas"
+        />
+        <Text fw={"bold"} fz={"sm"} >Gambar Pencegahan Kriminalitas</Text>
+        <IconImageInPicture size={24} color={colors['blue-button']} />
+      </Stack>
+    </Box>
+  );
+}
+
+export default CreatePencegahan;

src/app/admin/(dashboard)/keamanan/pencegahan-kriminalitas/listData/page.tsx

@@ -0,0 +1,23 @@
+import colors from '@/con/colors';
+import { Box, Paper, Stack, Text, Title } from '@mantine/core';
+import React from 'react';
+
+function ListDataPencegahan() {
+  return (
+    <Paper bg={colors['white-1']} p={'md'} radius={10}>
+      <Stack gap={"xs"}>
+        <Title order={3}>List Data Pencegahan Kriminalitas</Title>
+        <Box>
+          <Text fw={"bold"}>Judul Pencegahan Kriminalitas</Text>
+          <Text> </Text>
+          <Text fw={"bold"}>Deskripsi Pencegahan Kriminalitas</Text>
+          <Text> </Text>
+          <Text fw={"bold"}>Gambar Pencegahan Kriminalitas</Text>
+          <Text> </Text>
+        </Box>
+      </Stack>
+    </Paper>
+  );
+}
+
+export default ListDataPencegahan;

src/app/admin/(dashboard)/keamanan/pencegahan-kriminalitas/page.tsx

@@ -1,10 +1,31 @@
+import colors from '@/con/colors';
+import { Stack, SimpleGrid, Box, Paper, Title, Group, Button } from '@mantine/core';
 import React from 'react';
+import CreatePencegahan from './create/createPencegahan';
+import ListDataPencegahan from './listData/page';
+
 
 function Page() {
   return (
-    <div>
-      pencegahan-kriminalitas
-    </div>
+    <Stack gap={"xs"}>
+    <SimpleGrid cols={{ base: 1, md: 2 }}>
+      <Box>
+        <Paper bg={colors['white-1']} p={'md'} radius={10}>
+          <Title order={3}>Kontak Darurat</Title>
+        <CreatePencegahan/>
+        <Group>
+          <Button
+            mt={10}
+            bg={colors['blue-button']}
+          >
+            Submit
+          </Button>
+        </Group>
+        </Paper>
+      </Box>
+      <ListDataPencegahan/>
+    </SimpleGrid>
+  </Stack>
   );
 }
 

src/app/admin/(dashboard)/keamanan/tips-keamanan/create/createTips.tsx

@@ -0,0 +1,27 @@
+import colors from '@/con/colors';
+import { Box, Stack, Text, TextInput } from '@mantine/core';
+import { IconImageInPicture } from '@tabler/icons-react';
+import React from 'react';
+import { KeamananEditor } from '../../_com/keamananEditor';
+
+function CreateTipsKeamanan() {
+  return (
+    <Box>
+      <Stack gap={"xs"}>
+        <TextInput
+          label={<Text fz={"sm"} fw={"bold"}>Judul Tips Keamanan</Text>}
+          placeholder="masukkan judul tips keamanan"
+        />
+        <Box>
+          <Text fz={"sm"} fw={"bold"}>Upload Gambar</Text>
+          <IconImageInPicture size={24} color={colors['blue-button']} />
+        </Box>
+        <KeamananEditor
+          showSubmit={false}
+        />
+      </Stack>
+    </Box>
+  );
+}
+
+export default CreateTipsKeamanan;

src/app/admin/(dashboard)/keamanan/tips-keamanan/listData/page.tsx

@@ -0,0 +1,24 @@
+import colors from '@/con/colors';
+import { Box, Paper, Stack, Text, Title } from '@mantine/core';
+import { IconImageInPicture } from '@tabler/icons-react';
+import React from 'react';
+
+function ListDataTipsKeamanan() {
+  return (
+    <Paper bg={colors['white-1']} p={'md'} radius={10}>
+      <Stack gap={"xs"}>
+        <Title order={3}>List Data Tips Keamanan</Title>
+        <Box>
+          <Text fw={"bold"}>Judul Tips Keamanan</Text>
+          <Text></Text>
+          <Text fw={"bold"}>Gambar Tips Keamanan</Text>
+          <IconImageInPicture size={24} color={colors['blue-button']} />
+          <Text fw={"bold"}>Deskripsi Tips Keamanan</Text>
+          <Text></Text>
+        </Box>
+      </Stack>
+    </Paper>
+  );
+}
+
+export default ListDataTipsKeamanan;

src/app/admin/(dashboard)/keamanan/tips-keamanan/page.tsx

@@ -1,11 +1,31 @@
+import colors from '@/con/colors';
+import { Box, Button, Group, Paper, SimpleGrid, Stack, Title } from '@mantine/core';
 import React from 'react';
+import CreateTipsKeamanan from './create/createTips';
+import ListDataTipsKeamanan from './listData/page';
 
 function Page() {
   return (
-    <div>
-      tips-keamanan
-    </div>
-  );
+    <Stack gap={"xs"}>
+      <SimpleGrid cols={{ base: 1, md: 2 }}>  
+        <Box>
+          <Paper bg={colors['white-1']} p={'md'} radius={10}>
+            <Title order={3}>Tips Keamanan</Title>
+            <CreateTipsKeamanan/>
+            <Group>
+              <Button
+              mt={10}
+              bg={colors['blue-button']}
+              >
+                Submit
+              </Button>
+            </Group>
+          </Paper>
+        </Box>
+        <ListDataTipsKeamanan/>
+      </SimpleGrid>
+    </Stack>
+  )
 }
 
 export default Page;

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

@@ -1,9 +1,9 @@
 import prisma from "@/lib/prisma";
 
- async function katagoryBeritaFindMany() {
-  const data = await prisma.katagoryBerita.findMany();
+ async function kategoriBeritaFindMany() {
+  const data = await prisma.kategoriBerita.findMany();
   return { data };
 }
 
-export default katagoryBeritaFindMany
+export default kategoriBeritaFindMany
 

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

@@ -6,13 +6,14 @@ type FormCreate = Prisma.BeritaGetPayload<{
   select: {
     judul: true;
     deskripsi: true;
-    image: true;
     content: true;
-    katagoryBeritaId: true;
+    kategoriBeritaId: true;
+    imageId: true;
   };
 }>;
 async function beritaCreate(context: Context) {
   const body = context.body as FormCreate;
+  console.log(body)
 
 //   console.log(body)
 
@@ -20,9 +21,9 @@ async function beritaCreate(context: Context) {
   data: {
       content: body.content,
       deskripsi: body.deskripsi,
-      image: body.image,
+      imageId: body.imageId,
       judul: body.judul,
-      katagoryBeritaId: body.katagoryBeritaId,
+      kategoriBeritaId: body.kategoriBeritaId,
     },
   });
 

src/app/api/[[...slugs]]/_lib/desa/berita/find-many.ts

@@ -1,8 +1,27 @@
 import prisma from "@/lib/prisma";
 
-export default async function beritaFindMany() {
-  const res = await prisma.berita.findMany();
-  return {
-    data: res,
-  };
+async function beritaFindMany() {
+  try {
+    const data = await prisma.berita.findMany({
+      where: { isActive: true },
+      include: {
+        image: true,
+        kategoriBerita: true,
+      },
+    });
+
+    return {
+      success: true,
+      message: "Success fetch berita",
+      data,
+    };
+  } catch (e) {
+    console.error("Find many error:", e);
+    return {
+      success: false,
+      message: "Failed fetch berita",
+    };
+  }
 }
+
+export default beritaFindMany;

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

@@ -1,18 +1,18 @@
 import Elysia, { t } from "elysia";
-import katagoryBeritaFindMany from "./category";
+import kategoriBeritaFindMany from "./category";
 import beritaFindMany from "./find-many";
 import beritaCreate from "./create";
 
 const Berita = new Elysia({ prefix: "/berita", tags: ["Desa/Berita"] })
-  .get("/category/find-many", katagoryBeritaFindMany)
+  .get("/category/find-many", kategoriBeritaFindMany)
   .get("/find-many", beritaFindMany)
   .post("/create", beritaCreate, {
     body: t.Object({
       judul: t.String(),
       deskripsi: t.String(),
-      image: t.String(),
+      imageId: t.String(),
       content: t.String(),
-      katagoryBeritaId: t.Union([t.String(), t.Null()]),
+      kategoriBeritaId: t.Union([t.String(), t.Null()]),
     }),
   });
 

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

@@ -2,6 +2,7 @@ import Elysia from "elysia";
 import Berita from "./berita";
 import Pengumuman from "./pengumuman";
 import ProfileDesa from "./profile/profile_desa";
+ 
 
 const Desa = new Elysia({ prefix: "/api/desa", tags: ["Desa"] })
   .use(Berita)

src/app/api/[[...slugs]]/_lib/fileStorage/_lib/create.ts

@@ -44,6 +44,7 @@ const fileStorageCreate = async (context: Context) => {
   const data = await prisma.fileStorage.create({
     data: {
       name: newName,
+      realName: file.name, // Add the original file name as realName
       path: rootPath,
       mimeType: file.type,
       link: `/api/fileStorage/findUnique/${newName}`,
@@ -60,4 +61,4 @@ const fileStorageCreate = async (context: Context) => {
   };
 };
 
-export default fileStorageCreate;
+export default fileStorageCreate;

src/app/api/[[...slugs]]/route.ts

@@ -18,20 +18,14 @@ import uplImg from "./_lib/upl-img";
 import { uplImgSingle } from "./_lib/upl-img-single";
 import FileStorage from "./_lib/fileStorage";
 
+
 const ROOT = process.cwd();
 
 if (!process.env.WIBU_UPLOAD_DIR)
   throw new Error("WIBU_UPLOAD_DIR is not defined");
 
 const UPLOAD_DIR = path.join(ROOT, process.env.WIBU_UPLOAD_DIR);
-const UPLOAD_DIR_IMAGE = path.join(
-  UPLOAD_DIR,
-  "public",
-  "assets",
-  "images",
-  "ppid",
-  "profile-ppid"
-);
+const UPLOAD_DIR_IMAGE = path.join(UPLOAD_DIR, "image");
 
 // create uploads dir
 fs.mkdir(UPLOAD_DIR, {
@@ -73,8 +67,8 @@ const ApiServer = new Elysia()
   .use(swagger({ path: "/api/docs" }))
   .use(
     staticPlugin({
-      prefix: "/", // biar bisa akses dari root URL
-      assets: "./public",
+      assets: process.env.WIBU_UPLOAD_DIR || "./uploads",
+      prefix: "/uploads",
     })
   )
   .use(cors(corsConfig))
@@ -93,116 +87,116 @@ const ApiServer = new Elysia()
   })
   .group("/api", (app) =>
     app
-      .get("/layanan", layanan)
-      .get("/potensi", getPotensi)
-      .get(
-        "/img/:name",
-        ({ params, query }) => {
-          return img({
-            name: params.name,
-            UPLOAD_DIR_IMAGE,
-            ROOT,
-            size: query.size,
-          });
-        },
-        {
-          params: t.Object({
-            name: t.String(),
-          }),
-          query: t.Optional(
-            t.Object({
-              size: t.Optional(t.Number()),
-            })
-          ),
-        }
-      )
-      .delete(
-        "/img/:name",
-        ({ params }) => {
-          return imgDel({
-            name: params.name,
-            UPLOAD_DIR_IMAGE,
-          });
-        },
-        {
-          params: t.Object({
-            name: t.String(),
-          }),
-        }
-      )
-      .get(
-        "/imgs",
-        ({ query }) => {
-          return imgs({
-            search: query.search,
-            page: query.page,
-            count: query.count,
-            UPLOAD_DIR_IMAGE,
-          });
-        },
-        {
-          query: t.Optional(
-            t.Object({
-              page: t.Number({ default: 1 }),
-              count: t.Number({ default: 10 }),
-              search: t.String({ default: "" }),
-            })
-          ),
-        }
-      )
-      .post(
-        "/upl-img",
-        ({ body }) => {
-          console.log(body.title);
-          return uplImg({ files: body.files, UPLOAD_DIR_IMAGE });
-        },
-        {
-          body: t.Object({
-            title: t.String(),
-            files: t.Files({ multiple: true }),
-          }),
-        }
-      )
-      .post(
-        "/upl-img-single",
-        ({ body }) => {
-          return uplImgSingle({
-            fileName: body.name,
-            file: body.file,
-            UPLOAD_DIR_IMAGE,
-          });
-        },
-        {
-          body: t.Object({
-            name: t.String(),
-            file: t.File(),
-          }),
-        }
-      )
-      .post(
-        "/upl-csv-single",
-        ({ body }) => {
-          return uplCsvSingle({ fileName: body.name, file: body.file });
-        },
-        {
-          body: t.Object({
-            name: t.String(),
-            file: t.File(),
-          }),
-        }
-      )
-      .post(
-        "/upl-csv",
-        ({ body }) => {
-          return uplCsv({ files: body.files });
-        },
-        {
-          body: t.Object({
-            files: t.Files(),
-          }),
-        }
-      )
-  );
+  .get("/layanan", layanan)
+  .get("/potensi", getPotensi)
+  .get(
+    "/img/:name",
+    ({ params, query }) => {
+      return img({
+        name: params.name,
+        UPLOAD_DIR_IMAGE,
+        ROOT,
+        size: query.size,
+      });
+    },
+    {
+      params: t.Object({
+        name: t.String(),
+      }),
+      query: t.Optional(
+        t.Object({
+          size: t.Optional(t.Number()),
+        })
+      ),
+    }
+  )
+  .delete(
+    "/img/:name",
+    ({ params }) => {
+      return imgDel({
+        name: params.name,
+        UPLOAD_DIR_IMAGE,
+      });
+    },
+    {
+      params: t.Object({
+        name: t.String(),
+      }),
+    }
+  )
+  .get(
+    "/imgs",
+    ({ query }) => {
+      return imgs({
+        search: query.search,
+        page: query.page,
+        count: query.count,
+        UPLOAD_DIR_IMAGE,
+      });
+    },
+    {
+      query: t.Optional(
+        t.Object({
+          page: t.Number({ default: 1 }),
+          count: t.Number({ default: 10 }),
+          search: t.String({ default: "" }),
+        })
+      ),
+    }
+  )
+  .post(
+    "/upl-img",
+    ({ body }) => {
+      console.log(body.title);
+      return uplImg({ files: body.files, UPLOAD_DIR_IMAGE });
+    },
+    {
+      body: t.Object({
+        title: t.String(),
+        files: t.Files({ multiple: true }),
+      }),
+    }
+  )
+  .post(
+    "/upl-img-single",
+    ({ body }) => {
+      return uplImgSingle({
+        fileName: body.name,
+        file: body.file,
+        UPLOAD_DIR_IMAGE,
+      });
+    },
+    {
+      body: t.Object({
+        name: t.String(),
+        file: t.File(),
+      }),
+    }
+  )
+  .post(
+    "/upl-csv-single",
+    ({ body }) => {
+      return uplCsvSingle({ fileName: body.name, file: body.file });
+    },
+    {
+      body: t.Object({
+        name: t.String(),
+        file: t.File(),
+      }),
+    }
+  )
+  .post(
+    "/upl-csv",
+    ({ body }) => {
+      return uplCsv({ files: body.files });
+    },
+    {
+      body: t.Object({
+        files: t.Files(),
+      }),
+    }
+  )
+);
 
 export const GET = ApiServer.handle;
 export const POST = ApiServer.handle;

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

@@ -1,11 +1,11 @@
 'use client'
 import colors from '@/con/colors';
-import { Box, Button, Combobox, Flex, Group, Image, InputBase, InputPlaceholder, Paper, SimpleGrid, Stack, Text, TextInput, useCombobox } from '@mantine/core';
-import { IconArrowDown, IconMapPinFilled, IconSearch, IconShoppingCartFilled, IconStarFilled } from '@tabler/icons-react';
+import { Box, Combobox, Flex, Image, InputBase, InputPlaceholder, Paper, SimpleGrid, Stack, Text, TextInput, useCombobox } from '@mantine/core';
+import { IconMapPinFilled, IconSearch, IconShoppingCartFilled, IconStarFilled } from '@tabler/icons-react';
+import { motion } from 'motion/react';
+import { useRouter } from 'next/navigation';
 import { useState } from 'react';
 import BackButton from '../../desa/layanan/_com/BackButto';
-import { useRouter } from 'next/navigation';
-import { motion } from 'motion/react';
 
 const groceries = [
   'Makanan',
@@ -170,9 +170,6 @@ function Page() {
               )
             })}
           </SimpleGrid>
-          <Group justify='center'>
-            <Button bg={colors['blue-button']} rightSection={<IconArrowDown size={20} color={colors['white-1']} />} fz={'md'}>Lihat Produk Lainnya</Button>
-          </Group>
         </Stack>
       </Box>
     </Stack>

src/app/percobaan/page.tsx

@@ -64,4 +64,4 @@ function Page() {
   );
 }
 
-export default Page;
+export default Page;