Show project nav on app pages (#171)

This commit is contained in:
Ben Senescu 2026-05-08 16:00:04 -04:00 committed by GitHub
parent 103b6fe91c
commit 2234cb54fc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -20,6 +20,7 @@ import { signOutAndRedirect, useSession } from "@/lib/auth-client";
import { isHostedClientAuthMode } from "@/lib/auth-mode"; import { isHostedClientAuthMode } from "@/lib/auth-mode";
import { BILLING_ROUTE } from "@/shared/billing"; import { BILLING_ROUTE } from "@/shared/billing";
import { getSeoApiKeyStatus } from "@/serverFunctions/config"; import { getSeoApiKeyStatus } from "@/serverFunctions/config";
import { getOrCreateDefaultProject } from "@/serverFunctions/projects";
const DATAFORSEO_HELP_PATH = "/help/dataforseo-api-key"; const DATAFORSEO_HELP_PATH = "/help/dataforseo-api-key";
const SUPPORT_PATH = "/support"; const SUPPORT_PATH = "/support";
@ -38,6 +39,12 @@ export function AuthenticatedAppLayout({
const setupModalRef = React.useRef<HTMLDivElement | null>(null); const setupModalRef = React.useRef<HTMLDivElement | null>(null);
const [showMissingSeoApiKeyModal, setShowMissingSeoApiKeyModal] = const [showMissingSeoApiKeyModal, setShowMissingSeoApiKeyModal] =
React.useState(false); React.useState(false);
const defaultProjectQuery = useQuery({
queryKey: ["defaultProject"],
queryFn: () => getOrCreateDefaultProject(),
enabled: !projectId,
});
const headerProjectId = projectId ?? defaultProjectQuery.data?.id ?? null;
const shouldCheckSeoApiKeyStatus = location.pathname !== BILLING_ROUTE; const shouldCheckSeoApiKeyStatus = location.pathname !== BILLING_ROUTE;
const seoApiKeyStatusQuery = useQuery({ const seoApiKeyStatusQuery = useQuery({
queryKey: ["seoApiKeyStatus"], queryKey: ["seoApiKeyStatus"],
@ -106,7 +113,7 @@ export function AuthenticatedAppLayout({
<div className="flex h-[100dvh] flex-col bg-base-200"> <div className="flex h-[100dvh] flex-col bg-base-200">
<TopNav <TopNav
drawerOpen={drawerOpen} drawerOpen={drawerOpen}
projectId={projectId ?? null} projectId={headerProjectId}
pathname={location.pathname} pathname={location.pathname}
onOpenDrawer={() => setDrawerOpen(true)} onOpenDrawer={() => setDrawerOpen(true)}
/> />
@ -120,7 +127,7 @@ export function AuthenticatedAppLayout({
<AppContent <AppContent
drawerOpen={drawerOpen} drawerOpen={drawerOpen}
projectId={projectId ?? null} projectId={headerProjectId}
onCloseDrawer={() => setDrawerOpen(false)} onCloseDrawer={() => setDrawerOpen(false)}
> >
{children} {children}