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 0000000..3219097 Binary files /dev/null and b/frontend/src/assets/icons8-admin-55.png differ diff --git a/frontend/src/assets/icons8-admin-57.png b/frontend/src/assets/icons8-admin-57.png new file mode 100644 index 0000000..346638e Binary files /dev/null and b/frontend/src/assets/icons8-admin-57.png differ diff --git a/frontend/src/assets/icons8-user-70.png b/frontend/src/assets/icons8-user-70.png index 80499ab..90e174c 100644 Binary files a/frontend/src/assets/icons8-user-70.png and b/frontend/src/assets/icons8-user-70.png differ 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/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/header/Header.jsx b/frontend/src/components/header/Header.jsx index 6b35d40..327c74c 100644 --- a/frontend/src/components/header/Header.jsx +++ b/frontend/src/components/header/Header.jsx @@ -7,10 +7,10 @@ import AdminButton from "../input/AdminButton"; function Header() { return (
- 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/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..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,19 +16,22 @@ function ProfilPage() { if (connected && connected.login && connected.login.username && profil) { return (
-
- -
-
- +
+
+
+ +
+
+ +