X-Git-Url: https://git.auder.net/img/rock_paper_scissors_lizard_spock.gif?a=blobdiff_plain;f=client%2Fsrc%2Fcomponents%2FChallengeList.vue;h=1107b58ce023c9207e1555f64e51c38eb0ce859a;hb=e50a802531b99829c533f22ecd21e359e7e1e049;hp=95a71ac2e23e0f23cd99968586034aa3a1bc3049;hpb=714680114508183fba2c07231dbe8f90b5631b81;p=vchess.git

diff --git a/client/src/components/ChallengeList.vue b/client/src/components/ChallengeList.vue
index 95a71ac2..1107b58c 100644
--- a/client/src/components/ChallengeList.vue
+++ b/client/src/components/ChallengeList.vue
@@ -1,44 +1,92 @@
 <template lang="pug">
 div
-  table
+  table(v-if="challenges.length > 0")
     thead
       tr
         th {{ st.tr["Variant"] }}
-        th {{ st.tr["From"] }}
-        th {{ st.tr["To"] }}
+        th {{ st.tr["With"] }}
         th {{ st.tr["Cadence"] }}
+        th {{ st.tr["Random?"] }}
     tbody
-      tr(v-for="c in sortedChallenges" @click="$emit('click-challenge',c)")
-        td(data-label="Variant") {{ c.vname }}
-        td(data-label="From") {{ c.from.name || "@nonymous" }}
-        td(data-label="To") {{ c.to }}
-        td(data-label="Cadence") {{ c.cadence }}
+      tr(
+        v-for="c in sortedChallenges"
+        :class="{toyou:c.priority==1,fromyou:c.priority==2}"
+        @click="$emit('click-challenge',c)"
+      )
+        td {{ c.vname }}
+        td {{ withWho(c) }}
+        td {{ c.cadence }}
+        td(:class="getRandomnessClass(c)")
+  p(v-else)
+    | {{ st.tr["No challenges found :( Click on 'New game'!"] }}
 </template>
 
 <script>
 import { store } from "@/store";
-
 export default {
   name: "my-challenge-list",
   props: ["challenges"],
   data: function() {
     return {
-      st: store.state,
+      st: store.state
     };
   },
   computed: {
     sortedChallenges: function() {
-      // Show in order: challenges I sent, challenges I received, other challenges
+      // Show in order:
+      // challenges I sent, challenges I received, other challenges
+      let minAdded = Number.MAX_SAFE_INTEGER;
+      let maxAdded = 0;
       let augmentedChalls = this.challenges.map(c => {
         let priority = 0;
-        if (c.to == this.st.user.name)
-          priority = 1;
-        else if (c.from.id == this.st.user.id || c.from.sid == this.st.user.sid)
+        if (!!c.to && c.to == this.st.user.name) priority = 1;
+        else if (
+          c.from.sid == this.st.user.sid ||
+          (c.from.id > 0 && c.from.id == this.st.user.id)
+        ) {
           priority = 2;
-        return Object.assign({}, c, {priority: priority});
+        }
+        if (c.added < minAdded) minAdded = c.added;
+        if (c.added > maxAdded) maxAdded = c.added;
+        return Object.assign({}, c, { priority: priority });
       });
-      return augmentedChalls.sort((c1,c2) => { return c2.priority - c1.priority; });
-    },
+      const deltaAdded = maxAdded - minAdded;
+      return augmentedChalls.sort((c1, c2) => {
+        return c2.priority - c1.priority + (c2.added - c1.added) / deltaAdded;
+      });
+    }
   },
+  methods: {
+    withWho: function(c) {
+      if (c.from.sid == this.st.user.sid || c.from.id == this.st.user.id)
+        return c.to || this.st.tr["Any player"];
+      return c.from.name || "@nonymous";
+    },
+    getRandomnessClass: function(c) {
+      return {
+        ["random-" + c.randomness]: true
+      };
+    }
+  }
 };
 </script>
+
+<style lang="sass" scoped>
+p
+  text-align: center
+  font-weight: bold
+
+// NOTE: the style applied to <tr> element doesn't work
+tr.fromyou > td
+  font-style: italic
+tr.toyou > td
+  background-color: #fcd785
+
+tr > td:last-child
+  &.random-0
+    background-color: #FF5733
+  &.random-1
+    background-color: #2B63B4
+  &.random-2
+    background-color: #33B42B
+</style>