sarlink/sarlink-portal
7
0
Fork 0
mirror of https://github.com/i701/sarlink-portal.git synced 2025-07-01 03:05:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat(portal-ui): enhance user and device information display in admin and user devices tables ✨

Browse Source
This commit is contained in:
i701
2025-06-30 22:58:44 +05:00
parent 01b064aee7
commit 3cd3bbad16
5 changed files with 29 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
components/admin/admin-devices-table.tsx
View File

@ -16,7 +16,6 @@ import {
import { cn } from "@/lib/utils";
import { getDevices } from "@/queries/devices";
import { tryCatch } from "@/utils/tryCatch";
import AddDevicesToCartButton from "../add-devices-to-cart-button";
import BlockDeviceDialog from "../block-device-dialog";
import ClientErrorMessage from "../client-error-message";
import DeviceCard from "../device-card";
@ -130,15 +129,23 @@ export async function AdminDevicesTable({
)}
</div>
</TableCell>
<TableCell className="font-medium">{device.user}</TableCell>
<TableCell className="font-medium">
<div className="flex flex-col items-start">
{device?.user?.name}
<span className="text-muted-foreground">{device?.user?.id_card}</span>
</div>
</TableCell>
<TableCell className="font-medium">{device.mac}</TableCell>
<TableCell className="font-medium">{device?.vendor}</TableCell>
<TableCell>
<BlockDeviceDialog
admin={isAdmin}
type={device.blocked ? "unblock" : "block"}
device={device}
/>
{!device.has_a_pending_payment && (
<BlockDeviceDialog
admin={isAdmin}
type={device.blocked ? "unblock" : "block"}
device={device}
/>
)}
</TableCell>
</TableRow>
))}

4
components/devices-table.tsx
View File

@ -1,3 +1,5 @@
import { redirect } from "next/navigation";
import { getServerSession } from "next-auth";
import { authOptions } from "@/app/auth";
import {
Table,
@ -11,8 +13,6 @@ import {
} from "@/components/ui/table";
import { getDevices } from "@/queries/devices";
import { tryCatch } from "@/utils/tryCatch";
import { getServerSession } from "next-auth";
import { redirect } from "next/navigation";
import ClickableRow from "./clickable-row";
import ClientErrorMessage from "./client-error-message";
import DeviceCard from "./device-card";