Ajout css

Zak
1 parent 716532ee
Showing 8 changed files with 98 additions and 43 deletions Show diff stats
src/main/java/fr/plil/sio/web/mvc/ApplicationSecurityConfiguration.java
src/main/java/fr/plil/sio/web/mvc/Dette.java
src/main/java/fr/plil/sio/web/mvc/User.java
src/main/java/fr/plil/sio/web/mvc/UserServiceImpl.java
src/main/webapp/WEB-INF/pages/header.jsp
src/main/webapp/WEB-INF/pages/login.jsp
src/main/webapp/css/kawafile.css
src/main/webapp/js/kawafile.js
@@ -29,6 +29,7 @@ public class ApplicationSecurityConfiguration extends WebSecurityConfigurerAdapt
                 .authorizeRequests()
                 .antMatchers("/webjars/**").permitAll()
                 .antMatchers("/js/**").permitAll()
+                .antMatchers("/css/**").permitAll()
                 .anyRequest().authenticated()
                 .and()
                 .formLogin()
 package fr.plil.sio.web.mvc;
  
+import com.fasterxml.jackson.annotation.JsonManagedReference;
 import java.util.Objects;
 import javax.persistence.*;
  
@@ -16,9 +17,11 @@ public class Dette {
  
  
     @ManyToOne(optional = false)
+    @JsonManagedReference
     private User creditor;
  
     @ManyToOne(optional = false)
+    @JsonManagedReference
     private User borrower;
  
     @Override
 package fr.plil.sio.web.mvc;
  
  
+import com.fasterxml.jackson.annotation.JsonBackReference;
 import com.fasterxml.jackson.annotation.JsonManagedReference;
 import java.util.ArrayList;
 import org.springframework.security.core.GrantedAuthority;
@@ -27,8 +28,9 @@ public class User implements UserDetails {
     @Column(name = "PASSWORD_F")
     private String password;
  
-    @OneToMany(mappedBy="holderOfDebt",cascade = CascadeType.REMOVE)
-    private List<Dette> dettes = new ArrayList<Dette>();
+    @OneToMany(mappedBy="borrower",cascade = CascadeType.REMOVE)
+    @JsonBackReference
+    private List<Dette> dettes = new ArrayList<>();
  
     public List<Dette> getDettes() {
         return dettes;
@@ -14,6 +14,9 @@ public class UserServiceImpl implements UserService {
  
     @Resource
     private UserRepository userRepository;
+    
+    @Resource
+    private DetteRepository detteRepository;
  
     @Resource
     private RoleRepository roleRepository;
@@ -47,8 +50,8 @@ public class UserServiceImpl implements UserService {
     @Transactional(readOnly = true)
     public List<Dette> findDettes() {
         String username = securityService.findLoggedInUsername();
-        List<Dette> dettes = userRepository.findByUsername(username).getDettes();
-        return dettes;
+        User user = userRepository.findByUsername(username);
+        return detteRepository.findByBorrower(user);
     }
  
     @Override
@@ -61,22 +64,19 @@ public class UserServiceImpl implements UserService {
     @Transactional
     public Dette addDette(String username, String sommeDette) {
         //Get the holder of debt
-//        User user = userRepository.findByUsername(username);
-//
-//        //Get connected user
-//        // Authentication auth = SecurityContextHolder.getContext().getAuthentication();
-//        String connectedUsername = securityService.findLoggedInUsername();
-//        User connectedUser = userRepository.findByUsername(connectedUsername);
-//        //Set dette        
-//        List<Dette> newDettes = user.getDettes();
-//        Dette d = new Dette();
-//        Double dSomme = Double.parseDouble(sommeDette);
-//        d.setSommeDette(dSomme);
-//        d.setHolderOfDebt(connectedUser);
-//        d.setDueToUser(user);
-//        newDettes.add(d);
-        
-        return new Dette();
+         User user = userRepository.findByUsername(username);
+
+        String connectedUsername = securityService.findLoggedInUsername();
+        User connectedUser = userRepository.findByUsername(connectedUsername);
+
+        Dette d = new Dette();
+        Double dSomme = Double.parseDouble(sommeDette);
+        d.setSommeDette(dSomme);
+        d.setBorrower(connectedUser);
+        d.setCreditor(user);
+
+        detteRepository.save(d);
+        return d;
     }
  
 }
@@ -5,5 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title><%= request.getAttribute("pageTitle") %></title>
+    <link href="/webjars/bootstrap/css/bootstrap.min.css" rel="stylesheet"/>
+    <link href="/css/kawafile.css" rel="stylesheet"/>
 </head>
 <a href="login.jsp"></a>
 \ No newline at end of file
@@ -6,19 +6,36 @@
 </jsp:include>
  
 <c:url value="/login" var="loginUrl"/>
-<form action="${loginUrl}" method="post">
-    <b><c:out value="${message}"></c:out></b>
-    <p>
-        <label for="username">Username</label>
-        <input type="text" id="username" name="username"/>
-    </p>
-    <p>
-        <label for="password">Password</label>
-        <input type="password" id="password" name="password"/>
-    </p>
-    <input type="hidden"
-           name="${_csrf.parameterName}"
-           value="${_csrf.token}"/>
-    <button type="submit" class="btn">Log in</button>
-</form>
+
+
+<div class="container-fluid"/>
+
+    
+<h1 class="name">CONNEXION</h1>
+        <div class="panel panel-info  signInForm ">
+            <div class="panel-body">
+                  <form action="${loginUrl}" method="post" >
+                        <b><c:out value="${message}"></c:out></b>
+                        <div class="form-group">
+                            <label for="username">Username</label>
+                            <input class="form-control" type="text" id="username" name="username"/>                        
+                        </div>
+                        <div class="form-group">
+                            <label for="password">Password</label>
+                            <input class="form-control" type="password" id="password" name="password"/>
+                        </div>
+                        <input type="hidden"
+                               name="${_csrf.parameterName}"
+                               value="${_csrf.token}"/>
+                        <div class="text-center">
+                        <button type="submit" class="btn btn-info">Log in</button>
+                        </div>
+                </form>
+            </div>
+        </div>
+        
+    
+</div>
+
+
 <jsp:include page="footer.jsp"/>
 \ No newline at end of file
@@ -0,0 +1,26 @@
+body{
+    background-color:#9cd2d2;
+}
+.signInForm {
+    width:500px;
+    height:250px;
+    position: absolute;
+    top:-150px;
+    bottom: 0;
+    left: 0;
+    right: 0;
+
+    margin: auto;
+}
+
+.name{
+    display: block;
+    font-family: Montserrat,"Helvetica Neue",Helvetica,Arial,sans-serif;
+    text-transform: uppercase;
+    font-weight: 700;
+    font-size: 3.5em;
+    
+    text-align:center;
+    color:white;
+    margin-top:200px;
+}
 \ No newline at end of file
@@ -6,11 +6,13 @@ function getDebtsOfUser(){
     $.getJSON(url,function(d){
         html+="<ul>";
             $.each(d,function(index,item){
-                html+="<li>"+item.holderOfDebt.username+"</li>";
+                html+="<li>"+item.creditor.username+"</li>";
                 html+="<li>"+item.sommeDette+"</li>";
             });
-    });
+             html+="</ul>";
     $("#dettes").html(html);
+    });
+   
 }
  
 function updateDebtOfUser(){
@@ -42,16 +44,18 @@ function updateDebtOfUser(){
         url:url,
         method:"POST",
         data:requestData,
-        async:false,
-    }).done(function(d){
-        alert("Ok");
-         getDebtsOfUser();
+        async:false
+    }).done(function(d){        
+        console.log(d);        
     }).success(function(d){
-      getDebtsOfUser();
+        console.log("Succes");
+        console.log(d);
      }).fail(function(d){
          alert("Erreur");
+         console.log("Fail");
+         console.log(d);
      });
-        getDebtsOfUser();
+        //getDebtsOfUser();
 }