root/nezha_dash
1
0
Fork 0
mirror of https://github.com/hamster1963/nezha-dash.git synced 2025-04-24 21:10:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #104 from hamster1963/fix-auth-cache

Browse Source 
fix:layout cache
This commit is contained in:
仓鼠 2024-11-06 16:12:20 +08:00 committed by GitHub
commit d3936ff307
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 36 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/(main)/layout.tsx
View File

@ -8,16 +8,24 @@ import React from "react";
type DashboardProps = { type DashboardProps = {
children: React.ReactNode; children: React.ReactNode;
}; };
export default async function MainLayout({ children }: DashboardProps) { export default function MainLayout({ children }: DashboardProps) {
const session = await auth();
return ( return (
<div className="flex min-h-screen w-full flex-col"> <div className="flex min-h-screen w-full flex-col">
<main className="flex min-h-[calc(100vh_-_theme(spacing.16))] flex-1 flex-col gap-4 bg-background p-4 md:p-10 md:pt-8"> <main className="flex min-h-[calc(100vh_-_theme(spacing.16))] flex-1 flex-col gap-4 bg-background p-4 md:p-10 md:pt-8">
<Header /> <Header />
{!session && getEnv("SitePassword") ? <SignIn /> : children} <AuthProtected>{children}</AuthProtected>
<Footer /> <Footer />
</main> </main>
</div> </div>
); );
} }
async function AuthProtected({ children }: DashboardProps) {
if (getEnv("SitePassword")) {
const session = await auth();
if (!session) {
return <SignIn />;
}
}
return children;
}

5
app/api/detail/route.ts
View File

@ -12,11 +12,12 @@ interface ResError extends Error {
} }
export async function GET(req: NextRequest) { export async function GET(req: NextRequest) {
if (getEnv("SitePassword")) {
const session = await auth(); const session = await auth();
if (!session) {
if (!session && getEnv("SitePassword")) {
redirect("/"); redirect("/");
} }
}
const { searchParams } = new URL(req.url); const { searchParams } = new URL(req.url);
const server_id = searchParams.get("server_id"); const server_id = searchParams.get("server_id");

6
app/api/monitor/route.ts
View File

@ -12,14 +12,16 @@ interface ResError extends Error {
} }
export async function GET(req: NextRequest) { export async function GET(req: NextRequest) {
if (getEnv("SitePassword")) {
const session = await auth(); const session = await auth();
if (!session) {
if (!session && getEnv("SitePassword")) {
redirect("/"); redirect("/");
} }
}
const { searchParams } = new URL(req.url); const { searchParams } = new URL(req.url);
const server_id = searchParams.get("server_id"); const server_id = searchParams.get("server_id");
if (!server_id) { if (!server_id) {
return NextResponse.json( return NextResponse.json(
{ error: "server_id is required" }, { error: "server_id is required" },

5
app/api/server/route.ts
View File

@ -12,11 +12,12 @@ interface ResError extends Error {
} }
export async function GET() { export async function GET() {
if (getEnv("SitePassword")) {
const session = await auth(); const session = await auth();
if (!session) {
if (!session && getEnv("SitePassword")) {
redirect("/"); redirect("/");
} }
}
try { try {
const data = await GetNezhaData(); const data = await GetNezhaData();

2
app/layout.tsx
View File

@ -48,7 +48,7 @@ export default async function LocaleLayout({
return ( return (
<html lang={locale} suppressHydrationWarning> <html lang={locale} suppressHydrationWarning>
<head> <head>
<PublicEnvScript /> {!process.env.VERCEL && !process.env.CF_PAGES && <PublicEnvScript />}
<link <link
rel="stylesheet" rel="stylesheet"
href="https://cdn.jsdelivr.net/gh/lipis/flag-icons@7.0.0/css/flag-icons.min.css" href="https://cdn.jsdelivr.net/gh/lipis/flag-icons@7.0.0/css/flag-icons.min.css"

4
lib/env-entry.ts
View File

@ -1,8 +1,12 @@
import { env } from "next-runtime-env"; import { env } from "next-runtime-env";
export default function getEnv(key: string) { export default function getEnv(key: string) {
if (process.env.VERCEL || process.env.CF_PAGES) {
return process.env[key];
} else {
if (key.startsWith("NEXT_PUBLIC_")) { if (key.startsWith("NEXT_PUBLIC_")) {
return env(key); return env(key);
} }
return process.env[key]; return process.env[key];
} }
}