Merge branch 'master' into dev-chat-driver

TugasBesar2_2017/WebApp/src/main/java/com/adaapa/adaojek/servlets/EditProfileServlet.java

@@ -28,7 +28,7 @@ public class EditProfileServlet extends HttpServlet{
     ApplicationCookie cookie = CookieCheck.getCookie(req);
     WebServiceBean wsBean = new Gson().fromJson(service.getProfile(cookie.getToken()), WebServiceBean.class);
     if(wsBean.getStatus().equals(WebServiceBean.STATUS_INVALID)) {
-      resp.sendRedirect("/login");
+      resp.sendRedirect("login");
     } else {
       UserBean ubean = new Gson().fromJson(wsBean.getBody(),UserBean.class);
       req.setAttribute("userProfile",ubean);
@@ -39,7 +39,7 @@ public class EditProfileServlet extends HttpServlet{
   @Override
   protected void doPost(HttpServletRequest req, HttpServletResponse resp)
       throws ServletException, IOException {
-    CookieCheck.redirectIfTokenNotFound(req, resp,"/login");
+    CookieCheck.redirectIfTokenNotFound(req, resp,"login");
     PrintWriter out = resp.getWriter();
  //   out.println(req.getParameter("name"));
     UserBean userBean = new UserBean();
@@ -63,7 +63,7 @@ public class EditProfileServlet extends HttpServlet{
 
     Gson gson = new Gson();
     service.editProfile(cookie.getToken(),gson.toJson(userBean));
-    resp.sendRedirect("/profile");
+    resp.sendRedirect("profile");
 
   }
 }

TugasBesar2_2017/WebApp/src/main/java/com/adaapa/adaojek/servlets/LogoutServlet.java

@@ -22,7 +22,7 @@ public class LogoutServlet extends HttpServlet {
   @Override
   protected void doGet(HttpServletRequest req, HttpServletResponse resp)
       throws ServletException, IOException {
-    if(!CookieCheck.redirectIfTokenNotFound(req,resp,"/login")) {
+    if(!CookieCheck.redirectIfTokenNotFound(req,resp,"login")) {
       DomainConfig domain = DomainConfig.getInstance();
       Gson gson = new Gson();
       String response = RequestSender.sendRequest(
@@ -40,7 +40,7 @@ public class LogoutServlet extends HttpServlet {
       } else {
         //Do nothing
       }
-      resp.sendRedirect("/login");
+      resp.sendRedirect("login");
     }
   }
 }

TugasBesar2_2017/WebApp/src/main/java/com/adaapa/adaojek/servlets/OrderServlet.java

@@ -12,7 +12,7 @@ public class OrderServlet extends HttpServlet {
   @Override
   protected void doGet(HttpServletRequest req, HttpServletResponse resp)
       throws ServletException, IOException {
-    if(!CookieCheck.redirectIfTokenNotFound(req,resp,"/login")) {
+    if(!CookieCheck.redirectIfTokenNotFound(req,resp,"login")) {
       req.setAttribute("user", CookieCheck.getCookie(req).getUsername());
       req.getRequestDispatcher("WEB-INF/order.jsp").forward(req, resp);
     }

TugasBesar2_2017/WebApp/src/main/java/com/adaapa/adaojek/servlets/PreferredLocationServlet.java

@@ -18,7 +18,7 @@ public class PreferredLocationServlet extends HttpServlet{
   @Override
   protected void doGet(HttpServletRequest req, HttpServletResponse resp)
       throws ServletException, IOException {
-    if(!CookieCheck.redirectIfTokenNotFound(req,resp,"/login")) {
+    if(!CookieCheck.redirectIfTokenNotFound(req,resp,"login")) {
       OjekOnline service = ServiceConnector.getServiceClass();
       ApplicationCookie cookie = CookieCheck.getCookie(req);
       Gson gson = new Gson();
@@ -45,7 +45,7 @@ public class PreferredLocationServlet extends HttpServlet{
       if(wsBean.getStatus().equals(WebServiceBean.STATUS_INVALID)) {
         resp.sendRedirect("logout");
       } else{
-        resp.sendRedirect("/preferred_location");
+        resp.sendRedirect("preferred_location");
       }
     }
   }

TugasBesar2_2017/WebApp/src/main/java/com/adaapa/adaojek/servlets/ProfileServlet.java

@@ -20,7 +20,7 @@ public class ProfileServlet extends HttpServlet {
   @Override
   protected void doGet(HttpServletRequest req, HttpServletResponse resp)
       throws ServletException, IOException {
-    if(!CookieCheck.redirectIfTokenNotFound(req,resp,"/login")) {
+    if(!CookieCheck.redirectIfTokenNotFound(req,resp,"login")) {
       OjekOnline service = ServiceConnector.getServiceClass();
       PrintWriter out = resp.getWriter();
       String token = CookieCheck.getCookie(req).getToken();
@@ -30,7 +30,7 @@ public class ProfileServlet extends HttpServlet {
               WebServiceBean.class);
 
       if (webServiceBean.getStatus().equals(WebServiceBean.STATUS_INVALID)) {
-        resp.sendRedirect("/logout");
+        resp.sendRedirect("logout");
       } else {
         //  out.println(webServiceBean.getBody());
         UserBean ubean = gson.fromJson(webServiceBean.getBody(), UserBean.class);

TugasBesar2_2017/WebApp/src/main/java/com/adaapa/adaojek/servlets/RegisterServlet.java

@@ -28,7 +28,7 @@ public class RegisterServlet extends HttpServlet{
   @Override
   protected void doGet(HttpServletRequest req, HttpServletResponse resp)
       throws ServletException, IOException {
-    if(!CookieCheck.redirectIfTokenFound(req,resp,"/order")) {
+    if(!CookieCheck.redirectIfTokenFound(req,resp,"order")) {
       req.getRequestDispatcher("WEB-INF/signup.jsp").forward(req,resp);
     }
   }
@@ -66,10 +66,10 @@ public class RegisterServlet extends HttpServlet{
       ServiceConnector.getServiceClass().addUser(loginResponse.getAccessToken(), gson.toJson(wsUser));
       resp.addCookie(cookie);
       if(isDriver) {
-        resp.sendRedirect("/profile");
+        resp.sendRedirect("profile");
       }
       else {
-        resp.sendRedirect("/index");
+        resp.sendRedirect("index");
       }
     } else {
       req.setAttribute("errorMessage","Registrasi Gagal");

TugasBesar2_2017/WebApp/src/main/webapp/WEB-INF/driver_history.jsp

@@ -19,14 +19,14 @@
                 </div>
             </div>
             <div class="row inline-flex history-menu">
-                <a href="/history">
+                <a href="history">
 
                     <div>
                         My Previous Order
 
                     </div>
                 </a>
-                <a href="/driver_history">
+                <a href="driver_history">
                     <div class="active">
                         Driver History
                     </div>

TugasBesar2_2017/WebApp/src/main/webapp/WEB-INF/edit_preferences.jsp

@@ -33,7 +33,7 @@
                 <tr>
                     <td><%= i %></td>
                     <td>
-                        <form action="/edit_preferred_location" method="post" id="form-update-${item.getPosition()}">
+                        <form action="edit_preferred_location" method="post" id="form-update-${item.getPosition()}">
                             <input type="hidden" value="${item.getPosition()}" name="position">
                             <input value="${item.getLocation()}"  class="form-input" id="edit-input-${item.getPosition()}" disabled name="location">
                         </form>
@@ -41,7 +41,7 @@
                     <td>
                             <span><button class="edit-button inline-block" type="button" onclick=toggleEdit(${item.getPosition()})
                                                 id="edit-button-${item.getPosition()}"></button></span>
-                        <form action="/delete_location" class="display-inline-block" onsubmit="return confirm('Are You Sure')" method="post">
+                        <form action="delete_location" class="display-inline-block" onsubmit="return confirm('Are You Sure')" method="post">
                             <input type="hidden" value="${item.getPosition()}" name="position">
                             <span><button class="delete-button inline-block" type="submit"></button></span>
                         </form>

TugasBesar2_2017/WebApp/src/main/webapp/WEB-INF/edit_profile.jsp

@@ -70,7 +70,7 @@
                 </tr>
                 <tr>
                     <td>
-                        <a href="/profile">
+                        <a href="profile">
                         <button id="back-button" type="button" class="submit-button">Back</button>
                         </a>
                     </td>

TugasBesar2_2017/WebApp/src/main/webapp/WEB-INF/find_driver.jsp

@@ -28,7 +28,7 @@
             </li>
             </ul>
         </div>
-        <form action="/complete_order" method="get">
+        <form action="complete_order" method="get">
             <input type="hidden" name="pickUp" value="${pickup}">
             <input type="hidden" name="destination" value="${destination}">
             <div class="order-panel">

TugasBesar2_2017/WebApp/src/main/webapp/WEB-INF/history.jsp

@@ -19,14 +19,14 @@
                 </div>
             </div>
             <div class="row inline-flex history-menu">
-                <a href="/history">
+                <a href="history">
 
                 <div class="active">
                     My Previous Order
 
                 </div>
                 </a>
-                <a href="/driver_history">
+                <a href="driver_history">
                 <div>
                     Driver History
                 </div>

TugasBesar2_2017/WebApp/src/main/webapp/WEB-INF/order.jsp

@@ -30,7 +30,7 @@
             </ul>
         </div>
         <div class="order-form">
-            <form action="/find_driver" onsubmit="return validateForm(this)" method="get">
+            <form action="find_driver" onsubmit="return validateForm(this)" method="get">
                 <table>
                     <tr>
                         <td>Picking Point</td>

TugasBesar2_2017/WebApp/src/main/webapp/WEB-INF/signup.jsp

@@ -15,7 +15,7 @@
                out.println("<span class='color-red'>SignUp Gagal</span>");
             }
             %>
-            <form action="/register" method="post" onsubmit="return validateForm(this)">
+            <form action="register" method="post" onsubmit="return validateForm(this)">
                 <div class="form-box-body-wrapper">
                     <table border="0" class="form-box-table">
                         <tr>

TugasBesar2_2017/WebApp/src/main/webapp/component/footer.html

-<script src="../js/app.js"></script>
+<script src="js/app.js"></script>
 </body>
 </html>
\ No newline at end of file

TugasBesar2_2017/WebApp/src/main/webapp/component/nav.html

 <nav class="navbar">
     <div class="row navbar-top">
         <div class="inline-block float-left txt-left">
-            <img src="../img/logo.png" class="margin-auto height-100">
+            <img src="img/logo.png" class="margin-auto height-100">
         </div>
         <div class="inline-block float-right txt-right">
             Hi,${user}!
             <br>
-            <a href="/logout">Logout</a>
+            <a href="logout">Logout</a>
         </div>
     </div>
 
     <br>
     <div class="inline-flex" id="navbar-menu">
 
-        <a href="/order">
+        <a href="order">
             <div id="nav-order">
                 <span>ORDER</span>
             </div>
         </a>
-    <a href="/history">
+    <a href="history">
         <div id="nav-history">
             <span>HISTORY</span>
         </div>
     </a>
-    <a href="/profile">
+    <a href="profile">
         <div id="nav-profile">
             <span> MY PROFILE</span>
         </div>