-
+
-
-
-
- Stats en MasterMind :
-
-
-
-
-
-
-
-Stats en Enigme facile :
-
-
-
-
-
-
-
-
-
-
-
-Stats en Enigme moyenne :
-
-
-
-
-
-
-
-Stats en Enigme difficile :
-
-
-
-
-
-
-
-
-
-
-
-Stats en ligne :
-
-
-
-
-
-
-
-
-
- 
-
- MasterMind :
- {dailyMastermindStats !== null ? (dailyMastermindStats.tab.length !== 0 ? dailyMastermindStats.tab.map((stats: any, index: number) => (
-
-
- )) : (
-
-
- )) : (
-
-
- )}
-
-
- -Multijoueur :
- {dailyOnlineStats !== null ? (dailyOnlineStats.tab.length !== 0 ? dailyOnlineStats.tab.map((stats: any, index: number) => (
-
-
- )) : (
-
-
- )) : (
-
-
- )}
-
-
- -Enigme facile :
- {dailyEasyEnigmaStats !== null ? (dailyEasyEnigmaStats.tab.length !== 0 ? dailyEasyEnigmaStats.tab.map((stats: any, index: number) => (
-
-
- )) : (
-
-
- )) : (
-
-
- )}
-
-
- -
-
-
-
-
- MasterMind :
- {weeklyMastermindStats !== null ? (weeklyMastermindStats.tab.length !== 0 ? weeklyMastermindStats.tab.map((stats: any, index: number) => (
-
-
- )) : (
-
-
- )) : (
-
-
- )}
-
-Multijoueur :
- {weeklyOnlineStats !== null ? (weeklyOnlineStats.tab.length !== 0 ? weeklyOnlineStats.tab.map((stats: any, index: number) => (
-
-
- )) : (
-
-
- )) : (
-
-
- )}
-
-
- -Enigme facile :
- {weeklyEasyEnigmaStats !== null ? (weeklyEasyEnigmaStats.tab.length !== 0 ? weeklyEasyEnigmaStats.tab.map((stats: any, index: number) => (
-
-
- )) : (
-
-
- )) : (
-
-
- )}
-
-
-
-
-
-
-
-
- //-
-
-
-
- -
- -
- -
-
- -
-
+
+
+ Mastermind
++
Parties Jouées: {Player.mastermindStats.nbGames}
+Best-Score: {Player.mastermindStats.bestScore}
+Moyenne d'essai: {Player.mastermindStats.avgNbTry}
+
+
+
+ Enigme facile
++
Parties Jouées: {Player.easyEnigmaStats.nbGames}
+Nombre de victoires: {Player.easyEnigmaStats.nbWins}
+Ratio V/D: {Player.easyEnigmaStats.ratio}
+Meilleur temps: {Player.easyEnigmaStats.bestTime}
+Moyenne de temps: {Player.easyEnigmaStats.avgTime}
+
+
+
+ Enigme moyenne
++
Parties Jouées: {Player.mediumEnigmaStats.nbGames}
+Best-Score: {Player.mediumEnigmaStats.bestScore}
+Moyenne d'essai: {Player.mediumEnigmaStats.avgNbTry}
+
+
+
+ Enigme difficile
++
Parties Jouées: {Player.hardEnigmaStats.nbGames}
+Nombre de victoires: {Player.hardEnigmaStats.nbWins}
+Ratio V/D: {Player.hardEnigmaStats.ratio}
+Meilleur temps: {Player.hardEnigmaStats.bestTime}
+Moyenne de temps: {Player.hardEnigmaStats.avgTime}
+
+
+
+ En ligne
++
Parties Jouées: {Player.onlineStats.nbGames}
+Nombre de victoires: {Player.onlineStats.nbWins}
+Ratio V/D: {Player.onlineStats.ratio}
+
+
+ {dailyMastermindStats !== null ? (dailyMastermindStats.tab.length !== 0 ? dailyMastermindStats.tab.map((stats: any, index: number) => ( + <> +
+
+
+ )) : (
+
+ Mastermind
++ {dailyMastermindStats !== null ? (dailyMastermindStats.tab.length !== 0 ? dailyMastermindStats.tab.map((stats: any, index: number) => ( + <> +
{index+1}.{stats.pseudo}
+ +{stats.score}
+ +Nothing for the moment
+ )) : ( +Nothing for the moment
+ )} +
+
+ {dailyEasyEnigmaStats !== null ? (dailyEasyEnigmaStats.tab.length !== 0 ? dailyEasyEnigmaStats.tab.map((stats: any, index: number) => ( + <> +
+
+
+ )) : (
+
+ Enigme facile
++ {dailyEasyEnigmaStats !== null ? (dailyEasyEnigmaStats.tab.length !== 0 ? dailyEasyEnigmaStats.tab.map((stats: any, index: number) => ( + <> +
{index+1}.{stats.pseudo}
+ +{stats.time}
+ +Nothing for the moment
+ )) : ( +Nothing for the moment
+ )} +
+
+ {dailyMediumEnigmaStats !== null ? (dailyMediumEnigmaStats.tab.length !== 0 ? dailyMediumEnigmaStats.tab.map((stats: any, index: number) => ( + <> +
+
+
+ )) : (
+
+ Enigme moyenne
++ {dailyMediumEnigmaStats !== null ? (dailyMediumEnigmaStats.tab.length !== 0 ? dailyMediumEnigmaStats.tab.map((stats: any, index: number) => ( + <> +
{index+1}.{stats.pseudo}
+ +{stats.time}
+ +Nothing for the moment
+ )) : ( +Nothing for the moment
+ )} +
+
+ {dailyHardEnigmaStats !== null ? (dailyHardEnigmaStats.tab.length !== 0 ? dailyHardEnigmaStats.tab.map((stats: any, index: number) => ( + <> +
+
+
+ )) : (
+
+ Enigme difficile
++ {dailyHardEnigmaStats !== null ? (dailyHardEnigmaStats.tab.length !== 0 ? dailyHardEnigmaStats.tab.map((stats: any, index: number) => ( + <> +
{index+1}.{stats.pseudo}
+ +{stats.time}
+ +Nothing for the moment
+ )) : ( +Nothing for the moment
+ )} +
+
+ {dailyOnlineStats !== null ? (dailyOnlineStats.tab.length !== 0 ? dailyOnlineStats.tab.map((stats: any, index: number) => ( + <> +
+
+
+ )) : (
+
+ En ligne
++ {dailyOnlineStats !== null ? (dailyOnlineStats.tab.length !== 0 ? dailyOnlineStats.tab.map((stats: any, index: number) => ( + <> +
{index+1}.{stats.pseudo}
+ +{stats.wins}
+ +Nothing for the moment
+ )) : ( +Nothing for the moment
+ )} +
+
+ {weeklyMastermindStats !== null ? (weeklyMastermindStats.tab.length !== 0 ? weeklyMastermindStats.tab.map((stats: any, index: number) => ( + <> +
+
+
+ )) : (
+
+ Mastermind
++ {weeklyMastermindStats !== null ? (weeklyMastermindStats.tab.length !== 0 ? weeklyMastermindStats.tab.map((stats: any, index: number) => ( + <> +
{index+1}.{stats.pseudo}
+ +{stats.score}
+ +Nothing for the moment
+ )) : ( +Nothing for the moment
+ )} +
+
+ {weeklyEasyEnigmaStats !== null ? (weeklyEasyEnigmaStats.tab.length !== 0 ? weeklyEasyEnigmaStats.tab.map((stats: any, index: number) => ( + <> +
+
+
+ )) : (
+
+ Enigme facile
++ {weeklyEasyEnigmaStats !== null ? (weeklyEasyEnigmaStats.tab.length !== 0 ? weeklyEasyEnigmaStats.tab.map((stats: any, index: number) => ( + <> +
{index+1}.{stats.pseudo}
+ +{stats.time}
+ +Nothing for the moment
+ )) : ( +Nothing for the moment
+ )} +
+
+ {weeklyMediumEnigmaStats !== null ? (weeklyMediumEnigmaStats.tab.length !== 0 ? weeklyMediumEnigmaStats.tab.map((stats: any, index: number) => ( + <> +
+
+
+ )) : (
+
+ Enigme moyenne
++ {weeklyMediumEnigmaStats !== null ? (weeklyMediumEnigmaStats.tab.length !== 0 ? weeklyMediumEnigmaStats.tab.map((stats: any, index: number) => ( + <> +
{index+1}.{stats.pseudo}
+ +{stats.time}
+ +Nothing for the moment
+ )) : ( +Nothing for the moment
+ )} +
+
+ {weeklyHardEnigmaStats !== null ? (weeklyHardEnigmaStats.tab.length !== 0 ? weeklyHardEnigmaStats.tab.map((stats: any, index: number) => ( + <> +
+
+
+ )) : (
+
+ Enigme difficile
++ {weeklyHardEnigmaStats !== null ? (weeklyHardEnigmaStats.tab.length !== 0 ? weeklyHardEnigmaStats.tab.map((stats: any, index: number) => ( + <> +
{index+1}.{stats.pseudo}
+ +{stats.time}
+ +Nothing for the moment
+ )) : ( +Nothing for the moment
+ )} +
+
+ {weeklyOnlineStats !== null ? (weeklyOnlineStats.tab.length !== 0 ? weeklyOnlineStats.tab.map((stats: any, index: number) => ( + <> +
+
+
+ )) : (
+
+ En ligne
++ {weeklyOnlineStats !== null ? (weeklyOnlineStats.tab.length !== 0 ? weeklyOnlineStats.tab.map((stats: any, index: number) => ( + <> +
{index+1}.{stats.pseudo}
+ +{stats.wins}
+ +Nothing for the moment
+ )) : ( +Nothing for the moment
+ )} +- Mot de passe oublié ? + Pas encore inscrit ?
diff --git a/cryptide_project/src/Pages/NewPlay.tsx b/cryptide_project/src/Pages/NewPlay.tsx index 6af04e3..98f0743 100644 --- a/cryptide_project/src/Pages/NewPlay.tsx +++ b/cryptide_project/src/Pages/NewPlay.tsx @@ -189,20 +189,15 @@ function NewPlay() { // const returnVisibility: Visibility = goBackRoom !== -1 ? "visible" : "hidden"; - const returnVisibility: any= goBackRoom !== -1 ? "visible" : "hidden" ; - + const returnVisibility = goBackRoom !== -1 ? "block" : "none" ; return (
-
-
+
+ {/* Bouton de déconnexion */}
+
-
- {/* Menu de boutons */}
-
+
);
}
diff --git a/cryptide_project/src/Pages/Play.css b/cryptide_project/src/Pages/Play.css
index f0a843e..f650357 100644
--- a/cryptide_project/src/Pages/Play.css
+++ b/cryptide_project/src/Pages/Play.css
@@ -1,17 +1,16 @@
-
-.MainContainer{
- flex: 1 1 0;
+.MainContainer {
display: flex;
flex-direction: row;
- justify-content:space-around
+ justify-content: center;
+ align-items: center;
+ height: 100%;
}
-.MidContainer{
+.MidContainer {
display: flex;
- /* justify-content:center; */
- align-items:center;
+ justify-content: center;
+ align-items: center;
flex-direction: column;
-
margin-top: 15px;
width: 30%;
}
@@ -21,20 +20,24 @@
justify-content: center;
}
-.leftContainer{
- width: 30%;
+.leftContainer {
+ height: 100%;
+ margin: 20px 30px;
+ width: 70%;
}
-.rightContainer{
+.rightContainer {
+ height: 100%;
+ margin: 20px 30px;
width: 30%;
}
-.NewleftContainer{
+.NewleftContainer {
margin: 20px 30px;
width: 70%;
}
-.NewrightContainer{
+.NewrightContainer {
display: flex;
flex-direction: column;
justify-content: center;
@@ -42,81 +45,55 @@
width: 30%;
}
-/* .textBoard div{
- display: flex;
- flex-direction:column-reverse;
- justify-content:space-between
-} */
-
-/* .textBoard div:nth-child(2){
+.buttonGroupVertical {
display: flex;
- justify-content: end;
-} */
-
-/**Button**/
-.buttonGroupVertical{
- display: flex;
- justify-content:center;
- align-items:center;
+ justify-content: center;
+ align-items: center;
flex-direction: column;
}
-.NewbuttonGroupVertical{
+.NewbuttonGroupVertical {
display: flex;
- justify-content:space-around;
- align-items:start;
+ flex-direction: row;
+ justify-content: space-evenly;
}
-
-.ButtonNav{
+.ButtonNav {
margin: 15px 10px;
- width:200px;
+ width: 200px;
height: 8vh;
-
- /* background-color: #85C9C2;
- color: #2A4541; */
color: white;
-
- border: solid;
+ border: 2px solid #0056b3;
border-radius: 15px;
- border-width: 2px;
-
- font-size:larger;
+ font-size: larger;
}
-
-.ButtonNavRejoin{
+.ButtonNavRejoin {
margin: 15px 10px;
- width:200px;
+ width: 200px;
height: 8vh;
-
color: white;
background-color: aquamarine;
-
- border: solid 2px rgb(40, 225, 163);
+ border: 2px solid #0056b3;
border-radius: 15px;
-
- font-size:larger;
+ font-size: larger;
}
-.returnDiv{
+
+.returnDiv {
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
-
- margin:40px 15px;
-
- border: solid 2px whitesmoke;
+ margin: 40px 15px;
+ border: 2px solid whitesmoke;
border-radius: 15px;
-
background-color: white;
}
.returnDiv p {
margin: 15px;
padding: 10px;
- border: solid 1px whitesmoke;
+ border: 1px solid whitesmoke;
border-radius: 10px;
-
- font-weight:500;
-}
\ No newline at end of file
+ font-weight: 500;
+}
diff --git a/cryptide_project/src/Pages/Profile.css b/cryptide_project/src/Pages/Profile.css
index 3f183ed..2959742 100644
--- a/cryptide_project/src/Pages/Profile.css
+++ b/cryptide_project/src/Pages/Profile.css
@@ -1,6 +1,5 @@
.mainContainer{
display: flex;
- /* flex-direction: column; */
justify-content: center;
align-items: center;
margin: 50px;
diff --git a/cryptide_project/src/Pages/Profile.tsx b/cryptide_project/src/Pages/Profile.tsx
index 5b0a634..f01640c 100644
--- a/cryptide_project/src/Pages/Profile.tsx
+++ b/cryptide_project/src/Pages/Profile.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React, { useState, useEffect } from 'react';
import ProfilePDP from '../Components/ProfilePDP';
import SessionService from '../services/SessionService';
@@ -27,15 +27,30 @@ import ProgressBar from 'react-bootstrap/ProgressBar';
//@ts-ignore
const Profile = () => {
-
const navigate = useNavigate();
- //let player;
- const {user, logout} = useAuth()
-
const [editingUsername, setEditingUsername] = useState(false);
+ const {isLoggedIn, login, logout, user, setUserData, manager } = useAuth();
const [newUsername, setNewUsername] = useState(user?.pseudo);
- //@ts-ignore
+ useEffect(() => {
+ if (user == null){
+ manager.userService.fetchUserInformation().then(([user, loggedIn]) =>{
+ if (user!=null){
+ if (loggedIn){
+ login()
+ setUserData(user)
+ }
+ }
+ })
+ }
+ }, [isLoggedIn]);
+
+ const handleLogout = () => {
+ logout();
+ navigate('/');
+ };
+
+ // @ts-ignore
const onUsernameChange = (newUsername) => {
if(user?.pseudo != null){
SessionService.UpdatePseudo(user.pseudo, newUsername)
@@ -349,7 +364,10 @@ const Profile = () => {
+ {/* Boutons pour jouer */}
-
-
-
{({ placement, arrowProps, show: _show, popper, ...props }) => (
@@ -224,31 +219,18 @@ function NewPlay() {
-
- {/* {goBackRoom != -1 && } */}
-
-
+
{/* Lobbies */}
- )}
+
+
- 
-
- {user && (- {user && user.pseudo} -
-
+ {user && }
+
+
diff --git a/cryptide_project/src/Pages/SignUpForm.tsx b/cryptide_project/src/Pages/SignUpForm.tsx
index e7b6025..862197b 100644
--- a/cryptide_project/src/Pages/SignUpForm.tsx
+++ b/cryptide_project/src/Pages/SignUpForm.tsx
@@ -6,7 +6,6 @@ import '../Style/Global.css';
const SignUp = () => {
const navigate = useNavigate();
-
const [error, setError] = useState