Compare commits

..

2 Commits

6 changed files with 64 additions and 17 deletions

View File

@ -14,6 +14,7 @@ export * from "./types/PlacedPiece";
export * from "./BoardBuilder"; export * from "./BoardBuilder";
export * from "./server-events/ServerError"; export * from "./server-events/ServerError";
export * from "./server-events/ServerEvent"; export * from "./server-events/ServerEvent";
export * from "./server-events/StartRoundEvent";
export * from "./server-events/UpdateLobbyEvent"; export * from "./server-events/UpdateLobbyEvent";
export * from "./client-events/ClientEvent"; export * from "./client-events/ClientEvent";
export * from "./client-events/CreateLobbyEvent"; export * from "./client-events/CreateLobbyEvent";

View File

@ -0,0 +1,22 @@
import { Socket as ServerSocket } from "socket.io";
import { Socket as ClientSocket } from "socket.io-client";
import { ServerEvent } from "./ServerEvent";
import { PieceId } from "../constants/Pieces";
export type StartRoundEvent = {
pieceIds: PieceId[];
};
export const emitStartRoundEvent = (
socket: ServerSocket,
payload: StartRoundEvent,
) => {
socket.emit(ServerEvent.START_ROUND, payload);
};
export function attachHandlerToStartRoundEvent(
socket: ClientSocket,
handler: (event: StartRoundEvent) => void,
): void {
socket.once(ServerEvent.START_ROUND, handler);
}

View File

@ -1,4 +1,5 @@
import { Socket } from "socket.io-client"; import { Socket as ServerSocket } from "socket.io";
import { Socket as ClientSocket } from "socket.io-client";
import { ServerEvent } from "./ServerEvent"; import { ServerEvent } from "./ServerEvent";
export type UpdateLobbyEvent = { export type UpdateLobbyEvent = {
@ -6,8 +7,15 @@ export type UpdateLobbyEvent = {
gameCode: string; gameCode: string;
}; };
export const emitUpdateLobbyEvent = (
socket: ServerSocket,
payload: UpdateLobbyEvent,
) => {
socket.emit(ServerEvent.LOBBY_UPDATE, payload);
};
export function attachHandlerToUpdateLobbyEvent( export function attachHandlerToUpdateLobbyEvent(
socket: Socket, socket: ClientSocket,
handler: (event: UpdateLobbyEvent) => void, handler: (event: UpdateLobbyEvent) => void,
): void { ): void {
socket.once(ServerEvent.LOBBY_UPDATE, handler); socket.once(ServerEvent.LOBBY_UPDATE, handler);

View File

@ -3,7 +3,11 @@ import { Socket } from "socket.io-client";
import LandingPage from "./pages/landing/LandingPage"; import LandingPage from "./pages/landing/LandingPage";
import GamePage from "./pages/game/GamePage"; import GamePage from "./pages/game/GamePage";
import LobbyPage from "./pages/lobby/LobbyPage"; import LobbyPage from "./pages/lobby/LobbyPage";
import { attachHandlerToUpdateLobbyEvent } from "interface"; import {
attachHandlerToStartRoundEvent,
attachHandlerToUpdateLobbyEvent,
PieceId,
} from "interface";
export interface AppProps { export interface AppProps {
socket: Socket; socket: Socket;
@ -13,8 +17,9 @@ const App = (props: AppProps) => {
const { socket } = props; const { socket } = props;
const [renderedPage, setRenderedPage] = useState("LANDING"); const [renderedPage, setRenderedPage] = useState("LANDING");
const [initialPlayerNames, setInitialPlayerNames] = useState([""]); const [initialPlayerNames, setInitialPlayerNames] = useState([] as string[]);
const [gameCode, setGameCode] = useState(""); const [gameCode, setGameCode] = useState("");
const [initialPieceIds, setInitialPieceIds] = useState([] as PieceId[]);
const setupNextPageTransition = useCallback(() => { const setupNextPageTransition = useCallback(() => {
if (renderedPage === "LANDING") { if (renderedPage === "LANDING") {
@ -23,6 +28,11 @@ const App = (props: AppProps) => {
setGameCode(event.gameCode); setGameCode(event.gameCode);
setRenderedPage("LOBBY"); setRenderedPage("LOBBY");
}); });
} else if (renderedPage === "LOBBY") {
attachHandlerToStartRoundEvent(socket, (event) => {
setInitialPieceIds(event.pieceIds);
setRenderedPage("GAME");
});
} }
}, [renderedPage]); }, [renderedPage]);
@ -37,7 +47,9 @@ const App = (props: AppProps) => {
gameCode={gameCode} gameCode={gameCode}
/> />
)} )}
{renderedPage === "GAME" && <GamePage />} {renderedPage === "GAME" && (
<GamePage initialPieceIds={initialPieceIds} />
)}
</div> </div>
); );
}; };

View File

@ -6,16 +6,19 @@ import { buildBoard, PieceId } from "interface";
import { DieViewProps } from "./types/DieViewProps"; import { DieViewProps } from "./types/DieViewProps";
import { PlacePieceActionStack } from "./types/PlacePieceActionStack"; import { PlacePieceActionStack } from "./types/PlacePieceActionStack";
const GamePage = () => { export interface GamePageProps {
const getRandomPieceId = () => { initialPieceIds: PieceId[];
const randomId = Math.floor(Math.random() * Object.keys(PieceId).length); }
return Object.values(PieceId)[randomId];
};
const getRandomDiceSet: () => DieViewProps[] = () => const GamePage = (props: GamePageProps) => {
[1, 2, 3, 4].map(() => { const { initialPieceIds } = props;
const [pieceIds] = useState(initialPieceIds);
const getDiceSet: () => DieViewProps[] = () =>
pieceIds.map((pieceId) => {
return { return {
pieceId: getRandomPieceId(), pieceId: pieceId,
isSelected: false, isSelected: false,
isDisabled: false, isDisabled: false,
isSpecial: false, isSpecial: false,
@ -23,7 +26,7 @@ const GamePage = () => {
}; };
}); });
const [dice, setDice] = useState(getRandomDiceSet()); const [dice, setDice] = useState(getDiceSet());
const [specialDice, setSpecialDice] = useState( const [specialDice, setSpecialDice] = useState(
[ [
PieceId.P03, PieceId.P03,
@ -96,7 +99,7 @@ const GamePage = () => {
const commitBoard = () => { const commitBoard = () => {
if (dice.some((die) => !die.isDisabled)) return; if (dice.some((die) => !die.isDisabled)) return;
placePieceActionStack.commitActions(); placePieceActionStack.commitActions();
setDice(getRandomDiceSet()); setDice(getDiceSet());
setSpecialDieUsedInRound(false); setSpecialDieUsedInRound(false);
}; };

View File

@ -1,7 +1,7 @@
import { useState } from "react"; import { useState } from "react";
import "./LobbyPage.scss"; import "./LobbyPage.scss";
import { Socket } from "socket.io-client"; import { Socket } from "socket.io-client";
import { attachHandlerToUpdateLobbyEvent } from "interface"; import { attachHandlerToUpdateLobbyEvent, ClientEvent } from "interface";
export interface LobbyPageProps { export interface LobbyPageProps {
initialPlayerNames: string[]; initialPlayerNames: string[];
@ -16,6 +16,7 @@ const LobbyPage = (props: LobbyPageProps) => {
attachHandlerToUpdateLobbyEvent(socket, (event) => { attachHandlerToUpdateLobbyEvent(socket, (event) => {
setPlayerNames(event.playerNames); setPlayerNames(event.playerNames);
}); });
const startGame = () => socket.emit(ClientEvent.START_GAME);
return ( return (
<div className="lobby-page"> <div className="lobby-page">
@ -27,7 +28,7 @@ const LobbyPage = (props: LobbyPageProps) => {
<article className="lobby-user-name">{name}</article> <article className="lobby-user-name">{name}</article>
))} ))}
<div className="start-game-button"> <div className="start-game-button">
<button>Start Game</button> <button onClick={startGame}>Start Game</button>
</div> </div>
<article className="game-code">Game code: {gameCode}</article> <article className="game-code">Game code: {gameCode}</article>
</div> </div>