From 966e68750919fa15271a8e9a4c48899f9bd0ca24 Mon Sep 17 00:00:00 2001
From: Ludovic CANDELLIER <ludovic.candellier@fundglobam.com>
Date: Thu, 24 Nov 2022 17:41:57 +0100
Subject: [PATCH] fix on better routes

---
 .../Shop/Auth/ResetPasswordController.php        | 16 +++++-----------
 resources/views/Shop/auth/login.blade.php        |  2 +-
 .../views/Shop/auth/partials/login.blade.php     |  4 ++--
 .../Shop/auth/partials/lost_password.blade.php   |  4 ++--
 .../views/Shop/auth/partials/register.blade.php  |  2 +-
 resources/views/Shop/auth/verify.blade.php       |  2 +-
 .../layout/partials/header-profile.blade.php     |  4 ++--
 routes/Shop/route.php                            |  2 +-
 8 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/app/Http/Controllers/Shop/Auth/ResetPasswordController.php b/app/Http/Controllers/Shop/Auth/ResetPasswordController.php
index 2a3803c9..882bc0d9 100644
--- a/app/Http/Controllers/Shop/Auth/ResetPasswordController.php
+++ b/app/Http/Controllers/Shop/Auth/ResetPasswordController.php
@@ -15,18 +15,12 @@ class ResetPasswordController extends Controller
 
     protected $redirectTo = '/';
 
-    public function __construct()
-    {
-        $this->middleware('guest');
-    }
-
     public function showResetForm(Request $request, $token = null)
     {
-        $token = $request->route()->parameter('token');
-
-        return view('Shop.auth.passwords.reset')->with(
-            ['token' => $token, 'email' => $request->email]
-        );
+        return view('Shop.auth.passwords.reset')->with([
+            'token' => $token,
+            'email' => $request->email,
+        ]);
     }
 
     protected function rules()
@@ -34,7 +28,7 @@ class ResetPasswordController extends Controller
         return [
             'token' => 'required',
             'email' => 'required|email',
-            'password' => ['required', 'confirmed', new PasswordRules()],
+            'password' => ['required', 'confirmed', new Password()],
         ];
     }
 
diff --git a/resources/views/Shop/auth/login.blade.php b/resources/views/Shop/auth/login.blade.php
index c0aec836..7e69b3c7 100644
--- a/resources/views/Shop/auth/login.blade.php
+++ b/resources/views/Shop/auth/login.blade.php
@@ -9,6 +9,6 @@
 
     <p class="mt-3">
         Vous n'avez pas encore de compte ? 
-        <a href="{{ route('register') }}" class="text-center">{{ __('Inscrivez-vous') }}</a>
+        <a href="{{ route('Shop.register') }}" class="text-center">{{ __('Inscrivez-vous') }}</a>
     </p>
 @endsection
diff --git a/resources/views/Shop/auth/partials/login.blade.php b/resources/views/Shop/auth/partials/login.blade.php
index 4515e3fb..a421619f 100644
--- a/resources/views/Shop/auth/partials/login.blade.php
+++ b/resources/views/Shop/auth/partials/login.blade.php
@@ -1,4 +1,4 @@
-{!! Form::open(['route' => 'login.post', 'method' => 'post', 'autocomplete'=> 'off']) !!}
+{!! Form::open(['route' => 'Shop.login.post', 'method' => 'post', 'autocomplete'=> 'off']) !!}
 
     <div class="form-group has-feedback">
         <div class="input-group form-group {{ $errors->has('email') ? 'has-error' : '' }}">
@@ -28,7 +28,7 @@
         </div>
 
         <div class="col-12 col-lg-6">
-            <a href="{{ route('password.request') }}">{{ __('Mot de passe oublié ?') }}</a><br>        
+            <a href="{{ route('Shop.password.request') }}">{{ __('Mot de passe oublié ?') }}</a><br>        
             <!--
             <div class="checkbox icheck">
                 <label style="padding-left: 0">
diff --git a/resources/views/Shop/auth/partials/lost_password.blade.php b/resources/views/Shop/auth/partials/lost_password.blade.php
index 6a9f3b69..edb32d0f 100644
--- a/resources/views/Shop/auth/partials/lost_password.blade.php
+++ b/resources/views/Shop/auth/partials/lost_password.blade.php
@@ -1,4 +1,4 @@
-{!! Form::open(['route' => 'password.email', 'method' => 'post', 'autocomplete'=> 'off']) !!}
+{!! Form::open(['route' => 'Shop.password.email', 'method' => 'post', 'autocomplete'=> 'off']) !!}
 <div class="form-group {{ $errors->has('email') ? 'has-error' : '' }}">
     {{ Form::email('email', old('email'), ['class' => 'form-control', 'placeholder' => __('boilerplate::auth.fields.email'), 'required', 'autofocus']) }}
     {!! $errors->first('email','<p class="text-danger"><strong>:message</strong></p>') !!}
@@ -13,4 +13,4 @@
     </div>
 </div>
 {!! Form::close() !!}
-<a href="{{ route('login') }}">{{ __('boilerplate::auth.password.login_link') }}</a><br>
+<a href="{{ route('Shop.login') }}">{{ __('boilerplate::auth.password.login_link') }}</a><br>
diff --git a/resources/views/Shop/auth/partials/register.blade.php b/resources/views/Shop/auth/partials/register.blade.php
index ba472840..8c49834c 100644
--- a/resources/views/Shop/auth/partials/register.blade.php
+++ b/resources/views/Shop/auth/partials/register.blade.php
@@ -1,4 +1,4 @@
-{!! Form::open(['route' => 'register.post', 'method' => 'post', 'autocomplete'=> 'off']) !!}
+{!! Form::open(['route' => 'Shop.register.post', 'method' => 'post', 'autocomplete'=> 'off']) !!}
     <div class="row">
         <div class="col-12">
             <x-card title='Créez votre compte' class='mt-3 mb-3'>
diff --git a/resources/views/Shop/auth/verify.blade.php b/resources/views/Shop/auth/verify.blade.php
index c742cb4b..6b27db84 100644
--- a/resources/views/Shop/auth/verify.blade.php
+++ b/resources/views/Shop/auth/verify.blade.php
@@ -15,7 +15,7 @@
                     @endif
 
                     {{ __('Before proceeding, please check your email for a verification link.') }}
-                    {{ __('If you did not receive the email') }}, <a href="{{ route('verification.resend') }}">{{ __('click here to request another') }}</a>.
+                    {{ __('If you did not receive the email') }}, <a href="{{ route('Shop.verification.resend') }}">{{ __('click here to request another') }}</a>.
                 </div>
             </div>
         </div>
diff --git a/resources/views/Shop/layout/partials/header-profile.blade.php b/resources/views/Shop/layout/partials/header-profile.blade.php
index 06ef79fb..13f94c46 100644
--- a/resources/views/Shop/layout/partials/header-profile.blade.php
+++ b/resources/views/Shop/layout/partials/header-profile.blade.php
@@ -27,12 +27,12 @@
 				</li>
 			@else
 				<li class="dropdown-item">
-					<a href="{{ route('login') }}" title="Identifiez-vous" rel="nofollow">
+					<a href="{{ route('Shop.login') }}" title="Identifiez-vous" rel="nofollow">
 						<span>Connexion</span>
 					</a>
 				</li>
 				<li class="dropdown-item">
-					<a href="{{ route('register') }}" title="Enregistrez-vous" rel="nofollow">
+					<a href="{{ route('Shop.register') }}" title="Enregistrez-vous" rel="nofollow">
 						<span>Creer votre compte</span>
 					</a>
 				</li>
diff --git a/routes/Shop/route.php b/routes/Shop/route.php
index a1918367..7f1d5e3d 100644
--- a/routes/Shop/route.php
+++ b/routes/Shop/route.php
@@ -1,6 +1,6 @@
 <?php
 
-Route::prefix('')->namespace('Shop')->name('')->group(function () {
+Route::prefix('')->namespace('Shop')->name('Shop.')->group(function () {
     Route::get('login', 'Auth\LoginController@showLoginForm')->name('login');
     Route::post('login', 'Auth\LoginController@login')->name('login.post');
     Route::post('logout', 'Auth\LoginController@logout')->name('logout');