X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fcomponents%2FBaseGame.vue;h=a2d78a069d959660b3284be5d1c8aa559172366d;hb=7aa548e72ba8a4af4e2c7f63e7723ad10d2cd3a4;hp=b5a82dfbfda16cbcc9fb462f560fb233ce6807ea;hpb=21baf44462799a80c4b1cd772de8c3c4fa0b3d37;p=vchess.git

diff --git a/client/src/components/BaseGame.vue b/client/src/components/BaseGame.vue
index b5a82dfb..a2d78a06 100644
--- a/client/src/components/BaseGame.vue
+++ b/client/src/components/BaseGame.vue
@@ -1,36 +1,34 @@
 <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 }}
-    // TODO: or "BoardHex" if this.game.vname in "Hexagonal..."
-    Board(:vr="vr" :last-move="lastMove" :analyze="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
+  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"] }}
-        // TODO: Import game button copy game locally in IndexedDB
-        //button Import game
-    //MoveList(v-if="showMoves"
-      :moves="moves" :cursor="cursor" @goto-move="gotoMove")
+        button(@click="() => play()") Play
+        button(@click="() => undo()") Undo
+        button(@click="flip") Flip
+        button(@click="gotoBegin") GotoBegin
+        button(@click="gotoEnd") GotoEnd
+      #fenDiv(v-if="showFen && !!vr")
+        p {{ 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";
@@ -39,7 +37,7 @@ export default {
   name: 'my-base-game',
   components: {
     Board,
-    //MoveList,
+    MoveList,
   },
   // "vr": VariantRules object, describing the game state + rules
   props: ["vr","game"],
@@ -60,6 +58,13 @@ 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() {
+      this.endGame(this.game.score, this.game.scoreMsg);
+    },
   },
   computed: {
     showMoves: function() {
@@ -70,7 +75,7 @@ export default {
       return this.game.vname != "Dark" || this.score != "*";
     },
     analyze: function() {
-      return this.game.mode == "analyze" || this.game.score != "*";
+      return this.game.mode == "analyze" || this.score != "*";
     },
   },
   created: function() {
@@ -235,10 +240,12 @@ export default {
             this.moves = this.moves.slice(0,this.cursor).concat([move]);
         }
       }
-      // Is opponent in check? (TODO: generalize, find all check squares)
+      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 != "*") //TODO: generalize score for 3 or 4 players
+      if (score != "*")
       {
         if (!this.analyze)
           this.endGame(score);
@@ -249,9 +256,6 @@ export default {
           this.showEndgameMsg(score + " . " + message);
         }
       }
-      if (!this.analyze) { console.log("EMIT NEWMOVE");
-        this.$emit("newmove", move); //post-processing (e.g. computer play)
-      }
     },
     undo: function(move) {
       const navigate = !move;