diff --git a/app/Http/Middleware/DecideWhatToDoWithUser.php b/app/Http/Middleware/DecideWhatToDoWithUser.php index 70bb9dd6c..3fb9dfea7 100644 --- a/app/Http/Middleware/DecideWhatToDoWithUser.php +++ b/app/Http/Middleware/DecideWhatToDoWithUser.php @@ -12,6 +12,9 @@ class DecideWhatToDoWithUser public function handle(Request $request, Closure $next): Response { if (!auth()->user() || !isCloud() || isInstanceAdmin()) { + if (!isCloud() && showBoarding() && !in_array($request->path(), allowedPathsForBoardingAccounts())) { + return redirect('boarding'); + } return $next($request); } if (!auth()->user()->hasVerifiedEmail()) { diff --git a/app/Models/User.php b/app/Models/User.php index 970120079..c4275cd68 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -72,7 +72,7 @@ public function sendVerificationEmail() $mail->view('emails.email-verification', [ 'url' => $url, ]); - $mail->subject('Coolify Cloud: Verify your email.'); + $mail->subject('Coolify: Verify your email.'); send_user_an_email($mail, $this->email); } public function sendPasswordResetNotification($token): void diff --git a/resources/views/livewire/dashboard.blade.php b/resources/views/livewire/dashboard.blade.php index 71b400e63..1cfec37be 100644 --- a/resources/views/livewire/dashboard.blade.php +++ b/resources/views/livewire/dashboard.blade.php @@ -14,9 +14,12 @@ Your subscription has been activated! Welcome onboard! @endif - -

Projects

- + @if ($projects->count() === 0 && $servers->count() === 0) + No resources found. Add your first server / private key here. + @endif + @if ($projects->count() > 0) +

Projects

+ @endif @if ($projects->count() === 1)
@else @@ -58,7 +61,9 @@
@endforeach -

Servers

+@if ($projects->count() > 0) +

Servers

+@endif @if ($servers->count() === 1)
@else diff --git a/routes/web.php b/routes/web.php index 1a9d5851c..54dc7582b 100644 --- a/routes/web.php +++ b/routes/web.php @@ -73,6 +73,7 @@ Route::get('/email/verify/{id}/{hash}', function (EmailVerificationRequest $request) { $request->fulfill(); + send_internal_notification("User {$request->user()->name} verified their email address."); return redirect('/'); })->middleware(['auth'])->name('verify.verify');