diff --git a/.docker/nginx/conf.d/default.conf b/.docker/nginx/conf.d/default.conf
index a53cff6eff..0dcc120116 100644
--- a/.docker/nginx/conf.d/default.conf
+++ b/.docker/nginx/conf.d/default.conf
@@ -17,6 +17,13 @@ server {
         try_files $uri $uri/ /index.php?$query_string;
     }
 
+    # File hasil upload disajikan langsung dari storage/app/public (symlink
+    # public/storage) sehingga tidak melewati aplikasi. Blokir eksekusi skrip
+    # di jalur ini sebagai lap keamanan terakhir.
+    location ~* ^/storage/.*\.(php|php[0-9]?|phtml|phar|pl|py|rb|sh|bash|cgi|jsp|asp|aspx|htaccess)$ {
+        deny all;
+    }
+
     error_page 404 /index.php;
 
     location ~ \.php$ {
diff --git a/app/Enums/TipeMedia.php b/app/Enums/TipeMedia.php
new file mode 100644
index 0000000000..ca0b7aadd2
--- /dev/null
+++ b/app/Enums/TipeMedia.php
@@ -0,0 +1,90 @@
+<?php
+
+/*
+ * File ini bagian dari:
+ *
+ * OpenDK
+ *
+ * Aplikasi dan source code ini dirilis berdasarkan lisensi GPL V3
+ *
+ * Hak Cipta 2017 - 2024 Perkumpulan Desa Digital Terbuka (https://opendesa.id)
+ *
+ * Dengan ini diberikan izin, secara gratis, kepada siapa pun yang mendapatkan salinan
+ * dari perangkat lunak ini dan file dokumentasi terkait ("Aplikasi Ini"), untuk diperlakukan
+ * tanpa batasan, termasuk hak untuk menggunakan, menyalin, mengubah dan/atau mendistribusikan,
+ * asal tunduk pada syarat berikut:
+ *
+ * Pemberitahuan hak cipta di atas dan pemberitahuan izin ini harus disertakan dalam
+ * setiap salinan atau bagian penting Aplikasi Ini. Barang siapa yang menghapus atau menghilangkan
+ * pemberitahuan ini melanggar ketentuan lisensi Aplikasi Ini.
+ *
+ * PERANGKAT LUNAK INI DISEDIAKAN "SEBAGAIMANA ADANYA", TANPA JAMINAN APA PUN, BAIK TERSURAT MAUPUN
+ * TERSIRAT. PENULIS ATAU PEMEGANG HAK CIPTA SAMA SEKALI TIDAK BERTANGGUNG JAWAB ATAS KLAIM, KERUSAKAN ATAU
+ * KEWAJIBAN ATAUPUN PENGGUNAAN ATAU LAINNYA TERKAIT APLIKASI INI.
+ *
+ * @package    OpenDK
+ * @author     Tim Pengembang OpenDesa
+ * @copyright  Hak Cipta 2017 - 2024 Perkumpulan Desa Digital Terbuka (https://opendesa.id)
+ * @license    http://www.gnu.org/licenses/gpl.html    GPL V3
+ * @link       https://github.com/OpenSID/opendk
+ */
+
+namespace App\Enums;
+
+use BenSampo\Enum\Enum;
+
+/**
+ * Tipe media galeri untuk media berbasis link (Google Drive, YouTube, file langsung).
+ *
+ * Menentukan bagaimana media ditampilkan pada web maupun admin:
+ * - image  : dirender sebagai <img>
+ * - video  : dirender sebagai <video> atau <iframe> preview
+ * - youtube: dirender sebagai <iframe> embed YouTube
+ * - unknown: hanya ditampilkan sebagai tautan biasa
+ */
+final class TipeMedia extends Enum
+{
+    /** @var string Media foto. */
+    public const Image = 'image';
+
+    /** @var string Media video. */
+    public const Video = 'video';
+
+    /** @var string Video YouTube, ditampilkan melalui iframe embed. */
+    public const Youtube = 'youtube';
+
+    /** @var string Link tidak dikenali sebagai media. */
+    public const Unknown = 'unknown';
+
+    /**
+     * Tipe media yang boleh dipilih manual oleh pengguna pada form galeri.
+     *
+     * @return array<string, string>
+     */
+    public static function selectable(): array
+    {
+        return [
+            self::Image => 'Foto',
+            self::Video => 'Video',
+            self::Youtube => 'YouTube',
+        ];
+    }
+
+    /**
+     * Daftar seluruh nilai tipe media yang valid.
+     *
+     * @return array<int, string>
+     */
+    public static function values(): array
+    {
+        return [self::Image, self::Video, self::Youtube, self::Unknown];
+    }
+
+    /**
+     * Cek apakah nilai yang diberikan merupakan tipe media yang valid.
+     */
+    public static function isValid(?string $value): bool
+    {
+        return $value !== null && in_array($value, self::values(), true);
+    }
+}
diff --git a/app/Events/ProsedurChanged.php b/app/Events/ProsedurChanged.php
new file mode 100644
index 0000000000..3d17be4387
--- /dev/null
+++ b/app/Events/ProsedurChanged.php
@@ -0,0 +1,55 @@
+<?php
+
+/*
+ * File ini bagian dari:
+ *
+ * OpenDK
+ *
+ * Aplikasi dan source code ini dirilis berdasarkan lisensi GPL V3
+ *
+ * Hak Cipta 2017 - 2025 Perkumpulan Desa Digital Terbuka (https://opendesa.id)
+ *
+ * Dengan ini diberikan izin, secara gratis, kepada siapa pun yang mendapatkan salinan
+ * dari perangkat lunak ini dan file dokumentasi terkait ("Aplikasi Ini"), untuk diperlakukan
+ * tanpa batasan, termasuk hak untuk menggunakan, menyalin, mengubah dan/atau mendistribusikan,
+ * asal tunduk pada syarat berikut:
+ *
+ * Pemberitahuan hak cipta di atas dan pemberitahuan izin ini harus disertakan dalam
+ * setiap salinan atau bagian penting Aplikasi Ini. Barang siapa yang menghapus atau menghilangkan
+ * pemberitahuan ini melanggar ketentuan lisensi Aplikasi Ini.
+ *
+ * PERANGKAT LUNAK INI DISEDIAKAN "SEBAGAIMANA ADANYA", TANPA JAMINAN APA PUN, BAIK TERSURAT MAUPUN
+ * TERSIRAT. PENULIS ATAU PEMEGANG HAK CIPTA SAMA SEKALI TIDAK BERTANGGUNG JAWAB ATAS KLAIM, KERUSAKAN ATAU
+ * KEWAJIBAN APAPUN ATAS PENGGUNAAN ATAU LAINNYA TERKAIT APLIKASI INI.
+ *
+ * @package    OpenDK
+ * @author     Tim Pengembang OpenDesa
+ * @copyright  Hak Cipta 2017 - 2025 Perkumpulan Desa Digital Terbuka (https://opendesa.id)
+ * @license    http://www.gnu.org/licenses/gpl.html    GPL V3
+ * @link       https://github.com/OpenSID/opendk
+ */
+
+namespace App\Events;
+
+use App\Models\Prosedur;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
+
+class ProsedurChanged
+{
+    use Dispatchable;
+    use SerializesModels;
+
+    public Prosedur $prosedur;
+
+    /**
+     * Create a new event instance.
+     *
+     * @param  Prosedur  $prosedur
+     * @return void
+     */
+    public function __construct(Prosedur $prosedur)
+    {
+        $this->prosedur = $prosedur;
+    }
+}
diff --git a/app/Exports/ExportAKIAKB.php b/app/Exports/ExportAKIAKB.php
index 92c9e66cc7..6c9e3d63d3 100644
--- a/app/Exports/ExportAKIAKB.php
+++ b/app/Exports/ExportAKIAKB.php
@@ -109,7 +109,7 @@ public function map($akiAkb): array
 
         return [
             $akiAkb->id,
-            $akiAkb->desa->nama ?? 'Tidak Diketahui',
+            nama_desa($akiAkb->desa_id) ?? 'Tidak Diketahui',
             $akiAkb->desa_id,
             $akiAkb->aki,
             $akiAkb->akb,
diff --git a/app/Exports/ExportEpidemiPenyakit.php b/app/Exports/ExportEpidemiPenyakit.php
index ed09eeb4d5..567decd026 100644
--- a/app/Exports/ExportEpidemiPenyakit.php
+++ b/app/Exports/ExportEpidemiPenyakit.php
@@ -80,7 +80,7 @@ public function map($epidemiPenyakit): array
     {
         return [
             $epidemiPenyakit->id,
-            $epidemiPenyakit->desa->nama ?? '',
+            nama_desa($epidemiPenyakit->desa_id) ?? '',
             $epidemiPenyakit->penyakit->nama ?? '',
             $epidemiPenyakit->jumlah_penderita,
             months_list()[$epidemiPenyakit->bulan] ?? $epidemiPenyakit->bulan,
diff --git a/app/Exports/ExportFasilitasPaud.php b/app/Exports/ExportFasilitasPaud.php
index 859e9e4abb..198e0a4310 100644
--- a/app/Exports/ExportFasilitasPaud.php
+++ b/app/Exports/ExportFasilitasPaud.php
@@ -81,7 +81,7 @@ public function map($fasilitasPaud): array
     {
         return [
             $fasilitasPaud->id,
-            $fasilitasPaud->desa->nama ?? '',
+            nama_desa($fasilitasPaud->desa_id) ?? '',
             $fasilitasPaud->jumlah_paud,
             $fasilitasPaud->jumlah_guru_paud,
             $fasilitasPaud->jumlah_siswa_paud,
diff --git a/app/Exports/ExportImunisasi.php b/app/Exports/ExportImunisasi.php
index 7417df3fc1..60437ce14e 100644
--- a/app/Exports/ExportImunisasi.php
+++ b/app/Exports/ExportImunisasi.php
@@ -82,7 +82,7 @@ public function map($imunisasi): array
 
         return [
             $imunisasi->id,
-            $imunisasi->desa->nama ?? 'Tidak Diketahui',
+            nama_desa($imunisasi->desa_id) ?? 'Tidak Diketahui',
             $imunisasi->desa_id,
             $imunisasi->cakupan_imunisasi, // Format dengan persen
             $bulanList[$imunisasi->bulan] ?? 'Tidak Diketahui',
diff --git a/app/Exports/ExportPutusSekolah.php b/app/Exports/ExportPutusSekolah.php
index df09a7115a..a83d7fcf91 100644
--- a/app/Exports/ExportPutusSekolah.php
+++ b/app/Exports/ExportPutusSekolah.php
@@ -86,7 +86,7 @@ public function map($putusSekolah): array
     {
         return [
             $putusSekolah->id,
-            $putusSekolah->desa->nama ?? '',
+            nama_desa($putusSekolah->desa_id) ?? '',
             $putusSekolah->siswa_paud,
             $putusSekolah->anak_usia_paud,
             $putusSekolah->siswa_sd,
diff --git a/app/Exports/ExportSuplemenTerdata.php b/app/Exports/ExportSuplemenTerdata.php
index d32b69a0ee..09e88c43f4 100644
--- a/app/Exports/ExportSuplemenTerdata.php
+++ b/app/Exports/ExportSuplemenTerdata.php
@@ -41,6 +41,7 @@
 class ExportSuplemenTerdata implements FromCollection, WithHeadings, WithMapping, WithStyles
 {
     protected $suplemenId;
+
     protected $filters;
 
     public function __construct($suplemenId = null, array $filters = [])
@@ -77,9 +78,6 @@ public function collection()
         return $query->get();
     }
 
-    /**
-     * @return array
-     */
     public function headings(): array
     {
         return [
@@ -99,10 +97,6 @@ public function headings(): array
         ];
     }
 
-    /**
-     * @param mixed $suplemenTerdata
-     * @return array
-     */
     public function map($suplemenTerdata): array
     {
         $penduduk = $suplemenTerdata->penduduk;
@@ -126,7 +120,6 @@ public function map($suplemenTerdata): array
     }
 
     /**
-     * @param Worksheet $sheet
      * @return array
      */
     public function styles(Worksheet $sheet)
diff --git a/app/Exports/ExportSuplemenTerdataGabungan.php b/app/Exports/ExportSuplemenTerdataGabungan.php
new file mode 100644
index 0000000000..a450bc6791
--- /dev/null
+++ b/app/Exports/ExportSuplemenTerdataGabungan.php
@@ -0,0 +1,128 @@
+<?php
+
+/*
+ * File ini bagian dari:
+ *
+ * OpenDK
+ *
+ * Aplikasi dan source code ini dirilis berdasarkan lisensi GPL V3
+ *
+ * Hak Cipta 2017 - 2026 Perkumpulan Desa Digital Terbuka (https://opendesa.id)
+ *
+ * Dengan ini diberikan izin, secara gratis, kepada siapa pun yang mendapatkan salinan
+ * dari perangkat lunak ini dan file dokumentasi terkait ("Aplikasi Ini"), untuk diperlakukan
+ * tanpa batasan, termasuk hak untuk menggunakan, menyalin, mengubah dan/atau mendistribusikan,
+ * asal tunduk pada syarat berikut:
+ *
+ * Pemberitahuan hak cipta di atas dan pemberitahuan izin ini harus disertakan dalam
+ * setiap salinan atau bagian penting Aplikasi Ini. Barang siapa yang menghapus atau menghilangkan
+ * pemberitahuan ini melanggar ketentuan lisensi Aplikasi Ini.
+ *
+ * PERANGKAT LUNAK INI DISEDIAKAN "SEBAGAIMANA ADANYA", TANPA JAMINAN APA PUN, BAIK TERSURAT MAUPUN
+ * TERSIRAT. PENULIS ATAU PEMEGANG HAK CIPTA SAMA SEKALI TIDAK BERTANGGUNG JAWAB ATAS KLAIM, KERUSAKAN ATAU
+ * KEWAJIBAN APAPUN ATAS PENGGUNAAN ATAU LAINNYA TERKAIT APLIKASI INI.
+ *
+ * @package    OpenDK
+ * @author     Tim Pengembang OpenDesa
+ * @copyright  Hak Cipta 2017 - 2026 Perkumpulan Desa Digital Terbuka (https://opendesa.id)
+ * @license    http://www.gnu.org/licenses/gpl.html    GPL V3
+ * @link       https://github.com/OpenSID/opendk
+ */
+
+namespace App\Exports;
+
+use App\Models\DataDesa;
+use App\Models\Penduduk;
+use App\Models\SuplemenTerdata;
+use App\Services\PendudukService;
+use Illuminate\Support\Collection;
+
+class ExportSuplemenTerdataGabungan extends ExportSuplemenTerdata
+{
+    /**
+     * @param  array<int, int|string>  $pendudukGabunganIds
+     */
+    public function __construct($suplemenId = null, array $filters = [], array $pendudukGabunganIds = [])
+    {
+        parent::__construct($suplemenId, $filters);
+        $this->pendudukGabunganIds = array_map('intval', $pendudukGabunganIds);
+    }
+
+    public function collection(): Collection
+    {
+        $collection = parent::collection();
+
+        if ($collection->isEmpty() || empty($this->pendudukGabunganIds)) {
+            return $collection;
+        }
+
+        $missingIds = $this->pendudukGabunganIds;
+
+        foreach ($collection as $row) {
+            if ($row->penduduk_id_gabungan) {
+                $key = (int) $row->penduduk_id_gabungan;
+
+                if (isset($missingIds[$key])) {
+                    unset($missingIds[$key]);
+                }
+            }
+        }
+
+        if (empty($missingIds)) {
+            return $collection;
+        }
+
+        $resolved = (new PendudukService())->pendudukGabunganByIds(array_values($missingIds));
+
+        if ($resolved->isEmpty()) {
+            return $collection;
+        }
+
+        $resolvedMap = [];
+        foreach ($resolved as $item) {
+            if (! is_array($item)) {
+                continue;
+            }
+
+            $penduduk = $this->mapGabunganPenduduk($item);
+            $resolvedMap[(int) ($item['id'] ?? 0)] = $penduduk;
+        }
+
+        return $collection->map(function (SuplemenTerdata $row) use ($resolvedMap) {
+            if ($row->penduduk_id_gabungan && ! $row->penduduk) {
+                $penduduk = $resolvedMap[(int) $row->penduduk_id_gabungan] ?? null;
+
+                if ($penduduk) {
+                    $row->setRelation('penduduk', $penduduk);
+                }
+            }
+
+            return $row;
+        });
+    }
+
+    private function mapGabunganPenduduk(array $item): Penduduk
+    {
+        $attributes = $item['attributes'] ?? [];
+
+        $penduduk = new Penduduk();
+        $penduduk->forceFill([
+            'id' => $item['id'] ?? null,
+            'no_kk' => data_get($attributes, 'keluarga.no_kk') ?? $attributes['no_kk'] ?? null,
+            'nik' => $attributes['nik'] ?? null,
+            'nama' => $attributes['nama'] ?? null,
+            'tempat_lahir' => $attributes['tempatlahir'] ?? $attributes['tempat_lahir'] ?? null,
+            'tanggal_lahir' => $attributes['tanggallahir'] ?? $attributes['tanggal_lahir'] ?? null,
+            'umur' => $attributes['umur'] ?? null,
+            'sex' => $attributes['sex'] ?? null,
+            'alamat' => $attributes['alamat_sekarang'] ?? $attributes['alamat'] ?? null,
+        ]);
+
+        $penduduk->setRelation('desa', new DataDesa([
+            'nama' => data_get($attributes, 'config.nama_desa') ?? $attributes['nama_desa'] ?? null,
+            'desa_id' => data_get($attributes, 'config.kode_desa') ?? $attributes['kode_desa'] ?? null,
+        ]));
+
+        return $penduduk;
+    }
+}
diff --git a/app/Exports/ExportTingkatPendidikan.php b/app/Exports/ExportTingkatPendidikan.php
index bd264584b4..aa938de29c 100644
--- a/app/Exports/ExportTingkatPendidikan.php
+++ b/app/Exports/ExportTingkatPendidikan.php
@@ -83,7 +83,7 @@ public function map($tingkatPendidikan): array
     {
         return [
             $tingkatPendidikan->id,
-            $tingkatPendidikan->desa->nama ?? '',
+            nama_desa($tingkatPendidikan->desa_id) ?? '',
             $tingkatPendidikan->tidak_tamat_sekolah,
             $tingkatPendidikan->tamat_sd,
             $tingkatPendidikan->tamat_smp,
diff --git a/app/Exports/ExportToiletSanitasi.php b/app/Exports/ExportToiletSanitasi.php
index 1122e105b4..081e26bdd5 100644
--- a/app/Exports/ExportToiletSanitasi.php
+++ b/app/Exports/ExportToiletSanitasi.php
@@ -83,7 +83,7 @@ public function map($toiletSanitasi): array
 
         return [
             $toiletSanitasi->id,
-            $toiletSanitasi->desa->nama ?? 'Tidak Diketahui',
+            nama_desa($toiletSanitasi->desa_id) ?? 'Tidak Diketahui',
             $toiletSanitasi->desa_id,
             $toiletSanitasi->toilet,
             $toiletSanitasi->sanitasi,
diff --git a/app/Http/Controllers/Data/AKIAKBController.php b/app/Http/Controllers/Data/AKIAKBController.php
index 2553c1f004..b7ceecea61 100644
--- a/app/Http/Controllers/Data/AKIAKBController.php
+++ b/app/Http/Controllers/Data/AKIAKBController.php
@@ -34,6 +34,7 @@
 use App\Exports\ExportAKIAKB;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\ImportAKIAKBRequest;
+use App\Http\Requests\UpdateAKIAKBRequest;
 use App\Imports\ImporAKIAKB;
 use App\Models\AkiAkb;
 use App\Services\DesaService;
@@ -65,8 +66,12 @@ public function index()
      */
     public function getDataAKIAKB()
     {
+        $desa = request()->input('desa');
         $listDesa = (new DesaService)->listDesa()->pluck('nama', 'desa_id');
-        return DataTables::of(AkiAkb::with(['desa'])->get())
+        return DataTables::of(AkiAkb::when($desa && $desa !== 'Semua', function ($query) use ($desa) {
+            return $query->where('desa_id', $desa);
+        })
+            ->with(['desa'])->get())
             ->addColumn('aksi', function ($row) {
                 $data['edit_url'] = auth()->user()->can('access.data.aki_akb.edit') ? route('data.aki-akb.edit', $row->id) : null;
                 $data['delete_url'] = auth()->user()->can('access.data.aki_akb.delete') ? route('data.aki-akb.destroy', $row->id) : null;
diff --git a/app/Http/Controllers/Data/FasilitasPaudController.php b/app/Http/Controllers/Data/FasilitasPaudController.php
index 03e6122b4d..baeaa52bcb 100644
--- a/app/Http/Controllers/Data/FasilitasPaudController.php
+++ b/app/Http/Controllers/Data/FasilitasPaudController.php
@@ -34,8 +34,10 @@
 use App\Exports\ExportFasilitasPaud;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\ImportFasilitasPaudRequest;
+use App\Http\Requests\UpdateFasilitasPaudRequest;
 use App\Imports\ImporFasilitasPaud;
 use App\Models\FasilitasPAUD;
+use App\Services\DesaService;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Illuminate\Support\Facades\Log;
@@ -59,12 +61,18 @@ public function index()
      */
     public function getDataFasilitasPAUD()
     {
-        return DataTables::of(FasilitasPAUD::with(['desa'])->get())
+        $desa = request()->input('desa');
+        $listDesa = (new DesaService)->listDesa()->pluck('nama', 'desa_id');
+        return DataTables::of(FasilitasPAUD::when($desa && $desa !== 'Semua', function ($query) use ($desa) {
+                    return $query->where('desa_id', $desa);
+                })->with(['desa'])->get())
             ->addColumn('aksi', function ($row) {
                 $data['edit_url'] = auth()->user()->can('access.data.fasilitas_paud.edit') ? route('data.fasilitas-paud.edit', $row->id) : null;
                 $data['delete_url'] = auth()->user()->can('access.data.fasilitas_paud.delete') ? route('data.fasilitas-paud.destroy', $row->id) : null;
 
                 return view('forms.aksi', $data);
+            })->addColumn('nama_desa', function ($row) use ($listDesa) {
+                return $row->desa->nama ?? $listDesa[$row->desa_id] ?? '-';
             })
             ->rawColumns(['aksi'])->make();
     }
@@ -116,7 +124,7 @@ public function edit($id)
     {
         $fasilitas = FasilitasPAUD::with(['desa'])->findOrFail($id);
         $page_title = 'Fasilitas PAUD';
-        $page_description = 'Ubah Fasilitas PAUD : Desa ' . $fasilitas->desa->nama;
+        $page_description = 'Ubah Fasilitas PAUD : Desa ' . nama_desa($fasilitas->desa_id);
 
         return view('data.fasilitas_paud.edit', compact('page_title', 'page_description', 'fasilitas'));
     }
@@ -127,18 +135,10 @@ public function edit($id)
      * @param  int  $id
      * @return Response
      */
-    public function update(Request $request, $id)
+    public function update(UpdateFasilitasPaudRequest $request, $id)
     {
-        request()->validate([
-            'jumlaah_paud' => 'required',
-            'jumlah_guru_paud' => 'required',
-            'jumlah_siswa_paud' => 'required',
-            'semester' => 'required',
-            'tahun' => 'required',
-        ]);
-
         try {
-            FasilitasPAUD::findOrFail($id)->update($request->all());
+            FasilitasPAUD::findOrFail($id)->update($request->validated());
         } catch (\Exception $e) {
             Log::error('Fasilitas PAUD update failed', [
                 'error' => $e->getMessage(),
diff --git a/app/Http/Controllers/Data/ImunisasiController.php b/app/Http/Controllers/Data/ImunisasiController.php
index ac5a550cca..fef53f2ec0 100644
--- a/app/Http/Controllers/Data/ImunisasiController.php
+++ b/app/Http/Controllers/Data/ImunisasiController.php
@@ -65,8 +65,12 @@ public function index()
      */
     public function getDataAKIAKB()
     {
+        $desa = request()->input('desa');
         $listDesa = (new DesaService)->listDesa()->pluck('nama', 'desa_id');
-        return DataTables::of(Imunisasi::with(['desa'])->get())
+        return DataTables::of(Imunisasi::when($desa && $desa !== 'Semua', function ($query) use ($desa) {
+            return $query->where('desa_id', $desa);
+        })
+            ->with(['desa'])->get())
             ->addColumn('aksi', function ($row) {
                 $data['edit_url'] = auth()->user()->can('access.data.imunisasi.edit') ? route('data.imunisasi.edit', $row->id) : null;
                 $data['delete_url'] = auth()->user()->can('access.data.imunisasi.delete') ? route('data.imunisasi.destroy', $row->id) : null;
diff --git a/app/Http/Controllers/Data/LembagaAnggotaController.php b/app/Http/Controllers/Data/LembagaAnggotaController.php
index 386de9a6d5..068618de55 100644
--- a/app/Http/Controllers/Data/LembagaAnggotaController.php
+++ b/app/Http/Controllers/Data/LembagaAnggotaController.php
@@ -2,11 +2,13 @@
 
 namespace App\Http\Controllers\Data;
 
+use App\Models\SettingAplikasi;
 use Carbon\Carbon;
 use App\Models\Lembaga;
 use App\Models\Penduduk;
 use Illuminate\Http\Request;
 use App\Models\LembagaAnggota;
+use App\Services\PendudukService;
 use Yajra\DataTables\DataTables;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\StoreLembagaAnggotaRequest;
@@ -38,17 +40,23 @@ public function getData(Request $request, $slug)
         if ($request->ajax()) {
             $lembaga = Lembaga::where('slug', $slug)->firstOrFail();
 
-            // Ambil data anggota lembaga dengan informasi lembaga dan penduduk terkait
             $anggotaList = LembagaAnggota::with(['lembaga', 'penduduk'])
                 ->where('lembaga_id', $lembaga->id)
                 ->get();
 
+            $pendudukGabunganIds = $anggotaList->pluck('penduduk_id_gabungan')->filter()->unique()->values()->all();
+
+            $pendudukGabungan = collect();
+            if ($this->isDatabaseGabungan() && !empty($pendudukGabunganIds)) {
+                $pendudukGabungan = (new PendudukService())->pendudukGabunganByIds($pendudukGabunganIds);
+            }
+            
             return DataTables::of($anggotaList)
                 ->addIndexColumn()
                 ->addColumn('aksi', function ($row) use ($slug) {
                     if (!auth()->guest()) {
-                        $data['edit_url'] = auth()->user()->can('access.data.lembaga_anggota.edit') ? route('data.lembaga_anggota.edit', ['slug' => $slug, 'id' => $row->id]) : null;
-                        $data['delete_url'] = auth()->user()->can('access.data.lembaga_anggota.delete') ? route('data.lembaga_anggota.destroy', ['slug' => $slug, 'id' => $row->id]) : null;
+                        $data['edit_url'] = auth()->user()->can('access.data.lembaga.edit') ? route('data.lembaga_anggota.edit', ['slug' => $slug, 'id' => $row->id]) : null;
+                        $data['delete_url'] = auth()->user()->can('access.data.lembaga.delete') ? route('data.lembaga_anggota.destroy', ['slug' => $slug, 'id' => $row->id]) : null;
                     }
 
                     return view('forms.aksi', $data);
@@ -56,31 +64,80 @@ public function getData(Request $request, $slug)
                 ->addColumn('no_anggota', function ($row) {
                     return $row->no_anggota ?: '-';
                 })
-                ->addColumn('nik', function ($row) {
+                ->addColumn('nik', function ($row) use ($pendudukGabungan) {
+                    if ($this->isDatabaseGabungan()) {
+                        $penduduk = $pendudukGabungan->firstWhere('id', $row->penduduk_id_gabungan);
+
+                        return $penduduk ? ($penduduk['attributes']['nik'] ?? '-') : '-';
+                    }
+
                     return $row->penduduk->nik ?? '-';
                 })
-                ->addColumn('nama', function ($row) {
+                ->addColumn('nama', function ($row) use ($pendudukGabungan) {
+                    if ($this->isDatabaseGabungan()) {
+                        $penduduk = $pendudukGabungan->firstWhere('id', $row->penduduk_id_gabungan);
+
+                        return $penduduk ? ($penduduk['attributes']['nama'] ?? '-') : '-';
+                    }
+
                     return $row->penduduk->nama ?? '-';
                 })
-                ->addColumn('tempat_tgl_lahir', function ($row) {
+                ->addColumn('tempat_tgl_lahir', function ($row) use ($pendudukGabungan) {
+                    if ($this->isDatabaseGabungan()) {
+                        $penduduk = $pendudukGabungan->firstWhere('id', $row->penduduk_id_gabungan);
+
+                        $tempat = $penduduk ? ($penduduk['attributes']['tempatlahir'] ?? '-') : '-';
+                        $tanggalLahir = $penduduk && ($penduduk['attributes']['tanggallahir'] ?? false)
+                            ? Carbon::parse($penduduk['attributes']['tanggallahir'])->translatedFormat('d F Y')
+                            : '-';
+
+                        return "$tempat / $tanggalLahir";
+                    }
+
                     $tempat = $row->penduduk->tempat_lahir ?? '-';
                     $tanggalLahir = $row->penduduk->tanggal_lahir
                         ? Carbon::parse($row->penduduk->tanggal_lahir)->translatedFormat('d F Y')
                         : '-';
+
                     return "$tempat / $tanggalLahir";
                 })
-                ->addColumn('umur', function ($row) {
+                ->addColumn('umur', function ($row) use ($pendudukGabungan) {
+                    if ($this->isDatabaseGabungan()) {
+                        $penduduk = $pendudukGabungan->firstWhere('id', $row->penduduk_id_gabungan);
+
+                        return $penduduk['attributes']['umur'] ?? '-';
+                    }
+
                     return $row->penduduk && $row->penduduk->tanggal_lahir
-                        ? \Carbon\Carbon::parse($row->penduduk->tanggal_lahir)->age
+                        ? Carbon::parse($row->penduduk->tanggal_lahir)->age
                         : '-';
                 })
-                ->addColumn('sex', function ($row) {
+                ->addColumn('sex', function ($row) use ($pendudukGabungan) {
+                    if ($this->isDatabaseGabungan()) {
+                        $penduduk = $pendudukGabungan->firstWhere('id', $row->penduduk_id_gabungan);
+                        $sex = ['1' => 'Laki-laki', '2' => 'Perempuan'];
+                        return $penduduk ? ($sex[$penduduk['attributes']['sex']] ?? '-') : '-';
+                    }
+
                     return $row->penduduk && $row->penduduk->pendudukSex ? $row->penduduk->pendudukSex->nama : '-';
                 })
-                ->addColumn('alamat', function ($row) {
+                ->addColumn('alamat', function ($row) use ($pendudukGabungan) {
+                    if ($this->isDatabaseGabungan()) {
+                        $penduduk = $pendudukGabungan->firstWhere('id', $row->penduduk_id_gabungan);
+
+                        if (!$penduduk) {
+                            return '-';
+                        }
+
+                        $alamat = $penduduk['attributes']['alamat_wilayah'] ?? '-';
+
+                        return $alamat;
+                    }
+
                     $rt = $row->penduduk->rt ?? '-';
                     $rw = $row->penduduk->rw ?? '-';
                     $alamat = $row->penduduk->dusun ?? '-';
+
                     return "RT $rt / RW $rw $alamat";
                 })
                 ->addColumn('jabatan', function ($row) {
@@ -136,15 +193,18 @@ public function getData(Request $request, $slug)
      */
     public function create($slug)
     {
-        // Cari lembaga berdasarkan slug
         $lembaga = Lembaga::where('slug', $slug)->firstOrFail();
 
-        // Ambil anggota yang sudah ada di lembaga ini
+        if ($this->isDatabaseGabungan()) {
+            $page_title = 'Tambah Anggota Lembaga ' . $lembaga->nama;
+            $page_description = 'Tambah Anggota Lembaga ' . $lembaga->nama;
+
+            return view('data.lembaga_anggota.gabungan.create', compact('page_title', 'page_description', 'lembaga'));
+        }
+
         $existingAnggotaIds = $lembaga->lembagaAnggota->pluck('penduduk_id')->toArray();
 
-        // Ambil semua penduduk yang belum menjadi anggota
         $pendudukList = Penduduk::whereNotIn('id', $existingAnggotaIds)->get()->mapWithKeys(function ($penduduk) {
-            // Membuat string yang menggabungkan NIK, nama, dan alamat
             $optionText = "NIK: {$penduduk->nik} - {$penduduk->nama} - Dusun {$penduduk->dusun} RT {$penduduk->rt} / RW {$penduduk->rw}";
 
             return [$penduduk->id => $optionText];
@@ -165,24 +225,25 @@ public function create($slug)
      */
     public function store(StoreLembagaAnggotaRequest $request, $slug)
     {
-        // Cari lembaga berdasarkan slug
         $lembaga = Lembaga::where('slug', $slug)->firstOrFail();
 
-        // Cek apakah jabatan yang dipilih adalah Ketua (jabatan_id = 1)
         if ($request->jabatan_id == 1) {
-            // Cek apakah sudah ada Ketua di lembaga ini
             $existingKetua = $lembaga->lembagaAnggota()->where('jabatan', 1)->first();
 
-            // Jika ada, ubah jabatan ketua yang sudah ada menjadi Anggota (jabatan_id = 5)
             if ($existingKetua) {
                 $existingKetua->update(['jabatan' => 5]);
             }
         }
 
-        try {
+        $data = $request->validated();
 
-            $lembaga->lembagaAnggota()->create([
-                'penduduk_id' => $request->penduduk_id,
+        if (SettingAplikasi::where('key', 'sinkronisasi_database_gabungan')->value('value') === '1') {
+            $data['penduduk_id'] = null;
+            $data['penduduk_id_gabungan'] = $data['penduduk_id_gabungan'] ?? null;
+        }
+
+        try {
+            $lembaga->lembagaAnggota()->create($data + [
                 'no_anggota' => $request->no_anggota,
                 'jabatan' => $request->jabatan_id,
                 'no_sk_jabatan' => $request->no_sk_jabatan,
@@ -193,7 +254,6 @@ public function store(StoreLembagaAnggotaRequest $request, $slug)
                 'periode' => $request->periode,
                 'keterangan' => $request->keterangan,
             ]);
-
         } catch (\Exception $e) {
             Log::error('Lembaga Anggota creation failed', [
                 'error' => $e->getMessage(),
@@ -216,13 +276,24 @@ public function store(StoreLembagaAnggotaRequest $request, $slug)
      */
     public function edit($slug, $id)
     {
-        // Cari lembaga berdasarkan slug
         $lembaga = Lembaga::where('slug', $slug)->firstOrFail();
-
-        // Cari anggota lembaga berdasarkan ID
         $anggota = LembagaAnggota::with('penduduk')->where('lembaga_id', $lembaga->id)->findOrFail($id);
 
-        // Ambil semua penduduk yang belum menjadi anggota kecuali yang sedang diedit
+        if ($this->isDatabaseGabungan()) {
+            $page_title = 'Ubah Anggota Lembaga ' . $lembaga->nama;
+            $page_description = 'Ubah Anggota Lembaga ' . $lembaga->nama;
+
+            $pendudukGabungan = (new PendudukService())->pendudukGabunganByIds([$anggota->penduduk_id_gabungan]);
+            $penduduk = new Penduduk();
+            if($pendudukGabungan[0]){                
+                $penduduk->nama = $pendudukGabungan[0]['attributes']['nama'];
+                $penduduk->nik = $pendudukGabungan[0]['attributes']['nik'];
+            }
+            $anggota->setRelation('penduduk', $penduduk);  
+
+            return view('data.lembaga_anggota.gabungan.edit', compact('page_title', 'page_description', 'lembaga', 'anggota'));
+        }
+
         $existingAnggotaIds = $lembaga->lembagaAnggota()
             ->where('id', '!=', $anggota->id)
             ->pluck('penduduk_id')
@@ -233,7 +304,6 @@ public function edit($slug, $id)
             return [$penduduk->id => $optionText];
         });
 
-        // Tambahkan penduduk saat ini (yang sedang diedit) ke daftar pendudukList
         $pendudukList->prepend("NIK: {$anggota->penduduk->nik} - {$anggota->penduduk->nama} - Dusun {$anggota->penduduk->dusun} RT {$anggota->penduduk->rt} / RW {$anggota->penduduk->rw}", $anggota->penduduk->id);
 
         $page_title = 'Ubah Anggota Lembaga ' . $lembaga->nama;
@@ -252,28 +322,28 @@ public function edit($slug, $id)
     public function update(UpdateLembagaAnggotaRequest $request, $slug, $id)
     {
         try {
-
-            // Cari lembaga berdasarkan slug
             $lembaga = Lembaga::where('slug', $slug)->firstOrFail();
 
-            // Cari anggota berdasarkan id dan pastikan anggota tersebut milik lembaga yang sesuai
             $anggota = LembagaAnggota::where('id', $id)
                 ->where('lembaga_id', $lembaga->id)
                 ->firstOrFail();
 
-            // Cek apakah jabatan yang dipilih adalah Ketua (jabatan_id = 1)
             if ($request->jabatan_id == 1) {
-                // Cek apakah sudah ada Ketua di lembaga ini
                 $existingKetua = $lembaga->lembagaAnggota()->where('jabatan', 1)->first();
 
-                // Jika ada Ketua lain, ubah jabatan Ketua yang sudah ada menjadi Anggota (jabatan_id = 5)
                 if ($existingKetua && $existingKetua->id !== $anggota->id) {
                     $existingKetua->update(['jabatan' => 5]);
                 }
             }
 
-            // Update data anggota
-            $anggota->update([
+            $data = $request->validated();
+
+            if (SettingAplikasi::where('key', 'sinkronisasi_database_gabungan')->value('value') === '1') {
+                $data['penduduk_id'] = null;
+                $data['penduduk_id_gabungan'] = $data['penduduk_id_gabungan'] ?? null;
+            }
+
+            $anggota->update($data + [
                 'no_anggota' => $request->no_anggota,
                 'jabatan' => $request->jabatan_id,
                 'no_sk_jabatan' => $request->no_sk_jabatan,
@@ -284,7 +354,6 @@ public function update(UpdateLembagaAnggotaRequest $request, $slug, $id)
                 'periode' => $request->periode,
                 'keterangan' => $request->keterangan,
             ]);
-
         } catch (\Exception $e) {
             Log::error('Lembaga Anggota update failed', [
                 'error' => $e->getMessage(),
diff --git a/app/Http/Controllers/Data/LembagaController.php b/app/Http/Controllers/Data/LembagaController.php
index 8cb9851c60..fd38ed68a8 100644
--- a/app/Http/Controllers/Data/LembagaController.php
+++ b/app/Http/Controllers/Data/LembagaController.php
@@ -2,17 +2,18 @@
 
 namespace App\Http\Controllers\Data;
 
+use App\Http\Controllers\Controller;
+use App\Http\Requests\StoreLembagaRequest;
+use App\Http\Requests\UpdateLembagaRequest;
+use App\Models\KategoriLembaga;
 use App\Models\Lembaga;
+use App\Models\LembagaAnggota;
 use App\Models\Penduduk;
+use App\Services\PendudukService;
 use Illuminate\Http\Request;
-use App\Models\LembagaAnggota;
-use App\Models\KategoriLembaga;
-use Yajra\DataTables\DataTables;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
-use App\Http\Controllers\Controller;
-use App\Http\Requests\StoreLembagaRequest;
-use App\Http\Requests\UpdateLembagaRequest;
+use Yajra\DataTables\DataTables;
 
 class LembagaController extends Controller
 {
@@ -35,14 +36,22 @@ public function index()
     public function getData(Request $request)
     {
         if ($request->ajax()) {
-            $lembagaList = Lembaga::with(['lembagaKategori', 'penduduk', 'lembagaAnggota'])
+            $lembagaList = Lembaga::with(['lembagaKategori', 'penduduk', 'pendudukGabungan', 'lembagaAnggota'])
                 ->withCount('lembagaAnggota as jml_anggota')
                 ->get();
+
+            $pendudukGabunganIds = $lembagaList->pluck('penduduk_id_gabungan')->filter()->unique()->values()->all();
+
+            $pendudukGabungan = collect();
+            if ($this->isDatabaseGabungan() && !empty($pendudukGabunganIds)) {
+                $pendudukGabungan = (new PendudukService())->pendudukGabunganByIds($pendudukGabunganIds);
+            }
+
             return DataTables::of($lembagaList)
                 ->addIndexColumn()
                 ->addColumn('aksi', function ($row) {
                     if (!auth()->guest()) {
-                        $data['detail_url'] = auth()->user()->can('access.data.lembaga_anggota.view') ? route('data.lembaga_anggota.index', $row->slug) : null;
+                        $data['detail_url'] = auth()->user()->can('access.data.lembaga.view') ? route('data.lembaga_anggota.index', $row->slug) : null;
                         $data['edit_url'] = auth()->user()->can('access.data.lembaga.edit') ? route('data.lembaga.edit', $row->id) : null;
                         $data['delete_url'] = auth()->user()->can('access.data.lembaga.delete') ? route('data.lembaga.destroy', $row->id) : null;
                     }
@@ -52,7 +61,13 @@ public function getData(Request $request)
                 ->addColumn('kategori', function ($row) {
                     return $row->lembagaKategori ? $row->lembagaKategori->nama : '-';
                 })
-                ->addColumn('ketua', function ($row) {
+                ->addColumn('ketua', function ($row) use ($pendudukGabungan) {
+                    if ($this->isDatabaseGabungan()) {
+                        $penduduk = $pendudukGabungan->firstWhere('id', $row->penduduk_id_gabungan);
+
+                        return $penduduk ? ($penduduk['attributes']['nama'] ?? '-') : '-';
+                    }
+
                     return $row->penduduk ? $row->penduduk->nama : '-';
                 })
                 ->rawColumns(['aksi'])
@@ -69,12 +84,15 @@ public function create()
     {
         $page_title = $this->title;
         $page_description = 'Tambah ' . $this->title;
+
+        if ($this->isDatabaseGabungan()) {
+            $view = 'data.lembaga.gabungan.create';
+            return view($view, compact('page_title', 'page_description'));
+        }
+
         $kategoriLembagaList = KategoriLembaga::pluck('nama', 'id');
         $pendudukList = Penduduk::all()->mapWithKeys(function ($penduduk) {
-            // Membuat string yang menggabungkan NIK, nama, dan alamat
             $optionText = "NIK: {$penduduk->nik} - {$penduduk->nama} - Dusun {$penduduk->dusun} RT {$penduduk->rt} / RW {$penduduk->rw}";
-
-            // Menambahkan ke array dengan 'id' sebagai key dan $optionText sebagai value
             return [$penduduk->id => $optionText];
         });
 
@@ -85,24 +103,28 @@ public function create()
      * Store a newly created resource in storage.
      *
      * @param  \Illuminate\Http\Request  $request
+     *
      * @return \Illuminate\Http\Response
      */
     public function store(StoreLembagaRequest $request)
     {
         $data = $request->all();
 
-        // Menggunakan scope untuk menghasilkan slug yang unik
+        if ($this->isDatabaseGabungan()) {
+            $data['penduduk_id'] = null;
+            $data['penduduk_id_gabungan'] = $data['penduduk_id_gabungan'] ?? null;
+        }
+
         $data['slug'] = Lembaga::generateUniqueSlug($request->nama);
 
         try {
             DB::transaction(function () use ($data) {
-                // Insert ke table 'lembaga'
                 $lembaga = Lembaga::create($data);
 
-                // Insert ke tabel 'lembagaanggota' dengan id penduduk yang diambil dari input
                 LembagaAnggota::create([
                     'lembaga_id' => $lembaga->id,
                     'penduduk_id' => $data['penduduk_id'],
+                    'penduduk_id_gabungan' => $data['penduduk_id_gabungan'] ?? null,
                     'no_anggota' => 1,
                     'jabatan' => 1,
                     'keterangan' => 'Ketua lembaga'
@@ -125,6 +147,7 @@ public function store(StoreLembagaRequest $request)
      * Display the specified resource.
      *
      * @param  int  $id
+     *
      * @return \Illuminate\Http\Response
      */
     public function show($id)
@@ -136,6 +159,7 @@ public function show($id)
      * Show the form for editing the specified resource.
      *
      * @param  int  $id
+     *
      * @return \Illuminate\Http\Response
      */
     public function edit($id)
@@ -143,12 +167,22 @@ public function edit($id)
         $lembaga = Lembaga::findOrFail($id);
         $page_title = $this->title;
         $page_description = 'Ubah ' . $this->title;
+
+        if ($this->isDatabaseGabungan()) {
+            $view = 'data.lembaga.gabungan.edit';
+            $pendudukGabungan = (new PendudukService())->pendudukGabunganByIds([$lembaga->penduduk_id_gabungan]);
+            $penduduk = new Penduduk();
+            if($pendudukGabungan[0]){                
+                $penduduk->nama = $pendudukGabungan[0]['attributes']['nama'];
+                $penduduk->nik = $pendudukGabungan[0]['attributes']['nik'];
+            }
+            $lembaga->setRelation('penduduk', $penduduk);  
+            return view($view, compact('page_title', 'page_description', 'lembaga'));
+        }
+
         $kategoriLembagaList = KategoriLembaga::pluck('nama', 'id');
         $pendudukList = Penduduk::all()->mapWithKeys(function ($penduduk) {
-            // Membuat string yang menggabungkan NIK, nama, dan alamat
             $optionText = "NIK: {$penduduk->nik} - {$penduduk->nama} - Dusun {$penduduk->dusun} RT {$penduduk->rt} / RW {$penduduk->rw}";
-
-            // Menambahkan ke array dengan 'id' sebagai key dan $optionText sebagai value
             return [$penduduk->id => $optionText];
         });
 
@@ -160,6 +194,7 @@ public function edit($id)
      *
      * @param  \Illuminate\Http\Request  $request
      * @param  int  $id
+     *
      * @return \Illuminate\Http\Response
      */
     public function update(UpdateLembagaRequest $request, $id)
@@ -168,24 +203,25 @@ public function update(UpdateLembagaRequest $request, $id)
 
         try {
             DB::transaction(function () use ($data, $request, $id) {
-                // Temukan lembaga yang akan diupdate
                 $lembaga = Lembaga::findOrFail($id);
 
-                // Hanya buat slug baru jika nama lembaga berubah
                 if ($request->nama !== $lembaga->nama) {
                     $data['slug'] = Lembaga::generateUniqueSlug($request->nama);
                 }
 
-                // Update data lembaga
+                if ($this->isDatabaseGabungan()) {
+                    $data['penduduk_id'] = null;
+                    $data['penduduk_id_gabungan'] = $data['penduduk_id_gabungan'] ?? null;
+                }
+
                 $lembaga->update($data);
 
-                // Cek apakah anggota terkait sudah ada
                 $anggota = LembagaAnggota::where('lembaga_id', $lembaga->id)->first();
 
                 if ($anggota) {
-                    // Update penduduk_id pada anggota jika anggota sudah ada
                     $anggota->update([
                         'penduduk_id' => $data['penduduk_id'] ?? $lembaga->penduduk_id,
+                        'penduduk_id_gabungan' => $data['penduduk_id_gabungan'] ?? $lembaga->penduduk_id_gabungan,
                     ]);
                 }
             });
@@ -202,11 +238,11 @@ public function update(UpdateLembagaRequest $request, $id)
         return redirect()->route('data.lembaga.index')->with('success', 'Lembaga berhasil diubah!');
     }
 
-
     /**
      * Remove the specified resource from storage.
      *
      * @param  int  $id
+     *
      * @return \Illuminate\Http\Response
      */
     public function destroy($id)
diff --git a/app/Http/Controllers/Data/PutusSekolahController.php b/app/Http/Controllers/Data/PutusSekolahController.php
index 0273a00616..78d50ba574 100644
--- a/app/Http/Controllers/Data/PutusSekolahController.php
+++ b/app/Http/Controllers/Data/PutusSekolahController.php
@@ -34,8 +34,10 @@
 use App\Exports\ExportPutusSekolah;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\ImportPutusSekolahRequest;
+use App\Http\Requests\UpdatePutusSekolahRequest;
 use App\Imports\ImporPutusSekolah;
 use App\Models\PutusSekolah;
+use App\Services\DesaService;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Illuminate\Support\Facades\Log;
@@ -59,12 +61,18 @@ public function index()
      */
     public function getDataPutusSekolah()
     {
-        return DataTables::of(PutusSekolah::with(['desa'])->get())
-            ->addColumn('aksi', function ($row) {
+        $desa = request()->input('desa');
+        $listDesa = (new DesaService)->listDesa()->pluck('nama', 'desa_id');
+        return DataTables::of(PutusSekolah::when($desa && $desa !== 'Semua', function ($query) use ($desa) {
+                    return $query->where('desa_id', $desa);
+                })->with(['desa'])->get())
+            ->addColumn('aksi', function ($row) {                
                 $data['edit_url'] = auth()->user()->can('access.data.putus_sekolah.edit') ? route('data.putus-sekolah.edit', $row->id) : null;
                 $data['delete_url'] = auth()->user()->can('access.data.putus_sekolah.delete') ? route('data.putus-sekolah.destroy', $row->id) : null;
 
                 return view('forms.aksi', $data);
+            })->addColumn('nama_desa', function ($row) use ($listDesa) {
+                return $row->desa->nama ?? $listDesa[$row->desa_id] ?? '-';
             })
             ->rawColumns(['aksi'])->make();
     }
@@ -116,7 +124,7 @@ public function edit($id)
     {
         $siswa = PutusSekolah::with(['desa'])->findOrFail($id);
         $page_title = 'Siswa Putus Sekolah';
-        $page_description = 'Ubah Siswa Putus Sekolah : Desa ' . $siswa->desa->nama;
+        $page_description = 'Ubah Siswa Putus Sekolah : Desa ' . nama_desa($siswa->desa_id);
 
         return view('data.putus_sekolah.edit', compact('page_title', 'page_description', 'siswa'));
     }
@@ -127,23 +135,10 @@ public function edit($id)
      * @param  int  $id
      * @return Response
      */
-    public function update(Request $request, $id)
+    public function update(UpdatePutusSekolahRequest $request, $id)
     {
-        request()->validate([
-            'siswa_paud' => 'required',
-            'anak_usia_paud' => 'required',
-            'siswa_sd' => 'required',
-            'anak_usia_sd' => 'required',
-            'siswa_smp' => 'required',
-            'anak_usia_smp' => 'required',
-            'siswa_sma' => 'required',
-            'anak_usia_sma' => 'required',
-            'semester' => 'required',
-            'tahun' => 'required',
-        ]);
-
         try {
-            PutusSekolah::findOrFail($id)->update($request->all());
+            PutusSekolah::findOrFail($id)->update($request->validated());
         } catch (\Exception $e) {
             Log::error('Putus Sekolah update failed', [
                 'error' => $e->getMessage(),
diff --git a/app/Http/Controllers/Data/SuplemenController.php b/app/Http/Controllers/Data/SuplemenController.php
index 5bb4f28323..2f8215c0dd 100644
--- a/app/Http/Controllers/Data/SuplemenController.php
+++ b/app/Http/Controllers/Data/SuplemenController.php
@@ -33,25 +33,31 @@
 
 use App\Exports\ExportSuplemen;
 use App\Exports\ExportSuplemenTerdata;
+use App\Exports\ExportSuplemenTerdataGabungan;
 use App\Http\Controllers\Controller;
+use App\Http\Requests\SuplemenRequest;
+use App\Http\Requests\SuplemenTerdataRequest;
 use App\Models\DataDesa;
 use App\Models\Penduduk;
 use App\Models\Suplemen;
 use App\Models\SuplemenTerdata;
+use App\Services\PendudukService;
+use Illuminate\Contracts\View\View;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Str;
 use Maatwebsite\Excel\Facades\Excel;
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
 use Yajra\DataTables\DataTables;
 
 class SuplemenController extends Controller
 {
     /**
      * Display a listing of the resource.
-     *
-     * @return \Illuminate\Http\Response
      */
-    public function index()
+    public function index(): View
     {
         $page_title = 'Data Suplemen';
         $page_description = 'Daftar Data Suplemen';
@@ -60,11 +66,11 @@ public function index()
     }
 
     /**
-     * Return datatable Data Suplemen
+     * Return datatable Data Suplemen.
      */
-    public function getDataSuplemen()
+    public function getDataSuplemen(Request $request): ?JsonResponse
     {
-        if (request()->ajax()) {
+        if ($request->ajax()) {
             return DataTables::of(Suplemen::withCount('terdata')->get())
                 ->addIndexColumn()
                 ->addColumn('aksi', function ($row) {
@@ -88,10 +94,8 @@ public function getDataSuplemen()
 
     /**
      * Show the form for creating a new resource.
-     *
-     * @return \Illuminate\Http\Response
      */
-    public function create()
+    public function create(): View
     {
         $page_title = 'Data Suplemen';
         $page_description = 'Tambah Data Suplemen';
@@ -101,19 +105,14 @@ public function create()
 
     /**
      * Store a newly created resource in storage.
-     *
-     * @return \Illuminate\Http\Response
      */
-    public function store(Request $request)
+    public function store(SuplemenRequest $request): RedirectResponse
     {
-        request()->validate([
-            'nama' => 'required',
-        ]);
-
-        $request['slug'] = Str::slug($request->nama);
+        $data = $request->validated();
+        $data['slug'] = Str::slug($data['nama']);
 
         try {
-            Suplemen::create($request->all());
+            Suplemen::create($data);
         } catch (\Exception $e) {
             Log::error('Suplemen creation failed', [
                 'error' => $e->getMessage(),
@@ -129,11 +128,8 @@ public function store(Request $request)
 
     /**
      * Show the form for editing the specified resource.
-     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
      */
-    public function edit($id)
+    public function edit(int $id): View
     {
         $suplemen = Suplemen::findOrFail($id);
         $page_title = 'Data Suplemen';
@@ -144,20 +140,14 @@ public function edit($id)
 
     /**
      * Update the specified resource in storage.
-     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
      */
-    public function update(Request $request, $id)
+    public function update(SuplemenRequest $request, int $id): RedirectResponse
     {
-        request()->validate([
-            'nama' => 'required',
-        ]);
-
-        $request['slug'] = Str::slug($request->nama);
+        $data = $request->validated();
+        $data['slug'] = Str::slug($data['nama']);
 
         try {
-            Suplemen::findOrFail($id)->update($request->all());
+            Suplemen::findOrFail($id)->update($data);
         } catch (\Exception $e) {
             Log::error('Suplemen update failed', [
                 'error' => $e->getMessage(),
@@ -173,11 +163,8 @@ public function update(Request $request, $id)
 
     /**
      * Remove the specified resource from storage.
-     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
      */
-    public function destroy($id)
+    public function destroy(int $id): RedirectResponse
     {
         if (SuplemenTerdata::where('suplemen_id', $id)->exists()) {
             return redirect()->route('data.data-suplemen.index')->with('error', 'Tidak dapat menghapus Data Suplemen yang mempunyai anggota!');
@@ -200,46 +187,79 @@ public function destroy($id)
 
     /**
      * Display the specified resource.
-     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
      */
-    public function show($id)
+    public function show(int $id): View
     {
         $suplemen = Suplemen::findOrFail($id);
         $sasaran = ['1' => 'Penduduk', '2' => 'Keluarga/KK'];
         $page_title = 'Anggota Suplemen';
         $page_description = 'Anggota Suplemen: ' . ucwords(strtolower($suplemen->nama));
 
-        return view('data.data_suplemen.show', compact('page_title', 'page_description', 'suplemen', 'sasaran'));
+        $view = $this->isDatabaseGabungan() ? 'data.data_suplemen.gabungan.show' : 'data.data_suplemen.show';
+
+        return view($view, compact('page_title', 'page_description', 'suplemen', 'sasaran'));
     }
 
     /**
-     * Return datatable Data Suplemen Terdata
+     * Return datatable Data Suplemen Terdata.
+     *
+     * Saat database gabungan aktif, data dari API database gabungan
+     * (hasil sinkronisasi desa) digabungkan dengan data anggota lokal.
      */
-    public function getDataSuplemenTerdata($id_terdata)
+    public function getDataSuplemenTerdata(Request $request, int $id_terdata): ?JsonResponse
     {
-        if (request()->ajax()) {
-            return DataTables::of(SuplemenTerdata::with('penduduk', 'penduduk.desa')->where('suplemen_id', $id_terdata)->get())
+        if ($request->ajax()) {
+            $desa = $request->input('desa');
+
+            $terdata = SuplemenTerdata::with('penduduk', 'penduduk.desa')
+                ->where('suplemen_id', $id_terdata)
+                ->when($desa && $desa !== 'Semua', fn ($query) => $query->where('desa_id', $desa))
+                ->get();
+
+            if ($this->isDatabaseGabungan()) {
+                $pendudukGabungan = $this->pendudukGabunganBatch(
+                    $terdata->pluck('penduduk_id_gabungan')->filter()->values()->all()
+                );
+
+                $terdata = $terdata->map(function (SuplemenTerdata $row) use ($pendudukGabungan) {
+                    if ($row->penduduk_id_gabungan && ! $row->penduduk) {
+                        $penduduk = $pendudukGabungan[(int) $row->penduduk_id_gabungan] ?? null;
+
+                        if ($penduduk) {
+                            $row->setRelation('penduduk', $penduduk);
+                        }
+                    }
+
+                    return $row;
+                });
+            }
+
+            return DataTables::of($terdata)
                 ->addIndexColumn()
                 ->addColumn('aksi', function ($row) {
-                    if (!auth()->guest()) {
-                        $data['edit_url'] = route('data.data-suplemen.editdetail', [$row->id, $row->suplemen_id]);
-                        $data['delete_url'] = route('data.data-suplemen.destroydetail', [$row->id, $row->suplemen_id]);
+                    if (! $row instanceof SuplemenTerdata) {
+                        return null;
                     }
 
+                    if (auth()->guest()) {
+                        return null;
+                    }
+
+                    $data['edit_url'] = auth()->user()->can('access.data.data_suplemen.edit') ? route('data.data-suplemen.editdetail', [$row->id, $row->suplemen_id]) : null;
+                    $data['delete_url'] = auth()->user()->can('access.data.data_suplemen.delete') ? route('data.data-suplemen.destroydetail', [$row->id, $row->suplemen_id]) : null;
+
                     return view('forms.aksi', $data);
                 })
                 ->editColumn('penduduk.sex', function ($row) {
                     $sex = ['1' => 'Laki-laki', '2' => 'Perempuan'];
 
-                    return $sex[$row->penduduk->sex];
+                    return $sex[$row->penduduk->sex] ?? '-';
                 })
                 ->make();
         }
     }
 
-    public function getPenduduk($desa, $suplemen)
+    public function getPenduduk(string $desa, int $suplemen): JsonResponse
     {
         $penduduk = [];
 
@@ -258,83 +278,97 @@ public function getPenduduk($desa, $suplemen)
 
     /**
      * Show the form for creating a new resource.
-     *
-     * @return \Illuminate\Http\Response
      */
-    public function createDetail($id_suplemen)
+    public function createDetail(int $id_suplemen): View
     {
         $suplemen = Suplemen::findOrFail($id_suplemen);
         $sasaran = ['1' => 'Penduduk', '2' => 'Keluarga/KK'];
         $page_title = 'Anggota Suplemen';
         $page_description = 'Tambah Anggota Suplemen';
-        $desa = DataDesa::all();
         $anggota = null;
+        $isDatabaseGabungan = $this->isDatabaseGabungan();
 
-        if ($suplemen->sasaran == 1) {
-            $data = Penduduk::get();
+        if ($isDatabaseGabungan) {
+            $data = collect();
+            $desa = collect();
+            $view = 'data.data_suplemen.gabungan.create_detail';
         } else {
-            $data = Penduduk::where('kk_level', 1)->get();
+            $desa = DataDesa::all();
+            $view = 'data.data_suplemen.create_detail';
+
+            if ($suplemen->sasaran == 1) {
+                $data = Penduduk::get();
+            } else {
+                $data = Penduduk::where('kk_level', 1)->get();
+            }
         }
 
-        return view('data.data_suplemen.create_detail', compact('page_title', 'page_description', 'suplemen', 'sasaran', 'data', 'desa', 'anggota'));
+        return view($view, compact('page_title', 'page_description', 'suplemen', 'sasaran', 'data', 'desa', 'anggota', 'isDatabaseGabungan'));
     }
 
     /**
      * Store a newly created resource in storage.
-     *
-     * @return \Illuminate\Http\Response
      */
-    public function storeDetail(Request $request)
+    public function storeDetail(SuplemenTerdataRequest $request): RedirectResponse
     {
-        request()->validate(
-            ['penduduk_id' => 'required'],
-            ['penduduk_id.required' => 'isian warga atau penduduk wajib diisi']
-        );
+        $data = $this->normalizePendudukSumber($this->resolveDesaId($request->validated()));
 
         try {
-            SuplemenTerdata::create($request->all());
+            SuplemenTerdata::create($data);
         } catch (\Exception $e) {
             Log::error('Suplemen Terdata creation failed', [
                 'error' => $e->getMessage(),
                 'user_id' => auth()->id(),
-                'suplemen_id' => $request['suplemen_id'],
+                'suplemen_id' => $request->input('suplemen_id'),
             ]);
 
             return back()->withInput()->with('error', 'Anggota Suplemen gagal ditambah!');
         }
 
-        return redirect()->route('data.data-suplemen.show', $request['suplemen_id'])->with('success', 'Anggota Suplemen berhasil ditambah!');
+        return redirect()->route('data.data-suplemen.show', $request->input('suplemen_id'))->with('success', 'Anggota Suplemen berhasil ditambah!');
     }
 
     /**
      * Show the form for editing the specified resource.
-     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
      */
-    public function editDetail($id, $id_suplemen)
+    public function editDetail(int $id, int $id_suplemen): View
     {
         $suplemen = Suplemen::findOrFail($id_suplemen);
         $sasaran = ['1' => 'Penduduk', '2' => 'Keluarga/KK'];
         $page_title = 'Anggota Suplemen';
         $page_description = 'Ubah Anggota Suplemen';
-        $anggota = SuplemenTerdata::with('penduduk', 'penduduk.desa')->where('id', $id)->first();
-        $data = Penduduk::where('id', $anggota->penduduk_id)->get();
+        $anggota = SuplemenTerdata::with('penduduk', 'penduduk.desa')->where('id', $id)->firstOrFail();
+        $isDatabaseGabungan = $this->isDatabaseGabungan();
+
+        if ($isDatabaseGabungan) {
+            $penduduk = null;
+
+            if ($anggota->penduduk_id_gabungan) {
+                $penduduk = $this->pendudukGabunganBatch([$anggota->penduduk_id_gabungan])[(int) $anggota->penduduk_id_gabungan] ?? null;
+            }
+
+            $selectedDesaId = $penduduk?->desa?->desa_id ?? $anggota->desa_id;
+
+            return view('data.data_suplemen.gabungan.edit_detail', compact('page_title', 'page_description', 'suplemen', 'sasaran', 'anggota', 'isDatabaseGabungan', 'penduduk', 'selectedDesaId'));
+        }
+
         $desa = DataDesa::all();
+        $data = $anggota->penduduk_id ? Penduduk::where('id', $anggota->penduduk_id)->get() : collect();
+        $selectedDesaId = optional($anggota->penduduk)?->desa?->desa_id ?? $anggota->desa_id;
+        $selectedPendudukId = optional($anggota->penduduk)->id;
 
-        return view('data.data_suplemen.edit_detail', compact('page_title', 'page_description', 'suplemen', 'sasaran', 'data', 'desa', 'anggota'));
+        return view('data.data_suplemen.edit_detail', compact('page_title', 'page_description', 'suplemen', 'sasaran', 'data', 'desa', 'anggota', 'isDatabaseGabungan', 'selectedDesaId', 'selectedPendudukId'));
     }
 
     /**
      * Update the specified resource in storage.
-     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
      */
-    public function updateDetail(Request $request, $id)
+    public function updateDetail(SuplemenTerdataRequest $request, int $id): RedirectResponse
     {
+        $data = $this->normalizePendudukSumber($this->resolveDesaId($request->validated()));
+
         try {
-            SuplemenTerdata::findOrFail($id)->update($request->all());
+            SuplemenTerdata::findOrFail($id)->update($data);
         } catch (\Exception $e) {
             Log::error('Suplemen Terdata update failed', [
                 'error' => $e->getMessage(),
@@ -345,16 +379,13 @@ public function updateDetail(Request $request, $id)
             return back()->withInput()->with('error', 'Anggota Suplemen gagal diubah!');
         }
 
-        return redirect()->route('data.data-suplemen.show', $request['suplemen_id'])->with('success', 'Anggota Suplemen berhasil diubah!');
+        return redirect()->route('data.data-suplemen.show', $request->input('suplemen_id'))->with('success', 'Anggota Suplemen berhasil diubah!');
     }
 
     /**
      * Remove the specified resource from storage.
-     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
      */
-    public function destroyDetail($id, $id_suplemen)
+    public function destroyDetail(int $id, int $id_suplemen): RedirectResponse
     {
         try {
             SuplemenTerdata::findOrFail($id)->delete();
@@ -374,11 +405,8 @@ public function destroyDetail($id, $id_suplemen)
 
     /**
      * Export Excel data suplemen.
-     *
-     * @param Request $request
-     * @return \Symfony\Component\HttpFoundation\BinaryFileResponse
      */
-    public function exportExcel(Request $request)
+    public function exportExcel(Request $request): BinaryFileResponse
     {
         $filters = $request->only(['nama', 'sasaran']);
         $timestamp = date('Y-m-d-H-i-s');
@@ -389,18 +417,139 @@ public function exportExcel(Request $request)
 
     /**
      * Export Excel data suplemen terdata.
-     *
-     * @param Request $request
-     * @param int $id Suplemen ID
-     * @return \Symfony\Component\HttpFoundation\BinaryFileResponse
      */
-    public function exportTerdataExcel(Request $request, $id)
+    public function exportTerdataExcel(Request $request, int $id): BinaryFileResponse
     {
         $suplemen = Suplemen::findOrFail($id);
         $filters = $request->only(['desa', 'nama_penduduk']);
         $timestamp = date('Y-m-d-H-i-s');
         $filename = "data-suplemen-terdata-{$suplemen->slug}-{$timestamp}.xlsx";
 
+        if ($this->isDatabaseGabungan()) {
+            $query = SuplemenTerdata::query()->where('suplemen_id', $id);
+
+            if (!empty($filters['desa'])) {
+                $query->where(function ($q) use ($filters) {
+                    $q->where('desa_id', $filters['desa']);
+                });
+            }
+
+            if (!empty($filters['nama_penduduk'])) {
+                $query->whereHas('penduduk', function ($q) use ($filters) {
+                    $q->where('nama', 'like', '%' . $filters['nama_penduduk'] . '%');
+                });
+            }
+
+            $pendudukGabunganIds = $query->whereNotNull('penduduk_id_gabungan')->pluck('penduduk_id_gabungan')->filter()->values()->all();
+
+            return Excel::download(new ExportSuplemenTerdataGabungan($id, $filters, $pendudukGabunganIds), $filename);
+        }
+
         return Excel::download(new ExportSuplemenTerdata($id, $filters), $filename);
     }
+
+    /**
+     * Normalisasi sumber penduduk untuk anggota suplemen.
+     *
+     * Anggota hanya boleh berisi salah satu sumber: penduduk lokal (penduduk_id)
+     * atau penduduk dari database gabungan (penduduk_id_gabungan), tidak keduanya.
+     */
+    private function normalizePendudukSumber(array $validated): array
+    {
+        if (! empty($validated['penduduk_id_gabungan'])) {
+            $validated['penduduk_id'] = null;
+        } else {
+            $validated['penduduk_id_gabungan'] = null;
+        }
+
+        return $validated;
+    }
+
+    /**
+     * Resolusi desa_id untuk anggota suplemen.
+     *
+     * Nilai desa_id dari form diutamakan. Fallback diambil dari respons API
+     * database gabungan (config.kode_desa) atau kolom desa_id das_penduduk
+     * untuk penduduk lokal.
+     */
+    private function resolveDesaId(array $data): array
+    {
+        if (! empty($data['desa_id'])) {
+            return $data;
+        }
+
+        if (! empty($data['penduduk_id_gabungan'])) {
+            $penduduk = $this->pendudukGabunganBatch([(int) $data['penduduk_id_gabungan']])[(int) $data['penduduk_id_gabungan']] ?? null;
+            $data['desa_id'] = $penduduk?->desa?->desa_id;
+        } elseif (! empty($data['penduduk_id'])) {
+            $data['desa_id'] = Penduduk::where('id', $data['penduduk_id'])->value('desa_id');
+        }
+
+        return $data;
+    }
+
+    /**
+     * Resolusi beberapa penduduk dari database gabungan sekaligus (batch)
+     * menggunakan filter id_penduduk berupa array, agar tidak melakukan
+     * request berulang per anggota.
+     *
+     * @param  array<int, int|string>  $ids
+     *
+     * @return array<int, Penduduk>
+     */
+    private function pendudukGabunganBatch(array $ids): array
+    {
+        if (empty($ids)) {
+            return [];
+        }
+
+        try {
+            $penduduk = [];
+
+            foreach ((new PendudukService())->pendudukGabunganByIds($ids) as $item) {
+                if (! is_array($item)) {
+                    continue;
+                }
+
+                $penduduk[(int) ($item['id'] ?? 0)] = $this->mapGabunganPenduduk($item);
+            }
+
+            return $penduduk;
+        } catch (\Exception $e) {
+            Log::error('Penduduk batch fetch from gabungan failed', [
+                'error' => $e->getMessage(),
+                'ids' => $ids,
+            ]);
+
+            return [];
+        }
+    }
+
+    /**
+     * Map respons penduduk API database gabungan (JSON:API) ke model Eloquent
+     * yang digunakan kolom datatable dan form anggota suplemen.
+     */
+    private function mapGabunganPenduduk(array $item): Penduduk
+    {
+        $attributes = $item['attributes'] ?? [];
+
+        $penduduk = new Penduduk();
+        $penduduk->forceFill([
+            'id' => $item['id'] ?? null,
+            'no_kk' => data_get($attributes, 'keluarga.no_kk') ?? $attributes['no_kk'] ?? null,
+            'nik' => $attributes['nik'] ?? null,
+            'nama' => $attributes['nama'] ?? null,
+            'tempat_lahir' => $attributes['tempatlahir'] ?? $attributes['tempat_lahir'] ?? null,
+            'tanggal_lahir' => $attributes['tanggallahir'] ?? $attributes['tanggal_lahir'] ?? null,
+            'sex' => $attributes['sex'] ?? null,
+            'alamat' => $attributes['alamat_sekarang'] ?? $attributes['alamat'] ?? null,
+        ]);
+
+        $desa = new DataDesa();
+        $desa->nama = data_get($attributes, 'config.nama_desa') ?? $attributes['nama_desa'] ?? null;
+        $desa->desa_id = data_get($attributes, 'config.kode_desa') ?? $attributes['kode_desa'] ?? null;
+        $penduduk->setRelation('desa', $desa);
+
+        return $penduduk;
+    }
 }
diff --git a/app/Http/Controllers/Data/TingkatPendidikanController.php b/app/Http/Controllers/Data/TingkatPendidikanController.php
index 2fdab92d08..8f27d095c1 100644
--- a/app/Http/Controllers/Data/TingkatPendidikanController.php
+++ b/app/Http/Controllers/Data/TingkatPendidikanController.php
@@ -36,6 +36,7 @@
 use App\Http\Requests\TingkatPendidikanRequest;
 use App\Imports\ImporTingkatPendidikan;
 use App\Models\TingkatPendidikan;
+use App\Services\DesaService;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Illuminate\Support\Facades\Log;
@@ -61,7 +62,7 @@ public function getData()
     {
         if (request()->ajax()) {
             $desa = request()->input('desa');
-
+            $listDesa = (new DesaService)->listDesa()->pluck('nama', 'desa_id');
             return DataTables::of(
                 TingkatPendidikan::when($desa && $desa !== 'Semua', function ($query) use ($desa) {
                     return $query->where('desa_id', $desa);
@@ -74,6 +75,9 @@ public function getData()
 
                     return view('forms.aksi', $data);
                 })
+                ->addColumn('nama_desa', function ($row) use ($listDesa) {
+                    return $row->desa->nama ?? $listDesa[$row->desa_id] ?? '-';
+                })
                 ->rawColumns(['aksi'])
                 ->make();
         }
diff --git a/app/Http/Controllers/Data/ToiletSanitasiController.php b/app/Http/Controllers/Data/ToiletSanitasiController.php
index aa60afe6e3..227f6eae17 100644
--- a/app/Http/Controllers/Data/ToiletSanitasiController.php
+++ b/app/Http/Controllers/Data/ToiletSanitasiController.php
@@ -34,6 +34,7 @@
 use App\Exports\ExportToiletSanitasi;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\ImportToiletSanitasiRequest;
+use App\Http\Requests\UpdateToiletSanitasiRequest;
 use App\Imports\ImporToiletSanitasi;
 use App\Models\ToiletSanitasi;
 use App\Services\DesaService;
@@ -65,8 +66,12 @@ public function index()
      */
     public function getDataAKIAKB()
     {
+        $desa = request()->input('desa');
         $listDesa = (new DesaService)->listDesa()->pluck('nama', 'desa_id');
-        return DataTables::of(ToiletSanitasi::with(['desa']))
+        return DataTables::of(ToiletSanitasi::when($desa && $desa !== 'Semua', function ($query) use ($desa) {
+            return $query->where('desa_id', $desa);
+        })
+            ->with(['desa']))
             ->addColumn('aksi', function ($row) {
                 $data['edit_url'] = auth()->user()->can('access.data.toilet_sanitasi.edit') ? route('data.toilet-sanitasi.edit', $row->id) : null;
                 $data['delete_url'] = auth()->user()->can('access.data.toilet_sanitasi.delete') ? route('data.toilet-sanitasi.destroy', $row->id) : null;
@@ -114,7 +119,7 @@ public function do_import(ImportToiletSanitasiRequest $request)
             return back()->with('error', 'Import data gagal.');
         }
 
-        return back()->with('success', 'Import data sukses.');
+        return redirect()->route('data.toilet_sanitasi.index')->with('success', 'Data berhasil diimpor!');        
     }
 
     /**
@@ -127,7 +132,7 @@ public function edit($id)
     {
         $toilet = ToiletSanitasi::with(['desa'])->findOrFail($id);
         $page_title = 'Toilet & Sanitasi';
-        $page_description = 'Ubah Toilet & Sanitasi : ' . $toilet->desa->nama;
+        $page_description = 'Ubah Toilet & Sanitasi : ' . nama_desa($toilet->desa_id);
 
         return view('data.toilet_sanitasi.edit', compact('page_title', 'page_description', 'toilet'));
     }
@@ -138,15 +143,10 @@ public function edit($id)
      * @param  int  $id
      * @return Response
      */
-    public function update(Request $request, $id)
+    public function update(UpdateToiletSanitasiRequest $request, $id)
     {
-        request()->validate([
-            'toilet' => 'required',
-            'sanitasi' => 'required',
-        ]);
-
         try {
-            ToiletSanitasi::findOrFail($id)->update($request->all());
+            ToiletSanitasi::findOrFail($id)->update($request->validated());
         } catch (\Exception $e) {
             Log::error('Toilet Sanitasi update failed', [
                 'error' => $e->getMessage(),
diff --git a/app/Http/Controllers/FrontEnd/PageController.php b/app/Http/Controllers/FrontEnd/PageController.php
index ac9d8eb89a..1293e312ed 100644
--- a/app/Http/Controllers/FrontEnd/PageController.php
+++ b/app/Http/Controllers/FrontEnd/PageController.php
@@ -34,22 +34,28 @@
 use App\Enums\SurveiEnum;
 use App\Facades\Counter;
 use App\Http\Controllers\FrontEndController;
+use App\Http\Requests\KirimBalasanRequest;
+use App\Http\Requests\KirimKomentarRequest;
 use App\Http\Requests\SurveiRequest;
 use App\Models\Artikel;
 use App\Models\Comment;
 use App\Models\Event;
 use App\Models\Kategori;
 use App\Models\Survei;
+use App\Models\TipePotensi;
 use App\Services\DesaService;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Session;
+use Illuminate\View\View;
 use Jenssegers\Agent\Agent;
 
 class PageController extends FrontEndController
 {
     protected $data = [];
 
-    public function index()
+    public function index(): View
     {
         Counter::count('beranda');
 
@@ -65,7 +71,7 @@ public function index()
         ]);
     }
 
-    public function beritaDesa()
+    public function beritaDesa(): View
     {
         if ($this->isDatabaseGabungan()) {
             $apiServer = $this->settings['api_server_database_gabungan'] ?? '';
@@ -94,13 +100,7 @@ public function beritaDesa()
         ]);
     }
 
-    private function getFeeds()
-    {        
-        $feeds = (new DesaService())->getFeeds();
-        return $feeds ?? null;
-    }
-
-    public function filterFeeds(Request $request)
+    public function filterFeeds(Request $request): JsonResponse
     {
         $this->data = $this->getFeeds();
         $feeds = collect($this->data);
@@ -141,23 +141,34 @@ public function filterFeeds(Request $request)
         return response()->json(compact('html'));
     }
 
-    public function PotensiByKategory($slug)
+    public function PotensiIndex(): View
     {
         $page_title = 'Potensi';
-        $page_description = 'Potensi-Potensi';
+        $page_description = 'Potensi-Potensi Kecamatan';
+        $kategori_potensi = TipePotensi::all();
+
+        return view('pages.potensi.index', compact(['page_title', 'page_description', 'kategori_potensi']));
+    }
+
+    public function PotensiByKategory(string $slug): View
+    {
+        $kategori = TipePotensi::where('slug', $slug)->first();
+        $page_title = 'Potensi' . ($kategori ? ' - ' . $kategori->nama_kategori : '');
+        $page_description = 'Potensi-Potensi Kecamatan' . ($kategori ? ' Kategori ' . $kategori->nama_kategori : '');
+        $kategori_potensi = TipePotensi::all();
 
-        return view('pages.potensi.index', compact(['page_title', 'page_description', 'slug']));
+        return view('pages.potensi.index', compact(['page_title', 'page_description', 'slug', 'kategori', 'kategori_potensi']));
     }
 
-    public function PotensiShow($kategori, $slug)
+    public function PotensiShow(string $kategori, string $id): View
     {
         $page_title = 'Potensi';
         $page_description = 'Potensi-Potensi Kecamatan';
 
-        return view('pages.potensi.show', compact(['page_title', 'page_description', 'slug']));
+        return view('pages.potensi.show', compact(['page_title', 'page_description', 'id']));
     }
 
-    public function DesaShow($slug)
+    public function DesaShow(string $slug): View
     {
         $desa = (new DesaService)->dataDesa($slug);
         $page_title = 'Desa '.$desa->nama;
@@ -166,12 +177,12 @@ public function DesaShow($slug)
         return view('pages.desa.desa_show', compact('page_title', 'page_description', 'desa'));
     }
 
-    public function refresh_captcha()
+    public function refresh_captcha(): JsonResponse
     {
         return response()->json(['captcha' => captcha_img('mini')]);
     }
 
-    public function kategoriBerita($slug)
+    public function kategoriBerita(string $slug): View
     {
         $kategori = Kategori::where('slug', $slug)->firstOrFail();
         $artikel = Artikel::whereRelation('kategori', 'slug', $slug)->paginate(9);
@@ -179,7 +190,7 @@ public function kategoriBerita($slug)
         return view('pages.berita.kategori', compact('artikel', 'kategori'));
     }
 
-    public function detailBerita($slug, Request $request)
+    public function detailBerita(string $slug, Request $request): View
     {
         // Temukan artikel berdasarkan slug
         $artikel = Artikel::with(['kategori', 'comments' => function ($query) use ($request) {
@@ -214,18 +225,8 @@ public function detailBerita($slug, Request $request)
         return view('pages.berita.detail', compact('page_title', 'page_description', 'page_image', 'artikel', 'comments'));
     }
 
-    public function kirimKomentar(Request $request)
+    public function kirimKomentar(KirimKomentarRequest $request): RedirectResponse
     {
-
-        // Validasi input
-        $validated = $request->validate([
-            'nama' => 'required|string|max:255',
-            'email' => 'required|email|max:255',
-            'body' => 'required|string',
-            'das_artikel_id' => 'required|exists:das_artikel,id',
-            'captcha_main' => 'required|captcha',
-        ]);
-
         try {
             // Mendeteksi IP address
             $ipAddress = $request->ip();
@@ -241,11 +242,11 @@ public function kirimKomentar(Request $request)
 
             // Simpan komentar baru
             $comment = Comment::create([
-                'nama' => $validated['nama'],
-                'email' => $validated['email'],
-                'body' => $validated['body'],
+                'nama' => $request->nama,
+                'email' => $request->email,
+                'body' => $request->body,
                 'status' => 'disable', // Set status default ke 'disable' untuk moderasi
-                'das_artikel_id' => $validated['das_artikel_id'],
+                'das_artikel_id' => $request->das_artikel_id,
                 'comment_id' => $request->input('comment_id', null), // Jika ini adalah balasan
                 'ip_address' => $ipAddress,
                 'device' => $deviceInfo,
@@ -262,7 +263,7 @@ public function kirimKomentar(Request $request)
         }
     }
 
-    public function modalKirimBalasan(Request $request)
+    public function modalKirimBalasan(Request $request): View
     {
         $commentId = $request->input('comment_id');
         $artikelId = $request->input('artikel_id');
@@ -270,17 +271,8 @@ public function modalKirimBalasan(Request $request)
         return view('pages.berita.comment', compact('commentId', 'artikelId'));
     }
 
-    public function kirimBalasan(Request $request)
+    public function kirimBalasan(KirimBalasanRequest $request): RedirectResponse
     {
-        $request->validate([
-            'nama' => 'required|string|max:255',
-            'email' => 'required|email|max:255',
-            'body' => 'required|string',
-            'captcha_main' => 'required|captcha',
-            'das_artikel_id' => 'required|exists:das_artikel,id', // Pastikan artikel terkait ada
-            'comment_id' => 'required|exists:das_artikel_comment,id', // Pastikan comment_id ada
-        ]);
-
         try {
             // Mendeteksi IP address
             $ipAddress = $request->ip();
@@ -314,7 +306,7 @@ public function kirimBalasan(Request $request)
         }
     }
 
-    public function eventDetail($slug)
+    public function eventDetail(string $slug): View
     {
         $event = Event::slug($slug)->firstOrFail();
         $page_title = $event->event_name;
@@ -323,7 +315,7 @@ public function eventDetail($slug)
         return view('pages.event.event_detail', compact('page_title', 'page_description', 'event'));
     }
 
-    public function kategori($slug)
+    public function kategori(string $slug): View
     {
         return view('pages.berita.kategori', [
             'apiBaseKategori' => url($this->urlApi.'/kategori?'.http_build_query([
@@ -341,7 +333,7 @@ public function kategori($slug)
     }
 
     // fitur survey indeks kepuasan pengguna terhadap penyajian informasi yang tersedia di website
-    public function survei()
+    public function survei(): View
     {
         $page_title = 'Index Kepuasan Masyarakat';
 
@@ -360,7 +352,7 @@ public function survei()
         return view('pages.ikm.index', compact('page_title', 'results'));
     }
 
-    public function surveiSubmit(SurveiRequest $request)
+    public function surveiSubmit(SurveiRequest $request): RedirectResponse
     {
         // Cek ulang session untuk keamanan
         if (Session::has('survey_submitted')) {
@@ -381,4 +373,10 @@ public function surveiSubmit(SurveiRequest $request)
 
         return redirect()->back()->with('success', 'Terima kasih atas tanggapan Anda!');
     }
+
+    private function getFeeds(): ?array
+    {
+        $feeds = (new DesaService())->getFeeds();
+        return $feeds ?? null;
+    }
 }
diff --git a/app/Http/Controllers/FrontEnd/ProfilController.php b/app/Http/Controllers/FrontEnd/ProfilController.php
index c966126ec0..1cfd4bfb10 100644
--- a/app/Http/Controllers/FrontEnd/ProfilController.php
+++ b/app/Http/Controllers/FrontEnd/ProfilController.php
@@ -76,13 +76,14 @@ public function LetakGeografis()
         Counter::count('profil.letak-geografis');
 
         $wilayah_desa = (new DesaService())->listPathDesa();
+        $data_umum = DataUmum::first();
         $page_title = 'Letak Geografis';
 
         $page_description = $this->browser_title;
 
         $view = $this->isDatabaseGabungan() ? 'pages.profil.gabungan.letakgeografis' : 'pages.profil.letakgeografis';
 
-        return view($view, compact('page_title', 'page_description', 'wilayah_desa'));
+        return view($view, compact('page_title', 'page_description', 'wilayah_desa', 'data_umum'));
     }
 
     public function StrukturPemerintahan()
diff --git a/app/Http/Controllers/FrontEnd/SistemKomplainController.php b/app/Http/Controllers/FrontEnd/SistemKomplainController.php
index 052795c816..a653b4c976 100644
--- a/app/Http/Controllers/FrontEnd/SistemKomplainController.php
+++ b/app/Http/Controllers/FrontEnd/SistemKomplainController.php
@@ -31,15 +31,14 @@
 
 namespace App\Http\Controllers\FrontEnd;
 
+use App\Http\Controllers\FrontEndController;
+use App\Http\Requests\FrontEnd\SistemKomplainRequest;
+use App\Models\JawabKomplain;
 use App\Models\Komplain;
 use App\Models\Penduduk;
+use App\Services\PendudukService;
 use Illuminate\Http\Request;
-use App\Models\JawabKomplain;
 use Illuminate\Http\Response;
-use Illuminate\Support\Facades\Validator;
-use App\Http\Controllers\FrontEndController;
-use App\Rules\ValidasiNikRule;
-use App\Services\PendudukService;
 use Illuminate\Support\Facades\Log;
 
 class SistemKomplainController extends FrontEndController
@@ -100,34 +99,15 @@ public function tracking(Request $request)
         }
     }
 
-    public function store(Request $request)
+    public function store(SistemKomplainRequest $request)
     {
         try {
-            $maxRule = \App\Services\FileUploadService::isLimitEnabled() ? '|max:1024' : '';
-            $validator = Validator::make($request->all(), [
-                'nik' => ['required', 'numeric', new ValidasiNikRule($request->input('tanggal_lahir'))],
-                'judul' => 'required|string|max:255',
-                'kategori' => 'required',
-                'laporan' => 'required|string',
-                'captcha' => 'required|captcha',
-                'tanggal_lahir' => 'required|date',
-                'lampiran1' => 'file|mimes:jpeg,png,jpg,gif,svg' . $maxRule . '|valid_file',
-                'lampiran2' => 'file|mimes:jpeg,png,jpg,gif,svg' . $maxRule . '|valid_file',
-                'lampiran3' => 'file|mimes:jpeg,png,jpg,gif,svg' . $maxRule . '|valid_file',
-                'lampiran4' => 'file|mimes:jpeg,png,jpg,gif,svg' . $maxRule . '|valid_file',
-            ], [
-                'captcha.captcha' => 'Invalid captcha code.',
-            ]);
-
-            if ($validator->fails()) {
-                return back()->withInput()->with('error', 'Komplain gagal dikirim!')->withErrors($validator);
-            }
             $komplain = new Komplain($request->all());
 
             $penduduk = $this->isDatabaseGabungan()
                 ? (new PendudukService)->cekPendudukNikTanggalLahir($request->input('nik'), $request->input('tanggal_lahir'))
                 : Penduduk::where('nik', $komplain->nik)->first();
-
+    
             $komplain->komplain_id = Komplain::generateID();
             $komplain->slug = str_slug($komplain->judul) . '-' . $komplain->komplain_id;
             $komplain->status = 'REVIEW';
@@ -211,6 +191,7 @@ public function store(Request $request)
      * Display the specified resource.
      *
      * @param  int  slug
+     *
      * @return Response
      */
     public function show($slug)
@@ -292,5 +273,4 @@ public function getJawabans(Request $request)
 
         return view('pages.komplain.jawabans', compact('jawabans', 'komplain'))->render();
     }
-
 }
diff --git a/app/Http/Controllers/Informasi/PotensiController.php b/app/Http/Controllers/Informasi/PotensiController.php
index a2498f43ff..c3110b4e3f 100644
--- a/app/Http/Controllers/Informasi/PotensiController.php
+++ b/app/Http/Controllers/Informasi/PotensiController.php
@@ -31,11 +31,11 @@
 
 namespace App\Http\Controllers\Informasi;
 
+use App\Http\Controllers\Controller;
+use App\Http\Requests\PotensiRequest;
 use App\Models\Potensi;
 use App\Models\TipePotensi;
 use App\Traits\HandlesFileUpload;
-use App\Http\Controllers\Controller;
-use App\Http\Requests\PotensiRequest;
 use Illuminate\Support\Facades\Log;
 use Yajra\DataTables\Facades\DataTables;
 
@@ -103,6 +103,10 @@ public function store(PotensiRequest $request)
 
             $this->handleFileUpload($request, $input, 'file_gambar', 'potensi_kecamatan');
 
+            if ($request->hasFile('file_gambar')) {
+                $input['mime_type'] = $request->file('file_gambar')->getClientMimeType();
+            }
+
             Potensi::create($input);
         } catch (\Exception $e) {
             Log::error('Potensi creation failed', [
@@ -139,6 +143,10 @@ public function update(PotensiRequest $request, Potensi $potensi)
 
             $this->handleFileUpload($request, $input, 'file_gambar', 'potensi_kecamatan');
 
+            if ($request->hasFile('file_gambar')) {
+                $input['mime_type'] = $request->file('file_gambar')->getClientMimeType();
+            }
+
             $potensi->update($input);
         } catch (\Exception $e) {
             Log::error('Potensi update failed', [
@@ -175,25 +183,13 @@ public function destroy(Potensi $potensi)
     public function download(Potensi $potensi)
     {
         try {
-            $path = $potensi->file_gambar;
-            if (empty($path)) {
-                return back()->with('error', 'Dokumen potensi tidak ditemukan');
-            }
+            $filePath = $this->resolveSecureFilePath($potensi->file_gambar);
 
-            if (file_exists(public_path($path))) {
-                return response()->download(public_path($path));
-            }
-
-            if (file_exists(base_path('public/' . $path))) {
-                return response()->download(base_path('public/' . $path));
+            if (!$filePath) {
+                return back()->with('error', 'Dokumen potensi tidak ditemukan');
             }
 
-            $storagePath = storage_path('app/public/' . str_replace('storage/', '', $path));
-            if (file_exists($storagePath)) {
-                return response()->download($storagePath);
-            }
-            
-            return back()->with('error', 'Dokumen potensi tidak ditemukan');
+            return response()->download($filePath);
         } catch (\Exception $e) {
             Log::error('Potensi download failed', [
                 'error' => $e->getMessage(),
diff --git a/app/Http/Controllers/Informasi/ProsedurController.php b/app/Http/Controllers/Informasi/ProsedurController.php
index 73ec08a3bb..5d4ff1b84c 100644
--- a/app/Http/Controllers/Informasi/ProsedurController.php
+++ b/app/Http/Controllers/Informasi/ProsedurController.php
@@ -31,12 +31,12 @@
 
 namespace App\Http\Controllers\Informasi;
 
-use App\Models\Prosedur;
-use Yajra\DataTables\DataTables;
-use App\Traits\HandlesFileUpload;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\ProsedurRequest;
+use App\Models\Prosedur;
+use App\Traits\HandlesFileUpload;
 use Illuminate\Support\Facades\Log;
+use Yajra\DataTables\DataTables;
 
 class ProsedurController extends Controller
 {
@@ -98,7 +98,6 @@ public function getDataProsedur()
                 }
 
                 $data['download_url'] = auth()->user()->can('access.informasi.prosedur.export') ? route('informasi.prosedur.download', $row->id) : null;
-                $data['preview_url'] = auth()->user()->can('access.informasi.prosedur.view') ? route('informasi.prosedur.preview', $row->id) : null;
 
                 return view('forms.aksi', $data);
             })
@@ -196,7 +195,13 @@ public function destroy(Prosedur $prosedur)
     public function download(Prosedur $prosedur)
     {
         try {
-            return response()->download($prosedur->file_prosedur);
+            $filePath = $this->resolveSecureFilePath($prosedur->file_prosedur);
+
+            if (!$filePath) {
+                return back()->with('error', 'Dokumen prosedur tidak ditemukan');
+            }
+
+            return response()->download($filePath);
         } catch (\Exception $e) {
             Log::error('Prosedur download failed', [
                 'error' => $e->getMessage(),
@@ -207,28 +212,4 @@ public function download(Prosedur $prosedur)
             return back()->with('error', 'Dokumen prosedur tidak ditemukan');
         }
     }
-
-    public function preview(Prosedur $prosedur)
-    {
-        $path = $prosedur->file_prosedur;
-
-        if (empty($path)) {
-            abort(404, 'File tidak ditemukan.');
-        }
-
-        if (file_exists(public_path($path))) {
-            return response()->file(public_path($path));
-        }
-
-        if (file_exists(base_path('public/' . $path))) {
-            return response()->file(base_path('public/' . $path));
-        }
-
-        $storagePath = storage_path('app/public/' . str_replace('storage/', '', $path));
-        if (file_exists($storagePath)) {
-            return response()->file($storagePath);
-        }
-
-        abort(404, 'File tidak ditemukan.');
-    }
 }
diff --git a/app/Http/Controllers/Informasi/RegulasiController.php b/app/Http/Controllers/Informasi/RegulasiController.php
index 580cd12662..d5785a5304 100644
--- a/app/Http/Controllers/Informasi/RegulasiController.php
+++ b/app/Http/Controllers/Informasi/RegulasiController.php
@@ -31,12 +31,12 @@
 
 namespace App\Http\Controllers\Informasi;
 
-use App\Models\Regulasi;
-use App\Traits\HandlesFileUpload;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\RegulasiRequest;
 use App\Http\Requests\RegulasiUpdateRequest;
+use App\Models\Regulasi;
 use App\Models\TipeRegulasi;
+use App\Traits\HandlesFileUpload;
 use Illuminate\Support\Facades\Log;
 use Yajra\DataTables\Facades\DataTables;
 
@@ -124,7 +124,6 @@ public function update(RegulasiUpdateRequest $request, Regulasi $regulasi)
             $input['profil_id'] = $this->profil->id;
             $this->handleFileUpload($request, $input, 'file_regulasi', 'regulasi');
 
-
             if ($request->hasFile('file_regulasi')) {
                 $input['mime_type'] = $request->file('file_regulasi')->getMimeType();
             }
@@ -167,7 +166,13 @@ public function destroy(Regulasi $regulasi)
     public function download(Regulasi $regulasi)
     {
         try {
-            return response()->download($regulasi->file_regulasi);
+            $filePath = $this->resolveSecureFilePath($regulasi->file_regulasi);
+
+            if (!$filePath) {
+                return back()->with('error', 'Dokumen regulasi tidak ditemukan');
+            }
+
+            return response()->download($filePath);
         } catch (\Exception $e) {
             Log::error('Regulasi download failed', [
                 'error' => $e->getMessage(),
diff --git a/app/Http/Controllers/LogViewerController.php b/app/Http/Controllers/LogViewerController.php
index 0f5e780804..b8ee2ffe90 100644
--- a/app/Http/Controllers/LogViewerController.php
+++ b/app/Http/Controllers/LogViewerController.php
@@ -81,11 +81,11 @@ public function index()
     {
         $folderFiles = [];
         if ($this->request->input('f')) {
-            $this->log_viewer->setFolder(Crypt::decrypt($this->request->input('f')));
+            $this->log_viewer->setFolder(Crypt::decryptString($this->request->input('f')));
             $folderFiles = $this->log_viewer->getFolderFiles(true);
         }
         if ($this->request->input('l')) {
-            $this->log_viewer->setFile(Crypt::decrypt($this->request->input('l')));
+            $this->log_viewer->setFile(Crypt::decryptString($this->request->input('l')));
         }
 
         if ($early_return = $this->earlyReturn()) {
@@ -143,7 +143,7 @@ public function index()
     private function earlyReturn()
     {
         if ($this->request->input('f')) {
-            $this->log_viewer->setFolder(Crypt::decrypt($this->request->input('f')));
+            $this->log_viewer->setFolder(Crypt::decryptString($this->request->input('f')));
         }
 
         if ($this->request->input('dl')) {
@@ -178,7 +178,7 @@ private function earlyReturn()
      */
     private function pathFromInput($input_string)
     {
-        return $this->log_viewer->pathToLogFile(Crypt::decrypt($this->request->input($input_string)));
+        return $this->log_viewer->pathToLogFile(Crypt::decryptString($this->request->input($input_string)));
     }
 
     /**
diff --git a/app/Http/Controllers/Pesan/PesanController.php b/app/Http/Controllers/Pesan/PesanController.php
index ea7046425a..d7a4f8b29b 100644
--- a/app/Http/Controllers/Pesan/PesanController.php
+++ b/app/Http/Controllers/Pesan/PesanController.php
@@ -32,16 +32,23 @@
 namespace App\Http\Controllers\Pesan;
 
 use App\Http\Controllers\Controller;
+use App\Http\Requests\FilterPesanRequest;
+use App\Http\Requests\ReplyPesanRequest;
+use App\Http\Requests\SetArsipPesanRequest;
+use App\Http\Requests\SetMultipleArsipPesanStatusRequest;
+use App\Http\Requests\SetMultipleReadPesanStatusRequest;
+use App\Http\Requests\StoreComposePesanRequest;
 use App\Models\Pesan;
 use App\Models\PesanDetail;
 use App\Services\DesaService;
-use Illuminate\Http\Request;
+use Illuminate\Contracts\View\View;
+use Illuminate\Http\RedirectResponse;
 use Illuminate\Support\Facades\DB;
 use Stevebauman\Purify\Facades\Purify;
 
 class PesanController extends Controller
 {
-    public function index(Request $request)
+    public function index(FilterPesanRequest $request): View
     {
         $data = collect([]);
         $data->put('page_title', 'Pesan');
@@ -72,31 +79,14 @@ public function index(Request $request)
             })
             ->paginate(Pesan::PER_PAGE);
 
-        $list_desa = (new DesaService())->listDesa();        
+        $list_desa = (new DesaService())->listDesa();
         $data->put('list_pesan', $pesan);
         $data->put('list_desa', $list_desa);
 
         return view('pesan.masuk.index', $data->all());
     }
 
-    protected function loadCounter()
-    {
-        $counter_unread = Pesan::where([
-            'jenis' => Pesan::PESAN_MASUK,
-            'diarsipkan' => Pesan::NON_ARSIP,
-            'sudah_dibaca' => Pesan::BELUM_DIBACA])->count();
-        $counter_unread_keluar = Pesan::where([
-            'jenis' => Pesan::PESAN_KELUAR,
-            'diarsipkan' => Pesan::NON_ARSIP,
-            'sudah_dibaca' => Pesan::BELUM_DIBACA])->count();
-
-        return [
-            'counter_unread' => $counter_unread,
-            'counter_unread_keluar' => $counter_unread_keluar,
-        ];
-    }
-
-    public function loadPesanKeluar(Request $request)
+    public function loadPesanKeluar(FilterPesanRequest $request): View
     {
         $data = collect([]);
         $data->put('desa_id', null);
@@ -119,16 +109,14 @@ public function loadPesanKeluar(Request $request)
 
                 return  $q->where('judul', 'LIKE', "%{$request->get('q')}%");
             })
-            ->paginate(Pesan::PER_PAGE);
-
-        $list_desa = (new DesaService())->listDesa();
+            ->paginate(Pesan::PER_PAGE);        
         $data->put('list_pesan', $pesan);
-        $data->put('list_desa', $list_desa);
+        
 
         return view('pesan.keluar.index', $data->all());
     }
 
-    public function loadPesanArsip(Request $request)
+    public function loadPesanArsip(FilterPesanRequest $request): View
     {
         $data = collect([]);
         $data->put('desa_id', null);
@@ -159,7 +147,7 @@ public function loadPesanArsip(Request $request)
         return view('pesan.arsip.index', $data->all());
     }
 
-    public function readPesan($id_pesan)
+    public function readPesan(int $id_pesan): View
     {
         $pesan = Pesan::findOrFail($id_pesan);
         if ($pesan->sudah_dibaca == Pesan::BELUM_DIBACA) {
@@ -176,7 +164,7 @@ public function readPesan($id_pesan)
         return view('pesan.read_pesan', $data->all());
     }
 
-    public function composePesan()
+    public function composePesan(): View
     {
         $data = collect([]);
         $data->put('page_title', 'Buat Pesan');
@@ -188,18 +176,9 @@ public function composePesan()
         return view('pesan.compose_pesan', $data->all());
     }
 
-    /**
-     * @throws \Illuminate\Validation\ValidationException
-     */
-    public function storeComposePesan(Request $request)
+    public function storeComposePesan(StoreComposePesanRequest $request): RedirectResponse
     {
         try {
-            $this->validate($request, [
-                'judul' => 'required',
-                'das_data_desa_id' => 'required|'.(!$this->isDatabaseGabungan() ? 'exists:das_data_desa,desa_id' : ''),
-                'text' => 'required',
-            ]);
-
             DB::transaction(function () use ($request) {
                 $desa = (new DesaService())->getDesaByKode($request->get('das_data_desa_id'));
                 $id = Pesan::create([
@@ -224,7 +203,7 @@ public function storeComposePesan(Request $request)
         }
     }
 
-    public function setArsipPesan(Request $request)
+    public function setArsipPesan(SetArsipPesanRequest $request): RedirectResponse
     {
         $pesan = Pesan::findOrFail($request->get('id'));
         $pesan->diarsipkan = Pesan::MASUK_ARSIP;
@@ -235,7 +214,7 @@ public function setArsipPesan(Request $request)
         return back()->withInput()->with('error', 'Pesan gagal diarsipkan!');
     }
 
-    public function setMultipleReadPesanStatus(Request $request)
+    public function setMultipleReadPesanStatus(SetMultipleReadPesanStatusRequest $request): RedirectResponse
     {
         $array = json_decode($request->get('array_id'));
         $pesan = Pesan::whereIn('id', $array)->update([
@@ -249,7 +228,7 @@ public function setMultipleReadPesanStatus(Request $request)
         return back()->withInput()->with('error', 'Pesan gagal ditandai!');
     }
 
-    public function setMultipleArsipPesanStatus(Request $request)
+    public function setMultipleArsipPesanStatus(SetMultipleArsipPesanStatusRequest $request): RedirectResponse
     {
         $array = json_decode($request->get('array_id'));
         $pesan = Pesan::whereIn('id', $array)->update([
@@ -263,7 +242,7 @@ public function setMultipleArsipPesanStatus(Request $request)
         return back()->withInput()->with('error', 'Pesan gagal diarsipkan!');
     }
 
-    public function replyPesan(Request $request)
+    public function replyPesan(ReplyPesanRequest $request): RedirectResponse
     {
         $pesan = PesanDetail::create([
             'pesan_id' => $request->get('id'),
@@ -278,4 +257,21 @@ public function replyPesan(Request $request)
 
         return back()->withInput()->with('error', 'Pesan gagal dikirim!');
     }
+
+    protected function loadCounter(): array
+    {
+        $counter_unread = Pesan::where([
+            'jenis' => Pesan::PESAN_MASUK,
+            'diarsipkan' => Pesan::NON_ARSIP,
+            'sudah_dibaca' => Pesan::BELUM_DIBACA])->count();
+        $counter_unread_keluar = Pesan::where([
+            'jenis' => Pesan::PESAN_KELUAR,
+            'diarsipkan' => Pesan::NON_ARSIP,
+            'sudah_dibaca' => Pesan::BELUM_DIBACA])->count();
+
+        return [
+            'counter_unread' => $counter_unread,
+            'counter_unread_keluar' => $counter_unread_keluar,
+        ];
+    }
 }
diff --git a/app/Http/Controllers/Publikasi/GaleriController.php b/app/Http/Controllers/Publikasi/GaleriController.php
index 6599741916..604a22840a 100644
--- a/app/Http/Controllers/Publikasi/GaleriController.php
+++ b/app/Http/Controllers/Publikasi/GaleriController.php
@@ -35,6 +35,7 @@
 use App\Http\Requests\GaleriRequest;
 use App\Models\Album;
 use App\Models\Galeri;
+use App\Services\MediaLinkService;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Session;
@@ -43,7 +44,6 @@
 
 class GaleriController extends Controller
 {
-
     public function index(Album $album)
     {
         $page_title = 'Album';
@@ -61,7 +61,7 @@ public function getDataGaleri(Request $request, Album $album)
                 ->addIndexColumn()
                 ->addColumn('aksi', function ($row) {
                     // $data['show_web'] = route('berita.detail', $row->slug);
-    
+
                     if (!auth()->guest()) {
                         $data['edit_url'] = auth()->user()->can('access.publikasi.galeri.edit') ? route('publikasi.galeri.edit', $row->id) : null;
                         $data['delete_url'] = auth()->user()->can('access.publikasi.galeri.delete') ? route('publikasi.galeri.destroy', $row->id) : null;
@@ -74,17 +74,22 @@ public function getDataGaleri(Request $request, Album $album)
 
                     return view('forms.aksi', $data);
                 })
+                ->addColumn('media', function (Galeri $row) {
+                    return view('publikasi.galeri.parts.media-cell', [
+                        'galeri' => $row,
+                    ]);
+                })
                 ->editColumn('status', function ($row) {
                     if ($row->status == 0) {
                         return '<span class="label label-danger">Tidak Aktif</span>';
-                    } else {
-                        return '<span class="label label-success">Aktif</span>';
                     }
+                        return '<span class="label label-success">Aktif</span>';
+
                 })
                 ->editColumn('dibuat', function ($row) {
                     return format_datetime($row->created_at);
                 })
-                ->rawColumns(['aksi', 'status', 'dibuat'])
+                ->rawColumns(['aksi', 'media', 'status', 'dibuat'])
                 ->make(true);
         }
     }
@@ -105,25 +110,29 @@ public function store(GaleriRequest $request)
             $imageNames = [];
             if ($request->hasFile('gambar')) {
                 foreach ($request->file('gambar') as $file) {
-                    $path = Storage::putFile('public/publikasi/galeri', $file);
+                    $path = Storage::disk('public')->putFile('publikasi/galeri', $file);
 
                     $imageNames[] = basename($path);
                 }
                 $input['gambar'] = $imageNames;
+            } else {
+                $input['gambar'] = null;
             }
 
+            $input['link'] = $input['jenis'] == 'file' ? null : ($input['link'] ?? null);
+            $input['media_type'] = $input['jenis'] == 'file' ? null : $this->detectMediaType($request);
             $input['album_id'] = Session::get('album_id');
 
             Galeri::create($input);
 
-            return redirect()->route('publikasi.galeri.index', Session::get('album_id'))->with('success', 'Album berhasil disimpan!');
+            return redirect()->route('publikasi.galeri.index', Session::get('album_id'))->with('success', 'Galeri berhasil disimpan!');
         } catch (\Exception $e) {
             Log::error('Galeri creation failed', [
                 'error' => $e->getMessage(),
                 'user_id' => auth()->id(),
             ]);
 
-            return back()->withInput()->with('error', 'Simpan album gagal!');
+            return back()->withInput()->with('error', 'Simpan galeri gagal!');
         }
     }
 
@@ -166,14 +175,19 @@ public function update(GaleriRequest $request, Galeri $galeri)
             $imageNames = [];
             if ($request->hasFile('gambar')) {
                 foreach ($request->file('gambar') as $file) {
-                    $path = Storage::putFile('public/publikasi/galeri', $file);
+                    $path = Storage::disk('public')->putFile('publikasi/galeri', $file);
 
                     $imageNames[] = basename($path);
                 }
                 $input['gambar'] = $imageNames;
+            } elseif (($input['jenis'] ?? null) == 'file') {
+                unset($input['gambar']);
+            } else {
+                $input['gambar'] = null;
             }
 
-            $input['link'] = $input['jenis'] == 'file' ? null : $input['link'];
+            $input['link'] = ($input['jenis'] ?? null) == 'file' ? null : ($input['link'] ?? null);
+            $input['media_type'] = ($input['jenis'] ?? null) == 'file' ? null : $this->detectMediaType($request);
 
             $galeri->update($input);
         } catch (\Exception $e) {
@@ -183,7 +197,7 @@ public function update(GaleriRequest $request, Galeri $galeri)
                 'galeri_id' => $galeri->id,
             ]);
 
-            return back()->withInput()->with('error', 'Galeri gagal dihapus!');
+            return back()->withInput()->with('error', 'Galeri gagal diubah!');
         }
 
         return redirect()->route('publikasi.galeri.index', Session::get('album_id'))->with('success', 'Galeri berhasil diubah!');
@@ -205,4 +219,19 @@ public function destroy(Galeri $galeri)
 
         return redirect()->route('publikasi.galeri.index', Session::get('album_id'))->with('success', 'Galeri sukses dihapus!');
     }
+
+    /**
+     * Tentukan tipe media untuk galeri berbasis link.
+     *
+     * Pilihan manual pengguna selalu dipakai apa adanya. Bila tidak ada pilihan,
+     * tipe dideteksi dari link, dan hanya melakukan permintaan jaringan bila
+     * link-nya memang tidak memberi petunjuk (misalnya Google Drive).
+     */
+    protected function detectMediaType(GaleriRequest $request): string
+    {
+        return app(MediaLinkService::class)->detectType(
+            $request->input('link'),
+            $request->selectedMediaType()
+        );
+    }
 }
diff --git a/app/Http/Controllers/Setting/NavMenuController.php b/app/Http/Controllers/Setting/NavMenuController.php
index 5855dbbe5b..98eaca5c10 100644
--- a/app/Http/Controllers/Setting/NavMenuController.php
+++ b/app/Http/Controllers/Setting/NavMenuController.php
@@ -33,14 +33,14 @@
 
 use App\Http\Controllers\Controller;
 use App\Models\Artikel;
+use App\Models\JenisDokumen;
 use App\Models\Kategori;
 use App\Models\NavMenu;
-use App\Models\JenisDokumen;
+use App\Models\TipePotensi;
 use Illuminate\Http\Request;
 
 class NavMenuController extends Controller
 {
-
     public function index()
     {
         $page_title = 'Pengaturan Menu';
@@ -65,12 +65,17 @@ public function index()
             ),
             'Kategori' => Kategori::cursor()->pluck('nama', 'link')->toArray(),
             'Dokumen' => JenisDokumen::cursor()->pluck('nama', 'link')->toArray(),
+            'Potensi' => array_merge(
+                ['/potensi' => 'Semua Potensi'],
+                TipePotensi::cursor()->mapWithKeys(function ($item) {
+                    return ['/potensi/' . $item->slug => $item->nama_kategori];
+                })->toArray()
+            ),
         ];
 
         return view('setting.nav_menu.index', compact('page_title', 'page_description', 'nav_menus', 'sourceItem'));
     }
 
-
     public function store(Request $request)
     {
         NavMenu::whereNotNull('id')->delete();
@@ -90,11 +95,12 @@ private function loopTree(array $elements, $parentId = null)
     {
         $sequence = 1;
         foreach ($elements as $element) {
+            $type = strtolower($element['type'] ?? '');
             $input = [
                 'name' => $element['text'],
                 'url' => $element['href'],
                 'target' => $element['target'],
-                'type' => $element['type'],
+                'type' => in_array($type, ['link', 'halaman', 'kategori', 'modul', 'dokumen']) ? $type : 'modul',
                 'is_show' => isset($element['is_show']) ? $element['is_show'] : 1,
                 'order' => $sequence,
                 'parent_id' => $parentId,
diff --git a/app/Http/Middleware/SecurityHeaders.php b/app/Http/Middleware/SecurityHeaders.php
index 3fa6c4b3b1..8a7efedcda 100644
--- a/app/Http/Middleware/SecurityHeaders.php
+++ b/app/Http/Middleware/SecurityHeaders.php
@@ -31,6 +31,7 @@
 
 namespace App\Http\Middleware;
 
+use App\Support\CspPolicy;
 use Closure;
 
 class SecurityHeaders
@@ -41,18 +42,25 @@ class SecurityHeaders
      * Handle an incoming request.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return mixed
      */
     public function handle($request, Closure $next)
     {
         /** @var \Illuminate\Http\Response $response */
         $response = $next($request);
 
+        foreach ($this->unwantedHeaders as $header) {
+            $response->headers->remove($header);
+        }
+
+        /*
+         * Cegah browser menebak-nebak Content-Type dari isi file. Tanpa header ini
+         * file markup seperti SVG dapat dieksekusi sebagai script meskipun
+         * header dan nama ekstensinya tidak menyerupai HTML.
+         */
+        $response->headers->set('X-Content-Type-Options', 'nosniff');
+
         if (app()->environment('production')) {
-            $localDomain = env('APP_URL', 'http://localhost');
-            $urlDatabaseGabungan = config('setting.api_server_database_gabungan');
-            $response->headers->set('X-Content-Type-Options', 'nosniff');            
-            $response->headers->set('Content-Security-Policy', "default-src 'self';script-src 'self' https://pantau.opensid.my.id/ https://cdnjs.cloudflare.com/ajax/libs/tinymce/ https://cdn.jsdelivr.net/npm/ https://cdnjs.cloudflare.com/ajax/libs/numeral.js/2.0.6/numeral.min.js https://website-widgets.pages.dev/dist/sienna.min.js platform.twitter.com unpkg.com 'unsafe-inline' 'unsafe-eval';style-src 'self' https://www.tiny.cloud/ http://www.tinymce.com/css/codepen.min.css https://cdnjs.cloudflare.com/ajax/libs/tinymce/ https://cdn.jsdelivr.net/npm/ fonts.googleapis.com unpkg.com 'unsafe-inline';img-src 'self' * data:;font-src 'self' https://cdnjs.cloudflare.com/ajax/libs/tinymce/ https://cdn.jsdelivr.net/npm/ fonts.gstatic.com data:;connect-src 'self' ".$urlDatabaseGabungan." https://pantau.opensid.my.id/ ;media-src 'self';frame-src 'self' platform.twitter.com github.com *.youtube.com *.vimeo.com *.opensid.my.id;object-src 'none';base-uri 'self';report-uri");
+            $response->headers->set('Content-Security-Policy', (new CspPolicy())->toHeader());
         }
 
         return $response;
diff --git a/app/Http/Requests/FilterPesanRequest.php b/app/Http/Requests/FilterPesanRequest.php
new file mode 100644
index 0000000000..9c1b0af077
--- /dev/null
+++ b/app/Http/Requests/FilterPesanRequest.php
@@ -0,0 +1,51 @@
+<?php
+
+/*
+ * File ini bagian dari:
+ *
+ * OpenDK
+ *
+ * Aplikasi dan source code ini dirilis berdasarkan lisensi GPL V3
+ *
+ * Hak Cipta 2017 - 2025 Perkumpulan Desa Digital Terbuka (https://opendesa.id)
+ *
+ * Dengan ini diberikan izin, secara gratis, kepada siapa pun yang mendapatkan salinan
+ * dari perangkat lunak ini dan file dokumentasi terkait ("Aplikasi Ini"), untuk diperlakukan
+ * tanpa batasan, termasuk hak untuk menggunakan, menyalin, mengubah dan/atau mendistribusikan,
+ * asal tunduk pada syarat berikut:
+ *
+ * Pemberitahuan hak cipta di atas dan pemberitahuan izin ini harus disertakan dalam
+ * setiap salinan atau bagian penting Aplikasi Ini. Barang siapa yang menghapus atau menghilangkan
+ * pemberitahuan ini melanggar ketentuan lisensi Aplikasi Ini.
+ *
+ * PERANGKAT LUNAK INI DISEDIAKAN "SEBAGAIMANA ADANYA", TANPA JAMINAN APA PUN, BAIK TERSURAT MAUPUN
+ * TERSIRAT. PENULIS ATAU PEMEGANG HAK CIPTA SAMA SEKALI TIDAK BERTANGGUNG JAWAB ATAS KLAIM, KERUSAKAN ATAU
+ * KEWAJIBAN APAPUN ATAS PENGGUNAAN ATAU LAINNYA TERKAIT APLIKASI INI.
+ *
+ * @package    OpenDK
+ * @author     Tim Pengembang OpenDesa
+ * @copyright  Hak Cipta 2017 - 2025 Perkumpulan Desa Digital Terbuka (https://opendesa.id)
+ * @license    http://www.gnu.org/licenses/gpl.html    GPL V3
+ * @link       https://github.com/OpenSID/opendk
+ */
+
+namespace App\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class FilterPesanRequest extends FormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'desa_id' => ['nullable', 'integer'],
+            'q' => ['nullable', 'string'],
+            'sudahdibaca' => ['nullable', 'in:0,1'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/FrontEnd/SistemKomplainRequest.php b/app/Http/Requests/FrontEnd/SistemKomplainRequest.php
new file mode 100644
index 0000000000..8576ccc69c
--- /dev/null
+++ b/app/Http/Requests/FrontEnd/SistemKomplainRequest.php
@@ -0,0 +1,118 @@
+<?php
+
+/*
+ * File ini bagian dari:
+ *
+ * OpenDK
+ *
+ * Aplikasi dan source code ini dirilis berdasarkan lisensi GPL V3
+ *
+ * Hak Cipta 2017 - 2024 Perkumpulan Desa Digital Terbuka (https://opendesa.id)
+ *
+ * Dengan ini diberikan izin, secara gratis, kepada siapa pun yang mendapatkan salinan
+ * dari perangkat lunak ini dan file dokumentasi terkait ("Aplikasi Ini"), untuk diperlakukan
+ * tanpa batasan, termasuk hak untuk menggunakan, menyalin, mengubah dan/atau mendistribusikan,
+ * asal tunduk pada syarat berikut:
+ *
+ * Pemberitahuan hak cipta di atas dan pemberitahuan izin ini harus disertakan dalam
+ * setiap salinan atau bagian penting Aplikasi Ini. Barang siapa yang menghapus atau menghilangkan
+ * pemberitahuan ini melanggar ketentuan lisensi Aplikasi Ini.
+ *
+ * PERANGKAT LUNAK INI DISEDIAKAN "SEBAGAIMANA ADANYA", TANPA JAMINAN APA PUN, BAIK TERSURAT MAUPUN
+ * TERSIRAT. PENULIS ATAU PEMEGANG HAK CIPTA SAMA SEKALI TIDAK BERTANGGUNG JAWAB ATAS KLAIM, KERUSAKAN ATAU
+ * KEWAJIBAN APAPUN ATAS PENGGUNAAN ATAU LAINNYA TERKAIT APLIKASI INI.
+ *
+ * @package    OpenDK
+ * @author     Tim Pengembang OpenDesa
+ * @copyright  Hak Cipta 2017 - 2024 Perkumpulan Desa Digital Terbuka (https://opendesa.id)
+ * @license    http://www.gnu.org/licenses/gpl.html    GPL V3
+ * @link       https://github.com/OpenSID/opendk
+ */
+
+namespace App\Http\Requests\FrontEnd;
+
+use App\Models\Penduduk;
+use App\Models\SettingAplikasi;
+use App\Services\PendudukService;
+use Illuminate\Foundation\Http\FormRequest;
+
+class SistemKomplainRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        $maxRule = \App\Services\FileUploadService::isLimitEnabled() ? '|max:1024' : '';
+
+        return [
+            'nik' => ['required', 'numeric', $this->nikRule()],
+            'judul' => 'required|string|max:255',
+            'kategori' => 'required',
+            'laporan' => 'required|string',
+            'tanggal_lahir' => 'required|date',
+            'captcha' => 'required|captcha',
+            'lampiran1' => 'file|mimes:jpeg,png,jpg,gif,svg' . $maxRule . '|valid_file',
+            'lampiran2' => 'file|mimes:jpeg,png,jpg,gif,svg' . $maxRule . '|valid_file',
+            'lampiran3' => 'file|mimes:jpeg,png,jpg,gif,svg' . $maxRule . '|valid_file',
+            'lampiran4' => 'file|mimes:jpeg,png,jpg,gif,svg' . $maxRule . '|valid_file',
+        ];
+    }
+
+    /**
+     * Get custom messages for validator errors.
+     *
+     * @return array
+     */
+    public function messages()
+    {
+        return [
+            'captcha.captcha' => 'Invalid captcha code.',
+        ];
+    }
+
+    /**
+     * Determine if penduduk database gabungan is active.
+     *
+     * @return bool
+     */
+    protected function isDatabaseGabungan()
+    {
+        return SettingAplikasi::where('key', 'sinkronisasi_database_gabungan')->value('value') === '1';
+    }
+
+    /**
+     * NIK validation rule.
+     *
+     * When database gabungan is active, validate against the penduduk service,
+     * otherwise validate against the local penduduk table.
+     */
+    protected function nikRule()
+    {
+        return function ($attribute, $value, $fail) {
+            $tanggalLahir = $this->input('tanggal_lahir');
+
+            if ($this->isDatabaseGabungan()) {
+                $valid = (new PendudukService)->cekPendudukNikTanggalLahir($value, $tanggalLahir);
+            } else {
+                $valid = Penduduk::where('nik', $value)->where('tanggal_lahir', $tanggalLahir)->exists();
+            }
+
+            if (!$valid) {
+                $fail('NIK tidak ditemukan atau tidak sesuai dengan tanggal lahir.');
+            }
+        };
+    }
+}
diff --git a/app/Http/Requests/GaleriRequest.php b/app/Http/Requests/GaleriRequest.php
index bed893553a..3d972ff236 100644
--- a/app/Http/Requests/GaleriRequest.php
+++ b/app/Http/Requests/GaleriRequest.php
@@ -2,7 +2,10 @@
 
 namespace App\Http\Requests;
 
+use App\Enums\TipeMedia;
+use App\Services\FileUploadService;
 use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Validation\Rule;
 
 class GaleriRequest extends FormRequest
 {
@@ -23,12 +26,43 @@ public function authorize()
      */
     public function rules()
     {
+        $isUrl = $this->input('jenis') === 'url';
+        $maxRule = FileUploadService::isLimitEnabled() ? '|max:1024' : '';
+
         return [
             'judul' => 'required|string|max:191',
-            'jenis' => 'required',
-            'link' => $this->input('jenis') == 'url' ? 'required|max:255' : 'nullable',
-            'gambar.*' => $this->input('jenis') == 'url' ? 'nullable' : 'required|image|mimes:jpg,jpeg,png|max:1024',
+            'jenis' => 'required|in:file,url',
+            'link' => $isUrl ? 'required|string|max:255|url:http,https' : 'nullable',
+            'media_type' => [
+                'nullable',
+                Rule::in(array_keys(TipeMedia::selectable())),
+            ],
+            'gambar' => (! $isUrl && $this->isMethod('post')) ? 'required|array' : 'nullable|array',
+            'gambar.*' => $isUrl ? 'nullable' : 'required|image|mimes:jpg,jpeg,png' . $maxRule . '|valid_file',
             'status' => 'required',
         ];
     }
+
+    /**
+     * Get custom messages for validator errors.
+     *
+     * @return array<string, string>
+     */
+    public function messages()
+    {
+        return [
+            'link.url' => 'Link media harus berupa URL yang valid (diawali http:// atau https://).',
+            'media_type.in' => 'Tipe media harus salah satu dari: Foto, Video, atau YouTube.',
+        ];
+    }
+
+    /**
+     * Tipe media yang dipilih manual, atau null bila biarkan dideteksi otomatis.
+     */
+    public function selectedMediaType(): ?string
+    {
+        $mediaType = $this->input('media_type');
+
+        return is_string($mediaType) && $mediaType !== '' ? $mediaType : null;
+    }
 }
diff --git a/app/Http/Requests/KirimBalasanRequest.php b/app/Http/Requests/KirimBalasanRequest.php
new file mode 100644
index 0000000000..3222c562f5
--- /dev/null
+++ b/app/Http/Requests/KirimBalasanRequest.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class KirimBalasanRequest extends FormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'nama' => 'required|string|max:255',
+            'email' => 'required|email|max:255',
+            'body' => 'required|string',
+            'captcha_main' => 'required|captcha',
+            'das_artikel_id' => 'required|exists:das_artikel,id',
+            'comment_id' => 'required|exists:das_artikel_comment,id',
+        ];
+    }
+}
diff --git a/app/Http/Requests/KirimKomentarRequest.php b/app/Http/Requests/KirimKomentarRequest.php
new file mode 100644
index 0000000000..15a12539f2
--- /dev/null
+++ b/app/Http/Requests/KirimKomentarRequest.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class KirimKomentarRequest extends FormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'nama' => 'required|string|max:255',
+            'email' => 'required|email|max:255',
+            'body' => 'required|string',
+            'das_artikel_id' => 'required|exists:das_artikel,id',
+            'captcha_main' => 'required|captcha',
+        ];
+    }
+}
diff --git a/app/Http/Requests/PotensiRequest.php b/app/Http/Requests/PotensiRequest.php
index cdef15dea0..cba7f6789c 100644
--- a/app/Http/Requests/PotensiRequest.php
+++ b/app/Http/Requests/PotensiRequest.php
@@ -57,7 +57,7 @@ public function rules()
             'nama_potensi' => 'required|string|max:200',
             'deskripsi' => 'required|string',
             'lokasi' => 'required|string|max:200',
-            'file_gambar' => 'file|mimes:bmp,jpg,jpeg,gif,png' . (\App\Services\FileUploadService::isLimitEnabled() ? '|max:1024' : '') . '|valid_file',
+            'file_gambar' => 'file|mimes:bmp,jpg,jpeg,gif,png,pdf' . (\App\Services\FileUploadService::isLimitEnabled() ? '|max:2048' : '') . '|valid_file',
         ];
     }
 }
diff --git a/app/Http/Requests/ReplyPesanRequest.php b/app/Http/Requests/ReplyPesanRequest.php
new file mode 100644
index 0000000000..40345edc16
--- /dev/null
+++ b/app/Http/Requests/ReplyPesanRequest.php
@@ -0,0 +1,50 @@
+<?php
+
+/*
+ * File ini bagian dari:
+ *
+ * OpenDK
+ *
+ * Aplikasi dan source code ini dirilis berdasarkan lisensi GPL V3
+ *
+ * Hak Cipta 2017 - 2025 Perkumpulan Desa Digital Terbuka (https://opendesa.id)
+ *
+ * Dengan ini diberikan izin, secara gratis, kepada siapa pun yang mendapatkan salinan
+ * dari perangkat lunak ini dan file dokumentasi terkait ("Aplikasi Ini"), untuk diperlakukan
+ * tanpa batasan, termasuk hak untuk menggunakan, menyalin, mengubah dan/atau mendistribusikan,
+ * asal tunduk pada syarat berikut:
+ *
+ * Pemberitahuan hak cipta di atas dan pemberitahuan izin ini harus disertakan dalam
+ * setiap salinan atau bagian penting Aplikasi Ini. Barang siapa yang menghapus atau menghilangkan
+ * pemberitahuan ini melanggar ketentuan lisensi Aplikasi Ini.
+ *
+ * PERANGKAT LUNAK INI DISEDIAKAN "SEBAGAIMANA ADANYA", TANPA JAMINAN APA PUN, BAIK TERSURAT MAUPUN
+ * TERSIRAT. PENULIS ATAU PEMEGANG HAK CIPTA SAMA SEKALI TIDAK BERTANGGUNG JAWAB ATAS KLAIM, KERUSAKAN ATAU
+ * KEWAJIBAN APAPUN ATAS PENGGUNAAN ATAU LAINNYA TERKAIT APLIKASI INI.
+ *
+ * @package    OpenDK
+ * @author     Tim Pengembang OpenDesa
+ * @copyright  Hak Cipta 2017 - 2025 Perkumpulan Desa Digital Terbuka (https://opendesa.id)
+ * @license    http://www.gnu.org/licenses/gpl.html    GPL V3
+ * @link       https://github.com/OpenSID/opendk
+ */
+
+namespace App\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class ReplyPesanRequest extends FormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'id' => ['required', 'integer', 'exists:das_pesan,id'],
+            'text' => ['required', 'string'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/SetArsipPesanRequest.php b/app/Http/Requests/SetArsipPesanRequest.php
new file mode 100644
index 0000000000..7eed898f47
--- /dev/null
+++ b/app/Http/Requests/SetArsipPesanRequest.php
@@ -0,0 +1,49 @@
+<?php
+
+/*
+ * File ini bagian dari:
+ *
+ * OpenDK
+ *
+ * Aplikasi dan source code ini dirilis berdasarkan lisensi GPL V3
+ *
+ * Hak Cipta 2017 - 2025 Perkumpulan Desa Digital Terbuka (https://opendesa.id)
+ *
+ * Dengan ini diberikan izin, secara gratis, kepada siapa pun yang mendapatkan salinan
+ * dari perangkat lunak ini dan file dokumentasi terkait ("Aplikasi Ini"), untuk diperlakukan
+ * tanpa batasan, termasuk hak untuk menggunakan, menyalin, mengubah dan/atau mendistribusikan,
+ * asal tunduk pada syarat berikut:
+ *
+ * Pemberitahuan hak cipta di atas dan pemberitahuan izin ini harus disertakan dalam
+ * setiap salinan atau bagian penting Aplikasi Ini. Barang siapa yang menghapus atau menghilangkan
+ * pemberitahuan ini melanggar ketentuan lisensi Aplikasi Ini.
+ *
+ * PERANGKAT LUNAK INI DISEDIAKAN "SEBAGAIMANA ADANYA", TANPA JAMINAN APA PUN, BAIK TERSURAT MAUPUN
+ * TERSIRAT. PENULIS ATAU PEMEGANG HAK CIPTA SAMA SEKALI TIDAK BERTANGGUNG JAWAB ATAS KLAIM, KERUSAKAN ATAU
+ * KEWAJIBAN APAPUN ATAS PENGGUNAAN ATAU LAINNYA TERKAIT APLIKASI INI.
+ *
+ * @package    OpenDK
+ * @author     Tim Pengembang OpenDesa
+ * @copyright  Hak Cipta 2017 - 2025 Perkumpulan Desa Digital Terbuka (https://opendesa.id)
+ * @license    http://www.gnu.org/licenses/gpl.html    GPL V3
+ * @link       https://github.com/OpenSID/opendk
+ */
+
+namespace App\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class SetArsipPesanRequest extends FormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'id' => ['required', 'integer', 'exists:das_pesan,id'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/SetMultipleArsipPesanStatusRequest.php b/app/Http/Requests/SetMultipleArsipPesanStatusRequest.php
new file mode 100644
index 0000000000..6e716ce60a
--- /dev/null
+++ b/app/Http/Requests/SetMultipleArsipPesanStatusRequest.php
@@ -0,0 +1,49 @@
+<?php
+
+/*
+ * File ini bagian dari:
+ *
+ * OpenDK
+ *
+ * Aplikasi dan source code ini dirilis berdasarkan lisensi GPL V3
+ *
+ * Hak Cipta 2017 - 2025 Perkumpulan Desa Digital Terbuka (https://opendesa.id)
+ *
+ * Dengan ini diberikan izin, secara gratis, kepada siapa pun yang mendapatkan salinan
+ * dari perangkat lunak ini dan file dokumentasi terkait ("Aplikasi Ini"), untuk diperlakukan
+ * tanpa batasan, termasuk hak untuk menggunakan, menyalin, mengubah dan/atau mendistribusikan,
+ * asal tunduk pada syarat berikut:
+ *
+ * Pemberitahuan hak cipta di atas dan pemberitahuan izin ini harus disertakan dalam
+ * setiap salinan atau bagian penting Aplikasi Ini. Barang siapa yang menghapus atau menghilangkan
+ * pemberitahuan ini melanggar ketentuan lisensi Aplikasi Ini.
+ *
+ * PERANGKAT LUNAK INI DISEDIAKAN "SEBAGAIMANA ADANYA", TANPA JAMINAN APA PUN, BAIK TERSURAT MAUPUN
+ * TERSIRAT. PENULIS ATAU PEMEGANG HAK CIPTA SAMA SEKALI TIDAK BERTANGGUNG JAWAB ATAS KLAIM, KERUSAKAN ATAU
+ * KEWAJIBAN APAPUN ATAS PENGGUNAAN ATAU LAINNYA TERKAIT APLIKASI INI.
+ *
+ * @package    OpenDK
+ * @author     Tim Pengembang OpenDesa
+ * @copyright  Hak Cipta 2017 - 2025 Perkumpulan Desa Digital Terbuka (https://opendesa.id)
+ * @license    http://www.gnu.org/licenses/gpl.html    GPL V3
+ * @link       https://github.com/OpenSID/opendk
+ */
+
+namespace App\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class SetMultipleArsipPesanStatusRequest extends FormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'array_id' => ['required', 'string'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/SetMultipleReadPesanStatusRequest.php b/app/Http/Requests/SetMultipleReadPesanStatusRequest.php
new file mode 100644
index 0000000000..b0376710a8
--- /dev/null
+++ b/app/Http/Requests/SetMultipleReadPesanStatusRequest.php
@@ -0,0 +1,49 @@
+<?php
+
+/*
+ * File ini bagian dari:
+ *
+ * OpenDK
+ *
+ * Aplikasi dan source code ini dirilis berdasarkan lisensi GPL V3
+ *
+ * Hak Cipta 2017 - 2025 Perkumpulan Desa Digital Terbuka (https://opendesa.id)
+ *
+ * Dengan ini diberikan izin, secara gratis, kepada siapa pun yang mendapatkan salinan
+ * dari perangkat lunak ini dan file dokumentasi terkait ("Aplikasi Ini"), untuk diperlakukan
+ * tanpa batasan, termasuk hak untuk menggunakan, menyalin, mengubah dan/atau mendistribusikan,
+ * asal tunduk pada syarat berikut:
+ *
+ * Pemberitahuan hak cipta di atas dan pemberitahuan izin ini harus disertakan dalam
+ * setiap salinan atau bagian penting Aplikasi Ini. Barang siapa yang menghapus atau menghilangkan
+ * pemberitahuan ini melanggar ketentuan lisensi Aplikasi Ini.
+ *
+ * PERANGKAT LUNAK INI DISEDIAKAN "SEBAGAIMANA ADANYA", TANPA JAMINAN APA PUN, BAIK TERSURAT MAUPUN
+ * TERSIRAT. PENULIS ATAU PEMEGANG HAK CIPTA SAMA SEKALI TIDAK BERTANGGUNG JAWAB ATAS KLAIM, KERUSAKAN ATAU
+ * KEWAJIBAN APAPUN ATAS PENGGUNAAN ATAU LAINNYA TERKAIT APLIKASI INI.
+ *
+ * @package    OpenDK
+ * @author     Tim Pengembang OpenDesa
+ * @copyright  Hak Cipta 2017 - 2025 Perkumpulan Desa Digital Terbuka (https://opendesa.id)
+ * @license    http://www.gnu.org/licenses/gpl.html    GPL V3
+ * @link       https://github.com/OpenSID/opendk
+ */
+
+namespace App\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class SetMultipleReadPesanStatusRequest extends FormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'array_id' => ['required', 'string'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/StoreComposePesanRequest.php b/app/Http/Requests/StoreComposePesanRequest.php
new file mode 100644
index 0000000000..ad1c090460
--- /dev/null
+++ b/app/Http/Requests/StoreComposePesanRequest.php
@@ -0,0 +1,56 @@
+<?php
+
+/*
+ * File ini bagian dari:
+ *
+ * OpenDK
+ *
+ * Aplikasi dan source code ini dirilis berdasarkan lisensi GPL V3
+ *
+ * Hak Cipta 2017 - 2025 Perkumpulan Desa Digital Terbuka (https://opendesa.id)
+ *
+ * Dengan ini diberikan izin, secara gratis, kepada siapa pun yang mendapatkan salinan
+ * dari perangkat lunak ini dan file dokumentasi terkait ("Aplikasi Ini"), untuk diperlakukan
+ * tanpa batasan, termasuk hak untuk menggunakan, menyalin, mengubah dan/atau mendistribusikan,
+ * asal tunduk pada syarat berikut:
+ *
+ * Pemberitahuan hak cipta di atas dan pemberitahuan izin ini harus disertakan dalam
+ * setiap salinan atau bagian penting Aplikasi Ini. Barang siapa yang menghapus atau menghilangkan
+ * pemberitahuan ini melanggar ketentuan lisensi Aplikasi Ini.
+ *
+ * PERANGKAT LUNAK INI DISEDIAKAN "SEBAGAIMANA ADANYA", TANPA JAMINAN APA PUN, BAIK TERSURAT MAUPUN
+ * TERSIRAT. PENULIS ATAU PEMEGANG HAK CIPTA SAMA SEKALI TIDAK BERTANGGUNG JAWAB ATAS KLAIM, KERUSAKAN ATAU
+ * KEWAJIBAN APAPUN ATAS PENGGUNAAN ATAU LAINNYA TERKAIT APLIKASI INI.
+ *
+ * @package    OpenDK
+ * @author     Tim Pengembang OpenDesa
+ * @copyright  Hak Cipta 2017 - 2025 Perkumpulan Desa Digital Terbuka (https://opendesa.id)
+ * @license    http://www.gnu.org/licenses/gpl.html    GPL V3
+ * @link       https://github.com/OpenSID/opendk
+ */
+
+namespace App\Http\Requests;
+
+use App\Models\SettingAplikasi;
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Validation\Rule;
+
+class StoreComposePesanRequest extends FormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        $settings = SettingAplikasi::pluck('value', 'key');
+        $isDatabaseGabungan = ($settings['sinkronisasi_database_gabungan'] ?? null) === '1';
+
+        return [
+            'judul' => ['required', 'string'],
+            'das_data_desa_id' => ['required', Rule::when(! $isDatabaseGabungan, ['exists:das_data_desa,desa_id'])],
+            'text' => ['required', 'string'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/StoreLembagaAnggotaRequest.php b/app/Http/Requests/StoreLembagaAnggotaRequest.php
index 17be9f95f6..f60fd0a0de 100644
--- a/app/Http/Requests/StoreLembagaAnggotaRequest.php
+++ b/app/Http/Requests/StoreLembagaAnggotaRequest.php
@@ -3,6 +3,7 @@
 namespace App\Http\Requests;
 
 use App\Models\Lembaga;
+use App\Models\SettingAplikasi;
 use Illuminate\Validation\Rule;
 use Illuminate\Foundation\Http\FormRequest;
 
@@ -25,9 +26,22 @@ public function authorize()
      */
     public function rules()
     {
-        $slug = $this->route('slug'); 
+        $slug = $this->route('slug');
         $lembaga = Lembaga::where('slug', $slug)->first();
-        
+
+        if (SettingAplikasi::where('key', 'sinkronisasi_database_gabungan')->value('value') === '1') {
+            return [
+                'penduduk_id' => 'nullable|integer',
+                'penduduk_id_gabungan' => 'required|integer',
+                'no_anggota' => [
+                    'required',
+                    Rule::unique('das_lembaga_anggota', 'no_anggota')
+                        ->where('lembaga_id', $lembaga->id),
+                ],
+                'jabatan_id' => 'required|in:1,2,3,4,5',
+            ];
+        }
+
         return [
             'penduduk_id' => 'required|exists:das_penduduk,id',
             'no_anggota' => [
@@ -35,7 +49,7 @@ public function rules()
                 Rule::unique('das_lembaga_anggota', 'no_anggota')
                     ->where('lembaga_id', $lembaga->id),
             ],
-            'jabatan_id' => 'required|in:1,2,3,4,5', // Kode jabatan harus 1-5
+            'jabatan_id' => 'required|in:1,2,3,4,5',
         ];
     }
 
@@ -48,6 +62,7 @@ public function attributes()
     {
         return [
             'penduduk_id' => 'Nama Anggota',
+            'penduduk_id_gabungan' => 'Nama Anggota',
             'no_anggota' => 'Nomor Anggota',
             'jabatan_id' => 'Jabatan',
         ];
diff --git a/app/Http/Requests/StoreLembagaRequest.php b/app/Http/Requests/StoreLembagaRequest.php
index 0bd7d662c3..32a7b49884 100644
--- a/app/Http/Requests/StoreLembagaRequest.php
+++ b/app/Http/Requests/StoreLembagaRequest.php
@@ -2,33 +2,31 @@
 
 namespace App\Http\Requests;
 
+use App\Models\SettingAplikasi;
 use Illuminate\Foundation\Http\FormRequest;
 
 class StoreLembagaRequest extends FormRequest
 {
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
     public function authorize()
     {
         return true;
     }
 
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array<string, mixed>
-     */
     public function rules()
     {
-        return [
+        $rules = [
             'nama' => 'required|string|max:255',
             'kode' => 'required|string|max:255|unique:das_lembaga,kode',
             'lembaga_kategori_id' => 'required|exists:das_lembaga_kategori,id',
-            'penduduk_id' => 'required|exists:das_penduduk,id',
         ];
+
+        if (SettingAplikasi::where('key', 'sinkronisasi_database_gabungan')->value('value') === '1') {
+            $rules['penduduk_id_gabungan'] = 'required|integer';
+        } else {
+            $rules['penduduk_id'] = 'required|exists:das_penduduk,id';
+        }
+
+        return $rules;
     }
 
     /**
@@ -43,6 +41,7 @@ public function attributes()
             'kode' => 'Kode Lembaga',
             'lembaga_kategori_id' => 'Kategori Lembaga',
             'penduduk_id' => 'Ketua Lembaga',
+            'penduduk_id_gabungan' => 'Ketua Lembaga',
         ];
     }
 }
diff --git a/app/Http/Requests/SuplemenRequest.php b/app/Http/Requests/SuplemenRequest.php
new file mode 100644
index 0000000000..49daf802fd
--- /dev/null
+++ b/app/Http/Requests/SuplemenRequest.php
@@ -0,0 +1,57 @@
+<?php
+
+/*
+ * File ini bagian dari:
+ *
+ * OpenDK
+ *
+ * Aplikasi dan source code ini dirilis berdasarkan lisensi GPL V3
+ *
+ * Hak Cipta 2017 - 2026 Perkumpulan Desa Digital Terbuka (https://opendesa.id)
+ *
+ * Dengan ini diberikan izin, secara gratis, kepada siapa pun yang mendapatkan salinan
+ * dari perangkat lunak ini dan file dokumentasi terkait ("Aplikasi Ini"), untuk diperlakukan
+ * tanpa batasan, termasuk hak untuk menggunakan, menyalin, mengubah dan/atau mendistribusikan,
+ * asal tunduk pada syarat berikut:
+ *
+ * Pemberitahuan hak cipta di atas dan pemberitahuan izin ini harus disertakan dalam
+ * setiap salinan atau bagian penting Aplikasi Ini. Barang siapa yang menghapus atau menghilangkan
+ * pemberitahuan ini melanggar ketentuan lisensi Aplikasi Ini.
+ *
+ * PERANGKAT LUNAK INI DISEDIAKAN "SEBAGAIMANA ADANYA", TANPA JAMINAN APA PUN, BAIK TERSURAT MAUPUN
+ * TERSIRAT. PENULIS ATAU PEMEGANG HAK CIPTA SAMA SEKALI TIDAK BERTANGGUNG JAWAB ATAS KLAIM, KERUSAKAN ATAU
+ * KEWAJIBAN APAPUN ATAS PENGGUNAAN ATAU LAINNYA TERKAIT APLIKASI INI.
+ *
+ * @package    OpenDK
+ * @author     Tim Pengembang OpenDesa
+ * @copyright  Hak Cipta 2017 - 2026 Perkumpulan Desa Digital Terbuka (https://opendesa.id)
+ * @license    http://www.gnu.org/licenses/gpl.html    GPL V3
+ * @link       https://github.com/OpenSID/opendk
+ */
+
+namespace App\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class SuplemenRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     */
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     */
+    public function rules(): array
+    {
+        return [
+            'nama' => ['required', 'string', 'max:255'],
+            'sasaran' => ['required', 'in:1,2'],
+            'keterangan' => ['nullable', 'string'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/SuplemenTerdataRequest.php b/app/Http/Requests/SuplemenTerdataRequest.php
new file mode 100644
index 0000000000..0d02e7f4fc
--- /dev/null
+++ b/app/Http/Requests/SuplemenTerdataRequest.php
@@ -0,0 +1,93 @@
+<?php
+
+/*
+ * File ini bagian dari:
+ *
+ * OpenDK
+ *
+ * Aplikasi dan source code ini dirilis berdasarkan lisensi GPL V3
+ *
+ * Hak Cipta 2017 - 2026 Perkumpulan Desa Digital Terbuka (https://opendesa.id)
+ *
+ * Dengan ini diberikan izin, secara gratis, kepada siapa pun yang mendapatkan salinan
+ * dari perangkat lunak ini dan file dokumentasi terkait ("Aplikasi Ini"), untuk diperlakukan
+ * tanpa batasan, termasuk hak untuk menggunakan, menyalin, mengubah dan/atau mendistribusikan,
+ * asal tunduk pada syarat berikut:
+ *
+ * Pemberitahuan hak cipta di atas dan pemberitahuan izin ini harus disertakan dalam
+ * setiap salinan atau bagian penting Aplikasi Ini. Barang siapa yang menghapus atau menghilangkan
+ * pemberitahuan ini melanggar ketentuan lisensi Aplikasi Ini.
+ *
+ * PERANGKAT LUNAK INI DISEDIAKAN "SEBAGAIMANA ADANYA", TANPA JAMINAN APA PUN, BAIK TERSURAT MAUPUN
+ * TERSIRAT. PENULIS ATAU PEMEGANG HAK CIPTA SAMA SEKALI TIDAK BERTANGGUNG JAWAB ATAS KLAIM, KERUSAKAN ATAU
+ * KEWAJIBAN APAPUN ATAS PENGGUNAAN ATAU LAINNYA TERKAIT APLIKASI INI.
+ *
+ * @package    OpenDK
+ * @author     Tim Pengembang OpenDesa
+ * @copyright  Hak Cipta 2017 - 2026 Perkumpulan Desa Digital Terbuka (https://opendesa.id)
+ * @license    http://www.gnu.org/licenses/gpl.html    GPL V3
+ * @link       https://github.com/OpenSID/opendk
+ */
+
+namespace App\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class SuplemenTerdataRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     */
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     */
+    public function rules(): array
+    {
+        return [
+            'suplemen_id' => ['required', 'exists:das_suplemen,id'],
+            'desa_id' => ['required', 'string', 'max:13', 'not_in:Semua'],
+            'penduduk_id' => ['nullable', 'integer'],
+            'penduduk_id_gabungan' => ['nullable', 'integer'],
+            'keterangan' => ['nullable', 'string'],
+        ];
+    }
+
+    /**
+     * Pastikan hanya salah satu sumber penduduk yang diisi:
+     * penduduk lokal (penduduk_id) atau penduduk dari database gabungan (penduduk_id_gabungan).
+     */
+    public function withValidator(\Illuminate\Validation\Validator $validator): void
+    {
+        $validator->after(function ($validator) {
+            $hasLocal = $this->filled('penduduk_id');
+            $hasGabungan = $this->filled('penduduk_id_gabungan');
+
+            if (! $hasLocal && ! $hasGabungan) {
+                $validator->errors()->add('penduduk_id', 'isian warga atau penduduk wajib diisi');
+            }
+
+            if ($hasLocal && $hasGabungan) {
+                $validator->errors()->add('penduduk_id_gabungan', 'hanya boleh memilih salah satu, penduduk lokal atau penduduk database gabungan');
+            }
+        });
+    }
+
+    /**
+     * Get the error messages for the defined validation rules.
+     */
+    public function messages(): array
+    {
+        $sebutanDesa = config('setting.sebutan_desa');
+
+        return [
+            'penduduk_id.required' => 'isian warga atau penduduk wajib diisi',
+            'desa_id.required' => "isian {$sebutanDesa} wajib diisi",
+            'desa_id.not_in' => "isian {$sebutanDesa} wajib diisi",
+        ];
+    }
+}
diff --git a/app/Http/Requests/UpdateAKIAKBRequest.php b/app/Http/Requests/UpdateAKIAKBRequest.php
new file mode 100644
index 0000000000..a5fb7cb4ec
--- /dev/null
+++ b/app/Http/Requests/UpdateAKIAKBRequest.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class UpdateAKIAKBRequest extends FormRequest
+{
+    public function authorize()
+    {
+        return true;
+    }
+
+    public function rules()
+    {
+        return [
+            'aki' => 'required|integer',
+            'akb' => 'required|integer',
+        ];
+    }
+
+    public function messages()
+    {
+        return [
+            'aki.required' => 'Jumlah AKI wajib diisi.',
+            'akb.required' => 'Jumlah AKB wajib diisi.',
+        ];
+    }
+}
diff --git a/app/Http/Requests/UpdateFasilitasPaudRequest.php b/app/Http/Requests/UpdateFasilitasPaudRequest.php
new file mode 100644
index 0000000000..d7fd87a0bb
--- /dev/null
+++ b/app/Http/Requests/UpdateFasilitasPaudRequest.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class UpdateFasilitasPaudRequest extends FormRequest
+{
+    public function authorize()
+    {
+        return true;
+    }
+
+    public function rules()
+    {
+        return [
+            'jumlah_paud' => 'required|integer',
+            'jumlah_guru_paud' => 'required|integer',
+            'jumlah_siswa_paud' => 'required|integer',
+            'semester' => 'required|integer',
+            'tahun' => 'required|integer',
+        ];
+    }
+
+    public function messages()
+    {
+        return [
+            'jumlah_paud.required' => 'Jumlah PAUD wajib diisi.',
+            'jumlah_guru_paud.required' => 'Jumlah guru PAUD wajib diisi.',
+            'jumlah_siswa_paud.required' => 'Jumlah siswa PAUD wajib diisi.',
+            'semester.required' => 'Semester wajib diisi.',
+            'tahun.required' => 'Tahun wajib diisi.',
+        ];
+    }
+}
diff --git a/app/Http/Requests/UpdateLembagaAnggotaRequest.php b/app/Http/Requests/UpdateLembagaAnggotaRequest.php
index 6a05da04a5..4bf1a75194 100644
--- a/app/Http/Requests/UpdateLembagaAnggotaRequest.php
+++ b/app/Http/Requests/UpdateLembagaAnggotaRequest.php
@@ -3,6 +3,7 @@
 namespace App\Http\Requests;
 
 use App\Models\LembagaAnggota;
+use App\Models\SettingAplikasi;
 use Illuminate\Foundation\Http\FormRequest;
 
 class UpdateLembagaAnggotaRequest extends FormRequest
@@ -25,22 +26,23 @@ public function authorize()
     public function rules()
     {
         $rules = [
-            // 'no_anggota' => 'required|unique:das_lembaga_anggota,no_anggota', // pastikan id penduduk ada dalam tabel
-            'jabatan_id' => 'required|in:1,2,3,4,5', // kode jabatan harus 1-5
+            'jabatan_id' => 'required|in:1,2,3,4,5',
         ];
 
         $id = $this->route('id');
 
-        // cek no_anggota berdasarkan id
         $anggota = LembagaAnggota::findOrFail($id);
-        
-        // jika inputan nomor anggota tidak sama dengan data no_anggota
-        if($this->input('no_anggota') !== $anggota->no_anggota){
+
+        if ($this->input('no_anggota') !== $anggota->no_anggota) {
             $rules['no_anggota'] = 'required|unique:das_lembaga_anggota,no_anggota';
         }
 
-        return $rules;
+        if (SettingAplikasi::where('key', 'sinkronisasi_database_gabungan')->value('value') === '1') {
+            $rules['penduduk_id'] = 'nullable|integer';
+            $rules['penduduk_id_gabungan'] = 'required|integer';
+        }
 
+        return $rules;
     }
 
     /**
@@ -51,6 +53,8 @@ public function rules()
     public function attributes()
     {
         return [
+            'penduduk_id' => 'Nama Anggota',
+            'penduduk_id_gabungan' => 'Nama Anggota',
             'no_anggota' => 'Nomor Anggota',
             'jabatan_id' => 'Jabatan',
         ];
diff --git a/app/Http/Requests/UpdateLembagaRequest.php b/app/Http/Requests/UpdateLembagaRequest.php
index 4d75072de9..b93b60cad8 100644
--- a/app/Http/Requests/UpdateLembagaRequest.php
+++ b/app/Http/Requests/UpdateLembagaRequest.php
@@ -3,43 +3,37 @@
 namespace App\Http\Requests;
 
 use App\Models\Lembaga;
+use App\Models\SettingAplikasi;
 use Illuminate\Foundation\Http\FormRequest;
 
 class UpdateLembagaRequest extends FormRequest
 {
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
     public function authorize()
     {
         return true;
     }
 
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array<string, mixed>
-     */
     public function rules()
     {
         $rules = [
             'nama' => 'required|string|max:255',
             'lembaga_kategori_id' => 'required|exists:das_lembaga_kategori,id',
-            'penduduk_id' => 'required|exists:das_penduduk,id',
         ];
 
-        // Dapatkan id lembaga dari route
         $id = $this->route('id');
-
-        // Cek apakah field kode mengalami perubahan
         $lembaga = Lembaga::findOrFail($id);
-        
+
         if ($this->input('kode') !== $lembaga->kode) {
             $rules['kode'] = 'required|string|max:255|unique:das_lembaga,kode';
         }
 
+        if (SettingAplikasi::where('key', 'sinkronisasi_database_gabungan')->value('value') === '1') {
+            $rules['penduduk_id'] = 'nullable|integer';
+            $rules['penduduk_id_gabungan'] = 'required|integer';
+        } else {
+            $rules['penduduk_id'] = 'required|exists:das_penduduk,id';
+        }
+
         return $rules;
     }
 
@@ -55,6 +49,7 @@ public function attributes()
             'kode' => 'Kode Lembaga',
             'lembaga_kategori_id' => 'Kategori Lembaga',
             'penduduk_id' => 'Ketua Lembaga',
+            'penduduk_id_gabungan' => 'Ketua Lembaga',
         ];
     }
 }
diff --git a/app/Http/Requests/UpdatePutusSekolahRequest.php b/app/Http/Requests/UpdatePutusSekolahRequest.php
new file mode 100644
index 0000000000..eed6bca7ca
--- /dev/null
+++ b/app/Http/Requests/UpdatePutusSekolahRequest.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace App\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class UpdatePutusSekolahRequest extends FormRequest
+{
+    public function authorize()
+    {
+        return true;
+    }
+
+    public function rules()
+    {
+        return [
+            'siswa_paud' => 'required|integer',
+            'anak_usia_paud' => 'required|integer',
+            'siswa_sd' => 'required|integer',
+            'anak_usia_sd' => 'required|integer',
+            'siswa_smp' => 'required|integer',
+            'anak_usia_smp' => 'required|integer',
+            'siswa_sma' => 'required|integer',
+            'anak_usia_sma' => 'required|integer',
+            'semester' => 'required|integer',
+            'tahun' => 'required|integer',
+        ];
+    }
+
+    public function messages()
+    {
+        return [
+            'siswa_paud.required' => 'Jumlah siswa PAUD wajib diisi.',
+            'anak_usia_paud.required' => 'Jumlah anak usia PAUD wajib diisi.',
+            'siswa_sd.required' => 'Jumlah siswa SD wajib diisi.',
+            'anak_usia_sd.required' => 'Jumlah anak usia SD wajib diisi.',
+            'siswa_smp.required' => 'Jumlah siswa SMP wajib diisi.',
+            'anak_usia_smp.required' => 'Jumlah anak usia SMP wajib diisi.',
+            'siswa_sma.required' => 'Jumlah siswa SMA wajib diisi.',
+            'anak_usia_sma.required' => 'Jumlah anak usia SMA wajib diisi.',
+            'semester.required' => 'Semester wajib diisi.',
+            'tahun.required' => 'Tahun wajib diisi.',
+        ];
+    }
+}
diff --git a/app/Http/Requests/UpdateToiletSanitasiRequest.php b/app/Http/Requests/UpdateToiletSanitasiRequest.php
new file mode 100644
index 0000000000..545b15a8dc
--- /dev/null
+++ b/app/Http/Requests/UpdateToiletSanitasiRequest.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class UpdateToiletSanitasiRequest extends FormRequest
+{
+    public function authorize()
+    {
+        return true;
+    }
+
+    public function rules()
+    {
+        return [
+            'toilet' => 'required|integer',
+            'sanitasi' => 'required|integer',
+        ];
+    }
+
+    public function messages()
+    {
+        return [
+            'toilet.required' => 'Jumlah toilet wajib diisi.',
+            'sanitasi.required' => 'Jumlah sanitasi wajib diisi.',
+        ];
+    }
+}
diff --git a/app/Listeners/ClearProsedurCacheListener.php b/app/Listeners/ClearProsedurCacheListener.php
new file mode 100644
index 0000000000..9ec17c2dfe
--- /dev/null
+++ b/app/Listeners/ClearProsedurCacheListener.php
@@ -0,0 +1,57 @@
+<?php
+
+/*
+ * File ini bagian dari:
+ *
+ * OpenDK
+ *
+ * Aplikasi dan source code ini dirilis berdasarkan lisensi GPL V3
+ *
+ * Hak Cipta 2017 - 2025 Perkumpulan Desa Digital Terbuka (https://opendesa.id)
+ *
+ * Dengan ini diberikan izin, secara gratis, kepada siapa pun yang mendapatkan salinan
+ * dari perangkat lunak ini dan file dokumentasi terkait ("Aplikasi Ini"), untuk diperlakukan
+ * tanpa batasan, termasuk hak untuk menggunakan, menyalin, mengubah dan/atau mendistribusikan,
+ * asal tunduk pada syarat berikut:
+ *
+ * Pemberitahuan hak cipta di atas dan pemberitahuan izin ini harus disertakan dalam
+ * setiap salinan atau bagian penting Aplikasi Ini. Barang siapa yang menghapus atau menghilangkan
+ * pemberitahuan ini melanggar ketentuan lisensi Aplikasi Ini.
+ *
+ * PERANGKAT LUNAK INI DISEDIAKAN "SEBAGAIMANA ADANYA", TANPA JAMINAN APA PUN, BAIK TERSURAT MAUPUN
+ * TERSIRAT. PENULIS ATAU PEMEGANG HAK CIPTA SAMA SEKALI TIDAK BERTANGGUNG JAWAB ATAS KLAIM, KERUSAKAN ATAU
+ * KEWAJIBAN APAPUN ATAS PENGGUNAAN ATAU LAINNYA TERKAIT APLIKASI INI.
+ *
+ * @package    OpenDK
+ * @author     Tim Pengembang OpenDesa
+ * @copyright  Hak Cipta 2017 - 2025 Perkumpulan Desa Digital Terbuka (https://opendesa.id)
+ * @license    http://www.gnu.org/licenses/gpl.html    GPL V3
+ * @link       https://github.com/OpenSID/opendk
+ */
+
+namespace App\Listeners;
+
+use App\Events\ProsedurChanged;
+use App\Services\CacheService;
+use Illuminate\Support\Facades\Log;
+
+class ClearProsedurCacheListener
+{
+    /**
+     * Handle the event.
+     *
+     * @return void
+     */
+    public function handle(ProsedurChanged $event)
+    {
+        try {
+            $cacheService = app(CacheService::class);
+            $prefix = config('theme-api.prosedur.cache_prefix', 'prosedur:api');
+            $cacheService->removeCachePrefix($prefix);
+        } catch (\Exception $e) {
+            Log::error('Exception occurred while clearing prosedur cache', [
+                'message' => $e->getMessage(),
+            ]);
+        }
+    }
+}
diff --git a/app/Models/Galeri.php b/app/Models/Galeri.php
index 6189cf65d9..d78cc7e75a 100644
--- a/app/Models/Galeri.php
+++ b/app/Models/Galeri.php
@@ -2,30 +2,26 @@
 
 namespace App\Models;
 
+use App\Enums\TipeMedia;
+use App\Observers\GaleriObserver;
+use App\Services\MediaLinkService;
+use App\ValueObjects\MediaLink;
 use Cviebrock\EloquentSluggable\Sluggable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use App\Observers\GaleriObserver;
 
 class Galeri extends Model
 {
     use HasFactory, Sluggable;
 
-    /**
-     * Register model lifecycle hooks.
-     */
-    protected static function booted(): void
-    {
-        static::observe(GaleriObserver::class);
-    }
-
     protected $fillable = [
         'album_id',
         'judul',
         'gambar',
         'link',
         'jenis',
+        'media_type',
         'status',
     ];
 
@@ -34,7 +30,7 @@ protected static function booted(): void
         'status' => 'boolean',
     ];
 
-    protected $appends = ['gambar_path'];
+    protected $appends = ['gambar_path', 'media_type', 'media_url', 'media_embed_url'];
 
     /**
      * Return the sluggable configuration array for this model.
@@ -63,8 +59,80 @@ public function Album(): BelongsTo
         return $this->belongsTo(Album::class);
     }
 
-    protected function getGambarPathAttribute(){
-        $gambar = $this->gambar[0];
-        return $this->attributes['jenis'] == 'file' ? isThumbnail("publikasi/galeri/".$gambar) : asset('/img/no-image.png');
+    public function getGambarPathAttribute(): string
+    {
+        // Media lokal selalu berupa foto, jadi cukup pakai berkas pertama.
+        if (($this->attributes['jenis'] ?? null) === 'file' && ! empty($this->gambar)) {
+            $gambar = is_array($this->gambar) ? ($this->gambar[0] ?? null) : $this->gambar;
+            if ($gambar) {
+                return isThumbnail('publikasi/galeri/' . $gambar);
+            }
+        }
+
+        return $this->media()->thumbnail ?? asset('/img/no-image.png');
+    }
+
+    /**
+     * Tipe media galeri: image, video, youtube, atau unknown.
+     *
+     * Untuk media berbasis link, kolom media_type hasil deteksi saat penyimpanan
+     * lebih dipercaya daripada menebak ulang dari URL, karena link Google Drive
+     * tidak memiliki ekstensi berkas sehingga jenis media tidak bisa dibaca
+     * langsung dari URL.
+     */
+    public function getMediaTypeAttribute(): string
+    {
+        if (($this->attributes['jenis'] ?? null) === 'file') {
+            return empty($this->gambar) ? TipeMedia::Unknown : TipeMedia::Image;
+        }
+
+        $stored = $this->attributes['media_type'] ?? null;
+
+        if (is_string($stored) && in_array($stored, [TipeMedia::Image, TipeMedia::Video, TipeMedia::Youtube], true)) {
+            return $stored;
+        }
+
+        return $this->media()->type;
+    }
+
+    /**
+     * URL media yang bisa dimuat langsung oleh browser (src).
+     */
+    public function getMediaUrlAttribute(): ?string
+    {
+        if (($this->attributes['jenis'] ?? null) === 'file' && ! empty($this->gambar)) {
+            $gambar = is_array($this->gambar) ? ($this->gambar[0] ?? null) : $this->gambar;
+
+            return $gambar ? isThumbnail('publikasi/galeri/' . $gambar) : null;
+        }
+
+        return $this->media()->url;
+    }
+
+    /**
+     * URL untuk <iframe>, dipakai bila <video> tidak mendukung media tersebut.
+     */
+    public function getMediaEmbedUrlAttribute(): ?string
+    {
+        return $this->media()->embedUrl;
+    }
+
+    /**
+     * Register model lifecycle hooks.
+     */
+    protected static function booted(): void
+    {
+        static::observe(GaleriObserver::class);
+    }
+
+    /**
+     * Resolusi link galeri menjadi objek media siap tampil.
+     */
+    protected function media(): MediaLink
+    {
+        return app(MediaLinkService::class)->resolve(
+            $this->attributes['link'] ?? null,
+            $this->attributes['media_type'] ?? null
+        );
     }
 }
diff --git a/app/Models/Lembaga.php b/app/Models/Lembaga.php
index 12a8cb4583..c74100c757 100644
--- a/app/Models/Lembaga.php
+++ b/app/Models/Lembaga.php
@@ -31,6 +31,11 @@ public function penduduk()
         return $this->belongsTo(Penduduk::class, 'penduduk_id', 'id');
     }
 
+    public function pendudukGabungan()
+    {
+        return $this->belongsTo(Penduduk::class, 'penduduk_id_gabungan', 'id');
+    }
+
     // Scope untuk membuat slug yang unik
     public static function generateUniqueSlug($nama)
     {
diff --git a/app/Models/LembagaAnggota.php b/app/Models/LembagaAnggota.php
index 8f57d0053e..cfd43179ef 100644
--- a/app/Models/LembagaAnggota.php
+++ b/app/Models/LembagaAnggota.php
@@ -18,12 +18,16 @@ public function lembaga()
         return $this->belongsTo(Lembaga::class, 'lembaga_id');
     }
 
-    // Relasi ke model Penduduk (Many-to-One)
     public function penduduk()
     {
         return $this->belongsTo(Penduduk::class, 'penduduk_id');
     }
 
+    public function pendudukGabungan()
+    {
+        return $this->belongsTo(Penduduk::class, 'penduduk_id_gabungan');
+    }
+
     // Menentukan kolom slug yang digunakan untuk pencarian di rute
     public function getRouteKeyName()
     {
diff --git a/app/Models/Potensi.php b/app/Models/Potensi.php
index cf5fd259b0..5ad9bde69f 100644
--- a/app/Models/Potensi.php
+++ b/app/Models/Potensi.php
@@ -41,13 +41,6 @@ class Potensi extends Model
 
     protected $table = 'das_potensi';
 
-    protected static function booted(): void
-    {
-        static::created(fn (Potensi $potensi) => PotensiChanged::dispatch($potensi));
-        static::updated(fn (Potensi $potensi) => PotensiChanged::dispatch($potensi));
-        static::deleted(fn (Potensi $potensi) => PotensiChanged::dispatch($potensi));
-    }
-
     protected $fillable = [
         'kategori_id',
         'nama_potensi',
@@ -56,6 +49,7 @@ protected static function booted(): void
         'long',
         'lat',
         'file_gambar',
+        'mime_type',
     ];
 
     /**
@@ -71,4 +65,17 @@ public function tipe()
     {
         return $this->hasOne(TipePotensi::class, 'id', 'kategori_id');
     }
+
+    public function getIsPdfAttribute(): bool
+    {
+        return str_contains(strtolower($this->mime_type ?? ''), 'pdf')
+            || str_ends_with(strtolower($this->file_gambar ?? ''), '.pdf');
+    }
+
+    protected static function booted(): void
+    {
+        static::created(fn (Potensi $potensi) => PotensiChanged::dispatch($potensi));
+        static::updated(fn (Potensi $potensi) => PotensiChanged::dispatch($potensi));
+        static::deleted(fn (Potensi $potensi) => PotensiChanged::dispatch($potensi));
+    }
 }
diff --git a/app/Models/Prosedur.php b/app/Models/Prosedur.php
index d1a618d313..06d94b80b7 100644
--- a/app/Models/Prosedur.php
+++ b/app/Models/Prosedur.php
@@ -31,19 +31,30 @@
 
 namespace App\Models;
 
+use App\Events\ProsedurChanged;
 use App\Traits\HandlesResourceDeletion;
-use Illuminate\Database\Eloquent\Model;
 use Cviebrock\EloquentSluggable\Sluggable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
 
 class Prosedur extends Model
 {
+    use HandlesResourceDeletion;
     use HasFactory;
     use Sluggable;
-    use HandlesResourceDeletion;
 
     protected $table = 'das_prosedur';
 
+    /**
+     * Register model lifecycle hooks.
+     */
+    protected static function booted(): void
+    {
+        static::created(fn (Prosedur $prosedur) => ProsedurChanged::dispatch($prosedur));
+        static::updated(fn (Prosedur $prosedur) => ProsedurChanged::dispatch($prosedur));
+        static::deleted(fn (Prosedur $prosedur) => ProsedurChanged::dispatch($prosedur));
+    }
+
     protected $fillable = [
         'judul_prosedur',
         'file_prosedur',
@@ -72,5 +83,9 @@ public function sluggable(): array
         ];
     }
 
+    public function getIsPdfAttribute(): bool
+    {
+        return str_contains(strtolower($this->mime_type ?? ''), 'pdf')
+            || str_ends_with(strtolower($this->file_prosedur ?? ''), '.pdf');
+    }
 }
-
diff --git a/app/Models/Regulasi.php b/app/Models/Regulasi.php
index db2a313e3f..542820c1ad 100644
--- a/app/Models/Regulasi.php
+++ b/app/Models/Regulasi.php
@@ -41,13 +41,6 @@ class Regulasi extends Model
 
     protected $table = 'das_regulasi';
 
-    protected static function booted(): void
-    {
-        static::created(fn (Regulasi $regulasi) => RegulasiChanged::dispatch($regulasi));
-        static::updated(fn (Regulasi $regulasi) => RegulasiChanged::dispatch($regulasi));
-        static::deleted(fn (Regulasi $regulasi) => RegulasiChanged::dispatch($regulasi));
-    }
-
     protected $fillable = [
         'kecamatan_id',
         'tipe_regulasi',
@@ -70,4 +63,17 @@ public function tipe()
     {
         return $this->hasOne(TipeRegulasi::class, 'id', 'tipe_regulasi');
     }
+
+    public function getIsPdfAttribute(): bool
+    {
+        return str_contains(strtolower($this->mime_type ?? ''), 'pdf')
+            || str_ends_with(strtolower($this->file_regulasi ?? ''), '.pdf');
+    }
+
+    protected static function booted(): void
+    {
+        static::created(fn (Regulasi $regulasi) => RegulasiChanged::dispatch($regulasi));
+        static::updated(fn (Regulasi $regulasi) => RegulasiChanged::dispatch($regulasi));
+        static::deleted(fn (Regulasi $regulasi) => RegulasiChanged::dispatch($regulasi));
+    }
 }
diff --git a/app/Models/SuplemenTerdata.php b/app/Models/SuplemenTerdata.php
index 4def4e50e0..b38be739b4 100644
--- a/app/Models/SuplemenTerdata.php
+++ b/app/Models/SuplemenTerdata.php
@@ -42,7 +42,9 @@ class SuplemenTerdata extends Model
 
     protected $fillable = [
         'suplemen_id',
+        'desa_id',
         'penduduk_id',
+        'penduduk_id_gabungan',
         'keterangan',
     ];
 
diff --git a/app/Observers/GaleriObserver.php b/app/Observers/GaleriObserver.php
index 3509f8ddda..2892ff8fc9 100644
--- a/app/Observers/GaleriObserver.php
+++ b/app/Observers/GaleriObserver.php
@@ -30,15 +30,17 @@ public function updated(Galeri $galeri)
         if ($galeri->isDirty('gambar')) {
             // Ambil gambar lama dan baru dari database
             $oldImages = $galeri->getOriginal('gambar');
-            $newImages = $galeri->gambar;
+            $newImages = $galeri->gambar ?? [];
 
             if (is_array($oldImages)) {
                 // Cari gambar yang ada di array lama tapi tidak ada di array baru
-                $deletedImages = array_diff($oldImages, $newImages);
+                $deletedImages = array_diff($oldImages, is_array($newImages) ? $newImages : []);
 
                 // Hapus setiap gambar yang sudah tidak ada di array baru
                 foreach ($deletedImages as $image) {
-                    Storage::disk('public')->delete($image);
+                    if ($image) {
+                        Storage::disk('public')->delete('publikasi/galeri/' . $image);
+                    }
                 }
             }
         }
@@ -59,10 +61,9 @@ public function deleted(Galeri $galeri)
 
         if (is_array($images)) {
             foreach ($images as $image) {
-                // Cek jika file ada
-                if (Storage::disk('public')->exists($image)) {
+                if ($image && Storage::disk('public')->exists('publikasi/galeri/' . $image)) {
                     // Hapus file gambar dari storage
-                    Storage::disk('public')->delete($image);
+                    Storage::disk('public')->delete('publikasi/galeri/' . $image);
                 }
             }
         }
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index a9f28e67ed..c77edb3db7 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -31,6 +31,7 @@
 
 namespace App\Providers;
 
+use App\Rules\SafeFileContent;
 use App\Services\ActivityLogService;
 use App\Services\CacheService;
 use App\Support\Collection;
@@ -44,7 +45,6 @@
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Event;
-use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Schema;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Support\ServiceProvider;
@@ -244,16 +244,19 @@ protected function blade(): void
 
     /**
      * Validator untuk file upload (mencegah file berbahaya).
+     *
+     * Logika berada di App\Rules\SafeFileContent agar dapat diuji terpisah.
      */
     protected function file(): void
     {
         Validator::extend('valid_file', function ($attributes, $value, $parameters) {
-            $contains = preg_match('/<\?php|<script|function|__halt_compiler|<html/i', File::get($value));
-            if ($contains) {
-                return false;
-            }
+            $failed = false;
 
-            return true;
+            (new SafeFileContent())->validate($attributes, $value, function () use (&$failed) {
+                $failed = true;
+            });
+
+            return ! $failed;
         });
     }
 
diff --git a/app/Repositories/PotensiApiRepository.php b/app/Repositories/PotensiApiRepository.php
index f159cabf64..21557cd6a1 100644
--- a/app/Repositories/PotensiApiRepository.php
+++ b/app/Repositories/PotensiApiRepository.php
@@ -20,6 +20,7 @@ public function __construct(Potensi $model)
             AllowedFilter::exact('kategori_id'),
             AllowedFilter::exact('id'),
             AllowedFilter::exact('tipe.id'),
+            AllowedFilter::exact('tipe.slug'),
         ];
         $this->allowedSorts = [
             'id',
diff --git a/app/Rules/SafeFileContent.php b/app/Rules/SafeFileContent.php
new file mode 100644
index 0000000000..a4b33c840c
--- /dev/null
+++ b/app/Rules/SafeFileContent.php
@@ -0,0 +1,106 @@
+<?php
+
+namespace App\Rules;
+
+use Closure;
+use Illuminate\Contracts\Validation\ValidationRule;
+use Illuminate\Http\UploadedFile;
+
+class SafeFileContent implements ValidationRule
+{
+    /**
+     * Batas byte yang dipindai dari awal file.
+     *
+     * Pemindaian dibatasi dengan sengaja: seluruh file tidak perlu dibaca karena
+     * penanda skrip pada payload yang disisipkan selalu berada di bagian awal,
+     * sedangkan pemindaian penuh membuat file besar menjadi vektor kehabisan memori.
+     */
+    private const SCAN_LIMIT = 1048576;
+
+    /**
+     * MIME berbasis markup yang isinya diparse oleh browser saat disajikan inline.
+     */
+    private const MARKUP_MIMES = [
+        'image/svg+xml',
+        'image/svg',
+        'text/html',
+        'application/xhtml+xml',
+        'text/xml',
+        'application/xml',
+    ];
+
+    /**
+     * Penanda skrip yang sah-sah saja muncul pada payload yang disisipkan.
+     *
+     * Token generik seperti "function" SENGAJA TIDAK disertakan: string tersebut
+     * muncul wajar pada struktur biner PDF/Office sehingga memicu false positive
+     * pada dokumen yang sah.
+     */
+    private const SCRIPT_SIGNATURES = '/<\?php|<\?=|<script\b|__halt_compiler/i';
+
+    /**
+     * Pola tambahan yang hanya relevan untuk format berbasis markup.
+     * Diterapkan pada SVG/XML/HTML karena isinya dieksekusi browser (stored XSS).
+     */
+    private const MARKUP_DANGERS = '/<\s*script\b|<\s*html\b|<\s*iframe\b|<\s*embed\b|<\s*object\b|<\s*foreignObject\b'
+        .'|\bon[a-z]{3,}\s*=|javascript\s*:|vbscript\s*:|data:text\/html/i';
+
+    public function validate(string $attribute, mixed $value, Closure $fail): void
+    {
+        if (! $value instanceof UploadedFile || ! $value->isValid()) {
+            $this->fail($attribute, $fail);
+
+            return;
+        }
+
+        $head = $this->readHead($value);
+
+        if ($this->matches(self::SCRIPT_SIGNATURES, $head)) {
+            $this->fail($attribute, $fail);
+
+            return;
+        }
+
+        $mime = $value->getMimeType() ?? '';
+
+        if (in_array($mime, self::MARKUP_MIMES, true) && $this->matches(self::MARKUP_DANGERS, $head)) {
+            $this->fail($attribute, $fail);
+        }
+    }
+
+    /**
+     * Baca bagian awal file tanpa memuat seluruh isinya ke memori.
+     */
+    protected function readHead(UploadedFile $file): string
+    {
+        $path = $file->getRealPath();
+
+        if ($path === false || ! is_readable($path)) {
+            return '';
+        }
+
+        $handle = @fopen($path, 'rb');
+
+        if ($handle === false) {
+            return '';
+        }
+
+        try {
+            $head = fread($handle, self::SCAN_LIMIT);
+
+            return $head === false ? '' : $head;
+        } finally {
+            fclose($handle);
+        }
+    }
+
+    protected function matches(string $pattern, string $content): bool
+    {
+        return $content !== '' && preg_match($pattern, $content) === 1;
+    }
+
+    protected function fail(string $attribute, Closure $fail): void
+    {
+        $fail(__('validation.valid_file', ['attribute' => str_replace('_', ' ', $attribute)]));
+    }
+}
diff --git a/app/Services/BaseApiService.php b/app/Services/BaseApiService.php
index c43f092e57..13ac15f86d 100644
--- a/app/Services/BaseApiService.php
+++ b/app/Services/BaseApiService.php
@@ -5,20 +5,25 @@
 use App\Models\SettingAplikasi;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Support\Facades\Session;
 
 class BaseApiService
 {
     protected $settings;
+
     protected $useDatabaseGabungan;
+
     protected $header;
+
     protected $baseUrl;
+
     protected $kodeKecamatan;
+
     private $fullResponse = false;
+
     public function __construct()
     {
-        $this->settings = SettingAplikasi::whereIn('key', ['api_server_database_gabungan', 'api_key_database_gabungan', 'sinkronisasi_database_gabungan'])->pluck('value', 'key');        
-        
+        $this->settings = SettingAplikasi::whereIn('key', ['api_server_database_gabungan', 'api_key_database_gabungan', 'sinkronisasi_database_gabungan'])->pluck('value', 'key');
+
         // Allow mock via config for testing
         if (config()->has('api_server_database_gabungan')) {
             $this->settings['api_server_database_gabungan'] = config('api_server_database_gabungan');
@@ -37,30 +42,36 @@ public function __construct()
             'Authorization' => 'Bearer ' . ($this->settings['api_key_database_gabungan'] ?? ''),
         ];
         $this->baseUrl = !empty($this->settings['api_server_database_gabungan']) ? $this->settings['api_server_database_gabungan'] : 'http://localhost';
-        $this->kodeKecamatan = str_replace('.','',config('profil.kecamatan_id'));        
+        $this->kodeKecamatan = str_replace('.','',config('profil.kecamatan_id'));
     }
 
     /**
-     * General API Call Method
+     * General API Call Method.
      */
-    protected function apiRequest(string $endpoint, array $params = [])
-    {        
+    protected function apiRequest(string $endpoint, array $params = [], string $method = 'GET')
+    {
         try {
             // Buat permintaan API dengan Header dan Parameter
-            $response = Http::withHeaders($this->header)->get($this->baseUrl . $endpoint, $params);            
+            $response = Http::withHeaders($this->header)->{$this->resolveMethod($method)}($this->baseUrl . $endpoint, $params);
             session()->forget('error_api');
+
+            // Jika response gagal (non-2xx), kembalikan array kosong
+            if (!$response->successful()) {
+                return [];
+            }
+
             $jsonResponse = $response->json();
-            
+
             if($this->isFullResponse()) {
                 // Jika full response, kembalikan seluruh response
                 return $jsonResponse;
             }
-            
+
             // Return JSON hasil, cek apakah ada key 'data', jika tidak ada kembalikan seluruh response
-            if (isset($jsonResponse['data'])) {
+            if (array_key_exists('data', $jsonResponse)) {
                 return $jsonResponse['data'];
             }
-            
+
             return $jsonResponse;
         } catch (\Exception $e) {
             if (app()->environment('testing')) {
@@ -70,10 +81,10 @@ protected function apiRequest(string $endpoint, array $params = [])
             Log::error('Failed get data in '.__FILE__.' function '.__METHOD__.' '. $e->getMessage());
         }
         return [];
-    }    
+    }
 
     /**
-     * General API Call Method
+     * General API Call Method.
      */
     protected function apiRequestLengkap(string $endpoint, array $params = [])
     {
@@ -81,11 +92,24 @@ protected function apiRequestLengkap(string $endpoint, array $params = [])
         return $this->apiRequest($endpoint, $params);
     }
 
+    /**
+     * General API Call Method with POST.
+     */
+    protected function apiRequestPost(string $endpoint, array $params = [])
+    {
+        return $this->apiRequest($endpoint, $params, 'POST');
+    }
+
     protected function useDatabaseGabungan()
     {
         return ($this->settings['sinkronisasi_database_gabungan'] ?? null) === '1';
     }
 
+    private function resolveMethod(string $method): string
+    {
+        return strtolower($method);
+    }
+
     private function setFullResponse(bool $fullResponse)
     {
         $this->fullResponse = $fullResponse;
diff --git a/app/Services/DesaService.php b/app/Services/DesaService.php
index bb227eaaf3..51ae88d4c6 100644
--- a/app/Services/DesaService.php
+++ b/app/Services/DesaService.php
@@ -200,9 +200,9 @@ public function jumlahDesa(array $filters = [])
      * Dapatkan object desa berdasarkan kode_desa tertentu
      *
      * @param string $kodeDesa
-     * @return collection|DataDesa|stdClass|null
+     * @return collection|DataDesa|\stdClass|null
      */
-    public function getDesaByKode(string $kodeDesa): Collection|DataDesa|stdClass|null
+    public function getDesaByKode(string $kodeDesa): Collection|DataDesa|\stdClass|null
     {
         $listDesa = $this->listDesa();
         return $listDesa->where('desa_id', $kodeDesa)->first();
diff --git a/app/Services/MediaLinkService.php b/app/Services/MediaLinkService.php
new file mode 100644
index 0000000000..7765d6b72f
--- /dev/null
+++ b/app/Services/MediaLinkService.php
@@ -0,0 +1,408 @@
+<?php
+
+/*
+ * File ini bagian dari:
+ *
+ * OpenDK
+ *
+ * Aplikasi dan source code ini dirilis berdasarkan lisensi GPL V3
+ *
+ * Hak Cipta 2017 - 2024 Perkumpulan Desa Digital Terbuka (https://opendesa.id)
+ *
+ * Dengan ini diberikan izin, secara gratis, kepada siapa pun yang mendapatkan salinan
+ * dari perangkat lunak ini dan file dokumentasi terkait ("Aplikasi Ini"), untuk diperlakukan
+ * tanpa batasan, termasuk hak untuk menggunakan, menyalin, mengubah dan/atau mendistribusikan,
+ * asal tunduk pada syarat berikut:
+ *
+ * Pemberitahuan hak cipta di atas dan pemberitahuan izin ini harus disertakan dalam
+ * setiap salinan atau bagian penting Aplikasi Ini. Barang siapa yang menghapus atau menghilangkan
+ * pemberitahuan ini melanggar ketentuan lisensi Aplikasi Ini.
+ *
+ * PERANGKAT LUNAK INI DISEDIAKAN "SEBAGAIMANA ADANYA", TANPA JAMINAN APA PUN, BAIK TERSURAT MAUPUN
+ * TERSIRAT. PENULIS ATAU PEMEGANG HAK CIPTA SAMA SEKALI TIDAK BERTANGGUNG JAWAB ATAS KLAIM, KERUSAKAN ATAU
+ * KEWAJIBAN ATAUPUN PENGGUNAAN ATAU LAINNYA TERKAIT APLIKASI INI.
+ *
+ * @package    OpenDK
+ * @author     Tim Pengembang OpenDesa
+ * @copyright  Hak Cipta 2017 - 2024 Perkumpulan Desa Digital Terbuka (https://opendesa.id)
+ * @license    http://www.gnu.org/licenses/gpl.html    GPL V3
+ * @link       https://github.com/OpenSID/opendk
+ */
+
+namespace App\Services;
+
+use App\Enums\TipeMedia;
+use App\ValueObjects\MediaLink;
+use Illuminate\Http\Client\Response;
+use Illuminate\Support\Facades\Http;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Str;
+
+/**
+ * Resolusi link media galeri menjadi informasi siap tampil.
+ *
+ * Menangani link Google Drive (foto maupun video), YouTube, Vimeo, serta
+ * file foto/video yang dihosting langsung. Media tidak diunduh ke server,
+ * melainkan dinormalkan menjadi URL yang bisa dimuat langsung oleh browser.
+ */
+class MediaLinkService
+{
+    /** @var array<int, string> Ekstensi foto yang dikenali. */
+    protected const IMAGE_EXTENSIONS = ['jpg', 'jpeg', 'png', 'gif', 'webp', 'bmp', 'avif', 'svg'];
+
+    /** @var array<int, string> Ekstensi video yang dikenali. */
+    protected const VIDEO_EXTENSIONS = ['mp4', 'webm', 'ogv', 'ogg', 'mov', 'm4v', 'mkv', 'avi'];
+
+    /**
+     * Resolusi link menjadi objek media tanpa melakukan permintaan jaringan.
+     *
+     * Parameter $hint adalah tipe media yang dipilih manual oleh pengguna.
+     * Hint dipakai hanya bila link sendiri tidak memberikan petunjuk yang jelas,
+     * sehingga pilihan pengguna tidak dapat menimpa provider yang pasti
+     * (misalnya YouTube tetap dianggap YouTube).
+     *
+     * @param  string|null  $url  Link media yang dimasukkan pengguna
+     * @param  string|null  $hint  Tipe media pilihan manual (image/video/youtube)
+     */
+    public function resolve(?string $url, ?string $hint = null): MediaLink
+    {
+        $url = is_string($url) ? trim($url) : '';
+
+        if ($url === '' || ! $this->isHttpUrl($url)) {
+            return MediaLink::unknown();
+        }
+
+        if (($youtubeId = $this->youtubeId($url)) !== null) {
+            return new MediaLink(
+                type: TipeMedia::Youtube,
+                id: $youtubeId,
+                url: $url,
+                embedUrl: 'https://www.youtube.com/embed/' . $youtubeId,
+                thumbnail: 'https://img.youtube.com/vi/' . $youtubeId . '/hqdefault.jpg',
+            );
+        }
+
+        if (($vimeoId = $this->vimeoId($url)) !== null) {
+            return new MediaLink(
+                type: TipeMedia::Video,
+                id: $vimeoId,
+                url: $url,
+                embedUrl: 'https://player.vimeo.com/video/' . $vimeoId,
+            );
+        }
+
+        if (($driveId = $this->googleDriveId($url)) !== null) {
+            return $this->resolveGoogleDrive($url, $driveId, $hint);
+        }
+
+        $extension = $this->extension($url);
+
+        if ($extension !== null && in_array($extension, self::IMAGE_EXTENSIONS, true)) {
+            return new MediaLink(TipeMedia::Image, null, $url, null, $url);
+        }
+
+        if ($extension !== null && in_array($extension, self::VIDEO_EXTENSIONS, true)) {
+            return new MediaLink(TipeMedia::Video, null, $url, null, null);
+        }
+
+        $hinted = $this->normalizeHint($hint);
+
+        if ($hinted !== null && $hinted !== TipeMedia::Unknown) {
+            return new MediaLink($hinted, null, $url, null, $hinted === TipeMedia::Image ? $url : null);
+        }
+
+        return MediaLink::unknown($url);
+    }
+
+    /**
+     * Tentukan tipe media, dengan melakukan probing HTTP bila link tidak informatif.
+     *
+     * @param  string|null  $url  Link media
+     * @param  string|null  $hint  Tipe media pilihan manual; bila diisi, probing dilewati
+     */
+    public function detectType(?string $url, ?string $hint = null): string
+    {
+        $hinted = $this->normalizeHint($hint);
+        $resolved = $this->resolve($url, $hint);
+
+        // Tautan Google Drive tidak memuat ekstensi berkas, sehingga "image" di sana
+        // hanya asumsi dan harus dipastikan lewat pemeriksaan HTTP. Tanpa ini, video
+        // Google Drive akan salah diperlakukan sebagai foto dan gagal ditampilkan.
+        $needsProbe = $resolved->type === TipeMedia::Unknown
+            || ($resolved->type === TipeMedia::Image && $this->isGoogleDrive((string) $url));
+
+        if (! $needsProbe) {
+            return $resolved->type;
+        }
+
+        if ($hinted !== null) {
+            return $hinted;
+        }
+
+        return $this->probe($url) ?? $resolved->type;
+    }
+
+    /**
+     * Deteksi tipe media lewat HTTP HEAD, hanya untuk link yang tidak punya petunjuk.
+     *
+     * @return string|null Tipe media, atau null bila link tidak dapat diperiksa sama sekali
+     *                     (URL tidak valid, request gagal, atau timeout)
+     */
+    public function probe(?string $url): ?string
+    {
+        $url = is_string($url) ? trim($url) : '';
+
+        if ($url === '' || ! $this->isHttpUrl($url)) {
+            return null;
+        }
+
+        // Google Drive hanya-serving halaman HTML pada /view, jadi periksa file langsungnya.
+        $target = $this->isGoogleDrive($url) ? $this->googleDriveDownloadUrl($this->googleDriveId($url) ?? '') : $url;
+
+        if ($target === null) {
+            return null;
+        }
+
+        try {
+            $response = Http::timeout(5)
+                ->withOptions(['allow_redirects' => ['max' => 3]])
+                ->head($target);
+
+            if (! $response->successful()) {
+                return null;
+            }
+
+            return $this->typeFromResponse($response);
+        } catch (\Throwable $e) {
+            Log::debug('Gagal memeriksa tipe media dari link.', [
+                'url' => $url,
+                'error' => $e->getMessage(),
+            ]);
+
+            return null;
+        }
+    }
+
+    /**
+     * Bangun URL preview Google Drive untuk media video.
+     */
+    public function googleDrivePreviewUrl(string $fileId): string
+    {
+        return 'https://drive.google.com/file/d/' . $fileId . '/preview';
+    }
+
+    /**
+     * Bangun URL unduh langsung Google Drive untuk media video.
+     */
+    public function googleDriveDownloadUrl(?string $fileId): ?string
+    {
+        return $fileId === null
+            ? null
+            : 'https://drive.google.com/uc?export=download&id=' . $fileId;
+    }
+
+    /**
+     * Bangun URL tampil langsung (untuk foto) Google Drive.
+     */
+    public function googleDriveViewUrl(string $fileId): string
+    {
+        return 'https://drive.google.com/uc?export=view&id=' . $fileId;
+    }
+
+    /**
+     * Resolusi link Google Drive menjadi media siap tampil.
+     */
+    protected function resolveGoogleDrive(string $originalUrl, string $fileId, ?string $hint): MediaLink
+    {
+        $hint = $this->normalizeHint($hint);
+        $isVideo = $hint === TipeMedia::Video;
+
+        if ($isVideo) {
+            return new MediaLink(
+                type: TipeMedia::Video,
+                id: $fileId,
+                url: $this->googleDriveDownloadUrl($fileId),
+                embedUrl: $this->googleDrivePreviewUrl($fileId),
+            );
+        }
+
+        return new MediaLink(
+            type: TipeMedia::Image,
+            id: $fileId,
+            url: $this->googleDriveViewUrl($fileId),
+            thumbnail: $this->googleDriveViewUrl($fileId),
+        );
+    }
+
+    /**
+     * Ambil ID video YouTube dari berbagai format link.
+     */
+    protected function youtubeId(string $url): ?string
+    {
+        $host = strtolower((string) parse_url($url, PHP_URL_HOST));
+        $path = (string) parse_url($url, PHP_URL_PATH);
+
+        if ($host === 'youtu.be') {
+            return $this->trimId(ltrim($path, '/'));
+        }
+
+        if (! in_array($host, ['youtube.com', 'www.youtube.com', 'm.youtube.com', 'music.youtube.com', 'youtube-nocookie.com', 'www.youtube-nocookie.com'], true)) {
+            return null;
+        }
+
+        if (preg_match('~^/(?:embed|shorts|live|v)/([^/?&#]+)~', $path, $matches) === 1) {
+            return $this->trimId($matches[1]);
+        }
+
+        parse_str((string) parse_url($url, PHP_URL_QUERY), $query);
+
+        if (isset($query['v']) && is_string($query['v'])) {
+            return $this->trimId($query['v']);
+        }
+
+        return null;
+    }
+
+    /**
+     * Ambil ID video Vimeo dari link vimeo.com.
+     */
+    protected function vimeoId(string $url): ?string
+    {
+        $host = strtolower((string) parse_url($url, PHP_URL_HOST));
+        $path = trim((string) parse_url($url, PHP_URL_PATH), '/');
+
+        if (! in_array($host, ['vimeo.com', 'www.vimeo.com', 'player.vimeo.com'], true)) {
+            return null;
+        }
+
+        if (preg_match('#(?:^|/)(?:video/)?(\d+)#', $path, $matches) === 1) {
+            return $matches[1];
+        }
+
+        return null;
+    }
+
+    /**
+     * Ambil file ID Google Drive dari berbagai format link.
+     */
+    protected function googleDriveId(string $url): ?string
+    {
+        $host = strtolower((string) parse_url($url, PHP_URL_HOST));
+
+        if (! $this->isGoogleDrive($url)) {
+            return null;
+        }
+
+        $path = (string) parse_url($url, PHP_URL_PATH);
+        $query = [];
+        parse_str((string) parse_url($url, PHP_URL_QUERY), $query);
+
+        if (preg_match('~/(?:file/)?d/([^/?]+)~', $path, $matches) === 1) {
+            return $this->trimId($matches[1]);
+        }
+
+        // docs.google.com hanya punya viewer untuk berkas, parameter ?id= dipakai form editor.
+        if ($host !== 'docs.google.com' && isset($query['id']) && is_string($query['id']) && $query['id'] !== '') {
+            return $this->trimId($query['id']);
+        }
+
+        return null;
+    }
+
+    /**
+     * Cek apakah host berasal dari Google Drive / Google Docs viewer.
+     */
+    protected function isGoogleDrive(string $url): bool
+    {
+        $host = strtolower((string) parse_url($url, PHP_URL_HOST));
+
+        return in_array($host, ['drive.google.com', 'docs.google.com'], true)
+            || str_ends_with($host, '.drive.google.com');
+    }
+
+    /**
+     * Ekstrak tipe media dari respons HTTP.
+     *
+     * @return string Tipe media, atau TipeMedia::Unknown bila respons tidak membocorkan jenis berkasnya
+     */
+    protected function typeFromResponse(Response $response): string
+    {
+        $contentType = strtolower(trim(explode(';', (string) $response->header('Content-Type'))[0]));
+
+        if (str_starts_with($contentType, 'image/')) {
+            return TipeMedia::Image;
+        }
+
+        if (str_starts_with($contentType, 'video/')) {
+            return TipeMedia::Video;
+        }
+
+        // Google Drive sering mengirim application/octet-stream, andalkan nama berkas.
+        $disposition = (string) $response->header('Content-Disposition');
+
+        if (preg_match('/filename="?([^";]+)"?/i', $disposition, $matches) === 1) {
+            $extension = $this->extension($matches[1]);
+
+            if ($extension !== null && in_array($extension, self::VIDEO_EXTENSIONS, true)) {
+                return TipeMedia::Video;
+            }
+
+            if ($extension !== null && in_array($extension, self::IMAGE_EXTENSIONS, true)) {
+                return TipeMedia::Image;
+            }
+        }
+
+        return TipeMedia::Unknown;
+    }
+
+    /**
+     * Ekstensi berkas lowercase dari URL, tanpa titik sama sekali.
+     */
+    protected function extension(string $value): ?string
+    {
+        $path = parse_url($value, PHP_URL_PATH);
+
+        if (! is_string($path) || ! str_contains($path, '.')) {
+            return null;
+        }
+
+        $extension = strtolower((string) pathinfo($path, PATHINFO_EXTENSION));
+
+        return $extension === '' ? null : $extension;
+    }
+
+    /**
+     * Normalisasi pilihan tipe media manual dari pengguna.
+     */
+    protected function normalizeHint(?string $hint): ?string
+    {
+        $hint = is_string($hint) ? strtolower(trim($hint)) : '';
+
+        if ($hint === '' || $hint === TipeMedia::Unknown || $hint === 'auto') {
+            return null;
+        }
+
+        return TipeMedia::isValid($hint) ? $hint : null;
+    }
+
+    /**
+     * Pastikan nilai adalah URL http(s) yang valid.
+     */
+    protected function isHttpUrl(string $url): bool
+    {
+        $scheme = strtolower((string) parse_url($url, PHP_URL_SCHEME));
+        $host = (string) parse_url($url, PHP_URL_HOST);
+
+        return in_array($scheme, ['http', 'https'], true) && $host !== '' && filter_var($url, FILTER_VALIDATE_URL) !== false;
+    }
+
+    /**
+     * Bersihkan identifier agar aman dipakai di URL.
+     */
+    protected function trimId(string $id): ?string
+    {
+        $id = trim(Str::before(trim($id), '/'));
+
+        return preg_match('/^[A-Za-z0-9_-]{3,128}$/', $id) === 1 ? $id : null;
+    }
+}
diff --git a/app/Services/PendudukService.php b/app/Services/PendudukService.php
index 8372a9959f..00b5b3936e 100644
--- a/app/Services/PendudukService.php
+++ b/app/Services/PendudukService.php
@@ -3,14 +3,12 @@
 namespace App\Services;
 
 use App\Models\Penduduk;
-use App\Models\SettingAplikasi;
-use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Log;
 
 class PendudukService extends BaseApiService
 {
     /**
-     * Get Unique Desa
+     * Get Unique Desa.
      */
     public function jumlahPenduduk(array $filters = [])
     {
@@ -33,7 +31,7 @@ public function jumlahPenduduk(array $filters = [])
     }
 
     /**
-     * Get Unique Desa
+     * Get Unique Desa.
      */
     public function desa(array $filters = [])
     {
@@ -59,7 +57,7 @@ public function desa(array $filters = [])
     }
 
     /**
-     * Export Data Penduduk
+     * Export Data Penduduk.
      */
     public function exportPenduduk($size, $number, $search)
     {
@@ -110,23 +108,43 @@ public function detailPenduduk($id)
     }
 
     /**
-     * Export Data Penduduk
+     * Ambil beberapa data penduduk dari database gabungan sekaligus
+     * menggunakan filter id_penduduk berupa array.
+     *
+     * @param  array<int, int|string>  $ids
+     *
+     * @return \Illuminate\Support\Collection
      */
-    public function cekPendudukNikTanggalLahir($nik, $tgl_lhr = null)
+    public function pendudukGabunganByIds(array $ids)
     {
-        try {
-            $baseUrl = $this->settings['api_server_database_gabungan'];
+        if (empty($ids)) {
+            return collect();
+        }
+
+        $data = $this->apiRequest('/api/v1/opendk/sync-penduduk-opendk', [
+            'filter[kode_kecamatan]' => str_replace('.', '', config('profil.kecamatan_id')),
+            'filter[id_penduduk]' => $ids,
+            'page[size]' => count($ids),
+        ]);
 
-            $response = Http::post($baseUrl . '/api/v1/opendk/penduduk-nik-tanggalahir', [
-                'kode_kecamatan' => str_replace('.', '', config('profil.kecamatan_id')),
+        return collect($data)->filter(fn (mixed $item): bool => is_array($item));
+    }
+
+    /**
+     * Export Data Penduduk.
+     */
+    public function cekPendudukNikTanggalLahir(string $nik, $tgl_lhr = null)
+    {
+        try {
+            $data = $this->apiRequestPost('/api/v1/opendk/penduduk-nik-tanggalahir', [
+                'kode_kecamatan' => $this->kodeKecamatan,
                 'nik' => $nik,
                 'tanggallahir' => $tgl_lhr,
             ]);
 
-            if ($response->successful() && $response->json('data')) {
-                $pendudukData = $response->json('data');
+            if ($data) {
                 $penduduk = new Penduduk();
-                $penduduk->forceFill($pendudukData);
+                $penduduk->forceFill($data);
                 return $penduduk;
             }
 
diff --git a/app/Services/ThemeHooksValidator.php b/app/Services/ThemeHooksValidator.php
index 73ab3e65d6..2557524ef0 100644
--- a/app/Services/ThemeHooksValidator.php
+++ b/app/Services/ThemeHooksValidator.php
@@ -10,18 +10,44 @@ class ThemeHooksValidator
      * Dangerous PHP functions that are blocked in hooks.php.
      */
     private const DANGEROUS_FUNCTIONS = [
+        // OS command & process execution
         'system', 'exec', 'passthru', 'shell_exec', 'popen', 'proc_open',
-        'pcntl_exec', 'assert', 'create_function', 'eval',
-        // BUG FIX: call_user_func / call_user_func_array bypass (Severity: Critical)
+        'pcntl_exec', 'pcntl_fork', 'pcntl_alarm', 'pcntl_signal', 'pcntl_wait',
+        'pcntl_waitpid', 'pcntl_wexitstatus', 'dl', 'assert', 'create_function', 'eval',
+        // Dynamic callback & indirect invocation
         'call_user_func', 'call_user_func_array',
+        'forward_static_call', 'forward_static_call_array',
+        'register_shutdown_function', 'register_tick_function',
+        'preg_replace_callback', 'preg_replace_callback_array', 'mb_ereg_replace_callback',
+        'array_map', 'array_filter', 'array_reduce', 'array_walk', 'array_walk_recursive',
+        'unserialize',
+        // File system & I/O
         'file_put_contents', 'file_get_contents', 'fopen', 'fwrite', 'fputs',
         'unlink', 'mkdir', 'rmdir', 'rename', 'copy', 'chmod', 'chown',
-        'symlink', 'link', 'tmpfile', 'move_uploaded_file',
+        'symlink', 'link', 'tmpfile', 'move_uploaded_file', 'touch',
+        'readfile', 'file', 'fpassthru', 'highlight_file', 'show_source',
+        'fileperms', 'fileowner', 'filegroup', 'chgrp', 'lchown', 'lchgrp',
+        'glob', 'scandir', 'opendir', 'readdir', 'dir',
+        // Environment, configuration & variable manipulation
         'extract', 'parse_str', 'putenv',
         'ini_set', 'ini_alter',
         'header', 'setcookie',
         'define', 'defined',
-        'base64_decode', 'urldecode',
+        // Encoding / Obfuscation helpers
+        'base64_decode', 'urldecode', 'hex2bin',
+        'gzinflate', 'gzuncompress', 'gzdecode', 'str_rot13', 'convert_uudecode',
+    ];
+
+    /**
+     * Dangerous PHP language construct tokens that are blocked in hooks.php.
+     */
+    private const DANGEROUS_LANGUAGE_TOKENS = [
+        T_EVAL,
+        T_INCLUDE,
+        T_INCLUDE_ONCE,
+        T_REQUIRE,
+        T_REQUIRE_ONCE,
+        T_HALT_COMPILER,
     ];
 
     /**
@@ -32,7 +58,7 @@ class ThemeHooksValidator
     ];
 
     /**
-     * Scan ZIP archive for files with dangerous PHP extensions.
+     * Scan ZIP archive for files with dangerous PHP extensions and malicious blade templates.
      * Must be called BEFORE extractTo().
      *
      * @throws \RuntimeException if dangerous files are detected.
@@ -44,8 +70,26 @@ public function scanZipForPhp(\ZipArchive $zip): void
         for ($i = 0; $i < $zip->numFiles; $i++) {
             $filename = $zip->getNameIndex($i);
 
-            // Skip Blade template files — they are safe Laravel templates
+            // Skip directories
+            if (str_ends_with($filename, '/')) {
+                continue;
+            }
+
+            // Validate Blade template files
             if (str_ends_with($filename, '.blade.php')) {
+                // Blade templates must be inside resources/views/
+                if (! str_contains($filename, 'resources/views/')) {
+                    $dangerousFiles[] = "{$filename} (Blade template must reside in resources/views/)";
+                    continue;
+                }
+
+                // Scan Blade content for PHP/Blade execution blocks containing backtick operator
+                $bladeContent = $zip->getFromIndex($i);
+                if ($bladeContent !== false && preg_match('/(<\?php|@php|\{\{|\{!!)[^>}]*`/', $bladeContent)) {
+                    $dangerousFiles[] = "{$filename} (Backtick execution operator detected in PHP/Blade directive)";
+                    continue;
+                }
+
                 continue;
             }
 
@@ -144,12 +188,28 @@ public function loadHooks(string $themePath): void
     }
 
     /**
-     * Validate hooks.php source code using token_get_all().
+     * Validate hooks.php source code using multi-layer token and string analysis.
      *
      * Returns ['valid' => bool, 'reason' => string, 'details' => array]
      */
     public function validateSource(string $source, string $themeName): array
     {
+        // === LAYER 1: Raw character scan ===
+        // Reject backtick execution operators immediately
+        if (str_contains($source, '`')) {
+            return [
+                'valid' => false,
+                'reason' => 'Backtick execution operator is not allowed',
+                'details' => [
+                    [
+                        'function' => 'backtick_execution',
+                        'line' => 1,
+                    ],
+                ],
+            ];
+        }
+
+        // === LAYER 2: Token-based AST analysis ===
         $tokens = @token_get_all($source);
         if (! is_array($tokens)) {
             return ['valid' => false, 'reason' => 'hooks.php cannot be parsed', 'details' => []];
@@ -161,70 +221,151 @@ public function validateSource(string $source, string $themeName): array
         $hasBadCharacter = false;
 
         for ($i = 0; $i < $count; $i++) {
-            if (! is_array($tokens[$i])) {
+            $token = $tokens[$i];
+
+            // Handle single-character literal tokens (e.g. '`', '$', '(', '}', ']', etc.)
+            if (! is_array($token)) {
+                if ($token === '`') {
+                    $dangerousCalls[] = [
+                        'function' => 'backtick_execution',
+                        'line' => 1,
+                    ];
+                } elseif ($token === '$') {
+                    // Check for variable variables like $$var
+                    $nextIdx = $this->getNextMeaningfulTokenIndex($tokens, $i, $count);
+                    if ($nextIdx < $count && is_array($tokens[$nextIdx]) && $tokens[$nextIdx][0] === T_VARIABLE) {
+                        $dangerousCalls[] = [
+                            'function' => 'variable_variable:' . $tokens[$nextIdx][1],
+                            'line' => $tokens[$nextIdx][2],
+                        ];
+                    }
+                } elseif ($token === '}' || $token === ']') {
+                    // Detect: ${"system"}(), ${'system'}(), ${$a}() → '}('
+                    // Detect: $_GET["cmd"](), $a['fn']()       → ']('
+                    // This catches bypass payloads A, B, C, D from the security review.
+                    $nextIdx = $this->getNextMeaningfulTokenIndex($tokens, $i, $count);
+                    if ($nextIdx < $count && ! is_array($tokens[$nextIdx]) && $tokens[$nextIdx] === '(') {
+                        $dangerousCalls[] = [
+                            'function' => $token === '}' ? 'curly_expression_function_call' : 'array_subscript_function_call',
+                            'line' => 1,
+                        ];
+                    }
+                }
                 continue;
             }
 
+            $tokenId   = $token[0];
+            $tokenText = $token[1];
+            $tokenLine = $token[2];
+
+            // Double check for backtick inside any token text
+            if (str_contains($tokenText, '`')) {
+                $dangerousCalls[] = [
+                    'function' => 'backtick_execution',
+                    'line' => $tokenLine,
+                ];
+            }
+
             // Detect syntax errors via T_BAD_CHARACTER
-            if ($tokens[$i][0] === T_BAD_CHARACTER) {
+            if ($tokenId === T_BAD_CHARACTER) {
                 $hasBadCharacter = true;
             }
 
             // Reject inline HTML — hooks.php should be pure PHP
-            if ($tokens[$i][0] === T_INLINE_HTML) {
-                $content = trim((string) $tokens[$i][1]);
+            if ($tokenId === T_INLINE_HTML) {
+                $content = trim((string) $tokenText);
                 if ($content !== '') {
                     $hasInlineHtml = true;
                 }
             }
 
-            // Detect eval() — T_EVAL is a language construct token, not T_STRING
-            if ($tokens[$i][0] === T_EVAL) {
+            // Detect dangerous language constructs (eval, include, require, etc.)
+            if (in_array($tokenId, self::DANGEROUS_LANGUAGE_TOKENS, true)) {
                 $dangerousCalls[] = [
-                    'function' => 'eval',
-                    'line' => $tokens[$i][2],
+                    'function' => token_name($tokenId),
+                    'line' => $tokenLine,
                 ];
                 continue;
             }
 
-            // Look for function calls: T_STRING followed by '('
-            if ($tokens[$i][0] === T_STRING) {
-                $funcName = strtolower((string) $tokens[$i][1]);
+            // Detect dynamic class instantiation: new $var()
+            if ($tokenId === T_NEW) {
+                $nextIdx = $this->getNextMeaningfulTokenIndex($tokens, $i, $count);
+                if ($nextIdx < $count && is_array($tokens[$nextIdx]) && $tokens[$nextIdx][0] === T_VARIABLE) {
+                    $dangerousCalls[] = [
+                        'function' => 'dynamic_instantiation:' . $tokens[$nextIdx][1],
+                        'line' => $tokenLine,
+                    ];
+                }
+                continue;
+            }
 
-                // Check if the next non-whitespace token is '('
-                $nextIdx = $i + 1;
-                while ($nextIdx < $count && is_array($tokens[$nextIdx]) && $tokens[$nextIdx][0] === T_WHITESPACE) {
-                    $nextIdx++;
+            // Detect dynamic method/property calls: $obj->$method or $obj->{$method}
+            $isNullsafe = defined('T_NULLSAFE_OBJECT_OPERATOR') && $tokenId === T_NULLSAFE_OBJECT_OPERATOR;
+            if ($tokenId === T_OBJECT_OPERATOR || $isNullsafe) {
+                $nextIdx = $this->getNextMeaningfulTokenIndex($tokens, $i, $count);
+                if ($nextIdx < $count) {
+                    if (is_array($tokens[$nextIdx]) && $tokens[$nextIdx][0] === T_VARIABLE) {
+                        $dangerousCalls[] = [
+                            'function' => 'dynamic_member_access:' . $tokens[$nextIdx][1],
+                            'line' => $tokenLine,
+                        ];
+                    } elseif (! is_array($tokens[$nextIdx]) && $tokens[$nextIdx] === '{') {
+                        $dangerousCalls[] = [
+                            'function' => 'dynamic_member_expression',
+                            'line' => $tokenLine,
+                        ];
+                    }
                 }
+                continue;
+            }
+
+            // Detect dynamic static calls: Class::$method() or $class::$method()
+            if ($tokenId === T_PAAMAYIM_NEKUDOTAYIM) {
+                $nextIdx = $this->getNextMeaningfulTokenIndex($tokens, $i, $count);
+                if ($nextIdx < $count) {
+                    if (is_array($tokens[$nextIdx]) && $tokens[$nextIdx][0] === T_VARIABLE) {
+                        $dangerousCalls[] = [
+                            'function' => 'dynamic_static_call:' . $tokens[$nextIdx][1],
+                            'line' => $tokenLine,
+                        ];
+                    } elseif (! is_array($tokens[$nextIdx]) && $tokens[$nextIdx] === '$') {
+                        $dangerousCalls[] = [
+                            'function' => 'dynamic_static_expression',
+                            'line' => $tokenLine,
+                        ];
+                    }
+                }
+                continue;
+            }
+
+            // Look for function calls: T_STRING followed by '('
+            if ($tokenId === T_STRING) {
+                $funcName = strtolower((string) $tokenText);
+                $nextIdx  = $this->getNextMeaningfulTokenIndex($tokens, $i, $count);
 
                 if ($nextIdx < $count && ! is_array($tokens[$nextIdx]) && $tokens[$nextIdx] === '(') {
                     // Skip if this T_STRING is part of a function/method definition
-                    $prevIdx = $i - 1;
-                    while ($prevIdx >= 0 && is_array($tokens[$prevIdx]) && $tokens[$prevIdx][0] === T_WHITESPACE) {
-                        $prevIdx--;
-                    }
+                    $prevIdx = $this->getPrevMeaningfulTokenIndex($tokens, $i);
                     $isDefinition = ($prevIdx >= 0 && is_array($tokens[$prevIdx]) && $tokens[$prevIdx][0] === T_FUNCTION);
 
                     if (! $isDefinition && in_array($funcName, self::DANGEROUS_FUNCTIONS, true)) {
                         $dangerousCalls[] = [
                             'function' => $funcName,
-                            'line' => $tokens[$i][2],
+                            'line' => $tokenLine,
                         ];
                     }
                 }
             }
 
-            // BUG FIX (High): Detect variable function calls, e.g. $f('id') or $obj->method().
-            if ($tokens[$i][0] === T_VARIABLE) {
-                $nextIdx = $i + 1;
-                while ($nextIdx < $count && is_array($tokens[$nextIdx]) && $tokens[$nextIdx][0] === T_WHITESPACE) {
-                    $nextIdx++;
-                }
+            // Detect variable function calls, e.g. $f('id')
+            if ($tokenId === T_VARIABLE) {
+                $nextIdx = $this->getNextMeaningfulTokenIndex($tokens, $i, $count);
 
                 if ($nextIdx < $count && ! is_array($tokens[$nextIdx]) && $tokens[$nextIdx] === '(') {
                     $dangerousCalls[] = [
-                        'function' => 'variable_function_call:' . $tokens[$i][1],
-                        'line' => $tokens[$i][2],
+                        'function' => 'variable_function_call:' . $tokenText,
+                        'line' => $tokenLine,
                     ];
                 }
             }
@@ -256,4 +397,38 @@ public function validateSource(string $source, string $themeName): array
 
         return ['valid' => true, 'reason' => '', 'details' => []];
     }
+
+    /**
+     * Get index of next non-whitespace, non-comment token.
+     */
+    private function getNextMeaningfulTokenIndex(array $tokens, int $currentIndex, int $count): int
+    {
+        $next = $currentIndex + 1;
+        while ($next < $count) {
+            if (is_array($tokens[$next]) && in_array($tokens[$next][0], [T_WHITESPACE, T_COMMENT, T_DOC_COMMENT], true)) {
+                $next++;
+                continue;
+            }
+            break;
+        }
+
+        return $next;
+    }
+
+    /**
+     * Get index of previous non-whitespace, non-comment token.
+     */
+    private function getPrevMeaningfulTokenIndex(array $tokens, int $currentIndex): int
+    {
+        $prev = $currentIndex - 1;
+        while ($prev >= 0) {
+            if (is_array($tokens[$prev]) && in_array($tokens[$prev][0], [T_WHITESPACE, T_COMMENT, T_DOC_COMMENT], true)) {
+                $prev--;
+                continue;
+            }
+            break;
+        }
+
+        return $prev;
+    }
 }
diff --git a/app/Support/CspPolicy.php b/app/Support/CspPolicy.php
new file mode 100644
index 0000000000..bdd2d68dbf
--- /dev/null
+++ b/app/Support/CspPolicy.php
@@ -0,0 +1,129 @@
+<?php
+
+/*
+ * File ini bagian dari:
+ *
+ * OpenDK
+ *
+ * Aplikasi dan source code ini dirilis berdasarkan lisensi GPL V3
+ *
+ * Hak Cipta 2017 - 2024 Perkumpulan Desa Digital Terbuka (https://opendesa.id)
+ *
+ * Dengan ini diberikan izin, secara gratis, kepada siapa pun yang mendapatkan salinan
+ * dari perangkat lunak ini dan file dokumentasi terkait ("Aplikasi Ini"), untuk diperlakukan
+ * tanpa batasan, termasuk hak untuk menggunakan, menyalin, mengubah dan/atau mendistribusikan,
+ * asal tunduk pada syarat berikut:
+ *
+ * Pemberitahuan hak cipta di atas dan pemberitahuan izin ini harus disertakan dalam
+ * setiap salinan atau bagian penting Aplikasi Ini. Barang siapa yang menghapus atau menghilangkan
+ * pemberitahuan ini melanggar ketentuan lisensi Aplikasi Ini.
+ *
+ * PERANGKAT LUNAK INI DISEDIAKAN "SEBAGAIMANA ADANYA", TANPA JAMINAN APA PUN, BAIK TERSURAT MAUPUN
+ * TERSIRAT. PENULIS ATAU PEMEGANG HAK CIPTA SAMA SEKALI TIDAK BERTANGGUNG JAWAB ATAS KLAIM, KERUSAKAN ATAU
+ * KEWAJIBAN ATAUPUN PENGGUNAAN ATAU LAINNYA TERKAIT APLIKASI INI.
+ *
+ * @package    OpenDK
+ * @author     Tim Pengembang OpenDesa
+ * @copyright  Hak Cipta 2017 - 2024 Perkumpulan Desa Digital Terbuka (https://opendesa.id)
+ * @license    http://www.gnu.org/licenses/gpl.html    GPL V3
+ * @link       https://github.com/OpenSID/opendk
+ */
+
+namespace App\Support;
+
+/**
+ * Content Security Policy untuk seluruh halaman.
+ *
+ * Dipisahkan dari middleware agar tiap directive bisa diuji secara terpisah
+ * dan mudah ditambahkan ketika ada sumber daya baru yang diizinkan.
+ */
+class CspPolicy
+{
+    /**
+     * Directive CSP beserta sumber daya yang diizinkan.
+     *
+     * media-src mengizinkan https: karena galeri dapat memutar video dari
+     * hosting situs desa mana pun, dan frame-src mengizinkan penyedia video
+     * yang hanya menyediakan preview lewat iframe (Google Drive, YouTube, Vimeo).
+     *
+     * @var array<string, array<int, string>>
+     */
+    protected const DIRECTIVES = [
+        'default-src' => ["'self'"],
+        'script-src' => [
+            "'self'",
+            'https://pantau.opensid.my.id/',
+            'https://cdnjs.cloudflare.com/ajax/libs/tinymce/',
+            'https://cdn.jsdelivr.net/npm/',
+            'https://cdnjs.cloudflare.com/ajax/libs/numeral.js/2.0.6/numeral.min.js',
+            'https://website-widgets.pages.dev/dist/sienna.min.js',
+            'platform.twitter.com',
+            'unpkg.com',
+            "'unsafe-inline'",
+            "'unsafe-eval'",
+        ],
+        'style-src' => [
+            "'self'",
+            'https://www.tiny.cloud/',
+            'http://www.tinymce.com/css/codepen.min.css',
+            'https://cdnjs.cloudflare.com/ajax/libs/tinymce/',
+            'https://cdn.jsdelivr.net/npm/',
+            'fonts.googleapis.com',
+            'unpkg.com',
+            "'unsafe-inline'",
+        ],
+        'img-src' => ["'self'", '*', 'data:', 'blob:'],
+        'font-src' => [
+            "'self'",
+            'https://cdnjs.cloudflare.com/ajax/libs/tinymce/',
+            'https://cdn.jsdelivr.net/npm/',
+            'fonts.gstatic.com',
+            'data:',
+        ],
+        'media-src' => ["'self'", 'https:', 'blob:'],
+        'frame-src' => [
+            "'self'",
+            'blob:',
+            'data:',
+            'platform.twitter.com',
+            'github.com',
+            '*.youtube.com',
+            '*.vimeo.com',
+            'https://drive.google.com',
+            '*.opensid.my.id',
+        ],
+        'object-src' => ["'self'", 'blob:'],
+        'frame-ancestors' => ["'self'"],
+        'base-uri' => ["'self'"],
+    ];
+
+    /**
+     * Nilai seluruh directive dalam format header CSP.
+     */
+    public function toHeader(): string
+    {
+        $directives = self::DIRECTIVES;
+
+        $directives['connect-src'] = array_values(array_filter(array_merge(
+            ["'self'"],
+            [config('setting.api_server_database_gabungan')],
+            ['https://pantau.opensid.my.id/']
+        )));
+
+        $parts = [];
+
+        foreach ($directives as $name => $sources) {
+            $parts[] = $name . ' ' . implode(' ', $sources);
+        }
+
+        return implode(';', $parts) . ';';
+    }
+
+    /**
+     * Nilai satu directive, mis. media-src.
+     */
+    public function directive(string $name): string
+    {
+        return implode(' ', self::DIRECTIVES[$name] ?? []);
+    }
+}
diff --git a/app/Traits/HandlesFileUpload.php b/app/Traits/HandlesFileUpload.php
index 5bdea81a7b..ff00826ff6 100644
--- a/app/Traits/HandlesFileUpload.php
+++ b/app/Traits/HandlesFileUpload.php
@@ -36,7 +36,7 @@
 trait HandlesFileUpload
 {
     /**
-     * Daftar MIME types default yang diizinkan
+     * Daftar MIME types default yang diizinkan.
      */
     protected array $defaultAllowedMimes = [
         'image' => ['jpeg', 'png', 'jpg', 'gif', 'svg', 'webp'],
@@ -53,7 +53,9 @@ trait HandlesFileUpload
      * @param string $directory
      * @param bool $withDirectory
      * @param array $allowedMimes Optional list of allowed mime extensions
+     *
      * @return void
+     *
      * @throws \Illuminate\Validation\ValidationException
      */
     public function handleFileUpload($request, &$input, $field = 'file', $directory = 'uploads', $withDirectory = true, array $allowedMimes = [])
@@ -78,12 +80,45 @@ public function handleFileUpload($request, &$input, $field = 'file', $directory
         }
     }
 
+    /**
+     * Resolve file path secara aman dan pastikan berada dalam direktori yang diizinkan (mencegah Path Traversal).
+     */
+    public function resolveSecureFilePath(?string $path): ?string
+    {
+        if (empty($path)) {
+            return null;
+        }
+
+        $candidates = [
+            public_path($path),
+            base_path('public/' . $path),
+            storage_path('app/public/' . str_replace('storage/', '', $path)),
+        ];
+
+        $allowedPublic = realpath(public_path());
+        $allowedStorage = realpath(storage_path('app/public'));
+
+        foreach ($candidates as $candidate) {
+            if (file_exists($candidate)) {
+                $real = realpath($candidate);
+                if ($real) {
+                    $isAllowedPublic = $allowedPublic && str_starts_with($real, $allowedPublic);
+                    $isAllowedStorage = $allowedStorage && str_starts_with($real, $allowedStorage);
+                    if ($isAllowedPublic || $isAllowedStorage) {
+                        return $real;
+                    }
+                }
+            }
+        }
+
+        return null;
+    }
+
     /**
      * Validasi MIME type file.
      *
-     * @param UploadedFile $file
      * @param array $allowedMimes List of allowed extensions (e.g., ['jpg', 'png', 'pdf'])
-     * @return void
+     *
      * @throws \Illuminate\Validation\ValidationException
      */
     protected function validateMimeType(UploadedFile $file, array $allowedMimes): void
@@ -92,7 +127,7 @@ protected function validateMimeType(UploadedFile $file, array $allowedMimes): vo
 
         if (!in_array($extension, $allowedMimes)) {
             throw \Illuminate\Validation\ValidationException::withMessages([
-                'file' => "Tipe file tidak diizinkan. Tipe yang diizinkan: " . implode(', ', $allowedMimes),
+                'file' => 'Tipe file tidak diizinkan. Tipe yang diizinkan: ' . implode(', ', $allowedMimes),
             ]);
         }
 
@@ -102,16 +137,13 @@ protected function validateMimeType(UploadedFile $file, array $allowedMimes): vo
 
         if (!empty($allowedMimeTypes) && !in_array($mimeType, $allowedMimeTypes)) {
             throw \Illuminate\Validation\ValidationException::withMessages([
-                'file' => "MIME type file tidak valid. Pastikan file yang diupload sesuai dengan ekstensinya.",
+                'file' => 'MIME type file tidak valid. Pastikan file yang diupload sesuai dengan ekstensinya.',
             ]);
         }
     }
 
     /**
      * Generate nama file yang aman untuk penyimpanan.
-     *
-     * @param UploadedFile $file
-     * @return string
      */
     protected function generateSafeFileName(UploadedFile $file): string
     {
@@ -120,9 +152,6 @@ protected function generateSafeFileName(UploadedFile $file): string
 
     /**
      * Convert extensions to MIME types.
-     *
-     * @param array $extensions
-     * @return array
      */
     protected function extensionsToMimeTypes(array $extensions): array
     {
@@ -158,7 +187,6 @@ protected function extensionsToMimeTypes(array $extensions): array
      * Mendapatkan daftar MIME types berdasarkan kategori.
      *
      * @param string $category 'image', 'document', atau 'archive'
-     * @return array
      */
     protected function getAllowedMimesByCategory(string $category): array
     {
diff --git a/app/ValueObjects/MediaLink.php b/app/ValueObjects/MediaLink.php
new file mode 100644
index 0000000000..a54cba88e2
--- /dev/null
+++ b/app/ValueObjects/MediaLink.php
@@ -0,0 +1,90 @@
+<?php
+
+/*
+ * File ini bagian dari:
+ *
+ * OpenDK
+ *
+ * Aplikasi dan source code ini dirilis berdasarkan lisensi GPL V3
+ *
+ * Hak Cipta 2017 - 2024 Perkumpulan Desa Digital Terbuka (https://opendesa.id)
+ *
+ * Dengan ini diberikan izin, secara gratis, kepada siapa pun yang mendapatkan salinan
+ * dari perangkat lunak ini dan file dokumentasi terkait ("Aplikasi Ini"), untuk diperlakukan
+ * tanpa batasan, termasuk hak untuk menggunakan, menyalin, mengubah dan/atau mendistribusikan,
+ * asal tunduk pada syarat berikut:
+ *
+ * Pemberitahuan hak cipta di atas dan pemberitahuan izin ini harus disertakan dalam
+ * setiap salinan atau bagian penting Aplikasi Ini. Barang siapa yang menghapus atau menghilangkan
+ * pemberitahuan ini melanggar ketentuan lisensi Aplikasi Ini.
+ *
+ * PERANGKAT LUNAK INI DISEDIAKAN "SEBAGAIMANA ADANYA", TANPA JAMINAN APA PUN, BAIK TERSURAT MAUPUN
+ * TERSIRAT. PENULIS ATAU PEMEGANG HAK CIPTA SAMA SEKALI TIDAK BERTANGGUNG JAWAB ATAS KLAIM, KERUSAKAN ATAU
+ * KEWAJIBAN ATAUPUN PENGGUNAAN ATAU LAINNYA TERKAIT APLIKASI INI.
+ *
+ * @package    OpenDK
+ * @author     Tim Pengembang OpenDesa
+ * @copyright  Hak Cipta 2017 - 2024 Perkumpulan Desa Digital Terbuka (https://opendesa.id)
+ * @license    http://www.gnu.org/licenses/gpl.html    GPL V3
+ * @link       https://github.com/OpenSID/opendk
+ */
+
+namespace App\ValueObjects;
+
+use App\Enums\TipeMedia;
+use JsonSerializable;
+
+/**
+ * Hasil resolusi sebuah link media.
+ *
+ * Objek ini dipakai oleh front-end (API) maupun Blade untuk menentukan
+ * elemen HTML mana yang harus dirender saat menampilkan galeri.
+ */
+final class MediaLink implements JsonSerializable
+{
+    /**
+     * @param  string  $type  Salah satu dari nilai {@see TipeMedia}
+     * @param  string|null  $id  Identifier media pada penyedia (YouTube/Vimeo/Drive), jika ada
+     * @param  string|null  $url  URL media yang bisa dimuat langsung (src)
+     * @param  string|null  $embedUrl  URL untuk <iframe> bila <video> tidak mendukung
+     * @param  string|null  $thumbnail  URL poster/thumbnail untuk pratinjau
+     */
+    public function __construct(
+        public readonly string $type = TipeMedia::Unknown,
+        public readonly ?string $id = null,
+        public readonly ?string $url = null,
+        public readonly ?string $embedUrl = null,
+        public readonly ?string $thumbnail = null,
+    ) {
+    }
+
+    /**
+     * Buat hasil resolusi kosong untuk link yang tidak valid.
+     */
+    public static function unknown(?string $url = null): self
+    {
+        return new self(TipeMedia::Unknown, null, $url, null, null);
+    }
+
+    /**
+     * Apakah media ini bisa ditampilkan langsung tanpa membuka tab baru.
+     */
+    public function isEmbeddable(): bool
+    {
+        return $this->embedUrl !== null || $this->thumbnail !== null || $this->url !== null;
+    }
+
+    /**
+     * @return array<string, string|null>
+     */
+    public function jsonSerialize(): array
+    {
+        return [
+            'type' => $this->type,
+            'id' => $this->id,
+            'url' => $this->url,
+            'embed_url' => $this->embedUrl,
+            'thumbnail' => $this->thumbnail,
+        ];
+    }
+}
diff --git a/catatan_rilis.md b/catatan_rilis.md
index 660ee33bae..865544e2a0 100644
--- a/catatan_rilis.md
+++ b/catatan_rilis.md
@@ -1,14 +1,33 @@
-Di rilis versi v2609.0.0 di versi ini terdapat modul komentar pada artikel dan perbaikan lain yang diminta Komunitas.
+Di rilis versi v2610.0.0 di versi ini terdapat modul komentar pada artikel dan perbaikan lain yang diminta Komunitas.
 
 Terimakasih [isi disini] yang telah berkontribusi langsung mengembangkan aplikasi OpenDK.
 
 
 #### FITUR
 
+1. [#1725](https://github.com/OpenSID/OpenDK/issues/1725) Penambahan fungsi pratinjau file pdf untuk kebutuhan OpenDK tidak di dukung.
 
 #### BUG
 
+1. [#1718](https://github.com/OpenSID/OpenDK/issues/1718) Bug pada Modul Potensi – OpenDK v2608.0.2.
+2. [#1724](https://github.com/OpenSID/OpenDK/issues/1724) eta Letak Geografis kosong (Bounds are not valid) karena $data_umum tidak dikirim ke view gabungan.
+3. [#1721](https://github.com/OpenSID/OpenDK/issues/1721) Halaman Unduhan Dokumen hanya menampilkan data sesuai default pagination API (10 data).
+4. [#1731](https://github.com/OpenSID/OpenDK/issues/1731) Perbaikan menambah anggota penduduk untuk data suplemen tidak menampilkan list penduduk & keluarga.
+5. [#1732](https://github.com/OpenSID/OpenDK/issues/1732) Berkas download dokumen laporan-penduduk pada data tidak sikron dari OpenSID.
+6. [#1727](https://github.com/OpenSID/OpenDK/issues/1727) Perbaikan Tampilan Thumbnail Galeri dan Pratinjau Gambar Dinamis.
+7. [#1733](https://github.com/OpenSID/OpenDK/issues/1733) perbaikan filter kesehatan.
+8. [#1729](https://github.com/OpenSID/OpenDK/issues/1729) perbaikan tombol sarana ui.
+9. [#1730](https://github.com/OpenSID/OpenDK/issues/1730) data yang tampil pada datatable overlaping tidak di handle dengan scroll.
+10. [#1735](https://github.com/OpenSID/OpenDK/issues/1735) Periksa bagian tambah ketua lembaga ketika menggunakan API satu data.
+11. [#1736](http://github.com/OpenSID/OpenDK/issues/1736) Fix Penyesuaian Validasi NIK pada Pengiriman Keluhan untuk Database Gabungan (API Satu Data).
+12. [#1737](https://github.com/OpenSID/OpenDK/issues/1737) fungsi kirim pesan error 500.
+13. [#1761](https://github.com/OpenSID/OpenDK/issues/1761)Perbaikan validasi valid_file menolak PDF sah karena string generik "function".
+14. [#1764](https://github.com/OpenSID/OpenDK/issues/1764) Gagal Menampilkan data foto/video dari link pada web dan admin.
+15. [#1767](https://github.com/OpenSID/OpenDK/issues/1767)Perbaikan menu potensi pada halaman publik tidak berfungsi.
 
 #### TEKNIS
 
 1. [#1713](https://github.com/OpenSID/OpenDK/issues/1713) File di storage/app/public 404 karena direktori upload dibuat permission 0700 (Flysystem directory visibility).
+2. [#58](https://github.com/OpenSID/wiki-keamanan/issues/58) Insecure deserialization via Crypt::decrypt() (unserialize=true) on LogViewer user params.
+3. [#57](https://github.com/OpenSID/wiki-keamanan/issues/57) CRITICAL: RCE via Theme Hook include_once — backtick execution operator bypasses ThemeHooksValidator (theme.php).
+4. [#1759](https://github.com/OpenSID/OpenDK/issues/1759) Pastikan perubahan Known security vulnerabilities detected masuk rilis.
\ No newline at end of file
diff --git a/composer.lock b/composer.lock
index 2fe00f3a3e..a367387be9 100644
--- a/composer.lock
+++ b/composer.lock
@@ -8,16 +8,16 @@
     "packages": [
         {
             "name": "bensampo/laravel-enum",
-            "version": "v6.14.0",
+            "version": "v6.14.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/BenSampo/laravel-enum.git",
-                "reference": "067df676131295e2084d9d1a0f1dee811a1d4c99"
+                "reference": "9a7ee80d245a52bea2f611da81056e2e8ac6cc59"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/BenSampo/laravel-enum/zipball/067df676131295e2084d9d1a0f1dee811a1d4c99",
-                "reference": "067df676131295e2084d9d1a0f1dee811a1d4c99",
+                "url": "https://api.github.com/repos/BenSampo/laravel-enum/zipball/9a7ee80d245a52bea2f611da81056e2e8ac6cc59",
+                "reference": "9a7ee80d245a52bea2f611da81056e2e8ac6cc59",
                 "shasum": ""
             },
             "require": {
@@ -88,7 +88,7 @@
             ],
             "support": {
                 "issues": "https://github.com/BenSampo/laravel-enum/issues",
-                "source": "https://github.com/BenSampo/laravel-enum/tree/v6.14.0"
+                "source": "https://github.com/BenSampo/laravel-enum/tree/v6.14.1"
             },
             "funding": [
                 {
@@ -96,7 +96,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2026-03-29T17:00:09+00:00"
+            "time": "2026-09-03T07:17:56+00:00"
         },
         {
             "name": "brick/math",
@@ -159,16 +159,16 @@
         },
         {
             "name": "carbonphp/carbon-doctrine-types",
-            "version": "3.2.0",
+            "version": "3.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/CarbonPHP/carbon-doctrine-types.git",
-                "reference": "18ba5ddfec8976260ead6e866180bd5d2f71aa1d"
+                "reference": "5fa5eacafd9ef47c8c6ab9143fc901ba0194d3dc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/CarbonPHP/carbon-doctrine-types/zipball/18ba5ddfec8976260ead6e866180bd5d2f71aa1d",
-                "reference": "18ba5ddfec8976260ead6e866180bd5d2f71aa1d",
+                "url": "https://api.github.com/repos/CarbonPHP/carbon-doctrine-types/zipball/5fa5eacafd9ef47c8c6ab9143fc901ba0194d3dc",
+                "reference": "5fa5eacafd9ef47c8c6ab9143fc901ba0194d3dc",
                 "shasum": ""
             },
             "require": {
@@ -183,6 +183,11 @@
                 "phpunit/phpunit": "^10.3"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "3.x-dev"
+                }
+            },
             "autoload": {
                 "psr-4": {
                     "Carbon\\Doctrine\\": "src/Carbon/Doctrine/"
@@ -208,7 +213,7 @@
             ],
             "support": {
                 "issues": "https://github.com/CarbonPHP/carbon-doctrine-types/issues",
-                "source": "https://github.com/CarbonPHP/carbon-doctrine-types/tree/3.2.0"
+                "source": "https://github.com/CarbonPHP/carbon-doctrine-types/tree/3.2.1"
             },
             "funding": [
                 {
@@ -224,7 +229,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-02-09T16:56:22+00:00"
+            "time": "2026-09-06T14:11:38+00:00"
         },
         {
             "name": "cocur/slugify",
@@ -1236,24 +1241,24 @@
         },
         {
             "name": "graham-campbell/result-type",
-            "version": "v1.1.4",
+            "version": "v1.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/GrahamCampbell/Result-Type.git",
-                "reference": "e01f4a821471308ba86aa202fed6698b6b695e3b"
+                "reference": "adccca3324eece92ca35463648c12b9e6293c05b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/e01f4a821471308ba86aa202fed6698b6b695e3b",
-                "reference": "e01f4a821471308ba86aa202fed6698b6b695e3b",
+                "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/adccca3324eece92ca35463648c12b9e6293c05b",
+                "reference": "adccca3324eece92ca35463648c12b9e6293c05b",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.2.5 || ^8.0",
-                "phpoption/phpoption": "^1.9.5"
+                "phpoption/phpoption": "^1.10"
             },
             "require-dev": {
-                "phpunit/phpunit": "^8.5.41 || ^9.6.22 || ^10.5.45 || ^11.5.7"
+                "phpunit/phpunit": "^8.5.52 || ^9.6.34 || ^10.5.63 || ^11.5.55 || ^12.5.14"
             },
             "type": "library",
             "autoload": {
@@ -1282,7 +1287,7 @@
             ],
             "support": {
                 "issues": "https://github.com/GrahamCampbell/Result-Type/issues",
-                "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.1.4"
+                "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.2.0"
             },
             "funding": [
                 {
@@ -1294,26 +1299,26 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-12-27T19:43:20+00:00"
+            "time": "2026-08-24T09:06:52+00:00"
         },
         {
             "name": "guzzlehttp/guzzle",
-            "version": "7.15.3",
+            "version": "7.15.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "ae311b8f045ea93ce7b1c9cdb7cec06c53f944bc"
+                "reference": "ee80339fd9177ba44c49cdb653ff02a4d1106b9a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/ae311b8f045ea93ce7b1c9cdb7cec06c53f944bc",
-                "reference": "ae311b8f045ea93ce7b1c9cdb7cec06c53f944bc",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/ee80339fd9177ba44c49cdb653ff02a4d1106b9a",
+                "reference": "ee80339fd9177ba44c49cdb653ff02a4d1106b9a",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
-                "guzzlehttp/promises": "^2.5.2",
-                "guzzlehttp/psr7": "^2.13",
+                "guzzlehttp/promises": "^2.5.3",
+                "guzzlehttp/psr7": "^2.13.1",
                 "php": "^7.2.5 || ^8.0",
                 "psr/http-client": "^1.0",
                 "symfony/deprecation-contracts": "^2.5 || ^3.0",
@@ -1406,7 +1411,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/guzzle/issues",
-                "source": "https://github.com/guzzle/guzzle/tree/7.15.3"
+                "source": "https://github.com/guzzle/guzzle/tree/7.15.5"
             },
             "funding": [
                 {
@@ -1422,20 +1427,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-08-05T19:48:21+00:00"
+            "time": "2026-08-24T09:21:06+00:00"
         },
         {
             "name": "guzzlehttp/promises",
-            "version": "2.5.2",
+            "version": "2.5.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/promises.git",
-                "reference": "2823687acff28b2dbe67b2508a6b300e2c3fa4ce"
+                "reference": "cde49999552d185d64715fe9c1f77a2aadd2f9f1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/promises/zipball/2823687acff28b2dbe67b2508a6b300e2c3fa4ce",
-                "reference": "2823687acff28b2dbe67b2508a6b300e2c3fa4ce",
+                "url": "https://api.github.com/repos/guzzle/promises/zipball/cde49999552d185d64715fe9c1f77a2aadd2f9f1",
+                "reference": "cde49999552d185d64715fe9c1f77a2aadd2f9f1",
                 "shasum": ""
             },
             "require": {
@@ -1490,7 +1495,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/promises/issues",
-                "source": "https://github.com/guzzle/promises/tree/2.5.2"
+                "source": "https://github.com/guzzle/promises/tree/2.5.3"
             },
             "funding": [
                 {
@@ -1506,20 +1511,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-08-05T19:30:54+00:00"
+            "time": "2026-08-24T09:11:28+00:00"
         },
         {
             "name": "guzzlehttp/psr7",
-            "version": "2.13.0",
+            "version": "2.13.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/psr7.git",
-                "reference": "dad89620b7a6edb60c15858442eb2e408b45d8f4"
+                "reference": "95e7828100de18b4e269fb1703be530082d5166d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/dad89620b7a6edb60c15858442eb2e408b45d8f4",
-                "reference": "dad89620b7a6edb60c15858442eb2e408b45d8f4",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/95e7828100de18b4e269fb1703be530082d5166d",
+                "reference": "95e7828100de18b4e269fb1703be530082d5166d",
                 "shasum": ""
             },
             "require": {
@@ -1609,7 +1614,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/psr7/issues",
-                "source": "https://github.com/guzzle/psr7/tree/2.13.0"
+                "source": "https://github.com/guzzle/psr7/tree/2.13.1"
             },
             "funding": [
                 {
@@ -1625,30 +1630,30 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-07-16T22:23:49+00:00"
+            "time": "2026-08-24T09:13:11+00:00"
         },
         {
             "name": "guzzlehttp/uri-template",
-            "version": "v1.0.10",
+            "version": "v2.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/uri-template.git",
-                "reference": "f6c24c21f42b990e9a58912b332d0874df6ba839"
+                "reference": "7a466ad606491eb6528c717482f7cca77f1851f3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/uri-template/zipball/f6c24c21f42b990e9a58912b332d0874df6ba839",
-                "reference": "f6c24c21f42b990e9a58912b332d0874df6ba839",
+                "url": "https://api.github.com/repos/guzzle/uri-template/zipball/7a466ad606491eb6528c717482f7cca77f1851f3",
+                "reference": "7a466ad606491eb6528c717482f7cca77f1851f3",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2.5 || ^8.0",
+                "php": "^7.4 || ^8.0",
                 "symfony/polyfill-php80": "^1.25"
             },
             "require-dev": {
                 "bamarni/composer-bin-plugin": "^1.8.2",
-                "phpunit/phpunit": "^8.5.52 || ^9.6.34",
-                "uri-template/tests": "1.0.0"
+                "phpunit/phpunit": "^9.6.34",
+                "uri-template/tests": "1.0.2"
             },
             "type": "library",
             "extra": {
@@ -1695,7 +1700,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/uri-template/issues",
-                "source": "https://github.com/guzzle/uri-template/tree/v1.0.10"
+                "source": "https://github.com/guzzle/uri-template/tree/v2.0.1"
             },
             "funding": [
                 {
@@ -1711,7 +1716,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-07-17T13:53:03+00:00"
+            "time": "2026-08-24T17:13:02+00:00"
         },
         {
             "name": "hexadog/laravel-theme-installer",
@@ -2445,16 +2450,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v13.25.0",
+            "version": "v13.31.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "ed36fe882bd4eed4e6ff75343cbad8dbda03fdba"
+                "reference": "7c75fbf93f91fa077d3df1c820cc14f4e59a9774"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/ed36fe882bd4eed4e6ff75343cbad8dbda03fdba",
-                "reference": "ed36fe882bd4eed4e6ff75343cbad8dbda03fdba",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/7c75fbf93f91fa077d3df1c820cc14f4e59a9774",
+                "reference": "7c75fbf93f91fa077d3df1c820cc14f4e59a9774",
                 "shasum": ""
             },
             "require": {
@@ -2471,9 +2476,10 @@
                 "ext-session": "*",
                 "ext-tokenizer": "*",
                 "fruitcake/php-cors": "^1.3",
-                "guzzlehttp/guzzle": "^7.8.2",
-                "guzzlehttp/promises": "^2.0.3",
-                "guzzlehttp/uri-template": "^1.0",
+                "guzzlehttp/guzzle": "^7.8.2 || ^8.0",
+                "guzzlehttp/promises": "^2.0.3 || ^3.0",
+                "guzzlehttp/psr7": "^2.9 || ^3.0",
+                "guzzlehttp/uri-template": "^1.0 || ^2.0",
                 "laravel/prompts": "^0.3.11",
                 "laravel/serializable-closure": "^2.0.10",
                 "league/commonmark": "^2.8.1",
@@ -2485,6 +2491,7 @@
                 "nunomaduro/termwind": "^2.0",
                 "php": "^8.3",
                 "psr/container": "^1.1.1 || ^2.0.1",
+                "psr/http-message": "^1.0 || ^2.0",
                 "psr/log": "^1.0 || ^2.0 || ^3.0",
                 "psr/simple-cache": "^1.0 || ^2.0 || ^3.0",
                 "ramsey/uuid": "^4.7",
@@ -2559,7 +2566,6 @@
                 "aws/aws-sdk-php": "^3.322.9",
                 "ext-gmp": "*",
                 "fakerphp/faker": "^1.24",
-                "guzzlehttp/psr7": "^2.9",
                 "intervention/image": "^4.0",
                 "laravel/pint": "^1.18",
                 "league/flysystem-aws-s3-v3": "^3.25.1",
@@ -2575,7 +2581,7 @@
                 "phpstan/phpstan": "^2.0",
                 "phpunit/phpunit": "^11.5.50 || ^12.5.8 || ^13.0.3",
                 "predis/predis": "^2.3 || ^3.0",
-                "rector/rector": "^2.3",
+                "rector/rector": "2.6.3",
                 "resend/resend-php": "^1.0",
                 "symfony/cache": "^7.4.0 || ^8.0.0",
                 "symfony/http-client": "^7.4.0 || ^8.0.0",
@@ -2609,7 +2615,6 @@
                 "php-http/discovery": "Required to use PSR-7 bridging features (^1.15).",
                 "phpunit/phpunit": "Required to use assertions and run tests (^11.5.50 || ^12.5.8 || ^13.0.3).",
                 "predis/predis": "Required to use the predis connector (^2.3 || ^3.0).",
-                "psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0).",
                 "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^6.0 || ^7.0).",
                 "resend/resend-php": "Required to enable support for the Resend mail transport (^0.10.0 || ^1.0).",
                 "spatie/fork": "Required to use the 'fork' concurrency driver (^1.2).",
@@ -2668,7 +2673,7 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2026-08-11T13:56:22+00:00"
+            "time": "2026-09-08T14:22:55+00:00"
         },
         {
             "name": "laravel/helpers",
@@ -2729,16 +2734,16 @@
         },
         {
             "name": "laravel/prompts",
-            "version": "v0.3.22",
+            "version": "v0.3.24",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/prompts.git",
-                "reference": "02b89b39e8972a998db4d5d4ad4719239dd4aee4"
+                "reference": "5d3cdef29e93ca3b62b1871359db3078cd99908b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/prompts/zipball/02b89b39e8972a998db4d5d4ad4719239dd4aee4",
-                "reference": "02b89b39e8972a998db4d5d4ad4719239dd4aee4",
+                "url": "https://api.github.com/repos/laravel/prompts/zipball/5d3cdef29e93ca3b62b1871359db3078cd99908b",
+                "reference": "5d3cdef29e93ca3b62b1871359db3078cd99908b",
                 "shasum": ""
             },
             "require": {
@@ -2782,22 +2787,22 @@
             "description": "Add beautiful and user-friendly forms to your command-line applications.",
             "support": {
                 "issues": "https://github.com/laravel/prompts/issues",
-                "source": "https://github.com/laravel/prompts/tree/v0.3.22"
+                "source": "https://github.com/laravel/prompts/tree/v0.3.24"
             },
-            "time": "2026-08-04T14:50:50+00:00"
+            "time": "2026-08-20T12:55:36+00:00"
         },
         {
             "name": "laravel/serializable-closure",
-            "version": "v2.0.15",
+            "version": "v2.0.16",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/serializable-closure.git",
-                "reference": "dccd8bcb851bb03fcc005df650b708b57cc52661"
+                "reference": "7cfc24e4fa2cca045fb8dd2a797a2b2b13b655ed"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/dccd8bcb851bb03fcc005df650b708b57cc52661",
-                "reference": "dccd8bcb851bb03fcc005df650b708b57cc52661",
+                "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/7cfc24e4fa2cca045fb8dd2a797a2b2b13b655ed",
+                "reference": "7cfc24e4fa2cca045fb8dd2a797a2b2b13b655ed",
                 "shasum": ""
             },
             "require": {
@@ -2845,7 +2850,7 @@
                 "issues": "https://github.com/laravel/serializable-closure/issues",
                 "source": "https://github.com/laravel/serializable-closure"
             },
-            "time": "2026-07-21T16:49:22+00:00"
+            "time": "2026-08-18T20:28:54+00:00"
         },
         {
             "name": "laravel/ui",
@@ -2985,16 +2990,16 @@
         },
         {
             "name": "league/commonmark",
-            "version": "2.10.0",
+            "version": "2.10.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/commonmark.git",
-                "reference": "d2d1aa8b35e072966c89bc0c66cf926e56767dc4"
+                "reference": "6efbd9c472b91db0a3350fcd601c8332c2382e1f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/d2d1aa8b35e072966c89bc0c66cf926e56767dc4",
-                "reference": "d2d1aa8b35e072966c89bc0c66cf926e56767dc4",
+                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/6efbd9c472b91db0a3350fcd601c8332c2382e1f",
+                "reference": "6efbd9c472b91db0a3350fcd601c8332c2382e1f",
                 "shasum": ""
             },
             "require": {
@@ -3088,7 +3093,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-08-11T16:06:25+00:00"
+            "time": "2026-09-21T13:07:34+00:00"
         },
         {
             "name": "league/config",
@@ -3174,16 +3179,16 @@
         },
         {
             "name": "league/flysystem",
-            "version": "3.35.2",
+            "version": "3.36.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem.git",
-                "reference": "b277b5dc3d56650b68904117124e79c851e12376"
+                "reference": "f7fb152932f30072d573510cbd4dd657d6475b25"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/b277b5dc3d56650b68904117124e79c851e12376",
-                "reference": "b277b5dc3d56650b68904117124e79c851e12376",
+                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/f7fb152932f30072d573510cbd4dd657d6475b25",
+                "reference": "f7fb152932f30072d573510cbd4dd657d6475b25",
                 "shasum": ""
             },
             "require": {
@@ -3251,22 +3256,22 @@
             ],
             "support": {
                 "issues": "https://github.com/thephpleague/flysystem/issues",
-                "source": "https://github.com/thephpleague/flysystem/tree/3.35.2"
+                "source": "https://github.com/thephpleague/flysystem/tree/3.36.0"
             },
-            "time": "2026-07-06T14:42:07+00:00"
+            "time": "2026-09-02T08:00:27+00:00"
         },
         {
             "name": "league/flysystem-local",
-            "version": "3.31.0",
+            "version": "3.35.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem-local.git",
-                "reference": "2f669db18a4c20c755c2bb7d3a7b0b2340488079"
+                "reference": "a099b24dce160f3b2239043d13d47c4a1a214ea4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem-local/zipball/2f669db18a4c20c755c2bb7d3a7b0b2340488079",
-                "reference": "2f669db18a4c20c755c2bb7d3a7b0b2340488079",
+                "url": "https://api.github.com/repos/thephpleague/flysystem-local/zipball/a099b24dce160f3b2239043d13d47c4a1a214ea4",
+                "reference": "a099b24dce160f3b2239043d13d47c4a1a214ea4",
                 "shasum": ""
             },
             "require": {
@@ -3300,9 +3305,9 @@
                 "local"
             ],
             "support": {
-                "source": "https://github.com/thephpleague/flysystem-local/tree/3.31.0"
+                "source": "https://github.com/thephpleague/flysystem-local/tree/3.35.3"
             },
-            "time": "2026-01-23T15:30:45+00:00"
+            "time": "2026-08-12T13:29:21+00:00"
         },
         {
             "name": "league/fractal",
@@ -3614,16 +3619,16 @@
         },
         {
             "name": "livewire/livewire",
-            "version": "v3.8.4",
+            "version": "v3.8.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/livewire/livewire.git",
-                "reference": "bc06b755058e2253cc4153d95c8720c585f6254c"
+                "reference": "ec19e5fb1e0b60df22ad15b901c2f7740267ba11"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/livewire/livewire/zipball/bc06b755058e2253cc4153d95c8720c585f6254c",
-                "reference": "bc06b755058e2253cc4153d95c8720c585f6254c",
+                "url": "https://api.github.com/repos/livewire/livewire/zipball/ec19e5fb1e0b60df22ad15b901c2f7740267ba11",
+                "reference": "ec19e5fb1e0b60df22ad15b901c2f7740267ba11",
                 "shasum": ""
             },
             "require": {
@@ -3678,7 +3683,7 @@
             "description": "A front-end framework for Laravel.",
             "support": {
                 "issues": "https://github.com/livewire/livewire/issues",
-                "source": "https://github.com/livewire/livewire/tree/v3.8.4"
+                "source": "https://github.com/livewire/livewire/tree/v3.8.8"
             },
             "funding": [
                 {
@@ -3686,7 +3691,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2026-08-10T15:24:05+00:00"
+            "time": "2026-09-07T16:02:29+00:00"
         },
         {
             "name": "maatwebsite/excel",
@@ -3956,16 +3961,16 @@
         },
         {
             "name": "mews/captcha",
-            "version": "3.5.0",
+            "version": "3.5.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/mewebstudio/captcha.git",
-                "reference": "b7add434bfd87c7e900c82d821a56ec566381915"
+                "reference": "7154a930e88bdb7b02630b14105c5b7b3ecc7fb4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/mewebstudio/captcha/zipball/b7add434bfd87c7e900c82d821a56ec566381915",
-                "reference": "b7add434bfd87c7e900c82d821a56ec566381915",
+                "url": "https://api.github.com/repos/mewebstudio/captcha/zipball/7154a930e88bdb7b02630b14105c5b7b3ecc7fb4",
+                "reference": "7154a930e88bdb7b02630b14105c5b7b3ecc7fb4",
                 "shasum": ""
             },
             "require": {
@@ -4023,9 +4028,9 @@
             ],
             "support": {
                 "issues": "https://github.com/mewebstudio/captcha/issues",
-                "source": "https://github.com/mewebstudio/captcha/tree/3.5.0"
+                "source": "https://github.com/mewebstudio/captcha/tree/3.5.1"
             },
-            "time": "2026-06-08T01:49:41+00:00"
+            "time": "2026-08-28T22:05:37+00:00"
         },
         {
             "name": "mobiledetect/mobiledetectlib",
@@ -4091,16 +4096,16 @@
         },
         {
             "name": "monolog/monolog",
-            "version": "3.10.0",
+            "version": "3.12.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/monolog.git",
-                "reference": "b321dd6749f0bf7189444158a3ce785cc16d69b0"
+                "reference": "72c534fc0ab181ef52d92a68382318631e301608"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/b321dd6749f0bf7189444158a3ce785cc16d69b0",
-                "reference": "b321dd6749f0bf7189444158a3ce785cc16d69b0",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/72c534fc0ab181ef52d92a68382318631e301608",
+                "reference": "72c534fc0ab181ef52d92a68382318631e301608",
                 "shasum": ""
             },
             "require": {
@@ -4126,6 +4131,7 @@
                 "phpstan/phpstan-strict-rules": "^2",
                 "phpunit/phpunit": "^10.5.17 || ^11.0.7",
                 "predis/predis": "^1.1 || ^2",
+                "psr/clock": "^1.0",
                 "rollbar/rollbar": "^4.0",
                 "ruflin/elastica": "^7 || ^8",
                 "symfony/mailer": "^5.4 || ^6",
@@ -4144,6 +4150,7 @@
                 "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server",
                 "mongodb/mongodb": "Allow sending log messages to a MongoDB server (via library)",
                 "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib",
+                "psr/clock": "Required to pass a clock to the Logger and control the timestamp of log records",
                 "rollbar/rollbar": "Allow sending log messages to Rollbar",
                 "ruflin/elastica": "Allow sending log messages to an Elastic Search server"
             },
@@ -4178,7 +4185,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Seldaek/monolog/issues",
-                "source": "https://github.com/Seldaek/monolog/tree/3.10.0"
+                "source": "https://github.com/Seldaek/monolog/tree/3.12.0"
             },
             "funding": [
                 {
@@ -4190,7 +4197,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-01-02T08:56:05+00:00"
+            "time": "2026-09-09T08:34:20+00:00"
         },
         {
             "name": "mpociot/reflection-docblock",
@@ -4986,16 +4993,16 @@
         },
         {
             "name": "phpoption/phpoption",
-            "version": "1.9.5",
+            "version": "1.10.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/schmittjoh/php-option.git",
-                "reference": "75365b91986c2405cf5e1e012c5595cd487a98be"
+                "reference": "67b192b6a42ec03944b972d6e633ddec78ad2c6d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/75365b91986c2405cf5e1e012c5595cd487a98be",
-                "reference": "75365b91986c2405cf5e1e012c5595cd487a98be",
+                "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/67b192b6a42ec03944b972d6e633ddec78ad2c6d",
+                "reference": "67b192b6a42ec03944b972d6e633ddec78ad2c6d",
                 "shasum": ""
             },
             "require": {
@@ -5003,7 +5010,7 @@
             },
             "require-dev": {
                 "bamarni/composer-bin-plugin": "^1.8.2",
-                "phpunit/phpunit": "^8.5.44 || ^9.6.25 || ^10.5.53 || ^11.5.34"
+                "phpunit/phpunit": "^8.5.54 || ^9.6.36 || ^10.5.64 || ^11.5.56 || ^12.5.33"
             },
             "type": "library",
             "extra": {
@@ -5045,7 +5052,7 @@
             ],
             "support": {
                 "issues": "https://github.com/schmittjoh/php-option/issues",
-                "source": "https://github.com/schmittjoh/php-option/tree/1.9.5"
+                "source": "https://github.com/schmittjoh/php-option/tree/1.10.0"
             },
             "funding": [
                 {
@@ -5057,7 +5064,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-12-27T19:41:33+00:00"
+            "time": "2026-08-24T00:54:40+00:00"
         },
         {
             "name": "proengsoft/laravel-jsvalidation",
@@ -5819,16 +5826,16 @@
         },
         {
             "name": "sentry/sentry",
-            "version": "4.30.0",
+            "version": "4.31.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/getsentry/sentry-php.git",
-                "reference": "95a26e7c946651cacd69d1ded95a8190f952a3ae"
+                "reference": "39d9f86bd56c6cc6ae7b64c2b849f7f046d38394"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/getsentry/sentry-php/zipball/95a26e7c946651cacd69d1ded95a8190f952a3ae",
-                "reference": "95a26e7c946651cacd69d1ded95a8190f952a3ae",
+                "url": "https://api.github.com/repos/getsentry/sentry-php/zipball/39d9f86bd56c6cc6ae7b64c2b849f7f046d38394",
+                "reference": "39d9f86bd56c6cc6ae7b64c2b849f7f046d38394",
                 "shasum": ""
             },
             "require": {
@@ -5899,7 +5906,7 @@
             ],
             "support": {
                 "issues": "https://github.com/getsentry/sentry-php/issues",
-                "source": "https://github.com/getsentry/sentry-php/tree/4.30.0"
+                "source": "https://github.com/getsentry/sentry-php/tree/4.31.0"
             },
             "funding": [
                 {
@@ -5911,7 +5918,7 @@
                     "type": "custom"
                 }
             ],
-            "time": "2026-08-05T14:54:26+00:00"
+            "time": "2026-08-27T12:59:01+00:00"
         },
         {
             "name": "sentry/sentry-laravel",
@@ -6272,22 +6279,22 @@
         },
         {
             "name": "spatie/laravel-activitylog",
-            "version": "5.1.0",
+            "version": "5.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/laravel-activitylog.git",
-                "reference": "97c9f7e82033b18dc9db25de276f9b71e01449ea"
+                "reference": "8ce56d3b9d72f4e4551f4449d236a5ed06e71667"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/laravel-activitylog/zipball/97c9f7e82033b18dc9db25de276f9b71e01449ea",
-                "reference": "97c9f7e82033b18dc9db25de276f9b71e01449ea",
+                "url": "https://api.github.com/repos/spatie/laravel-activitylog/zipball/8ce56d3b9d72f4e4551f4449d236a5ed06e71667",
+                "reference": "8ce56d3b9d72f4e4551f4449d236a5ed06e71667",
                 "shasum": ""
             },
             "require": {
-                "illuminate/config": "^13.0",
-                "illuminate/database": "^13.0",
-                "illuminate/support": "^13.0",
+                "illuminate/config": "^12.0 || ^13.0",
+                "illuminate/database": "^12.0 || ^13.0",
+                "illuminate/support": "^12.0 || ^13.0",
                 "php": "^8.4",
                 "spatie/laravel-package-tools": "^1.6.3"
             },
@@ -6295,8 +6302,8 @@
                 "ext-json": "*",
                 "larastan/larastan": "^3.0",
                 "laravel/pint": "^1.29",
-                "orchestra/testbench": "^11.0",
-                "pestphp/pest": "^5.0"
+                "orchestra/testbench": "^10.0 || ^11.0",
+                "pestphp/pest": "^4.0 || ^5.0"
             },
             "type": "library",
             "extra": {
@@ -6349,7 +6356,7 @@
             ],
             "support": {
                 "issues": "https://github.com/spatie/laravel-activitylog/issues",
-                "source": "https://github.com/spatie/laravel-activitylog/tree/5.1.0"
+                "source": "https://github.com/spatie/laravel-activitylog/tree/5.1.1"
             },
             "funding": [
                 {
@@ -6361,20 +6368,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2026-08-12T12:07:38+00:00"
+            "time": "2026-09-08T12:16:25+00:00"
         },
         {
             "name": "spatie/laravel-backup",
-            "version": "10.3.1",
+            "version": "10.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/laravel-backup.git",
-                "reference": "1160cf6a6faa262586f47e2bd20c59512bb1a77e"
+                "reference": "705147b2521c19b6e2a0cd598acbf8a0c5f3184f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/laravel-backup/zipball/1160cf6a6faa262586f47e2bd20c59512bb1a77e",
-                "reference": "1160cf6a6faa262586f47e2bd20c59512bb1a77e",
+                "url": "https://api.github.com/repos/spatie/laravel-backup/zipball/705147b2521c19b6e2a0cd598acbf8a0c5f3184f",
+                "reference": "705147b2521c19b6e2a0cd598acbf8a0c5f3184f",
                 "shasum": ""
             },
             "require": {
@@ -6449,7 +6456,7 @@
             ],
             "support": {
                 "issues": "https://github.com/spatie/laravel-backup/issues",
-                "source": "https://github.com/spatie/laravel-backup/tree/10.3.1"
+                "source": "https://github.com/spatie/laravel-backup/tree/10.3.2"
             },
             "funding": [
                 {
@@ -6461,7 +6468,7 @@
                     "type": "other"
                 }
             ],
-            "time": "2026-07-28T13:19:06+00:00"
+            "time": "2026-08-20T12:06:47+00:00"
         },
         {
             "name": "spatie/laravel-fractal",
@@ -6690,16 +6697,16 @@
         },
         {
             "name": "spatie/laravel-package-tools",
-            "version": "1.93.1",
+            "version": "1.93.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/laravel-package-tools.git",
-                "reference": "d5552849801f2642aea710557463234b59ef65eb"
+                "reference": "e927d5b5b05e9fecae098e559e51918aa608ad02"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/laravel-package-tools/zipball/d5552849801f2642aea710557463234b59ef65eb",
-                "reference": "d5552849801f2642aea710557463234b59ef65eb",
+                "url": "https://api.github.com/repos/spatie/laravel-package-tools/zipball/e927d5b5b05e9fecae098e559e51918aa608ad02",
+                "reference": "e927d5b5b05e9fecae098e559e51918aa608ad02",
                 "shasum": ""
             },
             "require": {
@@ -6739,7 +6746,7 @@
             ],
             "support": {
                 "issues": "https://github.com/spatie/laravel-package-tools/issues",
-                "source": "https://github.com/spatie/laravel-package-tools/tree/1.93.1"
+                "source": "https://github.com/spatie/laravel-package-tools/tree/1.93.2"
             },
             "funding": [
                 {
@@ -6747,7 +6754,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2026-05-19T14:06:37+00:00"
+            "time": "2026-08-26T09:13:25+00:00"
         },
         {
             "name": "spatie/laravel-permission",
@@ -6835,16 +6842,16 @@
         },
         {
             "name": "spatie/laravel-query-builder",
-            "version": "7.3.3",
+            "version": "7.3.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/laravel-query-builder.git",
-                "reference": "eb1e0835018fff80900160d4bfd730c560c54ec4"
+                "reference": "595523f861caf751ebd29fc377ddc525cd2e3fb1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/laravel-query-builder/zipball/eb1e0835018fff80900160d4bfd730c560c54ec4",
-                "reference": "eb1e0835018fff80900160d4bfd730c560c54ec4",
+                "url": "https://api.github.com/repos/spatie/laravel-query-builder/zipball/595523f861caf751ebd29fc377ddc525cd2e3fb1",
+                "reference": "595523f861caf751ebd29fc377ddc525cd2e3fb1",
                 "shasum": ""
             },
             "require": {
@@ -6905,7 +6912,7 @@
                     "type": "custom"
                 }
             ],
-            "time": "2026-08-07T11:50:57+00:00"
+            "time": "2026-09-03T13:42:08+00:00"
         },
         {
             "name": "spatie/laravel-signal-aware-command",
@@ -8402,16 +8409,16 @@
         },
         {
             "name": "symfony/polyfill-intl-idn",
-            "version": "v1.38.1",
+            "version": "v1.42.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-idn.git",
-                "reference": "dc21118016c039a66235cf93d96b435ffb282412"
+                "reference": "51b5ff5ba85452b31ec6f55490b08148612339d9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/dc21118016c039a66235cf93d96b435ffb282412",
-                "reference": "dc21118016c039a66235cf93d96b435ffb282412",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/51b5ff5ba85452b31ec6f55490b08148612339d9",
+                "reference": "51b5ff5ba85452b31ec6f55490b08148612339d9",
                 "shasum": ""
             },
             "require": {
@@ -8465,7 +8472,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.38.1"
+                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.42.0"
             },
             "funding": [
                 {
@@ -8485,20 +8492,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-05-25T15:22:23+00:00"
+            "time": "2026-08-24T10:51:20+00:00"
         },
         {
             "name": "symfony/polyfill-intl-normalizer",
-            "version": "v1.38.0",
+            "version": "v1.42.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
-                "reference": "2d446c214bdbe5b71bde5011b060a05fece3ae6b"
+                "reference": "aa20edea75bd9c48cfecc8360922e5a6e5c44502"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/2d446c214bdbe5b71bde5011b060a05fece3ae6b",
-                "reference": "2d446c214bdbe5b71bde5011b060a05fece3ae6b",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/aa20edea75bd9c48cfecc8360922e5a6e5c44502",
+                "reference": "aa20edea75bd9c48cfecc8360922e5a6e5c44502",
                 "shasum": ""
             },
             "require": {
@@ -8550,7 +8557,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.38.0"
+                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.42.0"
             },
             "funding": [
                 {
@@ -8570,7 +8577,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-05-25T13:48:31+00:00"
+            "time": "2026-08-07T06:33:24+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",
@@ -9363,16 +9370,16 @@
         },
         {
             "name": "symfony/service-contracts",
-            "version": "v3.7.1",
+            "version": "v3.7.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "c0a284bab1ed8aa0417e3d69250ab437739563a0"
+                "reference": "15e6a07ec2a2c75ceb1b21dd98105ee8456d2257"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/c0a284bab1ed8aa0417e3d69250ab437739563a0",
-                "reference": "c0a284bab1ed8aa0417e3d69250ab437739563a0",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/15e6a07ec2a2c75ceb1b21dd98105ee8456d2257",
+                "reference": "15e6a07ec2a2c75ceb1b21dd98105ee8456d2257",
                 "shasum": ""
             },
             "require": {
@@ -9426,7 +9433,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/service-contracts/tree/v3.7.1"
+                "source": "https://github.com/symfony/service-contracts/tree/v3.7.3"
             },
             "funding": [
                 {
@@ -9446,7 +9453,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-06-16T09:55:08+00:00"
+            "time": "2026-07-27T15:39:01+00:00"
         },
         {
             "name": "symfony/string",
@@ -10249,23 +10256,23 @@
         },
         {
             "name": "vlucas/phpdotenv",
-            "version": "v5.6.4",
+            "version": "v5.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/vlucas/phpdotenv.git",
-                "reference": "416df702837983f8d5ff48c9c3fee4f5f57b980b"
+                "reference": "301c07936b16d88628b126b01d082ba153cf4c40"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/416df702837983f8d5ff48c9c3fee4f5f57b980b",
-                "reference": "416df702837983f8d5ff48c9c3fee4f5f57b980b",
+                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/301c07936b16d88628b126b01d082ba153cf4c40",
+                "reference": "301c07936b16d88628b126b01d082ba153cf4c40",
                 "shasum": ""
             },
             "require": {
                 "ext-pcre": "*",
-                "graham-campbell/result-type": "^1.1.4",
+                "graham-campbell/result-type": "^1.2",
                 "php": "^7.2.5 || ^8.0",
-                "phpoption/phpoption": "^1.9.5",
+                "phpoption/phpoption": "^1.10",
                 "symfony/polyfill-ctype": "^1.26",
                 "symfony/polyfill-mbstring": "^1.26",
                 "symfony/polyfill-php80": "^1.26"
@@ -10309,7 +10316,7 @@
                     "homepage": "https://github.com/vlucas"
                 }
             ],
-            "description": "Loads environment variables from `.env` to `getenv()`, `$_ENV` and `$_SERVER` automagically.",
+            "description": "Loads environment variables from `.env` to `$_ENV` and `$_SERVER` automagically, and optionally to `getenv()`.",
             "keywords": [
                 "dotenv",
                 "env",
@@ -10317,7 +10324,7 @@
             ],
             "support": {
                 "issues": "https://github.com/vlucas/phpdotenv/issues",
-                "source": "https://github.com/vlucas/phpdotenv/tree/v5.6.4"
+                "source": "https://github.com/vlucas/phpdotenv/tree/v5.7.0"
             },
             "funding": [
                 {
@@ -10329,7 +10336,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-07-06T19:11:50+00:00"
+            "time": "2026-08-24T18:07:49+00:00"
         },
         {
             "name": "voku/anti-xss",
@@ -10589,16 +10596,16 @@
         },
         {
             "name": "yajra/laravel-datatables-oracle",
-            "version": "v13.2.0",
+            "version": "v13.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/yajra/laravel-datatables.git",
-                "reference": "1a3d674cdc0ef6a226c76f5ff0c3b6d8f3af15cc"
+                "reference": "45fc543117f9cbbbdb47d47bada1e36cef3eed20"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/yajra/laravel-datatables/zipball/1a3d674cdc0ef6a226c76f5ff0c3b6d8f3af15cc",
-                "reference": "1a3d674cdc0ef6a226c76f5ff0c3b6d8f3af15cc",
+                "url": "https://api.github.com/repos/yajra/laravel-datatables/zipball/45fc543117f9cbbbdb47d47bada1e36cef3eed20",
+                "reference": "45fc543117f9cbbbdb47d47bada1e36cef3eed20",
                 "shasum": ""
             },
             "require": {
@@ -10666,7 +10673,7 @@
             ],
             "support": {
                 "issues": "https://github.com/yajra/laravel-datatables/issues",
-                "source": "https://github.com/yajra/laravel-datatables/tree/v13.2.0"
+                "source": "https://github.com/yajra/laravel-datatables/tree/v13.3.0"
             },
             "funding": [
                 {
@@ -10674,7 +10681,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2026-08-14T03:20:47+00:00"
+            "time": "2026-08-26T05:15:51+00:00"
         }
     ],
     "packages-dev": [
@@ -10901,16 +10908,16 @@
         },
         {
             "name": "amphp/dns",
-            "version": "v2.4.0",
+            "version": "v2.4.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/amphp/dns.git",
-                "reference": "78eb3db5fc69bf2fc0cb503c4fcba667bc223c71"
+                "reference": "ec5948bfafac808f410406e18bc7b52a2d4629b7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/amphp/dns/zipball/78eb3db5fc69bf2fc0cb503c4fcba667bc223c71",
-                "reference": "78eb3db5fc69bf2fc0cb503c4fcba667bc223c71",
+                "url": "https://api.github.com/repos/amphp/dns/zipball/ec5948bfafac808f410406e18bc7b52a2d4629b7",
+                "reference": "ec5948bfafac808f410406e18bc7b52a2d4629b7",
                 "shasum": ""
             },
             "require": {
@@ -10929,7 +10936,7 @@
                 "amphp/php-cs-fixer-config": "^2",
                 "amphp/phpunit-util": "^3",
                 "phpunit/phpunit": "^9",
-                "psalm/phar": "5.20"
+                "psalm/phar": "6.16.1"
             },
             "type": "library",
             "autoload": {
@@ -10978,7 +10985,7 @@
             ],
             "support": {
                 "issues": "https://github.com/amphp/dns/issues",
-                "source": "https://github.com/amphp/dns/tree/v2.4.0"
+                "source": "https://github.com/amphp/dns/tree/v2.4.1"
             },
             "funding": [
                 {
@@ -10986,7 +10993,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-01-19T15:43:40+00:00"
+            "time": "2026-07-26T17:53:54+00:00"
         },
         {
             "name": "amphp/hpack",
@@ -11586,16 +11593,16 @@
         },
         {
             "name": "amphp/socket",
-            "version": "v2.4.0",
+            "version": "v2.4.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/amphp/socket.git",
-                "reference": "dadb63c5d3179fd83803e29dfeac27350e619314"
+                "reference": "b347be5aff6b2cc025208bb4d896607eb470c018"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/amphp/socket/zipball/dadb63c5d3179fd83803e29dfeac27350e619314",
-                "reference": "dadb63c5d3179fd83803e29dfeac27350e619314",
+                "url": "https://api.github.com/repos/amphp/socket/zipball/b347be5aff6b2cc025208bb4d896607eb470c018",
+                "reference": "b347be5aff6b2cc025208bb4d896607eb470c018",
                 "shasum": ""
             },
             "require": {
@@ -11658,7 +11665,7 @@
             ],
             "support": {
                 "issues": "https://github.com/amphp/socket/issues",
-                "source": "https://github.com/amphp/socket/tree/v2.4.0"
+                "source": "https://github.com/amphp/socket/tree/v2.4.1"
             },
             "funding": [
                 {
@@ -11666,7 +11673,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2026-04-19T15:09:56+00:00"
+            "time": "2026-08-22T18:13:20+00:00"
         },
         {
             "name": "amphp/sync",
@@ -11910,16 +11917,16 @@
         },
         {
             "name": "barryvdh/laravel-debugbar",
-            "version": "v4.4.1",
+            "version": "v4.4.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/fruitcake/laravel-debugbar.git",
-                "reference": "389157fb616e5c5d19d16a88fd9bfcf3e3248e9b"
+                "reference": "caa08515a2eef6d8137653d3a1f3c3387cadf184"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/fruitcake/laravel-debugbar/zipball/389157fb616e5c5d19d16a88fd9bfcf3e3248e9b",
-                "reference": "389157fb616e5c5d19d16a88fd9bfcf3e3248e9b",
+                "url": "https://api.github.com/repos/fruitcake/laravel-debugbar/zipball/caa08515a2eef6d8137653d3a1f3c3387cadf184",
+                "reference": "caa08515a2eef6d8137653d3a1f3c3387cadf184",
                 "shasum": ""
             },
             "require": {
@@ -11994,7 +12001,7 @@
             ],
             "support": {
                 "issues": "https://github.com/fruitcake/laravel-debugbar/issues",
-                "source": "https://github.com/fruitcake/laravel-debugbar/tree/v4.4.1"
+                "source": "https://github.com/fruitcake/laravel-debugbar/tree/v4.4.3"
             },
             "funding": [
                 {
@@ -12006,7 +12013,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2026-08-03T06:23:16+00:00"
+            "time": "2026-09-01T13:46:43+00:00"
         },
         {
             "name": "brianium/paratest",
@@ -12377,19 +12384,20 @@
         },
         {
             "name": "justinrainbow/json-schema",
-            "version": "6.10.0",
+            "version": "6.12.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/jsonrainbow/json-schema.git",
-                "reference": "8b1308a9d7bdbdb20ce87ef920f82b4564bb2d33"
+                "reference": "8ef236a1a37df364b518b7411a4b5bb95b040d79"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/jsonrainbow/json-schema/zipball/8b1308a9d7bdbdb20ce87ef920f82b4564bb2d33",
-                "reference": "8b1308a9d7bdbdb20ce87ef920f82b4564bb2d33",
+                "url": "https://api.github.com/repos/jsonrainbow/json-schema/zipball/8ef236a1a37df364b518b7411a4b5bb95b040d79",
+                "reference": "8ef236a1a37df364b518b7411a4b5bb95b040d79",
                 "shasum": ""
             },
             "require": {
+                "ext-filter": "*",
                 "ext-json": "*",
                 "marc-mabe/php-enum": "^4.4",
                 "php": "^7.2 || ^8.0"
@@ -12422,20 +12430,9 @@
             ],
             "authors": [
                 {
-                    "name": "Bruno Prieto Reis",
-                    "email": "bruno.p.reis@gmail.com"
-                },
-                {
-                    "name": "Justin Rainbow",
-                    "email": "justin.rainbow@gmail.com"
-                },
-                {
-                    "name": "Igor Wiedler",
-                    "email": "igor@wiedler.ch"
-                },
-                {
-                    "name": "Robert Schönthal",
-                    "email": "seroscho@googlemail.com"
+                    "name": "Danny van der Sluijs",
+                    "email": "danny.vandersluijs@icloud.com",
+                    "role": "Maintainer"
                 }
             ],
             "description": "A library to validate a json schema.",
@@ -12446,9 +12443,9 @@
             ],
             "support": {
                 "issues": "https://github.com/jsonrainbow/json-schema/issues",
-                "source": "https://github.com/jsonrainbow/json-schema/tree/6.10.0"
+                "source": "https://github.com/jsonrainbow/json-schema/tree/6.12.0"
             },
-            "time": "2026-06-16T20:50:26+00:00"
+            "time": "2026-09-04T12:54:20+00:00"
         },
         {
             "name": "kelunik/certificate",
@@ -12510,16 +12507,16 @@
         },
         {
             "name": "laravel/pint",
-            "version": "v1.30.5",
+            "version": "v1.32.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/pint.git",
-                "reference": "fe4148c503a0e266353d61396b79bbf7f35122df"
+                "reference": "dea4e95f0f1722b8fec9eaabc8fdd676d71e8841"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/pint/zipball/fe4148c503a0e266353d61396b79bbf7f35122df",
-                "reference": "fe4148c503a0e266353d61396b79bbf7f35122df",
+                "url": "https://api.github.com/repos/laravel/pint/zipball/dea4e95f0f1722b8fec9eaabc8fdd676d71e8841",
+                "reference": "dea4e95f0f1722b8fec9eaabc8fdd676d71e8841",
                 "shasum": ""
             },
             "require": {
@@ -12531,13 +12528,13 @@
             },
             "require-dev": {
                 "composer/semver": "^3.4.4",
-                "friendsofphp/php-cs-fixer": "^3.95.18",
-                "illuminate/view": "^13.24.0",
-                "larastan/larastan": "^3.10.0",
+                "friendsofphp/php-cs-fixer": "^3.95.25",
+                "illuminate/view": "^13.31.0",
+                "larastan/larastan": "^3.11.0",
                 "laravel-zero/framework": "^13.0.0",
                 "laravel/agent-detector": "^2.0.2",
-                "laravel/prompts": "^0.3.22",
-                "mockery/mockery": "^1.6.12",
+                "laravel/prompts": "^0.3.24",
+                "mockery/mockery": "^1.6.15",
                 "nunomaduro/termwind": "^2.4.0",
                 "pestphp/pest": "^4.7.8"
             },
@@ -12576,7 +12573,7 @@
                 "issues": "https://github.com/laravel/pint/issues",
                 "source": "https://github.com/laravel/pint"
             },
-            "time": "2026-08-10T15:35:50+00:00"
+            "time": "2026-09-09T16:26:47+00:00"
         },
         {
             "name": "laravel/tinker",
@@ -12806,16 +12803,16 @@
         },
         {
             "name": "mockery/mockery",
-            "version": "1.6.13",
+            "version": "1.6.15",
             "source": {
                 "type": "git",
                 "url": "https://github.com/mockery/mockery.git",
-                "reference": "9cb54414cdcd2ec5ca292e7ba19dba3a3444885d"
+                "reference": "967a801bd188989a5669bd280f252d51c0fdc9ee"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/mockery/mockery/zipball/9cb54414cdcd2ec5ca292e7ba19dba3a3444885d",
-                "reference": "9cb54414cdcd2ec5ca292e7ba19dba3a3444885d",
+                "url": "https://api.github.com/repos/mockery/mockery/zipball/967a801bd188989a5669bd280f252d51c0fdc9ee",
+                "reference": "967a801bd188989a5669bd280f252d51c0fdc9ee",
                 "shasum": ""
             },
             "require": {
@@ -12884,7 +12881,7 @@
                 "security": "https://github.com/mockery/mockery/security/advisories",
                 "source": "https://github.com/mockery/mockery"
             },
-            "time": "2026-08-15T03:07:32+00:00"
+            "time": "2026-08-19T19:37:52+00:00"
         },
         {
             "name": "myclabs/deep-copy",
@@ -13958,16 +13955,16 @@
         },
         {
             "name": "phpstan/phpdoc-parser",
-            "version": "2.3.3",
+            "version": "2.3.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpdoc-parser.git",
-                "reference": "fb19eedd2bb67ff8cf7a5502ad329e701d6398a3"
+                "reference": "148cefffaf0233e4c08cc13db8a195a56dd6dfe9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/fb19eedd2bb67ff8cf7a5502ad329e701d6398a3",
-                "reference": "fb19eedd2bb67ff8cf7a5502ad329e701d6398a3",
+                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/148cefffaf0233e4c08cc13db8a195a56dd6dfe9",
+                "reference": "148cefffaf0233e4c08cc13db8a195a56dd6dfe9",
                 "shasum": ""
             },
             "require": {
@@ -13999,9 +13996,9 @@
             "description": "PHPDoc parser with support for nullable, intersection and generic types",
             "support": {
                 "issues": "https://github.com/phpstan/phpdoc-parser/issues",
-                "source": "https://github.com/phpstan/phpdoc-parser/tree/2.3.3"
+                "source": "https://github.com/phpstan/phpdoc-parser/tree/2.3.5"
             },
-            "time": "2026-07-08T07:01:06+00:00"
+            "time": "2026-08-31T16:05:28+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -14093,23 +14090,23 @@
         },
         {
             "name": "phpunit/php-file-iterator",
-            "version": "6.0.1",
+            "version": "6.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "3d1cd096ef6bea4bf2762ba586e35dbd317cbfd5"
+                "reference": "a248d1640ab059b075f53a2ef0f9856e864e06b5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/3d1cd096ef6bea4bf2762ba586e35dbd317cbfd5",
-                "reference": "3d1cd096ef6bea4bf2762ba586e35dbd317cbfd5",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/a248d1640ab059b075f53a2ef0f9856e864e06b5",
+                "reference": "a248d1640ab059b075f53a2ef0f9856e864e06b5",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^12.0"
+                "phpunit/phpunit": "^12.5.33"
             },
             "type": "library",
             "extra": {
@@ -14142,7 +14139,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
                 "security": "https://github.com/sebastianbergmann/php-file-iterator/security/policy",
-                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/6.0.1"
+                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/6.0.2"
             },
             "funding": [
                 {
@@ -14162,7 +14159,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-02-02T14:04:18+00:00"
+            "time": "2026-08-25T14:40:53+00:00"
         },
         {
             "name": "phpunit/php-invoker",
@@ -14810,24 +14807,24 @@
         },
         {
             "name": "sebastian/diff",
-            "version": "7.0.0",
+            "version": "7.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "7ab1ea946c012266ca32390913653d844ecd085f"
+                "reference": "cd4cabe39f8a4e8ee6818ba99f10a05561ea4ad6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/7ab1ea946c012266ca32390913653d844ecd085f",
-                "reference": "7ab1ea946c012266ca32390913653d844ecd085f",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/cd4cabe39f8a4e8ee6818ba99f10a05561ea4ad6",
+                "reference": "cd4cabe39f8a4e8ee6818ba99f10a05561ea4ad6",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^12.0",
-                "symfony/process": "^7.2"
+                "phpunit/phpunit": "^12.5.33",
+                "symfony/process": "^7.4.17"
             },
             "type": "library",
             "extra": {
@@ -14865,15 +14862,27 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/diff/issues",
                 "security": "https://github.com/sebastianbergmann/diff/security/policy",
-                "source": "https://github.com/sebastianbergmann/diff/tree/7.0.0"
+                "source": "https://github.com/sebastianbergmann/diff/tree/7.0.1"
             },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
                     "type": "github"
+                },
+                {
+                    "url": "https://liberapay.com/sebastianbergmann",
+                    "type": "liberapay"
+                },
+                {
+                    "url": "https://thanks.dev/u/gh/sebastianbergmann",
+                    "type": "thanks_dev"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/sebastian/diff",
+                    "type": "tidelift"
                 }
             ],
-            "time": "2025-02-07T04:55:46+00:00"
+            "time": "2026-08-25T15:35:54+00:00"
         },
         {
             "name": "sebastian/environment",
@@ -16113,15 +16122,15 @@
     ],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": [],
+    "stability-flags": {},
     "prefer-stable": true,
     "prefer-lowest": false,
     "platform": {
         "php": "^8.4"
     },
-    "platform-dev": [],
+    "platform-dev": {},
     "platform-overrides": {
         "php": "8.4"
     },
-    "plugin-api-version": "2.6.0"
+    "plugin-api-version": "2.9.0"
 }
diff --git a/config/app.php b/config/app.php
index ca2cf8a7c2..e637096bad 100644
--- a/config/app.php
+++ b/config/app.php
@@ -37,7 +37,7 @@
     |--------------------------------------------------------------------------
     */
 
-    'version' => 'v2609.0.0',
+    'version' => 'v2610.0.0',
 
     /*
     |--------------------------------------------------------------------------
diff --git a/database/migrations/2026_09_07_000001_add_mime_type_to_das_potensi_table.php b/database/migrations/2026_09_07_000001_add_mime_type_to_das_potensi_table.php
new file mode 100644
index 0000000000..b94dc4c0fc
--- /dev/null
+++ b/database/migrations/2026_09_07_000001_add_mime_type_to_das_potensi_table.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('das_potensi', function (Blueprint $table) {
+            if (!Schema::hasColumn('das_potensi', 'mime_type')) {
+                $table->string('mime_type', 50)->nullable()->after('file_gambar');
+            }
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('das_potensi', function (Blueprint $table) {
+            if (Schema::hasColumn('das_potensi', 'mime_type')) {
+                $table->dropColumn('mime_type');
+            }
+        });
+    }
+};
diff --git a/database/migrations/2026_09_07_000001_add_penduduk_id_gabungan_to_suplemen_terdata_table.php b/database/migrations/2026_09_07_000001_add_penduduk_id_gabungan_to_suplemen_terdata_table.php
new file mode 100644
index 0000000000..e3317c02a7
--- /dev/null
+++ b/database/migrations/2026_09_07_000001_add_penduduk_id_gabungan_to_suplemen_terdata_table.php
@@ -0,0 +1,59 @@
+<?php
+
+/*
+ * File ini bagian dari:
+ *
+ * OpenDK
+ *
+ * Aplikasi dan source code ini dirilis berdasarkan lisensi GPL V3
+ *
+ * Hak Cipta 2017 - 2026 Perkumpulan Desa Digital Terbuka (https://opendesa.id)
+ *
+ * Dengan ini diberikan izin, secara gratis, kepada siapa pun yang mendapatkan salinan
+ * dari perangkat lunak ini dan file dokumentasi terkait ("Aplikasi Ini"), untuk diperlakukan
+ * tanpa batasan, termasuk hak untuk menggunakan, menyalin, mengubah dan/atau mendistribusikan,
+ * asal tunduk pada syarat berikut:
+ *
+ * Pemberitahuan hak cipta di atas dan pemberitahuan izin ini harus disertakan dalam
+ * setiap salinan atau bagian penting Aplikasi Ini. Barang siapa yang menghapus atau menghilangkan
+ * pemberitahuan ini melanggar ketentuan lisensi Aplikasi Ini.
+ *
+ * PERANGKAT LUNAK INI DISEDIAKAN "SEBAGAIMANA ADANYA", TANPA JAMINAN APA PUN, BAIK TERSURAT MAUPUN
+ * TERSIRAT. PENULIS ATAU PEMEGANG HAK CIPTA SAMA SEKALI TIDAK BERTANGGUNG JAWAB ATAS KLAIM, KERUSAKAN ATAU
+ * KEWAJIBAN APAPUN ATAS PENGGUNAAN ATAU LAINNYA TERKAIT APLIKASI INI.
+ *
+ * @package    OpenDK
+ * @author     Tim Pengembang OpenDesa
+ * @copyright  Hak Cipta 2017 - 2026 Perkumpulan Desa Digital Terbuka (https://opendesa.id)
+ * @license    http://www.gnu.org/licenses/gpl.html    GPL V3
+ * @link       https://github.com/OpenSID/opendk
+ */
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddPendudukIdGabunganToSuplemenTerdataTable extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up()
+    {
+        Schema::table('das_suplemen_terdata', function (Blueprint $table) {
+            $table->unsignedBigInteger('penduduk_id_gabungan')->nullable()->after('penduduk_id');
+            $table->unsignedInteger('penduduk_id')->nullable()->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down()
+    {
+        Schema::table('das_suplemen_terdata', function (Blueprint $table) {
+            $table->dropColumn('penduduk_id_gabungan');
+            $table->unsignedInteger('penduduk_id')->nullable(false)->change();
+        });
+    }
+}
diff --git a/database/migrations/2026_09_07_000002_add_desa_id_to_suplemen_terdata_table.php b/database/migrations/2026_09_07_000002_add_desa_id_to_suplemen_terdata_table.php
new file mode 100644
index 0000000000..6790d9b0ea
--- /dev/null
+++ b/database/migrations/2026_09_07_000002_add_desa_id_to_suplemen_terdata_table.php
@@ -0,0 +1,60 @@
+<?php
+
+/*
+ * File ini bagian dari:
+ *
+ * OpenDK
+ *
+ * Aplikasi dan source code ini dirilis berdasarkan lisensi GPL V3
+ *
+ * Hak Cipta 2017 - 2026 Perkumpulan Desa Digital Terbuka (https://opendesa.id)
+ *
+ * Dengan ini diberikan izin, secara gratis, kepada siapa pun yang mendapatkan salinan
+ * dari perangkat lunak ini dan file dokumentasi terkait ("Aplikasi Ini"), untuk diperlakukan
+ * tanpa batasan, termasuk hak untuk menggunakan, menyalin, mengubah dan/atau mendistribusikan,
+ * asal tunduk pada syarat berikut:
+ *
+ * Pemberitahuan hak cipta di atas dan pemberitahuan izin ini harus disertakan dalam
+ * setiap salinan atau bagian penting Aplikasi Ini. Barang siapa yang menghapus atau menghilangkan
+ * pemberitahuan ini melanggar ketentuan lisensi Aplikasi Ini.
+ *
+ * PERANGKAT LUNAK INI DISEDIAKAN "SEBAGAIMANA ADANYA", TANPA JAMINAN APA PUN, BAIK TERSURAT MAUPUN
+ * TERSIRAT. PENULIS ATAU PEMEGANG HAK CIPTA SAMA SEKALI TIDAK BERTANGGUNG JAWAB ATAS KLAIM, KERUSAKAN ATAU
+ * KEWAJIBAN APAPUN ATAS PENGGUNAAN ATAU LAINNYA TERKAIT APLIKASI INI.
+ *
+ * @package    OpenDK
+ * @author     Tim Pengembang OpenDesa
+ * @copyright  Hak Cipta 2017 - 2026 Perkumpulan Desa Digital Terbuka (https://opendesa.id)
+ * @license    http://www.gnu.org/licenses/gpl.html    GPL V3
+ * @link       https://github.com/OpenSID/opendk
+ */
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+
+class AddDesaIdToSuplemenTerdataTable extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up()
+    {
+        Schema::table('das_suplemen_terdata', function (Blueprint $table) {
+            $table->string('desa_id', 13)->nullable()->after('suplemen_id');
+        });
+
+        DB::statement('UPDATE das_suplemen_terdata st JOIN das_penduduk p ON p.id = st.penduduk_id SET st.desa_id = p.desa_id WHERE st.desa_id IS NULL');
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down()
+    {
+        Schema::table('das_suplemen_terdata', function (Blueprint $table) {
+            $table->dropColumn('desa_id');
+        });
+    }
+}
diff --git a/database/migrations/2026_09_08_055444_add_penduduk_id_gabungan_to_lembaga_tables.php b/database/migrations/2026_09_08_055444_add_penduduk_id_gabungan_to_lembaga_tables.php
new file mode 100644
index 0000000000..fa3e4c9d3a
--- /dev/null
+++ b/database/migrations/2026_09_08_055444_add_penduduk_id_gabungan_to_lembaga_tables.php
@@ -0,0 +1,40 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('das_lembaga', function (Blueprint $table) {
+            $table->unsignedInteger('penduduk_id_gabungan')->nullable()->after('penduduk_id');
+        });
+
+        Schema::table('das_lembaga_anggota', function (Blueprint $table) {
+            $table->unsignedInteger('penduduk_id_gabungan')->nullable()->after('penduduk_id');
+            $table->dropForeign(['penduduk_id']);
+            $table->unsignedInteger('penduduk_id')->nullable()->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('das_lembaga', function (Blueprint $table) {
+            $table->dropColumn('penduduk_id_gabungan');
+        });
+
+        Schema::table('das_lembaga_anggota', function (Blueprint $table) {
+            $table->unsignedInteger('penduduk_id')->nullable(false)->change();
+            $table->foreign('penduduk_id')->references('id')->on('das_penduduk')->onDelete('cascade');
+            $table->dropColumn('penduduk_id_gabungan');
+        });
+    }
+};
diff --git a/database/migrations/2026_09_28_000001_add_media_type_to_galeris_table.php b/database/migrations/2026_09_28_000001_add_media_type_to_galeris_table.php
new file mode 100644
index 0000000000..fac7f624b2
--- /dev/null
+++ b/database/migrations/2026_09_28_000001_add_media_type_to_galeris_table.php
@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * Menambahkan kolom penanda tipe media (foto/video/youtube/unknown) untuk
+     * galeri berbasis link, karena link Google Drive tidak memiliki ekstensi
+     * sehingga jenis media tidak bisa ditentukan hanya dari URL.
+     */
+    public function up(): void
+    {
+        Schema::table('galeris', function (Blueprint $table) {
+            if (! Schema::hasColumn('galeris', 'media_type')) {
+                $table->string('media_type', 20)->nullable()->after('jenis')->comment('image|video|youtube|unknown untuk media berbasis link');
+            }
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('galeris', function (Blueprint $table) {
+            if (Schema::hasColumn('galeris', 'media_type')) {
+                $table->dropColumn('media_type');
+            }
+        });
+    }
+};
diff --git a/database/migrations/2026_09_30_080000_fix_potensi_nav_menu.php b/database/migrations/2026_09_30_080000_fix_potensi_nav_menu.php
new file mode 100644
index 0000000000..271da7b608
--- /dev/null
+++ b/database/migrations/2026_09_30_080000_fix_potensi_nav_menu.php
@@ -0,0 +1,40 @@
+<?php
+
+use App\Models\NavMenu;
+use App\Services\CacheService;
+use Illuminate\Database\Migrations\Migration;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        NavMenu::where('name', 'Potensi')
+            ->where('url', '#')
+            ->update([
+                'url' => '/potensi',
+                'target' => '_self',
+                'type' => 'modul',
+            ]);
+
+        try {
+            app(CacheService::class)->removeCachePrefix(config('theme-api.website.cache_prefix', 'website:api'));
+        } catch (\Throwable $e) {
+            // Abaikan jika cache service belum siap
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        // Tidak perlu direverse karena perbaikan data
+    }
+};
diff --git a/database/seeders/DasNavigationTableSeeder.php b/database/seeders/DasNavigationTableSeeder.php
index faffe95350..e31e22e5d4 100644
--- a/database/seeders/DasNavigationTableSeeder.php
+++ b/database/seeders/DasNavigationTableSeeder.php
@@ -77,8 +77,8 @@ public function run()
             [
                 'name' => 'Potensi',
                 'slug' => Str::slug('Potensi'),
-                'type' => MenuTipe::EKSTERNAL,
-                'url' => '#',
+                'type' => MenuTipe::POTENSI,
+                'url' => 'potensi',
                 'order' => 4,
                 'status' => 1,
             ],
diff --git a/helpers/general_helper.php b/helpers/general_helper.php
index 8d6fc0f01d..badfabeb92 100644
--- a/helpers/general_helper.php
+++ b/helpers/general_helper.php
@@ -42,7 +42,7 @@
 use voku\helper\AntiXSS;
 use willvincent\Feeds\Facades\FeedsFacade;
 
-/**
+/*
  * Parsing url image dari rss feed description
  *
  * @param  string  $content
@@ -60,9 +60,10 @@ function get_tag_image(string $content)
 }
 
 /**
- * { function_description }
+ * { function_description }.
  *
  * @param      <type>  $parent_id  The parent identifier
+ *
  * @return <type>  ( description_of_the_return_value )
  */
 function define_child($parent_id)
@@ -73,10 +74,11 @@ function define_child($parent_id)
 }
 
 /**
- * { function_description }
+ * { function_description }.
  *
  * @param      <type>  $id          The identifier
  * @param      <type>  $permission  The permission
+ *
  * @return <type>  ( description_of_the_return_value )
  */
 function permission_val($id, $permission)
@@ -98,9 +100,10 @@ function permission_name($name)
 }
 
 /**
- * Generate Password
+ * Generate Password.
  *
  * @param  int  $length  Length Character
+ *
  * @return string voucher
  */
 function generate_password($length = 6)
@@ -122,7 +125,7 @@ function generate_password($length = 6)
 }
 
 /**
- * Respon Meta
+ * Respon Meta.
  *
  * @param      <type>  $message  The message
  */
@@ -311,7 +314,9 @@ function is_wajib_ktp($umur, $status_kawin)
 
 function isThumbnail($url = null, $img = '/img/no-image.png')
 {
-    return ! empty($url) && Storage::disk('public')->exists($url) ? Storage::disk('public')->url($url) : asset($img);
+    $url = trim($url ?? '');
+
+    return ! empty($url) && Storage::disk('public')->exists($url) ? asset('storage/' . ltrim($url, '/')) : asset($img);
 }
 
 function is_img($url = null, $img = '/img/no-image.png')
@@ -389,7 +394,7 @@ function terbilang($angka)
 
 if (! function_exists('sudahInstal')) {
     /**
-     * Cek apakah sudah install OpenDK atau belum
+     * Cek apakah sudah install OpenDK atau belum.
      *
      * @return bool True jika sudah install, False jika belum install
      */
@@ -405,7 +410,7 @@ function sudahInstal(): bool
 
 if (! function_exists('isActive')) {
     /**
-     * Helper function untuk installer views - cek apakah route aktif
+     * Helper function untuk installer views - cek apakah route aktif.
      *
      * @param  string  $routeName
      */
@@ -429,7 +434,7 @@ function isActive($routeName): string
     }
 }
 
-/**
+/*
  * Cek akses website.
  *
  * @param  string  $url
@@ -488,7 +493,7 @@ function parsedown($params = null)
 
 if (! function_exists('theme_new')) {
     /**
-     * Ambil model tema
+     * Ambil model tema.
      *
      * @return Theme
      */
@@ -753,3 +758,32 @@ function kembalikanSlug($str): ?string
     // Ganti '-' dengan spasi dan hilangkan titik '.'
     return str_replace(['-', '.'], [' ', ''], $str);
 }
+
+if (! function_exists('list_desa')) {
+    function list_desa(bool $all = false)
+    {
+        return (new \App\Services\DesaService)->listDesa($all)->pluck('nama', 'desa_id');
+    }
+}
+
+if (! function_exists('nama_desa')) {
+    function nama_desa(string $desaId): ?string
+    {
+        return list_desa()[$desaId] ?? null;
+    }
+}
+
+if (! function_exists('is_pdf')) {
+    function is_pdf($path = null, $mime = null): bool
+    {
+        if ($mime && str_contains(strtolower($mime), 'pdf')) {
+            return true;
+        }
+
+        if ($path && str_ends_with(strtolower($path), '.pdf')) {
+            return true;
+        }
+
+        return false;
+    }
+}
diff --git a/package-lock.json b/package-lock.json
index 7cd4482547..a447172d10 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -450,11 +450,10 @@
             }
         },
         "node_modules/brace-expansion": {
-            "version": "5.0.9",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.9.tgz",
-            "integrity": "sha512-ScQ4IuvIEF1TMlP7Zt+vjJ//9zlPb2SDcxWxM3bk8s6t6GGdJ7KO1dCcTidOPJKePW30LE/2cT7wCyPho9/Wxg==",
+            "version": "5.0.12",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.12.tgz",
+            "integrity": "sha512-YovQ3rzhaLMIrDjNDMkNS01tea93qhEhG5xy8f6+R0l+dw3Ki+5sCoIoI942iuLZTHWogWktgwVDhU09iNEimQ==",
             "dev": true,
-            "license": "MIT",
             "dependencies": {
                 "balanced-match": "^4.0.2"
             },
@@ -717,11 +716,10 @@
             "license": "MIT"
         },
         "node_modules/editorconfig/node_modules/brace-expansion": {
-            "version": "2.1.4",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.4.tgz",
-            "integrity": "sha512-hGfVzPxthbf3+2yjg/RBs60cB0FhqBS/zvdV/4wn4/BmN0bNMMHPc4V/BbFieqf1TKAGGAHnY4eSjajCl0f2Xg==",
+            "version": "2.1.7",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.7.tgz",
+            "integrity": "sha512-uZbew1NqdmPDTMJ8ah1y+b+9QEJrfkXFk3RcTQw3X0jW/xRUvFKsg1CfQdSYGdTbXZWExtU3J3ccxtnfw1Fi0g==",
             "dev": true,
-            "license": "MIT",
             "dependencies": {
                 "balanced-match": "^1.0.0"
             }
@@ -807,9 +805,9 @@
             }
         },
         "node_modules/fast-uri": {
-            "version": "3.1.5",
-            "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.5.tgz",
-            "integrity": "sha512-gHwA1O9LDIcKunMKhObS/HimwtehO1nPUECKAu5TpKgaO19fcWEl4bliWe1jWxVFvIXztJjjQ4L8XQ1EU9f7Jw==",
+            "version": "3.1.8",
+            "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.8.tgz",
+            "integrity": "sha512-GZMtZUTNRpOVIECoXwLNZS5xUGE+mVNbTB8h/7Rwh2TFWcBQiPzTgyZi05BF9UMZKkLJv8XBRJTlU7zg8+ZfMg==",
             "dev": true,
             "funding": [
                 {
@@ -820,8 +818,7 @@
                     "type": "opencollective",
                     "url": "https://opencollective.com/fastify"
                 }
-            ],
-            "license": "BSD-3-Clause"
+            ]
         },
         "node_modules/fastq": {
             "version": "1.20.1",
@@ -1134,11 +1131,10 @@
             "license": "MIT"
         },
         "node_modules/js-beautify/node_modules/brace-expansion": {
-            "version": "2.1.4",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.4.tgz",
-            "integrity": "sha512-hGfVzPxthbf3+2yjg/RBs60cB0FhqBS/zvdV/4wn4/BmN0bNMMHPc4V/BbFieqf1TKAGGAHnY4eSjajCl0f2Xg==",
+            "version": "2.1.7",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.7.tgz",
+            "integrity": "sha512-uZbew1NqdmPDTMJ8ah1y+b+9QEJrfkXFk3RcTQw3X0jW/xRUvFKsg1CfQdSYGdTbXZWExtU3J3ccxtnfw1Fi0g==",
             "dev": true,
-            "license": "MIT",
             "dependencies": {
                 "balanced-match": "^1.0.0"
             }
@@ -1630,11 +1626,10 @@
             }
         },
         "node_modules/postcss-selector-parser": {
-            "version": "6.1.2",
-            "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
-            "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+            "version": "6.1.4",
+            "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.4.tgz",
+            "integrity": "sha512-bIoJLOmjCO1S9XdY/DcnR5hJxvrDir1PbGChrzXG3vw0/FOliy/fA3dmdhQ441kah4gKv+TwckGzex6wNS5cnQ==",
             "dev": true,
-            "license": "MIT",
             "dependencies": {
                 "cssesc": "^3.0.0",
                 "util-deprecate": "^1.0.2"
diff --git a/public/css/admin-style.css b/public/css/admin-style.css
index 187c0bdd15..82fdfae93f 100644
--- a/public/css/admin-style.css
+++ b/public/css/admin-style.css
@@ -92,12 +92,18 @@ body.sidebar-collapse .sidebar-kabupaten {
 
 /* Prevent dropdown clipping inside DataTable responsive wrapper */
 .box-body .table-responsive {
-	overflow: visible !important;
+	overflow-x: auto;
 }
 .box-body .table-responsive .dropdown-menu {
 	z-index: 1050;
 }
 
+/* Ensure nowrap tables do not wrap cells and preserve header spacing */
+.table.nowrap th,
+.table.nowrap td {
+	white-space: nowrap;
+}
+
 /* Simple centered modal for activity detail */
 .modal-overlay {
 	position: fixed;
diff --git a/public/js/admin.js b/public/js/admin.js
index 445a5c445a..1e2cb30252 100644
--- a/public/js/admin.js
+++ b/public/js/admin.js
@@ -5,6 +5,61 @@ $(function() {
             'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
         }
     });
+
+    // Fix dropdown clipping inside scrollable DataTables and responsive tables
+    $(document).on('shown.bs.dropdown', '.table-responsive, .dataTables_scrollBody', function(e) {
+        var $dropdown = $(e.target);
+        var $menu = $dropdown.find('.dropdown-menu');
+        if (!$menu.length) return;
+
+        $('body').append($menu.detach());
+
+        function updateDropdownPosition() {
+            if (!$dropdown.is(':visible') || !$dropdown.hasClass('open')) {
+                $dropdown.trigger('hide.bs.dropdown');
+                return;
+            }
+            var offset = $dropdown.offset();
+            var menuWidth = $menu.outerWidth();
+            var left = offset.left;
+
+            if (left + menuWidth > $(window).width()) {
+                left = offset.left + $dropdown.outerWidth() - menuWidth;
+            }
+
+            $menu.css({
+                display: 'block',
+                position: 'absolute',
+                top: (offset.top + $dropdown.outerHeight()) + 'px',
+                left: left + 'px',
+                zIndex: 1060
+            });
+        }
+
+        updateDropdownPosition();
+        $dropdown.data('detached-dropdown-menu', $menu);
+
+        $(window).on('scroll.dropdown_fix resize.dropdown_fix', updateDropdownPosition);
+        $('.dataTables_scrollBody, .table-responsive').on('scroll.dropdown_fix', updateDropdownPosition);
+    });
+
+    $(document).on('hide.bs.dropdown', '.table-responsive, .dataTables_scrollBody', function(e) {
+        var $dropdown = $(e.target);
+        var $menu = $dropdown.data('detached-dropdown-menu');
+        if ($menu && $menu.length) {
+            $dropdown.append($menu.detach());
+            $menu.css({
+                display: '',
+                position: '',
+                top: '',
+                left: '',
+                zIndex: ''
+            });
+            $dropdown.removeData('detached-dropdown-menu');
+        }
+        $(window).off('.dropdown_fix');
+        $('.dataTables_scrollBody, .table-responsive').off('.dropdown_fix');
+    });
 });
 
 function errorValidation(response) {
diff --git a/public/js/custom.js b/public/js/custom.js
index 69fe222324..b8e3af1af5 100644
--- a/public/js/custom.js
+++ b/public/js/custom.js
@@ -121,6 +121,81 @@ function generateDropdownYear(element) {
   }  
 }
 
+/**
+ * Render media galeri (foto, video, atau YouTube) menjadi HTML.
+ *
+ * Data galeri berasal dari API frontend dan sudah membawa:
+ * - media_type     : "image" | "video" | "youtube" | "unknown"
+ * - media_url      : URL yang bisa dimuat langsung (src)
+ * - media_embed_url: URL untuk <iframe> bila <video> tidak mendukung
+ * - gambar_path    : thumbnail/pratinjau
+ *
+ * Opsi:
+ * - className  : kelas CSS untuk elemen pembungkus
+ * - imageStyle : gaya inline untuk elemen <img>
+ * - controls   : tampilkan kontrol pemutar video (default true)
+ * - autoplay   : mulai putar otomatis (default false)
+ * - preferNativeVideo : pakai <video> walau tersedia embed
+ */
+function renderGaleriMedia(galeri, options) {
+  var opts = options || {};
+  var type = galeri && galeri.media_type ? galeri.media_type : "unknown";
+  var url = galeri ? galeri.media_url : null;
+  var embed = galeri ? galeri.media_embed_url : null;
+  var poster = (galeri && galeri.gambar_path) || "/img/no-image.png";
+  var label = galeri ? galeri.judul || "Media" : "Media";
+  var wrapperClass = opts.className ? " " + opts.className : "";
+  var imageStyle = opts.imageStyle || "width:100%;height:100%;object-fit:cover;";
+  var allowFullscreen =
+    ' allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen referrerpolicy="strict-origin-when-cross-origin"';
+
+  function escapeAttr(value) {
+    return String(value)
+      .replace(/&/g, "&amp;")
+      .replace(/"/g, "&quot;")
+      .replace(/</g, "&lt;")
+      .replace(/>/g, "&gt;");
+  }
+
+  var html = "";
+
+  if (type === "youtube" && embed) {
+    // YouTube hanya mengizinkan pemutaran lewat iframe.
+    html =
+      '<div class="embed-responsive embed-responsive-16by9' + wrapperClass + '">' +
+      '<iframe class="embed-responsive-item" src="' + escapeAttr(embed) + '" title="' + escapeAttr(label) + '"' + allowFullscreen + "></iframe>" +
+      "</div>";
+  } else if (type === "video" && embed && !opts.preferNativeVideo) {
+    // Google Drive dan Vimeo tidak mendukung Range Request, jadi pakai preview resmi.
+    html =
+      '<div class="embed-responsive embed-responsive-16by9' + wrapperClass + '">' +
+      '<iframe class="embed-responsive-item" src="' + escapeAttr(embed) + '" title="' + escapeAttr(label) + '"' + allowFullscreen + "></iframe>" +
+      "</div>";
+  } else if (type === "video" && url) {
+    html =
+      '<video src="' + escapeAttr(url) + '"' + (opts.controls === false ? "" : " controls") + ' preload="metadata"' + (opts.autoplay ? " autoplay" : "") + ' playsinline style="width:100%;height:100%;object-fit:contain;background:#000;"' + wrapperClass + "></video>";
+  } else if (type === "image" && url) {
+    html =
+      '<img src="' + escapeAttr(url) + '" alt="' + escapeAttr(label) + '" loading="lazy" style="' + imageStyle + '"' + wrapperClass +
+      ' onerror="this.onerror=null;this.src=\'/img/no-image.png\';">';
+  } else {
+    html =
+      '<div class="' + (opts.className || "") + '">' +
+      '<img src="' + escapeAttr(poster) + '" alt="' + escapeAttr(label) + '" loading="lazy" style="' + imageStyle + '">' +
+      "</div>";
+  }
+
+  return html;
+}
+
+/**
+ * Tandai galeri yang berupa video/YouTube agar tema bisa menampilkan ikon putar.
+ */
+function isGaleriPlayable(galeri) {
+  var type = galeri && galeri.media_type ? galeri.media_type : "unknown";
+  return type === "video" || type === "youtube";
+}
+
 //drop down menu
 $(".drop-down").hover(function () {
   $(".dropdown-menu").addClass("display-on");
diff --git a/resources/views/backend/event/form_create.blade.php b/resources/views/backend/event/form_create.blade.php
index a6656889ca..e72efaa426 100644
--- a/resources/views/backend/event/form_create.blade.php
+++ b/resources/views/backend/event/form_create.blade.php
@@ -40,32 +40,41 @@
     <script type="application/javascript">
     var fileTypes = ['jpg', 'jpeg', 'png', 'bmp', 'gif', 'pdf', 'doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx', 'svg'];
     var imageTypes = ['jpg', 'jpeg', 'png', 'bmp', 'gif', 'svg'];
+    var currentAttachmentBlobUrl = null;
 
     function readAttachmentURL(input) {
         if (input.files && input.files[0]) {
-            var extension = input.files[0].name.split('.').pop().toLowerCase();
+            var file = input.files[0];
+            var extension = file.name.split('.').pop().toLowerCase();
             var isSuccess = fileTypes.indexOf(extension) > -1;
 
             if (isSuccess) {
-                var reader = new FileReader();
-                reader.onload = function(e) {
-                    if (imageTypes.indexOf(extension) > -1) {
-                        $('#showgambar-attachment').attr('src', e.target.result);
-                        $('#showgambar-attachment').removeClass('hide');
-                        $('#showpdf-attachment').addClass('hide');
-                    } else if (extension === 'pdf') {
-                        $('#showpdf-attachment').attr('src', e.target.result + '#toolbar=1');
-                        $('#showpdf-attachment').removeClass('hide');
-                        $('#showgambar-attachment').addClass('hide');
-                    } else {
-                        $('#showgambar-attachment').addClass('hide');
-                        $('#showpdf-attachment').addClass('hide');
-                    }
-                };
-                reader.readAsDataURL(input.files[0]);
+                if (currentAttachmentBlobUrl) {
+                    URL.revokeObjectURL(currentAttachmentBlobUrl);
+                    currentAttachmentBlobUrl = null;
+                }
+
+                currentAttachmentBlobUrl = URL.createObjectURL(file);
+
+                if (imageTypes.indexOf(extension) > -1) {
+                    $('#showgambar-attachment').attr('src', currentAttachmentBlobUrl).removeClass('hide');
+                    $('#showpdf-attachment').addClass('hide').attr('src', '');
+                } else if (extension === 'pdf') {
+                    $('#showpdf-attachment').attr('src', currentAttachmentBlobUrl + '#toolbar=1').removeClass('hide');
+                    $('#showgambar-attachment').addClass('hide').attr('src', '');
+                } else {
+                    $('#showgambar-attachment').addClass('hide').attr('src', '');
+                    $('#showpdf-attachment').addClass('hide').attr('src', '');
+                }
             } else {
                 $('#attachment').val('');
-                alert('File tersebut tidak diperbolehkan.');
+                if (currentAttachmentBlobUrl) {
+                    URL.revokeObjectURL(currentAttachmentBlobUrl);
+                    currentAttachmentBlobUrl = null;
+                }
+                $('#showgambar-attachment').addClass('hide').attr('src', '');
+                $('#showpdf-attachment').addClass('hide').attr('src', '');
+                openAlert('File tersebut tidak diperbolehkan.', 'Peringatan', 'warning');
             }
         }
     }
diff --git a/resources/views/backend/event/form_edit.blade.php b/resources/views/backend/event/form_edit.blade.php
index 37d2061b25..a236e74456 100644
--- a/resources/views/backend/event/form_edit.blade.php
+++ b/resources/views/backend/event/form_edit.blade.php
@@ -15,7 +15,7 @@
     <div class="col-md-6 col-sm-8 col-xs-12">
         {!! html()->textarea('description', old('description', $event->description))->class('textarea my-editor')->placeholder('Deskripsi kegiatan')->style(
                 'width: 100%; height: 200px; font-size: 14px; line-height: 18px; border: 1px solid #dddddd; padding:
-                                                                                                10px;',
+                                                                                                                                                10px;',
             )->required() !!}
     </div>
 </div>
@@ -84,32 +84,41 @@
     <script type="application/javascript">
         var fileTypes = ['jpg', 'jpeg', 'png', 'bmp', 'gif', 'pdf', 'doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx', 'svg'];
         var imageTypes = ['jpg', 'jpeg', 'png', 'bmp', 'gif', 'svg'];
+        var currentAttachmentBlobUrl = null;
 
         function readAttachmentURL(input) {
             if (input.files && input.files[0]) {
-                var extension = input.files[0].name.split('.').pop().toLowerCase();
+                var file = input.files[0];
+                var extension = file.name.split('.').pop().toLowerCase();
                 var isSuccess = fileTypes.indexOf(extension) > -1;
 
                 if (isSuccess) {
-                    var reader = new FileReader();
-                    reader.onload = function(e) {
-                        if (imageTypes.indexOf(extension) > -1) {
-                            $('#showgambar-attachment').attr('src', e.target.result);
-                            $('#showgambar-attachment').removeClass('hide');
-                            $('#showpdf-attachment').addClass('hide');
-                        } else if (extension === 'pdf') {
-                            $('#showpdf-attachment').attr('src', e.target.result + '#toolbar=1');
-                            $('#showpdf-attachment').removeClass('hide');
-                            $('#showgambar-attachment').addClass('hide');
-                        } else {
-                            $('#showgambar-attachment').addClass('hide');
-                            $('#showpdf-attachment').addClass('hide');
-                        }
-                    };
-                    reader.readAsDataURL(input.files[0]);
+                    if (currentAttachmentBlobUrl) {
+                        URL.revokeObjectURL(currentAttachmentBlobUrl);
+                        currentAttachmentBlobUrl = null;
+                    }
+
+                    currentAttachmentBlobUrl = URL.createObjectURL(file);
+
+                    if (imageTypes.indexOf(extension) > -1) {
+                        $('#showgambar-attachment').attr('src', currentAttachmentBlobUrl).removeClass('hide');
+                        $('#showpdf-attachment').addClass('hide').attr('src', '');
+                    } else if (extension === 'pdf') {
+                        $('#showpdf-attachment').attr('src', currentAttachmentBlobUrl + '#toolbar=1').removeClass('hide');
+                        $('#showgambar-attachment').addClass('hide').attr('src', '');
+                    } else {
+                        $('#showgambar-attachment').addClass('hide').attr('src', '');
+                        $('#showpdf-attachment').addClass('hide').attr('src', '');
+                    }
                 } else {
                     $("#attachment").val('');
-                    alert('File tersebut tidak diperbolehkan.');
+                    if (currentAttachmentBlobUrl) {
+                        URL.revokeObjectURL(currentAttachmentBlobUrl);
+                        currentAttachmentBlobUrl = null;
+                    }
+                    $('#showgambar-attachment').addClass('hide').attr('src', '');
+                    $('#showpdf-attachment').addClass('hide').attr('src', '');
+                    openAlert('File tersebut tidak diperbolehkan.', 'Peringatan', 'warning');
                 }
             }
         }
diff --git a/resources/views/components/galeri-media.blade.php b/resources/views/components/galeri-media.blade.php
new file mode 100644
index 0000000000..57e426daeb
--- /dev/null
+++ b/resources/views/components/galeri-media.blade.php
@@ -0,0 +1,42 @@
+@props(['galeri', 'variant' => 'thumb'])
+
+@use(App\Enums\TipeMedia)
+
+@php
+    $type = $galeri->media_type;
+    $url = $galeri->media_url;
+    $embed = $galeri->media_embed_url;
+    $poster = $galeri->gambar_path ?: asset('/img/no-image.png');
+    $isFull = $variant === 'full';
+    $isYoutube = $type === TipeMedia::Youtube;
+    $isVideo = in_array($type, [TipeMedia::Video, TipeMedia::Youtube], true);
+@endphp
+
+<div class="galeri-media" data-media-type="{{ $type }}">
+    @if ($isFull && $isYoutube && $embed)
+        {{-- Embed YouTube memakai iframe karena YouTube tidak mengizinkan pemutaran langsung. --}}
+        <div class="embed-responsive embed-responsive-16by9">
+            <iframe class="embed-responsive-item" src="{{ $embed }}" title="{{ $galeri->judul }}" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen referrerpolicy="strict-origin-when-cross-origin"></iframe>
+        </div>
+    @elseif ($isFull && $type === TipeMedia::Video && $embed)
+        {{-- Google Drive/Vimeo tidak mendukung Range Request, jadi pakai preview resmi. --}}
+        <div class="embed-responsive embed-responsive-16by9">
+            <iframe class="embed-responsive-item" src="{{ $embed }}" title="{{ $galeri->judul }}" allow="autoplay" allowfullscreen referrerpolicy="strict-origin-when-cross-origin"></iframe>
+        </div>
+    @elseif ($isFull && $type === TipeMedia::Video && $url)
+        <video src="{{ $url }}" controls preload="metadata" style="width:100%;max-height:70vh;background:#000;border-radius:4px;">
+            Browser Anda tidak mendukung pemutaran video. <a href="{{ $url }}">Unduh video</a>.
+        </video>
+    @elseif ($type === TipeMedia::Image && $url)
+        <img src="{{ $url }}" alt="{{ $galeri->judul }}" loading="lazy" style="{{ $isFull ? 'width:100%;height:auto;border-radius:4px;' : 'max-height:60px;max-width:90px;object-fit:contain;border-radius:3px;' }}" onerror="this.src='{{ asset('/img/no-image.png') }}'">
+    @else
+        <img src="{{ $poster }}" alt="{{ $galeri->judul }}" loading="lazy" style="{{ $isFull ? 'width:100%;height:auto;border-radius:4px;' : 'max-height:60px;max-width:90px;object-fit:contain;border-radius:3px;' }}" onerror="this.src='{{ asset('/img/no-image.png') }}'">
+    @endif
+
+    @if ($isVideo && !$isFull)
+        <span class="label label-primary galeri-media__badge">
+            <i class="fa {{ $isYoutube ? 'fa-youtube-play' : 'fa-play-circle' }}"></i>
+            {{ $isYoutube ? 'YouTube' : 'Video' }}
+        </span>
+    @endif
+</div>
diff --git a/resources/views/components/modal-image.blade.php b/resources/views/components/modal-image.blade.php
new file mode 100644
index 0000000000..ad73851710
--- /dev/null
+++ b/resources/views/components/modal-image.blade.php
@@ -0,0 +1,81 @@
+@props([
+    'id' => 'modal-image-preview',
+    'title' => 'Pratinjau Gambar',
+])
+
+<div class="modal fade" id="{{ $id }}" tabindex="-1" role="dialog" aria-labelledby="{{ $id }}Label">
+    <div class="modal-dialog modal-lg" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                <h4 class="modal-title" id="{{ $id }}Label">{{ $title }}</h4>
+            </div>
+            <div class="modal-body text-center" style="background-color: #f8f9fa; min-height: 200px; display: flex; align-items: center; justify-content: center; overflow: hidden; padding: 15px;">
+                <img id="{{ $id }}-img" src="" alt="Pratinjau Gambar" style="max-height: 70vh; max-width: 100%; object-fit: contain; border-radius: 4px; box-shadow: 0 2px 8px rgba(0,0,0,0.15);" />
+            </div>
+            <div class="modal-footer">
+                <a href="#" id="{{ $id }}-download" class="btn btn-primary" download target="_blank">
+                    <i class="fa fa-download"></i> Unduh
+                </a>
+                <button type="button" class="btn btn-default" data-dismiss="modal">Tutup</button>
+            </div>
+        </div>
+    </div>
+</div>
+
+@once
+    @push('scripts')
+        <script>
+            function openImageModal(imageUrl, title, downloadUrl, targetModal) {
+                var modalSelector = targetModal || '#{{ $id }}';
+                var $modal = $(modalSelector);
+                if (!$modal.length) {
+                    $modal = $('#{{ $id }}');
+                }
+
+                var $img = $modal.find('.modal-body img');
+                var $download = $modal.find('.modal-footer a[download]');
+                var $title = $modal.find('.modal-title');
+
+                if (title) {
+                    $title.text(title);
+                } else {
+                    $title.text('Pratinjau Gambar');
+                }
+
+                $img.attr('src', imageUrl);
+
+                var dl = downloadUrl || imageUrl;
+                $download.attr('href', dl);
+
+                var filename = '';
+                try {
+                    var raw = dl.split('?')[0].split('#')[0];
+                    filename = raw.substring(raw.lastIndexOf('/') + 1);
+                } catch (e) {
+                    filename = '';
+                }
+
+                if (!filename || filename.indexOf('.') === -1) {
+                    filename = (title ? title.replace(/[^a-z0-9]/gi, '_').toLowerCase() : 'gambar') + '.jpg';
+                }
+                $download.attr('download', filename);
+
+                $modal.modal('show');
+            }
+
+            $(document).on('click', '[data-toggle="modal-image"], .preview-image-trigger', function(e) {
+                e.preventDefault();
+                var $this = $(this);
+                var targetModal = $this.attr('data-target');
+                var url = $this.attr('data-url') || $this.attr('data-src') || $this.attr('src') || $this.attr('href');
+                var title = $this.attr('data-title') || $this.attr('alt') || $this.attr('title') || 'Pratinjau Gambar';
+                var downloadUrl = $this.attr('data-download') || url;
+
+                if (url && url !== '#' && url !== 'javascript:void(0)') {
+                    openImageModal(url, title, downloadUrl, targetModal);
+                }
+            });
+        </script>
+    @endpush
+@endonce
diff --git a/resources/views/components/penduduk-gabungan-select.blade.php b/resources/views/components/penduduk-gabungan-select.blade.php
new file mode 100644
index 0000000000..fcee29704e
--- /dev/null
+++ b/resources/views/components/penduduk-gabungan-select.blade.php
@@ -0,0 +1,77 @@
+@props([
+    'name' => 'penduduk_id',
+    'id' => 'penduduk_id_gabungan',
+    'selected' => null,
+    'selectedText' => null,
+    'placeholder' => 'Pilih Ketua Lembaga',
+    'required' => false,
+    'apiServerDatabase' => null,
+    'apiKeyDatabase' => null,
+    'kodeKecamatan' => null,
+])
+
+@php
+    $apiServerDatabase = $apiServerDatabase ?? ($settings['api_server_database_gabungan'] ?? '');
+    $apiKeyDatabase = $apiKeyDatabase ?? ($settings['api_key_database_gabungan'] ?? '');
+    $kodeKecamatan = $kodeKecamatan ?? (isset($profil) ? str_replace('.', '', $profil->kecamatan_id) : '');
+@endphp
+
+<div style="display: flex; flex-direction: column;">
+    <select name="{{ $name }}" id="{{ $id }}" class="form-control select2" {{ $required ? 'required' : '' }}>
+        <option value="">{{ $placeholder }}</option>
+        @if ($selected)
+            <option value="{{ $selected }}" selected>{{ $selectedText }}</option>
+        @endif
+    </select>
+</div>
+
+@push('scripts')
+    <script>
+        $(function() {
+            var $penduduk = $('#{{ $id }}');
+
+            $penduduk.select2({
+                placeholder: '{{ $placeholder }}',
+                width: '100%',
+                minimumInputLength: 0,
+                allowClear: true,
+                ajax: {
+                    url: `{{ $apiServerDatabase }}/api/v1/opendk/sync-penduduk-opendk`,
+                    dataType: 'json',
+                    delay: 400,
+                    headers: {
+                        "Authorization": `Bearer {{ $apiKeyDatabase }}`,
+                        "Accept": "application/ld+json"
+                    },
+                    data: function(params) {
+                        return {
+                            'filter[kode_kecamatan]': '{{ $kodeKecamatan }}',
+                            'filter[status_dasar]': 1,
+                            'filter[search]': params.term,
+                            'page[size]': 20,
+                            'page[number]': params.page || 1,
+                        };
+                    },
+                    processResults: function(response, params) {
+                        params.page = params.page || 1;
+                        var total = (response.meta && response.meta.pagination && response.meta.pagination.total) || 0;
+
+                        return {
+                            results: $.map(response.data || [], function(item) {
+                                var attributes = item.attributes || {};
+                                return {
+                                    id: item.id,
+                                    text: attributes.nama + ' - ' + (attributes.nik || ''),
+                                };
+                            }),
+                            pagination: {
+                                more: params.page * 20 < total
+                            }
+                        };
+                    },
+                    cache: true
+                }
+            });
+        });
+    </script>
+@endpush
diff --git a/resources/views/data/aki_akb/index.blade.php b/resources/views/data/aki_akb/index.blade.php
index 1b3f012ee2..f251ca0e2a 100644
--- a/resources/views/data/aki_akb/index.blade.php
+++ b/resources/views/data/aki_akb/index.blade.php
@@ -55,7 +55,10 @@
                     url: "{!! route('data.aki-akb.getdata') !!}",
                     type: 'POST',
                     data: function(d) {
-                        d.desa_id = $('#list_desa').val();
+                        var desaId = $('#list_desa').val();
+                        if (desaId && desaId != 'Semua') {
+                            d.desa = desaId;
+                        }
                     }
                 },
                 columns: [{
@@ -94,8 +97,9 @@ class: 'text-center',
             });
 
             $('#list_desa').on('select2:select', function(e) {
-                data.columns(1).search(this.value).draw();
+                data.ajax.reload();
             });
+
         });
     </script>
     @include('forms.datatable-vertical')
diff --git a/resources/views/data/anggaran_desa/index.blade.php b/resources/views/data/anggaran_desa/index.blade.php
index 3a445b4c44..38467f4526 100644
--- a/resources/views/data/anggaran_desa/index.blade.php
+++ b/resources/views/data/anggaran_desa/index.blade.php
@@ -55,7 +55,10 @@
                     url: "{!! route('data.anggaran-desa.getdata') !!}",
                     type: "POST",
                     data: function(d) {
-                        d.desa = $('#list_desa').val();
+                        var desaId = $('#list_desa').val();
+                        if (desaId && desaId != 'Semua') {
+                            d.desa = desaId;
+                        }
                     }
                 },
                 columns: [{
diff --git a/resources/views/data/data_sarana/index.blade.php b/resources/views/data/data_sarana/index.blade.php
index 20f38c3e07..7c981874aa 100644
--- a/resources/views/data/data_sarana/index.blade.php
+++ b/resources/views/data/data_sarana/index.blade.php
@@ -50,7 +50,7 @@
                     <table class="table table-bordered table-hover" id="datasarana-table">
                         <thead>
                             <tr>
-                                <th style="max-width: 80px;">Aksi</th>
+                                <th class="text-center text-nowrap" style="width: 100px;">Aksi</th>
                                 <th>Nama Sarana</th>
                                 <th>Jumlah</th>
                                 <th>Kategori</th>
@@ -76,8 +76,11 @@
                     url: "{{ route('data.data-sarana.getdata') }}",
                     type: "POST",
                     data: function(d) {
-                        d.desa_id = $('#list_desa').val(),
-                            d.kategori = $('#kategori').val()
+                        var desaId = $('#list_desa').val();
+                        if (desaId && desaId != 'Semua') {
+                            d.desa = desaId;
+                        }
+                        d.kategori = $('#kategori').val()
                     }
                 },
                 columns: [{
@@ -85,7 +88,7 @@
                         name: 'aksi',
                         orderable: false,
                         searchable: false,
-                        className: 'text-center'
+                        className: 'text-center text-nowrap'
                     },
                     {
                         data: 'nama',
diff --git a/resources/views/data/data_sarana/partials/action.blade.php b/resources/views/data/data_sarana/partials/action.blade.php
index 3cb9ac1eb5..7acc2d872a 100644
--- a/resources/views/data/data_sarana/partials/action.blade.php
+++ b/resources/views/data/data_sarana/partials/action.blade.php
@@ -1,17 +1,13 @@
-<div class="btn-group">
-    <a href="{{ $editUrl ?? '#' }}">
-        <button class="btn btn-success btn-sm" style="width: 40px;">
-            <i class="fa fa-edit" aria-hidden="true"></i>
-        </button>
+<div class="btn-group" style="display: inline-flex; align-items: center; gap: 4px; white-space: nowrap;">
+    <a href="{{ $editUrl ?? '#' }}" class="btn btn-success btn-sm" style="width: 40px;" title="Ubah">
+        <i class="fa fa-edit" aria-hidden="true"></i>
     </a>
 
-    <div style="display: inline-block; margin-left: 4px">
-        <form action="{{ $deleteUrl ?? '#' }}" method="POST" style="display:inline;">
-            @csrf
-            @method('DELETE')
-            <button type="submit" class="btn btn-icon btn-danger btn-sm" style="width: 40px" data-confirm="Yakin ingin menghapus data ini?">
-                <i class="fa fa-trash" aria-hidden="true"></i>
-            </button>
-        </form>
-    </div>
+    <form action="{{ $deleteUrl ?? '#' }}" method="POST" style="display: inline-block; margin: 0;">
+        @csrf
+        @method('DELETE')
+        <button type="submit" class="btn btn-icon btn-danger btn-sm" style="width: 40px;" data-confirm="Yakin ingin menghapus data ini?" title="Hapus">
+            <i class="fa fa-trash" aria-hidden="true"></i>
+        </button>
+    </form>
 </div>
diff --git a/resources/views/data/data_suplemen/create.blade.php b/resources/views/data/data_suplemen/create.blade.php
index 6b0ff3363f..f04a9356d6 100644
--- a/resources/views/data/data_suplemen/create.blade.php
+++ b/resources/views/data/data_suplemen/create.blade.php
@@ -19,7 +19,7 @@
 
                     {!! html()->form('POST', route('data.data-suplemen.store'))->id('form-faq')->class(
                             'form-horizontal
-                                                                                                                                                                                form-label-left',
+                                                                                                                                                                                                                                                                                                                                                form-label-left',
                         )->open() !!}
 
                     <div class="box-body">
diff --git a/resources/views/data/data_suplemen/form.blade.php b/resources/views/data/data_suplemen/form.blade.php
index 9b80a9c4b2..f2c3926f42 100644
--- a/resources/views/data/data_suplemen/form.blade.php
+++ b/resources/views/data/data_suplemen/form.blade.php
@@ -18,8 +18,8 @@
     <div class="col-md-6 col-sm-6 col-xs-12">
         {!! html()->textarea('keterangan')->class('textarea')->style(
                 'width: 100%; height: 200px; font-size: 14px;
-                                                                                line-height: 18px; border: 1px solid #dddddd; padding:
-                                                                                10px;',
+                                                                                                                                                line-height: 18px; border: 1px solid #dddddd; padding:
+                                                                                                                                                10px;',
             )->placeholder('Keterangan')->value(old('keterangan', isset($suplemen) ? $suplemen->keterangan : '')) !!}
     </div>
 </div>
diff --git a/resources/views/data/data_suplemen/form_detail.blade.php b/resources/views/data/data_suplemen/form_detail.blade.php
index 22239183d3..03e111bcd3 100644
--- a/resources/views/data/data_suplemen/form_detail.blade.php
+++ b/resources/views/data/data_suplemen/form_detail.blade.php
@@ -1,3 +1,9 @@
+@php
+    $isDatabaseGabungan = $isDatabaseGabungan ?? false;
+    $pendudukField = $isDatabaseGabungan ? 'penduduk_id_gabungan' : 'penduduk_id';
+    $selectedDesaId = $selectedDesaId ?? null;
+    $selectedPendudukId = $selectedPendudukId ?? null;
+@endphp
 {{ html()->hidden('suplemen_id', $suplemen->id) }}
 @if ($suplemen->sasaran == 3)
     <div class="form-group">
@@ -7,11 +13,7 @@
             <select name="desa_id" id="desa" class="form-control">
                 <option class="form-control" value="">Pilih {{ config('setting.sebutan_desa') }}</option>
                 @foreach ($desa as $item)
-                    @if ($anggota == null)
-                        <option value="{{ $item['desa_id'] }}">{{ $item['nama'] }}</option>
-                    @else
-                        <option {{ $anggota->penduduk->desa->desa_id == $item['desa_id'] ? 'selected' : '' }} value="{{ $item['desa_id'] }}">{{ $item['nama'] }}</option>
-                    @endif
+                    <option {{ $selectedDesaId == $item['desa_id'] ? 'selected' : '' }} value="{{ $item['desa_id'] }}">{{ $item['nama'] }}</option>
                 @endforeach
             </select>
         </div>
@@ -20,16 +22,12 @@
         <label class="control-label col-md-3 col-sm-3 col-xs-12" for="penduduk_id">Nama Penduduk</label>
 
         <div class="col-md-6 col-sm-6 col-xs-12">
-            <select name="penduduk_id" id="penduduk" class="form-control" disabled>
+            <select name="{{ $pendudukField }}" id="penduduk" class="form-control" disabled>
                 <option class="form-control" value="">Pilih penduduk</option>
                 @foreach ($data as $penduduk)
-                    @if ($anggota == null)
-                        <option value="{{ $penduduk['id'] }}">{{ $penduduk['nama'] }}</option>
-                    @else
-                        <option {{ $anggota->penduduk->id == $penduduk['id'] ? 'selected' : '' }} value="{{ $penduduk['id'] }}">
-                            {{ $penduduk['nama'] }}
-                        </option>
-                    @endif
+                    <option {{ $selectedPendudukId == $penduduk['id'] ? 'selected' : '' }} value="{{ $penduduk['id'] }}">
+                        {{ $penduduk['nama'] }}
+                    </option>
                 @endforeach
             </select>
         </div>
@@ -43,32 +41,25 @@
             <select name="desa_id" id="desa" class="form-control">
                 <option class="form-control" value="">Pilih {{ config('setting.sebutan_desa') }}</option>
                 @foreach ($desa as $item)
-                    @if ($anggota == null)
-                        <option value="{{ $item['desa_id'] }}">{{ $item['nama'] }}</option>
-                    @else
-                        <option {{ $anggota->penduduk->desa->desa_id == $item['desa_id'] ? 'selected' : '' }} value="{{ $item['desa_id'] }}">{{ $item['nama'] }}</option>
-                    @endif
+                    <option {{ $selectedDesaId == $item['desa_id'] ? 'selected' : '' }} value="{{ $item['desa_id'] }}">{{ $item['nama'] }}</option>
                 @endforeach
             </select>
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-md-3 col-sm-3 col-xs-12" for="penduduk_id">{{ $suplemen->sasaran == 2
-            ? 'Nama Kepala
-                                                                                                                Keluarga'
-            : 'Nama Penduduk' }}</label>
+        <label class="control-label col-md-3 col-sm-3 col-xs-12"
+            for="penduduk_id">{{ $suplemen->sasaran == 2
+                ? 'Nama Kepala
+                                                                                                                                                                                                                        Keluarga'
+                : 'Nama Penduduk' }}</label>
 
         <div class="col-md-6 col-sm-6 col-xs-12">
-            <select name="penduduk_id" id="penduduk" class="form-control" disabled>
+            <select name="{{ $pendudukField }}" id="penduduk" class="form-control">
                 <option class="form-control" value="">Pilih Penduduk</option>
                 @foreach ($data as $penduduk)
-                    @if ($anggota == null)
-                        <option value="{{ $penduduk['id'] }}">{{ $penduduk['nama'] }}</option>
-                    @else
-                        <option {{ $anggota->penduduk->id == $penduduk['id'] ? 'selected' : '' }} value="{{ $penduduk['id'] }}">
-                            {{ $penduduk['nama'] }}
-                        </option>
-                    @endif
+                    <option {{ $selectedPendudukId == $penduduk['id'] ? 'selected' : '' }} value="{{ $penduduk['id'] }}">
+                        {{ $penduduk['nama'] }}
+                    </option>
                 @endforeach
             </select>
         </div>
diff --git a/resources/views/data/data_suplemen/gabungan/create_detail.blade.php b/resources/views/data/data_suplemen/gabungan/create_detail.blade.php
new file mode 100644
index 0000000000..0a9f977891
--- /dev/null
+++ b/resources/views/data/data_suplemen/gabungan/create_detail.blade.php
@@ -0,0 +1,177 @@
+@extends('layouts.dashboard_template')
+
+@section('content')
+    <section class="content-header block-breadcrumb">
+        <h1>
+            {{ $page_title ?? 'Page Title' }}
+            <small>{{ $page_description ?? '' }}</small>
+        </h1>
+        <ol class="breadcrumb">
+            <li><a href="{{ route('dashboard') }}"><i class="fa fa-dashboard"></i> Dashboard</a></li>
+            <li><a href="{{ route('data.data-suplemen.index') }}">Daftar Data Suplemen</a></li>
+            <li><a href="{{ route('data.data-suplemen.show', $suplemen->id) }}">Data Suplemen {{ $suplemen->nama }}</a></li>
+            <li class="active">{{ $page_description }}</li>
+        </ol>
+    </section>
+    <section class="content container-fluid">
+        <div class="row">
+            <div class="col-md-12">
+                <div class="box box-primary">
+
+                    {!! html()->form('POST', route('data.data-suplemen.storedetail'))->id('form-suiplemen-gabungan')->class('form-horizontal form-label-left')->open() !!}
+
+                    <div class="box-body">
+                        <div class="table-responsive">
+                            <table class="table table-bordered table-striped table-condensed">
+                                <tr>
+                                    <th class="col-md-2">Nama</th>
+                                    <td>: {{ $suplemen->nama }}</td>
+                                </tr>
+                                <tr>
+                                    <th>Sasaran</th>
+                                    <td>: {{ $sasaran[$suplemen->sasaran] }}</td>
+                                </tr>
+                                <tr>
+                                    <th>Keterangan</th>
+                                    <td>: {{ $suplemen->keterangan }}</td>
+                                </tr>
+                            </table>
+                        </div>
+                        <hr>
+                        <legend>Daftar Anggota Suplemen</legend>
+
+                        @if (count($errors) > 0)
+                            <div class="alert alert-danger">
+                                <strong>Ups!</strong> Ada beberapa masalah dengan masukan Anda.<br><br>
+                                <ul>
+                                    @foreach ($errors->all() as $error)
+                                        <li>{{ $error }}</li>
+                                    @endforeach
+                                </ul>
+                            </div>
+                        @endif
+
+                        @include('flash::message')
+
+                        {{ html()->hidden('suplemen_id', $suplemen->id) }}
+
+                        <div class="form-group">
+                            <label class="control-label col-md-3 col-sm-3 col-xs-12">Nama
+                                {{ config('setting.sebutan_desa') }}</label>
+
+                            <div class="col-md-6 col-sm-6 col-xs-12">
+                                @include('layouts.fragments.select-desa', ['selectAttributes' => ['name' => 'desa_id', 'required' => 'required']])
+                            </div>
+                        </div>
+
+                        <div class="form-group">
+                            <label class="control-label col-md-3 col-sm-3 col-xs-12" for="penduduk_id">{{ $suplemen->sasaran == 2 ? 'Nama Kepala Keluarga' : 'Nama Penduduk' }}</label>
+
+                            <div class="col-md-6 col-sm-6 col-xs-12">
+                                <select name="penduduk_id_gabungan" id="penduduk_id_gabungan" class="form-control" required>
+                                    <option class="form-control" value="">Pilih Penduduk</option>
+                                </select>
+                            </div>
+                        </div>
+
+                        <div class="form-group">
+                            <label class="control-label col-md-3 col-sm-3 col-xs-12">Keterangan</label>
+
+                            <div class="col-md-6 col-sm-6 col-xs-12">
+                                {!! html()->textarea('keterangan')->class('textarea')->placeholder('Keterangan')->value(old('keterangan'))->style('width: 100%; height: 200px; font-size: 14px; line-height: 18px; border: 1px solid #dddddd; padding: 10px;') !!}
+                            </div>
+                        </div>
+                        <div class="ln_solid"></div>
+                    </div>
+                    <div class="box-footer">
+                        @include('partials.button_reset_submit')
+                    </div>
+                    {!! html()->form()->close() !!}
+                </div>
+            </div>
+        </div>
+    </section>
+@endsection
+
+@include('partials.asset_select2')
+
+@push('scripts')
+    <script>
+        $(function() {
+            var $penduduk = $('#penduduk_id_gabungan');
+            $('#list_desa').select2({
+                width: '100%',
+            })
+
+            $penduduk.select2({
+                placeholder: 'Pilih Penduduk',
+                width: '100%',
+                minimumInputLength: 0,
+                allowClear: true,
+                ajax: {
+                    url: `{{ $settings['api_server_database_gabungan'] ?? '' }}/api/v1/opendk/sync-penduduk-opendk`,
+                    dataType: 'json',
+                    delay: 400,
+                    headers: {
+                        "Authorization": `Bearer {{ $settings['api_key_database_gabungan'] ?? '' }}`,
+                        "Accept": "application/ld+json"
+                    },
+                    data: function(params) {
+                        var data = {
+                            'filter[kode_kecamatan]': {{ str_replace('.', '', $profil->kecamatan_id) }},
+                            'filter[kode_desa]': $('#list_desa').val(),
+                            'filter[status_dasar]': 1,
+                            'filter[search]': params.term,
+                            'page[size]': 20,
+                            'page[number]': params.page || 1,
+                        };
+
+                        @if ((int) $suplemen->sasaran !== 1)
+                            data['filter[kk_level]'] = 1;
+                        @endif
+
+                        return data;
+                    },
+                    processResults: function(response, params) {
+                        params.page = params.page || 1;
+
+                        var total = (response.meta && response.meta.pagination && response.meta.pagination.total) || 0;
+
+                        return {
+                            results: $.map(response.data || [], function(item) {
+                                var attributes = item.attributes || {};
+
+                                return {
+                                    id: item.id,
+                                    text: attributes.nik ? attributes.nama + ' - ' + attributes.nik : attributes.nama,
+                                };
+                            }),
+                            pagination: {
+                                more: params.page * 20 < total
+                            }
+                        };
+                    },
+                    cache: true
+                }
+            });
+
+            function setPendudukEnabled(enabled) {
+                var instance = $penduduk.data('select2');
+                $penduduk.prop('disabled', !enabled);
+
+                if (instance) {
+                    instance._syncAttributes();
+                }
+            }
+
+            setPendudukEnabled(false);
+
+            $('#list_desa').on('change', function() {
+                var desa = $(this).val();
+                $penduduk.val(null).trigger('change');
+
+                setPendudukEnabled(!!desa && desa !== 'Semua');
+            });
+        });
+    </script>
+@endpush
diff --git a/resources/views/data/data_suplemen/gabungan/edit_detail.blade.php b/resources/views/data/data_suplemen/gabungan/edit_detail.blade.php
new file mode 100644
index 0000000000..b5d05f0f7a
--- /dev/null
+++ b/resources/views/data/data_suplemen/gabungan/edit_detail.blade.php
@@ -0,0 +1,187 @@
+@extends('layouts.dashboard_template')
+
+@section('content')
+    <section class="content-header block-breadcrumb">
+        <h1>
+            {{ $page_title ?? 'Page Title' }}
+            <small>{{ $page_description ?? '' }}</small>
+        </h1>
+        <ol class="breadcrumb">
+            <li><a href="{{ route('dashboard') }}"><i class="fa fa-dashboard"></i> Dashboard</a></li>
+            <li><a href="{{ route('data.data-suplemen.index') }}">Daftar Data Suplemen</a></li>
+            <li><a href="{{ route('data.data-suplemen.show', $suplemen->id) }}">Data Suplemen {{ $suplemen->nama }}</a></li>
+            <li class="active">{{ $page_description }}</li>
+        </ol>
+    </section>
+    <section class="content container-fluid">
+        <div class="row">
+            <div class="col-md-12">
+                <div class="box box-primary">
+
+                    @if (count($errors) > 0)
+                        <div class="alert alert-danger">
+                            <strong>Ups!</strong> Ada beberapa masalah dengan masukan Anda.<br><br>
+                            <ul>
+                                @foreach ($errors->all() as $error)
+                                    <li>{{ $error }}</li>
+                                @endforeach
+                            </ul>
+                        </div>
+                    @endif
+
+                    <!-- form start -->
+                    {!! html()->form('post', route('data.data-suplemen.updatedetail', $anggota->id))->id('form-suiplemen-gabungan')->class('form-horizontal form-label-left')->open() !!}
+
+                    <div class="box-body">
+                        <div class="table-responsive">
+                            <table class="table table-bordered table-striped table-condensed">
+                                <tr>
+                                    <th class="col-md-2">Nama</th>
+                                    <td>: {{ $suplemen->nama }}</td>
+                                </tr>
+                                <tr>
+                                    <th>Sasaran</th>
+                                    <td>: {{ $sasaran[$suplemen->sasaran] }}</td>
+                                </tr>
+                                <tr>
+                                    <th>Keterangan</th>
+                                    <td>: {{ $suplemen->keterangan }}</td>
+                                </tr>
+                            </table>
+                        </div>
+                        <hr>
+                        <legend>Daftar Anggota Suplemen</legend>
+
+                        {{ method_field('PUT') }}
+                        @include('flash::message')
+
+                        {{ html()->hidden('suplemen_id', $suplemen->id) }}
+
+                        <div class="form-group">
+                            <label class="control-label col-md-3 col-sm-3 col-xs-12">Nama
+                                {{ config('setting.sebutan_desa') }}</label>
+
+                            <div class="col-md-6 col-sm-6 col-xs-12">
+                                @include('layouts.fragments.select-desa', ['selectAttributes' => ['name' => 'desa_id', 'required' => 'required'], 'selectedOption' => $selectedDesaId])
+                            </div>
+                        </div>
+
+                        <div class="form-group">
+                            <label class="control-label col-md-3 col-sm-3 col-xs-12" for="penduduk_id">{{ $suplemen->sasaran == 2 ? 'Nama Kepala Keluarga' : 'Nama Penduduk' }}</label>
+
+                            <div class="col-md-6 col-sm-6 col-xs-12">
+                                <select name="penduduk_id_gabungan" id="penduduk_id_gabungan" class="form-control" required>
+                                    @if ($penduduk)
+                                        <option value="{{ $penduduk->id }}" selected>{{ trim($penduduk->nama . ' - ' . ($penduduk->nik ?? ''), ' -') }}</option>
+                                    @endif
+                                </select>
+                            </div>
+                        </div>
+
+                        <div class="form-group">
+                            <label class="control-label col-md-3 col-sm-3 col-xs-12">Keterangan</label>
+
+                            <div class="col-md-6 col-sm-6 col-xs-12">
+                                {!! html()->textarea('keterangan')->class('textarea')->placeholder('Keterangan')->value(old('keterangan', $anggota->keterangan))->style('width: 100%; height: 200px; font-size: 14px; line-height: 18px; border: 1px solid #dddddd; padding: 10px;') !!}
+                            </div>
+                        </div>
+                    </div>
+                    <!-- /.box-body -->
+                    <div class="box-footer">
+                        @include('partials.button_reset_submit')
+                    </div>
+                    {!! html()->form()->close() !!}
+                </div>
+            </div>
+        </div>
+    </section>
+@endsection
+
+@include('partials.asset_select2')
+
+@push('scripts')
+    <script>
+        $(function() {
+            var $penduduk = $('#penduduk_id_gabungan');
+            $('#list_desa').select2({
+                width: '100%',
+            })
+
+            $penduduk.select2({
+                placeholder: 'Pilih Penduduk',
+                width: '100%',
+                minimumInputLength: 0,
+                allowClear: true,
+                ajax: {
+                    url: `{{ $settings['api_server_database_gabungan'] ?? '' }}/api/v1/opendk/sync-penduduk-opendk`,
+                    dataType: 'json',
+                    delay: 400,
+                    headers: {
+                        "Authorization": `Bearer {{ $settings['api_key_database_gabungan'] ?? '' }}`,
+                        "Accept": "application/ld+json"
+                    },
+                    data: function(params) {
+                        var data = {
+                            'filter[kode_kecamatan]': {{ str_replace('.', '', $profil->kecamatan_id) }},
+                            'filter[kode_desa]': $('#list_desa').val(),
+                            'filter[status_dasar]': 1,
+                            'filter[search]': params.term,
+                            'page[size]': 20,
+                            'page[number]': params.page || 1,
+                        };
+
+                        @if ((int) $suplemen->sasaran !== 1)
+                            data['filter[kk_level]'] = 1;
+                        @endif
+
+                        return data;
+                    },
+                    processResults: function(response, params) {
+                        params.page = params.page || 1;
+
+                        var total = (response.meta && response.meta.pagination && response.meta.pagination.total) || 0;
+
+                        return {
+                            results: $.map(response.data || [], function(item) {
+                                var attributes = item.attributes || {};
+
+                                return {
+                                    id: item.id,
+                                    text: attributes.nik ? attributes.nama + ' - ' + attributes.nik : attributes.nama,
+                                };
+                            }),
+                            pagination: {
+                                more: params.page * 20 < total
+                            }
+                        };
+                    },
+                    cache: true
+                }
+            });
+
+            function setPendudukEnabled(enabled) {
+                var instance = $penduduk.data('select2');
+                $penduduk.prop('disabled', !enabled);
+
+                if (instance) {
+                    instance._syncAttributes();
+                }
+            }
+
+            function hasDesa() {
+                var desa = $('#list_desa').val();
+
+                return !!desa && desa !== 'Semua';
+            }
+
+            $('#list_desa').on('change', function() {
+                $penduduk.val(null).trigger('change');
+                setPendudukEnabled(hasDesa());
+            });
+
+            if (hasDesa()) {
+                setPendudukEnabled(true);
+            }
+        });
+    </script>
+@endpush
diff --git a/resources/views/data/data_suplemen/gabungan/show.blade.php b/resources/views/data/data_suplemen/gabungan/show.blade.php
new file mode 100644
index 0000000000..4b88bcdbb4
--- /dev/null
+++ b/resources/views/data/data_suplemen/gabungan/show.blade.php
@@ -0,0 +1,162 @@
+@extends('layouts.dashboard_template')
+
+@section('content')
+    <section class="content-header block-breadcrumb">
+        <h1>
+            {{ $page_title ?? 'Page Title' }}
+            <small>{{ $page_description ?? '' }}</small>
+        </h1>
+        <ol class="breadcrumb">
+            <li><a href="{{ route('dashboard') }}"><i class="fa fa-dashboard"></i> Dashboard</a></li>
+            <li><a href="{{ route('data.data-suplemen.index') }}">Data Suplemen</a></li>
+            <li class="active">Data Suplemen {{ $suplemen->nama }}</li>
+        </ol>
+    </section>
+    <section class="content container-fluid">
+
+        @include('partials.flash_message')
+
+        <div class="box box-primary">
+            <div class="box-header with-border">
+                <a href="{{ route('data.data-suplemen.createdetail', $suplemen->id) }}" class="btn btn-primary btn-sm" judul="Tambah Data">
+                    <i class="fa fa-plus"></i>&ensp;Tambah
+                </a>
+                @include('forms.btn-social', [
+                    'export_url' => route('data.data-suplemen.export-terdata-excel', $suplemen->id),
+                ])
+            </div>
+            <div class="box-body">
+                <div class="table-responsive">
+                    <table class="table table-bordered table-striped table-condensed">
+                        <tr>
+                            <th class="col-md-2">Nama</th>
+                            <td>: {{ $suplemen->nama }}</td>
+                        </tr>
+                        <tr>
+                            <th>Sasaran</th>
+                            <td>: {{ $sasaran[$suplemen->sasaran] }}</td>
+                        </tr>
+                        <tr>
+                            <th>Keterangan</th>
+                            <td>: {{ $suplemen->keterangan }}</td>
+                        </tr>
+                    </table>
+                </div>
+                <hr>
+                <legend>Daftar Anggota Suplemen</legend>
+                @include('layouts.fragments.list-desa')
+                <hr>
+                <div class="table-responsive">
+                    <table class="table table-striped table-bordered" id="suplemen-terdata-table">
+                        <thead>
+                            <tr>
+                                <th style="max-width: 80px;">Aksi</th>
+                                <th>{{ config('setting.sebutan_desa') }}</th>
+                                <th>No. KK</th>
+                                <th>NIK Penduduk</th>
+                                <th>Nama Penduduk</th>
+                                <th>Tempat Lahir</th>
+                                <th>Tanggal Lahir</th>
+                                <th>Jenis Kelamin</th>
+                                <th>Alamat</th>
+                                <th>Keterangan</th>
+                            </tr>
+                        </thead>
+                    </table>
+                </div>
+            </div>
+        </div>
+    </section>
+@endsection
+
+@include('partials.asset_select2')
+@include('partials.asset_datatables')
+
+@push('scripts')
+    <script type="text/javascript">
+        $(document).ready(function() {
+            $('#list_desa').select2();
+
+            var data = $('#suplemen-terdata-table').DataTable({
+                processing: true,
+                serverSide: true,
+                ajax: {
+                    url: "{!! route('data.data-suplemen.getsuplementerdata', $suplemen->id) !!}",
+                    type: "POST",
+                    data: function(row) {
+                        return {
+                            desa: $('#list_desa').val()
+                        };
+                    }
+                },
+                columns: [{
+                        data: 'aksi',
+                        name: 'aksi',
+                        class: 'text-center',
+                        searchable: false,
+                        orderable: false
+                    },
+                    {
+                        data: 'penduduk.desa.nama',
+                        name: 'penduduk.desa.nama'
+                    },
+                    {
+                        data: 'penduduk.no_kk',
+                        name: 'penduduk.no_kk'
+                    },
+                    {
+                        data: 'penduduk.nik',
+                        name: 'penduduk.nik'
+                    },
+                    {
+                        data: 'penduduk.nama',
+                        name: 'penduduk.nama'
+                    },
+                    {
+                        data: 'penduduk.tempat_lahir',
+                        name: 'penduduk.tempat_lahir'
+                    },
+                    {
+                        data: 'penduduk.tanggal_lahir',
+                        name: 'penduduk.tanggal_lahir'
+                    },
+                    {
+                        data: 'penduduk.sex',
+                        name: 'penduduk.sex'
+                    },
+                    {
+                        data: 'penduduk.alamat',
+                        name: 'penduduk.alamat'
+                    },
+                    {
+                        data: 'keterangan',
+                        name: 'keterangan'
+                    },
+                ],
+                order: [
+                    [1, 'asc']
+                ]
+            });
+
+            $('#list_desa').on('select2:select', function(e) {
+                data.ajax.reload();
+            });
+        });
+    </script>
+
+    <script type="text/javascript">
+        $(document).ready(function() {
+            var exportUrl = $('#export-url');
+
+            if (exportUrl.length && $('#list_desa').length) {
+                $('#list_desa').on('change', function() {
+                    var url = new URL(exportUrl.attr('href'));
+                    url.searchParams.set('desa', $(this).val() || 'Semua');
+                    exportUrl.attr('href', url.toString());
+                });
+            }
+        });
+    </script>
+    @include('forms.datatable-vertical')
+    @include('forms.delete-modal')
+@endpush
diff --git a/resources/views/data/data_suplemen/show.blade.php b/resources/views/data/data_suplemen/show.blade.php
index 6b9361fb7f..a4778e1ccf 100644
--- a/resources/views/data/data_suplemen/show.blade.php
+++ b/resources/views/data/data_suplemen/show.blade.php
@@ -46,6 +46,7 @@
                 </div>
                 <hr>
                 <legend>Daftar Anggota Suplemen</legend>
+                @include('layouts.fragments.list-desa')
                 <div class="table-responsive">
                     <table class="table table-striped table-bordered" id="suplemen-terdata-table">
                         <thead>
@@ -131,6 +132,20 @@ class: 'text-center',
             });
         });
     </script>
+
+    <script type="text/javascript">
+        $(document).ready(function() {
+            var exportUrl = $('#export-url');
+
+            if (exportUrl.length && $('#list_desa').length) {
+                $('#list_desa').on('change', function() {
+                    var url = new URL(exportUrl.attr('href'));
+                    url.searchParams.set('desa', $(this).val() || 'Semua');
+                    exportUrl.attr('href', url.toString());
+                });
+            }
+        });
+    </script>
     @include('forms.datatable-vertical')
     @include('forms.delete-modal')
 @endpush
diff --git a/resources/views/data/epidemi_penyakit/index.blade.php b/resources/views/data/epidemi_penyakit/index.blade.php
index 85530fa9a9..f2a34390bb 100644
--- a/resources/views/data/epidemi_penyakit/index.blade.php
+++ b/resources/views/data/epidemi_penyakit/index.blade.php
@@ -62,7 +62,10 @@
                     url: "{!! route('data.epidemi-penyakit.getdata') !!}",
                     type: 'POST',
                     data: function(d) {
-                        d.desa = $('#list_desa').val();
+                        var desaId = $('#list_desa').val();
+                        if (desaId && desaId != 'Semua') {
+                            d.desa = desaId;
+                        }
                     }
                 },
                 columns: [{
@@ -99,7 +102,7 @@ class: 'text-center',
             });
 
             $('#list_desa').on('select2:select', function(e) {
-                data.columns(1).search(this.value).draw();
+                data.ajax.reload();
             });
         });
     </script>
diff --git a/resources/views/data/fasilitas_paud/edit.blade.php b/resources/views/data/fasilitas_paud/edit.blade.php
index 1a34d1dcfb..c088134a54 100644
--- a/resources/views/data/fasilitas_paud/edit.blade.php
+++ b/resources/views/data/fasilitas_paud/edit.blade.php
@@ -29,7 +29,7 @@
                 @endif
 
                 <!-- form start -->
-                {!! html()->form()->open() !!}
+                {!! html()->form('PUT', route('data.fasilitas-paud.update', $fasilitas->id))->class('form-horizontal form-label-left')->open() !!}
 
                 <div class="box-body">
 
diff --git a/resources/views/data/fasilitas_paud/import.blade.php b/resources/views/data/fasilitas_paud/import.blade.php
index 10ecfde187..efa2e45265 100644
--- a/resources/views/data/fasilitas_paud/import.blade.php
+++ b/resources/views/data/fasilitas_paud/import.blade.php
@@ -21,7 +21,7 @@
                 <!-- form start -->
                 {!! html()->form('POST', route('data.fasilitas-paud.do_import'))->id('form-import')->class(
                         'form-horizontal
-                                                                                                                                            form-label-left',
+                                                                                                                                                                                                                                            form-label-left',
                     )->acceptsFiles()->open() !!}
 
                 <div class="box-body">
@@ -43,11 +43,7 @@
                             <div class="form-group">
                                 <label for="list_desa" class="control-label col-md-4 col-sm-3 col-xs-12">{{ config('setting.sebutan_desa') }}</label>
                                 <div class="col-md-8">
-                                    <select class="form-control" id="list_desa" name="desa_id">
-                                        @foreach (\App\Models\DataDesa::all() as $desa)
-                                            <option value="{{ $desa->desa_id }}">{{ $desa->nama }}</option>
-                                        @endforeach
-                                    </select>
+                                    @include('layouts.fragments.select-desa', ['selectAttributes' => ['name' => 'desa_id', 'data-width' => '100%', 'required' => 'required']])
                                 </div>
                             </div>
 
@@ -106,6 +102,7 @@
 @push('scripts')
     <script>
         $(function() {
+            $('#list_desa option[value="Semua"]').val('');
 
             function readURL(input) {
                 if (input.files && input.files[0]) {
diff --git a/resources/views/data/fasilitas_paud/index.blade.php b/resources/views/data/fasilitas_paud/index.blade.php
index cdcc22a5bf..5d826c1309 100644
--- a/resources/views/data/fasilitas_paud/index.blade.php
+++ b/resources/views/data/fasilitas_paud/index.blade.php
@@ -56,7 +56,10 @@
                     url: "{!! route('data.fasilitas-paud.getdata') !!}",
                     type: 'POST',
                     data: function(d) {
-                        d.desa = $('#list_desa').val();
+                        var desaId = $('#list_desa').val();
+                        if (desaId && desaId != 'Semua') {
+                            d.desa = desaId;
+                        }
                     }
                 },
                 columns: [{
@@ -67,7 +70,7 @@ class: 'text-center',
                         orderable: false
                     },
                     {
-                        data: 'desa.nama',
+                        data: 'nama_desa',
                         name: 'desa.nama'
                     },
                     {
diff --git a/resources/views/data/imunisasi/form_edit.blade.php b/resources/views/data/imunisasi/form_edit.blade.php
index 88c20e776b..4b1de19e2c 100644
--- a/resources/views/data/imunisasi/form_edit.blade.php
+++ b/resources/views/data/imunisasi/form_edit.blade.php
@@ -2,13 +2,13 @@
     <label for="cakupan_imunisasi" class="control-label col-md-4 col-sm-3 col-xs-12">Cakupan Imunisasi<span class="required">*</span></label>
 
     <div class="col-md-6 col-sm-6 col-xs-12">
-        {!! html()->number('cakupan_imunisasi', old('cakupan_imunisasi'))->class('form-control')->required()->id('cakupan_imunisasi') !!}
+        {!! html()->number('cakupan_imunisasi', old('cakupan_imunisasi') ?? $imunisasi->cakupan_imunisasi)->class('form-control')->required()->id('cakupan_imunisasi') !!}
     </div>
 </div>
 <div class="form-group">
     <label for="bulan" class="control-label col-md-4 col-sm-3 col-xs-12">Bulan</label>
 
-    <div class="col-md-8">
+    <div class="col-md-6 col-sm-6 col-xs-12">
         <select class="form-control" id="bulan" name="bulan">
             @foreach (months_list() as $key => $month)
                 @if ($imunisasi->bulan == $key)
@@ -24,7 +24,7 @@
 <div class="form-group">
     <label for="list_year" class="control-label col-md-4 col-sm-3 col-xs-12">Tahun</label>
 
-    <div class="col-md-8">
+    <div class="col-md-6 col-sm-6 col-xs-12">
         <select class="form-control" id="list_year" name="tahun">
             @foreach (years_list() as $year)
                 @if ($imunisasi->tahun == $year)
diff --git a/resources/views/data/imunisasi/index.blade.php b/resources/views/data/imunisasi/index.blade.php
index 610e6758d4..dd36dbe992 100644
--- a/resources/views/data/imunisasi/index.blade.php
+++ b/resources/views/data/imunisasi/index.blade.php
@@ -54,7 +54,10 @@
                     url: "{!! route('data.imunisasi.getdata') !!}",
                     type: 'POST',
                     data: function(d) {
-                        d.desa = $('#list_desa').val();
+                        var desaId = $('#list_desa').val();
+                        if (desaId && desaId != 'Semua') {
+                            d.desa = desaId;
+                        }
                     }
                 },
                 columns: [{
@@ -87,7 +90,7 @@ class: 'text-center',
             });
 
             $('#list_desa').on('select2:select', function(e) {
-                data.columns(1).search(this.value).draw();
+                data.ajax.reload();
             });
         });
     </script>
diff --git a/resources/views/data/keluarga/index.blade.php b/resources/views/data/keluarga/index.blade.php
index 93ec0a1cba..08d1f3e36c 100644
--- a/resources/views/data/keluarga/index.blade.php
+++ b/resources/views/data/keluarga/index.blade.php
@@ -68,7 +68,10 @@
                     url: "{!! route('data.keluarga.getdata') !!}",
                     type: "POST",
                     data: function(d) {
-                        d.desa = $('#list_desa').val();
+                        var desaId = $('#list_desa').val();
+                        if (desaId && desaId != 'Semua') {
+                            d.desa = desaId;
+                        }
                     }
                 },
                 columns: [{
diff --git a/resources/views/data/laporan-apbdes/index.blade.php b/resources/views/data/laporan-apbdes/index.blade.php
index ba3e81786a..0d3117c376 100644
--- a/resources/views/data/laporan-apbdes/index.blade.php
+++ b/resources/views/data/laporan-apbdes/index.blade.php
@@ -72,7 +72,10 @@
                     url: "{!! route('data.laporan-apbdes.getdata') !!}",
                     type: "POST",
                     data: function(d) {
-                        d.desa = $('#list_desa').val();
+                        var desaId = $('#list_desa').val();
+                        if (desaId && desaId != 'Semua') {
+                            d.desa = desaId;
+                        }
                     }
                 },
                 columns: [{
diff --git a/resources/views/data/laporan-penduduk/gabungan/index.blade.php b/resources/views/data/laporan-penduduk/gabungan/index.blade.php
index cfca0ad8b9..84a843b7d1 100644
--- a/resources/views/data/laporan-penduduk/gabungan/index.blade.php
+++ b/resources/views/data/laporan-penduduk/gabungan/index.blade.php
@@ -99,7 +99,7 @@
                             const _url = data.attributes.path === undefined ?
                                 `{{ route('data.laporan-penduduk.export-excel.by-id', ['data' => '__DATA__']) }}`
                                 .replace('__DATA__', jsonData) :
-                                `asset('storage/laporan_penduduk')/${data.nama_file}`
+                                data.attributes.path
                             const _disabled = data.attributes.path === undefined ? 'disabled' : ''
 
                             return `<a href="${_url}" title="Unduh" data-button="download" target="_blank">
diff --git a/resources/views/data/laporan-penduduk/index.blade.php b/resources/views/data/laporan-penduduk/index.blade.php
index d28337509a..c041616724 100644
--- a/resources/views/data/laporan-penduduk/index.blade.php
+++ b/resources/views/data/laporan-penduduk/index.blade.php
@@ -68,7 +68,10 @@
                     url: "{!! route('data.laporan-penduduk.getdata') !!}",
                     type: "POST",
                     data: function(d) {
-                        d.desa = $('#list_desa').val();
+                        var desaId = $('#list_desa').val();
+                        if (desaId && desaId != 'Semua') {
+                            d.desa = desaId;
+                        }
                     }
                 },
                 columns: [{
diff --git a/resources/views/data/lembaga/gabungan/create.blade.php b/resources/views/data/lembaga/gabungan/create.blade.php
new file mode 100644
index 0000000000..574224888c
--- /dev/null
+++ b/resources/views/data/lembaga/gabungan/create.blade.php
@@ -0,0 +1,37 @@
+@extends('layouts.dashboard_template')
+
+@section('content')
+    <section class="content-header block-breadcrumb">
+        <h1>
+            {{ $page_title ?? 'Page Title' }}
+            <small>{{ $page_description ?? '' }}</small>
+        </h1>
+        <ol class="breadcrumb">
+            <li><a href="{{ route('dashboard') }}"><i class="fa fa-dashboard"></i> Dashboard</a></li>
+            <li class="active">{{ $page_description }}</li>
+        </ol>
+    </section>
+    <section class="content container-fluid">
+        <div class="row">
+            <div class="col-md-12">
+                <div class="box box-primary">
+
+                    {!! html()->form('POST', route('data.lembaga.store'))->id('form-lembaga')->class('form-horizontal form-label-left')->open() !!}
+                    @include('layouts.fragments.error_message')
+                    <div class="box-body">
+
+                        @include('flash::message')
+                        @include('data.lembaga.gabungan.form_create')
+
+                    </div>
+                    <div class="box-footer">
+                        @include('partials.button_reset_submit')
+                    </div>
+                    {!! html()->form()->close() !!}
+                </div>
+            </div>
+        </div>
+    </section>
+@endsection
+
+@include('partials.tinymce_min')
diff --git a/resources/views/data/lembaga/gabungan/edit.blade.php b/resources/views/data/lembaga/gabungan/edit.blade.php
new file mode 100644
index 0000000000..b9b439f6d0
--- /dev/null
+++ b/resources/views/data/lembaga/gabungan/edit.blade.php
@@ -0,0 +1,37 @@
+@extends('layouts.dashboard_template')
+
+@section('content')
+    <section class="content-header block-breadcrumb">
+        <h1>
+            {{ $page_title ?? 'Page Title' }}
+            <small>{{ $page_description ?? '' }}</small>
+        </h1>
+        <ol class="breadcrumb">
+            <li><a href="{{ route('dashboard') }}"><i class="fa fa-dashboard"></i> Dashboard</a></li>
+            <li class="active">{{ $page_description }}</li>
+        </ol>
+    </section>
+    <section class="content container-fluid">
+        <div class="row">
+            <div class="col-md-12">
+                <div class="box box-primary">
+
+                    {!! html()->form('PUT', route('data.lembaga.update', $lembaga->id))->id('form-lembaga')->class('form-horizontal form-label-left')->open() !!}
+                    @include('layouts.fragments.error_message')
+                    <div class="box-body">
+
+                        @include('flash::message')
+                        @include('data.lembaga.gabungan.form_edit')
+
+                    </div>
+                    <div class="box-footer">
+                        @include('partials.button_reset_submit')
+                    </div>
+                    {!! html()->form()->close() !!}
+                </div>
+            </div>
+        </div>
+    </section>
+@endsection
+
+@include('partials.tinymce_min')
diff --git a/resources/views/data/lembaga/gabungan/form_create.blade.php b/resources/views/data/lembaga/gabungan/form_create.blade.php
new file mode 100644
index 0000000000..0b8ac0d810
--- /dev/null
+++ b/resources/views/data/lembaga/gabungan/form_create.blade.php
@@ -0,0 +1,51 @@
+@include('partials.asset_select2')
+<div class="form-group">
+    <label class="control-label col-md-3 col-sm-3 col-xs-12">Nama Lembaga <span class="required">*</span></label>
+
+    <div class="col-md-6 col-sm-6 col-xs-12">
+        {!! html()->text('nama')->value(old('nama', isset($lembaga) ? $lembaga->nama : ''))->class('form-control')->required()->placeholder('Nama Lembaga') !!}
+    </div>
+</div>
+
+<div class="form-group">
+    <label class="control-label col-md-3 col-sm-3 col-xs-12">Kode Lembaga <span class="required">*</span></label>
+
+    <div class="col-md-6 col-sm-6 col-xs-12">
+        {!! html()->text('kode')->value(old('kode', isset($lembaga) ? $lembaga->kode : ''))->class('form-control')->required()->placeholder('Kode Lembaga') !!}
+    </div>
+</div>
+
+<div class="form-group">
+    <label class="control-label col-md-3 col-sm-3 col-xs-12">Kategori Lembaga <span class="required">*</span></label>
+
+    <div class="col-md-6 col-sm-6 col-xs-12">
+        <select name="lembaga_kategori_id" class="form-control select2" data-width="100%" required>
+            <option value="">Pilih Kategori Lembaga</option>
+            @foreach (\App\Models\KategoriLembaga::orderBy('nama')->get() as $kategori)
+                <option value="{{ $kategori->id }}" {{ old('lembaga_kategori_id', isset($lembaga) ? $lembaga->lembaga_kategori_id : '') == $kategori->id ? 'selected' : '' }}>
+                    {{ $kategori->nama }}
+                </option>
+            @endforeach
+        </select>
+    </div>
+</div>
+
+<div class="form-group">
+    <label class="control-label col-md-3 col-sm-3 col-xs-12">Ketua Lembaga <span class="required">*</span></label>
+
+    <div class="col-md-6 col-sm-6 col-xs-12">
+        <x-penduduk-gabungan-select name="penduduk_id_gabungan" required />
+    </div>
+</div>
+
+<div class="form-group">
+    <label class="control-label col-md-3 col-sm-3 col-xs-12">Deskripsi Lembaga</label>
+
+    <div class="col-md-6 col-sm-6 col-xs-12">
+        {!! html()->textarea('keterangan')->value(old('keterangan', isset($lembaga) ? $lembaga->keterangan : ''))->class('form-control')->placeholder('Deskripsi Lembaga')->rows(2) !!}
+    </div>
+</div>
+
+<div class="ln_solid"></div>
+
+@include('partials.asset_jqueryvalidation')
diff --git a/resources/views/data/lembaga/gabungan/form_edit.blade.php b/resources/views/data/lembaga/gabungan/form_edit.blade.php
new file mode 100644
index 0000000000..5a6574fe65
--- /dev/null
+++ b/resources/views/data/lembaga/gabungan/form_edit.blade.php
@@ -0,0 +1,55 @@
+@include('partials.asset_select2')
+<div class="form-group">
+    <label class="control-label col-md-3 col-sm-3 col-xs-12">Nama Lembaga <span class="required">*</span></label>
+
+    <div class="col-md-6 col-sm-6 col-xs-12">
+        {!! html()->text('nama')->value(old('nama', isset($lembaga) ? $lembaga->nama : ''))->class('form-control')->required()->placeholder('Nama Lembaga') !!}
+    </div>
+</div>
+
+<div class="form-group">
+    <label class="control-label col-md-3 col-sm-3 col-xs-12">Kode Lembaga <span class="required">*</span></label>
+
+    <div class="col-md-6 col-sm-6 col-xs-12">
+        {!! html()->text('kode')->value(old('kode', isset($lembaga) ? $lembaga->kode : ''))->class('form-control')->required()->placeholder('Kode Lembaga') !!}
+    </div>
+</div>
+
+<div class="form-group">
+    <label class="control-label col-md-3 col-sm-3 col-xs-12">Kategori Lembaga <span class="required">*</span></label>
+
+    <div class="col-md-6 col-sm-6 col-xs-12">
+        <select name="lembaga_kategori_id" class="form-control select2" required data-width="100%">
+            <option value="">Pilih Kategori Lembaga</option>
+            @foreach (\App\Models\KategoriLembaga::orderBy('nama')->get() as $kategori)
+                <option value="{{ $kategori->id }}" {{ old('lembaga_kategori_id', isset($lembaga) ? $lembaga->lembaga_kategori_id : '') == $kategori->id ? 'selected' : '' }}>
+                    {{ $kategori->nama }}
+                </option>
+            @endforeach
+        </select>
+    </div>
+</div>
+
+<div class="form-group">
+    <label class="control-label col-md-3 col-sm-3 col-xs-12">Ketua Lembaga <span class="required">*</span></label>
+
+    <div class="col-md-6 col-sm-6 col-xs-12">
+        <x-penduduk-gabungan-select name="penduduk_id_gabungan" required :selected="old('penduduk_id_gabungan', isset($lembaga) ? $lembaga->penduduk_id_gabungan : null)" :selectedText="isset($lembaga) && $lembaga->penduduk_id_gabungan ? $lembaga->penduduk->nama . ' - ' . $lembaga->penduduk->nik : null" />
+    </div>
+</div>
+
+<div class="form-group">
+    <label class="control-label col-md-3 col-sm-3 col-xs-12">Deskripsi Lembaga</label>
+
+    <div class="col-md-6 col-sm-6 col-xs-12">
+        {!! html()->textarea('keterangan')->value(old('keterangan', isset($lembaga) ? $lembaga->keterangan : ''))->class('form-control')->placeholder('Deskripsi Lembaga')->rows(2) !!}
+    </div>
+</div>
+
+<div class="ln_solid"></div>
+
+@include('partials.asset_jqueryvalidation')
+
+@push('scripts')
+    {!! JsValidator::formRequest('App\Http\Requests\UpdateLembagaRequest', '#form-lembaga') !!}
+@endpush
diff --git a/resources/views/data/lembaga_anggota/gabungan/create.blade.php b/resources/views/data/lembaga_anggota/gabungan/create.blade.php
new file mode 100644
index 0000000000..586f5bf4e8
--- /dev/null
+++ b/resources/views/data/lembaga_anggota/gabungan/create.blade.php
@@ -0,0 +1,41 @@
+@extends('layouts.dashboard_template')
+
+@section('content')
+    <section class="content-header block-breadcrumb">
+        <h1>
+            {{ $page_title ?? 'Page Title' }}
+            <small>{{ $page_description ?? '' }}</small>
+        </h1>
+        <ol class="breadcrumb">
+            <li><a href="{{ route('dashboard') }}"><i class="fa fa-dashboard"></i> Dashboard</a></li>
+            <li><a href="{{ route('data.lembaga.index') }}"> Daftar Lembaga</a></li>
+            <li><a href="{{ route('data.lembaga_anggota.index', $lembaga->slug) }}"> Daftar Anggota Lembaga
+                    {{ $lembaga->nama }} </a></li>
+            <li class="active">{{ $page_description }}</li>
+        </ol>
+    </section>
+    <section class="content container-fluid">
+        <div class="row">
+            <div class="col-md-12">
+                <div class="box box-primary">
+
+                    {!! html()->form()->route('data.lembaga_anggota.store', $lembaga->slug)->method('POST')->id('form-lembaga-anggota')->class('form-horizontal form-label-left')->open() !!}
+                    @include('layouts.fragments.error_message')
+
+                    <div class="box-body">
+
+                        @include('flash::message')
+                        @include('data.lembaga_anggota.gabungan.form_create')
+
+                    </div>
+                    <div class="box-footer">
+                        @include('partials.button_reset_submit')
+                    </div>
+                    {!! html()->form()->close() !!}
+                </div>
+            </div>
+        </div>
+    </section>
+@endsection
+
+@include('partials.tinymce_min')
diff --git a/resources/views/data/lembaga_anggota/gabungan/edit.blade.php b/resources/views/data/lembaga_anggota/gabungan/edit.blade.php
new file mode 100644
index 0000000000..62202df849
--- /dev/null
+++ b/resources/views/data/lembaga_anggota/gabungan/edit.blade.php
@@ -0,0 +1,48 @@
+@extends('layouts.dashboard_template')
+
+@section('content')
+    <section class="content-header block-breadcrumb">
+        <h1>
+            {{ $page_title ?? 'Page Title' }}
+            <small>{{ $page_description ?? '' }}</small>
+        </h1>
+        <ol class="breadcrumb">
+            <li><a href="{{ route('dashboard') }}"><i class="fa fa-dashboard"></i> Dashboard</a></li>
+            <li><a href="{{ route('data.lembaga.index') }}"> Daftar Lembaga</a></li>
+            <li><a href="{{ route('data.lembaga_anggota.index', $lembaga->slug) }}"> Daftar Anggota Lembaga
+                    {{ $lembaga->nama }} </a></li>
+            <li class="active">{{ $page_description }}</li>
+        </ol>
+    </section>
+    <section class="content container-fluid">
+        <div class="row">
+            <div class="col-md-12">
+                <div class="box box-primary">
+
+                    {!! html()->form(
+                            'PUT',
+                            route('data.lembaga_anggota.update', [
+                                'id' => $anggota->id,
+                                'slug' => $lembaga->slug,
+                            ]),
+                        )->id('form-lembaga-anggota')->class('form-horizontal form-label-left')->open() !!}
+
+                    @include('layouts.fragments.error_message')
+
+                    <div class="box-body">
+
+                        @include('flash::message')
+                        @include('data.lembaga_anggota.gabungan.form_edit')
+
+                    </div>
+                    <div class="box-footer">
+                        @include('partials.button_reset_submit')
+                    </div>
+                    {!! html()->form()->close() !!}
+                </div>
+            </div>
+        </div>
+    </section>
+@endsection
+
+@include('partials.tinymce_min')
diff --git a/resources/views/data/lembaga_anggota/gabungan/form_create.blade.php b/resources/views/data/lembaga_anggota/gabungan/form_create.blade.php
new file mode 100644
index 0000000000..273b10452a
--- /dev/null
+++ b/resources/views/data/lembaga_anggota/gabungan/form_create.blade.php
@@ -0,0 +1,96 @@
+@include('partials.asset_select2')
+<div class="form-group">
+    <label class="control-label col-md-3 col-sm-3 col-xs-12">Nama Anggota <span class="required">*</span></label>
+
+    <div class="col-md-6 col-sm-6 col-xs-12">
+        <x-penduduk-gabungan-select name="penduduk_id_gabungan" placeholder="Pilih Anggota" required />
+    </div>
+</div>
+<div class="form-group">
+    <label class="control-label col-md-3 col-sm-3 col-xs-12">Nomor Anggota <span class="required">*</span></label>
+
+    <div class="col-md-6 col-sm-6 col-xs-12">
+        {!! html()->number('no_anggota')->value(old('no_anggota', isset($anggota) ? $anggota->no_anggota : ''))->class('form-control')->required()->placeholder('Nomor Anggota')->attribute('min', 1) !!}
+        <small class="text-danger" style="font-style: italic; font-weight: 700">*Pastikan nomor anggota belum pernah digunakan !</small>
+    </div>
+</div>
+
+<div class="form-group">
+    <label class="control-label col-md-3 col-sm-3 col-xs-12">Jabatan <span class="required">*</span></label>
+
+    <div class="col-md-6 col-sm-6 col-xs-12">
+        <div style="display: flex; flex-direction: column;">
+            {!! html()->select('jabatan_id', [
+                    1 => 'Ketua',
+                    2 => 'Wakil Ketua',
+                    3 => 'Sekretaris',
+                    4 => 'Bendahara',
+                    5 => 'Anggota',
+                ])->value(old('jabatan_id', isset($anggota) ? $anggota->jabatan : ''))->placeholder('Pilih Jabatan')->class('form-control select2')->required()->style('width:100%;') !!}
+        </div>
+    </div>
+</div>
+
+<div class="form-group">
+    <label class="control-label col-md-3 col-sm-3 col-xs-12">Nomor SK Jabatan</label>
+
+    <div class="col-md-6 col-sm-6 col-xs-12">
+        {!! html()->text('no_sk_jabatan')->value(old('no_sk_jabatan', isset($anggota) ? $anggota->no_sk_jabatan : ''))->class('form-control')->placeholder('Nomor SK Jabatan') !!}
+    </div>
+</div>
+
+<div class="form-group">
+    <label class="control-label col-md-3 col-sm-3 col-xs-12">Nomor SK Pengangkatan</label>
+
+    <div class="col-md-6 col-sm-6 col-xs-12">
+        {!! html()->text('no_sk_pengangkatan')->value(old('no_sk_pengangkatan', isset($anggota) ? $anggota->no_sk_pengangkatan : ''))->class('form-control')->placeholder('Nomor SK Pengangkatan') !!}
+    </div>
+</div>
+
+<div class="form-group">
+    <label class="control-label col-md-3 col-sm-3 col-xs-12">Tanggal SK Pengangkatan</label>
+
+    <div class="col-md-6 col-sm-6 col-xs-12">
+        {!! html()->date('tgl_sk_pengangkatan')->value(old('tgl_sk_pengangkatan', isset($anggota) ? $anggota->tgl_sk_pengangkatan : ''))->class('form-control')->placeholder('Tanggal SK Pengangkatan') !!}
+    </div>
+</div>
+
+<div class="form-group">
+    <label class="control-label col-md-3 col-sm-3 col-xs-12">Nomor SK Pemberhentian</label>
+
+    <div class="col-md-6 col-sm-6 col-xs-12">
+        {!! html()->text('no_sk_pemberhentian')->value(old('no_sk_pemberhentian', isset($anggota) ? $anggota->no_sk_pemberhentian : ''))->class('form-control')->placeholder('Nomor SK Pemberhentian') !!}
+    </div>
+</div>
+
+<div class="form-group">
+    <label class="control-label col-md-3 col-sm-3 col-xs-12">Tanggal SK Pemberhentian</label>
+
+    <div class="col-md-6 col-sm-6 col-xs-12">
+        {!! html()->date('tgl_sk_pemberhentian')->value(old('tgl_sk_pemberhentian', isset($anggota) ? $anggota->tgl_sk_pemberhentian : ''))->class('form-control')->placeholder('Tanggal SK Pemberhentian') !!}
+    </div>
+</div>
+
+<div class="form-group">
+    <label class="control-label col-md-3 col-sm-3 col-xs-12">Masa Jabatan (Usia/Periode)</label>
+
+    <div class="col-md-6 col-sm-6 col-xs-12">
+        {!! html()->text('periode')->value(old('periode', isset($anggota) ? $anggota->periode : ''))->class('form-control')->placeholder('Contoh: 6 Tahun Periode Pertama (2015 s/d 2021)') !!}
+    </div>
+</div>
+
+<div class="form-group">
+    <label class="control-label col-md-3 col-sm-3 col-xs-12">Keterangan</label>
+
+    <div class="col-md-6 col-sm-6 col-xs-12">
+        {!! html()->textarea('keterangan')->value(old('keterangan', isset($anggota) ? $anggota->keterangan : ''))->class('form-control')->placeholder('Keterangan')->rows(2) !!}
+    </div>
+</div>
+
+<div class="ln_solid"></div>
+
+@include('partials.asset_jqueryvalidation')
+
+@push('scripts')
+    {!! JsValidator::formRequest('App\Http\Requests\StoreLembagaAnggotaRequest', '#form-lembaga-anggota') !!}
+@endpush
diff --git a/resources/views/data/lembaga_anggota/gabungan/form_edit.blade.php b/resources/views/data/lembaga_anggota/gabungan/form_edit.blade.php
new file mode 100644
index 0000000000..44d8a95478
--- /dev/null
+++ b/resources/views/data/lembaga_anggota/gabungan/form_edit.blade.php
@@ -0,0 +1,96 @@
+@include('partials.asset_select2')
+<div class="form-group">
+    <label class="control-label col-md-3 col-sm-3 col-xs-12">Nama Anggota <span class="required">*</span></label>
+
+    <div class="col-md-6 col-sm-6 col-xs-12">
+        <x-penduduk-gabungan-select name="penduduk_id_gabungan" placeholder="Pilih Anggota" required :selected="old('penduduk_id_gabungan', isset($anggota) ? $lembaga->penduduk_id_gabungan : null)" :selectedText="isset($anggota) && $anggota->penduduk_id_gabungan ? $anggota->penduduk->nama . ' - ' . $anggota->penduduk->nik : null" />
+    </div>
+</div>
+<div class="form-group">
+    <label class="control-label col-md-3 col-sm-3 col-xs-12">Nomor Anggota <span class="required">*</span></label>
+
+    <div class="col-md-6 col-sm-6 col-xs-12">
+        {!! html()->number('no_anggota')->value(old('no_anggota', $anggota->no_anggota ?? ''))->class('form-control')->required()->placeholder('Nomor Anggota')->attribute('min', 1) !!}
+        <small class="text-danger" style="font-style: italic; font-weight: 700">*Pastikan nomor anggota belum pernah digunakan !</small>
+    </div>
+</div>
+
+<div class="form-group">
+    <label class="control-label col-md-3 col-sm-3 col-xs-12">Jabatan <span class="required">*</span></label>
+
+    <div class="col-md-6 col-sm-6 col-xs-12">
+        <div style="display: flex; flex-direction: column;">
+            {!! html()->select('jabatan_id', [
+                    1 => 'Ketua',
+                    2 => 'Wakil Ketua',
+                    3 => 'Sekretaris',
+                    4 => 'Bendahara',
+                    5 => 'Anggota',
+                ])->value(old('jabatan_id', isset($anggota) ? $anggota->jabatan : ''))->placeholder('Pilih Jabatan')->class('form-control select2')->required()->style('width:100%;') !!}
+        </div>
+    </div>
+</div>
+
+<div class="form-group">
+    <label class="control-label col-md-3 col-sm-3 col-xs-12">Nomor SK Jabatan</label>
+
+    <div class="col-md-6 col-sm-6 col-xs-12">
+        {!! html()->text('no_sk_jabatan')->value(old('no_sk_jabatan', $anggota->no_sk_jabatan ?? ''))->class('form-control')->placeholder('Nomor SK Jabatan') !!}
+    </div>
+</div>
+
+<div class="form-group">
+    <label class="control-label col-md-3 col-sm-3 col-xs-12">Nomor SK Pengangkatan</label>
+
+    <div class="col-md-6 col-sm-6 col-xs-12">
+        {!! html()->text('no_sk_pengangkatan')->value(old('no_sk_pengangkatan', $anggota->no_sk_pengangkatan ?? ''))->class('form-control')->placeholder('Nomor SK Pengangkatan') !!}
+    </div>
+</div>
+
+<div class="form-group">
+    <label class="control-label col-md-3 col-sm-3 col-xs-12">Tanggal SK Pengangkatan</label>
+
+    <div class="col-md-6 col-sm-6 col-xs-12">
+        {!! html()->date('tgl_sk_pengangkatan')->value(old('tgl_sk_pengangkatan', $anggota->tgl_sk_pengangkatan ?? ''))->class('form-control')->placeholder('Tanggal SK Pengangkatan') !!}
+    </div>
+</div>
+
+<div class="form-group">
+    <label class="control-label col-md-3 col-sm-3 col-xs-12">Nomor SK Pemberhentian</label>
+
+    <div class="col-md-6 col-sm-6 col-xs-12">
+        {!! html()->text('no_sk_pemberhentian')->value(old('no_sk_pemberhentian', $anggota->no_sk_pemberhentian ?? ''))->class('form-control')->placeholder('Nomor SK Pemberhentian') !!}
+    </div>
+</div>
+
+<div class="form-group">
+    <label class="control-label col-md-3 col-sm-3 col-xs-12">Tanggal SK Pemberhentian</label>
+
+    <div class="col-md-6 col-sm-6 col-xs-12">
+        {!! html()->date('tgl_sk_pemberhentian')->value(old('tgl_sk_pemberhentian', $anggota->tgl_sk_pemberhentian ?? ''))->class('form-control')->placeholder('Tanggal SK Pemberhentian') !!}
+    </div>
+</div>
+
+<div class="form-group">
+    <label class="control-label col-md-3 col-sm-3 col-xs-12">Masa Jabatan (Usia/Periode)</label>
+
+    <div class="col-md-6 col-sm-6 col-xs-12">
+        {!! html()->text('periode')->value(old('periode', $anggota->periode ?? ''))->class('form-control')->placeholder('Contoh: 6 Tahun Periode Pertama (2015 s/d 2021)') !!}
+    </div>
+</div>
+
+<div class="form-group">
+    <label class="control-label col-md-3 col-sm-3 col-xs-12">Keterangan</label>
+
+    <div class="col-md-6 col-sm-6 col-xs-12">
+        {!! html()->textarea('keterangan')->value(old('keterangan', $anggota->keterangan ?? ''))->class('form-control')->placeholder('Keterangan')->rows(2) !!}
+    </div>
+</div>
+
+<div class="ln_solid"></div>
+
+@include('partials.asset_jqueryvalidation')
+
+@push('scripts')
+    {!! JsValidator::formRequest('App\Http\Requests\UpdateLembagaAnggotaRequest', '#form-lembaga-anggota') !!}
+@endpush
diff --git a/resources/views/data/lembaga_anggota/index.blade.php b/resources/views/data/lembaga_anggota/index.blade.php
index a211db23d3..f2fe37317f 100644
--- a/resources/views/data/lembaga_anggota/index.blade.php
+++ b/resources/views/data/lembaga_anggota/index.blade.php
@@ -26,7 +26,7 @@
         <div class="box box-primary">
             <div class="box-header with-border">
                 @include('forms.btn-social', [
-                    'create_url' => auth()->user()->can('access.data.lembaga_anggota.create') ? route('data.lembaga_anggota.create', $lembaga->slug) : null,
+                    'create_url' => auth()->user()->can('access.data.lembaga.create') ? route('data.lembaga_anggota.create', $lembaga->slug) : null,
                 ])
             </div>
             <div class="box-body">
@@ -47,7 +47,7 @@
                         <tr>
                             <td>Ketua Lembaga</td>
                             <td>:</td>
-                            <td>{{ $lembaga->penduduk->nama }}</td>
+                            <td>{{ $lembaga->penduduk?->nama ?? ($lembaga->pendudukGabungan?->nama ?? '-') }}</td>
                         </tr>
                         <tr>
                             <td>Kategori Lembaga</td>
@@ -102,7 +102,6 @@
                 processing: true,
                 serverSide: false,
                 ordering: false,
-                scrollX: true,
                 ajax: "{!! route('data.lembaga_anggota.getdata', $lembaga->slug) !!}",
                 columns: [{
                         data: 'aksi',
diff --git a/resources/views/data/pembangunan/index.blade.php b/resources/views/data/pembangunan/index.blade.php
index 1e0886754a..544f3c2089 100644
--- a/resources/views/data/pembangunan/index.blade.php
+++ b/resources/views/data/pembangunan/index.blade.php
@@ -70,7 +70,10 @@
                     url: "{!! route('data.pembangunan.getdata') !!}",
                     type: "POST",
                     data: function(d) {
-                        d.desa = $('#list_desa').val();
+                        var desaId = $('#list_desa').val();
+                        if (desaId && desaId != 'Semua') {
+                            d.desa = desaId;
+                        }
                     }
                 },
                 columns: [{
diff --git a/resources/views/data/penduduk/index.blade.php b/resources/views/data/penduduk/index.blade.php
index 92b8abb723..801ac1fe82 100644
--- a/resources/views/data/penduduk/index.blade.php
+++ b/resources/views/data/penduduk/index.blade.php
@@ -72,7 +72,10 @@
                     url: "{!! route('data.penduduk.getdata') !!}",
                     type: "POST",
                     data: function(d) {
-                        d.desa = $('#list_desa').val();
+                        var desaId = $('#list_desa').val();
+                        if (desaId && desaId != 'Semua') {
+                            d.desa = desaId;
+                        }
                     }
                 },
                 columns: [{
diff --git a/resources/views/data/pengurus/index.blade.php b/resources/views/data/pengurus/index.blade.php
index c90bbf6381..e3be8e2488 100644
--- a/resources/views/data/pengurus/index.blade.php
+++ b/resources/views/data/pengurus/index.blade.php
@@ -4,6 +4,14 @@
     Data Pengurus
 @endsection
 
+@push('css')
+    <style>
+        .nowrap {
+            white-space: nowrap;
+        }
+    </style>
+@endpush
+
 @section('content')
     <section class="content-header block-breadcrumb">
         <h1>
@@ -44,18 +52,18 @@
                 </div>
                 <hr>
                 <div class="table-responsive">
-                    <table class="table table-striped table-bordered" id="pengurus-table">
+                    <table class="table nowrap table-striped table-bordered" id="pengurus-table" style="width: 100%">
                         <thead>
                             <tr>
-                                <th style="min-width: 170px;">Aksi</th>
-                                <th>Foto</th>
-                                <th style="min-width: 150px;">Nama, NIP, NIK</th>
-                                <th style="min-width: 150px;">Tempat, Tanggal Lahir</th>
+                                <th style="width: 80px;" class="text-center">Aksi</th>
+                                <th style="width: 60px;" class="text-center">Foto</th>
+                                <th style="min-width: 160px;">Nama, NIP, NIK</th>
+                                <th style="min-width: 160px;">Tempat, Tanggal Lahir</th>
                                 <th>Jenis Kelamin</th>
                                 <th>Agama</th>
                                 <th>Pangkat/Golongan</th>
                                 <th>Jabatan</th>
-                                <th>Status</th>
+                                <th style="width: 80px;" class="text-center">Status</th>
                                 <th>Pendidikan Terakhir</th>
                                 <th>No SK Pengangkatan</th>
                                 <th>Tanggal SK Pengangkatan</th>
@@ -79,6 +87,8 @@
             var data = $('#pengurus-table').DataTable({
                 processing: true,
                 serverSide: true,
+                scrollX: true,
+                autoWidth: false,
                 ajax: {
                     url: "{!! route('data.pengurus.getdata.post') !!}",
                     type: "POST",
@@ -130,7 +140,8 @@ class: 'text-center',
                     },
                     {
                         data: 'status',
-                        name: 'status'
+                        name: 'status',
+                        class: 'text-center'
                     },
                     {
                         data: 'pendidikan.nama',
@@ -163,6 +174,10 @@ class: 'text-center',
             $('#status').on('change', function(e) {
                 data.ajax.reload();
             });
+
+            $(window).on('resize', function() {
+                data.columns.adjust();
+            });
         });
     </script>
     @include('forms.datatable-vertical')
diff --git a/resources/views/data/program_bantuan/index.blade.php b/resources/views/data/program_bantuan/index.blade.php
index e0044707ec..2519b9123e 100644
--- a/resources/views/data/program_bantuan/index.blade.php
+++ b/resources/views/data/program_bantuan/index.blade.php
@@ -65,7 +65,10 @@
                     url: "{!! route('data.program-bantuan.getdata') !!}",
                     type: "POST",
                     data: function(d) {
-                        d.desa = $('#list_desa').val();
+                        var desaId = $('#list_desa').val();
+                        if (desaId && desaId != 'Semua') {
+                            d.desa = desaId;
+                        }
                     }
                 },
 
diff --git a/resources/views/data/putus_sekolah/import.blade.php b/resources/views/data/putus_sekolah/import.blade.php
index d8f671dad3..7e473d812c 100644
--- a/resources/views/data/putus_sekolah/import.blade.php
+++ b/resources/views/data/putus_sekolah/import.blade.php
@@ -20,7 +20,7 @@
 
                 {!! html()->form()->route('data.putus-sekolah.do_import')->method('POST')->id('form-import')->class(
                         'form-horizontal
-                                                                                                                                            form-label-left',
+                                                                                                                                                                                                                                            form-label-left',
                     )->acceptsFiles()->open() !!}
 
                 <div class="box-body">
@@ -43,11 +43,7 @@
                                 <label for="list_desa" class="control-label col-md-4 col-sm-3 col-xs-12">{{ config('setting.sebutan_desa') }}</label>
 
                                 <div class="col-md-8">
-                                    <select class="form-control" id="list_desa" name="desa_id">
-                                        @foreach (\App\Models\DataDesa::all() as $desa)
-                                            <option value="{{ $desa->desa_id }}">{{ $desa->nama }}</option>
-                                        @endforeach
-                                    </select>
+                                    @include('layouts.fragments.select-desa', ['selectAttributes' => ['name' => 'desa_id', 'data-width' => '100%', 'required' => 'required']])
                                 </div>
                             </div>
 
@@ -108,6 +104,7 @@
 @push('scripts')
     <script>
         $(function() {
+            $('#list_desa option[value="Semua"]').val('');
 
             function readURL(input) {
                 if (input.files && input.files[0]) {
diff --git a/resources/views/data/putus_sekolah/index.blade.php b/resources/views/data/putus_sekolah/index.blade.php
index 81be3ef242..65826f735f 100644
--- a/resources/views/data/putus_sekolah/index.blade.php
+++ b/resources/views/data/putus_sekolah/index.blade.php
@@ -61,7 +61,10 @@
                     url: "{!! route('data.putus-sekolah.getdata') !!}",
                     type: 'POST',
                     data: function(d) {
-                        d.desa = $('#list_desa').val();
+                        var desaId = $('#list_desa').val();
+                        if (desaId && desaId != 'Semua') {
+                            d.desa = desaId;
+                        }
                     }
                 },
                 columns: [{
@@ -72,7 +75,7 @@ class: 'text-center',
                         orderable: false
                     },
                     {
-                        data: 'desa.nama',
+                        data: 'nama_desa',
                         name: 'desa.nama'
                     },
                     {
diff --git a/resources/views/data/tingkat_pendidikan/import.blade.php b/resources/views/data/tingkat_pendidikan/import.blade.php
index 5f788c3afb..c4cc532289 100644
--- a/resources/views/data/tingkat_pendidikan/import.blade.php
+++ b/resources/views/data/tingkat_pendidikan/import.blade.php
@@ -20,7 +20,7 @@
 
                 {!! html()->form('POST', route('data.tingkat-pendidikan.do_import'))->id('form-import')->class(
                         'form-horizontal
-                                                                                                                                            form-label-left',
+                                                                                                                                                                                                                                            form-label-left',
                     )->acceptsFiles()->open() !!}
 
                 <div class="box-body">
@@ -43,11 +43,7 @@
                                 <label for="list_desa" class="control-label col-md-4 col-sm-3 col-xs-12">{{ config('setting.sebutan_desa') }}</label>
 
                                 <div class="col-md-8">
-                                    <select class="form-control" id="list_desa" name="desa_id">
-                                        @foreach (\App\Models\DataDesa::all() as $desa)
-                                            <option value="{{ $desa->desa_id }}">{{ $desa->nama }}</option>
-                                        @endforeach
-                                    </select>
+                                    @include('layouts.fragments.select-desa', ['selectAttributes' => ['name' => 'desa_id', 'data-width' => '100%', 'required' => 'required']])
                                 </div>
                             </div>
 
@@ -108,6 +104,7 @@
 @push('scripts')
     <script>
         $(function() {
+            $('#list_desa option[value="Semua"]').val('');
 
             function readURL(input) {
                 if (input.files && input.files[0]) {
diff --git a/resources/views/data/tingkat_pendidikan/index.blade.php b/resources/views/data/tingkat_pendidikan/index.blade.php
index bda5d58d63..38349bb155 100644
--- a/resources/views/data/tingkat_pendidikan/index.blade.php
+++ b/resources/views/data/tingkat_pendidikan/index.blade.php
@@ -59,7 +59,10 @@
                     url: "{!! route('data.tingkat-pendidikan.getdata') !!}",
                     type: 'POST',
                     data: function(d) {
-                        d.desa = $('#list_desa').val();
+                        var desaId = $('#list_desa').val();
+                        if (desaId && desaId != 'Semua') {
+                            d.desa = desaId;
+                        }
                     }
                 },
                 columns: [{
@@ -71,7 +74,7 @@ class: 'text-center',
                     },
                     // {data: 'id', id: 'id'},
                     {
-                        data: 'desa.nama',
+                        data: 'nama_desa',
                         name: 'desa.nama'
                     },
                     {
diff --git a/resources/views/data/toilet_sanitasi/form_edit.blade.php b/resources/views/data/toilet_sanitasi/form_edit.blade.php
index 0f0ee5387e..4fc0b8202b 100644
--- a/resources/views/data/toilet_sanitasi/form_edit.blade.php
+++ b/resources/views/data/toilet_sanitasi/form_edit.blade.php
@@ -2,20 +2,20 @@
     <label for="toilet" class="control-label col-md-4 col-sm-3 col-xs-12">Toilet <span class="required">*</span></label>
 
     <div class="col-md-6 col-sm-6 col-xs-12">
-        {!! html()->number('toilet', old('toilet'))->class('form-control')->required()->id('toilet') !!}
+        {!! html()->number('toilet', old('toilet', $toilet->toilet))->class('form-control')->required()->id('toilet') !!}
     </div>
 </div>
 <div class="form-group">
     <label for="sanitasi" class="control-label col-md-4 col-sm-3 col-xs-12">Sanitasi <span class="required">*</span></label>
 
     <div class="col-md-6 col-sm-6 col-xs-12">
-        {!! html()->number('sanitasi', old('sanitasi'))->class('form-control')->required()->id('sanitasi') !!}
+        {!! html()->number('sanitasi', old('sanitasi', $toilet->sanitasi))->class('form-control')->required()->id('sanitasi') !!}
     </div>
 </div>
 <div class="form-group">
     <label for="bulan" class="control-label col-md-4 col-sm-3 col-xs-12">Bulan</label>
 
-    <div class="col-md-8">
+    <div class="col-md-6 col-sm-6 col-xs-12">
         <select class="form-control" id="bulan" name="bulan">
             @foreach (months_list() as $key => $month)
                 @if ($toilet->bulan == $key)
@@ -31,7 +31,7 @@
 <div class="form-group">
     <label for="list_year" class="control-label col-md-4 col-sm-3 col-xs-12">Tahun</label>
 
-    <div class="col-md-8">
+    <div class="col-md-6 col-sm-6 col-xs-12">
         <select class="form-control" id="list_year" name="tahun">
             @foreach (years_list() as $year)
                 @if ($toilet->tahun == $year)
diff --git a/resources/views/data/toilet_sanitasi/import.blade.php b/resources/views/data/toilet_sanitasi/import.blade.php
index 4002aa89ce..5b41fcd1b1 100644
--- a/resources/views/data/toilet_sanitasi/import.blade.php
+++ b/resources/views/data/toilet_sanitasi/import.blade.php
@@ -33,7 +33,7 @@
                 <!-- form start -->
                 {!! html()->form('POST', route('data.toilet-sanitasi.do_import'))->id('form-import')->class(
                         'form-horizontal
-                                                                                                                                            form-label-left',
+                                                                                                                                                                                                                                            form-label-left',
                     )->acceptsFiles()->open() !!}
 
                 <div class="box-body">
@@ -95,6 +95,7 @@
 @push('scripts')
     <script>
         $(function() {
+            $('#list_desa option[value="Semua"]').val('');
 
             function readURL(input) {
                 if (input.files && input.files[0]) {
diff --git a/resources/views/data/toilet_sanitasi/index.blade.php b/resources/views/data/toilet_sanitasi/index.blade.php
index 9c2c7aecba..f779b03d60 100644
--- a/resources/views/data/toilet_sanitasi/index.blade.php
+++ b/resources/views/data/toilet_sanitasi/index.blade.php
@@ -54,7 +54,10 @@
                 ajax: {
                     url: "{!! route('data.toilet-sanitasi.getdata') !!}",
                     data: function(d) {
-                        d.desa = $('#list_desa').val();
+                        var desaId = $('#list_desa').val();
+                        if (desaId && desaId != 'Semua') {
+                            d.desa = desaId;
+                        }
                     }
                 },
                 columns: [{
@@ -91,7 +94,7 @@ class: 'text-center',
             });
 
             $('#list_desa').on('select2:select', function(e) {
-                data.columns(1).search(this.value).draw();
+                data.ajax.reload();
             });
         });
     </script>
diff --git a/resources/views/forms/btn-social.blade.php b/resources/views/forms/btn-social.blade.php
index ddf9bd401a..544b7e0a81 100644
--- a/resources/views/forms/btn-social.blade.php
+++ b/resources/views/forms/btn-social.blade.php
@@ -15,7 +15,7 @@
 @endif
 
 @if (isset($export_url))
-    <a href="{{ $export_url }}">
+    <a href="{{ $export_url }}" id="export-url">
         <button type="button" class="btn btn-primary btn-sm btn-social" title="{{ $export_text ?? 'Ekspor' }}">
             <i class="fa fa-upload"></i>{{ $export_text ?? 'Ekspor' }}
         </button>
diff --git a/resources/views/informasi/form_dokumen/form_edit.blade.php b/resources/views/informasi/form_dokumen/form_edit.blade.php
index 59aad21937..66b9e9992e 100644
--- a/resources/views/informasi/form_dokumen/form_edit.blade.php
+++ b/resources/views/informasi/form_dokumen/form_edit.blade.php
@@ -28,7 +28,7 @@
 <div class="form-group">
     <label class="control-label col-md-3 col-sm-3 col-xs-12">Unggah Dokumen</label>
     <div class="col-md-6 col-sm-6 col-xs-12">
-        {!! html()->file('file_dokumen')->class('form-control')->id('file_prosedur')->attribute('accept', '.jpeg,.png,.jpg,.gif,.svg,.xlsx,.xls,.doc,.docx,.pdf,.ppt,.pptx') !!}
+        {!! html()->file('file_dokumen')->class('form-control')->id('file_dokumen')->attribute('accept', '.jpeg,.png,.jpg,.gif,.svg,.xlsx,.xls,.doc,.docx,.pdf,.ppt,.pptx') !!}
         <br>
         @if (!empty($dokumen->file_dokumen))
             <a class="btn btn-sm btn-primary" href="{{ asset($dokumen->file_dokumen) }}">Download File</a>
diff --git a/resources/views/informasi/potensi/create.blade.php b/resources/views/informasi/potensi/create.blade.php
index 8b5e1fb5e8..7ef1e3d719 100644
--- a/resources/views/informasi/potensi/create.blade.php
+++ b/resources/views/informasi/potensi/create.blade.php
@@ -21,7 +21,7 @@
                         <!-- form start -->
                         {!! html()->form('POST', route('informasi.potensi.store'))->acceptsFiles()->id('form-potensi')->class(
                                 'form-horizontal
-                                                                                                                                                                                                                                            form-label-left',
+                                                                                                                                                                                                                                                                                                                                                                                            form-label-left',
                             )->open() !!}
 
                         @if (count($errors) > 0)
@@ -52,24 +52,39 @@
 @push('scripts')
     <script>
         $(function() {
-
-            var fileTypes = ['jpg', 'jpeg', 'png', 'bmp', 'gif'];
+            var fileTypes = ['jpg', 'jpeg', 'png', 'bmp', 'gif', 'pdf'];
+            var currentBlobUrl = null;
 
             function readURL(input) {
                 if (input.files && input.files[0]) {
-                    var extension = input.files[0].name.split('.').pop().toLowerCase();
+                    var file = input.files[0];
+                    var extension = file.name.split('.').pop().toLowerCase();
                     var isSuccess = fileTypes.indexOf(extension) > -1;
 
                     if (isSuccess) {
-                        var reader = new FileReader();
-                        reader.onload = function(e) {
-                            $('#showgambar').attr('src', e.target.result);
-                            $('#showgambar').removeClass('hide');
-                        };
-                        reader.readAsDataURL(input.files[0]);
+                        if (currentBlobUrl) {
+                            URL.revokeObjectURL(currentBlobUrl);
+                            currentBlobUrl = null;
+                        }
+
+                        currentBlobUrl = URL.createObjectURL(file);
+
+                        if (extension !== 'pdf') {
+                            $('#showgambar').attr('src', currentBlobUrl).removeClass('hide');
+                            $('#showpdf').addClass('hide').attr('src', '');
+                        } else {
+                            $('#showpdf').attr('src', currentBlobUrl + '#toolbar=1').removeClass('hide');
+                            $('#showgambar').addClass('hide').attr('src', '');
+                        }
                     } else {
                         $("#file_gambar").val('');
-                        alert('File tersebut tidak diperbolehkan.');
+                        if (currentBlobUrl) {
+                            URL.revokeObjectURL(currentBlobUrl);
+                            currentBlobUrl = null;
+                        }
+                        $('#showgambar').addClass('hide').attr('src', '');
+                        $('#showpdf').addClass('hide').attr('src', '');
+                        openAlert('File tersebut tidak diperbolehkan.', 'Peringatan', 'warning');
                     }
                 }
             }
diff --git a/resources/views/informasi/potensi/edit.blade.php b/resources/views/informasi/potensi/edit.blade.php
index 03ae88aeac..c0aaa84a94 100644
--- a/resources/views/informasi/potensi/edit.blade.php
+++ b/resources/views/informasi/potensi/edit.blade.php
@@ -51,24 +51,39 @@
 @push('scripts')
     <script>
         $(function() {
-
-            var fileTypes = ['jpg', 'jpeg', 'png', 'bmp', 'gif'];
+            var fileTypes = ['jpg', 'jpeg', 'png', 'bmp', 'gif', 'pdf'];
+            var currentBlobUrl = null;
 
             function readURL(input) {
                 if (input.files && input.files[0]) {
-                    var extension = input.files[0].name.split('.').pop().toLowerCase();
+                    var file = input.files[0];
+                    var extension = file.name.split('.').pop().toLowerCase();
                     var isSuccess = fileTypes.indexOf(extension) > -1;
 
                     if (isSuccess) {
-                        var reader = new FileReader();
-                        reader.onload = function(e) {
-                            $('#showgambar').attr('src', e.target.result);
-                            $('#showgambar').removeClass('hide');
-                        };
-                        reader.readAsDataURL(input.files[0]);
+                        if (currentBlobUrl) {
+                            URL.revokeObjectURL(currentBlobUrl);
+                            currentBlobUrl = null;
+                        }
+
+                        currentBlobUrl = URL.createObjectURL(file);
+
+                        if (extension !== 'pdf') {
+                            $('#showgambar').attr('src', currentBlobUrl).removeClass('hide');
+                            $('#showpdf').addClass('hide').attr('src', '');
+                        } else {
+                            $('#showpdf').attr('src', currentBlobUrl + '#toolbar=1').removeClass('hide');
+                            $('#showgambar').addClass('hide').attr('src', '');
+                        }
                     } else {
                         $("#file_gambar").val('');
-                        alert('File tersebut tidak diperbolehkan.');
+                        if (currentBlobUrl) {
+                            URL.revokeObjectURL(currentBlobUrl);
+                            currentBlobUrl = null;
+                        }
+                        $('#showgambar').addClass('hide').attr('src', '');
+                        $('#showpdf').addClass('hide').attr('src', '');
+                        openAlert('File tersebut tidak diperbolehkan.', 'Peringatan', 'warning');
                     }
                 }
             }
diff --git a/resources/views/informasi/potensi/form_create.blade.php b/resources/views/informasi/potensi/form_create.blade.php
index 445c1d4e35..57eae5b46d 100644
--- a/resources/views/informasi/potensi/form_create.blade.php
+++ b/resources/views/informasi/potensi/form_create.blade.php
@@ -23,13 +23,14 @@
     </div>
 </div>
 <div class="form-group">
-    <label class="control-label col-md-4 col-sm-3 col-xs-12">Gambar <span class="required">*</span></label>
+    <label class="control-label col-md-4 col-sm-3 col-xs-12">File Potensi <span class="required">*</span></label>
     <div class="col-md-5 col-sm-5 col-xs-12">
-        <input type="file" name="file_gambar" id="file_gambar" class="form-control" required accept=".jpg,.jpeg,.png,.bmp,.gif">
-        <x-upload-hint formats="JPG, JPEG, PNG, BMP, GIF" :limit-kb="1024" />
+        <input type="file" name="file_gambar" id="file_gambar" class="form-control" required accept=".jpg,.jpeg,.png,.bmp,.gif,.pdf">
+        <x-upload-hint formats="JPG, JPEG, PNG, BMP, GIF, PDF" :limit-kb="1024" />
         <div class="clearfix"></div>
         <br>
         <img class="hide" id="showgambar" style="max-width:400px;max-height:250px;float:left;" />
+        <iframe src="" class="showpdf hide" id="showpdf" style="width: 100%; height: 400px; border: none;"></iframe>
     </div>
 </div>
 
diff --git a/resources/views/informasi/potensi/form_edit.blade.php b/resources/views/informasi/potensi/form_edit.blade.php
index a96ecf81e4..c4ae777d40 100644
--- a/resources/views/informasi/potensi/form_edit.blade.php
+++ b/resources/views/informasi/potensi/form_edit.blade.php
@@ -23,10 +23,10 @@
     </div>
 </div>
 <div class="form-group">
-    <label class="control-label col-md-4 col-sm-3 col-xs-12">Gambar</label>
+    <label class="control-label col-md-4 col-sm-3 col-xs-12">File Potensi</label>
     <div class="col-md-5 col-sm-6 col-xs-12">
-        <input type="file" name="file_gambar" id="file_gambar" class="form-control" accept=".jpg,.jpeg,.png,.bmp,.gif">
-        <x-upload-hint formats="JPG, JPEG, PNG, BMP, GIF" :limit-kb="1024" />
+        <input type="file" name="file_gambar" id="file_gambar" class="form-control" accept=".jpg,.jpeg,.png,.bmp,.gif,.pdf">
+        <x-upload-hint formats="JPG, JPEG, PNG, BMP, GIF, PDF" :limit-kb="1024" />
         <br />
 
         @if (isset($potensi->file_gambar) && $potensi->file_gambar)
@@ -34,7 +34,11 @@
                 $fileName = basename($potensi->file_gambar);
             @endphp
             <div style="padding:8px; background:#f5f5f5; border-radius:4px; margin-bottom:8px; display:flex; align-items:center; gap:10px;">
-                <img src="{{ is_img(str_replace('//', '/', $potensi->file_gambar)) }}" style="max-height:60px; max-width:90px; object-fit:contain; border-radius:3px;" class="img-thumbnail">
+                @if ($potensi->is_pdf)
+                    <i class="fa fa-file-pdf-o fa-2x text-danger"></i>
+                @else
+                    <img src="{{ is_img(str_replace('//', '/', $potensi->file_gambar)) }}" style="max-height:60px; max-width:90px; object-fit:contain; border-radius:3px;" class="img-thumbnail">
+                @endif
                 <div style="overflow: hidden;">
                     <span class="text-muted" style="word-break: break-all;">{{ $fileName }}</span><br>
                     <a href="{{ route('informasi.potensi.download', $potensi->id) }}" class="btn btn-xs btn-default" style="margin-top: 4px;">
@@ -43,13 +47,14 @@
                 </div>
             </div>
             <small class="help-block text-muted">
-                Upload gambar baru di atas untuk menggantikan gambar yang ada.
+                Upload file baru di atas untuk menggantikan file yang ada.
             </small>
         @endif
 
         <div class="clearfix"></div>
         <br>
         <img class="hide" id="showgambar" style="max-width:400px;max-height:250px;float:left;" />
+        <iframe src="" class="showpdf hide" id="showpdf" style="width: 100%; height: 400px; border: none;"></iframe>
     </div>
 </div>
 
diff --git a/resources/views/informasi/potensi/show.blade.php b/resources/views/informasi/potensi/show.blade.php
index b3d0f888a7..96e62a4dd1 100644
--- a/resources/views/informasi/potensi/show.blade.php
+++ b/resources/views/informasi/potensi/show.blade.php
@@ -21,6 +21,11 @@
                             <button type="button" class="btn btn-default btn-sm"><i class="fa fa-arrow-left"></i>&nbsp;
                                 Kembali</button>
                         </a>
+                        @if (!empty($potensi->file_gambar))
+                            <a href="{{ route('informasi.potensi.download', $potensi->id) }}" class="btn btn-sm btn-info">
+                                <i class="fa fa-download"></i>&nbsp; Unduh
+                            </a>
+                        @endif
                         <a href="{!! route('informasi.potensi.edit', $potensi->id) !!}" class="btn btn-sm btn-primary" title="Ubah" data-button="edit"><i class="fa fa-edit"></i>&nbsp; Ubah</a>
 
                         <a href="javascript:void(0)" class="" title="Hapus" data-href="{!! route('informasi.potensi.destroy', $potensi->id) !!}" data-button="delete" id="deleteModal">
@@ -32,7 +37,15 @@
                         <!-- form start -->
                         <div class="row overflow-x">
                             <div class="col-md-12">
-                                <img src="{{ is_img(str_replace('//', '/', $potensi->file_gambar)) }}" width="100%">
+                                @if (!empty($potensi->file_gambar))
+                                    @if ($potensi->is_pdf)
+                                        <iframe src="{{ asset($potensi->file_gambar) }}#toolbar=1" class="showpdf" id="showpdf" style="width: 100%; height: 750px; border: 1px solid #e0e0e0; border-radius: 4px;" frameborder="0">
+                                            <p>Browser Anda tidak mendukung preview PDF langsung. <a href="{{ route('informasi.potensi.download', $potensi->id) }}">Klik di sini untuk mengunduh</a>.</p>
+                                        </iframe>
+                                    @else
+                                        <img src="{{ is_img(str_replace('//', '/', $potensi->file_gambar)) }}" class="img-responsive" style="max-width: 100%; margin: 0 auto; display: block;">
+                                    @endif
+                                @endif
                             </div>
                             <div class="col-md-12">
                                 <h3>{{ $potensi->nama_potensi }}</h3>
diff --git a/resources/views/informasi/prosedur/create.blade.php b/resources/views/informasi/prosedur/create.blade.php
index 13a874fe45..16dc932e19 100644
--- a/resources/views/informasi/prosedur/create.blade.php
+++ b/resources/views/informasi/prosedur/create.blade.php
@@ -21,7 +21,7 @@
                         <!-- form start -->
                         {!! html()->form('POST', route('informasi.prosedur.store'))->acceptsFiles()->id('form-prosedur')->class(
                                 'form-horizontal
-                                                                                                                                                                                                                                            form-label-left',
+                                                                                                                                                                                                                                                                                                                                                                                            form-label-left',
                             )->open() !!}
 
                         @if (count($errors) > 0)
@@ -52,35 +52,38 @@
 @push('scripts')
     <script>
         $(function() {
-
-            var fileTypes = ['jpg', 'jpeg', 'png', 'bmp', 'pdf']; //acceptable file types
+            var fileTypes = ['jpg', 'jpeg', 'png', 'gif', 'bmp', 'pdf'];
+            var currentBlobUrl = null;
 
             function readURL(input) {
                 if (input.files && input.files[0]) {
-                    var extension = input.files[0].name.split('.').pop()
-                        .toLowerCase(), //file extension from input file
-                        isSuccess = fileTypes.indexOf(extension) > -1; //is extension in acceptable types
+                    var file = input.files[0];
+                    var extension = file.name.split('.').pop().toLowerCase();
+                    var isSuccess = fileTypes.indexOf(extension) > -1;
 
-                    if (isSuccess) { //yes
-                        var reader = new FileReader();
-                        reader.onload = function(e) {
+                    if (isSuccess) {
+                        if (currentBlobUrl) {
+                            URL.revokeObjectURL(currentBlobUrl);
+                            currentBlobUrl = null;
+                        }
 
-                            if (extension != 'pdf') {
-                                $('#showgambar').attr('src', e.target.result);
-                                $('#showgambar').removeClass('hide');
-                                $('#showpdf').addClass('hide');
-                            } else {
-                                $('#showpdf').attr('src', e.target.result + '#toolbar=1');
-                                $('#showpdf').removeClass('hide');
-                                $('#showgambar').addClass('hide');
-                            }
+                        currentBlobUrl = URL.createObjectURL(file);
 
+                        if (extension !== 'pdf') {
+                            $('#showgambar').attr('src', currentBlobUrl).removeClass('hide');
+                            $('#showpdf').addClass('hide').attr('src', '');
+                        } else {
+                            $('#showpdf').attr('src', currentBlobUrl + '#toolbar=1').removeClass('hide');
+                            $('#showgambar').addClass('hide').attr('src', '');
                         }
-
-                        reader.readAsDataURL(input.files[0]);
-                    } else { //no
-                        //warning
+                    } else {
                         $("#file_prosedur").val('');
+                        if (currentBlobUrl) {
+                            URL.revokeObjectURL(currentBlobUrl);
+                            currentBlobUrl = null;
+                        }
+                        $('#showgambar').addClass('hide').attr('src', '');
+                        $('#showpdf').addClass('hide').attr('src', '');
                         openAlert('File tersebut tidak diperbolehkan.', 'Peringatan', 'warning');
                     }
                 }
diff --git a/resources/views/informasi/prosedur/edit.blade.php b/resources/views/informasi/prosedur/edit.blade.php
index 17a4b733d5..948dee55bf 100644
--- a/resources/views/informasi/prosedur/edit.blade.php
+++ b/resources/views/informasi/prosedur/edit.blade.php
@@ -50,35 +50,38 @@
 @push('scripts')
     <script>
         $(function() {
-
-            var fileTypes = ['jpg', 'jpeg', 'png', 'bmp', 'pdf']; //acceptable file types
+            var fileTypes = ['jpg', 'jpeg', 'png', 'gif', 'bmp', 'pdf'];
+            var currentBlobUrl = null;
 
             function readURL(input) {
                 if (input.files && input.files[0]) {
-                    var extension = input.files[0].name.split('.').pop()
-                        .toLowerCase(), //file extension from input file
-                        isSuccess = fileTypes.indexOf(extension) > -1; //is extension in acceptable types
+                    var file = input.files[0];
+                    var extension = file.name.split('.').pop().toLowerCase();
+                    var isSuccess = fileTypes.indexOf(extension) > -1;
 
-                    if (isSuccess) { //yes
-                        var reader = new FileReader();
-                        reader.onload = function(e) {
+                    if (isSuccess) {
+                        if (currentBlobUrl) {
+                            URL.revokeObjectURL(currentBlobUrl);
+                            currentBlobUrl = null;
+                        }
 
-                            if (extension != 'pdf') {
-                                $('#showgambar').attr('src', e.target.result);
-                                $('#showgambar').removeClass('hide');
-                                $('#showpdf').addClass('hide');
-                            } else {
-                                $('#showpdf').attr('src', e.target.result + '#toolbar=1');
-                                $('#showpdf').removeClass('hide');
-                                $('#showgambar').addClass('hide');
-                            }
+                        currentBlobUrl = URL.createObjectURL(file);
 
+                        if (extension !== 'pdf') {
+                            $('#showgambar').attr('src', currentBlobUrl).removeClass('hide');
+                            $('#showpdf').addClass('hide').attr('src', '');
+                        } else {
+                            $('#showpdf').attr('src', currentBlobUrl + '#toolbar=1').removeClass('hide');
+                            $('#showgambar').addClass('hide').attr('src', '');
                         }
-
-                        reader.readAsDataURL(input.files[0]);
-                    } else { //no
-                        //warning
+                    } else {
                         $("#file_prosedur").val('');
+                        if (currentBlobUrl) {
+                            URL.revokeObjectURL(currentBlobUrl);
+                            currentBlobUrl = null;
+                        }
+                        $('#showgambar').addClass('hide').attr('src', '');
+                        $('#showpdf').addClass('hide').attr('src', '');
                         openAlert('File tersebut tidak diperbolehkan.', 'Peringatan', 'warning');
                     }
                 }
diff --git a/resources/views/informasi/prosedur/index.blade.php b/resources/views/informasi/prosedur/index.blade.php
index 7d4b007fd2..2d2fa0f14b 100644
--- a/resources/views/informasi/prosedur/index.blade.php
+++ b/resources/views/informasi/prosedur/index.blade.php
@@ -74,17 +74,8 @@ class: 'text-center text-nowrap',
                     [1, 'asc']
                 ]
             });
-            // Event untuk tombol pratinjau
-            $(document).on('click', '.btn-preview-surat', function(e) {
-                e.preventDefault();
-                var url = $(this).data('url');
-                $('#modalPreviewSuratLabel').text('Pratinjau');
-                $('#modalPreviewSurat .modal-body').html('<iframe src="' + url + '" width="100%" height="500px" style="border:none;"></iframe>');
-                $('#modalPreviewSurat').modal('show');
-            });
         });
     </script>
-    @include('components.modal-preview-surat')
     @include('forms.datatable-vertical')
     @include('forms.delete-modal')
 @endpush
diff --git a/resources/views/informasi/prosedur/show.blade.php b/resources/views/informasi/prosedur/show.blade.php
index 291de99051..d9a2486f2f 100644
--- a/resources/views/informasi/prosedur/show.blade.php
+++ b/resources/views/informasi/prosedur/show.blade.php
@@ -18,21 +18,28 @@
                 <div class="box box-primary">
                     <div class="box-header with-border">
                         <a href="{{ route('informasi.prosedur.index') }}">
-                            <button type="button" class="btn btn-primary btn-sm"><i class="fa fa-arrow-left"></i>&nbsp;
+                            <button type="button" class="btn btn-default btn-sm"><i class="fa fa-arrow-left"></i>&nbsp;
                                 Kembali</button>
                         </a>
+                        @if (!empty($prosedur->file_prosedur))
+                            <a href="{{ route('informasi.prosedur.download', $prosedur->id) }}" class="btn btn-primary btn-sm">
+                                <i class="fa fa-download"></i>&nbsp; Unduh
+                            </a>
+                        @endif
                     </div>
                     <!-- /.box-header -->
                     <div class="box-body">
                         <!-- form start -->
                         <div class="row overflow-x">
                             <div class="col-md-12">
-                                @if (isset($prosedur->file_prosedur) && $prosedur->mime_type != 'pdf')
-                                    <img src="{{ asset($prosedur->file_prosedur) }}" width="100%">
-                                @endif
-
-                                @if (isset($prosedur->file_prosedur) && $prosedur->mime_type == 'pdf')
-                                    <object data="@if (isset($prosedur->file_prosedur)) {{ asset($prosedur->file_prosedur . '#toolbar=1') }} @endif" type="application/pdf" class="showpdf" id="showpdf"> </object>
+                                @if (!empty($prosedur->file_prosedur))
+                                    @if ($prosedur->is_pdf)
+                                        <iframe src="{{ asset($prosedur->file_prosedur) }}#toolbar=1" class="showpdf" id="showpdf" style="width: 100%; height: 750px; border: 1px solid #e0e0e0; border-radius: 4px;" frameborder="0">
+                                            <p>Browser Anda tidak mendukung preview PDF langsung. <a href="{{ route('informasi.prosedur.download', $prosedur->id) }}">Klik di sini untuk mengunduh</a>.</p>
+                                        </iframe>
+                                    @else
+                                        <img src="{{ asset($prosedur->file_prosedur) }}" class="img-responsive" style="max-width: 100%; margin: 0 auto; display: block;">
+                                    @endif
                                 @endif
                             </div>
                         </div>
diff --git a/resources/views/informasi/regulasi/form_create.blade.php b/resources/views/informasi/regulasi/form_create.blade.php
index 7aacb9cc3e..d9a8ae8cf8 100644
--- a/resources/views/informasi/regulasi/form_create.blade.php
+++ b/resources/views/informasi/regulasi/form_create.blade.php
@@ -19,20 +19,12 @@
 <div class="form-group">
     <label class="control-label col-md-3 col-sm-3 col-xs-12">File Regulasi <span class="required">*</span></label>
     <div class="col-md-6 col-sm-6 col-xs-12">
-        <input accept="image/*, application/pdf" type="file" id="file_regulasi" name="file_regulasi" class="form-control" required>
+        <input accept=".jpg,.jpeg,.png,.gif,.pdf" type="file" id="file_regulasi" name="file_regulasi" class="form-control" required>
+        <x-upload-hint formats="JPG, JPEG, PNG, GIF, PDF" />
+        <div class="clearfix"></div>
         <br>
-
-        @if (isset($regulasi->file_regulasi) && $regulasi->mime_type != 'pdf')
-            <img class="" src="@if (isset($regulasi->file_regulasi)) {{ asset($regulasi->file_regulasi) }} @else {{ 'http://placehold.co/1000x600' }} @endif" id="showgambar" style="max-width:400px;max-height:250px;float:left;" />
-        @endif
-
-        @if (isset($regulasi->file_regulasi) && $regulasi->mime_type == 'pdf')
-            <object data="@if (isset($regulasi->file_regulasi)) {{ asset($regulasi->file_regulasi . '#toolbar=1') }} @endif" type="application/pdf" class="showpdf" id="showpdf"> </object>
-        @endif
-
-        <img class="hide" src="@if (isset($regulasi->file_regulasi)) {{ asset($regulasi->file_regulasi) }} @else {{ 'http://placehold.co/1000x600' }} @endif" id="showgambar" style="max-width:400px;max-height:250px;float:left;" />
-
-        <object data="@if (isset($regulasi->file_regulasi)) {{ asset($regulasi->file_regulasi . '#toolbar=1') }} @endif" type="application/pdf" class="showpdf hide" id="showpdf"> </object>
+        <img class="hide" id="showgambar" style="max-width:400px;max-height:250px;float:left;" />
+        <iframe src="" class="showpdf hide" id="showpdf" style="width: 100%; height: 400px; border: none;"></iframe>
     </div>
 </div>
 
@@ -45,34 +37,38 @@
 
     <script>
         $(function() {
-
-            var fileTypes = ['jpg', 'jpeg', 'png', 'bmp', 'pdf']; //acceptable file types
+            var fileTypes = ['jpg', 'jpeg', 'png', 'gif', 'pdf'];
+            var currentBlobUrl = null;
 
             function readURL(input) {
                 if (input.files && input.files[0]) {
-                    var extension = input.files[0].name.split('.').pop().toLowerCase(), //file extension from input file
-                        isSuccess = fileTypes.indexOf(extension) > -1; //is extension in acceptable types
+                    var file = input.files[0];
+                    var extension = file.name.split('.').pop().toLowerCase();
+                    var isSuccess = fileTypes.indexOf(extension) > -1;
 
-                    if (isSuccess) { //yes
-                        var reader = new FileReader();
-                        reader.onload = function(e) {
+                    if (isSuccess) {
+                        if (currentBlobUrl) {
+                            URL.revokeObjectURL(currentBlobUrl);
+                            currentBlobUrl = null;
+                        }
 
-                            if (extension != 'pdf') {
-                                $('#showgambar').attr('src', e.target.result);
-                                $('#showgambar').removeClass('hide');
-                                $('#showpdf').addClass('hide');
-                            } else {
-                                $('#showpdf').attr('data', e.target.result + '#toolbar=1');
-                                $('#showpdf').removeClass('hide');
-                                $('#showgambar').addClass('hide');
-                            }
+                        currentBlobUrl = URL.createObjectURL(file);
 
+                        if (extension !== 'pdf') {
+                            $('#showgambar').attr('src', currentBlobUrl).removeClass('hide');
+                            $('#showpdf').addClass('hide').attr('src', '');
+                        } else {
+                            $('#showpdf').attr('src', currentBlobUrl + '#toolbar=1').removeClass('hide');
+                            $('#showgambar').addClass('hide').attr('src', '');
                         }
-
-                        reader.readAsDataURL(input.files[0]);
-                    } else { //no
-                        //warning
+                    } else {
                         $("#file_regulasi").val('');
+                        if (currentBlobUrl) {
+                            URL.revokeObjectURL(currentBlobUrl);
+                            currentBlobUrl = null;
+                        }
+                        $('#showgambar').addClass('hide').attr('src', '');
+                        $('#showpdf').addClass('hide').attr('src', '');
                         openAlert('File tersebut tidak diperbolehkan.', 'Peringatan', 'warning');
                     }
                 }
diff --git a/resources/views/informasi/regulasi/form_update.blade.php b/resources/views/informasi/regulasi/form_update.blade.php
index 9b34e95fa5..482ba1f7d9 100644
--- a/resources/views/informasi/regulasi/form_update.blade.php
+++ b/resources/views/informasi/regulasi/form_update.blade.php
@@ -19,20 +19,33 @@
 <div class="form-group">
     <label class="control-label col-md-3 col-sm-3 col-xs-12">File Regulasi <span class="required">*</span></label>
     <div class="col-md-6 col-sm-6 col-xs-12">
-        <input accept="image/*, application/pdf" type="file" id="file_regulasi" name="file_regulasi" class="form-control">
-        <br>
-
-        @if (isset($regulasi->file_regulasi) && $regulasi->mime_type != 'pdf')
-            <img class="" src="@if (isset($regulasi->file_regulasi)) {{ asset($regulasi->file_regulasi) }} @else {{ 'http://placehold.co/1000x600' }} @endif" id="showgambar" style="max-width:400px;max-height:250px;float:left;" />
-        @endif
+        <input accept=".jpg,.jpeg,.png,.gif,.pdf" type="file" id="file_regulasi" name="file_regulasi" class="form-control">
+        <x-upload-hint formats="JPG, JPEG, PNG, GIF, PDF" />
+        <br />
 
-        @if (isset($regulasi->file_regulasi) && $regulasi->mime_type == 'pdf')
-            <object data="@if (isset($regulasi->file_regulasi)) {{ asset($regulasi->file_regulasi . '#toolbar=1') }} @endif" type="application/pdf" class="showpdf" id="showpdf"> </object>
+        @if (isset($regulasi->file_regulasi))
+            <div style="padding:8px; background:#f5f5f5; border-radius:4px; margin-bottom:8px; display:flex; align-items:center; gap:10px;">
+                @if ($regulasi->is_pdf)
+                    <i class="fa fa-file-pdf-o fa-2x text-danger"></i>
+                @else
+                    <img src="{{ asset($regulasi->file_regulasi) }}" style="max-height:60px; max-width:90px; object-fit:contain; border-radius:3px;" class="img-thumbnail">
+                @endif
+                <div style="overflow: hidden;">
+                    <span class="text-muted" style="word-break: break-all;">{{ basename($regulasi->file_regulasi) }}</span><br>
+                    <a href="{{ route('informasi.regulasi.download', $regulasi->id) }}" class="btn btn-xs btn-default" style="margin-top: 4px;">
+                        <i class="fa fa-download"></i> Unduh
+                    </a>
+                </div>
+            </div>
+            <small class="help-block text-muted">
+                Upload file baru di atas untuk menggantikan file yang ada.
+            </small>
         @endif
 
-        <img class="hide" src="@if (isset($regulasi->file_regulasi)) {{ asset($regulasi->file_regulasi) }} @else {{ 'http://placehold.co/1000x600' }} @endif" id="showgambar" style="max-width:400px;max-height:250px;float:left;" />
-
-        <object data="@if (isset($regulasi->file_regulasi)) {{ asset($regulasi->file_regulasi . '#toolbar=1') }} @endif" type="application/pdf" class="showpdf hide" id="showpdf"> </object>
+        <div class="clearfix"></div>
+        <br>
+        <img class="hide" id="showgambar" style="max-width:400px;max-height:250px;float:left;" />
+        <iframe src="" class="showpdf hide" id="showpdf" style="width: 100%; height: 400px; border: none;"></iframe>
     </div>
 </div>
 
@@ -45,34 +58,38 @@
 
     <script>
         $(function() {
-
-            var fileTypes = ['jpg', 'jpeg', 'png', 'bmp', 'pdf']; //acceptable file types
+            var fileTypes = ['jpg', 'jpeg', 'png', 'gif', 'pdf'];
+            var currentBlobUrl = null;
 
             function readURL(input) {
                 if (input.files && input.files[0]) {
-                    var extension = input.files[0].name.split('.').pop().toLowerCase(), //file extension from input file
-                        isSuccess = fileTypes.indexOf(extension) > -1; //is extension in acceptable types
+                    var file = input.files[0];
+                    var extension = file.name.split('.').pop().toLowerCase();
+                    var isSuccess = fileTypes.indexOf(extension) > -1;
 
-                    if (isSuccess) { //yes
-                        var reader = new FileReader();
-                        reader.onload = function(e) {
+                    if (isSuccess) {
+                        if (currentBlobUrl) {
+                            URL.revokeObjectURL(currentBlobUrl);
+                            currentBlobUrl = null;
+                        }
 
-                            if (extension != 'pdf') {
-                                $('#showgambar').attr('src', e.target.result);
-                                $('#showgambar').removeClass('hide');
-                                $('#showpdf').addClass('hide');
-                            } else {
-                                $('#showpdf').attr('data', e.target.result + '#toolbar=1');
-                                $('#showpdf').removeClass('hide');
-                                $('#showgambar').addClass('hide');
-                            }
+                        currentBlobUrl = URL.createObjectURL(file);
 
+                        if (extension !== 'pdf') {
+                            $('#showgambar').attr('src', currentBlobUrl).removeClass('hide');
+                            $('#showpdf').addClass('hide').attr('src', '');
+                        } else {
+                            $('#showpdf').attr('src', currentBlobUrl + '#toolbar=1').removeClass('hide');
+                            $('#showgambar').addClass('hide').attr('src', '');
                         }
-
-                        reader.readAsDataURL(input.files[0]);
-                    } else { //no
-                        //warning
+                    } else {
                         $("#file_regulasi").val('');
+                        if (currentBlobUrl) {
+                            URL.revokeObjectURL(currentBlobUrl);
+                            currentBlobUrl = null;
+                        }
+                        $('#showgambar').addClass('hide').attr('src', '');
+                        $('#showpdf').addClass('hide').attr('src', '');
                         openAlert('File tersebut tidak diperbolehkan.', 'Peringatan', 'warning');
                     }
                 }
diff --git a/resources/views/informasi/regulasi/show.blade.php b/resources/views/informasi/regulasi/show.blade.php
index 243296d596..9f89d422f7 100644
--- a/resources/views/informasi/regulasi/show.blade.php
+++ b/resources/views/informasi/regulasi/show.blade.php
@@ -18,9 +18,14 @@
                 <div class="box box-primary">
                     <div class="box-header with-border">
                         <a href="{{ route('informasi.regulasi.index') }}">
-                            <button type="button" class="btn btn-primary btn-sm"><i class="fa fa-arrow-left"></i>&nbsp;
+                            <button type="button" class="btn btn-default btn-sm"><i class="fa fa-arrow-left"></i>&nbsp;
                                 Kembali</button>
                         </a>
+                        @if (!empty($regulasi->file_regulasi))
+                            <a href="{{ route('informasi.regulasi.download', $regulasi->id) }}" class="btn btn-primary btn-sm">
+                                <i class="fa fa-download"></i>&nbsp; Unduh
+                            </a>
+                        @endif
                     </div>
                     <!-- /.box-header -->
                     <div class="box-body">
@@ -29,13 +34,15 @@
                             <div class="col-md-12">
                                 <label>Deskripsi : </label>
                                 <p>{{ $regulasi->deskripsi }}</p>
-                                </hr>
-                                @if (isset($regulasi->file_regulasi) && $regulasi->mime_type != 'pdf')
-                                    <img src="{{ asset($regulasi->file_regulasi) }}" width="100%">
-                                @endif
-
-                                @if (isset($regulasi->file_regulasi) && $regulasi->mime_type == 'pdf')
-                                    <object data="@if (isset($regulasi->file_regulasi)) {{ asset($regulasi->file_regulasi . '#toolbar=1') }} @endif" type="application/pdf" class="showpdf" id="showpdf"> </object>
+                                <hr>
+                                @if (!empty($regulasi->file_regulasi))
+                                    @if ($regulasi->is_pdf)
+                                        <iframe src="{{ asset($regulasi->file_regulasi) }}#toolbar=1" class="showpdf" id="showpdf" style="width: 100%; height: 750px; border: 1px solid #e0e0e0; border-radius: 4px;" frameborder="0">
+                                            <p>Browser Anda tidak mendukung preview PDF langsung. <a href="{{ route('informasi.regulasi.download', $regulasi->id) }}">Klik di sini untuk mengunduh</a>.</p>
+                                        </iframe>
+                                    @else
+                                        <img src="{{ asset($regulasi->file_regulasi) }}" class="img-responsive" style="max-width: 100%; margin: 0 auto; display: block;">
+                                    @endif
                                 @endif
                             </div>
                         </div>
diff --git a/resources/views/partials/asset_leaflet.blade.php b/resources/views/partials/asset_leaflet.blade.php
index 9aa3278ccf..b18ad0e05d 100644
--- a/resources/views/partials/asset_leaflet.blade.php
+++ b/resources/views/partials/asset_leaflet.blade.php
@@ -21,6 +21,15 @@
         var layers = {};
 
         function showPolygon(wilayah, layerpeta, warna = '#ffffff') {
+            if (typeof wilayah === 'string' || typeof wilayah === 'number') {
+                try {
+                    wilayah = JSON.parse(wilayah);
+                } catch (e) {
+                    return;
+                }
+            }
+            if (!wilayah || wilayah.length === 0) return;
+
             var area_wilayah = JSON.parse(JSON.stringify(wilayah));
             var bounds = new Array();
 
@@ -68,7 +77,9 @@ function showPolygon(wilayah, layerpeta, warna = '#ffffff') {
                 path.push(layer._latlngs);
             }
 
-            layerpeta.fitBounds(bounds);
+            if (bounds.length > 0) {
+                layerpeta.fitBounds(bounds);
+            }
             document.getElementById("path").value = getLatLong("multi", path).toString();
 
         }
diff --git a/resources/views/pesan/compose_pesan.blade.php b/resources/views/pesan/compose_pesan.blade.php
index c5e39e053f..c1ec36f87c 100644
--- a/resources/views/pesan/compose_pesan.blade.php
+++ b/resources/views/pesan/compose_pesan.blade.php
@@ -28,7 +28,7 @@
                     <div class="box-body">
                         <div class="form-group">
                             <label>Kirim ke {{ config('setting.sebutan_desa') }}</label>
-                            {!! html()->select('das_data_desa_id', $list_desa->pluck('nama', 'desa_id'), null)->placeholder('pilih desa')->class('form-control')->id('list_desa')->required() !!}
+                            @include('layouts.fragments.select-desa', ['selectAttributes' => ['required' => 'required', 'name' => 'das_data_desa_id']])
                         </div>
                         <div class="form-group">
                             <label>Subject</label>
@@ -57,13 +57,6 @@
 @include('partials.asset_select2')
 @push('scripts')
     <script type="text/javascript">
-        $(document).ready(function() {
-            $('#list_desa').select2({
-                placeholder: "Pilih {{ config('setting.sebutan_desa') }}",
-                allowClear: true
-            });
-        });
-
         tinymce.init({
             selector: 'textarea',
             height: 500,
diff --git a/resources/views/pesan/keluar/index.blade.php b/resources/views/pesan/keluar/index.blade.php
index fd377c1bc1..75dafd2d27 100644
--- a/resources/views/pesan/keluar/index.blade.php
+++ b/resources/views/pesan/keluar/index.blade.php
@@ -26,7 +26,7 @@
                             <div class="row">
                                 <div class="col-md-6">
                                     {!! html()->form()->route('pesan.keluar')->method('get')->id('form-search-desa')->open() !!}
-                                    {!! html()->select('das_data_desa_id', $list_desa->pluck('nama', 'id'), $desa_id)->placeholder('pilih desa')->class('form-control')->id('list_desa')->required() !!}
+                                    @include('layouts.fragments.select-desa', ['selectAttributes' => ['name' => 'das_data_desa_id'], 'selectedOption' => $desa_id])
                                     {!! html()->form()->close() !!}
                                 </div>
                                 <div class="col-md-6">
diff --git a/resources/views/publikasi/album/_form.blade.php b/resources/views/publikasi/album/_form.blade.php
index 964862c765..410b8d5e92 100644
--- a/resources/views/publikasi/album/_form.blade.php
+++ b/resources/views/publikasi/album/_form.blade.php
@@ -22,7 +22,7 @@
             <div class="box-body">
                 <div class="form-group">
                     <label class="control-label" for="thumbnail">Thumbnail</label>
-                    <img src="{{ isThumbnail(isset($album->gambar) ? " publikasi/album/{$album->gambar}" : null) }}" id="showthumbnail" style="width:100%; max-height:250px; float:left;" />
+                    <img src="{{ isThumbnail(isset($album->gambar) ? "publikasi/album/{$album->gambar}" : null) }}" id="showthumbnail" style="width:100%; max-height:250px; float:left;" />
 
                     {!! html()->file('gambar')->class('form-control')->id('file-album')->attribute('accept', '.jpg,.jpeg,.png') !!}
                     @if ($errors->has('gambar'))
diff --git a/resources/views/publikasi/galeri/_form.blade.php b/resources/views/publikasi/galeri/_form.blade.php
index 948b1d902d..e729ce8644 100644
--- a/resources/views/publikasi/galeri/_form.blade.php
+++ b/resources/views/publikasi/galeri/_form.blade.php
@@ -1,8 +1,10 @@
+@use(App\Enums\TipeMedia)
+
 <div class="row">
     <div class="col-md-9">
         <div class="box box-primary">
             <div class="box-header with-border">
-                <a href="javascript:history.back()"><button type="button" class="btn btn-info btn-sm"><i class="fa fa-arrow-left"></i> Kembali</button></a>
+                <a href="{{ route('publikasi.galeri.index', Session::get('album_id')) }}" class="btn btn-info btn-sm"><i class="fa fa-arrow-left"></i> Kembali</a>
             </div>
             <div class="box-body">
                 <div class="form-group">
@@ -24,35 +26,89 @@
                 <div class="form-group" id="view-url">
                     <label for="url" class="control-label">URL <span class="required text-danger">*</span></label>
 
-                    {!! html()->text('link')->class('form-control')->value(old('link', isset($galeri) ? $galeri->link : '')) !!}
+                    {!! html()->text('link')->class('form-control')->placeholder('https://drive.google.com/file/d/... atau https://youtube.com/watch?v=...')->value(old('link', isset($galeri) ? $galeri->link : '')) !!}
+
+                    <small class="help-block text-muted">
+                        Mendukung tautan Google Drive, YouTube, Vimeo, serta berkas foto/video yang dihosting langsung.
+                    </small>
 
                     @if ($errors->has('link'))
                         <span class="help-block" style="color:red">{{ $errors->first('link') }}</span>
                     @endif
                 </div>
                 <div class="form-group" id="image">
-                    <label class="control-label" for="thumbnail">Thumbnail<span class="required text-danger">*</span></label>
-
-                    <div id="preview-container" style="display: flex; gap: 10px; flex-wrap: wrap;">
-                        <!-- Preview Gambar Akan Ditempatkan Di Sini -->
-                        @if (isset($galeri->gambar))
-                            @foreach ($galeri->gambar as $image)
-                                <img src="{{ isThumbnail(" publikasi/galeri/{$image}") }}" style="width:100px; max-height:100px; margin: 5px;">
-                            @endforeach
+                    <label class="control-label" for="file-galeri">Thumbnail @if (!isset($galeri) || empty($galeri->gambar))
+                            <span class="required text-danger">*</span>
                         @endif
-                    </div>
+                    </label>
 
-                    @if (isset($galeri->gambar) == false)
-                        <img src="{{ asset('/img/no-image.png') }}" id="showthumbnail" style="width:100%; max-height:250px; float:left;" />
+                    {!! html()->select('media_type', array_merge(['' => 'Otomatis (deteksi sendiri)'], TipeMedia::selectable()))->class('form-control')->value(old('media_type', isset($galeri) ? $galeri->media_type : '')) !!}
+
+                    <small class="help-block text-muted">
+                        Pilih <b>Video</b> bila berkas Google Drive berisi video, karena jenis media
+                        tidak dapat dibaca langsung dari alamat tautannya.
+                    </small>
+
+                    @if ($errors->has('media_type'))
+                        <span class="help-block" style="color:red">{{ $errors->first('media_type') }}</span>
+                    @endif
+                </div>
+                <div class="form-group" id="media-link-preview">
+                    @if (isset($galeri) && $galeri->jenis === 'url' && $galeri->link)
+                        <label class="control-label">Pratinjau Media</label>
+                        <x-galeri-media :galeri="$galeri" variant="full" />
+                        <small class="help-block text-muted">
+                            Tautan asli: <a href="{{ $galeri->link }}" target="_blank" rel="noopener">{{ $galeri->link }}</a>
+                        </small>
+                    @endif
+                </div>
+                <div class="form-group" id="image">
+                    <label class="control-label" for="file-galeri">Thumbnail @if (!isset($galeri) || empty($galeri->gambar))
+                            <span class="required text-danger">*</span>
+                        @endif
+                    </label>
+
+                    <input
+                        type="file"
+                        name="gambar[]"
+                        id="file-galeri"
+                        class="form-control"
+                        accept=".jpg,.jpeg,.png"
+                        multiple
+                        data-testid="file-galeri"
+                    >
+                    <x-upload-hint formats="JPG, JPEG, PNG" :limit-kb="1024" />
+                    <br />
+
+                    @if (isset($galeri) && !empty($galeri->gambar))
+                        @foreach ((array) $galeri->gambar as $image)
+                            @php $imageUrl = asset('storage/publikasi/galeri/' . $image); @endphp
+                            <div style="padding:8px; background:#f5f5f5; border-radius:4px; margin-bottom:8px; display:flex; align-items:center; gap:10px;">
+                                <a href="javascript:void(0)" data-toggle="modal-image" data-url="{{ $imageUrl }}" data-title="{{ $image }}" title="Klik untuk memperbesar">
+                                    <img src="{{ $imageUrl }}" style="max-height:60px; max-width:90px; object-fit:contain; border-radius:3px; cursor:pointer;" class="img-thumbnail">
+                                </a>
+                                <div style="overflow: hidden; flex-grow: 1;">
+                                    <span class="text-muted" style="word-break: break-all;">{{ $image }}</span><br>
+                                    <a href="javascript:void(0)" data-toggle="modal-image" data-url="{{ $imageUrl }}" data-title="{{ $image }}" class="btn btn-xs btn-info" style="margin-top: 4px;">
+                                        <i class="fa fa-eye"></i> Pratinjau
+                                    </a>
+                                    <a href="{{ $imageUrl }}" download="{{ $image }}" class="btn btn-xs btn-default" style="margin-top: 4px;">
+                                        <i class="fa fa-download"></i> Unduh
+                                    </a>
+                                </div>
+                            </div>
+                        @endforeach
+                        <small class="help-block text-muted">
+                            Upload file baru di atas untuk menggantikan file yang ada.
+                        </small>
                     @endif
 
-                    {!! html()->file('gambar[]', [
-                        'placeholder' => 'Thumbnail',
-                        'class' => 'form-control',
-                        'id' => 'file-album',
-                        'accept' => 'jpg,jpeg,png',
-                        'multiple' => true,
-                    ]) !!}
+                    <div class="clearfix"></div>
+                    <br>
+                    <div id="preview-container">
+                        <img class="hide" id="showgambar" style="max-width:400px;max-height:250px;float:left;" />
+                    </div>
+                    <div class="clearfix"></div>
 
                     @if ($errors->has('gambar'))
                         <span class="help-block" style="color:red">{{ $errors->first('gambar') }}</span>
@@ -66,7 +122,7 @@
         <div class="box box-primary">
             <div class="box-body">
                 <div class="form-group">
-                    <label class="control-label" for="status">Status<span class="required text-danger">*</span></label>
+                    <label class="control-label" for="status">Status <span class="required text-danger">*</span></label>
                     {!! html()->select('status', ['0' => 'Tidak Aktif', '1' => 'Aktif'])->class('form-control')->value(old('status', isset($galeri) ? $galeri->status : '')) !!}
                 </div>
             </div>
@@ -81,16 +137,30 @@
 @push('scripts')
     <script>
         $(function() {
+            var objectUrls = [];
+
+            function cleanupObjectUrls() {
+                objectUrls.forEach(function(url) {
+                    URL.revokeObjectURL(url);
+                });
+                objectUrls = [];
+            }
 
             function toggleUrlFields(type) {
                 var viewUrl = $('#view-url');
+                var viewMediaType = $('#view-media-type');
+                var mediaPreview = $('#media-link-preview');
                 var image = $('#image');
 
                 if (type == 'file') {
                     viewUrl.hide();
+                    viewMediaType.hide();
+                    mediaPreview.hide();
                     image.show();
                 } else {
                     viewUrl.show();
+                    viewMediaType.show();
+                    mediaPreview.show();
                     image.hide();
                 }
             }
@@ -99,49 +169,63 @@ function toggleUrlFields(type) {
                 toggleUrlFields($(this).val());
             }).trigger('change');
 
-            var fileTypes = ['jpg', 'jpeg', 'png']; //acceptable file types
+            var fileTypes = ['jpg', 'jpeg', 'png'];
+
+            function previewImages(input) {
+                cleanupObjectUrls();
+                var $container = $('#preview-container');
+                $container.empty();
 
-            function readURL(input) {
                 if (input.files && input.files.length > 0) {
-                    // Kosongkan gambar default dan preview lama
-                    $('#showthumbnail').hide(); // sembunyikan gambar default
-                    $('#preview-container').empty(); // kosongkan container preview
+                    var invalidFiles = false;
 
-                    // Loop melalui semua file yang dipilih
                     for (var i = 0; i < input.files.length; i++) {
                         var file = input.files[i];
-                        var
-                            extension = file.name.split('.').pop().toLowerCase(),
-                            isSuccess = fileTypes.indexOf(extension) > -1; // cek tipe file
-
-                        if (isSuccess) { // file yang valid
-                            var reader = new FileReader();
-                            reader.onload = function(e) {
-                                // Buat elemen gambar untuk preview
-                                var img = $('<img />', {
-                                    'src': e.target.result,
-                                    'style': 'width:100px; max-height:100px; margin: 5px;'
-                                });
-                                $('#preview-container').append(img);
-                            }
-
-                            reader.readAsDataURL(file);
-                        } else { // jika file tidak valid
-                            $("#file-album").val(''); // reset input
-                            openAlert('File tersebut tidak diperbolehkan.', 'Peringatan', 'warning');
+                        var extension = file.name.split('.').pop().toLowerCase();
+
+                        if (fileTypes.indexOf(extension) === -1) {
+                            invalidFiles = true;
+                            break;
                         }
                     }
+
+                    if (invalidFiles) {
+                        $(input).val('');
+                        if (typeof openAlert === 'function') {
+                            openAlert('File tersebut tidak diperbolehkan. Hanya format JPG, JPEG, dan PNG yang didukung.', 'Peringatan', 'warning');
+                        } else {
+                            alert('File tersebut tidak diperbolehkan. Hanya format JPG, JPEG, dan PNG yang didukung.');
+                        }
+                        return;
+                    }
+
+                    for (var j = 0; j < input.files.length; j++) {
+                        var validFile = input.files[j];
+                        var objectUrl = URL.createObjectURL(validFile);
+                        objectUrls.push(objectUrl);
+
+                        var $img = $('<img />', {
+                            src: objectUrl,
+                            id: j === 0 ? 'showgambar' : undefined,
+                            'data-toggle': 'modal-image',
+                            'data-url': objectUrl,
+                            'data-title': validFile.name,
+                            title: 'Klik untuk memperbesar',
+                            style: 'max-width:400px;max-height:250px;float:left;margin-right:10px;margin-bottom:10px;cursor:pointer;'
+                        });
+
+                        $container.append($img);
+                    }
                 } else {
-                    // Jika tidak ada file, tampilkan kembali gambar default
-                    $('#showthumbnail').show();
-                    $('#preview-container').empty();
+                    $container.html('<img class="hide" id="showgambar" style="max-width:400px;max-height:250px;float:left;" />');
                 }
             }
 
-            // Trigger preview saat file diubah
-            $("#file-album").change(function() {
-                readURL(this);
+            $('#file-galeri').on('change', function() {
+                previewImages(this);
             });
         });
     </script>
 @endpush
+
+<x-modal-image />
diff --git a/resources/views/publikasi/galeri/index.blade.php b/resources/views/publikasi/galeri/index.blade.php
index 79c7e07803..da71ba9224 100644
--- a/resources/views/publikasi/galeri/index.blade.php
+++ b/resources/views/publikasi/galeri/index.blade.php
@@ -18,16 +18,17 @@
         <div class="box box-primary">
             <div class="box-header with-border">
                 @can('access.publikasi.galeri.create')
-                    <a href="{{ route('publikasi.galeri.create') }}" class="btn btn-primary btn-sm" judul="Tambah Data"><i class="fa fa-plus"></i>&ensp;Tambah</a>
+                    <a href="{{ route('publikasi.galeri.create') }}" class="btn btn-primary btn-sm" judul="Tambah Data" data-testid="btn-tambah"><i class="fa fa-plus"></i>&ensp;Tambah</a>
                 @endcan
-                <a href="{{ route('publikasi.album.index') }}" class="btn btn-info btn-sm" judul="Tambah Data"><i class="fa fa-arrow-left"></i>&ensp;Kembali ke Daftar Album</a>
+                <a href="{{ route('publikasi.album.index') }}" class="btn btn-info btn-sm" judul="Kembali ke Daftar Album" data-testid="btn-kembali"><i class="fa fa-arrow-left"></i>&ensp;Kembali ke Daftar Album</a>
             </div>
             <div class="box-body">
                 <div class="table-responsive">
-                    <table class="table table-striped table-bordered" id="galeri-table">
+                    <table class="table table-striped table-bordered" id="galeri-table" data-testid="table-galeri">
                         <thead>
                             <tr>
                                 <th style="max-width: 80px;">Aksi</th>
+                                <th style="max-width: 100px;">Media</th>
                                 <th>Nama Album</th>
                                 <th style="max-width: 100px;">Aktif</th>
                                 <th>Dimuat pada</th>
@@ -56,6 +57,12 @@ class: 'text-center',
                         searchable: false,
                         orderable: false
                     },
+                    {
+                        data: 'media',
+                        name: 'media',
+                        orderable: false,
+                        searchable: false
+                    },
                     {
                         data: 'judul',
                         name: 'judul'
diff --git a/resources/views/publikasi/galeri/parts/media-cell.blade.php b/resources/views/publikasi/galeri/parts/media-cell.blade.php
new file mode 100644
index 0000000000..658e0684ff
--- /dev/null
+++ b/resources/views/publikasi/galeri/parts/media-cell.blade.php
@@ -0,0 +1 @@
+<x-galeri-media :galeri="$galeri" variant="thumb" />
diff --git a/resources/views/setting/nav_menu/field.blade.php b/resources/views/setting/nav_menu/field.blade.php
index 11d434cbee..d2d4c086d1 100644
--- a/resources/views/setting/nav_menu/field.blade.php
+++ b/resources/views/setting/nav_menu/field.blade.php
@@ -24,6 +24,9 @@
         <label class="form-check-inline">
             {!! html()->radio('source', false)->value('Dokumen')->class('form-check-input')->id('sourceDokumen') !!} Dokumen
         </label>
+        <label class="form-check-inline">
+            {!! html()->radio('source', false)->value('Potensi')->class('form-check-input')->id('sourcePotensi') !!} Potensi
+        </label>
     </div>
 </div>
 
@@ -63,6 +66,7 @@
                         case 'Kategori':
                         case 'Halaman':
                         case 'Dokumen':
+                        case 'Potensi':
                             let select = document.querySelector('select[name=sourcelist]');
                             select.style.display = 'block'; // Tampilkan select sourcelist
 
diff --git a/resources/views/setting/nav_menu/index.blade.php b/resources/views/setting/nav_menu/index.blade.php
index e5e081ce31..7cdd994eaf 100644
--- a/resources/views/setting/nav_menu/index.blade.php
+++ b/resources/views/setting/nav_menu/index.blade.php
@@ -157,6 +157,7 @@
                 let sourceKategori = $('#sourceKategori');
                 let sourceModul = $('#sourceModul');
                 let sourceDokumen = $('#sourceDokumen');
+                let sourcePotensi = $('#sourcePotensi');
 
                 let source = '';
                 if (sourceLink.is(':checked')) source = sourceLink.val();
@@ -164,6 +165,7 @@
                 else if (sourceKategori.is(':checked')) source = sourceKategori.val();
                 else if (sourceModul.is(':checked')) source = sourceModul.val();
                 else if (sourceDokumen.is(':checked')) source = sourceDokumen.val();
+                else if (sourcePotensi.is(':checked')) source = 'modul';
 
                 editor.add(source);
             });
diff --git a/resources/views/setting/navigation/form.blade.php b/resources/views/setting/navigation/form.blade.php
index ee4e4548e6..e7e93a43fc 100644
--- a/resources/views/setting/navigation/form.blade.php
+++ b/resources/views/setting/navigation/form.blade.php
@@ -27,18 +27,19 @@
                 @endforeach
             </optgroup>
             <optgroup label="Potensi">
+                <option value="4" data-value="potensi" @selected('potensi' == optional($navigation)->url)>Semua Potensi</option>
                 @foreach (\App\Enums\MenuTipe::getPotensi() as $key => $value)
-                    <option value="3" data-value="{{ 'potensi/' . $key }}" @selected('potensi/' . $key == optional($navigation)->url)>{{ $value }}</option>
+                    <option value="4" data-value="{{ 'potensi/' . $key }}" @selected('potensi/' . $key == optional($navigation)->url)>{{ $value }}</option>
                 @endforeach
             </optgroup>
             <optgroup label="Unduhan">
                 @foreach (\App\Enums\MenuTipe::getUnduhan() as $key => $value)
-                    <option value="4" data-value="{{ 'unduhan/' . $key }}" @selected('unduhan/' . $key == optional($navigation)->url)>{{ $value }}</option>
+                    <option value="5" data-value="{{ 'unduhan/' . $key }}" @selected('unduhan/' . $key == optional($navigation)->url)>{{ $value }}</option>
                 @endforeach
             </optgroup>
             <optgroup label="Publikasi">
                 @foreach (\App\Enums\MenuTipe::getPublikasi() as $key => $value)
-                    <option value="4" data-value="{{ 'publikasi/' . $key }}" @selected('publikasi/' . $key == optional($navigation)->url)>{{ $value }}</option>
+                    <option value="6" data-value="{{ 'publikasi/' . $key }}" @selected('publikasi/' . $key == optional($navigation)->url)>{{ $value }}</option>
                 @endforeach
             </optgroup>
             <option value="0" @selected('0' == optional($navigation)->type)>Eksternal</option>
diff --git a/resources/views/vendor/laravel-log-viewer/log.blade.php b/resources/views/vendor/laravel-log-viewer/log.blade.php
index 22a1b5801f..f53e807aa5 100644
--- a/resources/views/vendor/laravel-log-viewer/log.blade.php
+++ b/resources/views/vendor/laravel-log-viewer/log.blade.php
@@ -30,7 +30,7 @@
             <div class="box-body no-padding">
                 <ul class="nav nav-pills nav-stacked">
                     @foreach ($files as $file)
-                        <li @if ($current_file == $file) class="active" @endif><a href="?l={{ \Illuminate\Support\Facades\Crypt::encrypt($file) }}"> {{ $file }}
+                        <li @if ($current_file == $file) class="active" @endif><a href="?l={{ \Illuminate\Support\Facades\Crypt::encryptString($file) }}"> {{ $file }}
                             </a></li>
                     @endforeach
                 </ul>
@@ -43,22 +43,22 @@
                 <div class="p-3">
                     @if ($current_file)
                         <a class="btn btn-social btn-sm btn-success visible-xs-block visible-sm-inline-block visible-md-inline-block visible-lg-inline-block"
-                            href="?dl={{ \Illuminate\Support\Facades\Crypt::encrypt($current_file) }}{{ $current_folder ? '&f=' . \Illuminate\Support\Facades\Crypt::encrypt($current_folder) : '' }}"
+                            href="?dl={{ \Illuminate\Support\Facades\Crypt::encryptString($current_file) }}{{ $current_folder ? '&f=' . \Illuminate\Support\Facades\Crypt::encryptString($current_folder) : '' }}"
                         >
                             <span class="fa fa-download"></span> Unduh
                         </a>
                         <a class="btn btn-social btn-sm btn-info visible-xs-block visible-sm-inline-block visible-md-inline-block visible-lg-inline-block" id="clean-log"
-                            href="?clean={{ \Illuminate\Support\Facades\Crypt::encrypt($current_file) }}{{ $current_folder ? '&f=' . \Illuminate\Support\Facades\Crypt::encrypt($current_folder) : '' }}"
+                            href="?clean={{ \Illuminate\Support\Facades\Crypt::encryptString($current_file) }}{{ $current_folder ? '&f=' . \Illuminate\Support\Facades\Crypt::encryptString($current_folder) : '' }}"
                         >
                             <span class="fa fa-times-circle"></span> Bersihkan File
                         </a>
                         <a class="btn btn-social btn-sm btn-danger visible-xs-block visible-sm-inline-block visible-md-inline-block visible-lg-inline-block" id="delete-log"
-                            href="?del={{ \Illuminate\Support\Facades\Crypt::encrypt($current_file) }}{{ $current_folder ? '&f=' . \Illuminate\Support\Facades\Crypt::encrypt($current_folder) : '' }}"
+                            href="?del={{ \Illuminate\Support\Facades\Crypt::encryptString($current_file) }}{{ $current_folder ? '&f=' . \Illuminate\Support\Facades\Crypt::encryptString($current_folder) : '' }}"
                         >
                             <span class="fa fa-trash"></span> Hapus File
                         </a>
                         @if (count($files) > 1)
-                            <a id="delete-all-log" class="btn btn-social btn-sm btn-danger visible-sm-inline-block visible-md-inline-block visible-lg-inline-block" href="?delall=true{{ $current_folder ? '&f=' . \Illuminate\Support\Facades\Crypt::encrypt($current_folder) : '' }}">
+                            <a id="delete-all-log" class="btn btn-social btn-sm btn-danger visible-sm-inline-block visible-md-inline-block visible-lg-inline-block" href="?delall=true{{ $current_folder ? '&f=' . \Illuminate\Support\Facades\Crypt::encryptString($current_folder) : '' }}">
                                 <span class="fa fa-trash"></span> Hapus Semua file
                             </a>
                         @endif
diff --git a/routes/web.php b/routes/web.php
index 0d00b9ed4c..fcde690df4 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -233,9 +233,9 @@
             });
 
             Route::group(['prefix' => 'potensi'], function () {
-                Route::permanentRedirect('/', '/');
+                Route::get('/', 'PageController@PotensiIndex')->name('potensi.index');
                 Route::get('{slug}', 'PageController@PotensiByKategory')->name('potensi.kategori');
-                Route::get('{kategori}/{slug}', 'PageController@PotensiShow')->name('potensi.kategori.show');
+                Route::get('{kategori}/{id}', 'PageController@PotensiShow')->name('potensi.kategori.show');
             });
 
             Route::any('refresh-captcha', 'PageController@refresh_captcha')->name('refresh-captcha');
@@ -346,7 +346,6 @@
                     Route::put('update/{prosedur}', ['as' => 'informasi.prosedur.update', 'uses' => 'ProsedurController@update']);
                     Route::delete('destroy/{prosedur}', ['as' => 'informasi.prosedur.destroy', 'uses' => 'ProsedurController@destroy']);
                     Route::get('download/{prosedur}', ['as' => 'informasi.prosedur.download', 'uses' => 'ProsedurController@download']);
-                    Route::get('preview/{prosedur}', ['as' => 'informasi.prosedur.preview', 'uses' => 'ProsedurController@preview']);
                 });
 
                 // Regulasi
diff --git a/tests/Arch/NginxUploadGuardTest.php b/tests/Arch/NginxUploadGuardTest.php
new file mode 100644
index 0000000000..48c9df24b8
--- /dev/null
+++ b/tests/Arch/NginxUploadGuardTest.php
@@ -0,0 +1,31 @@
+<?php
+
+$nginxConf = dirname(__DIR__, 2).'/.docker/nginx/conf.d/default.conf';
+
+describe('Nginx upload guard', function () use ($nginxConf) {
+    test('memblokir eksekusi skrip di bawah /storage/', function () use ($nginxConf) {
+        $config = file_get_contents($nginxConf);
+
+        expect($config)->toContain('^/storage/');
+        expect($config)->toMatch('/location\s+~\*\s+\^\/storage\/.*phtml/');
+    });
+
+    test('guard /storage/ ditulis sebelum location .php agar tidak ditimpa', function () use ($nginxConf) {
+        $config = file_get_contents($nginxConf);
+
+        $storageGuard = strpos($config, '^/storage/');
+        $phpHandler = strpos($config, 'location ~ \.php$');
+
+        expect($storageGuard)->not->toBeFalse();
+        expect($phpHandler)->not->toBeFalse();
+        expect($storageGuard)->toBeLessThan($phpHandler);
+    });
+
+    test('blokir mencakup daftar ekstensi eksekutable yang umum', function () use ($nginxConf) {
+        $config = file_get_contents($nginxConf);
+
+        foreach (['php', 'phtml', 'phar', 'cgi', 'jsp', 'asp'] as $extension) {
+            expect($config)->toContain($extension);
+        }
+    });
+});
diff --git a/tests/Feature/Api/Frontend/GaleriControllerTest.php b/tests/Feature/Api/Frontend/GaleriControllerTest.php
new file mode 100644
index 0000000000..8e68c22efb
--- /dev/null
+++ b/tests/Feature/Api/Frontend/GaleriControllerTest.php
@@ -0,0 +1,120 @@
+<?php
+
+use App\Http\Middleware\Authenticate;
+use App\Http\Middleware\CompleteProfile;
+use App\Http\Middleware\GlobalShareMiddleware;
+use App\Models\Album;
+use App\Models\Galeri;
+use App\Models\SettingAplikasi;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Illuminate\Support\Facades\Cache;
+use Spatie\Permission\Middleware\PermissionMiddleware;
+use Spatie\Permission\Middleware\RoleMiddleware;
+
+/*
+|--------------------------------------------------------------------------
+| Galeri Frontend API
+|--------------------------------------------------------------------------
+|
+| Tema web merender galeri dari API, jadi API wajib mengembalikan informasi
+| media (tipe, URL, embed) agar foto maupun video berbasis link bisa
+| ditampilkan dengan benar.
+|
+*/
+
+uses(DatabaseTransactions::class);
+
+beforeEach(function () {
+    $this->withViewErrors([]);
+    $this->withoutMiddleware([
+        Authenticate::class,
+        RoleMiddleware::class,
+        PermissionMiddleware::class,
+        CompleteProfile::class,
+        GlobalShareMiddleware::class,
+    ]);
+
+    // Respons API di-cache; DatabaseTransactions membuat rollback pada tabel
+    // cache_keys sehingga cache dari test sebelumnya tidak bisa dihapus observer.
+    Cache::flush();
+
+    SettingAplikasi::updateOrCreate(
+        ['key' => 'sinkronisasi_database_gabungan'],
+        ['value' => '0']
+    );
+
+    $this->album = Album::factory()->create([
+        'judul' => 'Album Galeri Uji',
+        'slug' => 'album-galeri-uji',
+    ]);
+});
+
+function makeGaleri(array $attributes = []): Galeri
+{
+    return Galeri::create(array_merge([
+        'album_id' => test()->album->id,
+        'judul' => 'Galeri API',
+        'jenis' => 'url',
+        'status' => true,
+    ], $attributes));
+}
+
+it('returns media details for a google drive video', function () {
+    makeGaleri([
+        'judul' => 'Video Drive',
+        'link' => 'https://drive.google.com/file/d/1AbCdEf123/view',
+        'media_type' => 'video',
+    ]);
+
+    $response = $this->getJson('/api/frontend/v1/galeri?filter[status]=1&filter[album.slug]=album-galeri-uji');
+
+    $response->assertStatus(200);
+
+    $attributes = collect($response->json('data'))->firstWhere('attributes.judul', 'Video Drive')['attributes'];
+
+    expect($attributes['media_type'])->toBe('video')
+        ->and($attributes['media_embed_url'])->toBe('https://drive.google.com/file/d/1AbCdEf123/preview')
+        ->and($attributes['media_url'])->toBe('https://drive.google.com/uc?export=download&id=1AbCdEf123');
+});
+
+it('returns media details for a google drive photo', function () {
+    makeGaleri([
+        'judul' => 'Foto Drive',
+        'link' => 'https://drive.google.com/file/d/1AbCdEf123/view',
+        'media_type' => 'image',
+    ]);
+
+    $response = $this->getJson('/api/frontend/v1/galeri?filter[status]=1&filter[album.slug]=album-galeri-uji');
+
+    $attributes = collect($response->json('data'))->firstWhere('attributes.judul', 'Foto Drive')['attributes'];
+
+    expect($attributes['media_type'])->toBe('image')
+        ->and($attributes['media_url'])->toBe('https://drive.google.com/uc?export=view&id=1AbCdEf123')
+        ->and($attributes['gambar_path'])->toBe('https://drive.google.com/uc?export=view&id=1AbCdEf123');
+});
+
+it('returns an embed url and thumbnail for a youtube video', function () {
+    makeGaleri([
+        'judul' => 'Video YouTube',
+        'link' => 'https://www.youtube.com/watch?v=dQw4w9WgXcQ',
+    ]);
+
+    $response = $this->getJson('/api/frontend/v1/galeri?filter[status]=1&filter[album.slug]=album-galeri-uji');
+
+    $attributes = collect($response->json('data'))->firstWhere('attributes.judul', 'Video YouTube')['attributes'];
+
+    expect($attributes['media_type'])->toBe('youtube')
+        ->and($attributes['media_embed_url'])->toBe('https://www.youtube.com/embed/dQw4w9WgXcQ')
+        ->and($attributes['gambar_path'])->toBe('https://img.youtube.com/vi/dQw4w9WgXcQ/hqdefault.jpg');
+});
+
+it('exposes the media keys for every galeri record', function () {
+    makeGaleri(['judul' => 'Tanpa Link', 'link' => null]);
+
+    $response = $this->getJson('/api/frontend/v1/galeri?filter[status]=1&filter[album.slug]=album-galeri-uji');
+
+    $attributes = collect($response->json('data'))->firstWhere('attributes.judul', 'Tanpa Link')['attributes'];
+
+    expect($attributes)->toHaveKeys(['media_type', 'media_url', 'media_embed_url', 'gambar_path'])
+        ->and($attributes['media_type'])->toBe('unknown');
+});
diff --git a/tests/Feature/Data/SuplemenControllerRequestTest.php b/tests/Feature/Data/SuplemenControllerRequestTest.php
new file mode 100644
index 0000000000..e8b8ba125a
--- /dev/null
+++ b/tests/Feature/Data/SuplemenControllerRequestTest.php
@@ -0,0 +1,186 @@
+<?php
+
+/*
+ * File ini bagian dari:
+ *
+ * OpenDK
+ *
+ * Aplikasi dan source code ini dirilis berdasarkan lisensi GPL V3
+ *
+ * Hak Cipta 2017 - 2026 Perkumpulan Desa Digital Terbuka (https://opendesa.id)
+ *
+ * Dengan ini diberikan izin, secara gratis, kepada siapa pun yang mendapatkan salinan
+ * dari perangkat lunak ini dan file dokumentasi terkait ("Aplikasi Ini"), untuk diperlakukan
+ * tanpa batasan, termasuk hak untuk menggunakan, menyalin, mengubah dan/atau mendistribusikan,
+ * asal tunduk pada syarat berikut:
+ *
+ * Pemberitahuan hak cipta di atas dan pemberitahuan izin ini harus disertakan dalam
+ * setiap salinan atau bagian penting Aplikasi Ini. Barang siapa yang menghapus atau menghilangkan
+ * pemberitahuan ini melanggar ketentuan lisensi Aplikasi Ini.
+ *
+ * PERANGKAT LUNAK INI DISEDIAKAN "SEBAGAIMANA ADANYA", TANPA JAMINAN APA PUN, BAIK TERSURAT MAUPUN
+ * TERSIRAT. PENULIS ATAU PEMEGANG HAK CIPTA SAMA SEKALI TIDAK BERTANGGUNG JAWAB ATAS KLAIM, KERUSAKAN ATAU
+ * KEWAJIBAN APAPUN ATAS PENGGUNAAN ATAU LAINNYA TERKAIT APLIKASI INI.
+ *
+ * @package    OpenDK
+ * @author     Tim Pengembang OpenDesa
+ * @copyright  Hak Cipta 2017 - 2026 Perkumpulan Desa Digital Terbuka (https://opendesa.id)
+ * @license    http://www.gnu.org/licenses/gpl.html    GPL V3
+ * @link       https://github.com/OpenSID/opendk
+ */
+
+use App\Http\Middleware\Authenticate;
+use App\Http\Middleware\CompleteProfile;
+use App\Http\Middleware\GlobalShareMiddleware;
+use App\Models\Penduduk;
+use App\Models\SettingAplikasi;
+use App\Models\Suplemen;
+use App\Models\SuplemenTerdata;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Spatie\Permission\Middleware\PermissionMiddleware;
+use Spatie\Permission\Middleware\RoleMiddleware;
+
+uses(DatabaseTransactions::class);
+
+beforeEach(function () {
+    $this->withViewErrors([]);
+    $this->withoutMiddleware([
+        Authenticate::class,
+        RoleMiddleware::class,
+        PermissionMiddleware::class,
+        CompleteProfile::class,
+        GlobalShareMiddleware::class,
+    ]);
+
+    SettingAplikasi::updateOrCreate(
+        ['key' => 'sinkronisasi_database_gabungan'],
+        ['value' => '0']
+    );
+});
+
+test('store membuat data suplemen dengan data valid', function () {
+    $response = $this->post(route('data.data-suplemen.store'), [
+        'nama' => 'Suplemen Valid',
+        'sasaran' => '1',
+        'keterangan' => 'Keterangan valid',
+    ]);
+
+    $response->assertRedirect(route('data.data-suplemen.index'));
+    $response->assertSessionHas('success', 'Data Suplemen berhasil ditambah!');
+
+    $this->assertDatabaseHas('das_suplemen', [
+        'nama' => 'Suplemen Valid',
+        'slug' => 'suplemen-valid',
+        'sasaran' => '1',
+    ]);
+});
+
+test('store gagal ketika nama kosong', function () {
+    $response = $this->post(route('data.data-suplemen.store'), [
+        'nama' => '',
+        'sasaran' => '1',
+    ]);
+
+    $response->assertSessionHasErrors(['nama']);
+});
+
+test('store gagal ketika sasaran tidak valid', function () {
+    $response = $this->post(route('data.data-suplemen.store'), [
+        'nama' => 'Suplemen Sasaran',
+        'sasaran' => '3',
+    ]);
+
+    $response->assertSessionHasErrors(['sasaran']);
+});
+
+test('update mengubah data suplemen saat data valid', function () {
+    $suplemen = Suplemen::create([
+        'nama' => 'Suplemen Lama',
+        'slug' => 'suplemen-lama',
+        'sasaran' => 1,
+    ]);
+
+    $response = $this->put(route('data.data-suplemen.update', $suplemen->id), [
+        'nama' => 'Suplemen Baru',
+        'sasaran' => '2',
+        'keterangan' => 'Keterangan baru',
+    ]);
+
+    $response->assertRedirect(route('data.data-suplemen.index'));
+    $response->assertSessionHas('success', 'Data Suplemen berhasil diubah!');
+
+    $this->assertDatabaseHas('das_suplemen', [
+        'id' => $suplemen->id,
+        'nama' => 'Suplemen Baru',
+        'slug' => 'suplemen-baru',
+        'sasaran' => '2',
+    ]);
+});
+
+test('storeDetail membuat anggota suplemen saat data valid', function () {
+    $suplemen = Suplemen::create([
+        'nama' => 'Suplemen Anggota',
+        'slug' => 'suplemen-anggota',
+        'sasaran' => 1,
+    ]);
+    $penduduk = Penduduk::factory()->create();
+
+    $response = $this->post(route('data.data-suplemen.storedetail'), [
+        'suplemen_id' => $suplemen->id,
+        'desa_id' => $penduduk->desa_id,
+        'penduduk_id' => $penduduk->id,
+        'keterangan' => 'Anggota baru',
+    ]);
+
+    $response->assertRedirect(route('data.data-suplemen.show', $suplemen->id));
+    $response->assertSessionHas('success', 'Anggota Suplemen berhasil ditambah!');
+
+    expect(SuplemenTerdata::where('suplemen_id', $suplemen->id)->count())->toBe(1);
+});
+
+test('storeDetail gagal ketika sumber penduduk kosong dengan pesan kustom', function () {
+    $suplemen = Suplemen::create([
+        'nama' => 'Suplemen Anggota',
+        'slug' => 'suplemen-anggota',
+        'sasaran' => 1,
+    ]);
+
+    $response = $this->post(route('data.data-suplemen.storedetail'), [
+        'suplemen_id' => $suplemen->id,
+        'keterangan' => 'Tanpa penduduk',
+    ]);
+
+    $response->assertSessionHasErrors(['penduduk_id']);
+
+    $errors = session('errors');
+    expect($errors->first('penduduk_id'))->toBe('isian warga atau penduduk wajib diisi');
+});
+
+test('updateDetail mengubah anggota suplemen saat data valid', function () {
+    $suplemen = Suplemen::create([
+        'nama' => 'Suplemen Anggota',
+        'slug' => 'suplemen-anggota',
+        'sasaran' => 1,
+    ]);
+    $penduduk = Penduduk::factory()->create();
+    $terdata = SuplemenTerdata::create([
+        'suplemen_id' => $suplemen->id,
+        'penduduk_id' => $penduduk->id,
+        'keterangan' => 'Keterangan awal',
+    ]);
+
+    $response = $this->put(route('data.data-suplemen.updatedetail', $terdata->id), [
+        'suplemen_id' => $suplemen->id,
+        'desa_id' => $penduduk->desa_id,
+        'penduduk_id' => $penduduk->id,
+        'keterangan' => 'Keterangan diubah',
+    ]);
+
+    $response->assertRedirect(route('data.data-suplemen.show', $suplemen->id));
+    $response->assertSessionHas('success', 'Anggota Suplemen berhasil diubah!');
+
+    $this->assertDatabaseHas('das_suplemen_terdata', [
+        'id' => $terdata->id,
+        'keterangan' => 'Keterangan diubah',
+    ]);
+});
diff --git a/tests/Feature/Data/SuplemenGabunganTest.php b/tests/Feature/Data/SuplemenGabunganTest.php
new file mode 100644
index 0000000000..65e4d88e04
--- /dev/null
+++ b/tests/Feature/Data/SuplemenGabunganTest.php
@@ -0,0 +1,572 @@
+<?php
+
+/*
+ * File ini bagian dari:
+ *
+ * OpenDK
+ *
+ * Aplikasi dan source code ini dirilis berdasarkan lisensi GPL V3
+ *
+ * Hak Cipta 2017 - 2026 Perkumpulan Desa Digital Terbuka (https://opendesa.id)
+ *
+ * Dengan ini diberikan izin, secara gratis, kepada siapa pun yang mendapatkan salinan
+ * dari perangkat lunak ini dan file dokumentasi terkait ("Aplikasi Ini"), untuk diperlakukan
+ * tanpa batasan, termasuk hak untuk menggunakan, menyalin, mengubah dan/atau mendistribusikan,
+ * asal tunduk pada syarat berikut:
+ *
+ * Pemberitahuan hak cipta di atas dan pemberitahuan izin ini harus disertakan dalam
+ * setiap salinan atau bagian penting Aplikasi Ini. Barang siapa yang menghapus atau menghilangkan
+ * pemberitahuan ini melanggar ketentuan lisensi Aplikasi Ini.
+ *
+ * PERANGKAT LUNAK INI DISEDIAKAN "SEBAGAIMANA ADANYA", TANPA JAMINAN APA PUN, BAIK TERSURAT MAUPUN
+ * TERSIRAT. PENULIS ATAU PEMEGANG HAK CIPTA SAMA SEKALI TIDAK BERTANGGUNG JAWAB ATAS KLAIM, KERUSAKAN ATAU
+ * KEWAJIBAN APAPUN ATAS PENGGUNAAN ATAU LAINNYA TERKAIT APLIKASI INI.
+ *
+ * @package    OpenDK
+ * @author     Tim Pengembang OpenDesa
+ * @copyright  Hak Cipta 2017 - 2026 Perkumpulan Desa Digital Terbuka (https://opendesa.id)
+ * @license    http://www.gnu.org/licenses/gpl.html    GPL V3
+ * @link       https://github.com/OpenSID/opendk
+ */
+
+use App\Http\Middleware\Authenticate;
+use App\Http\Middleware\CompleteProfile;
+use App\Http\Middleware\GlobalShareMiddleware;
+use App\Models\DataDesa;
+use App\Models\Penduduk;
+use App\Models\SettingAplikasi;
+use App\Models\Suplemen;
+use App\Models\SuplemenTerdata;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Illuminate\Support\Facades\Http;
+use Spatie\Permission\Middleware\PermissionMiddleware;
+use Spatie\Permission\Middleware\RoleMiddleware;
+
+uses(DatabaseTransactions::class);
+
+function aktifkanDatabaseGabungan(bool $aktif = true): void
+{
+    SettingAplikasi::updateOrCreate(
+        ['key' => 'sinkronisasi_database_gabungan'],
+        ['value' => $aktif ? '1' : '0']
+    );
+
+    if ($aktif) {
+        SettingAplikasi::updateOrCreate(
+            ['key' => 'api_server_database_gabungan'],
+            ['value' => 'https://api.example.com']
+        );
+        SettingAplikasi::updateOrCreate(
+            ['key' => 'api_key_database_gabungan'],
+            ['value' => 'test-api-key']
+        );
+    }
+}
+
+/**
+ * Fake seluruh panggilan API database gabungan.
+ *
+ * Constructor controller memanggil DesaService::listDesa() sehingga setiap
+ * request saat mode gabungan aktif wajib memiliki stub catch-all.
+ */
+function fakeGabunganApi(array $routes = []): void
+{
+    Http::fake(array_merge($routes, [
+        '*' => Http::response([
+            'data' => [],
+            'meta' => ['pagination' => ['total' => 0]],
+        ], 200),
+    ]));
+}
+
+beforeEach(function () {
+    $this->withViewErrors([]);
+    $this->withoutMiddleware([
+        Authenticate::class,
+        RoleMiddleware::class,
+        PermissionMiddleware::class,
+        CompleteProfile::class,
+        GlobalShareMiddleware::class,
+    ]);
+
+    aktifkanDatabaseGabungan(false);
+
+    $this->suplemen = Suplemen::create([
+        'nama' => 'Suplemen Gabungan Test',
+        'slug' => 'suplemen-gabungan-test',
+        'sasaran' => 1,
+        'keterangan' => 'Testing database gabungan',
+    ]);
+});
+
+test('show menampilkan view gabungan saat database gabungan aktif', function () {
+    aktifkanDatabaseGabungan(true);
+    fakeGabunganApi();
+
+    $response = $this->get(route('data.data-suplemen.show', $this->suplemen->id));
+
+    $response->assertStatus(200);
+    $response->assertViewIs('data.data_suplemen.gabungan.show');
+    $response->assertViewHas('suplemen', fn (Suplemen $suplemen) => $suplemen->id === $this->suplemen->id);
+});
+
+test('show menampilkan view lokal saat database gabungan tidak aktif', function () {
+    $response = $this->get(route('data.data-suplemen.show', $this->suplemen->id));
+
+    $response->assertStatus(200);
+    $response->assertViewIs('data.data_suplemen.show');
+    $response->assertViewHas('suplemen', fn (Suplemen $suplemen) => $suplemen->id === $this->suplemen->id);
+});
+
+test('createDetail menampilkan view gabungan saat database gabungan aktif', function () {
+    aktifkanDatabaseGabungan(true);
+    fakeGabunganApi();
+
+    $response = $this->get(route('data.data-suplemen.createdetail', $this->suplemen->id));
+
+    $response->assertStatus(200);
+    $response->assertViewIs('data.data_suplemen.gabungan.create_detail');
+    $response->assertViewHas('isDatabaseGabungan', true);
+    $response->assertSee('api.example.com/api/v1/opendk/sync-penduduk-opendk');
+    $response->assertSee('filter[kode_desa]');
+    $response->assertSee('select2({');
+    $response->assertSee('minimumInputLength: 0');
+    $response->assertSee("$('#penduduk_id_gabungan')", false);
+});
+
+test('createDetail menampilkan view lokal saat database gabungan tidak aktif', function () {
+    $response = $this->get(route('data.data-suplemen.createdetail', $this->suplemen->id));
+
+    $response->assertStatus(200);
+    $response->assertViewIs('data.data_suplemen.create_detail');
+    $response->assertViewHas('isDatabaseGabungan', false);
+});
+
+test('storeDetail menyimpan penduduk dari database gabungan saat gabungan aktif', function () {
+    aktifkanDatabaseGabungan(true);
+    fakeGabunganApi();
+
+    $response = $this->post(route('data.data-suplemen.storedetail'), [
+        'suplemen_id' => $this->suplemen->id,
+        'desa_id' => '3301010001',
+        'penduduk_id_gabungan' => 99,
+        'keterangan' => 'Anggota dari gabungan',
+    ]);
+
+    $response->assertRedirect(route('data.data-suplemen.show', $this->suplemen->id));
+    $response->assertSessionHas('success', 'Anggota Suplemen berhasil ditambah!');
+
+    $this->assertDatabaseHas('das_suplemen_terdata', [
+        'suplemen_id' => $this->suplemen->id,
+        'penduduk_id' => null,
+        'penduduk_id_gabungan' => 99,
+        'desa_id' => '3301010001',
+        'keterangan' => 'Anggota dari gabungan',
+    ]);
+});
+
+test('storeDetail menyimpan penduduk lokal saat database gabungan tidak aktif', function () {
+    $penduduk = Penduduk::factory()->create();
+
+    $response = $this->post(route('data.data-suplemen.storedetail'), [
+        'suplemen_id' => $this->suplemen->id,
+        'desa_id' => $penduduk->desa_id,
+        'penduduk_id' => $penduduk->id,
+        'keterangan' => 'Anggota lokal',
+    ]);
+
+    $response->assertRedirect(route('data.data-suplemen.show', $this->suplemen->id));
+    $response->assertSessionHas('success', 'Anggota Suplemen berhasil ditambah!');
+
+    $this->assertDatabaseHas('das_suplemen_terdata', [
+        'suplemen_id' => $this->suplemen->id,
+        'penduduk_id' => $penduduk->id,
+        'penduduk_id_gabungan' => null,
+        'desa_id' => $penduduk->desa_id,
+    ]);
+});
+
+test('storeDetail gagal ketika penduduk lokal dan gabungan keduanya diisi', function () {
+    $penduduk = Penduduk::factory()->create();
+
+    $response = $this->post(route('data.data-suplemen.storedetail'), [
+        'suplemen_id' => $this->suplemen->id,
+        'desa_id' => $penduduk->desa_id,
+        'penduduk_id' => $penduduk->id,
+        'penduduk_id_gabungan' => 99,
+    ]);
+
+    $response->assertSessionHasErrors(['penduduk_id_gabungan']);
+});
+
+test('storeDetail gagal ketika desa_id tidak diisi', function () {
+    $penduduk = Penduduk::factory()->create();
+
+    $response = $this->post(route('data.data-suplemen.storedetail'), [
+        'suplemen_id' => $this->suplemen->id,
+        'penduduk_id' => $penduduk->id,
+    ]);
+
+    $response->assertSessionHasErrors(['desa_id']);
+});
+
+test('getDataSuplemenTerdata tidak menggabungkan anggota dari API database gabungan', function () {
+    aktifkanDatabaseGabungan(true);
+    fakeGabunganApi([
+        'https://api.example.com/api/v1/opendk/suplemen-terdata-datatable/*' => Http::response([
+            'data' => [
+                [
+                    'id' => 100,
+                    'attributes' => [
+                        'nama_desa' => 'Desa API',
+                        'no_kk' => '1234567890123456',
+                        'nik' => '1234567890123457',
+                        'nama' => 'Anggota Dari API',
+                        'tempat_lahir' => 'Jakarta',
+                        'tanggal_lahir' => '1990-01-01',
+                        'sex' => 1,
+                        'alamat' => 'Alamat API',
+                        'keterangan' => 'Terdata desa',
+                    ],
+                ],
+            ],
+            'meta' => ['pagination' => ['total' => 1]],
+        ], 200),
+    ]);
+
+    $penduduk = Penduduk::factory()->create(['nama' => 'Anggota Lokal']);
+    SuplemenTerdata::create([
+        'suplemen_id' => $this->suplemen->id,
+        'penduduk_id' => $penduduk->id,
+        'desa_id' => $penduduk->desa_id,
+        'keterangan' => 'Anggota lokal',
+    ]);
+
+    $response = $this->postJson(
+        route('data.data-suplemen.getsuplementerdata', $this->suplemen->id),
+        [],
+        ['X-Requested-With' => 'XMLHttpRequest']
+    );
+
+    $response->assertStatus(200);
+    $data = collect($response->json('data'));
+
+    expect($data->pluck('keterangan'))->toContain('Anggota lokal')
+        ->not->toContain('Terdata desa')
+        ->and($data->pluck('penduduk.nama'))->toContain('Anggota Lokal')
+        ->not->toContain('Anggota Dari API');
+});
+
+test('getDataSuplemenTerdata menyelesaikan penduduk gabungan lokal dalam satu request batch', function () {
+    aktifkanDatabaseGabungan(true);
+
+    $batchCalls = 0;
+    $sentIds = null;
+
+    Http::fake([
+        'https://api.example.com/api/v1/opendk/sync-penduduk-opendk*' => function (\Illuminate\Http\Client\Request $request) use (&$batchCalls, &$sentIds) {
+            $batchCalls++;
+            parse_str((string) parse_url($request->url(), PHP_URL_QUERY), $query);
+            $sentIds = $query['filter']['id_penduduk'] ?? null;
+
+            return Http::response([
+                'data' => [
+                    ['id' => 500, 'attributes' => ['nama' => 'Penduduk Gabungan 1', 'nik' => '123', 'sex' => 1]],
+                    ['id' => 501, 'attributes' => ['nama' => 'Penduduk Gabungan 2', 'nik' => '124', 'sex' => 2]],
+                ],
+                'meta' => ['pagination' => ['total' => 2]],
+            ], 200);
+        },
+        'https://api.example.com/api/v1/opendk/suplemen-terdata-datatable/*' => Http::response([
+            'data' => [],
+            'meta' => ['pagination' => ['total' => 0]],
+        ], 200),
+        '*' => Http::response([
+            'data' => [],
+            'meta' => ['pagination' => ['total' => 0]],
+        ], 200),
+    ]);
+
+    SuplemenTerdata::create([
+        'suplemen_id' => $this->suplemen->id,
+        'penduduk_id_gabungan' => 500,
+        'keterangan' => 'A1',
+    ]);
+    SuplemenTerdata::create([
+        'suplemen_id' => $this->suplemen->id,
+        'penduduk_id_gabungan' => 501,
+        'keterangan' => 'A2',
+    ]);
+
+    $response = $this->postJson(
+        route('data.data-suplemen.getsuplementerdata', $this->suplemen->id),
+        [],
+        ['X-Requested-With' => 'XMLHttpRequest']
+    );
+
+    $response->assertStatus(200);
+    $data = collect($response->json('data'));
+
+    expect($batchCalls)->toBe(1)
+        ->and($sentIds)->toContain('500')
+        ->and($sentIds)->toContain('501')
+        ->and($data->pluck('penduduk.nama'))->toContain('Penduduk Gabungan 1')
+        ->and($data->pluck('penduduk.nama'))->toContain('Penduduk Gabungan 2');
+});
+
+test('getDataSuplemenTerdata mengabaikan item non-array pada respons batch', function () {
+    aktifkanDatabaseGabungan(true);
+
+    Http::fake([
+        'https://api.example.com/api/v1/opendk/sync-penduduk-opendk*' => Http::response([
+            'data' => [
+                ['id' => 500, 'attributes' => ['nama' => 'Penduduk Gabungan 1', 'nik' => '123', 'sex' => 1]],
+                false,
+                null,
+            ],
+            'meta' => ['pagination' => ['total' => 3]],
+        ], 200),
+        'https://api.example.com/api/v1/opendk/suplemen-terdata-datatable/*' => Http::response([
+            'data' => [],
+            'meta' => ['pagination' => ['total' => 0]],
+        ], 200),
+        '*' => Http::response([
+            'data' => [],
+            'meta' => ['pagination' => ['total' => 0]],
+        ], 200),
+    ]);
+
+    SuplemenTerdata::create([
+        'suplemen_id' => $this->suplemen->id,
+        'penduduk_id_gabungan' => 500,
+        'keterangan' => 'A1',
+    ]);
+
+    $response = $this->postJson(
+        route('data.data-suplemen.getsuplementerdata', $this->suplemen->id),
+        [],
+        ['X-Requested-With' => 'XMLHttpRequest']
+    );
+
+    $response->assertStatus(200);
+    $data = collect($response->json('data'));
+
+    expect($data->pluck('penduduk.nama'))->toContain('Penduduk Gabungan 1');
+});
+
+test('getDataSuplemenTerdata memfilter anggota lokal berdasarkan desa', function () {
+    aktifkanDatabaseGabungan(true);
+    fakeGabunganApi();
+
+    $desaA = DataDesa::create(['desa_id' => '3301010001', 'nama' => 'Desa A']);
+    $desaB = DataDesa::create(['desa_id' => '3301010002', 'nama' => 'Desa B']);
+
+    $pendudukA = Penduduk::factory()->create(['desa_id' => $desaA->desa_id, 'nama' => 'Warga Desa A']);
+    $pendudukB = Penduduk::factory()->create(['desa_id' => $desaB->desa_id, 'nama' => 'Warga Desa B']);
+
+    SuplemenTerdata::create([
+        'suplemen_id' => $this->suplemen->id,
+        'penduduk_id' => $pendudukA->id,
+        'desa_id' => $pendudukA->desa_id,
+        'keterangan' => 'A',
+    ]);
+    SuplemenTerdata::create([
+        'suplemen_id' => $this->suplemen->id,
+        'penduduk_id' => $pendudukB->id,
+        'desa_id' => $pendudukB->desa_id,
+        'keterangan' => 'B',
+    ]);
+
+    $response = $this->postJson(
+        route('data.data-suplemen.getsuplementerdata', $this->suplemen->id),
+        ['desa' => $desaA->desa_id],
+        ['X-Requested-With' => 'XMLHttpRequest']
+    );
+
+    $response->assertStatus(200);
+    $data = collect($response->json('data'));
+
+    expect($data->pluck('penduduk.nama'))->toContain('Warga Desa A')
+        ->not->toContain('Warga Desa B');
+});
+
+test('getDataSuplemenTerdata tanpa filter desa menampilkan semua anggota lokal', function () {
+    $desaA = DataDesa::create(['desa_id' => '3301010001', 'nama' => 'Desa A']);
+    $desaB = DataDesa::create(['desa_id' => '3301010002', 'nama' => 'Desa B']);
+
+    $pendudukA = Penduduk::factory()->create(['desa_id' => $desaA->desa_id, 'nama' => 'Warga Desa A']);
+    $pendudukB = Penduduk::factory()->create(['desa_id' => $desaB->desa_id, 'nama' => 'Warga Desa B']);
+
+    SuplemenTerdata::create([
+        'suplemen_id' => $this->suplemen->id,
+        'penduduk_id' => $pendudukA->id,
+        'desa_id' => $pendudukA->desa_id,
+    ]);
+    SuplemenTerdata::create([
+        'suplemen_id' => $this->suplemen->id,
+        'penduduk_id' => $pendudukB->id,
+        'desa_id' => $pendudukB->desa_id,
+    ]);
+
+    $response = $this->postJson(
+        route('data.data-suplemen.getsuplementerdata', $this->suplemen->id),
+        ['desa' => 'Semua'],
+        ['X-Requested-With' => 'XMLHttpRequest']
+    );
+
+    $response->assertStatus(200);
+    $data = collect($response->json('data'));
+
+    expect($data->pluck('penduduk.nama'))->toContain('Warga Desa A')
+        ->toContain('Warga Desa B');
+});
+
+test('storeDetail menyimpan desa_id dari penduduk database gabungan', function () {
+    aktifkanDatabaseGabungan(true);
+    fakeGabunganApi([
+        'https://api.example.com/api/v1/opendk/sync-penduduk-opendk*' => Http::response([
+            'data' => [
+                [
+                    'id' => 99,
+                    'attributes' => [
+                        'nama' => 'Penduduk Gabungan',
+                        'nik' => '123',
+                        'sex' => 1,
+                        'config' => ['kode_desa' => '3301010001', 'nama_desa' => 'Desa API'],
+                    ],
+                ],
+            ],
+            'meta' => ['pagination' => ['total' => 1]],
+        ], 200),
+    ]);
+
+    $response = $this->post(route('data.data-suplemen.storedetail'), [
+        'suplemen_id' => $this->suplemen->id,
+        'desa_id' => '3301010001',
+        'penduduk_id_gabungan' => 99,
+        'keterangan' => 'Anggota dari gabungan',
+    ]);
+
+    $response->assertRedirect(route('data.data-suplemen.show', $this->suplemen->id));
+
+    $this->assertDatabaseHas('das_suplemen_terdata', [
+        'suplemen_id' => $this->suplemen->id,
+        'penduduk_id_gabungan' => 99,
+        'desa_id' => '3301010001',
+    ]);
+});
+
+test('storeDetail menyimpan desa_id dari penduduk lokal', function () {
+    $penduduk = Penduduk::factory()->create(['desa_id' => '3301010003', 'nama' => 'Warga Lokal']);
+
+    $response = $this->post(route('data.data-suplemen.storedetail'), [
+        'suplemen_id' => $this->suplemen->id,
+        'desa_id' => $penduduk->desa_id,
+        'penduduk_id' => $penduduk->id,
+        'keterangan' => 'Anggota lokal',
+    ]);
+
+    $response->assertRedirect(route('data.data-suplemen.show', $this->suplemen->id));
+
+    $this->assertDatabaseHas('das_suplemen_terdata', [
+        'suplemen_id' => $this->suplemen->id,
+        'penduduk_id' => $penduduk->id,
+        'desa_id' => '3301010003',
+    ]);
+});
+
+test('editDetail menampilkan view gabungan saat database gabungan aktif', function () {
+    aktifkanDatabaseGabungan(true);
+    fakeGabunganApi([
+        'https://api.example.com/api/v1/opendk/sync-penduduk-opendk*' => Http::response([
+            'data' => [
+                [
+                    'id' => 99,
+                    'attributes' => [
+                        'nama' => 'Penduduk Gabungan Edit',
+                        'nik' => '1234567890123456',
+                        'sex' => 1,
+                        'config' => ['nama_desa' => 'Desa Edit'],
+                    ],
+                ],
+            ],
+            'meta' => ['pagination' => ['total' => 1]],
+        ], 200),
+    ]);
+
+    $terdata = SuplemenTerdata::create([
+        'suplemen_id' => $this->suplemen->id,
+        'penduduk_id_gabungan' => 99,
+        'keterangan' => 'Anggota gabungan',
+    ]);
+
+    $response = $this->get(route('data.data-suplemen.editdetail', [$terdata->id, $this->suplemen->id]));
+
+    $response->assertStatus(200);
+    $response->assertViewIs('data.data_suplemen.gabungan.edit_detail');
+    $response->assertViewHas('isDatabaseGabungan', true);
+    $response->assertSee('Penduduk Gabungan Edit');
+    $response->assertSee('sync-penduduk-opendk');
+    $response->assertSee('filter[kode_desa]');
+});
+
+test('editDetail menampilkan view lokal saat database gabungan tidak aktif', function () {
+    $penduduk = Penduduk::factory()->create(['nama' => 'Anggota Lokal Edit']);
+    $terdata = SuplemenTerdata::create([
+        'suplemen_id' => $this->suplemen->id,
+        'penduduk_id' => $penduduk->id,
+        'keterangan' => 'Anggota lokal',
+    ]);
+
+    $response = $this->get(route('data.data-suplemen.editdetail', [$terdata->id, $this->suplemen->id]));
+
+    $response->assertStatus(200);
+    $response->assertViewIs('data.data_suplemen.edit_detail');
+    $response->assertViewHas('isDatabaseGabungan', false);
+});
+
+test('updateDetail memperbarui anggota gabungan saat gabungan aktif', function () {
+    aktifkanDatabaseGabungan(true);
+    fakeGabunganApi();
+
+    $terdata = SuplemenTerdata::create([
+        'suplemen_id' => $this->suplemen->id,
+        'penduduk_id_gabungan' => 99,
+        'keterangan' => 'Keterangan awal',
+    ]);
+
+    $response = $this->put(route('data.data-suplemen.updatedetail', $terdata->id), [
+        'suplemen_id' => $this->suplemen->id,
+        'desa_id' => '3301010001',
+        'penduduk_id_gabungan' => 100,
+        'keterangan' => 'Keterangan diubah',
+    ]);
+
+    $response->assertRedirect(route('data.data-suplemen.show', $this->suplemen->id));
+    $response->assertSessionHas('success', 'Anggota Suplemen berhasil diubah!');
+
+    $this->assertDatabaseHas('das_suplemen_terdata', [
+        'id' => $terdata->id,
+        'penduduk_id' => null,
+        'penduduk_id_gabungan' => 100,
+        'keterangan' => 'Keterangan diubah',
+    ]);
+});
+
+test('destroyDetail menghapus anggota saat gabungan aktif', function () {
+    aktifkanDatabaseGabungan(true);
+    fakeGabunganApi();
+
+    $terdata = SuplemenTerdata::create([
+        'suplemen_id' => $this->suplemen->id,
+        'penduduk_id_gabungan' => 99,
+        'keterangan' => 'Anggota gabungan',
+    ]);
+
+    $response = $this->delete(route('data.data-suplemen.destroydetail', [$terdata->id, $this->suplemen->id]));
+
+    $response->assertRedirect(route('data.data-suplemen.show', $this->suplemen->id));
+    $response->assertSessionHas('success', 'Anggota Suplemen berhasil dihapus!');
+
+    $this->assertDatabaseMissing('das_suplemen_terdata', ['id' => $terdata->id]);
+});
diff --git a/tests/Feature/FilePreviewFeatureTest.php b/tests/Feature/FilePreviewFeatureTest.php
new file mode 100644
index 0000000000..a952dd2c04
--- /dev/null
+++ b/tests/Feature/FilePreviewFeatureTest.php
@@ -0,0 +1,152 @@
+<?php
+
+namespace Tests\Feature;
+
+use App\Http\Middleware\CompleteProfile;
+use App\Models\Potensi;
+use App\Models\Prosedur;
+use App\Models\Regulasi;
+use App\Models\TipePotensi;
+use App\Models\TipeRegulasi;
+use App\Models\User;
+
+describe('File Preview Feature & Security Tests', function () {
+    beforeEach(function () {
+        $this->withoutMiddleware([CompleteProfile::class]);
+
+        $this->user = User::first();
+        $this->actingAs($this->user);
+
+        // Prepare test directory
+        $this->testDir = public_path('storage/test_previews');
+        if (!file_exists($this->testDir)) {
+            mkdir($this->testDir, 0777, true);
+        }
+
+        // Create dummy PDF and Image files
+        $this->pdfPath = $this->testDir . '/sample.pdf';
+        file_put_contents($this->pdfPath, "%PDF-1.4\n%test pdf content");
+
+        $this->imgPath = $this->testDir . '/sample.png';
+        // 1x1 transparent PNG
+        file_put_contents($this->imgPath, base64_decode('iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNk+M9QDwADhgGAWjR9awAAAABJRU5ErkJggg=='));
+    });
+
+    afterEach(function () {
+        if (file_exists($this->pdfPath)) {
+            @unlink($this->pdfPath);
+        }
+        if (file_exists($this->imgPath)) {
+            @unlink($this->imgPath);
+        }
+        if (is_dir($this->testDir)) {
+            @rmdir($this->testDir);
+        }
+    });
+
+    test('prosedur show page renders iframe for PDF and img for image', function () {
+        $prosedurPdf = Prosedur::create([
+            'judul_prosedur' => 'Prosedur Test PDF',
+            'file_prosedur'  => 'storage/test_previews/sample.pdf',
+            'mime_type'      => 'application/pdf',
+        ]);
+
+        $responsePdf = $this->get(route('informasi.prosedur.show', $prosedurPdf->id));
+        $responsePdf->assertStatus(200);
+        $responsePdf->assertSee('<iframe', false);
+        $responsePdf->assertSee('class="showpdf"', false);
+
+        $prosedurImg = Prosedur::create([
+            'judul_prosedur' => 'Prosedur Test Image',
+            'file_prosedur'  => 'storage/test_previews/sample.png',
+            'mime_type'      => 'image/png',
+        ]);
+
+        $responseImg = $this->get(route('informasi.prosedur.show', $prosedurImg->id));
+        $responseImg->assertStatus(200);
+        $responseImg->assertSee('<img', false);
+
+        $prosedurPdf->delete();
+        $prosedurImg->delete();
+    });
+
+    test('regulasi show page renders iframe for PDF and img for image', function () {
+        $tipe = TipeRegulasi::first();
+
+        $regulasiPdf = Regulasi::create([
+            'tipe_regulasi' => $tipe->id,
+            'judul'         => 'Regulasi Test PDF',
+            'deskripsi'     => 'Deskripsi Regulasi PDF',
+            'file_regulasi' => 'storage/test_previews/sample.pdf',
+            'mime_type'     => 'application/pdf',
+        ]);
+
+        $responsePdf = $this->get(route('informasi.regulasi.show', $regulasiPdf->id));
+        $responsePdf->assertStatus(200);
+        $responsePdf->assertSee('<iframe', false);
+        $responsePdf->assertSee('class="showpdf"', false);
+
+        $regulasiImg = Regulasi::create([
+            'tipe_regulasi' => $tipe->id,
+            'judul'         => 'Regulasi Test Image',
+            'deskripsi'     => 'Deskripsi Regulasi Image',
+            'file_regulasi' => 'storage/test_previews/sample.png',
+            'mime_type'     => 'image/png',
+        ]);
+
+        $responseImg = $this->get(route('informasi.regulasi.show', $regulasiImg->id));
+        $responseImg->assertStatus(200);
+        $responseImg->assertSee('<img', false);
+
+        $regulasiPdf->delete();
+        $regulasiImg->delete();
+    });
+
+    test('potensi show page renders iframe for PDF and img for image', function () {
+        $tipe = TipePotensi::first();
+
+        $potensiPdf = Potensi::create([
+            'kategori_id'  => $tipe->id,
+            'nama_potensi' => 'Potensi Wisata PDF',
+            'deskripsi'    => 'Deskripsi Potensi PDF',
+            'lokasi'       => 'Lokasi Wisata',
+            'file_gambar'  => 'storage/test_previews/sample.pdf',
+            'mime_type'    => 'application/pdf',
+        ]);
+
+        $responsePdf = $this->get(route('informasi.potensi.show', $potensiPdf->id));
+        $responsePdf->assertStatus(200);
+        $responsePdf->assertSee('<iframe', false);
+        $responsePdf->assertSee('class="showpdf"', false);
+
+        $potensiImg = Potensi::create([
+            'kategori_id'  => $tipe->id,
+            'nama_potensi' => 'Potensi Wisata Image',
+            'deskripsi'    => 'Deskripsi Potensi Image',
+            'lokasi'       => 'Lokasi Wisata',
+            'file_gambar'  => 'storage/test_previews/sample.png',
+            'mime_type'    => 'image/png',
+        ]);
+
+        $responseImg = $this->get(route('informasi.potensi.show', $potensiImg->id));
+        $responseImg->assertStatus(200);
+        $responseImg->assertSee('<img', false);
+
+        $potensiPdf->delete();
+        $potensiImg->delete();
+    });
+
+    test('download rejects path traversal attempts securely', function () {
+        $prosedurEvil = Prosedur::create([
+            'judul_prosedur' => 'Evil Prosedur',
+            'file_prosedur'  => '../../../../Windows/win.ini',
+            'mime_type'      => 'application/pdf',
+        ]);
+
+        // Download attempt with traversal path should not return the file
+        $downloadResponse = $this->get(route('informasi.prosedur.download', $prosedurEvil->id));
+        expect($downloadResponse->status())->toBeIn([302, 403, 404]);
+
+        $prosedurEvil->delete();
+    });
+});
diff --git a/tests/Feature/Frontend/PotensiPublicTest.php b/tests/Feature/Frontend/PotensiPublicTest.php
new file mode 100644
index 0000000000..9139b9c73f
--- /dev/null
+++ b/tests/Feature/Frontend/PotensiPublicTest.php
@@ -0,0 +1,73 @@
+<?php
+
+use App\Models\NavMenu;
+use App\Models\Potensi;
+use App\Models\TipePotensi;
+use Illuminate\Support\Facades\Cache;
+
+beforeEach(function () {
+    Cache::flush();
+    $this->tipePotensi = TipePotensi::firstOrCreate(
+        ['slug' => 'pariwisata'],
+        ['nama_kategori' => 'Pariwisata']
+    );
+
+    $this->potensi = Potensi::firstOrCreate(
+        ['nama_potensi' => 'Air Terjun Indah'],
+        [
+            'kategori_id' => $this->tipePotensi->id,
+            'deskripsi'   => 'Deskripsi wisata alam air terjun indah',
+            'lokasi'      => 'Kecamatan Contoh',
+            'file_gambar' => 'storage/potensi_kecamatan/sample.jpg',
+        ]
+    );
+});
+
+it('displays all potensi page at /potensi successfully', function () {
+    $response = $this->get('/potensi');
+
+    $response->assertOk();
+    $response->assertViewIs('pages.potensi.index');
+    $response->assertViewHas('page_title', 'Potensi');
+    $response->assertViewHas('kategori_potensi');
+});
+
+it('displays potensi by category page at /potensi/{slug} successfully', function () {
+    $response = $this->get('/potensi/' . $this->tipePotensi->slug);
+
+    $response->assertOk();
+    $response->assertViewIs('pages.potensi.index');
+    $response->assertViewHas('slug', $this->tipePotensi->slug);
+    $response->assertViewHas('kategori_potensi');
+});
+
+it('displays potensi detail page at /potensi/{kategori}/{id} successfully', function () {
+    $response = $this->get('/potensi/' . $this->tipePotensi->slug . '/' . $this->potensi->id);
+
+    $response->assertOk();
+    $response->assertViewIs('pages.potensi.show');
+    $response->assertViewHas('id', (string) $this->potensi->id);
+});
+
+it('ensures nav_menus table contains /potensi for Potensi menu', function () {
+    $nav = NavMenu::where('name', 'Potensi')->first();
+
+    expect($nav)->not->toBeNull();
+    expect($nav->url)->toBe('/potensi');
+});
+
+it('returns /potensi in the website api navmenus data', function () {
+    $response = $this->getJson('/api/frontend/v1/website');
+
+    $response->assertOk();
+    $data = $response->json('data');
+
+    $navmenusItem = collect($data)->firstWhere('id', 'navmenus');
+    expect($navmenusItem)->not->toBeNull();
+
+    $menus = $navmenusItem['attributes'][0] ?? [];
+    $potensiMenu = collect($menus)->firstWhere('name', 'Potensi');
+
+    expect($potensiMenu)->not->toBeNull();
+    expect($potensiMenu['url'])->toBe('/potensi');
+});
diff --git a/tests/Feature/GaleriControllerTest.php b/tests/Feature/GaleriControllerTest.php
new file mode 100644
index 0000000000..efc672db51
--- /dev/null
+++ b/tests/Feature/GaleriControllerTest.php
@@ -0,0 +1,495 @@
+<?php
+
+use App\Http\Middleware\Authenticate;
+use App\Http\Middleware\CompleteProfile;
+use App\Models\Album;
+use App\Models\Galeri;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Illuminate\Http\UploadedFile;
+use Illuminate\Support\Facades\Http;
+use Illuminate\Support\Facades\Session;
+use Illuminate\Support\Facades\Storage;
+use Spatie\Permission\Middleware\PermissionMiddleware;
+use Spatie\Permission\Middleware\RoleMiddleware;
+
+uses(DatabaseTransactions::class);
+
+beforeEach(function () {
+    $this->withViewErrors([]);
+    $this->withoutMiddleware([
+        Authenticate::class,
+        RoleMiddleware::class,
+        PermissionMiddleware::class,
+        CompleteProfile::class,
+    ]);
+});
+
+test('display the galeri index page', function () {
+    $album = Album::factory()->create();
+
+    $response = $this->get(route('publikasi.galeri.index', $album->id));
+
+    $response->assertStatus(200);
+    $response->assertViewIs('publikasi.galeri.index');
+});
+
+test('display the galeri create page without broken image placeholder', function () {
+    $album = Album::factory()->create();
+    Session::put('album_id', $album->id);
+
+    $response = $this->get(route('publikasi.galeri.create'));
+
+    $response->assertStatus(200);
+    $response->assertViewIs('publikasi.galeri.create');
+    // Ensure the old broken placeholder is not displayed
+    $response->assertDontSee('id="showthumbnail"', false);
+    $response->assertSee('id="file-galeri"', false);
+    $response->assertSee('id="preview-container"', false);
+});
+
+test('display the galeri edit page and render valid thumbnail path', function () {
+    Storage::fake('public');
+    $album = Album::factory()->create();
+    Session::put('album_id', $album->id);
+
+    // Put a dummy image in storage
+    Storage::disk('public')->put('publikasi/galeri/sample.jpg', 'fake content');
+
+    $galeri = Galeri::create([
+        'album_id' => $album->id,
+        'judul' => 'Galeri Edit Test',
+        'gambar' => ['sample.jpg'],
+        'jenis' => 'file',
+        'status' => true,
+    ]);
+
+    $response = $this->get(route('publikasi.galeri.edit', $galeri->id));
+
+    $response->assertStatus(200);
+    $response->assertViewIs('publikasi.galeri.edit');
+    // Should see sample.jpg in existing images
+    $response->assertSee('sample.jpg');
+    // Should render modal image trigger and download button
+    $response->assertSee('data-toggle="modal-image"', false);
+    $response->assertSee('Unduh');
+    $response->assertSee('id="modal-image-preview"', false);
+    $response->assertDontSee('publikasi/galeri/ sample.jpg');
+    $response->assertDontSee('isThumbnail(" publikasi/galeri/');
+});
+
+test('create a galeri with file upload', function () {
+    Storage::fake('public');
+    $album = Album::factory()->create();
+    Session::put('album_id', $album->id);
+
+    $file = UploadedFile::fake()->image('foto1.jpg', 600, 400);
+
+    $data = [
+        'judul' => 'Galeri Foto Kegiatan',
+        'jenis' => 'file',
+        'status' => '1',
+        'gambar' => [$file],
+    ];
+
+    $response = $this->post(route('publikasi.galeri.store'), $data);
+
+    $response->assertRedirect(route('publikasi.galeri.index', $album->id));
+    $response->assertSessionHas('success', 'Galeri berhasil disimpan!');
+
+    $galeri = Galeri::where('judul', 'Galeri Foto Kegiatan')->first();
+    expect($galeri)->not->toBeNull();
+    expect($galeri->jenis)->toBe('file');
+    expect($galeri->gambar)->toBeArray()->toHaveCount(1);
+
+    Storage::disk('public')->assertExists('publikasi/galeri/' . $galeri->gambar[0]);
+});
+
+test('create a galeri with url link', function () {
+    $album = Album::factory()->create();
+    Session::put('album_id', $album->id);
+
+    $data = [
+        'judul' => 'Galeri Video YouTube',
+        'jenis' => 'url',
+        'link' => 'https://www.youtube.com/watch?v=dQw4w9WgXcQ',
+        'status' => '1',
+    ];
+
+    $response = $this->post(route('publikasi.galeri.store'), $data);
+
+    $response->assertRedirect(route('publikasi.galeri.index', $album->id));
+    $response->assertSessionHas('success', 'Galeri berhasil disimpan!');
+
+    $galeri = Galeri::where('judul', 'Galeri Video YouTube')->first();
+    expect($galeri)->not->toBeNull();
+    expect($galeri->jenis)->toBe('url');
+    expect($galeri->link)->toBe('https://www.youtube.com/watch?v=dQw4w9WgXcQ');
+    expect($galeri->gambar)->toBeNull();
+});
+
+test('create a galeri with google drive video link', function () {
+    Http::fake(['*' => Http::response('', 200, ['Content-Type' => 'video/mp4'])]);
+    $album = Album::factory()->create();
+    Session::put('album_id', $album->id);
+
+    $data = [
+        'judul' => 'Video Kegiatan Google Drive',
+        'jenis' => 'url',
+        'link' => 'https://drive.google.com/file/d/1AbCdEf123/view?usp=sharing',
+        'status' => '1',
+    ];
+
+    $response = $this->post(route('publikasi.galeri.store'), $data);
+
+    $response->assertRedirect(route('publikasi.galeri.index', $album->id));
+    $response->assertSessionHas('success', 'Galeri berhasil disimpan!');
+
+    $galeri = Galeri::where('judul', 'Video Kegiatan Google Drive')->first();
+    expect($galeri)->not->toBeNull()
+        ->and($galeri->media_type)->toBe('video')
+        ->and($galeri->media_embed_url)->toBe('https://drive.google.com/file/d/1AbCdEf123/preview')
+        ->and($galeri->media_url)->toBe('https://drive.google.com/uc?export=download&id=1AbCdEf123');
+});
+
+test('create a galeri with google drive photo link', function () {
+    $album = Album::factory()->create();
+    Session::put('album_id', $album->id);
+
+    $data = [
+        'judul' => 'Foto Kegiatan Google Drive',
+        'jenis' => 'url',
+        'link' => 'https://drive.google.com/file/d/1AbCdEf123/view',
+        'status' => '1',
+    ];
+
+    $this->post(route('publikasi.galeri.store'), $data)
+        ->assertSessionHas('success', 'Galeri berhasil disimpan!');
+
+    $galeri = Galeri::where('judul', 'Foto Kegiatan Google Drive')->first();
+    expect($galeri)->not->toBeNull()
+        ->and($galeri->media_type)->toBe('image')
+        ->and($galeri->media_url)->toBe('https://drive.google.com/uc?export=view&id=1AbCdEf123');
+});
+
+test('manual media type overrides the automatic detection', function () {
+    Http::preventStrayRequests();
+    $album = Album::factory()->create();
+    Session::put('album_id', $album->id);
+
+    $data = [
+        'judul' => 'Video Pilihan Manual',
+        'jenis' => 'url',
+        'link' => 'https://drive.google.com/file/d/1AbCdEf123/view',
+        'media_type' => 'video',
+        'status' => '1',
+    ];
+
+    $this->post(route('publikasi.galeri.store'), $data)
+        ->assertSessionHas('success', 'Galeri berhasil disimpan!');
+
+    expect(Galeri::where('judul', 'Video Pilihan Manual')->first()->media_type)->toBe('video');
+});
+
+test('rejects a link that is not a valid url', function () {
+    $album = Album::factory()->create();
+    Session::put('album_id', $album->id);
+
+    $data = [
+        'judul' => 'Link Tidak Valid',
+        'jenis' => 'url',
+        'link' => 'bukan sebuah url',
+        'status' => '1',
+    ];
+
+    $response = $this->post(route('publikasi.galeri.store'), $data);
+
+    $response->assertSessionHasErrors('link');
+    $this->assertDatabaseMissing('galeris', ['judul' => 'Link Tidak Valid']);
+});
+
+test('rejects an unsupported manual media type', function () {
+    $album = Album::factory()->create();
+    Session::put('album_id', $album->id);
+
+    $data = [
+        'judul' => 'Tipe Media Ngawur',
+        'jenis' => 'url',
+        'link' => 'https://youtu.be/dQw4w9WgXcQ',
+        'media_type' => 'audio',
+        'status' => '1',
+    ];
+
+    $this->post(route('publikasi.galeri.store'), $data)
+        ->assertSessionHasErrors('media_type');
+
+    $this->assertDatabaseMissing('galeris', ['judul' => 'Tipe Media Ngawur']);
+});
+
+test('switching a galeri from file to link clears the stored image', function () {
+    Storage::fake('public');
+    $album = Album::factory()->create();
+    Session::put('album_id', $album->id);
+
+    Storage::disk('public')->put('publikasi/galeri/lama.jpg', 'lama');
+    $galeri = Galeri::create([
+        'album_id' => $album->id,
+        'judul' => 'Galeri Awal File',
+        'gambar' => ['lama.jpg'],
+        'jenis' => 'file',
+        'status' => true,
+    ]);
+
+    $data = [
+        'judul' => 'Galeri Jadi Link',
+        'jenis' => 'url',
+        'link' => 'https://youtu.be/dQw4w9WgXcQ',
+        'status' => '1',
+    ];
+
+    $this->put(route('publikasi.galeri.update', $galeri->id), $data)
+        ->assertSessionHas('success', 'Galeri berhasil diubah!');
+
+    $galeri->refresh();
+    expect($galeri->jenis)->toBe('url')
+        ->and($galeri->gambar)->toBeNull()
+        ->and($galeri->media_type)->toBe('youtube');
+
+    Storage::disk('public')->assertMissing('publikasi/galeri/lama.jpg');
+});
+
+test('switching a galeri from link to file clears the stored media type', function () {
+    $album = Album::factory()->create();
+    Session::put('album_id', $album->id);
+
+    $galeri = Galeri::create([
+        'album_id' => $album->id,
+        'judul' => 'Galeri Awal Link',
+        'jenis' => 'url',
+        'link' => 'https://youtu.be/dQw4w9WgXcQ',
+        'media_type' => 'youtube',
+        'status' => true,
+    ]);
+
+    $data = [
+        'judul' => 'Galeri Jadi File',
+        'jenis' => 'file',
+        'status' => '1',
+        'gambar' => [UploadedFile::fake()->image('baru.jpg', 600, 400)],
+    ];
+
+    $this->put(route('publikasi.galeri.update', $galeri->id), $data)
+        ->assertSessionHas('success', 'Galeri berhasil diubah!');
+
+    $galeri->refresh();
+    expect($galeri->jenis)->toBe('file')
+        ->and($galeri->link)->toBeNull()
+        ->and($galeri->media_type)->toBe('image');
+});
+
+test('display the galeri edit page with a link media preview', function () {
+    $album = Album::factory()->create();
+    Session::put('album_id', $album->id);
+
+    $galeri = Galeri::create([
+        'album_id' => $album->id,
+        'judul' => 'Galeri Link Video',
+        'jenis' => 'url',
+        'link' => 'https://drive.google.com/file/d/1AbCdEf123/view',
+        'media_type' => 'video',
+        'status' => true,
+    ]);
+
+    $response = $this->get(route('publikasi.galeri.edit', $galeri->id));
+
+    $response->assertStatus(200);
+    $response->assertViewIs('publikasi.galeri.edit');
+    $response->assertSee('id="media-link-preview"', false);
+    $response->assertSee('https://drive.google.com/file/d/1AbCdEf123/preview', false);
+    $response->assertSee('id="media_type"', false);
+});
+
+test('galeri datatable exposes a media column that renders link media', function () {
+    $album = Album::factory()->create();
+    Session::put('album_id', $album->id);
+
+    Galeri::create([
+        'album_id' => $album->id,
+        'judul' => 'Galeri DataTable',
+        'jenis' => 'url',
+        'link' => 'https://youtu.be/dQw4w9WgXcQ',
+        'status' => true,
+    ]);
+
+    $response = $this->getJson(route('publikasi.galeri.getdata', $album->id), [
+        'X-Requested-With' => 'XMLHttpRequest',
+    ]);
+
+    $response->assertStatus(200);
+    $row = collect($response->json('data'))->firstWhere('judul', 'Galeri DataTable');
+
+    expect($row)->not->toBeNull()
+        ->and(data_get($row, 'media_type'))->toBe('youtube')
+        ->and(data_get($row, 'media_embed_url'))->toBe('https://www.youtube.com/embed/dQw4w9WgXcQ')
+        ->and(data_get($row, 'gambar_path'))->toBe('https://img.youtube.com/vi/dQw4w9WgXcQ/hqdefault.jpg')
+        ->and(data_get($row, 'media'))->toContain('data-media-type="youtube"');
+});
+
+test('update a galeri without changing image preserves existing image', function () {
+    Storage::fake('public');
+    $album = Album::factory()->create();
+    Session::put('album_id', $album->id);
+
+    $galeri = Galeri::create([
+        'album_id' => $album->id,
+        'judul' => 'Galeri Awal',
+        'gambar' => ['existing_image.jpg'],
+        'jenis' => 'file',
+        'status' => true,
+    ]);
+
+    $data = [
+        'judul' => 'Galeri Diperbarui',
+        'jenis' => 'file',
+        'status' => '1',
+    ];
+
+    $response = $this->put(route('publikasi.galeri.update', $galeri->id), $data);
+
+    $response->assertRedirect(route('publikasi.galeri.index', $album->id));
+    $response->assertSessionHas('success', 'Galeri berhasil diubah!');
+
+    $galeri->refresh();
+    expect($galeri->judul)->toBe('Galeri Diperbarui');
+    expect($galeri->gambar)->toBe(['existing_image.jpg']);
+});
+
+test('update a galeri with new image replaces old image in storage', function () {
+    Storage::fake('public');
+    $album = Album::factory()->create();
+    Session::put('album_id', $album->id);
+
+    Storage::disk('public')->put('publikasi/galeri/old_file.jpg', 'old content');
+
+    $galeri = Galeri::create([
+        'album_id' => $album->id,
+        'judul' => 'Galeri File Lama',
+        'gambar' => ['old_file.jpg'],
+        'jenis' => 'file',
+        'status' => true,
+    ]);
+
+    $newFile = UploadedFile::fake()->image('new_file.jpg', 600, 400);
+
+    $data = [
+        'judul' => 'Galeri File Baru',
+        'jenis' => 'file',
+        'status' => '1',
+        'gambar' => [$newFile],
+    ];
+
+    $response = $this->put(route('publikasi.galeri.update', $galeri->id), $data);
+
+    $response->assertRedirect(route('publikasi.galeri.index', $album->id));
+    $response->assertSessionHas('success', 'Galeri berhasil diubah!');
+
+    $galeri->refresh();
+    expect($galeri->judul)->toBe('Galeri File Baru');
+    expect($galeri->gambar[0])->not->toBe('old_file.jpg');
+
+    // Observer should have deleted the old file
+    Storage::disk('public')->assertMissing('publikasi/galeri/old_file.jpg');
+    // And new file should exist
+    Storage::disk('public')->assertExists('publikasi/galeri/' . $galeri->gambar[0]);
+});
+
+test('delete a galeri removes image from storage', function () {
+    Storage::fake('public');
+    $album = Album::factory()->create();
+    Session::put('album_id', $album->id);
+
+    Storage::disk('public')->put('publikasi/galeri/to_delete.jpg', 'content');
+
+    $galeri = Galeri::create([
+        'album_id' => $album->id,
+        'judul' => 'Galeri Hapus',
+        'gambar' => ['to_delete.jpg'],
+        'jenis' => 'file',
+        'status' => true,
+    ]);
+
+    $response = $this->delete(route('publikasi.galeri.destroy', $galeri->id));
+
+    $response->assertRedirect(route('publikasi.galeri.index', $album->id));
+    $response->assertSessionHas('success', 'Galeri sukses dihapus!');
+
+    $this->assertDatabaseMissing('galeris', ['id' => $galeri->id]);
+    Storage::disk('public')->assertMissing('publikasi/galeri/to_delete.jpg');
+});
+
+test('toggle galeri status', function () {
+    $album = Album::factory()->create();
+    Session::put('album_id', $album->id);
+
+    $galeri = Galeri::create([
+        'album_id' => $album->id,
+        'judul' => 'Galeri Status',
+        'jenis' => 'file',
+        'status' => false,
+    ]);
+
+    $response = $this->put(route('publikasi.galeri.status', $galeri->id));
+
+    $galeri->refresh();
+    expect($galeri->status)->toBeTrue();
+    $response->assertRedirect(route('publikasi.galeri.index', $album->id));
+});
+
+test('getGambarPathAttribute handles file, youtube url, and empty safely', function () {
+    Storage::fake('public');
+    $album = Album::factory()->create();
+
+    // 1. File that exists
+    Storage::disk('public')->put('publikasi/galeri/ada.jpg', 'fake content');
+    $galeri1 = Galeri::create([
+        'album_id' => $album->id,
+        'judul' => 'Galeri Ada File',
+        'gambar' => ['ada.jpg'],
+        'jenis' => 'file',
+        'status' => true,
+    ]);
+    expect($galeri1->gambar_path)->toContain('publikasi/galeri/ada.jpg');
+
+    // 2. File that does not exist in storage -> returns fallback no-image
+    $galeri2 = Galeri::create([
+        'album_id' => $album->id,
+        'judul' => 'Galeri Tak Ada File',
+        'gambar' => ['tidak_ada.jpg'],
+        'jenis' => 'file',
+        'status' => true,
+    ]);
+    expect($galeri2->gambar_path)->toContain('no-image.png');
+
+    // 3. YouTube link -> returns YouTube thumbnail url
+    $galeri3 = Galeri::create([
+        'album_id' => $album->id,
+        'judul' => 'Galeri YouTube',
+        'link' => 'https://www.youtube.com/watch?v=dQw4w9WgXcQ',
+        'jenis' => 'url',
+        'status' => true,
+    ]);
+    expect($galeri3->gambar_path)->toBe('https://img.youtube.com/vi/dQw4w9WgXcQ/hqdefault.jpg');
+
+    // 4. Non-youtube link -> returns fallback no-image
+    $galeri4 = Galeri::create([
+        'album_id' => $album->id,
+        'judul' => 'Galeri Web Biasa',
+        'link' => 'https://opendesa.id',
+        'jenis' => 'url',
+        'status' => true,
+    ]);
+    expect($galeri4->gambar_path)->toContain('no-image.png');
+
+    // 5. Empty / null fields -> does not crash with undefined array key
+    $galeri5 = new Galeri();
+    expect($galeri5->gambar_path)->toContain('no-image.png');
+});
diff --git a/tests/Feature/LembagaAnggotaControllerTest.php b/tests/Feature/LembagaAnggotaControllerTest.php
index 828c073d00..4ede05554d 100644
--- a/tests/Feature/LembagaAnggotaControllerTest.php
+++ b/tests/Feature/LembagaAnggotaControllerTest.php
@@ -60,7 +60,7 @@
     );
 });
 
-function getLembagaPenduduk()
+function getLembagaPendudukAnggota()
 {
     $penduduk = Penduduk::inRandomOrder()->first();
     if (!$penduduk) {
@@ -70,7 +70,7 @@ function getLembagaPenduduk()
     return $penduduk;
 }
 
-function getLembagaKategori()
+function getLembagaKategoriAnggota()
 {
     $kategori = KategoriLembaga::inRandomOrder()->first();
     if (!$kategori) {
@@ -81,8 +81,8 @@ function getLembagaKategori()
 }
 
 test('it can create lembaga anggota', function () {
-    $penduduk = getLembagaPenduduk();
-    $kategori = getLembagaKategori();
+    $penduduk = getLembagaPendudukAnggota();
+    $kategori = getLembagaKategoriAnggota();
     $lembaga = Lembaga::factory()->create([
         'lembaga_kategori_id' => $kategori->id,
         'penduduk_id' => $penduduk->id,
@@ -110,8 +110,8 @@ function getLembagaKategori()
 });
 
 test('it can update lembaga anggota', function () {
-    $penduduk = getLembagaPenduduk();
-    $kategori = getLembagaKategori();
+    $penduduk = getLembagaPendudukAnggota();
+    $kategori = getLembagaKategoriAnggota();
     $lembaga = Lembaga::factory()->create([
         'lembaga_kategori_id' => $kategori->id,
         'penduduk_id' => $penduduk->id,
@@ -136,8 +136,8 @@ function getLembagaKategori()
 });
 
 test('it can delete lembaga anggota', function () {
-    $penduduk = getLembagaPenduduk();
-    $kategori = getLembagaKategori();
+    $penduduk = getLembagaPendudukAnggota();
+    $kategori = getLembagaKategoriAnggota();
     $lembaga = Lembaga::factory()->create([
         'lembaga_kategori_id' => $kategori->id,
         'penduduk_id' => $penduduk->id,
diff --git a/tests/Feature/LembagaControllerTest.php b/tests/Feature/LembagaControllerTest.php
new file mode 100644
index 0000000000..0141b78cb0
--- /dev/null
+++ b/tests/Feature/LembagaControllerTest.php
@@ -0,0 +1,238 @@
+<?php
+
+/*
+ * File ini bagian dari:
+ *
+ * OpenDK
+ *
+ * Aplikasi dan source code ini dirilis berdasarkan lisensi GPL V3
+ *
+ * Hak Cipta 2017 - 2025 Perkumpulan Desa Digital Terbuka (https://opendesa.id)
+ *
+ * Dengan ini diberikan izin, secara gratis, kepada siapa pun yang mendapatkan salinan
+ * dari perangkat lunak ini dan file dokumentasi terkait ("Aplikasi Ini"), untuk diperlakukan
+ * tanpa batasan, termasuk hak untuk menggunakan, menyalin, mengubah dan/atau mendistribusikan,
+ * asal tunduk pada syarat berikut:
+ *
+ * Pemberitahuan hak cipta di atas dan pemberitahuan izin ini harus disertakan dalam
+ * setiap salinan atau bagian penting Aplikasi Ini. Barang siapa yang menghapus atau menghilangkan
+ * pemberitahuan ini melanggar ketentuan lisensi Aplikasi Ini.
+ *
+ * PERANGKAT LUNAK INI DISEDIAKAN "SEBAGAIMANA ADANYA", TANPA JAMINAN APA PUN, BAIK TERSURAT MAUPUN
+ * TERSIRAT. PENULIS ATAU PEMEGANG HAK CIPTA SAMA SEKALI TIDAK BERTANGGUNG JAWAB ATAS KLAIM, KERUSAKAN ATAU
+ * KEWAJIBAN APAPUN ATAS PENGGUNAAN ATAU LAINNYA TERKAIT APLIKASI INI.
+ *
+ * @package    OpenDK
+ * @author     Tim Pengembang OpenDesa
+ * @copyright  Hak Cipta 2017 - 2025 Perkumpulan Desa Digital Terbuka (https://opendesa.id)
+ * @license    http://www.gnu.org/licenses/gpl.html    GPL V3
+ * @link       https://github.com/OpenSID/opendk
+ */
+
+use App\Models\KategoriLembaga;
+use App\Models\Lembaga;
+use App\Models\Penduduk;
+use App\Models\SettingAplikasi;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Illuminate\Support\Facades\Http;
+
+use function Pest\Laravel\get;
+use function Pest\Laravel\post;
+use function Pest\Laravel\put;
+
+uses(DatabaseTransactions::class);
+
+beforeEach(function () {
+    $this->withViewErrors([]);
+    $this->withoutMiddleware([
+        \App\Http\Middleware\Authenticate::class,
+        \Spatie\Permission\Middleware\PermissionMiddleware::class,
+        \Spatie\Permission\Middleware\RoleMiddleware::class,
+        \App\Http\Middleware\CompleteProfile::class,
+        \App\Http\Middleware\GlobalShareMiddleware::class,
+    ]);
+});
+
+function getLembagaPenduduk()
+{
+    $penduduk = Penduduk::inRandomOrder()->first();
+    if (!$penduduk) {
+        Penduduk::factory()->create();
+        $penduduk = Penduduk::inRandomOrder()->first();
+    }
+    return $penduduk;
+}
+
+function getLembagaKategori()
+{
+    $kategori = KategoriLembaga::inRandomOrder()->first();
+    if (!$kategori) {
+        KategoriLembaga::factory()->create();
+        $kategori = KategoriLembaga::inRandomOrder()->first();
+    }
+    return $kategori;
+}
+
+test('it can show create lembaga page (local mode)', function () {
+    $penduduk = getLembagaPenduduk();
+    $kategori = getLembagaKategori();
+
+    SettingAplikasi::updateOrCreate(
+        ['key' => 'sinkronisasi_database_gabungan'],
+        ['value' => '0']
+    );
+
+    $response = get(route('data.lembaga.create'));
+
+    $response->assertStatus(200);
+    $response->assertSee('Tambah Lembaga');
+    $response->assertSee('penduduk_id');
+});
+
+test('it can show create lembaga page (gabungan mode)', function () {
+    SettingAplikasi::updateOrCreate(
+        ['key' => 'sinkronisasi_database_gabungan'],
+        ['value' => '1']
+    );
+    SettingAplikasi::updateOrCreate(
+        ['key' => 'api_server_database_gabungan'],
+        ['value' => 'http://localhost:8000']
+    );
+    SettingAplikasi::updateOrCreate(
+        ['key' => 'api_key_database_gabungan'],
+        ['value' => 'test-key']
+    );
+
+    Http::fake([
+        'http://localhost:8000/api/v1/wilayah/desa*' => Http::response([
+            'data' => [
+                [
+                    'id' => 1,
+                    'attributes' => [
+                        'kode_desa' => '5102060001',
+                        'nama_desa' => 'Desa Test',
+                        'sebutan_desa' => 'Desa',
+                        'path' => null,
+                    ],
+                ],
+            ],
+        ], 200),
+        'http://localhost:8000/*' => Http::response(['data' => []], 200),
+    ]);
+
+    $response = get(route('data.lembaga.create'));
+
+    $response->assertStatus(200);
+    $response->assertSee('Tambah Lembaga');
+    $response->assertSee('penduduk_id_gabungan');
+});
+
+test('it can show edit lembaga page (gabungan mode)', function () {
+    SettingAplikasi::updateOrCreate(
+        ['key' => 'sinkronisasi_database_gabungan'],
+        ['value' => '1']
+    );
+    SettingAplikasi::updateOrCreate(
+        ['key' => 'api_server_database_gabungan'],
+        ['value' => 'http://localhost:8000']
+    );
+    SettingAplikasi::updateOrCreate(
+        ['key' => 'api_key_database_gabungan'],
+        ['value' => 'test-key']
+    );
+
+    Http::fake([
+        'http://localhost:8000/api/v1/wilayah/desa*' => Http::response([
+            'data' => [
+                [
+                    'id' => 1,
+                    'attributes' => [
+                        'kode_desa' => '5102060001',
+                        'nama_desa' => 'Desa Test',
+                        'sebutan_desa' => 'Desa',
+                        'path' => null,
+                    ],
+                ],
+            ],
+        ], 200),
+        'http://localhost:8000/api/v1/opendk/sync-penduduk-opendk*' => Http::response([
+            'data' => [
+                [
+                    'id' => 1,
+                    'attributes' => [
+                        'nama' => 'John Doe',
+                        'nik' => '1234567890123456',
+                    ],
+                ],
+            ],
+        ], 200),
+        'http://localhost:8000/*' => Http::response(['data' => []], 200),
+    ]);
+
+    $penduduk = getLembagaPenduduk();
+    $kategori = getLembagaKategori();
+    $lembaga = Lembaga::factory()->create([
+        'lembaga_kategori_id' => $kategori->id,
+        'penduduk_id' => $penduduk->id,
+    ]);
+
+    $response = get(route('data.lembaga.edit', $lembaga->id));
+
+    $response->assertStatus(200);
+    $response->assertSee('Ubah Lembaga');
+    $response->assertSee('penduduk_id_gabungan');
+});
+
+test('it can create lembaga in gabungan mode with integer penduduk_id', function () {
+    SettingAplikasi::updateOrCreate(
+        ['key' => 'sinkronisasi_database_gabungan'],
+        ['value' => '1']
+    );
+
+    $penduduk = getLembagaPenduduk();
+    $kategori = getLembagaKategori();
+
+    $response = post(route('data.lembaga.store'), [
+        'nama' => 'Lembaga Test Gabungan',
+        'kode' => 'LTG-' . uniqid(),
+        'lembaga_kategori_id' => $kategori->id,
+        'penduduk_id_gabungan' => $penduduk->id,
+    ]);
+
+    $response->assertRedirect(route('data.lembaga.index'));
+    $this->assertDatabaseHas('das_lembaga', [
+        'nama' => 'Lembaga Test Gabungan',
+        'lembaga_kategori_id' => $kategori->id,
+        'penduduk_id_gabungan' => $penduduk->id,
+    ]);
+});
+
+test('it can update lembaga in gabungan mode with integer penduduk_id', function () {
+    SettingAplikasi::updateOrCreate(
+        ['key' => 'sinkronisasi_database_gabungan'],
+        ['value' => '1']
+    );
+
+    $penduduk = getLembagaPenduduk();
+    $kategori = getLembagaKategori();
+    $lembaga = Lembaga::factory()->create([
+        'lembaga_kategori_id' => $kategori->id,
+        'penduduk_id_gabungan' => $penduduk->id,
+    ]);
+
+    $newPenduduk = getLembagaPenduduk();
+
+    $response = put(route('data.lembaga.update', $lembaga->id), [
+        'nama' => 'Lembaga Updated Gabungan',
+        'kode' => $lembaga->kode,
+        'lembaga_kategori_id' => $kategori->id,
+        'penduduk_id_gabungan' => $newPenduduk->id,
+    ]);
+
+    $response->assertRedirect(route('data.lembaga.index'));
+    $this->assertDatabaseHas('das_lembaga', [
+        'id' => $lembaga->id,
+        'nama' => 'Lembaga Updated Gabungan',
+        'penduduk_id_gabungan' => $newPenduduk->id,
+    ]);
+});
diff --git a/tests/Feature/LogViewerControllerTest.php b/tests/Feature/LogViewerControllerTest.php
new file mode 100644
index 0000000000..542ab9c84a
--- /dev/null
+++ b/tests/Feature/LogViewerControllerTest.php
@@ -0,0 +1,74 @@
+<?php
+
+/*
+ * File ini bagian dari:
+ *
+ * OpenDK
+ *
+ * Aplikasi dan source code ini dirilis berdasarkan lisensi GPL V3
+ *
+ * Hak Cipta 2017 - 2025 Perkumpulan Desa Digital Terbuka (https://opendesa.id)
+ *
+ * Dengan ini diberikan izin, secara gratis, kepada siapa pun yang mendapatkan salinan
+ * dari perangkat lunak ini dan file dokumentasi terkait ("Aplikasi Ini"), untuk diperlakukan
+ * tanpa batasan, termasuk hak untuk menggunakan, menyalin, mengubah dan/atau mendistribusikan,
+ * asal tunduk pada syarat berikut:
+ *
+ * Pemberitahuan hak cipta di atas dan pemberitahuan izin ini harus disertakan dalam
+ * setiap salinan atau bagian penting Aplikasi Ini. Barang siapa yang menghapus atau menghilangkan
+ * pemberitahuan ini melanggar ketentuan lisensi Aplikasi Ini.
+ *
+ * PERANGKAT LUNAK INI DISEDIAKAN "SEBAGAIMANA ADANYA", TANPA JAMINAN APA PUN, BAIK TERSURAT MAUPUN
+ * TERSIRAT. PENULIS ATAU PEMEGANG HAK CIPTA SAMA SEKALI TIDAK BERTANGGUNG JAWAB ATAS KLAIM, KERUSAKAN ATAU
+ * KEWAJIBAN APAPUN ATAS PENGGUNAAN ATAU LAINNYA TERKAIT APLIKASI INI.
+ *
+ * @package    OpenDK
+ * @author     Tim Pengembang OpenDesa
+ * @copyright  Hak Cipta 2017 - 2025 Perkumpulan Desa Digital Terbuka (https://opendesa.id)
+ * @license    http://www.gnu.org/licenses/gpl.html    GPL V3
+ * @link       https://github.com/OpenSID/opendk
+ */
+
+use App\Http\Middleware\Authenticate;
+use App\Http\Middleware\CompleteProfile;
+use App\Http\Middleware\GlobalShareMiddleware;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Illuminate\Support\Facades\Crypt;
+use Spatie\Permission\Middleware\PermissionMiddleware;
+use Spatie\Permission\Middleware\RoleMiddleware;
+
+uses(DatabaseTransactions::class);
+
+class ObjectInjectionGadget
+{
+    public static $wokenUp = false;
+
+    public function __wakeup()
+    {
+        self::$wokenUp = true;
+    }
+}
+
+beforeEach(function () {
+    ObjectInjectionGadget::$wokenUp = false;
+
+    $this->withoutMiddleware([
+        Authenticate::class,
+        RoleMiddleware::class,
+        PermissionMiddleware::class,
+        CompleteProfile::class,
+        GlobalShareMiddleware::class,
+    ]);
+});
+
+test('user-supplied log params are decrypted without unserialization', function () {
+    // Payload dibuat seolah-olah oleh penyerang yang memiliki APP_KEY:
+    // menyerupai Crypt::decrypt() lama (unserialize=true) terhadap input user.
+    // decryptString() mengembalikan string mentah tanpa unserialize, sehingga
+    // object tidak pernah diinstansiasi (tidak ada side effect __wakeup()).
+    $malicious = Crypt::encryptString(serialize(new ObjectInjectionGadget));
+
+    $this->get(route('setting.info-sistem').'?f='.urlencode($malicious));
+
+    expect(ObjectInjectionGadget::$wokenUp)->toBeFalse();
+});
diff --git a/tests/Feature/ProfilControllerTest.php b/tests/Feature/ProfilControllerTest.php
index 5a39507327..83f0eba656 100644
--- a/tests/Feature/ProfilControllerTest.php
+++ b/tests/Feature/ProfilControllerTest.php
@@ -32,7 +32,9 @@
 use App\Models\DataDesa;
 use App\Models\DataUmum;
 use App\Models\Profil;
+use App\Models\SettingAplikasi;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Illuminate\Support\Facades\Http;
 
 uses(DatabaseTransactions::class);
 
@@ -296,3 +298,54 @@ function createTestProfil(): void
     expect($rateLimitHeader)->not->toBeNull()
         ->and(is_numeric($rateLimitHeader))->toBeTrue();
 });
+
+test('letak geografis page passes data_umum to the view', function () {
+    $response = $this->get(route('profil.letak-geografis'));
+
+    $response->assertStatus(200);
+    $response->assertViewHas('data_umum');
+});
+
+test('letak geografis gabungan page renders polygon path from data_umum', function () {
+    Http::fake([
+        '*' => Http::response(['data' => []], 200),
+    ]);
+
+    SettingAplikasi::updateOrCreate(
+        ['key' => 'sinkronisasi_database_gabungan'],
+        ['value' => '1']
+    );
+
+    $data_umum = DataUmum::first();
+
+    $response = $this->get(route('profil.letak-geografis'));
+
+    $response->assertStatus(200);
+    $response->assertViewIs('pages.profil.gabungan.letakgeografis');
+    $response->assertViewHas('data_umum', function ($viewDataUmum) use ($data_umum) {
+        return $viewDataUmum !== null
+            && (int) $viewDataUmum->id === (int) $data_umum->id
+            && $viewDataUmum->path === $data_umum->path;
+    });
+});
+
+test('letak geografis gabungan page renders when polygon path is empty', function () {
+    Http::fake([
+        '*' => Http::response(['data' => []], 200),
+    ]);
+
+    SettingAplikasi::updateOrCreate(
+        ['key' => 'sinkronisasi_database_gabungan'],
+        ['value' => '1']
+    );
+
+    DataUmum::query()->update(['path' => null]);
+
+    $response = $this->get(route('profil.letak-geografis'));
+
+    $response->assertStatus(200);
+    $response->assertViewIs('pages.profil.gabungan.letakgeografis');
+    $response->assertViewHas('data_umum', function ($viewDataUmum) {
+        return $viewDataUmum === null || $viewDataUmum->path === null;
+    });
+});
diff --git a/tests/Feature/PublikasiGaleriPublikTest.php b/tests/Feature/PublikasiGaleriPublikTest.php
new file mode 100644
index 0000000000..46e94bd7c5
--- /dev/null
+++ b/tests/Feature/PublikasiGaleriPublikTest.php
@@ -0,0 +1,65 @@
+<?php
+
+use App\Models\Album;
+use App\Models\Galeri;
+use App\Models\SettingAplikasi;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Illuminate\Support\Facades\Cache;
+
+/*
+|--------------------------------------------------------------------------
+| Halaman Galeri Publik
+|--------------------------------------------------------------------------
+|
+| Tema web memuat media galeri lewat JavaScript, namun URL dasar media harus
+| benar-benar valid agar gambar tidak gagal dimuat di browser.
+|
+*/
+
+uses(DatabaseTransactions::class);
+
+beforeEach(function () {
+    SettingAplikasi::updateOrCreate(
+        ['key' => 'sinkronisasi_database_gabungan'],
+        ['value' => '0']
+    );
+
+    Cache::flush();
+
+    $this->album = Album::factory()->create([
+        'judul' => 'Album Publik',
+        'slug' => 'album-publik',
+    ]);
+});
+
+it('renders the public galeri list page', function () {
+    $response = $this->get(route('publik.publikasi.galeri', 'album-publik'));
+
+    $response->assertStatus(200);
+    $response->assertSee('galeri-container', false);
+});
+
+it('renders the public galeri detail page', function () {
+    $response = $this->get(route('publik.publikasi.galeri.detail', 'album-publik'));
+
+    $response->assertStatus(200);
+    $response->assertSee('galeri-images-container', false);
+});
+
+it('builds the storage base url without a double slash', function () {
+    $response = $this->get(route('publik.publikasi.galeri.detail', 'album-publik'));
+
+    // asset() membuang garis miring di akhir path, sehingga pemisah harus
+    // ditambahkan eksplisit. Tanpa itu nama berkas akan menempel ke folder.
+    $response->assertSee(json_encode(asset('storage/publikasi/galeri')), false)
+        ->assertSee("storageBaseUrl + '/' + item", false);
+
+    // Dua garis miring sebelum folder akan membuat gambar gagal dimuat.
+    $response->assertDontSee('//storage/publikasi/galeri/');
+});
+
+it('loads the shared media rendering helper on the galeri pages', function () {
+    $response = $this->get(route('publik.publikasi.galeri.detail', 'album-publik'));
+
+    $response->assertSee('custom.js', false);
+});
diff --git a/tests/Feature/Security/ThemeUploadSecurityTest.php b/tests/Feature/Security/ThemeUploadSecurityTest.php
index 5d3248ad65..4a5f9ad9b1 100644
--- a/tests/Feature/Security/ThemeUploadSecurityTest.php
+++ b/tests/Feature/Security/ThemeUploadSecurityTest.php
@@ -2,12 +2,11 @@
 
 namespace Tests\Feature\Security;
 
-use App\Models\User;
 use App\Models\Themes;
+use App\Models\User;
 use Database\Seeders\RoleSpatieSeeder;
 use Illuminate\Http\UploadedFile;
 use Illuminate\Support\Facades\Storage;
-use Tests\TestCase;
 use ZipArchive;
 
 describe('Theme Upload Security (RCE Prevention)', function () {
@@ -218,6 +217,90 @@
         @unlink($hooksFile);
     });
 
+    // ── Issue #57 FIX: Backtick Execution Operator Bypass ──
+
+    test('hooks_with_backtick_execution_is_rejected', function () {
+        $hooksDir = base_path('themes/default');
+        if (! is_dir($hooksDir)) {
+            mkdir($hooksDir, 0755, true);
+        }
+
+        $hooksFile = $hooksDir . '/hooks.php';
+        $proofFile = $hooksDir . '/rce_proof.txt';
+        @unlink($proofFile);
+
+        // PoC payload from Issue #57
+        file_put_contents($hooksFile, '<?php `id > ' . $proofFile . ' 2>&1`;');
+
+        $theme = Themes::firstOrCreate(
+            ['name' => 'default'],
+            [
+                'vendor'      => 'opendk',
+                'version'     => '1.0',
+                'description' => 'Default',
+                'path'        => $hooksDir,
+                'system'      => true,
+                'active'      => 0,
+            ]
+        );
+
+        $r = $this->actingAs($this->superAdmin)
+            ->get(route('setting.themes.activate', $theme));
+
+        $r->assertStatus(302);
+        $r->assertSessionHas('error');
+
+        // Verify that command was NOT executed and proof file was NOT created
+        expect(file_exists($proofFile))->toBeFalse();
+
+        @unlink($hooksFile);
+        @unlink($proofFile);
+    });
+
+    test('hooks_with_include_construct_is_rejected', function () {
+        $hooksDir = base_path('themes/default');
+        if (! is_dir($hooksDir)) {
+            mkdir($hooksDir, 0755, true);
+        }
+
+        $hooksFile = $hooksDir . '/hooks.php';
+        file_put_contents($hooksFile, '<?php include "payload.php";');
+
+        $theme = Themes::firstOrCreate(
+            ['name' => 'default'],
+            [
+                'vendor'      => 'opendk',
+                'version'     => '1.0',
+                'description' => 'Default',
+                'path'        => $hooksDir,
+                'system'      => true,
+                'active'      => 0,
+            ]
+        );
+
+        $r = $this->actingAs($this->superAdmin)
+            ->get(route('setting.themes.activate', $theme));
+
+        $r->assertStatus(302);
+        $r->assertSessionHas('error');
+
+        @unlink($hooksFile);
+    });
+
+    test('upload_with_backtick_in_blade_template_is_rejected', function () {
+        $file = makeZipWithBacktickBlade();
+        $r = $this->actingAs($this->superAdmin)
+            ->post(route('setting.themes.upload'), ['file' => $file]);
+        $r->assertJson(['status' => 'error']);
+    });
+
+    test('upload_with_misplaced_blade_template_is_rejected', function () {
+        $file = makeZipWithMisplacedBlade();
+        $r = $this->actingAs($this->superAdmin)
+            ->post(route('setting.themes.upload'), ['file' => $file]);
+        $r->assertJson(['status' => 'error']);
+    });
+
     // ── Helpers ──
 
     function makeZipWithPhp(): UploadedFile
@@ -233,6 +316,38 @@ function makeZipWithPhp(): UploadedFile
         return new UploadedFile($path, 'theme.zip', 'application/zip', null, true);
     }
 
+    /**
+     * Helper — creates a ZIP with backtick in a Blade template.
+     */
+    function makeZipWithBacktickBlade(): UploadedFile
+    {
+        $path = sys_get_temp_dir() . DIRECTORY_SEPARATOR . uniqid() . '.zip';
+        $zip  = new ZipArchive();
+        $zip->open($path, ZipArchive::CREATE);
+        $zip->addFromString('evil-theme/composer.json', '{"name":"evil"}');
+        $zip->addFromString('evil-theme/theme.json', '{"api_version":"v1"}');
+        $zip->addFromString('evil-theme/resources/views/layouts/evil.blade.php', '<div>{{ `id` }}</div>');
+        $zip->close();
+
+        return new UploadedFile($path, 'theme.zip', 'application/zip', null, true);
+    }
+
+    /**
+     * Helper — creates a ZIP with a Blade template outside resources/views/.
+     */
+    function makeZipWithMisplacedBlade(): UploadedFile
+    {
+        $path = sys_get_temp_dir() . DIRECTORY_SEPARATOR . uniqid() . '.zip';
+        $zip  = new ZipArchive();
+        $zip->open($path, ZipArchive::CREATE);
+        $zip->addFromString('evil-theme/composer.json', '{"name":"evil"}');
+        $zip->addFromString('evil-theme/theme.json', '{"api_version":"v1"}');
+        $zip->addFromString('evil-theme/misplaced.blade.php', '<div>Bad</div>');
+        $zip->close();
+
+        return new UploadedFile($path, 'theme.zip', 'application/zip', null, true);
+    }
+
     /**
      * BUG 3 FIX: Helper — creates a ZIP with a path traversal entry.
      */
@@ -250,4 +365,4 @@ function makeZipWithPathTraversal(): UploadedFile
         return new UploadedFile($path, 'theme.zip', 'application/zip', null, true);
     }
 
-})->group('security', 'theme-upload');
\ No newline at end of file
+})->group('security', 'theme-upload');
diff --git a/tests/Feature/SuplemenExportTest.php b/tests/Feature/SuplemenExportTest.php
index d57d48c9d3..fc2854d7ab 100644
--- a/tests/Feature/SuplemenExportTest.php
+++ b/tests/Feature/SuplemenExportTest.php
@@ -2,11 +2,14 @@
 
 use App\Exports\ExportSuplemen;
 use App\Exports\ExportSuplemenTerdata;
+use App\Exports\ExportSuplemenTerdataGabungan;
 use App\Models\DataDesa;
 use App\Models\Penduduk;
+use App\Models\SettingAplikasi;
 use App\Models\Suplemen;
 use App\Models\SuplemenTerdata;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Illuminate\Support\Facades\Http;
 use Maatwebsite\Excel\Facades\Excel;
 
 uses(DatabaseTransactions::class);
@@ -227,17 +230,17 @@
     // Arrange: Buat data suplemen dan terdata
     Suplemen::query()->delete();
     SuplemenTerdata::query()->delete();
-    
+
     $desa = DataDesa::factory()->create();
     $penduduk = Penduduk::factory()->create(['desa_id' => $desa->desa_id]);
-    
+
     $suplemen = Suplemen::create([
         'nama' => 'Test Suplemen Terdata',
         'slug' => 'test-suplemen-terdata',
         'sasaran' => 1,
         'keterangan' => 'Test Keterangan'
     ]);
-    
+
     SuplemenTerdata::create([
         'suplemen_id' => $suplemen->id,
         'penduduk_id' => $penduduk->id,
@@ -266,23 +269,121 @@
     expect($collection)->toHaveCount(0);
 });
 
+test('export suplemen terdata with gabungan resolver fills penduduk relation', function () {
+    Suplemen::query()->delete();
+    SuplemenTerdata::query()->delete();
+
+    Http::fake([
+        'https://api.example.com/api/v1/opendk/sync-penduduk-opendk*' => Http::response([
+            'data' => [
+                [
+                    'id' => 500,
+                    'attributes' => [
+                        'nama' => 'Penduduk Dari API',
+                        'nik' => '1234567890123456',
+                        'sex' => 1,
+                        'config' => ['kode_desa' => '3301010001', 'nama_desa' => 'Desa API'],
+                    ],
+                ],
+            ],
+            'meta' => ['pagination' => ['total' => 1]],
+        ], 200),
+    ]);
+
+    SettingAplikasi::updateOrCreate(['key' => 'api_server_database_gabungan'], ['value' => 'https://api.example.com']);
+    SettingAplikasi::updateOrCreate(['key' => 'api_key_database_gabungan'], ['value' => 'test-api-key']);
+
+    $suplemen = Suplemen::create([
+        'nama' => 'Suplemen Gabungan',
+        'slug' => 'suplemen-gabungan',
+        'sasaran' => 1,
+        'keterangan' => 'Test',
+    ]);
+
+    $terdata = SuplemenTerdata::create([
+        'suplemen_id' => $suplemen->id,
+        'penduduk_id_gabungan' => 500,
+        'desa_id' => '3301010001',
+        'keterangan' => 'A1',
+    ]);
+
+    expect(SuplemenTerdata::count())->toBe(1)
+        ->and(SuplemenTerdata::first()->penduduk_id_gabungan)->toBe(500);
+
+    $export = new ExportSuplemenTerdataGabungan($suplemen->id, [], [500]);
+
+    $collection = $export->collection();
+
+    expect($collection)->toHaveCount(1)
+        ->and($collection->first()->penduduk_id_gabungan)->toBe(500)
+        ->and($collection->first()->desa_id)->toBe('3301010001')
+        ->and($collection->first()->penduduk)->not->toBeNull()
+        ->and($collection->first()->penduduk->nama)->toBe('Penduduk Dari API');
+});
+
+test('export suplemen terdata excel calls gabungan api when gabungan active', function () {
+    SettingAplikasi::updateOrCreate(['key' => 'sinkronisasi_database_gabungan'], ['value' => '1']);
+    SettingAplikasi::updateOrCreate(['key' => 'api_server_database_gabungan'], ['value' => 'https://api.example.com']);
+    SettingAplikasi::updateOrCreate(['key' => 'api_key_database_gabungan'], ['value' => 'test-api-key']);
+
+    Http::fake([
+        'https://api.example.com/api/v1/opendk/sync-penduduk-opendk*' => Http::response([
+            'data' => [
+                [
+                    'id' => 500,
+                    'attributes' => [
+                        'nama' => 'Penduduk API Export',
+                        'nik' => '1234567890123456',
+                        'sex' => 1,
+                        'config' => ['kode_desa' => '3301010001', 'nama_desa' => 'Desa API'],
+                    ],
+                ],
+            ],
+            'meta' => ['pagination' => ['total' => 1]],
+        ], 200),
+        '*' => Http::response([
+            'data' => [],
+            'meta' => ['pagination' => ['total' => 0]],
+        ], 200),
+    ]);
+
+    $suplemen = Suplemen::create([
+        'nama' => 'Suplemen Gabungan Export',
+        'slug' => 'suplemen-gabungan-export',
+        'sasaran' => 1,
+        'keterangan' => 'Test',
+    ]);
+
+    SuplemenTerdata::create([
+        'suplemen_id' => $suplemen->id,
+        'penduduk_id_gabungan' => 500,
+        'desa_id' => '3301010001',
+        'keterangan' => 'A1',
+    ]);
+
+    $response = $this->get("/data/data-suplemen/export-terdata-excel/{$suplemen->id}");
+
+    $response->assertSuccessful();
+    Http::assertSent(fn ($request) => str_contains($request->url(), 'api/v1/opendk/sync-penduduk-opendk'));
+});
+
 test('export suplemen terdata by id with multiple terdata', function () {
     // Arrange: Buat data suplemen dengan multiple terdata
     Suplemen::query()->delete();
     SuplemenTerdata::query()->delete();
-    
+
     $desa = DataDesa::factory()->create();
     $penduduk1 = Penduduk::factory()->create(['desa_id' => $desa->desa_id, 'nama' => 'Penduduk 1']);
     $penduduk2 = Penduduk::factory()->create(['desa_id' => $desa->desa_id, 'nama' => 'Penduduk 2']);
     $penduduk3 = Penduduk::factory()->create(['desa_id' => $desa->desa_id, 'nama' => 'Penduduk 3']);
-    
+
     $suplemen = Suplemen::create([
         'nama' => 'Test Suplemen Multiple',
         'slug' => 'test-suplemen-multiple',
         'sasaran' => 1,
         'keterangan' => 'Test Keterangan'
     ]);
-    
+
     SuplemenTerdata::create([
         'suplemen_id' => $suplemen->id,
         'penduduk_id' => $penduduk1->id,
diff --git a/tests/Unit/FilePreviewSecurityTest.php b/tests/Unit/FilePreviewSecurityTest.php
new file mode 100644
index 0000000000..1c91a8264a
--- /dev/null
+++ b/tests/Unit/FilePreviewSecurityTest.php
@@ -0,0 +1,107 @@
+<?php
+
+use App\Http\Middleware\SecurityHeaders;
+use App\Models\Potensi;
+use App\Models\Prosedur;
+use App\Models\Regulasi;
+use App\Traits\HandlesFileUpload;
+use Illuminate\Http\Request;
+use Illuminate\Http\Response;
+
+// Dummy class to test HandlesFileUpload trait
+class FileUploadSecurityTestHelper
+{
+    use HandlesFileUpload;
+
+    public function testResolvePath(?string $path): ?string
+    {
+        return $this->resolveSecureFilePath($path);
+    }
+}
+
+describe('File Preview Security & Detection Tests', function () {
+
+    test('is_pdf helper correctly identifies PDF paths and MIME types', function () {
+        expect(is_pdf('doc.pdf'))->toBeTrue();
+        expect(is_pdf('DOC.PDF'))->toBeTrue();
+        expect(is_pdf('storage/files/prosedur.pdf'))->toBeTrue();
+        expect(is_pdf(null, 'application/pdf'))->toBeTrue();
+        expect(is_pdf(null, 'pdf'))->toBeTrue();
+        expect(is_pdf('doc.png', 'application/pdf'))->toBeTrue();
+        expect(is_pdf('photo.png', 'image/png'))->toBeFalse();
+        expect(is_pdf('photo.jpg'))->toBeFalse();
+        expect(is_pdf(null, null))->toBeFalse();
+    });
+
+    test('models have functional is_pdf attribute', function () {
+        $prosedurPdf = new Prosedur(['file_prosedur' => 'storage/doc.pdf', 'mime_type' => 'application/pdf']);
+        expect($prosedurPdf->is_pdf)->toBeTrue();
+
+        $prosedurImg = new Prosedur(['file_prosedur' => 'storage/pic.jpg', 'mime_type' => 'image/jpeg']);
+        expect($prosedurImg->is_pdf)->toBeFalse();
+
+        $regulasiPdf = new Regulasi(['file_regulasi' => 'storage/sk.pdf', 'mime_type' => 'application/pdf']);
+        expect($regulasiPdf->is_pdf)->toBeTrue();
+
+        $regulasiImg = new Regulasi(['file_regulasi' => 'storage/banner.png', 'mime_type' => 'image/png']);
+        expect($regulasiImg->is_pdf)->toBeFalse();
+
+        $potensiPdf = new Potensi(['file_gambar' => 'storage/wisata.pdf', 'mime_type' => 'application/pdf']);
+        expect($potensiPdf->is_pdf)->toBeTrue();
+
+        $potensiImg = new Potensi(['file_gambar' => 'storage/wisata.png', 'mime_type' => 'image/png']);
+        expect($potensiImg->is_pdf)->toBeFalse();
+    });
+
+    test('HandlesFileUpload rejects path traversal and files outside allowed directories', function () {
+        $helper = new FileUploadSecurityTestHelper();
+
+        // Null and empty paths
+        expect($helper->testResolvePath(null))->toBeNull();
+        expect($helper->testResolvePath(''))->toBeNull();
+
+        // Path traversal attempts
+        expect($helper->testResolvePath('../../../Windows/win.ini'))->toBeNull();
+        expect($helper->testResolvePath('..\\..\\..\\Windows\\win.ini'))->toBeNull();
+        expect($helper->testResolvePath('storage/../../../../etc/passwd'))->toBeNull();
+        expect($helper->testResolvePath('/etc/passwd'))->toBeNull();
+
+        // Safe resolution for real file inside public_path
+        $tempFile = public_path('test_preview_security_probe.txt');
+        file_put_contents($tempFile, 'safe content');
+
+        try {
+            $resolved = $helper->testResolvePath('test_preview_security_probe.txt');
+            expect($resolved)->not->toBeNull();
+            expect(realpath($resolved))->toBe(realpath($tempFile));
+        } finally {
+            if (file_exists($tempFile)) {
+                unlink($tempFile);
+            }
+        }
+    });
+
+    test('SecurityHeaders middleware enforces secure CSP in production', function () {
+        app()['env'] = 'production';
+        try {
+            $middleware = new SecurityHeaders();
+            $request = Request::create('/', 'GET');
+            $response = $middleware->handle($request, function () {
+                return new Response('<html><body>Hello</body></html>');
+            });
+
+            $csp = $response->headers->get('Content-Security-Policy');
+            expect($csp)->not->toBeNull();
+
+            // Verify CSP directives for secure PDF preview
+            expect($csp)->toContain("object-src 'self' blob:");
+            expect($csp)->toContain("frame-src 'self' blob: data:");
+            expect($csp)->toContain("img-src 'self' * data: blob:");
+            expect($csp)->toContain("frame-ancestors 'self'");
+            expect($csp)->not->toContain('report-uri ;');
+        } finally {
+            app()['env'] = 'testing';
+        }
+    });
+
+});
diff --git a/tests/Unit/Listeners/ClearProsedurCacheListenerTest.php b/tests/Unit/Listeners/ClearProsedurCacheListenerTest.php
new file mode 100644
index 0000000000..a3a6e5d692
--- /dev/null
+++ b/tests/Unit/Listeners/ClearProsedurCacheListenerTest.php
@@ -0,0 +1,55 @@
+<?php
+
+use App\Events\ProsedurChanged;
+use App\Listeners\ClearProsedurCacheListener;
+use App\Models\Prosedur;
+use App\Services\CacheService;
+
+it('clears prosedur cache when event is dispatched', function () {
+    $cacheService = Mockery::mock(CacheService::class);
+    $cacheService->shouldReceive('removeCachePrefix')
+        ->once()
+        ->with('prosedur:api')
+        ->andReturnTrue();
+
+    $this->app->instance(CacheService::class, $cacheService);
+
+    $listener = new ClearProsedurCacheListener();
+    $event = new ProsedurChanged(new Prosedur());
+
+    $listener->handle($event);
+});
+
+it('reads correct cache prefix from config', function () {
+    config(['theme-api.prosedur.cache_prefix' => 'custom:prosedur']);
+
+    $cacheService = Mockery::mock(CacheService::class);
+    $cacheService->shouldReceive('removeCachePrefix')
+        ->once()
+        ->with('custom:prosedur')
+        ->andReturnTrue();
+
+    $this->app->instance(CacheService::class, $cacheService);
+
+    $listener = new ClearProsedurCacheListener();
+    $event = new ProsedurChanged(new Prosedur());
+
+    $listener->handle($event);
+});
+
+it('handles exception gracefully', function () {
+    $cacheService = Mockery::mock(CacheService::class);
+    $cacheService->shouldReceive('removeCachePrefix')
+        ->once()
+        ->andThrow(new \Exception('Cache error'));
+
+    $this->app->instance(CacheService::class, $cacheService);
+
+    \Illuminate\Support\Facades\Log::shouldReceive('error')->once();
+
+    $listener = new ClearProsedurCacheListener();
+    $event = new ProsedurChanged(new Prosedur());
+
+    // Should not throw exception
+    $listener->handle($event);
+});
diff --git a/tests/Unit/Models/GaleriTest.php b/tests/Unit/Models/GaleriTest.php
new file mode 100644
index 0000000000..86d3b13926
--- /dev/null
+++ b/tests/Unit/Models/GaleriTest.php
@@ -0,0 +1,134 @@
+<?php
+
+use App\Models\Album;
+use App\Models\Galeri;
+use Illuminate\Support\Facades\Storage;
+
+/*
+|--------------------------------------------------------------------------
+| Galeri media resolvers
+|--------------------------------------------------------------------------
+|
+| Galeri dengan `jenis = url` harus bisa ditampilkan baik di web maupun di
+| admin, baik berupa foto, video Google Drive, maupun video YouTube.
+|
+*/
+
+beforeEach(function () {
+    Storage::fake('public');
+    $this->album = Album::factory()->create();
+});
+
+it('exposes image media for google drive photo links', function () {
+    $galeri = Galeri::create([
+        'album_id' => $this->album->id,
+        'judul' => 'Foto Google Drive',
+        'jenis' => 'url',
+        'link' => 'https://drive.google.com/file/d/1AbCdEf123/view?usp=sharing',
+        'media_type' => 'image',
+        'status' => true,
+    ]);
+
+    expect($galeri->media_type)->toBe('image')
+        ->and($galeri->media_url)->toBe('https://drive.google.com/uc?export=view&id=1AbCdEf123')
+        ->and($galeri->media_embed_url)->toBeNull()
+        ->and($galeri->gambar_path)->toBe('https://drive.google.com/uc?export=view&id=1AbCdEf123');
+});
+
+it('exposes video media for google drive video links', function () {
+    $galeri = Galeri::create([
+        'album_id' => $this->album->id,
+        'judul' => 'Video Google Drive',
+        'jenis' => 'url',
+        'link' => 'https://drive.google.com/file/d/1AbCdEf123/view',
+        'media_type' => 'video',
+        'status' => true,
+    ]);
+
+    expect($galeri->media_type)->toBe('video')
+        ->and($galeri->media_embed_url)->toBe('https://drive.google.com/file/d/1AbCdEf123/preview')
+        ->and($galeri->media_url)->toContain('id=1AbCdEf123');
+});
+
+it('exposes embed media for youtube links', function () {
+    $galeri = Galeri::create([
+        'album_id' => $this->album->id,
+        'judul' => 'Video YouTube',
+        'jenis' => 'url',
+        'link' => 'https://youtu.be/dQw4w9WgXcQ',
+        'status' => true,
+    ]);
+
+    expect($galeri->media_type)->toBe('youtube')
+        ->and($galeri->media_embed_url)->toBe('https://www.youtube.com/embed/dQw4w9WgXcQ')
+        ->and($galeri->gambar_path)->toBe('https://img.youtube.com/vi/dQw4w9WgXcQ/hqdefault.jpg');
+});
+
+it('exposes media url for direct video files', function () {
+    $galeri = Galeri::create([
+        'album_id' => $this->album->id,
+        'judul' => 'Video MP4',
+        'jenis' => 'url',
+        'link' => 'https://sitim.go.id/video/kegiatan.mp4',
+        'status' => true,
+    ]);
+
+    expect($galeri->media_type)->toBe('video')
+        ->and($galeri->media_url)->toBe('https://sitim.go.id/video/kegiatan.mp4')
+        ->and($galeri->media_embed_url)->toBeNull();
+});
+
+it('falls back to a local file thumbnail for uploaded media', function () {
+    Storage::disk('public')->put('publikasi/galeri/unggah.jpg', 'fake content');
+
+    $galeri = Galeri::create([
+        'album_id' => $this->album->id,
+        'judul' => 'Foto Unggah',
+        'jenis' => 'file',
+        'gambar' => ['unggah.jpg'],
+        'status' => true,
+    ]);
+
+    expect($galeri->media_type)->toBe('image')
+        ->and($galeri->media_url)->toContain('publikasi/galeri/unggah.jpg')
+        ->and($galeri->media_embed_url)->toBeNull();
+});
+
+it('returns a no image placeholder when nothing can be displayed', function () {
+    $galeri = new Galeri();
+
+    expect($galeri->media_type)->toBe('unknown')
+        ->and($galeri->media_url)->toBeNull()
+        ->and($galeri->media_embed_url)->toBeNull()
+        ->and($galeri->gambar_path)->toContain('no-image.png');
+});
+
+it('keeps the original link intact for the detail page', function () {
+    $galeri = Galeri::create([
+        'album_id' => $this->album->id,
+        'judul' => 'Link Asli',
+        'jenis' => 'url',
+        'link' => 'https://drive.google.com/file/d/1AbCdEf123/view?usp=sharing',
+        'media_type' => 'video',
+        'status' => true,
+    ]);
+
+    expect($galeri->link)->toBe('https://drive.google.com/file/d/1AbCdEf123/view?usp=sharing');
+});
+
+it('serializes media fields for the api', function () {
+    $galeri = Galeri::create([
+        'album_id' => $this->album->id,
+        'judul' => 'Serialisasi',
+        'jenis' => 'url',
+        'link' => 'https://drive.google.com/file/d/1AbCdEf123/view',
+        'media_type' => 'video',
+        'status' => true,
+    ]);
+
+    $data = $galeri->toArray();
+
+    expect($data)->toHaveKeys(['media_type', 'media_url', 'media_embed_url', 'gambar_path'])
+        ->and($data['media_type'])->toBe('video')
+        ->and($data['media_embed_url'])->toBe('https://drive.google.com/file/d/1AbCdEf123/preview');
+});
diff --git a/tests/Unit/SecurityHeadersTest.php b/tests/Unit/SecurityHeadersTest.php
new file mode 100644
index 0000000000..f89ecd5165
--- /dev/null
+++ b/tests/Unit/SecurityHeadersTest.php
@@ -0,0 +1,39 @@
+<?php
+
+use App\Http\Middleware\SecurityHeaders;
+use Illuminate\Http\Request;
+use Illuminate\Http\Response;
+
+function handleWithSecurityHeaders(string $env = 'production'): Response
+{
+    app()['env'] = $env;
+
+    return (new SecurityHeaders())->handle(
+        Request::create('/', 'GET'),
+        fn () => new Response('<html><body>Hello</body></html>')
+    );
+}
+
+describe('SecurityHeaders nosniff', function () {
+    test('menambahkan X-Content-Type-Options nosniff di production', function () {
+        $response = handleWithSecurityHeaders('production');
+
+        expect($response->headers->get('X-Content-Type-Options'))->toBe('nosniff');
+    });
+
+    test('nosniff tetap dipasang di luar production', function () {
+        try {
+            $response = handleWithSecurityHeaders('testing');
+
+            expect($response->headers->get('X-Content-Type-Options'))->toBe('nosniff');
+        } finally {
+            app()['env'] = 'testing';
+        }
+    });
+
+    test('tidak membocorkan versi server', function () {
+        $response = handleWithSecurityHeaders('production');
+
+        expect($response->headers->has('X-Powered-By'))->toBeFalse();
+    });
+});
diff --git a/tests/Unit/Services/MediaLinkServiceTest.php b/tests/Unit/Services/MediaLinkServiceTest.php
new file mode 100644
index 0000000000..02348896bd
--- /dev/null
+++ b/tests/Unit/Services/MediaLinkServiceTest.php
@@ -0,0 +1,248 @@
+<?php
+
+use App\Services\MediaLinkService;
+use Illuminate\Http\Client\Request;
+use Illuminate\Support\Facades\Http;
+
+/*
+|--------------------------------------------------------------------------
+| Media Link Service
+|--------------------------------------------------------------------------
+|
+| Menguji resolusi link media (Google Drive, YouTube, Vimeo, file langsung)
+| menjadi tipe media + URL yang bisa langsung ditampilkan di web/admin.
+|
+*/
+
+beforeEach(function () {
+    $this->service = new MediaLinkService();
+});
+
+describe('youtube', function () {
+    it('resolves a regular watch url', function () {
+        $media = $this->service->resolve('https://www.youtube.com/watch?v=dQw4w9WgXcQ');
+
+        expect($media->type)->toBe('youtube')
+            ->and($media->id)->toBe('dQw4w9WgXcQ')
+            ->and($media->embedUrl)->toBe('https://www.youtube.com/embed/dQw4w9WgXcQ')
+            ->and($media->thumbnail)->toBe('https://img.youtube.com/vi/dQw4w9WgXcQ/hqdefault.jpg');
+    });
+
+    it('resolves short, embed, shorts and live urls', function (string $url, string $id) {
+        expect($this->service->resolve($url)->type)->toBe('youtube')
+            ->and($this->service->resolve($url)->id)->toBe($id);
+    })->with([
+        ['https://youtu.be/dQw4w9WgXcQ', 'dQw4w9WgXcQ'],
+        ['https://www.youtube.com/embed/dQw4w9WgXcQ', 'dQw4w9WgXcQ'],
+        ['https://www.youtube.com/shorts/dQw4w9WgXcQ', 'dQw4w9WgXcQ'],
+        ['https://www.youtube.com/live/dQw4w9WgXcQ', 'dQw4w9WgXcQ'],
+        ['https://m.youtube.com/watch?v=dQw4w9WgXcQ&t=30s', 'dQw4w9WgXcQ'],
+    ]);
+
+    it('ignores a non youtube url', function () {
+        expect($this->service->resolve('https://opendesa.id')->type)->not->toBe('youtube');
+    });
+});
+
+describe('google drive', function () {
+    it('resolves the file view url to a direct image url', function () {
+        $media = $this->service->resolve('https://drive.google.com/file/d/1AbCdEf123/view?usp=sharing');
+
+        expect($media->type)->toBe('image')
+            ->and($media->id)->toBe('1AbCdEf123')
+            ->and($media->url)->toBe('https://drive.google.com/uc?export=view&id=1AbCdEf123')
+            ->and($media->embedUrl)->toBeNull();
+    });
+
+    it('resolves the uc export url', function () {
+        $media = $this->service->resolve('https://drive.google.com/uc?export=view&id=1AbCdEf123');
+
+        expect($media->id)->toBe('1AbCdEf123')
+            ->and($media->url)->toBe('https://drive.google.com/uc?export=view&id=1AbCdEf123');
+    });
+
+    it('resolves the open id url', function () {
+        $media = $this->service->resolve('https://drive.google.com/open?id=1AbCdEf123');
+
+        expect($media->id)->toBe('1AbCdEf123')
+            ->and($media->url)->toBe('https://drive.google.com/uc?export=view&id=1AbCdEf123');
+    });
+
+    it('resolves a drive video to a playable preview embed', function () {
+        $media = $this->service->resolve('https://drive.google.com/file/d/1AbCdEf123/view', 'video');
+
+        expect($media->type)->toBe('video')
+            ->and($media->embedUrl)->toBe('https://drive.google.com/file/d/1AbCdEf123/preview')
+            ->and($media->url)->toBe('https://drive.google.com/uc?export=download&id=1AbCdEf123');
+    });
+
+    it('resolves the docs.google.com viewer url', function () {
+        expect($this->service->resolve('https://docs.google.com/file/d/1AbCdEf123/view')->id)->toBe('1AbCdEf123');
+    });
+
+    it('marks a drive folder as unknown', function () {
+        $media = $this->service->resolve('https://drive.google.com/drive/folders/1AbCdEf123');
+
+        expect($media->type)->toBe('unknown')
+            ->and($media->id)->toBeNull();
+    });
+});
+
+describe('direct files', function () {
+    it('detects image urls by extension', function (string $url) {
+        $media = $this->service->resolve($url);
+
+        expect($media->type)->toBe('image')
+            ->and($media->url)->toBe($url)
+            ->and($media->embedUrl)->toBeNull();
+    })->with([
+        ['https://contoh.sitim.go.id/foto/kegiatan.jpg'],
+        ['https://contoh.sitim.go.id/foto/kegiatan.JPEG'],
+        ['https://contoh.sitim.go.id/foto/kegiatan.png'],
+        ['https://contoh.sitim.go.id/foto/kegiatan.webp'],
+        ['https://contoh.sitim.go.id/foto/kegiatan.gif'],
+    ]);
+
+    it('detects video urls by extension', function (string $url) {
+        $media = $this->service->resolve($url);
+
+        expect($media->type)->toBe('video')
+            ->and($media->url)->toBe($url);
+    })->with([
+        ['https://contoh.sitim.go.id/video/kegiatan.mp4'],
+        ['https://contoh.sitim.go.id/video/kegiatan.webm'],
+        ['https://contoh.sitim.go.id/video/kegiatan.ogv'],
+        ['https://contoh.sitim.go.id/video/kegiatan.mov'],
+    ]);
+
+    it('resolves a vimeo url to an embed', function () {
+        $media = $this->service->resolve('https://vimeo.com/123456789');
+
+        expect($media->type)->toBe('video')
+            ->and($media->id)->toBe('123456789')
+            ->and($media->embedUrl)->toBe('https://player.vimeo.com/video/123456789');
+    });
+});
+
+describe('fallback', function () {
+    it('returns unknown for a plain url without media hints', function () {
+        $media = $this->service->resolve('https://opendesa.id');
+
+        expect($media->type)->toBe('unknown')
+            ->and($media->url)->toBe('https://opendesa.id')
+            ->and($media->embedUrl)->toBeNull()
+            ->and($media->thumbnail)->toBeNull();
+    });
+
+    it('returns unknown for empty or invalid values', function (?string $url) {
+        $media = $this->service->resolve($url);
+
+        expect($media->type)->toBe('unknown')
+            ->and($media->url)->toBeNull();
+    })->with([null, '', '   ', 'bukan-url']);
+
+    it('respects the manual type hint for unknown urls', function () {
+        expect($this->service->resolve('https://opendesa.id', 'image')->type)->toBe('image')
+            ->and($this->service->resolve('https://opendesa.id', 'video')->type)->toBe('video');
+    });
+
+    it('never trusts a type hint that contradicts the provider', function () {
+        expect($this->service->resolve('https://youtu.be/dQw4w9WgXcQ', 'image')->type)->toBe('youtube');
+    });
+});
+
+describe('probing', function () {
+    it('returns the media type from the content-type header', function (string $contentType, string $expected) {
+        Http::fake(['*' => Http::response('', 200, ['Content-Type' => $contentType])]);
+
+        expect($this->service->probe('https://contoh.sitim.go.id/media/berkas'))->toBe($expected);
+    })->with([
+        ['image/jpeg', 'image'],
+        ['image/png', 'image'],
+        ['video/mp4', 'video'],
+        ['application/octet-stream', 'unknown'],
+    ]);
+
+    it('falls back to the filename extension when content type is generic', function () {
+        Http::fake(['*' => Http::response('', 200, [
+            'Content-Type' => 'application/octet-stream',
+            'Content-Disposition' => 'attachment; filename="dokumentasi.mp4"',
+        ])]);
+
+        expect($this->service->probe('https://contoh.sitim.go.id/media/berkas'))->toBe('video');
+    });
+
+    it('resolves the drive download url before probing', function () {
+        Http::fake([
+            'drive.google.com/*' => Http::response('', 200, ['Content-Type' => 'video/mp4']),
+            '*' => Http::response('', 500),
+        ]);
+
+        expect($this->service->probe('https://drive.google.com/file/d/1AbCdEf123/view'))->toBe('video');
+
+        Http::assertSent(function (Request $request) {
+            return str_contains($request->url(), 'uc?export=download&id=1AbCdEf123');
+        });
+    });
+
+    it('returns null when the request fails', function () {
+        Http::fake(['*' => Http::response('', 500)]);
+
+        expect($this->service->probe('https://contoh.sitim.go.id/media/berkas'))->toBeNull();
+    });
+
+    it('does not probe empty urls', function () {
+        Http::preventStrayRequests();
+
+        expect($this->service->probe(null))->toBeNull()
+            ->and($this->service->probe('bukan-url'))->toBeNull();
+    });
+});
+
+describe('detectType', function () {
+    it('uses the resolved type without touching the network', function () {
+        Http::preventStrayRequests();
+
+        expect($this->service->detectType('https://youtu.be/dQw4w9WgXcQ'))->toBe('youtube')
+            ->and($this->service->detectType('https://contoh.sitim.go.id/foto.jpg'))->toBe('image')
+            ->and($this->service->detectType('https://contoh.sitim.go.id/video.mp4'))->toBe('video');
+    });
+
+    it('probes only when the url is inconclusive', function () {
+        Http::fake(['*' => Http::response('', 200, ['Content-Type' => 'video/mp4'])]);
+
+        expect($this->service->detectType('https://contoh.sitim.go.id/media/berkas'))->toBe('video');
+
+        Http::assertSentCount(1);
+    });
+
+    it('probes google drive links because they carry no file extension', function () {
+        Http::fake([
+            'drive.google.com/*' => Http::response('', 200, ['Content-Type' => 'video/mp4']),
+            '*' => Http::response('', 500),
+        ]);
+
+        expect($this->service->detectType('https://drive.google.com/file/d/1AbCdEf123/view'))->toBe('video');
+
+        Http::assertSentCount(1);
+    });
+
+    it('falls back to the default drive type when probing fails', function () {
+        Http::fake(['*' => Http::response('', 500)]);
+
+        expect($this->service->detectType('https://drive.google.com/file/d/1AbCdEf123/view'))->toBe('image');
+    });
+
+    it('never probes when the user picked the type manually', function () {
+        Http::preventStrayRequests();
+
+        expect($this->service->detectType('https://contoh.sitim.go.id/media/berkas', 'image'))->toBe('image')
+            ->and($this->service->detectType('https://drive.google.com/file/d/1AbCdEf123/view', 'video'))->toBe('video');
+    });
+
+    it('returns unknown for a missing link', function () {
+        Http::preventStrayRequests();
+
+        expect($this->service->detectType(null))->toBe('unknown');
+    });
+});
diff --git a/tests/Unit/Services/PendudukServiceTest.php b/tests/Unit/Services/PendudukServiceTest.php
index de4fabc913..f67a6648d6 100644
--- a/tests/Unit/Services/PendudukServiceTest.php
+++ b/tests/Unit/Services/PendudukServiceTest.php
@@ -1,8 +1,8 @@
 <?php
 
-use App\Services\PendudukService;
 use App\Models\Penduduk;
 use App\Models\SettingAplikasi;
+use App\Services\PendudukService;
 use Illuminate\Support\Facades\Http;
 
 // Seed required settings for BaseApiService constructor
@@ -260,6 +260,37 @@
     expect($result)->toBeNull();
 });
 
+it('can fetch multiple penduduk from gabungan by ids', function () {
+    $sentParams = null;
+
+    Http::fake([
+        '*/api/v1/opendk/sync-penduduk-opendk*' => function (\Illuminate\Http\Client\Request $request) use (&$sentParams) {
+            parse_str((string) parse_url($request->url(), PHP_URL_QUERY), $sentParams);
+
+            return Http::response([
+                'data' => [
+                    ['id' => 500, 'attributes' => ['nama' => 'John Doe', 'nik' => '1234567890123456']],
+                    ['id' => 501, 'attributes' => ['nama' => 'Jane Doe', 'nik' => '1234567890123457']],
+                ],
+            ], 200);
+        },
+    ]);
+
+    $service = new PendudukService();
+    $result = $service->pendudukGabunganByIds([500, 501]);
+
+    expect($result)->toHaveCount(2);
+    expect($result->pluck('id'))->toContain(500);
+    expect($result->pluck('id'))->toContain(501);
+    expect($sentParams['filter']['id_penduduk'])->toBe(['500', '501']);
+});
+
+it('returns empty collection when gabungan ids empty', function () {
+    $service = new PendudukService();
+
+    expect($service->pendudukGabunganByIds([]))->toHaveCount(0);
+});
+
 it('can apply filters to jumlah penduduk', function () {
     Http::fake([
         '*/api/v1/opendk/sync-penduduk-opendk*' => Http::response([
@@ -372,4 +403,4 @@
     expect($exportData->first()['umur'])->toBe('');
     expect($exportData->first()['pekerjaan'])->toBe('');
     expect($exportData->first()['status_kawin'])->toBe('');
-});
\ No newline at end of file
+});
diff --git a/tests/Unit/Support/CspPolicyTest.php b/tests/Unit/Support/CspPolicyTest.php
new file mode 100644
index 0000000000..4bfc07fef9
--- /dev/null
+++ b/tests/Unit/Support/CspPolicyTest.php
@@ -0,0 +1,53 @@
+<?php
+
+use App\Support\CspPolicy;
+
+/*
+|--------------------------------------------------------------------------
+| Content Security Policy
+|--------------------------------------------------------------------------
+|
+| Galeri dapat menampilkan media dari luar (Google Drive, YouTube, Vimeo, dan
+| situs desa), sehingga CSP harus mengizinkan sumber tersebut.
+|
+*/
+
+it('allows youtube and vimeo frames for embedded videos', function () {
+    $policy = (new CspPolicy())->toHeader();
+
+    expect($policy)->toContain('*.youtube.com')
+        ->and($policy)->toContain('*.vimeo.com')
+        ->and($policy)->toContain('https://drive.google.com');
+});
+
+it('allows external media sources for gallery videos', function () {
+    $directive = (new CspPolicy())->directive('media-src');
+
+    expect($directive)->toContain("'self'")
+        ->and($directive)->toContain('https:')
+        ->and($directive)->toContain('blob:');
+});
+
+it('allows external images for gallery thumbnails', function () {
+    $directive = (new CspPolicy())->directive('img-src');
+
+    expect($directive)->toContain("'self'")
+        ->and($directive)->toContain('data:')
+        ->and($directive)->toContain('blob:');
+});
+
+it('includes the database gabungan api in connect-src', function () {
+    config(['setting.api_server_database_gabungan' => 'https://api.gabungan.test']);
+
+    expect((new CspPolicy())->toHeader())->toContain('connect-src')
+        ->toContain('https://api.gabungan.test');
+});
+
+it('keeps a restrictive baseline for scripts and objects', function () {
+    $policy = new CspPolicy();
+
+    expect($policy->directive('default-src'))->toBe("'self'")
+        ->and($policy->directive('object-src'))->toBe("'self' blob:")
+        ->and($policy->directive('frame-ancestors'))->toBe("'self'")
+        ->and($policy->directive('base-uri'))->toBe("'self'");
+});
diff --git a/tests/Unit/ThemesControllerSecurityTest.php b/tests/Unit/ThemesControllerSecurityTest.php
index abde0f5e91..6ec5dc10c1 100644
--- a/tests/Unit/ThemesControllerSecurityTest.php
+++ b/tests/Unit/ThemesControllerSecurityTest.php
@@ -109,4 +109,205 @@
 test('validateHooksSource rejects inline HTML', function () {
     $r = $this->validator->validateSource('<?php $x=1; ?><h1>x</h1><?php return $x;', 'evil');
     expect($r['valid'])->toBeFalse();
-});
\ No newline at end of file
+});
+
+// ── Backtick execution operator tests (Issue #57) ──
+
+test('validateHooksSource rejects simple backtick execution', function () {
+    $r = $this->validator->validateSource('<?php `id`;', 'evil');
+    expect($r['valid'])->toBeFalse()
+        ->and($r['reason'])->toContain('Backtick execution operator');
+});
+
+test('validateHooksSource rejects live PoC backtick execution', function () {
+    $r = $this->validator->validateSource('<?php `id > themes/default/rce_proof.txt 2>&1`;', 'evil');
+    expect($r['valid'])->toBeFalse()
+        ->and($r['reason'])->toContain('Backtick execution operator');
+});
+
+test('validateHooksSource rejects backtick assigned to variable', function () {
+    $r = $this->validator->validateSource('<?php $output = `whoami`;', 'evil');
+    expect($r['valid'])->toBeFalse()
+        ->and($r['reason'])->toContain('Backtick execution operator');
+});
+
+// ── Language constructs tests (include, require) ──
+
+test('validateHooksSource rejects include construct', function () {
+    $r = $this->validator->validateSource('<?php include "payload.php";', 'evil');
+    expect($r['valid'])->toBeFalse();
+});
+
+test('validateHooksSource rejects include_once construct', function () {
+    $r = $this->validator->validateSource('<?php include_once "payload.php";', 'evil');
+    expect($r['valid'])->toBeFalse();
+});
+
+test('validateHooksSource rejects require construct', function () {
+    $r = $this->validator->validateSource('<?php require "payload.php";', 'evil');
+    expect($r['valid'])->toBeFalse();
+});
+
+test('validateHooksSource rejects require_once construct', function () {
+    $r = $this->validator->validateSource('<?php require_once "payload.php";', 'evil');
+    expect($r['valid'])->toBeFalse();
+});
+
+// ── Dynamic invocation tests ──
+
+test('validateHooksSource rejects dynamic class instantiation', function () {
+    $r = $this->validator->validateSource('<?php $class = "Evil"; new $class();', 'evil');
+    expect($r['valid'])->toBeFalse();
+});
+
+test('validateHooksSource rejects dynamic method access', function () {
+    $r = $this->validator->validateSource('<?php $obj->$method();', 'evil');
+    expect($r['valid'])->toBeFalse();
+});
+
+test('validateHooksSource rejects dynamic static call', function () {
+    $r = $this->validator->validateSource('<?php ClassName::$method();', 'evil');
+    expect($r['valid'])->toBeFalse();
+});
+
+test('validateHooksSource rejects variable variables', function () {
+    $r = $this->validator->validateSource('<?php $$dynamicVar = "val";', 'evil');
+    expect($r['valid'])->toBeFalse();
+});
+
+test('validateHooksSource rejects variable function call with comments and whitespace', function () {
+    $r = $this->validator->validateSource('<?php $f = "system"; $f /* comment */ ("id");', 'evil');
+    expect($r['valid'])->toBeFalse();
+});
+
+// ── Exotic bypass tests (Security Review findings A–D) ──
+
+test('validateHooksSource rejects curly-string function call: ${"system"}()', function () {
+    $r = $this->validator->validateSource('<?php ${"system"}("id");', 'evil');
+    expect($r['valid'])->toBeFalse()
+        ->and($r['reason'])->toContain('curly_expression_function_call');
+});
+
+test('validateHooksSource rejects curly-variable function call: ${$a}()', function () {
+    $r = $this->validator->validateSource('<?php $a="system"; ${$a}("id");', 'evil');
+    expect($r['valid'])->toBeFalse()
+        ->and($r['reason'])->toContain('curly_expression_function_call');
+});
+
+test('validateHooksSource rejects array-subscript function call: $_GET["cmd"]()', function () {
+    $r = $this->validator->validateSource('<?php $_GET["cmd"]("id");', 'evil');
+    expect($r['valid'])->toBeFalse()
+        ->and($r['reason'])->toContain('array_subscript_function_call');
+});
+
+test("validateHooksSource rejects curly-string single-quote function call: \${'system'}()", function () {
+    $r = $this->validator->validateSource("<?php {\$a='system'; \${\$a}('id');}", 'evil');
+    expect($r['valid'])->toBeFalse()
+        ->and($r['reason'])->toContain('curly_expression_function_call');
+});
+
+// ── Expanded dangerous functions tests ──
+
+test('validateHooksSource rejects readfile() call', function () {
+    $r = $this->validator->validateSource('<?php readfile("/etc/passwd");', 'evil');
+    expect($r['valid'])->toBeFalse();
+});
+
+test('validateHooksSource rejects forward_static_call() call', function () {
+    $r = $this->validator->validateSource('<?php forward_static_call("system", "id");', 'evil');
+    expect($r['valid'])->toBeFalse();
+});
+
+test('validateHooksSource rejects register_shutdown_function() call', function () {
+    $r = $this->validator->validateSource('<?php register_shutdown_function("system", "id");', 'evil');
+    expect($r['valid'])->toBeFalse();
+});
+
+test('validateHooksSource rejects unserialize() call', function () {
+    $r = $this->validator->validateSource('<?php unserialize($data);', 'evil');
+    expect($r['valid'])->toBeFalse();
+});
+
+test('validateHooksSource rejects scandir() call', function () {
+    $r = $this->validator->validateSource('<?php scandir(".");', 'evil');
+    expect($r['valid'])->toBeFalse();
+});
+
+test('validateHooksSource rejects glob() call', function () {
+    $r = $this->validator->validateSource('<?php glob("*.php");', 'evil');
+    expect($r['valid'])->toBeFalse();
+});
+
+// ── ZIP Blade template scanning tests ──
+
+test('scanZipForPhp allows valid blade templates inside resources/views/', function () {
+    $zipPath = sys_get_temp_dir() . '/' . uniqid() . '.zip';
+    $z = new ZipArchive();
+    $z->open($zipPath, ZipArchive::CREATE);
+    $z->addFromString('theme.json', '{}');
+    $z->addFromString('resources/views/layouts/app.blade.php', '<div>{{ $page_title }}</div>');
+    $z->close();
+
+    $z = new ZipArchive();
+    $z->open($zipPath);
+
+    $this->validator->scanZipForPhp($z);
+
+    expect(true)->toBeTrue();
+
+    $z->close();
+    @unlink($zipPath);
+});
+
+test('scanZipForPhp rejects blade template placed outside resources/views/', function () {
+    $zipPath = sys_get_temp_dir() . '/' . uniqid() . '.zip';
+    $z = new ZipArchive();
+    $z->open($zipPath, ZipArchive::CREATE);
+    $z->addFromString('evil.blade.php', '<h1>Bad location</h1>');
+    $z->close();
+
+    $z = new ZipArchive();
+    $z->open($zipPath);
+
+    expect(fn () => $this->validator->scanZipForPhp($z))
+        ->toThrow(RuntimeException::class);
+
+    $z->close();
+    @unlink($zipPath);
+});
+
+test('scanZipForPhp allows blade template with JavaScript ES6 template literals', function () {
+    $zipPath = sys_get_temp_dir() . '/' . uniqid() . '.zip';
+    $z = new ZipArchive();
+    $z->open($zipPath, ZipArchive::CREATE);
+    $z->addFromString('theme.json', '{}');
+    $z->addFromString('resources/views/widgets/custom.blade.php', '<script>var str = `hello ${name}`;</script>');
+    $z->close();
+
+    $z = new ZipArchive();
+    $z->open($zipPath);
+
+    $this->validator->scanZipForPhp($z);
+
+    expect(true)->toBeTrue();
+
+    $z->close();
+    @unlink($zipPath);
+});
+
+test('scanZipForPhp rejects blade template containing backtick operator in PHP/Blade directive', function () {
+    $zipPath = sys_get_temp_dir() . '/' . uniqid() . '.zip';
+    $z = new ZipArchive();
+    $z->open($zipPath, ZipArchive::CREATE);
+    $z->addFromString('resources/views/pages/evil.blade.php', '<div>{{ `id` }}</div>');
+    $z->close();
+
+    $z = new ZipArchive();
+    $z->open($zipPath);
+
+    expect(fn () => $this->validator->scanZipForPhp($z))
+        ->toThrow(RuntimeException::class);
+
+    $z->close();
+    @unlink($zipPath);
+});
diff --git a/tests/Unit/ValidFileContentTest.php b/tests/Unit/ValidFileContentTest.php
new file mode 100644
index 0000000000..da644a0416
--- /dev/null
+++ b/tests/Unit/ValidFileContentTest.php
@@ -0,0 +1,136 @@
+<?php
+
+use App\Rules\SafeFileContent;
+use Illuminate\Http\UploadedFile;
+use Illuminate\Support\Facades\Validator;
+
+function validPdfBinary(): string
+{
+    return "%PDF-1.4\n".
+        "1 0 obj<</Type/Catalog/Pages 2 0 R>>endobj\n".
+        "2 0 obj<</Type/Pages/Kids[3 0 R]/Count 1>>endobj\n".
+        "3 0 obj<</Type/Page/Parent 2 0 R/MediaBox[0 0 612 792]>>endobj\n".
+        "stream\nBT /F1 12 Tf 72 720 Td (Function of the Quarterly Report) Tj ET\nendstream\n".
+        "xref\n0 4\n".
+        "trailer<</Size 4/Root 1 0 R>>\n".
+        "startxref\n0\n%%EOF";
+}
+
+function svgWith(string $body): string
+{
+    return '<?xml version="1.0" encoding="UTF-8"?>'."\n".
+        '<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="100" height="100">'.
+        $body.
+        '</svg>';
+}
+
+function passRule(mixed $file): bool
+{
+    $failed = false;
+    (new SafeFileContent())->validate('file', $file, function () use (&$failed) {
+        $failed = true;
+    });
+
+    return ! $failed;
+}
+
+describe('valid_file content inspection', function () {
+    test('pdf valid yang mengandung string Function tetap lolos', function () {
+        $file = UploadedFile::fake()->createWithContent('renja.pdf', validPdfBinary());
+
+        expect(passRule($file))->toBeTrue();
+    });
+
+    test('pdf tanpa konten berbahaya lolos', function () {
+        $file = UploadedFile::fake()->createWithContent('dokumen.pdf', "%PDF-1.7\n%%EOF");
+
+        expect(passRule($file))->toBeTrue();
+    });
+
+    test('pdf yang menyamar dengan header pdf tetapi berisi kode php ditolak', function () {
+        $polyglot = "%PDF-1.4\n<?php system(\$_GET['c']); ?>\n%%EOF";
+        $file = UploadedFile::fake()->createWithContent('shell.pdf', $polyglot);
+
+        expect(passRule($file))->toBeFalse();
+    });
+
+    test('file php yang diberi ekstensi pdf ditolak', function () {
+        $file = UploadedFile::fake()->createWithContent('shell.pdf', '<?php system($_GET["c"]); ?>');
+
+        expect(passRule($file))->toBeFalse();
+    });
+
+    test('svg dengan tag script ditolak', function () {
+        $file = UploadedFile::fake()->createWithContent('logo.svg', svgWith('<script>alert(1)</script>'));
+
+        expect(passRule($file))->toBeFalse();
+    });
+
+    test('svg dengan event handler onload ditolak', function () {
+        $file = UploadedFile::fake()->createWithContent('logo.svg', svgWith('<rect onload="alert(1)"/>'));
+
+        expect(passRule($file))->toBeFalse();
+    });
+
+    test('svg dengan javascript pada xlink href ditolak', function () {
+        $file = UploadedFile::fake()->createWithContent('logo.svg', svgWith('<a xlink:href="javascript:alert(1)">x</a>'));
+
+        expect(passRule($file))->toBeFalse();
+    });
+
+    test('svg dengan foreignObject berisi html ditolak', function () {
+        $file = UploadedFile::fake()->createWithContent('logo.svg', svgWith('<foreignObject><body onload="alert(1)"/></foreignObject>'));
+
+        expect(passRule($file))->toBeFalse();
+    });
+
+    test('svg bersih lolos', function () {
+        $file = UploadedFile::fake()->createWithContent('logo.svg', svgWith('<rect width="100" height="100" fill="red"/>'));
+
+        expect(passRule($file))->toBeTrue();
+    });
+
+    test('html dengan script ditolak', function () {
+        $file = UploadedFile::fake()->createWithContent('page.html', '<html><script>alert(1)</script></html>');
+
+        expect(passRule($file))->toBeFalse();
+    });
+
+    test('file yang bukan uploaded file ditolak', function () {
+        expect(passRule('bukan-file'))->toBeFalse();
+        expect(passRule(null))->toBeFalse();
+    });
+
+    test('gambar png dan jpeg asli tetap lolos', function () {
+        expect(passRule(UploadedFile::fake()->image('foto.png', 20, 20)))->toBeTrue();
+        expect(passRule(UploadedFile::fake()->image('foto.jpg', 20, 20)))->toBeTrue();
+    });
+
+    test('file yang menyamar sebagai gambar tetapi berisi html ditolak', function () {
+        $file = UploadedFile::fake()->createWithContent('foto.png', '<html><script>alert(1)</script></html>');
+
+        expect(passRule($file))->toBeFalse();
+    });
+});
+
+describe('valid_file rule registration', function () {
+    test('rule valid_file menerima pdf berisi string Function', function () {
+        $validator = Validator::make(
+            ['file_dokumen' => UploadedFile::fake()->createWithContent('renja.pdf', validPdfBinary())],
+            ['file_dokumen' => 'valid_file']
+        );
+
+        expect($validator->passes())->toBeTrue();
+    });
+
+    test('rule valid_file menolak svg berbahaya', function () {
+        $validator = Validator::make(
+            ['file_dokumen' => UploadedFile::fake()->createWithContent('logo.svg', svgWith('<script>alert(1)</script>'))],
+            ['file_dokumen' => 'valid_file']
+        );
+
+        expect($validator->fails())->toBeTrue();
+        expect($validator->errors()->first('file_dokumen'))
+            ->toBe(trans('validation.valid_file', ['attribute' => 'file dokumen']));
+    });
+});
diff --git a/themes/opendk/default/resources/views/pages/potensi/index.blade.php b/themes/opendk/default/resources/views/pages/potensi/index.blade.php
index 8b4762071a..7b5c85eb52 100644
--- a/themes/opendk/default/resources/views/pages/potensi/index.blade.php
+++ b/themes/opendk/default/resources/views/pages/potensi/index.blade.php
@@ -4,10 +4,18 @@
     <div class="col-md-8">
         <div class="box box-primary">
             <div class="box-header">
-                <h3 class="box-title text-bold"><i id="title-container" class="fa fa-arrow-circle-right fa-lg text-blue"></i> </h3>
+                <h3 class="box-title text-bold"><i id="title-container" class="fa fa-arrow-circle-right fa-lg text-blue"></i> {{ $page_title ?? 'Potensi' }}</h3>
             </div>
             <!-- /.box-header -->
             <div class="box-body">
+                @if (isset($kategori_potensi) && $kategori_potensi->count() > 0)
+                    <div style="margin-bottom: 20px;">
+                        <a href="{{ route('potensi.index') }}" class="btn btn-sm {{ empty($slug) ? 'btn-primary' : 'btn-default' }}" style="margin-right: 5px; margin-bottom: 5px;">Semua</a>
+                        @foreach ($kategori_potensi as $kat)
+                            <a href="{{ route('potensi.kategori', $kat->slug) }}" class="btn btn-sm {{ ($slug ?? '') === $kat->slug ? 'btn-primary' : 'btn-default' }}" style="margin-right: 5px; margin-bottom: 5px;">{{ $kat->nama_kategori }}</a>
+                        @endforeach
+                    </div>
+                @endif
                 <div id="potensi-container">
                     <div class="post clearfix">
                         <!-- Loading indicator will be shown here -->
@@ -24,74 +32,74 @@
 @endsection
 
 @push('scripts')
-<script>
-    $(function(){
-        function renderPotensi(items) {
-            if (!items || items.length === 0) {
-                return '<h4 class="text-center"><span class="fa fa-times"></span> Data tidak ditemukan.</h4>';
-            }
+    <script>
+        $(function() {
+            function renderPotensi(items) {
+                if (!items || items.length === 0) {
+                    return '<h4 class="text-center"><span class="fa fa-times"></span> Data tidak ditemukan.</h4>';
+                }
+
+                return items.map(function(item) {
+                    var potensi = item.attributes;
+                    var potensiImage = potensi.file_gambar_path || '{{ asset('/img/no-image.png') }}';
 
-            return items.map(function(item) {
-                var potensi = item.attributes;
-                var potensiImage = potensi.file_gambar_path || '{{ asset("/img/no-image.png") }}';
-                
-                return '<div class="attachment-block clearfix">' +
-                    '<img id="myImg" class="attachment-img responsive" src="' + potensiImage + '" alt="' + (potensi.nama_potensi || '') + '">' +
-                    '<!-- The Modal -->' +
-                    '<div id="myModal" class="modal">' +
+                    return '<div class="attachment-block clearfix">' +
+                        '<img id="myImg" class="attachment-img responsive" src="' + potensiImage + '" alt="' + (potensi.nama_potensi || '') + '">' +
+                        '<!-- The Modal -->' +
+                        '<div id="myModal" class="modal">' +
                         '<span class="close">&times;</span>' +
                         '<img class="modal-content" id="img01">' +
                         '<div id="caption">' + (potensi.nama_potensi || '') + '</div>' +
-                    '</div>' +
-                    '<div class="attachment-pushed">' +
-                        '<h4 class="attachment-heading"><a href="{{ url("/potensi") }}/' + (potensi.tipe ? potensi.tipe.slug : '') + '/' + (potensi.slug || '') + '"><i class="fa fa-industry" aria-hidden="true"></i> ' + (potensi.nama_potensi || '') + '</a></h4>' +
+                        '</div>' +
+                        '<div class="attachment-pushed">' +
+                        '<h4 class="attachment-heading"><a href="{{ url('/potensi') }}/' + (potensi.tipe ? potensi.tipe.slug : '') + '/' + (item.id || '') + '"><i class="fa fa-industry" aria-hidden="true"></i> ' + (potensi.nama_potensi || '') + '</a></h4>' +
                         '<div class="attachment-text">' +
-                            (potensi.deskripsi ? (potensi.deskripsi.length > 300 ? potensi.deskripsi.substring(0, 300) + ' ...' : potensi.deskripsi) : '') +
-                            '<div class="pull-right button-group" style="position:relative; bottom:0px; margin-bottom: 0px;">' +
-                                '<a href="{{ url("/potensi") }}/' + (potensi.tipe ? potensi.tipe.slug : '') + '/' + (potensi.slug || '') + '" class="btn btn-xs btn-primary"><i class="fa fa-angle-double-right"></i> Baca Selengkapnya</a>' +
-                            '</div>' +
+                        (potensi.deskripsi ? (potensi.deskripsi.length > 300 ? potensi.deskripsi.substring(0, 300) + ' ...' : potensi.deskripsi) : '') +
+                        '<div class="pull-right button-group" style="position:relative; bottom:0px; margin-bottom: 0px;">' +
+                        '<a href="{{ url('/potensi') }}/' + (potensi.tipe ? potensi.tipe.slug : '') + '/' + (item.id || '') + '" class="btn btn-xs btn-primary"><i class="fa fa-angle-double-right"></i> Baca Selengkapnya</a>' +
+                        '</div>' +
+                        '</div>' +
                         '</div>' +
-                    '</div>' +
-                '</div>';
-            }).join('');
-        }
+                        '</div>';
+                }).join('');
+            }
+
+            // Function to load potensi from API
+            function loadPotensi(page = 1) {
+                var $container = $('#potensi-container .post.clearfix');
+                $container.html(`@include('components.placeholder')`);
+
+                // Make API call to get potensi
+                $.ajax({
+                    url: '{!! $urlApi !!}/potensi?filter[tipe.slug]={!! $slug !!}&include=tipe&page[number]=' + page,
+                    method: 'GET',
+                    success: function(response) {
+                        var items = response.data || response;
 
-        // Function to load potensi from API
-        function loadPotensi(page = 1) {
-            var $container = $('#potensi-container .post.clearfix');
-            $container.html(`@include('components.placeholder')`);
-            
-            // Make API call to get potensi
-            $.ajax({
-                url: '{!! $urlApi !!}/potensi?filter[tipe.slug]={!! $slug !!}&include=tipe&page[number]=' + page,
-                method: 'GET',
-                success: function(response) {
-                    var items = response.data || response;
-                    
-                    var html = renderPotensi(items);                    
-                    $('#title-container').text(items[0].attributes.tipe.nama_kategori)                    
-                    var $container = $('#potensi-container .post.clearfix');
+                        var html = renderPotensi(items);
+                        $('#title-container').text(items[0].attributes.tipe.nama_kategori)
+                        var $container = $('#potensi-container .post.clearfix');
 
-                    $container.html(html);
-                    initPagination(response, function() {
-                        $('.pagination').on('click', '.btn-page', function() {
-                            var params = {};
-                            var page = $(this).data('page');
-                            loadPotensi(page);
+                        $container.html(html);
+                        initPagination(response, function() {
+                            $('.pagination').on('click', '.btn-page', function() {
+                                var params = {};
+                                var page = $(this).data('page');
+                                loadPotensi(page);
+                            });
+                            $('.pagination').find('.btn-page').attr('href', '#potensi-container')
                         });
-                        $('.pagination').find('.btn-page').attr('href','#potensi-container')
-                    });
-                },
-                error: function(xhr, status, error) {
-                    console.error('Error loading potensi:', error);
-                    var $container = $('#potensi-container .post.clearfix');
-                    $container.html('<div class="callout callout-danger"><p class="text-bold">Gagal memuat potensi. Silakan coba lagi nanti.</p></div>');
-                }
-            });
-        }
-        
-        // Load potensi on page load
-        loadPotensi();
-    });
-</script>
+                    },
+                    error: function(xhr, status, error) {
+                        console.error('Error loading potensi:', error);
+                        var $container = $('#potensi-container .post.clearfix');
+                        $container.html('<div class="callout callout-danger"><p class="text-bold">Gagal memuat potensi. Silakan coba lagi nanti.</p></div>');
+                    }
+                });
+            }
+
+            // Load potensi on page load
+            loadPotensi();
+        });
+    </script>
 @endpush
diff --git a/themes/opendk/default/resources/views/pages/potensi/show.blade.php b/themes/opendk/default/resources/views/pages/potensi/show.blade.php
index 617ef1a1b4..7f27002b8d 100644
--- a/themes/opendk/default/resources/views/pages/potensi/show.blade.php
+++ b/themes/opendk/default/resources/views/pages/potensi/show.blade.php
@@ -2,7 +2,10 @@
 
 @section('content')
     <div class="col-md-8">
-        <div class="box box-widget">                 
+        <div class="box box-widget">
+            <div class="box-header with-border">
+                <a href="{{ route('potensi.index') }}" class="btn btn-sm btn-default"><i class="fa fa-arrow-left"></i> Kembali ke Daftar Potensi</a>
+            </div>
             <!-- /.box-header -->
             <div class="box-body">
                 <div id="potensi-detail-container">
@@ -11,7 +14,7 @@
                         <i class="fa fa-spinner fa-spin fa-2x"></i>
                         <p>Loading potensi...</p>
                     </div>
-                </div>            
+                </div>
             </div>
             <!-- /.box-footer -->
         </div>
@@ -19,43 +22,47 @@
 @endsection
 
 @push('scripts')
-<script>
-    $(function(){
-        // Function to load potensi detail from API
-        function loadPotensiDetail() {
-            // Make API call to get potensi by slug
-            $.ajax({
-                url: '{!! $urlApi !!}/potensi?filter[slug]={!! $slug !!}',
-                method: 'GET',
-                success: function(response) {
-                    if (response.data && response.data.length > 0) {
-                        var potensi = response.data[0].attributes;                                                
-                        
-                        // Generate potensi detail HTML
-                        var potensiHtml = '<div class="col-md-12">' +
-                            '<img src="' + (potensi.file_gambar_path || "{{ asset('/img/no-image.png') }}") + '" width="100%">' +
-                            '</div>' +
-                            '<div class="col-md-12">' +
-                            '<h3>' + (potensi.nama_potensi || '') + '</h3>' +
-                            '<p>' + (potensi.deskripsi || '') + '</p>' +
-                            '</div>';
-                        
-                        // Update the container with potensi detail
-                        $('#potensi-detail-container').html(potensiHtml);
-                    } else {                        
-                        $('#potensi-detail-container').html('<div class="col-12"><p>Potensi tidak ditemukan!</p></div>');
+    <script>
+        $(function() {
+            // Function to load potensi detail from API
+            function loadPotensiDetail() {
+                // Make API call to get potensi by id
+                $.ajax({
+                    url: '{!! $urlApi !!}/potensi?filter[id]={!! $id !!}',
+                    method: 'GET',
+                    success: function(response) {
+                        if (response.data && response.data.length > 0) {
+                            var potensi = response.data[0].attributes;
+                            let isPdf = (potensi.mime_type === 'application/pdf' || (potensi.file_gambar && potensi.file_gambar.toLowerCase().endsWith('.pdf')) || (potensi.file_gambar_path && potensi.file_gambar_path.toLowerCase().endsWith('.pdf')));
+                            let mediaHtml = isPdf ?
+                                '<iframe src="' + (potensi.file_gambar_path || '') + '#toolbar=1" width="100%" height="550" style="border: 1px solid #e0e0e0; border-radius: 4px;" frameborder="0"></iframe>' :
+                                '<img src="' + (potensi.file_gambar_path || "{{ asset('/img/no-image.png') }}") + '" width="100%">';
+
+                            // Generate potensi detail HTML
+                            var potensiHtml = '<div class="col-md-12 text-center" style="margin-bottom: 20px;">' +
+                                mediaHtml +
+                                '</div>' +
+                                '<div class="col-md-12">' +
+                                '<h3>' + (potensi.nama_potensi || '') + '</h3>' +
+                                '<p>' + (potensi.deskripsi || '') + '</p>' +
+                                '</div>';
+
+                            // Update the container with potensi detail
+                            $('#potensi-detail-container').html(potensiHtml);
+                        } else {
+                            $('#potensi-detail-container').html('<div class="col-12"><p>Potensi tidak ditemukan!</p></div>');
+                        }
+                    },
+                    error: function(xhr, status, error) {
+                        console.error('Error loading potensi detail:', error);
+                        $('#potensi-title').text('Gagal Memuat Potensi');
+                        $('#potensi-detail-container').html('<div class="col-12"><p>Gagal memuat potensi. Silakan coba lagi nanti.</p></div>');
                     }
-                },
-                error: function(xhr, status, error) {
-                    console.error('Error loading potensi detail:', error);
-                    $('#potensi-title').text('Gagal Memuat Potensi');
-                    $('#potensi-detail-container').html('<div class="col-12"><p>Gagal memuat potensi. Silakan coba lagi nanti.</p></div>');
-                }
-            });
-        }
-        
-        // Load potensi detail on page load
-        loadPotensiDetail();
-    });
-</script>
+                });
+            }
+
+            // Load potensi detail on page load
+            loadPotensiDetail();
+        });
+    </script>
 @endpush
diff --git a/themes/opendk/default/resources/views/pages/profil/gabungan/letakgeografis.blade.php b/themes/opendk/default/resources/views/pages/profil/gabungan/letakgeografis.blade.php
index badacea115..bae0e8f825 100644
--- a/themes/opendk/default/resources/views/pages/profil/gabungan/letakgeografis.blade.php
+++ b/themes/opendk/default/resources/views/pages/profil/gabungan/letakgeografis.blade.php
@@ -13,8 +13,7 @@
                             <label for="{{ $sebutan_wilayah }}" class="col-sm-2 control-label">{{ $sebutan_wilayah }}</label>
                             <div class="col-sm-4">
                                 <input type="hidden" id="profil_id" value="{{ $profil->id }}">
-                                <select class="form-control" id="{{ $sebutan_wilayah }}" name="{{ $sebutan_wilayah }}"
-                                    onchange=""></select>
+                                <select class="form-control" id="{{ $sebutan_wilayah }}" name="{{ $sebutan_wilayah }}" onchange=""></select>
                             </div>
                         </div>
                     </form>
@@ -109,7 +108,7 @@ function tampil_peta () {
         zoom: 13
       });
 
-      var path_kec = {!! $data_umum->path ?? '[]' !!};
+      var path_kec = {!! ($data_umum->path ?? null) ?: '[]' !!};
       // Geolocation IP Route/GPS
       geoLocation(peta_wilayah);
       showPolygon(path_kec, peta_wilayah);
diff --git a/themes/opendk/default/resources/views/pages/publikasi/galeri.blade.php b/themes/opendk/default/resources/views/pages/publikasi/galeri.blade.php
index a9f172bd6a..62d46ecbc8 100644
--- a/themes/opendk/default/resources/views/pages/publikasi/galeri.blade.php
+++ b/themes/opendk/default/resources/views/pages/publikasi/galeri.blade.php
@@ -11,82 +11,72 @@
     </div>
 @endsection
 @push('scripts')
-<script>
-    $(function(){
-        function renderGaleri(items) {
-            if (!items || items.length === 0) {
-                return '<div class="callout callout-info"><p class="text-bold">Tidak ada galeri yang ditampilkan!</p></div>';
-            }
+    <script>
+        $(function() {
+            function renderGaleri(items) {
+                if (!items || items.length === 0) {
+                    return '<div class="callout callout-info"><p class="text-bold">Tidak ada galeri yang ditampilkan!</p></div>';
+                }
+
+                return items.map(function(item) {
+                    var galeri = item.attributes;
+                    var media = renderGaleriMedia(galeri, {
+                        imageStyle: 'width:100%;height:auto;max-height:220px;object-fit:contain;background:#f5f5f5;'
+                    });
+                    var detailUrl = '{{ url('/publikasi/galeri/detail') }}/' + (galeri.slug || '');
+                    var targetUrl = (galeri.jenis === 'file') ? detailUrl : (galeri.link || detailUrl);
+                    var badge = isGaleriPlayable(galeri) ?
+                        '<span class="label label-primary" style="position:absolute;top:8px;left:8px;z-index:2;"><i class="fa fa-play-circle"></i> ' + (galeri.media_type === 'youtube' ? 'YouTube' : 'Video') + '</span>' :
+                        '';
 
-            return items.map(function(item) {
-                var galeri = item.attributes;
-                var galeriImage = galeri.gambar_path || '{{ asset("/img/no-image.png") }}';
-                
-                if (galeri.jenis === 'file') {
                     return '<div class="post" style="margin-bottom: 5px; padding-top: 5px; padding-bottom: 5px;">' +
                         '<div class="row">' +
-                            '<div class="col-sm-4">' +
-                                '<img class="img-responsive" src="' + galeriImage + '" alt="' + (galeri.slug || '') + '">' +
-                            '</div>' +
-                            '<div class="col-sm-8">' +
-                                '<h5 style="margin-top: 5px; text-align: justify;"><b><a href="{{ url("/publikasi/galeri/detail") }}/' + (galeri.slug || '') + '">' + (galeri.judul || '') + '</a></b></h5>' +
-                                '<p style="font-size:11px;"><i class="fa fa-calendar"></i>&ensp;' + formatDate(galeri.created_at) + '&ensp;|&ensp;<i class="fa fa-user"></i>&ensp;Administrator</p>' +
-                                '<a href="{{ url("/publikasi/galeri/detail") }}/' + (galeri.slug || '') + '" class="btn btn-sm btn-primary" target="_blank">Selengkapnya</a>' +
-                            '</div>' +
+                        '<div class="col-sm-4" style="position:relative;">' + badge + media + '</div>' +
+                        '<div class="col-sm-8">' +
+                        '<h5 style="margin-top: 5px; text-align: justify;"><b><a href="' + targetUrl + '">' + (galeri.judul || '') + '</a></b></h5>' +
+                        '<p style="font-size:11px;"><i class="fa fa-calendar"></i>&ensp;' + formatDate(galeri.created_at) + '&ensp;|&ensp;<i class="fa fa-user"></i>&ensp;Administrator</p>' +
+                        '<a href="' + detailUrl + '" class="btn btn-sm btn-primary" target="_blank">Selengkapnya</a>' +
                         '</div>' +
-                    '</div>';
-                } else {
-                    return '<div class="post" style="margin-bottom: 5px; padding-top: 5px; padding-bottom: 5px;">' +
-                        '<div class="row">' +
-                            '<div class="col-sm-4">' +
-                                '<img class="img-responsive" src="' + galeriImage + '" alt="' + (galeri.slug || '') + '">' +
-                            '</div>' +
-                            '<div class="col-sm-8">' +
-                                '<h5 style="margin-top: 5px; text-align: justify;"><b><a href="' + (galeri.link || '') + '">' + (galeri.judul || '') + '</a></b></h5>' +
-                                '<p style="font-size:11px;"><i class="fa fa-calendar"></i>&ensp;' + formatDate(galeri.created_at) + '&ensp;|&ensp;<i class="fa fa-user"></i>&ensp;Administrator</p>' +
-                                '<a href="' + (galeri.link || '') + '" class="btn btn-sm btn-primary" target="_blank">Selengkapnya</a>' +
-                            '</div>' +
                         '</div>' +
-                    '</div>';
-                }
-            }).join('');
-        }
+                        '</div>';
+                }).join('');
+            }
+
+            // Function to load galeri from API
+            function loadGaleri(page = 1) {
+                var $container = $('#galeri-container .post.clearfix');
+                $container.html(`@include('components.placeholder')`);
 
-        // Function to load galeri from API
-        function loadGaleri(page = 1) {
-            var $container = $('#galeri-container .post.clearfix');
-            $container.html(`@include('components.placeholder')`);
-            
-            // Make API call to get galeri
-            $.ajax({
-                url: '{!! $urlApi !!}/galeri?filter[status]=1&filter[album.slug]={!! $slug !!}&page[number]=' + page,
-                method: 'GET',
-                success: function(response) {
-                    var items = response.data || response;
-                    
-                    var html = renderGaleri(items);
-                    var $container = $('#galeri-container .post.clearfix');
+                // Make API call to get galeri
+                $.ajax({
+                    url: '{!! $urlApi !!}/galeri?filter[status]=1&filter[album.slug]={!! $slug !!}&page[number]=' + page,
+                    method: 'GET',
+                    success: function(response) {
+                        var items = response.data || response;
 
-                    $container.html(html);
-                    initPagination(response, function() {
-                        $('.pagination').on('click', '.btn-page', function() {
-                            var params = {};
-                            var page = $(this).data('page');
-                            loadGaleri(page);
+                        var html = renderGaleri(items);
+                        var $container = $('#galeri-container .post.clearfix');
+
+                        $container.html(html);
+                        initPagination(response, function() {
+                            $('.pagination').on('click', '.btn-page', function() {
+                                var params = {};
+                                var page = $(this).data('page');
+                                loadGaleri(page);
+                            });
+                            $('.pagination').find('.btn-page').attr('href', '#galeri-container')
                         });
-                        $('.pagination').find('.btn-page').attr('href','#galeri-container')
-                    });
-                },
-                error: function(xhr, status, error) {
-                    console.error('Error loading galeri:', error);
-                    var $container = $('#galeri-container .post.clearfix');
-                    $container.html('<div class="callout callout-danger"><p class="text-bold">Gagal memuat galeri. Silakan coba lagi nanti.</p></div>');
-                }
-            });
-        }
-        
-        // Load galeri on page load
-        loadGaleri();            
-    });
-</script>
+                    },
+                    error: function(xhr, status, error) {
+                        console.error('Error loading galeri:', error);
+                        var $container = $('#galeri-container .post.clearfix');
+                        $container.html('<div class="callout callout-danger"><p class="text-bold">Gagal memuat galeri. Silakan coba lagi nanti.</p></div>');
+                    }
+                });
+            }
+
+            // Load galeri on page load
+            loadGaleri();
+        });
+    </script>
 @endpush
diff --git a/themes/opendk/default/resources/views/pages/publikasi/galeri_detail.blade.php b/themes/opendk/default/resources/views/pages/publikasi/galeri_detail.blade.php
index ca87152d7f..2ee0dde43f 100644
--- a/themes/opendk/default/resources/views/pages/publikasi/galeri_detail.blade.php
+++ b/themes/opendk/default/resources/views/pages/publikasi/galeri_detail.blade.php
@@ -2,120 +2,145 @@
 @section('title', 'Galeri')
 
 @push('css')
-<style>
-    .image-container {
-        width: 100%;
-        padding-top: 100%;
-        /* Menyusun rasio aspek 1:1 (tinggi = lebar) */
-        position: relative;
-        margin-bottom: 15px;
-        /* Sesuaikan dengan jarak yang diinginkan */
-    }
-
-    .image-container img {
-        position: absolute;
-        top: 0;
-        left: 0;
-        width: 100%;
-        height: 100%;
-        object-fit: cover;
-        /* Menjaga proporsi gambar dengan crop jika perlu */
-    }
-</style>
+    <style>
+        .image-container {
+            width: 100%;
+            padding-top: 100%;
+            /* Menyusun rasio aspek 1:1 (tinggi = lebar) */
+            position: relative;
+            margin-bottom: 15px;
+            /* Sesuaikan dengan jarak yang diinginkan */
+        }
+
+        .image-container img {
+            position: absolute;
+            top: 0;
+            left: 0;
+            width: 100%;
+            height: 100%;
+            object-fit: cover;
+            /* Menjaga proporsi gambar dengan crop jika perlu */
+        }
+
+        .media-container {
+            margin-bottom: 15px;
+        }
+    </style>
 @endpush
 
 @section('content')
-<div class="col-md-8">
-    <div class="box box-warning">
-        <div class="box-header with-border">
-            <div class="box-header with-border text-bold">
-                <h3 class="box-title text-bold"><i class="fa  fa-arrow-circle-right fa-lg text-blue"></i> Galeri :
-                    <span id="galeri-judul">Loading...</span>
-                </h3>
+    <div class="col-md-8">
+        <div class="box box-warning">
+            <div class="box-header with-border">
+                <div class="box-header with-border text-bold">
+                    <h3 class="box-title text-bold"><i class="fa  fa-arrow-circle-right fa-lg text-blue"></i> Galeri :
+                        <span id="galeri-judul">Loading...</span>
+                    </h3>
+                </div>
             </div>
-        </div>
-        <div class="box-body">
-            <div id="galeri-images-container">
-                <!-- Loading indicator -->
-                <div class="text-center">
-                    <i class="fa fa-spinner fa-spin fa-2x"></i>
-                    <p>Loading galeri...</p>
+            <div class="box-body">
+                <div id="galeri-images-container">
+                    <!-- Loading indicator -->
+                    <div class="text-center">
+                        <i class="fa fa-spinner fa-spin fa-2x"></i>
+                        <p>Loading galeri...</p>
+                    </div>
                 </div>
             </div>
         </div>
     </div>
-</div>
 @endsection
 
 @push('scripts')
-<script>
-    $(function(){
-        // Function to load galeri detail from API
-        function loadGaleriDetail() {
-            // Make API call to get galeri by slug
-            $.ajax({
-                url: '{!! $urlApi !!}/galeri?filter[status]=1&filter[slug]={!! $slug !!}',
-                method: 'GET',
-                success: function(response) {
-                    if (response.data && response.data.length > 0) {
-                        var galeri = response.data[0].attributes;
-                        
-                        // Update the title
-                        $('#galeri-judul').text(galeri.judul ? galeri.judul.toUpperCase() : '');
-                        
-                        // Generate images HTML
-                        var imagesHtml = '';
-                        if (galeri.gambar && Array.isArray(galeri.gambar)) {
-                            galeri.gambar.forEach(function(item) {
-                                var imagePath = '{{ asset("") }}storage/publikasi/galeri/' + item;
-                                imagesHtml += '<div class="col-md-6 mt-2">' +
-                                    '<div class="image-container">' +
+    <script>
+        $(function() {
+            // asset() membuang garis miring di akhir path, sehingga pemisah ke nama
+            // berkas ditambahkan eksplisit di JavaScript.
+            var storageBaseUrl = @json(asset('storage/publikasi/galeri'));
+
+            // Function to load galeri detail from API
+            function loadGaleriDetail() {
+                // Make API call to get galeri by slug
+                $.ajax({
+                    url: '{!! $urlApi !!}/galeri?filter[status]=1&filter[slug]={!! $slug !!}',
+                    method: 'GET',
+                    success: function(response) {
+                        if (response.data && response.data.length > 0) {
+                            var galeri = response.data[0].attributes;
+
+                            // Update the title
+                            $('#galeri-judul').text(galeri.judul ? galeri.judul.toUpperCase() : '');
+
+                            // Galeri berbasis link (Google Drive, YouTube, dll) tidak punya
+                            // array gambar, jadi media-nya dirender sesuai tipenya.
+                            if (galeri.jenis === 'url' && galeri.link) {
+                                var media = renderGaleriMedia(galeri, {
+                                    imageStyle: 'width:100%;height:auto;border-radius:4px;'
+                                });
+
+                                $('#galeri-images-container').html(
+                                    '<div class="col-12 media-container">' + media + '</div>' +
+                                    '<div class="col-12"><p style="font-size:12px;">' +
+                                    'Sumber: <a href="' + galeri.link + '" target="_blank" rel="noopener">' + galeri.link + '</a>' +
+                                    '</p></div>'
+                                );
+
+                                return;
+                            }
+
+                            // Generate images HTML
+                            var imagesHtml = '';
+                            if (galeri.gambar && Array.isArray(galeri.gambar)) {
+                                galeri.gambar.forEach(function(item) {
+                                    var imagePath = storageBaseUrl + '/' + item;
+                                    imagesHtml += '<div class="col-md-6 mt-2">' +
+                                        '<div class="image-container">' +
                                         '<img id="myImg" class="img-fluid" src="' + imagePath + '" alt="Image">' +
-                                    '</div>' +
-                                '</div>';
-                            });
+                                        '</div>' +
+                                        '</div>';
+                                });
+                            } else {
+                                imagesHtml = '<div class="col-12"><p>Tidak ada media yang ditampilkan!</p></div>';
+                            }
+
+                            // Update the container with images
+                            $('#galeri-images-container').html(imagesHtml);
+
+                            // Reinitialize image modal functionality if it exists
+                            initializeImageModal();
                         } else {
-                            imagesHtml = '<div class="col-12"><p>Tidak ada gambar yang ditampilkan!</p></div>';
+                            $('#galeri-judul').text('Galeri Tidak Ditemukan');
+                            $('#galeri-images-container').html('<div class="col-12"><p>Galeri tidak ditemukan!</p></div>');
                         }
-                        
-                        // Update the container with images
-                        $('#galeri-images-container').html(imagesHtml);
-                        
-                        // Reinitialize image modal functionality if it exists
-                        initializeImageModal();
-                    } else {
-                        $('#galeri-judul').text('Galeri Tidak Ditemukan');
-                        $('#galeri-images-container').html('<div class="col-12"><p>Galeri tidak ditemukan!</p></div>');
+                    },
+                    error: function(xhr, status, error) {
+                        console.error('Error loading galeri detail:', error);
+                        $('#galeri-judul').text('Gagal Memuat Galeri');
+                        $('#galeri-images-container').html('<div class="col-12"><p>Gagal memuat galeri. Silakan coba lagi nanti.</p></div>');
                     }
-                },
-                error: function(xhr, status, error) {
-                    console.error('Error loading galeri detail:', error);
-                    $('#galeri-judul').text('Gagal Memuat Galeri');
-                    $('#galeri-images-container').html('<div class="col-12"><p>Gagal memuat galeri. Silakan coba lagi nanti.</p></div>');
-                }
-            });
-        }
-        
-        // Load galeri detail on page load
-        loadGaleriDetail();
-        
-        // Initialize image modal functionality
-        function initializeImageModal() {
-            // If there's a modal functionality, reinitialize it here
-            // This would depend on what's in 'forms.image-modal'
-            $('#myImg').on('click', function() {
-                var modal = document.getElementById("myModal");
-                var modalImg = document.getElementById("img01");
-                var captionText = document.getElementById("caption");
-                
-                if (modal && modalImg) {
-                    modal.style.display = "block";
-                    modalImg.src = this.src;
-                    captionText.innerHTML = this.alt;
-                }
-            });
-        }
-    });
-</script>
-@include('forms.image-modal')
-@endpush
\ No newline at end of file
+                });
+            }
+
+            // Load galeri detail on page load
+            loadGaleriDetail();
+
+            // Initialize image modal functionality
+            function initializeImageModal() {
+                // If there's a modal functionality, reinitialize it here
+                // This would depend on what's in 'forms.image-modal'
+                $('#myImg').on('click', function() {
+                    var modal = document.getElementById("myModal");
+                    var modalImg = document.getElementById("img01");
+                    var captionText = document.getElementById("caption");
+
+                    if (modal && modalImg) {
+                        modal.style.display = "block";
+                        modalImg.src = this.src;
+                        captionText.innerHTML = this.alt;
+                    }
+                });
+            }
+        });
+    </script>
+    @include('forms.image-modal')
+@endpush
diff --git a/themes/opendk/default/resources/views/pages/unduhan/form-dokumen.blade.php b/themes/opendk/default/resources/views/pages/unduhan/form-dokumen.blade.php
index 07b1e21d86..50efbcad01 100644
--- a/themes/opendk/default/resources/views/pages/unduhan/form-dokumen.blade.php
+++ b/themes/opendk/default/resources/views/pages/unduhan/form-dokumen.blade.php
@@ -30,15 +30,18 @@
         $(document).ready(function() {
             var table = $('#dokumen-table').DataTable({
                 processing: true,
-                serverSide: false,
+                serverSide: true,
                 ajax: {
                     url: '{!! $urlApi !!}/form-dokumen',
                     cache: false,
-                    dataSrc: 'data',
+                    dataSrc: function(json) {
+                        json.recordsTotal = json.meta?.pagination?.total ?? 0;
+                        json.recordsFiltered = json.meta?.pagination?.total ?? 0;
+                        return json.data;
+                    },
                     data: function(d) {
-                        // Convert DataTables parameters to API format (use safe defaults to avoid NaN)
                         var start = (typeof d.start !== 'undefined' && d.start !== null) ? d.start : 0;
-                        var length = (typeof d.length !== 'undefined' && d.length) ? d.length : (typeof d.pageLength !== 'undefined' ? d.pageLength : 10);
+                        var length = (typeof d.length !== 'undefined' && d.length) ? d.length : 10;
                         var pageNumber = 1;
                         if (length && !isNaN(length)) {
                             pageNumber = Math.floor(start / length) + 1;
@@ -52,6 +55,8 @@
                         };
                     }
                 },
+                pageLength: 10,
+                lengthMenu: [5, 10, 25, 50, 100],
                 columns: [{
                         data: null,
                         name: 'aksi',
diff --git a/themes/opendk/default/resources/views/pages/unduhan/prosedur.blade.php b/themes/opendk/default/resources/views/pages/unduhan/prosedur.blade.php
index b25a3f8713..bfcc3d1778 100644
--- a/themes/opendk/default/resources/views/pages/unduhan/prosedur.blade.php
+++ b/themes/opendk/default/resources/views/pages/unduhan/prosedur.blade.php
@@ -30,15 +30,18 @@
         $(document).ready(function() {
             var table = $('#prosedur-table').DataTable({
                 processing: true,
-                serverSide: false,
+                serverSide: true,
                 ajax: {
                     url: '{!! $urlApi !!}/prosedur',
                     cache: false,
-                    dataSrc: 'data',
+                    dataSrc: function(json) {
+                        json.recordsTotal = json.meta?.pagination?.total ?? 0;
+                        json.recordsFiltered = json.meta?.pagination?.total ?? 0;
+                        return json.data;
+                    },
                     data: function(d) {
-                        // Convert DataTables parameters to API format (use safe defaults to avoid NaN)
                         var start = (typeof d.start !== 'undefined' && d.start !== null) ? d.start : 0;
-                        var length = (typeof d.length !== 'undefined' && d.length) ? d.length : (typeof d.pageLength !== 'undefined' ? d.pageLength : 10);
+                        var length = (typeof d.length !== 'undefined' && d.length) ? d.length : 10;
                         var pageNumber = 1;
                         if (length && !isNaN(length)) {
                             pageNumber = Math.floor(start / length) + 1;
@@ -50,6 +53,8 @@
                         };
                     }
                 },
+                pageLength: 10,
+                lengthMenu: [5, 10, 25, 50, 100],
                 columns: [{
                         data: 'attributes.judul_prosedur',
                         name: 'judul_prosedur',
diff --git a/themes/opendk/default/resources/views/pages/unduhan/regulasi.blade.php b/themes/opendk/default/resources/views/pages/unduhan/regulasi.blade.php
index 567698960f..0b2b90993f 100644
--- a/themes/opendk/default/resources/views/pages/unduhan/regulasi.blade.php
+++ b/themes/opendk/default/resources/views/pages/unduhan/regulasi.blade.php
@@ -30,15 +30,18 @@
         $(document).ready(function() {
             var table = $('#regulasi-table').DataTable({
                 processing: true,
-                serverSide: false,
+                serverSide: true,
                 ajax: {
                     url: '{!! $urlApi !!}/regulasi',
                     cache: false,
-                    dataSrc: 'data',
+                    dataSrc: function(json) {
+                        json.recordsTotal = json.meta?.pagination?.total ?? 0;
+                        json.recordsFiltered = json.meta?.pagination?.total ?? 0;
+                        return json.data;
+                    },
                     data: function(d) {
-                        // Convert DataTables parameters to API format (use safe defaults to avoid NaN)
                         var start = (typeof d.start !== 'undefined' && d.start !== null) ? d.start : 0;
-                        var length = (typeof d.length !== 'undefined' && d.length) ? d.length : (typeof d.pageLength !== 'undefined' ? d.pageLength : 10);
+                        var length = (typeof d.length !== 'undefined' && d.length) ? d.length : 10;
                         var pageNumber = 1;
                         if (length && !isNaN(length)) {
                             pageNumber = Math.floor(start / length) + 1;
@@ -50,6 +53,8 @@
                         };
                     }
                 },
+                pageLength: 10,
+                lengthMenu: [5, 10, 25, 50, 100],
                 columns: [{
                         data: 'attributes.judul',
                         name: 'judul',