show site type

This commit is contained in:
Milo Schwartz
2024-11-24 22:48:17 -05:00
parent ce2bfcddd5
commit 8c02367507
6 changed files with 54 additions and 25 deletions

View File

@@ -81,7 +81,7 @@ export default function UsersTable({ roles: r }: RolesTableProps) {
<DropdownMenuContent align="end">
<DropdownMenuItem>
<button
className="text-red-600 hover:text-red-800"
className="text-red-500"
onClick={() => {
setIsDeleteModalOpen(true);
setUserToRemove(roleRow);

View File

@@ -99,7 +99,7 @@ export default function UsersTable({ users: u }: UsersTableProps) {
return (
<div className="flex flex-row items-center gap-1">
{userRow.isOwner && <Crown className="w-4 h-4" />}
{userRow.isOwner && <Crown className="w-4 h-4 text-yellow-600" />}
<span>{userRow.role}</span>
</div>
);
@@ -138,13 +138,13 @@ export default function UsersTable({ users: u }: UsersTableProps) {
{userRow.email !== user?.email && (
<DropdownMenuItem>
<button
className="text-red-600 hover:text-red-800"
className="text-red-500"
onClick={() => {
setIsDeleteModalOpen(
true
true,
);
setSelectedUser(
userRow
userRow,
);
}}
>
@@ -159,7 +159,7 @@ export default function UsersTable({ users: u }: UsersTableProps) {
className="ml-2"
onClick={() =>
router.push(
`/${org?.org.orgId}/settings/access/users/${userRow.id}`
`/${org?.org.orgId}/settings/access/users/${userRow.id}`,
)
}
>
@@ -185,7 +185,7 @@ export default function UsersTable({ users: u }: UsersTableProps) {
title: "Failed to remove user",
description: formatAxiosError(
e,
"An error occurred while removing the user."
"An error occurred while removing the user.",
),
});
});
@@ -198,7 +198,7 @@ export default function UsersTable({ users: u }: UsersTableProps) {
});
setUsers((prev) =>
prev.filter((u) => u.id !== selectedUser?.id)
prev.filter((u) => u.id !== selectedUser?.id),
);
}
}

View File

@@ -117,7 +117,7 @@ export default function SitesTable({ resources, orgId }: ResourcesTableProps) {
},
{
accessorKey: "domain",
header: "Domain",
header: "Full URL",
cell: ({ row }) => {
const resourceRow = row.original;
return (

View File

@@ -27,6 +27,7 @@ export type SiteRow = {
mbIn: string;
mbOut: string;
orgId: string;
type: "newt" | "wireguard";
};
type SitesTableProps = {
@@ -105,6 +106,29 @@ export default function SitesTable({ sites, orgId }: SitesTableProps) {
accessorKey: "mbOut",
header: "MB Out",
},
{
accessorKey: "type",
header: "Connection Type",
cell: ({ row }) => {
const originalRow = row.original;
if (originalRow.type === "newt") {
return (
<div className="flex items-center space-x-2">
<span>Newt</span>
</div>
);
}
if (originalRow.type === "wireguard") {
return (
<div className="flex items-center space-x-2">
<span>WireGuard</span>
</div>
);
}
},
},
{
id: "actions",
cell: ({ row }) => {
@@ -135,7 +159,7 @@ export default function SitesTable({ sites, orgId }: SitesTableProps) {
setSelectedSite(siteRow);
setIsDeleteModalOpen(true);
}}
className="text-red-600 hover:text-red-800"
className="text-red-500"
>
Delete
</button>
@@ -147,7 +171,7 @@ export default function SitesTable({ sites, orgId }: SitesTableProps) {
className="ml-2"
onClick={() =>
router.push(
`/${siteRow.orgId}/settings/sites/${siteRow.nice}`
`/${siteRow.orgId}/settings/sites/${siteRow.nice}`,
)
}
>

View File

@@ -40,6 +40,7 @@ export default async function SitesPage(props: SitesPageProps) {
mbIn: formatSize(site.megabytesIn || 0),
mbOut: formatSize(site.megabytesOut || 0),
orgId: params.orgId,
type: site.type as any,
};
});