From 6cb3df93503fa40b2a7d818e527a10530e2b4cc7 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 13 Mar 2024 12:11:37 +0100 Subject: [PATCH] rename boarding to onboarding --- app/Http/Middleware/DecideWhatToDoWithUser.php | 4 ++-- app/Livewire/Boarding/Index.php | 2 +- bootstrap/helpers/subscriptions.php | 2 +- resources/js/components/MagicBar.vue | 4 ++-- resources/views/components/navbar.blade.php | 8 ++++---- resources/views/livewire/dashboard.blade.php | 2 +- routes/web.php | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/Http/Middleware/DecideWhatToDoWithUser.php b/app/Http/Middleware/DecideWhatToDoWithUser.php index a531f2cf3..e5531a6e7 100644 --- a/app/Http/Middleware/DecideWhatToDoWithUser.php +++ b/app/Http/Middleware/DecideWhatToDoWithUser.php @@ -21,7 +21,7 @@ public function handle(Request $request, Closure $next): Response } if (!auth()->user() || !isCloud() || isInstanceAdmin()) { if (!isCloud() && showBoarding() && !in_array($request->path(), allowedPathsForBoardingAccounts())) { - return redirect()->route('boarding'); + return redirect()->route('onboarding'); } return $next($request); } @@ -43,7 +43,7 @@ public function handle(Request $request, Closure $next): Response if (Str::startsWith($request->path(), 'invitations')) { return $next($request); } - return redirect()->route('boarding'); + return redirect()->route('onboarding'); } if (auth()->user()->hasVerifiedEmail() && $request->path() === 'verify') { return redirect(RouteServiceProvider::HOME); diff --git a/app/Livewire/Boarding/Index.php b/app/Livewire/Boarding/Index.php index 52440dde7..c77aa54ec 100644 --- a/app/Livewire/Boarding/Index.php +++ b/app/Livewire/Boarding/Index.php @@ -73,7 +73,7 @@ public function explanation() public function restartBoarding() { - return redirect()->route('boarding'); + return redirect()->route('onboarding'); } public function skipBoarding() { diff --git a/bootstrap/helpers/subscriptions.php b/bootstrap/helpers/subscriptions.php index a26bed75b..928bbbcaf 100644 --- a/bootstrap/helpers/subscriptions.php +++ b/bootstrap/helpers/subscriptions.php @@ -135,7 +135,7 @@ function allowedPathsForBoardingAccounts() { return [ ...allowedPathsForUnsubscribedAccounts(), - 'boarding', + 'onboarding', 'livewire/update' ]; } diff --git a/resources/js/components/MagicBar.vue b/resources/js/components/MagicBar.vue index 5f11d8afd..386a267b1 100644 --- a/resources/js/components/MagicBar.vue +++ b/resources/js/components/MagicBar.vue @@ -419,7 +419,7 @@ const magicActions = [{ }, { id: 24, - name: 'Goto: Boarding process', + name: 'Goto: Onboarding process', icon: 'goto', sequence: ['main', 'redirect'] }, @@ -667,7 +667,7 @@ async function redirect() { targetUrl.pathname = `/team` break; case 24: - targetUrl.pathname = `/boarding` + targetUrl.pathname = `/onboarding` break; case 25: targetUrl.pathname = `/security/api-tokens` diff --git a/resources/views/components/navbar.blade.php b/resources/views/components/navbar.blade.php index 65d2f0736..4ba890c31 100644 --- a/resources/views/components/navbar.blade.php +++ b/resources/views/components/navbar.blade.php @@ -177,14 +177,14 @@ class="{{ request()->is('settings*') ? 'text-warning icon' : 'icon' }}" @endif -
  • - - + + - Boarding + Onboarding
  • diff --git a/resources/views/livewire/dashboard.blade.php b/resources/views/livewire/dashboard.blade.php index e8ba873ea..d450aa62e 100644 --- a/resources/views/livewire/dashboard.blade.php +++ b/resources/views/livewire/dashboard.blade.php @@ -17,7 +17,7 @@ @endif @if ($projects->count() === 0 && $servers->count() === 0) No resources found. Add your first server & private key here or go to the boarding page. + href="{{ route('server.create') }}">here or go to the onboarding page. @endif @if ($projects->count() > 0)

    Projects

    diff --git a/routes/web.php b/routes/web.php index 0e9d3c478..fcf3d7824 100644 --- a/routes/web.php +++ b/routes/web.php @@ -108,7 +108,7 @@ }); Route::get('/', Dashboard::class)->name('dashboard'); - Route::get('/boarding', BoardingIndex::class)->name('boarding'); + Route::get('/onboarding', BoardingIndex::class)->name('onboarding'); Route::get('/subscription', SubscriptionShow::class)->name('subscription.show'); Route::get('/subscription/new', SubscriptionIndex::class)->name('subscription.index');