| {{ 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'"
@show-game="showGame"
@abortgame="abortGame"
)
+ UploadGame(
+ v-show="display=='import'"
+ @game-uploaded="addGameImport"
+ )
+ GameList(
+ v-show="display=='import'"
+ ref="importgames"
+ :games="importGames"
+ :show-both="true"
+ @show-game="showGame"
+ )
button#loadMoreBtn(
v-show="hasMore[display]"
@click="loadMore(display)"
<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 {
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: true },
+ hasMore: {
+ live: true,
+ "import": true,
+ corr: (store.state.user.id > 0)
+ },
conn: null,
- connexionString: ""
+ connexionString: "",
+ socketCloseListener: 0
};
},
watch: {
// 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 = () => {
// Now ask completed games (partial list)
this.loadMore(
"live",
- () => this.loadMore("corr", adjustAndSetDisplay)
+ () => this.loadMore("corr", () => {
+ this.loadMore("import", adjustAndSetDisplay);
+ })
);
}
}
);
- } else {
- this.loadMore(
- "live",
- () => this.loadMore("corr", adjustAndSetDisplay)
- );
+ }
+ else {
+ this.loadMore("live", () => {
+ this.loadMore("import", adjustAndSetDisplay);
+ });
}
});
},
},
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;
},
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;
+ }
+ // NOTE: since a random new ID is generated for imported games,
+ // this error will not occur.
+ 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")
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
}
}
},
- 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;
}
);
}
}
+ // NOTE: no imported games here
else if (!game.deletedByWhite || !game.deletedByBlack) {
// Set score if game isn't deleted on server:
ajax(
}
},
loadMore: function(type, cb) {
- if (type == "corr") {
+ if (type == "corr" && this.st.user.id > 0) {
ajax(
"/completedgames",
"GET",
}
}
);
- } 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);
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();
+ });
+ }
}
}
};
</script>
-<style lang="sass">
+<style lang="sass" scoped>
.active
- color: #42a983
+ color: #388e3c
.tabbtn
background-color: #f9faee
-table.game-list
- max-height: 100%
-
button#loadMoreBtn
display: block
margin: 0 auto
.somethingnew
- background-color: #c5fefe !important
+ background-color: #90C4EC !important
+</style>
+
+<!-- Not scoped because acting on GameList -->
+<style lang="sass">
+table.game-list
+ max-height: 100%
</style>
projects / vchess.git / blobdiff