diff --git a/database/PR-Ojek.sql b/database/PR-Ojek.sql
index f1d90595f176ee52779b52abfc3ed98506dc1744..0289c80c70e444eed87ad81b60759b7c317806a3 100755
--- a/database/PR-Ojek.sql
+++ b/database/PR-Ojek.sql
@@ -1,7 +1,8 @@
-- Database PR-Ojek
+DROP TABLE IF EXISTS `user`;
CREATE TABLE IF NOT EXISTS `user` (
- `user_id` INT NOT NULL,
+ `user_id` INT NOT NULL AUTO_INCREMENT,
`name` VARCHAR(50) NOT NULL,
`email` VARCHAR(50) NOT NULL,
`phone` VARCHAR(20) NOT NULL,
@@ -13,11 +14,7 @@ CREATE TABLE IF NOT EXISTS `user` (
PRIMARY KEY (`user_id`)
);
-LOCK TABLES `user` WRITE;
-
-INSERT INTO `user` VALUES ('1','Donald Trump','donaldducktrump@gmail.com','08136','donaldduck','123456','Not_Driver',DEFAULT);
-UNLOCK TABLES;
-
+DROP TABLE IF EXISTS `driver`;
CREATE TABLE IF NOT EXISTS `driver` (
`driver_id` INT NOT NULL,
`total_score` DOUBLE(50,1) NOT NULL,
@@ -27,6 +24,7 @@ CREATE TABLE IF NOT EXISTS `driver` (
CONSTRAINT `driver_ibfk_1` FOREIGN KEY (`driver_id`) REFERENCES `user` (`user_id`)
);
+DROP TABLE IF EXISTS `driver_prefloc`;
CREATE TABLE IF NOT EXISTS `driver_prefloc` (
`driver_id` INT NOT NULL,
`pref_loc` VARCHAR(50) NOT NULL,
diff --git a/login/login.php b/login/login.php
index a559a4bc91321f02768039ebc1ba04c51212939c..25c864af5f08c66dfa4335a019212880697cd399 100755
--- a/login/login.php
+++ b/login/login.php
@@ -1,7 +1,7 @@
<?php
if ($_SERVER["REQUEST_METHOD"] == "POST") {
if (!empty($_POST['user_name']) && !empty($_POST['user_password'])) {
- include '../db_pr-ojek.php';
+ include '../database/dbconnect.php';
$user = $_POST['user_name'];
$pass = $_POST['user_password'];
$query=mysql_query("SELECT * FROM user WHERE username='".$user."' AND password='".$pass."'") or die(mysql_error());
@@ -17,7 +17,7 @@
if($user == $dbusername && $pass == $dbpassword)
{
- header("Location: ../profile_page/profile.html");
+ header("Location: ../order/order.html");
}
} else {
include("login.html");
@@ -29,11 +29,4 @@
mysql_close($conn);
}
}
-
- function clean_input($data) {
- $data = trim($data);
- $data = stripslashes($data);
- $data = htmlspecialchars($data);
- return $data;
- }
?>
diff --git a/login/sign_up.html b/login/sign_up.html
index b73e8172007ce916bba5845064d4c4848a3bac37..61fc5a7a14349cddd052e6cd824284b7a96230d7 100755
--- a/login/sign_up.html
+++ b/login/sign_up.html
@@ -9,26 +9,45 @@
<h1>-- Sign up --</h1>
<div>
- <form method="post">
- Your name
- <input type="text" name="real_name"><br/>
- Username
- <input type="text" name="real_name"><br/>
- Email
- <input type="Email" name="real_name"><br/>
- Password
- <input type="Password" name="real_name"><br/>
- Confirm password
- <input type="Password" name="real_name"><br/>
- Phone number
- <input type="text" name="real_name"><br/>
-
- <input type="checkbox" name="is_driver" value="true">Also sign me up as a driver<br/>
+ <form name="sign_up" method="post" action="sign_up.php" onsubmit="return validate_password();">
+ Your name*
+ <input type="text" name="full_name"><br/>
+ Username*
+ <input type="text" name="user_name"><br/>
+ Email*
+ <input type="Email" name="user_email"><br/>
+ Password*
+ <input type="Password" name="user_password"><br/>
+ Confirm password*
+ <input type="Password" name="confirm_password"><br/>
+ Phone number*
+ <input type="text" name="user_phone"><br/>
+ <input type="button" value="Sign me up as driver" id="signAs_driver" style="width : 40%" onclick= "driver_signup();"><label id="driversign_status"><br></label>
+ <input type="text" name="is_driver" style="display:none">
<input type="submit" value="REGISTER">
</form>
+ <p><br>* Required field</p>
</div>
</div>
+ <script>
+ function validate_password()
+ {
+ var password = document.sign_up.user_password.value;
+ var confirm_password = document.sign_up.confirm_password.value;
+ if (password !== confirm_password)
+ {
+ window.alert("The passwords you entered didn't match");
+ return false;
+ }
+ }
+ function driver_signup()
+ {
+ document.getElementById("driversign_status").innerHTML= "Signed as driver";
+ document.getElementById("signAs_driver").style.display = "none";
+ document.sign_up.is_driver.value = "Yes";
+ }
+ </script>
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/login/sign_up.php b/login/sign_up.php
new file mode 100644
index 0000000000000000000000000000000000000000..eb264696d367e00909e7aa33145c8517f2969ec8
--- /dev/null
+++ b/login/sign_up.php
@@ -0,0 +1,42 @@
+<?php
+ if ($_SERVER["REQUEST_METHOD"] == "POST") {
+ if (!empty($_POST['full_name']) &&
+ !empty($_POST['user_name']) &&
+ !empty($_POST['user_email']) &&
+ !empty($_POST['user_password']) &&
+ !empty($_POST['confirm_password']) &&
+ !empty($_POST['user_phone']))
+ {
+ include '../database/dbconnect.php';
+ $fullname = $_POST['full_name'];
+ $username = $_POST['user_name'];
+ $email = $_POST['user_email'];
+ $password = $_POST['user_password'];
+ $phone = $_POST['user_phone'];
+
+ if(isset($_POST['is_driver']))
+ {
+ $status = 'driver';
+ }
+ else
+ {
+ $status = 'customer';
+ }
+
+ $query = mysql_query("INSERT INTO user (name,email,phone,username,password,status,pict) VALUES ('$fullname', '$email', '$phone', '$username', '$password', '$status',DEFAULT)") or die(mysql_error());
+ if($query)
+ {
+ header("Location: ../order/order.html");
+ }
+ mysql_close($conn);
+ /*else {
+ include("login.html");
+ echo "<script>
+ document.getElementById('error_credential').innerHTML = 'Invalid username or password!';
+ </script>";
+ header("Location: login.html");
+ }
+ */
+ }
+ }
+?>
diff --git a/order/order.html b/order/order.html
index 8914b2b4976b8d4040e52b022d9e2b1ba5d16310..6bb38cfd1042e8c5877edb9f66bc4fe4db0c40f6 100644
--- a/order/order.html
+++ b/order/order.html
@@ -6,7 +6,7 @@
</head>
<body>
<div class="frame">
- <p>test</p>
+ <p>Order</p>
</div>
</body>
-</html>
\ No newline at end of file
+</html>