diff --git a/app/Http/Controllers/Club/GoldenCrushController.php b/app/Http/Controllers/Club/GoldenCrushController.php index 2a44294c..f8295705 100644 --- a/app/Http/Controllers/Club/GoldenCrushController.php +++ b/app/Http/Controllers/Club/GoldenCrushController.php @@ -3,8 +3,7 @@ namespace App\Http\Controllers\Club; use App\Http\Controllers\Controller; -use Illuminate\Contracts\View\View; -use Illuminate\Http\Request; + class GoldenCrushController extends Controller { diff --git a/app/Http/Middleware/RedirectToGoldenIfVoteOpen.php b/app/Http/Middleware/RedirectToGoldenIfVoteOpen.php index ebd6f681..52efdcbc 100644 --- a/app/Http/Middleware/RedirectToGoldenIfVoteOpen.php +++ b/app/Http/Middleware/RedirectToGoldenIfVoteOpen.php @@ -11,17 +11,22 @@ class RedirectToGoldenIfVoteOpen { public function handle(Request $request, Closure $next): Response { - if ($request->routeIs('club.golden-crush')) { - return $next($request); + $startAt = config('vote.start_at'); + $endAt = config('vote.end_at'); + + if (! $startAt || ! $endAt) { + abort(404); } - if (auth('club')->check()) { - $startAt = Carbon::parse(config('vote.start_at')); - $endAt = Carbon::parse(config('vote.end_at')); + $isOpen = now()->between( + Carbon::parse($startAt), + Carbon::parse($endAt) + ); - if (now()->between($startAt, $endAt)) { - return redirect()->route('club.golden-crush'); - } + if (! $isOpen) { + return redirect() + ->route('club.home') + ->with('error', 'La période d’accès à cette page est terminée ou non commencée.'); } return $next($request); diff --git a/resources/views/components/fo/page-golden-crush/concept.blade.php b/resources/views/components/fo/page-golden-crush/concept.blade.php index 07522fa2..bfc4e832 100644 --- a/resources/views/components/fo/page-golden-crush/concept.blade.php +++ b/resources/views/components/fo/page-golden-crush/concept.blade.php @@ -35,7 +35,7 @@
- + JE PARTICIPE diff --git a/resources/views/components/fo/page-golden-crush/hero.blade.php b/resources/views/components/fo/page-golden-crush/hero.blade.php index 13925d5c..7c79f1ac 100644 --- a/resources/views/components/fo/page-golden-crush/hero.blade.php +++ b/resources/views/components/fo/page-golden-crush/hero.blade.php @@ -44,7 +44,7 @@ {{-- Boutton --}}
- + JE PARTICIPE
diff --git a/routes/web-club.php b/routes/web-club.php index 183fbcb9..9a38bd15 100644 --- a/routes/web-club.php +++ b/routes/web-club.php @@ -43,9 +43,7 @@ Route::name('club.')->prefix('club')->group(function () { } // * STATIC PAGES - Route::get('/', [HomeController::class, 'index']) - ->middleware(['vote.redirect']) - ->name('home.show'); + Route::get('/', [HomeController::class, 'index'])->name('home.show'); Route::middleware(['auth:club', EnsureEmailIsVerified::class])->group(function () { Route::get('mon-compte', [CustomerController::class, 'index'])->name('customers.index'); @@ -135,7 +133,9 @@ Route::name('club.')->prefix('club')->group(function () { Route::post('reductions/print', [DiscountController::class, 'fetchBrPdf'])->name('discounts.print'); // * GOLDEN CRUSH - Route::get('/golden-crush', [GoldenCrushController::class, 'index'])->name('golden-crush'); + Route::get('/golden-crush', [GoldenCrushController::class, 'index']) + ->middleware(['vote.redirect']) + ->name('golden-crush'); }); }); });