Ajout css, img et refonte graphique

Zak
1 parent 8a362652
Showing 9 changed files with 173 additions and 30 deletions Show diff stats
src/main/java/fr/plil/sio/web/mvc/ApplicationSecurityConfiguration.java
src/main/java/fr/plil/sio/web/mvc/DetteRepository.java
src/main/java/fr/plil/sio/web/mvc/UserRestController.java
src/main/java/fr/plil/sio/web/mvc/UserService.java
src/main/java/fr/plil/sio/web/mvc/UserServiceImpl.java
src/main/webapp/WEB-INF/pages/viewUsers.jsp
src/main/webapp/css/kawafile.css
src/main/webapp/img/money_icon.png
src/main/webapp/js/kawafile.js
@@ -31,6 +31,7 @@ public class ApplicationSecurityConfiguration extends WebSecurityConfigurerAdapt
                 .antMatchers("/js/**").permitAll()
                 .antMatchers("/css/**").permitAll()
                 .antMatchers("/bootstrap/**").permitAll()
+                .antMatchers("/img/**").permitAll()
                 .anyRequest().authenticated()
                 .and()
                 .formLogin()
@@ -11,5 +11,7 @@ import org.springframework.data.jpa.repository.JpaRepository;
 public interface DetteRepository  extends JpaRepository<Dette,Long>{
     Dette findById(Long id);
     List<Dette> findByBorrower(User borrower);
-            
+    
+    List<Dette> findByCreditor(User creditor);
+    
 }
@@ -7,6 +7,8 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.annotation.Resource;
 import java.util.List;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.web.bind.annotation.RequestParam;
 @RestController
@@ -20,6 +22,13 @@ public class UserRestController {
         return userService.findAll();
     }
+    @RequestMapping(value="/api/connectedUser/",method=RequestMethod.GET)
+    public User connectedUser() {
+        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+        User usr = (User)authentication.getPrincipal();       
+        return usr;
+    }
+    
     @RequestMapping(value = "/api/users/{username}/", method = RequestMethod.GET)
     public User listUsers(@PathVariable String username) {
         return userService.findByUsername(username);
@@ -30,6 +39,11 @@ public class UserRestController {
         return userService.findDettes();
     }
+    @RequestMapping(value = "/api/creances/", method = RequestMethod.GET)
+    public List<Dette> listCreances(){
+        return userService.findCreances();
+    }
+    
     @RequestMapping(value = "/api/addDette/", method = RequestMethod.POST)
     public Dette addDette(@RequestParam(value="username",required=false) String username,@RequestParam(value="sommeDette",required=false) String sommeDette) {
         return userService.addDette(username,sommeDette);
@@ -10,6 +10,8 @@ public interface UserService {
     User findByUsername(String username);
     List<Dette> findDettes();
+    
+    List<Dette> findCreances();
     List<User> findAll();
@@ -56,6 +56,14 @@ public class UserServiceImpl implements UserService {
     @Override
     @Transactional(readOnly = true)
+    public List<Dette> findCreances() {
+        String username = securityService.findLoggedInUsername();
+        User user = userRepository.findByUsername(username);
+        return detteRepository.findByCreditor(user);
+    }
+    
+    @Override
+    @Transactional(readOnly = true)
     public List<User> findAll() {
         return userRepository.findAll();
     }
+<%@page import="org.springframework.security.core.context.SecurityContextHolder"%>
+<%@page import="org.springframework.security.core.Authentication"%>
 <%@ page contentType="text/html" pageEncoding="UTF-8" %>
 <%@ taglib uri="http://www.springframework.org/tags" prefix="spring" %>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ page session="true" %>
 <jsp:include page="header.jsp">
     <jsp:param name="pageTitle" value="View users page"/>
 </jsp:include>
 <body>
-    
+    <nav class="navbar navbar-inverse navbar-fixed-top">
+        <div class="container-fluid">
+            <div class="collapse navbar-collapse">
+                <p class="navbar-text navbar-center"><i class="glyphicon glyphicon-euro"></i> <span class="title">Banque</span>  </p>
+            
+                <ul class="nav navbar-nav navbar-right">
+                    <li>
+                        <p id="usrCo"></p>
+                    </li>
+                    <li>
+                        <a href="login?logout"><spring:message code="view.users.main.logout"/></a>
+                    </li>
+                </ul>
+            </div>
+        </div>
+    </nav>
     <div class="row headerSpace">
-        
+        <img class="imgTitle" src="/img/money_icon.png" />
     </div>
-    <div class="row">
+    
          <div class="addDebt">
                 <form>
                             <div class="form-group">
@@ -37,23 +55,41 @@
                   </form>
          </div>
-    </div>
+    
+   
-   <div class="row">
-       <table class="table table-stripped debtsTable">
-           <thead>
-            <td>Emprunteur</td>
-            <td>Somme</td>
-            <td>Action</td>
-           </thead>
-           <tbody id="dettes">
+       <table class="table-container">
+           <tr>
+               <td valign="top">
+                    <table class="table table-stripped debtsTable">
+                            <thead>
+                             <td>Créditeur</td>
+                             <td>Somme</td>            
+                            </thead>
+                            <tbody id="dettes">
+
+                            </tbody>                                 
+                        </table>
+               </td>
-           </tbody>
-           
-           
-           
+               <td valign="top">
+                    <table class="table table-stripped debtsTable">
+                            <thead>
+                            <td>Emprunteur</td>
+                             <td>Somme</td>
+                             <td>Action</td>
+                            </thead>
+                            <tbody id="creances">
+
+                            </tbody>
+                        </table>
+               </td>
+           </tr>
        </table>
-    </div>
+       
+       
+    
+    
 body{
     background-color:#9cd2d2;
     font-size:22px;
+       font-family: Montserrat,"Helvetica Neue",Helvetica,Arial,sans-serif;
 }
 .signInForm {
     width:500px;
@@ -34,7 +35,7 @@ body{
 }
 .headerSpace {
-    margin-top: 150px;
+    margin-top: 90px;
 }
 .control-group {
@@ -53,10 +54,11 @@ label {
 .debtsTable {
     margin-top:30px;
-    width:65%;
-    margin-left:auto;
-    margin-right:auto;
+    vertical-align:top;
         text-align:center;
+        width:99%;
+        margin:5px;
+        padding:5px;
     /*background-color:white;*/
 }
@@ -70,3 +72,58 @@ label {
 tbody {
     background-color:#FFEBDB;
 }
+
+.table-container {
+    width:70%;
+    margin-right:auto;
+ margin-left:auto;
+    text-align:center;
+}
+
+.table-container>tbody {
+    background-color:transparent;
+}
+
+.navbar-inverse {
+    background-color:#293c3c;
+}
+
+.navbar-center
+{
+    position: absolute;
+    width: 100%;
+    left: 0;
+    top: 0;
+    text-align: center;
+    vertical-align:top;
+}
+
+.navbar-inverse .navbar-nav>li>a {
+    color:#cccccc;
+}
+
+.navbar-inverse .navbar-nav>li>p {
+    margin-top:8px;
+    vertical-align:top;
+    color:#cccccc;
+}
+
+.navbar-inverse .navbar-text{
+    margin-top:5px;
+    color:white;
+}
+.title {
+    font-size:29px;
+}
+
+.imgTitle {
+    width:200px;
+    height:200px;
+    text-align:center;
+}
+
+img {
+    display: block;
+    margin: 0 auto;
+    margin-bottom:30px;
+}
 \ No newline at end of file
 var debtsOfUser = [];
+function getConnectedUser(){    
+    var url = '/api/connectedUser/';
+        $.getJSON(url,function(d){
+            $("#usrCo").html(d.username);
+        });
+    
+}
+
 function getDebtsOfUser(){
     var url = "/api/debts/";
     var html ="";
@@ -8,6 +16,23 @@ function getDebtsOfUser(){
             $.each(d,function(index,item){
                 html+="<tr>";
                 html+="<td>"+item.creditor.username+"</td>";
+                html+="<td>"+item.sommeDette+"</td>";               
+                html+="</tr>";
+            });
+             
+    $("#dettes").html(html);
+    });
+   
+}
+
+function getCreancesOfUser(){
+    var url = "/api/creances/";
+    var html ="";
+    $.getJSON(url,function(d){
+        
+            $.each(d,function(index,item){
+                html+="<tr>";
+                html+="<td>"+item.borrower.username+"</td>";
                 html+="<td>"+item.sommeDette+"</td>";
                 html+='<td>\n\
                                 <button class="btn btn-danger" type="submit" onclick="deleteDebt('+item.id+');">\n\
@@ -17,7 +42,7 @@ function getDebtsOfUser(){
                 html+="</tr>";
             });
-    $("#dettes").html(html);
+    $("#creances").html(html);
     });
 }
@@ -29,7 +54,7 @@ function deleteDebt(id){
         url:url + $.param({"id":id}),
         type:"DELETE",        
         success: function(d){
-                getDebtsOfUser();
+                getCreancesOfUser();
         }        
     });      
@@ -54,13 +79,10 @@ function updateDebtOfUser(){
         async:false
     }).done(function(d){        
         console.log(d);        
-    }).success(function(d){
-        console.log("Succes");
+    }).success(function(d){        
         console.log(d);
      }).fail(function(d){
-         alert("Erreur");
-         console.log("Fail");
-         console.log(d);
+         alert("Erreur");         
      });       
 }
@@ -68,8 +90,9 @@ function updateDebtOfUser(){
 (function(){
     'use strict';
-    
+    getConnectedUser();
     getDebtsOfUser();
+    getCreancesOfUser();
 })();