diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml
new file mode 100644
index 0000000..c98448e
--- /dev/null
+++ b/WebContent/WEB-INF/web.xml
@@ -0,0 +1,11 @@
+
+
+ Application Name
+
+ index.jsp
+
+
+ 404
+ /html/webpages/error.jsp
+
+
\ No newline at end of file
diff --git a/WebContent/html/imgs/my-icons-collection-128px/png/warning.png b/WebContent/html/imgs/my-icons-collection-128px/png/warning.png
new file mode 100644
index 0000000..68f62c6
Binary files /dev/null and b/WebContent/html/imgs/my-icons-collection-128px/png/warning.png differ
diff --git a/WebContent/html/webpages/error.jsp b/WebContent/html/webpages/error.jsp
new file mode 100644
index 0000000..91076ee
--- /dev/null
+++ b/WebContent/html/webpages/error.jsp
@@ -0,0 +1,40 @@
+
+
+
+
+
+
+
+
+
+
+ Synchrony Financial
+
+
+
+
+
+
+
+
+
+
+
+
+
Error
+
+
Page Does Not Exist
+
+
+
\ No newline at end of file
diff --git a/WebContent/html/webpages/navbar.jsp b/WebContent/html/webpages/navbar.jsp
index ab6850c..b647029 100644
--- a/WebContent/html/webpages/navbar.jsp
+++ b/WebContent/html/webpages/navbar.jsp
@@ -8,10 +8,11 @@
-
+
-
-
+
+
+
@@ -27,11 +28,10 @@
Cookie[] usercookies = request.getCookies();
String navsso = "invalid";
String navname = "error";
+ User self = new User();
Cookie newCookie;
//iterate cookies
- System.out.println("Cookies:\n----------\n");
for(Cookie c : usercookies){
- System.out.println(c.getName());
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
@@ -41,11 +41,10 @@
break;
}
}
- System.out.println("\nnavsso = "+navsso+"\n");
if(navsso.equals("invalid"))//if we didn't get a cookie, redirect to the homepage to log in again!
response.sendRedirect("../../index.jsp");
else{
- User self = EmployeeQueries.getEmployeeByID(Integer.parseInt(navsso));
+ self = EmployeeQueries.getEmployeeByID(Integer.parseInt(navsso));
navname = self.getName();
}
%>
diff --git a/src/entities/User.java b/src/entities/User.java
index 6b600fd..34fdd60 100644
--- a/src/entities/User.java
+++ b/src/entities/User.java
@@ -9,6 +9,10 @@ public class User {
private String email;
private int icon;
+ public User(){
+ //empty
+ }
+
public User(int id, int location, String name, String phone, String email, int icon){
this.id = id;
this.location = location;
+ 
-
-
+
+
+