Better Ball rules. Buggish but almost OK Synchrone variant

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

diff --git a/client/src/components/UpsertUser.vue b/client/src/components/UpsertUser.vue
index 50b702d..dc948cf 100644 (file)
--- a/client/src/components/UpsertUser.vue
+++ b/client/src/components/UpsertUser.vue
@@ -4,7 +4,7 @@ div
     type="checkbox"
     @change="trySetEnterTime($event)"
   )
-  div(
+  div#upsertDiv(
     role="dialog"
     data-checkbox="modalUser"
   )
@@ -14,22 +14,22 @@ div
       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
@@ -59,6 +59,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 +68,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 +108,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 +147,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 +161,7 @@ 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 +170,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);
+          }
         }
       );
     },