Skip to content

Commit 96bcea5

Browse files
committed
fix conflicts
2 parents 54e512f + f1c4c46 commit 96bcea5

File tree

13 files changed

+22
-24
lines changed

13 files changed

+22
-24
lines changed

.prettierrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"printWidth": 150,
77
"plugins": ["prettier-plugin-organize-imports", "prettier-plugin-tailwindcss"],
88
"tailwindFunctions": ["clsx", "cn"],
9+
"tailwindStylesheet": "resources/css/app.css",
910
"tabWidth": 4,
1011
"overrides": [
1112
{

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,12 @@
5555
],
5656
"dev": [
5757
"Composer\\Config::disableProcessTimeout",
58-
"npx concurrently -c \"#93c5fd,#c4b5fd,#fb7185,#fdba74\" \"php artisan serve\" \"php artisan queue:listen --tries=1\" \"php artisan pail --timeout=0\" \"npm run dev\" --names=server,queue,logs,vite"
58+
"npx concurrently -c \"#93c5fd,#c4b5fd,#fb7185,#fdba74\" \"php artisan serve\" \"php artisan queue:listen --tries=1\" \"php artisan pail --timeout=0\" \"npm run dev\" --names=server,queue,logs,vite --kill-others"
5959
],
6060
"dev:ssr": [
6161
"npm run build:ssr",
6262
"Composer\\Config::disableProcessTimeout",
63-
"npx concurrently -c \"#93c5fd,#c4b5fd,#fb7185,#fdba74\" \"php artisan serve\" \"php artisan queue:listen --tries=1\" \"php artisan pail --timeout=0\" \"php artisan inertia:start-ssr\" --names=server,queue,logs,ssr"
63+
"npx concurrently -c \"#93c5fd,#c4b5fd,#fb7185,#fdba74\" \"php artisan serve\" \"php artisan queue:listen --tries=1\" \"php artisan pail --timeout=0\" \"php artisan inertia:start-ssr\" --names=server,queue,logs,ssr --kill-others"
6464
],
6565
"test": [
6666
"@php artisan config:clear --ansi",

resources/js/components/app-header.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ export function AppHeader({ breadcrumbs = [] }: AppHeaderProps) {
4848
const getInitials = useInitials();
4949
return (
5050
<>
51-
<div className="border-sidebar-border/80 border-b">
51+
<div className="border-b border-sidebar-border/80">
5252
<div className="mx-auto flex h-16 items-center px-4 md:max-w-7xl">
5353
{/* Mobile Menu */}
5454
<div className="lg:hidden">
@@ -58,7 +58,7 @@ export function AppHeader({ breadcrumbs = [] }: AppHeaderProps) {
5858
<Menu className="h-5 w-5" />
5959
</Button>
6060
</SheetTrigger>
61-
<SheetContent side="left" className="bg-sidebar flex h-full w-64 flex-col items-stretch justify-between">
61+
<SheetContent side="left" className="flex h-full w-64 flex-col items-stretch justify-between bg-sidebar">
6262
<SheetTitle className="sr-only">Navigation Menu</SheetTitle>
6363
<SheetHeader className="flex justify-start text-left">
6464
<AppLogoIcon className="h-6 w-6 fill-current text-black dark:text-white" />
@@ -138,7 +138,7 @@ export function AppHeader({ breadcrumbs = [] }: AppHeaderProps) {
138138
href={item.href}
139139
target="_blank"
140140
rel="noopener noreferrer"
141-
className="group text-accent-foreground ring-offset-background hover:bg-accent hover:text-accent-foreground focus-visible:ring-ring ml-1 inline-flex h-9 w-9 items-center justify-center rounded-md bg-transparent p-0 text-sm font-medium transition-colors focus-visible:ring-2 focus-visible:ring-offset-2 focus-visible:outline-none disabled:pointer-events-none disabled:opacity-50"
141+
className="group ml-1 inline-flex h-9 w-9 items-center justify-center rounded-md bg-transparent p-0 text-sm font-medium text-accent-foreground ring-offset-background transition-colors hover:bg-accent hover:text-accent-foreground focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 focus-visible:outline-none disabled:pointer-events-none disabled:opacity-50"
142142
>
143143
<span className="sr-only">{item.title}</span>
144144
{item.icon && <Icon iconNode={item.icon} className="size-5 opacity-80 group-hover:opacity-100" />}
@@ -171,7 +171,7 @@ export function AppHeader({ breadcrumbs = [] }: AppHeaderProps) {
171171
</div>
172172
</div>
173173
{breadcrumbs.length > 1 && (
174-
<div className="border-sidebar-border/70 flex w-full border-b">
174+
<div className="flex w-full border-b border-sidebar-border/70">
175175
<div className="mx-auto flex h-12 w-full items-center justify-start px-4 text-neutral-500 md:max-w-7xl">
176176
<Breadcrumbs breadcrumbs={breadcrumbs} />
177177
</div>

resources/js/components/app-logo.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ import AppLogoIcon from './app-logo-icon';
33
export default function AppLogo() {
44
return (
55
<>
6-
<div className="bg-sidebar-primary text-sidebar-primary-foreground flex aspect-square size-8 items-center justify-center rounded-md">
6+
<div className="flex aspect-square size-8 items-center justify-center rounded-md bg-sidebar-primary text-sidebar-primary-foreground">
77
<AppLogoIcon className="size-5 fill-current text-white dark:text-black" />
88
</div>
99
<div className="ml-1 grid flex-1 text-left text-sm">
10-
<span className="mb-0.5 truncate leading-none font-semibold">Laravel Starter Kit</span>
10+
<span className="mb-0.5 truncate leading-tight font-semibold">Laravel Starter Kit</span>
1111
</div>
1212
</>
1313
);

resources/js/components/app-sidebar-header.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { type BreadcrumbItem as BreadcrumbItemType } from '@/types';
44

55
export function AppSidebarHeader({ breadcrumbs = [] }: { breadcrumbs?: BreadcrumbItemType[] }) {
66
return (
7-
<header className="border-sidebar-border/50 flex h-16 shrink-0 items-center gap-2 border-b px-6 transition-[width,height] ease-linear group-has-data-[collapsible=icon]/sidebar-wrapper:h-12 md:px-4">
7+
<header className="flex h-16 shrink-0 items-center gap-2 border-b border-sidebar-border/50 px-6 transition-[width,height] ease-linear group-has-data-[collapsible=icon]/sidebar-wrapper:h-12 md:px-4">
88
<div className="flex items-center gap-2">
99
<SidebarTrigger className="-ml-1" />
1010
<Breadcrumbs breadcrumbs={breadcrumbs} />

resources/js/components/heading-small.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ export default function HeadingSmall({ title, description }: { title: string; de
22
return (
33
<header>
44
<h3 className="mb-0.5 text-base font-medium">{title}</h3>
5-
{description && <p className="text-muted-foreground text-sm">{description}</p>}
5+
{description && <p className="text-sm text-muted-foreground">{description}</p>}
66
</header>
77
);
88
}

resources/js/components/heading.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ export default function Heading({ title, description }: { title: string; descrip
22
return (
33
<div className="mb-8 space-y-0.5">
44
<h2 className="text-xl font-semibold tracking-tight">{title}</h2>
5-
{description && <p className="text-muted-foreground text-sm">{description}</p>}
5+
{description && <p className="text-sm text-muted-foreground">{description}</p>}
66
</div>
77
);
88
}

resources/js/components/nav-main.tsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@ export function NavMain({ items = [] }: { items: NavItem[] }) {
1010
<SidebarMenu>
1111
{items.map((item) => (
1212
<SidebarMenuItem key={item.title}>
13-
<SidebarMenuButton
14-
asChild isActive={item.href === page.url}
15-
tooltip={{ children: item.title }}
16-
>
13+
<SidebarMenuButton asChild isActive={page.url.startsWith(item.href)} tooltip={{ children: item.title }}>
1714
<Link href={item.href} prefetch>
1815
{item.icon && <item.icon />}
1916
<span>{item.title}</span>

resources/js/components/nav-user.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export function NavUser() {
1717
<SidebarMenuItem>
1818
<DropdownMenu>
1919
<DropdownMenuTrigger asChild>
20-
<SidebarMenuButton size="lg" className="text-sidebar-accent-foreground data-[state=open]:bg-sidebar-accent group">
20+
<SidebarMenuButton size="lg" className="group text-sidebar-accent-foreground data-[state=open]:bg-sidebar-accent">
2121
<UserInfo user={auth.user} />
2222
<ChevronsUpDown className="ml-auto size-4" />
2323
</SidebarMenuButton>

resources/js/components/user-info.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export function UserInfo({ user, showEmail = false }: { user: User; showEmail?:
1515
</Avatar>
1616
<div className="grid flex-1 text-left text-sm leading-tight">
1717
<span className="truncate font-medium">{user.name}</span>
18-
{showEmail && <span className="text-muted-foreground truncate text-xs">{user.email}</span>}
18+
{showEmail && <span className="truncate text-xs text-muted-foreground">{user.email}</span>}
1919
</div>
2020
</>
2121
);

0 commit comments

Comments
 (0)