cryps list

client/src/actions.jsx

@@ -1,8 +1,11 @@
 export const SET_ACCOUNT = 'SET_ACCOUNT';
 export const setAccount = (value) => ({ type: SET_ACCOUNT, value });
 
-export const SET_CRYP = 'SET_CRYP';
+export const SET_CRYPS = 'SET_CRYPS';
-export const setCryp = (value) => ({ type: SET_CRYP, value });
+export const setCryps = (value) => ({ type: SET_CRYPS, value });
+
+export const SET_ACTIVE_CRYP = 'SET_ACTIVE_CRYP';
+export const setActiveCryp = (value) => ({ type: SET_ACTIVE_CRYP, value });
 
 export const SET_WS = 'SET_WS';
 export const setWs = (value) => ({ type: SET_WS, value });

client/src/components/cryp.container.js

@@ -1,16 +0,0 @@
-const { connect } = require('preact-redux');
-
-const CrypPanel = require('./cryp.panel');
-
-const addState = connect(
-    function receiveState(state) {
-        const { ws, cryp } = state;
-        function sendCombatPve() {
-            return ws.sendCombatPve(cryp.id);
-        }
-
-        return { cryp, sendCombatPve };
-    }
-);
-
-module.exports = addState(CrypPanel);

client/src/components/cryps.container.js

@@ -0,0 +1,16 @@
+const { connect } = require('preact-redux');
+
+const CrypsPanel = require('./cryps.panel');
+
+const addState = connect(
+    function receiveState(state) {
+        const { ws, cryps } = state;
+        function sendCombatPve(crypId) {
+            return ws.sendCombatPve(crypId);
+        }
+
+        return { cryps, sendCombatPve };
+    }
+);
+
+module.exports = addState(CrypsPanel);

client/src/components/cryps.panel.jsx

@@ -1,10 +1,10 @@
 const preact = require('preact');
 
-function CrypPanel({ cryp, sendCombatPve }) {
+function CrypPanel({ cryps, sendCombatPve }) {
-    if (!cryp) return <div>not ready</div>;
+    if (!cryps) return <div>not ready</div>;
 
-    return (
+    const crypPanels = cryps.map(cryp => (
-        <div className="tile is-ancestor has-text-centered has-background-grey is-dark is-10">
+        <div key={cryp.id} className="tile is-ancestor has-text-centered has-background-grey is-dark is-10">
             <div className="tile is-6">
                 <div className="tile is-parent is-vertical is-3">
                     <section className="tile is-child notification is-success">
@@ -51,16 +51,22 @@ function CrypPanel({ cryp, sendCombatPve }) {
                     <button
                         className="button is-success"
                         type="submit"
-                        onClick={() => sendCombatPve()}>
+                        onClick={() => sendCombatPve(cryp.id)}>
                         Start PVE
                     </button>
                 </section>
             </div>
         </div>
-    );
+    ));
     // map is a function that is called on every element of an array
     // so in this ^^ case it calls Icon('Mashy') which returns some jsx
     // that gets put into the dom
+
+    return (
+        <section>
+            {crypPanels}
+        </section>
+    );
 }
 
 module.exports = CrypPanel;

client/src/main.jsx

@@ -9,17 +9,17 @@ const actions = require('./actions');
 const fizzyText = require('../lib/fizzy-text');
 const createSocket = require('./socket');
 
-const CrypContainer = require('./components/cryp.container');
+const CrypsContainer = require('./components/cryps.container');
 const LoginContainer = require('./components/login.container');
-const Navbar = require('./components/navbar');
+// const Navbar = require('./components/navbar');
 
 // Redux Store
 const store = createStore(
     combineReducers({
         account: reducers.accountReducer,
-        cryp: reducers.crypReducer,
+        cryps: reducers.crypsReducer,
         ws: reducers.wsReducer,
-    }),
+    })
 );
 
 store.subscribe(() => console.log(store.getState()));
@@ -36,10 +36,9 @@ jdenticon.config = {
 
 const Cryps = () => (
     <section>
-        <Navbar />
         <LoginContainer />
         <div id="fizzytext" />
-        <CrypContainer />
+        <CrypsContainer />
     </section>
 );
 

client/src/reducers.jsx

@@ -10,10 +10,10 @@ function accountReducer(state = defaultAccount, action) {
     }
 }
 
-const defaultCryp = null;
+const defaultCryps = null;
-function crypReducer(state = defaultCryp, action) {
+function crypsReducer(state = defaultCryps, action) {
     switch (action.type) {
-    case actions.SET_CRYP:
+    case actions.SET_CRYPS:
         return action.value;
     default:
         return state;
@@ -32,6 +32,6 @@ function wsReducer(state = defaultWs, action) {
 
 module.exports = {
     accountReducer,
-    crypReducer,
+    crypsReducer,
     wsReducer,
 };

client/src/socket.jsx

@@ -31,14 +31,19 @@ function createSocket(store) {
 
         account = login;
         store.dispatch(actions.setAccount(login));
+        send({ method: 'account_cryps', params: {} });
         console.log(account);
-        return send({ method: 'cryp_spawn', params: { name: 'drake' } });
+    }
+
+    function accountCryps(response) {
+        const [structName, cryps] = response;
+        store.dispatch(actions.setCryps(cryps));
+        console.log('got my cryps', cryps);
     }
 
     function crypSpawn(response) {
         const [structName, cryp] = response;
         console.log('got a new cryp', cryp);
-        return store.dispatch(actions.setCryp(cryp));
     }
 
     function combatPve(response) {
@@ -74,6 +79,7 @@ function createSocket(store) {
         combat_pve: combatPve,
         account_login: accountLogin,
         account_create: accountLogin,
+        account_cryps: accountCryps,
     };
 
     // decodes the cbor and
@@ -93,8 +99,7 @@ function createSocket(store) {
 
     // Connection opened
     ws.addEventListener('open', function wsOpen(event) {
-        // send({ method: 'account_create', params: { name: 'ntr', password: 'grepgrepgrep' }});
+        send({ method: 'account_login', params: { name: 'ntr', password: 'grepgrepgrep' } });
-        // send({ method: 'account_login', params: { name: 'ntr', password: 'grepgrepgrep' } });
     });
 
     // Listen for messages

server/WORKLOG.md

@@ -34,5 +34,17 @@ items give skills
 gem td style attr combinations
   stoney + spikey = jagged
 
+  plants
+  animals
+  viruses
+  fungus
+  artificial
+  elementals
+
+
+  first strike
+
+  techno artists for the soundtrack
+
   slimey
   ghostly

server/src/account.rs

@@ -3,12 +3,16 @@ use bcrypt::{hash, verify};
 use rand::{thread_rng, Rng};
 use rand::distributions::Alphanumeric;
 use std::iter;
+use serde_cbor::{from_slice, to_vec};
+
 
 use std::str;
 
 use net::Db;
 use rpc::{AccountCreateParams, AccountLoginParams, RpcResult};
 
+use cryp::Cryp;
+
 use failure::Error;
 use failure::err_msg;
 
@@ -55,7 +59,7 @@ pub fn from_token(token: String, db: &Db) -> Result<Account, Error> {
     return Ok(entry);
 }
 
-pub fn create(params: AccountCreateParams, db: Db) -> Result<RpcResult, Error> {
+pub fn create(params: AccountCreateParams, db: Db) -> Result<Account, Error> {
     let id = Uuid::new_v4();
 
     if params.password.len() < PASSWORD_MIN_LEN {
@@ -99,10 +103,10 @@ pub fn create(params: AccountCreateParams, db: Db) -> Result<RpcResult, Error> {
 
     tx.commit()?;
 
-    return Ok(RpcResult::Account(entry));
+    return Ok(entry);
 }
 
-pub fn login(params: AccountLoginParams, db: Db) -> Result<RpcResult, Error> {
+pub fn login(params: AccountLoginParams, db: Db) -> Result<Account, Error> {
     let query = "
         SELECT id, name, token, password
         FROM accounts
@@ -142,5 +146,31 @@ pub fn login(params: AccountLoginParams, db: Db) -> Result<RpcResult, Error> {
         token: entry.token,
     };
 
-    return Ok(RpcResult::Account(account));
+    return Ok(account);
-}
+}
+
+pub fn fetch_cryps(db: Db, account: Account) -> Result<Vec<Cryp>, Error> {
+    let query = "
+        SELECT data
+        FROM cryps
+        WHERE account = $1;
+    ";
+
+    let result = db
+        .query(query, &[&account.id])?;
+
+    let cryps: Result<Vec<Cryp>, _> = result.iter().map(|row| {
+        let cryp_bytes: Vec<u8> = row.get(0);
+        from_slice::<Cryp>(&cryp_bytes)
+    }).collect();
+
+    // catch any errors
+    if cryps.is_err() {
+        return Err(err_msg("could not deserialize a cryp"));
+    }
+
+    // now unwrap is safe
+    return Ok(cryps.unwrap());
+}
+
+

server/src/combat.rs

@@ -121,10 +121,7 @@ where F: Fn(&Battle) -> Result<(), Error>
     loop {
       battle.next();
 
-      match send(&battle) {
+      send(&battle)?;
-        Err(e) => break Err(err_msg("could not reply")),
-        _ => (),
-      };
 
       if battle.finished() {
           break Ok(battle)

server/src/cryp.rs

@@ -1,7 +1,7 @@
 use uuid::Uuid;
 use rand::prelude::*;
 use serde_cbor::*;
-use serde_cbor::{to_vec};
+use serde_cbor::{from_slice, to_vec};
 
 use failure::Error;
 use failure::err_msg;
@@ -217,7 +217,6 @@ pub fn spawn(params: CrypSpawnParams, db: Db, account: Account) -> Result<Cryp,
     return Ok(cryp);
 }
 
-
 #[cfg(test)]
 mod tests {
   use cryp::*;

server/src/rpc.rs

@@ -8,7 +8,7 @@ use net::Db;
 use cryp::{Cryp, spawn};
 use battle::{Battle};
 use combat::{pve};
-use account::{Account, create, login, from_token};
+use account::{Account, create, login, from_token, fetch_cryps};
 
 pub struct Rpc;
 
@@ -75,7 +75,7 @@ impl Rpc {
                         match from_slice::<AccountCreateMsg>(&data) {
                             Ok(v) => Ok(RpcResponse {
                                 method: v.method,
-                                params: create(v.params, db)?
+                                params: RpcResult::Account(create(v.params, db)?)
                             }),
                             Err(_e) => Err(err_msg("invalid params")),
                         }
@@ -84,12 +84,20 @@ impl Rpc {
                         match from_slice::<AccountLoginMsg>(&data) {
                             Ok(v) => Ok(RpcResponse {
                                 method: v.method,
-                                params: login(v.params, db)?
+                                params: RpcResult::Account(login(v.params, db)?)
                             }),
                             Err(_e) => Err(err_msg("invalid params")),
                         }
                     },
-
+                    "account_cryps" => {
+                        match account {
+                            Some(u) => Ok(RpcResponse {
+                                method: v.method,
+                                params: RpcResult::CrypList(fetch_cryps(db, u)?)
+                            }),
+                            None => Err(err_msg("auth required")),
+                        }
+                   },
                     _ => Err(err_msg("unknown method")),
                 }
             },
@@ -108,6 +116,7 @@ pub struct RpcResponse {
 pub enum RpcResult {
     SpawnCryp(Cryp),
     Account(Account),
+    CrypList(Vec<Cryp>),
     Pve(Battle),
 }
 
@@ -163,6 +172,12 @@ pub struct AccountLoginParams {
     pub password: String,
 }
 
+#[derive(Debug,Clone,Serialize,Deserialize)]
+struct AccountCrypsMsg {
+    method: String,
+    params: (),
+}
+
 // #[cfg(test)]
 // mod tests {
 //     use super::*;