diff --git a/cryptide_project/src/App.tsx b/cryptide_project/src/App.tsx index 8b4d0d0..40cf7ee 100644 --- a/cryptide_project/src/App.tsx +++ b/cryptide_project/src/App.tsx @@ -44,6 +44,7 @@ import messagesEn from './Translations/en.json'; /* Gestion d' erreur */ import ErrorBoundary from './Error/ErrorBoundary'; import ErrorPage from './Error/ErrorPage'; +import NewPlay from './Pages/NewPlay'; const messages = { fr: messagesFr, @@ -79,7 +80,7 @@ function App() { } /> } /> } /> - } /> + } /> } /> } /> }/> diff --git a/cryptide_project/src/Pages/Lobbies.tsx b/cryptide_project/src/Pages/Lobbies.tsx index da6a2d5..1a08cb3 100644 --- a/cryptide_project/src/Pages/Lobbies.tsx +++ b/cryptide_project/src/Pages/Lobbies.tsx @@ -56,7 +56,7 @@ function Lobbies() { ); const filteredLobbiesToShow = showAvailable - ? filteredLobbies.filter((lobby) => lobby.started == false) + ? filteredLobbies.filter((lobby) => lobby.started == false && lobby.nbPlayer < 6) : filteredLobbies; @@ -94,49 +94,44 @@ function Lobbies() { return(
-

Bienvenue dans le lobby des lobbies

setSearchTerm(e.target.value)} + style={{width:'80%', margin:'10px'}} /> - - {/*
- - -
*/} - -
- - -
+ +
+ + +
diff --git a/cryptide_project/src/Pages/NewPlay.tsx b/cryptide_project/src/Pages/NewPlay.tsx index b17e0c1..2b1c058 100644 --- a/cryptide_project/src/Pages/NewPlay.tsx +++ b/cryptide_project/src/Pages/NewPlay.tsx @@ -29,6 +29,7 @@ import { loadImageAsync } from '../ImageHelper'; import { Overlay, ToggleButton, ToggleButtonGroup } from 'react-bootstrap'; import Button from 'react-bootstrap/Button'; import ButtonGroup from 'react-bootstrap/ButtonGroup'; +import Lobbies from './Lobbies'; let cptNavigation = 0 @@ -231,24 +232,10 @@ function NewPlay() { return (
-
- {/* */} - {/* */} -
-
-
-

- {user && user.pseudo} -

- Person -
-
+
+ + {/* Menu de boutons */} +
@@ -277,8 +264,17 @@ function NewPlay() { {goBackRoom != -1 && }
+ + {/* Lobbies */} +
+ +
+
-
+ + {/*
+
*/} +
{user && ()}
diff --git a/cryptide_project/src/Pages/Play.css b/cryptide_project/src/Pages/Play.css index 1ebf969..3967eb6 100644 --- a/cryptide_project/src/Pages/Play.css +++ b/cryptide_project/src/Pages/Play.css @@ -35,7 +35,18 @@ width: 30%; } +.NewleftContainer{ + margin: 20px 30px; + width: 70%; +} +.NewrightContainer{ + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + width: 30%; +} /* .textBoard div{ display: flex; @@ -56,6 +67,13 @@ flex-direction: column; } +.NewbuttonGroupVertical{ + display: flex; + justify-content:space-around; + align-items:start; +} + + .ButtonNav{ margin: 15px 0; width:200px;