New admin section.

src/app/(main)/admin/users/UsersDataTable.tsx

@@ -7,7 +7,7 @@ export function UsersDataTable({ showActions }: { showActions?: boolean; childre
   const queryResult = useUsersQuery();
 
   return (
-    <DataGrid queryResult={queryResult} allowSearch={true}>
+    <DataGrid query={queryResult} allowSearch={true}>
       {({ data }) => <UsersTable data={data} showActions={showActions} />}
     </DataGrid>
   );

src/app/(main)/admin/users/UsersPage.tsx

@@ -5,7 +5,7 @@ import { SectionHeader } from '@/components/common/SectionHeader';
 import { useMessages } from '@/components/hooks';
 import { UserAddButton } from './UserAddButton';
 
-export function UsersSettingsPage() {
+export function UsersPage() {
   const { formatMessage, labels } = useMessages();
 
   const handleSave = () => {};

src/app/(main)/admin/users/UsersTable.tsx

@@ -1,22 +1,13 @@
 import { useState } from 'react';
-import {
-  Row,
-  Text,
-  Icon,
-  DataTable,
-  DataColumn,
-  MenuItem,
-  MenuSeparator,
-  Modal,
-} from '@umami/react-zen';
+import { Row, Text, Icon, DataTable, DataColumn, MenuItem, Modal } from '@umami/react-zen';
 import Link from 'next/link';
-import { formatDistance } from 'date-fns';
 import { ROLES } from '@/lib/constants';
 import { Trash } from '@/components/icons';
-import { useMessages, useLocale } from '@/components/hooks';
+import { useMessages } from '@/components/hooks';
 import { Edit } from '@/components/icons';
 import { MenuButton } from '@/components/input/MenuButton';
 import { UserDeleteForm } from './UserDeleteForm';
+import { DateDistance } from '@/components/common/DateDistance';
 
 export function UsersTable({
   data = [],
@@ -26,7 +17,6 @@ export function UsersTable({
   showActions?: boolean;
 }) {
   const { formatMessage, labels } = useMessages();
-  const { dateLocale } = useLocale();
   const [deleteUser, setDeleteUser] = useState(null);
 
   return (
@@ -42,17 +32,12 @@ export function UsersTable({
             )
           }
         </DataColumn>
-        <DataColumn id="created" label={formatMessage(labels.created)}>
-          {(row: any) =>
-            formatDistance(new Date(row.createdAt), new Date(), {
-              addSuffix: true,
-              locale: dateLocale,
-            })
-          }
-        </DataColumn>
-        <DataColumn id="websites" label={formatMessage(labels.websites)} width="100px">
+        <DataColumn id="websites" label={formatMessage(labels.websites)}>
           {(row: any) => row._count.websiteUser}
         </DataColumn>
+        <DataColumn id="created" label={formatMessage(labels.created)}>
+          {(row: any) => <DateDistance date={new Date(row.createdAt)} />}
+        </DataColumn>
         {showActions && (
           <DataColumn id="action" align="end" width="100px">
             {(row: any) => {
@@ -68,7 +53,6 @@ export function UsersTable({
                       <Text>{formatMessage(labels.edit)}</Text>
                     </Row>
                   </MenuItem>
-                  <MenuSeparator />
                   <MenuItem
                     id="delete"
                     onAction={() => setDeleteUser(row)}

src/app/(main)/admin/users/[userId]/UserWebsites.tsx

@@ -1,12 +1,12 @@
 import { DataGrid } from '@/components/common/DataGrid';
-import { useWebsitesQuery } from '@/components/hooks';
+import { useUserWebsitesQuery } from '@/components/hooks';
 import { WebsitesTable } from '@/app/(main)/settings/websites/WebsitesTable';
 
 export function UserWebsites({ userId }) {
-  const queryResult = useWebsitesQuery({ userId });
+  const queryResult = useUserWebsitesQuery({ userId });
 
   return (
-    <DataGrid queryResult={queryResult}>
+    <DataGrid query={queryResult}>
       {({ data }) => (
         <WebsitesTable data={data} showActions={true} allowEdit={true} allowView={true} />
       )}

src/app/(main)/admin/users/[userId]/page.tsx

@@ -8,5 +8,5 @@ export default async function ({ params }: { params: Promise<{ userId: string }>
 }
 
 export const metadata: Metadata = {
-  title: 'User Settings',
+  title: 'Users',
 };

src/app/(main)/admin/users/page.tsx

@@ -1,8 +1,8 @@
 import { Metadata } from 'next';
-import { UsersSettingsPage } from './UsersSettingsPage';
+import { UsersPage } from './UsersPage';
 
 export default function () {
-  return <UsersSettingsPage />;
+  return <UsersPage />;
 }
 export const metadata: Metadata = {
   title: 'Users',