redirect intend

This commit is contained in:
HolgerHatGarKeineNode
2023-02-02 15:18:31 +01:00
parent cf55ff1752
commit 449c2af0c8
4 changed files with 13 additions and 21 deletions

View File

@@ -52,6 +52,11 @@ class Meetups extends Component
} }
} }
public function next()
{
return redirect()->intended();
}
public function updatedSearch($value) public function updatedSearch($value)
{ {
$this->meetups = Meetup::query() $this->meetups = Meetup::query()

View File

@@ -22,7 +22,7 @@ class NeedMeetupMiddleware
if ($request->user()) { if ($request->user()) {
$request->user()->load('meetups'); $request->user()->load('meetups');
if ($request->user()->meetups->count() < 1) { if ($request->user()->meetups->count() < 1) {
return redirect()->route('profile.meetups')->with('redirectToThis', $request->route()?->getName()); return redirect()->setIntendedUrl($request->url())->route('profile.meetups');
} }
} }

View File

@@ -26,7 +26,7 @@
<div class="px-10 pt-6 mx-auto max-w-7xl"> <div class="px-10 pt-6 mx-auto max-w-7xl">
<div class="w-full mx-auto text-left md:text-center"> <div class="w-full mx-auto text-left md:text-center">
<p class="px-0 mb-6 text-lg text-gray-200 md:text-xl lg:px-24"> <p class="px-0 mb-6 text-lg text-gray-200 md:text-xl lg:px-24">
<x-button href="/" primary lg> <x-button wire:click="next" primary lg>
{{ __('Thanks, continue here') }} {{ __('Thanks, continue here') }}
</x-button> </x-button>
</p> </p>

View File

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