Merge branch 'master' into Leo/masterRegNo

backend/src/main/java/ovh/herisson/Clyde/Tables/User.java

@@ -8,6 +8,8 @@ import ovh.herisson.Clyde.Tables.Msg.Message;
 import java.util.Date;
 import java.util.List;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
 
 @Entity
 @Table(name = "Users")
@@ -24,7 +26,8 @@ public class User {
     private String country;
     private Date birthDate;
     private String profilePictureUrl;
-    private ovh.herisson.Clyde.Tables.Role role;
+    private Role role;
+	@JsonIgnore
     private String password;
 
 	////// Extension Messagerie /////

frontend/src/App.vue

@@ -99,20 +99,19 @@ window.addEventListener('hashchange', () => {
 			height: 100%;
 			width: 100%;
     display:grid;
-    grid-template-columns:[firstCol-start]70px[firstCol-end secondCol-start]auto[endCol];
-    grid-template-rows:[firstRow-start]61px[firstRow-end secondRow-start] auto [endRow];
+
+    grid-template-columns:[firstCol-start]70px[firstCol-end secondCol-start] auto [endCol];
+    grid-template-rows:[firstRow-start] var(--header-size) [firstRow-end secondRow-start] calc(100% - var(--header-size)) [endRow];
     grid-template-areas:
     "topBar topBar" 
     "leftBar page";
-    row-gap:0px;
-    column-gap:0px;
+
   }
 
   .page {
     grid-area:page;
 		height: 100%;
 		width: 100%;
-    place-self:center;
   }
 
   .topBar{
@@ -155,7 +154,7 @@ window.addEventListener('hashchange', () => {
 
 	ul.vertical{
 		list-style-type: none;
-		margin-top: 61px;
+		margin-top: var(--header-size);
     top:0;
     left:0;
 		padding: 25px 0 0;
@@ -203,7 +202,7 @@ window.addEventListener('hashchange', () => {
     left:0;
     
 		position: fixed;
-		height:61px;
+		height:var(--header-size);
 		width: 100%;
 		background-color: rgb(24, 24, 24);
 	}

frontend/src/assets/main.css

@@ -1,3 +1,7 @@
+:root {
+	--header-size: 61px;
+}
+
 body {
    background-color: rgb(53, 25, 60);
    margin:0;