remove bots on empty lobby

.drone.yml

@@ -1,92 +0,0 @@
-kind: pipeline
-type: docker
-name: default
-
-trigger:
-  event:
-    - push
-
-steps:
-  - name: build
-    image: node:20
-    commands:
-      - cd cryptide_project
-      - npm install --legacy-peer-deps
-      - CI=false npm run build
-
-  - name: code-analysis
-    image: node:20
-    environment:
-      SONAR_TOKEN:
-        from_secret: SECRET_SONAR_LOGIN_CRYPTIDE
-    commands:
-      - export SONAR_SCANNER_VERSION=4.7.0.2747
-      - export SONAR_SCANNER_HOME=$HOME/.sonar/sonar-scanner-$SONAR_SCANNER_VERSION-linux
-      - curl --create-dirs -sSLo $HOME/.sonar/sonar-scanner.zip https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-$SONAR_SCANNER_VERSION-linux.zip
-      - unzip -o $HOME/.sonar/sonar-scanner.zip -d $HOME/.sonar/
-      - export PATH=$SONAR_SCANNER_HOME/bin:$PATH
-      - export SONAR_SCANNER_OPTS="-server"
-      - sonar-scanner -D sonar.projectKey=Cryptid -D sonar.sources=. -D sonar.host.url=https://codefirst.iut.uca.fr/sonar
-    secrets: [SECRET_SONAR_LOGIN_CRYPTIDE]
-    settings:
-      sonar_host: https://codefirst.iut.uca.fr/sonar/
-      sonar_token:
-        from_secret: SECRET_SONAR_LOGIN_CRYPTIDE
-
-#
-  - name: deploy-container-mysql
-    image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-dockerproxy-clientdrone:latest
-    build:
-      context: .
-    environment:
-        IMAGENAME: mysql:latest
-        CONTAINERNAME: mysql
-        COMMAND: create
-        #OVERWRITE: true
-        PRIVATE: false
-        CODEFIRST_CLIENTDRONE_ENV_MYSQL_ROOT_PASSWORD:    
-          from_secret: MYSQL_ROOT_PASSWORD
-        CODEFIRST_CLIENTDRONE_ENV_MYSQL_DATABASE:
-          from_secret: MYSQL_DATABASE
-        CODEFIRST_CLIENTDRONE_ENV_MYSQL_USER:
-          from_secret: MYSQL_USER
-        CODEFIRST_CLIENTDRONE_ENV_MYSQL_PASSWORD:
-          from_secret: MYSQL_PASSWORD
-        ADMINS: thomaschazot2,pierreferreira,baptistemarcel
-    when:
-      branch:
-      - CI/CD
-
-  - name: container-web
-    image: plugins/docker
-    settings:
-      dockerfile: ./cryptide_project/Dockerfile
-      context: ./cryptide_project
-      registry: hub.codefirst.iut.uca.fr
-      repo: hub.codefirst.iut.uca.fr/thomas.chazot2/cryptide/web
-      username:
-        from_secret: SECRET_REGISTRY_USERNAME
-      password:
-        from_secret: SECRET_REGISTRY_PASSWORD
-    environment:
-       BASEPATH: "/containers/Crypteam-website"
-    #depends_on: [ build ]
-    when:
-      branch:
-      - CI/CD
-
-
-#container deployment
-  - name: deploy-server-containers
-    image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-dockerproxy-clientdrone:latest
-    environment:
-        IMAGENAME: hub.codefirst.iut.uca.fr/thomas.chazot2/cryptide/web:latest
-        CONTAINERNAME: website
-        COMMAND: create
-        OVERWRITE: true
-        #PRIVATE: true
-        ADMINS: thomaschazot2,pierreferreira,baptistemarcel
-    depends_on: [ container-web ]
-    when:
-      branch:
-      - master

.gitignore

@@ -48,7 +48,5 @@ yarn.lock
 package-lock.json
 
 # db
-socialgraph.db
 
-# build
+socialgraph.db
-cryptide_project/build/*

cryptide_project/Dockerfile

@@ -1,33 +0,0 @@
-# Utilisez l'image Node.js LTS comme base
-FROM node:14-alpine
-
-# Définissez le répertoire de travail dans le conteneur
-WORKDIR /app
-
-# Copiez le package.json et le package-lock.json dans le conteneur
-COPY package*.json ./
-
-# Installez les dépendances du projet
-RUN npm install
-
-# Copiez le reste des fichiers de l'application dans le conteneur
-COPY . .
-
-# Construisez l'application React
-RUN npm run build
-
-# Utilisez l'image légère Nginx pour servir l'application construite
-FROM nginx:alpine
-
-# Copiez les fichiers construits de l'étape précédente dans le répertoire de travail de Nginx
-COPY --from=0 /app/build /usr/share/nginx/html
-
-# Copiez la configuration Nginx personnalisée
-COPY nginx.conf /etc/nginx/conf.d/default.conf
-
-# Exposez le port 80 pour que l'application puisse être accessible
-EXPOSE 80
-
-# Définissez ENTRYPOINT pour démarrer Nginx lorsque le conteneur est lancé
-ENTRYPOINT ["nginx", "-g", "daemon off;"]
-#

cryptide_project/Scripts/ProdMod.sh

@@ -1,33 +0,0 @@
-#!/bin/bash
-
-
-# Récupérer le répertoire du script (où que le script soit appelé)
-SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-# Aller au répertoire du projet
-#cd "$SCRIPT_DIR/../"
-
-#* Lancement des serveurs
-node $SCRIPT_DIR/../server/server.js &
-
-# Attendre un court instant pour laisser le serveur démarrer
-sleep 2
-
-node $SCRIPT_DIR/../src/server/server.js &
-
-# Attendre un court instant pour laisser le serveur démarrer
-sleep 2
-
-
-
-cd $SCRIPT_DIR/..
-
-#* Génération de version de production
-npm run build
-
-#* Installation d'un serveur http simple
-npm install -g serve
-
-#* Execution du serveur sur le répertoire de build
-serve -s build
-

cryptide_project/Scripts/setupAdress.sh

@@ -1,17 +0,0 @@
-#!/bin/bash
-
-# Vérifier si l'adresse IP est fournie en tant que paramètre
-if [ -z "$1" ]; then
-    echo "Usage: $0 <adresse_ip>"
-    exit 1
-fi
-
-# Stocker l'adresse IP fournie en tant que variable
-adresse_ip="$1"
-
-SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-# Utiliser l'adresse IP dans la commande find avec Perl
-find $SCRIPT_DIR/../ -type f -exec perl -pi -e 's|http://[0-9.]+:([0-9]+)|http://localhost:$1|g' {} +
-
-find $SCRIPT_DIR/../ -type f -exec perl -pi -e "s|http://localhost:([0-9]+)|http://$adresse_ip:\$1|g" {} +

cryptide_project/nginx.conf

@@ -1,15 +0,0 @@
-server {
-    listen 80;
-
-    location / {
-        root   /usr/share/nginx/html;
-        index  index.html;
-        try_files $uri $uri/ /index.html;
-    }
-
-    error_page 404 /index.html;
-
-    location ~ /\. {
-        deny all;
-    }
-}

cryptide_project/package.json

@@ -13,14 +13,17 @@
     "bcrypt": "^5.1.1",
     "body-parser": "^1.20.2",
     "bootstrap": "^5.3.2",
+    "cookie-parser": "^1.4.6",
+    "cookie-session": "^2.0.0",
     "cors": "^2.8.5",
     "express": "^4.18.2",
     "express-session": "^1.17.3",
     "file-saver": "^2.0.5",
-    "jspdf": "^2.5.1",
     "jszip": "^3.10.1",
+    "jzip": "^1.0.0",
     "lodash": "^4.17.21",
-    "nuka-carousel": "^7.0.0",
+    "mysql": "^2.18.1",
+    "path": "^0.12.7",
     "react": "^18.2.0",
     "react-bootstrap": "^2.9.1",
     "react-country-flag": "^3.1.0",
@@ -41,7 +44,7 @@
   "scripts": {
     "start": "react-scripts start",
     "build": "react-scripts build",
-    "test": "jest --passWithNoTests",
+    "test": "react-scripts test",
     "eject": "react-scripts eject"
   },
   "eslintConfig": {
@@ -65,15 +68,6 @@
   "devDependencies": {
     "@types/file-saver": "^2.0.7",
     "@types/react-router-hash-link": "^2.4.9",
-    "@types/uuid": "^9.0.7",
+    "@types/uuid": "^9.0.7"
-    "babel-jest": "^29.7.0",
-    "depcheck": "^1.4.7"
-  },
-  "babel": {
-    "presets": [
-      "@babel/preset-env",
-      "@babel/preset-react",
-      "@babel/preset-typescript"
-    ]
   }
 }

cryptide_project/serve.json

@@ -1,6 +0,0 @@
-{
-  "headers": [
-    { "source": "**/*.js", "headers": [{ "key": "Content-Type", "value": "application/javascript; charset=utf-8" }] }
-  ]
-}
-

cryptide_project/server.js

@@ -1,31 +0,0 @@
-const express = require('express');
-const path = require('path');
-
-const app = express();
-const port = process.env.PORT || 80;
-
-// Servir les fichiers statiques depuis le dossier 'build'
-app.use(express.static(path.join(__dirname, 'build')));
-
-// Définir le type MIME pour les fichiers JavaScript
-app.use('/static/js', (req, res, next) => {
-  res.type('application/javascript; charset=utf-8');
-  next();
-}, express.static(path.join(__dirname, 'build/static/js')));
-
-// Définir le type MIME pour les fichiers CSS
-app.use('/static/css', (req, res, next) => {
-  res.type('text/css; charset=utf-8');
-  next();
-}, express.static(path.join(__dirname, 'build/static/css')));
-
-// Route par défaut pour servir l'application React
-app.get('*', (req, res) => {
-  res.sendFile(path.join(__dirname, 'build', 'index.html'));
-});
-
-// Démarrer le serveur
-app.listen(port, () => {
-  console.log(`Serveur en cours d'exécution sur le port ${port}`);
-  console.log(path.join(__dirname, 'build'))
-});

cryptide_project/server/api/controllers/AuthController.js

@@ -1,198 +0,0 @@
-const bcrypt = require('bcrypt');
-const path = require('path');
-const DatabaseService = require(path.resolve(__dirname, '../services/DatabaseService.js'));
-const UserService = require(path.resolve(__dirname, '../services/UserService.js'));
-
-class AuthController {
-    static async signUp(req, res) {
-        const databaseService = new DatabaseService();
-        const pseudo = req.body.pseudo;
-        const date = new Date();
-        const hour = date.getHours();
-        const minutes = date.getMinutes();
-
-        try {
-            await databaseService.connect();
-
-            // Vérifier que le pseudo n'existe pas déjà
-            const verif = await databaseService.getUserByPseudo(pseudo);
-            if (verif) {
-                res.status(400).json({ error: 'Le pseudo est déjà utilisé.' });
-                return;
-            }
-
-            // Créer un nouvel utilisateur
-            const currentUser = await UserService.createUser(req.body);
-            const insertedUser = await databaseService.insertUser(currentUser);
-            
-            const user = await databaseService.getUserByPseudo(pseudo);
-            
-            console.log("[" + hour + ":" + minutes + "] " + user.pseudo + " have been registered.");
-            res.status(201).json({ message: 'Inscription réussie', user: insertedUser});
-        } 
-        catch (error) {
-            // Gérer les erreurs
-            console.error(error);
-            res.status(500).json({ error: 'Erreur lors de l\'inscription.' });
-        } 
-        finally {
-            await databaseService.disconnect();
-        }
-    }
-
-  static async signIn(req, res) {
-    const databaseService = new DatabaseService();
-    const date = new Date();
-    const hour = date.getHours();
-    const minutes = date.getMinutes();
-
-    try{
-        await databaseService.connect();
-
-        // Vérifier que le pseudo existe
-        const pseudo = req.body.pseudo;
-        const user = await databaseService.getUserByPseudo(pseudo);
-        if (!user) {
-            res.status(400).json({ error: 'Le pseudo n\'existe pas.' });
-            return;
-        }
-
-        // Vérifier que le mot de passe est correct
-        const password = req.body.password;
-        const validPassword = await bcrypt.compare(password, user.password);
-        if (!validPassword) {
-            res.status(400).json({ error: 'Le mot de passe est incorrect.' });
-            return;
-        }
-
-        // 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.");
-        res.status(200).json({ message: 'Connexion réussie', user: user });
-    }
-    catch(error){
-        // Gérer les erreurs
-        console.error(error);
-        res.status(500).json({ error: 'Erreur lors de la connexion.' });
-    }
-    finally{
-        await databaseService.disconnect();
-    }
-  }
-
-  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();
-    const hour = date.getHours();
-    const minutes = date.getMinutes();
-    // Détruire la session pour déconnecter l'utilisateur
-        req.session.destroy((err) => {
-            if (err) {
-                console.error(err);
-                res.status(500).json({ error: 'Erreur lors de la déconnexion.' });
-            } else {
-                console.log("[" + hour + ":" + minutes + "] " + pseudo + " have been disconnected.");
-                res.status(200).json({ message: 'Déconnexion réussie' });
-            }
-        });
-    }
-
-    static async delAccount(req, res){
-        const db = new DatabaseService();
-        try{
-            await db.connect();
-
-            const user = await db.getUserByPseudo(req.body.pseudo);
-            
-            if(!user){
-                res.status(400).json({ error: 'Le pseudo n\'existe pas.' });
-                return;
-            }
-            
-            await db.deleteUser(user.idUser);
-        }
-        catch(error){
-            console.error(error);
-            res.status(500).json({ error: 'Erreur lors de la supression du compte.' });
-        }
-        finally{
-            db.disconnect();
-        }
-    }
-
-    static async validatePassword(req, res){
-        const db = new DatabaseService();
-        try{
-            await db.connect();
-
-            const user = await db.getUserByPseudo(req.body.pseudo);
-            if(!user){
-                res.status(400).json({ error: 'Le pseudo n\'existe pas.' });
-                return;
-            }
-
-            const password = req.body.password;
-            const validPassword = await bcrypt.compare(password, user.password);
-            if(!validPassword){
-                res.status(400).json({ error: 'Le mot de passe est incorrect.' });
-                return;
-            }
-
-            res.status(200).json({ message: 'Mot de passe correct.' });
-        }
-        catch(error){
-            console.error(error);
-            res.status(500).json({ error: 'Erreur lors de la vérification du mot de passe.' });
-        }
-        finally{
-            db.disconnect();
-        }
-    }
-
-    static async updatePassword(req, res){
-        const db = new DatabaseService();
-        try{
-            await db.connect();
-
-            const user = await db.getUserByPseudo(req.body.pseudo);
-            if(!user){
-                res.status(400).json({ error: 'Le pseudo n\'existe pas.' });
-                return;
-            }
-
-            const hashedPassword = await bcrypt.hash(req.body.newPassword, 10);
-
-            await db.updatePassword(user.idUser, hashedPassword);
-
-            res.status(200).json({ message: 'Mot de passe mis à jour.' });
-        }
-        catch(error){
-            console.error(error);
-            res.status(500).json({ error: 'Erreur lors de la mise à jour du mot de passe.' });
-        }
-        finally{
-            db.disconnect();
-        }
-    }
-}
-
-module.exports = AuthController;

cryptide_project/server/api/controllers/ScoreboardController.js

@@ -1,209 +0,0 @@
-const path = require('path');
-const DatabaseService = require(path.resolve(__dirname, '../services/DatabaseService'));
-
-const ENIGME_FACILE = "enigme_facile";
-const ENIGME_MOYEN = "enigme_moyenne";
-const ENIGME_DIFFICILE = "enigme_difficile";
-
-class SessionController {
-    // ---------------------------------------------------
-    // ----------------- GET DAILY STATS -----------------
-    // ---------------------------------------------------
-
-    static async getDailyMastermind(req, res){
-        const db = new DatabaseService();
-
-        try{
-            await db.connect();
-
-            const dailyMastermindStats = await db.getDailyMastermindStats();
-
-            res.status(200).json({ tab : dailyMastermindStats });
-        }
-        catch(error){
-            console.error(error);
-            res.status(500).json({ error: 'Erreur lors de la récupération des stats dailyMastermind.' });
-        }
-        finally{
-            await db.disconnect();
-        }
-    }
-
-    static async getDailyEasyEnigma(req, res){
-        const db = new DatabaseService();
-
-        try{
-            await db.connect();
-
-            const dailyEasyEnigmaStats = await db.getDailyEnigmaStats(ENIGME_FACILE);
-
-            res.status(200).json({ tab : dailyEasyEnigmaStats });
-        }
-        catch(error){
-            console.error(error);
-            res.status(500).json({ error: 'Erreur lors de la récupération des stats dailyEasyEnigma.' });
-        }
-        finally{
-            await db.disconnect();
-        }
-    }
-
-    static async getDailyMediumEnigma(req, res){
-        const db = new DatabaseService();
-
-        try{
-            await db.connect();
-
-            const dailyMediumEnigmaStats = await db.getDailyEnigmaStats(ENIGME_MOYEN);
-
-            res.status(200).json({ tab : dailyMediumEnigmaStats });
-        }
-        catch(error){
-            console.error(error);
-            res.status(500).json({ error: 'Erreur lors de la récupération des stats dailyMediumEnigma.' });
-        }
-        finally{
-            await db.disconnect();
-        }
-    }
-
-    static async getDailyHardEnigma(req, res){
-        const db = new DatabaseService();
-
-        try{
-            await db.connect();
-
-            const dailyHardEnigmaStats = await db.getDailyEnigmaStats(ENIGME_DIFFICILE);
-
-            res.status(200).json({ tab : dailyHardEnigmaStats });
-        }
-        catch(error){
-            console.error(error);
-            res.status(500).json({ error: 'Erreur lors de la récupération des stats dailyHardEnigma.' });
-        }
-        finally{
-            await db.disconnect();
-        }
-    }
-
-    static async getDailyOnline(req, res){
-        const db = new DatabaseService();
-
-        try{
-            await db.connect();
-
-            const dailyOnlineStats = await db.getDailyOnlineStats();
-
-            res.status(200).json({ tab : dailyOnlineStats });
-        }
-        catch(error){
-            console.error(error);
-            res.status(500).json({ error: 'Erreur lors de la récupération des stats dailyOnline' });
-        }
-        finally{
-            await db.disconnect();
-        }
-    }
-
-    // ---------------------------------------------------
-    // ---------------- GET WEEKLY STATS -----------------
-    // ---------------------------------------------------
-
-    static async getWeeklyMastermind(req, res){
-        const db = new DatabaseService();
-
-        try{
-            await db.connect();
-
-            const weeklyMastermindStats = await db.getWeeklyMastermindStats();
-
-            res.status(200).json({ tab : weeklyMastermindStats });
-        }
-        catch(error){
-            console.error(error);
-            res.status(500).json({ error: 'Erreur lors de la récupération des stats weeklyMastermind.' });
-        }
-        finally{
-            await db.disconnect();
-        }
-    }
-
-    static async getWeeklyEasyEnigma(req, res){
-        const db = new DatabaseService();
-
-        try{
-            await db.connect();
-
-            const weeklyEasyEnigmaStats = await db.getWeeklyEnigmaStats(ENIGME_FACILE);
-
-            res.status(200).json({ tab : weeklyEasyEnigmaStats });
-        }
-        catch(error){
-            console.error(error);
-            res.status(500).json({ error: 'Erreur lors de la récupération des stats weeklyEasyEnigma.' });
-        }
-        finally{
-            await db.disconnect();
-        }
-    }
-
-    static async getWeeklyMediumEnigma(req, res){
-        const db = new DatabaseService();
-
-        try{
-            await db.connect();
-
-            const weeklyMediumEnigmaStats = await db.getWeeklyEnigmaStats(ENIGME_MOYEN);
-
-            res.status(200).json({ tab : weeklyMediumEnigmaStats });
-        }
-        catch(error){
-            console.error(error);
-            res.status(500).json({ error: 'Erreur lors de la récupération des stats weeklyMediumEnigma.' });
-        }
-        finally{
-            await db.disconnect();
-        }
-    }
-
-    static async getWeeklyHardEnigma(req, res){
-        const db = new DatabaseService();
-
-        try{
-            await db.connect();
-
-            const weeklyHardEnigmaStats = await db.getWeeklyEnigmaStats(ENIGME_DIFFICILE);
-
-            res.status(200).json({ tab : weeklyHardEnigmaStats });
-        }
-        catch(error){
-            console.error(error);
-            res.status(500).json({ error: 'Erreur lors de la récupération des stats weeklyHardEnigma.' });
-        }
-        finally{
-            await db.disconnect();
-        }
-    }
-
-    static async getWeeklyOnline(req, res){
-        const db = new DatabaseService();
-
-        try{
-            await db.connect();
-
-            const weeklyOnlineStats = await db.getWeeklyOnlineStats();
-
-            res.status(200).json({ tab : weeklyOnlineStats });
-        }
-        catch(error){
-            console.error(error);
-            res.status(500).json({ error: 'Erreur lors de la récupération des stats weeklyOnline' });
-        }
-        finally{
-            await db.disconnect();
-        }
-    }
-    
-}
-
-module.exports = SessionController;

cryptide_project/server/api/controllers/SessionController.js

@@ -1,235 +0,0 @@
-const path = require('path');
-const DatabaseService = require(path.resolve(__dirname, '../services/DatabaseService'));
-
-const ENIGME_FACILE = "enigme_facile";
-const ENIGME_MOYEN = "enigme_moyenne";
-const ENIGME_DIFFICILE = "enigme_difficile";
-
-class SessionController {
-    static async getUserInformation(req, res) {
-        const db = new DatabaseService();
-        const date = new Date();
-        const hour = date.getHours();
-        const minutes = date.getMinutes();
-
-        try{
-            await db.connect();
-
-            if (!req.session.user) {
-                res.status(200).json({ error: "true", message: 'User not found' });
-                return;
-            }
-
-            // Récupérer les stats mastermind de l'utilisateur
-            let nbGamesMM = await db.getNbGamesMastermindByUserId(req.session.user.idUser);
-            nbGamesMM = nbGamesMM.nbGames || 0;
-            let bestScoreMM = await db.getBestScoreMastermindByUserId(req.session.user.idUser);
-            bestScoreMM = bestScoreMM.bestScore || 0;
-            let avgNbTryMM = await db.getAvgNbTryMastermindByUserId(req.session.user.idUser);
-            avgNbTryMM = avgNbTryMM.avgNbTry || 0;
-
-            req.session.user.mastermindStats = {nbGames: nbGamesMM, 
-                                                bestScore: bestScoreMM, 
-                                                avgNbTry: avgNbTryMM};
-
-            // Récupérer les stats enigme facile
-            let nbGamesEF = await db.getNbGamesEnigmeByUserId(req.session.user.idUser, ENIGME_FACILE);
-            nbGamesEF = nbGamesEF.nbGames || 0;
-            let nbWinsEF = await db.getNbWinsEnigmeByUserId(req.session.user.idUser, ENIGME_FACILE);
-            nbWinsEF = nbWinsEF.nbWins || 0;
-            let ratioEF = (nbWinsEF.nbWins / nbGamesEF.nbGames) * 100 || 0;
-            let bestTimeEF = await db.getBestTimeEnigmeByUserId(req.session.user.idUser, ENIGME_FACILE);
-            bestTimeEF = bestTimeEF.bestTime || 0;
-            let avgTimeEF = await db.getAvgTimeEnigmeByUserId(req.session.user.idUser, ENIGME_FACILE);
-            avgTimeEF = avgTimeEF.avgTime || 0;
-
-            req.session.user.easyEnigmaStats = {nbGames: nbGamesEF,
-                                                    nbWins: nbWinsEF,
-                                                    ratio: ratioEF,
-                                                    bestTime: bestTimeEF,
-                                                    avgTime: avgTimeEF};
-
-            // Récupérer les stats enigme moyenne
-            let nbGamesEM = await db.getNbGamesEnigmeByUserId(req.session.user.idUser, ENIGME_MOYEN);
-            nbGamesEM = nbGamesEM.nbGames || 0;
-            let bestScoreEM = await db.getBestScoreEnigmeByUserId(req.session.user.idUser, ENIGME_MOYEN);
-            bestScoreEM = bestScoreEM.bestScore || 0;
-            let avgNbTryEM = await db.getAvgScoreEnigmeByUserId(req.session.user.idUser, ENIGME_MOYEN);
-            avgNbTryEM = avgNbTryEM.avgScore || 0;
-
-            req.session.user.mediumEnigmaStats = {nbGames: nbGamesEM,
-                                                    bestScore: bestScoreEM,
-                                                    avgNbTry: avgNbTryEM};
-            
-            // Récupérer les stats enigme difficile
-            let nbGamesED = await db.getNbGamesEnigmeByUserId(req.session.user.idUser, ENIGME_DIFFICILE);
-            nbGamesED = nbGamesED.nbGames || 0;
-            let nbWinsED = await db.getNbWinsEnigmeByUserId(req.session.user.idUser, ENIGME_DIFFICILE);
-            nbWinsED = nbWinsED.nbWins || 0;
-            let ratioED = (nbWinsED.nbWins / nbGamesED.nbGames) * 100 || 0;
-            let bestTimeED = await db.getBestTimeEnigmeByUserId(req.session.user.idUser, ENIGME_DIFFICILE);
-            bestTimeED = bestTimeED.bestTime || 0;
-            let avgTimeED = await db.getAvgTimeEnigmeByUserId(req.session.user.idUser, ENIGME_DIFFICILE);
-            avgTimeED = avgTimeED.avgTime || 0;
-
-            req.session.user.hardEnigmaStats = {nbGames: nbGamesED,
-                                                    nbWins: nbWinsED,
-                                                    ratio: ratioED,
-                                                    bestTime: bestTimeED,
-                                                    avgTime: avgTimeED};
-
-            // Récupérer les stats en ligne de l'utilisateur
-            let nbGamesOL = await db.getNbGamesOnlineByUserId(req.session.user.idUser);
-            nbGamesOL = nbGamesOL.nbGames || 0;
-            let nbWinsOL = await db.getNbWinsOnlineByUserId(req.session.user.idUser);
-            nbWinsOL = nbWinsOL.nbWins || 0;
-            let ratioOL = (nbWinsOL.nbWins / nbGamesOL.nbGames) * 100 || 0;
-            req.session.user.onlineStats = {nbGames: nbGamesOL, 
-                                            nbWins: nbWinsOL, 
-                                            ratio: ratioOL};
-
-            res.status(200).json({ user: req.session.user });
-        }
-        catch(error){
-            console.error(error);
-            res.status(500).json({ error: 'Erreur lors de la récupération de l\'utilisateur.' });
-        }
-        finally{
-            await db.disconnect();
-        }
-    }
-
-    static async UpdatePseudo(req, res){
-        const db = new DatabaseService();
-
-        try{
-            await db.connect();
-
-            const user = await db.getUserByPseudo(req.body.pseudo);
-            console.log("utilisateur" + user.idUser + " pseudo" + user.pseudo)
-            if (!user) {
-                res.status(200).json({ error: "true", message: 'User not found' });
-                return;
-            }
-
-            await db.updatePseudo(user.idUser, req.body.newPseudo);     //* update
-
-            const updatedUser = await db.getUserByPseudo(req.body.newPseudo);
-            console.log("updaetdutilisateur" + updatedUser.idUser + " pseudo" + updatedUser.pseudo)
-            req.session.user.pseudo = updatedUser.pseudo;
-            console.log("req.session.user.pseudo" + req.session.user.pseudo)
-            res.status(200).json({ user: req.session.user });   //verif rep
-        }
-        catch(error){
-            console.error(error);
-            res.status(500).json({ error: 'Erreur lors de la modification du pseudo de l\'utilisateur.' });
-        }
-        finally{
-            await db.disconnect();
-        }
-    }
-
-    static async addMastermindStats(req, res){
-        const db = new DatabaseService();
-
-        try{
-            await db.connect();
-
-            const user = await db.getUserByPseudo(req.body.pseudo);
-            if (!user) {
-                res.status(200).json({ error: "true", message: 'User not found' });
-                return;
-            }
-
-            await db.addMastermindStats(user.idUser, req.body.score, req.body.time);
-
-            res.status(200).json({ user: req.session.user });   //verif rep
-        }
-        catch(error){
-            console.error(error);
-            res.status(500).json({ error: 'Erreur lors de la modification des stats mastermind de l\'utilisateur.' });
-        }
-        finally{
-            await db.disconnect();
-        }
-    }
-
-    static async addEasyEnigmaStats(req, res){
-        const db = new DatabaseService();
-
-        try{
-            await db.connect();
-
-            const user = await db.getUserByPseudo(req.body.pseudo);
-            if (!user) {
-                res.status(200).json({ error: "true", message: 'User not found' });
-                return;
-            }
-
-            await db.addEasyEnigmaStats(user.idUser, ENIGME_FACILE, req.body.win, req.body.time);
-
-            res.status(200).json({ user: req.session.user });   //verif rep
-        }
-        catch(error){
-            console.error(error);
-            res.status(500).json({ error: 'Erreur lors de la modification des stats de l\'énigme facile de l\'utilisateur.' });
-        }
-        finally{
-            await db.disconnect();
-        }
-    }
-
-    // static async addMediumEnigmaStats(req, res)
-
-    static async addHardEnigmaStats(req, res){
-        const db = new DatabaseService();
-
-        try{
-            await db.connect();
-
-            const user = await db.getUserByPseudo(req.body.pseudo);
-            if (!user) {
-                res.status(200).json({ error: "true", message: 'User not found' });
-                return;
-            }
-
-            await db.addHardEnigmaStats(user.idUser, ENIGME_DIFFICILE, req.body.win, req.body.time);
-
-            res.status(200).json({ user: req.session.user });   //verif rep
-        }
-        catch(error){
-            console.error(error);
-            res.status(500).json({ error: 'Erreur lors de la modification des stats de l\'énigme difficile de l\'utilisateur.' });
-        }
-        finally{
-            await db.disconnect();
-        }
-    }
-
-    static async addOnlineStats(req, res){
-        const db = new DatabaseService();
-
-        try{
-            await db.connect();
-
-            const user = await db.getUserByPseudo(req.body.pseudo);
-            if (!user) {
-                res.status(200).json({ error: "true", message: 'User not found' });
-                return;
-            }
-
-            await db.addOnlineStats(user.idUser, req.body.win, req.body.time);
-
-            res.status(200).json({ user: req.session.user });   //verif rep
-        }
-        catch(error){
-            console.error(error);
-            res.status(500).json({ error: 'Erreur lors de la modification des stats en ligne de l\'utilisateur.' });
-        }
-        finally{
-            await db.disconnect();
-        }
-    }
-}
-
-module.exports = SessionController;

cryptide_project/server/api/routes/AuthRoutes.js

@@ -1,41 +0,0 @@
-const express = require('express');
-const router = express.Router();
-const AuthController = require('../controllers/AuthController');
-const SessionController = require('../controllers/SessionController');
-const ScoreboardController = require('../controllers/ScoreboardController');
-
-// Routes pour l'authentification
-router.post('/auth/signup', AuthController.signUp);
-router.post('/auth/signin', AuthController.signIn);
-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);
-router.post('/session/addMastermindStats', SessionController.addMastermindStats);
-router.post('/session/addEasyEnigmaStats', SessionController.addEasyEnigmaStats);
-// router.post('/session/addMediumEnigmaStats', SessionController.addMediumEnigmaStats);
-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);
-router.get('/scoreboard/getDailyMediumEnigma', ScoreboardController.getDailyMediumEnigma);
-router.get('/scoreboard/getDailyHardEnigma', ScoreboardController.getDailyHardEnigma);
-router.get('/scoreboard/getDailyOnline', ScoreboardController.getDailyOnline);
-
-// Routes pour le weekly scoreboard
-router.get('/scoreboard/getWeeklyMastermind', ScoreboardController.getWeeklyMastermind);
-router.get('/scoreboard/getWeeklyEasyEnigma', ScoreboardController.getWeeklyEasyEnigma);
-router.get('/scoreboard/getWeeklyMediumEnigma', ScoreboardController.getWeeklyMediumEnigma);
-router.get('/scoreboard/getWeeklyHardEnigma', ScoreboardController.getWeeklyHardEnigma);
-router.get('/scoreboard/getWeeklyOnline', ScoreboardController.getWeeklyOnline);
-
-
-module.exports = router;

cryptide_project/server/api/services/DatabaseService.js

@@ -1,473 +0,0 @@
-const sqlite3 = require('sqlite3');
-const path = require('path');
-const { rejects } = require('assert');
-
-class DatabaseService {
-    constructor(){
-        this.db_name = "socialgraph";
-    }
-
-    // ----------------------------------------------------
-    // ------------------- UTILITAIRE ---------------------
-    // ----------------------------------------------------
-
-    async connect(client){
-        const dbPath = path.resolve(__dirname, `../../../db/${this.db_name}.db`)
-        
-        return new Promise((resolve, reject) => {
-            this.client = new sqlite3.Database(dbPath, 
-            sqlite3.OPEN_READWRITE | sqlite3.OPEN_CREATE, 
-            (err) => {
-                if(err){
-                    reject(err);
-                }
-                else{
-                    resolve();
-                }
-            });
-        });
-    }
-
-    async disconnect(){
-        return new Promise((resolve, reject) => {
-            this.client.close((err) => {
-                if(err){
-                    reject(err);
-                }
-                else{
-                    resolve();
-                }
-            });
-        });
-    }
-
-
-    // ----------------------------------------------------
-    // ------------------- UTILISATEUR --------------------
-    // ----------------------------------------------------
-
-    // Récupère l'utilisateur par son id
-    async getUserByID(id){
-        return new Promise((resolve, reject) => {
-            this.client.get('SELECT * FROM users WHERE idUser = ?', id, (err, result) => {
-                if(err){
-                    reject(err);
-                }
-                else{
-                    resolve(result);
-                }
-            });
-        });
-    }
-
-    // Récupère l'utilisateur par son pseudo
-    async getUserByPseudo(pseudo){
-        return new Promise((resolve, reject) => {
-            this.client.get('SELECT * FROM users WHERE pseudo = ?', pseudo, (err, result) => {
-                if(err){
-                    reject(err);
-                }
-                else{
-                    resolve(result);
-                }
-            });
-        });
-    }
-
-    // insère un utilisateur dans la base de données
-    async insertUser(user) {
-        return new Promise((resolve, reject) => {
-            const { pseudo, password } = user;
-            this.client.run('INSERT INTO users (pseudo, password) VALUES (?, ?)', [pseudo, password], (err, result) => {
-                if (err) {
-                    reject(err);
-                } else {
-                    resolve(result);
-                }
-            });
-        });
-    }
-
-    async deleteUser(userId){
-        return new Promise((resolve, reject) => {
-            this.client.run('DELETE FROM users WHERE idUser=?', userId, (err, result) => {
-                if(err){
-                    reject(err);
-                }
-                else{
-                    resolve(result);
-                }
-            });
-        });
-    }
-
-    async updatePseudo(userId, newPseudo){
-        return new Promise((resolve, reject) => {
-            this.client.run('UPDATE users SET pseudo = ? WHERE idUser = ?', newPseudo, userId, (err, result) => {
-                if(err){
-                    reject(err);
-                }
-                else{
-                    resolve(result);
-                }
-            });
-        });
-    }
-
-    async updatePassword(userId, newPassword){
-        return new Promise((resolve, reject) => {
-            this.client.run('UPDATE users SET password = ? WHERE idUser = ?', newPassword, userId, (err, result) => {
-                if(err){
-                    reject(err);
-                }
-                else{
-                    resolve(result);
-                }
-            });
-        });
-    }
-
-    // ---------------------------------------------------------------
-    // ------------------- STATS JOURNALIERE -------------------------
-    // ---------------------------------------------------------------
-
-    async getDailyMastermindStats() {
-        return new Promise((resolve, reject) => {
-            // Obtenez la date actuelle au format AAAA-MM-JJ
-            const currentDate = new Date().toISOString().slice(0, 10);
-
-            // Récupérer les 5 meilleurs scores de la journée
-            this.client.all(
-                'SELECT pseudo, score FROM users INNER JOIN games ON users.idUser = games.idUser WHERE gameType = ? AND SUBSTR(playedDate, 1, 10) = ? ORDER BY score ASC LIMIT 10',
-                "mastermind",
-                currentDate,
-                (err, result) => {
-                    if (err) {
-                        reject(err);
-                    } else {
-                        resolve(result);
-                    }
-                }
-            );
-        });
-    }
-
-    async getDailyEnigmaStats(enigmaLevel) {
-        return new Promise((resolve, reject) => {
-            const currentDate = new Date().toISOString().slice(0, 10);
-
-            this.client.all(
-                'SELECT pseudo, time FROM users INNER JOIN games ON users.idUser = games.idUser WHERE gameType = ? AND SUBSTR(playedDate, 1, 10) = ? ORDER BY time ASC LIMIT 10',
-                enigmaLevel,
-                currentDate,
-                (err, result) => {
-                    if (err) {
-                        reject(err);
-                    } else {
-                        resolve(result);
-                    }
-                }
-            );
-        });
-    }
-
-    async getDailyOnlineStats() {
-        return new Promise((resolve, reject) => {
-            const currentDate = new Date().toISOString().slice(0, 10);
-    
-            this.client.all(
-                'SELECT pseudo, COUNT(*) AS wins FROM users INNER JOIN games ON users.idUser = games.idUser WHERE gameType = ? AND SUBSTR(playedDate, 1, 10) = ? AND win = ? GROUP BY users.idUser ORDER BY wins ASC LIMIT 10',
-                "multijoueur", currentDate, 1,
-                (err, result) => {
-                    if (err) {
-                        reject(err);
-                    } else {
-                        resolve(result);
-                    }
-                }
-            );
-        });
-    }
-    
-    
-    // ---------------------------------------------------------------
-    // ------------------- STATS HEBDOMADAIRE ------------------------
-    // ---------------------------------------------------------------
-
-    async getWeeklyMastermindStats() {
-        return new Promise((resolve, reject) => {
-            const currentDate = new Date().toISOString().slice(0, 10);
-            const currentDay = new Date().getDay();
-            const firstDayOfWeek = new Date(new Date().setDate(new Date().getDate() - currentDay)).toISOString().slice(0, 10);
-
-            this.client.all(
-                'SELECT pseudo, score FROM users INNER JOIN games ON users.idUser = games.idUser WHERE gameType = ? AND SUBSTR(playedDate, 1, 10) BETWEEN ? AND ? ORDER BY score ASC LIMIT 10',
-                "mastermind",
-                firstDayOfWeek,
-                currentDate,
-                (err, result) => {
-                    if (err) {
-                        reject(err);
-                    } else {
-                        resolve(result);
-                    }
-                }
-            );
-        });
-    }
-
-    async getWeeklyEnigmaStats(enigmaLevel) {
-        return new Promise((resolve, reject) => {
-            const currentDate = new Date().toISOString().slice(0, 10);
-            const currentDay = new Date().getDay();
-            const firstDayOfWeek = new Date(new Date().setDate(new Date().getDate() - currentDay)).toISOString().slice(0, 10);
-
-            this.client.all(
-                'SELECT pseudo, time FROM users INNER JOIN games ON users.idUser = games.idUser WHERE gameType = ? AND SUBSTR(playedDate, 1, 10) BETWEEN ? AND ? ORDER BY time ASC LIMIT 10',
-                enigmaLevel,
-                firstDayOfWeek,
-                currentDate,
-                (err, result) => {
-                    if (err) {
-                        reject(err);
-                    } else {
-                        resolve(result);
-                    }
-                }
-            );
-        });
-    }
-
-    async getWeeklyOnlineStats() {
-        return new Promise((resolve, reject) => {
-            const currentDate = new Date().toISOString().slice(0, 10);
-            const currentDay = new Date().getDay();
-            const firstDayOfWeek = new Date(new Date().setDate(new Date().getDate() - currentDay)).toISOString().slice(0, 10);
-
-            this.client.all(
-                'SELECT pseudo, COUNT(*) as wins FROM users INNER JOIN games ON users.idUser = games.idUser WHERE gameType = ? AND SUBSTR(playedDate, 1, 10) BETWEEN ? AND ? AND win = ? ORDER BY wins ASC LIMIT 10',
-                "multijoueur",
-                firstDayOfWeek,
-                currentDate,
-                1,
-                (err, result) => {
-                    if (err) {
-                        reject(err);
-                    } else {
-                        resolve(result);
-                    }
-                }
-            );
-        });
-    }
-
-    // -------------------------------------------------------------
-    // ------------------- STATS MASTERMIND ------------------------
-    // -------------------------------------------------------------
-    
-    async getNbGamesMastermindByUserId(userId){
-        return new Promise((resolve, reject) => {
-            this.client.get('SELECT COUNT(*) AS nbGames FROM games WHERE idUser = ? AND gameType = ?', userId, "mastermind", (err, result) => {
-                if(err){
-                    reject(err);
-                }
-                else{
-                    resolve(result);
-                }
-            });
-        });
-    }
-
-    async getBestScoreMastermindByUserId(userId){
-        return new Promise((resolve, reject) => {
-            this.client.get('SELECT MIN(score) AS bestScore FROM games WHERE idUser = ? AND gameType = ?', userId, "mastermind", (err, result) => {
-                if(err){
-                    reject(err);
-                }
-                else{
-                    resolve(result);
-                }
-            });
-        });
-    }
-
-    async getAvgNbTryMastermindByUserId(userId){
-        return new Promise((resolve, reject) => {
-            this.client.get('SELECT AVG(score) AS avgNbTry FROM games WHERE idUser = ? AND gameType = ?', userId, "mastermind", (err, result) => {
-                if(err){
-                    reject(err);
-                }
-                else{
-                    resolve(result);
-                }
-            });
-        });
-    }
-
-    async addMastermindStats(userId, score, time){
-        return new Promise((resolve, reject) => {
-            this.client.run('INSERT INTO games (idUser, gameType, win, score, time) VALUES (?, ?, ?, ?, ?)', userId, "mastermind", 1, score, time, (err, result) => {
-                if(err){
-                    reject(err);
-                }
-                else{
-                    resolve(result);
-                }
-            });
-        });
-    }
-    // -------------------------------------------------------------
-    // ------------------- STATS EN LIGNE --------------------------
-    // -------------------------------------------------------------
-
-    async getNbGamesOnlineByUserId(userId){
-        return new Promise((resolve, reject) => {
-            this.client.get('SELECT COUNT(*) AS nbGames FROM games WHERE idUser = ? AND gameType = ?', userId, "multijoueur", (err, result) => {
-                if(err){
-                    reject(err);
-                }
-                else{
-                    resolve(result);
-                }
-            });
-        });
-    }
-
-    async getNbWinsOnlineByUserId(userId){
-        return new Promise((resolve, reject) => {
-            this.client.get('SELECT COUNT(*) AS nbWins FROM games WHERE idUser = ? AND gameType = ? AND win = ?', userId, "multijoueur", 1, (err, result) => {
-                if(err){
-                    reject(err);
-                }
-                else{
-                    resolve(result);
-                }
-            });
-        });
-    }
-
-    async addOnlineStats(userId, win, time){
-        return new Promise((resolve, reject) => {
-            this.client.run('INSERT INTO games (idUser, gameType, win, score, time) VALUES (?, ?, ?, ?, ?)', userId, "multijoueur", win, 0, time, (err, result) => {
-                if(err){
-                    reject(err);
-                }
-                else{
-                    resolve(result);
-                }
-            });
-        });
-    }
-
-    // -------------------------------------------------------------
-    // ------------------- STATS ENIGME ----------------------------
-    // -------------------------------------------------------------
-
-    async getNbGamesEnigmeByUserId(userId, enigmaLevel){
-        return new Promise((resolve, reject) => {
-            this.client.get('SELECT COUNT(*) AS nbGames FROM games WHERE idUser = ? AND gameType = ?', userId, enigmaLevel, (err, result) => {
-                if(err){
-                    reject(err);
-                }
-                else{
-                    resolve(result);
-                }
-            });
-        });
-    }
-
-    async getNbWinsEnigmeByUserId(userId, enigmaLevel){
-        return new Promise((resolve, reject) => {
-            this.client.get('SELECT COUNT(*) AS nbWins FROM games WHERE idUser = ? AND gameType = ? AND win = ?', userId, enigmaLevel, 1, (err, result) => {
-                if(err){
-                    reject(err);
-                }
-                else{
-                    resolve(result);
-                }
-            });
-        });
-    }
-
-    async getBestScoreEnigmeByUserId(userId, enigmaLevel){
-        return new Promise((resolve, reject) => {
-            this.client.get('SELECT MAX(score) AS bestScore FROM games WHERE idUser = ? AND gameType = ?', userId, enigmaLevel, (err, result) => {
-                if(err){
-                    reject(err);
-                }
-                else{
-                    resolve(result);
-                }
-            });
-        });
-    }
-
-    async getAvgScoreEnigmeByUserId(userId, enigmaLevel){
-        return new Promise((resolve, reject) => {
-            this.client.get('SELECT AVG(score) AS avgScore FROM games WHERE idUser = ? AND gameType = ?', userId, enigmaLevel, (err, result) => {
-                if(err){
-                    reject(err);
-                }
-                else{
-                    resolve(result);
-                }
-            });
-        });
-    }
-
-    async getBestTimeEnigmeByUserId(userId, enigmaLevel){
-        return new Promise((resolve, reject) => {
-            this.client.get('SELECT MIN(time) AS bestTime FROM games WHERE idUser = ? AND gameType = ?', userId, enigmaLevel, (err, result) => {
-                if(err){
-                    reject(err);
-                }
-                else{
-                    resolve(result);
-                }
-            });
-        });
-    }
-
-    async getAvgTimeEnigmeByUserId(userId, enigmaLevel){
-        return new Promise((resolve, reject) => {
-            this.client.get('SELECT AVG(time) AS avgTime FROM games WHERE idUser = ? AND gameType = ?', userId, enigmaLevel, (err, result) => {
-                if(err){
-                    reject(err);
-                }
-                else{
-                    resolve(result);
-                }
-            });
-        });
-    }
-
-    async addEasyEnigmaStats(userId, enigmaLevel, win, time){
-        return new Promise((resolve, reject) => {
-            this.client.run('INSERT INTO games (idUser, gameType, win, score, time) VALUES (?, ?, ?, ?, ?)', userId, enigmaLevel, win, 0, time, (err, result) => {
-                if(err){
-                    reject(err);
-                }
-                else{
-                    resolve(result);
-                }
-            });
-        });
-    }
-
-    // async addMediumEnigmaStats(userId, enigmaLevel, score)
-
-    async addHardEnigmaStats(userId, enigmaLevel, win, time){
-        return new Promise((resolve, reject) => {
-            this.client.run('INSERT INTO games (idUser, gameType, win, score, time) VALUES (?, ?, ?, ?, ?)', userId, enigmaLevel, win, 0, time, (err, result) => {
-                if(err){
-                    reject(err);
-                }
-                else{
-                    resolve(result);
-                }
-            });
-        });
-    }
-}
-
-module.exports = DatabaseService;

cryptide_project/server/server.js

@@ -0,0 +1,139 @@
+const express = require('express');
+const http = require('http');
+const socketIO = require('socket.io');
+const cors = require('cors');
+
+const app = express();
+const server = http.createServer(app);
+const io = socketIO(server, {
+  cors: {
+    origin: ["http://localhost:3000", "http://localhost:3000"], // Remplacez par l'URL de votre application React
+    methods: ["GET", "POST"],
+    credentials: true
+  }
+});
+
+
+const map = new Map()
+
+server.listen(3002, () => {
+  console.log('Serveur Socket.IO écoutant sur le port 3002');
+});
+
+io.on('connection', (socket) => {
+  console.log(socket.id);  
+
+  socket.on('network created', (network, person, indices, room, start) =>{
+    io.to(room).emit("game created", network, person, indices, start)
+  });
+
+  socket.on("lobby joined", (room, player) =>{
+    console.log(player)
+    if (player.type=="User"){
+      socket.join(room)
+    }
+    if (map.get(room) == undefined){
+      map.set(room, [{type: player.type, id: socket.id, pseudo: player.pseudo, profilePicture: player.profilePicture}])
+    }
+    else{
+      const tab = map.get(room)
+      for(let i = 0; i<tab.length; i++){
+        if (tab[i].id === socket.id && player.type==="User"){
+          tab.splice(i, 1)
+        }
+      }
+
+      if (player.type!=="User"){
+        map.get(room).push({type: player.type, id: player.id, pseudo: player.pseudo, profilePicture: player.profilePicture})
+      }
+      else{
+        map.get(room).push({type: player.type, id: socket.id, pseudo: player.pseudo, profilePicture: player.profilePicture})
+      }
+    }
+    
+    io.to(room).emit("new player", map.get(room))
+  })
+
+
+  socket.on("bot deleted", (bot, room) =>{
+    const tab = map.get(room)
+    for(let i = 0; i<tab.length; i++){
+      if (tab[i].id === bot.id){
+        tab.splice(i, 1)
+      }
+    }
+    io.to(room).emit("new player", map.get(room))
+  })
+
+
+  socket.on("lobby created", () =>{
+    io.to(socket.id).emit("lobby created", Math.floor(Math.random() * 10000))
+  })
+
+  socket.on("already asked", (nodeId, askingPlayer, askedPlayer) =>{
+    io.to(askingPlayer.id).emit("already asked", nodeId, askedPlayer)
+  })
+
+  socket.on("ask player", (nodeId, playerId, askingPlayer) =>{
+    io.to(playerId).emit("asked", nodeId, askingPlayer)
+  })
+
+  socket.on("asked all 1by1", (id, playerId) =>{
+    io.to(playerId).emit("asked all", id)
+  })
+
+  socket.on("asked wrong", (askingPlayer) =>{
+    io.to(askingPlayer.id).emit("asked wrong")
+  })
+
+  socket.on("disconnect", () =>{
+    for (const k of map.keys()){
+      const tab = map.get(k)
+        for (let i = 0; i<tab.length; i++){
+          if (tab[i].id === socket.id){
+            tab.splice(i, 1)
+            io.to(k).emit("player left", tab, i)
+            if (tab.filter((p) => p.type=="User").length == 0){
+              map.delete(k)
+            }
+          }
+        }
+    }
+  })
+
+  socket.on("node checked", (id, works, color, room, playerIndex) =>{
+    io.to(room).emit("node checked", id, works, color, playerIndex, socket.id)
+  })
+  
+  socket.on("put correct background", (id) =>{
+    io.to(id).emit("put correct background")
+  })
+
+  socket.on("put grey background", (id, player) =>{
+    io.to(id).emit("put grey background", player)
+  })
+
+  socket.on("put imossible grey", (id) =>{
+    io.to(id).emit("put imossible grey")
+  })
+
+  socket.on("can't put square", (askingPlayer, room) => {
+    io.to(room).emit("can't put square" , askingPlayer)
+  })
+
+  socket.on("opacity activated", (id) => {
+    io.to(id).emit("opacity activated")
+  })
+
+  socket.on("opacity deactivated", (id) => {
+    io.to(id).emit("opacity deactivated")
+  })
+
+  socket.on("reset graph", (id) => {
+    io.to(id).emit("reset graph")
+  })
+
+  socket.on("end game", (winnerIndex, room) =>{
+    io.to(room).emit("end game", winnerIndex)
+  })
+});

cryptide_project/server/socket_io/server.js

@@ -1,284 +0,0 @@
-const express = require('express');
-const http = require('http');
-const socketIO = require('socket.io');
-const cors = require('cors');
-
-const app = express();
-const server = http.createServer(app);
-const io = socketIO(server, {
-  cors: {
-    origin: "*", // Remplacez par l'URL de votre application React
-    methods: ["GET", "POST"],
-    credentials: true
-  }
-});
-
-
-let lastSocketJoined = ""
-const map = new Map()
-
-server.listen(3002, () => {
-  console.log('Serveur Socket.IO écoutant sur le port 3002');
-});
-
-io.on('connection', (socket) => {
-  console.log(socket.id);  
-
-  socket.on('network created', (network, person, indices, room, start) =>{
-    try{
-      io.to(room).emit("game created", network, person, indices, start)
-      map.get(room).started = true
-      map.get(room).actualPlayer=start
-      const playerArray = Array.from(map.entries()).map(([key, value]) => ({ key, value }))
-      const playerJson = JSON.stringify(playerArray);
-      io.emit("request lobbies", playerJson)
-    }
-    catch{
-      console.log("error")
-    }
-    
-  });
-
-  socket.on("give network", (networkPerson, person, indices, start, room, nodes, playerId) => {
-    io.to(playerId).emit("join during game", networkPerson, person, indices, start, map.get(room).tab, nodes)
-  })
-
-  socket.on("join back game", (player) => {
-    for (const k of map.keys()){
-      const tab = map.get(k)
-        for (let i = 0; i<tab.tab.length; i++){
-          if (tab.tab[i].pseudo === player.pseudo && tab.tab[i].type !== "User"){
-            if (tab.started){
-              io.to(socket.id).emit("join back game", k)
-            }
-          }
-        }
-    }
-  })
-
-  socket.on("lobby joined", (room, player) =>{
-
-    const game = map.get(room)
-    if (game !== undefined){
-      if (game.tab.length == 6 && !game.started){
-        io.to(socket.id).emit("room full")
-        return
-      }
-      if (game.started){
-        for(const u of game.tab){
-          if(u.type !== "User" && u.pseudo===player.pseudo){
-            u.type = "User"
-            u.id=socket.id
-            io.to(game.tab[game.actualPlayer].id).emit("give network", socket.id)
-            io.to(room).emit("player joined ingame", game.tab)
-            socket.join(room)
-            return
-          }
-        }
-        io.to(socket.id).emit("game already started")
-        return
-      }
-    }
-
-
-    if (game == undefined){
-      map.set(room, {tab: [{type: player.type, id: socket.id, pseudo: player.pseudo, profilePicture: player.profilePicture}], started: false, actualPlayer: 0, lastWorks: false})
-      socket.join(room)
-    }
-    else{
-      const tab = game.tab
-      for(let i = 0; i<tab.length; i++){
-        if (tab[i].id === socket.id && player.type==="User"){
-          tab.splice(i, 1)
-        }
-      }
-
-      if (player.type!=="User"){
-        tab.push({type: player.type, id: player.id, pseudo: player.pseudo, profilePicture: player.profilePicture})
-      }
-      else{
-        tab.push({type: player.type, id: socket.id, pseudo: player.pseudo, profilePicture: player.profilePicture})
-        socket.join(room)
-      }
-    }
-    
-    io.to(room).emit("new player", map.get(room))
-    const playerArray = Array.from(map.entries()).map(([key, value]) => ({ key, value }))
-    const playerJson = JSON.stringify(playerArray);
-    io.emit("request lobbies", playerJson)
-    
-  })
-
-  socket.on("request lobbies", () => {
-    const playerArray = Array.from(map.entries()).map(([key, value]) => ({ key, value }))
-    const playerJson = JSON.stringify(playerArray);
-    io.to(socket.id).emit("request lobbies", playerJson)
-  })
-
-
-  socket.on("bot deleted", (bot, room) =>{
-    const tab = map.get(room).tab
-    for(let i = 0; i<tab.length; i++){
-      if (tab[i].id === bot.id){
-        tab.splice(i, 1)
-      }
-    }
-    io.to(room).emit("new player", map.get(room))
-    const playerArray = Array.from(map.entries()).map(([key, value]) => ({ key, value }))
-    const playerJson = JSON.stringify(playerArray);
-    io.emit("request lobbies", playerJson)
-  })
-
-
-  socket.on("lobby created", () =>{
-    io.to(socket.id).emit("lobby created", Math.floor(Math.random() * 10000))
-  })
-
-  socket.on("already asked", (nodeId, askingPlayer, askedPlayer) =>{
-    io.to(askingPlayer.id).emit("already asked", nodeId, askedPlayer)
-  })
-
-  socket.on("ask player", (nodeId, playerId, askingPlayer) =>{
-    io.to(playerId).emit("asked", nodeId, askingPlayer)
-  })
-
-  socket.on("asked all 1by1", (id, playerId) =>{
-    io.to(playerId).emit("asked all", id)
-  })
-
-  socket.on("asked wrong", (askingPlayer) =>{
-    io.to(askingPlayer.id).emit("asked wrong")
-  })
-
-  socket.on("who plays", (room) => {
-    try{
-      if (map.get(room) !== undefined){
-        let player = map.get(room).actualPlayer
-        if (map.get(room).tab[player].type != "User"){
-          player = player + 1
-          if (player == map.get(room).tab.length){
-            player=0
-          }
-        }
-        // console.log(player)
-        io.to(room).emit("who plays", player, map.get(room).lastWorks)
-      }
-    }
-    catch{
-
-    }
-    
-  })
-
-  socket.on("disconnect", () =>{
-    for (const k of map.keys()){
-      const tab = map.get(k)
-        for (let i = 0; i<tab.tab.length; i++){
-          if (tab.tab[i].id === socket.id){
-            if (!tab.started){
-              tab.tab.splice(i, 1)
-              if (i==0){
-                tab.tab.sort(comparePlayersByType).reverse()
-              }
-              io.to(k).emit("player left", tab, i)
-            }
-            else{
-              tab.tab[i].type="EasyBot"
-              io.to(k).emit("player left ingame", tab, i)
-            }
-            if (tab.tab.filter((p) => p.type=="User").length == 0){
-              map.delete(k)
-            }
-          }
-        }
-    }
-    const playerArray = Array.from(map.entries()).map(([key, value]) => ({ key, value }))
-    const playerJson = JSON.stringify(playerArray);
-    io.emit("request lobbies", playerJson)
-  })
-
-
-  socket.on("player quit", () => {
-    lastSocketJoined=""
-    for (const k of map.keys()){
-      const tab = map.get(k)
-        for (let i = 0; i<tab.tab.length; i++){
-          if (tab.tab[i].id === socket.id){
-            if (!tab.started){
-              tab.tab.splice(i, 1)
-              if (i==0){
-                tab.tab.sort(comparePlayersByType).reverse()
-
-              }
-              io.to(k).emit("player left", tab, i)
-            }
-            else{
-              tab.tab[i].type="EasyBot"
-              io.to(k).emit("player left ingame", tab, i)
-            }
-            if (tab.tab.filter((p) => p.type=="User").length == 0){
-              map.delete(k)
-            }
-          }
-        }
-    }
-    const playerArray = Array.from(map.entries()).map(([key, value]) => ({ key, value }))
-    const playerJson = JSON.stringify(playerArray);
-    io.emit("request lobbies", playerJson)
-  })
-
-  socket.on("node checked", (id, works, color, room, playerIndex) =>{
-    try{
-      map.get(room).actualPlayer=playerIndex
-      map.get(room).lastWorks=works
-      io.to(room).emit("node checked", id, works, color, playerIndex, socket.id)
-    }
-    catch{
-      console.log("error")
-    }
-  })
-  
-  socket.on("put correct background", (id) =>{
-    io.to(id).emit("put correct background")
-  })
-
-  socket.on("put grey background", (id, player) =>{
-    io.to(id).emit("put grey background", player)
-  })
-
-  socket.on("put imossible grey", (id) =>{
-    io.to(id).emit("put imossible grey")
-  })
-
-  socket.on("can't put square", (askingPlayer, room) => {
-    io.to(room).emit("can't put square" , askingPlayer)
-  })
-
-  socket.on("opacity activated", (id) => {
-    io.to(id).emit("opacity activated")
-  })
-
-  socket.on("opacity deactivated", (id) => {
-    io.to(id).emit("opacity deactivated")
-  })
-
-  socket.on("reset graph", (id) => {
-    io.to(id).emit("reset graph")
-  })
-
-  socket.on("end game", (winnerIndex, room) =>{
-    io.to(room).emit("end game", winnerIndex)
-    map.delete(room)
-  })
-});
-
-
-function comparePlayersByType(a, b) {
-  if (a.type < b.type) {
-    return -1;
-  } else if (a.type > b.type) {
-    return 1;
-  } else {
-    return 0;
-  }
-}

cryptide_project/setupAdress.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+# Vérifier si l'adresse IP est fournie en tant que paramètre
+if [ -z "$1" ]; then
+    echo "Usage: $0 <adresse_ip>"
+    exit 1
+fi
+
+# Stocker l'adresse IP fournie en tant que variable
+adresse_ip="$1"
+
+# Utiliser l'adresse IP dans la commande find avec Perl
+find . -type f -exec perl -pi -e 's|http://[0-9.]+:([0-9]+)|http://localhost:$1|g' {} +
+
+find . -type f -exec perl -pi -e "s|http://localhost:([0-9]+)|http://$adresse_ip:\$1|g" {} +

cryptide_project/social_graph.sh

@@ -2,8 +2,6 @@
 
 npm install --force
 
-SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
 if lsof -Pi :3000 -sTCP:LISTEN -t >/dev/null; then
   # Tuer le processus associé au port
   pid=$(lsof -Pi :3000 -sTCP:LISTEN -t)
@@ -26,8 +24,8 @@ fi
 
 npm start &
 
-node $SCRIPT_DIR/../server/socket_io/server.js &
+node server/server.js &
 
-node $SCRIPT_DIR/../server/api/server.js 
+node src/server/server.js 
 
 

cryptide_project/src/AdressSetup.ts

@@ -1,7 +1,5 @@
-// const ADRESSE_WEBSERVER = "http://172.20.10.4:3002"
 const ADRESSE_WEBSERVER = "http://localhost:3002"
 
-// const ADRESSE_DBSERVER = "http://172.20.10.4:3003"
 const ADRESSE_DBSERVER = "http://localhost:3003"
 
 const tmp = ADRESSE_DBSERVER
@@ -9,9 +7,4 @@ const tmp2 = ADRESSE_WEBSERVER
 
 const ADRESSE_WEBSITE = ""
 
-const basePath = process.env.REACT_APP_BASE_PATH || '';
+export {ADRESSE_DBSERVER, ADRESSE_WEBSERVER, ADRESSE_WEBSITE}
-
-const tmp3 = basePath
-
-
-export {ADRESSE_DBSERVER, ADRESSE_WEBSERVER, ADRESSE_WEBSITE, basePath}

cryptide_project/src/App.tsx

@@ -9,19 +9,20 @@ import { AuthProvider } from './Contexts/AuthContext';
 import Home from './Pages/Home'; 
 import Login from './Pages/LoginForm';
 import SignUp from './Pages/SignUpForm';
-import NewPlay from './Pages/NewPlay';
+import Play from './Pages/Play';
 import Profile from './Pages/Profile';
 import Lobby from './Pages/Lobby';
 import InGame from './Pages/InGame';
+
 import EndGame from './Pages/EndGame';
 import InfoPage from './Pages/InfoPage';
 
-import DeducGrid from './Pages/DeducGrid'; 
-import Lobbies from './Pages/Lobbies';
-
 /* Component */
 import AppNavbar from './Components/NavBar';
 
+/* service */
+import SessionService from './services/SessionService';
+
 /* nav */
 import { BrowserRouter, Route, Routes, useLocation } from "react-router-dom";
 
@@ -37,26 +38,11 @@ import 'bootstrap/dist/css/bootstrap.min.css';
 /* Internationnalisation */
 import messagesFr from './Translations/fr.json';
 import messagesEn from './Translations/en.json';
-import messagesEs from './Translations/es.json';
+import SoloGame from './Pages/SoloGame';
-import messagesPt from './Translations/pt.json';
-import messagesRu from './Translations/ru.json';
-
-
-/* Gestion d' erreur */
-import ErrorBoundary from './Error/ErrorBoundary';
-import ErrorPage from './Error/ErrorPage';
-import DeducCheck from './Pages/DeducCheck';
-import {basePath} from "./AdressSetup"
-import Tutorial from './Pages/Tutorial';
-
-
 
 const messages = {
   fr: messagesFr,
   en: messagesEn,
-  es: messagesEs,
-  pt: messagesPt,
-  ru: messagesRu,
 };
 
 function App() {
@@ -70,48 +56,43 @@ function App() {
     setLocale(newLocale);
   };
 
-  console.log(basePath)
-
 
   //const location = useLocation();
-  const hasNavbarVisible = [basePath + "/", basePath + "/login", basePath + "/signup", basePath + "/lobby", basePath + "/endgame", basePath + "/deduc"]//.includes(window.location.pathname);
+  const hasNavbarVisible = ["/", "/login", "/signup", "/play", "/lobby", "/endgame"]//.includes(window.location.pathname);
 
-  document.title = "Social Graph"; 
 
   return (
-    <ErrorBoundary fallback={(error, errorInfo) => <ErrorPage />}>
+  // <div className="App">
-      <AuthProvider>
+  //   <header className="App-header">
-        <GameProvider>
+  //     <Home />
-          {/*@ts-ignore*/}
+  //     <img src={logo} className="App-logo" alt="logo" />
-          <IntlProvider locale={locale} messages={messages[locale]}>
+  //   </header>
-            <ThemeProvider>
+  // </div>
-              <BrowserRouter>  
+    
-                {hasNavbarVisible && <AppNavbar changeLocale={changeLocale} locale={locale} />}
+    <AuthProvider>
-                <Routes>
+      <GameProvider>
-                
+        {/*@ts-ignore*/}
-                  <Route path={`${basePath}/`} element={<NewPlay/>} />
+        <IntlProvider locale={locale} messages={messages[locale]}>
-                  <Route path={`${basePath}/login`} element={<Login />} />
+          <ThemeProvider>
-                  <Route path={`${basePath}/signup`} element={<SignUp />} />
+            <BrowserRouter>  
-                  <Route path={`${basePath}/presentation`} element={<Home />} />
+              {hasNavbarVisible && <AppNavbar changeLocale={changeLocale} />}
-                  <Route path={`${basePath}/lobby`} element={<Lobby/>} />
+              <Routes>
-                  <Route path={`${basePath}/endgame`} element={<EndGame lang={locale}/>} />
+                <Route path="/" element={<Play />} />
-                  <Route path={`${basePath}/game`} element={<InGame locale={locale} changeLocale={changeLocale}/>}/>
+                <Route path="/login" element={<Login />} />
-                  <Route path={`${basePath}/info`} element={<InfoPage locale={locale} changeLocale={changeLocale}/>} />
+                <Route path="/signup" element={<SignUp />} />
-                  <Route path={`${basePath}/tutorial`} element={<Tutorial locale={locale} changeLocale={changeLocale}/>} />
+                <Route path="/home" element={<Home/>} />
-                  <Route path={`${basePath}/deduc`} element={<DeducCheck lang={locale}/>} />
+                <Route path="/lobby" element={<Lobby/>} />
-                  <Route path={`${basePath}/TheRealDeduc`} element={<DeducGrid/>} />
+                <Route path="/endgame" element={<EndGame/>} />
-                  <Route path={`${basePath}/profile`} element={<Profile/>} />
+                <Route path="/game" element={<InGame locale={locale} changeLocale={changeLocale}/>}/>
-                  <Route path={`${basePath}/join`} element={<Lobbies/>}/>
+                <Route path="/info" element={<InfoPage locale={locale} changeLocale={changeLocale}/>} />
-                  {/* <Route path="/solo" element={<SoloGame locale={locale} changeLocale={changeLocale} />}/>   */}
+                <Route path="/profile" element={<Profile/>} />
-
+                {/* <Route path="/solo" element={<SoloGame locale={locale} changeLocale={changeLocale} />}/>   */}
-                  <Route path="*" element={<ErrorPage code="404" msg='not found' />} /> {/* page 404 */}
+              </Routes>
-                </Routes>
+            </BrowserRouter>
-              </BrowserRouter>
+          </ThemeProvider>
-            </ThemeProvider>
+        </IntlProvider>
-          </IntlProvider>
+      </GameProvider>
-        </GameProvider>
+    </AuthProvider>
-      </AuthProvider>
-    </ErrorBoundary>
   );
 }
 

cryptide_project/src/Components/AccordionIndice.tsx

@@ -1,87 +0,0 @@
-import React, { useState } from 'react';
-
-/* Style */
-import '../Style/Global.css';
-//import { useTheme } from '../Style/ThemeContext';
-
-/* Model */
-import Stub from '../model/Stub';
-import Indice from '../model/Indices/Indice';
-
-
-/* lang */
-import { FormattedMessage } from 'react-intl';
-
-/* Boostrap */
-import Accordion from 'react-bootstrap/Accordion';
-import Table from 'react-bootstrap/Table';
-import Case from './CheckCase';
-
-
-interface AccordionIndiceComponentProps<T extends Indice> {
-instance: (new (...args: any[]) => T) | (Function & { prototype: T });
-    head: string;
-    lang: string;
-}
-
-const AccordionIndice: React.FC<AccordionIndiceComponentProps<any>> = ({ instance, head, lang }) => {
-const indices = Stub.GenerateIndice();
-const [selectedRows, setSelectedRows] = useState<number[]>([]);
-
-
-const handleRowClick = (index: number) => {
-
-    const newSelectedRows = [...selectedRows];
-
-    const selectedIndex = newSelectedRows.indexOf(index);
-    if (selectedIndex === -1) {
-        newSelectedRows.push(index);
-    } else {
-        newSelectedRows.splice(selectedIndex, 1);
-    }
-
-    console.log('New Selected Rows:', newSelectedRows);
-    setSelectedRows(newSelectedRows);
-};
-
-return (
-    <>
-    <Accordion defaultActiveKey={['0']} alwaysOpen style={{ width: '100%' }}>
-        <Accordion.Item eventKey="0">
-        <Accordion.Header>{head}</Accordion.Header>
-        <Accordion.Body>
-            <Table striped bordered hover>
-            <thead>
-                <tr>
-                    <th>Indice</th>
-                </tr>
-            </thead>
-            <tbody>
-                {indices
-                .filter((i) => i instanceof instance)
-                .map((indice, index) => (
-                    <tr
-                        key={index}
-                        onClick={() => handleRowClick(index)}
-                        style={{
-                            cursor: 'pointer',
-                        }}>
-                        <td
-                            style={{
-                                border: selectedRows.includes(index) ? '1px solid red' : 'none',
-                                backgroundColor: selectedRows.includes(index) ? '#FF9191' : 'white',
-                            }}>
-                            {indice.ToString(lang)}
-                        </td>
-                    </tr>
-                ))}
-            </tbody>
-            </Table>
-        </Accordion.Body>
-        </Accordion.Item>
-    </Accordion>
-    </>
-);
-};
-
-export default AccordionIndice;

cryptide_project/src/Components/BigButtonNav.tsx

@@ -5,8 +5,6 @@ import { FormattedMessage } from 'react-intl';
 
 import { useTheme } from '../Style/ThemeContext';
 import COLORS from '../Style/Color';
-import {basePath} from "../AdressSetup"
-
 //@ts-ignore
 function BigButtonNav({ dest, img}) {
     
@@ -17,7 +15,7 @@ function BigButtonNav({ dest, img}) {
     // };
 
     return (
-    <Link to={`${basePath}/${dest}`} className="link-without-underline">
+    <Link to={dest} className="link-without-underline">
         <button className='bigbuttonNabImg' style={{ backgroundColor: theme.colors.primary }}>
             <img src={img} alt="Button Image" height="100" width="100"/>
         </button>

cryptide_project/src/Components/ButtonImgNav.tsx

@@ -4,14 +4,12 @@ import './ButtonImgNav.css';
 import { FormattedMessage } from 'react-intl';
 
 import { useTheme } from '../Style/ThemeContext';
-import {basePath} from "../AdressSetup"
-
 
 //@ts-ignore
 function ButtonImgNav({ dest, img, text = "" }) {
     const theme = useTheme();
     return (
-    <Link to={`${basePath}/${dest}`} className="link-without-underline"> {/*target='_blank' ==> ouvre un nouvelle onglet*/ }
+    <Link to={dest} className="link-without-underline"> {/*target='_blank' ==> ouvre un nouvelle onglet*/ }
         <button className='buttonNabImg' style={{ backgroundColor: theme.colors.primary, color: theme.colors.secondary}}>
             <img src={img} alt="Button Image" height="50" width="50"/>
             <p>{text}</p>

cryptide_project/src/Components/CheckCase.tsx

@@ -1,41 +0,0 @@
-import React, { useState } from 'react';
-import { Link } from 'react-router-dom';
-
-
-/* style */
-import { useTheme } from '../Style/ThemeContext';
-import '../Pages/DeducGrid.css';
-
-/* res */
-import Check from '../res/icon/checkboxGreen.png';
-
-/* trad */
-import { FormattedMessage } from 'react-intl';
-
-
-//@ts-ignore
-function Case() {
-    const theme = useTheme();
-
-    const [bg, setbg] = useState('whitesmoke');
-    
-    //let check = ""; //? avec image
-    //let bg = 'whitesmoke';
-
-    function changeOnCheck(){
-        // if (check == "")check = Check;
-        // else check = "";
-
-        if(bg == "whitesmoke")setbg(theme.colors.tertiary);
-        else setbg("whitesmoke");
-
-        console.log("clic")
-    }
-    
-    return (
-        <button className='case' onClick={changeOnCheck} style={{backgroundColor: bg, borderColor:'grey'}}>
-        </button>
-    );
-}
-
-export default Case;

cryptide_project/src/Components/ChoiceBar.tsx

@@ -19,7 +19,6 @@ const ChoiceBar = () => {
 
   async function askEveryone(){
     if (nodeId !== null){
-      //@ts-ignore
       const person = personNetwork?.getPersons().find((p) => p.getId() == nodeId)
       if (person != undefined){
         const indiceTester = IndiceTesterFactory.Create(indices[actualPlayerIndex])

cryptide_project/src/Components/LangDropDown.tsx

@@ -3,39 +3,11 @@ import React from 'react';
 import { NavDropdown } from 'react-bootstrap';
 import LanguageNavItem from './LangNavItem';
 import { HiLanguage } from 'react-icons/hi2';
-import ReactCountryFlag from 'react-country-flag';
-
-//@ts-ignore
-const localToCountryCode = (locale) => {
-  switch (locale) {
-    case 'fr':
-      return 'FR';
-    case 'en':
-      return 'GB';
-    case 'es':
-      return 'ES';
-    case 'pt':
-      return 'PT';
-    case 'ru':
-      return 'RU';
-    default:
-      return 'FR';
-  }
-};
-
 
 // @ts-ignore
-const LangDropdown = ({ changeLocale, locale}) => {
+const LangDropdown = ({ changeLocale }) => {
-  const selectedcountryCode = localToCountryCode(locale);
   return (
-    <NavDropdown title={
+    <NavDropdown title={<HiLanguage/>} id="language-dropdown" align='end' drop='down-centered'>
-      <ReactCountryFlag
-        className="custom-flag"
-        countryCode={selectedcountryCode === null ? 'FR' : selectedcountryCode}
-        svg
-        style={{ margin: 'auto 10px 3px auto' }}
-      />
-    } id="language-dropdown" align='end' drop='down-centered'>
       <LanguageNavItem
         countryCode="FR"
         languageKey="languageSelector.french"
@@ -46,21 +18,7 @@ const LangDropdown = ({ changeLocale, locale}) => {
         languageKey="languageSelector.english"
         onClick={() => changeLocale('en')}
       />
-      <LanguageNavItem
+      {/* Ajoutez d'autres langues selon vos besoins */}
-        countryCode="ES"
-        languageKey="languageSelector.espagnol"
-        onClick={() => changeLocale('es')}
-      />
-      <LanguageNavItem
-        countryCode="PT"
-        languageKey="languageSelector.portuguese"
-        onClick={() => changeLocale('pt')}
-      />
-      <LanguageNavItem
-        countryCode="RU"
-        languageKey="languageSelector.russian"
-        onClick={() => changeLocale('ru')}
-      />
     </NavDropdown>
   );
 };

cryptide_project/src/Components/LobbyContainer.tsx

@@ -1,159 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { useTheme } from '../Style/ThemeContext';
-import Player from '../model/Player';
-import { Link } from 'react-router-dom';
-import { useNavigate } from 'react-router-dom';
-
-import Modal from 'react-bootstrap/Modal';
-import Offcanvas from 'react-bootstrap/Offcanvas';
-import Button from 'react-bootstrap/Button';
-import { socket } from '../SocketConfig';
-import Tooltip from 'react-bootstrap/esm/Tooltip';
-import OverlayTrigger from 'react-bootstrap/esm/OverlayTrigger';
-import {basePath} from "../AdressSetup"
-
-interface LobbyContainerProps {
-        roomNum : string
-        HeadPlayer : Player
-        nbPlayer : number
-        setFirst: (first: boolean) => void
-        started : boolean
-    //? mettre un "nbplayermax" si le nombre de joueur max peut etre fixé ?
-}
-
-
-const LobbyContainer: React.FC<LobbyContainerProps> = ({roomNum, HeadPlayer, nbPlayer, setFirst, started}) => {
-    const theme=useTheme();
-
-    const navigate = useNavigate();
-    const dest = 'lobby?room=' + roomNum;
-
-    //* Modal
-    const [showFull, setShowFull] = useState(false);
-    const [showStart, setShowStart] = useState(false);
-
-    const handleClose = () => {
-        setShowFull(false) 
-        setShowStart(false)
-    };
-    
-    const handleShowFull = () => setShowFull(true);
-    const handleShowStart = () => setShowStart(true);
-
-    const handleContainerClick = () => {
-        
-        if (showFull || showStart){
-            handleClose()
-        }
-        else{
-            if (nbPlayer < 6 && !started) {
-                socket.off("request lobbies")
-                setFirst(true)
-                navigate(`${basePath}/${dest}`);
-            }
-            else if(started){
-                handleShowStart()
-            }
-            else {
-                handleShowFull()
-            }
-        }
-    };
-
-
-    //* popup pour salle pleine
-    //@ts-ignore
-    const renderTooltipFull = (props) => (
-        <Tooltip id="button-tooltip" {...props}>
-            Salle Pleine !
-        </Tooltip>
-    );
-    
-    //* popup pour partie déjà lancé
-    //@ts-ignore
-    const renderTooltipInGame = (props) => (
-        <Tooltip id="button-tooltip" {...props}>
-            En Jeu !
-        </Tooltip>
-    );
-
-    //* autre
-    //@ts-ignore
-    const renderTooltip = (props) => (
-        <Tooltip id="button-tooltip" {...props}>
-            Rejoindre le lobby !
-        </Tooltip>
-    );
-
-    //let IsInGame = true;
-
-    let stylefull;
-    let colorfull;
-    let actualRender = renderTooltip;
-    let bgcol = 'white';
-
-    if (nbPlayer >= 6) {
-        stylefull = "darkred"
-        colorfull = "darkred"
-        actualRender = renderTooltipFull
-
-    }
-    else {
-        stylefull = "whitesmoke"
-        colorfull = "black"
-    }
-    
-    if(started){
-        bgcol = 'lightgrey' //! le hover ne marche plus
-        actualRender = renderTooltipInGame
-    }
-
-
-
-    return(
-    <OverlayTrigger
-        placement="top"
-        delay={{ show: 250, hide: 400 }}
-        overlay={actualRender}>
-
-        <div className='lobbyMainContainer' onClick={handleContainerClick} style={{borderColor:stylefull, backgroundColor:bgcol}}>
-            <header style={{height:'20%', display:'flex', justifyContent:'end'}}>
-                <h6><i>Room : {roomNum}</i></h6>
-            </header>
-            <hr/>
-                <h3><b>{HeadPlayer.pseudo}</b></h3>
-            <div style={{display:'flex', justifyContent:'end', alignItems:'end'}}>
-                <h2 style={{color:colorfull}}>{nbPlayer}/6</h2>
-            </div>
-
-            {/* Modals */}
-            <Modal show={showFull} onHide={handleClose}>
-                <Modal.Header closeButton>
-                    <Modal.Title>Salle pleine</Modal.Title> 
-                </Modal.Header>
-                <Modal.Body>La salle est pleine, il est impossible d'y aller pour le moment !</Modal.Body>
-                <Modal.Footer>
-                    <Button variant="secondary" onClick={handleClose}>
-                        Ok
-                    </Button>
-                </Modal.Footer>
-            </Modal>
-
-            <Modal show={showStart} onHide={handleClose}>
-                <Modal.Header closeButton>
-                    <Modal.Title>La partie a déjà commencée</Modal.Title> 
-                </Modal.Header>
-                <Modal.Body>La partie a déjà commencée, il est impossible d'y aller pour le moment !</Modal.Body>
-                <Modal.Footer>
-                    <Button variant="secondary" onClick={handleClose}>
-                        Ok
-                    </Button>
-                </Modal.Footer>
-            </Modal>
-
-        </div>
-    </OverlayTrigger>
-    );
-}
-
-export default LobbyContainer;

cryptide_project/src/Components/NavBar.tsx

@@ -12,7 +12,6 @@ import { BsFillPersonPlusFill } from 'react-icons/bs';
 
 /* Images */
 import logo from '../res/img/logo2_preview_rev_1.png';
-import defaultImg from '../res/img/Person.png';
 
 /* Components */
 import LanguageNavItem from './LangNavItem';
@@ -26,26 +25,20 @@ import { useTheme } from '../Style/ThemeContext';
 import { useAuth } from '../Contexts/AuthContext';
 import { useNavigate } from 'react-router-dom';
 
-import {basePath} from "../AdressSetup"
-import Player from '../model/Player';
-import { set } from 'lodash';
-
 // @ts-ignore
-function AppNavbar({changeLocale, locale}) {
+function AppNavbar({changeLocale}) {
     const theme = useTheme();
+    const {user, isLoggedIn, logout} = useAuth();
+
     const navigate = useNavigate();
-    const {isLoggedIn, login, user, setUserData, manager } = useAuth();
+
 
     function navigateToProfile(){
-        navigate(`${basePath}/profile`)
+        navigate("/profile")
     }
 
-    function navigateToLogin(){
-        navigate(`${basePath}/login`)
-    }
-    
     function navigateToHome(){
-        navigate(`${basePath}/`)
+        navigate("/")
     }
 
     return (
@@ -57,46 +50,58 @@ function AppNavbar({changeLocale, locale}) {
                 <Navbar.Toggle aria-controls="basic-navbar-nav" />
                 <Navbar.Collapse id="basic-navbar-nav">
                     <Nav className="me-auto">
-                        <Nav.Link href={`${basePath}/`} style={{ color: theme.colors.text }}>
+                        <Nav.Link href="/" style={{ color: theme.colors.text }}>
-                            <FormattedMessage id="navbar.play" />
+                            Jouer
                         </Nav.Link>
-                        <Nav.Link href={`${basePath}/presentation`} style={{ color: theme.colors.text }}>
+                        <Nav.Link href="/home" style={{ color: theme.colors.text }}>
-                            <FormattedMessage id="navbar.presentation" />
+                            Présentation
                         </Nav.Link>
-                        <Nav.Link href={`${basePath}/info`} style={{ color: theme.colors.text }}>
+                        <Nav.Link href="/info" style={{ color: theme.colors.text }}>
-                            <FormattedMessage id="navbar.info" />
+                            Info
                         </Nav.Link>
                     </Nav>
                     <div className='leftdiv'>
                         <Nav className="ml-auto navbar-title-dd">
-                            {isLoggedIn ? (
+                        {isLoggedIn ? (
-                                <>
+                            <NavDropdown
-                                    {/* Boutou qui lors du clique nous redirige vers le profile */}
+                                title={<span style={{ color: theme.colors.text }}>Menu <BiDoorOpen /></span>}
-                                    <Nav.Link onClick={navigateToProfile} style={{ color: theme.colors.text }}>
+                                id="basic-nav-dropdown"
-                                        <span>
+                                align="end"
-                                            <img src={user? user.profilePicture : defaultImg} height="50" width="50" alt="profile"/>
+                                drop='down-centered'
-                                            {user && user.pseudo}
+                            >
-                                        </span>
+                            <NavDropdown.Item onClick={navigateToProfile}>Profil</NavDropdown.Item>
-                                    </Nav.Link>
+                            {/* <LanguageNavItem
-                                </>
+                                countryCode="FR"
-                            ):(
+                                languageKey="languageSelector.french"
-                                <>
+                                onClick={() => changeLocale('fr')}
-                                    {/* Bouton qui lors du clique nous redirige vers la connexion */}
+                            />
-                                    <Nav.Link onClick={navigateToLogin} style={{ color: theme.colors.text }}>
+                            <LanguageNavItem
-                                        <span>
+                                countryCode="GB"
-                                            <img src={user?.profilePicture} height="50" width="50" alt="profile"/>
+                                languageKey="languageSelector.english"
-                                            {user && user.pseudo}
+                                onClick={() => changeLocale('en')}
-                                        </span>
+                            /> */}
-                                    </Nav.Link>
+                            <NavDropdown.Divider />
-                                </>
+                            <NavDropdown.Item onClick={logout}>Déconnexion</NavDropdown.Item>
-                            )}
+                            </NavDropdown>
+                        ) : (
+                            <>
+                            <Nav.Link href="/login" className='navbar-title-dd' style={{ backgroundColor: theme.colors.secondary }}>
+                                <BiLogInCircle />
+                                <FormattedMessage id="log_in" />
+                            </Nav.Link>
+                            <Nav.Link href="/signup" className='navbar-title-dd' style={{ backgroundColor: theme.colors.secondary }}>
+                                <BsFillPersonPlusFill />
+                                <FormattedMessage id="sign_up" />
+                            </Nav.Link>
+                            {/* <LangDropDown changeLocale={changeLocale}/> */}
+                            </>
+                        )}
                         </Nav>
                     </div>
                 </Navbar.Collapse>
-                <LangDropDown changeLocale={changeLocale} locale={locale}/>
             </Container>
         </Navbar>
     );
 }
 
-export default AppNavbar;
+export default AppNavbar;

cryptide_project/src/Components/PersonStatus.tsx

@@ -7,14 +7,8 @@ import { useTheme } from '../Style/ThemeContext';
 /* Ressources */
 import Person from '../res/img/Person.png'
 import BotImg from '../res/img/bot.png'
-
-/* Model */
-import Bot from '../model/Bot';
-
-/* Context */
 import { useGame } from '../Contexts/GameContext';
-import { positionToColor } from '../ColorHelper';
+import Bot from '../model/Bot';
-
 interface PlayerStatusProps {
     img: any
     state: any
@@ -25,9 +19,8 @@ interface PlayerStatusProps {
     showCircle: boolean
     playerIndex: number
     askedWrong: boolean
-}
+  }
-
+  let touchedPlayer = -1
-let touchedPlayer = -1
 
 //@ts-ignore
 const PersonStatus: React.FC<PlayerStatusProps> = ({img = Person, state= Person, name = "Dummy", index, playerTouched, setPlayerTouched, showCircle, playerIndex, askedWrong}) => {
@@ -37,7 +30,7 @@ const PersonStatus: React.FC<PlayerStatusProps> = ({img = Person, state= Person,
         img = BotImg
     }
 
-    const [buffer, setBuffer] = useState('50%')
+    const [buffer, setBuffer] = useState("")
 
     const [touchedPlayer, setTouchedPlayer] = useState(-2)
     useEffect(() =>{
@@ -48,90 +41,41 @@ const PersonStatus: React.FC<PlayerStatusProps> = ({img = Person, state= Person,
 
     useEffect(() => {
         if (playerIndex===index){
-            setBuffer('5px')
+            setBuffer('solid 1px green')
         }
         else{
-            setBuffer('50%')
+            setBuffer('')
         }
     }, [playerIndex])
     
     function onTouch(){
         if (IsActualPlayer && !askedWrong){
             setPlayerTouched(index)
-            setTouchedPlayer(index)
-            //setIsClicked(!isClicked);
         }
     }
-
-    //* Code pour le cercle
-
-    //const [isClicked, setIsClicked] = useState(false); // État du bouton, par défaut false
-    const handleClick = () => {
-        onTouch();
-    };
-    const circleStyle: React.CSSProperties = {
-        backgroundColor: positionToColor(index), // Changement de la couleur en fonction de la condition
-        borderRadius: buffer,
-        width: '80px',
-        height: '80px',
-        display: 'flex',
-        justifyContent: 'center',
-        alignItems: 'center',
-        position: 'relative',
-        objectFit: 'cover'
-    };
-
-    const circleStyleInt: React.CSSProperties = {
-
-        backgroundColor: touchedPlayer == index && showCircle ? 'lightblue' : 'white',
-        borderRadius: buffer,
-        width: '70px',
-        height: '70px',
-        display: 'flex',
-        justifyContent: 'center',
-        alignItems: 'center',
-        position: 'relative',
-        objectFit: 'cover'
-    }
-    
-    const imageStyle: React.CSSProperties = {
-        borderRadius: '50%', 
-        width: '60px',
-        height: '60px',
-        objectFit: 'cover', // image est ajustée pour couvrir le cercle
-        position: 'relative',
-    };
     
     return (
-        <div className='centerDivV'>
+        <div style={{border:buffer}}>
-            {/* <div className='centerDivV' style={{border:buffer, borderRadius: '50%', padding:'1px'}}> */}
+            <div className='centerDivV' onClick={() => onTouch()}>
-                <div className='centerDivV' style={circleStyle} onClick={() => handleClick()}>
+                <img src={img} alt="player" height="60" width="60"/>
-                    <div className='centerDivV' style={circleStyleInt}>
+                <h5>{name}</h5>      
-                        <img src={img} alt="player" height="40" width="40" style={{ ...imageStyle, objectFit: 'cover' }}/>
+
-                    </div>
+                {IsActualPlayer && (      
-            {/* </div> */}
+                    (touchedPlayer == index && showCircle) ?(
-            </div>
+                        <div className='statusDiv' style={{ backgroundColor: "gold" }}>
-            <div className='playerNameDisplay'>
+                            <img src={state} alt="state" height="30" width="30"/>
-                <h6>{actualPlayerIndex !== index ? (name.length > 18 ? name.substring(0, 15) + '...' : name) : 'vous'}</h6>
+                        </div>
+                    ): showCircle &&
+                    (
+                        <div className='statusDiv' style={{ backgroundColor: theme.colors.primary }}>
+                            <img src={state} alt="state" height="30" width="30"/>
+                        </div>
+                    )
+                )}
+                
             </div>
         </div>
     );
 }
 
 export default PersonStatus;
-
-
-
-
-// {IsActualPlayer && (      
-//     (touchedPlayer == index && showCircle) ?(
-//         <div className='statusDiv' style={{ backgroundColor: "gold" }}>
-//             <img src={state} alt="state" height="30" width="30"/>
-//         </div>
-//     ): showCircle &&
-//     (
-//         <div className='statusDiv' style={{ backgroundColor: theme.colors.primary }}>
-//             <img src={state} alt="state" height="30" width="30"/>
-//         </div>
-//     )
-// )}

cryptide_project/src/Components/PlayerItemList.tsx

@@ -20,7 +20,6 @@ import Bot from '../model/Bot';
 
 /* server */
 import { socket } from '../SocketConfig';
-import { Form } from 'react-router-dom';
 
 interface MyPlayerItemListProps {
     player : Player,
@@ -56,19 +55,19 @@ const PlayerItemList:React.FC<MyPlayerItemListProps> =({ player, room }) => {
                     </Button>
                 )}
             </div>
-            {isBot && (
+            {/* {isBot && (
                 <ToggleButtonGroup type='radio' name={`options-${player.id}`} defaultValue={1}>
                     <ToggleButton id={`tbg-radio-1-${player.id}`} value={1}>
-                        <FormattedMessage id='easy' />
+                        Facile
                     </ToggleButton>
                     <ToggleButton id={`tbg-radio-2-${player.id}`} value={2}>
-                        <FormattedMessage id='medium' />
+                        Intermédiaire
                     </ToggleButton>
                     <ToggleButton id={`tbg-radio-3-${player.id}`} value={3}>
-                        <FormattedMessage id='strong' />
+                        Fort
                     </ToggleButton>
                 </ToggleButtonGroup>
-            )}
+            )} */}
         </div>
     )
 }

cryptide_project/src/Components/PlayerList.tsx

@@ -5,10 +5,7 @@ import Player from '../model/Player';
 import { useTheme } from '../Style/ThemeContext';
 import PersonStatus from './PersonStatus';
 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
@@ -19,36 +16,36 @@ interface PlayerListProps {
     setPlayerTouched: (newPlayerTouch: number) => void;
     playerIndex: number
     askedWrong: boolean
-    greyForEveryone: () => void
 }
 
-const PlayerList: React.FC<PlayerListProps> = ({ players, playerTouched, setPlayerTouched, playerIndex, askedWrong, greyForEveryone}) => {
+const PlayerList: React.FC<PlayerListProps> = ({ players, playerTouched, setPlayerTouched, playerIndex, askedWrong}) => {
     const theme = useTheme();
 
     function askEveryone(){
         if (!askedWrong){
-            greyForEveryone()
             setPlayerTouched(players.length)    
         }
     }
 
     return (
         <div>
-            <div style={{ display: 'grid', gridTemplateColumns: 'repeat(2, 1fr)', gap: '20px' }}>
+            <div style={{ display: 'grid', gridTemplateColumns: 'repeat(2, 1fr)', gap: '16px' }}>
                 {
                     //@ts-ignore
                     players.map((player, index) => (
                         //player.id!=socket.id && 
-                        <PersonStatus img={player instanceof Player ? Person : BotImg} 
+                        <PersonStatus img={player.profilePicture} 
-                                    state={Person} 
+                                                    state={Person} 
-                                    key={index} 
+                                                    key={index} 
-                                    name={player.pseudo}
+                                                    name={player.pseudo 
-                                    playerTouched={playerTouched} 
+                                                    + " " + 
-                                    setPlayerTouched={setPlayerTouched} 
+                                                    positionToEmoji(index, true)} 
-                                    index={index} 
+                                                    playerTouched={playerTouched} 
-                                    showCircle={true}
+                                                    setPlayerTouched={setPlayerTouched} 
-                                    playerIndex={playerIndex}
+                                                    index={index} 
-                                    askedWrong={askedWrong}/>
+                                                    showCircle={true}
+                                                    playerIndex={playerIndex}
+                                                    askedWrong={askedWrong}/>
                     ))
                 }
             </div>
@@ -59,31 +56,28 @@ const PlayerList: React.FC<PlayerListProps> = ({ players, playerTouched, setPlay
                 alignItems:"center",
                 margin: 10
                 }}>
-                
+                {(playerTouched == players.length) 
-                    {(playerTouched == players.length) 
+                ?(
-                        ?(
+                    <button style={{ 
-                            <button style={{ 
+                    backgroundColor: "gold",
-                            backgroundColor: "gold",
+                    borderColor: theme.colors.secondary,
-                            borderColor: theme.colors.secondary,
+                    borderRadius: "10px",
-                            borderRadius: "10px",
+                    border: "solid 1px",
-                            border: "solid 1px",
+                    textAlign: "center",
-                            textAlign: "center",
+                    padding: "10px"}}
-                            color: "white",
+                    onClick={() => askEveryone()}>Ask everyone</button>
-                            padding: "10px"}}
+                ):
-                            onClick={() => askEveryone()}><FormattedMessage id='askeveryone'/></button>
+                (
-                        ):
+                    <button style={{ 
-                        (
+                        backgroundColor: theme.colors.primary,
-                            <button style={{ 
+                        borderColor: theme.colors.secondary,
-                                backgroundColor: theme.colors.primary,
+                        borderRadius: "10px",
-                                borderColor: theme.colors.secondary,
+                        border: "solid 1px",
-                                borderRadius: "10px",
+                        textAlign: "center",
-                                border: "solid 1px",
+                        padding: "10px"}}
-                                textAlign: "center",
+                    onClick={() => askEveryone()}>Ask everyone</button>
-                                color: "white",
+                )
-                                padding: "10px"}}
+            }
-                            onClick={() => askEveryone()}><FormattedMessage id='askeveryone'/></button>
-                        )
-                    }
             </div>
         </div>
         

cryptide_project/src/Components/ScoreBoard.css

@@ -1,28 +0,0 @@
-/* Ajoutez ces styles dans votre fichier CSS ou utilisez un préprocesseur comme SCSS */
-.tabsStats {
-    padding: 20px;
-  }
-  
-  .stats {
-    background-color: #f0f0f0;
-    padding: 20px;
-    border-radius: 8px;
-    box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
-    text-align: center;
-  }
-  
-  /* Personnalisez davantage selon vos préférences */
-
-  .carousselButton{
-    border:none;
-    background-color:darkgray;
-    color:white;
-    opacity: 60%;
-    width: 50px;
-    height: 70px;
-    font-size: 40px;
-    border-radius: 5px;
-    padding: 5px;
-    margin: 5px;
-    cursor: pointer;
-  }

cryptide_project/src/Components/ScoreBoard.tsx

@@ -1,13 +1,13 @@
-import React, {useState, useEffect} from 'react';
+import React from 'react';
-import Carousel from 'nuka-carousel';
 
 /* Style */
 import '../Pages/Play.css';
 import '../Style/Global.css'
-import './ScoreBoard.css';
 import { useTheme } from '../Style/ThemeContext';
 
 /* Ressources */
+import Person from '../res/img/Person.png'
+import leave from '../res/img/bot.png'
 import trophy from '../res/icon/trophy.png'
 import share from '../res/icon/share.png';
 
@@ -19,373 +19,104 @@ import Row from 'react-bootstrap/Row';
 import Col from 'react-bootstrap/Col';
 
 /* Component */
+import ButtonImgNav from './ButtonImgNav';
 import User from '../model/User';
 
-/* Services */
+/* Types */
-import ScoreboardService from '../services/ScoreboardService';
-import { BiLineChart, BiLineChartDown } from 'react-icons/bi';
-import { CarouselCaption } from 'react-bootstrap';
-import { BsLine } from 'react-icons/bs';
-
-import { FormattedMessage, useIntl } from 'react-intl';
 
 //@ts-ignore
 const ScoreBoard: React.FC<{ Player: User }> = ({ Player }) => {
     const theme=useTheme();
 
-    const [carouselKey, setCarouselKey] = useState(0);
-    const [activeTab, setActiveTab] = useState("perso");
-
-    // DAILY STATS
-    const [dailyMastermindStats, setDailyMastermindStats] = useState<any>(null);
-    const [dailyEasyEnigmaStats, setDailyEasyEnigmaStats] = useState<any>(null);
-    const [dailyMediumEnigmaStats, setDailyMediumEnigmaStats] = useState<any>(null);
-    const [dailyHardEnigmaStats, setDailyHardEnigmaStats] = useState<any>(null);
-    const [dailyOnlineStats, setDailyOnlineStats] = useState<any>(null);
-
-    // WEEKLY STATS
-    const [weeklyMastermindStats, setWeeklyMastermindStats] = useState<any>(null);
-    const [weeklyEasyEnigmaStats, setWeeklyEasyEnigmaStats] = useState<any>(null);
-    const [weeklyMediumEnigmaStats, setWeeklyMediumEnigmaStats] = useState<any>(null);
-    const [weeklyHardEnigmaStats, setWeeklyHardEnigmaStats] = useState<any>(null);
-    const [weeklyOnlineStats, setWeeklyOnlineStats] = useState<any>(null);
-
-    // Récupérer les records daily
-    useEffect(() => {
-        async function fetchDailyStats() {
-            try {
-                const resultMM = await ScoreboardService.getDailyMastermindStats();
-                const resultEF = await ScoreboardService.getDailyEasyEnigmaStats();
-                const resultEM = await ScoreboardService.getDailyMediumEnigmaStats();
-                const resultED = await ScoreboardService.getDailyHardEnigmaStats();
-                const resultOL = await ScoreboardService.getDailyOnlineStats(); 
-                
-                setDailyMastermindStats(resultMM);
-                setDailyEasyEnigmaStats(resultEF);
-                setDailyMediumEnigmaStats(resultEM);
-                setDailyHardEnigmaStats(resultED);
-                setDailyOnlineStats(resultOL);
-            } catch (error) {
-                console.error(error);
-            }
-        }
-
-        async function fetchWeeklyStats() {
-            try{
-                const resultMM = await ScoreboardService.getWeeklyMastermindStats();
-                const resultEF = await ScoreboardService.getWeeklyEasyEnigmaStats();
-                const resultEM = await ScoreboardService.getWeeklyMediumEnigmaStats();
-                const resultED = await ScoreboardService.getWeeklyHardEnigmaStats();
-                const resultOL = await ScoreboardService.getWeeklyOnlineStats();
-
-                setWeeklyMastermindStats(resultMM);
-                setWeeklyEasyEnigmaStats(resultEF);
-                setWeeklyMediumEnigmaStats(resultEM);
-                setWeeklyHardEnigmaStats(resultED);
-                setWeeklyOnlineStats(resultOL);
-            } catch (error) {
-                console.error(error);
-            }
-        }
-
-        fetchDailyStats();
-        fetchWeeklyStats();
-    }, []);
-
-    const intl = useIntl();
-
-
-    //@ts-ignore
-    const CustomPrevButton = ({ previousSlide }) => (
-        <button className='carousselButton' onClick={previousSlide}>&lt;</button>
-    );
-    
-    //@ts-ignore
-    const CustomNextButton = ({ nextSlide }) => (
-    <button className='carousselButton' onClick={nextSlide}>&gt;</button>
-    );
-
-
-
     return (
-        <Tabs
+        // <div className='LeaderBoardiv'>
-            activeKey={activeTab}
+        <div className='LeaderBoardiv'>
-            onSelect={(key:any) => {
+            <Tabs style={{width:"100%"}}
-            setActiveTab(key);
+                defaultActiveKey="perso"
-            // Forcer une mise à jour du carousel
+                id="ScoreBoard"
-            setCarouselKey((prevKey) => prevKey + 1);
+                className="mb-3">
-            }}
+                <Tab eventKey="perso" title="Vos Stats">
-            id="ScoreBoard"
+                
-            className="tabsStats justify-content-around">
+                { Player.pseudo.startsWith("Guest_") ? (
-            <Tab eventKey="perso"
+                    <div className='guestDisplay'>
-            title={intl.formatMessage({ id: 'score.tab.stat' })}
+                        <h4> 
-            disabled={!Player.pseudo.startsWith("Guest_") ? false : true}>
+                            <i>Veuillez vous connecter pour bénéficier des statistiques personnalisées.</i>
-                <Tab.Content className={`tabsStats ${activeTab !== 'perso' ? 'hidden' : ''}`}>
+                        </h4>
-                    <Carousel
+                    </div>
-                        renderCenterLeftControls={({ previousSlide }) => <CustomPrevButton previousSlide={previousSlide} />}
+                ) : (
-                        renderCenterRightControls={({ nextSlide }) => <CustomNextButton nextSlide={nextSlide} />}
+                    <Container fluid>
-                        adaptiveHeight
+                        <Row>Stats en solo :</Row>
-                        wrapAround
+                        <Row>
-                        slidesToShow={1}
+                            <Col sm={10}>Partie Jouées :</Col>
-                        cellSpacing={10}
+                            <Col className='leftRow'>{Player !== null ? Player.soloStats.nbGames : "0"}</Col>
-                        key={carouselKey}
+                        </Row>
-                        >
+                        <Row>
-                        <div className="stats">
+                            <Col sm={10}>Best-Score :</Col>
-                            <h5><FormattedMessage id='info.mdj.mastermind'/></h5>
+                            <Col className='leftRow'>{Player !== null ? Player.soloStats.bestScore : "0"}</Col>
-                            <hr />
+                        </Row>
-                            <p><FormattedMessage id='score.nbPlayed'/> : {Player.mastermindStats.nbGames}</p>
+                        <Row>
-                            <p><FormattedMessage id='score.best'/>: {Player.mastermindStats.bestScore}</p>
+                            <Col sm={10}>Moyenne d'essai :</Col>
-                            <p><FormattedMessage id='score.moy'/>: {Player.mastermindStats.avgNbTry.toFixed(2)}</p>
+                            <Col className='leftRow'>{Player !== null ? Player.soloStats.avgNbTry : "0"}</Col>
-                        </div>
+                        </Row>
-                        <div className="stats">
+                        <hr/>
-                            <h5><FormattedMessage id='score.titre.easy'/></h5>
+                        <Row>Stats en ligne :</Row>
-                            <hr />
+                        <Row>
-                            <p><FormattedMessage id='score.nbPlayed'/>: {Player.easyEnigmaStats.nbGames}</p>
+                            <Col sm={10}>Partie jouée :</Col>
-                            <p><FormattedMessage id='score.NbWin'/>: {Player.easyEnigmaStats.nbWins}</p>
+                            <Col className='leftRow'>{Player !== null ? Player.onlineStats.nbGames : "0"}</Col>
-                            <p><FormattedMessage id='score.ratio'/>: {Player.easyEnigmaStats.ratio.toFixed(2) + "%"}</p>
+                        </Row>
-                            <p><FormattedMessage id='score.bestTmp'/>: {Player.easyEnigmaStats.bestTime + "s"}</p>
+                        <Row>
-                            <p><FormattedMessage id='score.moyTmp'/>: {Player.easyEnigmaStats.avgTime.toFixed(2) + "s"}</p>
+                            <Col sm={10}>Nombre de victoire :</Col>
-                        </div>
+                            <Col className='leftRow'>{Player !== null ? Player.onlineStats.nbWins : "0"}</Col>
-                        <div className="stats">
+                        </Row>
-                            <h5><FormattedMessage id='score.titre.int'/></h5>
+                        <Row>
-                            <hr />
+                            <Col sm={10}>Ratio P/V :</Col>
-                            <p><FormattedMessage id='score.nbPlayed'/>: {Player.mediumEnigmaStats.nbGames}</p>
+                            <Col className='leftRow'>{Player !== null ? Player.onlineStats.ratio : "0"}</Col>
-                            <p><FormattedMessage id='score.best'/>: {Player.mediumEnigmaStats.bestScore}</p>
+                        </Row>
-                            <p><FormattedMessage id='score.moy'/>: {Player.mediumEnigmaStats.avgNbTry.toFixed(2)}</p>
+                    </Container>
-                        </div>
+                )}
-                        <div className="stats">
+                </Tab>
-                            <h5><FormattedMessage id='score.titre.hard'/></h5>
+                {/* <Tab eventKey="daily" title="Daily"
-                            <hr />
+                    style={{display:"flex", flexDirection:'column', alignItems:'center'}}>
-                            <p><FormattedMessage id='score.nbPlayed'/>: {Player.hardEnigmaStats.nbGames}</p>
+                    <img src={trophy}
-                            <p><FormattedMessage id='score.NbWin'/>: {Player.hardEnigmaStats.nbWins}</p>
+                            height='100'
-                            <p><FormattedMessage id='score.ratio'/>: {Player.hardEnigmaStats.ratio.toFixed(2) + "%"}</p>
+                            width='100'
-                            <p><FormattedMessage id='score.bestTmp'/>: {Player.hardEnigmaStats.bestTime + "s"}</p>
+                            alt="Person2"/>
-                            <p><FormattedMessage id='score.moyTmp'/>: {Player.hardEnigmaStats.avgTime.toFixed(2) + "s"}</p>
+                    <Container fluid>
-                        </div>
+                        <Row>
-                        <div className="stats">
+                            <Col sm={8}>Partie Jouées :</Col>
-                            <h5><FormattedMessage id='score.online'/></h5>
+                            <Col className='leftRow'>10</Col>
-                            <hr />
+                        </Row>
-                            <p><FormattedMessage id='score.nbPlayed'/>: {Player.onlineStats.nbGames}</p>
+                        <Row>
-                            <p><FormattedMessage id='score.NbWin'/>: {Player.onlineStats.nbWins}</p>
+                            <Col sm={8}>Partie gagnées :</Col>
-                            <p><FormattedMessage id='score.ratio'/>: {Player.onlineStats.ratio.toFixed(2) + "s"}</p>
+                            <Col className='leftRow'>2</Col>
-                        </div>
+                        </Row>
-                    </Carousel>
+                        <Row>
-                </Tab.Content>
+                            <Col sm={8}>Pions posés :</Col>
-            </Tab>
+                            <Col className='leftRow'>2</Col>
-            <Tab eventKey="daily" title={intl.formatMessage({ id: 'score.tab.quoti' })}>
+                        </Row>
-                <Tab.Content className={`tabsStats ${activeTab !== 'daily' ? 'hidden' : ''}`}>
+                        <hr/>
-                    <Carousel adaptiveHeight wrapAround slidesToShow={1} cellSpacing={10} key={carouselKey}>
+                        <Row>
-                        <div className="stats">
+                            <Col sm={8}>Partie solo :</Col>
-                            <h5><FormattedMessage id='info.mdj.mastermind'/></h5>
+                            <Col className='leftRow'>21</Col>
-                            <hr />
+                        </Row>
-                            {dailyMastermindStats !== null ? (dailyMastermindStats.tab.length !== 0 ? dailyMastermindStats.tab.map((stats: any, index: number) => (
+                        <Row>
-                                <>
+                            <Col sm={8}>Nombre de coups moyen :</Col>
-                                    <Row>
+                            <Col className='leftRow'>19</Col>
-                                        <Col>
+                        </Row>
-                                            <p>{index+1}.{stats.pseudo}</p>
+                    </Container>
-                                        </Col>
+                </Tab>
-                                        <Col>
+                <Tab eventKey="weekly" title="Weekly">
-                                            <p>{stats.score + " essai(s)"}</p>
+                    <img src={trophy}
-                                        </Col>
+                                height='100'
-                                    </Row>
+                                width='100'
-                                </>
+                                alt="Person2"/>
-                            )) : (
+                </Tab> */}
-                                <p className='text-warning'><FormattedMessage id='score.nothing'/></p>
+            </Tabs>
-                            )) : (
+            
-                                <p className='text-warning'><FormattedMessage id='score.nothing'/></p>
+                {/* <ButtonImgNav dest='/' img={share}/> */}
-                            )}
+                </div>
-                        </div>
+        //</div>
-                        <div className="stats">
-                            <h5><FormattedMessage id='score.titre.easy'/></h5>
-                            <hr />
-                            {dailyEasyEnigmaStats !== null ? (dailyEasyEnigmaStats.tab.length !== 0 ? dailyEasyEnigmaStats.tab.map((stats: any, index: number) => (
-                                <>
-                                    <Row>
-                                        <Col>
-                                            <p>{index+1}.{stats.pseudo}</p>
-                                        </Col>
-                                        <Col>
-                                            <p>{stats.time + "s"}</p>
-                                        </Col>
-                                    </Row>
-                                </>
-                            )) : (
-                                <p className='text-warning'><FormattedMessage id='score.nothing'/></p>
-                            )) : (
-                                <p className='text-warning'><FormattedMessage id='score.nothing'/></p>
-                            )}
-                        </div>
-                        <div className="stats">
-                            <h5><FormattedMessage id='score.titre.int'/></h5>
-                            <hr />
-                            {dailyMediumEnigmaStats !== null ? (dailyMediumEnigmaStats.tab.length !== 0 ? dailyMediumEnigmaStats.tab.map((stats: any, index: number) => (
-                                <>
-                                    <Row>
-                                        <Col>
-                                            <p>{index+1}.{stats.pseudo}</p>
-                                        </Col>
-                                        <Col>
-                                            <p>{stats.time + "s"}</p>
-                                        </Col>
-                                    </Row>
-                                </>
-                            )) : (
-                                <p className='text-warning'><FormattedMessage id='score.nothing'/></p>
-                            )) : (
-                                <p className='text-warning'><FormattedMessage id='score.nothing'/></p>
-                            )}
-                        </div>
-                        <div className="stats">
-                            <h5><FormattedMessage id='score.titre.hard'/></h5>
-                            <hr />
-                            {dailyHardEnigmaStats !== null ? (dailyHardEnigmaStats.tab.length !== 0 ? dailyHardEnigmaStats.tab.map((stats: any, index: number) => (
-                                <>
-                                    <Row>
-                                        <Col>
-                                            <p>{index+1}.{stats.pseudo}</p>
-                                        </Col>
-                                        <Col>
-                                            <p>{stats.time + "s"}</p>
-                                        </Col>
-                                    </Row>
-                                </>
-                            )) : (
-                                <p className='text-warning'><FormattedMessage id='score.nothing'/></p>
-                            )) : (
-                                <p className='text-warning'><FormattedMessage id='score.nothing'/></p>
-                            )}
-                        </div>
-                        <div className="stats">
-                            <h5><FormattedMessage id='score.online'/></h5>
-                            <hr />
-                            {dailyOnlineStats !== null ? (dailyOnlineStats.tab.length !== 0 ? dailyOnlineStats.tab.map((stats: any, index: number) => (
-                                <>
-                                    <Row>
-                                        <Col>
-                                            <p>{index+1}.{stats.pseudo}</p>
-                                        </Col>
-                                        <Col>
-                                            <p>{stats.wins + " victoires"}</p>
-                                        </Col>
-                                    </Row>
-                                </>
-                            )) : (
-                                <p className='text-warning'><FormattedMessage id='score.nothing'/></p>
-                            )) : (
-                                <p className='text-warning'><FormattedMessage id='score.nothing'/></p>
-                            )}
-                        </div>
-                    </Carousel>
-                </Tab.Content>
-            </Tab>
-            <Tab eventKey="weekly" title={intl.formatMessage({ id: 'score.tab.hebdo' })}>
-                <Tab.Content className={`tabsStats ${activeTab !== 'weekly' ? 'hidden' : ''}`}>
-                    <Carousel adaptiveHeight wrapAround slidesToShow={1} cellSpacing={10} key={carouselKey}>
-                        <div className="stats">
-                            <h5><FormattedMessage id='info.mdj.mastermind'/></h5>
-                            <hr />
-                            {weeklyMastermindStats !== null ? (weeklyMastermindStats.tab.length !== 0 ? weeklyMastermindStats.tab.map((stats: any, index: number) => (
-                                <>
-                                    <Row>
-                                        <Col>
-                                            <p>{index+1}.{stats.pseudo}</p>
-                                        </Col>
-                                        <Col>
-                                            <p>{stats.score + " essai(s)"}</p>
-                                        </Col>
-                                    </Row>
-                                </>
-                            )) : (
-                                <p className='text-warning'><FormattedMessage id='score.nothing'/></p>
-                            )) : (
-                                <p className='text-warning'><FormattedMessage id='score.nothing'/></p>
-                            )}
-                        </div>
-                        <div className="stats">
-                            <h5><FormattedMessage id='score.titre.easy'/></h5>
-                            <hr />
-                            {weeklyEasyEnigmaStats !== null ? (weeklyEasyEnigmaStats.tab.length !== 0 ? weeklyEasyEnigmaStats.tab.map((stats: any, index: number) => (
-                                <>
-                                    <Row>
-                                        <Col>
-                                            <p>{index+1}.{stats.pseudo}</p>
-                                        </Col>
-                                        <Col>
-                                            <p>{stats.time + "s"}</p>
-                                        </Col>
-                                    </Row>
-                                </>
-                            )) : (
-                                <p className='text-warning'><FormattedMessage id='score.nothing'/></p>
-                            )) : (
-                                <p className='text-warning'><FormattedMessage id='score.nothing'/></p>
-                            )}
-                        </div>
-                        <div className="stats">
-                            <h5><FormattedMessage id='score.titre.int'/></h5>
-                            <hr />
-                            {weeklyMediumEnigmaStats !== null ? (weeklyMediumEnigmaStats.tab.length !== 0 ? weeklyMediumEnigmaStats.tab.map((stats: any, index: number) => (
-                                <>
-                                    <Row>
-                                        <Col>
-                                            <p>{index+1}.{stats.pseudo}</p>
-                                        </Col>
-                                        <Col>
-                                            <p>{stats.time + "s"}</p>
-                                        </Col>
-                                    </Row>
-                                </>
-                            )) : (
-                                <p className='text-warning'><FormattedMessage id='score.nothing'/></p>
-                            )) : (
-                                <p className='text-warning'><FormattedMessage id='score.nothing'/></p>
-                            )}
-                        </div>
-                        <div className="stats">
-                            <h5><FormattedMessage id='score.titre.hard'/></h5>
-                            <hr />
-                            {weeklyHardEnigmaStats !== null ? (weeklyHardEnigmaStats.tab.length !== 0 ? weeklyHardEnigmaStats.tab.map((stats: any, index: number) => (
-                                <>
-                                    <Row>
-                                        <Col>
-                                            <p>{index+1}.{stats.pseudo}</p>
-                                        </Col>
-                                        <Col>
-                                            <p>{stats.time + "s"}</p>
-                                        </Col>
-                                    </Row>
-                                </>
-                            )) : (
-                                <p className='text-warning'><FormattedMessage id='score.nothing'/></p>
-                            )) : (
-                                <p className='text-warning'><FormattedMessage id='score.nothing'/></p>
-                            )}
-                        </div>
-                        <div className="stats">
-                            <h5><FormattedMessage id='score.titre.online'/></h5>
-                            <hr />
-                            {weeklyOnlineStats !== null ? (weeklyOnlineStats.tab.length !== 0 ? weeklyOnlineStats.tab.map((stats: any, index: number) => (
-                                <>
-                                    <Row>
-                                        <Col>
-                                            <p>{index+1}.{stats.pseudo}</p>
-                                        </Col>
-                                        <Col>
-                                            <p>{stats.wins + " victoires"}</p>
-                                        </Col>
-                                    </Row>
-                                </>
-                            )) : (
-                                <p className='text-warning'><FormattedMessage id='score.nothing'/></p>
-                            )) : (
-                                <p className='text-warning'><FormattedMessage id='score.nothing'/></p>
-                            )}
-                        </div>
-                    </Carousel>
-                </Tab.Content>
-            </Tab>
-        </Tabs>
     );
 }
 
-export default ScoreBoard;
+export default ScoreBoard;

cryptide_project/src/Components/TurnBar.tsx

@@ -12,6 +12,7 @@ const TurnBar: React.FC<TurnBarProps> = ({text})=> {
             style={{ 
                 borderColor: theme.colors.secondary
             }}>
+            {/* texte changeable et a traduire */}
             <p>{text}</p>
         </div>
     );

cryptide_project/src/Components/TutorialGraph.tsx

@@ -1,335 +0,0 @@
-import React, { useEffect, useState } from "react";
-import { DataSet, Network} from "vis-network/standalone/esm/vis-network";
-import GraphCreator from "../model/Graph/GraphCreator";
-import "./GraphContainer.css";
-import IndiceTesterFactory from "../model/Factory/IndiceTesterFactory";
-import Person from "../model/Person";
-import { useNavigate } from "react-router-dom";
-import { useGame } from "../Contexts/GameContext";
-import { socket } from "../SocketConfig"
-import { colorToEmoji, positionToColor, positionToEmoji } from "../ColorHelper";
-import { ColorToHexa } from "../model/EnumExtender";
-import Bot from "../model/Bot";
-import NodePerson from "../model/Graph/NodePerson";
-import { useAuth } from "../Contexts/AuthContext";
-import Indice from "../model/Indices/Indice";
-import Pair from "../model/Pair";
-import Player from "../model/Player";
-import JSONParser from "../JSONParser";
-import User from "../model/User";
-import { json } from "body-parser";
-import html2canvas from 'html2canvas';
-import jsPDF from 'jspdf';
-import {basePath} from "../AdressSetup"
-import PersonNetwork from "../model/PersonsNetwork";
-import { useIntl } from "react-intl";
-
-interface TutorialGraphProps {
-  setNetwork: (network: Network) => void
-  showLast: boolean
-  setPlayerIndex: (playerIndex: number) => void
-  handleShowTurnBar: (bool: boolean) => void
-  handleTurnBarTextChange: (text: string) => void
-  addToHistory: (text: string) => void
-  setPlayerTouched: (playerIndex: number) => void
-  playerTouched: number
-  tutoStep: number
-  setTutoStep: (step: number) => void
-  setGreyForEveryone: (func: () => void) => void
-  displayModalstep: (step: number) => void;
-}
-
-let lastNodes: NodePerson[] = []
-let firstIndex = true
-let first = true
-let touchedPlayer = -1
-let stepTuto = -1
-
-
-
-
-const TutorialGraph: React.FC<TutorialGraphProps> = ({showLast, setNetwork, setPlayerIndex, handleShowTurnBar, handleTurnBarTextChange, addToHistory, setPlayerTouched, playerTouched, tutoStep, setTutoStep, setGreyForEveryone, displayModalstep}) => {
-  let cptTour: number = 0
-
-  //* Gestion du temps :
-  let initMtn = 0
-
-    //* traduction
-    const intl = useIntl();
-
-  const {isLoggedIn, user, manager} = useAuth();
-  const {setIndiceData, setIndicesData, setActualPlayerIndexData, setWinnerData, setPlayersData, setNetworkDataData, setPersonData} = useGame();
-  const params = new URLSearchParams(window.location.search);
-
-  const navigate = useNavigate();
-  const [lastIndex, setLastIndex] = useState(-1)
-
-  if (first){
-    first = false
-    setActualPlayerIndexData(0)
-    handleTurnBarTextChange(intl.formatMessage({ id: 'game.yourTurn' }))
-    handleShowTurnBar(true)
-  }
-  
-
-  useEffect(() =>{
-    touchedPlayer=playerTouched
-  }, [playerTouched])
-
-  useEffect(() => {
-    stepTuto = tutoStep
-    if(stepTuto===1){
-      handleShowTurnBar(true)
-    }
-  }, [tutoStep])
-
-
-  useEffect(() => {
-    const tab: NodePerson[] = []
-    for(const n of lastNodes.reverse()){
-    
-    }
-    lastNodes = tab
-    if (showLast){
-      socket.emit("opacity activated", socket.id)
-    }
-    else{
-      socket.emit("opacity deactivated", socket.id)
-    }
-    
-  }, [showLast])
-
-  let playerIndex: number = 0
-
-  if (firstIndex){
-    firstIndex=false
-    setPlayerIndex(playerIndex)
-  }
-  let index = 0
-
-  useEffect(() => {
-
-
-    let jsonGraph = require("../tuto/graph.json")
-    let jsonIndice = require("../tuto/indices.json")
-
-    const personNetwork = JSONParser.JSONToNetwork(JSON.stringify(jsonGraph))
-    const indices = JSONParser.JSONToIndices(jsonIndice)
-
-    setIndiceData(indices[0])
-    if (personNetwork == null){
-      return
-    }
-    const graph = GraphCreator.CreateGraph(personNetwork)
-
-    const nodes = new DataSet(graph.nodesPerson);
-
-    setIndicesData(indices)
-    setPersonData(personNetwork.getPersons()[4])
-
-    let n = graph.nodesPerson;
-    let e = graph.edges;
-    const graphState = { n, e };
-
-    // Sauvegarder l'état dans localStorage
-    localStorage.setItem('graphState', JSON.stringify(graphState));
-
-    const container = document.getElementById('graph-container');
-    if (!container) {
-      console.error("Container not found");
-      return;
-    }
-    // Charger les données dans le graph
-
-    // Configuration des options du Graphe
-    const initialOptions = {
-
-        layout: {
-            improvedLayout: true,
-            hierarchical: {
-                enabled: false,
-                direction: 'LR', // LR (Left to Right) ou autre selon votre préférence
-                sortMethod: 'hubsize'
-            },
-            randomSeed: 3
-        },
-        physics: {
-            enabled: true,
-            barnesHut: {
-                gravitationalConstant: -1000,
-                springConstant: 0.001,
-                springLength: 100
-            },
-            solver: "repulsion",
-            repulsion: {
-              nodeDistance: 100 // Put more distance between the nodes.
-            }
-        }
-    };
-
-    const networkData = { nodes: nodes, edges: graph.edges };
-    const network = new Network(container, networkData, initialOptions);
-    network.stabilize();
-    setNetwork(network)
-
-    const myFunctionInsideEffect = () => {
-      if (stepTuto === 3){
-        const tabGrey = [0, 1, 2, 3, 5, 6, 7, 8, 9]
-        for (const i of tabGrey){
-          nodes.update({id: i, color: "#808080"})
-        }
-      }
-    };
-
-    setGreyForEveryone(() => myFunctionInsideEffect);
-
-
-    network.on("click", async (params) => {
-      
-      if(params.nodes.length > 0){
-      }
-    });
-
-    network.on("dragging", (params) => {
-      if (params.nodes.length > 0) {
-          // Un nœud a été cliqué
-          initialOptions.physics.enabled = false;
-          network.setOptions(initialOptions);
-          setNetwork(network)
-      }
-    });
-
-    network.on("click", async (params) => {
-      if(params.nodes.length > 0){
-        if (stepTuto === 0 && touchedPlayer === 1){
-          const node = nodes.get().find((n: NodePerson) => n.id === params.nodes[0])
-          
-          if (node === undefined)return;
-          if (node.id === 7){
-            nodes.update({id: node.id, label: node.label + positionToEmoji(1, true)})
-            handleShowTurnBar(false)
-            setPlayerIndex(1)
-            setPlayerTouched(-1)
-            await delay(500)
-            const node2 = nodes.get().find((n: NodePerson) => n.id === params.nodes[0])
-            if (node2 === undefined)return;
-            nodes.update({id: node.id, label: node2.label + positionToEmoji(2, false)})
-            await delay(500)
-            const node3 = nodes.get().find((n: NodePerson) => n.id === 8)
-            if (node3 === undefined)return;
-            nodes.update({id: node3.id, label: node3.label + positionToEmoji(1, false)})
-            setPlayerIndex(2)
-            await delay(500)
-            const node4 = nodes.get().find((n: NodePerson) => n.id === 0)
-            if (node4 === undefined)return;
-            nodes.update({id: node4.id, label: node4.label + positionToEmoji(1, true)})
-            setPlayerIndex(0)
-            setTutoStep(1)
-
-            displayModalstep(1);
-          }
-        }
-        else if(stepTuto === 1 && touchedPlayer === 2){
-          const node = nodes.get().find((n: NodePerson) => n.id === params.nodes[0])
-          if (node === undefined){
-            return;
-          }
-          if (node.id === 0){
-            nodes.update({id: node.id, label: node.label + positionToEmoji(2, false)})
-            setPlayerTouched(-1)
-            displayModalstep(2);
-            handleTurnBarTextChange(intl.formatMessage({ id: 'game.wrong' }))
-            const tabGrey = [7, 0, 4, 1, 8]
-            for (const id of tabGrey){
-              const node = nodes.get().find((n: NodePerson) => n.id === id)
-              if (node === undefined)return;
-              nodes.update({id: node.id, color: "#808080"})
-            }
-            setTutoStep(2)
-          }
-        }
-        else if(stepTuto === 2){
-          const node = nodes.get().find((n: NodePerson) => n.id === params.nodes[0])
-          if (node === undefined)return;
-          if (node.id === 9){
-            const tabColor = [7, 0, 4, 1, 8]
-            nodes.update({id: node.id, label: node.label + positionToEmoji(0, false)})
-            for(const id of tabColor){
-              const pers = personNetwork.getPersons().find((p: Person) => p.getId() === id)
-              if (pers !== undefined){
-                nodes.update({id: id, color: ColorToHexa(pers.getColor())})
-              }
-            }
-            handleShowTurnBar(false)
-            setPlayerIndex(1)
-            await delay(500)
-            const node2 = nodes.get().find((n: NodePerson) => n.id === 4)
-            if (node2 === undefined)return;
-            nodes.update({id: node2.id, label: node2.label + positionToEmoji(2, true)})
-            setPlayerIndex(2)
-            await delay(500)
-            const node3 = nodes.get().find((n: NodePerson) => n.id === 3)
-            if (node3 === undefined)return;
-            nodes.update({id: node3.id, label: node3.label + positionToEmoji(0, false)})
-            await delay(500)
-            const node4 = nodes.get().find((n: NodePerson) => n.id === 1)
-            if (node4 === undefined)return;
-            nodes.update({id: node4.id, label: node4.label + positionToEmoji(2, false)})
-            setPlayerIndex(0)
-            handleTurnBarTextChange(intl.formatMessage({ id: 'game.yourTurn' }))
-            handleShowTurnBar(true)
-            setTutoStep(3)
-            displayModalstep(3);
-          }
-        }
-        else if(stepTuto === 3 && touchedPlayer === 3){
-          const node = nodes.get().find((n: NodePerson) => n.id === params.nodes[0])
-          if (node === undefined)return;
-          if (node.id === 4){
-            nodes.update({id: node.id, label: node.label + positionToEmoji(0, true)})
-            setPlayerTouched(-1)
-            await delay(500)
-            const node2 = nodes.get().find((n: NodePerson) => n.id === 4)
-            if (node2 === undefined)return;
-            nodes.update({id: node2.id, label: node2.label + positionToEmoji(1, true)})
-            await delay(500)
-
-            for(const person of personNetwork.getPersons()){
-              nodes.update({id: person.getId(), color: ColorToHexa(person.getColor())})
-            }
-            if (user != null){
-              const winner = user;
-              setNetworkDataData(networkData)
-              setActualPlayerIndexData(-1)
-              setLastIndex(-1)
-              setPlayerTouched(-1)
-              setWinnerData(winner)      
-              first = true
-              navigate(`${basePath}/endgame`)
-            }  
-          }
-        }
-      }
-      else{
-        setPlayerTouched(-1)
-      }
-    });
-  
-    
-  }, []); // Le tableau vide signifie que cela ne s'exécutera qu'une fois après le premier rendu
-
-  return (
-    <>
-      <div id="graph-container"/>
-    </>
-  );
-
-  function delay(ms: number): Promise<void> {
-    return new Promise(resolve => setTimeout(resolve, ms));
-  }
-
-}
-
-
-
-export default TutorialGraph;

cryptide_project/src/Contexts/AuthContext.tsx

@@ -24,6 +24,8 @@ const AuthProvider: React.FC<{ children: ReactNode }> = ({ children }) => {
 
   const login = async () => {
     setIsLoggedIn(true);
+    const [u, bool] = await manager.userService.fetchUserInformation()
+    setUser(u)
   };
 
   const setUserData = (newPlayer: User) => {

cryptide_project/src/Contexts/GameContext.tsx

@@ -1,6 +1,4 @@
 import React, { createContext, useContext, useState, ReactNode } from 'react';
-import { DataSet, Edge } from 'vis-network';
-import NodePerson from '../model/Graph/NodePerson';
 import Indice from '../model/Indices/Indice';
 import Pair from '../model/Pair';
 import Person from '../model/Person';
@@ -25,9 +23,6 @@ interface GameContextProps {
   temps : number
   networkData: any
   seed: number | string;
-  nodesC: NodePerson[]
-  gameStart: boolean
-  setGameStartData : (newStart: boolean) => void
   setIndicesData: (newIndices: Indice[]) => void;
   setIndiceData: (newIndice: Indice) => void;
   setPersonData: (newPerson: Person) => void;
@@ -39,14 +34,13 @@ interface GameContextProps {
   setTurnPlayerIndexData: (newTurnPlayerIndex: number) => void;
   setRoomData: (newRoom: string) => void;
   setOnlyFalseData: (newOnlyFalse: boolean) => void
-  setWinnerData: (winner: Player | null) => void
+  setWinnerData: (winner: Player) => void
   reset: () => void
   setDailyEnigmeData: (map: Map<number, Pair<Indice, boolean>[]>) => void
   setNbCoupData: (newNbCoup : number) => void
   settempsData: (newtemps : number) => void
   setNetworkDataData: (networkData: any) => void
   setSeedData: (seed: number | string) => void
-  setNodesData: (nodes: NodePerson[]) => void
 }
 
 const GameContext = createContext<GameContextProps | undefined>(undefined);
@@ -73,17 +67,6 @@ export const GameProvider: React.FC<GameProviderProps> = ({ children }) => {
   const [temps, settemps] = useState<number>(0);
   const [networkData, setNetworkData] = useState<any>(null);
   const [seed, setSeed] = useState<number | string>(0);
-  const [nodesC, setNodes] = useState<NodePerson[]>([]);
-  const [gameStart, setGameStart] = useState<boolean>(true)
-
-
-  const setGameStartData = (newStart: boolean) => {
-    setGameStart(newStart)
-  }
-
-  const setNodesData = (nodes: NodePerson[]) => {
-    setNodes(nodes)
-  }
 
   const setNetworkDataData = (networkData: any) => {
     setNetworkData(networkData);
@@ -138,7 +121,7 @@ export const GameProvider: React.FC<GameProviderProps> = ({ children }) => {
     setOnlyFalse(newOnlyFalse)
   }
 
-  const setWinnerData = (winner: Player | null) =>{
+  const setWinnerData = (winner: Player) =>{
     setWinner(winner)
   }
 
@@ -172,7 +155,7 @@ export const GameProvider: React.FC<GameProviderProps> = ({ children }) => {
   }
 
   return (
-    <GameContext.Provider value={{ indices, setIndicesData, indice, setIndiceData, person, setPersonData, personNetwork, setPersonNetworkData, players, setPlayersData, nodeId, setNodeIdData, askedPersons, setAskedPersonsData, actualPlayerIndex, setActualPlayerIndexData, turnPlayerIndex, setTurnPlayerIndexData, room, setRoomData, onlyFalse, setOnlyFalseData, winner, setWinnerData, reset, dailyEnigme, setDailyEnigmeData, nbCoup, setNbCoupData, temps, settempsData, setNetworkDataData, networkData, seed, setSeedData, nodesC, setNodesData, gameStart, setGameStartData}}>
+    <GameContext.Provider value={{ indices, setIndicesData, indice, setIndiceData, person, setPersonData, personNetwork, setPersonNetworkData, players, setPlayersData, nodeId, setNodeIdData, askedPersons, setAskedPersonsData, actualPlayerIndex, setActualPlayerIndexData, turnPlayerIndex, setTurnPlayerIndexData, room, setRoomData, onlyFalse, setOnlyFalseData, winner, setWinnerData, reset, dailyEnigme, setDailyEnigmeData, nbCoup, setNbCoupData, temps, settempsData, setNetworkDataData, networkData, seed, setSeedData}}>
       {children}
     </GameContext.Provider>
   );

cryptide_project/src/Error/ErrorBoundary.tsx

@@ -1,67 +0,0 @@
-import React, { Component, ErrorInfo, ReactNode } from 'react';
-import ErrorPage from './ErrorPage';
-
-
-interface ErrorBoundaryProps {
-    fallback: (error: Error, errorInfo: ErrorInfo) => ReactNode;
-    children: ReactNode;
-}
-
-interface ErrorBoundaryState {
-    hasError: boolean;
-}
-
-class ErrorBoundary extends Component<ErrorBoundaryProps, ErrorBoundaryState> {
-    constructor(props: ErrorBoundaryProps) {
-        super(props);
-        this.state = {
-            hasError: false,
-        };
-    }
-
-    static getDerivedStateFromError(): ErrorBoundaryState {
-        return { hasError: true };
-    }
-
-    componentDidCatch(error: Error, errorInfo: ErrorInfo): void {
-        console.error('Error caught by ErrorBoundary:', error, errorInfo);
-    }
-
-    render(): ReactNode {
-        if (this.state.hasError) {
-        return this.props.fallback(new Error('Error caught by ErrorBoundary'), {});
-        }
-
-        return this.props.children;
-    }
-}
-
-export default ErrorBoundary;
-
-
-
-// interface ErrorBoundaryProps {
-//         children: ReactNode;
-//     }
-
-    
-// class ErrorBoundary extends React.Component <ErrorBoundaryProps>{
-//     state = { hasError : true }
-//     //@ts-ignore
-//     static getDerivedStateFromError(error){
-//         return { hasError : true};
-//     }
-
-//     componentDidCatch(error: Error, errorInfo: React.ErrorInfo): void {
-//         console.log(error, errorInfo);
-//     }
-
-//     render(){
-//         if (this.state.hasError){
-//             return <ErrorPage/>;
-//         }
-//         return this.props.children;
-//     }
-// }
-
-// export default ErrorBoundary;

cryptide_project/src/Error/ErrorPage.tsx

@@ -1,37 +0,0 @@
-
-import React from 'react';
-import { useTheme } from '../Style/ThemeContext';
-import { Link } from 'react-router-dom';
-import './ErrorStyle.css';
-import { FormattedMessage } from 'react-intl';
-import { Button } from 'react-bootstrap';
-
-const basePath = process.env.REACT_APP_BASE_PATH || '/containers/Crypteam-website';
-
-//@ts-ignore
-function ErrorPage({ code = "", msg = "Something is wrong"}) {
-    
-    const theme = useTheme();
-
-
-    return (
-        <div className='mainErrorDiv'>
-            <div className='titleError'>
-                <div>
-                    <h1>ERROR</h1>
-                    <hr style={{width:"100%"}}/>
-                </div>
-                { code != "" &&
-                    <h1 style={{color:'darkred', margin:'10px'}}>{code}</h1>
-                } 
-                <h2>{msg}</h2>
-            </div>
-
-            <div className='centerDivH' style={{margin: "20px"}}>
-                <Button href={`${basePath}/`} variant='danger'><FormattedMessage id='BackHome'/></Button>
-            </div>
-        </div>
-    );
-}
-
-export default ErrorPage;

cryptide_project/src/Error/ErrorStyle.css

@@ -1,29 +0,0 @@
-
-.mainErrorDiv{
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
-}
-
-
-.titleError{
-    border: solid 2px #C70039;
-    border-radius: 10px;
-    margin: 15px;
-    padding: 10px;  
-    box-shadow: 5px 5px 5px #900C3F;
-
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
-
-    width: 400px;
-    height: 250px;
-}
-
-.titleError h1 {
-    color: #900C3F;
-    margin: 10px !important;
-}

cryptide_project/src/JSONParser.ts

@@ -11,8 +11,6 @@ import Person from "./model/Person";
 import PersonNetwork from "./model/PersonsNetwork";
 import Player from "./model/Player";
 import User from "./model/User";
-import NodePerson from "./model/Graph/NodePerson";
-import Font from "./model/Graph/Font";
 
 class JSONParser{
 
@@ -88,22 +86,13 @@ class JSONParser{
     static JSONToPlayer(json: any): Player{
         switch (json.type){
             case "User":
-                return new User(json.id, json.pseudo, json.profilePicture, json.mastermindStats, json.easyEnigmaStats, json.mediumEnigmaStats ,json.hardEnigmaStatsS, json.onlineStats)
+                return new User(json.id, json.pseudo, json.profilePicture, json.soloStats, json.onlineStats)
             case "EasyBot":
                 return new EasyBot(json.id, json.pseudo, json.profilePicture)
             default:
                 throw new Error("PARSER unable to parse player: " + json.type);
         }
     }
-
-
-    static JSONToNodePersons(json: any): NodePerson[]{
-        const tmpTab: NodePerson[] = []
-        json.forEach((element: any) => {
-            tmpTab.push(new NodePerson(element.id, element.label, element.color, new Font(element.font.color, element.font.size, element.font.align), element.shape))
-        });
-        return tmpTab
-    }
 }
 
 export default JSONParser

cryptide_project/src/Pages/DeducCheck.tsx

@@ -1,120 +0,0 @@
-import React from 'react';
-
-/* Style */
-import './DeducGrid.css';
-import { useTheme } from '../Style/ThemeContext';
-
-/* Component */
-
-/* Boostrap */
-import Table from 'react-bootstrap/Table';
-import Form from 'react-bootstrap/Form';
-
-/* lang */
-import { FormattedMessage } from 'react-intl';
-
-/* model */
-import Stub from '../model/Stub';
-
-import { useGame } from '../Contexts/GameContext';
-import { positionToEmoji } from '../ColorHelper';
-
-function DeducCheck({lang}: {lang: string}) {
-    const theme = useTheme();
-    //const indices = Stub.GenerateIndice();
-    
-    const params = new URLSearchParams(window.location.search);
-    
-    const NbPlayer = params.get('nbPlayer');
-    const actualPlayerIndex = params.get('actualId') ?? '0';
-    
-    //const { actualPlayerIndex, players } = useGame();
-
-    // let playerstmp
-    // if (players.length == 0) playerstmp = ["1", "2", "3", "4", "5", "4"];
-    // else { playerstmp = players}
-
-    //* Gestion players
-    const playerList = Array.from({ length: parseInt(NbPlayer ?? '1') }, (_, index) => (index + 1).toString());
-    const playerColors = playerList.map((_, index) => positionToEmoji(index, true));
-    const players = playerColors.filter((_, index) => index !== parseInt(actualPlayerIndex ?? '0'));
-
-    
-
-    // const players = [
-    //     "🔵",
-    //     "🟢",
-    //     "🟡",
-    //     "🟣",
-    //     "🔴"
-    //]
-    //console.log(players)
-    // console.log(playerColors)
-    // console.log(actualPlayerIndex)
-
-    //* Gestion indices
-    const indices = Stub.GenerateIndice();
-    
-    const halfLength = Math.ceil(indices.length / 2);
-    const firstHalfIndices = indices.slice(0, halfLength);
-    const secondHalfIndices = indices.slice(halfLength);
-
-        
-    return (
-        <div style={{ margin: '20px', display: 'flex', flexDirection: 'column' }}>
-            <div style={{ display: 'flex', flexDirection: 'row', overflowX: 'auto' }}>
-                {/* Premier tableau */}
-                <Table striped bordered hover style={{ marginRight: '20px' }}>
-                    <thead>
-                        <tr>
-                            <th>Indices</th>
-                            {players.map((player, index) => (
-                                <th key={index}>{player}</th>
-                            ))}
-                        </tr>
-                    </thead>
-                    <tbody>
-                        {firstHalfIndices.map((indice, rowIndex) => (
-                            <tr key={rowIndex}>
-                                <td>{indice.ToString(lang)}</td>
-                                {players.map((player, colIndex) => (
-                                    <td key={colIndex}>
-                                        {/* <input type="checkbox"/> */}
-                                        <Form.Check aria-label="option 1" />
-                                    </td>
-                                ))}
-                            </tr>
-                        ))}
-                    </tbody>
-                </Table>
-
-                {/* Deuxième tableau */}
-                <Table striped bordered hover>
-                    <thead>
-                        <tr>
-                            <th>Indices</th>
-                            {players.map((player, index) => (
-                                <th key={index}>{player}</th>
-                            ))}
-                        </tr>
-                    </thead>
-                    <tbody>
-                        {secondHalfIndices.map((indice, rowIndex) => (
-                            <tr key={rowIndex}>
-                                <td>{indice.ToString(lang)}</td>
-                                {players.map((player, colIndex) => (
-                                    <td key={colIndex}>
-                                        {/* <input type="checkbox"/> */}
-                                        <Form.Check aria-label="option 1" />
-                                    </td>
-                                ))}
-                            </tr>
-                        ))}
-                    </tbody>
-                </Table>
-            </div>
-        </div>
-    );
-}
-
-export default DeducCheck;

cryptide_project/src/Pages/DeducGrid.css

@@ -1,17 +0,0 @@
-.case{
-    min-width: 50px;
-    min-height: 50px;
-    border: solid 1px whitesmoke;
-}
-
-.deducDiv{
-    display: flex;
-    flex-direction: column;
-}
-
-.sectionAccordion{
-    display: flex;
-    flex-direction: row;
-    justify-content: space-around;
-    
-}

cryptide_project/src/Pages/DeducGrid.tsx

@@ -1,79 +0,0 @@
-import React from 'react';
-
-
-/* Style */
-import './DeducGrid.css';
-import { useTheme } from '../Style/ThemeContext';
-
-/* Component */
-
-/* Boostrap */
-import Accordion from 'react-bootstrap/Accordion';
-import Table from 'react-bootstrap/Table';
-import Tab from 'react-bootstrap/Tab';
-import Tabs from 'react-bootstrap/Tabs';
-
-/* nav */
-import { Link } from 'react-router-dom';
-
-/* lang */
-import { FormattedMessage } from 'react-intl';
-import Case from '../Components/CheckCase';
-
-import Age from '../model/Indices/AgeIndice'
-import Stub from '../model/Stub';
-import Edge from '../model/Graph/Edge';
-import EdgesIndice from '../model/Indices/EdgesIndice';
-import AccordionIndice from '../Components/AccordionIndice';
-import AgeIndice from '../model/Indices/AgeIndice';
-import ColorIndice from '../model/Indices/ColorIndice';
-import ColorEdgesIndice from '../model/Indices/ColorEdgesIndice';
-import SportIndice from '../model/Indices/SportIndice';
-import NbEdgesIndice from '../model/Indices/NbEdgesIndice';
-import NbSportIndice from '../model/Indices/NbSportIndice';
-import { useGame } from '../Contexts/GameContext';
-
-function DeducGrid() {
-    const theme = useTheme();
-    //const indices = Stub.GenerateIndice();
-
-
-    // const { players } = useGame();
-
-    const players = [
-        "bla",
-        "bli",
-        "blou"
-    ]
-        
-    console.log(players)
-    return (
-        <div style={{margin:'20px'}}>
-            <Tabs defaultActiveKey="0" id="uncontrolled-tab-example" className="mb-3">
-            {players.map((joueur, index) => (
-                <Tab key={index} eventKey={index.toString()} title={`${joueur} ${index + 1}`}>
-                    <div className='deducDiv'>
-                        <div className='sectionAccordion'>
-                            <AccordionIndice instance={AgeIndice} head='Age' lang='fr'/>
-                        </div>
-                        <div className='sectionAccordion'>
-                            <AccordionIndice instance={ColorIndice} head='Couleur de cheveux' lang='fr'/>
-                            <AccordionIndice instance={ColorEdgesIndice} head='Couleur de cheveux voisine' lang='fr'/>
-                        </div>
-                        <div className='sectionAccordion'>
-                            <AccordionIndice instance={SportIndice} head='Sport' lang='fr'/>
-                            <AccordionIndice instance={NbSportIndice} head='Nombre de Sport' lang='fr'/>
-                        </div>
-                        <div className='sectionAccordion'>
-                            <AccordionIndice instance={EdgesIndice} head='Caractéristique des voisin' lang='fr'/>
-                            <AccordionIndice instance={NbEdgesIndice} head='Nombre de voisin' lang='fr'/>
-                        </div>
-                    </div>
-                </Tab>
-            ))}
-            </Tabs>
-        </div>
-    );
-}
-
-export default DeducGrid;

cryptide_project/src/Pages/EndGame.css

@@ -1,90 +1,123 @@
-/* Styles for the Winner and Indice section */
+.head{
-.head {
     display: flex;
     justify-content: center;
+    flex-direction: column;
     align-items: center;
-  }
+}
-  
+
-  .leaderboard-header {
+.leaderboard-header{
-    border: 2px solid;
-    border-color: #0064E0;
-    padding: 20px;
-    text-align: center;
-    border-radius: 0px 0px 10px 10px;
-  }
-  
-  /* Styles for the Winner's details */
-  .winner-details {
     display: flex;
-    align-items: center;
     justify-content: center;
-  }
+    flex-direction: column;
-  
+    align-items: center;
-  .winner-details img {
+
-    width: 75px;
+    width: fit-content;
-    height: 75px;
+
-    border-radius: 50%;
+    border-radius: 0px 0px 30px 30px;
-    margin-right: 10px;
+    border: solid;
-  }
+    border-width: 0 5px;
-  
+
-  /* Styles for the Indice Display */
+    padding: 20px;
-  .indiceDisplay {
+}
-    border: 2px solid whitesmoke;
+
-    border-radius: 10px;
+.bottomEnd{
-    margin: 5px; /* Réduire la marge */
-    padding: 8px; /* Réduire le rembourrage */
-    box-shadow: 3px 3px 3px rgb(246, 246, 246); /* Réduire l'ombre */
-  }
-  
-  /* Styles for the Losing Players Container */
-  .losingPlayersContainer {
     display: flex;
-    flex-wrap: wrap;
+    justify-content: space-around;
-    justify-content: space-evenly;
+}
-    margin: 5px;
+
-  }
+.winner{
-  
-  /* Styles for individual Player Containers */
-  .playerContainer {
     display: flex;
+    justify-content: center;
     flex-direction: column;
     align-items: center;
-    margin-top: 30px;
+}
-    margin-bottom: 30px;
-    border: 1px solid whitesmoke;
-    border-radius: 15px;
-    background-color: white;
-  }
 
-  .soloContainer {
+.playersContainer {
     display: flex;
-    justify-content: center;
+    flex-direction: column;
     align-items: center;
-    width: 100%; /* Ajoutez cette ligne pour occuper toute la largeur */
+    /* padding-left: "5px"; */
-  }
+
-  
+    width: 100px;
-  .solostat{
+    background-color: red;
+}
+
+.playerContainer{
+    /* display: flex;
+    align-items: center; */
+    /* flex-direction: column; */
+
+    /* width: 300px; */
+    width: 30%;
+    margin-bottom: 20px;
+    /* margin-bottom: 10px; */
+
     border: solid 1px whitesmoke;
     border-radius: 15px;
+    
     background-color: white;
-    padding: 10px;
+}
-    margin: 5px;
-    width: fit-content; /* Ajoutez cette ligne pour ajuster la largeur au contenu */
-  }
 
-  .center {
+.losingPlayersContainer{
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-evenly;
+    
+    margin: 10px 0; 
+    
+    max-width: 50%;
+    
+    overflow-y: scroll;
+    max-height: 200px;
+    /* background-color: yellow; */
+}
+
+.indiceDisplay{
+    border: solid 2px whitesmoke;
+    border-radius: 10px;
+    margin: 0 15px 0 15px;
+    padding: 10px;  
+    box-shadow: 5px 5px 5px rgb(246, 246, 246);    
+}
+
+.SoloContainer{
     display: flex;
-    justify-content: center;
     flex-direction: column;
     align-items: center;
-  }
+
+    border: solid 1px whitesmoke;
+    border-radius: 15px;
+    background-color: white;
+
+    max-width: 50%;
+}
+
+.indicesolo{
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-evenly;
     
+    /* margin: 10px 0;  */
+    /* max-height: 200px; */
+}
+
+.solostat{
+    display: flex;
+    justify-content: space-between;
+    width: 70%;
+}
+
+.solostat p {
+    border: solid 1px whitesmoke;
+    border-radius: 15px;
+    background-color: white;
+
+    padding: 10px;
+}
 
-  /* Styles for the Graph Container */
+#vis-graph {
-  #vis-graph {
     height: 500px;
-    margin: 5px;
+    margin: 50px; 
     border: 2px solid #ccc;
-    overflow: hidden;
+    overflow: hidden; 
-  }
+  }
-  

cryptide_project/src/Pages/EndGame.tsx

@@ -1,4 +1,4 @@
-import React,  {useEffect, useState} from 'react';
+import React, {useEffect} from 'react';
 
 
 /* Style */
@@ -11,37 +11,19 @@ import Person from '../res/img/Person.png';
 import Leave from '../res/icon/leave.png';
 import Replay from '../res/icon/replay.png';
 
-/* sound */
-import WinSound from '../res/Audio/win.wav';
-
 /* Component */
 import PersonStatus from '../Components/PersonStatus';
 import ButtonImgNav from '../Components/ButtonImgNav';
 import BigButtonNav from '../Components/BigButtonNav';
-//
+import { Button } from 'react-bootstrap';
 import { Network } from "vis-network/standalone/esm/vis-network";
-import { map } from 'lodash';
-
-/* Nav */
-import { Link } from 'react-router-dom';
-
-/* Lang */
-import { FormattedMessage } from 'react-intl';
 
-/* Model */
-import Player from '../model/Player';
 
-/* Context  */
 import { useGame } from '../Contexts/GameContext';
-
+import Player from '../model/Player';
-/* Boostrap */
-import { Button, Col, Container, Row } from 'react-bootstrap';
-import Bot from '../model/Bot';
-import {basePath} from "../AdressSetup"
-
 
 
-function EndGame({lang}: {lang: string}) {
+function EndGame() {
     const {networkData, seed} = useGame();
     const params = new URLSearchParams(window.location.search);
     
@@ -52,7 +34,7 @@ function EndGame({lang}: {lang: string}) {
             randomSeed: seed,
             hierarchical: {
                 enabled: false,
-                direction: 'LR',
+                direction: 'LR', // LR (Left to Right) ou autre selon votre préférence
                 sortMethod: 'hubsize'
             },
             //randomSeed: 2
@@ -67,24 +49,17 @@ function EndGame({lang}: {lang: string}) {
         }
     };
 
-    useEffect(() => {
-        handleWinSound();
-    }, []);
-
-
     useEffect(() => {
         const container = document.getElementById("vis-graph");
         if (!container) {
             console.error("Container not found");
             return;
-        }
+          }
         const network = new Network(container, networkData, initialOptions);
         console.log(networkData)
     
     }, []);
 
-
-
     //* Gestion solo
     let IsSolo: boolean = false
     const solotmp = params.get('solo');
@@ -128,210 +103,85 @@ function EndGame({lang}: {lang: string}) {
     }
     const theme = useTheme();
 
-
-    let indicenull = false;
-    if (indices.length == 0){
-        indicenull = true;
-    }
-
-    //* Sound
-    const [playTurnSound, setPlayTurnSound] = useState(false);
-
-    const handleWinSound = () => {
-        setTimeout(() => { // on attend 1s avant de jouer le son
-            setPlayTurnSound(true);
-        }, 300);
-
-        setTimeout(() => { // on attend 2s avant de remettre le son à false
-        setPlayTurnSound(false);
-        }, 2000);
-    };
     return (
-        <div style={{overflow:"hidden"}}>
+        <div>
-            {playTurnSound && <audio src={WinSound} autoPlay />}
             {!IsSolo ? (
-                <Container>
+                <div>
-                    {/* Winner et son indice */}
+                    <div className="head">
-                    <Row>
+                        <header className='leaderboard-header' style={{ borderColor: theme.colors.primary }}>
-                        <Col>
+                            <h1>{winner?.pseudo} a gagné !</h1>
-                            <div className="losingPlayersContainer">
+                            <h3>Le coupable était <u>{person?.getName()}</u></h3>
-                                {/* Indices pairs */}
+                        </header>
-                                {players.map((player, index) => (
+                    </div>
-                                    index % 2 == 0 && (
+                    <div className='winner'>
-                                        <div className="playerContainer" key={index}>
+                        <img src={Person} width='250' height='250'/>
+                        <h3 className='indiceDisplay'>{indices[players.findIndex((p) => p.id == winner?.id)].ToString("fr")}</h3>
+                    </div>
+                    <div className='bottomEnd'>
+                        {/* <div className='centerDivH' onClick={resetAll}>
+                            <BigButtonNav dest="/play" img={Leave}/>
+                        </div> */}
+                        <div className="losingPlayersContainer">
+                            {losingPlayers.map((player, index) => (
+                                <div className="playerContainer" key={index}>
+                                    {player.id !== winner?.id && (
+                                        <div>
                                             <PersonStatus img={Person} state={Person} key={index} name={player.pseudo} playerTouched={1} setPlayerTouched={() => {}} index={index} playerIndex={-2} showCircle={false} askedWrong={false}/>
-                                            {!indicenull && (<h6 className='indiceDisplay'>{indices[players.findIndex((p) => p.id == player?.id)].ToString(lang)}</h6>)}
+                                            <h6 className='indiceDisplay'>{indices[players.findIndex((p) => p.id == player?.id)].ToString("fr")}</h6>
                                         </div>
-                                    )
+                                    )}
-                                ))}
-                            </div>
-                        </Col>
-
-                        <Col xs={6}>
-                            <Row>
-                                <div className="head">
-                                    <header className='leaderboard-header' style={{ borderColor: theme.colors.primary }}>
-                                        <h4>{winner?.pseudo} a gagné !</h4>
-                                        <h5>Le coupable était <u>{person?.getName()}</u></h5>
-                                    </header>
                                 </div>
-                            </Row>
+                            ))}
-                            <Row>
+                        </div>
-                                <div id="vis-graph"></div>
+                        {/* <div className='centerDivH'>
-                            </Row>
+                            <BigButtonNav dest="/lobby" img={Replay}/>
-
+                        </div> */}
-                            <Row className="justify-content-md-center">
+                    </div>
-                                <Button href={`${basePath}/`} style={{
+                </div>
-                                    width:"50%",
-                                    margin:"10px"
-                                }}>Retour à l'accueil</Button>
-                            </Row>
-                        </Col>
-
-                        <Col>
-                            <div className="losingPlayersContainer">
-                                {players.map((player, index) => (
-                                    index % 2 == 1 && (
-                                        <div className="playerContainer" key={index}>
-                                            <PersonStatus img={Person} state={Person} key={index} name={player.pseudo} playerTouched={1} setPlayerTouched={() => {}} index={index} playerIndex={-2} showCircle={false} askedWrong={false}/>
-                                            {!indicenull && (<h6 className='indiceDisplay'>{indices[players.findIndex((p) => p.id == player?.id)].ToString(lang)}</h6>)}
-                                        </div>
-                                    )
-                                ))}
-                            </div>
-                        </Col>
-                    </Row>
-                </Container>
             ): (
-                <Container fluid>
+            <div>
-                    {/* Perd une énigme */}
+                <div className="head">
-                    {!winner && (
+                            <header className='leaderboard-header' style={{ borderColor: theme.colors.primary }}>
-                        <Row>
+                                <h1>Vous avez gagné !</h1>
-                            <Col>
+                                <h3>Le coupable était <u>{person?.getName()}</u></h3>
-                                <Row>
+                            </header>
-                                    <div className="head">
+                </div>
-                                        <header className='leaderboard-header' style={{ borderColor: theme.colors.primary }}>
+                <div className='winner'>
-                                            <h4>Vous avez perdu !</h4>
+                    <img src={Person} width='250' height='250'/>
-                                            <h5>Le coupable était <u>{person?.getName()}</u></h5>
+                    <h1>{winner?.pseudo}</h1>
-                                        </header>
+                </div>
-                                    </div>
+
-
+                <div className='bottomEnd'>
-                                    <Row>
+                    <div className="SoloContainer">
-                                        {!IsDaily && 
+                        <div className='solostat'>
-                                            <Col className='center'>
+                            {!IsDaily && <p>Nombre de coups : {nbCoup}</p> }
-                                                <p className='solostat'>Nombre de coups : {nbCoup}</p>
+                            <p>Temps : {temps}s</p>
-                                            </Col>
+                        </div>
-                                        }
+                        <div className='indicesolo'>
-
+                            {indices.map((indice, index) => (
-                                        <Col className='center'>
+                                        // <div className="playerContainer" key={index}>
-                                            <p className='solostat'>Temps : {temps}s</p>
+                                            <div>
-                                        </Col>
+                                                <h6 className='indiceDisplay'> <u>Indice {index+1}</u> : {indice.ToString("fr")}</h6>
-                                    </Row>
+                                            </div>
-                                </Row>
+                                        //</div>
-
+                                    ))
-                                <Row>
+                            }
-                                    <Col>
+                        </div>
-                                        {indices.map((indice, index) => (
+                    </div>
-                                            index % 2 == 0 && (
+                    {/* <div className='centerDivH'>
-                                                <div className='playerContainer'>
+                        <BigButtonNav dest="/lobby" img={Replay}/>
-                                                    <h6 className='indiceDisplay'> <u>Indice {index+1}</u> : {indice.ToString("fr")}</h6>
+                    </div> */}
-                                                </div>
+                </div>
-                                            )
+                
-                                        ))}
+                
-                                    </Col>
+            </div>
-
-                                    <Col xs={6}>
-                                        <div id="vis-graph"></div>
-                                    </Col>
-
-                                    <Col>
-                                        <div className="losingPlayersContainer">
-                                            {indices.map((indice, index) => (
-                                                index % 2 == 1 && (
-                                                    <div className='playerContainer'>
-                                                        <h6 className='indiceDisplay'> <u>Indice {index+1}</u> : {indice.ToString("fr")}</h6>
-                                                    </div>  
-                                                )
-                                            ))}
-                                        </div>
-                                    </Col>
-                                </Row>
-
-                                <Row className="justify-content-md-center">
-
-                                    <Button href={`${basePath}/`} style={{
-                                        width:"50%",
-                                        margin:"10px"
-                                    }}>Retour à l'accueil</Button>
-                                </Row>
-                            </Col>
-                        </Row>
-                    )}        
-
-                    {/* Gagne une énigme */}
-                    {winner && (
-                        <Row>
-                            <Col>
-                                <Row>
-                                    <div className="head">
-                                        <header className='leaderboard-header' style={{ borderColor: theme.colors.primary }}>
-                                            <h4>Vous avez gagné !</h4>
-                                            <h5>Le coupable était <u>{person?.getName()}</u></h5>
-                                        </header>
-                                    </div>
-
-                                    <Row>
-                                        {!IsDaily && 
-                                            <Col className='center'>
-                                                <p className='solostat'>Nombre de coups : {nbCoup}</p>
-                                            </Col>
-                                        }
-
-                                        <Col className='center'>
-                                            <p className='solostat'>Temps : {temps}s</p>
-                                        </Col>
-                                    </Row>
-                                </Row>
-
-                                <Row>
-                                    <Col>
-                                        {indices.map((indice, index) => (
-                                            index % 2 == 0 && (
-                                                <div className='playerContainer'>
-                                                    <h6 className='indiceDisplay'> <u>Indice {index+1}</u> : {indice.ToString("fr")}</h6>
-                                                </div>
-                                            )
-                                        ))}
-                                    </Col>
-
-                                    <Col xs={6}>
-                                        <div id="vis-graph"></div>
-                                    </Col>
-
-                                    <Col>
-                                        <div className="losingPlayersContainer">
-                                            {indices.map((indice, index) => (
-                                                index % 2 == 1 && (
-                                                    <div className='playerContainer'>
-                                                        <h6 className='indiceDisplay'> <u>Indice {index+1}</u> : {indice.ToString("fr")}</h6>
-                                                    </div>  
-                                                )
-                                            ))}
-                                        </div>
-                                    </Col>
-                                </Row>
-
-                                <Row className='justify-content-center'>
-                                    <Button href={`${basePath}/`} style={{
-                                        width:"50%",
-                                        margin:"10px"
-                                    }}>Retour à l'accueil</Button>   
-                                </Row>
-                            </Col>
-                        </Row>    
-                    )}        
-                </Container>
             )}
+            
+            <div id="vis-graph"/>
+
+            <div className='centerDivH' onClick={resetAll} style={{margin: "20px"}}>
+                <Button href='/'>Retour à l'accueil</Button>
+            </div>
         </div>
     );
 }

cryptide_project/src/Pages/Home.css

@@ -3,6 +3,8 @@
     justify-content: space-between;
     /* background-color: #D7D4C6; */
     background-color: #fff;
+    min-height: 100vh;
+    display: flex;
     font-size: calc(10px + 2vmin);
     /* color: #2A4541; */
 }

cryptide_project/src/Pages/Home.tsx

@@ -12,8 +12,6 @@ import {loadImageAsync} from "../ImageHelper"
 import { socket } from '../SocketConfig';
 import JSONParser from '../JSONParser';
 
-import {basePath} from "../AdressSetup"
-
 
 // @ts-ignore
 function Home() {
@@ -40,91 +38,77 @@ function Home() {
         }
     }, [isLoggedIn]);
 
-    return (        
+    return (
-        <div className="home-container" style={{overflow:"hidden"}}>
+        
-            <div className="left-section">
+    <div className="home-container">
-                <div>
-                    {/* <h2><FormattedMessage id="home.histoire.title"/></h2> */}
-                    <h2>Introduction</h2>
-                    <p style={{fontSize:"14px"}}>
-                        {/* <FormattedMessage id="home.histoire" /> */}
-                        Bienvenue dans notre jeu de déduction captivant, où l'intrigue et la malice se rejoignent dans une aventure palpitante ! 
-                        Plongez-vous dans un monde de mystère et d'intrigue, où chaque interaction compte, et chaque indice vous rapproche de la vérité.
-                        Imaginez un graphique complexe où chaque sommet représente une personne, chaque axe une relation, et chaque détail compte. 
-                        Vous êtes plongé dans un défi stimulant pour découvrir qui parmi ces individus est le mystérieux coupable. 
-                        Chaque joueur détient un indice crucial, et seul le partage stratégique de ces indices vous mènera à la résolution du mystère. 
-                        Explorez notre page de règles pour comprendre les subtilités du jeu, découvrez les indices qui peuvent vous guider, et élaborez des stratégies intelligentes pour identifier le coupable. 
-                        Manipuler vos amis, afin d'être le premier à découvrir qui est le meurtrier ! 
-                        Êtes-vous prêt à relever le défi et à démasquer le coupable caché dans le graphe ? Que l'enquête commence !
-                    </p>
-                </div>
-
-                <hr/>
-
-                <div>
-                    <h2><FormattedMessage id="home.jeu.title"/></h2>
-                    <p style={{fontSize:"14px"}}>
-                        {/* <FormattedMessage id="home.jeu" /> */}
-                        Dans l'univers captivant de notre jeu de déduction, la tromperie et la ruse sont les maîtres mots de la réussite. Explorez le mystère qui se dissimule derrière chaque interaction de notre graphique complexe, dévoilant les liens entre les individus. 
-                    </p>
-
-                    <p style={{fontSize:"14px"}}>
-                        {/* <FormattedMessage id="home.jeu" /> */}
-                        Votre mission ultime ? Découvrir qui parmi les individus est le coupable, mais n'attendez pas une collaboration ouverte. Utilisez plutôt la manipulation subtile pour embrouiller les pistes, détourner l'attention de vos adversaires. Posez des questions stratégiques, répondez avec malice et plantez des indices trompeurs pour vous rapprocher du dénouement.
-                    </p>
-
-                    <p style={{fontSize:"14px"}}>
-                        {/* <FormattedMessage id="home.jeu" /> */}
-                        Chaque occasion offre la possibilité de semer le doute parmi vos adversaires. Lorsqu'un joueur vous interroge, répondez en plaçant adroitement un jeton carré pour suggérer que "selon votre indice, cette personne ne peut être le coupable", ou un jeton rond pour indiquer qu'elle reste dans la liste des suspects. Soyez vigilant, chaque geste peut être interprété, et la vérité se dissimule souvent derrière une façade d'indices trompeurs.
-                    </p>
 
-                    <p style={{fontSize:"14px"}}>
+        <div className="left-section">
-                        {/* <FormattedMessage id="home.jeu" /> */}
-                        Si un joueur place un jeton carré, le questionneur doit également jouer son jeu en plaçant un jeton carré de sa couleur sur un nœud du graphique. La contre-manipulation devient ainsi une arme redoutable pour détourner l'accusation et semer la confusion. Pour en savoir plus, plongez-vous dans les détails de ce passionnant récit sur une autre page.
-                    </p>
 
-                    <h5>Pour des informations plus détaillées, consulter les <Link to={`${basePath}/info`}>règles</Link>.</h5>
+            <div>
-                    <hr/>
+                {/* <h2><FormattedMessage id="home.histoire.title"/></h2> */}
-                </div>
+                <h2>Introduction</h2>
-                
+                <p>
-                <div>
+                    {/* <FormattedMessage id="home.histoire" /> */}
-                    <h6>Jeu inspiré par le jeu de société "Cryptide"</h6>
+                    Bienvenue dans notre jeu de déduction captivant, où l'intrigue et la malice se rejoignent dans une aventure palpitante ! Plongez-vous dans un monde de mystère et d'intrigue, où chaque interaction compte, et chaque indice vous rapproche de la vérité.Imaginez un graphique complexe où chaque sommet représente une personne, chaque axe une relation, et chaque détail compte. Vous êtes plongé dans un défi stimulant pour découvrir qui parmi ces individus est le mystérieux coupable. Chaque joueur détient un indice crucial, et seul le partage stratégique de ces indices vous mènera à la résolution du mystère. Explorez notre page de règles pour comprendre les subtilités du jeu, découvrez les indices qui peuvent vous guider, et élaborez des stratégies intelligentes pour identifier le coupable. Manipuler vos amis, afin d'être le premier à découvrir qui est le meurtrier ! Êtes-vous prêt à relever le défi et à démasquer le coupable caché dans le graphe ? Que l'enquête commence !
-                </div>
+                </p>
             </div>
-                
+            <div>
-            <div className="vertical-divider"></div>
+                <h2><FormattedMessage id="home.jeu.title"/></h2>
+                <p>
+                    {/* <FormattedMessage id="home.jeu" /> */}
+                    Dans l'univers captivant de notre jeu de déduction, la tromperie et la ruse sont les maîtres mots de la réussite. Explorez le mystère qui se dissimule derrière chaque interaction de notre graphique complexe, dévoilant les liens entre les individus.
 
-            <div className="right-section">
+                    Votre mission ultime ? Découvrir qui parmi les individus est le coupable, mais n'attendez pas une collaboration ouverte. Utilisez plutôt la manipulation subtile pour embrouiller les pistes, détourner l'attention de vos adversaires. Posez des questions stratégiques, répondez avec malice et plantez des indices trompeurs pour vous rapprocher du dénouement.
-                {/* <h3><FormattedMessage id="game.time"/></h3>
-                <h3><FormattedMessage id="game.players"/></h3>
-                <h3><FormattedMessage id="game.age"/></h3> */}
-                <h3>
-                    Temps : 20 minutes<br/>
-                    Joueurs : 1 à 6<br/>
-                    Âge : 8ans et +<br/>
-                </h3>
 
-                <hr/>
+                    Chaque occasion offre la possibilité de semer le doute parmi vos adversaires. Lorsqu'un joueur vous interroge, répondez en plaçant adroitement un jeton carré pour suggérer que "selon votre indice, cette personne ne peut être le coupable", ou un jeton rond pour indiquer qu'elle reste dans la liste des suspects. Soyez vigilant, chaque geste peut être interprété, et la vérité se dissimule souvent derrière une façade d'indices trompeurs.
-                
-                <h3> 
-                    <u><FormattedMessage id="game.createdBy"/></u><br/>
-                    Chazot Thomas<br/>
-                    Ferreira Pierre<br/>
-                    Marcel Baptiste<br/>
-                </h3>
-                {/* <h3> <u><FormattedMessage id="game.illustratedBy"/></u><br/> Kwanchai Moriya</h3> */}
-                {/* <button>Jouer au jeu</button> */}
-                <br/>
 
-                <Link to={`${basePath}/`} className='button'
+                    Si un joueur place un jeton carré, le questionneur doit également jouer son jeu en plaçant un jeton carré de sa couleur sur un nœud du graphique. La contre-manipulation devient ainsi une arme redoutable pour détourner l'accusation et semer la confusion. Pour en savoir plus, plongez-vous dans les détails de ce passionnant récit sur une autre page.
-                    style={{ 
+                </p>
-                        backgroundColor: theme.colors.primary,
+                <br/>
-                        borderColor: theme.colors.secondary
+                <p>Pour des informations plus détaillées, consulter les <Link to="/info">règles</Link>.</p>
-                    }}>
+                <br/>
-                    <FormattedMessage id="play"/> 
-                </Link>
             </div>
+            <div>
+                {/* <h2><FormattedMessage id="home.plus.title"/></h2>
+                <ul>
+                    <li><FormattedMessage id="home.plus.1"/></li>
+                    <li><FormattedMessage id="home.plus.2"/></li>
+                    <li><FormattedMessage id="home.plus.3"/></li>
+                </ul> */}
+                <h2>Présentation Video :</h2>
+                (ici il y aura la vidéo)
+            </div>
+        </div>
+            
+        <div className="vertical-divider"></div>
+
+        <div className="right-section">
+            {/* <h3><FormattedMessage id="game.time"/></h3>
+            <h3><FormattedMessage id="game.players"/></h3>
+            <h3><FormattedMessage id="game.age"/></h3> */}
+            <h3>
+                Temps : 20 minutes<br/>
+                Joueurs : 1 à 6<br/>
+                Âge : 8ans et +<br/>
+            </h3>
+            <hr/>
+            <h3> <u><FormattedMessage id="game.createdBy"/></u><br/>
+            Chazot Thomas<br/>
+            Ferreira Pierre<br/>
+            Marcel Baptiste<br/>
+            </h3>
+            {/* <h3> <u><FormattedMessage id="game.illustratedBy"/></u><br/> Kwanchai Moriya</h3> */}
+            {/* <button>Jouer au jeu</button> */}
+            <br/>
+            <Link to="/play" className='button' 
+                style={{ 
+                    backgroundColor: theme.colors.primary,
+                    borderColor: theme.colors.secondary
+                }}>
+                <FormattedMessage id="play"/> 
+            </Link>
         </div>
+    </div>
     );
 }
 

cryptide_project/src/Pages/InGame.css

@@ -1,10 +1,11 @@
 .upperInfo{
     display: flex;
-    justify-content: center;
     flex-direction: column;
+    justify-content: center;
     align-items: center;
 
-    width: 30%;
+    width: 35%;
+    height: 50px;
 
     border-radius: 0px 0px 30px 30px;
     border: solid;
@@ -12,9 +13,9 @@
 
     background-color: white;
 
-    font-size: 30px;
+    font-size: 25px;
 
-    top: 20px;;
+    top: 0;
 }
 
 #mainDiv{
@@ -72,8 +73,8 @@
 .playerlistDiv{
     position: absolute;
     z-index: 1;
-    left: 30px;
+    left: 10px;
-    top : 30px;
+    top :50px;
 }
 
 .nbLaps{ /*nombre de tour*/
@@ -137,43 +138,38 @@
 
 /** Historique*/
 
-.historique {
+.historique{
     position: absolute;
     z-index: 1;
     bottom: 2%;
     left: 2%;
+
     display: flex;
     flex-direction: column;
+    /* justify-content: end; */
+
     padding: 15px 25px;
-    border: solid;
+    background-color: #d9d9d9;
-    border-width: 0.5px 0.5px 5px 0.5px;
+    border-radius: 15px;
-    border-color: whitesmoke lightgray gray whitesmoke;
+
-    border-radius: 0 5% 15px 0;
     height: 250px;
     width: 20%;
-
+    overflow-y:auto;
-    direction: rtl;
-    overflow-y: auto;
 }
 
-.historique div{
+#bottom-container {  
-    direction: ltr;
+    /* Ajout du style pour le conteneur en bas à droite */
-}
+    position: fixed;
-
+    bottom: 0;
-
+    right: 0;
-.historique::-webkit-scrollbar {
+    margin: 20px;
-    width: 10px;
-}
-
-.historique::-webkit-scrollbar-thumb {
-    background-color: lightgray;
-    border-radius: 5px;
 }
 
-.historique::-webkit-scrollbar-track {
+.bottomRightButton {
-    background-color: whitesmoke;
+    /* Style pour le bouton en bas à droite */
+    position: absolute;
+    bottom: 0;
+    right: 0;
+    margin: 10px;
 }
-
+  
-.historique::-webkit-scrollbar-corner {
-    background-color: whitesmoke;
-}

cryptide_project/src/Pages/InGame.tsx

@@ -14,24 +14,26 @@ import PlayerList from '../Components/PlayerList';
 import TurnBar from '../Components/TurnBar';
 
 /* Icon */
+import Leave from "../res/icon/leave.png";
 import Param from "../res/icon/param.png";
+import Replay from "../res/icon/replay.png";
 import Info from "../res/icon/infoGreen.png";
 import Check from "../res/icon/checkboxGreen.png";
+import Alpha from "../res/GreekLetters/alphaW.png";
 import MGlass from "../res/icon/magnifying-glass.png";
-import Pdf from "../res/icon/pdf.png"
+import Download from "../res/icon/download.png"
-import Tex from "../res/icon/tex.png"
 import Reset from "../res/icon/reset.png";
 import Oeye from "../res/icon/eye.png";
 import Ceye from "../res/icon/hidden.png";
 import JSZip from 'jszip';
-
+import ballonDeBasket from '../Script/ballon-de-basket.png';
-/* Sound */
+import ballonDeFoot from '../Script/ballon-de-foot.png';
-import turnSound from "../res/Audio/turn.mp3";
+import baseball from '../Script/baseball.png';
-import winSound from "../res/Audio/win.wav";
+import bowling from '../Script/bowling.png';
-
+import tennis from '../Script/tennis.png';
 
 /* nav */
-import { Link, Navigate, useNavigate, useNavigationType } from 'react-router-dom';
+import { Link } from 'react-router-dom';
 
 /* Boostrap */
 import Button from 'react-bootstrap/Button';
@@ -44,44 +46,19 @@ import { Nav, NavDropdown, Spinner } from 'react-bootstrap';
 import { FormattedMessage } from 'react-intl';
 import Color from '../model/Color';
 import { useGame } from '../Contexts/GameContext';
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import { NavLink } from 'react-router-dom';
-import { last } from 'lodash';
 import { socket } from '../SocketConfig';
 import { Network } from 'vis-network';
 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';
-
-import ballonDeBasket from '../Script/ballon-de-basket.png';
-import ballonDeFoot from '../Script/ballon-de-foot.png';
-import baseball from '../Script/baseball.png';
-import bowling from '../Script/bowling.png';
-import tennis from '../Script/tennis.png';
-
-
-let cptNavigation = 0
 
 //@ts-ignore
 const InGame = ({locale, changeLocale}) => {
   
   const theme = useTheme();
   
-  const navigate = useNavigate()
-  const {user, manager} = useAuth()
   
   const params = new URLSearchParams(window.location.search);
-
-  const navigationType = useNavigationType()
-    cptNavigation++
-    if (cptNavigation % 2 == 0){
-        if (navigationType.toString() == "POP"){
-            socket.emit("player quit")
-            navigate(`${basePath}/`)
-        }
-    }
   
   //* Gestion solo
   let IsSolo: boolean = true
@@ -97,51 +74,15 @@ const InGame = ({locale, changeLocale}) => {
     isDaily=false
   }
 
-
+  let isEasy: boolean = true
-  let difficulty: string = "";
+  const isEasytmp = params.get('easy');
-  let difficultyTmp = params.get('difficulty')
+  if (isEasytmp == "false"){
-  if (difficultyTmp !== null){
+    isEasy=false
-    difficulty=difficultyTmp
   }
-
   //* Historique
   const [history, setHistory] = useState<string[]>([]);
   const [showLast, setShowLast] = useState(false)
   const [askedWrong, setAskedWrong] = useState(false)
-  const [importToPdf, setImportToPdf] = useState(false)
-  const [importToJSON, setImportToJSON] = useState(false)
-  const [firstHistory, setFirstHistory] = useState(true)
-
-  const [putCorrectBackground, setPutCorrectBackground] = useState<() => void>(() => {});
-  const [putGreyBackgroud, setPutGreyBackground] = useState<() => void>(() => {});
-  const [putImposssibleGrey, setPutImposssibleGrey] = useState<() => void>(() => {});
-  const [changeGraph, setChangeGraph] = useState<(nbNodes: number, nbIndices: number) => void>(() => {});
-
-
-
-  const setPutCorrectBackgroundData = (func: () => void) => {
-    setPutCorrectBackground(func)
-  }
-
-  const setPutGreyBackgroundData = (func: () => void) => {
-    setPutGreyBackground(func)
-  }
-
-  const setPutImposssibleGreyData = (func: () => void) => {
-    setPutImposssibleGrey(func)
-  }
-
-  const setChangeGraphData = (func: (nbNodes: number, nbIndices: number) => void) => {
-    setChangeGraph(func)
-  }
-
-  const setImportToJSONData = (imp: boolean) => {
-    setImportToJSON(imp)
-  }
-
-  const setImportToPdfData = (imp: boolean) => {
-    setImportToPdf(imp)
-  }
 
   // Fonction pour ajouter un élément à l'historique
   const addToHistory = (message: string) => {
@@ -211,7 +152,7 @@ const InGame = ({locale, changeLocale}) => {
 
       const zip = new JSZip();
       
-      if (isDaily && (difficulty === "hard" || difficulty === "intermediate") && networkEnigme != null){
+      if (isDaily && !isEasy && networkEnigme != null){
         const tex = generateLatexCodeEnigme(personNetwork, person, indices, network, networkEnigme)
         const blob = new Blob([tex], { type: 'application/x-latex;charset=utf-8' });
         zip.file('socialGraph.tex', tex);
@@ -222,38 +163,26 @@ const InGame = ({locale, changeLocale}) => {
         zip.file('socialGraph.tex', tex);
       }
 
-      const imageNames = ['ballon-de-basket.png', 'ballon-de-foot.png', "baseball.png", "bowling.png", "tennis.png"]; // Liste des noms de fichiers d'images
+      zip.file('ballon-de-basket.png', await fetchImage(ballonDeBasket));
-      
+      zip.file('ballon-de-foot.png', await fetchImage(ballonDeFoot));
-      const imageNames2 = [ballonDeBasket, ballonDeFoot, baseball, bowling, tennis];
+      zip.file('baseball.png', await fetchImage(baseball));
-
+      zip.file('bowling.png', await fetchImage(bowling));
-      const imagesFolder = 'Script';
+      zip.file('tennis.png', await fetchImage(tennis));
-      let test = 0
-      for (const image of imageNames2) {
-        /*
-        const imageUrl = `localhost/${imagesFolder}/${imageName}`;
-        console.log(imageUrl)
-        const response = await fetch(imageUrl);
-        */
-        const response = await fetch(image);
-        
-        if (response.ok) {
-          const imageBlob = await response.blob();
-          zip.file(imageNames[test], imageBlob);
-          test++
-        } else {
-          //  console.error(`Erreur de chargement de l'image ${imageName}`);
-        }
-      }
 
       const content = await zip.generateAsync({ type: 'blob' });
 
       // Enregistre l'archive en tant que fichier
       saveAs(content, 'social_graph.zip');
-      
+
-      // Utiliser FileSaver pour télécharger le fichier
     }
   }
 
+  const fetchImage = async (imageUrl: string) => {
+    const response = await fetch(imageUrl);
+    const blob = await response.blob();
+    return blob;
+  };
+
   const resetGraph = () => {
     setisLoading(true);
     socket.emit("reset graph", socket.id)
@@ -277,7 +206,7 @@ const InGame = ({locale, changeLocale}) => {
   const handleCloseS = () => setShowS(false);
   const handleShowS = () => setShowS(true);
 
-  const [cptTour, setcptTour] = useState(1);
+  const [cptTour, setcptTour] = useState(0);
 
   const [LastVisible, setLastVisible] = useState(false);
 
@@ -327,106 +256,9 @@ const InGame = ({locale, changeLocale}) => {
       window.open(url);
     };
   
-  // const [SwitchEnabled, setSwitchEnabled] = useState(false)
+  const [SwitchEnabled, setSwitchEnabled] = useState(false)
   const allIndices = Stub.GenerateIndice()
-  const { indice, players, actualPlayerIndex} = useGame();
+  const { indice, players } = useGame();
-
-  const nbPlayer = players.length;
-  const navdeduc = 'deduc?actualId=' + actualPlayerIndex + '&nbPlayer=' + nbPlayer;
-
-
-  //* Sound
-  const [playTurnSound, setPlayTurnSound] = useState(false);
-  const [soundPreference, setSoundPreference] = useState(true); // utilisateur
-
-  const [enteredNumber, setEnteredNumber] = useState(user?.nbNodes || 25);
-  const [enteredNumberIndices, setEnteredNumberIndices] = useState(user?.nbIndices || 3);
-
-
-  //@ts-ignore
-  const handleNumberChange = (event) => {
-    if (parseInt(event.target.value)){
-      setEnteredNumber(parseInt(event.target.value));
-    }
-  };
-
-  //@ts-ignore
-  const handleKeyDown = (event) => {
-    // Vérifier si la touche appuyée est "Entrée"
-    if (event.key === 'Enter' && user!==null && parseInt(event.target.value)) {
-      const newNumber = Math.max(20, Math.min(50, parseInt(event.target.value, 10)));
-      user.nbNodes = newNumber;
-      setEnteredNumber(newNumber);
-    }
-  };
-  
-  const handleBlur = () => {
-    if (user!==null){
-      const newNumber = Math.max(20, Math.min(50, enteredNumber));
-      user.nbNodes = newNumber;
-      setEnteredNumber(newNumber);
-    }
-  };
-  
-
-  //@ts-ignore
-  const handleNumberIndicesChange = (event) => {
-    if (parseInt(event.target.value)){
-      setEnteredNumberIndices(parseInt(event.target.value));
-    }
-};
-
-useEffect(() => {
-  if (changeGraph){
-    if (enteredNumber>=20 && enteredNumber<=50 && enteredNumberIndices>=3 && enteredNumberIndices<=6){
-      console.log(enteredNumber)
-      console.log(enteredNumberIndices)
-      manager?.userService.changeNodesIndices(enteredNumber, enteredNumberIndices)
-      setHistory([]);
-      setFirstHistory(true)
-      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' && user!=null && parseInt(event.target.value)) {
-    const newNumber = Math.max(3, Math.min(6, parseInt(event.target.value, 10)));
-    user.nbIndices = newNumber;
-    setEnteredNumberIndices(newNumber);
-  }
-};
-
-const handleBlurIndice = () => {
-  if (user!==null){
-    const newNumber = Math.max(3, Math.min(6, enteredNumberIndices));
-    setEnteredNumberIndices(newNumber);
-    user.nbIndices = newNumber;
-  }
-};
-
-  const handleSoundPreferenceChange = () => {
-    setSoundPreference(!soundPreference);
-    console.log("changement des options du son : "+ soundPreference)
-  };
-
-  const handleTurn = () => {
-    
-    console.log("etat normal du sound : " + soundPreference)
-    if (soundPreference) {
-      setPlayTurnSound(true);
-      
-      setTimeout(() => {
-        setPlayTurnSound(false);
-      }, 2000);
-    }
-  };
 
 
     return (
@@ -440,7 +272,7 @@ const handleBlurIndice = () => {
                           addToHistory={addToHistory}
                           solo={IsSolo} 
                           isDaily={isDaily} 
-                          difficulty={difficulty}
+                          isEasy={isEasy}
                           setPlayerTouched={handleSetPlayerTouched} 
                           playerTouched={playerTouched}
                           setNetwork={setNetworkData}
@@ -448,34 +280,20 @@ const handleBlurIndice = () => {
                           showLast={showLast}
                           setPlayerIndex={setPlayerIndexData}
                           askedWrong={askedWrong}
-                          setAskedWrong={setAskedWrongData}
+                          setAskedWrong={setAskedWrongData}/>
-                          importToPdf={importToPdf}
-                          setImportToPdf={setImportToPdfData}
-                          importToJSON={importToJSON}
-                          setImportToJSON={setImportToJSONData}
-                          setPutCorrectBackground={setPutCorrectBackgroundData}
-                          setPutGreyBackground={setPutGreyBackgroundData}
-                          setPutImposssibleGrey={setPutImposssibleGreyData}
-                          putCorrectBackground={putCorrectBackground}
-                          putGreyBackground={putGreyBackgroud}
-                          putImposssibleGrey={putImposssibleGrey}
-                          handleTurn={handleTurn}
-                          lang={locale}
-                          setChangeGraph={setChangeGraphData}/>
         </div>
-        {playTurnSound && <audio src={turnSound} autoPlay />}
 
 
-        {IsSolo && (!isDaily || difficulty !== "hard") &&
+        {IsSolo &&
             <div className='nbLaps' style={{ 
                 backgroundColor: theme.colors.primary,
                 borderColor: theme.colors.secondary
             }}>
-              <FormattedMessage id='turn'/> : {cptTour}
+              Tour : {cptTour}
             </div>
         }
         
-        {(!isDaily || (isDaily && (difficulty==="easy" || difficulty==="intermediate"))) &&
+        {(!isDaily || (isDaily && isEasy)) &&
           <div className='historique' id="history-container">
               {history.map((item, index) => (
                   <div key={index}>{item}</div>
@@ -483,7 +301,7 @@ const handleBlurIndice = () => {
           </div>
         }   
 
-        <div className='paramDiv'>
+        {/* <div className='paramDiv'>
           <button className='button'
             style={{ 
                 backgroundColor: theme.colors.tertiary,
@@ -492,12 +310,11 @@ const handleBlurIndice = () => {
             onClick={handleChangeS}>
             <img src={Param} alt="paramètres" height='40'/>
           </button>
-        </div>
+        </div> */}
 
 
 
         <div className='menuGame'>
-
           <div className='resetDiv'>
             <button className='button'
               style={{ 
@@ -519,15 +336,13 @@ const handleBlurIndice = () => {
             </button>
           </div>
 
-          
-
 
 
 
           {/* <Link to='/info#indice-possible' target='_blank'> 
             //? redirection impossible apparament (securité des navigateur
           */}
-          <Link to={`${basePath}/info`} target='_blank'>
+          <Link to='/info' target='_blank'>
             <button className='button' 
               style={{ 
                 backgroundColor: theme.colors.tertiary,
@@ -536,9 +351,12 @@ const handleBlurIndice = () => {
               <img src={Info} alt="info" height="40"/>
             </button>
           </Link>
+          {/* <button className='button' onClick={() => openInNewTab('http://localhost:3000/play')}> //! avec url =={'>'} dangereux
+            <img src={Check} alt="check" height="40"/>
+          </button> */}
 
           {!IsSolo &&
-          <Link to={`${basePath}/${navdeduc}`} target='_blank'>
+          <Link to='/info' target='_blank'>
             <button className='button'
               style={{ 
                 backgroundColor: theme.colors.tertiary,
@@ -571,24 +389,27 @@ const handleBlurIndice = () => {
                 backgroundColor: theme.colors.tertiary,
                 borderColor: theme.colors.secondary
               }}>
-              <img src={Tex} alt="indice" height="40"/>
+              <img src={Download} alt="indice" height="40"/>
-            </button>
-          }
-
-          {IsSolo &&   
-            <button className='button' onClick={ () => setImportToPdfData(true)}
-              style={{ 
-                backgroundColor: theme.colors.tertiary,
-                borderColor: theme.colors.secondary
-              }}>
-              <img src={Pdf} alt="indice" height="40"/>
             </button>
           }
         </div>
 
+{/*
+        <Offcanvas show={showP} 
+                  onHide={handleCloseP}>
+          <Offcanvas.Header closeButton>
+            <Offcanvas.Title>Joueurs</Offcanvas.Title>
+            <h3>Il y a {players.length} joueurs</h3>
+          </Offcanvas.Header>
+          <Offcanvas.Body>
+
+          </Offcanvas.Body>
+        </Offcanvas>
+          */}
+
           { !IsSolo &&
             <div className='playerlistDiv'>
-              <PlayerList players={players} setPlayerTouched={handleSetPlayerTouched} playerTouched={playerTouched} playerIndex={playerIndex} askedWrong={askedWrong} greyForEveryone={() => {}}/>
+              <PlayerList players={players} setPlayerTouched={handleSetPlayerTouched} playerTouched={playerTouched} playerIndex={playerIndex} askedWrong={askedWrong}/>
             </div>
           }
 
@@ -597,11 +418,12 @@ const handleBlurIndice = () => {
                   placement='end'
                   scroll={true}
                   backdrop={false}
-                  style={{ height: '20%', width: '25%', top: '60vh' }}>
+                  style={{ height: '20%', width: '25%', top: '0' }}>
           <Offcanvas.Header closeButton>
-            <Offcanvas.Title><FormattedMessage id='indice'/></Offcanvas.Title>
+            <Offcanvas.Title>Indice</Offcanvas.Title>
           </Offcanvas.Header>
           <Offcanvas.Body>
+            {/* Possède les cheveux noir <u>ou</u> joue au basket */}
             {indice?.ToString(locale)}
           </Offcanvas.Body>
         </Offcanvas>
@@ -612,62 +434,42 @@ const handleBlurIndice = () => {
         <Offcanvas show={showS} 
                   onHide={handleCloseS} 
                   placement='top'
-                  style={{height: '80%', width: '30%', left: '70%' }}>
+                  style={{height: '30%', width: '30%', left: '70%' }}>
           <Offcanvas.Header closeButton>
-            <Offcanvas.Title><img src={Param} alt='param'/> <FormattedMessage id='param'/></Offcanvas.Title>
+            <Offcanvas.Title><img src={Param} alt='param'/> Paramètres</Offcanvas.Title>
           </Offcanvas.Header>
-          <Offcanvas.Body >
+          <Offcanvas.Body>
-            <div style={{display: "flex", justifyContent: "center", flexDirection: "column", alignItems: "center"}}>
+            <Nav className="me-auto">
-              <label style={{ display:'flex'}}>
+                <NavDropdown 
-                <Switch checked={soundPreference} onChange={handleSoundPreferenceChange}/>
+                title={<span><HiLanguage/> Language </span>}
-                <p style={{ marginLeft:'20px'}}><FormattedMessage id='sfx'/></p>
+                className="navbar-title" id="basic-nav-dropdown">
-              </label>
+                    <NavDropdown.Item onClick={() => changeLocale('fr')}> 
-
+                        <FormattedMessage id="languageSelector.french"/> 
-              {IsSolo && 
+                    </NavDropdown.Item>
-              <div className='nbNodeDiv' style={{ padding:'20px'}}>
+                    <NavDropdown.Item onClick={() => changeLocale('en')}> 
-                  <label htmlFor="numberInput"><FormattedMessage id='param.node'/> :</label>
+                        <FormattedMessage id="languageSelector.english"/> 
-                  <div>
+                    </NavDropdown.Item>
-                      <button className='valuebutton' onClick={() => { if (enteredNumber>20 && user !== null){ setEnteredNumber(enteredNumber-1); user.nbNodes = user.nbNodes-1; setHistory([]); }}}
+                </NavDropdown>
-                          style={{borderColor:theme.colors.secondary}}> - </button>
+            </Nav>
-                      <input
+
-                          // type="number"
+            <label>
-                          style={{textAlign:'center', border: 'none', width: '100px'}}
+              <Switch checked={SwitchEnabled} onChange={setSwitchEnabled}/>
-                          id="numberInput"
+              <p>Afficher les noeuds possibles</p>
-                          value={enteredNumber}
+            </label>
-                          onChange={handleNumberChange}
+
-                          onKeyDown={handleKeyDown} // Ajout de l'événement onKeyDown
-                          onBlur={handleBlur} // Ajout de l'événement onBlur
-                          />
-                      <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>}
-
-              {IsSolo && 
-              <div className='nbNodeDiv' style={{ padding:'20px'}}>
-                  <label htmlFor="numberInput"><FormattedMessage id='param.clue'/> :</label>
-                  <div>
-                      <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"
-                          style={{textAlign:'center', border: 'none', width: '100px'}}
-                          id="numberInput"
-                          value={enteredNumberIndices}
-                          onChange={handleNumberIndicesChange}
-                          onKeyDown={handleKeyDownIndice} // Ajout de l'événement onKeyDown
-                          onBlur={handleBlurIndice}/>
-                      <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>}
-              <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>
+        {/*
+        <div id="endgamebutton" > {/*  tmp 
+          <ButtonImgNav dest="/endgame" img={Leave} text='endgame'/>
+        </div>
+      */}
+        <div id="bottom-container">
+          {/* Ajout du bouton en bas à droite */}
+          <div className='bottomRightButton'>
+            <Button href='/'>Retour à l'accueil</Button>
+          </div>
+        </div>
       </div>
     );
   };

cryptide_project/src/Pages/InfoPage.tsx

@@ -1,4 +1,4 @@
-import React, {useEffect} from 'react';
+import React from 'react';
 
 /* Style */
 import '../Style/Global.css';
@@ -25,41 +25,33 @@ import MGlass from "../res/icon/magnifying-glass.png";
 import Param from "../res/icon/param.png";
 import Info from "../res/icon/infoGreen.png"; //todo changer la couleur de l'icon
 import { useAuth } from '../Contexts/AuthContext';
-import { Spinner } from 'react-bootstrap';
+import { useEffect } from 'react';
-import Reset from '../res/icon/reset.png';
-import Ceye from '../res/icon/hidden.png';
-
 
 //@ts-ignore
-function InfoPage({locale, changeLocale}) {
+function InfoPage({locale, changeLocale}) {    
     const theme = useTheme();
     const {isLoggedIn, login, user, setUserData, manager } = useAuth();
+    const styles = {
+        roux: { backgroundColor: ColorToHexa(Color.REDHEAD), width: '15px', height: '15px', display: 'inline-block', marginRight: '5px' },
+        blond: { backgroundColor: ColorToHexa(Color.BLOND), width: '15px', height: '15px', display: 'inline-block', marginRight: '5px' },
+        noir: { backgroundColor: ColorToHexa(Color.BLACK), width: '15px', height: '15px', display: 'inline-block', marginRight: '5px' },
+        blanc: { backgroundColor: ColorToHexa(Color.WHITE), border: '1px solid #ccc', width: '15px', height: '15px', display: 'inline-block', marginRight: '5px' },
+        chatain: { backgroundColor: ColorToHexa(Color.BROWN), width: '15px', height: '15px', display: 'inline-block', marginRight: '5px' },
+    };
 
     useEffect(() => {
         if (user == null){
-            console.log(user)
             manager.userService.fetchUserInformation().then(([user, loggedIn]) =>{
-                console.log(user);
                 if (user!=null){
                     if (loggedIn){
                         login()
                         setUserData(user)
                     }
-                    else{
-                        setUserData(user)
-                    }
                 }
             })
         }
     }, [isLoggedIn]);
 
-    const styles = {
-        roux: { backgroundColor: ColorToHexa(Color.REDHEAD), width: '15px', height: '15px', display: 'inline-block', marginRight: '5px' },
-        blond: { backgroundColor: ColorToHexa(Color.BLOND), width: '15px', height: '15px', display: 'inline-block', marginRight: '5px' },
-        noir: { backgroundColor: ColorToHexa(Color.BLACK), width: '15px', height: '15px', display: 'inline-block', marginRight: '5px' },
-        blanc: { backgroundColor: ColorToHexa(Color.WHITE), border: '1px solid #ccc', width: '15px', height: '15px', display: 'inline-block', marginRight: '5px' },
-        chatain: { backgroundColor: ColorToHexa(Color.BROWN), width: '15px', height: '15px', display: 'inline-block', marginRight: '5px' },
-    };
     return (
         //! Il faudra possiblement faire une gestion des mode de jeu, pour modifier les regles en fonction de ce dernier.
     <div className='infoPage'>
@@ -78,15 +70,16 @@ function InfoPage({locale, changeLocale}) {
                 <li><Link to="#composants-du-jeu"><span><FormattedMessage id="info.title.composant"/></span></Link></li>
                 <li><Link to="#objectif-du-jeu"><span><FormattedMessage id="info.title.objectif"/></span></Link></li>
                 <li><Link to="#deroulement-du-jeu"><span><FormattedMessage id="info.title.deroulement"/></span></Link></li>
-                <li><Link to="#mode-de-jeu"><span><FormattedMessage id="info.mdj"/></span></Link></li>
                 <li><Link to="#indice-possible"><span><FormattedMessage id="info.title.indice_possible"/></span></Link></li>
             </ul>
         </div>
 
         <section id="composants-du-jeu">
             <h2><FormattedMessage id="info.pions"/> :</h2>
-            <h4><FormattedMessage id="info.sommaire"/></h4>
+                <h4>
-            <h6><FormattedMessage id="info.composant.text"/></h6>
+                    <FormattedMessage id="info.sommaire"/> 
+                </h4>
+                <h6><FormattedMessage id="info.composant.text"/></h6>
             <ul>
                 <p>
                     <li><h5 className='h5title'><FormattedMessage id="info.composant.carre.title"/> : 🟪🟦🟩🟨🟥🟫</h5></li>
@@ -95,6 +88,7 @@ function InfoPage({locale, changeLocale}) {
                     <li><h5 className='h5title'><FormattedMessage id="info.composant.rond.title"/> : 🟣🔵🟢🟡🔴🟤</h5></li>
                     <FormattedMessage id="info.composant.rond"/>
                 </p>
+            </ul>
                 <hr/>
                 <h4>
                     <FormattedMessage id="info.car_perso"/>
@@ -143,7 +137,6 @@ function InfoPage({locale, changeLocale}) {
                         </ul>
                         <FormattedMessage id="info.composant.sport.bis"/>                    
                 </p>
-            </ul>
         </section>
         <hr/>
         <section id="objectif-du-jeu">
@@ -167,9 +160,9 @@ function InfoPage({locale, changeLocale}) {
             </p>
 
             <h4>
-                <FormattedMessage id="info.interface"/>
+                Interface :
             </h4>
-            <h6> <FormattedMessage id="info.interface.text"/> </h6>
+            <h6> Pour chacune des parties, vous aurez certains éléments d'interface à disposition :</h6>
             <ul>
                 <li>
                     <div className='LiInterfaceDisplay'>
@@ -182,24 +175,12 @@ function InfoPage({locale, changeLocale}) {
                             <img src={Param} alt="paramètres" height='40'/>
                         </button>
                         <p>
-                            <FormattedMessage id="info.interface.param"/>
+                            Le bouton "<b>Paramètre</b>" permet l'affichage et la gestion de différent paramètres de la partie, comme par exemple le language, l'aide ... .
                         </p>
                     </div>
-                </li>
+                    <Alert variant='danger'>
-                <li>
+                        Attention, cette partie ne peut pas être complétée tant que tout les paramètres n'ont pas été choisis !
-                <div className='LiInterfaceDisplay'>
+                    </Alert>
-                    <button className='button'
-                    style={{ 
-                        backgroundColor: theme.colors.tertiary,
-                        borderColor: theme.colors.secondary,
-                        margin:"0 20px"
-                    }}>
-                        <img src={Reset} alt="paramètres" height='40'/>                 
-                    </button>
-                    <p>
-                        <FormattedMessage id="info.interface.reset"/>
-                    </p>
-                </div>
                 </li>
                 <li>
                     <div className='LiInterfaceDisplay'>
@@ -212,7 +193,10 @@ function InfoPage({locale, changeLocale}) {
                             <img src={Info} alt="info" height="40"/>
                         </button>
                         <p>
-                            <FormattedMessage id="info.interface.info"/>
+                            Le bouton "<b>Information</b>" permet de rediriger vers la page de règle du jeu (celle ci). 
+                            {/*
+                                //! mais est ce que nous devons rediriger sur les indices possibles ?
+                            */} 
                         </p>
                     </div>
                 </li>
@@ -228,9 +212,12 @@ function InfoPage({locale, changeLocale}) {
                         </button>
                     
                         <p>
-                            <FormattedMessage id="info.interface.fiche"/>
+                            Le bouton "<b>Fiche de déduction d'indice</b>" permet l'affichage de tableau dynamic permettant, avec le déroulé de la partie, de déduire quels indices sont les plus probables.
                         </p>
                     </div>
+                    <Alert variant='danger'>
+                        Attention, cette partie ne peut pas être complétée tant que la page et l'algorithme dédié ne sont pas fait !
+                    </Alert>
                 </li>
                 <li>
                     <div className='LiInterfaceDisplay'>
@@ -244,26 +231,10 @@ function InfoPage({locale, changeLocale}) {
                     </button>
                     
                         <p>
-                            <FormattedMessage id="info.interface.indice"/>
+                            Le bouton "<b>Indice personnel</b>" est le plus important, en effet il permet d'afficher quel est votre indice secret. Vous seul le connaissais ! Il va falloir ruser pour tromper vos amis et le garder secret le plus longtemps possible !
-                        </p>
-                    </div>
-                </li>
-                <li>
-                    <div className='LiInterfaceDisplay'>
-                        <button className='button'
-                            style={{ 
-                                backgroundColor: theme.colors.tertiary,
-                                borderColor: theme.colors.secondary,
-                                margin:"0 20px"
-                            }}>
-                            <img src={Ceye} alt="check" height="40"/>
-                        </button>
-                        <p>
-                            <FormattedMessage id="info.interface.vision"/>
                         </p>
                     </div>
                 </li>
-                {/* ajouter les bouton de telechargement de graph ? */}
             </ul>
         </section>
         <hr/>
@@ -289,46 +260,6 @@ function InfoPage({locale, changeLocale}) {
             </p>
         </section>
         <hr/>
-        <section id="mode-de-jeu">
-        <h2> <FormattedMessage id="info.mdj"/> </h2>
-        <br/>
-        <p>
-            <FormattedMessage id="info.mdj.text"/>
-        </p>
-        <h3>
-            <FormattedMessage id="info.mdj.mastermind"/>
-        </h3>
-        <br/>
-        <p>
-            <FormattedMessage id="info.mdj.mastermind.text"/>
-        </p>
-        
-        <h3>
-            <FormattedMessage id="info.mdj.enigme"/>
-        </h3>
-        <p>
-            <FormattedMessage id="info.mdj.enigme.text"/>
-        </p>
-        <h4>
-            <u><FormattedMessage id="info.mdj.enigme.easy"/></u>
-        </h4>
-        <p>
-            <FormattedMessage id="info.mdj.enigme.easy.txt"/>
-        </p>
-        <h4>
-            <u><FormattedMessage id="info.mdj.enigme.medium"/></u>
-        </h4>
-        <p>
-            <FormattedMessage id="info.mdj.enigme.medium.txt"/>
-        </p>
-        <h4>
-            <u><FormattedMessage id="info.mdj.enigme.hard"/></u>
-        </h4>
-        <p>
-            <FormattedMessage id="info.mdj.enigme.hard.txt"/>
-        </p>
-        </section>
-        <hr/>
         <section id="indice-possible">
             <h2><FormattedMessage id="info.title.indice_possible"/> :</h2>
             <br/>
@@ -354,6 +285,7 @@ function InfoPage({locale, changeLocale}) {
                 <FormattedMessage id="info.indice-possible.voisin"/>
             </h4>
             <IndiceList instance={EdgesIndice} lang={locale}/>
+            <IndiceList instance={NbEdgesIndice} lang={locale}/>
             <hr/>
         </section>
     </div>

cryptide_project/src/Pages/Lobbies.css

@@ -1,46 +0,0 @@
-.lobbyMainContainer{
-    display: flex;
-    flex-direction: column;
-    
-    background-color: white;
-    
-    border: solid 1px whitesmoke;
-    border-radius: 15px;
-    box-shadow: 5px 5px 5px rgb(246, 246, 246);    
-
-    width: 300px;
-    /* max-width: 300px; */
-    /* max-width: 20%; */
-    max-height: 200px;
-
-    padding: 20px;
-    margin: 20px;
-    cursor: pointer;
-}
-
-.lobbyMainContainer:hover{
-    background-color: whitesmoke;
-}
-
-.lobbyList{
-    display: flex;
-    /* justify-content: space-around; */
-    /* columns: 4; */
-    flex-wrap: wrap;
-
-    justify-content: center;
-}
-
-.searchLobby{
-    border: solid 1px whitesmoke;
-    border-radius: 15px;
-    padding: 15px;
-
-    width: 50%;
-}
-
-
-h1{
-    margin: 50px !important;
-    font-family: "Raleway", sans-serif;
-}

cryptide_project/src/Pages/Lobbies.tsx

@@ -1,175 +0,0 @@
-import React, { useEffect, useState } from 'react';
-
-
-/* Style */
-import './Lobbies.css';
-import "../Style/Global.css"
-import { useTheme } from '../Style/ThemeContext';
-import LobbyContainer from '../Components/LobbyContainer';
-import Player from '../model/Player';
-import User from '../model/User';
-import { socket } from '../SocketConfig';
-import JSONParser from '../JSONParser';
-import Person from '../model/Person';
-import { useNavigationType } from 'react-router-dom';
-import { FormattedMessage, useIntl } from 'react-intl';
-
-class LobbyDataProps {
-    roomNum : string
-    headPlayer: Player
-    nbPlayer: number
-    started: boolean
-
-    constructor(roomNum: string, player: Player, nbPlayer: number, started: boolean){
-        this.roomNum = roomNum
-        this.headPlayer = player
-        this.nbPlayer = nbPlayer
-        this.started=started
-    }
-}
-
-let cptNavigation = 0
-
-function Lobbies() {
-    const theme=useTheme();
-
-
-    const [first, setFirst] = useState(true)
-
-    const [lobbyData, setLobbyData] = useState<LobbyDataProps[]>([])
-
-    const [searchTerm, setSearchTerm] = useState('');
-
-    const [showAvailable, setShowAvailable] = useState(true);
-
-
-    const handleShowAllClick = () => {
-        setShowAvailable(false);
-    };
-    
-    const handleShowAvailableClick = () => {
-        setShowAvailable(true);
-    };
-
-    const handleSetFirst = () => {
-        setFirst(false);
-        socket.emit("request lobbies");
-    };
-    
-    const handleSetCptNavigation = () => {
-        cptNavigation++
-
-        if (cptNavigation % 2 >= 0 && navigationType.toString() === "POP") {
-            socket.emit("player quit");
-        }
-    };
-    const filteredLobbies = lobbyData.filter((lobby) =>
-        lobby.roomNum.toLowerCase().includes(searchTerm.toLowerCase()) ||
-        lobby.headPlayer.pseudo.toLowerCase().includes(searchTerm.toLowerCase())
-    );
-
-    const filteredLobbiesToShow = showAvailable
-    ? filteredLobbies.filter((lobby) => lobby.started == false && lobby.nbPlayer < 6) //* retire les lobbies pleins ou commencés
-    : filteredLobbies;
-    
-    
-    
-    const setFirstData = (first: boolean) => {
-        setFirst(first)
-    }
-
-    const navigationType = useNavigationType();
-    
-    
-
-    handleSetCptNavigation();
-    
-    if (first){
-        handleSetFirst();
-    }
-    
-    
-    
-    useEffect(() => {
-        socket.on("request lobbies", (map) => {
-            const jsonMap = JSON.parse(map)
-            const tmpTab: LobbyDataProps[]=[]
-            
-            for(const item of jsonMap){
-                tmpTab.push(new LobbyDataProps(item.key, JSONParser.JSONToPlayer(item.value.tab[0]), item.value.tab.length, item.value.started))
-            }
-            
-            setLobbyData(tmpTab)
-        })
-    }, [])
-
-    function createLobby(){
-        socket.emit("lobby created")
-    }
-
-
-    const intl = useIntl();
-
-
-    return(
-        <div style={{display:'flex', flexDirection:'column', alignItems:'center'}}>
-            <input
-                type="text"
-                className='searchLobby'
-                placeholder={intl.formatMessage({ id: 'placeholder.searchLobby' })}
-                value={searchTerm}
-                onChange={(e) => setSearchTerm(e.target.value)}
-                style={{width:'80%', margin:'10px'}}
-            />
-            
-            <div style={{border:'solid 3px', borderColor:'lightgray', borderRadius:'20px', margin:'10px'}}>
-                <button
-                    style={{
-                        width:'120px',
-                        border:'solid',
-                        borderStyle:'none',
-                        borderRadius: '15px 0px 0px 15px',
-                        borderWidth: '2px',
-                        padding: '10px 15px',
-                        backgroundColor: !showAvailable ? 'white' : 'lightgray',
-                    }}
-                    onClick={handleShowAllClick}
-                >
-                    <FormattedMessage id='lobbies.all'/>
-                </button>
-                <button
-                    style={{
-                        width:'120px',
-                        border:'solid',
-                        borderStyle:'none',
-                        borderRadius: '0px 15px 15px 0px',
-                        padding: '10px 15px',
-                        backgroundColor: showAvailable ? 'white' : 'lightgray',
-                    }}
-                    onClick={handleShowAvailableClick}
-                >
-                    <FormattedMessage id='lobbies.dispo'/>
-                </button>
-            </div>
-
-                {filteredLobbiesToShow.length === 0 ? (
-                        <button onClick={createLobby}  className='ButtonNav' style={{backgroundColor: theme.colors.primary, borderColor: theme.colors.secondary}}><FormattedMessage id='play.create' /></button>
-                    ) : (
-                        <div className="lobbyList">
-                            {filteredLobbiesToShow.map((lobby, index) => (
-                                <LobbyContainer
-                                    key={index}
-                                    roomNum={lobby.roomNum}
-                                    HeadPlayer={lobby.headPlayer}
-                                    nbPlayer={lobby.nbPlayer}
-                                    setFirst={setFirstData}
-                                    started={lobby.started}
-                                />
-                            ))}
-                        </div>
-                )}
-        </div>
-    );
-}
-
-export default Lobbies;

cryptide_project/src/Pages/Lobby.css

@@ -41,13 +41,6 @@
     margin: 20px;
 }
 
-
-.NumbDiv{
-    display: flex;
-    align-items: start;
-    justify-content: start;
-    margin: auto 20px;
-}
 .codeDiv{
     display: flex;
     align-items: end;
@@ -55,7 +48,7 @@
     margin: auto 20px;
 }
 
-.codeDiv p, .NumbDiv p{
+.codeDiv p{
     font-style: italic;
     font-weight: bold;
     color: gray;
@@ -76,29 +69,4 @@
 
 .lobbyR *{
     margin: 20px 10px;
-}
-
-.valuebutton{
-    border-radius: 90px;
-    width: 50px;
-    height: 50px;
-    background-color: #fff;
-}
-
-.nbNodeDiv{
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-
-    border: solid 2px whitesmoke;
-    border-radius: 15px;
-    
-    background-color: white;
-
-    width: 70%;
-}
-
-.nbNodeDiv div {
-    display: flex;
-    justify-content: center;
 }

cryptide_project/src/Pages/Lobby.tsx

@@ -42,23 +42,20 @@ import { socket } from "../SocketConfig";
 import { random } from 'lodash';
 import SessionService from '../services/SessionService';
 
+
 import { useRef } from 'react';
 import Button from 'react-bootstrap/Button';
 import Overlay from 'react-bootstrap/Overlay';
-import { DataSet } from 'vis-network';
-import {basePath} from "../AdressSetup"
-
-import { FormattedMessage } from 'react-intl';
 
 
 let gameStarted = false
-let firstLaunch = true
 
 function Lobby() {
     const theme=useTheme();
     const navigate = useNavigate();
     
-    const { indices, setIndicesData, setGameStartData, indice, setIndiceData, person, setPersonData, personNetwork, setPersonNetworkData, players, setPlayersData, setActualPlayerIndexData, setTurnPlayerIndexData, setRoomData, setNodesData } = useGame();
+
+    const { indices, setIndicesData, indice, setIndiceData, person, setPersonData, personNetwork, setPersonNetworkData, players, setPlayersData, setActualPlayerIndexData, setTurnPlayerIndexData, setRoomData } = useGame();
     
     const {user, setUserData, manager, login} = useAuth()
     let first = true
@@ -67,23 +64,10 @@ function Lobby() {
     const room = params.get('room');
 
     function addBot(){
-        let json = require("../res/botNames.json")
+        socket.emit("lobby joined", room, new EasyBot("botId" + Math.floor(Math.random() * 1000), "Bot" + Math.floor(Math.random() * 100), "").toJson())
-        const tabNames = [...json.names]
-        let name = tabNames[Math.floor(Math.random() * tabNames.length)]
-        while (players.find((p) => p.pseudo === name) != undefined){
-            name = tabNames[Math.floor(Math.random() * tabNames.length)]
-        }
-        socket.emit("lobby joined", room, new EasyBot(name, name, "").toJson())
     }
 
-    //* nb Node
+    
-    const [enteredNumber, setEnteredNumber] = useState(25);
-
-    //@ts-ignore
-    const handleNumberChange = (event) => {
-        const newNumber = Math.max(20, Math.min(60, parseInt(event.target.value, 10)));
-        setEnteredNumber(newNumber);
-    };
 
     useEffect(() => {
         if (first){
@@ -139,75 +123,25 @@ function Lobby() {
         setPersonData(choosenOne)
         setPersonNetworkData(network)
         setIndicesData(choosenIndices)
-        setGameStartData(true)
         first = true
         gameStarted = true
-        //socket.off("player left")
+        socket.off("player left")
-        //socket.off("new player")
+        socket.off("new player")
-        navigate(`${basePath}/game?solo=false&daily=false`);
+        navigate('/game?solo=false&daily=false');
-    });
-
-
-    socket.on("join during game", (jsonNetwork, jsonPersonString, jsonIndicesString, playerIndex, players, nodes)=> {
-        const jsonPerson = JSON.parse(jsonPersonString)
-        const networkPerson: PersonNetwork = JSONParser.JSONToNetwork(jsonNetwork)
-        const choosenOne: Person = networkPerson.getPersons().filter((i) => i.getId() == jsonPerson.id)[0]
-        const choosenIndices : Indice[] = JSONParser.JSONToIndices(jsonIndicesString)
-        for (let i=0; i<players.length; i++){
-            const player = players[i]
-            if(player.id == socket.id){
-                setActualPlayerIndexData(i)
-                setIndiceData(choosenIndices[i])
-            }
-            if (player instanceof Bot){
-                player.indice = choosenIndices[i]
-            }
-        }
-        const tmpPlayers: Player[] = []
-        console.log(players)
-        for (const p of players){
-            tmpPlayers.push(JSONParser.JSONToPlayer(p))
-        }
-        setPlayersData(tmpPlayers)
-        if (room != null){
-            setRoomData(room)
-        }
-        const tab = JSONParser.JSONToNodePersons(JSON.parse(nodes))
-        setNodesData(tab)
-        setTurnPlayerIndexData(playerIndex)
-        setPersonData(choosenOne)
-        setPersonNetworkData(networkPerson)
-        setIndicesData(choosenIndices)
-        setGameStartData(true)
-        first = true
-        gameStarted = true
-        navigate(`${basePath}/game?solo=false&daily=false`)
     });
 
     socket.on("new player", (tab) =>{
         const tmpTab: Player[] = []
-        for (const p of tab.tab){
+        for (const p of tab){
             tmpTab.push(JSONParser.JSONToPlayer(p))
         }
-        setPlayersData(tmpTab);
+        console.log(tmpTab)
-
+        setPlayersData(tmpTab)
-    });
-
-    socket.on("room full", () => {
-        navigate(`${basePath}/`)
-    })
-
-    socket.on("game started", () => {
-        navigate(`${basePath}/`)
-    })
-
-    socket.on("game already started", () => {
-        navigate(`${basePath}/`)
     })
 
     socket.on("player left", (tab, i) => {
         const tmpTab: Player[] = []
-        for (const p of tab.tab){
+        for (const p of tab){
             tmpTab.push(JSONParser.JSONToPlayer(p))
         }
         setPlayersData(tmpTab)
@@ -217,25 +151,25 @@ function Lobby() {
 
 
     function StartGame(){
-        if (players.length > 2){
+        const [networkPerson, choosenPerson, choosenIndices] = GameCreator.CreateGame(players.length, 30)
-            const [networkPerson, choosenPerson, choosenIndices] = GameCreator.CreateGame(players.length, enteredNumber)
+        setPersonData(choosenPerson)
-            setPersonData(choosenPerson)
+        setPersonNetworkData(networkPerson)
-            setPersonNetworkData(networkPerson)
+        setIndicesData(choosenIndices)
-            setIndicesData(choosenIndices)
+        let users = players.filter((p) => p instanceof User)
-            let users = players.filter((p) => p instanceof User)
+        let u = users[Math.floor(Math.random() * users.length)]
-            let u = users[Math.floor(Math.random() * users.length)]
+        let start = players.findIndex((p) => p.id == u.id)
-            let start = players.findIndex((p) => p.id == u.id)
+        if (start == -1){
-            if (start == -1){
+            start = 0
-                start = 0
-            }
-            socket.emit('network created', JSON.stringify(networkPerson, null, 2), JSON.stringify(choosenPerson), JSON.stringify(choosenIndices), room, start);
         }
+        socket.emit('network created', JSON.stringify(networkPerson, null, 2), JSON.stringify(choosenPerson), JSON.stringify(choosenIndices), room, start);
     }
 
+
+
     const copyGameLink = () => {
         setShow(!show)
         
-        const gameLink = basePath + "/lobby?room="+ room;
+        const gameLink = "http://localhost:3000/lobby?room="+ room;
         navigator.clipboard.writeText(gameLink)
             .then(() => {
                 console.log('Lien copié avec succès !');
@@ -246,7 +180,7 @@ function Lobby() {
     };
 
     const textAreaRef = useRef<HTMLTextAreaElement>(null);
-    const linkToCopy = basePath + "/lobby?room="+ room
+    const linkToCopy = "http://localhost:3000/lobby?room="+ room
     const handleCopyClick = () => {
         setShow(!show)
         if(textAreaRef.current != null){
@@ -259,36 +193,26 @@ function Lobby() {
 
     const [show, setShow] = useState(false);
         const target = useRef(null);
+
     return (
         <div className='lobby-container'>
             <div className='left-part'>
                 <div className='player-board'>
-                    <div>
+                    <div className='codeDiv' onClick={() => setCodeShowed(!codeShowed)}>
-                        <div className='codeDiv' onClick={() => setCodeShowed(!codeShowed)}>
+                        {
-                            {
+                            codeShowed ? (
-                                codeShowed ? (
+                                <p>Room : {room}</p>
-                                    <p>Room : {room}</p>
+                            ) : (
-                                ) : (
+                                <p>Room : ******</p>
-                                    <p>Room : ******</p>
+                            )
-                                )
+                        }
-                            }
-                        </div>
-                        <div className='NumbDiv'>
-                            {players.length == 6 ? (
-                                    <p style={{color:'darkred'}}>6/6 <FormattedMessage id='lobby.players'/></p>
-                                ) : (
-                                    <p>{players.length}/6 <FormattedMessage id='lobby.players'/></p>
-                                )
-                            }
-                        </div>
                     </div>
-
                     {/* //! voir pour la gestion avec un liste, utilisateur avec le "+ (vous)" et les pdp avec les lettres grecs (?)*/}
                     {players.map((player, index) => (
                         // <PlayerItemList key={player.id} pdp={PersonImg} name={player.name} id={player.id}/>
                         <PlayerItemList key={player.id} player={player} room={room}/>
                     ))}
-                    {(players.length < 6) && <div className='centerButton'>
+                    <div className='centerButton'>
                             <button className='button' onClick={addBot}
                                 style={{
                                     backgroundColor: theme.colors.primary,
@@ -296,22 +220,54 @@ function Lobby() {
                                 +
                             </button>
                     </div>
-                    }
                 </div>
             </div>
 
             <div className="lobby-vertical-divider" style={{backgroundColor: theme.colors.secondary}}></div>
 
             <div className='right-part'>
+                {/* <div className='title-param-div'>
+                    <img src={param} alt="param"/>
+                    <h2>Paramètre de la partie</h2>
+                </div>
+                <ul> */}
+                    {/* <li><h4> Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed non risus. Suspendisse lectus tortor, dignissim sit amet, adipiscing nec, ultricies sed, dolor. Cras elementum ultrices diam. Maecenas ligula massa, varius a, semper congue, euismod non, mi. Proin porttitor, orci nec nonummy molestie, enim est eleifend mi, non fermentum diam nisl sit amet erat. Duis semper. Duis arcu massa, scelerisque vitae, consequat in, pretium a, enim</h4></li>
+                    <li><h4>paramètre super important pour la partie</h4></li>
+                    <li><h4>paramètre super important pour la partie</h4></li>
+                    <li><h4>paramètre super important pour la partie</h4></li>
+                    <li><h4>Niveau des bots : Facile </h4></li>
+                    <li><h4>Thèmes : basique </h4></li> */}
+                    {
+                        //? mettre un timer pour chaques personne ?
+                        //? indice avancé ? ==> négation, voisin du 2e degré etc.
+                    }
+                {/* </ul> */}
+                {/* <center >
+                    <button className='buttonNabImg' onClick={StartGame}>
+                        <img src={cible} alt="Button Image" height="50" width="50" />
+                        <p>{"la chasse !"}</p>
+                    </button>
+                </center> */}
+
                 <div className='lobbyR' 
                     style={{flexDirection:'column',
                             alignItems:'space-around'}}>
-                        <h3><FormattedMessage id='lobby.bienvenue'/></h3>
+                        <h3>Bienvenue dans votre lobby !</h3>
-                        <p><FormattedMessage id='lobby.wait'/></p>
+                        <p>Attendez que tous vos amis rejoignent avant de lancer la partie.</p>
                         {/* Bouton pour copier le lien */}
                         {/* <Button variant="primary" ref={target} onClick={copyGameLink}>
-                            <FormattedMessage id='lobby.invite'/>
+                            Inviter des amis
                         </Button> */}
+                        <div>
+                            <textarea
+                                ref={textAreaRef}
+                                readOnly
+                                value={linkToCopy}
+                                style={{ position: 'absolute', left: '-9999px' }}
+                            />
+                            <Button onClick={handleCopyClick}>Inviter des amis</Button>
+                        </div>
+
                         <Overlay target={target.current} show={show} placement="top">
                             {({
                             placement: _placement,
@@ -332,31 +288,11 @@ function Lobby() {
                                 ...props.style,
                                 }}
                             >
-                            <FormattedMessage id='lobby.copyLink'/>
+                            Lien copié
                         </div>
                         )}
                     </Overlay>
 
-                <div className='nbNodeDiv'>
-                    <label htmlFor="numberInput"> <FormattedMessage id='lobby.nbNode'/> :</label>
-                    <div>
-                        <button className='valuebutton' onClick={() => { if (enteredNumber>20) setEnteredNumber(enteredNumber-1)}}
-                            style={{borderColor:theme.colors.secondary}}> - </button>
-                        <input
-                            // type="number"
-                            style={{textAlign:'center'}}
-                            id="numberInput"
-                            disabled
-                            value={enteredNumber}
-                            onChange={handleNumberChange}
-                            min={20}
-                            max={60}/>
-                        <button className='valuebutton' onClick={() => { if (enteredNumber<50) setEnteredNumber(enteredNumber+1)}}
-                            style={{borderColor:theme.colors.secondary}}> + </button>
-                    </div>
-                </div>
-
-
                     <button className='button' onClick={StartGame}
                         style={{ 
                             backgroundColor: theme.colors.tertiary,
@@ -364,7 +300,7 @@ function Lobby() {
                             width: 'auto',
                             height: 'auto'
                         }}>
-                        <FormattedMessage id='lobby.start'/>
+                        Démarrer la partie !
                     </button>
                 </div>
             </div>

cryptide_project/src/Pages/LoginForm.tsx

@@ -4,23 +4,22 @@ import { useNavigate } from 'react-router-dom';
 import { useAuth } from '../Contexts/AuthContext'; 
 import AuthService from '../services/AuthService';
 import '../Style/Global.css';
-import { Link } from 'react-router-dom';
-import {basePath} from "../AdressSetup"
-
 
 const SignIn = () => {
     const navigate = useNavigate();
+    const { login } = useAuth(); 
+
     const [error, setError] = useState<string | null>(null);
-    const {login} = useAuth();
     const [showConfirmation, setShowConfirmation] = useState(false);
-    
+
     const handleSubmit = async (event: React.FormEvent) => {
         event.preventDefault();
     
         try {
             const data = {
                 pseudo: (event.target as any).pseudo.value,
-                password: (event.target as any).password.value
+                password: (event.target as any).password.value,
+                remember: (event.target as any).remember.checked
             };
 
             const validation = await AuthService.validateSignIn(data);
@@ -32,12 +31,12 @@ const SignIn = () => {
 
                 const result = await AuthService.signIn(data);
                 
-                console.log(result);
+                // console.log(result);
 
                 setShowConfirmation(true);
                 setTimeout(async () => {
                     await login();
-                    navigate(`${basePath}/`);
+                    navigate('/');         // 3 secondes avant de rediriger vers la page de connexion
                 }, 1250);
             }
         } catch (error: any) {
@@ -74,13 +73,26 @@ const SignIn = () => {
                         placeholder="Entrez votre mot de passe ici"
                     />
                 </div>
+                <div className="mb-3">
+                    <div className="custom-control custom-checkbox">
+                        <input
+                            type="checkbox"
+                            name='remember'
+                            className="custom-control-input"
+                            id="customCheck1"
+                        />
+                        <label className="custom-control-label" htmlFor="customCheck1">
+                            Se souvenir de moi
+                        </label>
+                    </div>
+                </div>
                 <div className="d-grid">
                     <button type="submit" className="btn btn-primary">
                         Soumettre <AiOutlineSend/>
                     </button>
                 </div>
                 <p className="forgot-password text-right">
-                    <Link to={`${basePath}/signup`}>Pas encore inscrit ?</Link>
+                    <a href="#">Mot de passe</a> oublié ?
                 </p>
             </form>
 
@@ -91,8 +103,8 @@ const SignIn = () => {
             )}
 
             {showConfirmation && (
-                <div className="alert alert-success" role="alert">
+                <div className="alert alert-success text-center" role="alert">
-                    Connexion réussie ! Vous serez redirigé vers votre profil.
+                    Connexion réussie ! Vous allez être redirigé vers la page principale.
                 </div>
             )}
         </div>

cryptide_project/src/Pages/NewPlay.tsx

@@ -1,270 +0,0 @@
-import React, { useEffect, useRef, useState } from 'react';
-
-/* Context */
-import { useAuth } from '../Contexts/AuthContext';
-/* Style */
-import './Play.css';
-import { useTheme } from '../Style/ThemeContext';
-
-/* Component */
-import ButtonImgNav from "../Components/ButtonImgNav";
-
-/* Img */
-/* Icon */
-import { socket } from '../SocketConfig';
-import { NavigationType, useNavigate, useNavigationType } from 'react-router-dom';
-import GameCreator from '../model/GameCreator';
-import { useGame } from '../Contexts/GameContext';
-import ScoreBoard from '../Components/ScoreBoard';
-
-import defaultImg from "../res/img/Person.png"
-
-/* Types */
-import User from '../model/User';
-import EnigmeDuJourCreator from '../model/EnigmeDuJourCreator';
-import Stub from '../model/Stub';
-
-import SessionService from '../services/SessionService';
-import { loadImageAsync } from '../ImageHelper';
-import { Overlay, ToggleButton, ToggleButtonGroup } from 'react-bootstrap';
-import Button from 'react-bootstrap/Button';
-import ButtonGroup from 'react-bootstrap/ButtonGroup';
-import Lobbies from './Lobbies';
-import {basePath} from "../AdressSetup"
-import { FormattedMessage } from 'react-intl';
-
-
-
-let cptNavigation = 0
-
-
-function NewPlay() {
-    let first = true
-
-    const theme=useTheme()
-    const {isLoggedIn, login, user, setUserData, manager } = useAuth();
-    const {setDailyEnigmeData, setIndicesData, setPersonData, setPersonNetworkData, setGameStartData } = useGame()
-
-    const target = useRef(null);
-
-    const navigationType = useNavigationType()
-    cptNavigation++
-    if (cptNavigation % 2 == 0){
-        if (navigationType.toString() == "POP"){
-            first=true
-            socket.emit("player quit")
-        }
-    }
-
-    useEffect(() => {
-        if (user == null){
-            manager.userService.fetchUserInformation().then(([user, loggedIn]) =>{
-                if (user!=null){
-                    if (loggedIn){
-                        login()
-                        setUserData(user)
-                        socket.emit("join back game", user)
-                    }
-                    else{
-                        loadImageAsync(defaultImg).then((blob) => {
-                            user.profilePicture=blob
-                            setUserData(user)
-                        })
-                    }
-                }
-            })
-        }
-        else{
-            socket.emit("join back game", user)
-        }
-    }, [isLoggedIn]);
-
-    const [goBackRoom, setGoBackRoom] = useState(-1)
-
-    useEffect(() => {
-        socket.on("join back game", (room) => {
-            setGoBackRoom(room)
-        })
-    }, [])
-
-
-    const [room, setRoom] = useState(null);
-    const navigate = useNavigate();
-
-    function createLobby(){
-        socket.emit("lobby created")
-    }
-
-    function launchMastermind(){
-        const [networkPerson, choosenPerson, choosenIndices] = GameCreator.CreateGame(user?.nbIndices || 3, user?.nbNodes || 25)
-        setPersonData(choosenPerson)
-        setPersonNetworkData(networkPerson)
-        setIndicesData(choosenIndices)
-        setIndicesData(choosenIndices)
-        setGameStartData(true)
-        navigate(`${basePath}/game?solo=true&daily=false`);
-    }
-
-    
-    function launchEngimeJour(){
-        //* overlay
-        
-        if (!showOverlay)setShowOverlay(true)
-        else setShowOverlay(true)
-
-    }
-
-    function launchTuto(){
-        navigate(`${basePath}/tutorial`);
-    }
-    
-
-    useEffect(() => {
-        const handleLobbyCreated = (newRoom: any) => {
-            setRoom(newRoom);
-        };
-    
-        // Ajouter l'event listener
-        socket.on('lobby created', handleLobbyCreated);
-    
-        // Nettoyer l'event listener lors du démontage du composant
-        return () => {
-            socket.off('lobby created', handleLobbyCreated);
-        };
-        
-      }, []);  // Aucune dépendance ici
-
-    useEffect(() => {
-        if (room !== null) {
-            const nouvelleURL = `/lobby?room=${room}`;
-            navigate(`${basePath}${nouvelleURL}`)
-        }
-    }, [room, navigate]);
-
-    const goBack = () => {
-        navigate(`${basePath}/lobby?room=${goBackRoom}`)
-    }
-
-
-
-    const [showOverlay, setShowOverlay] = useState(false);
-    const [selectedDifficulty, setSelectedDifficulty] = useState(null);
-
-    //@ts-ignore
-    const handleDifficultyChange = (value) => {
-        setSelectedDifficulty(value);
-    };
-
-    const handleStartEasyGame = () => {
-
-        //* Mode facile 
-        //todo différencier les deux
-        const [networkPerson, choosenPerson, choosenIndices] = GameCreator.CreateGame(user?.nbIndices || 3, user?.nbNodes || 25)
-        setPersonData(choosenPerson)
-        setPersonNetworkData(networkPerson)
-        setIndicesData(choosenIndices)
-        setIndicesData(choosenIndices)
-        setGameStartData(true)
-        navigate(`${basePath}/game?solo=true&daily=true&difficulty=easy`);
-        setShowOverlay(false);
-    };
-
-    const handleStartMediumGame = () => {
-
-        //* Mode facile 
-        //todo différencier les deux
-        const [networkPerson, choosenPerson, choosenIndices] = GameCreator.CreateGame(user?.nbIndices || 3, user?.nbNodes || 25)
-        setPersonData(choosenPerson)
-        setPersonNetworkData(networkPerson)
-        setIndicesData(choosenIndices)
-        setGameStartData(true)
-
-
-        navigate(`${basePath}/game?solo=true&daily=true&difficulty=intermediate`);
-        if (first){
-            first = false
-            const map = EnigmeDuJourCreator.createEnigme(networkPerson, choosenIndices, choosenPerson, Stub.GenerateIndice())
-            setDailyEnigmeData(map)
-        }
-        setShowOverlay(false);
-    };
-
-    const handleStartHardGame = () => {
-        //* Mode difficile
-
-        //todo différencier les deux
-        const [networkPerson, choosenPerson, choosenIndices] = GameCreator.CreateGame(user?.nbIndices || 3, user?.nbNodes || 25)
-        setPersonData(choosenPerson)
-        setPersonNetworkData(networkPerson)
-        setIndicesData(choosenIndices)
-        setGameStartData(true)
-        if (first){
-            first = false
-            const map = EnigmeDuJourCreator.createEnigme(networkPerson, choosenIndices, choosenPerson, Stub.GenerateIndice())
-            setDailyEnigmeData(map)
-        }
-        navigate(`${basePath}/game?solo=true&daily=true&difficulty=hard`);
-        setShowOverlay(false);
-    };
-
-
-
-    // if (goBackRoom != -1){
-    //     var returnVisibility = "visible"
-    // }
-    // else{
-    //     var returnVisibility = "hidden"
-    // }
-
-    // const returnVisibility: Visibility = goBackRoom !== -1 ? "visible" : "hidden";
-
-    const returnVisibility = goBackRoom !== -1 ?  "block" : "none" ;
-
-    return (
-
-        <div className="MainContainer">
-            <div className="leftContainer">
-                {/* Boutons pour jouer */}
-                <div className='NewbuttonGroupVertical'>
-                    <button onClick={launchMastermind} className="ButtonNav" style={{backgroundColor: theme.colors.primary, borderColor: theme.colors.secondary}}> <FormattedMessage id="play.jouerseul"/> </button>
-                    <button ref={target} onClick={launchEngimeJour} className="ButtonNav" style={{backgroundColor: theme.colors.primary, borderColor: theme.colors.secondary}}> <FormattedMessage id="play.enigme"/> </button>
-                    <Overlay show={showOverlay} target={target.current} placement="bottom" rootClose={true} rootCloseEvent='click' onHide={() => setShowOverlay(false)}>
-                        {({ placement, arrowProps, show: _show, popper, ...props }) => (
-                            <div
-                                {...props}
-                                style={{
-                                    backgroundColor: theme.colors.secondary,
-                                    padding: '2px 10px',
-                                    borderRadius: 3,
-                                    ...props.style,
-                                }}>
-
-                                <ButtonGroup aria-label="difficulty">
-                                    <Button onClick={handleStartEasyGame}><FormattedMessage id='play.enigme.easy'/></Button>
-                                    <Button onClick={handleStartMediumGame}><FormattedMessage id='play.enigme.medium'/></Button>
-                                    <Button onClick={handleStartHardGame}><FormattedMessage id='play.enigme.hard'/></Button>
-                                </ButtonGroup>
-                            </div>
-                        )}
-                    </Overlay>
-
-                    <button onClick={createLobby} className="ButtonNav" style={{backgroundColor: theme.colors.primary, borderColor: theme.colors.secondary}}> <FormattedMessage id='play.create'/> </button>
-                    <button onClick={launchTuto} className="ButtonNav" style={{backgroundColor: theme.colors.primary, borderColor: theme.colors.secondary}}> <FormattedMessage id='play.tuto'/> </button>
-                    <button onClick={goBack} className="ButtonNavRejoin" style={{ display:returnVisibility}}><FormattedMessage id='play.return'/> </button>
-
-                </div>
-            
-                {/* Lobbies */}
-                <div style={{border:'solid 1px lightgray', borderRadius:'15px', marginTop:'20px', minHeight:'400px'}}>
-                    <Lobbies/>
-                </div>
-            </div>
-
-            <div className='rightContainer'>
-                {user && <ScoreBoard Player={user}/>}
-            </div>        
-        </div>
-    );
-}
-
-export default NewPlay;

cryptide_project/src/Pages/Play.css

@@ -1,16 +1,17 @@
-.MainContainer {
+
+.MainContainer{
+    flex: 1 1 0;
     display: flex;
     flex-direction: row;
-    justify-content: center;
+    justify-content:space-around
-    align-items: center;
-    height: 100%;
 }
 
-.MidContainer {
+.MidContainer{
     display: flex;
-    justify-content: center;
+    /* justify-content:center; */
-    align-items: center;
+    align-items:center;
     flex-direction: column;
+
     margin-top: 15px;
     width: 30%;
 }
@@ -19,81 +20,68 @@
     display: flex;
     justify-content: center;
 }
+/* 
+.MidContainer div {
+    display: flex;
+    justify-content: center;
+    flex-direction: column;
+} */
 
-.leftContainer {
+.leftContainer{
-    height: 100%;
+    width: 30%;
-    margin: 20px 30px;
-    width: 70%;
 }
 
-.rightContainer {
+.rightContainer{
-    height: 100%;
-    margin: 20px 30px;
     width: 30%;
 }
 
-.NewleftContainer {
-    margin: 20px 30px;
-    width: 70%;
-}
 
-.NewrightContainer {
+
+/* .textBoard div{
     display: flex;
-    flex-direction: column;
+    flex-direction:column-reverse;
-    justify-content: center;
+    justify-content:space-between
-    align-items: center;
+} */
-    width: 30%;
-}
 
-.buttonGroupVertical {
+/* .textBoard div:nth-child(2){
     display: flex;
-    justify-content: center;
+    justify-content: end;
-    align-items: center;
+} */
-    flex-direction: column;
-}
 
-.NewbuttonGroupVertical {
+/**Button**/
+.buttonGroupVertical{
     display: flex;
-    flex-direction: row;
+    justify-content:center;
-    justify-content: space-evenly;
+    align-items:center;
+    flex-direction: column;
 }
 
-.ButtonNav {
+.ButtonNav{
-    margin: 15px 10px;
+    margin: 15px 0;
-    width: 200px;
+    width:200px;
     height: 8vh;
-    color: white;
-    border: 2px solid #0056b3;
-    border-radius: 15px;
-    font-size: larger;
-}
 
-.ButtonNavRejoin {
+    /* background-color: #85C9C2;
-    margin: 15px 10px;
+    color: #2A4541; */
-    width: 200px;
-    height: 8vh;
     color: white;
-    background-color: aquamarine;
+
-    border: 2px solid #0056b3;
+    border: solid;
     border-radius: 15px;
-    font-size: larger;
+    border-width: 2px;
+
+    font-size:larger;
 }
 
-.returnDiv {
+.guestDisplay{
     display: flex;
-    flex-direction: column;
     justify-content: center;
     align-items: center;
-    margin: 40px 15px;
+    /* flex-direction: column; */
-    border: 2px solid whitesmoke;
+
+    margin: 20px;
+    padding: 15px;
+    border: solid 1px whitesmoke;
     border-radius: 15px;
+    
     background-color: white;
-}
+}
-
-.returnDiv p {
-    margin: 15px;
-    padding: 10px;
-    border: 1px solid whitesmoke;
-    border-radius: 10px;
-    font-weight: 500;
-}

cryptide_project/src/Pages/Play.tsx

@@ -2,6 +2,7 @@ import React, { useEffect, useRef, useState } from 'react';
 
 /* Context */
 import { useAuth } from '../Contexts/AuthContext';
+
 /* Style */
 import './Play.css';
 import { useTheme } from '../Style/ThemeContext';
@@ -12,7 +13,7 @@ import ButtonImgNav from "../Components/ButtonImgNav";
 /* Img */
 /* Icon */
 import { socket } from '../SocketConfig';
-import { NavigationType, useNavigate, useNavigationType } from 'react-router-dom';
+import { useNavigate } from 'react-router-dom';
 import GameCreator from '../model/GameCreator';
 import { useGame } from '../Contexts/GameContext';
 import ScoreBoard from '../Components/ScoreBoard';
@@ -20,19 +21,18 @@ import ScoreBoard from '../Components/ScoreBoard';
 import defaultImg from "../res/img/Person.png"
 
 /* Types */
+import User from '../model/User';
 import EnigmeDuJourCreator from '../model/EnigmeDuJourCreator';
 import Stub from '../model/Stub';
 
 import SessionService from '../services/SessionService';
 import { loadImageAsync } from '../ImageHelper';
+
+
 import { Overlay, ToggleButton, ToggleButtonGroup } from 'react-bootstrap';
+
 import Button from 'react-bootstrap/Button';
 import ButtonGroup from 'react-bootstrap/ButtonGroup';
-import Info from '../res/icon/infoGreen.png';
-
-import {basePath} from "../AdressSetup"
-
-let cptNavigation = 0
 
 
 function Play() {
@@ -40,29 +40,66 @@ function Play() {
 
     const theme=useTheme()
     const {isLoggedIn, login, user, setUserData, manager } = useAuth();
-    const {setDailyEnigmeData, setIndicesData, setPersonData, setPersonNetworkData } = useGame()
+    const {setDailyEnigmeData} = useGame()
+
     const target = useRef(null);
 
-    const navigationType = useNavigationType()
+
-    cptNavigation++
+    useEffect(() => {
-    if (cptNavigation % 2 == 0){
+        const fetchUserInformation = async () => {
-        if (navigationType.toString() == "POP"){
+            try {
-            socket.emit("player quit")
+                const sessionData = await SessionService.getSession();
-        }
+                
-    }
+                // Vérifie si il y a une session
+                if (sessionData.user) {
+                    // Il y a une session on récupère les infos du joueur
+                    const updatedPlayer: User = new User(socket.id, sessionData.user.pseudo, sessionData.user.profilePicture, {
+                        nbGames: sessionData.user.soloStats.nbGames,
+                        bestScore: sessionData.user.soloStats.bestScore,
+                        avgNbTry: sessionData.user.soloStats.avgNbTry,
+                    },
+                    {
+                        nbGames: sessionData.user.onlineStats.nbGames,
+                        nbWins: sessionData.user.onlineStats.nbWins,
+                        ratio: sessionData.user.onlineStats.ratio,
+                    })
+                    login();
+                    setUserData(updatedPlayer);
+                } else {
+                    // Pas de session on génère un guest random
+                    const guestPlayer: User = new User(socket.id, 'Guest_' + Math.floor(Math.random() * 1000000), '',
+                    {
+                        nbGames: 0,
+                        bestScore: 0,
+                        avgNbTry: 0,
+                    },
+                    {
+                        nbGames: 0,
+                        nbWins: 0,
+                        ratio: 0,
+                    })
+                    setUserData(guestPlayer);
+                }
+            } catch (error) {
+                console.error(error);
+            }
+        };
+
+        fetchUserInformation();
+    }, [isLoggedIn]);
 
 
+    const { setIndicesData, setPersonData, setPersonNetworkData } = useGame();
+
 
     useEffect(() => {
+
         if (user == null){
             manager.userService.fetchUserInformation().then(([user, loggedIn]) =>{
-                console.log(user);
-                
                 if (user!=null){
                     if (loggedIn){
                         login()
                         setUserData(user)
-                        socket.emit("join back game", user)
                     }
                     else{
                         loadImageAsync(defaultImg).then((blob) => {
@@ -73,20 +110,8 @@ function Play() {
                 }
             })
         }
-        else{
-            socket.emit("join back game", user)
-        }
     }, [isLoggedIn]);
 
-    const [goBackRoom, setGoBackRoom] = useState(-1)
-
-    useEffect(() => {
-        socket.on("join back game", (room) => {
-            setGoBackRoom(room)
-        })
-    }, [])
-
-
     const [room, setRoom] = useState(null);
     const navigate = useNavigate();
 
@@ -94,13 +119,15 @@ function Play() {
         socket.emit("lobby created")
     }
 
+
     function launchMastermind(){
         const [networkPerson, choosenPerson, choosenIndices] = GameCreator.CreateGame(3, 30)
         setPersonData(choosenPerson)
         setPersonNetworkData(networkPerson)
+        console.log(networkPerson)
         setIndicesData(choosenIndices)
         setIndicesData(choosenIndices)
-        navigate(`${basePath}/game?solo=true&daily=false`);
+        navigate('/game?solo=true&daily=false');
     }
 
     
@@ -131,14 +158,10 @@ function Play() {
     useEffect(() => {
         if (room !== null) {
             const nouvelleURL = `/lobby?room=${room}`;
-            navigate(`${basePath}${nouvelleURL}`);
+            navigate(nouvelleURL);
         }
     }, [room, navigate]);
 
-    const goBack = () => {
-        navigate(`${basePath}/lobby?room=${goBackRoom}`)
-    }
-
 
 
     const [showOverlay, setShowOverlay] = useState(false);
@@ -157,9 +180,7 @@ function Play() {
         setPersonData(choosenPerson)
         setPersonNetworkData(networkPerson)
         setIndicesData(choosenIndices)
-        setIndicesData(choosenIndices)
+        navigate('/game?solo=true&daily=true&easy=true');
-
-        navigate(`${basePath}/game?solo=true&daily=true&easy=true`);
         setShowOverlay(false);
     };
 
@@ -171,13 +192,12 @@ function Play() {
         setPersonData(choosenPerson)
         setPersonNetworkData(networkPerson)
         setIndicesData(choosenIndices)
-        setIndicesData(choosenIndices)
         if (first){
             first = false
             const map = EnigmeDuJourCreator.createEnigme(networkPerson, choosenIndices, choosenPerson, Stub.GenerateIndice())
             setDailyEnigmeData(map)
         }
-        navigate(`${basePath}/game?solo=true&daily=true&easy=false`);
+        navigate('/game?solo=true&daily=true&easy=false');
         setShowOverlay(false);
     };
 
@@ -186,22 +206,10 @@ function Play() {
 
         <div className="MainContainer">
             <div className="leftContainer">
-                {goBackRoom != -1 && 
+                {/* <button className='ButtonNav'>
-                    <div className='returnDiv'>
+                    Param
-                        <div style={{
+                </button> */}
-                            display:'flex',
+                {/* <ButtonImgNav dest='/signup' img={defaultImg} text="Gestion du compte"/> */}
-                            alignItems:'center'
-                        }}>
-                            <img src={Info} alt='info' height='50px' width='50px'/>
-                            <h1>Information</h1>
-                        </div>
-                        <p> Il semblerait que vous avez quitté une partie en cours... <br/> <i>Et si nous y retournions ?</i></p>
-                        <button onClick={goBack} className="ButtonNav" 
-                            style={{backgroundColor: theme.colors.primary, borderColor: theme.colors.secondary}}>
-                            Retourner à la partie
-                        </button>
-                    </div>
-                }
             </div>
             <div className="MidContainer">
                 <div>
@@ -240,7 +248,8 @@ function Play() {
 
 
                     <button onClick={createLobby} className="ButtonNav" style={{backgroundColor: theme.colors.primary, borderColor: theme.colors.secondary}}> Créer une partie </button>
-                    <button onClick= {() => navigate(`${basePath}/join`)} className="ButtonNav" style={{backgroundColor: theme.colors.primary, borderColor: theme.colors.secondary}}> Rejoindre </button>
+                    {/* <button  className="ButtonNav" style={{backgroundColor: theme.colors.primary, borderColor: theme.colors.secondary}}> Rejoindre </button> */}
+                    
                 </div>
             </div>
             <div className='rightContainer'>

cryptide_project/src/Pages/Profile.css

@@ -1,5 +1,6 @@
 .mainContainer{
     display: flex;
+    /* flex-direction: column; */
     justify-content: center;
     align-items: center;
     margin: 50px;
@@ -45,9 +46,6 @@
     border-radius: 15px;
 }
 
-.pseudoDisplay{
-    margin: 0px !important;
-}
 
 .username-display{
     display: flex;

cryptide_project/src/Pages/Profile.tsx

@@ -1,7 +1,10 @@
-import React, { useState, useEffect } from 'react';
+import React, { useEffect, useState } from 'react';
 import ProfilePDP from '../Components/ProfilePDP';
 
 import SessionService from '../services/SessionService';
+import { PlayerProps } from '../types/Player';
+import { delay, update } from 'lodash';
+import { socket } from '../SocketConfig';
 import AuthService from '../services/AuthService';
 
 
@@ -11,8 +14,8 @@ import Edit from "../res/icon/edit-pen.png"
 import Coche from '../res/icon/coche.png'
 import Cancel from '../res/icon/cancel.png'
 
-/* Nav */
+/* Model */
-import { useNavigate } from 'react-router-dom';
+import User from '../model/User';
 
 /* Context */
 import { useAuth } from '../Contexts/AuthContext';
@@ -22,36 +25,24 @@ import Button from 'react-bootstrap/Button';
 import Alert from 'react-bootstrap/Alert';
 import Modal from 'react-bootstrap/Modal';
 import Form from 'react-bootstrap/Form';
-import ProgressBar from 'react-bootstrap/ProgressBar';
+import { useNavigate } from 'react-router-dom';
-
-import {basePath} from "../AdressSetup"
 
 //@ts-ignore
 const Profile = () => {
+  
   const navigate = useNavigate();
+  //let player;
+  const {user, logout} = useAuth()
+  
+  // let pseudoNotNull;
+  // if(user?.pseudo != null){
+  //   pseudoNotNull = user.pseudo;
+  // }
+
   const [editingUsername, setEditingUsername] = useState(false);
-  const {isLoggedIn, login, logout, user, setUserData, manager } = useAuth();
   const [newUsername, setNewUsername] = useState(user?.pseudo);
 
-  useEffect(() => {
+  //@ts-ignore
-      if (user == null){
-          manager.userService.fetchUserInformation().then(([user, loggedIn]) =>{
-              if (user!=null){
-                  if (loggedIn){
-                      login()
-                      setUserData(user)
-                  }
-              }
-          })
-      }
-  }, [isLoggedIn]);
-
-  const handleLogout = () => {
-    logout();
-    navigate(`${basePath}/`);
-  };
-  
-  // @ts-ignore
   const onUsernameChange = (newUsername) => {
     if(user?.pseudo != null){
       SessionService.UpdatePseudo(user.pseudo, newUsername)
@@ -66,103 +57,7 @@ const Profile = () => {
     // Désactiver le mode d'édition
     setEditingUsername(false);
   };
-  
-
-    //* Gestion de la modification du mot de passe :
-    // Modal de modification du mot de passe
-    const [showPasswordModal, setShowPasswordModal] = useState(false);
-    const [showWrongPassword, setShowWrongPassword] = useState(false);
-    const [showCorrectPassword, setShowCorrectPassword] = useState(false);
-    
-    // Etat du mot de passe
-    const [oldPassword, setOldPassword] = useState('');
-    const [newPassword, setNewPassword] = useState('');
-    
-    // Etat de l'étape
-    const [step, setStep] = useState(1);
-    const [DisableNextStep, setDisableNextStep] = useState(true);
-    
-    // Etat du nouveau mot de passe
-    const [confirmNewPassword, setConfirmNewPassword] = useState('');
-
-
-    const [ percent, setpercent] = useState(0);
-    const handleShowPasswordModal = () => {
-      setShowPasswordModal(true);
-    };
-    const handleClosePasswordModal = () => {
-      setShowPasswordModal(false);
-    };
-
-    //* Vérification de l'ancien mot de passe :
-    const handleConfirmedAuth = async () => {
-      // Vérification de l'ancien mot de passe
-      if(user){
-        try {
-          if (await AuthService.validatePassword(user?.pseudo, oldPassword)) {
-            console.log('Ancien mot de passe correct.');
-            setShowWrongPassword(false);
-            setShowCorrectPassword(true);
-            setDisableNextStep(false);
-            setpercent(25);
-          }
-        } catch (error) {
-          console.error(error);
-          setShowWrongPassword(true);
-          setShowCorrectPassword(false);
-          setDisableNextStep(true);
-        }
-      }
-    }
 
-    const handleChangeStep = () => {
-      setShowWrongPassword(false);
-      setShowCorrectPassword(false);
-      setpercent(50);
-      setStep(2)
-    }
-
-    //* Modification du mot de passe :
-    const handlePasswordChange = async () => {
-      //Effectuer la modification du mot de passe
-      // sinon, affichez une erreur
-      if(user){
-        if (newPassword === confirmNewPassword) {
-          await AuthService.updatePassword(user.pseudo, newPassword);
-          console.log('Changement de mot de passe');
-          setpercent(100);
-          setTimeout(async () => {
-            setShowPasswordModal(false);
-          }, 1250);
-        } else {
-          //les mots de passe ne correspondent pas
-          console.error("Les mots de passe ne correspondent pas.");
-          setShowWrongPassword(true);
-          setTimeout(async () => {
-            setShowWrongPassword(false);
-          }, 1250);
-        }
-      }
-    };
-  
-
-    
-    //@ts-ignore
-    const handleOldPasswordChange = (e) => {
-      setOldPassword(e.target.value);
-      setpercent(13);
-    };
-    
-    //@ts-ignore
-    const handleNewPasswordChange = (e) => {
-      setpercent(63);
-      setNewPassword(e.target.value);
-    };
-    //@ts-ignore
-    const handleConfirmNewPasswordChange = (e) => {
-      setConfirmNewPassword(e.target.value);
-      setpercent(75);
-    };
 
   //* Gestion Modal de suppression :
   const [showDeleteModal, setShowDeleteModal] = useState(false);
@@ -192,15 +87,16 @@ const Profile = () => {
 
       if(user!= null){
         const pseudo = user.pseudo;
-        logout();
         AuthService.delAccount(pseudo);
+        AuthService.logout();
+        logout();
       }
       else{
         console.error("l'utilisateur ne peut pas être null")
       }
       handleCloseDeleteModal();
 
-      navigate(`${basePath}/`)
+      navigate("/")
 
     } else {
       console.error('Phrase de confirmation incorrecte.');
@@ -210,6 +106,7 @@ const Profile = () => {
       }, 3000);
     }
   };
+
   
   return (
     <>
@@ -236,7 +133,7 @@ const Profile = () => {
             </div>
           ) : (
             <div className='username-display'>
-              <h1 className='pseudoDisplay'>{user?.pseudo}</h1>
+              <h1>{user?.pseudo}</h1>
               <button className='editbutton' onClick={() => setEditingUsername(true)}>
                 <img src={Edit} alt='edit' width='25' height='25'/>
               </button>
@@ -245,95 +142,16 @@ const Profile = () => {
         }
         <hr/>
         {!editingUsername ? (
-        <Button variant="secondary" onClick={() => setShowPasswordModal(true)}>Modifier le mot de passe</Button>
+        <Button variant="secondary">Modifier le mot de passe</Button>
         ) : (
           <Alert key='info' variant='info' style={{width:'100%'}}>
             Vous êtes en mode "édition".
           </Alert>
         )}
-
-        {/* Modal de modification de mdp */}
-        <Modal show={showPasswordModal} onHide={handleClosePasswordModal}>
-        <Modal.Header closeButton>
-          <Modal.Title>{`Étape ${step}`}</Modal.Title>
-          {/* <ProgressBar animated now={50*step} /> */}
-        </Modal.Header>
-        <Modal.Body>
-          <ProgressBar animated now={percent} />
-          {step === 1 && (
-            <>
-              <p>Entrez votre ancien mot de passe :</p>
-              <Form.Control
-                type="password"
-                placeholder="Ancien mot de passe"
-                value={oldPassword}
-                onChange={handleOldPasswordChange}
-              />
-              <Button variant="primary" style={{margin:'15px'}} onClick={handleConfirmedAuth}>
-                Confirmer
-              </Button>
-            </>
-          )}
-
-          {step === 2 && (
-            <>
-              <p>Entrez votre nouveau mot de passe :</p>
-              <Form.Control
-                type="password"
-                placeholder="Nouveau mot de passe"
-                value={newPassword}
-                onChange={handleNewPasswordChange}
-              />
-              <br/>
-
-              <p>Confirmez votre nouveau mot de passe :</p>
-              <Form.Control
-                type="password"
-                placeholder="Confirmez le nouveau mot de passe"
-                value={confirmNewPassword}
-                onChange={handleConfirmNewPasswordChange}
-              />
-            </>
-          )}
-
-          {showWrongPassword && (
-            <Alert variant="danger" style={{ width: '100%' }}>
-              Ancien mot de passe incorrect.
-            </Alert>
-          )}
-          {showCorrectPassword && (
-            <Alert variant="success" style={{ width: '100%' }}>
-              Ancien mot de passe correct.
-            </Alert>
-          )}
-        </Modal.Body>
-        <Modal.Footer>
-          {step === 1 && (
-            <Button variant="secondary" onClick={handleClosePasswordModal}>
-              Annuler
-            </Button>
-          )}
-
-          {step === 2 ? (
-            <Button variant="primary" onClick={handlePasswordChange}>
-              Modifier le mot de passe
-            </Button>
-          ) : (
-            <Button variant="primary" onClick={handleChangeStep} disabled={DisableNextStep}>
-              Étape suivante
-            </Button>
-          )}
-        </Modal.Footer>
-      </Modal>
-
-
         <div className='bottom'>
           <>
-          {!editingUsername && (
             <Button variant="danger" onClick={handleShowDeleteModal}>Supprimer</Button>
-          ) }
 
-          {/* Modal de suppression */}
             <Modal show={showDeleteModal} onHide={handleCloseDeleteModal}>
               <Modal.Header closeButton>
                 <Modal.Title>Confirmation de suppression</Modal.Title>
@@ -365,10 +183,7 @@ const Profile = () => {
             </Modal>
           </>
         </div>
-      </div>
+
-      {/* Bouton de déconnexion */}
-      <div className='logout'>
-        <Button variant="warning" onClick={handleLogout}>Déconnexion</Button>
       </div>
     </div>
     </>

cryptide_project/src/Pages/SignUpForm.tsx

@@ -4,11 +4,9 @@ import { useNavigate } from 'react-router-dom';
 import AuthService from '../services/AuthService';
 import '../Style/Global.css';
 
-import {basePath} from "../AdressSetup"
-
-
 const SignUp = () => {
     const navigate = useNavigate(); 
+
     const [error, setError] = useState<string | null>(null);
     const [showConfirmation, setShowConfirmation] = useState(false);
 
@@ -34,7 +32,7 @@ const SignUp = () => {
 
                 setShowConfirmation(true);
                 setTimeout(() => {
-                    navigate(`${basePath}/login`);         // 3 secondes avant de rediriger vers la page de connexion
+                    navigate('/login');         // 3 secondes avant de rediriger vers la page de connexion
                 }, 1250);
             }
         } catch (error: any) {
@@ -91,7 +89,7 @@ const SignUp = () => {
                     </button>
                 </div>
                 <p className="forgot-password text-right">
-                    Vous avez déjà un <a href={`${basePath}/login`}>compte</a> ?
+                    Vous avez déjà un <a href="/login">compte</a> ?
                 </p>
             </form>
 
@@ -102,7 +100,7 @@ const SignUp = () => {
             )}
 
             {showConfirmation && (
-                <div className="alert alert-success" role="alert">
+                <div className="alert alert-success text-center" role="alert">
                     Inscription réussie ! Vous serez redirigé vers la page de connexion.
                 </div>
             )}

cryptide_project/src/Pages/SoloGame.css

@@ -0,0 +1,107 @@
+.upperInfo{
+    display: flex;
+    justify-content: center;
+    flex-direction: column;
+    align-items: center;
+
+    width: 30%;
+
+    border-radius: 0px 0px 30px 30px;
+    border: solid;
+    border-width: 2px 5px;
+
+    background-color: white;
+
+    font-size: 30px;
+
+    top: 20px;;
+}
+
+#mainDiv{
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    flex-direction: column;
+}
+
+
+.paramDiv{
+    z-index: 1;
+    position: absolute;
+    top: 10px;
+    right: 10px;
+}
+
+#graphDiv{
+
+    display: flex;
+    flex-direction: row;
+
+    position: absolute;
+
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+}
+
+#bottom-container{
+    bottom: 0;
+    
+    background-color: white;
+    padding:20px;
+    border-radius: 20px 20px 0px 0px;
+}
+
+.nbLaps{
+    position: absolute;
+    z-index: 1;
+    left: 10px;
+    top :50px;
+
+    margin: 10px 20px;
+    padding: 20px;
+    border-radius: 15px;
+    border: solid 2px;
+
+    font-size: 30px;
+    color: #fff;
+}
+
+#endgamebutton{
+    position: absolute;
+    z-index: 1;
+    bottom: 0;
+    right: 25%;
+}
+
+.upperInfo,
+#bottom-container,
+.menuGame {
+    position: absolute;
+    z-index: 1;
+}
+
+.menuGame{
+    display: flex;
+    align-items: space-between;
+    justify-content: end;
+    flex-direction: column;
+
+    top:30%;
+    right: 0;
+}
+
+.menuGame Button {
+    margin: 10px;
+}
+
+.button{
+    /*background-color: #85C9C2;*/
+    
+    border: solid 2px #85C9C2;
+    border-radius: 10px;
+
+    width: 100px;
+    height: 60px;
+}

cryptide_project/src/Pages/SoloGame.tsx

@@ -0,0 +1,236 @@
+import React, { useState } from 'react';
+import Switch from "react-switch";
+
+/* Style */
+import "./SoloGame.css"
+import {useTheme} from '../Style/ThemeContext'
+/* Component */
+import GraphContainer from '../Components/GraphContainer';
+import ChoiceBar from '../Components/ChoiceBar';
+import ButtonImgNav from '../Components/ButtonImgNav';
+import PersonStatus from '../Components/PersonStatus';
+import PlayerList from '../Components/PlayerList';
+
+/* Icon */
+import Leave from "../res/icon/leave.png";
+import Param from "../res/icon/param.png";
+import Replay from "../res/icon/replay.png";
+import Info from "../res/icon/infoGreen.png";
+import Check from "../res/icon/checkboxGreen.png";
+import Alpha from "../res/GreekLetters/alphaW.png";
+
+/* nav */
+import { Link } from 'react-router-dom';
+
+/* Boostrap */
+import Button from 'react-bootstrap/Button';
+import Offcanvas from 'react-bootstrap/Offcanvas';
+
+/* Model */
+import Stub from '../model/Stub';
+import { HiLanguage } from 'react-icons/hi2';
+import { Nav, NavDropdown } from 'react-bootstrap';
+import { FormattedMessage } from 'react-intl';
+import Color from '../model/Color';
+import TurnBar from '../Components/TurnBar';
+import { useGame } from '../Contexts/GameContext';
+
+//@ts-ignore
+const SoloGame = ({locale, changeLocale}) => {
+
+    const theme = useTheme();
+
+    const [showChoiceBar, setShowChoiceBar] = useState(false);
+    const [showTurnBar, setShowTurnBar] = useState(false);
+
+
+    const handleNodeClick = (shouldShowChoiceBar: boolean) => {
+        setShowChoiceBar(shouldShowChoiceBar);
+    };
+
+    const handleShowTurnBar = (shouldShowTurnBar: boolean) => {
+        setShowTurnBar(shouldShowTurnBar);
+    };
+
+    /* offcanvas */
+    //? faire une fonction pour close et show en fonction de l'etat du canva ?
+    //? comment faire pour eviter la recopie de tout le code a chaque canvas boostrap ?
+    const [show, setShow] = useState(false);
+    const handleClose = () => setShow(false);
+    const handleShow = () => setShow(true);
+
+    // const [showP, setShowP] = useState(false);
+    // const handleCloseP = () => setShowP(false);
+    // const handleShowP = () => setShowP(true);
+
+    const [showS, setShowS] = useState(false);
+    const handleCloseS = () => setShowS(false);
+    const handleShowS = () => setShowS(true);
+
+    const handleChange = () => {
+        if (show){
+        handleClose()
+        }
+        else {
+            handleShow()
+        }
+    };
+
+    // const handleChangeP = () => {
+    //     if (showP){
+    //         handleCloseP()
+    //     }
+    //     else {
+    //         handleShowP()
+    //     }
+    // };
+
+    const handleChangeS = () => {
+        if (showS){
+            handleCloseS()
+        }
+        else {
+            handleShowS()
+        }
+    };
+
+    /* Windows open */
+    //@ts-ignore
+    const openInNewTab = (url) => { //! avec url ==> dangereux
+        window.open(url);
+    };
+
+    const [SwitchEnabled, setSwitchEnabled] = useState(false)
+    const indices = Stub.GenerateIndice()
+    const { indice, players } = useGame();
+
+
+    return (
+        <div id="mainDiv">
+            <TurnBar text="je suis dans la page solo"/>
+            <div id='graphDiv'>
+                {/* <GraphContainer onNodeClick={handleNodeClick} handleShowTurnBar={handleShowTurnBar} FromSolo={true}/> */}
+            </div>
+
+            <div className='nbLaps' style={{ 
+                                        backgroundColor: theme.colors.primary,
+                                        borderColor: theme.colors.secondary
+                                    }}>
+                Tour : 5
+            </div>
+
+            <div className='paramDiv'>
+                <button className='button'
+                    style={{ 
+                        backgroundColor: theme.colors.primary,
+                        borderColor: theme.colors.secondary
+                    }}
+                    onClick={handleChangeS}>
+                    <img src={Param} alt="paramètres" height='40'/>
+                </button>
+            </div>
+
+            <div className='menuGame'>
+                <Link to='/info' target='_blank'>
+                    <button className='button' 
+                    style={{ 
+                        backgroundColor: theme.colors.primary,
+                        borderColor: theme.colors.secondary
+                    }}>
+                    <img src={Info} alt="info" height="40"/>
+                    </button>
+                </Link>
+            {/* <button className='button' onClick={() => openInNewTab('http://localhost:3000/play')}> //! avec url =={'>'} dangereux
+                <img src={Check} alt="check" height="40"/>
+            </button> */}
+
+                <Link to='/info' target='_blank'>
+                    <button className='button'
+                    style={{ 
+                        backgroundColor: theme.colors.primary,
+                        borderColor: theme.colors.secondary
+                    }}>
+                    <img src={Check} alt="check" height="40"/>
+                    </button>
+                </Link>
+
+                <button className='button' onClick={handleChange}
+                            style={{ 
+                                backgroundColor: theme.colors.primary,
+                                borderColor: theme.colors.secondary
+                            }}>
+                    <img src={Alpha} alt="indice" height="40"/>
+                </button>
+            </div>
+
+            {/* <Offcanvas show={showP} 
+                    onHide={handleCloseP}>
+            <Offcanvas.Header closeButton>
+                <Offcanvas.Title>Joueurs</Offcanvas.Title>
+                <h3>Il y a {players.length} joueurs</h3>
+            </Offcanvas.Header>
+            <Offcanvas.Body>
+                <PlayerList players={players} />
+            </Offcanvas.Body>
+            </Offcanvas> */}
+
+            <Offcanvas show={show} 
+                    onHide={handleClose} 
+                    placement='end'
+                    scroll={true}
+                    backdrop={false}
+                    style={{ height: '20%', width: '25%', top: '60vh' }}>
+            <Offcanvas.Header closeButton>
+                <Offcanvas.Title>Indice</Offcanvas.Title>
+            </Offcanvas.Header>
+            <Offcanvas.Body>
+                {/* Possède les cheveux noir <u>ou</u> joue au basket */}
+                {indice?.ToString(locale)}
+            </Offcanvas.Body>
+            </Offcanvas>
+
+            {
+            //* canva pour les paramètres
+            }
+            <Offcanvas show={showS} 
+                    onHide={handleCloseS} 
+                    placement='top'
+                    style={{height: '30%', width: '30%', left: '70%' }}>
+                <Offcanvas.Header closeButton>
+                    <Offcanvas.Title><img src={Param} alt='param'/> Paramètres</Offcanvas.Title>
+                </Offcanvas.Header>
+                <Offcanvas.Body>
+                    <Nav className="me-auto">
+                        <NavDropdown 
+                        title={<span><HiLanguage/> Language </span>}
+                        className="navbar-title" id="basic-nav-dropdown">
+                            <NavDropdown.Item onClick={() => changeLocale('fr')}> 
+                                <FormattedMessage id="languageSelector.french"/> 
+                            </NavDropdown.Item>
+                            <NavDropdown.Item onClick={() => changeLocale('en')}> 
+                                <FormattedMessage id="languageSelector.english"/> 
+                            </NavDropdown.Item>
+                        </NavDropdown>
+                    </Nav>
+
+                    <label>
+                        <Switch checked={SwitchEnabled} onChange={setSwitchEnabled}/>
+                        <p>Afficher les noeuds possibles</p>
+                    </label>
+
+                </Offcanvas.Body>
+            </Offcanvas>
+            <div id="bottom-container">
+            {showChoiceBar && <ChoiceBar />}
+            </div>
+            {/*
+            <div id="endgamebutton" > {/*  tmp 
+            <ButtonImgNav dest="/endgame" img={Leave} text='endgame'/>
+            </div>
+        */}
+        </div>
+    );
+};
+
+
+export default SoloGame;

cryptide_project/src/Pages/Tutorial.tsx

@@ -1,754 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import Switch from "react-switch";
-import {saveAs} from "file-saver"
-
-/* Style */
-import "./InGame.css"
-import {useTheme} from '../Style/ThemeContext'
-/* Component */
-import GraphContainer from '../Components/GraphContainer';
-import PlayerList from '../Components/PlayerList';
-import TurnBar from '../Components/TurnBar';
-
-/* Icon */
-import Param from "../res/icon/param.png";
-import Info from "../res/icon/infoGreen.png";
-import Check from "../res/icon/checkboxGreen.png";
-import MGlass from "../res/icon/magnifying-glass.png";
-import Reset from "../res/icon/reset.png";
-import Oeye from "../res/icon/eye.png";
-import Ceye from "../res/icon/hidden.png";
-import ImgBot from "../res/img/bot.png";
-
-import detective from "../res/img/tuto/tuto-detective.jpg";
-import ava from "../res/img/tuto/tuto-ava2.png";
-import indicetxt from "../res/img/tuto/tuto-indiceTxt.png"
-import rep from "../res/img/tuto/tuto-rep.png";
-import joueurs from "../res/img/tuto/tuto-joueurs.png";
-import graph from "../res/img/tuto/tuto-graph.png";
-
-import step1 from "../res/img/tuto/tuto2-1.png";
-import step2 from "../res/img/tuto/tuto2-2.png";
-import step3 from "../res/img/tuto/tuto2-3.png";
-import step4 from "../res/img/tuto/tuto2-4.png";
-import step5 from "../res/img/tuto/tuto2-5.png";
-import step6 from "../res/img/tuto/tuto2-6.png";
-
-/* nav */
-import { Link, Navigate, useNavigate, useNavigationType } from 'react-router-dom';
-
-/* Boostrap */
-import Offcanvas from 'react-bootstrap/Offcanvas';
-import Modal from 'react-bootstrap/Modal';
-import Card from 'react-bootstrap/Card';
-import Button from 'react-bootstrap/Button';
-
-/* Model */
-import Stub from '../model/Stub';
-import { useGame } from '../Contexts/GameContext';
-import { socket } from '../SocketConfig';
-import { Network } from 'vis-network';
-import {generateLatexCode, generateLatexCodeEnigme} from '../Script/LatexScript';
-import Pair from '../model/Pair';
-import Indice from '../model/Indices/Indice';
-import {basePath} from "../AdressSetup"
-import TutorialGraph from '../Components/TutorialGraph';
-import { useAuth } from '../Contexts/AuthContext';
-import EasyBot from '../model/EasyBot';
-import { set } from 'lodash';
-import { FormattedMessage } from 'react-intl';
-
-
-let cptNavigation = 0
-
-//@ts-ignore
-const Tutorial = ({locale, changeLocale}) => {
-  const {personNetwork, person, indices, players, setPlayersData, indice, actualPlayerIndex} = useGame()
-  const {user} = useAuth()
-
-  
-  const theme = useTheme();
-  
-  const navigate = useNavigate()
-  
-  const [greyForEveryone, setGreyForEveryone] = useState<() => void>(() => {});
-
-  const setGreyForEveryoneData = (func: () => void) => {
-    setGreyForEveryone(func)
-  }
-
-  const navigationType = useNavigationType()
-    cptNavigation++
-    if (cptNavigation % 2 == 0){
-        if (navigationType.toString() == "POP"){
-            socket.emit("player quit")
-            navigate(`${basePath}/`)
-        }
-    }
-  
-  //* Historique
-  const [history, setHistory] = useState<string[]>([]);
-  const [showLast, setShowLast] = useState(false)
-  const [askedWrong, setAskedWrong] = useState(false)
-  const [importToPdf, setImportToPdf] = useState(false)
-  const [importToJSON, setImportToJSON] = useState(false)
-  const [tutoStep, setTutoStep] = useState(0)
-
-  const setTutoStepData = (step: number) => {
-    setTutoStep(step)
-  }
-
-  const setImportToJSONData = (imp: boolean) => {
-    setImportToJSON(imp)
-  }
-
-  const setImportToPdfData = (imp: boolean) => {
-    setImportToPdf(imp)
-  }
-
-  // Fonction pour ajouter un élément à l'historique
-  const addToHistory = (message: string) => {
-    setHistory(prevHistory => [...prevHistory, message]);
-  };
-  
-  const setShowLastData = () =>{
-    setLastVisible(!showLast);
-    setShowLast(!showLast);
-  }
-
-  const setAskedWrongData = (askedWrong: boolean) => {
-    setAskedWrong(askedWrong)
-  }
-
-  useEffect(() => {
-    const historyContainer = document.getElementById('history-container');
-    if (historyContainer) {
-      historyContainer.scrollTop = historyContainer.scrollHeight;
-    }
-  }, [history]);
-
-  useEffect(() => {
-    if (user == null){
-      return
-    }
-    setPlayersData([user, new EasyBot("Scooby-Doo", "Scooby-Doo", ImgBot), new EasyBot("Batman", "Batman", ImgBot)])
-  }, [])
-
-
-
-  const [showChoiceBar, setShowChoiceBar] = useState(false);
-  const [showTurnBar, setShowTurnBar] = useState(false);
-  const [turnBarText, setTurnBarText] = useState("");
-  const [playerTouched, setPlayerTouched] = useState(-2)
-  const [playerIndex, setPlayerIndex] = useState(-2)
-
-
-  const [network, setNetwork] = useState<Network | null>(null)
-  const [networkEnigme, setNetworkEnigme] = useState<Map<number, Pair<Indice, boolean>[]> | null>(null)
-
-  const setNetworkData = (network: Network) => {
-    setNetwork(network)
-  }
-
-  const setNetworkEnigmeData = (networkEnigme: Map<number, Pair<Indice, boolean>[]>) => {
-    setNetworkEnigme(networkEnigme)
-  }
-
-  const handleNodeClick = (shouldShowChoiceBar: boolean) => {
-    setShowChoiceBar(shouldShowChoiceBar);
-  };
-
-    const handleSetPlayerTouched = (newPlayerTouched: number) => {
-      setPlayerTouched(newPlayerTouched);
-    };
-  
-
-  const handleShowTurnBar = (shouldShowTurnBar: boolean) => {
-    setShowTurnBar(shouldShowTurnBar);
-  };
-  
-  const handleTurnBarTextChange = (newTurnBarText: string) =>{
-    setTurnBarText(newTurnBarText)
-  }
-
-  const setPlayerIndexData = (playerIndex: number) => {
-    setPlayerIndex(playerIndex)
-  }
-
-  
-  const resetGraph = () => {
-    setisLoading(true);
-    socket.emit("reset graph", socket.id)
-    setTimeout(() => {
-      setisLoading(false);
-    }, 2000);  
-  }
-
-  /* offcanvas */
-  //? faire une fonction pour close et show en fonction de l'etat du canva ?
-  //? comment faire pour eviter la recopie de tout le code a chaque canvas boostrap ?
-  const [show, setShow] = useState(false);
-  const handleClose = () => setShow(false);
-  const handleShow = () => setShow(true);
-
-  const [showP, setShowP] = useState(false);
-  const handleCloseP = () => setShowP(false);
-  const handleShowP = () => setShowP(true);
-
-  const [showS, setShowS] = useState(false);
-  const handleCloseS = () => setShowS(false);
-  const handleShowS = () => setShowS(true);
-
-  const [cptTour, setcptTour] = useState(0);
-
-  const [LastVisible, setLastVisible] = useState(false);
-
-  const [isLoading, setisLoading] = useState(false);
-  
-
-  //@ts-ignore
-  const changecptTour = (newcptTour) => {
-    setcptTour(newcptTour);
-  };
-  
-    const handleChange = () => {
-      if (show){
-        handleClose()
-      }
-      else {
-        handleShow()
-      }
-    };
-  
-    const handleChangeS = () => {
-      if (showS){
-        handleCloseS()
-      }
-      else {
-        handleShowS()
-      }
-    };
-
-    const eye = LastVisible ? Oeye : Ceye; //icon que l'on affiche pour l'oeil : fermé ou ouvert.
-
-    /* Windows open */
-    //@ts-ignore
-    const openInNewTab = (url) => { //! avec url ==> dangereux
-      window.open(url);
-    };
-  
-  const [SwitchEnabled, setSwitchEnabled] = useState(false)
-  const allIndices = Stub.GenerateIndice()
-
-  const nbPlayer = players.length;
-  const navdeduc = 'deduc?actualId=' + actualPlayerIndex + '&nbPlayer=' + nbPlayer;
-
-
-
-    //* gestion demo */
-  const [showM, setShowM] = useState(false);
-  const [showTuto2, setShowTuto2] = useState(false);
-  const [showTuto21, setShowTuto21] = useState(false);
-  const [showTuto22, setShowTuto22] = useState(false);
-  const [showTuto3, setShowTuto3] = useState(false);
-
-  const handleCloseM = () => {
-    setShowM(false);
-    handleShowHelp()
-  }
-  const handleShowM = () => setShowM(true);
-
-  const handleCloseHelp = () => {
-    switch(tutoStep){
-      case 0:
-        setShowTuto2(false);
-        break;
-      case 1:
-        setShowTuto21(false);
-        break;
-      case 2:
-        setShowTuto22(false);
-        break;
-      case 3:
-        setShowTuto3(false);
-        break;
-    }
-  }
-  const handleShowHelp = () => {
-    switch(tutoStep){
-      case 0:
-        setShowTuto2(true);
-        break;
-      case 1:
-        setShowTuto21(true);
-        break;
-      case 2:
-        setShowTuto22(true);
-        break;
-      case 3:
-        setShowTuto3(true);
-        break;
-    }
-  }
-  
-
-  const handleCloseTuto2 = () => setShowTuto2(false);
-  const handleShowTuto2 = () => setShowTuto2(true);
-
-  const handleCloseTuto21 = () => setShowTuto21(false);
-  const handleShowTuto21 = () => setShowTuto21(true);
-
-  const handleCloseTuto22 = () => setShowTuto22(false);
-  const handleShowTuto22 = () => setShowTuto22(true);
-  
-  const handleCloseTuto3 = () => setShowTuto3(false);
-  const handleShowTuto3 = () => setShowTuto3(true);
-  
-
-  const [step, setStep] = useState(-1);
-
-  //@ts-ignore
-  const displayModalstep = (step: number) => {
-    //* for step 2
-    setStep(0); // remise a 0 de step
-    switch(step) {
-      case 1:
-        setShowTuto21(true);
-        break;
-      case 2:
-        setShowTuto22(true);
-        break;
-      case 3:
-        setShowTuto3(true);
-        break;
-    }
-  
-  }
-
-  useEffect(() => {
-    handleShowM();
-  }, [])
-
-    return (
-      <div id="mainDiv">
-        {showTurnBar && <TurnBar text={turnBarText}/>}
-        <div id='graphDiv'>
-          <TutorialGraph  tutoStep={tutoStep}
-                          setTutoStep={setTutoStepData}
-                          handleShowTurnBar={handleShowTurnBar} 
-                          handleTurnBarTextChange={handleTurnBarTextChange} 
-                          addToHistory={addToHistory}
-                          setPlayerTouched={handleSetPlayerTouched} 
-                          playerTouched={playerTouched}
-                          setNetwork={setNetworkData}
-                          showLast={showLast}
-                          setPlayerIndex={setPlayerIndexData}
-                          setGreyForEveryone={setGreyForEveryoneData}
-                          displayModalstep={displayModalstep}/>
-        </div>
-
-        <div className='historique' id="history-container">
-            {history.map((item, index) => (
-                <div key={index}>{item}</div>
-            ))}
-        </div>
-
-
-        <div className='menuGame'>
-          {/* <Button variant="primary" onClick={handleShowM}>
-              tuto 1
-          </Button>
-          <Button variant="primary" onClick={handleShowTuto2} disabled={tuto1disable}>
-              tuto 2
-          </Button> */}
-
-          <Button variant="primary" onClick={handleShowHelp}>
-            <FormattedMessage id='aide'/>
-          </Button>
-          <Link to={`${basePath}/info`} target='_blank'>
-            <button className='button' 
-              style={{ 
-                backgroundColor: theme.colors.tertiary,
-                borderColor: theme.colors.secondary
-              }}>
-              <img src={Info} alt="info" height="40"/>
-            </button>
-          </Link>
-
-          <button className='button' onClick={handleChange}
-            style={{ 
-              backgroundColor: theme.colors.tertiary,
-              borderColor: theme.colors.secondary
-            }}>
-            <img src={MGlass} alt="indice" height="40"/>
-          </button>
-
-          <button className='button' onClick={setShowLastData}
-            style={{ 
-              backgroundColor: theme.colors.tertiary,
-              borderColor: theme.colors.secondary
-            }}>
-            <img src={ eye } alt="indice" height="40"/>
-          </button>
-        </div>
-
-          
-          <div className='playerlistDiv'>
-            <PlayerList players={players} setPlayerTouched={handleSetPlayerTouched} playerTouched={playerTouched} playerIndex={playerIndex} askedWrong={askedWrong} greyForEveryone={greyForEveryone}/>
-          </div>
-          
-
-        <Offcanvas show={show} 
-                  onHide={handleClose} 
-                  placement='end'
-                  scroll={true}
-                  backdrop={false}
-                  style={{ height: '20%', width: '25%', top: '60vh' }}>
-          <Offcanvas.Header closeButton>
-            <Offcanvas.Title><FormattedMessage id='indice'/></Offcanvas.Title>
-          </Offcanvas.Header>
-          <Offcanvas.Body>
-            {indice?.ToString(locale)}
-          </Offcanvas.Body>
-        </Offcanvas>
-      
-
-
-        <Modal
-          show={showM}
-          onHide={handleCloseM}
-          backdrop="static"
-          keyboard={false}
-          size="lg"
-          style={{ maxHeight: '100vh'}}>
-          <Modal.Header>
-            <Modal.Title><FormattedMessage id='tutorial.title'/></Modal.Title>
-          </Modal.Header>
-          <Modal.Body style={{ display:'flex', justifyContent:'center', alignItems:'center', flexDirection:'column'}}>
-
-          {step === -1 && (
-            <Card style={{ width: '90%', display:'flex', justifyContent:'center', alignItems:'center', flexDirection:'column'}}>
-              <Card.Img variant="top" src={detective} style={{width:'300px', height:'300px'}}/>
-              <Card.Body>
-                <Card.Title> <FormattedMessage id='tuto.title.1'/> </Card.Title>
-                <Card.Text>
-                  <FormattedMessage id='tuto.txt.1.1'/> <br/>
-                  <FormattedMessage id='tuto.txt.1.2'/> <br/>
-                  <FormattedMessage id='tuto.txt.1.3'/> <br/>
-                  <FormattedMessage id='tuto.txt.1.4'/> <br/>
-                  <FormattedMessage id='tuto.txt.1.5'/> <br/>
-                  <i><FormattedMessage id='tuto.txt.1.6'/></i>
-                </Card.Text>
-              </Card.Body>
-            </Card>
-          )}
-            {step === 0 && (
-              <Card style={{ width: '90%', display:'flex', justifyContent:'center', alignItems:'center', flexDirection:'column'}}>
-                <Card.Img variant="top" src={ava} style={{width:'300px', height:'300px'}}/>
-                <Card.Body>
-                  <Card.Title> <FormattedMessage id='tuto.title.2'/> </Card.Title>
-                  <Card.Text>
-                    <FormattedMessage id='tuto.txt.2.1'/>
-                    <br />
-                    <FormattedMessage id='tuto.txt.2.2' /><b>Ava</b><FormattedMessage id='tuto.txt.2.2.1'/><b>40 <FormattedMessage id='age_indice_end'/></b><FormattedMessage id='tuto.txt.2.2.2'/><b><FormattedMessage id='basketball'/></b><FormattedMessage id='tuto.txt.2.2.3'/><b><FormattedMessage id='tennis'/></b><FormattedMessage id='tuto.txt.2.2.4'/><b><FormattedMessage id='redhead'/></b><FormattedMessage id='tuto.txt.2.2.5'/><b>2 <FormattedMessage id='nb_friends_indice_end'/></b> : Carter <FormattedMessage id='and'/> Liam.
-                  </Card.Text>
-                </Card.Body>
-              </Card>
-            )}
-
-            {step === 1 && (
-              <Card style={{ width: '90%', display:'flex', justifyContent:'center', alignItems:'center', flexDirection:'column'}}>
-                <Card.Img variant="top" src={indicetxt} style={{width:'300px', height:'auto'}}/>
-                <Card.Body>
-                  <Card.Title><FormattedMessage id='tuto.title.3'/></Card.Title>
-                  <Card.Text>
-                    <FormattedMessage id='tuto.txt.3.1'/>
-                    <br />
-                    "<u><FormattedMessage id='tuto.txt.3.2'/></u>".
-                  </Card.Text>
-                </Card.Body>
-              </Card>
-            )}
-
-            {step === 3 && (
-              <Card style={{ width: '90%', display:'flex', justifyContent:'center', alignItems:'center', flexDirection:'column'}}>
-                <Card.Img variant="top" src={joueurs} style={{width:'auto', height:'300px'}}/>
-                <Card.Body>
-                  <Card.Title><FormattedMessage id='tuto.title.4'/></Card.Title>
-                  <Card.Text>
-                    <FormattedMessage id='tuto.txt.4.1'/>
-                    <br />
-                    <FormattedMessage id='tuto.txt.4.2'/>
-                  </Card.Text>
-                </Card.Body>
-              </Card>
-            )}
-
-            {step === 4 && (
-              <Card style={{ width: '90%', display:'flex', justifyContent:'center', alignItems:'center', flexDirection:'column'}}>
-                <Card.Img variant="top" src={rep} style={{width:'300px', height:'300px'}}/>
-                <Card.Body>
-                  <Card.Title><FormattedMessage id='tuto.title.5'/></Card.Title>
-                  <Card.Text>
-                    <FormattedMessage id='tuto.txt.5.1'/>
-                    <br />
-                    <ul>
-                      <li>
-                        <FormattedMessage id='majUn'/> <u><FormattedMessage id='square'/></u> <FormattedMessage id='tuto.txt.5.2'/>.
-                      </li>
-                      <li>
-                        <FormattedMessage id='majUn'/> <u><FormattedMessage id='round'/></u> <FormattedMessage id='tuto.txt.5.3'/>.
-                      </li>
-                    </ul>
-                    <FormattedMessage id='tuto.txt.5.4'/><br />
-                    <FormattedMessage id='tuto.txt.5.5.1'/>(<u><FormattedMessage id='color.green'/></u>) <FormattedMessage id='tuto.txt.5.5.2'/>.
-                    <br/><FormattedMessage id='tuto.txt.5.6'/> (<u><FormattedMessage id='color.yellow'/></u>).
-                    <br/><FormattedMessage id='tuto.txt.5.7.1'/><u><FormattedMessage id='tuto.txt.5.7.2'/></u>.
-                  </Card.Text>
-                </Card.Body>
-              </Card>
-            )}
-
-            {step === 5 && (
-              <Card style={{ width: '90%', display:'flex', justifyContent:'center', alignItems:'center', flexDirection:'column'}}>
-                <Card.Header>
-                  <button className='button' 
-                    style={{ 
-                      backgroundColor: theme.colors.tertiary,
-                      borderColor: theme.colors.secondary
-                    }}>
-                    <img src={Info} alt="info" height="40"/>
-                  </button>
-                </Card.Header>
-                <Card.Body>
-                  <Card.Title><FormattedMessage id='tuto.title.6'/></Card.Title>
-                  <Card.Text>
-                    <FormattedMessage id='tuto.txt.6.1.1'/><b><FormattedMessage id='tuto.txt.6.1.2'/></b><FormattedMessage id='tuto.txt.6.1.3'/>
-                  </Card.Text>
-                </Card.Body>
-              </Card>
-            )}
-
-            {step === 2 && (
-              <Card style={{ width: '90%', display:'flex', justifyContent:'center', alignItems:'center', flexDirection:'column'}}>
-                <Card.Header>
-                  <button className='button' 
-                    style={{ 
-                      backgroundColor: theme.colors.tertiary,
-                      borderColor: theme.colors.secondary
-                    }}>
-                    <img src={MGlass} alt="info" height="40"/>
-                  </button>
-                </Card.Header>
-                <Card.Body>
-                  <Card.Title><FormattedMessage id='tuto.title.7'/></Card.Title>
-                  <Card.Text>
-                    <FormattedMessage id='tuto.txt.7.1'/>
-                  </Card.Text>
-                </Card.Body>
-              </Card>
-            )}
-
-            {step === 6 && (
-              <Card style={{ width: '90%', display:'flex', justifyContent:'center', alignItems:'center', flexDirection:'column'}}>
-                <Card.Img variant="top" src={graph} style={{width:'auto', height:'300px'}}/>
-                <Card.Body>
-                  <Card.Title><FormattedMessage id='tuto.title.8'/></Card.Title>
-                  <Card.Text>
-                    <FormattedMessage id='tuto.txt.8.1'/>
-                    <br/>
-                    <FormattedMessage id='tuto.txt.8.2'/>
-                    <br/>
-                    <FormattedMessage id='tuto.txt.8.3'/>
-                  </Card.Text>
-                </Card.Body>
-              </Card>
-            )}
-
-
-
-          </Modal.Body>
-          <Modal.Footer style={{display:'flex'}}>
-            <div style={{ width:'100%', display:'flex', justifyContent:'start'}}>
-              <label style={{ color:'gray'}}><FormattedMessage id='step'/> {step+1}/7</label>
-            </div>
-            { step != -1 && (<Button variant="primary" onClick={() => setStep(step - 1)}><FormattedMessage id='previous'/></Button>)}
-            { step === 6 ? (<Button variant="primary" onClick={handleCloseM}><FormattedMessage id='continue'/></Button>) : 
-            <Button variant="primary" onClick={() => setStep(step + 1)}><FormattedMessage id='next'/></Button>}
-            
-          </Modal.Footer>
-        </Modal>
-
-        <Modal
-          show={showTuto2}
-          onHide={handleCloseTuto2}
-          backdrop="static"
-          keyboard={false}
-          size="lg"
-          style={{ maxHeight: '100vh'}}>
-          <Modal.Header>
-            <Modal.Title><FormattedMessage id='tutorial.title'/></Modal.Title>
-          </Modal.Header>
-          <Modal.Body style={{ display:'flex', justifyContent:'center', alignItems:'center', flexDirection:'column'}}>
-
-              <Card style={{ width: '100%', display:'flex', justifyContent:'center', alignItems:'center', flexDirection:'column'}}>
-                <Card.Img variant="top" src={step1} style={{width:'auto', height:'300px'}}/>
-                <Card.Body>
-                  <Card.Title><FormattedMessage id='tuto.title.9'/></Card.Title>
-                  <Card.Text>
-                    <FormattedMessage id='tuto.txt.9.1'/>
-                    <br/>
-                    <FormattedMessage id='tuto.txt.9.2.1'/><b>Scooby-Doo</b><FormattedMessage id='tuto.txt.9.2.2'/><b>Violet</b><FormattedMessage id='tuto.txt.9.2.3'/>
-                  </Card.Text>
-                </Card.Body>
-              </Card>
-
-          </Modal.Body>
-          <Modal.Footer style={{display:'flex'}}>
-            <Button variant="primary" onClick={handleCloseTuto2}><FormattedMessage id='compris'/></Button>
-          </Modal.Footer>
-        </Modal>
-
-        <Modal
-          show={showTuto21}
-          onHide={handleCloseTuto21}
-          backdrop="static"
-          keyboard={false}
-          size="lg"
-          style={{ maxHeight: '100vh'}}>
-          <Modal.Header>
-            <Modal.Title><FormattedMessage id='tutorial.title'/></Modal.Title>
-          </Modal.Header>
-          <Modal.Body style={{ display:'flex', justifyContent:'center', alignItems:'center', flexDirection:'column'}}>
-            {step === 0 && (
-              <Card style={{ width: '100%', display:'flex', justifyContent:'center', alignItems:'center', flexDirection:'column'}}>
-                <Card.Img variant="top" src={step2} style={{width:'300px', height:'auto'}}/>
-                <Card.Body>
-                  <Card.Title><FormattedMessage id='tuto.title.10'/></Card.Title>
-                  <Card.Text>
-                    <FormattedMessage id='tuto.txt.10.1.1'/> <u><FormattedMessage id='tuto.txt.10.1.2'/></u><FormattedMessage id='tuto.txt.10.1.3'/><i><FormattedMessage id='tuto.txt.10.1.4'/></i><FormattedMessage id='tuto.txt.10.1.5'/>
-                    <br/>
-                    <FormattedMessage id='tuto.txt.10.2'/>
-                  </Card.Text>
-                </Card.Body>
-              </Card>
-            )}
-
-            {step === 1 && (
-              <Card style={{ width: '100%', display:'flex', justifyContent:'center', alignItems:'center', flexDirection:'column'}}>
-                <Card.Img variant="top" src={step3} style={{width:'200px', height:'auto'}}/>
-                <Card.Body>
-                  <Card.Title><FormattedMessage id='tuto.title.11'/></Card.Title>
-                  <Card.Text>
-                    <FormattedMessage id='tuto.txt.11.1.1'/><b><FormattedMessage id='non'/></b><FormattedMessage id='tuto.txt.11.1.2'/>
-                    <br/>
-                    <FormattedMessage id='tuto.txt.11.2.1'/><b><FormattedMessage id='tuto.txt.11.2.2'/></b><FormattedMessage id='tuto.txt.11.2.3'/>
-                    <br/>
-                    <FormattedMessage id='tuto.txt.11.3'/>
-                  </Card.Text>
-                </Card.Body>
-              </Card>
-            )}
-
-            {step === 2 && (
-              <Card style={{ width: '100%', display:'flex', justifyContent:'center', alignItems:'center', flexDirection:'column'}}>
-                <Card.Img variant="top" src={step4} style={{width:'300px', height:'auto'}}/>
-                <Card.Body>
-                  <Card.Title><FormattedMessage id='tuto.title.12'/></Card.Title>
-                  <Card.Text>
-                    <FormattedMessage id='tuto.txt.12.1.1'/><u><FormattedMessage id='tuto.txt.12.1.2'/></u><FormattedMessage id='tuto.txt.12.1.3'/>
-                    <br/>
-                    <FormattedMessage id='tuto.txt.12.2'/>
-                  </Card.Text>
-                </Card.Body>
-              </Card>
-            )}
-
-
-          </Modal.Body>
-          <Modal.Footer style={{display:'flex'}}>
-            <div style={{ width:'100%', display:'flex', justifyContent:'start'}}>
-              <label style={{ color:'gray'}}><FormattedMessage id='step'/> {step+1}/3</label>
-            </div>
-            { step != 0 && (<Button variant="primary" onClick={() => setStep(step - 1)}><FormattedMessage id='previous'/></Button>)}
-            { step === 2 ? (<Button variant="primary" onClick={handleCloseTuto21}><FormattedMessage id='close'/></Button>) : 
-            <Button variant="primary" onClick={() => setStep(step + 1)}><FormattedMessage id='next'/></Button>}
-          </Modal.Footer>
-        </Modal>
-
-        <Modal
-          show={showTuto22}
-          onHide={handleCloseTuto22}
-          backdrop="static"
-          keyboard={false}
-          size="lg"
-          style={{ maxHeight: '100vh'}}>
-          <Modal.Header>
-            <Modal.Title><FormattedMessage id='tutorial.title'/></Modal.Title>
-          </Modal.Header>
-          <Modal.Body style={{ display:'flex', justifyContent:'center', alignItems:'center', flexDirection:'column'}}>
-
-              <Card style={{ width: '100%', display:'flex', justifyContent:'center', alignItems:'center', flexDirection:'column'}}>
-                <Card.Img variant="top" src={step5} style={{width:'300px', height:'auto'}}/>
-                <Card.Body>
-                  <Card.Title><FormattedMessage id='tuto.title.13'/></Card.Title>
-                  <Card.Text>
-                    <FormattedMessage id='tuto.txt.13.1.1'/><b><FormattedMessage id='tuto.txt.13.1.2'/></b><FormattedMessage id='tuto.txt.13.1.3'/>
-                    <br/>
-                    <FormattedMessage id='tuto.txt.13.2.1'/><u><FormattedMessage id='tuto.txt.13.2.2'/></u><FormattedMessage id='tuto.txt.13.2.3'/>
-                    <br/>
-                    <FormattedMessage id='tuto.txt.13.3.1'/><b>Liam</b> <FormattedMessage id='tuto.txt.13.3.2'/>
-                  </Card.Text>
-                </Card.Body>
-              </Card>
-          </Modal.Body>
-          <Modal.Footer style={{display:'flex'}}>
-            <Button variant="primary" onClick={handleCloseTuto22}><FormattedMessage id='compris'/></Button>
-          </Modal.Footer>
-        </Modal>
-
-        <Modal
-          show={showTuto3}
-          onHide={handleCloseTuto3}
-          backdrop="static"
-          keyboard={false}
-          size="lg"
-          style={{ maxHeight: '100vh'}}>
-          <Modal.Header>
-            <Modal.Title>The End Game</Modal.Title>
-          </Modal.Header>
-          <Modal.Body style={{ display:'flex', justifyContent:'center', alignItems:'center', flexDirection:'column'}}>
-              <Card style={{ width: '100%', display:'flex', justifyContent:'center', alignItems:'center', flexDirection:'column'}}>
-                <Card.Img variant="top" src={step6} style={{width:'250px', height:'auto'}}/>
-                <Card.Body>
-                  <Card.Title><FormattedMessage id='tuto.title.14'/></Card.Title>
-                  <Card.Text>
-                    <FormattedMessage id='tuto.txt.14.1'/>
-                    <br/>
-                    <FormattedMessage id='tuto.txt.14.2'/>
-                    <ul>
-                      <li>
-                        <FormattedMessage id='tuto.txt.14.3'/><i>{indices[1]?.ToString(locale)}</i>.
-                      </li>
-                      <li>
-                        <FormattedMessage id='tuto.txt.14.4'/><i>{indices[2]?.ToString(locale)}</i>.
-                      </li>
-                      <li>
-                        <FormattedMessage id='tuto.txt.14.5'/><i>{indices[0]?.ToString(locale)}</i>.
-                      </li>
-                    </ul>
-                    <FormattedMessage id='tuto.txt.14.6.1'/><b><FormattedMessage id='tuto.txt.14.6.2'/></b><FormattedMessage id='tuto.txt.14.6.3'/><b><FormattedMessage id='tuto.txt.14.6.4'/></b><FormattedMessage id='tuto.txt.14.6.5'/>
-                  </Card.Text>
-                </Card.Body>
-              </Card>
-          </Modal.Body>
-          <Modal.Footer style={{display:'flex'}}>
-            <Button variant="primary" onClick={handleCloseTuto3}><FormattedMessage id='compris'/></Button>
-          </Modal.Footer>
-        </Modal>
-      </div>
-    );
-  };
-  
-
-export default Tutorial;

cryptide_project/src/Script/LatexScript.tsx

@@ -14,7 +14,6 @@ import Pair from "../model/Pair";
 
 function generateLatexCode(personsNet : PersonNetwork, choosenPerson : Person, choosenIndices : Indice[], network: Network): string {
     let latexCode = "";
-
     //*Setup
     latexCode += "\\documentclass[11pt]{article}\n"
     latexCode += "\\usepackage[landscape]{geometry}\n"
@@ -82,11 +81,13 @@ function generateLatexCode(personsNet : PersonNetwork, choosenPerson : Person, c
     choosenIndices.forEach((indice, index) => {
 
         latexCode += `\\item Indice ${index + 1} : ${indice.ToString('fr')}.\n`
+        console.log("coucou")
+        console.log(indice.ToString("fr"))
     })
     latexCode += "\\end{compactitem}\n"
 
     //* Solution
-    latexCode += "Solution : " + choosenPerson.getName() + "\n";
+    latexCode += "% Solution : " + choosenPerson.getName() + "\n";
     
     latexCode += "\\end{document}\n"
 
@@ -123,7 +124,7 @@ function generateLatexCodeEnigme(personsNet : PersonNetwork, choosenPerson : Per
     latexCode+= "\\begin{tikzpicture}[scale=.18]\n"
     
     
-    personsNet.getPersons().forEach((person, index) => {
+    personsNet.getPersons().sort().forEach((person, index) => {
 
         var nodesData = network.getPositions();
         // Obtenir les coordonnées du nœud
@@ -192,14 +193,8 @@ function generateLatexCodeEnigme(personsNet : PersonNetwork, choosenPerson : Per
     latexCode += "\\end{compactitem}\n"
 
     //* Solution
-    latexCode += "Solution : " + choosenPerson.getName() + "\n";
+    latexCode += "% Solution : " + choosenPerson.getName() + "\n";
     
-    latexCode += "\\begin{compactitem}\n"
-    choosenIndices.forEach((indices, index) => {
-        latexCode += `\\item Indice ${index + 1}: ${indices.ToString("fr")}\n`
-    })
-
-    latexCode += "\\end{compactitem}\n"
     latexCode += "\\end{document}\n"
 
    return latexCode

cryptide_project/src/Style/Global.css

@@ -59,16 +59,6 @@
     justify-content: center;
 }
 
-.playerNameDisplay{
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    background-color:#fff;
-    border: solid 3px #0064E0;
-    border-radius: 15px;
-    width: 100%;
-}
-
 /**Form**/
 .form-container {
     /* background-color: #D7D4C6; */
@@ -84,8 +74,6 @@ form{
     columns: 2 auto;
 }
 
-
-
 /* LeaderBoard */
 .LeaderBoardiv{  
     border: solid;

cryptide_project/src/Translations/en.json

@@ -1,9 +1,6 @@
 {
     "languageSelector.french": "French",
     "languageSelector.english": "English",
-    "languageSelector.espagnol": "Espagnol",
-    "languageSelector.portuguese": "Portuguese",
-    "languageSelector.russian": "Russian",
 
     "home.histoire.title": "HISTORY",
     "home.histoire": "Cryptozoology studies the traces of legendary monsters: cryptids. Yetis, Chupacabra, beast of the gevaudan, Dahut, etc. , are very serious topics for you… Cross the clues and be the first to discover them!",
@@ -26,13 +23,6 @@
     "sign_up":" Sign up ",
     "log_out":" Log out ",
 
-    "indice":"Hint",
-    "param":"Settings",
-    "sfx":"Activate sounds",
-    "aide":"Help",
-
-    "majUn":"A",
-
     "join" : "Join",
     "create_room" : "Create room",
     "play_solo" : "Single player",
@@ -51,10 +41,6 @@
     "redhead": "Red",
     "brown": "Brown",
 
-
-    "oui": "yes",
-    "non": "no",
-
     "and": "and",
     "or": "or",
     "or_sport": "or",
@@ -79,80 +65,15 @@
     "sport_start": "The suspect plays at least",
     "sport_end": "",
 
-    "navbar.play" : "Play",
-    "navbar.presentation":"Presentation",
-    "navbar.info":"Information",
 
-    
+
-    "hard": "Hard",
+
-    "medium": "Medium",
+
-    "strong": "Strong",
+
-    "weak": "Weak",
+
-    "none": "None",
+
-    
+
-    "turn" : "Round",
+
-    "square":"square",
-    "round":"round",
-
-    "step": "Step",
-    "previous": "Previous",
-    "next": "Next",
-    "continue": "Continue",
-    "compris": "Understood!",
-    "close": "Close",
-
-    "regenerate":"Regenarte graph",
-    "BackHome" : "Back to home",
-    "askeveryone" : "Ask everyone",
-
-    "color.green":"Green",
-    "color.blue":"Blue",
-    "color.red":"Red",
-    "color.yellow":"Yellow",
-
-    "play.jouerseul": "Play alone",
-    "play.enigme": "Solve an enigma",
-    "play.enigme.easy": "Easy",
-    "play.enigme.medium": "Intermediate",
-    "play.enigme.hard": "Hard",
-
-    "play.create": "Create a game",
-    "play.tuto": "Tutorial",
-    "play.return": "Return to game",
-
-    "lobbies.all":"All",
-    "lobbies.dispo":"Disponible",
-
-    "placeholder.searchLobby": "Search for a lobby...",
-
-    "score.nbPlayed": "Games Played",
-    "score.best": "Best Score",
-    "score.moy": "Average Attempts",
-    "score.NbWin": "Number of Wins",
-    "score.ratio": "Win/Loss Ratio",
-    "score.bestTmp": "Best Time",
-    "score.moyTmp": "Average Time",
-    "score.nothing": "Nothing for the moment",
-
-    "score.titre.easy": "Easy Enigma",
-    "score.titre.int": "Intermediate Enigma",
-    "score.titre.hard": "Hard Enigma",
-    "score.online": "Online",
-
-    "score.tab.stat" : "Your Stats",
-    "score.tab.quoti" : "Daily",
-    "score.tab.hebdo" : "Weekly",
-
-    "lobby.players" : "Players",
-    "lobby.bienvenue": "Welcome to your lobby!",
-    "lobby.wait": "Wait for all your friends to join before starting the game.",
-    "lobby.invite": "Invite friends",
-    "lobby.copyLink": "Link copied",
-    "lobby.nbNode": "Select the number of nodes (between 20 and 60)",
-    "lobby.start": "Start the game!",
-
-    "game.yourTurn":"It's your turn !",
-    "game.wrong":"Wrong choice, put a square !",
 
     "informations" : "Information",
     "info.intro.title":"Introduction to the game :",
@@ -190,11 +111,6 @@
     "hair.chatain":"Brown",
     "hair.noir":"Black",
 
-    "param.node": "Select the number of nodes (between 20 and 50)",
-    "param.clue": "Select the number of clues (between 3 and 6)",
-    "param.valid": "Validate",
-
-
     "info.composant.sport.title":"Sports",
     "info.composant.sport":"The characters' hobbies are represented by five sports respectively :",
     "info.composant.baseball":"Baseball",
@@ -213,15 +129,6 @@
     "info.objectif.t3":"Counter-manipulation",
     "info.objectif.t3.text":"If a player places a square token, the questioner must also play his game by placing a square token of his color on a node of the graph. Countermanipulation becomes a formidable weapon to divert the accusation and sow confusion.",
 
-    "info.interface": "Game Interface",
-    "info.interface.text": "For each game, you will have certain interface elements available:",
-    "info.interface.param": "The 'Settings' button allows the display and management of various game settings, such as enabling or disabling sound effects. It is also possible to choose the number of nodes for the 'Enigma' game mode using this button.",
-    "info.interface.reset": "The 'Reset' button resets the current state of the graph. If you have moved it too much or want its display to be neater, this button is for you!",
-    "info.interface.info": "The 'Information' button redirects to the game rule page (this one).",
-    "info.interface.fiche": "The 'Clue Deduction Sheet' button displays a table that, along with the progress of the game, allows deducing which clues are most likely for each player.",
-    "info.interface.indice": "The 'Personal Clue' button is the most important; it displays your secret clue. Only you know it! You'll have to be clever to deceive your friends and keep it a secret for as long as possible!",
-    "info.interface.vision": "The 'Last Moves Vision' button allows the user to visualize the last 5 moves made. It acts as a visual tool.",
-
     "etape":"Step",
     "info.deroulement.e1":"Ask Strategic Questions",
     "info.deroulement.e1.text":"Each round begins with a player asking another player a question about a person on the graph. Answers are formulated by placing square or round tokens to indicate certainty or doubt as to the involvement of this person.",
@@ -233,125 +140,5 @@
     "info.indice-possible.age":"Person's age",
     "info.indice-possible.hair":"Hair color of a person",
     "info.indice-possible.sport":"Sport(s) of a person",
-    "info.indice-possible.voisin":"Character of neighbours",
+    "info.indice-possible.voisin":"Character of neighbours"
-
-    "info.mdj": "Game Modes",
-    "info.mdj.text": "There are various other game modes that allow you to add variety and make the game more or less complex.",
-    "info.mdj.mastermind": "Mastermind",
-    "info.mdj.mastermind.text": "The 'Mastermind' game mode is a solo mode where you must be able to guess the culprit using the minimum number of guesses. In this mode, you won't have any clues, but you'll need to guess them during the game. Selecting a suspect reveals the state of all clues for that suspect. It becomes possible to guess the clues and then identify the culprit!",
-    "info.mdj.enigme": "Enigma",
-    "info.mdj.enigme.text": "This is a solo mode with three difficulty levels:",
-    "info.mdj.enigme.easy": "Easy Enigma",
-    "info.mdj.enigme.easy.txt": "In this game mode, you have access to all clues, and you must guess the culprit that matches all these clues. You can practice guessing the culprit in this mode.",
-    "info.mdj.enigme.medium": "Intermediate Enigma",
-    "info.mdj.enigme.medium.txt": "In this game mode, you don't have access to clues, but you have just enough information about some suspects to be able to guess the culprit. This information will help you guess the clues, and the culprit is the suspect for whom all the clues match. If you select the wrong suspect, don't worry! You'll have information about that suspect, making it easier for you to find the culprit. The goal is to find the culprit in the minimum number of guesses.",
-    "info.mdj.enigme.hard": "Hard Enigma",
-    "info.mdj.enigme.hard.txt": "This final variant is similar to the intermediate enigma; however, you must find the culprit on the first try, or you lose! It's up to you to play! The goal is to find the culprit in the minimum amount of time.",
-
-    "tutorial.title": "Tutorial",
-
-    "tuto.title.1": "Welcome to SocialGraph!",
-    "tuto.txt.1.1": "You play as a glory-seeking detective faced with a crime.",
-    "tuto.txt.1.2": "However, other investigators are also on the case, all seeking the title of the world's best detective.",
-    "tuto.txt.1.3": "Each has a crucial clue to identify the culprit; you'll need to deduce your competitors' clues if you want to win!",
-    "tuto.txt.1.4": "Interrogate your competitors to get answers with yes or no, but beware, a refusal has consequences.",
-    "tuto.txt.1.5": "Be the first to deduce the clues of others and find the culprit to win the coveted recognition.",
-    "tuto.txt.1.6": "If you have any doubts, click on the 'help' button to display the current tutorial step.",
-
-    "tuto.title.2": "The Suspects",
-    "tuto.txt.2.1": "Here is how a suspect is represented; each suspect has different characteristics, including their name, age, sport, and hair color.",
-    "tuto.txt.2.2": "For example, here we have ",
-    "tuto.txt.2.2.1": ", who is ",
-    "tuto.txt.2.2.2": ", practicing ",
-    "tuto.txt.2.2.3": " and ",
-    "tuto.txt.2.2.4": ", has ",
-    "tuto.txt.2.2.5": " hair, and possesses ",
-
-    "tuto.title.3": "The Clues",
-    "tuto.txt.3.1": "In this game, each detective has a clue that identifies a characteristic of the culprit. Your clue is:",
-    "tuto.txt.3.2": "The suspect is between 20 and 29 years old.",
-
-    "tuto.title.4": "The Detectives",
-    "tuto.txt.4.1": "It is possible to see the detectives on the left side of the screen, represented by circles of different colors. The square outline means that the detective is in deep thought.",
-    "tuto.txt.4.2": "To interrogate a detective about a suspect, select the detective, then click on the suspect you want. The detective will respond with what he thinks of this suspect based on his clue.",
-
-    "tuto.title.5": "The Responses",
-    "tuto.txt.5.1": "Detectives will respond to you only with circles or squares of their color.",
-    "tuto.txt.5.2": " means that their clue clears the suspect.",
-    "tuto.txt.5.3": " means that their clue may incriminate the suspect.",
-    "tuto.txt.5.4": "For example, here:",
-    "tuto.txt.5.5.1": "Scooby-Doo's clue ",
-    "tuto.txt.5.5.2": "clears Logan.",
-    "tuto.txt.5.6": "Eleanor can be suspected based on Batman's clue.",
-    "tuto.txt.5.7.1": "Evelyn is cleared by the clues of ",
-    "tuto.txt.5.7.2": "3 different detectives.",
-
-    "tuto.title.6": "The Rules of the Game",
-    "tuto.txt.6.1.1": "This button takes you to the game's ",
-    "tuto.txt.6.1.2": "information page",
-    "tuto.txt.6.1.3": ", with all the rules of the game, including objectives, clues, flow, etc.",
-
-    "tuto.title.7": "The Clue",
-    "tuto.txt.7.1": "This button allows you to display your personal clue; keep it a secret! It is your best asset to win.",
-
-    "tuto.title.8": "Time to Practice!",
-    "tuto.txt.8.1": "Well done! You now have all the basics of a real detective.",
-    "tuto.txt.8.2": "You will now have a practical exercise for solving a case, alongside our dear Batman and Scooby-Doo.",
-    "tuto.txt.8.3": "Click 'Continue' to start your first game.",
-
-    "tuto.title.9": "First Steps",
-    "tuto.txt.9.1": "Welcome to this second part, where we will learn the flow of a real investigation.",
-    "tuto.txt.9.2.1": "First, select player ",
-    "tuto.txt.9.2.2": " and question them about the suspect named ",
-    "tuto.txt.9.2.3": " by clicking on the latter.",
-
-    "tuto.title.10": "Your First Turn",
-    "tuto.txt.10.1.1": "Great, ",
-    "tuto.txt.10.1.2": "Violet has been identified by Scooby-Doo's clue",
-    "tuto.txt.10.1.3": ", which is essential information! However, this does not necessarily ",
-    "tuto.txt.10.1.4": "mean",
-    "tuto.txt.10.1.5": " that she is guilty.",
-    "tuto.txt.10.2": "Now, it's the other players' turn to play; let's see what they did.",
-
-    "tuto.title.11": "Other Players' First Turn",
-    "tuto.txt.11.1.1": "It seems that Scooby-Doo also questioned Batman about Violet, and Batman responded with ",
-    "tuto.txt.11.1.2": "a square. This means Violet is not guilty and is innocent!",
-    "tuto.txt.11.2.1": "Scooby-Doo made a mistake by questioning someone who could clear Violet. As a ",
-    "tuto.txt.11.2.2": "punishment",
-    "tuto.txt.11.2.3": ", he must also place a square on another player, revealing more information about his clue. So now we know that Scooby-Doo's clue does not identify Sebastian.",
-    "tuto.txt.11.3": "Next, Batman questioned Scooby-Doo about Charlotte, identified by Scooby-Doo's clue.",
-
-    "tuto.title.12": "Second Turn",
-    "tuto.txt.12.1.1": "You notice that ",
-    "tuto.txt.12.1.2": "your clue also identifies Charlotte",
-    "tuto.txt.12.1.3": ", so what if we ask Batman if he thinks Charlotte is the culprit?",
-    "tuto.txt.12.2": "This would allow us to end the game!",
-
-    "tuto.title.13": "The Punishment",
-    "tuto.txt.13.1.1": "Oh no, it seems that Batman's clue clears Charlotte, and you have made a mistake; the ",
-    "tuto.txt.13.1.2": "punishment",
-    "tuto.txt.13.1.3": " applies!",
-    "tuto.txt.13.2.1": "So, you must place a ",
-    "tuto.txt.13.2.2": "square on another player",
-    "tuto.txt.13.2.3": ", revealing more information about your clue.",
-    "tuto.txt.13.3.1": "But all is not lost! Let's place our square on ",
-    "tuto.txt.13.3.2": "for that, select the desired suspect directly.",
-
-    "tuto.title.14": "The End of the Game",
-    "tuto.txt.14.1": "This turn is also rich in information!",
-    "tuto.txt.14.2": "You now have enough information to guess the clues of others:",
-    "tuto.txt.14.3": "Scooby-Doo seems to have:",
-    "tuto.txt.14.4": "Batman seems to have:",
-    "tuto.txt.14.5": "And your clue is:",
-    "tuto.txt.14.6.1": "You now have all the cards in hand to guess who the culprit is. Click the ",
-    "tuto.txt.14.6.2": "Ask Everyone",
-    "tuto.txt.14.6.3": " button, then select a suspect to make an ",
-    "tuto.txt.14.6.4": "accusation",
-    "tuto.txt.14.6.5": " to guess. Good luck!",
-
-    "history.mis": " placed a ",
-    "à": "to",
-    "history.cantPose": " can no longer place a square",
-    "history.NotCoupable": " is not the culprit!"
-
 }

cryptide_project/src/Translations/es.json

@@ -1,163 +0,0 @@
-{
-    "languageSelector.french": "Francés",
-    "languageSelector.english": "Inglés",
-    "languageSelector.espagnol": "Español",
-    "languageSelector.portuguese": "Portugués",
-    "languageSelector.russian": "Ruso",
-
-    "home.histoire.title": "HISTORIA",
-    "home.histoire": "La criptozoología estudia las huellas de monstruos legendarios: criptidos. Yetis, Chupacabra, bestia de Gévaudan, Dahut, etc. son temas muy serios para ti... Cruza las pistas y sé el primero en descubrirlos.",
-
-    "home.jeu.title": "EL JUEGO",
-    "home.jeu": "Cada jugador tiene una pista en el campo donde se encuentra la criatura. Cruzando tu información, solo puede haber una casilla. Pero el objetivo es ser el primero en encontrarla. Pregunta a tus colegas y, sin embargo, competidores. Solo pueden responderte con un 'no' o un 'quizás', con mucha lógica y un poco de audacia, ¡puedes entrar en la leyenda!",
-
-    "home.plus.title": "FORTALEZAS",
-    "home.plus.1": "Un mecanismo de deducción asombroso.",
-    "home.plus.2": "Una inmensa rejugabilidad.",
-    "home.plus.3": "Un tema sorprendente y fuerte.",
-
-    "game.time": "Tiempo: 45 minutos",
-    "game.players": "Jugadores: de 3 a 5 jugadores",
-    "game.age": "Edad: 10 años en adelante",
-    "game.createdBy": "Creado por:",
-    "game.illustratedBy": "Ilustrado por:",
-
-    "log_in": "Iniciar sesión",
-    "sign_up": "Registrarse",
-    "log_out": "Cerrar sesión",
-
-    "join": "Unirse",
-    "create_room": "Crear sala",
-    "play_solo": "Jugador individual",
-
-    "play": "JUGAR",
-
-    "football": "Fútbol",
-    "basketball": "Baloncesto",
-    "baseball": "Béisbol",
-    "tennis": "Tenis",
-    "bowling": "Bolos",
-
-    "white": "Blanco",
-    "black": "Negro",
-    "blond": "Rubio",
-    "redhead": "Pelirrojo",
-    "brown": "Marrón",
-
-    "and": "y",
-    "or": "o",
-    "or_sport": "o",
-
-    "age_indice_start": "El sospechoso tiene entre",
-    "age_indice_more_start": "El sospechoso tiene al menos",
-    "age_indice_end": "años",
-
-    "color_edges_start": "El sospechoso tiene al menos un amigo con cabello",
-    "color_edges_end": "",
-
-    "color_start": "El sospechoso tiene cabello",
-    "color_end": "",
-
-    "nb_friends_indice_start": "El sospechoso tiene",
-    "nb_friends_indice_end": "amigos",
-
-    "nb_sports_indice_start": "El sospechoso juega",
-    "nb_sports_indice_end": "deporte(s)",
-
-    "sport_start": "El sospechoso juega al menos",
-    "sport_end": "",
-
-    "navbar.play" : "Jugar",
-    "navbar.presentation":"Presentación",
-    "navbar.info":"Información",
-
-    "round":"Vuelta",
-
-    "informations": "Información",
-    "info.intro.title": "Introducción al juego:",
-    "info.intro.text": "¡Bienvenido a nuestro emocionante juego de deducción, donde la intriga y la travesura se combinan en una emocionante aventura! Sumérgete en un mundo de misterio e intriga, donde cada interacción cuenta y cada pista te acerca a la verdad. Imagina un gráfico complejo donde cada vértice representa a una persona, cada eje una relación, y cada detalle cuenta. Te sumerges en un desafiante reto para descubrir quién entre estas personas es el misterioso asesino. Cada jugador tiene una pista crucial y solo el intercambio estratégico de estas pistas te llevará a resolver el misterio. Explora nuestra página de reglas para entender las complejidades del juego, descubre pistas que pueden guiarte y desarrolla estrategias inteligentes para identificar al culpable. ¡Manipula a tus amigos para ser el primero en descubrir quién es el asesino oculto en el gráfico! ¿Estás listo para aceptar el desafío y desenmascarar al asesino oculto en el gráfico? ¡Que comience la investigación!",
-
-    "info.sommaire": "Contenidos",
-
-    "info.title.composant": "Componentes del juego",
-    "info.title.objectif": "Objetivo del juego",
-    "info.title.deroulement": "Desarrollo del juego",
-    "info.title.indice_possible": "Posible pista del juego",
-
-    "info.pions": "Peones",
-    "info.composant.text": "A cada jugador se le asignará un color específico que distinguirá las acciones representadas por los peones de la siguiente manera:",
-
-    "info.composant.carre.title": "Fichas cuadradas",
-    "info.composant.carre": "Estas fichas indican una negación. Cuando un jugador coloca una ficha cuadrada, significa que su pista elimina a la persona designada.",
-
-    "info.composant.rond.title": "Fichas redondas",
-    "info.composant.rond": "Estas fichas representan un 'quizás'. El jugador que deposita esta ficha afirma que la persona es sospechosa, pero esto no garantiza su culpabilidad. ¡Solo hay un sospechoso que lleva una ficha redonda para todos los jugadores en el juego, y ese es el culpable!",
-
-    "info.car_perso": "Características",
-    "info.composant.textcar": "Además de sus nombres, los personajes están representados con otras características:",
-
-    "info.composant.age.title": "Edades",
-    "info.composant.age": "Cada persona tiene una edad para autenticarlos, que varía entre 0 y 60 años. La edad es una característica que se confirmará con pistas en forma de ",
-    "info.composant.age.link": "grupos de edad",
-
-    "info.composant.hair_col.title": "Colores de cabello",
-    "info.composant.hair_col": "Los personajes también tienen un color de cabello, que puede ser de los siguientes colores:",
-
-    "hair.blanc": "Blanco",
-    "hair.blond": "Rubio",
-    "hair.roux": "Pelirrojo",
-    "hair.chatain": "Marrón",
-    "hair.noir": "Negro",
-
-    "info.composant.sport.title": "Deportes",
-    "info.composant.sport": "Los hobbies de los personajes están representados por cinco deportes respectivamente:",
-    "info.composant.baseball": "Béisbol",
-    "info.composant.basketball": "Baloncesto",
-    "info.composant.bowling": "Bowling",
-    "info.composant.football": "Fútbol",
-    "info.composant.tennis": "Tenis",
-    "info.composant.sport.bis": "Entre estos deportes, cada personaje puede tener entre 0 y 3 deportes, lo que facilita su identificación utilizando las pistas que tienes.",
-
-    "info.objectif.intro": "Bienvenido al ingenioso universo de nuestro juego de deducción, donde el engaño y la astucia son las claves del éxito. Tu misión es desentrañar el misterio detrás de cada interacción del complejo gráfico que representa las relaciones entre individuos.",
-    "info.objectif.t1": "Manipulación Sutil",
-    "info.objectif.t1.text": "El objetivo final es descubrir quién entre los individuos es el asesino, pero no a través de una colaboración abierta. Por el contrario, utilizarás una manipulación sutil para difuminar las líneas y distraer a tus oponentes. Haz preguntas estratégicas, responde con malicia y siembra pistas engañosas para acercarte al resultado.",
-    "info.objectif.t2": "Trucos",
-    "info.objectif.t2.text": "Cada ronda ofrece la oportunidad de sembrar dudas entre tus oponentes. Cuando un jugador te hace preguntas, responde colocando inteligentemente un token cuadrado para indicar que 'según tu pista, esa persona no puede ser el culpable' o un token redondo para sugerir que permanezcan en la lista de sospechosos. Ten cuidado, porque cada gesto puede interpretarse, y la verdad a menudo está oculta detrás de una fachada de pistas engañosas.",
-    "info.objectif.t3": "Contramanipulación",
-    "info.objectif.t3.text": "Si un jugador coloca un token cuadrado, el que hace la pregunta también debe jugar su juego colocando un token cuadrado de su color en un nodo del gráfico. La contramanipulación se convierte en un arma formidable para desviar la acusación y sembrar la confusión.",
-
-    "info.interface": "Interfaz de juego",
-    "info.interface.text": "Para cada juego, tendrás disponibles ciertos elementos de interfaz:",
-    "info.interface.param": "El botón 'Configuración' permite mostrar y gestionar varias configuraciones del juego, como activar o desactivar efectos de sonido. También es posible elegir el número de nodos para el modo de juego 'Enigma' con este botón.",
-    "info.interface.reset": "El botón 'Restablecer' restablece el estado actual del gráfico. Si lo has movido demasiado o quieres que su visualización sea más ordenada, ¡este botón es para ti!",
-    "info.interface.info": "El botón 'Información' redirige a la página de reglas del juego (esta).",
-    "info.interface.fiche": "El botón 'Hoja de Deducción de Pistas' muestra una tabla que, junto con el progreso del juego, permite deducir qué pistas son más probables para cada jugador.",
-    "info.interface.indice": "El botón 'Pista Personal' es el más importante; muestra tu pista secreta. ¡Solo tú lo sabes! Tendrás que ser astuto para engañar a tus amigos y mantenerlo en secreto el mayor tiempo posible!",
-    "info.interface.vision": "El botón 'Visión de los Últimos Movimientos' permite al usuario visualizar los últimos 5 movimientos realizados. Actúa como una herramienta visual.",
-
-    "etape": "Paso",
-    "info.deroulement.e1": "Hacer preguntas estratégicas",
-    "info.deroulement.e1.text": "Cada ronda comienza con un jugador haciendo preguntas a otro jugador sobre una persona en el gráfico. Las respuestas se formulan colocando fichas cuadradas o redondas para indicar certeza o duda sobre la participación de esa persona.",
-    "info.deroulement.e2": "Contramanipulación y Contra-pregunta",
-    "info.deroulement.e2.text": "Si un jugador coloca una ficha cuadrada, el que hace la pregunta también debe colocar una ficha cuadrada en un nodo del gráfico. Las contra-preguntas son una forma de confundir a los jugadores y desviar la acusación.",
-    "info.deroulement.e3": "La Adivinanza Final",
-    "info.deroulement.e3.text": "El juego alcanza su clímax cuando un jugador intenta la 'Adivinanza' final, afirmando que tal persona es el asesino. Otros jugadores",
-
-    "info.indice-possible.age": "Edad de la persona",
-    "info.indice-possible.hair": "Color de pelo de una persona",
-    "info.indice-possible.sport": "Deporte(s) de una persona",
-    "info.indice-possible.voisin": "Personaje de los vecinos",
-
-    "info.mdj": "Modos de juego",
-    "info.mdj.text": "Existen varios modos de juego que te permiten agregar variedad y hacer el juego más o menos complejo.",
-    "info.mdj.mastermind": "Mastermind",
-    "info.mdj.mastermind.text": "El modo de juego 'Mastermind' es un modo para un solo jugador donde debes ser capaz de adivinar al culpable utilizando el menor número de suposiciones. En este modo, no tendrás ninguna pista, pero deberás adivinarlas durante el juego. Seleccionar a un sospechoso revela el estado de todas las pistas para ese sospechoso. ¡Se vuelve posible adivinar las pistas y luego identificar al culpable!",
-    "info.mdj.enigme": "Enigma",
-    "info.mdj.enigme.text": "Este es un modo para un solo jugador con tres niveles de dificultad:",
-    "info.mdj.enigme.easy": "Enigma Fácil",
-    "info.mdj.enigme.easy.txt": "En este modo de juego, tienes acceso a todas las pistas y debes adivinar al culpable que coincide con todas estas pistas. Puedes practicar adivinando al culpable en este modo.",
-    "info.mdj.enigme.medium": "Enigma Intermedio",
-    "info.mdj.enigme.medium.txt": "En este modo de juego, no tienes acceso a pistas, pero tienes información suficiente sobre algunos sospechosos para poder adivinar al culpable. Esta información te ayudará a adivinar las pistas, y el culpable es el sospechoso para el cual todas las pistas coinciden. Si seleccionas al sospechoso equivocado, ¡no te preocupes! Tendrás información sobre ese sospechoso, lo que facilitará encontrar al culpable. El objetivo es encontrar al culpable en el menor número de suposiciones.",
-    "info.mdj.enigme.hard": "Enigma Difícil",
-    "info.mdj.enigme.hard.txt": "Esta variante final es similar al enigma intermedio; sin embargo, ¡debes encontrar al culpable en el primer intento, o pierdes! ¡Depende de ti jugar! El objetivo es encontrar al culpable en el menor tiempo posible."
-}

cryptide_project/src/Translations/fr.json

@@ -1,9 +1,6 @@
 {
     "languageSelector.french": "Français",
     "languageSelector.english": "Anglais",
-    "languageSelector.espagnol": "Espagnol",
-    "languageSelector.portuguese": "Portugais",
-    "languageSelector.russian": "Russe",
 
     "home.histoire.title": "L'HISTOIRE",
     "home.histoire": "La cryptozoologie étudie les traces des monstres de légende : les cryptides. Yétis, Chupacabra, bête du gévaudan, Dahut, etc., sont des sujets très sérieux pour vous… Croisez les indices et soyez le premier à les découvrir!",
@@ -26,12 +23,6 @@
     "sign_up":" S'inscrire ",
     "log_out":" Se déconnecter ",
 
-    "indice":"Indice",
-    "param":"Paramètres",
-    "sfx":"Activer les sons",
-    "aide":"Aide",
-
-    "majUn":"Un",
 
     "join" : "Rejoindre",
     "create_room" : "Créer une partie",
@@ -50,10 +41,6 @@
     "redhead": "Roux",
     "brown": "Brun",
 
-
-    "oui": "oui",
-    "non": "non",
-
     "and": "et",
     "or": "ou",
     "or_sport": "ou du",
@@ -77,85 +64,19 @@
     "sport_start": "Le suspect pratique au moins du",
     "sport_end": "",
 
-    "navbar.play" : "Jouer",
+
-    "navbar.presentation":"Présentation",
+
-    "navbar.info":"Informations",
+
-
+
-    "hard" : "Difficile",
+
-    "medium" : "Intermédiaire",
+
-    "strong" : "Fort",
+
-    "weak" : "Faible",
+
-    "none" : "Aucun",
+
-
-    "turn" : "Tour",
-    "square":"carré",
-    "round":"rond",
-
-    "step" : "Étape",
-    "previous" : "Précédent",
-    "next" : "Suivant",
-    "continue" : "Poursuivre",
-    "compris":"Compris !",
-    "close" : "Fermer",
-
-    "askeveryone" : "Demandez à tous",
-
-    "regenerate":"Regénérer le graph",
-    "BackHome" : "Retour à l'accueil",
-
-    "color.green":"Vert",
-    "color.blue":"Bleu",
-    "color.red":"Rouge",
-    "color.yellow":"Jaune",
-
-    "play.jouerseul": "Mastermind",
-    "play.enigme": "Résoudre une énigme",
-    "play.enigme.easy": "Facile",
-    "play.enigme.medium": "Intermédiaire",
-    "play.enigme.hard": "Difficile",
-
-    "play.create":"Créer une partie",
-    "play.tuto": "Tutoriel",
-    "play.return": "Retourner à la partie",
-
-    "lobbies.all":"Tous",
-    "lobbies.dispo":"Disponibles",
-
-    "placeholder.searchLobby": "Rechercher un lobby...",
-
-    "score.nbPlayed" : "Parties Jouées",
-    "score.best" : "Best-Score",
-    "score.moy" : "Moyenne d'essai",
-    "score.NbWin" : "Nombre de victoire",
-    "score.ratio" : "Ratio V/D",
-    "score.bestTmp" : "Meilleur temps",
-    "score.moyTmp" : "Moyenne de temps",
-    "score.nothing" : "Rien pour le moment",
-
-    "score.titre.easy" : "Énigme facile",
-    "score.titre.int" : "Énigme intermédiaire",
-    "score.titre.hard" : "Énigme difficile",
-    "score.online" : "En ligne",
-
-    "score.tab.stat" : "Vos Stats",
-    "score.tab.quoti" : "Quotidien",
-    "score.tab.hebdo" : "Hebdomadaire",
-
-    "lobby.players" : "Joueurs",
-    "lobby.bienvenue" : "Bienvenue dans votre lobby !",
-    "lobby.wait" : "Attendez que tous vos amis rejoignent avant de lancer la partie.",
-    "lobby.invite" : "Inviter des amis",
-    "lobby.copyLink" : "Lien copié",
-    "lobby.nbNode" : "Sélectionner le nombre de noeud (entre 20 et 60) ",
-    "lobby.start" : "Démarrer la partie !",
-
-
-    "game.yourTurn":"À vous de jouer !",
-    "game.wrong":"Mauvais choix, posez un carré !",
 
     "informations" : "Informations",
     "info.intro.title":"Introduction au jeu :",
-    "info.intro.text":"Bienvenue dans notre jeu de déduction captivant, où l'intrigue et la malice se rejoignent dans une aventure palpitante ! Plongez-vous dans un monde de mystère et d'intrigue, où chaque interaction compte, et chaque indice vous rapproche de la vérité.Imaginez un graphique complexe où chaque sommet représente une personne, chaque axe une relation, et chaque détail compte. Vous êtes plongé dans un défi stimulant pour découvrir qui parmi ces individus est le mystérieux coupable. Chaque joueur détient un indice crucial, et seul le partage stratégique de ces indices vous mènera à la résolution du mystère. Explorez notre page de règles pour comprendre les subtilités du jeu, découvrez les indices qui peuvent vous guider, et élaborez des stratégies intelligentes pour identifier le coupable. Manipuler vos amis, afin d'être le premier à découvrir qui est le meurtrier ! Êtes-vous prêt à relever le défi et à démasquer le coupable caché dans le graphe ? Que l'enquête commence !",
+    "info.intro.text":"Bienvenue dans notre jeu de déduction captivant, où l'intrigue et la malice se rejoignent dans une aventure palpitante ! Plongez-vous dans un monde de mystère et d'intrigue, où chaque interaction compte, et chaque indice vous rapproche de la vérité.Imaginez un graphique complexe où chaque sommet représente une personne, chaque axe une relation, et chaque détail compte. Vous êtes plongé dans un défi stimulant pour découvrir qui parmi ces individus est le mystérieux tueur. Chaque joueur détient un indice crucial, et seul le partage stratégique de ces indices vous mènera à la résolution du mystère. Explorez notre page de règles pour comprendre les subtilités du jeu, découvrez les indices qui peuvent vous guider, et élaborez des stratégies intelligentes pour identifier le coupable. Manipuler vos amis, afin d'être le premier à découvrir qui est le meurtrier ! Êtes-vous prêt à relever le défi et à démasquer le tueur caché dans le graphe ? Que l'enquête commence !",
 
     "info.sommaire":"Sommaire",
 
@@ -189,12 +110,6 @@
     "hair.chatain":"Châtain",
     "hair.noir":"Noir",
 
-
-    "param.node":"Sélectionner le nombre de noeuds (entre 20 et 50)",
-    "param.clue":"Sélectionner le nombre d'indices (entre 3 et 6)",
-    "param.valid":"Valider",
-
-
     "info.composant.sport.title":"Les Sports",
     "info.composant.sport":"Les loisirs des personnages sont représentés par cinq sports respectivement :",
     
@@ -207,21 +122,12 @@
 
     "info.objectif.intro":"Bienvenue dans l'univers astucieux de notre jeu de déduction, où la tromperie et la ruse sont les clés du succès. Votre mission est de démêler le mystère qui se cache derrière chaque interaction du graphique complexe représentant les relations entre les individus.",
     "info.objectif.t1":"Manipulation Subtile",
-    "info.objectif.t1.text":"Le but ultime est de découvrir qui parmi les individus est le coupable, mais pas par une collaboration ouverte. Au contraire, vous utiliserez la manipulation subtile pour brouiller les pistes et détourner l'attention de vos adversaires. Posez des questions stratégiques, répondez avec malice, et plantez des indices trompeurs pour vous rapprocher du dénouement.",
+    "info.objectif.t1.text":"Le but ultime est de découvrir qui parmi les individus est le tueur, mais pas par une collaboration ouverte. Au contraire, vous utiliserez la manipulation subtile pour brouiller les pistes et détourner l'attention de vos adversaires. Posez des questions stratégiques, répondez avec malice, et plantez des indices trompeurs pour vous rapprocher du dénouement.",
     "info.objectif.t2":"Jeu de Duperie",
     "info.objectif.t2.text":"Chaque tour offre l'opportunité de semer le doute parmi vos adversaires. Lorsqu'un joueur vous interroge, répondez en plaçant habilement un jeton carré pour indiquer que 'selon votre indice, cette personne ne peut être le coupable' ou un jeton rond pour suggérer qu'elle reste dans la liste des suspects. Soyez prudent, car chaque geste peut être interprété, et la vérité est souvent cachée derrière une façade d'indices trompeurs.",
     "info.objectif.t3":"Contre-manipulation",
     "info.objectif.t3.text":"Si un joueur place un jeton carré, le questionneur doit également jouer son jeu en posant un jeton carré de sa couleur sur un nœud du graphique. La contre-manipulation devient une arme redoutable pour détourner l'accusation et semer la confusion.",
 
-    "info.interface":"Interface du jeu",
-    "info.interface.text":"Pour chacune des parties, vous aurez certains éléments d'interface à disposition :",
-    "info.interface.param":"Le bouton 'Paramètre' permet l'affichage et la gestion de différents paramètres de la partie, comme par exemple l'option d'activé ou non l' effect sonore. Il est aussi possible de choisir le nombre de nœud du mode de jeu 'Enigme' à l'aide de ce bouton.",
-    "info.interface.reset":"Le bouton 'Reset' permet de réinitialiser l'état du graphe actuel. Si jamais vous avez trop déplacé ce dernier, ou que vous souhaite que son affichage soit plus propre, ce bouton est fait pour vous !",
-    "info.interface.info":"Le bouton 'Information' permet de rediriger vers la page de règle du jeu (celle-ci).",
-    "info.interface.fiche":"Le bouton 'Fiche de déduction d'indice' permet l'affichage de tableau permettant, avec le déroulé de la partie, de déduire quels indices sont les plus probables pour chaque joueur.",
-    "info.interface.indice":"Le bouton 'Indice personnel' est le plus important, en effet, il permet d'afficher quel est votre indice secret. Vous seul le connaissez ! Il va falloir ruser pour tromper vos amis et le garder secret le plus longtemps possible !",
-    "info.interface.vision":"Le bouton 'Vision des derniers mouvements' permet à l'utilisateur de visualiser les 5 derniers coup effectué. Il agit donc vraiment comme un outil visuel.",
-    
     "etape":"Étape",
 
     "info.deroulement.e1":"Poser des Questions Stratégiques",
@@ -229,131 +135,10 @@
     "info.deroulement.e2":"Contre-manipulation et Contre-questions",
     "info.deroulement.e2.text":"Si un joueur place un jeton carré, le questionneur doit également poser un jeton carré sur un nœud du graphique. Les contre-questions sont un moyen de semer la confusion parmi les joueurs et de détourner l'accusation.",
     "info.deroulement.e3":"Le 'Guess' Final",
-    "info.deroulement.e3.text":"La partie atteint son apogée lorsqu'un joueur tente le 'Guess' final, affirmant que telle personne est le coupable. Les autres joueurs peuvent alors contredire cette affirmation en plaçant leurs propres jetons carrés. Si aucune réfutation n'est faite, le joueur ayant fait le 'Guess' remporte la partie, démontrant ainsi sa maîtrise dans l'art de la manipulation.",
+    "info.deroulement.e3.text":"La partie atteint son apogée lorsqu'un joueur tente le 'Guess' final, affirmant que telle personne est le tueur. Les autres joueurs peuvent alors contredire cette affirmation en plaçant leurs propres jetons carrés. Si aucune réfutation n'est faite, le joueur ayant fait le 'Guess' remporte la partie, démontrant ainsi sa maîtrise dans l'art de la manipulation.",
 
     "info.indice-possible.age":"Âge d'une personne",
     "info.indice-possible.hair":"Couleur de cheveux d'une personne",
     "info.indice-possible.sport":"Sport(s) d'une personne",
-    "info.indice-possible.voisin":"Caractèristique des voisins",
+    "info.indice-possible.voisin":"Caractèristique des voisins"
-
-    "info.mdj":"Modes de jeu",
-    "info.mdj.text":"Il existe différents autres modes de jeu, qui permettent de varier les plaisirs et de rendre le jeu plus ou moins complexe.",
-    "info.mdj.mastermind":"Mastermind",
-    "info.mdj.mastermind.text":"Le mode de jeu 'Mastermind' est un mode de jeu solo. Où vous devez être capable de deviner qui est le coupable en utilisant le minimum de coup. Pour cela, vous n'aurez aucun indice, mais vous allez devoir être capable de les deviner au cours de la partie. Sélectionner un suspect révéle l'état de tous les indices pour ce dernier. Il devient donc possible de deviner les indices, pour ensuite deviner le coupable !",
-    "info.mdj.enigme":"Énigme",
-    "info.mdj.enigme.text":"Il s'agit d'un mode solo, pour lequel on retrouve 3 modes de difficultés :",
-    "info.mdj.enigme.easy":"L'énigme facile",
-    "info.mdj.enigme.easy.txt":"Dans ce mode de jeu, vous avez accès à tous les indices, et vous devez deviner le coupable qui répond à tous ces indices. Vous pouvez donc vous entraîner à deviner le coupable dans ce mode.",
-    "info.mdj.enigme.medium":"L'énigme intermédiaire",
-    "info.mdj.enigme.medium.txt":"Dans ce mode de jeu, vous n'avez pas accès au indice, mais vous avez juste assez d'informations sur certains suspects pour pouvoir deviner le coupable. Ces informations vont vous permettre de deviner les indices, et le coupable est le suspect pour lequel tous les indices correspondent. Si jamais vous sélectionnez le mauvais suspect, pas de panique ! Vous aurez les informations relatives à ce dernier, ce qui vous facilitera le travail pour trouver le coupable. L'objectif est donc de trouver le coupable en un minimum de coup.",
-    "info.mdj.enigme.hard":"L'énigme difficile",
-    "info.mdj.enigme.hard.txt":"Cette dernière variante est similaire à l'énigme intermédiaire, cependant, il faudra trouver du premier coup sinon, vous aurez perdu ! À vous de jouer ! L'objectif est donc de trouver le coupable en un minimum de temps.",
-
-    "tutorial.title":"Tutoriel",
-    "tuto.title.1":"Bienvenue dans SocialGraph !",
-    "tuto.txt.1.1":"Vous incarnez un détective assoiffé de gloire, confronté à un crime.",
-    "tuto.txt.1.2":"Cependant, d'autres enquêteurs sont également sur le coup, tous cherchant à décrocher le titre de meilleur détective du monde.",
-    "tuto.txt.1.3":"Chacun possède un indice crucial pour identifier le coupable, il va falloir déduire l'indice de vos concurrents si vous souhaitez l'emporter !",
-    "tuto.txt.1.4":"Interrogez vos concurrents pour obtenir des réponses par oui ou non, mais méfiez-vous, un refus a des conséquences.",
-    "tuto.txt.1.5":"Soyez le premier à déduire les indices des autres et à trouver le coupable pour remporter la reconnaissance tant convoitée.",
-    "tuto.txt.1.6":"Si vous avez le moindre doute, cliquer sur le bouton 'aide' pour afficher l'étape actuel du tuto",
-
-    "tuto.title.2":"Les Suspects",
-    "tuto.txt.2.1":"Voici comment est représenté un suspect, chaque suspect possède différentes caractéristiques, que ce soit leur nom, âge, sport et leur couleur de cheveux.",
-    "tuto.txt.2.2":"Par exemple, ici, nous avons ",
-    "tuto.txt.2.2.1":", qui a ",
-    "tuto.txt.2.2.2":", qui pratique du ",
-    "tuto.txt.2.2.3":" et du ",
-    "tuto.txt.2.2.4":", qui a les cheveux ",
-    "tuto.txt.2.2.5":" et qui possède ",
-
-    "tuto.title.3":"Les indices",
-    "tuto.txt.3.1":"Dans ce jeu, chaque détective possède un indice, qui permet d'identifier une caractéristique du coupable, votre indice est le suivant :",
-    "tuto.txt.3.2":"Le suspect a entre 20 et 29 ans",
-    
-    "tuto.title.4":"Les Détectives",
-    "tuto.txt.4.1":"Il est possible de voir les détectives sur le côté gauche de l'écran, ils sont représentés par des cercles de couleurs différentes. Le contour carré signifie que ce détective est en pleine réflexion.",
-    "tuto.txt.4.2":"Pour interroger un détective à propos d'un suspect, il suffit de le sélectionner, puis de cliquer sur le suspect que vous souhaitez. Il vous répondra donc ce qu'il pense de ce suspect selon son indice.",
-
-    "tuto.title.5":"Les réponses",
-    "tuto.txt.5.1":"Les détéctives vous répondrons que par des ronds ou des carrés de leur couleur.",
-    "tuto.txt.5.2":" signifie que son indice innocente le suspect",
-    "tuto.txt.5.3":" signifie que son indice peut incréminer le suspect",
-    "tuto.txt.5.4":"Par exemple, ici :",
-    "tuto.txt.5.5.1":"l'indice du détéctive Scooby-Doo ",
-    "tuto.txt.5.5.2":" permet d'innocenter Logan",
-    "tuto.txt.5.6":"Eleanor peut être suspectée par l'indice du détective Batman ",
-    "tuto.txt.5.7.1":"Evelyn est innocentée par l'indice de ",
-    "tuto.txt.5.7.2":"3 détéctives différents",
-    
-    "tuto.title.6":"Les règles du jeu",
-    "tuto.txt.6.1.1":"Ce bouton vous mène à la page d'",
-    "tuto.txt.6.1.2":"information du jeu",
-    "tuto.txt.6.1.3":", avec toutes les règles du jeu, que ce soit les objectifs, les indices, le déroulement, etc.",
-
-    "tuto.title.7":"L'indice",
-    "tuto.txt.7.1":"Ce bouton vous permet d'afficher votre indice personnel, gardez le secret ! Il s'agit de votre meilleur atout pour gagner.",
-
-    "tuto.title.8":"Place à la pratique !",
-    "tuto.txt.8.1":"Bien joué ! Vous avez maintenant toutes les bases d'un veritable détéctive.",
-    "tuto.txt.8.2":"Vous allez à présent avoir un exercice pratique pour la résolution d'une enquête, au côté de ces très chère Batman et Scooby-Doo.",
-    "tuto.txt.8.3":"Cliquer sur 'Poursuivre' pour commencer votre première partie.",
-
-
-    "tuto.title.9":"Premier pas",
-    "tuto.txt.9.1":"Bienvenue dans cette seconde partie, où nous allons apprendre le déroulé d'une veritable enquête.",
-    "tuto.txt.9.2.1":"Dans un premier temps, sélectionnez le joueur ",
-    "tuto.txt.9.2.2":" et questionnez le à propos du suspect nommé ",
-    "tuto.txt.9.2.3":" en cliquant sur cette dernière.",
-
-    "tuto.title.10":"Votre premier tour",
-    "tuto.txt.10.1.1":"Super, ",
-    "tuto.txt.10.1.2":"Violet a été identifié par l'indice de Scooby-Doo",
-    "tuto.txt.10.1.3":", c'est une information essentielle ! Cependant, cela ne signifie ",
-    "tuto.txt.10.1.4":"pas forcément",
-    "tuto.txt.10.1.5":" qu'elle est coupable.",
-    "tuto.txt.10.2":"C'est à présent le tour aux autres joueurs de jouer, regardons ce qu'ils ont fait.",
-
-    "tuto.title.11":"Premier tour des autres joueurs",
-    "tuto.txt.11.1.1":"Il semblerait que Scooby-Doo ait lui aussi interrogé Batman à propos de Violet, et que ce dernier ait répondu ",
-    "tuto.txt.11.1.2":" par un carré. Cela signifie que Violet n'est pas coupable, et qu'elle est donc innocente !",
-    "tuto.txt.11.2.1":"Scooby-Doo a donc fait une erreur, en questionnant quelqu'un pouvant innocenter Violet. En guise de ",
-    "tuto.txt.11.2.2":"punition",
-    "tuto.txt.11.2.3":", il doit, lui aussi, poser un carré sur un autre joueur, révélant aussi plus d'information sur son indice.Nous savons donc maintenant que l'indice de Scooby-Doo ne permet pas d'identifier Sebastian.",
-    "tuto.txt.11.3":"Ensuite, Batman a questionné Scooby-Doo à propos de Charlotte, qui est identifié par l'indice de Scooby-Doo.",
-
-    "tuto.title.12":"Second tour",
-    "tuto.txt.12.1.1":"Vous remarquez que ",
-    "tuto.txt.12.1.2":"votre indice identifie lui aussi Charlotte",
-    "tuto.txt.12.1.3":", et si nous demandions à Batman, si ce dernier pense que Charlotte est la coupable ?",
-    "tuto.txt.12.2":"Cela nous permettrait donc de mettre fin à la partie !",
-
-    "tuto.title.13":"La punition",
-    "tuto.txt.13.1.1":"Mince, il semblerait que l'indice de Batman innocente Charlotte, et que vous avez donc commit une erreur, la ",
-    "tuto.txt.13.1.2":"punition",
-    "tuto.txt.13.1.3":" s'applique !",
-    "tuto.txt.13.2.1":"Vous devez donc poser un ",
-    "tuto.txt.13.2.2":"carré sur un autre joueur",
-    "tuto.txt.13.2.3":", révélant ainsi plus d'information sur votre indice.",
-    "tuto.txt.13.3.1": "Mais rien n'est joué ! Posons notre carré sur ",
-    "tuto.txt.13.3.2": "pour cela, sélectionnez directement le suspect désiré.",
-    
-    "tuto.title.14":"La fin du jeu",
-    "tuto.txt.14.1":"Ce tour est lui aussi riche en informations !",
-    "tuto.txt.14.2":"Vous avez à présent assez d'information pour deviner les indices des autres : ",
-    "tuto.txt.14.3":"Scooby-Doo semble avoir : ",
-    "tuto.txt.14.4":"Batman semble avoir : ",
-    "tuto.txt.14.5":"Et votre indice est : ",
-    "tuto.txt.14.6.1":"Vous avez à présent toutes les cartes en main pour deviner qui est le coupable, cliquer sur le bouton ",
-    "tuto.txt.14.6.2":"Ask Everyone",
-    "tuto.txt.14.6.3":", puis séléctionné un suspect pour émettre une ",
-    "tuto.txt.14.6.4":"accusation",
-    "tuto.txt.14.6.5":" pour deviner, bonne chance !",
-
-
-    "history.mis":" a mis un ",
-    "à":"à",
-    "history.cantPose":" ne peut plus poser de carré",
-    "history.NotCoupable":" n'est pas le coupable !"
 }
-

cryptide_project/src/Translations/pt.json

@@ -1,167 +0,0 @@
-{
-    "languageSelector.french": "Francês",
-    "languageSelector.english": "Inglês",
-    "languageSelector.espagnol": "Espanhol",
-    "languageSelector.portuguese": "Português",
-    "languageSelector.russian": "Russo",
-
-    "home.histoire.title": "HISTÓRIA",
-    "home.histoire": "A criptozoologia estuda as pegadas de monstros lendários: criptídeos. Yetis, Chupacabra, a besta de Gévaudan, Dahut, etc., são tópicos muito sérios para você... Cruze as pistas e seja o primeiro a descobri-los!",
-    
-    "home.jeu.title": "O JOGO",
-    "home.jeu": "Cada jogador tem uma pista no campo onde a criatura está localizada. Ao cruzar suas informações, só pode haver uma caixa. Mas o objetivo é ser o primeiro a encontrá-la. Pergunte aos seus colegas, e ainda assim aos concorrentes. Eles só podem responder com 'não' ou 'talvez', com muita lógica e um pouco de audácia, você pode entrar na lenda!",
-    
-    "home.plus.title": "FORÇA",
-    "home.plus.1": "Um mecanismo de dedução incrível.",
-    "home.plus.2": "Uma imensa rejogabilidade.",
-    "home.plus.3": "Um tema surpreendente e forte.",
-
-    "game.time": "Tempo: 45 minutos",
-    "game.players": "Jogadores: 3 a 5 jogadores",
-    "game.age": "Idade: 10 anos ou mais",
-    "game.createdBy": "Criado por:",
-    "game.illustratedBy": "Ilustrado por:",
-
-    "log_in":" Entrar ",
-    "sign_up":" Inscrever-se ",
-    "log_out":" Sair ",
-
-    "join" : "Participar",
-    "create_room" : "Criar sala",
-    "play_solo" : "Jogador único",
-
-    "play" : "JOGAR",
-
-    "football": "Futebol",
-    "basketball": "Basquete",
-    "baseball": "Beisebol",
-    "tennis": "Tênis",
-    "bowling": "Boliche",
-
-    "white": "Branco",
-    "black": "Preto",
-    "blond": "Loiro",
-    "redhead": "Ruivo",
-    "brown": "Castanho",
-
-    "and": "e",
-    "or": "ou",
-    "or_sport": "ou",
-
-
-    "age_indice_start": "O suspeito tem entre",
-    "age_indice_more_start": "O suspeito tem pelo menos",
-    "age_indice_end": "anos",
-    
-    "color_edges_start": "O suspeito tem pelo menos um amigo com",
-    "color_edges_end": "cabelo",
-
-    "color_start": "O suspeito tem",
-    "color_end": "cabelo",
-
-    "nb_friends_indice_start": "O suspeito tem",
-    "nb_friends_indice_end": "amigos",
-
-    "nb_sports_indice_start": "O suspeito pratica",
-    "nb_sports_indice_end": "esporte(s)",
-
-    "sport_start": "O suspeito joga pelo menos",
-    "sport_end": "",
-
-    "navbar.play" : "Jogar",
-    "navbar.presentation":"Apresentação",
-    "navbar.info":"Informação",
-
-    "round":"ronda",
-
-
-    "informations" : "Informação",
-    "info.intro.title":"Introdução ao jogo:",
-    "info.intro.text":"Bem-vindo ao nosso empolgante jogo de dedução, onde intriga e malícia se unem em uma aventura emocionante! Mergulhe em um mundo de mistério e intriga, onde cada interação conta, e cada pista o aproxima da verdade. Imagine um gráfico complexo onde cada vértice representa uma pessoa, cada eixo uma relação, e cada detalhe conta. Você está imerso em um desafio desafiador para descobrir quem, entre esses indivíduos, é o misterioso assassino. Cada jogador tem uma pista crucial, e apenas o compartilhamento estratégico dessas pistas o levará a resolver o mistério. Explore nossa página de regras para entender as complexidades do jogo, descobrir pistas que podem orientá-lo e desenvolver estratégias inteligentes para identificar o culpado. Manipule seus amigos para ser o primeiro a descobrir quem é o assassino escondido no gráfico. Você está pronto para aceitar o desafio e desmascarar o assassino oculto no gráfico? Que a investigação comece!",
-
-    "info.sommaire":"Conteúdo",
-
-    "info.title.composant":"Componentes do Jogo",
-    "info.title.objectif":"Objetivo do Jogo",
-    "info.title.deroulement":"Desenvolvimento do Jogo",
-    "info.title.indice_possible":"Possíveis Pistas do Jogo",
-
-    "info.pions" : "Peões",
-    "info.composant.text" : "Cada jogador será associado a uma cor específica que distinguirá as ações representadas pelos peões da seguinte forma:",
-
-    "info.composant.carre.title":"Fichas quadradas",
-    "info.composant.carre":"Essas fichas indicam uma negação. Quando um jogador coloca uma ficha quadrada, significa que sua pista elimina a pessoa designada.",
-    
-    "info.composant.rond.title":"Fichas redondas",
-    "info.composant.rond":"Essas fichas representam um 'talvez'. O jogador que deposita esta ficha afirma que a pessoa é suspeita, mas isso não garante sua culpa. Há apenas um suspeito com uma ficha redonda para todos os jogadores no jogo, e este é o culpado!",
-
-    "info.car_perso":"Características",
-    "info.composant.textcar":"Além de seus nomes, os personagens são representados com outras características:",
-
-    "info.composant.age.title":"Idades",
-    "info.composant.age":"Cada pessoa tem uma idade para autenticá-la, variando entre 0 e 60 anos. A idade é uma característica que será confirmada por pistas na forma de ",
-    "info.composant.age.link":"grupos etários",
-
-    "info.composant.hair_col.title":"Cores de cabelo",
-    "info.composant.hair_col":"Os personagens também têm uma cor de cabelo, que pode ser encontrada nas seguintes cores:",
-
-    "hair.blanc":"Branco",
-    "hair.blond":"Loiro",
-    "hair.roux":"Ruivo",
-    "hair.chatain":"Castanho",
-    "hair.noir":"Preto",
-
-    "info.composant.sport.title":"Esportes",
-    "info.composant.sport":"Os hobbies dos personagens são representados por cinco esportes, respectivamente:",
-
-    "info.composant.baseball":"Beisebol",
-    "info.composant.basketball":"Basquete",
-    "info.composant.bowling":"Boliche",
-    "info.composant.football":"Futebol",
-    "info.composant.tennis":"Tênis",
-    "info.composant.sport.bis":"Entre esses esportes, cada personagem pode ter entre 0 e 3 esportes, o que facilita sua identificação usando as pistas que você possui.",
-
-    "info.objectif.intro":"Bem-vindo ao universo inteligente do nosso jogo de dedução, onde a decepção e a astúcia são as chaves para o sucesso. Sua missão é desvendar o mistério por trás de cada interação do gráfico complexo que representa as relações entre os indivíduos.",
-    "info.objectif.t1":"Manipulação Sutil",
-    "info.objectif.t1.text":"O objetivo final é descobrir quem, entre os indivíduos, é o assassino, mas não por meio de colaboração aberta. Pelo contrário, você usará manipulação sutil para turvar as linhas e distrair seus oponentes. Faça perguntas estratégicas, responda com malícia e plante pistas enganosas para se aproximar do resultado.",
-    "info.objectif.t2":"Trapaça",
-    "info.objectif.t2.text":"Cada rodada oferece a oportunidade de semear dúvidas entre seus oponentes. Quando um jogador faz perguntas a você, responda colocando astutamente uma ficha quadrada para indicar que 'dependendo da sua pista, essa pessoa não pode ser o culpado' ou uma ficha redonda para sugerir que eles permanecem na lista de suspeitos. Cuidado, porque cada gesto pode ser interpretado, e a verdade muitas vezes está escondida por trás de uma fachada de pistas enganosas.",
-    "info.objectif.t3":"Contra-manipulação",
-    "info.objectif.t3.text":"Se um jogador colocar uma ficha quadrada, o questionador também deve jogar seu jogo colocando uma ficha quadrada de sua cor em um nó do gráfico. A contra-manipulação se torna uma arma formidável para desviar a acusação e semear confusão.",
-
-    "info.interface": "Interface do Jogo",
-    "info.interface.text": "Para cada jogo, você terá certos elementos de interface disponíveis:",
-    "info.interface.param": "O botão 'Configurações' permite exibir e gerenciar várias configurações do jogo, como ativar ou desativar efeitos sonoros. Também é possível escolher o número de nós para o modo de jogo 'Enigma' usando este botão.",
-    "info.interface.reset": "O botão 'Redefinir' redefine o estado atual do gráfico. Se você o moveu demais ou deseja que sua exibição fique mais organizada, este botão é para você!",
-    "info.interface.info": "O botão 'Informações' redireciona para a página de regras do jogo (esta aqui).",
-    "info.interface.fiche": "O botão 'Folha de Dedução de Pistas' exibe uma tabela que, junto com o progresso do jogo, permite deduzir quais pistas são mais prováveis para cada jogador.",
-    "info.interface.indice": "O botão 'Pista Pessoal' é o mais importante; ele exibe sua pista secreta. Só você a conhece! Você terá que ser esperto para enganar seus amigos e mantê-la em segredo o máximo possível!",
-    "info.interface.vision": "O botão 'Últimas Jogadas' permite ao usuário visualizar as últimas 5 jogadas feitas. Ele age como uma ferramenta visual.",
-
-    "etape":"Etapa",
-    "info.deroulement.e1":"Faça Perguntas Estratégicas",
-    "info.deroulement.e1.text":"Cada rodada começa com um jogador fazendo perguntas a outro jogador sobre uma pessoa no gráfico. As respostas são formuladas colocando fichas quadradas ou redondas para indicar certeza ou dúvida quanto ao envolvimento dessa pessoa.",
-    "info.deroulement.e2":"Contra-manipulação e Contra-perguntas",
-    "info.deroulement.e2.text":"Se um jogador colocar uma ficha quadrada, o questionador também deve colocar uma ficha quadrada em um nó no gráfico. Contra-perguntas são uma maneira de confundir os jogadores e desviar a acusação.",
-    "info.deroulement.e3":"O Palpite Final",
-    "info.deroulement.e3.text":"O jogo atinge seu clímax quando um jogador tenta o 'Palpite' final, alegando que tal pessoa é o assassino. Outros jogadores podem contradizer essa declaração colocando suas próprias fichas quadradas. Se nenhuma refutação for feita, o jogador que fez o 'Palpite' vence o jogo, demonstrando sua maestria na arte da manipulação.",
-
-    "info.indice-possible.age":"Idade da Pessoa",
-    "info.indice-possible.hair":"Cor do cabelo de uma pessoa",
-    "info.indice-possible.sport":"Esporte(s) de uma pessoa",
-    "info.indice-possible.voisin":"Personagem dos vizinhos",
-
-    "info.mdj": "Modos de Jogo",
-    "info.mdj.text": "Existem vários outros modos de jogo que permitem adicionar variedade e tornar o jogo mais ou menos complexo.",
-    "info.mdj.mastermind": "Mestre das Pistas",
-    "info.mdj.mastermind.text": "O modo de jogo 'Mestre das Pistas' é um modo solo onde você deve ser capaz de adivinhar o culpado usando o número mínimo de palpites. Neste modo, você não terá pistas, mas precisará adivinhá-las durante o jogo. Selecionar um suspeito revela o estado de todas as pistas para esse suspeito. Torna-se possível adivinhar as pistas e depois identificar o culpado!",
-    "info.mdj.enigme": "Enigma",
-    "info.mdj.enigme.text": "Este é um modo solo com três níveis de dificuldade:",
-    "info.mdj.enigme.easy": "Enigma Fácil",
-    "info.mdj.enigme.easy.txt": "Neste modo de jogo, você tem acesso a todas as pistas e deve adivinhar o culpado que corresponde a todas essas pistas. Você pode praticar adivinhando o culpado neste modo.",
-    "info.mdj.enigme.medium": "Enigma Intermediário",
-    "info.mdj.enigme.medium.txt": "Neste modo de jogo, você não tem acesso a pistas, mas tem informações suficientes sobre alguns suspeitos para poder adivinhar o culpado. Essas informações o ajudarão a adivinhar as pistas, e o culpado é o suspeito para quem todas as pistas correspondem. Se você selecionar o suspeito errado, não se preocupe! Você terá informações sobre aquele suspeito, o que facilitará encontrar o culpado. O objetivo é encontrar o culpado no mínimo de palpites.",
-    "info.mdj.enigme.hard": "Enigma Difícil",
-    "info.mdj.enigme.hard.txt": "Esta variante final é semelhante ao enigma intermediário; no entanto, você deve encontrar o culpado na primeira tentativa, ou você perde! Depende de você jogar! O objetivo é encontrar o culpado no mínimo de tempo."
-
-}

cryptide_project/src/Translations/ru.json

@@ -1,165 +0,0 @@
-{
-    "languageSelector.french": "Французский",
-    "languageSelector.english": "Английский",
-    "languageSelector.espagnol": "Испанский",
-    "languageSelector.portuguese": "Португальский",
-    "languageSelector.russian": "Русский",
-    
-    "home.histoire.title": "ИСТОРИЯ",
-    "home.histoire": "Криптозоология изучает следы легендарных монстров: криптидов. Иети, Чупакабра, зверь из Жеводана, Дахут и т. д., это очень серьезные темы для вас... Пересеките улики и первым откройте их!",
-    
-    "home.jeu.title": "ИГРА",
-    "home.jeu": "У каждого игрока есть улика на поле, где находится существо. Путем кросс-референцирования вашей информации может быть только одна клетка. Но цель - быть первым, кто ее найдет. Спрашивайте своих коллег, а также конкурентов. Они могут отвечать только «нет» или «возможно». С логикой и дерзостью вы можете войти в легенду!",
-    
-    "home.plus.title": "СИЛА",
-    "home.plus.1": "Умопомрачительный механизм дедукции.",
-    "home.plus.2": "Огромная возможность переигрывания.",
-    "home.plus.3": "Удивительная и крепкая тема.",
-
-    "game.time": "Время: 45 минут",
-    "game.players": "Игроки: от 3 до 5 человек",
-    "game.age": "Возраст: от 10 лет",
-    "game.createdBy": "Создано:",
-    "game.illustratedBy": "Иллюстрировано:",
-
-    "log_in":" Войти ",
-    "sign_up":" Зарегистрироваться ",
-    "log_out":" Выйти ",
-
-    "join" : "Присоединиться",
-    "create_room" : "Создать комнату",
-    "play_solo" : "Один игрок",
-
-    "play" : "ИГРАТЬ",
-
-    "football": "Футбол",
-    "basketball": "Баскетбол",
-    "baseball": "Бейсбол",
-    "tennis": "Теннис",
-    "bowling": "Боулинг",
-
-    "white": "Белый",
-    "black": "Черный",
-    "blond": "Блондин",
-    "redhead": "Рыжий",
-    "brown": "Каштановый",
-
-    "and": "и",
-    "or": "или",
-    "or_sport": "или",
-
-
-    "age_indice_start": "Подозреваемый находится в возрасте от",
-    "age_indice_more_start": "Подозреваемый по крайней мере",
-    "age_indice_end": "лет",
-    
-    "color_edges_start": "У подозреваемого есть хотя бы один друг с",
-    "color_edges_end": "волосами",
-
-    "color_start": "У подозреваемого есть",
-    "color_end": "волосы",
-
-    "nb_friends_indice_start": "У подозреваемого есть",
-    "nb_friends_indice_end": "друзей",
-
-    "nb_sports_indice_start": "Подозреваемый играет в",
-    "nb_sports_indice_end": "вида(ов) спорта",
-
-    "sport_start": "Подозреваемый играет по меньшей мере в",
-    "sport_end": "",
-
-    "navbar.play" : "Разыграть",
-    "navbar.presentation":"Презентационный",
-    "navbar.info":"Информация",
-
-    "round" : "Раунд",
-
-    "informations" : "Информация",
-    "info.intro.title":"Введение в игру :",
-    "info.intro.text":"Добро пожаловать в нашу захватывающую игру-дедукцию, где интрига и хитрость соединяются в захватывающем приключении! Погрузитесь в мир тайны и интриги, где каждое взаимодействие имеет значение, и каждая улика приближает вас к правде. Представьте себе сложный граф, где каждая вершина представляет собой человека, каждая ось - отношение, и каждая деталь имеет значение. Вы бросаетесь в сложное испытание, чтобы открыть тайну, кто из этих людей - загадочный убийца. У каждого игрока есть важная улика, и только стратегический обмен этими уликами приведет вас к разгадке тайны. Изучите нашу страницу с правилами, чтобы понять тонкости игры, обнаружьте улики, которые могут вас направить, и разрабатывайте умные стратегии для выявления виновного. Манипулируйте своими друзьями, чтобы быть первым, кто узнает, кто убийца! Готовы ли вы принять вызов и разоблачить убийцу, скрытого в графе? Пусть начнется расследование!",
-
-    "info.sommaire":"Содержание",
-
-    "info.title.composant":"Игровые компоненты",
-    "info.title.objectif":"Цель игры",
-    "info.title.deroulement":"Ход игры",
-    "info.title.indice_possible":"Возможное игровое подсказка",
-
-    "info.pions" : "Фишки",
-    "info.composant.text" : "Каждому игроку будет присвоен определенный цвет, который будет отличать действия, представленные фишками, следующим образом :",
-    
-    "info.composant.carre.title":"квадратные фишки",
-    "info.composant.carre":"Эти фишки указывают на отрицание. Когда игрок ставит квадратную фишку, это означает, что его улика исключает указанного человека.",
-    
-    "info.composant.rond.title":"круглые фишки",
-    "info.composant.rond":"Эти фишки представляют собой 'возможно'. Игрок, укладывающий эту фишку, утверждает, что человек является подозреваемым, но это не гарантирует его вину. Есть только один подозреваемый с круглой фишкой для всех игроков в игре, и это убийца!",
-
-    "info.car_perso":"Характеристики",
-    "info.composant.textcar":"Помимо их имен, персонажи представлены другими характеристиками :",
-    
-    "info.composant.age.title":"Возраст",
-    "info.composant.age":"У каждого человека есть возраст для его идентификации, варьирующийся от 0 до 60 лет. Возраст - это характеристика, которая будет подтверждена уликами в виде ",
-    "info.composant.age.link":"возрастных групп",
-
-    "info.composant.hair_col.title":"Цвет волос",
-    "info.composant.hair_col":"У персонажей также есть цвет волос, который может быть следующими цветами :",
-
-    "hair.blanc":"Белый",
-    "hair.blond":"Блондин",
-    "hair.roux":"Рыжий",
-    "hair.chatain":"Каштановый",
-    "hair.noir":"Черный",
-
-    "info.composant.sport.title":"Спорт",
-    "info.composant.sport":"Увлечения персонажей представлены пятью видами спорта :",
-    "info.composant.baseball":"Бейсбол",
-    "info.composant.basketball":"Баскетбол",
-    "info.composant.bowling":"Боулинг",
-    "info.composant.football":"Футбол",
-    "info.composant.tennis":"Теннис",
-    "info.composant.sport.bis":"Среди этих видов спорта каждый персонаж может заниматься от 0 до 3 видов спорта, что облегчит их идентификацию с использованием имеющихся у вас улик.",
-
-
-    "info.objectif.intro":"Добро пожаловать в умный мир нашей игры-дедукции, где обман и хитрость - ключи к успеху. Ваша миссия - раскрывать тайну за каждым взаимодействием сложного графа, представляющего отношения между людьми.",
-    "info.objectif.t1":"Тонкая манипуляция",
-    "info.objectif.t1.text":"Основная цель - узнать, кто из людей является убийцей, но не через открытое сотрудничество. Напротив, вы будете использовать тонкую манипуляцию, чтобы размыть границы и отвлечь своих оппонентов. Задавайте стратегические вопросы, отвечайте злонамеренно и сеивайте вводные улики, чтобы приблизиться к результату.",
-    "info.objectif.t2":"Хитрость",
-    "info.objectif.t2.text":"Каждый раунд предоставляет возможность сеять сомнения среди ваших оппонентов. Когда вас допрашивают, отвечайте, умно ставя квадратную фишку, чтобы указать, что 'в зависимости от вашей улики этот человек не может быть убийцей' или круглую фишку, чтобы предположить, что они остаются в списке подозреваемых. Будьте осторожны, потому что каждый жест может быть истолкован, и правда часто скрыта за фасадом вводных улик.",
-    "info.objectif.t3":"Контрманипуляция",
-    "info.objectif.t3.text":"Если игрок ставит квадратную фишку, допрашивающий также должен играть свою игру, ставя квадратную фишку своего цвета на узле графа. Контрманипуляция становится мощным оружием для отвода обвинения и посева смуты.",
-
-    "info.interface": "Игровой интерфейс",
-    "info.interface.text": "Для каждой игры у вас будут доступны определенные элементы интерфейса:",
-    "info.interface.param": "Кнопка 'Настройки' позволяет отображать и управлять различными настройками игры, такими как включение или выключение звуковых эффектов. С ее помощью также можно выбирать количество узлов для режима игры 'Загадка'.",
-    "info.interface.reset": "Кнопка 'Сброс' сбрасывает текущее состояние графа. Если вы передвинули его слишком сильно или хотите, чтобы его отображение было аккуратнее, эта кнопка для вас!",
-    "info.interface.info": "Кнопка 'Информация' перенаправляет на страницу правил игры (эту).",
-    "info.interface.fiche": "Кнопка 'Таблица вывода улик' отображает таблицу, которая, вместе с ходом игры, позволяет делать выводы о том, какие улики наиболее вероятны для каждого игрока.",
-    "info.interface.indice": "Кнопка 'Личная улика' самая важная; она отображает вашу секретную улику. Только вы знаете ее! Вам придется быть умным, чтобы обмануть своих друзей и держать ее в секрете как можно дольше!",
-    "info.interface.vision": "Кнопка 'Последние движения' позволяет пользователю визуализировать последние 5 сделанных ходов. Она действует как визуальный инструмент.",
-
-    "etape": "Шаг",
-    "info.deroulement.e1": "Задавайте стратегические вопросы",
-    "info.deroulement.e1.text": "Каждый раунд начинается с того, что один игрок задает другому игроку вопрос о человеке на графике. Ответы формулируются путем установки квадратных или круглых фишек, чтобы указать уверенность или сомнение в причастности этого человека.",
-    "info.deroulement.e2": "Контролирование и контропросы",
-    "info.deroulement.e2.text": "Если игрок устанавливает квадратную фишку, задающий вопрос также должен установить квадратную фишку на узле графика. Контропросы - это способ сбить с толку игроков и отклонить обвинение.",
-    "info.deroulement.e3": "Окончательное предположение",
-    "info.deroulement.e3.text": "Игра достигает своего пика, когда игрок пытается сделать окончательное 'Предположение', утверждая, что такой-то человек - убийца. Другие игроки могут затем противоречить этому заявлению, устанавливая свои собственные квадратные фишки. Если не последует опровержение, игрок, сделавший 'Предположение', выигрывает игру, продемонстрировав свое мастерство в искусстве манипуляции.",
-
-    "info.indice-possible.age": "Возраст человека",
-    "info.indice-possible.hair": "Цвет волос человека",
-    "info.indice-possible.sport": "Спорт(ы) человека",
-    "info.indice-possible.voisin": "Характер соседей",
-
-    "info.mdj": "Режимы игры",
-    "info.mdj.text": "Существует различные режимы игры, которые позволяют вам добавить разнообразие и сделать игру более или менее сложной.",
-    "info.mdj.mastermind": "Мастер-майнд",
-    "info.mdj.mastermind.text": "Режим игры 'Мастер-майнд' - это сольный режим, в котором вы должны угадать убийцу, используя минимальное количество догадок. В этом режиме у вас не будет никаких улик, но вам нужно будет угадать их в ходе игры. Выбор подозреваемого позволяет узнать состояние всех улик для этого подозреваемого. Становится возможным угадать улики, а затем определить убийцу!",
-    "info.mdj.enigme": "Загадка",
-    "info.mdj.enigme.text": "Это сольный режим с тремя уровнями сложности:",
-    "info.mdj.enigme.easy": "Легкая загадка",
-    "info.mdj.enigme.easy.txt": "В этом режиме у вас есть доступ ко всем уликам, и вы должны угадать убийцу, соответствующего всем этим уликам. Вы можете практиковаться в угадывании убийцы в этом режиме.",
-    "info.mdj.enigme.medium": "Средняя загадка",
-    "info.mdj.enigme.medium.txt": "В этом режиме у вас нет доступа к уликам, но у вас есть достаточно информации о некоторых подозреваемых, чтобы угадать убийцу. Эта информация поможет вам угадать улики, и убийца - подозреваемый, для которого все улики совпадают. Если вы выберете неправильного подозреваемого, не волнуйтесь! У вас будет информация о том подозреваемом, что облегчит вам поиск убийцы. Цель - найти убийцу минимальным количеством догадок.",
-    "info.mdj.enigme.hard": "Трудная загадка",
-    "info.mdj.enigme.hard.txt": "Этот последний вариант аналогичен средней загадке; однако вы должны найти убийцу с первой попытки, иначе вы проиграли! Решайте сами! Цель - найти убийцу минимальным количеством времени."
-}

cryptide_project/src/model/DataManagers/DbUserService.ts

@@ -1,4 +1,3 @@
-import { random } from "lodash";
 import SessionService from "../../services/SessionService";
 import { socket } from "../../SocketConfig";
 import User from "../User";
@@ -11,77 +10,33 @@ class DbUserService implements IUserService{
             
             // Vérifie si il y a une session
             if (sessionData.user) {
-                const currentUser = new User(socket.id, sessionData.user.pseudo, sessionData.profilePicture,
+                // Il y a une session on récupère les infos du joueur
-                {
+                const updatedPlayer: User = new User(socket.id, sessionData.user.pseudo, sessionData.user.profilePicture, {
-                    nbGames: sessionData.user.mastermindStats.nbGames, 
+                    nbGames: sessionData.user.soloStats.nbGames,
-                    bestScore: sessionData.user.mastermindStats.bestScore, 
+                    bestScore: sessionData.user.soloStats.bestScore,
-                    avgNbTry: sessionData.user.mastermindStats.avgNbTry
+                    avgNbTry: sessionData.user.soloStats.avgNbTry,
-                },
-                {
-                    nbGames: sessionData.user.easyEnigmaStats.nbGames,
-                    nbWins: sessionData.user.easyEnigmaStats.nbWins,
-                    ratio: sessionData.user.easyEnigmaStats.ratio,
-                    bestTime: sessionData.user.easyEnigmaStats.bestTime,
-                    avgTime: sessionData.user.easyEnigmaStats.avgTime
-                },
-                {
-                    nbGames: sessionData.user.mediumEnigmaStats.nbGames,
-                    bestScore: sessionData.user.mediumEnigmaStats.bestScore,
-                    avgNbTry: sessionData.user.mediumEnigmaStats.avgNbTry
-                },
-                {
-                    nbGames: sessionData.user.hardEnigmaStats.nbGames,
-                    nbWins: sessionData.user.hardEnigmaStats.nbWins,
-                    ratio: sessionData.user.hardEnigmaStats.ratio,
-                    bestTime: sessionData.user.hardEnigmaStats.bestTime,
-                    avgTime: sessionData.user.hardEnigmaStats.avgTime
                 },
                 {
                     nbGames: sessionData.user.onlineStats.nbGames,
                     nbWins: sessionData.user.onlineStats.nbWins,
                     ratio: sessionData.user.onlineStats.ratio,
-                });
+                })
-                currentUser.nbNodes = sessionData.user.nbNodes || 25
+                return [updatedPlayer, true]
-                currentUser.nbIndices = sessionData.user.nbIndices || 3
+            } else {
-
+                // Pas de session on génère un guest random
-                return [currentUser, true];
+                const guestPlayer: User = new User(socket.id, 'Guest_' + Math.floor(Math.random() * 1000000), '',
-            } 
-            else{
-                const guestUser = new User(socket.id, "Guest_" + random(1000, 9999), "",
-                {
-                    nbGames: 0, 
-                    bestScore: 0, 
-                    avgNbTry: 0
-                },
-                {
-                    nbGames: 0,
-                    nbWins: 0,
-                    ratio: 0,
-                    bestTime: 0,
-                    avgTime: 0
-                },
                 {
                     nbGames: 0,
                     bestScore: 0,
-                    avgNbTry: 0
+                    avgNbTry: 0,
                 },
                 {
                     nbGames: 0,
                     nbWins: 0,
                     ratio: 0,
-                    bestTime: 0,
+                })
-                    avgTime: 0
+                return [guestPlayer, false]
-                },
+                
-                {
-                    nbGames: 0,
-                    nbWins: 0,
-                    ratio: 0,
-                });
-
-                guestUser.nbNodes = 25
-                guestUser.nbIndices = 3
-
-                return [guestUser, false];
             }
         } catch (error) {
             console.error(error);
@@ -89,9 +44,9 @@ class DbUserService implements IUserService{
         }
     }
 
-    async addMastermindStats(pseudo: string, score: number, time: number): Promise<void> {
+    async updateSoloStats(pseudo: string, nbGames: number, bestScore: number, avgNbTry: number): Promise<void> {
         try {
-            const result = await SessionService.addMastermindStats(pseudo, score, time);
+            const result = await SessionService.updateSoloStats(pseudo, nbGames, bestScore, avgNbTry);
             if (result) {
                 console.log("Stats solo updated");
             } else {
@@ -102,48 +57,9 @@ class DbUserService implements IUserService{
         }
     }
 
-    async addEasyEnigmaStats(pseudo: string, win: number, time: number): Promise<void> {
+    async updateOnlineStats(pseudo: string, nbGames: number, bestScore: number, ratio: number): Promise<void> {
         try {
-            const result = await SessionService.addEasyEnigmaStats(pseudo, win, time);
+            const result = await SessionService.updateOnlineStats(pseudo, nbGames, bestScore, ratio);
-            if (result) {
-                console.log("Stats easy updated");
-            } else {
-                console.log("Stats easy not updated");
-            }
-        } catch (error) {
-            console.error(error);
-        }
-    }
-
-    // async addMediumEnigmaStats(pseudo: string, win: number, time: number): Promise<void> {
-    //     try {
-    //         const result = await SessionService.addMediumEnigmaStats(pseudo, win, time);
-    //         if (result) {
-    //             console.log("Stats medium updated");
-    //         } else {
-    //             console.log("Stats medium not updated");
-    //         }
-    //     } catch (error) {
-    //         console.error(error);
-    //     }
-    // }
-
-    async addHardEnigmaStats(pseudo: string, win: number, time: number): Promise<void> {
-        try {
-            const result = await SessionService.addHardEnigmaStats(pseudo, win, time);
-            if (result) {
-                console.log("Stats hard updated");
-            } else {
-                console.log("Stats hard not updated");
-            }
-        } catch (error) {
-            console.error(error);
-        }
-    }
-
-    async addOnlineStats(pseudo: string, win: number, time: number): Promise<void> {
-        try {
-            const result = await SessionService.addOnlineStats(pseudo, win, time);
             if (result) {
                 console.log("Stats online updated");
             } else {
@@ -153,19 +69,6 @@ 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,12 +2,8 @@ import User from "../User";
 
 interface IUserService{
     fetchUserInformation(): Promise<[User | null, boolean]>
-    changeNodesIndices(nbNodes: number, nbIndices: number): Promise<void>
+    updateSoloStats(pseudo: string, nbGames: number, bestScore: number, avgNbTry: number): Promise<void>
-    addMastermindStats(pseudo: string, score: number, time: number): Promise<void>
+    updateOnlineStats(pseudo: string, nbGames: number, bestScore: number, ratio: number): Promise<void>
-    addEasyEnigmaStats(pseudo: string, win: number, time: number): Promise<void>
-    // addMediumEnigmaStats(pseudo: string, win: number, time: number): Promise<void>
-    addHardEnigmaStats(pseudo: string, win: number, time: number): Promise<void>
-    addOnlineStats(pseudo: string, win: number, time: number): Promise<void>
 }
 
 

cryptide_project/src/model/EnigmeDuJourCreator.ts

@@ -29,7 +29,7 @@ class EnigmeDuJourCreator{
                         possibleIndices.forEach((possibleIndice, index) =>{
                             const tester = IndiceTesterFactory.Create(possibleIndice)
                             if (tester.Works(person)){
-                                 const t = veryTmpIndice.findIndex((tmpIndice) => tmpIndice.getId() == possibleIndice.getId())
+                                const t = veryTmpIndice.findIndex((tmpIndice) => tmpIndice.getId() == possibleIndice.getId())
                                 if (t != -1){
                                     veryTmpIndice.splice(t, 1)
                                 }
@@ -58,7 +58,10 @@ class EnigmeDuJourCreator{
                 }
                 possibleIndices = [...tmpPossibleIndices]
                 modifiedPersons.push(choosenPair)
+                console.log(possibleIndices)
             }
+            console.log("choosenIndice => " + choosenIndice.ToString("fr"))
+            console.log("possibleIndices => " + possibleIndices[0].ToString("fr"))
             modifiedPersons.forEach((pair) =>{
                 map.get(pair.first.getId())?.push(new Pair(choosenIndice, pair.second))
             })

cryptide_project/src/model/Graph/Edge.ts

@@ -2,7 +2,6 @@ class Edge{
     
     public from: number
     public to: number
-    public color: string = "black"
     
     constructor(from: number, to: number){
         this.from = from

cryptide_project/src/model/User.tsx

@@ -2,20 +2,12 @@ import Player from "./Player";
 import defaultImg from "../res/img/Person.png"
 class User extends Player{
 
-    public mastermindStats: any
+    public soloStats: any
-    public easyEnigmaStats: any
-    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){
+    constructor(id: string, pseudo: string, profilePicture: string, soloStats: any, onlineStats: any){
         super(id, pseudo, profilePicture || defaultImg)
-        this.mastermindStats=soloStats
+        this.soloStats=soloStats
-        this.easyEnigmaStats=easyEnigmaStats
-        this.mediumEnigmaStats=mediumEnigmaStats
-        this.hardEnigmaStats=hardEnigmaStats
         this.onlineStats=onlineStats
     }
 
@@ -26,9 +18,7 @@ class User extends Player{
             id: this.id,
             profilePicture: this.profilePicture,
             pseudo: this.pseudo,
-            easyEnigmaStats: this.easyEnigmaStats,
+            soloStats: this.soloStats,
-            mediumEnigmaStats: this.mediumEnigmaStats,
-            hardEnigmaStats: this.hardEnigmaStats,
             onlineStats: this.onlineStats
         };
     }

cryptide_project/src/react-app-env.d.tsx

@@ -2,5 +2,3 @@ declare module "*.png";
 declare module "*.svg";
 declare module "*.jpeg";
 declare module "*.jpg";
-declare module '*.mp3';
-declare module '*.wav';

cryptide_project/src/res/botNames.json

@@ -1,22 +0,0 @@
-{
-    "names": [
-        "Sherlock Holmes",
-        "Inspecteur Gadget",
-        "Scooby-Doo",
-        "Marple",
-        "Spocky",
-        "Phoenix",
-        "Batman",
-        "James Bond",
-        "Sherlockio",
-        "Verra",
-        "Hercule Poirot",
-        "Colombo",
-        "MacGyver",
-        "Lupin",
-        "D. Conan",
-        "Pr. Layton",
-        "Dr. Watson"
-    ]
-  }
-