|
@@ -6,13 +6,13 @@ import {
|
|
|
POST_ROUND,
|
|
|
POST_GAME,
|
|
|
ERROR,
|
|
|
-} from "./game-state.enum";
|
|
|
-import HeaderAndFooter from "./header-and-footer.component";
|
|
|
-import PreGame from '../screens/pre-game.component';
|
|
|
-import PreRound from '../screens/pre-round.component';
|
|
|
-import GamePanelContainer from "../screens/game-panel.component";
|
|
|
-import RoundSummary from '../screens/round-summary.component';
|
|
|
-import PlayerScoresContainer from "../screens/player-scores.component";
|
|
|
+} from "./GameState";
|
|
|
+import HeaderAndFooter from "./HeaderAndFooter";
|
|
|
+import PreGame from '../screens/PreGame';
|
|
|
+import PreRound from '../screens/PreRound';
|
|
|
+import GamePanel from "../screens/GamePanel";
|
|
|
+import RoundSummary from '../screens/RoundSummary';
|
|
|
+import PlayerScores from "../screens/PlayerScores";
|
|
|
|
|
|
const initialState = {
|
|
|
gameState: PRE_GAME,
|
|
@@ -43,7 +43,7 @@ const Game = () => {
|
|
|
onStart={() => setGameState(IN_ROUND)}
|
|
|
/>
|
|
|
case IN_ROUND:
|
|
|
- return <GamePanelContainer
|
|
|
+ return <GamePanel
|
|
|
gameId={state.gameId}
|
|
|
playerName={state.playerName}
|
|
|
onRoundEnd={lastRound => setGameStateAnd(POST_ROUND, { lastRound })}
|
|
@@ -57,7 +57,7 @@ const Game = () => {
|
|
|
case POST_GAME:
|
|
|
return (
|
|
|
<HeaderAndFooter>
|
|
|
- <PlayerScoresContainer
|
|
|
+ <PlayerScores
|
|
|
gameId={state.gameId}
|
|
|
onReturnToStart={() => setGameState(PRE_GAME)}
|
|
|
/>
|