Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
70cb7f0
Replace Figtree font with Inter
hugosaintemarie Feb 20, 2025
bdba738
Sentence case all the things
hugosaintemarie Feb 20, 2025
51b6ed1
Add placeholders
hugosaintemarie Feb 20, 2025
60de696
Remove period in "Saved" status
hugosaintemarie Feb 20, 2025
40ac236
Tweak reset password copy
hugosaintemarie Feb 20, 2025
cb13f3c
Tweak register page copy
hugosaintemarie Feb 20, 2025
e79c996
Tweak auth pages spacing
hugosaintemarie Feb 20, 2025
0dfb502
Tweak colors in auth pages
hugosaintemarie Feb 20, 2025
ca6fefb
Tweak Laravel logo thickness and color
hugosaintemarie Feb 20, 2025
304fc32
Move status on forgot-password page
hugosaintemarie Feb 20, 2025
6e6e96b
Move status on login page
hugosaintemarie Feb 20, 2025
4aff27f
Update verify-email copy
hugosaintemarie Feb 20, 2025
81693b6
Tweak verify-email layout
hugosaintemarie Feb 20, 2025
9a5ec98
More sentence case + minor copy tweaks
hugosaintemarie Feb 20, 2025
eea45f4
Tweak + fix text-link for dark mode
hugosaintemarie Feb 20, 2025
867a0f1
Add label on confirm-password
hugosaintemarie Feb 20, 2025
c6bb63b
Update icons for Repo and Docs
hugosaintemarie Feb 20, 2025
57aeb1d
No bg on active item in header layout
hugosaintemarie Feb 20, 2025
77e31c9
Bigger icons in app-header
hugosaintemarie Feb 20, 2025
cfc58a1
Tweak user menu in app-header
hugosaintemarie Feb 20, 2025
dfb581e
Tweak user menu, hide email in trigger
hugosaintemarie Feb 20, 2025
7152319
Tweak app logo
hugosaintemarie Feb 20, 2025
564fcb2
Update delete-user design
hugosaintemarie Feb 20, 2025
739201f
Bigger Laravel logo and no app name in split layout
hugosaintemarie Feb 20, 2025
1fd31b7
Responsive tweak (paddings and breakpoints)
hugosaintemarie Feb 20, 2025
98c5d4b
Bigger text in heading descriptions
hugosaintemarie Feb 20, 2025
8e33495
No separator below Heading, tweak spacing and font size
hugosaintemarie Feb 20, 2025
c092059
Tighter and thiner hatched background pattern
hugosaintemarie Feb 20, 2025
30f30ed
Tweak text color of quote author in split layout
hugosaintemarie Feb 20, 2025
bf56775
Same font size in split layout as simple layout
hugosaintemarie Feb 20, 2025
cfeb3c4
Tweak spacing in simple auth layout
hugosaintemarie Feb 20, 2025
f671ad2
Bigger checkbox
hugosaintemarie Feb 20, 2025
898eb98
Clean up stray indigo ring
hugosaintemarie Feb 20, 2025
9ef5482
Change all grays to `neutral`
hugosaintemarie Feb 20, 2025
26334cf
Fix breakpoint in settings layout
hugosaintemarie Feb 20, 2025
d56ab85
Revert padding changes in settings layout
hugosaintemarie Feb 20, 2025
5ee9d97
Merge branch 'main' into ui-pass
tnylea Feb 20, 2025
438c824
use inter var
taylorotwell Feb 20, 2025
dc0a61f
adding a few small updatesg
tnylea Feb 22, 2025
a438aed
Adding a few more small updates
tnylea Feb 22, 2025
516baf3
merged main into the ui branch
tnylea Feb 22, 2025
904e90e
Adding back the default simple layout
tnylea Feb 22, 2025
bcf2bdb
Adding app layout back to sidebar
tnylea Feb 22, 2025
79b2df3
small update
tnylea Feb 22, 2025
69fe982
adding package lock to make sure tests pass
tnylea Feb 22, 2025
6286456
Merge branch 'main' into ui-pass
tnylea Feb 23, 2025
405698e
submitting card auth ui
tnylea Feb 23, 2025
2389273
Merge branch 'ui-pass' of https://github.com/laravel/react-starter-ki…
tnylea Feb 23, 2025
052221c
font
taylorotwell Feb 23, 2025
63417fc
update fonts in welcome
taylorotwell Feb 23, 2025
84be56f
run npm format
taylorotwell Feb 23, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/Http/Controllers/Auth/PasswordResetLinkController.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,6 @@ public function store(Request $request): RedirectResponse
$request->only('email')
);

return back()->with('status', __('If an account exists with that email, you’ll receive a reset link shortly.'));
return back()->with('status', __('A reset link will be sent if the account exists.'));
}
}
7,308 changes: 7,308 additions & 0 deletions package-lock.json

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions resources/css/app.css
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
@custom-variant dark (&:is(.dark *));

@theme {
--font-sans: Figtree, ui-sans-serif, system-ui, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';
--font-sans:
'Instrument Sans', ui-sans-serif, system-ui, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';

--radius-lg: var(--radius);
--radius-md: calc(var(--radius) - 2px);
Expand Down Expand Up @@ -122,7 +123,7 @@
--primary-foreground: hsl(0, 0%, 9%);
--secondary: hsl(0, 0%, 14.9%);
--secondary-foreground: hsl(0, 0%, 98%);
--muted: hsl(0, 0%, 14.9%);
--muted: hsl(0, 0%, 6.9%);
--muted-foreground: hsl(0, 0%, 63.9%);
--accent: hsl(0, 0%, 14.9%);
--accent-foreground: hsl(0, 0%, 98%);
Expand Down
19 changes: 8 additions & 11 deletions resources/js/components/app-header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { useInitials } from '@/hooks/use-initials';
import { cn } from '@/lib/utils';
import { type BreadcrumbItem, type NavItem, type SharedData } from '@/types';
import { Link, usePage } from '@inertiajs/react';
import { BookOpenText, ChevronDown, FolderGit2, LayoutGrid, Menu, Search } from 'lucide-react';
import { BookOpen, Folder, LayoutGrid, Menu, Search } from 'lucide-react';
import AppLogo from './app-logo';
import AppLogoIcon from './app-logo-icon';

Expand All @@ -27,16 +27,16 @@ const rightNavItems: NavItem[] = [
{
title: 'Repository',
url: 'https://github.com/laravel/react-starter-kit',
icon: FolderGit2,
icon: Folder,
},
{
title: 'Documentation',
url: 'https://laravel.com/docs/starter-kits',
icon: BookOpenText,
icon: BookOpen,
},
];

const activeItemStyles = 'bg-neutral-100 text-neutral-900 dark:bg-neutral-800 dark:text-neutral-100';
const activeItemStyles = 'text-neutral-900 dark:bg-neutral-800 dark:text-neutral-100';

interface AppHeaderProps {
breadcrumbs?: BreadcrumbItem[];
Expand Down Expand Up @@ -127,7 +127,7 @@ export function AppHeader({ breadcrumbs = [] }: AppHeaderProps) {
<div className="ml-auto flex items-center space-x-2">
<div className="relative flex items-center space-x-1">
<Button variant="ghost" size="icon" className="group h-9 w-9 cursor-pointer">
<Search className="h-5 w-5 opacity-80 group-hover:opacity-100" />
<Search className="!size-5 opacity-80 group-hover:opacity-100" />
</Button>
<div className="hidden lg:flex">
{rightNavItems.map((item) => (
Expand All @@ -141,9 +141,7 @@ export function AppHeader({ breadcrumbs = [] }: AppHeaderProps) {
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"
>
<span className="sr-only">{item.title}</span>
{item.icon && (
<Icon iconNode={item.icon} className="h-4 w-4 opacity-80 group-hover:opacity-100" />
)}
{item.icon && <Icon iconNode={item.icon} className="size-5 opacity-80 group-hover:opacity-100" />}
</a>
</TooltipTrigger>
<TooltipContent>
Expand All @@ -156,14 +154,13 @@ export function AppHeader({ breadcrumbs = [] }: AppHeaderProps) {
</div>
<DropdownMenu>
<DropdownMenuTrigger asChild>
<Button variant="ghost" className="h-9 px-1.5">
<Avatar className="h-7 w-7 overflow-hidden rounded-lg">
<Button variant="ghost" className="size-10 rounded-full p-1">
<Avatar className="size-8 overflow-hidden rounded-full">
<AvatarImage src={auth.user.avatar} alt={auth.user.name} />
<AvatarFallback className="rounded-lg bg-neutral-200 text-black dark:bg-neutral-700 dark:text-white">
{getInitials(auth.user.name)}
</AvatarFallback>
</Avatar>
<ChevronDown className="hidden h-4 w-4 lg:block" />
</Button>
</DropdownMenuTrigger>
<DropdownMenuContent className="w-56" align="end">
Expand Down
8 changes: 6 additions & 2 deletions resources/js/components/app-logo-icon.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,12 @@ import { SVGAttributes } from 'react';

export default function AppLogoIcon(props: SVGAttributes<SVGElement>) {
return (
<svg {...props} viewBox="0 0 316 316" xmlns="http://www.w3.org/2000/svg">
<path d="M305.8 81.125C305.77 80.995 305.69 80.885 305.65 80.755C305.56 80.525 305.49 80.285 305.37 80.075C305.29 79.935 305.17 79.815 305.07 79.685C304.94 79.515 304.83 79.325 304.68 79.175C304.55 79.045 304.39 78.955 304.25 78.845C304.09 78.715 303.95 78.575 303.77 78.475L251.32 48.275C249.97 47.495 248.31 47.495 246.96 48.275L194.51 78.475C194.33 78.575 194.19 78.725 194.03 78.845C193.89 78.955 193.73 79.045 193.6 79.175C193.45 79.325 193.34 79.515 193.21 79.685C193.11 79.815 192.99 79.935 192.91 80.075C192.79 80.285 192.71 80.525 192.63 80.755C192.58 80.875 192.51 80.995 192.48 81.125C192.38 81.495 192.33 81.875 192.33 82.265V139.625L148.62 164.795V52.575C148.62 52.185 148.57 51.805 148.47 51.435C148.44 51.305 148.36 51.195 148.32 51.065C148.23 50.835 148.16 50.595 148.04 50.385C147.96 50.245 147.84 50.125 147.74 49.995C147.61 49.825 147.5 49.635 147.35 49.485C147.22 49.355 147.06 49.265 146.92 49.155C146.76 49.025 146.62 48.885 146.44 48.785L93.99 18.585C92.64 17.805 90.98 17.805 89.63 18.585L37.18 48.785C37 48.885 36.86 49.035 36.7 49.155C36.56 49.265 36.4 49.355 36.27 49.485C36.12 49.635 36.01 49.825 35.88 49.995C35.78 50.125 35.66 50.245 35.58 50.385C35.46 50.595 35.38 50.835 35.3 51.065C35.25 51.185 35.18 51.305 35.15 51.435C35.05 51.805 35 52.185 35 52.575V232.235C35 233.795 35.84 235.245 37.19 236.025L142.1 296.425C142.33 296.555 142.58 296.635 142.82 296.725C142.93 296.765 143.04 296.835 143.16 296.865C143.53 296.965 143.9 297.015 144.28 297.015C144.66 297.015 145.03 296.965 145.4 296.865C145.5 296.835 145.59 296.775 145.69 296.745C145.95 296.655 146.21 296.565 146.45 296.435L251.36 236.035C252.72 235.255 253.55 233.815 253.55 232.245V174.885L303.81 145.945C305.17 145.165 306 143.725 306 142.155V82.265C305.95 81.875 305.89 81.495 305.8 81.125ZM144.2 227.205L100.57 202.515L146.39 176.135L196.66 147.195L240.33 172.335L208.29 190.625L144.2 227.205ZM244.75 114.995V164.795L226.39 154.225L201.03 139.625V89.825L219.39 100.395L244.75 114.995ZM249.12 57.105L292.81 82.265L249.12 107.425L205.43 82.265L249.12 57.105ZM114.49 184.425L96.13 194.995V85.305L121.49 70.705L139.85 60.135V169.815L114.49 184.425ZM91.76 27.425L135.45 52.585L91.76 77.745L48.07 52.585L91.76 27.425ZM43.67 60.135L62.03 70.705L87.39 85.305V202.545V202.555V202.565C87.39 202.735 87.44 202.895 87.46 203.055C87.49 203.265 87.49 203.485 87.55 203.695V203.705C87.6 203.875 87.69 204.035 87.76 204.195C87.84 204.375 87.89 204.575 87.99 204.745C87.99 204.745 87.99 204.755 88 204.755C88.09 204.905 88.22 205.035 88.33 205.175C88.45 205.335 88.55 205.495 88.69 205.635L88.7 205.645C88.82 205.765 88.98 205.855 89.12 205.965C89.28 206.085 89.42 206.225 89.59 206.325C89.6 206.325 89.6 206.325 89.61 206.335C89.62 206.335 89.62 206.345 89.63 206.345L139.87 234.775V285.065L43.67 229.705V60.135ZM244.75 229.705L148.58 285.075V234.775L219.8 194.115L244.75 179.875V229.705ZM297.2 139.625L253.49 164.795V114.995L278.85 100.395L297.21 89.825V139.625H297.2Z" />
<svg {...props} viewBox="0 0 40 42" xmlns="http://www.w3.org/2000/svg">
<path
fillRule="evenodd"
clipRule="evenodd"
d="M17.2 5.63325L8.6 0.855469L0 5.63325V32.1434L16.2 41.1434L32.4 32.1434V23.699L40 19.4767V9.85547L31.4 5.07769L22.8 9.85547V18.2999L17.2 21.411V5.63325ZM38 18.2999L32.4 21.411V15.2545L38 12.1434V18.2999ZM36.9409 10.4439L31.4 13.5221L25.8591 10.4439L31.4 7.36561L36.9409 10.4439ZM24.8 18.2999V12.1434L30.4 15.2545V21.411L24.8 18.2999ZM23.8 20.0323L29.3409 23.1105L16.2 30.411L10.6591 27.3328L23.8 20.0323ZM7.6 27.9212L15.2 32.1434V38.2999L2 30.9666V7.92116L7.6 11.0323V27.9212ZM8.6 9.29991L3.05913 6.22165L8.6 3.14339L14.1409 6.22165L8.6 9.29991ZM30.4 24.8101L17.2 32.1434V38.2999L30.4 30.9666V24.8101ZM9.6 11.0323L15.2 7.92117V22.5221L9.6 25.6333V11.0323Z"
/>
</svg>
);
}
5 changes: 2 additions & 3 deletions resources/js/components/app-logo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@ export default function AppLogo() {
<div className="bg-sidebar-primary text-sidebar-primary-foreground flex aspect-square size-8 items-center justify-center rounded-md">
<AppLogoIcon className="size-5 fill-current text-white dark:text-black" />
</div>
<div className="grid flex-1 text-left text-sm leading-tight">
<span className="mb-0.5 truncate leading-none font-semibold">Laravel</span>
<span className="truncate text-[11px] leading-none tracking-tight opacity-80">Starter Kit</span>
<div className="ml-1 grid flex-1 text-left text-sm">
<span className="mb-0.5 truncate leading-none font-semibold">Laravel Starter Kit</span>
</div>
</>
);
Expand Down
2 changes: 1 addition & 1 deletion resources/js/components/app-sidebar-header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { type BreadcrumbItem as BreadcrumbItemType } from '@/types';

export function AppSidebarHeader({ breadcrumbs = [] }: { breadcrumbs?: BreadcrumbItemType[] }) {
return (
<header className="border-sidebar-border/50 flex h-16 shrink-0 items-center gap-2 border-b px-4 transition-[width,height] ease-linear group-has-data-[collapsible=icon]/sidebar-wrapper:h-12">
<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">
<div className="flex items-center gap-2">
<SidebarTrigger className="-ml-1" />
<Breadcrumbs breadcrumbs={breadcrumbs} />
Expand Down
6 changes: 3 additions & 3 deletions resources/js/components/app-sidebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { NavUser } from '@/components/nav-user';
import { Sidebar, SidebarContent, SidebarFooter, SidebarHeader, SidebarMenu, SidebarMenuButton, SidebarMenuItem } from '@/components/ui/sidebar';
import { type NavItem } from '@/types';
import { Link } from '@inertiajs/react';
import { BookOpenText, FolderGit2, LayoutGrid } from 'lucide-react';
import { BookOpen, Folder, LayoutGrid } from 'lucide-react';
import AppLogo from './app-logo';

const mainNavItems: NavItem[] = [
Expand All @@ -19,12 +19,12 @@ const footerNavItems: NavItem[] = [
{
title: 'Repository',
url: 'https://github.com/laravel/react-starter-kit',
icon: FolderGit2,
icon: Folder,
},
{
title: 'Documentation',
url: 'https://laravel.com/docs/starter-kits',
icon: BookOpenText,
icon: BookOpen,
},
];

Expand Down
11 changes: 6 additions & 5 deletions resources/js/components/delete-user.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,12 @@ export default function DeleteUser() {
return (
<div className="space-y-6">
<HeadingSmall title="Delete account" description="Delete your account and all of its resources" />
<div className="flex items-center rounded-lg border border-red-100 bg-red-50 p-3 dark:border-red-950 dark:bg-red-700/10">
<div className="space-y-4 rounded-lg border border-red-100 bg-red-50 p-4 dark:border-red-200/10 dark:bg-red-700/10">
<div className="relative space-y-0.5 text-red-600 dark:text-red-100">
<p className="font-medium">Warning</p>
<p className="text-sm">Please proceed with caution, this cannot be undone.</p>
</div>

<Dialog>
<DialogTrigger asChild>
<Button variant="destructive">Delete account</Button>
Expand Down Expand Up @@ -79,10 +84,6 @@ export default function DeleteUser() {
</form>
</DialogContent>
</Dialog>
<div className="relative ml-3 text-red-600 dark:text-red-100">
<p className="mb-1 text-sm leading-none font-medium">Warning</p>
<p className="text-xs leading-none">Please proceed with caution, this cannot be undone.</p>
</div>
</div>
</div>
);
Expand Down
2 changes: 1 addition & 1 deletion resources/js/components/heading-small.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ export default function HeadingSmall({ title, description }: { title: string; de
return (
<header>
<h3 className="mb-0.5 text-base font-medium">{title}</h3>
{description && <p className="text-muted-foreground text-xs">{description}</p>}
{description && <p className="text-muted-foreground text-sm">{description}</p>}
</header>
);
}
9 changes: 3 additions & 6 deletions resources/js/components/heading.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
import { Separator } from '@/components/ui/separator';

export default function Heading({ title, description }: { title: string; description?: string }) {
return (
<>
<div className="space-y-0.5">
<h2 className="text-base font-semibold tracking-tight sm:text-lg lg:text-xl">{title}</h2>
{description && <p className="text-muted-foreground text-xs md:text-sm">{description}</p>}
<div className="mb-8 space-y-0.5">
<h2 className="text-xl font-semibold tracking-tight">{title}</h2>
{description && <p className="text-muted-foreground text-sm">{description}</p>}
</div>
<Separator className="my-6" />
</>
);
}
5 changes: 4 additions & 1 deletion resources/js/components/text-link.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@ type LinkProps = ComponentProps<typeof Link>;
export default function TextLink({ className = '', children, ...props }: LinkProps) {
return (
<Link
className={cn('underline decoration-neutral-400 underline-offset-2 duration-300 ease-out hover:decoration-neutral-700', className)}
className={cn(
'text-foreground underline decoration-neutral-300 underline-offset-4 transition-colors duration-300 ease-out hover:decoration-current! dark:decoration-neutral-500',
className,
)}
{...props}
>
{children}
Expand Down
4 changes: 2 additions & 2 deletions resources/js/components/ui/checkbox.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ const Checkbox = React.forwardRef<React.ElementRef<typeof CheckboxPrimitive.Root
<CheckboxPrimitive.Root
ref={ref}
className={cn(
'peer h-4 w-4 shrink-0 rounded-sm border border-primary ring-offset-background focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:bg-primary data-[state=checked]:text-primary-foreground',
'peer size-5 shrink-0 rounded-sm border border-input ring-offset-background focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:bg-primary data-[state=checked]:text-primary-foreground data-[state=checked]:border-accent-foreground',
className,
)}
{...props}
>
<CheckboxPrimitive.Indicator className={cn('flex items-center justify-center text-current')}>
<Check className="h-4 w-4" />
<Check className="size-3.5 stroke-[3]" />
</CheckboxPrimitive.Indicator>
</CheckboxPrimitive.Root>
),
Expand Down
4 changes: 2 additions & 2 deletions resources/js/components/ui/placeholder-pattern.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ export function PlaceholderPattern({ className }: PlaceholderPatternProps) {
return (
<svg className={className} fill="none">
<defs>
<pattern id={patternId} x="0" y="0" width="10" height="10" patternUnits="userSpaceOnUse">
<path d="M-3 13 15-5M-5 5l18-18M-1 21 17 3"></path>
<pattern id={patternId} x="0" y="0" width="8" height="8" patternUnits="userSpaceOnUse">
<path d="M-1 5L5 -1M3 9L8.5 3.5" stroke-width="0.5"></path>
</pattern>
</defs>
<rect stroke="none" fill={`url(#${patternId})`} width="100%" height="100%"></rect>
Expand Down
8 changes: 4 additions & 4 deletions resources/js/components/user-info.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,20 @@ import { Avatar, AvatarFallback, AvatarImage } from '@/components/ui/avatar';
import { useInitials } from '@/hooks/use-initials';
import { type User } from '@/types';

export function UserInfo({ user }: { user: User }) {
export function UserInfo({ user, showEmail = false }: { user: User; showEmail?: boolean }) {
const getInitials = useInitials();

return (
<>
<Avatar className="h-8 w-8 overflow-hidden rounded-lg">
<Avatar className="h-8 w-8 overflow-hidden rounded-full">
<AvatarImage src={user.avatar} alt={user.name} />
<AvatarFallback className="rounded-lg bg-neutral-200 text-black dark:bg-neutral-700 dark:text-white">
{getInitials(user.name)}
</AvatarFallback>
</Avatar>
<div className="grid flex-1 text-left text-sm leading-tight">
<span className="truncate font-semibold">{user.name}</span>
<span className="truncate text-xs">{user.email}</span>
<span className="truncate font-medium">{user.name}</span>
{showEmail && <span className="text-muted-foreground truncate text-xs">{user.email}</span>}
</div>
</>
);
Expand Down
2 changes: 1 addition & 1 deletion resources/js/components/user-menu-content.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export function UserMenuContent({ user }: UserMenuContentProps) {
<>
<DropdownMenuLabel className="p-0 font-normal">
<div className="flex items-center gap-2 px-1 py-1.5 text-left text-sm">
<UserInfo user={user} />
<UserInfo user={user} showEmail={true} />
</div>
</DropdownMenuLabel>
<DropdownMenuSeparator />
Expand Down
4 changes: 2 additions & 2 deletions resources/js/layouts/auth/auth-card-layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ export default function AuthCardLayout({
<div className="bg-muted flex min-h-svh flex-col items-center justify-center gap-6 p-6 md:p-10">
<div className="flex w-full max-w-md flex-col gap-6">
<a href="#" className="flex items-center gap-2 self-center font-medium">
<div className="flex h-10 w-10 items-center justify-center">
<AppLogoIcon className="size-10 fill-current text-black" />
<div className="flex h-9 w-9 items-center justify-center">
<AppLogoIcon className="size-9 fill-current text-black dark:text-white" />
</div>
</a>

Expand Down
Loading