X-Git-Url: https://git.auder.net/?p=vchess.git;a=blobdiff_plain;f=client%2Fsrc%2Fcomponents%2FGameList.vue;h=ed6b99fa18503aea4fc89ea749bdf72d36fe8f9c;hp=2a4b0239395fabfdd69d41e687e5bf5068d9dbba;hb=eb2d61de8d569470fa329a484efe9bab420b2b82;hpb=bd76b45611cbb58dcf774745a4d690277a82aacd

diff --git a/client/src/components/GameList.vue b/client/src/components/GameList.vue
index 2a4b0239..ed6b99fa 100644
--- a/client/src/components/GameList.vue
+++ b/client/src/components/GameList.vue
@@ -1,6 +1,6 @@
 <template lang="pug">
 div
-  table
+  table.game-list(v-if="games.length > 0")
     thead
       tr
         th {{ st.tr["Variant"] }}
@@ -8,100 +8,177 @@ div
         th(v-if="showCadence") {{ st.tr["Cadence"] }}
         th {{ st.tr["Result"] }}
     tbody
-      tr(v-for="g in sortedGames" @click="$emit('show-game',g)"
-          :class="{'my-turn': g.myTurn}")
-        td {{ g.vname }}
+      tr(
+        v-for="g in sortedGames()"
+        @click="$emit('show-game',g)"
+        :class="{'my-turn': !!g.myTurn}"
+      )
+        td {{ g.vname + '-' + g.options.abridged }}
         td {{ player_s(g) }}
         td(v-if="showCadence") {{ g.cadence }}
-        td(:class="{finished: g.score!='*'}" @click="deleteGame(g,$event)")
+        td(
+          :class="scoreClass(g)"
+          @click="deleteGame(g,$event)"
+        )
           | {{ g.score }}
+  p(v-else)
+    | {{ st.tr["No games found :( Send a challenge!"] }}
 </template>
 
 <script>
 import { store } from "@/store";
 import { GameStorage } from "@/utils/gameStorage";
+import { ImportgameStorage } from "@/utils/importgameStorage";
+import { ajax } from "@/utils/ajax";
 export default {
   name: "my-game-list",
-  props: ["games","showBoth"],
+  props: ["games", "showBoth"],
   data: function() {
     return {
       st: store.state,
-      showCadence: true,
+      deleted: {}, //mark deleted games
+      showCadence: window.innerWidth >= 425 //TODO: arbitrary value
     };
   },
   mounted: function() {
     // timeout to avoid calling too many time the adjust method
     let timeoutLaunched = false;
-    window.addEventListener("resize", (e) => {
-      if (!timeoutLaunched)
-      {
+    window.addEventListener("resize", () => {
+      if (!timeoutLaunched) {
         timeoutLaunched = true;
-        setTimeout( () => {
-          this.showCadence = window.innerWidth >= 425; //TODO: arbitrary
+        setTimeout(() => {
+          this.showCadence = window.innerWidth >= 425;
           timeoutLaunched = false;
         }, 500);
       }
     });
   },
-  computed: {
+  methods: {
+    player_s: function(g) {
+      if (this.showBoth)
+        return (
+          (g.players[0].name || "@nonymous") +
+          " - " +
+          (g.players[1].name || "@nonymous")
+        );
+      if (
+        this.st.user.sid == g.players[0].sid ||
+        this.st.user.id == g.players[0].id
+      ) {
+        return g.players[1].name || "@nonymous";
+      }
+      return g.players[0].name || "@nonymous";
+    },
     sortedGames: function() {
-      // 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 == "*")
-          {
-            priority++;
-            const 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++;
-          }
+      // Show in order: it's my turn, running games, completed games
+      let minCreated = Number.MAX_SAFE_INTEGER;
+      let maxCreated = 0;
+      let remGames = this.games.filter(g => !this.deleted[g.id]);
+      remGames.forEach(g => {
+        if (g.created < minCreated) minCreated = g.created;
+        if (g.created > maxCreated) maxCreated = g.created;
+        g.priority = 0;
+        if (g.score == "*") {
+          g.priority++;
+          if (!!g.myColor) g.priority++;
+          if (!!g.myTurn) g.priority++;
         }
-        if (g.created < minCreated)
-          minCreated = g.created;
-        if (g.created > maxCreated)
-          maxCreated = g.created;
-        return Object.assign({}, g, {priority: priority, myTurn: priority==3});
       });
       const deltaCreated = maxCreated - minCreated;
-      return augmentedGames.sort((g1,g2) => {
-        return g2.priority - g1.priority +
-          (g2.created - g1.created) / deltaCreated;
+      return remGames.sort((g1, g2) => {
+        return (
+          g2.priority - g1.priority +
+          // Modulate with creation time (value in ]0,1[)
+          (g2.created - g1.created) / (deltaCreated + 1)
+        );
       });
     },
-  },
-  methods: {
-    player_s: function(g) {
-      if (this.showBoth)
-        return (g.players[0].name || "@nonymous") + " - " + (g.players[1].name || "@nonymous");
-      if (this.st.user.sid == g.players[0].sid || this.st.user.id == g.players[0].uid)
-        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 (
+        // My game ?
+        game.players.some(p =>
+          p.sid == this.st.user.sid || p.id == this.st.user.id
+        )
+      ) {
+        const message =
+          game.score != "*"
+            ? "Remove game?"
+            : "Abort and remove game?";
+        if (confirm(this.st.tr[message])) {
+          const afterDelete = () => {
+            if (game.score == "*" && game.type != "import")
+              this.$emit("abortgame", game);
+            this.$set(this.deleted, game.id, true);
+          };
+          if (game.type == "live")
+            // Effectively remove game:
+            GameStorage.remove(game.id, afterDelete);
+          else if (game.type == "import")
+            ImportgameStorage.remove(game.id, afterDelete);
+          else {
+            const mySide =
+              game.players[0].id == this.st.user.id
+                ? "White"
+                : "Black";
+            game["deletedBy" + mySide] = true;
+            // Mark the game for deletion on server
+            // If both people mark it, it is deleted
+            ajax(
+              "/games",
+              "PUT",
+              {
+                data: {
+                  gid: game.id,
+                  newObj: { removeFlag: true }
+                },
+                success: afterDelete
+              }
+            );
+          }
+        }
         e.stopPropagation();
       }
-    },
-  },
+    }
+  }
 };
 </script>
 
 <style lang="sass" scoped>
-// TODO: understand why the style applied to <tr> element doesn't work
+p
+  text-align: center
+  font-weight: bold
+
+// NOTE: the style applied to <tr> 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
 </style>