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 10 months ago
parent de58aff695
commit dab6ab2755

@ -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>

@ -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>
);

@ -215,7 +215,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>

@ -330,14 +330,49 @@ const InGame = ({locale, changeLocale}) => {
//@ts-ignore
const handleNumberChange = (event) => {
const newNumber = Math.max(20, Math.min(50, parseInt(event.target.value, 10)));
setEnteredNumber(newNumber);
//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(newNumber);
//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)));
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
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)));
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 = () => {
@ -541,7 +576,7 @@ const InGame = ({locale, changeLocale}) => {
<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>
@ -553,54 +588,47 @@ const InGame = ({locale, changeLocale}) => {
</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) setEnteredNumber(enteredNumber-1)}}
<button className='valuebutton' onClick={() => { if (enteredNumber>20){ setEnteredNumber(enteredNumber-1); setHistory([]); changeGraph(enteredNumber, enteredNumberIndices)}}}
style={{borderColor:theme.colors.secondary}}> - </button>
<input
// type="number"
style={{textAlign:'center'}}
style={{textAlign:'center', border: 'none', width: '100px'}}
id="numberInput"
disabled
value={enteredNumber}
onChange={handleNumberChange}
min={20}
max={60}/>
<button className='valuebutton' onClick={() => { if (enteredNumber<50) setEnteredNumber(enteredNumber+1)}}
onKeyDown={handleKeyDown}
onBlur={handleBlur}
/>
<button className='valuebutton' onClick={() => { if (enteredNumber<50){ setEnteredNumber(enteredNumber+1); setHistory([]); changeGraph(enteredNumber, enteredNumberIndices)}}}
style={{borderColor:theme.colors.secondary}}> + </button>
</div>
<button onClick={() => {setHistory([]); changeGraph(enteredNumber, enteredNumberIndices)}}
style={{
backgroundColor: theme.colors.tertiary,
borderColor: theme.colors.secondary,
}}><FormattedMessage id='param.valid'/></button>
</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) setEnteredNumberIndices(enteredNumberIndices-1)}}
<button className='valuebutton' onClick={() => { if (enteredNumberIndices>3){ setEnteredNumberIndices(enteredNumberIndices-1); setHistory([]); changeGraph(enteredNumber, enteredNumberIndices)}}}
style={{borderColor:theme.colors.secondary}}> - </button>
<input
// type="number"
style={{textAlign:'center'}}
style={{textAlign:'center', border: 'none', width: '100px'}}
id="numberInput"
disabled
value={enteredNumberIndices}
onChange={handleNumberIndicesChange}
min={3}
max={6}/>
<button className='valuebutton' onClick={() => { if (enteredNumberIndices<6) setEnteredNumberIndices(enteredNumberIndices+1)}}
onKeyDown={handleKeyDownIndice}
onBlur={handleBlurIndice}/>
<button className='valuebutton' onClick={() => { if (enteredNumberIndices<6){ setEnteredNumberIndices(enteredNumberIndices+1); setHistory([]); changeGraph(enteredNumber, enteredNumberIndices)}}}
style={{borderColor:theme.colors.secondary}}> + </button>
</div>
<button onClick={() => {setHistory([]); changeGraph(enteredNumber, enteredNumberIndices)}}
style={{
backgroundColor: theme.colors.tertiary,
borderColor: theme.colors.secondary,
}}><FormattedMessage id='param.valid'/></button>
</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>

@ -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,

@ -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",

@ -28,7 +28,7 @@
"indice":"Indice",
"param":"Paramètres",
"sfx":"Activer les SFX",
"sfx":"Activer les sons",
"aide":"Aide",
"majUn":"Un",
@ -98,6 +98,10 @@
"compris":"Compris !",
"close" : "Fermer",
"askeveryone" : "Demandez à tous",
"regenerate":"Regénérer le graph",
"BackHome" : "Retour à l'accueil",
"color.green":"Vert",
"color.blue":"Bleu",
@ -345,7 +349,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 !"

Loading…
Cancel
Save