Sfoglia il codice sorgente

Moving screens into a screens directory

Kirk Trombley 5 anni fa
parent
commit
b334c87411

+ 4 - 10
client/src/components/game.component/game.jsx

@@ -7,11 +7,11 @@ import {
   POST_GAME,
   ERROR,
 } from "./game-state.enum";
-import PreGame from '../pre-game.component';
-import PreRound from '../pre-round.component';
-import GamePanelContainer from "../game-panel.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 '../round-summary.component';
-import PlayerScoresContainer from "../player-scores.component";
+import PlayerScoresContainer from "../screens/player-scores.component";
 
 const initialState = {
   gameState: PRE_GAME,
@@ -25,12 +25,6 @@ const Game = () => {
   const setGameState = gameState => rawSetState({ ...state, gameState });
   const setGameStateAnd = (gameState, updates) => rawSetState({ ...state, gameState, ...updates });
 
-  // return <GamePanelContainer
-  //   gameId="34d49753-0f2a-4f77-aac6-5cc0b6db0446"
-  //   playerName="Kirk"
-  //   onRoundEnd={() => console.log("Round is over!")}
-  // />
-
   switch (state.gameState) {
     case PRE_GAME:
       return <PreGame

+ 0 - 0
client/src/components/game-panel.component/click-marker-map.component.jsx → client/src/components/screens/game-panel.component/click-marker-map.component.jsx


+ 2 - 2
client/src/components/game-panel.component/game-panel.component.jsx → client/src/components/screens/game-panel.component/game-panel.component.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
-import { gameInfo, getGuesses, sendGuess } from "../../services/ggsh.service";
+import { gameInfo, getGuesses, sendGuess } from "../../../services/ggsh.service";
+import Loading from '../../util/loading.component';
 import GuessPane from "./guess-pane.component";
-import Loading from '../loading.component';
 import PositionedStreetView from "./positioned-street-view.component";
 
 // TODO want a button for moving the pano back to start somehow

+ 0 - 0
client/src/components/game-panel.component/guess-pane.component.jsx → client/src/components/screens/game-panel.component/guess-pane.component.jsx


+ 0 - 0
client/src/components/game-panel.component/index.js → client/src/components/screens/game-panel.component/index.js


+ 0 - 0
client/src/components/game-panel.component/positioned-street-view.component.jsx → client/src/components/screens/game-panel.component/positioned-street-view.component.jsx


+ 0 - 0
client/src/components/game-panel.component/round-timer.component.jsx → client/src/components/screens/game-panel.component/round-timer.component.jsx


+ 0 - 0
client/src/components/player-scores.component/index.js → client/src/components/screens/player-scores.component/index.js


+ 0 - 0
client/src/components/player-scores.component/player-score-list.component.jsx → client/src/components/screens/player-scores.component/player-score-list.component.jsx


+ 0 - 0
client/src/components/player-scores.component/player-score-tile.component.jsx → client/src/components/screens/player-scores.component/player-score-tile.component.jsx


+ 2 - 2
client/src/components/player-scores.component/player-scores.component.jsx → client/src/components/screens/player-scores.component/player-scores.component.jsx

@@ -1,6 +1,6 @@
 import React, { useState, useEffect } from 'react';
-import { gameInfo } from '../../services/ggsh.service';
-import Loading from '../util/loading.component';
+import { gameInfo } from '../../../services/ggsh.service';
+import Loading from '../../util/loading.component';
 import PlayerScores from "./player-score-list.component";
 
 const PlayerScoresContainer = ({ gameId, onReturnToStart }) => {

+ 0 - 0
client/src/components/pre-game.component/index.js → client/src/components/screens/pre-game.component/index.js


+ 0 - 0
client/src/components/pre-game.component/join-game-input.component.jsx → client/src/components/screens/pre-game.component/join-game-input.component.jsx


+ 0 - 0
client/src/components/pre-game.component/player-name-input.component.jsx → client/src/components/screens/pre-game.component/player-name-input.component.jsx


+ 0 - 0
client/src/components/pre-game.component/pre-game.component.jsx → client/src/components/screens/pre-game.component/pre-game.component.jsx


+ 1 - 1
client/src/components/pre-round.component.jsx → client/src/components/screens/pre-round.component.jsx

@@ -1,5 +1,5 @@
 import React from "react";
-import ClickToCopy from "./util/click-to-copy.component";
+import ClickToCopy from "../util/click-to-copy.component";
 
 const PreRound = ({ gameId, playerName, onStart }) => (
   <div style={{

+ 0 - 0
client/src/components/round-summary.component.jsx → client/src/components/screens/round-summary.component.jsx