From 6f5cf8bb39105b92344d725f5e2804699408a651 Mon Sep 17 00:00:00 2001
From: Mashy <himesh.kapadia@gmail.com>
Date: Mon, 28 Oct 2019 12:25:26 +1000
Subject: [PATCH] misc

---
 client/src/components/instance.constructs.jsx |   5 +-
 client/src/components/vbox.component.jsx      | 126 +++++++++---------
 2 files changed, 67 insertions(+), 64 deletions(-)

diff --git a/client/src/components/instance.constructs.jsx b/client/src/components/instance.constructs.jsx
index 84d77f21..f3367a2a 100644
--- a/client/src/components/instance.constructs.jsx
+++ b/client/src/components/instance.constructs.jsx
@@ -77,8 +77,11 @@ function Construct(props) {
         iter,
         itemEquip,
         instance,
+        mobileVisible,
         player,
         tutorial,
+        // Static Info
+        itemInfo,
         // Function Calls
         sendVboxApply,
         sendUnequip,
@@ -272,7 +275,7 @@ class InstanceConstructs extends preact.Component {
 
         const constructs = range(0, 3).map(i => {
             const tutorialConstruct = tutorialConstructDisplay(player, instance, tutorial, navInstance, i);
-        	if (tutorialConstruct) return (tutorialConstruct);
+            if (tutorialConstruct) return (tutorialConstruct);
 
             return Construct({
                 iter: i,
diff --git a/client/src/components/vbox.component.jsx b/client/src/components/vbox.component.jsx
index 1d1b9ee3..54427f92 100644
--- a/client/src/components/vbox.component.jsx
+++ b/client/src/components/vbox.component.jsx
@@ -160,12 +160,12 @@ class Vbox extends preact.Component {
         //
         function vboxHover(e, v) {
             if (v) {
-	            e.stopPropagation();
-	            if (combiner.length !== 0) {
-	                const base = combiner.find(c => !['Red', 'Blue', 'Green'].includes(vbox.bound[c]));
-	                if (base) return setInfo(vbox.bound[base]);
-	            }
-	            if (info !== v) setInfo(v);
+                e.stopPropagation();
+                if (combiner.length !== 0) {
+                    const base = combiner.find(c => !['Red', 'Blue', 'Green'].includes(vbox.bound[c]));
+                    if (base) return setInfo(vbox.bound[base]);
+                }
+                if (info !== v) setInfo(v);
             }
             return true;
         }
@@ -247,32 +247,32 @@ class Vbox extends preact.Component {
 
         function vboxElement() {
             return (
-				<div class='vbox-vbox'
-	                onMouseDown={() => setReclaiming(false)}
-	                onClick={e => e.stopPropagation()}>
-	                <div class="vbox-hdr">
-	                    <h3
-	                        onTouchStart={e => e.target.scrollIntoView(true)}
-	                        onMouseOver={e => hoverInfo(e, 'vbox')}> VBOX
-	                    </h3>
-	                    <div class="bits" onMouseOver={e => hoverInfo(e, 'bits')} >{vbox.bits}b</div>
-	                </div>
-	                <div class="vbox-colours">
-	                    {range(0, 6).map(i => availableBtn(vbox.free[0][i], 0, i))}
-	                </div>
-	                <div class="vbox-items">
-	                    {range(0, 3).map(i => availableBtn(vbox.free[1][i], 1, i))}
-	                    {range(0, 3).map(i => availableBtn(vbox.free[2][i], 2, i))}
-	                </div>
-	                <button
-	                    class='vbox-btn'
-	                    onMouseOver={e => hoverInfo(e, 'refill')}
-	                    disabled={tutorial && tutorial < 7}
-	                    onClick={e => e.stopPropagation()}
-	                    onMouseDown={() => sendVboxDiscard()}>
-	                    refill - 2b
-	                </button>
-	            </div>
+                <div class='vbox-vbox'
+                    onMouseDown={() => setReclaiming(false)}
+                    onClick={e => e.stopPropagation()}>
+                    <div class="vbox-hdr">
+                        <h3
+                            onTouchStart={e => e.target.scrollIntoView(true)}
+                            onMouseOver={e => hoverInfo(e, 'vbox')}> VBOX
+                        </h3>
+                        <div class="bits" onMouseOver={e => hoverInfo(e, 'bits')} >{vbox.bits}b</div>
+                    </div>
+                    <div class="vbox-colours">
+                        {range(0, 6).map(i => availableBtn(vbox.free[0][i], 0, i))}
+                    </div>
+                    <div class="vbox-items">
+                        {range(0, 3).map(i => availableBtn(vbox.free[1][i], 1, i))}
+                        {range(0, 3).map(i => availableBtn(vbox.free[2][i], 2, i))}
+                    </div>
+                    <button
+                        class='vbox-btn'
+                        onMouseOver={e => hoverInfo(e, 'refill')}
+                        disabled={tutorial && tutorial < 7}
+                        onClick={e => e.stopPropagation()}
+                        onMouseDown={() => sendVboxDiscard()}>
+                        refill - 2b
+                    </button>
+                </div>
             );
         }
 
@@ -313,10 +313,10 @@ class Vbox extends preact.Component {
                 if (reclaiming) return sendVboxReclaim(i);
 
                 // 4 things selected
-	            if (combiner.length > 2) {
-	                setInfo(vbox.bound[i]);
-	                return combinerChange([i]);
-	            }
+                if (combiner.length > 2) {
+                    setInfo(vbox.bound[i]);
+                    return combinerChange([i]);
+                }
                 // removing
                 const combinerIndex = combiner.indexOf(i);
                 if (combinerIndex > -1) {
@@ -325,10 +325,10 @@ class Vbox extends preact.Component {
 
                 combiner.push(i);
 
-	            if (!comboHighlight) {
-	                setInfo(vbox.bound[i]);
-	                return combinerChange([i]);
-	            }
+                if (!comboHighlight) {
+                    setInfo(vbox.bound[i]);
+                    return combinerChange([i]);
+                }
 
                 return combinerChange(combiner);
             }
@@ -407,29 +407,29 @@ class Vbox extends preact.Component {
             }
 
             return (
-	            <div class={inventoryClass}
-	                onMouseDown={inventoryClick}
-	                onClick={e => e.stopPropagation()}
-	                style={vboxSelecting || (itemUnequip.length) ? { cursor: 'pointer' } : null}>
-	                <div class="vbox-hdr">
-	                    <h3
-	                        onTouchStart={e => e.target.scrollIntoView(true)}
-	                        onMouseOver={e => hoverInfo(e, 'inventory')}> INVENTORY
-	                    </h3>
-	                    <button
-	                        disabled={tutorial && tutorial < 8}
-	                        class='vbox-btn reclaim'
-	                        onMouseOver={e => hoverInfo(e, 'reclaim')}
-	                        onClick={e => e.stopPropagation()}
-	                        onMouseDown={reclaimClick}>
-	                        reclaim
-	                    </button>
-	                </div>
-	                <div class='vbox-items'>
-	                    {range(0, 9).map(i => inventoryBtn(vbox.bound[i], i))}
-	                </div>
-	                {combinerBtn()}
-	            </div>
+                <div class={inventoryClass}
+                    onMouseDown={inventoryClick}
+                    onClick={e => e.stopPropagation()}
+                    style={vboxSelecting || (itemUnequip.length) ? { cursor: 'pointer' } : null}>
+                    <div class="vbox-hdr">
+                        <h3
+                            onTouchStart={e => e.target.scrollIntoView(true)}
+                            onMouseOver={e => hoverInfo(e, 'inventory')}> INVENTORY
+                        </h3>
+                        <button
+                            disabled={tutorial && tutorial < 8}
+                            class='vbox-btn reclaim'
+                            onMouseOver={e => hoverInfo(e, 'reclaim')}
+                            onClick={e => e.stopPropagation()}
+                            onMouseDown={reclaimClick}>
+                            reclaim
+                        </button>
+                    </div>
+                    <div class='vbox-items'>
+                        {range(0, 9).map(i => inventoryBtn(vbox.bound[i], i))}
+                    </div>
+                    {combinerBtn()}
+                </div>
             );
         }