diff --git a/resources/js/Layouts/AuthenticatedLayout.tsx b/resources/js/Layouts/AuthenticatedLayout.tsx index 4f23bad..b9cb3aa 100644 --- a/resources/js/Layouts/AuthenticatedLayout.tsx +++ b/resources/js/Layouts/AuthenticatedLayout.tsx @@ -34,6 +34,7 @@ import { import { usePermission } from "@/hooks/usePermission"; import ApplicationLogo from "@/Components/ApplicationLogo"; import { generateLightestColor, generateLightColor, generateDarkColor, generateActiveColor } from "@/utils/colorUtils"; +import { PageProps } from "@/types/global"; interface MenuItem { id: string; @@ -51,9 +52,9 @@ export default function AuthenticatedLayout({ children: React.ReactNode, breadcrumbs?: BreadcrumbItemType[] }) { - const { url, props } = usePage(); - // @ts-ignore - const user = props.auth?.user || { name: 'Guest', username: 'guest' }; + const { url, props } = usePage(); + const branding = props.branding; + const user = props.auth?.user || { name: 'Guest', username: 'guest', roles: [], role_labels: [], permissions: [] }; const { can, canAny } = usePermission(); const [isCollapsed, setIsCollapsed] = useState(() => { if (typeof window !== "undefined") { @@ -331,16 +332,16 @@ export default function AuthenticatedLayout({
- + {/* Mobile Header -> Global Header */}