X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fcomponents%2FBaseGame.vue;h=45364053e944d23d82daeb5b1e9a018227d6708b;hb=9ddaf8da8743c50b9019888a82d84392913c60c9;hp=07343c5ad3b9663204a0e6e33c1fc6ce313d53fa;hpb=4f51861013271a060b358884097a676e3d42d496;p=vchess.git

diff --git a/client/src/components/BaseGame.vue b/client/src/components/BaseGame.vue
index 07343c5a..45364053 100644
--- a/client/src/components/BaseGame.vue
+++ b/client/src/components/BaseGame.vue
@@ -1,33 +1,41 @@
 <template lang="pug">
-div#baseGame(tabindex=-1 @click="() => focusBg()"
+div#baseGame(tabindex=-1 @click="focusBg()"
     @keydown="handleKeys" @wheel="handleScroll")
   input#modalEog.modal(type="checkbox")
-  div(role="dialog" data-checkbox="modalEog" aria-labelledby="eogMessage")
+  div#eogDiv(role="dialog" data-checkbox="modalEog" aria-labelledby="eogMessage")
     .card.smallpad.small-modal.text-center
       label.modal-close(for="modalEog")
       h3#eogMessage.section {{ endgameMessage }}
+  input#modalAdjust.modal(type="checkbox")
+  div#adjuster(role="dialog" data-checkbox="modalAdjust" aria-labelledby="labelAdjust")
+    .card.smallpad.small-modal.text-center
+      label.modal-close(for="modalAdjust")
+      label#labelAdjust(for="boardSize") {{ st.tr["Board size"] }}
+      input#boardSize.slider(type="range" min="0" max="100" value="50"
+        @input="adjustBoard")
   #gameContainer
     #boardContainer
       Board(:vr="vr" :last-move="lastMove" :analyze="analyze"
         :user-color="game.mycolor" :orientation="orientation"
-        :vname="game.vname" @play-move="play")
+        :vname="game.vname" :incheck="incheck" @play-move="play")
       #turnIndicator(v-if="game.vname=='Dark' && game.score=='*'")
         | {{ turn }}
       #controls
-        button(@click="gotoBegin") <<
-        button(@click="() => undo()") <
-        button(@click="flip") &#8645;
-        button(@click="() => play()") >
-        button(@click="gotoEnd") >>
+        button(@click="gotoBegin()") <<
+        button(@click="undo()") <
+        button(@click="flip()") &#8645;
+        button(@click="play()") >
+        button(@click="gotoEnd()") >>
       #pgnDiv
-        div(v-if="game.vname!='Dark' || game.score!='*'")
+        #downloadDiv(v-if="game.vname!='Dark' || game.score!='*'")
           a#download(href="#")
-          button(@click="download") {{ st.tr["Download PGN"] }}
+          button(@click="download()") {{ st.tr["Download"] }} PGN
+        button(onClick="doClick('modalAdjust')") &#10530;
         button(v-if="game.vname!='Dark' && game.mode!='analyze'"
-            @click="analyzePosition")
-          | {{ st.tr["Analyze"] }}
+            @click="analyzePosition()")
+          | {{ st.tr["Analyse"] }}
         // NOTE: rather ugly hack to avoid showing twice "rules" link...
-        button(v-if="!$route.path.match('/variants/')" @click="showRules")
+        button(v-if="!$route.path.match('/variants/')" @click="showRules()")
           | {{ st.tr["Rules"] }}
     #movesList
       MoveList(v-if="showMoves" :score="game.score" :message="game.scoreMsg"
@@ -42,7 +50,8 @@ import MoveList from "@/components/MoveList.vue";
 import { store } from "@/store";
 import { getSquareId } from "@/utils/squareId";
 import { getDate } from "@/utils/datetime";
-
+import { processModalClick } from "@/utils/modalClick";
+import { getScoreMessage } from "@/utils/scoring";
 export default {
   name: 'my-base-game',
   components: {
@@ -62,6 +71,7 @@ export default {
       cursor: -1, //index of the move just played
       lastMove: null,
       firstMoveNumber: 0, //for printing
+      incheck: [], //for Board
     };
   },
   watch: {
@@ -86,7 +96,7 @@ export default {
         color = "White";
       else //if (this.moves[L-1].color == "w")
         color = "Black";
-      return color + " turn";
+      return this.st.tr[color + " to move"];
     },
     analyze: function() {
       return this.game.mode=="analyze" ||
@@ -99,6 +109,8 @@ export default {
       this.re_setVariables();
   },
   mounted: function() {
+    [document.getElementById("eogDiv"),document.getElementById("adjuster")]
+      .forEach(elt => elt.addEventListener("click", processModalClick));
     // Take full width on small screens:
     let boardSize = parseInt(localStorage.getItem("boardSize"));
     if (!boardSize)
@@ -111,12 +123,41 @@ export default {
     document.getElementById("boardContainer").style.width = boardSize + "px";
     let gameContainer = document.getElementById("gameContainer");
     gameContainer.style.width = (boardSize + movesWidth) + "px";
+    // TODO: find the right formula here:
+    //document.getElementById("boardSize").value = Math.floor(boardSize / 10);
+    // timeout to avoid calling too many time the adjust method
+    let timeoutLaunched = false;
+    window.addEventListener("resize", (e) => {
+      if (!timeoutLaunched)
+      {
+        timeoutLaunched = true;
+        setTimeout( () => {
+          this.adjustBoard();
+          timeoutLaunched = false;
+        }, 500);
+      }
+    });
   },
   methods: {
     focusBg: function() {
       // NOTE: small blue border appears...
       document.getElementById("baseGame").focus();
     },
+    adjustBoard: function() {
+      const boardContainer = document.getElementById("boardContainer");
+      if (!boardContainer)
+        return; //no board on page
+      const k = document.getElementById("boardSize").value;
+      const movesWidth = (window.innerWidth >= 768 ? 280 : 0);
+      const minBoardWidth = 240; //TODO: these 240 and 280 are arbitrary...
+      // Value of 0 is board min size; 100 is window.width [- movesWidth]
+      const boardSize = minBoardWidth +
+        k * (window.innerWidth - (movesWidth+minBoardWidth)) / 100;
+      localStorage.setItem("boardSize", boardSize);
+      boardContainer.style.width = boardSize + "px";
+      document.getElementById("gameContainer").style.width =
+        (boardSize + movesWidth) + "px";
+    },
     handleKeys: function(e) {
       if ([32,37,38,39,40].includes(e.keyCode))
         e.preventDefault();
@@ -180,9 +221,10 @@ export default {
       const L = this.moves.length;
       this.cursor = L-1;
       this.lastMove = (L > 0 ? this.moves[L-1]  : null);
+      this.incheck = [];
     },
     analyzePosition: function() {
-      const newUrl = "/analyze/" + this.game.vname +
+      const newUrl = "/analyse/" + this.game.vname +
         "/?fen=" + this.vr.getFen().replace(/ /g, "_");
       if (this.game.type == "live")
         this.$router.push(newUrl); //open in same tab: against cheating...
@@ -222,25 +264,6 @@ export default {
       }
       return pgn + "\n";
     },
-    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");
@@ -249,12 +272,18 @@ export default {
     },
     animateMove: function(move, callback) {
       let startSquare = document.getElementById(getSquareId(move.start));
+      // TODO: error "flush nextTick callbacks" when observer reloads page:
+      // this late check is not a fix!
+      if (!startSquare)
+        return;
       let endSquare = document.getElementById(getSquareId(move.end));
       let rectStart = startSquare.getBoundingClientRect();
       let rectEnd = endSquare.getBoundingClientRect();
       let translation = {x:rectEnd.x-rectStart.x, y:rectEnd.y-rectStart.y};
       let movingPiece =
         document.querySelector("#" + getSquareId(move.start) + " > img.piece");
+      if (!movingPiece) //TODO: shouldn't happen
+        return;
       // HACK for animation (with positive translate, image slides "under background")
       // Possible improvement: just alter squares on the piece's way...
       const squares = document.getElementsByClassName("board");
@@ -318,7 +347,7 @@ export default {
         const score = this.vr.getCurrentScore();
         if (score != "*")
         {
-          const message = this.getScoreMessage(score);
+          const message = getScoreMessage(score);
           if (this.game.mode != "analyze")
             this.$emit("gameover", score, message);
           else //just show score on screen (allow undo)
@@ -391,6 +420,9 @@ export default {
   margin-left: auto
   margin-right: auto
 
+#downloadDiv
+  display: inline-block
+
 #modal-eog+div .card
   overflow: hidden
 #controls