X-Git-Url: https://git.auder.net/?a=blobdiff_plain;ds=sidebyside;f=client%2Fsrc%2Fcomponents%2FGameList.vue;h=0d488e51cf4ead64f3953ff3295ddd202b72d77b;hb=c31c31c5e70b73cc22e1574a274032e6c0ea9ac9;hp=fba1f79bef0eef571c59cf75e5db2fe7d6853f0a;hpb=df647c70b4148894c7d87fc499df5a9050347aec;p=vchess.git

diff --git a/client/src/components/GameList.vue b/client/src/components/GameList.vue
index fba1f79b..0d488e51 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"] }}
@@ -9,11 +9,11 @@ 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 {{ g.vname + (g.options.abridged || '') }}
         td {{ player_s(g) }}
         td(v-if="showCadence") {{ g.cadence }}
         td(
@@ -21,18 +21,23 @@ 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 { ImportgameStorage } from "@/utils/importgameStorage";
+import { ajax } from "@/utils/ajax";
 export default {
   name: "my-game-list",
   props: ["games", "showBoth"],
   data: function() {
     return {
       st: store.state,
-      showCadence: true
+      deleted: {}, //mark deleted games
+      showCadence: window.innerWidth >= 425 //TODO: arbitrary value
     };
   },
   mounted: function() {
@@ -42,56 +47,12 @@ export default {
       if (!timeoutLaunched) {
         timeoutLaunched = true;
         setTimeout(() => {
-          this.showCadence = window.innerWidth >= 425; //TODO: arbitrary
+          this.showCadence = window.innerWidth >= 425;
           timeoutLaunched = false;
         }, 500);
       }
     });
   },
-  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;
-      let augmentedGames = this.games.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++;
-            // 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,
-          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)
@@ -102,11 +63,36 @@ 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.
@@ -128,8 +114,48 @@ export default {
       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();
       }
     }
@@ -138,6 +164,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