7 files changed, 80 insertions, 14 deletions
diff --git a/src/main/webapp/pages/addNewPokemon.jsp b/src/main/webapp/pages/addNewPokemon.jsp
index 201370b..e6f03af 100644
--- a/src/main/webapp/pages/addNewPokemon.jsp
+++ b/src/main/webapp/pages/addNewPokemon.jsp
@@ -7,7 +7,12 @@
 <title>Insert title here</title>
 </head>
 <body>
-
+<%
+boolean isAdmin=(Boolean)session.getAttribute("admin");
+if(!isAdmin){
+	response.sendRedirect("../index.jsp");
+}
+%>
 
 
 <form method="post" action="addNewPokemonHelper.jsp">
diff --git a/src/main/webapp/pages/addNewPokemonHelper.jsp b/src/main/webapp/pages/addNewPokemonHelper.jsp
index 2553bb9..938d70b 100644
--- a/src/main/webapp/pages/addNewPokemonHelper.jsp
+++ b/src/main/webapp/pages/addNewPokemonHelper.jsp
@@ -6,15 +6,12 @@
 <%@page import="models.CONSTS"%>
 <%@page import="java.rmi.Naming"%>
 <%@page import="pokemon.IService"%>
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-    pageEncoding="ISO-8859-1"%>
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="ISO-8859-1">
-<title>Insert title here</title>
-</head>
-<body>
+<%
+boolean isAdmin=(Boolean)session.getAttribute("admin");
+if(!isAdmin){
+	response.sendRedirect("../index.jsp");
+}
+%>
 <jsp:useBean id="pokemon" class="models.PokemonAddModel"></jsp:useBean>
 
 <jsp:setProperty property="*" name="pokemon"/>
@@ -42,5 +39,3 @@ response.sendRedirect("adminIndex.jsp");
 
 %>
 
-</body>
-</html>
-\ No newline at end of file
diff --git a/src/main/webapp/pages/adminIndex.jsp b/src/main/webapp/pages/adminIndex.jsp
index 1b0f4e7..25d021f 100644
--- a/src/main/webapp/pages/adminIndex.jsp
+++ b/src/main/webapp/pages/adminIndex.jsp
@@ -21,14 +21,26 @@
 </style>
 </head>
 <body>
+<%
+boolean isAdmin=(Boolean)session.getAttribute("admin");
+if(!isAdmin){
+	response.sendRedirect("../index.jsp");
+}
+%>
 <a href="logout.jsp">
 	<button>Log out</button>
+</a><br><br>
+<a href="addNewPokemon.jsp">
+	<button>DodajNovogPokemona</button>
 </a>
+
 <h1>Lista korisnika</h1>
 <%
 IService service=(IService)Naming.lookup(CONSTS.rmiUrl);
 ArrayList<User>users=service.getAllUsers();
 request.setAttribute("users", users);
+ArrayList<Monster> monsters=service.getMonsters();
+request.setAttribute("monsters", monsters);
 %>
 
 
@@ -95,6 +107,40 @@ request.setAttribute("users", users);
 </h1>
 
 
+<h1>Svi pokemoni</h1>
+<table>
+<tr>
+<th>Ime</th>
+<th>Opis</th>
+<th>Hp</th>
+<th>Slika</th>
+<th></th>
+</tr>
+<c:forEach items="${monsters}" var="item">
+<tr>
+	<td>
+	<c:out value="${item.name}"/>
+	</td>
+	<td>
+	<c:out value="${item.description}"/>
+	</td>
+	<td>
+	<c:out value="${item.hp}"/>
+	</td>
+	<td>
+	<img style="height: 50px" src="data:image/*;base64, ${item.base64Image }" />
+	</td>
+	<td>
+	<a href="deletePokemon.jsp?monsterId=${item.id}">
+	<button>Izbrisi</button>
+</a>
+	</td>
+</tr> 
+</c:forEach>
+
+</table>
+
+
 
 
 </body>
diff --git a/src/main/webapp/pages/choosePokemon.jsp b/src/main/webapp/pages/choosePokemon.jsp
index 797c89f..61acd75 100644
--- a/src/main/webapp/pages/choosePokemon.jsp
+++ b/src/main/webapp/pages/choosePokemon.jsp
@@ -2,9 +2,12 @@
 <%@page import="java.rmi.Naming"%>
 <%@page import="pokemon.IService"%>
 <%
+boolean isAdmin=(Boolean)session.getAttribute("admin");
+if(isAdmin){
+	response.sendRedirect("../index.jsp");
+}
 
 IService service=(IService)Naming.lookup(CONSTS.rmiUrl);
-out.print(session.getAttribute("id"));
 long userId=(Long)session.getAttribute("id");
 long monsterId=Long.parseLong(request.getParameter("monsterId"));
 
diff --git a/src/main/webapp/pages/deleteUser.jsp b/src/main/webapp/pages/deleteUser.jsp
index e8de025..0abd2f7 100644
--- a/src/main/webapp/pages/deleteUser.jsp
+++ b/src/main/webapp/pages/deleteUser.jsp
@@ -2,6 +2,12 @@
 <%@page import="java.rmi.Naming"%>
 <%@page import="pokemon.IService"%>
 <%
+boolean isAdmin=(Boolean)session.getAttribute("admin");
+if(!isAdmin){
+	response.sendRedirect("../index.jsp");
+}
+%>
+<%
 long userId=Long.parseLong(request.getParameter("userId"));
 IService service=(IService)Naming.lookup(CONSTS.rmiUrl);
 service.deleteUser(userId);
diff --git a/src/main/webapp/pages/registerAdmin.jsp b/src/main/webapp/pages/registerAdmin.jsp
index 1dd42bf..f6d518b 100644
--- a/src/main/webapp/pages/registerAdmin.jsp
+++ b/src/main/webapp/pages/registerAdmin.jsp
@@ -5,7 +5,12 @@
 <jsp:useBean id="user" class="models.User"></jsp:useBean>
 
 <jsp:setProperty property="*" name="user"/>
-
+<%
+boolean isAdmin=(Boolean)session.getAttribute("admin");
+if(!isAdmin){
+	response.sendRedirect("../index.jsp");
+}
+%>
 <%
 	IService service=(IService)Naming.lookup(CONSTS.rmiUrl);
 	user.setAdmin(true);
diff --git a/src/main/webapp/pages/userIndex.jsp b/src/main/webapp/pages/userIndex.jsp
index e54c742..b06d966 100644
--- a/src/main/webapp/pages/userIndex.jsp
+++ b/src/main/webapp/pages/userIndex.jsp
@@ -21,6 +21,12 @@
 </style>
 </head>
 <body>
+<%
+boolean isAdmin=(Boolean)session.getAttribute("admin");
+if(isAdmin){
+	response.sendRedirect("../index.jsp");
+}
+%>
 <a href="logout.jsp">
 	<button>Log out</button>
 </a>