diff --git a/WebContent/html/webpages/adminApprove.jsp b/WebContent/html/webpages/adminApprove.jsp index 773165c..6c999ef 100644 --- a/WebContent/html/webpages/adminApprove.jsp +++ b/WebContent/html/webpages/adminApprove.jsp @@ -71,11 +71,16 @@ .table{ width: auto; background-color: #E9EAEB; + margin: 0 auto; } tbody{ text-align: left; } + + .btn{ + margin-top: 15px; + } diff --git a/WebContent/html/webpages/logout.jsp b/WebContent/html/webpages/logout.jsp new file mode 100644 index 0000000..1d7cba8 --- /dev/null +++ b/WebContent/html/webpages/logout.jsp @@ -0,0 +1,22 @@ +<%@ page import = "database.*" %> +<%@ page language="java" contentType="text/html; charset=ISO-8859-1" + pageEncoding="ISO-8859-1"%> +<%@ page import = "java.sql.*" %> + +<% +Cookie[] usercookies = request.getCookies(); +if(usercookies != null){ + for(Cookie c : usercookies){ + if(c.getName().equals("ssoNum")){//when (and if) we get to user cookie we want to reset it + c.setMaxAge(0);//delete current + Cookie newCookie = new Cookie("ssoNum","");//make new one + newCookie.setMaxAge(0); + newCookie.setPath("/"); + response.addCookie(newCookie); + break; + } + } +} +response.sendRedirect("index.jsp"); +return; +%> \ No newline at end of file diff --git a/WebContent/html/webpages/logoutPage.jsp b/WebContent/html/webpages/logoutPage.jsp new file mode 100644 index 0000000..1161ef7 --- /dev/null +++ b/WebContent/html/webpages/logoutPage.jsp @@ -0,0 +1,36 @@ + + + + + + + + + + + Synchrony Financial + + + + + + + + + + +
+

You Have Logged Out.

+ +
+ + \ No newline at end of file diff --git a/WebContent/html/webpages/navbar.jsp b/WebContent/html/webpages/navbar.jsp index ab4cbb2..8d1a49d 100644 --- a/WebContent/html/webpages/navbar.jsp +++ b/WebContent/html/webpages/navbar.jsp @@ -22,6 +22,7 @@
  • Return Device
  • Device Listing
  • Shopping Cart
    • +
  • Logout
    • <% @@ -34,12 +35,15 @@ if(usercookies != null){ for(Cookie c : usercookies){ if(c.getName().equals("ssoNum")){//when (and if) we get to user cookie we want to reset it - navsso = c.getValue(); - c.setMaxAge(0);//delete current - newCookie = new Cookie("ssoNum",navsso);//make new one - newCookie.setMaxAge(30*60); - response.addCookie(newCookie); - break; + if(c.getValue().equals("") == false){ + navsso = c.getValue(); + c.setMaxAge(0);//delete current + newCookie = new Cookie("ssoNum",navsso);//make new one + newCookie.setMaxAge(30*60); + newCookie.setPath("/"); + response.addCookie(newCookie); + break; + } } } } diff --git a/WebContent/index.jsp b/WebContent/index.jsp index c9e4a6a..bec4e8a 100644 --- a/WebContent/index.jsp +++ b/WebContent/index.jsp @@ -122,15 +122,11 @@ Cookie newCookie; if(usercookies != null){ for(Cookie c : usercookies){ if(c.getName().equals("ssoNum")){//when (and if) we get to user cookie we want to reset it - navsso = c.getValue(); - c.setMaxAge(0);//delete current - newCookie = new Cookie("ssoNum",navsso); //make new one - newCookie.setMaxAge(30*60); - response.addCookie(newCookie); - break; + if(c.getValue().equals("") == false){ + response.sendRedirect("html/webpages/index.jsp"); + return; + } } } -} -if(navsso.equals("invalid") == false)//if we did get cookie, redirect to the homepage! - response.sendRedirect("html/webpages/index.jsp"); +} %> diff --git a/WebContent/userLogin.jsp b/WebContent/userLogin.jsp index 54f84ca..373502d 100644 --- a/WebContent/userLogin.jsp +++ b/WebContent/userLogin.jsp @@ -21,6 +21,7 @@ if (result.next()){ session.setAttribute("ssoNum", ssoNum); userCookie = new Cookie("ssoNum", Integer.toString(ssoNum)); userCookie.setMaxAge(30*60); + userCookie.setPath("/"); response.addCookie(userCookie); stmt.close(); connection.close(); @@ -28,7 +29,7 @@ if (result.next()){ } else { stmt.close(); connection.close(); - response.sendRedirect("index.jsp"); + response.sendRedirect("html/webpages/index.jsp"); } %> \ No newline at end of file