0.3.1 UI修复

This commit is contained in:
liaibo
2026-01-18 19:01:31 +08:00
parent 90a38b48cf
commit 8a5b915002
86 changed files with 1160 additions and 2867 deletions
+5 -23
View File
@@ -1,10 +1,8 @@
import type { Metadata } from "next";
import { Inter } from "next/font/google";
import "./globals.css";
import { SupabaseProvider } from "@/components/providers/supabase-provider";
import { QueryProvider } from "@/components/providers/query-provider";
import { ConvexClientProvider } from "@/components/providers/convex-provider";
import { createSupabaseServerClient } from "@/lib/supabase/server";
import { getMnoteRuntimeConfig } from "@/lib/runtime-config";
import { isConvexEnabled } from "@/lib/convex/enabled";
import { ConvexAuthNextjsServerProvider } from "@convex-dev/auth/nextjs/server";
@@ -16,7 +14,7 @@ const inter = Inter({
export const metadata: Metadata = {
title: "Wolai Clone",
description: "Stage0 + Stage1 implementation powered by Supabase",
description: "Convex 自部署模式",
};
export default async function RootLayout({
@@ -27,16 +25,6 @@ export default async function RootLayout({
const isDesktop = process.env.MNOTE_DESKTOP === "1";
const useConvex = isConvexEnabled();
let session = null;
if (!useConvex) {
try {
session = (await (await createSupabaseServerClient()).auth.getSession()).data.session;
} catch {
// 说明:不阻塞页面渲染,交由客户端登录页处理(例如网络暂不可达)。
session = null;
}
}
const runtimeConfig = { ...getMnoteRuntimeConfig(), isDesktop, useConvex };
const runtimeConfigJson = JSON.stringify(runtimeConfig).replace(/</g, "\\u003cc");
@@ -52,17 +40,11 @@ export default async function RootLayout({
/>
</head>
<body className={`${inter.variable} antialiased`}>
{useConvex ? (
<ConvexAuthNextjsServerProvider>
<ConvexClientProvider>
<QueryProvider>{children}</QueryProvider>
</ConvexClientProvider>
</ConvexAuthNextjsServerProvider>
) : (
<SupabaseProvider session={session}>
<ConvexAuthNextjsServerProvider>
<ConvexClientProvider>
<QueryProvider>{children}</QueryProvider>
</SupabaseProvider>
)}
</ConvexClientProvider>
</ConvexAuthNextjsServerProvider>
</body>
</html>
);