projects
/
vchess.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix accumulation of socket.close code. Ready to finish Game.js and then the website
[vchess.git]
/
client
/
src
/
store.js
diff --git
a/client/src/store.js
b/client/src/store.js
index
e9bbf65
..
a999b0a
100644
(file)
--- a/
client/src/store.js
+++ b/
client/src/store.js
@@
-2,6
+2,7
@@
import { ajax } from "./utils/ajax";
import { getRandString } from "./utils/alea";
import params from "./parameters"; //for socket connection
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 =
{
state: {
export const store =
{
state: {
@@
-12,13
+13,32
@@
export const store =
settings: {},
lang: "",
},
settings: {},
lang: "",
},
+ socketCloseListener: null,
initialize() {
ajax("/variants", "GET", res => { this.state.variants = res.variantArray; });
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 = {
this.state.user = {
- id: localStorage["myuid"] || 0,
- name: localStorage["myname"] || "", //"anonymous"
- sid: localStorage["mysid"] || getRandString(),
+ id: localStorage["myid"] || 0,
+ name: localStorage["myname"] || "", //"" for "anonymous"
+ email: "", //unknown yet
+ notify: false, //email notifications
+ 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 = {
this.state.conn = new WebSocket(params.socketUrl + "/?sid=" + this.state.user.sid);
// Settings initialized with values from localStorage
this.state.settings = {
@@
-29,10
+49,10
@@
export const store =
highlight: !!eval(localStorage["highlight"]),
sqSize: parseInt(localStorage["sqSize"]),
};
highlight: !!eval(localStorage["highlight"]),
sqSize: parseInt(localStorage["sqSize"]),
};
-
const
socketCloseListener = () => {
+
this.
socketCloseListener = () => {
this.state.conn = new WebSocket(params.socketUrl + "/?sid=" + mysid);
this.state.conn = new WebSocket(params.socketUrl + "/?sid=" + mysid);
- }
- this.state.conn.onclose = socketCloseListener;
+ }
;
+ this.state.conn.onclose =
this.
socketCloseListener;
const supportedLangs = ["en","es","fr"];
this.state.lang = localStorage["lang"] ||
supportedLangs.includes(navigator.language)
const supportedLangs = ["en","es","fr"];
this.state.lang = localStorage["lang"] ||
supportedLangs.includes(navigator.language)