OjekOnlineApp/nbproject/private/private.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
+    <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
+    <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
+        <group>
+            <file>file:/D:/WBD2/master/TugasBesar2_2017/Tubes2/web/WEB-INF/web.xml</file>
+            <file>file:/D:/WBD2/master/TugasBesar2_2017/Tubes2/web/css/style.css</file>
+            <file>file:/D:/WBD2/master/TugasBesar2_2017/Tubes2/web/WEB-INF/view/login/Login.jsp</file>
+            <file>file:/D:/WBD2/master/TugasBesar2_2017/Tubes2/web/WEB-INF/jspf/Header.jspf</file>
+            <file>file:/D:/WBD2/master/TugasBesar2_2017/Tubes2/web/index.jsp</file>
+            <file>file:/D:/WBD2/master/TugasBesar2_2017/Tubes2/src/java/controller/LoginServlet.java</file>
+            <file>file:/D:/WBD2/master/TugasBesar2_2017/Tubes2/web/WEB-INF/jspf/Footer.jspf</file>
+        </group>
+    </open-files>
+</project-private>

OjekOnlineApp/nbproject/project.properties

+annotation.processing.enabled=true
+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-html-editor-lib.default-html-public-id=HTML5
+build.classes.dir=${build.web.dir}/WEB-INF/classes
+build.classes.excludes=**/*.java,**/*.form
+build.dir=build
+build.generated.dir=${build.dir}/generated
+build.generated.sources.dir=${build.dir}/generated-sources
+build.test.classes.dir=${build.dir}/test/classes
+build.test.results.dir=${build.dir}/test/results
+build.web.dir=${build.dir}/web
+build.web.excludes=${build.classes.excludes}
+client.urlPart=
+compile.jsps=false
+conf.dir=${source.root}/conf
+debug.classpath=${build.classes.dir}:${javac.classpath}
+debug.test.classpath=\
+    ${run.test.classpath}
+display.browser=true
+# Files to be excluded from distribution war
+dist.archive.excludes=
+dist.dir=dist
+dist.ear.war=${dist.dir}/${war.ear.name}
+dist.javadoc.dir=${dist.dir}/javadoc
+dist.war=${dist.dir}/${war.name}
+endorsed.classpath=\
+    ${libs.javaee-endorsed-api-7.0.classpath}
+excludes=
+includes=**
+j2ee.compile.on.save=true
+j2ee.copy.static.files.on.save=true
+j2ee.deploy.on.save=true
+j2ee.platform=1.7-web
+j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/grizzly-npn-bootstrap.jar:${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/cdi-api.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.json.bind-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.security.enterprise-api.jar:${j2ee.server.home}/modules/javax.security.enterprise.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar
+j2ee.platform.embeddableejb.classpath=${j2ee.server.home}/lib/embedded/glassfish-embedded-static-shell.jar
+j2ee.platform.wscompile.classpath=${j2ee.server.home}/modules/webservices-osgi.jar
+j2ee.platform.wsgen.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar
+j2ee.platform.wsimport.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar
+j2ee.platform.wsit.classpath=
+j2ee.server.type=gfv3ee6
+jar.compress=false
+javac.classpath=
+# Space-separated list of extra javac options
+javac.compilerargs=
+javac.debug=true
+javac.deprecation=false
+javac.processorpath=\
+    ${javac.classpath}
+javac.source=1.8
+javac.target=1.8
+javac.test.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}
+javac.test.processorpath=\
+    ${javac.test.classpath}
+javadoc.additionalparam=
+javadoc.author=false
+javadoc.encoding=${source.encoding}
+javadoc.noindex=false
+javadoc.nonavbar=false
+javadoc.notree=false
+javadoc.preview=true
+javadoc.private=false
+javadoc.splitindex=true
+javadoc.use=true
+javadoc.version=false
+javadoc.windowtitle=
+lib.dir=${web.docbase.dir}/WEB-INF/lib
+no.dependencies=false
+persistence.xml.dir=${conf.dir}
+platform.active=default_platform
+resource.dir=setup
+run.test.classpath=\
+    ${javac.test.classpath}:\
+    ${build.test.classes.dir}
+# Space-separated list of JVM arguments used when running a class with a main method or a unit test
+# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value):
+runmain.jvmargs=
+source.encoding=UTF-8
+source.root=src
+src.dir=${source.root}/java
+test.src.dir=test
+war.content.additional=
+war.ear.name=${war.name}
+war.name=Tubes2.war
+web.docbase.dir=web
+webinf.dir=web/WEB-INF

OjekOnlineApp/nbproject/project.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.web.project</type>
+    <configuration>
+        <data xmlns="http://www.netbeans.org/ns/web-project/3">
+            <name>OjekOnlineApp</name>
+            <minimum-ant-version>1.6.5</minimum-ant-version>
+            <web-module-libraries/>
+            <web-module-additional-libraries/>
+            <source-roots>
+                <root id="src.dir" name="Source Packages"/>
+            </source-roots>
+            <test-roots>
+                <root id="test.src.dir" name="Test Packages"/>
+            </test-roots>
+        </data>
+    </configuration>
+</project>

OjekOnlineApp/src/conf/MANIFEST.MF

+Manifest-Version: 1.0
+

OjekOnlineApp/src/java/controller/HistoryServlet.java

+/*
+ * 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 = "HistoryServlet", urlPatterns = {"/History"})
+public class HistoryServlet 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/history" + 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("/History")) {
+            // TODO: Implement add product to cart action
+            
+        // if updateCart action is called
+        } 
+
+        // use RequestDispatcher to forward request internally
+        String url = "/WEB-INF/view/history" + userPath + ".jsp";
+
+        try {
+            request.getRequestDispatcher(url).forward(request, response);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+    }
+
+}

OjekOnlineApp/src/java/controller/LoginServlet.java

+/*
+ * 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 = "LoginServlet", urlPatterns = {"/Login"})
+public class LoginServlet 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/login" + userPath + ".jsp";
+
+        try {
+            request.getRequestDispatcher(url).forward(request, response);
+        } catch (IOException | ServletException ex) {
+        }
+    }
+
+    /**
+     * 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("/Login")) {
+            // TODO: Implement add product to cart action
+            
+        // if updateCart action is called
+        } 
+
+        // use RequestDispatcher to forward request internally
+        String url = "/WEB-INF/view/login" + userPath + ".jsp";
+
+        try {
+            request.getRequestDispatcher(url).forward(request, response);
+        } catch (IOException | ServletException ex) {
+        }
+    }
+
+}

OjekOnlineApp/src/java/controller/OrderServlet.java

+/*
+ * 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 = "OrderServlet", urlPatterns = {"/Order", "/CompleteOrder", "/SelectDriver"})
+public class OrderServlet 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/order" + 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 = "/Order";
+        }
+
+        // use RequestDispatcher to forward request internally
+        String url = "/WEB-INF/view/order" + userPath + ".jsp";
+
+        try {
+            request.getRequestDispatcher(url).forward(request, response);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+    }
+
+}
\ No newline at end of file

OjekOnlineApp/src/java/controller/ProfileServlet.java

+/*
+ * 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 = "ProfileServlet", urlPatterns = {"/Profile", "/EditProfile", "/EditPrefLoc"})
+public class ProfileServlet 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/profile" + 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("/Profile")) {
+            // TODO: Implement add product to cart action
+
+        // if updateCart action is called
+        } else if (userPath.equals("/EditProf")) {
+            // TODO: Implement update cart action
+
+        // if purchase action is called
+        } else if (userPath.equals("/EditPrefLoc")) {
+            // TODO: Implement purchase action
+
+            userPath = "/Order";
+        }
+
+        // use RequestDispatcher to forward request internally
+        String url = "/WEB-INF/view/profile" + userPath + ".jsp";
+
+        try {
+            request.getRequestDispatcher(url).forward(request, response);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+    }
+
+}

OjekOnlineApp/src/java/controller/RegistrasiServlet.java

+/*
+ * 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 = "RegistrasiServlet", urlPatterns = {"/Signup"})
+public class RegistrasiServlet 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/signup" + 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("/Signup")) {
+            // TODO: Implement add product to cart action
+            
+        // if updateCart action is called
+        }
+
+        // use RequestDispatcher to forward request internally
+        String url = "/WEB-INF/view/signup" + userPath + ".jsp";
+
+        try {
+            request.getRequestDispatcher(url).forward(request, response);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+    }
+
+}

OjekOnlineApp/web/WEB-INF/glassfish-web.xml

+<?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>/OjekOnlineApp</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>

OjekOnlineApp/web/WEB-INF/jspf/Footer.jspf

+        <div class="footer">
+            <div>Dayu <br /> 13515067</div>
+            <div>Marvin <br /> 13515076</div>
+            <div>Adrian HP <br /> 13515091</div>
+        </div>
+    </body>
+</html>

OjekOnlineApp/web/WEB-INF/jspf/Header.jspf

+<%-- 
+    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" class="text-link">ORDER</a></div>
+                <div id="historyheader" class="menu-cell"><a href="/History" class="text-link">HISTORY</a></div>
+                <div id="profileheader" class="menu-cell"><a href="/Profile" class="text-link">MY PROFILE</a></div>
+            </div>
+        </div>
\ No newline at end of file

OjekOnlineApp/web/WEB-INF/view/history/History.jsp

+<div class="subtitle-cont subtitle-history">
+    TRANSACTION HISTORY
+</div>
+<div class="body-container">
+    <div class='menu'>
+        <div class="menu-column"></div>
+        <div class="menu-column"></div>
+        <div id="user-his" class="menu-cell" onclick="tabActive('user');">MY PREVIOUS ORDERS</div>
+        <div id="driver-his" class="menu-cell" onclick="tabActive('driver');">DRIVER HISTORY</div>
+    </div>
+</div>
+
+<div id="history-container">
+    <ol class="history-list order-list">
+    <?php foreach($this->historyUser as $history): ?>
+        <li class="list-text-his">
+            <div class="history-pic-div">
+                <img class="profile-pic-his" src=<?php echo $this->image . $history[1]; ?> alt="">
+            </div>
+            <span class="hide">
+            <a href=<?php echo "/history/". $history[0] . "/update/" . $history[1] . "/" . rawurlencode($history[4]); ?>>HIDE</a>
+            </span>
+            <div class="his-text">
+                <div class="date-his"><?php echo htmlentities($history[4]); ?></div>
+                <div class="name-his"><b><?php echo $history[1]; ?></b></div>
+                <div><?php echo $history[5]; ?> - <?php echo $history[6]; ?></div>
+                <div>
+                    You rated : ?<?php echo $history[2]; ?>
+                <div>
+                <div>
+                    You commented:
+                    <div class="comment">
+                        <?php echo $history[3]; ?>
+                    </div>
+                </div>
+            </div>
+        </li>
+    <?php endforeach; ?>
+    </ol>
+
+    <ol class="history-list driver-list">
+
+    <?php foreach($this->historyDriver as $history): ?>
+        <li class="list-text-his">
+            <div class="history-pic-div">
+                <img class="profile-pic-his" src=<?php echo $this->image . $history[0]; ?> alt="" />
+            </div>
+            <span class="hide">
+            <a href=<?php echo "/history/". $history[0] . "/update/" . $history[1] . "/" . rawurlencode($history[4]); ?>>HIDE</a>
+            </span>
+            <div class="his-text">
+                <div class="date-his"><?php echo $history[4]; ?></div>
+                <div><b><?php echo $history[0]; ?></b></div>
+                <div><?php echo $history[5]; ?> - <?php echo $history[6]; ?></div>
+                <div>
+                    gave <span><?php echo $history[2]; ?></span> stars for this order
+                <div>
+                <div>
+                    and left comment:
+                    <div class="comment">
+                        <?php echo $history[3]; ?>
+                    </div>
+                </div>
+            </div>
+        </li>
+    <?php endforeach; ?>
+    </ol>
+</div>
+<script src=<?php echo $this->script; ?>></script>
\ No newline at end of file

OjekOnlineApp/web/WEB-INF/view/login/Login.jsp

+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+        <link rel="stylesheet" href="css/style.css"/>
+    </head>
+    <body>
+        <section class="content-layout">
+            <header class="title">
+              <div>
+                <hr>
+                <h1>LOGIN</h1>
+                <hr>
+              </div>
+            </header>
+            <section class="form-layout">
+              <form action="/Profile" method="post" name="loginform" onsubmit="return loginValidation();">
+                <div class="form-input">
+                  <div>Username</div>
+                  <input id="username" type="text" name="username">
+                </div>
+                <div class="form-input">
+                  <div>Password</div>
+                  <input type="password" name="password">
+                </div>
+                <div id="button-layout">
+                  <div>
+                    <a href="/Signup">Don't have an account?</a>
+                  </div>
+                  <input id="register-button" type="submit" value="GO!">
+                </div>
+              </form>
+            </section>
+          </section>
+    </body>
+</html>

OjekOnlineApp/web/WEB-INF/view/order/CompleteOrder.jsp

+<div class="edit-profile-header">
+    Make an order       
+</div>
+<div class="progress-container">
+    <div class="progress">
+        <div class="progress-num">1</div> Select Destination
+    </div>
+    <div class="progress">
+        <div class="progress-num">2</div> Select a driver
+    </div>
+    <div class="progress selected">
+        <div class="progress-num selected">3</div> Complete your order
+    </div>
+</div>
+<div class="edit-profile-header">
+    How was it?
+</div>
+<form action="/order/<?php echo $this->user; ?>/completeorder/finish" method="post" name="completeorder-form">
+    <div class="completeorder-container">
+    <input type='hidden' name='driver' value='<?php echo $this->driver; ?>'>
+    <input type='hidden' name='from' value='<?php echo $this->from; ?>'>
+    <input type='hidden' name='dest' value='<?php echo $this->dest; ?>'>
+    <img class="driver-completeorder-pic" src="<?php echo $this->image; ?>" alt="">
+    <div class="driver-name-disp">@<?php echo $this->driver; ?></div>
+    <div class="driver-fullname-disp"><?php echo $this->drivername; ?></div>
+    <span class="starRating">
+      <input id="rating5" type="radio" name="rating" value="5">
+      <label for="rating5">5</label>
+      <input id="rating4" type="radio" name="rating" value="4">
+      <label for="rating4">4</label>
+      <input id="rating3" type="radio" name="rating" value="3">
+      <label for="rating3">3</label>
+      <input id="rating2" type="radio" name="rating" value="2">
+      <label for="rating2">2</label>
+      <input id="rating1" type="radio" name="rating" value="1">
+      <label for="rating1">1</label>
+    </span>
+    <textarea cols="5" placeholder="Your comment..." name="comment"></textarea>
+    </div>
+    <div class="right-align">
+        <input class="accept-button select-driver-btn completeorder-btn" type="submit" value="Complete&#13;&#10;Order">
+    </div>
+</form>
\ No newline at end of file

OjekOnlineApp/web/WEB-INF/view/order/Order.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"  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

OjekOnlineApp/web/WEB-INF/view/order/SelectDriver.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>
\ No newline at end of file

OjekOnlineApp/web/WEB-INF/view/profile/EditPrefLoc.jsp

+<div class="container">
+    <h1 class="header"><?php echo $this->title; ?></h1>
+    <form action=<?php echo '/preferred-loc/' . $this->user . '/edit'; ?> method="post">
+        <table style="width:100%">
+        <tr>
+            <th>No</th>
+            <th>Location</th> 
+            <th>Actions</th>
+        </tr>
+        <?php
+            $count = 0;
+            foreach($this->prefLoc as $loc) {
+                $count = $count + 1;
+                echo "<tr class='rows'>";
+                echo "<td id='count'>" . $count . "</td>";
+                echo "<td><div name='location'>" . $loc['location'] . "</div></td>";
+                echo "<td id='action'><img class=\"pref-button\" name=\"edit-button\" src='" .  IMG . "/edit.png' /><a href='/preferred-loc/" . $this->user . "/delete/" . $loc['location'] . "'><img class=\"pref-button\" src='" . IMG . "/delete.png' /></td></a>";
+                echo "</tr>";
+            }
+        ?>
+        </table>
+    </form>
+    <form action=<?php echo '/preferred-loc/' . $this->user . '/finish'; ?> method='post' enctype="multipart/form-data">
+        <div class="edit-profile-btm">
+            <h2 class="header">Add new Location:</h2>
+            <div class="form-input">
+                <input type="text" id="next-button-text" name="location" />
+                <input class="next-button" type="submit" value="Add" />
+            </div>
+        </div>
+    </form>
+</div>
+<script>
+    var edit = Array.prototype.slice.call(document.getElementsByName('edit-button'));
+    var locs = document.getElementsByName('location');
+    var rows = document.getElementsByClassName('rows');
+
+    edit.map(function(x, i) {
+        var loc = locs[i].innerHTML;
+        x.addEventListener('click', function (event) {
+            event.preventDefault();
+            rows[i].cells[1].innerHTML = '<input type="text" name="location_new" value="' + loc + '" /><input type="hidden" name="location_old" value="' + loc +  '"/>';
+            rows[i].cells[2].innerHTML = '<input type="submit" value="Save" />';
+        });
+    });
+</script>
\ No newline at end of file

OjekOnlineApp/web/WEB-INF/view/profile/EditProfile.jsp

+<div class="edit-profile-container">
+    <form action='/editprofile/<?php echo $this->user; ?>/finish' method='post' onsubmit="return editProfileValidation();" enctype="multipart/form-data" name="editprofile-form">
+        <h1 class="edit-profile-header">Edit Profile Information</h1>
+            <img id="profile-pic" src="<?php echo $this->image; ?>" alt="">
+            <div class="img-chooser">
+            <p>Update profile picture</p>
+            <input type="file" name="image" accept="image/jpeg, image/png">
+        </div>
+        <div class="edit-profile-btm">
+            <div class="form-editprofile">
+                <label for="your-name">Your Name</label>
+                <input class="ep-textarea" type="text" name="your-name" value="<?php echo $this->name; ?>">
+            </div>
+            <div class="form-editprofile">
+                <label for="phone-number">Phone</label>
+                <input class="ep-textarea" type="text" name="phone-number" value="<?php echo $this->phone; ?>">
+            </div>
+            <div class="button-form">
+                <div>
+                    Status driver
+                </div>
+                <label class="switch">
+                    <input type="checkbox" name="is-driver" <?php echo $this->isDriver; ?>>
+                    <span class="slider round"></span>
+                </label>
+            </div>
+            <a href='/Profile'><input class="cancel-button" value="Back"></a>
+            <input class="accept-button" id="save-profile" type="submit" value="Save">
+        </div>
+    </form>
+</div>
\ No newline at end of file