Merge pull request 'fixRT10' (#114) from fixRT10 into master

Reviewed-on: #114

cryptide_project/src/Components/PlayerList.tsx

@@ -8,6 +8,7 @@ import Person from '../res/img/Person.png'
 import BotImg from '../res/img/bot.png'
 
 import { socket } from '../SocketConfig';
+import { FormattedMessage } from 'react-intl';
 
 
 //@ts-ignore
@@ -69,7 +70,7 @@ const PlayerList: React.FC<PlayerListProps> = ({ players, playerTouched, setPlay
                             textAlign: "center",
                             color: "white",
                             padding: "10px"}}
-                            onClick={() => askEveryone()}>Ask everyone</button>
+                            onClick={() => askEveryone()}><FormattedMessage id='askeveryone'/></button>
                         ):
                         (
                             <button style={{ 
@@ -80,7 +81,7 @@ const PlayerList: React.FC<PlayerListProps> = ({ players, playerTouched, setPlay
                                 textAlign: "center",
                                 color: "white",
                                 padding: "10px"}}
-                            onClick={() => askEveryone()}>Ask everyone</button>
+                            onClick={() => askEveryone()}><FormattedMessage id='askeveryone'/></button>
                         )
                     }
             </div>

cryptide_project/src/Components/ScoreBoard.css

@@ -13,3 +13,16 @@
   
   /* Personnalisez davantage selon vos préférences */
 
+  .carousselButton{
+    border:none;
+    background-color:darkgray;
+    color:white;
+    opacity: 60%;
+    width: 50px;
+    height: 70px;
+    font-size: 40px;
+    border-radius: 5px;
+    padding: 5px;
+    margin: 5px;
+    cursor: pointer;
+  }

cryptide_project/src/Components/ScoreBoard.tsx

@@ -94,6 +94,19 @@ const ScoreBoard: React.FC<{ Player: User }> = ({ Player }) => {
 
     const intl = useIntl();
 
+
+    //@ts-ignore
+    const CustomPrevButton = ({ previousSlide }) => (
+        <button className='carousselButton' onClick={previousSlide}>&lt;</button>
+    );
+    
+    //@ts-ignore
+    const CustomNextButton = ({ nextSlide }) => (
+    <button className='carousselButton' onClick={nextSlide}>&gt;</button>
+    );
+
+
+
     return (
         <Tabs
             activeKey={activeTab}
@@ -108,7 +121,15 @@ const ScoreBoard: React.FC<{ Player: User }> = ({ Player }) => {
             title={intl.formatMessage({ id: 'score.tab.stat' })}
             disabled={!Player.pseudo.startsWith("Guest_") ? false : true}>
                 <Tab.Content className={`tabsStats ${activeTab !== 'perso' ? 'hidden' : ''}`}>
-                    <Carousel adaptiveHeight wrapAround slidesToShow={1} cellSpacing={10} key={carouselKey}>
+                    <Carousel
+                        renderCenterLeftControls={({ previousSlide }) => <CustomPrevButton previousSlide={previousSlide} />}
+                        renderCenterRightControls={({ nextSlide }) => <CustomNextButton nextSlide={nextSlide} />}
+                        adaptiveHeight
+                        wrapAround
+                        slidesToShow={1}
+                        cellSpacing={10}
+                        key={carouselKey}
+                        >
                         <div className="stats">
                             <h5><FormattedMessage id='info.mdj.mastermind'/></h5>
                             <hr />
@@ -117,7 +138,7 @@ const ScoreBoard: React.FC<{ Player: User }> = ({ Player }) => {
                             <p><FormattedMessage id='score.moy'/>: {Player.mastermindStats.avgNbTry.toFixed(2)}</p>
                         </div>
                         <div className="stats">
-                            <h5>Enigme facile</h5>
+                            <h5><FormattedMessage id='score.titre.easy'/></h5>
                             <hr />
                             <p><FormattedMessage id='score.nbPlayed'/>: {Player.easyEnigmaStats.nbGames}</p>
                             <p><FormattedMessage id='score.NbWin'/>: {Player.easyEnigmaStats.nbWins}</p>
@@ -126,14 +147,14 @@ const ScoreBoard: React.FC<{ Player: User }> = ({ Player }) => {
                             <p><FormattedMessage id='score.moyTmp'/>: {Player.easyEnigmaStats.avgTime.toFixed(2) + "s"}</p>
                         </div>
                         <div className="stats">
-                            <h5>Enigme moyenne</h5>
+                            <h5><FormattedMessage id='score.titre.int'/></h5>
                             <hr />
                             <p><FormattedMessage id='score.nbPlayed'/>: {Player.mediumEnigmaStats.nbGames}</p>
                             <p><FormattedMessage id='score.best'/>: {Player.mediumEnigmaStats.bestScore}</p>
                             <p><FormattedMessage id='score.moy'/>: {Player.mediumEnigmaStats.avgNbTry.toFixed(2)}</p>
                         </div>
                         <div className="stats">
-                            <h5>Enigme difficile</h5>
+                            <h5><FormattedMessage id='score.titre.hard'/></h5>
                             <hr />
                             <p><FormattedMessage id='score.nbPlayed'/>: {Player.hardEnigmaStats.nbGames}</p>
                             <p><FormattedMessage id='score.NbWin'/>: {Player.hardEnigmaStats.nbWins}</p>
@@ -142,7 +163,7 @@ const ScoreBoard: React.FC<{ Player: User }> = ({ Player }) => {
                             <p><FormattedMessage id='score.moyTmp'/>: {Player.hardEnigmaStats.avgTime.toFixed(2) + "s"}</p>
                         </div>
                         <div className="stats">
-                            <h5>En ligne</h5>
+                            <h5><FormattedMessage id='score.online'/></h5>
                             <hr />
                             <p><FormattedMessage id='score.nbPlayed'/>: {Player.onlineStats.nbGames}</p>
                             <p><FormattedMessage id='score.NbWin'/>: {Player.onlineStats.nbWins}</p>
@@ -151,7 +172,7 @@ const ScoreBoard: React.FC<{ Player: User }> = ({ Player }) => {
                     </Carousel>
                 </Tab.Content>
             </Tab>
-            <Tab eventKey="daily" title="Daily">
+            <Tab eventKey="daily" title={intl.formatMessage({ id: 'score.tab.quoti' })}>
                 <Tab.Content className={`tabsStats ${activeTab !== 'daily' ? 'hidden' : ''}`}>
                     <Carousel adaptiveHeight wrapAround slidesToShow={1} cellSpacing={10} key={carouselKey}>
                         <div className="stats">
@@ -257,7 +278,7 @@ const ScoreBoard: React.FC<{ Player: User }> = ({ Player }) => {
                     </Carousel>
                 </Tab.Content>
             </Tab>
-            <Tab eventKey="weekly" title="Weekly">
+            <Tab eventKey="weekly" title={intl.formatMessage({ id: 'score.tab.hebdo' })}>
                 <Tab.Content className={`tabsStats ${activeTab !== 'weekly' ? 'hidden' : ''}`}>
                     <Carousel adaptiveHeight wrapAround slidesToShow={1} cellSpacing={10} key={carouselKey}>
                         <div className="stats">

cryptide_project/src/Error/ErrorPage.tsx

@@ -28,7 +28,7 @@ function ErrorPage({ code = "", msg = "Something is wrong"}) {
             </div>
 
             <div className='centerDivH' style={{margin: "20px"}}>
-                <Button href={`${basePath}/`} variant='danger'>Retour à l'accueil</Button>
+                <Button href={`${basePath}/`} variant='danger'><FormattedMessage id='BackHome'/></Button>
             </div>
         </div>
     );

cryptide_project/src/Pages/EndGame.tsx

@@ -216,7 +216,7 @@ function EndGame({lang}: {lang: string}) {
             <div id="vis-graph"/>
 
             <div className='centerDivH' onClick={resetAll} style={{margin: "20px"}}>
-                <Button href={`${basePath}/`}>Retour à l'accueil</Button>
+                <Button href={`${basePath}/`}><FormattedMessage id='BackHome'/></Button>
             </div>
 
         </div>

cryptide_project/src/Pages/InGame.tsx

@@ -600,7 +600,7 @@ const handleBlurIndice = () => {
         <Offcanvas show={showS} 
                   onHide={handleCloseS} 
                   placement='top'
-                  style={{height: '60%', width: '30%', left: '70%' }}>
+                  style={{height: '80%', width: '30%', left: '70%' }}>
           <Offcanvas.Header closeButton>
             <Offcanvas.Title><img src={Param} alt='param'/> <FormattedMessage id='param'/></Offcanvas.Title>
           </Offcanvas.Header>
@@ -612,14 +612,14 @@ const handleBlurIndice = () => {
               </label>
 
               {IsSolo && 
-              <div className='nbNodeDiv'>
+              <div className='nbNodeDiv' style={{ padding:'20px'}}>
                   <label htmlFor="numberInput"><FormattedMessage id='param.node'/> :</label>
                   <div>
                       <button className='valuebutton' onClick={() => { if (enteredNumber>20 && user !== null){ setEnteredNumber(enteredNumber-1); user.nbNodes = user.nbNodes-1; setHistory([]); }}}
                           style={{borderColor:theme.colors.secondary}}> - </button>
                       <input
                           // type="number"
-                          style={{textAlign:'center'}}
+                          style={{textAlign:'center', border: 'none', width: '100px'}}
                           id="numberInput"
                           value={enteredNumber}
                           onChange={handleNumberChange}
@@ -632,14 +632,14 @@ const handleBlurIndice = () => {
               </div>}
 
               {IsSolo && 
-              <div className='nbNodeDiv'>
+              <div className='nbNodeDiv' style={{ padding:'20px'}}>
                   <label htmlFor="numberInput"><FormattedMessage id='param.clue'/> :</label>
                   <div>
                       <button className='valuebutton' onClick={() => { if (enteredNumberIndices>3 && user!==null){ setEnteredNumberIndices(enteredNumberIndices - 1); user.nbIndices = user.nbIndices-1; setHistory([]); }}}
                           style={{borderColor:theme.colors.secondary}}> - </button>
                       <input
                           // type="number"
-                          style={{textAlign:'center'}}
+                          style={{textAlign:'center', border: 'none', width: '100px'}}
                           id="numberInput"
                           value={enteredNumberIndices}
                           onChange={handleNumberIndicesChange}
@@ -649,6 +649,10 @@ const handleBlurIndice = () => {
                           style={{borderColor:theme.colors.secondary}}> + </button>
                   </div>
               </div>}
+              <div className='centerDivH' style={{margin: "20px"}}>
+                <Button variant="outline-warning" onClick={() => {setHistory([]); changeGraph(enteredNumber, enteredNumberIndices)}}><FormattedMessage id='regenerate'/></Button>
+              </div>
+                <Button variant="outline-danger" href={`${basePath}/`}><FormattedMessage id='BackHome'/></Button>
             </div>
           </Offcanvas.Body>
         </Offcanvas>

cryptide_project/src/Pages/Lobby.tsx

@@ -309,9 +309,9 @@ function Lobby() {
                         <h3><FormattedMessage id='lobby.bienvenue'/></h3>
                         <p><FormattedMessage id='lobby.wait'/></p>
                         {/* Bouton pour copier le lien */}
-                        <Button variant="primary" ref={target} onClick={copyGameLink}>
+                        {/* <Button variant="primary" ref={target} onClick={copyGameLink}>
                             <FormattedMessage id='lobby.invite'/>
-                        </Button>
+                        </Button> */}
                         <Overlay target={target.current} show={show} placement="top">
                             {({
                             placement: _placement,

cryptide_project/src/Pages/NewPlay.tsx

@@ -255,7 +255,7 @@ function NewPlay() {
                 </div>
             
                 {/* Lobbies */}
-                <div style={{border:'solid 1px lightgray', borderRadius:'15px', marginTop:'20px'}}>
+                <div style={{border:'solid 1px lightgray', borderRadius:'15px', marginTop:'20px', minHeight:'400px'}}>
                     <Lobbies/>
                 </div>
             </div>

cryptide_project/src/Translations/en.json

@@ -28,7 +28,7 @@
 
     "indice":"Hint",
     "param":"Settings",
-    "sfx":"Activate SFX",
+    "sfx":"Activate sounds",
     "aide":"Help",
 
     "majUn":"A",
@@ -101,6 +101,10 @@
     "compris": "Understood!",
     "close": "Close",
 
+    "regenerate":"Regenarte graph",
+    "BackHome" : "Back to home",
+    "askeveryone" : "Ask everyone",
+
     "color.green":"Green",
     "color.blue":"Blue",
     "color.red":"Red",
@@ -136,6 +140,8 @@
     "score.online": "Online",
 
     "score.tab.stat" : "Your Stats",
+    "score.tab.quoti" : "Daily",
+    "score.tab.hebdo" : "Weekly",
 
     "lobby.players" : "Players",
     "lobby.bienvenue": "Welcome to your lobby!",

cryptide_project/src/Translations/fr.json

@@ -28,7 +28,7 @@
 
     "indice":"Indice",
     "param":"Paramètres",
-    "sfx":"Activer les SFX",
+    "sfx":"Activer les sons",
     "aide":"Aide",
 
     "majUn":"Un",
@@ -98,13 +98,17 @@
     "compris":"Compris !",
     "close" : "Fermer",
 
+    "askeveryone" : "Demandez à tous",
+
+    "regenerate":"Regénérer le graph",
+    "BackHome" : "Retour à l'accueil",
 
     "color.green":"Vert",
     "color.blue":"Bleu",
     "color.red":"Rouge",
     "color.yellow":"Jaune",
 
-    "play.jouerseul": "Jouer seul",
+    "play.jouerseul": "Mastermind",
     "play.enigme": "Résoudre une énigme",
     "play.enigme.easy": "Facile",
     "play.enigme.medium": "Intermédiaire",
@@ -134,6 +138,8 @@
     "score.online" : "En ligne",
 
     "score.tab.stat" : "Vos Stats",
+    "score.tab.quoti" : "Quotidien",
+    "score.tab.hebdo" : "Hebdomadaire",
 
     "lobby.players" : "Joueurs",
     "lobby.bienvenue" : "Bienvenue dans votre lobby !",
@@ -345,7 +351,7 @@
     "tuto.txt.14.6.5":" pour deviner, bonne chance !",
 
 
-    "history.mis":" à mis un ",
+    "history.mis":" a mis un ",
     "à":"à",
     "history.cantPose":" ne peut plus poser de carré",
     "history.NotCoupable":" n'est pas le coupable !"