Cosmetics, mostly, and a few small bugs fixes

[vchess.git] / client / src / components / UpsertUser.vue

diff --git a/client/src/components/UpsertUser.vue b/client/src/components/UpsertUser.vue
index b5c6fbe..24e3c41 100644 (file)
--- a/client/src/components/UpsertUser.vue
+++ b/client/src/components/UpsertUser.vue
@@ -4,32 +4,46 @@ div
     type="checkbox"
     @change="trySetEnterTime($event)"
   )
-  div(
+  div#upsertDiv(
     role="dialog"
     data-checkbox="modalUser"
   )
     .card
       label.modal-close(for="modalUser")
-      h3.section {{ st.tr[stage] }}
+      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["User name"] }}
-            input#username(
+            label(for="u_username") {{ st.tr["User name"] }}
+            input#u_username(
               type="text"
-              v-model="st.user.name"
+              v-model="user.name"
             )
           fieldset
-            label(for="useremail") {{ st.tr["Email"] }}
-            input#useremail(
+            label(for="u_useremail") {{ st.tr["Email"] }}
+            input#u_useremail(
               type="email"
-              v-model="st.user.email"
+              v-model="user.email"
             )
           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
@@ -38,20 +52,8 @@ div
               type="text"
               v-model="nameOrEmail"
             )
-      .button-group
-        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"] }}
+      button#submitBtn(@click="onSubmit()")
+        | {{ st.tr[submitMessage] }}
       #dialog.text-center {{ st.tr[infoMsg] }}
 </template>
 
@@ -59,6 +61,7 @@ div
 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",
   data: function() {
@@ -67,17 +70,22 @@ export default {
       logStage: "Login", //or Register
       infoMsg: "",
       enterTime: Number.MAX_SAFE_INTEGER, //for a basic anti-bot strategy
-      st: store.state
+      st: store.state,
+      user: {}
     };
   },
+  mounted: function() {
+    document.getElementById("upsertDiv")
+      .addEventListener("click", processModalClick);
+  },
   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 {
-        this.st.user.name = newValue;
-        this.st.user.email = "";
+        this.user.name = newValue;
+        this.user.email = "";
       }
     }
   },
@@ -102,6 +110,12 @@ export default {
       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() {
@@ -135,7 +149,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 now";
         case "Update":
           return "Modifications applied!";
       }
@@ -149,7 +163,8 @@ export default {
       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;
@@ -158,16 +173,26 @@ export default {
       ajax(
         this.ajaxUrl(),
         this.ajaxMethod(),
-        this.stage == "Login"
-          ? { nameOrEmail: this.nameOrEmail }
-          : this.st.user,
-        () => {
-          this.infoMsg = this.infoMessage();
-          if (this.stage != "Update") this.nameOrEmail = "";
-        },
-        err => {
-          this.infoMsg = "";
-          alert(err);
+        {
+          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 = "";
+            alert(err);
+          }
         }
       );
     },
@@ -181,9 +206,25 @@ export default {
 
 <style lang="sass" scoped>
 [type="checkbox"].modal+div .card
-  max-width: 370px
+  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