X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fstore.js;h=33d03121c8d02cfbca4758a766df946f0192210e;hb=bc0b9205e41c5db0552e4ccf060b945342e36ed0;hp=10ad10e694bffdafd592cb964ae1e56331a4d0ff;hpb=f0c68a04e31bb6a4b2f8b94a532ef3ca2eebbe3e;p=vchess.git diff --git a/client/src/store.js b/client/src/store.js index 10ad10e6..33d03121 100644 --- a/client/src/store.js +++ b/client/src/store.js @@ -1,8 +1,9 @@ -// NOTE: do not use ajax() here because ajax.js require the store for translations +// 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: [], @@ -13,14 +14,25 @@ export const store = { }, socketCloseListener: null, initialize() { + const headers = { + "Content-Type": "application/json;charset=UTF-8", + "X-Requested-With": "XMLHttpRequest" + }; fetch( params.serverUrl + "/variants", - {method: "GET"}, + { + method: "GET", + headers: headers + } ) .then(res => res.json()) .then(json => { - this.state.variants = json.variantArray.sort( - (v1,v2) => v1.name.localeCompare(v2.name)); + 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) @@ -34,6 +46,7 @@ export const store = { name: localStorage.getItem("myname") || "", //"" for "anonymous" email: "", //unknown yet notify: false, //email notifications + newsRead: localStorage.getItem("newsRead") || 0, sid: mysid }; // Slow verification through the server: @@ -42,6 +55,7 @@ export const store = { params.serverUrl + "/whoami", { method: "GET", + headers: headers, credentials: params.credentials } ) @@ -65,6 +79,8 @@ export const store = { localStorage.removeItem("myname"); this.state.user.email = json.email; this.state.user.notify = json.notify; + if (!!json.newsRead && json.newsRead > this.state.user.newsRead) + this.state.user.newsRead = json.newsRead; }); // Settings initialized with values from localStorage const getItemDefaultTrue = (item) => { @@ -76,8 +92,13 @@ export const store = { bcolor: localStorage.getItem("bcolor") || "lichess", sound: getItemDefaultTrue("sound"), hints: getItemDefaultTrue("hints"), - highlight: getItemDefaultTrue("highlight") + highlight: getItemDefaultTrue("highlight"), + gotonext: getItemDefaultTrue("gotonext"), + randomness: parseInt(localStorage.getItem("randomness")) }; + if (isNaN(this.state.settings.randomness)) + // Default: random asymmetric + this.state.settings.randomness = 2; const supportedLangs = ["en", "es", "fr"]; const navLanguage = navigator.language.substr(0,2); this.state.lang =