From 92eab92efb1158b94fd6ce283a92191656649b85 Mon Sep 17 00:00:00 2001 From: Ognjen Cirkovic Date: Thu, 22 Dec 2022 04:22:48 +0100 Subject: Dodate provere role korisnika. Dodat prikaz pokemona kod admina. --- src/main/webapp/pages/addNewPokemon.jsp | 7 +++- src/main/webapp/pages/addNewPokemonHelper.jsp | 17 ++++------ src/main/webapp/pages/adminIndex.jsp | 46 +++++++++++++++++++++++++++ src/main/webapp/pages/choosePokemon.jsp | 5 ++- src/main/webapp/pages/deleteUser.jsp | 6 ++++ src/main/webapp/pages/registerAdmin.jsp | 7 +++- src/main/webapp/pages/userIndex.jsp | 6 ++++ 7 files changed, 80 insertions(+), 14 deletions(-) (limited to 'src') 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 @@ Insert title here - +<% +boolean isAdmin=(Boolean)session.getAttribute("admin"); +if(!isAdmin){ + response.sendRedirect("../index.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"%> - - - - -Insert title here - - +<% +boolean isAdmin=(Boolean)session.getAttribute("admin"); +if(!isAdmin){ + response.sendRedirect("../index.jsp"); +} +%> @@ -42,5 +39,3 @@ response.sendRedirect("adminIndex.jsp"); %> - - \ 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 @@ +<% +boolean isAdmin=(Boolean)session.getAttribute("admin"); +if(!isAdmin){ + response.sendRedirect("../index.jsp"); +} +%> +

+ + +

Lista korisnika

<% IService service=(IService)Naming.lookup(CONSTS.rmiUrl); ArrayListusers=service.getAllUsers(); request.setAttribute("users", users); +ArrayList monsters=service.getMonsters(); +request.setAttribute("monsters", monsters); %> @@ -95,6 +107,40 @@ request.setAttribute("users", users); +

Svi pokemoni

+ + + + + + + + + + + + + + + + + + +
ImeOpisHpSlika
+ + + + + + + + + + + +
+ + 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 @@ - +<% +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 @@ +<% +boolean isAdmin=(Boolean)session.getAttribute("admin"); +if(isAdmin){ + response.sendRedirect("../index.jsp"); +} +%> -- cgit v1.2.3