From 528423d56bd8a9fc74abee003802c6b46011f171 Mon Sep 17 00:00:00 2001 From: Windows Store Date: Mon, 17 Aug 2026 08:10:48 +0330 Subject: [PATCH] feat(auth): update login and register flow --- app/Http/Controllers/Auth/LoginController.php | 2 + app/Http/Requests/Auth/LoginPostRequest.php | 2 +- .../Requests/Auth/RegisterPostRequest.php | 16 +- resources/views/auth/login.blade.php | 284 ++++-------------- resources/views/auth/register.blade.php | 10 +- 5 files changed, 73 insertions(+), 241 deletions(-) diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index 069b9da..bc07cb6 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -29,11 +29,13 @@ class LoginController extends Controller 'general' => 'اطلاعات یافت نشد' ]); } + if (!\Hash::check($input['password'] , $user->password)){ return back()->withErrors([ 'general' => 'اطلاعات یافت نشد' ]); } + Auth::login($user); return redirect()->route('index'); } diff --git a/app/Http/Requests/Auth/LoginPostRequest.php b/app/Http/Requests/Auth/LoginPostRequest.php index d41844e..db7bcea 100644 --- a/app/Http/Requests/Auth/LoginPostRequest.php +++ b/app/Http/Requests/Auth/LoginPostRequest.php @@ -34,7 +34,7 @@ class LoginPostRequest extends FormRequest 'password' => [ 'required', 'string', - 'min:8', + 'min:2', 'alpha_num', diff --git a/app/Http/Requests/Auth/RegisterPostRequest.php b/app/Http/Requests/Auth/RegisterPostRequest.php index e0697db..58a6037 100644 --- a/app/Http/Requests/Auth/RegisterPostRequest.php +++ b/app/Http/Requests/Auth/RegisterPostRequest.php @@ -66,7 +66,8 @@ class RegisterPostRequest extends FormRequest 'string', 'min:5', 'max:100', - 'alpha_num' + 'alpha_num', + 'unique:users,user_name' ], 'national_code' => [ 'required', @@ -84,19 +85,26 @@ class RegisterPostRequest extends FormRequest 'gender' => [ 'required', 'int', - 'in:0,1,2' + 'in:0,1,' ], 'marital_status' => [ 'required', 'int', - 'in:0,1' + 'in:0,1,2' ], 'user_province' => [ 'nullable' ], 'user_city' => [ 'nullable' - ] + ], + 'image' => [ + 'nullable', + 'file', + 'mimes:jpg,jpeg,png,webp', + 'max:800', + + ], ]; } } diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index ea7e66f..e4993ae 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -1,246 +1,68 @@ @extends('layouts.app') @section('content') -
-
-
-

داشبورد

- -
+
+

ورود

+
-
@endsection - diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php index 7cdd09a..e4cee0f 100644 --- a/resources/views/auth/register.blade.php +++ b/resources/views/auth/register.blade.php @@ -24,7 +24,7 @@

حساب MyTrip خود را ایجاد کنید

-
+ @csrf
@@ -196,7 +196,7 @@ class="form-control" placeholder="نام کاربری" id="user_name" - value="{{old('username')}}" + value="{{old('user_name')}}" > @@ -236,13 +236,13 @@
- +