X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fstore.js;h=9d1c6e6285b6d9e25f0f48f1fca1e2db5d4d5796;hb=98f485791e915563996de4f37430b285ffc773ae;hp=e8f4284bf6f4b709e49f7128ebf609452afd0812;hpb=c66a829b3770122fe0ff2fb9db8def9635bbc334;p=vchess.git diff --git a/client/src/store.js b/client/src/store.js index e8f4284b..9d1c6e62 100644 --- a/client/src/store.js +++ b/client/src/store.js @@ -14,14 +14,30 @@ export const store = }, initialize() { ajax("/variants", "GET", res => { this.state.variants = res.variantArray; }); + let mysid = localStorage["mysid"]; + if (!mysid) + { + mysid = getRandString(); + localStorage["mysid"] = mysid; //done only once (unless user clear browser data) + } this.state.user = { - // id and name could be undefined - id: localStorage["myuid"], - name: localStorage["myname"], + id: localStorage["myid"] || 0, + name: localStorage["myname"] || "", //"" for "anonymous" + email: "", //unknown yet + notify: false, //email notifications + sid: mysid, }; - // TODO: if there is a socket ID in localStorage, it means a live game was interrupted (and should resume) - const mysid = localStorage["mysid"] || getRandString(); - this.state.conn = new WebSocket(params.socketUrl + "/?sid=" + mysid); + if (this.state.user.id > 0) + { + fetch(params.serverUrl + "/whoami", { + method: "GET", + credentials: params.cors ? "include" : "omit", + }).then((res) => { + this.state.user.email = res.email; + this.state.user.notify = res.notify; + }); + } + this.state.conn = new WebSocket(params.socketUrl + "/?sid=" + this.state.user.sid); // Settings initialized with values from localStorage this.state.settings = { bcolor: localStorage["bcolor"] || "lichess", @@ -43,9 +59,7 @@ export const store = this.setTranslations(); }, setTranslations: async function() { - // Fill modalWelcome, and import translations from "./translations/$lang.js" - document.getElementById("modalWelcome").innerHTML = - require("raw-loader!pug-plain-loader!@/welcome/" + this.state.lang + ".pug"); + // Import translations from "./translations/$lang.js" const tModule = await import("@/translations/" + this.state.lang + ".js"); this.state.tr = tModule.translations; },