diff --git a/login.html b/login.html
index b0c8650..1514bec 100644
--- a/login.html
+++ b/login.html
@@ -313,6 +313,7 @@ input:focus {
       </p>
 
 <script>
+  /*LOGIN VALIDATION*/
 document.getElementById("loginForm").addEventListener("submit", function(e) {
     e.preventDefault(); // jangan reload halaman
 
@@ -334,33 +335,24 @@ document.getElementById("loginForm").addEventListener("submit", function(e) {
         return;
     }
 
-    // Kirim ke login.php via AJAX
-    fetch("login.php", {
-        method: "POST",
-        headers: {"Content-Type": "application/x-www-form-urlencoded"},
-        body: `username=${encodeURIComponent(username)}&password=${encodeURIComponent(password)}`
-    })
-    .then(response => response.text())
-    .then(data => {
-        // Hapus whitespace & newline dari server
-        data = data.trim();
+  const usersData = localStorage.getItem("users");
+  const users = usersData ? JSON.parse(usersData) : [];
 
-        // Cek jawaban PHP
-        if (data === "OK") {
-            window.location.href = "mainboard.php";
-        } else if (data.length > 0) {
-            // Kalau PHP mengirim pesan kesalahan (username/password salah)
-            showError(data);
-        } else {
-            // Kalau PHP ngirim kosong atau error tak terduga
-            showError("Terjadi kesalahan saat login");
-        }
-    })
-    .catch(err => {
-        // Error network / fetch
-        showError("Terjadi kesalahan server");
-        console.error(err);
-    });
+  const user = users.find(u => u.username === username);
+
+  if (!user) {
+    showError("Username tidak ditemukan");
+    return;
+  }
+
+  if (user.password !== password) {
+    showError("Password salah");
+    return;
+  }
+
+  // Login sukses
+  localStorage.setItem("loggedInUser", JSON.stringify(user));
+  window.location.href = "mainboard.html";
 });
 
 function showError(msg) {
diff --git a/login.php b/login.php
index 04ccfc9..6c7885f 100644
--- a/login.php
+++ b/login.php
@@ -9,7 +9,10 @@ $stmt = mysqli_prepare($conn, "SELECT * FROM user WHERE username=?");
 mysqli_stmt_bind_param($stmt, "s", $username);
 mysqli_stmt_execute($stmt);
 $result = mysqli_stmt_get_result($stmt);
+<<<<<<< HEAD
 $row = mysqli_fetch_assoc($result); 
+=======
+>>>>>>> 99c33ab04fa37c4be55d5d09fec7aae16d58e08d
 
 if ($row && password_verify($password, $row['password'])) {
     $_SESSION['username'] = $row['username'];