diff --git a/HelloWeb/build/web/WEB-INF/classes/.netbeans_automatic_build b/HelloWeb/build/web/WEB-INF/classes/.netbeans_automatic_build
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/HelloWeb/build/web/WEB-INF/classes/.netbeans_update_resources b/HelloWeb/build/web/WEB-INF/classes/.netbeans_update_resources
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/HelloWeb/build/web/WEB-INF/classes/controller/ControllerServlet.class b/HelloWeb/build/web/WEB-INF/classes/controller/ControllerServlet.class
deleted file mode 100644
index 09c237e97de8d507182b3f8b330b3a93a29e5ec1..0000000000000000000000000000000000000000
Binary files a/HelloWeb/build/web/WEB-INF/classes/controller/ControllerServlet.class and /dev/null differ
diff --git a/HelloWeb/build/web/WEB-INF/classes/org/mypackage/hello/NameHandler.class b/HelloWeb/build/web/WEB-INF/classes/org/mypackage/hello/NameHandler.class
deleted file mode 100644
index c9e8c8d051dd25f65ce84513b67d78227225a499..0000000000000000000000000000000000000000
Binary files a/HelloWeb/build/web/WEB-INF/classes/org/mypackage/hello/NameHandler.class and /dev/null differ
diff --git a/HelloWeb/build/web/gfv3ee6.dpf b/HelloWeb/build/web/gfv3ee6.dpf
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/HelloWeb/src/conf/MANIFEST.MF b/HelloWeb/src/conf/MANIFEST.MF
deleted file mode 100644
index 59499bce4a2bd51cba227b7c00fcf745b19c95a4..0000000000000000000000000000000000000000
--- a/HelloWeb/src/conf/MANIFEST.MF
+++ /dev/null
@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-
diff --git a/HelloWeb/web/WEB-INF/jspf/Footer.jspf b/HelloWeb/web/WEB-INF/jspf/Footer.jspf
deleted file mode 100644
index 36ed5dbf6284e479dd45458c0d432e3f70ab3b6b..0000000000000000000000000000000000000000
--- a/HelloWeb/web/WEB-INF/jspf/Footer.jspf
+++ /dev/null
@@ -1,7 +0,0 @@
- <div class="footer">
- <div>Dayu <br /> 13500000</div>
- <div>Marvin <br /> 1350000</div>
- <div>Adrian HP <br /> 13515091</div>
- </div>
- </body>
-</html>
diff --git a/HelloWeb/web/WEB-INF/jspf/Header.jspf b/HelloWeb/web/WEB-INF/jspf/Header.jspf
deleted file mode 100644
index 08500a2b6d688079f46e1977239da737a060a4f9..0000000000000000000000000000000000000000
--- a/HelloWeb/web/WEB-INF/jspf/Header.jspf
+++ /dev/null
@@ -1,41 +0,0 @@
-<%--
- 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>
\ No newline at end of file
diff --git a/HelloWeb/web/WEB-INF/view/CompleteOrder.jsp b/HelloWeb/web/WEB-INF/view/CompleteOrder.jsp
deleted file mode 100644
index 9ac61413d2afd552640f07890dae353e0569ab09..0000000000000000000000000000000000000000
--- a/HelloWeb/web/WEB-INF/view/CompleteOrder.jsp
+++ /dev/null
@@ -1,43 +0,0 @@
-<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 Order">
- </div>
-</form>
\ No newline at end of file
diff --git a/HelloWeb/web/WEB-INF/view/Order.jsp b/HelloWeb/web/WEB-INF/view/Order.jsp
deleted file mode 100644
index 90e429e371cc87c4bc15e6e5ae64f728cf05a730..0000000000000000000000000000000000000000
--- a/HelloWeb/web/WEB-INF/view/Order.jsp
+++ /dev/null
@@ -1,35 +0,0 @@
-<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>
\ No newline at end of file
diff --git a/HelloWeb/web/WEB-INF/view/SelectDriver.jsp b/HelloWeb/web/WEB-INF/view/SelectDriver.jsp
deleted file mode 100644
index d8106748f411b9c73c53488a6929904b0faa165b..0000000000000000000000000000000000000000
--- a/HelloWeb/web/WEB-INF/view/SelectDriver.jsp
+++ /dev/null
@@ -1,25 +0,0 @@
-<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>
\ No newline at end of file
diff --git a/HelloWeb/web/WEB-INF/web.xml b/HelloWeb/web/WEB-INF/web.xml
deleted file mode 100644
index 049039080d0056c6d56999a779d0866d8f8d98e9..0000000000000000000000000000000000000000
--- a/HelloWeb/web/WEB-INF/web.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app version="3.1" 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">
- <session-config>
- <session-timeout>
- 30
- </session-timeout>
- </session-config>
- <jsp-config>
- <jsp-property-group>
- <description>header and footer setting</description>
- <url-pattern>/index.jsp</url-pattern>
- <url-pattern>/WEB-INF/view/*</url-pattern>
- <include-prelude>/WEB-INF/jspf/Header.jspf</include-prelude>
- <include-coda>/WEB-INF/jspf/Footer.jspf</include-coda>
- </jsp-property-group>
- </jsp-config>
-</web-app>
diff --git a/HelloWeb/web/index.jsp b/HelloWeb/web/index.jsp
deleted file mode 100644
index 2b172800278557aa1e28a1c6deb714e1fad2aa5e..0000000000000000000000000000000000000000
--- a/HelloWeb/web/index.jsp
+++ /dev/null
@@ -1,23 +0,0 @@
-<%--
- Document : index
- Created on : Nov 4, 2017, 9:23:05 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>
- <h1>Hello World!</h1>
-
- <form name="Name Input Form" action="/HelloWeb/Order" method='post'>
- Enter Your Name:
- <input type="text" name="name" value="" />
- <input type="submit" value="OK" />
- </form>
- </body>
-</html>
diff --git a/docker-compose.yml b/Tubes1/docker-compose.yml
similarity index 100%
rename from docker-compose.yml
rename to Tubes1/docker-compose.yml
diff --git a/etc/nginx/default.conf b/Tubes1/etc/nginx/default.conf
similarity index 100%
rename from etc/nginx/default.conf
rename to Tubes1/etc/nginx/default.conf
diff --git a/etc/php/php.ini b/Tubes1/etc/php/php.ini
similarity index 100%
rename from etc/php/php.ini
rename to Tubes1/etc/php/php.ini
diff --git a/mocks/complete-order.PNG b/Tubes1/mocks/complete-order.PNG
similarity index 100%
rename from mocks/complete-order.PNG
rename to Tubes1/mocks/complete-order.PNG
diff --git a/mocks/edit-preferred-location.PNG b/Tubes1/mocks/edit-preferred-location.PNG
similarity index 100%
rename from mocks/edit-preferred-location.PNG
rename to Tubes1/mocks/edit-preferred-location.PNG
diff --git a/mocks/edit-profile.PNG b/Tubes1/mocks/edit-profile.PNG
similarity index 100%
rename from mocks/edit-profile.PNG
rename to Tubes1/mocks/edit-profile.PNG
diff --git a/mocks/history-driver.PNG b/Tubes1/mocks/history-driver.PNG
similarity index 100%
rename from mocks/history-driver.PNG
rename to Tubes1/mocks/history-driver.PNG
diff --git a/mocks/history-penumpang.PNG b/Tubes1/mocks/history-penumpang.PNG
similarity index 100%
rename from mocks/history-penumpang.PNG
rename to Tubes1/mocks/history-penumpang.PNG
diff --git a/mocks/login.PNG b/Tubes1/mocks/login.PNG
similarity index 100%
rename from mocks/login.PNG
rename to Tubes1/mocks/login.PNG
diff --git a/mocks/order-ojek.PNG b/Tubes1/mocks/order-ojek.PNG
similarity index 100%
rename from mocks/order-ojek.PNG
rename to Tubes1/mocks/order-ojek.PNG
diff --git a/mocks/profile.PNG b/Tubes1/mocks/profile.PNG
similarity index 100%
rename from mocks/profile.PNG
rename to Tubes1/mocks/profile.PNG
diff --git a/mocks/register.PNG b/Tubes1/mocks/register.PNG
similarity index 100%
rename from mocks/register.PNG
rename to Tubes1/mocks/register.PNG
diff --git a/mocks/select-driver.PNG b/Tubes1/mocks/select-driver.PNG
similarity index 100%
rename from mocks/select-driver.PNG
rename to Tubes1/mocks/select-driver.PNG
diff --git a/motaraido.sql b/Tubes1/motaraido.sql
similarity index 100%
rename from motaraido.sql
rename to Tubes1/motaraido.sql
diff --git a/src/app/Core/Config.php b/Tubes1/src/app/Core/Config.php
similarity index 100%
rename from src/app/Core/Config.php
rename to Tubes1/src/app/Core/Config.php
diff --git a/src/app/Core/Database/Connector.php b/Tubes1/src/app/Core/Database/Connector.php
similarity index 100%
rename from src/app/Core/Database/Connector.php
rename to Tubes1/src/app/Core/Database/Connector.php
diff --git a/src/app/Core/Database/Encryption.php b/Tubes1/src/app/Core/Database/Encryption.php
similarity index 100%
rename from src/app/Core/Database/Encryption.php
rename to Tubes1/src/app/Core/Database/Encryption.php
diff --git a/src/app/Core/Database/Query.php b/Tubes1/src/app/Core/Database/Query.php
similarity index 100%
rename from src/app/Core/Database/Query.php
rename to Tubes1/src/app/Core/Database/Query.php
diff --git a/src/app/Core/ErrorMessage.php b/Tubes1/src/app/Core/ErrorMessage.php
similarity index 100%
rename from src/app/Core/ErrorMessage.php
rename to Tubes1/src/app/Core/ErrorMessage.php
diff --git a/src/app/Core/Route.php b/Tubes1/src/app/Core/Route.php
similarity index 100%
rename from src/app/Core/Route.php
rename to Tubes1/src/app/Core/Route.php
diff --git a/src/app/Core/View.php b/Tubes1/src/app/Core/View.php
similarity index 100%
rename from src/app/Core/View.php
rename to Tubes1/src/app/Core/View.php
diff --git a/src/app/Login/Login.routes.php b/Tubes1/src/app/Login/Login.routes.php
similarity index 100%
rename from src/app/Login/Login.routes.php
rename to Tubes1/src/app/Login/Login.routes.php
diff --git a/src/app/Login/Login.view.php b/Tubes1/src/app/Login/Login.view.php
similarity index 100%
rename from src/app/Login/Login.view.php
rename to Tubes1/src/app/Login/Login.view.php
diff --git a/src/app/Menu/Footer.php b/Tubes1/src/app/Menu/Footer.php
similarity index 100%
rename from src/app/Menu/Footer.php
rename to Tubes1/src/app/Menu/Footer.php
diff --git a/src/app/Menu/Header.php b/Tubes1/src/app/Menu/Header.php
similarity index 100%
rename from src/app/Menu/Header.php
rename to Tubes1/src/app/Menu/Header.php
diff --git a/src/app/Menu/HeaderWithMenu.php b/Tubes1/src/app/Menu/HeaderWithMenu.php
similarity index 100%
rename from src/app/Menu/HeaderWithMenu.php
rename to Tubes1/src/app/Menu/HeaderWithMenu.php
diff --git a/src/app/Menu/History/History.routes.php b/Tubes1/src/app/Menu/History/History.routes.php
similarity index 100%
rename from src/app/Menu/History/History.routes.php
rename to Tubes1/src/app/Menu/History/History.routes.php
diff --git a/src/app/Menu/History/History.view.php b/Tubes1/src/app/Menu/History/History.view.php
similarity index 100%
rename from src/app/Menu/History/History.view.php
rename to Tubes1/src/app/Menu/History/History.view.php
diff --git a/src/app/Menu/Order/CompleteOrder.routes.jsp b/Tubes1/src/app/Menu/Order/CompleteOrder.routes.jsp
similarity index 100%
rename from src/app/Menu/Order/CompleteOrder.routes.jsp
rename to Tubes1/src/app/Menu/Order/CompleteOrder.routes.jsp
diff --git a/src/app/Menu/Order/CompleteOrder.routes.php b/Tubes1/src/app/Menu/Order/CompleteOrder.routes.php
similarity index 100%
rename from src/app/Menu/Order/CompleteOrder.routes.php
rename to Tubes1/src/app/Menu/Order/CompleteOrder.routes.php
diff --git a/src/app/Menu/Order/CompleteOrder.view.jsp b/Tubes1/src/app/Menu/Order/CompleteOrder.view.jsp
similarity index 100%
rename from src/app/Menu/Order/CompleteOrder.view.jsp
rename to Tubes1/src/app/Menu/Order/CompleteOrder.view.jsp
diff --git a/src/app/Menu/Order/CompleteOrder.view.php b/Tubes1/src/app/Menu/Order/CompleteOrder.view.php
similarity index 100%
rename from src/app/Menu/Order/CompleteOrder.view.php
rename to Tubes1/src/app/Menu/Order/CompleteOrder.view.php
diff --git a/src/app/Menu/Order/Order.routes.jsp b/Tubes1/src/app/Menu/Order/Order.routes.jsp
similarity index 100%
rename from src/app/Menu/Order/Order.routes.jsp
rename to Tubes1/src/app/Menu/Order/Order.routes.jsp
diff --git a/src/app/Menu/Order/Order.routes.php b/Tubes1/src/app/Menu/Order/Order.routes.php
similarity index 100%
rename from src/app/Menu/Order/Order.routes.php
rename to Tubes1/src/app/Menu/Order/Order.routes.php
diff --git a/src/app/Menu/Order/Order.view.jsp b/Tubes1/src/app/Menu/Order/Order.view.jsp
similarity index 100%
rename from src/app/Menu/Order/Order.view.jsp
rename to Tubes1/src/app/Menu/Order/Order.view.jsp
diff --git a/src/app/Menu/Order/Order.view.php b/Tubes1/src/app/Menu/Order/Order.view.php
similarity index 100%
rename from src/app/Menu/Order/Order.view.php
rename to Tubes1/src/app/Menu/Order/Order.view.php
diff --git a/src/app/Menu/Order/SelectDriver.routes.jsp b/Tubes1/src/app/Menu/Order/SelectDriver.routes.jsp
similarity index 100%
rename from src/app/Menu/Order/SelectDriver.routes.jsp
rename to Tubes1/src/app/Menu/Order/SelectDriver.routes.jsp
diff --git a/src/app/Menu/Order/SelectDriver.routes.php b/Tubes1/src/app/Menu/Order/SelectDriver.routes.php
similarity index 100%
rename from src/app/Menu/Order/SelectDriver.routes.php
rename to Tubes1/src/app/Menu/Order/SelectDriver.routes.php
diff --git a/src/app/Menu/Order/SelectDriver.view.jsp b/Tubes1/src/app/Menu/Order/SelectDriver.view.jsp
similarity index 100%
rename from src/app/Menu/Order/SelectDriver.view.jsp
rename to Tubes1/src/app/Menu/Order/SelectDriver.view.jsp
diff --git a/src/app/Menu/Order/SelectDriver.view.php b/Tubes1/src/app/Menu/Order/SelectDriver.view.php
similarity index 100%
rename from src/app/Menu/Order/SelectDriver.view.php
rename to Tubes1/src/app/Menu/Order/SelectDriver.view.php
diff --git a/src/app/Menu/Profile/EditPrefLoc.routes.php b/Tubes1/src/app/Menu/Profile/EditPrefLoc.routes.php
similarity index 100%
rename from src/app/Menu/Profile/EditPrefLoc.routes.php
rename to Tubes1/src/app/Menu/Profile/EditPrefLoc.routes.php
diff --git a/src/app/Menu/Profile/EditPrefLoc.view.php b/Tubes1/src/app/Menu/Profile/EditPrefLoc.view.php
similarity index 100%
rename from src/app/Menu/Profile/EditPrefLoc.view.php
rename to Tubes1/src/app/Menu/Profile/EditPrefLoc.view.php
diff --git a/src/app/Menu/Profile/EditProfile.routes.php b/Tubes1/src/app/Menu/Profile/EditProfile.routes.php
similarity index 100%
rename from src/app/Menu/Profile/EditProfile.routes.php
rename to Tubes1/src/app/Menu/Profile/EditProfile.routes.php
diff --git a/src/app/Menu/Profile/EditProfile.view.php b/Tubes1/src/app/Menu/Profile/EditProfile.view.php
similarity index 100%
rename from src/app/Menu/Profile/EditProfile.view.php
rename to Tubes1/src/app/Menu/Profile/EditProfile.view.php
diff --git a/src/app/Menu/Profile/Profile.routes.php b/Tubes1/src/app/Menu/Profile/Profile.routes.php
similarity index 100%
rename from src/app/Menu/Profile/Profile.routes.php
rename to Tubes1/src/app/Menu/Profile/Profile.routes.php
diff --git a/src/app/Menu/Profile/Profile.view.php b/Tubes1/src/app/Menu/Profile/Profile.view.php
similarity index 100%
rename from src/app/Menu/Profile/Profile.view.php
rename to Tubes1/src/app/Menu/Profile/Profile.view.php
diff --git a/src/app/SignUp/Signup.routes.php b/Tubes1/src/app/SignUp/Signup.routes.php
similarity index 100%
rename from src/app/SignUp/Signup.routes.php
rename to Tubes1/src/app/SignUp/Signup.routes.php
diff --git a/src/app/SignUp/Signup.view.php b/Tubes1/src/app/SignUp/Signup.view.php
similarity index 100%
rename from src/app/SignUp/Signup.view.php
rename to Tubes1/src/app/SignUp/Signup.view.php
diff --git a/src/index.php b/Tubes1/src/index.php
similarity index 100%
rename from src/index.php
rename to Tubes1/src/index.php
diff --git a/HelloWeb/build/web/css/.gitkeep b/Tubes1/src/public/css/.gitkeep
similarity index 100%
rename from HelloWeb/build/web/css/.gitkeep
rename to Tubes1/src/public/css/.gitkeep
diff --git a/HelloWeb/build/web/css/fonts/geo.woff2 b/Tubes1/src/public/css/fonts/geo.woff2
similarity index 100%
rename from HelloWeb/build/web/css/fonts/geo.woff2
rename to Tubes1/src/public/css/fonts/geo.woff2
diff --git a/HelloWeb/build/web/css/fonts/mukta1.woff2 b/Tubes1/src/public/css/fonts/mukta1.woff2
similarity index 100%
rename from HelloWeb/build/web/css/fonts/mukta1.woff2
rename to Tubes1/src/public/css/fonts/mukta1.woff2
diff --git a/HelloWeb/build/web/css/fonts/mukta2.woff2 b/Tubes1/src/public/css/fonts/mukta2.woff2
similarity index 100%
rename from HelloWeb/build/web/css/fonts/mukta2.woff2
rename to Tubes1/src/public/css/fonts/mukta2.woff2
diff --git a/HelloWeb/build/web/css/fonts/mukta3.woff2 b/Tubes1/src/public/css/fonts/mukta3.woff2
similarity index 100%
rename from HelloWeb/build/web/css/fonts/mukta3.woff2
rename to Tubes1/src/public/css/fonts/mukta3.woff2
diff --git a/HelloWeb/build/web/css/profile.css b/Tubes1/src/public/css/profile.css
similarity index 100%
rename from HelloWeb/build/web/css/profile.css
rename to Tubes1/src/public/css/profile.css
diff --git a/HelloWeb/build/web/css/style.css b/Tubes1/src/public/css/style.css
similarity index 100%
rename from HelloWeb/build/web/css/style.css
rename to Tubes1/src/public/css/style.css
diff --git a/HelloWeb/build/web/css/style_old.css b/Tubes1/src/public/css/style_old.css
similarity index 100%
rename from HelloWeb/build/web/css/style_old.css
rename to Tubes1/src/public/css/style_old.css
diff --git a/HelloWeb/build/web/img/.gitkeep b/Tubes1/src/public/img/.gitkeep
similarity index 100%
rename from HelloWeb/build/web/img/.gitkeep
rename to Tubes1/src/public/img/.gitkeep
diff --git a/HelloWeb/build/web/img/a b/Tubes1/src/public/img/a
similarity index 100%
rename from HelloWeb/build/web/img/a
rename to Tubes1/src/public/img/a
diff --git a/HelloWeb/build/web/img/admin b/Tubes1/src/public/img/admin
similarity index 100%
rename from HelloWeb/build/web/img/admin
rename to Tubes1/src/public/img/admin
diff --git a/HelloWeb/build/web/img/delete.png b/Tubes1/src/public/img/delete.png
similarity index 100%
rename from HelloWeb/build/web/img/delete.png
rename to Tubes1/src/public/img/delete.png
diff --git a/HelloWeb/build/web/img/driver1 b/Tubes1/src/public/img/driver1
similarity index 100%
rename from HelloWeb/build/web/img/driver1
rename to Tubes1/src/public/img/driver1
diff --git a/HelloWeb/build/web/img/edit.png b/Tubes1/src/public/img/edit.png
similarity index 100%
rename from HelloWeb/build/web/img/edit.png
rename to Tubes1/src/public/img/edit.png
diff --git a/HelloWeb/build/web/img/images.jpg b/Tubes1/src/public/img/images.jpg
similarity index 100%
rename from HelloWeb/build/web/img/images.jpg
rename to Tubes1/src/public/img/images.jpg
diff --git a/HelloWeb/build/web/img/motaraido.png b/Tubes1/src/public/img/motaraido.png
similarity index 100%
rename from HelloWeb/build/web/img/motaraido.png
rename to Tubes1/src/public/img/motaraido.png
diff --git a/HelloWeb/build/web/img/pen.png b/Tubes1/src/public/img/pen.png
similarity index 100%
rename from HelloWeb/build/web/img/pen.png
rename to Tubes1/src/public/img/pen.png
diff --git a/HelloWeb/build/web/img/profilepic.png b/Tubes1/src/public/img/profilepic.png
similarity index 100%
rename from HelloWeb/build/web/img/profilepic.png
rename to Tubes1/src/public/img/profilepic.png
diff --git a/HelloWeb/build/web/img/star-off.svg b/Tubes1/src/public/img/star-off.svg
old mode 100644
new mode 100755
similarity index 100%
rename from HelloWeb/build/web/img/star-off.svg
rename to Tubes1/src/public/img/star-off.svg
diff --git a/HelloWeb/build/web/img/star-on.svg b/Tubes1/src/public/img/star-on.svg
old mode 100644
new mode 100755
similarity index 100%
rename from HelloWeb/build/web/img/star-on.svg
rename to Tubes1/src/public/img/star-on.svg
diff --git a/HelloWeb/build/web/img/tes1 b/Tubes1/src/public/img/tes1
similarity index 100%
rename from HelloWeb/build/web/img/tes1
rename to Tubes1/src/public/img/tes1
diff --git a/HelloWeb/build/web/img/winarto b/Tubes1/src/public/img/winarto
similarity index 100%
rename from HelloWeb/build/web/img/winarto
rename to Tubes1/src/public/img/winarto
diff --git a/HelloWeb/build/web/img/yowinarto b/Tubes1/src/public/img/yowinarto
similarity index 100%
rename from HelloWeb/build/web/img/yowinarto
rename to Tubes1/src/public/img/yowinarto
diff --git a/HelloWeb/build/web/js/.gitkeep b/Tubes1/src/public/js/.gitkeep
similarity index 100%
rename from HelloWeb/build/web/js/.gitkeep
rename to Tubes1/src/public/js/.gitkeep
diff --git a/HelloWeb/build/web/js/app.js b/Tubes1/src/public/js/app.js
similarity index 100%
rename from HelloWeb/build/web/js/app.js
rename to Tubes1/src/public/js/app.js
diff --git a/HelloWeb/build/web/js/history.js b/Tubes1/src/public/js/history.js
similarity index 100%
rename from HelloWeb/build/web/js/history.js
rename to Tubes1/src/public/js/history.js
diff --git a/HelloWeb/build/web/js/selectdriver.js b/Tubes1/src/public/js/selectdriver.js
similarity index 100%
rename from HelloWeb/build/web/js/selectdriver.js
rename to Tubes1/src/public/js/selectdriver.js
diff --git a/HelloWeb/build/web/js/signup.js b/Tubes1/src/public/js/signup.js
similarity index 100%
rename from HelloWeb/build/web/js/signup.js
rename to Tubes1/src/public/js/signup.js
diff --git a/src/vendor/autoload.php b/Tubes1/src/vendor/autoload.php
similarity index 100%
rename from src/vendor/autoload.php
rename to Tubes1/src/vendor/autoload.php
diff --git a/HelloWeb/build.xml b/Tubes2/build.xml
similarity index 96%
rename from HelloWeb/build.xml
rename to Tubes2/build.xml
index 21452eab775d5660008b4984bf8560036a951e1a..82b0c2e07ac2435f0650066826ded52123296967 100644
--- a/HelloWeb/build.xml
+++ b/Tubes2/build.xml
@@ -7,8 +7,8 @@
<!-- 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>
+<project name="Tubes2" default="default" basedir=".">
+ <description>Builds, tests, and runs the project Tubes2.</description>
<import file="nbproject/build-impl.xml"/>
<!--
diff --git a/HelloWeb/nbproject/ant-deploy.xml b/Tubes2/nbproject/ant-deploy.xml
similarity index 100%
rename from HelloWeb/nbproject/ant-deploy.xml
rename to Tubes2/nbproject/ant-deploy.xml
diff --git a/HelloWeb/nbproject/build-impl.xml b/Tubes2/nbproject/build-impl.xml
similarity index 99%
rename from HelloWeb/nbproject/build-impl.xml
rename to Tubes2/nbproject/build-impl.xml
index 1be60313d4755e4bf7b865ce8b7594b248ea4cbb..bf7f8d7eaec27a07f52ac3a36c2cfbdbc4ad5a04 100644
--- a/HelloWeb/nbproject/build-impl.xml
+++ b/Tubes2/nbproject/build-impl.xml
@@ -17,7 +17,7 @@
- cleanup
-->
-<project xmlns:webproject1="http://www.netbeans.org/ns/web-project/1" xmlns:webproject2="http://www.netbeans.org/ns/web-project/2" xmlns:webproject3="http://www.netbeans.org/ns/web-project/3" basedir=".." default="default" name="HelloWeb-impl">
+<project xmlns:webproject1="http://www.netbeans.org/ns/web-project/1" xmlns:webproject2="http://www.netbeans.org/ns/web-project/2" xmlns:webproject3="http://www.netbeans.org/ns/web-project/3" basedir=".." default="default" name="Tubes2-impl">
<import file="ant-deploy.xml"/>
<fail message="Please build using Ant 1.7.1 or higher.">
<condition>
@@ -470,7 +470,7 @@ or ant -Dj2ee.platform.classpath=<server_classpath> (where no properties f
</fileset>
</union>
<taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/>
- <testng classfilesetref="test.set" failureProperty="tests.failed" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="HelloWeb" testname="TestNG tests" workingDir="${basedir}">
+ <testng classfilesetref="test.set" failureProperty="tests.failed" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="Tubes2" testname="TestNG tests" workingDir="${basedir}">
<xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>
<propertyset>
<propertyref prefix="test-sys-prop."/>
@@ -620,7 +620,7 @@ or ant -Dj2ee.platform.classpath=<server_classpath> (where no properties f
<condition else="-testclass @{testClass}" property="test.class.or.method" value="-methods @{testClass}.@{testMethod}">
<isset property="test.method"/>
</condition>
- <condition else="-suitename HelloWeb -testname @{testClass} ${test.class.or.method}" property="testng.cmd.args" value="@{testClass}">
+ <condition else="-suitename Tubes2 -testname @{testClass} ${test.class.or.method}" property="testng.cmd.args" value="@{testClass}">
<matches pattern=".*\.xml" string="@{testClass}"/>
</condition>
<delete dir="${build.test.results.dir}" quiet="true"/>
diff --git a/HelloWeb/nbproject/genfiles.properties b/Tubes2/nbproject/genfiles.properties
similarity index 66%
rename from HelloWeb/nbproject/genfiles.properties
rename to Tubes2/nbproject/genfiles.properties
index 3ce279b54c6ea06c9409b8a309e6bf0503054fe7..e9f9633c47b91d8098fe84ce66062f55c8f7e7c0 100644
--- a/HelloWeb/nbproject/genfiles.properties
+++ b/Tubes2/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=ef64ba77
-build.xml.script.CRC32=7449866d
+build.xml.data.CRC32=613f9ad5
+build.xml.script.CRC32=b0885ed0
build.xml.stylesheet.CRC32=651128d4@1.77.1.1
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=ef64ba77
-nbproject/build-impl.xml.script.CRC32=97641e6f
+nbproject/build-impl.xml.data.CRC32=613f9ad5
+nbproject/build-impl.xml.script.CRC32=79f4aa2e
nbproject/build-impl.xml.stylesheet.CRC32=99ea4b56@1.77.1.1
diff --git a/HelloWeb/nbproject/private/private.properties b/Tubes2/nbproject/private/private.properties
similarity index 100%
rename from HelloWeb/nbproject/private/private.properties
rename to Tubes2/nbproject/private/private.properties
diff --git a/HelloWeb/nbproject/project.properties b/Tubes2/nbproject/project.properties
similarity index 98%
rename from HelloWeb/nbproject/project.properties
rename to Tubes2/nbproject/project.properties
index 2693da259719723f8d20b6366d03dcabc10bea26..d0f1eaa14f65df0bbc3ace180a4f6ef044983e33 100644
--- a/HelloWeb/nbproject/project.properties
+++ b/Tubes2/nbproject/project.properties
@@ -3,7 +3,6 @@ annotation.processing.enabled.in.editor=true
annotation.processing.processors.list=
annotation.processing.run.all.processors=true
annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
-auxiliary.org-netbeans-modules-projectapi.jsf_2e_language=Facelets
build.classes.dir=${build.web.dir}/WEB-INF/classes
build.classes.excludes=**/*.java,**/*.form
build.dir=build
@@ -85,6 +84,6 @@ src.dir=${source.root}/java
test.src.dir=test
war.content.additional=
war.ear.name=${war.name}
-war.name=HelloWeb.war
+war.name=Tubes2.war
web.docbase.dir=web
webinf.dir=web/WEB-INF
diff --git a/HelloWeb/nbproject/project.xml b/Tubes2/nbproject/project.xml
similarity index 95%
rename from HelloWeb/nbproject/project.xml
rename to Tubes2/nbproject/project.xml
index e6da5e4a1c8144e3d499f7c70aacabc857888a32..1dbed815b440485277d6bae6c0c12fd91f4b7b95 100644
--- a/HelloWeb/nbproject/project.xml
+++ b/Tubes2/nbproject/project.xml
@@ -3,7 +3,7 @@
<type>org.netbeans.modules.web.project</type>
<configuration>
<data xmlns="http://www.netbeans.org/ns/web-project/3">
- <name>HelloWeb</name>
+ <name>Tubes2</name>
<minimum-ant-version>1.6.5</minimum-ant-version>
<web-module-libraries/>
<web-module-additional-libraries/>
diff --git a/HelloWeb/build/web/META-INF/MANIFEST.MF b/Tubes2/src/conf/MANIFEST.MF
similarity index 100%
rename from HelloWeb/build/web/META-INF/MANIFEST.MF
rename to Tubes2/src/conf/MANIFEST.MF
diff --git a/HelloWeb/src/java/controller/ControllerServlet.java b/Tubes2/src/java/controller/ControllerServlet.java
similarity index 100%
rename from HelloWeb/src/java/controller/ControllerServlet.java
rename to Tubes2/src/java/controller/ControllerServlet.java
diff --git a/Tubes2/web/WEB-INF/glassfish-web.xml b/Tubes2/web/WEB-INF/glassfish-web.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d3a6f1e55d76d7682aa7d4e166245866991b7cd2
--- /dev/null
+++ b/Tubes2/web/WEB-INF/glassfish-web.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glassfish-web-app PUBLIC "-//GlassFish.org//DTD GlassFish Application Server 3.1 Servlet 3.0//EN" "http://glassfish.org/dtds/glassfish-web-app_3_0-1.dtd">
+<glassfish-web-app error-url="">
+ <context-root>/</context-root>
+ <class-loader delegate="true"/>
+ <jsp-config>
+ <property name="keepgenerated" value="true">
+ <description>Keep a copy of the generated servlet class' java code.</description>
+ </property>
+ </jsp-config>
+</glassfish-web-app>
diff --git a/HelloWeb/build/web/WEB-INF/jspf/Footer.jspf b/Tubes2/web/WEB-INF/jspf/Footer.jspf
similarity index 100%
rename from HelloWeb/build/web/WEB-INF/jspf/Footer.jspf
rename to Tubes2/web/WEB-INF/jspf/Footer.jspf
diff --git a/HelloWeb/build/web/WEB-INF/jspf/Header.jspf b/Tubes2/web/WEB-INF/jspf/Header.jspf
similarity index 100%
rename from HelloWeb/build/web/WEB-INF/jspf/Header.jspf
rename to Tubes2/web/WEB-INF/jspf/Header.jspf
diff --git a/HelloWeb/build/web/WEB-INF/view/CompleteOrder.jsp b/Tubes2/web/WEB-INF/view/CompleteOrder.jsp
similarity index 100%
rename from HelloWeb/build/web/WEB-INF/view/CompleteOrder.jsp
rename to Tubes2/web/WEB-INF/view/CompleteOrder.jsp
diff --git a/HelloWeb/build/web/WEB-INF/view/Order.jsp b/Tubes2/web/WEB-INF/view/Order.jsp
similarity index 100%
rename from HelloWeb/build/web/WEB-INF/view/Order.jsp
rename to Tubes2/web/WEB-INF/view/Order.jsp
diff --git a/HelloWeb/build/web/WEB-INF/view/SelectDriver.jsp b/Tubes2/web/WEB-INF/view/SelectDriver.jsp
similarity index 100%
rename from HelloWeb/build/web/WEB-INF/view/SelectDriver.jsp
rename to Tubes2/web/WEB-INF/view/SelectDriver.jsp
diff --git a/HelloWeb/build/web/WEB-INF/web.xml b/Tubes2/web/WEB-INF/web.xml
similarity index 100%
rename from HelloWeb/build/web/WEB-INF/web.xml
rename to Tubes2/web/WEB-INF/web.xml
diff --git a/HelloWeb/web/css/.gitkeep b/Tubes2/web/css/.gitkeep
similarity index 100%
rename from HelloWeb/web/css/.gitkeep
rename to Tubes2/web/css/.gitkeep
diff --git a/HelloWeb/web/css/fonts/geo.woff2 b/Tubes2/web/css/fonts/geo.woff2
similarity index 100%
rename from HelloWeb/web/css/fonts/geo.woff2
rename to Tubes2/web/css/fonts/geo.woff2
diff --git a/HelloWeb/web/css/fonts/mukta1.woff2 b/Tubes2/web/css/fonts/mukta1.woff2
similarity index 100%
rename from HelloWeb/web/css/fonts/mukta1.woff2
rename to Tubes2/web/css/fonts/mukta1.woff2
diff --git a/HelloWeb/web/css/fonts/mukta2.woff2 b/Tubes2/web/css/fonts/mukta2.woff2
similarity index 100%
rename from HelloWeb/web/css/fonts/mukta2.woff2
rename to Tubes2/web/css/fonts/mukta2.woff2
diff --git a/HelloWeb/web/css/fonts/mukta3.woff2 b/Tubes2/web/css/fonts/mukta3.woff2
similarity index 100%
rename from HelloWeb/web/css/fonts/mukta3.woff2
rename to Tubes2/web/css/fonts/mukta3.woff2
diff --git a/HelloWeb/web/css/profile.css b/Tubes2/web/css/profile.css
similarity index 100%
rename from HelloWeb/web/css/profile.css
rename to Tubes2/web/css/profile.css
diff --git a/HelloWeb/web/css/style.css b/Tubes2/web/css/style.css
similarity index 100%
rename from HelloWeb/web/css/style.css
rename to Tubes2/web/css/style.css
diff --git a/HelloWeb/web/css/style_old.css b/Tubes2/web/css/style_old.css
similarity index 100%
rename from HelloWeb/web/css/style_old.css
rename to Tubes2/web/css/style_old.css
diff --git a/HelloWeb/web/img/.gitkeep b/Tubes2/web/img/.gitkeep
similarity index 100%
rename from HelloWeb/web/img/.gitkeep
rename to Tubes2/web/img/.gitkeep
diff --git a/HelloWeb/web/img/a b/Tubes2/web/img/a
similarity index 100%
rename from HelloWeb/web/img/a
rename to Tubes2/web/img/a
diff --git a/HelloWeb/web/img/admin b/Tubes2/web/img/admin
similarity index 100%
rename from HelloWeb/web/img/admin
rename to Tubes2/web/img/admin
diff --git a/HelloWeb/web/img/delete.png b/Tubes2/web/img/delete.png
similarity index 100%
rename from HelloWeb/web/img/delete.png
rename to Tubes2/web/img/delete.png
diff --git a/HelloWeb/web/img/driver1 b/Tubes2/web/img/driver1
similarity index 100%
rename from HelloWeb/web/img/driver1
rename to Tubes2/web/img/driver1
diff --git a/HelloWeb/web/img/edit.png b/Tubes2/web/img/edit.png
similarity index 100%
rename from HelloWeb/web/img/edit.png
rename to Tubes2/web/img/edit.png
diff --git a/HelloWeb/web/img/images.jpg b/Tubes2/web/img/images.jpg
similarity index 100%
rename from HelloWeb/web/img/images.jpg
rename to Tubes2/web/img/images.jpg
diff --git a/HelloWeb/web/img/motaraido.png b/Tubes2/web/img/motaraido.png
similarity index 100%
rename from HelloWeb/web/img/motaraido.png
rename to Tubes2/web/img/motaraido.png
diff --git a/HelloWeb/web/img/pen.png b/Tubes2/web/img/pen.png
similarity index 100%
rename from HelloWeb/web/img/pen.png
rename to Tubes2/web/img/pen.png
diff --git a/HelloWeb/web/img/profilepic.png b/Tubes2/web/img/profilepic.png
similarity index 100%
rename from HelloWeb/web/img/profilepic.png
rename to Tubes2/web/img/profilepic.png
diff --git a/HelloWeb/web/img/star-off.svg b/Tubes2/web/img/star-off.svg
old mode 100755
new mode 100644
similarity index 100%
rename from HelloWeb/web/img/star-off.svg
rename to Tubes2/web/img/star-off.svg
diff --git a/HelloWeb/web/img/star-on.svg b/Tubes2/web/img/star-on.svg
old mode 100755
new mode 100644
similarity index 100%
rename from HelloWeb/web/img/star-on.svg
rename to Tubes2/web/img/star-on.svg
diff --git a/HelloWeb/web/img/tes1 b/Tubes2/web/img/tes1
similarity index 100%
rename from HelloWeb/web/img/tes1
rename to Tubes2/web/img/tes1
diff --git a/HelloWeb/web/img/winarto b/Tubes2/web/img/winarto
similarity index 100%
rename from HelloWeb/web/img/winarto
rename to Tubes2/web/img/winarto
diff --git a/HelloWeb/web/img/yowinarto b/Tubes2/web/img/yowinarto
similarity index 100%
rename from HelloWeb/web/img/yowinarto
rename to Tubes2/web/img/yowinarto
diff --git a/HelloWeb/build/web/index.jsp b/Tubes2/web/index.jsp
similarity index 87%
rename from HelloWeb/build/web/index.jsp
rename to Tubes2/web/index.jsp
index 2b172800278557aa1e28a1c6deb714e1fad2aa5e..f0d6d8208f99c203f66a3cbe780e3e3f3343b6ad 100644
--- a/HelloWeb/build/web/index.jsp
+++ b/Tubes2/web/index.jsp
@@ -14,7 +14,7 @@
<body>
<h1>Hello World!</h1>
- <form name="Name Input Form" action="/HelloWeb/Order" method='post'>
+ <form name="Name Input Form" action="/Order" method='post'>
Enter Your Name:
<input type="text" name="name" value="" />
<input type="submit" value="OK" />
diff --git a/HelloWeb/web/js/.gitkeep b/Tubes2/web/js/.gitkeep
similarity index 100%
rename from HelloWeb/web/js/.gitkeep
rename to Tubes2/web/js/.gitkeep
diff --git a/HelloWeb/web/js/app.js b/Tubes2/web/js/app.js
similarity index 100%
rename from HelloWeb/web/js/app.js
rename to Tubes2/web/js/app.js
diff --git a/HelloWeb/web/js/history.js b/Tubes2/web/js/history.js
similarity index 100%
rename from HelloWeb/web/js/history.js
rename to Tubes2/web/js/history.js
diff --git a/HelloWeb/web/js/selectdriver.js b/Tubes2/web/js/selectdriver.js
similarity index 100%
rename from HelloWeb/web/js/selectdriver.js
rename to Tubes2/web/js/selectdriver.js
diff --git a/HelloWeb/web/js/signup.js b/Tubes2/web/js/signup.js
similarity index 100%
rename from HelloWeb/web/js/signup.js
rename to Tubes2/web/js/signup.js
diff --git a/src/public/css/.gitkeep b/src/public/css/.gitkeep
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/src/public/css/fonts/geo.woff2 b/src/public/css/fonts/geo.woff2
deleted file mode 100644
index 4c1d8680a68afc90ed228ae5c313f9002255b7b2..0000000000000000000000000000000000000000
Binary files a/src/public/css/fonts/geo.woff2 and /dev/null differ
diff --git a/src/public/css/fonts/mukta1.woff2 b/src/public/css/fonts/mukta1.woff2
deleted file mode 100644
index dfa6d95388c06078e73dc1ccc0df0cdd8c152c4b..0000000000000000000000000000000000000000
Binary files a/src/public/css/fonts/mukta1.woff2 and /dev/null differ
diff --git a/src/public/css/fonts/mukta2.woff2 b/src/public/css/fonts/mukta2.woff2
deleted file mode 100644
index ed0d8a0451ef90b479b036e337f741573dfa55bb..0000000000000000000000000000000000000000
Binary files a/src/public/css/fonts/mukta2.woff2 and /dev/null differ
diff --git a/src/public/css/fonts/mukta3.woff2 b/src/public/css/fonts/mukta3.woff2
deleted file mode 100644
index b6d906226264df96ac57ba02427ae5043bfd031f..0000000000000000000000000000000000000000
Binary files a/src/public/css/fonts/mukta3.woff2 and /dev/null differ
diff --git a/src/public/css/profile.css b/src/public/css/profile.css
deleted file mode 100644
index 7bf19a4f7d989ea396720a3c92bd8cb9cce368d7..0000000000000000000000000000000000000000
--- a/src/public/css/profile.css
+++ /dev/null
@@ -1,154 +0,0 @@
-.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
diff --git a/src/public/css/style.css b/src/public/css/style.css
deleted file mode 100644
index ae7bb6a41858edde4cdc42187c4481c84a4a3473..0000000000000000000000000000000000000000
--- a/src/public/css/style.css
+++ /dev/null
@@ -1,628 +0,0 @@
-@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;
-}
diff --git a/src/public/css/style_old.css b/src/public/css/style_old.css
deleted file mode 100644
index 7ee8d5f20ad0ad8b49088c590ce18c398f09c1d8..0000000000000000000000000000000000000000
--- a/src/public/css/style_old.css
+++ /dev/null
@@ -1,614 +0,0 @@
-@charset "UTF-8";
-
-/* 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;
-}
-
-/* Body style */
-
-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;
- }
-
- .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;
- 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-item:hover, .menu-item#selected {
- color: #ffffff;
- border-color: #000000;
- background-color: #5A1E83;
-}
-
-/* Footer style */
-.footer {
- width: 100% fit-content;
- display: inline-block;
- column-count: 3;
- column-span: all;
- column-gap: 1.5em;
- column-rule-style: solid;
- border-style: solid;
- border-width: 2px;
- margin: auto;
-}
-
-.footer > div {
- text-align: center;
- font-weight: bold;
- font-family: 'Mukta', sans-serif;
- vertical-align: middle;
-}
-
-.img-chooser {
- padding-top: 20px;
-}
-
-/* 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: 130px;
-}
-
-.form-input>input {
- width: 198px;
-}
-
-.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: fit-content;
- 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;
-}
-
-#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: 100%;
-}
-
-.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;
-}
diff --git a/src/public/img/.gitkeep b/src/public/img/.gitkeep
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/src/public/img/a b/src/public/img/a
deleted file mode 100644
index 33aea4c0776f5cb48d23fab288743ca549d3092e..0000000000000000000000000000000000000000
Binary files a/src/public/img/a and /dev/null differ
diff --git a/src/public/img/admin b/src/public/img/admin
deleted file mode 100644
index dd3fea2721dfc529ad21300b36bada01e362032d..0000000000000000000000000000000000000000
Binary files a/src/public/img/admin and /dev/null differ
diff --git a/src/public/img/delete.png b/src/public/img/delete.png
deleted file mode 100644
index f8998a18f10f6e0e754cdf3f06794b299e90a1b9..0000000000000000000000000000000000000000
Binary files a/src/public/img/delete.png and /dev/null differ
diff --git a/src/public/img/driver1 b/src/public/img/driver1
deleted file mode 100644
index 8de4beb39862ac7125f2339dcb1c9b32ab7f90f8..0000000000000000000000000000000000000000
Binary files a/src/public/img/driver1 and /dev/null differ
diff --git a/src/public/img/edit.png b/src/public/img/edit.png
deleted file mode 100644
index 919913bc0052626f61433d69128dc17ac739450b..0000000000000000000000000000000000000000
Binary files a/src/public/img/edit.png and /dev/null differ
diff --git a/src/public/img/images.jpg b/src/public/img/images.jpg
deleted file mode 100644
index 30b7ce2cd13386017b2fa5d56503d42e4c25ea1d..0000000000000000000000000000000000000000
Binary files a/src/public/img/images.jpg and /dev/null differ
diff --git a/src/public/img/motaraido.png b/src/public/img/motaraido.png
deleted file mode 100644
index 2b72f7e2abdd5f8ea4d11911d7c6ad9260be5262..0000000000000000000000000000000000000000
Binary files a/src/public/img/motaraido.png and /dev/null differ
diff --git a/src/public/img/pen.png b/src/public/img/pen.png
deleted file mode 100644
index d2bcdf9ca880be6a8d6d687245ec080d4d711240..0000000000000000000000000000000000000000
Binary files a/src/public/img/pen.png and /dev/null differ
diff --git a/src/public/img/profilepic.png b/src/public/img/profilepic.png
deleted file mode 100644
index 2b72f7e2abdd5f8ea4d11911d7c6ad9260be5262..0000000000000000000000000000000000000000
Binary files a/src/public/img/profilepic.png and /dev/null differ
diff --git a/src/public/img/star-off.svg b/src/public/img/star-off.svg
deleted file mode 100755
index 9a393aa40d139025bf2324aec47830757facb84a..0000000000000000000000000000000000000000
--- a/src/public/img/star-off.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
- <path fill="#fff" stroke="#ccc" d="M 12,2.5 14.4,9.5 21.5,9.5 15.8,13.75 18.5,21.5 12,16.625 5.5,21.5 8.2,13.75 2.5,9.5 9.6,9.5 z"/>
-</svg>
diff --git a/src/public/img/star-on.svg b/src/public/img/star-on.svg
deleted file mode 100755
index fac31ff43ec2ba8dff2f36a3b0ae43d92b312533..0000000000000000000000000000000000000000
--- a/src/public/img/star-on.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
- <path fill="#311B92" stroke="#000" d="M 12,2.5 14.4,9.5 21.5,9.5 15.8,13.75 18.5,21.5 12,16.625 5.5,21.5 8.2,13.75 2.5,9.5 9.6,9.5 z"/>
-</svg>
diff --git a/src/public/img/tes1 b/src/public/img/tes1
deleted file mode 100644
index 7352b27d5a4202c3849d34614463b6e94eee7285..0000000000000000000000000000000000000000
Binary files a/src/public/img/tes1 and /dev/null differ
diff --git a/src/public/img/winarto b/src/public/img/winarto
deleted file mode 100644
index 33aea4c0776f5cb48d23fab288743ca549d3092e..0000000000000000000000000000000000000000
Binary files a/src/public/img/winarto and /dev/null differ
diff --git a/src/public/img/yowinarto b/src/public/img/yowinarto
deleted file mode 100644
index 8de4beb39862ac7125f2339dcb1c9b32ab7f90f8..0000000000000000000000000000000000000000
Binary files a/src/public/img/yowinarto and /dev/null differ
diff --git a/src/public/js/.gitkeep b/src/public/js/.gitkeep
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/src/public/js/app.js b/src/public/js/app.js
deleted file mode 100644
index dbea0f5c367dec9b0cb20f3b11c4ce40644838a3..0000000000000000000000000000000000000000
--- a/src/public/js/app.js
+++ /dev/null
@@ -1,102 +0,0 @@
-function loginValidation() {
- var username = document.forms["loginform"]["username"];
- var pwd = document.forms["loginform"]["password"];
- var usrVerify = Validate(username, "empty");
- var pwdVerify = Validate(pwd, "empty");
- return (usrVerify && pwdVerify);
-}
-
-function editProfileValidation() {
- var name = document.forms["editprofile-form"]["your-name"];
- var phone = document.forms["editprofile-form"]["phone-number"];
- var nameVerify = Validate(name, "empty", 0, 20, "length");
- var phoneVerify = Validate(phone, "empty", 9, 12, "length");
- return (nameVerify && phoneVerify);
-}
-
-function Validate(inputArea, type1, min = 0, max = 0, type2 = null, type3 = null) {
- var error = GetErrorMessage(inputArea.value, type1, min, max);
- if(error === "") {
- if (type2 != null) {
- error = GetErrorMessage(inputArea.value, type2, min, max);
- console.log(type2 + "length");
- }
- if (error === "") {
- if (type3 != null) {
- error = GetErrorMessage(inputArea.value, type3, min, max);
- }
- }
- }
- if(error !== "" && inputArea.nextElementSibling === null) {
- var errorEl = document.createElement("p");
- errorEl.innerHTML = error;
- errorEl.className = "error";
- insertAfterElement(errorEl, inputArea);
-
- inputArea.addEventListener("blur", function() {
- var error = GetErrorMessage(inputArea.value, type1, min, max);
- if(error === "") {
- if (type2 != null) {
- error = GetErrorMessage(inputArea.value, type2, min, max);
- }
- if (error === "") {
- if (type3 != null) {
- error = GetErrorMessage(inputArea.value, type3, min, max);
- }
- }
- }
- if (error === ""){
- this.nextSibling.remove();
- }
- },true);
- }
- return (error === "");
-}
-
-function insertAfterElement(el, src) {
- src.parentNode.insertBefore(el, src.nextSibling);
-}
-
-
-function GetErrorMessage(textArea, type, min = 0, max = 0) {
- var validateText = "";
- switch(type) {
- case "empty" :
- if(isEmpty(textArea)) {
- validateText = "Fill in the field";
- }
- break;
- case "email" :
- if(!isEmail(textArea)) {
- validatedText = "Invalid Email Address";
- }
- break;
- case "number" :
- if(isNumber(textArea)){
- validateText = "Fill in with only number";
- }
- break;
- case "length" :
- if (!isLengthEqual(textArea,min,max)){
- validateText = "Character must be between " + min.toString() + " and " + max.toString() + " long";
- }
- break;
- }
- return validateText;
-}
-
-function isEmpty(textArea) {
- return (textArea.match(/^s+$/) || textArea == "");
-}
-
-function isNumber(textArea) {
- return (!isNaN(textArea));
-}
-
-function isLengthEqual(textArea, min, max){
- return (textArea.length >= min && textArea.length <= max);
-}
-
-function isEmail(textArea) {
- return (textArea.match(/^([a-zA-Z0-9])+([.a-zA-Z0-9_-])*@([a-zA-Z0-9_-])+(.[a-zA-Z0-9_-]+)+/));
-}
\ No newline at end of file
diff --git a/src/public/js/history.js b/src/public/js/history.js
deleted file mode 100644
index 4e4b3f528dfb96a699cdbb10ad6ba0b731005f5a..0000000000000000000000000000000000000000
--- a/src/public/js/history.js
+++ /dev/null
@@ -1,41 +0,0 @@
-
-function tabActive(tag) {
- var tabUser = document.getElementById('user-his');
- var tabDriver = document.getElementById('driver-his');
- var order = document.getElementsByClassName('order-list');
- var driver = document.getElementsByClassName('driver-list');
-
- if (tag == 'user') {
- order[0].classList.add("active-list");
- driver[0].classList.remove("active-list");
- tabUser.classList.add('active');
- tabDriver.classList.remove('active');
- }
- else {
- driver[0].classList.add("active-list");
- order[0].classList.remove("active-list");
- tabDriver.classList.add('active');
- tabUser.classList.remove('active');
- }
-}
-
-tabActive('user');
-
-function hideThis(user) {
- updateHide(user);
- console.log(user[0]);
-}
-
-function updateHide(history)
-{
- var data = "user=" + history[0] + "&driver=" + history[1] + "&date=" + history[4];
- var xhr;
- if (window.XMLHttpRequest) {
- xhr = new XMLHttpRequest();
- } else if (window.ActiveXObject) {
- xhr = new ActiveXObject("Microsoft.XMLHTTP");
- }
- xhr.open("GET", "/history/update", true);
- xhr.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
- xhr.send(data);
-}
\ No newline at end of file
diff --git a/src/public/js/selectdriver.js b/src/public/js/selectdriver.js
deleted file mode 100644
index 2d7b38f4833461051ad76f37a3eac112a88b0156..0000000000000000000000000000000000000000
--- a/src/public/js/selectdriver.js
+++ /dev/null
@@ -1,97 +0,0 @@
-var prefDriver = document.getElementById("pref-driver");
-var otherDriver = document.getElementById("other-driver");
-var driverSumRating = [];
-var driverCountRating = [];
-var driverNameList = [];
-
-for (var i = 0; i < driverArr.length; i++) {
- for(var j = 0; j < ratingArr.length; j++) {
- if(driverArr[i] === ratingArr[j]["usernameDriver"]){
- driverSumRating[driverArr[i]] = (driverSumRating[driverArr[i]] === undefined) ? parseFloat(ratingArr[j]["rating"]) : driverSumRating[driverArr[i]] + parseFloat(ratingArr[j]["rating"]);
- driverCountRating[driverArr[i]] = (driverCountRating[driverArr[i]] === undefined) ? 1 : driverCountRating[driverArr[i]]+1;
- }
- }
- for(var k = 0; k < driverNameArr.length; k++) {
- if(driverArr[i] === driverNameArr[k]["username"]){
- driverNameList[driverArr[i]] = driverNameArr[k]["fullname"];
- break;
- }
- }
-}
-
-for(var j = 0; j < ratingArr.length; j++) {
- if(preferredDriver === ratingArr[j]["usernameDriver"]){
- driverSumRating[preferredDriver] = (driverSumRating[preferredDriver] === undefined) ? parseFloat(ratingArr[j]["rating"]) : driverSumRating[preferredDriver] + parseFloat(ratingArr[j]["rating"]);
- driverCountRating[preferredDriver] = (driverCountRating[preferredDriver] === undefined) ? 1 : driverCountRating[preferredDriver]+1;
- }
-}
-for(var k = 0; k < driverNameArr.length; k++) {
- if(preferredDriver === driverNameArr[k]["username"]){
- driverNameList[preferredDriver] = driverNameArr[k]["fullname"];
- break;
- }
-}
-
-if(preferredDriver !== "") {
- CreateDriverDisplay(prefDriver, preferredDriver);
-} else {
- CreateNotFoundDisplay(prefDriver);
-}
-
-if(driverArr.length > 0) {
- for (var i = 0; i < driverArr.length; i++) {
- CreateDriverDisplay(otherDriver, driverArr[i]);
- }
-} else {
- CreateNotFoundDisplay(otherDriver);
-}
-
-function CreateDriverDisplay(driverType, driverUsrName) {
- var newForm = driverType.appendChild(document.createElement("form"));
- var newContainer = newForm.appendChild(document.createElement("div"));
- var newImg = newContainer.appendChild(document.createElement("img"));
- var newName = newContainer.appendChild(document.createElement("div"));
- var newRating = newContainer.appendChild(document.createElement("div"));
- var postUsrName = newContainer.appendChild(document.createElement("input"));
- var newPickLoc = newContainer.appendChild(document.createElement("input"));
- var newDest = newContainer.appendChild(document.createElement("input"));
- var newBtn = newContainer.appendChild(document.createElement("input"));
-
-
- var avgRating = (driverSumRating[driverUsrName]/driverCountRating[driverUsrName]).toFixed(1).toString();
-
- newForm.setAttribute('method', 'post');
- newForm.setAttribute('action', '/order/' + user + '/completeorder');
- newContainer.classList.add("driver-content");
-
- newImg.classList.add("driver-pic");
- newImg.setAttribute('src', '/public/img/' + driverUsrName);
-
- newName.classList.add("driver-name-disp");
- newName.innerHTML = driverNameList[driverUsrName];
-
- newRating.classList.add("driver-rating-disp");
- newRating.innerHTML = "★" + avgRating + " <span class='vote-disp'>(" + driverCountRating[driverUsrName] + " votes)</span>";
-
- postUsrName.setAttribute('type', 'hidden');
- postUsrName.setAttribute('name', 'driver-username');
- postUsrName.setAttribute('value', driverUsrName);
-
- newPickLoc.setAttribute('type','hidden');
- newPickLoc.setAttribute('name','pickLoc');
- newPickLoc.setAttribute('value', pickLoc);
- newDest.setAttribute('type','hidden');
- newDest.setAttribute('name','dest');
- newDest.setAttribute('value', dest);
-
- newBtn.classList.add("accept-button");
- newBtn.classList.add("select-driver-btn");
- newBtn.setAttribute('type','submit');
- newBtn.setAttribute('value','Select Driver');
-}
-
-function CreateNotFoundDisplay(driverType) {
- var newContainer = driverType.appendChild(document.createElement("div"));
- newContainer.classList.add("driver-not-found");
- newContainer.innerHTML = "Nothing to display.";
-}
\ No newline at end of file
diff --git a/src/public/js/signup.js b/src/public/js/signup.js
deleted file mode 100644
index 43a9342a95538b30e1b8bf663cf3fc0a0b62718f..0000000000000000000000000000000000000000
--- a/src/public/js/signup.js
+++ /dev/null
@@ -1,44 +0,0 @@
-function checkData(name, element)
-{
- var data = "?" + name + "=" + document.forms["signupform"][name].value;
- var xhr;
- if (window.XMLHttpRequest) {
- xhr = new XMLHttpRequest();
- } else if (window.ActiveXObject) {
- xhr = new ActiveXObject("Microsoft.XMLHTTP");
- }
-
- xhr.open("GET", "/validation" + data, true);
- xhr.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
- xhr.send(null);
- xhr.onload = function() {
- if (xhr.readyState == 4) {
- if (xhr.status == 200) {
- if (xhr.responseText === 'OK') {
- document.getElementById(element).innerHTML = "√";
- } else {
- document.getElementById(element).innerHTML = "X";
- }
- }
- else {
- alert('There was a problem with the request.');
- }
- }
- }
-}
-
-function signupValidation() {
- var username = document.forms["signupform"]["username"];
- var password = document.forms["signupform"]["password"];
- var cpassword = document.forms["signupform"]["confirm-password"];
- var email = document.forms["signupform"]["email"];
- var fullname = document.forms["signupform"]["your-name"];
- var phone = document.forms["signupform"]["phone"];
- var usrVerify = Validate(username, "empty");
- var pwdVerify = Validate(password, "empty");
- var cpwdVerify = Validate(cpassword, "empty");
- var emailVerify = Validate(email, "empty", 0, 0, "email");
- var fullnameVerify = Validate(fullname, "empty", 0, 20, "length");
- var phoneVerify = Validate(phone, "empty", 9, 12, "length");
- return (usrVerify && pwdVerify && cpwdVerify && emailVerify && fullnameVerify && phoneVerify);
-}
\ No newline at end of file