fix de plein de bug de rt10, nouvelle gestion de paramètre, problème de trad etc. 🚑
continuous-integration/drone/push Build is passing Details

pull/114/head
Pierre Ferreira 1 year ago
parent de58aff695
commit dab6ab2755

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

@ -28,7 +28,7 @@ function ErrorPage({ code = "", msg = "Something is wrong"}) {
</div> </div>
<div className='centerDivH' style={{margin: "20px"}}> <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>
</div> </div>
); );

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

@ -330,14 +330,49 @@ const InGame = ({locale, changeLocale}) => {
//@ts-ignore //@ts-ignore
const handleNumberChange = (event) => { const handleNumberChange = (event) => {
//const newNumber = Math.max(20, Math.min(50, parseInt(event.target.value, 10)));
setEnteredNumber(event.target.value);
};
//@ts-ignore
const handleNumberIndicesChange = (event) => {
//const newNumber = Math.max(3, Math.min(6, parseInt(event.target.value, 10)));
setEnteredNumberIndices(event.target.value);
};
//@ts-ignore
const handleKeyDown = (event) => {
// Vérifier si la touche appuyée est "Entrée"
if (event.key === 'Enter') {
const newNumber = Math.max(20, Math.min(50, parseInt(event.target.value, 10))); const newNumber = Math.max(20, Math.min(50, parseInt(event.target.value, 10)));
setEnteredNumber(newNumber); setEnteredNumber(newNumber);
setHistory([]); changeGraph(newNumber, enteredNumberIndices)
}
};
const handleBlur = () => {
const newNumber = Math.max(20, Math.min(50, enteredNumber));
setEnteredNumber(newNumber);
setHistory([]);
changeGraph(newNumber, enteredNumberIndices)
}; };
//@ts-ignore //@ts-ignore
const handleNumberIndicesChange = (event) => { const handleKeyDownIndice = (event) => {
// Vérifier si la touche appuyée est "Entrée"
if (event.key === 'Enter') {
const newNumber = Math.max(3, Math.min(6, parseInt(event.target.value, 10))); const newNumber = Math.max(3, Math.min(6, parseInt(event.target.value, 10)));
setEnteredNumberIndices(newNumber); setEnteredNumberIndices(newNumber);
setHistory([]);
changeGraph(enteredNumber, newNumber)
}
};
const handleBlurIndice = () => {
const newNumber = Math.max(3, Math.min(6, enteredNumber));
setEnteredNumberIndices(newNumber);
setHistory([]);
changeGraph(enteredNumber, newNumber)
}; };
const handleSoundPreferenceChange = () => { const handleSoundPreferenceChange = () => {
@ -541,7 +576,7 @@ const InGame = ({locale, changeLocale}) => {
<Offcanvas show={showS} <Offcanvas show={showS}
onHide={handleCloseS} onHide={handleCloseS}
placement='top' placement='top'
style={{height: '60%', width: '30%', left: '70%' }}> style={{height: '80%', width: '30%', left: '70%' }}>
<Offcanvas.Header closeButton> <Offcanvas.Header closeButton>
<Offcanvas.Title><img src={Param} alt='param'/> <FormattedMessage id='param'/></Offcanvas.Title> <Offcanvas.Title><img src={Param} alt='param'/> <FormattedMessage id='param'/></Offcanvas.Title>
</Offcanvas.Header> </Offcanvas.Header>
@ -553,54 +588,47 @@ const InGame = ({locale, changeLocale}) => {
</label> </label>
{IsSolo && {IsSolo &&
<div className='nbNodeDiv'> <div className='nbNodeDiv' style={{ padding:'20px'}}>
<label htmlFor="numberInput"><FormattedMessage id='param.node'/> :</label> <label htmlFor="numberInput"><FormattedMessage id='param.node'/> :</label>
<div> <div>
<button className='valuebutton' onClick={() => { if (enteredNumber>20) setEnteredNumber(enteredNumber-1)}} <button className='valuebutton' onClick={() => { if (enteredNumber>20){ setEnteredNumber(enteredNumber-1); setHistory([]); changeGraph(enteredNumber, enteredNumberIndices)}}}
style={{borderColor:theme.colors.secondary}}> - </button> style={{borderColor:theme.colors.secondary}}> - </button>
<input <input
// type="number" // type="number"
style={{textAlign:'center'}} style={{textAlign:'center', border: 'none', width: '100px'}}
id="numberInput" id="numberInput"
disabled
value={enteredNumber} value={enteredNumber}
onChange={handleNumberChange} onChange={handleNumberChange}
min={20} onKeyDown={handleKeyDown}
max={60}/> onBlur={handleBlur}
<button className='valuebutton' onClick={() => { if (enteredNumber<50) setEnteredNumber(enteredNumber+1)}} />
<button className='valuebutton' onClick={() => { if (enteredNumber<50){ setEnteredNumber(enteredNumber+1); setHistory([]); changeGraph(enteredNumber, enteredNumberIndices)}}}
style={{borderColor:theme.colors.secondary}}> + </button> style={{borderColor:theme.colors.secondary}}> + </button>
</div> </div>
<button onClick={() => {setHistory([]); changeGraph(enteredNumber, enteredNumberIndices)}}
style={{
backgroundColor: theme.colors.tertiary,
borderColor: theme.colors.secondary,
}}><FormattedMessage id='param.valid'/></button>
</div>} </div>}
{IsSolo && {IsSolo &&
<div className='nbNodeDiv'> <div className='nbNodeDiv' style={{ padding:'20px'}}>
<label htmlFor="numberInput"><FormattedMessage id='param.clue'/> :</label> <label htmlFor="numberInput"><FormattedMessage id='param.clue'/> :</label>
<div> <div>
<button className='valuebutton' onClick={() => { if (enteredNumberIndices>3) setEnteredNumberIndices(enteredNumberIndices-1)}} <button className='valuebutton' onClick={() => { if (enteredNumberIndices>3){ setEnteredNumberIndices(enteredNumberIndices-1); setHistory([]); changeGraph(enteredNumber, enteredNumberIndices)}}}
style={{borderColor:theme.colors.secondary}}> - </button> style={{borderColor:theme.colors.secondary}}> - </button>
<input <input
// type="number" // type="number"
style={{textAlign:'center'}} style={{textAlign:'center', border: 'none', width: '100px'}}
id="numberInput" id="numberInput"
disabled
value={enteredNumberIndices} value={enteredNumberIndices}
onChange={handleNumberIndicesChange} onChange={handleNumberIndicesChange}
min={3} onKeyDown={handleKeyDownIndice}
max={6}/> onBlur={handleBlurIndice}/>
<button className='valuebutton' onClick={() => { if (enteredNumberIndices<6) setEnteredNumberIndices(enteredNumberIndices+1)}} <button className='valuebutton' onClick={() => { if (enteredNumberIndices<6){ setEnteredNumberIndices(enteredNumberIndices+1); setHistory([]); changeGraph(enteredNumber, enteredNumberIndices)}}}
style={{borderColor:theme.colors.secondary}}> + </button> style={{borderColor:theme.colors.secondary}}> + </button>
</div> </div>
<button onClick={() => {setHistory([]); changeGraph(enteredNumber, enteredNumberIndices)}}
style={{
backgroundColor: theme.colors.tertiary,
borderColor: theme.colors.secondary,
}}><FormattedMessage id='param.valid'/></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> </div>
</Offcanvas.Body> </Offcanvas.Body>
</Offcanvas> </Offcanvas>

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

@ -28,7 +28,7 @@
"indice":"Hint", "indice":"Hint",
"param":"Settings", "param":"Settings",
"sfx":"Activate SFX", "sfx":"Activate sounds",
"aide":"Help", "aide":"Help",
"majUn":"A", "majUn":"A",
@ -101,6 +101,10 @@
"compris": "Understood!", "compris": "Understood!",
"close": "Close", "close": "Close",
"regenerate":"Regenarte graph",
"BackHome" : "Back to home",
"askeveryone" : "Ask everyone",
"color.green":"Green", "color.green":"Green",
"color.blue":"Blue", "color.blue":"Blue",
"color.red":"Red", "color.red":"Red",

@ -28,7 +28,7 @@
"indice":"Indice", "indice":"Indice",
"param":"Paramètres", "param":"Paramètres",
"sfx":"Activer les SFX", "sfx":"Activer les sons",
"aide":"Aide", "aide":"Aide",
"majUn":"Un", "majUn":"Un",
@ -98,6 +98,10 @@
"compris":"Compris !", "compris":"Compris !",
"close" : "Fermer", "close" : "Fermer",
"askeveryone" : "Demandez à tous",
"regenerate":"Regénérer le graph",
"BackHome" : "Retour à l'accueil",
"color.green":"Vert", "color.green":"Vert",
"color.blue":"Bleu", "color.blue":"Bleu",
@ -345,7 +349,7 @@
"tuto.txt.14.6.5":" pour deviner, bonne chance !", "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.cantPose":" ne peut plus poser de carré",
"history.NotCoupable":" n'est pas le coupable !" "history.NotCoupable":" n'est pas le coupable !"

Loading…
Cancel
Save