From 1ee7996485dff8fa9ab4fc41f62294a1c94975ae Mon Sep 17 00:00:00 2001
From: ntr <ntr@smokestack.io>
Date: Mon, 15 Oct 2018 23:23:04 +1100
Subject: [PATCH] bulma shit

---
 client/src/actions.jsx                        |  3 ++
 client/src/components/body.component.jsx      | 16 +++++++--
 client/src/components/cryp.list.jsx           | 12 +++----
 client/src/components/cryp.panel.jsx          |  2 +-
 client/src/components/cryp.spawn.button.jsx   | 31 ++++++++++++++++
 client/src/components/cryp.spawn.container.js | 18 ++++++++++
 client/src/components/item.list.container.js  | 16 +++++++++
 client/src/components/item.list.jsx           | 36 +++++++++++++++++++
 client/src/components/login.component.jsx     |  2 +-
 client/src/components/sidebar.component.jsx   | 19 ----------
 client/src/main.jsx                           |  3 +-
 client/src/reducers.jsx                       | 11 ++++++
 client/src/socket.jsx                         |  7 +++-
 server/WORKLOG.md                             |  8 ++++-
 14 files changed, 151 insertions(+), 33 deletions(-)
 create mode 100644 client/src/components/cryp.spawn.button.jsx
 create mode 100644 client/src/components/cryp.spawn.container.js
 create mode 100644 client/src/components/item.list.container.js
 create mode 100644 client/src/components/item.list.jsx
 delete mode 100644 client/src/components/sidebar.component.jsx

diff --git a/client/src/actions.jsx b/client/src/actions.jsx
index 524561a1..52a062c3 100644
--- a/client/src/actions.jsx
+++ b/client/src/actions.jsx
@@ -4,6 +4,9 @@ export const setAccount = (value) => ({ type: SET_ACCOUNT, value });
 export const SET_CRYPS = 'SET_CRYPS';
 export const setCryps = (value) => ({ type: SET_CRYPS, value });
 
+export const SET_ITEMS = 'SET_ITEMS';
+export const setItems = (value) => ({ type: SET_ITEMS, value });
+
 export const SET_BATTLE = 'SET_BATTLE';
 export const setBattle = (value) => ({ type: SET_BATTLE, value });
 
diff --git a/client/src/components/body.component.jsx b/client/src/components/body.component.jsx
index 159f8c41..f4bbfaea 100644
--- a/client/src/components/body.component.jsx
+++ b/client/src/components/body.component.jsx
@@ -1,14 +1,26 @@
 // eslint-disable-next-line
 const preact = require('preact');
 
+const ItemListContainer = require('./item.list.container');
+const CrypSpawnContainer = require('./cryp.spawn.container');
 const CrypListContainer = require('./cryp.list.container');
 const BattleContainer = require('./battle.container');
 
 function renderBody() {
     return (
         <section className="columns">
-            <div className="column is-3">
-                <CrypListContainer />
+            <div className="column is-4">
+                <div className="column">
+                    <CrypSpawnContainer />
+                </div>
+                <div className="columns">
+                    <div className="column is-8">
+                        <CrypListContainer />
+                    </div>
+                    <div className="column">
+                        <ItemListContainer />
+                    </div>
+                </div>
             </div>
             <div className="column">
                 <BattleContainer />
diff --git a/client/src/components/cryp.list.jsx b/client/src/components/cryp.list.jsx
index ce7091b2..87cd8c75 100644
--- a/client/src/components/cryp.list.jsx
+++ b/client/src/components/cryp.list.jsx
@@ -1,10 +1,11 @@
 const preact = require('preact');
 
+
 function CrypList({ cryps, sendCombatPve }) {
     if (!cryps) return <div>not ready</div>;
     const crypPanels = cryps.map(cryp => (
 
-        <div key={cryp.id} className="tile is-parent is-vertical box">
+        <div key={cryp.id} className="tile is-vertical box">
             <div className="tile is-vertical is-child">
                 <div className="columns" >
                     <div className="column is-10">
@@ -19,10 +20,10 @@ function CrypList({ cryps, sendCombatPve }) {
 
                 </div>
                 <div className="has-text-centered">{cryp.hp.value} / {cryp.stam.value} HP </div>
-                <progress className="progress is-success" value={cryp.hp.value} max={cryp.stam.value}></progress>
+                <progress className="progress is-dark" value={cryp.hp.value} max={cryp.stam.value}></progress>
             </div>
             <button
-                className="button is-success"
+                className="button is-dark"
                 type="submit"
                 onClick={() => sendCombatPve(cryp.id)}>
                 Start PVE
@@ -30,10 +31,7 @@ function CrypList({ cryps, sendCombatPve }) {
         </div>
     ));
     return (
-        <div>
-            <a className="button is-large is-fullwidth">
-                <span>Spawn 👾</span>
-            </a>
+        <div className="tile is-parent is-vertical" >
             {crypPanels}
         </div>
     );
diff --git a/client/src/components/cryp.panel.jsx b/client/src/components/cryp.panel.jsx
index 99694d6e..2c598704 100644
--- a/client/src/components/cryp.panel.jsx
+++ b/client/src/components/cryp.panel.jsx
@@ -28,7 +28,7 @@ function renderCrypPanel(cryp) {
                             </div>
                         </div>
                         <div className="has-text-centered">5 / 5 HP </div>
-                        <progress className="progress is-success" value="5" max="5"></progress>
+                        <progress className="progress is-dark" value="5" max="5"></progress>
                     </div>
                 </div>
             </div>
diff --git a/client/src/components/cryp.spawn.button.jsx b/client/src/components/cryp.spawn.button.jsx
new file mode 100644
index 00000000..f55ce1ab
--- /dev/null
+++ b/client/src/components/cryp.spawn.button.jsx
@@ -0,0 +1,31 @@
+// eslint-disable-next-line
+const preact = require('preact');
+
+function renderSpawnButton({ account, sendCrypSpawn }) {
+    let name = '';
+
+    if (!account) return <div>...</div>;
+
+    return (
+        <div className="columns">
+            <div className="column">
+                <input
+                    className="input"
+                    type="email"
+                    placeholder="cryp name"
+                    onChange={e => (name = e.target.value)}
+                />
+            </div>
+            <div className="column is-3">
+                <button
+                    className="button is-dark is-fullwidth"
+                    type="submit"
+                    onClick={() => sendCrypSpawn(name)}>
+                    Spawn 👾
+                </button>
+            </div>
+        </div>
+    );
+}
+
+module.exports = renderSpawnButton;
\ No newline at end of file
diff --git a/client/src/components/cryp.spawn.container.js b/client/src/components/cryp.spawn.container.js
new file mode 100644
index 00000000..23d918fa
--- /dev/null
+++ b/client/src/components/cryp.spawn.container.js
@@ -0,0 +1,18 @@
+const { connect } = require('preact-redux');
+
+const CrypSpawnButton = require('./cryp.spawn.button');
+
+const addState = connect(
+    function receiveState(state) {
+        const { ws } = state;
+        function sendCrypSpawn(name) {
+            return ws.sendCrypSpawn(name);
+        }
+
+        console.log(ws);
+
+        return { account: state.account, sendCrypSpawn };
+    }
+);
+
+module.exports = addState(CrypSpawnButton);
diff --git a/client/src/components/item.list.container.js b/client/src/components/item.list.container.js
new file mode 100644
index 00000000..d035102a
--- /dev/null
+++ b/client/src/components/item.list.container.js
@@ -0,0 +1,16 @@
+const { connect } = require('preact-redux');
+
+const ItemList = require('./item.list');
+
+const addState = connect(
+    function receiveState(state) {
+        const { ws, items } = state;
+        function sendItemUse(crypId) {
+            return ws.sendItemUse(crypId);
+        }
+
+        return { items, sendItemUse };
+    }
+);
+
+module.exports = addState(ItemList);
diff --git a/client/src/components/item.list.jsx b/client/src/components/item.list.jsx
new file mode 100644
index 00000000..95b2f31b
--- /dev/null
+++ b/client/src/components/item.list.jsx
@@ -0,0 +1,36 @@
+const preact = require('preact');
+
+function ItemList({ items, sendItemUse }) {
+    if (!items) return <div>...</div>;
+    const itemPanels = items.map(item => (
+
+        <div key={item.id} className="tile is-parent is-vertical box">
+            <div className="tile is-vertical is-child">
+                <div className="columns" >
+                    <div className="column is-8">
+                        <p className="title">{item.action}</p>
+                        <p className="subtitle">∞</p>
+                    </div>
+                    <div className="column">
+                        <figure className="image">
+                            <svg width="40" height="40" data-jdenticon-value={item.action} />
+                        </figure>
+                    </div>
+                </div>
+            </div>
+            <button
+                className="button is-dark"
+                type="submit"
+                onClick={() => sendItemUse(item.id)}>
+                Use
+            </button>
+        </div>
+    ));
+    return (
+        <div className="tile is-parent" >
+            {itemPanels}
+        </div>
+    );
+}
+
+module.exports = ItemList;
diff --git a/client/src/components/login.component.jsx b/client/src/components/login.component.jsx
index 140ee015..4a17ecde 100644
--- a/client/src/components/login.component.jsx
+++ b/client/src/components/login.component.jsx
@@ -43,7 +43,7 @@ function renderLogin({ account, submitLogin }) {
             <div className="field">
                 <p className="control">
                     <button
-                        className="button is-success"
+                        className="button is-dark"
                         type="submit"
                         onClick={() => submitLogin(details.name, details.password)}>
                         Login
diff --git a/client/src/components/sidebar.component.jsx b/client/src/components/sidebar.component.jsx
deleted file mode 100644
index 78f50ebe..00000000
--- a/client/src/components/sidebar.component.jsx
+++ /dev/null
@@ -1,19 +0,0 @@
-// eslint-disable-next-line
-const preact = require('preact');
-
-const LoginContainer = require('./login.container');
-
-function renderHeader() {
-    return (
-        <section className="hero is-dark">
-            <div className="hero-body">
-                <div className="container">
-                    <h1 className="title">cryps.gg</h1>
-                    <LoginContainer />
-                </div>
-            </div>
-        </section>
-    );
-}
-
-module.exports = renderHeader;
diff --git a/client/src/main.jsx b/client/src/main.jsx
index 4e3c6505..11aa1a69 100755
--- a/client/src/main.jsx
+++ b/client/src/main.jsx
@@ -15,9 +15,10 @@ const Body = require('./components/body.component');
 // Redux Store
 const store = createStore(
     combineReducers({
-        battle: reducers.battleReducer,
         account: reducers.accountReducer,
+        battle: reducers.battleReducer,
         cryps: reducers.crypsReducer,
+        items: reducers.itemsReducer,
         ws: reducers.wsReducer,
     })
 );
diff --git a/client/src/reducers.jsx b/client/src/reducers.jsx
index 517e1f96..41f9c3e1 100644
--- a/client/src/reducers.jsx
+++ b/client/src/reducers.jsx
@@ -20,6 +20,16 @@ function crypsReducer(state = defaultCryps, action) {
     }
 }
 
+const defaultItems = null;
+function itemsReducer(state = defaultItems, action) {
+    switch (action.type) {
+    case actions.SET_ITEMS:
+        return action.value;
+    default:
+        return state;
+    }
+}
+
 const defaultBattle = null;
 function battleReducer(state = defaultBattle, action) {
     switch (action.type) {
@@ -44,5 +54,6 @@ module.exports = {
     battleReducer,
     accountReducer,
     crypsReducer,
+    itemsReducer,
     wsReducer,
 };
diff --git a/client/src/socket.jsx b/client/src/socket.jsx
index b79d2782..6aa5018f 100644
--- a/client/src/socket.jsx
+++ b/client/src/socket.jsx
@@ -86,7 +86,7 @@ function createSocket(store) {
 
     function itemList(response) {
         const [structName, items] = response;
-        console.log('got my items', items);
+        store.dispatch(actions.setItems(items));
     }
 
     // -------------
@@ -101,6 +101,10 @@ function createSocket(store) {
         send({ method: 'account_login', params: { name, password } });
     }
 
+    function sendCrypSpawn(name) {
+        send({ method: 'cryp_spawn', params: { name } });
+    }
+
     function sendCombatPve(id) {
         send({ method: 'combat_pve', params: { id } });
     }
@@ -139,6 +143,7 @@ function createSocket(store) {
     return {
         sendAccountLogin,
         sendCombatPve,
+        sendCrypSpawn,
         connect,
     };
 }
diff --git a/server/WORKLOG.md b/server/WORKLOG.md
index d1bdf0e2..e190e8de 100755
--- a/server/WORKLOG.md
+++ b/server/WORKLOG.md
@@ -28,10 +28,16 @@
 
 * Blockchain Integration?
 
+# Principles
+* Experience something
+* Express something
+* Prove something
 
 # Mechanic Ideas
-
 teams
+1v1 2v2 3v3
+
+
 
 physical, magic, pure dmg?
   elemental?