X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fcomponents%2FBaseGame.vue;h=e02462e578396744d76b069545c84fa39810e892;hb=9ca1e26b79ec1873aa6ac914013160f8593d52cf;hp=393b9ccf41a8d50ad9912113e8188a563f0b0588;hpb=c4f91d3ff756bf1c8948433e0584e0e4235f3524;p=vchess.git

diff --git a/client/src/components/BaseGame.vue b/client/src/components/BaseGame.vue
index 393b9ccf..e02462e5 100644
--- a/client/src/components/BaseGame.vue
+++ b/client/src/components/BaseGame.vue
@@ -1,42 +1,43 @@
 <template lang="pug">
-.row
-  .col-sm-12.col-md-10.col-md-offset-1.col-lg-8.col-lg-offset-2
-    input#modalEog.modal(type="checkbox")
-    div(role="dialog" aria-labelledby="eogMessage")
-      .card.smallpad.small-modal.text-center
-        label.modal-close(for="modalEog")
-        h3#eogMessage.section {{ endgameMessage }}
-    Board(:vr="vr" :last-move="lastMove" :analyze="game.mode=='analyze'"
-      :user-color="game.mycolor" :orientation="orientation"
-      :vname="game.vname" @play-move="play")
-    .button-group
-      button(@click="() => play()") Play
-      button(@click="() => undo()") Undo
-      button(@click="flip") Flip
-      button(@click="gotoBegin") GotoBegin
-      button(@click="gotoEnd") GotoEnd
-    #fenDiv.section-content(v-if="showFen && !!vr")
-      p#fenString.text-center {{ vr.getFen() }}
-    #pgnDiv.section-content
-      a#download(href="#")
+div#baseGame(tabindex=-1 @click="() => focusBg()" @keydown="handleKeys")
+  input#modalEog.modal(type="checkbox")
+  div(role="dialog" aria-labelledby="eogMessage")
+    .card.smallpad.small-modal.text-center
+      label.modal-close(for="modalEog")
+      h3#eogMessage.section {{ endgameMessage }}
+  .row
+    .col-sm-12.col-md-9.col-lg-8
+      Board(:vr="vr" :last-move="lastMove" :analyze="analyze"
+        :user-color="game.mycolor" :orientation="orientation"
+        :vname="game.vname" @play-move="play")
       .button-group
-        button#downloadBtn(@click="download") {{ st.tr["Download PGN"] }}
-        button Import game
-    //MoveList(v-if="showMoves"
-      :moves="moves" :cursor="cursor" @goto-move="gotoMove")
+        button(@click="gotoBegin") <<
+        button(@click="() => undo()") <
+        button(@click="flip") &#8645;
+        button(@click="() => play()") >
+        button(@click="gotoEnd") >>
+      #fenDiv(v-if="showFen && !!vr")
+        p(@click="gotoFenContent") {{ vr.getFen() }}
+      #pgnDiv
+        a#download(href="#")
+        button(@click="download") {{ st.tr["Download PGN"] }}
+    .col-sm-12.col-md-3.col-lg-4
+      MoveList(v-if="showMoves"
+        :moves="moves" :cursor="cursor" @goto-move="gotoMove")
 </template>
 
 <script>
 import Board from "@/components/Board.vue";
-//import MoveList from "@/components/MoveList.vue";
+import MoveList from "@/components/MoveList.vue";
 import { store } from "@/store";
 import { getSquareId } from "@/utils/squareId";
+import { getDate } from "@/utils/datetime";
 
 export default {
   name: 'my-base-game',
   components: {
     Board,
-    //MoveList,
+    MoveList,
   },
   // "vr": VariantRules object, describing the game state + rules
   props: ["vr","game"],
@@ -50,6 +51,7 @@ export default {
       moves: [],
       cursor: -1, //index of the move just played
       lastMove: null,
+      gameHasEnded: false, //to avoid showing end message twice
     };
   },
   watch: {
@@ -57,6 +59,17 @@ export default {
     "game.fenStart": function() {
       this.re_setVariables();
     },
+    // Received a new move to play:
+    "game.moveToPlay": function() {
+      this.play(this.game.moveToPlay, "receive", this.game.vname=="Dark");
+    },
+    "game.score": function(score) {
+      if (!this.gameHasEnded && score != "*")
+      {
+        // "false" says "don't bubble up": the parent already knows
+        this.endGame(score, this.game.scoreMsg, false);
+      }
+    },
   },
   computed: {
     showMoves: function() {
@@ -67,7 +80,7 @@ export default {
       return this.game.vname != "Dark" || this.score != "*";
     },
     analyze: function() {
-      return this.game.mode == "analyze";
+      return this.game.mode == "analyze" || this.score != "*";
     },
   },
   created: function() {
@@ -75,33 +88,61 @@ export default {
       this.re_setVariables();
   },
   methods: {
+    focusBg: function() {
+      // TODO: small blue border appears...
+      document.getElementById("baseGame").focus();
+    },
+    handleKeys: function(e) {
+      switch (e.keyCode)
+      {
+        case 37:
+          this.undo();
+          break;
+        case 39:
+          this.play();
+          break;
+        case 28:
+          this.gotoBegin();
+          break;
+        case 40:
+          this.gotoEnd();
+          break;
+        case 32:
+          e.preventDefault();
+          this.flip();
+          break;
+      }
+    },
     re_setVariables: function() {
       this.endgameMessage = "";
       this.orientation = this.game.mycolor || "w"; //default orientation for observed games
       this.score = this.game.score || "*"; //mutable (if initially "*")
+      this.gameHasEnded = (this.score != "*");
       this.moves = JSON.parse(JSON.stringify(this.game.moves || []));
+      // Post-processing: decorate each move with color + current FEN:
+      // (to be able to jump to any position quickly)
+      let vr_tmp = new V(this.game.fenStart); //vr is already at end of game
+      this.moves.forEach(move => {
+        // NOTE: this is doing manually what play() function below achieve,
+        // but in a lighter "fast-forward" way
+        move.color = vr_tmp.turn;
+        move.notation = vr_tmp.getNotation(move);
+        vr_tmp.play(move);
+        move.fen = vr_tmp.getFen();
+      });
+      if (this.game.fenStart.indexOf(" b ") >= 0 ||
+        (this.moves.length > 0 && this.moves[0].color == "b"))
+      {
+        // 'end' is required for Board component to check lastMove for e.p.
+        this.moves.unshift({color: "w", notation: "...", end: {x:-1,y:-1}});
+      }
       const L = this.moves.length;
       this.cursor = L-1;
       this.lastMove = (L > 0 ? this.moves[L-1]  : null);
     },
-    setEndgameMessage: function(score) {
-      let eogMessage = "Undefined";
-      switch (score)
-      {
-        case "1-0":
-          eogMessage = translations["White win"];
-          break;
-        case "0-1":
-          eogMessage = translations["Black win"];
-          break;
-        case "1/2":
-          eogMessage = translations["Draw"];
-          break;
-        case "?":
-          eogMessage = "Unfinished";
-          break;
-      }
-      this.endgameMessage = eogMessage;
+    gotoFenContent: function(event) {
+      this.$router.push("/analyze/" + this.game.vname +
+        "/?fen=" + event.target.innerText.replace(/ /g, "_"));
     },
     download: function() {
       const content = this.getPgn();
@@ -116,8 +157,8 @@ export default {
       pgn += '[Site "vchess.club"]\n';
       pgn += '[Variant "' + this.game.vname + '"]\n';
       pgn += '[Date "' + getDate(new Date()) + '"]\n';
-      pgn += '[White "' + this.game.players[0] + '"]\n';
-      pgn += '[Black "' + this.game.players[1] + '"]\n';
+      pgn += '[White "' + this.game.players[0].name + '"]\n';
+      pgn += '[Black "' + this.game.players[1].name + '"]\n';
       pgn += '[Fen "' + this.game.fenStart + '"]\n';
       pgn += '[Result "' + this.score + '"]\n\n';
       let counter = 1;
@@ -129,23 +170,46 @@ export default {
         {
           let move = "";
           while (i < this.moves.length && this.moves[i].color == color)
-            move += this.moves[i++].notation[0] + ",";
+            move += this.moves[i++].notation + ",";
           move = move.slice(0,-1); //remove last comma
-          pgn += move + (i < this.moves.length-1 ? " " : "");
+          pgn += move + (i < this.moves.length ? " " : "");
         }
       }
       return pgn + "\n";
     },
-    showScoreMsg: function(score) {
-      this.setEndgameMessage(score);
+    getScoreMessage: function(score) {
+      let eogMessage = "Undefined";
+      switch (score)
+      {
+        case "1-0":
+          eogMessage = this.st.tr["White win"];
+          break;
+        case "0-1":
+          eogMessage = this.st.tr["Black win"];
+          break;
+        case "1/2":
+          eogMessage = this.st.tr["Draw"];
+          break;
+        case "?":
+          eogMessage = this.st.tr["Unfinished"];
+          break;
+      }
+      return eogMessage;
+    },
+    showEndgameMsg: function(message) {
+      this.endgameMessage = message;
       let modalBox = document.getElementById("modalEog");
       modalBox.checked = true;
       setTimeout(() => { modalBox.checked = false; }, 2000);
     },
-    endGame: function(score) {
+    endGame: function(score, message, bubbleUp) {
+      this.gameHasEnded = true;
       this.score = score;
-      this.showScoreMsg(score);
-      this.$emit("gameover", score);
+      if (!message)
+        message = this.getScoreMessage(score);
+      this.showEndgameMsg(score + " . " + message);
+      if (bubbleUp)
+        this.$emit("gameover", score);
     },
     animateMove: function(move) {
       let startSquare = document.getElementById(getSquareId(move.start));
@@ -219,18 +283,22 @@ export default {
             this.moves = this.moves.slice(0,this.cursor).concat([move]);
         }
       }
+      if (!this.analyze)
+        this.$emit("newmove", move); //post-processing (e.g. computer play)
       // Is opponent in check?
       this.incheck = this.vr.getCheckSquares(this.vr.turn);
       const score = this.vr.getCurrentScore();
       if (score != "*")
       {
         if (!this.analyze)
-          this.endGame(score);
-        else //just show score on screen (allow undo)
-          this.showScoreMsg(score);
+          this.endGame(score, undefined, true);
+        else
+        {
+          // Just show score on screen (allow undo)
+          const message = this.getScoreMessage(score);
+          this.showEndgameMsg(score + " . " + message);
+        }
       }
-      if (!this.analyze)
-        this.$emit("newmove", move); //post-processing (e.g. computer play)
     },
     undo: function(move) {
       const navigate = !move;