From c0e3d2e6773ce725a5a0c94449575815da6fb9ae Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 23 Jun 2022 18:47:44 +1000 Subject: [PATCH] add signup checks to flutter routes --- app/Http/Controllers/BaseController.php | 23 +++++++++++++++++------ app/Jobs/Mail/NinjaMailerJob.php | 8 ++++++++ resources/views/index/index.blade.php | 2 +- 3 files changed, 26 insertions(+), 7 deletions(-) diff --git a/app/Http/Controllers/BaseController.php b/app/Http/Controllers/BaseController.php index 9332df3876f6..a61698bc24d2 100644 --- a/app/Http/Controllers/BaseController.php +++ b/app/Http/Controllers/BaseController.php @@ -778,8 +778,13 @@ class BaseController extends Controller } /* Clean up URLs and remove query parameters from the URL*/ - if(request()->has('login') && request()->input('login') == 'true') - return redirect('/')->with(['login' => "true"]); + if (request()->has('login') && request()->input('login') == 'true') { + return redirect('/')->with(['login' => 'true']); + } + + if (request()->has('signup') && request()->input('signup') == 'true') { + return redirect('/')->with(['signup' => 'true']); + } $data = []; @@ -789,10 +794,16 @@ class BaseController extends Controller //pass referral code to front end $data['rc'] = request()->has('rc') ? request()->input('rc') : ''; $data['build'] = request()->has('build') ? request()->input('build') : ''; - $data['login'] = request()->has('login') ? request()->input('login') : "false"; - - if(request()->session()->has('login')) - $data['login'] = "true"; + $data['login'] = request()->has('login') ? request()->input('login') : 'false'; + $data['signup'] = request()->has('signup') ? request()->input('signup') : 'false'; + + if (request()->session()->has('login')) { + $data['login'] = 'true'; + } + + if(request()->session()->has('signup')){ + $data['signup'] = 'true'; + } $data['user_agent'] = request()->server('HTTP_USER_AGENT'); diff --git a/app/Jobs/Mail/NinjaMailerJob.php b/app/Jobs/Mail/NinjaMailerJob.php index 4f94b0fd9ed9..80d1837da553 100644 --- a/app/Jobs/Mail/NinjaMailerJob.php +++ b/app/Jobs/Mail/NinjaMailerJob.php @@ -378,4 +378,12 @@ class NinjaMailerJob implements ShouldQueue } + /** + * Is this the cleanest way to requeue a job? + * + * $this->delete(); + * + * $job = NinjaMailerJob::dispatch($this->nmo, $this->override)->delay(3600); + */ + } \ No newline at end of file diff --git a/resources/views/index/index.blade.php b/resources/views/index/index.blade.php index 380cc083b89b..a7596262599f 100644 --- a/resources/views/index/index.blade.php +++ b/resources/views/index/index.blade.php @@ -1,5 +1,5 @@ - +