Skip to content

Commit 7035d5f

Browse files
committed
remove jetstream inertia properties; remove unused ApiTokenManager;
1 parent f32ec59 commit 7035d5f

10 files changed

Lines changed: 9 additions & 377 deletions

File tree

app/Http/Middleware/ShareInertiaData.php

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,10 @@
99
use App\Service\PermissionStore;
1010
use Closure;
1111
use Illuminate\Http\Request;
12-
use Illuminate\Support\Facades\Gate;
1312
use Illuminate\Support\Facades\Session;
1413
use Illuminate\Support\MessageBag;
1514
use Inertia\Inertia;
1615
use Laravel\Fortify\Features;
17-
use Laravel\Jetstream\Jetstream;
1816
use Symfony\Component\HttpFoundation\Response;
1917

2018
class ShareInertiaData
@@ -27,25 +25,6 @@ public function handle(Request $request, Closure $next): Response
2725
/** @var PermissionStore $permissions */
2826
$permissions = app(PermissionStore::class);
2927
Inertia::share([
30-
'jetstream' => function () use ($request) {
31-
/** @var User|null $user */
32-
$user = $request->user();
33-
34-
return [
35-
'canCreateTeams' => $user !== null &&
36-
Jetstream::userHasTeamFeatures($user) &&
37-
Gate::forUser($user)->check('create', Jetstream::newTeamModel()),
38-
'canManageTwoFactorAuthentication' => Features::canManageTwoFactorAuthentication(),
39-
'canUpdatePassword' => Features::enabled(Features::updatePasswords()),
40-
'canUpdateProfileInformation' => Features::canUpdateProfileInformation(),
41-
'hasEmailVerification' => Features::enabled(Features::emailVerification()),
42-
'hasAccountDeletionFeatures' => Jetstream::hasAccountDeletionFeatures(),
43-
'hasApiFeatures' => Jetstream::hasApiFeatures(),
44-
'hasTeamFeatures' => Jetstream::hasTeamFeatures(),
45-
'hasTermsAndPrivacyPolicyFeature' => Jetstream::hasTermsAndPrivacyPolicyFeature(),
46-
'managesProfilePhotos' => Jetstream::managesProfilePhotos(),
47-
];
48-
},
4928
'auth' => [
5029
'permissions' => $request->user() !== null && $request->user()->currentTeam !== null ? $permissions->getPermissions($request->user()->currentTeam) : [],
5130
'user' => function () use ($request): array {

resources/js/Components/OrganizationSwitcher.vue

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,6 @@ import {
2020
} from '@/packages/ui/src';
2121
2222
const page = usePage<{
23-
jetstream: {
24-
canCreateTeams: boolean;
25-
hasTeamFeatures: boolean;
26-
managesProfilePhotos: boolean;
27-
hasApiFeatures: boolean;
28-
};
2923
auth: {
3024
user: User & {
3125
all_teams: Organization[];
@@ -39,7 +33,7 @@ const switchToTeam = (organization: Organization) => {
3933
</script>
4034

4135
<template>
42-
<DropdownMenu v-if="page.props.jetstream.hasTeamFeatures">
36+
<DropdownMenu>
4337
<DropdownMenuTrigger
4438
class="flex w-full text-left hover:bg-white/10 focus-visible:ring-2 focus-visible:ring-ring cursor-pointer transition pl-2 py-1 rounded w-full items-center justify-between"
4539
as-child>
@@ -78,7 +72,7 @@ const switchToTeam = (organization: Organization) => {
7872
<Link href="/billing" class="inline-flex items-center w-full"> Billing </Link>
7973
</DropdownMenuItem>
8074

81-
<DropdownMenuItem v-if="page.props.jetstream.canCreateTeams" as-child>
75+
<DropdownMenuItem as-child>
8276
<Link
8377
:href="route('teams.create')"
8478
class="inline-flex items-center gap-2.5 w-full">

resources/js/Components/UserSettingsIcon.vue

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import {
1010
} from '@/packages/ui/src';
1111
import {
1212
UserCircleIcon,
13-
KeyIcon,
1413
ArrowLeftOnRectangleIcon,
1514
ChatBubbleLeftRightIcon,
1615
} from '@heroicons/vue/24/solid';
@@ -19,12 +18,6 @@ import { openFeedback } from '@/utils/feedback';
1918
const page = usePage<{
2019
has_services_extension?: boolean;
2120
has_billing_extension?: boolean;
22-
jetstream: {
23-
canCreateTeams: boolean;
24-
hasTeamFeatures: boolean;
25-
managesProfilePhotos: boolean;
26-
hasApiFeatures: boolean;
27-
};
2821
auth: {
2922
user: User & {
3023
all_teams: Organization[];
@@ -61,15 +54,6 @@ const logout = () => {
6154
</Link>
6255
</DropdownMenuItem>
6356

64-
<DropdownMenuItem v-if="page.props.jetstream.hasApiFeatures" as-child>
65-
<Link
66-
:href="route('api-tokens.index')"
67-
class="inline-flex items-center gap-2.5 w-full">
68-
<KeyIcon class="w-5 h-5 text-icon-default" />
69-
<span>API Tokens</span>
70-
</Link>
71-
</DropdownMenuItem>
72-
7357
<DropdownMenuItem v-if="page.props.has_services_extension" as-child>
7458
<button
7559
type="button"

resources/js/Pages/API/Index.vue

Lines changed: 0 additions & 28 deletions
This file was deleted.

resources/js/Pages/API/Partials/ApiTokenManager.vue

Lines changed: 0 additions & 263 deletions
This file was deleted.

0 commit comments

Comments
 (0)