Some (experimental) fixes

[vchess.git] / client / src / components / ChallengeList.vue

diff --git a/client/src/components/ChallengeList.vue b/client/src/components/ChallengeList.vue
index 5c58263..a1c46cd 100644 (file)
--- a/client/src/components/ChallengeList.vue
+++ b/client/src/components/ChallengeList.vue
@@ -6,7 +6,7 @@ div
         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"
@@ -15,8 +15,8 @@ div
       )
         td {{ c.vname }}
         td {{ withWho(c) }}
-        td(:class="getCadenceClass(c)") {{ c.cadence }}
-        td(:class="getRandomnessClass(c)")
+        td {{ c.cadence }}
+        td(:class="getRandomnessClass(c)") {{ c.options.abridged || '' }}
   p(v-else)
     | {{ st.tr["No challenges found :( Click on 'New game'!"] }}
 </template>
@@ -48,7 +48,7 @@ export default {
         }
         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) => {
@@ -62,15 +62,14 @@ export default {
         return c.to || this.st.tr["Any player"];
       return c.from.name || "@nonymous";
     },
+    // TODO: duplicated from Hall
     getRandomnessClass: function(c) {
-      return {
-        ["random-" + c.randomness]: true
-      };
-    },
-    getCadenceClass: function(c) {
-      return {
-        "simultaneous": c.cadence.indexOf("/") >= 0
-      };
+      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 };
     }
   }
 };
@@ -87,14 +86,11 @@ tr.fromyou > td
 tr.toyou > td
   background-color: #fcd785
 
-td.simultaneous
-  background-color: purple
-
 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>