X-Git-Url: https://git.auder.net/images/pieces/%22%20%20VariantRules.getPpath%28board%5Bi%5D%5Bj%5D%29%20%20%20%22.svg?a=blobdiff_plain;f=client%2Fsrc%2Fcomponents%2FMoveList.vue;h=9ec968f8878dca3886efe93ebc2135e2b628a0e4;hb=7a1d72724ca06099ac87f094e7216d29a05c7a3e;hp=6df5a70a1f1f002f28774d3def997582c109d31e;hpb=933fd1f90a080c1a3e477cc36adebb5e8db8a9d3;p=vchess.git

diff --git a/client/src/components/MoveList.vue b/client/src/components/MoveList.vue
index 6df5a70a..9ec968f8 100644
--- a/client/src/components/MoveList.vue
+++ b/client/src/components/MoveList.vue
@@ -1,99 +1,102 @@
+<template lang="pug">
+div
+  input#modalAdjust.modal(type="checkbox")
+  div#adjuster(
+    role="dialog"
+    data-checkbox="modalAdjust"
+  )
+    .card.text-center
+      label.modal-close(for="modalAdjust")
+      label(for="boardSize") {{ st.tr["Board size"] }}
+      input#boardSize.slider(
+        type="range"
+        min="0"
+        max="100"
+        value="50"
+        @input="adjustBoard()"
+      )
+  #aboveMoves
+    // NOTE: variants pages already have a "Rules" link on top
+    span#rulesBtn(
+      v-if="!$route.path.match('/variants/')"
+      @click="$emit('showrules')"
+    )
+      | {{ st.tr["Rules"] }}
+    button(
+      :class="btnTooltipClass()"
+      onClick="window.doClick('modalAdjust')"
+      :aria-label="st.tr['Resize board']"
+    )
+      img.inline(src="/images/icons/resize.svg")
+    button#analyzeBtn(
+      v-if="canAnalyze"
+      :class="btnTooltipClass()"
+      @click="$emit('analyze')"
+      :aria-label="st.tr['Analyse']"
+    )
+      img.inline(src="/images/icons/analyse.svg")
+    #downloadDiv(v-if="canDownload")
+      a#download(href="#")
+      button(
+        :class="btnTooltipClass()"
+        @click="$emit('download')"
+        :aria-label="st.tr['Download'] + ' PGN'"
+      )
+        img.inline(src="/images/icons/download.svg")
+  #scoreInfo(v-if="score!='*'")
+    span.score {{ score }}
+    span.score-msg {{ st.tr[message] }}
+  .moves-list(v-if="!['none','highlight'].includes(show)")
+    .tr(v-for="moveIdx in evenNumbers")
+      .td {{ firstNum + moveIdx / 2 }}
+      .td(v-if="moveIdx < moves.length-1 || show == 'all'"
+        :class="{'highlight-lm': cursor == moveIdx}"
+        @click="() => gotoMove(moveIdx)"
+      )
+        | {{ notation(moves[moveIdx]) }}
+      .td(
+        v-if="moveIdx < moves.length-1"
+        :class="{'highlight-lm': highlightBlackmove(moveIdx+1)}"
+        @click="() => gotoMove(moveIdx+1)"
+      )
+        | {{ notation(moves[moveIdx + 1]) }}
+</template>
+
 <script>
 import { store } from "@/store";
+import { getFullNotation } from "@/utils/notation";
+import { processModalClick } from "@/utils/modalClick";
 export default {
   name: "my-move-list",
-  props: ["moves", "show", "cursor", "score", "message", "firstNum"],
-  // TODO: if show == "byrows", show only full rows.
-  render(h) {
-    let rootElements = [];
-    if (!!this.score && this.score != "*") {
-      const scoreDiv = h(
-        "div",
-        {
-          id: "scoreInfo",
-          style: {
-            display: this.score != "*" ? "block" : "none"
-          }
-        },
-        [h("p", this.score), h("p", store.state.tr[this.message])]
-      );
-      rootElements.push(scoreDiv);
-    }
-    if (this.moves.length > 0) {
-      let tableContent = [];
-      let moveCounter = 0;
-      let tableRow = undefined;
-      let moveCells = undefined;
-      let curCellContent = "";
-      let firstIndex = 0;
-      for (let i = 0; i < this.moves.length; i++) {
-        if (this.moves[i].color == "w") {
-          if (i == 0 || (i > 0 && this.moves[i - 1].color == "b")) {
-            if (tableRow) {
-              tableRow.children = moveCells;
-              tableContent.push(tableRow);
-            }
-            moveCells = [
-              h(
-                "div",
-                {
-                  "class": {td: true},
-                  domProps: { innerHTML: ++moveCounter + "." }
-                }
-              )
-            ];
-            tableRow = h("div", {"class": {tr: true}});
-            curCellContent = "";
-            firstIndex = i;
-          }
-        }
-        // Next condition is fine because even if the first move is black,
-        // there will be the "..." which count as white move.
-        else if (this.moves[i].color == "b" && this.moves[i - 1].color == "w")
-          firstIndex = i;
-        curCellContent += this.moves[i].notation;
-        if (
-          i < this.moves.length - 1 &&
-          this.moves[i + 1].color == this.moves[i].color
-        )
-          curCellContent += ",";
-        else {
-          // Color change
-          moveCells.push(
-            h(
-              "div",
-              {
-                "class": {
-                  td: true,
-                  "highlight-lm": this.cursor >= firstIndex && this.cursor <= i
-                },
-                domProps: { innerHTML: curCellContent },
-                on: { click: () => this.gotoMove(i) }
-              }
-            )
-          );
-          curCellContent = "";
-        }
-      }
-      // Complete last row, which might not be full:
-      if (moveCells.length - 1 == 1) {
-        moveCells.push(h("div", {"class": {td: true}}));
-      }
-      tableRow.children = moveCells;
-      tableContent.push(tableRow);
-      rootElements.push(
-        h(
-          "div",
-          {
-            class: {
-              "moves-list": true
-            }
-          },
-          tableContent
-        )
-      );
+  props: [
+    "moves", "show", "canAnalyze", "canDownload",
+    "cursor", "score", "message", "firstNum"],
+  data: function() {
+    return {
+      st: store.state
+    };
+  },
+  mounted: function() {
+    document.getElementById("adjuster")
+      .addEventListener("click", processModalClick);
+    // Take full width on small screens:
+    let boardSize = parseInt(localStorage.getItem("boardSize"));
+    if (!boardSize) {
+      boardSize =
+        window.innerWidth >= 768
+          ? 0.75 * Math.min(window.innerWidth, window.innerHeight)
+          : window.innerWidth;
     }
-    return h("div", {}, rootElements);
+    const movesWidth = window.innerWidth >= 768 ? 280 : 0;
+    document.getElementById("boardContainer").style.width = boardSize + "px";
+    let gameContainer = document.getElementById("gameContainer");
+    gameContainer.style.width = boardSize + movesWidth + "px";
+    document.getElementById("boardSize").value =
+      (boardSize * 100) / (window.innerWidth - movesWidth);
+    window.addEventListener("resize", this.adjustBoard);
+  },
+  beforeDestroy: function() {
+    window.removeEventListener("resize", this.adjustBoard);
   },
   watch: {
     cursor: function(newCursor) {
@@ -101,7 +104,12 @@ export default {
       // $nextTick to wait for table > tr to be rendered
       this.$nextTick(() => {
         let curMove = document.querySelector(".td.highlight-lm");
-        if (curMove) {
+        if (!curMove && this.moves.length > 0) {
+          // Cursor is before game beginning, and some moves were made:
+          curMove =
+            document.querySelector(".moves-list > .tr:first-child > .td");
+        }
+        if (!!curMove) {
           curMove.scrollIntoView({
             behavior: "auto",
             block: "nearest"
@@ -110,9 +118,50 @@ export default {
       });
     }
   },
+  computed: {
+    evenNumbers: function() {
+      return [...Array(this.moves.length).keys()].filter(i => i%2==0);
+    }
+  },
   methods: {
+    notation: function(move) {
+      return getFullNotation(move);
+    },
+    highlightBlackmove: function(moveIdx) {
+      return (
+        this.cursor == moveIdx ||
+        (
+          // If display by rows, hightlight last black move while the white
+          // move is being played:
+          this.show == "byrow" &&
+          this.cursor == moveIdx + 1 &&
+          // ...except if cursor is behind in the game:
+          this.cursor == this.moves.length - 1
+        )
+      );
+    },
+    btnTooltipClass: function() {
+      return { tooltip: !("ontouchstart" in window) };
+    },
     gotoMove: function(index) {
-      this.$emit("goto-move", index);
+      // Goto move except if click on current move:
+      if (this.cursor != index) this.$emit("goto-move", index);
+    },
+    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";
+      this.$emit("redraw-board");
     }
   }
 };
@@ -120,6 +169,7 @@ export default {
 
 <style lang="sass" scoped>
 .moves-list
+  user-select: none
   cursor: pointer
   min-height: 1px
   max-height: 500px
@@ -131,12 +181,12 @@ export default {
     border-bottom: 1px solid lightgrey
     & > .td
       float: left
-      padding: 2% 0 2% 1%
+      padding: 2% 0 2% 2%
       &:first-child
         color: grey
-        width: 15%
+        width: 13%
       &:not(first-child)
-        width: 41%
+        width: 40.5%
 
 @media screen and (max-width: 767px)
   .moves-list
@@ -144,4 +194,49 @@ export default {
 
 .td.highlight-lm
   background-color: plum
+
+#boardSizeBtnContainer
+  width: 100%
+  text-align: center
+
+[type="checkbox"]#modalAdjust+div .card
+  padding: 5px
+
+img.inline
+  height: 22px
+  @media screen and (max-width: 767px)
+    height: 18px
+
+#scoreInfo
+  margin: 10px 0
+  @media screen and (max-width: 767px)
+    margin: 5px 0
+
+span.score
+  display: inline-block
+  margin-left: 10px
+  font-weight: bold
+
+span.score-msg
+  display: inline-block
+  margin-left: 10px
+  font-style: italic
+
+#downloadDiv
+  display: inline-block
+  margin: 0
+
+span#rulesBtn
+  cursor: pointer
+  display: inline-block
+  margin: 0 10px
+  font-weight: bold
+
+button
+  margin: 0
+  &.active
+    background-color: #48C9B0
+
+#aboveMoves button
+  padding-bottom: 5px
 </style>