From e86160cb63ca27dc979e774fd62ebed391b19c54 Mon Sep 17 00:00:00 2001
From: ukyo <ukyo02@gmail.com>
Date: Sat, 8 Feb 2025 17:02:42 +0800
Subject: [PATCH] =?UTF-8?q?fix.=20=E4=BF=AE=E6=AD=A3=E4=B8=80=E4=BA=9B?=
 =?UTF-8?q?=E4=B9=8B=E5=89=8D=20login=20=E7=9A=84=E5=91=BD=E5=90=8D?=
 =?UTF-8?q?=E5=B0=8E=E8=87=B4program=20error?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/LoginController.php        |  2 +-
 .../Controllers/front/RegisterController.php    |  8 +-------
 resources/views/admin/login.blade.php           | 17 +++++++++--------
 .../views/front/member/auth-register.blade.php  |  7 ++++++-
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/app/Http/Controllers/LoginController.php b/app/Http/Controllers/LoginController.php
index 30d4aee..d03ccae 100644
--- a/app/Http/Controllers/LoginController.php
+++ b/app/Http/Controllers/LoginController.php
@@ -157,7 +157,7 @@ public function memberNormalLogin(Request $request)
             return redirect()->route('member.index');
         } else {
 
-            return redirect()->route('front.login.view')->with('error', '帳號密碼錯誤');
+            return redirect()->route('login')->with('error', '帳號密碼錯誤');
         }
     }
 
diff --git a/app/Http/Controllers/front/RegisterController.php b/app/Http/Controllers/front/RegisterController.php
index e83e65c..819ab8d 100644
--- a/app/Http/Controllers/front/RegisterController.php
+++ b/app/Http/Controllers/front/RegisterController.php
@@ -35,14 +35,8 @@ public function create(Request $request)
             'phone' => $request->phone ?? '',
         ]);
 
-        if (isset($newUser->email)) {
+            return redirect()->route('login')->with('sucess', '完成註冊,請登入');
 
-            return redirect()->route('member.index')->with('sucess', '完成註冊');
-
-        } else {
-
-            return redirect()->route('member.profile')->with('sucess', '完成註冊,請完善你得資料');
-        }
 
     }
 
diff --git a/resources/views/admin/login.blade.php b/resources/views/admin/login.blade.php
index f0094d7..45532d9 100644
--- a/resources/views/admin/login.blade.php
+++ b/resources/views/admin/login.blade.php
@@ -231,6 +231,14 @@
 </body>
 <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
 
+
+
+</body>
+
+</html>
+
+<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
+
 @if (session('error'))
 <script>
     document.addEventListener("DOMContentLoaded", function() {
@@ -244,11 +252,4 @@
     });
 
 </script>
-@endif
-
-</body>
-
-</html>
-
-<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-
+@endif
\ No newline at end of file
diff --git a/resources/views/front/member/auth-register.blade.php b/resources/views/front/member/auth-register.blade.php
index a1bcdda..4f4238f 100644
--- a/resources/views/front/member/auth-register.blade.php
+++ b/resources/views/front/member/auth-register.blade.php
@@ -157,7 +157,7 @@
 
                         <p class="text-center">
                             <span>已經有帳號?</span>
-                            <a href="{{ route('front.login.view') }}" class="text-body">
+                            <a href="{{ route('login') }}" class="text-body">
                                 <span>由此登入</span>
                             </a>
                         </p>
@@ -388,6 +388,11 @@ function validateEmailField(field) {
 
             // 如果所有欄位均有效，執行表單提交
             if (isFormValid && isPhoneValid) {
+                $.ajaxSetup({
+    headers: {
+        'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
+    }
+});
                 $.ajax({
                     url: "{{ route('member.register.create') }}",
                     type: 'POST',