X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fcomponents%2FMoveList.vue;h=ecdc14207f6a432656810c84373b6791f84f26b3;hb=7a0c1b7e33a346195caebfdfa6489e7c6d0457e6;hp=aa12969aa1c968311d1c2223632dd01bffa569f4;hpb=910d631b73cad5ffef1b4461157b704e7e7057d8;p=vchess.git

diff --git a/client/src/components/MoveList.vue b/client/src/components/MoveList.vue
index aa12969a..ecdc1420 100644
--- a/client/src/components/MoveList.vue
+++ b/client/src/components/MoveList.vue
@@ -1,26 +1,111 @@
+<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="clickRulesBtn()"
+      :class="btnRulesClass"
+    )
+      | {{ 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
+    .tr(v-for="moveIdx in evenNumbers")
+      .td {{ firstNum + moveIdx / 2 }}
+      .td(
+        :class="{'highlight-lm': cursor == moveIdx}"
+        @click="() => gotoMove(moveIdx)"
+        v-html="notation(moveIdx)")
+      .td(
+        v-if="moveIdx < moves.length-1"
+        :class="{'highlight-lm': cursor == moveIdx+1}"
+        @click="() => gotoMove(moveIdx+1)"
+        v-html="notation(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", "cursor", "score", "message", "firstNum"],
+  props: [
+    "moves", "show", "canAnalyze", "canDownload",
+    "vname", "cursor", "score", "message", "firstNum"],
+  data: function() {
+    return {
+      st: store.state
+    };
+  },
+  mounted: function() {
+    document.getElementById("adjuster")
+      .addEventListener("click", processModalClick);
+    // Take full width on small screens:
+    const movesWidth = window.innerWidth >= 768 ? 280 : 0;
+    const winBound = Math.min(window.innerWidth - movesWidth, window.innerHeight);
+    let boardSize = (window.innerWidth >= 768 ? 0.7 : 1.0) * winBound;
+    document.getElementById("boardContainer").style.width = boardSize + "px";
+    let gameContainer = document.getElementById("gameContainer");
+    gameContainer.style.width = boardSize + movesWidth + "px";
+    const minBoardWidth =
+      (window.innerWidth <= 767 || "ontouchstart" in window) ? 160 : 240;
+    document.getElementById("boardSize").value = (boardSize - minBoardWidth) * 100 / (winBound - minBoardWidth);
+    window.addEventListener("resize", () => this.adjustBoard());
+  },
+  beforeDestroy: function() {
+    window.removeEventListener("resize", this.adjustBoard);
+  },
   watch: {
     cursor: function(newCursor) {
       if (window.innerWidth <= 767) return; //scrolling would hide chessboard
-      // Count grouped moves until the cursor (if multi-moves):
-      let groupsCount = -1;
-      let curCol = undefined;
-      for (let i = 0; i < newCursor; i++) {
-        const m = this.moves[i];
-        if (m.color != curCol) {
-          groupsCount++;
-          curCol = m.color;
-        }
-      }
       // $nextTick to wait for table > tr to be rendered
       this.$nextTick(() => {
-        let rows = document.querySelectorAll("#movesList tr");
-        if (rows.length > 0) {
-          rows[Math.floor(Math.max(groupsCount, 0) / 2)].scrollIntoView({
+        let curMove = document.querySelector(".td.highlight-lm");
+        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"
           });
@@ -28,89 +113,81 @@ export default {
       });
     }
   },
-  render(h) {
-    if (this.moves.length == 0) return h("div");
-    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("td", { domProps: { innerHTML: ++moveCounter + "." } })
-          ];
-          tableRow = h("tr", {});
-          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 += ",";
-      //color change
-      else {
-        moveCells.push(
-          h("td", {
-            domProps: { innerHTML: curCellContent },
-            on: { click: () => this.gotoMove(i) },
-            class: {
-              "highlight-lm": this.cursor >= firstIndex && this.cursor <= i
-            }
-          })
-        );
-        curCellContent = "";
-      }
-    }
-    // Complete last row, which might not be full:
-    if (moveCells.length - 1 == 1) {
-      moveCells.push(h("td", { domProps: { innerHTML: "" } }));
-    }
-    tableRow.children = moveCells;
-    tableContent.push(tableRow);
-    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);
+  computed: {
+    evenNumbers: function() {
+      return [...Array(this.moves.length).keys()].filter(i => i%2==0);
+    },
+    btnRulesClass: function() {
+      // "rr" for "rules read"
+      return {
+        highlightRules:
+          !!this.vname && !localStorage.getItem("rr_" + this.vname)
+      };
     }
-    rootElements.push(
-      h(
-        "table",
-        {
-          class: {
-            "moves-list": true
-          }
-        },
-        tableContent
-      )
-    );
-    return h("div", {}, rootElements);
   },
   methods: {
+    notation: function(moveIdx) {
+      const move = this.moves[moveIdx];
+      if (this.score != "*") return getFullNotation(move);
+      if (
+        ['none','highlight'].includes(this.show) ||
+        (
+          this.show == "byrow" &&
+          moveIdx == this.moves.length-1 &&
+          moveIdx % 2 == 0
+        )
+      ) {
+        return "?";
+      }
+      return getFullNotation(move);
+    },
+    btnTooltipClass: function() {
+      return { tooltip: !("ontouchstart" in window) };
+    },
+    clickRulesBtn: function() {
+      const key = "rr_" + this.vname;
+      if (!localStorage.getItem(key)) {
+        localStorage.setItem(key, '1');
+        document.getElementById("rulesBtn").classList.remove("highlightRules");
+      }
+      this.$emit("showrules");
+    },
     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(vertical) {
+      const boardContainer = document.getElementById("boardContainer");
+      if (!boardContainer) return; //no board on page
+      const movesWidth = window.innerWidth >= 768 ? 280 : 0;
+      let gameContainer = document.getElementById("gameContainer");
+      if (vertical) {
+        const bRect =
+          document.getElementById("rootBoardElement").getBoundingClientRect();
+        if (bRect.bottom > window.innerHeight) {
+          const maxHeight = window.innerHeight - 20;
+          document.getElementById("boardContainer").style.height = maxHeight + "px";
+          const boardSize = maxHeight * bRect.width / bRect.height;
+          boardContainer.style.width = Math.min(boardSize, boardContainer.style.width) + "px";
+          gameContainer.style.width = boardSize + movesWidth + "px";
+          this.$emit("redraw-board");
+          setTimeout( () => window.scroll(0, bRect.top), 1000);
+        }
+      }
+      else {
+        const k = document.getElementById("boardSize").value;
+        // TODO: these 160 and 280 are arbitrary...
+        const minBoardWidth =
+          (window.innerWidth <= 767 || "ontouchstart" in window) ? 160 : 240;
+        // Value of 0 is board min size; 100 is window.width [- movesWidth]
+        const maxWidth =
+          Math.min(window.innerHeight, window.innerWidth - movesWidth);
+        const boardSize =
+          minBoardWidth + (k * (maxWidth - minBoardWidth)) / 100;
+        boardContainer.style.width = boardSize + "px";
+        gameContainer.style.width = boardSize + movesWidth + "px";
+        this.$emit("redraw-board");
+      }
     }
   }
 };
@@ -118,67 +195,78 @@ export default {
 
 <style lang="sass" scoped>
 .moves-list
-  min-width: 250px
+  user-select: none
+  cursor: pointer
+  min-height: 1px
+  max-height: 500px
+  overflow: auto
+  background-color: white
+  width: 280px
+  & > .tr
+    clear: both
+    border-bottom: 1px solid lightgrey
+    & > .td
+      float: left
+      padding: 2% 0 2% 2%
+      &:first-child
+        color: grey
+        width: 13%
+      &:not(first-child)
+        width: 40.5%
+
+@media screen and (max-width: 767px)
+  .moves-list
+    width: 100%
 
-td.highlight-lm
+.td.highlight-lm
   background-color: plum
-</style>
 
-<!-- TODO: use template function + multi-moves: much easier
-<template lang="pug">
-div
-  #scoreInfo(v-if="score!='*'")
-    p {{ score }}
-    p {{ message }}
-  table.moves-list
-    tbody
-      tr(v-for="moveIdx in evenNumbers")
-        td {{ firstNum + moveIdx / 2 + 1 }}
-        td(:class="{'highlight-lm': cursor == moveIdx}"
-            @click="() => gotoMove(moveIdx)")
-          | {{ moves[moveIdx].notation }}
-        td(v-if="moveIdx < moves.length-1"
-            :class="{'highlight-lm': cursor == moveIdx+1}"
-            @click="() => gotoMove(moveIdx+1)")
-          | {{ moves[moveIdx+1].notation }}
-        // Else: just add an empty cell
-        td(v-else)
-</template>
+.highlightRules
+  padding: 3px 5px
+  background-color: yellow
 
-<script>
-// Component for moves list on the right
-export default {
-  name: 'my-move-list',
-	props: ["moves","cursor","score","message","firstNum"],
-  watch: {
-    cursor: function(newValue) {
-      if (window.innerWidth <= 767)
-        return; //moves list is below: scrolling would hide chessboard
-      if (newValue < 0)
-        newValue = 0; //avoid rows[-1] => error
-      // $nextTick to wait for table > tr to be rendered
-      this.$nextTick( () => {
-        let rows = document.querySelectorAll('#movesList tr');
-        if (rows.length > 0)
-        {
-          rows[Math.floor(newValue/2)].scrollIntoView({
-            behavior: "auto",
-            block: "nearest",
-          });
-        }
-      });
-    },
-  },
-  computed: {
-    evenNumbers: function() {
-      return [...Array(this.moves.length).keys()].filter(i => i%2==0);
-    },
-  },
-  methods: {
-		gotoMove: function(index) {
-			this.$emit("goto-move", index);
-		},
-	},
-};
-</script>
--->
+#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>