Skip to content

Commit fcb7514

Browse files
committed
Fix various TS issues
Fixes various issues that would prevent typescript from compiling when vue-tsc is being used.
1 parent 4fc4bc2 commit fcb7514

File tree

8 files changed

+15
-15
lines changed

8 files changed

+15
-15
lines changed

resources/js/components/AppHeader.vue

+2-2
Original file line numberDiff line numberDiff line change
@@ -169,15 +169,15 @@ const rightNavItems: NavItem[] = [
169169
class="relative size-10 w-auto rounded-full p-1 focus-within:ring-2 focus-within:ring-primary"
170170
>
171171
<Avatar class="size-8 overflow-hidden rounded-full">
172-
<AvatarImage v-if="auth.user.avatar" :src="auth.user.avatar" :alt="auth.user.name" />
172+
<AvatarImage v-if="auth.user?.avatar" :src="auth.user.avatar" :alt="auth.user.name" />
173173
<AvatarFallback class="rounded-lg bg-neutral-200 font-semibold text-black dark:bg-neutral-700 dark:text-white">
174174
{{ getInitials(auth.user?.name) }}
175175
</AvatarFallback>
176176
</Avatar>
177177
</Button>
178178
</DropdownMenuTrigger>
179179
<DropdownMenuContent align="end" class="w-56">
180-
<UserMenuContent :user="auth.user" />
180+
<UserMenuContent :user="auth.user!" />
181181
</DropdownMenuContent>
182182
</DropdownMenu>
183183
</div>

resources/js/components/AppSidebarHeader.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ defineProps<{
1414
>
1515
<div class="flex items-center gap-2">
1616
<SidebarTrigger class="-ml-1" />
17-
<template v-if="breadcrumbs.length > 0">
17+
<template v-if="breadcrumbs?.length">
1818
<Breadcrumbs :breadcrumbs="breadcrumbs" />
1919
</template>
2020
</div>

resources/js/components/NavMain.vue

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<script setup lang="ts">
22
import { SidebarGroup, SidebarGroupLabel, SidebarMenu, SidebarMenuButton, SidebarMenuItem } from '@/components/ui/sidebar';
3-
import { type NavItem, type SharedData } from '@/types';
3+
import { type NavItem} from '@/types';
44
import { Link, usePage } from '@inertiajs/vue3';
55
66
defineProps<{
77
items: NavItem[];
88
}>();
99
10-
const page = usePage<SharedData>();
10+
const page = usePage();
1111
</script>
1212

1313
<template>

resources/js/components/NavUser.vue

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
import UserInfo from '@/components/UserInfo.vue';
33
import { DropdownMenu, DropdownMenuContent, DropdownMenuTrigger } from '@/components/ui/dropdown-menu';
44
import { SidebarMenu, SidebarMenuButton, SidebarMenuItem, useSidebar } from '@/components/ui/sidebar';
5-
import { type SharedData, type User } from '@/types';
5+
import { type User } from '@/types';
66
import { usePage } from '@inertiajs/vue3';
77
import { ChevronsUpDown } from 'lucide-vue-next';
88
import UserMenuContent from './UserMenuContent.vue';
99
10-
const page = usePage<SharedData>();
10+
const page = usePage();
1111
const user = page.props.auth.user as User;
1212
const { isMobile, state } = useSidebar();
1313
</script>
@@ -22,10 +22,10 @@ const { isMobile, state } = useSidebar();
2222
<ChevronsUpDown class="ml-auto size-4" />
2323
</SidebarMenuButton>
2424
</DropdownMenuTrigger>
25-
<DropdownMenuContent
26-
class="w-[--radix-dropdown-menu-trigger-width] min-w-56 rounded-lg"
25+
<DropdownMenuContent
26+
class="w-[--radix-dropdown-menu-trigger-width] min-w-56 rounded-lg"
2727
:side="isMobile ? 'bottom' : state === 'collapsed' ? 'left' : 'bottom'"
28-
align="end"
28+
align="end"
2929
:side-offset="4"
3030
>
3131
<UserMenuContent :user="user" />

resources/js/components/TextLink.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { Link } from '@inertiajs/vue3';
44
interface Props {
55
href: string;
66
tabindex?: number;
7-
method?: string;
7+
method?: 'get' | 'post' | 'put' | 'patch' | 'delete';
88
as?: string;
99
}
1010

resources/js/components/UserInfo.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ const showAvatar = computed(() => props.user.avatar && props.user.avatar !== '')
2121

2222
<template>
2323
<Avatar class="h-8 w-8 overflow-hidden rounded-lg">
24-
<AvatarImage v-if="showAvatar" :src="user.avatar" :alt="user.name" />
24+
<AvatarImage v-if="showAvatar" :src="user.avatar!" :alt="user.name" />
2525
<AvatarFallback class="rounded-lg text-black dark:text-white">
2626
{{ getInitials(user.name) }}
2727
</AvatarFallback>

resources/js/pages/Welcome.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ import { Head, Link } from '@inertiajs/vue3';
215215
/>
216216
</g>
217217
<g
218-
:style="{ mixBlendMode: 'plus-darker' }"
218+
:style="`mixBlendMode: 'plus-darker'`"
219219
class="duration-750 starting:translate-y-4 starting:opacity-0 translate-y-0 opacity-100 transition-all delay-300"
220220
>
221221
<path

resources/js/pages/settings/Profile.vue

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { Input } from '@/components/ui/input';
99
import { Label } from '@/components/ui/label';
1010
import AppLayout from '@/layouts/AppLayout.vue';
1111
import SettingsLayout from '@/layouts/settings/Layout.vue';
12-
import { type BreadcrumbItem, type SharedData, type User } from '@/types';
12+
import { type BreadcrumbItem, type User } from '@/types';
1313
1414
interface Props {
1515
mustVerifyEmail: boolean;
@@ -25,7 +25,7 @@ const breadcrumbs: BreadcrumbItem[] = [
2525
},
2626
];
2727
28-
const page = usePage<SharedData>();
28+
const page = usePage();
2929
const user = page.props.auth.user as User;
3030
3131
const form = useForm({

0 commit comments

Comments
 (0)