X-Git-Url: https://git.auder.net/?p=vchess.git;a=blobdiff_plain;f=client%2Fsrc%2Fstore.js;h=13c600b77fcf9d619c4f5329ee76f269a2c4b494;hp=91f9bdd81b915da9d2fa37c426a6d9399385dd36;hb=eb2d61de8d569470fa329a484efe9bab420b2b82;hpb=f920250230b564373911c895f18a57ab464be937

diff --git a/client/src/store.js b/client/src/store.js
index 91f9bdd8..13c600b7 100644
--- a/client/src/store.js
+++ b/client/src/store.js
@@ -1,7 +1,9 @@
-import { ajax } from "./utils/ajax";
+// NOTE: do not use ajax() here because ajax.js requires the store
+import params from "./parameters"; //for server URL
 import { getRandString } from "./utils/alea";
 
-// Global store: see https://medium.com/fullstackio/managing-state-in-vue-js-23a0352b1c87
+// Global store: see
+// https://medium.com/fullstackio/managing-state-in-vue-js-23a0352b1c87
 export const store = {
   state: {
     variants: [],
@@ -10,10 +12,26 @@ export const store = {
     settings: {},
     lang: ""
   },
-  socketCloseListener: null,
   initialize() {
-    ajax("/variants", "GET", res => {
-      this.state.variants = res.variantArray.sort((v1,v2) => v1.localeCompare(v2));
+    const headers = {
+      "Content-Type": "application/json;charset=UTF-8",
+      "X-Requested-With": "XMLHttpRequest"
+    };
+    fetch(
+      params.serverUrl + "/variants",
+      {
+        method: "GET",
+        headers: headers
+      }
+    )
+    .then(res => res.json())
+    .then(json => {
+      if (!Array.isArray(json.variantArray)) {
+        alert("Variants loading failed: reload the page");
+        return;
+      }
+      this.state.variants = json.variantArray
+        .sort((v1,v2) => v1.name.localeCompare(v2.name));
     });
     let mysid = localStorage.getItem("mysid");
     // Assign mysid only once (until next time user clear browser data)
@@ -31,37 +49,53 @@ export const store = {
     };
     // Slow verification through the server:
     // NOTE: still superficial identity usurpation possible, but difficult.
-    ajax("/whoami", "GET", res => {
-      this.state.user.id = res.id;
+    fetch(
+      params.serverUrl + "/whoami",
+      {
+        method: "GET",
+        headers: headers,
+        credentials: params.credentials
+      }
+    )
+    .then(res => res.json())
+    .then(json => {
+      this.state.user.id = json.id;
       const storedId = localStorage.getItem("myid");
-      if (res.id > 0 && !storedId)
+      if (json.id > 0 && !storedId)
         // User cleared localStorage
-        localStorage.setItem("myid", res.id);
-      else if (res.id == 0 && !!storedId)
+        localStorage.setItem("myid", json.id);
+      else if (json.id == 0 && !!storedId)
         // User cleared cookie
         localStorage.removeItem("myid");
-      this.state.user.name = res.name;
+      this.state.user.name = json.name;
       const storedName = localStorage.getItem("myname");
-      if (!!res.name && !storedName)
+      if (!!json.name && !storedName)
         // User cleared localStorage
-        localStorage.setItem("myname", res.name);
-      else if (!res.name && !!storedName)
+        localStorage.setItem("myname", json.name);
+      else if (!json.name && !!storedName)
         // User cleared cookie
         localStorage.removeItem("myname");
-      this.state.user.email = res.email;
-      this.state.user.notify = res.notify;
+      this.state.user.email = json.email;
+      this.state.user.notify = json.notify;
     });
     // Settings initialized with values from localStorage
+    const getItemDefaultTrue = (item) => {
+      const value = localStorage.getItem(item);
+      if (!value) return true;
+      return value == "true";
+    };
     this.state.settings = {
       bcolor: localStorage.getItem("bcolor") || "lichess",
-      sound: parseInt(localStorage.getItem("sound")) || 1,
-      hints: localStorage.getItem("hints") == "true",
-      highlight: localStorage.getItem("highlight") == "true"
+      sound: getItemDefaultTrue("sound"),
+      hints: getItemDefaultTrue("hints"),
+      highlight: getItemDefaultTrue("highlight"),
+      gotonext: getItemDefaultTrue("gotonext"),
     };
     const supportedLangs = ["en", "es", "fr"];
+    const navLanguage = navigator.language.substr(0, 2);
     this.state.lang =
       localStorage["lang"] ||
-      (supportedLangs.includes(navigator.language) ? navigator.language : "en");
+      (supportedLangs.includes(navLanguage) ? navLanguage : "en");
     this.setTranslations();
   },
   updateSetting: function(propName, value) {