X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fviews%2FRules.vue;h=8ac03a9124e921f4b5296e5e009dd86957e520e1;hb=20620465247585ed4e845885c4d9fee8cd6920c1;hp=701d56a7c7fec66db931d13adad61ba4b05d0612;hpb=834c202a003ca6285106133336701b340939ba12;p=vchess.git

diff --git a/client/src/views/Rules.vue b/client/src/views/Rules.vue
index 701d56a7..8ac03a91 100644
--- a/client/src/views/Rules.vue
+++ b/client/src/views/Rules.vue
@@ -1,97 +1,145 @@
 <template lang="pug">
-.row
-  .col-sm-12.col-md-10.col-md-offset-1.col-lg-8.col-lg-offset-2
-    .button-group
-      button(@click="display='rules'") Read the rules
-      button(v-show="!gameInProgress" @click="() => startGame('auto')")
-        | Observe a sample game
-      button(v-show="!gameInProgress" @click="() => startGame('versus')")
-        | Beat the computer!
-      button(v-show="gameInProgress" @click="stopGame")
-        | Stop game
-    .section-content(v-show="display=='rules'" v-html="content")
-    ComputerGame(v-show="display=='computer'" :game-info="gameInfo"
-      @computer-think="gameInProgress=false" @game-over="stopGame")
+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["Example game"] }}
+        button(
+          v-show="!gameInProgress"
+          @click="startGame('versus')"
+        )
+          | {{ st.tr["Practice"] }}
+        button(
+          v-show="gameInProgress"
+          @click="stopGame()"
+        )
+          | {{ st.tr["Stop game"] }}
+        button(
+          v-if="showAnalyzeBtn"
+          @click="gotoAnalyze()"
+        )
+          | {{ st.tr["Analyse"] }}
+      div(
+        v-show="display=='rules'"
+        v-html="content"
+      )
+  ComputerGame(
+    v-show="display=='computer'"
+    :game-info="gameInfo"
+    @game-over="stopGame"
+    @game-stopped="gameStopped"
+  )
 </template>
 
 <script>
 import ComputerGame from "@/components/ComputerGame.vue";
 import { store } from "@/store";
 import { getDiagram } from "@/utils/printDiagram";
-
 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: "",
-        userStop: false,
+        score: "*"
       }
     };
   },
   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"]);
+  },
+  computed: {
+    showAnalyzeBtn: function() {
+      return (this.display=='rules' && (!window.V || V.CanAnalyse));
+    },
+    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)
+      );
+    }
   },
   methods: {
+    clickReadRules: function() {
+      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],
+        shadow: fenParts[3]
       };
     },
-    tryChangeVariant: async function(vname) {
-      if (!vname || vname == "_unknown")
-        return;
-      this.gameInfo.vname = vname;
+    // 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;
-      // Method to replace diagrams in loaded HTML
-      const replaceByDiag = (match, p1, p2) => {
-        const args = this.parseFen(p2);
-        return getDiagram(args);
-      };
-      // (AJAX) Request to get rules content (plain text, HTML)
-      this.content =
-        require("raw-loader!@/rules/" + vname + "/" + this.st.lang + ".pug")
-        .replace(/(fen:)([^:]*):/g, replaceByDiag);
+      this.gameInfo.vname = vname;
     },
     startGame: function(mode) {
-      if (this.gameInProgress)
-        return;
+      if (this.gameInProgress) return;
       this.gameInProgress = true;
       this.display = "computer";
       this.gameInfo.mode = mode;
-      this.gameInfo.userStop = false;
+      this.gameInfo.score = "*";
       this.gameInfo.fen = V.GenRandInitFen();
     },
-    stopGame: function() {
+    // user is willing to stop the game:
+    stopGame: function(score) {
+      this.gameInfo.score = score || "?";
+    },
+    // The game is effectively stopped:
+    gameStopped: function() {
       this.gameInProgress = false;
-      this.gameInfo.userStop = true;
-      this.gameInfo.mode = "analyze";
     },
-  },
+    gotoAnalyze: function() {
+      this.$router.push(
+        "/analyse/" + this.gameInfo.vname + "/?fen=" + V.GenRandInitFen()
+      );
+    }
+  }
 };
 </script>
 
+<!-- NOTE: not scoped here, because HTML is injected (TODO) -->
 <style lang="sass">
 .warn
   padding: 3px
@@ -129,76 +177,38 @@ figure.diagram-container
     padding-top: 5px
     font-size: 0.8em
 
-  p.boxed
-    background-color: #FFCC66
-    padding: 5px
-
-  .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
+p.boxed
+  background-color: #FFCC66
+  padding: 5px
 
-  ol, ul:not(.browser-default)
-    padding-left: 20px
+.bigfont
+  font-size: 1.2em
 
-  ul:not(.browser-default)
-    margin-top: 5px
-
-  ul:not(.browser-default) > li
-    list-style-type: disc
-
-.light-square-diag
-  background-color: #e5e5ca
-
-.dark-square-diag
-  background-color: #6f8f57
+.bold
+  font-weight: bold
 
-// TODO: following is duplicated
-div.board
-  float: left
-  height: 0
-  display: inline-block
-  position: relative
+.stageDelimiter
+  color: purple
 
-div.board8
-  width: 12.5%
-  padding-bottom: 12.5%
+// To show (new) pieces, and/or there values...
+figure.showPieces > img
+  width: 50px
 
-div.board10
-  width: 10%
-  padding-bottom: 10%
+figure.showPieces > figcaption
+  color: #6C6C6C
 
-div.board11
-  width: 9.09%
-  padding-bottom: 9.1%
+.section-title
+  padding: 0
 
-img.piece
-  width: 100%
+.section-title > h4
+  padding: 5px
 
-img.piece, img.mark-square
-  max-width: 100%
-  height: auto
-  display: block
+ol, ul:not(.browser-default)
+  padding-left: 20px
 
-img.mark-square
-  opacity: 0.6
-  width: 76%
-  position: absolute
-  top: 12%
-  left: 12%
-  opacity: .7
+ul:not(.browser-default)
+  margin-top: 5px
 
-.in-shadow
-  filter: brightness(50%)
+ul:not(.browser-default) > li
+  list-style-type: disc
 </style>