From c1d2852e126d62873e8cc8e86fad1d47b0df5959 Mon Sep 17 00:00:00 2001 From: Zak Date: Fri, 16 Jun 2017 12:09:16 +0200 Subject: [PATCH] Ajout css --- src/main/java/fr/plil/sio/web/mvc/ApplicationSecurityConfiguration.java | 1 + src/main/java/fr/plil/sio/web/mvc/Dette.java | 3 +++ src/main/java/fr/plil/sio/web/mvc/User.java | 6 ++++-- src/main/java/fr/plil/sio/web/mvc/UserServiceImpl.java | 36 ++++++++++++++++++------------------ src/main/webapp/WEB-INF/pages/header.jsp | 2 ++ src/main/webapp/WEB-INF/pages/login.jsp | 47 ++++++++++++++++++++++++++++++++--------------- src/main/webapp/css/kawafile.css | 26 ++++++++++++++++++++++++++ src/main/webapp/js/kawafile.js | 20 ++++++++++++-------- 8 files changed, 98 insertions(+), 43 deletions(-) create mode 100644 src/main/webapp/css/kawafile.css diff --git a/src/main/java/fr/plil/sio/web/mvc/ApplicationSecurityConfiguration.java b/src/main/java/fr/plil/sio/web/mvc/ApplicationSecurityConfiguration.java index 1cbceae..eef1d47 100644 --- a/src/main/java/fr/plil/sio/web/mvc/ApplicationSecurityConfiguration.java +++ b/src/main/java/fr/plil/sio/web/mvc/ApplicationSecurityConfiguration.java @@ -29,6 +29,7 @@ public class ApplicationSecurityConfiguration extends WebSecurityConfigurerAdapt .authorizeRequests() .antMatchers("/webjars/**").permitAll() .antMatchers("/js/**").permitAll() + .antMatchers("/css/**").permitAll() .anyRequest().authenticated() .and() .formLogin() diff --git a/src/main/java/fr/plil/sio/web/mvc/Dette.java b/src/main/java/fr/plil/sio/web/mvc/Dette.java index 268e7d0..3898fe1 100644 --- a/src/main/java/fr/plil/sio/web/mvc/Dette.java +++ b/src/main/java/fr/plil/sio/web/mvc/Dette.java @@ -1,5 +1,6 @@ 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 diff --git a/src/main/java/fr/plil/sio/web/mvc/User.java b/src/main/java/fr/plil/sio/web/mvc/User.java index d38402d..a8f74fb 100644 --- a/src/main/java/fr/plil/sio/web/mvc/User.java +++ b/src/main/java/fr/plil/sio/web/mvc/User.java @@ -1,6 +1,7 @@ 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 dettes = new ArrayList(); + @OneToMany(mappedBy="borrower",cascade = CascadeType.REMOVE) + @JsonBackReference + private List dettes = new ArrayList<>(); public List getDettes() { return dettes; diff --git a/src/main/java/fr/plil/sio/web/mvc/UserServiceImpl.java b/src/main/java/fr/plil/sio/web/mvc/UserServiceImpl.java index 4706d59..2a4bec6 100644 --- a/src/main/java/fr/plil/sio/web/mvc/UserServiceImpl.java +++ b/src/main/java/fr/plil/sio/web/mvc/UserServiceImpl.java @@ -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 findDettes() { String username = securityService.findLoggedInUsername(); - List 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 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; } } diff --git a/src/main/webapp/WEB-INF/pages/header.jsp b/src/main/webapp/WEB-INF/pages/header.jsp index 6cebc09..cfd3877 100644 --- a/src/main/webapp/WEB-INF/pages/header.jsp +++ b/src/main/webapp/WEB-INF/pages/header.jsp @@ -5,5 +5,7 @@ <%= request.getAttribute("pageTitle") %> + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/pages/login.jsp b/src/main/webapp/WEB-INF/pages/login.jsp index 897ef5b..1ce431a 100644 --- a/src/main/webapp/WEB-INF/pages/login.jsp +++ b/src/main/webapp/WEB-INF/pages/login.jsp @@ -6,19 +6,36 @@ -
- -

- - -

-

- - -

- - -
+ + +
+ + +

CONNEXION

+
+
+
+ +
+ + +
+
+ + +
+ +
+ +
+
+
+
+ + +
+ + \ No newline at end of file diff --git a/src/main/webapp/css/kawafile.css b/src/main/webapp/css/kawafile.css new file mode 100644 index 0000000..e243335 --- /dev/null +++ b/src/main/webapp/css/kawafile.css @@ -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 diff --git a/src/main/webapp/js/kawafile.js b/src/main/webapp/js/kawafile.js index d2e48a9..528d5c0 100644 --- a/src/main/webapp/js/kawafile.js +++ b/src/main/webapp/js/kawafile.js @@ -6,11 +6,13 @@ function getDebtsOfUser(){ $.getJSON(url,function(d){ html+="
    "; $.each(d,function(index,item){ - html+="
  • "+item.holderOfDebt.username+"
    • "; + html+="
  • "+item.creditor.username+"
    • "; html+="
  • "+item.sommeDette+"
    • "; }); - }); + html+="
"; $("#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(); } -- libgit2 0.21.2