diff --git a/controller/login.php b/controller/login.php
deleted file mode 100644
index 6d97b5e8f282cc2304cd30596439001b1a7ca37e..0000000000000000000000000000000000000000
--- a/controller/login.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-echo "login controller";
\ No newline at end of file
diff --git a/js/edit-prefered-location.js b/js/edit-prefered-location.js
index 5338cebd365d5ca80917cf2c9524b53ad7d1f21a..15481ca9f8f2422e37615d74890bb8967dcff9f4 100644
--- a/js/edit-prefered-location.js
+++ b/js/edit-prefered-location.js
@@ -5,8 +5,9 @@ function hideMe(i){
var inputBox = document.getElementById("locationinput"+i);
var image = document.getElementById("imageeditsave"+i);
- if(textHidden){
+ if(inputBox.type=="hidden"){
textBox.setAttribute("style","display:none");
+ inputBox.type = "text";
inputBox.setAttribute("style","display:block");
inputBox.value = textBox.innerHTML;
image.src = "../img/floppy.png";
diff --git a/model/user.php b/model/user.php
index fb5e18c4b3f0329b3252605b023de1d17cb7a0dc..415b9170ff6d6458ed43c91fc55fd41d259fa24b 100644
--- a/model/user.php
+++ b/model/user.php
@@ -18,6 +18,15 @@ class User {
mysqli_close($con);
return $result;
}
+
+ function getUserByLogIn($username, $password){
+ $con = mysqli_connect('localhost','root','','projekers');
+ mysqli_select_db($con, 'projekers');
+ $sql = "SELECT * FROM user WHERE username='" . (string)$username . "' AND password='" . (string)$password . "'";
+ $result = mysqli_query($con, $sql);
+ mysqli_close($con);
+ return $result;
+ }
function getUserById($id){
$con = mysqli_connect('localhost','root','','projekers');
diff --git a/view/Login.html b/view/Login.html
deleted file mode 100644
index 018092955259624dd9c3181650c4b0b5bba9a74a..0000000000000000000000000000000000000000
--- a/view/Login.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<html>
- <head>
- <title>Projekers - Login</title>
- <link rel = "stylesheet" href = "../css/primary.css">
- <link rel = "stylesheet" href = "../css/index.css">
- </head>
- <body>
- <div class = "container">
- <div>
- <div class = "horizontal"></div>
- <div class = "judul">LOGIN</div>
- <div class = "horizontal"></div>
- </div>
-
- <div class = "form_input">
- <form>
- <div class="set">
- <div class="label">Username</div>
- <div class="field"><input type = "text"></div>
- </div>
-
- <div class="set">
- <div class="label">Password</div>
- <div class="field"><input type = "password"></div>
- </div>
-
- <div class="linkset">
- <div class="link"><a href="signup">Don't have an account?</a></div>
- <div class="submitbutton">
- <input type = "Submit" value = "GO!" class = "submit">
- </div>
- </div>
- </form>
- </div>
- </div>
- </body>
-</html>
-
diff --git a/view/edit-prefered-locations.php b/view/edit-prefered-locations.php
index 891b182b21f5e22f82717a60a65974cbf345f2a9..9c45d20c8ab3c98d502d9bda1ca3cac860fbb928 100644
--- a/view/edit-prefered-locations.php
+++ b/view/edit-prefered-locations.php
@@ -29,7 +29,7 @@
<td class="tabno">'.$i.'</td>
<td class="tabloc">
<div id="locationtext'.$i.'">'.$row["location"].'</div>
- <input class="locationinput" id="locationinput'.$i.'" type="text">
+ <input class="locationinput" id="locationinput'.$i.'" type="hidden">
</td>
<td class="tabact">
<div class="addset" align="center">
diff --git a/view/index.html b/view/index.php
similarity index 53%
rename from view/index.html
rename to view/index.php
index 8abba56392e8b5a6cde43e9adf2962b8dce53f68..d849f9e60906df9916bd489b939e816848cceb6b 100644
--- a/view/index.html
+++ b/view/index.php
@@ -1,3 +1,21 @@
+<?php
+ include "../model/user.php";
+ if($_SERVER["REQUEST_METHOD"] == "POST") {
+ $user = new User;
+ $result = $user->getUserByLogIn($_POST['username'], $_POST['password']);
+ $count = mysqli_num_rows($result);
+ $result = $result->fetch_assoc();
+ if($count == 1) {
+ if ($result['isDriver']) {
+ header("location:dashboard.php?id=" . $result["id"]);
+ } else {
+ header("location:dashboard.php?id=" . $result["id"]);
+ }
+ } else {
+ echo "<script>alert('Username dan/atau password yang anda masukkan salah.')</script>";
+ }
+ }
+?>
<html>
<head>
<title>Projekers - Login</title>
@@ -13,15 +31,15 @@
</div>
<div class = "form_input">
- <form>
+ <form method="POST">
<div class="set">
<div class="label">Username</div>
- <div class="field"><input type = "text"></div>
+ <div class="field"><input type="text" name="username"></div>
</div>
<div class="set">
<div class="label">Password</div>
- <div class="field"><input type = "password"></div>
+ <div class="field"><input type="password" name="password"></div>
</div>
<div class="linkset">
diff --git a/view/register.php b/view/register.php
index 06fb4f6afb27460e19ebcd58bde6cef9f5153b84..2c0a426a2e4752de6f9f7ba1e963d535c13f28f0 100644
--- a/view/register.php
+++ b/view/register.php
@@ -59,7 +59,7 @@
<br>
<div class="bottom">
<div class="redirect-login">
- <a href="login.html">Already have an account?</a>
+ <a href="index.php">Already have an account?</a>
</div>
<div class="register">
<input type="submit" value="REGISTER" name="register">