Maxime/Clyde
1
0
Fork 0
forked from PGL/Clyde
Code Pull Requests Activity

Merge branch 'master' into Leo/masterRegNo

Browse Source
This commit is contained in:
LeoMoulin 2024-04-18 10:30:01 +02:00
commit 8724748642
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
backend/src/main/java/ovh/herisson/Clyde/Tables/User.java
View File

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

11
frontend/src/App.vue
View File

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

4
frontend/src/assets/main.css
View File

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