button.tabbtn#liveGames(@click="setDisplay('live',$event)")
| {{ st.tr["Live games"] }}
button.tabbtn#corrGames(@click="setDisplay('corr',$event)")
- | {{ st.tr["Correspondance games"] }}
+ | {{ st.tr["Correspondence 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: store.state.user.id > 0 },
+ hasMore: {
+ live: true,
+ "import": true,
+ corr: (store.state.user.id > 0)
+ },
conn: null,
connexionString: "",
socketCloseListener: 0
watch: {
$route: function(to, from) {
if (to.path != "/mygames") this.cleanBeforeDestroy();
+ },
+ // st.variants changes only once, at loading from [] to [...]
+ "st.variants": function() {
+ // Set potential games variant names + display:
+ this.liveGames.concat(this.corrGames).concat(this.importGames)
+ .forEach(o => {
+ if (!o.vname) this.setVname(o);
+ });
}
},
created: function() {
},
mounted: function() {
const adjustAndSetDisplay = () => {
- // showType is the last type viwed by the user (default)
+ // showType is the last type viewed 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";
this.corrGames.forEach(g => {
g.type = "corr";
g.score = "*";
+ g.options = JSON.parse(g.options);
});
this.decorate(this.corrGames);
// 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() {
setDisplay: function(type, e) {
this.display = type;
localStorage.setItem("type-myGames", type);
- let elt = e ? e.target : document.getElementById(type + "Games");
+ 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");
+ }
+ },
+ // TODO: duplicated from Hall.vue:
+ setVname: function(obj) {
+ const variant = this.st.variants.find(v => v.id == obj.vid);
+ if (!!variant) {
+ obj.vname = variant.name;
+ obj.vdisp = variant.display;
+ }
+ },
+ 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")
if ((rem == 0 && g.myColor == 'w') || (rem == 1 && g.myColor == 'b'))
g.myTurn = true;
}
+ this.setVname(g);
});
},
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
case "notifyturn":
case "notifyscore": {
const info = data.data;
- const type = (!!parseInt(info.gid) ? "corr" : "live");
+ const type = (!!parseInt(info.gid, 10) ? "corr" : "live");
let game = gamesArrays[type].find(g => g.id == info.gid);
// "notifything" --> "thing":
const thing = data.code.substr(6);
if (thing == "turn") {
game.myTurn = !game.myTurn;
if (game.myTurn) this.tryShowNewsIndicator(type);
- } else game.myTurn = false;
+ }
+ else game.myTurn = false;
// 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 : "";
+ let gameInfo = data.data;
+ this.setVname(gameInfo);
+ // TODO: remove patch on next line (options || "{}")
+ gameInfo.options = JSON.parse(gameInfo.options || "{}");
const type = (gameInfo.cadence.indexOf('d') >= 0 ? "corr": "live");
let game = Object.assign(
{
- vname: vname,
type: type,
score: "*",
created: Date.now()
}
},
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(
if (L > 0) {
this.cursor["corr"] = res.games[L - 1].created;
let moreGames = res.games;
- moreGames.forEach(g => g.type = "corr");
+ moreGames.forEach(g => {
+ g.type = "corr";
+ g.options = JSON.parse(g.options);
+ });
this.decorate(moreGames);
this.corrGames = this.corrGames.concat(moreGames);
- } else this.hasMore["corr"] = false;
+ }
+ else this.hasMore["corr"] = false;
if (!!cb) cb();
}
}
);
- } 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");
+ localGames.forEach(g => {
+ g.type = "live";
+ // TODO: remove patch on next line (options || "{}")
+ g.options = JSON.parse(g.options || "{}");
+ });
this.decorate(localGames);
this.liveGames = this.liveGames.concat(localGames);
- } else this.hasMore["live"] = false;
+ }
+ else this.hasMore["live"] = false;
+ 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";
+ // TODO: remove following patch (options || "{}")
+ g.options = JSON.parse(g.options || "{}");
+ this.setVname(g);
+ });
+ 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