From 42ed0aabfabc2fa6ae741ef2b67f936c598fd05f Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Tue, 8 Sep 2020 08:16:54 -0500 Subject: [PATCH] formatting --- src/Http/Middleware/ShareInertiaData.php | 6 +++--- stubs/inertia/resources/js/Layouts/AppLayout.vue | 2 +- stubs/livewire/resources/views/layouts/app.blade.php | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Http/Middleware/ShareInertiaData.php b/src/Http/Middleware/ShareInertiaData.php index b4a39f1ce..95641087f 100644 --- a/src/Http/Middleware/ShareInertiaData.php +++ b/src/Http/Middleware/ShareInertiaData.php @@ -23,6 +23,9 @@ public function handle($request, $next) Inertia::share(array_filter([ 'jetstream' => function () use ($request) { return [ + 'canCreateTeams' => $request->user() && + Jetstream::hasTeamFeatures() && + Gate::forUser($request->user())->authorize('create', Jetstream::newTeamModel()), 'canManageTwoFactorAuthentication' => Features::canManageTwoFactorAuthentication(), 'flash' => $request->session()->get('flash', []), 'hasApiFeatures' => Jetstream::hasApiFeatures(), @@ -43,9 +46,6 @@ public function handle($request, $next) 'all_teams' => Jetstream::hasTeamFeatures() ? $request->user()->allTeams() : null, ]), [ 'two_factor_enabled' => ! is_null($request->user()->two_factor_secret), - 'can' => [ - 'create_team' => Jetstream::hasTeamFeatures() && Gate::forUser($user)->authorize('create', Jetstream::newTeamModel()), - ], ]); }, 'errorBags' => function () { diff --git a/stubs/inertia/resources/js/Layouts/AppLayout.vue b/stubs/inertia/resources/js/Layouts/AppLayout.vue index 73106e13b..0c5b46415 100644 --- a/stubs/inertia/resources/js/Layouts/AppLayout.vue +++ b/stubs/inertia/resources/js/Layouts/AppLayout.vue @@ -57,7 +57,7 @@ Team Settings - + Create New Team diff --git a/stubs/livewire/resources/views/layouts/app.blade.php b/stubs/livewire/resources/views/layouts/app.blade.php index 88e8c31fc..a4bf7c9fc 100644 --- a/stubs/livewire/resources/views/layouts/app.blade.php +++ b/stubs/livewire/resources/views/layouts/app.blade.php @@ -79,9 +79,9 @@ @can('create', Laravel\Jetstream\Jetstream::newTeamModel()) - - Create New Team - + + Create New Team + @endcan