X-Git-Url: https://git.auder.net/css/rpsls.css?a=blobdiff_plain;f=client%2Fsrc%2Fcomponents%2FChallengeList.vue;h=5c582631b07d4f622a72b2a82852fc1fc620ce76;hb=2fb22896fd3a519c6864cd5a5d97326bad376634;hp=ed490671db3ce1a4c028f6d84784edc826c73637;hpb=910d631b73cad5ffef1b4461157b704e7e7057d8;p=vchess.git

diff --git a/client/src/components/ChallengeList.vue b/client/src/components/ChallengeList.vue
index ed490671..5c582631 100644
--- a/client/src/components/ChallengeList.vue
+++ b/client/src/components/ChallengeList.vue
@@ -1,11 +1,12 @@
 <template lang="pug">
 div
-  table
+  table(v-if="challenges.length > 0")
     thead
       tr
         th {{ st.tr["Variant"] }}
-        th {{ st.tr["From"] }}
+        th {{ st.tr["With"] }}
         th {{ st.tr["Cadence"] }}
+        th {{ st.tr["Random?"] }}
     tbody
       tr(
         v-for="c in sortedChallenges"
@@ -13,8 +14,11 @@ div
         @click="$emit('click-challenge',c)"
       )
         td {{ c.vname }}
-        td {{ c.from.name || "@nonymous" }}
-        td {{ c.cadence }}
+        td {{ withWho(c) }}
+        td(:class="getCadenceClass(c)") {{ c.cadence }}
+        td(:class="getRandomnessClass(c)")
+  p(v-else)
+    | {{ st.tr["No challenges found :( Click on 'New game'!"] }}
 </template>
 
 <script>
@@ -29,14 +33,19 @@ export default {
   },
   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 && c.to == this.st.user.name) priority = 1;
-        else if (c.from.sid == this.st.user.sid || c.from.id == this.st.user.id)
+        else if (
+          c.from.sid == this.st.user.sid ||
+          (c.from.id > 0 && c.from.id == this.st.user.id)
+        ) {
           priority = 2;
+        }
         if (c.added < minAdded) minAdded = c.added;
         if (c.added > maxAdded) maxAdded = c.added;
         return Object.assign({}, c, { priority: priority });
@@ -46,14 +55,46 @@ export default {
         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
+      };
+    },
+    getCadenceClass: function(c) {
+      return {
+        "simultaneous": c.cadence.indexOf("/") >= 0
+      };
+    }
   }
 };
 </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
+
+td.simultaneous
+  background-color: purple
+
+tr > td:last-child
+  &.random-0
+    background-color: #FF5733
+  &.random-1
+    background-color: #2B63B4
+  &.random-2
+    background-color: #33B42B
 </style>