X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fcomponents%2FBoard.vue;h=6a20d54bffe4bfb4b2d27731f7d9b7face122183;hb=dfeb96ea90e880a2557cbb5953dbb7258c912283;hp=c36ea8ae5894e6ffa8a086889d94326ddbfa4c45;hpb=50aed5a15e214d31b63f6320209ac14fe5c052cb;p=vchess.git

diff --git a/client/src/components/Board.vue b/client/src/components/Board.vue
index c36ea8ae..6a20d54b 100644
--- a/client/src/components/Board.vue
+++ b/client/src/components/Board.vue
@@ -1,31 +1,35 @@
 <script>
-// This can work for squared boards (2 or 4 players), with some adaptations (TODO)
-// TODO: for 3 players, write a "board3.js"
-
 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...
-  // mode: HH, HC or analyze
-  // userColor: for mode HH or HC
-  props: ["vr","lastMove","mode","orientation","userColor","vname"],
+  // userColor is left undefined for an external observer
+  props: ["vr","lastMove","analyze","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);
@@ -33,15 +37,19 @@ 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 choices = h(
       'div',
       {
         attrs: { "id": "choices" },
         'class': { 'row': true },
         style: {
-          "display": this.choices.length>0?"block":"none",
-          "top": "-" + ((sizeY/2)*squareWidth+squareWidth/2) + "px",
+          "display": (this.choices.length > 0 ? "block" : "none"),
+          "top": ((sizeY/2)*squareWidth+squareWidth/2) + "px",
           "width": (this.choices.length * squareWidth) + "px",
           "height": squareWidth + "px",
         },
@@ -75,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',
       {
@@ -98,8 +106,8 @@ export default {
             let cj = (this.orientation=='w' ? j : sizeY-j-1);
             let elems = [];
             if (this.vr.board[ci][cj] != V.EMPTY && (this.vname!="Dark"
-              || this.gameOver || this.mode == "analyze"
-              || this.vr.enlightened[this.userColor][ci][cj]))
+              || this.analyze || (!!this.userColor
+                && this.vr.enlightened[this.userColor][ci][cj])))
             {
               elems.push(
                 h(
@@ -118,7 +126,7 @@ export default {
                 )
               );
             }
-            if (this.hints && hintSquares[ci][cj])
+            if (this.settings.hints && hintSquares[ci][cj])
             {
               elems.push(
                 h(
@@ -142,10 +150,10 @@ export default {
                   ['board'+sizeY]: true,
                   'light-square': (i+j)%2==0,
                   'dark-square': (i+j)%2==1,
-                  [this.bcolor]: true,
-                  'in-shadow': this.vname=="Dark" && !this.gameOver
-                    && this.mode != "analyze"
-                    && !this.vr.enlightened[this.userColor][ci][cj],
+                  [this.settings.bcolor]: true,
+                  'in-shadow': this.vname=="Dark" && !this.analyze
+                    && (!this.userColor
+                      || !this.vr.enlightened[this.userColor][ci][cj]),
                   'highlight': showLight && !!lm && lm.end.x == ci && lm.end.y == cj,
                   'incheck': showLight && incheckSq[ci][cj],
                 },
@@ -159,10 +167,11 @@ export default {
         );
       })
     );
+    const playingColor = this.userColor || "w"; //default for an observer
     let elementArray = [choices, gameDiv];
     if (!!this.vr.reserve)
     {
-      const shiftIdx = (this.userColor=="w" ? 0 : 1);
+      const shiftIdx = (playingColor=="w" ? 0 : 1);
       let myReservePiecesArray = [];
       for (let i=0; i<V.RESERVE_PIECES.length; i++)
       {
@@ -177,17 +186,17 @@ export default {
             'class': {"piece":true, "reserve":true},
             attrs: {
               "src": "/images/pieces/" +
-                this.vr.getReservePpath(this.userColor,i) + ".svg",
+                this.vr.getReservePpath(playingColor,i) + ".svg",
             }
           }),
           h('sup',
             {"class": { "reserve-count": true } },
-            [ this.vr.reserve[this.userColor][V.RESERVE_PIECES[i]] ]
+            [ this.vr.reserve[playingColor][V.RESERVE_PIECES[i]] ]
           )
         ]));
       }
       let oppReservePiecesArray = [];
-      const oppCol = V.GetOppCol(this.userColor);
+      const oppCol = V.GetOppCol(playingColor);
       for (let i=0; i<V.RESERVE_PIECES.length; i++)
       {
         oppReservePiecesArray.push(h('div',
@@ -238,13 +247,6 @@ 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,
@@ -291,9 +293,7 @@ export default {
         this.selectedPiece.style.zIndex = 3000;
         const startSquare = getSquareFromId(e.target.parentNode.id);
         this.possibleMoves = [];
-        const color = this.mode=="analyze" || this.gameOver
-          ? this.vr.turn
-          : this.userColor;
+        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
@@ -363,7 +363,7 @@ export default {
 };
 </script>
 
-<style lang="sass">
+<style lang="sass" scoped>
 .game.reserve-div
   margin-bottom: 18px
 
@@ -373,6 +373,8 @@ export default {
 .reserve-row-1
   margin-bottom: 15px
 
+// NOTE: no variants with reserve of size != 8
+
 div.board
   float: left
   height: 0
@@ -391,16 +393,11 @@ 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