admin and user seperation

thomasr13 · Aug 25, 2022 · a588e688634e7671739b8e3ae5245ee361c76bf5 · a588e68
1 parent 47b06bc
commit a588e688634e7671739b8e3ae5245ee361c76bf5
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 5 deletions.
diff --git a/WebContent/admin.jsp b/WebContent/admin.jsp
@@ -23,9 +23,13 @@ List<Product> prod = (List<Product>) request.getAttribute("product");
 
 <!-- custom css file link  -->
 <link rel="stylesheet" href="./css/admin.css">
+<%@include file="/includes/head.jsp"%>
+
 
 </head>
 <body>
+<%@include file="/includes/navbar.jsp"%>
+
 
 
 
@@ -93,6 +97,7 @@ List<Product> prod = (List<Product>) request.getAttribute("product");
 		</div>
 
 	</div>
+
 
 
 </body>

diff --git a/WebContent/css/admin.css b/WebContent/css/admin.css
@@ -134,7 +134,6 @@ html{
 
 
 
-
 @media (max-width:991px){
 
    html{

diff --git a/WebContent/includes/navbar.jsp b/WebContent/includes/navbar.jsp
@@ -1,9 +1,9 @@
 
 
-<%-- <%@page import="cfy.model.User"%>
+<%@page import="cfy.model.User"%>
 <%
-User auth = (User) request.getSession().getAttribute("auth");
-%> --%>
+User usr = (User) request.getSession().getAttribute("auth");
+%>
 
 
 <nav class="navbar navbar-expand-lg navbar-light bg-light">
@@ -19,14 +19,30 @@ User auth = (User) request.getSession().getAttribute("auth");
 		<div class="collapse navbar-collapse" id="navbarSupportedContent">
 			<ul class="navbar-nav ml-auto">
 				<li class="nav-item"><a class="nav-link" href="index.jsp">Home</a></li>
+
+				<%
+				if (usr!=null && usr.getType().equals("user")) {
+				%>
 				<li class="nav-item"><a class="nav-link" href="cart.jsp">Cart
 						<span class="badge badge-danger">${cart_list.size()}</span>
 				</a></li>
+
+
 				<%
-				if (auth != null) {
+				}
+				if (usr != null) {
+					if (usr.getType().equals("user")) {
 				%>
+
+
 				<li class="nav-item"><a class="nav-link" href="orders.jsp">Orders</a></li>
+				<%
+				}
+				%>
+
+
 				<li class="nav-item"><a class="nav-link" href="log-out">Logout</a></li>
+
 				<%
 				} else {
 				%>

diff --git a/WebContent/index.jsp b/WebContent/index.jsp
@@ -12,6 +12,11 @@ if (auth != null) {
     request.setAttribute("person", auth);
 }
 
+if(auth.getType().equals("admin")){
+	response.sendRedirect("admin");
+}
+	
+
 
 ProductDao pd = new ProductDao(DbCon.getConnection());
 List<Product> products = pd.getAllProducts();