Skip to content

Commit 59084a2

Browse files
taylorotwelltaylorotwell
committed
fix conflicts
2 parents 0c631af + 5d0f78f commit 59084a2

File tree

15 files changed

+265
-267
lines changed

15 files changed

+265
-267
lines changed

‎app/Http/Middleware/HandleInertiaRequests.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@ public function share(Request $request): array
3838
{
3939
[$message, $author] = str(Inspiring::quotes()->random())->explode('-');
4040

41-
return array_merge(parent::share($request), [
41+
return [
4242
...parent::share($request),
4343
'name' => config('app.name'),
4444
'quote' => ['message' => trim($message), 'author' => trim($author)],
4545
'auth' => [
4646
'user' => $request->user(),
4747
],
48-
]);
48+
];
4949
}
5050
}

‎package-lock.json‎

Lines changed: 194 additions & 196 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,21 @@
1111
},
1212
"devDependencies": {
1313
"@eslint/js": "^9.19.0",
14+
"@types/node": "^22.13.5",
1415
"@vue/eslint-config-typescript": "^14.3.0",
1516
"eslint": "^9.17.0",
1617
"eslint-config-prettier": "^10.0.1",
1718
"eslint-plugin-vue": "^9.32.0",
1819
"prettier": "^3.4.2",
1920
"prettier-plugin-organize-imports": "^4.1.0",
2021
"prettier-plugin-tailwindcss": "^0.6.9",
21-
"typescript-eslint": "^8.23.0"
22+
"typescript-eslint": "^8.23.0",
23+
"vue-tsc": "^2.2.4"
2224
},
2325
"dependencies": {
2426
"@headlessui/vue": "^1.7.23",
2527
"@inertiajs/vue3": "^2.0.0-beta.3",
2628
"@tailwindcss/forms": "^0.5.3",
27-
"@types/node": "^22.10.2",
28-
"@types/ziggy-js": "^1.3.3",
2929
"@vitejs/plugin-vue": "^5.2.1",
3030
"@vueuse/core": "^12.0.0",
3131
"autoprefixer": "^10.4.20",
@@ -40,9 +40,8 @@
4040
"tailwindcss": "^3.4.1",
4141
"tailwindcss-animate": "^1.0.7",
4242
"typescript": "^5.2.2",
43-
"vite": "^6.0.3",
43+
"vite": "^6.2.0",
4444
"vue": "^3.5.13",
45-
"vue-tsc": "^2.2.0",
4645
"ziggy-js": "^2.4.2"
4746
},
4847
"optionalDependencies": {

‎public/logo.svg‎

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

‎resources/css/app.css‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44

55
body,
66
html {
7-
--font-sans: 'Instrument Sans', ui-sans-serif, system-ui, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';
7+
--font-sans:
8+
'Instrument Sans', ui-sans-serif, system-ui, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';
89
}
910

1011
@layer base {

‎resources/js/components/AppHeader.vue‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<script setup lang="ts">
22
import AppLogo from '@/components/AppLogo.vue';
33
import AppLogoIcon from '@/components/AppLogoIcon.vue';
4+
import Breadcrumbs from '@/components/Breadcrumbs.vue';
45
import { Avatar, AvatarFallback, AvatarImage } from '@/components/ui/avatar';
56
import { Button } from '@/components/ui/button';
67
import { DropdownMenu, DropdownMenuContent, DropdownMenuTrigger } from '@/components/ui/dropdown-menu';
@@ -76,7 +77,7 @@ const rightNavItems: NavItem[] = [
7677
<SheetHeader class="flex justify-start text-left">
7778
<AppLogoIcon class="size-6 fill-current text-black dark:text-white" />
7879
</SheetHeader>
79-
<div class="flex flex-col justify-between h-full space-y-4 py-6 flex-1">
80+
<div class="flex h-full flex-1 flex-col justify-between space-y-4 py-6">
8081
<nav class="-mx-3 space-y-1">
8182
<Link
8283
v-for="item in mainNavItems"
@@ -165,7 +166,7 @@ const rightNavItems: NavItem[] = [
165166
class="relative size-10 w-auto rounded-full p-1 focus-within:ring-2 focus-within:ring-primary"
166167
>
167168
<Avatar class="size-8 overflow-hidden rounded-full">
168-
<AvatarImage :src="auth.user.avatar" :alt="auth.user.name" />
169+
<AvatarImage v-if="auth.user.avatar" :src="auth.user.avatar" :alt="auth.user.name" />
169170
<AvatarFallback class="rounded-lg bg-neutral-200 font-semibold text-black dark:bg-neutral-700 dark:text-white">
170171
{{ getInitials(auth.user?.name) }}
171172
</AvatarFallback>

‎resources/js/components/AppSidebarHeader.vue‎

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<script setup lang="ts">
2-
import { Breadcrumb, BreadcrumbItem, BreadcrumbLink, BreadcrumbList, BreadcrumbPage, BreadcrumbSeparator } from '@/components/ui/breadcrumb';
2+
import Breadcrumbs from '@/components/Breadcrumbs.vue';
33
import { SidebarTrigger } from '@/components/ui/sidebar';
44
import type { BreadcrumbItemType } from '@/types';
55
@@ -15,23 +15,7 @@ defineProps<{
1515
<div class="flex items-center gap-2">
1616
<SidebarTrigger class="-ml-1" />
1717
<template v-if="breadcrumbs.length > 0">
18-
<Breadcrumb>
19-
<BreadcrumbList>
20-
<template v-for="(item, index) in breadcrumbs" :key="index">
21-
<BreadcrumbItem>
22-
<template v-if="index === breadcrumbs.length - 1">
23-
<BreadcrumbPage>{{ item.title }}</BreadcrumbPage>
24-
</template>
25-
<template v-else>
26-
<BreadcrumbLink :href="item.href">
27-
{{ item.title }}
28-
</BreadcrumbLink>
29-
</template>
30-
</BreadcrumbItem>
31-
<BreadcrumbSeparator v-if="index !== breadcrumbs.length - 1" />
32-
</template>
33-
</BreadcrumbList>
34-
</Breadcrumb>
18+
<Breadcrumbs :breadcrumbs="breadcrumbs" />
3519
</template>
3620
</div>
3721
</header>

‎resources/js/components/Breadcrumbs.vue‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<script setup lang="ts">
2+
import { Breadcrumb, BreadcrumbItem, BreadcrumbLink, BreadcrumbList, BreadcrumbPage, BreadcrumbSeparator } from '@/components/ui/breadcrumb';
3+
import { Link } from '@inertiajs/vue3';
4+
5+
interface BreadcrumbItem {
6+
title: string;
7+
href?: string;
8+
}
9+
10+
defineProps<{
11+
breadcrumbs: BreadcrumbItem[];
12+
}>();
13+
</script>
14+
15+
<template>
16+
<Breadcrumb>
17+
<BreadcrumbList>
18+
<template v-for="(item, index) in breadcrumbs" :key="index">
19+
<BreadcrumbItem>
20+
<template v-if="index === breadcrumbs.length - 1">
21+
<BreadcrumbPage>{{ item.title }}</BreadcrumbPage>
22+
</template>
23+
<template v-else>
24+
<BreadcrumbLink>
25+
<Link :href="item.href ?? '#'">{{ item.title }}</Link>
26+
</BreadcrumbLink>
27+
</template>
28+
</BreadcrumbItem>
29+
<BreadcrumbSeparator v-if="index !== breadcrumbs.length - 1" />
30+
</template>
31+
</BreadcrumbList>
32+
</Breadcrumb>
33+
</template>

‎resources/js/components/DeleteUser.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ const closeModal = () => {
7070
<InputError :message="form.errors.password" />
7171
</div>
7272

73-
<DialogFooter>
73+
<DialogFooter class="gap-2">
7474
<DialogClose as-child>
7575
<Button variant="secondary" @click="closeModal"> Cancel </Button>
7676
</DialogClose>

‎resources/js/components/NavMain.vue‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,7 @@
11
<script setup lang="ts">
22
import { SidebarGroup, SidebarGroupLabel, SidebarMenu, SidebarMenuButton, SidebarMenuItem } from '@/components/ui/sidebar';
3-
import { type SharedData } from '@/types';
3+
import { type NavItem, type SharedData } from '@/types';
44
import { Link, usePage } from '@inertiajs/vue3';
5-
import type { Component } from 'vue';
6-
7-
interface NavItem {
8-
title: string;
9-
url: string;
10-
icon: Component;
11-
}
125
136
defineProps<{
147
items: NavItem[];
@@ -22,8 +15,8 @@ const page = usePage<SharedData>();
2215
<SidebarGroupLabel>Platform</SidebarGroupLabel>
2316
<SidebarMenu>
2417
<SidebarMenuItem v-for="item in items" :key="item.title">
25-
<SidebarMenuButton as-child :is-active="item.url === page.url">
26-
<Link :href="item.url">
18+
<SidebarMenuButton as-child :is-active="item.href === page.url">
19+
<Link :href="item.href">
2720
<component :is="item.icon" />
2821
<span>{{ item.title }}</span>
2922
</Link>

0 commit comments

Comments
 (0)