ouyang/wr.do
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

upd table list

Browse Source
This commit is contained in:
oiov
2025-04-17 16:36:23 +08:00
parent 88c0e046a7
commit e9f8788ca7
5 changed files with 35 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/(protected)/admin/users/user-list.tsx
+2 -2
View File
@@ -203,7 +203,7 @@ export default function UsersList({ user }: UrlListProps) {
Status
</TableHead>
<TableHead className="col-span-1 hidden items-center justify-center font-bold sm:flex">
CreatedAt
Join
</TableHead>
<TableHead className="col-span-1 flex items-center justify-center font-bold">
Actions
@@ -252,7 +252,7 @@ export default function UsersList({ user }: UrlListProps) {
</TableCell>
<TableCell className="col-span-1 hidden justify-center sm:flex">
<Badge className="text-xs" variant="outline">
{user.team}
{user.team?.toLocaleUpperCase()}
</Badge>
</TableCell>
<TableCell className="col-span-1 hidden justify-center sm:flex">
app/(protected)/dashboard/urls/live-logs.tsx
+1 -1
View File
@@ -209,7 +209,7 @@ export default function LiveLog({ admin }: { admin: boolean }) {
<TableHeader>
<TableRow className="bg-gray-100/50 text-sm dark:bg-primary-foreground">
<TableHead className="h-8 w-1/6 px-1">Time</TableHead>
<TableHead className="h-8 w-1/12 px-1">Url</TableHead>
<TableHead className="h-8 w-1/12 px-1">Slug</TableHead>
<TableHead className="h-8 px-1">Target</TableHead>
<TableHead className="h-8 w-1/12 px-1">IP</TableHead>
<TableHead className="h-8 w-1/6 px-1">Location</TableHead>
app/(protected)/dashboard/urls/url-list.tsx
+16 -7
View File
@@ -65,7 +65,7 @@ export interface UrlListProps {
function TableColumnSekleton() {
return (
<TableRow className="grid grid-cols-3 items-center sm:grid-cols-10">
<TableCell className="col-span-1 sm:col-span-2">
<TableCell className="col-span-1">
<Skeleton className="h-5 w-20" />
</TableCell>
<TableCell className="col-span-1 sm:col-span-2">
@@ -83,6 +83,9 @@ function TableColumnSekleton() {
<TableCell className="col-span-1 hidden sm:flex">
<Skeleton className="h-5 w-16" />
</TableCell>
<TableCell className="col-span-1 hidden sm:flex">
<Skeleton className="h-5 w-16" />
</TableCell>
<TableCell className="col-span-1 flex">
<Skeleton className="h-5 w-16" />
</TableCell>
@@ -311,9 +314,9 @@ export default function UserUrlsList({ user, action }: UrlListProps) {
<Table>
<TableHeader className="bg-gray-100/50 dark:bg-primary-foreground">
<TableRow className="grid grid-cols-3 items-center sm:grid-cols-10">
<TableRow className="grid grid-cols-3 items-center sm:grid-cols-11">
<TableHead className="col-span-1 flex items-center font-bold sm:col-span-2">
Url
Slug
</TableHead>
<TableHead className="col-span-1 flex items-center font-bold sm:col-span-2">
Target
@@ -330,7 +333,10 @@ export default function UserUrlsList({ user, action }: UrlListProps) {
<TableHead className="col-span-1 hidden items-center font-bold sm:flex">
Updated
</TableHead>
<TableHead className="col-span-1 flex items-center font-bold">
<TableHead className="col-span-1 hidden items-center font-bold sm:flex">
Created
</TableHead>
<TableHead className="col-span-1 flex items-center font-bold sm:col-span-2">
Actions
</TableHead>
</TableRow>
@@ -349,7 +355,7 @@ export default function UserUrlsList({ user, action }: UrlListProps) {
<>
<TableRow
key={short.id}
className="grid animate-fade-in grid-cols-3 items-center animate-in sm:grid-cols-10"
className="grid animate-fade-in grid-cols-3 items-center animate-in sm:grid-cols-11"
>
<TableCell className="col-span-1 flex items-center gap-1 sm:col-span-2">
<Link
@@ -403,10 +409,13 @@ export default function UserUrlsList({ user, action }: UrlListProps) {
<TableCell className="col-span-1 hidden sm:flex">
{expirationTime(short.expiration, short.updatedAt)}
</TableCell>
<TableCell className="col-span-1 hidden sm:flex">
<TableCell className="col-span-1 hidden truncate sm:flex">
{timeAgo(short.updatedAt as Date)}
</TableCell>
<TableCell className="col-span-1 flex items-center gap-1">
<TableCell className="col-span-1 hidden truncate sm:flex">
{timeAgo(short.createdAt as Date)}
</TableCell>
<TableCell className="col-span-1 flex items-center gap-1 sm:col-span-2">
<Button
className="h-7 px-1 text-xs hover:bg-slate-100 dark:hover:text-primary-foreground"
size="sm"
components/layout/user-account-nav.tsx
+15 -2
View File
@@ -16,6 +16,8 @@ import {
} from "@/components/ui/dropdown-menu";
import { UserAvatar } from "@/components/shared/user-avatar";
import { Badge } from "../ui/badge";
export function UserAccountNav() {
const { data: session } = useSession();
const user = session?.user;
@@ -53,7 +55,13 @@ export function UserAccountNav() {
<div className="flex items-center justify-start gap-2 p-2">
<div className="flex flex-col">
{user.name && <p className="font-medium">{user.name}</p>}
<div className="flex items-center gap-2">
<p className="font-medium">{user.name || "Anonymous"}</p>
<Badge className="text-xs" variant="default">
{user.team}
</Badge>
</div>
{user.email && (
<p className="w-[200px] truncate text-muted-foreground">
{user?.email}
@@ -131,7 +139,12 @@ export function UserAccountNav() {
<DropdownMenuContent align="end">
<div className="flex items-center justify-start gap-2 p-2">
<div className="flex flex-col space-y-1 leading-none">
{user.name && <p className="font-medium">{user.name}</p>}
<div className="flex items-center justify-between">
<p className="font-medium">{user.name || "Anonymous"}</p>
<Badge className="text-xs" variant="default">
{user.team}
</Badge>
</div>
{user.email && (
<p className="w-[200px] truncate text-sm text-muted-foreground">
{user?.email}
public/sw.js.map
+1 -1
View File
File diff suppressed because one or more lines are too long