From 157afc8a65694a79b42d9c7dcd33faa2346437a0 Mon Sep 17 00:00:00 2001
From: Thomas Chazot <tchazot63@gmail.com>
Date: Tue, 28 Nov 2023 09:43:56 +0100
Subject: [PATCH] fix endgame

---
 .../src/Components/GraphContainer.tsx         |  2 +-
 cryptide_project/src/Pages/EndGame.tsx        | 69 ++++++++++---------
 cryptide_project/src/Pages/Lobby.tsx          |  2 +-
 3 files changed, 39 insertions(+), 34 deletions(-)

diff --git a/cryptide_project/src/Components/GraphContainer.tsx b/cryptide_project/src/Components/GraphContainer.tsx
index 10bc725..640a824 100644
--- a/cryptide_project/src/Components/GraphContainer.tsx
+++ b/cryptide_project/src/Components/GraphContainer.tsx
@@ -494,7 +494,7 @@ const MyGraphComponent: React.FC<MyGraphComponentProps> = ({onNodeClick, handleS
         setActualPlayerIndexData(-1)
         setLastIndex(-1)
         setPlayerTouched(-1)
-        setWinnerData(players[winnerIndex])
+        setWinnerData(winner)
         setElapsedTime(0)
 
         first = true
diff --git a/cryptide_project/src/Pages/EndGame.tsx b/cryptide_project/src/Pages/EndGame.tsx
index 2e56dee..710f344 100644
--- a/cryptide_project/src/Pages/EndGame.tsx
+++ b/cryptide_project/src/Pages/EndGame.tsx
@@ -74,10 +74,12 @@ function EndGame() {
         losingPlayers = [];
     }
     const theme = useTheme();
+
+    console.log(winner)
     
     return (
         <div>
-            {!IsSolo &&
+            {!IsSolo ? (
                 <div>
                     <div className="head">
                         <header className='leaderboard-header' style={{ borderColor: theme.colors.primary }}>
@@ -110,42 +112,45 @@ function EndGame() {
                         </div>
                     </div>
                 </div>
-            }
-            <div className="head">
-                        <header className='leaderboard-header' style={{ borderColor: theme.colors.primary }}>
-                            <h1>Vous avez gagné !</h1>
-                            <h3>Le tueur était <u>{person?.getName()}</u></h3>
-                        </header>
-            </div>
-            <div className='winner'>
-                <img src={Person} width='250' height='250'/>
-                <h1>{winner?.pseudo}</h1>
-            </div>
-
-            <div className='bottom'>
-                <div className='centerDivH' onClick={resetAll}>
-                    <BigButtonNav dest="/play" img={Leave}/>
+            ): (
+            <div>
+                <div className="head">
+                            <header className='leaderboard-header' style={{ borderColor: theme.colors.primary }}>
+                                <h1>Vous avez gagné !</h1>
+                                <h3>Le tueur était <u>{person?.getName()}</u></h3>
+                            </header>
+                </div>
+                <div className='winner'>
+                    <img src={Person} width='250' height='250'/>
+                    <h1>{winner?.pseudo}</h1>
                 </div>
-                <div className="SoloContainer">
-                    <div className='solostat'>
-                        {!IsDaily && <p>Nombre de coups : {nbCoup}</p> }
-                        <p>Temps : {temps}s</p>
+
+                <div className='bottom'>
+                    <div className='centerDivH' onClick={resetAll}>
+                        <BigButtonNav dest="/play" img={Leave}/>
                     </div>
-                    <div className='indicesolo'>
-                        {indices.map((indice, index) => (
-                                    // <div className="playerContainer" key={index}>
-                                        <div>
-                                            <h6 className='indiceDisplay'> <u>Indice {index+1}</u> : {indice.ToString("fr")}</h6>
-                                        </div>
-                                    //</div>
-                                ))
-                        }
+                    <div className="SoloContainer">
+                        <div className='solostat'>
+                            {!IsDaily && <p>Nombre de coups : {nbCoup}</p> }
+                            <p>Temps : {temps}s</p>
+                        </div>
+                        <div className='indicesolo'>
+                            {indices.map((indice, index) => (
+                                        // <div className="playerContainer" key={index}>
+                                            <div>
+                                                <h6 className='indiceDisplay'> <u>Indice {index+1}</u> : {indice.ToString("fr")}</h6>
+                                            </div>
+                                        //</div>
+                                    ))
+                            }
+                        </div>
+                    </div>
+                    <div className='centerDivH'>
+                        <BigButtonNav dest="/lobby" img={Replay}/>
                     </div>
-                </div>
-                <div className='centerDivH'>
-                    <BigButtonNav dest="/lobby" img={Replay}/>
                 </div>
             </div>
+            )}
         </div>
     );
 }
diff --git a/cryptide_project/src/Pages/Lobby.tsx b/cryptide_project/src/Pages/Lobby.tsx
index 2ad4ce3..e0bc7a9 100644
--- a/cryptide_project/src/Pages/Lobby.tsx
+++ b/cryptide_project/src/Pages/Lobby.tsx
@@ -122,7 +122,7 @@ function Lobby() {
         gameStarted = true
         socket.off("player left")
         socket.off("new player")
-        navigate('/game?solo=false');
+        navigate('/game?solo=false&daily=false');
     });
 
     socket.on("new player", (tab) =>{