X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fstore.js;h=b81ec5524639866ad2c1d5c7a9f59732364c6716;hb=db1f1f9adb920605c7a16b060a7737e54636ee08;hp=798251f9dc87962c9d3cd9ae77a1fae654638403;hpb=dfeb96ea90e880a2557cbb5953dbb7258c912283;p=vchess.git

diff --git a/client/src/store.js b/client/src/store.js
index 798251f9..b81ec552 100644
--- a/client/src/store.js
+++ b/client/src/store.js
@@ -1,63 +1,74 @@
 import { ajax } from "./utils/ajax";
 import { getRandString } from "./utils/alea";
-import params from "./parameters"; //for socket connection
 
 // Global store: see https://medium.com/fullstackio/managing-state-in-vue-js-23a0352b1c87
-export const store =
-{
+export const store = {
   state: {
     variants: [],
     tr: {},
     user: {},
-    conn: null,
     settings: {},
-    lang: "",
+    lang: ""
   },
   socketCloseListener: null,
-  initialize(page) {
-    ajax("/variants", "GET", res => { this.state.variants = res.variantArray; });
-    let mysid = localStorage["mysid"];
-    if (!mysid)
-    {
+  initialize() {
+    ajax("/variants", "GET", res => {
+      this.state.variants = res.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)
+    if (!mysid) {
       mysid = getRandString();
-      localStorage["mysid"] = mysid; //done only once (unless user clear browser data)
+      localStorage.setItem("mysid", mysid);
     }
     // Quick user setup using local storage:
     this.state.user = {
-      id: localStorage["myid"] || 0,
-      name: localStorage["myname"] || "", //"" for "anonymous"
+      id: localStorage.getItem("myid") || 0,
+      name: localStorage.getItem("myname") || "", //"" for "anonymous"
       email: "", //unknown yet
       notify: false, //email notifications
-      sid: mysid,
+      sid: mysid
     };
     // Slow verification through the server:
     // NOTE: still superficial identity usurpation possible, but difficult.
     ajax("/whoami", "GET", res => {
       this.state.user.id = res.id;
+      const storedId = localStorage.getItem("myid");
+      if (res.id > 0 && !storedId)
+        // User cleared localStorage
+        localStorage.setItem("myid", res.id);
+      else if (res.id == 0 && !!storedId)
+        // User cleared cookie
+        localStorage.removeItem("myid");
       this.state.user.name = res.name;
+      const storedName = localStorage.getItem("myname");
+      if (!!res.name && !storedName)
+        // User cleared localStorage
+        localStorage.setItem("myname", res.name);
+      else if (!res.name && !!storedName)
+        // User cleared cookie
+        localStorage.removeItem("myname");
       this.state.user.email = res.email;
       this.state.user.notify = res.notify;
     });
-    this.state.conn = new WebSocket(params.socketUrl + "/?sid=" + mysid +
-      "&page=" + encodeURIComponent(page));
     // 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")
     };
-    this.socketCloseListener = () => {
-      // Next line may fail at first, but should retry and eventually success (TODO?)
-      this.state.conn = new WebSocket(params.socketUrl + "/?sid=" + mysid +
-        "&page=" + encodeURIComponent(page));
-    };
-    this.state.conn.onclose = this.socketCloseListener;
-    const supportedLangs = ["en","es","fr"];
-    this.state.lang = localStorage["lang"] ||
-      (supportedLangs.includes(navigator.language)
-        ? navigator.language
-        : "en");
+    const supportedLangs = ["en", "es", "fr"];
+    const navLanguage = navigator.language.substr(0,2);
+    this.state.lang =
+      localStorage["lang"] ||
+      (supportedLangs.includes(navLanguage) ? navLanguage : "en");
     this.setTranslations();
   },
   updateSetting: function(propName, value) {
@@ -72,5 +83,5 @@ export const store =
   setLanguage(lang) {
     this.state.lang = lang;
     this.setTranslations();
-  },
+  }
 };