diff --git a/app/Http/Controllers/Auth/ForgotPasswordController.php b/app/Http/Controllers/Auth/ForgotPasswordController.php index 46cbf98..38e126f 100644 --- a/app/Http/Controllers/Auth/ForgotPasswordController.php +++ b/app/Http/Controllers/Auth/ForgotPasswordController.php @@ -28,9 +28,4 @@ class ForgotPasswordController extends Controller { $this->middleware('guest'); } - - public function showForgotForm() - { - return view('pages.authentication.forgot'); - } } diff --git a/resources/views/pages/authentication/login.blade.php b/resources/views/pages/authentication/login.blade.php index d6d7809..f2579d6 100644 --- a/resources/views/pages/authentication/login.blade.php +++ b/resources/views/pages/authentication/login.blade.php @@ -60,7 +60,7 @@
- Forgot your password? + Forgot your password?
diff --git a/resources/views/pages/authentication/password/change.blade.php b/resources/views/pages/authentication/password/change.blade.php new file mode 100644 index 0000000..949e9b4 --- /dev/null +++ b/resources/views/pages/authentication/password/change.blade.php @@ -0,0 +1,120 @@ +@extends('layouts.base') + +@section('content') +
+
+
+
+
+
+
+
+ logo +
+
+
+
+
+

Change Your Password

+
+
+
+
+
+
+
+ @if($errors->any()) + @foreach ($errors->all() as $error) +
{{ $error }}
+ @endforeach + @endif +
+
+
+ @csrf + +
+ +
+ +
+
+
+ +
+ + @if ($errors->has('password')) + + {{ $errors->first('password') }} + + @endif +
+
+
+ +
+ +
+
+
+
+ +
+
+
+ + {{--
--}} + {{--@csrf--}} + + {{----}} + + {{--
--}} + {{----}} + + {{--
--}} + {{----}} + + {{--@if ($errors->has('email'))--}} + {{----}} + {{--{{ $errors->first('email') }}--}} + {{----}} + {{--@endif--}} + {{--
--}} + {{--
--}} + + {{--
--}} + {{----}} + + {{--
--}} + {{----}} + + {{--@if ($errors->has('password'))--}} + {{----}} + {{--{{ $errors->first('password') }}--}} + {{----}} + {{--@endif--}} + {{--
--}} + {{--
--}} + + {{--
--}} + {{----}} + + {{--
--}} + {{----}} + {{--
--}} + {{--
--}} + + {{--
--}} + {{--
--}} + {{----}} + {{--
--}} + {{--
--}} + {{--
--}} +
+
+
+
+
+@endsection \ No newline at end of file diff --git a/resources/views/pages/authentication/forgot.blade.php b/resources/views/pages/authentication/password/forgot.blade.php similarity index 51% rename from resources/views/pages/authentication/forgot.blade.php rename to resources/views/pages/authentication/password/forgot.blade.php index 3dba811..b8d9336 100644 --- a/resources/views/pages/authentication/forgot.blade.php +++ b/resources/views/pages/authentication/password/forgot.blade.php @@ -1,6 +1,33 @@ @extends('layouts.base') @section('content') + @if (session('status')) +
+
+
+
+
+
+
+ +
We just sent an email to reset your password
+

Click on the link we've sent you to reset your password. + if you have not received an email, Please check your spambox

+
+
+
+ + + +
+
+
+
+
+
+
+
+ @else
@@ -31,29 +58,35 @@ @endif
- -
+ + @csrf +
- + +
+
+ + @if ($errors->has('email')) + + {{ $errors->first('email') }} + + @endif
+
{{ csrf_field() }}
-
-<<<<<<< Updated upstream -@endsection -======= -@endsection ->>>>>>> Stashed changes + @endif +@endsection \ No newline at end of file diff --git a/routes/web.php b/routes/web.php index 17ba750..f990d7a 100644 --- a/routes/web.php +++ b/routes/web.php @@ -1,7 +1,6 @@ name('login'); -Route::get('/forgot', 'Auth\ForgotPasswordController@showForgotForm')->name('login'); Route::group(['prefix' => 'auth'], function () { Route::post('/login', 'Auth\LoginController@login')->name('auth.login'); @@ -10,7 +9,14 @@ Route::group(['prefix' => 'auth'], function () { Route::post('/registration/create', 'Account\RegisterAccountController@register')->name('auth.registration.create'); - Route::post('/forgot', 'Account\ForgotAccountController@forgot')->name('auth.forgot'); + Route::get('password/forgot', function () { + return view('pages.authentication.password.forgot'); + })->name('password.forgot'); + Route::post('password/email', 'Auth\ForgotPasswordController@sendResetLinkEmail')->name('password.email'); + Route::get('password/reset/{token}', function ($token){ + return view('pages.authentication.password.change',['token' => $token]); + })->name('password.reset'); + Route::post('password/update', 'Auth\ResetPasswordController@reset')->name('password.update'); Route::get('/logout', 'Auth\LoginController@logout')->name('auth.logout'); }); @@ -47,7 +53,7 @@ Route::group(['middleware' => ['secure', 'clearcache']], function (): void { Route::get('/order/profile', function(){ return view('pages.orders.profile'); })->name('order.profile'); - + });