Skip to content

Commit 63954fa

Browse files
committed
refactor: remove unnecessary QueryProvider wrapper and optimize layout structure
1 parent d396cea commit 63954fa

6 files changed

Lines changed: 21 additions & 22 deletions

File tree

frontend/app/(app)/layout.tsx

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { DashboardSidebar } from '@/components/dashboard-sidebar'
2-
import { QueryProvider } from '@/components/query-provider'
32
import { SidebarProvider } from '@/components/ui/sidebar'
43
import { Toaster } from '@/components/ui/sonner'
54
import { UnifiedFooter } from '@/components/unified-footer'
@@ -10,15 +9,13 @@ export default async function AppLayout({
109
}: Readonly<{ children: React.ReactNode }>) {
1110
await requireUser()
1211
return (
13-
<QueryProvider>
14-
<SidebarProvider>
15-
<DashboardSidebar />
16-
<main className="flex-1 flex flex-col min-h-screen">
17-
<div className="flex-1">{children}</div>
18-
<UnifiedFooter variant="app" />
19-
</main>
20-
</SidebarProvider>
12+
<SidebarProvider>
13+
<DashboardSidebar />
14+
<main className="flex-1 flex flex-col min-h-screen">
15+
<div className="flex-1">{children}</div>
16+
<UnifiedFooter variant="app" />
17+
</main>
2118
<Toaster />
22-
</QueryProvider>
19+
</SidebarProvider>
2320
)
2421
}

frontend/app/e/layout.tsx

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import type { Metadata } from 'next'
2-
import { QueryProvider } from '@/components/query-provider'
32

43
export const metadata: Metadata = {
54
title: 'Campus Life Events',
@@ -11,11 +10,5 @@ export default function PublicLayout({
1110
}: {
1211
children: React.ReactNode
1312
}) {
14-
return (
15-
<html lang="de">
16-
<body className="antialiased">
17-
<QueryProvider>{children}</QueryProvider>
18-
</body>
19-
</html>
20-
)
13+
return <>{children}</>
2114
}

frontend/app/layout.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import type { Metadata } from 'next'
22
import './globals.css'
3+
import { QueryProvider } from '@/components/query-provider'
34
import { ThemeProvider } from '@/components/theme-provider'
45

56
export const metadata: Metadata = {
@@ -36,7 +37,9 @@ export default function RootLayout({
3637
return (
3738
<html lang="de" suppressHydrationWarning>
3839
<body className="antialiased min-h-screen bg-background text-foreground">
39-
<ThemeProvider>{children}</ThemeProvider>
40+
<QueryProvider>
41+
<ThemeProvider>{children}</ThemeProvider>
42+
</QueryProvider>
4043
</body>
4144
</html>
4245
)

frontend/components/query-provider.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ export function QueryProvider({ children }: { children: React.ReactNode }) {
1111
defaultOptions: {
1212
queries: {
1313
staleTime: 60 * 1000,
14+
gcTime: 5 * 60 * 1000,
1415
retry: 1
1516
}
1617
}

frontend/components/unified-footer.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
'use client'
2+
13
import Link from 'next/link'
24
import { ThemeToggle } from '@/components/theme-toggle'
35

frontend/next.config.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,19 @@ const nextConfig: NextConfig = {
1313
},
1414
];
1515
}
16-
// In production, let ingress handle the API routing
1716
return [];
1817
},
1918
output: "standalone",
19+
cacheComponents: true,
2020
experimental: {
2121
webpackMemoryOptimizations: true,
22+
staleTimes: {
23+
dynamic: 30,
24+
static: 180,
25+
},
2226
},
23-
reactCompiler: true,
27+
reactCompiler: false,
2428
poweredByHeader: false,
25-
2629
};
2730

2831
export default nextConfig;

0 commit comments

Comments
 (0)