X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fcomponents%2FChallengeList.vue;h=7316c266a01d4ecdae463bd46447378ccefaadd3;hb=81dd17869116f70db375597b59232fa8cb11a868;hp=7572ede11e5659d4bb90abea53ebd766b509a24b;hpb=7ba4a5bc5b64e19a1e7f26aa232d5c50770d07ad;p=vchess.git

diff --git a/client/src/components/ChallengeList.vue b/client/src/components/ChallengeList.vue
index 7572ede1..7316c266 100644
--- a/client/src/components/ChallengeList.vue
+++ b/client/src/components/ChallengeList.vue
@@ -1,12 +1,12 @@
 <template lang="pug">
 div
-  table
+  table(v-if="challenges.length > 0")
     thead
       tr
         th {{ st.tr["Variant"] }}
         th {{ st.tr["With"] }}
         th {{ st.tr["Cadence"] }}
-        th {{ st.tr["Random?"] }}
+        th {{ st.tr["Options"] }}
     tbody
       tr(
         v-for="c in sortedChallenges"
@@ -16,7 +16,9 @@ div
         td {{ c.vname }}
         td {{ withWho(c) }}
         td {{ c.cadence }}
-        td(:class="getRandomnessClass(c)")
+        td(:class="getRandomnessClass(c)") {{ c.options.abridged || '' }}
+  p(v-else)
+    | {{ st.tr["No challenges found :( Click on 'New game'!"] }}
 </template>
 
 <script>
@@ -31,17 +33,22 @@ 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 });
+        return Object.assign({ priority: priority }, c);
       });
       const deltaAdded = maxAdded - minAdded;
       return augmentedChalls.sort((c1, c2) => {
@@ -56,8 +63,9 @@ export default {
       return c.from.name || "@nonymous";
     },
     getRandomnessClass: function(c) {
+      if (!Number.isInteger(c.options.randomness)) return {};
       return {
-        ["random-" + c.randomness]: true
+        ["random-" + c.options.randomness]: true
       };
     }
   }
@@ -65,6 +73,10 @@ export default {
 </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
@@ -73,9 +85,9 @@ tr.toyou > td
 
 tr > td:last-child
   &.random-0
-    background-color: #FF5733
+    background-color: #FEAF9E
   &.random-1
-    background-color: #2B63B4
+    background-color: #9EB2FE
   &.random-2
-    background-color: #33B42B
+    background-color: #A5FE9E
 </style>