projects
/
vchess.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improve style, implement 'next' for corr games. TODO: rematch logic
[vchess.git]
/
client
/
src
/
components
/
UpsertUser.vue
diff --git
a/client/src/components/UpsertUser.vue
b/client/src/components/UpsertUser.vue
index
eb8adff
..
2be637c
100644
(file)
--- a/
client/src/components/UpsertUser.vue
+++ b/
client/src/components/UpsertUser.vue
@@
-11,25
+11,25
@@
div
.card
label.modal-close(for="modalUser")
h3.section {{ st.tr[stage] }}
.card
label.modal-close(for="modalUser")
h3.section {{ st.tr[stage] }}
-
form(@submit.prevent="onSubmit()"
@keyup.enter="onSubmit()")
+
div(
@keyup.enter="onSubmit()")
div(v-show="stage!='Login'")
fieldset
div(v-show="stage!='Login'")
fieldset
- label(for="username") {{ st.tr["User name"] }}
- input#username(
+ label(for="u
_u
sername") {{ st.tr["User name"] }}
+ input#u
_u
sername(
type="text"
type="text"
- v-model="
st.
user.name"
+ v-model="user.name"
)
fieldset
)
fieldset
- label(for="useremail") {{ st.tr["Email"] }}
- input#useremail(
+ label(for="u
_u
seremail") {{ st.tr["Email"] }}
+ input#u
_u
seremail(
type="email"
type="email"
- v-model="
st.
user.email"
+ v-model="user.email"
)
fieldset
label(for="notifyNew") {{ st.tr["Notifications by email"] }}
input#notifyNew(
type="checkbox"
)
fieldset
label(for="notifyNew") {{ st.tr["Notifications by email"] }}
input#notifyNew(
type="checkbox"
- v-model="
st.
user.notify"
+ v-model="user.notify"
)
div(v-show="stage=='Login'")
fieldset
)
div(v-show="stage=='Login'")
fieldset
@@
-67,17
+67,18
@@
export default {
logStage: "Login", //or Register
infoMsg: "",
enterTime: Number.MAX_SAFE_INTEGER, //for a basic anti-bot strategy
logStage: "Login", //or Register
infoMsg: "",
enterTime: Number.MAX_SAFE_INTEGER, //for a basic anti-bot strategy
- st: store.state
+ st: store.state,
+ user: {}
};
},
watch: {
nameOrEmail: function(newValue) {
if (newValue.indexOf("@") >= 0) {
};
},
watch: {
nameOrEmail: function(newValue) {
if (newValue.indexOf("@") >= 0) {
- this.
st.
user.email = newValue;
- this.
st.
user.name = "";
+ this.user.email = newValue;
+ this.user.name = "";
} else {
} else {
- this.
st.
user.name = newValue;
- this.
st.
user.email = "";
+ this.user.name = newValue;
+ this.user.email = "";
}
}
},
}
}
},
@@
-102,6
+103,12
@@
export default {
if (event.target.checked) {
this.infoMsg = "";
this.enterTime = Date.now();
if (event.target.checked) {
this.infoMsg = "";
this.enterTime = Date.now();
+ document.getElementById("u_username").focus();
+ this.user = {
+ name: this.st.user.name,
+ email: this.st.user.email,
+ notify: this.st.user.notify
+ };
}
},
toggleStage: function() {
}
},
toggleStage: function() {
@@
-135,7
+142,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
now
";
case "Update":
return "Modifications applied!";
}
case "Update":
return "Modifications applied!";
}
@@
-149,7
+156,7
@@
export default {
if (this.stage == "Login") {
const type = this.nameOrEmail.indexOf("@") >= 0 ? "email" : "name";
error = checkNameEmail({ [type]: this.nameOrEmail });
if (this.stage == "Login") {
const type = this.nameOrEmail.indexOf("@") >= 0 ? "email" : "name";
error = checkNameEmail({ [type]: this.nameOrEmail });
- } else error = checkNameEmail(this.
st.
user);
+ } else error = checkNameEmail(this.user);
if (error) {
alert(this.st.tr[error]);
return;
if (error) {
alert(this.st.tr[error]);
return;
@@
-160,10
+167,15
@@
export default {
this.ajaxMethod(),
this.stage == "Login"
? { nameOrEmail: this.nameOrEmail }
this.ajaxMethod(),
this.stage == "Login"
? { nameOrEmail: this.nameOrEmail }
- : this.
st.
user,
+ : this.user,
() => {
this.infoMsg = this.infoMessage();
if (this.stage != "Update") this.nameOrEmail = "";
() => {
this.infoMsg = this.infoMessage();
if (this.stage != "Update") this.nameOrEmail = "";
+ else {
+ this.st.user.name = this.user.name;
+ this.st.user.email = this.user.email;
+ this.st.user.notify = this.user.notify;
+ }
},
err => {
this.infoMsg = "";
},
err => {
this.infoMsg = "";
@@
-181,7
+193,7
@@
export default {
<style lang="sass" scoped>
[type="checkbox"].modal+div .card
<style lang="sass" scoped>
[type="checkbox"].modal+div .card
- max-width:
37
0px
+ max-width:
45
0px
max-height: 100%
#dialog
max-height: 100%
#dialog