transition

client/src/components/controls.jsx

@@ -30,8 +30,8 @@ function Controls(args) {
         sendGameReady,
     } = args;
 
-    if (instance) return <InstanceCtrl />;
     if (game) return <GameCtrl />;
+    if (instance) return <InstanceCtrl />;
     if (nav === 'play' || !nav) return <PlayCtrl />
 
     return false;

client/src/components/game.ctrl.jsx

@@ -1,8 +1,6 @@
 const preact = require('preact');
 const { connect } = require('preact-redux');
 
-const InstanceCtrl = require('./instance.ctrl');
-
 const addState = connect(
     function receiveState(state) {
         const {

client/src/components/main.jsx

@@ -35,6 +35,7 @@ function Main(props) {
         return <Instance />;
     }
 
+    if (nav === 'transition') return false;
     if (nav === 'play') return <Play />;
     if (nav === 'team') return <Team />;
 

client/src/components/nav.jsx

@@ -74,8 +74,8 @@ function Nav(args) {
     }
 
     function joinInstance(i) {
-        if (game) navTo(null);
         sendInstanceState(i);
+        if (game) navTo('transition');
         return true;
     }
 

client/src/components/play.ctrl.jsx

@@ -29,13 +29,13 @@ function JoinButtons(args) {
     return (
         <aside>
             <button
-                class='pvp'
+                class='pvp ready'
                 onClick={() => sendInstanceQueue()}
                 type="submit">
                 PVP
             </button>
             <button
-                class='practice'
+                class='practice ready'
                 onClick={() => sendInstancePractice()}
                 type="submit">
                 Practice