Skip to content
Snippets Groups Projects
Commit 7d67a8e1 authored by Husnulzaki Wibisono Haryadi's avatar Husnulzaki Wibisono Haryadi
Browse files

Merge branch 'master' of http://gitlab.informatika.org/IF3110-2017-K02-OneHundred/TugasBesar1_2017

parents 29af0008 6577f8e7
1 merge request!45OneHundred - 13515005 - Husnulzaki Wibisono Haryadi
Hide whitespace changes
Inline Side-by-side
css/default_style.css
+ 9
− 4
View file @ 7d67a8e1
......@@ -38,9 +38,10 @@
background: #ff264e;
}
input{
width: 90%;
margin: 1px auto 15px;
input {
height: 70%;
width: 100%;
border: 1px solid black;
}
a:link, a:visited {
......@@ -56,6 +57,9 @@ a:hover {
border: 0.5px solid black;
width: 119px;
float: left;
<<<<<<< HEAD
}
=======
text-align: center;
font-family: calibri;
}
......@@ -70,4 +74,5 @@ a:hover {
width: 360px;
margin-left: auto;
margin-right: auto;
}
\ No newline at end of file
}
>>>>>>> e4cb031f91cc3a69608d1c077166b3a49967d20f
css/login.css
+ 57
− 10
View file @ 7d67a8e1
.frame {
height: 550px;
width: 400px;
height: 450px;
border: 10px solid #02702c;
border-radius: 70px;
background-color: #8bbd3c;
color: #02702c;
}
.frame > div {
left: 10%;
width: 80%;
height: auto;
position: relative;
.login_header {
margin-top: 5%;
margin-bottom: 20%;
display: flex;
font-size: 1.7em;
}
.login_header h1 {
margin: 0px 8px;
}
.horizontal_line {
width: 45%;
height: 20px;
border-bottom: 1px solid black;
margin-left: 1%;
margin-top: 2%;
margin-right: 1%;
}
.login {
width: 80px;
height: 40px;
margin-left: 25%;
margin-right: 0px;
font-size: 1.1em;
}
.login_container {
display: inline;
position: relative;
margin-left: auto;
width: 80%;
font-size: 1.3em;
}
.form_name {
display: inline-block;
position: relative;
height: 60px;
width: 80px;
margin-right: 15px;
}
.form_field {
display: inline-block;
position: absolute;
height: 60px;
width: 250px;
}
.form_button {
display:flex;
width: 375px;
margin-top: 15%;
}
.no_account {
float: left;
margin-top: 2%;
}
.login_form {
height: 30px;
}
.register {
width: 80px;
height: 30px;
float: right;
}
\ No newline at end of file
}
css/sign_up.css 0 → 100644
+ 69
− 0
View file @ 7d67a8e1
.frame {
height: 450px;
border: 10px solid #02702c;
border-radius: 70px;
background-color: #8bbd3c;
color: #02702c;
}
.signup_header {
margin-top: 5%;
margin-bottom: 5%;
display: flex;
font-size: 1.7em;
}
.signup_header h1 {
margin: 0px 8px;
}
.horizontal_line {
width: 45%;
height: 20px;
border-bottom: 1px solid black;
margin-left: 1%;
margin-top: 2%;
margin-right: 1%;
}
.signup {
width: 100px;
height: 40px;
margin-left: 25%;
margin-right: 0px;
font-size: 1.1em;
}
.signup_container {
display: inline-block;
position: relative;
margin-left: auto;
width: 80%;
font-size: 1em;
}
.form_name {
display: inline-block;
position: relative;
height: 60px;
width: 120px;
margin-right: 15px;
}
.form_field {
display: inline-block;
position: absolute;
height: 60px;
width: 200px;
}
.form_button {
display:flex;
width: 375px;
margin-top: 15%;
}
.have_account {
float: left;
margin-top: 4%;
}
.signup_form {
display: flex;
height: 30px;
}
.driver_form {
display: flex;
margin-top: 7%;
width: 350px;
}
login/login.html
+ 30
− 18
View file @ 7d67a8e1
......@@ -6,25 +6,37 @@
<link rel="stylesheet" type="text/css" href="../css/login.css">
</head>
<body>
<div id="login_frame" class="frame">
<h2>Welcome to OneHundred<img src="../img/logo.png" style="width: 70px;height: 50px;float: right"></h2>
<p style="text-align: center">"An ojek for anything you need"</p>
<br/><br/>
<h2>--- Login ---</h2>
<p id="error_credential" style="text-align: center;"></p>
<div>
<form name="login" method="POST" action="login.php" onsubmit="return validate();">
Username
<input type="text" name="user_name"><br/>
Password
<input type="Password" name="user_password"><br/>
<input type="submit" value="Login" >
</form>
<a href="sign_up.html">Don't have an account?</a><br/>
<div class="frame">
<div class="login_header">
<div class="horizontal_line"></div>
<h1>LOGIN</h1>
<div class="horizontal_line"></div>
</div>
<p id="error_credential" style="text-align: center;"></p>
<form name="login" method="POST" action="login.php" onsubmit="return validate();">
<div class="login_container">
<div class="form_name">
<div class="login_form">
Username
</div>
<div class="login_form">
Password
</div>
</div>
<div class="form_field">
<div class="login_form">
<input type="text" name="user_name"><br/>
</div>
<div class="login_form">
<input type="Password" name="user_password"><br/>
</div>
</div>
<div class="form_button">
<a class="no_account" href="sign_up.html">Don't have an account?</a>
<input type="submit" class="button green login" value="GO!">
</div>
</div>
</form>
</div>
<script>
function validate()
......
login/sign_up.html
+ 58
− 23
View file @ 7d67a8e1
......@@ -3,33 +3,68 @@
<head>
<title>Sign Up</title>
<link rel="stylesheet" type="text/css" href="../css/default_style.css">
<link rel="stylesheet" type="text/css" href="../css/login.css">
<link rel="stylesheet" type="text/css" href="../css/sign_up.css">
</head>
<body>
<div class="frame">
<h1>-- Sign up --</h1>
<div>
<div class="signup_header">
<div class="horizontal_line"></div>
<h1>SIGNUP</h1>
<div class="horizontal_line"></div>
</div>
<form name="sign_up" method="post" action="sign_up.php" onsubmit="return validate_password();">
<p id="error_signup" style="text-align: center;"></p>
<form name="sign_up" method="post" action="sign_up.php" onsubmit="return validate_password();">
Your name*
<input type="text" name="full_name">
Username*
<input type="text" name="username" onkeyup="checkAvailability(this.name,this.value)"><label id="username_verification"></label></br>
Email*
<input type="Email" name="user_email"onkeyup="checkAvailability(this.name,this.value)"><label id="email_verification"></label></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="checkbox" name="is_driver" value="true" style="width: 20px">
<label for="chkbx_driver">Sign me up as a driver</label>
<input type="submit" class="button green register" value="REGISTER">
</form>
<p><br>* Required field</p>
</div>
<div class="signup_container">
<div class="form_name">
<div class="signup_form">
Your Name
</div>
<div class="signup_form">
Username
</div>
<div class="signup_form">
Email
</div>
<div class="signup_form">
Password
</div>
<div class="signup_form">
Confirm Password
</div>
<div class="signup_form">
Phone Number
</div>
</div>
<div class="form_field">
<div class="signup_form">
<input type="text" name="full_name">
</div>
<div class="signup_form">
<input type="text" name="username" onkeyup="checkAvailability(this.name,this.value)"><div id="username_verification" style="margin-left: 15px;"></div>
</div>
<div class="signup_form">
<input type="Email" name="user_email"onkeyup="checkAvailability(this.name,this.value)"><div id="email_verification" style="margin-left: 15px;"></div>
</div>
<div class="signup_form">
<input type="Password" name="user_password">
</div>
<div class="signup_form">
<input type="Password" name="confirm_password">
</div>
<div class="signup_form">
<input type="text" name="user_phone">
</div>
</div>
<div class="driver_form">
<input type="checkbox" name="is_driver" value="true" style="width: 30px">
<label for="is_driver">Also sign me up as a driver!</label>
</div>
<div class="form_button">
<a class="have_account" href="login.html">Already have an account?</a>
<input type="submit" class="button green signup" value="REGISTER">
</div>
</div>
</form>
</div>
<script>
function validate_password()
......
login/sign_up.php
+ 2
− 2
View file @ 7d67a8e1
......@@ -60,9 +60,9 @@
$numrows=mysqli_num_rows($query);
}
if ($numrows != 0) {
echo " X";
echo "☓";
} else {
echo " Ok";
echo "✓";
}
mysqli_close($con);
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment