🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
refactor(admin): streamline admin components and enhance user experience
Bill Yang34d601547734
diff --git a/client/src/api/admin/getAdminSites.ts b/client/src/api/admin/getAdminSites.tsindex 83c752b89..81c8557fa 100644--- a/client/src/api/admin/getAdminSites.ts+++ b/client/src/api/admin/getAdminSites.ts@@ -19,6 +19,5 @@ export function useAdminSites() {return useQuery<AdminSiteData[]>({queryKey: ["admin-sites"],queryFn: getAdminSites,- staleTime: 60000, // 1 minute});}diff --git a/client/src/api/admin/getAdminUsers.ts b/client/src/api/admin/getAdminUsers.tsindex bb07e76ae..e9f05c792 100644--- a/client/src/api/admin/getAdminUsers.ts+++ b/client/src/api/admin/getAdminUsers.ts@@ -25,6 +25,5 @@ export function useAdminUsers() {return useQuery<AdminUserData[]>({queryKey: ["admin-users"],queryFn: getAdminUsers,- staleTime: 60000, // 1 minute});}diff --git a/client/src/app/admin/components/shared/AdminLayout.tsx b/client/src/app/admin/components/shared/AdminLayout.tsxnew file mode 100644index 000000000..7721a0576--- /dev/null+++ b/client/src/app/admin/components/shared/AdminLayout.tsx@@ -0,0 +1,50 @@+"use client";++import { ReactNode } from "react";+import { redirect } from "next/navigation";+import { AlertCircle } from "lucide-react";+import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";+import { Button } from "@/components/ui/button";+import { useAdminPermission } from "../../hooks/useAdminPermission";++interface AdminLayoutProps {+ children: ReactNode;+ title: string;+ showStopImpersonating?: boolean;+}++export function AdminLayout({+ children,+ title,+ showStopImpersonating = false,+}: AdminLayoutProps) {+ const { isAdmin, isImpersonating, isCheckingAdmin, stopImpersonating } =+ useAdminPermission();++ // If not admin, show access denied+ if (!isAdmin && !isCheckingAdmin) {+ redirect("/");+ }++ if (isCheckingAdmin) {+ return (+ <div className="flex items-center justify-center min-h-[200px]">+ <div className="animate-spin rounded-full h-8 w-8 border-b-2 border-neutral-400"></div>+ </div>+ );+ }++ return (+ <div>+ <div className="flex items-center justify-between mb-6">+ <h2 className="text-xl font-bold">{title}</h2>+ {showStopImpersonating && isImpersonating && (+ <Button onClick={stopImpersonating} variant="destructive">+ Stop Impersonating+ </Button>+ )}+ </div>+ {children}+ </div>+ );+}diff --git a/client/src/app/admin/components/sites/SiteTablePagination.tsx b/client/src/app/admin/components/shared/AdminTablePagination.tsxsimilarity index 61%rename from client/src/app/admin/components/sites/SiteTablePagination.tsxrename to client/src/app/admin/components/shared/AdminTablePagination.tsxindex 222daa650..ab29f5735 100644--- a/client/src/app/admin/components/sites/SiteTablePagination.tsx+++ b/client/src/app/admin/components/shared/AdminTablePagination.tsx@@ -1,32 +1,33 @@"use client";import { Table } from "@tanstack/react-table";-import { AdminSiteData } from "@/api/admin/getAdminSites";import { TablePagination } from "@/components/pagination";-interface SitePaginationProps {- table: Table<AdminSiteData>;- data: AdminSiteData[] | undefined;+interface AdminTablePaginationProps<TData> {+ table: Table<TData>;+ data: { items: TData[]; total: number } | undefined;pagination: { pageIndex: number; pageSize: number };setPagination: (value: { pageIndex: number; pageSize: number }) => void;isLoading: boolean;+ itemName: string;}-export function SiteTablePagination({+export function AdminTablePagination<TData>({table,data,pagination,setPagination,isLoading,-}: SitePaginationProps) {+ itemName,+}: AdminTablePaginationProps<TData>) {return (<TablePaginationtable={table}- data={data ? { items: data, total: data.length } : undefined}+ data={data}pagination={pagination}setPagination={setPagination}isLoading={isLoading}- itemName="sites"+ itemName={itemName}/>);}diff --git a/client/src/app/admin/components/shared/ErrorAlert.tsx b/client/src/app/admin/components/shared/ErrorAlert.tsxnew file mode 100644index 000000000..f8e6728ca--- /dev/null+++ b/client/src/app/admin/components/shared/ErrorAlert.tsx@@ -0,0 +1,24 @@+"use client";++import { AlertCircle } from "lucide-react";+import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";++interface ErrorAlertProps {+ title?: string;+ message?: string;+ className?: string;+}++export function ErrorAlert({+ title = "Error",+ message = "An error occurred. Please try again later.",+ className = "mb-4",+}: ErrorAlertProps) {+ return (+ <Alert variant="destructive" className={className}>+ <AlertCircle className="h-4 w-4" />+ <AlertTitle>{title}</AlertTitle>+ <AlertDescription>{message}</AlertDescription>+ </Alert>+ );+}diff --git a/client/src/app/admin/components/shared/SearchInput.tsx b/client/src/app/admin/components/shared/SearchInput.tsxnew file mode 100644index 000000000..60fca58f8--- /dev/null+++ b/client/src/app/admin/components/shared/SearchInput.tsx@@ -0,0 +1,30 @@+"use client";++import { Search } from "lucide-react";+import { Input } from "@/components/ui/input";++interface SearchInputProps {+ value: string;+ onChange: (value: string) => void;+ placeholder?: string;+ className?: string;+}++export function SearchInput({+ value,+ onChange,+ placeholder = "Search...",+ className = "max-w-sm",+}: SearchInputProps) {+ return (+ <div className={`relative ${className}`}>+ <Search className="absolute left-2.5 top-2.5 h-4 w-4 text-neutral-400" />+ <Input+ placeholder={placeholder}+ value={value}+ onChange={(e) => onChange(e.target.value)}+ className="pl-9 bg-neutral-900 border-neutral-700"+ />+ </div>+ );+}diff --git a/client/src/app/admin/components/shared/SortableHeader.tsx b/client/src/app/admin/components/shared/SortableHeader.tsxnew file mode 100644index 000000000..961b7bf49--- /dev/null+++ b/client/src/app/admin/components/shared/SortableHeader.tsx@@ -0,0 +1,36 @@+"use client";++import { Button } from "@/components/ui/button";+import { ArrowDown, ArrowUp, ArrowUpDown } from "lucide-react";+import { Column } from "@tanstack/react-table";++interface SortableHeaderProps<TData> {+ column: Column<TData, unknown>;+ children: React.ReactNode;+ className?: string;+}++export function SortableHeader<TData>({+ column,+ children,+ className = "p-0 hover:bg-transparent",+}: SortableHeaderProps<TData>) {+ const sortDirection = column.getIsSorted();++ return (+ <Button+ variant="ghost"+ onClick={() => column.toggleSorting(sortDirection === "asc")}+ className={className}+ >+ {children}+ {sortDirection === "asc" ? (+ <ArrowUp className="ml-2 h-4 w-4" />+ ) : sortDirection === "desc" ? (+ <ArrowDown className="ml-2 h-4 w-4" />+ ) : (+ <ArrowUpDown className="ml-2 h-4 w-4" />+ )}+ </Button>+ );+}diff --git a/client/src/app/admin/components/sites/Sites.tsx b/client/src/app/admin/components/sites/Sites.tsxindex 505bb1998..7b00c3546 100644--- a/client/src/app/admin/components/sites/Sites.tsx+++ b/client/src/app/admin/components/sites/Sites.tsx@@ -13,10 +13,6 @@ import {import { Badge } from "@/components/ui/badge";import { Skeleton } from "@/components/ui/skeleton";import { formatDistanceToNow } from "date-fns";-import { AlertCircle, ArrowDown, ArrowUp, ArrowUpDown } from "lucide-react";-import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";-import { Input } from "@/components/ui/input";-import { Button } from "@/components/ui/button";import {ColumnDef,flexRender,@@ -26,7 +22,11 @@ import {SortingState,getPaginationRowModel,} from "@tanstack/react-table";-import { SiteTablePagination } from "./SiteTablePagination";+import { AdminTablePagination } from "../shared/AdminTablePagination";+import { SortableHeader } from "../shared/SortableHeader";+import { SearchInput } from "../shared/SearchInput";+import { ErrorAlert } from "../shared/ErrorAlert";+import { AdminLayout } from "../shared/AdminLayout";import Link from "next/link";export function Sites() {@@ -60,19 +60,7 @@ export function Sites() {{accessorKey: "siteId",header: ({ column }) => (- <Button- variant="ghost"- onClick={() => column.toggleSorting(column.getIsSorted() === "asc")}- className="p-0 hover:bg-transparent"- >- Site ID- {{- asc: <ArrowUp className="ml-2 h-4 w-4" />,- desc: <ArrowDown className="ml-2 h-4 w-4" />,- }[column.getIsSorted() as string] ?? (- <ArrowUpDown className="ml-2 h-4 w-4" />- )}- </Button>+ <SortableHeader column={column}>Site ID</SortableHeader>),cell: ({ row }) => (<div>@@ -89,19 +77,7 @@ export function Sites() {{accessorKey: "domain",header: ({ column }) => (- <Button- variant="ghost"- onClick={() => column.toggleSorting(column.getIsSorted() === "asc")}- className="p-0 hover:bg-transparent"- >- Domain- {{- asc: <ArrowUp className="ml-2 h-4 w-4" />,- desc: <ArrowDown className="ml-2 h-4 w-4" />,- }[column.getIsSorted() as string] ?? (- <ArrowUpDown className="ml-2 h-4 w-4" />- )}- </Button>+ <SortableHeader column={column}>Domain</SortableHeader>),cell: ({ row }) => (<div className="font-medium">@@ -118,19 +94,7 @@ export function Sites() {{accessorKey: "createdAt",header: ({ column }) => (- <Button- variant="ghost"- onClick={() => column.toggleSorting(column.getIsSorted() === "asc")}- className="p-0 hover:bg-transparent"- >- Created- {{- asc: <ArrowUp className="ml-2 h-4 w-4" />,- desc: <ArrowDown className="ml-2 h-4 w-4" />,- }[column.getIsSorted() as string] ?? (- <ArrowUpDown className="ml-2 h-4 w-4" />- )}- </Button>+ <SortableHeader column={column}>Created</SortableHeader>),cell: ({ row }) => (<div>@@ -143,19 +107,7 @@ export function Sites() {{accessorKey: "public",header: ({ column }) => (- <Button- variant="ghost"- onClick={() => column.toggleSorting(column.getIsSorted() === "asc")}- className="p-0 hover:bg-transparent"- >- Public- {{- asc: <ArrowUp className="ml-2 h-4 w-4" />,- desc: <ArrowDown className="ml-2 h-4 w-4" />,- }[column.getIsSorted() as string] ?? (- <ArrowUpDown className="ml-2 h-4 w-4" />- )}- </Button>+ <SortableHeader column={column}>Public</SortableHeader>),cell: ({ row }) => (<div>@@ -170,19 +122,7 @@ export function Sites() {{accessorKey: "eventsLast24Hours",header: ({ column }) => (- <Button- variant="ghost"- onClick={() => column.toggleSorting(column.getIsSorted() === "asc")}- className="p-0 hover:bg-transparent"- >- Events (24h)- {{- asc: <ArrowUp className="ml-2 h-4 w-4" />,- desc: <ArrowDown className="ml-2 h-4 w-4" />,- }[column.getIsSorted() as string] ?? (- <ArrowUpDown className="ml-2 h-4 w-4" />- )}- </Button>+ <SortableHeader column={column}>Events (24h)</SortableHeader>),cell: ({ row }) => (<div>@@ -193,19 +133,7 @@ export function Sites() {{accessorKey: "organizationOwnerEmail",header: ({ column }) => (- <Button- variant="ghost"- onClick={() => column.toggleSorting(column.getIsSorted() === "asc")}- className="p-0 hover:bg-transparent"- >- Owner Email- {{- asc: <ArrowUp className="ml-2 h-4 w-4" />,- desc: <ArrowDown className="ml-2 h-4 w-4" />,- }[column.getIsSorted() as string] ?? (- <ArrowUpDown className="ml-2 h-4 w-4" />- )}- </Button>+ <SortableHeader column={column}>Owner Email</SortableHeader>),cell: ({ row }) => (<div>{row.getValue("organizationOwnerEmail") || "-"}</div>@@ -233,28 +161,19 @@ export function Sites() {if (isError) {return (- <Alert variant="destructive" className="mb-4">- <AlertCircle className="h-4 w-4" />- <AlertTitle>Error</AlertTitle>- <AlertDescription>- Failed to load sites data. Please try again later.- </AlertDescription>- </Alert>+ <AdminLayout title="Sites">+ <ErrorAlert message="Failed to load sites data. Please try again later." />+ </AdminLayout>);}return (- <div>- <div className="flex items-center justify-between mb-6">- <h2 className="text-xl font-bold">Sites</h2>- </div>-+ <AdminLayout title="Sites"><div className="mb-4">- <Input+ <SearchInputplaceholder="Search by domain or owner email..."value={searchQuery}- onChange={(e) => setSearchQuery(e.target.value)}- className="max-w-sm"+ onChange={setSearchQuery}/></div>@@ -332,14 +251,19 @@ export function Sites() {</div><div className="mt-4">- <SiteTablePagination+ <AdminTablePaginationtable={table}- data={filteredSites}+ data={+ filteredSites+ ? { items: filteredSites, total: filteredSites.length }+ : undefined+ }pagination={pagination}setPagination={setPagination}isLoading={isLoading}+ itemName="sites"/></div>- </div>+ </AdminLayout>);}diff --git a/client/src/app/admin/components/users/OrgUsersList.tsx b/client/src/app/admin/components/users/OrgUsersList.tsxindex c4e688cca..055798719 100644--- a/client/src/app/admin/components/users/OrgUsersList.tsx+++ b/client/src/app/admin/components/users/OrgUsersList.tsx@@ -1,6 +1,6 @@"use client";-import { useState, useMemo } from "react";+import { useState, useMemo, useCallback } from "react";import { useRouter } from "next/navigation";import { useAdminUsers, AdminUserData } from "@/api/admin/getAdminUsers";import {@@ -14,17 +14,7 @@ import {import { Badge } from "@/components/ui/badge";import { Skeleton } from "@/components/ui/skeleton";import { formatDistanceToNow } from "date-fns";-import {- AlertCircle,- ChevronDown,- ChevronRight,- User,- ArrowDown,- ArrowUp,- ArrowUpDown,-} from "lucide-react";-import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";-import { Input } from "@/components/ui/input";+import { ChevronDown, ChevronRight, User } from "lucide-react";import Link from "next/link";import { Button } from "@/components/ui/button";import { TablePagination } from "@/components/pagination";@@ -38,6 +28,10 @@ import {getSortedRowModel,SortingState,} from "@tanstack/react-table";+import { SortableHeader } from "../shared/SortableHeader";+import { SearchInput } from "../shared/SearchInput";+import { ErrorAlert } from "../shared/ErrorAlert";+import { AdminLayout } from "../shared/AdminLayout";export function OrgUsersList() {const router = useRouter();@@ -50,27 +44,56 @@ export function OrgUsersList() {pageSize: 50,});- const toggleExpand = (userId: string) => {- const newExpanded = new Set(expandedUsers);- if (newExpanded.has(userId)) {- newExpanded.delete(userId);- } else {- newExpanded.add(userId);- }- setExpandedUsers(newExpanded);- };+ const toggleExpand = useCallback(+ (userId: string) => {+ const newExpanded = new Set(expandedUsers);+ if (newExpanded.has(userId)) {+ newExpanded.delete(userId);+ } else {+ newExpanded.add(userId);+ }+ setExpandedUsers(newExpanded);+ },+ [expandedUsers]+ );// Filter users based on search query- const filteredUsers = users?.filter((user) => {+ const filteredUsers = useMemo(() => {+ if (!users) return [];++ if (!searchQuery.trim()) return users;+const lowerSearchQuery = searchQuery.toLowerCase();- return (- user.name?.toLowerCase().includes(lowerSearchQuery) ||- user.email.toLowerCase().includes(lowerSearchQuery) ||- user.sites.some((site) =>- site.domain.toLowerCase().includes(lowerSearchQuery)- )- );- });+ return users.filter((user) => {+ return (+ user.name?.toLowerCase().includes(lowerSearchQuery) ||+ user.email.toLowerCase().includes(lowerSearchQuery) ||+ user.sites.some((site) =>+ site.domain.toLowerCase().includes(lowerSearchQuery)+ )+ );+ });+ }, [users, searchQuery]);++ // Impersonation handler+ const handleImpersonate = useCallback(+ async (userId: string) => {+ try {+ await authClient.admin.impersonateUser({+ userId,+ });+ window.location.reload();+ router.push("/");+ return true;+ } catch (err) {+ const errorMessage =+ err instanceof Error ? err.message : "Unknown error occurred";+ console.error(`Failed to impersonate user: ${errorMessage}`);+ return false;+ }+ },+ [router]+ );// Define columns for the tableconst columns = useMemo<ColumnDef<AdminUserData>[]>(@@ -97,19 +120,7 @@ export function OrgUsersList() {{accessorKey: "name",header: ({ column }) => (- <Button- variant="ghost"- onClick={() => column.toggleSorting(column.getIsSorted() === "asc")}- className="p-0 hover:bg-transparent"- >- User- {{- asc: <ArrowUp className="ml-2 h-4 w-4" />,- desc: <ArrowDown className="ml-2 h-4 w-4" />,- }[column.getIsSorted() as string] ?? (- <ArrowUpDown className="ml-2 h-4 w-4" />- )}- </Button>+ <SortableHeader column={column}>User</SortableHeader>),cell: ({ row }) => (<div className="font-medium">{row.getValue("name") || "Unnamed"}</div>@@ -118,57 +129,21 @@ export function OrgUsersList() {{accessorKey: "email",header: ({ column }) => (- <Button- variant="ghost"- onClick={() => column.toggleSorting(column.getIsSorted() === "asc")}- className="p-0 hover:bg-transparent"- >- {{- asc: <ArrowUp className="ml-2 h-4 w-4" />,- desc: <ArrowDown className="ml-2 h-4 w-4" />,- }[column.getIsSorted() as string] ?? (- <ArrowUpDown className="ml-2 h-4 w-4" />- )}- </Button>+ <SortableHeader column={column}>Email</SortableHeader>),cell: ({ row }) => row.getValue("email"),},{accessorKey: "role",header: ({ column }) => (- <Button- variant="ghost"- onClick={() => column.toggleSorting(column.getIsSorted() === "asc")}- className="p-0 hover:bg-transparent"- >- Role- {{- asc: <ArrowUp className="ml-2 h-4 w-4" />,- desc: <ArrowDown className="ml-2 h-4 w-4" />,- }[column.getIsSorted() as string] ?? (- <ArrowUpDown className="ml-2 h-4 w-4" />- )}- </Button>+ <SortableHeader column={column}>Role</SortableHeader>),cell: ({ row }) => row.getValue("role"),},{accessorKey: "createdAt",header: ({ column }) => (- <Button- variant="ghost"- onClick={() => column.toggleSorting(column.getIsSorted() === "asc")}- className="p-0 hover:bg-transparent"- >- Created- {{- asc: <ArrowUp className="ml-2 h-4 w-4" />,- desc: <ArrowDown className="ml-2 h-4 w-4" />,- }[column.getIsSorted() as string] ?? (- <ArrowUpDown className="ml-2 h-4 w-4" />- )}- </Button>+ <SortableHeader column={column}>Created</SortableHeader>),cell: ({ row }) =>formatDistanceToNow(new Date(row.getValue("createdAt")), {@@ -178,19 +153,7 @@ export function OrgUsersList() {{accessorKey: "monthlyEventCount",header: ({ column }) => (- <Button- variant="ghost"- onClick={() => column.toggleSorting(column.getIsSorted() === "asc")}- className="p-0 hover:bg-transparent"- >- Monthly Events- {{- asc: <ArrowUp className="ml-2 h-4 w-4" />,- desc: <ArrowDown className="ml-2 h-4 w-4" />,- }[column.getIsSorted() as string] ?? (- <ArrowUpDown className="ml-2 h-4 w-4" />- )}- </Button>+ <SortableHeader column={column}>Monthly Events</SortableHeader>),cell: ({ row }) =>(row.getValue("monthlyEventCount") as number)?.toLocaleString() || 0,@@ -198,19 +161,7 @@ export function OrgUsersList() {{id: "sites",header: ({ column }) => (- <Button- variant="ghost"- onClick={() => column.toggleSorting(column.getIsSorted() === "asc")}- className="p-0 hover:bg-transparent"- >- Sites- {{- asc: <ArrowUp className="ml-2 h-4 w-4" />,- desc: <ArrowDown className="ml-2 h-4 w-4" />,- }[column.getIsSorted() as string] ?? (- <ArrowUpDown className="ml-2 h-4 w-4" />- )}- </Button>+ <SortableHeader column={column}>Sites</SortableHeader>),accessorFn: (row) => row.sites.length,cell: ({ row }) => <Badge>{row.original.sites.length}</Badge>,@@ -233,7 +184,7 @@ export function OrgUsersList() {enableSorting: false,},],- [expandedUsers]+ [toggleExpand, handleImpersonate]);// Initialize the table@@ -290,47 +241,21 @@ export function OrgUsersList() {}),};- // Impersonation handler- const handleImpersonate = async (userId: string) => {- try {- await authClient.admin.impersonateUser({- userId,- });- window.location.reload();- router.push("/");- return true;- } catch (err) {- const errorMessage =- err instanceof Error ? err.message : "Unknown error occurred";- console.error(`Failed to impersonate user: ${errorMessage}`);- return false;- }- };-if (isError) {return (- <Alert variant="destructive" className="mb-4">- <AlertCircle className="h-4 w-4" />- <AlertTitle>Error</AlertTitle>- <AlertDescription>- Failed to load organization users data. Please try again later.- </AlertDescription>- </Alert>+ <AdminLayout title="Organization Owners">+ <ErrorAlert message="Failed to load organization users data. Please try again later." />+ </AdminLayout>);}return (- <div>- <div className="flex items-center justify-between mb-6">- <h2 className="text-xl font-bold">Organization Owners</h2>- </div>-+ <AdminLayout title="Organization Owners"><div className="mb-4">- <Input+ <SearchInputplaceholder="Search by name, email or domain..."value={searchQuery}- onChange={(e) => setSearchQuery(e.target.value)}- className="max-w-sm"+ onChange={setSearchQuery}/></div>@@ -483,6 +408,6 @@ export function OrgUsersList() {itemName="users"/></div>- </div>+ </AdminLayout>);}diff --git a/client/src/app/admin/components/users/UserTablePagination.tsx b/client/src/app/admin/components/users/UserTablePagination.tsxdeleted file mode 100644index 30e08b4dc..000000000--- a/client/src/app/admin/components/users/UserTablePagination.tsx+++ /dev/null@@ -1,32 +0,0 @@-"use client";--import { Table } from "@tanstack/react-table";-import { AdminUser } from "@/types/admin";-import { TablePagination } from "@/components/pagination";--interface UserPaginationProps {- table: Table<AdminUser>;- data: { users: AdminUser[]; total: number } | undefined;- pagination: { pageIndex: number; pageSize: number };- setPagination: (value: { pageIndex: number; pageSize: number }) => void;- isLoading: boolean;-}--export function UserTablePagination({- table,- data,- pagination,- setPagination,- isLoading,-}: UserPaginationProps) {- return (- <TablePagination- table={table}- data={data ? { items: data.users, total: data.total } : undefined}- pagination={pagination}- setPagination={setPagination}- isLoading={isLoading}- itemName="users"- />- );-}diff --git a/client/src/app/admin/components/users/Users.tsx b/client/src/app/admin/components/users/Users.tsxindex 4c313445a..8e11eb022 100644--- a/client/src/app/admin/components/users/Users.tsx+++ b/client/src/app/admin/components/users/Users.tsx@@ -9,14 +9,13 @@ import { StandardPage } from "@/components/StandardPage";import { useAdminUsers } from "@/hooks/useAdminUsers";import { UsersTable } from "@/app/admin/components/users/UsersTable";import { UserFilters } from "@/app/admin/components/users/UserFilters";-import { UserTablePagination } from "@/app/admin/components/users/UserTablePagination";+import { AdminTablePagination } from "@/app/admin/components/shared/AdminTablePagination";+import { AdminLayout } from "@/app/admin/components/shared/AdminLayout";+import { ErrorAlert } from "@/app/admin/components/shared/ErrorAlert";import { authClient } from "@/lib/auth";export function Users() {const router = useRouter();- const [isAdmin, setIsAdmin] = useState(false);- const [isImpersonating, setIsImpersonating] = useState(false);- const [isCheckingAdmin, setIsCheckingAdmin] = useState(true);const {// Data@@ -41,48 +40,6 @@ export function Users() {handleImpersonate,} = useAdminUsers();- useEffect(() => {- async function checkAdminPermission() {- try {- // Check if the user has impersonate permission (admin feature)- const result = await authClient.admin.hasPermission({- permissions: {- user: ["impersonate"],- },- });- setIsAdmin(result.data?.success ?? false);-- // Check if the user is currently impersonating- const session = await authClient.getSession();- // Check if impersonatedBy exists in the session data- setIsImpersonating(Boolean(session.data?.session?.impersonatedBy));-- setIsCheckingAdmin(false);- } catch (err) {- setIsAdmin(false);- setIsCheckingAdmin(false);- console.error("Error checking admin status:", err);- }- }-- checkAdminPermission();- }, []);-- // Function to stop impersonating- const stopImpersonating = async () => {- try {- await authClient.admin.stopImpersonating();- setIsImpersonating(false);- window.location.reload();- return true;- } catch (err) {- const errorMessage =- err instanceof Error ? err.message : "Unknown error occurred";- console.error(`Failed to stop impersonation: ${errorMessage}`);- return false;- }- };-const data = { users, total };// Handle impersonation with navigation@@ -94,43 +51,16 @@ export function Users() {}};- // If not admin, show access denied- if (!isAdmin && !isCheckingAdmin) {+ if (isError) {return (- <div className="container mt-8">- <Alert variant="destructive">- <AlertCircle className="h-4 w-4" />- <AlertTitle>Access Denied</AlertTitle>- <AlertDescription>- You don't have permission to access this page. Please contact an- administrator if you believe this is an error.- </AlertDescription>- </Alert>- </div>+ <AdminLayout title="Users" showStopImpersonating>+ <ErrorAlert message="Failed to load users. Please try again later." />+ </AdminLayout>);}return (- <div>- <div className="flex items-center justify-between mb-6">- <h2 className="text-xl font-bold">Users</h2>- {isImpersonating && (- <Button onClick={stopImpersonating} variant="destructive">- Stop Impersonating- </Button>- )}- </div>-- {isError && (- <Alert variant="destructive" className="mb-4">- <AlertCircle className="h-4 w-4" />- <AlertTitle>Error</AlertTitle>- <AlertDescription>- Failed to load users. Please try again later.- </AlertDescription>- </Alert>- )}-+ <AdminLayout title="Users" showStopImpersonating><div className="space-y-4">{/* Filters */}<UserFilters@@ -176,7 +106,7 @@ export function Users() {/>{/* Pagination */}- <UserTablePagination+ <AdminTablePaginationtable={{getCanPreviousPage: () => pagination.pageIndex > 0,@@ -202,12 +132,13 @@ export function Users() {}),} as any}- data={data}+ data={data ? { items: data.users, total: data.total } : undefined}pagination={pagination}setPagination={setPagination}isLoading={isLoading}+ itemName="users"/></div>- </div>+ </AdminLayout>);}diff --git a/client/src/app/admin/components/users/UsersTable.tsx b/client/src/app/admin/components/users/UsersTable.tsxindex c50fdf8cc..8a7dbdf7a 100644--- a/client/src/app/admin/components/users/UsersTable.tsx+++ b/client/src/app/admin/components/users/UsersTable.tsx@@ -25,7 +25,7 @@ import {} from "@/components/ui/table";import { UserTableSkeleton } from "./UserTableSkeleton";import { userStore } from "@/lib/userStore";-import { ArrowDown, ArrowUp, ArrowUpDown } from "lucide-react";+import { SortableHeader } from "../shared/SortableHeader";interface UsersTableProps {data: { users: AdminUser[]; total: number } | undefined;@@ -60,19 +60,7 @@ export function UsersTable({{accessorKey: "id",header: ({ column }) => (- <Button- variant="ghost"- onClick={() => column.toggleSorting(column.getIsSorted() === "asc")}- className="p-0 hover:bg-transparent"- >- User ID- {{- asc: <ArrowUp className="ml-2 h-4 w-4" />,- desc: <ArrowDown className="ml-2 h-4 w-4" />,- }[column.getIsSorted() as string] ?? (- <ArrowUpDown className="ml-2 h-4 w-4" />- )}- </Button>+ <SortableHeader column={column}>User ID</SortableHeader>),cell: ({ row }) => (<div className="font-mono">{row.getValue("id")}</div>@@ -81,76 +69,28 @@ export function UsersTable({{accessorKey: "name",header: ({ column }) => (- <Button- variant="ghost"- onClick={() => column.toggleSorting(column.getIsSorted() === "asc")}- className="p-0 hover:bg-transparent"- >- Name- {{- asc: <ArrowUp className="ml-2 h-4 w-4" />,- desc: <ArrowDown className="ml-2 h-4 w-4" />,- }[column.getIsSorted() as string] ?? (- <ArrowUpDown className="ml-2 h-4 w-4" />- )}- </Button>+ <SortableHeader column={column}>Name</SortableHeader>),cell: ({ row }) => row.getValue("name") || "N/A",},{accessorKey: "email",header: ({ column }) => (- <Button- variant="ghost"- onClick={() => column.toggleSorting(column.getIsSorted() === "asc")}- className="p-0 hover:bg-transparent"- >- {{- asc: <ArrowUp className="ml-2 h-4 w-4" />,- desc: <ArrowDown className="ml-2 h-4 w-4" />,- }[column.getIsSorted() as string] ?? (- <ArrowUpDown className="ml-2 h-4 w-4" />- )}- </Button>+ <SortableHeader column={column}>Email</SortableHeader>),cell: ({ row }) => row.getValue("email"),},{accessorKey: "role",header: ({ column }) => (- <Button- variant="ghost"- onClick={() => column.toggleSorting(column.getIsSorted() === "asc")}- className="p-0 hover:bg-transparent"- >- Role- {{- asc: <ArrowUp className="ml-2 h-4 w-4" />,- desc: <ArrowDown className="ml-2 h-4 w-4" />,- }[column.getIsSorted() as string] ?? (- <ArrowUpDown className="ml-2 h-4 w-4" />- )}- </Button>+ <SortableHeader column={column}>Role</SortableHeader>),cell: ({ row }) => row.getValue("role") || "user",},{accessorKey: "createdAt",header: ({ column }) => (- <Button- variant="ghost"- onClick={() => column.toggleSorting(column.getIsSorted() === "asc")}- className="p-0 hover:bg-transparent"- >- Created At- {{- asc: <ArrowUp className="ml-2 h-4 w-4" />,- desc: <ArrowDown className="ml-2 h-4 w-4" />,- }[column.getIsSorted() as string] ?? (- <ArrowUpDown className="ml-2 h-4 w-4" />- )}- </Button>+ <SortableHeader column={column}>Created At</SortableHeader>),cell: ({ row }) =>new Date(row.getValue("createdAt")).toLocaleDateString(),diff --git a/client/src/app/admin/hooks/useAdminPermission.ts b/client/src/app/admin/hooks/useAdminPermission.tsnew file mode 100644index 000000000..fa3ef602d--- /dev/null+++ b/client/src/app/admin/hooks/useAdminPermission.ts@@ -0,0 +1,69 @@+"use client";++import { useState, useEffect } from "react";+import { authClient } from "@/lib/auth";++interface AdminPermissionState {+ isAdmin: boolean;+ isImpersonating: boolean;+ isCheckingAdmin: boolean;+}++export function useAdminPermission() {+ const [state, setState] = useState<AdminPermissionState>({+ isAdmin: false,+ isImpersonating: false,+ isCheckingAdmin: true,+ });++ useEffect(() => {+ async function checkAdminPermission() {+ try {+ // Check if the user has admin access+ const result = await authClient.admin.hasPermission({+ permissions: {+ user: ["impersonate"],+ },+ });++ // Check if the user is currently impersonating+ const session = await authClient.getSession();+ const isImpersonating = Boolean(session.data?.session?.impersonatedBy);++ setState({+ isAdmin: result.data?.success ?? false,+ isImpersonating,+ isCheckingAdmin: false,+ });+ } catch (err) {+ setState({+ isAdmin: false,+ isImpersonating: false,+ isCheckingAdmin: false,+ });+ console.error("Error checking admin status:", err);+ }+ }++ checkAdminPermission();+ }, []);++ const stopImpersonating = async () => {+ try {+ await authClient.admin.stopImpersonating();+ setState((prev) => ({ ...prev, isImpersonating: false }));+ window.location.reload();+ return true;+ } catch (err) {+ const errorMessage =+ err instanceof Error ? err.message : "Unknown error occurred";+ console.error(`Failed to stop impersonation: ${errorMessage}`);+ return false;+ }+ };++ return {+ ...state,+ stopImpersonating,+ };+}diff --git a/client/src/app/admin/page.tsx b/client/src/app/admin/page.tsxindex ebbc38604..29c494492 100644--- a/client/src/app/admin/page.tsx+++ b/client/src/app/admin/page.tsx@@ -2,79 +2,52 @@import { StandardPage } from "@/components/StandardPage";import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";-import { authClient } from "@/lib/auth";-import { redirect } from "next/navigation";-import { useEffect, useState } from "react";+import { useState } from "react";import { Sites } from "./components/sites/Sites";import { OrgUsersList } from "./components/users/OrgUsersList";import { Users } from "./components/users/Users";+import { AdminLayout } from "./components/shared/AdminLayout";export default function AdminPage() {- const [isAdmin, setIsAdmin] = useState(false);- const [isCheckingAdmin, setIsCheckingAdmin] = useState(true);const [activeTab, setActiveTab] = useState("users");- useEffect(() => {- async function checkAdminPermission() {- try {- // Check if the user has admin access- const result = await authClient.admin.hasPermission({- permissions: {- user: ["impersonate"],- },- });- setIsAdmin(result.data?.success ?? false);- setIsCheckingAdmin(false);- } catch (err) {- setIsAdmin(false);- setIsCheckingAdmin(false);- console.error("Error checking admin status:", err);- }- }-- checkAdminPermission();- }, []);-- // If not admin, show access denied- if (!isAdmin && !isCheckingAdmin) {- redirect("/");- }-return (<StandardPage>- <div className="mb-6">- <h1 className="text-2xl font-bold">Admin Dashboard</h1>- </div>-- <Tabs defaultValue="users" value={activeTab} onValueChange={setActiveTab}>- <TabsList className="mb-4">- <TabsTrigger value="users">Users</TabsTrigger>- <TabsTrigger value="org-users">Organization Owners</TabsTrigger>- <TabsTrigger value="sites">Sites</TabsTrigger>- <TabsTrigger value="settings">Settings</TabsTrigger>- </TabsList>-- <TabsContent value="users">- <Users />- </TabsContent>-- <TabsContent value="org-users">- <OrgUsersList />- </TabsContent>-- <TabsContent value="sites">- <Sites />- </TabsContent>-- <TabsContent value="settings">- <div className="p-4 border rounded-md">- <h2 className="text-xl font-bold mb-4">Admin Settings</h2>- <p className="text-muted-foreground">- Settings panel coming soon...- </p>- </div>- </TabsContent>- </Tabs>+ <AdminLayout title="Admin Dashboard">+ <Tabs+ defaultValue="users"+ value={activeTab}+ onValueChange={setActiveTab}+ >+ <TabsList className="mb-4">+ <TabsTrigger value="users">Users</TabsTrigger>+ <TabsTrigger value="org-users">Organization Owners</TabsTrigger>+ <TabsTrigger value="sites">Sites</TabsTrigger>+ <TabsTrigger value="settings">Settings</TabsTrigger>+ </TabsList>++ <TabsContent value="users">+ <Users />+ </TabsContent>++ <TabsContent value="org-users">+ <OrgUsersList />+ </TabsContent>++ <TabsContent value="sites">+ <Sites />+ </TabsContent>++ <TabsContent value="settings">+ <div className="p-4 border rounded-md">+ <h2 className="text-xl font-bold mb-4">Admin Settings</h2>+ <p className="text-muted-foreground">+ Settings panel coming soon...+ </p>+ </div>+ </TabsContent>+ </Tabs>+ </AdminLayout></StandardPage>);}