diff --git a/app/Http/Livewire/Profile/Meetups.php b/app/Http/Livewire/Profile/Meetups.php index 4e7fa557..8f1ed100 100644 --- a/app/Http/Livewire/Profile/Meetups.php +++ b/app/Http/Livewire/Profile/Meetups.php @@ -52,6 +52,11 @@ class Meetups extends Component } } + public function next() + { + return redirect()->intended(); + } + public function updatedSearch($value) { $this->meetups = Meetup::query() diff --git a/app/Http/Middleware/NeedMeetupMiddleware.php b/app/Http/Middleware/NeedMeetupMiddleware.php index c3510283..5cbbc0ed 100644 --- a/app/Http/Middleware/NeedMeetupMiddleware.php +++ b/app/Http/Middleware/NeedMeetupMiddleware.php @@ -22,7 +22,7 @@ class NeedMeetupMiddleware if ($request->user()) { $request->user()->load('meetups'); if ($request->user()->meetups->count() < 1) { - return redirect()->route('profile.meetups')->with('redirectToThis', $request->route()?->getName()); + return redirect()->setIntendedUrl($request->url())->route('profile.meetups'); } } diff --git a/resources/views/livewire/profile/meetups.blade.php b/resources/views/livewire/profile/meetups.blade.php index 1c05d987..c394f0e8 100644 --- a/resources/views/livewire/profile/meetups.blade.php +++ b/resources/views/livewire/profile/meetups.blade.php @@ -26,7 +26,7 @@

- + {{ __('Thanks, continue here') }}

diff --git a/routes/web.php b/routes/web.php index 9027fe63..7221e2de 100644 --- a/routes/web.php +++ b/routes/web.php @@ -3,9 +3,7 @@ use Illuminate\Support\Facades\Route; use Laravel\Socialite\Facades\Socialite; -Route::middleware([ - 'needMeetup', -]) +Route::middleware([]) ->get('/', \App\Http\Livewire\Frontend\Welcome::class) ->name('welcome'); @@ -65,9 +63,7 @@ Route::get('/auth/twitter/callback', function () { /* * School * */ -Route::middleware([ - 'needMeetup', -]) +Route::middleware([]) ->as('school.') ->prefix('/{country:code}/school') ->group(function () { @@ -93,9 +89,7 @@ Route::middleware([ /* * Library * */ -Route::middleware([ - 'needMeetup', -]) +Route::middleware([]) ->as('library.') ->prefix('/{country:code}/library') ->group(function () { @@ -109,9 +103,7 @@ Route::middleware([ /* * Books * */ -Route::middleware([ - 'needMeetup', -]) +Route::middleware([]) ->as('bookCases.') ->prefix('/{country:code}/book-cases') ->group(function () { @@ -131,9 +123,7 @@ Route::middleware([ /* * Events * */ -Route::middleware([ - 'needMeetup', -]) +Route::middleware([]) ->as('bitcoinEvent.') ->prefix('/{country:code}/event') ->group(function () { @@ -147,9 +137,7 @@ Route::middleware([ /* * Meetups * */ -Route::middleware([ - 'needMeetup', -]) +Route::middleware([]) ->as('meetup.') ->prefix('/{country:code}/meetup') ->group(function () { @@ -172,7 +160,6 @@ Route::middleware([ 'auth:sanctum', config('jetstream.auth_session'), 'verified', - 'needMeetup', ]) ->group(function () { /*