Merge branch 'issue-135'

client/src/components/Register.vue

@@ -12,7 +12,7 @@
       dark
       flat
     > <v-icon>mdi-account-plus</v-icon>&nbsp;&nbsp;
-      <v-card-title class="title font-weight-regular">สมัคสมาชิก</v-card-title>
+      <v-card-title ><h1>สมัครสมาชิก</h1></v-card-title>
 
       <v-spacer></v-spacer>
 
@@ -97,13 +97,17 @@
     </table>
           <div v-if = "clickRegister == true">
           <div v-if = "registerCheck == true">
+
             <v-alert type="success">Register Completed</v-alert>
           </div>
         <div v-if = "registerCheck == false">
           <v-alert type="error">Can't Register</v-alert>
         </div>
-
+        <div v-if = "UsernameCheck == false">
+          <v-alert type="error">Username ถูกใช้ไปแล้ว</v-alert>
         </div>
+          </div>
+
 </v-form>
       </v-card>
 
@@ -131,6 +135,7 @@ export default {
     Gender : [],
      registerCheck: false,
       clickRegister: false,
+      UsernameCheck: true
       
   };
   },
@@ -172,35 +177,36 @@ export default {
          },
  
     SaveRe() {
-          this.clickRegister = true;
+         
       if (this.username==null || this.pw ==null|| 
         this.selectGender==null || this.name==null ||
         this.selectJob==null ||
         this.age==null|| this.selectCountry==null ||
         this.tel==null){
         //alert("กรุณากรอกข้อมูลให้ครบถ้วน!");
-       
+       this.clickRegister = true;
       } else {
         this.checkUsername();
       }
     },
 
-    checkUsername() {this.registerCheckUsernae = false;
+    checkUsername() {
       http
         .get("/user/check/" + this.username)
         .then(res => {
           if (!res.data) {
             this.registered();}
             else{
-              alert("Username ถูกใช้ไปแล้ว")
+             // alert("Username ถูกใช้ไปแล้ว")
+              this.UsernameCheck  = false;
+              
             }
         })
         .catch(e => {
           console.log(e);
         });
     },
     registered() {
-      this.registerCheck = true;
          http
         .post("/user/" +
           this.username+"/"+this.pw+"/"+this.selectGender
@@ -209,6 +215,7 @@ export default {
           console.log(response);
           //alert("บันทึกข้อมูลสำเร็จ");
          // window.location.reload()
+          this.registerCheck = true;
         })
         .catch(e => {
           console.log(e);
@@ -230,3 +237,16 @@ export default {
   },
 };
 </script>
+<style>
+@import url('https://fonts.googleapis.com/css?family=Prompt&display=swap');
+
+    div {
+    font-family: 'Prompt', sans-serif;
+  
+    }
+   v-card{
+        font-family: 'Prompt', sans-serif;
+    }
+
+
+</style>