forge-joniko/ldc-tousenselle
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix feed back and email verify on private navigation

Browse source
This commit is contained in:
Jérémy Munsch 2021-07-06 10:41:13 +02:00
parent fd674b06ca
commit 814a6c00e9
8 changed files with 39 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/Http/Middleware/Authenticate.php
View file

@ -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');
}

9
resources/views/auth/login.blade.php
View file

@ -8,6 +8,11 @@
<div class="container">
<form method="POST" action="{{ route('login') }}">
@csrf
@if(request()->logFirst)
<div class="row text-center text-danger">
<h3>{{ __('Veuillez vous connecter pour vérifier votre email.') }}</h3>
</div>
@endif
<div class="row justify-content-center text-center">
<div class="col-12 col-md-6">
<h2 class="formTitle">{{ __('S\'Inscrire') }}</h2>
@ -23,7 +28,7 @@
<div class="col-md-6">
<input id="email" type="email" class="form-control @error('email') is-invalid @enderror" name="email" value="{{ old('email') }}" required autocomplete="email" autofocus>
@error('email')
<span class="invalid-feedback" role="alert">
<span class="invalid-feedback d-block" role="alert">
<strong>{{ $message }}</strong>
</span>
@enderror
@ -37,7 +42,7 @@
<input id="password" type="password" class="form-control @error('password') is-invalid @enderror" name="password" required autocomplete="current-password">
@error('password')
<span class="invalid-feedback" role="alert">
<span class="invalid-feedback d-block" role="alert">
<strong>{{ $message }}</strong>
</span>
@enderror

2
resources/views/auth/passwords/confirm.blade.php
View file

@ -20,7 +20,7 @@
<input id="password" type="password" class="form-control @error('password') is-invalid @enderror" name="password" required autocomplete="current-password">
@error('password')
<span class="invalid-feedback" role="alert">
<span class="invalid-feedback d-block" role="alert">
<strong>{{ $message }}</strong>
</span>
@enderror

2
resources/views/auth/passwords/email.blade.php
View file

@ -24,7 +24,7 @@
<input id="email" type="email" class="form-control @error('email') is-invalid @enderror" name="email" value="{{ old('email') }}" required autocomplete="email" autofocus>
@error('email')
<span class="invalid-feedback" role="alert">
<span class="invalid-feedback d-block" role="alert">
<strong>{{ $message }}</strong>
</span>
@enderror

4
resources/views/auth/passwords/reset.blade.php
View file

@ -20,7 +20,7 @@
<input id="email" type="email" class="form-control @error('email') is-invalid @enderror" name="email" value="{{ $email ?? old('email') }}" required autocomplete="email" autofocus>
@error('email')
<span class="invalid-feedback" role="alert">
<span class="invalid-feedback d-block" role="alert">
<strong>{{ $message }}</strong>
</span>
@enderror
@ -34,7 +34,7 @@
<input id="password" type="password" class="form-control @error('password') is-invalid @enderror" name="password" required autocomplete="new-password">
@error('password')
<span class="invalid-feedback" role="alert">
<span class="invalid-feedback d-block" role="alert">
<strong>{{ $message }}</strong>
</span>
@enderror

24
resources/views/auth/register.blade.php
View file

@ -18,7 +18,7 @@
<div class="col-md-6">
<input type="text" class="form-control @error('firstname') is-invalid @enderror" name="firstname" placeholder="{{ __('Prénom*') }}" value="{{ old('firstname') }}" required autocomplete="firstname" autofocus>
@error('firstname')
<span class="invalid-feedback" role="alert">
<span class="invalid-feedback d-block" role="alert">
<strong>{{ $message }}</strong>
</span>
@enderror
@ -28,7 +28,7 @@
<div class="col-md-6">
<input type="text" class="form-control @error('lastname') is-invalid @enderror" name="lastname" placeholder="{{ __('Nom*') }}" value="{{ old('lastname') }}" required autocomplete="lastname" autofocus>
@error('lastname')
<span class="invalid-feedback" role="alert">
<span class="invalid-feedback d-block" role="alert">
<strong>{{ $message }}</strong>
</span>
@enderror
@ -38,7 +38,7 @@
<div class="col-md-6">
<input type="date" class="form-control @error('birthdate') is-invalid @enderror" name="birthdate" placeholder="{{ __('Date de naissance*') }}" value="{{ old('birthdate') }}" required autocomplete="birthdate" placeholder="1990-12-31" autofocus>
@error('birthdate')
<span class="invalid-feedback" role="alert">
<span class="invalid-feedback d-block" role="alert">
<strong>{{ $message }}</strong>
</span>
@enderror
@ -54,7 +54,7 @@
<div class="col-md-6">
<input type="email" class="form-control @error('email') is-invalid @enderror" name="email" placeholder="{{ __('E-mail*') }}" value="{{ old('email') }}" required autocomplete="email">
@error('email')
<span class="invalid-feedback" role="alert">
<span class="invalid-feedback d-block" role="alert">
<strong>{{ $message }}</strong>
</span>
@enderror
@ -65,7 +65,7 @@
<div class="col-md-6">
<input type="email" class="form-control @error('email') is-invalid @enderror" name="email-confirm" placeholder="{{ __('Confirmation E-mail*') }}" required autocomplete="email">
@error('email-confirm')
<span class="invalid-feedback" role="alert">
<span class="invalid-feedback d-block" role="alert">
<strong>{{ $message }}</strong>
</span>
@enderror
@ -76,7 +76,7 @@
<div class="col-md-6">
<input type="password" class="form-control @error('password') is-invalid @enderror" name="password" placeholder="{{ __('Mot de passe*') }}" required autocomplete="new-password">
@error('password')
<span class="invalid-feedback" role="alert">
<span class="invalid-feedback d-block" role="alert">
<strong>{{ $message }}</strong>
</span>
@enderror
@ -98,7 +98,7 @@
<div class="col-md-6">
<input type="text" class="form-control @error('address') is-invalid @enderror" name="address" placeholder="{{ __('Addresse*') }}" value="{{ old('address') }}" required autocomplete="address" autofocus>
@error('address')
<span class="invalid-feedback" role="alert">
<span class="invalid-feedback d-block" role="alert">
<strong>{{ $message }}</strong>
</span>
@enderror
@ -109,7 +109,7 @@
<div class="col-md-6">
<input type="text" class="form-control @error('address2') is-invalid @enderror" name="address2" placeholder="{{ __('Addresse complément') }}" value="{{ old('address2') }}" autocomplete="address2" autofocus>
@error('address2')
<span class="invalid-feedback" role="alert">
<span class="invalid-feedback d-block" role="alert">
<strong>{{ $message }}</strong>
</span>
@enderror
@ -120,7 +120,7 @@
<div class="col-md-6">
<input type="text" class="form-control @error('phone') is-invalid @enderror" name="phone" placeholder="{{ __('Téléphone*') }}" value="{{ old('phone') }}" required autocomplete="phone" autofocus>
@error('phone')
<span class="invalid-feedback" role="alert">
<span class="invalid-feedback d-block" role="alert">
<strong>{{ $message }}</strong>
</span>
@enderror
@ -131,7 +131,7 @@
<div class="col-md-6">
<input type="number" class="form-control @error('postcode') is-invalid @enderror" name="postcode" placeholder="{{ __('Code postal*') }}" value="{{ old('postcode') }}" required autocomplete="postcode" autofocus>
@error('postcode')
<span class="invalid-feedback" role="alert">
<span class="invalid-feedback d-block" role="alert">
<strong>{{ $message }}</strong>
</span>
@enderror
@ -142,7 +142,7 @@
<div class="col-md-6">
<input type="text" class="form-control @error('city') is-invalid @enderror" name="city" placeholder="{{ __('Ville*') }}" value="{{ old('city') }}" required autocomplete="city" autofocus>
@error('city')
<span class="invalid-feedback" role="alert">
<span class="invalid-feedback d-block" role="alert">
<strong>{{ $message }}</strong>
</span>
@enderror
@ -154,7 +154,7 @@
<input id="rules" type="checkbox" class="@error('rules') is-invalid @enderror form-check-input" name="rules" value="1" required>
<label for="rules" class="form-check-label w-100 d-block text-start user-select-none">j'ai lu et j'accepte <a href="{{ route('rules') }}"><span class="font-weight-bold text-primary">le règlement *</span></a></label>
@error('rules')
<span class="invalid-feedback" role="alert">
<span class="invalid-feedback d-block" role="alert">
<strong>{{ $message }}</strong>
</span>
@enderror

6
resources/views/participation.blade.php
View file

@ -36,7 +36,7 @@
<input type="number" name="ean" id="ean" class="form-control @error('ean') is-invalid @enderror" max="9999999999999" maxlength="13" value="{{ old('ean') }}">
<small>{{ __('Votre code produit') }}</small>
@if($errors->has('ean'))
<div class="error invalid-feedback" role="alert">
<div class="error invalid-feedback d-block" role="alert">
{{ implode($errors->get('ean')) }}
</div>
@endif
@ -48,7 +48,7 @@
<label for="buydate" class="participationlabel">{{ __('Date d\'achat') }}*</label>
<input type="date" name="buydate" id="buydate" class="form-control @error('buydate') is-invalid @enderror" placeholder="1990-12-31" required autofocus>
@if($errors->has('buydate'))
<div class="error invalid-feedback" role="alert">
<div class="error invalid-feedback d-block" role="alert">
{{ implode($errors->get('buydate')) }}
</div>
@endif
@ -68,7 +68,7 @@
</select>
</div>
@if($errors->has('magasin'))
<div class="error invalid-feedback" role="alert">
<div class="error invalid-feedback d-block" role="alert">
{{ implode($errors->get('magasin')) }}
</div>
@endif

20
resources/views/winner.blade.php
View file

@ -39,7 +39,7 @@
</select>
</div>
@if($errors->has('magasin'))
<div class="error invalid-feedback" role="alert">
<div class="error invalid-feedback d-block" role="alert">
{{ implode($errors->get('magasin')) }}
</div>
@endif
@ -85,7 +85,7 @@
<div class="col-md-6">
<input id="lastname" type="text" class="form-control @error('lastname') is-invalid @enderror" name="lastname" value="{{ old('lastname') ?? $user->lastname }}" required autocomplete="lastname" autofocus>
@error('lastname')
<span class="invalid-feedback" role="alert">
<span class="invalid-feedback d-block" role="alert">
<strong>{{ $message }}</strong>
</span>
@enderror
@ -97,7 +97,7 @@
<div class="col-md-6">
<input id="firstname" type="text" class="form-control @error('firstname') is-invalid @enderror" name="firstname" value="{{ old('firstname') ?? $user->firstname }}" required autocomplete="firstname" autofocus>
@error('firstname')
<span class="invalid-feedback" role="alert">
<span class="invalid-feedback d-block" role="alert">
<strong>{{ $message }}</strong>
</span>
@enderror
@ -109,7 +109,7 @@
<div class="col-md-6">
<input id="address" type="text" class="form-control @error('address') is-invalid @enderror" name="address" value="{{ old('address') ?? $user->address }}" required autocomplete="address" autofocus>
@error('address')
<span class="invalid-feedback" role="alert">
<span class="invalid-feedback d-block" role="alert">
<strong>{{ $message }}</strong>
</span>
@enderror
@ -121,7 +121,7 @@
<div class="col-md-6">
<input id="address2" type="text" class="form-control @error('address2') is-invalid @enderror" name="address2" value="{{ old('address2') ?? $user->address2 }}" autocomplete="address2" autofocus>
@error('address2')
<span class="invalid-feedback" role="alert">
<span class="invalid-feedback d-block" role="alert">
<strong>{{ $message }}</strong>
</span>
@enderror
@ -133,7 +133,7 @@
<div class="col-md-6">
<input id="postcode" type="number" class="form-control @error('postcode') is-invalid @enderror" name="postcode" value="{{ old('postcode') ?? $user->postcode }}" required autocomplete="postcode" autofocus>
@error('postcode')
<span class="invalid-feedback" role="alert">
<span class="invalid-feedback d-block" role="alert">
<strong>{{ $message }}</strong>
</span>
@enderror
@ -145,7 +145,7 @@
<div class="col-md-6">
<input id="city" type="text" class="form-control @error('city') is-invalid @enderror" name="city" value="{{ old('city') ?? $user->city }}" required autocomplete="city" autofocus>
@error('city')
<span class="invalid-feedback" role="alert">
<span class="invalid-feedback d-block" role="alert">
<strong>{{ $message }}</strong>
</span>
@enderror
@ -157,7 +157,7 @@
<div class="col-md-6">
<input id="country" type="text" class="form-control @error('country') is-invalid @enderror" name="country" value="{{ old('country') }}" required autocomplete="county" autofocus>
@error('country')
<span class="invalid-feedback" role="alert">
<span class="invalid-feedback d-block" role="alert">
<strong>{{ $message }}</strong>
</span>
@enderror
@ -169,7 +169,7 @@
<div class="col-md-6">
<input id="phone" type="text" class="form-control @error('phone') is-invalid @enderror" name="phone" value="{{ old('phone') ?? $user->phone }}" required autocomplete="phone" autofocus>
@error('phone')
<span class="invalid-feedback" role="alert">
<span class="invalid-feedback d-block" role="alert">
<strong>{{ $message }}</strong>
</span>
@enderror
@ -184,7 +184,7 @@
<div class="col-md-6">
<input id="file" type="file" class="form-control @error('file') is-invalid @enderror" name="file" value="{{ old('file') }}" required accept=".png,.jpg,.pdf">
@error('file')
<span class="invalid-feedback" role="alert">
<span class="invalid-feedback d-block" role="alert">
<strong>{{ $message }}</strong>
</span>
@enderror