X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fviews%2FGame.vue;h=262823dfffbdf8873979e6ad2eb65684f803fbcd;hb=5701c228a422bed7570452b2d24b3193f7653a19;hp=2751b56b84de5d2d2c5837ad0d8f40caadeee9d2;hpb=b7cbbda10f16c2419f9a4d49e219fcface5e5658;p=vchess.git

diff --git a/client/src/views/Game.vue b/client/src/views/Game.vue
index 2751b56b..262823df 100644
--- a/client/src/views/Game.vue
+++ b/client/src/views/Game.vue
@@ -1,16 +1,21 @@
 <template lang="pug">
-.row
-  .col-sm-12.col-md-10.col-md-offset-1.col-lg-8.col-lg-offset-2
-    BaseGame(:game="game" :vr="vr" ref="basegame"
-      @newmove="processMove" @gameover="gameOver")
-    div Names: {{ game.players[0].name }} - {{ game.players[1].name }}
-    div(v-if="game.score=='*'") Time: {{ virtualClocks[0] }} - {{ virtualClocks[1] }}
-    .button-group(v-if="game.mode!='analyze' && game.score=='*'")
-      button(@click="offerDraw") Draw
-      button(@click="abortGame") Abort
-      button(@click="resign") Resign
-    textarea(v-if="game.score=='*'" v-model="corrMsg")
-    Chat(:players="game.players")
+main
+  .row
+    .col-sm-12.col-md-3
+      Chat(:players="game.players")
+    .col-sm-12.col-md-9
+      BaseGame(:game="game" :vr="vr" ref="basegame"
+        @newmove="processMove" @gameover="gameOver")
+  .row
+    .col-sm-12.col-md-9.col-md-offset-3
+      .button-group(v-if="game.mode!='analyze' && game.score=='*'")
+        button(@click="offerDraw") Draw
+        button(@click="abortGame") Abort
+        button(@click="resign") Resign
+      div Names: {{ game.players[0].name }} - {{ game.players[1].name }}
+      div(v-if="game.score=='*'") Time: {{ virtualClocks[0] }} - {{ virtualClocks[1] }}
+      div(v-if="game.type=='corr'") {{ game.corrMsg }}
+      textarea(v-if="game.score=='*'" v-model="corrMsg")
 </template>
 
 <script>
@@ -73,10 +78,7 @@ export default {
         {
           clearInterval(clockUpdate);
           if (countdown < 0)
-          {
-            this.$refs["basegame"].endGame(
-              this.vr.turn=="w" ? "0-1" : "1-0", "Time");
-          }
+            this.setScore(this.vr.turn=="w" ? "0-1" : "1-0", "Time");
         }
         else
         {
@@ -196,9 +198,8 @@ export default {
             game:myGame, target:data.from}));
           break;
         case "newmove":
-          // NOTE: this call to play() will trigger processMove()
-          this.$refs["basegame"].play(data.move,
-            "receive", this.game.vname!="Dark" ? "animate" : null);
+          this.corrMsg = data.move.message; //may be empty
+          this.$set(this.game, "moveToPlay", data.move); //TODO: Vue3...
           break;
         case "lastate": //got opponent infos about last move
         {
@@ -209,14 +210,13 @@ export default {
           break;
         }
         case "resign":
-          this.$refs["basegame"].endGame(
-            (data.side=="b" ? "1-0" : "0-1"), "Resign");
+          this.setScore(data.side=="b" ? "1-0" : "0-1", "Resign");
           break;
         case "abort":
-          this.$refs["basegame"].endGame("?", "Abort");
+          this.setScore("?", "Abort");
           break;
         case "draw":
-          this.$refs["basegame"].endGame("1/2", "Mutual agreement");
+          this.setScore("1/2", "Mutual agreement");
           break;
         case "drawoffer":
           this.drawOffer = "received"; //TODO: observers don't know who offered draw
@@ -247,19 +247,22 @@ export default {
       if (data.movesCount > L)
       {
         // Just got last move from him
-        this.$refs["basegame"].play(data.lastMove,
-          "receive", this.game.vname!="Dark" ? "animate" : null);
+        this.$set(this.game, "moveToPlay", data.lastMove);
         if (data.score != "*" && this.game.score == "*")
         {
           // Opponent resigned or aborted game, or accepted draw offer
           // (this is not a stalemate or checkmate)
-          this.$refs["basegame"].endGame(data.score, "Opponent action");
+          this.setScore(data.score, "Opponent action");
         }
         this.game.clocks = data.clocks; //TODO: check this?
         if (!!data.lastMove.draw)
           this.drawOffer = "received";
       }
     },
+    setScore: function(score, message) {
+      this.game.scoreMsg = message;
+      this.$set(this.game, "score", score); //TODO: Vue3...
+    },
     offerDraw: function() {
       if (this.drawOffer == "received")
       {
@@ -269,7 +272,7 @@ export default {
           if (p.sid != this.st.user.sid)
             this.st.conn.send(JSON.stringify({code:"draw", target:p.sid}));
         });
-        this.$refs["basegame"].endGame("1/2", "Mutual agreement");
+        this.setScore("1/2", "Mutual agreement");
       }
       else if (this.drawOffer == "sent")
       {
@@ -293,8 +296,7 @@ export default {
     abortGame: function() {
       if (!confirm(this.st.tr["Terminate game?"]))
         return;
-      // Next line will trigger a "gameover" event, bubbling up till here
-      this.$refs["basegame"].endGame("?", "Abort");
+      this.setScore("?", "Abort");
       this.people.forEach(p => {
         if (p.sid != this.st.user.sid)
         {
@@ -315,9 +317,7 @@ export default {
             side:this.game.mycolor, target:p.sid}));
         }
       });
-      // Next line will trigger a "gameover" event, bubbling up till here
-      this.$refs["basegame"].endGame(
-        this.game.mycolor=="w" ? "0-1" : "1-0", "Resign");
+      this.setScore(this.game.mycolor=="w" ? "0-1" : "1-0", "Resign");
     },
     // 3 cases for loading a game:
     //  - from indexedDB (running or completed live game I play)
@@ -462,12 +462,6 @@ export default {
             }));
           }
         });
-        if (this.game.type == "corr" && this.corrMsg != "")
-        {
-          // Add message to last move in BaseGame:
-          // TODO: not very good style...
-          this.$refs["basegame"].setCurrentMessage(this.corrMsg);
-        }
       }
       else
         addTime = move.addTime; //supposed transmitted
@@ -481,10 +475,10 @@ export default {
           GameStorage.update(this.gameRef.id,
           {
             fen: move.fen,
+            message: this.corrMsg,
             move:
             {
               squares: filtered_move,
-              message: this.corrMsg,
               played: Date.now(), //TODO: on server?
               idx: this.game.moves.length,
             },
@@ -511,13 +505,11 @@ export default {
       //TODO: (Vue3) just this.game.clocks[colorIdx] += addTime;
       this.$set(this.game.clocks, colorIdx, this.game.clocks[colorIdx] + addTime);
       this.game.initime[nextIdx] = Date.now();
-      // Finally reset curMoveMessage if needed
-      if (this.game.type == "corr" && move.color == this.game.mycolor)
-        this.corrMsg = "";
     },
     gameOver: function(score) {
       this.game.mode = "analyze";
-      this.game.score = score;
+      this.game.score = score; //until Vue3, this property change isn't seen
+                               //by child (and doesn't need to be)
       const myIdx = this.game.players.findIndex(p => {
         return p.sid == this.st.user.sid || p.uid == this.st.user.id;
       });