Skip to content

Commit 219eb79

Browse files
committed
Merge branch 'main' into workos
2 parents 4f60753 + 108963e commit 219eb79

File tree

10 files changed

+22
-10
lines changed

10 files changed

+22
-10
lines changed

composer.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,10 @@
6161
"npm run build:ssr",
6262
"Composer\\Config::disableProcessTimeout",
6363
"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"
64+
],
65+
"test": [
66+
"@php artisan config:clear --ansi",
67+
"@php artisan test"
6468
]
6569
},
6670
"extra": {

public/apple-touch-icon.png

1.7 KB
Loading

public/favicon.ico

4.19 KB
Binary file not shown.

public/favicon.svg

Lines changed: 3 additions & 0 deletions
Loading

resources/js/components/app-header.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ const rightNavItems: NavItem[] = [
3131
},
3232
{
3333
title: 'Documentation',
34-
href: 'https://laravel.com/docs/starter-kits',
34+
href: 'https://laravel.com/docs/starter-kits#react',
3535
icon: BookOpen,
3636
},
3737
];

resources/js/components/app-sidebar.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ const footerNavItems: NavItem[] = [
2323
},
2424
{
2525
title: 'Documentation',
26-
href: 'https://laravel.com/docs/starter-kits',
26+
href: 'https://laravel.com/docs/starter-kits#react',
2727
icon: BookOpen,
2828
},
2929
];

resources/js/components/user-menu-content.tsx

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { DropdownMenuGroup, DropdownMenuItem, DropdownMenuLabel, DropdownMenuSep
22
import { UserInfo } from '@/components/user-info';
33
import { useMobileNavigation } from '@/hooks/use-mobile-navigation';
44
import { type User } from '@/types';
5-
import { Link } from '@inertiajs/react';
5+
import { Link, router } from '@inertiajs/react';
66
import { LogOut, Settings } from 'lucide-react';
77

88
interface UserMenuContentProps {
@@ -12,6 +12,11 @@ interface UserMenuContentProps {
1212
export function UserMenuContent({ user }: UserMenuContentProps) {
1313
const cleanup = useMobileNavigation();
1414

15+
const handleLogout = () => {
16+
cleanup();
17+
router.flushAll();
18+
};
19+
1520
return (
1621
<>
1722
<DropdownMenuLabel className="p-0 font-normal">
@@ -30,7 +35,7 @@ export function UserMenuContent({ user }: UserMenuContentProps) {
3035
</DropdownMenuGroup>
3136
<DropdownMenuSeparator />
3237
<DropdownMenuItem asChild>
33-
<Link className="block w-full" method="post" href={route('logout')} as="button" onClick={cleanup}>
38+
<Link className="block w-full" method="post" href={route('logout')} as="button" onClick={handleLogout}>
3439
<LogOut className="mr-2" />
3540
Log out
3641
</Link>

resources/js/hooks/use-initials.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { useCallback } from 'react';
22

33
export function useInitials() {
4-
const getInitials = useCallback((fullName: string): string => {
4+
return useCallback((fullName: string): string => {
55
const names = fullName.trim().split(' ');
66

77
if (names.length === 0) return '';
@@ -12,6 +12,4 @@ export function useInitials() {
1212

1313
return `${firstInitial}${lastInitial}`.toUpperCase();
1414
}, []);
15-
16-
return getInitials;
1715
}
Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
import { useCallback } from 'react';
22

33
export function useMobileNavigation() {
4-
const cleanup = useCallback(() => {
4+
return useCallback(() => {
55
// Remove pointer-events style from body...
66
document.body.style.removeProperty('pointer-events');
77
}, []);
8-
9-
return cleanup;
108
}

resources/views/app.blade.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@
3232

3333
<title inertia>{{ config('app.name', 'Laravel') }}</title>
3434

35+
<link rel="icon" href="/favicon.ico" sizes="any">
36+
<link rel="icon" href="/favicon.svg" type="image/svg+xml">
37+
<link rel="apple-touch-icon" href="/apple-touch-icon.png">
38+
3539
<link rel="preconnect" href="https://fonts.bunny.net">
3640
<link href="https://fonts.bunny.net/css?family=instrument-sans:400,500,600" rel="stylesheet" />
3741

0 commit comments

Comments
 (0)