Apply fixes from Laravel Starter Kit

skryukov · skryukov · commit ebdc5aa7aa69 · 2025-06-14T15:00:06.000+03:00
diff --git a/app/frontend/components/app-logo.tsx b/app/frontend/components/app-logo.tsx
@@ -7,7 +7,7 @@ export default function AppLogo() {
         <AppLogoIcon className="size-5 fill-current text-white" />
       </div>
       <div className="ml-1 grid flex-1 text-left text-sm">
-        <span className="mb-0.5 truncate leading-none font-semibold">
+        <span className="mb-0.5 truncate leading-tight font-semibold">
           Inertia Rails Starter Kit
         </span>
       </div>
diff --git a/app/frontend/components/nav-main.tsx b/app/frontend/components/nav-main.tsx
@@ -19,7 +19,7 @@ export function NavMain({ items = [] }: { items: NavItem[] }) {
           <SidebarMenuItem key={item.title}>
             <SidebarMenuButton
               asChild
-              isActive={item.href === page.url}
+              isActive={page.url.startsWith(item.href)}
               tooltip={{ children: item.title }}
             >
               <Link href={item.href} prefetch>
diff --git a/app/frontend/components/ui/sidebar.tsx b/app/frontend/components/ui/sidebar.tsx
@@ -310,7 +310,7 @@ function SidebarInset({ className, ...props }: React.ComponentProps<"main">) {
     <main
       data-slot="sidebar-inset"
       className={cn(
-        "bg-background relative flex w-full flex-1 flex-col",
+        "bg-background relative flex min-h-svh max-w-full flex-1 flex-col",
         "md:peer-data-[variant=inset]:m-2 md:peer-data-[variant=inset]:ml-0 md:peer-data-[variant=inset]:rounded-xl md:peer-data-[variant=inset]:shadow-sm md:peer-data-[variant=inset]:peer-data-[state=collapsed]:ml-2",
         className,
       )}
diff --git a/app/frontend/components/user-menu-content.tsx b/app/frontend/components/user-menu-content.tsx
@@ -1,4 +1,4 @@
-import { Link } from "@inertiajs/react"
+import { Link, router } from "@inertiajs/react"
 import { LogOut, Settings } from "lucide-react"
 
 import {
@@ -25,6 +25,11 @@ export function UserMenuContent({ auth }: UserMenuContentProps) {
   const { session, user } = auth
   const cleanup = useMobileNavigation()
 
+  const handleLogout = () => {
+    cleanup()
+    router.flushAll()
+  }
+
   return (
     <>
       <DropdownMenuLabel className="p-0 font-normal">
@@ -54,7 +59,7 @@ export function UserMenuContent({ auth }: UserMenuContentProps) {
           method="delete"
           href={sessionPath({ id: session.id })}
           as="button"
-          onClick={cleanup}
+          onClick={handleLogout}
         >
           <LogOut className="mr-2" />
           Log out
diff --git a/app/frontend/hooks/use-initials.tsx b/app/frontend/hooks/use-initials.tsx
@@ -1,7 +1,7 @@
 import { useCallback } from "react"
 
 export function useInitials() {
-  const getInitials = useCallback((fullName: string): string => {
+  return useCallback((fullName: string): string => {
     const names = fullName.trim().split(" ")
 
     if (names.length === 0) return ""
@@ -12,6 +12,4 @@ export function useInitials() {
 
     return `${firstInitial}${lastInitial}`.toUpperCase()
   }, [])
-
-  return getInitials
 }
diff --git a/app/frontend/hooks/use-mobile-navigation.ts b/app/frontend/hooks/use-mobile-navigation.ts
@@ -1,10 +1,8 @@
 import { useCallback } from "react"
 
 export function useMobileNavigation() {
-  const cleanup = useCallback(() => {
+  return useCallback(() => {
     // Remove pointer-events style from body...
     document.body.style.removeProperty("pointer-events")
   }, [])
-
-  return cleanup
 }
diff --git a/app/frontend/layouts/app/app-sidebar-layout.tsx b/app/frontend/layouts/app/app-sidebar-layout.tsx
@@ -15,7 +15,7 @@ export default function AppSidebarLayout({
   return (
     <AppShell variant="sidebar">
       <AppSidebar />
-      <AppContent variant="sidebar">
+      <AppContent variant="sidebar" className="overflow-x-hidden">
         <AppSidebarHeader breadcrumbs={breadcrumbs} />
         {children}
       </AppContent>
diff --git a/app/frontend/pages/dashboard/index.tsx b/app/frontend/pages/dashboard/index.tsx
@@ -16,7 +16,7 @@ export default function Dashboard() {
   return (
     <AppLayout breadcrumbs={breadcrumbs}>
       <Head title="Dashboard" />
-      <div className="flex h-full flex-1 flex-col gap-4 rounded-xl p-4">
+      <div className="flex h-full flex-1 flex-col gap-4 overflow-x-auto rounded-xl p-4">
         <div className="grid auto-rows-min gap-4 md:grid-cols-3">
           <div className="border-sidebar-border/70 dark:border-sidebar-border relative aspect-video overflow-hidden rounded-xl border">
             <PlaceholderPattern className="absolute inset-0 size-full stroke-neutral-900/20 dark:stroke-neutral-100/20" />

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ export function NavMain({ items = [] }: { items: NavItem[] }) {`
`19`	`19`	`<SidebarMenuItem key={item.title}>`
`20`	`20`	`<SidebarMenuButton`
`21`	`21`	`asChild`
`22`		`- isActive={item.href === page.url}`
	`22`	`+ isActive={page.url.startsWith(item.href)}`
`23`	`23`	`tooltip={{ children: item.title }}`
`24`	`24`	`>`
`25`	`25`	`<Link href={item.href} prefetch>`