From 0418e56f6e432b9420cd70aa5d900c240fdfd55d Mon Sep 17 00:00:00 2001 From: Zura Sekhniashvili Date: Sat, 5 Nov 2022 00:13:49 +0400 Subject: [PATCH 1/3] Add demo users on frontend and admin panel login pages --- backend/src/views/Login.vue | 11 ++++++++++- package-lock.json | 2 +- resources/views/auth/login.blade.php | 8 ++++++++ 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/backend/src/views/Login.vue b/backend/src/views/Login.vue index 003f56d..fc7a842 100644 --- a/backend/src/views/Login.vue +++ b/backend/src/views/Login.vue @@ -21,8 +21,17 @@ d="M6 18L18 6M6 6l12 12" /> - + + +
+

Demo user

+
+Email: admin@example.com
+Password: admin123
+
+
+
diff --git a/package-lock.json b/package-lock.json index 9a03ed9..cf30ad1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "laravel-vue-ecommerce", + "name": "tmp", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index cfd1574..7375f09 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -13,6 +13,14 @@ class="text-sm text-purple-700 hover:text-purple-600"

+

Demo Users

+
+Email: user1@example.com   
+Password: useruser1
+
+Email: user2@example.com
+Password: useruser2
+ From 8456c449fdee55583cb72b37c7cf9f41c59a28ad Mon Sep 17 00:00:00 2001 From: Zura Sekhniashvili Date: Sat, 5 Nov 2022 22:57:20 +0400 Subject: [PATCH 2/3] Rollback user registration if there is exception --- .../Auth/RegisteredUserController.php | 39 +++++++++++-------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/app/Http/Controllers/Auth/RegisteredUserController.php b/app/Http/Controllers/Auth/RegisteredUserController.php index 388d6ba..cc91923 100644 --- a/app/Http/Controllers/Auth/RegisteredUserController.php +++ b/app/Http/Controllers/Auth/RegisteredUserController.php @@ -10,6 +10,7 @@ use Illuminate\Auth\Events\Registered; use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; +use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Hash; use Illuminate\Validation\Rules; @@ -28,7 +29,7 @@ public function create() /** * Handle an incoming registration request. * - * @param \Illuminate\Http\Request $request + * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\RedirectResponse * * @throws \Illuminate\Validation\ValidationException @@ -41,24 +42,30 @@ public function store(Request $request) 'password' => ['required', 'confirmed', Rules\Password::defaults()], ]); - $user = User::create([ - 'name' => $request->name, - 'email' => $request->email, - 'password' => Hash::make($request->password), - ]); - - event(new Registered($user)); + DB::beginTransaction(); + try { + $user = User::create([ + 'name' => $request->name, + 'email' => $request->email, + 'password' => Hash::make($request->password), + ]); - $customer = new Customer(); - $names = explode(" ",$user->name); - $customer->user_id = $user->id; - $customer->first_name = $names[0]; - $customer->last_name = $names[1] ?? ''; - $customer->save(); - Auth::login($user); + $customer = new Customer(); + $names = explode(" ", $user->name); + $customer->user_id = $user->id; + $customer->first_name = $names[0]; + $customer->last_name = $names[1] ?? ''; + $customer->save(); + event(new Registered($user)); + Auth::login($user); - Cart::moveCartItemsIntoDb(); + Cart::moveCartItemsIntoDb(); + DB::commit(); + } catch (\Exception $e) { + DB::rollBack(); + throw $e; + } return redirect(RouteServiceProvider::HOME); } From a4fa1a7307d4a26b6ff13efe77f4c1b19f7ae69f Mon Sep 17 00:00:00 2001 From: Zura Sekhniashvili Date: Sat, 5 Nov 2022 23:05:13 +0400 Subject: [PATCH 3/3] Show correct message on registration --- app/Http/Controllers/Auth/RegisteredUserController.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/Auth/RegisteredUserController.php b/app/Http/Controllers/Auth/RegisteredUserController.php index cc91923..43dbd83 100644 --- a/app/Http/Controllers/Auth/RegisteredUserController.php +++ b/app/Http/Controllers/Auth/RegisteredUserController.php @@ -13,6 +13,7 @@ use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Hash; use Illuminate\Validation\Rules; +use Illuminate\Validation\ValidationException; class RegisteredUserController extends Controller { @@ -64,7 +65,9 @@ public function store(Request $request) DB::commit(); } catch (\Exception $e) { DB::rollBack(); - throw $e; + throw ValidationException::withMessages([ + 'email' => 'There was a problem during email sending. Please try to login with existing accounts', + ]); } return redirect(RouteServiceProvider::HOME);