X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fcomponents%2FBoard.vue;h=8b570952de5cc36eac05eadf9d2e16c7e80354f0;hb=8e44d3a3982a536240ae576df0eafcc8a16f23c5;hp=f97a2c5a12d6ba7651ddc49d8efb4e01e7ed1997;hpb=d4036efea5b57656478affd7d71f53dcea0f8017;p=vchess.git

diff --git a/client/src/components/Board.vue b/client/src/components/Board.vue
index f97a2c5a..8b570952 100644
--- a/client/src/components/Board.vue
+++ b/client/src/components/Board.vue
@@ -1,29 +1,33 @@
 <script>
-// TODO: BoardHex for hexagonal variants (2 players)
-
 import { getSquareId, getSquareFromId } from "@/utils/squareId";
 import { ArrayFun } from "@/utils/array";
-
+import { store } from "@/store";
 export default {
   name: 'my-board',
   // Last move cannot be guessed from here, and is required to highlight squares
   // vr: object to check moves, print board...
   // userColor is left undefined for an external observer
-  props: ["vr","lastMove","analyze","orientation","userColor","vname"],
+  props: ["vr","lastMove","analyze","incheck","orientation","userColor","vname"],
   data: function () {
     return {
-      hints: (!localStorage["hints"] ? true : localStorage["hints"] === "1"),
-      bcolor: localStorage["bcolor"] || "lichess", //lichess, chesscom or chesstempo
       possibleMoves: [], //filled after each valid click/dragstart
       choices: [], //promotion pieces, or checkered captures... (as moves)
       selectedPiece: null, //moving piece (or clicked piece)
-      incheck: [],
       start: {}, //pixels coordinates + id of starting square (click or drag)
+      settings: store.state.settings,
     };
   },
   render(h) {
     if (!this.vr)
-      return;
+    {
+      // Return empty div of class 'game' to avoid error when setting size
+      return h("div",
+        {
+          "class": {
+            "game": true,
+          },
+        });
+    }
     const [sizeX,sizeY] = [V.size.x,V.size.y];
     // Precompute hints squares to facilitate rendering
     let hintSquares = ArrayFun.init(sizeX, sizeY, false);
@@ -31,7 +35,14 @@ export default {
     // Also precompute in-check squares
     let incheckSq = ArrayFun.init(sizeX, sizeY, false);
     this.incheck.forEach(sq => { incheckSq[sq[0]][sq[1]] = true; });
-    const squareWidth = 40; //TODO: compute this
+
+    let boardElt = document.querySelector(".game");
+    const squareWidth = (!!boardElt
+      ? boardElt.offsetWidth / sizeY
+      : 40); //arbitrary value (not relevant)
+    const offset = (!!boardElt
+      ? [boardElt.offsetTop, boardElt.offsetLeft]
+      : [0, 0]);
     const choices = h(
       'div',
       {
@@ -39,7 +50,8 @@ export default {
         'class': { 'row': true },
         style: {
           "display": (this.choices.length > 0 ? "block" : "none"),
-          "top": "-" + ((sizeY/2)*squareWidth+squareWidth/2) + "px",
+          "top": (offset[0] + (sizeY/2)*squareWidth-squareWidth/2) + "px",
+          "left": (offset[1] + squareWidth*(sizeY - this.choices.length)/2) + "px",
           "width": (this.choices.length * squareWidth) + "px",
           "height": squareWidth + "px",
         },
@@ -63,8 +75,6 @@ export default {
               'class': { 'choice-piece': true },
               on: {
                 "click": e => { this.play(m); this.choices=[]; },
-                // NOTE: add 'touchstart' event to fix a problem on smartphones
-                "touchstart": e => { this.play(m); this.choices=[]; },
               },
             })
           ]
@@ -73,7 +83,7 @@ export default {
     );
     // Create board element (+ reserves if needed by variant or mode)
     const lm = this.lastMove;
-    const showLight = this.hints && this.vname != "Dark";
+    const showLight = this.settings.highlight && this.vname != "Dark";
     const gameDiv = h(
       'div',
       {
@@ -116,7 +126,7 @@ export default {
                 )
               );
             }
-            if (this.hints && hintSquares[ci][cj])
+            if (this.settings.hints && hintSquares[ci][cj])
             {
               elems.push(
                 h(
@@ -140,7 +150,7 @@ export default {
                   ['board'+sizeY]: true,
                   'light-square': (i+j)%2==0,
                   'dark-square': (i+j)%2==1,
-                  [this.bcolor]: true,
+                  [this.settings.bcolor]: true,
                   'in-shadow': this.vname=="Dark" && !this.analyze
                     && (!this.userColor
                       || !this.vr.enlightened[this.userColor][ci][cj]),
@@ -237,21 +247,14 @@ export default {
     return h(
       'div',
       {
-        'class': {
-          "col-sm-12": true,
-          "col-md-10": true,
-          "col-md-offset-1": true,
-          "col-lg-8": true,
-          "col-lg-offset-2": true,
-        },
         // NOTE: click = mousedown + mouseup
         on: {
           mousedown: this.mousedown,
           mousemove: this.mousemove,
           mouseup: this.mouseup,
-          touchstart: this.mousedown,
+//          touchstart: this.mousedown,
           touchmove: this.mousemove,
-          touchend: this.mouseup,
+//          touchend: this.mouseup,
         },
       },
       elementArray
@@ -276,26 +279,28 @@ export default {
       e.preventDefault(); //disable native drag & drop
       if (!this.selectedPiece && e.target.classList.contains("piece"))
       {
+        let parent = e.target.parentNode;
         // Next few lines to center the piece on mouse cursor
-        let rect = e.target.parentNode.getBoundingClientRect();
+        let rect = parent.getBoundingClientRect();
         this.start = {
           x: rect.x + rect.width/2,
           y: rect.y + rect.width/2,
-          id: e.target.parentNode.id
+          id: parent.id
         };
         this.selectedPiece = e.target.cloneNode();
-        this.selectedPiece.style.position = "absolute";
-        this.selectedPiece.style.top = 0;
-        this.selectedPiece.style.display = "inline-block";
-        this.selectedPiece.style.zIndex = 3000;
-        const startSquare = getSquareFromId(e.target.parentNode.id);
+        let spStyle = this.selectedPiece.style
+        spStyle.position = "absolute";
+        spStyle.top = 0;
+        spStyle.display = "inline-block";
+        spStyle.zIndex = 3000;
+        const startSquare = getSquareFromId(parent.id);
         this.possibleMoves = [];
         const color = (this.analyze ? this.vr.turn : this.userColor);
         if (this.vr.canIplay(color,startSquare))
           this.possibleMoves = this.vr.getPossibleMovesFrom(startSquare);
         // Next line add moving piece just after current image
         // (required for Crazyhouse reserve)
-        e.target.parentNode.insertBefore(this.selectedPiece, e.target.nextSibling);
+        parent.insertBefore(this.selectedPiece, e.target.nextSibling);
       }
     },
     mousemove: function(e) {
@@ -316,7 +321,6 @@ export default {
       if (!this.selectedPiece)
         return;
       e = e || window.event;
-      // Read drop target (or parentElement, parentNode... if type == "img")
       this.selectedPiece.style.zIndex = -3000; //HACK to find square from final coords
       const [offsetX,offsetY] = !!e.clientX
         ? [e.clientX,e.clientY]
@@ -331,7 +335,7 @@ export default {
         // A click: selectedPiece and possibleMoves are already filled
         return;
       }
-      // OK: process move attempt
+      // OK: process move attempt, landing is a square node
       let endSquare = getSquareFromId(landing.id);
       let moves = this.findMatchingMoves(endSquare);
       this.possibleMoves = [];
@@ -360,7 +364,7 @@ export default {
 };
 </script>
 
-<style lang="sass">
+<style lang="sass" scoped>
 .game.reserve-div
   margin-bottom: 18px
 
@@ -370,38 +374,17 @@ export default {
 .reserve-row-1
   margin-bottom: 15px
 
-div.board
-  float: left
-  height: 0
-  display: inline-block
-  position: relative
-
-div.board8
-  width: 12.5%
-  padding-bottom: 12.5%
-
-div.board10
-  width: 10%
-  padding-bottom: 10%
-
-div.board11
-  width: 9.09%
-  padding-bottom: 9.1%
-
 // NOTE: no variants with reserve of size != 8
 
 .game
-  width: 80vh
-  margin: 0 auto
+  width: 100%
+  margin: 0
   .board
     cursor: pointer
-  @media screen and (max-width: 767px)
-    width: 100%
-    margin: 0
 
 #choices
-  margin: 0 auto 0 auto
-  position: relative
+  margin: 0
+  position: absolute
   z-index: 300
   overflow-y: inherit
   background-color: rgba(0,0,0,0)
@@ -415,22 +398,6 @@ div.board11
       height: auto
       display: block
 
-img.piece
-  width: 100%
-
-img.piece, img.mark-square
-  max-width: 100%
-  height: auto
-  display: block
-
-img.mark-square
-  opacity: 0.6
-  width: 76%
-  position: absolute
-  top: 12%
-  left: 12%
-  opacity: .7
-
 img.ghost
   position: absolute
   opacity: 0.4
@@ -439,9 +406,6 @@ img.ghost
 .highlight
   background-color: #00cc66 !important
 
-.in-shadow
-  filter: brightness(50%)
-
 .incheck
   background-color: #cc3300 !important