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

cryptide_project/server/api/controllers/AuthController.js

@@ -67,6 +67,9 @@ class AuthController {
 
         // Stocker l'utilisateur dans la session)
         req.session.user = user;
+        req.session.user.nbNodes = 25
+        req.session.user.nbIndices = 3
+
 
         // Envoyer une réponse réussie
         console.log("[" + hour + ":" + minutes + "] " + user.pseudo + " have been connected.");
@@ -82,6 +85,20 @@ class AuthController {
     }
   }
 
+  static async UpdateNbNodesIndices(req, res){
+    try{
+        if (req.session.user){
+            req.session.user.nbNodes = req.body.nbNodes;
+            req.session.user.nbIndices = req.body.nbIndices;
+            res.status(200).json({ message: 'Nombre de noeuds mis à jour.' });
+        }
+    }
+    catch(error){
+        console.error(error);
+        res.status(500).json({ error: 'Erreur lors de la mise à jour du nombre de noeuds.' });
+    }
+}
+
   static async logout(req, res) {
     const pseudo = req.session.user.pseudo;
     const date = new Date();

cryptide_project/server/api/routes/AuthRoutes.js

@@ -11,6 +11,7 @@ router.delete('/auth/logout', AuthController.logout)
 router.delete('/auth/delAccount', AuthController.delAccount)
 router.post('/auth/validatePassword', AuthController.validatePassword);
 router.put('/auth/updatePassword', AuthController.updatePassword);
+router.put('/session/updateNbNodes', AuthController.UpdateNbNodesIndices);
 
 // Routes pour les sessions
 router.get('/session', SessionController.getUserInformation);
@@ -21,6 +22,7 @@ router.post('/session/addHardEnigmaStats', SessionController.addHardEnigmaStats)
 router.post('/session/addOnlineStats', SessionController.addOnlineStats);
 router.put('/session/updatePseudo', SessionController.UpdatePseudo);
 
+
 // Routes pour le daily scoreboard
 router.get('/scoreboard/getDailyMastermind', ScoreboardController.getDailyMastermind);
 router.get('/scoreboard/getDailyEasyEnigma', ScoreboardController.getDailyEasyEnigma);

cryptide_project/src/Components/GraphContainer.tsx

@@ -618,7 +618,6 @@ const MyGraphComponent: React.FC<MyGraphComponentProps> = ({onNodeClick, handleS
         setPlayerIndex(index)
         setLastIndex(index)
         if (actualPlayerIndex==index){
-          handleTurnBarTextChange(intl.formatMessage({ id: 'game.yourTurn' }))
           handleShowTurnBar(true)
         }
       })
@@ -949,24 +948,6 @@ const MyGraphComponent: React.FC<MyGraphComponentProps> = ({onNodeClick, handleS
       }
     })
 
-
-
-      personNetwork.getPersons().forEach(p => {
-        let a = 0
-        for (let i of indices){
-          let tester = IndiceTesterFactory.Create(i)
-          if (tester.Works(p)){
-            a++
-          }
-        }
-        if (a==indices.length){
-          //networkData.nodes.update({id: p.getId(), label: p.getName() + "\n🔵"})
-          //console.log(p)
-        }
-        
-      });
-      
-
       // Gérer le changement entre la physique et le déplacement manuel
       network.on("dragging", (params) => {
           if (params.nodes.length > 0) {
@@ -1104,15 +1085,14 @@ const MyGraphComponent: React.FC<MyGraphComponentProps> = ({onNodeClick, handleS
           const personTest = personNetwork?.getPersons().find((p) => p.getId() == params.nodes[0]) //person sélectionnée
           const node = nodes.get().find((n: any) => params.nodes[0] == n.id)
           if(node == undefined)return;
-          if (personTest != undefined && !node.label.includes(positionToEmoji(index, true)) && !node.label.includes(positionToEmoji(index, false))){ //si la personne existe et que le noeud n'a pas déjà été cliqué
+          if (node.label.includes(colorToEmoji(positionToColor(0), true)) || node.label.includes(colorToEmoji(positionToColor(0), false))) return
+          if (personTest != undefined){ //si la personne existe et que le noeud n'a pas déjà été cliqué
             let index =0
-            let works = true
-            const statsTime = elapsedTime;
             for (const i of indices){
               const tester = IndiceTesterFactory.Create(i)
               const test = tester.Works(personTest)
                 //@ts-ignore
-              if (node!=undefined){
+              if (node!=undefined && !node.label.includes(positionToEmoji(index, true)) && !node.label.includes(positionToEmoji(index, false))){
                 const nodeNode = nodes.get().find((n: any) => params.nodes[0] == n.id)
                 if(nodeNode == undefined)return;
                 networkData.nodes.update({id: params.nodes[0], label: nodeNode.label + positionToEmoji(index, test)})

cryptide_project/src/Pages/InGame.tsx

@@ -55,6 +55,7 @@ import {generateLatexCode, generateLatexCodeEnigme} from '../Script/LatexScript'
 import Pair from '../model/Pair';
 import Indice from '../model/Indices/Indice';
 import {basePath} from "../AdressSetup"
+import { useAuth } from '../Contexts/AuthContext';
 
 
 let cptNavigation = 0
@@ -65,6 +66,7 @@ const InGame = ({locale, changeLocale}) => {
   const theme = useTheme();
   
   const navigate = useNavigate()
+  const {user, manager} = useAuth()
   
   const params = new URLSearchParams(window.location.search);
 
@@ -324,55 +326,70 @@ const InGame = ({locale, changeLocale}) => {
   const [playTurnSound, setPlayTurnSound] = useState(false);
   const [soundPreference, setSoundPreference] = useState(true); // utilisateur
 
-  const [enteredNumber, setEnteredNumber] = useState(25);
-  const [enteredNumberIndices, setEnteredNumberIndices] = useState(3);
+  const [enteredNumber, setEnteredNumber] = useState(user?.nbNodes || 25);
+  const [enteredNumberIndices, setEnteredNumberIndices] = useState(user?.nbIndices || 3);
 
 
   //@ts-ignore
   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') {
+    if (event.key === 'Enter' && user!==null) {
       const newNumber = Math.max(20, Math.min(50, parseInt(event.target.value, 10)));
+      user.nbNodes = newNumber;
       setEnteredNumber(newNumber);
-  setHistory([]); changeGraph(newNumber, enteredNumberIndices)
+      setHistory([]); 
     }
   };
   
   const handleBlur = () => {
+    if (user!==null){
       const newNumber = Math.max(20, Math.min(50, enteredNumber));
+      user.nbNodes = newNumber;
       setEnteredNumber(newNumber);
       setHistory([]); 
-changeGraph(newNumber, enteredNumberIndices)
+    }
   };
   
+
+  //@ts-ignore
+  const handleNumberIndicesChange = (event) => {
+    setEnteredNumberIndices(event.target.value);
+};
+
+useEffect(() => {
+  if (changeGraph !== undefined){
+    manager?.userService.changeNodesIndices(enteredNumber, enteredNumberIndices)
+    changeGraph(enteredNumber, enteredNumberIndices)
+  }
+  else{
+    setEnteredNumber(user?.nbNodes || 25)
+    setEnteredNumberIndices(user?.nbIndices || 3)
+  }
+}, [enteredNumber, enteredNumberIndices])
+
 //@ts-ignore
 const handleKeyDownIndice = (event) => {
   // Vérifier si la touche appuyée est "Entrée"
-if (event.key === 'Enter') {
+  if (event.key === 'Enter' && user!=null) {
     const newNumber = Math.max(3, Math.min(6, parseInt(event.target.value, 10)));
+    user.nbIndices = newNumber;
     setEnteredNumberIndices(newNumber);
     setHistory([]); 
-changeGraph(enteredNumber, newNumber)
   }
 };
 
 const handleBlurIndice = () => {
+  if (user!==null){
     const newNumber = Math.max(3, Math.min(6, enteredNumber));
     setEnteredNumberIndices(newNumber);
+    user.nbIndices = newNumber;
     setHistory([]); 
-changeGraph(enteredNumber, newNumber)
+  }
 };
 
   const handleSoundPreferenceChange = () => {
@@ -591,7 +608,7 @@ changeGraph(enteredNumber, newNumber)
               <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); setHistory([]); changeGraph(enteredNumber, enteredNumberIndices)}}}
+                      <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"
@@ -599,10 +616,10 @@ changeGraph(enteredNumber, newNumber)
                           id="numberInput"
                           value={enteredNumber}
                           onChange={handleNumberChange}
-                          onKeyDown={handleKeyDown}
-                          onBlur={handleBlur}
+                          onKeyDown={handleKeyDown} // Ajout de l'événement onKeyDown
+                          onBlur={handleBlur} // Ajout de l'événement onBlur
                           />
-                      <button className='valuebutton' onClick={() => { if (enteredNumber<50){ setEnteredNumber(enteredNumber+1); setHistory([]); changeGraph(enteredNumber, enteredNumberIndices)}}}
+                      <button className='valuebutton' onClick={() => { if (enteredNumber<50 && user!==null){ setEnteredNumber(enteredNumber+1); user.nbNodes = user.nbNodes+1 ;setHistory([]); }}}
                           style={{borderColor:theme.colors.secondary}}> + </button>
                   </div>
               </div>}
@@ -611,7 +628,7 @@ changeGraph(enteredNumber, newNumber)
               <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); setHistory([]); changeGraph(enteredNumber, enteredNumberIndices)}}}
+                      <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"
@@ -619,9 +636,9 @@ changeGraph(enteredNumber, newNumber)
                           id="numberInput"
                           value={enteredNumberIndices}
                           onChange={handleNumberIndicesChange}
-                          onKeyDown={handleKeyDownIndice}
+                          onKeyDown={handleKeyDownIndice} // Ajout de l'événement onKeyDown
                           onBlur={handleBlurIndice}/>
-                      <button className='valuebutton' onClick={() => { if (enteredNumberIndices<6){ setEnteredNumberIndices(enteredNumberIndices+1); setHistory([]); changeGraph(enteredNumber, enteredNumberIndices)}}}
+                      <button className='valuebutton' onClick={() => { if (enteredNumberIndices<6 && user!==null){ setEnteredNumberIndices(enteredNumberIndices + 1); user.nbIndices = user.nbIndices+1; setHistory([]); }}}
                           style={{borderColor:theme.colors.secondary}}> + </button>
                   </div>
               </div>}

cryptide_project/src/Pages/NewPlay.tsx

@@ -96,7 +96,7 @@ function NewPlay() {
     }
 
     function launchMastermind(){
-        const [networkPerson, choosenPerson, choosenIndices] = GameCreator.CreateGame(3, 30)
+        const [networkPerson, choosenPerson, choosenIndices] = GameCreator.CreateGame(user?.nbIndices || 3, user?.nbNodes || 25)
         setPersonData(choosenPerson)
         setPersonNetworkData(networkPerson)
         setIndicesData(choosenIndices)
@@ -159,7 +159,7 @@ function NewPlay() {
 
         //* Mode facile 
         //todo différencier les deux
-        const [networkPerson, choosenPerson, choosenIndices] = GameCreator.CreateGame(3, 30)
+        const [networkPerson, choosenPerson, choosenIndices] = GameCreator.CreateGame(user?.nbIndices || 3, user?.nbNodes || 25)
         setPersonData(choosenPerson)
         setPersonNetworkData(networkPerson)
         setIndicesData(choosenIndices)
@@ -173,7 +173,7 @@ function NewPlay() {
 
         //* Mode facile 
         //todo différencier les deux
-        const [networkPerson, choosenPerson, choosenIndices] = GameCreator.CreateGame(3, 30)
+        const [networkPerson, choosenPerson, choosenIndices] = GameCreator.CreateGame(user?.nbIndices || 3, user?.nbNodes || 25)
         setPersonData(choosenPerson)
         setPersonNetworkData(networkPerson)
         setIndicesData(choosenIndices)
@@ -193,7 +193,7 @@ function NewPlay() {
         //* Mode difficile
 
         //todo différencier les deux
-        const [networkPerson, choosenPerson, choosenIndices] = GameCreator.CreateGame(3, 30)
+        const [networkPerson, choosenPerson, choosenIndices] = GameCreator.CreateGame(user?.nbIndices || 3, user?.nbNodes || 25)
         setPersonData(choosenPerson)
         setPersonNetworkData(networkPerson)
         setIndicesData(choosenIndices)

cryptide_project/src/model/DataManagers/DbUserService.ts

@@ -41,6 +41,8 @@ class DbUserService implements IUserService{
                     nbWins: sessionData.user.onlineStats.nbWins,
                     ratio: sessionData.user.onlineStats.ratio,
                 });
+                currentUser.nbNodes = sessionData.user.nbNodes || 25
+                currentUser.nbIndices = sessionData.user.nbIndices || 3
 
                 return [currentUser, true];
             } 
@@ -76,6 +78,9 @@ class DbUserService implements IUserService{
                     ratio: 0,
                 });
 
+                guestUser.nbNodes = 25
+                guestUser.nbIndices = 3
+
                 return [guestUser, false];
             }
         } catch (error) {
@@ -148,6 +153,19 @@ class DbUserService implements IUserService{
             console.error(error);
         }
     }
+
+    async changeNodesIndices(nbNodes: number, nbIndices: number): Promise<void> {
+        try {
+            const result = await SessionService.changeNodesIndices(nbNodes, nbIndices);
+            if (result) {
+                console.log("Nodes updated");
+            } else {
+                console.log("Nodes not updated");
+            }
+        } catch (error) {
+            console.error(error);
+        }
+    }
 }
 
 export default DbUserService

cryptide_project/src/model/DataManagers/IUserService.ts

@@ -2,6 +2,7 @@ import User from "../User";
 
 interface IUserService{
     fetchUserInformation(): Promise<[User | null, boolean]>
+    changeNodesIndices(nbNodes: number, nbIndices: number): Promise<void>
     addMastermindStats(pseudo: string, score: number, time: number): Promise<void>
     addEasyEnigmaStats(pseudo: string, win: number, time: number): Promise<void>
     // addMediumEnigmaStats(pseudo: string, win: number, time: number): Promise<void>

cryptide_project/src/model/User.tsx

@@ -7,6 +7,8 @@ class User extends Player{
     public mediumEnigmaStats: any
     public hardEnigmaStats: any
     public onlineStats: any
+    public nbNodes: number = 25
+    public nbIndices: number = 3
 
     constructor(id: string, pseudo: string, profilePicture: string, soloStats: any, easyEnigmaStats: any, mediumEnigmaStats: any, hardEnigmaStats: any, onlineStats: any){
         super(id, pseudo, profilePicture || defaultImg)

cryptide_project/src/services/SessionService.tsx

@@ -24,6 +24,34 @@ class SessionService {
         }
     }
 
+    static async changeNodesIndices(nbNodes: number, nbIndices: number) {
+        try {
+            const response = await fetch(ADRESSE_DBSERVER + '/session/updateNbNodes', {
+                method: 'PUT',
+                headers: {
+                    'Content-Type': 'application/json',
+                },
+                body: JSON.stringify({
+                    nbNodes,
+                    nbIndices
+                }),
+                credentials: 'include',
+            });
+    
+            if (response.ok) {
+                const result = await response.json();
+                return result;
+            } else {
+                const errorResponse = await response.json();
+                throw new Error(errorResponse.error);
+            }
+        } catch (error) {
+            console.error(error);
+            throw error;
+        }
+
+    }
+
     static async addMastermindStats(pseudo: string, score: number, time: number){
         try {
             const response = await fetch(ADRESSE_DBSERVER + '/session/addMastermindStats', {