diff --git a/src/app/(main)/admin/AdminNav.tsx b/src/app/(main)/admin/AdminNav.tsx
index aa1cbe884..edcfb4c62 100644
--- a/src/app/(main)/admin/AdminNav.tsx
+++ b/src/app/(main)/admin/AdminNav.tsx
@@ -1,10 +1,13 @@
+import { Column, Focusable, Row, Tooltip, TooltipTrigger } from '@umami/react-zen';
+import Link from 'next/link';
+import { IconLabel } from '@/components/common/IconLabel';
import { NavMenu } from '@/components/common/NavMenu';
import { useMessages, useNavigation } from '@/components/hooks';
-import { Globe, User, Users } from '@/components/icons';
+import { ArrowLeft, Globe, User, Users } from '@/components/icons';
export function AdminNav({ onItemClick }: { onItemClick?: () => void }) {
const { t, labels } = useMessages();
- const { pathname } = useNavigation();
+ const { pathname, renderUrl } = useNavigation();
const items = [
{
@@ -37,12 +40,29 @@ export function AdminNav({ onItemClick }: { onItemClick?: () => void }) {
?.find(({ path }) => path && pathname.startsWith(path))?.id;
return (
-
+
+
+
+
+
+ } label={t(labels.back)} padding />
+
+
+ {t(labels.back)}
+
+
+
+
);
}
diff --git a/src/app/(main)/admin/teams/AdminTeamsTable.tsx b/src/app/(main)/admin/teams/AdminTeamsTable.tsx
index 2d5243b99..f948aba96 100644
--- a/src/app/(main)/admin/teams/AdminTeamsTable.tsx
+++ b/src/app/(main)/admin/teams/AdminTeamsTable.tsx
@@ -10,6 +10,7 @@ import { TeamDeleteForm } from '../../teams/[teamId]/TeamDeleteForm';
export function AdminTeamsTable({
data = [],
showActions = true,
+ ...props
}: {
data: any[];
showActions?: boolean;
@@ -19,7 +20,7 @@ export function AdminTeamsTable({
return (
<>
-
+
{(row: any) => {row.name}}
diff --git a/src/app/(main)/admin/users/UsersTable.tsx b/src/app/(main)/admin/users/UsersTable.tsx
index 16a5b9084..f337cc85f 100644
--- a/src/app/(main)/admin/users/UsersTable.tsx
+++ b/src/app/(main)/admin/users/UsersTable.tsx
@@ -11,6 +11,7 @@ import { UserDeleteForm } from './UserDeleteForm';
export function UsersTable({
data = [],
showActions = true,
+ ...props
}: {
data: any[];
showActions?: boolean;
@@ -20,7 +21,7 @@ export function UsersTable({
return (
<>
-
+
{(row: any) => {row.username}}
diff --git a/src/app/(main)/admin/websites/AdminWebsitesTable.tsx b/src/app/(main)/admin/websites/AdminWebsitesTable.tsx
index def6dd9ff..062fe2774 100644
--- a/src/app/(main)/admin/websites/AdminWebsitesTable.tsx
+++ b/src/app/(main)/admin/websites/AdminWebsitesTable.tsx
@@ -7,13 +7,13 @@ import { useMessages } from '@/components/hooks';
import { Edit, Trash, Users } from '@/components/icons';
import { MenuButton } from '@/components/input/MenuButton';
-export function AdminWebsitesTable({ data = [] }: { data: any[] }) {
+export function AdminWebsitesTable({ data = [], ...props }: { data: any[] }) {
const { t, labels } = useMessages();
const [deleteWebsite, setDeleteWebsite] = useState(null);
return (
<>
-
+
{(row: any) => (
diff --git a/src/app/login/LoginForm.tsx b/src/app/login/LoginForm.tsx
index 936a30e77..23101b947 100644
--- a/src/app/login/LoginForm.tsx
+++ b/src/app/login/LoginForm.tsx
@@ -36,7 +36,7 @@ export function LoginForm() {
umami
-