X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fviews%2FMyGames.vue;h=52e6dc3beb9041beca07ec60f7fb84c4dbe47fbf;hb=1ef65040168ab7d55ce921abc9d63644a937d689;hp=1e1c9e7cb420ea5d5c6fc4ada911b77e5e3f74b1;hpb=7ebc0408a76b4a966273190a2ade49e0f97099be;p=vchess.git

diff --git a/client/src/views/MyGames.vue b/client/src/views/MyGames.vue
index 1e1c9e7c..52e6dc3b 100644
--- a/client/src/views/MyGames.vue
+++ b/client/src/views/MyGames.vue
@@ -7,6 +7,8 @@ main
           | {{ st.tr["Live games"] }}
         button.tabbtn#corrGames(@click="setDisplay('corr',$event)")
           | {{ st.tr["Correspondance games"] }}
+        button.tabbtn#importGames(@click="setDisplay('import',$event)")
+          | {{ st.tr["Imported games"] }}
       GameList(
         ref="livegames"
         v-show="display=='live'"
@@ -21,6 +23,16 @@ main
         @show-game="showGame"
         @abortgame="abortGame"
       )
+      UploadGame(
+        v-show="display=='import'"
+        @game-uploaded="addGameImport"
+      )
+      GameList(
+        v-show="display=='import'"
+        ref="importgames"
+        :games="importGames"
+        @show-game="showGame"
+      )
       button#loadMoreBtn(
         v-show="hasMore[display]"
         @click="loadMore(display)"
@@ -31,15 +43,18 @@ main
 <script>
 import { store } from "@/store";
 import { GameStorage } from "@/utils/gameStorage";
+import { ImportgameStorage } from "@/utils/importgameStorage";
 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";
+import UploadGame from "@/components/UploadGame.vue";
 export default {
   name: "my-my-games",
   components: {
-    GameList
+    GameList,
+    UploadGame
   },
   data: function() {
     return {
@@ -47,15 +62,22 @@ export default {
       display: "live",
       liveGames: [],
       corrGames: [],
+      importGames: [],
       // timestamp of last showed (oldest) game:
       cursor: {
         live: Number.MAX_SAFE_INTEGER,
+        "import": Number.MAX_SAFE_INTEGER,
         corr: Number.MAX_SAFE_INTEGER
       },
       // hasMore == TRUE: a priori there could be more games to load
-      hasMore: { live: true, corr: store.state.user.id > 0 },
+      hasMore: {
+        live: true,
+        "import": true,
+        corr: (store.state.user.id > 0)
+      },
       conn: null,
-      connexionString: ""
+      connexionString: "",
+      socketCloseListener: 0
     };
   },
   watch: {
@@ -68,17 +90,24 @@ export default {
     // Initialize connection
     this.connexionString =
       params.socketUrl +
-      "/?sid=" +
-      this.st.user.sid +
-      "&id=" +
-      this.st.user.id +
-      "&tmpId=" +
-      getRandString() +
+      "/?sid=" + this.st.user.sid +
+      "&id=" + this.st.user.id +
+      "&tmpId=" + getRandString() +
       "&page=" +
       encodeURIComponent(this.$route.path);
     this.conn = new WebSocket(this.connexionString);
     this.conn.onmessage = this.socketMessageListener;
-    this.conn.onclose = this.socketCloseListener;
+    this.socketCloseListener = setInterval(
+      () => {
+        if (this.conn.readyState == 3) {
+          // Connexion is closed: re-open
+          this.conn.removeEventListener("message", this.socketMessageListener);
+          this.conn = new WebSocket(this.connexionString);
+          this.conn.addEventListener("message", this.socketMessageListener);
+        }
+      },
+      1000
+    );
   },
   mounted: function() {
     const adjustAndSetDisplay = () => {
@@ -124,12 +153,19 @@ export default {
               // Now ask completed games (partial list)
               this.loadMore(
                 "live",
-                () => this.loadMore("corr", adjustAndSetDisplay)
+                () => this.loadMore("corr", () => {
+                  this.loadMore("import", adjustAndSetDisplay);
+                })
               );
             }
           }
         );
-      } else this.loadMore("live", adjustAndSetDisplay);
+      }
+      else {
+        this.loadMore("live", () => {
+          this.loadMore("import", adjustAndSetDisplay);
+        });
+      }
     });
   },
   beforeDestroy: function() {
@@ -137,9 +173,9 @@ export default {
   },
   methods: {
     cleanBeforeDestroy: function() {
+      clearInterval(this.socketCloseListener);
       window.removeEventListener("beforeunload", this.cleanBeforeDestroy);
       this.conn.removeEventListener("message", this.socketMessageListener);
-      this.conn.removeEventListener("close", this.socketCloseListener);
       this.conn.send(JSON.stringify({code: "disconnect"}));
       this.conn = null;
     },
@@ -149,14 +185,28 @@ export default {
       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");
+      for (let t of ["live","corr","import"]) {
+        if (t != type)
+          document.getElementById(t + "Games").classList.remove("active");
+      }
+    },
+    addGameImport(game) {
+      game.type = "import";
+      ImportgameStorage.add(game, (err) => {
+        if (!!err) {
+          if (err.message.indexOf("Key already exists") < 0) {
+            alert(this.st.tr["An error occurred. Try again!"]);
+            return;
+          }
+          else alert(this.st.tr["The game was already imported"]);
+        }
+        this.$router.push("/game/" + game.id);
+      });
     },
     tryShowNewsIndicator: function(type) {
       if (
-        (type == "live" && this.display == "corr") ||
-        (type == "corr" && this.display == "live")
+        (type == "live" && this.display != "live") ||
+        (type == "corr" && this.display != "corr")
       ) {
         document
           .getElementById(type + "Games")
@@ -182,6 +232,7 @@ export default {
     socketMessageListener: function(msg) {
       if (!this.conn) return;
       const data = JSON.parse(msg.data);
+      // NOTE: no imported games here
       let gamesArrays = {
         "corr": this.corrGames,
         "live": this.liveGames
@@ -231,13 +282,8 @@ export default {
         }
       }
     },
-    socketCloseListener: function() {
-      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) {
+      if (game.type != "corr" || !game.myTurn) {
         this.$router.push("/game/" + game.id);
         return;
       }
@@ -274,6 +320,7 @@ export default {
           );
         }
       }
+      // NOTE: no imported games here
       else if (!game.deletedByWhite || !game.deletedByBlack) {
         // Set score if game isn't deleted on server:
         ajax(
@@ -312,11 +359,12 @@ export default {
             }
           }
         );
-      } else if (type == "live") {
+      }
+      else if (type == "live") {
         GameStorage.getNext(this.cursor["live"], localGames => {
           const L = localGames.length;
           if (L > 0) {
-            // Add "-1" because IDBKeyRange.upperBound seems to include boundary
+            // Add "-1" because IDBKeyRange.upperBound includes boundary
             this.cursor["live"] = localGames[L - 1].created - 1;
             localGames.forEach(g => g.type = "live");
             this.decorate(localGames);
@@ -325,6 +373,18 @@ export default {
           if (!!cb) cb();
         });
       }
+      else if (type == "import") {
+        ImportgameStorage.getNext(this.cursor["import"], importGames => {
+          const L = importGames.length;
+          if (L > 0) {
+            // Add "-1" because IDBKeyRange.upperBound includes boundary
+            this.cursor["import"] = importGames[L - 1].created - 1;
+            importGames.forEach(g => g.type = "import");
+            this.importGames = this.importGames.concat(importGames);
+          } else this.hasMore["import"] = false;
+          if (!!cb) cb();
+        });
+      }
     }
   }
 };