From 18e36aa7b392bf6b58cafdefb7ec86dbdf612752 Mon Sep 17 00:00:00 2001 From: Mike Cao Date: Mon, 29 Jan 2024 14:47:52 -0800 Subject: [PATCH] Changed route ids to be more explicit. --- src/app/(main)/console/TestConsole.tsx | 2 +- src/app/(main)/dashboard/Dashboard.tsx | 2 +- .../{[id] => [reportId]}/BaseParameters.tsx | 0 .../FieldAddForm.module.css | 0 .../{[id] => [reportId]}/FieldAddForm.tsx | 0 .../FieldAggregateForm.tsx | 0 .../FieldFilterForm.module.css | 0 .../{[id] => [reportId]}/FieldFilterForm.tsx | 0 .../FieldSelectForm.module.css | 0 .../{[id] => [reportId]}/FieldSelectForm.tsx | 0 .../{[id] => [reportId]}/FilterSelectForm.tsx | 0 .../ParameterList.module.css | 0 .../{[id] => [reportId]}/ParameterList.tsx | 0 .../{[id] => [reportId]}/PopupForm.module.css | 0 .../{[id] => [reportId]}/PopupForm.tsx | 0 .../{[id] => [reportId]}/Report.module.css | 0 .../reports/{[id] => [reportId]}/Report.tsx | 0 .../ReportBody.module.css | 0 .../{[id] => [reportId]}/ReportBody.tsx | 0 .../{[id] => [reportId]}/ReportDetails.tsx | 0 .../ReportHeader.module.css | 0 .../{[id] => [reportId]}/ReportHeader.tsx | 0 .../ReportMenu.module.css | 0 .../{[id] => [reportId]}/ReportMenu.tsx | 0 .../reports/{[id] => [reportId]}/page.tsx | 6 ++--- .../event-data/EventDataParameters.tsx | 8 +++--- .../reports/event-data/EventDataReport.tsx | 8 +++--- .../reports/event-data/EventDataTable.tsx | 2 +- src/app/(main)/reports/funnel/FunnelChart.tsx | 2 +- .../reports/funnel/FunnelParameters.tsx | 8 +++--- .../(main)/reports/funnel/FunnelReport.tsx | 8 +++--- src/app/(main)/reports/funnel/FunnelTable.tsx | 2 +- .../reports/insights/InsightsParameters.tsx | 12 ++++----- .../reports/insights/InsightsReport.tsx | 8 +++--- .../(main)/reports/insights/InsightsTable.tsx | 2 +- .../reports/retention/RetentionParameters.tsx | 4 +-- .../reports/retention/RetentionReport.tsx | 8 +++--- .../reports/retention/RetentionTable.tsx | 2 +- .../teams/{[id] => [teamId]}/TeamData.tsx | 0 .../teams/{[id] => [teamId]}/TeamEditForm.tsx | 0 .../TeamMemberRemoveButton.tsx | 0 .../teams/{[id] => [teamId]}/TeamMembers.tsx | 0 .../{[id] => [teamId]}/TeamMembersTable.tsx | 0 .../teams/{[id] => [teamId]}/TeamSettings.tsx | 12 +++++++-- .../TeamWebsiteRemoveButton.tsx | 0 .../teams/{[id] => [teamId]}/TeamWebsites.tsx | 0 .../{[id] => [teamId]}/TeamWebsitesTable.tsx | 0 .../teams/{[id] => [teamId]}/page.tsx | 4 +-- .../users/{[id] => [userId]}/UserSettings.tsx | 0 .../users/{[id] => [userId]}/UserWebsites.tsx | 0 .../users/{[id] => [userId]}/page.tsx | 4 +-- .../settings/websites/WebsiteSettings.tsx | 10 +++---- .../{[id] => [websiteId]}/ShareUrl.tsx | 0 .../{[id] => [websiteId]}/TrackingCode.tsx | 4 ++- .../{[id] => [websiteId]}/WebsiteData.tsx | 0 .../WebsiteDeleteForm.tsx | 0 .../{[id] => [websiteId]}/WebsiteEditForm.tsx | 0 .../WebsiteResetForm.tsx | 0 .../websites/{[id] => [websiteId]}/page.tsx | 0 .../(main)/teams/{[id] => [teamId]}/Team.tsx | 0 .../teams/{[id] => [teamId]}/layout.tsx | 0 .../websites/[websiteId]/page.tsx | 2 +- .../{[id] => [teamId]}/websites/page.tsx | 6 ++--- .../WebsiteChart.module.css | 0 .../{[id] => [websiteId]}/WebsiteChart.tsx | 0 .../WebsiteChartList.tsx | 0 .../{[id] => [websiteId]}/WebsiteContext.tsx | 0 .../{[id] => [websiteId]}/WebsiteDetails.tsx | 0 .../WebsiteExpandedView.module.css | 0 .../WebsiteExpandedView.tsx | 0 .../WebsiteFilterButton.tsx | 4 +-- .../WebsiteHeader.module.css | 0 .../{[id] => [websiteId]}/WebsiteHeader.tsx | 0 .../WebsiteMetricsBar.module.css | 0 .../WebsiteMetricsBar.tsx | 0 .../WebsiteTableView.tsx | 0 .../event-data/EventDataMetricsBar.module.css | 0 .../event-data/EventDataMetricsBar.tsx | 0 .../event-data/EventDataTable.tsx | 0 .../event-data/EventDataValueTable.tsx | 0 .../event-data/WebsiteEventData.module.css | 0 .../event-data/WebsiteEventData.tsx | 0 .../{[id] => [websiteId]}/event-data/page.tsx | 0 .../websites/{[id] => [websiteId]}/page.tsx | 0 .../realtime/Realtime.module.css | 0 .../realtime/Realtime.tsx | 0 .../realtime/RealtimeCountries.module.css | 0 .../realtime/RealtimeCountries.tsx | 0 .../realtime/RealtimeHeader.module.css | 0 .../realtime/RealtimeHeader.tsx | 0 .../realtime/RealtimeHome.tsx | 0 .../realtime/RealtimeLog.module.css | 0 .../realtime/RealtimeLog.tsx | 0 .../realtime/RealtimeUrls.tsx | 0 .../{[id] => [websiteId]}/realtime/page.tsx | 0 .../reports/WebsiteReports.tsx | 0 .../{[id] => [websiteId]}/reports/page.tsx | 0 .../Footer.module.css | 0 .../{[...id] => [...shareId]}/Footer.tsx | 0 .../Header.module.css | 0 .../{[...id] => [...shareId]}/Header.tsx | 0 .../Share.module.css | 0 .../share/{[...id] => [...shareId]}/Share.tsx | 2 +- .../share/{[...id] => [...shareId]}/page.tsx | 4 +-- src/index.ts | 26 +++++++++---------- 105 files changed, 86 insertions(+), 76 deletions(-) rename src/app/(main)/reports/{[id] => [reportId]}/BaseParameters.tsx (100%) rename src/app/(main)/reports/{[id] => [reportId]}/FieldAddForm.module.css (100%) rename src/app/(main)/reports/{[id] => [reportId]}/FieldAddForm.tsx (100%) rename src/app/(main)/reports/{[id] => [reportId]}/FieldAggregateForm.tsx (100%) rename src/app/(main)/reports/{[id] => [reportId]}/FieldFilterForm.module.css (100%) rename src/app/(main)/reports/{[id] => [reportId]}/FieldFilterForm.tsx (100%) rename src/app/(main)/reports/{[id] => [reportId]}/FieldSelectForm.module.css (100%) rename src/app/(main)/reports/{[id] => [reportId]}/FieldSelectForm.tsx (100%) rename src/app/(main)/reports/{[id] => [reportId]}/FilterSelectForm.tsx (100%) rename src/app/(main)/reports/{[id] => [reportId]}/ParameterList.module.css (100%) rename src/app/(main)/reports/{[id] => [reportId]}/ParameterList.tsx (100%) rename src/app/(main)/reports/{[id] => [reportId]}/PopupForm.module.css (100%) rename src/app/(main)/reports/{[id] => [reportId]}/PopupForm.tsx (100%) rename src/app/(main)/reports/{[id] => [reportId]}/Report.module.css (100%) rename src/app/(main)/reports/{[id] => [reportId]}/Report.tsx (100%) rename src/app/(main)/reports/{[id] => [reportId]}/ReportBody.module.css (100%) rename src/app/(main)/reports/{[id] => [reportId]}/ReportBody.tsx (100%) rename src/app/(main)/reports/{[id] => [reportId]}/ReportDetails.tsx (100%) rename src/app/(main)/reports/{[id] => [reportId]}/ReportHeader.module.css (100%) rename src/app/(main)/reports/{[id] => [reportId]}/ReportHeader.tsx (100%) rename src/app/(main)/reports/{[id] => [reportId]}/ReportMenu.module.css (100%) rename src/app/(main)/reports/{[id] => [reportId]}/ReportMenu.tsx (100%) rename src/app/(main)/reports/{[id] => [reportId]}/page.tsx (55%) rename src/app/(main)/settings/teams/{[id] => [teamId]}/TeamData.tsx (100%) rename src/app/(main)/settings/teams/{[id] => [teamId]}/TeamEditForm.tsx (100%) rename src/app/(main)/settings/teams/{[id] => [teamId]}/TeamMemberRemoveButton.tsx (100%) rename src/app/(main)/settings/teams/{[id] => [teamId]}/TeamMembers.tsx (100%) rename src/app/(main)/settings/teams/{[id] => [teamId]}/TeamMembersTable.tsx (100%) rename src/app/(main)/settings/teams/{[id] => [teamId]}/TeamSettings.tsx (80%) rename src/app/(main)/settings/teams/{[id] => [teamId]}/TeamWebsiteRemoveButton.tsx (100%) rename src/app/(main)/settings/teams/{[id] => [teamId]}/TeamWebsites.tsx (100%) rename src/app/(main)/settings/teams/{[id] => [teamId]}/TeamWebsitesTable.tsx (100%) rename src/app/(main)/settings/teams/{[id] => [teamId]}/page.tsx (51%) rename src/app/(main)/settings/users/{[id] => [userId]}/UserSettings.tsx (100%) rename src/app/(main)/settings/users/{[id] => [userId]}/UserWebsites.tsx (100%) rename src/app/(main)/settings/users/{[id] => [userId]}/page.tsx (51%) rename src/app/(main)/settings/websites/{[id] => [websiteId]}/ShareUrl.tsx (100%) rename src/app/(main)/settings/websites/{[id] => [websiteId]}/TrackingCode.tsx (93%) rename src/app/(main)/settings/websites/{[id] => [websiteId]}/WebsiteData.tsx (100%) rename src/app/(main)/settings/websites/{[id] => [websiteId]}/WebsiteDeleteForm.tsx (100%) rename src/app/(main)/settings/websites/{[id] => [websiteId]}/WebsiteEditForm.tsx (100%) rename src/app/(main)/settings/websites/{[id] => [websiteId]}/WebsiteResetForm.tsx (100%) rename src/app/(main)/settings/websites/{[id] => [websiteId]}/page.tsx (100%) rename src/app/(main)/teams/{[id] => [teamId]}/Team.tsx (100%) rename src/app/(main)/teams/{[id] => [teamId]}/layout.tsx (100%) rename src/app/(main)/teams/{[id] => [teamId]}/websites/[websiteId]/page.tsx (61%) rename src/app/(main)/teams/{[id] => [teamId]}/websites/page.tsx (50%) rename src/app/(main)/websites/{[id] => [websiteId]}/WebsiteChart.module.css (100%) rename src/app/(main)/websites/{[id] => [websiteId]}/WebsiteChart.tsx (100%) rename src/app/(main)/websites/{[id] => [websiteId]}/WebsiteChartList.tsx (100%) rename src/app/(main)/websites/{[id] => [websiteId]}/WebsiteContext.tsx (100%) rename src/app/(main)/websites/{[id] => [websiteId]}/WebsiteDetails.tsx (100%) rename src/app/(main)/websites/{[id] => [websiteId]}/WebsiteExpandedView.module.css (100%) rename src/app/(main)/websites/{[id] => [websiteId]}/WebsiteExpandedView.tsx (100%) rename src/app/(main)/websites/{[id] => [websiteId]}/WebsiteFilterButton.tsx (93%) rename src/app/(main)/websites/{[id] => [websiteId]}/WebsiteHeader.module.css (100%) rename src/app/(main)/websites/{[id] => [websiteId]}/WebsiteHeader.tsx (100%) rename src/app/(main)/websites/{[id] => [websiteId]}/WebsiteMetricsBar.module.css (100%) rename src/app/(main)/websites/{[id] => [websiteId]}/WebsiteMetricsBar.tsx (100%) rename src/app/(main)/websites/{[id] => [websiteId]}/WebsiteTableView.tsx (100%) rename src/app/(main)/websites/{[id] => [websiteId]}/event-data/EventDataMetricsBar.module.css (100%) rename src/app/(main)/websites/{[id] => [websiteId]}/event-data/EventDataMetricsBar.tsx (100%) rename src/app/(main)/websites/{[id] => [websiteId]}/event-data/EventDataTable.tsx (100%) rename src/app/(main)/websites/{[id] => [websiteId]}/event-data/EventDataValueTable.tsx (100%) rename src/app/(main)/websites/{[id] => [websiteId]}/event-data/WebsiteEventData.module.css (100%) rename src/app/(main)/websites/{[id] => [websiteId]}/event-data/WebsiteEventData.tsx (100%) rename src/app/(main)/websites/{[id] => [websiteId]}/event-data/page.tsx (100%) rename src/app/(main)/websites/{[id] => [websiteId]}/page.tsx (100%) rename src/app/(main)/websites/{[id] => [websiteId]}/realtime/Realtime.module.css (100%) rename src/app/(main)/websites/{[id] => [websiteId]}/realtime/Realtime.tsx (100%) rename src/app/(main)/websites/{[id] => [websiteId]}/realtime/RealtimeCountries.module.css (100%) rename src/app/(main)/websites/{[id] => [websiteId]}/realtime/RealtimeCountries.tsx (100%) rename src/app/(main)/websites/{[id] => [websiteId]}/realtime/RealtimeHeader.module.css (100%) rename src/app/(main)/websites/{[id] => [websiteId]}/realtime/RealtimeHeader.tsx (100%) rename src/app/(main)/websites/{[id] => [websiteId]}/realtime/RealtimeHome.tsx (100%) rename src/app/(main)/websites/{[id] => [websiteId]}/realtime/RealtimeLog.module.css (100%) rename src/app/(main)/websites/{[id] => [websiteId]}/realtime/RealtimeLog.tsx (100%) rename src/app/(main)/websites/{[id] => [websiteId]}/realtime/RealtimeUrls.tsx (100%) rename src/app/(main)/websites/{[id] => [websiteId]}/realtime/page.tsx (100%) rename src/app/(main)/websites/{[id] => [websiteId]}/reports/WebsiteReports.tsx (100%) rename src/app/(main)/websites/{[id] => [websiteId]}/reports/page.tsx (100%) rename src/app/share/{[...id] => [...shareId]}/Footer.module.css (100%) rename src/app/share/{[...id] => [...shareId]}/Footer.tsx (100%) rename src/app/share/{[...id] => [...shareId]}/Header.module.css (100%) rename src/app/share/{[...id] => [...shareId]}/Header.tsx (100%) rename src/app/share/{[...id] => [...shareId]}/Share.module.css (100%) rename src/app/share/{[...id] => [...shareId]}/Share.tsx (87%) rename src/app/share/{[...id] => [...shareId]}/page.tsx (56%) diff --git a/src/app/(main)/console/TestConsole.tsx b/src/app/(main)/console/TestConsole.tsx index 640a81f6..2e11e4b0 100644 --- a/src/app/(main)/console/TestConsole.tsx +++ b/src/app/(main)/console/TestConsole.tsx @@ -7,7 +7,7 @@ import WebsiteSelect from 'components/input/WebsiteSelect'; import Page from 'components/layout/Page'; import PageHeader from 'components/layout/PageHeader'; import EventsChart from 'components/metrics/EventsChart'; -import WebsiteChart from 'app/(main)/websites/[id]/WebsiteChart'; +import WebsiteChart from '../websites/[websiteId]/WebsiteChart'; import { useApi, useNavigation } from 'components/hooks'; import styles from './TestConsole.module.css'; diff --git a/src/app/(main)/dashboard/Dashboard.tsx b/src/app/(main)/dashboard/Dashboard.tsx index e4d8671a..202f88f6 100644 --- a/src/app/(main)/dashboard/Dashboard.tsx +++ b/src/app/(main)/dashboard/Dashboard.tsx @@ -3,7 +3,7 @@ import { Button, Icon, Icons, Loading, Text } from 'react-basics'; import Link from 'next/link'; import PageHeader from 'components/layout/PageHeader'; import Pager from 'components/common/Pager'; -import WebsiteChartList from 'app/(main)/websites/[id]/WebsiteChartList'; +import WebsiteChartList from '../websites/[websiteId]/WebsiteChartList'; import DashboardSettingsButton from 'app/(main)/dashboard/DashboardSettingsButton'; import DashboardEdit from 'app/(main)/dashboard/DashboardEdit'; import EmptyPlaceholder from 'components/common/EmptyPlaceholder'; diff --git a/src/app/(main)/reports/[id]/BaseParameters.tsx b/src/app/(main)/reports/[reportId]/BaseParameters.tsx similarity index 100% rename from src/app/(main)/reports/[id]/BaseParameters.tsx rename to src/app/(main)/reports/[reportId]/BaseParameters.tsx diff --git a/src/app/(main)/reports/[id]/FieldAddForm.module.css b/src/app/(main)/reports/[reportId]/FieldAddForm.module.css similarity index 100% rename from src/app/(main)/reports/[id]/FieldAddForm.module.css rename to src/app/(main)/reports/[reportId]/FieldAddForm.module.css diff --git a/src/app/(main)/reports/[id]/FieldAddForm.tsx b/src/app/(main)/reports/[reportId]/FieldAddForm.tsx similarity index 100% rename from src/app/(main)/reports/[id]/FieldAddForm.tsx rename to src/app/(main)/reports/[reportId]/FieldAddForm.tsx diff --git a/src/app/(main)/reports/[id]/FieldAggregateForm.tsx b/src/app/(main)/reports/[reportId]/FieldAggregateForm.tsx similarity index 100% rename from src/app/(main)/reports/[id]/FieldAggregateForm.tsx rename to src/app/(main)/reports/[reportId]/FieldAggregateForm.tsx diff --git a/src/app/(main)/reports/[id]/FieldFilterForm.module.css b/src/app/(main)/reports/[reportId]/FieldFilterForm.module.css similarity index 100% rename from src/app/(main)/reports/[id]/FieldFilterForm.module.css rename to src/app/(main)/reports/[reportId]/FieldFilterForm.module.css diff --git a/src/app/(main)/reports/[id]/FieldFilterForm.tsx b/src/app/(main)/reports/[reportId]/FieldFilterForm.tsx similarity index 100% rename from src/app/(main)/reports/[id]/FieldFilterForm.tsx rename to src/app/(main)/reports/[reportId]/FieldFilterForm.tsx diff --git a/src/app/(main)/reports/[id]/FieldSelectForm.module.css b/src/app/(main)/reports/[reportId]/FieldSelectForm.module.css similarity index 100% rename from src/app/(main)/reports/[id]/FieldSelectForm.module.css rename to src/app/(main)/reports/[reportId]/FieldSelectForm.module.css diff --git a/src/app/(main)/reports/[id]/FieldSelectForm.tsx b/src/app/(main)/reports/[reportId]/FieldSelectForm.tsx similarity index 100% rename from src/app/(main)/reports/[id]/FieldSelectForm.tsx rename to src/app/(main)/reports/[reportId]/FieldSelectForm.tsx diff --git a/src/app/(main)/reports/[id]/FilterSelectForm.tsx b/src/app/(main)/reports/[reportId]/FilterSelectForm.tsx similarity index 100% rename from src/app/(main)/reports/[id]/FilterSelectForm.tsx rename to src/app/(main)/reports/[reportId]/FilterSelectForm.tsx diff --git a/src/app/(main)/reports/[id]/ParameterList.module.css b/src/app/(main)/reports/[reportId]/ParameterList.module.css similarity index 100% rename from src/app/(main)/reports/[id]/ParameterList.module.css rename to src/app/(main)/reports/[reportId]/ParameterList.module.css diff --git a/src/app/(main)/reports/[id]/ParameterList.tsx b/src/app/(main)/reports/[reportId]/ParameterList.tsx similarity index 100% rename from src/app/(main)/reports/[id]/ParameterList.tsx rename to src/app/(main)/reports/[reportId]/ParameterList.tsx diff --git a/src/app/(main)/reports/[id]/PopupForm.module.css b/src/app/(main)/reports/[reportId]/PopupForm.module.css similarity index 100% rename from src/app/(main)/reports/[id]/PopupForm.module.css rename to src/app/(main)/reports/[reportId]/PopupForm.module.css diff --git a/src/app/(main)/reports/[id]/PopupForm.tsx b/src/app/(main)/reports/[reportId]/PopupForm.tsx similarity index 100% rename from src/app/(main)/reports/[id]/PopupForm.tsx rename to src/app/(main)/reports/[reportId]/PopupForm.tsx diff --git a/src/app/(main)/reports/[id]/Report.module.css b/src/app/(main)/reports/[reportId]/Report.module.css similarity index 100% rename from src/app/(main)/reports/[id]/Report.module.css rename to src/app/(main)/reports/[reportId]/Report.module.css diff --git a/src/app/(main)/reports/[id]/Report.tsx b/src/app/(main)/reports/[reportId]/Report.tsx similarity index 100% rename from src/app/(main)/reports/[id]/Report.tsx rename to src/app/(main)/reports/[reportId]/Report.tsx diff --git a/src/app/(main)/reports/[id]/ReportBody.module.css b/src/app/(main)/reports/[reportId]/ReportBody.module.css similarity index 100% rename from src/app/(main)/reports/[id]/ReportBody.module.css rename to src/app/(main)/reports/[reportId]/ReportBody.module.css diff --git a/src/app/(main)/reports/[id]/ReportBody.tsx b/src/app/(main)/reports/[reportId]/ReportBody.tsx similarity index 100% rename from src/app/(main)/reports/[id]/ReportBody.tsx rename to src/app/(main)/reports/[reportId]/ReportBody.tsx diff --git a/src/app/(main)/reports/[id]/ReportDetails.tsx b/src/app/(main)/reports/[reportId]/ReportDetails.tsx similarity index 100% rename from src/app/(main)/reports/[id]/ReportDetails.tsx rename to src/app/(main)/reports/[reportId]/ReportDetails.tsx diff --git a/src/app/(main)/reports/[id]/ReportHeader.module.css b/src/app/(main)/reports/[reportId]/ReportHeader.module.css similarity index 100% rename from src/app/(main)/reports/[id]/ReportHeader.module.css rename to src/app/(main)/reports/[reportId]/ReportHeader.module.css diff --git a/src/app/(main)/reports/[id]/ReportHeader.tsx b/src/app/(main)/reports/[reportId]/ReportHeader.tsx similarity index 100% rename from src/app/(main)/reports/[id]/ReportHeader.tsx rename to src/app/(main)/reports/[reportId]/ReportHeader.tsx diff --git a/src/app/(main)/reports/[id]/ReportMenu.module.css b/src/app/(main)/reports/[reportId]/ReportMenu.module.css similarity index 100% rename from src/app/(main)/reports/[id]/ReportMenu.module.css rename to src/app/(main)/reports/[reportId]/ReportMenu.module.css diff --git a/src/app/(main)/reports/[id]/ReportMenu.tsx b/src/app/(main)/reports/[reportId]/ReportMenu.tsx similarity index 100% rename from src/app/(main)/reports/[id]/ReportMenu.tsx rename to src/app/(main)/reports/[reportId]/ReportMenu.tsx diff --git a/src/app/(main)/reports/[id]/page.tsx b/src/app/(main)/reports/[reportId]/page.tsx similarity index 55% rename from src/app/(main)/reports/[id]/page.tsx rename to src/app/(main)/reports/[reportId]/page.tsx index 9ba87f41..1f173d7c 100644 --- a/src/app/(main)/reports/[id]/page.tsx +++ b/src/app/(main)/reports/[reportId]/page.tsx @@ -1,12 +1,12 @@ import ReportDetails from './ReportDetails'; import { Metadata } from 'next'; -export default function ReportDetailsPage({ params: { id } }) { - if (!id) { +export default function ReportDetailsPage({ params: { reportId } }) { + if (!reportId) { return null; } - return ; + return ; } export const metadata: Metadata = { diff --git a/src/app/(main)/reports/event-data/EventDataParameters.tsx b/src/app/(main)/reports/event-data/EventDataParameters.tsx index 7a39131b..2ee77a43 100644 --- a/src/app/(main)/reports/event-data/EventDataParameters.tsx +++ b/src/app/(main)/reports/event-data/EventDataParameters.tsx @@ -4,10 +4,10 @@ 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 '../[id]/Report'; -import FieldAddForm from '../[id]/FieldAddForm'; -import ParameterList from '../[id]/ParameterList'; -import BaseParameters from '../[id]/BaseParameters'; +import { ReportContext } from '../[reportId]/Report'; +import FieldAddForm from '../[reportId]/FieldAddForm'; +import ParameterList from '../[reportId]/ParameterList'; +import BaseParameters from '../[reportId]/BaseParameters'; import styles from './EventDataParameters.module.css'; function useFields(websiteId, startDate, endDate) { diff --git a/src/app/(main)/reports/event-data/EventDataReport.tsx b/src/app/(main)/reports/event-data/EventDataReport.tsx index 8b4dc99c..2ce17306 100644 --- a/src/app/(main)/reports/event-data/EventDataReport.tsx +++ b/src/app/(main)/reports/event-data/EventDataReport.tsx @@ -1,7 +1,7 @@ -import Report from '../[id]/Report'; -import ReportHeader from '../[id]/ReportHeader'; -import ReportMenu from '../[id]/ReportMenu'; -import ReportBody from '../[id]/ReportBody'; +import Report from '../[reportId]/Report'; +import ReportHeader from '../[reportId]/ReportHeader'; +import ReportMenu from '../[reportId]/ReportMenu'; +import ReportBody from '../[reportId]/ReportBody'; import EventDataParameters from './EventDataParameters'; import EventDataTable from './EventDataTable'; import Nodes from 'assets/nodes.svg'; diff --git a/src/app/(main)/reports/event-data/EventDataTable.tsx b/src/app/(main)/reports/event-data/EventDataTable.tsx index b709aee7..740cbce4 100644 --- a/src/app/(main)/reports/event-data/EventDataTable.tsx +++ b/src/app/(main)/reports/event-data/EventDataTable.tsx @@ -1,7 +1,7 @@ import { useContext } from 'react'; import { GridTable, GridColumn } from 'react-basics'; import { useMessages } from 'components/hooks'; -import { ReportContext } from '../[id]/Report'; +import { ReportContext } from '../[reportId]/Report'; export function EventDataTable() { const { report } = useContext(ReportContext); diff --git a/src/app/(main)/reports/funnel/FunnelChart.tsx b/src/app/(main)/reports/funnel/FunnelChart.tsx index e401e3cb..38373517 100644 --- a/src/app/(main)/reports/funnel/FunnelChart.tsx +++ b/src/app/(main)/reports/funnel/FunnelChart.tsx @@ -3,7 +3,7 @@ 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 '../[id]/Report'; +import { ReportContext } from '../[reportId]/Report'; 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.tsx index 0bb45415..c4f8f384 100644 --- a/src/app/(main)/reports/funnel/FunnelParameters.tsx +++ b/src/app/(main)/reports/funnel/FunnelParameters.tsx @@ -13,10 +13,10 @@ import { } from 'react-basics'; import Icons from 'components/icons'; import UrlAddForm from './UrlAddForm'; -import { ReportContext } from '../[id]/Report'; -import BaseParameters from '../[id]/BaseParameters'; -import ParameterList from '../[id]/ParameterList'; -import PopupForm from '../[id]/PopupForm'; +import { ReportContext } from '../[reportId]/Report'; +import BaseParameters from '../[reportId]/BaseParameters'; +import ParameterList from '../[reportId]/ParameterList'; +import PopupForm from '../[reportId]/PopupForm'; export function FunnelParameters() { const { report, runReport, updateReport, isRunning } = useContext(ReportContext); diff --git a/src/app/(main)/reports/funnel/FunnelReport.tsx b/src/app/(main)/reports/funnel/FunnelReport.tsx index 69f46091..b9b4bd77 100644 --- a/src/app/(main)/reports/funnel/FunnelReport.tsx +++ b/src/app/(main)/reports/funnel/FunnelReport.tsx @@ -2,10 +2,10 @@ import FunnelChart from './FunnelChart'; import FunnelTable from './FunnelTable'; import FunnelParameters from './FunnelParameters'; -import Report from '../[id]/Report'; -import ReportHeader from '../[id]/ReportHeader'; -import ReportMenu from '../[id]/ReportMenu'; -import ReportBody from '../[id]/ReportBody'; +import Report from '../[reportId]/Report'; +import ReportHeader from '../[reportId]/ReportHeader'; +import ReportMenu from '../[reportId]/ReportMenu'; +import ReportBody from '../[reportId]/ReportBody'; import Funnel from 'assets/funnel.svg'; import { REPORT_TYPES } from 'lib/constants'; diff --git a/src/app/(main)/reports/funnel/FunnelTable.tsx b/src/app/(main)/reports/funnel/FunnelTable.tsx index 4cf797f2..1fe1fdd9 100644 --- a/src/app/(main)/reports/funnel/FunnelTable.tsx +++ b/src/app/(main)/reports/funnel/FunnelTable.tsx @@ -1,7 +1,7 @@ import { useContext } from 'react'; import ListTable from 'components/metrics/ListTable'; import { useMessages } from 'components/hooks'; -import { ReportContext } from '../[id]/Report'; +import { ReportContext } from '../[reportId]/Report'; export function FunnelTable() { const { report } = useContext(ReportContext); diff --git a/src/app/(main)/reports/insights/InsightsParameters.tsx b/src/app/(main)/reports/insights/InsightsParameters.tsx index cd643eed..a5a98dd2 100644 --- a/src/app/(main)/reports/insights/InsightsParameters.tsx +++ b/src/app/(main)/reports/insights/InsightsParameters.tsx @@ -11,12 +11,12 @@ import { TooltipPopup, } from 'react-basics'; import Icons from 'components/icons'; -import BaseParameters from '../[id]/BaseParameters'; -import { ReportContext } from '../[id]/Report'; -import ParameterList from '../[id]/ParameterList'; -import FilterSelectForm from '../[id]/FilterSelectForm'; -import FieldSelectForm from '../[id]/FieldSelectForm'; -import PopupForm from '../[id]/PopupForm'; +import BaseParameters from '../[reportId]/BaseParameters'; +import { ReportContext } from '../[reportId]/Report'; +import ParameterList from '../[reportId]/ParameterList'; +import FilterSelectForm from '../[reportId]/FilterSelectForm'; +import FieldSelectForm from '../[reportId]/FieldSelectForm'; +import PopupForm from '../[reportId]/PopupForm'; import styles from './InsightsParameters.module.css'; export function InsightsParameters() { diff --git a/src/app/(main)/reports/insights/InsightsReport.tsx b/src/app/(main)/reports/insights/InsightsReport.tsx index b90ff396..709cdf72 100644 --- a/src/app/(main)/reports/insights/InsightsReport.tsx +++ b/src/app/(main)/reports/insights/InsightsReport.tsx @@ -1,8 +1,8 @@ 'use client'; -import Report from '../[id]/Report'; -import ReportHeader from '../[id]/ReportHeader'; -import ReportMenu from '../[id]/ReportMenu'; -import ReportBody from '../[id]/ReportBody'; +import Report from '../[reportId]/Report'; +import ReportHeader from '../[reportId]/ReportHeader'; +import ReportMenu from '../[reportId]/ReportMenu'; +import ReportBody from '../[reportId]/ReportBody'; import InsightsParameters from './InsightsParameters'; import InsightsTable from './InsightsTable'; import Lightbulb from 'assets/lightbulb.svg'; diff --git a/src/app/(main)/reports/insights/InsightsTable.tsx b/src/app/(main)/reports/insights/InsightsTable.tsx index a4517698..2cccc24c 100644 --- a/src/app/(main)/reports/insights/InsightsTable.tsx +++ b/src/app/(main)/reports/insights/InsightsTable.tsx @@ -1,7 +1,7 @@ import { useContext, useEffect, useState } from 'react'; import { GridTable, GridColumn } from 'react-basics'; import { useFormat, useMessages } from 'components/hooks'; -import { ReportContext } from '../[id]/Report'; +import { ReportContext } from '../[reportId]/Report'; import EmptyPlaceholder from 'components/common/EmptyPlaceholder'; export function InsightsTable() { diff --git a/src/app/(main)/reports/retention/RetentionParameters.tsx b/src/app/(main)/reports/retention/RetentionParameters.tsx index fc168695..9bc1c548 100644 --- a/src/app/(main)/reports/retention/RetentionParameters.tsx +++ b/src/app/(main)/reports/retention/RetentionParameters.tsx @@ -1,9 +1,9 @@ import { useContext } from 'react'; import { useMessages } from 'components/hooks'; import { Form, FormButtons, FormRow, SubmitButton } from 'react-basics'; -import { ReportContext } from '../[id]/Report'; +import { ReportContext } from '../[reportId]/Report'; import { MonthSelect } from 'components/input/MonthSelect'; -import BaseParameters from '../[id]/BaseParameters'; +import BaseParameters from '../[reportId]/BaseParameters'; import { parseDateRange } from 'lib/date'; export function RetentionParameters() { diff --git a/src/app/(main)/reports/retention/RetentionReport.tsx b/src/app/(main)/reports/retention/RetentionReport.tsx index 35f0fcb1..b49975dc 100644 --- a/src/app/(main)/reports/retention/RetentionReport.tsx +++ b/src/app/(main)/reports/retention/RetentionReport.tsx @@ -1,10 +1,10 @@ 'use client'; import RetentionTable from './RetentionTable'; import RetentionParameters from './RetentionParameters'; -import Report from '../[id]/Report'; -import ReportHeader from '../[id]/ReportHeader'; -import ReportMenu from '../[id]/ReportMenu'; -import ReportBody from '../[id]/ReportBody'; +import Report from '../[reportId]/Report'; +import ReportHeader from '../[reportId]/ReportHeader'; +import ReportMenu from '../[reportId]/ReportMenu'; +import ReportBody from '../[reportId]/ReportBody'; import Magnet from 'assets/magnet.svg'; import { REPORT_TYPES } from 'lib/constants'; import { parseDateRange } from 'lib/date'; diff --git a/src/app/(main)/reports/retention/RetentionTable.tsx b/src/app/(main)/reports/retention/RetentionTable.tsx index d2e7f129..171c5bd3 100644 --- a/src/app/(main)/reports/retention/RetentionTable.tsx +++ b/src/app/(main)/reports/retention/RetentionTable.tsx @@ -1,6 +1,6 @@ import { useContext } from 'react'; import classNames from 'classnames'; -import { ReportContext } from '../[id]/Report'; +import { ReportContext } from '../[reportId]/Report'; import EmptyPlaceholder from 'components/common/EmptyPlaceholder'; import { useMessages, useLocale } from 'components/hooks'; import { formatDate } from 'lib/date'; diff --git a/src/app/(main)/settings/teams/[id]/TeamData.tsx b/src/app/(main)/settings/teams/[teamId]/TeamData.tsx similarity index 100% rename from src/app/(main)/settings/teams/[id]/TeamData.tsx rename to src/app/(main)/settings/teams/[teamId]/TeamData.tsx diff --git a/src/app/(main)/settings/teams/[id]/TeamEditForm.tsx b/src/app/(main)/settings/teams/[teamId]/TeamEditForm.tsx similarity index 100% rename from src/app/(main)/settings/teams/[id]/TeamEditForm.tsx rename to src/app/(main)/settings/teams/[teamId]/TeamEditForm.tsx diff --git a/src/app/(main)/settings/teams/[id]/TeamMemberRemoveButton.tsx b/src/app/(main)/settings/teams/[teamId]/TeamMemberRemoveButton.tsx similarity index 100% rename from src/app/(main)/settings/teams/[id]/TeamMemberRemoveButton.tsx rename to src/app/(main)/settings/teams/[teamId]/TeamMemberRemoveButton.tsx diff --git a/src/app/(main)/settings/teams/[id]/TeamMembers.tsx b/src/app/(main)/settings/teams/[teamId]/TeamMembers.tsx similarity index 100% rename from src/app/(main)/settings/teams/[id]/TeamMembers.tsx rename to src/app/(main)/settings/teams/[teamId]/TeamMembers.tsx diff --git a/src/app/(main)/settings/teams/[id]/TeamMembersTable.tsx b/src/app/(main)/settings/teams/[teamId]/TeamMembersTable.tsx similarity index 100% rename from src/app/(main)/settings/teams/[id]/TeamMembersTable.tsx rename to src/app/(main)/settings/teams/[teamId]/TeamMembersTable.tsx diff --git a/src/app/(main)/settings/teams/[id]/TeamSettings.tsx b/src/app/(main)/settings/teams/[teamId]/TeamSettings.tsx similarity index 80% rename from src/app/(main)/settings/teams/[id]/TeamSettings.tsx rename to src/app/(main)/settings/teams/[teamId]/TeamSettings.tsx index 21aafbc4..39d03b87 100644 --- a/src/app/(main)/settings/teams/[id]/TeamSettings.tsx +++ b/src/app/(main)/settings/teams/[teamId]/TeamSettings.tsx @@ -1,6 +1,6 @@ 'use client'; import { useState } from 'react'; -import { Item, Loading, Tabs, Flexbox } from 'react-basics'; +import { Item, Loading, Tabs, Flexbox, Text, Icon } from 'react-basics'; import TeamsContext from 'app/(main)/teams/TeamsContext'; import PageHeader from 'components/layout/PageHeader'; import { ROLES } from 'lib/constants'; @@ -10,6 +10,7 @@ import TeamEditForm from './TeamEditForm'; import TeamMembers from './TeamMembers'; import TeamWebsites from './TeamWebsites'; import TeamData from './TeamData'; +import LinkButton from 'components/common/LinkButton'; export function TeamSettings({ teamId }: { teamId: string }) { const { formatMessage, labels } = useMessages(); @@ -28,7 +29,14 @@ export function TeamSettings({ teamId }: { teamId: string }) { return ( - } /> + }> + + + + + {formatMessage(labels.view)} + + setTab(value)} diff --git a/src/app/(main)/settings/teams/[id]/TeamWebsiteRemoveButton.tsx b/src/app/(main)/settings/teams/[teamId]/TeamWebsiteRemoveButton.tsx similarity index 100% rename from src/app/(main)/settings/teams/[id]/TeamWebsiteRemoveButton.tsx rename to src/app/(main)/settings/teams/[teamId]/TeamWebsiteRemoveButton.tsx diff --git a/src/app/(main)/settings/teams/[id]/TeamWebsites.tsx b/src/app/(main)/settings/teams/[teamId]/TeamWebsites.tsx similarity index 100% rename from src/app/(main)/settings/teams/[id]/TeamWebsites.tsx rename to src/app/(main)/settings/teams/[teamId]/TeamWebsites.tsx diff --git a/src/app/(main)/settings/teams/[id]/TeamWebsitesTable.tsx b/src/app/(main)/settings/teams/[teamId]/TeamWebsitesTable.tsx similarity index 100% rename from src/app/(main)/settings/teams/[id]/TeamWebsitesTable.tsx rename to src/app/(main)/settings/teams/[teamId]/TeamWebsitesTable.tsx diff --git a/src/app/(main)/settings/teams/[id]/page.tsx b/src/app/(main)/settings/teams/[teamId]/page.tsx similarity index 51% rename from src/app/(main)/settings/teams/[id]/page.tsx rename to src/app/(main)/settings/teams/[teamId]/page.tsx index 652e65c1..ad242431 100644 --- a/src/app/(main)/settings/teams/[id]/page.tsx +++ b/src/app/(main)/settings/teams/[teamId]/page.tsx @@ -1,9 +1,9 @@ import TeamSettings from './TeamSettings'; -export default function ({ params }) { +export default function ({ params: { teamId } }) { if (process.env.cloudMode) { return null; } - return ; + return ; } diff --git a/src/app/(main)/settings/users/[id]/UserSettings.tsx b/src/app/(main)/settings/users/[userId]/UserSettings.tsx similarity index 100% rename from src/app/(main)/settings/users/[id]/UserSettings.tsx rename to src/app/(main)/settings/users/[userId]/UserSettings.tsx diff --git a/src/app/(main)/settings/users/[id]/UserWebsites.tsx b/src/app/(main)/settings/users/[userId]/UserWebsites.tsx similarity index 100% rename from src/app/(main)/settings/users/[id]/UserWebsites.tsx rename to src/app/(main)/settings/users/[userId]/UserWebsites.tsx diff --git a/src/app/(main)/settings/users/[id]/page.tsx b/src/app/(main)/settings/users/[userId]/page.tsx similarity index 51% rename from src/app/(main)/settings/users/[id]/page.tsx rename to src/app/(main)/settings/users/[userId]/page.tsx index 7a6378aa..e8f1793e 100644 --- a/src/app/(main)/settings/users/[id]/page.tsx +++ b/src/app/(main)/settings/users/[userId]/page.tsx @@ -1,9 +1,9 @@ import UserSettings from './UserSettings'; -export default function ({ params }) { +export default function ({ params: { userId } }) { if (process.env.cloudMode) { return null; } - return ; + return ; } diff --git a/src/app/(main)/settings/websites/WebsiteSettings.tsx b/src/app/(main)/settings/websites/WebsiteSettings.tsx index 55037cee..bceeff01 100644 --- a/src/app/(main)/settings/websites/WebsiteSettings.tsx +++ b/src/app/(main)/settings/websites/WebsiteSettings.tsx @@ -4,12 +4,12 @@ import { Item, Tabs, Button, Text, Icon, Loading } from 'react-basics'; import Link from 'next/link'; import Icons from 'components/icons'; import PageHeader from 'components/layout/PageHeader'; -import WebsiteEditForm from './[id]/WebsiteEditForm'; -import WebsiteData from './[id]/WebsiteData'; -import TrackingCode from './[id]/TrackingCode'; -import ShareUrl from './[id]/ShareUrl'; +import WebsiteEditForm from './[websiteId]/WebsiteEditForm'; +import WebsiteData from './[websiteId]/WebsiteData'; +import TrackingCode from './[websiteId]/TrackingCode'; +import ShareUrl from './[websiteId]/ShareUrl'; import { useWebsite, useMessages } from 'components/hooks'; -import WebsiteContext from 'app/(main)/websites/[id]/WebsiteContext'; +import WebsiteContext from '../../websites/[websiteId]/WebsiteContext'; export function WebsiteSettings({ websiteId, openExternal = false }) { const { formatMessage, labels } = useMessages(); diff --git a/src/app/(main)/settings/websites/[id]/ShareUrl.tsx b/src/app/(main)/settings/websites/[websiteId]/ShareUrl.tsx similarity index 100% rename from src/app/(main)/settings/websites/[id]/ShareUrl.tsx rename to src/app/(main)/settings/websites/[websiteId]/ShareUrl.tsx diff --git a/src/app/(main)/settings/websites/[id]/TrackingCode.tsx b/src/app/(main)/settings/websites/[websiteId]/TrackingCode.tsx similarity index 93% rename from src/app/(main)/settings/websites/[id]/TrackingCode.tsx rename to src/app/(main)/settings/websites/[websiteId]/TrackingCode.tsx index bf4168d3..66222349 100644 --- a/src/app/(main)/settings/websites/[id]/TrackingCode.tsx +++ b/src/app/(main)/settings/websites/[websiteId]/TrackingCode.tsx @@ -1,12 +1,14 @@ import { TextArea } from 'react-basics'; import { useMessages, useConfig } from 'components/hooks'; +const SCRIPT_NAME = 'script.js'; + export function TrackingCode({ websiteId, hostUrl }: { websiteId: string; hostUrl?: string }) { const { formatMessage, messages } = useMessages(); const config = useConfig(); const trackerScriptName = - config?.trackerScriptName?.split(',')?.map((n: string) => n.trim())?.[0] || 'script.js'; + config?.trackerScriptName?.split(',')?.map((n: string) => n.trim())?.[0] || SCRIPT_NAME; const url = trackerScriptName?.startsWith('http') ? trackerScriptName diff --git a/src/app/(main)/settings/websites/[id]/WebsiteData.tsx b/src/app/(main)/settings/websites/[websiteId]/WebsiteData.tsx similarity index 100% rename from src/app/(main)/settings/websites/[id]/WebsiteData.tsx rename to src/app/(main)/settings/websites/[websiteId]/WebsiteData.tsx diff --git a/src/app/(main)/settings/websites/[id]/WebsiteDeleteForm.tsx b/src/app/(main)/settings/websites/[websiteId]/WebsiteDeleteForm.tsx similarity index 100% rename from src/app/(main)/settings/websites/[id]/WebsiteDeleteForm.tsx rename to src/app/(main)/settings/websites/[websiteId]/WebsiteDeleteForm.tsx diff --git a/src/app/(main)/settings/websites/[id]/WebsiteEditForm.tsx b/src/app/(main)/settings/websites/[websiteId]/WebsiteEditForm.tsx similarity index 100% rename from src/app/(main)/settings/websites/[id]/WebsiteEditForm.tsx rename to src/app/(main)/settings/websites/[websiteId]/WebsiteEditForm.tsx diff --git a/src/app/(main)/settings/websites/[id]/WebsiteResetForm.tsx b/src/app/(main)/settings/websites/[websiteId]/WebsiteResetForm.tsx similarity index 100% rename from src/app/(main)/settings/websites/[id]/WebsiteResetForm.tsx rename to src/app/(main)/settings/websites/[websiteId]/WebsiteResetForm.tsx diff --git a/src/app/(main)/settings/websites/[id]/page.tsx b/src/app/(main)/settings/websites/[websiteId]/page.tsx similarity index 100% rename from src/app/(main)/settings/websites/[id]/page.tsx rename to src/app/(main)/settings/websites/[websiteId]/page.tsx diff --git a/src/app/(main)/teams/[id]/Team.tsx b/src/app/(main)/teams/[teamId]/Team.tsx similarity index 100% rename from src/app/(main)/teams/[id]/Team.tsx rename to src/app/(main)/teams/[teamId]/Team.tsx diff --git a/src/app/(main)/teams/[id]/layout.tsx b/src/app/(main)/teams/[teamId]/layout.tsx similarity index 100% rename from src/app/(main)/teams/[id]/layout.tsx rename to src/app/(main)/teams/[teamId]/layout.tsx diff --git a/src/app/(main)/teams/[id]/websites/[websiteId]/page.tsx b/src/app/(main)/teams/[teamId]/websites/[websiteId]/page.tsx similarity index 61% rename from src/app/(main)/teams/[id]/websites/[websiteId]/page.tsx rename to src/app/(main)/teams/[teamId]/websites/[websiteId]/page.tsx index c9f2927b..eb506411 100644 --- a/src/app/(main)/teams/[id]/websites/[websiteId]/page.tsx +++ b/src/app/(main)/teams/[teamId]/websites/[websiteId]/page.tsx @@ -1,4 +1,4 @@ -import WebsiteDetails from 'app/(main)/websites/[id]/WebsiteDetails'; +import WebsiteDetails from '../../../../websites/[websiteId]/WebsiteDetails'; export default function TeamWebsitePage({ params: { websiteId } }) { return ; diff --git a/src/app/(main)/teams/[id]/websites/page.tsx b/src/app/(main)/teams/[teamId]/websites/page.tsx similarity index 50% rename from src/app/(main)/teams/[id]/websites/page.tsx rename to src/app/(main)/teams/[teamId]/websites/page.tsx index aed17d84..1218c620 100644 --- a/src/app/(main)/teams/[id]/websites/page.tsx +++ b/src/app/(main)/teams/[teamId]/websites/page.tsx @@ -1,11 +1,11 @@ import WebsitesDataTable from 'app/(main)/settings/websites/WebsitesDataTable'; import WebsitesHeader from 'app/(main)/settings/websites/WebsitesHeader'; -export default function TeamWebsitesPage({ params: { id } }: { params: { id: string } }) { +export default function TeamWebsitesPage({ params: { teamId } }: { params: { teamId: string } }) { return ( <> - - + + ); } diff --git a/src/app/(main)/websites/[id]/WebsiteChart.module.css b/src/app/(main)/websites/[websiteId]/WebsiteChart.module.css similarity index 100% rename from src/app/(main)/websites/[id]/WebsiteChart.module.css rename to src/app/(main)/websites/[websiteId]/WebsiteChart.module.css diff --git a/src/app/(main)/websites/[id]/WebsiteChart.tsx b/src/app/(main)/websites/[websiteId]/WebsiteChart.tsx similarity index 100% rename from src/app/(main)/websites/[id]/WebsiteChart.tsx rename to src/app/(main)/websites/[websiteId]/WebsiteChart.tsx diff --git a/src/app/(main)/websites/[id]/WebsiteChartList.tsx b/src/app/(main)/websites/[websiteId]/WebsiteChartList.tsx similarity index 100% rename from src/app/(main)/websites/[id]/WebsiteChartList.tsx rename to src/app/(main)/websites/[websiteId]/WebsiteChartList.tsx diff --git a/src/app/(main)/websites/[id]/WebsiteContext.tsx b/src/app/(main)/websites/[websiteId]/WebsiteContext.tsx similarity index 100% rename from src/app/(main)/websites/[id]/WebsiteContext.tsx rename to src/app/(main)/websites/[websiteId]/WebsiteContext.tsx diff --git a/src/app/(main)/websites/[id]/WebsiteDetails.tsx b/src/app/(main)/websites/[websiteId]/WebsiteDetails.tsx similarity index 100% rename from src/app/(main)/websites/[id]/WebsiteDetails.tsx rename to src/app/(main)/websites/[websiteId]/WebsiteDetails.tsx diff --git a/src/app/(main)/websites/[id]/WebsiteExpandedView.module.css b/src/app/(main)/websites/[websiteId]/WebsiteExpandedView.module.css similarity index 100% rename from src/app/(main)/websites/[id]/WebsiteExpandedView.module.css rename to src/app/(main)/websites/[websiteId]/WebsiteExpandedView.module.css diff --git a/src/app/(main)/websites/[id]/WebsiteExpandedView.tsx b/src/app/(main)/websites/[websiteId]/WebsiteExpandedView.tsx similarity index 100% rename from src/app/(main)/websites/[id]/WebsiteExpandedView.tsx rename to src/app/(main)/websites/[websiteId]/WebsiteExpandedView.tsx diff --git a/src/app/(main)/websites/[id]/WebsiteFilterButton.tsx b/src/app/(main)/websites/[websiteId]/WebsiteFilterButton.tsx similarity index 93% rename from src/app/(main)/websites/[id]/WebsiteFilterButton.tsx rename to src/app/(main)/websites/[websiteId]/WebsiteFilterButton.tsx index 6a02cd47..c06cff45 100644 --- a/src/app/(main)/websites/[id]/WebsiteFilterButton.tsx +++ b/src/app/(main)/websites/[websiteId]/WebsiteFilterButton.tsx @@ -1,6 +1,6 @@ import { Button, Icon, Icons, Popup, PopupTrigger, Text } from 'react-basics'; -import PopupForm from 'app/(main)/reports/[id]/PopupForm'; -import FilterSelectForm from 'app/(main)/reports/[id]/FilterSelectForm'; +import PopupForm from '../../reports/[reportId]/PopupForm'; +import FilterSelectForm from '../../reports/[reportId]/FilterSelectForm'; import { useMessages, useNavigation } from 'components/hooks'; export function WebsiteFilterButton({ diff --git a/src/app/(main)/websites/[id]/WebsiteHeader.module.css b/src/app/(main)/websites/[websiteId]/WebsiteHeader.module.css similarity index 100% rename from src/app/(main)/websites/[id]/WebsiteHeader.module.css rename to src/app/(main)/websites/[websiteId]/WebsiteHeader.module.css diff --git a/src/app/(main)/websites/[id]/WebsiteHeader.tsx b/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx similarity index 100% rename from src/app/(main)/websites/[id]/WebsiteHeader.tsx rename to src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx diff --git a/src/app/(main)/websites/[id]/WebsiteMetricsBar.module.css b/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.module.css similarity index 100% rename from src/app/(main)/websites/[id]/WebsiteMetricsBar.module.css rename to src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.module.css diff --git a/src/app/(main)/websites/[id]/WebsiteMetricsBar.tsx b/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx similarity index 100% rename from src/app/(main)/websites/[id]/WebsiteMetricsBar.tsx rename to src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx diff --git a/src/app/(main)/websites/[id]/WebsiteTableView.tsx b/src/app/(main)/websites/[websiteId]/WebsiteTableView.tsx similarity index 100% rename from src/app/(main)/websites/[id]/WebsiteTableView.tsx rename to src/app/(main)/websites/[websiteId]/WebsiteTableView.tsx diff --git a/src/app/(main)/websites/[id]/event-data/EventDataMetricsBar.module.css b/src/app/(main)/websites/[websiteId]/event-data/EventDataMetricsBar.module.css similarity index 100% rename from src/app/(main)/websites/[id]/event-data/EventDataMetricsBar.module.css rename to src/app/(main)/websites/[websiteId]/event-data/EventDataMetricsBar.module.css diff --git a/src/app/(main)/websites/[id]/event-data/EventDataMetricsBar.tsx b/src/app/(main)/websites/[websiteId]/event-data/EventDataMetricsBar.tsx similarity index 100% rename from src/app/(main)/websites/[id]/event-data/EventDataMetricsBar.tsx rename to src/app/(main)/websites/[websiteId]/event-data/EventDataMetricsBar.tsx diff --git a/src/app/(main)/websites/[id]/event-data/EventDataTable.tsx b/src/app/(main)/websites/[websiteId]/event-data/EventDataTable.tsx similarity index 100% rename from src/app/(main)/websites/[id]/event-data/EventDataTable.tsx rename to src/app/(main)/websites/[websiteId]/event-data/EventDataTable.tsx diff --git a/src/app/(main)/websites/[id]/event-data/EventDataValueTable.tsx b/src/app/(main)/websites/[websiteId]/event-data/EventDataValueTable.tsx similarity index 100% rename from src/app/(main)/websites/[id]/event-data/EventDataValueTable.tsx rename to src/app/(main)/websites/[websiteId]/event-data/EventDataValueTable.tsx diff --git a/src/app/(main)/websites/[id]/event-data/WebsiteEventData.module.css b/src/app/(main)/websites/[websiteId]/event-data/WebsiteEventData.module.css similarity index 100% rename from src/app/(main)/websites/[id]/event-data/WebsiteEventData.module.css rename to src/app/(main)/websites/[websiteId]/event-data/WebsiteEventData.module.css diff --git a/src/app/(main)/websites/[id]/event-data/WebsiteEventData.tsx b/src/app/(main)/websites/[websiteId]/event-data/WebsiteEventData.tsx similarity index 100% rename from src/app/(main)/websites/[id]/event-data/WebsiteEventData.tsx rename to src/app/(main)/websites/[websiteId]/event-data/WebsiteEventData.tsx diff --git a/src/app/(main)/websites/[id]/event-data/page.tsx b/src/app/(main)/websites/[websiteId]/event-data/page.tsx similarity index 100% rename from src/app/(main)/websites/[id]/event-data/page.tsx rename to src/app/(main)/websites/[websiteId]/event-data/page.tsx diff --git a/src/app/(main)/websites/[id]/page.tsx b/src/app/(main)/websites/[websiteId]/page.tsx similarity index 100% rename from src/app/(main)/websites/[id]/page.tsx rename to src/app/(main)/websites/[websiteId]/page.tsx diff --git a/src/app/(main)/websites/[id]/realtime/Realtime.module.css b/src/app/(main)/websites/[websiteId]/realtime/Realtime.module.css similarity index 100% rename from src/app/(main)/websites/[id]/realtime/Realtime.module.css rename to src/app/(main)/websites/[websiteId]/realtime/Realtime.module.css diff --git a/src/app/(main)/websites/[id]/realtime/Realtime.tsx b/src/app/(main)/websites/[websiteId]/realtime/Realtime.tsx similarity index 100% rename from src/app/(main)/websites/[id]/realtime/Realtime.tsx rename to src/app/(main)/websites/[websiteId]/realtime/Realtime.tsx diff --git a/src/app/(main)/websites/[id]/realtime/RealtimeCountries.module.css b/src/app/(main)/websites/[websiteId]/realtime/RealtimeCountries.module.css similarity index 100% rename from src/app/(main)/websites/[id]/realtime/RealtimeCountries.module.css rename to src/app/(main)/websites/[websiteId]/realtime/RealtimeCountries.module.css diff --git a/src/app/(main)/websites/[id]/realtime/RealtimeCountries.tsx b/src/app/(main)/websites/[websiteId]/realtime/RealtimeCountries.tsx similarity index 100% rename from src/app/(main)/websites/[id]/realtime/RealtimeCountries.tsx rename to src/app/(main)/websites/[websiteId]/realtime/RealtimeCountries.tsx diff --git a/src/app/(main)/websites/[id]/realtime/RealtimeHeader.module.css b/src/app/(main)/websites/[websiteId]/realtime/RealtimeHeader.module.css similarity index 100% rename from src/app/(main)/websites/[id]/realtime/RealtimeHeader.module.css rename to src/app/(main)/websites/[websiteId]/realtime/RealtimeHeader.module.css diff --git a/src/app/(main)/websites/[id]/realtime/RealtimeHeader.tsx b/src/app/(main)/websites/[websiteId]/realtime/RealtimeHeader.tsx similarity index 100% rename from src/app/(main)/websites/[id]/realtime/RealtimeHeader.tsx rename to src/app/(main)/websites/[websiteId]/realtime/RealtimeHeader.tsx diff --git a/src/app/(main)/websites/[id]/realtime/RealtimeHome.tsx b/src/app/(main)/websites/[websiteId]/realtime/RealtimeHome.tsx similarity index 100% rename from src/app/(main)/websites/[id]/realtime/RealtimeHome.tsx rename to src/app/(main)/websites/[websiteId]/realtime/RealtimeHome.tsx diff --git a/src/app/(main)/websites/[id]/realtime/RealtimeLog.module.css b/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.module.css similarity index 100% rename from src/app/(main)/websites/[id]/realtime/RealtimeLog.module.css rename to src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.module.css diff --git a/src/app/(main)/websites/[id]/realtime/RealtimeLog.tsx b/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx similarity index 100% rename from src/app/(main)/websites/[id]/realtime/RealtimeLog.tsx rename to src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx diff --git a/src/app/(main)/websites/[id]/realtime/RealtimeUrls.tsx b/src/app/(main)/websites/[websiteId]/realtime/RealtimeUrls.tsx similarity index 100% rename from src/app/(main)/websites/[id]/realtime/RealtimeUrls.tsx rename to src/app/(main)/websites/[websiteId]/realtime/RealtimeUrls.tsx diff --git a/src/app/(main)/websites/[id]/realtime/page.tsx b/src/app/(main)/websites/[websiteId]/realtime/page.tsx similarity index 100% rename from src/app/(main)/websites/[id]/realtime/page.tsx rename to src/app/(main)/websites/[websiteId]/realtime/page.tsx diff --git a/src/app/(main)/websites/[id]/reports/WebsiteReports.tsx b/src/app/(main)/websites/[websiteId]/reports/WebsiteReports.tsx similarity index 100% rename from src/app/(main)/websites/[id]/reports/WebsiteReports.tsx rename to src/app/(main)/websites/[websiteId]/reports/WebsiteReports.tsx diff --git a/src/app/(main)/websites/[id]/reports/page.tsx b/src/app/(main)/websites/[websiteId]/reports/page.tsx similarity index 100% rename from src/app/(main)/websites/[id]/reports/page.tsx rename to src/app/(main)/websites/[websiteId]/reports/page.tsx diff --git a/src/app/share/[...id]/Footer.module.css b/src/app/share/[...shareId]/Footer.module.css similarity index 100% rename from src/app/share/[...id]/Footer.module.css rename to src/app/share/[...shareId]/Footer.module.css diff --git a/src/app/share/[...id]/Footer.tsx b/src/app/share/[...shareId]/Footer.tsx similarity index 100% rename from src/app/share/[...id]/Footer.tsx rename to src/app/share/[...shareId]/Footer.tsx diff --git a/src/app/share/[...id]/Header.module.css b/src/app/share/[...shareId]/Header.module.css similarity index 100% rename from src/app/share/[...id]/Header.module.css rename to src/app/share/[...shareId]/Header.module.css diff --git a/src/app/share/[...id]/Header.tsx b/src/app/share/[...shareId]/Header.tsx similarity index 100% rename from src/app/share/[...id]/Header.tsx rename to src/app/share/[...shareId]/Header.tsx diff --git a/src/app/share/[...id]/Share.module.css b/src/app/share/[...shareId]/Share.module.css similarity index 100% rename from src/app/share/[...id]/Share.module.css rename to src/app/share/[...shareId]/Share.module.css diff --git a/src/app/share/[...id]/Share.tsx b/src/app/share/[...shareId]/Share.tsx similarity index 87% rename from src/app/share/[...id]/Share.tsx rename to src/app/share/[...shareId]/Share.tsx index 174f1e44..d8b83fe7 100644 --- a/src/app/share/[...id]/Share.tsx +++ b/src/app/share/[...shareId]/Share.tsx @@ -1,5 +1,5 @@ 'use client'; -import WebsiteDetails from 'app/(main)/websites/[id]/WebsiteDetails'; +import WebsiteDetails from '../../(main)/websites/[websiteId]/WebsiteDetails'; import { useShareToken } from 'components/hooks'; import styles from './Share.module.css'; import Page from 'components/layout/Page'; diff --git a/src/app/share/[...id]/page.tsx b/src/app/share/[...shareId]/page.tsx similarity index 56% rename from src/app/share/[...id]/page.tsx rename to src/app/share/[...shareId]/page.tsx index 2a69f406..5a0b2822 100644 --- a/src/app/share/[...id]/page.tsx +++ b/src/app/share/[...shareId]/page.tsx @@ -1,8 +1,8 @@ import Share from './Share'; import { Metadata } from 'next'; -export default function ({ params: { id } }) { - return ; +export default function ({ params: { shareId } }) { + return ; } export const metadata: Metadata = { diff --git a/src/index.ts b/src/index.ts index 8bea579e..abd00fbf 100644 --- a/src/index.ts +++ b/src/index.ts @@ -19,14 +19,14 @@ export * from 'components/hooks/useSticky'; export * from 'components/hooks/useTheme'; export * from 'components/hooks/useTimezone'; -export * from 'app/(main)/settings/teams/[id]/TeamEditForm'; -export * from 'app/(main)/settings/teams/[id]/TeamMemberRemoveButton'; -export * from 'app/(main)/settings/teams/[id]/TeamMembers'; -export * from 'app/(main)/settings/teams/[id]/TeamMembersTable'; -export * from 'app/(main)/settings/teams/[id]/TeamSettings'; -export * from 'app/(main)/settings/teams/[id]/TeamWebsiteRemoveButton'; -export * from 'app/(main)/settings/teams/[id]/TeamWebsites'; -export * from 'app/(main)/settings/teams/[id]/TeamWebsitesTable'; +export * from './app/(main)/settings/teams/[teamId]/TeamEditForm'; +export * from './app/(main)/settings/teams/[teamId]/TeamMemberRemoveButton'; +export * from './app/(main)/settings/teams/[teamId]/TeamMembers'; +export * from './app/(main)/settings/teams/[teamId]/TeamMembersTable'; +export * from './app/(main)/settings/teams/[teamId]/TeamSettings'; +export * from './app/(main)/settings/teams/[teamId]/TeamWebsiteRemoveButton'; +export * from './app/(main)/settings/teams/[teamId]/TeamWebsites'; +export * from './app/(main)/settings/teams/[teamId]/TeamWebsitesTable'; export * from 'app/(main)/settings/teams/TeamAddForm'; export * from 'app/(main)/settings/teams/TeamDeleteForm'; export * from 'app/(main)/settings/teams/TeamsHeader'; @@ -36,11 +36,11 @@ export * from 'app/(main)/settings/teams/TeamsDataTable'; export * from 'app/(main)/settings/teams/TeamsTable'; export * from 'app/(main)/settings/teams/WebsiteTags'; -export * from 'app/(main)/settings/websites/[id]/ShareUrl'; -export * from 'app/(main)/settings/websites/[id]/TrackingCode'; -export * from 'app/(main)/settings/websites/[id]/WebsiteDeleteForm'; -export * from 'app/(main)/settings/websites/[id]/WebsiteEditForm'; -export * from 'app/(main)/settings/websites/[id]/WebsiteResetForm'; +export * from './app/(main)/settings/websites/[websiteId]/ShareUrl'; +export * from './app/(main)/settings/websites/[websiteId]/TrackingCode'; +export * from './app/(main)/settings/websites/[websiteId]/WebsiteDeleteForm'; +export * from './app/(main)/settings/websites/[websiteId]/WebsiteEditForm'; +export * from './app/(main)/settings/websites/[websiteId]/WebsiteResetForm'; export * from 'app/(main)/settings/websites/WebsiteAddForm'; export * from 'app/(main)/settings/websites/WebsitesHeader';