diff --git a/css/login.css b/css/index.css
similarity index 100%
rename from css/login.css
rename to css/index.css
diff --git a/model/user.php b/model/user.php
index c5d0ca53920041aca66d50bd617c4da1145cee92..fb5e18c4b3f0329b3252605b023de1d17cb7a0dc 100644
--- a/model/user.php
+++ b/model/user.php
@@ -107,5 +107,4 @@ class User {
mysqli_close($con);
return $result;
}
->>>>>>> c2ae002b0ea1e89875f3cea9e97fbf6eeddd1b39
}
\ No newline at end of file
diff --git a/view/Login.html b/view/Login.html
index 9acf08542fe6f4969f75cbbadb4057158a184314..018092955259624dd9c3181650c4b0b5bba9a74a 100644
--- a/view/Login.html
+++ b/view/Login.html
@@ -2,7 +2,7 @@
<head>
<title>Projekers - Login</title>
<link rel = "stylesheet" href = "../css/primary.css">
- <link rel = "stylesheet" href = "../css/login.css">
+ <link rel = "stylesheet" href = "../css/index.css">
</head>
<body>
<div class = "container">
diff --git a/view/edit-prefered-locations.html b/view/edit-prefered-locations.html
deleted file mode 100644
index 8231727803b2a4f60db0d80db69a1e6c9bc90bea..0000000000000000000000000000000000000000
--- a/view/edit-prefered-locations.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<html>
- <head>
- <title>Projekers - Edit Prefered Location</title>
- <link rel = "stylesheet" href = "../css/edit-prefered-location.css">
- <link rel = "stylesheet" href = "../css/primary.css">
- <script src = "../js/edit-prefered-location.js"></script>
- </head>
- <body>
- <div class = "container">
- <h1>EDIT PREFERED LOCATION</h1>
- <table class="tab">
- <tr>
- <th class="tabno">No</td>
- <th class="tabloc">Location</td>
- <th class="tabact">Actions</td>
- </tr>
- <tr>
- <td class="tabno">1</td>
- <td class="tabloc">
- <div id="locationtext">Bandung</div>
- <input id="locationinput" type="text">
- </td>
- <td class="tabact">
- <div class="addset" align="center">
- <div class="editsavebox">
- <button onClick=hideMe() class="editsave">
- <img src="../img/pencil.png" class="editsavebutton" id="imageeditsave">
- </button>
- </div>
- <div>
- <button onClick=f() class="delete">
- <img src="../img/delete.png" class="deletebutton">
- </button>
- </div>
- </div>
- </td>
- </tr>
- </table>
- <br>
- <br>
- <h2>ADD NEW LOCATION:</h2>
- <div class="addset">
- <div class="field"><input type="text"></div>
- <div class="submitbutton">
- <input type="Submit" value="ADD" class="submit">
- </div>
- </div>
- </div>
- </body>
-</html>
-
diff --git a/view/edit-prefered-locations.php b/view/edit-prefered-locations.php
new file mode 100644
index 0000000000000000000000000000000000000000..0dbd655909bafa8e9814438b9b48f587b022fbd0
--- /dev/null
+++ b/view/edit-prefered-locations.php
@@ -0,0 +1,70 @@
+<html>
+ <head>
+ <title>Projekers - Edit Prefered Location</title>
+ <link rel = "stylesheet" href = "../css/edit-prefered-location.css">
+ <link rel = "stylesheet" href = "../css/primary.css">
+ <script src = "../js/edit-prefered-location.js"></script>
+ </head>
+ <body>
+ <div class = "container">
+ <h1>EDIT PREFERED LOCATION</h1>
+ <?php
+ include "../model/user.php";
+ $user = new User;
+ $user_id = 1;
+ $result = $user->getPreferredLocation($user_id);
+ if ($result->num_rows > 0) {
+ echo '
+ <table class="tab">
+ <tr>
+ <th class="tabno">No</td>
+ <th class="tabloc">Location</td>
+ <th class="tabact">Actions</td>
+ </tr>
+ ';
+ $i=1;
+ while($row = $result->fetch_assoc()) {
+ echo '
+ <tr>
+ <td class="tabno">'.$i.'</td>
+ <td class="tabloc">
+ <div id="locationtext">'.$row["location"].'</div>
+ <input id="locationinput" type="text">
+ </td>
+ <td class="tabact">
+ <div class="addset" align="center">
+ <div class="editsavebox">
+ <button onClick=hideMe() class="editsave">
+ <img src="../img/pencil.png" class="editsavebutton" id="imageeditsave">
+ </button>
+ </div>
+ <div>
+ <button onClick=f() class="delete">
+ <img src="../img/delete.png" class="deletebutton">
+ </button>
+ </div>
+ </div>
+ </td>
+ </tr>';
+ $i++;
+ }
+ echo '
+ </table>
+ ';
+ } else {
+ echo "No prefered location, add one using the box below.";
+ }
+ ?>
+ <br>
+ <br>
+ <h2>ADD NEW LOCATION:</h2>
+ <div class="addset">
+ <div class="field"><input type="text"></div>
+ <div class="submitbutton">
+ <input type="Submit" value="ADD" class="submit">
+ </div>
+ </div>
+ </div>
+ </body>
+</html>
+
diff --git a/view/index.html b/view/index.html
index a2b8265999486570ad8b818c002fab81d739a95d..8abba56392e8b5a6cde43e9adf2962b8dce53f68 100644
--- a/view/index.html
+++ b/view/index.html
@@ -1,9 +1,38 @@
-<!DOCTYPE html>
<html>
-<head>
- <title>Login</title>
-</head>
-<body>
- <h1>Index Page</h1>
-</body>
-</html>
\ No newline at end of file
+ <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="register.php">Don't have an account?</a></div>
+ <div class="submitbutton">
+ <input type = "Submit" value = "GO!" class = "submit">
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+ </body>
+</html>
+