註冊登入空白欄位檢查 & 英文化

html/login.js

@@ -67,7 +67,30 @@ function login(){
         }
     };
     
-    var data = "grant_type=&username=" + $('#username').val() + "&password="+$('#password').val()+"&scope=&client_id=&client_secret=";
+    var username = $('#username').val();
+    var password = $('#password').val();
+
+    // 登入資料檢查
+    if (username == '' || password == '') {
+        let title = "登入失敗";
+        let text = "請先輸入您的帳號/密碼";
+
+        if (lang == 'en') { 
+            title = "Login Failed!";
+            text = "Please enter your username and password";
+        }
+
+        Swal.fire({
+            title: title,
+            icon: 'error',
+            text: text,
+            confirmButtonColor: '#3085d6',
+        });
+
+        return;
+    }
+
+    var data = "grant_type=&username=" + username + "&password="+password+"&scope=&client_id=&client_secret=";
     result = xhr.send(data);
     console.log(result);
 }

html/register.js

@@ -23,7 +23,13 @@ function validateEmail(email) {
     if(re.test(String(email).toLowerCase()) === false) {
         $('#register [name = "email"]').addClass('error');
         if( !$('.error-text').length ) {
-            $('input.error').after('<p class="error-text" set-lan="html:errorEmail">請輸入正確E-mail</p>');
+            let msg = '請輸入正確E-mail';
+
+            if (lang == 'en') { 
+                msg = 'Please enter valid Email format.';
+            }
+
+            $('input.error').after('<p class="error-text" set-lan="html:errorEmail">' + msg + '</p>');
         } 
     } else {
         $('#register [name = "email"]').removeClass('error');
@@ -48,9 +54,30 @@ function validatePassword(psd) {
 }
 
 function register() {
-    const userName = $('#register [name = "username"]').val();
-    const email = $('#register [name = "email"]').val();
-    const password = $('#register [name = "password"]').val();
+    let userName = $('#register [name = "username"]').val();
+    let email = $('#register [name = "email"]').val();
+    let password = $('#register [name = "password"]').val();
+
+    // 註冊資料檢查
+    if (username == '' || password == '') {
+        let title = "註冊失敗";
+        let text = "請先輸入您的帳號/密碼";
+
+        if (lang == 'en') { 
+            title = "Login Failed!";
+            text = "Please enter your username and password";
+        }
+
+        Swal.fire({
+            title: title,
+            icon: 'error',
+            text: text,
+            confirmButtonColor: '#3085d6',
+        });
+
+        return;
+    }
+
     if(userName && validateEmail(email) && validatePassword(password)) {
         let userObj = {
             username: userName,