X-Git-Url: https://git.auder.net/pieces/Cwda/n_black_bishop.svg?a=blobdiff_plain;f=client%2Fsrc%2Fcomponents%2FGameList.vue;h=a83eb85a4daa24b868916fb17df20289602e1242;hb=f54f4c26b4c820b14aca298e94644efb20beeed6;hp=98eaf33f0c107a5c3418cc4eb7865695843451c3;hpb=f9c36b2da005b596ad656f4b6cc4e09ef3c656f1;p=vchess.git

diff --git a/client/src/components/GameList.vue b/client/src/components/GameList.vue
index 98eaf33f..a83eb85a 100644
--- a/client/src/components/GameList.vue
+++ b/client/src/components/GameList.vue
@@ -1,6 +1,6 @@
 <template lang="pug">
 div
-  table.game-list
+  table.game-list(v-if="games.length > 0")
     thead
       tr
         th {{ st.tr["Variant"] }}
@@ -9,9 +9,9 @@ div
         th {{ st.tr["Result"] }}
     tbody
       tr(
-        v-for="g in sortedGames"
+        v-for="g in sortedGames()"
         @click="$emit('show-game',g)"
-        :class="{'my-turn': g.myTurn}"
+        :class="{'my-turn': !!g.myTurn}"
       )
         td {{ g.vname }}
         td {{ player_s(g) }}
@@ -21,11 +21,14 @@ div
           @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 { ajax } from "@/utils/ajax";
 export default {
   name: "my-game-list",
   props: ["games", "showBoth"],
@@ -49,55 +52,6 @@ export default {
       }
     });
   },
-  computed: {
-    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;
-      const isMyTurn = (g, myColor) => {
-        const rem = g.movesCount % 2;
-        return (
-          (rem == 0 && myColor == "w") ||
-          (rem == 1 && myColor == "b")
-        );
-      };
-      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++;
-            myColor =
-              g.players[0].uid == this.st.user.id ||
-              g.players[0].sid == this.st.user.sid
-                ? "w"
-                : "b";
-            if (g.score == "*") {
-              priority++;
-              if (isMyTurn(g, 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,
-            myColor: myColor
-          });
-        });
-      const deltaCreated = maxCreated - minCreated;
-      return augmentedGames.sort((g1, g2) => {
-        return (
-          g2.priority - g1.priority + (g2.created - g1.created) / deltaCreated
-        );
-      });
-    }
-  },
   methods: {
     player_s: function(g) {
       if (this.showBoth)
@@ -108,11 +62,35 @@ export default {
         );
       if (
         this.st.user.sid == g.players[0].sid ||
-        this.st.user.id == g.players[0].uid
+        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: 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++;
+        }
+      });
+      const deltaCreated = maxCreated - minCreated;
+      return remGames.sort((g1, g2) => {
+        return (
+          g2.priority - g1.priority +
+          // Modulate with creation time (value in ]0,1[)
+          (g2.created - g1.created) / (deltaCreated + 1)
+        );
+      });
+    },
     scoreClass: function(g) {
       if (g.score == "*" || !g.myColor) return {};
       // Ok it's my finished game: determine if I won, drew or lost.
@@ -135,19 +113,43 @@ export default {
     },
     deleteGame: function(game, e) {
       if (
-        game.score != "*" &&
+        // My game ?
         game.players.some(p =>
-          p.sid == this.st.user.sid ||
-          p.uid == this.st.user.id
+          p.sid == this.st.user.sid || p.id == this.st.user.id
         )
       ) {
-        if (confirm(this.st.tr["Remove game?"])) {
-          GameStorage.remove(
-            game.id,
-            () => {
-              this.$set(this.deleted, game.id, true);
-            }
-          );
+        const message =
+          game.score != "*"
+            ? "Remove game?"
+            : "Abort and remove game?";
+        if (confirm(this.st.tr[message])) {
+          const afterDelete = () => {
+            if (game.score == "*") this.$emit("abortgame", game);
+            this.$set(this.deleted, game.id, true);
+          };
+          if (game.type == "live")
+            // Effectively remove game:
+            GameStorage.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();
       }
@@ -157,6 +159,10 @@ export default {
 </script>
 
 <style lang="sass" scoped>
+p
+  text-align: center
+  font-weight: bold
+
 // NOTE: the style applied to <tr> element doesn't work
 tr.my-turn > td
   background-color: #fcd785