From 49406e2ab015886a05e7c2446b0eb8f71857dd6a Mon Sep 17 00:00:00 2001
From: Irene Edria <ireneedriadr@gmail.com>
Date: Thu, 23 Nov 2017 14:26:20 +0700
Subject: [PATCH] add Order Driver Servlet
---
.../adaapa/adaojek/servlets/LoginServlet.java | 2 ++
.../adaojek/servlets/OrderDriverServlet.java | 21 ++++++++++++
.../WebApp/src/main/webapp/WEB-INF/web.xml | 4 +--
.../WebApp/src/main/webapp/test.jsp | 32 +++++++++++++++++++
4 files changed, 57 insertions(+), 2 deletions(-)
create mode 100644 TugasBesar2_2017/WebApp/src/main/java/com/adaapa/adaojek/servlets/OrderDriverServlet.java
create mode 100644 TugasBesar2_2017/WebApp/src/main/webapp/test.jsp
diff --git a/TugasBesar2_2017/WebApp/src/main/java/com/adaapa/adaojek/servlets/LoginServlet.java b/TugasBesar2_2017/WebApp/src/main/java/com/adaapa/adaojek/servlets/LoginServlet.java
index 2596b24..540f092 100644
--- a/TugasBesar2_2017/WebApp/src/main/java/com/adaapa/adaojek/servlets/LoginServlet.java
+++ b/TugasBesar2_2017/WebApp/src/main/java/com/adaapa/adaojek/servlets/LoginServlet.java
@@ -4,9 +4,11 @@ package com.adaapa.adaojek.servlets;
import com.adaapa.adaojek.middlewares.CookieCheck;
import com.adaapa.adaojek.services.DomainConfig;
import com.adaapa.adaojek.services.RequestSender;
+import com.adaapa.adaojek.services.ServiceConnector;
import com.adaapa.adaojek.stub.ApplicationCookie;
import com.adaapa.bean.LoginRequestBean;
import com.adaapa.bean.LoginResponseBean;
+import com.adaapa.ojekservice.OjekOnline;
import com.google.gson.Gson;
import javax.servlet.ServletException;
diff --git a/TugasBesar2_2017/WebApp/src/main/java/com/adaapa/adaojek/servlets/OrderDriverServlet.java b/TugasBesar2_2017/WebApp/src/main/java/com/adaapa/adaojek/servlets/OrderDriverServlet.java
new file mode 100644
index 0000000..4c66fb3
--- /dev/null
+++ b/TugasBesar2_2017/WebApp/src/main/java/com/adaapa/adaojek/servlets/OrderDriverServlet.java
@@ -0,0 +1,21 @@
+package com.adaapa.adaojek.servlets;
+
+import com.adaapa.adaojek.middlewares.CookieCheck;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+public class OrderDriverServlet extends HttpServlet {
+
+ @Override
+ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws ServletException, IOException {
+ if (!CookieCheck.redirectIfTokenNotFound(req, resp, "login")) {
+ req.setAttribute("user", CookieCheck.getCookie(req).getUsername());
+ req.getRequestDispatcher("WEB-INF/order_driver.jsp").forward(req, resp);
+ }
+ }
+}
\ No newline at end of file
diff --git a/TugasBesar2_2017/WebApp/src/main/webapp/WEB-INF/web.xml b/TugasBesar2_2017/WebApp/src/main/webapp/WEB-INF/web.xml
index cc7818d..779aee4 100644
--- a/TugasBesar2_2017/WebApp/src/main/webapp/WEB-INF/web.xml
+++ b/TugasBesar2_2017/WebApp/src/main/webapp/WEB-INF/web.xml
@@ -143,12 +143,12 @@
</servlet-mapping>
<servlet>
- <servlet-name>OrderDrvier</servlet-name>
+ <servlet-name>OrderDriver</servlet-name>
<servlet-class>com.adaapa.adaojek.servlets.OrderDriverServlet</servlet-class>
</servlet>
<servlet-mapping>
- <servlet-name>OrderDrvier</servlet-name>
+ <servlet-name>OrderDriver</servlet-name>
<url-pattern>/order_driver</url-pattern>
</servlet-mapping>
diff --git a/TugasBesar2_2017/WebApp/src/main/webapp/test.jsp b/TugasBesar2_2017/WebApp/src/main/webapp/test.jsp
new file mode 100644
index 0000000..075d8d6
--- /dev/null
+++ b/TugasBesar2_2017/WebApp/src/main/webapp/test.jsp
@@ -0,0 +1,32 @@
+<%@ include file="/component/header.html" %>
+<%@ include file="/component/nav.html" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+
+<div ng-app= "" class="container">
+ <div class="wrapper row">
+ <div>
+ <div class="page-title row txt-center height-fit float-container">
+ <div class="float-left">
+ <h1 class="inline-block">LOOKING FOR AN ORDER</h1>
+ </div>
+ </div>
+ </div>
+ <div class="order-form">
+ <div class="txt-center">
+ <h2 ng-show="show" class="inline-block">Finding Order....</h2>
+ </div>
+ <div class="txt-center">
+ <button class="find-button" ng-hide="closeFind" ng-click="show=true; showClose=true; closeFind=true">FIND ORDER</button>
+ <button class="close-button-order" ng-show="showClose" ng-click="show=false; closeFind=false; showClose=false">CLOSE</button>
+ </div>
+ </div>
+ </div>
+</div>
+
+<%@include file="/component/footer.html" %>
+
+<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.4/angular.min.js"></script>
+<script>
+ window.onload = toggleActive("nav-order");
+</script>
--
GitLab