80 crea nuova partita automaticamente

Scoprimi/src/components/finalresults/FinalResults.tsx

@@ -1,6 +1,10 @@
-import React from 'react';
+import React, { useEffect, useState } from 'react';
 import { FinalResultData } from '../../ts/types';
 import { useLocation, useNavigate } from 'react-router-dom';
+import { socket } from '../../ts/socketInit';
+import { SocketEvents } from '../../../../Server/src/MiddleWare/SocketEvents';
+import { useSession } from '../../contexts/SessionContext';
+import Alert from '../common/Alert';
 
 const defaultHeights = [
   '7vh',
@@ -14,6 +18,7 @@ const defaultColors = [
   '#cd7f32', // Bronzo
 ];
 
+
 function getPodiumStats(sameScore1And2, sameScore1And3, sameScore2And3, positionsArray) {
   let podiumArray = [...positionsArray];
 
@@ -36,6 +41,44 @@ const FinalResults: React.FC = () => {
   const location = useLocation();
   const navigate = useNavigate();
   const { finalResults } = location.state as { finalResults: FinalResultData };
+  const { currentPlayer, setCurrentLobby, currentPlayerImage, currentLobby } = useSession();
+  const [showAlert, setShowAlert] = useState<boolean>(false);
+
+  function TODOREMATCH() {
+    socket.emit(SocketEvents.SET_NEXT_GAME, { code: currentLobby, playerName: currentPlayer, image: currentPlayerImage });
+  }
+
+  useEffect(() => {
+    socket.on(SocketEvents.PLAYER_CAN_JOIN, (data) => {
+      if (data.canJoin) {
+        setCurrentLobby(data.lobbyCode);
+        navigate('/lobby');
+      } else {
+        setShowAlert(true);
+      }
+    });
+
+    return () => {
+      socket.off(SocketEvents.PLAYER_CAN_JOIN);
+    };
+  }, [navigate, setCurrentLobby]);
+
+  useEffect(() => {
+    socket.on(SocketEvents.RETURN_NEWGAME, (data: { lobbyCode: string }) => {
+      // TODO
+      const datatoSend = {
+        lobbyCode: data.lobbyCode,
+        playerName: currentPlayer,
+        image: currentPlayerImage,
+      };
+      socket.emit(SocketEvents.REQUEST_TO_JOIN_LOBBY, datatoSend);
+    });
+
+    return () => {
+      socket.off(SocketEvents.RETURN_NEWGAME);
+    };
+  }, [currentPlayer, currentPlayerImage]);
+
 
   // Ordinamento con tipizzazione
   const sortedResults = Object.entries(finalResults)
@@ -68,6 +111,7 @@ const FinalResults: React.FC = () => {
 
   return (
     <>
+      <Alert text='Sei già in questa lobby' show={showAlert} onHide={() => setShowAlert(false)} />
       <div id="gameOverMessage" className="paginator">
         <h2 className="">Classifica</h2>
 
@@ -147,12 +191,19 @@ const FinalResults: React.FC = () => {
           </table>
         </div>
 
+
         <button
           className="my-btn mt-3 my-bg-puss"
           onClick={() => navigate('/')}
         >
           Torna alla homepage
         </button>
+        <button
+          className='my-btn mt-3 my-bg-puss'
+          onClick={TODOREMATCH}
+        >
+          Gioca ancora
+        </button>
       </div>
     </>
   );

Scoprimi/src/components/game/Game.tsx

@@ -47,7 +47,7 @@
   const [isPhoto, setIsPhoto] = useState<boolean>(false);
   const [selectedPlayer, setSelectedPlayer] = useState<string>('');
 
   const [pages, setPages] = useState<any>();
 
   const [isWho, setIsWho] = useState<boolean>(false);
 
@@ -72,8 +72,6 @@
 
   useEffect(() => {
     socket.on(SocketEvents.SEND_QUESTION, (data: { question: Question, players: string[], images: { [key: string]: string }, selectedPlayer: string }) => {
-      console.log('questions: ');
-      console.log(data.question.images);
       setClicked(false);
       setIsTimerActive(true);
       setQuestion(data.question.text);
@@ -100,7 +98,6 @@
 
   useEffect(() => {
     socket.on(SocketEvents.PLAYERS_WHO_VOTED, (data: { players: { [key: string]: string } }) => {
-      console.log(Object.keys(data.players));
       setPlayersWhoVoted(Object.keys(data.players));
     });
     return () => {
@@ -114,7 +111,6 @@
       playerImages: { [key: string]: string },
       mostVotedPerson: string,
     }) => {
-      console.log('Madonna sburra');
       setVoteRecap(data.voteRecap);
       setPlayerImages(data.playerImages);
       setMostVotedPerson(data.mostVotedPerson);
@@ -124,7 +120,6 @@
 
     socket.on(SocketEvents.GAME_OVER, (data: { playerScores: PlayerScores, playerImages: PlayerImages }) => {
       setQuestion('');
-      setCurrentLobby(null);
       setPlayers([]);
       socket.emit(SocketEvents.LEAVE_ROOM, { playerName: currentPlayer, LobbyCode: currentLobby });
 

Scoprimi/src/components/lobby/Lobby.tsx

@@ -21,7 +21,6 @@ const Lobby: React.FC = () => {
 
   useEffect(() => {
     const handleVisibilityChange = () => {
-      console.log('dentro alla funzione');
       if (!document.hidden) {
 
         const data = {
@@ -55,7 +54,6 @@ const Lobby: React.FC = () => {
   useEffect(() => {
     document.title = `Lobby - ${currentLobby}`;
     socket.emit(SocketEvents.REQUEST_RENDER_LOBBY, currentLobby, (data: Game) => {
-      console.log('Received data:', data);
       setGame(data);
       // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       setIsReady(data.players[currentPlayer!].isReadyToGame);
@@ -106,7 +104,6 @@ const Lobby: React.FC = () => {
   const handleRemovePlayer = (playerName: string) => {
     console.log('Admin is removing the player:', playerName);
     socket.emit(SocketEvents.REMOVE_PLAYER, { playerName, currentLobby });
-    console.log('Io sono il giocatore: ', currentPlayer);
   };
 
   const handleCancelLeave = () => {

Scoprimi/src/components/newGame/NewGameModal.tsx

@@ -90,11 +90,9 @@ const NewGameModal: React.FC<NewGameModalProps> = ({ isOpen, onClose, playerName
 
   useEffect(() => {
     if (isOpen) {
-      console.log('Modal aperto per il giocatore:', playerName);
       socket.emit(SocketEvents.REQUEST_CATEGORIES);
 
       socket.on(SocketEvents.SEND_GENRES, (data: { genres: string[] }) => {
-        console.log('Categorie ricevute: ', data.genres);
         setCategories(data.genres);
         setSelectedCategories(new Array(data.genres.length).fill(false));
       });

Server/src/API/questions.ts

@@ -36,7 +36,6 @@ export const setupUpload = (app: Express) => {
   };
 
   app.post('/upload', authMiddleware, upload.single('file'), async (req: Request, res: Response) => {
-    console.log('eccoci');
     const tempPath = req.file?.path;
     const targetPath = join(__dirname, '../questions.json');
 
@@ -48,7 +47,6 @@ export const setupUpload = (app: Express) => {
       await rename(tempPath, targetPath);
       const data = await readFile(targetPath, 'utf8');
       AllQuestions = JSON.parse(data);
-      console.log(AllQuestions);
       res.status(200).json({ message: 'File aggiornato con successo' });
     } catch (err) {
       console.error('Errore durante il salvataggio del file', err);

Server/src/MiddleWare/SocketEvents.ts

@@ -34,4 +34,5 @@ export enum SocketEvents {
   SEND_GENRES = 'SEND_GENRES',
   ENDGAMEWRAPPER = 'ENDGAMEWRAPPER',
   READY_FOR_PODIUM = 'READY_FOR_PODIUM',
+  SET_NEXT_GAME = 'set_next_game',
 }

Server/src/data/Game.ts

@@ -8,6 +8,8 @@ import { Question, QuestionMode } from "./Question.js";
 export class Game {
   // Lobby code
   public lobbyCode: string;
+  // List of Game Modes
+  public gamesGenre: QuestionGenre[]
   // Indicates whether the game has started
   public isGameStarted: boolean;
   // List of players
@@ -23,6 +25,8 @@ export class Game {
   public creationTime: number;
   // Admin of the lobby (can start the game / remove a player from the lobby)
   public admin: string;
+  // nextGame
+  public nextGame: string | undefined;
 
   /**
    * Creates an instance of the game.
@@ -31,6 +35,7 @@ export class Game {
    */
   constructor(lobbyCode: string, admin: string) {
     this.lobbyCode = lobbyCode;
+    this.gamesGenre = [];
     this.isGameStarted = false;
     this.players = {};
     this.numOfVoters = 0;
@@ -39,6 +44,7 @@ export class Game {
     this.iterator = this.createIterator();
     this.creationTime = Date.now();
     this.admin = admin;
+    this.nextGame = undefined;
   }
 
   /**