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 branch 'cloudflare' into cloudflare-dev

Browse Source
This commit is contained in:
hamster1963 2024-10-21 03:02:42 +08:00
commit f248869b35
17 changed files with 125 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.github/workflows/Deploy.yml vendored
View File

@ -30,13 +30,6 @@ jobs:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Login to AliYun Container Registry
uses: docker/login-action@v3
with:
registry: registry.cn-guangzhou.aliyuncs.com
username: ${{ secrets.ALI_USERNAME }}
password: ${{ secrets.ALI_TOKEN }}
- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@v5

4
.github/workflows/sync.yml vendored
View File

@ -25,8 +25,8 @@ jobs:
uses: aormsby/Fork-Sync-With-Upstream-action@v3.4
with:
upstream_sync_repo: hamster1963/nezha-dash
upstream_sync_branch: main
target_sync_branch: main
upstream_sync_branch: cloudflare
target_sync_branch: cloudflare
target_repo_token: ${{ secrets.GITHUB_TOKEN }} # automatically generated, no need to set
# Set test_mode true to run tests instead of the true action!!

16
README.md
View File

@ -8,15 +8,16 @@
| 一键部署到 Vercel-推荐 | Docker部署 | Cloudflare部署 | 如何更新？ |
| ----------------------------------------------------- | --------------------------------------------------------------- | ----------------------------------------------------------------------- | --------------------------------------------------------- |
| [部署简易教程](https://buycoffee.top/blog/tech/nezha) | [Docker 部署教程](https://buycoffee.top/blog/tech/nezha-docker) | [Cloudflare 部署教程](https://buycoffee.top/blog/tech/nezha-cloudflare) | [更新教程](https://buycoffee.top/blog/tech/nezha-upgrade) |
| [Vercel-demo](https://nezha-dash-ruddy.vercel.app) | [Docker-demo](https://nezha-docker.buycoffee.tech) | [Cloudflare-demo](https://nezha-cloudflare.buycoffee.tech) |
| [Vercel-demo](https://nezha-vercel.buycoffee.top) | [Docker-demo](https://nezha-docker.buycoffee.tech) | [Cloudflare-demo](https://nezha-cloudflare.buycoffee.tech) |
#### 环境变量
| 变量名 | 含义 | 示例 |
| ------------------------------ | -------------------------------- | ------------------------------------------------------------- |
| ------------------------------ | ------------------------ | ------------------------------------------------------------- |
| NezhaBaseUrl | nezha 面板地址 | http://120.x.x.x:8008 |
| NezhaAuth | nezha 面板 API Token | 5hAY3QX6Nl9B3Uxxxx26KMvOMyXS1Udi |
| DefaultLocale | 面板默认显示语言（代码参考下表） | **默认**：en |
| SitePassword | 页面密码 | 123456 |
| DefaultLocale | 面板默认显示语言 | **默认**：en [简中:zh 繁中:zh-t 英语:en 日语:ja] |
| ForceShowAllServers | 是否强制显示所有服务器 | **默认**：false |
| NEXT_PUBLIC_NezhaFetchInterval | 获取数据间隔（毫秒） | **默认**：2000 |
| NEXT_PUBLIC_ShowFlag | 是否显示旗帜 | **默认**：false |
@ -28,15 +29,6 @@
| NEXT_PUBLIC_CustomTitle | 自定义标题 | |
| NEXT_PUBLIC_CustomDescription | 自定义描述(无多语言支持) | |
#### 多语言支持
| 语言 | 代码 | 是否完成翻译 |
| -------- | ---- | ------------ |
| 简体中文 | zh | 是 |
| 繁体中文 | zh-t | 是 |
| 英语 | en | 是 |
| 日语 | ja | 是 |
![screen](/.github/shot-1.png)
![screen](/.github/shot-2.png)
![screen](/.github/shot-3.png)

6
app/[locale]/(main)/ClientComponents/ServerDetailChartClient.tsx
View File

@ -1,5 +1,7 @@
"use client";
import { ServerDetailChartLoading } from "@/app/[locale]/(main)/ClientComponents/ServerDetailLoading";
import { NezhaAPISafe } from "@/app/[locale]/types/nezha-api";
import AnimatedCircularProgressBar from "@/components/ui/animated-circular-progress-bar";
import { Card, CardContent } from "@/components/ui/card";
import { ChartConfig, ChartContainer } from "@/components/ui/chart";
@ -18,8 +20,6 @@ import {
} from "recharts";
import useSWR from "swr";
import { NezhaAPISafe } from "../../types/nezha-api";
type cpuChartData = {
timeStamp: string;
cpu: number;
@ -83,7 +83,7 @@ export default function ServerDetailChartClient({
</>
);
}
if (!data) return null;
if (!data) return <ServerDetailChartLoading />;
return (
<section className="grid md:grid-cols-2 lg:grid-cols-3 grid-cols-1 gap-3">

3
app/[locale]/(main)/ClientComponents/ServerDetailClient.tsx
View File

@ -1,5 +1,6 @@
"use client";
import { ServerDetailLoading } from "@/app/[locale]/(main)/ClientComponents/ServerDetailLoading";
import { NezhaAPISafe } from "@/app/[locale]/types/nezha-api";
import { BackIcon } from "@/components/Icon";
import { Badge } from "@/components/ui/badge";
@ -10,8 +11,6 @@ import { useLocale, useTranslations } from "next-intl";
import { useRouter } from "next/navigation";
import useSWR from "swr";
import ServerDetailLoading from "./ServerDetailLoading";
export default function ServerDetailClient({
server_id,
}: {

36
app/[locale]/(main)/ClientComponents/ServerDetailLoading.tsx
View File

@ -1,25 +1,11 @@
import { BackIcon } from "@/components/Icon";
import { Separator } from "@/components/ui/separator";
import { Skeleton } from "@/components/ui/skeleton";
import { useLocale } from "next-intl";
import { useRouter } from "next/navigation";
export default function ServerDetailLoading() {
const router = useRouter();
const locale = useLocale();
export function ServerDetailChartLoading() {
return (
<div>
<div
onClick={() => {
router.push(`/${locale}/`);
}}
className="flex flex-none cursor-pointer font-semibold leading-none items-center break-all tracking-tight gap-0.5 text-xl"
>
<BackIcon />
<Skeleton className="h-[20px] w-24 rounded-[5px] bg-muted-foreground/10 animate-none"></Skeleton>
</div>
<Skeleton className="flex flex-wrap gap-2 h-[100px] w-1/2 mt-3 rounded-[5px] bg-muted-foreground/10 animate-none"></Skeleton>
<Separator className="my-4" />
<section className="grid md:grid-cols-2 lg:grid-cols-3 grid-cols-1 gap-3">
<Skeleton className="h-[182px] w-full rounded-[5px] bg-muted-foreground/10 animate-none"></Skeleton>
<Skeleton className="h-[182px] w-full rounded-[5px] bg-muted-foreground/10 animate-none"></Skeleton>
@ -31,3 +17,23 @@ export default function ServerDetailLoading() {
</div>
);
}
export function ServerDetailLoading() {
const router = useRouter();
const locale = useLocale();
return (
<>
<div
onClick={() => {
router.push(`/${locale}/`);
}}
className="flex flex-none cursor-pointer font-semibold leading-none items-center break-all tracking-tight gap-0.5 text-xl"
>
<BackIcon />
<Skeleton className="h-[20px] w-24 rounded-[5px] bg-muted-foreground/10 animate-none"></Skeleton>
</div>
<Skeleton className="flex flex-wrap gap-2 h-[81px] w-1/2 mt-3 rounded-[5px] bg-muted-foreground/10 animate-none"></Skeleton>
</>
);
}

6
app/[locale]/(main)/header.tsx
View File

@ -3,6 +3,7 @@
import { LanguageSwitcher } from "@/components/LanguageSwitcher";
import { ModeToggle } from "@/components/ThemeSwitcher";
import { Separator } from "@/components/ui/separator";
import { Skeleton } from "@/components/ui/skeleton";
import getEnv from "@/lib/env-entry";
import { DateTime } from "luxon";
import { useTranslations } from "next-intl";
@ -20,7 +21,6 @@ function Header() {
const router = useRouter();
const locale = useLocale();
return (
<div className="mx-auto w-full max-w-5xl">
<section className="flex items-center justify-between">
@ -96,9 +96,9 @@ function Overview() {
<p className="text-sm font-medium opacity-50">
{t("p_2390-2457_wherethetimeis")}
</p>
{mouted && (
{mouted ? (
<p className="opacity-1 text-sm font-medium">{timeString}</p>
)}
) : <Skeleton className="h-[20px] w-[50px] rounded-[5px] bg-muted-foreground/10 animate-none"></Skeleton>}
</div>
</section>
);

15
app/[locale]/(main)/layout.tsx
View File

@ -1,20 +1,23 @@
import Footer from "@/app/[locale]/(main)/footer";
import Header from "@/app/[locale]/(main)/header";
import { auth } from "@/auth";
import { SignIn } from "@/components/sign-in";
import getEnv from "@/lib/env-entry";
import React from "react";
import { redirect } from "next/navigation";
import { getLocale } from "next-intl/server";
import React from "react";
type DashboardProps = {
children: React.ReactNode;
};
export default async function MainLayout({ children }: DashboardProps) {
const session = await auth()
const locale = await getLocale()
const session = await auth();
if (!session && getEnv("SITE_PASSWORD")) {
redirect(`/${locale}/login`);
if (!session && getEnv("SitePassword")) {
if (getEnv("CF_PAGES")) {
redirect("/api/auth/signin");
} else {
return <SignIn />;
}
}
return (

7
app/[locale]/layout.tsx
View File

@ -1,4 +1,5 @@
// @auto-i18n-check. Please do not delete the line.
import { auth } from "@/auth";
import { locales } from "@/i18n-metadata";
import getEnv from "@/lib/env-entry";
import { cn } from "@/lib/utils";
@ -13,7 +14,6 @@ import { Inter as FontSans } from "next/font/google";
import React from "react";
import "/node_modules/flag-icons/css/flag-icons.min.css";
import { auth } from "@/auth";
const fontSans = FontSans({
subsets: ["latin"],
@ -41,6 +41,11 @@ export const viewport: Viewport = {
userScalable: false,
};
// optimization: force static for vercel
export const dynamic = process.env.VERCEL ? "force-static" : "auto";
export const runtime = "edge";
export async function generateStaticParams() {
return locales.map((locale) => ({ locale }));
}

2
app/[locale]/not-found.tsx
View File

@ -2,7 +2,7 @@ import { useTranslations } from "next-intl";
import Image from "next/image";
import Link from "next/link";
export const runtime = 'edge';
export const runtime = "edge";
export default function NotFoundPage() {
const t = useTranslations("NotFoundPage");

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

@ -1,8 +1,10 @@
import { NezhaAPISafe } from "@/app/[locale]/types/nezha-api";
import { auth } from "@/auth";
import getEnv from "@/lib/env-entry";
import { GetServerDetail } from "@/lib/serverFetch";
import { NextResponse } from "next/server";
import { auth } from "@/auth"
import getEnv from "@/lib/env-entry";
export const runtime = 'edge';
export const dynamic = "force-dynamic";
export const runtime = 'edge';
@ -13,8 +15,7 @@ interface NezhaDataResponse {
}
export const GET = auth(async function GET(req) {
if (!req.auth && getEnv("SITE_PASSWORD")) {
if (!req.auth && getEnv("SitePassword")) {
return NextResponse.json({ message: "Not authenticated" }, { status: 401 });
}

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

@ -4,6 +4,8 @@ import getEnv from "@/lib/env-entry";
import { GetServerMonitor } from "@/lib/serverFetch";
import { NextResponse } from "next/server";
export const runtime = "edge";
export const dynamic = "force-dynamic";
export const runtime = 'edge';
@ -13,8 +15,7 @@ interface NezhaDataResponse {
}
export const GET = auth(async function GET(req) {
if (!req.auth && getEnv("SITE_PASSWORD")) {
if (!req.auth && getEnv("SitePassword")) {
return NextResponse.json({ message: "Not authenticated" }, { status: 401 });
}

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

@ -1,13 +1,12 @@
import { NezhaAPI, ServerApi } from "@/app/[locale]/types/nezha-api";
import { auth } from "@/auth";
import { MakeOptional } from "@/app/[locale]/types/utils";
import { auth } from "@/auth";
import getEnv from "@/lib/env-entry";
import { NextResponse } from "next/server";
export const dynamic = "force-dynamic";
export const runtime = 'edge';
export const runtime = "edge";
interface NezhaDataResponse {
error?: string;
@ -15,8 +14,7 @@ interface NezhaDataResponse {
}
export const GET = auth(async function GET(req) {
if (!req.auth && getEnv("SITE_PASSWORD")) {
if (!req.auth && getEnv("SitePassword")) {
return NextResponse.json({ message: "Not authenticated" }, { status: 401 });
}

15
auth.ts
View File

@ -1,6 +1,7 @@
import NextAuth from "next-auth"
import Credentials from "next-auth/providers/credentials"
import getEnv from "./lib/env-entry"
import NextAuth from "next-auth";
import Credentials from "next-auth/providers/credentials";
import getEnv from "./lib/env-entry";
export const { handlers, signIn, signOut, auth } = NextAuth({
secret: "this_is_nezha_dash_web_secret",
@ -10,11 +11,11 @@ export const { handlers, signIn, signOut, auth } = NextAuth({
password: {},
},
authorize: async (credentials) => {
if (credentials.password === getEnv("SITE_PASSWORD")) {
return { id: "0" }
if (credentials.password === getEnv("SitePassword")) {
return { id: "0" };
}
return null
return null;
},
}),
],
})
});

31
components/sign-in.tsx
View File

@ -1,21 +1,20 @@
import Footer from "@/app/[locale]/(main)/footer"
import Header from "@/app/[locale]/(main)/header"
import { signIn } from "@/auth"
import { useLocale } from "next-intl"
import { redirect } from "next/navigation"
import Footer from "@/app/[locale]/(main)/footer";
import Header from "@/app/[locale]/(main)/header";
import { signIn } from "@/auth";
import { useLocale } from "next-intl";
import { redirect } from "next/navigation";
export const runtime = 'edge';
export function SignIn() {
const locale = useLocale()
const locale = useLocale();
async function handleSubmit(formData: FormData) {
'use server'
"use server";
try {
await signIn("credentials", formData)
await signIn("credentials", formData);
} catch (error) {
redirect(`/${locale}`)
redirect(`/${locale}`);
}
}
@ -30,13 +29,19 @@ export function SignIn() {
<section className="flex flex-col items-start gap-2">
<label className="flex flex-col items-start gap-1 ">
<p className="text-base font-semibold">请输入页面密码</p>
<input className="px-1 border-[1px] rounded-[5px]" name="password" type="password" />
<input
className="px-1 border-[1px] rounded-[5px]"
name="password"
type="password"
/>
</label>
<button className=" px-1.5 py-0.5 w-fit text-sm font-semibold rounded-[8px] border bg-card hover:brightness-95 transition-all text-card-foreground shadow-lg shadow-neutral-200/40 dark:shadow-none">确认</button>
<button className=" px-1.5 py-0.5 w-fit text-sm font-semibold rounded-[8px] border bg-card hover:brightness-95 transition-all text-card-foreground shadow-lg shadow-neutral-200/40 dark:shadow-none">
确认
</button>
</section>
</form>
<Footer />
</main>
</div>
)
);
}

10
docker/docker-compose.yml.cn
View File

@ -1,10 +0,0 @@
version: "3"
services:
nezha-dash:
container_name: nezha-dash
image: registry.cn-guangzhou.aliyuncs.com/hamster-home/nezha-dash:latest
volumes:
- ./.env:/app/.env
restart: always
ports:
- "4123:3000"

2
next.config.mjs
View File

@ -25,7 +25,7 @@ const nextConfig = {
reactStrictMode: true,
experimental: {
serverActions: {
allowedOrigins: ['*'],
allowedOrigins: ["*"],
},
},
logging: {