From 2f4e0fc300e52570c14cf3c6ed9b5298125ac334 Mon Sep 17 00:00:00 2001
From: Baptiste Marcel <baptiste.marcel@etu.uca.fr>
Date: Tue, 28 Nov 2023 12:46:39 +0100
Subject: [PATCH 1/8] Suppression du choix des langues

---
 cryptide_project/src/Components/NavBar.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cryptide_project/src/Components/NavBar.tsx b/cryptide_project/src/Components/NavBar.tsx
index 3118e17..a1074e3 100644
--- a/cryptide_project/src/Components/NavBar.tsx
+++ b/cryptide_project/src/Components/NavBar.tsx
@@ -70,7 +70,7 @@ function AppNavbar({changeLocale}) {
                                 drop='down-centered'
                             >
                             <NavDropdown.Item onClick={navigateToProfile}>Profil</NavDropdown.Item>
-                            <LanguageNavItem
+                            {/* <LanguageNavItem
                                 countryCode="FR"
                                 languageKey="languageSelector.french"
                                 onClick={() => changeLocale('fr')}
@@ -79,7 +79,7 @@ function AppNavbar({changeLocale}) {
                                 countryCode="GB"
                                 languageKey="languageSelector.english"
                                 onClick={() => changeLocale('en')}
-                            />
+                            /> */}
                             <NavDropdown.Divider />
                             <NavDropdown.Item onClick={logout}>Déconnexion</NavDropdown.Item>
                             </NavDropdown>
@@ -93,7 +93,7 @@ function AppNavbar({changeLocale}) {
                                 <BsFillPersonPlusFill />
                                 <FormattedMessage id="sign_up" />
                             </Nav.Link>
-                            <LangDropDown changeLocale={changeLocale}/>
+                            {/* <LangDropDown changeLocale={changeLocale}/> */}
                             </>
                         )}
                         </Nav>

From cff2a9b085c8cd16018781e0c38a8a8474ba495c Mon Sep 17 00:00:00 2001
From: Baptiste Marcel <baptiste.marcel@etu.uca.fr>
Date: Tue, 28 Nov 2023 13:21:22 +0100
Subject: [PATCH 2/8] modification navbar + info dynamique

---
 cryptide_project/src/App.tsx               |  4 ++--
 cryptide_project/src/Components/NavBar.tsx | 15 +++++++++------
 cryptide_project/src/Pages/InfoPage.tsx    | 21 ++++++++++++++++++---
 3 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/cryptide_project/src/App.tsx b/cryptide_project/src/App.tsx
index f6a601f..8fcf6dd 100644
--- a/cryptide_project/src/App.tsx
+++ b/cryptide_project/src/App.tsx
@@ -77,10 +77,10 @@ function App() {
             <BrowserRouter>  
               {hasNavbarVisible && <AppNavbar changeLocale={changeLocale} />}
               <Routes>
-                <Route path="/" element={<Home />} />
+                <Route path="/" element={<Play />} />
                 <Route path="/login" element={<Login />} />
                 <Route path="/signup" element={<SignUp />} />
-                <Route path="/play" element={<Play/>} />
+                <Route path="/home" element={<Home/>} />
                 <Route path="/lobby" element={<Lobby/>} />
                 <Route path="/endgame" element={<EndGame/>} />
                 <Route path="/game" element={<InGame locale={locale} changeLocale={changeLocale}/>}/>
diff --git a/cryptide_project/src/Components/NavBar.tsx b/cryptide_project/src/Components/NavBar.tsx
index a1074e3..2451992 100644
--- a/cryptide_project/src/Components/NavBar.tsx
+++ b/cryptide_project/src/Components/NavBar.tsx
@@ -53,12 +53,15 @@ function AppNavbar({changeLocale}) {
                 <Navbar.Toggle aria-controls="basic-navbar-nav" />
                 <Navbar.Collapse id="basic-navbar-nav">
                     <Nav className="me-auto">
-                        <NavDropdown title={<span style={{ color: theme.colors.text }}><FormattedMessage id="play" /></span>} className="navbar-title" id="basic-nav-dropdown">
-                        <NavDropdown.Item href="play"><FormattedMessage id="play_solo" /> </NavDropdown.Item>
-                        <NavDropdown.Divider />
-                        <NavDropdown.Item href="play"><FormattedMessage id="create_room" /> </NavDropdown.Item>
-                        <NavDropdown.Item href="play"><FormattedMessage id="join" /> </NavDropdown.Item>
-                        </NavDropdown>
+                        <Nav.Link href="/" style={{ color: theme.colors.text }}>
+                            Jouer
+                        </Nav.Link>
+                        <Nav.Link href="/home" style={{ color: theme.colors.text }}>
+                            Présentation
+                        </Nav.Link>
+                        <Nav.Link href="/info" style={{ color: theme.colors.text }}>
+                            Info
+                        </Nav.Link>
                     </Nav>
                     <div className='leftdiv'>
                         <Nav className="ml-auto navbar-title-dd">
diff --git a/cryptide_project/src/Pages/InfoPage.tsx b/cryptide_project/src/Pages/InfoPage.tsx
index dadd9ac..881633c 100644
--- a/cryptide_project/src/Pages/InfoPage.tsx
+++ b/cryptide_project/src/Pages/InfoPage.tsx
@@ -24,12 +24,13 @@ import Alert from 'react-bootstrap/Alert';
 import MGlass from "../res/icon/magnifying-glass.png";
 import Param from "../res/icon/param.png";
 import Info from "../res/icon/infoGreen.png"; //todo changer la couleur de l'icon
+import { useAuth } from '../Contexts/AuthContext';
+import { useEffect } from 'react';
 
 //@ts-ignore
-function InfoPage({locale, changeLocale}) {
-    
+function InfoPage({locale, changeLocale}) {    
     const theme = useTheme();
-
+    const {isLoggedIn, login, user, setUserData, manager } = useAuth();
     const styles = {
         roux: { backgroundColor: ColorToHexa(Color.REDHEAD), width: '15px', height: '15px', display: 'inline-block', marginRight: '5px' },
         blond: { backgroundColor: ColorToHexa(Color.BLOND), width: '15px', height: '15px', display: 'inline-block', marginRight: '5px' },
@@ -37,6 +38,20 @@ function InfoPage({locale, changeLocale}) {
         blanc: { backgroundColor: ColorToHexa(Color.WHITE), border: '1px solid #ccc', width: '15px', height: '15px', display: 'inline-block', marginRight: '5px' },
         chatain: { backgroundColor: ColorToHexa(Color.BROWN), width: '15px', height: '15px', display: 'inline-block', marginRight: '5px' },
     };
+
+    useEffect(() => {
+        if (user == null){
+            manager.userService.fetchUserInformation().then(([user, loggedIn]) =>{
+                if (user!=null){
+                    if (loggedIn){
+                        login()
+                        setUserData(user)
+                    }
+                }
+            })
+        }
+    }, [isLoggedIn]);
+
     return (
         //! Il faudra possiblement faire une gestion des mode de jeu, pour modifier les regles en fonction de ce dernier.
     <div className='infoPage'>

From d747f63318b4205f3692355fba6db1b66fd1abbd Mon Sep 17 00:00:00 2001
From: Pierre Ferreira <p.ferreira1@outlook.fr>
Date: Tue, 28 Nov 2023 13:35:32 +0100
Subject: [PATCH 3/8] nettoyage des pages lobby, ingame, play et scoreboard
 :minus:

---
 .../src/Components/ScoreBoard.tsx             | 21 +++--
 cryptide_project/src/Pages/InGame.tsx         |  4 +-
 cryptide_project/src/Pages/Lobby.css          | 10 +++
 cryptide_project/src/Pages/Lobby.tsx          | 76 ++++++++++++++++---
 cryptide_project/src/Pages/Play.css           | 14 ++++
 cryptide_project/src/Pages/Play.tsx           |  2 +-
 6 files changed, 109 insertions(+), 18 deletions(-)

diff --git a/cryptide_project/src/Components/ScoreBoard.tsx b/cryptide_project/src/Components/ScoreBoard.tsx
index e005dea..b4198a5 100644
--- a/cryptide_project/src/Components/ScoreBoard.tsx
+++ b/cryptide_project/src/Components/ScoreBoard.tsx
@@ -32,11 +32,19 @@ const ScoreBoard: React.FC<{ Player: User }> = ({ Player }) => {
         // <div className='LeaderBoardiv'>
         <div className='LeaderBoardiv'>
             <Tabs style={{width:"100%"}}
-                defaultActiveKey="daily"
+                defaultActiveKey="perso"
                 id="ScoreBoard"
                 className="mb-3">
-                <Tab eventKey="perso" title="Vos Stats" disabled = { !Player.pseudo.startsWith("Guest_") ? false : true}>
-                <Container fluid>
+                <Tab eventKey="perso" title="Vos Stats">
+                
+                { Player.pseudo.startsWith("Guest_") ? (
+                    <div className='guestDisplay'>
+                        <h4> 
+                            <i>Veuillez vous connecter pour bénéficier des statistiques personnalisées.</i>
+                        </h4>
+                    </div>
+                ) : (
+                    <Container fluid>
                         <Row>Stats en solo :</Row>
                         <Row>
                             <Col sm={10}>Partie Jouées :</Col>
@@ -65,8 +73,9 @@ const ScoreBoard: React.FC<{ Player: User }> = ({ Player }) => {
                             <Col className='leftRow'>{Player !== null ? Player.onlineStats.ratio : "0"}</Col>
                         </Row>
                     </Container>
+                )}
                 </Tab>
-                <Tab eventKey="daily" title="Daily"
+                {/* <Tab eventKey="daily" title="Daily"
                     style={{display:"flex", flexDirection:'column', alignItems:'center'}}>
                     <img src={trophy}
                             height='100'
@@ -101,10 +110,10 @@ const ScoreBoard: React.FC<{ Player: User }> = ({ Player }) => {
                                 height='100'
                                 width='100'
                                 alt="Person2"/>
-                </Tab>
+                </Tab> */}
             </Tabs>
             
-                <ButtonImgNav dest='/' img={share}/>
+                {/* <ButtonImgNav dest='/' img={share}/> */}
                 </div>
         //</div>
     );
diff --git a/cryptide_project/src/Pages/InGame.tsx b/cryptide_project/src/Pages/InGame.tsx
index e3feff6..2218940 100644
--- a/cryptide_project/src/Pages/InGame.tsx
+++ b/cryptide_project/src/Pages/InGame.tsx
@@ -244,7 +244,7 @@ const InGame = ({locale, changeLocale}) => {
           </div>
         }   
 
-        <div className='paramDiv'>
+        {/* <div className='paramDiv'>
           <button className='button'
             style={{ 
                 backgroundColor: theme.colors.tertiary,
@@ -253,7 +253,7 @@ const InGame = ({locale, changeLocale}) => {
             onClick={handleChangeS}>
             <img src={Param} alt="paramètres" height='40'/>
           </button>
-        </div>
+        </div> */}
 
 
 
diff --git a/cryptide_project/src/Pages/Lobby.css b/cryptide_project/src/Pages/Lobby.css
index 60dfcf0..0428a83 100644
--- a/cryptide_project/src/Pages/Lobby.css
+++ b/cryptide_project/src/Pages/Lobby.css
@@ -59,4 +59,14 @@
 .centerButton {
     display: flex;
     justify-content: center;
+}
+
+.lobbyR{
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+}
+
+.lobbyR *{
+    margin: 20px 10px;
 }
\ No newline at end of file
diff --git a/cryptide_project/src/Pages/Lobby.tsx b/cryptide_project/src/Pages/Lobby.tsx
index 6fcd06f..18c63bc 100644
--- a/cryptide_project/src/Pages/Lobby.tsx
+++ b/cryptide_project/src/Pages/Lobby.tsx
@@ -43,6 +43,11 @@ import { random } from 'lodash';
 import SessionService from '../services/SessionService';
 
 
+import { useRef } from 'react';
+import Button from 'react-bootstrap/Button';
+import Overlay from 'react-bootstrap/Overlay';
+
+
 let gameStarted = false
 
 function Lobby() {
@@ -159,6 +164,24 @@ function Lobby() {
         socket.emit('network created', JSON.stringify(networkPerson, null, 2), JSON.stringify(choosenPerson), JSON.stringify(choosenIndices), room, start);
     }
 
+
+
+    const copyGameLink = () => {
+        setShow(!show)
+        
+        const gameLink = "http://localhost:3000/lobby?room="+ room;
+        navigator.clipboard.writeText(gameLink)
+            .then(() => {
+                console.log('Lien copié avec succès !');
+            })
+            .catch((err) => {
+                console.error('Erreur lors de la copie du lien :', err);
+            });
+    };
+
+    const [show, setShow] = useState(false);
+        const target = useRef(null);
+
     return (
         <div className='lobby-container'>
             <div className='left-part'>
@@ -191,22 +214,22 @@ function Lobby() {
             <div className="lobby-vertical-divider" style={{backgroundColor: theme.colors.secondary}}></div>
 
             <div className='right-part'>
-                <div className='title-param-div'>
+                {/* <div className='title-param-div'>
                     <img src={param} alt="param"/>
                     <h2>Paramètre de la partie</h2>
                 </div>
-                <ul>
-                    <li><h4> Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed non risus. Suspendisse lectus tortor, dignissim sit amet, adipiscing nec, ultricies sed, dolor. Cras elementum ultrices diam. Maecenas ligula massa, varius a, semper congue, euismod non, mi. Proin porttitor, orci nec nonummy molestie, enim est eleifend mi, non fermentum diam nisl sit amet erat. Duis semper. Duis arcu massa, scelerisque vitae, consequat in, pretium a, enim</h4></li>
+                <ul> */}
+                    {/* <li><h4> Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed non risus. Suspendisse lectus tortor, dignissim sit amet, adipiscing nec, ultricies sed, dolor. Cras elementum ultrices diam. Maecenas ligula massa, varius a, semper congue, euismod non, mi. Proin porttitor, orci nec nonummy molestie, enim est eleifend mi, non fermentum diam nisl sit amet erat. Duis semper. Duis arcu massa, scelerisque vitae, consequat in, pretium a, enim</h4></li>
                     <li><h4>paramètre super important pour la partie</h4></li>
                     <li><h4>paramètre super important pour la partie</h4></li>
                     <li><h4>paramètre super important pour la partie</h4></li>
-                    <li><h4>Niveau des bots : Facile </h4></li> {/* mettre un dropdown ou un swiper */}
-                    <li><h4>Thèmes : basique </h4></li> {/* mettre un dropdown*/}
+                    <li><h4>Niveau des bots : Facile </h4></li>
+                    <li><h4>Thèmes : basique </h4></li> */}
                     {
                         //? mettre un timer pour chaques personne ?
                         //? indice avancé ? ==> négation, voisin du 2e degré etc.
                     }
-                </ul>
+                {/* </ul> */}
                 {/* <center >
                     <button className='buttonNabImg' onClick={StartGame}>
                         <img src={cible} alt="Button Image" height="50" width="50" />
@@ -214,13 +237,48 @@ function Lobby() {
                     </button>
                 </center> */}
 
-                <div className='centerDivH'>
+                <div className='lobbyR' 
+                style={{flexDirection:'column',
+                        alignItems:'space-around'}}>
+                    <h3>Bienvenue dans votre lobby !</h3>
+                    <p>Attendez que tous vos amis se joignent avant de lancer la partie.</p>
+                    {/* Bouton pour copier le lien */}
+                    <Button variant="primary" ref={target} onClick={copyGameLink}>
+                        Inviter des amis
+                    </Button>
+                    <Overlay target={target.current} show={show} placement="top">
+                        {({
+                        placement: _placement,
+                        arrowProps: _arrowProps,
+                        show: _show,
+                        popper: _popper,
+                        hasDoneInitialMeasure: _hasDoneInitialMeasure,
+                        ...props
+                        }) => (
+                        <div
+                            {...props}
+                            style={{
+                            position: 'absolute',
+                            backgroundColor: theme.colors.secondary,
+                            padding: '2px 10px',
+                            color: 'white',
+                            borderRadius: 3,
+                            ...props.style,
+                            }}
+                        >
+                            Lien copié
+                        </div>
+                        )}
+                    </Overlay>
+
                     <button className='button' onClick={StartGame}
                         style={{ 
                             backgroundColor: theme.colors.tertiary,
-                            borderColor: theme.colors.secondary
+                            borderColor: theme.colors.secondary,
+                            width: 'auto',
+                            height: 'auto'
                         }}>
-                        <img src={cible} alt="cible" height="40"/>
+                        Démarrer la partie !
                     </button>
                 </div>
             </div>
diff --git a/cryptide_project/src/Pages/Play.css b/cryptide_project/src/Pages/Play.css
index 07e51aa..ed1826d 100644
--- a/cryptide_project/src/Pages/Play.css
+++ b/cryptide_project/src/Pages/Play.css
@@ -70,4 +70,18 @@
     border-width: 2px;
 
     font-size:larger;
+}
+
+.guestDisplay{
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    /* flex-direction: column; */
+
+    margin: 20px;
+    padding: 15px;
+    border: solid 1px whitesmoke;
+    border-radius: 15px;
+    
+    background-color: white;
 }
\ No newline at end of file
diff --git a/cryptide_project/src/Pages/Play.tsx b/cryptide_project/src/Pages/Play.tsx
index 03c5ddf..d0e15e8 100644
--- a/cryptide_project/src/Pages/Play.tsx
+++ b/cryptide_project/src/Pages/Play.tsx
@@ -184,7 +184,7 @@ function Play() {
                     <button onClick={launchMastermind} className="ButtonNav" style={{backgroundColor: theme.colors.primary, borderColor: theme.colors.secondary}}> Jouer seul </button>
                     <button onClick={launchEngimeJour} className="ButtonNav" style={{backgroundColor: theme.colors.primary, borderColor: theme.colors.secondary}}> Résoudre une énigme</button>
                     <button onClick={createLobby} className="ButtonNav" style={{backgroundColor: theme.colors.primary, borderColor: theme.colors.secondary}}> Créer une partie </button>
-                    <button  className="ButtonNav" style={{backgroundColor: theme.colors.primary, borderColor: theme.colors.secondary}}> Rejoindre </button>
+                    {/* <button  className="ButtonNav" style={{backgroundColor: theme.colors.primary, borderColor: theme.colors.secondary}}> Rejoindre </button> */}
                     
                 </div>
             </div>

From 33b2a6e3f3ee7e8b0fd8aadf269b8523cdff5740 Mon Sep 17 00:00:00 2001
From: Baptiste Marcel <baptiste.marcel@etu.uca.fr>
Date: Tue, 28 Nov 2023 13:35:50 +0100
Subject: [PATCH 4/8] Uniquement bouton retour accueil sur page endgame

---
 cryptide_project/src/Pages/EndGame.tsx        |  18 +++++++-----------
 cryptide_project/src/server/db/socialgraph.db | Bin 28672 -> 28672 bytes
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/cryptide_project/src/Pages/EndGame.tsx b/cryptide_project/src/Pages/EndGame.tsx
index e695e8d..03ad0b4 100644
--- a/cryptide_project/src/Pages/EndGame.tsx
+++ b/cryptide_project/src/Pages/EndGame.tsx
@@ -15,14 +15,9 @@ import Replay from '../res/icon/replay.png';
 import PersonStatus from '../Components/PersonStatus';
 import ButtonImgNav from '../Components/ButtonImgNav';
 import BigButtonNav from '../Components/BigButtonNav';
+import { Button } from 'react-bootstrap';
 
-/* nav */
-import { Link } from 'react-router-dom';
-
-/* lang */
-import { FormattedMessage } from 'react-intl';
 import { useGame } from '../Contexts/GameContext';
-import { map } from 'lodash';
 import Player from '../model/Player';
 
 
@@ -124,9 +119,6 @@ function EndGame() {
                 </div>
 
                 <div className='bottomEnd'>
-                    <div className='centerDivH' onClick={resetAll}>
-                        <BigButtonNav dest="/play" img={Leave}/>
-                    </div>
                     <div className="SoloContainer">
                         <div className='solostat'>
                             {!IsDaily && <p>Nombre de coups : {nbCoup}</p> }
@@ -143,9 +135,13 @@ function EndGame() {
                             }
                         </div>
                     </div>
-                    <div className='centerDivH'>
+                    {/* <div className='centerDivH'>
                         <BigButtonNav dest="/lobby" img={Replay}/>
-                    </div>
+                    </div> */}
+                </div>
+                
+                <div className='centerDivH' onClick={resetAll} style={{margin: "20px"}}>
+                    <Button href='/'>Retour à l'accueil</Button>
                 </div>
             </div>
             )}
diff --git a/cryptide_project/src/server/db/socialgraph.db b/cryptide_project/src/server/db/socialgraph.db
index dee9ca357d4cf06633bf36dda55e43b4331a35e4..0b29b1893820f8c17fe6d4844c82a5928523983c 100644
GIT binary patch
delta 74
zcmZp8z}WDBae_2s_Cy(H#_Wv=3;lWdpEB_BmoxBx=YPjvzL_r|lV3=Hm5qUslbw;-
ZK`|5zI45_;$FMUnFmM9F<~Q*o0suRL6RQ9K

delta 52
zcmV-40L%Y?-~oW(0gxL3XptO40cf#cp-&9}000dSi2x7x5AF};vkp*c50Q`(lZjtk
KljUz4qF@l%XcB<{


From be5c80de8692250eb1519d1e44eb37978b78e5a4 Mon Sep 17 00:00:00 2001
From: Baptiste Marcel <baptiste.marcel@etu.uca.fr>
Date: Tue, 28 Nov 2023 13:50:47 +0100
Subject: [PATCH 5/8] modification temps insc et connexion, modif redirection
 suppression compte

---
 cryptide_project/src/Pages/LoginForm.tsx      |   8 ++++----
 cryptide_project/src/Pages/Profile.tsx        |   2 +-
 cryptide_project/src/Pages/SignUpForm.tsx     |   6 +++---
 cryptide_project/src/server/db/socialgraph.db | Bin 28672 -> 28672 bytes
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/cryptide_project/src/Pages/LoginForm.tsx b/cryptide_project/src/Pages/LoginForm.tsx
index 9800f65..42066a1 100644
--- a/cryptide_project/src/Pages/LoginForm.tsx
+++ b/cryptide_project/src/Pages/LoginForm.tsx
@@ -36,8 +36,8 @@ const SignIn = () => {
                 setShowConfirmation(true);
                 setTimeout(async () => {
                     await login();
-                    navigate('/play');         // 3 secondes avant de rediriger vers la page de connexion
-                }, 3000);
+                    navigate('/');         // 3 secondes avant de rediriger vers la page de connexion
+                }, 1250);
             }
         } catch (error: any) {
             setError(error.message);
@@ -103,8 +103,8 @@ const SignIn = () => {
             )}
 
             {showConfirmation && (
-                <div className="alert alert-success" role="alert">
-                    Connexion réussie ! Vous serez redirigé vers votre profil dans 3 secondes.
+                <div className="alert alert-success text-center" role="alert">
+                    Connexion réussie ! Vous allez être redirigé vers la page principale.
                 </div>
             )}
         </div>
diff --git a/cryptide_project/src/Pages/Profile.tsx b/cryptide_project/src/Pages/Profile.tsx
index 1e96b92..aabb873 100644
--- a/cryptide_project/src/Pages/Profile.tsx
+++ b/cryptide_project/src/Pages/Profile.tsx
@@ -97,7 +97,7 @@ const Profile = () => {
       }
       handleCloseDeleteModal();
 
-      navigate("/play")
+      navigate("/")
 
     } else {
       console.error('Phrase de confirmation incorrecte.');
diff --git a/cryptide_project/src/Pages/SignUpForm.tsx b/cryptide_project/src/Pages/SignUpForm.tsx
index 2796999..64e2d28 100644
--- a/cryptide_project/src/Pages/SignUpForm.tsx
+++ b/cryptide_project/src/Pages/SignUpForm.tsx
@@ -33,7 +33,7 @@ const SignUp = () => {
                 setShowConfirmation(true);
                 setTimeout(() => {
                     navigate('/login');         // 3 secondes avant de rediriger vers la page de connexion
-                }, 3000);
+                }, 1250);
             }
         } catch (error: any) {
             setError(error.message);
@@ -100,8 +100,8 @@ const SignUp = () => {
             )}
 
             {showConfirmation && (
-                <div className="alert alert-success" role="alert">
-                    Inscription réussie ! Vous serez redirigé vers la page de connexion dans 3 secondes.
+                <div className="alert alert-success text-center" role="alert">
+                    Inscription réussie ! Vous serez redirigé vers la page de connexion.
                 </div>
             )}
         </div>
diff --git a/cryptide_project/src/server/db/socialgraph.db b/cryptide_project/src/server/db/socialgraph.db
index 0b29b1893820f8c17fe6d4844c82a5928523983c..720d35d60118c5ff505edc72ee7dd5ae7de288ea 100644
GIT binary patch
delta 320
zcmZp8z}WDBae_2s<3t%}#>R~ahxnPerf)VBDC0^==T&ZGHD+WiD9SG_$<0s7%t=)-
zN>VX2Q1Q=CF)E6(@F;gQ3NK5_vrM)q^sDqQ^iPaP3O903^@$3v$WM0<N)O2k3JCU3
zH!BY{jx;keFf!IPG}JY+P%t#IGBLF>FclHm{7*`Sb+dwk6+f>4l06cWGxc|FRxoho
zadBd##8L@ImPS^_$pX?go1fdf6=D>beAQo`M}(7+S)8%7IJKx)Vp4z-6aUlAf)2s_
vf&#2;42+!Yj4Tdv3}7(1BR-LpgM))nV)DCq6DIy9pt?kUHcp68cYY}Vw`*JM

delta 126
zcmZp8z}WDBae_2s_Cy(H#_Wv=hxj)eD%|1P{7*`Sb+e#@JOAWN{hdIe79LhdmPS^_
z$pX?go1fdf6=D>eeAQo`N05_|S)8%7IJKx)bW(s4P)jJkpa3fy10yFpBeR2IC>Tuc
Zh)-nY<m6=Jocu1{1gI#Je{y$zDFE+SC42w?


From a8409743e7d404de977cc22d945fad95be08a6c0 Mon Sep 17 00:00:00 2001
From: Baptiste Marcel <baptiste.marcel@etu.uca.fr>
Date: Tue, 28 Nov 2023 14:04:48 +0100
Subject: [PATCH 6/8] =?UTF-8?q?Bouton=20qui=20redirige=20=C3=A0=20l'accuei?=
 =?UTF-8?q?l=20sur=20page=20inGame?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cryptide_project/src/Pages/InGame.css | 19 ++++++++++++++++++-
 cryptide_project/src/Pages/InGame.tsx |  9 ++++++---
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/cryptide_project/src/Pages/InGame.css b/cryptide_project/src/Pages/InGame.css
index 81b99e3..7d30dfe 100644
--- a/cryptide_project/src/Pages/InGame.css
+++ b/cryptide_project/src/Pages/InGame.css
@@ -154,4 +154,21 @@
     height: 250px;
     width: 20%;
     overflow-y:auto;
-}
\ No newline at end of file
+}
+
+#bottom-container {  
+    /* Ajout du style pour le conteneur en bas à droite */
+    position: fixed;
+    bottom: 0;
+    right: 0;
+    margin: 20px;
+}
+
+.bottomRightButton {
+    /* Style pour le bouton en bas à droite */
+    position: absolute;
+    bottom: 0;
+    right: 0;
+    margin: 10px;
+}
+  
\ No newline at end of file
diff --git a/cryptide_project/src/Pages/InGame.tsx b/cryptide_project/src/Pages/InGame.tsx
index e3feff6..57723c7 100644
--- a/cryptide_project/src/Pages/InGame.tsx
+++ b/cryptide_project/src/Pages/InGame.tsx
@@ -40,9 +40,6 @@ import { Nav, NavDropdown, Spinner } from 'react-bootstrap';
 import { FormattedMessage } from 'react-intl';
 import Color from '../model/Color';
 import { useGame } from '../Contexts/GameContext';
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import { NavLink } from 'react-router-dom';
-import { last } from 'lodash';
 import { socket } from '../SocketConfig';
 import { Network } from 'vis-network';
 import generateLatexCode from '../Script/LatexScript';
@@ -407,6 +404,12 @@ const InGame = ({locale, changeLocale}) => {
           <ButtonImgNav dest="/endgame" img={Leave} text='endgame'/>
         </div>
       */}
+        <div id="bottom-container">
+          {/* Ajout du bouton en bas à droite */}
+          <div className='bottomRightButton'>
+            <Button href='/'>Retour à l'accueil</Button>
+          </div>
+        </div>
       </div>
     );
   };

From 92fa06313c9fb338299798a61a5cd3a36816a24a Mon Sep 17 00:00:00 2001
From: Baptiste Marcel <baptiste.marcel@etu.uca.fr>
Date: Tue, 28 Nov 2023 14:28:44 +0100
Subject: [PATCH 7/8] Enlever choix niveau bot + correction faute

---
 cryptide_project/src/Components/PlayerItemList.tsx | 4 ++--
 cryptide_project/src/Pages/Lobby.tsx               | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cryptide_project/src/Components/PlayerItemList.tsx b/cryptide_project/src/Components/PlayerItemList.tsx
index fa70c4a..7841723 100644
--- a/cryptide_project/src/Components/PlayerItemList.tsx
+++ b/cryptide_project/src/Components/PlayerItemList.tsx
@@ -55,7 +55,7 @@ const PlayerItemList:React.FC<MyPlayerItemListProps> =({ player, room }) => {
                     </Button>
                 )}
             </div>
-            {isBot && (
+            {/* {isBot && (
                 <ToggleButtonGroup type='radio' name={`options-${player.id}`} defaultValue={1}>
                     <ToggleButton id={`tbg-radio-1-${player.id}`} value={1}>
                         Facile
@@ -67,7 +67,7 @@ const PlayerItemList:React.FC<MyPlayerItemListProps> =({ player, room }) => {
                         Fort
                     </ToggleButton>
                 </ToggleButtonGroup>
-            )}
+            )} */}
         </div>
     )
 }
diff --git a/cryptide_project/src/Pages/Lobby.tsx b/cryptide_project/src/Pages/Lobby.tsx
index 18c63bc..04c724e 100644
--- a/cryptide_project/src/Pages/Lobby.tsx
+++ b/cryptide_project/src/Pages/Lobby.tsx
@@ -241,7 +241,7 @@ function Lobby() {
                 style={{flexDirection:'column',
                         alignItems:'space-around'}}>
                     <h3>Bienvenue dans votre lobby !</h3>
-                    <p>Attendez que tous vos amis se joignent avant de lancer la partie.</p>
+                    <p>Attendez que tous vos amis rejoignent avant de lancer la partie.</p>
                     {/* Bouton pour copier le lien */}
                     <Button variant="primary" ref={target} onClick={copyGameLink}>
                         Inviter des amis

From 6ddd2e5a292bb8eac3d6a96e2f5d0dd57ef0d6ac Mon Sep 17 00:00:00 2001
From: Pierre Ferreira <p.ferreira1@outlook.fr>
Date: Tue, 28 Nov 2023 14:46:16 +0100
Subject: [PATCH 8/8] changement du upperinfo :art:

---
 cryptide_project/src/Pages/InGame.css | 9 +++++----
 cryptide_project/src/Pages/InGame.tsx | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/cryptide_project/src/Pages/InGame.css b/cryptide_project/src/Pages/InGame.css
index 7d30dfe..bb6e8ac 100644
--- a/cryptide_project/src/Pages/InGame.css
+++ b/cryptide_project/src/Pages/InGame.css
@@ -1,10 +1,11 @@
 .upperInfo{
     display: flex;
-    justify-content: center;
     flex-direction: column;
+    justify-content: center;
     align-items: center;
 
-    width: 30%;
+    width: 35%;
+    height: 50px;
 
     border-radius: 0px 0px 30px 30px;
     border: solid;
@@ -12,9 +13,9 @@
 
     background-color: white;
 
-    font-size: 30px;
+    font-size: 25px;
 
-    top: 20px;;
+    top: 0;
 }
 
 #mainDiv{
diff --git a/cryptide_project/src/Pages/InGame.tsx b/cryptide_project/src/Pages/InGame.tsx
index ea41201..379874f 100644
--- a/cryptide_project/src/Pages/InGame.tsx
+++ b/cryptide_project/src/Pages/InGame.tsx
@@ -358,7 +358,7 @@ const InGame = ({locale, changeLocale}) => {
                   placement='end'
                   scroll={true}
                   backdrop={false}
-                  style={{ height: '20%', width: '25%', top: '60vh' }}>
+                  style={{ height: '20%', width: '25%', top: '0' }}>
           <Offcanvas.Header closeButton>
             <Offcanvas.Title>Indice</Offcanvas.Title>
           </Offcanvas.Header>