Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.
TypeScript analyticsaudience-segmentationchartscohort-analysisgoogle-analyticsproduct-analyticsstatisticsuser-journeyweb-analytics
Added teams pages. Refactored hooks.
Mike Cao9448aa3ab54a
diff --git a/src/app/(main)/NavBar.tsx b/src/app/(main)/NavBar.tsxindex 14a360f89..6eb46cb25 100644--- a/src/app/(main)/NavBar.tsx+++ b/src/app/(main)/NavBar.tsx@@ -6,7 +6,7 @@ import Icons from 'components/icons';import ThemeButton from 'components/input/ThemeButton';import LanguageButton from 'components/input/LanguageButton';import ProfileButton from 'components/input/ProfileButton';-import useMessages from 'components/hooks/useMessages';+import { useMessages } from 'components/hooks';import HamburgerButton from 'components/common/HamburgerButton';import { usePathname } from 'next/navigation';import styles from './NavBar.module.css';diff --git a/src/app/(main)/UpdateNotice.tsx b/src/app/(main)/UpdateNotice.tsxindex 509df95ce..c56d3ce45 100644--- a/src/app/(main)/UpdateNotice.tsx+++ b/src/app/(main)/UpdateNotice.tsx@@ -6,7 +6,7 @@ import { setItem } from 'next-basics';import useStore, { checkVersion } from 'store/version';import { REPO_URL, VERSION_CHECK } from 'lib/constants';import styles from './UpdateNotice.module.css';-import useMessages from 'components/hooks/useMessages';+import { useMessages } from 'components/hooks';import { usePathname } from 'next/navigation';export function UpdateNotice({ user, config }) {diff --git a/src/app/(main)/console/TestConsole.tsx b/src/app/(main)/console/TestConsole.tsxindex 246b7088d..640a81f6e 100644--- a/src/app/(main)/console/TestConsole.tsx+++ b/src/app/(main)/console/TestConsole.tsx@@ -8,8 +8,7 @@ import Page from 'components/layout/Page';import PageHeader from 'components/layout/PageHeader';import EventsChart from 'components/metrics/EventsChart';import WebsiteChart from 'app/(main)/websites/[id]/WebsiteChart';-import useApi from 'components/hooks/useApi';-import useNavigation from 'components/hooks/useNavigation';+import { useApi, useNavigation } from 'components/hooks';import styles from './TestConsole.module.css';export function TestConsole({ websiteId }: { websiteId: string }) {diff --git a/src/app/(main)/dashboard/Dashboard.tsx b/src/app/(main)/dashboard/Dashboard.tsxindex d340ebc67..b6ab0617f 100644--- a/src/app/(main)/dashboard/Dashboard.tsx+++ b/src/app/(main)/dashboard/Dashboard.tsx@@ -7,11 +7,11 @@ import WebsiteChartList from '../../(main)/websites/[id]/WebsiteChartList';import DashboardSettingsButton from 'app/(main)/dashboard/DashboardSettingsButton';import DashboardEdit from 'app/(main)/dashboard/DashboardEdit';import EmptyPlaceholder from 'components/common/EmptyPlaceholder';-import useApi from 'components/hooks/useApi';+import { useApi } from 'components/hooks';import useDashboard from 'store/dashboard';-import useMessages from 'components/hooks/useMessages';-import useLocale from 'components/hooks/useLocale';-import useFilterQuery from 'components/hooks/useFilterQuery';+import { useMessages } from 'components/hooks';+import { useLocale } from 'components/hooks';+import { useFilterQuery } from 'components/hooks';import { useUser } from 'components/hooks';export function Dashboard() {diff --git a/src/app/(main)/dashboard/DashboardEdit.tsx b/src/app/(main)/dashboard/DashboardEdit.tsxindex 4b05a9607..fd94c7676 100644--- a/src/app/(main)/dashboard/DashboardEdit.tsx+++ b/src/app/(main)/dashboard/DashboardEdit.tsx@@ -5,8 +5,8 @@ import classNames from 'classnames';import { Button } from 'react-basics';import { firstBy } from 'thenby';import useDashboard, { saveDashboard } from 'store/dashboard';-import useMessages from 'components/hooks/useMessages';-import useApi from 'components/hooks/useApi';+import { useMessages } from 'components/hooks';+import { useApi } from 'components/hooks';import styles from './DashboardEdit.module.css';const dragId = 'dashboard-website-ordering';diff --git a/src/app/(main)/dashboard/DashboardSettingsButton.tsx b/src/app/(main)/dashboard/DashboardSettingsButton.tsxindex eeb1f9471..9e1d3dbc6 100644--- a/src/app/(main)/dashboard/DashboardSettingsButton.tsx+++ b/src/app/(main)/dashboard/DashboardSettingsButton.tsx@@ -1,7 +1,7 @@import { TooltipPopup, Icon, Text, Flexbox, Button } from 'react-basics';import Icons from 'components/icons';import { saveDashboard } from 'store/dashboard';-import useMessages from 'components/hooks/useMessages';+import { useMessages } from 'components/hooks';export function DashboardSettingsButton() {const { formatMessage, labels } = useMessages();diff --git a/src/app/(main)/reports/ReportsTable.tsx b/src/app/(main)/reports/ReportsTable.tsxindex 882110eec..3a5f7497b 100644--- a/src/app/(main)/reports/ReportsTable.tsx+++ b/src/app/(main)/reports/ReportsTable.tsx@@ -1,7 +1,7 @@import { GridColumn, GridTable, Icon, Icons, Text, useBreakpoint } from 'react-basics';import LinkButton from 'components/common/LinkButton';import { useMessages } from 'components/hooks';-import useUser from 'components/hooks/useUser';+import { useUser } from 'components/hooks';import { REPORT_TYPES } from 'lib/constants';import ReportDeleteButton from './ReportDeleteButton';diff --git a/src/app/(main)/reports/funnel/FunnelChart.tsx b/src/app/(main)/reports/funnel/FunnelChart.tsxindex 923e8d56b..ae4bc2ea8 100644--- a/src/app/(main)/reports/funnel/FunnelChart.tsx+++ b/src/app/(main)/reports/funnel/FunnelChart.tsx@@ -1,7 +1,7 @@import { JSX, useCallback, useContext, useMemo } from 'react';import { Loading, StatusLight } from 'react-basics';-import useMessages from 'components/hooks/useMessages';-import useTheme from 'components/hooks/useTheme';+import { useMessages } from 'components/hooks';+import { useTheme } from 'components/hooks';import BarChart from 'components/metrics/BarChart';import { formatLongNumber } from 'lib/format';import { ReportContext } from '../[id]/Report';diff --git a/src/app/(main)/settings/SettingsContext.tsx b/src/app/(main)/settings/SettingsContext.tsxindex 898a40cc0..694bfed07 100644--- a/src/app/(main)/settings/SettingsContext.tsx+++ b/src/app/(main)/settings/SettingsContext.tsx@@ -1,3 +1,4 @@+'use client';import { createContext } from 'react';export const SettingsContext = createContext(null);diff --git a/src/app/(main)/settings/layout.tsx b/src/app/(main)/settings/layout.tsxindex e36b5b53d..2c0547a51 100644--- a/src/app/(main)/settings/layout.tsx+++ b/src/app/(main)/settings/layout.tsx@@ -1,7 +1,7 @@'use client';import { usePathname } from 'next/navigation';-import useUser from 'components/hooks/useUser';-import useMessages from 'components/hooks/useMessages';+import { useUser } from 'components/hooks';+import { useMessages } from 'components/hooks';import SideNav from 'components/layout/SideNav';import styles from './layout.module.css';diff --git a/src/app/(main)/settings/profile/DateRangeSetting.tsx b/src/app/(main)/settings/profile/DateRangeSetting.tsxindex e44d45db6..f71bc71df 100644--- a/src/app/(main)/settings/profile/DateRangeSetting.tsx+++ b/src/app/(main)/settings/profile/DateRangeSetting.tsx@@ -1,8 +1,8 @@import DateFilter from 'components/input/DateFilter';import { Button, Flexbox } from 'react-basics';-import useDateRange from 'components/hooks/useDateRange';+import { useDateRange } from 'components/hooks';import { DEFAULT_DATE_RANGE } from 'lib/constants';-import useMessages from 'components/hooks/useMessages';+import { useMessages } from 'components/hooks';import { DateRange } from 'lib/types';export function DateRangeSetting() {diff --git a/src/app/(main)/settings/profile/LanguageSetting.tsx b/src/app/(main)/settings/profile/LanguageSetting.tsxindex 267a20f4c..a1a5b11bd 100644--- a/src/app/(main)/settings/profile/LanguageSetting.tsx+++ b/src/app/(main)/settings/profile/LanguageSetting.tsx@@ -1,9 +1,9 @@import { useState } from 'react';import { Button, Dropdown, Item, Flexbox } from 'react-basics';-import useLocale from 'components/hooks/useLocale';+import { useLocale } from 'components/hooks';import { DEFAULT_LOCALE } from 'lib/constants';import { languages } from 'lib/lang';-import useMessages from 'components/hooks/useMessages';+import { useMessages } from 'components/hooks';import styles from './LanguageSetting.module.css';export function LanguageSetting() {diff --git a/src/app/(main)/settings/profile/PasswordChangeButton.tsx b/src/app/(main)/settings/profile/PasswordChangeButton.tsxindex 29ec844a3..1ddc69541 100644--- a/src/app/(main)/settings/profile/PasswordChangeButton.tsx+++ b/src/app/(main)/settings/profile/PasswordChangeButton.tsx@@ -1,7 +1,7 @@import { Button, Icon, Text, useToasts, ModalTrigger, Modal } from 'react-basics';import PasswordEditForm from 'app/(main)/settings/profile/PasswordEditForm';import Icons from 'components/icons';-import useMessages from 'components/hooks/useMessages';+import { useMessages } from 'components/hooks';export function PasswordChangeButton() {const { formatMessage, labels, messages } = useMessages();diff --git a/src/app/(main)/settings/profile/PasswordEditForm.tsx b/src/app/(main)/settings/profile/PasswordEditForm.tsxindex 1384a9196..597379fcb 100644--- a/src/app/(main)/settings/profile/PasswordEditForm.tsx+++ b/src/app/(main)/settings/profile/PasswordEditForm.tsx@@ -1,7 +1,7 @@import { useRef } from 'react';import { Form, FormRow, FormInput, FormButtons, PasswordField, Button } from 'react-basics';-import useApi from 'components/hooks/useApi';-import useMessages from 'components/hooks/useMessages';+import { useApi } from 'components/hooks';+import { useMessages } from 'components/hooks';export function PasswordEditForm({ onSave, onClose }) {const { formatMessage, labels, messages } = useMessages();diff --git a/src/app/(main)/settings/profile/ProfileSettings.tsx b/src/app/(main)/settings/profile/ProfileSettings.tsxindex 89c6354c7..e93536e8c 100644--- a/src/app/(main)/settings/profile/ProfileSettings.tsx+++ b/src/app/(main)/settings/profile/ProfileSettings.tsx@@ -5,8 +5,8 @@ import DateRangeSetting from 'app/(main)/settings/profile/DateRangeSetting';import LanguageSetting from 'app/(main)/settings/profile/LanguageSetting';import ThemeSetting from 'app/(main)/settings/profile/ThemeSetting';import PasswordChangeButton from './PasswordChangeButton';-import useUser from 'components/hooks/useUser';-import useMessages from 'components/hooks/useMessages';+import { useUser } from 'components/hooks';+import { useMessages } from 'components/hooks';import { ROLES } from 'lib/constants';export function ProfileSettings() {diff --git a/src/app/(main)/settings/profile/ThemeSetting.tsx b/src/app/(main)/settings/profile/ThemeSetting.tsxindex aa3a67a21..577728b73 100644--- a/src/app/(main)/settings/profile/ThemeSetting.tsx+++ b/src/app/(main)/settings/profile/ThemeSetting.tsx@@ -1,6 +1,6 @@import classNames from 'classnames';import { Button, Icon } from 'react-basics';-import useTheme from 'components/hooks/useTheme';+import { useTheme } from 'components/hooks';import Sun from 'assets/sun.svg';import Moon from 'assets/moon.svg';import styles from './ThemeSetting.module.css';diff --git a/src/app/(main)/settings/profile/TimezoneSetting.tsx b/src/app/(main)/settings/profile/TimezoneSetting.tsxindex c0f722d0e..ca14f3561 100644--- a/src/app/(main)/settings/profile/TimezoneSetting.tsx+++ b/src/app/(main)/settings/profile/TimezoneSetting.tsx@@ -1,8 +1,8 @@import { useState } from 'react';import { Dropdown, Item, Button, Flexbox } from 'react-basics';import { listTimeZones } from 'timezone-support';-import useTimezone from 'components/hooks/useTimezone';-import useMessages from 'components/hooks/useMessages';+import { useTimezone } from 'components/hooks';+import { useMessages } from 'components/hooks';import { getTimezone } from 'lib/date';import styles from './TimezoneSetting.module.css';diff --git a/src/app/(main)/settings/teams/TeamAddForm.tsx b/src/app/(main)/settings/teams/TeamAddForm.tsxindex 5a242cb90..a9b229ba5 100644--- a/src/app/(main)/settings/teams/TeamAddForm.tsx+++ b/src/app/(main)/settings/teams/TeamAddForm.tsx@@ -8,8 +8,8 @@ import {SubmitButton,} from 'react-basics';import { setValue } from 'store/cache';-import useApi from 'components/hooks/useApi';-import useMessages from 'components/hooks/useMessages';+import { useApi } from 'components/hooks';+import { useMessages } from 'components/hooks';export function TeamAddForm({ onSave, onClose }: { onSave: () => void; onClose: () => void }) {const { formatMessage, labels } = useMessages();diff --git a/src/app/(main)/settings/teams/TeamDeleteForm.tsx b/src/app/(main)/settings/teams/TeamDeleteForm.tsxindex 00eedb178..e2ee6b659 100644--- a/src/app/(main)/settings/teams/TeamDeleteForm.tsx+++ b/src/app/(main)/settings/teams/TeamDeleteForm.tsx@@ -1,6 +1,6 @@import { Button, Form, FormButtons, SubmitButton } from 'react-basics';-import useApi from 'components/hooks/useApi';-import useMessages from 'components/hooks/useMessages';+import { useApi } from 'components/hooks';+import { useMessages } from 'components/hooks';import { setValue } from 'store/cache';export function TeamDeleteForm({diff --git a/src/app/(main)/settings/teams/TeamJoinForm.tsx b/src/app/(main)/settings/teams/TeamJoinForm.tsxindex 569c38484..094eaec54 100644--- a/src/app/(main)/settings/teams/TeamJoinForm.tsx+++ b/src/app/(main)/settings/teams/TeamJoinForm.tsx@@ -8,8 +8,8 @@ import {Button,SubmitButton,} from 'react-basics';-import useApi from 'components/hooks/useApi';-import useMessages from 'components/hooks/useMessages';+import { useApi } from 'components/hooks';+import { useMessages } from 'components/hooks';import { setValue } from 'store/cache';export function TeamJoinForm({ onSave, onClose }: { onSave: () => void; onClose: () => void }) {diff --git a/src/app/(main)/settings/teams/TeamLeaveButton.tsx b/src/app/(main)/settings/teams/TeamLeaveButton.tsxindex 97676e176..bc5c32293 100644--- a/src/app/(main)/settings/teams/TeamLeaveButton.tsx+++ b/src/app/(main)/settings/teams/TeamLeaveButton.tsx@@ -1,7 +1,7 @@import { Button, Icon, Icons, Modal, ModalTrigger, Text } from 'react-basics';-import useMessages from 'components/hooks/useMessages';-import useLocale from 'components/hooks/useLocale';-import useUser from 'components/hooks/useUser';+import { useMessages } from 'components/hooks';+import { useLocale } from 'components/hooks';+import { useUser } from 'components/hooks';import TeamDeleteForm from './TeamLeaveForm';export function TeamLeaveButton({diff --git a/src/app/(main)/settings/teams/TeamLeaveForm.tsx b/src/app/(main)/settings/teams/TeamLeaveForm.tsxindex 3b4d4703c..e8fd3e5a4 100644--- a/src/app/(main)/settings/teams/TeamLeaveForm.tsx+++ b/src/app/(main)/settings/teams/TeamLeaveForm.tsx@@ -1,6 +1,6 @@import { Button, Form, FormButtons, SubmitButton } from 'react-basics';-import useApi from 'components/hooks/useApi';-import useMessages from 'components/hooks/useMessages';+import { useApi } from 'components/hooks';+import { useMessages } from 'components/hooks';import { setValue } from 'store/cache';export function TeamLeaveForm({diff --git a/src/app/(main)/settings/teams/TeamsAddButton.tsx b/src/app/(main)/settings/teams/TeamsAddButton.tsxindex 09f9ecbbf..871cdb761 100644--- a/src/app/(main)/settings/teams/TeamsAddButton.tsx+++ b/src/app/(main)/settings/teams/TeamsAddButton.tsx@@ -1,6 +1,6 @@import { Button, Icon, Modal, ModalTrigger, Text } from 'react-basics';import Icons from 'components/icons';-import useMessages from 'components/hooks/useMessages';+import { useMessages } from 'components/hooks';import TeamAddForm from './TeamAddForm';export function TeamsAddButton({ onAdd }: { onAdd?: () => void }) {diff --git a/src/app/(main)/settings/teams/TeamsDataTable.tsx b/src/app/(main)/settings/teams/TeamsDataTable.tsxindex 2424e464e..b2ac7e164 100644--- a/src/app/(main)/settings/teams/TeamsDataTable.tsx+++ b/src/app/(main)/settings/teams/TeamsDataTable.tsx@@ -1,8 +1,8 @@'use client';import DataTable from 'components/common/DataTable';import TeamsTable from 'app/(main)/settings/teams/TeamsTable';-import useApi from 'components/hooks/useApi';-import useFilterQuery from 'components/hooks/useFilterQuery';+import { useApi } from 'components/hooks';+import { useFilterQuery } from 'components/hooks';import useCache from 'store/cache';export function TeamsDataTable() {diff --git a/src/app/(main)/settings/teams/TeamsHeader.tsx b/src/app/(main)/settings/teams/TeamsHeader.tsxindex 3a98318d3..f7d49bd50 100644--- a/src/app/(main)/settings/teams/TeamsHeader.tsx+++ b/src/app/(main)/settings/teams/TeamsHeader.tsx@@ -2,8 +2,8 @@import { Flexbox } from 'react-basics';import PageHeader from 'components/layout/PageHeader';import { ROLES } from 'lib/constants';-import useUser from 'components/hooks/useUser';-import useMessages from 'components/hooks/useMessages';+import { useUser } from 'components/hooks';+import { useMessages } from 'components/hooks';import TeamsJoinButton from './TeamsJoinButton';import TeamsAddButton from './TeamsAddButton';diff --git a/src/app/(main)/settings/teams/TeamsJoinButton.tsx b/src/app/(main)/settings/teams/TeamsJoinButton.tsxindex f8d2fa238..45a2142ea 100644--- a/src/app/(main)/settings/teams/TeamsJoinButton.tsx+++ b/src/app/(main)/settings/teams/TeamsJoinButton.tsx@@ -1,6 +1,6 @@import { Button, Icon, Modal, ModalTrigger, Text, useToasts } from 'react-basics';import Icons from 'components/icons';-import useMessages from 'components/hooks/useMessages';+import { useMessages } from 'components/hooks';import TeamJoinForm from './TeamJoinForm';export function TeamsJoinButton() {diff --git a/src/app/(main)/settings/teams/TeamsTable.tsx b/src/app/(main)/settings/teams/TeamsTable.tsxindex 852b4ff4f..7cc73ed39 100644--- a/src/app/(main)/settings/teams/TeamsTable.tsx+++ b/src/app/(main)/settings/teams/TeamsTable.tsx@@ -1,10 +1,9 @@'use client';-import useMessages from 'components/hooks/useMessages';-import useUser from 'components/hooks/useUser';-import { ROLES } from 'lib/constants';-import Link from 'next/link';import { Button, GridColumn, GridTable, Icon, Icons, Text, useBreakpoint } from 'react-basics';-import TeamLeaveButton from './TeamLeaveButton';+import Link from 'next/link';+import { useMessages } from 'components/hooks';+import { useUser } from 'components/hooks';+import { ROLES } from 'lib/constants';export function TeamsTable({ data = [] }: { data: any[] }) {const { formatMessage, labels } = useMessages();@@ -25,17 +24,28 @@ export function TeamsTable({ data = [] }: { data: any[] }) {</GridColumn><GridColumn name="action" label=" " alignment="end">{row => {- const { id, name, teamUser } = row;+ const { id, teamUser } = row;const owner = teamUser.find(({ role }) => role === ROLES.teamOwner);const isOwner = user.id === owner?.userId;return (<>- {!isOwner && <TeamLeaveButton teamId={id} teamName={name} />}- <Link href={`/settings/teams/${id}`}>+ {isOwner && (+ <Link href={`/settings/teams/${id}`}>+ <Button>+ <Icon>+ <Icons.Edit />+ </Icon>+ <Text>{formatMessage(labels.edit)}</Text>+ </Button>+ </Link>+ )}+ <Link href={`/teams/${id}`}><Button>- <Icon>{isOwner ? <Icons.Edit /> : <Icons.ArrowRight />}</Icon>- <Text>{formatMessage(isOwner ? labels.edit : labels.view)}</Text>+ <Icon>+ <Icons.External />+ </Icon>+ <Text>{formatMessage(labels.view)}</Text></Button></Link></>diff --git a/src/app/(main)/settings/teams/[id]/TeamData.tsx b/src/app/(main)/settings/teams/[id]/TeamData.tsxindex f2983ea50..14b20dc3a 100644--- a/src/app/(main)/settings/teams/[id]/TeamData.tsx+++ b/src/app/(main)/settings/teams/[id]/TeamData.tsx@@ -1,5 +1,5 @@import { ActionForm, Button, Modal, ModalTrigger } from 'react-basics';-import useMessages from 'components/hooks/useMessages';+import { useMessages } from 'components/hooks';import TeamDeleteForm from '../TeamDeleteForm';export function TeamData({ teamId }: { teamId: string; onSave?: (value: string) => void }) {diff --git a/src/app/(main)/settings/teams/[id]/TeamEditForm.tsx b/src/app/(main)/settings/teams/[id]/TeamEditForm.tsxindex 420afe9bb..4f728af4b 100644--- a/src/app/(main)/settings/teams/[id]/TeamEditForm.tsx+++ b/src/app/(main)/settings/teams/[id]/TeamEditForm.tsx@@ -10,8 +10,8 @@ import {} from 'react-basics';import { getRandomChars } from 'next-basics';import { useRef, useState } from 'react';-import useApi from 'components/hooks/useApi';-import useMessages from 'components/hooks/useMessages';+import { useApi } from 'components/hooks';+import { useMessages } from 'components/hooks';const generateId = () => getRandomChars(16);diff --git a/src/app/(main)/settings/teams/[id]/TeamMemberRemoveButton.tsx b/src/app/(main)/settings/teams/[id]/TeamMemberRemoveButton.tsxindex cef2977ef..9b33ed6b2 100644--- a/src/app/(main)/settings/teams/[id]/TeamMemberRemoveButton.tsx+++ b/src/app/(main)/settings/teams/[id]/TeamMemberRemoveButton.tsx@@ -1,5 +1,5 @@-import useApi from 'components/hooks/useApi';-import useMessages from 'components/hooks/useMessages';+import { useApi } from 'components/hooks';+import { useMessages } from 'components/hooks';import { Icon, Icons, LoadingButton, Text } from 'react-basics';import { setValue } from 'store/cache';diff --git a/src/app/(main)/settings/teams/[id]/TeamMembers.tsx b/src/app/(main)/settings/teams/[id]/TeamMembers.tsxindex a84fad10e..42286bc07 100644--- a/src/app/(main)/settings/teams/[id]/TeamMembers.tsx+++ b/src/app/(main)/settings/teams/[id]/TeamMembers.tsx@@ -1,5 +1,5 @@-import useApi from 'components/hooks/useApi';-import useFilterQuery from 'components/hooks/useFilterQuery';+import { useApi } from 'components/hooks';+import { useFilterQuery } from 'components/hooks';import DataTable from 'components/common/DataTable';import useCache from 'store/cache';import TeamMembersTable from './TeamMembersTable';diff --git a/src/app/(main)/settings/teams/[id]/TeamMembersTable.tsx b/src/app/(main)/settings/teams/[id]/TeamMembersTable.tsxindex a08c746bb..c4c333ce0 100644--- a/src/app/(main)/settings/teams/[id]/TeamMembersTable.tsx+++ b/src/app/(main)/settings/teams/[id]/TeamMembersTable.tsx@@ -1,6 +1,6 @@import { GridColumn, GridTable, useBreakpoint } from 'react-basics';-import useMessages from 'components/hooks/useMessages';-import useUser from 'components/hooks/useUser';+import { useMessages } from 'components/hooks';+import { useUser } from 'components/hooks';import { ROLES } from 'lib/constants';import TeamMemberRemoveButton from './TeamMemberRemoveButton';diff --git a/src/app/(main)/settings/teams/[id]/TeamSettings.tsx b/src/app/(main)/settings/teams/[id]/TeamSettings.tsxindex c62857742..44f6d2211 100644--- a/src/app/(main)/settings/teams/[id]/TeamSettings.tsx+++ b/src/app/(main)/settings/teams/[id]/TeamSettings.tsx@@ -3,9 +3,9 @@ import { useEffect, useState } from 'react';import { Item, Loading, Tabs, useToasts, Flexbox } from 'react-basics';import PageHeader from 'components/layout/PageHeader';import { ROLES } from 'lib/constants';-import useUser from 'components/hooks/useUser';-import useApi from 'components/hooks/useApi';-import useMessages from 'components/hooks/useMessages';+import { useUser } from 'components/hooks';+import { useApi } from 'components/hooks';+import { useMessages } from 'components/hooks';import TeamEditForm from './TeamEditForm';import TeamMembers from './TeamMembers';import TeamWebsites from './TeamWebsites';diff --git a/src/app/(main)/settings/teams/[id]/TeamWebsiteRemoveButton.tsx b/src/app/(main)/settings/teams/[id]/TeamWebsiteRemoveButton.tsxindex 0c039d4e9..76ffdae41 100644--- a/src/app/(main)/settings/teams/[id]/TeamWebsiteRemoveButton.tsx+++ b/src/app/(main)/settings/teams/[id]/TeamWebsiteRemoveButton.tsx@@ -1,5 +1,5 @@-import useApi from 'components/hooks/useApi';-import useMessages from 'components/hooks/useMessages';+import { useApi } from 'components/hooks';+import { useMessages } from 'components/hooks';import { Icon, Icons, LoadingButton, Text } from 'react-basics';export function TeamWebsiteRemoveButton({ teamId, websiteId, onSave }) {diff --git a/src/app/(main)/settings/teams/[id]/TeamWebsites.tsx b/src/app/(main)/settings/teams/[id]/TeamWebsites.tsxindex d71ebd993..24d38bc31 100644--- a/src/app/(main)/settings/teams/[id]/TeamWebsites.tsx+++ b/src/app/(main)/settings/teams/[id]/TeamWebsites.tsx@@ -1,27 +1,7 @@-import WebsitesTable from 'app/(main)/settings/websites/WebsitesTable';-import DataTable from 'components/common/DataTable';-import useFilterQuery from 'components/hooks/useFilterQuery';-import useApi from 'components/hooks/useApi';-import useUser from 'components/hooks/useUser';-import useCache from 'store/cache';+import WebsitesDataTable from 'app/(main)/settings/websites/WebsitesDataTable';export function TeamWebsites({ teamId }: { teamId: string; readOnly: boolean }) {- const { get } = useApi();- const { user } = useUser();- const modified = useCache(state => state?.['team:websites']);- const queryResult = useFilterQuery({- queryKey: ['team:websites', { teamId, modified }],- queryFn: params => {- return get(`/teams/${teamId}/websites`, {- ...params,- });- },- enabled: !!user,- });-- return (- <DataTable queryResult={queryResult}>{({ data }) => <WebsitesTable data={data} />}</DataTable>- );+ return <WebsitesDataTable teamId={teamId} />;}export default TeamWebsites;diff --git a/src/app/(main)/settings/teams/[id]/TeamWebsitesTable.tsx b/src/app/(main)/settings/teams/[id]/TeamWebsitesTable.tsxindex 8811b8bcd..2fb691a2d 100644--- a/src/app/(main)/settings/teams/[id]/TeamWebsitesTable.tsx+++ b/src/app/(main)/settings/teams/[id]/TeamWebsitesTable.tsx@@ -1,6 +1,6 @@import Link from 'next/link';import { Button, GridColumn, GridTable, Icon, Icons, Text } from 'react-basics';-import useMessages from 'components/hooks/useMessages';+import { useMessages } from 'components/hooks';export function TeamWebsitesTable({data = [],diff --git a/src/app/(main)/settings/users/UserAddButton.tsx b/src/app/(main)/settings/users/UserAddButton.tsxindex 1158ecec6..571abf5ab 100644--- a/src/app/(main)/settings/users/UserAddButton.tsx+++ b/src/app/(main)/settings/users/UserAddButton.tsx@@ -1,6 +1,6 @@import { Button, Icon, Text, Modal, Icons, ModalTrigger, useToasts } from 'react-basics';import UserAddForm from './UserAddForm';-import useMessages from 'components/hooks/useMessages';+import { useMessages } from 'components/hooks';import { setValue } from 'store/cache';export function UserAddButton({ onSave }: { onSave?: () => void }) {diff --git a/src/app/(main)/settings/users/UserAddForm.tsx b/src/app/(main)/settings/users/UserAddForm.tsxindex 8c1537757..0b15e4227 100644--- a/src/app/(main)/settings/users/UserAddForm.tsx+++ b/src/app/(main)/settings/users/UserAddForm.tsx@@ -10,9 +10,9 @@ import {SubmitButton,Button,} from 'react-basics';-import useApi from 'components/hooks/useApi';+import { useApi } from 'components/hooks';import { ROLES } from 'lib/constants';-import useMessages from 'components/hooks/useMessages';+import { useMessages } from 'components/hooks';export function UserAddForm({ onSave, onClose }) {const { post, useMutation } = useApi();diff --git a/src/app/(main)/settings/users/UserDeleteButton.tsx b/src/app/(main)/settings/users/UserDeleteButton.tsxindex 775004a84..197ddbe58 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 from 'components/hooks/useMessages';-import useUser from 'components/hooks/useUser';+import { useMessages } from 'components/hooks';+import { useUser } from 'components/hooks';import UserDeleteForm from './UserDeleteForm';export function UserDeleteButton({diff --git a/src/app/(main)/settings/users/UserDeleteForm.tsx b/src/app/(main)/settings/users/UserDeleteForm.tsxindex eaa8e4818..08ba6724d 100644--- a/src/app/(main)/settings/users/UserDeleteForm.tsx+++ b/src/app/(main)/settings/users/UserDeleteForm.tsx@@ -1,6 +1,6 @@import { Button, Form, FormButtons, SubmitButton } from 'react-basics';-import useApi from 'components/hooks/useApi';-import useMessages from 'components/hooks/useMessages';+import { useApi } from 'components/hooks';+import { useMessages } from 'components/hooks';export function UserDeleteForm({ userId, username, onSave, onClose }) {const { formatMessage, FormattedMessage, labels, messages } = useMessages();diff --git a/src/app/(main)/settings/users/UserEditForm.tsx b/src/app/(main)/settings/users/UserEditForm.tsxindex 0b823a94e..cc8014d7a 100644--- a/src/app/(main)/settings/users/UserEditForm.tsx+++ b/src/app/(main)/settings/users/UserEditForm.tsx@@ -9,9 +9,9 @@ import {SubmitButton,PasswordField,} from 'react-basics';-import useApi from 'components/hooks/useApi';+import { useApi } from 'components/hooks';import { ROLES } from 'lib/constants';-import useMessages from 'components/hooks/useMessages';+import { useMessages } from 'components/hooks';export function UserEditForm({userId,diff --git a/src/app/(main)/settings/users/UserWebsites.tsx b/src/app/(main)/settings/users/UserWebsites.tsxindex 3897b5b09..da7ba7a29 100644--- a/src/app/(main)/settings/users/UserWebsites.tsx+++ b/src/app/(main)/settings/users/UserWebsites.tsx@@ -1,7 +1,7 @@import Page from 'components/layout/Page';-import useApi from 'components/hooks/useApi';+import { useApi } from 'components/hooks';import WebsitesTable from 'app/(main)/settings/websites/WebsitesTable';-import useFilterQuery from 'components/hooks/useFilterQuery';+import { useFilterQuery } from 'components/hooks';import DataTable from 'components/common/DataTable';export function UserWebsites({ userId }) {diff --git a/src/app/(main)/settings/users/UsersDataTable.tsx b/src/app/(main)/settings/users/UsersDataTable.tsxindex 77243f609..ed37787d8 100644--- a/src/app/(main)/settings/users/UsersDataTable.tsx+++ b/src/app/(main)/settings/users/UsersDataTable.tsx@@ -1,6 +1,6 @@'use client';-import useApi from 'components/hooks/useApi';-import useFilterQuery from 'components/hooks/useFilterQuery';+import { useApi } from 'components/hooks';+import { useFilterQuery } from 'components/hooks';import DataTable from 'components/common/DataTable';import UsersTable from './UsersTable';import useCache from 'store/cache';diff --git a/src/app/(main)/settings/users/UsersHeader.tsx b/src/app/(main)/settings/users/UsersHeader.tsxindex 0901a6fb2..20c5f8984 100644--- a/src/app/(main)/settings/users/UsersHeader.tsx+++ b/src/app/(main)/settings/users/UsersHeader.tsx@@ -1,6 +1,6 @@'use client';import PageHeader from 'components/layout/PageHeader';-import useMessages from 'components/hooks/useMessages';+import { useMessages } from 'components/hooks';import UserAddButton from './UserAddButton';export function UsersHeader({ onAdd }: { onAdd?: () => void }) {diff --git a/src/app/(main)/settings/users/UsersTable.tsx b/src/app/(main)/settings/users/UsersTable.tsxindex 13f3b6f89..036c3de6d 100644--- a/src/app/(main)/settings/users/UsersTable.tsx+++ b/src/app/(main)/settings/users/UsersTable.tsx@@ -2,8 +2,8 @@ import { Button, Text, Icon, Icons, GridTable, GridColumn, useBreakpoint } fromimport { formatDistance } from 'date-fns';import Link from 'next/link';import { ROLES } from 'lib/constants';-import useMessages from 'components/hooks/useMessages';-import useLocale from 'components/hooks/useLocale';+import { useMessages } from 'components/hooks';+import { useLocale } from 'components/hooks';import UserDeleteButton from './UserDeleteButton';export function UsersTable({diff --git a/src/app/(main)/settings/users/[id]/UserSettings.tsx b/src/app/(main)/settings/users/[id]/UserSettings.tsxindex d9b149c33..070b8aa2d 100644--- a/src/app/(main)/settings/users/[id]/UserSettings.tsx+++ b/src/app/(main)/settings/users/[id]/UserSettings.tsx@@ -3,8 +3,8 @@ import { Key, useEffect, useState } from 'react';import { Item, Loading, Tabs, useToasts } from 'react-basics';import UserEditForm from '../UserEditForm';import PageHeader from 'components/layout/PageHeader';-import useApi from 'components/hooks/useApi';-import useMessages from 'components/hooks/useMessages';+import { useApi } from 'components/hooks';+import { useMessages } from 'components/hooks';import UserWebsites from '../UserWebsites';export function UserSettings({ userId }) {diff --git a/src/app/(main)/settings/websites/WebsiteAddButton.tsx b/src/app/(main)/settings/websites/WebsiteAddButton.tsxindex 7b4c92deb..edda0c1b3 100644--- a/src/app/(main)/settings/websites/WebsiteAddButton.tsx+++ b/src/app/(main)/settings/websites/WebsiteAddButton.tsx@@ -1,9 +1,9 @@import { Button, Icon, Icons, Modal, ModalTrigger, Text, useToasts } from 'react-basics';import WebsiteAddForm from './WebsiteAddForm';-import useMessages from 'components/hooks/useMessages';+import { useMessages } from 'components/hooks';import { setValue } from 'store/cache';-export function WebsiteAddButton({ onSave }: { onSave?: () => void }) {+export function WebsiteAddButton({ teamId, onSave }: { teamId: string; onSave?: () => void }) {const { formatMessage, labels, messages } = useMessages();const { showToast } = useToasts();@@ -22,7 +22,9 @@ export function WebsiteAddButton({ onSave }: { onSave?: () => void }) {<Text>{formatMessage(labels.addWebsite)}</Text></Button><Modal title={formatMessage(labels.addWebsite)}>- {(close: () => void) => <WebsiteAddForm onSave={handleSave} onClose={close} />}+ {(close: () => void) => (+ <WebsiteAddForm teamId={teamId} onSave={handleSave} onClose={close} />+ )}</Modal></ModalTrigger>);diff --git a/src/app/(main)/settings/websites/WebsiteAddForm.tsx b/src/app/(main)/settings/websites/WebsiteAddForm.tsxindex 6d8fb8c32..64c457d1b 100644--- a/src/app/(main)/settings/websites/WebsiteAddForm.tsx+++ b/src/app/(main)/settings/websites/WebsiteAddForm.tsx@@ -7,18 +7,26 @@ import {Button,SubmitButton,} from 'react-basics';-import useApi from 'components/hooks/useApi';+import { useApi } from 'components/hooks';import { DOMAIN_REGEX } from 'lib/constants';-import useMessages from 'components/hooks/useMessages';+import { useMessages } from 'components/hooks';import { useContext } from 'react';import SettingsContext from '../SettingsContext';-export function WebsiteAddForm({ onSave, onClose }: { onSave?: () => void; onClose?: () => void }) {+export function WebsiteAddForm({+ teamId,+ onSave,+ onClose,+}: {+ teamId: string;+ onSave?: () => void;+ onClose?: () => void;+}) {const { formatMessage, labels, messages } = useMessages();const { websitesUrl } = useContext(SettingsContext);const { post, useMutation } = useApi();const { mutate, error, isPending } = useMutation({- mutationFn: (data: any) => post(websitesUrl, data),+ mutationFn: (data: any) => post(websitesUrl, { ...data, teamId }),});const handleSubmit = async (data: any) => {diff --git a/src/app/(main)/settings/websites/WebsiteSettings.tsx b/src/app/(main)/settings/websites/WebsiteSettings.tsxindex 0c5ce6142..031307b05 100644--- a/src/app/(main)/settings/websites/WebsiteSettings.tsx+++ b/src/app/(main)/settings/websites/WebsiteSettings.tsx@@ -8,8 +8,8 @@ import WebsiteEditForm from './[id]/WebsiteEditForm';import WebsiteData from './[id]/WebsiteData';import TrackingCode from './[id]/TrackingCode';import ShareUrl from './[id]/ShareUrl';-import useApi from 'components/hooks/useApi';-import useMessages from 'components/hooks/useMessages';+import { useApi } from 'components/hooks';+import { useMessages } from 'components/hooks';import SettingsContext from '../SettingsContext';export function WebsiteSettings({ websiteId, openExternal = false }) {diff --git a/src/app/(main)/settings/websites/WebsitesDataTable.tsx b/src/app/(main)/settings/websites/WebsitesDataTable.tsxindex 7ed2a3b33..8f54439c9 100644--- a/src/app/(main)/settings/websites/WebsitesDataTable.tsx+++ b/src/app/(main)/settings/websites/WebsitesDataTable.tsx@@ -1,14 +1,12 @@'use client';-import { ReactNode, useContext } from 'react';+import { ReactNode } from 'react';import WebsitesTable from 'app/(main)/settings/websites/WebsitesTable';-import useApi from 'components/hooks/useApi';import DataTable from 'components/common/DataTable';-import useFilterQuery from 'components/hooks/useFilterQuery';-import useCache from 'store/cache';-import SettingsContext from '../SettingsContext';+import useWebsites from 'components/hooks/queries/useWebsites';export interface WebsitesDataTableProps {- userId: string;+ userId?: string;+ teamId?: string;allowEdit?: boolean;allowView?: boolean;showActions?: boolean;@@ -17,24 +15,13 @@ export interface WebsitesDataTableProps {export function WebsitesDataTable({userId,+ teamId,allowEdit = true,allowView = true,showActions = true,children,}: WebsitesDataTableProps) {- const { get } = useApi();- const modified = useCache((state: any) => state?.websites);- const { websitesUrl } = useContext(SettingsContext);-- const queryResult = useFilterQuery({- queryKey: ['websites', { modified }],- queryFn: (params: any) => {- return get(websitesUrl, {- ...params,- });- },- enabled: !!userId,- });+ const queryResult = useWebsites({ userId, teamId });return (<DataTable queryResult={queryResult}>diff --git a/src/app/(main)/settings/websites/WebsitesHeader.tsx b/src/app/(main)/settings/websites/WebsitesHeader.tsxindex 61bfb886d..7809b0c42 100644--- a/src/app/(main)/settings/websites/WebsitesHeader.tsx+++ b/src/app/(main)/settings/websites/WebsitesHeader.tsx@@ -1,14 +1,19 @@'use client';-import useMessages from 'components/hooks/useMessages';+import { useMessages } from 'components/hooks';import PageHeader from 'components/layout/PageHeader';import WebsiteAddButton from './WebsiteAddButton';-export function WebsitesHeader({ showActions = true }) {+export interface WebsitesHeaderProps {+ teamId?: string;+ showActions?: boolean;+}++export function WebsitesHeader({ teamId, showActions = true }: WebsitesHeaderProps) {const { formatMessage, labels } = useMessages();return (<PageHeader title={formatMessage(labels.websites)}>- {!process.env.cloudMode && showActions && <WebsiteAddButton />}+ {!process.env.cloudMode && showActions && <WebsiteAddButton teamId={teamId} />}</PageHeader>);}diff --git a/src/app/(main)/settings/websites/WebsitesTable.tsx b/src/app/(main)/settings/websites/WebsitesTable.tsxindex 06c4b5861..5c36bde61 100644--- a/src/app/(main)/settings/websites/WebsitesTable.tsx+++ b/src/app/(main)/settings/websites/WebsitesTable.tsx@@ -1,15 +1,15 @@-import { ReactNode, useContext } from 'react';+import { ReactNode } from 'react';import Link from 'next/link';import { Button, Text, Icon, Icons, GridTable, GridColumn, useBreakpoint } from 'react-basics';-import useMessages from 'components/hooks/useMessages';-import useUser from 'components/hooks/useUser';-import SettingsContext from '../SettingsContext';+import { useMessages } from 'components/hooks';+import { useUser } from 'components/hooks';export interface WebsitesTableProps {data: any[];showActions?: boolean;allowEdit?: boolean;allowView?: boolean;+ teamId?: string;children?: ReactNode;}@@ -18,12 +18,12 @@ export function WebsitesTable({showActions,allowEdit,allowView,+ teamId,children,}: WebsitesTableProps) {const { formatMessage, labels } = useMessages();const { user } = useUser();const breakpoint = useBreakpoint();- const { settingsPath, websitesPath } = useContext(SettingsContext);return (<GridTable data={data} cardMode={['xs', 'sm', 'md'].includes(breakpoint)}>@@ -32,15 +32,13 @@ export function WebsitesTable({{showActions && (<GridColumn name="action" label=" " alignment="end">{row => {- const {- id,- user: { id: ownerId },- } = row;+ const { id } = row;+ const isOwner = row.userId === user.id || row.teamId === teamId;return (<>- {allowEdit && ownerId === user.id && (- <Link href={`${settingsPath}/${id}`}>+ {allowEdit && isOwner && (+ <Link href={`/settings/${id}`}><Button><Icon><Icons.Edit />@@ -50,7 +48,7 @@ export function WebsitesTable({</Link>)}{allowView && (- <Link href={`${websitesPath}/${id}`}>+ <Link href={teamId ? `/team/${teamId}/websites/${id}` : `/websites/${id}`}><Button><Icon><Icons.External />diff --git a/src/app/(main)/settings/websites/[id]/ShareUrl.tsx b/src/app/(main)/settings/websites/[id]/ShareUrl.tsxindex 90ce6ea69..7c9c96e6d 100644--- a/src/app/(main)/settings/websites/[id]/ShareUrl.tsx+++ b/src/app/(main)/settings/websites/[id]/ShareUrl.tsx@@ -10,8 +10,8 @@ import {} from 'react-basics';import { useContext, useEffect, useMemo, useRef, useState } from 'react';import { getRandomChars } from 'next-basics';-import useApi from 'components/hooks/useApi';-import useMessages from 'components/hooks/useMessages';+import { useApi } from 'components/hooks';+import { useMessages } from 'components/hooks';import SettingsContext from '../../SettingsContext';const generateId = () => getRandomChars(16);diff --git a/src/app/(main)/settings/websites/[id]/TrackingCode.tsx b/src/app/(main)/settings/websites/[id]/TrackingCode.tsxindex 6e5fd99eb..d13f0ddbe 100644--- a/src/app/(main)/settings/websites/[id]/TrackingCode.tsx+++ b/src/app/(main)/settings/websites/[id]/TrackingCode.tsx@@ -1,6 +1,6 @@import { TextArea } from 'react-basics';-import useMessages from 'components/hooks/useMessages';-import useConfig from 'components/hooks/useConfig';+import { useMessages } from 'components/hooks';+import { useConfig } from 'components/hooks';import { useContext } from 'react';import SettingsContext from '../../SettingsContext';diff --git a/src/app/(main)/settings/websites/[id]/WebsiteData.tsx b/src/app/(main)/settings/websites/[id]/WebsiteData.tsxindex 0ad3b5596..2c82c2152 100644--- a/src/app/(main)/settings/websites/[id]/WebsiteData.tsx+++ b/src/app/(main)/settings/websites/[id]/WebsiteData.tsx@@ -1,7 +1,7 @@import { Button, Modal, ModalTrigger, ActionForm } from 'react-basics';import WebsiteDeleteForm from './WebsiteDeleteForm';import WebsiteResetForm from './WebsiteResetForm';-import useMessages from 'components/hooks/useMessages';+import { useMessages } from 'components/hooks';export function WebsiteData({websiteId,diff --git a/src/app/(main)/settings/websites/[id]/WebsiteDeleteForm.tsx b/src/app/(main)/settings/websites/[id]/WebsiteDeleteForm.tsxindex 020aa2372..6ed365c7d 100644--- a/src/app/(main)/settings/websites/[id]/WebsiteDeleteForm.tsx+++ b/src/app/(main)/settings/websites/[id]/WebsiteDeleteForm.tsx@@ -7,8 +7,8 @@ import {SubmitButton,TextField,} from 'react-basics';-import useApi from 'components/hooks/useApi';-import useMessages from 'components/hooks/useMessages';+import { useApi } from 'components/hooks';+import { useMessages } from 'components/hooks';import { useContext } from 'react';import SettingsContext from '../../SettingsContext';diff --git a/src/app/(main)/settings/websites/[id]/WebsiteEditForm.tsx b/src/app/(main)/settings/websites/[id]/WebsiteEditForm.tsxindex 80b36cae1..9512e9266 100644--- a/src/app/(main)/settings/websites/[id]/WebsiteEditForm.tsx+++ b/src/app/(main)/settings/websites/[id]/WebsiteEditForm.tsx@@ -1,8 +1,8 @@import { SubmitButton, Form, FormInput, FormRow, FormButtons, TextField } from 'react-basics';import { useContext, useRef } from 'react';-import useApi from 'components/hooks/useApi';+import { useApi } from 'components/hooks';import { DOMAIN_REGEX } from 'lib/constants';-import useMessages from 'components/hooks/useMessages';+import { useMessages } from 'components/hooks';import SettingsContext from '../../SettingsContext';export function WebsiteEditForm({diff --git a/src/app/(main)/settings/websites/[id]/WebsiteResetForm.tsx b/src/app/(main)/settings/websites/[id]/WebsiteResetForm.tsxindex 96cea7c42..86077c1c9 100644--- a/src/app/(main)/settings/websites/[id]/WebsiteResetForm.tsx+++ b/src/app/(main)/settings/websites/[id]/WebsiteResetForm.tsx@@ -7,8 +7,8 @@ import {SubmitButton,TextField,} from 'react-basics';-import useApi from 'components/hooks/useApi';-import useMessages from 'components/hooks/useMessages';+import { useApi } from 'components/hooks';+import { useMessages } from 'components/hooks';import { useContext } from 'react';import SettingsContext from '../../SettingsContext';diff --git a/src/app/(main)/teams/TeamsContext.tsx b/src/app/(main)/teams/TeamsContext.tsxnew file mode 100644index 000000000..822643a50--- /dev/null+++ b/src/app/(main)/teams/TeamsContext.tsx@@ -0,0 +1,5 @@+import { createContext } from 'react';++export const TeamsContext = createContext(null);++export default TeamsContext;diff --git a/src/app/(main)/teams/[id]/Team.tsx b/src/app/(main)/teams/[id]/Team.tsxnew file mode 100644index 000000000..a8817c374--- /dev/null+++ b/src/app/(main)/teams/[id]/Team.tsx@@ -0,0 +1,20 @@+'use client';+import TeamsContext from '../TeamsContext';+import { Loading } from 'react-basics';+import { useTeam } from 'components/hooks';+import { useParams } from 'next/navigation';++export default function Team({ children }) {+ const { id: teamId } = useParams();+ const { data: team, isLoading, error } = useTeam(teamId as string);++ if (error) {+ return null;+ }++ if (isLoading) {+ return <Loading position="page" />;+ }++ return <TeamsContext.Provider value={team}>{children}</TeamsContext.Provider>;+}diff --git a/src/app/(main)/teams/[id]/layout.tsx b/src/app/(main)/teams/[id]/layout.tsxnew file mode 100644index 000000000..1f887ce8a--- /dev/null+++ b/src/app/(main)/teams/[id]/layout.tsx@@ -0,0 +1,5 @@+import Team from './Team';++export default function ({ children }) {+ return <Team>{children}</Team>;+}diff --git a/src/app/(main)/teams/[id]/websites/TeamWebsites.tsx b/src/app/(main)/teams/[id]/websites/TeamWebsites.tsxnew file mode 100644index 000000000..443e4b91d--- /dev/null+++ b/src/app/(main)/teams/[id]/websites/TeamWebsites.tsx@@ -0,0 +1,14 @@+'use client';+import { useContext } from 'react';+import TeamsContext from 'app/(main)/teams/TeamsContext';+import WebsitesDataTable from 'app/(main)/settings/websites/WebsitesDataTable';++export default function TeamWebsites() {+ const team = useContext(TeamsContext);++ if (!team) {+ return null;+ }++ return <WebsitesDataTable teamId={team.id} />;+}diff --git a/src/app/(main)/teams/[id]/websites/page.tsx b/src/app/(main)/teams/[id]/websites/page.tsxnew file mode 100644index 000000000..386c13545--- /dev/null+++ b/src/app/(main)/teams/[id]/websites/page.tsx@@ -0,0 +1,11 @@+import TeamWebsites from './TeamWebsites';+import WebsitesHeader from 'app/(main)/settings/websites/WebsitesHeader';++export default function TeamWebsitesPage({ params: { id } }: { params: { id: string } }) {+ return (+ <>+ <WebsitesHeader teamId={id} />+ <TeamWebsites />+ </>+ );+}diff --git a/src/app/(main)/websites/[id]/WebsiteDetails.tsx b/src/app/(main)/websites/[id]/WebsiteDetails.tsxindex b234ea0a1..0a18c03f3 100644--- a/src/app/(main)/websites/[id]/WebsiteDetails.tsx+++ b/src/app/(main)/websites/[id]/WebsiteDetails.tsx@@ -3,7 +3,7 @@ import { Loading } from 'react-basics';import { usePathname } from 'next/navigation';import Page from 'components/layout/Page';import FilterTags from 'components/metrics/FilterTags';-import useNavigation from 'components/hooks/useNavigation';+import { useNavigation } from 'components/hooks';import { useWebsite } from 'components/hooks';import WebsiteChart from './WebsiteChart';import WebsiteExpandedView from './WebsiteExpandedView';diff --git a/src/app/(main)/websites/[id]/WebsiteExpandedView.tsx b/src/app/(main)/websites/[id]/WebsiteExpandedView.tsxindex f01d93633..2f7a9a9fa 100644--- a/src/app/(main)/websites/[id]/WebsiteExpandedView.tsx+++ b/src/app/(main)/websites/[id]/WebsiteExpandedView.tsx@@ -12,8 +12,8 @@ import ReferrersTable from 'components/metrics/ReferrersTable';import ScreenTable from 'components/metrics/ScreenTable';import EventsTable from 'components/metrics/EventsTable';import SideNav from 'components/layout/SideNav';-import useNavigation from 'components/hooks/useNavigation';-import useMessages from 'components/hooks/useMessages';+import { useNavigation } from 'components/hooks';+import { useMessages } from 'components/hooks';import LinkButton from 'components/common/LinkButton';import styles from './WebsiteExpandedView.module.css';diff --git a/src/app/(main)/websites/[id]/event-data/EventDataMetricsBar.tsx b/src/app/(main)/websites/[id]/event-data/EventDataMetricsBar.tsxindex 419472d59..7f4a265a5 100644--- a/src/app/(main)/websites/[id]/event-data/EventDataMetricsBar.tsx+++ b/src/app/(main)/websites/[id]/event-data/EventDataMetricsBar.tsx@@ -1,6 +1,6 @@import { useApi, useDateRange } from 'components/hooks';import MetricCard from 'components/metrics/MetricCard';-import useMessages from 'components/hooks/useMessages';+import { useMessages } from 'components/hooks';import WebsiteDateFilter from 'components/input/WebsiteDateFilter';import MetricsBar from 'components/metrics/MetricsBar';import styles from './EventDataMetricsBar.module.css';diff --git a/src/app/(main)/websites/[id]/page.tsx b/src/app/(main)/websites/[id]/page.tsxindex 4b7d6ff35..da5f2c0c3 100644--- a/src/app/(main)/websites/[id]/page.tsx+++ b/src/app/(main)/websites/[id]/page.tsx@@ -1,5 +1,5 @@import WebsiteDetails from './WebsiteDetails';-export default function WebsiteReportsPage({ params: { id } }) {+export default function WebsitePage({ params: { id } }) {return <WebsiteDetails websiteId={id} />;}diff --git a/src/app/(main)/websites/[id]/realtime/Realtime.tsx b/src/app/(main)/websites/[id]/realtime/Realtime.tsxindex bd9f74bc1..3990b8202 100644--- a/src/app/(main)/websites/[id]/realtime/Realtime.tsx+++ b/src/app/(main)/websites/[id]/realtime/Realtime.tsx@@ -6,7 +6,7 @@ import { Grid, GridRow } from 'components/layout/Grid';import Page from 'components/layout/Page';import RealtimeChart from 'components/metrics/RealtimeChart';import WorldMap from 'components/metrics/WorldMap';-import useApi from 'components/hooks/useApi';+import { useApi } from 'components/hooks';import { useWebsite } from 'components/hooks';import { percentFilter } from 'lib/filters';import { REALTIME_RANGE, REALTIME_INTERVAL } from 'lib/constants';diff --git a/src/app/(main)/websites/[id]/realtime/RealtimeCountries.tsx b/src/app/(main)/websites/[id]/realtime/RealtimeCountries.tsxindex 6f484b091..893e23848 100644--- a/src/app/(main)/websites/[id]/realtime/RealtimeCountries.tsx+++ b/src/app/(main)/websites/[id]/realtime/RealtimeCountries.tsx@@ -1,8 +1,8 @@import { useCallback } from 'react';import ListTable from 'components/metrics/ListTable';-import useLocale from 'components/hooks/useLocale';-import useCountryNames from 'components/hooks/useCountryNames';-import useMessages from 'components/hooks/useMessages';+import { useLocale } from 'components/hooks';+import { useCountryNames } from 'components/hooks';+import { useMessages } from 'components/hooks';import classNames from 'classnames';import styles from './RealtimeCountries.module.css';diff --git a/src/app/(main)/websites/[id]/realtime/RealtimeHeader.tsx b/src/app/(main)/websites/[id]/realtime/RealtimeHeader.tsxindex ad03efd14..80d3d8c62 100644--- a/src/app/(main)/websites/[id]/realtime/RealtimeHeader.tsx+++ b/src/app/(main)/websites/[id]/realtime/RealtimeHeader.tsx@@ -1,5 +1,5 @@import MetricCard from 'components/metrics/MetricCard';-import useMessages from 'components/hooks/useMessages';+import { useMessages } from 'components/hooks';import { RealtimeData } from 'lib/types';import styles from './RealtimeHeader.module.css';diff --git a/src/app/(main)/websites/[id]/realtime/RealtimeHome.tsx b/src/app/(main)/websites/[id]/realtime/RealtimeHome.tsxindex 154ac707f..67ac5cc48 100644--- a/src/app/(main)/websites/[id]/realtime/RealtimeHome.tsx+++ b/src/app/(main)/websites/[id]/realtime/RealtimeHome.tsx@@ -2,9 +2,9 @@ import { useEffect } from 'react';import { useRouter } from 'next/navigation';import Page from 'components/layout/Page';import PageHeader from 'components/layout/PageHeader';-import useApi from 'components/hooks/useApi';+import { useApi } from 'components/hooks';import EmptyPlaceholder from 'components/common/EmptyPlaceholder';-import useMessages from 'components/hooks/useMessages';+import { useMessages } from 'components/hooks';export function RealtimeHome() {const { formatMessage, labels, messages } = useMessages();@@ -22,7 +22,7 @@ export function RealtimeHome() {}, [data, router]);return (- <Page loading={isLoading || data?.length > 0} error={error}>+ <Page isLoading={isLoading || data?.length > 0} error={error}><PageHeader title={formatMessage(labels.realtime)} />{data?.length === 0 && (<EmptyPlaceholder message={formatMessage(messages.noWebsitesConfigured)} />diff --git a/src/app/(main)/websites/[id]/realtime/RealtimeLog.tsx b/src/app/(main)/websites/[id]/realtime/RealtimeLog.tsxindex 5293c1f06..003600cf4 100644--- a/src/app/(main)/websites/[id]/realtime/RealtimeLog.tsx+++ b/src/app/(main)/websites/[id]/realtime/RealtimeLog.tsx@@ -6,10 +6,10 @@ import thenby from 'thenby';import { safeDecodeURI } from 'next-basics';import FilterButtons from 'components/common/FilterButtons';import Empty from 'components/common/Empty';-import useLocale from 'components/hooks/useLocale';-import useCountryNames from 'components/hooks/useCountryNames';+import { useLocale } from 'components/hooks';+import { useCountryNames } from 'components/hooks';import Icons from 'components/icons';-import useMessages from 'components/hooks/useMessages';+import { useMessages } from 'components/hooks';import useFormat from 'components//hooks/useFormat';import { BROWSERS } from 'lib/constants';import { stringToColor } from 'lib/format';diff --git a/src/app/(main)/websites/[id]/realtime/RealtimeUrls.tsx b/src/app/(main)/websites/[id]/realtime/RealtimeUrls.tsxindex 27a9ec5a6..b3726d6d2 100644--- a/src/app/(main)/websites/[id]/realtime/RealtimeUrls.tsx+++ b/src/app/(main)/websites/[id]/realtime/RealtimeUrls.tsx@@ -4,7 +4,7 @@ import thenby from 'thenby';import { percentFilter } from 'lib/filters';import ListTable from 'components/metrics/ListTable';import { FILTER_PAGES, FILTER_REFERRERS } from 'lib/constants';-import useMessages from 'components/hooks/useMessages';+import { useMessages } from 'components/hooks';import { RealtimeData } from 'lib/types';export function RealtimeUrls({diff --git a/src/app/Providers.tsx b/src/app/Providers.tsxindex f1460b055..ac2f04015 100644--- a/src/app/Providers.tsx+++ b/src/app/Providers.tsx@@ -5,7 +5,7 @@ import { QueryClient, QueryClientProvider } from '@tanstack/react-query';import { ReactBasicsProvider } from 'react-basics';import ErrorBoundary from 'components/common/ErrorBoundary';import SettingsContext from 'app/(main)/settings/SettingsContext';-import useLocale from 'components/hooks/useLocale';+import { useLocale } from 'components/hooks';import 'chartjs-adapter-date-fns';const client = new QueryClient({diff --git a/src/app/login/LoginForm.tsx b/src/app/login/LoginForm.tsxindex 78cf3dd37..de92373cc 100644--- a/src/app/login/LoginForm.tsx+++ b/src/app/login/LoginForm.tsx@@ -10,10 +10,9 @@ import {Icon,} from 'react-basics';import { useRouter } from 'next/navigation';-import useApi from 'components/hooks/useApi';+import { useApi, useMessages } from 'components/hooks';import { setUser } from 'store/app';import { setClientAuthToken } from 'lib/client';-import useMessages from 'components/hooks/useMessages';import Logo from 'assets/logo.svg';import styles from './LoginForm.module.css';@@ -25,13 +24,13 @@ export function LoginForm() {mutationFn: (data: any) => post('/auth/login', data),});- const handleSubmit = async data => {+ const handleSubmit = async (data: any) => {mutate(data, {onSuccess: async ({ token, user }) => {setClientAuthToken(token);setUser(user);- await router.push('/dashboard');+ router.push('/dashboard');},});};diff --git a/src/app/logout/Logout.tsx b/src/app/logout/Logout.tsxindex e9da0373e..a6f43f92f 100644--- a/src/app/logout/Logout.tsx+++ b/src/app/logout/Logout.tsx@@ -1,7 +1,7 @@'use client';import { useEffect } from 'react';import { useRouter } from 'next/navigation';-import useApi from 'components/hooks/useApi';+import { useApi } from 'components/hooks';import { setUser } from 'store/app';import { removeClientAuthToken } from 'lib/client';diff --git a/src/app/not-found.tsx b/src/app/not-found.tsxindex 16c5bbcbe..7a2bbb53c 100644--- a/src/app/not-found.tsx+++ b/src/app/not-found.tsx@@ -1,6 +1,6 @@'use client';import { Flexbox } from 'react-basics';-import useMessages from 'components/hooks/useMessages';+import { useMessages } from 'components/hooks';export default function () {const { formatMessage, labels } = useMessages();diff --git a/src/app/share/[...id]/Share.tsx b/src/app/share/[...id]/Share.tsxindex 99ba64078..174f1e445 100644--- a/src/app/share/[...id]/Share.tsx+++ b/src/app/share/[...id]/Share.tsx@@ -1,6 +1,6 @@'use client';import WebsiteDetails from 'app/(main)/websites/[id]/WebsiteDetails';-import useShareToken from 'components/hooks/useShareToken';+import { useShareToken } from 'components/hooks';import styles from './Share.module.css';import Page from 'components/layout/Page';import Header from './Header';diff --git a/src/components/common/ConfirmDeleteForm.tsx b/src/components/common/ConfirmDeleteForm.tsxindex d4cbf2039..f6908a77a 100644--- a/src/components/common/ConfirmDeleteForm.tsx+++ b/src/components/common/ConfirmDeleteForm.tsx@@ -1,6 +1,6 @@import { useState } from 'react';import { Button, LoadingButton, Form, FormButtons } from 'react-basics';-import useMessages from 'components/hooks/useMessages';+import { useMessages } from 'components/hooks';export interface ConfirmDeleteFormProps {name: string;diff --git a/src/components/common/DataTable.tsx b/src/components/common/DataTable.tsxindex 00aba09c8..9ef41875a 100644--- a/src/components/common/DataTable.tsx+++ b/src/components/common/DataTable.tsx@@ -5,7 +5,7 @@ import { useMessages } from 'components/hooks';import Empty from 'components/common/Empty';import Pager from 'components/common/Pager';import styles from './DataTable.module.css';-import { FilterQueryResult } from 'components/hooks/useFilterQuery';+import { FilterQueryResult } from 'components/hooks';const DEFAULT_SEARCH_DELAY = 600;diff --git a/src/components/common/Empty.tsx b/src/components/common/Empty.tsxindex 4e2677f8f..8e7d2d00c 100644--- a/src/components/common/Empty.tsx+++ b/src/components/common/Empty.tsx@@ -1,5 +1,5 @@import classNames from 'classnames';-import useMessages from 'components/hooks/useMessages';+import { useMessages } from 'components/hooks';import styles from './Empty.module.css';export interface EmptyProps {diff --git a/src/components/common/ErrorBoundary.tsx b/src/components/common/ErrorBoundary.tsxindex 2da596e9f..6bb1f4edc 100644--- a/src/components/common/ErrorBoundary.tsx+++ b/src/components/common/ErrorBoundary.tsx@@ -2,7 +2,7 @@import { ErrorInfo, ReactNode } from 'react';import { ErrorBoundary as Boundary } from 'react-error-boundary';import { Button } from 'react-basics';-import useMessages from 'components/hooks/useMessages';+import { useMessages } from 'components/hooks';import styles from './ErrorBoundary.module.css';const logError = (error: Error, info: ErrorInfo) => {diff --git a/src/components/common/ErrorMessage.tsx b/src/components/common/ErrorMessage.tsxindex 0deb6f928..7ed8662a1 100644--- a/src/components/common/ErrorMessage.tsx+++ b/src/components/common/ErrorMessage.tsx@@ -1,6 +1,6 @@import { Icon, Icons, Text } from 'react-basics';import styles from './ErrorMessage.module.css';-import useMessages from 'components/hooks/useMessages';+import { useMessages } from 'components/hooks';export function ErrorMessage() {const { formatMessage, messages } = useMessages();diff --git a/src/components/common/FilterLink.tsx b/src/components/common/FilterLink.tsxindex bc0a4d48d..ebb9bbecf 100644--- a/src/components/common/FilterLink.tsx+++ b/src/components/common/FilterLink.tsx@@ -3,8 +3,8 @@ import { Icon, Icons } from 'react-basics';import classNames from 'classnames';import Link from 'next/link';import { safeDecodeURI } from 'next-basics';-import useNavigation from 'components/hooks/useNavigation';-import useMessages from 'components/hooks/useMessages';+import { useNavigation } from 'components/hooks';+import { useMessages } from 'components/hooks';import styles from './FilterLink.module.css';export interface FilterLinkProps {diff --git a/src/components/common/Pager.tsx b/src/components/common/Pager.tsxindex 2fe7c6dba..82292156a 100644--- a/src/components/common/Pager.tsx+++ b/src/components/common/Pager.tsx@@ -1,6 +1,6 @@import classNames from 'classnames';import { Button, Icon, Icons } from 'react-basics';-import useMessages from 'components/hooks/useMessages';+import { useMessages } from 'components/hooks';import styles from './Pager.module.css';export interface PagerProps {diff --git a/src/components/hooks/index.js b/src/components/hooks/index.jsindex b851eeb72..3370d307c 100644--- a/src/components/hooks/index.js+++ b/src/components/hooks/index.js@@ -1,5 +1,14 @@-export * from './useApi';-export * from './useConfig';+export * from './queries/useApi';+export * from './queries/useConfig';+export * from './queries/useFilterQuery';+export * from './queries/useLogin';+export * from './queries/useReport';+export * from './queries/useReports';+export * from './queries/useShareToken';+export * from './queries/useTeam';+export * from './queries/useTeamWebsites';+export * from './queries/useUser';+export * from './queries/useWebsite';export * from './useCountryNames';export * from './useDateRange';export * from './useDocumentClick';@@ -11,12 +20,6 @@ export * from './useLanguageNames';export * from './useLocale';export * from './useMessages';export * from './useNavigation';-export * from './useReport';-export * from './useReports';-export * from './useLogin';-export * from './useShareToken';export * from './useSticky';export * from './useTheme';export * from './useTimezone';-export * from './useUser';-export * from './useWebsite';diff --git a/src/components/hooks/useApi.ts b/src/components/hooks/queries/useApi.tssimilarity index 87%rename from src/components/hooks/useApi.tsrename to src/components/hooks/queries/useApi.tsindex 75a928d53..e806d37ed 100644--- a/src/components/hooks/useApi.ts+++ b/src/components/hooks/queries/useApi.ts@@ -4,7 +4,7 @@ import { getClientAuthToken } from 'lib/client';import { SHARE_TOKEN_HEADER } from 'lib/constants';import useStore from 'store/app';-const selector = state => state.shareToken;+const selector = (state: { shareToken: { token?: string } }) => state.shareToken;export function useApi() {const shareToken = useStore(selector);diff --git a/src/components/hooks/useConfig.ts b/src/components/hooks/queries/useConfig.tssimilarity index 92%rename from src/components/hooks/useConfig.tsrename to src/components/hooks/queries/useConfig.tsindex 5a516abc7..72fe095d0 100644--- a/src/components/hooks/useConfig.ts+++ b/src/components/hooks/queries/useConfig.ts@@ -1,6 +1,6 @@import { useEffect } from 'react';import useStore, { setConfig } from 'store/app';-import useApi from 'components/hooks/useApi';+import { useApi } from './useApi';let loading = false;diff --git a/src/components/hooks/useFilterQuery.ts b/src/components/hooks/queries/useFilterQuery.tssimilarity index 94%rename from src/components/hooks/useFilterQuery.tsrename to src/components/hooks/queries/useFilterQuery.tsindex 030da27da..2f7bac09a 100644--- a/src/components/hooks/useFilterQuery.ts+++ b/src/components/hooks/queries/useFilterQuery.ts@@ -1,6 +1,6 @@import { UseQueryOptions } from '@tanstack/react-query';import { useState, Dispatch, SetStateAction } from 'react';-import { useApi } from 'components/hooks/useApi';+import { useApi } from './useApi';import { FilterResult, SearchFilter } from 'lib/types';export interface FilterQueryResult<T> {diff --git a/src/components/hooks/useLogin.ts b/src/components/hooks/queries/useLogin.tssimilarity index 78%rename from src/components/hooks/useLogin.tsrename to src/components/hooks/queries/useLogin.tsindex a4ac9d3b3..ec8978b20 100644--- a/src/components/hooks/useLogin.ts+++ b/src/components/hooks/queries/useLogin.ts@@ -1,5 +1,5 @@-import useApi from 'components/hooks/useApi';-import useUser from 'components/hooks/useUser';+import useApi from './useApi';+import useUser from './useUser';export function useLogin() {const { get, useQuery } = useApi();diff --git a/src/components/hooks/useReport.ts b/src/components/hooks/queries/useReport.tssimilarity index 94%rename from src/components/hooks/useReport.tsrename to src/components/hooks/queries/useReport.tsindex 7769ed6c9..38061761d 100644--- a/src/components/hooks/useReport.ts+++ b/src/components/hooks/queries/useReport.ts@@ -1,8 +1,8 @@import { produce } from 'immer';import { useCallback, useEffect, useState } from 'react';-import { useTimezone } from './useTimezone';-import useApi from './useApi';-import useMessages from './useMessages';+import { useApi } from './useApi';+import { useTimezone } from '../useTimezone';+import { useMessages } from '../useMessages';export function useReport(reportId: string, defaultParameters: { [key: string]: any }) {const [report, setReport] = useState(null);diff --git a/src/components/hooks/useReports.ts b/src/components/hooks/queries/useReports.tssimilarity index 92%rename from src/components/hooks/useReports.tsrename to src/components/hooks/queries/useReports.tsindex d2473002d..f7842f0eb 100644--- a/src/components/hooks/useReports.ts+++ b/src/components/hooks/queries/useReports.ts@@ -1,6 +1,6 @@import { useState } from 'react';import useApi from './useApi';-import useFilterQuery from 'components/hooks/useFilterQuery';+import useFilterQuery from './useFilterQuery';export function useReports(websiteId?: string) {const [modified, setModified] = useState(Date.now());diff --git a/src/components/hooks/useShareToken.ts b/src/components/hooks/queries/useShareToken.tssimilarity index 100%rename from src/components/hooks/useShareToken.tsrename to src/components/hooks/queries/useShareToken.tsdiff --git a/src/components/hooks/queries/useTeam.ts b/src/components/hooks/queries/useTeam.tsnew file mode 100644index 000000000..e348531c6--- /dev/null+++ b/src/components/hooks/queries/useTeam.ts@@ -0,0 +1,12 @@+import useApi from './useApi';++export function useTeam(teamId: string) {+ const { get, useQuery } = useApi();+ return useQuery({+ queryKey: ['teams', teamId],+ queryFn: () => get(`/teams/${teamId}`),+ enabled: !!teamId,+ });+}++export default useTeam;diff --git a/src/components/hooks/queries/useTeamWebsites.ts b/src/components/hooks/queries/useTeamWebsites.tsnew file mode 100644index 000000000..19bcdf762--- /dev/null+++ b/src/components/hooks/queries/useTeamWebsites.ts@@ -0,0 +1,15 @@+import useApi from './useApi';+import useFilterQuery from './useFilterQuery';++export function useTeamWebsites(teamId: string) {+ const { get } = useApi();++ return useFilterQuery({+ queryKey: ['teams:websites', { teamId }],+ queryFn: (params: any) => {+ return get(`/teams/${teamId}/websites`, params);+ },+ });+}++export default useTeamWebsites;diff --git a/src/components/hooks/useUser.ts b/src/components/hooks/queries/useUser.tssimilarity index 75%rename from src/components/hooks/useUser.tsrename to src/components/hooks/queries/useUser.tsindex c5f1a8267..fb36d1bce 100644--- a/src/components/hooks/useUser.ts+++ b/src/components/hooks/queries/useUser.ts@@ -1,6 +1,6 @@import useStore, { setUser } from 'store/app';-const selector = state => state.user;+const selector = (state: { user: any }) => state.user;export function useUser() {const user = useStore(selector);diff --git a/src/components/hooks/useWebsite.ts b/src/components/hooks/queries/useWebsite.tssimilarity index 100%rename from src/components/hooks/useWebsite.tsrename to src/components/hooks/queries/useWebsite.tsdiff --git a/src/components/hooks/queries/useWebsites.ts b/src/components/hooks/queries/useWebsites.tsnew file mode 100644index 000000000..abb0ca4f2--- /dev/null+++ b/src/components/hooks/queries/useWebsites.ts@@ -0,0 +1,20 @@+import useApi from './useApi';+import useFilterQuery from './useFilterQuery';+import useCache from 'store/cache';++export function useWebsites({ userId, teamId }: { userId?: string; teamId?: string }) {+ const { get } = useApi();+ const modified = useCache((state: any) => state?.websites);++ return useFilterQuery({+ queryKey: ['websites', { userId, teamId, modified }],+ queryFn: (params: any) => {+ return get(teamId ? `/teams/${teamId}/websites` : '/websites', {+ ...params,+ });+ },+ enabled: !!(userId || teamId),+ });+}++export default useWebsites;diff --git a/src/components/hooks/useCountryNames.ts b/src/components/hooks/useCountryNames.tsindex 22f20666c..acfada442 100644--- a/src/components/hooks/useCountryNames.ts+++ b/src/components/hooks/useCountryNames.ts@@ -1,6 +1,6 @@import { useState, useEffect } from 'react';import { httpGet } from 'next-basics';-import enUS from 'public/intl/country/en-US.json';+import enUS from '../../../public/intl/country/en-US.json';const countryNames = {'en-US': enUS,diff --git a/src/components/hooks/useDateRange.ts b/src/components/hooks/useDateRange.tsindex 764c5968e..e7a31930e 100644--- a/src/components/hooks/useDateRange.ts+++ b/src/components/hooks/useDateRange.ts@@ -5,7 +5,7 @@ import websiteStore, { setWebsiteDateRange } from 'store/websites';import appStore, { setDateRange } from 'store/app';import { DateRange } from 'lib/types';import useLocale from './useLocale';-import useApi from './useApi';+import { useApi } from 'components/hooks';export function useDateRange(websiteId?: string) {const { get } = useApi();diff --git a/src/components/hooks/useLanguageNames.ts b/src/components/hooks/useLanguageNames.tsindex 3823a26bd..d4bfbf2fb 100644--- a/src/components/hooks/useLanguageNames.ts+++ b/src/components/hooks/useLanguageNames.ts@@ -1,6 +1,6 @@import { useState, useEffect } from 'react';import { httpGet } from 'next-basics';-import enUS from 'public/intl/language/en-US.json';+import enUS from '../../../public/intl/language/en-US.json';const languageNames = {'en-US': enUS,diff --git a/src/components/hooks/useLocale.ts b/src/components/hooks/useLocale.tsindex 71574d86b..88d8aaef3 100644--- a/src/components/hooks/useLocale.ts+++ b/src/components/hooks/useLocale.ts@@ -3,8 +3,8 @@ import { httpGet, setItem } from 'next-basics';import { LOCALE_CONFIG } from 'lib/constants';import { getDateLocale, getTextDirection } from 'lib/lang';import useStore, { setLocale } from 'store/app';-import useForceUpdate from 'components/hooks/useForceUpdate';-import enUS from 'public/intl/country/en-US.json';+import { useForceUpdate } from 'components/hooks';+import enUS from '../../../public/intl/country/en-US.json';const messages = {'en-US': enUS,diff --git a/src/components/hooks/useTimezone.ts b/src/components/hooks/useTimezone.tsindex fb347c4d1..3dbb52b3b 100644--- a/src/components/hooks/useTimezone.ts+++ b/src/components/hooks/useTimezone.ts@@ -7,7 +7,7 @@ export function useTimezone() {const [timezone, setTimezone] = useState(getItem(TIMEZONE_CONFIG) || getTimezone());const saveTimezone = useCallback(- value => {+ (value: string) => {setItem(TIMEZONE_CONFIG, value);setTimezone(value);},diff --git a/src/components/input/DateFilter.tsx b/src/components/input/DateFilter.tsxindex f7739f170..767f5e404 100644--- a/src/components/input/DateFilter.tsx+++ b/src/components/input/DateFilter.tsx@@ -2,8 +2,8 @@ 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 useLocale from 'components/hooks/useLocale';-import useMessages from 'components/hooks/useMessages';+import { useLocale } from 'components/hooks';+import { useMessages } from 'components/hooks';import Icons from 'components/icons';import { formatDate } from 'lib/date';diff --git a/src/components/input/LanguageButton.tsx b/src/components/input/LanguageButton.tsxindex 1151da0be..fcaa4046e 100644--- a/src/components/input/LanguageButton.tsx+++ b/src/components/input/LanguageButton.tsx@@ -1,7 +1,7 @@import { Icon, Button, PopupTrigger, Popup, Text } from 'react-basics';import classNames from 'classnames';import { languages } from 'lib/lang';-import useLocale from 'components/hooks/useLocale';+import { useLocale } from 'components/hooks';import Icons from 'components/icons';import styles from './LanguageButton.module.css';diff --git a/src/components/input/LogoutButton.tsx b/src/components/input/LogoutButton.tsxindex c787f2296..f3129207c 100644--- a/src/components/input/LogoutButton.tsx+++ b/src/components/input/LogoutButton.tsx@@ -1,6 +1,6 @@import { Button, Icon, Icons, TooltipPopup } from 'react-basics';import Link from 'next/link';-import useMessages from 'components/hooks/useMessages';+import { useMessages } from 'components/hooks';export function LogoutButton({tooltipPosition = 'top',diff --git a/src/components/input/ProfileButton.tsx b/src/components/input/ProfileButton.tsxindex 5c1d33f3a..17d2b519c 100644--- a/src/components/input/ProfileButton.tsx+++ b/src/components/input/ProfileButton.tsx@@ -1,9 +1,9 @@import { Icon, Button, PopupTrigger, Popup, Menu, Item, Text } from 'react-basics';import { useRouter } from 'next/navigation';import Icons from 'components/icons';-import useMessages from 'components/hooks/useMessages';-import useUser from 'components/hooks/useUser';-import useLocale from 'components/hooks/useLocale';+import { useMessages } from 'components/hooks';+import { useUser } from 'components/hooks';+import { useLocale } from 'components/hooks';import { CURRENT_VERSION } from 'lib/constants';import styles from './ProfileButton.module.css';diff --git a/src/components/input/RefreshButton.tsx b/src/components/input/RefreshButton.tsxindex 01e80378d..4515a5749 100644--- a/src/components/input/RefreshButton.tsx+++ b/src/components/input/RefreshButton.tsx@@ -1,8 +1,8 @@import { LoadingButton, Icon, TooltipPopup } from 'react-basics';import { setWebsiteDateRange } from 'store/websites';-import useDateRange from 'components/hooks/useDateRange';+import { useDateRange } from 'components/hooks';import Icons from 'components/icons';-import useMessages from 'components/hooks/useMessages';+import { useMessages } from 'components/hooks';export function RefreshButton({websiteId,diff --git a/src/components/input/SettingsButton.tsx b/src/components/input/SettingsButton.tsxindex 2a076d42b..eb409f3f6 100644--- a/src/components/input/SettingsButton.tsx+++ b/src/components/input/SettingsButton.tsx@@ -2,7 +2,7 @@ import { Button, Icon, PopupTrigger, Popup, Form, FormRow } from 'react-basics';import TimezoneSetting from 'app/(main)/settings/profile/TimezoneSetting';import DateRangeSetting from 'app/(main)/settings/profile/DateRangeSetting';import Icons from 'components/icons';-import useMessages from 'components/hooks/useMessages';+import { useMessages } from 'components/hooks';import styles from './SettingsButton.module.css';export function SettingsButton() {diff --git a/src/components/input/ThemeButton.tsx b/src/components/input/ThemeButton.tsxindex 76d1b3708..ece571ab6 100644--- a/src/components/input/ThemeButton.tsx+++ b/src/components/input/ThemeButton.tsx@@ -1,6 +1,6 @@import { useTransition, animated } from '@react-spring/web';import { Button, Icon } from 'react-basics';-import useTheme from 'components/hooks/useTheme';+import { useTheme } from 'components/hooks';import Icons from 'components/icons';import styles from './ThemeButton.module.css';diff --git a/src/components/input/WebsiteDateFilter.tsx b/src/components/input/WebsiteDateFilter.tsxindex cf1beaa1d..03a841467 100644--- a/src/components/input/WebsiteDateFilter.tsx+++ b/src/components/input/WebsiteDateFilter.tsx@@ -1,4 +1,4 @@-import useDateRange from 'components/hooks/useDateRange';+import { useDateRange } from 'components/hooks';import { isAfter } from 'date-fns';import { incrementDateRange } from 'lib/date';import { Button, Icon, Icons } from 'react-basics';diff --git a/src/components/input/WebsiteSelect.tsx b/src/components/input/WebsiteSelect.tsxindex 97475f187..71f961003 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 useApi from 'components/hooks/useApi';-import useMessages from 'components/hooks/useMessages';+import { useApi } from 'components/hooks';+import { useMessages } from 'components/hooks';import styles from './WebsiteSelect.module.css';import Empty from 'components/common/Empty';diff --git a/src/components/layout/Page.tsx b/src/components/layout/Page.tsxindex e32a09a3a..83312d12d 100644--- a/src/components/layout/Page.tsx+++ b/src/components/layout/Page.tsx@@ -2,7 +2,7 @@import { ReactNode } from 'react';import classNames from 'classnames';import { Banner, Loading } from 'react-basics';-import useMessages from 'components/hooks/useMessages';+import { useMessages } from 'components/hooks';import styles from './Page.module.css';export function Page({diff --git a/src/components/messages.ts b/src/components/messages.tsindex 00942b870..97cb4e1a3 100644--- a/src/components/messages.ts+++ b/src/components/messages.ts@@ -198,6 +198,7 @@ export const labels = defineMessages({id: 'label.number-of-records',defaultMessage: '{x} {x, plural, one {record} other {records}}',},+ select: { id: 'label.select', defaultMessage: 'Select' },});export const messages = defineMessages({diff --git a/src/components/metrics/ActiveUsers.tsx b/src/components/metrics/ActiveUsers.tsxindex 605d9270e..9a5ff327a 100644--- a/src/components/metrics/ActiveUsers.tsx+++ b/src/components/metrics/ActiveUsers.tsx@@ -1,7 +1,7 @@import { useMemo } from 'react';import { StatusLight } from 'react-basics';-import useApi from 'components/hooks/useApi';-import useMessages from 'components/hooks/useMessages';+import { useApi } from 'components/hooks';+import { useMessages } from 'components/hooks';import styles from './ActiveUsers.module.css';export function ActiveUsers({diff --git a/src/components/metrics/BarChart.tsx b/src/components/metrics/BarChart.tsxindex 6d28dc201..584e8b109 100644--- a/src/components/metrics/BarChart.tsx+++ b/src/components/metrics/BarChart.tsx@@ -4,8 +4,8 @@ import classNames from 'classnames';import Chart from 'chart.js/auto';import HoverTooltip from 'components/common/HoverTooltip';import Legend from 'components/metrics/Legend';-import useLocale from 'components/hooks/useLocale';-import useTheme from 'components/hooks/useTheme';+import { useLocale } from 'components/hooks';+import { useTheme } from 'components/hooks';import { DEFAULT_ANIMATION_DURATION } from 'lib/constants';import { renderNumberLabels } from 'lib/charts';import styles from './BarChart.module.css';diff --git a/src/components/metrics/BrowsersTable.tsx b/src/components/metrics/BrowsersTable.tsxindex e1c054358..c0c741cf4 100644--- a/src/components/metrics/BrowsersTable.tsx+++ b/src/components/metrics/BrowsersTable.tsx@@ -1,7 +1,7 @@import FilterLink from 'components/common/FilterLink';import MetricsTable, { MetricsTableProps } from 'components/metrics/MetricsTable';-import useMessages from 'components/hooks/useMessages';-import useFormat from 'components/hooks/useFormat';+import { useMessages } from 'components/hooks';+import { useFormat } from 'components/hooks';export function BrowsersTable(props: MetricsTableProps) {const { formatMessage, labels } = useMessages();diff --git a/src/components/metrics/CitiesTable.tsx b/src/components/metrics/CitiesTable.tsxindex 067e07e93..d275e6504 100644--- a/src/components/metrics/CitiesTable.tsx+++ b/src/components/metrics/CitiesTable.tsx@@ -1,9 +1,9 @@import MetricsTable, { MetricsTableProps } from './MetricsTable';import { emptyFilter } from 'lib/filters';import FilterLink from 'components/common/FilterLink';-import useLocale from 'components/hooks/useLocale';-import useMessages from 'components/hooks/useMessages';-import useCountryNames from 'components/hooks/useCountryNames';+import { useLocale } from 'components/hooks';+import { useMessages } from 'components/hooks';+import { useCountryNames } from 'components/hooks';export function CitiesTable(props: MetricsTableProps) {const { locale } = useLocale();diff --git a/src/components/metrics/CountriesTable.tsx b/src/components/metrics/CountriesTable.tsxindex 99f9ca2fd..e38666bfd 100644--- a/src/components/metrics/CountriesTable.tsx+++ b/src/components/metrics/CountriesTable.tsx@@ -1,5 +1,5 @@import FilterLink from 'components/common/FilterLink';-import useCountryNames from 'components/hooks/useCountryNames';+import { useCountryNames } from 'components/hooks';import { useLocale, useMessages, useFormat } from 'components/hooks';import MetricsTable, { MetricsTableProps } from './MetricsTable';diff --git a/src/components/metrics/DatePickerForm.tsx b/src/components/metrics/DatePickerForm.tsxindex b4f0781e4..892cd1276 100644--- a/src/components/metrics/DatePickerForm.tsx+++ b/src/components/metrics/DatePickerForm.tsx@@ -1,9 +1,9 @@import { useState } from 'react';import { Button, ButtonGroup, Calendar } from 'react-basics';import { isAfter, isBefore, isSameDay, startOfDay, endOfDay } from 'date-fns';-import useLocale from 'components/hooks/useLocale';+import { useLocale } from 'components/hooks';import { FILTER_DAY, FILTER_RANGE } from 'lib/constants';-import useMessages from 'components/hooks/useMessages';+import { useMessages } from 'components/hooks';import styles from './DatePickerForm.module.css';export function DatePickerForm({diff --git a/src/components/metrics/DevicesTable.tsx b/src/components/metrics/DevicesTable.tsxindex 4ebdac1b5..4df331a4b 100644--- a/src/components/metrics/DevicesTable.tsx+++ b/src/components/metrics/DevicesTable.tsx@@ -1,6 +1,6 @@import MetricsTable, { MetricsTableProps } from './MetricsTable';import FilterLink from 'components/common/FilterLink';-import useMessages from 'components/hooks/useMessages';+import { useMessages } from 'components/hooks';import { useFormat } from 'components/hooks';export function DevicesTable(props: MetricsTableProps) {diff --git a/src/components/metrics/EventsTable.tsx b/src/components/metrics/EventsTable.tsxindex 26d9529b4..c90ae9887 100644--- a/src/components/metrics/EventsTable.tsx+++ b/src/components/metrics/EventsTable.tsx@@ -1,5 +1,5 @@import MetricsTable, { MetricsTableProps } from './MetricsTable';-import useMessages from 'components/hooks/useMessages';+import { useMessages } from 'components/hooks';export function EventsTable(props: MetricsTableProps) {const { formatMessage, labels } = useMessages();diff --git a/src/components/metrics/FilterTags.tsx b/src/components/metrics/FilterTags.tsxindex 1b168a283..312008c6f 100644--- a/src/components/metrics/FilterTags.tsx+++ b/src/components/metrics/FilterTags.tsx@@ -1,8 +1,8 @@import { safeDecodeURI } from 'next-basics';import { Button, Icon, Icons, Text } from 'react-basics';-import useNavigation from 'components/hooks/useNavigation';-import useMessages from 'components/hooks/useMessages';-import useFormat from 'components/hooks/useFormat';+import { useNavigation } from 'components/hooks';+import { useMessages } from 'components/hooks';+import { useFormat } from 'components/hooks';import styles from './FilterTags.module.css';export function FilterTags({ params }) {diff --git a/src/components/metrics/LanguagesTable.tsx b/src/components/metrics/LanguagesTable.tsxindex c0d2052bb..67b6e6223 100644--- a/src/components/metrics/LanguagesTable.tsx+++ b/src/components/metrics/LanguagesTable.tsx@@ -1,8 +1,8 @@import MetricsTable, { MetricsTableProps } from './MetricsTable';import { percentFilter } from 'lib/filters';-import useLanguageNames from 'components/hooks/useLanguageNames';-import useLocale from 'components/hooks/useLocale';-import useMessages from 'components/hooks/useMessages';+import { useLanguageNames } from 'components/hooks';+import { useLocale } from 'components/hooks';+import { useMessages } from 'components/hooks';export function LanguagesTable({onDataLoad,diff --git a/src/components/metrics/Legend.tsx b/src/components/metrics/Legend.tsxindex 95e4a3d2f..6349b3d4a 100644--- a/src/components/metrics/Legend.tsx+++ b/src/components/metrics/Legend.tsx@@ -2,8 +2,8 @@ import { useEffect } from 'react';import { StatusLight } from 'react-basics';import { colord } from 'colord';import classNames from 'classnames';-import useLocale from 'components/hooks/useLocale';-import useForceUpdate from 'components/hooks/useForceUpdate';+import { useLocale } from 'components/hooks';+import { useForceUpdate } from 'components/hooks';import styles from './Legend.module.css';export function Legend({ chart }) {diff --git a/src/components/metrics/ListTable.tsx b/src/components/metrics/ListTable.tsxindex 7c66ff3c0..fa6bc6568 100644--- a/src/components/metrics/ListTable.tsx+++ b/src/components/metrics/ListTable.tsx@@ -3,7 +3,7 @@ import { useSpring, animated, config } from '@react-spring/web';import classNames from 'classnames';import Empty from 'components/common/Empty';import { formatLongNumber } from 'lib/format';-import useMessages from 'components/hooks/useMessages';+import { useMessages } from 'components/hooks';import styles from './ListTable.module.css';import { ReactNode } from 'react';diff --git a/src/components/metrics/MetricsTable.tsx b/src/components/metrics/MetricsTable.tsxindex 6c9293e12..4779c7bb3 100644--- a/src/components/metrics/MetricsTable.tsx+++ b/src/components/metrics/MetricsTable.tsx@@ -1,17 +1,17 @@import { ReactNode, useMemo, useState } from 'react';import { Loading, Icon, Text, SearchField } from 'react-basics';import classNames from 'classnames';-import useApi from 'components/hooks/useApi';+import { useApi } from 'components/hooks';import { percentFilter } from 'lib/filters';-import useDateRange from 'components/hooks/useDateRange';-import useNavigation from 'components/hooks/useNavigation';+import { useDateRange } from 'components/hooks';+import { useNavigation } from 'components/hooks';import ErrorMessage from 'components/common/ErrorMessage';import LinkButton from 'components/common/LinkButton';import ListTable, { ListTableProps } from './ListTable';import { DEFAULT_ANIMATION_DURATION } from 'lib/constants';import Icons from 'components/icons';-import useMessages from 'components/hooks/useMessages';-import useLocale from 'components/hooks/useLocale';+import { useMessages } from 'components/hooks';+import { useLocale } from 'components/hooks';import useFormat from 'components//hooks/useFormat';import styles from './MetricsTable.module.css';diff --git a/src/components/metrics/OSTable.tsx b/src/components/metrics/OSTable.tsxindex 102bafd36..d27108f19 100644--- a/src/components/metrics/OSTable.tsx+++ b/src/components/metrics/OSTable.tsx@@ -1,6 +1,6 @@import MetricsTable, { MetricsTableProps } from './MetricsTable';import FilterLink from 'components/common/FilterLink';-import useMessages from 'components/hooks/useMessages';+import { useMessages } from 'components/hooks';const names = {'Mac OS': 'macOS',diff --git a/src/components/metrics/PagesTable.tsx b/src/components/metrics/PagesTable.tsxindex 042af9c06..9b3df4187 100644--- a/src/components/metrics/PagesTable.tsx+++ b/src/components/metrics/PagesTable.tsx@@ -1,8 +1,8 @@import FilterLink from 'components/common/FilterLink';import FilterButtons from 'components/common/FilterButtons';import MetricsTable, { MetricsTableProps } from './MetricsTable';-import useMessages from 'components/hooks/useMessages';-import useNavigation from 'components/hooks/useNavigation';+import { useMessages } from 'components/hooks';+import { useNavigation } from 'components/hooks';import { emptyFilter } from 'lib/filters';export interface PagesTableProps extends MetricsTableProps {diff --git a/src/components/metrics/QueryParametersTable.tsx b/src/components/metrics/QueryParametersTable.tsxindex 904894603..f0d08ecf2 100644--- a/src/components/metrics/QueryParametersTable.tsx+++ b/src/components/metrics/QueryParametersTable.tsx@@ -4,7 +4,7 @@ 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 useMessages from 'components/hooks/useMessages';+import { useMessages } from 'components/hooks';import styles from './QueryParametersTable.module.css';const filters = {diff --git a/src/components/metrics/ReferrersTable.tsx b/src/components/metrics/ReferrersTable.tsxindex 079e6e722..0f5f5f58d 100644--- a/src/components/metrics/ReferrersTable.tsx+++ b/src/components/metrics/ReferrersTable.tsx@@ -1,6 +1,6 @@import MetricsTable, { MetricsTableProps } from './MetricsTable';import FilterLink from 'components/common/FilterLink';-import useMessages from 'components/hooks/useMessages';+import { useMessages } from 'components/hooks';export function ReferrersTable(props: MetricsTableProps) {const { formatMessage, labels } = useMessages();diff --git a/src/components/metrics/RegionsTable.tsx b/src/components/metrics/RegionsTable.tsxindex ee95d58eb..65c91f211 100644--- a/src/components/metrics/RegionsTable.tsx+++ b/src/components/metrics/RegionsTable.tsx@@ -1,8 +1,8 @@import FilterLink from 'components/common/FilterLink';import { emptyFilter } from 'lib/filters';-import useLocale from 'components/hooks/useLocale';-import useMessages from 'components/hooks/useMessages';-import useCountryNames from 'components/hooks/useCountryNames';+import { useLocale } from 'components/hooks';+import { useMessages } from 'components/hooks';+import { useCountryNames } from 'components/hooks';import MetricsTable, { MetricsTableProps } from './MetricsTable';import regions from '../../../public/iso-3166-2.json';diff --git a/src/components/metrics/ScreenTable.tsx b/src/components/metrics/ScreenTable.tsxindex 5b856cbab..51015fcbc 100644--- a/src/components/metrics/ScreenTable.tsx+++ b/src/components/metrics/ScreenTable.tsx@@ -1,5 +1,5 @@import MetricsTable, { MetricsTableProps } from './MetricsTable';-import useMessages from 'components/hooks/useMessages';+import { useMessages } from 'components/hooks';export function ScreenTable(props: MetricsTableProps) {const { formatMessage, labels } = useMessages();diff --git a/src/components/metrics/WorldMap.tsx b/src/components/metrics/WorldMap.tsxindex ed3b3ac99..31d55dd09 100644--- a/src/components/metrics/WorldMap.tsx+++ b/src/components/metrics/WorldMap.tsx@@ -4,10 +4,10 @@ import classNames from 'classnames';import { colord } from 'colord';import HoverTooltip from 'components/common/HoverTooltip';import { ISO_COUNTRIES, MAP_FILE } from 'lib/constants';-import useTheme from 'components/hooks/useTheme';-import useCountryNames from 'components/hooks/useCountryNames';-import useLocale from 'components/hooks/useLocale';-import useMessages from 'components/hooks/useMessages';+import { useTheme } from 'components/hooks';+import { useCountryNames } from 'components/hooks';+import { useLocale } from 'components/hooks';+import { useMessages } from 'components/hooks';import { formatLongNumber } from 'lib/format';import { percentFilter } from 'lib/filters';import styles from './WorldMap.module.css';diff --git a/src/index.ts b/src/index.tsindex cbcef9886..7f83248f0 100644--- a/src/index.ts+++ b/src/index.ts@@ -1,22 +1,23 @@-export * from 'components/hooks/useApi';-export * from 'components/hooks/useConfig';+export * from 'components/hooks/queries/useApi';+export * from 'components/hooks/queries/useConfig';+export * from 'components/hooks/queries/useFilterQuery';+export * from 'components/hooks/queries/useLogin';+export * from 'components/hooks/queries/useShareToken';+export * from 'components/hooks/queries/useUser';+export * from 'components/hooks/queries/useWebsite';+export * from 'components/hooks/useDateRange';export * from 'components/hooks/useDocumentClick';export * from 'components/hooks/useEscapeKey';-export * from 'components/hooks/useFilterQuery';export * from 'components/hooks/useFilters';export * from 'components/hooks/useForceUpdate';export * from 'components/hooks/useFormat';export * from 'components/hooks/useLocale';export * from 'components/hooks/useMessages';export * from 'components/hooks/useNavigation';-export * from 'components/hooks/useLogin';-export * from 'components/hooks/useShareToken';export * from 'components/hooks/useSticky';export * from 'components/hooks/useTheme';export * from 'components/hooks/useTimezone';-export * from 'components/hooks/useUser';-export * from 'components/hooks/useWebsite';export * from 'app/(main)/settings/teams/[id]/TeamEditForm';export * from 'app/(main)/settings/teams/[id]/TeamMemberRemoveButton';diff --git a/src/pages/api/teams/[id]/index.ts b/src/pages/api/teams/[id]/index.tsindex a4f80abae..8d2c2f6cf 100644--- a/src/pages/api/teams/[id]/index.ts+++ b/src/pages/api/teams/[id]/index.ts@@ -3,7 +3,7 @@ import { canDeleteTeam, canUpdateTeam, canViewTeam } from 'lib/auth';import { useAuth, useValidate } from 'lib/middleware';import { NextApiRequestQueryBody } from 'lib/types';import { NextApiResponse } from 'next';-import { methodNotAllowed, ok, unauthorized } from 'next-basics';+import { methodNotAllowed, notFound, ok, unauthorized } from 'next-basics';import { deleteTeam, getTeamById, updateTeam } from 'queries';import * as yup from 'yup';@@ -44,9 +44,13 @@ export default async (return unauthorized(res);}- const user = await getTeamById(teamId, { includeTeamUser: true });+ const team = await getTeamById(teamId, { includeTeamUser: true });- return ok(res, user);+ if (!team) {+ return notFound(res);+ }++ return ok(res, team);}if (req.method === 'POST') {