X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fviews%2FGame.vue;h=e16fa2f8b7a8fc7991d4cae61bbc0faba01fb264;hb=050ae3b58673dfa1ed41bf78d935fe95ec9e74c5;hp=262823dfffbdf8873979e6ad2eb65684f803fbcd;hpb=06e79b0783d6e9962ca6b2a25f62d46f46fa5c8b;p=vchess.git

diff --git a/client/src/views/Game.vue b/client/src/views/Game.vue
index 262823df..e16fa2f8 100644
--- a/client/src/views/Game.vue
+++ b/client/src/views/Game.vue
@@ -1,21 +1,27 @@
 <template lang="pug">
 main
+  input#modalChat.modal(type="checkbox" @change="toggleChat")
+  div(role="dialog" aria-labelledby="inputChat")
+    #chat.card
+      label.modal-close(for="modalChat")
+      Chat(:players="game.players" :pastChats="game.chats"
+        @newchat-sent="finishSendChat" @newchat-received="processChat")
   .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=='*'")
+    #aboveBoard.col-sm-12.col-md-9.col-md-offset-3.col-lg-10.col-lg-offset-2
+      button#chatBtn(onClick="doClick('modalChat')") Chat
+      #actions(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")
+      #playersInfo
+        p
+          span.name(:class="{connected: isConnected(0)}") {{ game.players[0].name }}
+          span.time(v-if="game.score=='*'") {{ virtualClocks[0] }}
+          span.split-names -
+          span.name(:class="{connected: isConnected(1)}") {{ game.players[1].name }}
+          span.time(v-if="game.score=='*'") {{ virtualClocks[1] }}
+  BaseGame(:game="game" :vr="vr" ref="basegame"
+    @newmove="processMove" @gameover="gameOver")
 </template>
 
 <script>
@@ -42,12 +48,12 @@ export default {
         rid: ""
       },
       game: {players:[{name:""},{name:""}]}, //passed to BaseGame
-      corrMsg: "", //to send offline messages in corr games
       virtualClocks: [0, 0], //initialized with true game.clocks
       vr: null, //"variant rules" object initialized from FEN
       drawOffer: "", //TODO: use for button style
       people: [], //players + observers
       lastate: undefined, //used if opponent send lastate before game is ready
+      repeat: {}, //detect position repetition
     };
   },
   watch: {
@@ -78,7 +84,7 @@ export default {
         {
           clearInterval(clockUpdate);
           if (countdown < 0)
-            this.setScore(this.vr.turn=="w" ? "0-1" : "1-0", "Time");
+            this.gameOver(this.vr.turn=="w" ? "0-1" : "1-0", "Time");
         }
         else
         {
@@ -125,6 +131,12 @@ export default {
     roomInit: function() {
       this.st.conn.send(JSON.stringify({code:"pollclients"}));
     },
+    isConnected: function(index) {
+      const name = this.game.players[index].name;
+      if (this.st.user.name == name)
+        return true;
+      return this.people.some(p => p.name == name);
+    },
     socketMessageListener: function(msg) {
       const data = JSON.parse(msg.data);
       switch (data.code)
@@ -198,7 +210,6 @@ export default {
             game:myGame, target:data.from}));
           break;
         case "newmove":
-          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
@@ -210,13 +221,13 @@ export default {
           break;
         }
         case "resign":
-          this.setScore(data.side=="b" ? "1-0" : "0-1", "Resign");
+          this.gameOver(data.side=="b" ? "1-0" : "0-1", "Resign");
           break;
         case "abort":
-          this.setScore("?", "Abort");
+          this.gameOver("?", "Abort");
           break;
         case "draw":
-          this.setScore("1/2", "Mutual agreement");
+          this.gameOver("1/2", "Mutual agreement");
           break;
         case "drawoffer":
           this.drawOffer = "received"; //TODO: observers don't know who offered draw
@@ -252,19 +263,15 @@ export default {
         {
           // Opponent resigned or aborted game, or accepted draw offer
           // (this is not a stalemate or checkmate)
-          this.setScore(data.score, "Opponent action");
+          this.gameOver(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")
+      if (["received","threerep"].includes(this.drawOffer))
       {
         if (!confirm("Accept draw?"))
           return;
@@ -272,7 +279,10 @@ export default {
           if (p.sid != this.st.user.sid)
             this.st.conn.send(JSON.stringify({code:"draw", target:p.sid}));
         });
-        this.setScore("1/2", "Mutual agreement");
+        const message = (this.drawOffer == "received"
+          ? "Mutual agreement"
+          : "Three repetitions");
+        this.gameOver("1/2", message);
       }
       else if (this.drawOffer == "sent")
       {
@@ -296,7 +306,7 @@ export default {
     abortGame: function() {
       if (!confirm(this.st.tr["Terminate game?"]))
         return;
-      this.setScore("?", "Abort");
+      this.gameOver("?", "Abort");
       this.people.forEach(p => {
         if (p.sid != this.st.user.sid)
         {
@@ -317,7 +327,7 @@ export default {
             side:this.game.mycolor, target:p.sid}));
         }
       });
-      this.setScore(this.game.mycolor=="w" ? "0-1" : "1-0", "Resign");
+      this.gameOver(this.game.mycolor=="w" ? "0-1" : "1-0", "Resign");
     },
     // 3 cases for loading a game:
     //  - from indexedDB (running or completed live game I play)
@@ -370,9 +380,10 @@ export default {
               vanish: s.vanish,
               start: s.start,
               end: s.end,
-              message: m.message,
             };
           });
+          // Also sort chat messages (if any)
+          game.chats.sort( (c1,c2) => { return c2.added - c1.added; });
         }
         const myIdx = game.players.findIndex(p => {
           return p.sid == this.st.user.sid || p.uid == this.st.user.id;
@@ -407,6 +418,7 @@ export default {
             oppid: (myIdx < 0 ? undefined : game.players[1-myIdx].uid),
           }
         );
+        this.repeat = {}; //reset
         if (!!this.lastate) //lastate arrived before game was loaded:
           this.processLastate();
         callback();
@@ -427,18 +439,20 @@ export default {
     },
     // Post-process a move (which was just played)
     processMove: function(move) {
-      if (!this.game.mycolor)
-        return; //I'm just an observer
-      // Update storage (corr or live)
+      // Update storage (corr or live) if I play in the game
       const colorIdx = ["w","b"].indexOf(move.color);
       // https://stackoverflow.com/a/38750895
-      const allowed_fields = ["appear", "vanish", "start", "end"];
-      const filtered_move = Object.keys(move)
-        .filter(key => allowed_fields.includes(key))
-        .reduce((obj, key) => {
-          obj[key] = move[key];
-          return obj;
-        }, {});
+      if (!!this.game.mycolor)
+      {
+        const allowed_fields = ["appear", "vanish", "start", "end"];
+        // NOTE: 'var' to see this variable outside this block
+        var filtered_move = Object.keys(move)
+          .filter(key => allowed_fields.includes(key))
+          .reduce((obj, key) => {
+            obj[key] = move[key];
+            return obj;
+          }, {});
+      }
       // Send move ("newmove" event) to people in the room (if our turn)
       let addTime = 0;
       if (move.color == this.game.mycolor)
@@ -450,8 +464,6 @@ export default {
           addTime = this.game.increment - elapsed/1000;
         }
         let sendMove = Object.assign({}, filtered_move, {addTime: addTime});
-        if (this.game.type == "corr")
-          sendMove.message = this.corrMsg;
         this.people.forEach(p => {
           if (p.sid != this.st.user.sid)
           {
@@ -468,14 +480,14 @@ export default {
       const nextIdx = ["w","b"].indexOf(this.vr.turn);
       // Since corr games are stored at only one location, update should be
       // done only by one player for each move:
-      if (this.game.type == "live" || move.color == this.game.mycolor)
+      if (!!this.game.mycolor &&
+        (this.game.type == "live" || move.color == this.game.mycolor))
       {
         if (this.game.type == "corr")
         {
           GameStorage.update(this.gameRef.id,
           {
             fen: move.fen,
-            message: this.corrMsg,
             move:
             {
               squares: filtered_move,
@@ -505,11 +517,32 @@ 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();
+      // If repetition detected, consider that a draw offer was received:
+      const fenObj = V.ParseFen(move.fen);
+      let repIdx = fenObj.position + "_" + fenObj.turn;
+      if (!!fenObj.flags)
+        repIdx += "_" + fenObj.flags;
+      this.repeat[repIdx] = (!!this.repeat[repIdx]
+        ? this.repeat[repIdx]+1
+        : 1);
+      if (this.repeat[repIdx] >= 3)
+        this.drawOffer = "threerep";
+    },
+    toggleChat: function() {
+      document.getElementById("chatBtn").style.backgroundColor = "#e2e2e2";
+    },
+    finishSendChat: function(chat) {
+      if (this.game.type == "corr")
+        GameStorage.update(this.gameRef.id, {chat: chat});
+    },
+    processChat: function() {
+      if (!document.getElementById("inputChat").checked)
+        document.getElementById("chatBtn").style.backgroundColor = "#c5fefe";
     },
-    gameOver: function(score) {
+    gameOver: function(score, scoreMsg) {
       this.game.mode = "analyze";
-      this.game.score = score; //until Vue3, this property change isn't seen
-                               //by child (and doesn't need to be)
+      this.game.score = score;
+      this.game.scoreMsg = scoreMsg;
       const myIdx = this.game.players.findIndex(p => {
         return p.sid == this.st.user.sid || p.uid == this.st.user.id;
       });
@@ -521,5 +554,46 @@ export default {
 </script>
 
 <style lang="sass">
-// TODO
+.connected
+  background-color: lightgreen
+
+@media screen and (min-width: 768px)
+  #actions
+    width: 300px
+@media screen and (max-width: 767px)
+  .game
+    width: 100%
+
+#actions
+  display: inline-block
+  margin-top: 10px
+  button
+    display: inline-block
+    width: 33%
+    margin: 0
+
+@media screen and (max-width: 767px)
+  #aboveBoard
+    text-align: center
+
+.name
+  font-size: 1.5rem
+  padding: 1px
+
+.time
+  font-size: 2rem
+  display: inline-block
+  margin-left: 10px
+
+.split-names
+  display: inline-block
+  margin: 0 15px
+
+#chat
+  padding-top: 20px
+  max-width: 600px
+  border: none;
+
+#chatBtn
+  margin: 0 10px 0 0
 </style>