diff --git a/HelloWeb/build.xml b/HelloWeb/build.xml
deleted file mode 100644
index 21452eab775d5660008b4984bf8560036a951e1a..0000000000000000000000000000000000000000
--- a/HelloWeb/build.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?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>
diff --git a/HelloWeb/build/web/CompleteOrder.jsp b/HelloWeb/build/web/CompleteOrder.jsp
deleted file mode 100644
index a391722f4b82ca63b942d62759148061ac132c84..0000000000000000000000000000000000000000
--- a/HelloWeb/build/web/CompleteOrder.jsp
+++ /dev/null
@@ -1,60 +0,0 @@
-<%--
- 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 Order">
- </div>
- </form>
- <jsp:include page="Footer.jsp" />
- </body>
-</html>
diff --git a/HelloWeb/build/web/Footer.jsp b/HelloWeb/build/web/Footer.jsp
deleted file mode 100644
index cb71c0e72911f50c9dbe43c71bd65e1480f68104..0000000000000000000000000000000000000000
--- a/HelloWeb/build/web/Footer.jsp
+++ /dev/null
@@ -1,21 +0,0 @@
-<%--
- 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>
diff --git a/HelloWeb/build/web/Header.jsp b/HelloWeb/build/web/Header.jsp
deleted file mode 100644
index 119e70cf6571e555a0c91f2d8cd7a3725e9bf931..0000000000000000000000000000000000000000
--- a/HelloWeb/build/web/Header.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<%--
- 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>
diff --git a/HelloWeb/build/web/Order.jsp b/HelloWeb/build/web/Order.jsp
deleted file mode 100644
index 2e60e67aec463f378c67bdefc5c1691c2eeff4ac..0000000000000000000000000000000000000000
--- a/HelloWeb/build/web/Order.jsp
+++ /dev/null
@@ -1,52 +0,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>
diff --git a/HelloWeb/build/web/SelectDriver.jsp b/HelloWeb/build/web/SelectDriver.jsp
deleted file mode 100644
index 66883b9eab372f10232faadc29186ce462e57856..0000000000000000000000000000000000000000
--- a/HelloWeb/build/web/SelectDriver.jsp
+++ /dev/null
@@ -1,42 +0,0 @@
-<%--
- 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>
diff --git a/HelloWeb/build/web/WEB-INF/classes/controller/ControllerServlet.class b/HelloWeb/build/web/WEB-INF/classes/controller/ControllerServlet.class
new file mode 100644
index 0000000000000000000000000000000000000000..09c237e97de8d507182b3f8b330b3a93a29e5ec1
Binary files /dev/null and b/HelloWeb/build/web/WEB-INF/classes/controller/ControllerServlet.class differ
diff --git a/HelloWeb/build/web/WEB-INF/jspf/Footer.jspf b/HelloWeb/build/web/WEB-INF/jspf/Footer.jspf
new file mode 100644
index 0000000000000000000000000000000000000000..36ed5dbf6284e479dd45458c0d432e3f70ab3b6b
--- /dev/null
+++ b/HelloWeb/build/web/WEB-INF/jspf/Footer.jspf
@@ -0,0 +1,7 @@
+ <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/build/web/HeaderWithMenu.jsp b/HelloWeb/build/web/WEB-INF/jspf/Header.jspf
similarity index 97%
rename from HelloWeb/build/web/HeaderWithMenu.jsp
rename to HelloWeb/build/web/WEB-INF/jspf/Header.jspf
index 78c4a75393711918b69da7a6a7906f70ea9e48aa..08500a2b6d688079f46e1977239da737a060a4f9 100644
--- a/HelloWeb/build/web/HeaderWithMenu.jsp
+++ b/HelloWeb/build/web/WEB-INF/jspf/Header.jspf
@@ -38,6 +38,4 @@
<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>
+ </div>
\ No newline at end of file
diff --git a/HelloWeb/build/web/WEB-INF/view/CompleteOrder.jsp b/HelloWeb/build/web/WEB-INF/view/CompleteOrder.jsp
new file mode 100644
index 0000000000000000000000000000000000000000..9ac61413d2afd552640f07890dae353e0569ab09
--- /dev/null
+++ b/HelloWeb/build/web/WEB-INF/view/CompleteOrder.jsp
@@ -0,0 +1,43 @@
+<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/build/web/WEB-INF/view/Order.jsp b/HelloWeb/build/web/WEB-INF/view/Order.jsp
new file mode 100644
index 0000000000000000000000000000000000000000..90e429e371cc87c4bc15e6e5ae64f728cf05a730
--- /dev/null
+++ b/HelloWeb/build/web/WEB-INF/view/Order.jsp
@@ -0,0 +1,35 @@
+<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/build/web/WEB-INF/view/SelectDriver.jsp b/HelloWeb/build/web/WEB-INF/view/SelectDriver.jsp
new file mode 100644
index 0000000000000000000000000000000000000000..d8106748f411b9c73c53488a6929904b0faa165b
--- /dev/null
+++ b/HelloWeb/build/web/WEB-INF/view/SelectDriver.jsp
@@ -0,0 +1,25 @@
+<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/build/web/WEB-INF/web.xml b/HelloWeb/build/web/WEB-INF/web.xml
new file mode 100644
index 0000000000000000000000000000000000000000..049039080d0056c6d56999a779d0866d8f8d98e9
--- /dev/null
+++ b/HelloWeb/build/web/WEB-INF/web.xml
@@ -0,0 +1,17 @@
+<?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/build/web/index.jsp b/HelloWeb/build/web/index.jsp
index 22504f9267bb56b7c135ccc41f977d7940e730e0..2b172800278557aa1e28a1c6deb714e1fad2aa5e 100644
--- a/HelloWeb/build/web/index.jsp
+++ b/HelloWeb/build/web/index.jsp
@@ -14,7 +14,7 @@
<body>
<h1>Hello World!</h1>
- <form name="Name Input Form" action="Order.jsp">
+ <form name="Name Input Form" action="/HelloWeb/Order" method='post'>
Enter Your Name:
<input type="text" name="name" value="" />
<input type="submit" value="OK" />
diff --git a/HelloWeb/build/web/response.jsp b/HelloWeb/build/web/response.jsp
deleted file mode 100644
index 57974eb4eb5d11be34b125ef651ba674465e7ffb..0000000000000000000000000000000000000000
--- a/HelloWeb/build/web/response.jsp
+++ /dev/null
@@ -1,19 +0,0 @@
-<%--
- Document : response
- Created on : Nov 4, 2017, 9:26: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>
- <jsp:useBean id="mybean" scope="session" class="org.mypackage.hello.NameHandler" />
- <jsp:setProperty name="mybean" property="name" />
- <h1>Hello, <jsp:getProperty name="mybean" property="name" />!</h1>
- </body>
-</html>
diff --git a/HelloWeb/nbproject/project.properties b/HelloWeb/nbproject/project.properties
index 57c9144548eed1ff35ffe52d96fb97e5daab26a9..2693da259719723f8d20b6366d03dcabc10bea26 100644
--- a/HelloWeb/nbproject/project.properties
+++ b/HelloWeb/nbproject/project.properties
@@ -3,6 +3,7 @@ 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
diff --git a/HelloWeb/src/java/controller/ControllerServlet.java b/HelloWeb/src/java/controller/ControllerServlet.java
new file mode 100644
index 0000000000000000000000000000000000000000..5b7311724a1e5a460381733379dd34dc34f99b40
--- /dev/null
+++ b/HelloWeb/src/java/controller/ControllerServlet.java
@@ -0,0 +1,84 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package controller;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ *
+ * @author nim_13515091
+ */
+@WebServlet(name = "ControllerServlet", urlPatterns = {"/Order", "/CompleteOrder", "/SelectDriver"})
+public class ControllerServlet extends HttpServlet {
+
+ /**
+ * Handles the HTTP <code>GET</code> method.
+ * @param request servlet request
+ * @param response servlet response
+ * @throws ServletException if a servlet-specific error occurs
+ * @throws IOException if an I/O error occurs
+ */
+ @Override
+ protected void doGet(HttpServletRequest request, HttpServletResponse response)
+ throws ServletException, IOException {
+
+ String userPath = request.getServletPath();
+
+ // use RequestDispatcher to forward request internally
+ String url = "/WEB-INF/view" + userPath + ".jsp";
+
+ try {
+ request.getRequestDispatcher(url).forward(request, response);
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+
+ /**
+ * Handles the HTTP <code>POST</code> method.
+ * @param request servlet request
+ * @param response servlet response
+ * @throws ServletException if a servlet-specific error occurs
+ * @throws IOException if an I/O error occurs
+ */
+ @Override
+ protected void doPost(HttpServletRequest request, HttpServletResponse response)
+ throws ServletException, IOException {
+
+ String userPath = request.getServletPath();
+
+ // if addToCart action is called
+ if (userPath.equals("/Order")) {
+ // TODO: Implement add product to cart action
+
+ // if updateCart action is called
+ } else if (userPath.equals("/SelectDriver")) {
+ // TODO: Implement update cart action
+
+ // if purchase action is called
+ } else if (userPath.equals("/CompleteOrder")) {
+ // TODO: Implement purchase action
+
+ userPath = "/confirmation";
+ }
+
+ // use RequestDispatcher to forward request internally
+ String url = "/WEB-INF/view" + userPath + ".jsp";
+
+ try {
+ request.getRequestDispatcher(url).forward(request, response);
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/HelloWeb/web/CompleteOrder.jsp b/HelloWeb/web/CompleteOrder.jsp
deleted file mode 100644
index a391722f4b82ca63b942d62759148061ac132c84..0000000000000000000000000000000000000000
--- a/HelloWeb/web/CompleteOrder.jsp
+++ /dev/null
@@ -1,60 +0,0 @@
-<%--
- 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 Order">
- </div>
- </form>
- <jsp:include page="Footer.jsp" />
- </body>
-</html>
diff --git a/HelloWeb/web/Footer.jsp b/HelloWeb/web/Footer.jsp
deleted file mode 100644
index cb71c0e72911f50c9dbe43c71bd65e1480f68104..0000000000000000000000000000000000000000
--- a/HelloWeb/web/Footer.jsp
+++ /dev/null
@@ -1,21 +0,0 @@
-<%--
- 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>
diff --git a/HelloWeb/web/Header.jsp b/HelloWeb/web/Header.jsp
deleted file mode 100644
index 119e70cf6571e555a0c91f2d8cd7a3725e9bf931..0000000000000000000000000000000000000000
--- a/HelloWeb/web/Header.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<%--
- 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>
diff --git a/HelloWeb/web/Order.jsp b/HelloWeb/web/Order.jsp
deleted file mode 100644
index 2e60e67aec463f378c67bdefc5c1691c2eeff4ac..0000000000000000000000000000000000000000
--- a/HelloWeb/web/Order.jsp
+++ /dev/null
@@ -1,52 +0,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>
diff --git a/HelloWeb/web/SelectDriver.jsp b/HelloWeb/web/SelectDriver.jsp
deleted file mode 100644
index 66883b9eab372f10232faadc29186ce462e57856..0000000000000000000000000000000000000000
--- a/HelloWeb/web/SelectDriver.jsp
+++ /dev/null
@@ -1,42 +0,0 @@
-<%--
- 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>
diff --git a/HelloWeb/web/WEB-INF/jspf/Footer.jspf b/HelloWeb/web/WEB-INF/jspf/Footer.jspf
new file mode 100644
index 0000000000000000000000000000000000000000..36ed5dbf6284e479dd45458c0d432e3f70ab3b6b
--- /dev/null
+++ b/HelloWeb/web/WEB-INF/jspf/Footer.jspf
@@ -0,0 +1,7 @@
+ <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/HeaderWithMenu.jsp b/HelloWeb/web/WEB-INF/jspf/Header.jspf
similarity index 97%
rename from HelloWeb/web/HeaderWithMenu.jsp
rename to HelloWeb/web/WEB-INF/jspf/Header.jspf
index 78c4a75393711918b69da7a6a7906f70ea9e48aa..08500a2b6d688079f46e1977239da737a060a4f9 100644
--- a/HelloWeb/web/HeaderWithMenu.jsp
+++ b/HelloWeb/web/WEB-INF/jspf/Header.jspf
@@ -38,6 +38,4 @@
<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>
+ </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
new file mode 100644
index 0000000000000000000000000000000000000000..9ac61413d2afd552640f07890dae353e0569ab09
--- /dev/null
+++ b/HelloWeb/web/WEB-INF/view/CompleteOrder.jsp
@@ -0,0 +1,43 @@
+<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
new file mode 100644
index 0000000000000000000000000000000000000000..90e429e371cc87c4bc15e6e5ae64f728cf05a730
--- /dev/null
+++ b/HelloWeb/web/WEB-INF/view/Order.jsp
@@ -0,0 +1,35 @@
+<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
new file mode 100644
index 0000000000000000000000000000000000000000..d8106748f411b9c73c53488a6929904b0faa165b
--- /dev/null
+++ b/HelloWeb/web/WEB-INF/view/SelectDriver.jsp
@@ -0,0 +1,25 @@
+<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
new file mode 100644
index 0000000000000000000000000000000000000000..049039080d0056c6d56999a779d0866d8f8d98e9
--- /dev/null
+++ b/HelloWeb/web/WEB-INF/web.xml
@@ -0,0 +1,17 @@
+<?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
index 22504f9267bb56b7c135ccc41f977d7940e730e0..2b172800278557aa1e28a1c6deb714e1fad2aa5e 100644
--- a/HelloWeb/web/index.jsp
+++ b/HelloWeb/web/index.jsp
@@ -14,7 +14,7 @@
<body>
<h1>Hello World!</h1>
- <form name="Name Input Form" action="Order.jsp">
+ <form name="Name Input Form" action="/HelloWeb/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/HelloWeb/web/js/.gitkeep
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/HelloWeb/web/js/app.js b/HelloWeb/web/js/app.js
deleted file mode 100644
index dbea0f5c367dec9b0cb20f3b11c4ce40644838a3..0000000000000000000000000000000000000000
--- a/HelloWeb/web/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/HelloWeb/web/js/history.js b/HelloWeb/web/js/history.js
deleted file mode 100644
index 4e4b3f528dfb96a699cdbb10ad6ba0b731005f5a..0000000000000000000000000000000000000000
--- a/HelloWeb/web/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/HelloWeb/web/js/selectdriver.js b/HelloWeb/web/js/selectdriver.js
deleted file mode 100644
index 2d7b38f4833461051ad76f37a3eac112a88b0156..0000000000000000000000000000000000000000
--- a/HelloWeb/web/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/HelloWeb/web/js/signup.js b/HelloWeb/web/js/signup.js
deleted file mode 100644
index 43a9342a95538b30e1b8bf663cf3fc0a0b62718f..0000000000000000000000000000000000000000
--- a/HelloWeb/web/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
diff --git a/HelloWeb/web/response.jsp b/HelloWeb/web/response.jsp
deleted file mode 100644
index 57974eb4eb5d11be34b125ef651ba674465e7ffb..0000000000000000000000000000000000000000
--- a/HelloWeb/web/response.jsp
+++ /dev/null
@@ -1,19 +0,0 @@
-<%--
- Document : response
- Created on : Nov 4, 2017, 9:26: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>
- <jsp:useBean id="mybean" scope="session" class="org.mypackage.hello.NameHandler" />
- <jsp:setProperty name="mybean" property="name" />
- <h1>Hello, <jsp:getProperty name="mybean" property="name" />!</h1>
- </body>
-</html>