Fix README, TODO and a mistake in MyGames

[vchess.git] / client / src / views / MyGames.vue

diff --git a/client/src/views/MyGames.vue b/client/src/views/MyGames.vue
index 5d19e7d..bcf7d18 100644 (file)
--- a/client/src/views/MyGames.vue
+++ b/client/src/views/MyGames.vue
@@ -43,10 +43,6 @@ export default {
   },
   created: function() {
     GameStorage.getAll(true, localGames => {
-
-
-console.log(localGames);
-
       localGames.forEach(g => (g.type = this.classifyObject(g)));
       this.liveGames = localGames;
     });
@@ -91,13 +87,40 @@ console.log(localGames);
     classifyObject: function(o) {
       return o.cadence.indexOf("d") === -1 ? "live" : "corr";
     },
-    showGame: function(g) {
-      this.$router.push("/game/" + g.id);
+    showGame: function(game) {
+      // TODO: "isMyTurn" is duplicated (see GameList component). myColor also
+      const isMyTurn = (g) => {
+        if (g.score != "*") return false;
+        const myColor =
+          g.players[0].uid == this.st.user.id ||
+          g.players[0].sid == this.st.user.sid
+            ? "w"
+            : "b";
+        const rem = g.movesCount % 2;
+        return (
+          (rem == 0 && myColor == "w") ||
+          (rem == 1 && myColor == "b")
+        );
+      };
+      if (game.type == "live" || !isMyTurn(game)) {
+        this.$router.push("/game/" + game.id);
+        return;
+      }
+      // It's my turn in this game. Are there others?
+      let nextIds = "";
+      let otherCorrGamesMyTurn = this.corrGames.filter(
+        g => g.id != game.id && isMyTurn(g));
+      if (otherCorrGamesMyTurn.length > 0) {
+        nextIds += "/?next=[";
+        otherCorrGamesMyTurn.forEach(g => { nextIds += g.id + ","; });
+        // Remove last comma and close array:
+        nextIds = nextIds.slice(0, -1) + "]";
+      }
+      this.$router.push("/game/" + game.id + nextIds);
     },
     socketMessageListener: function(msg) {
       const data = JSON.parse(msg.data);
-      // Only event is newmove, and received only:
-      if (data.code == "newmove") {
+      if (data.code == "changeturn") {
         let games = !!parseInt(data.gid)
           ? this.corrGames
           : this.liveGames;