Nayyara0412/WebGIS-Project
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix login JSON errors and WebGIS02 rendering

Browse Source
This commit is contained in:
Nayyara0412
2026-06-11 16:10:45 +07:00
parent b3cacf6432
commit ad5a82ca36
4 changed files with 92 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
webgis-v3/api/index.php
+6 -4
View File
@@ -94,10 +94,12 @@ switch ($method) {
default: jsonError('Method tidak diizinkan',405);
}
function jsonError($msg,$code=400){
http_response_code($code);
echo json_encode(['success'=>false,'message'=>$msg]);
exit;
if (!function_exists('jsonError')) {
function jsonError($msg,$code=400){
http_response_code($code);
echo json_encode(['success'=>false,'message'=>$msg]);
exit;
}
}
// ═══════════════════════════════════════════════════════════════
webgis-v3/config/database.php
+37
View File
@@ -14,6 +14,43 @@ function getDB(): PDO {
PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC,
PDO::ATTR_EMULATE_PREPARES => false,
]);
ensureDefaultUsers($pdo);
}
return $pdo;
}
function ensureDefaultUsers(PDO $pdo): void {
$stmt = $pdo->query("SHOW TABLES LIKE 'user'");
if (!$stmt->fetch()) return;
$users = [
['admin', 1, 'Administrator Sistem', 'admin@webgis-ptk.id'],
['pengurus_jami', 2, 'Ahmad Fauzi (Masjid Jami)', 'fauzi@webgis-ptk.id'],
['pengurus_ktdr', 2, 'Romo Benediktus (Katedral)', 'romo@webgis-ptk.id'],
['pimpinan', 3, 'Camat Pontianak Kota', 'camat@webgis-ptk.id'],
['warga1', 4, 'Budi Santoso', 'budi@gmail.com'],
];
$select = $pdo->prepare("SELECT password_hash FROM user WHERE username = ? LIMIT 1");
$insert = $pdo->prepare(
"INSERT INTO user (id_role, username, password_hash, nama_lengkap, email, aktif)
VALUES (?, ?, ?, ?, ?, 1)"
);
$update = $pdo->prepare(
"UPDATE user
SET id_role = ?, password_hash = ?, nama_lengkap = ?, email = ?, aktif = 1
WHERE username = ?"
);
foreach ($users as [$username, $roleId, $name, $email]) {
$select->execute([$username]);
$row = $select->fetch();
$hash = password_hash('admin123', PASSWORD_BCRYPT);
if (!$row) {
$insert->execute([$roleId, $username, $hash, $name, $email]);
} elseif (!password_verify('admin123', $row['password_hash'])) {
$update->execute([$roleId, $hash, $name, $email, $username]);
}
}
}
webgis-v3/sql/schema.sql
+5 -5
View File
@@ -292,11 +292,11 @@ CREATE TABLE `peristiwa_kependudukan` (
-- ================================================================
-- Password: admin123 (bcrypt hash contoh)
INSERT INTO `user` (`id_role`,`username`,`password_hash`,`nama_lengkap`,`email`) VALUES
(1, 'admin', '$2y$10$9JkAyeakwNYcOvjtrxLeb.teP0iJCFQ9Eeru0LOfodabdjDyAXNTC', 'Administrator Sistem', 'admin@webgis-ptk.id'),
(2, 'pengurus_jami','$2y$10$9JkAyeakwNYcOvjtrxLeb.teP0iJCFQ9Eeru0LOfodabdjDyAXNTC', 'Ahmad Fauzi (Masjid Jami)', 'fauzi@webgis-ptk.id'),
(2, 'pengurus_ktdr','$2y$10$9JkAyeakwNYcOvjtrxLeb.teP0iJCFQ9Eeru0LOfodabdjDyAXNTC', 'Romo Benediktus (Katedral)', 'romo@webgis-ptk.id'),
(3, 'pimpinan', '$2y$10$9JkAyeakwNYcOvjtrxLeb.teP0iJCFQ9Eeru0LOfodabdjDyAXNTC', 'Camat Pontianak Kota', 'camat@webgis-ptk.id'),
(4, 'warga1', '$2y$10$9JkAyeakwNYcOvjtrxLeb.teP0iJCFQ9Eeru0LOfodabdjDyAXNTC', 'Budi Santoso', 'budi@gmail.com');
(1, 'admin', '$2y$10$SCqLjlnUWWOlz6DIB8cXB.aABZyThMWfnf0facH2Lylv4jbs5NQiS', 'Administrator Sistem', 'admin@webgis-ptk.id'),
(2, 'pengurus_jami','$2y$10$SCqLjlnUWWOlz6DIB8cXB.aABZyThMWfnf0facH2Lylv4jbs5NQiS', 'Ahmad Fauzi (Masjid Jami)', 'fauzi@webgis-ptk.id'),
(2, 'pengurus_ktdr','$2y$10$SCqLjlnUWWOlz6DIB8cXB.aABZyThMWfnf0facH2Lylv4jbs5NQiS', 'Romo Benediktus (Katedral)', 'romo@webgis-ptk.id'),
(3, 'pimpinan', '$2y$10$SCqLjlnUWWOlz6DIB8cXB.aABZyThMWfnf0facH2Lylv4jbs5NQiS', 'Camat Pontianak Kota', 'camat@webgis-ptk.id'),
(4, 'warga1', '$2y$10$SCqLjlnUWWOlz6DIB8cXB.aABZyThMWfnf0facH2Lylv4jbs5NQiS', 'Budi Santoso', 'budi@gmail.com');
-- ================================================================
-- SEED DATA — Rumah Ibadah
webgis02/index.html
+44 -24
View File
@@ -316,6 +316,17 @@ const layerJalan = L.layerGroup().addTo(map);
const layerParsil = L.layerGroup().addTo(map);
const layerRusak = L.layerGroup().addTo(map);
function parseGeojsonSafe(raw){
try{
const gj = typeof raw === 'string' ? JSON.parse(raw) : raw;
if(!gj || !gj.geometry || !gj.geometry.type) return null;
return gj;
}catch(e){
console.warn('GeoJSON tidak valid:', raw);
return null;
}
}
// =============================================================
// 2. WARNA & IKON
// =============================================================
@@ -688,16 +699,19 @@ async function loadJalan(q=''){
if(!data.length){ list.innerHTML='<div class="empty-state"><i class="fas fa-road"></i><p>'+(q?'Tidak ada hasil pencarian':'Belum ada data jalan')+'</p></div>'; return; }
list.innerHTML='';
data.forEach(item=>{
const gj = JSON.parse(item.geojson);
const gj = parseGeojsonSafe(item.geojson);
const style = WARNA_JALAN[item.status_jalan]||WARNA_JALAN['Kabupaten'];
const layer = L.geoJSON(gj,{style}).addTo(layerJalan);
layer.bindPopup(`
<div class="popup-title">${item.nama_jalan}</div>
<div class="popup-row">Status: <span>${item.status_jalan}</span></div>
<div class="popup-row">Panjang: <span>${parseFloat(item.panjang_meter).toFixed(2)} m</span></div>
${item.keterangan?`<div class="popup-row">Ket: <span>${item.keterangan}</span></div>`:''}
${item.foto?`<img class="popup-foto" src="${item.foto}" alt="foto">`:''}
`);
let layer = null;
if(gj){
layer = L.geoJSON(gj,{style}).addTo(layerJalan);
layer.bindPopup(`
<div class="popup-title">${item.nama_jalan}</div>
<div class="popup-row">Status: <span>${item.status_jalan}</span></div>
<div class="popup-row">Panjang: <span>${parseFloat(item.panjang_meter).toFixed(2)} m</span></div>
${item.keterangan?`<div class="popup-row">Ket: <span>${item.keterangan}</span></div>`:''}
${item.foto?`<img class="popup-foto" src="${item.foto}" alt="foto">`:''}
`);
}
const card = document.createElement('div');
card.className='data-card';
card.innerHTML=`
@@ -708,12 +722,12 @@ async function loadJalan(q=''){
<div class="card-meta"><span><i class="fas fa-ruler"></i>${parseFloat(item.panjang_meter).toFixed(0)} m</span></div>
${item.foto?`<img class="card-thumb" src="${item.foto}" alt="foto">`:''}
<div class="card-actions">
<button class="btn-sm btn-zoom" onclick="zoomJalan${item.id}()"><i class="fas fa-search-location"></i> Zoom</button>
<button class="btn-sm btn-zoom" ${layer ? `onclick="zoomJalan${item.id}()"` : 'disabled title="Lokasi belum valid"'}><i class="fas fa-search-location"></i> Zoom</button>
<button class="btn-sm btn-edit" onclick="editJalan(${item.id})"><i class="fas fa-edit"></i> Edit</button>
<button class="btn-sm btn-hapus" onclick="hapusJalan(${item.id})"><i class="fas fa-trash"></i> Hapus</button>
</div>`;
list.appendChild(card);
window[`zoomJalan${item.id}`]=()=>map.fitBounds(layer.getBounds(),{padding:[50,50]});
if(layer) window[`zoomJalan${item.id}`]=()=>map.fitBounds(layer.getBounds(),{padding:[50,50]});
});
}
@@ -739,17 +753,20 @@ async function loadParsil(q=''){
if(!data.length){ list.innerHTML='<div class="empty-state"><i class="fas fa-map"></i><p>'+(q?'Tidak ada hasil pencarian':'Belum ada data parsil')+'</p></div>'; return; }
list.innerHTML='';
data.forEach(item=>{
const gj = JSON.parse(item.geojson);
const gj = parseGeojsonSafe(item.geojson);
const style = WARNA_PARSIL[item.status_kepemilikan]||WARNA_PARSIL['SHM'];
const layer = L.geoJSON(gj,{style}).addTo(layerParsil);
layer.bindPopup(`
let layer = null;
if(gj){
layer = L.geoJSON(gj,{style}).addTo(layerParsil);
layer.bindPopup(`
<div class="popup-title">${item.nama_pemilik}</div>
<div class="popup-row">No. Sertifikat: <span>${item.no_sertifikat}</span></div>
<div class="popup-row">Status: <span>${item.status_kepemilikan}</span></div>
<div class="popup-row">Luas: <span>${parseFloat(item.luas_m2).toFixed(2)} m²</span></div>
${item.alamat?`<div class="popup-row">Alamat: <span>${item.alamat}</span></div>`:''}
${item.foto?`<img class="popup-foto" src="${item.foto}" alt="foto">`:''}
`);
`);
}
const card = document.createElement('div');
card.className='data-card';
card.innerHTML=`
@@ -763,12 +780,12 @@ async function loadParsil(q=''){
</div>
${item.foto?`<img class="card-thumb" src="${item.foto}" alt="foto">`:''}
<div class="card-actions">
<button class="btn-sm btn-zoom" onclick="zoomParsil${item.id}()"><i class="fas fa-search-location"></i> Zoom</button>
<button class="btn-sm btn-zoom" ${layer ? `onclick="zoomParsil${item.id}()"` : 'disabled title="Lokasi belum valid"'}><i class="fas fa-search-location"></i> Zoom</button>
<button class="btn-sm btn-edit" onclick="editParsil(${item.id})"><i class="fas fa-edit"></i> Edit</button>
<button class="btn-sm btn-hapus" onclick="hapusParsil(${item.id})"><i class="fas fa-trash"></i> Hapus</button>
</div>`;
list.appendChild(card);
window[`zoomParsil${item.id}`]=()=>map.fitBounds(layer.getBounds(),{padding:[50,50]});
if(layer) window[`zoomParsil${item.id}`]=()=>map.fitBounds(layer.getBounds(),{padding:[50,50]});
});
}
@@ -794,18 +811,21 @@ async function loadRusak(q=''){
if(!data.length){ list.innerHTML='<div class="empty-state"><i class="fas fa-exclamation-triangle"></i><p>'+(q?'Tidak ada hasil pencarian':'Belum ada data jalan rusak')+'</p></div>'; return; }
list.innerHTML='';
data.forEach(item=>{
const gj = JSON.parse(item.geojson);
const gj = parseGeojsonSafe(item.geojson);
const cfg = WARNA_RUSAK[item.tingkat]||WARNA_RUSAK['Sedang'];
const coord = gj.geometry.coordinates; // [lng, lat]
const layer = L.circleMarker([coord[1],coord[0]], cfg).addTo(layerRusak);
layer.bindPopup(`
const coord = gj && Array.isArray(gj.geometry.coordinates) ? gj.geometry.coordinates : null; // [lng, lat]
let layer = null;
if(coord){
layer = L.circleMarker([coord[1],coord[0]], cfg).addTo(layerRusak);
layer.bindPopup(`
<div class="popup-title"><i class="fas fa-exclamation-triangle" style="color:#ef4444;margin-right:5px"></i>${item.lokasi}</div>
<div class="popup-row">Tingkat: <span style="color:${cfg.color};font-weight:700">${item.tingkat}</span></div>
${item.jenis?`<div class="popup-row">Jenis: <span>${item.jenis}</span></div>`:''}
<div class="popup-row">Dilaporkan: <span>${item.tanggal_lapor||'-'}</span></div>
${item.keterangan?`<div class="popup-row">Ket: <span>${item.keterangan}</span></div>`:''}
${item.foto?`<img class="popup-foto" src="${item.foto}" alt="foto">`:''}
`);
`);
}
const card = document.createElement('div');
card.className='data-card';
card.innerHTML=`
@@ -819,12 +839,12 @@ async function loadRusak(q=''){
</div>
${item.foto?`<img class="card-thumb" src="${item.foto}" alt="foto">`:''}
<div class="card-actions">
<button class="btn-sm btn-zoom" onclick="zoomRusak${item.id}()"><i class="fas fa-search-location"></i> Zoom</button>
<button class="btn-sm btn-zoom" ${layer ? `onclick="zoomRusak${item.id}()"` : 'disabled title="Lokasi belum valid"'}><i class="fas fa-search-location"></i> Zoom</button>
<button class="btn-sm btn-edit" onclick="editRusak(${item.id})"><i class="fas fa-edit"></i> Edit</button>
<button class="btn-sm btn-hapus" onclick="hapusRusak(${item.id})"><i class="fas fa-trash"></i> Hapus</button>
</div>`;
list.appendChild(card);
window[`zoomRusak${item.id}`]=()=>map.setView([coord[1],coord[0]],17);
if(layer) window[`zoomRusak${item.id}`]=()=>map.setView([coord[1],coord[0]],17);
});
}