X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fcomponents%2FBaseGame.vue;h=c17ba1ea1181e96c516c480ad7d9eb6cb6cdb495;hb=bd76b45611cbb58dcf774745a4d690277a82aacd;hp=aa606aa57f4946c851a3d1ba3f37573efadb4eb9;hpb=a0c41e7e23c9ff64031739e072f38e493bac8dca;p=vchess.git

diff --git a/client/src/components/BaseGame.vue b/client/src/components/BaseGame.vue
index aa606aa5..c17ba1ea 100644
--- a/client/src/components/BaseGame.vue
+++ b/client/src/components/BaseGame.vue
@@ -1,18 +1,18 @@
 <template lang="pug">
-div#baseGame(tabindex=-1 @click="() => focusBg()"
-    @keydown="handleKeys" @wheel="handleScroll")
+div#baseGame(tabindex=-1 @click="focusBg()"
+    @keydown="handleKeys($event)" @wheel="handleScroll($event)")
   input#modalEog.modal(type="checkbox")
-  div#eogDiv(role="dialog" data-checkbox="modalEog" aria-labelledby="eogMessage")
-    .card.smallpad.small-modal.text-center
+  div#eogDiv(role="dialog" data-checkbox="modalEog")
+    .card.text-center
       label.modal-close(for="modalEog")
-      h3#eogMessage.section {{ endgameMessage }}
+      h3.section {{ endgameMessage }}
   input#modalAdjust.modal(type="checkbox")
-  div#adjuster(role="dialog" data-checkbox="modalAdjust" aria-labelledby="labelAdjust")
-    .card.smallpad.small-modal.text-center
+  div#adjuster(role="dialog" data-checkbox="modalAdjust")
+    .card.text-center
       label.modal-close(for="modalAdjust")
-      label#labelAdjust(for="boardSize") {{ st.tr["Board size"] }}
+      label(for="boardSize") {{ st.tr["Board size"] }}
       input#boardSize.slider(type="range" min="0" max="100" value="50"
-        @input="adjustBoard")
+        @input="adjustBoard()")
   #gameContainer
     #boardContainer
       Board(:vr="vr" :last-move="lastMove" :analyze="analyze"
@@ -21,21 +21,21 @@ div#baseGame(tabindex=-1 @click="() => focusBg()"
       #turnIndicator(v-if="game.vname=='Dark' && game.score=='*'")
         | {{ turn }}
       #controls
-        button(@click="gotoBegin") <<
-        button(@click="() => undo()") <
-        button(@click="flip") &#8645;
-        button(@click="() => play()") >
-        button(@click="gotoEnd") >>
-      #pgnDiv
+        button(@click="gotoBegin()") <<
+        button(@click="undo()") <
+        button(@click="flip()") &#8645;
+        button(@click="play()") >
+        button(@click="gotoEnd()") >>
+      #belowControls
         #downloadDiv(v-if="game.vname!='Dark' || game.score!='*'")
           a#download(href="#")
-          button(@click="download") {{ st.tr["Download PGN"] }}
+          button(@click="download()") {{ st.tr["Download"] }} PGN
         button(onClick="doClick('modalAdjust')") &#10530;
         button(v-if="game.vname!='Dark' && game.mode!='analyze'"
-            @click="analyzePosition")
-          | {{ st.tr["Analyze"] }}
+            @click="analyzePosition()")
+          | {{ st.tr["Analyse"] }}
         // NOTE: rather ugly hack to avoid showing twice "rules" link...
-        button(v-if="!$route.path.match('/variants/')" @click="showRules")
+        button(v-if="!$route.path.match('/variants/')" @click="showRules()")
           | {{ st.tr["Rules"] }}
     #movesList
       MoveList(v-if="showMoves" :score="game.score" :message="game.scoreMsg"
@@ -52,7 +52,6 @@ import { getSquareId } from "@/utils/squareId";
 import { getDate } from "@/utils/datetime";
 import { processModalClick } from "@/utils/modalClick";
 import { getScoreMessage } from "@/utils/scoring";
-
 export default {
   name: 'my-base-game',
   components: {
@@ -85,6 +84,11 @@ export default {
       if (!!newMove) //if stop + launch new game, get undefined move
         this.play(newMove, "receive");
     },
+    // ...Or to undo (corr game, move not validated)
+    "game.moveToUndo": function(move) {
+      if (!!move)
+        this.undo(move);
+    },
   },
   computed: {
     showMoves: function() {
@@ -124,8 +128,7 @@ export default {
     document.getElementById("boardContainer").style.width = boardSize + "px";
     let gameContainer = document.getElementById("gameContainer");
     gameContainer.style.width = (boardSize + movesWidth) + "px";
-    // TODO: find the right formula here:
-    //document.getElementById("boardSize").value = Math.floor(boardSize / 10);
+    document.getElementById("boardSize").value = (boardSize * 100) / (window.innerWidth - movesWidth);
     // timeout to avoid calling too many time the adjust method
     let timeoutLaunched = false;
     window.addEventListener("resize", (e) => {
@@ -225,7 +228,7 @@ export default {
       this.incheck = [];
     },
     analyzePosition: function() {
-      const newUrl = "/analyze/" + this.game.vname +
+      const newUrl = "/analyse/" + this.game.vname +
         "/?fen=" + this.vr.getFen().replace(/ /g, "_");
       if (this.game.type == "live")
         this.$router.push(newUrl); //open in same tab: against cheating...
@@ -412,6 +415,11 @@ export default {
 </script>
 
 <style lang="sass" scoped>
+[type="checkbox"]#modalEog+div .card
+  min-height: 45px
+[type="checkbox"]#modalAdjust+div .card
+  padding: 5px
+
 #baseGame
   width: 100%
   &:focus
@@ -424,25 +432,25 @@ export default {
 #downloadDiv
   display: inline-block
 
-#modal-eog+div .card
-  overflow: hidden
 #controls
-  margin-top: 10px
-  margin-left: auto
-  margin-right: auto
+  margin: 0 auto
   button
     display: inline-block
     width: 20%
     margin: 0
-@media screen and (min-width: 768px)
-  #controls
-    max-width: 400px
 #turnIndicator
   text-align: center
-#pgnDiv
+#belowControls
+  border-top: 1px solid #2f4f4f
   text-align: center
-  margin-left: auto
-  margin-right: auto
+  margin: 0 auto
+  & > #downloadDiv
+    margin: 0
+    & > button
+      margin: 0
+  & > button
+    border-left: 1px solid #2f4f4f
+    margin: 0
 #boardContainer
   float: left
 // TODO: later, maybe, allow movesList of variable width