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
Renamed (app) folder to (main).
Mike Caoc99045923890
diff --git a/src/app/(app)/NavBar.js b/src/app/(main)/NavBar.jssimilarity index 100%rename from src/app/(app)/NavBar.jsrename to src/app/(main)/NavBar.jsdiff --git a/src/app/(app)/NavBar.module.css b/src/app/(main)/NavBar.module.csssimilarity index 100%rename from src/app/(app)/NavBar.module.cssrename to src/app/(main)/NavBar.module.cssdiff --git a/src/app/(app)/Shell.tsx b/src/app/(main)/Shell.tsxsimilarity index 100%rename from src/app/(app)/Shell.tsxrename to src/app/(main)/Shell.tsxdiff --git a/src/app/(app)/console/TestConsole.js b/src/app/(main)/console/TestConsole.jssimilarity index 98%rename from src/app/(app)/console/TestConsole.jsrename to src/app/(main)/console/TestConsole.jsindex 82edd1911..1ae3eaf1a 100644--- a/src/app/(app)/console/TestConsole.js+++ b/src/app/(main)/console/TestConsole.js@@ -3,7 +3,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 '../websites/[id]/WebsiteChart';+import WebsiteChart from '../../(main)/websites/[id]/WebsiteChart';import useApi from 'components/hooks/useApi';import Head from 'next/head';import Link from 'next/link';diff --git a/src/app/(app)/console/TestConsole.module.css b/src/app/(main)/console/TestConsole.module.csssimilarity index 100%rename from src/app/(app)/console/TestConsole.module.cssrename to src/app/(main)/console/TestConsole.module.cssdiff --git a/src/app/(app)/console/[[...id]]/page.tsx b/src/app/(main)/console/[[...id]]/page.tsxsimilarity index 100%rename from src/app/(app)/console/[[...id]]/page.tsxrename to src/app/(main)/console/[[...id]]/page.tsxdiff --git a/src/app/(app)/dashboard/Dashboard.js b/src/app/(main)/dashboard/Dashboard.jssimilarity index 90%rename from src/app/(app)/dashboard/Dashboard.jsrename to src/app/(main)/dashboard/Dashboard.jsindex 6520323e4..5fb65f238 100644--- a/src/app/(app)/dashboard/Dashboard.js+++ b/src/app/(main)/dashboard/Dashboard.js@@ -3,9 +3,9 @@ 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 '../websites/[id]/WebsiteChartList';-import DashboardSettingsButton from 'app/(app)/dashboard/DashboardSettingsButton';-import DashboardEdit from 'app/(app)/dashboard/DashboardEdit';+import WebsiteChartList from '../../(main)/websites/[id]/WebsiteChartList';+import DashboardSettingsButton from 'app/(main)/dashboard/DashboardSettingsButton';+import DashboardEdit from 'app/(main)/dashboard/DashboardEdit';import EmptyPlaceholder from 'components/common/EmptyPlaceholder';import useApi from 'components/hooks/useApi';import useDashboard from 'store/dashboard';diff --git a/src/app/(app)/dashboard/DashboardEdit.js b/src/app/(main)/dashboard/DashboardEdit.jssimilarity index 100%rename from src/app/(app)/dashboard/DashboardEdit.jsrename to src/app/(main)/dashboard/DashboardEdit.jsdiff --git a/src/app/(app)/dashboard/DashboardEdit.module.css b/src/app/(main)/dashboard/DashboardEdit.module.csssimilarity index 100%rename from src/app/(app)/dashboard/DashboardEdit.module.cssrename to src/app/(main)/dashboard/DashboardEdit.module.cssdiff --git a/src/app/(app)/dashboard/DashboardSettingsButton.js b/src/app/(main)/dashboard/DashboardSettingsButton.jssimilarity index 100%rename from src/app/(app)/dashboard/DashboardSettingsButton.jsrename to src/app/(main)/dashboard/DashboardSettingsButton.jsdiff --git a/src/app/(app)/dashboard/DashboardSettingsButton.module.css b/src/app/(main)/dashboard/DashboardSettingsButton.module.csssimilarity index 100%rename from src/app/(app)/dashboard/DashboardSettingsButton.module.cssrename to src/app/(main)/dashboard/DashboardSettingsButton.module.cssdiff --git a/src/app/(app)/dashboard/page.tsx b/src/app/(main)/dashboard/page.tsxsimilarity index 75%rename from src/app/(app)/dashboard/page.tsxrename to src/app/(main)/dashboard/page.tsxindex 7e7c095c5..91cc9c6e0 100644--- a/src/app/(app)/dashboard/page.tsx+++ b/src/app/(main)/dashboard/page.tsx@@ -1,4 +1,4 @@-import Dashboard from 'app/(app)/dashboard/Dashboard';+import Dashboard from 'app/(main)/dashboard/Dashboard';import { Metadata } from 'next';export default function DashboardPage() {diff --git a/src/app/(app)/layout.module.css b/src/app/(main)/layout.module.csssimilarity index 100%rename from src/app/(app)/layout.module.cssrename to src/app/(main)/layout.module.cssdiff --git a/src/app/(app)/layout.tsx b/src/app/(main)/layout.tsxsimilarity index 100%rename from src/app/(app)/layout.tsxrename to src/app/(main)/layout.tsxdiff --git a/src/app/(app)/reports/BaseParameters.js b/src/app/(main)/reports/BaseParameters.jssimilarity index 100%rename from src/app/(app)/reports/BaseParameters.jsrename to src/app/(main)/reports/BaseParameters.jsdiff --git a/src/app/(app)/reports/FieldAddForm.js b/src/app/(main)/reports/FieldAddForm.jssimilarity index 100%rename from src/app/(app)/reports/FieldAddForm.jsrename to src/app/(main)/reports/FieldAddForm.jsdiff --git a/src/app/(app)/reports/FieldAddForm.module.css b/src/app/(main)/reports/FieldAddForm.module.csssimilarity index 100%rename from src/app/(app)/reports/FieldAddForm.module.cssrename to src/app/(main)/reports/FieldAddForm.module.cssdiff --git a/src/app/(app)/reports/FieldAggregateForm.js b/src/app/(main)/reports/FieldAggregateForm.jssimilarity index 100%rename from src/app/(app)/reports/FieldAggregateForm.jsrename to src/app/(main)/reports/FieldAggregateForm.jsdiff --git a/src/app/(app)/reports/FieldFilterForm.js b/src/app/(main)/reports/FieldFilterForm.jssimilarity index 100%rename from src/app/(app)/reports/FieldFilterForm.jsrename to src/app/(main)/reports/FieldFilterForm.jsdiff --git a/src/app/(app)/reports/FieldFilterForm.module.css b/src/app/(main)/reports/FieldFilterForm.module.csssimilarity index 100%rename from src/app/(app)/reports/FieldFilterForm.module.cssrename to src/app/(main)/reports/FieldFilterForm.module.cssdiff --git a/src/app/(app)/reports/FieldSelectForm.js b/src/app/(main)/reports/FieldSelectForm.jssimilarity index 100%rename from src/app/(app)/reports/FieldSelectForm.jsrename to src/app/(main)/reports/FieldSelectForm.jsdiff --git a/src/app/(app)/reports/FieldSelectForm.module.css b/src/app/(main)/reports/FieldSelectForm.module.csssimilarity index 100%rename from src/app/(app)/reports/FieldSelectForm.module.cssrename to src/app/(main)/reports/FieldSelectForm.module.cssdiff --git a/src/app/(app)/reports/FilterSelectForm.js b/src/app/(main)/reports/FilterSelectForm.jssimilarity index 100%rename from src/app/(app)/reports/FilterSelectForm.jsrename to src/app/(main)/reports/FilterSelectForm.jsdiff --git a/src/app/(app)/reports/ParameterList.js b/src/app/(main)/reports/ParameterList.jssimilarity index 100%rename from src/app/(app)/reports/ParameterList.jsrename to src/app/(main)/reports/ParameterList.jsdiff --git a/src/app/(app)/reports/ParameterList.module.css b/src/app/(main)/reports/ParameterList.module.csssimilarity index 100%rename from src/app/(app)/reports/ParameterList.module.cssrename to src/app/(main)/reports/ParameterList.module.cssdiff --git a/src/app/(app)/reports/PopupForm.js b/src/app/(main)/reports/PopupForm.jssimilarity index 100%rename from src/app/(app)/reports/PopupForm.jsrename to src/app/(main)/reports/PopupForm.jsdiff --git a/src/app/(app)/reports/PopupForm.module.css b/src/app/(main)/reports/PopupForm.module.csssimilarity index 100%rename from src/app/(app)/reports/PopupForm.module.cssrename to src/app/(main)/reports/PopupForm.module.cssdiff --git a/src/app/(app)/reports/Report.js b/src/app/(main)/reports/Report.jssimilarity index 100%rename from src/app/(app)/reports/Report.jsrename to src/app/(main)/reports/Report.jsdiff --git a/src/app/(app)/reports/Report.module.css b/src/app/(main)/reports/Report.module.csssimilarity index 100%rename from src/app/(app)/reports/Report.module.cssrename to src/app/(main)/reports/Report.module.cssdiff --git a/src/app/(app)/reports/ReportBody.js b/src/app/(main)/reports/ReportBody.jssimilarity index 100%rename from src/app/(app)/reports/ReportBody.jsrename to src/app/(main)/reports/ReportBody.jsdiff --git a/src/app/(app)/reports/ReportHeader.js b/src/app/(main)/reports/ReportHeader.jssimilarity index 100%rename from src/app/(app)/reports/ReportHeader.jsrename to src/app/(main)/reports/ReportHeader.jsdiff --git a/src/app/(app)/reports/ReportHeader.module.css b/src/app/(main)/reports/ReportHeader.module.csssimilarity index 100%rename from src/app/(app)/reports/ReportHeader.module.cssrename to src/app/(main)/reports/ReportHeader.module.cssdiff --git a/src/app/(app)/reports/ReportMenu.js b/src/app/(main)/reports/ReportMenu.jssimilarity index 100%rename from src/app/(app)/reports/ReportMenu.jsrename to src/app/(main)/reports/ReportMenu.jsdiff --git a/src/app/(app)/reports/ReportsHeader.js b/src/app/(main)/reports/ReportsHeader.jssimilarity index 100%rename from src/app/(app)/reports/ReportsHeader.jsrename to src/app/(main)/reports/ReportsHeader.jsdiff --git a/src/app/(app)/reports/ReportsList.js b/src/app/(main)/reports/ReportsList.jssimilarity index 100%rename from src/app/(app)/reports/ReportsList.jsrename to src/app/(main)/reports/ReportsList.jsdiff --git a/src/app/(app)/reports/ReportsTable.js b/src/app/(main)/reports/ReportsTable.jssimilarity index 100%rename from src/app/(app)/reports/ReportsTable.jsrename to src/app/(main)/reports/ReportsTable.jsdiff --git a/src/app/(app)/reports/[id]/ReportDetails.js b/src/app/(main)/reports/[id]/ReportDetails.jssimilarity index 100%rename from src/app/(app)/reports/[id]/ReportDetails.jsrename to src/app/(main)/reports/[id]/ReportDetails.jsdiff --git a/src/app/(app)/reports/[id]/page.tsx b/src/app/(main)/reports/[id]/page.tsxsimilarity index 100%rename from src/app/(app)/reports/[id]/page.tsxrename to src/app/(main)/reports/[id]/page.tsxdiff --git a/src/app/(app)/reports/create/ReportTemplates.js b/src/app/(main)/reports/create/ReportTemplates.jssimilarity index 100%rename from src/app/(app)/reports/create/ReportTemplates.jsrename to src/app/(main)/reports/create/ReportTemplates.jsdiff --git a/src/app/(app)/reports/create/ReportTemplates.module.css b/src/app/(main)/reports/create/ReportTemplates.module.csssimilarity index 100%rename from src/app/(app)/reports/create/ReportTemplates.module.cssrename to src/app/(main)/reports/create/ReportTemplates.module.cssdiff --git a/src/app/(app)/reports/create/page.tsx b/src/app/(main)/reports/create/page.tsxsimilarity index 100%rename from src/app/(app)/reports/create/page.tsxrename to src/app/(main)/reports/create/page.tsxdiff --git a/src/app/(app)/reports/event-data/EventDataParameters.js b/src/app/(main)/reports/event-data/EventDataParameters.jssimilarity index 100%rename from src/app/(app)/reports/event-data/EventDataParameters.jsrename to src/app/(main)/reports/event-data/EventDataParameters.jsdiff --git a/src/app/(app)/reports/event-data/EventDataParameters.module.css b/src/app/(main)/reports/event-data/EventDataParameters.module.csssimilarity index 100%rename from src/app/(app)/reports/event-data/EventDataParameters.module.cssrename to src/app/(main)/reports/event-data/EventDataParameters.module.cssdiff --git a/src/app/(app)/reports/event-data/EventDataReport.js b/src/app/(main)/reports/event-data/EventDataReport.jssimilarity index 100%rename from src/app/(app)/reports/event-data/EventDataReport.jsrename to src/app/(main)/reports/event-data/EventDataReport.jsdiff --git a/src/app/(app)/reports/event-data/EventDataTable.js b/src/app/(main)/reports/event-data/EventDataTable.jssimilarity index 100%rename from src/app/(app)/reports/event-data/EventDataTable.jsrename to src/app/(main)/reports/event-data/EventDataTable.jsdiff --git a/src/app/(app)/reports/funnel/FunnelChart.js b/src/app/(main)/reports/funnel/FunnelChart.jssimilarity index 100%rename from src/app/(app)/reports/funnel/FunnelChart.jsrename to src/app/(main)/reports/funnel/FunnelChart.jsdiff --git a/src/app/(app)/reports/funnel/FunnelChart.module.css b/src/app/(main)/reports/funnel/FunnelChart.module.csssimilarity index 100%rename from src/app/(app)/reports/funnel/FunnelChart.module.cssrename to src/app/(main)/reports/funnel/FunnelChart.module.cssdiff --git a/src/app/(app)/reports/funnel/FunnelParameters.js b/src/app/(main)/reports/funnel/FunnelParameters.jssimilarity index 100%rename from src/app/(app)/reports/funnel/FunnelParameters.jsrename to src/app/(main)/reports/funnel/FunnelParameters.jsdiff --git a/src/app/(app)/reports/funnel/FunnelReport.js b/src/app/(main)/reports/funnel/FunnelReport.jssimilarity index 100%rename from src/app/(app)/reports/funnel/FunnelReport.jsrename to src/app/(main)/reports/funnel/FunnelReport.jsdiff --git a/src/app/(app)/reports/funnel/FunnelReport.module.css b/src/app/(main)/reports/funnel/FunnelReport.module.csssimilarity index 100%rename from src/app/(app)/reports/funnel/FunnelReport.module.cssrename to src/app/(main)/reports/funnel/FunnelReport.module.cssdiff --git a/src/app/(app)/reports/funnel/FunnelTable.js b/src/app/(main)/reports/funnel/FunnelTable.jssimilarity index 100%rename from src/app/(app)/reports/funnel/FunnelTable.jsrename to src/app/(main)/reports/funnel/FunnelTable.jsdiff --git a/src/app/(app)/reports/funnel/UrlAddForm.js b/src/app/(main)/reports/funnel/UrlAddForm.jssimilarity index 100%rename from src/app/(app)/reports/funnel/UrlAddForm.jsrename to src/app/(main)/reports/funnel/UrlAddForm.jsdiff --git a/src/app/(app)/reports/funnel/UrlAddForm.module.css b/src/app/(main)/reports/funnel/UrlAddForm.module.csssimilarity index 100%rename from src/app/(app)/reports/funnel/UrlAddForm.module.cssrename to src/app/(main)/reports/funnel/UrlAddForm.module.cssdiff --git a/src/app/(app)/reports/funnel/page.tsx b/src/app/(main)/reports/funnel/page.tsxsimilarity index 100%rename from src/app/(app)/reports/funnel/page.tsxrename to src/app/(main)/reports/funnel/page.tsxdiff --git a/src/app/(app)/reports/insights/InsightsParameters.js b/src/app/(main)/reports/insights/InsightsParameters.jssimilarity index 100%rename from src/app/(app)/reports/insights/InsightsParameters.jsrename to src/app/(main)/reports/insights/InsightsParameters.jsdiff --git a/src/app/(app)/reports/insights/InsightsParameters.module.css b/src/app/(main)/reports/insights/InsightsParameters.module.csssimilarity index 100%rename from src/app/(app)/reports/insights/InsightsParameters.module.cssrename to src/app/(main)/reports/insights/InsightsParameters.module.cssdiff --git a/src/app/(app)/reports/insights/InsightsReport.js b/src/app/(main)/reports/insights/InsightsReport.jssimilarity index 100%rename from src/app/(app)/reports/insights/InsightsReport.jsrename to src/app/(main)/reports/insights/InsightsReport.jsdiff --git a/src/app/(app)/reports/insights/InsightsTable.js b/src/app/(main)/reports/insights/InsightsTable.jssimilarity index 100%rename from src/app/(app)/reports/insights/InsightsTable.jsrename to src/app/(main)/reports/insights/InsightsTable.jsdiff --git a/src/app/(app)/reports/insights/page.tsx b/src/app/(main)/reports/insights/page.tsxsimilarity index 100%rename from src/app/(app)/reports/insights/page.tsxrename to src/app/(main)/reports/insights/page.tsxdiff --git a/src/app/(app)/reports/page.tsx b/src/app/(main)/reports/page.tsxsimilarity index 100%rename from src/app/(app)/reports/page.tsxrename to src/app/(main)/reports/page.tsxdiff --git a/src/app/(app)/reports/retention/RetentionParameters.js b/src/app/(main)/reports/retention/RetentionParameters.jssimilarity index 100%rename from src/app/(app)/reports/retention/RetentionParameters.jsrename to src/app/(main)/reports/retention/RetentionParameters.jsdiff --git a/src/app/(app)/reports/retention/RetentionReport.js b/src/app/(main)/reports/retention/RetentionReport.jssimilarity index 100%rename from src/app/(app)/reports/retention/RetentionReport.jsrename to src/app/(main)/reports/retention/RetentionReport.jsdiff --git a/src/app/(app)/reports/retention/RetentionReport.module.css b/src/app/(main)/reports/retention/RetentionReport.module.csssimilarity index 100%rename from src/app/(app)/reports/retention/RetentionReport.module.cssrename to src/app/(main)/reports/retention/RetentionReport.module.cssdiff --git a/src/app/(app)/reports/retention/RetentionTable.js b/src/app/(main)/reports/retention/RetentionTable.jssimilarity index 100%rename from src/app/(app)/reports/retention/RetentionTable.jsrename to src/app/(main)/reports/retention/RetentionTable.jsdiff --git a/src/app/(app)/reports/retention/RetentionTable.module.css b/src/app/(main)/reports/retention/RetentionTable.module.csssimilarity index 100%rename from src/app/(app)/reports/retention/RetentionTable.module.cssrename to src/app/(main)/reports/retention/RetentionTable.module.cssdiff --git a/src/app/(app)/reports/retention/page.js b/src/app/(main)/reports/retention/page.jssimilarity index 100%rename from src/app/(app)/reports/retention/page.jsrename to src/app/(main)/reports/retention/page.jsdiff --git a/src/app/(app)/settings/layout.module.css b/src/app/(main)/settings/layout.module.csssimilarity index 100%rename from src/app/(app)/settings/layout.module.cssrename to src/app/(main)/settings/layout.module.cssdiff --git a/src/app/(app)/settings/layout.tsx b/src/app/(main)/settings/layout.tsxsimilarity index 100%rename from src/app/(app)/settings/layout.tsxrename to src/app/(main)/settings/layout.tsxdiff --git a/src/app/(app)/settings/profile/DateRangeSetting.js b/src/app/(main)/settings/profile/DateRangeSetting.jssimilarity index 100%rename from src/app/(app)/settings/profile/DateRangeSetting.jsrename to src/app/(main)/settings/profile/DateRangeSetting.jsdiff --git a/src/app/(app)/settings/profile/LanguageSetting.js b/src/app/(main)/settings/profile/LanguageSetting.jssimilarity index 100%rename from src/app/(app)/settings/profile/LanguageSetting.jsrename to src/app/(main)/settings/profile/LanguageSetting.jsdiff --git a/src/app/(app)/settings/profile/PasswordChangeButton.js b/src/app/(main)/settings/profile/PasswordChangeButton.jssimilarity index 91%rename from src/app/(app)/settings/profile/PasswordChangeButton.jsrename to src/app/(main)/settings/profile/PasswordChangeButton.jsindex 692f6d6e5..29ec844a3 100644--- a/src/app/(app)/settings/profile/PasswordChangeButton.js+++ b/src/app/(main)/settings/profile/PasswordChangeButton.js@@ -1,5 +1,5 @@import { Button, Icon, Text, useToasts, ModalTrigger, Modal } from 'react-basics';-import PasswordEditForm from 'app/(app)/settings/profile/PasswordEditForm';+import PasswordEditForm from 'app/(main)/settings/profile/PasswordEditForm';import Icons from 'components/icons';import useMessages from 'components/hooks/useMessages';diff --git a/src/app/(app)/settings/profile/PasswordEditForm.js b/src/app/(main)/settings/profile/PasswordEditForm.jssimilarity index 100%rename from src/app/(app)/settings/profile/PasswordEditForm.jsrename to src/app/(main)/settings/profile/PasswordEditForm.jsdiff --git a/src/app/(app)/settings/profile/ProfileHeader.js b/src/app/(main)/settings/profile/ProfileHeader.jssimilarity index 100%rename from src/app/(app)/settings/profile/ProfileHeader.jsrename to src/app/(main)/settings/profile/ProfileHeader.jsdiff --git a/src/app/(app)/settings/profile/ProfileSettings.js b/src/app/(main)/settings/profile/ProfileSettings.jssimilarity index 84%rename from src/app/(app)/settings/profile/ProfileSettings.jsrename to src/app/(main)/settings/profile/ProfileSettings.jsindex 8510efbbd..89c6354c7 100644--- a/src/app/(app)/settings/profile/ProfileSettings.js+++ b/src/app/(main)/settings/profile/ProfileSettings.js@@ -1,9 +1,9 @@'use client';import { Form, FormRow } from 'react-basics';-import TimezoneSetting from 'app/(app)/settings/profile/TimezoneSetting';-import DateRangeSetting from 'app/(app)/settings/profile/DateRangeSetting';-import LanguageSetting from 'app/(app)/settings/profile/LanguageSetting';-import ThemeSetting from 'app/(app)/settings/profile/ThemeSetting';+import TimezoneSetting from 'app/(main)/settings/profile/TimezoneSetting';+import DateRangeSetting from 'app/(main)/settings/profile/DateRangeSetting';+import LanguageSetting from 'app/(main)/settings/profile/LanguageSetting';+import ThemeSetting from 'app/(main)/settings/profile/ThemeSetting';import PasswordChangeButton from './PasswordChangeButton';import useUser from 'components/hooks/useUser';import useMessages from 'components/hooks/useMessages';diff --git a/src/app/(app)/settings/profile/ThemeSetting.js b/src/app/(main)/settings/profile/ThemeSetting.jssimilarity index 100%rename from src/app/(app)/settings/profile/ThemeSetting.jsrename to src/app/(main)/settings/profile/ThemeSetting.jsdiff --git a/src/app/(app)/settings/profile/ThemeSetting.module.css b/src/app/(main)/settings/profile/ThemeSetting.module.csssimilarity index 100%rename from src/app/(app)/settings/profile/ThemeSetting.module.cssrename to src/app/(main)/settings/profile/ThemeSetting.module.cssdiff --git a/src/app/(app)/settings/profile/TimezoneSetting.js b/src/app/(main)/settings/profile/TimezoneSetting.jssimilarity index 100%rename from src/app/(app)/settings/profile/TimezoneSetting.jsrename to src/app/(main)/settings/profile/TimezoneSetting.jsdiff --git a/src/app/(app)/settings/profile/page.js b/src/app/(main)/settings/profile/page.jssimilarity index 100%rename from src/app/(app)/settings/profile/page.jsrename to src/app/(main)/settings/profile/page.jsdiff --git a/src/app/(app)/settings/teams/TeamAddForm.js b/src/app/(main)/settings/teams/TeamAddForm.jssimilarity index 100%rename from src/app/(app)/settings/teams/TeamAddForm.jsrename to src/app/(main)/settings/teams/TeamAddForm.jsdiff --git a/src/app/(app)/settings/teams/TeamDeleteButton.js b/src/app/(main)/settings/teams/TeamDeleteButton.jssimilarity index 100%rename from src/app/(app)/settings/teams/TeamDeleteButton.jsrename to src/app/(main)/settings/teams/TeamDeleteButton.jsdiff --git a/src/app/(app)/settings/teams/TeamDeleteForm.js b/src/app/(main)/settings/teams/TeamDeleteForm.jssimilarity index 100%rename from src/app/(app)/settings/teams/TeamDeleteForm.jsrename to src/app/(main)/settings/teams/TeamDeleteForm.jsdiff --git a/src/app/(app)/settings/teams/TeamJoinForm.js b/src/app/(main)/settings/teams/TeamJoinForm.jssimilarity index 100%rename from src/app/(app)/settings/teams/TeamJoinForm.jsrename to src/app/(main)/settings/teams/TeamJoinForm.jsdiff --git a/src/app/(app)/settings/teams/TeamLeaveButton.js b/src/app/(main)/settings/teams/TeamLeaveButton.jssimilarity index 100%rename from src/app/(app)/settings/teams/TeamLeaveButton.jsrename to src/app/(main)/settings/teams/TeamLeaveButton.jsdiff --git a/src/app/(app)/settings/teams/TeamLeaveForm.js b/src/app/(main)/settings/teams/TeamLeaveForm.jssimilarity index 100%rename from src/app/(app)/settings/teams/TeamLeaveForm.jsrename to src/app/(main)/settings/teams/TeamLeaveForm.jsdiff --git a/src/app/(app)/settings/teams/TeamWebsiteRemoveButton.js b/src/app/(main)/settings/teams/TeamWebsiteRemoveButton.jssimilarity index 100%rename from src/app/(app)/settings/teams/TeamWebsiteRemoveButton.jsrename to src/app/(main)/settings/teams/TeamWebsiteRemoveButton.jsdiff --git a/src/app/(app)/settings/teams/TeamsAddButton.js b/src/app/(main)/settings/teams/TeamsAddButton.jssimilarity index 100%rename from src/app/(app)/settings/teams/TeamsAddButton.jsrename to src/app/(main)/settings/teams/TeamsAddButton.jsdiff --git a/src/app/(app)/settings/teams/TeamsHeader.js b/src/app/(main)/settings/teams/TeamsHeader.jssimilarity index 100%rename from src/app/(app)/settings/teams/TeamsHeader.jsrename to src/app/(main)/settings/teams/TeamsHeader.jsdiff --git a/src/app/(app)/settings/teams/TeamsJoinButton.js b/src/app/(main)/settings/teams/TeamsJoinButton.jssimilarity index 100%rename from src/app/(app)/settings/teams/TeamsJoinButton.jsrename to src/app/(main)/settings/teams/TeamsJoinButton.jsdiff --git a/src/app/(app)/settings/teams/TeamsList.js b/src/app/(main)/settings/teams/TeamsList.jssimilarity index 89%rename from src/app/(app)/settings/teams/TeamsList.jsrename to src/app/(main)/settings/teams/TeamsList.jsindex 78e0c2992..1983ceae9 100644--- a/src/app/(app)/settings/teams/TeamsList.js+++ b/src/app/(main)/settings/teams/TeamsList.js@@ -1,6 +1,6 @@'use client';import DataTable from 'components/common/DataTable';-import TeamsTable from 'app/(app)/settings/teams/TeamsTable';+import TeamsTable from 'app/(main)/settings/teams/TeamsTable';import useApi from 'components/hooks/useApi';import useFilterQuery from 'components/hooks/useFilterQuery';diff --git a/src/app/(app)/settings/teams/TeamsTable.js b/src/app/(main)/settings/teams/TeamsTable.jssimilarity index 100%rename from src/app/(app)/settings/teams/TeamsTable.jsrename to src/app/(main)/settings/teams/TeamsTable.jsdiff --git a/src/app/(app)/settings/teams/WebsiteTags.js b/src/app/(main)/settings/teams/WebsiteTags.jssimilarity index 100%rename from src/app/(app)/settings/teams/WebsiteTags.jsrename to src/app/(main)/settings/teams/WebsiteTags.jsdiff --git a/src/app/(app)/settings/teams/WebsiteTags.module.css b/src/app/(main)/settings/teams/WebsiteTags.module.csssimilarity index 100%rename from src/app/(app)/settings/teams/WebsiteTags.module.cssrename to src/app/(main)/settings/teams/WebsiteTags.module.cssdiff --git a/src/app/(app)/settings/teams/[id]/TeamAddWebsiteForm.js b/src/app/(main)/settings/teams/[id]/TeamAddWebsiteForm.jssimilarity index 100%rename from src/app/(app)/settings/teams/[id]/TeamAddWebsiteForm.jsrename to src/app/(main)/settings/teams/[id]/TeamAddWebsiteForm.jsdiff --git a/src/app/(app)/settings/teams/[id]/TeamEditForm.js b/src/app/(main)/settings/teams/[id]/TeamEditForm.jssimilarity index 100%rename from src/app/(app)/settings/teams/[id]/TeamEditForm.jsrename to src/app/(main)/settings/teams/[id]/TeamEditForm.jsdiff --git a/src/app/(app)/settings/teams/[id]/TeamMemberRemoveButton.js b/src/app/(main)/settings/teams/[id]/TeamMemberRemoveButton.jssimilarity index 100%rename from src/app/(app)/settings/teams/[id]/TeamMemberRemoveButton.jsrename to src/app/(main)/settings/teams/[id]/TeamMemberRemoveButton.jsdiff --git a/src/app/(app)/settings/teams/[id]/TeamMembers.js b/src/app/(main)/settings/teams/[id]/TeamMembers.jssimilarity index 100%rename from src/app/(app)/settings/teams/[id]/TeamMembers.jsrename to src/app/(main)/settings/teams/[id]/TeamMembers.jsdiff --git a/src/app/(app)/settings/teams/[id]/TeamMembersTable.js b/src/app/(main)/settings/teams/[id]/TeamMembersTable.jssimilarity index 100%rename from src/app/(app)/settings/teams/[id]/TeamMembersTable.jsrename to src/app/(main)/settings/teams/[id]/TeamMembersTable.jsdiff --git a/src/app/(app)/settings/teams/[id]/TeamSettings.js b/src/app/(main)/settings/teams/[id]/TeamSettings.jssimilarity index 100%rename from src/app/(app)/settings/teams/[id]/TeamSettings.jsrename to src/app/(main)/settings/teams/[id]/TeamSettings.jsdiff --git a/src/app/(app)/settings/teams/[id]/TeamWebsites.js b/src/app/(main)/settings/teams/[id]/TeamWebsites.jssimilarity index 100%rename from src/app/(app)/settings/teams/[id]/TeamWebsites.jsrename to src/app/(main)/settings/teams/[id]/TeamWebsites.jsdiff --git a/src/app/(app)/settings/teams/[id]/TeamWebsitesTable.js b/src/app/(main)/settings/teams/[id]/TeamWebsitesTable.jssimilarity index 100%rename from src/app/(app)/settings/teams/[id]/TeamWebsitesTable.jsrename to src/app/(main)/settings/teams/[id]/TeamWebsitesTable.jsdiff --git a/src/app/(app)/settings/teams/[id]/page.js b/src/app/(main)/settings/teams/[id]/page.jssimilarity index 100%rename from src/app/(app)/settings/teams/[id]/page.jsrename to src/app/(main)/settings/teams/[id]/page.jsdiff --git a/src/app/(app)/settings/teams/page.js b/src/app/(main)/settings/teams/page.jssimilarity index 76%rename from src/app/(app)/settings/teams/page.jsrename to src/app/(main)/settings/teams/page.jsindex 606c45728..d2d0ff16b 100644--- a/src/app/(app)/settings/teams/page.js+++ b/src/app/(main)/settings/teams/page.js@@ -1,4 +1,4 @@-import TeamsList from 'app/(app)/settings/teams/TeamsList';+import TeamsList from 'app/(main)/settings/teams/TeamsList';import TeamsHeader from './TeamsHeader';export default function () {diff --git a/src/app/(app)/settings/users/UserAddButton.js b/src/app/(main)/settings/users/UserAddButton.jssimilarity index 100%rename from src/app/(app)/settings/users/UserAddButton.jsrename to src/app/(main)/settings/users/UserAddButton.jsdiff --git a/src/app/(app)/settings/users/UserAddForm.js b/src/app/(main)/settings/users/UserAddForm.jssimilarity index 100%rename from src/app/(app)/settings/users/UserAddForm.jsrename to src/app/(main)/settings/users/UserAddForm.jsdiff --git a/src/app/(app)/settings/users/UserDeleteButton.js b/src/app/(main)/settings/users/UserDeleteButton.jssimilarity index 100%rename from src/app/(app)/settings/users/UserDeleteButton.jsrename to src/app/(main)/settings/users/UserDeleteButton.jsdiff --git a/src/app/(app)/settings/users/UserDeleteForm.js b/src/app/(main)/settings/users/UserDeleteForm.jssimilarity index 100%rename from src/app/(app)/settings/users/UserDeleteForm.jsrename to src/app/(main)/settings/users/UserDeleteForm.jsdiff --git a/src/app/(app)/settings/users/UserEditForm.js b/src/app/(main)/settings/users/UserEditForm.jssimilarity index 100%rename from src/app/(app)/settings/users/UserEditForm.jsrename to src/app/(main)/settings/users/UserEditForm.jsdiff --git a/src/app/(app)/settings/users/UserWebsites.js b/src/app/(main)/settings/users/UserWebsites.jssimilarity index 93%rename from src/app/(app)/settings/users/UserWebsites.jsrename to src/app/(main)/settings/users/UserWebsites.jsindex f88ec78a3..333ba5d10 100644--- a/src/app/(app)/settings/users/UserWebsites.js+++ b/src/app/(main)/settings/users/UserWebsites.js@@ -1,6 +1,6 @@import Page from 'components/layout/Page';import useApi from 'components/hooks/useApi';-import WebsitesTable from 'app/(app)/settings/websites/WebsitesTable';+import WebsitesTable from 'app/(main)/settings/websites/WebsitesTable';import useApiFilter from 'components/hooks/useApiFilter';export function UserWebsites({ userId }) {diff --git a/src/app/(app)/settings/users/UsersHeader.js b/src/app/(main)/settings/users/UsersHeader.jssimilarity index 100%rename from src/app/(app)/settings/users/UsersHeader.jsrename to src/app/(main)/settings/users/UsersHeader.jsdiff --git a/src/app/(app)/settings/users/UsersList.js b/src/app/(main)/settings/users/UsersList.jssimilarity index 100%rename from src/app/(app)/settings/users/UsersList.jsrename to src/app/(main)/settings/users/UsersList.jsdiff --git a/src/app/(app)/settings/users/UsersTable.js b/src/app/(main)/settings/users/UsersTable.jssimilarity index 100%rename from src/app/(app)/settings/users/UsersTable.jsrename to src/app/(main)/settings/users/UsersTable.jsdiff --git a/src/app/(app)/settings/users/[id]/UserSettings.js b/src/app/(main)/settings/users/[id]/UserSettings.jssimilarity index 100%rename from src/app/(app)/settings/users/[id]/UserSettings.jsrename to src/app/(main)/settings/users/[id]/UserSettings.jsdiff --git a/src/app/(app)/settings/users/[id]/page.js b/src/app/(main)/settings/users/[id]/page.jssimilarity index 100%rename from src/app/(app)/settings/users/[id]/page.jsrename to src/app/(main)/settings/users/[id]/page.jsdiff --git a/src/app/(app)/settings/users/page.tsx b/src/app/(main)/settings/users/page.tsxsimilarity index 77%rename from src/app/(app)/settings/users/page.tsxrename to src/app/(main)/settings/users/page.tsxindex 25545083c..b0af9fbb6 100644--- a/src/app/(app)/settings/users/page.tsx+++ b/src/app/(main)/settings/users/page.tsx@@ -1,4 +1,4 @@-import UsersList from 'app/(app)/settings/users/UsersList';+import UsersList from 'app/(main)/settings/users/UsersList';import { Metadata } from 'next';export default function () {diff --git a/src/app/(app)/settings/websites/WebsiteAddButton.js b/src/app/(main)/settings/websites/WebsiteAddButton.jssimilarity index 100%rename from src/app/(app)/settings/websites/WebsiteAddButton.jsrename to src/app/(main)/settings/websites/WebsiteAddButton.jsdiff --git a/src/app/(app)/settings/websites/WebsiteAddForm.js b/src/app/(main)/settings/websites/WebsiteAddForm.jssimilarity index 100%rename from src/app/(app)/settings/websites/WebsiteAddForm.jsrename to src/app/(main)/settings/websites/WebsiteAddForm.jsdiff --git a/src/app/(app)/settings/websites/WebsiteSettings.js b/src/app/(main)/settings/websites/WebsiteSettings.jssimilarity index 100%rename from src/app/(app)/settings/websites/WebsiteSettings.jsrename to src/app/(main)/settings/websites/WebsiteSettings.jsdiff --git a/src/app/(app)/settings/websites/Websites.js b/src/app/(main)/settings/websites/Websites.jssimilarity index 93%rename from src/app/(app)/settings/websites/Websites.jsrename to src/app/(main)/settings/websites/Websites.jsindex 568050623..693d6780d 100644--- a/src/app/(app)/settings/websites/Websites.js+++ b/src/app/(main)/settings/websites/Websites.js@@ -1,5 +1,5 @@'use client';-import WebsitesTable from 'app/(app)/settings/websites/WebsitesTable';+import WebsitesTable from 'app/(main)/settings/websites/WebsitesTable';import useUser from 'components/hooks/useUser';import useApi from 'components/hooks/useApi';import DataTable from 'components/common/DataTable';diff --git a/src/app/(app)/settings/websites/Websites.module.css b/src/app/(main)/settings/websites/Websites.module.csssimilarity index 100%rename from src/app/(app)/settings/websites/Websites.module.cssrename to src/app/(main)/settings/websites/Websites.module.cssdiff --git a/src/app/(app)/settings/websites/WebsitesHeader.js b/src/app/(main)/settings/websites/WebsitesHeader.jssimilarity index 100%rename from src/app/(app)/settings/websites/WebsitesHeader.jsrename to src/app/(main)/settings/websites/WebsitesHeader.jsdiff --git a/src/app/(app)/settings/websites/WebsitesTable.js b/src/app/(main)/settings/websites/WebsitesTable.jssimilarity index 100%rename from src/app/(app)/settings/websites/WebsitesTable.jsrename to src/app/(main)/settings/websites/WebsitesTable.jsdiff --git a/src/app/(app)/settings/websites/WebsitesTable.module.css b/src/app/(main)/settings/websites/WebsitesTable.module.csssimilarity index 100%rename from src/app/(app)/settings/websites/WebsitesTable.module.cssrename to src/app/(main)/settings/websites/WebsitesTable.module.cssdiff --git a/src/app/(app)/settings/websites/[id]/ShareUrl.js b/src/app/(main)/settings/websites/[id]/ShareUrl.jssimilarity index 100%rename from src/app/(app)/settings/websites/[id]/ShareUrl.jsrename to src/app/(main)/settings/websites/[id]/ShareUrl.jsdiff --git a/src/app/(app)/settings/websites/[id]/TrackingCode.js b/src/app/(main)/settings/websites/[id]/TrackingCode.jssimilarity index 100%rename from src/app/(app)/settings/websites/[id]/TrackingCode.jsrename to src/app/(main)/settings/websites/[id]/TrackingCode.jsdiff --git a/src/app/(app)/settings/websites/[id]/WebsiteData.js b/src/app/(main)/settings/websites/[id]/WebsiteData.jssimilarity index 100%rename from src/app/(app)/settings/websites/[id]/WebsiteData.jsrename to src/app/(main)/settings/websites/[id]/WebsiteData.jsdiff --git a/src/app/(app)/settings/websites/[id]/WebsiteDeleteForm.js b/src/app/(main)/settings/websites/[id]/WebsiteDeleteForm.jssimilarity index 100%rename from src/app/(app)/settings/websites/[id]/WebsiteDeleteForm.jsrename to src/app/(main)/settings/websites/[id]/WebsiteDeleteForm.jsdiff --git a/src/app/(app)/settings/websites/[id]/WebsiteEditForm.js b/src/app/(main)/settings/websites/[id]/WebsiteEditForm.jssimilarity index 100%rename from src/app/(app)/settings/websites/[id]/WebsiteEditForm.jsrename to src/app/(main)/settings/websites/[id]/WebsiteEditForm.jsdiff --git a/src/app/(app)/settings/websites/[id]/WebsiteResetForm.js b/src/app/(main)/settings/websites/[id]/WebsiteResetForm.jssimilarity index 100%rename from src/app/(app)/settings/websites/[id]/WebsiteResetForm.jsrename to src/app/(main)/settings/websites/[id]/WebsiteResetForm.jsdiff --git a/src/app/(app)/settings/websites/[id]/page.js b/src/app/(main)/settings/websites/[id]/page.jssimilarity index 100%rename from src/app/(app)/settings/websites/[id]/page.jsrename to src/app/(main)/settings/websites/[id]/page.jsdiff --git a/src/app/(app)/settings/websites/page.js b/src/app/(main)/settings/websites/page.jssimilarity index 100%rename from src/app/(app)/settings/websites/page.jsrename to src/app/(main)/settings/websites/page.jsdiff --git a/src/app/(app)/websites/WebsiteTableView.js b/src/app/(main)/websites/WebsiteTableView.jssimilarity index 100%rename from src/app/(app)/websites/WebsiteTableView.jsrename to src/app/(main)/websites/WebsiteTableView.jsdiff --git a/src/app/(app)/websites/WebsitesBrowse.js b/src/app/(main)/websites/WebsitesBrowse.jssimilarity index 92%rename from src/app/(app)/websites/WebsitesBrowse.jsrename to src/app/(main)/websites/WebsitesBrowse.jsindex 96a25743d..8f2c5d516 100644--- a/src/app/(app)/websites/WebsitesBrowse.js+++ b/src/app/(main)/websites/WebsitesBrowse.js@@ -1,5 +1,5 @@'use client';-import WebsiteList from '../settings/websites/Websites';+import WebsiteList from '../../(main)/settings/websites/Websites';import { useMessages } from 'components/hooks';import { useState } from 'react';import { Item, Tabs } from 'react-basics';diff --git a/src/app/(app)/websites/[id]/WebsiteChart.js b/src/app/(main)/websites/[id]/WebsiteChart.jssimilarity index 100%rename from src/app/(app)/websites/[id]/WebsiteChart.jsrename to src/app/(main)/websites/[id]/WebsiteChart.jsdiff --git a/src/app/(app)/websites/[id]/WebsiteChart.module.css b/src/app/(main)/websites/[id]/WebsiteChart.module.csssimilarity index 100%rename from src/app/(app)/websites/[id]/WebsiteChart.module.cssrename to src/app/(main)/websites/[id]/WebsiteChart.module.cssdiff --git a/src/app/(app)/websites/[id]/WebsiteChartList.js b/src/app/(main)/websites/[id]/WebsiteChartList.jssimilarity index 100%rename from src/app/(app)/websites/[id]/WebsiteChartList.jsrename to src/app/(main)/websites/[id]/WebsiteChartList.jsdiff --git a/src/app/(app)/websites/[id]/WebsiteDetails.js b/src/app/(main)/websites/[id]/WebsiteDetails.jssimilarity index 100%rename from src/app/(app)/websites/[id]/WebsiteDetails.jsrename to src/app/(main)/websites/[id]/WebsiteDetails.jsdiff --git a/src/app/(app)/websites/[id]/WebsiteHeader.js b/src/app/(main)/websites/[id]/WebsiteHeader.jssimilarity index 100%rename from src/app/(app)/websites/[id]/WebsiteHeader.jsrename to src/app/(main)/websites/[id]/WebsiteHeader.jsdiff --git a/src/app/(app)/websites/[id]/WebsiteHeader.module.css b/src/app/(main)/websites/[id]/WebsiteHeader.module.csssimilarity index 100%rename from src/app/(app)/websites/[id]/WebsiteHeader.module.cssrename to src/app/(main)/websites/[id]/WebsiteHeader.module.cssdiff --git a/src/app/(app)/websites/[id]/WebsiteMenuView.js b/src/app/(main)/websites/[id]/WebsiteMenuView.jssimilarity index 100%rename from src/app/(app)/websites/[id]/WebsiteMenuView.jsrename to src/app/(main)/websites/[id]/WebsiteMenuView.jsdiff --git a/src/app/(app)/websites/[id]/WebsiteMenuView.module.css b/src/app/(main)/websites/[id]/WebsiteMenuView.module.csssimilarity index 100%rename from src/app/(app)/websites/[id]/WebsiteMenuView.module.cssrename to src/app/(main)/websites/[id]/WebsiteMenuView.module.cssdiff --git a/src/app/(app)/websites/[id]/WebsiteMetricsBar.js b/src/app/(main)/websites/[id]/WebsiteMetricsBar.jssimilarity index 97%rename from src/app/(app)/websites/[id]/WebsiteMetricsBar.jsrename to src/app/(main)/websites/[id]/WebsiteMetricsBar.jsindex b2aa8ca42..62f549b0c 100644--- a/src/app/(app)/websites/[id]/WebsiteMetricsBar.js+++ b/src/app/(main)/websites/[id]/WebsiteMetricsBar.js@@ -3,8 +3,8 @@ import { useApi, useDateRange, useMessages, useNavigation, useSticky } from 'comimport WebsiteDateFilter from 'components/input/WebsiteDateFilter';import MetricCard from 'components/metrics/MetricCard';import MetricsBar from 'components/metrics/MetricsBar';-import FilterSelectForm from '../../reports/FilterSelectForm';-import PopupForm from '../../reports/PopupForm';+import FilterSelectForm from '../../../(main)/reports/FilterSelectForm';+import PopupForm from '../../../(main)/reports/PopupForm';import { formatShortTime } from 'lib/format';import { Button, Icon, Icons, Popup, PopupTrigger } from 'react-basics';import styles from './WebsiteMetricsBar.module.css';diff --git a/src/app/(app)/websites/[id]/WebsiteMetricsBar.module.css b/src/app/(main)/websites/[id]/WebsiteMetricsBar.module.csssimilarity index 100%rename from src/app/(app)/websites/[id]/WebsiteMetricsBar.module.cssrename to src/app/(main)/websites/[id]/WebsiteMetricsBar.module.cssdiff --git a/src/app/(app)/websites/[id]/event-data/EventDataMetricsBar.js b/src/app/(main)/websites/[id]/event-data/EventDataMetricsBar.jssimilarity index 100%rename from src/app/(app)/websites/[id]/event-data/EventDataMetricsBar.jsrename to src/app/(main)/websites/[id]/event-data/EventDataMetricsBar.jsdiff --git a/src/app/(app)/websites/[id]/event-data/EventDataMetricsBar.module.css b/src/app/(main)/websites/[id]/event-data/EventDataMetricsBar.module.csssimilarity index 100%rename from src/app/(app)/websites/[id]/event-data/EventDataMetricsBar.module.cssrename to src/app/(main)/websites/[id]/event-data/EventDataMetricsBar.module.cssdiff --git a/src/app/(app)/websites/[id]/event-data/EventDataTable.js b/src/app/(main)/websites/[id]/event-data/EventDataTable.jssimilarity index 100%rename from src/app/(app)/websites/[id]/event-data/EventDataTable.jsrename to src/app/(main)/websites/[id]/event-data/EventDataTable.jsdiff --git a/src/app/(app)/websites/[id]/event-data/EventDataValueTable.js b/src/app/(main)/websites/[id]/event-data/EventDataValueTable.jssimilarity index 100%rename from src/app/(app)/websites/[id]/event-data/EventDataValueTable.jsrename to src/app/(main)/websites/[id]/event-data/EventDataValueTable.jsdiff --git a/src/app/(app)/websites/[id]/event-data/WebsiteEventData.js b/src/app/(main)/websites/[id]/event-data/WebsiteEventData.jssimilarity index 100%rename from src/app/(app)/websites/[id]/event-data/WebsiteEventData.jsrename to src/app/(main)/websites/[id]/event-data/WebsiteEventData.jsdiff --git a/src/app/(app)/websites/[id]/event-data/WebsiteEventData.module.css b/src/app/(main)/websites/[id]/event-data/WebsiteEventData.module.csssimilarity index 100%rename from src/app/(app)/websites/[id]/event-data/WebsiteEventData.module.cssrename to src/app/(main)/websites/[id]/event-data/WebsiteEventData.module.cssdiff --git a/src/app/(app)/websites/[id]/event-data/page.js b/src/app/(main)/websites/[id]/event-data/page.jssimilarity index 100%rename from src/app/(app)/websites/[id]/event-data/page.jsrename to src/app/(main)/websites/[id]/event-data/page.jsdiff --git a/src/app/(app)/websites/[id]/page.tsx b/src/app/(main)/websites/[id]/page.tsxsimilarity index 100%rename from src/app/(app)/websites/[id]/page.tsxrename to src/app/(main)/websites/[id]/page.tsxdiff --git a/src/app/(app)/websites/[id]/realtime/Realtime.js b/src/app/(main)/websites/[id]/realtime/Realtime.jssimilarity index 100%rename from src/app/(app)/websites/[id]/realtime/Realtime.jsrename to src/app/(main)/websites/[id]/realtime/Realtime.jsdiff --git a/src/app/(app)/websites/[id]/realtime/Realtime.module.css b/src/app/(main)/websites/[id]/realtime/Realtime.module.csssimilarity index 100%rename from src/app/(app)/websites/[id]/realtime/Realtime.module.cssrename to src/app/(main)/websites/[id]/realtime/Realtime.module.cssdiff --git a/src/app/(app)/websites/[id]/realtime/RealtimeCountries.js b/src/app/(main)/websites/[id]/realtime/RealtimeCountries.jssimilarity index 100%rename from src/app/(app)/websites/[id]/realtime/RealtimeCountries.jsrename to src/app/(main)/websites/[id]/realtime/RealtimeCountries.jsdiff --git a/src/app/(app)/websites/[id]/realtime/RealtimeCountries.module.css b/src/app/(main)/websites/[id]/realtime/RealtimeCountries.module.csssimilarity index 100%rename from src/app/(app)/websites/[id]/realtime/RealtimeCountries.module.cssrename to src/app/(main)/websites/[id]/realtime/RealtimeCountries.module.cssdiff --git a/src/app/(app)/websites/[id]/realtime/RealtimeHeader.js b/src/app/(main)/websites/[id]/realtime/RealtimeHeader.jssimilarity index 100%rename from src/app/(app)/websites/[id]/realtime/RealtimeHeader.jsrename to src/app/(main)/websites/[id]/realtime/RealtimeHeader.jsdiff --git a/src/app/(app)/websites/[id]/realtime/RealtimeHeader.module.css b/src/app/(main)/websites/[id]/realtime/RealtimeHeader.module.csssimilarity index 100%rename from src/app/(app)/websites/[id]/realtime/RealtimeHeader.module.cssrename to src/app/(main)/websites/[id]/realtime/RealtimeHeader.module.cssdiff --git a/src/app/(app)/websites/[id]/realtime/RealtimeHome.js b/src/app/(main)/websites/[id]/realtime/RealtimeHome.jssimilarity index 100%rename from src/app/(app)/websites/[id]/realtime/RealtimeHome.jsrename to src/app/(main)/websites/[id]/realtime/RealtimeHome.jsdiff --git a/src/app/(app)/websites/[id]/realtime/RealtimeLog.js b/src/app/(main)/websites/[id]/realtime/RealtimeLog.jssimilarity index 100%rename from src/app/(app)/websites/[id]/realtime/RealtimeLog.jsrename to src/app/(main)/websites/[id]/realtime/RealtimeLog.jsdiff --git a/src/app/(app)/websites/[id]/realtime/RealtimeLog.module.css b/src/app/(main)/websites/[id]/realtime/RealtimeLog.module.csssimilarity index 100%rename from src/app/(app)/websites/[id]/realtime/RealtimeLog.module.cssrename to src/app/(main)/websites/[id]/realtime/RealtimeLog.module.cssdiff --git a/src/app/(app)/websites/[id]/realtime/RealtimeUrls.js b/src/app/(main)/websites/[id]/realtime/RealtimeUrls.jssimilarity index 100%rename from src/app/(app)/websites/[id]/realtime/RealtimeUrls.jsrename to src/app/(main)/websites/[id]/realtime/RealtimeUrls.jsdiff --git a/src/app/(app)/websites/[id]/realtime/page.tsx b/src/app/(main)/websites/[id]/realtime/page.tsxsimilarity index 100%rename from src/app/(app)/websites/[id]/realtime/page.tsxrename to src/app/(main)/websites/[id]/realtime/page.tsxdiff --git a/src/app/(app)/websites/[id]/reports/WebsiteReports.js b/src/app/(main)/websites/[id]/reports/WebsiteReports.jssimilarity index 95%rename from src/app/(app)/websites/[id]/reports/WebsiteReports.jsrename to src/app/(main)/websites/[id]/reports/WebsiteReports.jsindex f5d9aca94..696543751 100644--- a/src/app/(app)/websites/[id]/reports/WebsiteReports.js+++ b/src/app/(main)/websites/[id]/reports/WebsiteReports.js@@ -1,7 +1,7 @@'use client';import Page from 'components/layout/Page';import Empty from 'components/common/Empty';-import ReportsTable from 'app/(app)/reports/ReportsTable';+import ReportsTable from '../../../../(main)/reports/ReportsTable';import { useMessages, useWebsiteReports } from 'components/hooks';import Link from 'next/link';import { Button, Flexbox, Icon, Icons, Text } from 'react-basics';diff --git a/src/app/(app)/websites/[id]/reports/page.tsx b/src/app/(main)/websites/[id]/reports/page.tsxsimilarity index 100%rename from src/app/(app)/websites/[id]/reports/page.tsxrename to src/app/(main)/websites/[id]/reports/page.tsxdiff --git a/src/app/(app)/websites/page.js b/src/app/(main)/websites/page.jssimilarity index 70%rename from src/app/(app)/websites/page.jsrename to src/app/(main)/websites/page.jsindex a30bc5834..07c82a506 100644--- a/src/app/(app)/websites/page.js+++ b/src/app/(main)/websites/page.js@@ -1,5 +1,5 @@'use client';-import WebsitesHeader from '../settings/websites/WebsitesHeader';+import WebsitesHeader from '../../(main)/settings/websites/WebsitesHeader';import WebsitesBrowse from './WebsitesBrowse';export default function WebsitesPage() {diff --git a/src/app/share/[...id]/Share.js b/src/app/share/[...id]/Share.jsindex 69d76178a..618f66b70 100644--- a/src/app/share/[...id]/Share.js+++ b/src/app/share/[...id]/Share.js@@ -1,5 +1,5 @@'use client';-import WebsiteDetails from 'app/(app)/websites/[id]/WebsiteDetails';+import WebsiteDetails from '../../(main)/websites/[id]/WebsiteDetails';import useShareToken from 'components/hooks/useShareToken';export default function ({ shareId }) {diff --git a/src/components/input/SettingsButton.js b/src/components/input/SettingsButton.jsindex 8c15c615b..46c725973 100644--- a/src/components/input/SettingsButton.js+++ b/src/components/input/SettingsButton.js@@ -1,6 +1,6 @@import { Button, Icon, PopupTrigger, Popup, Form, FormRow } from 'react-basics';-import TimezoneSetting from 'app/(app)/settings/profile/TimezoneSetting';-import DateRangeSetting from 'app/(app)/settings/profile/DateRangeSetting';+import TimezoneSetting from 'app/(main)/settings/profile/TimezoneSetting';+import DateRangeSetting from 'app/(main)/settings/profile/DateRangeSetting';import Icons from 'components/icons';import useMessages from 'components/hooks/useMessages';import styles from './SettingsButton.module.css';diff --git a/src/index.ts b/src/index.tsindex fed9d096f..b56051e96 100644--- a/src/index.ts+++ b/src/index.ts@@ -1,69 +1,3 @@-/*-export * from 'components/common/ConfirmDeleteForm';-export * from 'components/common/Empty';-export * from 'components/common/EmptyPlaceholder';-export * from 'components/common/ErrorBoundary';-export * from 'components/common/ErrorMessage';-export * from 'components/common/Favicon';-export * from 'components/common/FilterButtons';-export * from 'components/common/FilterLink';-export * from 'components/common/HamburgerButton';-export * from 'components/common/HoverTooltip';-export * from 'components/common/LinkButton';-export * from 'components/common/MobileMenu';-export * from 'components/common/Pager';-export * from 'components/common/UpdateNotice';-export * from 'components/common/WorldMap';--export * from 'components/hooks/useApi';-export * from 'components/hooks/useConfig';-export * from 'components/hooks/useCountryNames';-export * from 'components/hooks/useDateRange';-export * from 'components/hooks/useDocumentClick';-export * from 'components/hooks/useEscapeKey';-export * from 'components/hooks/useFilters';-export * from 'components/hooks/useForceUpdate';-export * from 'components/hooks/useFormat';-export * from 'components/hooks/useLanguageNames';-export * from 'components/hooks/useLocale';-export * from 'components/hooks/useMessages';-export * from 'components/hooks/usePageQuery';-export * from 'components/hooks/useReport';-export * from 'components/hooks/useReports';-export * from 'components/hooks/useRequireLogin';-export * from 'components/hooks/useShareToken';-export * from 'components/hooks/useSticky';-export * from 'components/hooks/useTheme';-export * from 'components/hooks/useTimezone';-export * from 'components/hooks/useUser';-export * from 'components/hooks/useWebsite';-export * from 'components/hooks/useWebsiteReports';--export * from 'components/input/DateFilter';-export * from 'components/input/LanguageButton';-export * from 'components/input/LogoutButton';-export * from 'components/input/MonthSelect';-export * from 'components/input/ProfileButton';-export * from 'components/input/RefreshButton';-export * from 'components/input/SettingsButton';-export * from 'components/input/ThemeButton';-export * from 'components/input/WebsiteDateFilter';-export * from 'components/input/WebsiteSelect';--export * from 'components/layout/AppLayout';-export * from 'components/layout/Footer';-export * from 'components/layout/Grid';-export * from 'components/layout/Header';-export * from 'components/layout/NavBar';-export * from 'components/layout/NavGroup';-export * from 'components/layout/Page';-export * from 'components/layout/PageHeader';-export * from 'components/layout/ReportsLayout';-export * from 'components/layout/SettingsLayout';-export * from 'components/layout/ShareLayout';-export * from 'components/layout/SideNav';-*/-export * from 'components/hooks/useApi';export * from 'components/hooks/useConfig';export * from 'components/hooks/useCountryNames';@@ -88,29 +22,29 @@ export * from 'components/hooks/useUser';export * from 'components/hooks/useWebsite';export * from 'components/hooks/useWebsiteReports';-export * from 'app/(app)/settings/teams/TeamAddForm';-export * from 'app/(app)/settings/teams/[id]/TeamAddWebsiteForm';-export * from 'app/(app)/settings/teams/TeamDeleteForm';-export * from 'app/(app)/settings/teams/[id]/TeamEditForm';-export * from 'app/(app)/settings/teams/TeamJoinForm';-export * from 'app/(app)/settings/teams/TeamLeaveForm';-export * from 'app/(app)/settings/teams/[id]/TeamMemberRemoveButton';-export * from 'app/(app)/settings/teams/[id]/TeamMembers';-export * from 'app/(app)/settings/teams/[id]/TeamMembersTable';-export * from 'app/(app)/settings/teams/[id]/TeamSettings';-export * from 'app/(app)/settings/teams/TeamsList';-export * from 'app/(app)/settings/teams/TeamsTable';-export * from 'app/(app)/settings/teams/TeamWebsiteRemoveButton';-export * from 'app/(app)/settings/teams/[id]/TeamWebsites';-export * from 'app/(app)/settings/teams/[id]/TeamWebsitesTable';-export * from 'app/(app)/settings/teams/WebsiteTags';+export * from 'app/(main)/settings/teams/TeamAddForm';+export * from 'app/(main)/settings/teams/[id]/TeamAddWebsiteForm';+export * from 'app/(main)/settings/teams/TeamDeleteForm';+export * from 'app/(main)/settings/teams/[id]/TeamEditForm';+export * from 'app/(main)/settings/teams/TeamJoinForm';+export * from 'app/(main)/settings/teams/TeamLeaveForm';+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/TeamsList';+export * from 'app/(main)/settings/teams/TeamsTable';+export * from 'app/(main)/settings/teams/TeamWebsiteRemoveButton';+export * from 'app/(main)/settings/teams/[id]/TeamWebsites';+export * from 'app/(main)/settings/teams/[id]/TeamWebsitesTable';+export * from 'app/(main)/settings/teams/WebsiteTags';-export * from 'app/(app)/settings/websites/[id]/ShareUrl';-export * from 'app/(app)/settings/websites/[id]/TrackingCode';-export * from 'app/(app)/settings/websites/WebsiteAddForm';-export * from 'app/(app)/settings/websites/[id]/WebsiteDeleteForm';-export * from 'app/(app)/settings/websites/[id]/WebsiteEditForm';-export * from 'app/(app)/settings/websites/[id]/WebsiteResetForm';-export * from 'app/(app)/settings/websites/WebsiteSettings';-export * from './app/(app)/settings/websites/Websites';-export * from 'app/(app)/settings/websites/WebsitesTable';+export * from 'app/(main)/settings/websites/[id]/ShareUrl';+export * from 'app/(main)/settings/websites/[id]/TrackingCode';+export * from 'app/(main)/settings/websites/WebsiteAddForm';+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/WebsiteSettings';+export * from 'app/(main)/settings/websites/Websites';+export * from 'app/(main)/settings/websites/WebsitesTable';