pull/67/head
Pierre Ferreira 2 years ago
parent cd1aff13db
commit 73b049f348

@ -24,14 +24,15 @@ import { colorToEmoji, positionToColor } from "../ColorHelper";
interface MyGraphComponentProps { interface MyGraphComponentProps {
onNodeClick: (shouldShowChoiceBar: boolean) => void; onNodeClick: (shouldShowChoiceBar: boolean) => void;
handleShowTurnBar: (shouldShowTurnBar: boolean) => void handleShowTurnBar: (shouldShowTurnBar: boolean) => void;
FromSolo: boolean;
} }
let lastAskingPlayer = 0 let lastAskingPlayer = 0
let lastNodeId = -1 let lastNodeId = -1
let first = true let first = true
const MyGraphComponent: React.FC<MyGraphComponentProps> = ({onNodeClick, handleShowTurnBar}) => { const MyGraphComponent: React.FC<MyGraphComponentProps> = ({onNodeClick, handleShowTurnBar, FromSolo}) => {
const { indices, indice, person, personNetwork, setNodeIdData, players, askedPersons, setActualPlayerIndexData, room, actualPlayerIndex, turnPlayerIndex } = useGame(); const { indices, indice, person, personNetwork, setNodeIdData, players, askedPersons, setActualPlayerIndexData, room, actualPlayerIndex, turnPlayerIndex } = useGame();
@ -96,8 +97,26 @@ const MyGraphComponent: React.FC<MyGraphComponentProps> = ({onNodeClick, handleS
const networkData = { nodes: nodes, edges: graph.edges }; const networkData = { nodes: nodes, edges: graph.edges };
const network = new Network(container, networkData, initialOptions); const network = new Network(container, networkData, initialOptions);
if(FromSolo){
//* lsti = Generate indice (paramNbIndice) //une couleur par indice
/*
Onclick :
nbcoup = 0;
pour chaque indice i :
jeton = IsNodeInIndice(node,i)
lstJ.add(jeton)
if jeton == X :
rep = false
if(rep) :
endgame()
break
afficheJeton(jeton)
*/
}
else {
socket.on("node checked",(id, works, color, newPlayerIndex) => { socket.on("node checked",(id, works, color, newPlayerIndex) => {
const node = nodes.get().find((n) => id == n.id) const node = nodes.get().find((n) => id == n.id)
if (node!=undefined){ if (node!=undefined){
@ -150,8 +169,9 @@ const MyGraphComponent: React.FC<MyGraphComponentProps> = ({onNodeClick, handleS
} }
} }
} }
}
}) )
@ -198,6 +218,8 @@ const MyGraphComponent: React.FC<MyGraphComponentProps> = ({onNodeClick, handleS
onNodeClick(false) onNodeClick(false)
} }
}); });
} //notfromsolo
}, []); // Le tableau vide signifie que cela ne s'exécutera qu'une fois après le premier rendu }, []); // Le tableau vide signifie que cela ne s'exécutera qu'une fois après le premier rendu
return ( return (

@ -1,7 +1,8 @@
import React from "react"; import React from "react";
import { useTheme } from "../Style/ThemeContext"; import { useTheme } from "../Style/ThemeContext";
const TurnBar = () => { //@ts-ignore
const TurnBar = ({text}) => {
const theme = useTheme(); const theme = useTheme();
return ( return (
<div className='upperInfo' <div className='upperInfo'
@ -9,7 +10,7 @@ const TurnBar = () => {
borderColor: theme.colors.secondary borderColor: theme.colors.secondary
}}> }}>
{/* texte changeable et a traduire */} {/* texte changeable et a traduire */}
<p>Dummy, à vous de jouer !</p> <p>{text}</p>
</div> </div>
); );
}; };

@ -108,9 +108,9 @@ const InGame = ({locale, changeLocale}) => {
return ( return (
<div id="mainDiv"> <div id="mainDiv">
{showTurnBar && <TurnBar/>} {showTurnBar && <TurnBar text="je suis dans la page InGame"/>}
<div id='graphDiv'> <div id='graphDiv'>
<GraphContainer onNodeClick={handleNodeClick} handleShowTurnBar={handleShowTurnBar} /> <GraphContainer onNodeClick={handleNodeClick} handleShowTurnBar={handleShowTurnBar} FromSolo={false}/>
</div> </div>
<div className='playerlistDiv'> <div className='playerlistDiv'>

@ -107,9 +107,9 @@ const SoloGame = ({locale, changeLocale}) => {
return ( return (
<div id="mainDiv"> <div id="mainDiv">
<TurnBar/> <TurnBar text="je suis dans la page solo"/>
<div id='graphDiv'> <div id='graphDiv'>
<GraphContainer onNodeClick={handleNodeClick} handleShowTurnBar={handleShowTurnBar} /> <GraphContainer onNodeClick={handleNodeClick} handleShowTurnBar={handleShowTurnBar} FromSolo={true}/>
</div> </div>
<div className='nbLaps' style={{ <div className='nbLaps' style={{

Loading…
Cancel
Save