Merge branch 'main' into cloudflare

This commit is contained in:
hamster1963 2024-12-06 10:41:12 +08:00
commit 10c0a450f9
3 changed files with 11 additions and 8 deletions

BIN
bun.lockb

Binary file not shown.

View File

@ -12,6 +12,8 @@ import { cn, formatBytes, formatNezhaInfo } from "@/lib/utils";
import { useTranslations } from "next-intl"; import { useTranslations } from "next-intl";
import Link from "next/link"; import Link from "next/link";
import { Separator } from "./ui/separator";
export default function ServerCardInline({ export default function ServerCardInline({
serverInfo, serverInfo,
}: { }: {
@ -35,7 +37,7 @@ export default function ServerCardInline({
)} )}
> >
<section <section
className={cn("grid items-center gap-2 w-40")} className={cn("grid items-center gap-2 lg:w-36")}
style={{ gridTemplateColumns: "auto auto 1fr" }} style={{ gridTemplateColumns: "auto auto 1fr" }}
> >
<span className="h-2 w-2 shrink-0 rounded-full bg-green-500 self-center"></span> <span className="h-2 w-2 shrink-0 rounded-full bg-green-500 self-center"></span>
@ -47,7 +49,7 @@ export default function ServerCardInline({
> >
{showFlag ? <ServerFlag country_code={country_code} /> : null} {showFlag ? <ServerFlag country_code={country_code} /> : null}
</div> </div>
<div className="relative"> <div className="relative w-28">
<p <p
className={cn( className={cn(
"break-all font-bold tracking-tight", "break-all font-bold tracking-tight",
@ -58,6 +60,7 @@ export default function ServerCardInline({
</p> </p>
</div> </div>
</section> </section>
<Separator orientation="vertical" className="h-8 mx-0 ml-2" />
<div className="flex flex-col gap-2"> <div className="flex flex-col gap-2">
<section className={cn("grid grid-cols-9 items-center gap-3 flex-1")}> <section className={cn("grid grid-cols-9 items-center gap-3 flex-1")}>
<div <div
@ -161,7 +164,7 @@ export default function ServerCardInline({
> >
{showFlag ? <ServerFlag country_code={country_code} /> : null} {showFlag ? <ServerFlag country_code={country_code} /> : null}
</div> </div>
<div className="relative"> <div className="relative w-28">
<p <p
className={cn( className={cn(
"break-all font-bold tracking-tight", "break-all font-bold tracking-tight",

View File

@ -1,6 +1,6 @@
{ {
"name": "nezha-dash", "name": "nezha-dash",
"version": "1.7.0", "version": "1.7.1",
"private": true, "private": true,
"scripts": { "scripts": {
"dev": "next dev -p 3040", "dev": "next dev -p 3040",
@ -37,11 +37,11 @@
"framer-motion": "^12.0.0-alpha.2", "framer-motion": "^12.0.0-alpha.2",
"lucide-react": "^0.454.0", "lucide-react": "^0.454.0",
"luxon": "^3.5.0", "luxon": "^3.5.0",
"next": "^15.0.3", "next": "^15.0.4",
"next-auth": "^5.0.0-beta.25", "next-auth": "^5.0.0-beta.25",
"next-intl": "^3.25.3", "next-intl": "^3.25.3",
"next-runtime-env": "^3.2.2", "next-runtime-env": "^3.2.2",
"next-themes": "^0.4.3", "next-themes": "^0.4.4",
"react": "19.0.0-rc-02c0e824-20241028", "react": "19.0.0-rc-02c0e824-20241028",
"react-device-detect": "^2.2.3", "react-device-detect": "^2.2.3",
"react-dom": "19.0.0-rc-02c0e824-20241028", "react-dom": "19.0.0-rc-02c0e824-20241028",
@ -55,13 +55,13 @@
"typescript-eslint": "^8.17.0" "typescript-eslint": "^8.17.0"
}, },
"devDependencies": { "devDependencies": {
"@next/bundle-analyzer": "^15.0.3", "@next/bundle-analyzer": "^15.0.4",
"@tailwindcss/postcss": "^4.0.0-beta.5", "@tailwindcss/postcss": "^4.0.0-beta.5",
"@types/node": "^22.10.1", "@types/node": "^22.10.1",
"@types/react": "npm:types-react@19.0.0-rc.1", "@types/react": "npm:types-react@19.0.0-rc.1",
"@types/react-dom": "npm:types-react-dom@19.0.0-rc.1", "@types/react-dom": "npm:types-react-dom@19.0.0-rc.1",
"eslint": "^9.16.0", "eslint": "^9.16.0",
"eslint-config-next": "^15.0.3", "eslint-config-next": "^15.0.4",
"eslint-plugin-turbo": "^2.3.3", "eslint-plugin-turbo": "^2.3.3",
"eslint-plugin-unused-imports": "^4.1.4", "eslint-plugin-unused-imports": "^4.1.4",
"postcss": "^8.4.49", "postcss": "^8.4.49",