Merge pull request #230 from csci312a-s19/lobbie

Lobbie
csci312a-s19 · May 13, 2019 · d6225fa · d6225fa
2 parents 6604543 + 84c52dd
commit d6225fa
Show file tree

Hide file tree

Showing 12 changed files with 227 additions and 239 deletions.
diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/src/App.js b/client/src/App.js
@@ -29,7 +29,8 @@ const GUEST_ACCOUNT = {
   total_multi_wins: 0,
   map_0: -1,
   map_1: -1,
-  map_2: -1
+  map_2: -1,
+  map_3: -1
 };
 
 const CenteredDiv = styled.div`
@@ -330,6 +331,7 @@ class App extends Component {
                 resetLobby={() => {
                   this.setState({ lobby: '' });
                 }}
+                lobby={this.state.lobby}
                 mapProps={this.state.mapProps}
                 goToMenu={this.handleGoToMenu}
                 guest={this.state.guest}
@@ -352,6 +354,7 @@ class App extends Component {
         } else {
           return (
             <GameEngine
+              lobby={this.state.lobby}
               mapProps={this.state.mapProps}
               goToMenu={this.handleGoToMenu}
               guest={this.state.guest}

diff --git a/client/src/Engine/GameEngine.js b/client/src/Engine/GameEngine.js
@@ -58,7 +58,9 @@ class GameEngine extends Component {
        * each game will have a socket to connect back to the server
        * store the other players as a member for THIS player
        */
-      this.socket = io.connect(this.props.lobby);
+      if (this.props.lobby) {
+        this.socket = io.connect('/' + this.props.lobby.toLowerCase());
+      }
     }
 
     // timeout for debounce