From f43b9f6cc3077d13c634962c38e3040ecb44ae80 Mon Sep 17 00:00:00 2001
From: ntr <ntr@smokestack.io>
Date: Mon, 2 Sep 2019 17:00:55 +1000
Subject: [PATCH 1/6] tabs init

---
 WORKLOG.md                               |  4 +++
 bin/deploy.sh                            |  1 -
 client/assets/styles/instance.less       |  2 +-
 client/assets/styles/menu.less           | 18 ++++++++--
 client/assets/styles/styles.less         | 45 ++++++++++++++++--------
 client/src/components/info.component.jsx |  2 ++
 client/src/components/play.jsx           | 19 ++++++++++
 client/src/components/vbox.component.jsx | 20 +++++------
 etc/telegraf/telegraf.conf               |  2 +-
 9 files changed, 84 insertions(+), 29 deletions(-)

diff --git a/WORKLOG.md b/WORKLOG.md
index bc56173d..5d23e2e2 100644
--- a/WORKLOG.md
+++ b/WORKLOG.md
@@ -11,6 +11,10 @@
     * constructs jiggle when clicked
     * background colour changes depending on time of day
 
+  * other
+    * skill pane bigger
+      * add colours and speed -> Skill > <B></B>B
+
 * bot game grind
 
 * change score to enum
diff --git a/bin/deploy.sh b/bin/deploy.sh
index 15778cd7..0c9362f1 100755
--- a/bin/deploy.sh
+++ b/bin/deploy.sh
@@ -6,7 +6,6 @@ MNML_PATH=$(realpath "$DIR/../")
 VERSION=$(<"$MNML_PATH/VERSION")
 
 SERVER_BIN_DIR="/usr/local/mnml/bin"
-
 CLIENT_DIST_DIR="/var/lib/mnml/client"
 CLIENT_PUBLIC_DIR="/var/lib/mnml/public/current"
 
diff --git a/client/assets/styles/instance.less b/client/assets/styles/instance.less
index d9c5a195..21d5b885 100644
--- a/client/assets/styles/instance.less
+++ b/client/assets/styles/instance.less
@@ -3,7 +3,7 @@
 .instance {
     overflow-x: hidden;
     display: grid;
-    grid-template-columns: 2fr minmax(min-content, 1fr);
+    grid-template-columns: 1fr minmax(min-content, 1fr);
     grid-template-rows: min-content 1fr;
 
     grid-template-areas:
diff --git a/client/assets/styles/menu.less b/client/assets/styles/menu.less
index fb919124..acb680a1 100644
--- a/client/assets/styles/menu.less
+++ b/client/assets/styles/menu.less
@@ -4,11 +4,12 @@
     height: 100%;
     display: grid;
 
-    grid-template-rows: minmax(min-content, 2fr) 1fr;
+    grid-template-rows: minmax(min-content, 2fr) min-content 1fr;
     grid-template-columns: 1fr;
 
     grid-template-areas:
         "top"
+        "tabs"
         "bottom";
 
     .top {
@@ -63,7 +64,6 @@
     .inventory {
         margin-top: 2em;
         grid-area: bottom;
-
         display: grid;
         grid-template-columns: 1fr 1fr;
 
@@ -87,4 +87,18 @@
             flex-flow: column;
         }
     }
+
+    .options {
+        grid-area: tabs;
+        display: flex;
+        flex-flow: row;
+        button {
+            border-top: 0;
+            border: 1px solid #222;
+            &:not(:last-child) {
+                border-right: 0;
+            }
+            flex: 1;
+        }
+    }
 }
diff --git a/client/assets/styles/styles.less b/client/assets/styles/styles.less
index 30b6d8e1..e678e581 100644
--- a/client/assets/styles/styles.less
+++ b/client/assets/styles/styles.less
@@ -88,8 +88,8 @@ dl {
     grid-template-rows: min-content 1fr min-content;
     grid-template-areas:
       "hd  hd   ctrl"
-      "nav main ctrl"
-      "nav main ctrl";
+      "main main ctrl"
+      "main main ctrl";
 }
 
 main {
@@ -198,12 +198,6 @@ button[disabled] {
 */
 
 .welcome {
-    .highlight {
-        color: black;
-        background: @white;
-        border: 1px solid @white;
-    }
-
     .login {
         width: 50%;
         display: flex;
@@ -213,11 +207,6 @@ button[disabled] {
 
     .options {
         width: 50%;
-        display: flex;
-        flex-flow: row;
-        button {
-            flex: 1;
-        }
     }
 
     h2 {
@@ -262,4 +251,32 @@ figure.gray {
 
 .mobile-title {
     display: none;
-}
\ No newline at end of file
+}
+
+.options {
+    display: flex;
+    flex-flow: row;
+
+    button {
+        &.highlight {
+            color: @white;
+            box-shadow: inset 0px 5px 0px 0px @white;
+            border: 0;
+            &:first-child {
+                border-left: 1px solid #444;
+            }
+
+            &:last-child {
+                border-right: 1px solid #444;
+            }
+
+        }
+
+        border: 1px solid #444;
+        flex: 1;
+    }
+}
+
+nav {
+    display: none;
+}
diff --git a/client/src/components/info.component.jsx b/client/src/components/info.component.jsx
index 547581aa..49393582 100644
--- a/client/src/components/info.component.jsx
+++ b/client/src/components/info.component.jsx
@@ -31,6 +31,8 @@ function InfoComponent(args) {
             return (
                 <div class="info-skill">
                     <h2>{fullInfo.item}</h2>
+                    <h3>Skill > BB</h3>
+                    <h3>tri 3</h3>
                     <div> {infoDescription} </div>
                 </div>
             );
diff --git a/client/src/components/play.jsx b/client/src/components/play.jsx
index 7b508c70..d306d3d8 100644
--- a/client/src/components/play.jsx
+++ b/client/src/components/play.jsx
@@ -111,6 +111,25 @@ function Play(args) {
             <div class="team top">
                 {constructPanels}
             </div>
+            <h1>mnml.gg</h1>
+            <div class="options">
+                <button
+                    class={`login-btn highlight`}>
+                    Play
+                </button>
+                <button
+                    class={`login-btn`}>
+                    News
+                </button>
+                <button
+                    class={`login-btn`}>
+                    Store
+                </button>
+                <button
+                    class={`login-btn`}>
+                    ⚙ Account
+                </button>
+            </div>
             <Inventory />
         </main>
     );
diff --git a/client/src/components/vbox.component.jsx b/client/src/components/vbox.component.jsx
index 232ba9c2..a7ffdc38 100644
--- a/client/src/components/vbox.component.jsx
+++ b/client/src/components/vbox.component.jsx
@@ -203,7 +203,7 @@ function Vbox(args) {
                 <button
                     class={classes}
                     onMouseOver={e => vboxHover(e, v)}
-                    onClick={onClick}
+                    onMouseDown={onClick}
                     onDblClick={onDblClick} >
                     {shapes[v]()}
                 </button>
@@ -213,7 +213,7 @@ function Vbox(args) {
         return (
             <button
                 class={classes}
-                onClick={onClick}
+                onMouseDown={onClick}
                 onDblClick={onDblClick}
                 onMouseOver={e => vboxHover(e, v)}>
                 {v}
@@ -225,7 +225,7 @@ function Vbox(args) {
     function vboxElement() {
         return (
             <div class='vbox-vbox'
-                onClick={() => setReclaiming(false)}
+                onMouseDown={() => setReclaiming(false)}
                 onMouseOver={e => hoverInfo(e, 'vbox')}>
                 <div class="vbox-hdr">
                     <h3 onTouchStart={e => e.target.scrollIntoView(true)}>VBOX</h3>
@@ -241,7 +241,7 @@ function Vbox(args) {
                 <button
                     class='vbox-btn'
                     onMouseOver={e => hoverInfo(e, 'refill')}
-                    onClick={() => sendVboxDiscard()}>
+                    onMouseDown={() => sendVboxDiscard()}>
                     refill - 2b
                 </button>
             </div>
@@ -270,7 +270,7 @@ function Vbox(args) {
     //             key={i}
     //             class={`${highlighted ? 'highlight' : ''}`}
     //             onMouseOver={(e) => vboxHover(e, value)}
-    //             onClick={e => boundClick(e, i, highlighted) }>
+    //             onMouseDown={e => boundClick(e, i, highlighted) }>
     //             {convertItem(value)}
     //         </td>
     //     );
@@ -311,7 +311,7 @@ function Vbox(args) {
                 <button
                     class={classes}
                     onMouseOver={e => vboxHover(e, v)}
-                    onClick={onClick}>
+                    onMouseDown={onClick}>
                     {shapes[v]()}
                 </button>
             );
@@ -320,7 +320,7 @@ function Vbox(args) {
         return (
             <button
                 class={classes}
-                onClick={onClick}
+                onMouseDown={onClick}
                 onMouseOver={e => vboxHover(e, v)}>
                 {v}
             </button>
@@ -347,7 +347,7 @@ function Vbox(args) {
                 class='vbox-btn'
                 disabled={combiner.length !== 3}
                 onMouseOver={e => hoverInfo(e, 'refine')}
-                onClick={() => sendVboxCombine()}>
+                onMouseDown={() => sendVboxCombine()}>
                 {text}
             </button>
         );
@@ -364,7 +364,7 @@ function Vbox(args) {
 
         return (
             <div class={inventoryClass}
-                onClick={inventoryClick}
+                onMouseDown={inventoryClick}
                 style={vboxSelecting || itemUnequip.length ? { cursor: 'pointer' } : null}
                 onMouseOver={e => hoverInfo(e, 'inventory')}>
                 <div class="vbox-hdr">
@@ -372,7 +372,7 @@ function Vbox(args) {
                     <button
                         class='vbox-btn reclaim'
                         onMouseOver={e => hoverInfo(e, 'reclaim')}
-                        onClick={reclaimClick}>
+                        onMouseDown={reclaimClick}>
                         reclaim
                     </button>
                 </div>
diff --git a/etc/telegraf/telegraf.conf b/etc/telegraf/telegraf.conf
index 9d994fd3..97a108c7 100644
--- a/etc/telegraf/telegraf.conf
+++ b/etc/telegraf/telegraf.conf
@@ -101,7 +101,7 @@
   ## urls will be written to each interval.
   # urls = ["unix:///var/run/influxdb.sock"]
   # urls = ["udp://127.0.0.1:8089"]
-  urls = ["http://mnml-prod-elk:8086"]
+  urls = ["http://mnml-prod-mn:8086"]
 
   ## The target database for metrics; will be created as needed.
   ## For UDP url endpoint database needs to be configured on server side.

From f0a67432384ce203b591648c0d82e3790cc03177 Mon Sep 17 00:00:00 2001
From: ntr <ntr@smokestack.io>
Date: Wed, 4 Sep 2019 15:15:16 +1000
Subject: [PATCH 2/6] remove title

---
 client/src/components/play.jsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/client/src/components/play.jsx b/client/src/components/play.jsx
index d306d3d8..ae4f16e7 100644
--- a/client/src/components/play.jsx
+++ b/client/src/components/play.jsx
@@ -111,7 +111,6 @@ function Play(args) {
             <div class="team top">
                 {constructPanels}
             </div>
-            <h1>mnml.gg</h1>
             <div class="options">
                 <button
                     class={`login-btn highlight`}>

From 60d9ea5198ff5137130a56d04177419e56d4748e Mon Sep 17 00:00:00 2001
From: ntr <ntr@smokestack.io>
Date: Wed, 4 Sep 2019 21:20:05 +1000
Subject: [PATCH 3/6] better vbox touches

---
 client/src/components/vbox.component.jsx | 37 +++++++-----------------
 1 file changed, 11 insertions(+), 26 deletions(-)

diff --git a/client/src/components/vbox.component.jsx b/client/src/components/vbox.component.jsx
index da92fa0c..6768cde6 100644
--- a/client/src/components/vbox.component.jsx
+++ b/client/src/components/vbox.component.jsx
@@ -192,6 +192,7 @@ function Vbox(args) {
 
         function onClick(e) {
             e.stopPropagation();
+            setCombiner([]);
             if (selected) return clearVboxSelected();
             return setVboxSelected([group, index]);
         }
@@ -204,6 +205,7 @@ function Vbox(args) {
                     class={classes}
                     onMouseOver={e => vboxHover(e, v)}
                     onMouseDown={onClick}
+                    onClick={e => e.stopPropagation()}
                     onDblClick={onDblClick} >
                     {shapes[v]()}
                 </button>
@@ -214,6 +216,7 @@ function Vbox(args) {
             <button
                 class={classes}
                 onMouseDown={onClick}
+                onClick={e => e.stopPropagation()}
                 onDblClick={onDblClick}
                 onMouseOver={e => vboxHover(e, v)}>
                 {v}
@@ -226,6 +229,7 @@ function Vbox(args) {
         return (
             <div class='vbox-vbox'
                 onMouseDown={() => setReclaiming(false)}
+                onClick={e => e.stopPropagation()}
                 onMouseOver={e => hoverInfo(e, 'vbox')}>
                 <div class="vbox-hdr">
                     <h3 onTouchStart={e => e.target.scrollIntoView(true)}>VBOX</h3>
@@ -241,6 +245,7 @@ function Vbox(args) {
                 <button
                     class='vbox-btn'
                     onMouseOver={e => hoverInfo(e, 'refill')}
+                    onClick={e => e.stopPropagation()}
                     onMouseDown={() => sendVboxDiscard()}>
                     refill - 2b
                 </button>
@@ -251,32 +256,6 @@ function Vbox(args) {
     //
     //  INVENTORY
     //
-
-    // const boundTds = range(0, 9).map(i => {
-    //     const value = vbox.bound[i];
-    //     if (combiner.indexOf(i) > -1) {
-    //         return (
-    //             <td
-    //                 key={i}>
-    //                 &nbsp;
-    //             </td>
-    //         );
-    //     }
-
-    //     const highlighted = value && vboxHighlight.includes(value);
-
-    //     return (
-    //         <td
-    //             key={i}
-    //             class={`${highlighted ? 'highlight' : ''}`}
-    //             onMouseOver={(e) => vboxHover(e, value)}
-    //             onMouseDown={e => boundClick(e, i, highlighted) }>
-    //             {convertItem(value)}
-    //         </td>
-    //     );
-    // });
-
-
     function reclaimClick(e) {
         e.stopPropagation();
         return setReclaiming(!reclaiming);
@@ -292,6 +271,7 @@ function Vbox(args) {
         }
 
         function onClick(e) {
+            if (vboxSelecting) clearVboxSelected();
             if (reclaiming) return sendVboxReclaim(i);
 
             const combinerIndex = combiner.indexOf(i);
@@ -310,6 +290,7 @@ function Vbox(args) {
                 <button
                     class={classes}
                     onMouseOver={e => vboxHover(e, v)}
+                    onClick={e => e.stopPropagation()}
                     onMouseDown={onClick}>
                     {shapes[v]()}
                 </button>
@@ -320,6 +301,7 @@ function Vbox(args) {
             <button
                 class={classes}
                 onMouseDown={onClick}
+                onClick={e => e.stopPropagation()}
                 onMouseOver={e => vboxHover(e, v)}>
                 {v}
             </button>
@@ -346,6 +328,7 @@ function Vbox(args) {
                 class='vbox-btn'
                 disabled={combiner.length !== 3}
                 onMouseOver={e => hoverInfo(e, 'refine')}
+                onClick={e => e.stopPropagation()}
                 onMouseDown={() => sendVboxCombine()}>
                 {text}
             </button>
@@ -364,6 +347,7 @@ function Vbox(args) {
         return (
             <div class={inventoryClass}
                 onMouseDown={inventoryClick}
+                onClick={e => e.stopPropagation()}
                 style={vboxSelecting || itemUnequip.length ? { cursor: 'pointer' } : null}
                 onMouseOver={e => hoverInfo(e, 'inventory')}>
                 <div class="vbox-hdr">
@@ -371,6 +355,7 @@ function Vbox(args) {
                     <button
                         class='vbox-btn reclaim'
                         onMouseOver={e => hoverInfo(e, 'reclaim')}
+                        onClick={e => e.stopPropagation()}
                         onMouseDown={reclaimClick}>
                         reclaim
                     </button>

From 7af81c5252d7904dac3205fca5eccd14b6d0a2a2 Mon Sep 17 00:00:00 2001
From: ntr <ntr@smokestack.io>
Date: Fri, 6 Sep 2019 12:13:54 +1000
Subject: [PATCH 4/6] woah

---
 WORKLOG.md                                    |   3 -
 client/assets/styles/account.less             |   3 -
 client/assets/styles/controls.less            |  13 +-
 client/assets/styles/instance.less            |   2 +-
 client/assets/styles/menu.less                |  25 ++--
 client/assets/styles/styles.less              |  28 ++--
 client/src/components/account.management.jsx  |  25 ++--
 client/src/components/account.page.jsx        |   2 +
 client/src/components/game.ctrl.jsx           |   8 +-
 client/src/components/header.jsx              | 131 ++++++++++++++----
 client/src/components/info.component.jsx      |  14 +-
 client/src/components/instance.constructs.jsx |   2 +-
 client/src/components/instance.ctrl.jsx       |  10 +-
 client/src/components/inventory.jsx           |  29 ++--
 client/src/components/main.jsx                |   2 +-
 client/src/components/mnml.jsx                |   1 -
 client/src/components/nav.jsx                 |   1 -
 client/src/components/play.ctrl.jsx           |  57 ++++++--
 client/src/components/play.jsx                |  24 +---
 client/src/components/shapes.jsx              |   2 +-
 client/src/components/team.ctrl.jsx           |   2 +-
 client/src/components/team.jsx                |   4 +-
 server/src/img.rs                             |   5 +-
 23 files changed, 265 insertions(+), 128 deletions(-)

diff --git a/WORKLOG.md b/WORKLOG.md
index 999f1afa..5af518fa 100644
--- a/WORKLOG.md
+++ b/WORKLOG.md
@@ -11,9 +11,6 @@
     * constructs jiggle when clicked
     * background colour changes depending on time of day
 
-* bug fixes
-  * pvp 1st round doesn't resolve until warden timer completes
-
 * bot game grind
 * stress test
 
diff --git a/client/assets/styles/account.less b/client/assets/styles/account.less
index d6f43a30..74ef9e3c 100644
--- a/client/assets/styles/account.less
+++ b/client/assets/styles/account.less
@@ -1,9 +1,6 @@
 @import 'colours.less';
 
 .account {
-    margin-top: 2em;
-    grid-area: bottom;
-
     display: grid;
     grid-template-columns: 1fr 1fr 1fr 1fr;
     grid-gap: 0 1em;
diff --git a/client/assets/styles/controls.less b/client/assets/styles/controls.less
index d036debc..4484d720 100644
--- a/client/assets/styles/controls.less
+++ b/client/assets/styles/controls.less
@@ -8,10 +8,17 @@ aside {
         "timer controls";
 
     grid-template-columns: min-content 1fr;
-    grid-template-rows: 1fr 1fr 1fr;
-    grid-gap: 0.5em 0;
+    grid-template-rows: 1fr;
 
-    padding: 1em 1em 1em 0;
+    padding-left: 1em;
+
+    .controls {
+        grid-area: controls;
+
+        display: grid;
+        grid-auto-rows: 1fr;
+        grid-gap: 0.5em 0;
+    }
 
     // fix chrome being inconsistent
     table {
diff --git a/client/assets/styles/instance.less b/client/assets/styles/instance.less
index 88ce7692..ee7a1898 100644
--- a/client/assets/styles/instance.less
+++ b/client/assets/styles/instance.less
@@ -1,7 +1,7 @@
 @import 'colours.less';
 
 .instance {
-    overflow-x: hidden;
+    overflow: hidden;
     display: grid;
     grid-template-columns: 1fr minmax(min-content, 1fr);
     grid-template-rows: min-content 1fr;
diff --git a/client/assets/styles/menu.less b/client/assets/styles/menu.less
index acb680a1..041f0263 100644
--- a/client/assets/styles/menu.less
+++ b/client/assets/styles/menu.less
@@ -4,17 +4,16 @@
     height: 100%;
     display: grid;
 
-    grid-template-rows: minmax(min-content, 2fr) min-content 1fr;
+    grid-template-rows: min-content 1fr 2fr;
     grid-template-columns: 1fr;
 
     grid-template-areas:
+        "hdr"
         "top"
-        "tabs"
         "bottom";
 
     .top {
         grid-area: top;
-        padding: 0 0 0.5em 2em;
         border-bottom: 0.1em solid #222;
         box-sizing: border-box;
     }
@@ -25,9 +24,10 @@
 
     .team {
         display: grid;
-        grid-area: top;
+        grid-area: bottom;
         grid-template-columns: repeat(auto-fill, minmax(min-content, 33%));
         max-height: 100%;
+        margin-top: 1em;
 
         .team-select:not(:nth-child(3n)) {
             margin-right: 0.5em;
@@ -62,8 +62,6 @@
     }
 
     .inventory {
-        margin-top: 2em;
-        grid-area: bottom;
         display: grid;
         grid-template-columns: 1fr 1fr;
 
@@ -71,6 +69,10 @@
             margin-bottom: 0.5em;
         }
 
+        .news {
+            padding-right: 1em;
+        }
+
         .list {
             letter-spacing: 0.25em;
             text-transform: uppercase;
@@ -89,16 +91,19 @@
     }
 
     .options {
-        grid-area: tabs;
-        display: flex;
-        flex-flow: row;
+        grid-area: hdr;
+
         button {
+            width: 25%;
             border-top: 0;
             border: 1px solid #222;
             &:not(:last-child) {
                 border-right: 0;
             }
-            flex: 1;
+
+            &:last-child {
+                float: right;
+            }
         }
     }
 }
diff --git a/client/assets/styles/styles.less b/client/assets/styles/styles.less
index e678e581..747c36ca 100644
--- a/client/assets/styles/styles.less
+++ b/client/assets/styles/styles.less
@@ -84,16 +84,17 @@ dl {
 
 #mnml {
     display: grid;
-    grid-template-columns: minmax(min-content, 1fr) 8fr 1fr;
-    grid-template-rows: min-content 1fr min-content;
+    grid-template-columns: 9fr 1fr;
+    grid-template-rows: min-content min-content 1fr;
     grid-template-areas:
-      "hd  hd   ctrl"
-      "main main ctrl"
-      "main main ctrl";
+      "hdr  ctrl"
+      "main ctrl"
+      "main ctrl";
+
+    padding: 0.5em 1em;
 }
 
 main {
-    padding: 1em;
     grid-area: main;
 }
 
@@ -253,10 +254,17 @@ figure.gray {
     display: none;
 }
 
-.options {
-    display: flex;
-    flex-flow: row;
+header {
+    .options {
+        font-size: 150%;
+    }
 
+    button {
+        height: 2em;
+    }
+}
+
+.options {
     button {
         &.highlight {
             color: @white;
@@ -279,4 +287,4 @@ figure.gray {
 
 nav {
     display: none;
-}
+}
\ No newline at end of file
diff --git a/client/src/components/account.management.jsx b/client/src/components/account.management.jsx
index b2799138..813e6054 100644
--- a/client/src/components/account.management.jsx
+++ b/client/src/components/account.management.jsx
@@ -151,19 +151,9 @@ class AccountStatus extends Component {
         }
 
         return (
-            <section class='account' onClick={tlClick}>
+            <section class='account top' onClick={tlClick}>
                 <div>
-                    <h1>{account.name}</h1>
-                    <div class="list">
-                        <figure>
-                            <figcaption>spawn new construct</figcaption>
-                            <button onClick={() => sendConstructSpawn()} type="submit">
-                                ¤50
-                            </button>
-                        </figure>
-                    </div>
-                    <button onClick={() => logout()}>Logout</button>
-                    <button><a href={`mailto:humans@mnml.gg?subject=Account%20Support:%20${account.name}`}>✉ support</a></button>
+                    {subInfo()}
                 </div>
                 <div>
                     <label for="email">Email Settings:</label>
@@ -216,7 +206,16 @@ class AccountStatus extends Component {
                     </button>
                 </div>
                 <div>
-                    {subInfo()}
+                    <div class="list">
+                        <figure>
+                            <figcaption>spawn new construct</figcaption>
+                            <button onClick={() => sendConstructSpawn()} type="submit">
+                                ¤50
+                            </button>
+                        </figure>
+                    </div>
+                    <button onClick={() => logout()}>Logout</button>
+                    <button><a href={`mailto:humans@mnml.gg?subject=Account%20Support:%20${account.name}`}>✉ support</a></button>
                 </div>
             </section>
         );
diff --git a/client/src/components/account.page.jsx b/client/src/components/account.page.jsx
index 021bb58b..6b945876 100644
--- a/client/src/components/account.page.jsx
+++ b/client/src/components/account.page.jsx
@@ -2,6 +2,7 @@ const { connect } = require('preact-redux');
 const preact = require('preact');
 
 const Team = require('./team');
+const Header = require('./header');
 const AccountManagement = require('./account.management');
 
 const addState = connect(
@@ -24,6 +25,7 @@ function Account(args) {
 
     return (
         <main class="menu">
+            <Header />
             <Team />
             <AccountManagement />
         </main>
diff --git a/client/src/components/game.ctrl.jsx b/client/src/components/game.ctrl.jsx
index a27e4e06..4bf517d6 100644
--- a/client/src/components/game.ctrl.jsx
+++ b/client/src/components/game.ctrl.jsx
@@ -125,9 +125,11 @@ function Controls(args) {
     return (
         <aside class="controls">
             {timer}
-            {scoreboard(game, opponent, true)}
-            {game.phase === 'Finish' ? quitBtn : readyBtn}
-            {scoreboard(game, player)}
+            <div class="controls">
+                {scoreboard(game, opponent, true)}
+                {game.phase === 'Finish' ? quitBtn : readyBtn}
+                {scoreboard(game, player)}
+            </div>
         </aside>
     );
 }
diff --git a/client/src/components/header.jsx b/client/src/components/header.jsx
index 5562502b..8248e9ac 100644
--- a/client/src/components/header.jsx
+++ b/client/src/components/header.jsx
@@ -1,40 +1,121 @@
-// eslint-disable-next-line
-const preact = require('preact');
 const { connect } = require('preact-redux');
+const preact = require('preact');
 
-const { saw } = require('./shapes');
-const actions = require('./../actions');
-
-function pingColour(ping) {
-    if (ping < 100) return 'forestgreen';
-    if (ping < 200) return 'yellow';
-    return 'red';
-}
+const actions = require('../actions');
+const AccountStatus = require('./account.status');
 
 const addState = connect(
-    ({ account, ping, showNav }) => {
-        return { account, ping };
+    function receiveState(state) {
+        const {
+            ws,
+            account,
+            instances,
+            team,
+            nav,
+            ping,
+
+            game,
+        } = state;
+
+        function sendInstanceState(instance) {
+            return ws.sendInstanceState(instance.id);
+        }
+
+        function sendAccountStates() {
+            ws.sendEmailState();
+            ws.sendSubscriptionState();
+        }
+
+        return {
+            account,
+            instances,
+            team,
+            game,
+            ping,
+            nav,
+            sendInstanceState,
+            sendAccountStates,
+        };
     },
+    function receiveDispatch(dispatch) {
+        function setNav(place) {
+            dispatch(actions.setGame(null));
+            dispatch(actions.setInstance(null));
+            dispatch(actions.setCombiner([]));
+            dispatch(actions.setReclaiming(false));
+            dispatch(actions.setActiveSkill(null));
+            dispatch(actions.setActiveConstruct(null));
+            dispatch(actions.setInfo(null));
+            dispatch(actions.setItemEquip(null));
+            dispatch(actions.setItemUnequip([]));
+            dispatch(actions.setVboxHighlight([]));
+
+            return dispatch(actions.setNav(place));
+        }
+
+        function hideNav() {
+            return dispatch(actions.setShowNav(false));
+        }
+
+        return {
+            setNav,
+            hideNav,
+        };
+    }
 );
 
-function renderHeader(args) {
-    const { account, ping } = args;
+function Nav(args) {
+    const {
+        account,
+        game,
+        team,
+        nav,
 
-    const accountStatus = account
-        ? (<div class="header-status">
-            <h1 class="header-username">{account.name}</h1>
-            {saw(pingColour(ping))}
-            <div class="ping-text">{ping}ms</div>
-        </div>)
-        : '';
+        sendAccountStates,
+        sendInstanceState,
+
+        setNav,
+        hideNav,
+    } = args;
+
+    if (!account) return false;
+
+    function navTo(p) {
+        return setNav(p);
+    }
+
+    function joinInstance(i) {
+        sendInstanceState(i);
+        if (game) navTo('transition');
+        return true;
+    }
+
+    function accountClick() {
+        sendAccountStates();
+        navTo('account');
+    }
 
     return (
         <header>
-            <h1 class="header-title">mnml.gg</h1>
-            {accountStatus}
+            <div class="options">
+                <button
+                    onClick={() => navTo('play')}
+                    class={`login-btn ${nav === 'play' ? 'highlight' : ''}`}>
+                    MNML
+                </button>
+                <button
+                    onClick={() => navTo('news')}
+                    class={`login-btn ${nav === 'news' ? 'highlight' : ''}`}>
+                    Shop
+                </button>
+                <button
+                    onClick={accountClick}
+                    class={`login-btn ${nav === 'account' ? 'highlight' : ''}`}>
+                    ⚙ {account.name}
+                </button>
+            </div>
         </header>
     );
 }
 
-
-module.exports = addState(renderHeader);
+module.exports = addState(Nav);
\ No newline at end of file
diff --git a/client/src/components/info.component.jsx b/client/src/components/info.component.jsx
index 2696cadf..36fc19b5 100644
--- a/client/src/components/info.component.jsx
+++ b/client/src/components/info.component.jsx
@@ -18,7 +18,19 @@ function InfoComponent(args) {
     // const { info } = args;
 
     function Info() {
-        if (!info) return false;
+        if (!info) {
+            return (
+                <div>
+                    <h2>VBOX phase</h2>
+                    <p>double clicking items in the <b>VBOX</b> will purchase and move them to your <b>INVENTORY</b>.</p>
+                    <p>
+                        hover over an item to see its effects and combinations.<br />
+                        click an item and then click a construct to equip that item to it.<br />
+                    </p>
+                    <p>click the <b>READY</b> button on the right to progress to the <b>GAME PHASE</b>.</p>
+                </div>
+            );
+        }
         const fullInfo = itemInfo.items.find(i => i.item === info) || INFO[info];
         if (!fullInfo) return false;
         const isSkill = fullInfo.skill;
diff --git a/client/src/components/instance.constructs.jsx b/client/src/components/instance.constructs.jsx
index 1761b656..1eecfd6e 100644
--- a/client/src/components/instance.constructs.jsx
+++ b/client/src/components/instance.constructs.jsx
@@ -98,7 +98,7 @@ function Construct(props) {
         const skill = construct.skills[i];
         const s = skill
             ? skill.skill
-            : (<span class="gray">+</span>);
+            : (<span class="gray">SKILL</span>);
 
         function skillClick(e) {
             if (!skill) return false;
diff --git a/client/src/components/instance.ctrl.jsx b/client/src/components/instance.ctrl.jsx
index 129bb80c..a431f1d4 100644
--- a/client/src/components/instance.ctrl.jsx
+++ b/client/src/components/instance.ctrl.jsx
@@ -93,11 +93,13 @@ function Controls(args) {
     );
 
     return (
-        <aside class="controls">
+        <aside>
             {timer}
-            {scoreboard(instance, opponent, true)}
-            <button class="ready" onClick={() => sendReady()}>Ready</button>
-            {scoreboard(instance, player)}
+            <div class="controls">
+                {scoreboard(instance, opponent, true)}
+                <button class="ready" onClick={() => sendReady()}>Ready</button>
+                {scoreboard(instance, player)}
+            </div>
         </aside>
     );
 }
diff --git a/client/src/components/inventory.jsx b/client/src/components/inventory.jsx
index 37cf55f1..60250df0 100644
--- a/client/src/components/inventory.jsx
+++ b/client/src/components/inventory.jsx
@@ -7,6 +7,8 @@ const toast = require('izitoast');
 const actions = require('./../actions');
 const StripeBtns = require('./stripe.buttons');
 
+const VERSION = process.env.npm_package_version;
+
 const addState = connect(
     function receiveState(state) {
         const {
@@ -64,21 +66,32 @@ function Inventory(args) {
     );
 
     return (
-        <div class="inventory">
+        <div class="inventory top">
+            <div class="news">
+                <h1>v{VERSION}</h1>
+                <h2>welcome to mnml</h2>
+                <p>use the buttons on the right to join an instance.</p>
+                <p>
+                    select <b>PVP</b> to play against other players.<br />
+                    click <b>LEARN</b> to practice the game without time controls.
+                </p>
+                <p>
+                    if you enjoy the game please support its development by <b>subscribing</b> or purchasing <b>credits</b>.<br />
+                    glhf
+                </p>
+                <p>--ntr & mashy</p>
+            </div>
             <div>
-                <h1>Shop</h1>
+                <h1 class="credits">¤ {account.balance}</h1>
                 <Elements>
                     <StripeBtns account={account} />
                 </Elements>
-                <div class='list'>
-                    {shop.available.map(availableMtx)}
-                </div>
-            </div>
-            <div>
-                <h1 class="credits">¤ {account.balance}</h1>
                 <div class='list'>
                     {shop.owned.map(useMtx)}
                 </div>
+                <div class='list'>
+                    {shop.available.map(availableMtx)}
+                </div>
             </div>
         </div>
     );
diff --git a/client/src/components/main.jsx b/client/src/components/main.jsx
index 57abab03..b42b9702 100644
--- a/client/src/components/main.jsx
+++ b/client/src/components/main.jsx
@@ -38,7 +38,7 @@ function Main(props) {
 
     if (nav === 'transition') return false;
     if (nav === 'play') return <Play />;
-    if (nav === 'team') return <Team />;
+    // if (nav === 'team') return <Team />;
     if (nav === 'account') return <Account />;
 
     return (
diff --git a/client/src/components/mnml.jsx b/client/src/components/mnml.jsx
index 30ae1d10..70a184fe 100644
--- a/client/src/components/mnml.jsx
+++ b/client/src/components/mnml.jsx
@@ -1,7 +1,6 @@
 const preact = require('preact');
 const { connect } = require('preact-redux');
 
-// const Header = require('./header');
 const Main = require('./main');
 const Nav = require('./nav');
 const Controls = require('./controls');
diff --git a/client/src/components/nav.jsx b/client/src/components/nav.jsx
index 365500dc..daf513f1 100644
--- a/client/src/components/nav.jsx
+++ b/client/src/components/nav.jsx
@@ -92,7 +92,6 @@ function Nav(args) {
 
     const canJoin = team.some(c => !c);
 
-
     return (
         <nav onClick={hideNav} >
             <h1 class="header-title">mnml.gg</h1>
diff --git a/client/src/components/play.ctrl.jsx b/client/src/components/play.ctrl.jsx
index e1cf47c2..468de26e 100644
--- a/client/src/components/play.ctrl.jsx
+++ b/client/src/components/play.ctrl.jsx
@@ -3,7 +3,14 @@ const { connect } = require('preact-redux');
 
 const addState = connect(
     function receiveState(state) {
-        const { ws } = state;
+        const {
+            ws,
+            instances,
+        } = state;
+
+        function sendInstanceState(id) {
+            ws.sendInstanceState(id);
+        }
 
         function sendInstancePractice() {
             ws.sendInstancePractice();
@@ -14,6 +21,9 @@ const addState = connect(
         }
 
         return {
+            instances,
+
+            sendInstanceState,
             sendInstanceQueue,
             sendInstancePractice,
         };
@@ -22,25 +32,46 @@ const addState = connect(
 
 function JoinButtons(args) {
     const {
+        instances,
+
+        sendInstanceState,
         sendInstanceQueue,
         sendInstancePractice,
     } = args;
 
+    if (instances.length) {
+        return (
+            <aside class='play-ctrl'>
+                <div class="timer-container"></div>
+                <div class="controls">
+                    <button
+                        class='pvp ready full'
+                        onClick={() => sendInstanceState(instances[0].id)}
+                        type="submit">
+                        Rejoin
+                    </button>
+                </div>
+            </aside>
+        );
+    }
+
     return (
         <aside class='play-ctrl'>
             <div class="timer-container"></div>
-            <button
-                class='pvp ready'
-                onClick={() => sendInstanceQueue()}
-                type="submit">
-                PVP
-            </button>
-            <button
-                class='practice ready'
-                onClick={() => sendInstancePractice()}
-                type="submit">
-                Practice
-            </button>
+            <div class="controls">
+                <button
+                    class='pvp ready'
+                    onClick={() => sendInstanceQueue()}
+                    type="submit">
+                    PVP
+                </button>
+                <button
+                    class='practice ready'
+                    onClick={() => sendInstancePractice()}
+                    type="submit">
+                    Learn
+                </button>
+            </div>
         </aside>
     );
 }
diff --git a/client/src/components/play.jsx b/client/src/components/play.jsx
index ae4f16e7..38efb8bc 100644
--- a/client/src/components/play.jsx
+++ b/client/src/components/play.jsx
@@ -5,6 +5,7 @@ const { stringSort } = require('./../utils');
 const { ConstructAvatar } = require('./construct');
 const actions = require('./../actions');
 const Inventory = require('./inventory');
+const Header = require('./header');
 
 const idSort = stringSort('id');
 
@@ -108,28 +109,11 @@ function Play(args) {
 
     return (
         <main class="menu">
-            <div class="team top">
+            <Header />
+            <Inventory />
+            <div class="team">
                 {constructPanels}
             </div>
-            <div class="options">
-                <button
-                    class={`login-btn highlight`}>
-                    Play
-                </button>
-                <button
-                    class={`login-btn`}>
-                    News
-                </button>
-                <button
-                    class={`login-btn`}>
-                    Store
-                </button>
-                <button
-                    class={`login-btn`}>
-                    ⚙ Account
-                </button>
-            </div>
-            <Inventory />
         </main>
     );
 }
diff --git a/client/src/components/shapes.jsx b/client/src/components/shapes.jsx
index ec8f2106..a8a20ed8 100644
--- a/client/src/components/shapes.jsx
+++ b/client/src/components/shapes.jsx
@@ -42,7 +42,7 @@ module.exports = {
     None: () =>
     <figure>
         {diamond(['gray'])}
-        <figcaption>&nbsp;</figcaption>
+        <figcaption>SPEC</figcaption>
     </figure>,
 
 
diff --git a/client/src/components/team.ctrl.jsx b/client/src/components/team.ctrl.jsx
index ba13edf1..b3af9169 100644
--- a/client/src/components/team.ctrl.jsx
+++ b/client/src/components/team.ctrl.jsx
@@ -52,7 +52,7 @@ function TeamCtrl(args) {
                 class='ready'
                 disabled={teamSelect.some(c => !c)}
                 onClick={sendAccountSetTeam}>
-                Set Team
+                Set
             </button>
             <div class="team-page-ctrl">
                 <button onClick={() => setTeamPage(teamPage - 1)} disabled={disableDecrement}> &laquo; </button>
diff --git a/client/src/components/team.jsx b/client/src/components/team.jsx
index cb88b526..682e29ed 100644
--- a/client/src/components/team.jsx
+++ b/client/src/components/team.jsx
@@ -58,7 +58,7 @@ function Team(args) {
     }
     console.log(constructs.length);
     const dispConstructs = constructs.length >= ((teamPage + 1) * 6)
-        ? constructs.slice(teamPage * 6, (teamPage + 1) * 6) 
+        ? constructs.slice(teamPage * 6, (teamPage + 1) * 6)
         : constructs.slice(teamPage * 6, constructs.length);
 
     const constructPanels = dispConstructs.map(construct => {
@@ -80,7 +80,7 @@ function Team(args) {
     });
 
     return (
-        <section class="team top">
+        <section class="team">
             {constructPanels}
         </section>
     );
diff --git a/server/src/img.rs b/server/src/img.rs
index a1b15953..75b0d95f 100644
--- a/server/src/img.rs
+++ b/server/src/img.rs
@@ -53,16 +53,15 @@ pub fn invader_write(id: Uuid) -> Result<Uuid, Error> {
     colours.push("none".to_string());
 
     // add up to 100 for %
-    // [3] is the transparent colour
     let weights = [
         5,
         5,
         65,
-        25,
+        25, // the transparent colour
     ];
     let colour_dist = WeightedIndex::new(&weights)?;
 
-    write!(&mut svg, "<svg xmlns='http://www.w3.org/2000/svg' version='1.1' viewBox='-250 -250 1000 1000' width='500' height='500'><g>")?;
+    write!(&mut svg, "<svg xmlns='http://www.w3.org/2000/svg' version='1.1' viewBox='-250 -250 1000 1000' width='375' height='375'><g>")?;
     for i in 0..50 {
         let x = (i % 5) * 50;
         let y = (i / 5) * 50;

From a429f21367955ed48b2fac77153da0cec4d85b12 Mon Sep 17 00:00:00 2001
From: ntr <ntr@smokestack.io>
Date: Fri, 6 Sep 2019 15:13:10 +1000
Subject: [PATCH 5/6] tabbed menu

---
 WORKLOG.md                                    |   3 +
 client/assets/styles/styles.less              |  10 ++
 client/src/components/account.page.jsx        |   4 +-
 ...account.management.jsx => account.top.jsx} |   0
 client/src/components/collection.jsx          |  89 +++++++++
 client/src/components/header.jsx              |  35 +---
 client/src/components/inventory.jsx           | 100 -----------
 client/src/components/main.bottom.jsx         |  30 ++++
 client/src/components/main.jsx                |  19 +-
 client/src/components/main.top.jsx            |  34 ++++
 client/src/components/menu.jsx                |  39 ++++
 client/src/components/menu.top.jsx            |  31 ++++
 client/src/components/play.jsx                | 170 +++++++++---------
 client/src/components/shop.jsx                |  58 ++++++
 client/src/components/stripe.buttons.jsx      |  49 +++--
 client/src/components/team.jsx                | 132 ++++++++------
 16 files changed, 514 insertions(+), 289 deletions(-)
 rename client/src/components/{account.management.jsx => account.top.jsx} (100%)
 create mode 100644 client/src/components/collection.jsx
 delete mode 100644 client/src/components/inventory.jsx
 create mode 100644 client/src/components/main.bottom.jsx
 create mode 100644 client/src/components/main.top.jsx
 create mode 100644 client/src/components/menu.jsx
 create mode 100644 client/src/components/menu.top.jsx
 create mode 100644 client/src/components/shop.jsx

diff --git a/WORKLOG.md b/WORKLOG.md
index 5af518fa..da05e3ac 100644
--- a/WORKLOG.md
+++ b/WORKLOG.md
@@ -10,6 +10,9 @@
   * treats
     * constructs jiggle when clicked
     * background colour changes depending on time of day
+    * hit animation wobble
+    * combat text scale + translate
+    * susbcriber gold name in instance
 
 * bot game grind
 * stress test
diff --git a/client/assets/styles/styles.less b/client/assets/styles/styles.less
index 747c36ca..cd773c0d 100644
--- a/client/assets/styles/styles.less
+++ b/client/assets/styles/styles.less
@@ -67,6 +67,7 @@ hr {
     color: #222;
     margin: 1.5em 0;
     width: 100%;
+    border-top: 1px solid #222;
 }
 
 figure {
@@ -287,4 +288,13 @@ header {
 
 nav {
     display: none;
+}
+
+ul {
+    margin-bottom: 1em;
+    list-style: inside;
+}
+
+li {
+    margin-bottom: 0.5em;
 }
\ No newline at end of file
diff --git a/client/src/components/account.page.jsx b/client/src/components/account.page.jsx
index 6b945876..c8b7563a 100644
--- a/client/src/components/account.page.jsx
+++ b/client/src/components/account.page.jsx
@@ -1,7 +1,7 @@
 const { connect } = require('preact-redux');
 const preact = require('preact');
 
-const Team = require('./team');
+const Collection = require('./collection');
 const Header = require('./header');
 const AccountManagement = require('./account.management');
 
@@ -26,8 +26,8 @@ function Account(args) {
     return (
         <main class="menu">
             <Header />
-            <Team />
             <AccountManagement />
+            <Collection />
         </main>
     );
 }
diff --git a/client/src/components/account.management.jsx b/client/src/components/account.top.jsx
similarity index 100%
rename from client/src/components/account.management.jsx
rename to client/src/components/account.top.jsx
diff --git a/client/src/components/collection.jsx b/client/src/components/collection.jsx
new file mode 100644
index 00000000..c6441803
--- /dev/null
+++ b/client/src/components/collection.jsx
@@ -0,0 +1,89 @@
+const preact = require('preact');
+const { connect } = require('preact-redux');
+
+const actions = require('./../actions');
+const { COLOURS } = require('./../utils');
+const { ConstructAvatar } = require('./construct');
+
+const addState = connect(
+    function receiveState(state) {
+        const { ws, constructs, teamPage, teamSelect } = state;
+
+        function sendConstructSpawn(name) {
+            return ws.sendMtxConstructSpawn(name);
+        }
+
+        return {
+            constructs,
+            teamPage,
+            teamSelect,
+        };
+    },
+    function receiveDispatch(dispatch) {
+        function setTeam(constructIds) {
+            dispatch(actions.setTeamSelect(constructIds));
+        }
+
+        return {
+            setTeam,
+        };
+    }
+);
+
+function Collection(args) {
+    const {
+        constructs,
+        teamPage,
+        teamSelect,
+        setTeam,
+    } = args;
+
+    if (!constructs) return <div></div>;
+
+    // redux limitation + suggested workaround
+    // so much for dumb components
+    function selectConstruct(id) {
+        // remove
+        const i = teamSelect.findIndex(sid => sid === id);
+        if (i > -1) {
+            teamSelect[i] = null;
+            return setTeam(teamSelect);
+        }
+
+        // window insert
+        const insert = teamSelect.findIndex(j => j === null);
+        if (insert === -1) return setTeam([id, null, null]);
+        teamSelect[insert] = id;
+        return setTeam(teamSelect);
+    }
+    console.log(constructs.length);
+    const dispConstructs = constructs.length >= ((teamPage + 1) * 6)
+        ? constructs.slice(teamPage * 6, (teamPage + 1) * 6)
+        : constructs.slice(teamPage * 6, constructs.length);
+
+    const constructPanels = dispConstructs.map(construct => {
+        const colour = teamSelect.indexOf(construct.id);
+        const selected = colour > -1;
+
+        const borderColour = selected ? COLOURS[colour] : '#000000';
+
+        return (
+            <div
+                key={construct.id}
+                class="construct team-select"
+                style={ { 'border-color': borderColour || 'whitesmoke' } }
+                onClick={() => selectConstruct(construct.id)} >
+                <ConstructAvatar construct={construct} />
+                <h2>{construct.name}</h2>
+            </div>
+        );
+    });
+
+    return (
+        <section class="team">
+            {constructPanels}
+        </section>
+    );
+}
+
+module.exports = addState(Collection);
diff --git a/client/src/components/header.jsx b/client/src/components/header.jsx
index 8248e9ac..7c776ff8 100644
--- a/client/src/components/header.jsx
+++ b/client/src/components/header.jsx
@@ -2,19 +2,13 @@ const { connect } = require('preact-redux');
 const preact = require('preact');
 
 const actions = require('../actions');
-const AccountStatus = require('./account.status');
 
 const addState = connect(
     function receiveState(state) {
         const {
             ws,
             account,
-            instances,
-            team,
             nav,
-            ping,
-
-            game,
         } = state;
 
         function sendInstanceState(instance) {
@@ -28,11 +22,8 @@ const addState = connect(
 
         return {
             account,
-            instances,
-            team,
-            game,
-            ping,
             nav,
+
             sendInstanceState,
             sendAccountStates,
         };
@@ -53,29 +44,19 @@ const addState = connect(
             return dispatch(actions.setNav(place));
         }
 
-        function hideNav() {
-            return dispatch(actions.setShowNav(false));
-        }
-
         return {
             setNav,
-            hideNav,
         };
     }
 );
 
-function Nav(args) {
+function Header(args) {
     const {
         account,
-        game,
-        team,
         nav,
 
         sendAccountStates,
-        sendInstanceState,
-
         setNav,
-        hideNav,
     } = args;
 
     if (!account) return false;
@@ -84,12 +65,6 @@ function Nav(args) {
         return setNav(p);
     }
 
-    function joinInstance(i) {
-        sendInstanceState(i);
-        if (game) navTo('transition');
-        return true;
-    }
-
     function accountClick() {
         sendAccountStates();
         navTo('account');
@@ -104,8 +79,8 @@ function Nav(args) {
                     MNML
                 </button>
                 <button
-                    onClick={() => navTo('news')}
-                    class={`login-btn ${nav === 'news' ? 'highlight' : ''}`}>
+                    onClick={() => navTo('shop')}
+                    class={`login-btn ${nav === 'shop' ? 'highlight' : ''}`}>
                     Shop
                 </button>
                 <button
@@ -118,4 +93,4 @@ function Nav(args) {
     );
 }
 
-module.exports = addState(Nav);
\ No newline at end of file
+module.exports = addState(Header);
\ No newline at end of file
diff --git a/client/src/components/inventory.jsx b/client/src/components/inventory.jsx
deleted file mode 100644
index 60250df0..00000000
--- a/client/src/components/inventory.jsx
+++ /dev/null
@@ -1,100 +0,0 @@
-const { connect } = require('preact-redux');
-const { Elements } = require('react-stripe-elements');
-
-const preact = require('preact');
-const toast = require('izitoast');
-
-const actions = require('./../actions');
-const StripeBtns = require('./stripe.buttons');
-
-const VERSION = process.env.npm_package_version;
-
-const addState = connect(
-    function receiveState(state) {
-        const {
-            ws,
-            account,
-            shop,
-        } = state;
-
-        function mtxBuy(mtx) {
-            return ws.sendMtxBuy(mtx.variant);
-        }
-
-        return {
-            account,
-            shop,
-            mtxBuy,
-        };
-    },
-
-    function receiveDispatch(dispatch) {
-        function setMtxActive(mtx) {
-            dispatch(actions.setConstructRename(null));
-            dispatch(actions.setMtxActive(mtx));
-            return true;
-        }
-
-        return {
-            setMtxActive,
-        };
-    }
-);
-
-function Inventory(args) {
-    const {
-        account,
-        shop,
-        setMtxActive,
-        mtxBuy,
-    } = args;
-
-    if (!shop) return false;
-
-    const useMtx = (item, i) => (
-        <figure key={i} onClick={() => setMtxActive(item)} >
-            <figcaption>{item}</figcaption>
-            <button disabled={account.balance === 0}>¤1</button>
-        </figure>
-    );
-
-    const availableMtx = (item, i) => (
-        <figure key={i} onClick={() => mtxBuy(item)} >
-            <figcaption>{item.variant}</figcaption>
-            <button disabled={account.balance < item.credits}>¤{item.credits}</button>
-        </figure>
-    );
-
-    return (
-        <div class="inventory top">
-            <div class="news">
-                <h1>v{VERSION}</h1>
-                <h2>welcome to mnml</h2>
-                <p>use the buttons on the right to join an instance.</p>
-                <p>
-                    select <b>PVP</b> to play against other players.<br />
-                    click <b>LEARN</b> to practice the game without time controls.
-                </p>
-                <p>
-                    if you enjoy the game please support its development by <b>subscribing</b> or purchasing <b>credits</b>.<br />
-                    glhf
-                </p>
-                <p>--ntr & mashy</p>
-            </div>
-            <div>
-                <h1 class="credits">¤ {account.balance}</h1>
-                <Elements>
-                    <StripeBtns account={account} />
-                </Elements>
-                <div class='list'>
-                    {shop.owned.map(useMtx)}
-                </div>
-                <div class='list'>
-                    {shop.available.map(availableMtx)}
-                </div>
-            </div>
-        </div>
-    );
-}
-
-module.exports = addState(Inventory);
diff --git a/client/src/components/main.bottom.jsx b/client/src/components/main.bottom.jsx
new file mode 100644
index 00000000..7f89358d
--- /dev/null
+++ b/client/src/components/main.bottom.jsx
@@ -0,0 +1,30 @@
+const { connect } = require('preact-redux');
+const preact = require('preact');
+
+const actions = require('./../actions');
+
+const Team = require('./team');
+const Collection = require('./collection');
+
+const addState = connect(
+    function receiveState(state) {
+        const {
+            nav,
+        } = state;
+
+        return {
+            nav,
+        };
+    },
+);
+
+function Bottom(args) {
+    const {
+        nav,
+    } = args;
+
+    if (nav === 'account') return <Collection />;
+    return <Team />;
+}
+
+module.exports = addState(Bottom);
diff --git a/client/src/components/main.jsx b/client/src/components/main.jsx
index b42b9702..8441782e 100644
--- a/client/src/components/main.jsx
+++ b/client/src/components/main.jsx
@@ -5,14 +5,14 @@ const { connect } = require('preact-redux');
 const Welcome = require('./welcome');
 const Game = require('./game');
 const Instance = require('./instance.component');
-const Team = require('./team');
-const Play = require('./play');
-const Account = require('./account.page');
+const Header = require('./header');
+const Top = require('./main.top');
+const Bottom = require('./main.bottom');
 
 const addState = connect(
     state => {
-        const { game, instance, account, nav, team, constructs } = state;
-        return { game, instance, account, nav, team, constructs };
+        const { game, instance, account, nav } = state;
+        return { game, instance, account, nav };
     }
 );
 
@@ -37,12 +37,13 @@ function Main(props) {
     }
 
     if (nav === 'transition') return false;
-    if (nav === 'play') return <Play />;
-    // if (nav === 'team') return <Team />;
-    if (nav === 'account') return <Account />;
 
     return (
-        <Play />
+        <main class="menu">
+            <Header />
+            <Top />
+            <Bottom />
+        </main>
     );
 }
 
diff --git a/client/src/components/main.top.jsx b/client/src/components/main.top.jsx
new file mode 100644
index 00000000..64438f40
--- /dev/null
+++ b/client/src/components/main.top.jsx
@@ -0,0 +1,34 @@
+const { connect } = require('preact-redux');
+const preact = require('preact');
+
+const actions = require('./../actions');
+
+const AccountTop = require('./account.top');
+const Play = require('./play');
+const Shop = require('./shop');
+
+const addState = connect(
+    function receiveState(state) {
+        const {
+            nav,
+        } = state;
+
+        return {
+            nav,
+        };
+    },
+);
+
+function Top(args) {
+    const {
+        nav,
+    } = args;
+
+    if (nav === 'account') return <AccountTop />;
+    if (nav === 'play') return <Play />
+    if (nav === 'shop') return <Shop />
+
+    return false;
+}
+
+module.exports = addState(Top);
diff --git a/client/src/components/menu.jsx b/client/src/components/menu.jsx
new file mode 100644
index 00000000..7c5b7717
--- /dev/null
+++ b/client/src/components/menu.jsx
@@ -0,0 +1,39 @@
+// eslint-disable-next-line
+const preact = require('preact');
+const { connect } = require('preact-redux');
+
+const Shop = require('./shop');
+const Play = require('./play');
+const Account = require('./account.page');
+
+const addState = connect(
+    state => {
+        const {
+            account,
+            nav,
+        } = state;
+
+        return {
+            account,
+            nav,
+        };
+    }
+);
+
+function Menu(props) {
+    const {
+        account,
+        nav,
+    } = props;
+
+    // menu
+    if (nav === 'play') return <Play />;
+    if (nav === 'shop') return <Shop />;
+    if (nav === 'account') return <Account />;
+
+    return (
+        <Play />
+    );
+}
+
+module.exports = addState(Menu);
diff --git a/client/src/components/menu.top.jsx b/client/src/components/menu.top.jsx
new file mode 100644
index 00000000..52db35fe
--- /dev/null
+++ b/client/src/components/menu.top.jsx
@@ -0,0 +1,31 @@
+const preact = require('preact');
+const { connect } = require('preact-redux');
+
+const Shop = require('./shop');
+const Play = require('./play');
+const Account = require('./account.page');
+
+const addState = connect(
+    state => {
+        const { game, instance, account, nav } = state;
+        return { game, instance, account, nav };
+    }
+);
+
+function Menu(props) {
+    const {
+        account,
+        nav,
+    } = props;
+
+    // menu
+    if (nav === 'play') return <Play />;
+    if (nav === 'shop') return <Shop />;
+    if (nav === 'account') return <Account />;
+
+    return (
+        <Play />
+    );
+}
+
+module.exports = addState(Menu);
diff --git a/client/src/components/play.jsx b/client/src/components/play.jsx
index 38efb8bc..9ebd4d9e 100644
--- a/client/src/components/play.jsx
+++ b/client/src/components/play.jsx
@@ -1,120 +1,128 @@
-const { connect } = require('preact-redux');
+// const { connect } = require('preact-redux');
 const preact = require('preact');
+const { connect } = require('preact-redux');
+const { Elements } = require('react-stripe-elements');
 
-const { stringSort } = require('./../utils');
-const { ConstructAvatar } = require('./construct');
-const actions = require('./../actions');
-const Inventory = require('./inventory');
 const Header = require('./header');
+const Team = require('./team');
+const StripeBtns = require('./stripe.buttons');
 
-const idSort = stringSort('id');
+const actions = require('./../actions');
+
+const VERSION = process.env.npm_package_version;
 
 const addState = connect(
     function receiveState(state) {
         const {
             ws,
-            constructs,
-            constructRename,
-            team,
-            mtxActive,
+            account,
+            shop,
         } = state;
 
-        function sendInstancePractice() {
-            return ws.sendInstancePractice();
-        }
-
-        function sendConstructAvatarReroll(id) {
-            console.log('using', mtxActive, 'on', id);
-            return ws.sendMtxApply(id, mtxActive, '');
-        }
-
-        function sendConstructRename(id, name) {
-            ws.sendMtxApply(id, 'Rename', name);
+        function mtxBuy(mtx) {
+            return ws.sendMtxBuy(mtx.variant);
         }
 
         return {
-            constructs,
-            mtxActive,
-            constructRename,
-            team,
-            sendConstructRename,
-            sendInstancePractice,
-            sendConstructAvatarReroll,
+            account,
+            shop,
+            mtxBuy,
         };
     },
 
     function receiveDispatch(dispatch) {
-        function setConstructRename(id) {
-            dispatch(actions.setConstructRename(id));
+        function setMtxActive(mtx) {
+            dispatch(actions.setConstructRename(null));
+            dispatch(actions.setMtxActive(mtx));
+            return true;
         }
 
-        function clearMtxRename() {
-            dispatch(actions.setConstructRename(null));
-            dispatch(actions.setMtxActive(null));
+        function setNav(place) {
+            return dispatch(actions.setNav(place));
         }
 
         return {
-            clearMtxRename,
-            setConstructRename,
+            setMtxActive,
+            setNav,
         };
     }
-
 );
 
 function Play(args) {
     const {
-        team,
-        constructRename,
-        clearMtxRename,
-        setConstructRename,
-        sendConstructRename,
-        mtxActive,
-        sendConstructAvatarReroll,
+        account,
+        shop,
+        mtxBuy,
+
+        setMtxActive,
+        setNav,
     } = args;
 
-    const constructPanels = team
-        .map(construct => {
-            const constructName = constructRename === construct.id
-                ? <input id='renameInput' type="text" style="text-align: center" placeholder="enter a new name"></input>
-                : <h2>{construct.name}</h2>;
+    if (!shop) return false;
 
-            const confirm = constructRename === construct.id
-                ? <button onClick={() => sendConstructRename(construct.id, document.getElementById('renameInput').value)}>
-                    Confirm
-                </button>
-                : false;
+    const useMtx = (item, i) => (
+        <figure key={i} onClick={() => setMtxActive(item)} >
+            <figcaption>{item}</figcaption>
+            <button disabled={account.balance === 0}>¤1</button>
+        </figure>
+    );
+
+    const availableMtx = (item, i) => (
+        <figure key={i} onClick={() => mtxBuy(item)} >
+            <figcaption>{item.variant}</figcaption>
+            <button disabled={account.balance < item.credits}>¤{item.credits}</button>
+        </figure>
+    );
+
+    const subscription = account.subscribed
+        ? <button
+            class="stripe-btn"
+            disabled>
+            Subscribed
+        </button>
+        : <button
+            onClick={() => setNav('shop')}
+            class="stripe-btn"
+            role="link">
+            Subscribe
+        </button>;
 
-            const cancel = constructRename === construct.id
-                ? <button onClick={() => clearMtxRename()}>
-                    Cancel
-                </button>
-                : false;
-            return (
-                <div
-                    key={construct.id}
-                    style={ mtxActive ? { cursor: 'pointer' } : {}}
-                    onClick={() => {
-                        if (!mtxActive) return false;
-                        if (mtxActive === 'Rename') return setConstructRename(construct.id);
-                        return sendConstructAvatarReroll(construct.id);
-                    }}
-                    class="construct">
-                    <ConstructAvatar construct={construct} />
-                    {constructName}
-                    {confirm}
-                    {cancel}
-                </div>
-            );
-        });
 
     return (
-        <main class="menu">
-            <Header />
-            <Inventory />
-            <div class="team">
-                {constructPanels}
+        <div class="inventory top">
+            <div class="news">
+                <h1>mnml v{VERSION}</h1>
+                <p>use the buttons on the right to join an instance.</p>
+                <p>
+                    select <b>PVP</b> to play against other players.<br />
+                    click <b>LEARN</b> to practice the game without time controls.
+                </p>
+                <p>
+                    if you enjoy the game please support its development by <b>subscribing</b> or purchasing <b>credits</b>.<br />
+                    glhf
+                </p>
+                <p>--ntr & mashy</p>
             </div>
-        </main>
+            <div>
+                <h1 class="credits">¤ {account.balance}</h1>
+                <div class='list'>
+                    {subscription}
+                    <button
+                        onClick={() => setNav('shop')}
+                        class="stripe-btn"
+                        role="link">
+                        Get Credits
+                    </button>
+                    <div id="error-message"></div>
+                </div>
+                <div class='list'>
+                    {shop.owned.map(useMtx)}
+                </div>
+                <div class='list'>
+                    {shop.available.map(availableMtx)}
+                </div>
+            </div>
+        </div>
     );
 }
 
diff --git a/client/src/components/shop.jsx b/client/src/components/shop.jsx
new file mode 100644
index 00000000..da0de7af
--- /dev/null
+++ b/client/src/components/shop.jsx
@@ -0,0 +1,58 @@
+// const { connect } = require('preact-redux');
+const preact = require('preact');
+const { connect } = require('preact-redux');
+const { Elements } = require('react-stripe-elements');
+
+const StripeBtns = require('./stripe.buttons');
+const actions = require('./../actions');
+
+const addState = connect(
+    function receiveState(state) {
+        const {
+            ws,
+            account,
+        } = state;
+
+        return {
+            account,
+        };
+    },
+);
+
+function Shop(args) {
+    const {
+        account,
+    } = args;
+
+    return (
+        <div class="inventory top">
+            <div class="news">
+                <h1>support the game</h1>
+                <p>
+                    <b>credits</b> are in game currency that can be used to purchase:
+                    <ul>
+                        <li>img sets</li>
+                        <li>construct renames</li>
+                        <li>new constructs</li>
+                    </ul>
+                </p>
+                <p>
+                    <b>subscriptions</b> grant extra benefits:
+                    <ul>
+                        <li>additional credits</li>
+                        <li>chat wheel (soon ™)</li>
+                        <li>account icons (soon ™)</li>
+                    </ul>
+                </p>
+            </div>
+            <div>
+                <h1 class="credits">¤ {account.balance}</h1>
+                <Elements>
+                    <StripeBtns account={account} />
+                </Elements>
+            </div>
+        </div>
+    );
+}
+
+module.exports = addState(Shop);
diff --git a/client/src/components/stripe.buttons.jsx b/client/src/components/stripe.buttons.jsx
index ef72c5a9..15b3411a 100644
--- a/client/src/components/stripe.buttons.jsx
+++ b/client/src/components/stripe.buttons.jsx
@@ -6,8 +6,16 @@ function subPlan() {
     return 'prod_FWSA8RoyMMV3st';
 }
 
-function bitsSku() {
-    if (window.location.host === 'mnml.gg') return 'sku_Fjdu7zOy3sLGc5';
+function bitsSku(d) {
+    if (window.location.host === 'mnml.gg') {
+        if (d === 50) return 'sku_Fl5tLCWogUsgus';
+        if (d === 20) return 'sku_Fl5qegnxYRv7Cy';
+        if (d === 10) return 'sku_Fl5qVosoDsUVgy';
+        if (d === 5) return 'sku_Fjdu7zOy3sLGc5';
+
+        // !!!!
+        return 'sku_Fjdu7zOy3sLGc5';
+    }
     return 'sku_FjuNxONdWewjH2';
 }
 
@@ -16,6 +24,7 @@ function BitsBtn(args) {
         stripe,
         account,
     } = args;
+
     function subscribeClick() {
         stripe.redirectToCheckout({
             items: [{ plan: subPlan(), quantity: 1 }],
@@ -25,9 +34,9 @@ function BitsBtn(args) {
         });
     }
 
-    function bitsClick() {
+    function bitsClick(d) {
         stripe.redirectToCheckout({
-            items: [{ sku: bitsSku(), quantity: 1 }],
+            items: [{ sku: bitsSku(d), quantity: 1 }],
             successUrl: window.location.origin,
             cancelUrl: window.location.origin,
             clientReferenceId: account.id,
@@ -48,15 +57,29 @@ function BitsBtn(args) {
         </button>;
 
     return (
-        <div class='list'>
-            {subscription}
-            <button
-                onClick={bitsClick}
-                class="stripe-btn"
-                role="link">
-                Get Credits
-            </button>
-            <div id="error-message"></div>
+        <div>
+            <div class='list'>
+                {subscription}
+            </div>
+            <div class='list'>
+                <figure onClick={() => bitsClick(5)} >
+                    <figcaption>$5 AUD</figcaption>
+                    <button class="stripe-btn">¤50</button>
+                </figure>
+                <figure onClick={() => bitsClick(10)} >
+                    <figcaption>$10 AUD</figcaption>
+                    <button class="stripe-btn">¤110</button>
+                </figure>
+                <figure onClick={() => bitsClick(20)} >
+                    <figcaption>$20 AUD</figcaption>
+                    <button class="stripe-btn">¤250</button>
+                </figure>
+                <figure onClick={() => bitsClick(50)} >
+                    <figcaption>$50 AUD</figcaption>
+                    <button class="stripe-btn">¤660</button>
+                </figure>
+                <div id="error-message"></div>
+            </div>
         </div>
     );
 }
diff --git a/client/src/components/team.jsx b/client/src/components/team.jsx
index 682e29ed..dd821890 100644
--- a/client/src/components/team.jsx
+++ b/client/src/components/team.jsx
@@ -1,88 +1,112 @@
-const preact = require('preact');
 const { connect } = require('preact-redux');
+const preact = require('preact');
 
-const actions = require('./../actions');
-const { COLOURS } = require('./../utils');
 const { ConstructAvatar } = require('./construct');
+const actions = require('./../actions');
 
 const addState = connect(
     function receiveState(state) {
-        const { ws, constructs, teamPage, teamSelect } = state;
+        const {
+            ws,
+            constructs,
+            constructRename,
+            team,
+            mtxActive,
+        } = state;
 
-        function sendConstructSpawn(name) {
-            return ws.sendMtxConstructSpawn(name);
+        function sendInstancePractice() {
+            return ws.sendInstancePractice();
+        }
+
+        function sendConstructAvatarReroll(id) {
+            console.log('using', mtxActive, 'on', id);
+            return ws.sendMtxApply(id, mtxActive, '');
+        }
+
+        function sendConstructRename(id, name) {
+            ws.sendMtxApply(id, 'Rename', name);
         }
 
         return {
             constructs,
-            teamPage,
-            teamSelect,
+            mtxActive,
+            constructRename,
+            team,
+            sendConstructRename,
+            sendInstancePractice,
+            sendConstructAvatarReroll,
         };
     },
+
     function receiveDispatch(dispatch) {
-        function setTeam(constructIds) {
-            dispatch(actions.setTeamSelect(constructIds));
+        function setConstructRename(id) {
+            dispatch(actions.setConstructRename(id));
+        }
+
+        function clearMtxRename() {
+            dispatch(actions.setConstructRename(null));
+            dispatch(actions.setMtxActive(null));
         }
 
         return {
-            setTeam,
+            clearMtxRename,
+            setConstructRename,
         };
     }
+
 );
 
 function Team(args) {
     const {
-        constructs,
-        teamPage,
-        teamSelect,
-        setTeam,
+        team,
+        constructRename,
+        clearMtxRename,
+        setConstructRename,
+        sendConstructRename,
+        mtxActive,
+        sendConstructAvatarReroll,
     } = args;
 
-    if (!constructs) return <div></div>;
+    const constructPanels = team
+        .map(construct => {
+            const constructName = constructRename === construct.id
+                ? <input id='renameInput' type="text" style="text-align: center" placeholder="enter a new name"></input>
+                : <h2>{construct.name}</h2>;
 
-    // redux limitation + suggested workaround
-    // so much for dumb components
-    function selectConstruct(id) {
-        // remove
-        const i = teamSelect.findIndex(sid => sid === id);
-        if (i > -1) {
-            teamSelect[i] = null;
-            return setTeam(teamSelect);
-        }
+            const confirm = constructRename === construct.id
+                ? <button onClick={() => sendConstructRename(construct.id, document.getElementById('renameInput').value)}>
+                    Confirm
+                </button>
+                : false;
 
-        // window insert
-        const insert = teamSelect.findIndex(j => j === null);
-        if (insert === -1) return setTeam([id, null, null]);
-        teamSelect[insert] = id;
-        return setTeam(teamSelect);
-    }
-    console.log(constructs.length);
-    const dispConstructs = constructs.length >= ((teamPage + 1) * 6)
-        ? constructs.slice(teamPage * 6, (teamPage + 1) * 6)
-        : constructs.slice(teamPage * 6, constructs.length);
+            const cancel = constructRename === construct.id
+                ? <button onClick={() => clearMtxRename()}>
+                    Cancel
+                </button>
+                : false;
 
-    const constructPanels = dispConstructs.map(construct => {
-        const colour = teamSelect.indexOf(construct.id);
-        const selected = colour > -1;
-
-        const borderColour = selected ? COLOURS[colour] : '#000000';
-
-        return (
-            <div
-                key={construct.id}
-                class="construct team-select"
-                style={ { 'border-color': borderColour || 'whitesmoke' } }
-                onClick={() => selectConstruct(construct.id)} >
-                <ConstructAvatar construct={construct} />
-                <h2>{construct.name}</h2>
-            </div>
-        );
-    });
+            return (
+                <div
+                    key={construct.id}
+                    style={ mtxActive ? { cursor: 'pointer' } : {}}
+                    onClick={() => {
+                        if (!mtxActive) return false;
+                        if (mtxActive === 'Rename') return setConstructRename(construct.id);
+                        return sendConstructAvatarReroll(construct.id);
+                    }}
+                    class="construct">
+                    <ConstructAvatar construct={construct} />
+                    {constructName}
+                    {confirm}
+                    {cancel}
+                </div>
+            );
+        });
 
     return (
-        <section class="team">
+        <div class="team">
             {constructPanels}
-        </section>
+        </div>
     );
 }
 

From 727c3ee6dc6c7b383207a3484b9f3ccdeaebdabd Mon Sep 17 00:00:00 2001
From: ntr <ntr@smokestack.io>
Date: Fri, 6 Sep 2019 15:15:03 +1000
Subject: [PATCH 6/6] delete unused components

---
 client/src/components/account.page.jsx | 35 -----------------------
 client/src/components/menu.jsx         | 39 --------------------------
 client/src/components/menu.top.jsx     | 31 --------------------
 3 files changed, 105 deletions(-)
 delete mode 100644 client/src/components/account.page.jsx
 delete mode 100644 client/src/components/menu.jsx
 delete mode 100644 client/src/components/menu.top.jsx

diff --git a/client/src/components/account.page.jsx b/client/src/components/account.page.jsx
deleted file mode 100644
index c8b7563a..00000000
--- a/client/src/components/account.page.jsx
+++ /dev/null
@@ -1,35 +0,0 @@
-const { connect } = require('preact-redux');
-const preact = require('preact');
-
-const Collection = require('./collection');
-const Header = require('./header');
-const AccountManagement = require('./account.management');
-
-const addState = connect(
-    function receiveState(state) {
-        const {
-            ws,
-            account,
-        } = state;
-
-        return {
-            account,
-        };
-    },
-);
-
-function Account(args) {
-    const {
-        account,
-    } = args;
-
-    return (
-        <main class="menu">
-            <Header />
-            <AccountManagement />
-            <Collection />
-        </main>
-    );
-}
-
-module.exports = addState(Account);
diff --git a/client/src/components/menu.jsx b/client/src/components/menu.jsx
deleted file mode 100644
index 7c5b7717..00000000
--- a/client/src/components/menu.jsx
+++ /dev/null
@@ -1,39 +0,0 @@
-// eslint-disable-next-line
-const preact = require('preact');
-const { connect } = require('preact-redux');
-
-const Shop = require('./shop');
-const Play = require('./play');
-const Account = require('./account.page');
-
-const addState = connect(
-    state => {
-        const {
-            account,
-            nav,
-        } = state;
-
-        return {
-            account,
-            nav,
-        };
-    }
-);
-
-function Menu(props) {
-    const {
-        account,
-        nav,
-    } = props;
-
-    // menu
-    if (nav === 'play') return <Play />;
-    if (nav === 'shop') return <Shop />;
-    if (nav === 'account') return <Account />;
-
-    return (
-        <Play />
-    );
-}
-
-module.exports = addState(Menu);
diff --git a/client/src/components/menu.top.jsx b/client/src/components/menu.top.jsx
deleted file mode 100644
index 52db35fe..00000000
--- a/client/src/components/menu.top.jsx
+++ /dev/null
@@ -1,31 +0,0 @@
-const preact = require('preact');
-const { connect } = require('preact-redux');
-
-const Shop = require('./shop');
-const Play = require('./play');
-const Account = require('./account.page');
-
-const addState = connect(
-    state => {
-        const { game, instance, account, nav } = state;
-        return { game, instance, account, nav };
-    }
-);
-
-function Menu(props) {
-    const {
-        account,
-        nav,
-    } = props;
-
-    // menu
-    if (nav === 'play') return <Play />;
-    if (nav === 'shop') return <Shop />;
-    if (nav === 'account') return <Account />;
-
-    return (
-        <Play />
-    );
-}
-
-module.exports = addState(Menu);