From c2f57deb7c7216cd7b95c7f0fc4885c6350b38f6 Mon Sep 17 00:00:00 2001 From: Ognjen Cirkovic Date: Thu, 22 Dec 2022 01:07:57 +0100 Subject: Napravljene stranice za login i registraciju.I index stranice za user-a i admin-a. Omogucena registracija i login. Klase zadovoljavaju bean standard. --- src/main/webapp/index.jsp | 38 +++++++++++++++++++++++++-------- src/main/webapp/pages/adminIndex.jsp | 38 +++++++++++++++++++++++++++++++++ src/main/webapp/pages/login.jsp | 32 +++++++++++++++++++++++++++ src/main/webapp/pages/register.jsp | 19 +++++++++++++++++ src/main/webapp/pages/registerAdmin.jsp | 20 +++++++++++++++++ src/main/webapp/pages/registerPage.jsp | 24 +++++++++++++++++++++ src/main/webapp/pages/userIndex.jsp | 12 +++++++++++ 7 files changed, 174 insertions(+), 9 deletions(-) create mode 100644 src/main/webapp/pages/adminIndex.jsp create mode 100644 src/main/webapp/pages/login.jsp create mode 100644 src/main/webapp/pages/register.jsp create mode 100644 src/main/webapp/pages/registerAdmin.jsp create mode 100644 src/main/webapp/pages/registerPage.jsp create mode 100644 src/main/webapp/pages/userIndex.jsp (limited to 'src/main/webapp') diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 68385f6..2086f22 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -1,3 +1,5 @@ +<%@page import="java.rmi.Naming"%> +<%@page import="pokemon.IService"%> <%@page import="java.util.ArrayList"%> <%@page import="models.Monster"%> <%@page import="models.User"%> @@ -9,21 +11,39 @@ -Insert title here +Login -<% +

Login

-Database db=Database.getInstance(); +
+ Korisnicko ime +
+ Sifra +
+

+ <% + if(request.getParameter("id")!=null &&request.getParameter("id").equals("-1") ) + out.print("Pogresan login"); + %> +

+

+ <% + if(request.getParameter("id")!=null &&request.getParameter("id").equals("-2") ) + out.print("Uspesna registracija"); + %> +

+ +
-ArrayList m=db.getMonsters(); +
+ + + +

+

Lista korisnika

-for(Monster mon:m){ - out.println(mon+"
"); -} -%> - \ No newline at end of file diff --git a/src/main/webapp/pages/adminIndex.jsp b/src/main/webapp/pages/adminIndex.jsp new file mode 100644 index 0000000..e4225e2 --- /dev/null +++ b/src/main/webapp/pages/adminIndex.jsp @@ -0,0 +1,38 @@ +<%@ page language="java" contentType="text/html; charset=ISO-8859-1" + pageEncoding="ISO-8859-1"%> + + + + +Admin + + + +

Registracija novog admina

+
+ Korisnicko ime +
+ Sifra +
+

+ <% + if(request.getParameter("id")!=null &&request.getParameter("id").equals("-1") ) + out.print("Username vec postoji"); + %> +

+

+ <% + if(request.getParameter("id")!=null &&request.getParameter("id").equals("-2") ) + out.print("Uspesna registracija"); + %> +

+ +
+

+

+ + + + + + \ No newline at end of file diff --git a/src/main/webapp/pages/login.jsp b/src/main/webapp/pages/login.jsp new file mode 100644 index 0000000..71650c5 --- /dev/null +++ b/src/main/webapp/pages/login.jsp @@ -0,0 +1,32 @@ +<%@page import="models.User"%> +<%@page import="models.CONSTS"%> +<%@page import="java.rmi.Naming"%> +<%@page import="pokemon.IService"%> + + + + +<% + IService service=(IService)Naming.lookup(CONSTS.rmiUrl); + User s=service.login(user); + if(s==null) + { + response.sendRedirect("../index.jsp?id=-1"); + }else { + session.setAttribute("id", s.getId()); + session.setAttribute("username", s.getUsername()); + session.setAttribute("admin", s.isAdmin()); + if(s.isAdmin()) + response.sendRedirect("adminIndex.jsp"); + else + response.sendRedirect("userIndex.jsp"); + } + + + + + + + + +%> \ No newline at end of file diff --git a/src/main/webapp/pages/register.jsp b/src/main/webapp/pages/register.jsp new file mode 100644 index 0000000..e8de339 --- /dev/null +++ b/src/main/webapp/pages/register.jsp @@ -0,0 +1,19 @@ +<%@page import="models.User"%> +<%@page import="models.CONSTS"%> +<%@page import="java.rmi.Naming"%> +<%@page import="pokemon.IService"%> + + + + +<% + IService service=(IService)Naming.lookup(CONSTS.rmiUrl); + boolean s=service.addUser(user); + if(s) + { + response.sendRedirect("../index.jsp?id=-2"); + } + else{ + response.sendRedirect("registerPage.jsp?id=-1"); + } +%> \ No newline at end of file diff --git a/src/main/webapp/pages/registerAdmin.jsp b/src/main/webapp/pages/registerAdmin.jsp new file mode 100644 index 0000000..1dd42bf --- /dev/null +++ b/src/main/webapp/pages/registerAdmin.jsp @@ -0,0 +1,20 @@ +<%@page import="models.User"%> +<%@page import="models.CONSTS"%> +<%@page import="java.rmi.Naming"%> +<%@page import="pokemon.IService"%> + + + + +<% + IService service=(IService)Naming.lookup(CONSTS.rmiUrl); + user.setAdmin(true); + boolean s=service.addUser(user); + if(s) + { + response.sendRedirect("adminIndex.jsp?id=-2"); + } + else{ + response.sendRedirect("adminIndex.jsp?id=-1"); + } +%> \ No newline at end of file diff --git a/src/main/webapp/pages/registerPage.jsp b/src/main/webapp/pages/registerPage.jsp new file mode 100644 index 0000000..0f6cf3e --- /dev/null +++ b/src/main/webapp/pages/registerPage.jsp @@ -0,0 +1,24 @@ +<%@ page language="java" contentType="text/html; charset=ISO-8859-1" + pageEncoding="ISO-8859-1"%> + + + + +Insert title here + + +
+ Korisnicko ime +
+ Sifra +
+

+ <% + if(request.getParameter("id")!=null &&request.getParameter("id").equals("-1") ) + out.print("Username vec postoji"); + %> +

+ +
+ + \ No newline at end of file diff --git a/src/main/webapp/pages/userIndex.jsp b/src/main/webapp/pages/userIndex.jsp new file mode 100644 index 0000000..6379107 --- /dev/null +++ b/src/main/webapp/pages/userIndex.jsp @@ -0,0 +1,12 @@ +<%@ page language="java" contentType="text/html; charset=ISO-8859-1" + pageEncoding="ISO-8859-1"%> + + + + +User + + + + + \ No newline at end of file -- cgit v1.2.3