login/logout

cypo721 · Jan 13, 2017 · 588af30 · 588af30
1 parent ea1b85b
commit 588af30
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 11 deletions.
diff --git a/api/api.iml b/api/api.iml
@@ -16,5 +16,8 @@
  <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
  <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.3.3.RELEASE" level="project" />
  <orderEntry type="library" name="Maven: javax.validation:validation-api:1.1.0.Final" level="project" />
+ <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.8.5" level="project" />
+ <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.0" level="project" />
+ <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.5" level="project" />
  </component>
 </module>
diff --git a/api/target/classes/dto/MachineDTO.class b/api/target/classes/dto/MachineDTO.class
diff --git a/dao/dao.iml b/dao/dao.iml
@@ -13,6 +13,9 @@
  <orderEntry type="sourceFolder" forTests="false" />
  <orderEntry type="module" module-name="api" />
  <orderEntry type="library" name="Maven: javax.validation:validation-api:1.1.0.Final" level="project" />
+ <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.8.5" level="project" />
+ <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.0" level="project" />
+ <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.5" level="project" />
  <orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:6.9.10" level="project" />
  <orderEntry type="library" scope="TEST" name="Maven: com.beust:jcommander:1.48" level="project" />
  <orderEntry type="library" scope="TEST" name="Maven: org.beanshell:bsh:2.0b4" level="project" />

diff --git a/data/data.iml b/data/data.iml
@@ -20,6 +20,9 @@
  <orderEntry type="module" module-name="dao" />
  <orderEntry type="module" module-name="api" />
  <orderEntry type="library" name="Maven: javax.validation:validation-api:1.1.0.Final" level="project" />
+ <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.8.5" level="project" />
+ <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.0" level="project" />
+ <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.5" level="project" />
  <orderEntry type="library" name="Maven: org.springframework:spring-test:4.3.3.RELEASE" level="project" />
  <orderEntry type="library" name="Maven: org.springframework:spring-orm:4.3.3.RELEASE" level="project" />
  <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.3.RELEASE" level="project" />

diff --git a/service/service.iml b/service/service.iml
@@ -27,6 +27,9 @@
  <orderEntry type="module" module-name="dao" />
  <orderEntry type="module" module-name="api" />
  <orderEntry type="library" name="Maven: javax.validation:validation-api:1.1.0.Final" level="project" />
+ <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.8.5" level="project" />
+ <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.0" level="project" />
+ <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.5" level="project" />
  <orderEntry type="library" name="Maven: org.springframework:spring-test:4.3.3.RELEASE" level="project" />
  <orderEntry type="library" name="Maven: org.springframework:spring-orm:4.3.3.RELEASE" level="project" />
  <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.3.RELEASE" level="project" />

diff --git a/web/src/main/webapp/WEB-INF/jsp/home.jsp b/web/src/main/webapp/WEB-INF/jsp/home.jsp
@@ -1,7 +1,6 @@
-
 <%@ taglib prefix="c" uri="http:https://java.sun.com/jsp/jstl/core" %>
 <%@ taglib tagdir="/WEB-INF/tags" prefix="my" %>
-
+<%@ taglib prefix="sec" uri="http:https://www.springframework.org/security/tags" %>
 <%--
  Created by IntelliJ IDEA.
  User: xjavorka
@@ -19,7 +18,9 @@
  <div class="jumbotron">
  <h1>Hi!</h1>
  <p>Welcome to our project from PA165 course at FI MUNI.</p>
+ <sec:authorize access="isAnonymous()">
  <p>If you want to see and manage all information, please <a href="${pageContext.request.contextPath}/login">log in</a>.</p>
+ </sec:authorize>
  </div>
  <p><h2>Authors:</h2></p>
  <p>

diff --git a/web/src/main/webapp/WEB-INF/tags/template.tag b/web/src/main/webapp/WEB-INF/tags/template.tag
@@ -42,7 +42,7 @@
 
 <div class="container">
  <nav class="navbar navbar-inverse navbar-static-top">
- <div class="container">
+ <div class="container-fluid">
  <div class="navbar-header">
  <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
  <span class="sr-only">Toggle navigation</span>
@@ -61,20 +61,19 @@
  <li><a href="${pageContext.request.contextPath}/rental/list">Rentals</a></li>
 
  <li><a href="${pageContext.request.contextPath}/user/">Users</a></li>
-
+ </ul>
+ <ul class="nav navbar-nav navbar-right">
+ <sec:authorize access="isAnonymous()">
  <li><a href="${pageContext.request.contextPath}/login">Login</a></li>
-
+ </sec:authorize>
+ <sec:authorize access="isAuthenticated()">
+ <li><a><sec:authentication property="principal"/></a></li>
  <li><a href="${pageContext.request.contextPath}/logout">Logout</a></li>
-
-
-
-
-
+ </sec:authorize>
  </ul>
  </div><!--/.nav-collapse -->
  </div>
  </nav>
- </a> <sec:authentication property="principal"/> </a>
 
  <c:if test="${not empty title}">
  <div class="page-header">