X-Git-Url: https://git.auder.net/?p=vchess.git;a=blobdiff_plain;f=client%2Fsrc%2Fviews%2FMyGames.vue;h=628d72ebbcbb1ac6c5a3f914a3b68b545785c940;hp=5d19e7d70980a7694fe01286dcb29ad7c86807be;hb=0234201fb338fc239d6f613c677fa932c7c3697c;hpb=1aaae6ce703d43ccf4328da9b6b4dca4ed67289a

diff --git a/client/src/views/MyGames.vue b/client/src/views/MyGames.vue
index 5d19e7d7..628d72eb 100644
--- a/client/src/views/MyGames.vue
+++ b/client/src/views/MyGames.vue
@@ -8,21 +8,31 @@ main
         button.tabbtn#corrGames(@click="setDisplay('corr',$event)")
           | {{ st.tr["Correspondance games"] }}
       GameList(
+        ref="livegames"
         v-show="display=='live'"
         :games="liveGames"
         @show-game="showGame"
+        @abortgame="abortGame"
       )
-      GameList(
-        v-show="display=='corr'"
-        :games="corrGames"
-        @show-game="showGame"
-      )
+      div(v-show="display=='corr'")
+        GameList(
+          ref="corrgames"
+          :games="corrGames"
+          @show-game="showGame"
+          @abortgame="abortGame"
+        )
+        button#loadMoreBtn(
+          v-if="hasMore"
+          @click="loadMore()"
+        )
+          | {{ st.tr["Load more"] }}
 </template>
 
 <script>
 import { store } from "@/store";
 import { GameStorage } from "@/utils/gameStorage";
 import { ajax } from "@/utils/ajax";
+import { getScoreMessage } from "@/utils/scoring";
 import params from "@/parameters";
 import { getRandString } from "@/utils/alea";
 import GameList from "@/components/GameList.vue";
@@ -37,30 +47,22 @@ export default {
       display: "live",
       liveGames: [],
       corrGames: [],
+      // timestamp of last showed (oldest) corr game:
+      cursor: Number.MAX_SAFE_INTEGER,
+      // hasMore == TRUE: a priori there could be more games to load
+      hasMore: true,
       conn: null,
       connexionString: ""
     };
   },
   created: function() {
-    GameStorage.getAll(true, localGames => {
-
-
-console.log(localGames);
-
-      localGames.forEach(g => (g.type = this.classifyObject(g)));
-      this.liveGames = localGames;
-    });
-    if (this.st.user.id > 0) {
-      ajax("/games", "GET", { uid: this.st.user.id }, res => {
-        res.games.forEach(g => (g.type = this.classifyObject(g)));
-        this.corrGames = res.games;
-      });
-    }
     // Initialize connection
     this.connexionString =
       params.socketUrl +
       "/?sid=" +
       this.st.user.sid +
+      "&id=" +
+      this.st.user.id +
       "&tmpId=" +
       getRandString() +
       "&page=" +
@@ -70,8 +72,66 @@ console.log(localGames);
     this.conn.onclose = this.socketCloseListener;
   },
   mounted: function() {
-    const showType = localStorage.getItem("type-myGames") || "live";
-    this.setDisplay(showType);
+    const adjustAndSetDisplay = () => {
+      // showType is the last type viwed by the user (default)
+      let showType = localStorage.getItem("type-myGames") || "live";
+      // Live games, my turn: highest priority:
+      if (this.liveGames.some(g => !!g.myTurn)) showType = "live";
+      // Then corr games, my turn:
+      else if (this.corrGames.some(g => !!g.myTurn)) showType = "corr";
+      else {
+        // If a listing is empty, try showing the other (if non-empty)
+        const types = ["corr", "live"];
+        for (let i of [0,1]) {
+          if (
+            this[types[i] + "Games"].length > 0 &&
+            this[types[1-i] + "Games"].length == 0
+          ) {
+            showType = types[i];
+          }
+        }
+      }
+      this.setDisplay(showType);
+    };
+    GameStorage.getAll(localGames => {
+      localGames.forEach(g => g.type = "live");
+      this.decorate(localGames);
+      this.liveGames = localGames;
+      if (this.st.user.id > 0) {
+        // Ask running corr games first
+        ajax(
+          "/runninggames",
+          "GET",
+          {
+            success: (res) => {
+              // These games are garanteed to not be deleted
+              this.corrGames = res.games;
+              this.corrGames.forEach(g => g.type = "corr");
+              this.decorate(this.corrGames);
+              // Now ask completed games (partial list)
+              ajax(
+                "/completedgames",
+                "GET",
+                {
+                  data: { cursor: this.cursor },
+                  success: (res2) => {
+                    if (res2.games.length > 0) {
+                      const L = res2.games.length;
+                      this.cursor = res2.games[L - 1].created;
+                      let completedGames = res2.games;
+                      completedGames.forEach(g => g.type = "corr");
+                      this.decorate(completedGames);
+                      this.corrGames = this.corrGames.concat(completedGames);
+                      adjustAndSetDisplay();
+                    }
+                  }
+                }
+              );
+            }
+          }
+        );
+      } else adjustAndSetDisplay();
+    });
   },
   beforeDestroy: function() {
     this.conn.send(JSON.stringify({code: "disconnect"}));
@@ -87,30 +147,80 @@ console.log(localGames);
         elt.previousElementSibling.classList.remove("active");
       else elt.nextElementSibling.classList.remove("active");
     },
-    // TODO: classifyObject is redundant (see Hall.vue)
-    classifyObject: function(o) {
-      return o.cadence.indexOf("d") === -1 ? "live" : "corr";
+    tryShowNewsIndicator: function(type) {
+      if (
+        (type == "live" && this.display == "corr") ||
+        (type == "corr" && this.display == "live")
+      ) {
+        document
+          .getElementById(type + "Games")
+          .classList.add("somethingnew");
+      }
     },
-    showGame: function(g) {
-      this.$router.push("/game/" + g.id);
+    // Called at loading to augment games with myColor + myTurn infos
+    decorate: function(games) {
+      games.forEach(g => {
+        g.myColor =
+          (g.type == "corr" && g.players[0].id == this.st.user.id) ||
+          (g.type == "live" && g.players[0].sid == this.st.user.sid)
+            ? 'w'
+            : 'b';
+        // If game is over, myTurn doesn't exist:
+        if (g.score == "*") {
+          const rem = g.movesCount % 2;
+          if ((rem == 0 && g.myColor == 'w') || (rem == 1 && g.myColor == 'b'))
+            g.myTurn = true;
+        }
+      });
     },
     socketMessageListener: function(msg) {
       const data = JSON.parse(msg.data);
-      // Only event is newmove, and received only:
-      if (data.code == "newmove") {
-        let games = !!parseInt(data.gid)
-          ? this.corrGames
-          : this.liveGames;
-        // NOTE: new move itself is not received, because it wouldn't be used.
-        let g = games.find(g => g.id == data.gid);
-        this.$set(g, "movesCount", g.movesCount + 1);
-        if (
-          (g.type == "live" && this.display == "corr") ||
-          (g.type == "corr" && this.display == "live")
-        ) {
-          document
-            .getElementById(g.type + "Games")
-            .classList.add("somethingnew");
+      let gamesArrays = {
+        "corr": this.corrGames,
+        "live": this.liveGames
+      };
+      switch (data.code) {
+        case "notifyturn":
+        case "notifyscore": {
+          const info = data.data;
+          const type = (!!parseInt(info.gid) ? "corr" : "live");
+          let game = gamesArrays[type].find(g => g.id == info.gid);
+          // "notifything" --> "thing":
+          const thing = data.code.substr(6);
+          game[thing] = info[thing];
+          if (thing == "turn") {
+            game.myTurn = !game.myTurn;
+            if (game.myTurn) this.tryShowNewsIndicator(type);
+          }
+          // TODO: forcing refresh like that is ugly and wrong.
+          //       How to do it cleanly?
+          this.$refs[type + "games"].$forceUpdate();
+          break;
+        }
+        case "notifynewgame": {
+          const gameInfo = data.data;
+          // st.variants might be uninitialized,
+          // if unlucky and newgame right after connect:
+          const v = this.st.variants.find(v => v.id == gameInfo.vid);
+          const vname = !!v ? v.name : "";
+          const type = (gameInfo.cadence.indexOf('d') >= 0 ? "corr": "live");
+          let game = Object.assign(
+            {
+              vname: vname,
+              type: type,
+              score: "*",
+              created: Date.now()
+            },
+            gameInfo
+          );
+          game.myTurn =
+            (type == "corr" && game.players[0].id == this.st.user.id) ||
+            (type == "live" && game.players[0].sid == this.st.user.sid);
+          gamesArrays[type].push(game);
+          if (game.myTurn) this.tryShowNewsIndicator(type);
+          // TODO: cleaner refresh
+          this.$refs[type + "games"].$forceUpdate();
+          break;
         }
       }
     },
@@ -118,6 +228,78 @@ console.log(localGames);
       this.conn = new WebSocket(this.connexionString);
       this.conn.addEventListener("message", this.socketMessageListener);
       this.conn.addEventListener("close", this.socketCloseListener);
+    },
+    showGame: function(game) {
+      if (game.type == "live" || !game.myTurn) {
+        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 && !!g.myTurn);
+      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);
+    },
+    abortGame: function(game) {
+      // Special "trans-pages" case: from MyGames to Game
+      // TODO: also for corr games? (It's less important)
+      if (game.type == "live") {
+        const oppsid =
+          game.players[0].sid == this.st.user.sid
+            ? game.players[1].sid
+            : game.players[0].sid;
+        this.conn.send(
+          JSON.stringify(
+            {
+              code: "mabort",
+              gid: game.id,
+              // NOTE: target might not be online
+              target: oppsid
+            }
+          )
+        );
+      }
+      else if (!game.deletedByWhite || !game.deletedByBlack) {
+        // Set score if game isn't deleted on server:
+        ajax(
+          "/games",
+          "PUT",
+          {
+            data: {
+              gid: game.id,
+              newObj: {
+                score: "?",
+                scoreMsg: getScoreMessage("?")
+              }
+            }
+          }
+        );
+      }
+    },
+    loadMore: function() {
+      ajax(
+        "/completedgames",
+        "GET",
+        {
+          data: { cursor: this.cursor },
+          success: (res) => {
+            if (res.games.length > 0) {
+              const L = res.games.length;
+              this.cursor = res.games[L - 1].created;
+              let moreGames = res.games;
+              moreGames.forEach(g => g.type = "corr");
+              this.decorate(moreGames);
+              this.corrGames = this.corrGames.concat(moreGames);
+            } else this.hasMore = false;
+          }
+        }
+      );
     }
   }
 };
@@ -133,6 +315,10 @@ console.log(localGames);
 table.game-list
   max-height: 100%
 
+button#loadMoreBtn
+  margin-top: 0
+  margin-bottom: 0
+
 .somethingnew
   background-color: #c5fefe !important
 </style>