fix game navigation and added skip

client/src/components/game.component.jsx

@@ -15,6 +15,7 @@ function GamePanel(props) {
         sendGameReady,
         showLog,
         toggleLog,
+        skip,
         quit,
     } = props;
 
@@ -41,17 +42,29 @@ function GamePanel(props) {
     //     );
     // }
 
-    function backClick() {
-        if (game.phase === 'Finish') sendInstanceState(game.instance);
-        return quit();
+    function actionClick() {
+        if (game.phase === 'Finish') {
+            sendInstanceState(game.instance);
+            quit();
+        }
+
+        if (resolution) {
+            return skip();
+        }
+
+        return sendGameReady();
     }
 
+    let actionText = 'Ready';
+    if (game.phase === 'Finish') actionText = 'Done';
+    if (resolution) actionText = 'Skip';
+
     const header = (
         <div className="top">
             <button
                 className="instance-btn instance-ui-btn right"
-                onClick={() => sendGameReady()}>
-                Ready
+                onClick={() => actionClick()}>
+                {actionText}
             </button>
         </div>
     );

client/src/components/game.container.jsx

@@ -69,8 +69,11 @@ const addState = connect(
             dispatch(actions.setShowLog(v));
         }
 
+        function skip() {
+            dispatch(actions.setSkip(true));
+        }
 
-        return { setActiveSkill, setActiveCryp, quit, toggleLog };
+        return { setActiveSkill, setActiveCryp, quit, toggleLog, skip };
     }
 
 );

client/src/components/main.jsx

@@ -31,15 +31,6 @@ function Main(props) {
         );
     }
 
-    if (nav === 'team') return <Team />;
-    if (nav === 'list') return <List />;
-
-    if (instance) {
-        return (
-            <InstanceContainer />
-        );
-    }
-
     if (game) {
         console.log('game time');
         return (
@@ -47,6 +38,14 @@ function Main(props) {
         );
     }
 
+    if (instance) {
+        return (
+            <InstanceContainer />
+        );
+    }
+
+    if (nav === 'team') return <Team />;
+    if (nav === 'list') return <List />;
 
     return (
         <Team />

client/src/components/nav.jsx

@@ -37,6 +37,8 @@ const addState = connect(
         }
 
         function navTo(place) {
+            dispatch(actions.setGame(null));
+            dispatch(actions.setInstance(null));
             return dispatch(actions.setNav(place));
         }