projects
/
vchess.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Experimental improved behavior of login/logout/multitabs
[vchess.git]
/
client
/
src
/
components
/
UpsertUser.vue
diff --git
a/client/src/components/UpsertUser.vue
b/client/src/components/UpsertUser.vue
index
8d0b736
..
60970b0
100644
(file)
--- a/
client/src/components/UpsertUser.vue
+++ b/
client/src/components/UpsertUser.vue
@@
-1,34
+1,33
@@
<template lang="pug">
div
input#modalUser.modal(type="checkbox" @change="trySetEnterTime")
<template lang="pug">
div
input#modalUser.modal(type="checkbox" @change="trySetEnterTime")
- div(role="dialog")
+ div(role="dialog"
data-checkbox="modalUser"
)
.card
label.modal-close(for="modalUser")
.card
label.modal-close(for="modalUser")
- h3 {{ st
age
}}
- form#userForm(@submit.prevent="onSubmit()")
+ h3 {{ st
.tr[stage]
}}
+ form#userForm(@submit.prevent="onSubmit()"
@keyup.enter="onSubmit"
)
div(v-show="stage!='Login'")
fieldset
div(v-show="stage!='Login'")
fieldset
- label(for="username")
Name
- input#username(type="text" v-model="user.name")
+ label(for="username")
{{ st.tr["Name"] }}
+ input#username(type="text" v-model="
st.
user.name")
fieldset
fieldset
- label(for="useremail")
Email
- input#useremail(type="email" v-model="user.email")
+ label(for="useremail")
{{ st.tr["Email"] }}
+ input#useremail(type="email" v-model="
st.
user.email")
fieldset
fieldset
- label(for="notifyNew")
Notify new moves & games
- input#notifyNew(type="checkbox" v-model="user.notify")
+ label(for="notifyNew")
{{ st.tr["Notifications by email"] }}
+ input#notifyNew(type="checkbox" v-model="
st.
user.notify")
div(v-show="stage=='Login'")
fieldset
div(v-show="stage=='Login'")
fieldset
- label(for="nameOrEmail")
Name or Email
+ label(for="nameOrEmail")
{{ st.tr["Name or Email"] }}
input#nameOrEmail(type="text" v-model="nameOrEmail")
.button-group
button#submit(type="button" @click="onSubmit()")
input#nameOrEmail(type="text" v-model="nameOrEmail")
.button-group
button#submit(type="button" @click="onSubmit()")
- span {{ submitMessage }}
- i.material-icons send
+ span {{ st.tr[submitMessage] }}
button(v-if="stage!='Update'" @click="toggleStage()")
button(v-if="stage!='Update'" @click="toggleStage()")
- span {{ st
age=="Login" ? "Register" : "Login"
}}
- button(v-else @click="doLogout()")
- span
Logout
- #dialog(:style="{display: displayInfo}") {{
infoMsg
}}
+ span {{ st
.tr[stage=="Login" ? "Register" : "Login"]
}}
+ button
#logoutBtn
(v-else @click="doLogout()")
+ span
{{ st.tr["Logout"] }}
+ #dialog(:style="{display: displayInfo}") {{
st.tr[infoMsg]
}}
</template>
<script>
</template>
<script>
@@
-39,13
+38,27
@@
export default {
name: 'my-upsert-user',
data: function() {
return {
name: 'my-upsert-user',
data: function() {
return {
- user: store.state.user,
nameOrEmail: "", //for login
logStage: "Login", //or Register
infoMsg: "",
enterTime: Number.MAX_SAFE_INTEGER, //for a basic anti-bot strategy
nameOrEmail: "", //for login
logStage: "Login", //or Register
infoMsg: "",
enterTime: Number.MAX_SAFE_INTEGER, //for a basic anti-bot strategy
+ st: store.state,
};
},
};
},
+ watch: {
+ nameOrEmail: function(newValue) {
+ if (newValue.indexOf('@') >= 0)
+ {
+ this.st.user.email = newValue;
+ this.st.user.name = "";
+ }
+ else
+ {
+ this.st.user.name = newValue;
+ this.st.user.email = "";
+ }
+ },
+ },
computed: {
submitMessage: function() {
switch (this.stage)
computed: {
submitMessage: function() {
switch (this.stage)
@@
-62,7
+75,7
@@
export default {
return (this.infoMsg.length > 0 ? "block" : "none");
},
stage: function() {
return (this.infoMsg.length > 0 ? "block" : "none");
},
stage: function() {
- return this.user.id > 0 ? "Update" : this.logStage;
+ return this.
st.
user.id > 0 ? "Update" : this.logStage;
},
},
methods: {
},
},
methods: {
@@
-102,7
+115,7
@@
export default {
case "Login":
return "Connection token sent. Check your emails!";
case "Register":
case "Login":
return "Connection token sent. Check your emails!";
case "Register":
- return "Registration complete! Please check your emails
.
";
+ return "Registration complete! Please check your emails";
case "Update":
return "Modifications applied!";
}
case "Update":
return "Modifications applied!";
}
@@
-119,12
+132,12
@@
export default {
error = checkNameEmail({[type]: this.nameOrEmail});
}
else
error = checkNameEmail({[type]: this.nameOrEmail});
}
else
- error = checkNameEmail(this.user);
+ error = checkNameEmail(this.
st.
user);
if (!!error)
return alert(error);
this.infoMsg = "Processing... Please wait";
ajax(this.ajaxUrl(), this.ajaxMethod(),
if (!!error)
return alert(error);
this.infoMsg = "Processing... Please wait";
ajax(this.ajaxUrl(), this.ajaxMethod(),
- this.stage == "Login" ? { nameOrEmail: this.nameOrEmail } : this.user,
+ this.stage == "Login" ? { nameOrEmail: this.nameOrEmail } : this.
st.
user,
res => {
this.infoMsg = this.infoMessage();
if (this.stage != "Update")
res => {
this.infoMsg = this.infoMessage();
if (this.stage != "Update")
@@
-141,16
+154,8
@@
export default {
);
},
doLogout: function() {
);
},
doLogout: function() {
- ajax(
- "/logout",
- "GET",
- () => {
- this.user.id = 0;
- this.user.name = "";
- this.user.email = "";
- this.user.notify = false;
- }
- );
+ document.getElementById("modalUser").checked = false;
+ this.$router.push("/logout");
},
},
};
},
},
};