Merge branch 'main' into cloudflare

This commit is contained in:
hamster1963 2024-11-04 21:46:03 +08:00
commit c2579f0d98
4 changed files with 47 additions and 7 deletions

View File

@ -5,10 +5,9 @@
</div> </div>
| 一键部署到 Vercel-推荐 | Docker部署 | Cloudflare部署 | 如何更新? | | 一键部署到 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) | | [部署简易教程](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-vercel.buycoffee.top) | [Docker-demo](https://nezha-docker.buycoffee.tech) | [Cloudflare-demo](https://nezha-cloudflare.buycoffee.tech) [密码: nezhadash] |
#### Cloudflare 部署所需环境变量 #### Cloudflare 部署所需环境变量

View File

@ -0,0 +1,15 @@
{
"types": {
"feat": { "title": "🚀 Features" },
"fix": { "title": "🔧 Bug Fixes" },
"docs": { "title": "📚 Documentation" },
"style": { "title": "💄 Styles" },
"refactor": { "title": "🔨 Refactor" },
"perf": { "title": "🏎 Performance" },
"test": { "title": "🚨 Tests" },
"build": { "title": "🛠 Build" },
"ci": { "title": "👷 CI" },
"chore": { "title": "🛗 Chore" },
"revert": { "title": "⏪ Revert" }
}
}

View File

@ -16,7 +16,7 @@ export default function ServerCard({
}) { }) {
const t = useTranslations("ServerCard"); const t = useTranslations("ServerCard");
const router = useRouter(); const router = useRouter();
const { id, name, country_code, online, cpu, up, down, mem, stg } = const { id, name, country_code, online, cpu, up, down, mem, stg, tcp, udp } =
formatNezhaInfo(serverInfo); formatNezhaInfo(serverInfo);
const showFlag = getEnv("NEXT_PUBLIC_ShowFlag") === "true"; const showFlag = getEnv("NEXT_PUBLIC_ShowFlag") === "true";
@ -62,7 +62,11 @@ export default function ServerCard({
</div> </div>
</section> </section>
<div className="flex flex-col gap-2"> <div className="flex flex-col gap-2">
<section className={"grid grid-cols-5 items-center gap-3"}> <section
className={cn("grid grid-cols-5 items-center gap-3", {
"lg:grid-cols-7": fixedTopServerName,
})}
>
<div className={"flex w-14 flex-col"}> <div className={"flex w-14 flex-col"}>
<p className="text-xs text-muted-foreground">{t("CPU")}</p> <p className="text-xs text-muted-foreground">{t("CPU")}</p>
<div className="flex items-center text-xs font-semibold"> <div className="flex items-center text-xs font-semibold">
@ -100,6 +104,28 @@ export default function ServerCard({
: `${down.toFixed(2)}M/s`} : `${down.toFixed(2)}M/s`}
</div> </div>
</div> </div>
{fixedTopServerName && (
<div className={" w-14 flex-col hidden lg:flex"}>
<p className="text-xs text-muted-foreground">TCP</p>
<div className="flex items-center text-xs font-semibold gap-1">
<span className="relative inline-flex size-1.5 rounded-full bg-[hsl(var(--chart-1))]"></span>
<div className="flex items-center text-xs font-semibold">
{tcp}
</div>
</div>
</div>
)}
{fixedTopServerName && (
<div className={"w-14 flex-col hidden lg:flex"}>
<p className="text-xs text-muted-foreground">UDP</p>
<div className="flex items-center text-xs font-semibold gap-1">
<span className="relative inline-flex size-1.5 rounded-full bg-[hsl(var(--chart-4))]"></span>
<div className="flex items-center text-xs font-semibold">
{udp}
</div>
</div>
</div>
)}
</section> </section>
{showNetTransfer && ( {showNetTransfer && (
<section <section

View File

@ -1,6 +1,6 @@
{ {
"name": "nezha-dash", "name": "nezha-dash",
"version": "1.2.1", "version": "1.2.3",
"private": true, "private": true,
"scripts": { "scripts": {
"dev": "next dev -p 3020", "dev": "next dev -p 3020",