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