Started code review + some fixes (unfinished)

[vchess.git] / client / src / components / Settings.vue

diff --git a/client/src/components/Settings.vue b/client/src/components/Settings.vue
index 5d03886..e5a9d9c 100644 (file)
--- a/client/src/components/Settings.vue
+++ b/client/src/components/Settings.vue
@@ -1,41 +1,29 @@
 <template lang="pug">
 div
   input#modalSettings.modal(type="checkbox")
-  div(role="dialog" aria-labelledby="settingsTitle")
-    .card.smallpad(@change="updateSettings")
+  div(role="dialog" data-checkbox="modalSettings")
+    .card(@change="updateSettings($event)")
       label.modal-close(for="modalSettings")
-      h3#settingsTitle.section {{ st.tr["Preferences"] }}
-      fieldset
-        label(for="setSqSize") {{ st.tr["Square size (in pixels). 0 for 'adaptative'"] }}
-        input#setSqSize(type="number" v-model="st.settings.sqSize")
-      fieldset
-        label(for="selectHints") {{ st.tr["Show move hints?"] }}
-        select#setHints(v-model="st.settings.hints")
-          option(value="0") {{ st.tr["None"] }}
-          option(value="1") {{ st.tr["Moves from a square"] }}
-          option(value="2") {{ st.tr["Pieces which can move"] }}
-      fieldset
-        label(for="setHighlight") {{ st.tr["Highlight squares? (Last move & checks)"] }}
-        input#setHighlight(type="checkbox" v-model="st.settings.highlight")
-      fieldset
-        label(for="setCoords") {{ st.tr["Show board coordinates?"] }}
-        input#setCoords(type="checkbox" v-model="st.settings.coords")
-      fieldset
-        label(for="selectColor") {{ st.tr["Board colors"] }}
-        select#setBcolor(v-model="st.settings.bcolor")
-          option(value="lichess") {{ st.tr["brown"] }}
-          option(value="chesscom") {{ st.tr["green"] }}
-          option(value="chesstempo") {{ st.tr["blue"] }}
-      fieldset
-        label(for="selectSound") {{ st.tr["Play sounds?"] }}
-        select#setSound(v-model="st.settings.sound")
-          option(value="0") {{ st.tr["None"] }}
-          option(value="1") {{ st.tr["New game"] }}
-          option(value="2") {{ st.tr["All"] }}
-      fieldset
-        .slidecontainer
-          input#myRange.slider(type="range" min="0" max="100" value="50"
-            @input="adjustBoard")
+      form
+        fieldset
+          label(for="setHints") {{ st.tr["Show possible moves?"] }}
+          input#setHints(type="checkbox" v-model="st.settings.hints")
+        fieldset
+          label(for="setHighlight")
+            | {{ st.tr["Highlight last move and checks?"] }}
+          input#setHighlight(type="checkbox" v-model="st.settings.highlight")
+        fieldset
+          label(for="setBcolor") {{ st.tr["Board colors"] }}
+          select#setBcolor(v-model="st.settings.bcolor")
+            option(value="lichess") {{ st.tr["brown"] }}
+            option(value="chesscom") {{ st.tr["green"] }}
+            option(value="chesstempo") {{ st.tr["blue"] }}
+        fieldset
+          label(for="setSound") {{ st.tr["Play sounds?"] }}
+          select#setSound(v-model="st.settings.sound")
+            option(value="0") {{ st.tr["None"] }}
+            option(value="1") {{ st.tr["New game"] }}
+            option(value="2") {{ st.tr["All"] }}
 </template>
 
 <script>
@@ -44,36 +32,26 @@ export default {
   name: "my-settings",
   data: function() {
     return {
-      st: store.state,
+      st: store.state
     };
   },
-  mounted: function() {
-    const boardSize = localStorage.getItem("boardSize");
-    if (!!boardSize)
-      document.getElementById("myRange").value = Math.floor(boardSize / 10);
-  },
-       methods: {
+  methods: {
     updateSettings: function(event) {
-      const propName =
-        event.target.id.substr(3).replace(/^\w/, c => c.toLowerCase())
-      localStorage[propName] = ["highlight","coords"].includes(propName)
-        ? event.target.checked
-        : event.target.value;
-    },
-    adjustBoard: function() {
-      const boardContainer = document.getElementById("boardContainer");
-      if (!boardContainer)
-        return; //no board on page
-      const k = document.getElementById("myRange").value;
-      const movesWidth = (window.innerWidth >= 768 ? 280 : 0); //TODO: constant somewhere...;
-      const minBoardWidth = 240; //TODO: same
-      // Value of 0 is board min size; 100 is window.width [- movesWidth]
-      const boardSize = minBoardWidth +
-        k * (window.innerWidth - (movesWidth+minBoardWidth)) / 100;
-      localStorage.setItem("boardSize", boardSize);
-      boardContainer.style.width = boardSize + "px";
-      document.getElementById("gameContainer").style.width = (boardSize + movesWidth) + "px";
-    },
-       },
+      const propName = event.target.id
+        .substr(3)
+        .replace(/^\w/, c => c.toLowerCase());
+      let value = ["bcolor", "sound"].includes(propName)
+        ? event.target.value
+        : event.target.checked;
+      if (propName == "sound") value = parseInt(value);
+      store.updateSetting(propName, value);
+    }
+  }
 };
 </script>
+
+<style lang="sass" scoped>
+[type="checkbox"].modal+div .card
+  max-width: 767px
+  max-height: 100%
+</style>