Update TODO, improve style for Crazyhouse variant, fix an introduced bug in example...

[vchess.git] / client / src / components / Board.vue

diff --git a/client/src/components/Board.vue b/client/src/components/Board.vue
index 640ccca..19a5e32 100644 (file)
--- a/client/src/components/Board.vue
+++ b/client/src/components/Board.vue
@@ -19,6 +19,7 @@ export default {
   ],
   data: function() {
     return {
+      mobileBrowser: ("ontouchstart" in window),
       possibleMoves: [], //filled after each valid click/dragstart
       choices: [], //promotion pieces, or checkered captures... (as moves)
       selectedPiece: null, //moving piece (or clicked piece)
@@ -48,7 +49,10 @@ export default {
     });
 
     const lm = this.lastMove;
-    const showLight = this.settings.highlight && V.ShowMoves == "all";
+    const showLight = (
+      this.settings.highlight &&
+      ["all","highlight"].includes(V.ShowMoves)
+    );
     const orientation = !V.CanFlip ? "w" : this.orientation;
     // Ensure that squares colors do not change when board is flipped
     const lightSquareMod = (sizeX + sizeY) % 2;
@@ -73,6 +77,7 @@ export default {
       );
     };
     // Create board element (+ reserves if needed by variant)
+    let elementArray = [];
     const gameDiv = h(
       "div",
       {
@@ -150,18 +155,19 @@ export default {
         );
       })
     );
-    let elementArray = [gameDiv];
-    const playingColor = this.userColor || "w"; //default for an observer
-    if (this.vr.reserve) {
+    if (!!this.vr.reserve) {
+      const playingColor = this.userColor || "w"; //default for an observer
       const shiftIdx = playingColor == "w" ? 0 : 1;
       let myReservePiecesArray = [];
       for (let i = 0; i < V.RESERVE_PIECES.length; i++) {
+        const qty = this.vr.reserve[playingColor][V.RESERVE_PIECES[i]];
         myReservePiecesArray.push(
           h(
             "div",
             {
               class: { board: true, ["board" + sizeY]: true },
-              attrs: { id: getSquareId({ x: sizeX + shiftIdx, y: i }) }
+              attrs: { id: getSquareId({ x: sizeX + shiftIdx, y: i }) },
+              style: { opacity: qty > 0 ? 1 : 0.35 }
             },
             [
               h("img", {
@@ -173,9 +179,7 @@ export default {
                     ".svg"
                 }
               }),
-              h("sup", { class: { "reserve-count": true } }, [
-                this.vr.reserve[playingColor][V.RESERVE_PIECES[i]]
-              ])
+              h("sup", { class: { "reserve-count": true } }, [ qty ])
             ]
           )
         );
@@ -183,12 +187,14 @@ export default {
       let oppReservePiecesArray = [];
       const oppCol = V.GetOppCol(playingColor);
       for (let i = 0; i < V.RESERVE_PIECES.length; i++) {
+        const qty = this.vr.reserve[oppCol][V.RESERVE_PIECES[i]];
         oppReservePiecesArray.push(
           h(
             "div",
             {
               class: { board: true, ["board" + sizeY]: true },
-              attrs: { id: getSquareId({ x: sizeX + (1 - shiftIdx), y: i }) }
+              attrs: { id: getSquareId({ x: sizeX + (1 - shiftIdx), y: i }) },
+              style: { opacity: qty > 0 ? 1 : 0.35 }
             },
             [
               h("img", {
@@ -200,37 +206,72 @@ export default {
                     ".svg"
                 }
               }),
-              h("sup", { class: { "reserve-count": true } }, [
-                this.vr.reserve[oppCol][V.RESERVE_PIECES[i]]
-              ])
+              h("sup", { class: { "reserve-count": true } }, [ qty ])
             ]
           )
         );
       }
-      let reserves = h(
-        "div",
-        {
-          class: {
-            game: true,
-            "reserve-div": true
-          }
-        },
-        [
-          h(
-            "div",
-            {
-              class: {
-                row: true,
-                "reserve-row-1": true
-              }
-            },
-            myReservePiecesArray
-          ),
-          h("div", { class: { row: true } }, oppReservePiecesArray)
-        ]
+      const myReserveTop = (
+        (playingColor == 'w' && orientation == 'b') ||
+        (playingColor == 'b' && orientation == 'w')
       );
-      elementArray.push(reserves);
+      // Center reserves, assuming same number of pieces for each side:
+      const nbReservePieces = myReservePiecesArray.length;
+      const marginLeft = ((100 - nbReservePieces * (100 / sizeY)) / 2) + "%";
+      const reserveTop =
+        h(
+          "div",
+          {
+            class: {
+              game: true,
+              "reserve-div": true
+            },
+            style: {
+              "margin-left": marginLeft
+            }
+          },
+          [
+            h(
+              "div",
+              {
+                class: {
+                  row: true,
+                  "reserve-row": true
+                }
+              },
+              myReserveTop ? myReservePiecesArray : oppReservePiecesArray
+            )
+          ]
+        );
+      var reserveBottom =
+        h(
+          "div",
+          {
+            class: {
+              game: true,
+              "reserve-div": true
+            },
+            style: {
+              "margin-left": marginLeft
+            }
+          },
+          [
+            h(
+              "div",
+              {
+                class: {
+                  row: true,
+                  "reserve-row": true
+                }
+              },
+              myReserveTop ? oppReservePiecesArray : myReservePiecesArray
+            )
+          ]
+        );
+      elementArray.push(reserveTop);
     }
+    elementArray.push(gameDiv);
+    if (!!this.vr.reserve) elementArray.push(reserveBottom);
     const boardElt = document.querySelector(".game");
     if (this.choices.length > 0 && !!boardElt) {
       //no choices to show at first drawing
@@ -289,7 +330,7 @@ export default {
     }
     let onEvents = {};
     // NOTE: click = mousedown + mouseup
-    if ("ontouchstart" in window) {
+    if (this.mobileBrowser) {
       onEvents = {
         on: {
           touchstart: this.mousedown,
@@ -340,9 +381,10 @@ export default {
     mousemove: function(e) {
       if (!this.selectedPiece) return;
       // There is an active element: move it around
-      const [offsetX, offsetY] = e.clientX
-        ? [e.clientX, e.clientY] //desktop browser
-        : [e.changedTouches[0].pageX, e.changedTouches[0].pageY]; //smartphone
+      const [offsetX, offsetY] =
+        this.mobileBrowser
+          ? [e.changedTouches[0].pageX, e.changedTouches[0].pageY]
+          : [e.clientX, e.clientY];
       this.selectedPiece.style.left = offsetX - this.start.x + "px";
       this.selectedPiece.style.top = offsetY - this.start.y + "px";
     },
@@ -350,9 +392,10 @@ export default {
       if (!this.selectedPiece) return;
       // There is an active element: obtain the move from start and end squares
       this.selectedPiece.style.zIndex = -3000; //HACK to find square from final coords
-      const [offsetX, offsetY] = e.clientX
-        ? [e.clientX, e.clientY]
-        : [e.changedTouches[0].pageX, e.changedTouches[0].pageY];
+      const [offsetX, offsetY] =
+        this.mobileBrowser
+          ? [e.changedTouches[0].pageX, e.changedTouches[0].pageY]
+          : [e.clientX, e.clientY];
       let landing = document.elementFromPoint(offsetX, offsetY);
       this.selectedPiece.style.zIndex = 3000;
       // Next condition: classList.contains(piece) fails because of marks
@@ -393,7 +436,7 @@ export default {
 .reserve-count
   padding-left: 40%
 
-.reserve-row-1
+.reserve-row
   margin-bottom: 15px
 
 // NOTE: no variants with reserve of size != 8