diff --git a/app/Http/Controllers/Auth/ResetPasswordController.php b/app/Http/Controllers/Auth/ResetPasswordController.php index b1726a3..8081914 100644 --- a/app/Http/Controllers/Auth/ResetPasswordController.php +++ b/app/Http/Controllers/Auth/ResetPasswordController.php @@ -27,4 +27,18 @@ class ResetPasswordController extends Controller * @var string */ protected $redirectTo = RouteServiceProvider::HOME; + + /** + * Get the password reset validation rules. + * + * @return array + */ + protected function rules() + { + return [ + 'token' => 'required', + 'email' => 'required|email', + 'password' => ['required', 'string', 'min:8', 'confirmed', 'regex:/^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[#?!@$%^&*-]).{6,}$/'], + ]; + } } diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index ab3eb55..920baeb 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -43,14 +43,13 @@ @endif

Password

-

Don't forget your password! Passwords are currently non-recoverable.

@error('password') {{ $message }} @enderror
- @if (Route::has('password.request')) -
+

- {{ __('Forgot Your Password?') }} + Forgot Your Password? @endif diff --git a/resources/views/auth/passwords/email.blade.php b/resources/views/auth/passwords/email.blade.php index d1ac783..fd06226 100644 --- a/resources/views/auth/passwords/email.blade.php +++ b/resources/views/auth/passwords/email.blade.php @@ -1,47 +1,34 @@ @extends('layouts.app') +@section('title') + Reset Password - {{ env('APP_NAME') }} +@endsection + +@section('alert') + @if (session('status')) + + @endif +@endsection @section('content') -
-
-
-
-
{{ __('Reset Password') }}
+

Reset Password

+
+ @csrf +

Email Address

+ + @error('email') + +
{{ $message }} +
+ @enderror +

-
- @if (session('status')) - - @endif - - - @csrf - -
- - -
- - - @error('email') - - {{ $message }} - - @enderror -
-
- -
-
- -
-
- -
-
-
-
-
+ + @endsection diff --git a/resources/views/auth/passwords/reset.blade.php b/resources/views/auth/passwords/reset.blade.php index dccf6c6..05c2beb 100644 --- a/resources/views/auth/passwords/reset.blade.php +++ b/resources/views/auth/passwords/reset.blade.php @@ -1,65 +1,43 @@ @extends('layouts.app') +@section('title') + Reset Password - {{ env('APP_NAME') }} +@endsection @section('content') -
-
-
-
-
{{ __('Reset Password') }}
+

Reset Password

+

Passwords must be 8 or more characters, with 1 capital letter, 1 symbol and 1 number.


+
+ @csrf -
- - @csrf + - +

Email Address

+ -
- + @error('email') + +
{{ $message }} +
+ @enderror -
- +

New Password

+ - @error('email') - - {{ $message }} - - @enderror -
-
+ @error('password') + +
{{ $message }} +
+ @enderror -
- +

Confirm New Password

+ +

-
- - - @error('password') - - {{ $message }} - - @enderror -
-
- -
- - -
- -
-
- -
-
- -
-
- -
-
-
-
-
+ + @endsection diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php index 99a0c52..2c9491e 100644 --- a/resources/views/auth/register.blade.php +++ b/resources/views/auth/register.blade.php @@ -75,7 +75,6 @@

Don't reuse passwords, and don't use a simple one!

Passwords must be 8 or more characters, with 1 capital letter, 1 symbol and 1 number.

-

Don't forget your password! Passwords are currently non-recoverable.

@error('password')
{{ $message }}