fix team

WORKLOG.md

@@ -49,6 +49,8 @@
 * warden
   * set upkeep_at timestamp for games and instances
 
+* log game results for analysis
+
 ## SOON
 
 * push events

client/assets/styles/styles.css

@@ -352,7 +352,7 @@ header {
 }
 
 /*
-    MENU
+    TEAM
 */
 
 .menu-constructs {
@@ -365,22 +365,40 @@ header {
 }
 
 .menu-constructs .list {
+    margin-top: 0.5em;
     grid-area: list;
 
     display: grid;
     grid-template-columns: repeat(3, 1fr);
+    grid-auto-rows: 1fr;
+    grid-gap: 0.5em;
 }
 
-.menu-construct-ctr {
+.menu-construct {
-    /*flex: 0 0 30%;*/
+    height: 100%;
+    box-sizing: border-box;
+    border: 1px solid black;
 
     display: flex;
     flex-flow: column;
     text-align: center;
     justify-content: center;
+
+    transition-property: border;
+    transition-duration: 0.5s;
+    transition-delay: 0;
+    transition-timing-function: ease;
 }
 
-.spawn-btn .menu-construct {
+.menu-construct:nth-child(3n) {
+    margin-right: 0;
+}
+
+.menu-construct:first-child, .menu-construct:nth-child(4n) {
+    margin-left: 0;
+}
+
+.spawn-btn.menu-construct {
     border: 1px solid #333;
     color: #333;
     display: flex;
@@ -405,17 +423,7 @@ header {
     opacity: 0
 }
 
-.menu-construct {
+/* INSTANCE LIST */
-    height: 100%;
-    margin: 0.5em;
-    box-sizing: border-box;
-    border: 1px solid black;
-
-    transition-property: border;
-    transition-duration: 0.5s;
-    transition-delay: 0;
-    transition-timing-function: ease;
-}
 
 .menu-instance-list {
     flex: 1;

client/src/components/spawn.button.jsx

@@ -17,27 +17,24 @@ function SpawnButton({ spawn }) {
 
     return (
         <div
-            className="menu-construct-ctr spawn-btn">
+            className="menu-construct spawn-btn"
-            <div
+            onClick={e => enabledToggle(e)} >
-                className="menu-construct"
+            <h2>+</h2>
-                onClick={e => enabledToggle(e)} >
+            <input
-                <h2>+</h2>
+                className="login-input"
-                <input
+                type="text"
-                    className="login-input"
+                disabled={!enabled}
-                    type="text"
+                value={name}
-                    disabled={!enabled}
+                placeholder="name"
-                    value={name}
+                onInput={e => nameInput(e)}
-                    placeholder="name"
+            />
-                    onInput={e => nameInput(e)}
+            <button
-                />
+                className="login-btn"
-                <button
+                disabled={!enabled}
-                    className="login-btn"
+                onClick={() => spawn(name)}
-                    disabled={!enabled}
+                type="submit">
-                    onClick={() => spawn(name)}
+                spawn
-                    type="submit">
+            </button>
-                    spawn
-                </button>
-            </div>
         </div>
     );
 }

client/src/components/team.jsx

@@ -89,14 +89,11 @@ function Team(args) {
         return (
             <div
                 key={construct.id}
-                className="menu-construct-ctr">
+                className="menu-construct"
-                <div
+                style={ { 'border-color': borderColour || 'whitesmoke' } }
-                    className="menu-construct"
+                onClick={() => selectConstruct(construct.id)} >
-                    style={ { 'border-color': borderColour || 'whitesmoke' } }
+                {constructAvatar(construct.name, construct.id)}
-                    onClick={() => selectConstruct(construct.id)} >
+                <h2>{construct.name}</h2>
-                    {constructAvatar(construct.name, construct.id)}
-                    <h2>{construct.name}</h2>
-                </div>
             </div>
         );
     });

server/src/game.rs

@@ -166,8 +166,11 @@ impl Game {
     }
 
     fn skill_phase_start(mut self, num_resolutions: usize) -> Game {
-        let phase_add_time_ms = 60000 + num_resolutions * 2500;
+        let resolution_animation_ms = num_resolutions * 2500;
-        self.phase_start = Utc::now();
+        let phase_add_time_ms = 60000 + resolution_animation_ms;
+        self.phase_start = Utc::now()
+            .checked_add_signed(Duration::milliseconds(resolution_animation_ms as i64))
+            .expect("could not set phase start");
         self.phase_end = Utc::now()
             .checked_add_signed(Duration::milliseconds(phase_add_time_ms as i64))
             .expect("could not set phase end");