diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php index 5090fa4..717e191 100644 --- a/app/Http/Middleware/Authenticate.php +++ b/app/Http/Middleware/Authenticate.php @@ -15,6 +15,9 @@ class Authenticate extends Middleware */ protected function redirectTo($request) { + if ($request->route()->getName() === 'verification.verify') { + return route('login', ['logFirst' => true]); + } if (! $request->expectsJson()) { return route('login'); } diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index 9b82269..9a9fe8a 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -8,6 +8,11 @@
@csrf + @if(request()->logFirst) +
+

{{ __('Veuillez vous connecter pour vérifier votre email.') }}

+
+ @endif

{{ __('S\'Inscrire') }}

@@ -23,7 +28,7 @@
@error('email') - + {{ $message }} @enderror @@ -37,7 +42,7 @@ @error('password') - + {{ $message }} @enderror diff --git a/resources/views/auth/passwords/confirm.blade.php b/resources/views/auth/passwords/confirm.blade.php index a97b109..0fbad00 100644 --- a/resources/views/auth/passwords/confirm.blade.php +++ b/resources/views/auth/passwords/confirm.blade.php @@ -20,7 +20,7 @@ @error('password') - + {{ $message }} @enderror diff --git a/resources/views/auth/passwords/email.blade.php b/resources/views/auth/passwords/email.blade.php index 266dc83..c2682b6 100644 --- a/resources/views/auth/passwords/email.blade.php +++ b/resources/views/auth/passwords/email.blade.php @@ -24,7 +24,7 @@ @error('email') - + {{ $message }} @enderror diff --git a/resources/views/auth/passwords/reset.blade.php b/resources/views/auth/passwords/reset.blade.php index 64b6ace..63eb876 100644 --- a/resources/views/auth/passwords/reset.blade.php +++ b/resources/views/auth/passwords/reset.blade.php @@ -20,7 +20,7 @@ @error('email') - + {{ $message }} @enderror @@ -34,7 +34,7 @@ @error('password') - + {{ $message }} @enderror diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php index fbac15a..d0bdac4 100644 --- a/resources/views/auth/register.blade.php +++ b/resources/views/auth/register.blade.php @@ -18,7 +18,7 @@
@error('firstname') - + {{ $message }} @enderror @@ -28,7 +28,7 @@
@error('lastname') - + {{ $message }} @enderror @@ -38,7 +38,7 @@
@error('birthdate') - + {{ $message }} @enderror @@ -54,7 +54,7 @@
@error('email') - + {{ $message }} @enderror @@ -65,7 +65,7 @@
@error('email-confirm') - + {{ $message }} @enderror @@ -76,7 +76,7 @@
@error('password') - + {{ $message }} @enderror @@ -98,7 +98,7 @@
@error('address') - + {{ $message }} @enderror @@ -109,7 +109,7 @@
@error('address2') - + {{ $message }} @enderror @@ -120,7 +120,7 @@
@error('phone') - + {{ $message }} @enderror @@ -131,7 +131,7 @@
@error('postcode') - + {{ $message }} @enderror @@ -142,7 +142,7 @@
@error('city') - + {{ $message }} @enderror @@ -154,7 +154,7 @@ @error('rules') - + {{ $message }} @enderror diff --git a/resources/views/participation.blade.php b/resources/views/participation.blade.php index df03eb6..2717519 100644 --- a/resources/views/participation.blade.php +++ b/resources/views/participation.blade.php @@ -36,7 +36,7 @@ {{ __('Votre code produit') }} @if($errors->has('ean')) -