Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.
TypeScript analyticsaudience-segmentationchartscohort-analysisgoogle-analyticsproduct-analyticsstatisticsuser-journeyweb-analytics
Fixed 'use client' usage.
Mike Caof7151a880e58
diff --git a/src/app/(main)/App.tsx b/src/app/(main)/App.tsxindex 74be82922..a906739cf 100644--- a/src/app/(main)/App.tsx+++ b/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';diff --git a/src/app/(main)/NavBar.tsx b/src/app/(main)/NavBar.tsxindex 86d1db71a..ed29df135 100644--- a/src/app/(main)/NavBar.tsx+++ b/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';diff --git a/src/app/(main)/UpdateNotice.tsx b/src/app/(main)/UpdateNotice.tsxindex c56d3ce45..54ad05c9a 100644--- a/src/app/(main)/UpdateNotice.tsx+++ b/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';diff --git a/src/app/(main)/console/ConsolePage.tsx b/src/app/(main)/console/ConsolePage.tsxnew file mode 100644index 000000000..db1acbfe8--- /dev/null+++ b/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} />;+}diff --git a/src/app/(main)/console/TestConsole.module.css b/src/app/(main)/console/TestConsole.module.cssindex 7d9735297..88b70ab3d 100644--- a/src/app/(main)/console/TestConsole.module.css+++ b/src/app/(main)/console/TestConsole.module.css@@ -1,6 +1,7 @@.container {display: grid;gap: 30px;+ padding-bottom: 40px;}.actions {diff --git a/src/app/(main)/console/TestConsole.tsx b/src/app/(main)/console/TestConsole.tsxindex 2e11e4b09..9d8ecb24c 100644--- a/src/app/(main)/console/TestConsole.tsx+++ b/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';diff --git a/src/app/(main)/console/[[...websiteId]]/page.tsx b/src/app/(main)/console/[[...websiteId]]/page.tsxindex 0c69f4a5e..e9a6f722d 100644--- a/src/app/(main)/console/[[...websiteId]]/page.tsx+++ b/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 = {diff --git a/src/app/(main)/dashboard/DashboardEdit.tsx b/src/app/(main)/dashboard/DashboardEdit.tsxindex d934bf041..d702612f6 100644--- a/src/app/(main)/dashboard/DashboardEdit.tsx+++ b/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';diff --git a/src/app/(main)/dashboard/Dashboard.tsx b/src/app/(main)/dashboard/DashboardPage.tsxsimilarity index 97%rename from src/app/(main)/dashboard/Dashboard.tsxrename to src/app/(main)/dashboard/DashboardPage.tsxindex d669ca6fa..0b8a7d904 100644--- a/src/app/(main)/dashboard/Dashboard.tsx+++ b/src/app/(main)/dashboard/DashboardPage.tsx@@ -10,7 +10,7 @@ import { useMessages, useLocale, useTeamUrl, useWebsites } from 'components/hookimport 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;diff --git a/src/app/(main)/dashboard/DashboardSettingsButton.tsx b/src/app/(main)/dashboard/DashboardSettingsButton.tsxindex e276dc398..9e1d3dbc6 100644--- a/src/app/(main)/dashboard/DashboardSettingsButton.tsx+++ b/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';diff --git a/src/app/(main)/dashboard/page.tsx b/src/app/(main)/dashboard/page.tsxindex 50c08f472..634a26169 100644--- a/src/app/(main)/dashboard/page.tsx+++ b/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 = {diff --git a/src/app/(main)/layout.module.css b/src/app/(main)/layout.module.cssindex 58c1cacf6..09b2eab72 100644--- a/src/app/(main)/layout.module.css+++ b/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);+}diff --git a/src/app/(main)/layout.tsx b/src/app/(main)/layout.tsxindex f5aeab67d..bcc86bffb 100644--- a/src/app/(main)/layout.tsx+++ b/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';diff --git a/src/app/(main)/profile/DateRangeSetting.tsx b/src/app/(main)/profile/DateRangeSetting.tsxindex 50be068b2..a1ae7bc79 100644--- a/src/app/(main)/profile/DateRangeSetting.tsx+++ b/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';diff --git a/src/app/(main)/profile/LanguageSetting.tsx b/src/app/(main)/profile/LanguageSetting.tsxindex 0fefb6eb5..3004af1e9 100644--- a/src/app/(main)/profile/LanguageSetting.tsx+++ b/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';diff --git a/src/app/(main)/profile/PasswordChangeButton.tsx b/src/app/(main)/profile/PasswordChangeButton.tsxindex 116491729..552663ca9 100644--- a/src/app/(main)/profile/PasswordChangeButton.tsx+++ b/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';diff --git a/src/app/(main)/profile/PasswordEditForm.tsx b/src/app/(main)/profile/PasswordEditForm.tsxindex 6cbb2e9ee..1402efa2d 100644--- a/src/app/(main)/profile/PasswordEditForm.tsx+++ b/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';diff --git a/src/app/(main)/profile/ProfileHeader.tsx b/src/app/(main)/profile/ProfileHeader.tsxindex 35aeb0e65..e2d69cc7a 100644--- a/src/app/(main)/profile/ProfileHeader.tsx+++ b/src/app/(main)/profile/ProfileHeader.tsx@@ -1,4 +1,3 @@-'use client';import PageHeader from 'components/layout/PageHeader';import { useMessages } from 'components/hooks';diff --git a/src/app/(main)/profile/page.module.css b/src/app/(main)/profile/ProfilePage.module.csssimilarity index 100%rename from src/app/(main)/profile/page.module.cssrename to src/app/(main)/profile/ProfilePage.module.cssdiff --git a/src/app/(main)/profile/ProfilePage.tsx b/src/app/(main)/profile/ProfilePage.tsxnew file mode 100644index 000000000..428ce2842--- /dev/null+++ b/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>+ );+}diff --git a/src/app/(main)/profile/ProfileSettings.tsx b/src/app/(main)/profile/ProfileSettings.tsxindex f6b0a08bd..1021c37ed 100644--- a/src/app/(main)/profile/ProfileSettings.tsx+++ b/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';diff --git a/src/app/(main)/profile/ThemeSetting.tsx b/src/app/(main)/profile/ThemeSetting.tsxindex 3c714320e..577728b73 100644--- a/src/app/(main)/profile/ThemeSetting.tsx+++ b/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';diff --git a/src/app/(main)/profile/TimezoneSetting.tsx b/src/app/(main)/profile/TimezoneSetting.tsxindex 101e7b342..671125f40 100644--- a/src/app/(main)/profile/TimezoneSetting.tsx+++ b/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';diff --git a/src/app/(main)/profile/page.tsx b/src/app/(main)/profile/page.tsxindex d774e5281..c653624bf 100644--- a/src/app/(main)/profile/page.tsx+++ b/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 = {diff --git a/src/app/(main)/reports/ReportDeleteButton.tsx b/src/app/(main)/reports/ReportDeleteButton.tsxindex c0f164694..99e39d71c 100644--- a/src/app/(main)/reports/ReportDeleteButton.tsx+++ b/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';diff --git a/src/app/(main)/reports/ReportsDataTable.tsx b/src/app/(main)/reports/ReportsDataTable.tsxindex 5e0de5997..cf5953e85 100644--- a/src/app/(main)/reports/ReportsDataTable.tsx+++ b/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';diff --git a/src/app/(main)/reports/ReportsHeader.tsx b/src/app/(main)/reports/ReportsHeader.tsxindex e0b0c10a2..068c03698 100644--- a/src/app/(main)/reports/ReportsHeader.tsx+++ b/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';diff --git a/src/app/(main)/reports/ReportsPage.tsx b/src/app/(main)/reports/ReportsPage.tsxnew file mode 100644index 000000000..498bce57f--- /dev/null+++ b/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',+};diff --git a/src/app/(main)/reports/ReportsTable.tsx b/src/app/(main)/reports/ReportsTable.tsxindex 184fb43fd..7cb9cca7b 100644--- a/src/app/(main)/reports/ReportsTable.tsx+++ b/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';diff --git a/src/app/(main)/reports/[reportId]/BaseParameters.tsx b/src/app/(main)/reports/[reportId]/BaseParameters.tsxindex 3f02fab8f..cf7ae21c9 100644--- a/src/app/(main)/reports/[reportId]/BaseParameters.tsx+++ b/src/app/(main)/reports/[reportId]/BaseParameters.tsx@@ -1,11 +1,10 @@-'use client';import { useContext } from 'react';import { FormRow } from 'react-basics';import { parseDateRange } from 'lib/date';import DateFilter from 'components/input/DateFilter';import WebsiteSelect from 'components/input/WebsiteSelect';import { useMessages, useTeamUrl } from 'components/hooks';-import { ReportContext } from './Report';+import { ReportContext } from './ReportPage';export interface BaseParametersProps {showWebsiteSelect?: boolean;diff --git a/src/app/(main)/reports/[reportId]/FieldAddForm.tsx b/src/app/(main)/reports/[reportId]/FieldAddForm.tsxindex ac7bff5bc..9db472d8d 100644--- a/src/app/(main)/reports/[reportId]/FieldAddForm.tsx+++ b/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';diff --git a/src/app/(main)/reports/[reportId]/FieldAggregateForm.tsx b/src/app/(main)/reports/[reportId]/FieldAggregateForm.tsxindex 68463b33c..6b5bf6360 100644--- a/src/app/(main)/reports/[reportId]/FieldAggregateForm.tsx+++ b/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';diff --git a/src/app/(main)/reports/[reportId]/FieldFilterForm.tsx b/src/app/(main)/reports/[reportId]/FieldFilterForm.tsxindex c06e83b6c..63504ed15 100644--- a/src/app/(main)/reports/[reportId]/FieldFilterForm.tsx+++ b/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';diff --git a/src/app/(main)/reports/[reportId]/FieldSelectForm.tsx b/src/app/(main)/reports/[reportId]/FieldSelectForm.tsxindex 9219d7798..dfd402cf0 100644--- a/src/app/(main)/reports/[reportId]/FieldSelectForm.tsx+++ b/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';diff --git a/src/app/(main)/reports/[reportId]/FilterSelectForm.tsx b/src/app/(main)/reports/[reportId]/FilterSelectForm.tsxindex 2654bfc50..4f9b92642 100644--- a/src/app/(main)/reports/[reportId]/FilterSelectForm.tsx+++ b/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';diff --git a/src/app/(main)/reports/[reportId]/ParameterList.tsx b/src/app/(main)/reports/[reportId]/ParameterList.tsxindex 6ea92375a..eb1a646a4 100644--- a/src/app/(main)/reports/[reportId]/ParameterList.tsx+++ b/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';diff --git a/src/app/(main)/reports/[reportId]/PopupForm.tsx b/src/app/(main)/reports/[reportId]/PopupForm.tsxindex 81cad4edd..f26661991 100644--- a/src/app/(main)/reports/[reportId]/PopupForm.tsx+++ b/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';diff --git a/src/app/(main)/reports/[reportId]/ReportBody.tsx b/src/app/(main)/reports/[reportId]/ReportBody.tsxindex de7b0665b..c9c3220eb 100644--- a/src/app/(main)/reports/[reportId]/ReportBody.tsx+++ b/src/app/(main)/reports/[reportId]/ReportBody.tsx@@ -1,7 +1,6 @@-'use client';import styles from './ReportBody.module.css';import { useContext } from 'react';-import { ReportContext } from './Report';+import { ReportContext } from './ReportPage';export function ReportBody({ children }) {const { report } = useContext(ReportContext);diff --git a/src/app/(main)/reports/[reportId]/ReportDetails.tsx b/src/app/(main)/reports/[reportId]/ReportDetails.tsxindex e4d4688a0..40d58e927 100644--- a/src/app/(main)/reports/[reportId]/ReportDetails.tsx+++ b/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';diff --git a/src/app/(main)/reports/[reportId]/ReportHeader.tsx b/src/app/(main)/reports/[reportId]/ReportHeader.tsxindex 90b776b01..1c6cea6cb 100644--- a/src/app/(main)/reports/[reportId]/ReportHeader.tsx+++ b/src/app/(main)/reports/[reportId]/ReportHeader.tsx@@ -1,8 +1,7 @@-'use client';import { useContext } from 'react';import { Icon, LoadingButton, InlineEditField, useToasts } from 'react-basics';import { useMessages, useApi, useNavigation, useTeamUrl } from 'components/hooks';-import { ReportContext } from './Report';+import { ReportContext } from './ReportPage';import styles from './ReportHeader.module.css';import { REPORT_TYPES } from 'lib/constants';diff --git a/src/app/(main)/reports/[reportId]/ReportMenu.tsx b/src/app/(main)/reports/[reportId]/ReportMenu.tsxindex 0f6684a5f..4b2e7d833 100644--- a/src/app/(main)/reports/[reportId]/ReportMenu.tsx+++ b/src/app/(main)/reports/[reportId]/ReportMenu.tsx@@ -1,7 +1,6 @@-'use client';import styles from './ReportMenu.module.css';import { useContext } from 'react';-import { ReportContext } from './Report';+import { ReportContext } from './ReportPage';export function ReportMenu({ children }) {const { report } = useContext(ReportContext);diff --git a/src/app/(main)/reports/[reportId]/Report.tsx b/src/app/(main)/reports/[reportId]/ReportPage.tsxsimilarity index 80%rename from src/app/(main)/reports/[reportId]/Report.tsxrename to src/app/(main)/reports/[reportId]/ReportPage.tsxindex c1cc502f9..badc4a7fd 100644--- a/src/app/(main)/reports/[reportId]/Report.tsx+++ b/src/app/(main)/reports/[reportId]/ReportPage.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 ReportPage({+ 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) {@@ -28,4 +30,4 @@ export function Report({ reportId, defaultParameters, children, className }: Rep);}-export default Report;+export default ReportPage;diff --git a/src/app/(main)/reports/create/ReportCreatePage.tsx b/src/app/(main)/reports/create/ReportCreatePage.tsxnew file mode 100644index 000000000..ff3a761a2--- /dev/null+++ b/src/app/(main)/reports/create/ReportCreatePage.tsx@@ -0,0 +1,6 @@+'use client';+import ReportTemplates from './ReportTemplates';++export default function ReportCreatePage() {+ return <ReportTemplates />;+}diff --git a/src/app/(main)/reports/create/ReportTemplates.tsx b/src/app/(main)/reports/create/ReportTemplates.tsxindex 3fa58b509..ae84046ad 100644--- a/src/app/(main)/reports/create/ReportTemplates.tsx+++ b/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;diff --git a/src/app/(main)/reports/create/page.tsx b/src/app/(main)/reports/create/page.tsxindex 8726f435e..4a5928453 100644--- a/src/app/(main)/reports/create/page.tsx+++ b/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 = {diff --git a/src/app/(main)/reports/event-data/EventDataParameters.tsx b/src/app/(main)/reports/event-data/EventDataParameters.tsxindex 44f3e8e3e..4d95088f2 100644--- a/src/app/(main)/reports/event-data/EventDataParameters.tsx+++ b/src/app/(main)/reports/event-data/EventDataParameters.tsx@@ -1,11 +1,10 @@-'use client';import { useContext } from 'react';import { Form, FormRow, FormButtons, SubmitButton, PopupTrigger, Icon, Popup } from 'react-basics';import Empty from 'components/common/Empty';import Icons from 'components/icons';import { useApi, useMessages } from 'components/hooks';import { DATA_TYPES, REPORT_PARAMETERS } from 'lib/constants';-import { ReportContext } from '../[reportId]/Report';+import { ReportContext } from '../[reportId]/ReportPage';import FieldAddForm from '../[reportId]/FieldAddForm';import ParameterList from '../[reportId]/ParameterList';import BaseParameters from '../[reportId]/BaseParameters';diff --git a/src/app/(main)/reports/event-data/EventDataReport.tsx b/src/app/(main)/reports/event-data/EventDataReport.tsxindex f4d674e5d..9d761f22f 100644--- a/src/app/(main)/reports/event-data/EventDataReport.tsx+++ b/src/app/(main)/reports/event-data/EventDataReport.tsx@@ -1,5 +1,4 @@-'use client';-import Report from '../[reportId]/Report';+import ReportPage from '../[reportId]/ReportPage';import ReportHeader from '../[reportId]/ReportHeader';import ReportMenu from '../[reportId]/ReportMenu';import ReportBody from '../[reportId]/ReportBody';@@ -14,7 +13,7 @@ const defaultParameters = {export default function EventDataReport({ reportId }: { reportId?: string }) {return (- <Report reportId={reportId} defaultParameters={defaultParameters}>+ <ReportPage reportId={reportId} defaultParameters={defaultParameters}><ReportHeader icon={<Nodes />} /><ReportMenu><EventDataParameters />@@ -22,6 +21,6 @@ export default function EventDataReport({ reportId }: { reportId?: string }) {<ReportBody><EventDataTable /></ReportBody>- </Report>+ </ReportPage>);}diff --git a/src/app/(main)/reports/event-data/EventDataReportPage.tsx b/src/app/(main)/reports/event-data/EventDataReportPage.tsxnew file mode 100644index 000000000..8276acfbd--- /dev/null+++ b/src/app/(main)/reports/event-data/EventDataReportPage.tsx@@ -0,0 +1,6 @@+'use client';+import EventDataReport from './EventDataReport';++export default function EventDataReportPage() {+ return <EventDataReport />;+}diff --git a/src/app/(main)/reports/event-data/EventDataTable.tsx b/src/app/(main)/reports/event-data/EventDataTable.tsxindex cf5937597..e9a2b8763 100644--- a/src/app/(main)/reports/event-data/EventDataTable.tsx+++ b/src/app/(main)/reports/event-data/EventDataTable.tsx@@ -1,8 +1,7 @@-'use client';import { useContext } from 'react';import { GridTable, GridColumn } from 'react-basics';import { useMessages } from 'components/hooks';-import { ReportContext } from '../[reportId]/Report';+import { ReportContext } from '../[reportId]/ReportPage';export function EventDataTable() {const { report } = useContext(ReportContext);diff --git a/src/app/(main)/reports/event-data/page.tsx b/src/app/(main)/reports/event-data/page.tsxindex fe0fdb55e..b8a11749a 100644--- a/src/app/(main)/reports/event-data/page.tsx+++ b/src/app/(main)/reports/event-data/page.tsx@@ -1,7 +1,7 @@import { Metadata } from 'next';import EventDataReport from './EventDataReport';-export default function EventDataReportPage() {+export default function () {return <EventDataReport />;}diff --git a/src/app/(main)/reports/funnel/FunnelChart.tsx b/src/app/(main)/reports/funnel/FunnelChart.tsxindex e643967f0..e7ec7b594 100644--- a/src/app/(main)/reports/funnel/FunnelChart.tsx+++ b/src/app/(main)/reports/funnel/FunnelChart.tsx@@ -1,10 +1,9 @@-'use client';import { JSX, useCallback, useContext, useMemo } from 'react';import { Loading, StatusLight } from 'react-basics';import { useMessages, useTheme } from 'components/hooks';import BarChart from 'components/metrics/BarChart';import { formatLongNumber } from 'lib/format';-import { ReportContext } from '../[reportId]/Report';+import { ReportContext } from '../[reportId]/ReportPage';import styles from './FunnelChart.module.css';export interface FunnelChartProps {diff --git a/src/app/(main)/reports/funnel/FunnelParameters.tsx b/src/app/(main)/reports/funnel/FunnelParameters.tsxindex 5a3bdada6..676c18d49 100644--- a/src/app/(main)/reports/funnel/FunnelParameters.tsx+++ b/src/app/(main)/reports/funnel/FunnelParameters.tsx@@ -1,4 +1,3 @@-'use client';import { useContext } from 'react';import { useMessages } from 'components/hooks';import {@@ -14,7 +13,7 @@ import {} from 'react-basics';import Icons from 'components/icons';import UrlAddForm from './UrlAddForm';-import { ReportContext } from '../[reportId]/Report';+import { ReportContext } from '../[reportId]/ReportPage';import BaseParameters from '../[reportId]/BaseParameters';import ParameterList from '../[reportId]/ParameterList';import PopupForm from '../[reportId]/PopupForm';diff --git a/src/app/(main)/reports/funnel/FunnelReport.tsx b/src/app/(main)/reports/funnel/FunnelReport.tsxindex 4013f073a..479873480 100644--- a/src/app/(main)/reports/funnel/FunnelReport.tsx+++ b/src/app/(main)/reports/funnel/FunnelReport.tsx@@ -1,8 +1,7 @@-'use client';import FunnelChart from './FunnelChart';import FunnelTable from './FunnelTable';import FunnelParameters from './FunnelParameters';-import Report from '../[reportId]/Report';+import ReportPage from '../[reportId]/ReportPage';import ReportHeader from '../[reportId]/ReportHeader';import ReportMenu from '../[reportId]/ReportMenu';import ReportBody from '../[reportId]/ReportBody';@@ -16,7 +15,7 @@ const defaultParameters = {export default function FunnelReport({ reportId }: { reportId?: string }) {return (- <Report reportId={reportId} defaultParameters={defaultParameters}>+ <ReportPage reportId={reportId} defaultParameters={defaultParameters}><ReportHeader icon={<Funnel />} /><ReportMenu><FunnelParameters />@@ -25,6 +24,6 @@ export default function FunnelReport({ reportId }: { reportId?: string }) {<FunnelChart /><FunnelTable /></ReportBody>- </Report>+ </ReportPage>);}diff --git a/src/app/(main)/reports/funnel/FunnelReportPage.tsx b/src/app/(main)/reports/funnel/FunnelReportPage.tsxnew file mode 100644index 000000000..a114a8cce--- /dev/null+++ b/src/app/(main)/reports/funnel/FunnelReportPage.tsx@@ -0,0 +1,6 @@+'use client';+import FunnelReport from './FunnelReport';++export default function FunnelReportPage() {+ return <FunnelReport />;+}diff --git a/src/app/(main)/reports/funnel/FunnelTable.tsx b/src/app/(main)/reports/funnel/FunnelTable.tsxindex d74bdeb41..67a2444a8 100644--- a/src/app/(main)/reports/funnel/FunnelTable.tsx+++ b/src/app/(main)/reports/funnel/FunnelTable.tsx@@ -1,8 +1,7 @@-'use client';import { useContext } from 'react';import ListTable from 'components/metrics/ListTable';import { useMessages } from 'components/hooks';-import { ReportContext } from '../[reportId]/Report';+import { ReportContext } from '../[reportId]/ReportPage';export function FunnelTable() {const { report } = useContext(ReportContext);diff --git a/src/app/(main)/reports/funnel/UrlAddForm.tsx b/src/app/(main)/reports/funnel/UrlAddForm.tsxindex 9aa342f72..88c27ae91 100644--- a/src/app/(main)/reports/funnel/UrlAddForm.tsx+++ b/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';diff --git a/src/app/(main)/reports/funnel/page.tsx b/src/app/(main)/reports/funnel/page.tsxindex 7a2f2a5a8..e00cfd51b 100644--- a/src/app/(main)/reports/funnel/page.tsx+++ b/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 = {diff --git a/src/app/(main)/reports/insights/InsightsParameters.tsx b/src/app/(main)/reports/insights/InsightsParameters.tsxindex 5adfc58e4..3799ec8c9 100644--- a/src/app/(main)/reports/insights/InsightsParameters.tsx+++ b/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 {@@ -13,7 +12,7 @@ import {} from 'react-basics';import Icons from 'components/icons';import BaseParameters from '../[reportId]/BaseParameters';-import { ReportContext } from '../[reportId]/Report';+import { ReportContext } from '../[reportId]/ReportPage';import ParameterList from '../[reportId]/ParameterList';import FilterSelectForm from '../[reportId]/FilterSelectForm';import FieldSelectForm from '../[reportId]/FieldSelectForm';diff --git a/src/app/(main)/reports/insights/InsightsReport.tsx b/src/app/(main)/reports/insights/InsightsReport.tsxindex 3c1990033..306b3e760 100644--- a/src/app/(main)/reports/insights/InsightsReport.tsx+++ b/src/app/(main)/reports/insights/InsightsReport.tsx@@ -1,5 +1,4 @@-'use client';-import Report from '../[reportId]/Report';+import ReportPage from '../[reportId]/ReportPage';import ReportHeader from '../[reportId]/ReportHeader';import ReportMenu from '../[reportId]/ReportMenu';import ReportBody from '../[reportId]/ReportBody';@@ -15,7 +14,7 @@ const defaultParameters = {export default function InsightsReport({ reportId }: { reportId?: string }) {return (- <Report reportId={reportId} defaultParameters={defaultParameters}>+ <ReportPage reportId={reportId} defaultParameters={defaultParameters}><ReportHeader icon={<Lightbulb />} /><ReportMenu><InsightsParameters />@@ -23,6 +22,6 @@ export default function InsightsReport({ reportId }: { reportId?: string }) {<ReportBody><InsightsTable /></ReportBody>- </Report>+ </ReportPage>);}diff --git a/src/app/(main)/reports/insights/InsightsReportPage.tsx b/src/app/(main)/reports/insights/InsightsReportPage.tsxnew file mode 100644index 000000000..7525b7678--- /dev/null+++ b/src/app/(main)/reports/insights/InsightsReportPage.tsx@@ -0,0 +1,6 @@+'use client';+import InsightsReport from './InsightsReport';++export default function InsightsReportPage() {+ return <InsightsReport />;+}diff --git a/src/app/(main)/reports/insights/InsightsTable.tsx b/src/app/(main)/reports/insights/InsightsTable.tsxindex f69d8ccc1..f19aaa141 100644--- a/src/app/(main)/reports/insights/InsightsTable.tsx+++ b/src/app/(main)/reports/insights/InsightsTable.tsx@@ -1,8 +1,7 @@-'use client';import { useContext, useEffect, useState } from 'react';import { GridTable, GridColumn } from 'react-basics';import { useFormat, useMessages } from 'components/hooks';-import { ReportContext } from '../[reportId]/Report';+import { ReportContext } from '../[reportId]/ReportPage';import EmptyPlaceholder from 'components/common/EmptyPlaceholder';export function InsightsTable() {diff --git a/src/app/(main)/reports/insights/page.tsx b/src/app/(main)/reports/insights/page.tsxindex e09565c08..cb3b90162 100644--- a/src/app/(main)/reports/insights/page.tsx+++ b/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 = {diff --git a/src/app/(main)/reports/page.tsx b/src/app/(main)/reports/page.tsxindex 0dc380a98..44a034a06 100644--- a/src/app/(main)/reports/page.tsx+++ b/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',};diff --git a/src/app/(main)/reports/retention/RetentionParameters.tsx b/src/app/(main)/reports/retention/RetentionParameters.tsxindex 169553389..461dd90bf 100644--- a/src/app/(main)/reports/retention/RetentionParameters.tsx+++ b/src/app/(main)/reports/retention/RetentionParameters.tsx@@ -1,8 +1,7 @@-'use client';import { useContext } from 'react';import { useMessages } from 'components/hooks';import { Form, FormButtons, FormRow, SubmitButton } from 'react-basics';-import { ReportContext } from '../[reportId]/Report';+import { ReportContext } from '../[reportId]/ReportPage';import { MonthSelect } from 'components/input/MonthSelect';import BaseParameters from '../[reportId]/BaseParameters';import { parseDateRange } from 'lib/date';diff --git a/src/app/(main)/reports/retention/RetentionReport.tsx b/src/app/(main)/reports/retention/RetentionReport.tsxindex f02e5bb17..37fc5820f 100644--- a/src/app/(main)/reports/retention/RetentionReport.tsx+++ b/src/app/(main)/reports/retention/RetentionReport.tsx@@ -1,7 +1,6 @@-'use client';import RetentionTable from './RetentionTable';import RetentionParameters from './RetentionParameters';-import Report from '../[reportId]/Report';+import ReportPage from '../[reportId]/ReportPage';import ReportHeader from '../[reportId]/ReportHeader';import ReportMenu from '../[reportId]/ReportMenu';import ReportBody from '../[reportId]/ReportBody';@@ -21,7 +20,7 @@ const defaultParameters = {export default function RetentionReport({ reportId }: { reportId?: string }) {return (- <Report reportId={reportId} defaultParameters={defaultParameters}>+ <ReportPage reportId={reportId} defaultParameters={defaultParameters}><ReportHeader icon={<Magnet />} /><ReportMenu><RetentionParameters />@@ -29,6 +28,6 @@ export default function RetentionReport({ reportId }: { reportId?: string }) {<ReportBody><RetentionTable /></ReportBody>- </Report>+ </ReportPage>);}diff --git a/src/app/(main)/reports/retention/RetentionReportPage.tsx b/src/app/(main)/reports/retention/RetentionReportPage.tsxnew file mode 100644index 000000000..f2500fb20--- /dev/null+++ b/src/app/(main)/reports/retention/RetentionReportPage.tsx@@ -0,0 +1,6 @@+'use client';+import RetentionReport from './RetentionReport';++export default function RetentionReportPage() {+ return <RetentionReport />;+}diff --git a/src/app/(main)/reports/retention/RetentionTable.tsx b/src/app/(main)/reports/retention/RetentionTable.tsxindex b43848930..2ad36177a 100644--- a/src/app/(main)/reports/retention/RetentionTable.tsx+++ b/src/app/(main)/reports/retention/RetentionTable.tsx@@ -1,7 +1,6 @@-'use client';import { useContext } from 'react';import classNames from 'classnames';-import { ReportContext } from '../[reportId]/Report';+import { ReportContext } from '../[reportId]/ReportPage';import EmptyPlaceholder from 'components/common/EmptyPlaceholder';import { useMessages, useLocale } from 'components/hooks';import { formatDate } from 'lib/date';diff --git a/src/app/(main)/reports/retention/page.tsx b/src/app/(main)/reports/retention/page.tsxindex 417843724..810714031 100644--- a/src/app/(main)/reports/retention/page.tsx+++ b/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 = {diff --git a/src/app/(main)/settings/Settings.tsx b/src/app/(main)/settings/SettingsLayout.tsxsimilarity index 72%rename from src/app/(main)/settings/Settings.tsxrename to src/app/(main)/settings/SettingsLayout.tsxindex 85e9caeef..28e9a0742 100644--- a/src/app/(main)/settings/Settings.tsx+++ b/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>;}diff --git a/src/app/(main)/settings/layout.tsx b/src/app/(main)/settings/layout.tsxindex 6829e9668..eb382e3b7 100644--- a/src/app/(main)/settings/layout.tsx+++ b/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>;}diff --git a/src/app/(main)/settings/teams/TeamAddForm.tsx b/src/app/(main)/settings/teams/TeamAddForm.tsxindex a3caf25f8..9bcf78405 100644--- a/src/app/(main)/settings/teams/TeamAddForm.tsx+++ b/src/app/(main)/settings/teams/TeamAddForm.tsx@@ -1,4 +1,3 @@-'use client';import {Form,FormRow,diff --git a/src/app/(main)/settings/teams/TeamJoinForm.tsx b/src/app/(main)/settings/teams/TeamJoinForm.tsxindex b448a3687..385ff1df1 100644--- a/src/app/(main)/settings/teams/TeamJoinForm.tsx+++ b/src/app/(main)/settings/teams/TeamJoinForm.tsx@@ -1,4 +1,3 @@-'use client';import { useRef } from 'react';import {Form,diff --git a/src/app/(main)/settings/teams/TeamLeaveButton.tsx b/src/app/(main)/settings/teams/TeamLeaveButton.tsxindex db9dc050e..8b246a3be 100644--- a/src/app/(main)/settings/teams/TeamLeaveButton.tsx+++ b/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';diff --git a/src/app/(main)/settings/teams/TeamLeaveForm.tsx b/src/app/(main)/settings/teams/TeamLeaveForm.tsxindex eba448f1e..466fbab32 100644--- a/src/app/(main)/settings/teams/TeamLeaveForm.tsx+++ b/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';diff --git a/src/app/(main)/settings/teams/TeamsAddButton.tsx b/src/app/(main)/settings/teams/TeamsAddButton.tsxindex 945193589..871cdb761 100644--- a/src/app/(main)/settings/teams/TeamsAddButton.tsx+++ b/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';diff --git a/src/app/(main)/settings/teams/TeamsDataTable.tsx b/src/app/(main)/settings/teams/TeamsDataTable.tsxindex c48617f25..1890af8ad 100644--- a/src/app/(main)/settings/teams/TeamsDataTable.tsx+++ b/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';diff --git a/src/app/(main)/settings/teams/TeamsHeader.tsx b/src/app/(main)/settings/teams/TeamsHeader.tsxindex 0148d97be..4c0406918 100644--- a/src/app/(main)/settings/teams/TeamsHeader.tsx+++ b/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';diff --git a/src/app/(main)/settings/teams/TeamsJoinButton.tsx b/src/app/(main)/settings/teams/TeamsJoinButton.tsxindex 04bb9824b..45a2142ea 100644--- a/src/app/(main)/settings/teams/TeamsJoinButton.tsx+++ b/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';diff --git a/src/app/(main)/settings/teams/TeamsPage.tsx b/src/app/(main)/settings/teams/TeamsPage.tsxnew file mode 100644index 000000000..33ddda3df--- /dev/null+++ b/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 />+ </>+ );+}diff --git a/src/app/(main)/settings/teams/TeamsTable.tsx b/src/app/(main)/settings/teams/TeamsTable.tsxindex 65d79e517..787d51c7b 100644--- a/src/app/(main)/settings/teams/TeamsTable.tsx+++ b/src/app/(main)/settings/teams/TeamsTable.tsx@@ -1,4 +1,3 @@-'use client';import { GridColumn, GridTable, Icon, Text, useBreakpoint } from 'react-basics';import { useMessages } from 'components/hooks';import Icons from 'components/icons';diff --git a/src/app/(main)/settings/teams/WebsiteTags.tsx b/src/app/(main)/settings/teams/WebsiteTags.tsxindex 9e71e3d68..4a0f109d8 100644--- a/src/app/(main)/settings/teams/WebsiteTags.tsx+++ b/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';diff --git a/src/app/(main)/settings/teams/[teamId]/members/TeamMemberRemoveButton.tsx b/src/app/(main)/settings/teams/[teamId]/members/TeamMemberRemoveButton.tsxindex bae0e7236..0b4ca500b 100644--- a/src/app/(main)/settings/teams/[teamId]/members/TeamMemberRemoveButton.tsx+++ b/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';diff --git a/src/app/(main)/settings/teams/[teamId]/members/TeamMembersDataTable.tsx b/src/app/(main)/settings/teams/[teamId]/members/TeamMembersDataTable.tsxindex ff95e522c..996283a79 100644--- a/src/app/(main)/settings/teams/[teamId]/members/TeamMembersDataTable.tsx+++ b/src/app/(main)/settings/teams/[teamId]/members/TeamMembersDataTable.tsx@@ -1,4 +1,3 @@-'use client';import DataTable from 'components/common/DataTable';import TeamMembersTable from './TeamMembersTable';import { useTeamMembers } from 'components/hooks';diff --git a/src/app/(main)/settings/teams/[teamId]/members/TeamMembers.tsx b/src/app/(main)/settings/teams/[teamId]/members/TeamMembersPage.tsxsimilarity index 62%rename from src/app/(main)/settings/teams/[teamId]/members/TeamMembers.tsxrename to src/app/(main)/settings/teams/[teamId]/members/TeamMembersPage.tsxindex 34cb248c3..ef0e12d1d 100644--- a/src/app/(main)/settings/teams/[teamId]/members/TeamMembers.tsx+++ b/src/app/(main)/settings/teams/[teamId]/members/TeamMembersPage.tsx@@ -1,17 +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 TeamMembers({ teamId }: { teamId: string }) {+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 TeamMembers;+export default TeamMembersPage;diff --git a/src/app/(main)/settings/teams/[teamId]/members/TeamMembersTable.tsx b/src/app/(main)/settings/teams/[teamId]/members/TeamMembersTable.tsxindex aceb58945..d993bbc07 100644--- a/src/app/(main)/settings/teams/[teamId]/members/TeamMembersTable.tsx+++ b/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';diff --git a/src/app/(main)/settings/teams/[teamId]/members/page.tsx b/src/app/(main)/settings/teams/[teamId]/members/page.tsxindex 295b3f152..e36e92148 100644--- a/src/app/(main)/settings/teams/[teamId]/members/page.tsx+++ b/src/app/(main)/settings/teams/[teamId]/members/page.tsx@@ -1,13 +1,8 @@-import TeamMembers from './TeamMembers';-import TeamProvider from 'app/(main)/teams/[teamId]/TeamProvider';+import TeamMembersPage from './TeamMembersPage';import { Metadata } from 'next';export default function ({ params: { teamId } }) {- return (- <TeamProvider teamId={teamId}>- <TeamMembers teamId={teamId} />- </TeamProvider>- );+ return <TeamMembersPage teamId={teamId} />;}export const metadata: Metadata = {diff --git a/src/app/(main)/settings/teams/[teamId]/team/TeamAdmin.tsx b/src/app/(main)/settings/teams/[teamId]/team/TeamAdmin.tsxindex ff20989a6..582012d42 100644--- a/src/app/(main)/settings/teams/[teamId]/team/TeamAdmin.tsx+++ b/src/app/(main)/settings/teams/[teamId]/team/TeamAdmin.tsx@@ -1,4 +1,3 @@-'use client';import { ActionForm, Button, Modal, ModalTrigger } from 'react-basics';import { useMessages } from 'components/hooks';import TeamDeleteForm from './TeamDeleteForm';diff --git a/src/app/(main)/settings/teams/[teamId]/team/TeamDeleteForm.tsx b/src/app/(main)/settings/teams/[teamId]/team/TeamDeleteForm.tsxindex aa2b1d3f8..33694495c 100644--- a/src/app/(main)/settings/teams/[teamId]/team/TeamDeleteForm.tsx+++ b/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';diff --git a/src/app/(main)/settings/teams/[teamId]/team/Team.tsx b/src/app/(main)/settings/teams/[teamId]/team/TeamDetails.tsxsimilarity index 94%rename from src/app/(main)/settings/teams/[teamId]/team/Team.tsxrename to src/app/(main)/settings/teams/[teamId]/team/TeamDetails.tsxindex 18e0c0141..4162e83f4 100644--- a/src/app/(main)/settings/teams/[teamId]/team/Team.tsx+++ b/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';@@ -10,7 +9,7 @@ import TeamAdmin from './TeamAdmin';import LinkButton from 'components/common/LinkButton';import { TeamContext } from 'app/(main)/teams/[teamId]/TeamProvider';-export function Team({ teamId }: { teamId: string }) {+export function TeamDetails({ teamId }: { teamId: string }) {const team = useContext(TeamContext);const { formatMessage, labels } = useMessages();const { user } = useLogin();@@ -42,4 +41,4 @@ export function Team({ teamId }: { teamId: string }) {);}-export default Team;+export default TeamDetails;diff --git a/src/app/(main)/settings/teams/[teamId]/team/TeamEditForm.tsx b/src/app/(main)/settings/teams/[teamId]/team/TeamEditForm.tsxindex 7e158191e..cee3c3f10 100644--- a/src/app/(main)/settings/teams/[teamId]/team/TeamEditForm.tsx+++ b/src/app/(main)/settings/teams/[teamId]/team/TeamEditForm.tsx@@ -1,4 +1,3 @@-'use client';import {SubmitButton,Form,diff --git a/src/app/(main)/settings/teams/[teamId]/team/TeamPage.tsx b/src/app/(main)/settings/teams/[teamId]/team/TeamPage.tsxnew file mode 100644index 000000000..82abcf8da--- /dev/null+++ b/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;diff --git a/src/app/(main)/settings/teams/[teamId]/team/page.tsx b/src/app/(main)/settings/teams/[teamId]/team/page.tsxindex e23b670e8..de2c96576 100644--- a/src/app/(main)/settings/teams/[teamId]/team/page.tsx+++ b/src/app/(main)/settings/teams/[teamId]/team/page.tsx@@ -1,13 +1,8 @@-import Team from './Team';-import TeamProvider from 'app/(main)/teams/[teamId]/TeamProvider';import { Metadata } from 'next';+import TeamPage from './TeamPage';export default function ({ params: { teamId } }) {- return (- <TeamProvider teamId={teamId}>- <Team teamId={teamId} />- </TeamProvider>- );+ return <TeamPage teamId={teamId} />;}export const metadata: Metadata = {diff --git a/src/app/(main)/settings/teams/[teamId]/websites/TeamWebsiteRemoveButton.tsx b/src/app/(main)/settings/teams/[teamId]/websites/TeamWebsiteRemoveButton.tsxindex 843b76d3f..336e151a1 100644--- a/src/app/(main)/settings/teams/[teamId]/websites/TeamWebsiteRemoveButton.tsx+++ b/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';diff --git a/src/app/(main)/settings/teams/[teamId]/websites/TeamWebsitesDataTable.tsx b/src/app/(main)/settings/teams/[teamId]/websites/TeamWebsitesDataTable.tsxindex 794ce948d..9e2985d49 100644--- a/src/app/(main)/settings/teams/[teamId]/websites/TeamWebsitesDataTable.tsx+++ b/src/app/(main)/settings/teams/[teamId]/websites/TeamWebsitesDataTable.tsx@@ -1,4 +1,3 @@-'use client';import DataTable from 'components/common/DataTable';import { useTeamWebsites } from 'components/hooks';import TeamWebsitesTable from './TeamWebsitesTable';diff --git a/src/app/(main)/settings/teams/[teamId]/websites/TeamWebsites.tsx b/src/app/(main)/settings/teams/[teamId]/websites/TeamWebsitesPage.tsxsimilarity index 62%rename from src/app/(main)/settings/teams/[teamId]/websites/TeamWebsites.tsxrename to src/app/(main)/settings/teams/[teamId]/websites/TeamWebsitesPage.tsxindex 36f8d39b5..56582c045 100644--- a/src/app/(main)/settings/teams/[teamId]/websites/TeamWebsites.tsx+++ b/src/app/(main)/settings/teams/[teamId]/websites/TeamWebsitesPage.tsx@@ -1,17 +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 TeamWebsites({ teamId }: { teamId: string }) {+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 TeamWebsites;+export default TeamWebsitesPage;diff --git a/src/app/(main)/settings/teams/[teamId]/websites/TeamWebsitesTable.tsx b/src/app/(main)/settings/teams/[teamId]/websites/TeamWebsitesTable.tsxindex 0d54763ed..b07f3dbfd 100644--- a/src/app/(main)/settings/teams/[teamId]/websites/TeamWebsitesTable.tsx+++ b/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';diff --git a/src/app/(main)/settings/teams/[teamId]/websites/page.tsx b/src/app/(main)/settings/teams/[teamId]/websites/page.tsxindex 31b020656..ac4eb94f6 100644--- a/src/app/(main)/settings/teams/[teamId]/websites/page.tsx+++ b/src/app/(main)/settings/teams/[teamId]/websites/page.tsx@@ -1,15 +1,10 @@-import TeamWebsites from './TeamWebsites';-import TeamProvider from 'app/(main)/teams/[teamId]/TeamProvider';+import TeamWebsitesPage from './TeamWebsitesPage';import { Metadata } from 'next';export default function ({ params: { teamId } }) {- return (- <TeamProvider teamId={teamId}>- <TeamWebsites teamId={teamId} />- </TeamProvider>- );+ return <TeamWebsitesPage teamId={teamId} />;}export const metadata: Metadata = {- title: 'Teams websites - Umami',+ title: 'Teams Websites - Umami',};diff --git a/src/app/(main)/settings/teams/page.tsx b/src/app/(main)/settings/teams/page.tsxindex 98ce95fb0..e45d6f2d3 100644--- a/src/app/(main)/settings/teams/page.tsx+++ b/src/app/(main)/settings/teams/page.tsx@@ -1,14 +1,8 @@import { Metadata } from 'next';-import TeamsDataTable from './TeamsDataTable';-import TeamsHeader from './TeamsHeader';+import TeamsPage from './TeamsPage';export default function () {- return (- <>- <TeamsHeader />- <TeamsDataTable />- </>- );+ return <TeamsPage />;}export const metadata: Metadata = {diff --git a/src/app/(main)/settings/users/UserAddButton.tsx b/src/app/(main)/settings/users/UserAddButton.tsxindex 57f2ebc5a..5746ff2a3 100644--- a/src/app/(main)/settings/users/UserAddButton.tsx+++ b/src/app/(main)/settings/users/UserAddButton.tsx@@ -1,4 +1,3 @@-'use client';import { Button, Icon, Text, Modal, Icons, ModalTrigger, useToasts } from 'react-basics';import UserAddForm from './UserAddForm';import { useMessages } from 'components/hooks';diff --git a/src/app/(main)/settings/users/UserAddForm.tsx b/src/app/(main)/settings/users/UserAddForm.tsxindex 0632165c2..7ea720072 100644--- a/src/app/(main)/settings/users/UserAddForm.tsx+++ b/src/app/(main)/settings/users/UserAddForm.tsx@@ -1,4 +1,3 @@-'use client';import {Dropdown,Item,diff --git a/src/app/(main)/settings/users/UserDeleteButton.tsx b/src/app/(main)/settings/users/UserDeleteButton.tsxindex cdfde6aee..9f1f84591 100644--- a/src/app/(main)/settings/users/UserDeleteButton.tsx+++ b/src/app/(main)/settings/users/UserDeleteButton.tsx@@ -1,4 +1,3 @@-'use client';import { Button, Icon, Icons, Modal, ModalTrigger, Text } from 'react-basics';import { useMessages, useLogin } from 'components/hooks';import UserDeleteForm from './UserDeleteForm';diff --git a/src/app/(main)/settings/users/UserDeleteForm.tsx b/src/app/(main)/settings/users/UserDeleteForm.tsxindex 0cce8d6de..97caf644c 100644--- a/src/app/(main)/settings/users/UserDeleteForm.tsx+++ b/src/app/(main)/settings/users/UserDeleteForm.tsx@@ -1,4 +1,3 @@-'use client';import { useApi, useMessages } from 'components/hooks';import ConfirmationForm from 'components/common/ConfirmationForm';import { touch } from 'store/modified';diff --git a/src/app/(main)/settings/users/UserEditForm.tsx b/src/app/(main)/settings/users/UserEditForm.tsxindex 53384285b..12c5afbcb 100644--- a/src/app/(main)/settings/users/UserEditForm.tsx+++ b/src/app/(main)/settings/users/UserEditForm.tsx@@ -1,4 +1,3 @@-'use client';import {Dropdown,Item,diff --git a/src/app/(main)/settings/users/UsersDataTable.tsx b/src/app/(main)/settings/users/UsersDataTable.tsxindex a8e46cda6..cfff4e71c 100644--- a/src/app/(main)/settings/users/UsersDataTable.tsx+++ b/src/app/(main)/settings/users/UsersDataTable.tsx@@ -1,4 +1,3 @@-'use client';import DataTable from 'components/common/DataTable';import { useUsers } from 'components/hooks';import UsersTable from './UsersTable';diff --git a/src/app/(main)/settings/users/UsersHeader.tsx b/src/app/(main)/settings/users/UsersHeader.tsxindex 20c5f8984..6f4387c7c 100644--- a/src/app/(main)/settings/users/UsersHeader.tsx+++ b/src/app/(main)/settings/users/UsersHeader.tsx@@ -1,4 +1,3 @@-'use client';import PageHeader from 'components/layout/PageHeader';import { useMessages } from 'components/hooks';import UserAddButton from './UserAddButton';diff --git a/src/app/(main)/settings/users/UsersPage.tsx b/src/app/(main)/settings/users/UsersPage.tsxnew file mode 100644index 000000000..348c5a334--- /dev/null+++ b/src/app/(main)/settings/users/UsersPage.tsx@@ -0,0 +1,12 @@+'use client';+import UsersDataTable from './UsersDataTable';+import UsersHeader from './UsersHeader';++export default function UsersPage() {+ return (+ <>+ <UsersHeader />+ <UsersDataTable />+ </>+ );+}diff --git a/src/app/(main)/settings/users/UsersTable.tsx b/src/app/(main)/settings/users/UsersTable.tsxindex 523bd01c6..88effa54b 100644--- a/src/app/(main)/settings/users/UsersTable.tsx+++ b/src/app/(main)/settings/users/UsersTable.tsx@@ -1,4 +1,3 @@-'use client';import { Text, Icon, Icons, GridTable, GridColumn, useBreakpoint } from 'react-basics';import { formatDistance } from 'date-fns';import { ROLES } from 'lib/constants';diff --git a/src/app/(main)/settings/users/[userId]/UserPage.tsx b/src/app/(main)/settings/users/[userId]/UserPage.tsxnew file mode 100644index 000000000..285433eba--- /dev/null+++ b/src/app/(main)/settings/users/[userId]/UserPage.tsx@@ -0,0 +1,6 @@+'use client';+import UserSettings from './UserSettings';++export default function ({ userId }: { userId: string }) {+ return <UserSettings userId={userId} />;+}diff --git a/src/app/(main)/settings/users/[userId]/UserSettings.tsx b/src/app/(main)/settings/users/[userId]/UserSettings.tsxindex eda38089a..50a364879 100644--- a/src/app/(main)/settings/users/[userId]/UserSettings.tsx+++ b/src/app/(main)/settings/users/[userId]/UserSettings.tsx@@ -1,4 +1,3 @@-'use client';import { Key, useState } from 'react';import { Item, Loading, Tabs } from 'react-basics';import Icons from 'components/icons';diff --git a/src/app/(main)/settings/users/[userId]/UserWebsites.tsx b/src/app/(main)/settings/users/[userId]/UserWebsites.tsxindex 429195cd5..bfc6f74b0 100644--- a/src/app/(main)/settings/users/[userId]/UserWebsites.tsx+++ b/src/app/(main)/settings/users/[userId]/UserWebsites.tsx@@ -1,4 +1,3 @@-'use client';import WebsitesTable from 'app/(main)/settings/websites/WebsitesTable';import DataTable from 'components/common/DataTable';import { useWebsites } from 'components/hooks';diff --git a/src/app/(main)/settings/users/[userId]/page.tsx b/src/app/(main)/settings/users/[userId]/page.tsxindex 2e2e41377..414ad4831 100644--- a/src/app/(main)/settings/users/[userId]/page.tsx+++ b/src/app/(main)/settings/users/[userId]/page.tsx@@ -1,5 +1,10 @@-import UserSettings from './UserSettings';+import UserPage from './UserPage';+import { Metadata } from 'next';export default function ({ params: { userId } }) {- return <UserSettings userId={userId} />;+ return <UserPage userId={userId} />;}++export const metadata: Metadata = {+ title: 'User Settings - Umami',+};diff --git a/src/app/(main)/settings/users/page.tsx b/src/app/(main)/settings/users/page.tsxindex 0be95a0de..fa63cf188 100644--- a/src/app/(main)/settings/users/page.tsx+++ b/src/app/(main)/settings/users/page.tsx@@ -1,14 +1,8 @@import { Metadata } from 'next';-import UsersDataTable from './UsersDataTable';-import UsersHeader from './UsersHeader';+import UsersPage from './UsersPage';export default function () {- return (- <>- <UsersHeader />- <UsersDataTable />- </>- );+ return <UsersPage />;}export const metadata: Metadata = {title: 'Users | Umami',diff --git a/src/app/(main)/settings/websites/WebsiteAddButton.tsx b/src/app/(main)/settings/websites/WebsiteAddButton.tsxindex 90fc15b14..35e9bbc3f 100644--- a/src/app/(main)/settings/websites/WebsiteAddButton.tsx+++ b/src/app/(main)/settings/websites/WebsiteAddButton.tsx@@ -1,4 +1,3 @@-'use client';import { Button, Icon, Icons, Modal, ModalTrigger, Text, useToasts } from 'react-basics';import WebsiteAddForm from './WebsiteAddForm';import { useMessages } from 'components/hooks';diff --git a/src/app/(main)/settings/websites/WebsiteAddForm.tsx b/src/app/(main)/settings/websites/WebsiteAddForm.tsxindex 55054cd4c..88cbb4ff3 100644--- a/src/app/(main)/settings/websites/WebsiteAddForm.tsx+++ b/src/app/(main)/settings/websites/WebsiteAddForm.tsx@@ -1,4 +1,3 @@-'use client';import {Form,FormRow,diff --git a/src/app/(main)/settings/websites/WebsitesDataTable.tsx b/src/app/(main)/settings/websites/WebsitesDataTable.tsxindex 18502244a..a9d99f9af 100644--- a/src/app/(main)/settings/websites/WebsitesDataTable.tsx+++ b/src/app/(main)/settings/websites/WebsitesDataTable.tsx@@ -1,4 +1,3 @@-'use client';import { ReactNode } from 'react';import WebsitesTable from 'app/(main)/settings/websites/WebsitesTable';import DataTable from 'components/common/DataTable';diff --git a/src/app/(main)/settings/websites/WebsitesHeader.tsx b/src/app/(main)/settings/websites/WebsitesHeader.tsxindex 3ffc1a95f..e0d3860a6 100644--- a/src/app/(main)/settings/websites/WebsitesHeader.tsx+++ b/src/app/(main)/settings/websites/WebsitesHeader.tsx@@ -1,4 +1,3 @@-'use client';import { useMessages } from 'components/hooks';import PageHeader from 'components/layout/PageHeader';import WebsiteAddButton from './WebsiteAddButton';diff --git a/src/app/(main)/settings/websites/Websites.tsx b/src/app/(main)/settings/websites/WebsitesPage.tsxsimilarity index 70%rename from src/app/(main)/settings/websites/Websites.tsxrename to src/app/(main)/settings/websites/WebsitesPage.tsxindex ffa197ad3..4de8f1051 100644--- a/src/app/(main)/settings/websites/Websites.tsx+++ b/src/app/(main)/settings/websites/WebsitesPage.tsx@@ -3,12 +3,12 @@ import { useLogin } from 'components/hooks';import WebsitesDataTable from './WebsitesDataTable';import WebsitesHeader from './WebsitesHeader';-export default function Websites({ teamId }: { teamId: string }) {+export default function WebsitesPage({ teamId }: { teamId: string }) {const { user } = useLogin();return (<>- <WebsitesHeader teamId={teamId} showActions={user.role !== 'view-only'} />+ <WebsitesHeader teamId={teamId} allowCreate={user.role !== 'view-only'} /><WebsitesDataTable teamId={teamId} userId={user.id} allowEdit={true} /></>);diff --git a/src/app/(main)/settings/websites/WebsitesTable.tsx b/src/app/(main)/settings/websites/WebsitesTable.tsxindex 1f1353c00..cbd5e3a70 100644--- a/src/app/(main)/settings/websites/WebsitesTable.tsx+++ b/src/app/(main)/settings/websites/WebsitesTable.tsx@@ -1,4 +1,3 @@-'use client';import { ReactNode } from 'react';import { Text, Icon, Icons, GridTable, GridColumn, useBreakpoint } from 'react-basics';import { useMessages, useTeamUrl } from 'components/hooks';diff --git a/src/app/(main)/settings/websites/[websiteId]/ShareUrl.tsx b/src/app/(main)/settings/websites/[websiteId]/ShareUrl.tsxindex 13c07dd11..6fb543d0c 100644--- a/src/app/(main)/settings/websites/[websiteId]/ShareUrl.tsx+++ b/src/app/(main)/settings/websites/[websiteId]/ShareUrl.tsx@@ -1,4 +1,3 @@-'use client';import {Form,FormRow,diff --git a/src/app/(main)/settings/websites/[websiteId]/TrackingCode.tsx b/src/app/(main)/settings/websites/[websiteId]/TrackingCode.tsxindex 0995c8ca2..662223492 100644--- a/src/app/(main)/settings/websites/[websiteId]/TrackingCode.tsx+++ b/src/app/(main)/settings/websites/[websiteId]/TrackingCode.tsx@@ -1,4 +1,3 @@-'use client';import { TextArea } from 'react-basics';import { useMessages, useConfig } from 'components/hooks';diff --git a/src/app/(main)/settings/websites/[websiteId]/WebsiteData.tsx b/src/app/(main)/settings/websites/[websiteId]/WebsiteData.tsxindex d22c06084..4dd5fde45 100644--- a/src/app/(main)/settings/websites/[websiteId]/WebsiteData.tsx+++ b/src/app/(main)/settings/websites/[websiteId]/WebsiteData.tsx@@ -1,4 +1,3 @@-'use client';import { Button, Modal, ModalTrigger, ActionForm, useToasts } from 'react-basics';import { useRouter } from 'next/navigation';import { useMessages } from 'components/hooks';diff --git a/src/app/(main)/settings/websites/[websiteId]/WebsiteDeleteForm.tsx b/src/app/(main)/settings/websites/[websiteId]/WebsiteDeleteForm.tsxindex be703d910..19755205b 100644--- a/src/app/(main)/settings/websites/[websiteId]/WebsiteDeleteForm.tsx+++ b/src/app/(main)/settings/websites/[websiteId]/WebsiteDeleteForm.tsx@@ -1,4 +1,3 @@-'use client';import { useApi, useMessages } from 'components/hooks';import TypeConfirmationForm from 'components/common/TypeConfirmationForm';diff --git a/src/app/(main)/settings/websites/[websiteId]/WebsiteEditForm.tsx b/src/app/(main)/settings/websites/[websiteId]/WebsiteEditForm.tsxindex cd4fb5d78..53f27b26e 100644--- a/src/app/(main)/settings/websites/[websiteId]/WebsiteEditForm.tsx+++ b/src/app/(main)/settings/websites/[websiteId]/WebsiteEditForm.tsx@@ -1,4 +1,3 @@-'use client';import { useContext, useRef } from 'react';import {SubmitButton,diff --git a/src/app/(main)/settings/websites/[websiteId]/WebsitePage.tsx b/src/app/(main)/settings/websites/[websiteId]/WebsitePage.tsxnew file mode 100644index 000000000..752fd33ca--- /dev/null+++ b/src/app/(main)/settings/websites/[websiteId]/WebsitePage.tsx@@ -0,0 +1,11 @@+'use client';+import WebsiteProvider from 'app/(main)/websites/[websiteId]/WebsiteProvider';+import WebsiteSettings from './WebsiteSettings';++export default function WebsitePage({ websiteId }: { websiteId: string }) {+ return (+ <WebsiteProvider websiteId={websiteId}>+ <WebsiteSettings websiteId={websiteId} />+ </WebsiteProvider>+ );+}diff --git a/src/app/(main)/settings/websites/[websiteId]/WebsiteResetForm.tsx b/src/app/(main)/settings/websites/[websiteId]/WebsiteResetForm.tsxindex f96a705c4..c43f3efb7 100644--- a/src/app/(main)/settings/websites/[websiteId]/WebsiteResetForm.tsx+++ b/src/app/(main)/settings/websites/[websiteId]/WebsiteResetForm.tsx@@ -1,4 +1,3 @@-'use client';import { useApi, useMessages } from 'components/hooks';import TypeConfirmationForm from 'components/common/TypeConfirmationForm';diff --git a/src/app/(main)/settings/websites/[websiteId]/WebsiteSettings.tsx b/src/app/(main)/settings/websites/[websiteId]/WebsiteSettings.tsxindex fcb6316b9..24bf3d025 100644--- a/src/app/(main)/settings/websites/[websiteId]/WebsiteSettings.tsx+++ b/src/app/(main)/settings/websites/[websiteId]/WebsiteSettings.tsx@@ -1,4 +1,3 @@-'use client';import { useState, Key, useContext } from 'react';import { Item, Tabs, Button, Text, Icon } from 'react-basics';import Link from 'next/link';diff --git a/src/app/(main)/settings/websites/[websiteId]/page.tsx b/src/app/(main)/settings/websites/[websiteId]/page.tsxindex fe6fc69de..b8eb85303 100644--- a/src/app/(main)/settings/websites/[websiteId]/page.tsx+++ b/src/app/(main)/settings/websites/[websiteId]/page.tsx@@ -1,10 +1,10 @@-import WebsiteProvider from 'app/(main)/websites/[websiteId]/WebsiteProvider';-import WebsiteSettings from './WebsiteSettings';+import WebsitePage from './WebsitePage';+import { Metadata } from 'next';-export default async function WebsiteSettingsPage({ params: { websiteId } }) {- return (- <WebsiteProvider websiteId={websiteId}>- <WebsiteSettings websiteId={websiteId} />- </WebsiteProvider>- );+export default async function ({ params: { websiteId } }) {+ return <WebsitePage websiteId={websiteId} />;}++export const metadata: Metadata = {+ title: 'Website settings - Umami',+};diff --git a/src/app/(main)/settings/websites/page.tsx b/src/app/(main)/settings/websites/page.tsxindex 70c64dd3f..50a2df87b 100644--- a/src/app/(main)/settings/websites/page.tsx+++ b/src/app/(main)/settings/websites/page.tsx@@ -1,8 +1,8 @@import { Metadata } from 'next';-import Websites from './Websites';+import WebsitesPage from './WebsitesPage';export default function ({ params: { teamId } }: { params: { teamId: string } }) {- return <Websites teamId={teamId} />;+ return <WebsitesPage teamId={teamId} />;}export const metadata: Metadata = {diff --git a/src/app/(main)/teams/[teamId]/TeamProvider.tsx b/src/app/(main)/teams/[teamId]/TeamProvider.tsxindex a456f987e..6f0e391b4 100644--- a/src/app/(main)/teams/[teamId]/TeamProvider.tsx+++ b/src/app/(main)/teams/[teamId]/TeamProvider.tsx@@ -1,4 +1,3 @@-'use client';import { createContext, ReactNode, useEffect } from 'react';import { useTeam } from 'components/hooks';import { Loading } from 'react-basics';diff --git a/src/app/(main)/teams/[teamId]/layout.tsx b/src/app/(main)/teams/[teamId]/layout.tsxdeleted file mode 100644index f18d802af..000000000--- a/src/app/(main)/teams/[teamId]/layout.tsx+++ /dev/null@@ -1,5 +0,0 @@-import TeamProvider from './TeamProvider';--export default function ({ children, params: { teamId } }) {- return <TeamProvider teamId={teamId}>{children}</TeamProvider>;-}diff --git a/src/app/(main)/teams/[teamId]/settings/TeamSettings.tsx b/src/app/(main)/teams/[teamId]/settings/TeamSettingsLayout.tsxsimilarity index 83%rename from src/app/(main)/teams/[teamId]/settings/TeamSettings.tsxrename to src/app/(main)/teams/[teamId]/settings/TeamSettingsLayout.tsxindex 4be584329..5c2f2502c 100644--- a/src/app/(main)/teams/[teamId]/settings/TeamSettings.tsx+++ b/src/app/(main)/teams/[teamId]/settings/TeamSettingsLayout.tsx@@ -1,6 +1,6 @@'use client';import { ReactNode } from 'react';-import SettingsLayout from 'components/layout/SettingsLayout';+import MenuLayout from 'components/layout/MenuLayout';import { useMessages } from 'components/hooks';export default function ({ children, teamId }: { children: ReactNode; teamId: string }) {@@ -24,5 +24,5 @@ export default function ({ children, teamId }: { children: ReactNode; teamId: st},].filter(n => n);- return <SettingsLayout items={items}>{children}</SettingsLayout>;+ return <MenuLayout items={items}>{children}</MenuLayout>;}diff --git a/src/app/(main)/teams/[teamId]/settings/layout.tsx b/src/app/(main)/teams/[teamId]/settings/layout.tsxindex a72ce3b76..c86d01962 100644--- a/src/app/(main)/teams/[teamId]/settings/layout.tsx+++ b/src/app/(main)/teams/[teamId]/settings/layout.tsx@@ -1,5 +1,5 @@-import TeamSettings from './TeamSettings';+import TeamSettingsLayout from './TeamSettingsLayout';export default function ({ children, params: { teamId } }) {- return <TeamSettings teamId={teamId}>{children}</TeamSettings>;+ return <TeamSettingsLayout teamId={teamId}>{children}</TeamSettingsLayout>;}diff --git a/src/app/(main)/websites/Websites.tsx b/src/app/(main)/websites/Websites.tsxdeleted file mode 100644index 8769d6adb..000000000--- a/src/app/(main)/websites/Websites.tsx+++ /dev/null@@ -1,8 +0,0 @@-'use client';-import WebsitesDataTable from '../settings/websites/WebsitesDataTable';--export function Websites({ teamId, userId }: { teamId: string; userId: string }) {- return <WebsitesDataTable teamId={teamId} userId={userId} allowEdit={false} />;-}--export default Websites;diff --git a/src/app/(main)/websites/WebsitesPage.tsx b/src/app/(main)/websites/WebsitesPage.tsxnew file mode 100644index 000000000..fa2e9f71a--- /dev/null+++ b/src/app/(main)/websites/WebsitesPage.tsx@@ -0,0 +1,12 @@+'use client';+import WebsitesHeader from 'app/(main)/settings/websites/WebsitesHeader';+import WebsitesDataTable from 'app/(main)/settings/websites/WebsitesDataTable';++export default function WebsitesPage({ teamId, userId }: { teamId: string; userId: string }) {+ return (+ <>+ <WebsitesHeader teamId={teamId} />+ <WebsitesDataTable teamId={teamId} userId={userId} allowEdit={false} />+ </>+ );+}diff --git a/src/app/(main)/websites/[websiteId]/WebsiteChart.tsx b/src/app/(main)/websites/[websiteId]/WebsiteChart.tsxindex fb04a6ad7..c4df6e71f 100644--- a/src/app/(main)/websites/[websiteId]/WebsiteChart.tsx+++ b/src/app/(main)/websites/[websiteId]/WebsiteChart.tsx@@ -1,4 +1,3 @@-'use client';import { useMemo } from 'react';import PageviewsChart from 'components/metrics/PageviewsChart';import { useApi, useDateRange, useTimezone, useNavigation } from 'components/hooks';diff --git a/src/app/(main)/websites/[websiteId]/WebsiteChartList.tsx b/src/app/(main)/websites/[websiteId]/WebsiteChartList.tsxindex 6d069088e..b35b6f1f0 100644--- a/src/app/(main)/websites/[websiteId]/WebsiteChartList.tsx+++ b/src/app/(main)/websites/[websiteId]/WebsiteChartList.tsx@@ -1,4 +1,3 @@-'use client';import { Button, Text, Icon, Icons } from 'react-basics';import { useMemo } from 'react';import { firstBy } from 'thenby';diff --git a/src/app/(main)/websites/[websiteId]/WebsiteDetails.tsx b/src/app/(main)/websites/[websiteId]/WebsiteDetails.tsxindex 0a18c03f3..e4203177f 100644--- a/src/app/(main)/websites/[websiteId]/WebsiteDetails.tsx+++ b/src/app/(main)/websites/[websiteId]/WebsiteDetails.tsx@@ -1,10 +1,8 @@-'use client';import { Loading } from 'react-basics';import { usePathname } from 'next/navigation';import Page from 'components/layout/Page';import FilterTags from 'components/metrics/FilterTags';-import { useNavigation } from 'components/hooks';-import { useWebsite } from 'components/hooks';+import { useNavigation, useWebsite } from 'components/hooks';import WebsiteChart from './WebsiteChart';import WebsiteExpandedView from './WebsiteExpandedView';import WebsiteHeader from './WebsiteHeader';diff --git a/src/app/(main)/websites/[websiteId]/WebsiteExpandedView.tsx b/src/app/(main)/websites/[websiteId]/WebsiteExpandedView.tsxindex b47d435b8..fcded2545 100644--- a/src/app/(main)/websites/[websiteId]/WebsiteExpandedView.tsx+++ b/src/app/(main)/websites/[websiteId]/WebsiteExpandedView.tsx@@ -1,4 +1,3 @@-'use client';import { Icons, Icon, Text, Dropdown, Item } from 'react-basics';import BrowsersTable from 'components/metrics/BrowsersTable';import CountriesTable from 'components/metrics/CountriesTable';@@ -13,8 +12,7 @@ import ReferrersTable from 'components/metrics/ReferrersTable';import ScreenTable from 'components/metrics/ScreenTable';import EventsTable from 'components/metrics/EventsTable';import SideNav from 'components/layout/SideNav';-import { useNavigation } from 'components/hooks';-import { useMessages } from 'components/hooks';+import { useNavigation, useMessages } from 'components/hooks';import LinkButton from 'components/common/LinkButton';import styles from './WebsiteExpandedView.module.css';diff --git a/src/app/(main)/websites/[websiteId]/WebsiteFilterButton.tsx b/src/app/(main)/websites/[websiteId]/WebsiteFilterButton.tsxindex 25174a538..998c73c46 100644--- a/src/app/(main)/websites/[websiteId]/WebsiteFilterButton.tsx+++ b/src/app/(main)/websites/[websiteId]/WebsiteFilterButton.tsx@@ -1,4 +1,3 @@-'use client';import { Button, Icon, Icons, Popup, PopupTrigger, Text } from 'react-basics';import PopupForm from 'app/(main)/reports/[reportId]/PopupForm';import FilterSelectForm from 'app/(main)/reports/[reportId]/FilterSelectForm';diff --git a/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx b/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsxindex 0af9e596f..58ec225a1 100644--- a/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx+++ b/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx@@ -1,4 +1,3 @@-'use client';import { ReactNode } from 'react';import classNames from 'classnames';import { Text, Button, Icon } from 'react-basics';diff --git a/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx b/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsxindex e4011ea24..3c5c4e9a6 100644--- a/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx+++ b/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx@@ -1,4 +1,3 @@-'use client';import classNames from 'classnames';import { useApi, useDateRange, useMessages, useNavigation, useSticky } from 'components/hooks';import WebsiteDateFilter from 'components/input/WebsiteDateFilter';diff --git a/src/app/(main)/websites/[websiteId]/WebsiteProvider.tsx b/src/app/(main)/websites/[websiteId]/WebsiteProvider.tsxindex 4ea5a032a..e1d3da26c 100644--- a/src/app/(main)/websites/[websiteId]/WebsiteProvider.tsx+++ b/src/app/(main)/websites/[websiteId]/WebsiteProvider.tsx@@ -1,4 +1,3 @@-'use client';import { createContext, ReactNode, useEffect } from 'react';import { useWebsite } from 'components/hooks';import { Loading } from 'react-basics';diff --git a/src/app/(main)/websites/[websiteId]/WebsiteTableView.tsx b/src/app/(main)/websites/[websiteId]/WebsiteTableView.tsxindex 65b432cb2..7cc415e5c 100644--- a/src/app/(main)/websites/[websiteId]/WebsiteTableView.tsx+++ b/src/app/(main)/websites/[websiteId]/WebsiteTableView.tsx@@ -1,4 +1,3 @@-'use client';import { useState } from 'react';import { Grid, GridRow } from 'components/layout/Grid';import PagesTable from 'components/metrics/PagesTable';diff --git a/src/app/(main)/websites/[websiteId]/event-data/EventDataMetricsBar.tsx b/src/app/(main)/websites/[websiteId]/event-data/EventDataMetricsBar.tsxindex e4903a782..fceb86aae 100644--- a/src/app/(main)/websites/[websiteId]/event-data/EventDataMetricsBar.tsx+++ b/src/app/(main)/websites/[websiteId]/event-data/EventDataMetricsBar.tsx@@ -1,7 +1,5 @@-'use client';-import { useApi, useDateRange } from 'components/hooks';+import { useApi, useDateRange, useMessages } from 'components/hooks';import MetricCard from 'components/metrics/MetricCard';-import { useMessages } from 'components/hooks';import WebsiteDateFilter from 'components/input/WebsiteDateFilter';import MetricsBar from 'components/metrics/MetricsBar';import styles from './EventDataMetricsBar.module.css';diff --git a/src/app/(main)/websites/[websiteId]/event-data/EventDataTable.tsx b/src/app/(main)/websites/[websiteId]/event-data/EventDataTable.tsxindex 94b9934ee..71c369922 100644--- a/src/app/(main)/websites/[websiteId]/event-data/EventDataTable.tsx+++ b/src/app/(main)/websites/[websiteId]/event-data/EventDataTable.tsx@@ -1,4 +1,3 @@-'use client';import Link from 'next/link';import { GridTable, GridColumn } from 'react-basics';import { useMessages, useNavigation } from 'components/hooks';diff --git a/src/app/(main)/websites/[websiteId]/event-data/EventDataValueTable.tsx b/src/app/(main)/websites/[websiteId]/event-data/EventDataValueTable.tsxindex 8b7c8070e..edf1fa154 100644--- a/src/app/(main)/websites/[websiteId]/event-data/EventDataValueTable.tsx+++ b/src/app/(main)/websites/[websiteId]/event-data/EventDataValueTable.tsx@@ -1,4 +1,3 @@-'use client';import { GridTable, GridColumn, Icon, Text } from 'react-basics';import { useMessages, useNavigation } from 'components/hooks';import Icons from 'components/icons';diff --git a/src/app/(main)/websites/[websiteId]/event-data/WebsiteEventData.tsx b/src/app/(main)/websites/[websiteId]/event-data/WebsiteEventData.tsxindex 61a4dc622..27ccd96ca 100644--- a/src/app/(main)/websites/[websiteId]/event-data/WebsiteEventData.tsx+++ b/src/app/(main)/websites/[websiteId]/event-data/WebsiteEventData.tsx@@ -1,4 +1,3 @@-'use client';import { Flexbox, Loading } from 'react-basics';import EventDataTable from './EventDataTable';import EventDataValueTable from './EventDataValueTable';diff --git a/src/app/(main)/websites/[websiteId]/realtime/Realtime.tsx b/src/app/(main)/websites/[websiteId]/realtime/Realtime.tsxindex 3990b8202..6314fbb81 100644--- a/src/app/(main)/websites/[websiteId]/realtime/Realtime.tsx+++ b/src/app/(main)/websites/[websiteId]/realtime/Realtime.tsx@@ -1,4 +1,3 @@-'use client';import { useMemo, useState, useEffect } from 'react';import { subMinutes, startOfMinute } from 'date-fns';import thenby from 'thenby';@@ -6,8 +5,7 @@ import { Grid, GridRow } from 'components/layout/Grid';import Page from 'components/layout/Page';import RealtimeChart from 'components/metrics/RealtimeChart';import WorldMap from 'components/metrics/WorldMap';-import { useApi } from 'components/hooks';-import { useWebsite } from 'components/hooks';+import { useApi, useWebsite } from 'components/hooks';import { percentFilter } from 'lib/filters';import { REALTIME_RANGE, REALTIME_INTERVAL } from 'lib/constants';import { RealtimeData } from 'lib/types';diff --git a/src/app/(main)/websites/[websiteId]/realtime/RealtimeCountries.tsx b/src/app/(main)/websites/[websiteId]/realtime/RealtimeCountries.tsxindex 47417e0d8..506d5733e 100644--- a/src/app/(main)/websites/[websiteId]/realtime/RealtimeCountries.tsx+++ b/src/app/(main)/websites/[websiteId]/realtime/RealtimeCountries.tsx@@ -1,9 +1,6 @@-'use client';import { useCallback } from 'react';import ListTable from 'components/metrics/ListTable';-import { useLocale } from 'components/hooks';-import { useCountryNames } from 'components/hooks';-import { useMessages } from 'components/hooks';+import { useLocale, useCountryNames, useMessages } from 'components/hooks';import classNames from 'classnames';import styles from './RealtimeCountries.module.css';diff --git a/src/app/(main)/websites/[websiteId]/realtime/RealtimeHeader.tsx b/src/app/(main)/websites/[websiteId]/realtime/RealtimeHeader.tsxindex 228dbc002..80d3d8c62 100644--- a/src/app/(main)/websites/[websiteId]/realtime/RealtimeHeader.tsx+++ b/src/app/(main)/websites/[websiteId]/realtime/RealtimeHeader.tsx@@ -1,4 +1,3 @@-'use client';import MetricCard from 'components/metrics/MetricCard';import { useMessages } from 'components/hooks';import { RealtimeData } from 'lib/types';diff --git a/src/app/(main)/websites/[websiteId]/realtime/RealtimeHome.tsx b/src/app/(main)/websites/[websiteId]/realtime/RealtimeHome.tsxindex ee170c54d..0ed5fbdec 100644--- a/src/app/(main)/websites/[websiteId]/realtime/RealtimeHome.tsx+++ b/src/app/(main)/websites/[websiteId]/realtime/RealtimeHome.tsx@@ -1,11 +1,9 @@-'use client';import { useEffect } from 'react';import { useRouter } from 'next/navigation';import Page from 'components/layout/Page';import PageHeader from 'components/layout/PageHeader';-import { useApi } from 'components/hooks';+import { useApi, useMessages } from 'components/hooks';import EmptyPlaceholder from 'components/common/EmptyPlaceholder';-import { useMessages } from 'components/hooks';export function RealtimeHome() {const { formatMessage, labels, messages } = useMessages();diff --git a/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx b/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsxindex 1380207d0..d9aad35b5 100644--- a/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx+++ b/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx@@ -1,4 +1,3 @@-'use client';import { useMemo, useState } from 'react';import { StatusLight, Icon, Text, SearchField } from 'react-basics';import { FixedSizeList } from 'react-window';@@ -7,10 +6,8 @@ import thenby from 'thenby';import { safeDecodeURI } from 'next-basics';import FilterButtons from 'components/common/FilterButtons';import Empty from 'components/common/Empty';-import { useLocale } from 'components/hooks';-import { useCountryNames } from 'components/hooks';+import { useLocale, useCountryNames, useMessages } from 'components/hooks';import Icons from 'components/icons';-import { useMessages } from 'components/hooks';import useFormat from 'components//hooks/useFormat';import { BROWSERS } from 'lib/constants';import { stringToColor } from 'lib/format';diff --git a/src/app/(main)/websites/[websiteId]/realtime/RealtimeUrls.tsx b/src/app/(main)/websites/[websiteId]/realtime/RealtimeUrls.tsxindex cdd810f7a..b3726d6d2 100644--- a/src/app/(main)/websites/[websiteId]/realtime/RealtimeUrls.tsx+++ b/src/app/(main)/websites/[websiteId]/realtime/RealtimeUrls.tsx@@ -1,4 +1,3 @@-'use client';import { Key, useMemo, useState } from 'react';import { ButtonGroup, Button, Flexbox } from 'react-basics';import thenby from 'thenby';diff --git a/src/app/(main)/websites/[websiteId]/reports/WebsiteReports.tsx b/src/app/(main)/websites/[websiteId]/reports/WebsiteReports.tsxindex 5ea6f6147..60c36cc60 100644--- a/src/app/(main)/websites/[websiteId]/reports/WebsiteReports.tsx+++ b/src/app/(main)/websites/[websiteId]/reports/WebsiteReports.tsx@@ -1,4 +1,3 @@-'use client';import Link from 'next/link';import { Button, Flexbox, Icon, Icons, Text } from 'react-basics';import { useMessages } from 'components/hooks';diff --git a/src/app/(main)/websites/page.tsx b/src/app/(main)/websites/page.tsxindex 4f4d5e240..ee6e4336b 100644--- a/src/app/(main)/websites/page.tsx+++ b/src/app/(main)/websites/page.tsx@@ -1,14 +1,8 @@-import WebsitesHeader from 'app/(main)/settings/websites/WebsitesHeader';-import Websites from './Websites';+import WebsitesPage from './WebsitesPage';import { Metadata } from 'next';-export default function WebsitesPage({ params: { teamId, userId } }) {- return (- <>- <WebsitesHeader teamId={teamId} />- <Websites teamId={teamId} userId={userId} />- </>- );+export default function ({ params: { teamId, userId } }) {+ return <WebsitesPage teamId={teamId} userId={userId} />;}export const metadata: Metadata = {diff --git a/src/app/login/LoginForm.tsx b/src/app/login/LoginForm.tsxindex de92373cc..28d79458c 100644--- a/src/app/login/LoginForm.tsx+++ b/src/app/login/LoginForm.tsx@@ -1,4 +1,3 @@-'use client';import {Form,FormRow,diff --git a/src/app/login/page.module.css b/src/app/login/LoginPage.module.csssimilarity index 100%rename from src/app/login/page.module.cssrename to src/app/login/LoginPage.module.cssdiff --git a/src/app/login/LoginPage.tsx b/src/app/login/LoginPage.tsxnew file mode 100644index 000000000..28a3c0247--- /dev/null+++ b/src/app/login/LoginPage.tsx@@ -0,0 +1,17 @@+'use client';+import LoginForm from './LoginForm';+import styles from './LoginPage.module.css';++export function LoginPage() {+ if (process.env.loginDisabled) {+ return null;+ }++ return (+ <div className={styles.page}>+ <LoginForm />+ </div>+ );+}++export default LoginPage;diff --git a/src/app/login/page.tsx b/src/app/login/page.tsxindex aa2765c94..80543ef6b 100644--- a/src/app/login/page.tsx+++ b/src/app/login/page.tsx@@ -1,23 +1,7 @@-import LoginForm from './LoginForm';import { Metadata } from 'next';-import styles from './page.module.css';--async function getDisabled() {- return !!process.env.LOGIN_DISABLED;-}export default async function LoginPage() {- const disabled = await getDisabled();-- if (disabled) {- return null;- }-- return (- <div className={styles.page}>- <LoginForm />- </div>- );+ return <LoginPage />;}export const metadata: Metadata = {diff --git a/src/app/logout/Logout.tsx b/src/app/logout/LogoutPage.tsxsimilarity index 91%rename from src/app/logout/Logout.tsxrename to src/app/logout/LogoutPage.tsxindex a6f43f92f..11d963290 100644--- a/src/app/logout/Logout.tsx+++ b/src/app/logout/LogoutPage.tsx@@ -5,7 +5,7 @@ import { useApi } from 'components/hooks';import { setUser } from 'store/app';import { removeClientAuthToken } from 'lib/client';-export function Logout() {+export function LogoutPage() {const disabled = !!(process.env.disableLogin || process.env.cloudMode);const router = useRouter();const { post } = useApi();@@ -29,4 +29,4 @@ export function Logout() {return null;}-export default Logout;+export default LogoutPage;diff --git a/src/app/logout/page.tsx b/src/app/logout/page.tsxindex 11ee9b676..b74f65847 100644--- a/src/app/logout/page.tsx+++ b/src/app/logout/page.tsx@@ -1,8 +1,8 @@-import Logout from './Logout';+import LogoutPage from './LogoutPage';import { Metadata } from 'next';export default function () {- return <Logout />;+ return <LogoutPage />;}export const metadata: Metadata = {diff --git a/src/app/page.tsx b/src/app/page.tsxindex 6a146801d..4977c99b5 100644--- a/src/app/page.tsx+++ b/src/app/page.tsx@@ -1,4 +1,3 @@-'use client';import { redirect } from 'next/navigation';export default function RootPage() {diff --git a/src/app/share/[...shareId]/Footer.tsx b/src/app/share/[...shareId]/Footer.tsxindex 84d4162f7..3a07c12a8 100644--- a/src/app/share/[...shareId]/Footer.tsx+++ b/src/app/share/[...shareId]/Footer.tsx@@ -1,4 +1,3 @@-'use client';import { CURRENT_VERSION, HOMEPAGE_URL } from 'lib/constants';import styles from './Footer.module.css';diff --git a/src/app/share/[...shareId]/Header.tsx b/src/app/share/[...shareId]/Header.tsxindex 2b82908df..ddfb52a55 100644--- a/src/app/share/[...shareId]/Header.tsx+++ b/src/app/share/[...shareId]/Header.tsx@@ -1,4 +1,3 @@-'use client';import { Icon, Text } from 'react-basics';import Link from 'next/link';import LanguageButton from 'components/input/LanguageButton';diff --git a/src/app/share/[...shareId]/Share.module.css b/src/app/share/[...shareId]/SharePage.module.csssimilarity index 100%rename from src/app/share/[...shareId]/Share.module.cssrename to src/app/share/[...shareId]/SharePage.module.cssdiff --git a/src/app/share/[...shareId]/Share.tsx b/src/app/share/[...shareId]/SharePage.tsxsimilarity index 73%rename from src/app/share/[...shareId]/Share.tsxrename to src/app/share/[...shareId]/SharePage.tsxindex d8b83fe76..b49d36ec6 100644--- a/src/app/share/[...shareId]/Share.tsx+++ b/src/app/share/[...shareId]/SharePage.tsx@@ -1,12 +1,12 @@'use client';-import WebsiteDetails from '../../(main)/websites/[websiteId]/WebsiteDetails';+import WebsiteDetails from 'app/(main)/websites/[websiteId]/WebsiteDetails';import { useShareToken } from 'components/hooks';-import styles from './Share.module.css';import Page from 'components/layout/Page';import Header from './Header';import Footer from './Footer';+import styles from './SharePage.module.css';-export default function Share({ shareId }) {+export default function SharePage({ shareId }) {const { shareToken, isLoading } = useShareToken(shareId);if (isLoading || !shareToken) {diff --git a/src/app/share/[...shareId]/page.tsx b/src/app/share/[...shareId]/page.tsxindex 5a0b28223..02d244e99 100644--- a/src/app/share/[...shareId]/page.tsx+++ b/src/app/share/[...shareId]/page.tsx@@ -1,8 +1,8 @@-import Share from './Share';+import SharePage from './SharePage';import { Metadata } from 'next';export default function ({ params: { shareId } }) {- return <Share shareId={shareId[0]} />;+ return <SharePage shareId={shareId[0]} />;}export const metadata: Metadata = {diff --git a/src/components/common/ErrorBoundary.tsx b/src/components/common/ErrorBoundary.tsxindex 6bb1f4edc..9669580f9 100644--- a/src/components/common/ErrorBoundary.tsx+++ b/src/components/common/ErrorBoundary.tsx@@ -1,4 +1,3 @@-'use client';import { ErrorInfo, ReactNode } from 'react';import { ErrorBoundary as Boundary } from 'react-error-boundary';import { Button } from 'react-basics';diff --git a/src/components/hooks/queries/useApi.ts b/src/components/hooks/queries/useApi.tsindex 88427bc72..e806d37ed 100644--- a/src/components/hooks/queries/useApi.ts+++ b/src/components/hooks/queries/useApi.ts@@ -1,4 +1,3 @@-'use client';import * as reactQuery from '@tanstack/react-query';import { useApi as nextUseApi } from 'next-basics';import { getClientAuthToken } from 'lib/client';diff --git a/src/components/hooks/queries/useConfig.ts b/src/components/hooks/queries/useConfig.tsindex 505a93f3b..72fe095d0 100644--- a/src/components/hooks/queries/useConfig.ts+++ b/src/components/hooks/queries/useConfig.ts@@ -1,4 +1,3 @@-'use client';import { useEffect } from 'react';import useStore, { setConfig } from 'store/app';import { useApi } from './useApi';diff --git a/src/components/hooks/queries/useFilterQuery.ts b/src/components/hooks/queries/useFilterQuery.tsindex 5d86c7241..7e4c9a86f 100644--- a/src/components/hooks/queries/useFilterQuery.ts+++ b/src/components/hooks/queries/useFilterQuery.ts@@ -1,4 +1,3 @@-'use client';import { UseQueryOptions } from '@tanstack/react-query';import { useState, Dispatch, SetStateAction } from 'react';import { useApi } from './useApi';diff --git a/src/components/hooks/queries/useLogin.ts b/src/components/hooks/queries/useLogin.tsindex 2f777a77f..c17687b04 100644--- a/src/components/hooks/queries/useLogin.ts+++ b/src/components/hooks/queries/useLogin.ts@@ -1,4 +1,3 @@-'use client';import useStore, { setUser } from 'store/app';import useApi from './useApi';import { UseQueryResult } from '@tanstack/react-query';diff --git a/src/components/hooks/queries/useReport.ts b/src/components/hooks/queries/useReport.tsindex 332ba755f..38061761d 100644--- a/src/components/hooks/queries/useReport.ts+++ b/src/components/hooks/queries/useReport.ts@@ -1,4 +1,3 @@-'use client';import { produce } from 'immer';import { useCallback, useEffect, useState } from 'react';import { useApi } from './useApi';diff --git a/src/components/hooks/queries/useReports.ts b/src/components/hooks/queries/useReports.tsindex 77ebdbe98..0e0f260b6 100644--- a/src/components/hooks/queries/useReports.ts+++ b/src/components/hooks/queries/useReports.ts@@ -1,4 +1,3 @@-'use client';import useApi from './useApi';import useFilterQuery from './useFilterQuery';import useModified from 'store/modified';diff --git a/src/components/hooks/queries/useShareToken.ts b/src/components/hooks/queries/useShareToken.tsindex 8197fe665..189657be4 100644--- a/src/components/hooks/queries/useShareToken.ts+++ b/src/components/hooks/queries/useShareToken.ts@@ -1,4 +1,3 @@-'use client';import useStore, { setShareToken } from 'store/app';import useApi from './useApi';diff --git a/src/components/hooks/queries/useTeam.ts b/src/components/hooks/queries/useTeam.tsindex 1a8ccc548..e348531c6 100644--- a/src/components/hooks/queries/useTeam.ts+++ b/src/components/hooks/queries/useTeam.ts@@ -1,4 +1,3 @@-'use client';import useApi from './useApi';export function useTeam(teamId: string) {diff --git a/src/components/hooks/queries/useTeamMembers.ts b/src/components/hooks/queries/useTeamMembers.tsindex ccfd6c9b4..064231d10 100644--- a/src/components/hooks/queries/useTeamMembers.ts+++ b/src/components/hooks/queries/useTeamMembers.ts@@ -1,4 +1,3 @@-'use client';import useApi from './useApi';import useFilterQuery from './useFilterQuery';diff --git a/src/components/hooks/queries/useTeamWebsites.ts b/src/components/hooks/queries/useTeamWebsites.tsindex 036d715be..19bcdf762 100644--- a/src/components/hooks/queries/useTeamWebsites.ts+++ b/src/components/hooks/queries/useTeamWebsites.ts@@ -1,4 +1,3 @@-'use client';import useApi from './useApi';import useFilterQuery from './useFilterQuery';diff --git a/src/components/hooks/queries/useTeams.ts b/src/components/hooks/queries/useTeams.tsindex 7628887fd..020c99153 100644--- a/src/components/hooks/queries/useTeams.ts+++ b/src/components/hooks/queries/useTeams.ts@@ -1,4 +1,3 @@-'use client';import useApi from './useApi';import useFilterQuery from './useFilterQuery';import { useLogin } from 'components/hooks';diff --git a/src/components/hooks/queries/useUser.ts b/src/components/hooks/queries/useUser.tsindex 7ff73daca..61c22ecdf 100644--- a/src/components/hooks/queries/useUser.ts+++ b/src/components/hooks/queries/useUser.ts@@ -1,4 +1,3 @@-'use client';import useApi from './useApi';export function useUser(userId: string, options?: { [key: string]: any }) {diff --git a/src/components/hooks/queries/useUsers.ts b/src/components/hooks/queries/useUsers.tsindex 05f273d8e..ab897c17a 100644--- a/src/components/hooks/queries/useUsers.ts+++ b/src/components/hooks/queries/useUsers.ts@@ -1,4 +1,3 @@-'use client';import useApi from './useApi';import useFilterQuery from './useFilterQuery';import useModified from 'store/modified';diff --git a/src/components/hooks/queries/useWebsite.ts b/src/components/hooks/queries/useWebsite.tsindex 6aec87e86..4121f97b2 100644--- a/src/components/hooks/queries/useWebsite.ts+++ b/src/components/hooks/queries/useWebsite.ts@@ -1,4 +1,3 @@-'use client';import useApi from './useApi';export function useWebsite(websiteId: string, options?: { [key: string]: any }) {diff --git a/src/components/hooks/queries/useWebsiteEvents.ts b/src/components/hooks/queries/useWebsiteEvents.tsindex 613788e2f..de18a1f90 100644--- a/src/components/hooks/queries/useWebsiteEvents.ts+++ b/src/components/hooks/queries/useWebsiteEvents.ts@@ -1,4 +1,3 @@-'use client';import useApi from './useApi';import { UseQueryOptions } from '@tanstack/react-query';diff --git a/src/components/hooks/queries/useWebsiteMetrics.ts b/src/components/hooks/queries/useWebsiteMetrics.tsindex 300e526da..8e7d00db9 100644--- a/src/components/hooks/queries/useWebsiteMetrics.ts+++ b/src/components/hooks/queries/useWebsiteMetrics.ts@@ -1,4 +1,3 @@-'use client';import useApi from './useApi';import { UseQueryOptions } from '@tanstack/react-query';diff --git a/src/components/hooks/queries/useWebsites.ts b/src/components/hooks/queries/useWebsites.tsindex 9449acc72..bb3e9a2df 100644--- a/src/components/hooks/queries/useWebsites.ts+++ b/src/components/hooks/queries/useWebsites.ts@@ -1,4 +1,3 @@-'use client';import { useApi } from './useApi';import { useFilterQuery } from './useFilterQuery';import { useLogin } from './useLogin';diff --git a/src/components/hooks/useCountryNames.ts b/src/components/hooks/useCountryNames.tsindex 477164494..acfada442 100644--- a/src/components/hooks/useCountryNames.ts+++ b/src/components/hooks/useCountryNames.ts@@ -1,4 +1,3 @@-'use client';import { useState, useEffect } from 'react';import { httpGet } from 'next-basics';import enUS from '../../../public/intl/country/en-US.json';diff --git a/src/components/hooks/useDateRange.ts b/src/components/hooks/useDateRange.tsindex 8d7cf57c0..e022d9604 100644--- a/src/components/hooks/useDateRange.ts+++ b/src/components/hooks/useDateRange.ts@@ -1,4 +1,3 @@-'use client';import { getMinimumUnit, parseDateRange } from 'lib/date';import { setItem } from 'next-basics';import { DATE_RANGE_CONFIG, DEFAULT_DATE_RANGE } from 'lib/constants';diff --git a/src/components/hooks/useDocumentClick.ts b/src/components/hooks/useDocumentClick.tsindex dce9e1064..eefd93669 100644--- a/src/components/hooks/useDocumentClick.ts+++ b/src/components/hooks/useDocumentClick.ts@@ -1,4 +1,3 @@-'use client';import { useEffect } from 'react';export function useDocumentClick(handler: (event: MouseEvent) => any) {diff --git a/src/components/hooks/useEscapeKey.ts b/src/components/hooks/useEscapeKey.tsindex 567878b07..5c3350e73 100644--- a/src/components/hooks/useEscapeKey.ts+++ b/src/components/hooks/useEscapeKey.ts@@ -1,4 +1,3 @@-'use client';import { useEffect, useCallback, KeyboardEvent } from 'react';export function useEscapeKey(handler: (event: KeyboardEvent) => void) {diff --git a/src/components/hooks/useFilters.ts b/src/components/hooks/useFilters.tsindex 51a5d972c..e1a9a8858 100644--- a/src/components/hooks/useFilters.ts+++ b/src/components/hooks/useFilters.ts@@ -1,4 +1,3 @@-'use client';import { useMessages } from './useMessages';import { OPERATORS } from 'lib/constants';diff --git a/src/components/hooks/useForceUpdate.ts b/src/components/hooks/useForceUpdate.tsindex 1798cdd83..35f7fe162 100644--- a/src/components/hooks/useForceUpdate.ts+++ b/src/components/hooks/useForceUpdate.ts@@ -1,4 +1,3 @@-'use client';import { useCallback, useState } from 'react';export function useForceUpdate() {diff --git a/src/components/hooks/useFormat.ts b/src/components/hooks/useFormat.tsindex 4d8994fce..3057e9d87 100644--- a/src/components/hooks/useFormat.ts+++ b/src/components/hooks/useFormat.ts@@ -1,4 +1,3 @@-'use client';import useMessages from './useMessages';import { BROWSERS } from 'lib/constants';import useLocale from './useLocale';diff --git a/src/components/hooks/useLanguageNames.ts b/src/components/hooks/useLanguageNames.tsindex 95b1a97f8..d4bfbf2fb 100644--- a/src/components/hooks/useLanguageNames.ts+++ b/src/components/hooks/useLanguageNames.ts@@ -1,4 +1,3 @@-'use client';import { useState, useEffect } from 'react';import { httpGet } from 'next-basics';import enUS from '../../../public/intl/language/en-US.json';diff --git a/src/components/hooks/useLocale.ts b/src/components/hooks/useLocale.tsindex 00998ba4c..5e4e1ce84 100644--- a/src/components/hooks/useLocale.ts+++ b/src/components/hooks/useLocale.ts@@ -1,4 +1,3 @@-'use client';import { useEffect } from 'react';import { httpGet, setItem } from 'next-basics';import { LOCALE_CONFIG } from 'lib/constants';diff --git a/src/components/hooks/useMessages.ts b/src/components/hooks/useMessages.tsindex 8b82dd579..ab37cc192 100644--- a/src/components/hooks/useMessages.ts+++ b/src/components/hooks/useMessages.ts@@ -1,4 +1,3 @@-'use client';import { useIntl, FormattedMessage } from 'react-intl';import { messages, labels } from 'components/messages';diff --git a/src/components/hooks/useNavigation.ts b/src/components/hooks/useNavigation.tsindex 59731c3ec..0ff7155a2 100644--- a/src/components/hooks/useNavigation.ts+++ b/src/components/hooks/useNavigation.ts@@ -1,4 +1,3 @@-'use client';import { useMemo } from 'react';import { usePathname, useRouter, useSearchParams } from 'next/navigation';import { buildUrl } from 'next-basics';diff --git a/src/components/hooks/useSticky.ts b/src/components/hooks/useSticky.tsindex 39c57f6e2..459c489ad 100644--- a/src/components/hooks/useSticky.ts+++ b/src/components/hooks/useSticky.ts@@ -1,4 +1,3 @@-'use client';import { useState, useEffect, useRef } from 'react';export function useSticky({ enabled = true, threshold = 1 }) {diff --git a/src/components/hooks/useTeamUrl.ts b/src/components/hooks/useTeamUrl.tsindex 3e1c39720..b2aa8ea7c 100644--- a/src/components/hooks/useTeamUrl.ts+++ b/src/components/hooks/useTeamUrl.ts@@ -1,4 +1,3 @@-'use client';import { usePathname } from 'next/navigation';export function useTeamUrl(): {diff --git a/src/components/hooks/useTheme.ts b/src/components/hooks/useTheme.tsindex cd19f7021..099bf962b 100644--- a/src/components/hooks/useTheme.ts+++ b/src/components/hooks/useTheme.ts@@ -1,4 +1,3 @@-'use client';import { useEffect } from 'react';import useStore, { setTheme } from 'store/app';import { getItem, setItem } from 'next-basics';diff --git a/src/components/hooks/useTimezone.ts b/src/components/hooks/useTimezone.tsindex 0f5f8dbcb..3dbb52b3b 100644--- a/src/components/hooks/useTimezone.ts+++ b/src/components/hooks/useTimezone.ts@@ -1,4 +1,3 @@-'use client';import { useState, useCallback } from 'react';import { getTimezone } from 'lib/date';import { getItem, setItem } from 'next-basics';diff --git a/src/components/input/DateFilter.tsx b/src/components/input/DateFilter.tsxindex 34c80b5b1..0c29afa6b 100644--- a/src/components/input/DateFilter.tsx+++ b/src/components/input/DateFilter.tsx@@ -1,4 +1,3 @@-'use client';import { useState } from 'react';import { Icon, Modal, Dropdown, Item, Text, Flexbox } from 'react-basics';import { endOfYear, isSameDay } from 'date-fns';diff --git a/src/components/input/LogoutButton.tsx b/src/components/input/LogoutButton.tsxindex f3129207c..ddc71142a 100644--- a/src/components/input/LogoutButton.tsx+++ b/src/components/input/LogoutButton.tsx@@ -9,7 +9,7 @@ export function LogoutButton({}) {const { formatMessage, labels } = useMessages();return (- <Link href="/src/app/logout/logout">+ <Link href="/src/app/logout/LogoutPage"><TooltipPopup label={formatMessage(labels.logout)} position={tooltipPosition}><Button variant="quiet"><Icon>diff --git a/src/components/input/TeamsButton.tsx b/src/components/input/TeamsButton.tsxindex 84937c756..a91cdb2f6 100644--- a/src/components/input/TeamsButton.tsx+++ b/src/components/input/TeamsButton.tsx@@ -1,4 +1,3 @@-'use client';import { Key } from 'react';import { Text, Icon, Button, Popup, Menu, Item, PopupTrigger, Flexbox } from 'react-basics';import classNames from 'classnames';diff --git a/src/components/input/WebsiteSelect.tsx b/src/components/input/WebsiteSelect.tsxindex 6adeb2143..1ea8d3928 100644--- a/src/components/input/WebsiteSelect.tsx+++ b/src/components/input/WebsiteSelect.tsx@@ -1,4 +1,3 @@-'use client';import { useState, Key } from 'react';import { Dropdown, Item } from 'react-basics';import { useWebsite, useWebsites, useMessages } from 'components/hooks';diff --git a/src/components/layout/SettingsLayout.module.css b/src/components/layout/MenuLayout.module.csssimilarity index 100%rename from src/components/layout/SettingsLayout.module.cssrename to src/components/layout/MenuLayout.module.cssdiff --git a/src/components/layout/SettingsLayout.tsx b/src/components/layout/MenuLayout.tsxsimilarity index 74%rename from src/components/layout/SettingsLayout.tsxrename to src/components/layout/MenuLayout.tsxindex 317c7e293..2edd1091d 100644--- a/src/components/layout/SettingsLayout.tsx+++ b/src/components/layout/MenuLayout.tsx@@ -1,10 +1,9 @@-'use client';import { ReactNode } from 'react';import { usePathname } from 'next/navigation';import SideNav from 'components/layout/SideNav';-import styles from './SettingsLayout.module.css';+import styles from './MenuLayout.module.css';-export function SettingsLayout({ items = [], children }: { items: any[]; children: ReactNode }) {+export function MenuLayout({ items = [], children }: { items: any[]; children: ReactNode }) {const pathname = usePathname();const cloudMode = !!process.env.cloudMode;@@ -22,4 +21,4 @@ export function SettingsLayout({ items = [], children }: { items: any[]; childre);}-export default SettingsLayout;+export default MenuLayout;diff --git a/src/components/layout/Page.tsx b/src/components/layout/Page.tsxindex 83312d12d..c2a0e241f 100644--- a/src/components/layout/Page.tsx+++ b/src/components/layout/Page.tsx@@ -1,4 +1,3 @@-'use client';import { ReactNode } from 'react';import classNames from 'classnames';import { Banner, Loading } from 'react-basics';diff --git a/src/index.ts b/src/index.tsindex 2d7b6015d..4fecde0ec 100644--- a/src/index.ts+++ b/src/index.ts@@ -1,17 +1,17 @@export * from 'components/hooks';export * from 'app/(main)/settings/teams/[teamId]/members/TeamMemberRemoveButton';-export * from 'app/(main)/settings/teams/[teamId]/members/TeamMembers';+export * from './app/(main)/settings/teams/[teamId]/members/TeamMembersPage';export * from 'app/(main)/settings/teams/[teamId]/members/TeamMembersDataTable';export * from 'app/(main)/settings/teams/[teamId]/members/TeamMembersTable';-export * from 'app/(main)/settings/teams/[teamId]/team/Team';+export * from './app/(main)/settings/teams/[teamId]/team/TeamDetails';export * from 'app/(main)/settings/teams/[teamId]/team/TeamAdmin';export * from 'app/(main)/settings/teams/[teamId]/team/TeamDeleteForm';export * from 'app/(main)/settings/teams/[teamId]/team/TeamEditForm';export * from 'app/(main)/settings/teams/[teamId]/websites/TeamWebsiteRemoveButton';-export * from 'app/(main)/settings/teams/[teamId]/websites/TeamWebsites';+export * from './app/(main)/settings/teams/[teamId]/websites/TeamWebsitesPage';export * from 'app/(main)/settings/teams/[teamId]/websites/TeamWebsitesDataTable';export * from 'app/(main)/settings/teams/[teamId]/websites/TeamWebsitesTable';