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

diff --git a/client/src/components/ChallengeList.vue b/client/src/components/ChallengeList.vue
index f94cb71e..f6d3090e 100644
--- a/client/src/components/ChallengeList.vue
+++ b/client/src/components/ChallengeList.vue
@@ -5,19 +5,16 @@ div
       tr
         th {{ st.tr["Variant"] }}
         th {{ st.tr["From"] }}
-        th {{ st.tr["To"] }}
         th {{ st.tr["Cadence"] }}
     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.timeControl }}
+      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 {{ c.cadence }}
 </template>
 
 <script>
 import { store } from "@/store";
-
 export default {
   name: "my-challenge-list",
   props: ["challenges"],
@@ -29,16 +26,33 @@ export default {
   computed: {
     sortedChallenges: function() {
       // 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)
+        if (!!c.to && c.to == this.st.user.name)
           priority = 1;
-        else if (c.from.id == this.st.user.id || c.from.sid == this.st.user.sid)
+        else if (c.from.sid == this.st.user.sid || 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 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;
+      });
     },
   },
 };
 </script>
+
+<style lang="sass" scoped>
+// TODO: understand why the style applied to <tr> element doesn't work
+tr.fromyou > td
+  font-style: italic
+tr.toyou > td
+  background-color: #fcd785
+</style>