X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fcomponents%2FChallengeList.vue;h=a1c46cdc400da3d4fe42854048a8e9af664e2d7f;hb=902378e6276422d38b45f7d79282c2462f1124b1;hp=f6d3090e0206dca954be463b7c6338e799516539;hpb=2f258c37c19c5be20ec68695ddfaec2c21f7f0ae;p=vchess.git

diff --git a/client/src/components/ChallengeList.vue b/client/src/components/ChallengeList.vue
index f6d3090e..a1c46cdc 100644
--- a/client/src/components/ChallengeList.vue
+++ b/client/src/components/ChallengeList.vue
@@ -1,16 +1,24 @@
 <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["Options"] }}
     tbody
-      tr(v-for="c in sortedChallenges" :class="{toyou:c.priority==1,fromyou:c.priority==2}" @click="$emit('click-challenge',c)")
+      tr(
+        v-for="c in sortedChallenges"
+        :class="{toyou:c.priority==1,fromyou:c.priority==2}"
+        @click="$emit('click-challenge',c)"
+      )
         td {{ c.vname }}
-        td {{ c.from.name || "@nonymous" }}
+        td {{ withWho(c) }}
         td {{ c.cadence }}
+        td(:class="getRandomnessClass(c)") {{ c.options.abridged || '' }}
+  p(v-else)
+    | {{ st.tr["No challenges found :( Click on 'New game'!"] }}
 </template>
 
 <script>
@@ -20,39 +28,69 @@ export default {
   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
-      let minAdded = Number.MAX_SAFE_INTEGER
-      let maxAdded = 0
+      // 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)
+        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;
-        if (c.added < minAdded)
-          minAdded = c.added;
-        if (c.added > maxAdded)
-          maxAdded = c.added
-        return Object.assign({}, c, {priority: priority});
+        }
+        if (c.added < minAdded) minAdded = c.added;
+        if (c.added > maxAdded) maxAdded = c.added;
+        return Object.assign({ priority: priority }, c);
       });
       const deltaAdded = maxAdded - minAdded;
-      return augmentedChalls.sort((c1,c2) => {
+      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";
+    },
+    // TODO: duplicated from Hall
+    getRandomnessClass: function(c) {
+      const opts = c.options;
+      if (opts.randomness === undefined && opts.random === undefined)
+        return {};
+      if (opts.randomness !== undefined)
+        return { ["random-" + opts.randomness]: true };
+      return { ["random-" + (opts.random ? 2 : 0)]: true };
+    }
+  }
 };
 </script>
 
 <style lang="sass" scoped>
-// TODO: understand why the style applied to <tr> element doesn't work
+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: #FEAF9E
+  &.random-1
+    background-color: #9EB2FE
+  &.random-2
+    background-color: #A5FE9E
 </style>