sepehr
ddb67ba9e5
- Unified localStorage key to 'theme-preference' across all components
- Fixed header.tsx using wrong localStorage key ('theme' instead of 'theme-preference')
- Added localStorage hybrid persistence for instant theme changes
- Removed router.refresh() which was causing stale data revert
- Replaced Blue theme with Sepia
- Consolidated auth() calls to prevent race conditions
- Updated UserSettingsData types to include all themes
82 lines
2.0 KiB
TypeScript
82 lines
2.0 KiB
TypeScript
import type { Metadata, Viewport } from "next";
|
|
import { Inter } from "next/font/google";
|
|
import "./globals.css";
|
|
import { Toaster } from "@/components/ui/toast";
|
|
import { SessionProviderWrapper } from "@/components/session-provider-wrapper";
|
|
|
|
const inter = Inter({
|
|
subsets: ["latin"],
|
|
});
|
|
|
|
export const metadata: Metadata = {
|
|
title: "Memento - Your Digital Notepad",
|
|
description: "A beautiful note-taking app inspired by Google Keep, built with Next.js 16",
|
|
manifest: "/manifest.json",
|
|
icons: {
|
|
icon: "/icons/icon-512.svg",
|
|
apple: "/icons/icon-512.svg",
|
|
},
|
|
appleWebApp: {
|
|
capable: true,
|
|
statusBarStyle: "default",
|
|
title: "Memento",
|
|
},
|
|
};
|
|
|
|
export const viewport: Viewport = {
|
|
themeColor: "#f59e0b",
|
|
};
|
|
|
|
export const dynamic = "force-dynamic";
|
|
|
|
import { getAISettings } from "@/app/actions/ai-settings";
|
|
import { getUserSettings } from "@/app/actions/user-settings";
|
|
import { ThemeInitializer } from "@/components/theme-initializer";
|
|
|
|
// ... existing imports
|
|
|
|
import { DebugTheme } from "@/components/debug-theme";
|
|
|
|
// ...
|
|
|
|
import { getThemeScript } from "@/lib/theme-script";
|
|
|
|
// ...
|
|
|
|
import { auth } from "@/auth";
|
|
|
|
export default async function RootLayout({
|
|
children,
|
|
}: Readonly<{
|
|
children: React.ReactNode;
|
|
}>) {
|
|
const session = await auth();
|
|
const userId = session?.user?.id;
|
|
|
|
// Fetch user settings server-side with optimized single session check
|
|
const [aiSettings, userSettings] = await Promise.all([
|
|
getAISettings(userId),
|
|
getUserSettings(userId)
|
|
])
|
|
|
|
console.log('[RootLayout] Auth user:', userId)
|
|
console.log('[RootLayout] Server fetched user settings:', userSettings)
|
|
|
|
return (
|
|
<html suppressHydrationWarning>
|
|
<body className={inter.className}>
|
|
<script
|
|
dangerouslySetInnerHTML={{
|
|
__html: getThemeScript(userSettings.theme),
|
|
}}
|
|
/>
|
|
<SessionProviderWrapper>
|
|
<ThemeInitializer theme={userSettings.theme} fontSize={aiSettings.fontSize} />
|
|
{children}
|
|
<Toaster />
|
|
</SessionProviderWrapper>
|
|
</body>
|
|
</html>
|
|
);
|
|
}
|