From afd6ed1b21fef6592e0ae69b809980f25392d3e7 Mon Sep 17 00:00:00 2001 From: Defreitasnicolas Date: Wed, 7 Feb 2024 15:07:36 +0100 Subject: [PATCH 1/6] css de la page profil et du profil ds home --- .../src/components/ProfilPage/InfoProfil.jsx | 28 ++++----- .../src/components/ProfilPage/ProfilBio.jsx | 12 ++-- .../src/components/ProfilPage/Rancking.jsx | 7 +-- .../components/profilContainer/Profile.jsx | 14 +++-- frontend/src/pages/ProfilPage.jsx | 28 ++++----- frontend/src/style/components/InfoProfil.scss | 49 ++++++++++++++++ frontend/src/style/components/ProfilBio.scss | 46 +++++++++++++++ frontend/src/style/components/Rancking.scss | 37 ++++++++++++ frontend/src/style/index.scss | 4 ++ frontend/src/style/pages/Home.scss | 1 + frontend/src/style/pages/Profil.scss | 57 ++++++++++++++++--- frontend/src/style/pages/ProfilPage.scss | 22 +++++++ 12 files changed, 252 insertions(+), 53 deletions(-) create mode 100644 frontend/src/style/components/InfoProfil.scss create mode 100644 frontend/src/style/components/ProfilBio.scss create mode 100644 frontend/src/style/components/Rancking.scss create mode 100644 frontend/src/style/pages/ProfilPage.scss diff --git a/frontend/src/components/ProfilPage/InfoProfil.jsx b/frontend/src/components/ProfilPage/InfoProfil.jsx index 50970e2..29c5c08 100644 --- a/frontend/src/components/ProfilPage/InfoProfil.jsx +++ b/frontend/src/components/ProfilPage/InfoProfil.jsx @@ -3,25 +3,21 @@ import PropTypes from "prop-types"; function InfoProfil({ time, timePlayed, numberPlayed, numberWon }) { return ( -
+

Menbre depuis : {time}

-
-
-

Temps du jeu :

-
-

{timePlayed}

-
-
-

- Partie :{numberPlayed} -

-
-

- Gagné :{numberWon} -

-
+
+

Temps du jeu :

+

{timePlayed}

+
+
+

+ Partie :{numberPlayed} +

+

+ Gagné :{numberWon} +

); diff --git a/frontend/src/components/ProfilPage/ProfilBio.jsx b/frontend/src/components/ProfilPage/ProfilBio.jsx index f03418b..ccd6eca 100644 --- a/frontend/src/components/ProfilPage/ProfilBio.jsx +++ b/frontend/src/components/ProfilPage/ProfilBio.jsx @@ -3,15 +3,13 @@ import PropTypes from "prop-types"; function ProfilBio({ img, username, bio }) { return ( -
-

Profil

-
- profil img +
+

Profil

+
+ profil img

{username}

-
- -
+
); } diff --git a/frontend/src/components/ProfilPage/Rancking.jsx b/frontend/src/components/ProfilPage/Rancking.jsx index 065fdbf..34ee40c 100644 --- a/frontend/src/components/ProfilPage/Rancking.jsx +++ b/frontend/src/components/ProfilPage/Rancking.jsx @@ -4,14 +4,13 @@ import PropTypes from "prop-types"; function Rancking({ rang, trophy }) { return (
-
+

Division {rang}

-
-
- trophée +
+ trophée
); diff --git a/frontend/src/components/profilContainer/Profile.jsx b/frontend/src/components/profilContainer/Profile.jsx index 5942817..f2e7cb0 100644 --- a/frontend/src/components/profilContainer/Profile.jsx +++ b/frontend/src/components/profilContainer/Profile.jsx @@ -17,17 +17,19 @@ function ProfilContainer() { alt={profil.alt} width={40} /> -

{connected.login.username}

+

{connected.login.username}

-

- Division {division(connected.wonGames.won_count)} -

+
+

Division {division(connected.wonGames.wonGames)}

+
- MEMBRE DEPUIS +

MEMBRE DEPUIS

{convertTime(profil.createdat)}

+
+
trophée expérience
diff --git a/frontend/src/pages/ProfilPage.jsx b/frontend/src/pages/ProfilPage.jsx index 216a57f..2133786 100644 --- a/frontend/src/pages/ProfilPage.jsx +++ b/frontend/src/pages/ProfilPage.jsx @@ -15,19 +15,21 @@ function ProfilPage() { if (connected && connected.login && connected.login.username && profil) { return (
-
- -
-
- +
+
+ +
+
+ +
Date: Wed, 7 Feb 2024 16:04:09 +0100 Subject: [PATCH 2/6] fix css admin --- frontend/src/components/AdminUsersTable.jsx | 2 +- frontend/src/style/components/AdminUsersTable.scss | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/frontend/src/components/AdminUsersTable.jsx b/frontend/src/components/AdminUsersTable.jsx index a1ef8e2..52c59b7 100644 --- a/frontend/src/components/AdminUsersTable.jsx +++ b/frontend/src/components/AdminUsersTable.jsx @@ -34,7 +34,7 @@ function AdminUsersTable({ search }) { # User Name Email - #Edit + #Delete diff --git a/frontend/src/style/components/AdminUsersTable.scss b/frontend/src/style/components/AdminUsersTable.scss index c886519..ca07ec7 100644 --- a/frontend/src/style/components/AdminUsersTable.scss +++ b/frontend/src/style/components/AdminUsersTable.scss @@ -2,6 +2,14 @@ width: 60vw; } +.title-table { + color: var(--text-color); +} + +tbody { + color: var(--text-color); +} + th, td { padding-right: 4rem; From e9884b106142c119d7cb97788ac38bb6813d4f91 Mon Sep 17 00:00:00 2001 From: Defreitasnicolas Date: Wed, 7 Feb 2024 16:27:30 +0100 Subject: [PATCH 3/6] ajout de la nav dans la page profil --- frontend/src/pages/ProfilPage.jsx | 2 ++ frontend/src/style/pages/ProfilPage.scss | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/frontend/src/pages/ProfilPage.jsx b/frontend/src/pages/ProfilPage.jsx index 2133786..c6eaa58 100644 --- a/frontend/src/pages/ProfilPage.jsx +++ b/frontend/src/pages/ProfilPage.jsx @@ -8,6 +8,7 @@ import ProfilBio from "../components/ProfilPage/ProfilBio"; import division from "../services/divisions"; import cupColors from "../services/cupColors"; import convertTime from "../services/convertTime"; +import Header from "../components/header/Header"; function ProfilPage() { const { profil, connected } = useContext(AuthContext); @@ -15,6 +16,7 @@ function ProfilPage() { if (connected && connected.login && connected.login.username && profil) { return (
+
Date: Wed, 7 Feb 2024 16:44:26 +0100 Subject: [PATCH 4/6] fix icone et header --- frontend/index.html | 2 +- frontend/src/assets/icons8-admin-55.png | Bin 0 -> 3434 bytes frontend/src/assets/icons8-admin-57.png | Bin 0 -> 3122 bytes frontend/src/assets/icons8-user-70.png | Bin 3981 -> 4064 bytes frontend/src/components/header/Header.jsx | 21 ++++++++++++------ frontend/src/components/input/AdminButton.jsx | 3 ++- frontend/src/components/input/InputProfil.jsx | 20 ++++++++++------- frontend/src/style/components/Header.scss | 18 +++++++++++++-- .../components/LeaderBoard/LeaderBoard.scss | 12 +++++++++- 9 files changed, 56 insertions(+), 20 deletions(-) create mode 100644 frontend/src/assets/icons8-admin-55.png create mode 100644 frontend/src/assets/icons8-admin-57.png diff --git a/frontend/index.html b/frontend/index.html index 6bb6e1e..d769b27 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -5,7 +5,7 @@ diff --git a/frontend/src/assets/icons8-admin-55.png b/frontend/src/assets/icons8-admin-55.png new file mode 100644 index 0000000000000000000000000000000000000000..321909735818a7d5be2414898be27ec3d188f91b GIT binary patch literal 3434 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 literal 0 HcmV?d00001 diff --git a/frontend/src/assets/icons8-admin-57.png b/frontend/src/assets/icons8-admin-57.png new file mode 100644 index 0000000000000000000000000000000000000000..346638e7005ad57203530af91549bc8c76a441b4 GIT binary patch literal 3122 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 M07*qoM6N<$g57iShX4Qo literal 0 HcmV?d00001 diff --git a/frontend/src/assets/icons8-user-70.png b/frontend/src/assets/icons8-user-70.png index 80499ab84a808d10107ccb763b34411851cafefb..90e174ccef7f5185338fccbbfc09f733e45b69a4 100644 GIT binary patch literal 4064 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 - logo - - - + + logo + +
+ +
+ + +
+
); } diff --git a/frontend/src/components/input/AdminButton.jsx b/frontend/src/components/input/AdminButton.jsx index 194988a..7f2e2ca 100644 --- a/frontend/src/components/input/AdminButton.jsx +++ b/frontend/src/components/input/AdminButton.jsx @@ -1,6 +1,7 @@ import { useContext } from "react"; import { Link } from "react-router-dom"; import { AuthContext } from "../../../context/AuthContext"; +import Admin from "../../assets/icons8-admin-55.png"; function AdminButton() { const { connected } = useContext(AuthContext); @@ -8,7 +9,7 @@ function AdminButton() { if (connected && connected.login && connected.login.role_id === 2) { return ( -

Admin

+ icone admin ); } diff --git a/frontend/src/components/input/InputProfil.jsx b/frontend/src/components/input/InputProfil.jsx index 0041a25..236e1cd 100644 --- a/frontend/src/components/input/InputProfil.jsx +++ b/frontend/src/components/input/InputProfil.jsx @@ -1,16 +1,20 @@ +import { useContext } from "react"; import { Link } from "react-router-dom"; -import logo from "../../assets/icons8-user-32.png"; +import logo from "../../assets/icons8-user-70.png"; +import { AuthContext } from "../../../context/AuthContext"; function InputProfil() { - return ( - - - - ); + + ); + } + return ""; } export default InputProfil; diff --git a/frontend/src/style/components/Header.scss b/frontend/src/style/components/Header.scss index 3387418..a33dfa1 100644 --- a/frontend/src/style/components/Header.scss +++ b/frontend/src/style/components/Header.scss @@ -1,8 +1,22 @@ .headerContainer { display: flex; flex-direction: row; - justify-content: space-around; + justify-content: space-between; align-items: center; - width: 100%; + width: 90%; margin-left: 3rem; + margin-top: 5px; +} + +.mainHeaderContainer { + display: flex; + flex-direction: row-reverse; + gap: 3rem; + margin-right: 3rem; +} + +.mainHeaderContent { + display: flex; + justify-content: space-between; + width: 150px; } diff --git a/frontend/src/style/components/LeaderBoard/LeaderBoard.scss b/frontend/src/style/components/LeaderBoard/LeaderBoard.scss index a0b8355..31a8752 100644 --- a/frontend/src/style/components/LeaderBoard/LeaderBoard.scss +++ b/frontend/src/style/components/LeaderBoard/LeaderBoard.scss @@ -42,6 +42,7 @@ } } } + .burger, .cross { color: rgb(0, 0, 0); @@ -49,25 +50,31 @@ margin: 0 5px; cursor: pointer; position: absolute; - top: 5px; + top: 17px; left: 5px; z-index: 10; + color: white; } + .cross { color: white; } + .menu { margin-top: 4rem; } + .menuBurgerRanking { display: none; } + .leaderBoardMobile { z-index: 10; position: fixed; background-color: #383a40; width: 100%; } + @media screen and (max-width: 900px) { .menuBurgerRanking { display: flex; @@ -75,16 +82,19 @@ justify-content: center; } } + @media screen and (max-width: 470px) { .leaderBoardLineContainer { gap: 40px; } } + @media screen and (max-width: 900px) { .LeaderBoard-container { display: none; } } + .menuBurguerRankingContainer { .leaderBoardLineContainer { display: flex; From 25fc37ecf0273ccbd95cab241716de42021c8c59 Mon Sep 17 00:00:00 2001 From: Sarhane64 Date: Wed, 7 Feb 2024 16:47:37 +0100 Subject: [PATCH 5/6] fix icone et header --- frontend/src/components/header/Header.jsx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/frontend/src/components/header/Header.jsx b/frontend/src/components/header/Header.jsx index a502034..d0d0837 100644 --- a/frontend/src/components/header/Header.jsx +++ b/frontend/src/components/header/Header.jsx @@ -9,7 +9,12 @@ function Header() { return (
- logo + logo
From 8eef70039803122c2b7451fd1d0e02180a2108be Mon Sep 17 00:00:00 2001 From: Defreitasnicolas Date: Wed, 7 Feb 2024 17:19:55 +0100 Subject: [PATCH 6/6] fix css navbar --- frontend/src/components/header/Header.jsx | 26 +++++-------------- .../src/style/components/ButtonConnected.scss | 2 ++ frontend/src/style/components/Header.scss | 6 +++++ 3 files changed, 15 insertions(+), 19 deletions(-) diff --git a/frontend/src/components/header/Header.jsx b/frontend/src/components/header/Header.jsx index d0d0837..327c74c 100644 --- a/frontend/src/components/header/Header.jsx +++ b/frontend/src/components/header/Header.jsx @@ -1,28 +1,16 @@ -import { Link } from "react-router-dom"; - -import AdminButton from "../input/AdminButton"; -import InputProfil from "../input/InputProfil"; +import React from "react"; import logo from "../../assets/logo2.png"; import ButtonConected from "../input/ButtonConected"; +import InputProfil from "../input/InputProfil"; +import AdminButton from "../input/AdminButton"; function Header() { return (
- - logo - -
- -
- - -
-
+ logo + + +
); } diff --git a/frontend/src/style/components/ButtonConnected.scss b/frontend/src/style/components/ButtonConnected.scss index 5e03251..6ec9507 100644 --- a/frontend/src/style/components/ButtonConnected.scss +++ b/frontend/src/style/components/ButtonConnected.scss @@ -8,6 +8,7 @@ margin-bottom: 1rem; color: var(--text-color); cursor: pointer; + margin-right: 1rem; } .disconnectedButton { @@ -20,4 +21,5 @@ margin-bottom: 1rem; color: var(--text-color); cursor: pointer; + margin-right: 1rem; } diff --git a/frontend/src/style/components/Header.scss b/frontend/src/style/components/Header.scss index a33dfa1..9ec26bc 100644 --- a/frontend/src/style/components/Header.scss +++ b/frontend/src/style/components/Header.scss @@ -20,3 +20,9 @@ justify-content: space-between; width: 150px; } + +@media screen and (max-width: 600px) { + .buttonAdmin { + display: none; + } +}