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

diff --git a/client/src/components/UpsertUser.vue b/client/src/components/UpsertUser.vue
index 8d0b7369..d54014df 100644
--- 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")
-  div(role="dialog")
+  div(role="dialog" data-checkbox="modalUser")
     .card
       label.modal-close(for="modalUser")
       h3 {{ stage }}
-      form#userForm(@submit.prevent="onSubmit()")
+      form#userForm(@submit.prevent="onSubmit()" @keyup.enter="onSubmit")
         div(v-show="stage!='Login'")
           fieldset
-            label(for="username") Name
+            label(for="username") {{ st.tr["Name"] }}
             input#username(type="text" v-model="user.name")
           fieldset
-            label(for="useremail") Email
+            label(for="useremail") {{ st.tr["Email"] }}
             input#useremail(type="email" v-model="user.email")
           fieldset
-            label(for="notifyNew") Notify new moves &amp; games
+            label(for="notifyNew") {{ st.tr["Notifications by email"] }}
             input#notifyNew(type="checkbox" v-model="user.notify")
         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()")
-          span {{ submitMessage }}
-          i.material-icons send
+          span {{ st.tr[submitMessage] }}
         button(v-if="stage!='Update'" @click="toggleStage()")
-          span {{ stage=="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>
@@ -44,8 +43,23 @@ export default {
       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.user.email = newValue;
+        this.user.name = "";
+      }
+      else
+      {
+        this.user.name = newValue;
+        this.user.email = "";
+      }
+    },
+  },
   computed: {
     submitMessage: function() {
       switch (this.stage)
@@ -141,16 +155,24 @@ export default {
       );
     },
     doLogout: function() {
-      ajax(
-        "/logout",
-        "GET",
-        () => {
-          this.user.id = 0;
-          this.user.name = "";
-          this.user.email = "";
-          this.user.notify = false;
-        }
-      );
+      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);
+      });
     },
   },
 };