X-Git-Url: https://git.auder.net/img/rock_paper_scissors_lizard_spock.gif?a=blobdiff_plain;f=client%2Fsrc%2Fcomponents%2FGameList.vue;h=a90905507b02d9642afc9e9b2ecc36dc9488f47e;hb=603b8a8b4a854efb168953da70e7b43ae99b50d9;hp=bf9c8ffc3125169b31436479c6139795703cef71;hpb=41cb9b940084d6f56351a772f0340ebf0bc8d1bc;p=vchess.git

diff --git a/client/src/components/GameList.vue b/client/src/components/GameList.vue
index bf9c8ffc..a9090550 100644
--- a/client/src/components/GameList.vue
+++ b/client/src/components/GameList.vue
@@ -1,28 +1,63 @@
 <template lang="pug">
-table
-  tr
-    th Variant
-    th White
-    th Black
-    th Time control
-    th(v-if="showResult") Result
-  // TODO: show my games first (st.user.id or sid)
-  tr(v-for="g in games" @click="$emit('show-game',g)")
-    td {{ g.vname }}
-    td {{ g.players[0].name || "@nonymous" }}
-    td {{ g.players[1].name || "@nonymous" }}
-    td {{ g.timeControl }}
-    td(v-if="showResult") {{ g.score }}
+div
+  table
+    tr
+      th Variant
+      th White
+      th Black
+      th Time control
+      th(v-if="showResult") Result
+    tr(v-for="g in sortedGames" @click="$emit('show-game',g)"
+        :class="{'my-turn': g.myTurn}")
+      td {{ g.vname }}
+      td {{ g.players[0].name || "@nonymous" }}
+      td {{ g.players[1].name || "@nonymous" }}
+      td {{ g.timeControl }}
+      td(v-if="showResult") {{ 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.some(g => g.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==2});
+      });
+      return augmentedGames.sort((g1,g2) => { return g2.priority - g1.priority; });
+    },
+  },
 };
 </script>
+
+<style scoped lang="sass">
+.my-turn
+  // TODO: the style doesn't work... why?
+  background-color: orange
+</style>