From 66bb4c4c7cf02cfd968d084fdb48d3ac5783919f Mon Sep 17 00:00:00 2001
From: naukyy <kalbarskw60@gmail.com>
Date: Fri, 12 Jun 2026 22:46:13 +0700
Subject: [PATCH] Coba Commit

---
 01/backend/api/jalan.php                      |   4 +-
 01/backend/api/kavling.php                    |   4 +-
 01/backend/api/spbu.php                       |   4 +-
 01/frontend/js/services/api.service.js        |  10 +-
 02/backend/api/jalan.php                      |   4 +-
 02/backend/api/kavling.php                    |   4 +-
 02/backend/api/rumah_ibadah.php               |   4 +-
 02/backend/api/spbu.php                       |   4 +-
 02/backend/api/warga_miskin.php               |   4 +-
 02/frontend/js/services/api.service.js        |  10 +-
 03/backend/api/jalan.php                      |   4 +-
 03/backend/api/kavling.php                    |   4 +-
 03/backend/api/rumah_ibadah.php               |   4 +-
 03/backend/api/spbu.php                       |   4 +-
 03/backend/api/statistik.php                  |   4 +-
 03/backend/api/warga_miskin.php               |   4 +-
 03/frontend/js/services/api.service.js        |  10 +-
 README.md                                     |  61 +++++----
 .../buat_tabel.sql                            |   0
 .../data_awal_pengguna.sql                    |   0
 .../data_awal_wilayah.sql                     |   0
 .../webgis_naufal_zaky.sql                    |   0
 index.html                                    |   4 +-
 project_final/api/blank_spot.php              |  66 ----------
 project_final/api/check_srid.php              |  14 ---
 project_final/api/fix_srid.php                |  12 --
 project_final/api/helpers.php                 |  52 --------
 project_final/api/jalan.php                   |  22 ----
 project_final/api/kavling.php                 |  26 ----
 project_final/api/kawasan_kumuh.php           |  22 ----
 project_final/api/laporan.php                 | 104 ----------------
 project_final/api/rumah_ibadah.php            | 102 ---------------
 project_final/api/spbu.php                    |  57 ---------
 project_final/api/spbu_status.php             |  29 -----
 project_final/api/spbu_terdekat.php           |  13 --
 project_final/api/statistik.php               |  53 --------
 project_final/api/ulasan.php                  |  50 --------
 project_final/api/users.php                   |  31 -----
 project_final/api/warga_miskin.php            |  26 ----
 project_final/index.php                       |  13 --
 import_db.php => setup_database.php           |   0
 {final => versi}/backend/api/jalan.php        |   4 +-
 {final => versi}/backend/api/kavling.php      |   4 +-
 {final => versi}/backend/api/rumah_ibadah.php |   4 +-
 {final => versi}/backend/api/spbu.php         |   4 +-
 {final => versi}/backend/api/statistik.php    |   4 +-
 {final => versi}/backend/api/warga_miskin.php |   4 +-
 {final => versi}/backend/config/db.php        |   0
 .../backend/utils/response_helper.php         |   0
 {final => versi}/frontend/base.css            |   0
 {final => versi}/frontend/css/main.css        |   0
 {final => versi}/frontend/form.css            |   0
 {final => versi}/frontend/index.html          |   0
 {final => versi}/frontend/js/app.js           |   0
 {final => versi}/frontend/js/modules/draw.js  |   0
 {final => versi}/frontend/js/modules/form.js  |   0
 {final => versi}/frontend/js/modules/map.js   |   0
 .../frontend/js/services/api.service.js       |  10 +-
 .../js/services/rumah_ibadah.service.js       |   0
 .../frontend/js/services/statistik.service.js |   0
 .../js/services/warga_miskin.service.js       |   0
 {final => versi}/frontend/map.css             |   0
 {final => versi}/frontend/sidebar.css         |   0
 webgis_app/.htaccess                          |  13 ++
 webgis_app/api/blank_spot.php                 |   2 +
 webgis_app/api/check_srid.php                 |   2 +
 webgis_app/api/fix_srid.php                   |   2 +
 webgis_app/api/jalan.php                      |   2 +
 webgis_app/api/kavling.php                    |   2 +
 webgis_app/api/kawasan_kumuh.php              |   2 +
 webgis_app/api/laporan.php                    |   2 +
 webgis_app/api/rumah_ibadah.php               |   2 +
 webgis_app/api/spbu.php                       |   2 +
 webgis_app/api/spbu_status.php                |   2 +
 webgis_app/api/spbu_terdekat.php              |   2 +
 webgis_app/api/statistik.php                  |   2 +
 webgis_app/api/ulasan.php                     |   2 +
 webgis_app/api/users.php                      |   2 +
 webgis_app/api/warga_miskin.php               |   2 +
 .../core_config/database.php                  |   5 +-
 webgis_app/core_config/env_loader.php         |  56 +++++++++
 .../core_config/middleware_auth.php           |  29 ++++-
 .../core_config/session_mgr.php               |   2 +-
 .../core_config/settings.php                  |  10 +-
 webgis_app/endpoints/api_fasilitas.php        | 113 +++++++++++++++++
 webgis_app/endpoints/api_jalan.php            |  88 +++++++++++++
 webgis_app/endpoints/api_kavling.php          |  91 ++++++++++++++
 webgis_app/endpoints/api_kawasan.php          |  86 +++++++++++++
 webgis_app/endpoints/api_laporan.php          | 117 ++++++++++++++++++
 webgis_app/endpoints/api_pengguna.php         |  77 ++++++++++++
 webgis_app/endpoints/api_spbu.php             |  91 ++++++++++++++
 webgis_app/endpoints/api_spbu_nearby.php      |  62 ++++++++++
 webgis_app/endpoints/api_spbu_status.php      |  41 ++++++
 webgis_app/endpoints/api_statistik.php        |  65 ++++++++++
 webgis_app/endpoints/api_ulasan.php           | 100 +++++++++++++++
 webgis_app/endpoints/api_warga_miskin.php     |  91 ++++++++++++++
 webgis_app/endpoints/area_blank.php           |  98 +++++++++++++++
 webgis_app/endpoints/cek_srid.php             |  35 ++++++
 webgis_app/endpoints/perbaiki_srid.php        |  33 +++++
 {project_final => webgis_app}/import.php      |   4 +-
 webgis_app/index.php                          |  13 ++
 {project_final => webgis_app}/login.php       |  12 +-
 {project_final => webgis_app}/logout.php      |   4 +-
 .../panel_admin}/index.php                    |  14 +--
 .../panel_admin/kelola_fasilitas.php          |   6 +-
 .../panel_admin/kelola_jalan.php              |   8 +-
 .../panel_admin/kelola_kavling.php            |   8 +-
 .../panel_admin/kelola_kawasan.php            |   8 +-
 .../panel_admin/kelola_laporan.php            |   6 +-
 .../panel_admin/kelola_spbu.php               |   6 +-
 .../panel_admin/kelola_warga.php              |   6 +-
 .../panel_admin/manajemen_pengguna.php        |   6 +-
 .../panel_admin}/partials/footer.php          |   0
 .../panel_admin}/partials/header.php          |  28 ++---
 .../panel_admin/peta_admin.php                |   8 +-
 .../panel_user/buat_laporan.php               |   6 +-
 .../user => webgis_app/panel_user}/index.php  |  10 +-
 .../panel_user}/partials/footer.php           |   0
 .../panel_user}/partials/header.php           |  12 +-
 .../panel_user/peta_user.php                  |   8 +-
 .../public_assets}/css/auth.css               |   0
 .../public_assets/css/global.css              |   0
 .../public_assets}/css/map.css                |   0
 .../public_assets/css/panel.css               |   0
 .../public_assets/js/peta-admin.js            |  59 +++++++--
 .../public_assets/js/peta-user.js             |  37 +++++-
 126 files changed, 1613 insertions(+), 866 deletions(-)
 rename database/create_tables.sql => db_scripts/buat_tabel.sql (100%)
 rename database/seed_users.sql => db_scripts/data_awal_pengguna.sql (100%)
 rename database/seed_pontianak.sql => db_scripts/data_awal_wilayah.sql (100%)
 rename database/webgis_db.sql => db_scripts/webgis_naufal_zaky.sql (100%)
 delete mode 100644 project_final/api/blank_spot.php
 delete mode 100644 project_final/api/check_srid.php
 delete mode 100644 project_final/api/fix_srid.php
 delete mode 100644 project_final/api/helpers.php
 delete mode 100644 project_final/api/jalan.php
 delete mode 100644 project_final/api/kavling.php
 delete mode 100644 project_final/api/kawasan_kumuh.php
 delete mode 100644 project_final/api/laporan.php
 delete mode 100644 project_final/api/rumah_ibadah.php
 delete mode 100644 project_final/api/spbu.php
 delete mode 100644 project_final/api/spbu_status.php
 delete mode 100644 project_final/api/spbu_terdekat.php
 delete mode 100644 project_final/api/statistik.php
 delete mode 100644 project_final/api/ulasan.php
 delete mode 100644 project_final/api/users.php
 delete mode 100644 project_final/api/warga_miskin.php
 delete mode 100644 project_final/index.php
 rename import_db.php => setup_database.php (100%)
 rename {final => versi}/backend/api/jalan.php (97%)
 rename {final => versi}/backend/api/kavling.php (97%)
 rename {final => versi}/backend/api/rumah_ibadah.php (98%)
 rename {final => versi}/backend/api/spbu.php (97%)
 rename {final => versi}/backend/api/statistik.php (97%)
 rename {final => versi}/backend/api/warga_miskin.php (97%)
 rename {final => versi}/backend/config/db.php (100%)
 rename {final => versi}/backend/utils/response_helper.php (100%)
 rename {final => versi}/frontend/base.css (100%)
 rename {final => versi}/frontend/css/main.css (100%)
 rename {final => versi}/frontend/form.css (100%)
 rename {final => versi}/frontend/index.html (100%)
 rename {final => versi}/frontend/js/app.js (100%)
 rename {final => versi}/frontend/js/modules/draw.js (100%)
 rename {final => versi}/frontend/js/modules/form.js (100%)
 rename {final => versi}/frontend/js/modules/map.js (100%)
 rename {final => versi}/frontend/js/services/api.service.js (80%)
 rename {final => versi}/frontend/js/services/rumah_ibadah.service.js (100%)
 rename {final => versi}/frontend/js/services/statistik.service.js (100%)
 rename {final => versi}/frontend/js/services/warga_miskin.service.js (100%)
 rename {final => versi}/frontend/map.css (100%)
 rename {final => versi}/frontend/sidebar.css (100%)
 create mode 100644 webgis_app/.htaccess
 create mode 100644 webgis_app/api/blank_spot.php
 create mode 100644 webgis_app/api/check_srid.php
 create mode 100644 webgis_app/api/fix_srid.php
 create mode 100644 webgis_app/api/jalan.php
 create mode 100644 webgis_app/api/kavling.php
 create mode 100644 webgis_app/api/kawasan_kumuh.php
 create mode 100644 webgis_app/api/laporan.php
 create mode 100644 webgis_app/api/rumah_ibadah.php
 create mode 100644 webgis_app/api/spbu.php
 create mode 100644 webgis_app/api/spbu_status.php
 create mode 100644 webgis_app/api/spbu_terdekat.php
 create mode 100644 webgis_app/api/statistik.php
 create mode 100644 webgis_app/api/ulasan.php
 create mode 100644 webgis_app/api/users.php
 create mode 100644 webgis_app/api/warga_miskin.php
 rename project_final/config/db.php => webgis_app/core_config/database.php (94%)
 create mode 100644 webgis_app/core_config/env_loader.php
 rename project_final/config/auth_check.php => webgis_app/core_config/middleware_auth.php (56%)
 rename project_final/config/session.php => webgis_app/core_config/session_mgr.php (93%)
 rename project_final/config/app.php => webgis_app/core_config/settings.php (60%)
 create mode 100644 webgis_app/endpoints/api_fasilitas.php
 create mode 100644 webgis_app/endpoints/api_jalan.php
 create mode 100644 webgis_app/endpoints/api_kavling.php
 create mode 100644 webgis_app/endpoints/api_kawasan.php
 create mode 100644 webgis_app/endpoints/api_laporan.php
 create mode 100644 webgis_app/endpoints/api_pengguna.php
 create mode 100644 webgis_app/endpoints/api_spbu.php
 create mode 100644 webgis_app/endpoints/api_spbu_nearby.php
 create mode 100644 webgis_app/endpoints/api_spbu_status.php
 create mode 100644 webgis_app/endpoints/api_statistik.php
 create mode 100644 webgis_app/endpoints/api_ulasan.php
 create mode 100644 webgis_app/endpoints/api_warga_miskin.php
 create mode 100644 webgis_app/endpoints/area_blank.php
 create mode 100644 webgis_app/endpoints/cek_srid.php
 create mode 100644 webgis_app/endpoints/perbaiki_srid.php
 rename {project_final => webgis_app}/import.php (92%)
 create mode 100644 webgis_app/index.php
 rename {project_final => webgis_app}/login.php (91%)
 rename {project_final => webgis_app}/logout.php (58%)
 rename {project_final/admin => webgis_app/panel_admin}/index.php (91%)
 rename project_final/admin/data_rumah.php => webgis_app/panel_admin/kelola_fasilitas.php (98%)
 rename project_final/admin/data_jalan.php => webgis_app/panel_admin/kelola_jalan.php (96%)
 rename project_final/admin/data_kavling.php => webgis_app/panel_admin/kelola_kavling.php (96%)
 rename project_final/admin/data_kawasan.php => webgis_app/panel_admin/kelola_kawasan.php (93%)
 rename project_final/admin/data_laporan.php => webgis_app/panel_admin/kelola_laporan.php (98%)
 rename project_final/admin/data_spbu.php => webgis_app/panel_admin/kelola_spbu.php (98%)
 rename project_final/admin/data_warga.php => webgis_app/panel_admin/kelola_warga.php (98%)
 rename project_final/admin/users.php => webgis_app/panel_admin/manajemen_pengguna.php (98%)
 rename {project_final/admin => webgis_app/panel_admin}/partials/footer.php (100%)
 rename {project_final/admin => webgis_app/panel_admin}/partials/header.php (81%)
 rename project_final/admin/peta.php => webgis_app/panel_admin/peta_admin.php (96%)
 rename project_final/user/laporan.php => webgis_app/panel_user/buat_laporan.php (98%)
 rename {project_final/user => webgis_app/panel_user}/index.php (93%)
 rename {project_final/user => webgis_app/panel_user}/partials/footer.php (100%)
 rename {project_final/user => webgis_app/panel_user}/partials/header.php (90%)
 rename project_final/user/peta.php => webgis_app/panel_user/peta_user.php (96%)
 rename {project_final/assets => webgis_app/public_assets}/css/auth.css (100%)
 rename project_final/assets/css/main.css => webgis_app/public_assets/css/global.css (100%)
 rename {project_final/assets => webgis_app/public_assets}/css/map.css (100%)
 rename project_final/assets/css/admin.css => webgis_app/public_assets/css/panel.css (100%)
 rename project_final/assets/js/admin-map.js => webgis_app/public_assets/js/peta-admin.js (92%)
 rename project_final/assets/js/user-map.js => webgis_app/public_assets/js/peta-user.js (94%)

diff --git a/01/backend/api/jalan.php b/01/backend/api/jalan.php
index 7264a11..886efd9 100644
--- a/01/backend/api/jalan.php
+++ b/01/backend/api/jalan.php
@@ -1,10 +1,10 @@
-<?php
+<?php
 /**
  * jalan.php
  * Tanggung Jawab: Menangani operasi CRUD untuk entitas Jalan (LineString).
  */
 
-require_once '../config/db.php';
+require_once '../core_config/database.php';
 require_once '../utils/response_helper.php';
 
 $pdo = Database::getConnection();
diff --git a/01/backend/api/kavling.php b/01/backend/api/kavling.php
index ed862a5..4d51ee2 100644
--- a/01/backend/api/kavling.php
+++ b/01/backend/api/kavling.php
@@ -1,10 +1,10 @@
-<?php
+<?php
 /**
  * kavling.php
  * Tanggung Jawab: Menangani operasi CRUD untuk entitas Kavling (Polygon).
  */
 
-require_once '../config/db.php';
+require_once '../core_config/database.php';
 require_once '../utils/response_helper.php';
 
 $pdo = Database::getConnection();
diff --git a/01/backend/api/spbu.php b/01/backend/api/spbu.php
index 7529ba1..6acaf74 100644
--- a/01/backend/api/spbu.php
+++ b/01/backend/api/spbu.php
@@ -1,5 +1,5 @@
-<?php
-require_once '../config/db.php';
+<?php
+require_once '../core_config/database.php';
 require_once '../utils/response_helper.php';
 
 $pdo = Database::getConnection();
diff --git a/01/frontend/js/services/api.service.js b/01/frontend/js/services/api.service.js
index 36e7e5f..8339ec3 100644
--- a/01/frontend/js/services/api.service.js
+++ b/01/frontend/js/services/api.service.js
@@ -1,4 +1,12 @@
-export const BASE_URL = '';
+const getBaseUrl = () => {
+    const segments = window.location.pathname.split('/');
+    const targetIndex = segments.findIndex(seg => ['01', '02', '03', 'versi'].includes(seg));
+    if (targetIndex !== -1) {
+        return segments.slice(0, targetIndex).join('/');
+    }
+    return '';
+};
+export const BASE_URL = getBaseUrl();
 
 const createService = (endpoint) => ({
     getAll: async () => {
diff --git a/02/backend/api/jalan.php b/02/backend/api/jalan.php
index 7264a11..886efd9 100644
--- a/02/backend/api/jalan.php
+++ b/02/backend/api/jalan.php
@@ -1,10 +1,10 @@
-<?php
+<?php
 /**
  * jalan.php
  * Tanggung Jawab: Menangani operasi CRUD untuk entitas Jalan (LineString).
  */
 
-require_once '../config/db.php';
+require_once '../core_config/database.php';
 require_once '../utils/response_helper.php';
 
 $pdo = Database::getConnection();
diff --git a/02/backend/api/kavling.php b/02/backend/api/kavling.php
index ed862a5..4d51ee2 100644
--- a/02/backend/api/kavling.php
+++ b/02/backend/api/kavling.php
@@ -1,10 +1,10 @@
-<?php
+<?php
 /**
  * kavling.php
  * Tanggung Jawab: Menangani operasi CRUD untuk entitas Kavling (Polygon).
  */
 
-require_once '../config/db.php';
+require_once '../core_config/database.php';
 require_once '../utils/response_helper.php';
 
 $pdo = Database::getConnection();
diff --git a/02/backend/api/rumah_ibadah.php b/02/backend/api/rumah_ibadah.php
index 1de6d5d..b1172c4 100644
--- a/02/backend/api/rumah_ibadah.php
+++ b/02/backend/api/rumah_ibadah.php
@@ -1,10 +1,10 @@
-<?php
+<?php
 /**
  * rumah_ibadah.php
  * Tanggung Jawab: Operasi CRUD Rumah Ibadah + Endpoint analisis jangkauan Haversine.
  */
 
-require_once '../config/db.php';
+require_once '../core_config/database.php';
 require_once '../utils/response_helper.php';
 require_once '../utils/geo_helper.php';
 
diff --git a/02/backend/api/spbu.php b/02/backend/api/spbu.php
index 7529ba1..6acaf74 100644
--- a/02/backend/api/spbu.php
+++ b/02/backend/api/spbu.php
@@ -1,5 +1,5 @@
-<?php
-require_once '../config/db.php';
+<?php
+require_once '../core_config/database.php';
 require_once '../utils/response_helper.php';
 
 $pdo = Database::getConnection();
diff --git a/02/backend/api/warga_miskin.php b/02/backend/api/warga_miskin.php
index dca0aff..2c48a44 100644
--- a/02/backend/api/warga_miskin.php
+++ b/02/backend/api/warga_miskin.php
@@ -1,10 +1,10 @@
-<?php
+<?php
 /**
  * warga_miskin.php
  * Tanggung Jawab: Operasi CRUD untuk Warga Miskin.
  */
 
-require_once '../config/db.php';
+require_once '../core_config/database.php';
 require_once '../utils/response_helper.php';
 
 $pdo = Database::getConnection();
diff --git a/02/frontend/js/services/api.service.js b/02/frontend/js/services/api.service.js
index 36e7e5f..8339ec3 100644
--- a/02/frontend/js/services/api.service.js
+++ b/02/frontend/js/services/api.service.js
@@ -1,4 +1,12 @@
-export const BASE_URL = '';
+const getBaseUrl = () => {
+    const segments = window.location.pathname.split('/');
+    const targetIndex = segments.findIndex(seg => ['01', '02', '03', 'versi'].includes(seg));
+    if (targetIndex !== -1) {
+        return segments.slice(0, targetIndex).join('/');
+    }
+    return '';
+};
+export const BASE_URL = getBaseUrl();
 
 const createService = (endpoint) => ({
     getAll: async () => {
diff --git a/03/backend/api/jalan.php b/03/backend/api/jalan.php
index 7264a11..886efd9 100644
--- a/03/backend/api/jalan.php
+++ b/03/backend/api/jalan.php
@@ -1,10 +1,10 @@
-<?php
+<?php
 /**
  * jalan.php
  * Tanggung Jawab: Menangani operasi CRUD untuk entitas Jalan (LineString).
  */
 
-require_once '../config/db.php';
+require_once '../core_config/database.php';
 require_once '../utils/response_helper.php';
 
 $pdo = Database::getConnection();
diff --git a/03/backend/api/kavling.php b/03/backend/api/kavling.php
index ed862a5..4d51ee2 100644
--- a/03/backend/api/kavling.php
+++ b/03/backend/api/kavling.php
@@ -1,10 +1,10 @@
-<?php
+<?php
 /**
  * kavling.php
  * Tanggung Jawab: Menangani operasi CRUD untuk entitas Kavling (Polygon).
  */
 
-require_once '../config/db.php';
+require_once '../core_config/database.php';
 require_once '../utils/response_helper.php';
 
 $pdo = Database::getConnection();
diff --git a/03/backend/api/rumah_ibadah.php b/03/backend/api/rumah_ibadah.php
index 1de6d5d..b1172c4 100644
--- a/03/backend/api/rumah_ibadah.php
+++ b/03/backend/api/rumah_ibadah.php
@@ -1,10 +1,10 @@
-<?php
+<?php
 /**
  * rumah_ibadah.php
  * Tanggung Jawab: Operasi CRUD Rumah Ibadah + Endpoint analisis jangkauan Haversine.
  */
 
-require_once '../config/db.php';
+require_once '../core_config/database.php';
 require_once '../utils/response_helper.php';
 require_once '../utils/geo_helper.php';
 
diff --git a/03/backend/api/spbu.php b/03/backend/api/spbu.php
index 7529ba1..6acaf74 100644
--- a/03/backend/api/spbu.php
+++ b/03/backend/api/spbu.php
@@ -1,5 +1,5 @@
-<?php
-require_once '../config/db.php';
+<?php
+require_once '../core_config/database.php';
 require_once '../utils/response_helper.php';
 
 $pdo = Database::getConnection();
diff --git a/03/backend/api/statistik.php b/03/backend/api/statistik.php
index b5712c6..0208fa0 100644
--- a/03/backend/api/statistik.php
+++ b/03/backend/api/statistik.php
@@ -1,11 +1,11 @@
-<?php
+<?php
 /**
  * statistik.php
  * Tanggung Jawab: Menyediakan data analisis spasial menggunakan Point in Polygon (ST_Contains).
  * Menghitung kepadatan warga miskin dalam setiap kavling.
  */
 
-require_once '../config/db.php';
+require_once '../core_config/database.php';
 require_once '../utils/response_helper.php';
 
 $pdo = Database::getConnection();
diff --git a/03/backend/api/warga_miskin.php b/03/backend/api/warga_miskin.php
index dca0aff..2c48a44 100644
--- a/03/backend/api/warga_miskin.php
+++ b/03/backend/api/warga_miskin.php
@@ -1,10 +1,10 @@
-<?php
+<?php
 /**
  * warga_miskin.php
  * Tanggung Jawab: Operasi CRUD untuk Warga Miskin.
  */
 
-require_once '../config/db.php';
+require_once '../core_config/database.php';
 require_once '../utils/response_helper.php';
 
 $pdo = Database::getConnection();
diff --git a/03/frontend/js/services/api.service.js b/03/frontend/js/services/api.service.js
index 36e7e5f..8339ec3 100644
--- a/03/frontend/js/services/api.service.js
+++ b/03/frontend/js/services/api.service.js
@@ -1,4 +1,12 @@
-export const BASE_URL = '';
+const getBaseUrl = () => {
+    const segments = window.location.pathname.split('/');
+    const targetIndex = segments.findIndex(seg => ['01', '02', '03', 'versi'].includes(seg));
+    if (targetIndex !== -1) {
+        return segments.slice(0, targetIndex).join('/');
+    }
+    return '';
+};
+export const BASE_URL = getBaseUrl();
 
 const createService = (endpoint) => ({
     getAll: async () => {
diff --git a/README.md b/README.md
index 0f22db8..d80a113 100644
--- a/README.md
+++ b/README.md
@@ -1,18 +1,19 @@
-# WebGIS Poverty Map
+# D1041231071 — WebGIS Smart City Project
+**Naufal Zaky R | UAS WebGIS**
 
-Aplikasi WebGIS PHP + MySQL untuk pemetaan data kemiskinan, fasilitas, laporan warga, dan analisis blank spot bantuan.
+Aplikasi WebGIS berbasis PHP + MySQL untuk pemetaan data kemiskinan, fasilitas umum, laporan warga, dan analisis blank spot bantuan sosial di Kota Pontianak.
 
-## Stack
+## Stack Teknologi
 
 - PHP 8.2 Apache
-- MySQL/MariaDB
-- Leaflet
-- PDO MySQL
+- MySQL / MariaDB + PostGIS
+- Leaflet.js (peta interaktif)
+- PDO MySQL (koneksi database)
 
-## Deploy Coolify
+## Cara Deploy (Coolify)
 
 1. Buat database MySQL/MariaDB di Coolify.
-2. Import `database/webgis_db.sql` ke database tersebut.
+2. Import `db_scripts/webgis_naufal_zaky.sql` ke database tersebut.
 3. Buat aplikasi baru dari repo ini.
 4. Pilih build menggunakan `Dockerfile` di root repository.
 5. Set environment variable:
@@ -28,9 +29,7 @@ DB_USERNAME=user_database
 DB_PASSWORD=password_database
 ```
 
-Root aplikasi menampilkan halaman pemilih progres dari `index.html`. Versi final berjalan di `/project_final`, jadi gunakan `APP_BASE_PATH=/project_final` untuk deploy Coolify ini.
-
-`CORS_ALLOWED_ORIGIN` boleh dikosongkan untuk same-origin deployment. Isi dengan domain aplikasi jika API memang perlu diakses dari origin lain.
+Aplikasi final berjalan di `/webgis_app`. Gunakan `APP_BASE_PATH=/webgis_app` untuk deploy.
 
 ## Akun Awal
 
@@ -39,23 +38,38 @@ Setelah import SQL:
 - Admin: `admin / admin123`
 - Pengguna: `pengguna / user123`
 
-Ganti password akun demo setelah deploy jika aplikasi dibuka publik.
+> Ganti password akun demo setelah deploy jika aplikasi dibuka publik.
 
-## Struktur Penting
+## Struktur Project
 
-- `index.html` - halaman awal untuk memilih progres.
-- `01/`, `02/`, `03/`, `final/` - progres pertemuan.
-- `project_final/` - aplikasi final yang berjalan di `/project_final`.
-- `database/webgis_db.sql` - struktur dan seed database lengkap.
-- `Dockerfile` - image PHP Apache untuk Coolify.
-- `.env.example` - contoh environment variable deploy.
+```
+D1041231071_NaufalZakyR_UAS_WebGISProject/
+├── beranda.html           ← Halaman pemilih progres
+├── webgis_app/            ← Aplikasi final (main app)
+│   ├── panel_admin/       ← Halaman & fitur admin
+│   ├── panel_user/        ← Halaman & fitur pengguna
+│   ├── endpoints/         ← API endpoint PHP
+│   ├── core_config/       ← Konfigurasi (DB, session, auth)
+│   └── public_assets/     ← CSS & JS (global, panel, map)
+├── db_scripts/            ← SQL scripts database
+│   ├── buat_tabel.sql
+│   ├── data_awal_wilayah.sql
+│   ├── data_awal_pengguna.sql
+│   └── webgis_naufal_zaky.sql
+├── version_01/            ← Progres pertemuan 1
+├── version_02/            ← Progres pertemuan 2
+├── version_03/            ← Progres pertemuan 3
+├── legacy_version/        ← Versi lama (referensi)
+├── Dockerfile             ← Docker image untuk Coolify
+└── .env                   ← Konfigurasi environment
+```
 
-## Local XAMPP
+## Jalankan di XAMPP Lokal
 
-Untuk menjalankan dari XAMPP seperti struktur lama, set base path:
+Set konfigurasi di `.env`:
 
 ```env
-APP_BASE_PATH=/project/project_final
+APP_BASE_PATH=/D1041231071_NaufalZakyR_UAS_WebGISProject/webgis_app
 DB_HOST=127.0.0.1
 DB_PORT=3306
 DB_DATABASE=webgis_db
@@ -63,4 +77,5 @@ DB_USERNAME=root
 DB_PASSWORD=
 ```
 
-Import `database/webgis_db.sql`, lalu buka `/project/project_final/login.php`.
+Import `db_scripts/webgis_naufal_zaky.sql` ke phpMyAdmin, lalu buka:
+`http://localhost/D1041231071_NaufalZakyR_UAS_WebGISProject/webgis_app/login.php`
diff --git a/database/create_tables.sql b/db_scripts/buat_tabel.sql
similarity index 100%
rename from database/create_tables.sql
rename to db_scripts/buat_tabel.sql
diff --git a/database/seed_users.sql b/db_scripts/data_awal_pengguna.sql
similarity index 100%
rename from database/seed_users.sql
rename to db_scripts/data_awal_pengguna.sql
diff --git a/database/seed_pontianak.sql b/db_scripts/data_awal_wilayah.sql
similarity index 100%
rename from database/seed_pontianak.sql
rename to db_scripts/data_awal_wilayah.sql
diff --git a/database/webgis_db.sql b/db_scripts/webgis_naufal_zaky.sql
similarity index 100%
rename from database/webgis_db.sql
rename to db_scripts/webgis_naufal_zaky.sql
diff --git a/index.html b/index.html
index 1ba1c19..0c9ad80 100644
--- a/index.html
+++ b/index.html
@@ -8,7 +8,7 @@
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.0/css/all.min.css">
     <style>
         :root {
-            /* Matching project_final/main.css */
+            /* Matching webgis_app/main.css */
             --primary:        #2563EB;
             --primary-light:  #3B82F6;
             --primary-dark:   #1D4ED8;
@@ -302,7 +302,7 @@
         </a>
 
         <!-- Final (UAS) -->
-        <a href="project_final/" class="card final" style="animation-delay: 0.25s;">
+        <a href="webgis_app/" class="card final" style="animation-delay: 0.25s;">
             <div class="card-icon-wrap">
                 <i class="fas fa-laptop-code"></i>
             </div>
diff --git a/project_final/api/blank_spot.php b/project_final/api/blank_spot.php
deleted file mode 100644
index a4d8ce5..0000000
--- a/project_final/api/blank_spot.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-require_once __DIR__ . '/../config/db.php';
-require_once __DIR__ . '/helpers.php';
-
-$pdo = Database::getConnection();
-
-if ($_SERVER['REQUEST_METHOD'] !== 'GET') {
-    sendError('Method not allowed', 405);
-}
-
-// Warga miskin yang berada di luar semua radius bantuan rumah ibadah.
-$sql = "
-    SELECT
-        w.id,
-        w.nama_kk,
-        w.penghasilan,
-        ST_AsGeoJSON(w.geom) AS geojson,
-        ri.nama AS rumah_ibadah_terdekat,
-        ST_Distance_Sphere(ST_SRID(w.geom, 4326), ST_SRID(ri.geom, 4326)) AS jarak_meter,
-        ri.radius_bantuan_meter,
-        (ST_Distance_Sphere(ST_SRID(w.geom, 4326), ST_SRID(ri.geom, 4326)) - ri.radius_bantuan_meter) AS selisih_meter
-    FROM warga_miskin w
-    JOIN rumah_ibadah ri
-    JOIN (
-        SELECT
-            nearest_distance.warga_id,
-            MIN(nearest_distance.jarak_meter) AS min_jarak_meter
-        FROM (
-            SELECT
-                w2.id AS warga_id,
-                ST_Distance_Sphere(ST_SRID(w2.geom, 4326), ST_SRID(ri2.geom, 4326)) AS jarak_meter
-            FROM warga_miskin w2
-            CROSS JOIN rumah_ibadah ri2
-        ) nearest_distance
-        GROUP BY nearest_distance.warga_id
-    ) nearest
-        ON nearest.warga_id = w.id
-        AND ABS(ST_Distance_Sphere(ST_SRID(w.geom, 4326), ST_SRID(ri.geom, 4326)) - nearest.min_jarak_meter) < 0.001
-    WHERE NOT EXISTS (
-        SELECT 1
-        FROM rumah_ibadah ri_in_radius
-        WHERE ST_Distance_Sphere(ST_SRID(w.geom, 4326), ST_SRID(ri_in_radius.geom, 4326)) <= ri_in_radius.radius_bantuan_meter
-    )
-    GROUP BY w.id
-    ORDER BY selisih_meter DESC
-";
-
-$stmt = $pdo->query($sql);
-$features = [];
-
-while ($r = $stmt->fetch()) {
-    $features[] = [
-        'type' => 'Feature',
-        'geometry' => json_decode($r['geojson']),
-        'properties' => [
-            'id' => (int)$r['id'],
-            'nama_kk' => $r['nama_kk'],
-            'jarak_km' => round(((float)$r['jarak_meter']) / 1000, 2),
-            'radius_km' => round(((int)$r['radius_bantuan_meter']) / 1000, 2),
-            'selisih_km' => round(((float)$r['selisih_meter']) / 1000, 2),
-            'rumah_ibadah_terdekat' => $r['rumah_ibadah_terdekat']
-        ]
-    ];
-}
-
-sendSuccess(['type' => 'FeatureCollection', 'features' => $features], 'Blank Spot');
diff --git a/project_final/api/check_srid.php b/project_final/api/check_srid.php
deleted file mode 100644
index aa19004..0000000
--- a/project_final/api/check_srid.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-require_once __DIR__ . '/../config/db.php';
-try {
-    $pdo = Database::getConnection();
-    $stmt = $pdo->query("SELECT id, ST_SRID(geom) as srid FROM warga_miskin LIMIT 5");
-    echo "warga_miskin SRIDs: \n";
-    while ($row = $stmt->fetch()) echo $row['id'] . " => " . $row['srid'] . "\n";
-    
-    $stmt = $pdo->query("SELECT id, ST_SRID(geom) as srid FROM rumah_ibadah LIMIT 5");
-    echo "rumah_ibadah SRIDs: \n";
-    while ($row = $stmt->fetch()) echo $row['id'] . " => " . $row['srid'] . "\n";
-} catch (Exception $e) {
-    echo "ERROR: " . $e->getMessage();
-}
diff --git a/project_final/api/fix_srid.php b/project_final/api/fix_srid.php
deleted file mode 100644
index f5d3ef2..0000000
--- a/project_final/api/fix_srid.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-require_once __DIR__ . '/../config/db.php';
-try {
-    $pdo = Database::getConnection();
-    $tables = ['spbu', 'rumah_ibadah', 'jalan', 'kavling', 'kawasan_kumuh', 'warga_miskin'];
-    foreach ($tables as $t) {
-        $pdo->exec("UPDATE $t SET geom = ST_SRID(geom, 4326) WHERE ST_SRID(geom) != 4326");
-    }
-    echo "SRID FIXED";
-} catch (Exception $e) {
-    echo "ERROR: " . $e->getMessage();
-}
diff --git a/project_final/api/helpers.php b/project_final/api/helpers.php
deleted file mode 100644
index 16a36bd..0000000
--- a/project_final/api/helpers.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-require_once __DIR__ . '/../config/session.php';
-
-/**
- * Shared response helper for all API endpoints
- */
-header('Content-Type: application/json');
-$allowedOrigin = getenv('CORS_ALLOWED_ORIGIN');
-if ($allowedOrigin !== false && $allowedOrigin !== '') {
-    header('Access-Control-Allow-Origin: ' . $allowedOrigin);
-    header('Vary: Origin');
-    header('Access-Control-Allow-Methods: GET,POST,PUT,DELETE,OPTIONS');
-    header('Access-Control-Allow-Headers: Content-Type');
-}
-
-if ($_SERVER['REQUEST_METHOD'] === 'OPTIONS') { http_response_code(204); exit; }
-
-function sendSuccess($data, string $message = 'OK', int $code = 200): void {
-    http_response_code($code);
-    echo json_encode(['status' => 'success', 'message' => $message, 'data' => $data]);
-    exit;
-}
-
-function sendError(string $message = 'Bad Request', int $code = 400): void {
-    http_response_code($code);
-    echo json_encode(['status' => 'error', 'message' => $message, 'data' => null]);
-    exit;
-}
-
-function getInput(): array {
-    return json_decode(file_get_contents('php://input'), true) ?? [];
-}
-
-function requireApiRole(string $role): void {
-    if (session_status() === PHP_SESSION_NONE) {
-        startAppSession();
-    }
-
-    if (!isset($_SESSION['user_id'], $_SESSION['role'])) {
-        sendError('Unauthorized', 401);
-    }
-
-    if ($_SESSION['role'] !== $role) {
-        sendError('Forbidden', 403);
-    }
-}
-
-function requireAdminForMutation(): void {
-    if ($_SERVER['REQUEST_METHOD'] !== 'GET') {
-        requireApiRole('admin');
-    }
-}
diff --git a/project_final/api/jalan.php b/project_final/api/jalan.php
deleted file mode 100644
index 3c21ed8..0000000
--- a/project_final/api/jalan.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php require_once __DIR__ . '/../config/db.php'; require_once __DIR__ . '/helpers.php';
-$pdo = Database::getConnection(); $method = $_SERVER['REQUEST_METHOD'];
-requireAdminForMutation();
-switch ($method) {
-    case 'GET':
-        $stmt = $pdo->query("SELECT id,nama,jenis_jalan,created_at,ST_AsGeoJSON(geom) as geojson FROM jalan ORDER BY id DESC");
-        $features=[];
-        while($r=$stmt->fetch()) $features[]=['type'=>'Feature','geometry'=>json_decode($r['geojson']),'properties'=>['id'=>$r['id'],'nama'=>$r['nama'],'jenis_jalan'=>$r['jenis_jalan'],'created_at'=>$r['created_at']]];
-        sendSuccess(['type'=>'FeatureCollection','features'=>$features],'Data Jalan'); break;
-    case 'POST':
-        $d=getInput(); if(empty($d['nama'])||empty($d['geometry'])) sendError('Nama & geometri wajib');
-        $pdo->prepare("INSERT INTO jalan(nama,jenis_jalan,geom) VALUES(?,?,ST_GeomFromGeoJSON(?))")->execute([$d['nama'],$d['jenis_jalan']??'Lokal',json_encode($d['geometry'])]);
-        sendSuccess(['id'=>$pdo->lastInsertId()],'Jalan disimpan',201); break;
-    case 'PUT':
-        $d=getInput(); $id=$_GET['id']??null; if(!$id) sendError('ID wajib');
-        $pdo->prepare("UPDATE jalan SET nama=?,jenis_jalan=? WHERE id=?")->execute([$d['nama'],$d['jenis_jalan'],$id]);
-        sendSuccess(null,'Jalan diperbarui'); break;
-    case 'DELETE':
-        $id=$_GET['id']??null; if(!$id) sendError('ID wajib');
-        $pdo->prepare("DELETE FROM jalan WHERE id=?")->execute([$id]); sendSuccess(null,'Jalan dihapus'); break;
-    default: sendError('Method not allowed',405);
-}
diff --git a/project_final/api/kavling.php b/project_final/api/kavling.php
deleted file mode 100644
index 0c5fca3..0000000
--- a/project_final/api/kavling.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php require_once __DIR__ . '/../config/db.php'; require_once __DIR__ . '/helpers.php';
-$pdo = Database::getConnection(); $method = $_SERVER['REQUEST_METHOD'];
-requireAdminForMutation();
-switch ($method) {
-    case 'GET':
-        $stmt = $pdo->query("SELECT id,nama_pemilik,status_kepemilikan,luas,created_at,ST_AsGeoJSON(geom) as geojson FROM kavling ORDER BY id DESC");
-        $features=[];
-        while($r=$stmt->fetch()) $features[]=['type'=>'Feature','geometry'=>json_decode($r['geojson']),'properties'=>['id'=>$r['id'],'nama_pemilik'=>$r['nama_pemilik'],'status_kepemilikan'=>$r['status_kepemilikan'],'luas'=>$r['luas'],'created_at'=>$r['created_at']]];
-        sendSuccess(['type'=>'FeatureCollection','features'=>$features],'Data Kavling'); break;
-    case 'POST':
-        $d=getInput(); if(empty($d['nama_pemilik'])||empty($d['status_kepemilikan'])||empty($d['geometry'])) sendError('Data tidak lengkap');
-        $pdo->prepare("INSERT INTO kavling(nama_pemilik,status_kepemilikan,luas,geom) VALUES(?,?,?,ST_GeomFromGeoJSON(?))")->execute([$d['nama_pemilik'],$d['status_kepemilikan'],$d['luas']??0,json_encode($d['geometry'])]);
-        sendSuccess(['id'=>$pdo->lastInsertId()],'Kavling disimpan',201); break;
-    case 'PUT':
-        $d=getInput(); $id=$_GET['id']??null; if(!$id) sendError('ID wajib');
-        if(!empty($d['geometry'])){
-            $pdo->prepare("UPDATE kavling SET geom=ST_GeomFromGeoJSON(?) WHERE id=?")->execute([json_encode($d['geometry']),$id]);
-        } else {
-            $pdo->prepare("UPDATE kavling SET nama_pemilik=?,status_kepemilikan=?,luas=? WHERE id=?")->execute([$d['nama_pemilik'],$d['status_kepemilikan'],$d['luas']??0,$id]);
-        }
-        sendSuccess(null,'Kavling diperbarui'); break;
-    case 'DELETE':
-        $id=$_GET['id']??null; if(!$id) sendError('ID wajib');
-        $pdo->prepare("DELETE FROM kavling WHERE id=?")->execute([$id]); sendSuccess(null,'Kavling dihapus'); break;
-    default: sendError('Method not allowed',405);
-}
diff --git a/project_final/api/kawasan_kumuh.php b/project_final/api/kawasan_kumuh.php
deleted file mode 100644
index 397507b..0000000
--- a/project_final/api/kawasan_kumuh.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php require_once __DIR__ . '/../config/db.php'; require_once __DIR__ . '/helpers.php';
-$pdo = Database::getConnection(); $method = $_SERVER['REQUEST_METHOD'];
-requireAdminForMutation();
-switch ($method) {
-    case 'GET':
-        $stmt = $pdo->query("SELECT id,nama_kawasan,created_at,ST_AsGeoJSON(geom) as geojson FROM kawasan_kumuh ORDER BY id DESC");
-        $features=[];
-        while($r=$stmt->fetch()) $features[]=['type'=>'Feature','geometry'=>json_decode($r['geojson']),'properties'=>['id'=>$r['id'],'nama_kawasan'=>$r['nama_kawasan'],'created_at'=>$r['created_at']]];
-        sendSuccess(['type'=>'FeatureCollection','features'=>$features],'Data Kawasan Kumuh'); break;
-    case 'POST':
-        $d=getInput(); if(empty($d['nama_kawasan'])||empty($d['geometry'])) sendError('Data tidak lengkap');
-        $pdo->prepare("INSERT INTO kawasan_kumuh(nama_kawasan,geom) VALUES(?,ST_GeomFromGeoJSON(?))")->execute([$d['nama_kawasan'],json_encode($d['geometry'])]);
-        sendSuccess(['id'=>$pdo->lastInsertId()],'Kawasan disimpan',201); break;
-    case 'PUT':
-        $d=getInput(); $id=$_GET['id']??null; if(!$id) sendError('ID wajib');
-        $pdo->prepare("UPDATE kawasan_kumuh SET nama_kawasan=? WHERE id=?")->execute([$d['nama_kawasan'],$id]);
-        sendSuccess(null,'Kawasan diperbarui'); break;
-    case 'DELETE':
-        $id=$_GET['id']??null; if(!$id) sendError('ID wajib');
-        $pdo->prepare("DELETE FROM kawasan_kumuh WHERE id=?")->execute([$id]); sendSuccess(null,'Kawasan dihapus'); break;
-    default: sendError('Method not allowed',405);
-}
diff --git a/project_final/api/laporan.php b/project_final/api/laporan.php
deleted file mode 100644
index 07212a6..0000000
--- a/project_final/api/laporan.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-require_once __DIR__ . '/../config/db.php';
-require_once __DIR__ . '/../config/session.php';
-startAppSession();
-
-header('Content-Type: application/json');
-
-if (!isset($_SESSION['user_id'])) {
-    http_response_code(401);
-    echo json_encode(['status' => 'error', 'message' => 'Unauthorized']);
-    exit;
-}
-
-$pdo = Database::getConnection();
-$method = $_SERVER['REQUEST_METHOD'];
-
-try {
-    if ($method === 'GET') {
-        // Jika parameter my_reports=1, hanya laporan milik user yang login
-        // Jika tidak dan role=admin, ambil semua.
-        $my_reports = $_GET['my_reports'] ?? 0;
-        
-        $sql = "SELECT l.*, ST_X(l.geometry) as lng, ST_Y(l.geometry) as lat, u.nama_lengkap, u.username 
-                FROM laporan_warga l 
-                JOIN users u ON l.user_id = u.id ";
-                
-        if ($my_reports || $_SESSION['role'] !== 'admin') {
-            // User biasa hanya boleh melihat laporannya sendiri di tabel dashboard, 
-            // tapi mungkin butuh lihat semua laporan di peta publik? 
-            // Untuk peta public (semua laporan disetujui atau diproses), tambahkan parameter public=1
-            if (isset($_GET['public']) && $_GET['public'] == 1) {
-                $sql .= " WHERE l.status IN ('diproses', 'selesai') ";
-            } else {
-                $sql .= " WHERE l.user_id = " . (int)$_SESSION['user_id'];
-            }
-        }
-        $sql .= " ORDER BY l.id DESC";
-
-        $rows = $pdo->query($sql)->fetchAll();
-        
-        $features = [];
-        foreach ($rows as $row) {
-            $features[] = [
-                'type' => 'Feature',
-                'properties' => [
-                    'id' => $row['id'],
-                    'user_id' => $row['user_id'],
-                    'pelapor' => $row['nama_lengkap'] ?: $row['username'],
-                    'kategori' => $row['kategori'],
-                    'deskripsi' => $row['deskripsi'],
-                    'status' => $row['status'],
-                    'created_at' => $row['created_at']
-                ],
-                'geometry' => [
-                    'type' => 'Point',
-                    'coordinates' => [(float)$row['lng'], (float)$row['lat']]
-                ]
-            ];
-        }
-        echo json_encode([
-            'type' => 'FeatureCollection',
-            'features' => $features
-        ]);
-    } 
-    elseif ($method === 'POST') {
-        $input = json_decode(file_get_contents('php://input'), true);
-        if (!isset($input['kategori'], $input['deskripsi'], $input['geometry'])) {
-            throw new Exception("Data tidak lengkap.");
-        }
-        $coords = $input['geometry']['coordinates'];
-        $stmt = $pdo->prepare("INSERT INTO laporan_warga (user_id, kategori, deskripsi, geometry) VALUES (?, ?, ?, ST_GeomFromText(?))");
-        $stmt->execute([
-            $_SESSION['user_id'],
-            $input['kategori'],
-            $input['deskripsi'],
-            "POINT({$coords[0]} {$coords[1]})"
-        ]);
-        echo json_encode(['status' => 'success', 'message' => 'Laporan berhasil dibuat.']);
-    }
-    elseif ($method === 'PUT') {
-        if ($_SESSION['role'] !== 'admin') throw new Exception("Unauthorized");
-        $id = $_GET['id'] ?? 0;
-        $input = json_decode(file_get_contents('php://input'), true);
-        $status = $input['status'] ?? 'menunggu';
-        $stmt = $pdo->prepare("UPDATE laporan_warga SET status = ? WHERE id = ?");
-        $stmt->execute([$status, $id]);
-        echo json_encode(['status' => 'success', 'message' => 'Status laporan diperbarui.']);
-    }
-    elseif ($method === 'DELETE') {
-        $id = $_GET['id'] ?? 0;
-        // User bisa hapus kalau status menunggu. Admin bisa hapus semua.
-        if ($_SESSION['role'] === 'admin') {
-            $stmt = $pdo->prepare("DELETE FROM laporan_warga WHERE id = ?");
-            $stmt->execute([$id]);
-        } else {
-            $stmt = $pdo->prepare("DELETE FROM laporan_warga WHERE id = ? AND user_id = ? AND status = 'menunggu'");
-            $stmt->execute([$id, $_SESSION['user_id']]);
-        }
-        echo json_encode(['status' => 'success', 'message' => 'Laporan dihapus.']);
-    }
-} catch (Exception $e) {
-    http_response_code(400);
-    echo json_encode(['status' => 'error', 'message' => $e->getMessage()]);
-}
diff --git a/project_final/api/rumah_ibadah.php b/project_final/api/rumah_ibadah.php
deleted file mode 100644
index 28c73bd..0000000
--- a/project_final/api/rumah_ibadah.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-require_once __DIR__ . '/../config/db.php';
-require_once __DIR__ . '/helpers.php';
-
-$pdo = Database::getConnection();
-$method = $_SERVER['REQUEST_METHOD'];
-requireAdminForMutation();
-
-function normalizeRadius($value): int {
-    $radius = (int)($value ?? 1000);
-    if ($radius < 100) return 100;
-    if ($radius > 10000) return 10000;
-    return $radius;
-}
-
-switch ($method) {
-    case 'GET':
-        $stmt = $pdo->query("
-            SELECT
-                r.id,
-                r.nama,
-                r.agama,
-                r.radius_bantuan_meter,
-                r.created_at,
-                ST_AsGeoJSON(r.geom) AS geojson,
-                IFNULL(AVG(u.rating), 0) AS avg_rating,
-                COUNT(u.id) AS total_ulasan
-            FROM rumah_ibadah r
-            LEFT JOIN ulasan_fasilitas u
-                ON u.fasilitas_id = r.id
-                AND u.fasilitas_tipe = 'rumah_ibadah'
-            GROUP BY r.id
-            ORDER BY r.id DESC
-        ");
-
-        $features = [];
-        while ($r = $stmt->fetch()) {
-            $features[] = [
-                'type' => 'Feature',
-                'geometry' => json_decode($r['geojson']),
-                'properties' => [
-                    'id' => (int)$r['id'],
-                    'nama' => $r['nama'],
-                    'agama' => $r['agama'],
-                    'radius_bantuan_meter' => (int)$r['radius_bantuan_meter'],
-                    'radius_bantuan_km' => round(((int)$r['radius_bantuan_meter']) / 1000, 2),
-                    'created_at' => $r['created_at'],
-                    'avg_rating' => round((float)$r['avg_rating'], 1),
-                    'total_ulasan' => (int)$r['total_ulasan']
-                ]
-            ];
-        }
-
-        sendSuccess(['type' => 'FeatureCollection', 'features' => $features], 'Data Rumah Ibadah');
-        break;
-
-    case 'POST':
-        $d = getInput();
-        if (empty($d['nama']) || empty($d['agama']) || empty($d['geometry'])) {
-            sendError('Data tidak lengkap');
-        }
-
-        $radius = normalizeRadius($d['radius_bantuan_meter'] ?? null);
-        $pdo->prepare("
-            INSERT INTO rumah_ibadah (nama, agama, radius_bantuan_meter, geom)
-            VALUES (?, ?, ?, ST_GeomFromGeoJSON(?))
-        ")->execute([$d['nama'], $d['agama'], $radius, json_encode($d['geometry'])]);
-
-        sendSuccess(['id' => $pdo->lastInsertId()], 'Rumah Ibadah disimpan', 201);
-        break;
-
-    case 'PUT':
-        $d = getInput();
-        $id = $_GET['id'] ?? null;
-        if (!$id) sendError('ID wajib');
-
-        if (!empty($d['geometry'])) {
-            $pdo->prepare("UPDATE rumah_ibadah SET geom = ST_GeomFromGeoJSON(?) WHERE id = ?")
-                ->execute([json_encode($d['geometry']), $id]);
-        } else {
-            $radius = normalizeRadius($d['radius_bantuan_meter'] ?? null);
-            $pdo->prepare("
-                UPDATE rumah_ibadah
-                SET nama = ?, agama = ?, radius_bantuan_meter = ?
-                WHERE id = ?
-            ")->execute([$d['nama'], $d['agama'], $radius, $id]);
-        }
-
-        sendSuccess(null, 'Rumah Ibadah diperbarui');
-        break;
-
-    case 'DELETE':
-        $id = $_GET['id'] ?? null;
-        if (!$id) sendError('ID wajib');
-
-        $pdo->prepare("DELETE FROM rumah_ibadah WHERE id = ?")->execute([$id]);
-        sendSuccess(null, 'Rumah Ibadah dihapus');
-        break;
-
-    default:
-        sendError('Method not allowed', 405);
-}
diff --git a/project_final/api/spbu.php b/project_final/api/spbu.php
deleted file mode 100644
index bd703e3..0000000
--- a/project_final/api/spbu.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php require_once __DIR__ . '/../config/db.php'; require_once __DIR__ . '/helpers.php';
-$pdo = Database::getConnection();
-$method = $_SERVER['REQUEST_METHOD'];
-requireAdminForMutation();
-switch ($method) {
-    case 'GET':
-        $stmt = $pdo->query("SELECT s.id, s.nama, s.deskripsi, s.buka_24_jam, s.created_at, ST_AsGeoJSON(s.geom) as geojson,
-                                    IFNULL(AVG(u.rating), 0) as avg_rating, COUNT(u.id) as total_ulasan
-                             FROM spbu s
-                             LEFT JOIN ulasan_fasilitas u ON u.fasilitas_id = s.id AND u.fasilitas_tipe = 'spbu'
-                             GROUP BY s.id
-                             ORDER BY s.id DESC");
-        $features = [];
-        while ($r = $stmt->fetch()) { 
-            $features[] = [
-                'type'=>'Feature',
-                'geometry'=>json_decode($r['geojson']),
-                'properties'=>[
-                    'id'=>$r['id'],
-                    'nama'=>$r['nama'],
-                    'deskripsi'=>$r['deskripsi'],
-                    'buka_24_jam'=>(int)$r['buka_24_jam'],
-                    'created_at'=>$r['created_at'],
-                    'avg_rating'=>round($r['avg_rating'], 1),
-                    'total_ulasan'=>$r['total_ulasan']
-                ]
-            ]; 
-        }
-        sendSuccess(['type'=>'FeatureCollection','features'=>$features], 'Data SPBU');
-        break;
-    case 'POST':
-        $d = getInput();
-        if (empty($d['nama']) || empty($d['geometry'])) sendError('Nama dan geometri wajib diisi');
-        $stmt = $pdo->prepare("INSERT INTO spbu (nama, deskripsi, buka_24_jam, geom) VALUES (?,?,?,ST_GeomFromGeoJSON(?))");
-        $stmt->execute([$d['nama'], $d['deskripsi']??'', (int)($d['buka_24_jam']??0), json_encode($d['geometry'])]);
-        sendSuccess(['id'=>$pdo->lastInsertId()], 'SPBU disimpan', 201);
-        break;
-    case 'PUT':
-        $d = getInput(); $id = $_GET['id'] ?? null;
-        if (!$id) sendError('ID wajib disertakan');
-        if (!empty($d['geometry'])) {
-            $stmt = $pdo->prepare("UPDATE spbu SET geom=ST_GeomFromGeoJSON(?) WHERE id=?");
-            $stmt->execute([json_encode($d['geometry']), $id]);
-        } else {
-            $stmt = $pdo->prepare("UPDATE spbu SET nama=?, deskripsi=?, buka_24_jam=? WHERE id=?");
-            $stmt->execute([$d['nama'], $d['deskripsi']??'', (int)($d['buka_24_jam']??0), $id]);
-        }
-        sendSuccess(null, 'SPBU diperbarui');
-        break;
-    case 'DELETE':
-        $id = $_GET['id'] ?? null;
-        if (!$id) sendError('ID wajib disertakan');
-        $pdo->prepare("DELETE FROM spbu WHERE id=?")->execute([$id]);
-        sendSuccess(null, 'SPBU dihapus');
-        break;
-    default: sendError('Method not allowed', 405);
-}
diff --git a/project_final/api/spbu_status.php b/project_final/api/spbu_status.php
deleted file mode 100644
index 1df037d..0000000
--- a/project_final/api/spbu_status.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-require_once __DIR__ . '/../config/db.php';
-require_once __DIR__ . '/helpers.php';
-
-if ($_SERVER['REQUEST_METHOD'] !== 'GET') {
-    sendError('Method not allowed', 405);
-}
-
-$pdo = Database::getConnection();
-date_default_timezone_set('Asia/Jakarta');
-
-$row = $pdo->query("
-    SELECT
-        COUNT(*) AS total_spbu,
-        SUM(CASE WHEN buka_24_jam = 1 THEN 1 ELSE 0 END) AS spbu_buka
-    FROM spbu
-")->fetch();
-
-$total = (int)($row['total_spbu'] ?? 0);
-$open = (int)($row['spbu_buka'] ?? 0);
-
-sendSuccess([
-    'total_spbu' => $total,
-    'spbu_buka' => $open,
-    'spbu_tutup' => max(0, $total - $open),
-    'basis_perhitungan' => 'buka_24_jam',
-    'server_time' => date('Y-m-d H:i:s'),
-    'timezone' => date_default_timezone_get()
-], 'Status SPBU');
diff --git a/project_final/api/spbu_terdekat.php b/project_final/api/spbu_terdekat.php
deleted file mode 100644
index 1390820..0000000
--- a/project_final/api/spbu_terdekat.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php require_once __DIR__ . '/../config/db.php'; require_once __DIR__ . '/helpers.php';
-$pdo = Database::getConnection();
-if ($_SERVER['REQUEST_METHOD'] !== 'GET') sendError('Method not allowed', 405);
-$lat = (float)($_GET['lat'] ?? 0); $lng = (float)($_GET['lng'] ?? 0);
-if (!$lat || !$lng) sendError('lat dan lng wajib diisi');
-$wkt = sprintf('POINT(%F %F)', $lng, $lat);
-$stmt = $pdo->prepare("SELECT id, nama, buka_24_jam, ST_AsGeoJSON(geom) as geojson,
-    ST_Distance_Sphere(ST_SRID(geom, 4326), ST_SRID(ST_GeomFromText(?), 4326)) / 1000 as jarak_km
-    FROM spbu ORDER BY jarak_km ASC LIMIT 1");
-$stmt->execute([$wkt]);
-$r = $stmt->fetch();
-if (!$r) sendError('Tidak ada SPBU di database', 404);
-sendSuccess(['type'=>'Feature','geometry'=>json_decode($r['geojson']),'properties'=>['id'=>$r['id'],'nama'=>$r['nama'],'buka_24_jam'=>(int)$r['buka_24_jam'],'jarak_km'=>round($r['jarak_km'],2)]], 'SPBU terdekat');
diff --git a/project_final/api/statistik.php b/project_final/api/statistik.php
deleted file mode 100644
index 90132fb..0000000
--- a/project_final/api/statistik.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php require_once __DIR__ . '/../config/db.php'; require_once __DIR__ . '/helpers.php';
-$pdo = Database::getConnection();
-if ($_SERVER['REQUEST_METHOD'] !== 'GET') sendError('Method not allowed', 405);
-
-// Summary counts
-$counts = $pdo->query("SELECT
-    (SELECT COUNT(*) FROM spbu) as total_spbu,
-    (SELECT COUNT(*) FROM jalan) as total_jalan,
-    (SELECT COUNT(*) FROM kavling) as total_kavling,
-    (SELECT COUNT(*) FROM rumah_ibadah) as total_rumah_ibadah,
-    (SELECT COUNT(*) FROM warga_miskin) as total_warga_miskin,
-    (SELECT COUNT(*) FROM kawasan_kumuh) as total_kawasan_kumuh,
-    (SELECT COUNT(*) FROM spbu WHERE buka_24_jam=1) as spbu_24jam
-")->fetch();
-
-// Choropleth: kawasan kumuh + jumlah warga di dalamnya
-$sql = "SELECT k.id, k.nama_kawasan, ST_AsGeoJSON(k.geom) as geojson,
-               COUNT(w.id) as jumlah_warga,
-               COALESCE(SUM(w.jumlah_tanggungan),0) as total_tanggungan
-        FROM kawasan_kumuh k
-        LEFT JOIN warga_miskin w ON ST_Contains(k.geom, w.geom)
-        GROUP BY k.id";
-$stmt = $pdo->query($sql);
-$features = [];
-$merahCount = 0;
-while ($r = $stmt->fetch()) {
-    $jumlah = (int)$r['jumlah_warga'];
-    if ($jumlah > 3) $merahCount++;
-    $features[] = [
-        'type' => 'Feature',
-        'geometry' => json_decode($r['geojson']),
-        'properties' => [
-            'id' => $r['id'],
-            'nama_kawasan' => $r['nama_kawasan'],
-            'jumlah_warga' => $jumlah,
-            'total_tanggungan' => (int)$r['total_tanggungan'],
-        ]
-    ];
-}
-
-// Rumah ibadah by agama
-$byAgama = $pdo->query("SELECT agama, COUNT(*) as total FROM rumah_ibadah GROUP BY agama")->fetchAll();
-
-// Kavling by status
-$byStatus = $pdo->query("SELECT status_kepemilikan, COUNT(*) as total FROM kavling GROUP BY status_kepemilikan")->fetchAll();
-
-sendSuccess([
-    'counts' => $counts,
-    'kawasan_merah' => $merahCount,
-    'choropleth' => ['type' => 'FeatureCollection', 'features' => $features],
-    'rumah_by_agama' => $byAgama,
-    'kavling_by_status' => $byStatus,
-], 'Statistik OK');
diff --git a/project_final/api/ulasan.php b/project_final/api/ulasan.php
deleted file mode 100644
index b7528cb..0000000
--- a/project_final/api/ulasan.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-require_once __DIR__ . '/../config/db.php';
-require_once __DIR__ . '/../config/session.php';
-startAppSession();
-
-header('Content-Type: application/json');
-
-if (!isset($_SESSION['user_id']) || $_SESSION['role'] !== 'user') {
-    http_response_code(401);
-    echo json_encode(['status' => 'error', 'message' => 'Hanya pengguna terdaftar yang dapat memberikan ulasan']);
-    exit;
-}
-
-$pdo = Database::getConnection();
-$method = $_SERVER['REQUEST_METHOD'];
-
-try {
-    if ($method === 'POST') {
-        $input = json_decode(file_get_contents('php://input'), true);
-        if (!isset($input['fasilitas_tipe'], $input['fasilitas_id'], $input['rating'])) {
-            throw new Exception("Data ulasan tidak lengkap.");
-        }
-        
-        $tipe = $input['fasilitas_tipe'];
-        if (!in_array($tipe, ['spbu', 'rumah_ibadah'])) throw new Exception("Tipe fasilitas tidak valid");
-        
-        $fasilitas_id = (int)$input['fasilitas_id'];
-        $rating = (int)$input['rating'];
-        $komentar = trim($input['komentar'] ?? '');
-        
-        if ($rating < 1 || $rating > 5) throw new Exception("Rating harus antara 1 sampai 5");
-
-        // Cek apakah sudah pernah mengulas
-        $check = $pdo->prepare("SELECT id FROM ulasan_fasilitas WHERE user_id = ? AND fasilitas_tipe = ? AND fasilitas_id = ?");
-        $check->execute([$_SESSION['user_id'], $tipe, $fasilitas_id]);
-        if ($check->fetch()) {
-            throw new Exception("Anda sudah memberikan ulasan untuk fasilitas ini.");
-        }
-
-        $stmt = $pdo->prepare("INSERT INTO ulasan_fasilitas (user_id, fasilitas_tipe, fasilitas_id, rating, komentar) VALUES (?, ?, ?, ?, ?)");
-        $stmt->execute([$_SESSION['user_id'], $tipe, $fasilitas_id, $rating, $komentar]);
-        
-        echo json_encode(['status' => 'success', 'message' => 'Ulasan berhasil disimpan! Terima kasih atas partisipasi Anda.']);
-    } else {
-        throw new Exception("Method not allowed");
-    }
-} catch (Exception $e) {
-    http_response_code(400);
-    echo json_encode(['status' => 'error', 'message' => $e->getMessage()]);
-}
diff --git a/project_final/api/users.php b/project_final/api/users.php
deleted file mode 100644
index 1c27305..0000000
--- a/project_final/api/users.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php require_once __DIR__ . '/../config/db.php'; require_once __DIR__ . '/helpers.php';
-$pdo = Database::getConnection(); $method = $_SERVER['REQUEST_METHOD'];
-requireApiRole('admin');
-switch ($method) {
-    case 'GET':
-        $stmt = $pdo->query("SELECT id,username,role,nama_lengkap,created_at FROM users ORDER BY id ASC");
-        sendSuccess($stmt->fetchAll(), 'Data Users'); break;
-    case 'POST':
-        $d=getInput();
-        if(empty($d['username'])||empty($d['password'])||empty($d['role'])) sendError('Data tidak lengkap');
-        $hash = password_hash($d['password'], PASSWORD_BCRYPT);
-        try {
-            $pdo->prepare("INSERT INTO users(username,password,role,nama_lengkap) VALUES(?,?,?,?)")->execute([$d['username'],$hash,$d['role'],$d['nama_lengkap']??'']);
-            sendSuccess(['id'=>$pdo->lastInsertId()],'User disimpan',201);
-        } catch(Exception $e) { sendError('Username sudah digunakan'); }
-        break;
-    case 'PUT':
-        $d=getInput(); $id=$_GET['id']??null; if(!$id) sendError('ID wajib');
-        if(!empty($d['password'])) {
-            $hash=password_hash($d['password'],PASSWORD_BCRYPT);
-            $pdo->prepare("UPDATE users SET username=?,password=?,role=?,nama_lengkap=? WHERE id=?")->execute([$d['username'],$hash,$d['role'],$d['nama_lengkap']??'',$id]);
-        } else {
-            $pdo->prepare("UPDATE users SET username=?,role=?,nama_lengkap=? WHERE id=?")->execute([$d['username'],$d['role'],$d['nama_lengkap']??'',$id]);
-        }
-        sendSuccess(null,'User diperbarui'); break;
-    case 'DELETE':
-        $id=$_GET['id']??null; if(!$id) sendError('ID wajib');
-        if($id==1) sendError('Admin utama tidak dapat dihapus');
-        $pdo->prepare("DELETE FROM users WHERE id=?")->execute([$id]); sendSuccess(null,'User dihapus'); break;
-    default: sendError('Method not allowed',405);
-}
diff --git a/project_final/api/warga_miskin.php b/project_final/api/warga_miskin.php
deleted file mode 100644
index 0d0b647..0000000
--- a/project_final/api/warga_miskin.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php require_once __DIR__ . '/../config/db.php'; require_once __DIR__ . '/helpers.php';
-$pdo = Database::getConnection(); $method = $_SERVER['REQUEST_METHOD'];
-requireAdminForMutation();
-switch ($method) {
-    case 'GET':
-        $stmt = $pdo->query("SELECT id,nama_kk,penghasilan,jumlah_tanggungan,created_at,ST_AsGeoJSON(geom) as geojson FROM warga_miskin ORDER BY id DESC");
-        $features=[];
-        while($r=$stmt->fetch()) $features[]=['type'=>'Feature','geometry'=>json_decode($r['geojson']),'properties'=>['id'=>$r['id'],'nama_kk'=>$r['nama_kk'],'penghasilan'=>$r['penghasilan'],'jumlah_tanggungan'=>$r['jumlah_tanggungan'],'created_at'=>$r['created_at']]];
-        sendSuccess(['type'=>'FeatureCollection','features'=>$features],'Data Warga Miskin'); break;
-    case 'POST':
-        $d=getInput(); if(empty($d['nama_kk'])||empty($d['geometry'])) sendError('Data tidak lengkap');
-        $pdo->prepare("INSERT INTO warga_miskin(nama_kk,penghasilan,jumlah_tanggungan,geom) VALUES(?,?,?,ST_GeomFromGeoJSON(?))")->execute([$d['nama_kk'],$d['penghasilan']??0,$d['jumlah_tanggungan']??0,json_encode($d['geometry'])]);
-        sendSuccess(['id'=>$pdo->lastInsertId()],'Warga disimpan',201); break;
-    case 'PUT':
-        $d=getInput(); $id=$_GET['id']??null; if(!$id) sendError('ID wajib');
-        if(!empty($d['geometry'])){
-            $pdo->prepare("UPDATE warga_miskin SET geom=ST_GeomFromGeoJSON(?) WHERE id=?")->execute([json_encode($d['geometry']),$id]);
-        } else {
-            $pdo->prepare("UPDATE warga_miskin SET nama_kk=?,penghasilan=?,jumlah_tanggungan=? WHERE id=?")->execute([$d['nama_kk'],$d['penghasilan']??0,$d['jumlah_tanggungan']??0,$id]);
-        }
-        sendSuccess(null,'Warga diperbarui'); break;
-    case 'DELETE':
-        $id=$_GET['id']??null; if(!$id) sendError('ID wajib');
-        $pdo->prepare("DELETE FROM warga_miskin WHERE id=?")->execute([$id]); sendSuccess(null,'Warga dihapus'); break;
-    default: sendError('Method not allowed',405);
-}
diff --git a/project_final/index.php b/project_final/index.php
deleted file mode 100644
index 20ff4bc..0000000
--- a/project_final/index.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-require_once __DIR__ . '/config/session.php';
-startAppSession();
-if (isset($_SESSION['user_id'])) {
-    if ($_SESSION['role'] === 'admin') {
-        header('Location: admin/index.php');
-    } else {
-        header('Location: user/index.php');
-    }
-    exit;
-}
-header('Location: login.php');
-exit;
diff --git a/import_db.php b/setup_database.php
similarity index 100%
rename from import_db.php
rename to setup_database.php
diff --git a/final/backend/api/jalan.php b/versi/backend/api/jalan.php
similarity index 97%
rename from final/backend/api/jalan.php
rename to versi/backend/api/jalan.php
index 7264a11..886efd9 100644
--- a/final/backend/api/jalan.php
+++ b/versi/backend/api/jalan.php
@@ -1,10 +1,10 @@
-<?php
+<?php
 /**
  * jalan.php
  * Tanggung Jawab: Menangani operasi CRUD untuk entitas Jalan (LineString).
  */
 
-require_once '../config/db.php';
+require_once '../core_config/database.php';
 require_once '../utils/response_helper.php';
 
 $pdo = Database::getConnection();
diff --git a/final/backend/api/kavling.php b/versi/backend/api/kavling.php
similarity index 97%
rename from final/backend/api/kavling.php
rename to versi/backend/api/kavling.php
index ed862a5..4d51ee2 100644
--- a/final/backend/api/kavling.php
+++ b/versi/backend/api/kavling.php
@@ -1,10 +1,10 @@
-<?php
+<?php
 /**
  * kavling.php
  * Tanggung Jawab: Menangani operasi CRUD untuk entitas Kavling (Polygon).
  */
 
-require_once '../config/db.php';
+require_once '../core_config/database.php';
 require_once '../utils/response_helper.php';
 
 $pdo = Database::getConnection();
diff --git a/final/backend/api/rumah_ibadah.php b/versi/backend/api/rumah_ibadah.php
similarity index 98%
rename from final/backend/api/rumah_ibadah.php
rename to versi/backend/api/rumah_ibadah.php
index 1de6d5d..b1172c4 100644
--- a/final/backend/api/rumah_ibadah.php
+++ b/versi/backend/api/rumah_ibadah.php
@@ -1,10 +1,10 @@
-<?php
+<?php
 /**
  * rumah_ibadah.php
  * Tanggung Jawab: Operasi CRUD Rumah Ibadah + Endpoint analisis jangkauan Haversine.
  */
 
-require_once '../config/db.php';
+require_once '../core_config/database.php';
 require_once '../utils/response_helper.php';
 require_once '../utils/geo_helper.php';
 
diff --git a/final/backend/api/spbu.php b/versi/backend/api/spbu.php
similarity index 97%
rename from final/backend/api/spbu.php
rename to versi/backend/api/spbu.php
index 7529ba1..6acaf74 100644
--- a/final/backend/api/spbu.php
+++ b/versi/backend/api/spbu.php
@@ -1,5 +1,5 @@
-<?php
-require_once '../config/db.php';
+<?php
+require_once '../core_config/database.php';
 require_once '../utils/response_helper.php';
 
 $pdo = Database::getConnection();
diff --git a/final/backend/api/statistik.php b/versi/backend/api/statistik.php
similarity index 97%
rename from final/backend/api/statistik.php
rename to versi/backend/api/statistik.php
index b5712c6..0208fa0 100644
--- a/final/backend/api/statistik.php
+++ b/versi/backend/api/statistik.php
@@ -1,11 +1,11 @@
-<?php
+<?php
 /**
  * statistik.php
  * Tanggung Jawab: Menyediakan data analisis spasial menggunakan Point in Polygon (ST_Contains).
  * Menghitung kepadatan warga miskin dalam setiap kavling.
  */
 
-require_once '../config/db.php';
+require_once '../core_config/database.php';
 require_once '../utils/response_helper.php';
 
 $pdo = Database::getConnection();
diff --git a/final/backend/api/warga_miskin.php b/versi/backend/api/warga_miskin.php
similarity index 97%
rename from final/backend/api/warga_miskin.php
rename to versi/backend/api/warga_miskin.php
index dca0aff..2c48a44 100644
--- a/final/backend/api/warga_miskin.php
+++ b/versi/backend/api/warga_miskin.php
@@ -1,10 +1,10 @@
-<?php
+<?php
 /**
  * warga_miskin.php
  * Tanggung Jawab: Operasi CRUD untuk Warga Miskin.
  */
 
-require_once '../config/db.php';
+require_once '../core_config/database.php';
 require_once '../utils/response_helper.php';
 
 $pdo = Database::getConnection();
diff --git a/final/backend/config/db.php b/versi/backend/config/db.php
similarity index 100%
rename from final/backend/config/db.php
rename to versi/backend/config/db.php
diff --git a/final/backend/utils/response_helper.php b/versi/backend/utils/response_helper.php
similarity index 100%
rename from final/backend/utils/response_helper.php
rename to versi/backend/utils/response_helper.php
diff --git a/final/frontend/base.css b/versi/frontend/base.css
similarity index 100%
rename from final/frontend/base.css
rename to versi/frontend/base.css
diff --git a/final/frontend/css/main.css b/versi/frontend/css/main.css
similarity index 100%
rename from final/frontend/css/main.css
rename to versi/frontend/css/main.css
diff --git a/final/frontend/form.css b/versi/frontend/form.css
similarity index 100%
rename from final/frontend/form.css
rename to versi/frontend/form.css
diff --git a/final/frontend/index.html b/versi/frontend/index.html
similarity index 100%
rename from final/frontend/index.html
rename to versi/frontend/index.html
diff --git a/final/frontend/js/app.js b/versi/frontend/js/app.js
similarity index 100%
rename from final/frontend/js/app.js
rename to versi/frontend/js/app.js
diff --git a/final/frontend/js/modules/draw.js b/versi/frontend/js/modules/draw.js
similarity index 100%
rename from final/frontend/js/modules/draw.js
rename to versi/frontend/js/modules/draw.js
diff --git a/final/frontend/js/modules/form.js b/versi/frontend/js/modules/form.js
similarity index 100%
rename from final/frontend/js/modules/form.js
rename to versi/frontend/js/modules/form.js
diff --git a/final/frontend/js/modules/map.js b/versi/frontend/js/modules/map.js
similarity index 100%
rename from final/frontend/js/modules/map.js
rename to versi/frontend/js/modules/map.js
diff --git a/final/frontend/js/services/api.service.js b/versi/frontend/js/services/api.service.js
similarity index 80%
rename from final/frontend/js/services/api.service.js
rename to versi/frontend/js/services/api.service.js
index 36e7e5f..8339ec3 100644
--- a/final/frontend/js/services/api.service.js
+++ b/versi/frontend/js/services/api.service.js
@@ -1,4 +1,12 @@
-export const BASE_URL = '';
+const getBaseUrl = () => {
+    const segments = window.location.pathname.split('/');
+    const targetIndex = segments.findIndex(seg => ['01', '02', '03', 'versi'].includes(seg));
+    if (targetIndex !== -1) {
+        return segments.slice(0, targetIndex).join('/');
+    }
+    return '';
+};
+export const BASE_URL = getBaseUrl();
 
 const createService = (endpoint) => ({
     getAll: async () => {
diff --git a/final/frontend/js/services/rumah_ibadah.service.js b/versi/frontend/js/services/rumah_ibadah.service.js
similarity index 100%
rename from final/frontend/js/services/rumah_ibadah.service.js
rename to versi/frontend/js/services/rumah_ibadah.service.js
diff --git a/final/frontend/js/services/statistik.service.js b/versi/frontend/js/services/statistik.service.js
similarity index 100%
rename from final/frontend/js/services/statistik.service.js
rename to versi/frontend/js/services/statistik.service.js
diff --git a/final/frontend/js/services/warga_miskin.service.js b/versi/frontend/js/services/warga_miskin.service.js
similarity index 100%
rename from final/frontend/js/services/warga_miskin.service.js
rename to versi/frontend/js/services/warga_miskin.service.js
diff --git a/final/frontend/map.css b/versi/frontend/map.css
similarity index 100%
rename from final/frontend/map.css
rename to versi/frontend/map.css
diff --git a/final/frontend/sidebar.css b/versi/frontend/sidebar.css
similarity index 100%
rename from final/frontend/sidebar.css
rename to versi/frontend/sidebar.css
diff --git a/webgis_app/.htaccess b/webgis_app/.htaccess
new file mode 100644
index 0000000..26fefea
--- /dev/null
+++ b/webgis_app/.htaccess
@@ -0,0 +1,13 @@
+RewriteEngine On
+
+# Specific file mappings from old API names to new refactored endpoint names
+RewriteRule ^api/kawasan_kumuh\.php$ endpoints/api_kawasan.php [L,QSA]
+RewriteRule ^api/rumah_ibadah\.php$ endpoints/api_fasilitas.php [L,QSA]
+RewriteRule ^api/users\.php$ endpoints/api_pengguna.php [L,QSA]
+RewriteRule ^api/spbu_terdekat\.php$ endpoints/api_spbu_nearby.php [L,QSA]
+RewriteRule ^api/blank_spot\.php$ endpoints/area_blank.php [L,QSA]
+RewriteRule ^api/check_srid\.php$ endpoints/cek_srid.php [L,QSA]
+RewriteRule ^api/fix_srid\.php$ endpoints/perbaiki_srid.php [L,QSA]
+
+# General pattern mapping: api/filename.php -> endpoints/api_filename.php
+RewriteRule ^api/([a-zA-Z0-9_]+)\.php$ endpoints/api_$1.php [L,QSA]
diff --git a/webgis_app/api/blank_spot.php b/webgis_app/api/blank_spot.php
new file mode 100644
index 0000000..6b9c84b
--- /dev/null
+++ b/webgis_app/api/blank_spot.php
@@ -0,0 +1,2 @@
+<?php
+require_once __DIR__ . '/../endpoints/area_blank.php';
diff --git a/webgis_app/api/check_srid.php b/webgis_app/api/check_srid.php
new file mode 100644
index 0000000..e5e3ccc
--- /dev/null
+++ b/webgis_app/api/check_srid.php
@@ -0,0 +1,2 @@
+<?php
+require_once __DIR__ . '/../endpoints/cek_srid.php';
diff --git a/webgis_app/api/fix_srid.php b/webgis_app/api/fix_srid.php
new file mode 100644
index 0000000..110c994
--- /dev/null
+++ b/webgis_app/api/fix_srid.php
@@ -0,0 +1,2 @@
+<?php
+require_once __DIR__ . '/../endpoints/perbaiki_srid.php';
diff --git a/webgis_app/api/jalan.php b/webgis_app/api/jalan.php
new file mode 100644
index 0000000..2a6b991
--- /dev/null
+++ b/webgis_app/api/jalan.php
@@ -0,0 +1,2 @@
+<?php
+require_once __DIR__ . '/../endpoints/api_jalan.php';
diff --git a/webgis_app/api/kavling.php b/webgis_app/api/kavling.php
new file mode 100644
index 0000000..0be8593
--- /dev/null
+++ b/webgis_app/api/kavling.php
@@ -0,0 +1,2 @@
+<?php
+require_once __DIR__ . '/../endpoints/api_kavling.php';
diff --git a/webgis_app/api/kawasan_kumuh.php b/webgis_app/api/kawasan_kumuh.php
new file mode 100644
index 0000000..69898f8
--- /dev/null
+++ b/webgis_app/api/kawasan_kumuh.php
@@ -0,0 +1,2 @@
+<?php
+require_once __DIR__ . '/../endpoints/api_kawasan.php';
diff --git a/webgis_app/api/laporan.php b/webgis_app/api/laporan.php
new file mode 100644
index 0000000..58d3771
--- /dev/null
+++ b/webgis_app/api/laporan.php
@@ -0,0 +1,2 @@
+<?php
+require_once __DIR__ . '/../endpoints/api_laporan.php';
diff --git a/webgis_app/api/rumah_ibadah.php b/webgis_app/api/rumah_ibadah.php
new file mode 100644
index 0000000..447d4cd
--- /dev/null
+++ b/webgis_app/api/rumah_ibadah.php
@@ -0,0 +1,2 @@
+<?php
+require_once __DIR__ . '/../endpoints/api_fasilitas.php';
diff --git a/webgis_app/api/spbu.php b/webgis_app/api/spbu.php
new file mode 100644
index 0000000..ac3c8ec
--- /dev/null
+++ b/webgis_app/api/spbu.php
@@ -0,0 +1,2 @@
+<?php
+require_once __DIR__ . '/../endpoints/api_spbu.php';
diff --git a/webgis_app/api/spbu_status.php b/webgis_app/api/spbu_status.php
new file mode 100644
index 0000000..5e3eaa0
--- /dev/null
+++ b/webgis_app/api/spbu_status.php
@@ -0,0 +1,2 @@
+<?php
+require_once __DIR__ . '/../endpoints/api_spbu_status.php';
diff --git a/webgis_app/api/spbu_terdekat.php b/webgis_app/api/spbu_terdekat.php
new file mode 100644
index 0000000..7ea5b34
--- /dev/null
+++ b/webgis_app/api/spbu_terdekat.php
@@ -0,0 +1,2 @@
+<?php
+require_once __DIR__ . '/../endpoints/api_spbu_nearby.php';
diff --git a/webgis_app/api/statistik.php b/webgis_app/api/statistik.php
new file mode 100644
index 0000000..b8ed10e
--- /dev/null
+++ b/webgis_app/api/statistik.php
@@ -0,0 +1,2 @@
+<?php
+require_once __DIR__ . '/../endpoints/api_statistik.php';
diff --git a/webgis_app/api/ulasan.php b/webgis_app/api/ulasan.php
new file mode 100644
index 0000000..b897c46
--- /dev/null
+++ b/webgis_app/api/ulasan.php
@@ -0,0 +1,2 @@
+<?php
+require_once __DIR__ . '/../endpoints/api_ulasan.php';
diff --git a/webgis_app/api/users.php b/webgis_app/api/users.php
new file mode 100644
index 0000000..7a19008
--- /dev/null
+++ b/webgis_app/api/users.php
@@ -0,0 +1,2 @@
+<?php
+require_once __DIR__ . '/../endpoints/api_pengguna.php';
diff --git a/webgis_app/api/warga_miskin.php b/webgis_app/api/warga_miskin.php
new file mode 100644
index 0000000..7b9ba09
--- /dev/null
+++ b/webgis_app/api/warga_miskin.php
@@ -0,0 +1,2 @@
+<?php
+require_once __DIR__ . '/../endpoints/api_warga_miskin.php';
diff --git a/project_final/config/db.php b/webgis_app/core_config/database.php
similarity index 94%
rename from project_final/config/db.php
rename to webgis_app/core_config/database.php
index e90bd12..94b2143 100644
--- a/project_final/config/db.php
+++ b/webgis_app/core_config/database.php
@@ -1,10 +1,11 @@
-<?php
+<?php
 /**
  * Singleton PDO connection.
  *
  * Coolify: set DB_HOST, DB_PORT, DB_DATABASE, DB_USERNAME, and DB_PASSWORD
  * from the database service credentials.
  */
+require_once __DIR__ . '/env_loader.php';
 class Database {
     private static $conn = null;
 
@@ -45,7 +46,7 @@ class Database {
             // Auto-initialize database if empty
             $stmt = self::$conn->query("SHOW TABLES LIKE 'users'");
             if ($stmt->rowCount() == 0) {
-                $sqlFile = __DIR__ . '/../../database/webgis_db.sql';
+                $sqlFile = __DIR__ . '/../../db_scripts/webgis_naufal_zaky.sql';
                 if (file_exists($sqlFile)) {
                     $sql = file_get_contents($sqlFile);
                     self::$conn->exec($sql);
diff --git a/webgis_app/core_config/env_loader.php b/webgis_app/core_config/env_loader.php
new file mode 100644
index 0000000..b7bdd1e
--- /dev/null
+++ b/webgis_app/core_config/env_loader.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Simple .env loader.
+ * Reads the .env file from the repository root and sets environment variables
+ * via putenv() so getenv() calls throughout the app work correctly.
+ * Only loads once per request.
+ */
+function loadEnv(): void {
+    static $loaded = false;
+    if ($loaded) return;
+
+    // Walk up from webgis_app/config to the repository root
+    $envFile = dirname(__DIR__, 2) . DIRECTORY_SEPARATOR . '.env';
+
+    if (!file_exists($envFile)) {
+        $loaded = true;
+        return;
+    }
+
+    $lines = file($envFile, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
+    if (!empty($lines)) {
+        if (substr($lines[0], 0, 3) === "\xEF\xBB\xBF") {
+            $lines[0] = substr($lines[0], 3);
+        }
+    }
+    foreach ($lines as $line) {
+        $line = trim($line);
+        // Skip comments
+        if ($line === '' || $line[0] === '#') continue;
+
+        if (strpos($line, '=') === false) continue;
+
+        [$key, $value] = explode('=', $line, 2);
+        $key   = trim($key);
+        $value = trim($value);
+
+        // Remove surrounding quotes if present
+        if (strlen($value) >= 2 &&
+            (($value[0] === '"' && $value[-1] === '"') ||
+             ($value[0] === "'" && $value[-1] === "'"))) {
+            $value = substr($value, 1, -1);
+        }
+
+        // Only set if not already defined in the environment (server env wins)
+        if (getenv($key) === false) {
+            putenv("{$key}={$value}");
+            $_ENV[$key]    = $value;
+            $_SERVER[$key] = $value;
+        }
+    }
+
+    $loaded = true;
+}
+
+// Auto-load on include
+loadEnv();
diff --git a/project_final/config/auth_check.php b/webgis_app/core_config/middleware_auth.php
similarity index 56%
rename from project_final/config/auth_check.php
rename to webgis_app/core_config/middleware_auth.php
index 1e7b6cb..a012fed 100644
--- a/project_final/config/auth_check.php
+++ b/webgis_app/core_config/middleware_auth.php
@@ -1,10 +1,10 @@
 <?php
 /**
  * auth_check.php — Middleware: pastikan user sudah login dan role sesuai.
- * Usage: require_once __DIR__ . '/../config/auth_check.php';
+ * Usage: require_once __DIR__ . '/../core_config/middleware_auth.php';
  *        requireRole('admin'); // atau 'user'
  */
-require_once __DIR__ . '/session.php';
+require_once __DIR__ . '/session_mgr.php';
 
 if (session_status() === PHP_SESSION_NONE) {
     startAppSession();
@@ -27,9 +27,9 @@ function requireRole(string $role, ?string $redirect = null): void {
     if ($_SESSION['role'] !== $role) {
         // Redirect ke dashboard yang sesuai role-nya
         if ($_SESSION['role'] === 'admin') {
-            header('Location: ' . app_url('admin/index.php'));
+            header('Location: ' . app_url('panel_admin/index.php'));
         } else {
-            header('Location: ' . app_url('user/index.php'));
+            header('Location: ' . app_url('panel_user/index.php'));
         }
         exit;
     }
@@ -43,3 +43,24 @@ function currentUser(): array {
         'nama_lengkap'=> $_SESSION['nama_lengkap']?? '',
     ];
 }
+
+/**
+ * API-safe auth helpers: return JSON 401/403 instead of redirecting.
+ * Use these in endpoints called via fetch/AJAX.
+ */
+function requireApiLogin(): void {
+    if (!isLoggedIn()) {
+        http_response_code(401);
+        echo json_encode(['status' => 'error', 'message' => 'Autentikasi diperlukan']);
+        exit;
+    }
+}
+
+function requireApiRole(string $role): void {
+    requireApiLogin();
+    if ($_SESSION['role'] !== $role) {
+        http_response_code(403);
+        echo json_encode(['status' => 'error', 'message' => 'Akses ditolak: role tidak sesuai']);
+        exit;
+    }
+}
diff --git a/project_final/config/session.php b/webgis_app/core_config/session_mgr.php
similarity index 93%
rename from project_final/config/session.php
rename to webgis_app/core_config/session_mgr.php
index 14a6858..7280851 100644
--- a/project_final/config/session.php
+++ b/webgis_app/core_config/session_mgr.php
@@ -1,5 +1,5 @@
 <?php
-require_once __DIR__ . '/app.php';
+require_once __DIR__ . '/settings.php';
 
 function startAppSession(): void {
     if (session_status() === PHP_SESSION_ACTIVE) {
diff --git a/project_final/config/app.php b/webgis_app/core_config/settings.php
similarity index 60%
rename from project_final/config/app.php
rename to webgis_app/core_config/settings.php
index d17c0af..d2a4468 100644
--- a/project_final/config/app.php
+++ b/webgis_app/core_config/settings.php
@@ -2,13 +2,14 @@
 /**
  * Application path helpers.
  *
- * Set APP_BASE_PATH to the subdirectory that serves project_final.
- * In this repository's Coolify image the final app runs at /project_final.
+ * Set APP_BASE_PATH to the subdirectory that serves webgis_app.
+ * In this repository's Coolify image the final app runs at /webgis_app.
  */
+require_once __DIR__ . '/env_loader.php';
 function app_base_path(): string {
     $basePath = getenv('APP_BASE_PATH');
     if ($basePath === false) {
-        $basePath = '/project/project_final';
+        $basePath = '/project/webgis_app';
     }
 
     $basePath = trim($basePath);
@@ -20,6 +21,9 @@ function app_base_path(): string {
 }
 
 function app_url(string $path = ''): string {
+    if ($path === '') {
+        return app_base_path();
+    }
     $path = '/' . ltrim($path, '/');
     return app_base_path() . $path;
 }
diff --git a/webgis_app/endpoints/api_fasilitas.php b/webgis_app/endpoints/api_fasilitas.php
new file mode 100644
index 0000000..dc49388
--- /dev/null
+++ b/webgis_app/endpoints/api_fasilitas.php
@@ -0,0 +1,113 @@
+<?php
+/**
+ * api_fasilitas.php
+ * Endpoint: CRUD untuk layer Rumah Ibadah (Point).
+ */
+
+require_once __DIR__ . '/../core_config/database.php';
+require_once __DIR__ . '/../core_config/middleware_auth.php';
+
+header('Content-Type: application/json; charset=utf-8');
+
+function sendSuccess($data = null, $message = 'Success', $code = 200) {
+    http_response_code($code);
+    echo json_encode(['status' => 'success', 'message' => $message, 'data' => $data]);
+    exit();
+}
+function sendError($message = 'Error', $code = 400) {
+    http_response_code($code);
+    echo json_encode(['status' => 'error', 'message' => $message]);
+    exit();
+}
+
+$pdo    = Database::getConnection();
+$method = $_SERVER['REQUEST_METHOD'];
+
+switch ($method) {
+    case 'GET':
+        try {
+            $stmt = $pdo->query(
+                "SELECT id, nama, agama, radius_bantuan_meter, created_at,
+                        ST_AsGeoJSON(geom) AS geojson FROM rumah_ibadah"
+            );
+            $features = [];
+            while ($row = $stmt->fetch()) {
+                $features[] = [
+                    'type'       => 'Feature',
+                    'geometry'   => json_decode($row['geojson']),
+                    'properties' => [
+                        'id'                   => $row['id'],
+                        'nama'                 => $row['nama'],
+                        'agama'                => $row['agama'],
+                        'radius_bantuan_meter' => $row['radius_bantuan_meter'],
+                        'created_at'           => $row['created_at'],
+                    ],
+                ];
+            }
+            sendSuccess(['type' => 'FeatureCollection', 'features' => $features], 'Data Rumah Ibadah berhasil diambil');
+        } catch (PDOException $e) {
+            sendError('Gagal mengambil data Rumah Ibadah: ' . $e->getMessage(), 500);
+        }
+        break;
+
+    case 'POST':
+        requireApiRole('admin');
+        $input = json_decode(file_get_contents('php://input'), true);
+        if (!isset($input['nama']) || !isset($input['agama']) || !isset($input['geometry'])) {
+            sendError('Nama, agama, dan geometri wajib diisi');
+        }
+        try {
+            $stmt = $pdo->prepare(
+                "INSERT INTO rumah_ibadah (nama, agama, radius_bantuan_meter, geom)
+                 VALUES (:nama, :agama, :radius_bantuan_meter, ST_GeomFromGeoJSON(:geometry))"
+            );
+            $stmt->execute([
+                ':nama'                 => $input['nama'],
+                ':agama'                => $input['agama'],
+                ':radius_bantuan_meter' => $input['radius_bantuan_meter'] ?? 1000,
+                ':geometry'             => json_encode($input['geometry']),
+            ]);
+            sendSuccess(['id' => $pdo->lastInsertId()], 'Data Rumah Ibadah berhasil disimpan', 201);
+        } catch (PDOException $e) {
+            sendError('Gagal menyimpan Rumah Ibadah: ' . $e->getMessage(), 500);
+        }
+        break;
+
+    case 'PUT':
+        requireApiRole('admin');
+        $id = $_GET['id'] ?? null;
+        if (!$id) sendError('ID Rumah Ibadah wajib disertakan');
+        $input = json_decode(file_get_contents('php://input'), true);
+        if (!$input) sendError('Data tidak valid');
+        try {
+            $stmt = $pdo->prepare(
+                "UPDATE rumah_ibadah SET nama = :nama, agama = :agama, radius_bantuan_meter = :radius_bantuan_meter WHERE id = :id"
+            );
+            $stmt->execute([
+                ':nama'                 => $input['nama'],
+                ':agama'                => $input['agama'],
+                ':radius_bantuan_meter' => $input['radius_bantuan_meter'] ?? 1000,
+                ':id'                   => $id,
+            ]);
+            sendSuccess(null, 'Data Rumah Ibadah berhasil diperbarui');
+        } catch (PDOException $e) {
+            sendError('Gagal memperbarui Rumah Ibadah: ' . $e->getMessage(), 500);
+        }
+        break;
+
+    case 'DELETE':
+        requireApiRole('admin');
+        $id = $_GET['id'] ?? null;
+        if (!$id) sendError('ID Rumah Ibadah wajib disertakan');
+        try {
+            $stmt = $pdo->prepare("DELETE FROM rumah_ibadah WHERE id = :id");
+            $stmt->execute([':id' => $id]);
+            sendSuccess(null, 'Data Rumah Ibadah berhasil dihapus');
+        } catch (PDOException $e) {
+            sendError('Gagal menghapus Rumah Ibadah: ' . $e->getMessage(), 500);
+        }
+        break;
+
+    default:
+        sendError('Method not allowed', 405);
+}
diff --git a/webgis_app/endpoints/api_jalan.php b/webgis_app/endpoints/api_jalan.php
new file mode 100644
index 0000000..288f860
--- /dev/null
+++ b/webgis_app/endpoints/api_jalan.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * api_jalan.php
+ * Endpoint: CRUD untuk layer Jalan (LineString).
+ */
+
+require_once __DIR__ . '/../core_config/database.php';
+require_once __DIR__ . '/../core_config/middleware_auth.php';
+
+header('Content-Type: application/json; charset=utf-8');
+
+function sendSuccess($data = null, $message = 'Success', $code = 200) {
+    http_response_code($code);
+    echo json_encode(['status' => 'success', 'message' => $message, 'data' => $data]);
+    exit();
+}
+function sendError($message = 'Error', $code = 400) {
+    http_response_code($code);
+    echo json_encode(['status' => 'error', 'message' => $message]);
+    exit();
+}
+
+$pdo    = Database::getConnection();
+$method = $_SERVER['REQUEST_METHOD'];
+
+switch ($method) {
+    case 'GET':
+        try {
+            $stmt = $pdo->query(
+                "SELECT id, nama, jenis_jalan, created_at, ST_AsGeoJSON(geom) AS geojson FROM jalan"
+            );
+            $features = [];
+            while ($row = $stmt->fetch()) {
+                $features[] = [
+                    'type'       => 'Feature',
+                    'geometry'   => json_decode($row['geojson']),
+                    'properties' => [
+                        'id'          => $row['id'],
+                        'nama'        => $row['nama'],
+                        'jenis_jalan' => $row['jenis_jalan'],
+                        'created_at'  => $row['created_at'],
+                    ],
+                ];
+            }
+            sendSuccess(['type' => 'FeatureCollection', 'features' => $features], 'Data Jalan berhasil diambil');
+        } catch (PDOException $e) {
+            sendError('Gagal mengambil data Jalan: ' . $e->getMessage(), 500);
+        }
+        break;
+
+    case 'POST':
+        requireApiRole('admin');
+        $input = json_decode(file_get_contents('php://input'), true);
+        if (!isset($input['nama']) || !isset($input['geometry'])) {
+            sendError('Nama dan geometri wajib diisi');
+        }
+        try {
+            $stmt = $pdo->prepare(
+                "INSERT INTO jalan (nama, jenis_jalan, geom)
+                 VALUES (:nama, :jenis_jalan, ST_GeomFromGeoJSON(:geometry))"
+            );
+            $stmt->execute([
+                ':nama'        => $input['nama'],
+                ':jenis_jalan' => $input['jenis_jalan'] ?? 'Lokal',
+                ':geometry'    => json_encode($input['geometry']),
+            ]);
+            sendSuccess(['id' => $pdo->lastInsertId()], 'Data Jalan berhasil disimpan', 201);
+        } catch (PDOException $e) {
+            sendError('Gagal menyimpan Jalan: ' . $e->getMessage(), 500);
+        }
+        break;
+
+    case 'DELETE':
+        requireApiRole('admin');
+        $id = $_GET['id'] ?? null;
+        if (!$id) sendError('ID Jalan wajib disertakan');
+        try {
+            $stmt = $pdo->prepare("DELETE FROM jalan WHERE id = :id");
+            $stmt->execute([':id' => $id]);
+            sendSuccess(null, 'Data Jalan berhasil dihapus');
+        } catch (PDOException $e) {
+            sendError('Gagal menghapus Jalan: ' . $e->getMessage(), 500);
+        }
+        break;
+
+    default:
+        sendError('Method not allowed', 405);
+}
diff --git a/webgis_app/endpoints/api_kavling.php b/webgis_app/endpoints/api_kavling.php
new file mode 100644
index 0000000..cbdb76c
--- /dev/null
+++ b/webgis_app/endpoints/api_kavling.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * api_kavling.php
+ * Endpoint: CRUD untuk layer Kavling (Polygon).
+ */
+
+require_once __DIR__ . '/../core_config/database.php';
+require_once __DIR__ . '/../core_config/middleware_auth.php';
+
+header('Content-Type: application/json; charset=utf-8');
+
+function sendSuccess($data = null, $message = 'Success', $code = 200) {
+    http_response_code($code);
+    echo json_encode(['status' => 'success', 'message' => $message, 'data' => $data]);
+    exit();
+}
+function sendError($message = 'Error', $code = 400) {
+    http_response_code($code);
+    echo json_encode(['status' => 'error', 'message' => $message]);
+    exit();
+}
+
+$pdo    = Database::getConnection();
+$method = $_SERVER['REQUEST_METHOD'];
+
+switch ($method) {
+    case 'GET':
+        try {
+            $stmt = $pdo->query(
+                "SELECT id, nama_pemilik, status_kepemilikan, luas, created_at,
+                        ST_AsGeoJSON(geom) AS geojson FROM kavling"
+            );
+            $features = [];
+            while ($row = $stmt->fetch()) {
+                $features[] = [
+                    'type'       => 'Feature',
+                    'geometry'   => json_decode($row['geojson']),
+                    'properties' => [
+                        'id'                   => $row['id'],
+                        'nama_pemilik'          => $row['nama_pemilik'],
+                        'status_kepemilikan'    => $row['status_kepemilikan'],
+                        'luas'                 => $row['luas'],
+                        'created_at'           => $row['created_at'],
+                    ],
+                ];
+            }
+            sendSuccess(['type' => 'FeatureCollection', 'features' => $features], 'Data Kavling berhasil diambil');
+        } catch (PDOException $e) {
+            sendError('Gagal mengambil data Kavling: ' . $e->getMessage(), 500);
+        }
+        break;
+
+    case 'POST':
+        requireApiRole('admin');
+        $input = json_decode(file_get_contents('php://input'), true);
+        if (!isset($input['nama_pemilik']) || !isset($input['geometry'])) {
+            sendError('Nama pemilik dan geometri wajib diisi');
+        }
+        try {
+            $stmt = $pdo->prepare(
+                "INSERT INTO kavling (nama_pemilik, status_kepemilikan, luas, geom)
+                 VALUES (:nama_pemilik, :status_kepemilikan, :luas, ST_GeomFromGeoJSON(:geometry))"
+            );
+            $stmt->execute([
+                ':nama_pemilik'       => $input['nama_pemilik'],
+                ':status_kepemilikan' => $input['status_kepemilikan'] ?? 'SHM',
+                ':luas'               => $input['luas'] ?? 0,
+                ':geometry'           => json_encode($input['geometry']),
+            ]);
+            sendSuccess(['id' => $pdo->lastInsertId()], 'Data Kavling berhasil disimpan', 201);
+        } catch (PDOException $e) {
+            sendError('Gagal menyimpan Kavling: ' . $e->getMessage(), 500);
+        }
+        break;
+
+    case 'DELETE':
+        requireApiRole('admin');
+        $id = $_GET['id'] ?? null;
+        if (!$id) sendError('ID Kavling wajib disertakan');
+        try {
+            $stmt = $pdo->prepare("DELETE FROM kavling WHERE id = :id");
+            $stmt->execute([':id' => $id]);
+            sendSuccess(null, 'Data Kavling berhasil dihapus');
+        } catch (PDOException $e) {
+            sendError('Gagal menghapus Kavling: ' . $e->getMessage(), 500);
+        }
+        break;
+
+    default:
+        sendError('Method not allowed', 405);
+}
diff --git a/webgis_app/endpoints/api_kawasan.php b/webgis_app/endpoints/api_kawasan.php
new file mode 100644
index 0000000..bc867ab
--- /dev/null
+++ b/webgis_app/endpoints/api_kawasan.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * api_kawasan.php
+ * Endpoint: CRUD untuk layer Kawasan Kumuh (Polygon).
+ */
+
+require_once __DIR__ . '/../core_config/database.php';
+require_once __DIR__ . '/../core_config/middleware_auth.php';
+
+header('Content-Type: application/json; charset=utf-8');
+
+function sendSuccess($data = null, $message = 'Success', $code = 200) {
+    http_response_code($code);
+    echo json_encode(['status' => 'success', 'message' => $message, 'data' => $data]);
+    exit();
+}
+function sendError($message = 'Error', $code = 400) {
+    http_response_code($code);
+    echo json_encode(['status' => 'error', 'message' => $message]);
+    exit();
+}
+
+$pdo    = Database::getConnection();
+$method = $_SERVER['REQUEST_METHOD'];
+
+switch ($method) {
+    case 'GET':
+        try {
+            $stmt = $pdo->query(
+                "SELECT id, nama_kawasan, created_at, ST_AsGeoJSON(geom) AS geojson FROM kawasan_kumuh"
+            );
+            $features = [];
+            while ($row = $stmt->fetch()) {
+                $features[] = [
+                    'type'       => 'Feature',
+                    'geometry'   => json_decode($row['geojson']),
+                    'properties' => [
+                        'id'           => $row['id'],
+                        'nama_kawasan' => $row['nama_kawasan'],
+                        'created_at'   => $row['created_at'],
+                    ],
+                ];
+            }
+            sendSuccess(['type' => 'FeatureCollection', 'features' => $features], 'Data Kawasan Kumuh berhasil diambil');
+        } catch (PDOException $e) {
+            sendError('Gagal mengambil data Kawasan Kumuh: ' . $e->getMessage(), 500);
+        }
+        break;
+
+    case 'POST':
+        requireApiRole('admin');
+        $input = json_decode(file_get_contents('php://input'), true);
+        if (!isset($input['nama_kawasan']) || !isset($input['geometry'])) {
+            sendError('Nama kawasan dan geometri wajib diisi');
+        }
+        try {
+            $stmt = $pdo->prepare(
+                "INSERT INTO kawasan_kumuh (nama_kawasan, geom)
+                 VALUES (:nama_kawasan, ST_GeomFromGeoJSON(:geometry))"
+            );
+            $stmt->execute([
+                ':nama_kawasan' => $input['nama_kawasan'],
+                ':geometry'     => json_encode($input['geometry']),
+            ]);
+            sendSuccess(['id' => $pdo->lastInsertId()], 'Data Kawasan Kumuh berhasil disimpan', 201);
+        } catch (PDOException $e) {
+            sendError('Gagal menyimpan Kawasan Kumuh: ' . $e->getMessage(), 500);
+        }
+        break;
+
+    case 'DELETE':
+        requireApiRole('admin');
+        $id = $_GET['id'] ?? null;
+        if (!$id) sendError('ID Kawasan Kumuh wajib disertakan');
+        try {
+            $stmt = $pdo->prepare("DELETE FROM kawasan_kumuh WHERE id = :id");
+            $stmt->execute([':id' => $id]);
+            sendSuccess(null, 'Data Kawasan Kumuh berhasil dihapus');
+        } catch (PDOException $e) {
+            sendError('Gagal menghapus Kawasan Kumuh: ' . $e->getMessage(), 500);
+        }
+        break;
+
+    default:
+        sendError('Method not allowed', 405);
+}
diff --git a/webgis_app/endpoints/api_laporan.php b/webgis_app/endpoints/api_laporan.php
new file mode 100644
index 0000000..f9a1108
--- /dev/null
+++ b/webgis_app/endpoints/api_laporan.php
@@ -0,0 +1,117 @@
+<?php
+/**
+ * api_laporan.php
+ * Endpoint: CRUD untuk Laporan Warga.
+ */
+
+require_once __DIR__ . '/../core_config/database.php';
+require_once __DIR__ . '/../core_config/middleware_auth.php';
+require_once __DIR__ . '/../core_config/session_mgr.php';
+
+header('Content-Type: application/json; charset=utf-8');
+
+function sendSuccess($data = null, $message = 'Success', $code = 200) {
+    http_response_code($code);
+    echo json_encode(['status' => 'success', 'message' => $message, 'data' => $data]);
+    exit();
+}
+function sendError($message = 'Error', $code = 400) {
+    http_response_code($code);
+    echo json_encode(['status' => 'error', 'message' => $message]);
+    exit();
+}
+
+startAppSession();
+$pdo    = Database::getConnection();
+$method = $_SERVER['REQUEST_METHOD'];
+
+switch ($method) {
+    case 'GET':
+        requireApiLogin();
+        try {
+            $userId = $_SESSION['user_id'] ?? null;
+            $role   = $_SESSION['role']    ?? 'user';
+
+            if ($role === 'admin') {
+                $stmt = $pdo->query(
+                    "SELECT lw.id, lw.user_id, u.username, lw.kategori, lw.deskripsi,
+                            lw.status, lw.created_at, ST_AsGeoJSON(lw.geometry) AS geojson
+                     FROM laporan_warga lw
+                     JOIN users u ON u.id = lw.user_id
+                     ORDER BY lw.created_at DESC"
+                );
+            } else {
+                $stmt = $pdo->prepare(
+                    "SELECT id, user_id, kategori, deskripsi, status, created_at,
+                            ST_AsGeoJSON(geometry) AS geojson
+                     FROM laporan_warga WHERE user_id = :uid ORDER BY created_at DESC"
+                );
+                $stmt->execute([':uid' => $userId]);
+            }
+
+            $rows = $stmt->fetchAll();
+            foreach ($rows as &$r) {
+                $r['geojson'] = json_decode($r['geojson']);
+            }
+            sendSuccess($rows, 'Data Laporan berhasil diambil');
+        } catch (PDOException $e) {
+            sendError('Gagal mengambil laporan: ' . $e->getMessage(), 500);
+        }
+        break;
+
+    case 'POST':
+        requireApiLogin();
+        $input = json_decode(file_get_contents('php://input'), true);
+        if (!isset($input['kategori']) || !isset($input['deskripsi']) || !isset($input['geometry'])) {
+            sendError('Kategori, deskripsi, dan geometri wajib diisi');
+        }
+        $userId = $_SESSION['user_id'];
+        try {
+            $stmt = $pdo->prepare(
+                "INSERT INTO laporan_warga (user_id, kategori, deskripsi, geometry)
+                 VALUES (:user_id, :kategori, :deskripsi, ST_GeomFromGeoJSON(:geometry))"
+            );
+            $stmt->execute([
+                ':user_id'  => $userId,
+                ':kategori' => $input['kategori'],
+                ':deskripsi'=> $input['deskripsi'],
+                ':geometry' => json_encode($input['geometry']),
+            ]);
+            sendSuccess(['id' => $pdo->lastInsertId()], 'Laporan berhasil dikirim', 201);
+        } catch (PDOException $e) {
+            sendError('Gagal menyimpan laporan: ' . $e->getMessage(), 500);
+        }
+        break;
+
+    case 'PUT':
+        requireApiRole('admin');
+        $input = json_decode(file_get_contents('php://input'), true);
+        $id    = $_GET['id'] ?? null;
+        if (!$id || !isset($input['status'])) sendError('ID dan status wajib disertakan');
+        $allowed = ['menunggu', 'diproses', 'selesai', 'ditolak'];
+        if (!in_array($input['status'], $allowed)) sendError('Status tidak valid');
+        try {
+            $stmt = $pdo->prepare("UPDATE laporan_warga SET status = :status WHERE id = :id");
+            $stmt->execute([':status' => $input['status'], ':id' => $id]);
+            sendSuccess(null, 'Status laporan berhasil diperbarui');
+        } catch (PDOException $e) {
+            sendError('Gagal memperbarui laporan: ' . $e->getMessage(), 500);
+        }
+        break;
+
+    case 'DELETE':
+        requireApiRole('admin');
+        $id = $_GET['id'] ?? null;
+        if (!$id) sendError('ID laporan wajib disertakan');
+        try {
+            $stmt = $pdo->prepare("DELETE FROM laporan_warga WHERE id = :id");
+            $stmt->execute([':id' => $id]);
+            sendSuccess(null, 'Laporan berhasil dihapus');
+        } catch (PDOException $e) {
+            sendError('Gagal menghapus laporan: ' . $e->getMessage(), 500);
+        }
+        break;
+
+    default:
+        sendError('Method not allowed', 405);
+}
diff --git a/webgis_app/endpoints/api_pengguna.php b/webgis_app/endpoints/api_pengguna.php
new file mode 100644
index 0000000..b25d731
--- /dev/null
+++ b/webgis_app/endpoints/api_pengguna.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * api_pengguna.php
+ * Endpoint: Manajemen data Pengguna (hanya Admin).
+ */
+
+require_once __DIR__ . '/../core_config/database.php';
+require_once __DIR__ . '/../core_config/middleware_auth.php';
+
+header('Content-Type: application/json; charset=utf-8');
+
+function sendSuccess($data = null, $message = 'Success', $code = 200) {
+    http_response_code($code);
+    echo json_encode(['status' => 'success', 'message' => $message, 'data' => $data]);
+    exit();
+}
+function sendError($message = 'Error', $code = 400) {
+    http_response_code($code);
+    echo json_encode(['status' => 'error', 'message' => $message]);
+    exit();
+}
+
+requireApiRole('admin');
+
+$pdo    = Database::getConnection();
+$method = $_SERVER['REQUEST_METHOD'];
+
+switch ($method) {
+    case 'GET':
+        try {
+            $stmt = $pdo->query(
+                "SELECT id, username, role, nama_lengkap, created_at FROM users ORDER BY created_at DESC"
+            );
+            sendSuccess($stmt->fetchAll(), 'Data Pengguna berhasil diambil');
+        } catch (PDOException $e) {
+            sendError('Gagal mengambil data pengguna: ' . $e->getMessage(), 500);
+        }
+        break;
+
+    case 'POST':
+        $input = json_decode(file_get_contents('php://input'), true);
+        if (!isset($input['username'], $input['password'])) {
+            sendError('Username dan password wajib diisi');
+        }
+        try {
+            $hash = password_hash($input['password'], PASSWORD_BCRYPT);
+            $stmt = $pdo->prepare(
+                "INSERT INTO users (username, password, role, nama_lengkap)
+                 VALUES (:username, :password, :role, :nama_lengkap)"
+            );
+            $stmt->execute([
+                ':username'    => $input['username'],
+                ':password'    => $hash,
+                ':role'        => $input['role'] ?? 'user',
+                ':nama_lengkap'=> $input['nama_lengkap'] ?? null,
+            ]);
+            sendSuccess(['id' => $pdo->lastInsertId()], 'Pengguna berhasil dibuat', 201);
+        } catch (PDOException $e) {
+            sendError('Gagal membuat pengguna: ' . $e->getMessage(), 500);
+        }
+        break;
+
+    case 'DELETE':
+        $id = $_GET['id'] ?? null;
+        if (!$id) sendError('ID pengguna wajib disertakan');
+        try {
+            $stmt = $pdo->prepare("DELETE FROM users WHERE id = :id");
+            $stmt->execute([':id' => $id]);
+            sendSuccess(null, 'Pengguna berhasil dihapus');
+        } catch (PDOException $e) {
+            sendError('Gagal menghapus pengguna: ' . $e->getMessage(), 500);
+        }
+        break;
+
+    default:
+        sendError('Method not allowed', 405);
+}
diff --git a/webgis_app/endpoints/api_spbu.php b/webgis_app/endpoints/api_spbu.php
new file mode 100644
index 0000000..fdc1bd5
--- /dev/null
+++ b/webgis_app/endpoints/api_spbu.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * api_spbu.php
+ * Endpoint: CRUD untuk layer SPBU (Point).
+ */
+
+require_once __DIR__ . '/../core_config/database.php';
+require_once __DIR__ . '/../core_config/middleware_auth.php';
+
+header('Content-Type: application/json; charset=utf-8');
+
+function sendSuccess($data = null, $message = 'Success', $code = 200) {
+    http_response_code($code);
+    echo json_encode(['status' => 'success', 'message' => $message, 'data' => $data]);
+    exit();
+}
+function sendError($message = 'Error', $code = 400) {
+    http_response_code($code);
+    echo json_encode(['status' => 'error', 'message' => $message]);
+    exit();
+}
+
+$pdo    = Database::getConnection();
+$method = $_SERVER['REQUEST_METHOD'];
+
+switch ($method) {
+    case 'GET':
+        try {
+            $stmt = $pdo->query(
+                "SELECT id, nama, deskripsi, buka_24_jam, created_at,
+                        ST_AsGeoJSON(geom) AS geojson FROM spbu"
+            );
+            $features = [];
+            while ($row = $stmt->fetch()) {
+                $features[] = [
+                    'type'       => 'Feature',
+                    'geometry'   => json_decode($row['geojson']),
+                    'properties' => [
+                        'id'          => $row['id'],
+                        'nama'        => $row['nama'],
+                        'deskripsi'   => $row['deskripsi'],
+                        'buka_24_jam' => (bool) $row['buka_24_jam'],
+                        'created_at'  => $row['created_at'],
+                    ],
+                ];
+            }
+            sendSuccess(['type' => 'FeatureCollection', 'features' => $features], 'Data SPBU berhasil diambil');
+        } catch (PDOException $e) {
+            sendError('Gagal mengambil data SPBU: ' . $e->getMessage(), 500);
+        }
+        break;
+
+    case 'POST':
+        requireApiRole('admin');
+        $input = json_decode(file_get_contents('php://input'), true);
+        if (!isset($input['nama']) || !isset($input['geometry'])) {
+            sendError('Nama dan geometri wajib diisi');
+        }
+        try {
+            $stmt = $pdo->prepare(
+                "INSERT INTO spbu (nama, deskripsi, buka_24_jam, geom)
+                 VALUES (:nama, :deskripsi, :buka_24_jam, ST_GeomFromGeoJSON(:geometry))"
+            );
+            $stmt->execute([
+                ':nama'        => $input['nama'],
+                ':deskripsi'   => $input['deskripsi'] ?? '',
+                ':buka_24_jam' => isset($input['buka_24_jam']) && $input['buka_24_jam'] ? 1 : 0,
+                ':geometry'    => json_encode($input['geometry']),
+            ]);
+            sendSuccess(['id' => $pdo->lastInsertId()], 'Data SPBU berhasil disimpan', 201);
+        } catch (PDOException $e) {
+            sendError('Gagal menyimpan SPBU: ' . $e->getMessage(), 500);
+        }
+        break;
+
+    case 'DELETE':
+        requireApiRole('admin');
+        $id = $_GET['id'] ?? null;
+        if (!$id) sendError('ID SPBU wajib disertakan');
+        try {
+            $stmt = $pdo->prepare("DELETE FROM spbu WHERE id = :id");
+            $stmt->execute([':id' => $id]);
+            sendSuccess(null, 'Data SPBU berhasil dihapus');
+        } catch (PDOException $e) {
+            sendError('Gagal menghapus SPBU: ' . $e->getMessage(), 500);
+        }
+        break;
+
+    default:
+        sendError('Method not allowed', 405);
+}
diff --git a/webgis_app/endpoints/api_spbu_nearby.php b/webgis_app/endpoints/api_spbu_nearby.php
new file mode 100644
index 0000000..e6d705f
--- /dev/null
+++ b/webgis_app/endpoints/api_spbu_nearby.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * api_spbu_nearby.php
+ * Endpoint: Mencari SPBU terdekat dari titik koordinat pengguna.
+ * Query params: lat, lng, radius (meter, default 5000)
+ */
+
+require_once __DIR__ . '/../core_config/database.php';
+
+header('Content-Type: application/json; charset=utf-8');
+
+function sendSuccess($data = null, $message = 'Success', $code = 200) {
+    http_response_code($code);
+    echo json_encode(['status' => 'success', 'message' => $message, 'data' => $data]);
+    exit();
+}
+function sendError($message = 'Error', $code = 400) {
+    http_response_code($code);
+    echo json_encode(['status' => 'error', 'message' => $message]);
+    exit();
+}
+
+$pdo    = Database::getConnection();
+$method = $_SERVER['REQUEST_METHOD'];
+
+if ($method !== 'GET') { sendError('Method not allowed', 405); }
+
+$lat    = isset($_GET['lat'])    ? (float) $_GET['lat']    : null;
+$lng    = isset($_GET['lng'])    ? (float) $_GET['lng']    : null;
+$radius = isset($_GET['radius']) ? (int)   $_GET['radius'] : 5000;
+
+if ($lat === null || $lng === null) { sendError('Parameter lat dan lng wajib disertakan'); }
+
+try {
+    $stmt = $pdo->prepare(
+        "SELECT id, nama, deskripsi, buka_24_jam, created_at,
+                ST_AsGeoJSON(geom) AS geojson,
+                ST_Distance_Sphere(geom, ST_GeomFromText(:point)) AS jarak_meter
+         FROM spbu
+         WHERE ST_Distance_Sphere(geom, ST_GeomFromText(:point)) <= :radius
+         ORDER BY jarak_meter ASC"
+    );
+    $stmt->execute([':point' => "POINT({$lng} {$lat})", ':radius' => $radius]);
+    $features = [];
+    while ($row = $stmt->fetch()) {
+        $features[] = [
+            'type'       => 'Feature',
+            'geometry'   => json_decode($row['geojson']),
+            'properties' => [
+                'id'          => $row['id'],
+                'nama'        => $row['nama'],
+                'deskripsi'   => $row['deskripsi'],
+                'buka_24_jam' => (bool) $row['buka_24_jam'],
+                'jarak_meter' => round($row['jarak_meter'], 2),
+                'created_at'  => $row['created_at'],
+            ],
+        ];
+    }
+    sendSuccess(['type' => 'FeatureCollection', 'features' => $features], 'SPBU Terdekat berhasil diambil');
+} catch (PDOException $e) {
+    sendError('Gagal mengambil SPBU Terdekat: ' . $e->getMessage(), 500);
+}
diff --git a/webgis_app/endpoints/api_spbu_status.php b/webgis_app/endpoints/api_spbu_status.php
new file mode 100644
index 0000000..877dd78
--- /dev/null
+++ b/webgis_app/endpoints/api_spbu_status.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * api_spbu_status.php
+ * Endpoint: Mengambil ringkasan status SPBU (berapa 24 jam, berapa tidak).
+ */
+
+require_once __DIR__ . '/../core_config/database.php';
+
+header('Content-Type: application/json; charset=utf-8');
+
+function sendSuccess($data = null, $message = 'Success', $code = 200) {
+    http_response_code($code);
+    echo json_encode(['status' => 'success', 'message' => $message, 'data' => $data]);
+    exit();
+}
+function sendError($message = 'Error', $code = 400) {
+    http_response_code($code);
+    echo json_encode(['status' => 'error', 'message' => $message]);
+    exit();
+}
+
+$pdo    = Database::getConnection();
+$method = $_SERVER['REQUEST_METHOD'];
+
+if ($method !== 'GET') {
+    sendError('Method not allowed', 405);
+}
+
+try {
+    $stmt = $pdo->query(
+        "SELECT
+            COUNT(*) AS total,
+            SUM(buka_24_jam = 1) AS buka_24_jam,
+            SUM(buka_24_jam = 0) AS tidak_24_jam
+         FROM spbu"
+    );
+    $summary = $stmt->fetch();
+    sendSuccess($summary, 'Status SPBU berhasil diambil');
+} catch (PDOException $e) {
+    sendError('Gagal mengambil status SPBU: ' . $e->getMessage(), 500);
+}
diff --git a/webgis_app/endpoints/api_statistik.php b/webgis_app/endpoints/api_statistik.php
new file mode 100644
index 0000000..5ac87e8
--- /dev/null
+++ b/webgis_app/endpoints/api_statistik.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * api_statistik.php
+ * Endpoint: Mengembalikan ringkasan statistik keseluruhan data WebGIS.
+ */
+
+require_once __DIR__ . '/../core_config/database.php';
+
+header('Content-Type: application/json; charset=utf-8');
+
+function sendSuccess($data = null, $message = 'Success', $code = 200) {
+    http_response_code($code);
+    echo json_encode(['status' => 'success', 'message' => $message, 'data' => $data]);
+    exit();
+}
+function sendError($message = 'Error', $code = 400) {
+    http_response_code($code);
+    echo json_encode(['status' => 'error', 'message' => $message]);
+    exit();
+}
+
+$pdo    = Database::getConnection();
+$method = $_SERVER['REQUEST_METHOD'];
+
+if ($method !== 'GET') { sendError('Method not allowed', 405); }
+
+try {
+    $counts = [];
+
+    $tables = [
+        'spbu'          => 'total_spbu',
+        'rumah_ibadah'  => 'total_rumah_ibadah',
+        'jalan'         => 'total_jalan',
+        'kavling'       => 'total_kavling',
+        'kawasan_kumuh' => 'total_kawasan_kumuh',
+        'warga_miskin'  => 'total_warga_miskin',
+        'laporan_warga' => 'total_laporan',
+        'users'         => 'total_users',
+    ];
+
+    foreach ($tables as $table => $key) {
+        $row = $pdo->query("SELECT COUNT(*) AS cnt FROM `{$table}`")->fetch();
+        $counts[$key] = (int) $row['cnt'];
+    }
+
+    // Additional SPBU breakdown
+    $spbuStatus = $pdo->query(
+        "SELECT SUM(buka_24_jam=1) AS buka_24_jam, SUM(buka_24_jam=0) AS tidak_24_jam FROM spbu"
+    )->fetch();
+    $counts['spbu_buka_24_jam']   = (int) $spbuStatus['buka_24_jam'];
+    $counts['spbu_tidak_24_jam']  = (int) $spbuStatus['tidak_24_jam'];
+
+    // Laporan by status
+    $laporanStatus = $pdo->query(
+        "SELECT status, COUNT(*) AS cnt FROM laporan_warga GROUP BY status"
+    )->fetchAll();
+    $counts['laporan_by_status'] = [];
+    foreach ($laporanStatus as $row) {
+        $counts['laporan_by_status'][$row['status']] = (int) $row['cnt'];
+    }
+
+    sendSuccess($counts, 'Statistik berhasil diambil');
+} catch (PDOException $e) {
+    sendError('Gagal mengambil statistik: ' . $e->getMessage(), 500);
+}
diff --git a/webgis_app/endpoints/api_ulasan.php b/webgis_app/endpoints/api_ulasan.php
new file mode 100644
index 0000000..7b1262a
--- /dev/null
+++ b/webgis_app/endpoints/api_ulasan.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * api_ulasan.php
+ * Endpoint: CRUD untuk Ulasan Fasilitas (SPBU / Rumah Ibadah).
+ */
+
+require_once __DIR__ . '/../core_config/database.php';
+require_once __DIR__ . '/../core_config/middleware_auth.php';
+require_once __DIR__ . '/../core_config/session_mgr.php';
+
+header('Content-Type: application/json; charset=utf-8');
+
+function sendSuccess($data = null, $message = 'Success', $code = 200) {
+    http_response_code($code);
+    echo json_encode(['status' => 'success', 'message' => $message, 'data' => $data]);
+    exit();
+}
+function sendError($message = 'Error', $code = 400) {
+    http_response_code($code);
+    echo json_encode(['status' => 'error', 'message' => $message]);
+    exit();
+}
+
+startAppSession();
+$pdo    = Database::getConnection();
+$method = $_SERVER['REQUEST_METHOD'];
+
+switch ($method) {
+    case 'GET':
+        $tipe = $_GET['tipe'] ?? null;
+        $fid  = $_GET['fasilitas_id'] ?? null;
+        try {
+            if ($tipe && $fid) {
+                $stmt = $pdo->prepare(
+                    "SELECT uf.id, uf.user_id, u.username, uf.fasilitas_tipe,
+                            uf.fasilitas_id, uf.rating, uf.komentar, uf.created_at
+                     FROM ulasan_fasilitas uf
+                     JOIN users u ON u.id = uf.user_id
+                     WHERE uf.fasilitas_tipe = :tipe AND uf.fasilitas_id = :fid
+                     ORDER BY uf.created_at DESC"
+                );
+                $stmt->execute([':tipe' => $tipe, ':fid' => $fid]);
+            } else {
+                $stmt = $pdo->query(
+                    "SELECT uf.id, uf.user_id, u.username, uf.fasilitas_tipe,
+                            uf.fasilitas_id, uf.rating, uf.komentar, uf.created_at
+                     FROM ulasan_fasilitas uf
+                     JOIN users u ON u.id = uf.user_id
+                     ORDER BY uf.created_at DESC"
+                );
+            }
+            sendSuccess($stmt->fetchAll(), 'Data Ulasan berhasil diambil');
+        } catch (PDOException $e) {
+            sendError('Gagal mengambil ulasan: ' . $e->getMessage(), 500);
+        }
+        break;
+
+    case 'POST':
+        requireApiLogin();
+        $input = json_decode(file_get_contents('php://input'), true);
+        if (!isset($input['fasilitas_tipe'], $input['fasilitas_id'], $input['rating'])) {
+            sendError('fasilitas_tipe, fasilitas_id, dan rating wajib diisi');
+        }
+        $allowed = ['spbu', 'rumah_ibadah'];
+        if (!in_array($input['fasilitas_tipe'], $allowed)) sendError('fasilitas_tipe tidak valid');
+        if ($input['rating'] < 1 || $input['rating'] > 5) sendError('Rating harus antara 1-5');
+        try {
+            $stmt = $pdo->prepare(
+                "INSERT INTO ulasan_fasilitas (user_id, fasilitas_tipe, fasilitas_id, rating, komentar)
+                 VALUES (:user_id, :fasilitas_tipe, :fasilitas_id, :rating, :komentar)"
+            );
+            $stmt->execute([
+                ':user_id'       => $_SESSION['user_id'],
+                ':fasilitas_tipe'=> $input['fasilitas_tipe'],
+                ':fasilitas_id'  => $input['fasilitas_id'],
+                ':rating'        => $input['rating'],
+                ':komentar'      => $input['komentar'] ?? null,
+            ]);
+            sendSuccess(['id' => $pdo->lastInsertId()], 'Ulasan berhasil disimpan', 201);
+        } catch (PDOException $e) {
+            sendError('Gagal menyimpan ulasan: ' . $e->getMessage(), 500);
+        }
+        break;
+
+    case 'DELETE':
+        requireApiRole('admin');
+        $id = $_GET['id'] ?? null;
+        if (!$id) sendError('ID ulasan wajib disertakan');
+        try {
+            $stmt = $pdo->prepare("DELETE FROM ulasan_fasilitas WHERE id = :id");
+            $stmt->execute([':id' => $id]);
+            sendSuccess(null, 'Ulasan berhasil dihapus');
+        } catch (PDOException $e) {
+            sendError('Gagal menghapus ulasan: ' . $e->getMessage(), 500);
+        }
+        break;
+
+    default:
+        sendError('Method not allowed', 405);
+}
diff --git a/webgis_app/endpoints/api_warga_miskin.php b/webgis_app/endpoints/api_warga_miskin.php
new file mode 100644
index 0000000..f7829a7
--- /dev/null
+++ b/webgis_app/endpoints/api_warga_miskin.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * api_warga_miskin.php
+ * Endpoint: CRUD untuk layer Warga Miskin (Point).
+ */
+
+require_once __DIR__ . '/../core_config/database.php';
+require_once __DIR__ . '/../core_config/middleware_auth.php';
+
+header('Content-Type: application/json; charset=utf-8');
+
+function sendSuccess($data = null, $message = 'Success', $code = 200) {
+    http_response_code($code);
+    echo json_encode(['status' => 'success', 'message' => $message, 'data' => $data]);
+    exit();
+}
+function sendError($message = 'Error', $code = 400) {
+    http_response_code($code);
+    echo json_encode(['status' => 'error', 'message' => $message]);
+    exit();
+}
+
+$pdo    = Database::getConnection();
+$method = $_SERVER['REQUEST_METHOD'];
+
+switch ($method) {
+    case 'GET':
+        try {
+            $stmt = $pdo->query(
+                "SELECT id, nama_kk, penghasilan, jumlah_tanggungan, created_at,
+                        ST_AsGeoJSON(geom) AS geojson FROM warga_miskin"
+            );
+            $features = [];
+            while ($row = $stmt->fetch()) {
+                $features[] = [
+                    'type'       => 'Feature',
+                    'geometry'   => json_decode($row['geojson']),
+                    'properties' => [
+                        'id'                 => $row['id'],
+                        'nama_kk'            => $row['nama_kk'],
+                        'penghasilan'        => $row['penghasilan'],
+                        'jumlah_tanggungan'  => $row['jumlah_tanggungan'],
+                        'created_at'         => $row['created_at'],
+                    ],
+                ];
+            }
+            sendSuccess(['type' => 'FeatureCollection', 'features' => $features], 'Data Warga Miskin berhasil diambil');
+        } catch (PDOException $e) {
+            sendError('Gagal mengambil data Warga Miskin: ' . $e->getMessage(), 500);
+        }
+        break;
+
+    case 'POST':
+        requireApiRole('admin');
+        $input = json_decode(file_get_contents('php://input'), true);
+        if (!isset($input['nama_kk']) || !isset($input['geometry'])) {
+            sendError('Nama KK dan geometri wajib diisi');
+        }
+        try {
+            $stmt = $pdo->prepare(
+                "INSERT INTO warga_miskin (nama_kk, penghasilan, jumlah_tanggungan, geom)
+                 VALUES (:nama_kk, :penghasilan, :jumlah_tanggungan, ST_GeomFromGeoJSON(:geometry))"
+            );
+            $stmt->execute([
+                ':nama_kk'           => $input['nama_kk'],
+                ':penghasilan'       => $input['penghasilan'] ?? 0,
+                ':jumlah_tanggungan' => $input['jumlah_tanggungan'] ?? 0,
+                ':geometry'          => json_encode($input['geometry']),
+            ]);
+            sendSuccess(['id' => $pdo->lastInsertId()], 'Data Warga Miskin berhasil disimpan', 201);
+        } catch (PDOException $e) {
+            sendError('Gagal menyimpan Warga Miskin: ' . $e->getMessage(), 500);
+        }
+        break;
+
+    case 'DELETE':
+        requireApiRole('admin');
+        $id = $_GET['id'] ?? null;
+        if (!$id) sendError('ID Warga Miskin wajib disertakan');
+        try {
+            $stmt = $pdo->prepare("DELETE FROM warga_miskin WHERE id = :id");
+            $stmt->execute([':id' => $id]);
+            sendSuccess(null, 'Data Warga Miskin berhasil dihapus');
+        } catch (PDOException $e) {
+            sendError('Gagal menghapus Warga Miskin: ' . $e->getMessage(), 500);
+        }
+        break;
+
+    default:
+        sendError('Method not allowed', 405);
+}
diff --git a/webgis_app/endpoints/area_blank.php b/webgis_app/endpoints/area_blank.php
new file mode 100644
index 0000000..7b61a4e
--- /dev/null
+++ b/webgis_app/endpoints/area_blank.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * area_blank.php
+ * Endpoint: Blank Spot — area tanpa sinyal seluler.
+ * Menggunakan tabel kawasan_kumuh sebagai proxy (tidak ada tabel blank_spot tersendiri).
+ * Mengembalikan FeatureCollection kosong jika tabel belum ada.
+ */
+
+require_once __DIR__ . '/../core_config/database.php';
+require_once __DIR__ . '/../core_config/middleware_auth.php';
+
+header('Content-Type: application/json; charset=utf-8');
+
+function sendSuccess($data = null, $message = 'Success', $code = 200) {
+    http_response_code($code);
+    echo json_encode(['status' => 'success', 'message' => $message, 'data' => $data]);
+    exit();
+}
+function sendError($message = 'Error', $code = 400) {
+    http_response_code($code);
+    echo json_encode(['status' => 'error', 'message' => $message]);
+    exit();
+}
+
+$pdo    = Database::getConnection();
+$method = $_SERVER['REQUEST_METHOD'];
+
+switch ($method) {
+    case 'GET':
+        try {
+            // Check if blank_spot table exists, otherwise return empty collection
+            $check = $pdo->query("SHOW TABLES LIKE 'blank_spot'")->rowCount();
+            if ($check === 0) {
+                sendSuccess(
+                    ['type' => 'FeatureCollection', 'features' => []],
+                    'Tabel blank_spot belum tersedia'
+                );
+            }
+            $stmt = $pdo->query(
+                "SELECT id, nama, keterangan, created_at, ST_AsGeoJSON(geom) AS geojson FROM blank_spot"
+            );
+            $features = [];
+            while ($row = $stmt->fetch()) {
+                $features[] = [
+                    'type'       => 'Feature',
+                    'geometry'   => json_decode($row['geojson']),
+                    'properties' => [
+                        'id'          => $row['id'],
+                        'nama'        => $row['nama'],
+                        'keterangan'  => $row['keterangan'],
+                        'created_at'  => $row['created_at'],
+                    ],
+                ];
+            }
+            sendSuccess(['type' => 'FeatureCollection', 'features' => $features], 'Data Blank Spot berhasil diambil');
+        } catch (PDOException $e) {
+            sendError('Gagal mengambil data Blank Spot: ' . $e->getMessage(), 500);
+        }
+        break;
+
+    case 'POST':
+        requireApiRole('admin');
+        $input = json_decode(file_get_contents('php://input'), true);
+        if (!isset($input['nama']) || !isset($input['geometry'])) {
+            sendError('Nama dan geometri wajib diisi');
+        }
+        try {
+            $stmt = $pdo->prepare(
+                "INSERT INTO blank_spot (nama, keterangan, geom)
+                 VALUES (:nama, :keterangan, ST_GeomFromGeoJSON(:geometry))"
+            );
+            $stmt->execute([
+                ':nama'       => $input['nama'],
+                ':keterangan' => $input['keterangan'] ?? '',
+                ':geometry'   => json_encode($input['geometry']),
+            ]);
+            sendSuccess(['id' => $pdo->lastInsertId()], 'Data Blank Spot berhasil disimpan', 201);
+        } catch (PDOException $e) {
+            sendError('Gagal menyimpan Blank Spot: ' . $e->getMessage(), 500);
+        }
+        break;
+
+    case 'DELETE':
+        requireApiRole('admin');
+        $id = $_GET['id'] ?? null;
+        if (!$id) sendError('ID Blank Spot wajib disertakan');
+        try {
+            $stmt = $pdo->prepare("DELETE FROM blank_spot WHERE id = :id");
+            $stmt->execute([':id' => $id]);
+            sendSuccess(null, 'Data Blank Spot berhasil dihapus');
+        } catch (PDOException $e) {
+            sendError('Gagal menghapus Blank Spot: ' . $e->getMessage(), 500);
+        }
+        break;
+
+    default:
+        sendError('Method not allowed', 405);
+}
diff --git a/webgis_app/endpoints/cek_srid.php b/webgis_app/endpoints/cek_srid.php
new file mode 100644
index 0000000..cbee85c
--- /dev/null
+++ b/webgis_app/endpoints/cek_srid.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * cek_srid.php
+ * Utility: Cek SRID (Spatial Reference ID) dari semua kolom geometri.
+ * Hanya untuk Admin / debugging.
+ */
+
+require_once __DIR__ . '/../core_config/database.php';
+require_once __DIR__ . '/../core_config/middleware_auth.php';
+
+header('Content-Type: application/json; charset=utf-8');
+
+requireApiRole('admin');
+
+$pdo = Database::getConnection();
+
+try {
+    $tables = ['spbu', 'rumah_ibadah', 'jalan', 'kavling', 'kawasan_kumuh', 'warga_miskin'];
+    $results = [];
+
+    foreach ($tables as $table) {
+        $stmt = $pdo->query(
+            "SELECT ST_SRID(geom) AS srid, COUNT(*) AS jumlah
+             FROM `{$table}`
+             GROUP BY ST_SRID(geom)"
+        );
+        $results[$table] = $stmt->fetchAll();
+    }
+
+    http_response_code(200);
+    echo json_encode(['status' => 'success', 'data' => $results]);
+} catch (PDOException $e) {
+    http_response_code(500);
+    echo json_encode(['status' => 'error', 'message' => $e->getMessage()]);
+}
diff --git a/webgis_app/endpoints/perbaiki_srid.php b/webgis_app/endpoints/perbaiki_srid.php
new file mode 100644
index 0000000..a9858fb
--- /dev/null
+++ b/webgis_app/endpoints/perbaiki_srid.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * perbaiki_srid.php
+ * Utility: Perbaiki SRID semua geometri ke SRID 0 (tidak terdefinisi, kompatibel dengan MySQL).
+ * Hanya untuk Admin / debugging.
+ */
+
+require_once __DIR__ . '/../core_config/database.php';
+require_once __DIR__ . '/../core_config/middleware_auth.php';
+
+header('Content-Type: application/json; charset=utf-8');
+
+requireApiRole('admin');
+
+$pdo = Database::getConnection();
+
+try {
+    $tables = ['spbu', 'rumah_ibadah', 'jalan', 'kavling', 'kawasan_kumuh', 'warga_miskin'];
+    $updated = [];
+
+    foreach ($tables as $table) {
+        $affected = $pdo->exec(
+            "UPDATE `{$table}` SET geom = ST_GeomFromWKB(ST_AsWKB(geom), 0) WHERE ST_SRID(geom) != 0"
+        );
+        $updated[$table] = ['rows_updated' => $affected];
+    }
+
+    http_response_code(200);
+    echo json_encode(['status' => 'success', 'message' => 'SRID diperbaiki', 'data' => $updated]);
+} catch (PDOException $e) {
+    http_response_code(500);
+    echo json_encode(['status' => 'error', 'message' => $e->getMessage()]);
+}
diff --git a/project_final/import.php b/webgis_app/import.php
similarity index 92%
rename from project_final/import.php
rename to webgis_app/import.php
index 09d6687..e8b5d60 100644
--- a/project_final/import.php
+++ b/webgis_app/import.php
@@ -1,5 +1,5 @@
-<?php
-require_once __DIR__ . '/config/app.php';
+<?php
+require_once __DIR__ . '/core_config/settings.php';
 
 $host = getenv('DB_HOST') ?: 'localhost';
 $port = getenv('DB_PORT') ?: 3306;
diff --git a/webgis_app/index.php b/webgis_app/index.php
new file mode 100644
index 0000000..09c45d2
--- /dev/null
+++ b/webgis_app/index.php
@@ -0,0 +1,13 @@
+<?php
+require_once __DIR__ . '/core_config/session_mgr.php';
+startAppSession();
+if (isset($_SESSION['user_id'])) {
+    if ($_SESSION['role'] === 'admin') {
+        header('Location: panel_admin/index.php');
+    } else {
+        header('Location: panel_user/index.php');
+    }
+    exit;
+}
+header('Location: login.php');
+exit;
diff --git a/project_final/login.php b/webgis_app/login.php
similarity index 91%
rename from project_final/login.php
rename to webgis_app/login.php
index b04ebc7..dbab523 100644
--- a/project_final/login.php
+++ b/webgis_app/login.php
@@ -1,16 +1,16 @@
 <?php
-require_once __DIR__ . '/config/session.php';
+require_once __DIR__ . '/core_config/session_mgr.php';
 startAppSession();
 
 if (isset($_SESSION['user_id'])) {
-    header($_SESSION['role'] === 'admin' ? 'Location: admin/index.php' : 'Location: user/index.php');
+    header($_SESSION['role'] === 'admin' ? 'Location: panel_admin/index.php' : 'Location: panel_user/index.php');
     exit;
 }
 
 $error = '';
 
 if ($_SERVER['REQUEST_METHOD'] === 'POST') {
-    require_once __DIR__ . '/config/db.php';
+    require_once __DIR__ . '/core_config/database.php';
     $username = trim($_POST['username'] ?? '');
     $password = $_POST['password'] ?? '';
 
@@ -26,7 +26,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
             $_SESSION['username']     = $user['username'];
             $_SESSION['role']         = $user['role'];
             $_SESSION['nama_lengkap'] = $user['nama_lengkap'];
-            header($user['role'] === 'admin' ? 'Location: admin/index.php' : 'Location: user/index.php');
+            header($user['role'] === 'admin' ? 'Location: panel_admin/index.php' : 'Location: panel_user/index.php');
             exit;
         }
 
@@ -44,8 +44,8 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
     <title>Login - WebGIS Smart City</title>
     <link href="https://fonts.googleapis.com/css2?family=Inter:wght@300;400;500;600;700;800&display=swap" rel="stylesheet">
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.0/css/all.min.css">
-    <link rel="stylesheet" href="assets/css/main.css">
-    <link rel="stylesheet" href="assets/css/auth.css">
+    <link rel="stylesheet" href="public_assets/css/global.css">
+    <link rel="stylesheet" href="public_assets/css/auth.css">
 </head>
 <body class="auth-page">
 
diff --git a/project_final/logout.php b/webgis_app/logout.php
similarity index 58%
rename from project_final/logout.php
rename to webgis_app/logout.php
index 455d8f6..64e6652 100644
--- a/project_final/logout.php
+++ b/webgis_app/logout.php
@@ -1,5 +1,5 @@
-<?php
-require_once __DIR__ . '/config/session.php';
+<?php
+require_once __DIR__ . '/core_config/session_mgr.php';
 startAppSession();
 session_destroy();
 header('Location: ' . app_url('login.php'));
diff --git a/project_final/admin/index.php b/webgis_app/panel_admin/index.php
similarity index 91%
rename from project_final/admin/index.php
rename to webgis_app/panel_admin/index.php
index da24135..e57f6c6 100644
--- a/project_final/admin/index.php
+++ b/webgis_app/panel_admin/index.php
@@ -1,6 +1,6 @@
-<?php
-require_once __DIR__ . '/../config/db.php';
-require_once __DIR__ . '/../config/auth_check.php';
+<?php
+require_once __DIR__ . '/../core_config/database.php';
+require_once __DIR__ . '/../core_config/middleware_auth.php';
 requireRole('admin');
 
 $pdo = Database::getConnection();
@@ -32,7 +32,7 @@ $blankCount = $pdo->query("
     WHERE NOT EXISTS (
         SELECT 1
         FROM rumah_ibadah ri
-        WHERE ST_Distance_Sphere(ST_SRID(w.geom, 4326), ST_SRID(ri.geom, 4326)) <= ri.radius_bantuan_meter
+        WHERE ST_Distance_Sphere(ST_GeomFromText(ST_AsText(w.geom), 4326), ST_GeomFromText(ST_AsText(ri.geom), 4326)) <= ri.radius_bantuan_meter
     )
 ")->fetch();
 $blankSpot = (int)($blankCount['cnt'] ?? 0);
@@ -56,7 +56,7 @@ require_once __DIR__ . '/partials/header.php';
             </p>
         </div>
         <div style="display:flex; gap:10px;">
-            <a href="<?= app_url('admin/peta.php') ?>" class="btn btn-primary" style="box-shadow:0 4px 6px -1px rgba(37,99,235,0.2);">
+            <a href="<?= app_url('panel_admin/peta_admin.php') ?>" class="btn btn-primary" style="box-shadow:0 4px 6px -1px rgba(37,99,235,0.2);">
                 <i class="fas fa-map-marked-alt"></i> Buka Peta Admin
             </a>
         </div>
@@ -122,7 +122,7 @@ require_once __DIR__ . '/partials/header.php';
     <div class="card">
         <div style="display:flex; align-items:center; justify-content:space-between; margin-bottom:16px;">
             <h3 style="font-size:0.95rem; font-weight:700;">⛽ SPBU Terbaru</h3>
-            <a href="<?= app_url('admin/data_spbu.php') ?>" class="btn btn-ghost btn-sm">Lihat Semua</a>
+            <a href="<?= app_url('panel_admin/kelola_spbu.php') ?>" class="btn btn-ghost btn-sm">Lihat Semua</a>
         </div>
         <?php if ($recentSpbu): ?>
         <div style="display:flex; flex-direction:column; gap:8px;">
@@ -147,7 +147,7 @@ require_once __DIR__ . '/partials/header.php';
     <div class="card">
         <div style="display:flex; align-items:center; justify-content:space-between; margin-bottom:16px;">
             <h3 style="font-size:0.95rem; font-weight:700;">👥 Warga Terdaftar</h3>
-            <a href="<?= app_url('admin/data_warga.php') ?>" class="btn btn-ghost btn-sm">Lihat Semua</a>
+            <a href="<?= app_url('panel_admin/kelola_warga.php') ?>" class="btn btn-ghost btn-sm">Lihat Semua</a>
         </div>
         <?php if ($recentWarga): ?>
         <div style="display:flex; flex-direction:column; gap:8px;">
diff --git a/project_final/admin/data_rumah.php b/webgis_app/panel_admin/kelola_fasilitas.php
similarity index 98%
rename from project_final/admin/data_rumah.php
rename to webgis_app/panel_admin/kelola_fasilitas.php
index ec8dcc0..b82e0a9 100644
--- a/project_final/admin/data_rumah.php
+++ b/webgis_app/panel_admin/kelola_fasilitas.php
@@ -1,6 +1,6 @@
-<?php
-require_once __DIR__ . '/../config/db.php';
-require_once __DIR__ . '/../config/auth_check.php';
+<?php
+require_once __DIR__ . '/../core_config/database.php';
+require_once __DIR__ . '/../core_config/middleware_auth.php';
 requireRole('admin');
 $pdo = Database::getConnection();
 $rows = $pdo->query("SELECT id,nama,agama,radius_bantuan_meter,created_at FROM rumah_ibadah ORDER BY id DESC")->fetchAll();
diff --git a/project_final/admin/data_jalan.php b/webgis_app/panel_admin/kelola_jalan.php
similarity index 96%
rename from project_final/admin/data_jalan.php
rename to webgis_app/panel_admin/kelola_jalan.php
index ae32088..293b51a 100644
--- a/project_final/admin/data_jalan.php
+++ b/webgis_app/panel_admin/kelola_jalan.php
@@ -1,6 +1,6 @@
-<?php
-require_once __DIR__ . '/../config/db.php';
-require_once __DIR__ . '/../config/auth_check.php';
+<?php
+require_once __DIR__ . '/../core_config/database.php';
+require_once __DIR__ . '/../core_config/middleware_auth.php';
 requireRole('admin');
 $pdo = Database::getConnection();
 $rows = $pdo->query("SELECT id,nama,jenis_jalan,created_at FROM jalan ORDER BY id DESC")->fetchAll();
@@ -49,7 +49,7 @@ require_once __DIR__ . '/partials/header.php';
                 <option value="Jalan Tol">Jalan Tol</option>
             </select>
         </div>
-        <p style="font-size:0.82rem;color:var(--text-muted);background:rgba(59,130,246,0.08);border:1px solid rgba(59,130,246,0.2);border-radius:8px;padding:10px;"><i class="fas fa-info-circle"></i> Geometri jalan (LineString) hanya bisa ditambahkan melalui <a href="<?= app_url('admin/peta.php') ?>" style="color:var(--primary-light);">Peta Interaktif</a>.</p>
+        <p style="font-size:0.82rem;color:var(--text-muted);background:rgba(59,130,246,0.08);border:1px solid rgba(59,130,246,0.2);border-radius:8px;padding:10px;"><i class="fas fa-info-circle"></i> Geometri jalan (LineString) hanya bisa ditambahkan melalui <a href="<?= app_url('panel_admin/peta_admin.php') ?>" style="color:var(--primary-light);">Peta Interaktif</a>.</p>
     </form>
     <div class="modal-footer"><button class="btn btn-ghost" onclick="closeModal('modalTambah')">Batal</button><button class="btn btn-primary" onclick="simpan()"><i class="fas fa-save"></i> Simpan (Tanpa Geometri)</button></div>
 </div></div>
diff --git a/project_final/admin/data_kavling.php b/webgis_app/panel_admin/kelola_kavling.php
similarity index 96%
rename from project_final/admin/data_kavling.php
rename to webgis_app/panel_admin/kelola_kavling.php
index 0de57bd..c6b0569 100644
--- a/project_final/admin/data_kavling.php
+++ b/webgis_app/panel_admin/kelola_kavling.php
@@ -1,6 +1,6 @@
-<?php
-require_once __DIR__ . '/../config/db.php';
-require_once __DIR__ . '/../config/auth_check.php';
+<?php
+require_once __DIR__ . '/../core_config/database.php';
+require_once __DIR__ . '/../core_config/middleware_auth.php';
 requireRole('admin');
 $pdo = Database::getConnection();
 $rows = $pdo->query("SELECT id,nama_pemilik,status_kepemilikan,luas,created_at FROM kavling ORDER BY id DESC")->fetchAll();
@@ -52,7 +52,7 @@ $statusFull = ['SHM'=>'Sertifikat Hak Milik','HGB'=>'Hak Guna Bangunan','HGU'=>'
             </select>
         </div>
         <div class="form-group"><label class="form-label">Luas (m²)</label><input type="number" name="luas" class="form-control" placeholder="Luas bidang tanah" min="0" step="0.01"></div>
-        <p style="font-size:0.82rem;color:var(--text-muted);background:rgba(59,130,246,0.08);border:1px solid rgba(59,130,246,0.2);border-radius:8px;padding:10px;"><i class="fas fa-info-circle"></i> Polygon kavling bisa digambar di <a href="<?= app_url('admin/peta.php') ?>" style="color:var(--primary-light);">Peta Interaktif</a>.</p>
+        <p style="font-size:0.82rem;color:var(--text-muted);background:rgba(59,130,246,0.08);border:1px solid rgba(59,130,246,0.2);border-radius:8px;padding:10px;"><i class="fas fa-info-circle"></i> Polygon kavling bisa digambar di <a href="<?= app_url('panel_admin/peta_admin.php') ?>" style="color:var(--primary-light);">Peta Interaktif</a>.</p>
     </form>
     <div class="modal-footer"><button class="btn btn-ghost" onclick="closeModal('modalTambah')">Batal</button><button class="btn btn-primary" onclick="simpan()"><i class="fas fa-save"></i> Simpan</button></div>
 </div></div>
diff --git a/project_final/admin/data_kawasan.php b/webgis_app/panel_admin/kelola_kawasan.php
similarity index 93%
rename from project_final/admin/data_kawasan.php
rename to webgis_app/panel_admin/kelola_kawasan.php
index c044ed9..cbcd9ae 100644
--- a/project_final/admin/data_kawasan.php
+++ b/webgis_app/panel_admin/kelola_kawasan.php
@@ -1,6 +1,6 @@
-<?php
-require_once __DIR__ . '/../config/db.php';
-require_once __DIR__ . '/../config/auth_check.php';
+<?php
+require_once __DIR__ . '/../core_config/database.php';
+require_once __DIR__ . '/../core_config/middleware_auth.php';
 requireRole('admin');
 $pdo = Database::getConnection();
 $rows = $pdo->query("SELECT k.id, k.nama_kawasan, k.created_at, COUNT(w.id) as jumlah_warga
@@ -16,7 +16,7 @@ require_once __DIR__ . '/partials/header.php';
 </div>
 <div class="page-toolbar">
     <div class="search-box"><i class="fas fa-search search-icon"></i><input type="text" id="searchInput" placeholder="Cari kawasan..." oninput="filterTable('searchInput','kawasanTable')"></div>
-    <a href="<?= app_url('admin/peta.php') ?>" class="btn btn-primary"><i class="fas fa-map"></i> Gambar di Peta</a>
+    <a href="<?= app_url('panel_admin/peta_admin.php') ?>" class="btn btn-primary"><i class="fas fa-map"></i> Gambar di Peta</a>
 </div>
 <div class="table-wrap">
 <table class="data-table" id="kawasanTable">
diff --git a/project_final/admin/data_laporan.php b/webgis_app/panel_admin/kelola_laporan.php
similarity index 98%
rename from project_final/admin/data_laporan.php
rename to webgis_app/panel_admin/kelola_laporan.php
index 47582fc..7aa795c 100644
--- a/project_final/admin/data_laporan.php
+++ b/webgis_app/panel_admin/kelola_laporan.php
@@ -1,6 +1,6 @@
-<?php
-require_once __DIR__ . '/../config/db.php';
-require_once __DIR__ . '/../config/auth_check.php';
+<?php
+require_once __DIR__ . '/../core_config/database.php';
+require_once __DIR__ . '/../core_config/middleware_auth.php';
 requireRole('admin');
 
 $pdo = Database::getConnection();
diff --git a/project_final/admin/data_spbu.php b/webgis_app/panel_admin/kelola_spbu.php
similarity index 98%
rename from project_final/admin/data_spbu.php
rename to webgis_app/panel_admin/kelola_spbu.php
index a9cb598..f9bb7e1 100644
--- a/project_final/admin/data_spbu.php
+++ b/webgis_app/panel_admin/kelola_spbu.php
@@ -1,6 +1,6 @@
-<?php
-require_once __DIR__ . '/../config/db.php';
-require_once __DIR__ . '/../config/auth_check.php';
+<?php
+require_once __DIR__ . '/../core_config/database.php';
+require_once __DIR__ . '/../core_config/middleware_auth.php';
 requireRole('admin');
 $pdo = Database::getConnection();
 $rows = $pdo->query("SELECT id, nama, deskripsi, buka_24_jam, created_at FROM spbu ORDER BY id DESC")->fetchAll();
diff --git a/project_final/admin/data_warga.php b/webgis_app/panel_admin/kelola_warga.php
similarity index 98%
rename from project_final/admin/data_warga.php
rename to webgis_app/panel_admin/kelola_warga.php
index 4877948..9653642 100644
--- a/project_final/admin/data_warga.php
+++ b/webgis_app/panel_admin/kelola_warga.php
@@ -1,6 +1,6 @@
-<?php
-require_once __DIR__ . '/../config/db.php';
-require_once __DIR__ . '/../config/auth_check.php';
+<?php
+require_once __DIR__ . '/../core_config/database.php';
+require_once __DIR__ . '/../core_config/middleware_auth.php';
 requireRole('admin');
 $pdo = Database::getConnection();
 $rows = $pdo->query("SELECT id,nama_kk,penghasilan,jumlah_tanggungan,created_at FROM warga_miskin ORDER BY id DESC")->fetchAll();
diff --git a/project_final/admin/users.php b/webgis_app/panel_admin/manajemen_pengguna.php
similarity index 98%
rename from project_final/admin/users.php
rename to webgis_app/panel_admin/manajemen_pengguna.php
index 26c3619..60378e3 100644
--- a/project_final/admin/users.php
+++ b/webgis_app/panel_admin/manajemen_pengguna.php
@@ -1,6 +1,6 @@
-<?php
-require_once __DIR__ . '/../config/db.php';
-require_once __DIR__ . '/../config/auth_check.php';
+<?php
+require_once __DIR__ . '/../core_config/database.php';
+require_once __DIR__ . '/../core_config/middleware_auth.php';
 requireRole('admin');
 $pdo = Database::getConnection();
 $rows = $pdo->query("SELECT id, username, role, nama_lengkap, created_at FROM users ORDER BY id ASC")->fetchAll();
diff --git a/project_final/admin/partials/footer.php b/webgis_app/panel_admin/partials/footer.php
similarity index 100%
rename from project_final/admin/partials/footer.php
rename to webgis_app/panel_admin/partials/footer.php
diff --git a/project_final/admin/partials/header.php b/webgis_app/panel_admin/partials/header.php
similarity index 81%
rename from project_final/admin/partials/header.php
rename to webgis_app/panel_admin/partials/header.php
index 1c27689..08ae1c9 100644
--- a/project_final/admin/partials/header.php
+++ b/webgis_app/panel_admin/partials/header.php
@@ -1,4 +1,4 @@
-<?php
+<?php
 /**
  * Admin Layout — sidebar + topbar
  * Include di awal setiap halaman admin setelah auth check.
@@ -15,8 +15,8 @@ $initial = strtoupper(substr($user['nama_lengkap'] ?: $user['username'], 0, 1));
     <title><?= htmlspecialchars($pageTitle ?? 'Admin Panel') ?> — WebGIS Smart City</title>
     <link href="https://fonts.googleapis.com/css2?family=Inter:wght@300;400;500;600;700;800&display=swap" rel="stylesheet">
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.0/css/all.min.css">
-    <link rel="stylesheet" href="<?= app_url('assets/css/main.css') ?>?v=20260610-spbu-snackbar">
-    <link rel="stylesheet" href="<?= app_url('assets/css/admin.css') ?>">
+    <link rel="stylesheet" href="<?= app_url('public_assets/css/global.css') ?>?v=20260610-spbu-snackbar">
+    <link rel="stylesheet" href="<?= app_url('public_assets/css/panel.css') ?>">
     <script>const APP_BASE = '<?= app_url() ?>';</script>
     <?= $extraHead ?? '' ?>
 </head>
@@ -34,47 +34,47 @@ $initial = strtoupper(substr($user['nama_lengkap'] ?: $user['username'], 0, 1));
 
     <nav class="sidebar-nav">
         <div class="nav-section-title">Utama</div>
-        <a href="<?= app_url('admin/index.php') ?>"
+        <a href="<?= app_url('panel_admin/index.php') ?>"
            class="nav-item <?= ($activeNav==='dashboard') ? 'active' : '' ?>">
             <span class="nav-icon"><i class="fas fa-chart-pie"></i></span> Dashboard
         </a>
-        <a href="<?= app_url('admin/peta.php') ?>"
+        <a href="<?= app_url('panel_admin/peta_admin.php') ?>"
            class="nav-item <?= ($activeNav==='peta') ? 'active' : '' ?>">
             <span class="nav-icon"><i class="fas fa-map-marked-alt"></i></span> Peta Interaktif
         </a>
 
         <div class="nav-section-title">Data Spasial</div>
-        <a href="<?= app_url('admin/data_spbu.php') ?>"
+        <a href="<?= app_url('panel_admin/kelola_spbu.php') ?>"
            class="nav-item <?= ($activeNav==='spbu') ? 'active' : '' ?>">
             <span class="nav-icon"><i class="fas fa-gas-pump"></i></span> SPBU
         </a>
-        <a href="<?= app_url('admin/data_jalan.php') ?>"
+        <a href="<?= app_url('panel_admin/kelola_jalan.php') ?>"
            class="nav-item <?= ($activeNav==='jalan') ? 'active' : '' ?>">
             <span class="nav-icon"><i class="fas fa-road"></i></span> Jalan
         </a>
-        <a href="<?= app_url('admin/data_kavling.php') ?>"
+        <a href="<?= app_url('panel_admin/kelola_kavling.php') ?>"
            class="nav-item <?= ($activeNav==='kavling') ? 'active' : '' ?>">
             <span class="nav-icon"><i class="fas fa-vector-square"></i></span> Kavling / Parsil
         </a>
-        <a href="<?= app_url('admin/data_rumah.php') ?>"
+        <a href="<?= app_url('panel_admin/kelola_fasilitas.php') ?>"
            class="nav-item <?= ($activeNav==='rumah') ? 'active' : '' ?>">
             <span class="nav-icon"><i class="fas fa-mosque"></i></span> Rumah Ibadah
         </a>
-        <a href="<?= app_url('admin/data_warga.php') ?>"
+        <a href="<?= app_url('panel_admin/kelola_warga.php') ?>"
            class="nav-item <?= ($activeNav==='warga') ? 'active' : '' ?>">
             <span class="nav-icon"><i class="fas fa-users"></i></span> Warga Miskin
         </a>
-        <a href="<?= app_url('admin/data_kawasan.php') ?>"
+        <a href="<?= app_url('panel_admin/kelola_kawasan.php') ?>"
            class="nav-item <?= ($activeNav==='kawasan') ? 'active' : '' ?>">
             <span class="nav-icon"><i class="fas fa-draw-polygon"></i></span> Kawasan Kumuh
         </a>
-        <a href="<?= app_url('admin/data_laporan.php') ?>"
+        <a href="<?= app_url('panel_admin/kelola_laporan.php') ?>"
            class="nav-item <?= ($activeNav==='laporan') ? 'active' : '' ?>">
             <span class="nav-icon"><i class="fas fa-bullhorn"></i></span> Laporan Warga
         </a>
 
         <div class="nav-section-title">Manajemen</div>
-        <a href="<?= app_url('admin/users.php') ?>"
+        <a href="<?= app_url('panel_admin/manajemen_pengguna.php') ?>"
            class="nav-item <?= ($activeNav==='users') ? 'active' : '' ?>">
             <span class="nav-icon"><i class="fas fa-user-shield"></i></span> Kelola Users
         </a>
@@ -102,7 +102,7 @@ $initial = strtoupper(substr($user['nama_lengkap'] ?: $user['username'], 0, 1));
             <div class="topbar-time" id="clock">
                 <i class="fas fa-clock"></i> <span id="clockText"></span>
             </div>
-            <a href="<?= app_url('admin/peta.php') ?>" class="btn btn-primary btn-sm">
+            <a href="<?= app_url('panel_admin/peta_admin.php') ?>" class="btn btn-primary btn-sm">
                 <i class="fas fa-map"></i> Buka Peta
             </a>
         </div>
diff --git a/project_final/admin/peta.php b/webgis_app/panel_admin/peta_admin.php
similarity index 96%
rename from project_final/admin/peta.php
rename to webgis_app/panel_admin/peta_admin.php
index 99762be..4658c71 100644
--- a/project_final/admin/peta.php
+++ b/webgis_app/panel_admin/peta_admin.php
@@ -1,6 +1,6 @@
 <?php
-require_once __DIR__ . '/../config/db.php';
-require_once __DIR__ . '/../config/auth_check.php';
+require_once __DIR__ . '/../core_config/database.php';
+require_once __DIR__ . '/../core_config/middleware_auth.php';
 requireRole('admin');
 
 $pageTitle = 'Peta Interaktif';
@@ -9,7 +9,7 @@ $bodyClass = 'admin-map-page map-page';
 $extraHead = '
     <link rel="stylesheet" href="https://unpkg.com/leaflet@1.9.4/dist/leaflet.css">
     <link rel="stylesheet" href="https://unpkg.com/leaflet-draw@1.0.4/dist/leaflet.draw.css">
-    <link rel="stylesheet" href="' . app_url('assets/css/map.css') . '?v=20260610-2">
+    <link rel="stylesheet" href="' . app_url('public_assets/css/map.css') . '?v=20260610-2">
 ';
 require_once __DIR__ . '/partials/header.php';
 ?>
@@ -168,6 +168,6 @@ require_once __DIR__ . '/partials/header.php';
 
 <script src="https://unpkg.com/leaflet@1.9.4/dist/leaflet.js"></script>
 <script src="https://unpkg.com/leaflet-draw@1.0.4/dist/leaflet.draw.js"></script>
-<script src="<?= app_url('assets/js/admin-map.js') ?>?v=20260610-radius"></script>
+<script src="<?= app_url('public_assets/js/peta-admin.js') ?>?v=20260612-fix"></script>
 <?php $extraScript = ''; ?>
 <?php require_once __DIR__ . '/partials/footer.php'; ?>
diff --git a/project_final/user/laporan.php b/webgis_app/panel_user/buat_laporan.php
similarity index 98%
rename from project_final/user/laporan.php
rename to webgis_app/panel_user/buat_laporan.php
index 49fc7d5..d11958c 100644
--- a/project_final/user/laporan.php
+++ b/webgis_app/panel_user/buat_laporan.php
@@ -1,6 +1,6 @@
-<?php
-require_once __DIR__ . '/../config/db.php';
-require_once __DIR__ . '/../config/auth_check.php';
+<?php
+require_once __DIR__ . '/../core_config/database.php';
+require_once __DIR__ . '/../core_config/middleware_auth.php';
 requireRole('user');
 
 $pdo = Database::getConnection();
diff --git a/project_final/user/index.php b/webgis_app/panel_user/index.php
similarity index 93%
rename from project_final/user/index.php
rename to webgis_app/panel_user/index.php
index 29c06a8..c22e4e4 100644
--- a/project_final/user/index.php
+++ b/webgis_app/panel_user/index.php
@@ -1,6 +1,6 @@
-<?php
-require_once __DIR__ . '/../config/db.php';
-require_once __DIR__ . '/../config/auth_check.php';
+<?php
+require_once __DIR__ . '/../core_config/database.php';
+require_once __DIR__ . '/../core_config/middleware_auth.php';
 requireRole('user');
 
 $pdo = Database::getConnection();
@@ -29,7 +29,7 @@ $blankCount = $pdo->query("
     WHERE NOT EXISTS (
         SELECT 1
         FROM rumah_ibadah ri
-        WHERE ST_Distance_Sphere(ST_SRID(w.geom, 4326), ST_SRID(ri.geom, 4326)) <= ri.radius_bantuan_meter
+        WHERE ST_Distance_Sphere(ST_GeomFromText(ST_AsText(w.geom), 4326), ST_GeomFromText(ST_AsText(ri.geom), 4326)) <= ri.radius_bantuan_meter
     )
 ")->fetch();
 $blankSpot = (int)($blankCount['cnt'] ?? 0);
@@ -106,7 +106,7 @@ require_once __DIR__ . '/partials/header.php';
             </p>
         </div>
         <div style="display:flex; gap:10px;">
-            <a href="<?= app_url('user/peta.php') ?>" class="btn btn-success">
+            <a href="<?= app_url('panel_user/peta_user.php') ?>" class="btn btn-success">
                 <i class="fas fa-map-marked-alt"></i> Buka Peta
             </a>
         </div>
diff --git a/project_final/user/partials/footer.php b/webgis_app/panel_user/partials/footer.php
similarity index 100%
rename from project_final/user/partials/footer.php
rename to webgis_app/panel_user/partials/footer.php
diff --git a/project_final/user/partials/header.php b/webgis_app/panel_user/partials/header.php
similarity index 90%
rename from project_final/user/partials/header.php
rename to webgis_app/panel_user/partials/header.php
index 4da42b8..5016214 100644
--- a/project_final/user/partials/header.php
+++ b/webgis_app/panel_user/partials/header.php
@@ -1,4 +1,4 @@
-<?php
+<?php
 /**
  * User Layout — sidebar + topbar (read-only mode, beda style dari admin)
  * Variables expected from parent: $pageTitle, $activeNav
@@ -14,8 +14,8 @@ $initial = strtoupper(substr($user['nama_lengkap'] ?: $user['username'], 0, 1));
     <title><?= htmlspecialchars($pageTitle ?? 'User Portal') ?> — WebGIS Smart City</title>
     <link href="https://fonts.googleapis.com/css2?family=Inter:wght@300;400;500;600;700;800&display=swap" rel="stylesheet">
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.0/css/all.min.css">
-    <link rel="stylesheet" href="<?= app_url('assets/css/main.css') ?>?v=20260610-spbu-snackbar">
-    <link rel="stylesheet" href="<?= app_url('assets/css/admin.css') ?>">
+    <link rel="stylesheet" href="<?= app_url('public_assets/css/global.css') ?>?v=20260610-spbu-snackbar">
+    <link rel="stylesheet" href="<?= app_url('public_assets/css/panel.css') ?>">
     <script>const APP_BASE = '<?= app_url() ?>';</script>
     <?= $extraHead ?? '' ?>
 </head>
@@ -33,15 +33,15 @@ $initial = strtoupper(substr($user['nama_lengkap'] ?: $user['username'], 0, 1));
 
     <nav class="sidebar-nav">
         <div class="nav-section-title">Menu</div>
-        <a href="<?= app_url('user/index.php') ?>"
+        <a href="<?= app_url('panel_user/index.php') ?>"
            class="nav-item <?= ($activeNav==='dashboard') ? 'active' : '' ?>">
             <span class="nav-icon"><i class="fas fa-chart-pie"></i></span> Beranda
         </a>
-        <a href="<?= app_url('user/peta.php') ?>"
+        <a href="<?= app_url('panel_user/peta_user.php') ?>"
            class="nav-item <?= ($activeNav==='peta') ? 'active' : '' ?>">
             <span class="nav-icon"><i class="fas fa-map-marked-alt"></i></span> Peta Interaktif
         </a>
-        <a href="<?= app_url('user/laporan.php') ?>"
+        <a href="<?= app_url('panel_user/buat_laporan.php') ?>"
            class="nav-item <?= ($activeNav==='laporan') ? 'active' : '' ?>">
             <span class="nav-icon"><i class="fas fa-bullhorn"></i></span> Laporan Warga
         </a>
diff --git a/project_final/user/peta.php b/webgis_app/panel_user/peta_user.php
similarity index 96%
rename from project_final/user/peta.php
rename to webgis_app/panel_user/peta_user.php
index 03b0d6d..805a165 100644
--- a/project_final/user/peta.php
+++ b/webgis_app/panel_user/peta_user.php
@@ -1,6 +1,6 @@
 <?php
-require_once __DIR__ . '/../config/db.php';
-require_once __DIR__ . '/../config/auth_check.php';
+require_once __DIR__ . '/../core_config/database.php';
+require_once __DIR__ . '/../core_config/middleware_auth.php';
 requireRole('user');
 
 $pageTitle = 'Peta Interaktif';
@@ -8,7 +8,7 @@ $activeNav = 'peta';
 $bodyClass = 'admin-map-page map-page';
 $extraHead = '
     <link rel="stylesheet" href="https://unpkg.com/leaflet@1.9.4/dist/leaflet.css">
-    <link rel="stylesheet" href="' . app_url('assets/css/map.css') . '?v=20260610-2">
+    <link rel="stylesheet" href="' . app_url('public_assets/css/map.css') . '?v=20260610-2">
 ';
 require_once __DIR__ . '/partials/header.php';
 ?>
@@ -156,6 +156,6 @@ require_once __DIR__ . '/partials/header.php';
 </div>
 
 <script src="https://unpkg.com/leaflet@1.9.4/dist/leaflet.js"></script>
-<script src="<?= app_url('assets/js/user-map.js') ?>?v=20260610-radius"></script>
+<script src="<?= app_url('public_assets/js/peta-user.js') ?>?v=20260612-fix"></script>
 <?php $extraScript = ''; ?>
 <?php require_once __DIR__ . '/partials/footer.php'; ?>
diff --git a/project_final/assets/css/auth.css b/webgis_app/public_assets/css/auth.css
similarity index 100%
rename from project_final/assets/css/auth.css
rename to webgis_app/public_assets/css/auth.css
diff --git a/project_final/assets/css/main.css b/webgis_app/public_assets/css/global.css
similarity index 100%
rename from project_final/assets/css/main.css
rename to webgis_app/public_assets/css/global.css
diff --git a/project_final/assets/css/map.css b/webgis_app/public_assets/css/map.css
similarity index 100%
rename from project_final/assets/css/map.css
rename to webgis_app/public_assets/css/map.css
diff --git a/project_final/assets/css/admin.css b/webgis_app/public_assets/css/panel.css
similarity index 100%
rename from project_final/assets/css/admin.css
rename to webgis_app/public_assets/css/panel.css
diff --git a/project_final/assets/js/admin-map.js b/webgis_app/public_assets/js/peta-admin.js
similarity index 92%
rename from project_final/assets/js/admin-map.js
rename to webgis_app/public_assets/js/peta-admin.js
index 0fefc7a..317decd 100644
--- a/project_final/assets/js/admin-map.js
+++ b/webgis_app/public_assets/js/peta-admin.js
@@ -42,11 +42,34 @@ function makeIcon(emoji, bgColor, size = 34) {
 const ICONS = {
     spbu24:  makeIcon('⛽', COLORS.spbu24),
     spbu:    makeIcon('⛽', COLORS.spbu),
-    rumah:   makeIcon('🕌', COLORS.rumah),
+    rumah:   makeIcon('🕌', COLORS.rumah),  // default (Islam)
     warga:   makeIcon('👤', COLORS.warga),
     blankSpot: makeIcon('⚠️', COLORS.blankSpot, 36)
 };
 
+/* ── Per-religion icon colors & emojis ── */
+const AGAMA_EMOJI = {
+    'Islam':    '🕌',
+    'Kristen':  '⛪',
+    'Katolik':  '⛪',
+    'Hindu':    '🛕',
+    'Buddha':   '☯️',
+    'Konghucu': '🏯'
+};
+const AGAMA_COLOR = {
+    'Islam':    '#6D28D9',
+    'Kristen':  '#2563EB',
+    'Katolik':  '#1D4ED8',
+    'Hindu':    '#D97706',
+    'Buddha':   '#F59E0B',
+    'Konghucu': '#DC2626'
+};
+function getRumahIcon(agama) {
+    const emoji = AGAMA_EMOJI[agama] || '🛐';
+    const color = AGAMA_COLOR[agama] || COLORS.rumah;
+    return makeIcon(emoji, color);
+}
+
 /* ── Toast ── */
 function toast(msg, type = 'success') {
     const c = document.getElementById('toastContainer');
@@ -125,23 +148,25 @@ function renderKawasan(data) {
     if (document.getElementById('ly-kawasan')?.checked) state.layers.kawasan.addTo(state.map);
 }
 
-/* ── Render: Rumah Ibadah (Point) ── */
+/* ── Render: Rumah Ibadah (Point) — icon berubah sesuai agama ── */
 function renderRumah(data) {
     if (state.layers.rumah) state.map.removeLayer(state.layers.rumah);
     state.layers.rumah = L.featureGroup();
     (data.features || []).forEach((f) => {
         if (!f.geometry || f.geometry.type !== 'Point') return;
         const props = f.properties || {};
+        const agama = props.agama || 'Islam';
+        const agamaColor = AGAMA_COLOR[agama] || COLORS.rumah;
         const ll = L.latLng(f.geometry.coordinates[1], f.geometry.coordinates[0]);
         const circle = L.circle(ll, {
             radius: Number(props.radius_bantuan_meter || 1000),
-            color: COLORS.rumah,
-            fillColor: COLORS.rumah,
-            fillOpacity: 0.08,
-            opacity: 0.55,
+            color: agamaColor,
+            fillColor: agamaColor,
+            fillOpacity: 0.10,
+            opacity: 0.60,
             weight: 2
         });
-        const marker = L.marker(ll, { icon: ICONS.rumah });
+        const marker = L.marker(ll, { icon: getRumahIcon(agama) });
         bindPopup(circle, 'rumah', props);
         bindPopup(marker, 'rumah', props);
         state.layers.rumah.addLayer(circle);
@@ -216,9 +241,19 @@ function bindPopup(layer, type, props) {
         html += `<div class="popup-row">Penghasilan: <strong>Rp ${Number(props.penghasilan || 0).toLocaleString('id-ID')}</strong></div>`;
         html += `<div class="popup-row">Tanggungan: <strong>${props.jumlah_tanggungan || 0} org</strong></div>`;
     }
+    // Map type to the correct admin manage page
+    const kelolaMap = {
+        spbu:    'kelola_spbu.php',
+        jalan:   'kelola_jalan.php',
+        kavling: 'kelola_kavling.php',
+        kawasan: 'kelola_kawasan.php',
+        rumah:   'kelola_fasilitas.php',
+        warga:   'kelola_warga.php'
+    };
+    const kelolaPage = kelolaMap[type] || '';
     html += `<div class="popup-actions">
         <button class="btn btn-danger btn-sm" onclick="deleteFeature('${type}', ${props.id})"><i class="fas fa-trash"></i> Hapus</button>
-        <button class="btn btn-ghost btn-sm" onclick="window.location.href=APP_BASE + '/admin/data_${type === 'kavling' ? 'kavling' : (type === 'kawasan' ? 'kawasan' : (type === 'rumah' ? 'rumah' : (type === 'warga' ? 'warga' : type)))}.php'"><i class="fas fa-edit"></i> Kelola</button>
+        ${kelolaPage ? `<button class="btn btn-ghost btn-sm" onclick="window.location.href=APP_BASE+'/panel_admin/${kelolaPage}'"><i class="fas fa-edit"></i> Kelola</button>` : ''}
     </div>`;
     layer.bindPopup(html);
 }
@@ -337,7 +372,7 @@ function openFormModal(type, geometry) {
         formHtml = `
             <div class="form-group"><label class="form-label">Nama *</label><input type="text" id="f-nama" class="form-control" required></div>
             <div class="form-group"><label class="form-label">Agama *</label>
-                <select id="f-agama" class="form-control">
+                <select id="f-agama" class="form-control" onchange="updateRumahModalTitle(this.value)">
                     <option>Islam</option><option>Kristen</option><option>Katolik</option>
                     <option>Hindu</option><option>Buddha</option><option>Konghucu</option>
                 </select></div>
@@ -364,6 +399,12 @@ window.closeFormModal = function () {
     deactivateDraw();
 };
 
+/* ── Update draw modal title when agama changes ── */
+window.updateRumahModalTitle = function(agama) {
+    const emoji = AGAMA_EMOJI[agama] || '🛐';
+    document.getElementById('formModalTitle').textContent = `${emoji} Tambah Rumah Ibadah`;
+};
+
 /* ── Save feature to backend ── */
 window.saveFeature = async function (type) {
     const ep = { spbu: 'spbu.php', jalan: 'jalan.php', kavling: 'kavling.php', kawasan: 'kawasan_kumuh.php', rumah: 'rumah_ibadah.php', warga: 'warga_miskin.php' }[type];
diff --git a/project_final/assets/js/user-map.js b/webgis_app/public_assets/js/peta-user.js
similarity index 94%
rename from project_final/assets/js/user-map.js
rename to webgis_app/public_assets/js/peta-user.js
index 4f06119..ea78f21 100644
--- a/project_final/assets/js/user-map.js
+++ b/webgis_app/public_assets/js/peta-user.js
@@ -38,11 +38,34 @@ function makeIcon(emoji, bgColor, size = 34) {
 const ICONS = {
     spbu24: makeIcon('⛽', COLORS.spbu24),
     spbu:   makeIcon('⛽', COLORS.spbu),
-    rumah:  makeIcon('🕌', COLORS.rumah),
+    rumah:  makeIcon('🕌', COLORS.rumah),  // default (Islam)
     warga:  makeIcon('👤', COLORS.warga),
     blankSpot: makeIcon('⚠️', COLORS.blankSpot, 36)
 };
 
+/* ── Per-religion icon colors & emojis ── */
+const AGAMA_EMOJI = {
+    'Islam':    '🕌',
+    'Kristen':  '⛪',
+    'Katolik':  '⛪',
+    'Hindu':    '🛕',
+    'Buddha':   '☯️',
+    'Konghucu': '🏯'
+};
+const AGAMA_COLOR = {
+    'Islam':    '#6D28D9',
+    'Kristen':  '#2563EB',
+    'Katolik':  '#1D4ED8',
+    'Hindu':    '#D97706',
+    'Buddha':   '#F59E0B',
+    'Konghucu': '#DC2626'
+};
+function getRumahIcon(agama) {
+    const emoji = AGAMA_EMOJI[agama] || '🛐';
+    const color = AGAMA_COLOR[agama] || COLORS.rumah;
+    return makeIcon(emoji, color);
+}
+
 function toast(msg, type = 'success') {
     const c = document.getElementById('toastContainer');
     const t = document.createElement('div');
@@ -209,16 +232,18 @@ function renderRumah(data) {
     (data.features || []).forEach((f) => {
         if (!f.geometry || f.geometry.type !== 'Point') return;
         const props = f.properties || {};
+        const agama = props.agama || 'Islam';
+        const agamaColor = AGAMA_COLOR[agama] || COLORS.rumah;
         const ll = L.latLng(f.geometry.coordinates[1], f.geometry.coordinates[0]);
         const circle = L.circle(ll, {
             radius: Number(props.radius_bantuan_meter || 1000),
-            color: COLORS.rumah,
-            fillColor: COLORS.rumah,
-            fillOpacity: 0.08,
-            opacity: 0.55,
+            color: agamaColor,
+            fillColor: agamaColor,
+            fillOpacity: 0.10,
+            opacity: 0.60,
             weight: 2
         });
-        const marker = L.marker(ll, { icon: ICONS.rumah });
+        const marker = L.marker(ll, { icon: getRumahIcon(agama) });
         bindReadOnlyPopup(circle, 'rumah', props);
         bindReadOnlyPopup(marker, 'rumah', props);
         state.layers.rumah.addLayer(circle);