X-Git-Url: https://git.auder.net/img/rock_paper_scissors_lizard_spock.gif?a=blobdiff_plain;f=client%2Fsrc%2Fcomponents%2FUpsertUser.vue;h=6fc67742d02b56b8d70c10e9d8e67ff02bac7d0f;hb=659a9bd22c88177e203207a406cdb6c9f69139d4;hp=81267bff604e7fc09c3af8b023d6cc6795e7516d;hpb=77c5096644d83aaae8ab1dd42a5cde524507cf9d;p=vchess.git

diff --git a/client/src/components/UpsertUser.vue b/client/src/components/UpsertUser.vue
index 81267bff..6fc67742 100644
--- a/client/src/components/UpsertUser.vue
+++ b/client/src/components/UpsertUser.vue
@@ -1,69 +1,97 @@
 <template lang="pug">
 div
-  input#modalUser.modal(type="checkbox" @change="trySetEnterTime")
-  div(role="dialog" data-checkbox="modalUser")
+  input#modalUser.modal(
+    type="checkbox"
+    @change="trySetEnterTime($event)"
+  )
+  div#upsertDiv(
+    role="dialog"
+    data-checkbox="modalUser"
+  )
     .card
       label.modal-close(for="modalUser")
-      h3 {{ stage }}
-      form#userForm(@submit.prevent="onSubmit()" @keyup.enter="onSubmit")
+      h3.section
+        span.title {{ st.tr[stage] }}
+        | (
+        span.link(
+          v-if="stage!='Update'"
+          @click="toggleStage()"
+        )
+          | {{ st.tr[stage=="Login" ? "Register" : "Login"] }}
+        span.link(
+          v-else
+          @click="doLogout()"
+        )
+          | {{ st.tr["Logout"] }}
+        img(src="/images/icons/rightArrow.svg")
+        | )
+      div(@keyup.enter="onSubmit()")
         div(v-show="stage!='Login'")
           fieldset
-            label(for="username") {{ st.tr["Name"] }}
-            input#username(type="text" v-model="user.name")
+            label(for="u_username") {{ st.tr["User name"] }}
+            input#u_username(
+              type="text"
+              v-model="user.name"
+            )
           fieldset
-            label(for="useremail") {{ st.tr["Email"] }}
-            input#useremail(type="email" v-model="user.email")
+            label(for="u_useremail") {{ st.tr["Email"] }}
+            input#u_useremail(
+              type="email"
+              v-model="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="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()")
-          span {{ st.tr[submitMessage] }}
-        button(v-if="stage!='Update'" @click="toggleStage()")
-          span {{ st.tr[stage=="Login" ? "Register" : "Login"] }}
-        button#logoutBtn(v-else @click="doLogout()")
-          span {{ st.tr["Logout"] }}
-      #dialog(:style="{display: displayInfo}") {{ st.tr[infoMsg] }}
+            input#nameOrEmail(
+              type="text"
+              v-model="nameOrEmail"
+            )
+      button#submitBtn(@click="onSubmit()")
+        | {{ st.tr[submitMessage] }}
+      #dialog.text-center {{ st.tr[infoMsg] }}
 </template>
 
 <script>
 import { store } from "@/store";
 import { checkNameEmail } from "@/data/userCheck";
 import { ajax } from "@/utils/ajax";
+import { processModalClick } from "@/utils/modalClick.js";
 export default {
-  name: 'my-upsert-user',
+  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
       st: store.state,
+      user: {}
     };
   },
+  mounted: function() {
+    document.getElementById("upsertDiv")
+      .addEventListener("click", processModalClick);
+  },
   watch: {
     nameOrEmail: function(newValue) {
-      if (newValue.indexOf('@') >= 0)
-      {
+      if (newValue.indexOf("@") >= 0) {
         this.user.email = newValue;
         this.user.name = "";
-      }
-      else
-      {
+      } else {
         this.user.name = newValue;
         this.user.email = "";
       }
-    },
+    }
   },
   computed: {
     submitMessage: function() {
-      switch (this.stage)
-      {
+      switch (this.stage) {
         case "Login":
           return "Go";
         case "Register":
@@ -71,26 +99,31 @@ export default {
         case "Update":
           return "Apply";
       }
-    },
-    displayInfo: function() {
-      return (this.infoMsg.length > 0 ? "block" : "none");
+      return "Never reached";
     },
     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)
+      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() {
       // Loop login <--> register (update is for logged-in users)
-      this.logStage = (this.logStage == "Login" ? "Register" : "Login");
+      this.logStage = this.logStage == "Login" ? "Register" : "Login";
     },
     ajaxUrl: function() {
-      switch (this.stage)
-      {
+      switch (this.stage) {
         case "Login":
           return "/sendtoken";
         case "Register":
@@ -98,10 +131,10 @@ export default {
         case "Update":
           return "/update";
       }
+      return "Never reached";
     },
     ajaxMethod: function() {
-      switch (this.stage)
-      {
+      switch (this.stage) {
         case "Login":
           return "GET";
         case "Register":
@@ -109,71 +142,89 @@ export default {
         case "Update":
           return "PUT";
       }
+      return "Never reached";
     },
     infoMessage: function() {
-      switch (this.stage)
-      {
+      switch (this.stage) {
         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!";
       }
+      return "Never reached";
     },
     onSubmit: function() {
       // 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
+      if (this.stage == "Register" && exitTime - this.enterTime < 5000) return;
       let error = undefined;
-      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.user);
+      if (error) {
+        alert(this.st.tr[error]);
+        return;
       }
-      else
-        error = checkNameEmail(this.user);
-      if (!!error)
-        return alert(error);
       this.infoMsg = "Processing... Please wait";
-      ajax(this.ajaxUrl(), this.ajaxMethod(),
-        this.stage == "Login" ? { nameOrEmail: this.nameOrEmail } : this.user,
-        res => {
-          this.infoMsg = this.infoMessage();
-          if (this.stage != "Update")
-            this.nameOrEmail = "";
-          setTimeout(() => {
+      ajax(
+        this.ajaxUrl(),
+        this.ajaxMethod(),
+        {
+          credentials: true,
+          data: (
+            this.stage == "Login"
+              ? { nameOrEmail: this.nameOrEmail }
+              : this.user
+          ),
+          success: () => {
+            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;
+            }
+          },
+          error: (err) => {
             this.infoMsg = "";
-            document.getElementById("modalUser").checked = false;
-          }, 2000);
-        },
-        err => {
-          this.infoMsg = "";
-          alert(err);
+            alert(err);
+          }
         }
       );
     },
     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: 450px
+  max-height: 100%
+
+h3.section
+  span.title
+    padding-right: 10px
+  span.link
+    color: darkred
+    font-size: 0.8em
+    text-decoration: underline
+    cursor: pointer
+  img
+    height: 1em
+    padding-left: 5px
+
+#submitBtn
+  width: 50%
+  margin: 0 auto
+
+#dialog
+  padding: 5px
+  color: blue
+</style>