diff --git a/docker/middleware.js b/docker/middleware.js index 85fe96d21..584da8d16 100644 --- a/docker/middleware.js +++ b/docker/middleware.js @@ -33,7 +33,7 @@ function customScriptName(req) { } } -export default function middleware(req) { +export function middleware(req) { const fns = [customCollectEndpoint, customScriptName]; for (const fn of fns) { diff --git a/package.json b/package.json index 2667c6070..c58d15740 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "@react-spring/web": "^9.7.3", "@tanstack/react-query": "^5.28.6", "@umami/prisma-client": "^0.14.0", - "@umami/react-zen": "^0.50.0", + "@umami/react-zen": "^0.51.0", "@umami/redis-client": "^0.26.0", "bcryptjs": "^2.4.3", "chalk": "^4.1.1", diff --git a/src/app/(main)/App.tsx b/src/app/(main)/App.tsx index 2d3fd0bdc..bfb537332 100644 --- a/src/app/(main)/App.tsx +++ b/src/app/(main)/App.tsx @@ -2,9 +2,9 @@ import { Grid, Loading } from '@umami/react-zen'; import Script from 'next/script'; import { usePathname } from 'next/navigation'; -import UpdateNotice from './UpdateNotice'; -import NavBar from '@/app/(main)/NavBar'; -import Page from '@/components/layout/Page'; +import { UpdateNotice } from './UpdateNotice'; +import { NavBar } from '@/app/(main)/NavBar'; +import { Page } from '@/components/layout/Page'; import { useLogin, useConfig } from '@/components/hooks'; export function App({ children }) { @@ -41,5 +41,3 @@ export function App({ children }) { ); } - -export default App; diff --git a/src/app/(main)/NavBar.tsx b/src/app/(main)/NavBar.tsx index 59e485fe2..645e7720f 100644 --- a/src/app/(main)/NavBar.tsx +++ b/src/app/(main)/NavBar.tsx @@ -1,10 +1,10 @@ 'use client'; import { Icon, Text, ThemeButton, Row } from '@umami/react-zen'; import Link from 'next/link'; -import LanguageButton from '@/components/input/LanguageButton'; -import ProfileButton from '@/components/input/ProfileButton'; -import TeamsButton from '@/components/input/TeamsButton'; -import Icons from '@/components/icons'; +import { LanguageButton } from '@/components/input/LanguageButton'; +import { ProfileButton } from '@/components/input/ProfileButton'; +import { TeamsButton } from '@/components/input/TeamsButton'; +import { Icons } from '@/components/icons'; import { useMessages, useTeamUrl } from '@/components/hooks'; export function NavBar() { @@ -46,5 +46,3 @@ export function NavBar() { ); } - -export default NavBar; diff --git a/src/app/(main)/UpdateNotice.tsx b/src/app/(main)/UpdateNotice.tsx index 8a6fb3eb0..ed163d521 100644 --- a/src/app/(main)/UpdateNotice.tsx +++ b/src/app/(main)/UpdateNotice.tsx @@ -1,14 +1,14 @@ import { useEffect, useCallback, useState } from 'react'; import { Button, AlertBanner, Flexbox } from '@umami/react-zen'; import { setItem } from '@/lib/storage'; -import useStore, { checkVersion } from '@/store/version'; +import { useVersion, checkVersion } from '@/store/version'; import { REPO_URL, VERSION_CHECK } from '@/lib/constants'; import { useMessages } from '@/components/hooks'; import { usePathname } from 'next/navigation'; export function UpdateNotice({ user, config }) { const { formatMessage, labels, messages } = useMessages(); - const { latest, checked, hasUpdate, releaseUrl } = useStore(); + const { latest, checked, hasUpdate, releaseUrl } = useVersion(); const pathname = usePathname(); const [dismissed, setDismissed] = useState(checked); const allowUpdate = @@ -56,5 +56,3 @@ export function UpdateNotice({ user, config }) { ); } - -export default UpdateNotice; diff --git a/src/app/(main)/boards/BoardsPage.tsx b/src/app/(main)/boards/BoardsPage.tsx index d5ea69d15..7712a1aaf 100644 --- a/src/app/(main)/boards/BoardsPage.tsx +++ b/src/app/(main)/boards/BoardsPage.tsx @@ -1,3 +1,3 @@ -export default function BoardsPage() { +export function BoardsPage() { return

hi.

; } diff --git a/src/app/(main)/boards/page.tsx b/src/app/(main)/boards/page.tsx index 4bd8da6d1..ef4ccb1b0 100644 --- a/src/app/(main)/boards/page.tsx +++ b/src/app/(main)/boards/page.tsx @@ -1,4 +1,4 @@ -import BoardsPage from './BoardsPage'; +import { BoardsPage } from './BoardsPage'; import { Metadata } from 'next'; export default function () { diff --git a/src/app/(main)/console/ConsolePage.tsx b/src/app/(main)/console/ConsolePage.tsx index db1acbfe8..9d02ffc64 100644 --- a/src/app/(main)/console/ConsolePage.tsx +++ b/src/app/(main)/console/ConsolePage.tsx @@ -1,6 +1,6 @@ 'use client'; -import TestConsole from './TestConsole'; +import { TestConsole } from './TestConsole'; -export default function ConsolePage({ websiteId }) { +export function ConsolePage({ websiteId }) { return ; } diff --git a/src/app/(main)/console/TestConsole.tsx b/src/app/(main)/console/TestConsole.tsx index 21b98df6d..384532176 100644 --- a/src/app/(main)/console/TestConsole.tsx +++ b/src/app/(main)/console/TestConsole.tsx @@ -1,11 +1,11 @@ import { Button } from 'react-basics'; import Link from 'next/link'; import Script from 'next/script'; -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/[websiteId]/WebsiteChart'; +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/[websiteId]/WebsiteChart'; import { useApi, useNavigation } from '@/components/hooks'; import styles from './TestConsole.module.css'; @@ -216,5 +216,3 @@ export function TestConsole({ websiteId }: { websiteId: string }) { ); } - -export default TestConsole; diff --git a/src/app/(main)/dashboard/DashboardEdit.tsx b/src/app/(main)/dashboard/DashboardEdit.tsx index d15ae1977..4cfc7ebd3 100644 --- a/src/app/(main)/dashboard/DashboardEdit.tsx +++ b/src/app/(main)/dashboard/DashboardEdit.tsx @@ -3,7 +3,7 @@ import { DragDropContext, Draggable, Droppable } from '@hello-pangea/dnd'; import classNames from 'classnames'; import { Button, Loading, Toggle, SearchField } from 'react-basics'; import { firstBy } from 'thenby'; -import useDashboard, { saveDashboard } from '@/store/dashboard'; +import { useDashboard, saveDashboard } from '@/store/dashboard'; import { useMessages, useWebsites } from '@/components/hooks'; import styles from './DashboardEdit.module.css'; @@ -156,5 +156,3 @@ export function DashboardEdit({ teamId }: { teamId: string }) { ); } - -export default DashboardEdit; diff --git a/src/app/(main)/dashboard/DashboardPage.tsx b/src/app/(main)/dashboard/DashboardPage.tsx index 83b27e095..058837c5c 100644 --- a/src/app/(main)/dashboard/DashboardPage.tsx +++ b/src/app/(main)/dashboard/DashboardPage.tsx @@ -1,14 +1,14 @@ 'use client'; import { Icon, Icons, Loading, Text } from 'react-basics'; -import PageHeader from '@/components/layout/PageHeader'; -import Pager from '@/components/common/Pager'; -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'; +import { PageHeader } from '@/components/layout/PageHeader'; +import { Pager } from '@/components/common/Pager'; +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'; import { useMessages, useLocale, useTeamUrl, useWebsites } from '@/components/hooks'; -import useDashboard from '@/store/dashboard'; -import LinkButton from '@/components/common/LinkButton'; +import { useDashboard } from '@/store/dashboard'; +import { LinkButton } from '@/components/common/LinkButton'; export function DashboardPage() { const { formatMessage, labels, messages } = useMessages(); @@ -67,5 +67,3 @@ export function DashboardPage() { ); } - -export default DashboardPage; diff --git a/src/app/(main)/dashboard/DashboardSettingsButton.tsx b/src/app/(main)/dashboard/DashboardSettingsButton.tsx index 1c473a220..6e0ebae74 100644 --- a/src/app/(main)/dashboard/DashboardSettingsButton.tsx +++ b/src/app/(main)/dashboard/DashboardSettingsButton.tsx @@ -1,5 +1,5 @@ import { TooltipPopup, Icon, Text, Flexbox, Button } from 'react-basics'; -import Icons from '@/components/icons'; +import { Icons } from '@/components/icons'; import { saveDashboard } from '@/store/dashboard'; import { useMessages } from '@/components/hooks'; @@ -32,5 +32,3 @@ export function DashboardSettingsButton() { ); } - -export default DashboardSettingsButton; diff --git a/src/app/(main)/dashboard/page.tsx b/src/app/(main)/dashboard/page.tsx index 7a6051100..20ac3533b 100644 --- a/src/app/(main)/dashboard/page.tsx +++ b/src/app/(main)/dashboard/page.tsx @@ -1,4 +1,4 @@ -import DashboardPage from './DashboardPage'; +import { DashboardPage } from './DashboardPage'; import { Metadata } from 'next'; export default function () { diff --git a/src/app/(main)/layout.tsx b/src/app/(main)/layout.tsx index 5727224bc..b3fa289c9 100644 --- a/src/app/(main)/layout.tsx +++ b/src/app/(main)/layout.tsx @@ -1,7 +1,7 @@ import { Metadata } from 'next'; -import App from './App'; +import { App } from './App'; -export default async function ({ children }) { +export default function ({ children }) { return {children}; } diff --git a/src/app/(main)/profile/DateRangeSetting.tsx b/src/app/(main)/profile/DateRangeSetting.tsx index 37d2ca437..b65490b77 100644 --- a/src/app/(main)/profile/DateRangeSetting.tsx +++ b/src/app/(main)/profile/DateRangeSetting.tsx @@ -1,4 +1,4 @@ -import DateFilter from '@/components/input/DateFilter'; +import { DateFilter } from '@/components/input/DateFilter'; import { Button, Flexbox } from 'react-basics'; import { useDateRange, useMessages } from '@/components/hooks'; import { DEFAULT_DATE_RANGE } from '@/lib/constants'; @@ -26,5 +26,3 @@ export function DateRangeSetting() { ); } - -export default DateRangeSetting; diff --git a/src/app/(main)/profile/LanguageSetting.tsx b/src/app/(main)/profile/LanguageSetting.tsx index a47394b33..a4c950f73 100644 --- a/src/app/(main)/profile/LanguageSetting.tsx +++ b/src/app/(main)/profile/LanguageSetting.tsx @@ -39,5 +39,3 @@ export function LanguageSetting() { ); } - -export default LanguageSetting; diff --git a/src/app/(main)/profile/PasswordChangeButton.tsx b/src/app/(main)/profile/PasswordChangeButton.tsx index 63249a2bd..757c10bdc 100644 --- a/src/app/(main)/profile/PasswordChangeButton.tsx +++ b/src/app/(main)/profile/PasswordChangeButton.tsx @@ -1,6 +1,6 @@ import { Button, Icon, Text, useToasts, ModalTrigger, Modal } from 'react-basics'; -import PasswordEditForm from '@/app/(main)/profile/PasswordEditForm'; -import Icons from '@/components/icons'; +import { PasswordEditForm } from '@/app/(main)/profile/PasswordEditForm'; +import { Icons } from '@/components/icons'; import { useMessages } from '@/components/hooks'; export function PasswordChangeButton() { @@ -27,5 +27,3 @@ export function PasswordChangeButton() { ); } - -export default PasswordChangeButton; diff --git a/src/app/(main)/profile/PasswordEditForm.tsx b/src/app/(main)/profile/PasswordEditForm.tsx index c352d5165..18696d3ad 100644 --- a/src/app/(main)/profile/PasswordEditForm.tsx +++ b/src/app/(main)/profile/PasswordEditForm.tsx @@ -65,5 +65,3 @@ export function PasswordEditForm({ onSave, onClose }) { ); } - -export default PasswordEditForm; diff --git a/src/app/(main)/profile/ProfileHeader.tsx b/src/app/(main)/profile/ProfileHeader.tsx index 05871fba0..4908e9dbf 100644 --- a/src/app/(main)/profile/ProfileHeader.tsx +++ b/src/app/(main)/profile/ProfileHeader.tsx @@ -1,4 +1,4 @@ -import PageHeader from '@/components/layout/PageHeader'; +import { PageHeader } from '@/components/layout/PageHeader'; import { useMessages } from '@/components/hooks'; export function ProfileHeader() { @@ -6,5 +6,3 @@ export function ProfileHeader() { return ; } - -export default ProfileHeader; diff --git a/src/app/(main)/profile/ProfilePage.tsx b/src/app/(main)/profile/ProfilePage.tsx index 428ce2842..042cdb5c0 100644 --- a/src/app/(main)/profile/ProfilePage.tsx +++ b/src/app/(main)/profile/ProfilePage.tsx @@ -1,9 +1,9 @@ 'use client'; -import ProfileHeader from './ProfileHeader'; -import ProfileSettings from './ProfileSettings'; +import { ProfileHeader } from './ProfileHeader'; +import { ProfileSettings } from './ProfileSettings'; import styles from './ProfilePage.module.css'; -export default function () { +export function ProfilePage() { return (
diff --git a/src/app/(main)/profile/ProfileSettings.tsx b/src/app/(main)/profile/ProfileSettings.tsx index f9dfe06dc..9b3c6bb4f 100644 --- a/src/app/(main)/profile/ProfileSettings.tsx +++ b/src/app/(main)/profile/ProfileSettings.tsx @@ -1,9 +1,9 @@ import { Form, FormRow } from 'react-basics'; -import TimezoneSetting from '@/app/(main)/profile/TimezoneSetting'; -import DateRangeSetting from '@/app/(main)/profile/DateRangeSetting'; -import LanguageSetting from '@/app/(main)/profile/LanguageSetting'; -import ThemeSetting from '@/app/(main)/profile/ThemeSetting'; -import PasswordChangeButton from './PasswordChangeButton'; +import { TimezoneSetting } from '@/app/(main)/profile/TimezoneSetting'; +import { DateRangeSetting } from '@/app/(main)/profile/DateRangeSetting'; +import { LanguageSetting } from '@/app/(main)/profile/LanguageSetting'; +import { ThemeSetting } from '@/app/(main)/profile/ThemeSetting'; +import { PasswordChangeButton } from './PasswordChangeButton'; import { useLogin, useMessages } from '@/components/hooks'; import { ROLES } from '@/lib/constants'; @@ -56,5 +56,3 @@ export function ProfileSettings() { ); } - -export default ProfileSettings; diff --git a/src/app/(main)/profile/ThemeSetting.tsx b/src/app/(main)/profile/ThemeSetting.tsx index 49ea71617..2d9bcbc9f 100644 --- a/src/app/(main)/profile/ThemeSetting.tsx +++ b/src/app/(main)/profile/ThemeSetting.tsx @@ -29,5 +29,3 @@ export function ThemeSetting() {
); } - -export default ThemeSetting; diff --git a/src/app/(main)/profile/TimezoneSetting.tsx b/src/app/(main)/profile/TimezoneSetting.tsx index 56c858136..2181d873c 100644 --- a/src/app/(main)/profile/TimezoneSetting.tsx +++ b/src/app/(main)/profile/TimezoneSetting.tsx @@ -33,5 +33,3 @@ export function TimezoneSetting() { ); } - -export default TimezoneSetting; diff --git a/src/app/(main)/profile/page.tsx b/src/app/(main)/profile/page.tsx index 0c1f0082e..ad2b9bcc1 100644 --- a/src/app/(main)/profile/page.tsx +++ b/src/app/(main)/profile/page.tsx @@ -1,5 +1,5 @@ import { Metadata } from 'next'; -import ProfilePage from './ProfilePage'; +import { ProfilePage } from './ProfilePage'; export default function () { return ; diff --git a/src/app/(main)/reports/ReportDeleteButton.tsx b/src/app/(main)/reports/ReportDeleteButton.tsx index efd1da3c7..41448ed87 100644 --- a/src/app/(main)/reports/ReportDeleteButton.tsx +++ b/src/app/(main)/reports/ReportDeleteButton.tsx @@ -1,6 +1,6 @@ import { Button, Icon, Icons, Modal, ModalTrigger, Text } from 'react-basics'; import { useApi, useMessages, useModified } from '@/components/hooks'; -import ConfirmationForm from '@/components/common/ConfirmationForm'; +import { ConfirmationForm } from '@/components/common/ConfirmationForm'; export function ReportDeleteButton({ reportId, @@ -51,5 +51,3 @@ export function ReportDeleteButton({ ); } - -export default ReportDeleteButton; diff --git a/src/app/(main)/reports/ReportsDataTable.tsx b/src/app/(main)/reports/ReportsDataTable.tsx index 0cc5a96c4..dca2aaa27 100644 --- a/src/app/(main)/reports/ReportsDataTable.tsx +++ b/src/app/(main)/reports/ReportsDataTable.tsx @@ -1,9 +1,9 @@ import { useReports } from '@/components/hooks'; -import ReportsTable from './ReportsTable'; -import DataTable from '@/components/common/DataTable'; +import { ReportsTable } from './ReportsTable'; +import { DataTable } from '@/components/common/DataTable'; import { ReactNode } from 'react'; -export default function ReportsDataTable({ +export function ReportsDataTable({ websiteId, teamId, children, diff --git a/src/app/(main)/reports/ReportsHeader.tsx b/src/app/(main)/reports/ReportsHeader.tsx index ff9cb2941..8cba861f1 100644 --- a/src/app/(main)/reports/ReportsHeader.tsx +++ b/src/app/(main)/reports/ReportsHeader.tsx @@ -1,7 +1,7 @@ -import PageHeader from '@/components/layout/PageHeader'; +import { PageHeader } from '@/components/layout/PageHeader'; import { Icon, Icons, Text } from 'react-basics'; import { useLogin, useMessages, useTeamUrl } from '@/components/hooks'; -import LinkButton from '@/components/common/LinkButton'; +import { LinkButton } from '@/components/common/LinkButton'; import { ROLES } from '@/lib/constants'; export function ReportsHeader() { @@ -23,5 +23,3 @@ export function ReportsHeader() { ); } - -export default ReportsHeader; diff --git a/src/app/(main)/reports/ReportsPage.tsx b/src/app/(main)/reports/ReportsPage.tsx index 64d43c702..bec1a17c0 100644 --- a/src/app/(main)/reports/ReportsPage.tsx +++ b/src/app/(main)/reports/ReportsPage.tsx @@ -1,10 +1,10 @@ 'use client'; import { Metadata } from 'next'; -import ReportsHeader from './ReportsHeader'; -import ReportsDataTable from './ReportsDataTable'; +import { ReportsHeader } from './ReportsHeader'; +import { ReportsDataTable } from './ReportsDataTable'; import { useTeamUrl } from '@/components/hooks'; -export default function ReportsPage() { +export function ReportsPage() { const { teamId } = useTeamUrl(); return ( diff --git a/src/app/(main)/reports/ReportsTable.tsx b/src/app/(main)/reports/ReportsTable.tsx index a891b6d08..40eb94600 100644 --- a/src/app/(main)/reports/ReportsTable.tsx +++ b/src/app/(main)/reports/ReportsTable.tsx @@ -1,8 +1,8 @@ import { GridColumn, GridTable, Icon, Icons, Text } from 'react-basics'; -import LinkButton from '@/components/common/LinkButton'; +import { LinkButton } from '@/components/common/LinkButton'; import { useMessages, useLogin, useTeamUrl } from '@/components/hooks'; import { REPORT_TYPES } from '@/lib/constants'; -import ReportDeleteButton from './ReportDeleteButton'; +import { ReportDeleteButton } from './ReportDeleteButton'; export function ReportsTable({ data = [], showDomain }: { data: any[]; showDomain?: boolean }) { const { formatMessage, labels } = useMessages(); @@ -46,5 +46,3 @@ export function ReportsTable({ data = [], showDomain }: { data: any[]; showDomai ); } - -export default ReportsTable; diff --git a/src/app/(main)/reports/[reportId]/BaseParameters.tsx b/src/app/(main)/reports/[reportId]/BaseParameters.tsx index 1f4881bec..374699c96 100644 --- a/src/app/(main)/reports/[reportId]/BaseParameters.tsx +++ b/src/app/(main)/reports/[reportId]/BaseParameters.tsx @@ -1,8 +1,8 @@ import { useContext } from 'react'; import { FormRow } from 'react-basics'; import { parseDateRange } from '@/lib/date'; -import DateFilter from '@/components/input/DateFilter'; -import WebsiteSelect from '@/components/input/WebsiteSelect'; +import { DateFilter } from '@/components/input/DateFilter'; +import { WebsiteSelect } from '@/components/input/WebsiteSelect'; import { useMessages, useTeamUrl, useWebsite } from '@/components/hooks'; import { ReportContext } from './Report'; import styles from './BaseParameters.module.css'; @@ -63,5 +63,3 @@ export function BaseParameters({ ); } - -export default BaseParameters; diff --git a/src/app/(main)/reports/[reportId]/FieldAddForm.tsx b/src/app/(main)/reports/[reportId]/FieldAddForm.tsx index 6560a947a..9c0ab149d 100644 --- a/src/app/(main)/reports/[reportId]/FieldAddForm.tsx +++ b/src/app/(main)/reports/[reportId]/FieldAddForm.tsx @@ -1,8 +1,8 @@ import { useState } from 'react'; import { createPortal } from 'react-dom'; import { REPORT_PARAMETERS } from '@/lib/constants'; -import PopupForm from './PopupForm'; -import FieldSelectForm from './FieldSelectForm'; +import { PopupForm } from './PopupForm'; +import { FieldSelectForm } from './FieldSelectForm'; export function FieldAddForm({ fields = [], @@ -45,5 +45,3 @@ export function FieldAddForm({ document.body, ); } - -export default FieldAddForm; diff --git a/src/app/(main)/reports/[reportId]/FieldAggregateForm.tsx b/src/app/(main)/reports/[reportId]/FieldAggregateForm.tsx index 5db0e5801..c3c6cb1d5 100644 --- a/src/app/(main)/reports/[reportId]/FieldAggregateForm.tsx +++ b/src/app/(main)/reports/[reportId]/FieldAggregateForm.tsx @@ -1,7 +1,7 @@ import { Form, FormRow, Menu, Item } from 'react-basics'; import { useMessages } from '@/components/hooks'; -export default function FieldAggregateForm({ +export function FieldAggregateForm({ name, type, onSelect, diff --git a/src/app/(main)/reports/[reportId]/FieldFilterEditForm.tsx b/src/app/(main)/reports/[reportId]/FieldFilterEditForm.tsx index c1f95e804..bec97da74 100644 --- a/src/app/(main)/reports/[reportId]/FieldFilterEditForm.tsx +++ b/src/app/(main)/reports/[reportId]/FieldFilterEditForm.tsx @@ -33,7 +33,7 @@ export interface FieldFilterFormProps { isNew?: boolean; } -export default function FieldFilterEditForm({ +export function FieldFilterEditForm({ websiteId, name, label, diff --git a/src/app/(main)/reports/[reportId]/FieldParameters.tsx b/src/app/(main)/reports/[reportId]/FieldParameters.tsx index de80cc69d..e99bf57da 100644 --- a/src/app/(main)/reports/[reportId]/FieldParameters.tsx +++ b/src/app/(main)/reports/[reportId]/FieldParameters.tsx @@ -1,5 +1,5 @@ import { useFields, useMessages } from '@/components/hooks'; -import Icons from '@/components/icons'; +import { Icons } from '@/components/icons'; import { useContext } from 'react'; import { Button, FormRow, Icon, Popup, PopupTrigger } from 'react-basics'; import FieldSelectForm from '../[reportId]/FieldSelectForm'; @@ -59,5 +59,3 @@ export function FieldParameters() { ); } - -export default FieldParameters; diff --git a/src/app/(main)/reports/[reportId]/FieldSelectForm.tsx b/src/app/(main)/reports/[reportId]/FieldSelectForm.tsx index f73d59f79..55ac70ea6 100644 --- a/src/app/(main)/reports/[reportId]/FieldSelectForm.tsx +++ b/src/app/(main)/reports/[reportId]/FieldSelectForm.tsx @@ -9,11 +9,7 @@ export interface FieldSelectFormProps { showType?: boolean; } -export default function FieldSelectForm({ - fields = [], - onSelect, - showType = true, -}: FieldSelectFormProps) { +export function FieldSelectForm({ fields = [], onSelect, showType = true }: FieldSelectFormProps) { const { formatMessage, labels } = useMessages(); return ( diff --git a/src/app/(main)/reports/[reportId]/FilterParameters.tsx b/src/app/(main)/reports/[reportId]/FilterParameters.tsx index 538c4ce51..9fbfc283c 100644 --- a/src/app/(main)/reports/[reportId]/FilterParameters.tsx +++ b/src/app/(main)/reports/[reportId]/FilterParameters.tsx @@ -1,6 +1,6 @@ import { useContext } from 'react'; import { useMessages, useFormat, useFilters, useFields } from '@/components/hooks'; -import Icons from '@/components/icons'; +import { Icons } from '@/components/icons'; import { Button, FormRow, Icon, Popup, PopupTrigger } from 'react-basics'; import FilterSelectForm from '../[reportId]/FilterSelectForm'; import ParameterList from '../[reportId]/ParameterList'; @@ -134,5 +134,3 @@ const FilterParameter = ({ ); }; - -export default FilterParameters; diff --git a/src/app/(main)/reports/[reportId]/FilterSelectForm.tsx b/src/app/(main)/reports/[reportId]/FilterSelectForm.tsx index 77a36c3cc..55e008664 100644 --- a/src/app/(main)/reports/[reportId]/FilterSelectForm.tsx +++ b/src/app/(main)/reports/[reportId]/FilterSelectForm.tsx @@ -1,6 +1,6 @@ import { useState } from 'react'; -import FieldSelectForm from './FieldSelectForm'; -import FieldFilterEditForm from './FieldFilterEditForm'; +import { FieldSelectForm } from './FieldSelectForm'; +import { FieldFilterEditForm } from './FieldFilterEditForm'; export interface FilterSelectFormProps { websiteId?: string; @@ -11,7 +11,7 @@ export interface FilterSelectFormProps { allowFilterSelect?: boolean; } -export default function FilterSelectForm({ +export function FilterSelectForm({ websiteId, fields, startDate, diff --git a/src/app/(main)/reports/[reportId]/ParameterList.tsx b/src/app/(main)/reports/[reportId]/ParameterList.tsx index 3c0401a04..4a93884c1 100644 --- a/src/app/(main)/reports/[reportId]/ParameterList.tsx +++ b/src/app/(main)/reports/[reportId]/ParameterList.tsx @@ -1,7 +1,7 @@ import { ReactNode } from 'react'; import { Icon } from 'react-basics'; -import Icons from '@/components/icons'; -import Empty from '@/components/common/Empty'; +import { Icons } from '@/components/icons'; +import { Empty } from '@/components/common/Empty'; import { useMessages } from '@/components/hooks'; import styles from './ParameterList.module.css'; import classNames from 'classnames'; @@ -46,5 +46,3 @@ const Item = ({ }; ParameterList.Item = Item; - -export default ParameterList; diff --git a/src/app/(main)/reports/[reportId]/PopupForm.tsx b/src/app/(main)/reports/[reportId]/PopupForm.tsx index f26661991..2c470c2b5 100644 --- a/src/app/(main)/reports/[reportId]/PopupForm.tsx +++ b/src/app/(main)/reports/[reportId]/PopupForm.tsx @@ -21,5 +21,3 @@ export function PopupForm({ ); } - -export default PopupForm; diff --git a/src/app/(main)/reports/[reportId]/Report.tsx b/src/app/(main)/reports/[reportId]/Report.tsx index 1aed007cf..1deb1204a 100644 --- a/src/app/(main)/reports/[reportId]/Report.tsx +++ b/src/app/(main)/reports/[reportId]/Report.tsx @@ -29,5 +29,3 @@ export function Report({ ); } - -export default Report; diff --git a/src/app/(main)/reports/[reportId]/ReportBody.tsx b/src/app/(main)/reports/[reportId]/ReportBody.tsx index 9a740c5ec..9e7ca966a 100644 --- a/src/app/(main)/reports/[reportId]/ReportBody.tsx +++ b/src/app/(main)/reports/[reportId]/ReportBody.tsx @@ -11,5 +11,3 @@ export function ReportBody({ children }) { return
{children}
; } - -export default ReportBody; diff --git a/src/app/(main)/reports/[reportId]/ReportHeader.tsx b/src/app/(main)/reports/[reportId]/ReportHeader.tsx index 816a2df33..d78d213b8 100644 --- a/src/app/(main)/reports/[reportId]/ReportHeader.tsx +++ b/src/app/(main)/reports/[reportId]/ReportHeader.tsx @@ -4,7 +4,7 @@ import { useMessages, useApi, useNavigation, useTeamUrl } from '@/components/hoo import { ReportContext } from './Report'; import styles from './ReportHeader.module.css'; import { REPORT_TYPES } from '@/lib/constants'; -import Breadcrumb from '@/components/common/Breadcrumb'; +import { Breadcrumb } from '@/components/common/Breadcrumb'; export function ReportHeader({ icon }) { const { report, updateReport } = useContext(ReportContext); @@ -102,5 +102,3 @@ export function ReportHeader({ icon }) { ); } - -export default ReportHeader; diff --git a/src/app/(main)/reports/[reportId]/ReportMenu.tsx b/src/app/(main)/reports/[reportId]/ReportMenu.tsx index 5cca5640a..b3dbee83f 100644 --- a/src/app/(main)/reports/[reportId]/ReportMenu.tsx +++ b/src/app/(main)/reports/[reportId]/ReportMenu.tsx @@ -23,5 +23,3 @@ export function ReportMenu({ children }) { ); } - -export default ReportMenu; diff --git a/src/app/(main)/reports/[reportId]/ReportPage.tsx b/src/app/(main)/reports/[reportId]/ReportPage.tsx index 8a3a94ad3..c84ca95d5 100644 --- a/src/app/(main)/reports/[reportId]/ReportPage.tsx +++ b/src/app/(main)/reports/[reportId]/ReportPage.tsx @@ -20,7 +20,7 @@ const reports = { revenue: RevenueReport, }; -export default function ReportPage({ reportId }: { reportId: string }) { +export function ReportPage({ reportId }: { reportId: string }) { const { report } = useReport(reportId); if (!report) { diff --git a/src/app/(main)/reports/[reportId]/page.tsx b/src/app/(main)/reports/[reportId]/page.tsx index 85a97d1ca..037e14308 100644 --- a/src/app/(main)/reports/[reportId]/page.tsx +++ b/src/app/(main)/reports/[reportId]/page.tsx @@ -1,5 +1,5 @@ import { Metadata } from 'next'; -import ReportPage from './ReportPage'; +import { ReportPage } from './ReportPage'; export default async function ({ params }: { params: { reportId: string } }) { const { reportId } = await params; diff --git a/src/app/(main)/reports/create/ReportCreatePage.tsx b/src/app/(main)/reports/create/ReportCreatePage.tsx index ff3a761a2..4a04d0269 100644 --- a/src/app/(main)/reports/create/ReportCreatePage.tsx +++ b/src/app/(main)/reports/create/ReportCreatePage.tsx @@ -1,6 +1,6 @@ 'use client'; -import ReportTemplates from './ReportTemplates'; +import { ReportTemplates } from './ReportTemplates'; -export default function ReportCreatePage() { +export function ReportCreatePage() { return ; } diff --git a/src/app/(main)/reports/create/ReportTemplates.tsx b/src/app/(main)/reports/create/ReportTemplates.tsx index c26e3a919..60468a5db 100644 --- a/src/app/(main)/reports/create/ReportTemplates.tsx +++ b/src/app/(main)/reports/create/ReportTemplates.tsx @@ -6,7 +6,7 @@ import Path from '@/assets/path.svg'; import Tag from '@/assets/tag.svg'; import Target from '@/assets/target.svg'; import { useMessages, useTeamUrl } from '@/components/hooks'; -import PageHeader from '@/components/layout/PageHeader'; +import { PageHeader } from '@/components/layout/PageHeader'; import Link from 'next/link'; import { Button, Icon, Icons, Text } from 'react-basics'; import styles from './ReportTemplates.module.css'; @@ -97,5 +97,3 @@ function ReportItem({ title, description, url, icon }) { ); } - -export default ReportTemplates; diff --git a/src/app/(main)/reports/create/page.tsx b/src/app/(main)/reports/create/page.tsx index c2b1c18c5..608367fcc 100644 --- a/src/app/(main)/reports/create/page.tsx +++ b/src/app/(main)/reports/create/page.tsx @@ -1,4 +1,4 @@ -import ReportCreatePage from './ReportCreatePage'; +import { ReportCreatePage } from './ReportCreatePage'; import { Metadata } from 'next'; export default function () { diff --git a/src/app/(main)/reports/event-data/EventDataParameters.tsx b/src/app/(main)/reports/event-data/EventDataParameters.tsx index 9e931cf5a..43553b082 100644 --- a/src/app/(main)/reports/event-data/EventDataParameters.tsx +++ b/src/app/(main)/reports/event-data/EventDataParameters.tsx @@ -1,7 +1,7 @@ import { useContext } from 'react'; import { Form, FormRow, FormButtons, SubmitButton, PopupTrigger, Icon, Popup } from 'react-basics'; -import Empty from '@/components/common/Empty'; -import Icons from '@/components/icons'; +import { Empty } from '@/components/common/Empty'; +import { Icons } from '@/components/icons'; import { useApi, useMessages } from '@/components/hooks'; import { DATA_TYPES, REPORT_PARAMETERS } from '@/lib/constants'; import { ReportContext } from '../[reportId]/Report'; @@ -137,5 +137,3 @@ export function EventDataParameters() { ); } - -export default EventDataParameters; diff --git a/src/app/(main)/reports/event-data/EventDataReport.tsx b/src/app/(main)/reports/event-data/EventDataReport.tsx index 8205a4881..7e9c34df7 100644 --- a/src/app/(main)/reports/event-data/EventDataReport.tsx +++ b/src/app/(main)/reports/event-data/EventDataReport.tsx @@ -2,8 +2,8 @@ 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 { EventDataParameters } from './EventDataParameters'; +import { EventDataTable } from './EventDataTable'; import Nodes from '@/assets/nodes.svg'; const defaultParameters = { @@ -11,7 +11,7 @@ const defaultParameters = { parameters: { fields: [], filters: [] }, }; -export default function EventDataReport({ reportId }: { reportId?: string }) { +export function EventDataReport({ reportId }: { reportId?: string }) { return ( } /> diff --git a/src/app/(main)/reports/event-data/EventDataReportPage.tsx b/src/app/(main)/reports/event-data/EventDataReportPage.tsx index 8276acfbd..92bd0a058 100644 --- a/src/app/(main)/reports/event-data/EventDataReportPage.tsx +++ b/src/app/(main)/reports/event-data/EventDataReportPage.tsx @@ -1,6 +1,6 @@ 'use client'; -import EventDataReport from './EventDataReport'; +import { EventDataReport } from './EventDataReport'; -export default function EventDataReportPage() { +export function EventDataReportPage() { return ; } diff --git a/src/app/(main)/reports/event-data/EventDataTable.tsx b/src/app/(main)/reports/event-data/EventDataTable.tsx index f42e792d6..60cdd7dd2 100644 --- a/src/app/(main)/reports/event-data/EventDataTable.tsx +++ b/src/app/(main)/reports/event-data/EventDataTable.tsx @@ -15,5 +15,3 @@ export function EventDataTable() { ); } - -export default EventDataTable; diff --git a/src/app/(main)/reports/event-data/page.tsx b/src/app/(main)/reports/event-data/page.tsx index 2d6477e1a..888754087 100644 --- a/src/app/(main)/reports/event-data/page.tsx +++ b/src/app/(main)/reports/event-data/page.tsx @@ -1,5 +1,5 @@ import { Metadata } from 'next'; -import EventDataReportPage from './EventDataReportPage'; +import { EventDataReportPage } from './EventDataReportPage'; export default function () { return ; diff --git a/src/app/(main)/reports/funnel/FunnelChart.tsx b/src/app/(main)/reports/funnel/FunnelChart.tsx index be3da6143..e5c3c9d43 100644 --- a/src/app/(main)/reports/funnel/FunnelChart.tsx +++ b/src/app/(main)/reports/funnel/FunnelChart.tsx @@ -52,5 +52,3 @@ export function FunnelChart({ className }: FunnelChartProps) { ); } - -export default FunnelChart; diff --git a/src/app/(main)/reports/funnel/FunnelParameters.tsx b/src/app/(main)/reports/funnel/FunnelParameters.tsx index 3db57135e..cc1a5f9e6 100644 --- a/src/app/(main)/reports/funnel/FunnelParameters.tsx +++ b/src/app/(main)/reports/funnel/FunnelParameters.tsx @@ -12,8 +12,8 @@ import { TextField, Button, } from 'react-basics'; -import Icons from '@/components/icons'; -import FunnelStepAddForm from './FunnelStepAddForm'; +import { Icons } from '@/components/icons'; +import { FunnelStepAddForm } from './FunnelStepAddForm'; import { ReportContext } from '../[reportId]/Report'; import BaseParameters from '../[reportId]/BaseParameters'; import ParameterList from '../[reportId]/ParameterList'; @@ -124,5 +124,3 @@ export function FunnelParameters() { ); } - -export default FunnelParameters; diff --git a/src/app/(main)/reports/funnel/FunnelReport.tsx b/src/app/(main)/reports/funnel/FunnelReport.tsx index e0c90e4aa..ecdc11e74 100644 --- a/src/app/(main)/reports/funnel/FunnelReport.tsx +++ b/src/app/(main)/reports/funnel/FunnelReport.tsx @@ -1,5 +1,5 @@ -import FunnelChart from './FunnelChart'; -import FunnelParameters from './FunnelParameters'; +import { FunnelChart } from './FunnelChart'; +import { FunnelParameters } from './FunnelParameters'; import Report from '../[reportId]/Report'; import ReportHeader from '../[reportId]/ReportHeader'; import ReportMenu from '../[reportId]/ReportMenu'; @@ -12,7 +12,7 @@ const defaultParameters = { parameters: { window: 60, steps: [] }, }; -export default function FunnelReport({ reportId }: { reportId?: string }) { +export function FunnelReport({ reportId }: { reportId?: string }) { return ( } /> diff --git a/src/app/(main)/reports/funnel/FunnelReportPage.tsx b/src/app/(main)/reports/funnel/FunnelReportPage.tsx index a114a8cce..13c81ce4a 100644 --- a/src/app/(main)/reports/funnel/FunnelReportPage.tsx +++ b/src/app/(main)/reports/funnel/FunnelReportPage.tsx @@ -1,6 +1,6 @@ 'use client'; -import FunnelReport from './FunnelReport'; +import { FunnelReport } from './FunnelReport'; -export default function FunnelReportPage() { +export function FunnelReportPage() { return ; } diff --git a/src/app/(main)/reports/funnel/FunnelStepAddForm.tsx b/src/app/(main)/reports/funnel/FunnelStepAddForm.tsx index d7917d7d9..3d0ab2c1d 100644 --- a/src/app/(main)/reports/funnel/FunnelStepAddForm.tsx +++ b/src/app/(main)/reports/funnel/FunnelStepAddForm.tsx @@ -76,5 +76,3 @@ export function FunnelStepAddForm({ ); } - -export default FunnelStepAddForm; diff --git a/src/app/(main)/reports/funnel/page.tsx b/src/app/(main)/reports/funnel/page.tsx index 40270bba9..7e475e5e1 100644 --- a/src/app/(main)/reports/funnel/page.tsx +++ b/src/app/(main)/reports/funnel/page.tsx @@ -1,4 +1,4 @@ -import FunnelReportPage from './FunnelReportPage'; +import { FunnelReportPage } from './FunnelReportPage'; import { Metadata } from 'next'; export default function () { diff --git a/src/app/(main)/reports/goals/GoalsAddForm.tsx b/src/app/(main)/reports/goals/GoalsAddForm.tsx index b73545337..57ca0dda5 100644 --- a/src/app/(main)/reports/goals/GoalsAddForm.tsx +++ b/src/app/(main)/reports/goals/GoalsAddForm.tsx @@ -139,5 +139,3 @@ export function GoalsAddForm({ ); } - -export default GoalsAddForm; diff --git a/src/app/(main)/reports/goals/GoalsChart.tsx b/src/app/(main)/reports/goals/GoalsChart.tsx index 34ea485e6..831899fb4 100644 --- a/src/app/(main)/reports/goals/GoalsChart.tsx +++ b/src/app/(main)/reports/goals/GoalsChart.tsx @@ -70,5 +70,3 @@ export function GoalsChart({ className }: { className?: string; isLoading?: bool ); } - -export default GoalsChart; diff --git a/src/app/(main)/reports/goals/GoalsParameters.tsx b/src/app/(main)/reports/goals/GoalsParameters.tsx index 518666450..8edf5e973 100644 --- a/src/app/(main)/reports/goals/GoalsParameters.tsx +++ b/src/app/(main)/reports/goals/GoalsParameters.tsx @@ -1,5 +1,5 @@ import { useMessages } from '@/components/hooks'; -import Icons from '@/components/icons'; +import { Icons } from '@/components/icons'; import { formatNumber } from '@/lib/format'; import { useContext } from 'react'; import { @@ -17,7 +17,7 @@ import BaseParameters from '../[reportId]/BaseParameters'; import ParameterList from '../[reportId]/ParameterList'; import PopupForm from '../[reportId]/PopupForm'; import { ReportContext } from '../[reportId]/Report'; -import GoalsAddForm from './GoalsAddForm'; +import { GoalsAddForm } from './GoalsAddForm'; import styles from './GoalsParameters.module.css'; export function GoalsParameters() { @@ -137,5 +137,3 @@ export function GoalsParameters() { ); } - -export default GoalsParameters; diff --git a/src/app/(main)/reports/goals/GoalsReport.tsx b/src/app/(main)/reports/goals/GoalsReport.tsx index ae540f3b9..1df471745 100644 --- a/src/app/(main)/reports/goals/GoalsReport.tsx +++ b/src/app/(main)/reports/goals/GoalsReport.tsx @@ -1,5 +1,5 @@ -import GoalsChart from './GoalsChart'; -import GoalsParameters from './GoalsParameters'; +import { GoalsChart } from './GoalsChart'; +import { GoalsParameters } from './GoalsParameters'; import Report from '../[reportId]/Report'; import ReportHeader from '../[reportId]/ReportHeader'; import ReportMenu from '../[reportId]/ReportMenu'; @@ -12,7 +12,7 @@ const defaultParameters = { parameters: { goals: [] }, }; -export default function GoalsReport({ reportId }: { reportId?: string }) { +export function GoalsReport({ reportId }: { reportId?: string }) { return ( } /> diff --git a/src/app/(main)/reports/goals/GoalsReportPage.tsx b/src/app/(main)/reports/goals/GoalsReportPage.tsx index cbab8bd0a..d8b4a6b62 100644 --- a/src/app/(main)/reports/goals/GoalsReportPage.tsx +++ b/src/app/(main)/reports/goals/GoalsReportPage.tsx @@ -1,6 +1,6 @@ 'use client'; -import GoalReport from './GoalsReport'; +import { GoalReport } from './GoalsReport'; -export default function GoalReportPage() { +export function GoalReportPage() { return ; } diff --git a/src/app/(main)/reports/goals/page.tsx b/src/app/(main)/reports/goals/page.tsx index 112ae47cf..0f18f5d20 100644 --- a/src/app/(main)/reports/goals/page.tsx +++ b/src/app/(main)/reports/goals/page.tsx @@ -1,4 +1,4 @@ -import GoalsReportPage from './GoalsReportPage'; +import { GoalsReportPage } from './GoalsReportPage'; import { Metadata } from 'next'; export default function () { diff --git a/src/app/(main)/reports/insights/InsightsParameters.tsx b/src/app/(main)/reports/insights/InsightsParameters.tsx index 6b3402fb4..809dc435e 100644 --- a/src/app/(main)/reports/insights/InsightsParameters.tsx +++ b/src/app/(main)/reports/insights/InsightsParameters.tsx @@ -32,5 +32,3 @@ export function InsightsParameters() { ); } - -export default InsightsParameters; diff --git a/src/app/(main)/reports/insights/InsightsReport.tsx b/src/app/(main)/reports/insights/InsightsReport.tsx index d43576fab..749ab528c 100644 --- a/src/app/(main)/reports/insights/InsightsReport.tsx +++ b/src/app/(main)/reports/insights/InsightsReport.tsx @@ -2,8 +2,8 @@ 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 { InsightsParameters } from './InsightsParameters'; +import { InsightsTable } from './InsightsTable'; import Lightbulb from '@/assets/lightbulb.svg'; import { REPORT_TYPES } from '@/lib/constants'; @@ -12,7 +12,7 @@ const defaultParameters = { parameters: { fields: [], filters: [] }, }; -export default function InsightsReport({ reportId }: { reportId?: string }) { +export function InsightsReport({ reportId }: { reportId?: string }) { return ( } /> diff --git a/src/app/(main)/reports/insights/InsightsReportPage.tsx b/src/app/(main)/reports/insights/InsightsReportPage.tsx index 7525b7678..80cb42ff2 100644 --- a/src/app/(main)/reports/insights/InsightsReportPage.tsx +++ b/src/app/(main)/reports/insights/InsightsReportPage.tsx @@ -1,6 +1,6 @@ 'use client'; -import InsightsReport from './InsightsReport'; +import { InsightsReport } from './InsightsReport'; -export default function InsightsReportPage() { +export function InsightsReportPage() { return ; } diff --git a/src/app/(main)/reports/insights/InsightsTable.tsx b/src/app/(main)/reports/insights/InsightsTable.tsx index 6864d9196..848135d0a 100644 --- a/src/app/(main)/reports/insights/InsightsTable.tsx +++ b/src/app/(main)/reports/insights/InsightsTable.tsx @@ -2,7 +2,7 @@ import { useContext, useEffect, useState } from 'react'; import { GridTable, GridColumn } from 'react-basics'; import { useFormat, useMessages } from '@/components/hooks'; import { ReportContext } from '../[reportId]/Report'; -import EmptyPlaceholder from '@/components/common/EmptyPlaceholder'; +import { EmptyPlaceholder } from '@/components/common/EmptyPlaceholder'; import { formatShortTime } from '@/lib/format'; export function InsightsTable() { @@ -71,5 +71,3 @@ export function InsightsTable() { ); } - -export default InsightsTable; diff --git a/src/app/(main)/reports/insights/page.tsx b/src/app/(main)/reports/insights/page.tsx index 1e9e0ea6d..7b9b87220 100644 --- a/src/app/(main)/reports/insights/page.tsx +++ b/src/app/(main)/reports/insights/page.tsx @@ -1,4 +1,4 @@ -import InsightsReportPage from './InsightsReportPage'; +import { InsightsReportPage } from './InsightsReportPage'; import { Metadata } from 'next'; export default function () { diff --git a/src/app/(main)/reports/journey/JourneyParameters.tsx b/src/app/(main)/reports/journey/JourneyParameters.tsx index ffa5df89c..a89c98577 100644 --- a/src/app/(main)/reports/journey/JourneyParameters.tsx +++ b/src/app/(main)/reports/journey/JourneyParameters.tsx @@ -59,5 +59,3 @@ export function JourneyParameters() { ); } - -export default JourneyParameters; diff --git a/src/app/(main)/reports/journey/JourneyReport.tsx b/src/app/(main)/reports/journey/JourneyReport.tsx index 4322fa2a1..e59746b5b 100644 --- a/src/app/(main)/reports/journey/JourneyReport.tsx +++ b/src/app/(main)/reports/journey/JourneyReport.tsx @@ -3,8 +3,8 @@ import Report from '../[reportId]/Report'; import ReportHeader from '../[reportId]/ReportHeader'; import ReportMenu from '../[reportId]/ReportMenu'; import ReportBody from '../[reportId]/ReportBody'; -import JourneyParameters from './JourneyParameters'; -import JourneyView from './JourneyView'; +import { JourneyParameters } from './JourneyParameters'; +import { JourneyView } from './JourneyView'; import Path from '@/assets/path.svg'; import { REPORT_TYPES } from '@/lib/constants'; @@ -13,7 +13,7 @@ const defaultParameters = { parameters: { steps: 5 }, }; -export default function JourneyReport({ reportId }: { reportId?: string }) { +export function JourneyReport({ reportId }: { reportId?: string }) { return ( } /> diff --git a/src/app/(main)/reports/journey/JourneyReportPage.tsx b/src/app/(main)/reports/journey/JourneyReportPage.tsx index 0f4b78cad..ecc6d053c 100644 --- a/src/app/(main)/reports/journey/JourneyReportPage.tsx +++ b/src/app/(main)/reports/journey/JourneyReportPage.tsx @@ -1,5 +1,5 @@ -import JourneyReport from './JourneyReport'; +import { JourneyReport } from './JourneyReport'; -export default function JourneyReportPage() { +export function JourneyReportPage() { return ; } diff --git a/src/app/(main)/reports/journey/JourneyView.tsx b/src/app/(main)/reports/journey/JourneyView.tsx index abddf0231..3df54d180 100644 --- a/src/app/(main)/reports/journey/JourneyView.tsx +++ b/src/app/(main)/reports/journey/JourneyView.tsx @@ -12,7 +12,7 @@ const NODE_HEIGHT = 60; const NODE_GAP = 10; const LINE_WIDTH = 3; -export default function JourneyView() { +export function JourneyView() { const [selectedNode, setSelectedNode] = useState(null); const [activeNode, setActiveNode] = useState(null); const { report } = useContext(ReportContext); diff --git a/src/app/(main)/reports/journey/page.tsx b/src/app/(main)/reports/journey/page.tsx index 447747cc3..320acebdb 100644 --- a/src/app/(main)/reports/journey/page.tsx +++ b/src/app/(main)/reports/journey/page.tsx @@ -1,5 +1,5 @@ import { Metadata } from 'next'; -import JourneyReportPage from './JourneyReportPage'; +import { JourneyReportPage } from './JourneyReportPage'; export default function () { return ; diff --git a/src/app/(main)/reports/page.tsx b/src/app/(main)/reports/page.tsx index ef4e56ada..621281c4d 100644 --- a/src/app/(main)/reports/page.tsx +++ b/src/app/(main)/reports/page.tsx @@ -1,4 +1,4 @@ -import ReportsPage from './ReportsPage'; +import { ReportsPage } from './ReportsPage'; import { Metadata } from 'next'; export default function () { diff --git a/src/app/(main)/reports/retention/RetentionParameters.tsx b/src/app/(main)/reports/retention/RetentionParameters.tsx index 56cbdbd38..cc421fb12 100644 --- a/src/app/(main)/reports/retention/RetentionParameters.tsx +++ b/src/app/(main)/reports/retention/RetentionParameters.tsx @@ -42,5 +42,3 @@ export function RetentionParameters() { ); } - -export default RetentionParameters; diff --git a/src/app/(main)/reports/retention/RetentionReport.tsx b/src/app/(main)/reports/retention/RetentionReport.tsx index 054a1a66b..062055706 100644 --- a/src/app/(main)/reports/retention/RetentionReport.tsx +++ b/src/app/(main)/reports/retention/RetentionReport.tsx @@ -1,5 +1,5 @@ -import RetentionTable from './RetentionTable'; -import RetentionParameters from './RetentionParameters'; +import { RetentionTable } from './RetentionTable'; +import { RetentionParameters } from './RetentionParameters'; import Report from '../[reportId]/Report'; import ReportHeader from '../[reportId]/ReportHeader'; import ReportMenu from '../[reportId]/ReportMenu'; @@ -18,7 +18,7 @@ const defaultParameters = { }, }; -export default function RetentionReport({ reportId }: { reportId?: string }) { +export function RetentionReport({ reportId }: { reportId?: string }) { return ( } /> diff --git a/src/app/(main)/reports/retention/RetentionReportPage.tsx b/src/app/(main)/reports/retention/RetentionReportPage.tsx index 4d3e19e9d..a12c690c0 100644 --- a/src/app/(main)/reports/retention/RetentionReportPage.tsx +++ b/src/app/(main)/reports/retention/RetentionReportPage.tsx @@ -1,8 +1,8 @@ 'use client'; import { Metadata } from 'next'; -import RetentionReport from './RetentionReport'; +import { RetentionReport } from './RetentionReport'; -export default function RetentionReportPage() { +export function RetentionReportPage() { return ; } diff --git a/src/app/(main)/reports/retention/RetentionTable.tsx b/src/app/(main)/reports/retention/RetentionTable.tsx index 23f0a8b0e..3e57c2d0c 100644 --- a/src/app/(main)/reports/retention/RetentionTable.tsx +++ b/src/app/(main)/reports/retention/RetentionTable.tsx @@ -1,7 +1,7 @@ import { useContext } from 'react'; import classNames from 'classnames'; import { ReportContext } from '../[reportId]/Report'; -import EmptyPlaceholder from '@/components/common/EmptyPlaceholder'; +import { EmptyPlaceholder } from '@/components/common/EmptyPlaceholder'; import { useMessages, useLocale } from '@/components/hooks'; import { formatDate } from '@/lib/date'; import styles from './RetentionTable.module.css'; @@ -75,5 +75,3 @@ export function RetentionTable({ days = DAYS }) { ); } - -export default RetentionTable; diff --git a/src/app/(main)/reports/retention/page.tsx b/src/app/(main)/reports/retention/page.tsx index 0f04fe981..98560c527 100644 --- a/src/app/(main)/reports/retention/page.tsx +++ b/src/app/(main)/reports/retention/page.tsx @@ -1,5 +1,5 @@ import { Metadata } from 'next'; -import RetentionReportPage from './RetentionReportPage'; +import { RetentionReportPage } from './RetentionReportPage'; export default function () { return ; diff --git a/src/app/(main)/reports/revenue/RevenueParameters.tsx b/src/app/(main)/reports/revenue/RevenueParameters.tsx index 5cee14de9..6919bea3e 100644 --- a/src/app/(main)/reports/revenue/RevenueParameters.tsx +++ b/src/app/(main)/reports/revenue/RevenueParameters.tsx @@ -1,5 +1,5 @@ import { useMessages } from '@/components/hooks'; -import useRevenueValues from '@/components/hooks/queries/useRevenueValues'; +import { useRevenueValues } from '@/components/hooks/queries/useRevenueValues'; import { useContext } from 'react'; import { Dropdown, Form, FormButtons, FormInput, FormRow, Item, SubmitButton } from 'react-basics'; import BaseParameters from '../[reportId]/BaseParameters'; @@ -42,5 +42,3 @@ export function RevenueParameters() { ); } - -export default RevenueParameters; diff --git a/src/app/(main)/reports/revenue/RevenueReport.tsx b/src/app/(main)/reports/revenue/RevenueReport.tsx index 8400c6516..2cdd6bb89 100644 --- a/src/app/(main)/reports/revenue/RevenueReport.tsx +++ b/src/app/(main)/reports/revenue/RevenueReport.tsx @@ -4,15 +4,15 @@ import Report from '../[reportId]/Report'; import ReportBody from '../[reportId]/ReportBody'; import ReportHeader from '../[reportId]/ReportHeader'; import ReportMenu from '../[reportId]/ReportMenu'; -import RevenueParameters from './RevenueParameters'; -import RevenueView from './RevenueView'; +import { RevenueParameters } from './RevenueParameters'; +import { RevenueView } from './RevenueView'; const defaultParameters = { type: REPORT_TYPES.revenue, parameters: {}, }; -export default function RevenueReport({ reportId }: { reportId?: string }) { +export function RevenueReport({ reportId }: { reportId?: string }) { return ( } /> diff --git a/src/app/(main)/reports/revenue/RevenueReportPage.tsx b/src/app/(main)/reports/revenue/RevenueReportPage.tsx index e48c29d2e..990c62c9d 100644 --- a/src/app/(main)/reports/revenue/RevenueReportPage.tsx +++ b/src/app/(main)/reports/revenue/RevenueReportPage.tsx @@ -1,6 +1,6 @@ 'use client'; -import RevenueReport from './RevenueReport'; +import { RevenueReport } from './RevenueReport'; -export default function RevenueReportPage() { +export function RevenueReportPage() { return ; } diff --git a/src/app/(main)/reports/revenue/RevenueTable.tsx b/src/app/(main)/reports/revenue/RevenueTable.tsx index 184797e99..9e5ab2162 100644 --- a/src/app/(main)/reports/revenue/RevenueTable.tsx +++ b/src/app/(main)/reports/revenue/RevenueTable.tsx @@ -1,4 +1,4 @@ -import EmptyPlaceholder from '@/components/common/EmptyPlaceholder'; +import { EmptyPlaceholder } from '@/components/common/EmptyPlaceholder'; import { useMessages } from '@/components/hooks'; import { useContext } from 'react'; import { GridColumn, GridTable } from 'react-basics'; @@ -34,5 +34,3 @@ export function RevenueTable() { ); } - -export default RevenueTable; diff --git a/src/app/(main)/reports/revenue/RevenueView.tsx b/src/app/(main)/reports/revenue/RevenueView.tsx index bd3d6c637..9af8b19b9 100644 --- a/src/app/(main)/reports/revenue/RevenueView.tsx +++ b/src/app/(main)/reports/revenue/RevenueView.tsx @@ -1,19 +1,19 @@ import classNames from 'classnames'; import { colord } from 'colord'; -import BarChart from '@/components/charts/BarChart'; -import PieChart from '@/components/charts/PieChart'; -import TypeIcon from '@/components/common/TypeIcon'; +import { BarChart } from '@/components/charts/BarChart'; +import { PieChart } from '@/components/charts/PieChart'; +import { TypeIcon } from '@/components/common/TypeIcon'; import { useCountryNames, useLocale, useMessages } from '@/components/hooks'; import { GridRow } from '@/components/layout/Grid'; -import ListTable from '@/components/metrics/ListTable'; -import MetricCard from '@/components/metrics/MetricCard'; -import MetricsBar from '@/components/metrics/MetricsBar'; +import { ListTable } from '@/components/metrics/ListTable'; +import { MetricCard } from '@/components/metrics/MetricCard'; +import { MetricsBar } from '@/components/metrics/MetricsBar'; import { renderDateLabels } from '@/lib/charts'; import { CHART_COLORS } from '@/lib/constants'; import { formatLongCurrency, formatLongNumber } from '@/lib/format'; import { useCallback, useContext, useMemo } from 'react'; import { ReportContext } from '../[reportId]/Report'; -import RevenueTable from './RevenueTable'; +import { RevenueTable } from './RevenueTable'; import styles from './RevenueView.module.css'; export interface RevenueViewProps { @@ -152,5 +152,3 @@ export function RevenueView({ isLoading }: RevenueViewProps) { ); } - -export default RevenueView; diff --git a/src/app/(main)/reports/revenue/page.tsx b/src/app/(main)/reports/revenue/page.tsx index a8b79f086..402812593 100644 --- a/src/app/(main)/reports/revenue/page.tsx +++ b/src/app/(main)/reports/revenue/page.tsx @@ -1,4 +1,4 @@ -import RevenueReportPage from './RevenueReportPage'; +import { RevenueReportPage } from './RevenueReportPage'; import { Metadata } from 'next'; export default function () { diff --git a/src/app/(main)/reports/utm/UTMParameters.tsx b/src/app/(main)/reports/utm/UTMParameters.tsx index 5ae6017f2..2447668e3 100644 --- a/src/app/(main)/reports/utm/UTMParameters.tsx +++ b/src/app/(main)/reports/utm/UTMParameters.tsx @@ -32,5 +32,3 @@ export function UTMParameters() { ); } - -export default UTMParameters; diff --git a/src/app/(main)/reports/utm/UTMReport.tsx b/src/app/(main)/reports/utm/UTMReport.tsx index d9d2f579a..8898120e7 100644 --- a/src/app/(main)/reports/utm/UTMReport.tsx +++ b/src/app/(main)/reports/utm/UTMReport.tsx @@ -3,8 +3,8 @@ import Report from '../[reportId]/Report'; import ReportHeader from '../[reportId]/ReportHeader'; import ReportMenu from '../[reportId]/ReportMenu'; import ReportBody from '../[reportId]/ReportBody'; -import UTMParameters from './UTMParameters'; -import UTMView from './UTMView'; +import { UTMParameters } from './UTMParameters'; +import { UTMView } from './UTMView'; import Tag from '@/assets/tag.svg'; import { REPORT_TYPES } from '@/lib/constants'; @@ -13,7 +13,7 @@ const defaultParameters = { parameters: {}, }; -export default function UTMReport({ reportId }: { reportId?: string }) { +export function UTMReport({ reportId }: { reportId?: string }) { return ( } /> diff --git a/src/app/(main)/reports/utm/UTMReportPage.tsx b/src/app/(main)/reports/utm/UTMReportPage.tsx index 926a42632..92db240f9 100644 --- a/src/app/(main)/reports/utm/UTMReportPage.tsx +++ b/src/app/(main)/reports/utm/UTMReportPage.tsx @@ -1,5 +1,5 @@ -import UTMReport from './UTMReport'; +import { UTMReport } from './UTMReport'; -export default function UTMReportPage() { +export function UTMReportPage() { return ; } diff --git a/src/app/(main)/reports/utm/UTMView.tsx b/src/app/(main)/reports/utm/UTMView.tsx index ba0258243..774438140 100644 --- a/src/app/(main)/reports/utm/UTMView.tsx +++ b/src/app/(main)/reports/utm/UTMView.tsx @@ -2,8 +2,8 @@ import { useContext } from 'react'; import { firstBy } from 'thenby'; import { ReportContext } from '../[reportId]/Report'; import { CHART_COLORS, UTM_PARAMS } from '@/lib/constants'; -import PieChart from '@/components/charts/PieChart'; -import ListTable from '@/components/metrics/ListTable'; +import { PieChart } from '@/components/charts/PieChart'; +import { ListTable } from '@/components/metrics/ListTable'; import styles from './UTMView.module.css'; import { useMessages } from '@/components/hooks'; @@ -15,7 +15,7 @@ function toArray(data: { [key: string]: number } = {}) { .sort(firstBy('value', -1)); } -export default function UTMView() { +export function UTMView() { const { formatMessage, labels } = useMessages(); const { report } = useContext(ReportContext); const { data } = report || {}; diff --git a/src/app/(main)/reports/utm/page.tsx b/src/app/(main)/reports/utm/page.tsx index 7fa506608..110e72c21 100644 --- a/src/app/(main)/reports/utm/page.tsx +++ b/src/app/(main)/reports/utm/page.tsx @@ -1,5 +1,5 @@ import { Metadata } from 'next'; -import UTMReportPage from './UTMReportPage'; +import { UTMReportPage } from './UTMReportPage'; export default function () { return ; diff --git a/src/app/(main)/settings/SettingsLayout.tsx b/src/app/(main)/settings/SettingsLayout.tsx index 08dcc3eb1..8e3f71ba1 100644 --- a/src/app/(main)/settings/SettingsLayout.tsx +++ b/src/app/(main)/settings/SettingsLayout.tsx @@ -1,9 +1,9 @@ 'use client'; import { ReactNode } from 'react'; import { useLogin, useMessages } from '@/components/hooks'; -import MenuLayout from '@/components/layout/MenuLayout'; +import { MenuLayout } from '@/components/layout/MenuLayout'; -export default function SettingsLayout({ children }: { children: ReactNode }) { +export function SettingsLayout({ children }: { children: ReactNode }) { const { user } = useLogin(); const { formatMessage, labels } = useMessages(); diff --git a/src/app/(main)/settings/layout.tsx b/src/app/(main)/settings/layout.tsx index 573897d5e..94aed1fd0 100644 --- a/src/app/(main)/settings/layout.tsx +++ b/src/app/(main)/settings/layout.tsx @@ -1,4 +1,4 @@ -import SettingsLayout from './SettingsLayout'; +import { SettingsLayout } from './SettingsLayout'; import { Metadata } from 'next'; export default function ({ children }) { diff --git a/src/app/(main)/settings/teams/TeamAddForm.tsx b/src/app/(main)/settings/teams/TeamAddForm.tsx index e940aa17a..c53db62a1 100644 --- a/src/app/(main)/settings/teams/TeamAddForm.tsx +++ b/src/app/(main)/settings/teams/TeamAddForm.tsx @@ -43,5 +43,3 @@ export function TeamAddForm({ onSave, onClose }: { onSave: () => void; onClose: ); } - -export default TeamAddForm; diff --git a/src/app/(main)/settings/teams/TeamJoinForm.tsx b/src/app/(main)/settings/teams/TeamJoinForm.tsx index 0a82260c7..e46e9d6a7 100644 --- a/src/app/(main)/settings/teams/TeamJoinForm.tsx +++ b/src/app/(main)/settings/teams/TeamJoinForm.tsx @@ -41,5 +41,3 @@ export function TeamJoinForm({ onSave, onClose }: { onSave: () => void; onClose: ); } - -export default TeamJoinForm; diff --git a/src/app/(main)/settings/teams/TeamLeaveButton.tsx b/src/app/(main)/settings/teams/TeamLeaveButton.tsx index 5f5b54f3e..4d373c54a 100644 --- a/src/app/(main)/settings/teams/TeamLeaveButton.tsx +++ b/src/app/(main)/settings/teams/TeamLeaveButton.tsx @@ -1,7 +1,7 @@ import { useLocale, useLogin, useMessages, useModified } from '@/components/hooks'; import { useRouter } from 'next/navigation'; import { Button, Icon, Icons, Modal, ModalTrigger, Text } from 'react-basics'; -import TeamDeleteForm from './TeamLeaveForm'; +import { TeamLeaveForm } from './TeamLeaveForm'; export function TeamLeaveButton({ teamId, teamName }: { teamId: string; teamName: string }) { const { formatMessage, labels } = useMessages(); @@ -25,7 +25,7 @@ export function TeamLeaveButton({ teamId, teamName }: { teamId: string; teamName {(close: () => void) => ( - ); } - -export default TeamLeaveButton; diff --git a/src/app/(main)/settings/teams/TeamLeaveForm.tsx b/src/app/(main)/settings/teams/TeamLeaveForm.tsx index daf464341..0d555c4d9 100644 --- a/src/app/(main)/settings/teams/TeamLeaveForm.tsx +++ b/src/app/(main)/settings/teams/TeamLeaveForm.tsx @@ -1,5 +1,5 @@ import { useApi, useMessages, useModified } from '@/components/hooks'; -import ConfirmationForm from '@/components/common/ConfirmationForm'; +import { ConfirmationForm } from '@/components/common/ConfirmationForm'; export function TeamLeaveForm({ teamId, @@ -42,5 +42,3 @@ export function TeamLeaveForm({ /> ); } - -export default TeamLeaveForm; diff --git a/src/app/(main)/settings/teams/TeamsAddButton.tsx b/src/app/(main)/settings/teams/TeamsAddButton.tsx index 58c138a8a..72feefe6d 100644 --- a/src/app/(main)/settings/teams/TeamsAddButton.tsx +++ b/src/app/(main)/settings/teams/TeamsAddButton.tsx @@ -1,7 +1,7 @@ import { Button, Icon, Modal, ModalTrigger, Text, useToasts } from 'react-basics'; -import Icons from '@/components/icons'; +import { Icons } from '@/components/icons'; import { useMessages, useModified } from '@/components/hooks'; -import TeamAddForm from './TeamAddForm'; +import { TeamAddForm } from './TeamAddForm'; import { messages } from '@/components/messages'; export function TeamsAddButton({ onSave }: { onSave?: () => void }) { @@ -29,5 +29,3 @@ export function TeamsAddButton({ onSave }: { onSave?: () => void }) { ); } - -export default TeamsAddButton; diff --git a/src/app/(main)/settings/teams/TeamsDataTable.tsx b/src/app/(main)/settings/teams/TeamsDataTable.tsx index 9b8c9b278..f04edd1b8 100644 --- a/src/app/(main)/settings/teams/TeamsDataTable.tsx +++ b/src/app/(main)/settings/teams/TeamsDataTable.tsx @@ -1,5 +1,5 @@ -import DataTable from '@/components/common/DataTable'; -import TeamsTable from '@/app/(main)/settings/teams/TeamsTable'; +import { DataTable } from '@/components/common/DataTable'; +import { TeamsTable } from '@/app/(main)/settings/teams/TeamsTable'; import { useLogin, useTeams } from '@/components/hooks'; import { ReactNode } from 'react'; @@ -23,5 +23,3 @@ export function TeamsDataTable({ ); } - -export default TeamsDataTable; diff --git a/src/app/(main)/settings/teams/TeamsHeader.tsx b/src/app/(main)/settings/teams/TeamsHeader.tsx index e1911a197..1dcf5a6e5 100644 --- a/src/app/(main)/settings/teams/TeamsHeader.tsx +++ b/src/app/(main)/settings/teams/TeamsHeader.tsx @@ -1,9 +1,9 @@ import { Flexbox } from 'react-basics'; -import PageHeader from '@/components/layout/PageHeader'; +import { PageHeader } from '@/components/layout/PageHeader'; import { ROLES } from '@/lib/constants'; import { useLogin, useMessages } from '@/components/hooks'; -import TeamsJoinButton from './TeamsJoinButton'; -import TeamsAddButton from './TeamsAddButton'; +import { TeamsJoinButton } from './TeamsJoinButton'; +import { TeamsAddButton } from './TeamsAddButton'; export function TeamsHeader({ allowCreate = true }: { allowCreate?: boolean }) { const { formatMessage, labels } = useMessages(); @@ -19,5 +19,3 @@ export function TeamsHeader({ allowCreate = true }: { allowCreate?: boolean }) { ); } - -export default TeamsHeader; diff --git a/src/app/(main)/settings/teams/TeamsJoinButton.tsx b/src/app/(main)/settings/teams/TeamsJoinButton.tsx index bbf2d6858..72899c707 100644 --- a/src/app/(main)/settings/teams/TeamsJoinButton.tsx +++ b/src/app/(main)/settings/teams/TeamsJoinButton.tsx @@ -1,7 +1,7 @@ import { Button, Icon, Modal, ModalTrigger, Text, useToasts } from 'react-basics'; -import Icons from '@/components/icons'; +import { Icons } from '@/components/icons'; import { useMessages, useModified } from '@/components/hooks'; -import TeamJoinForm from './TeamJoinForm'; +import { TeamJoinForm } from './TeamJoinForm'; export function TeamsJoinButton() { const { formatMessage, labels, messages } = useMessages(); @@ -27,5 +27,3 @@ export function TeamsJoinButton() { ); } - -export default TeamsJoinButton; diff --git a/src/app/(main)/settings/teams/TeamsSettingsPage.tsx b/src/app/(main)/settings/teams/TeamsSettingsPage.tsx index 9b45845bc..144232417 100644 --- a/src/app/(main)/settings/teams/TeamsSettingsPage.tsx +++ b/src/app/(main)/settings/teams/TeamsSettingsPage.tsx @@ -1,8 +1,8 @@ 'use client'; -import TeamsDataTable from './TeamsDataTable'; -import TeamsHeader from './TeamsHeader'; +import { TeamsDataTable } from './TeamsDataTable'; +import { TeamsHeader } from './TeamsHeader'; -export default function TeamsSettingsPage() { +export function TeamsSettingsPage() { return ( <> diff --git a/src/app/(main)/settings/teams/TeamsTable.tsx b/src/app/(main)/settings/teams/TeamsTable.tsx index 8e7efa275..5028f20ac 100644 --- a/src/app/(main)/settings/teams/TeamsTable.tsx +++ b/src/app/(main)/settings/teams/TeamsTable.tsx @@ -1,8 +1,8 @@ import { GridColumn, GridTable, Icon, Text } from 'react-basics'; import { useMessages } from '@/components/hooks'; -import Icons from '@/components/icons'; +import { Icons } from '@/components/icons'; import { ROLES } from '@/lib/constants'; -import LinkButton from '@/components/common/LinkButton'; +import { LinkButton } from '@/components/common/LinkButton'; export function TeamsTable({ data = [], @@ -45,5 +45,3 @@ export function TeamsTable({ ); } - -export default TeamsTable; diff --git a/src/app/(main)/settings/teams/WebsiteTags.tsx b/src/app/(main)/settings/teams/WebsiteTags.tsx index 4a0f109d8..3258471ba 100644 --- a/src/app/(main)/settings/teams/WebsiteTags.tsx +++ b/src/app/(main)/settings/teams/WebsiteTags.tsx @@ -35,5 +35,3 @@ export function WebsiteTags({ ); } - -export default WebsiteTags; diff --git a/src/app/(main)/settings/teams/page.tsx b/src/app/(main)/settings/teams/page.tsx index 4342b607f..dd3bdade6 100644 --- a/src/app/(main)/settings/teams/page.tsx +++ b/src/app/(main)/settings/teams/page.tsx @@ -1,5 +1,5 @@ import { Metadata } from 'next'; -import TeamsSettingsPage from './TeamsSettingsPage'; +import { TeamsSettingsPage } from './TeamsSettingsPage'; export default function () { return ; diff --git a/src/app/(main)/settings/users/UserAddButton.tsx b/src/app/(main)/settings/users/UserAddButton.tsx index e1b048420..ce08b05ce 100644 --- a/src/app/(main)/settings/users/UserAddButton.tsx +++ b/src/app/(main)/settings/users/UserAddButton.tsx @@ -1,5 +1,5 @@ import { Button, Icon, Text, Modal, Icons, ModalTrigger, useToasts } from 'react-basics'; -import UserAddForm from './UserAddForm'; +import { UserAddForm } from './UserAddForm'; import { useMessages, useModified } from '@/components/hooks'; export function UserAddButton({ onSave }: { onSave?: () => void }) { @@ -27,5 +27,3 @@ export function UserAddButton({ onSave }: { onSave?: () => void }) { ); } - -export default UserAddButton; diff --git a/src/app/(main)/settings/users/UserAddForm.tsx b/src/app/(main)/settings/users/UserAddForm.tsx index 13f2faf59..ef8d37783 100644 --- a/src/app/(main)/settings/users/UserAddForm.tsx +++ b/src/app/(main)/settings/users/UserAddForm.tsx @@ -73,5 +73,3 @@ export function UserAddForm({ onSave, onClose }) { ); } - -export default UserAddForm; diff --git a/src/app/(main)/settings/users/UserDeleteButton.tsx b/src/app/(main)/settings/users/UserDeleteButton.tsx index 0909720e1..448f87cf6 100644 --- a/src/app/(main)/settings/users/UserDeleteButton.tsx +++ b/src/app/(main)/settings/users/UserDeleteButton.tsx @@ -1,6 +1,6 @@ import { Button, Icon, Icons, Modal, ModalTrigger, Text } from 'react-basics'; import { useMessages, useLogin } from '@/components/hooks'; -import UserDeleteForm from './UserDeleteForm'; +import { UserDeleteForm } from './UserDeleteForm'; export function UserDeleteButton({ userId, @@ -30,5 +30,3 @@ export function UserDeleteButton({ ); } - -export default UserDeleteButton; diff --git a/src/app/(main)/settings/users/UserDeleteForm.tsx b/src/app/(main)/settings/users/UserDeleteForm.tsx index 3ac7c1186..6db585cd8 100644 --- a/src/app/(main)/settings/users/UserDeleteForm.tsx +++ b/src/app/(main)/settings/users/UserDeleteForm.tsx @@ -1,5 +1,5 @@ import { useApi, useMessages, useModified } from '@/components/hooks'; -import ConfirmationForm from '@/components/common/ConfirmationForm'; +import { ConfirmationForm } from '@/components/common/ConfirmationForm'; export function UserDeleteForm({ userId, username, onSave, onClose }) { const { messages, labels, formatMessage } = useMessages(); @@ -28,5 +28,3 @@ export function UserDeleteForm({ userId, username, onSave, onClose }) { /> ); } - -export default UserDeleteForm; diff --git a/src/app/(main)/settings/users/UsersDataTable.tsx b/src/app/(main)/settings/users/UsersDataTable.tsx index 867f4090d..0d3c9df6b 100644 --- a/src/app/(main)/settings/users/UsersDataTable.tsx +++ b/src/app/(main)/settings/users/UsersDataTable.tsx @@ -1,6 +1,6 @@ -import DataTable from '@/components/common/DataTable'; +import { DataTable } from '@/components/common/DataTable'; import { useUsers } from '@/components/hooks'; -import UsersTable from './UsersTable'; +import { UsersTable } from './UsersTable'; import { ReactNode } from 'react'; export function UsersDataTable({ @@ -18,5 +18,3 @@ export function UsersDataTable({ ); } - -export default UsersDataTable; diff --git a/src/app/(main)/settings/users/UsersHeader.tsx b/src/app/(main)/settings/users/UsersHeader.tsx index d07a159f6..b94f0c263 100644 --- a/src/app/(main)/settings/users/UsersHeader.tsx +++ b/src/app/(main)/settings/users/UsersHeader.tsx @@ -1,6 +1,6 @@ -import PageHeader from '@/components/layout/PageHeader'; +import { PageHeader } from '@/components/layout/PageHeader'; import { useMessages } from '@/components/hooks'; -import UserAddButton from './UserAddButton'; +import { UserAddButton } from './UserAddButton'; export function UsersHeader({ onAdd }: { onAdd?: () => void }) { const { formatMessage, labels } = useMessages(); @@ -11,5 +11,3 @@ export function UsersHeader({ onAdd }: { onAdd?: () => void }) { ); } - -export default UsersHeader; diff --git a/src/app/(main)/settings/users/UsersSettingsPage.tsx b/src/app/(main)/settings/users/UsersSettingsPage.tsx index 664f58d1b..d51ea362b 100644 --- a/src/app/(main)/settings/users/UsersSettingsPage.tsx +++ b/src/app/(main)/settings/users/UsersSettingsPage.tsx @@ -1,8 +1,8 @@ 'use client'; -import UsersDataTable from './UsersDataTable'; -import UsersHeader from './UsersHeader'; +import { UsersDataTable } from './UsersDataTable'; +import { UsersHeader } from './UsersHeader'; -export default function UsersSettingsPage() { +export function UsersSettingsPage() { return ( <> diff --git a/src/app/(main)/settings/users/UsersTable.tsx b/src/app/(main)/settings/users/UsersTable.tsx index c698f38b5..1e5aa1d3f 100644 --- a/src/app/(main)/settings/users/UsersTable.tsx +++ b/src/app/(main)/settings/users/UsersTable.tsx @@ -2,8 +2,8 @@ import { Text, Icon, Icons, GridTable, GridColumn } from 'react-basics'; import { formatDistance } from 'date-fns'; import { ROLES } from '@/lib/constants'; import { useMessages, useLocale } from '@/components/hooks'; -import UserDeleteButton from './UserDeleteButton'; -import LinkButton from '@/components/common/LinkButton'; +import { UserDeleteButton } from './UserDeleteButton'; +import { LinkButton } from '@/components/common/LinkButton'; export function UsersTable({ data = [], @@ -57,5 +57,3 @@ export function UsersTable({ ); } - -export default UsersTable; diff --git a/src/app/(main)/settings/users/[userId]/UserEditForm.tsx b/src/app/(main)/settings/users/[userId]/UserEditForm.tsx index 70f21f632..a10a5f4b7 100644 --- a/src/app/(main)/settings/users/[userId]/UserEditForm.tsx +++ b/src/app/(main)/settings/users/[userId]/UserEditForm.tsx @@ -87,5 +87,3 @@ export function UserEditForm({ userId, onSave }: { userId: string; onSave?: () = ); } - -export default UserEditForm; diff --git a/src/app/(main)/settings/users/[userId]/UserPage.tsx b/src/app/(main)/settings/users/[userId]/UserPage.tsx index 50d5ab7ed..ab784dc95 100644 --- a/src/app/(main)/settings/users/[userId]/UserPage.tsx +++ b/src/app/(main)/settings/users/[userId]/UserPage.tsx @@ -1,6 +1,6 @@ 'use client'; -import UserSettings from './UserSettings'; -import UserProvider from './UserProvider'; +import { UserSettings } from './UserSettings'; +import { UserProvider } from './UserProvider'; export default function ({ userId }: { userId: string }) { return ( diff --git a/src/app/(main)/settings/users/[userId]/UserProvider.tsx b/src/app/(main)/settings/users/[userId]/UserProvider.tsx index ed559c910..58ecc36c8 100644 --- a/src/app/(main)/settings/users/[userId]/UserProvider.tsx +++ b/src/app/(main)/settings/users/[userId]/UserProvider.tsx @@ -20,5 +20,3 @@ export function UserProvider({ userId, children }: { userId: string; children: R return {children}; } - -export default UserProvider; diff --git a/src/app/(main)/settings/users/[userId]/UserSettings.tsx b/src/app/(main)/settings/users/[userId]/UserSettings.tsx index 0d98205ff..9af656b8d 100644 --- a/src/app/(main)/settings/users/[userId]/UserSettings.tsx +++ b/src/app/(main)/settings/users/[userId]/UserSettings.tsx @@ -1,12 +1,12 @@ import { Key, useContext, useState } from 'react'; import { Item, Tabs, useToasts } from 'react-basics'; -import Icons from '@/components/icons'; -import UserEditForm from './UserEditForm'; -import PageHeader from '@/components/layout/PageHeader'; +import { Icons } from '@/components/icons'; +import { UserEditForm } from './UserEditForm'; +import { PageHeader } from '@/components/layout/PageHeader'; import { useMessages } from '@/components/hooks'; -import UserWebsites from './UserWebsites'; +import { UserWebsites } from './UserWebsites'; import { UserContext } from './UserProvider'; -import Breadcrumb from '@/components/common/Breadcrumb'; +import { Breadcrumb } from '@/components/common/Breadcrumb'; export function UserSettings({ userId }: { userId: string }) { const { formatMessage, labels, messages } = useMessages(); @@ -44,5 +44,3 @@ export function UserSettings({ userId }: { userId: string }) { ); } - -export default UserSettings; diff --git a/src/app/(main)/settings/users/[userId]/UserWebsites.tsx b/src/app/(main)/settings/users/[userId]/UserWebsites.tsx index 15521b17b..d53a50f2c 100644 --- a/src/app/(main)/settings/users/[userId]/UserWebsites.tsx +++ b/src/app/(main)/settings/users/[userId]/UserWebsites.tsx @@ -1,5 +1,5 @@ -import WebsitesTable from '@/app/(main)/settings/websites/WebsitesTable'; -import DataTable from '@/components/common/DataTable'; +import { WebsitesTable } from '@/app/(main)/settings/websites/WebsitesTable'; +import { DataTable } from '@/components/common/DataTable'; import { useWebsites } from '@/components/hooks'; export function UserWebsites({ userId }) { @@ -13,5 +13,3 @@ export function UserWebsites({ userId }) { ); } - -export default UserWebsites; diff --git a/src/app/(main)/settings/users/[userId]/page.tsx b/src/app/(main)/settings/users/[userId]/page.tsx index 3b3a3fac9..b410643c5 100644 --- a/src/app/(main)/settings/users/[userId]/page.tsx +++ b/src/app/(main)/settings/users/[userId]/page.tsx @@ -1,4 +1,4 @@ -import UserPage from './UserPage'; +import { UserPage } from './UserPage'; import { Metadata } from 'next'; export default async function ({ params }: { params: { userId: string } }) { diff --git a/src/app/(main)/settings/users/page.tsx b/src/app/(main)/settings/users/page.tsx index 01d5156f2..311e4cb27 100644 --- a/src/app/(main)/settings/users/page.tsx +++ b/src/app/(main)/settings/users/page.tsx @@ -1,5 +1,5 @@ import { Metadata } from 'next'; -import UsersSettingsPage from './UsersSettingsPage'; +import { UsersSettingsPage } from './UsersSettingsPage'; export default function () { return ; diff --git a/src/app/(main)/settings/websites/WebsiteAddButton.tsx b/src/app/(main)/settings/websites/WebsiteAddButton.tsx index 6f32fc9f8..24be990c1 100644 --- a/src/app/(main)/settings/websites/WebsiteAddButton.tsx +++ b/src/app/(main)/settings/websites/WebsiteAddButton.tsx @@ -1,6 +1,6 @@ import { useMessages, useModified } from '@/components/hooks'; import { Button, Icon, Icons, Modal, ModalTrigger, Text, useToasts } from 'react-basics'; -import WebsiteAddForm from './WebsiteAddForm'; +import { WebsiteAddForm } from './WebsiteAddForm'; export function WebsiteAddButton({ teamId, onSave }: { teamId: string; onSave?: () => void }) { const { formatMessage, labels, messages } = useMessages(); @@ -29,5 +29,3 @@ export function WebsiteAddButton({ teamId, onSave }: { teamId: string; onSave?: ); } - -export default WebsiteAddButton; diff --git a/src/app/(main)/settings/websites/WebsiteAddForm.tsx b/src/app/(main)/settings/websites/WebsiteAddForm.tsx index 906724120..4fc8d6763 100644 --- a/src/app/(main)/settings/websites/WebsiteAddForm.tsx +++ b/src/app/(main)/settings/websites/WebsiteAddForm.tsx @@ -71,5 +71,3 @@ export function WebsiteAddForm({ ); } - -export default WebsiteAddForm; diff --git a/src/app/(main)/settings/websites/WebsitesDataTable.tsx b/src/app/(main)/settings/websites/WebsitesDataTable.tsx index 023df8573..f62bb9e64 100644 --- a/src/app/(main)/settings/websites/WebsitesDataTable.tsx +++ b/src/app/(main)/settings/websites/WebsitesDataTable.tsx @@ -1,6 +1,6 @@ import { ReactNode } from 'react'; -import WebsitesTable from '@/app/(main)/settings/websites/WebsitesTable'; -import DataTable from '@/components/common/DataTable'; +import { WebsitesTable } from '@/app/(main)/settings/websites/WebsitesTable'; +import { DataTable } from '@/components/common/DataTable'; import { useWebsites } from '@/components/hooks'; export function WebsitesDataTable({ @@ -32,5 +32,3 @@ export function WebsitesDataTable({ ); } - -export default WebsitesDataTable; diff --git a/src/app/(main)/settings/websites/WebsitesHeader.tsx b/src/app/(main)/settings/websites/WebsitesHeader.tsx index 34e87a13e..17e3bccb1 100644 --- a/src/app/(main)/settings/websites/WebsitesHeader.tsx +++ b/src/app/(main)/settings/websites/WebsitesHeader.tsx @@ -1,6 +1,6 @@ import { useMessages } from '@/components/hooks'; -import PageHeader from '@/components/layout/PageHeader'; -import WebsiteAddButton from './WebsiteAddButton'; +import { PageHeader } from '@/components/layout/PageHeader'; +import { WebsiteAddButton } from './WebsiteAddButton'; export interface WebsitesHeaderProps { teamId?: string; @@ -16,5 +16,3 @@ export function WebsitesHeader({ teamId, allowCreate = true }: WebsitesHeaderPro ); } - -export default WebsitesHeader; diff --git a/src/app/(main)/settings/websites/WebsitesSettingsPage.tsx b/src/app/(main)/settings/websites/WebsitesSettingsPage.tsx index 61909a9e5..6965f4fe6 100644 --- a/src/app/(main)/settings/websites/WebsitesSettingsPage.tsx +++ b/src/app/(main)/settings/websites/WebsitesSettingsPage.tsx @@ -1,10 +1,10 @@ 'use client'; import { useLogin } from '@/components/hooks'; -import WebsitesDataTable from './WebsitesDataTable'; -import WebsitesHeader from './WebsitesHeader'; +import { WebsitesDataTable } from './WebsitesDataTable'; +import { WebsitesHeader } from './WebsitesHeader'; import { ROLES } from '@/lib/constants'; -export default function WebsitesSettingsPage({ teamId }: { teamId: string }) { +export function WebsitesSettingsPage({ teamId }: { teamId: string }) { const { user } = useLogin(); const canCreate = user.role !== ROLES.viewOnly; diff --git a/src/app/(main)/settings/websites/WebsitesTable.tsx b/src/app/(main)/settings/websites/WebsitesTable.tsx index 79749b972..0d9ea11b5 100644 --- a/src/app/(main)/settings/websites/WebsitesTable.tsx +++ b/src/app/(main)/settings/websites/WebsitesTable.tsx @@ -1,7 +1,7 @@ import { ReactNode } from 'react'; import { Text, Icon, Icons, GridTable, GridColumn } from 'react-basics'; import { useMessages, useTeamUrl } from '@/components/hooks'; -import LinkButton from '@/components/common/LinkButton'; +import { LinkButton } from '@/components/common/LinkButton'; export interface WebsitesTableProps { data: any[]; @@ -61,5 +61,3 @@ export function WebsitesTable({ ); } - -export default WebsitesTable; diff --git a/src/app/(main)/settings/websites/[websiteId]/ShareUrl.tsx b/src/app/(main)/settings/websites/[websiteId]/ShareUrl.tsx index 318e4e95b..d091f9639 100644 --- a/src/app/(main)/settings/websites/[websiteId]/ShareUrl.tsx +++ b/src/app/(main)/settings/websites/[websiteId]/ShareUrl.tsx @@ -90,5 +90,3 @@ export function ShareUrl({ hostUrl, onSave }: { hostUrl?: string; onSave?: () => ); } - -export default ShareUrl; diff --git a/src/app/(main)/settings/websites/[websiteId]/TrackingCode.tsx b/src/app/(main)/settings/websites/[websiteId]/TrackingCode.tsx index cacdf689b..f1852c620 100644 --- a/src/app/(main)/settings/websites/[websiteId]/TrackingCode.tsx +++ b/src/app/(main)/settings/websites/[websiteId]/TrackingCode.tsx @@ -25,5 +25,3 @@ export function TrackingCode({ websiteId, hostUrl }: { websiteId: string; hostUr ); } - -export default TrackingCode; diff --git a/src/app/(main)/settings/websites/[websiteId]/WebsiteData.tsx b/src/app/(main)/settings/websites/[websiteId]/WebsiteData.tsx index d11f24df7..bf140c3ff 100644 --- a/src/app/(main)/settings/websites/[websiteId]/WebsiteData.tsx +++ b/src/app/(main)/settings/websites/[websiteId]/WebsiteData.tsx @@ -1,9 +1,9 @@ import { Button, Modal, ModalTrigger, ActionForm } from 'react-basics'; import { useRouter } from 'next/navigation'; import { useLogin, useMessages, useModified, useTeams, useTeamUrl } from '@/components/hooks'; -import WebsiteDeleteForm from './WebsiteDeleteForm'; -import WebsiteResetForm from './WebsiteResetForm'; -import WebsiteTransferForm from './WebsiteTransferForm'; +import { WebsiteDeleteForm } from './WebsiteDeleteForm'; +import { WebsiteResetForm } from './WebsiteResetForm'; +import { WebsiteTransferForm } from './WebsiteTransferForm'; import { ROLES } from '@/lib/constants'; export function WebsiteData({ websiteId, onSave }: { websiteId: string; onSave?: () => void }) { @@ -86,5 +86,3 @@ export function WebsiteData({ websiteId, onSave }: { websiteId: string; onSave?: ); } - -export default WebsiteData; diff --git a/src/app/(main)/settings/websites/[websiteId]/WebsiteDeleteForm.tsx b/src/app/(main)/settings/websites/[websiteId]/WebsiteDeleteForm.tsx index 5eef35442..9958e8cb5 100644 --- a/src/app/(main)/settings/websites/[websiteId]/WebsiteDeleteForm.tsx +++ b/src/app/(main)/settings/websites/[websiteId]/WebsiteDeleteForm.tsx @@ -1,5 +1,5 @@ import { useApi, useMessages } from '@/components/hooks'; -import TypeConfirmationForm from '@/components/common/TypeConfirmationForm'; +import { TypeConfirmationForm } from '@/components/common/TypeConfirmationForm'; const CONFIRM_VALUE = 'DELETE'; @@ -39,5 +39,3 @@ export function WebsiteDeleteForm({ /> ); } - -export default WebsiteDeleteForm; diff --git a/src/app/(main)/settings/websites/[websiteId]/WebsiteEditForm.tsx b/src/app/(main)/settings/websites/[websiteId]/WebsiteEditForm.tsx index aeef7f343..960062681 100644 --- a/src/app/(main)/settings/websites/[websiteId]/WebsiteEditForm.tsx +++ b/src/app/(main)/settings/websites/[websiteId]/WebsiteEditForm.tsx @@ -61,5 +61,3 @@ export function WebsiteEditForm({ websiteId, onSave }: { websiteId: string; onSa ); } - -export default WebsiteEditForm; diff --git a/src/app/(main)/settings/websites/[websiteId]/WebsiteResetForm.tsx b/src/app/(main)/settings/websites/[websiteId]/WebsiteResetForm.tsx index 73886aa92..89e93ad41 100644 --- a/src/app/(main)/settings/websites/[websiteId]/WebsiteResetForm.tsx +++ b/src/app/(main)/settings/websites/[websiteId]/WebsiteResetForm.tsx @@ -1,5 +1,5 @@ import { useApi, useMessages } from '@/components/hooks'; -import TypeConfirmationForm from '@/components/common/TypeConfirmationForm'; +import { TypeConfirmationForm } from '@/components/common/TypeConfirmationForm'; const CONFIRM_VALUE = 'RESET'; @@ -38,5 +38,3 @@ export function WebsiteResetForm({ /> ); } - -export default WebsiteResetForm; diff --git a/src/app/(main)/settings/websites/[websiteId]/WebsiteSettings.tsx b/src/app/(main)/settings/websites/[websiteId]/WebsiteSettings.tsx index 5bea27049..d4a8d5d3a 100644 --- a/src/app/(main)/settings/websites/[websiteId]/WebsiteSettings.tsx +++ b/src/app/(main)/settings/websites/[websiteId]/WebsiteSettings.tsx @@ -1,15 +1,15 @@ import { WebsiteContext } from '@/app/(main)/websites/[websiteId]/WebsiteProvider'; -import Breadcrumb from '@/components/common/Breadcrumb'; +import { Breadcrumb } from '@/components/common/Breadcrumb'; import { useMessages } from '@/components/hooks'; -import Icons from '@/components/icons'; -import PageHeader from '@/components/layout/PageHeader'; +import { Icons } from '@/components/icons'; +import { PageHeader } from '@/components/layout/PageHeader'; import Link from 'next/link'; import { Key, useContext, useState } from 'react'; import { Button, Icon, Item, Tabs, Text, useToasts } from 'react-basics'; -import ShareUrl from './ShareUrl'; -import TrackingCode from './TrackingCode'; -import WebsiteData from './WebsiteData'; -import WebsiteEditForm from './WebsiteEditForm'; +import { ShareUrl } from './ShareUrl'; +import { TrackingCode } from './TrackingCode'; +import { WebsiteData } from './WebsiteData'; +import { WebsiteEditForm } from './WebsiteEditForm'; export function WebsiteSettings({ websiteId, @@ -66,5 +66,3 @@ export function WebsiteSettings({ ); } - -export default WebsiteSettings; diff --git a/src/app/(main)/settings/websites/[websiteId]/WebsiteSettingsPage.tsx b/src/app/(main)/settings/websites/[websiteId]/WebsiteSettingsPage.tsx index 8d7badb83..5df7a8194 100644 --- a/src/app/(main)/settings/websites/[websiteId]/WebsiteSettingsPage.tsx +++ b/src/app/(main)/settings/websites/[websiteId]/WebsiteSettingsPage.tsx @@ -1,8 +1,8 @@ 'use client'; -import WebsiteProvider from '@/app/(main)/websites/[websiteId]/WebsiteProvider'; -import WebsiteSettings from './WebsiteSettings'; +import { WebsiteProvider } from '@/app/(main)/websites/[websiteId]/WebsiteProvider'; +import { WebsiteSettings } from './WebsiteSettings'; -export default function WebsiteSettingsPage({ websiteId }: { websiteId: string }) { +export function WebsiteSettingsPage({ websiteId }: { websiteId: string }) { return ( diff --git a/src/app/(main)/settings/websites/[websiteId]/WebsiteTransferForm.tsx b/src/app/(main)/settings/websites/[websiteId]/WebsiteTransferForm.tsx index 8214fb163..4ac0fc692 100644 --- a/src/app/(main)/settings/websites/[websiteId]/WebsiteTransferForm.tsx +++ b/src/app/(main)/settings/websites/[websiteId]/WebsiteTransferForm.tsx @@ -96,5 +96,3 @@ export function WebsiteTransferForm({ ); } - -export default WebsiteTransferForm; diff --git a/src/app/(main)/settings/websites/[websiteId]/page.tsx b/src/app/(main)/settings/websites/[websiteId]/page.tsx index 7e2feaf26..ce83c7bae 100644 --- a/src/app/(main)/settings/websites/[websiteId]/page.tsx +++ b/src/app/(main)/settings/websites/[websiteId]/page.tsx @@ -1,4 +1,4 @@ -import WebsiteSettingsPage from './WebsiteSettingsPage'; +import { WebsiteSettingsPage } from './WebsiteSettingsPage'; import { Metadata } from 'next'; export default async function ({ params }: { params: { websiteId: string } }) { diff --git a/src/app/(main)/settings/websites/page.tsx b/src/app/(main)/settings/websites/page.tsx index d05be0a5c..1200d9126 100644 --- a/src/app/(main)/settings/websites/page.tsx +++ b/src/app/(main)/settings/websites/page.tsx @@ -1,5 +1,5 @@ import { Metadata } from 'next'; -import WebsitesSettingsPage from './WebsitesSettingsPage'; +import { WebsitesSettingsPage } from './WebsitesSettingsPage'; export default async function ({ params }: { params: { teamId: string } }) { const { teamId } = await params; diff --git a/src/app/(main)/teams/[teamId]/TeamProvider.tsx b/src/app/(main)/teams/[teamId]/TeamProvider.tsx index ed2d5467e..f19f81948 100644 --- a/src/app/(main)/teams/[teamId]/TeamProvider.tsx +++ b/src/app/(main)/teams/[teamId]/TeamProvider.tsx @@ -25,5 +25,3 @@ export function TeamProvider({ teamId, children }: { teamId?: string; children: return {children}; } - -export default TeamProvider; diff --git a/src/app/(main)/teams/[teamId]/layout.tsx b/src/app/(main)/teams/[teamId]/layout.tsx index 0452ae976..de58b828e 100644 --- a/src/app/(main)/teams/[teamId]/layout.tsx +++ b/src/app/(main)/teams/[teamId]/layout.tsx @@ -1,4 +1,4 @@ -import TeamProvider from './TeamProvider'; +import { TeamProvider } from './TeamProvider'; import { Metadata } from 'next'; import TeamSettingsLayout from './settings/TeamSettingsLayout'; diff --git a/src/app/(main)/teams/[teamId]/settings/TeamSettingsLayout.tsx b/src/app/(main)/teams/[teamId]/settings/TeamSettingsLayout.tsx index 8c638d294..ddc58a31b 100644 --- a/src/app/(main)/teams/[teamId]/settings/TeamSettingsLayout.tsx +++ b/src/app/(main)/teams/[teamId]/settings/TeamSettingsLayout.tsx @@ -1,9 +1,9 @@ 'use client'; import { ReactNode } from 'react'; import { useMessages, useTeamUrl } from '@/components/hooks'; -import MenuLayout from '@/components/layout/MenuLayout'; +import { MenuLayout } from '@/components/layout/MenuLayout'; -export default function TeamSettingsLayout({ children }: { children: ReactNode }) { +export function TeamSettingsLayout({ children }: { children: ReactNode }) { const { formatMessage, labels } = useMessages(); const { teamId } = useTeamUrl(); diff --git a/src/app/(main)/teams/[teamId]/settings/members/TeamMemberEditButton.tsx b/src/app/(main)/teams/[teamId]/settings/members/TeamMemberEditButton.tsx index 85292f60d..5965ec5fb 100644 --- a/src/app/(main)/teams/[teamId]/settings/members/TeamMemberEditButton.tsx +++ b/src/app/(main)/teams/[teamId]/settings/members/TeamMemberEditButton.tsx @@ -1,6 +1,6 @@ import { useMessages, useModified } from '@/components/hooks'; import { Button, Icon, Icons, Modal, ModalTrigger, Text, useToasts } from 'react-basics'; -import TeamMemberEditForm from './TeamMemberEditForm'; +import { TeamMemberEditForm } from './TeamMemberEditForm'; export function TeamMemberEditButton({ teamId, @@ -45,5 +45,3 @@ export function TeamMemberEditButton({ ); } - -export default TeamMemberEditButton; diff --git a/src/app/(main)/teams/[teamId]/settings/members/TeamMemberEditForm.tsx b/src/app/(main)/teams/[teamId]/settings/members/TeamMemberEditForm.tsx index 4ce605dff..57c183883 100644 --- a/src/app/(main)/teams/[teamId]/settings/members/TeamMemberEditForm.tsx +++ b/src/app/(main)/teams/[teamId]/settings/members/TeamMemberEditForm.tsx @@ -78,5 +78,3 @@ export function TeamMemberEditForm({ ); } - -export default TeamMemberEditForm; diff --git a/src/app/(main)/teams/[teamId]/settings/members/TeamMemberRemoveButton.tsx b/src/app/(main)/teams/[teamId]/settings/members/TeamMemberRemoveButton.tsx index 931390c7b..80ef2ca85 100644 --- a/src/app/(main)/teams/[teamId]/settings/members/TeamMemberRemoveButton.tsx +++ b/src/app/(main)/teams/[teamId]/settings/members/TeamMemberRemoveButton.tsx @@ -1,4 +1,4 @@ -import ConfirmationForm from '@/components/common/ConfirmationForm'; +import { ConfirmationForm } from '@/components/common/ConfirmationForm'; import { useApi, useMessages, useModified } from '@/components/hooks'; import { messages } from '@/components/messages'; import { Button, Icon, Icons, Modal, ModalTrigger, Text } from 'react-basics'; @@ -55,5 +55,3 @@ export function TeamMemberRemoveButton({ ); } - -export default TeamMemberRemoveButton; diff --git a/src/app/(main)/teams/[teamId]/settings/members/TeamMembersDataTable.tsx b/src/app/(main)/teams/[teamId]/settings/members/TeamMembersDataTable.tsx index 9de26415c..447573492 100644 --- a/src/app/(main)/teams/[teamId]/settings/members/TeamMembersDataTable.tsx +++ b/src/app/(main)/teams/[teamId]/settings/members/TeamMembersDataTable.tsx @@ -1,5 +1,5 @@ -import DataTable from '@/components/common/DataTable'; -import TeamMembersTable from './TeamMembersTable'; +import { DataTable } from '@/components/common/DataTable'; +import { TeamMembersTable } from './TeamMembersTable'; import { useTeamMembers } from '@/components/hooks'; export function TeamMembersDataTable({ @@ -17,5 +17,3 @@ export function TeamMembersDataTable({ ); } - -export default TeamMembersDataTable; diff --git a/src/app/(main)/teams/[teamId]/settings/members/TeamMembersPage.tsx b/src/app/(main)/teams/[teamId]/settings/members/TeamMembersPage.tsx index 557a40bad..246f87fd8 100644 --- a/src/app/(main)/teams/[teamId]/settings/members/TeamMembersPage.tsx +++ b/src/app/(main)/teams/[teamId]/settings/members/TeamMembersPage.tsx @@ -1,7 +1,7 @@ 'use client'; import { TeamContext } from '@/app/(main)/teams/[teamId]/TeamProvider'; -import TeamMembersDataTable from './TeamMembersDataTable'; -import PageHeader from '@/components/layout/PageHeader'; +import { TeamMembersDataTable } from './TeamMembersDataTable'; +import { PageHeader } from '@/components/layout/PageHeader'; import { useLogin, useMessages } from '@/components/hooks'; import { ROLES } from '@/lib/constants'; import { useContext } from 'react'; @@ -24,5 +24,3 @@ export function TeamMembersPage({ teamId }: { teamId: string }) { ); } - -export default TeamMembersPage; diff --git a/src/app/(main)/teams/[teamId]/settings/members/TeamMembersTable.tsx b/src/app/(main)/teams/[teamId]/settings/members/TeamMembersTable.tsx index 0054437a2..58e414637 100644 --- a/src/app/(main)/teams/[teamId]/settings/members/TeamMembersTable.tsx +++ b/src/app/(main)/teams/[teamId]/settings/members/TeamMembersTable.tsx @@ -1,8 +1,8 @@ import { GridColumn, GridTable } from 'react-basics'; import { useMessages, useLogin } from '@/components/hooks'; import { ROLES } from '@/lib/constants'; -import TeamMemberRemoveButton from './TeamMemberRemoveButton'; -import TeamMemberEditButton from './TeamMemberEditButton'; +import { TeamMemberRemoveButton } from './TeamMemberRemoveButton'; +import { TeamMemberEditButton } from './TeamMemberEditButton'; export function TeamMembersTable({ data = [], @@ -52,5 +52,3 @@ export function TeamMembersTable({ ); } - -export default TeamMembersTable; diff --git a/src/app/(main)/teams/[teamId]/settings/members/page.tsx b/src/app/(main)/teams/[teamId]/settings/members/page.tsx index 9810f7a20..f6957843a 100644 --- a/src/app/(main)/teams/[teamId]/settings/members/page.tsx +++ b/src/app/(main)/teams/[teamId]/settings/members/page.tsx @@ -1,7 +1,7 @@ import { Metadata } from 'next'; -import TeamMembersPage from './TeamMembersPage'; +import { TeamMembersPage } from './TeamMembersPage'; -export default async function ({ params }: { params: { teamId: string } }) { +export default async function ({ params }: { params: Promise<{ teamId: string }> }) { const { teamId } = await params; return ; diff --git a/src/app/(main)/teams/[teamId]/settings/team/TeamDeleteForm.tsx b/src/app/(main)/teams/[teamId]/settings/team/TeamDeleteForm.tsx index 5e7f5cf8b..ef740d610 100644 --- a/src/app/(main)/teams/[teamId]/settings/team/TeamDeleteForm.tsx +++ b/src/app/(main)/teams/[teamId]/settings/team/TeamDeleteForm.tsx @@ -1,4 +1,4 @@ -import TypeConfirmationForm from '@/components/common/TypeConfirmationForm'; +import { TypeConfirmationForm } from '@/components/common/TypeConfirmationForm'; import { useApi, useMessages } from '@/components/hooks'; const CONFIRM_VALUE = 'DELETE'; @@ -39,5 +39,3 @@ export function TeamDeleteForm({ /> ); } - -export default TeamDeleteForm; diff --git a/src/app/(main)/teams/[teamId]/settings/team/TeamDetails.tsx b/src/app/(main)/teams/[teamId]/settings/team/TeamDetails.tsx index f3f258bde..18b43abdd 100644 --- a/src/app/(main)/teams/[teamId]/settings/team/TeamDetails.tsx +++ b/src/app/(main)/teams/[teamId]/settings/team/TeamDetails.tsx @@ -1,13 +1,13 @@ import { TeamContext } from '@/app/(main)/teams/[teamId]/TeamProvider'; import { useLogin, useMessages } from '@/components/hooks'; -import Icons from '@/components/icons'; -import PageHeader from '@/components/layout/PageHeader'; +import { Icons } from '@/components/icons'; +import { PageHeader } from '@/components/layout/PageHeader'; import { ROLES } from '@/lib/constants'; import { useContext, useState } from 'react'; import { Flexbox, Item, Tabs } from 'react-basics'; -import TeamLeaveButton from '@/app/(main)/settings/teams/TeamLeaveButton'; -import TeamManage from './TeamManage'; -import TeamEditForm from './TeamEditForm'; +import { TeamLeaveButton } from '@/app/(main)/settings/teams/TeamLeaveButton'; +import { TeamManage } from './TeamManage'; +import { TeamEditForm } from './TeamEditForm'; export function TeamDetails({ teamId }: { teamId: string }) { const team = useContext(TeamContext); @@ -39,5 +39,3 @@ export function TeamDetails({ teamId }: { teamId: string }) { ); } - -export default TeamDetails; diff --git a/src/app/(main)/teams/[teamId]/settings/team/TeamEditForm.tsx b/src/app/(main)/teams/[teamId]/settings/team/TeamEditForm.tsx index ac158fa70..fc62a188f 100644 --- a/src/app/(main)/teams/[teamId]/settings/team/TeamEditForm.tsx +++ b/src/app/(main)/teams/[teamId]/settings/team/TeamEditForm.tsx @@ -79,5 +79,3 @@ export function TeamEditForm({ teamId, allowEdit }: { teamId: string; allowEdit? ); } - -export default TeamEditForm; diff --git a/src/app/(main)/teams/[teamId]/settings/team/TeamManage.tsx b/src/app/(main)/teams/[teamId]/settings/team/TeamManage.tsx index 24ca93d37..172878946 100644 --- a/src/app/(main)/teams/[teamId]/settings/team/TeamManage.tsx +++ b/src/app/(main)/teams/[teamId]/settings/team/TeamManage.tsx @@ -1,7 +1,7 @@ import { useMessages, useModified } from '@/components/hooks'; import { useRouter } from 'next/navigation'; import { ActionForm, Button, Modal, ModalTrigger } from 'react-basics'; -import TeamDeleteForm from './TeamDeleteForm'; +import { TeamDeleteForm } from './TeamDeleteForm'; export function TeamManage({ teamId }: { teamId: string }) { const { formatMessage, labels, messages } = useMessages(); @@ -29,5 +29,3 @@ export function TeamManage({ teamId }: { teamId: string }) { ); } - -export default TeamManage; diff --git a/src/app/(main)/teams/[teamId]/settings/team/TeamPage.tsx b/src/app/(main)/teams/[teamId]/settings/team/TeamPage.tsx index e6fbd10a1..a35e6d72b 100644 --- a/src/app/(main)/teams/[teamId]/settings/team/TeamPage.tsx +++ b/src/app/(main)/teams/[teamId]/settings/team/TeamPage.tsx @@ -1,8 +1,6 @@ 'use client'; -import TeamDetails from './TeamDetails'; +import { TeamDetails } from './TeamDetails'; export function TeamPage({ teamId }: { teamId: string }) { return ; } - -export default TeamPage; diff --git a/src/app/(main)/teams/[teamId]/settings/team/page.tsx b/src/app/(main)/teams/[teamId]/settings/team/page.tsx index f15d5fb61..1d3d45653 100644 --- a/src/app/(main)/teams/[teamId]/settings/team/page.tsx +++ b/src/app/(main)/teams/[teamId]/settings/team/page.tsx @@ -1,5 +1,5 @@ import { Metadata } from 'next'; -import TeamPage from './TeamPage'; +import { TeamPage } from './TeamPage'; export default async function ({ params }: { params: { teamId: string } }) { const { teamId } = await params; diff --git a/src/app/(main)/teams/[teamId]/settings/websites/TeamWebsiteRemoveButton.tsx b/src/app/(main)/teams/[teamId]/settings/websites/TeamWebsiteRemoveButton.tsx index fdd76cd20..6eaa3363b 100644 --- a/src/app/(main)/teams/[teamId]/settings/websites/TeamWebsiteRemoveButton.tsx +++ b/src/app/(main)/teams/[teamId]/settings/websites/TeamWebsiteRemoveButton.tsx @@ -25,5 +25,3 @@ export function TeamWebsiteRemoveButton({ teamId, websiteId, onSave }) { ); } - -export default TeamWebsiteRemoveButton; diff --git a/src/app/(main)/teams/[teamId]/settings/websites/TeamWebsitesDataTable.tsx b/src/app/(main)/teams/[teamId]/settings/websites/TeamWebsitesDataTable.tsx index 63aa47f5d..af2dbf588 100644 --- a/src/app/(main)/teams/[teamId]/settings/websites/TeamWebsitesDataTable.tsx +++ b/src/app/(main)/teams/[teamId]/settings/websites/TeamWebsitesDataTable.tsx @@ -1,6 +1,6 @@ -import DataTable from '@/components/common/DataTable'; +import { DataTable } from '@/components/common/DataTable'; import { useTeamWebsites } from '@/components/hooks'; -import TeamWebsitesTable from './TeamWebsitesTable'; +import { TeamWebsitesTable } from './TeamWebsitesTable'; export function TeamWebsitesDataTable({ teamId, @@ -17,5 +17,3 @@ export function TeamWebsitesDataTable({ ); } - -export default TeamWebsitesDataTable; diff --git a/src/app/(main)/teams/[teamId]/settings/websites/TeamWebsitesPage.tsx b/src/app/(main)/teams/[teamId]/settings/websites/TeamWebsitesPage.tsx index d46d928ad..aca4b80ef 100644 --- a/src/app/(main)/teams/[teamId]/settings/websites/TeamWebsitesPage.tsx +++ b/src/app/(main)/teams/[teamId]/settings/websites/TeamWebsitesPage.tsx @@ -1,9 +1,9 @@ 'use client'; import { TeamContext } from '@/app/(main)/teams/[teamId]/TeamProvider'; -import WebsiteAddButton from '@/app/(main)/settings/websites/WebsiteAddButton'; +import { WebsiteAddButton } from '@/app/(main)/settings/websites/WebsiteAddButton'; import { useLogin, useMessages } from '@/components/hooks'; -import PageHeader from '@/components/layout/PageHeader'; -import TeamWebsitesDataTable from './TeamWebsitesDataTable'; +import { PageHeader } from '@/components/layout/PageHeader'; +import { TeamWebsitesDataTable } from './TeamWebsitesDataTable'; import { ROLES } from '@/lib/constants'; import { useContext } from 'react'; @@ -26,5 +26,3 @@ export function TeamWebsitesPage({ teamId }: { teamId: string }) { ); } - -export default TeamWebsitesPage; diff --git a/src/app/(main)/teams/[teamId]/settings/websites/TeamWebsitesTable.tsx b/src/app/(main)/teams/[teamId]/settings/websites/TeamWebsitesTable.tsx index 76c343b17..5e829608a 100644 --- a/src/app/(main)/teams/[teamId]/settings/websites/TeamWebsitesTable.tsx +++ b/src/app/(main)/teams/[teamId]/settings/websites/TeamWebsitesTable.tsx @@ -1,7 +1,7 @@ import { GridColumn, GridTable, Icon, Text } from 'react-basics'; import { useLogin, useMessages } from '@/components/hooks'; -import Icons from '@/components/icons'; -import LinkButton from '@/components/common/LinkButton'; +import { Icons } from '@/components/icons'; +import { LinkButton } from '@/components/common/LinkButton'; export function TeamWebsitesTable({ teamId, @@ -48,5 +48,3 @@ export function TeamWebsitesTable({ ); } - -export default TeamWebsitesTable; diff --git a/src/app/(main)/teams/[teamId]/settings/websites/[websiteId]/page.tsx b/src/app/(main)/teams/[teamId]/settings/websites/[websiteId]/page.tsx index a18f8a2eb..22739a997 100644 --- a/src/app/(main)/teams/[teamId]/settings/websites/[websiteId]/page.tsx +++ b/src/app/(main)/teams/[teamId]/settings/websites/[websiteId]/page.tsx @@ -1,4 +1,4 @@ -import Page from '@/app/(main)/settings/websites/[websiteId]/page'; +import { Page } from '@/app/(main)/settings/websites/[websiteId]/page'; export default function ({ params }) { return ; diff --git a/src/app/(main)/teams/[teamId]/settings/websites/page.tsx b/src/app/(main)/teams/[teamId]/settings/websites/page.tsx index 6709eb671..2ae8e23eb 100644 --- a/src/app/(main)/teams/[teamId]/settings/websites/page.tsx +++ b/src/app/(main)/teams/[teamId]/settings/websites/page.tsx @@ -1,4 +1,4 @@ -import TeamWebsitesPage from './TeamWebsitesPage'; +import { TeamWebsitesPage } from './TeamWebsitesPage'; import { Metadata } from 'next'; export default async function ({ params }: { params: { teamId: string } }) { diff --git a/src/app/(main)/websites/WebsitesPage.tsx b/src/app/(main)/websites/WebsitesPage.tsx index b5e40b303..98122c616 100644 --- a/src/app/(main)/websites/WebsitesPage.tsx +++ b/src/app/(main)/websites/WebsitesPage.tsx @@ -1,9 +1,9 @@ 'use client'; -import WebsitesHeader from '@/app/(main)/settings/websites/WebsitesHeader'; -import WebsitesDataTable from '@/app/(main)/settings/websites/WebsitesDataTable'; +import { WebsitesHeader } from '@/app/(main)/settings/websites/WebsitesHeader'; +import { WebsitesDataTable } from '@/app/(main)/settings/websites/WebsitesDataTable'; import { useTeamUrl } from '@/components/hooks'; -export default function WebsitesPage() { +export function WebsitesPage() { const { teamId } = useTeamUrl(); return ( diff --git a/src/app/(main)/websites/[websiteId]/WebsiteChart.tsx b/src/app/(main)/websites/[websiteId]/WebsiteChart.tsx index 681923077..a82e9bc31 100644 --- a/src/app/(main)/websites/[websiteId]/WebsiteChart.tsx +++ b/src/app/(main)/websites/[websiteId]/WebsiteChart.tsx @@ -1,6 +1,6 @@ import { useMemo } from 'react'; -import PageviewsChart from '@/components/metrics/PageviewsChart'; -import useWebsitePageviews from '@/components/hooks/queries/useWebsitePageviews'; +import { PageviewsChart } from '@/components/metrics/PageviewsChart'; +import { useWebsitePageviews } from '@/components/hooks/queries/useWebsitePageviews'; import { useDateRange } from '@/components/hooks'; export function WebsiteChart({ @@ -53,5 +53,3 @@ export function WebsiteChart({ /> ); } - -export default WebsiteChart; diff --git a/src/app/(main)/websites/[websiteId]/WebsiteChartList.tsx b/src/app/(main)/websites/[websiteId]/WebsiteChartList.tsx index b27f9870d..e7a410aa2 100644 --- a/src/app/(main)/websites/[websiteId]/WebsiteChartList.tsx +++ b/src/app/(main)/websites/[websiteId]/WebsiteChartList.tsx @@ -2,13 +2,13 @@ import { Button, Text, Icon, Icons } from 'react-basics'; import { useMemo } from 'react'; import { firstBy } from 'thenby'; import Link from 'next/link'; -import WebsiteChart from './WebsiteChart'; -import useDashboard from '@/store/dashboard'; -import WebsiteHeader from './WebsiteHeader'; +import { WebsiteChart } from './WebsiteChart'; +import { useDashboard } from '@/store/dashboard'; +import { WebsiteHeader } from './WebsiteHeader'; import { WebsiteMetricsBar } from './WebsiteMetricsBar'; import { useMessages, useLocale, useTeamUrl } from '@/components/hooks'; -export default function WebsiteChartList({ +export function WebsiteChartList({ websites, showCharts, limit, diff --git a/src/app/(main)/websites/[websiteId]/WebsiteDetailsPage.tsx b/src/app/(main)/websites/[websiteId]/WebsiteDetailsPage.tsx index 460792efc..67b374dc2 100644 --- a/src/app/(main)/websites/[websiteId]/WebsiteDetailsPage.tsx +++ b/src/app/(main)/websites/[websiteId]/WebsiteDetailsPage.tsx @@ -1,15 +1,15 @@ 'use client'; import { usePathname } from 'next/navigation'; -import FilterTags from '@/components/metrics/FilterTags'; +import { FilterTags } from '@/components/metrics/FilterTags'; import { useNavigation } from '@/components/hooks'; -import WebsiteChart from './WebsiteChart'; -import WebsiteExpandedView from './WebsiteExpandedView'; -import WebsiteHeader from './WebsiteHeader'; -import WebsiteMetricsBar from './WebsiteMetricsBar'; -import WebsiteTableView from './WebsiteTableView'; +import { WebsiteChart } from './WebsiteChart'; +import { WebsiteExpandedView } from './WebsiteExpandedView'; +import { WebsiteHeader } from './WebsiteHeader'; +import { WebsiteMetricsBar } from './WebsiteMetricsBar'; +import { WebsiteTableView } from './WebsiteTableView'; import { FILTER_COLUMNS } from '@/lib/constants'; -export default function WebsiteDetailsPage({ websiteId }: { websiteId: string }) { +export function WebsiteDetailsPage({ websiteId }: { websiteId: string }) { const pathname = usePathname(); const { query } = useNavigation(); diff --git a/src/app/(main)/websites/[websiteId]/WebsiteExpandedView.tsx b/src/app/(main)/websites/[websiteId]/WebsiteExpandedView.tsx index 4858ec734..adc45f370 100644 --- a/src/app/(main)/websites/[websiteId]/WebsiteExpandedView.tsx +++ b/src/app/(main)/websites/[websiteId]/WebsiteExpandedView.tsx @@ -1,22 +1,22 @@ import { Dropdown, Icon, Icons, Item, Text } from 'react-basics'; -import LinkButton from '@/components/common/LinkButton'; +import { LinkButton } from '@/components/common/LinkButton'; import { useLocale, useMessages, useNavigation } from '@/components/hooks'; -import SideNav from '@/components/layout/SideNav'; -import BrowsersTable from '@/components/metrics/BrowsersTable'; -import CitiesTable from '@/components/metrics/CitiesTable'; -import CountriesTable from '@/components/metrics/CountriesTable'; -import DevicesTable from '@/components/metrics/DevicesTable'; -import EventsTable from '@/components/metrics/EventsTable'; -import HostsTable from '@/components/metrics/HostsTable'; -import LanguagesTable from '@/components/metrics/LanguagesTable'; -import OSTable from '@/components/metrics/OSTable'; -import PagesTable from '@/components/metrics/PagesTable'; -import QueryParametersTable from '@/components/metrics/QueryParametersTable'; -import ReferrersTable from '@/components/metrics/ReferrersTable'; -import RegionsTable from '@/components/metrics/RegionsTable'; -import ScreenTable from '@/components/metrics/ScreenTable'; -import TagsTable from '@/components/metrics/TagsTable'; -import ChannelsTable from '@/components/metrics/ChannelsTable'; +import { SideNav } from '@/components/layout/SideNav'; +import { BrowsersTable } from '@/components/metrics/BrowsersTable'; +import { CitiesTable } from '@/components/metrics/CitiesTable'; +import { CountriesTable } from '@/components/metrics/CountriesTable'; +import { DevicesTable } from '@/components/metrics/DevicesTable'; +import { EventsTable } from '@/components/metrics/EventsTable'; +import { HostsTable } from '@/components/metrics/HostsTable'; +import { LanguagesTable } from '@/components/metrics/LanguagesTable'; +import { OSTable } from '@/components/metrics/OSTable'; +import { PagesTable } from '@/components/metrics/PagesTable'; +import { QueryParametersTable } from '@/components/metrics/QueryParametersTable'; +import { ReferrersTable } from '@/components/metrics/ReferrersTable'; +import { RegionsTable } from '@/components/metrics/RegionsTable'; +import { ScreenTable } from '@/components/metrics/ScreenTable'; +import { TagsTable } from '@/components/metrics/TagsTable'; +import { ChannelsTable } from '@/components/metrics/ChannelsTable'; import styles from './WebsiteExpandedView.module.css'; const views = { @@ -41,7 +41,7 @@ const views = { channel: ChannelsTable, }; -export default function WebsiteExpandedView({ +export function WebsiteExpandedView({ websiteId, domainName, }: { diff --git a/src/app/(main)/websites/[websiteId]/WebsiteFilterButton.tsx b/src/app/(main)/websites/[websiteId]/WebsiteFilterButton.tsx index 02b744184..12541bac1 100644 --- a/src/app/(main)/websites/[websiteId]/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/[reportId]/PopupForm'; -import FilterSelectForm from '@/app/(main)/reports/[reportId]/FilterSelectForm'; +import { PopupForm } from '@/app/(main)/reports/[reportId]/PopupForm'; +import { FilterSelectForm } from '@/app/(main)/reports/[reportId]/FilterSelectForm'; import { useFields, useMessages, useNavigation, useDateRange } from '@/components/hooks'; import { OPERATOR_PREFIXES } from '@/lib/constants'; import styles from './WebsiteFilterButton.module.css'; @@ -60,5 +60,3 @@ export function WebsiteFilterButton({ ); } - -export default WebsiteFilterButton; diff --git a/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx b/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx index b568dd3dc..c95ac5a19 100644 --- a/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx +++ b/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx @@ -1,8 +1,8 @@ import classNames from 'classnames'; -import Favicon from '@/components/common/Favicon'; +import { Favicon } from '@/components/common/Favicon'; import { useMessages, useTeamUrl, useWebsite } from '@/components/hooks'; -import Icons from '@/components/icons'; -import ActiveUsers from '@/components/metrics/ActiveUsers'; +import { Icons } from '@/components/icons'; +import { ActiveUsers } from '@/components/metrics/ActiveUsers'; import Link from 'next/link'; import { usePathname } from 'next/navigation'; import { ReactNode } from 'react'; @@ -98,5 +98,3 @@ export function WebsiteHeader({ ); } - -export default WebsiteHeader; diff --git a/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx b/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx index f206d3c9e..c6870873f 100644 --- a/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx +++ b/src/app/(main)/websites/[websiteId]/WebsiteMetricsBar.tsx @@ -1,13 +1,13 @@ import { Dropdown, Item } from 'react-basics'; import classNames from 'classnames'; import { useDateRange, useMessages, useSticky } from '@/components/hooks'; -import WebsiteDateFilter from '@/components/input/WebsiteDateFilter'; -import MetricCard from '@/components/metrics/MetricCard'; -import MetricsBar from '@/components/metrics/MetricsBar'; +import { WebsiteDateFilter } from '@/components/input/WebsiteDateFilter'; +import { MetricCard } from '@/components/metrics/MetricCard'; +import { MetricsBar } from '@/components/metrics/MetricsBar'; import { formatShortTime, formatLongNumber } from '@/lib/format'; -import useWebsiteStats from '@/components/hooks/queries/useWebsiteStats'; -import useStore, { setWebsiteDateCompare } from '@/store/websites'; -import WebsiteFilterButton from './WebsiteFilterButton'; +import { useWebsiteStats } from '@/components/hooks/queries/useWebsiteStats'; +import { useWebsites, setWebsiteDateCompare } from '@/store/websites'; +import { WebsiteFilterButton } from './WebsiteFilterButton'; import styles from './WebsiteMetricsBar.module.css'; export function WebsiteMetricsBar({ @@ -25,7 +25,7 @@ export function WebsiteMetricsBar({ }) { const { dateRange } = useDateRange(websiteId); const { formatMessage, labels } = useMessages(); - const dateCompare = useStore(state => state[websiteId]?.dateCompare); + const dateCompare = useWebsites(state => state[websiteId]?.dateCompare); const { ref, isSticky } = useSticky({ enabled: sticky }); const { data, isLoading, isFetched, error } = useWebsiteStats( websiteId, @@ -132,5 +132,3 @@ export function WebsiteMetricsBar({ ); } - -export default WebsiteMetricsBar; diff --git a/src/app/(main)/websites/[websiteId]/WebsiteProvider.tsx b/src/app/(main)/websites/[websiteId]/WebsiteProvider.tsx index 198ad030f..c843bc6af 100644 --- a/src/app/(main)/websites/[websiteId]/WebsiteProvider.tsx +++ b/src/app/(main)/websites/[websiteId]/WebsiteProvider.tsx @@ -27,5 +27,3 @@ export function WebsiteProvider({ return {children}; } - -export default WebsiteProvider; diff --git a/src/app/(main)/websites/[websiteId]/WebsiteTableView.tsx b/src/app/(main)/websites/[websiteId]/WebsiteTableView.tsx index 02422075c..1108edee3 100644 --- a/src/app/(main)/websites/[websiteId]/WebsiteTableView.tsx +++ b/src/app/(main)/websites/[websiteId]/WebsiteTableView.tsx @@ -1,16 +1,16 @@ import { Grid, GridRow } from '@/components/layout/Grid'; -import PagesTable from '@/components/metrics/PagesTable'; -import ReferrersTable from '@/components/metrics/ReferrersTable'; -import BrowsersTable from '@/components/metrics/BrowsersTable'; -import OSTable from '@/components/metrics/OSTable'; -import DevicesTable from '@/components/metrics/DevicesTable'; -import WorldMap from '@/components/metrics/WorldMap'; -import CountriesTable from '@/components/metrics/CountriesTable'; -import EventsTable from '@/components/metrics/EventsTable'; -import EventsChart from '@/components/metrics/EventsChart'; +import { PagesTable } from '@/components/metrics/PagesTable'; +import { ReferrersTable } from '@/components/metrics/ReferrersTable'; +import { BrowsersTable } from '@/components/metrics/BrowsersTable'; +import { OSTable } from '@/components/metrics/OSTable'; +import { DevicesTable } from '@/components/metrics/DevicesTable'; +import { WorldMap } from '@/components/metrics/WorldMap'; +import { CountriesTable } from '@/components/metrics/CountriesTable'; +import { EventsTable } from '@/components/metrics/EventsTable'; +import { EventsChart } from '@/components/metrics/EventsChart'; import { usePathname } from 'next/navigation'; -export default function WebsiteTableView({ websiteId }: { websiteId: string }) { +export function WebsiteTableView({ websiteId }: { websiteId: string }) { const pathname = usePathname(); const tableProps = { websiteId, diff --git a/src/app/(main)/websites/[websiteId]/compare/WebsiteComparePage.tsx b/src/app/(main)/websites/[websiteId]/compare/WebsiteComparePage.tsx index 10a2eed15..42fd34687 100644 --- a/src/app/(main)/websites/[websiteId]/compare/WebsiteComparePage.tsx +++ b/src/app/(main)/websites/[websiteId]/compare/WebsiteComparePage.tsx @@ -1,11 +1,11 @@ 'use client'; -import WebsiteHeader from '../WebsiteHeader'; -import WebsiteMetricsBar from '../WebsiteMetricsBar'; -import FilterTags from '@/components/metrics/FilterTags'; +import { WebsiteHeader } from '../WebsiteHeader'; +import { WebsiteMetricsBar } from '../WebsiteMetricsBar'; +import { FilterTags } from '@/components/metrics/FilterTags'; import { useNavigation } from '@/components/hooks'; import { FILTER_COLUMNS } from '@/lib/constants'; -import WebsiteChart from '../WebsiteChart'; -import WebsiteCompareTables from './WebsiteCompareTables'; +import { WebsiteChart } from '../WebsiteChart'; +import { WebsiteCompareTables } from './WebsiteCompareTables'; export function WebsiteComparePage({ websiteId }) { const { query } = useNavigation(); @@ -27,5 +27,3 @@ export function WebsiteComparePage({ websiteId }) { ); } - -export default WebsiteComparePage; diff --git a/src/app/(main)/websites/[websiteId]/compare/WebsiteCompareTables.tsx b/src/app/(main)/websites/[websiteId]/compare/WebsiteCompareTables.tsx index ce7f5b47b..8838da1e9 100644 --- a/src/app/(main)/websites/[websiteId]/compare/WebsiteCompareTables.tsx +++ b/src/app/(main)/websites/[websiteId]/compare/WebsiteCompareTables.tsx @@ -1,25 +1,25 @@ import { useDateRange, useMessages, useNavigation } from '@/components/hooks'; import { Grid, GridRow } from '@/components/layout/Grid'; -import SideNav from '@/components/layout/SideNav'; -import BrowsersTable from '@/components/metrics/BrowsersTable'; -import ChangeLabel from '@/components/metrics/ChangeLabel'; -import CitiesTable from '@/components/metrics/CitiesTable'; -import CountriesTable from '@/components/metrics/CountriesTable'; -import DevicesTable from '@/components/metrics/DevicesTable'; -import EventsTable from '@/components/metrics/EventsTable'; -import LanguagesTable from '@/components/metrics/LanguagesTable'; -import MetricsTable from '@/components/metrics/MetricsTable'; -import OSTable from '@/components/metrics/OSTable'; -import PagesTable from '@/components/metrics/PagesTable'; -import QueryParametersTable from '@/components/metrics/QueryParametersTable'; -import ReferrersTable from '@/components/metrics/ReferrersTable'; -import RegionsTable from '@/components/metrics/RegionsTable'; -import ScreenTable from '@/components/metrics/ScreenTable'; -import TagsTable from '@/components/metrics/TagsTable'; +import { SideNav } from '@/components/layout/SideNav'; +import { BrowsersTable } from '@/components/metrics/BrowsersTable'; +import { ChangeLabel } from '@/components/metrics/ChangeLabel'; +import { CitiesTable } from '@/components/metrics/CitiesTable'; +import { CountriesTable } from '@/components/metrics/CountriesTable'; +import { DevicesTable } from '@/components/metrics/DevicesTable'; +import { EventsTable } from '@/components/metrics/EventsTable'; +import { LanguagesTable } from '@/components/metrics/LanguagesTable'; +import { MetricsTable } from '@/components/metrics/MetricsTable'; +import { OSTable } from '@/components/metrics/OSTable'; +import { PagesTable } from '@/components/metrics/PagesTable'; +import { QueryParametersTable } from '@/components/metrics/QueryParametersTable'; +import { ReferrersTable } from '@/components/metrics/ReferrersTable'; +import { RegionsTable } from '@/components/metrics/RegionsTable'; +import { ScreenTable } from '@/components/metrics/ScreenTable'; +import { TagsTable } from '@/components/metrics/TagsTable'; import { getCompareDate } from '@/lib/date'; import { formatNumber } from '@/lib/format'; import { useState } from 'react'; -import useStore from '@/store/websites'; +import { useWebsites } from '@/store/websites'; import styles from './WebsiteCompareTables.module.css'; const views = { @@ -42,7 +42,7 @@ const views = { export function WebsiteCompareTables({ websiteId }: { websiteId: string }) { const [data, setData] = useState([]); const { dateRange } = useDateRange(websiteId); - const dateCompare = useStore(state => state[websiteId]?.dateCompare); + const dateCompare = useWebsites(state => state[websiteId]?.dateCompare); const { formatMessage, labels } = useMessages(); const { renderUrl, @@ -169,5 +169,3 @@ export function WebsiteCompareTables({ websiteId }: { websiteId: string }) { ); } - -export default WebsiteCompareTables; diff --git a/src/app/(main)/websites/[websiteId]/compare/page.tsx b/src/app/(main)/websites/[websiteId]/compare/page.tsx index bdd29bd54..4c90622e6 100644 --- a/src/app/(main)/websites/[websiteId]/compare/page.tsx +++ b/src/app/(main)/websites/[websiteId]/compare/page.tsx @@ -1,4 +1,4 @@ -import WebsiteComparePage from './WebsiteComparePage'; +import { WebsiteComparePage } from './WebsiteComparePage'; import { Metadata } from 'next'; export default async function ({ params }: { params: { websiteId: string } }) { diff --git a/src/app/(main)/websites/[websiteId]/events/EventProperties.tsx b/src/app/(main)/websites/[websiteId]/events/EventProperties.tsx index 453aa9a85..602497976 100644 --- a/src/app/(main)/websites/[websiteId]/events/EventProperties.tsx +++ b/src/app/(main)/websites/[websiteId]/events/EventProperties.tsx @@ -1,7 +1,7 @@ import { GridColumn, GridTable } from 'react-basics'; import { useEventDataProperties, useEventDataValues, useMessages } from '@/components/hooks'; import { LoadingPanel } from '@/components/common/LoadingPanel'; -import PieChart from '@/components/charts/PieChart'; +import { PieChart } from '@/components/charts/PieChart'; import { useState } from 'react'; import { CHART_COLORS } from '@/lib/constants'; import styles from './EventProperties.module.css'; @@ -61,5 +61,3 @@ export function EventProperties({ websiteId }: { websiteId: string }) { ); } - -export default EventProperties; diff --git a/src/app/(main)/websites/[websiteId]/events/EventsDataTable.tsx b/src/app/(main)/websites/[websiteId]/events/EventsDataTable.tsx index ce9048d31..b81b51cb2 100644 --- a/src/app/(main)/websites/[websiteId]/events/EventsDataTable.tsx +++ b/src/app/(main)/websites/[websiteId]/events/EventsDataTable.tsx @@ -1,9 +1,9 @@ import { useWebsiteEvents } from '@/components/hooks'; -import EventsTable from './EventsTable'; -import DataTable from '@/components/common/DataTable'; +import { EventsTable } from './EventsTable'; +import { DataTable } from '@/components/common/DataTable'; import { ReactNode } from 'react'; -export default function EventsDataTable({ +export function EventsDataTable({ websiteId, }: { websiteId?: string; diff --git a/src/app/(main)/websites/[websiteId]/events/EventsMetricsBar.tsx b/src/app/(main)/websites/[websiteId]/events/EventsMetricsBar.tsx index e90a7790a..f6bb328cd 100644 --- a/src/app/(main)/websites/[websiteId]/events/EventsMetricsBar.tsx +++ b/src/app/(main)/websites/[websiteId]/events/EventsMetricsBar.tsx @@ -1,8 +1,8 @@ import { useMessages } from '@/components/hooks'; -import useWebsiteSessionStats from '@/components/hooks/queries/useWebsiteSessionStats'; -import WebsiteDateFilter from '@/components/input/WebsiteDateFilter'; -import MetricCard from '@/components/metrics/MetricCard'; -import MetricsBar from '@/components/metrics/MetricsBar'; +import { useWebsiteSessionStats } from '@/components/hooks/queries/useWebsiteSessionStats'; +import { WebsiteDateFilter } from '@/components/input/WebsiteDateFilter'; +import { MetricCard } from '@/components/metrics/MetricCard'; +import { MetricsBar } from '@/components/metrics/MetricsBar'; import { formatLongNumber } from '@/lib/format'; import { Flexbox } from 'react-basics'; @@ -38,5 +38,3 @@ export function EventsMetricsBar({ websiteId }: { websiteId: string }) { ); } - -export default EventsMetricsBar; diff --git a/src/app/(main)/websites/[websiteId]/events/EventsPage.tsx b/src/app/(main)/websites/[websiteId]/events/EventsPage.tsx index cf4c19ef4..1016c88c2 100644 --- a/src/app/(main)/websites/[websiteId]/events/EventsPage.tsx +++ b/src/app/(main)/websites/[websiteId]/events/EventsPage.tsx @@ -1,16 +1,16 @@ 'use client'; -import WebsiteHeader from '../WebsiteHeader'; -import EventsDataTable from './EventsDataTable'; -import EventsMetricsBar from './EventsMetricsBar'; -import EventsChart from '@/components/metrics/EventsChart'; +import { WebsiteHeader } from '../WebsiteHeader'; +import { EventsDataTable } from './EventsDataTable'; +import { EventsMetricsBar } from './EventsMetricsBar'; +import { EventsChart } from '@/components/metrics/EventsChart'; import { GridRow } from '@/components/layout/Grid'; -import MetricsTable from '@/components/metrics/MetricsTable'; +import { MetricsTable } from '@/components/metrics/MetricsTable'; import { useMessages } from '@/components/hooks'; import { Item, Tabs } from 'react-basics'; import { useState } from 'react'; -import EventProperties from './EventProperties'; +import { EventProperties } from './EventProperties'; -export default function EventsPage({ websiteId }) { +export function EventsPage({ websiteId }) { const [tab, setTab] = useState('activity'); const { formatMessage, labels } = useMessages(); diff --git a/src/app/(main)/websites/[websiteId]/events/EventsTable.tsx b/src/app/(main)/websites/[websiteId]/events/EventsTable.tsx index 8e6cdf764..d97c9f2f2 100644 --- a/src/app/(main)/websites/[websiteId]/events/EventsTable.tsx +++ b/src/app/(main)/websites/[websiteId]/events/EventsTable.tsx @@ -1,9 +1,9 @@ import { GridTable, GridColumn, Icon } from 'react-basics'; import { useMessages, useTeamUrl, useTimezone } from '@/components/hooks'; -import Empty from '@/components/common/Empty'; -import Avatar from '@/components/common/Avatar'; +import { Empty } from '@/components/common/Empty'; +import { Avatar } from '@/components/common/Avatar'; import Link from 'next/link'; -import Icons from '@/components/icons'; +import { Icons } from '@/components/icons'; export function EventsTable({ data = [] }) { const { formatTimezoneDate } = useTimezone(); @@ -40,5 +40,3 @@ export function EventsTable({ data = [] }) { ); } - -export default EventsTable; diff --git a/src/app/(main)/websites/[websiteId]/events/page.tsx b/src/app/(main)/websites/[websiteId]/events/page.tsx index 1b8882445..23cd54648 100644 --- a/src/app/(main)/websites/[websiteId]/events/page.tsx +++ b/src/app/(main)/websites/[websiteId]/events/page.tsx @@ -1,5 +1,5 @@ import { Metadata } from 'next'; -import EventsPage from './EventsPage'; +import { EventsPage } from './EventsPage'; export default async function ({ params }: { params: { websiteId: string } }) { const { websiteId } = await params; diff --git a/src/app/(main)/websites/[websiteId]/layout.tsx b/src/app/(main)/websites/[websiteId]/layout.tsx index 2542f65af..01b913774 100644 --- a/src/app/(main)/websites/[websiteId]/layout.tsx +++ b/src/app/(main)/websites/[websiteId]/layout.tsx @@ -1,5 +1,5 @@ import { Metadata } from 'next'; -import WebsiteProvider from './WebsiteProvider'; +import { WebsiteProvider } from './WebsiteProvider'; export default async function ({ children, diff --git a/src/app/(main)/websites/[websiteId]/page.tsx b/src/app/(main)/websites/[websiteId]/page.tsx index fef27a53f..286a46126 100644 --- a/src/app/(main)/websites/[websiteId]/page.tsx +++ b/src/app/(main)/websites/[websiteId]/page.tsx @@ -1,4 +1,4 @@ -import WebsiteDetailsPage from './WebsiteDetailsPage'; +import { WebsiteDetailsPage } from './WebsiteDetailsPage'; import { Metadata } from 'next'; export default async function WebsitePage({ params }: { params: Promise<{ websiteId: string }> }) { diff --git a/src/app/(main)/websites/[websiteId]/realtime/RealtimeCountries.tsx b/src/app/(main)/websites/[websiteId]/realtime/RealtimeCountries.tsx index c3a3b8f70..e5023c498 100644 --- a/src/app/(main)/websites/[websiteId]/realtime/RealtimeCountries.tsx +++ b/src/app/(main)/websites/[websiteId]/realtime/RealtimeCountries.tsx @@ -1,9 +1,9 @@ import { useCallback } from 'react'; -import ListTable from '@/components/metrics/ListTable'; +import { ListTable } from '@/components/metrics/ListTable'; import { useLocale, useCountryNames, useMessages } from '@/components/hooks'; import classNames from 'classnames'; import styles from './RealtimeCountries.module.css'; -import TypeIcon from '@/components/common/TypeIcon'; +import { TypeIcon } from '@/components/common/TypeIcon'; export function RealtimeCountries({ data }) { const { formatMessage, labels } = useMessages(); @@ -29,5 +29,3 @@ export function RealtimeCountries({ data }) { /> ); } - -export default RealtimeCountries; diff --git a/src/app/(main)/websites/[websiteId]/realtime/RealtimeHeader.tsx b/src/app/(main)/websites/[websiteId]/realtime/RealtimeHeader.tsx index 6db56b76e..000877432 100644 --- a/src/app/(main)/websites/[websiteId]/realtime/RealtimeHeader.tsx +++ b/src/app/(main)/websites/[websiteId]/realtime/RealtimeHeader.tsx @@ -1,4 +1,4 @@ -import MetricCard from '@/components/metrics/MetricCard'; +import { MetricCard } from '@/components/metrics/MetricCard'; import { useMessages } from '@/components/hooks'; import { RealtimeData } from '@/lib/types'; import styles from './RealtimeHeader.module.css'; @@ -34,5 +34,3 @@ export function RealtimeHeader({ data }: { data: RealtimeData }) { ); } - -export default RealtimeHeader; diff --git a/src/app/(main)/websites/[websiteId]/realtime/RealtimeHome.tsx b/src/app/(main)/websites/[websiteId]/realtime/RealtimeHome.tsx index 104cf3347..dabe6e87b 100644 --- a/src/app/(main)/websites/[websiteId]/realtime/RealtimeHome.tsx +++ b/src/app/(main)/websites/[websiteId]/realtime/RealtimeHome.tsx @@ -1,9 +1,9 @@ import { useEffect } from 'react'; import { useRouter } from 'next/navigation'; -import Page from '@/components/layout/Page'; -import PageHeader from '@/components/layout/PageHeader'; +import { Page } from '@/components/layout/Page'; +import { PageHeader } from '@/components/layout/PageHeader'; import { useApi, useMessages } from '@/components/hooks'; -import EmptyPlaceholder from '@/components/common/EmptyPlaceholder'; +import { EmptyPlaceholder } from '@/components/common/EmptyPlaceholder'; export function RealtimeHome() { const { formatMessage, labels, messages } = useMessages(); @@ -29,5 +29,3 @@ export function RealtimeHome() { ); } - -export default RealtimeHome; diff --git a/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx b/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx index 21da2c54f..5e32eef94 100644 --- a/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx +++ b/src/app/(main)/websites/[websiteId]/realtime/RealtimeLog.tsx @@ -1,8 +1,8 @@ -import useFormat from '@/components//hooks/useFormat'; -import Empty from '@/components/common/Empty'; -import FilterButtons from '@/components/common/FilterButtons'; +import { useFormat } from '@/components//hooks/useFormat'; +import { Empty } from '@/components/common/Empty'; +import { FilterButtons } from '@/components/common/FilterButtons'; import { useCountryNames, useLocale, useMessages, useTimezone } from '@/components/hooks'; -import Icons from '@/components/icons'; +import { Icons } from '@/components/icons'; import { BROWSERS, OS_NAMES } from '@/lib/constants'; import { stringToColor } from '@/lib/format'; import { RealtimeData } from '@/lib/types'; @@ -173,5 +173,3 @@ export function RealtimeLog({ data }: { data: RealtimeData }) { ); } - -export default RealtimeLog; diff --git a/src/app/(main)/websites/[websiteId]/realtime/RealtimeUrls.tsx b/src/app/(main)/websites/[websiteId]/realtime/RealtimeUrls.tsx index ce95bf41d..6895a1e9c 100644 --- a/src/app/(main)/websites/[websiteId]/realtime/RealtimeUrls.tsx +++ b/src/app/(main)/websites/[websiteId]/realtime/RealtimeUrls.tsx @@ -2,7 +2,7 @@ import { Key, useContext, useState } from 'react'; import { ButtonGroup, Button, Flexbox } from 'react-basics'; import thenby from 'thenby'; import { percentFilter } from '@/lib/filters'; -import ListTable from '@/components/metrics/ListTable'; +import { ListTable } from '@/components/metrics/ListTable'; import { FILTER_PAGES, FILTER_REFERRERS } from '@/lib/constants'; import { useMessages } from '@/components/hooks'; import { RealtimeData } from '@/lib/types'; @@ -85,5 +85,3 @@ export function RealtimeUrls({ data }: { data: RealtimeData }) { ); } - -export default RealtimeUrls; diff --git a/src/app/(main)/websites/[websiteId]/realtime/WebsiteRealtimePage.tsx b/src/app/(main)/websites/[websiteId]/realtime/WebsiteRealtimePage.tsx index 6edc28f97..202c6e77f 100644 --- a/src/app/(main)/websites/[websiteId]/realtime/WebsiteRealtimePage.tsx +++ b/src/app/(main)/websites/[websiteId]/realtime/WebsiteRealtimePage.tsx @@ -1,15 +1,15 @@ 'use client'; import { firstBy } from 'thenby'; import { Grid, GridRow } from '@/components/layout/Grid'; -import Page from '@/components/layout/Page'; -import RealtimeChart from '@/components/metrics/RealtimeChart'; -import WorldMap from '@/components/metrics/WorldMap'; +import { Page } from '@/components/layout/Page'; +import { RealtimeChart } from '@/components/metrics/RealtimeChart'; +import { WorldMap } from '@/components/metrics/WorldMap'; import { useRealtime } from '@/components/hooks'; -import RealtimeLog from './RealtimeLog'; -import RealtimeHeader from './RealtimeHeader'; -import RealtimeUrls from './RealtimeUrls'; -import RealtimeCountries from './RealtimeCountries'; -import WebsiteHeader from '../WebsiteHeader'; +import { RealtimeLog } from './RealtimeLog'; +import { RealtimeHeader } from './RealtimeHeader'; +import { RealtimeUrls } from './RealtimeUrls'; +import { RealtimeCountries } from './RealtimeCountries'; +import { WebsiteHeader } from '../WebsiteHeader'; import { percentFilter } from '@/lib/filters'; export function WebsiteRealtimePage({ websiteId }) { @@ -43,5 +43,3 @@ export function WebsiteRealtimePage({ websiteId }) { ); } - -export default WebsiteRealtimePage; diff --git a/src/app/(main)/websites/[websiteId]/realtime/page.tsx b/src/app/(main)/websites/[websiteId]/realtime/page.tsx index f205caddf..09945b7f0 100644 --- a/src/app/(main)/websites/[websiteId]/realtime/page.tsx +++ b/src/app/(main)/websites/[websiteId]/realtime/page.tsx @@ -1,4 +1,4 @@ -import WebsiteRealtimePage from './WebsiteRealtimePage'; +import { WebsiteRealtimePage } from './WebsiteRealtimePage'; import { Metadata } from 'next'; export default async function ({ params }: { params: { websiteId: string } }) { diff --git a/src/app/(main)/websites/[websiteId]/reports/WebsiteReportsPage.tsx b/src/app/(main)/websites/[websiteId]/reports/WebsiteReportsPage.tsx index e61aacb14..fe38ef6dd 100644 --- a/src/app/(main)/websites/[websiteId]/reports/WebsiteReportsPage.tsx +++ b/src/app/(main)/websites/[websiteId]/reports/WebsiteReportsPage.tsx @@ -2,8 +2,8 @@ import Link from 'next/link'; import { Button, Flexbox, Icon, Icons, Text } from 'react-basics'; import { useMessages, useTeamUrl } from '@/components/hooks'; -import WebsiteHeader from '../WebsiteHeader'; -import ReportsDataTable from '@/app/(main)/reports/ReportsDataTable'; +import { WebsiteHeader } from '../WebsiteHeader'; +import { ReportsDataTable } from '@/app/(main)/reports/ReportsDataTable'; export function WebsiteReportsPage({ websiteId }) { const { formatMessage, labels } = useMessages(); @@ -26,5 +26,3 @@ export function WebsiteReportsPage({ websiteId }) { ); } - -export default WebsiteReportsPage; diff --git a/src/app/(main)/websites/[websiteId]/reports/page.tsx b/src/app/(main)/websites/[websiteId]/reports/page.tsx index 15c79de9a..c307ae05a 100644 --- a/src/app/(main)/websites/[websiteId]/reports/page.tsx +++ b/src/app/(main)/websites/[websiteId]/reports/page.tsx @@ -1,4 +1,4 @@ -import WebsiteReportsPage from './WebsiteReportsPage'; +import { WebsiteReportsPage } from './WebsiteReportsPage'; import { Metadata } from 'next'; export default async function ({ params }: { params: { websiteId: string } }) { diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionProperties.tsx b/src/app/(main)/websites/[websiteId]/sessions/SessionProperties.tsx index a0b47bc9a..bf36ddcab 100644 --- a/src/app/(main)/websites/[websiteId]/sessions/SessionProperties.tsx +++ b/src/app/(main)/websites/[websiteId]/sessions/SessionProperties.tsx @@ -1,7 +1,7 @@ import { GridColumn, GridTable } from 'react-basics'; import { useSessionDataProperties, useSessionDataValues, useMessages } from '@/components/hooks'; import { LoadingPanel } from '@/components/common/LoadingPanel'; -import PieChart from '@/components/charts/PieChart'; +import { PieChart } from '@/components/charts/PieChart'; import { useState } from 'react'; import { CHART_COLORS } from '@/lib/constants'; import styles from './SessionProperties.module.css'; @@ -48,5 +48,3 @@ export function SessionProperties({ websiteId }: { websiteId: string }) { ); } - -export default SessionProperties; diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionsDataTable.tsx b/src/app/(main)/websites/[websiteId]/sessions/SessionsDataTable.tsx index 56e0df628..dd6a98aff 100644 --- a/src/app/(main)/websites/[websiteId]/sessions/SessionsDataTable.tsx +++ b/src/app/(main)/websites/[websiteId]/sessions/SessionsDataTable.tsx @@ -1,9 +1,9 @@ import { useWebsiteSessions } from '@/components/hooks'; -import SessionsTable from './SessionsTable'; -import DataTable from '@/components/common/DataTable'; +import { SessionsTable } from './SessionsTable'; +import { DataTable } from '@/components/common/DataTable'; import { ReactNode } from 'react'; -export default function SessionsDataTable({ +export function SessionsDataTable({ websiteId, children, }: { diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionsMetricsBar.tsx b/src/app/(main)/websites/[websiteId]/sessions/SessionsMetricsBar.tsx index 62d60de8b..57e67228b 100644 --- a/src/app/(main)/websites/[websiteId]/sessions/SessionsMetricsBar.tsx +++ b/src/app/(main)/websites/[websiteId]/sessions/SessionsMetricsBar.tsx @@ -1,8 +1,8 @@ import { useMessages } from '@/components/hooks'; -import useWebsiteSessionStats from '@/components/hooks/queries/useWebsiteSessionStats'; -import WebsiteDateFilter from '@/components/input/WebsiteDateFilter'; -import MetricCard from '@/components/metrics/MetricCard'; -import MetricsBar from '@/components/metrics/MetricsBar'; +import { useWebsiteSessionStats } from '@/components/hooks/queries/useWebsiteSessionStats'; +import { WebsiteDateFilter } from '@/components/input/WebsiteDateFilter'; +import { MetricCard } from '@/components/metrics/MetricCard'; +import { MetricsBar } from '@/components/metrics/MetricsBar'; import { formatLongNumber } from '@/lib/format'; import { Flexbox } from 'react-basics'; @@ -38,5 +38,3 @@ export function SessionsMetricsBar({ websiteId }: { websiteId: string }) { ); } - -export default SessionsMetricsBar; diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionsPage.tsx b/src/app/(main)/websites/[websiteId]/sessions/SessionsPage.tsx index 2ee044db6..6be033700 100644 --- a/src/app/(main)/websites/[websiteId]/sessions/SessionsPage.tsx +++ b/src/app/(main)/websites/[websiteId]/sessions/SessionsPage.tsx @@ -1,14 +1,14 @@ 'use client'; -import WebsiteHeader from '../WebsiteHeader'; -import SessionsDataTable from './SessionsDataTable'; -import SessionsMetricsBar from './SessionsMetricsBar'; -import SessionProperties from './SessionProperties'; -import WorldMap from '@/components/metrics/WorldMap'; +import { WebsiteHeader } from '../WebsiteHeader'; +import { SessionsDataTable } from './SessionsDataTable'; +import { SessionsMetricsBar } from './SessionsMetricsBar'; +import { SessionProperties } from './SessionProperties'; +import { WorldMap } from '@/components/metrics/WorldMap'; import { GridRow } from '@/components/layout/Grid'; import { Item, Tabs } from 'react-basics'; import { useState } from 'react'; import { useMessages } from '@/components/hooks'; -import SessionsWeekly from './SessionsWeekly'; +import { SessionsWeekly } from './SessionsWeekly'; export function SessionsPage({ websiteId }) { const [tab, setTab] = useState('activity'); @@ -31,5 +31,3 @@ export function SessionsPage({ websiteId }) { ); } - -export default SessionsPage; diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionsTable.tsx b/src/app/(main)/websites/[websiteId]/sessions/SessionsTable.tsx index ddb3ed65b..bb2542171 100644 --- a/src/app/(main)/websites/[websiteId]/sessions/SessionsTable.tsx +++ b/src/app/(main)/websites/[websiteId]/sessions/SessionsTable.tsx @@ -1,9 +1,9 @@ import Link from 'next/link'; import { GridColumn, GridTable } from 'react-basics'; import { useFormat, useMessages, useTimezone } from '@/components/hooks'; -import Avatar from '@/components/common/Avatar'; +import { Avatar } from '@/components/common/Avatar'; import styles from './SessionsTable.module.css'; -import TypeIcon from '@/components/common/TypeIcon'; +import { TypeIcon } from '@/components/common/TypeIcon'; export function SessionsTable({ data = [] }: { data: any[]; showDomain?: boolean }) { const { formatTimezoneDate } = useTimezone(); @@ -56,5 +56,3 @@ export function SessionsTable({ data = [] }: { data: any[]; showDomain?: boolean ); } - -export default SessionsTable; diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionsWeekly.tsx b/src/app/(main)/websites/[websiteId]/sessions/SessionsWeekly.tsx index 6082f0e2d..ecf66405f 100644 --- a/src/app/(main)/websites/[websiteId]/sessions/SessionsWeekly.tsx +++ b/src/app/(main)/websites/[websiteId]/sessions/SessionsWeekly.tsx @@ -79,5 +79,3 @@ export function SessionsWeekly({ websiteId }: { websiteId: string }) { ); } - -export default SessionsWeekly; diff --git a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionActivity.tsx b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionActivity.tsx index 0a020d5cb..ea00482dc 100644 --- a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionActivity.tsx +++ b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionActivity.tsx @@ -1,6 +1,6 @@ import { isSameDay } from 'date-fns'; import { Loading, Icon, StatusLight } from 'react-basics'; -import Icons from '@/components/icons'; +import { Icons } from '@/components/icons'; import { useSessionActivity, useTimezone } from '@/components/hooks'; import styles from './SessionActivity.module.css'; import { Fragment } from 'react'; diff --git a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionData.tsx b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionData.tsx index 56d4a0d91..cc85bf4e9 100644 --- a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionData.tsx +++ b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionData.tsx @@ -1,6 +1,6 @@ import { TextOverflow } from 'react-basics'; import { useMessages, useSessionData } from '@/components/hooks'; -import Empty from '@/components/common/Empty'; +import { Empty } from '@/components/common/Empty'; import { DATA_TYPES } from '@/lib/constants'; import styles from './SessionData.module.css'; import { LoadingPanel } from '@/components/common/LoadingPanel'; diff --git a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionDetailsPage.tsx b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionDetailsPage.tsx index 9ccf275f6..990663440 100644 --- a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionDetailsPage.tsx +++ b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionDetailsPage.tsx @@ -1,15 +1,15 @@ 'use client'; -import Avatar from '@/components/common/Avatar'; +import { Avatar } from '@/components/common/Avatar'; import { LoadingPanel } from '@/components/common/LoadingPanel'; import { useWebsiteSession } from '@/components/hooks'; -import WebsiteHeader from '../../WebsiteHeader'; +import { WebsiteHeader } from '../../WebsiteHeader'; import { SessionActivity } from './SessionActivity'; import { SessionData } from './SessionData'; import styles from './SessionDetailsPage.module.css'; -import SessionInfo from './SessionInfo'; +import { SessionInfo } from './SessionInfo'; import { SessionStats } from './SessionStats'; -export default function SessionDetailsPage({ +export function SessionDetailsPage({ websiteId, sessionId, }: { diff --git a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionInfo.tsx b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionInfo.tsx index 889eb972f..57eb71e8c 100644 --- a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionInfo.tsx +++ b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionInfo.tsx @@ -1,10 +1,10 @@ import { useFormat, useLocale, useMessages, useRegionNames, useTimezone } from '@/components/hooks'; -import TypeIcon from '@/components/common/TypeIcon'; +import { TypeIcon } from '@/components/common/TypeIcon'; import { Icon, CopyIcon } from 'react-basics'; -import Icons from '@/components/icons'; +import { Icons } from '@/components/icons'; import styles from './SessionInfo.module.css'; -export default function SessionInfo({ data }) { +export function SessionInfo({ data }) { const { locale } = useLocale(); const { formatTimezoneDate } = useTimezone(); const { formatMessage, labels } = useMessages(); diff --git a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionStats.tsx b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionStats.tsx index eb385e9bb..5aa3716d4 100644 --- a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionStats.tsx +++ b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/SessionStats.tsx @@ -1,6 +1,6 @@ import { useMessages } from '@/components/hooks'; -import MetricCard from '@/components/metrics/MetricCard'; -import MetricsBar from '@/components/metrics/MetricsBar'; +import { MetricCard } from '@/components/metrics/MetricCard'; +import { MetricsBar } from '@/components/metrics/MetricsBar'; import { formatShortTime } from '@/lib/format'; export function SessionStats({ data }) { diff --git a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/page.tsx b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/page.tsx index f4882880c..a14a70c79 100644 --- a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/page.tsx +++ b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/page.tsx @@ -1,4 +1,4 @@ -import SessionDetailsPage from './SessionDetailsPage'; +import { SessionDetailsPage } from './SessionDetailsPage'; import { Metadata } from 'next'; export default async function WebsitePage({ diff --git a/src/app/(main)/websites/[websiteId]/sessions/page.tsx b/src/app/(main)/websites/[websiteId]/sessions/page.tsx index d1ff96f58..1012b6d15 100644 --- a/src/app/(main)/websites/[websiteId]/sessions/page.tsx +++ b/src/app/(main)/websites/[websiteId]/sessions/page.tsx @@ -1,4 +1,4 @@ -import SessionsPage from './SessionsPage'; +import { SessionsPage } from './SessionsPage'; import { Metadata } from 'next'; export default async function ({ params }: { params: { websiteId: string } }) { diff --git a/src/app/(main)/websites/page.tsx b/src/app/(main)/websites/page.tsx index 859516c9d..c3e54be69 100644 --- a/src/app/(main)/websites/page.tsx +++ b/src/app/(main)/websites/page.tsx @@ -1,4 +1,4 @@ -import WebsitesPage from './WebsitesPage'; +import { WebsitesPage } from './WebsitesPage'; import { Metadata } from 'next'; export default function () { diff --git a/src/app/Providers.tsx b/src/app/Providers.tsx index 2fb2dce27..d8c7f0304 100644 --- a/src/app/Providers.tsx +++ b/src/app/Providers.tsx @@ -2,7 +2,7 @@ import { IntlProvider } from 'react-intl'; import { QueryClient, QueryClientProvider } from '@tanstack/react-query'; import { ZenProvider } from '@umami/react-zen'; -import ErrorBoundary from '@/components/common/ErrorBoundary'; +import { ErrorBoundary } from '@/components/common/ErrorBoundary'; import { useLocale } from '@/components/hooks'; import 'chartjs-adapter-date-fns'; import { useEffect } from 'react'; @@ -48,5 +48,3 @@ export function Providers({ children }) { ); } - -export default Providers; diff --git a/src/app/layout.tsx b/src/app/layout.tsx index 2d3dde400..cdf49bcf1 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -1,5 +1,5 @@ import { Metadata } from 'next'; -import Providers from './Providers'; +import { Providers } from './Providers'; import '@fontsource/inter/300.css'; import '@fontsource/inter/400.css'; import '@fontsource/inter/500.css'; diff --git a/src/app/login/LoginForm.tsx b/src/app/login/LoginForm.tsx index a808c622d..0b18ff438 100644 --- a/src/app/login/LoginForm.tsx +++ b/src/app/login/LoginForm.tsx @@ -73,5 +73,3 @@ export function LoginForm() { ); } - -export default LoginForm; diff --git a/src/app/login/LoginPage.tsx b/src/app/login/LoginPage.tsx index 8ea0b4e20..9d4e2875d 100644 --- a/src/app/login/LoginPage.tsx +++ b/src/app/login/LoginPage.tsx @@ -1,5 +1,5 @@ 'use client'; -import LoginForm from './LoginForm'; +import { LoginForm } from './LoginForm'; import styles from './LoginPage.module.css'; export function LoginPage() { @@ -13,5 +13,3 @@ export function LoginPage() { ); } - -export default LoginPage; diff --git a/src/app/login/page.tsx b/src/app/login/page.tsx index 6f34d987e..364561f1c 100644 --- a/src/app/login/page.tsx +++ b/src/app/login/page.tsx @@ -1,5 +1,5 @@ import { Metadata } from 'next'; -import LoginPage from './LoginPage'; +import { LoginPage } from './LoginPage'; export default async function () { return ; diff --git a/src/app/logout/LogoutPage.tsx b/src/app/logout/LogoutPage.tsx index d3dc481ab..082e0c6db 100644 --- a/src/app/logout/LogoutPage.tsx +++ b/src/app/logout/LogoutPage.tsx @@ -28,5 +28,3 @@ export function LogoutPage() { return null; } - -export default LogoutPage; diff --git a/src/app/logout/page.tsx b/src/app/logout/page.tsx index a253049a9..f9280d0dc 100644 --- a/src/app/logout/page.tsx +++ b/src/app/logout/page.tsx @@ -1,4 +1,4 @@ -import LogoutPage from './LogoutPage'; +import { LogoutPage } from './LogoutPage'; import { Metadata } from 'next'; export default function () { diff --git a/src/app/share/[...shareId]/Footer.tsx b/src/app/share/[...shareId]/Footer.tsx index e1ba9833c..495b0e3d9 100644 --- a/src/app/share/[...shareId]/Footer.tsx +++ b/src/app/share/[...shareId]/Footer.tsx @@ -10,5 +10,3 @@ export function Footer() { ); } - -export default Footer; diff --git a/src/app/share/[...shareId]/Header.module.css b/src/app/share/[...shareId]/Header.module.css index 044781995..9fc946c78 100644 --- a/src/app/share/[...shareId]/Header.module.css +++ b/src/app/share/[...shareId]/Header.module.css @@ -28,10 +28,4 @@ .header .buttons { flex: 1; } - - .links { - order: 2; - margin: 20px 0; - min-width: 100%; - } } diff --git a/src/app/share/[...shareId]/Header.tsx b/src/app/share/[...shareId]/Header.tsx index a71a5b560..cfc693adc 100644 --- a/src/app/share/[...shareId]/Header.tsx +++ b/src/app/share/[...shareId]/Header.tsx @@ -1,9 +1,9 @@ +import { ThemeButton } from '@umami/react-zen'; import { Icon, Text } from 'react-basics'; import Link from 'next/link'; -import LanguageButton from '@/components/input/LanguageButton'; -import ThemeButton from '@/components/input/ThemeButton'; -import SettingsButton from '@/components/input/SettingsButton'; -import Icons from '@/components/icons'; +import { LanguageButton } from '@/components/input/LanguageButton'; +import { SettingsButton } from '@/components/input/SettingsButton'; +import { Icons } from '@/components/icons'; import styles from './Header.module.css'; export function Header() { @@ -25,5 +25,3 @@ export function Header() { ); } - -export default Header; diff --git a/src/app/share/[...shareId]/SharePage.tsx b/src/app/share/[...shareId]/SharePage.tsx index 00c7ec3f2..f6f3fd444 100644 --- a/src/app/share/[...shareId]/SharePage.tsx +++ b/src/app/share/[...shareId]/SharePage.tsx @@ -1,13 +1,13 @@ 'use client'; import WebsiteDetailsPage from '../../(main)/websites/[websiteId]/WebsiteDetailsPage'; import { useShareToken } from '@/components/hooks'; -import Page from '@/components/layout/Page'; -import Header from './Header'; -import Footer from './Footer'; +import { Page } from '@/components/layout/Page'; +import { Header } from './Header'; +import { Footer } from './Footer'; import styles from './SharePage.module.css'; import { WebsiteProvider } from '@/app/(main)/websites/[websiteId]/WebsiteProvider'; -export default function SharePage({ shareId }) { +export function SharePage({ shareId }) { const { shareToken, isLoading } = useShareToken(shareId); if (isLoading || !shareToken) { diff --git a/src/app/share/[...shareId]/page.tsx b/src/app/share/[...shareId]/page.tsx index c06274aa0..61d0c6546 100644 --- a/src/app/share/[...shareId]/page.tsx +++ b/src/app/share/[...shareId]/page.tsx @@ -1,4 +1,4 @@ -import SharePage from './SharePage'; +import { SharePage } from './SharePage'; export default async function ({ params }: { params: { shareId: string } }) { const { shareId } = await params; diff --git a/src/app/sso/SSOPage.tsx b/src/app/sso/SSOPage.tsx index eb7c0f0a9..1bd4bd692 100644 --- a/src/app/sso/SSOPage.tsx +++ b/src/app/sso/SSOPage.tsx @@ -4,7 +4,7 @@ import { Loading } from 'react-basics'; import { useRouter, useSearchParams } from 'next/navigation'; import { setClientAuthToken } from '@/lib/client'; -export default function SSOPage() { +export function SSOPage() { const router = useRouter(); const search = useSearchParams(); const url = search.get('url'); diff --git a/src/app/sso/page.tsx b/src/app/sso/page.tsx index 0cfef1a90..f6290d41c 100644 --- a/src/app/sso/page.tsx +++ b/src/app/sso/page.tsx @@ -1,5 +1,5 @@ import { Suspense } from 'react'; -import SSOPage from './SSOPage'; +import { SSOPage } from './SSOPage'; export default function () { return ( diff --git a/src/components/charts/BarChart.tsx b/src/components/charts/BarChart.tsx index f6a6e5e05..1ad8ed213 100644 --- a/src/components/charts/BarChart.tsx +++ b/src/components/charts/BarChart.tsx @@ -1,5 +1,5 @@ -import BarChartTooltip from '@/components/charts/BarChartTooltip'; -import Chart, { ChartProps } from '@/components/charts/Chart'; +import { BarChartTooltip } from '@/components/charts/BarChartTooltip'; +import { Chart, ChartProps } from '@/components/charts/Chart'; import { useTheme } from '@/components/hooks'; import { renderNumberLabels } from '@/lib/charts'; import { useMemo, useState } from 'react'; @@ -95,5 +95,3 @@ export function BarChart(props: BarChartProps) { /> ); } - -export default BarChart; diff --git a/src/components/charts/BarChartTooltip.tsx b/src/components/charts/BarChartTooltip.tsx index af31c8747..f6a1a8936 100644 --- a/src/components/charts/BarChartTooltip.tsx +++ b/src/components/charts/BarChartTooltip.tsx @@ -15,7 +15,7 @@ const formats = { year: 'yyyy', }; -export default function BarChartTooltip({ tooltip, unit, currency }) { +export function BarChartTooltip({ tooltip, unit, currency }) { const { locale } = useLocale(); const { labelColors, dataPoints } = tooltip; diff --git a/src/components/charts/BubbleChart.tsx b/src/components/charts/BubbleChart.tsx index dfe67f3a8..0ff498b77 100644 --- a/src/components/charts/BubbleChart.tsx +++ b/src/components/charts/BubbleChart.tsx @@ -7,7 +7,7 @@ export interface BubbleChartProps extends ChartProps { type?: 'bubble'; } -export default function BubbleChart(props: BubbleChartProps) { +export function BubbleChart(props: BubbleChartProps) { const [tooltip, setTooltip] = useState(null); const { type = 'bubble' } = props; diff --git a/src/components/charts/Chart.tsx b/src/components/charts/Chart.tsx index dde01eb44..17ff1db1f 100644 --- a/src/components/charts/Chart.tsx +++ b/src/components/charts/Chart.tsx @@ -2,8 +2,8 @@ import { useState, useRef, useEffect, useMemo, ReactNode } from 'react'; import { Loading } from 'react-basics'; import classNames from 'classnames'; import ChartJS, { LegendItem, ChartOptions } from 'chart.js/auto'; -import HoverTooltip from '@/components/common/HoverTooltip'; -import Legend from '@/components/metrics/Legend'; +import { HoverTooltip } from '@/components/common/HoverTooltip'; +import { Legend } from '@/components/metrics/Legend'; import { DEFAULT_ANIMATION_DURATION } from '@/lib/constants'; import styles from './Chart.module.css'; @@ -151,5 +151,3 @@ export function Chart({ ); } - -export default Chart; diff --git a/src/components/charts/PieChart.tsx b/src/components/charts/PieChart.tsx index a98b97305..01254140b 100644 --- a/src/components/charts/PieChart.tsx +++ b/src/components/charts/PieChart.tsx @@ -7,7 +7,7 @@ export interface PieChartProps extends ChartProps { type?: 'doughnut' | 'pie'; } -export default function PieChart(props: PieChartProps) { +export function PieChart(props: PieChartProps) { const [tooltip, setTooltip] = useState(null); const { type = 'pie' } = props; diff --git a/src/components/common/Avatar.tsx b/src/components/common/Avatar.tsx index d0cae2479..b3e8ccc45 100644 --- a/src/components/common/Avatar.tsx +++ b/src/components/common/Avatar.tsx @@ -5,7 +5,7 @@ import { getColor, getPastel } from '@/lib/colors'; const lib = lorelei; -function Avatar({ seed, size = 128, ...props }: { seed: string; size?: number }) { +export function Avatar({ seed, size = 128, ...props }: { seed: string; size?: number }) { const backgroundColor = getPastel(getColor(seed), 4); const avatar = useMemo(() => { @@ -19,5 +19,3 @@ function Avatar({ seed, size = 128, ...props }: { seed: string; size?: number }) return Avatar; } - -export default Avatar; diff --git a/src/components/common/Breadcrumb.tsx b/src/components/common/Breadcrumb.tsx index ebdce4977..2416f7cb2 100644 --- a/src/components/common/Breadcrumb.tsx +++ b/src/components/common/Breadcrumb.tsx @@ -34,5 +34,3 @@ export function Breadcrumb({ data }: BreadcrumbProps) { ); } - -export default Breadcrumb; diff --git a/src/components/common/ConfirmationForm.tsx b/src/components/common/ConfirmationForm.tsx index 8b617ab54..e532e6bb8 100644 --- a/src/components/common/ConfirmationForm.tsx +++ b/src/components/common/ConfirmationForm.tsx @@ -35,5 +35,3 @@ export function ConfirmationForm({ ); } - -export default ConfirmationForm; diff --git a/src/components/common/DataTable.tsx b/src/components/common/DataTable.tsx index b19ddf91d..91f02516f 100644 --- a/src/components/common/DataTable.tsx +++ b/src/components/common/DataTable.tsx @@ -2,8 +2,8 @@ import { ReactNode } from 'react'; import classNames from 'classnames'; import { Loading, SearchField } from 'react-basics'; import { useMessages, useNavigation } from '@/components/hooks'; -import Empty from '@/components/common/Empty'; -import Pager from '@/components/common/Pager'; +import { Empty } from '@/components/common/Empty'; +import { Pager } from '@/components/common/Pager'; import { PagedQueryResult } from '@/lib/types'; import styles from './DataTable.module.css'; import { LoadingPanel } from '@/components/common/LoadingPanel'; @@ -87,5 +87,3 @@ export function DataTable({ ); } - -export default DataTable; diff --git a/src/components/common/Empty.tsx b/src/components/common/Empty.tsx index cf6d11cc6..f1661e2d6 100644 --- a/src/components/common/Empty.tsx +++ b/src/components/common/Empty.tsx @@ -16,5 +16,3 @@ export function Empty({ message, className }: EmptyProps) { ); } - -export default Empty; diff --git a/src/components/common/EmptyPlaceholder.tsx b/src/components/common/EmptyPlaceholder.tsx index 2fd606cdc..c86923135 100644 --- a/src/components/common/EmptyPlaceholder.tsx +++ b/src/components/common/EmptyPlaceholder.tsx @@ -18,5 +18,3 @@ export function EmptyPlaceholder({ message, children }: EmptyPlaceholderProps) { ); } - -export default EmptyPlaceholder; diff --git a/src/components/common/ErrorBoundary.tsx b/src/components/common/ErrorBoundary.tsx index b9521bb4e..822a445ab 100644 --- a/src/components/common/ErrorBoundary.tsx +++ b/src/components/common/ErrorBoundary.tsx @@ -29,5 +29,3 @@ export function ErrorBoundary({ children }: { children: ReactNode }) { ); } - -export default ErrorBoundary; diff --git a/src/components/common/ErrorMessage.tsx b/src/components/common/ErrorMessage.tsx index bf3eefb14..92593e132 100644 --- a/src/components/common/ErrorMessage.tsx +++ b/src/components/common/ErrorMessage.tsx @@ -14,5 +14,3 @@ export function ErrorMessage() { ); } - -export default ErrorMessage; diff --git a/src/components/common/Favicon.tsx b/src/components/common/Favicon.tsx index ea3f31aae..ca5803229 100644 --- a/src/components/common/Favicon.tsx +++ b/src/components/common/Favicon.tsx @@ -17,5 +17,3 @@ export function Favicon({ domain, ...props }) { return hostName ? : null; } - -export default Favicon; diff --git a/src/components/common/FilterButtons.tsx b/src/components/common/FilterButtons.tsx index a64a6482a..09ec38d91 100644 --- a/src/components/common/FilterButtons.tsx +++ b/src/components/common/FilterButtons.tsx @@ -16,5 +16,3 @@ export function FilterButtons({ items, selectedKey, onSelect }: FilterButtonsPro ); } - -export default FilterButtons; diff --git a/src/components/common/FilterLink.tsx b/src/components/common/FilterLink.tsx index 9d726b58c..e5343caae 100644 --- a/src/components/common/FilterLink.tsx +++ b/src/components/common/FilterLink.tsx @@ -51,5 +51,3 @@ export function FilterLink({ ); } - -export default FilterLink; diff --git a/src/components/common/HamburgerButton.tsx b/src/components/common/HamburgerButton.tsx index 5a81f3a33..f9bc42a54 100644 --- a/src/components/common/HamburgerButton.tsx +++ b/src/components/common/HamburgerButton.tsx @@ -1,6 +1,6 @@ import { Button, Icon, Icons } from 'react-basics'; import { useState } from 'react'; -import MobileMenu from './MobileMenu'; +import { MobileMenu } from './MobileMenu'; export function HamburgerButton({ menuItems }: { menuItems: any[] }) { const [active, setActive] = useState(false); @@ -17,5 +17,3 @@ export function HamburgerButton({ menuItems }: { menuItems: any[] }) { ); } - -export default HamburgerButton; diff --git a/src/components/common/HoverTooltip.tsx b/src/components/common/HoverTooltip.tsx index e5e31219b..1ceb51009 100644 --- a/src/components/common/HoverTooltip.tsx +++ b/src/components/common/HoverTooltip.tsx @@ -23,5 +23,3 @@ export function HoverTooltip({ children }: { children: ReactNode }) { ); } - -export default HoverTooltip; diff --git a/src/components/common/LinkButton.tsx b/src/components/common/LinkButton.tsx index 3aa2a76a0..5115ec135 100644 --- a/src/components/common/LinkButton.tsx +++ b/src/components/common/LinkButton.tsx @@ -2,6 +2,7 @@ import { ReactNode } from 'react'; import classNames from 'classnames'; import Link from 'next/link'; import { useLocale } from '@/components/hooks'; +// eslint-disable-next-line css-modules/no-unused-class import styles from './LinkButton.module.css'; export interface LinkButtonProps { @@ -26,5 +27,3 @@ export function LinkButton({ href, className, variant, scroll = true, children } ); } - -export default LinkButton; diff --git a/src/components/common/LoadingPanel.tsx b/src/components/common/LoadingPanel.tsx index 4d27618ac..0cdbd075c 100644 --- a/src/components/common/LoadingPanel.tsx +++ b/src/components/common/LoadingPanel.tsx @@ -1,8 +1,8 @@ import { ReactNode } from 'react'; import classNames from 'classnames'; import { Loading } from 'react-basics'; -import ErrorMessage from '@/components/common/ErrorMessage'; -import Empty from '@/components/common/Empty'; +import { ErrorMessage } from '@/components/common/ErrorMessage'; +import { Empty } from '@/components/common/Empty'; import styles from './LoadingPanel.module.css'; export function LoadingPanel({ diff --git a/src/components/common/MobileMenu.tsx b/src/components/common/MobileMenu.tsx index e14f0b837..260f5cf8d 100644 --- a/src/components/common/MobileMenu.tsx +++ b/src/components/common/MobileMenu.tsx @@ -43,5 +43,3 @@ export function MobileMenu({ document.body, ); } - -export default MobileMenu; diff --git a/src/components/common/Pager.tsx b/src/components/common/Pager.tsx index f4097fe73..9301850c1 100644 --- a/src/components/common/Pager.tsx +++ b/src/components/common/Pager.tsx @@ -55,5 +55,3 @@ export function Pager({ page, pageSize, count, onPageChange, className }: PagerP ); } - -export default Pager; diff --git a/src/components/common/TypeConfirmationForm.tsx b/src/components/common/TypeConfirmationForm.tsx index baf5949f2..015a08dcd 100644 --- a/src/components/common/TypeConfirmationForm.tsx +++ b/src/components/common/TypeConfirmationForm.tsx @@ -51,5 +51,3 @@ export function TypeConfirmationForm({ ); } - -export default TypeConfirmationForm; diff --git a/src/components/common/TypeIcon.tsx b/src/components/common/TypeIcon.tsx index 2a180445f..25e77e4c3 100644 --- a/src/components/common/TypeIcon.tsx +++ b/src/components/common/TypeIcon.tsx @@ -26,5 +26,3 @@ export function TypeIcon({ ); } - -export default TypeIcon; diff --git a/src/components/hooks/queries/useConfig.ts b/src/components/hooks/queries/useConfig.ts index 223f45509..b0fe287e5 100644 --- a/src/components/hooks/queries/useConfig.ts +++ b/src/components/hooks/queries/useConfig.ts @@ -1,9 +1,9 @@ import { useEffect } from 'react'; -import useStore, { setConfig } from '@/store/app'; +import { useApp, setConfig } from '@/store/app'; import { getConfig } from '@/app/actions/getConfig'; export function useConfig() { - const { config } = useStore(); + const { config } = useApp(); async function loadConfig() { setConfig(await getConfig()); @@ -17,5 +17,3 @@ export function useConfig() { return config; } - -export default useConfig; diff --git a/src/components/hooks/queries/useEventDataEvents.ts b/src/components/hooks/queries/useEventDataEvents.ts index 5cad99169..b82126baa 100644 --- a/src/components/hooks/queries/useEventDataEvents.ts +++ b/src/components/hooks/queries/useEventDataEvents.ts @@ -16,5 +16,3 @@ export function useEventDataEvents( ...options, }); } - -export default useEventDataEvents; diff --git a/src/components/hooks/queries/useEventDataProperties.ts b/src/components/hooks/queries/useEventDataProperties.ts index b841a8f40..aaf9c5591 100644 --- a/src/components/hooks/queries/useEventDataProperties.ts +++ b/src/components/hooks/queries/useEventDataProperties.ts @@ -16,5 +16,3 @@ export function useEventDataProperties( ...options, }); } - -export default useEventDataProperties; diff --git a/src/components/hooks/queries/useEventDataValues.ts b/src/components/hooks/queries/useEventDataValues.ts index de6783a0a..2d4c58fd9 100644 --- a/src/components/hooks/queries/useEventDataValues.ts +++ b/src/components/hooks/queries/useEventDataValues.ts @@ -19,5 +19,3 @@ export function useEventDataValues( ...options, }); } - -export default useEventDataValues; diff --git a/src/components/hooks/queries/useLogin.ts b/src/components/hooks/queries/useLogin.ts index f88efbf0e..d06cc41c6 100644 --- a/src/components/hooks/queries/useLogin.ts +++ b/src/components/hooks/queries/useLogin.ts @@ -1,5 +1,5 @@ import { UseQueryResult } from '@tanstack/react-query'; -import useStore, { setUser } from '@/store/app'; +import { useApp, setUser } from '@/store/app'; import { useApi } from '../useApi'; const selector = (state: { user: any }) => state.user; @@ -9,7 +9,7 @@ export function useLogin(): { setUser: (data: any) => void; } & UseQueryResult { const { get, useQuery } = useApi(); - const user = useStore(selector); + const user = useApp(selector); const query = useQuery({ queryKey: ['login'], @@ -25,5 +25,3 @@ export function useLogin(): { return { user, setUser, ...query }; } - -export default useLogin; diff --git a/src/components/hooks/queries/useRealtime.ts b/src/components/hooks/queries/useRealtime.ts index 670b23bea..997344b38 100644 --- a/src/components/hooks/queries/useRealtime.ts +++ b/src/components/hooks/queries/useRealtime.ts @@ -17,5 +17,3 @@ export function useRealtime(websiteId: string) { return { data, isLoading, error }; } - -export default useRealtime; diff --git a/src/components/hooks/queries/useReport.ts b/src/components/hooks/queries/useReport.ts index 45aea19cf..71cfba751 100644 --- a/src/components/hooks/queries/useReport.ts +++ b/src/components/hooks/queries/useReport.ts @@ -92,5 +92,3 @@ export function useReport( return { report, runReport, updateReport, isRunning }; } - -export default useReport; diff --git a/src/components/hooks/queries/useReports.ts b/src/components/hooks/queries/useReports.ts index 21db15368..628afd6c1 100644 --- a/src/components/hooks/queries/useReports.ts +++ b/src/components/hooks/queries/useReports.ts @@ -1,6 +1,6 @@ -import useApi from '../useApi'; -import usePagedQuery from '../usePagedQuery'; -import useModified from '../useModified'; +import { useApi } from '../useApi'; +import { usePagedQuery } from '../usePagedQuery'; +import { useModified } from '../useModified'; export function useReports({ websiteId, teamId }: { websiteId?: string; teamId?: string }) { const { modified } = useModified(`reports`); @@ -24,5 +24,3 @@ export function useReports({ websiteId, teamId }: { websiteId?: string; teamId?: deleteReport, }; } - -export default useReports; diff --git a/src/components/hooks/queries/useRevenueValues.ts b/src/components/hooks/queries/useRevenueValues.ts index 007ca3c53..803c2a8ef 100644 --- a/src/components/hooks/queries/useRevenueValues.ts +++ b/src/components/hooks/queries/useRevenueValues.ts @@ -14,5 +14,3 @@ export function useRevenueValues(websiteId: string, startDate: Date, endDate: Da enabled: !!(websiteId && startDate && endDate), }); } - -export default useRevenueValues; diff --git a/src/components/hooks/queries/useSessionDataProperties.ts b/src/components/hooks/queries/useSessionDataProperties.ts index ca3798f02..94afb60da 100644 --- a/src/components/hooks/queries/useSessionDataProperties.ts +++ b/src/components/hooks/queries/useSessionDataProperties.ts @@ -16,5 +16,3 @@ export function useSessionDataProperties( ...options, }); } - -export default useSessionDataProperties; diff --git a/src/components/hooks/queries/useSessionDataValues.ts b/src/components/hooks/queries/useSessionDataValues.ts index 85529fc09..2f756c226 100644 --- a/src/components/hooks/queries/useSessionDataValues.ts +++ b/src/components/hooks/queries/useSessionDataValues.ts @@ -17,5 +17,3 @@ export function useSessionDataValues( ...options, }); } - -export default useSessionDataValues; diff --git a/src/components/hooks/queries/useShareToken.ts b/src/components/hooks/queries/useShareToken.ts index cf17c7562..050d05a80 100644 --- a/src/components/hooks/queries/useShareToken.ts +++ b/src/components/hooks/queries/useShareToken.ts @@ -1,4 +1,4 @@ -import useStore, { setShareToken } from '@/store/app'; +import { useApp, setShareToken } from '@/store/app'; import { useApi } from '../useApi'; const selector = (state: { shareToken: string }) => state.shareToken; @@ -8,7 +8,7 @@ export function useShareToken(shareId: string): { isLoading?: boolean; error?: Error; } { - const shareToken = useStore(selector); + const shareToken = useApp(selector); const { get, useQuery } = useApi(); const { isLoading, error } = useQuery({ queryKey: ['share', shareId], @@ -23,5 +23,3 @@ export function useShareToken(shareId: string): { return { shareToken, isLoading, error }; } - -export default useShareToken; diff --git a/src/components/hooks/queries/useTeam.ts b/src/components/hooks/queries/useTeam.ts index d0ce7499c..f9383ce07 100644 --- a/src/components/hooks/queries/useTeam.ts +++ b/src/components/hooks/queries/useTeam.ts @@ -8,5 +8,3 @@ export function useTeam(teamId: string) { enabled: !!teamId, }); } - -export default useTeam; diff --git a/src/components/hooks/queries/useTeamMembers.ts b/src/components/hooks/queries/useTeamMembers.ts index b6353afc1..c285c30f3 100644 --- a/src/components/hooks/queries/useTeamMembers.ts +++ b/src/components/hooks/queries/useTeamMembers.ts @@ -1,6 +1,6 @@ import { useApi } from '../useApi'; -import usePagedQuery from '../usePagedQuery'; -import useModified from '../useModified'; +import { usePagedQuery } from '../usePagedQuery'; +import { useModified } from '../useModified'; export function useTeamMembers(teamId: string) { const { get } = useApi(); @@ -14,5 +14,3 @@ export function useTeamMembers(teamId: string) { enabled: !!teamId, }); } - -export default useTeamMembers; diff --git a/src/components/hooks/queries/useTeamWebsites.ts b/src/components/hooks/queries/useTeamWebsites.ts index 5606407eb..1f5787095 100644 --- a/src/components/hooks/queries/useTeamWebsites.ts +++ b/src/components/hooks/queries/useTeamWebsites.ts @@ -1,6 +1,6 @@ import { useApi } from '../useApi'; import { usePagedQuery } from '../usePagedQuery'; -import useModified from '../useModified'; +import { useModified } from '../useModified'; export function useTeamWebsites(teamId: string) { const { get } = useApi(); @@ -13,5 +13,3 @@ export function useTeamWebsites(teamId: string) { }, }); } - -export default useTeamWebsites; diff --git a/src/components/hooks/queries/useTeams.ts b/src/components/hooks/queries/useTeams.ts index d09e2f7d2..9e83539a1 100644 --- a/src/components/hooks/queries/useTeams.ts +++ b/src/components/hooks/queries/useTeams.ts @@ -1,6 +1,6 @@ import { useApi } from '../useApi'; import { usePagedQuery } from '../usePagedQuery'; -import useModified from '../useModified'; +import { useModified } from '../useModified'; export function useTeams(userId: string) { const { get } = useApi(); @@ -14,5 +14,3 @@ export function useTeams(userId: string) { enabled: !!userId, }); } - -export default useTeams; diff --git a/src/components/hooks/queries/useUser.ts b/src/components/hooks/queries/useUser.ts index 8541a2207..671b4af1a 100644 --- a/src/components/hooks/queries/useUser.ts +++ b/src/components/hooks/queries/useUser.ts @@ -9,5 +9,3 @@ export function useUser(userId: string, options?: { [key: string]: any }) { ...options, }); } - -export default useUser; diff --git a/src/components/hooks/queries/useUsers.ts b/src/components/hooks/queries/useUsers.ts index 3d70d262d..5952a9818 100644 --- a/src/components/hooks/queries/useUsers.ts +++ b/src/components/hooks/queries/useUsers.ts @@ -1,6 +1,6 @@ import { useApi } from '../useApi'; import { usePagedQuery } from '../usePagedQuery'; -import useModified from '../useModified'; +import { useModified } from '../useModified'; export function useUsers() { const { get } = useApi(); @@ -15,5 +15,3 @@ export function useUsers() { }, }); } - -export default useUsers; diff --git a/src/components/hooks/queries/useWebsite.ts b/src/components/hooks/queries/useWebsite.ts index 9151b55d7..5f98192c0 100644 --- a/src/components/hooks/queries/useWebsite.ts +++ b/src/components/hooks/queries/useWebsite.ts @@ -10,5 +10,3 @@ export function useWebsite(websiteId: string, options?: { [key: string]: any }) ...options, }); } - -export default useWebsite; diff --git a/src/components/hooks/queries/useWebsiteEvents.ts b/src/components/hooks/queries/useWebsiteEvents.ts index 2a47c3eb2..e4204c845 100644 --- a/src/components/hooks/queries/useWebsiteEvents.ts +++ b/src/components/hooks/queries/useWebsiteEvents.ts @@ -18,5 +18,3 @@ export function useWebsiteEvents( ...options, }); } - -export default useWebsiteEvents; diff --git a/src/components/hooks/queries/useWebsiteEventsSeries.ts b/src/components/hooks/queries/useWebsiteEventsSeries.ts index 91c50ffff..7543f3e5d 100644 --- a/src/components/hooks/queries/useWebsiteEventsSeries.ts +++ b/src/components/hooks/queries/useWebsiteEventsSeries.ts @@ -16,5 +16,3 @@ export function useWebsiteEventsSeries( ...options, }); } - -export default useWebsiteEventsSeries; diff --git a/src/components/hooks/queries/useWebsiteMetrics.ts b/src/components/hooks/queries/useWebsiteMetrics.ts index 1a4202e87..4cc377367 100644 --- a/src/components/hooks/queries/useWebsiteMetrics.ts +++ b/src/components/hooks/queries/useWebsiteMetrics.ts @@ -36,5 +36,3 @@ export function useWebsiteMetrics( ...options, }); } - -export default useWebsiteMetrics; diff --git a/src/components/hooks/queries/useWebsitePageviews.ts b/src/components/hooks/queries/useWebsitePageviews.ts index 43c51745e..e14a6e3d5 100644 --- a/src/components/hooks/queries/useWebsitePageviews.ts +++ b/src/components/hooks/queries/useWebsitePageviews.ts @@ -17,5 +17,3 @@ export function useWebsitePageviews( ...options, }); } - -export default useWebsitePageviews; diff --git a/src/components/hooks/queries/useWebsiteSession.ts b/src/components/hooks/queries/useWebsiteSession.ts index 93e9057c6..0f771c4ee 100644 --- a/src/components/hooks/queries/useWebsiteSession.ts +++ b/src/components/hooks/queries/useWebsiteSession.ts @@ -10,5 +10,3 @@ export function useWebsiteSession(websiteId: string, sessionId: string) { }, }); } - -export default useWebsiteSession; diff --git a/src/components/hooks/queries/useWebsiteSessionStats.ts b/src/components/hooks/queries/useWebsiteSessionStats.ts index 5c02cfdce..6860fccc4 100644 --- a/src/components/hooks/queries/useWebsiteSessionStats.ts +++ b/src/components/hooks/queries/useWebsiteSessionStats.ts @@ -12,5 +12,3 @@ export function useWebsiteSessionStats(websiteId: string, options?: { [key: stri ...options, }); } - -export default useWebsiteSessionStats; diff --git a/src/components/hooks/queries/useWebsiteSessions.ts b/src/components/hooks/queries/useWebsiteSessions.ts index 09e34a803..2b943eb9d 100644 --- a/src/components/hooks/queries/useWebsiteSessions.ts +++ b/src/components/hooks/queries/useWebsiteSessions.ts @@ -1,6 +1,6 @@ import { useApi } from '../useApi'; import { usePagedQuery } from '../usePagedQuery'; -import useModified from '../useModified'; +import { useModified } from '../useModified'; import { useFilterParams } from '@/components/hooks/useFilterParams'; export function useWebsiteSessions(websiteId: string, params?: { [key: string]: string | number }) { @@ -20,5 +20,3 @@ export function useWebsiteSessions(websiteId: string, params?: { [key: string]: }, }); } - -export default useWebsiteSessions; diff --git a/src/components/hooks/queries/useWebsiteSessionsWeekly.ts b/src/components/hooks/queries/useWebsiteSessionsWeekly.ts index f3aa3b00b..2e691904b 100644 --- a/src/components/hooks/queries/useWebsiteSessionsWeekly.ts +++ b/src/components/hooks/queries/useWebsiteSessionsWeekly.ts @@ -1,5 +1,5 @@ import { useApi } from '../useApi'; -import useModified from '../useModified'; +import { useModified } from '../useModified'; import { useFilterParams } from '@/components/hooks/useFilterParams'; export function useWebsiteSessionsWeekly( @@ -20,5 +20,3 @@ export function useWebsiteSessionsWeekly( }, }); } - -export default useWebsiteSessionsWeekly; diff --git a/src/components/hooks/queries/useWebsiteStats.ts b/src/components/hooks/queries/useWebsiteStats.ts index 6d42009ee..a553fe099 100644 --- a/src/components/hooks/queries/useWebsiteStats.ts +++ b/src/components/hooks/queries/useWebsiteStats.ts @@ -16,5 +16,3 @@ export function useWebsiteStats( ...options, }); } - -export default useWebsiteStats; diff --git a/src/components/hooks/queries/useWebsiteValues.ts b/src/components/hooks/queries/useWebsiteValues.ts index 77f65fe58..a386faa1c 100644 --- a/src/components/hooks/queries/useWebsiteValues.ts +++ b/src/components/hooks/queries/useWebsiteValues.ts @@ -1,7 +1,7 @@ import { useApi } from '../useApi'; import { useCountryNames } from '@/components/hooks/useCountryNames'; import { useRegionNames } from '@/components/hooks/useRegionNames'; -import useLocale from '../useLocale'; +import { useLocale } from '../useLocale'; export function useWebsiteValues({ websiteId, @@ -60,5 +60,3 @@ export function useWebsiteValues({ enabled: !!(websiteId && type && startDate && endDate), }); } - -export default useWebsiteValues; diff --git a/src/components/hooks/queries/useWebsites.ts b/src/components/hooks/queries/useWebsites.ts index 7a5004d75..f9e1ddc20 100644 --- a/src/components/hooks/queries/useWebsites.ts +++ b/src/components/hooks/queries/useWebsites.ts @@ -1,7 +1,7 @@ import { useApi } from '../useApi'; import { usePagedQuery } from '../usePagedQuery'; import { useLogin } from './useLogin'; -import useModified from '../useModified'; +import { useModified } from '../useModified'; export function useWebsites( { userId, teamId }: { userId?: string; teamId?: string }, @@ -21,5 +21,3 @@ export function useWebsites( }, }); } - -export default useWebsites; diff --git a/src/components/hooks/useApi.ts b/src/components/hooks/useApi.ts index d8a05d92c..203e214c0 100644 --- a/src/components/hooks/useApi.ts +++ b/src/components/hooks/useApi.ts @@ -3,7 +3,7 @@ import * as reactQuery from '@tanstack/react-query'; import { getClientAuthToken } from '@/lib/client'; import { SHARE_TOKEN_HEADER } from '@/lib/constants'; import { httpGet, httpPost, httpPut, httpDelete, FetchResponse } from '@/lib/fetch'; -import useStore from '@/store/app'; +import { useApp } from '@/store/app'; const selector = (state: { shareToken: { token?: string } }) => state.shareToken; @@ -19,7 +19,7 @@ function handleError(err: Error | string) { } export function useApi() { - const shareToken = useStore(selector); + const shareToken = useApp(selector); const defaultHeaders = { authorization: `Bearer ${getClientAuthToken()}`, @@ -74,5 +74,3 @@ export function useApi() { ...reactQuery, }; } - -export default useApi; diff --git a/src/components/hooks/useCountryNames.ts b/src/components/hooks/useCountryNames.ts index 12f2f0dde..45019ebfa 100644 --- a/src/components/hooks/useCountryNames.ts +++ b/src/components/hooks/useCountryNames.ts @@ -30,5 +30,3 @@ export function useCountryNames(locale: string) { return { countryNames: list }; } - -export default useCountryNames; diff --git a/src/components/hooks/useDateRange.ts b/src/components/hooks/useDateRange.ts index 618389805..23ad20afd 100644 --- a/src/components/hooks/useDateRange.ts +++ b/src/components/hooks/useDateRange.ts @@ -1,8 +1,8 @@ import { getMinimumUnit, parseDateRange } from '@/lib/date'; import { setItem } from '@/lib/storage'; import { DATE_RANGE_CONFIG, DEFAULT_DATE_COMPARE, DEFAULT_DATE_RANGE } from '@/lib/constants'; -import websiteStore, { setWebsiteDateRange, setWebsiteDateCompare } from '@/store/websites'; -import appStore, { setDateRange } from '@/store/app'; +import { useWebsites, setWebsiteDateRange, setWebsiteDateCompare } from '@/store/websites'; +import { useApp, setDateRange } from '@/store/app'; import { DateRange } from '@/lib/types'; import { useLocale } from './useLocale'; import { useApi } from './useApi'; @@ -15,11 +15,11 @@ export function useDateRange(websiteId?: string): { } { const { get } = useApi(); const { locale } = useLocale(); - const websiteConfig = websiteStore(state => state[websiteId]?.dateRange); + const websiteConfig = useWebsites(state => state[websiteId]?.dateRange); const defaultConfig = DEFAULT_DATE_RANGE; - const globalConfig = appStore(state => state.dateRange); + const globalConfig = useApp(state => state.dateRange); const dateRange = parseDateRange(websiteConfig || globalConfig || defaultConfig, locale); - const dateCompare = websiteStore(state => state[websiteId]?.dateCompare || DEFAULT_DATE_COMPARE); + const dateCompare = useWebsites(state => state[websiteId]?.dateCompare || DEFAULT_DATE_COMPARE); const saveDateRange = async (value: DateRange | string) => { if (websiteId) { @@ -57,5 +57,3 @@ export function useDateRange(websiteId?: string): { return { dateRange, saveDateRange, dateCompare, saveDateCompare }; } - -export default useDateRange; diff --git a/src/components/hooks/useDocumentClick.ts b/src/components/hooks/useDocumentClick.ts index eefd93669..611f6285b 100644 --- a/src/components/hooks/useDocumentClick.ts +++ b/src/components/hooks/useDocumentClick.ts @@ -11,5 +11,3 @@ export function useDocumentClick(handler: (event: MouseEvent) => any) { return null; } - -export default useDocumentClick; diff --git a/src/components/hooks/useEscapeKey.ts b/src/components/hooks/useEscapeKey.ts index 5c3350e73..f05ad7690 100644 --- a/src/components/hooks/useEscapeKey.ts +++ b/src/components/hooks/useEscapeKey.ts @@ -17,5 +17,3 @@ export function useEscapeKey(handler: (event: KeyboardEvent) => void) { return null; } - -export default useEscapeKey; diff --git a/src/components/hooks/useFields.ts b/src/components/hooks/useFields.ts index 859ca1ce4..9b075bbcb 100644 --- a/src/components/hooks/useFields.ts +++ b/src/components/hooks/useFields.ts @@ -20,5 +20,3 @@ export function useFields() { return { fields }; } - -export default useFields; diff --git a/src/components/hooks/useFilters.ts b/src/components/hooks/useFilters.ts index 2b99785a6..94c458851 100644 --- a/src/components/hooks/useFilters.ts +++ b/src/components/hooks/useFilters.ts @@ -49,5 +49,3 @@ export function useFilters() { return { filters, operatorLabels, typeFilters, getFilters }; } - -export default useFilters; diff --git a/src/components/hooks/useForceUpdate.ts b/src/components/hooks/useForceUpdate.ts index 35f7fe162..550cc5cda 100644 --- a/src/components/hooks/useForceUpdate.ts +++ b/src/components/hooks/useForceUpdate.ts @@ -7,5 +7,3 @@ export function useForceUpdate() { update(Object.create(null)); }, [update]); } - -export default useForceUpdate; diff --git a/src/components/hooks/useFormat.ts b/src/components/hooks/useFormat.ts index 927e21e88..5023d56ec 100644 --- a/src/components/hooks/useFormat.ts +++ b/src/components/hooks/useFormat.ts @@ -1,8 +1,8 @@ -import useMessages from './useMessages'; +import { useMessages } from './useMessages'; import { BROWSERS, OS_NAMES } from '@/lib/constants'; -import useLocale from './useLocale'; -import useCountryNames from './useCountryNames'; -import useLanguageNames from './useLanguageNames'; +import { useLocale } from './useLocale'; +import { useCountryNames } from './useCountryNames'; +import { useLanguageNames } from './useLanguageNames'; import regions from '../../../public/iso-3166-2.json'; export function useFormat() { @@ -72,5 +72,3 @@ export function useFormat() { formatValue, }; } - -export default useFormat; diff --git a/src/components/hooks/useLanguageNames.ts b/src/components/hooks/useLanguageNames.ts index 8c28d5606..6b79ac52a 100644 --- a/src/components/hooks/useLanguageNames.ts +++ b/src/components/hooks/useLanguageNames.ts @@ -30,5 +30,3 @@ export function useLanguageNames(locale) { return { languageNames: list }; } - -export default useLanguageNames; diff --git a/src/components/hooks/useLocale.ts b/src/components/hooks/useLocale.ts index 863b20a54..d270a9445 100644 --- a/src/components/hooks/useLocale.ts +++ b/src/components/hooks/useLocale.ts @@ -3,7 +3,7 @@ import { httpGet } from '@/lib/fetch'; import { setItem } from '@/lib/storage'; import { LOCALE_CONFIG } from '@/lib/constants'; import { getDateLocale, getTextDirection } from '@/lib/lang'; -import useStore, { setLocale } from '@/store/app'; +import { useApp, setLocale } from '@/store/app'; import { useForceUpdate } from './useForceUpdate'; import enUS from '../../../public/intl/country/en-US.json'; @@ -14,7 +14,7 @@ const messages = { const selector = (state: { locale: any }) => state.locale; export function useLocale() { - const locale = useStore(selector); + const locale = useApp(selector); const forceUpdate = useForceUpdate(); const dir = getTextDirection(locale); const dateLocale = getDateLocale(locale); @@ -58,5 +58,3 @@ export function useLocale() { return { locale, saveLocale, messages, dir, dateLocale }; } - -export default useLocale; diff --git a/src/components/hooks/useMessages.ts b/src/components/hooks/useMessages.ts index fc73494f5..2b4752b6b 100644 --- a/src/components/hooks/useMessages.ts +++ b/src/components/hooks/useMessages.ts @@ -23,5 +23,3 @@ export function useMessages(): any { return { formatMessage, messages, labels, getMessage }; } - -export default useMessages; diff --git a/src/components/hooks/useModified.ts b/src/components/hooks/useModified.ts index fd8dc2e67..ea88888a5 100644 --- a/src/components/hooks/useModified.ts +++ b/src/components/hooks/useModified.ts @@ -1,15 +1,13 @@ -import useStore from '@/store/modified'; +import { create } from 'zustand'; + +const store = create(() => ({})); + +export function touch(key: string) { + store.setState({ [key]: Date.now() }); +} export function useModified(key?: string) { - const modified = useStore(state => state?.[key]); - - const touch = (id?: string) => { - if (id || key) { - useStore.setState({ [id || key]: Date.now() }); - } - }; + const modified = store(state => state?.[key]); return { modified, touch }; } - -export default useModified; diff --git a/src/components/hooks/useNavigation.ts b/src/components/hooks/useNavigation.ts index b727ee90a..40dc69e1e 100644 --- a/src/components/hooks/useNavigation.ts +++ b/src/components/hooks/useNavigation.ts @@ -28,5 +28,3 @@ export function useNavigation(): { return { pathname, query, router, renderUrl }; } - -export default useNavigation; diff --git a/src/components/hooks/usePagedQuery.ts b/src/components/hooks/usePagedQuery.ts index b6b06e1c8..f0d76075a 100644 --- a/src/components/hooks/usePagedQuery.ts +++ b/src/components/hooks/usePagedQuery.ts @@ -29,5 +29,3 @@ export function usePagedQuery({ setParams, }; } - -export default usePagedQuery; diff --git a/src/components/hooks/useRegionNames.ts b/src/components/hooks/useRegionNames.ts index 1ba7feaa7..85b2537c1 100644 --- a/src/components/hooks/useRegionNames.ts +++ b/src/components/hooks/useRegionNames.ts @@ -1,4 +1,4 @@ -import useCountryNames from './useCountryNames'; +import { useCountryNames } from './useCountryNames'; import regions from '../../../public/iso-3166-2.json'; export function useRegionNames(locale: string) { @@ -15,5 +15,3 @@ export function useRegionNames(locale: string) { return { regionNames: regions, getRegionName }; } - -export default useRegionNames; diff --git a/src/components/hooks/useSticky.ts b/src/components/hooks/useSticky.ts index 459c489ad..8e6722adf 100644 --- a/src/components/hooks/useSticky.ts +++ b/src/components/hooks/useSticky.ts @@ -6,6 +6,7 @@ export function useSticky({ enabled = true, threshold = 1 }) { useEffect(() => { let observer: IntersectionObserver | undefined; + // eslint-disable-next-line no-undef const handler: IntersectionObserverCallback = ([entry]) => setIsSticky(entry.intersectionRatio < threshold); @@ -22,5 +23,3 @@ export function useSticky({ enabled = true, threshold = 1 }) { return { ref, isSticky }; } - -export default useSticky; diff --git a/src/components/hooks/useTeamUrl.ts b/src/components/hooks/useTeamUrl.ts index b2aa8ea7c..65678d21b 100644 --- a/src/components/hooks/useTeamUrl.ts +++ b/src/components/hooks/useTeamUrl.ts @@ -13,5 +13,3 @@ export function useTeamUrl(): { return { teamId, renderTeamUrl }; } - -export default useTeamUrl; diff --git a/src/components/hooks/useTheme.ts b/src/components/hooks/useTheme.ts index 9bbe063c7..592c833e2 100644 --- a/src/components/hooks/useTheme.ts +++ b/src/components/hooks/useTheme.ts @@ -1,5 +1,5 @@ import { useEffect, useMemo } from 'react'; -import useStore, { setTheme } from '@/store/app'; +import { useApp, setTheme } from '@/store/app'; import { getItem, setItem } from '@/lib/storage'; import { DEFAULT_THEME, THEME_COLORS, THEME_CONFIG } from '@/lib/constants'; import { colord } from 'colord'; @@ -7,7 +7,7 @@ import { colord } from 'colord'; const selector = (state: { theme: string }) => state.theme; export function useTheme() { - const theme = useStore(selector) || getItem(THEME_CONFIG) || DEFAULT_THEME; + const theme = useApp(selector) || getItem(THEME_CONFIG) || DEFAULT_THEME; const primaryColor = colord(THEME_COLORS[theme].primary); const colors = useMemo(() => { @@ -60,5 +60,3 @@ export function useTheme() { return { theme, saveTheme, colors }; } - -export default useTheme; diff --git a/src/components/hooks/useTimezone.ts b/src/components/hooks/useTimezone.ts index 5f01c2abd..4a949b67b 100644 --- a/src/components/hooks/useTimezone.ts +++ b/src/components/hooks/useTimezone.ts @@ -1,12 +1,12 @@ import { setItem } from '@/lib/storage'; import { TIMEZONE_CONFIG } from '@/lib/constants'; import { formatInTimeZone, zonedTimeToUtc, utcToZonedTime } from 'date-fns-tz'; -import useStore, { setTimezone } from '@/store/app'; +import { useApp, setTimezone } from '@/store/app'; const selector = (state: { timezone: string }) => state.timezone; export function useTimezone() { - const timezone = useStore(selector); + const timezone = useApp(selector); const saveTimezone = (value: string) => { setItem(TIMEZONE_CONFIG, value); @@ -33,5 +33,3 @@ export function useTimezone() { return { timezone, saveTimezone, formatTimezoneDate, toUtc, fromUtc }; } - -export default useTimezone; diff --git a/src/components/icons.ts b/src/components/icons.ts index e952e500e..6735d23a5 100644 --- a/src/components/icons.ts +++ b/src/components/icons.ts @@ -1,4 +1,4 @@ -import { Icons } from 'react-basics'; +import { Icons as ReactBasicsIcons } from 'react-basics'; import AddUser from '@/assets/add-user.svg'; import Bars from '@/assets/bars.svg'; import BarChart from '@/assets/bar-chart.svg'; @@ -27,7 +27,7 @@ import Users from '@/assets/users.svg'; import Visitor from '@/assets/visitor.svg'; const icons = { - ...Icons, + ...ReactBasicsIcons, AddUser, Bars, BarChart, @@ -56,4 +56,4 @@ const icons = { Visitor, }; -export default icons; +export const Icons = icons; diff --git a/src/components/input/DateFilter.tsx b/src/components/input/DateFilter.tsx index 443827a0b..cd6a0747f 100644 --- a/src/components/input/DateFilter.tsx +++ b/src/components/input/DateFilter.tsx @@ -1,9 +1,9 @@ import { useState } from 'react'; import { Icon, Modal, Dropdown, Item, Text, Flexbox } from 'react-basics'; import { endOfYear, isSameDay } from 'date-fns'; -import DatePickerForm from '@/components/metrics/DatePickerForm'; +import { DatePickerForm } from '@/components/metrics/DatePickerForm'; import { useLocale, useMessages } from '@/components/hooks'; -import Icons from '@/components/icons'; +import { Icons } from '@/components/icons'; import { formatDate, parseDateValue } from '@/lib/date'; import styles from './DateFilter.module.css'; import classNames from 'classnames'; @@ -184,5 +184,3 @@ const CustomRange = ({ startDate, endDate, unit, onClick }) => { ); }; - -export default DateFilter; diff --git a/src/components/input/LanguageButton.tsx b/src/components/input/LanguageButton.tsx index cfe7187eb..c4e8a3717 100644 --- a/src/components/input/LanguageButton.tsx +++ b/src/components/input/LanguageButton.tsx @@ -1,7 +1,7 @@ import { Icon, Button, MenuTrigger, Popover, Grid, Text, Dialog } from '@umami/react-zen'; import { languages } from '@/lib/lang'; import { useLocale } from '@/components/hooks'; -import Icons from '@/components/icons'; +import { Icons } from '@/components/icons'; export function LanguageButton() { const { locale, saveLocale } = useLocale(); @@ -39,5 +39,3 @@ export function LanguageButton() { ); } - -export default LanguageButton; diff --git a/src/components/input/LogoutButton.tsx b/src/components/input/LogoutButton.tsx index a1a34a003..38d3e778d 100644 --- a/src/components/input/LogoutButton.tsx +++ b/src/components/input/LogoutButton.tsx @@ -20,5 +20,3 @@ export function LogoutButton({ ); } - -export default LogoutButton; diff --git a/src/components/input/MonthSelect.tsx b/src/components/input/MonthSelect.tsx index 144f5bd80..8fd6a524e 100644 --- a/src/components/input/MonthSelect.tsx +++ b/src/components/input/MonthSelect.tsx @@ -9,7 +9,7 @@ import { Popup, } from 'react-basics'; import { startOfMonth, endOfMonth } from 'date-fns'; -import Icons from '@/components/icons'; +import { Icons } from '@/components/icons'; import { useLocale } from '@/components/hooks'; import { formatDate } from '@/lib/date'; import styles from './MonthSelect.module.css'; @@ -62,5 +62,3 @@ export function MonthSelect({ date = new Date(), onChange }) { ); } - -export default MonthSelect; diff --git a/src/components/input/ProfileButton.tsx b/src/components/input/ProfileButton.tsx index 94b8ec2ac..d14ee9a42 100644 --- a/src/components/input/ProfileButton.tsx +++ b/src/components/input/ProfileButton.tsx @@ -11,7 +11,7 @@ import { Text, } from '@umami/react-zen'; import { useRouter } from 'next/navigation'; -import Icons from '@/components/icons'; +import { Icons } from '@/components/icons'; import { useMessages, useLogin } from '@/components/hooks'; export function ProfileButton() { @@ -60,5 +60,3 @@ export function ProfileButton() { ); } - -export default ProfileButton; diff --git a/src/components/input/RefreshButton.tsx b/src/components/input/RefreshButton.tsx index 35bfbf3c5..c4c94560b 100644 --- a/src/components/input/RefreshButton.tsx +++ b/src/components/input/RefreshButton.tsx @@ -1,7 +1,7 @@ import { LoadingButton, Icon, TooltipPopup } from 'react-basics'; import { setWebsiteDateRange } from '@/store/websites'; import { useDateRange } from '@/components/hooks'; -import Icons from '@/components/icons'; +import { Icons } from '@/components/icons'; import { useMessages } from '@/components/hooks'; export function RefreshButton({ @@ -30,5 +30,3 @@ export function RefreshButton({ ); } - -export default RefreshButton; diff --git a/src/components/input/SettingsButton.tsx b/src/components/input/SettingsButton.tsx index d3dc471fa..4778542c2 100644 --- a/src/components/input/SettingsButton.tsx +++ b/src/components/input/SettingsButton.tsx @@ -1,7 +1,7 @@ import { Button, Icon, PopupTrigger, Popup, Form, FormRow } from 'react-basics'; -import TimezoneSetting from '@/app/(main)/profile/TimezoneSetting'; -import DateRangeSetting from '@/app/(main)/profile/DateRangeSetting'; -import Icons from '@/components/icons'; +import { TimezoneSetting } from '@/app/(main)/profile/TimezoneSetting'; +import { DateRangeSetting } from '@/app/(main)/profile/DateRangeSetting'; +import { Icons } from '@/components/icons'; import { useMessages } from '@/components/hooks'; import styles from './SettingsButton.module.css'; @@ -28,5 +28,3 @@ export function SettingsButton() { ); } - -export default SettingsButton; diff --git a/src/components/input/TeamsButton.tsx b/src/components/input/TeamsButton.tsx index 01a1814d6..f42420ccb 100644 --- a/src/components/input/TeamsButton.tsx +++ b/src/components/input/TeamsButton.tsx @@ -14,7 +14,7 @@ import { Row, Box, } from '@umami/react-zen'; -import Icons from '@/components/icons'; +import { Icons } from '@/components/icons'; import { useLogin, useMessages, useTeams, useTeamUrl } from '@/components/hooks'; export function TeamsButton({ @@ -90,5 +90,3 @@ export function TeamsButton({ ); } - -export default TeamsButton; diff --git a/src/components/input/WebsiteDateFilter.tsx b/src/components/input/WebsiteDateFilter.tsx index 97beaf129..e1d1506c0 100644 --- a/src/components/input/WebsiteDateFilter.tsx +++ b/src/components/input/WebsiteDateFilter.tsx @@ -2,7 +2,7 @@ import { useDateRange, useLocale } from '@/components/hooks'; import { isAfter } from 'date-fns'; import { getOffsetDateRange } from '@/lib/date'; import { Button, Icon, Icons } from 'react-basics'; -import DateFilter from './DateFilter'; +import { DateFilter } from './DateFilter'; import styles from './WebsiteDateFilter.module.css'; import { DateRange } from '@/lib/types'; @@ -55,5 +55,3 @@ export function WebsiteDateFilter({ ); } - -export default WebsiteDateFilter; diff --git a/src/components/input/WebsiteSelect.tsx b/src/components/input/WebsiteSelect.tsx index 8a7e4ac08..df5289a17 100644 --- a/src/components/input/WebsiteSelect.tsx +++ b/src/components/input/WebsiteSelect.tsx @@ -1,7 +1,7 @@ import { useState, Key } from 'react'; import { Dropdown, Item } from 'react-basics'; import { useWebsite, useWebsites, useMessages } from '@/components/hooks'; -import Empty from '@/components/common/Empty'; +import { Empty } from '@/components/common/Empty'; import styles from './WebsiteSelect.module.css'; export function WebsiteSelect({ @@ -56,5 +56,3 @@ export function WebsiteSelect({ ); } - -export default WebsiteSelect; diff --git a/src/components/layout/MenuLayout.tsx b/src/components/layout/MenuLayout.tsx index 1465c0625..d88401228 100644 --- a/src/components/layout/MenuLayout.tsx +++ b/src/components/layout/MenuLayout.tsx @@ -1,6 +1,6 @@ import { ReactNode } from 'react'; import { usePathname } from 'next/navigation'; -import SideNav from '@/components/layout/SideNav'; +import { SideNav } from '@/components/layout/SideNav'; import styles from './MenuLayout.module.css'; export function MenuLayout({ items = [], children }: { items: any[]; children: ReactNode }) { @@ -20,5 +20,3 @@ export function MenuLayout({ items = [], children }: { items: any[]; children: R ); } - -export default MenuLayout; diff --git a/src/components/layout/NavGroup.tsx b/src/components/layout/NavGroup.tsx index 723f9a7ea..c5a25893c 100644 --- a/src/components/layout/NavGroup.tsx +++ b/src/components/layout/NavGroup.tsx @@ -3,7 +3,7 @@ import { Icon, Text, TooltipPopup } from 'react-basics'; import classNames from 'classnames'; import { usePathname } from 'next/navigation'; import Link from 'next/link'; -import Icons from '@/components/icons'; +import { Icons } from '@/components/icons'; import styles from './NavGroup.module.css'; export interface NavGroupProps { @@ -62,5 +62,3 @@ export function NavGroup({ ); } - -export default NavGroup; diff --git a/src/components/layout/Page.tsx b/src/components/layout/Page.tsx index 43df85a56..ae590c149 100644 --- a/src/components/layout/Page.tsx +++ b/src/components/layout/Page.tsx @@ -28,5 +28,3 @@ export function Page({ return
{children}
; } - -export default Page; diff --git a/src/components/layout/PageHeader.tsx b/src/components/layout/PageHeader.tsx index 53f1db9f2..7a1f842e3 100644 --- a/src/components/layout/PageHeader.tsx +++ b/src/components/layout/PageHeader.tsx @@ -32,5 +32,3 @@ export function PageHeader({ ); } - -export default PageHeader; diff --git a/src/components/layout/SideNav.tsx b/src/components/layout/SideNav.tsx index 0b5c98562..4be70c2fb 100644 --- a/src/components/layout/SideNav.tsx +++ b/src/components/layout/SideNav.tsx @@ -42,5 +42,3 @@ export function SideNav({ ); } - -export default SideNav; diff --git a/src/components/metrics/ActiveUsers.tsx b/src/components/metrics/ActiveUsers.tsx index 50c676ab8..2b965363e 100644 --- a/src/components/metrics/ActiveUsers.tsx +++ b/src/components/metrics/ActiveUsers.tsx @@ -40,5 +40,3 @@ export function ActiveUsers({ ); } - -export default ActiveUsers; diff --git a/src/components/metrics/BrowsersTable.tsx b/src/components/metrics/BrowsersTable.tsx index 500686b14..f280afa62 100644 --- a/src/components/metrics/BrowsersTable.tsx +++ b/src/components/metrics/BrowsersTable.tsx @@ -1,8 +1,8 @@ -import FilterLink from '@/components/common/FilterLink'; -import MetricsTable, { MetricsTableProps } from '@/components/metrics/MetricsTable'; +import { FilterLink } from '@/components/common/FilterLink'; +import { MetricsTable, MetricsTableProps } from '@/components/metrics/MetricsTable'; import { useMessages } from '@/components/hooks'; import { useFormat } from '@/components/hooks'; -import TypeIcon from '@/components/common/TypeIcon'; +import { TypeIcon } from '@/components/common/TypeIcon'; export function BrowsersTable(props: MetricsTableProps) { const { formatMessage, labels } = useMessages(); @@ -26,5 +26,3 @@ export function BrowsersTable(props: MetricsTableProps) { /> ); } - -export default BrowsersTable; diff --git a/src/components/metrics/ChangeLabel.tsx b/src/components/metrics/ChangeLabel.tsx index 7e7cb77b5..f19e6b6ef 100644 --- a/src/components/metrics/ChangeLabel.tsx +++ b/src/components/metrics/ChangeLabel.tsx @@ -42,5 +42,3 @@ export function ChangeLabel({ ); } - -export default ChangeLabel; diff --git a/src/components/metrics/ChannelsTable.tsx b/src/components/metrics/ChannelsTable.tsx index d2dc207f8..faff9ec70 100644 --- a/src/components/metrics/ChannelsTable.tsx +++ b/src/components/metrics/ChannelsTable.tsx @@ -1,4 +1,4 @@ -import MetricsTable, { MetricsTableProps } from '@/components/metrics/MetricsTable'; +import { MetricsTable, MetricsTableProps } from '@/components/metrics/MetricsTable'; import { useMessages } from '@/components/hooks'; export function ChannelsTable(props: MetricsTableProps) { @@ -18,5 +18,3 @@ export function ChannelsTable(props: MetricsTableProps) { /> ); } - -export default ChannelsTable; diff --git a/src/components/metrics/CitiesTable.tsx b/src/components/metrics/CitiesTable.tsx index 1e5fc7351..fc08d3a27 100644 --- a/src/components/metrics/CitiesTable.tsx +++ b/src/components/metrics/CitiesTable.tsx @@ -1,6 +1,6 @@ -import MetricsTable, { MetricsTableProps } from './MetricsTable'; +import { MetricsTable, MetricsTableProps } from './MetricsTable'; import { emptyFilter } from '@/lib/filters'; -import FilterLink from '@/components/common/FilterLink'; +import { FilterLink } from '@/components/common/FilterLink'; import { useMessages } from '@/components/hooks'; import { useFormat } from '@/components/hooks'; @@ -35,5 +35,3 @@ export function CitiesTable(props: MetricsTableProps) { /> ); } - -export default CitiesTable; diff --git a/src/components/metrics/CountriesTable.tsx b/src/components/metrics/CountriesTable.tsx index cdd051151..4ee17a2c0 100644 --- a/src/components/metrics/CountriesTable.tsx +++ b/src/components/metrics/CountriesTable.tsx @@ -1,8 +1,8 @@ -import FilterLink from '@/components/common/FilterLink'; +import { FilterLink } from '@/components/common/FilterLink'; import { useCountryNames } from '@/components/hooks'; import { useLocale, useMessages, useFormat } from '@/components/hooks'; -import MetricsTable, { MetricsTableProps } from './MetricsTable'; -import TypeIcon from '@/components/common/TypeIcon'; +import { MetricsTable, MetricsTableProps } from './MetricsTable'; +import { TypeIcon } from '@/components/common/TypeIcon'; export function CountriesTable({ ...props }: MetricsTableProps) { const { locale } = useLocale(); @@ -33,5 +33,3 @@ export function CountriesTable({ ...props }: MetricsTableProps) { /> ); } - -export default CountriesTable; diff --git a/src/components/metrics/DatePickerForm.tsx b/src/components/metrics/DatePickerForm.tsx index d1a5c7db0..345b2de07 100644 --- a/src/components/metrics/DatePickerForm.tsx +++ b/src/components/metrics/DatePickerForm.tsx @@ -82,5 +82,3 @@ export function DatePickerForm({ ); } - -export default DatePickerForm; diff --git a/src/components/metrics/DevicesTable.tsx b/src/components/metrics/DevicesTable.tsx index ed327c33a..ee66bb4de 100644 --- a/src/components/metrics/DevicesTable.tsx +++ b/src/components/metrics/DevicesTable.tsx @@ -1,8 +1,8 @@ -import MetricsTable, { MetricsTableProps } from './MetricsTable'; -import FilterLink from '@/components/common/FilterLink'; +import { MetricsTable, MetricsTableProps } from './MetricsTable'; +import { FilterLink } from '@/components/common/FilterLink'; import { useMessages } from '@/components/hooks'; import { useFormat } from '@/components/hooks'; -import TypeIcon from '@/components/common/TypeIcon'; +import { TypeIcon } from '@/components/common/TypeIcon'; export function DevicesTable(props: MetricsTableProps) { const { formatMessage, labels } = useMessages(); @@ -27,5 +27,3 @@ export function DevicesTable(props: MetricsTableProps) { /> ); } - -export default DevicesTable; diff --git a/src/components/metrics/EventsChart.tsx b/src/components/metrics/EventsChart.tsx index 9655c4a47..e82f2e092 100644 --- a/src/components/metrics/EventsChart.tsx +++ b/src/components/metrics/EventsChart.tsx @@ -1,5 +1,5 @@ import { colord } from 'colord'; -import BarChart from '@/components/charts/BarChart'; +import { BarChart } from '@/components/charts/BarChart'; import { useDateRange, useLocale, useWebsiteEventsSeries } from '@/components/hooks'; import { renderDateLabels } from '@/lib/charts'; import { CHART_COLORS } from '@/lib/constants'; @@ -59,5 +59,3 @@ export function EventsChart({ websiteId, className }: EventsChartProps) { /> ); } - -export default EventsChart; diff --git a/src/components/metrics/EventsTable.tsx b/src/components/metrics/EventsTable.tsx index bc753b3b2..9b6fa4860 100644 --- a/src/components/metrics/EventsTable.tsx +++ b/src/components/metrics/EventsTable.tsx @@ -1,4 +1,4 @@ -import MetricsTable, { MetricsTableProps } from './MetricsTable'; +import { MetricsTable, MetricsTableProps } from './MetricsTable'; import { useMessages } from '@/components/hooks'; export function EventsTable(props: MetricsTableProps) { @@ -18,5 +18,3 @@ export function EventsTable(props: MetricsTableProps) { /> ); } - -export default EventsTable; diff --git a/src/components/metrics/FilterTags.tsx b/src/components/metrics/FilterTags.tsx index fcba3c9e0..91e740a2d 100644 --- a/src/components/metrics/FilterTags.tsx +++ b/src/components/metrics/FilterTags.tsx @@ -8,12 +8,12 @@ import { useFormat, useFilters, } from '@/components/hooks'; -import PopupForm from '@/app/(main)/reports/[reportId]/PopupForm'; -import FieldFilterEditForm from '@/app/(main)/reports/[reportId]/FieldFilterEditForm'; +import { PopupForm } from '@/app/(main)/reports/[reportId]/PopupForm'; +import { FieldFilterEditForm } from '@/app/(main)/reports/[reportId]/FieldFilterEditForm'; import { OPERATOR_PREFIXES } from '@/lib/constants'; import { isSearchOperator, parseParameterValue } from '@/lib/params'; import styles from './FilterTags.module.css'; -import WebsiteFilterButton from '@/app/(main)/websites/[websiteId]/WebsiteFilterButton'; +import { WebsiteFilterButton } from '@/app/(main)/websites/[websiteId]/WebsiteFilterButton'; export function FilterTags({ websiteId, @@ -111,5 +111,3 @@ export function FilterTags({ ); } - -export default FilterTags; diff --git a/src/components/metrics/HostsTable.tsx b/src/components/metrics/HostsTable.tsx index e034b9702..f9efcf507 100644 --- a/src/components/metrics/HostsTable.tsx +++ b/src/components/metrics/HostsTable.tsx @@ -1,5 +1,5 @@ -import MetricsTable, { MetricsTableProps } from './MetricsTable'; -import FilterLink from '@/components/common/FilterLink'; +import { MetricsTable, MetricsTableProps } from './MetricsTable'; +import { FilterLink } from '@/components/common/FilterLink'; import { useMessages } from '@/components/hooks'; import { Flexbox } from 'react-basics'; @@ -31,5 +31,3 @@ export function HostsTable(props: MetricsTableProps) { ); } - -export default HostsTable; diff --git a/src/components/metrics/LanguagesTable.tsx b/src/components/metrics/LanguagesTable.tsx index 3ced249ed..27e142578 100644 --- a/src/components/metrics/LanguagesTable.tsx +++ b/src/components/metrics/LanguagesTable.tsx @@ -1,4 +1,4 @@ -import MetricsTable, { MetricsTableProps } from './MetricsTable'; +import { MetricsTable, MetricsTableProps } from './MetricsTable'; import { percentFilter } from '@/lib/filters'; import { useLocale } from '@/components/hooks'; import { useMessages } from '@/components/hooks'; @@ -28,5 +28,3 @@ export function LanguagesTable({ /> ); } - -export default LanguagesTable; diff --git a/src/components/metrics/Legend.tsx b/src/components/metrics/Legend.tsx index 774429573..538eb2bea 100644 --- a/src/components/metrics/Legend.tsx +++ b/src/components/metrics/Legend.tsx @@ -34,5 +34,3 @@ export function Legend({ ); } - -export default Legend; diff --git a/src/components/metrics/ListTable.tsx b/src/components/metrics/ListTable.tsx index 6fbf390af..64bd49151 100644 --- a/src/components/metrics/ListTable.tsx +++ b/src/components/metrics/ListTable.tsx @@ -1,7 +1,7 @@ import { FixedSizeList } from 'react-window'; import { useSpring, animated, config } from '@react-spring/web'; import classNames from 'classnames'; -import Empty from '@/components/common/Empty'; +import { Empty } from '@/components/common/Empty'; import { formatLongNumber } from '@/lib/format'; import { useMessages } from '@/components/hooks'; import styles from './ListTable.module.css'; @@ -107,5 +107,3 @@ const AnimatedRow = ({ label, value = 0, percent, change, animate, showPercentag ); }; - -export default ListTable; diff --git a/src/components/metrics/MetricCard.tsx b/src/components/metrics/MetricCard.tsx index 41766167e..2e322db42 100644 --- a/src/components/metrics/MetricCard.tsx +++ b/src/components/metrics/MetricCard.tsx @@ -1,7 +1,7 @@ import classNames from 'classnames'; import { useSpring, animated } from '@react-spring/web'; import { formatNumber } from '@/lib/format'; -import ChangeLabel from '@/components/metrics/ChangeLabel'; +import { ChangeLabel } from '@/components/metrics/ChangeLabel'; import styles from './MetricCard.module.css'; export interface MetricCardProps { @@ -58,5 +58,3 @@ export const MetricCard = ({ ); }; - -export default MetricCard; diff --git a/src/components/metrics/MetricsBar.tsx b/src/components/metrics/MetricsBar.tsx index 6e9f22de9..cb74fdc50 100644 --- a/src/components/metrics/MetricsBar.tsx +++ b/src/components/metrics/MetricsBar.tsx @@ -1,6 +1,6 @@ import { ReactNode } from 'react'; import { Loading, cloneChildren } from 'react-basics'; -import ErrorMessage from '@/components/common/ErrorMessage'; +import { ErrorMessage } from '@/components/common/ErrorMessage'; import { formatLongNumber } from '@/lib/format'; import styles from './MetricsBar.module.css'; @@ -27,5 +27,3 @@ export function MetricsBar({ children, isLoading, isFetched, error }: MetricsBar ); } - -export default MetricsBar; diff --git a/src/components/metrics/MetricsTable.tsx b/src/components/metrics/MetricsTable.tsx index 616262cb0..5a1f56de8 100644 --- a/src/components/metrics/MetricsTable.tsx +++ b/src/components/metrics/MetricsTable.tsx @@ -1,8 +1,8 @@ import { ReactNode, useMemo, useState } from 'react'; import { Loading, Icon, Text, SearchField } from 'react-basics'; import classNames from 'classnames'; -import ErrorMessage from '@/components/common/ErrorMessage'; -import LinkButton from '@/components/common/LinkButton'; +import { ErrorMessage } from '@/components/common/ErrorMessage'; +import { LinkButton } from '@/components/common/LinkButton'; import { DEFAULT_ANIMATION_DURATION } from '@/lib/constants'; import { percentFilter } from '@/lib/filters'; import { @@ -12,8 +12,8 @@ import { useLocale, useFormat, } from '@/components/hooks'; -import Icons from '@/components/icons'; -import ListTable, { ListTableProps } from './ListTable'; +import { Icons } from '@/components/icons'; +import { ListTable, ListTableProps } from './ListTable'; import styles from './MetricsTable.module.css'; export interface MetricsTableProps extends ListTableProps { @@ -123,5 +123,3 @@ export function MetricsTable({ ); } - -export default MetricsTable; diff --git a/src/components/metrics/OSTable.tsx b/src/components/metrics/OSTable.tsx index 37b79549a..da2821f5c 100644 --- a/src/components/metrics/OSTable.tsx +++ b/src/components/metrics/OSTable.tsx @@ -1,7 +1,7 @@ -import MetricsTable, { MetricsTableProps } from './MetricsTable'; -import FilterLink from '@/components/common/FilterLink'; +import { MetricsTable, MetricsTableProps } from './MetricsTable'; +import { FilterLink } from '@/components/common/FilterLink'; import { useMessages, useFormat } from '@/components/hooks'; -import TypeIcon from '@/components/common/TypeIcon'; +import { TypeIcon } from '@/components/common/TypeIcon'; export function OSTable(props: MetricsTableProps) { const { formatMessage, labels } = useMessages(); @@ -25,5 +25,3 @@ export function OSTable(props: MetricsTableProps) { /> ); } - -export default OSTable; diff --git a/src/components/metrics/PagesTable.tsx b/src/components/metrics/PagesTable.tsx index 8163b3d9c..ee522e0b0 100644 --- a/src/components/metrics/PagesTable.tsx +++ b/src/components/metrics/PagesTable.tsx @@ -1,10 +1,10 @@ import { WebsiteContext } from '@/app/(main)/websites/[websiteId]/WebsiteProvider'; -import FilterButtons from '@/components/common/FilterButtons'; -import FilterLink from '@/components/common/FilterLink'; +import { FilterButtons } from '@/components/common/FilterButtons'; +import { FilterLink } from '@/components/common/FilterLink'; import { useMessages, useNavigation } from '@/components/hooks'; import { emptyFilter } from '@/lib/filters'; import { useContext } from 'react'; -import MetricsTable, { MetricsTableProps } from './MetricsTable'; +import { MetricsTable, MetricsTableProps } from './MetricsTable'; export interface PagesTableProps extends MetricsTableProps { allowFilter?: boolean; @@ -70,5 +70,3 @@ export function PagesTable({ allowFilter, ...props }: PagesTableProps) { ); } - -export default PagesTable; diff --git a/src/components/metrics/PageviewsChart.tsx b/src/components/metrics/PageviewsChart.tsx index 6fa3285f4..c25b7dd2d 100644 --- a/src/components/metrics/PageviewsChart.tsx +++ b/src/components/metrics/PageviewsChart.tsx @@ -1,9 +1,9 @@ import { useMemo } from 'react'; -import BarChart, { BarChartProps } from '@/components/charts/BarChart'; +import { BarChart, BarChartProps } from '@/components/charts/BarChart'; import { useLocale, useTheme, useMessages } from '@/components/hooks'; import { renderDateLabels } from '@/lib/charts'; -export interface PagepageviewsChartProps extends BarChartProps { +export interface PageviewsChartProps extends BarChartProps { data: { pageviews: any[]; sessions: any[]; @@ -17,13 +17,13 @@ export interface PagepageviewsChartProps extends BarChartProps { isAllTime?: boolean; } -export function PagepageviewsChart({ +export function PageviewsChart({ data, unit, isLoading, isAllTime, ...props -}: PagepageviewsChartProps) { +}: PageviewsChartProps) { const { formatMessage, labels } = useMessages(); const { colors } = useTheme(); const { locale } = useLocale(); @@ -86,5 +86,3 @@ export function PagepageviewsChart({ /> ); } - -export default PagepageviewsChart; diff --git a/src/components/metrics/QueryParametersTable.tsx b/src/components/metrics/QueryParametersTable.tsx index 26f01faf4..47f5aea58 100644 --- a/src/components/metrics/QueryParametersTable.tsx +++ b/src/components/metrics/QueryParametersTable.tsx @@ -1,8 +1,8 @@ import { useState } from 'react'; -import FilterButtons from '@/components/common/FilterButtons'; +import { FilterButtons } from '@/components/common/FilterButtons'; import { emptyFilter, paramFilter } from '@/lib/filters'; import { FILTER_RAW, FILTER_COMBINED } from '@/lib/constants'; -import MetricsTable, { MetricsTableProps } from './MetricsTable'; +import { MetricsTable, MetricsTableProps } from './MetricsTable'; import { useMessages } from '@/components/hooks'; import styles from './QueryParametersTable.module.css'; @@ -49,5 +49,3 @@ export function QueryParametersTable({ ); } - -export default QueryParametersTable; diff --git a/src/components/metrics/RealtimeChart.tsx b/src/components/metrics/RealtimeChart.tsx index f5697caa1..bb886c73e 100644 --- a/src/components/metrics/RealtimeChart.tsx +++ b/src/components/metrics/RealtimeChart.tsx @@ -1,6 +1,6 @@ import { useMemo, useRef } from 'react'; import { startOfMinute, subMinutes, isBefore } from 'date-fns'; -import PageviewsChart from './PageviewsChart'; +import { PageviewsChart } from './PageviewsChart'; import { DEFAULT_ANIMATION_DURATION, REALTIME_RANGE } from '@/lib/constants'; import { RealtimeData } from '@/lib/types'; @@ -46,5 +46,3 @@ export function RealtimeChart({ data, unit, ...props }: RealtimeChartProps) { /> ); } - -export default RealtimeChart; diff --git a/src/components/metrics/ReferrersTable.tsx b/src/components/metrics/ReferrersTable.tsx index db40a6177..1a7d9e25f 100644 --- a/src/components/metrics/ReferrersTable.tsx +++ b/src/components/metrics/ReferrersTable.tsx @@ -1,8 +1,8 @@ -import FilterLink from '@/components/common/FilterLink'; -import Favicon from '@/components/common/Favicon'; +import { FilterLink } from '@/components/common/FilterLink'; +import { Favicon } from '@/components/common/Favicon'; import { useMessages, useNavigation } from '@/components/hooks'; -import MetricsTable, { MetricsTableProps } from './MetricsTable'; -import FilterButtons from '@/components/common/FilterButtons'; +import { MetricsTable, MetricsTableProps } from './MetricsTable'; +import { FilterButtons } from '@/components/common/FilterButtons'; import thenby from 'thenby'; import { GROUPED_DOMAINS } from '@/lib/constants'; import { Flexbox } from 'react-basics'; @@ -98,5 +98,3 @@ export function ReferrersTable({ allowFilter, ...props }: ReferrersTableProps) { ); } - -export default ReferrersTable; diff --git a/src/components/metrics/RegionsTable.tsx b/src/components/metrics/RegionsTable.tsx index 0b7e3bdfa..2a510a327 100644 --- a/src/components/metrics/RegionsTable.tsx +++ b/src/components/metrics/RegionsTable.tsx @@ -1,8 +1,8 @@ -import FilterLink from '@/components/common/FilterLink'; +import { FilterLink } from '@/components/common/FilterLink'; import { emptyFilter } from '@/lib/filters'; import { useMessages, useLocale, useRegionNames } from '@/components/hooks'; -import MetricsTable, { MetricsTableProps } from './MetricsTable'; -import TypeIcon from '@/components/common/TypeIcon'; +import { MetricsTable, MetricsTableProps } from './MetricsTable'; +import { TypeIcon } from '@/components/common/TypeIcon'; export function RegionsTable(props: MetricsTableProps) { const { locale } = useLocale(); @@ -29,5 +29,3 @@ export function RegionsTable(props: MetricsTableProps) { /> ); } - -export default RegionsTable; diff --git a/src/components/metrics/ScreenTable.tsx b/src/components/metrics/ScreenTable.tsx index c2a19caae..2e8c3fd3b 100644 --- a/src/components/metrics/ScreenTable.tsx +++ b/src/components/metrics/ScreenTable.tsx @@ -1,4 +1,4 @@ -import MetricsTable, { MetricsTableProps } from './MetricsTable'; +import { MetricsTable, MetricsTableProps } from './MetricsTable'; import { useMessages } from '@/components/hooks'; export function ScreenTable(props: MetricsTableProps) { @@ -13,5 +13,3 @@ export function ScreenTable(props: MetricsTableProps) { /> ); } - -export default ScreenTable; diff --git a/src/components/metrics/TagsTable.tsx b/src/components/metrics/TagsTable.tsx index e915f8735..7a39189bd 100644 --- a/src/components/metrics/TagsTable.tsx +++ b/src/components/metrics/TagsTable.tsx @@ -1,5 +1,5 @@ -import MetricsTable, { MetricsTableProps } from './MetricsTable'; -import FilterLink from '@/components/common/FilterLink'; +import { MetricsTable, MetricsTableProps } from './MetricsTable'; +import { FilterLink } from '@/components/common/FilterLink'; import { useMessages } from '@/components/hooks'; import { Flexbox } from 'react-basics'; @@ -26,5 +26,3 @@ export function TagsTable(props: MetricsTableProps) { ); } - -export default TagsTable; diff --git a/src/components/metrics/WorldMap.tsx b/src/components/metrics/WorldMap.tsx index a377bfc9a..2ea028e03 100644 --- a/src/components/metrics/WorldMap.tsx +++ b/src/components/metrics/WorldMap.tsx @@ -2,7 +2,7 @@ import { useState, useMemo, HTMLAttributes } from 'react'; import { ComposableMap, Geographies, Geography, ZoomableGroup } from 'react-simple-maps'; import classNames from 'classnames'; import { colord } from 'colord'; -import HoverTooltip from '@/components/common/HoverTooltip'; +import { HoverTooltip } from '@/components/common/HoverTooltip'; import { ISO_COUNTRIES, MAP_FILE } from '@/lib/constants'; import { useDateRange, useTheme, useWebsiteMetrics } from '@/components/hooks'; import { useCountryNames } from '@/components/hooks'; @@ -108,5 +108,3 @@ export function WorldMap({ ); } - -export default WorldMap; diff --git a/src/store/app.ts b/src/store/app.ts index 0890b7e9c..65617a20e 100644 --- a/src/store/app.ts +++ b/src/store/app.ts @@ -59,4 +59,4 @@ export function setDateRange(dateRange: string | object) { store.setState({ dateRange }); } -export default store; +export const useApp = store; diff --git a/src/store/cache.ts b/src/store/cache.ts index bb587319e..8ac938453 100644 --- a/src/store/cache.ts +++ b/src/store/cache.ts @@ -6,4 +6,4 @@ export function setValue(key: string, value: any) { store.setState({ [key]: value }); } -export default store; +export const useCache = store; diff --git a/src/store/dashboard.ts b/src/store/dashboard.ts index a34ec384c..93f59ed4e 100644 --- a/src/store/dashboard.ts +++ b/src/store/dashboard.ts @@ -19,4 +19,4 @@ export function saveDashboard(settings) { setItem(DASHBOARD_CONFIG, store.getState()); } -export default store; +export const useDashboard = store; diff --git a/src/store/modified.ts b/src/store/modified.ts deleted file mode 100644 index 272412eb8..000000000 --- a/src/store/modified.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { create } from 'zustand'; - -const store = create(() => ({})); - -export function touch(key: string) { - store.setState({ [key]: Date.now() }); -} - -export default store; diff --git a/src/store/version.ts b/src/store/version.ts index 9a889636f..c62924194 100644 --- a/src/store/version.ts +++ b/src/store/version.ts @@ -52,4 +52,4 @@ export async function checkVersion() { ); } -export default store; +export const useVersion = store; diff --git a/src/store/websites.ts b/src/store/websites.ts index e9271abda..fe5c1f926 100644 --- a/src/store/websites.ts +++ b/src/store/websites.ts @@ -32,4 +32,4 @@ export function setWebsiteDateCompare(websiteId: string, dateCompare: string) { ); } -export default store; +export const useWebsites = store; diff --git a/yarn.lock b/yarn.lock index 2b16726d4..7f454dbb8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4665,10 +4665,10 @@ chalk "^4.1.2" debug "^4.3.4" -"@umami/react-zen@^0.50.0": - version "0.50.0" - resolved "https://registry.yarnpkg.com/@umami/react-zen/-/react-zen-0.50.0.tgz#0d63c5270a6220e02206a74f438196079d176df5" - integrity sha512-eFCz3/xr0c+QrPZ21FdyvgLr/tE57hrdBQgSwWhYh7AxRyQUD2NyaPnQnJX2RbTb7He3sR0Wyex1IDSAtkkSsA== +"@umami/react-zen@^0.51.0": + version "0.51.0" + resolved "https://registry.yarnpkg.com/@umami/react-zen/-/react-zen-0.51.0.tgz#a9767df0356acacde54a2d5c51a4c4ce174895f7" + integrity sha512-j/JmJ4cpCC78EpLck9Vy3tI+hqEokOghedc738xviOo3UWv96DrjnLe3F39k4u58nFMhreOYNyPM55i9F8qJHw== dependencies: "@fontsource/jetbrains-mono" "^5.0.18" "@react-spring/web" "^9.7.5"