X-Git-Url: https://git.auder.net/?p=vchess.git;a=blobdiff_plain;f=client%2Fsrc%2Fviews%2FMyGames.vue;h=bcf7d18271ad08756e708ea901b5c581a3e13d5c;hp=a8d9e1270c640b97a43878800c898566ed0de8dc;hb=620a88ede2ad25e66d9cbb521388ee53e4a564c0;hpb=41c80bb63b85b2696d3925c10784c3d7bb5d2aa3

diff --git a/client/src/views/MyGames.vue b/client/src/views/MyGames.vue
index a8d9e127..bcf7d182 100644
--- a/client/src/views/MyGames.vue
+++ b/client/src/views/MyGames.vue
@@ -3,57 +3,159 @@ main
   .row
     .col-sm-12.col-md-10.col-md-offset-1.col-lg-8.col-lg-offset-2
       .button-group
-        button(@click="display='live'") Live games
-        button(@click="display='corr'") Correspondance games
-      GameList(v-show="display=='live'" :games="filterGames('live')"
-        @show-game="showGame")
-      GameList(v-show="display=='corr'" :games="filterGames('corr')"
-        @show-game="showGame")
+        button.tabbtn#liveGames(@click="setDisplay('live',$event)")
+          | {{ st.tr["Live games"] }}
+        button.tabbtn#corrGames(@click="setDisplay('corr',$event)")
+          | {{ st.tr["Correspondance games"] }}
+      GameList(
+        v-show="display=='live'"
+        :games="liveGames"
+        @show-game="showGame"
+      )
+      GameList(
+        v-show="display=='corr'"
+        :games="corrGames"
+        @show-game="showGame"
+      )
 </template>
 
 <script>
 import { store } from "@/store";
 import { GameStorage } from "@/utils/gameStorage";
 import { ajax } from "@/utils/ajax";
+import params from "@/parameters";
+import { getRandString } from "@/utils/alea";
 import GameList from "@/components/GameList.vue";
-
 export default {
-  name: "my-games",
+  name: "my-my-games",
   components: {
-    GameList,
+    GameList
   },
   data: function() {
     return {
       st: store.state,
-			display: "live",
-      games: [],
+      display: "live",
+      liveGames: [],
+      corrGames: [],
+      conn: null,
+      connexionString: ""
     };
   },
   created: function() {
-    GameStorage.getAll((localGames) => {
-      localGames.forEach((g) => g.type = this.classifyObject(g));
-      Array.prototype.push.apply(this.games, localGames);
+    GameStorage.getAll(true, 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));
-        //Array.prototype.push.apply(this.games, res.games); //TODO: Vue 3
-        this.games = this.games.concat(res.games);
+    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 +
+      "&tmpId=" +
+      getRandString() +
+      "&page=" +
+      encodeURIComponent(this.$route.path);
+    this.conn = new WebSocket(this.connexionString);
+    this.conn.onmessage = this.socketMessageListener;
+    this.conn.onclose = this.socketCloseListener;
+  },
+  mounted: function() {
+    const showType = localStorage.getItem("type-myGames") || "live";
+    this.setDisplay(showType);
+  },
+  beforeDestroy: function() {
+    this.conn.send(JSON.stringify({code: "disconnect"}));
   },
   methods: {
-    // TODO: classifyObject and filterGames are redundant (see Hall.vue)
+    setDisplay: function(type, e) {
+      this.display = type;
+      localStorage.setItem("type-myGames", type);
+      let elt = e ? e.target : document.getElementById(type + "Games");
+      elt.classList.add("active");
+      elt.classList.remove("somethingnew"); //in case of
+      if (elt.previousElementSibling)
+        elt.previousElementSibling.classList.remove("active");
+      else elt.nextElementSibling.classList.remove("active");
+    },
+    // TODO: classifyObject is redundant (see Hall.vue)
     classifyObject: function(o) {
-      return (o.timeControl.indexOf('d') === -1 ? "live" : "corr");
+      return o.cadence.indexOf("d") === -1 ? "live" : "corr";
     },
-    filterGames: function(type) {
-      return this.games.filter(g => g.type == type);
+    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);
     },
-    showGame: function(g) {
-      this.$router.push("/game/" + g.id);
+    socketMessageListener: function(msg) {
+      const data = JSON.parse(msg.data);
+      if (data.code == "changeturn") {
+        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");
+        }
+      }
     },
-  },
+    socketCloseListener: function() {
+      this.conn = new WebSocket(this.connexionString);
+      this.conn.addEventListener("message", this.socketMessageListener);
+      this.conn.addEventListener("close", this.socketCloseListener);
+    }
+  }
 };
 </script>
+
+<style lang="sass">
+.active
+  color: #42a983
+
+.tabbtn
+  background-color: #f9faee
+
+table.game-list
+  max-height: 100%
+
+.somethingnew
+  background-color: #c5fefe !important
+</style>