X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fviews%2FRules.vue;h=c48feb08849c446d8492b339a6e8fd2c8cdfe4f1;hb=07052665845283c65b50a76537669d0602ba436b;hp=8e88330176e0526ba140491166c2facce4624dd7;hpb=602d6befd30793111d3fda6e733f73e08d8b7a30;p=vchess.git

diff --git a/client/src/views/Rules.vue b/client/src/views/Rules.vue
index 8e883301..c48feb08 100644
--- a/client/src/views/Rules.vue
+++ b/client/src/views/Rules.vue
@@ -3,132 +3,155 @@ main
   .row
     .col-sm-12.col-md-10.col-md-offset-1.col-lg-8.col-lg-offset-2
       .button-group
-        button(@click="clickReadRules") {{ st.tr["Rules"] }}
-        button(v-show="!gameInProgress" @click="() => startGame('auto')")
-          | {{ st.tr["Sample game"] }}
-        button(v-show="!gameInProgress" @click="() => startGame('versus')")
+        button(@click="clickReadRules()") {{ st.tr["Rules"] }}
+        button(
+          v-show="!gameInProgress"
+          @click="startGame('auto')"
+        )
+          | {{ st.tr["Example game"] }}
+        button(
+          v-show="!gameInProgress"
+          @click="startGame('versus')"
+        )
           | {{ st.tr["Practice"] }}
-        button(v-show="gameInProgress" @click="() => stopGame()")
+        button(
+          v-show="gameInProgress"
+          @click="stopGame()"
+        )
           | {{ st.tr["Stop game"] }}
-        button(v-if="display=='rules' && gameInfo.vname!='Dark'"
-            @click="gotoAnalyze")
-          | {{ st.tr["Analyze"] }}
-      .section-content(v-show="display=='rules'" v-html="content")
-  ComputerGame(v-show="display=='computer'" :game-info="gameInfo"
-    @game-over="stopGame" @game-stopped="gameStopped")
+        button(
+          v-if="showAnalyzeBtn"
+          @click="gotoAnalyze()"
+        )
+          | {{ 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"
+      )
+  ComputerGame(
+    ref="compgame"
+    v-show="display=='computer'"
+    :game-info="gameInfo"
+    @game-stopped="gameStopped"
+  )
 </template>
 
 <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',
+  name: "my-rules",
   components: {
-    ComputerGame,
+    ComputerGame
   },
   data: function() {
     return {
       st: store.state,
-      content: "",
       display: "rules",
       gameInProgress: false,
       // variables passed to ComputerGame:
       gameInfo: {
-        vname: "_unknown",
+        vname: "",
         mode: "versus",
-        fen: "",
-        score: "*",
-      }
+      },
+      V: null,
     };
   },
   watch: {
-    "$route": function(newRoute) {
-      this.tryChangeVariant(newRoute.params["vname"]);
-    },
+    $route: function(newRoute) {
+      this.re_setVariant(newRoute.params["vname"]);
+    }
   },
-  created: async function() {
+  created: function() {
     // NOTE: variant cannot be set before store is initialized
-    this.tryChangeVariant(this.$route.params["vname"]);
+    this.re_setVariant(this.$route.params["vname"]);
   },
-  methods: {
-    clickReadRules: function() {
-      if (this.display != "rules")
-        this.display = "rules";
-      else if (this.gameInProgress)
-        this.display = "computer";
+  computed: {
+    showAnalyzeBtn: function() {
+      return !!this.V && this.V.CanAnalyze;
     },
-    parseFen(fen) {
-      const fenParts = fen.split(" ");
-      return {
-        position: fenParts[0],
-        marks: fenParts[1],
-        orientation: fenParts[2],
-        shadow: fenParts[3],
-      };
-    },
-    tryChangeVariant: async function(vname) {
-      if (!vname || vname == "_unknown")
-        return;
-      this.gameInfo.vname = vname;
-      const vModule = await import("@/variants/" + vname + ".js");
-      window.V = vModule.VariantRules;
-      // Method to replace diagrams in loaded HTML
-      const replaceByDiag = (match, p1, p2) => {
-        const args = this.parseFen(p2);
-        return getDiagram(args);
-      };
+    content: function() {
+      if (!this.gameInfo.vname) return ""; //variant not set yet
       // (AJAX) Request to get rules content (plain text, HTML)
-      this.content =
-        require("raw-loader!@/translations/rules/" + vname + "/" + this.st.lang + ".pug")
+      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('module.exports = "', '').replace(/"$/, "")
-        .replace(/(fen:)([^:]*):/g, replaceByDiag);
+        .replace(/\\n/g, " ")
+        .replace(/\\"/g, '"')
+        .replace('module.exports = "', "")
+        .replace(/"$/, "")
+        .replace(/(fen:)([^:]*):/g, replaceByDiag)
+      );
+    }
+  },
+  methods: {
+    clickReadRules: function() {
+      if (this.display != "rules") this.display = "rules";
+      else if (this.gameInProgress) this.display = "computer";
+    },
+    re_setVariant: async function(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;
+      if (this.gameInProgress) return;
       this.gameInProgress = true;
       this.display = "computer";
       this.gameInfo.mode = mode;
-      this.gameInfo.score = "*";
-      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:
-    stopGame: function(score) {
-      this.gameInfo.score = score || "?";
+    // 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("/analyze/" + this.gameInfo.vname
-        + "/?fen=" + V.GenRandInitFen());
-    },
-  },
+      this.$router.push(
+        "/analyse/" + this.gameInfo.vname +
+        "/?fen=" + V.GenRandInitFen(this.st.settings.randomness)
+      );
+    }
+  }
 };
 </script>
 
 <!-- NOTE: not scoped here, because HTML is injected (TODO) -->
 <style lang="sass">
-//.section-content
-//  *
-//    margin-left: auto
-//    margin-right: auto
-//    max-width: 767px
-//  figure.diagram-container
-//    max-width: 1000px
-//  @media screen and (max-width: 767px)
-//    max-width: 100%
-//    padding: 0 5px
-
-.warn
-  padding: 3px
-  color: red
-  background-color: lightgrey
+h4#variantName
+  text-align: center
   font-weight: bold
 
 figure.diagram-container
@@ -138,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)
@@ -151,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
@@ -165,6 +190,12 @@ p.boxed
   background-color: #FFCC66
   padding: 5px
 
+.bigfont
+  font-size: 1.2em
+
+.bold
+  font-weight: bold
+
 .stageDelimiter
   color: purple
 
@@ -190,47 +221,13 @@ ul:not(.browser-default)
 ul:not(.browser-default) > li
   list-style-type: disc
 
-.light-square-diag
-  background-color: #e5e5ca
-
-.dark-square-diag
-  background-color: #6f8f57
+table
+  margin: 15px auto
 
-// TODO: following is duplicated (Board.vue)
-div.board
-  float: left
-  height: 0
-  display: inline-block
-  position: relative
+.italic
+  font-style: italic
 
-div.board8
-  width: 12.5%
-  padding-bottom: 12.5%
-
-div.board10
-  width: 10%
-  padding-bottom: 10%
-
-div.board11
-  width: 9.09%
-  padding-bottom: 9.1%
-
-img.piece
-  width: 100%
-
-img.piece, img.mark-square
-  max-width: 100%
-  height: auto
+img.img-center
   display: block
-
-img.mark-square
-  opacity: 0.6
-  width: 76%
-  position: absolute
-  top: 12%
-  left: 12%
-  opacity: .7
-
-.in-shadow
-  filter: brightness(50%)
+  margin: 0 auto 15px auto
 </style>