X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fcomponents%2FUpsertUser.vue;h=3a0bb49043c333ff708e6224dada182f268edc94;hb=d8b1800bcec983faabc34bdb1057ef880488a160;hp=d54014dfa603650614bf5af5c798948d8170d437;hpb=602d6befd30793111d3fda6e733f73e08d8b7a30;p=vchess.git

diff --git a/client/src/components/UpsertUser.vue b/client/src/components/UpsertUser.vue
index d54014df..3a0bb490 100644
--- a/client/src/components/UpsertUser.vue
+++ b/client/src/components/UpsertUser.vue
@@ -1,33 +1,33 @@
 <template lang="pug">
 div
-  input#modalUser.modal(type="checkbox" @change="trySetEnterTime")
+  input#modalUser.modal(type="checkbox" @change="trySetEnterTime($event)")
   div(role="dialog" data-checkbox="modalUser")
     .card
       label.modal-close(for="modalUser")
-      h3 {{ stage }}
-      form#userForm(@submit.prevent="onSubmit()" @keyup.enter="onSubmit")
+      h3.section {{ st.tr[stage] }}
+      form(@submit.prevent="onSubmit()" @keyup.enter="onSubmit()")
         div(v-show="stage!='Login'")
           fieldset
             label(for="username") {{ st.tr["Name"] }}
-            input#username(type="text" v-model="user.name")
+            input#username(type="text" v-model="st.user.name")
           fieldset
             label(for="useremail") {{ st.tr["Email"] }}
-            input#useremail(type="email" v-model="user.email")
+            input#useremail(type="email" v-model="st.user.email")
           fieldset
             label(for="notifyNew") {{ st.tr["Notifications by email"] }}
-            input#notifyNew(type="checkbox" v-model="user.notify")
+            input#notifyNew(type="checkbox" v-model="st.user.notify")
         div(v-show="stage=='Login'")
           fieldset
             label(for="nameOrEmail") {{ st.tr["Name or Email"] }}
             input#nameOrEmail(type="text" v-model="nameOrEmail")
       .button-group
-        button#submit(type="button" @click="onSubmit()")
+        button(@click="onSubmit()")
           span {{ st.tr[submitMessage] }}
-        button(v-if="stage!='Update'" @click="toggleStage()")
+        button(v-if="stage!='Update'" type="button" @click="toggleStage()")
           span {{ st.tr[stage=="Login" ? "Register" : "Login"] }}
-        button#logoutBtn(v-else @click="doLogout()")
+        button(v-else type="button" @click="doLogout()")
           span {{ st.tr["Logout"] }}
-      #dialog(:style="{display: displayInfo}") {{ st.tr[infoMsg] }}
+      #dialog.text-center {{ st.tr[infoMsg] }}
 </template>
 
 <script>
@@ -38,7 +38,6 @@ export default {
   name: 'my-upsert-user',
   data: function() {
     return {
-      user: store.state.user,
       nameOrEmail: "", //for login
       logStage: "Login", //or Register
       infoMsg: "",
@@ -50,13 +49,13 @@ export default {
     nameOrEmail: function(newValue) {
       if (newValue.indexOf('@') >= 0)
       {
-        this.user.email = newValue;
-        this.user.name = "";
+        this.st.user.email = newValue;
+        this.st.user.name = "";
       }
       else
       {
-        this.user.name = newValue;
-        this.user.email = "";
+        this.st.user.name = newValue;
+        this.st.user.email = "";
       }
     },
   },
@@ -72,17 +71,17 @@ export default {
           return "Apply";
       }
     },
-    displayInfo: 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: {
     trySetEnterTime: function(event) {
       if (!!event.target.checked)
+      {
+        this.infoMsg = "";
         this.enterTime = Date.now();
+      }
     },
     toggleStage: function() {
       // Loop login <--> register (update is for logged-in users)
@@ -116,7 +115,7 @@ export default {
         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!";
       }
@@ -125,7 +124,7 @@ export default {
       // Basic anti-bot strategy:
       const exitTime = Date.now();
       if (this.stage == "Register" && exitTime - this.enterTime < 5000)
-        return; //silently return, in (curious) case of it was legitimate
+        return;
       let error = undefined;
       if (this.stage == 'Login')
       {
@@ -133,20 +132,16 @@ export default {
         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(),
-        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")
             this.nameOrEmail = "";
-          setTimeout(() => {
-            this.infoMsg = "";
-            document.getElementById("modalUser").checked = false;
-          }, 2000);
         },
         err => {
           this.infoMsg = "";
@@ -155,25 +150,18 @@ export default {
       );
     },
     doLogout: function() {
-      let logoutBtn = document.getElementById("logoutBtn");
-      logoutBtn.disabled = true;
-      // NOTE: this local cleaning would logically happen when we're sure
-      // that token is erased. But in the case a user clear the cookies,
-      // it would lead to situations where he cannot ("locally") log out.
-      // At worst, if token deletion fails the user can erase cookie manually.
-      this.user.id = 0;
-      this.user.name = "";
-      this.user.email = "";
-      this.user.notify = false;
-      localStorage.removeItem("myid");
-      localStorage.removeItem("myname");
-      ajax("/logout", "GET", () => {
-        logoutBtn.disabled = false; //for symmetry, but not very useful...
-        document.getElementById("modalUser").checked = false;
-        // this.$router.push("/") will fail if logout from Hall, so:
-        document.location.reload(true);
-      });
+      document.getElementById("modalUser").checked = false;
+      this.$router.push("/logout");
     },
   },
 };
 </script>
+
+<style lang="sass" scoped>
+[type="checkbox"].modal+div .card
+  max-width: 370px
+  max-height: 100%
+#dialog
+  padding: 5px
+  color: blue
+</style>