From f94aff376dbd205ba266b1d9e5b0390da7cbdebd Mon Sep 17 00:00:00 2001
From: ntr <ntr@smokestack.io>
Date: Thu, 30 May 2019 14:42:32 +1000
Subject: [PATCH] menu styles

---
 WORKLOG.md                      |  1 +
 client/assets/styles/styles.css | 21 ++++++++++++++-------
 client/src/components/list.jsx  | 22 ++++++++++++++++++++++
 server/src/construct.rs         | 12 ++++++++++--
 server/src/skill.rs             |  2 +-
 5 files changed, 48 insertions(+), 10 deletions(-)

diff --git a/WORKLOG.md b/WORKLOG.md
index f57bc9f7..6ef0a665 100644
--- a/WORKLOG.md
+++ b/WORKLOG.md
@@ -36,6 +36,7 @@
 * fix mobile menu
   * make fullscreen
   * disappear on touch
+* find cause of lag
 
 
 *SERVER*
diff --git a/client/assets/styles/styles.css b/client/assets/styles/styles.css
index ddd87392..162d3417 100644
--- a/client/assets/styles/styles.css
+++ b/client/assets/styles/styles.css
@@ -56,6 +56,11 @@ h4 {
     margin: 0;
 }
 
+hr {
+    margin: 1.5em 0;
+    width: 100%;
+}
+
 figure {
     margin: 0;
     text-align: center;
@@ -429,11 +434,15 @@ header {
     display: grid;
 
     grid-template-areas:
+        "top"
         "team"
-        "list"
-        "create";
+        "list";
     grid-template-columns: 1fr;
-    grid-template-rows: 1fr 1fr 1fr;
+    grid-template-rows: min-content min-content 1fr;
+}
+
+.menu-instances .top {
+    grid-area: top;
 }
 
 .menu-instances .construct-list {
@@ -508,10 +517,8 @@ figure.gray {
     fill: none;
 }
 
-main .top {
-    display: flex;
-    flex-flow: column;
-    flex: 1;
+main .top button {
+    width: 100%;
 }
 
 .ready:hover {
diff --git a/client/src/components/list.jsx b/client/src/components/list.jsx
index 96b2ceff..d5f6c926 100644
--- a/client/src/components/list.jsx
+++ b/client/src/components/list.jsx
@@ -36,6 +36,15 @@ const addState = connect(
             instances,
         };
     },
+
+    function receiveDispatch(dispatch) {
+        function navToTeam() {
+            return dispatch(actions.setNav('team'));
+        }
+        return {
+            navToTeam,
+        };
+    }
 );
 
 function List(args) {
@@ -47,6 +56,7 @@ function List(args) {
         sendInstanceJoin,
         sendInstanceList,
         instances,
+        navToTeam,
     } = args;
 
     function instanceList() {
@@ -76,6 +86,7 @@ function List(args) {
 
         return (
             <div className="menu-instance-list" >
+                <hr />
                 <table>
                     <thead>
                         <tr>
@@ -113,9 +124,20 @@ function List(args) {
         );
     });
 
+    const header = (
+        <div className="top">
+            <button
+                className="instance-btn instance-ui-btn left"
+                onClick={() => navToTeam()}>
+                Select Constructs
+            </button>
+        </div>
+    );
+
 
     return (
         <main className="menu-instances">
+            {header}
             <div className="construct-list">
                 {constructPanels}
             </div>
diff --git a/server/src/construct.rs b/server/src/construct.rs
index 01309d4e..663dd27e 100644
--- a/server/src/construct.rs
+++ b/server/src/construct.rs
@@ -757,8 +757,16 @@ impl Construct {
             skill,
         };
 
-        // info!("{:?} {:?} adding effect", self.name, effect.effect);
-        self.effects.push(effect);
+        if let Some(p) = self.effects.iter().position(|ce| ce.effect == effect.effect) {
+            // duplicate effect
+            // replace existing
+
+            self.effects[p] = effect;
+        } else {
+            // new effect
+            // info!("{:?} {:?} adding effect", self.name, effect.effect);
+            self.effects.push(effect);
+        }
 
         return result;
     }
diff --git a/server/src/skill.rs b/server/src/skill.rs
index 657ffb3f..9de2c51b 100644
--- a/server/src/skill.rs
+++ b/server/src/skill.rs
@@ -1617,7 +1617,7 @@ fn heal(source: &mut Construct, target: &mut Construct, mut results: Resolutions
 }
 
 fn triage(source: &mut Construct, target: &mut Construct, mut results: Resolutions, skill: Skill) -> Resolutions {
-    let ConstructEffect { effect, duration, meta, tick: _ } = skill.effect().first().unwrap().clone();
+    let ConstructEffect { effect, duration, meta, tick: _ } = skill.effect()[0];
     let tick_skill = match meta {
         Some(EffectMeta::Skill(s)) => s,
         _ => panic!("no triage tick skill"),