X-Git-Url: https://git.auder.net/?p=vchess.git;a=blobdiff_plain;f=client%2Fsrc%2Fviews%2FRules.vue;h=fc3a0cd9ffc323e841b9c6db4385625e36f22e30;hp=c05e1843f0161f3b473be84425e351ee26d1d8b6;hb=eb2d61de8d569470fa329a484efe9bab420b2b82;hpb=8055eabd23feaabe878b25522929c7273dcb0f24

diff --git a/client/src/views/Rules.vue b/client/src/views/Rules.vue
index c05e1843..fc3a0cd9 100644
--- a/client/src/views/Rules.vue
+++ b/client/src/views/Rules.vue
@@ -1,5 +1,30 @@
 <template lang="pug">
 main
+  input#modalOptions.modal(type="checkbox")
+  div#optionsDiv(
+    role="dialog"
+    data-checkbox="modalOptions"
+  )
+    .card
+      label.modal-close(for="modalOptions")
+      h3 {{ st.tr["Options"] }}
+      fieldset(v-if="!!V")
+        div(v-for="select of V.Options.select")
+          label(:for="select.variable + '_opt'") {{ st.tr[select.label] }} *
+          select(:id="select.variable + '_opt'")
+            option(
+              v-for="o of select.options"
+              :value="o.value"
+              :selected="o.value == select.defaut"
+            )
+              | {{ st.tr[o.label] }}
+        div(v-for="check of V.Options.check")
+          label(:for="check.variable + '_opt'") {{ st.tr[check.label] }} *
+          input(
+            :id="check.variable + '_opt'"
+            type="checkbox"
+            :checked="check.defaut")
+      button(@click="setOptions()") {{ st.tr["Validate"] }}
   .row
     .col-sm-12.col-md-10.col-md-offset-1.col-lg-8.col-lg-offset-2
       .button-group
@@ -26,6 +51,7 @@ main
           | {{ st.tr["Analysis mode"] }}
   .row
     .col-sm-12.col-md-8.col-md-offset-2.col-lg-6.col-lg-offset-3
+      h4#variantName(v-show="display=='rules'") {{ getVariantDisplay }}
       div(
         v-show="display=='rules'"
         v-html="content"
@@ -41,8 +67,10 @@ main
 <script>
 import ComputerGame from "@/components/ComputerGame.vue";
 import { store } from "@/store";
-import { getDiagram } from "@/utils/printDiagram";
+import { replaceByDiag } from "@/utils/printDiagram";
 import { CompgameStorage } from "@/utils/compgameStorage";
+import { processModalClick } from "@/utils/modalClick";
+import afterRawLoad from "@/utils/afterRawLoad";
 export default {
   name: "my-rules",
   components: {
@@ -56,9 +84,9 @@ export default {
       // variables passed to ComputerGame:
       gameInfo: {
         vname: "",
-        mode: "versus",
+        mode: "versus"
       },
-      V: null,
+      V: null
     };
   },
   watch: {
@@ -70,25 +98,27 @@ export default {
     // NOTE: variant cannot be set before store is initialized
     this.re_setVariant(this.$route.params["vname"]);
   },
+  mounted: function() {
+    document.getElementById("optionsDiv")
+      .addEventListener("click", processModalClick);
+  },
   computed: {
     showAnalyzeBtn: function() {
-      return this.V && this.V.CanAnalyze;
+      return !!this.V && this.V.CanAnalyze;
+    },
+    getVariantDisplay: function() {
+      if (!this.gameInfo.vname) return ""; //variant not set yet
+      return this.st.variants.find(v => v.name == this.gameInfo.vname).display;
     },
     content: function() {
       if (!this.gameInfo.vname) return ""; //variant not set yet
-      // (AJAX) Request to get rules content (plain text, HTML)
       return (
-        require("raw-loader!@/translations/rules/" +
-          this.gameInfo.vname +
-          "/" +
-          this.st.lang +
-          ".pug")
-          // Next two lines fix a weird issue after last update (2019-11)
-          .replace(/\\n/g, " ")
-          .replace(/\\"/g, '"')
-          .replace('module.exports = "', "")
-          .replace(/"$/, "")
-          .replace(/(fen:)([^:]*):/g, this.replaceByDiag)
+        afterRawLoad(
+          require(
+            "raw-loader!@/translations/rules/" +
+            this.gameInfo.vname + "/" + this.st.lang + ".pug"
+          ).default
+        ).replace(/(fen:)([^:]*):/g, replaceByDiag)
       );
     }
   },
@@ -97,40 +127,75 @@ export default {
       if (this.display != "rules") this.display = "rules";
       else if (this.gameInProgress) this.display = "computer";
     },
-    parseFen(fen) {
-      const fenParts = fen.split(" ");
-      return {
-        position: fenParts[0],
-        marks: fenParts[1],
-        orientation: fenParts[2],
-        shadow: fenParts[3]
-      };
-    },
-    // Method to replace diagrams in loaded HTML
-    replaceByDiag: function(match, p1, p2) {
-      const args = this.parseFen(p2);
-      return getDiagram(args);
-    },
     re_setVariant: async function(vname) {
-      const vModule = await import("@/variants/" + vname + ".js");
-      this.V = window.V = vModule.VariantRules;
-      this.gameInfo.vname = vname;
+      const key = "rr_" + vname;
+      if (!localStorage.getItem(key))
+        // Mark rules as "read"
+        localStorage.setItem(key, '1');
+      await import("@/variants/" + vname + ".js")
+      .then((vModule) => {
+        this.V = window.V = vModule[vname + "Rules"];
+        this.gameInfo.vname = vname;
+      })
+      .catch((err) => {
+        // Soon after component creation, st.tr might be uninitialized.
+        // Set a timeout to let a chance for the message to show translated.
+        const text = "Mispelled variant name";
+        setTimeout(() => {
+          alert(this.st.tr[text] || text);
+          this.$router.replace("/variants");
+        }, 500);
+      });
     },
-    startGame: function(mode) {
+    setOptions: function() {
+      let options = {};
+      // Get/set options variables / TODO: v-model?!
+      for (const check of this.V.Options.check) {
+        const elt = document.getElementById(check.variable + "_opt");
+        if (elt.checked) options[check.variable] = true;
+      }
+      for (const select of this.V.Options.select) {
+        const elt = document.getElementById(select.variable + "_opt");
+        options[select.variable] = elt.value;
+      }
+      document.getElementById("modalOptions").checked = false;
+      if (this.whatNext == "analyze") this.gotoAnalyze(options);
+      else this.startGame(this.whatNext, options);
+    },
+    startGame: function(mode, options) {
       if (this.gameInProgress) return;
-      this.gameInProgress = true;
-      this.display = "computer";
-      this.gameInfo.mode = mode;
-      if (this.gameInfo.mode == "versus") {
+      const next = (game, options) => {
+        this.gameInProgress = true;
+        this.display = "computer";
+        this.gameInfo.mode = mode;
+        this.$refs["compgame"].launchGame(game, options);
+      };
+      if (!!options) {
+        next(null, options);
+        return;
+      }
+      const askOptions = () => {
+        this.whatNext = mode;
+        doClick("modalOptions");
+      };
+      if (mode == "versus") {
         CompgameStorage.get(this.gameInfo.vname, (game) => {
-          // NOTE: game might be null
-          this.$refs["compgame"].launchGame(game);
+          // NOTE: game might be null (if none stored yet)
+          if (!!game && !V.IsGoodFen(game.fen)) {
+            // Some issues with stored game: delete
+            CompgameStorage.remove(game.vname);
+            game = null;
+          }
+          if (!!game || Object.keys(V.Options).length == 0) next(game);
+          else askOptions();
         });
-      } else {
-        this.$refs["compgame"].launchGame();
+      }
+      else {
+        if (Object.keys(V.Options).length == 0) next();
+        else askOptions();
       }
     },
-    // user wants to stop the game:
+    // The user wants to stop the game:
     stopGame: function() {
       this.$refs["compgame"].gameOver("?", "Undetermined result");
     },
@@ -140,85 +205,30 @@ export default {
       if (this.gameInfo.mode == "versus")
         CompgameStorage.remove(this.gameInfo.vname);
     },
-    gotoAnalyze: function() {
-      this.$router.push(
-        "/analyse/" + this.gameInfo.vname + "/?fen=" + V.GenRandInitFen()
-      );
+    gotoAnalyze: function(options) {
+      if (!options && Object.keys(V.Options).length > 0) {
+        this.whatNext = "analyze";
+        doClick("modalOptions");
+      }
+      else {
+        this.$router.push(
+          "/analyse/" + this.gameInfo.vname +
+          "/?fen=" + V.GenRandInitFen(options)
+        );
+      }
     }
   }
 };
 </script>
 
-<!-- NOTE: not scoped here, because HTML is injected (TODO) -->
+<!-- NOTE: not scoped here, because HTML is injected -->
 <style lang="sass">
-.warn
-  padding: 3px
-  color: red
-  background-color: lightgrey
-  font-weight: bold
+@import "@/styles/_board_squares_img.sass"
+@import "@/styles/_rules.sass"
+</style>
 
-figure.diagram-container
-  margin: 15px 0 15px 0
+<style lang="sass" scoped>
+h4#variantName
   text-align: center
-  width: 100%
-  display: block
-  .diagram
-    display: block
-    width: 40%
-    min-width: 240px
-    margin-left: auto
-    margin-right: auto
-  .diag12
-    float: left
-    margin-left: calc(10% - 20px)
-    margin-right: 40px
-    @media screen and (max-width: 630px)
-      float: none
-      margin: 0 auto 10px auto
-  .diag22
-    float: left
-    margin-right: calc(10% - 20px)
-    @media screen and (max-width: 630px)
-      float: none
-      margin: 0 auto
-  figcaption
-    display: block
-    clear: both
-    padding-top: 5px
-    font-size: 0.8em
-
-p.boxed
-  background-color: #FFCC66
-  padding: 5px
-
-.bigfont
-  font-size: 1.2em
-
-.bold
   font-weight: bold
-
-.stageDelimiter
-  color: purple
-
-// To show (new) pieces, and/or there values...
-figure.showPieces > img
-  width: 50px
-
-figure.showPieces > figcaption
-  color: #6C6C6C
-
-.section-title
-  padding: 0
-
-.section-title > h4
-  padding: 5px
-
-ol, ul:not(.browser-default)
-  padding-left: 20px
-
-ul:not(.browser-default)
-  margin-top: 5px
-
-ul:not(.browser-default) > li
-  list-style-type: disc
 </style>