X-Git-Url: https://git.auder.net/images/pieces/current/gitweb.js?a=blobdiff_plain;f=client%2Fsrc%2Fviews%2FRules.vue;h=c48feb08849c446d8492b339a6e8fd2c8cdfe4f1;hb=07052665845283c65b50a76537669d0602ba436b;hp=f864e9e4927a480b20b89a00371756c37ccb3a06;hpb=866842c3c310524c034922870234120ed2a16cbf;p=vchess.git

diff --git a/client/src/views/Rules.vue b/client/src/views/Rules.vue
index f864e9e4..c48feb08 100644
--- a/client/src/views/Rules.vue
+++ b/client/src/views/Rules.vue
@@ -23,7 +23,10 @@ main
           v-if="showAnalyzeBtn"
           @click="gotoAnalyze()"
         )
-          | {{ st.tr["Analyse"] }}
+          | {{ st.tr["Analysis mode"] }}
+  .row
+    .col-sm-12.col-md-8.col-md-offset-2.col-lg-6.col-lg-offset-3
+      h4#variantName {{ gameInfo.vname }}
       div(
         v-show="display=='rules'"
         v-html="content"
@@ -39,7 +42,8 @@ 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";
 export default {
   name: "my-rules",
   components: {
@@ -54,8 +58,8 @@ export default {
       gameInfo: {
         vname: "",
         mode: "versus",
-        fen: ""
-      }
+      },
+      V: null,
     };
   },
   watch: {
@@ -69,23 +73,23 @@ export default {
   },
   computed: {
     showAnalyzeBtn: function() {
-      return (this.display=='rules' && (!window.V || V.CanAnalyse));
+      return !!this.V && this.V.CanAnalyze;
     },
     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)
+        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, replaceByDiag)
       );
     }
   },
@@ -94,43 +98,50 @@ 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");
-      window.V = vModule.VariantRules;
-      this.gameInfo.vname = vname;
+      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) {
       if (this.gameInProgress) return;
       this.gameInProgress = true;
       this.display = "computer";
       this.gameInfo.mode = mode;
-      this.$set(this.gameInfo, "fen", V.GenRandInitFen());
+      if (this.gameInfo.mode == "versus") {
+        CompgameStorage.get(this.gameInfo.vname, (game) => {
+          // NOTE: game might be null
+          this.$refs["compgame"].launchGame(game);
+        });
+      } else {
+        this.$refs["compgame"].launchGame();
+      }
     },
-    // user is willing to stop the game:
+    // user wants to stop the game:
     stopGame: function() {
       this.$refs["compgame"].gameOver("?", "Undetermined result");
     },
     // The game is effectively stopped:
     gameStopped: function() {
       this.gameInProgress = false;
+      if (this.gameInfo.mode == "versus")
+        CompgameStorage.remove(this.gameInfo.vname);
     },
     gotoAnalyze: function() {
       this.$router.push(
-        "/analyse/" + this.gameInfo.vname + "/?fen=" + V.GenRandInitFen()
+        "/analyse/" + this.gameInfo.vname +
+        "/?fen=" + V.GenRandInitFen(this.st.settings.randomness)
       );
     }
   }
@@ -139,10 +150,8 @@ export default {
 
 <!-- NOTE: not scoped here, because HTML is injected (TODO) -->
 <style lang="sass">
-.warn
-  padding: 3px
-  color: red
-  background-color: lightgrey
+h4#variantName
+  text-align: center
   font-weight: bold
 
 figure.diagram-container
@@ -152,12 +161,13 @@ figure.diagram-container
   display: block
   .diagram
     display: block
-    width: 40%
+    width: 50%
     min-width: 240px
     margin-left: auto
     margin-right: auto
   .diag12
     float: left
+    width: 40%
     margin-left: calc(10% - 20px)
     margin-right: 40px
     @media screen and (max-width: 630px)
@@ -165,6 +175,7 @@ figure.diagram-container
       margin: 0 auto 10px auto
   .diag22
     float: left
+    width: 40%
     margin-right: calc(10% - 20px)
     @media screen and (max-width: 630px)
       float: none
@@ -209,4 +220,14 @@ ul:not(.browser-default)
 
 ul:not(.browser-default) > li
   list-style-type: disc
+
+table
+  margin: 15px auto
+
+.italic
+  font-style: italic
+
+img.img-center
+  display: block
+  margin: 0 auto 15px auto
 </style>