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 @@

Vous n'avez pas encore de compte ? - {{ __('Inscrivez-vous') }} + {{ __('Inscrivez-vous') }}

@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']) !!}
@@ -28,7 +28,7 @@
- {{ __('Mot de passe oublié ?') }}
+ {{ __('Mot de passe oublié ?') }}