Merge branch 'main' into prettier-tailwind

taylorotwell · web-flow · commit 6906a2227527 · 2025-06-05T14:24:15.000-05:00
diff --git a/app/Http/Controllers/Auth/RegisteredUserController.php b/app/Http/Controllers/Auth/RegisteredUserController.php
@@ -46,6 +46,6 @@ public function store(Request $request): RedirectResponse
 
         Auth::login($user);
 
-        return to_route('dashboard');
+        return redirect()->intended(route('dashboard', absolute: false));
     }
 }
diff --git a/resources/js/components/app-logo.tsx b/resources/js/components/app-logo.tsx
@@ -7,7 +7,7 @@ export default function AppLogo() {
                 <AppLogoIcon className="size-5 fill-current text-white dark:text-black" />
             </div>
             <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>
+                <span className="mb-0.5 truncate leading-tight font-semibold">Laravel Starter Kit</span>
             </div>
         </>
     );
diff --git a/resources/js/components/nav-main.tsx b/resources/js/components/nav-main.tsx
@@ -10,7 +10,7 @@ export function NavMain({ items = [] }: { items: NavItem[] }) {
             <SidebarMenu>
                 {items.map((item) => (
                     <SidebarMenuItem key={item.title}>
-                        <SidebarMenuButton asChild isActive={item.href === page.url} tooltip={{ children: item.title }}>
+                        <SidebarMenuButton asChild isActive={page.url.startsWith(item.href)} tooltip={{ children: item.title }}>
                             <Link href={item.href} prefetch>
                                 {item.icon && <item.icon />}
                                 <span>{item.title}</span>
diff --git a/resources/js/pages/settings/password.tsx b/resources/js/pages/settings/password.tsx
@@ -50,7 +50,7 @@ export default function Password() {
 
     return (
         <AppLayout breadcrumbs={breadcrumbs}>
-            <Head title="Profile settings" />
+            <Head title="Password settings" />
 
             <SettingsLayout>
                 <div className="space-y-6">

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,6 @@ public function store(Request $request): RedirectResponse`
`46`	`46`
`47`	`47`	`Auth::login($user);`
`48`	`48`
`49`		`- return to_route('dashboard');`
	`49`	`+ return redirect()->intended(route('dashboard', absolute: false));`
`50`	`50`	`}`
`51`	`51`	`}`