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 (10)
Showing
with 1108 additions and 0 deletions
#!/usr/bin/env bash
# See https://docs.docker.com/compose/environment-variables/#the-env-file
MYSQL_HOST=mysql
MYSQL_PORT=8989
MYSQL_DATABASE=motaraido
MYSQL_ROOT_USER=root
MYSQL_ROOT_PASSWORD=root
MYSQL_USER=datafreaks
MYSQL_PASSWORD=datafreaks
\ No newline at end of file
.DS_Store
Thumbs.db
npm-debug.log
/data
/bower_components
/node_modules
/vendor
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<!-- You may freely edit this file. See commented blocks below for -->
<!-- some examples of how to customize the build. -->
<!-- (If you delete it and reopen the project it will be recreated.) -->
<!-- By default, only the Clean and Build commands use this build script. -->
<!-- Commands such as Run, Debug, and Test only use this build script if -->
<!-- the Compile on Save feature is turned off for the project. -->
<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
<!-- in the project's Project Properties dialog box.-->
<project name="HelloWeb" default="default" basedir=".">
<description>Builds, tests, and runs the project HelloWeb.</description>
<import file="nbproject/build-impl.xml"/>
<!--
There exist several targets which are by default empty and which can be
used for execution of your tasks. These targets are usually executed
before and after some main targets. They are:
-pre-init: called before initialization of project properties
-post-init: called after initialization of project properties
-pre-compile: called before javac compilation
-post-compile: called after javac compilation
-pre-compile-single: called before javac compilation of single file
-post-compile-single: called after javac compilation of single file
-pre-compile-test: called before javac compilation of JUnit tests
-post-compile-test: called after javac compilation of JUnit tests
-pre-compile-test-single: called before javac compilation of single JUnit test
-post-compile-test-single: called after javac compilation of single JUunit test
-pre-dist: called before archive building
-post-dist: called after archive building
-post-clean: called after cleaning build products
-pre-run-deploy: called before deploying
-post-run-deploy: called after deploying
Example of pluging an obfuscator after the compilation could look like
<target name="-post-compile">
<obfuscate>
<fileset dir="${build.classes.dir}"/>
</obfuscate>
</target>
For list of available properties check the imported
nbproject/build-impl.xml file.
Other way how to customize the build is by overriding existing main targets.
The target of interest are:
init-macrodef-javac: defines macro for javac compilation
init-macrodef-junit: defines macro for junit execution
init-macrodef-debug: defines macro for class debugging
do-dist: archive building
run: execution of project
javadoc-build: javadoc generation
Example of overriding the target for project execution could look like
<target name="run" depends="<PROJNAME>-impl.jar">
<exec dir="bin" executable="launcher.exe">
<arg file="${dist.jar}"/>
</exec>
</target>
Notice that overridden target depends on jar target and not only on
compile target as regular run target does. Again, for list of available
properties which you can use check the target you are overriding in
nbproject/build-impl.xml file.
-->
</project>
<%--
Document : CompleteOrder
Created on : Nov 4, 2017, 11:24:04 AM
Author : nim_13515091
--%>
<%@page contentType="text/html" pageEncoding="UTF-8"%>
<!DOCTYPE html>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</head>
<body>
<jsp:include page="HeaderWithMenu.jsp" />
<div class="edit-profile-header">
Make an order
</div>
<div class="progress-container">
<div class="progress">
<div class="progress-num">1</div> Select Destination
</div>
<div class="progress">
<div class="progress-num">2</div> Select a driver
</div>
<div class="progress selected">
<div class="progress-num selected">3</div> Complete your order
</div>
</div>
<div class="edit-profile-header">
How was it?
</div>
<form action="/order/<?php echo $this->user; ?>/completeorder/finish" method="post" name="completeorder-form">
<div class="completeorder-container">
<input type='hidden' name='driver' value='<?php echo $this->driver; ?>'>
<input type='hidden' name='from' value='<?php echo $this->from; ?>'>
<input type='hidden' name='dest' value='<?php echo $this->dest; ?>'>
<img class="driver-completeorder-pic" src="<?php echo $this->image; ?>" alt="">
<div class="driver-name-disp">@<?php echo $this->driver; ?></div>
<div class="driver-fullname-disp"><?php echo $this->drivername; ?></div>
<span class="starRating">
<input id="rating5" type="radio" name="rating" value="5">
<label for="rating5">5</label>
<input id="rating4" type="radio" name="rating" value="4">
<label for="rating4">4</label>
<input id="rating3" type="radio" name="rating" value="3">
<label for="rating3">3</label>
<input id="rating2" type="radio" name="rating" value="2">
<label for="rating2">2</label>
<input id="rating1" type="radio" name="rating" value="1">
<label for="rating1">1</label>
</span>
<textarea cols="5" placeholder="Your comment..." name="comment"></textarea>
</div>
<div class="right-align">
<input class="accept-button select-driver-btn completeorder-btn" type="submit" value="Complete&#13;&#10;Order">
</div>
</form>
<jsp:include page="Footer.jsp" />
</body>
</html>
<%--
Document : Footer
Created on : Nov 4, 2017, 11:22:37 AM
Author : nim_13515091
--%>
<%@page contentType="text/html" pageEncoding="UTF-8"%>
<!DOCTYPE html>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>JSP Page</title>
</head>
<body>
<div class="footer">
<div>Dayu <br /> 13500000</div>
<div>Marvin <br /> 1350000</div>
<div>Adrian HP <br /> 13515091</div>
</div>
</body>
</html>
<%--
Document : Header
Created on : Nov 4, 2017, 11:22:56 AM
Author : nim_13515091
--%>
<%@page contentType="text/html" pageEncoding="UTF-8"%>
<!DOCTYPE html>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>JSP Page</title>
</head>
<body>
</body>
</html>
<%--
Document : HeaderWithMenu
Created on : Nov 4, 2017, 11:23:12 AM
Author : nim_13515091
--%>
<%@page contentType="text/html" pageEncoding="UTF-8"%>
<!DOCTYPE html>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="stylesheet" href="css/profile.css"/>
<link rel="stylesheet" href="css/style.css"/>
</head>
<body>
<div>
<header class="header-box">
<div class="col-header-left">
<div>
<span class='logo-title'>MotoRaido</span><br />
<span class='tagline'>Anata to issho ni noru mōtā</span>
</div>
</div>
<div class="col-header-right">
<div>
Hi, <b><?php echo $this->user; ?></b> !
</div>
<div>
<a href="/login">Logout</a>
</div>
</div>
</header>
<div class='menu'>
<div class="menu-column"></div>
<div class="menu-column"></div>
<div class="menu-column"></div>
<div id="orderheader" class="menu-cell"><a href="/order/<?php echo $this->user; ?>" class="text-link">ORDER</a></div>
<div id="historyheader" class="menu-cell"><a href="/history/<?php echo $this->user; ?>" class="text-link">HISTORY</a></div>
<div id="profileheader" class="menu-cell"><a href="/profile/<?php echo $this->user; ?>" class="text-link">MY PROFILE</a></div>
</div>
</div>
</body>
</html>
Manifest-Version: 1.0
<%--
Document : Order
Created on : Nov 4, 2017, 11:23:35 AM
Author : nim_13515091
--%>
<%@page contentType="text/html" pageEncoding="UTF-8"%>
<!DOCTYPE html>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</head>
<body>
<jsp:include page="HeaderWithMenu.jsp" />
<div class="container">
<div class="edit-profile-header">
Make an order
</div>
<div class="progress-container">
<div class="progress selected">
<div class="progress-num">1</div> Select Destination
</div>
<div class="progress">
<div class="progress-num">2</div> Select a driver
</div>
<div class="progress">
<div class="progress-num">3</div> Complete your order
</div>
</div>
<form action="SelectDriver.jsp" method='post'>
<div class="edit-profile-btm">
<div class="form-input">
<label for="pick-point">Picking point</label>
<input class="ep-textarea" type="text" name="pick-point" />
</div>
<div class="form-input">
<label for="destination">Destination</label>
<input class="ep-textarea" type="text" name="destination" />
</div>
<div class="form-input">
<label for="pref-driver">Preferred Driver</label>
<input class="ep-textarea" type="text" name="pref-driver" placeholder="(Optional)"/>
</div>
<div class="right-align">
<input class="accept-button select-driver-btn" id="save-profile" type="submit" value="Next" />
</div>
</div>
</form>
</div>
<jsp:include page="Footer.jsp" />
</body>
</html>
<%--
Document : SelectDriver
Created on : Nov 4, 2017, 11:23:47 AM
Author : nim_13515091
--%>
<%@page contentType="text/html" pageEncoding="UTF-8"%>
<!DOCTYPE html>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</head>
<body>
<jsp:include page="HeaderWithMenu.jsp" />
<div class="edit-profile-header">
Make an order
</div>
<div class="progress-container">
<div class="progress">
<div class="progress-num">1</div> Select Destination
</div>
<div class="progress selected">
<div class="progress-num">2</div> Select a driver
</div>
<div class="progress">
<div class="progress-num">3</div> Complete your order
</div>
</div>
<div id="pref-driver" class="select-driver">
<div class= "selectdriver-header">
Preferred Drivers:
</div>
</div>
<div id="other-driver" class="select-driver">
<div class="selectdriver-header">
Other Drivers:
</div>
</div>
<script src="js/selectdriver.js"></script>
<jsp:include page="Footer.jsp" />
</body>
</html>
File added
File added
File added
File added
File added
.profile-picture {
width: 150px;
height: 150px;
border: 5px solid black;
float: left;
border-radius: 500px;
clear: both;
}
#info-profile {
margin: 20px 0px;
height: auto;
}
.edit-pen {
float: right;
height: 30px;
}
.subtitle-profile {
float: left;
width: 200px;
font-size: 2em;
font-weight: bold;
font-family: 'Mutka', sans-serif;
}
#profile-pic-div {
margin: auto;
width: 160px;
height: 160px;
}
#edit-pen-div {
margin: auto;
height: auto;
}
.subtitle-cont {
margin-bottom: 20px;
height: 37px;
}
#info-text {
margin: auto;
font-size: 1.2em;
}
#list-info {
list-style: none;
text-align: center;
padding: 0px;
}
#prefer-loc-title {
font-size: 1.5em;
width: 400px;
}
.fa-star-o{
color: red;
}
#info-pref-text {
font-size: 1.2em;
}
.subtitle-history {
float: left;
font-size: 2em;
font-weight: bold;
font-family: 'Mutka', sans-serif;
margin-top: 20px;
}
.history-pic-div {
width: 120px;
height: 120px;
margin: 0px 20px;
float: left;
}
.profile-pic-his {
width: 110px;
height: 110px;
border: 1px solid black;
float: left;
}
.history-list {
margin-top: 20px;
list-style: none;
padding: 0px;
height: auto;
}
.order-list {
display: none;
}
.driver-list {
display: none;
}
.active-list {
display:block;
}
.comment {
margin-left: 180px;
}
.hide{
width: auto;
padding: 10px 15px;
border: 1px solid black;
border-radius: 10px;
background-color: red;
position: absolute;
right: 0;
}
.his-text>span {
display: inline-block;
}
.list-text-his {
height: auto;
position: relative;
clear: both;
}
.date-his {
color: gray;
}
.name-his {
font-size: 1.2em;
}
.tab-active {
display: block;
}
.active {
color: #ffffff;
border-color: #000000;
background-color: #5A1E83;
}
.hide-element {
display: none;
}
\ No newline at end of file
@charset "UTF-8";
body {
width: 470px;
margin: auto;
font-family: 'Mutka', sans-serif;
}
textarea {
resize: none;
width: 100%;
margin-bottom: 10px;
}
/* Order Header */
.progress-container {
width: fit-content;
border-collapse:separate;
border-spacing: 10px 10px;
display: table;
}
.progress {
width: 30%;
height: 50px;
font-size: 105%;
border: 1px solid black;
text-align: left;
vertical-align: middle;
display: table-cell;
}
.progress-num {
display:inline-block;
background-color: #DDD;
width: 35px;
height: 35px;
border-radius: 100%;
margin: 0px 5px;
line-height: 200%;
text-align: center;
vertical-align: middle;
float: left;
}
.selected {
background-color: #FFFF44;
}
/* Header style */
.header-box {
height: fit-content content-box;
width: fit-content content-box;
margin-left: auto;
margin-right: auto;
margin-top: none;
margin-bottom: none;
font-family: 'Mutka', sans-serif;
column-count: 2;
-moz-column-count: 2;
-webkit-column-count: 2;
-webkit-column-span: all; /* Chrome, Safari, Opera */
column-span: all;
column-gap: 40px;
}
.col-header-left {
width: 50% content-box;
float: left;
vertical-align: middle;
}
.logo-title {
font-family: 'Geo', sans-serif;
font-weight: bold;
font-size: 250%;
color: #5A1E83;
}
.tagline {
color: #311B92;
}
.col-header-right {
width: 50% content-box;
float: right;
text-align: right;
vertical-align: middle;
line-height: 2;
}
/* Menu style */
.menu {
width: 100%;
display: table;
table-layout: fixed;
}
.menu > div.menu-column {
display: table-column;
}
.menu > div.menu-cell {
display: table-cell;
font-family: 'Mukta', sans-serif;
vertical-align: middle;
line-height: 50px;
text-align: center;
font-weight: bold;
border-style: solid;
border-width: 1px;
}
.menu > div:hover, .menu > div.selected {
color: #ffffff;
border-color: #000000;
background-color: #5A1E83;
}
/* Footer style */
.footer {
column-count: 3;
-moz-column-count: 3;
-webkit-column-count: 3;
-webkit-column-span: all;
column-span: all;
-moz-column-gap: 2em;
-webkit-column-gap: 2em;
column-gap: 1.5em;
column-rule-style: solid;
border-style: solid;
border-width: 2px;
}
.footer > div {
width: fit-content content-box;
text-align: center;
font-weight: bold;
font-family: 'Mukta', sans-serif;
vertical-align: middle;
}
.img-chooser {
padding-top: 20px;
}
.text-link {
text-decoration: none;
font-size: 120%;
font-weight: bold;
color: black;
}
/* Container */
.container {
width: inherit;
}
.header {
line-height: 1.5;
text-transform: uppercase;
}
.selectdriver-header {
text-transform: uppercase;
font-weight: bold;
}
.edit-profile-container {
font-family: Verdana;
}
.edit-profile-header {
text-transform: uppercase;
font-weight: bold;
width: 100%;
font-size: 170%;
}
.edit-profile-btm {
clear: both;
}
.form-editprofile{
margin: 5px 0;
}
.ep-textarea{
width: 60%;
float: right;
clear: both;
}
.content-layout {
background-color: rgb(124, 206, 43);
padding: 50px;
border: 10px solid rgb(10, 127, 10);
border-radius: 100px;
width: 350px;
}
.title {
height: 27px;
padding: 0px 20px;
}
.title>div>h1 {
text-align: center;
margin-top: 0px;
width: 100px;
float: left;
}
.title>div>hr {
float:left;
position: relative;
width: 100px;
top: 5px;
background-color: rgb(10, 127, 10);
height: 5px;
border: none;
}
.form-layout {
clear: left;
}
.form-input {
width: 350px;
margin-bottom: 5px;
}
.form-input>div {
float: left;
width: 135px;
}
.form-input>input {
width: 198px;
}
.checked-input>input {
width: 170px;
}
.driver-checkbox {
margin: 20px 0px;
}
.driver-checkbox>input {
float: left;
margin-left: 0px;
}
.cancel-button {
width: 75px;
height: 30px;
text-align: center;
text-transform: uppercase;
letter-spacing: 1px;
border: 1px solid black;
background-color: #D2002E;
border-radius: 10px;
}
.accept-button {
width: 75px;
height: 30px;
text-transform: uppercase;
letter-spacing: 1px;
border: 1px solid black;
background-color: #83D535;
border-radius: 10px;
}
.driver-completeorder-pic {
height: 100px;
width: 100px;
margin: 10px;
border-radius: 100%;
border: 3px solid #5A1E83;
}
.completeorder-container {
text-align: center;
clear: both;
}
.right-align {
width: 100%;
text-align: right;
}
.driver-fullname-disp {
font-size: 105%;
font-weight: bold;
margin-top: 5px;
}
/*Select driver*/
.select-driver {
width: auto;
padding: 0 10px;
border-radius: 12px;
border: 1px solid black;
margin: 10px 0;
}
.driver-content {
height: 120px;
overflow: hidden;
}
.driver-pic {
height: 100px;
width: 100px;
margin: 10px;
border-radius: 100%;
border: 3px solid #5A1E83;
float: left;
}
.driver-name-disp {
font-size: 160%;
font-weight: bold;
margin-top: 10px;
}
.driver-rating-disp {
color: orange;
font-size: 110%;
}
.driver-not-found {
color: grey;
height: 70px;
text-align: center;
text-transform: none;
line-height: 70px;
vertical-align: middle;
}
.vote-disp {
color: black;
}
.select-driver-btn {
width: auto;
color: white;
background-color: #5A1E83;
letter-spacing: 0.5px;
float: right;
}
.order-btn {
float: none;
clear: both;
}
#profile-pic {
width: 150px;
height: 150px;
border: 1px solid black;
float: left;
margin-right: 25px;
margin-bottom: 30px;
}
#save-profile {
float: right;
margin-right: 120px;
}
#register-button {
background-color: #4CAF50;
border: 5px solid rgb(10, 127, 10);
border-radius: 20px;
color: white;
padding: 15px 32px;
text-align: center;
text-decoration: none;
display: inline-block;
font-size: 16px;
margin: 4px 2px;
cursor: pointer;
}
#button-layout>div {
float: left;
width: 200px;
height: 66px;
}
#button-layout a {
position: relative;
top: 20px;
}
.button-form {
text-align: right;
width: 350px;
}
.button-form div {
float: left;
}
.completeorder-btn {
width: 100px;
height: 50px;
float: none;
}
/* The switch - the box around the slider */
.switch {
position: relative;
display: inline-block;
width: 50px;
height: 25px;
}
/* Hide default HTML checkbox */
.switch input {display:none;}
/* The slider */
.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: 19px;
width: 19px;
left: 4px;
bottom: 3px;
background-color: white;
-webkit-transition: .4s;
transition: .4s;
}
input:checked + .slider {
background-color: #1E7B25;
}
input:focus + .slider {
box-shadow: 0 0 1px #1E7B25;
}
input:checked + .slider:before {
-webkit-transform: translateX(23px);
-ms-transform: translateX(23px);
transform: translateX(23px);
}
/* Rounded sliders */
.slider.round {
border-radius: 34px;
}
.slider.round:before {
border-radius: 50%;
}
/* Menu Order */
.menu-order {
height: 100%;
width: 100%;
position: relative;
font-size: 12px;
border-spacing: 20px 12px;
}
.menu-order-column {
height: 100%;
}
.menu-order-cell {
display: table-cell;
position: relative;
text-align: left;
font-weight: bold;
}
.menu-order-number
{
position: relative;
display: block;
width: 50px;
height: 50px;
border-radius: 25px; /* or 50% */
text-align: center;
margin-left: auto;
margin-right: auto;
background-color: #311B92;
color: #ffffff;
line-height: 50px;
}
.menu-order-title
{
position: relative;
display: inline-block;
}
#next-button-text {
line-height: 20px;
width: 75%;
padding-right: 1px;
}
input.next-button {
width: 20%;
height: 30px;
line-height: 20px;
text-transform: uppercase;
letter-spacing: 1px;
border: 1px solid black;
background-color: #83D535;
border-radius: 10px;
display: inline-block;
}
table, th, td {
table-layout: auto !important;
width: 100% auto !important;
max-width:100%;
white-space:nowrap;
border: 1px solid black;
border-collapse: collapse;
}
.pref-button {
width: 21px;
height: 21px;
vertical-align: middle;
border: none;
display: inline-block;
}
/** Rating **/
.starRating:not(old){
display : inline-block;
width : 7.5em;
height : 1.5em;
overflow : hidden;
vertical-align : bottom;
}
.starRating:not(old) > input{
margin-right : -100%;
opacity : 0;
}
.starRating:not(old) > label{
display : block;
float : right;
position : relative;
background : url('../img/star-off.svg');
background-size : contain;
}
.starRating:not(old) > label:before{
content : '';
display : block;
width : 1.5em;
height : 1.5em;
background : url('../img/star-on.svg');
background-size : contain;
opacity : 0;
transition : opacity 0.2s linear;
}
.starRating:not(old) > label:hover:before,
.starRating:not(old) > label:hover ~ label:before,
.starRating:not(:hover) > :checked ~ label:before{
opacity : 1;
}
/* Font customization */
/* latin */
@font-face {
font-family: 'Geo';
font-style: normal;
font-weight: 400;
src: local('Geo'), local('Geo-Regular'), url(./fonts/geo.woff2) format('woff2');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215;
}
/* devanagari */
@font-face {
font-family: 'Mukta';
font-style: normal;
font-weight: 400;
src: local('Mukta Regular'), local('Mukta-Regular'), url(./fonts/mukta1.woff2) format('woff2');
unicode-range: U+02BC, U+0900-097F, U+1CD0-1CF6, U+1CF8-1CF9, U+200B-200D, U+20A8, U+20B9, U+25CC, U+A830-A839, U+A8E0-A8FB;
}
/* latin-ext */
@font-face {
font-family: 'Mukta';
font-style: normal;
font-weight: 400;
src: local('Mukta Regular'), local('Mukta-Regular'), url(./fonts/mukta1.woff2) format('woff2');
unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF;
}
/* latin */
@font-face {
font-family: 'Mukta';
font-style: normal;
font-weight: 400;
src: local('Mukta Regular'), local('Mukta-Regular'), url(./fonts/mukta1.woff2) format('woff2');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215;
}