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

Merge upstream/main

Browse Source
This commit is contained in:
Buriburizaem0n
2026-04-16 11:52:58 +08:00
parent ead00a49cf f4696421ec
commit e848a34fe7
80 changed files with 9318 additions and 773 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/routes/alert-rule.tsx
+1 -1
View File
@@ -144,7 +144,7 @@ export default function AlertRulePage() {
<div className="flex mt-6 mb-4">
<NotificationTab className="flex-1 mr-4 sm:max-w-[40%]" />
<HeaderButtonGroup
className="flex-2 flex gap-2 ml-auto"
className="flex ml-auto self-end sm:self-auto gap-2 flex-wrap shrink-0"
delete={{
fn: deleteAlertRules,
id: selectedRows.map((r) => r.original.id),
src/routes/cron.tsx
+4 -4
View File
@@ -208,11 +208,11 @@ export default function CronPage() {
const selectedRows = table.getSelectedRowModel().rows
return (
<div className="px-3">
<div className="flex mt-6 mb-4">
<h1 className="flex-1 text-3xl font-bold tracking-tight">{t("Task")}</h1>
<div className="px-3 max-w-7xl mx-auto">
<div className="flex flex-col sm:flex-row sm:items-center justify-between w-full gap-3 mt-6 mb-4">
<h1 className="text-3xl font-bold tracking-tight">{t("Task")}</h1>
<HeaderButtonGroup
className="flex-2 flex ml-auto gap-2"
className="flex gap-2 flex-wrap shrink-0"
delete={{
fn: deleteCron,
id: selectedRows.map((r) => r.original.id),
src/routes/ddns.tsx
+1 -1
View File
@@ -149,7 +149,7 @@ export default function DDNSPage() {
<div className="flex mt-6 mb-4">
<h1 className="flex-1 text-3xl font-bold tracking-tight">{t("DDNS")}</h1>
<HeaderButtonGroup
className="flex-2 flex ml-auto gap-2"
className="flex ml-auto self-end sm:self-auto gap-2 flex-wrap shrink-0"
delete={{
fn: deleteDDNSProfiles,
id: selectedRows.map((r) => r.original.id),
src/routes/nat.tsx
+1 -1
View File
@@ -132,7 +132,7 @@ export default function NATPage() {
<div className="flex mt-6 mb-4">
<h1 className="flex-1 text-3xl font-bold tracking-tight"> {t("NATT")}</h1>
<HeaderButtonGroup
className="flex-2 flex ml-auto gap-2"
className="flex ml-auto self-end sm:self-auto gap-2 flex-wrap shrink-0"
delete={{
fn: deleteNAT,
id: selectedRows.map((r) => r.original.id),
src/routes/notification-group.tsx
+1 -1
View File
@@ -125,7 +125,7 @@ export default function NotificationGroupPage() {
<div className="flex mt-6 mb-4">
<GroupTab className="flex-1 mr-4 sm:max-w-[40%]" />
<HeaderButtonGroup
className="flex-2 flex gap-2 ml-auto"
className="flex ml-auto self-end sm:self-auto gap-2 flex-wrap shrink-0"
delete={{
fn: deleteNotificationGroups,
id: selectedRows.map((r) => r.original.group.id),
src/routes/notification.tsx
+1 -1
View File
@@ -140,7 +140,7 @@ export default function NotificationPage() {
<div className="flex mt-6 mb-4">
<NotificationTab className="flex-1 mr-4 sm:max-w-[40%]" />
<HeaderButtonGroup
className="flex-2 flex gap-2 ml-auto"
className="flex ml-auto self-end sm:self-auto gap-2 flex-wrap shrink-0"
delete={{
fn: deleteNotification,
id: selectedRows.map((r) => r.original.id),
src/routes/online-user.tsx
+2 -2
View File
@@ -40,7 +40,7 @@ export default function OnlineUserPage() {
// 计算 offset
const offset = (page - 1) * pageSize
const { data, mutate, error, isLoading } = useSWR<ModelOnlineUserApi>(
const { data, mutate, error, isLoading } = useSWR<ModelOnlineUserApi, Error>(
`/api/v1/online-user?offset=${offset}&limit=${pageSize}`,
swrFetcher,
)
@@ -128,7 +128,7 @@ export default function OnlineUserPage() {
return data?.value ?? []
}, [data])
const table = useReactTable({
const table = useReactTable<ModelOnlineUser>({
data: dataCache,
columns,
getCoreRowModel: getCoreRowModel(),
src/routes/server-group.tsx
+1 -1
View File
@@ -125,7 +125,7 @@ export default function ServerGroupPage() {
<div className="flex mt-6 mb-4">
<GroupTab className="flex-1 mr-4 sm:max-w-[40%]" />
<HeaderButtonGroup
className="flex-2 flex ml-auto gap-2"
className="flex ml-auto self-end sm:self-auto gap-2 flex-wrap shrink-0"
delete={{
fn: deleteServerGroups,
id: selectedRows.map((r) => r.original.group.id),
src/routes/server.tsx
+85 -50
View File
@@ -11,6 +11,12 @@ import { ServerConfigCard } from "@/components/server-config"
import { ServerConfigCardBatch } from "@/components/server-config-batch"
import { TerminalButton } from "@/components/terminal"
import { Checkbox } from "@/components/ui/checkbox"
import {
DropdownMenu,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuTrigger,
} from "@/components/ui/dropdown-menu"
import {
Table,
TableBody,
@@ -31,7 +37,10 @@ import useSWR from "swr"
export default function ServerPage() {
const { t } = useTranslation()
const { data, mutate, error, isLoading } = useSWR<Server[]>("/api/v1/server", swrFetcher)
const { data, mutate, error, isLoading } = useSWR<Server[]>("/api/v1/server", swrFetcher, {
revalidateOnFocus: false,
revalidateOnReconnect: false,
})
const { serverGroups } = useServer()
useEffect(() => {
@@ -144,9 +153,27 @@ export default function ServerPage() {
delete={{ fn: deleteServer, id: s.id, mutate: mutate }}
>
<>
<TerminalButton id={s.id} />
<ServerCard mutate={mutate} data={s} />
<ServerConfigCard sid={s.id} variant="outline" />
<DropdownMenu>
<DropdownMenuTrigger asChild>
<IconButton
icon="more"
variant="outline"
aria-label="More actions"
/>
</DropdownMenuTrigger>
<DropdownMenuContent align="end">
<DropdownMenuItem asChild>
<TerminalButton id={s.id} menuItem />
</DropdownMenuItem>
<DropdownMenuItem asChild>
<ServerConfigCard sid={s.id} variant="ghost" menuItem />
</DropdownMenuItem>
<DropdownMenuItem asChild>
<InstallCommandsMenu uuid={s.uuid} menuItem />
</DropdownMenuItem>
</DropdownMenuContent>
</DropdownMenu>
</>
</ActionButtonGroup>
)
@@ -167,11 +194,11 @@ export default function ServerPage() {
const selectedRows = table.getSelectedRowModel().rows
return (
<div className="px-3">
<div className="flex mt-6 mb-4">
<div className="px-3 max-w-7xl mx-auto">
<div className="flex flex-col sm:flex-row sm:items-center justify-between w-full gap-3 mt-6 mb-4">
<h1 className="text-3xl font-bold tracking-tight">{t("Server")}</h1>
<HeaderButtonGroup
className="flex-2 flex ml-auto gap-2"
className="flex gap-2 flex-wrap shrink-0"
delete={{
fn: deleteServer,
id: selectedRows.map((r) => r.original.id).filter(Boolean) as number[],
@@ -222,51 +249,59 @@ export default function ServerPage() {
<InstallCommandsMenu className="shadow-[inset_0_1px_0_rgba(255,255,255,0.2)] bg-blue-700 text-white hover:bg-blue-600 dark:hover:bg-blue-800 rounded-lg" />
</HeaderButtonGroup>
</div>
<Table>
<TableHeader>
{table.getHeaderGroups().map((headerGroup) => (
<TableRow key={headerGroup.id}>
{headerGroup.headers.map((header) => {
return (
<TableHead key={header.id} className="text-sm">
{header.isPlaceholder
? null
: flexRender(
header.column.columnDef.header,
header.getContext(),
)}
</TableHead>
)
})}
</TableRow>
))}
</TableHeader>
<TableBody>
{isLoading ? (
<TableRow>
<TableCell colSpan={columns.length} className="h-24 text-center">
{t("Loading")}...
</TableCell>
</TableRow>
) : table.getRowModel().rows?.length ? (
table.getRowModel().rows.map((row) => (
<TableRow key={row.id} data-state={row.getIsSelected() && "selected"}>
{row.getVisibleCells().map((cell) => (
<TableCell key={cell.id} className="text-xsm">
{flexRender(cell.column.columnDef.cell, cell.getContext())}
</TableCell>
))}
<div className="rounded-md border overflow-x-auto">
<Table className="min-w-[960px]">
<TableHeader className="sticky top-0 bg-background z-10">
{table.getHeaderGroups().map((headerGroup) => (
<TableRow key={headerGroup.id}>
{headerGroup.headers.map((header) => {
return (
<TableHead key={header.id} className="text-sm">
{header.isPlaceholder
? null
: flexRender(
header.column.columnDef.header,
header.getContext(),
)}
</TableHead>
)
})}
</TableRow>
))
) : (
<TableRow>
<TableCell colSpan={columns.length} className="h-24 text-center">
{t("NoResults")}
</TableCell>
</TableRow>
)}
</TableBody>
</Table>
))}
</TableHeader>
<TableBody>
{isLoading ? (
<TableRow>
<TableCell colSpan={columns.length} className="h-24 text-center">
{t("Loading")}...
</TableCell>
</TableRow>
) : table.getRowModel().rows?.length ? (
table.getRowModel().rows.map((row) => (
<TableRow
key={row.id}
data-state={row.getIsSelected() && "selected"}
>
{row.getVisibleCells().map((cell) => (
<TableCell key={cell.id} className="text-xsm">
{flexRender(
cell.column.columnDef.cell,
cell.getContext(),
)}
</TableCell>
))}
</TableRow>
))
) : (
<TableRow>
<TableCell colSpan={columns.length} className="h-24 text-center">
{t("NoResults")}
</TableCell>
</TableRow>
)}
</TableBody>
</Table>
</div>
</div>
)
}
src/routes/service.tsx
+5 -5
View File
@@ -60,7 +60,7 @@ export default function ServicePage() {
{
header: "ID",
accessorKey: "id",
accessorFn: (row) => row.id,
accessorFn: (row) => `${row.id}(${row.display_index ?? 0})`,
},
{
header: t("Name"),
@@ -174,11 +174,11 @@ export default function ServicePage() {
const selectedRows = table.getSelectedRowModel().rows
return (
<div className="px-3">
<div className="flex mt-6 mb-4">
<h1 className="flex-1 text-3xl font-bold tracking-tight">{t("Services")}</h1>
<div className="px-3 max-w-7xl mx-auto">
<div className="flex flex-col sm:flex-row sm:items-center justify-between w-full gap-3 mt-6 mb-4">
<h1 className="text-3xl font-bold tracking-tight">{t("Service")}</h1>
<HeaderButtonGroup
className="flex-2 flex ml-auto gap-2"
className="flex gap-2 flex-wrap shrink-0"
delete={{
fn: deleteService,
id: selectedRows.map((r) => r.original.id),
src/routes/settings.tsx
+17 -8
View File
@@ -21,6 +21,8 @@ import {
SelectValue,
} from "@/components/ui/select"
import { Textarea } from "@/components/ui/textarea"
import { Combobox } from "@/components/ui/combobox"
import { useNotification } from "@/hooks/useNotfication"
import { useAuth } from "@/hooks/useAuth"
import useSetting from "@/hooks/useSetting"
import { asOptionalField } from "@/lib/utils"
@@ -58,14 +60,20 @@ export default function SettingsPage() {
const { profile } = useAuth()
const navigate = useNavigate()
const { notifierGroup } = useNotification()
const ngroupList = notifierGroup?.map((ng) => ({
value: `${ng.group.id}`,
label: ng.group.name,
})) || [{ value: "", label: "" }]
const isAdmin = profile?.role === 0
if (!isAdmin) {
navigate("/dashboard/settings/online-user")
}
const form = useForm<z.infer<typeof settingFormSchema>>({
resolver: zodResolver(settingFormSchema),
const form = useForm({
resolver: zodResolver(settingFormSchema) as any,
defaultValues: config
? {
...config.config,
@@ -92,7 +100,7 @@ export default function SettingsPage() {
}
}, [config?.config, form])
const onSubmit = async (values: z.infer<typeof settingFormSchema>) => {
const onSubmit = async (values: any) => {
try {
await updateSettings(values)
form.reset()
@@ -448,12 +456,13 @@ export default function SettingsPage() {
name="ip_change_notification_group_id"
render={({ field }) => (
<FormItem>
<FormLabel>{t("NotifierGroupID")}</FormLabel>
<FormLabel>{t("NotifierGroup")}</FormLabel>
<FormControl>
<Input
placeholder="0"
type="number"
{...field}
<Combobox
placeholder={t("Search")}
options={ngroupList}
onValueChange={field.onChange}
defaultValue={field.value?.toString()}
/>
</FormControl>
<FormMessage />
src/routes/user.tsx
+2 -1
View File
@@ -77,7 +77,8 @@ export default function UserPage() {
{
header: t("LastLogin"),
accessorKey: "updated_at",
accessorFn: (row) => row.updated_at ? new Date(row.updated_at).toLocaleString() : t("Never"),
accessorFn: (row) =>
row.updated_at ? new Date(row.updated_at).toLocaleString() : t("Never"),
},
{
id: "actions",