projects
/
vchess.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix some translations and error messages
[vchess.git]
/
client
/
src
/
store.js
diff --git
a/client/src/store.js
b/client/src/store.js
index
e7e8697
..
10ad10e
100644
(file)
--- a/
client/src/store.js
+++ b/
client/src/store.js
@@
-1,4
+1,5
@@
-import { ajax } from "./utils/ajax";
+// NOTE: do not use ajax() here because ajax.js require the store for translations
+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
import { getRandString } from "./utils/alea";
// Global store: see https://medium.com/fullstackio/managing-state-in-vue-js-23a0352b1c87
@@
-12,8
+13,13
@@
export const store = {
},
socketCloseListener: null,
initialize() {
},
socketCloseListener: null,
initialize() {
- ajax("/variants", "GET", res => {
- this.state.variants = res.variantArray.sort(
+ fetch(
+ params.serverUrl + "/variants",
+ {method: "GET"},
+ )
+ .then(res => res.json())
+ .then(json => {
+ this.state.variants = json.variantArray.sort(
(v1,v2) => v1.name.localeCompare(v2.name));
});
let mysid = localStorage.getItem("mysid");
(v1,v2) => v1.name.localeCompare(v2.name));
});
let mysid = localStorage.getItem("mysid");
@@
-32,37
+38,51
@@
export const store = {
};
// Slow verification through the server:
// NOTE: still superficial identity usurpation possible, but difficult.
};
// 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",
+ credentials: params.credentials
+ }
+ )
+ .then(res => res.json())
+ .then(json => {
+ this.state.user.id = json.id;
const storedId = localStorage.getItem("myid");
const storedId = localStorage.getItem("myid");
- if (
res
.id > 0 && !storedId)
+ if (
json
.id > 0 && !storedId)
// User cleared localStorage
// 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");
// User cleared cookie
localStorage.removeItem("myid");
- this.state.user.name =
res
.name;
+ this.state.user.name =
json
.name;
const storedName = localStorage.getItem("myname");
const storedName = localStorage.getItem("myname");
- if (!!
res
.name && !storedName)
+ if (!!
json
.name && !storedName)
// User cleared localStorage
// 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");
// 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
});
// 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",
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")
};
const supportedLangs = ["en", "es", "fr"];
};
const supportedLangs = ["en", "es", "fr"];
+ const navLanguage = navigator.language.substr(0,2);
this.state.lang =
localStorage["lang"] ||
this.state.lang =
localStorage["lang"] ||
- (supportedLangs.includes(nav
igator.language) ? navigator.l
anguage : "en");
+ (supportedLangs.includes(nav
Language) ? navL
anguage : "en");
this.setTranslations();
},
updateSetting: function(propName, value) {
this.setTranslations();
},
updateSetting: function(propName, value) {