diff --git a/app/Http/Livewire/Profile/Meetups.php b/app/Http/Livewire/Profile/Meetups.php index 54529219..c7279d12 100644 --- a/app/Http/Livewire/Profile/Meetups.php +++ b/app/Http/Livewire/Profile/Meetups.php @@ -20,6 +20,10 @@ class Meetups extends Component public $hasMeetups = false; + public ?string $fromUrl = ''; + + protected $queryString = ['fromUrl' => ['except' => '']]; + public function rules() { return [ @@ -54,11 +58,14 @@ class Meetups extends Component if (count($this->myMeetups) > 0) { $this->hasMeetups = true; } + if (!$this->fromUrl) { + $this->fromUrl = url()->previous(); + } } public function next() { - return redirect()->intended(); + return redirect($this->fromUrl); } public function updatedSearch($value) diff --git a/resources/lang/de.json b/resources/lang/de.json index f1e495eb..018eed34 100644 --- a/resources/lang/de.json +++ b/resources/lang/de.json @@ -647,7 +647,7 @@ "Telegram-Link": "", "Website": "", "Twitter Username": "", - "Select one or more meetup groups so that you can get access to these groups in the backend.": "Suche dir Meetup-Gruppen aus, um Zugriff auf diese Gruppen im Backend zu erhalten.", + "Select one or more meetup groups so that you can get access to these groups in the backend.": "Suche dir Meetup-Gruppen aus, um Zugriff auf diese Gruppen zu erhalten.", "choice": "Auswahl", "By id": "nach ID", "Twitter": "", diff --git a/resources/views/livewire/frontend/navigation/meetups.blade.php b/resources/views/livewire/frontend/navigation/meetups.blade.php index e22b3cf4..63cbbab1 100644 --- a/resources/views/livewire/frontend/navigation/meetups.blade.php +++ b/resources/views/livewire/frontend/navigation/meetups.blade.php @@ -71,6 +71,12 @@ {{ __('Manage cities/areas') }} + + + {{ __('My meetups') }} + +