Buriburizaemon/admin-frontend-domain
1
0
Fork 0
mirror of https://github.com/Buriburizaem0n/admin-frontend-domain.git synced 2026-05-06 13:48:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: enhance public notes functionality with flexible options (#141)

Browse Source 
* feat: enhance public notes functionality with flexible options

- Make public notes optional to prevent default values causing frontend issues
- Add dual editing modes: raw text editing and custom fields (avoid hardcoded schema)
- Set raw text mode as default, populate input on edit, submit raw text content always
- Add toggle switch: submit raw text when enabled, submit empty & hide controls when disabled
- New records default to disabled public notes; auto-expand on edit based on content

* chore: auto-fix linting and formatting issues

* feat: Add public annotation data structure and utility functions

Implemented Zod validation patterns, default values, parsing functions, and utility functions for public notes, and updated related internationalization text.

* chore: auto-fix linting and formatting issues

* refactor(server): Replace i18n implementation

Replace direct use of i18n.t with react-i18next's useTranslation hook to improve internationalization support.

* refactor(public-note): Optimize data model and validation logic

Removed the pruneEmpty function and simplified the date processing logic, making billingDataMod and planDataMod optional fields. Also optimized the validation logic to handle optional fields.

* chore: auto-fix linting and formatting issues

* fix zod validation & don't write empty values when parsing

* use raw mode if object contains unknown fields

* rename some features

* chore: Update dependency package versions

Upgrade multiple npm dependencies to their latest versions, including react, tailwindcss, and eslint. Ignore lock files.

* fix(server): Fix default value when bill amount is undefined

Changed undefined values ​​for bill amount to the default value "0" to avoid potential null value errors.

---------

Co-authored-by: Guccen <171530509+Chillln@users.noreply.github.com>
Co-authored-by: uubulb <uub@suwako.de>
This commit is contained in:
Chillln
2025-10-09 09:35:13 +08:00
committed by GitHub
parent ec6511bcb8
commit e783692ac9
36 changed files with 1087 additions and 851 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+2
View File
@@ -22,3 +22,5 @@ dist-ssr
*.njsproj *.njsproj
*.sln *.sln
*.sw? *.sw?
bun.lock
pnpm-lock.yaml
package.json
+21 -21
View File
@@ -28,7 +28,7 @@
"@radix-ui/react-slot": "^1.2.3", "@radix-ui/react-slot": "^1.2.3",
"@radix-ui/react-switch": "^1.2.6", "@radix-ui/react-switch": "^1.2.6",
"@radix-ui/react-tabs": "^1.1.13", "@radix-ui/react-tabs": "^1.1.13",
"@tailwindcss/postcss": "^4.1.13", "@tailwindcss/postcss": "^4.1.14",
"@tanstack/react-table": "^8.21.3", "@tanstack/react-table": "^8.21.3",
"@trivago/prettier-plugin-sort-imports": "^5.2.2", "@trivago/prettier-plugin-sort-imports": "^5.2.2",
"@types/luxon": "^3.7.1", "@types/luxon": "^3.7.1",
@@ -41,44 +41,44 @@
"copy-to-clipboard": "^3.3.3", "copy-to-clipboard": "^3.3.3",
"date-fns": "^4.1.0", "date-fns": "^4.1.0",
"framer-motion": "^12.23.22", "framer-motion": "^12.23.22",
"i18next": "^25.5.2", "i18next": "^25.5.3",
"i18next-browser-languagedetector": "^8.2.0", "i18next-browser-languagedetector": "^8.2.0",
"jotai-zustand": "^0.6.0", "jotai-zustand": "^0.6.0",
"lucide-react": "^0.544.0", "lucide-react": "^0.545.0",
"luxon": "^3.7.2", "luxon": "^3.7.2",
"next-themes": "^0.4.6", "next-themes": "^0.4.6",
"prettier-plugin-tailwindcss": "^0.6.14", "prettier-plugin-tailwindcss": "^0.6.14",
"react": "^19.1.1", "react": "^19.2.0",
"react-day-picker": "^9.11.0", "react-day-picker": "^9.11.1",
"react-dom": "^19.1.1", "react-dom": "^19.2.0",
"react-hook-form": "^7.63.0", "react-hook-form": "^7.64.0",
"react-i18next": "^16.0.0", "react-i18next": "^16.0.0",
"react-router-dom": "^7.9.3", "react-router-dom": "^7.9.4",
"react-virtuoso": "^4.14.1", "react-virtuoso": "^4.14.1",
"sonner": "^2.0.7", "sonner": "^2.0.7",
"swr": "^2.3.6", "swr": "^2.3.6",
"tailwind-merge": "^3.3.1", "tailwind-merge": "^3.3.1",
"tailwindcss-animate": "^1.0.7", "tailwindcss-animate": "^1.0.7",
"vaul": "^1.1.2", "vaul": "^1.1.2",
"zod": "^4.1.11", "zod": "^4.1.12",
"zustand": "^5.0.8" "zustand": "^5.0.8"
}, },
"devDependencies": { "devDependencies": {
"@eslint/js": "^9.36.0", "@eslint/js": "^9.37.0",
"@types/node": "^24.5.2", "@types/node": "^24.7.0",
"@types/react": "^19.1.15", "@types/react": "^19.2.2",
"@types/react-dom": "^19.1.9", "@types/react-dom": "^19.2.1",
"@vitejs/plugin-react": "^5.0.4", "@vitejs/plugin-react": "^5.0.4",
"autoprefixer": "^10.4.21", "autoprefixer": "^10.4.21",
"eslint": "^9.36.0", "eslint": "^9.37.0",
"eslint-plugin-react-hooks": "^5.2.0", "eslint-plugin-react-hooks": "^7.0.0",
"eslint-plugin-react-refresh": "^0.4.22", "eslint-plugin-react-refresh": "^0.4.23",
"globals": "^16.4.0", "globals": "^16.4.0",
"postcss": "^8.5.6", "postcss": "^8.5.6",
"swagger-typescript-api": "^13.2.13", "swagger-typescript-api": "^13.2.15",
"tailwindcss": "^4.1.13", "tailwindcss": "^4.1.14",
"typescript": "~5.9.2", "typescript": "~5.9.3",
"typescript-eslint": "^8.44.1", "typescript-eslint": "^8.46.0",
"vite": "^7.1.7" "vite": "^7.1.9"
} }
} }
src/components/server.tsx
+352 -332
View File
@@ -34,10 +34,22 @@ import {
import { Switch } from "@/components/ui/switch" import { Switch } from "@/components/ui/switch"
import { Textarea } from "@/components/ui/textarea" import { Textarea } from "@/components/ui/textarea"
import { IconButton } from "@/components/xui/icon-button" import { IconButton } from "@/components/xui/icon-button"
import {
type PublicNote,
PublicNoteSchema,
applyPublicNoteDate,
applyPublicNotePatch,
detectPublicNoteMode,
normalizeISO,
parsePublicNote,
toggleEndNoExpiry,
validatePublicNote,
} from "@/lib/public-note"
import { conv } from "@/lib/utils" import { conv } from "@/lib/utils"
import { asOptionalField } from "@/lib/utils" import { asOptionalField } from "@/lib/utils"
import { ModelServer } from "@/types" import { ModelServer } from "@/types"
import { zodResolver } from "@hookform/resolvers/zod" import { zodResolver } from "@hookform/resolvers/zod"
import { HelpCircle } from "lucide-react"
import { useState } from "react" import { useState } from "react"
import { useForm } from "react-hook-form" import { useForm } from "react-hook-form"
import { useTranslation } from "react-i18next" import { useTranslation } from "react-i18next"
@@ -53,7 +65,22 @@ interface ServerCardProps {
const serverFormSchema = z.object({ const serverFormSchema = z.object({
name: z.string().min(1), name: z.string().min(1),
note: asOptionalField(z.string()), note: asOptionalField(z.string()),
public_note: asOptionalField(z.string()), public_note: asOptionalField(
z.string().refine(
(val) => {
const s = (val ?? "").trim()
if (s.length === 0) return true
try {
const obj = JSON.parse(s)
return PublicNoteSchema.safeParse(obj).success
} catch {
// skip check if not JSON
return true
}
},
{ message: "Invalid Public Note JSON" },
),
),
display_index: z.coerce.number().int(), display_index: z.coerce.number().int(),
hide_for_guest: asOptionalField(z.boolean()), hide_for_guest: asOptionalField(z.boolean()),
enable_ddns: asOptionalField(z.boolean()), enable_ddns: asOptionalField(z.boolean()),
@@ -95,71 +122,6 @@ export const ServerCard: React.FC<ServerCardProps> = ({ data, mutate }) => {
const [open, setOpen] = useState(false) const [open, setOpen] = useState(false)
type PublicNote = {
billingDataMod: {
startDate: string
endDate: string
autoRenewal: string
cycle: string
amount: string
}
planDataMod: {
bandwidth: string
trafficVol: string
trafficType: string
IPv4: string
IPv6: string
networkRoute: string
extra: string
}
}
const defaultPublicNote: PublicNote = {
billingDataMod: {
startDate: "",
endDate: "",
autoRenewal: "",
cycle: "",
amount: "",
},
planDataMod: {
bandwidth: "",
trafficVol: "",
trafficType: "",
IPv4: "0",
IPv6: "0",
networkRoute: "",
extra: "",
},
}
const parsePublicNote = (s?: string): PublicNote => {
if (!s) return defaultPublicNote
try {
const obj = JSON.parse(s)
return {
billingDataMod: {
startDate: obj?.billingDataMod?.startDate ?? "",
endDate: obj?.billingDataMod?.endDate ?? "",
autoRenewal: obj?.billingDataMod?.autoRenewal ?? "",
cycle: obj?.billingDataMod?.cycle ?? "",
amount: obj?.billingDataMod?.amount ?? "",
},
planDataMod: {
bandwidth: obj?.planDataMod?.bandwidth ?? "",
trafficVol: obj?.planDataMod?.trafficVol ?? "",
trafficType: obj?.planDataMod?.trafficType ?? "",
IPv4: obj?.planDataMod?.IPv4 === "1" ? "1" : "0",
IPv6: obj?.planDataMod?.IPv6 === "1" ? "1" : "0",
networkRoute: obj?.planDataMod?.networkRoute ?? "",
extra: obj?.planDataMod?.extra ?? "",
},
}
} catch {
return defaultPublicNote
}
}
const [publicNoteObj, setPublicNoteObj] = useState<PublicNote>( const [publicNoteObj, setPublicNoteObj] = useState<PublicNote>(
parsePublicNote(data?.public_note), parsePublicNote(data?.public_note),
) )
@@ -182,41 +144,22 @@ export const ServerCard: React.FC<ServerCardProps> = ({ data, mutate }) => {
> >
>({}) >({})
const isValidISOLike = (v: string) => { const [publicNoteMode, setPublicNoteMode] = useState<"structured" | "raw">(
if (!v) return true detectPublicNoteMode(data?.public_note),
// special marker for "no expiry" )
if (v === "0000-00-00T23:59:59+08:00") return true const [publicNoteRaw, setPublicNoteRaw] = useState<string>(data?.public_note ?? "")
const d = new Date(v)
return !isNaN(d.getTime())
}
const validatePublicNote = (pn: PublicNote) => { const patchPublicNote = (path: string, value: string | undefined) => {
const errs: Partial<Record<string, string>> = {} setPublicNoteObj((prev) => applyPublicNotePatch(prev, path, value))
if (pn.billingDataMod.startDate && !isValidISOLike(pn.billingDataMod.startDate)) {
errs["billing.startDate"] = t("Validation.InvalidDate")
} }
if (pn.billingDataMod.endDate && !isValidISOLike(pn.billingDataMod.endDate)) { const patchPublicNoteDate = (
errs["billing.endDate"] = t("Validation.InvalidDate") path: "billingDataMod.startDate" | "billingDataMod.endDate",
d: Date,
) => {
setPublicNoteObj((prev) => applyPublicNoteDate(prev, path, d))
} }
if (pn.billingDataMod.autoRenewal && !/^(0|1)$/.test(pn.billingDataMod.autoRenewal)) { const toggleEndNoExpiryLocal = () => {
errs["billing.autoRenewal"] = t("Validation.MustBe0Or1") setPublicNoteObj((prev) => toggleEndNoExpiry(prev))
}
if (pn.billingDataMod.cycle && !/^(Day|Week|Month|Year)$/i.test(pn.billingDataMod.cycle)) {
errs["billing.cycle"] = t("Validation.MustBeDayWeekMonthYear")
}
// amount 允许任意非空字符串或空
if (pn.planDataMod.trafficType && !/^(1|2)$/.test(pn.planDataMod.trafficType)) {
errs["plan.trafficType"] = t("Validation.MustBe1Or2")
}
if (!/^(0|1)$/.test(pn.planDataMod.IPv4)) {
errs["plan.IPv4"] = t("Validation.MustBe0Or1")
}
if (!/^(0|1)$/.test(pn.planDataMod.IPv6)) {
errs["plan.IPv6"] = t("Validation.MustBe0Or1")
}
return { errors: errs, valid: Object.keys(errs).length === 0 }
} }
const onSubmit = async (values: any) => { const onSubmit = async (values: any) => {
@@ -228,7 +171,14 @@ export const ServerCard: React.FC<ServerCardProps> = ({ data, mutate }) => {
? JSON.parse(values.override_ddns_domains_raw) ? JSON.parse(values.override_ddns_domains_raw)
: undefined : undefined
// validate structured fields if (publicNoteMode === "raw") {
const raw = (publicNoteRaw ?? "").trim()
if (raw.length === 0) {
values.public_note = undefined
} else {
values.public_note = raw
}
} else {
const { errors, valid } = validatePublicNote(publicNoteObj) const { errors, valid } = validatePublicNote(publicNoteObj)
if (!valid) { if (!valid) {
setPublicNoteErrors(errors) setPublicNoteErrors(errors)
@@ -237,26 +187,20 @@ export const ServerCard: React.FC<ServerCardProps> = ({ data, mutate }) => {
} }
setPublicNoteErrors({}) setPublicNoteErrors({})
// normalize datetime-local to ISO string if provided const bd = publicNoteObj.billingDataMod
const normalizeISO = (v: string) => { const pd = publicNoteObj.planDataMod
if (!v) return v
// keep special "no expiry" value as-is
if (v === "0000-00-00T23:59:59+08:00") return v
const date = new Date(v)
return isNaN(date.getTime()) ? v : date.toISOString()
}
const pnNormalized: PublicNote = { const pnNormalized: PublicNote = {
billingDataMod: { billingDataMod: bd && {
...publicNoteObj.billingDataMod, ...bd,
startDate: normalizeISO(publicNoteObj.billingDataMod.startDate), startDate: normalizeISO(bd.startDate),
endDate: normalizeISO(publicNoteObj.billingDataMod.endDate), endDate: normalizeISO(bd.endDate),
// keep others as-is
}, },
planDataMod: { ...publicNoteObj.planDataMod }, planDataMod: pd,
}
const jsonStr = JSON.stringify(pnNormalized)
values.public_note = jsonStr.length > 2 ? jsonStr : undefined
} }
// serialize structured public note back to JSON string
values.public_note = JSON.stringify(pnNormalized)
await updateServer(data!.id!, values) await updateServer(data!.id!, values)
} catch (e) { } catch (e) {
console.error(e) console.error(e)
@@ -404,15 +348,72 @@ export const ServerCard: React.FC<ServerCardProps> = ({ data, mutate }) => {
</FormItem> </FormItem>
)} )}
/> />
{/* Structured Public Note fields */} {/* Public Note controls (optional + dual mode) */}
<div className="space-y-3"> <div className="space-y-3">
<div className="space-y-1"> <div className="space-y-1">
<FormLabel>{t("Public") + t("Note")}</FormLabel> <div className="flex items-center justify-between">
<p className="text-xs text-muted-foreground"> <div className="flex items-center gap-2">
{t("PublicNote.DropdownHint")} <FormLabel>{t("PublicNote.Label")}</FormLabel>
</p> <a
href="https://nezha.wiki/guide/servers.html#%E5%85%AC%E5%BC%80%E5%A4%87%E6%B3%A8%E8%AE%BE%E7%BD%AE"
target="_blank"
rel="noopener noreferrer"
className="inline-flex items-center text-muted-foreground hover:text-foreground"
>
<HelpCircle className="h-4 w-4" />
</a>
</div>
</div>
</div> </div>
{/* Toggle: when disabled, hide edit controls and submit an empty value */}
<div className="flex items-center gap-4">
{/* Mode switch: Raw text / Custom fields */}
<div className="flex items-center gap-2">
{/* Show 'structured' first, then 'raw' */}
<Button
type="button"
variant={
publicNoteMode === "structured"
? "default"
: "outline"
}
className="text-xs h-7"
onClick={() => {
setPublicNoteMode("structured")
setPublicNoteObj(parsePublicNote(publicNoteRaw))
}}
>
{t("PublicNote.CustomFields")}
</Button>
<Button
type="button"
variant={
publicNoteMode === "raw" ? "default" : "outline"
}
className="text-xs h-7"
onClick={() => setPublicNoteMode("raw")}
>
{t("PublicNote.RawText")}
</Button>
</div>
</div>
{/* Raw text mode: shown by default; submission uses this string */}
{publicNoteMode === "raw" && (
<div>
<Textarea
className="resize-y"
value={publicNoteRaw}
onChange={(e) => setPublicNoteRaw(e.target.value)}
rows={10}
/>
</div>
)}
{/* Custom fields mode: keep structured editing; serialize to string on submit */}
{publicNoteMode === "structured" && (
<>
<div className="rounded-md border p-3 space-y-3"> <div className="rounded-md border p-3 space-y-3">
<div className="text-sm font-medium opacity-80"> <div className="text-sm font-medium opacity-80">
{t("PublicNote.Billing")} {t("PublicNote.Billing")}
@@ -422,15 +423,30 @@ export const ServerCard: React.FC<ServerCardProps> = ({ data, mutate }) => {
<Label className="text-xs"> <Label className="text-xs">
{t("PublicNote.StartDate")} {t("PublicNote.StartDate")}
</Label> </Label>
{/* Add 'Clear' button to allow removing the date */}
<Button
type="button"
variant="outline"
className="text-xs px-2 py-0 h-auto bg-gray-200 dark:bg-gray-700 ml-2"
onClick={() =>
patchPublicNote(
"billingDataMod.startDate",
undefined,
)
}
>
{t("PublicNote.ClearDate") ?? "Clear"}
</Button>
<Popover> <Popover>
<PopoverTrigger asChild> <PopoverTrigger asChild>
<Button <Button
variant="outline" variant="outline"
className="w-full justify-start text-left font-normal" className="w-full justify-start text-left font-normal"
> >
{publicNoteObj.billingDataMod.startDate {publicNoteObj.billingDataMod
?.startDate
? new Date( ? new Date(
publicNoteObj.billingDataMod.startDate, publicNoteObj.billingDataMod!.startDate!,
).toLocaleDateString() ).toLocaleDateString()
: "YYYY-MM-DD"} : "YYYY-MM-DD"}
</Button> </Button>
@@ -444,47 +460,27 @@ export const ServerCard: React.FC<ServerCardProps> = ({ data, mutate }) => {
className="w-full min-h-[320px]" className="w-full min-h-[320px]"
mode="single" mode="single"
captionLayout="dropdown" captionLayout="dropdown"
startMonth={new Date(2000, 0)} startMonth={
endMonth={new Date(2050, 11)} new Date(2000, 0)
}
endMonth={
new Date(2050, 11)
}
selected={ selected={
publicNoteObj.billingDataMod publicNoteObj
.startDate .billingDataMod
?.startDate
? new Date( ? new Date(
publicNoteObj.billingDataMod.startDate, publicNoteObj.billingDataMod!.startDate!,
) )
: undefined : undefined
} }
onSelect={(d) => { onSelect={(d) => {
if (!d) return if (!d) return
setPublicNoteObj((prev) => { patchPublicNoteDate(
const prevDateStr = "billingDataMod.startDate",
prev.billingDataMod d,
.startDate
if (prevDateStr) {
const pd = new Date(
prevDateStr,
) )
// 仅在有效日期时复制时分秒
if (
!isNaN(pd.getTime())
) {
d.setHours(
pd.getHours(),
pd.getMinutes(),
pd.getSeconds(),
0,
)
}
}
return {
...prev,
billingDataMod: {
...prev.billingDataMod,
startDate:
d.toISOString(),
},
}
})
}} }}
autoFocus autoFocus
/> />
@@ -493,7 +489,11 @@ export const ServerCard: React.FC<ServerCardProps> = ({ data, mutate }) => {
</Popover> </Popover>
{publicNoteErrors["billing.startDate"] && ( {publicNoteErrors["billing.startDate"] && (
<p className="text-xs text-destructive mt-1"> <p className="text-xs text-destructive mt-1">
{publicNoteErrors["billing.startDate"]} {
publicNoteErrors[
"billing.startDate"
]
}
</p> </p>
)} )}
</div> </div>
@@ -506,26 +506,29 @@ export const ServerCard: React.FC<ServerCardProps> = ({ data, mutate }) => {
type="button" type="button"
variant="outline" variant="outline"
className="text-xs px-2 py-0 h-auto bg-gray-200 dark:bg-gray-700" className="text-xs px-2 py-0 h-auto bg-gray-200 dark:bg-gray-700"
onClick={() => onClick={toggleEndNoExpiryLocal}
setPublicNoteObj((prev) => ({
...prev,
billingDataMod: {
...prev.billingDataMod,
endDate:
prev.billingDataMod
.endDate ===
"0000-00-00T23:59:59+08:00"
? ""
: "0000-00-00T23:59:59+08:00",
},
}))
}
> >
{publicNoteObj.billingDataMod.endDate === {publicNoteObj.billingDataMod
?.endDate ===
"0000-00-00T23:59:59+08:00" "0000-00-00T23:59:59+08:00"
? t("PublicNote.CancelNoExpiry") ? t("PublicNote.CancelNoExpiry")
: t("PublicNote.SetNoExpiry")} : t("PublicNote.SetNoExpiry")}
</Button> </Button>
{/* Add 'Clear' button to allow removing the date */}
<Button
type="button"
variant="outline"
className="text-xs px-2 py-0 h-auto bg-gray-200 dark:bg-gray-700"
onClick={() =>
patchPublicNote(
"billingDataMod.endDate",
undefined,
)
}
>
{t("PublicNote.ClearDate") ??
"Clear"}
</Button>
</div> </div>
<Popover> <Popover>
<PopoverTrigger asChild> <PopoverTrigger asChild>
@@ -533,13 +536,19 @@ export const ServerCard: React.FC<ServerCardProps> = ({ data, mutate }) => {
variant="outline" variant="outline"
className="w-full justify-start text-left font-normal" className="w-full justify-start text-left font-normal"
> >
{publicNoteObj.billingDataMod.endDate {publicNoteObj.billingDataMod
? publicNoteObj.billingDataMod ?.endDate
.endDate === ? publicNoteObj
.billingDataMod
?.endDate ===
"0000-00-00T23:59:59+08:00" "0000-00-00T23:59:59+08:00"
? t("PublicNote.NoExpiry") ? t(
"PublicNote.NoExpiry",
)
: new Date( : new Date(
publicNoteObj.billingDataMod.endDate, publicNoteObj
.billingDataMod
?.endDate as string,
).toLocaleDateString() ).toLocaleDateString()
: "YYYY-MM-DD"} : "YYYY-MM-DD"}
</Button> </Button>
@@ -553,50 +562,33 @@ export const ServerCard: React.FC<ServerCardProps> = ({ data, mutate }) => {
className="w-full min-h-[320px]" className="w-full min-h-[320px]"
mode="single" mode="single"
captionLayout="dropdown" captionLayout="dropdown"
startMonth={new Date(2000, 0)} startMonth={
endMonth={new Date(2050, 11)} new Date(2000, 0)
}
endMonth={
new Date(2050, 11)
}
selected={ selected={
publicNoteObj.billingDataMod publicNoteObj
.endDate && .billingDataMod
publicNoteObj.billingDataMod ?.endDate &&
.endDate !== publicNoteObj
.billingDataMod
?.endDate !==
"0000-00-00T23:59:59+08:00" "0000-00-00T23:59:59+08:00"
? new Date( ? new Date(
publicNoteObj.billingDataMod.endDate, publicNoteObj
.billingDataMod
?.endDate as string,
) )
: undefined : undefined
} }
onSelect={(d) => { onSelect={(d) => {
if (!d) return if (!d) return
setPublicNoteObj((prev) => { patchPublicNoteDate(
const prevDateStr = "billingDataMod.endDate",
prev.billingDataMod d,
.endDate
if (prevDateStr) {
const pd = new Date(
prevDateStr,
) )
// 仅在有效日期时复制时分秒（特殊“不过期”值不会影响）
if (
!isNaN(pd.getTime())
) {
d.setHours(
pd.getHours(),
pd.getMinutes(),
pd.getSeconds(),
0,
)
}
}
return {
...prev,
billingDataMod: {
...prev.billingDataMod,
endDate:
d.toISOString(),
},
}
})
}} }}
autoFocus autoFocus
/> />
@@ -606,64 +598,81 @@ export const ServerCard: React.FC<ServerCardProps> = ({ data, mutate }) => {
{publicNoteErrors["billing.endDate"] && ( {publicNoteErrors["billing.endDate"] && (
<p className="text-xs text-destructive mt-1"> <p className="text-xs text-destructive mt-1">
{publicNoteErrors["billing.endDate"]} {
publicNoteErrors[
"billing.endDate"
]
}
</p> </p>
)} )}
</div> </div>
<div className="space-y-1"> <div className="space-y-1">
<div className="flex items-center gap-2">
<Label className="text-xs"> <Label className="text-xs">
{t("PublicNote.AutoRenewal")} {t("PublicNote.AutoRenewal")}
</Label> </Label>
<Select </div>
onValueChange={(val) => <div className="flex items-center gap-2 mt-3">
setPublicNoteObj((prev) => ({ <span className="text-xs">
...prev,
billingDataMod: {
...prev.billingDataMod,
autoRenewal: val,
},
}))
}
defaultValue={
publicNoteObj.billingDataMod.autoRenewal ||
"0"
}
>
<SelectTrigger>
<SelectValue placeholder="Select" />
</SelectTrigger>
<SelectContent>
<SelectItem value="1">
{t("PublicNote.Enabled")}
</SelectItem>
<SelectItem value="0">
{t("PublicNote.Disabled")} {t("PublicNote.Disabled")}
</SelectItem> </span>
</SelectContent> <Switch
</Select> checked={
{publicNoteErrors["billing.autoRenewal"] && ( publicNoteObj.billingDataMod
?.autoRenewal === "1"
}
onCheckedChange={(checked) =>
patchPublicNote(
"billingDataMod.autoRenewal",
checked ? "1" : undefined,
)
}
/>
<span className="text-xs">
{t("PublicNote.Enabled")}
</span>
</div>
{publicNoteErrors[
"billing.autoRenewal"
] && (
<p className="text-xs text-destructive mt-1"> <p className="text-xs text-destructive mt-1">
{publicNoteErrors["billing.autoRenewal"]} {
publicNoteErrors[
"billing.autoRenewal"
]
}
</p> </p>
)} )}
</div> </div>
<div className="space-y-1"> <div className="space-y-1">
<div className="flex items-center gap-2">
<Label className="text-xs"> <Label className="text-xs">
{t("PublicNote.Cycle")} {t("PublicNote.Cycle")}
</Label> </Label>
<Button
type="button"
variant="outline"
className="text-xs px-2 py-0 h-auto bg-gray-200 dark:bg-gray-700"
onClick={() =>
patchPublicNote(
"billingDataMod.cycle",
undefined,
)
}
>
{t("PublicNote.Clear") ?? "Clear"}
</Button>
</div>
<Select <Select
onValueChange={(val) => onValueChange={(val) =>
setPublicNoteObj((prev) => ({ patchPublicNote(
...prev, "billingDataMod.cycle",
billingDataMod: { val,
...prev.billingDataMod, )
cycle: val,
},
}))
} }
defaultValue={ value={
publicNoteObj.billingDataMod.cycle || publicNoteObj.billingDataMod?.cycle
"Month"
} }
> >
<SelectTrigger> <SelectTrigger>
@@ -700,13 +709,10 @@ export const ServerCard: React.FC<ServerCardProps> = ({ data, mutate }) => {
variant="outline" variant="outline"
className="text-xs px-2 py-0 h-auto bg-gray-200 dark:bg-gray-700" className="text-xs px-2 py-0 h-auto bg-gray-200 dark:bg-gray-700"
onClick={() => onClick={() =>
setPublicNoteObj((prev) => ({ patchPublicNote(
...prev, "billingDataMod.amount",
billingDataMod: { "0",
...prev.billingDataMod, )
amount: "0",
},
}))
} }
> >
{t("PublicNote.Free")} {t("PublicNote.Free")}
@@ -716,13 +722,10 @@ export const ServerCard: React.FC<ServerCardProps> = ({ data, mutate }) => {
variant="outline" variant="outline"
className="text-xs px-2 py-0 h-auto bg-gray-200 dark:bg-gray-700" className="text-xs px-2 py-0 h-auto bg-gray-200 dark:bg-gray-700"
onClick={() => onClick={() =>
setPublicNoteObj((prev) => ({ patchPublicNote(
...prev, "billingDataMod.amount",
billingDataMod: { "-1",
...prev.billingDataMod, )
amount: "-1",
},
}))
} }
> >
{t("PublicNote.PayAsYouGo")} {t("PublicNote.PayAsYouGo")}
@@ -730,15 +733,14 @@ export const ServerCard: React.FC<ServerCardProps> = ({ data, mutate }) => {
</div> </div>
<Input <Input
placeholder="200EUR" placeholder="200EUR"
value={publicNoteObj.billingDataMod.amount} value={
publicNoteObj.billingDataMod?.amount
}
onChange={(e) => onChange={(e) =>
setPublicNoteObj((prev) => ({ patchPublicNote(
...prev, "billingDataMod.amount",
billingDataMod: { e.target.value,
...prev.billingDataMod, )
amount: e.target.value,
},
}))
} }
/> />
</div> </div>
@@ -756,15 +758,14 @@ export const ServerCard: React.FC<ServerCardProps> = ({ data, mutate }) => {
</Label> </Label>
<Input <Input
placeholder="30Mbps" placeholder="30Mbps"
value={publicNoteObj.planDataMod.bandwidth} value={
publicNoteObj.planDataMod?.bandwidth
}
onChange={(e) => onChange={(e) =>
setPublicNoteObj((prev) => ({ patchPublicNote(
...prev, "planDataMod.bandwidth",
planDataMod: { e.target.value,
...prev.planDataMod, )
bandwidth: e.target.value,
},
}))
} }
/> />
</div> </div>
@@ -774,34 +775,47 @@ export const ServerCard: React.FC<ServerCardProps> = ({ data, mutate }) => {
</Label> </Label>
<Input <Input
placeholder="1TB/Month" placeholder="1TB/Month"
value={publicNoteObj.planDataMod.trafficVol} value={
publicNoteObj.planDataMod
?.trafficVol
}
onChange={(e) => onChange={(e) =>
setPublicNoteObj((prev) => ({ patchPublicNote(
...prev, "planDataMod.trafficVol",
planDataMod: { e.target.value,
...prev.planDataMod, )
trafficVol: e.target.value,
},
}))
} }
/> />
</div> </div>
<div className="space-y-1"> <div className="space-y-1">
<div className="flex items-center gap-2">
<Label className="text-xs"> <Label className="text-xs">
{t("PublicNote.TrafficType")} {t("PublicNote.TrafficType")}
</Label> </Label>
<Button
type="button"
variant="outline"
className="text-xs px-2 py-0 h-auto bg-gray-200 dark:bg-gray-700"
onClick={() =>
patchPublicNote(
"planDataMod.trafficType",
undefined,
)
}
>
{t("PublicNote.Clear") ?? "Clear"}
</Button>
</div>
<Select <Select
onValueChange={(val) => onValueChange={(val) =>
setPublicNoteObj((prev) => ({ patchPublicNote(
...prev, "planDataMod.trafficType",
planDataMod: { val,
...prev.planDataMod, )
trafficType: val,
},
}))
} }
defaultValue={ value={
publicNoteObj.planDataMod.trafficType || "2" publicNoteObj.planDataMod
?.trafficType ?? ""
} }
> >
<SelectTrigger> <SelectTrigger>
@@ -818,7 +832,11 @@ export const ServerCard: React.FC<ServerCardProps> = ({ data, mutate }) => {
</Select> </Select>
{publicNoteErrors["plan.trafficType"] && ( {publicNoteErrors["plan.trafficType"] && (
<p className="text-xs text-destructive mt-1"> <p className="text-xs text-destructive mt-1">
{publicNoteErrors["plan.trafficType"]} {
publicNoteErrors[
"plan.trafficType"
]
}
</p> </p>
)} )}
</div> </div>
@@ -832,16 +850,14 @@ export const ServerCard: React.FC<ServerCardProps> = ({ data, mutate }) => {
</span> </span>
<Switch <Switch
checked={ checked={
publicNoteObj.planDataMod.IPv4 === "1" publicNoteObj.planDataMod
?.IPv4 === "1"
} }
onCheckedChange={(checked) => onCheckedChange={(checked) =>
setPublicNoteObj((prev) => ({ patchPublicNote(
...prev, "planDataMod.IPv4",
planDataMod: { checked ? "1" : "0",
...prev.planDataMod, )
IPv4: checked ? "1" : "0",
},
}))
} }
/> />
<span className="text-xs"> <span className="text-xs">
@@ -864,16 +880,14 @@ export const ServerCard: React.FC<ServerCardProps> = ({ data, mutate }) => {
</span> </span>
<Switch <Switch
checked={ checked={
publicNoteObj.planDataMod.IPv6 === "1" publicNoteObj.planDataMod
?.IPv6 === "1"
} }
onCheckedChange={(checked) => onCheckedChange={(checked) =>
setPublicNoteObj((prev) => ({ patchPublicNote(
...prev, "planDataMod.IPv6",
planDataMod: { checked ? "1" : "0",
...prev.planDataMod, )
IPv6: checked ? "1" : "0",
},
}))
} }
/> />
<span className="text-xs"> <span className="text-xs">
@@ -891,16 +905,18 @@ export const ServerCard: React.FC<ServerCardProps> = ({ data, mutate }) => {
{t("PublicNote.NetworkRoute")} {t("PublicNote.NetworkRoute")}
</Label> </Label>
<Input <Input
placeholder={t("PublicNote.CommaSeparated")} placeholder={t(
value={publicNoteObj.planDataMod.networkRoute} "PublicNote.CommaSeparated",
)}
value={
publicNoteObj.planDataMod
?.networkRoute ?? ""
}
onChange={(e) => onChange={(e) =>
setPublicNoteObj((prev) => ({ patchPublicNote(
...prev, "planDataMod.networkRoute",
planDataMod: { e.target.value,
...prev.planDataMod, )
networkRoute: e.target.value,
},
}))
} }
/> />
</div> </div>
@@ -909,21 +925,25 @@ export const ServerCard: React.FC<ServerCardProps> = ({ data, mutate }) => {
{t("PublicNote.Extra")} {t("PublicNote.Extra")}
</Label> </Label>
<Input <Input
placeholder={t("PublicNote.CommaSeparated")} placeholder={t(
value={publicNoteObj.planDataMod.extra} "PublicNote.CommaSeparated",
)}
value={
publicNoteObj.planDataMod?.extra ??
""
}
onChange={(e) => onChange={(e) =>
setPublicNoteObj((prev) => ({ patchPublicNote(
...prev, "planDataMod.extra",
planDataMod: { e.target.value,
...prev.planDataMod, )
extra: e.target.value,
},
}))
} }
/> />
</div> </div>
</div> </div>
</div> </div>
</>
)}
</div> </div>
<DialogFooter className="justify-end"> <DialogFooter className="justify-end">
<DialogClose asChild> <DialogClose asChild>
src/components/ui/alert-dialog.tsx
+1 -1
View File
@@ -1,7 +1,7 @@
import { buttonVariants } from "@/components/ui/button" import { buttonVariants } from "@/components/ui/button"
import { cn } from "@/lib/utils" import { cn } from "@/lib/utils"
import * as AlertDialogPrimitive from "@radix-ui/react-alert-dialog" import * as AlertDialogPrimitive from "@radix-ui/react-alert-dialog"
import { forwardRef, ComponentRef, ComponentPropsWithoutRef, HTMLAttributes } from "react" import { ComponentPropsWithoutRef, ComponentRef, HTMLAttributes, forwardRef } from "react"
const AlertDialog = AlertDialogPrimitive.Root const AlertDialog = AlertDialogPrimitive.Root
src/components/ui/avatar.tsx
+1 -1
View File
@@ -1,6 +1,6 @@
import { cn } from "@/lib/utils" import { cn } from "@/lib/utils"
import * as AvatarPrimitive from "@radix-ui/react-avatar" import * as AvatarPrimitive from "@radix-ui/react-avatar"
import { forwardRef, ComponentRef, ComponentPropsWithoutRef } from "react" import { ComponentPropsWithoutRef, ComponentRef, forwardRef } from "react"
const Avatar = forwardRef< const Avatar = forwardRef<
ComponentRef<typeof AvatarPrimitive.Root>, ComponentRef<typeof AvatarPrimitive.Root>,
src/components/ui/breadcrumb.tsx
+1 -1
View File
@@ -1,7 +1,7 @@
import { cn } from "@/lib/utils" import { cn } from "@/lib/utils"
import { Slot } from "@radix-ui/react-slot" import { Slot } from "@radix-ui/react-slot"
import { ChevronRight, MoreHorizontal } from "lucide-react" import { ChevronRight, MoreHorizontal } from "lucide-react"
import { forwardRef, ComponentPropsWithoutRef, ReactNode, ComponentProps } from "react" import { ComponentProps, ComponentPropsWithoutRef, ReactNode, forwardRef } from "react"
const Breadcrumb = forwardRef< const Breadcrumb = forwardRef<
HTMLElement, HTMLElement,
src/components/ui/button.tsx
+1 -1
View File
@@ -1,7 +1,7 @@
import { cn } from "@/lib/utils" import { cn } from "@/lib/utils"
import { Slot } from "@radix-ui/react-slot" import { Slot } from "@radix-ui/react-slot"
import { type VariantProps, cva } from "class-variance-authority" import { type VariantProps, cva } from "class-variance-authority"
import { forwardRef, ButtonHTMLAttributes } from "react" import { ButtonHTMLAttributes, forwardRef } from "react"
const buttonVariants = cva( const buttonVariants = cva(
"inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-colors focus-visible:outline-none disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0", "inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-colors focus-visible:outline-none disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0",
src/components/ui/calendar.tsx
+1 -1
View File
@@ -1,7 +1,7 @@
import { Button, buttonVariants } from "@/components/ui/button" import { Button, buttonVariants } from "@/components/ui/button"
import { cn } from "@/lib/utils" import { cn } from "@/lib/utils"
import { ChevronDownIcon, ChevronLeftIcon, ChevronRightIcon } from "lucide-react" import { ChevronDownIcon, ChevronLeftIcon, ChevronRightIcon } from "lucide-react"
import { ComponentProps, useRef, useEffect } from "react" import { ComponentProps, useEffect, useRef } from "react"
import { DayButton, DayPicker, getDefaultClassNames } from "react-day-picker" import { DayButton, DayPicker, getDefaultClassNames } from "react-day-picker"
function Calendar({ function Calendar({
src/components/ui/card.tsx
+5 -6
View File
@@ -1,5 +1,5 @@
import { cn } from "@/lib/utils" import { cn } from "@/lib/utils"
import { forwardRef, HTMLAttributes } from "react" import { HTMLAttributes, forwardRef } from "react"
const Card = forwardRef<HTMLDivElement, HTMLAttributes<HTMLDivElement>>( const Card = forwardRef<HTMLDivElement, HTMLAttributes<HTMLDivElement>>(
({ className, ...props }, ref) => ( ({ className, ...props }, ref) => (
@@ -30,12 +30,11 @@ const CardTitle = forwardRef<HTMLParagraphElement, HTMLAttributes<HTMLHeadingEle
) )
CardTitle.displayName = "CardTitle" CardTitle.displayName = "CardTitle"
const CardDescription = forwardRef< const CardDescription = forwardRef<HTMLParagraphElement, HTMLAttributes<HTMLParagraphElement>>(
HTMLParagraphElement, ({ className, ...props }, ref) => (
HTMLAttributes<HTMLParagraphElement>
>(({ className, ...props }, ref) => (
<p ref={ref} className={cn("text-sm text-muted-foreground", className)} {...props} /> <p ref={ref} className={cn("text-sm text-muted-foreground", className)} {...props} />
)) ),
)
CardDescription.displayName = "CardDescription" CardDescription.displayName = "CardDescription"
const CardContent = forwardRef<HTMLDivElement, HTMLAttributes<HTMLDivElement>>( const CardContent = forwardRef<HTMLDivElement, HTMLAttributes<HTMLDivElement>>(
src/components/ui/checkbox.tsx
+1 -1
View File
@@ -1,7 +1,7 @@
import { cn } from "@/lib/utils" import { cn } from "@/lib/utils"
import * as CheckboxPrimitive from "@radix-ui/react-checkbox" import * as CheckboxPrimitive from "@radix-ui/react-checkbox"
import { Check } from "lucide-react" import { Check } from "lucide-react"
import { forwardRef, ComponentRef, ComponentPropsWithoutRef } from "react" import { ComponentPropsWithoutRef, ComponentRef, forwardRef } from "react"
const Checkbox = forwardRef< const Checkbox = forwardRef<
ComponentRef<typeof CheckboxPrimitive.Root>, ComponentRef<typeof CheckboxPrimitive.Root>,
src/components/ui/combobox.tsx
+1 -1
View File
@@ -12,7 +12,7 @@ import {
import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover" import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover"
import { cn } from "@/lib/utils" import { cn } from "@/lib/utils"
import { Check, ChevronDown } from "lucide-react" import { Check, ChevronDown } from "lucide-react"
import { forwardRef, ButtonHTMLAttributes, useState } from "react" import { ButtonHTMLAttributes, forwardRef, useState } from "react"
interface ComboboxProps extends ButtonHTMLAttributes<HTMLButtonElement> { interface ComboboxProps extends ButtonHTMLAttributes<HTMLButtonElement> {
options: { options: {
src/components/ui/command.tsx
+1 -1
View File
@@ -3,7 +3,7 @@ import { cn } from "@/lib/utils"
import { type DialogProps } from "@radix-ui/react-dialog" import { type DialogProps } from "@radix-ui/react-dialog"
import { Command as CommandPrimitive } from "cmdk" import { Command as CommandPrimitive } from "cmdk"
import { Search } from "lucide-react" import { Search } from "lucide-react"
import { forwardRef, ComponentRef, ComponentPropsWithoutRef, HTMLAttributes } from "react" import { ComponentPropsWithoutRef, ComponentRef, HTMLAttributes, forwardRef } from "react"
const Command = forwardRef< const Command = forwardRef<
ComponentRef<typeof CommandPrimitive>, ComponentRef<typeof CommandPrimitive>,
src/components/ui/dialog.tsx
+1 -1
View File
@@ -1,7 +1,7 @@
import { cn } from "@/lib/utils" import { cn } from "@/lib/utils"
import * as DialogPrimitive from "@radix-ui/react-dialog" import * as DialogPrimitive from "@radix-ui/react-dialog"
import { X } from "lucide-react" import { X } from "lucide-react"
import { forwardRef, ComponentRef, ComponentPropsWithoutRef, HTMLAttributes } from "react" import { ComponentPropsWithoutRef, ComponentRef, HTMLAttributes, forwardRef } from "react"
const Dialog = DialogPrimitive.Root const Dialog = DialogPrimitive.Root
src/components/ui/drawer.tsx
+7 -1
View File
@@ -1,5 +1,11 @@
import { cn } from "@/lib/utils" import { cn } from "@/lib/utils"
import { ComponentProps, forwardRef, ComponentRef, ComponentPropsWithoutRef, HTMLAttributes } from "react" import {
ComponentProps,
ComponentPropsWithoutRef,
ComponentRef,
HTMLAttributes,
forwardRef,
} from "react"
import { Drawer as DrawerPrimitive } from "vaul" import { Drawer as DrawerPrimitive } from "vaul"
const Drawer = ({ const Drawer = ({
src/components/ui/dropdown-menu.tsx
+1 -1
View File
@@ -1,7 +1,7 @@
import { cn } from "@/lib/utils" import { cn } from "@/lib/utils"
import * as DropdownMenuPrimitive from "@radix-ui/react-dropdown-menu" import * as DropdownMenuPrimitive from "@radix-ui/react-dropdown-menu"
import { Check, ChevronRight, Circle } from "lucide-react" import { Check, ChevronRight, Circle } from "lucide-react"
import { forwardRef, ComponentRef, ComponentPropsWithoutRef, HTMLAttributes } from "react" import { ComponentPropsWithoutRef, ComponentRef, HTMLAttributes, forwardRef } from "react"
const DropdownMenu = DropdownMenuPrimitive.Root const DropdownMenu = DropdownMenuPrimitive.Root
src/components/ui/form.tsx
+21 -16
View File
@@ -2,7 +2,15 @@ import { Label } from "@/components/ui/label"
import { cn } from "@/lib/utils" import { cn } from "@/lib/utils"
import * as LabelPrimitive from "@radix-ui/react-label" import * as LabelPrimitive from "@radix-ui/react-label"
import { Slot } from "@radix-ui/react-slot" import { Slot } from "@radix-ui/react-slot"
import { createContext, useContext, forwardRef, HTMLAttributes, useId, ComponentRef, ComponentPropsWithoutRef } from "react" import {
ComponentPropsWithoutRef,
ComponentRef,
HTMLAttributes,
createContext,
forwardRef,
useContext,
useId,
} from "react"
import { import {
Controller, Controller,
ControllerProps, ControllerProps,
@@ -95,10 +103,8 @@ const FormLabel = forwardRef<
}) })
FormLabel.displayName = "FormLabel" FormLabel.displayName = "FormLabel"
const FormControl = forwardRef< const FormControl = forwardRef<ComponentRef<typeof Slot>, ComponentPropsWithoutRef<typeof Slot>>(
ComponentRef<typeof Slot>, ({ ...props }, ref) => {
ComponentPropsWithoutRef<typeof Slot>
>(({ ...props }, ref) => {
const { error, formItemId, formDescriptionId, formMessageId } = useFormField() const { error, formItemId, formDescriptionId, formMessageId } = useFormField()
return ( return (
@@ -112,13 +118,12 @@ const FormControl = forwardRef<
{...props} {...props}
/> />
) )
}) },
)
FormControl.displayName = "FormControl" FormControl.displayName = "FormControl"
const FormDescription = forwardRef< const FormDescription = forwardRef<HTMLParagraphElement, HTMLAttributes<HTMLParagraphElement>>(
HTMLParagraphElement, ({ className, ...props }, ref) => {
HTMLAttributes<HTMLParagraphElement>
>(({ className, ...props }, ref) => {
const { formDescriptionId } = useFormField() const { formDescriptionId } = useFormField()
return ( return (
@@ -129,13 +134,12 @@ const FormDescription = forwardRef<
{...props} {...props}
/> />
) )
}) },
)
FormDescription.displayName = "FormDescription" FormDescription.displayName = "FormDescription"
const FormMessage = forwardRef< const FormMessage = forwardRef<HTMLParagraphElement, HTMLAttributes<HTMLParagraphElement>>(
HTMLParagraphElement, ({ className, children, ...props }, ref) => {
HTMLAttributes<HTMLParagraphElement>
>(({ className, children, ...props }, ref) => {
const { error, formMessageId } = useFormField() const { error, formMessageId } = useFormField()
const body = error ? String(error?.message) : children const body = error ? String(error?.message) : children
@@ -153,7 +157,8 @@ const FormMessage = forwardRef<
{body} {body}
</p> </p>
) )
}) },
)
FormMessage.displayName = "FormMessage" FormMessage.displayName = "FormMessage"
export { export {
src/components/ui/input.tsx
+3 -5
View File
@@ -1,10 +1,9 @@
import { cn } from "@/lib/utils" import { cn } from "@/lib/utils"
import { forwardRef, InputHTMLAttributes } from "react" import { InputHTMLAttributes, forwardRef } from "react"
export interface InputProps extends InputHTMLAttributes<HTMLInputElement> {} export interface InputProps extends InputHTMLAttributes<HTMLInputElement> {}
const Input = forwardRef<HTMLInputElement, InputProps>( const Input = forwardRef<HTMLInputElement, InputProps>(({ className, type, ...props }, ref) => {
({ className, type, ...props }, ref) => {
return ( return (
<input <input
type={type} type={type}
@@ -16,8 +15,7 @@ const Input = forwardRef<HTMLInputElement, InputProps>(
{...props} {...props}
/> />
) )
}, })
)
Input.displayName = "Input" Input.displayName = "Input"
export { Input } export { Input }
src/components/ui/label.tsx
+1 -1
View File
@@ -1,7 +1,7 @@
import { cn } from "@/lib/utils" import { cn } from "@/lib/utils"
import * as LabelPrimitive from "@radix-ui/react-label" import * as LabelPrimitive from "@radix-ui/react-label"
import { type VariantProps, cva } from "class-variance-authority" import { type VariantProps, cva } from "class-variance-authority"
import { forwardRef, ComponentRef, ComponentPropsWithoutRef } from "react" import { ComponentPropsWithoutRef, ComponentRef, forwardRef } from "react"
const labelVariants = cva( const labelVariants = cva(
"text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70", "text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70",
src/components/ui/navigation-menu.tsx
+1 -1
View File
@@ -2,7 +2,7 @@ import { cn } from "@/lib/utils"
import * as NavigationMenuPrimitive from "@radix-ui/react-navigation-menu" import * as NavigationMenuPrimitive from "@radix-ui/react-navigation-menu"
import { cva } from "class-variance-authority" import { cva } from "class-variance-authority"
import { ChevronDown } from "lucide-react" import { ChevronDown } from "lucide-react"
import { forwardRef, ComponentRef, ComponentPropsWithoutRef } from "react" import { ComponentPropsWithoutRef, ComponentRef, forwardRef } from "react"
const NavigationMenu = forwardRef< const NavigationMenu = forwardRef<
ComponentRef<typeof NavigationMenuPrimitive.Root>, ComponentRef<typeof NavigationMenuPrimitive.Root>,
src/components/ui/pagination.tsx
+1 -4
View File
@@ -45,10 +45,7 @@ const PaginationLink = ({ className, isActive, size = "icon", ...props }: Pagina
) )
PaginationLink.displayName = "PaginationLink" PaginationLink.displayName = "PaginationLink"
const PaginationPrevious = ({ const PaginationPrevious = ({ className, ...props }: ComponentProps<typeof PaginationLink>) => (
className,
...props
}: ComponentProps<typeof PaginationLink>) => (
<PaginationLink <PaginationLink
aria-label="Go to previous page" aria-label="Go to previous page"
size="default" size="default"
src/components/ui/popover.tsx
+1 -1
View File
@@ -1,6 +1,6 @@
import { cn } from "@/lib/utils" import { cn } from "@/lib/utils"
import * as PopoverPrimitive from "@radix-ui/react-popover" import * as PopoverPrimitive from "@radix-ui/react-popover"
import { forwardRef, ComponentRef, ComponentPropsWithoutRef } from "react" import { ComponentPropsWithoutRef, ComponentRef, forwardRef } from "react"
const Popover = PopoverPrimitive.Root const Popover = PopoverPrimitive.Root
src/components/ui/scroll-area.tsx
+1 -1
View File
@@ -1,6 +1,6 @@
import { cn } from "@/lib/utils" import { cn } from "@/lib/utils"
import * as ScrollAreaPrimitive from "@radix-ui/react-scroll-area" import * as ScrollAreaPrimitive from "@radix-ui/react-scroll-area"
import { forwardRef, ComponentRef, ComponentPropsWithoutRef } from "react" import { ComponentPropsWithoutRef, ComponentRef, forwardRef } from "react"
const ScrollArea = forwardRef< const ScrollArea = forwardRef<
ComponentRef<typeof ScrollAreaPrimitive.Root>, ComponentRef<typeof ScrollAreaPrimitive.Root>,
src/components/ui/select.tsx
+1 -1
View File
@@ -1,7 +1,7 @@
import { cn } from "@/lib/utils" import { cn } from "@/lib/utils"
import * as SelectPrimitive from "@radix-ui/react-select" import * as SelectPrimitive from "@radix-ui/react-select"
import { Check, ChevronDown, ChevronUp } from "lucide-react" import { Check, ChevronDown, ChevronUp } from "lucide-react"
import { forwardRef, ComponentRef, ComponentPropsWithoutRef } from "react" import { ComponentPropsWithoutRef, ComponentRef, forwardRef } from "react"
const Select = SelectPrimitive.Root const Select = SelectPrimitive.Root
src/components/ui/separator.tsx
+1 -1
View File
@@ -1,6 +1,6 @@
import { cn } from "@/lib/utils" import { cn } from "@/lib/utils"
import * as SeparatorPrimitive from "@radix-ui/react-separator" import * as SeparatorPrimitive from "@radix-ui/react-separator"
import { forwardRef, ComponentRef, ComponentPropsWithoutRef } from "react" import { ComponentPropsWithoutRef, ComponentRef, forwardRef } from "react"
const Separator = forwardRef< const Separator = forwardRef<
ComponentRef<typeof SeparatorPrimitive.Root>, ComponentRef<typeof SeparatorPrimitive.Root>,
src/components/ui/switch.tsx
+1 -1
View File
@@ -1,6 +1,6 @@
import { cn } from "@/lib/utils" import { cn } from "@/lib/utils"
import * as SwitchPrimitives from "@radix-ui/react-switch" import * as SwitchPrimitives from "@radix-ui/react-switch"
import { forwardRef, ComponentRef, ComponentPropsWithoutRef } from "react" import { ComponentPropsWithoutRef, ComponentRef, forwardRef } from "react"
const Switch = forwardRef< const Switch = forwardRef<
ComponentRef<typeof SwitchPrimitives.Root>, ComponentRef<typeof SwitchPrimitives.Root>,
src/components/ui/table.tsx
+30 -32
View File
@@ -1,5 +1,5 @@
import { cn } from "@/lib/utils" import { cn } from "@/lib/utils"
import { forwardRef, HTMLAttributes, ThHTMLAttributes, TdHTMLAttributes } from "react" import { HTMLAttributes, TdHTMLAttributes, ThHTMLAttributes, forwardRef } from "react"
const Table = forwardRef<HTMLTableElement, HTMLAttributes<HTMLTableElement>>( const Table = forwardRef<HTMLTableElement, HTMLAttributes<HTMLTableElement>>(
({ className, ...props }, ref) => ( ({ className, ...props }, ref) => (
@@ -14,32 +14,29 @@ const Table = forwardRef<HTMLTableElement, HTMLAttributes<HTMLTableElement>>(
) )
Table.displayName = "Table" Table.displayName = "Table"
const TableHeader = forwardRef< const TableHeader = forwardRef<HTMLTableSectionElement, HTMLAttributes<HTMLTableSectionElement>>(
HTMLTableSectionElement, ({ className, ...props }, ref) => (
HTMLAttributes<HTMLTableSectionElement>
>(({ className, ...props }, ref) => (
<thead ref={ref} className={cn("[&_tr]:border-b", className)} {...props} /> <thead ref={ref} className={cn("[&_tr]:border-b", className)} {...props} />
)) ),
)
TableHeader.displayName = "TableHeader" TableHeader.displayName = "TableHeader"
const TableBody = forwardRef< const TableBody = forwardRef<HTMLTableSectionElement, HTMLAttributes<HTMLTableSectionElement>>(
HTMLTableSectionElement, ({ className, ...props }, ref) => (
HTMLAttributes<HTMLTableSectionElement>
>(({ className, ...props }, ref) => (
<tbody ref={ref} className={cn("[&_tr:last-child]:border-0", className)} {...props} /> <tbody ref={ref} className={cn("[&_tr:last-child]:border-0", className)} {...props} />
)) ),
)
TableBody.displayName = "TableBody" TableBody.displayName = "TableBody"
const TableFooter = forwardRef< const TableFooter = forwardRef<HTMLTableSectionElement, HTMLAttributes<HTMLTableSectionElement>>(
HTMLTableSectionElement, ({ className, ...props }, ref) => (
HTMLAttributes<HTMLTableSectionElement>
>(({ className, ...props }, ref) => (
<tfoot <tfoot
ref={ref} ref={ref}
className={cn("border-t bg-muted/50 font-medium [&>tr]:last:border-b-0", className)} className={cn("border-t bg-muted/50 font-medium [&>tr]:last:border-b-0", className)}
{...props} {...props}
/> />
)) ),
)
TableFooter.displayName = "TableFooter" TableFooter.displayName = "TableFooter"
const TableRow = forwardRef<HTMLTableRowElement, HTMLAttributes<HTMLTableRowElement>>( const TableRow = forwardRef<HTMLTableRowElement, HTMLAttributes<HTMLTableRowElement>>(
@@ -56,10 +53,8 @@ const TableRow = forwardRef<HTMLTableRowElement, HTMLAttributes<HTMLTableRowElem
) )
TableRow.displayName = "TableRow" TableRow.displayName = "TableRow"
const TableHead = forwardRef< const TableHead = forwardRef<HTMLTableCellElement, ThHTMLAttributes<HTMLTableCellElement>>(
HTMLTableCellElement, ({ className, ...props }, ref) => (
ThHTMLAttributes<HTMLTableCellElement>
>(({ className, ...props }, ref) => (
<th <th
ref={ref} ref={ref}
className={cn( className={cn(
@@ -68,27 +63,30 @@ const TableHead = forwardRef<
)} )}
{...props} {...props}
/> />
)) ),
)
TableHead.displayName = "TableHead" TableHead.displayName = "TableHead"
const TableCell = forwardRef< const TableCell = forwardRef<HTMLTableCellElement, TdHTMLAttributes<HTMLTableCellElement>>(
HTMLTableCellElement, ({ className, ...props }, ref) => (
TdHTMLAttributes<HTMLTableCellElement>
>(({ className, ...props }, ref) => (
<td <td
ref={ref} ref={ref}
className={cn("p-4 align-middle [&:has([role=checkbox])]:pr-0", className)} className={cn("p-4 align-middle [&:has([role=checkbox])]:pr-0", className)}
{...props} {...props}
/> />
)) ),
)
TableCell.displayName = "TableCell" TableCell.displayName = "TableCell"
const TableCaption = forwardRef< const TableCaption = forwardRef<HTMLTableCaptionElement, HTMLAttributes<HTMLTableCaptionElement>>(
HTMLTableCaptionElement, ({ className, ...props }, ref) => (
HTMLAttributes<HTMLTableCaptionElement> <caption
>(({ className, ...props }, ref) => ( ref={ref}
<caption ref={ref} className={cn("mt-4 text-sm text-muted-foreground", className)} {...props} /> className={cn("mt-4 text-sm text-muted-foreground", className)}
)) {...props}
/>
),
)
TableCaption.displayName = "TableCaption" TableCaption.displayName = "TableCaption"
export { Table, TableHeader, TableBody, TableFooter, TableHead, TableRow, TableCell, TableCaption } export { Table, TableHeader, TableBody, TableFooter, TableHead, TableRow, TableCell, TableCaption }
src/components/ui/tabs.tsx
+1 -1
View File
@@ -1,6 +1,6 @@
import { cn } from "@/lib/utils" import { cn } from "@/lib/utils"
import * as TabsPrimitive from "@radix-ui/react-tabs" import * as TabsPrimitive from "@radix-ui/react-tabs"
import { forwardRef, ComponentRef, ComponentPropsWithoutRef } from "react" import { ComponentPropsWithoutRef, ComponentRef, forwardRef } from "react"
const Tabs = TabsPrimitive.Root const Tabs = TabsPrimitive.Root
src/components/ui/textarea.tsx
+1 -1
View File
@@ -1,5 +1,5 @@
import { cn } from "@/lib/utils" import { cn } from "@/lib/utils"
import { forwardRef, ComponentProps } from "react" import { ComponentProps, forwardRef } from "react"
const Textarea = forwardRef<HTMLTextAreaElement, ComponentProps<"textarea">>( const Textarea = forwardRef<HTMLTextAreaElement, ComponentProps<"textarea">>(
({ className, ...props }, ref) => { ({ className, ...props }, ref) => {
src/components/xui/filepath.tsx
+1 -1
View File
@@ -15,7 +15,7 @@ import {
DropdownMenuTrigger, DropdownMenuTrigger,
} from "@/components/ui/dropdown-menu" } from "@/components/ui/dropdown-menu"
import { formatPath } from "@/lib/utils" import { formatPath } from "@/lib/utils"
import { Dispatch, SetStateAction, FC, useState, Fragment } from "react" import { Dispatch, FC, Fragment, SetStateAction, useState } from "react"
const ITEMS_TO_DISPLAY = 3 const ITEMS_TO_DISPLAY = 3
src/components/xui/multi-select.tsx
+1 -1
View File
@@ -38,7 +38,7 @@ import { Separator } from "@/components/ui/separator"
import { cn } from "@/lib/utils" import { cn } from "@/lib/utils"
import { type VariantProps, cva } from "class-variance-authority" import { type VariantProps, cva } from "class-variance-authority"
import { CheckIcon, ChevronDown, WandSparkles, XIcon } from "lucide-react" import { CheckIcon, ChevronDown, WandSparkles, XIcon } from "lucide-react"
import { useState, forwardRef, KeyboardEvent } from "react" import { KeyboardEvent, forwardRef, useState } from "react"
/** /**
* Variants for the multi-select component to handle different styles. * Variants for the multi-select component to handle different styles.
src/components/xui/overlayless-sheet.tsx
+12 -6
View File
@@ -2,7 +2,14 @@ import { cn } from "@/lib/utils"
import * as SheetPrimitive from "@radix-ui/react-dialog" import * as SheetPrimitive from "@radix-ui/react-dialog"
import { type VariantProps, cva } from "class-variance-authority" import { type VariantProps, cva } from "class-variance-authority"
import { X } from "lucide-react" import { X } from "lucide-react"
import { ComponentPropsWithoutRef, Dispatch, SetStateAction, forwardRef, ComponentRef, HTMLAttributes } from "react" import {
ComponentPropsWithoutRef,
ComponentRef,
Dispatch,
HTMLAttributes,
SetStateAction,
forwardRef,
} from "react"
const Sheet = SheetPrimitive.Root const Sheet = SheetPrimitive.Root
@@ -35,10 +42,8 @@ interface SheetContentProps
setOpen: Dispatch<SetStateAction<boolean>> setOpen: Dispatch<SetStateAction<boolean>>
} }
const SheetContent = forwardRef< const SheetContent = forwardRef<ComponentRef<typeof SheetPrimitive.Content>, SheetContentProps>(
ComponentRef<typeof SheetPrimitive.Content>, ({ side = "right", className, children, setOpen, ...props }, ref) => (
SheetContentProps
>(({ side = "right", className, children, setOpen, ...props }, ref) => (
<SheetPortal> <SheetPortal>
<SheetPrimitive.Content <SheetPrimitive.Content
ref={ref} ref={ref}
@@ -57,7 +62,8 @@ const SheetContent = forwardRef<
</SheetPrimitive.Close> </SheetPrimitive.Close>
</SheetPrimitive.Content> </SheetPrimitive.Content>
</SheetPortal> </SheetPortal>
)) ),
)
SheetContent.displayName = SheetPrimitive.Content.displayName SheetContent.displayName = SheetPrimitive.Content.displayName
const SheetHeader = ({ className, ...props }: HTMLAttributes<HTMLDivElement>) => ( const SheetHeader = ({ className, ...props }: HTMLAttributes<HTMLDivElement>) => (
src/hooks/useMediaQuery.tsx
+1 -1
View File
@@ -1,4 +1,4 @@
import { useState, useEffect } from "react" import { useEffect, useState } from "react"
export function useMediaQuery(query: string) { export function useMediaQuery(query: string) {
const [value, setValue] = useState(false) const [value, setValue] = useState(false)
src/lib/public-note.ts
+182
View File
@@ -0,0 +1,182 @@
import { z } from "zod"
import i18n from "./i18n"
/**
* Zod schema for PublicNote
* Conventions:
* - All fields are strings and may be empty
* - IPv4/IPv6/autoRenewal must be "0" or "1"
* - cycle is one of Day/Week/Month/Year
* - Date fields can be empty, ISO-like, or the special value "0000-00-00T23:59:59+08:00"
*/
export const PublicNoteSchema = z.object({
billingDataMod: z
.object({
startDate: z.string().optional(),
endDate: z.string().optional(),
autoRenewal: z.string().optional(),
cycle: z.string().optional(),
amount: z.string().optional(),
})
.optional(),
planDataMod: z
.object({
bandwidth: z.string().optional(),
trafficVol: z.string().optional(),
trafficType: z.string().optional(),
IPv4: z.string().optional(),
IPv6: z.string().optional(),
networkRoute: z.string().optional(),
extra: z.string().optional(),
})
.optional(),
})
export type PublicNote = z.infer<typeof PublicNoteSchema>
export const defaultPublicNote: PublicNote = {}
export const isValidISOLike = (v: string) => {
if (!v) return true
if (v === "0000-00-00T23:59:59+08:00") return true
const d = new Date(v)
return !isNaN(d.getTime())
}
export const normalizeISO = (v?: string) => {
if (!v) return undefined
if (v === "0000-00-00T23:59:59+08:00") return v
const date = new Date(v)
return isNaN(date.getTime()) ? v : date.toISOString()
}
/**
* Parse a string into PublicNote; return the default object if not valid JSON or validation fails.
*/
export const parsePublicNote = (s?: string): PublicNote => {
if (!s) return defaultPublicNote
try {
const obj = JSON.parse(s)
const parsed = PublicNoteSchema.safeParse(obj)
if (parsed.success) {
return parsed.data
}
return defaultPublicNote
} catch {
return defaultPublicNote
}
}
export const validatePublicNote = (pn: PublicNote) => {
const errors: Partial<Record<string, string>> = {}
// Structural and enum validations
if (pn.billingDataMod?.autoRenewal && !/^(0|1)$/.test(pn.billingDataMod.autoRenewal)) {
errors["billing.autoRenewal"] = i18n.t("Validation.MustBe0Or1")
}
if (pn.billingDataMod?.cycle && !/^(Day|Week|Month|Year)$/i.test(pn.billingDataMod.cycle)) {
errors["billing.cycle"] = i18n.t("Validation.MustBeDayWeekMonthYear")
}
if (pn.planDataMod?.trafficType && !/^(1|2)$/.test(pn.planDataMod.trafficType)) {
errors["plan.trafficType"] = i18n.t("Validation.MustBe1Or2")
}
if (pn.planDataMod?.IPv4 !== undefined && !/^(0|1)$/.test(pn.planDataMod.IPv4)) {
errors["plan.IPv4"] = i18n.t("Validation.MustBe0Or1")
}
if (pn.planDataMod?.IPv6 !== undefined && !/^(0|1)$/.test(pn.planDataMod.IPv6)) {
errors["plan.IPv6"] = i18n.t("Validation.MustBe0Or1")
}
// Date validity checks
if (pn.billingDataMod?.startDate && !isValidISOLike(pn.billingDataMod.startDate)) {
errors["billing.startDate"] = i18n.t("Validation.InvalidDate")
}
if (pn.billingDataMod?.endDate && !isValidISOLike(pn.billingDataMod.endDate)) {
errors["billing.endDate"] = i18n.t("Validation.InvalidDate")
}
return { errors, valid: Object.keys(errors).length === 0 }
}
/**
* Detect default mode from string: JSON matching schema -> "structured"; otherwise "raw".
*/
export const detectPublicNoteMode = (s?: string): "structured" | "raw" => {
if (!s) return "raw"
try {
const obj = JSON.parse(s)
const parsed = PublicNoteSchema.strict().safeParse(obj)
return parsed.success ? "structured" : "raw"
} catch {
return "raw"
}
}
/**
* Immutable patch by path, for use in component wrappers around setPublicNoteObj.
* Example path: "billingDataMod.startDate"
*/
export const applyPublicNotePatch = (
obj: PublicNote,
path: string,
value: string | undefined,
): PublicNote => {
const keys = path.split(".")
const draft: any = structuredClone ? structuredClone(obj) : JSON.parse(JSON.stringify(obj))
let cur: any = draft
for (let i = 0; i < keys.length - 1; i++) {
const k = keys[i]
cur[k] = { ...(cur[k] ?? {}) }
cur = cur[k]
}
cur[keys[keys.length - 1]] = value
return draft
}
/**
* Update a date field while preserving time parts: if the previous value is a valid date,
* keep hours/minutes/seconds. Path example: "billingDataMod.startDate" | "billingDataMod.endDate"
*/
export const applyPublicNoteDate = (obj: PublicNote, path: string, date: Date): PublicNote => {
const keys = path.split(".")
const draft: any = structuredClone ? structuredClone(obj) : JSON.parse(JSON.stringify(obj))
// Read previous value to preserve time components
let curRead: any = draft
for (let i = 0; i < keys.length - 1; i++) {
const k = keys[i]
curRead = (curRead as any)[k]
if (!curRead) break
}
const leafKey = keys[keys.length - 1]
const prevVal: string | undefined = curRead ? curRead[leafKey] : undefined
const d = new Date(date)
if (prevVal) {
const pd = new Date(prevVal)
if (!isNaN(pd.getTime())) {
d.setHours(pd.getHours(), pd.getMinutes(), pd.getSeconds(), 0)
}
}
// Write back
let curWrite: any = draft
for (let i = 0; i < keys.length - 1; i++) {
const k = keys[i]
curWrite[k] = { ...(curWrite[k] ?? {}) }
curWrite = curWrite[k]
}
curWrite[leafKey] = d.toISOString()
return draft
}
/**
* Toggle the special "no expiry" value for endDate.
*/
export const toggleEndNoExpiry = (obj: PublicNote): PublicNote => {
const NO_EXPIRY = "0000-00-00T23:59:59+08:00"
const current = obj.billingDataMod?.endDate
const next = current === NO_EXPIRY ? "" : NO_EXPIRY
return applyPublicNotePatch(obj, "billingDataMod.endDate", next)
}
src/locales/en/translation.json
+17 -4
View File
@@ -195,6 +195,7 @@
"Value": "Value", "Value": "Value",
"Preview": "Preview", "Preview": "Preview",
"PublicNote": { "PublicNote": {
"Label": "Public Note",
"Billing": "Billing", "Billing": "Billing",
"Plan": "Plan", "Plan": "Plan",
"StartDate": "Start Date", "StartDate": "Start Date",
@@ -222,10 +223,13 @@
"CancelNoExpiry": "Cancel No Expiry", "CancelNoExpiry": "Cancel No Expiry",
"Free": "Free", "Free": "Free",
"PayAsYouGo": "Pay as you go", "PayAsYouGo": "Pay as you go",
"DropdownHint": "You may need to reselect for dropdown changes to take effect",
"CommaSeparated": "Separate multiple items with commas", "CommaSeparated": "Separate multiple items with commas",
"Has": "Has", "Has": "Has",
"None": "None" "None": "None",
"CustomFields": "Custom Fields",
"ClearDate": "Clear Date",
"Clear": "Clear",
"RawText": "Raw Text"
}, },
"Validation": { "Validation": {
"InvalidDate": "Invalid date", "InvalidDate": "Invalid date",
@@ -233,7 +237,8 @@
"MustBeDayWeekMonthYear": "Must be Day/Week/Month/Year", "MustBeDayWeekMonthYear": "Must be Day/Week/Month/Year",
"MustBe1Or2": "Must be 1 or 2", "MustBe1Or2": "Must be 1 or 2",
"DigitsOnly": "Digits only", "DigitsOnly": "Digits only",
"InvalidForm": "Invalid form" "InvalidForm": "Invalid form",
"InvalidJSON": "Invalid JSON"
}, },
"AlertRules": { "AlertRules": {
"CoverAllServers": "Monitor all servers", "CoverAllServers": "Monitor all servers",
@@ -241,5 +246,13 @@
"IgnoreHint": "{{server}} ID: true/false", "IgnoreHint": "{{server}} ID: true/false",
"IgnoreExample": "e.g., {\"1\": true, \"2\": false}" "IgnoreExample": "e.g., {\"1\": true, \"2\": false}"
}, },
"Search": "Search..." "Search": "Search...",
"Format": "Format",
"Formatted": "Formatted",
"Copy": "Copy",
"Paste": "Paste",
"CopiedToClipboard": "Copied to clipboard",
"ClipboardWriteFailed": "Clipboard write failed",
"PastedFromClipboard": "Pasted from clipboard",
"ClipboardReadFailed": "Clipboard read failed"
} }
src/locales/zh-CN/translation.json
+17 -4
View File
@@ -195,6 +195,7 @@
"Preview": "预览", "Preview": "预览",
"Option": "选项", "Option": "选项",
"PublicNote": { "PublicNote": {
"Label": "公开备注",
"Billing": "账单信息", "Billing": "账单信息",
"Plan": "套餐配置", "Plan": "套餐配置",
"StartDate": "开始时间", "StartDate": "开始时间",
@@ -222,10 +223,13 @@
"CancelNoExpiry": "取消不过期", "CancelNoExpiry": "取消不过期",
"Free": "免费", "Free": "免费",
"PayAsYouGo": "按量付费", "PayAsYouGo": "按量付费",
"DropdownHint": "下拉项需要重新选择才能生效",
"CommaSeparated": "以英文逗号分隔多个", "CommaSeparated": "以英文逗号分隔多个",
"Has": "有", "Has": "有",
"None": "无" "None": "无",
"CustomFields": "自定义字段",
"ClearDate": "清除日期",
"Clear": "清除",
"RawText": "原始文本"
}, },
"Validation": { "Validation": {
"InvalidDate": "无效的日期格式", "InvalidDate": "无效的日期格式",
@@ -233,7 +237,8 @@
"MustBeDayWeekMonthYear": "必须为 Day/Week/Month/Year", "MustBeDayWeekMonthYear": "必须为 Day/Week/Month/Year",
"MustBe1Or2": "只能为 1 或 2", "MustBe1Or2": "只能为 1 或 2",
"DigitsOnly": "仅允许数字", "DigitsOnly": "仅允许数字",
"InvalidForm": "表单校验失败" "InvalidForm": "表单校验失败",
"InvalidJSON": "无效的 JSON"
}, },
"AlertRules": { "AlertRules": {
"CoverAllServers": "监控所有服务器", "CoverAllServers": "监控所有服务器",
@@ -241,5 +246,13 @@
"IgnoreHint": "{{server}}ID: true/false", "IgnoreHint": "{{server}}ID: true/false",
"IgnoreExample": "例如：{\"1\": true, \"2\": false}" "IgnoreExample": "例如：{\"1\": true, \"2\": false}"
}, },
"Search": "搜索..." "Search": "搜索...",
"Format": "格式化",
"Formatted": "已格式化",
"Copy": "复制",
"Paste": "粘贴",
"CopiedToClipboard": "已复制到剪贴板",
"ClipboardWriteFailed": "无法写入剪贴板",
"PastedFromClipboard": "已从剪贴板粘贴",
"ClipboardReadFailed": "无法读取剪贴板"
} }
src/main.tsx
+14 -17
View File
@@ -1,30 +1,27 @@
import { createRoot } from "react-dom/client" import { createRoot } from "react-dom/client"
import { RouterProvider, createBrowserRouter } from "react-router-dom" import { RouterProvider, createBrowserRouter } from "react-router-dom"
import "./index.css" import { TerminalPage } from "./components/terminal"
import "./lib/i18n" import ErrorPage from "./error-page"
import { AuthProvider } from "./hooks/useAuth" import { AuthProvider } from "./hooks/useAuth"
import { NotificationProvider } from "./hooks/useNotfication" import { NotificationProvider } from "./hooks/useNotfication"
import { ServerProvider } from "./hooks/useServer" import { ServerProvider } from "./hooks/useServer"
import "./index.css"
import Root from "./routes/root" import "./lib/i18n"
import ErrorPage from "./error-page"
import ProtectedRoute from "./routes/protect"
import CronPage from "./routes/cron"
import LoginPage from "./routes/login"
import ServerPage from "./routes/server"
import ServicePage from "./routes/service"
import { TerminalPage } from "./components/terminal"
import DDNSPage from "./routes/ddns"
import NATPage from "./routes/nat"
import NotificationGroupPage from "./routes/notification-group"
import ServerGroupPage from "./routes/server-group"
import AlertRulePage from "./routes/alert-rule" import AlertRulePage from "./routes/alert-rule"
import CronPage from "./routes/cron"
import DDNSPage from "./routes/ddns"
import LoginPage from "./routes/login"
import NATPage from "./routes/nat"
import NotificationPage from "./routes/notification" import NotificationPage from "./routes/notification"
import NotificationGroupPage from "./routes/notification-group"
import OnlineUserPage from "./routes/online-user" import OnlineUserPage from "./routes/online-user"
import ProfilePage from "./routes/profile" import ProfilePage from "./routes/profile"
import ProtectedRoute from "./routes/protect"
import Root from "./routes/root"
import ServerPage from "./routes/server"
import ServerGroupPage from "./routes/server-group"
import ServicePage from "./routes/service"
import SettingsPage from "./routes/settings" import SettingsPage from "./routes/settings"
import UserPage from "./routes/user" import UserPage from "./routes/user"
import WAFPage from "./routes/waf" import WAFPage from "./routes/waf"