X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fcomponents%2FGameList.vue;h=5ab61cc3d1908d152bc57c9e497bbe76313056f0;hb=41c80bb63b85b2696d3925c10784c3d7bb5d2aa3;hp=bb97a74278eebcf69f21a54cac5acd2a66c7a38f;hpb=9d58ef95e3affd799571838164f7c5bbfda11f64;p=vchess.git

diff --git a/client/src/components/GameList.vue b/client/src/components/GameList.vue
index bb97a742..5ab61cc3 100644
--- a/client/src/components/GameList.vue
+++ b/client/src/components/GameList.vue
@@ -1,28 +1,65 @@
 <template lang="pug">
-table
-  tr
-    th Variant
-    th Players names
-    th Cadence
-    th(v-if="showResult") Result
-    th(v-else) Moves count
-  tr(v-for="g in games" @click="$emit('show-game',g)")
-    td {{ g.vname }}
-    td
-      span(v-for="p in g.players") {{ p.name }}
-    td {{ g.mainTime }} + {{ g.increment }}
-    td(v-if="showResult") {{ g.score }}
-    td(v-else) {{ g.movesCount }}
+div
+  table
+    thead
+      tr
+        th Variant
+        th White
+        th Black
+        th Time control
+        th(v-if="showResult") Result
+    tbody
+      tr(v-for="g in sortedGames" @click="$emit('show-game',g)"
+          :class="{'my-turn': g.myTurn}")
+        td(data-label="Variant") {{ g.vname }}
+        td(data-label="White") {{ g.players[0].name || "@nonymous" }}
+        td(data-label="Black") {{ g.players[1].name || "@nonymous" }}
+        td(data-label="Time control") {{ g.timeControl }}
+        td(v-if="showResult" data-label="Result") {{ g.score }}
 </template>
 
 <script>
+import { store } from "@/store";
+
 export default {
   name: "my-game-list",
 	props: ["games"],
+  data: function() {
+    return {
+      st: store.state,
+      showResult: false,
+    };
+  },
 	computed: {
-		showResult: function() {
-			return this.games.length > 0 && this.games[0].score != "*";
-		},
-	},
+    sortedGames: function() {
+      // Show in order: games where it's my turn, my running games, my games, other games
+      this.showResult = this.games.some(g => g.score != "*");
+      let augmentedGames = this.games.map(g => {
+        let priority = 0;
+        if (g.players.some(p => p.uid == this.st.user.id || p.sid == this.st.user.sid))
+        {
+          priority++;
+          if (g.score == "*")
+          {
+            priority++;
+            const myColor = g.players[0].uid == this.st.user.id
+                || g.players[0].sid == this.st.user.sid
+              ? "w"
+              : "b";
+            if (!!g.fen.match(" " + myColor + " "))
+              priority++;
+          }
+        }
+        return Object.assign({}, g, {priority: priority, myTurn: priority==3});
+      });
+      return augmentedGames.sort((g1,g2) => { return g2.priority - g1.priority; });
+    },
+  },
 };
 </script>
+
+<style lang="sass" scoped>
+// TODO: understand why the style applied to <tr> element doesn't work
+tr.my-turn > td
+  background-color: #fcd785
+</style>