7 files changed, 174 insertions, 9 deletions
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 @@
 <html>
 <head>
 <meta charset="ISO-8859-1">
-<title>Insert title here</title>
+<title>Login</title>
 </head>
 <body>
-<%
+<h1>Login</h1>
 
-Database db=Database.getInstance();
+<form method="post" action="pages/login.jsp">
+	<input type="text" name="username"> Korisnicko ime 
+	<br>
+	<input type="password" name="password">Sifra
+	<br>
+	<p style="color:red;">
+	<%
+		if(request.getParameter("id")!=null &&request.getParameter("id").equals("-1") )
+			out.print("Pogresan login");
+	%>
+	</p>
+	<p style="color:green;">
+	<%
+		if(request.getParameter("id")!=null &&request.getParameter("id").equals("-2") )
+			out.print("Uspesna registracija");
+	%>
+	</p>
+	<button type="submit">Prijava</button>
+</form>
 
-ArrayList<Monster> m=db.getMonsters();
+<br>
+<a href="pages/registerPage.jsp">
+	<button>Registracija</button>
+</a>
+<br><br>
+<h1>Lista korisnika</h1>
 
-for(Monster mon:m){
-	out.println(mon+"<br>");
-}
 
 
-%>
-
 </body>
 </html>
 \ 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"%>
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="ISO-8859-1">
+<title>Admin</title>
+</head>
+<body>
+
+<h1>Registracija novog admina</h1>
+<form method="post" action="registerAdmin.jsp">
+	<input type="text" name="username"> Korisnicko ime 
+	<br>
+	<input type="password" name="password">Sifra
+	<br>
+	<p style="color:red;">
+	<%
+		if(request.getParameter("id")!=null &&request.getParameter("id").equals("-1") )
+			out.print("Username vec postoji");
+	%>
+	</p>
+	<p style="color:green;">
+	<%
+		if(request.getParameter("id")!=null &&request.getParameter("id").equals("-2") )
+			out.print("Uspesna registracija");
+	%>
+	</p>
+	<button type="submit">Registruj admina</button>
+</form>
+<h1>
+</h1>
+
+
+
+
+</body>
+</html>
+\ 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"%>
+<jsp:useBean id="user" class="models.User"></jsp:useBean>
+
+<jsp:setProperty property="*" name="user"/>
+
+<%
+	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"%>
+<jsp:useBean id="user" class="models.User"></jsp:useBean>
+
+<jsp:setProperty property="*" name="user"/>
+
+<%
+	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"%>
+<jsp:useBean id="user" class="models.User"></jsp:useBean>
+
+<jsp:setProperty property="*" name="user"/>
+
+<%
+	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"%>
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="ISO-8859-1">
+<title>Insert title here</title>
+</head>
+<body>
+<form method="post" action="register.jsp">
+	<input type="text" name="username"> Korisnicko ime 
+	<br>
+	<input type="password" name="password">Sifra
+	<br>
+	<p style="color:red;">
+	<%
+		if(request.getParameter("id")!=null &&request.getParameter("id").equals("-1") )
+			out.print("Username vec postoji");
+	%>
+	</p>
+	<button type="submit">Registracija</button>
+</form>
+</body>
+</html>
+\ 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"%>
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="ISO-8859-1">
+<title>User</title>
+</head>
+<body>
+
+</body>
+</html>
+\ No newline at end of file