X-Git-Url: https://git.auder.net/img/rock_paper_scissors_lizard_spock.gif?a=blobdiff_plain;f=client%2Fsrc%2Fcomponents%2FUpsertUser.vue;h=eb94deddb4b14c6bec6f9ad233627b6187979ae7;hb=5fe7e71c7d34afbaed99d5bb75525db411bade61;hp=7b92cf9a304f4c14d34ea6d217478e860a13c63c;hpb=1aeed627be63a298d3a093797c3728e3de30b464;p=vchess.git

diff --git a/client/src/components/UpsertUser.vue b/client/src/components/UpsertUser.vue
index 7b92cf9a..eb94dedd 100644
--- a/client/src/components/UpsertUser.vue
+++ b/client/src/components/UpsertUser.vue
@@ -1,35 +1,33 @@
-// Logic to login, or create / update a user (and also logout)
 <template lang="pug">
 div
-  input#modalUser.modal(type="checkbox" @change="trySetEnterTime")
-  div(role="dialog")
+  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()")
+      h3.section {{ st.tr[stage] }}
+      form(@submit.prevent="onSubmit()" @keyup.enter="onSubmit()")
         div(v-show="stage!='Login'")
           fieldset
-            label(for="username") Name
-            input#username(type="text" v-model="user.name")
+            label(for="username") {{ st.tr["User name"] }}
+            input#username(type="text" v-model="st.user.name")
           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
-            label(for="notifyNew") Notify new moves &amp; 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
-            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
-        button(v-if="stage!='Update'" @click="toggleStage()")
-          span {{ stage=="Login" ? "Register" : "Login" }}
-        button(v-else onClick="location.replace('/logout')")
-          span Logout
-      #dialog(:style="{display: displayInfo}") {{ infoMsg }}
+        button(@click="onSubmit()")
+          span {{ st.tr[submitMessage] }}
+        button(v-if="stage!='Update'" type="button" @click="toggleStage()")
+          span {{ st.tr[stage=="Login" ? "Register" : "Login"] }}
+        button(v-else type="button" @click="doLogout()")
+          span {{ st.tr["Logout"] }}
+      #dialog.text-center {{ st.tr[infoMsg] }}
 </template>
 
 <script>
@@ -40,13 +38,27 @@ export default {
   name: 'my-upsert-user',
   data: function() {
     return {
-      user: store.state.user,
       nameOrEmail: "", //for login
-      stage: (store.state.user.id > 0 ? "Update" : "Login"), //TODO?
+      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)
@@ -59,18 +71,21 @@ export default {
           return "Apply";
       }
     },
-    displayInfo: function() {
-      return (this.infoMsg.length > 0 ? "block" : "none");
+    stage: function() {
+      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)
-      this.stage = (this.stage == "Login" ? "Register" : "Login");
+      this.logStage = (this.logStage == "Login" ? "Register" : "Login");
     },
     ajaxUrl: function() {
       switch (this.stage)
@@ -100,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!";
       }
@@ -109,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')
       {
@@ -117,31 +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 = "";
-            this.user["email"] = "";
-            // Update global object
-            this.user["name"] = res.name;
-            this.user["id"] = res.id;
-            // Store our identifiers in local storage (by little anticipation...)
-            localStorage["myid"] = res.id;
-            localStorage["myname"] = res.name;
-          }
-          setTimeout(() => {
-            this.infoMsg = "";
-            if (this.stage == "Register")
-              this.stage = "Login";
-            document.getElementById("modalUser").checked = false;
-          }, 2000);
         },
         err => {
           this.infoMsg = "";
@@ -149,6 +149,19 @@ export default {
         }
       );
     },
+    doLogout: function() {
+      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>