Merge branch 'dev' of https://github.com/umami-software/umami into dev

package.json

@@ -67,7 +67,7 @@
     "@prisma/extension-read-replicas": "^0.3.0",
     "@react-spring/web": "^9.7.3",
     "@tanstack/react-query": "^5.12.2",
-    "@umami/prisma-client": "^0.13.0",
+    "@umami/prisma-client": "^0.14.0",
     "@umami/redis-client": "^0.18.0",
     "chalk": "^4.1.1",
     "chart.js": "^4.2.1",

src/app/(main)/App.tsx

@@ -1,4 +1,3 @@
-'use client';
 import { Loading } from 'react-basics';
 import Script from 'next/script';
 import { usePathname } from 'next/navigation';

src/app/(main)/NavBar.tsx

@@ -1,4 +1,3 @@
-'use client';
 import { Icon, Text } from 'react-basics';
 import Link from 'next/link';
 import classNames from 'classnames';

src/app/(main)/UpdateNotice.tsx

@@ -1,4 +1,3 @@
-'use client';
 import { useEffect, useCallback, useState } from 'react';
 import { createPortal } from 'react-dom';
 import { Button } from 'react-basics';

src/app/(main)/console/ConsolePage.tsx

@@ -0,0 +1,6 @@
+'use client';
+import TestConsole from './TestConsole';
+
+export default function ConsolePage({ websiteId }) {
+  return <TestConsole websiteId={websiteId} />;
+}

src/app/(main)/console/TestConsole.module.css

@@ -1,6 +1,7 @@
 .container {
   display: grid;
   gap: 30px;
+  padding-bottom: 40px;
 }
 
 .actions {

src/app/(main)/console/TestConsole.tsx

@@ -1,4 +1,3 @@
-'use client';
 import { Button } from 'react-basics';
 import Head from 'next/head';
 import Link from 'next/link';

src/app/(main)/console/[[...websiteId]]/page.tsx

@@ -1,5 +1,5 @@
-import TestConsole from '../TestConsole';
 import { Metadata } from 'next';
+import ConsolePage from '../ConsolePage';
 
 async function getEnabled() {
   return !!process.env.ENABLE_TEST_CONSOLE;
@@ -12,7 +12,7 @@ export default async function ({ params: { websiteId } }) {
     return null;
   }
 
-  return <TestConsole websiteId={websiteId?.[0]} />;
+  return <ConsolePage websiteId={websiteId?.[0]} />;
 }
 
 export const metadata: Metadata = {

src/app/(main)/dashboard/DashboardEdit.tsx

@@ -1,4 +1,3 @@
-'use client';
 import { useState, useMemo } from 'react';
 import { DragDropContext, Draggable, Droppable } from 'react-beautiful-dnd';
 import classNames from 'classnames';

src/app/(main)/dashboard/DashboardPage.tsx

@@ -10,7 +10,7 @@ import { useMessages, useLocale, useTeamUrl, useWebsites } from 'components/hook
 import useDashboard from 'store/dashboard';
 import LinkButton from 'components/common/LinkButton';
 
-export function Dashboard() {
+export function DashboardPage() {
   const { formatMessage, labels, messages } = useMessages();
   const { teamId, renderTeamUrl } = useTeamUrl();
   const { showCharts, editing } = useDashboard();
@@ -68,4 +68,4 @@ export function Dashboard() {
   );
 }
 
-export default Dashboard;
+export default DashboardPage;

src/app/(main)/dashboard/DashboardSettingsButton.tsx

@@ -1,4 +1,3 @@
-'use client';
 import { TooltipPopup, Icon, Text, Flexbox, Button } from 'react-basics';
 import Icons from 'components/icons';
 import { saveDashboard } from 'store/dashboard';

src/app/(main)/dashboard/page.tsx

@@ -1,8 +1,8 @@
-import Dashboard from 'app/(main)/dashboard/Dashboard';
+import DashboardPage from './DashboardPage';
 import { Metadata } from 'next';
 
 export default function () {
-  return <Dashboard />;
+  return <DashboardPage />;
 }
 
 export const metadata: Metadata = {

src/app/(main)/layout.module.css

@@ -19,3 +19,15 @@
   height: calc(100vh - 60px);
   overflow-y: auto;
 }
+
+.content {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  position: relative;
+  width: 100%;
+  max-width: 1320px;
+  margin: 0 auto;
+  padding: 0 20px;
+  min-height: calc(100vh - 60px);
+}

src/app/(main)/layout.tsx

@@ -1,3 +1,4 @@
+'use client';
 import App from './App';
 import NavBar from './NavBar';
 import Page from 'components/layout/Page';

src/app/(main)/profile/DateRangeSetting.tsx

@@ -1,4 +1,3 @@
-'use client';
 import DateFilter from 'components/input/DateFilter';
 import { Button, Flexbox } from 'react-basics';
 import { useDateRange, useMessages } from 'components/hooks';

src/app/(main)/profile/LanguageSetting.tsx

@@ -1,4 +1,3 @@
-'use client';
 import { useState } from 'react';
 import { Button, Dropdown, Item, Flexbox } from 'react-basics';
 import { useLocale, useMessages } from 'components/hooks';

src/app/(main)/profile/PasswordChangeButton.tsx

@@ -1,4 +1,3 @@
-'use client';
 import { Button, Icon, Text, useToasts, ModalTrigger, Modal } from 'react-basics';
 import PasswordEditForm from 'app/(main)/profile/PasswordEditForm';
 import Icons from 'components/icons';

src/app/(main)/profile/PasswordEditForm.tsx

@@ -1,4 +1,3 @@
-'use client';
 import { useRef } from 'react';
 import { Form, FormRow, FormInput, FormButtons, PasswordField, Button } from 'react-basics';
 import { useApi, useMessages } from 'components/hooks';

src/app/(main)/profile/ProfileHeader.tsx

@@ -1,4 +1,3 @@
-'use client';
 import PageHeader from 'components/layout/PageHeader';
 import { useMessages } from 'components/hooks';
 

src/app/(main)/profile/ProfilePage.tsx

@@ -0,0 +1,13 @@
+'use client';
+import ProfileHeader from './ProfileHeader';
+import ProfileSettings from './ProfileSettings';
+import styles from './ProfilePage.module.css';
+
+export default function () {
+  return (
+    <div className={styles.container}>
+      <ProfileHeader />
+      <ProfileSettings />
+    </div>
+  );
+}

src/app/(main)/profile/ProfileSettings.tsx

@@ -1,4 +1,3 @@
-'use client';
 import { Form, FormRow } from 'react-basics';
 import TimezoneSetting from 'app/(main)/profile/TimezoneSetting';
 import DateRangeSetting from 'app/(main)/profile/DateRangeSetting';
@@ -11,7 +10,7 @@ import { ROLES } from 'lib/constants';
 export function ProfileSettings() {
   const { user } = useLogin();
   const { formatMessage, labels } = useMessages();
-  const cloudMode = Boolean(process.env.cloudMode);
+  const cloudMode = !!process.env.cloudMode;
 
   if (!user) {
     return null;
@@ -24,7 +23,7 @@ export function ProfileSettings() {
       return formatMessage(labels.user);
     }
     if (value === ROLES.admin) {
-      return formatMessage(labels.admin);
+      return formatMessage(labels.administrator);
     }
     if (value === ROLES.viewOnly) {
       return formatMessage(labels.viewOnly);

src/app/(main)/profile/ThemeSetting.tsx

@@ -1,4 +1,3 @@
-'use client';
 import classNames from 'classnames';
 import { Button, Icon } from 'react-basics';
 import { useTheme } from 'components/hooks';

src/app/(main)/profile/TimezoneSetting.tsx

@@ -1,4 +1,3 @@
-'use client';
 import { useState } from 'react';
 import { Dropdown, Item, Button, Flexbox } from 'react-basics';
 import { listTimeZones } from 'timezone-support';

src/app/(main)/profile/page.tsx

@@ -1,15 +1,8 @@
-import ProfileHeader from './ProfileHeader';
-import ProfileSettings from './ProfileSettings';
 import { Metadata } from 'next';
-import styles from './page.module.css';
+import ProfilePage from './ProfilePage';
 
 export default function () {
-  return (
-    <div className={styles.container}>
-      <ProfileHeader />
-      <ProfileSettings />
-    </div>
-  );
+  return <ProfilePage />;
 }
 
 export const metadata: Metadata = {

src/app/(main)/reports/ReportDeleteButton.tsx

@@ -1,4 +1,3 @@
-'use client';
 import { Button, Icon, Icons, Modal, ModalTrigger, Text } from 'react-basics';
 import { useApi, useMessages } from 'components/hooks';
 import { touch } from 'store/modified';

src/app/(main)/reports/ReportsDataTable.tsx

@@ -1,4 +1,3 @@
-'use client';
 import { useReports } from 'components/hooks';
 import ReportsTable from './ReportsTable';
 import DataTable from 'components/common/DataTable';

src/app/(main)/reports/ReportsHeader.tsx

@@ -1,4 +1,3 @@
-'use client';
 import PageHeader from 'components/layout/PageHeader';
 import { Icon, Icons, Text } from 'react-basics';
 import { useMessages, useTeamUrl } from 'components/hooks';

src/app/(main)/reports/ReportsPage.tsx

@@ -0,0 +1,15 @@
+'use client';
+import ReportsHeader from './ReportsHeader';
+import ReportsDataTable from './ReportsDataTable';
+
+export default function ReportsPage({ teamId }: { teamId: string }) {
+  return (
+    <>
+      <ReportsHeader />
+      <ReportsDataTable teamId={teamId} />
+    </>
+  );
+}
+export const metadata = {
+  title: 'Reports | Umami',
+};

src/app/(main)/reports/ReportsTable.tsx

@@ -1,4 +1,3 @@
-'use client';
 import { GridColumn, GridTable, Icon, Icons, Text, useBreakpoint } from 'react-basics';
 import LinkButton from 'components/common/LinkButton';
 import { useMessages, useLogin, useTeamUrl } from 'components/hooks';

src/app/(main)/reports/[reportId]/BaseParameters.tsx

@@ -1,4 +1,3 @@
-'use client';
 import { useContext } from 'react';
 import { FormRow } from 'react-basics';
 import { parseDateRange } from 'lib/date';

src/app/(main)/reports/[reportId]/FieldAddForm.tsx

@@ -1,4 +1,3 @@
-'use client';
 import { useState } from 'react';
 import { createPortal } from 'react-dom';
 import { REPORT_PARAMETERS } from 'lib/constants';

src/app/(main)/reports/[reportId]/FieldAggregateForm.tsx

@@ -1,4 +1,3 @@
-'use client';
 import { Form, FormRow, Menu, Item } from 'react-basics';
 import { useMessages } from 'components/hooks';
 

src/app/(main)/reports/[reportId]/FieldFilterForm.tsx

@@ -1,4 +1,3 @@
-'use client';
 import { useState, useMemo } from 'react';
 import { Form, FormRow, Item, Flexbox, Dropdown, Button } from 'react-basics';
 import { useMessages, useFilters, useFormat, useLocale } from 'components/hooks';

src/app/(main)/reports/[reportId]/FieldSelectForm.tsx

@@ -1,4 +1,3 @@
-'use client';
 import { Menu, Item, Form, FormRow } from 'react-basics';
 import { useMessages } from 'components/hooks';
 import styles from './FieldSelectForm.module.css';

src/app/(main)/reports/[reportId]/FilterSelectForm.tsx

@@ -1,4 +1,3 @@
-'use client';
 import { useState } from 'react';
 import { Loading } from 'react-basics';
 import { subDays } from 'date-fns';

src/app/(main)/reports/[reportId]/ParameterList.tsx

@@ -1,4 +1,3 @@
-'use client';
 import { ReactNode } from 'react';
 import { Icon, TooltipPopup } from 'react-basics';
 import Icons from 'components/icons';

src/app/(main)/reports/[reportId]/PopupForm.tsx

@@ -1,4 +1,3 @@
-'use client';
 import { CSSProperties, ReactNode } from 'react';
 import classNames from 'classnames';
 import styles from './PopupForm.module.css';

src/app/(main)/reports/[reportId]/Report.tsx

@@ -1,20 +1,22 @@
-'use client';
 import { createContext, ReactNode } from 'react';
 import { Loading } from 'react-basics';
+import classNames from 'classnames';
 import { useReport } from 'components/hooks';
 import styles from './Report.module.css';
-import classNames from 'classnames';
 
 export const ReportContext = createContext(null);
 
-export interface ReportProps {
+export function Report({
+  reportId,
+  defaultParameters,
+  children,
+  className,
+}: {
   reportId: string;
   defaultParameters: { [key: string]: any };
   children: ReactNode;
   className?: string;
-}
-
-export function Report({ reportId, defaultParameters, children, className }: ReportProps) {
+}) {
   const report = useReport(reportId, defaultParameters);
 
   if (!report) {

src/app/(main)/reports/[reportId]/ReportBody.tsx

@@ -1,4 +1,3 @@
-'use client';
 import styles from './ReportBody.module.css';
 import { useContext } from 'react';
 import { ReportContext } from './Report';

src/app/(main)/reports/[reportId]/ReportDetails.tsx

@@ -1,4 +1,3 @@
-'use client';
 import FunnelReport from '../funnel/FunnelReport';
 import EventDataReport from '../event-data/EventDataReport';
 import InsightsReport from '../insights/InsightsReport';

src/app/(main)/reports/[reportId]/ReportHeader.tsx

@@ -1,4 +1,3 @@
-'use client';
 import { useContext } from 'react';
 import { Icon, LoadingButton, InlineEditField, useToasts } from 'react-basics';
 import { useMessages, useApi, useNavigation, useTeamUrl } from 'components/hooks';

src/app/(main)/reports/[reportId]/ReportMenu.tsx

@@ -1,4 +1,3 @@
-'use client';
 import styles from './ReportMenu.module.css';
 import { useContext } from 'react';
 import { ReportContext } from './Report';

src/app/(main)/reports/[reportId]/ReportPage.tsx

@@ -0,0 +1,6 @@
+'use client';
+import ReportDetails from './ReportDetails';
+
+export default function ReportPage({ reportId }) {
+  return <ReportDetails reportId={reportId} />;
+}

src/app/(main)/reports/[reportId]/page.tsx

@@ -1,12 +1,8 @@
-import ReportDetails from './ReportDetails';
 import { Metadata } from 'next';
+import ReportPage from './ReportPage';
 
-export default function ReportDetailsPage({ params: { reportId } }) {
-  if (!reportId) {
-    return null;
-  }
-
-  return <ReportDetails reportId={reportId} />;
+export default function ({ params: { reportId } }) {
+  return <ReportPage reportId={reportId} />;
 }
 
 export const metadata: Metadata = {

src/app/(main)/reports/create/ReportCreatePage.tsx

@@ -0,0 +1,6 @@
+'use client';
+import ReportTemplates from './ReportTemplates';
+
+export default function ReportCreatePage() {
+  return <ReportTemplates />;
+}

src/app/(main)/reports/create/ReportTemplates.tsx

@@ -1,4 +1,3 @@
-'use client';
 import Link from 'next/link';
 import { Button, Icons, Text, Icon } from 'react-basics';
 import PageHeader from 'components/layout/PageHeader';
@@ -8,30 +7,6 @@ import Magnet from 'assets/magnet.svg';
 import styles from './ReportTemplates.module.css';
 import { useMessages, useTeamUrl } from 'components/hooks';
 
-function ReportItem({ title, description, url, icon }) {
-  const { formatMessage, labels } = useMessages();
-
-  return (
-    <div className={styles.report}>
-      <div className={styles.title}>
-        <Icon size="lg">{icon}</Icon>
-        <Text>{title}</Text>
-      </div>
-      <div className={styles.description}>{description}</div>
-      <div className={styles.buttons}>
-        <Link href={url}>
-          <Button variant="primary">
-            <Icon>
-              <Icons.Plus />
-            </Icon>
-            <Text>{formatMessage(labels.create)}</Text>
-          </Button>
-        </Link>
-      </div>
-    </div>
-  );
-}
-
 export function ReportTemplates({ showHeader = true }: { showHeader?: boolean }) {
   const { formatMessage, labels } = useMessages();
   const { renderTeamUrl } = useTeamUrl();
@@ -71,4 +46,28 @@ export function ReportTemplates({ showHeader = true }: { showHeader?: boolean })
   );
 }
 
+function ReportItem({ title, description, url, icon }) {
+  const { formatMessage, labels } = useMessages();
+
+  return (
+    <div className={styles.report}>
+      <div className={styles.title}>
+        <Icon size="lg">{icon}</Icon>
+        <Text>{title}</Text>
+      </div>
+      <div className={styles.description}>{description}</div>
+      <div className={styles.buttons}>
+        <Link href={url}>
+          <Button variant="primary">
+            <Icon>
+              <Icons.Plus />
+            </Icon>
+            <Text>{formatMessage(labels.create)}</Text>
+          </Button>
+        </Link>
+      </div>
+    </div>
+  );
+}
+
 export default ReportTemplates;

src/app/(main)/reports/create/page.tsx

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

src/app/(main)/reports/event-data/EventDataParameters.tsx

@@ -1,4 +1,3 @@
-'use client';
 import { useContext } from 'react';
 import { Form, FormRow, FormButtons, SubmitButton, PopupTrigger, Icon, Popup } from 'react-basics';
 import Empty from 'components/common/Empty';

src/app/(main)/reports/event-data/EventDataReport.tsx

@@ -1,4 +1,3 @@
-'use client';
 import Report from '../[reportId]/Report';
 import ReportHeader from '../[reportId]/ReportHeader';
 import ReportMenu from '../[reportId]/ReportMenu';

src/app/(main)/reports/event-data/EventDataReportPage.tsx

@@ -0,0 +1,6 @@
+'use client';
+import EventDataReport from './EventDataReport';
+
+export default function EventDataReportPage() {
+  return <EventDataReport />;
+}

src/app/(main)/reports/event-data/EventDataTable.tsx

@@ -1,4 +1,3 @@
-'use client';
 import { useContext } from 'react';
 import { GridTable, GridColumn } from 'react-basics';
 import { useMessages } from 'components/hooks';

src/app/(main)/reports/event-data/page.tsx

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

src/app/(main)/reports/funnel/FunnelChart.tsx

@@ -1,4 +1,3 @@
-'use client';
 import { JSX, useCallback, useContext, useMemo } from 'react';
 import { Loading, StatusLight } from 'react-basics';
 import { useMessages, useTheme } from 'components/hooks';

src/app/(main)/reports/funnel/FunnelParameters.tsx

@@ -1,4 +1,3 @@
-'use client';
 import { useContext } from 'react';
 import { useMessages } from 'components/hooks';
 import {

src/app/(main)/reports/funnel/FunnelReport.tsx

@@ -1,4 +1,3 @@
-'use client';
 import FunnelChart from './FunnelChart';
 import FunnelTable from './FunnelTable';
 import FunnelParameters from './FunnelParameters';

src/app/(main)/reports/funnel/FunnelReportPage.tsx

@@ -0,0 +1,6 @@
+'use client';
+import FunnelReport from './FunnelReport';
+
+export default function FunnelReportPage() {
+  return <FunnelReport />;
+}

src/app/(main)/reports/funnel/FunnelTable.tsx

@@ -1,4 +1,3 @@
-'use client';
 import { useContext } from 'react';
 import ListTable from 'components/metrics/ListTable';
 import { useMessages } from 'components/hooks';

src/app/(main)/reports/funnel/UrlAddForm.tsx

@@ -1,4 +1,3 @@
-'use client';
 import { useState } from 'react';
 import { useMessages } from 'components/hooks';
 import { Button, Form, FormRow, TextField, Flexbox } from 'react-basics';

src/app/(main)/reports/funnel/page.tsx

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

src/app/(main)/reports/insights/InsightsParameters.tsx

@@ -1,4 +1,3 @@
-'use client';
 import { useContext } from 'react';
 import { useFormat, useMessages, useFilters } from 'components/hooks';
 import {

src/app/(main)/reports/insights/InsightsReport.tsx

@@ -1,4 +1,3 @@
-'use client';
 import Report from '../[reportId]/Report';
 import ReportHeader from '../[reportId]/ReportHeader';
 import ReportMenu from '../[reportId]/ReportMenu';

src/app/(main)/reports/insights/InsightsReportPage.tsx

@@ -0,0 +1,6 @@
+'use client';
+import InsightsReport from './InsightsReport';
+
+export default function InsightsReportPage() {
+  return <InsightsReport />;
+}

src/app/(main)/reports/insights/InsightsTable.tsx

@@ -1,4 +1,3 @@
-'use client';
 import { useContext, useEffect, useState } from 'react';
 import { GridTable, GridColumn } from 'react-basics';
 import { useFormat, useMessages } from 'components/hooks';

src/app/(main)/reports/insights/page.tsx

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

src/app/(main)/reports/page.tsx

@@ -1,14 +1,10 @@
-import ReportsHeader from './ReportsHeader';
-import ReportsDataTable from './ReportsDataTable';
+import ReportsPage from './ReportsPage';
+import { Metadata } from 'next';
 
 export default function ({ params: { teamId } }: { params: { teamId: string } }) {
-  return (
-    <>
-      <ReportsHeader />
-      <ReportsDataTable teamId={teamId} />
-    </>
-  );
+  return <ReportsPage teamId={teamId} />;
 }
-export const metadata = {
+
+export const metadata: Metadata = {
   title: 'Reports | Umami',
 };

src/app/(main)/reports/retention/RetentionParameters.tsx

@@ -1,4 +1,3 @@
-'use client';
 import { useContext } from 'react';
 import { useMessages } from 'components/hooks';
 import { Form, FormButtons, FormRow, SubmitButton } from 'react-basics';

src/app/(main)/reports/retention/RetentionReport.tsx

@@ -1,4 +1,3 @@
-'use client';
 import RetentionTable from './RetentionTable';
 import RetentionParameters from './RetentionParameters';
 import Report from '../[reportId]/Report';

src/app/(main)/reports/retention/RetentionReportPage.tsx

@@ -0,0 +1,6 @@
+'use client';
+import RetentionReport from './RetentionReport';
+
+export default function RetentionReportPage() {
+  return <RetentionReport />;
+}

src/app/(main)/reports/retention/RetentionTable.tsx

@@ -1,4 +1,3 @@
-'use client';
 import { useContext } from 'react';
 import classNames from 'classnames';
 import { ReportContext } from '../[reportId]/Report';

src/app/(main)/reports/retention/page.tsx

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

src/app/(main)/settings/SettingsLayout.tsx

@@ -1,9 +1,9 @@
 'use client';
 import { ReactNode } from 'react';
 import { useLogin, useMessages } from 'components/hooks';
-import SettingsLayout from 'components/layout/SettingsLayout';
+import MenuLayout from 'components/layout/MenuLayout';
 
-export default function Settings({ children }: { children: ReactNode }) {
+export default function SettingsLayout({ children }: { children: ReactNode }) {
   const { user } = useLogin();
   const { formatMessage, labels } = useMessages();
 
@@ -21,5 +21,5 @@ export default function Settings({ children }: { children: ReactNode }) {
     },
   ].filter(n => n);
 
-  return <SettingsLayout items={items}>{children}</SettingsLayout>;
+  return <MenuLayout items={items}>{children}</MenuLayout>;
 }

src/app/(main)/settings/layout.tsx

@@ -1,5 +1,5 @@
-import Settings from './Settings';
+import SettingsLayout from './SettingsLayout';
 
 export default function ({ children }) {
-  return <Settings>{children}</Settings>;
+  return <SettingsLayout>{children}</SettingsLayout>;
 }

src/app/(main)/settings/teams/TeamAddForm.tsx

@@ -1,4 +1,3 @@
-'use client';
 import {
   Form,
   FormRow,

src/app/(main)/settings/teams/TeamJoinForm.tsx

@@ -1,4 +1,3 @@
-'use client';
 import { useRef } from 'react';
 import {
   Form,

src/app/(main)/settings/teams/TeamLeaveButton.tsx

@@ -1,4 +1,3 @@
-'use client';
 import { Button, Icon, Icons, Modal, ModalTrigger, Text } from 'react-basics';
 import { useMessages, useLocale, useLogin } from 'components/hooks';
 import TeamDeleteForm from './TeamLeaveForm';

src/app/(main)/settings/teams/TeamLeaveForm.tsx

@@ -1,4 +1,3 @@
-'use client';
 import { useApi, useMessages } from 'components/hooks';
 import { touch } from 'store/modified';
 import ConfirmationForm from 'components/common/ConfirmationForm';

src/app/(main)/settings/teams/TeamsAddButton.tsx

@@ -1,4 +1,3 @@
-'use client';
 import { Button, Icon, Modal, ModalTrigger, Text } from 'react-basics';
 import Icons from 'components/icons';
 import { useMessages } from 'components/hooks';

src/app/(main)/settings/teams/TeamsDataTable.tsx

@@ -1,4 +1,3 @@
-'use client';
 import DataTable from 'components/common/DataTable';
 import TeamsTable from 'app/(main)/settings/teams/TeamsTable';
 import { useTeams } from 'components/hooks';

src/app/(main)/settings/teams/TeamsHeader.tsx

@@ -1,4 +1,3 @@
-'use client';
 import { Flexbox } from 'react-basics';
 import PageHeader from 'components/layout/PageHeader';
 import { ROLES } from 'lib/constants';

src/app/(main)/settings/teams/TeamsJoinButton.tsx

@@ -1,4 +1,3 @@
-'use client';
 import { Button, Icon, Modal, ModalTrigger, Text, useToasts } from 'react-basics';
 import Icons from 'components/icons';
 import { useMessages } from 'components/hooks';

src/app/(main)/settings/teams/TeamsPage.tsx

@@ -0,0 +1,12 @@
+'use client';
+import TeamsDataTable from './TeamsDataTable';
+import TeamsHeader from './TeamsHeader';
+
+export default function TeamsPage() {
+  return (
+    <>
+      <TeamsHeader />
+      <TeamsDataTable />
+    </>
+  );
+}

src/app/(main)/settings/teams/TeamsTable.tsx

@@ -1,13 +1,11 @@
-'use client';
 import { GridColumn, GridTable, Icon, Text, useBreakpoint } from 'react-basics';
-import { useMessages, useLogin } from 'components/hooks';
+import { useMessages } from 'components/hooks';
 import Icons from 'components/icons';
 import { ROLES } from 'lib/constants';
 import LinkButton from 'components/common/LinkButton';
 
 export function TeamsTable({
   data = [],
-  allowEdit = false,
   showActions = true,
 }: {
   data: any[];
@@ -15,7 +13,6 @@ export function TeamsTable({
   showActions?: boolean;
 }) {
   const { formatMessage, labels } = useMessages();
-  const { user } = useLogin();
   const breakpoint = useBreakpoint();
 
   return (
@@ -30,34 +27,22 @@ export function TeamsTable({
       <GridColumn name="members" label={formatMessage(labels.members)}>
         {row => row._count.teamUser}
       </GridColumn>
-      <GridColumn name="action" label=" " alignment="end">
-        {row => {
-          const { id, teamUser } = row;
-          const owner = teamUser.find(({ role }) => role === ROLES.teamOwner);
-          const isOwner = user.id === owner?.userId;
+      {showActions && (
+        <GridColumn name="action" label=" " alignment="end">
+          {row => {
+            const { id } = row;
 
-          return (
-            showActions && (
-              <>
-                {allowEdit && isOwner && (
-                  <LinkButton href={`/teams/${id}/settings`}>
-                    <Icon>
-                      <Icons.Edit />
-                    </Icon>
-                    <Text>{formatMessage(labels.edit)}</Text>
-                  </LinkButton>
-                )}
-                <LinkButton href={`/teams/${id}`}>
-                  <Icon>
-                    <Icons.Change />
-                  </Icon>
-                  <Text>{formatMessage(labels.switch)}</Text>
-                </LinkButton>
-              </>
-            )
-          );
-        }}
-      </GridColumn>
+            return (
+              <LinkButton href={`/teams/${id}/settings`}>
+                <Icon>
+                  <Icons.ArrowRight />
+                </Icon>
+                <Text>{formatMessage(labels.view)}</Text>
+              </LinkButton>
+            );
+          }}
+        </GridColumn>
+      )}
     </GridTable>
   );
 }

src/app/(main)/settings/teams/WebsiteTags.tsx

@@ -1,4 +1,3 @@
-'use client';
 import { Button, Icon, Icons, Text } from 'react-basics';
 import styles from './WebsiteTags.module.css';
 

src/app/(main)/settings/teams/[teamId]/members/TeamMemberRemoveButton.tsx

@@ -1,4 +1,3 @@
-'use client';
 import { useApi, useMessages } from 'components/hooks';
 import { Icon, Icons, LoadingButton, Text } from 'react-basics';
 import { touch } from 'store/modified';

src/app/(main)/settings/teams/[teamId]/members/TeamMembersDataTable.tsx

@@ -1,9 +1,14 @@
-'use client';
 import DataTable from 'components/common/DataTable';
 import TeamMembersTable from './TeamMembersTable';
 import { useTeamMembers } from 'components/hooks';
 
-export function TeamMembers({ teamId, allowEdit }: { teamId: string; allowEdit: boolean }) {
+export function TeamMembersDataTable({
+  teamId,
+  allowEdit = false,
+}: {
+  teamId: string;
+  allowEdit?: boolean;
+}) {
   const queryResult = useTeamMembers(teamId);
 
   return (
@@ -13,4 +18,4 @@ export function TeamMembers({ teamId, allowEdit }: { teamId: string; allowEdit:
   );
 }
 
-export default TeamMembers;
+export default TeamMembersDataTable;

src/app/(main)/settings/teams/[teamId]/members/TeamMembersPage.tsx

@@ -0,0 +1,18 @@
+'use client';
+import TeamProvider from 'app/(main)/teams/[teamId]/TeamProvider';
+import TeamMembersDataTable from './TeamMembersDataTable';
+import PageHeader from 'components/layout/PageHeader';
+import { useMessages } from 'components/hooks';
+
+export function TeamMembersPage({ teamId }: { teamId: string }) {
+  const { formatMessage, labels } = useMessages();
+
+  return (
+    <TeamProvider teamId={teamId}>
+      <PageHeader title={formatMessage(labels.members)} />
+      <TeamMembersDataTable teamId={teamId} allowEdit={true} />
+    </TeamProvider>
+  );
+}
+
+export default TeamMembersPage;

src/app/(main)/settings/teams/[teamId]/members/TeamMembersTable.tsx

@@ -1,4 +1,3 @@
-'use client';
 import { GridColumn, GridTable, useBreakpoint } from 'react-basics';
 import { useMessages, useLogin } from 'components/hooks';
 import { ROLES } from 'lib/constants';

src/app/(main)/settings/teams/[teamId]/members/page.tsx

@@ -0,0 +1,10 @@
+import TeamMembersPage from './TeamMembersPage';
+import { Metadata } from 'next';
+
+export default function ({ params: { teamId } }) {
+  return <TeamMembersPage teamId={teamId} />;
+}
+
+export const metadata: Metadata = {
+  title: 'Team members - Umami',
+};

src/app/(main)/settings/teams/[teamId]/page.tsx

@@ -1,10 +0,0 @@
-import TeamSettings from './TeamSettings';
-import TeamProvider from 'app/(main)/teams/[teamId]/TeamProvider';
-
-export default function ({ params: { teamId } }) {
-  return (
-    <TeamProvider teamId={teamId}>
-      <TeamSettings teamId={teamId} />
-    </TeamProvider>
-  );
-}

src/app/(main)/settings/teams/[teamId]/team/TeamAdmin.tsx

@@ -1,9 +1,8 @@
-'use client';
 import { ActionForm, Button, Modal, ModalTrigger } from 'react-basics';
 import { useMessages } from 'components/hooks';
-import TeamDeleteForm from '../TeamDeleteForm';
+import TeamDeleteForm from './TeamDeleteForm';
 
-export function TeamData({ teamId }: { teamId: string }) {
+export function TeamAdmin({ teamId }: { teamId: string }) {
   const { formatMessage, labels, messages } = useMessages();
 
   return (
@@ -21,4 +20,4 @@ export function TeamData({ teamId }: { teamId: string }) {
   );
 }
 
-export default TeamData;
+export default TeamAdmin;

src/app/(main)/settings/teams/[teamId]/team/TeamDeleteForm.tsx

@@ -1,4 +1,3 @@
-'use client';
 import { useApi, useMessages } from 'components/hooks';
 import { touch } from 'store/modified';
 import TypeConfirmationForm from 'components/common/TypeConfirmationForm';

src/app/(main)/settings/teams/[teamId]/team/TeamDetails.tsx

@@ -1,4 +1,3 @@
-'use client';
 import { useContext, useState } from 'react';
 import { Item, Tabs, Flexbox, Text, Icon } from 'react-basics';
 import PageHeader from 'components/layout/PageHeader';
@@ -6,13 +5,11 @@ import { ROLES } from 'lib/constants';
 import Icons from 'components/icons';
 import { useLogin, useMessages } from 'components/hooks';
 import TeamEditForm from './TeamEditForm';
-import TeamMembers from './TeamMembers';
-import TeamWebsites from './TeamWebsites';
-import TeamData from './TeamData';
+import TeamAdmin from './TeamAdmin';
 import LinkButton from 'components/common/LinkButton';
 import { TeamContext } from 'app/(main)/teams/[teamId]/TeamProvider';
 
-export function TeamSettings({ teamId }: { teamId: string }) {
+export function TeamDetails({ teamId }: { teamId: string }) {
   const team = useContext(TeamContext);
   const { formatMessage, labels } = useMessages();
   const { user } = useLogin();
@@ -25,25 +22,23 @@ export function TeamSettings({ teamId }: { teamId: string }) {
   return (
     <Flexbox direction="column">
       <PageHeader title={team?.name} icon={<Icons.Users />}>
-        <LinkButton href={`/teams/${teamId}`} variant="primary">
-          <Icon>
-            <Icons.Change />
-          </Icon>
-          <Text>{formatMessage(labels.view)}</Text>
-        </LinkButton>
+        {!canEdit && (
+          <LinkButton href={`/teams/${teamId}`}>
+            <Icon>
+              <Icons.Logout />
+            </Icon>
+            <Text>{formatMessage(labels.leaveTeam)}</Text>
+          </LinkButton>
+        )}
       </PageHeader>
       <Tabs selectedKey={tab} onSelect={(value: any) => setTab(value)} style={{ marginBottom: 30 }}>
         <Item key="details">{formatMessage(labels.details)}</Item>
-        <Item key="members">{formatMessage(labels.members)}</Item>
-        <Item key="websites">{formatMessage(labels.websites)}</Item>
-        <Item key="data">{formatMessage(labels.data)}</Item>
+        <Item key="admin">{formatMessage(labels.admin)}</Item>
       </Tabs>
       {tab === 'details' && <TeamEditForm teamId={teamId} allowEdit={canEdit} />}
-      {tab === 'members' && <TeamMembers teamId={teamId} allowEdit={canEdit} />}
-      {tab === 'websites' && <TeamWebsites teamId={teamId} allowEdit={canEdit} />}
-      {canEdit && tab === 'data' && <TeamData teamId={teamId} />}
+      {canEdit && tab === 'admin' && <TeamAdmin teamId={teamId} />}
     </Flexbox>
   );
 }
 
-export default TeamSettings;
+export default TeamDetails;

src/app/(main)/settings/teams/[teamId]/team/TeamEditForm.tsx

@@ -1,4 +1,3 @@
-'use client';
 import {
   SubmitButton,
   Form,

src/app/(main)/settings/teams/[teamId]/team/TeamPage.tsx

@@ -0,0 +1,13 @@
+'use client';
+import TeamProvider from 'app/(main)/teams/[teamId]/TeamProvider';
+import TeamDetails from './TeamDetails';
+
+export function TeamMembersPage({ teamId }: { teamId: string }) {
+  return (
+    <TeamProvider teamId={teamId}>
+      <TeamDetails teamId={teamId} />
+    </TeamProvider>
+  );
+}
+
+export default TeamMembersPage;

src/app/(main)/settings/teams/[teamId]/team/page.tsx

@@ -0,0 +1,10 @@
+import { Metadata } from 'next';
+import TeamPage from './TeamPage';
+
+export default function ({ params: { teamId } }) {
+  return <TeamPage teamId={teamId} />;
+}
+
+export const metadata: Metadata = {
+  title: 'Teams Settings - Umami',
+};

src/app/(main)/settings/teams/[teamId]/websites/TeamWebsiteRemoveButton.tsx

@@ -1,4 +1,3 @@
-'use client';
 import { useApi, useMessages } from 'components/hooks';
 import { Icon, Icons, LoadingButton, Text } from 'react-basics';
 

src/app/(main)/settings/teams/[teamId]/websites/TeamWebsitesDataTable.tsx

@@ -1,9 +1,14 @@
-'use client';
 import DataTable from 'components/common/DataTable';
 import { useTeamWebsites } from 'components/hooks';
 import TeamWebsitesTable from './TeamWebsitesTable';
 
-export function TeamWebsites({ teamId, allowEdit }: { teamId: string; allowEdit: boolean }) {
+export function TeamWebsitesDataTable({
+  teamId,
+  allowEdit = false,
+}: {
+  teamId: string;
+  allowEdit?: boolean;
+}) {
   const queryResult = useTeamWebsites(teamId);
 
   return (
@@ -13,4 +18,4 @@ export function TeamWebsites({ teamId, allowEdit }: { teamId: string; allowEdit:
   );
 }
 
-export default TeamWebsites;
+export default TeamWebsitesDataTable;

src/app/(main)/settings/teams/[teamId]/websites/TeamWebsitesPage.tsx

@@ -0,0 +1,18 @@
+'use client';
+import TeamProvider from 'app/(main)/teams/[teamId]/TeamProvider';
+import TeamWebsitesDataTable from './TeamWebsitesDataTable';
+import PageHeader from 'components/layout/PageHeader';
+import { useMessages } from 'components/hooks';
+
+export function TeamWebsitesPage({ teamId }: { teamId: string }) {
+  const { formatMessage, labels } = useMessages();
+
+  return (
+    <TeamProvider teamId={teamId}>
+      <PageHeader title={formatMessage(labels.websites)} />
+      <TeamWebsitesDataTable teamId={teamId} allowEdit={true} />
+    </TeamProvider>
+  );
+}
+
+export default TeamWebsitesPage;

src/app/(main)/settings/teams/[teamId]/websites/TeamWebsitesTable.tsx

@@ -1,4 +1,3 @@
-'use client';
 import { GridColumn, GridTable, Icon, Text } from 'react-basics';
 import { useLogin, useMessages } from 'components/hooks';
 import Icons from 'components/icons';
@@ -35,7 +34,7 @@ export function TeamWebsitesTable({
               )}
               <LinkButton href={`/teams/${teamId}/websites/${websiteId}`}>
                 <Icon>
-                  <Icons.Change />
+                  <Icons.ArrowRight />
                 </Icon>
                 <Text>{formatMessage(labels.view)}</Text>
               </LinkButton>