Skip to content

Integrate billing popup, usage sidebar, and credit preview toggle #441

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ngoiyaeric wants to merge 6 commits into
base: fix/regressions-security-architecture-13947295106479740171
Choose a base branch
from
Open

Integrate billing popup, usage sidebar, and credit preview toggle #441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6eeae28
Integrate billing popup, usage sidebar, and credit preview toggle
CJWTRUST Jan 20, 2026
160e082
Recover lost commit 488b47c and restore branch head
google-labs-jules[bot] Jan 28, 2026
ae085cf
Merge pull request #456 from QueueLab/jules-16847885310673003402-db9c…
ngoiyaeric Jan 28, 2026
ca536e1
Merge branch 'fix/regressions-security-architecture-13947295106479740…
ngoiyaeric Feb 2, 2026
5383a14
Update layout.tsx
ngoiyaeric Feb 2, 2026
0f84bd6
Update chat.tsx
ngoiyaeric Feb 2, 2026
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
85 changes: 43 additions & 42 deletions app/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { Metadata, Viewport } from 'next'
import { Inter as FontSans, Poppins } from 'next/font/google'
import './globals.css'
import 'katex/dist/katex.min.css';
import 'katex/dist/katex.min.css'
import { cn } from '@/lib/utils'
import { ThemeProvider } from '@/components/theme-provider'
import Header from '@/components/header'
Expand All @@ -12,15 +12,18 @@ import { SpeedInsights } from "@vercel/speed-insights/next"
import { Toaster } from '@/components/ui/sonner'
import { MapToggleProvider } from '@/components/map-toggle-context'
import { ProfileToggleProvider } from '@/components/profile-toggle-context'
import { UsageToggleProvider } from '@/components/usage-toggle-context'
import { CalendarToggleProvider } from '@/components/calendar-toggle-context'
import { MapLoadingProvider } from '@/components/map-loading-context';
import ConditionalLottie from '@/components/conditional-lottie';
import { MapProvider } from '@/components/map/map-context'
import { HistoryToggleProvider } from '@/components/history-toggle-context'
import { HistorySidebar } from '@/components/history-sidebar'
import { MapLoadingProvider } from '@/components/map-loading-context'
import ConditionalLottie from '@/components/conditional-lottie'
import { MapProvider } from '@/components/map/map-context' // ← imported as MapProvider
import { getSupabaseUserAndSessionOnServer } from '@/lib/auth/get-current-user'
import { PurchaseCreditsPopup } from '@/components/credits/purchase-credits-popup';
import { CreditsProvider } from '@/components/credits/credits-provider';
import { PurchaseCreditsPopup } from '@/components/credits/purchase-credits-popup'
import { CreditsProvider } from '@/components/credits/credits-provider'

// Force dynamic rendering since we check auth with cookies
// Force dynamic rendering because we read cookies for auth
export const dynamic = 'force-dynamic'

const fontSans = FontSans({
Expand All @@ -35,8 +38,7 @@ const fontPoppins = Poppins({
})

const title = ''
const description =
'language to Maps'
const description = 'language to Maps'

export const metadata: Metadata = {
metadataBase: new URL('https://www.qcx.world'),
Expand Down Expand Up @@ -66,8 +68,7 @@ export default async function RootLayout({
}: Readonly<{
children: React.ReactNode
}>) {
// Check authentication and conditionally render the layout
const { user } = await getSupabaseUserAndSessionOnServer();
const { user } = await getSupabaseUserAndSessionOnServer()

return (
<html lang="en" suppressHydrationWarning>
Expand All @@ -78,37 +79,37 @@ export default async function RootLayout({
fontPoppins.variable
)}
>
<ThemeProvider
attribute="class"
defaultTheme="earth"
enableSystem
disableTransitionOnChange
themes={['light', 'dark', 'earth']}
>
{user ? (
<CalendarToggleProvider>
<MapToggleProvider>
<ProfileToggleProvider>
<MapProvider>
<MapLoadingProvider>
<CreditsProvider>
<Header />
<ConditionalLottie />
{children}
<Sidebar />
<PurchaseCreditsPopup />
</CreditsProvider>
<Footer />
<Toaster />
</MapLoadingProvider>
</MapProvider>
</ProfileToggleProvider>
</MapToggleProvider>
</CalendarToggleProvider>
) : (
children
)}
</ThemeProvider>
<CalendarToggleProvider>
<HistoryToggleProvider>
<MapToggleProvider>
<ProfileToggleProvider>
<UsageToggleProvider>
<ThemeProvider
attribute="class"
defaultTheme="earth"
enableSystem
disableTransitionOnChange
themes={['light', 'dark', 'earth']}
>
{/* Changed MapContextProvider → MapProvider */}
<MapProvider>
<MapLoadingProvider>
<Header />
<ConditionalLottie />
{children}
<Sidebar />
<HistorySidebar />
<Footer />
<Toaster />
</MapLoadingProvider>
</MapProvider>
</ThemeProvider>
</UsageToggleProvider>
</ProfileToggleProvider>
</MapToggleProvider>
</HistoryToggleProvider>
</CalendarToggleProvider>

<Analytics />
<SpeedInsights />
</body>
Expand Down
Loading