From 8151c37f969c24fdda5c3042bf9008522ebb4e82 Mon Sep 17 00:00:00 2001
From: ntr <ntr@smokestack.io>
Date: Sun, 22 Sep 2019 18:10:05 +1000
Subject: [PATCH] account box

---
 client/assets/styles/controls.less           | 26 ++++----
 client/src/components/account.box.jsx        | 46 +++++++++++++
 client/src/components/game.ctrl.btns.jsx     |  2 +-
 client/src/components/instance.ctrl.btns.jsx |  2 +-
 client/src/components/play.ctrl.jsx          | 68 +++++++++++++-------
 client/src/components/player.box.jsx         |  3 +-
 6 files changed, 107 insertions(+), 40 deletions(-)
 create mode 100644 client/src/components/account.box.jsx

diff --git a/client/assets/styles/controls.less b/client/assets/styles/controls.less
index 0df8af26..69b1a07a 100644
--- a/client/assets/styles/controls.less
+++ b/client/assets/styles/controls.less
@@ -14,28 +14,30 @@ aside {
 
     padding-left: 1em;
 
-    .instance-ctrl, .game-ctrl {
+    .controls {
+        grid-area: controls;
+        display: grid;
+
         grid-template-areas:
             "top"
             "p0"
             "p1"
             "bottom";
 
-        grid-template-rows: min-content 3fr 3fr 1fr;
-    }
+        .flex {
+            display: flex;
+            flex-flow: column;;
+        }
 
-    .controls {
-        grid-area: controls;
-        display: grid;
-        grid-auto-rows: 1fr;
+        grid-template-rows: min-content 3fr 3fr 1fr;
         grid-gap: 0.5em 0;
     }
 
-    &.play-ctrl {
-        .controls {
-            grid-template-rows: 4fr 4fr 1fr;
-        }
-    }
+    // &.play-ctrl {
+    //     .controls {
+    //         grid-template-rows: 4fr 4fr 1fr;
+    //     }
+    // }
 
     text-align: center;
 
diff --git a/client/src/components/account.box.jsx b/client/src/components/account.box.jsx
new file mode 100644
index 00000000..1ad42023
--- /dev/null
+++ b/client/src/components/account.box.jsx
@@ -0,0 +1,46 @@
+const preact = require('preact');
+const { connect } = require('preact-redux');
+
+const addState = connect(
+    function receiveState(state) {
+        const {
+            account,
+        } = state;
+
+        return {
+            account,
+        };
+    }
+);
+
+
+function AccountBox(args) {
+    const {
+        account,
+    } = args;
+
+    const imgStyle = account.img
+        ? { 'background-image': `url(/imgs/${account.img}.svg)` }
+        : null;
+
+    // if (!isTop) {
+    //     return (
+    //         <div class='player-box top'>
+    //             <div class="name">Processor</div>
+    //             <div class="img avatar" id={account.img} style={imgStyle}></div>
+    //             <div class="msg">&nbsp;</div>
+    //         </div>
+    //     );
+    // }
+
+    return (
+        <div class='player-box bottom'>
+            <div class="msg">&nbsp;</div>
+            <div class="img avatar" id={account.img} style={imgStyle}></div>
+            <div class="name">{account.name}</div>
+            <div class="score">0 MMR</div>
+        </div>
+    );
+}
+
+module.exports = addState(AccountBox);
diff --git a/client/src/components/game.ctrl.btns.jsx b/client/src/components/game.ctrl.btns.jsx
index 81d36cb7..d92d0b86 100644
--- a/client/src/components/game.ctrl.btns.jsx
+++ b/client/src/components/game.ctrl.btns.jsx
@@ -62,7 +62,7 @@ function GameCtrlBtns(args) {
 
     return (
         <div class="game-ctrl-btns">
-            <button>Chat</button>
+            <button disabled={true} >Chat</button>
             <button disabled={animating} onClick={sendGameSkillClear}>Clear</button>
             <button disabled={animating} class="ready" onClick={() => sendReady()}>Ready</button>
         </div>
diff --git a/client/src/components/instance.ctrl.btns.jsx b/client/src/components/instance.ctrl.btns.jsx
index 751f7137..d2acd10c 100644
--- a/client/src/components/instance.ctrl.btns.jsx
+++ b/client/src/components/instance.ctrl.btns.jsx
@@ -40,7 +40,7 @@ function InstanceCtrlBtns(args) {
 
     return (
         <div class="instance-ctrl-btns">
-            <button>Chat</button>
+            <button disabled={true} >Chat</button>
             <button disabled={finished} class="ready" onClick={() => sendReady()}>Ready</button>
         </div>
     );
diff --git a/client/src/components/play.ctrl.jsx b/client/src/components/play.ctrl.jsx
index 0df4f4d0..4b0ed01c 100644
--- a/client/src/components/play.ctrl.jsx
+++ b/client/src/components/play.ctrl.jsx
@@ -3,6 +3,8 @@ const { connect } = require('preact-redux');
 
 const { errorToast, infoToast } = require('../utils');
 
+const AccountBox = require('./account.box');
+
 const addState = connect(
     function receiveState(state) {
         const {
@@ -50,17 +52,33 @@ function JoinButtons(args) {
         sendInstanceInvite,
     } = args;
 
+    const discordBtn = (
+        <button
+            class='discord-btn'
+            onClick={() => window.open('https://discord.gg/YJJgurM') }>
+                &nbsp;
+        </button>
+    );
+
     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>
+                    {discordBtn}
+                    <div class="flex">
+                        <div>&nbsp;</div>
+                    </div>
+                    <AccountBox />
+                    <div class="instance-ctrl-btns">
+                        <button disabled={true} >Chat</button>
+                        <button
+                            class='pvp ready full'
+                            onClick={() => sendInstanceState(instances[0].id)}
+                            type="submit">
+                            Rejoin
+                        </button>
+                    </div>
                 </div>
             </aside>
         );
@@ -112,24 +130,26 @@ function JoinButtons(args) {
         <aside class='play-ctrl'>
             <div class="timer-container"></div>
             <div class="controls">
-                <button
-                    class='pvp ready'
-                    onClick={() => sendInstanceQueue()}
-                    type="submit">
-                    PVP
-                </button>
-                {inviteBtn()}
-                <button
-                    class='practice ready'
-                    onClick={() => sendInstancePractice()}
-                    type="submit">
-                    Learn
-                </button>
-                <button
-                    class='discord-btn'
-                    onClick={() => window.open('https://discord.gg/YJJgurM') }>
-                        &nbsp;
-                </button>
+                {discordBtn}
+                <div class="flex">
+                    <button
+                        class='practice ready'
+                        onClick={() => sendInstancePractice()}
+                        type="submit">
+                        Learn
+                    </button>
+                    {inviteBtn()}
+                </div>
+                <AccountBox />
+                <div class="instance-ctrl-btns">
+                    <button disabled={true} >Chat</button>
+                    <button
+                        class='pvp ready'
+                        onClick={() => sendInstanceQueue()}
+                        type="submit">
+                        PVP
+                    </button>
+                </div>
             </div>
         </aside>
     );
diff --git a/client/src/components/player.box.jsx b/client/src/components/player.box.jsx
index 87ec4dae..409ace1d 100644
--- a/client/src/components/player.box.jsx
+++ b/client/src/components/player.box.jsx
@@ -7,7 +7,7 @@ function Scoreboard(args) {
     } = args;
 
     const scoreText = () => {
-        if (player.score === 'Zero') return [<span i={0}>▫</span>, <span i={1}>▫</span>, <span i={2}>▫</span>];
+        if (player.score === 'Zero' || player.score === 'Lose') return [<span i={0}>▫</span>, <span i={1}>▫</span>, <span i={2}>▫</span>];
         if (player.score === 'One') return [<span i={0}>■</span>, <span i={1}>▫</span>, <span i={2}>▫</span>];
         if (player.score === 'Two') return [<span i={0}>■</span>, <span i={1}>■</span>, <span i={2}>▫</span>];
         if (player.score === 'Win') return [<span i={0}>■</span>, <span i={1}>■</span>, <span i={2}>■</span>];
@@ -42,7 +42,6 @@ function Scoreboard(args) {
         );
     }
 
-
     return (
         <div class={`player-box bottom ${player.ready ? 'ready' : ''}`}>
             <div class="msg">hfhf</div>