X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fcomponents%2FGameList.vue;h=f85c49fe967a12b99c75ffa1eb2d398e1c0c40b2;hb=8477e53d8e78606e4c4e4bf91c77b1011aab583c;hp=77aa83e5e6bd5fffe9d8a37823988929d9d3eee3;hpb=910d631b73cad5ffef1b4461157b704e7e7057d8;p=vchess.git diff --git a/client/src/components/GameList.vue b/client/src/components/GameList.vue index 77aa83e5..f85c49fe 100644 --- a/client/src/components/GameList.vue +++ b/client/src/components/GameList.vue @@ -17,7 +17,7 @@ div td {{ player_s(g) }} td(v-if="showCadence") {{ g.cadence }} td( - :class="{finished: g.score!='*'}" + :class="scoreClass(g)" @click="deleteGame(g,$event)" ) | {{ g.score }} @@ -32,7 +32,8 @@ export default { data: function() { return { st: store.state, - showCadence: true + deleted: {}, //mark deleted games + showCadence: window.innerWidth >= 425 //TODO: arbitrary value }; }, mounted: function() { @@ -42,7 +43,7 @@ export default { if (!timeoutLaunched) { timeoutLaunched = true; setTimeout(() => { - this.showCadence = window.innerWidth >= 425; //TODO: arbitrary + this.showCadence = window.innerWidth >= 425; timeoutLaunched = false; }, 500); } @@ -53,32 +54,39 @@ export default { // Show in order: games where it's my turn, my running games, my games, other games let minCreated = Number.MAX_SAFE_INTEGER; let maxCreated = 0; - let augmentedGames = this.games.map(g => { - let priority = 0; - if ( - g.players.some( - p => p.uid == this.st.user.id || p.sid == this.st.user.sid - ) - ) { - priority++; - if (g.score == "*") { + let augmentedGames = this.games + .filter(g => !this.deleted[g.id]) + .map(g => { + let priority = 0; + let myColor = undefined; + if ( + g.players.some( + p => p.uid == this.st.user.id || p.sid == this.st.user.sid + ) + ) { priority++; - const myColor = + myColor = g.players[0].uid == this.st.user.id || g.players[0].sid == this.st.user.sid ? "w" : "b"; - // I play in this game, so g.fen will be defined - if (g.fen.match(" " + myColor + " ")) priority++; + if (g.score == "*") { + priority++; + // I play in this game, so g.fen will be defined + // NOTE: this is a fragile way to detect turn, + // but since V isn't defined let's do that for now. (TODO:) + //if (V.ParseFen(g.fen).turn == myColor) + if (g.fen.match(" " + myColor + " ")) priority++; + } } - } - if (g.created < minCreated) minCreated = g.created; - if (g.created > maxCreated) maxCreated = g.created; - return Object.assign({}, g, { - priority: priority, - myTurn: priority == 3 + if (g.created < minCreated) minCreated = g.created; + if (g.created > maxCreated) maxCreated = g.created; + return Object.assign({}, g, { + priority: priority, + myTurn: priority == 3, + myColor: myColor + }); }); - }); const deltaCreated = maxCreated - minCreated; return augmentedGames.sort((g1, g2) => { return ( @@ -102,9 +110,36 @@ export default { return g.players[1].name || "@nonymous"; return g.players[0].name || "@nonymous"; }, + scoreClass: function(g) { + if (g.score == "*" || !g.myColor) return {}; + // Ok it's my finished game: determine if I won, drew or lost. + let res = {}; + switch (g.score) { + case "1-0": + res[g.myColor == "w" ? "won" : "lost"] = true; + break; + case "0-1": + res[g.myColor == "b" ? "won" : "lost"] = true; + break; + case "1/2": + res["draw"] = true; + break; + // default case: "?" for unknown finished + default: + res["unknown"] = true; + } + return res; + }, deleteGame: function(game, e) { if (game.score != "*") { - if (confirm(this.st.tr["Remove game?"])) GameStorage.remove(game.id); + if (confirm(this.st.tr["Remove game?"])) { + GameStorage.remove( + game.id, + () => { + this.$set(this.deleted, game.id, true); + } + ); + } e.stopPropagation(); } } @@ -116,6 +151,14 @@ export default { // NOTE: the style applied to element doesn't work tr.my-turn > td background-color: #fcd785 -tr td.finished - background-color: #f5b7b1 + +tr + td.lost + background-color: #f5b7b1 + td.won + background-color: lightgreen + td.draw + background-color: lightblue + td.unknown + background-color: lightgrey