Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
No results found
Show changes
Commits on Source (1)
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 826 additions and 0 deletions
.gitignore 0 → 100755
View file @ 9dc132c1
# Created by .ignore support plugin (hsz.mobi)
### Java template
# Compiled class file
*.class
# Log file
*.log
# BlueJ files
*.ctxt
# Mobile Tools for Java (J2ME)
.mtj.tmp/
# Package Files #
*.jar
*.war
*.ear
*.zip
*.tar.gz
*.rar
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
### JetBrains template
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
# User-specific stuff:
.idea/**/workspace.xml
.idea/**/tasks.xml
.idea/dictionaries
# Sensitive or high-churn files:
.idea/**/dataSources/
.idea/**/dataSources.ids
.idea/**/dataSources.xml
.idea/**/dataSources.local.xml
.idea/**/sqlDataSources.xml
.idea/**/dynamic.xml
.idea/**/uiDesigner.xml
# Gradle:
.idea/**/gradle.xml
.idea/**/libraries
# Mongo Explorer plugin:
.idea/**/mongoSettings.xml
## File-based project format:
*.iws
## Plugin-specific files:
# IntelliJ
/out/
# mpeltonen/sbt-idea plugin
.idea_modules/
# JIRA plugin
atlassian-ide-plugin.xml
# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties
fabric.properties
### Example user template template
### Example user template
# IntelliJ project files
.idea
*.iml
out
gen
/arsitektur_umum.png
/test/
src/NavServlet.java 0 → 100644
View file @ 9dc132c1
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
public class NavServlet extends HttpServlet {
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
String page = request.getParameter("page");
RequestDispatcher dispatcher = request.getRequestDispatcher("/WEB-INF/" + page + ".jsp");
dispatcher.forward(request, response);
}
}
web/WEB-INF/login.jsp 0 → 100644
View file @ 9dc132c1
<%--
Created by IntelliJ IDEA.
User: iqbal
Date: 04/11/17
Time: 16:01
To change this template use File | Settings | File Templates.
--%>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ taglib uri = "http://java.sun.com/jsp/jstl/core" prefix = "c" %>
<html>
<head>
<title>OJOL | Login</title>
<link rel="stylesheet" type="text/css" href="<c:url value='/resource/login-register.css'/>">
</head>
<body>
<form method="post" action="http://localhost:8080/ojol/login">
<div class="login-container">
<div class="row">
<div class="col-6 text-center">
<h1 style="color: #007c30; font-size: 3em">LOGIN</h1><br>
</div>
</div>
<br>
<br>
<div class="row">
<div class="col-2">
<span style="font-size: 1.3em; line-height: 40px">Username</span>
</div>
<div class="col-4">
<input style="margin-left:10px; width:95%; height: 30px; padding-left: 5px" class="login-input" type="text" placeholder="Username" name="username">
</div>
</div>
<div class="row">
<div class="col-2">
<span style="font-size: 1.3em; line-height: 40px">Password</span>
</div>
<div class="col-4">
<input style="margin-left:10px;width:95%;height: 30px; padding-left: 5px" class="login-input" type="password" placeholder="Password" name="password">
</div>
</div>
<br>
<br>
<br>
<div class="row">
<div class="col-4 text-left">
<a style="float: left; font-size: 0.8em" class="login-link" href="nav?page=register">Don't have an account?</a>
</div>
<div class="col-2 text-right">
<input class="btn login-button" type="submit" value="GO!">
</div>
</div>
<br>
<br>
<br>
<br>
</div>
</form>
</body>
</html>
web/WEB-INF/register.jsp 0 → 100644
View file @ 9dc132c1
<%--
Created by IntelliJ IDEA.
User: iqbal
Date: 04/11/17
Time: 16:52
To change this template use File | Settings | File Templates.
--%>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ taglib uri = "http://java.sun.com/jsp/jstl/core" prefix = "c" %>
<html>
<head>
<title>OJOL | Register</title>
<link rel="stylesheet" type="text/css" href="<c:url value='/resource/login-register.css'/>">
</head>
<body>
<form id="register-form" method="post" action="http://localhost:8080/ojol/register">
<div class="login-container" style="max-width: 400px">
<div class="row">
<div class="col-6 text-center">
<h1 style="color: #007c30; font-size: 3em">SIGN UP</h1><br>
</div>
</div>
<div class="row">
<div class="col-2">
<span style="font-size: 1em; line-height: 35px">Your Name</span>
</div>
<div class="col-4">
<input style="margin-left:10px; width:95%; height: 30px; padding-left: 5px" type="text" placeholder="Your name" id="name" name="fullname">
</div>
</div>
<div class="row">
<div class="col-2">
<span style="font-size: 1em; line-height: 35px">Username</span>
</div>
<div class="col-4">
<input style="margin-left:10px; width:95%; height: 30px; padding-left: 5px" id="username" type="text" placeholder="Username" name="username">
<%--<img id="username-status" src="<c:url value='/resource/img/ic_close.png'/>" width="15">--%>
</div>
</div>
<div class="row">
<div class="col-2">
<span style="font-size: 1em; line-height: 35px">Email</span>
</div>
<div class="col-4">
<input style="margin-left:10px; width:95%; height: 30px; padding-left: 5px" id="email" type="email" placeholder="Email address" name="email">
<%--<img id="email-status" src="<c:url value='/resource/img/ic_close.png'/>" width="15">--%>
</div>
</div>
<div class="row">
<div class="col-2">
<span style="font-size: 1em; line-height: 35px">Password</span>
</div>
<div class="col-4">
<input style="margin-left:10px; width:95%; height: 30px; padding-left: 5px" type="password" placeholder="Password" id="password" name="password">
</div>
</div>
<div class="row">
<div class="col-2">
<span style="font-size: 1em; line-height: 35px">Confirm Password</span>
</div>
<div class="col-4">
<input style="margin-left:10px; width:95%; height: 30px; padding-left: 5px" type="password" placeholder="Confirm password" id="confirm-password" name="confirm-password">
</div>
</div>
<div class="row">
<div class="col-2">
<span style="font-size: 1em; line-height: 35px">Phone Number</span>
</div>
<div class="col-4">
<input style="margin-left:10px; width:95%; height: 30px; padding-left: 5px" type="number" placeholder="Phone number" id="phone" name="phone">
</div>
</div>
<br>
<div class="row">
<div class="col-6">
<input class="checkbox" id="driver-ckbox" type="checkbox" value="is-driver" name="is_driver"> Also sign me up as a driver!
</div>
</div>
<br>
<div class="row">
<div class="col-6">
<a class="register-link" href="nav?page=login">Already have an account?</a>
<input class="btn login-button" id="sign-up-btn" type="submit" value="Sign up" disabled>
</div>
</div>
<br>
<br>
<br>
<br>
<br>
<br>
</div>
</form>
<script type="application/javascript" src="<c:url value='/resource/login-register.js'/>"></script>
</body>
</html>
\ No newline at end of file
web/WEB-INF/web.xml 0 → 100644
View file @ 9dc132c1
<?xml version="1.0" encoding="UTF-8"?>
<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
version="3.1">
<servlet>
<servlet-name>NavServlet</servlet-name>
<servlet-class>NavServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>NavServlet</servlet-name>
<url-pattern>/nav</url-pattern>
</servlet-mapping>
</web-app>
\ No newline at end of file
web/index.jsp 0 → 100644
View file @ 9dc132c1
<%--
Created by IntelliJ IDEA.
User: iqbal
Date: 08/11/17
Time: 13:51
To change this template use File | Settings | File Templates.
--%>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<html>
<head>
<title>$Title$</title>
</head>
<body>
<%
RequestDispatcher dispatcher = request.getRequestDispatcher("/WEB-INF/login.jsp");
dispatcher.forward(request, response);
%>
$END$
</body>
</html>
web/resource/font/typicons.eot 0 → 100755
View file @ 9dc132c1
File added
web/resource/font/typicons.svg 0 → 100755
View file @ 9dc132c1
This diff is collapsed.
web/resource/font/typicons.ttf 0 → 100755
View file @ 9dc132c1
File added
web/resource/font/typicons.woff 0 → 100755
View file @ 9dc132c1
File added
web/resource/img/empty_profile.png 0 → 100755
View file @ 9dc132c1
web/resource/img/empty_profile.png

31.9 KiB

web/resource/img/ic_check.png 0 → 100755
View file @ 9dc132c1
web/resource/img/ic_check.png

5.13 KiB

web/resource/img/ic_close.png 0 → 100755
View file @ 9dc132c1
web/resource/img/ic_close.png

7.83 KiB

web/resource/img/ic_edit.jpg 0 → 100755
View file @ 9dc132c1
web/resource/img/ic_edit.jpg

1.52 KiB

web/resource/img/ic_save.png 0 → 100755
View file @ 9dc132c1
web/resource/img/ic_save.png

2.38 KiB

web/resource/img/ic_triangle.png 0 → 100755
View file @ 9dc132c1
web/resource/img/ic_triangle.png

395 B

web/resource/img/logo.jpg 0 → 100755
View file @ 9dc132c1
web/resource/img/logo.jpg

22.8 KiB

web/resource/login-register.css 0 → 100755
View file @ 9dc132c1
/* ------------------------- GENERAL -------------------------*/
body {
background-color: #F5F5F5;
font-family: KacstOffice, sans-serif;
}
.container {
width: 80%;
max-width: 700px;
margin: 50px auto;
background-color: white;
padding: 20px;
border-radius: 5px;
}
.row:before,
.row:after {
content: "";
display: table;
clear: both;
}
[class*='col-'] {
float: left;
min-height: 1px;
width: 16.66%;
}
.col-1 {
width: 16.66%;
}
.col-2 {
width: 33.33%;
}
.col-3 {
width: 50%;
}
.col-4 {
width: 66.66%;
}
.col-5 {
width: 83.33%;
}
.col-6 {
width: 100%;
}
.text-left {
text-align: left;
}
.text-right {
text-align: right;
}
.text-center {
text-align: center;
}
.text-orange {
color: orange;
}
.btn {
border-radius: 5px;
border: 1px solid black;
padding: 5px 15px;
color: black;
text-decoration: none;
font-size: medium;
}
.red {
background-color: #DA0000;
}
.green {
background-color: #58F100;
}
.line-height-medium {
line-height: 30px;
}
/* ------------------------- HEADER -------------------------*/
.logo:after {
background-image: url('/resource/img/logo.jpg');
background-size: 210px 40px;
display: inline-block;
width: 210px;
height: 40px;
content: "";
margin-bottom: 5px;
}
.user-action {
margin-top: 0px;
}
.tab {
outline: 1px solid #004D40;
padding-top: 15px;
padding-bottom: 15px;
font-weight: 900;
color: black;
text-decoration: none;
}
.tab.active {
background-color: #426344;
color: #FAFAFA;
}
.tab:hover {
background-color: #426344;
color: #FAFAFA;
}
/* ------------------------- ICON -------------------------*/
@font-face {
font-family: 'icon';
src: url("/resource/font/typicons.eot");
src: url("/resource/font/typicons.eot?#iefix") format('embedded-opentype'),
url("/resource/font/typicons.woff") format('woff'),
url("/resource/font/typicons.ttf") format('truetype'),
url("/resource/font/typicons.svg#typicons") format('svg');
font-weight: normal;
font-style: normal;
}
.icon:before {
font-family: 'icon';
font-style: normal;
font-weight: normal;
speak: none;
display: inline-block;
text-decoration: inherit;
width: 1em;
height: 1em;
font-size: 1em;
text-align: center;
-webkit-font-smoothing: antialiased;
font-smoothing: antialiased;
text-rendering: optimizeLegibility
}
.icon.big {
font-size: 3em;
color: #c2c2c2;
}
.icon.icon-mail:before {
content: '\e0a5'
}
.icon.icon-phone:before {
content: '\e0c5'
}
.icon.icon-star:before {
content: '\e108'
}
.icon.icon-star-full:before{
content:'\e105'
}
/* ------------------------- PROFIL -------------------------*/
.img-circle {
width: 170px;
height: 170px;
border-radius: 50%;
border: 3px solid black;
}
.img-profile {
width: 130px;
height: 130px;
outline: 3px solid black;
}
.profil > p {
line-height: 50%;
}
.location-list {
line-height: 1.9em;
list-style-image: url('/resource/img/ic_triangle.png');
}
.edit:after {
background-image: url('/resource/img/ic_edit.jpg');
background-size: 45px 45px;
display: inline-block;
width: 45px;
height: 45px;
content: "";
}
a.edit:after {
margin: 15px;
}
table {
border-collapse: collapse;
}
table, th, td {
border: 1px solid #c2c2c2;
}
.action-edit {
background-image: url('/resource/img/ic_edit.jpg');
background-size: 25px 25px;
display: inline-block;
width: 25px;
height: 20px;
content: "";
margin-right: 10px;
cursor: pointer;
}
.action-save {
background-image: url('/resource/img/ic_edit.jpg');
background-size: 25px 25px;
display: inline-block;
width: 25px;
height: 20px;
content: "";
margin-right: 10px;
cursor: pointer;
}
.action-delete {
background-image: url('/resource/img/ic_close.png');
background-size: 17px 17px;
display: inline-block;
width: 17px;
height: 17px;
content: "";
}
/* The switch - the box around the slider */
.switch {
position: relative;
display: inline-block;
width: 40px;
height: 22px;
}
/* Hide default HTML checkbox */
.switch input {display:none;}
.slider {
position: absolute;
cursor: pointer;
top: 0;
left: 0;
right: 0;
bottom: 0;
background-color: #ccc;
-webkit-transition: .4s;
transition: .4s;
}
.slider:before {
position: absolute;
content: "";
height: 15px;
width: 15px;
left: 4px;
bottom: 4px;
background-color: white;
-webkit-transition: .4s;
transition: .4s;
}
input:checked + .slider {
background-color: #008C14;
}
input:focus + .slider {
box-shadow: 0 0 1px #008C14;
}
input:checked + .slider:before {
-webkit-transform: translateX(17px);
-ms-transform: translateX(17px);
transform: translateX(17px);
}
.slider.round {
border-radius: 22px;
}
.slider.round:before {
border-radius: 50%;
}
.input-photo {
width: 0.1px;
height: 0.1px;
opacity: 0;
overflow: hidden;
position: absolute;
z-index: -1;
}
.input-photo + label {
display: inline-block;
cursor: pointer;
width: 100%;
line-height: 33px;
}
.input-photo + label > .input-photo-button {
color: black;
float: right;
font-size: 0.75em;
width: 27%;
background-color: #ccc;
text-align: center;
}
.input-photo + label > .input-photo-result {
float: left;
font-size: 0.75em;
width: 70%;
height: 32px;
padding-left: 5px;
border: solid 1px black;
margin-right: 2px;
}
.input-photo:focus + label > .input-photo-button,
.input-photo + label > .input-photo-button:hover {
background-color: #999aa3;
}
.input-photo:focus + label > .input-photo-button {
outline: 1px dotted #000;
outline: -webkit-focus-ring-color auto 5px;
}
/* ------------------------- ORDER -------------------------*/
.small-circle {
width: 30px;
height: 30px;
border-radius: 50%;
background-color: #c2c2c2;
font-size: large;
vertical-align: middle;
margin: 0;
}
.page-tab {
width: 180px;
height: 50px;
border: 1px solid black;
margin: 0 auto;
display: table;
box-sizing: border-box;
vertical-align: middle;
}
.page-tab.selected {
background-color: #f4fe96;
}
.page-tab > .page-tab-image {
float: left;
width: 30%;
height:100%;
text-align: center;
position: relative;
display: flex;
flex-direction: column;
justify-content: center;
}
.page-tab >.page-tab-image >.circle {
border-radius: 50%;
width: 40px;
height: 40px;
margin: auto;
background-color: #d7d7d7;
padding: auto;
text-align: center;
display: flex;
flex-direction: column;
justify-content: center;
}
.page-tab > .page-tab-content {
float: right;
width: 70%;
height:100%;
display: inline-block;
display: flex;
flex-direction: column;
justify-content: center;
}
/* Login Page */
.login-input {
margin: 5px 0 5px 0;
}
.login-link {
float: right;
margin-top: 10px;
}
.login-button {
padding: 10px 20px;
background-color: #58f100;
}
.login-container {
width: 60%;
max-width: 300px;
margin: 50px auto;
background-color: #74d034;
padding-left: 30px;
padding-right: 30px;
border-radius: 50px;
border: solid 10px #007c30;
color: #007c30;
}
/* Register Page */
#sign-up-btn {
float: right;
}
.register-link {
float: left;
margin-top: 8px;
}
.checkbox {
margin: 10px 0 10px 0;
}
.available {
background-color: greenyellow;
}
.unavailable, .empty-required, .not-match {
background-color: orangered;
}
.not-match::-webkit-input-placeholder, .empty-required::-webkit-input-placeholder, .unavailable::-webkit-input-placeholder {
color: whitesmoke;
}
\ No newline at end of file
web/resource/login-register.js 0 → 100755
View file @ 9dc132c1
function checkRequiredField(elmtID) {
var field = document.getElementById(elmtID);
if (field.value === "") {
field.classList.add("empty-required");
return false;
} else {
field.classList.remove("empty-required");
return true;
}
}
var isNameFilled = false;
var isUsernameFilled = false;
var isPasswordFilled = false;
var isEmailFilled = false;
var isPhoneFilled = false;
var isPasswordMatch = false;
document.getElementById("confirm-password").onkeyup = function () {
var confirmField = document.getElementById("confirm-password");
var passwordField = document.getElementById("password");
if (confirmField.value !== passwordField.value) {
confirmField.classList.add("not-match");
passwordField.classList.add("not-match");
isPasswordMatch = false;
} else {
confirmField.classList.remove("not-match");
passwordField.classList.remove("not-match");
isPasswordMatch = true;
}
};
document.getElementById("name").onkeyup = function () {
isNameFilled = checkRequiredField("name");
};
document.getElementById("username").onkeyup = function () {
isUsernameFilled = checkRequiredField("username");
};
document.getElementById("password").onkeyup = function () {
isPasswordFilled = checkRequiredField("password");
};
document.getElementById("email").onkeyup = function () {
isEmailFilled = checkRequiredField("email");
};
document.getElementById("phone").onkeyup = function () {
isPhoneFilled = checkRequiredField("phone");
};
document.getElementById("register-form").onkeyup = function () {
var submitBtn = document.getElementById("sign-up-btn");
if (isNameFilled &&
isUsernameFilled &&
isPasswordFilled &&
isEmailFilled &&
isPhoneFilled &&
isPasswordMatch) {
submitBtn.removeAttribute("disabled");
} else {
submitBtn.setAttribute("disabled", "true");
}
};
\ No newline at end of file