Merge branch 'todoS5' of https://codefirst.iut.uca.fr/git/Crypteam/Cryptid into todoS5

cryptide_project/src/Components/GraphContainer.tsx

@@ -23,6 +23,7 @@ interface MyGraphComponentProps {
   addToHistory: (message : string) => void
   solo : boolean
   isDaily : boolean
+  isEasy: boolean
   setNetwork: (network: Network) => void
   showLast: boolean
 }
@@ -42,9 +43,10 @@ let lastNodes: NodePerson[] = []
 let cptEndgame = 0
 let firstEnigme = true
 let endgame= false
+let firstHistory = true
 
 
-const MyGraphComponent: React.FC<MyGraphComponentProps> = ({onNodeClick, handleShowTurnBar, handleTurnBarTextChange, playerTouched, setPlayerTouched, changecptTour, solo, isDaily, addToHistory, showLast, setNetwork}) => {
+const MyGraphComponent: React.FC<MyGraphComponentProps> = ({onNodeClick, handleShowTurnBar, handleTurnBarTextChange, playerTouched, setPlayerTouched, changecptTour, solo, isDaily, isEasy, addToHistory, showLast, setNetwork}) => {
   let cptTour: number = 0
 
   //* Gestion du temps :
@@ -283,16 +285,26 @@ const MyGraphComponent: React.FC<MyGraphComponentProps> = ({onNodeClick, handleS
     setNetwork(network)
 
     if (isDaily){
-      dailyEnigme.forEach((pairs, index) => {
+      if (!isEasy){
-        pairs.forEach((pair) => {
+        dailyEnigme.forEach((pairs, index) => {
-          const i = indices.findIndex((indice) => pair.first.getId() === indice.getId())
+          pairs.forEach((pair) => {
-          const node = networkData.nodes.get().find((n) => index == n.id)
+            const i = indices.findIndex((indice) => pair.first.getId() === indice.getId())
-          if (node != undefined){
+            const node = networkData.nodes.get().find((n) => index == n.id)
-            networkData.nodes.update({id: node.id, label: node.label + positionToEmoji(i, pair.second)})
+            if (node != undefined){
-            const test = networkData.nodes.get().find((n) => index == n.id)
+              networkData.nodes.update({id: node.id, label: node.label + positionToEmoji(i, pair.second)})
-          }
+            }
-        })
+          })
-      });
+        });
+      }
+      else{
+        if (firstHistory){
+          firstHistory=false
+          indices.forEach((indice, index) => {
+            addToHistory("Indice " + positionToEmoji(index, true) + " : " + indice.ToString("fr"))
+          })
+        }
+        
+      }
     }
 
     socket.on("reset graph", () => {
@@ -429,7 +441,9 @@ const MyGraphComponent: React.FC<MyGraphComponentProps> = ({onNodeClick, handleS
     else {
       if (firstLap){
         firstLap=false
-        addToHistory("<----- [Tour " + 1  +"/"+networkData.nodes.length + "] ----->");
+        if (!isDaily){
+          addToHistory("<----- [Tour " + 1  +"/"+networkData.nodes.length + "] ----->");
+        }
       }
     }
     
@@ -501,7 +515,7 @@ const MyGraphComponent: React.FC<MyGraphComponentProps> = ({onNodeClick, handleS
         askedWrong=false
         askedWrongBot=false
         endgame = true
-  
+        firstHistory=true
         try{
           if(isLoggedIn){
             if(!solo){

cryptide_project/src/Pages/InGame.tsx

@@ -69,6 +69,11 @@ const InGame = ({locale, changeLocale}) => {
     isDaily=false
   }
 
+  let isEasy: boolean = true
+  const isEasytmp = params.get('easy');
+  if (isEasytmp == "false"){
+    isEasy=false
+  }
   //* Historique
   const [history, setHistory] = useState<string[]>([]);
   const [showLast, setShowLast] = useState(false)
@@ -220,6 +225,7 @@ const InGame = ({locale, changeLocale}) => {
                           addToHistory={addToHistory}
                           solo={IsSolo} 
                           isDaily={isDaily} 
+                          isEasy={isEasy}
                           setPlayerTouched={handleSetPlayerTouched} 
                           playerTouched={playerTouched}
                           setNetwork={setNetworkData}
@@ -236,7 +242,7 @@ const InGame = ({locale, changeLocale}) => {
             </div>
         }
         
-        {!isDaily &&
+        {(!isDaily || (isDaily && isEasy)) &&
           <div className='historique' id="history-container">
               {history.map((item, index) => (
                   <div key={index}>{item}</div>

cryptide_project/src/Pages/Play.tsx

@@ -183,12 +183,8 @@ function Play() {
         setPersonNetworkData(networkPerson)
         setIndicesData(choosenIndices)
         setIndicesData(choosenIndices)
-        if (first){
+
-            first = false
+        navigate('/game?solo=true&daily=true&easy=true');
-            const map = EnigmeDuJourCreator.createEnigme(networkPerson, choosenIndices, choosenPerson, Stub.GenerateIndice())
-            setDailyEnigmeData(map)
-        }
-        navigate('/game?solo=true&daily=true');
         setShowOverlay(false);
     };
 
@@ -206,7 +202,7 @@ function Play() {
             const map = EnigmeDuJourCreator.createEnigme(networkPerson, choosenIndices, choosenPerson, Stub.GenerateIndice())
             setDailyEnigmeData(map)
         }
-        navigate('/game?solo=true&daily=true');
+        navigate('/game?solo=true&daily=true&easy=false');
         setShowOverlay(false);
     };