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
Refactored to use app folder.
Mike Cao9a52cdd2e11a
diff --git a/next.config.js b/next.config.jsindex cc3cde7c6..2ef1c05e5 100644--- a/next.config.js+++ b/next.config.js@@ -6,7 +6,7 @@ const pkg = require('./package.json');const contentSecurityPolicy = `default-src 'self';img-src *;- script-src 'self' 'unsafe-eval';+ script-src 'self' 'unsafe-eval' 'unsafe-inline';style-src 'self' 'unsafe-inline';connect-src 'self' api.umami.is;frame-ancestors 'self' ${process.env.ALLOWED_FRAME_URLS};@@ -74,16 +74,20 @@ if (process.env.CLOUD_MODE && process.env.CLOUD_URL && process.env.DISABLE_LOGIN});}+const basePath = process.env.BASE_PATH;++/** @type {import('next').NextConfig} */const config = {env: {- cloudMode: process.env.CLOUD_MODE,+ basePath: basePath || '',+ cloudMode: !!process.env.CLOUD_MODE,cloudUrl: process.env.CLOUD_URL,configUrl: '/config',currentVersion: pkg.version,defaultLocale: process.env.DEFAULT_LOCALE,isProduction: process.env.NODE_ENV === 'production',},- basePath: process.env.BASE_PATH,+ basePath,output: 'standalone',eslint: {ignoreDuringBuilds: true,@@ -92,11 +96,23 @@ const config = {ignoreBuildErrors: true,},webpack(config) {- config.module.rules.push({- test: /\.svg$/,- issuer: /\.{js|jsx|ts|tsx}$/,- use: ['@svgr/webpack'],- });+ const fileLoaderRule = config.module.rules.find(rule => rule.test?.test?.('.svg'));++ config.module.rules.push(+ {+ ...fileLoaderRule,+ test: /\.svg$/i,+ resourceQuery: /url/,+ },+ {+ test: /\.svg$/i,+ issuer: fileLoaderRule.issuer,+ resourceQuery: { not: [...fileLoaderRule.resourceQuery.not, /url/] },+ use: ['@svgr/webpack'],+ },+ );++ fileLoaderRule.exclude = /\.svg$/i;config.resolve.alias['public'] = path.resolve('./public');diff --git a/package.json b/package.jsonindex 79960eb23..5b005f66a 100644--- a/package.json+++ b/package.json@@ -64,7 +64,7 @@"@fontsource/inter": "^4.5.15","@prisma/client": "5.3.1","@tanstack/react-query": "^4.33.0",- "@umami/prisma-client": "^0.2.0",+ "@umami/prisma-client": "^0.3.0","@umami/redis-client": "^0.15.0","chalk": "^4.1.1","chart.js": "^4.2.1",@@ -91,7 +91,7 @@"kafkajs": "^2.1.0","maxmind": "^4.3.6","moment-timezone": "^0.5.35",- "next": "13.5.2",+ "next": "13.5.3","next-basics": "^0.36.0","node-fetch": "^3.2.8","npm-run-all": "^4.1.5",@@ -100,7 +100,7 @@"react-beautiful-dnd": "^13.1.0","react-dom": "^18.2.0","react-error-boundary": "^4.0.4",- "react-intl": "^5.24.7",+ "react-intl": "^6.4.7","react-simple-maps": "^2.3.0","react-spring": "^9.4.4","react-use-measure": "^2.0.4",@@ -123,12 +123,12 @@"@rollup/plugin-node-resolve": "^15.2.0","@rollup/plugin-replace": "^5.0.2","@svgr/rollup": "^8.1.0",- "@svgr/webpack": "^6.2.1",+ "@svgr/webpack": "^8.1.0","@types/node": "^18.11.9","@types/react": "^18.0.25","@types/react-dom": "^18.0.8",- "@typescript-eslint/eslint-plugin": "^5.50.0",- "@typescript-eslint/parser": "^5.50.0",+ "@typescript-eslint/eslint-plugin": "^6.7.3",+ "@typescript-eslint/parser": "^6.7.3","cross-env": "^7.0.3","esbuild": "^0.17.17","eslint": "^8.33.0",@@ -138,8 +138,8 @@"eslint-plugin-import": "^2.26.0","eslint-plugin-prettier": "^4.0.0","extract-react-intl-messages": "^4.1.1",- "husky": "^7.0.0",- "lint-staged": "^11.0.0",+ "husky": "^8.0.3",+ "lint-staged": "^14.0.1","postcss": "^8.4.21","postcss-flexbugs-fixes": "^5.0.2","postcss-import": "^15.1.0",diff --git a/src/app/(app)/NavBar.js b/src/app/(app)/NavBar.jsnew file mode 100644index 000000000..211adf5fb--- /dev/null+++ b/src/app/(app)/NavBar.js@@ -0,0 +1,58 @@+'use client';+import { Icon, Text } from 'react-basics';+import Link from 'next/link';+import classNames from 'classnames';+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 HamburgerButton from 'components/common/HamburgerButton';+import { usePathname } from 'next/navigation';+import styles from './NavBar.module.css';++export function NavBar() {+ const pathname = usePathname();+ const { formatMessage, labels } = useMessages();++ const links = [+ { label: formatMessage(labels.dashboard), url: '/dashboard' },+ { label: formatMessage(labels.websites), url: '/websites' },+ { label: formatMessage(labels.reports), url: '/reports' },+ { label: formatMessage(labels.settings), url: '/settings' },+ ].filter(n => n);++ return (+ <div className={styles.navbar}>+ <div className={styles.logo}>+ <Icon size="lg">+ <Icons.Logo />+ </Icon>+ <Text>umami</Text>+ </div>+ <div className={styles.links}>+ {links.map(({ url, label }) => {+ return (+ <Link+ key={url}+ href={url}+ className={classNames({ [styles.selected]: pathname.startsWith(url) })}+ >+ <Text>{label}</Text>+ </Link>+ );+ })}+ </div>+ <div className={styles.actions}>+ <ThemeButton />+ <LanguageButton />+ <ProfileButton />+ </div>+ <div className={styles.mobile}>+ <HamburgerButton />+ </div>+ </div>+ );+}++export default NavBar;diff --git a/src/components/layout/NavBar.module.css b/src/app/(app)/NavBar.module.csssimilarity index 75%rename from src/components/layout/NavBar.module.cssrename to src/app/(app)/NavBar.module.cssindex dd5085a03..fd022ecab 100644--- a/src/components/layout/NavBar.module.css+++ b/src/app/(app)/NavBar.module.css@@ -1,7 +1,7 @@.navbar {+ display: grid;+ grid-template-columns: max-content 1fr 1fr;position: relative;- display: flex;- flex-direction: row;align-items: center;height: 60px;background: var(--base75);@@ -9,17 +9,6 @@padding: 0 20px;}-.left,-.right {- display: flex;- flex-direction: row;- align-items: center;-}--.right {- justify-content: flex-end;-}-.logo {display: flex;flex-direction: row;@@ -35,29 +24,24 @@flex-direction: row;gap: 30px;padding: 0 40px;- flex: 1;font-weight: 700;+ max-height: 60px;}-.links a {- display: flex;- align-items: center;- gap: 10px;- line-height: 60px;+.links a,+.links a:active,+.links a:visited {color: var(--font-color200);+ line-height: 60px;border-bottom: 2px solid transparent;}-.links span {- white-space: nowrap;-}-.links a:hover {color: var(--font-color100);border-bottom: 2px solid var(--primary400);}-.links .selected {+.links a.selected {color: var(--font-color100);border-bottom: 2px solid var(--primary400);}@@ -68,7 +52,6 @@flex-direction: row;align-items: center;justify-content: flex-end;- min-width: 0;}.mobile {@@ -76,6 +59,10 @@}@media only screen and (max-width: 768px) {+ .navbar {+ grid-template-columns: repeat(2, 1fr);+ }+.links,.actions {display: none;diff --git a/src/app/(app)/Shell.tsx b/src/app/(app)/Shell.tsxnew file mode 100644index 000000000..980abb621--- /dev/null+++ b/src/app/(app)/Shell.tsx@@ -0,0 +1,27 @@+'use client';+import Script from 'next/script';+import { usePathname } from 'next/navigation';+import UpdateNotice from 'components/common/UpdateNotice';+import { useRequireLogin, useConfig } from 'components/hooks';++export function Shell({ children }) {+ const { user } = useRequireLogin();+ const config = useConfig();+ const pathname = usePathname();++ if (!user || !config) {+ return null;+ }++ return (+ <>+ {children}+ <UpdateNotice user={user} config={config} />+ {process.env.NODE_ENV === 'production' && !pathname.includes('/share/') && (+ <Script src={`telemetry.js`} />+ )}+ </>+ );+}++export default Shell;diff --git a/src/components/pages/console/TestConsole.js b/src/app/(app)/console/TestConsole.jssimilarity index 97%rename from src/components/pages/console/TestConsole.jsrename to src/app/(app)/console/TestConsole.jsindex 71eb27b48..d80606513 100644--- a/src/components/pages/console/TestConsole.js+++ b/src/app/(app)/console/TestConsole.js@@ -2,11 +2,11 @@ import WebsiteSelect from 'components/input/WebsiteSelect';import Page from 'components/layout/Page';import PageHeader from 'components/layout/PageHeader';import EventsChart from 'components/metrics/EventsChart';-import WebsiteChart from 'components/pages/websites/WebsiteChart';+import WebsiteChart from '../websites/[id]/WebsiteChart';import useApi from 'components/hooks/useApi';import Head from 'next/head';import Link from 'next/link';-import { useRouter } from 'next/router';+import { useRouter } from 'next/navigation';import Script from 'next/script';import { Button, Column, Row } from 'react-basics';import styles from './TestConsole.module.css';diff --git a/src/components/pages/console/TestConsole.module.css b/src/app/(app)/console/TestConsole.module.csssimilarity index 100%rename from src/components/pages/console/TestConsole.module.cssrename to src/app/(app)/console/TestConsole.module.cssdiff --git a/src/app/(app)/console/[[...id]]/page.tsx b/src/app/(app)/console/[[...id]]/page.tsxnew file mode 100644index 000000000..3eb96ee81--- /dev/null+++ b/src/app/(app)/console/[[...id]]/page.tsx@@ -0,0 +1,15 @@+import TestConsole from '../TestConsole';++async function getEnabled() {+ return !!process.env.ENABLE_TEST_CONSOLE;+}++export default async function ConsolePage() {+ const enabled = await getEnabled();++ if (!enabled) {+ return null;+ }++ return <TestConsole />;+}diff --git a/src/components/pages/dashboard/Dashboard.js b/src/app/(app)/dashboard/Dashboard.jssimilarity index 79%rename from src/components/pages/dashboard/Dashboard.jsrename to src/app/(app)/dashboard/Dashboard.jsindex 2294b8be8..6520323e4 100644--- a/src/components/pages/dashboard/Dashboard.js+++ b/src/app/(app)/dashboard/Dashboard.js@@ -1,11 +1,11 @@-import { Button, Icon, Icons, Text } from 'react-basics';+'use client';+import { Button, Icon, Icons, Loading, Text } from 'react-basics';import Link from 'next/link';-import Page from 'components/layout/Page';import PageHeader from 'components/layout/PageHeader';import Pager from 'components/common/Pager';-import WebsiteChartList from 'components/pages/websites/WebsiteChartList';-import DashboardSettingsButton from 'components/pages/dashboard/DashboardSettingsButton';-import DashboardEdit from 'components/pages/dashboard/DashboardEdit';+import WebsiteChartList from '../websites/[id]/WebsiteChartList';+import DashboardSettingsButton from 'app/(app)/dashboard/DashboardSettingsButton';+import DashboardEdit from 'app/(app)/dashboard/DashboardEdit';import EmptyPlaceholder from 'components/common/EmptyPlaceholder';import useApi from 'components/hooks/useApi';import useDashboard from 'store/dashboard';@@ -20,18 +20,18 @@ export function Dashboard() {const { get, useQuery } = useApi();const { page, handlePageChange } = useApiFilter();const pageSize = 10;- const {- data: result,- isLoading,- error,- } = useQuery(['websites', page, pageSize], () =>+ const { data: result, isLoading } = useQuery(['websites', page, pageSize], () =>get('/websites', { includeTeams: 1, page, pageSize }),);const { data, count } = result || {};const hasData = data && data?.length !== 0;+ if (isLoading) {+ return <Loading size="lg" />;+ }+return (- <Page loading={isLoading} error={error}>+ <><PageHeader title={formatMessage(labels.dashboard)}>{!editing && hasData && <DashboardSettingsButton />}</PageHeader>@@ -63,7 +63,7 @@ export function Dashboard() {)}</>)}- </Page>+ </>);}diff --git a/src/components/pages/dashboard/DashboardEdit.js b/src/app/(app)/dashboard/DashboardEdit.jssimilarity index 100%rename from src/components/pages/dashboard/DashboardEdit.jsrename to src/app/(app)/dashboard/DashboardEdit.jsdiff --git a/src/components/pages/dashboard/DashboardEdit.module.css b/src/app/(app)/dashboard/DashboardEdit.module.csssimilarity index 100%rename from src/components/pages/dashboard/DashboardEdit.module.cssrename to src/app/(app)/dashboard/DashboardEdit.module.cssdiff --git a/src/components/pages/dashboard/DashboardSettingsButton.js b/src/app/(app)/dashboard/DashboardSettingsButton.jssimilarity index 100%rename from src/components/pages/dashboard/DashboardSettingsButton.jsrename to src/app/(app)/dashboard/DashboardSettingsButton.jsdiff --git a/src/components/pages/dashboard/DashboardSettingsButton.module.css b/src/app/(app)/dashboard/DashboardSettingsButton.module.csssimilarity index 100%rename from src/components/pages/dashboard/DashboardSettingsButton.module.cssrename to src/app/(app)/dashboard/DashboardSettingsButton.module.cssdiff --git a/src/app/(app)/dashboard/page.tsx b/src/app/(app)/dashboard/page.tsxnew file mode 100644index 000000000..17a1ed011--- /dev/null+++ b/src/app/(app)/dashboard/page.tsx@@ -0,0 +1,10 @@+import Dashboard from 'app/(app)/dashboard/Dashboard';+import { Metadata } from 'next';++export default function () {+ return <Dashboard />;+}++export const metadata: Metadata = {+ title: 'Dashboard | umami',+};diff --git a/src/components/layout/AppLayout.module.css b/src/app/(app)/layout.module.csssimilarity index 100%rename from src/components/layout/AppLayout.module.cssrename to src/app/(app)/layout.module.cssdiff --git a/src/app/(app)/layout.tsx b/src/app/(app)/layout.tsxnew file mode 100644index 000000000..c579f2c4d--- /dev/null+++ b/src/app/(app)/layout.tsx@@ -0,0 +1,20 @@+'use client';+import Shell from './Shell';+import NavBar from './NavBar';+import Page from 'components/layout/Page';+import styles from './layout.module.css';++export default function AppLayout({ children }) {+ return (+ <Shell>+ <main className={styles.layout}>+ <nav className={styles.nav}>+ <NavBar />+ </nav>+ <section className={styles.body}>+ <Page>{children}</Page>+ </section>+ </main>+ </Shell>+ );+}diff --git a/src/components/pages/reports/BaseParameters.js b/src/app/(app)/reports/BaseParameters.jssimilarity index 100%rename from src/components/pages/reports/BaseParameters.jsrename to src/app/(app)/reports/BaseParameters.jsdiff --git a/src/components/pages/reports/FieldAddForm.js b/src/app/(app)/reports/FieldAddForm.jssimilarity index 100%rename from src/components/pages/reports/FieldAddForm.jsrename to src/app/(app)/reports/FieldAddForm.jsdiff --git a/src/components/pages/reports/FieldAddForm.module.css b/src/app/(app)/reports/FieldAddForm.module.csssimilarity index 100%rename from src/components/pages/reports/FieldAddForm.module.cssrename to src/app/(app)/reports/FieldAddForm.module.cssdiff --git a/src/components/pages/reports/FieldAggregateForm.js b/src/app/(app)/reports/FieldAggregateForm.jssimilarity index 100%rename from src/components/pages/reports/FieldAggregateForm.jsrename to src/app/(app)/reports/FieldAggregateForm.jsdiff --git a/src/components/pages/reports/FieldFilterForm.js b/src/app/(app)/reports/FieldFilterForm.jssimilarity index 100%rename from src/components/pages/reports/FieldFilterForm.jsrename to src/app/(app)/reports/FieldFilterForm.jsdiff --git a/src/components/pages/reports/FieldFilterForm.module.css b/src/app/(app)/reports/FieldFilterForm.module.csssimilarity index 100%rename from src/components/pages/reports/FieldFilterForm.module.cssrename to src/app/(app)/reports/FieldFilterForm.module.cssdiff --git a/src/components/pages/reports/FieldSelectForm.js b/src/app/(app)/reports/FieldSelectForm.jssimilarity index 100%rename from src/components/pages/reports/FieldSelectForm.jsrename to src/app/(app)/reports/FieldSelectForm.jsdiff --git a/src/components/pages/reports/FieldSelectForm.module.css b/src/app/(app)/reports/FieldSelectForm.module.csssimilarity index 100%rename from src/components/pages/reports/FieldSelectForm.module.cssrename to src/app/(app)/reports/FieldSelectForm.module.cssdiff --git a/src/components/pages/reports/FilterSelectForm.js b/src/app/(app)/reports/FilterSelectForm.jssimilarity index 100%rename from src/components/pages/reports/FilterSelectForm.jsrename to src/app/(app)/reports/FilterSelectForm.jsdiff --git a/src/components/pages/reports/ParameterList.js b/src/app/(app)/reports/ParameterList.jssimilarity index 100%rename from src/components/pages/reports/ParameterList.jsrename to src/app/(app)/reports/ParameterList.jsdiff --git a/src/components/pages/reports/ParameterList.module.css b/src/app/(app)/reports/ParameterList.module.csssimilarity index 100%rename from src/components/pages/reports/ParameterList.module.cssrename to src/app/(app)/reports/ParameterList.module.cssdiff --git a/src/components/pages/reports/PopupForm.js b/src/app/(app)/reports/PopupForm.jssimilarity index 100%rename from src/components/pages/reports/PopupForm.jsrename to src/app/(app)/reports/PopupForm.jsdiff --git a/src/components/pages/reports/PopupForm.module.css b/src/app/(app)/reports/PopupForm.module.csssimilarity index 100%rename from src/components/pages/reports/PopupForm.module.cssrename to src/app/(app)/reports/PopupForm.module.cssdiff --git a/src/components/pages/reports/Report.js b/src/app/(app)/reports/Report.jssimilarity index 69%rename from src/components/pages/reports/Report.jsrename to src/app/(app)/reports/Report.jsindex de17aca62..0bea18edd 100644--- a/src/components/pages/reports/Report.js+++ b/src/app/(app)/reports/Report.js@@ -1,20 +1,18 @@+'use client';import { createContext } from 'react';-import Page from 'components/layout/Page';-import styles from './reports.module.css';import { useReport } from 'components/hooks';+import styles from './Report.module.css';export const ReportContext = createContext(null);export function Report({ reportId, defaultParameters, children, ...props }) {const report = useReport(reportId, defaultParameters);- //console.log({ report });-return (<ReportContext.Provider value={{ ...report }}>- <Page {...props} className={styles.container}>+ <div {...props} className={styles.container}>{children}- </Page>+ </div></ReportContext.Provider>);}diff --git a/src/components/pages/reports/reports.module.css b/src/app/(app)/reports/Report.module.csssimilarity index 100%rename from src/components/pages/reports/reports.module.cssrename to src/app/(app)/reports/Report.module.cssdiff --git a/src/components/pages/reports/ReportBody.js b/src/app/(app)/reports/ReportBody.jssimilarity index 75%rename from src/components/pages/reports/ReportBody.jsrename to src/app/(app)/reports/ReportBody.jsindex 2310c8af8..b34b138dc 100644--- a/src/components/pages/reports/ReportBody.js+++ b/src/app/(app)/reports/ReportBody.js@@ -1,4 +1,4 @@-import styles from './reports.module.css';+import styles from './Report.module.css';export function ReportBody({ children }) {return <div className={styles.body}>{children}</div>;diff --git a/src/components/pages/reports/ReportHeader.js b/src/app/(app)/reports/ReportHeader.jssimilarity index 96%rename from src/components/pages/reports/ReportHeader.jsrename to src/app/(app)/reports/ReportHeader.jsindex 930f745b9..a182142f9 100644--- a/src/components/pages/reports/ReportHeader.js+++ b/src/app/(app)/reports/ReportHeader.js@@ -1,11 +1,11 @@import { useContext } from 'react';-import { useRouter } from 'next/router';+import { useRouter } from 'next/navigation';import { Icon, LoadingButton, InlineEditField, useToasts } from 'react-basics';import PageHeader from 'components/layout/PageHeader';import { useMessages, useApi } from 'components/hooks';import { ReportContext } from './Report';import styles from './ReportHeader.module.css';-import reportStyles from './reports.module.css';+import reportStyles from './Report.module.css';export function ReportHeader({ icon }) {const { report, updateReport } = useContext(ReportContext);diff --git a/src/components/pages/reports/ReportHeader.module.css b/src/app/(app)/reports/ReportHeader.module.csssimilarity index 100%rename from src/components/pages/reports/ReportHeader.module.cssrename to src/app/(app)/reports/ReportHeader.module.cssdiff --git a/src/components/pages/reports/ReportMenu.js b/src/app/(app)/reports/ReportMenu.jssimilarity index 75%rename from src/components/pages/reports/ReportMenu.jsrename to src/app/(app)/reports/ReportMenu.jsindex abfea6fe2..91c6fc16c 100644--- a/src/components/pages/reports/ReportMenu.js+++ b/src/app/(app)/reports/ReportMenu.js@@ -1,4 +1,4 @@-import styles from './reports.module.css';+import styles from './Report.module.css';export function ReportMenu({ children }) {return <div className={styles.menu}>{children}</div>;diff --git a/src/app/(app)/reports/ReportsHeader.js b/src/app/(app)/reports/ReportsHeader.jsnew file mode 100644index 000000000..14d8bae27--- /dev/null+++ b/src/app/(app)/reports/ReportsHeader.js@@ -0,0 +1,24 @@+'use client';+import PageHeader from 'components/layout/PageHeader';+import Link from 'next/link';+import { Button, Icon, Icons, Text } from 'react-basics';+import { useMessages } from 'components/hooks';++export function ReportsHeader() {+ const { formatMessage, labels } = useMessages();++ return (+ <PageHeader title={formatMessage(labels.reports)}>+ <Link href="/reports/create">+ <Button variant="primary">+ <Icon>+ <Icons.Plus />+ </Icon>+ <Text>{formatMessage(labels.createReport)}</Text>+ </Button>+ </Link>+ </PageHeader>+ );+}++export default ReportsHeader;diff --git a/src/app/(app)/reports/ReportsList.js b/src/app/(app)/reports/ReportsList.jsnew file mode 100644index 000000000..dc2b9f2be--- /dev/null+++ b/src/app/(app)/reports/ReportsList.js@@ -0,0 +1,37 @@+'use client';+import { useApi } from 'components/hooks';+import ReportsTable from './ReportsTable';+import useFilterQuery from 'components/hooks/useFilterQuery';+import DataTable from 'components/common/DataTable';++function useReports() {+ const { get, del, useMutation } = useApi();+ const { mutate } = useMutation(reportId => del(`/reports/${reportId}`));+ const reports = useFilterQuery(['reports'], params => get(`/reports`, params));++ const deleteReport = id => {+ mutate(id, {+ onSuccess: () => {+ reports.refetch();+ },+ });+ };++ return { reports, deleteReport };+}++export default function ReportsList() {+ const { reports, deleteReport } = useReports();++ const handleDelete = async (id, callback) => {+ await deleteReport(id);+ await reports.refetch();+ callback?.();+ };++ return (+ <DataTable {...reports.getProps()}>+ {({ data }) => <ReportsTable data={data} showDomain={true} onDelete={handleDelete} />}+ </DataTable>+ );+}diff --git a/src/components/pages/reports/ReportsTable.js b/src/app/(app)/reports/ReportsTable.jssimilarity index 100%rename from src/components/pages/reports/ReportsTable.jsrename to src/app/(app)/reports/ReportsTable.jsdiff --git a/src/app/(app)/reports/[id]/ReportDetails.js b/src/app/(app)/reports/[id]/ReportDetails.jsnew file mode 100644index 000000000..8605ffb33--- /dev/null+++ b/src/app/(app)/reports/[id]/ReportDetails.js@@ -0,0 +1,26 @@+'use client';+import FunnelReport from '../funnel/FunnelReport';+import EventDataReport from '../event-data/EventDataReport';+import InsightsReport from '../insights/InsightsReport';+import RetentionReport from '../retention/RetentionReport';+import { useApi } from 'components/hooks';++const reports = {+ funnel: FunnelReport,+ 'event-data': EventDataReport,+ insights: InsightsReport,+ retention: RetentionReport,+};++export default function ReportDetails({ reportId }) {+ const { get, useQuery } = useApi();+ const { data: report } = useQuery(['reports', reportId], () => get(`/reports/${reportId}`));++ if (!report) {+ return null;+ }++ const ReportComponent = reports[report.type];++ return <ReportComponent reportId={reportId} />;+}diff --git a/src/app/(app)/reports/[id]/page.tsx b/src/app/(app)/reports/[id]/page.tsxnew file mode 100644index 000000000..9ba87f41f--- /dev/null+++ b/src/app/(app)/reports/[id]/page.tsx@@ -0,0 +1,14 @@+import ReportDetails from './ReportDetails';+import { Metadata } from 'next';++export default function ReportDetailsPage({ params: { id } }) {+ if (!id) {+ return null;+ }++ return <ReportDetails reportId={id} />;+}++export const metadata: Metadata = {+ title: 'Reports | umami',+};diff --git a/src/components/pages/reports/ReportTemplates.js b/src/app/(app)/reports/create/ReportTemplates.jssimilarity index 96%rename from src/components/pages/reports/ReportTemplates.jsrename to src/app/(app)/reports/create/ReportTemplates.jsindex 59cc8b310..003cb3fc4 100644--- a/src/components/pages/reports/ReportTemplates.js+++ b/src/app/(app)/reports/create/ReportTemplates.js@@ -1,6 +1,6 @@+'use client';import Link from 'next/link';import { Button, Icons, Text, Icon } from 'react-basics';-import Page from 'components/layout/Page';import PageHeader from 'components/layout/PageHeader';import Funnel from 'assets/funnel.svg';import Lightbulb from 'assets/lightbulb.svg';@@ -57,7 +57,7 @@ export function ReportTemplates({ showHeader = true }) {];return (- <Page>+ <>{showHeader && <PageHeader title={formatMessage(labels.reports)} />}<div className={styles.reports}>{reports.map(({ title, description, url, icon }) => {@@ -66,7 +66,7 @@ export function ReportTemplates({ showHeader = true }) {);})}</div>- </Page>+ </>);}diff --git a/src/components/pages/reports/ReportTemplates.module.css b/src/app/(app)/reports/create/ReportTemplates.module.csssimilarity index 100%rename from src/components/pages/reports/ReportTemplates.module.cssrename to src/app/(app)/reports/create/ReportTemplates.module.cssdiff --git a/src/app/(app)/reports/create/page.tsx b/src/app/(app)/reports/create/page.tsxnew file mode 100644index 000000000..a1a761bcd--- /dev/null+++ b/src/app/(app)/reports/create/page.tsx@@ -0,0 +1,10 @@+import ReportTemplates from './ReportTemplates';+import { Metadata } from 'next';++export default function ReportsCreatePage() {+ return <ReportTemplates />;+}++export const metadata: Metadata = {+ title: 'Create Report | umami',+};diff --git a/src/components/pages/reports/event-data/EventDataParameters.js b/src/app/(app)/reports/event-data/EventDataParameters.jssimilarity index 98%rename from src/components/pages/reports/event-data/EventDataParameters.jsrename to src/app/(app)/reports/event-data/EventDataParameters.jsindex e0fadb8b8..00397ffb8 100644--- a/src/components/pages/reports/event-data/EventDataParameters.js+++ b/src/app/(app)/reports/event-data/EventDataParameters.js@@ -1,7 +1,7 @@import { useContext, useRef } from 'react';import { useApi, useMessages } from 'components/hooks';import { Form, FormRow, FormButtons, SubmitButton, PopupTrigger, Icon, Popup } from 'react-basics';-import { ReportContext } from 'components/pages/reports/Report';+import { ReportContext } from '../Report';import Empty from 'components/common/Empty';import { DATA_TYPES, REPORT_PARAMETERS } from 'lib/constants';import Icons from 'components/icons';diff --git a/src/components/pages/reports/event-data/EventDataParameters.module.css b/src/app/(app)/reports/event-data/EventDataParameters.module.csssimilarity index 100%rename from src/components/pages/reports/event-data/EventDataParameters.module.cssrename to src/app/(app)/reports/event-data/EventDataParameters.module.cssdiff --git a/src/components/pages/reports/event-data/EventDataReport.js b/src/app/(app)/reports/event-data/EventDataReport.jssimilarity index 100%rename from src/components/pages/reports/event-data/EventDataReport.jsrename to src/app/(app)/reports/event-data/EventDataReport.jsdiff --git a/src/components/pages/reports/event-data/EventDataTable.js b/src/app/(app)/reports/event-data/EventDataTable.jssimilarity index 100%rename from src/components/pages/reports/event-data/EventDataTable.jsrename to src/app/(app)/reports/event-data/EventDataTable.jsdiff --git a/src/components/pages/reports/funnel/FunnelChart.js b/src/app/(app)/reports/funnel/FunnelChart.jssimilarity index 100%rename from src/components/pages/reports/funnel/FunnelChart.jsrename to src/app/(app)/reports/funnel/FunnelChart.jsdiff --git a/src/components/pages/reports/funnel/FunnelChart.module.css b/src/app/(app)/reports/funnel/FunnelChart.module.csssimilarity index 100%rename from src/components/pages/reports/funnel/FunnelChart.module.cssrename to src/app/(app)/reports/funnel/FunnelChart.module.cssdiff --git a/src/components/pages/reports/funnel/FunnelParameters.js b/src/app/(app)/reports/funnel/FunnelParameters.jssimilarity index 97%rename from src/components/pages/reports/funnel/FunnelParameters.jsrename to src/app/(app)/reports/funnel/FunnelParameters.jsindex a3fbe6634..c8e510d81 100644--- a/src/components/pages/reports/funnel/FunnelParameters.js+++ b/src/app/(app)/reports/funnel/FunnelParameters.js@@ -13,7 +13,7 @@ import {} from 'react-basics';import Icons from 'components/icons';import UrlAddForm from './UrlAddForm';-import { ReportContext } from 'components/pages/reports/Report';+import { ReportContext } from '../Report';import BaseParameters from '../BaseParameters';import ParameterList from '../ParameterList';import PopupForm from '../PopupForm';diff --git a/src/components/pages/reports/funnel/FunnelReport.js b/src/app/(app)/reports/funnel/FunnelReport.jssimilarity index 98%rename from src/components/pages/reports/funnel/FunnelReport.jsrename to src/app/(app)/reports/funnel/FunnelReport.jsindex d2971fa30..9b50d08bf 100644--- a/src/components/pages/reports/funnel/FunnelReport.js+++ b/src/app/(app)/reports/funnel/FunnelReport.js@@ -1,3 +1,4 @@+'use client';import FunnelChart from './FunnelChart';import FunnelTable from './FunnelTable';import FunnelParameters from './FunnelParameters';diff --git a/src/components/pages/reports/funnel/FunnelReport.module.css b/src/app/(app)/reports/funnel/FunnelReport.module.csssimilarity index 100%rename from src/components/pages/reports/funnel/FunnelReport.module.cssrename to src/app/(app)/reports/funnel/FunnelReport.module.cssdiff --git a/src/components/pages/reports/funnel/FunnelTable.js b/src/app/(app)/reports/funnel/FunnelTable.jssimilarity index 100%rename from src/components/pages/reports/funnel/FunnelTable.jsrename to src/app/(app)/reports/funnel/FunnelTable.jsdiff --git a/src/components/pages/reports/funnel/UrlAddForm.js b/src/app/(app)/reports/funnel/UrlAddForm.jssimilarity index 100%rename from src/components/pages/reports/funnel/UrlAddForm.jsrename to src/app/(app)/reports/funnel/UrlAddForm.jsdiff --git a/src/components/pages/reports/funnel/UrlAddForm.module.css b/src/app/(app)/reports/funnel/UrlAddForm.module.csssimilarity index 100%rename from src/components/pages/reports/funnel/UrlAddForm.module.cssrename to src/app/(app)/reports/funnel/UrlAddForm.module.cssdiff --git a/src/app/(app)/reports/funnel/page.tsx b/src/app/(app)/reports/funnel/page.tsxnew file mode 100644index 000000000..1ce70c754--- /dev/null+++ b/src/app/(app)/reports/funnel/page.tsx@@ -0,0 +1,10 @@+import FunnelReport from './FunnelReport';+import { Metadata } from 'next';++export default function FunnelReportPage() {+ return <FunnelReport reportId={null} />;+}++export const metadata: Metadata = {+ title: 'Funnel Report | umami',+};diff --git a/src/components/pages/reports/insights/InsightsParameters.js b/src/app/(app)/reports/insights/InsightsParameters.jssimilarity index 98%rename from src/components/pages/reports/insights/InsightsParameters.jsrename to src/app/(app)/reports/insights/InsightsParameters.jsindex 3ddc0367d..a012bd07f 100644--- a/src/components/pages/reports/insights/InsightsParameters.js+++ b/src/app/(app)/reports/insights/InsightsParameters.js@@ -10,7 +10,7 @@ import {Popup,TooltipPopup,} from 'react-basics';-import { ReportContext } from 'components/pages/reports/Report';+import { ReportContext } from '../Report';import Icons from 'components/icons';import BaseParameters from '../BaseParameters';import ParameterList from '../ParameterList';diff --git a/src/components/pages/reports/insights/InsightsParameters.module.css b/src/app/(app)/reports/insights/InsightsParameters.module.csssimilarity index 100%rename from src/components/pages/reports/insights/InsightsParameters.module.cssrename to src/app/(app)/reports/insights/InsightsParameters.module.cssdiff --git a/src/components/pages/reports/insights/InsightsReport.js b/src/app/(app)/reports/insights/InsightsReport.jssimilarity index 98%rename from src/components/pages/reports/insights/InsightsReport.jsrename to src/app/(app)/reports/insights/InsightsReport.jsindex 3d855d9e8..48d610bde 100644--- a/src/components/pages/reports/insights/InsightsReport.js+++ b/src/app/(app)/reports/insights/InsightsReport.js@@ -1,3 +1,4 @@+'use client';import Report from '../Report';import ReportHeader from '../ReportHeader';import ReportMenu from '../ReportMenu';diff --git a/src/components/pages/reports/insights/InsightsTable.js b/src/app/(app)/reports/insights/InsightsTable.jssimilarity index 100%rename from src/components/pages/reports/insights/InsightsTable.jsrename to src/app/(app)/reports/insights/InsightsTable.jsdiff --git a/src/app/(app)/reports/insights/page.tsx b/src/app/(app)/reports/insights/page.tsxnew file mode 100644index 000000000..a535553c2--- /dev/null+++ b/src/app/(app)/reports/insights/page.tsx@@ -0,0 +1,10 @@+import InsightsReport from './InsightsReport';+import { Metadata } from 'next';++export default function () {+ return <InsightsReport reportId={null} />;+}++export const metadata: Metadata = {+ title: 'Insights Report | umami',+};diff --git a/src/app/(app)/reports/page.tsx b/src/app/(app)/reports/page.tsxnew file mode 100644index 000000000..101844608--- /dev/null+++ b/src/app/(app)/reports/page.tsx@@ -0,0 +1,14 @@+import ReportsHeader from './ReportsHeader';+import ReportsList from './ReportsList';++export default function ReportsPage() {+ return (+ <>+ <ReportsHeader />+ <ReportsList />+ </>+ );+}+export const metadata = {+ title: 'Reports | umami',+};diff --git a/src/components/pages/reports/retention/RetentionParameters.js b/src/app/(app)/reports/retention/RetentionParameters.jssimilarity index 95%rename from src/components/pages/reports/retention/RetentionParameters.jsrename to src/app/(app)/reports/retention/RetentionParameters.jsindex e87108d13..6abae5ac1 100644--- a/src/components/pages/reports/retention/RetentionParameters.js+++ b/src/app/(app)/reports/retention/RetentionParameters.js@@ -1,7 +1,7 @@import { useContext, useRef } from 'react';import { useMessages } from 'components/hooks';import { Form, FormButtons, FormRow, SubmitButton } from 'react-basics';-import { ReportContext } from 'components/pages/reports/Report';+import { ReportContext } from '../Report';import { MonthSelect } from 'components/input/MonthSelect';import BaseParameters from '../BaseParameters';import { parseDateRange } from 'lib/date';diff --git a/src/components/pages/reports/retention/RetentionReport.js b/src/app/(app)/reports/retention/RetentionReport.jssimilarity index 98%rename from src/components/pages/reports/retention/RetentionReport.jsrename to src/app/(app)/reports/retention/RetentionReport.jsindex a9aaeb3e7..e6a32ece5 100644--- a/src/components/pages/reports/retention/RetentionReport.js+++ b/src/app/(app)/reports/retention/RetentionReport.js@@ -1,3 +1,4 @@+'use client';import RetentionTable from './RetentionTable';import RetentionParameters from './RetentionParameters';import Report from '../Report';diff --git a/src/components/pages/reports/retention/RetentionReport.module.css b/src/app/(app)/reports/retention/RetentionReport.module.csssimilarity index 100%rename from src/components/pages/reports/retention/RetentionReport.module.cssrename to src/app/(app)/reports/retention/RetentionReport.module.cssdiff --git a/src/components/pages/reports/retention/RetentionTable.js b/src/app/(app)/reports/retention/RetentionTable.jssimilarity index 100%rename from src/components/pages/reports/retention/RetentionTable.jsrename to src/app/(app)/reports/retention/RetentionTable.jsdiff --git a/src/components/pages/reports/retention/RetentionTable.module.css b/src/app/(app)/reports/retention/RetentionTable.module.csssimilarity index 100%rename from src/components/pages/reports/retention/RetentionTable.module.cssrename to src/app/(app)/reports/retention/RetentionTable.module.cssdiff --git a/src/app/(app)/reports/retention/page.js b/src/app/(app)/reports/retention/page.jsnew file mode 100644index 000000000..55b2de2ec--- /dev/null+++ b/src/app/(app)/reports/retention/page.js@@ -0,0 +1,9 @@+import RetentionReport from './RetentionReport';++export default function () {+ return <RetentionReport reportId={null} />;+}++export const metadata = {+ title: 'Create Report | umami',+};diff --git a/src/components/layout/SideNav.js b/src/app/(app)/settings/SideNav.jssimilarity index 85%rename from src/components/layout/SideNav.jsrename to src/app/(app)/settings/SideNav.jsindex ccb6f360c..1f1ab14f8 100644--- a/src/components/layout/SideNav.js+++ b/src/app/(app)/settings/SideNav.js@@ -1,6 +1,6 @@import classNames from 'classnames';import { Menu, Item } from 'react-basics';-import { useRouter } from 'next/router';+import { usePathname } from 'next/navigation';import Link from 'next/link';import styles from './SideNav.module.css';@@ -11,13 +11,13 @@ export function SideNav({scroll = false,onSelect = () => {},}) {- const { asPath } = useRouter();+ const pathname = usePathname();return (<Menu items={items} selectedKey={selectedKey} className={styles.menu} onSelect={onSelect}>{({ key, label, url }) => (<Itemkey={key}- className={classNames(styles.item, { [styles.selected]: asPath.startsWith(url) })}+ className={classNames(styles.item, { [styles.selected]: pathname.startsWith(url) })}><Link href={url} shallow={shallow} scroll={scroll}>{label}diff --git a/src/components/layout/SideNav.module.css b/src/app/(app)/settings/SideNav.module.csssimilarity index 100%rename from src/components/layout/SideNav.module.cssrename to src/app/(app)/settings/SideNav.module.cssdiff --git a/src/components/layout/SettingsLayout.module.css b/src/app/(app)/settings/layout.module.csssimilarity index 67%rename from src/components/layout/SettingsLayout.module.cssrename to src/app/(app)/settings/layout.module.cssindex 08ff02aa6..ef31160da 100644--- a/src/components/layout/SettingsLayout.module.css+++ b/src/app/(app)/settings/layout.module.css@@ -1,6 +1,11 @@+.layout {+ display: grid;+ grid-template-columns: max-content 1fr;+ gap: 20px;+}+.menu {- display: flex;- flex-direction: column;+ width: 240px;padding-top: 40px;padding-right: 20px;}diff --git a/src/components/layout/SettingsLayout.js b/src/app/(app)/settings/layout.tsxsimilarity index 64%rename from src/components/layout/SettingsLayout.jsrename to src/app/(app)/settings/layout.tsxindex 0f4aa5d96..23323b86d 100644--- a/src/components/layout/SettingsLayout.js+++ b/src/app/(app)/settings/layout.tsx@@ -1,13 +1,13 @@-import { Row, Column } from 'react-basics';-import { useRouter } from 'next/router';-import SideNav from './SideNav';+'use client';+import { usePathname } from 'next/navigation';import useUser from 'components/hooks/useUser';import useMessages from 'components/hooks/useMessages';-import styles from './SettingsLayout.module.css';+import SideNav from './SideNav';+import styles from './layout.module.css';-export function SettingsLayout({ children }) {+export default function SettingsLayout({ children }) {const { user } = useUser();- const { pathname } = useRouter();+ const pathname = usePathname();const { formatMessage, labels } = useMessages();const cloudMode = Boolean(process.env.cloudMode);@@ -21,17 +21,13 @@ export function SettingsLayout({ children }) {const getKey = () => items.find(({ url }) => pathname === url)?.key;return (- <Row>+ <div className={styles.layout}>{!cloudMode && (- <Column className={styles.menu} defaultSize={12} md={4} lg={3} xl={2}>+ <div className={styles.menu}><SideNav items={items} shallow={true} selectedKey={getKey()} />- </Column>+ </div>)}- <Column className={styles.content} defaultSize={12} md={8} lg={9} xl={10}>- {children}- </Column>- </Row>+ <div className={styles.content}>{children}</div>+ </div>);}--export default SettingsLayout;diff --git a/src/components/pages/settings/profile/DateRangeSetting.js b/src/app/(app)/settings/profile/DateRangeSetting.jssimilarity index 100%rename from src/components/pages/settings/profile/DateRangeSetting.jsrename to src/app/(app)/settings/profile/DateRangeSetting.jsdiff --git a/src/components/pages/settings/profile/LanguageSetting.js b/src/app/(app)/settings/profile/LanguageSetting.jssimilarity index 100%rename from src/components/pages/settings/profile/LanguageSetting.jsrename to src/app/(app)/settings/profile/LanguageSetting.jsdiff --git a/src/components/pages/settings/profile/PasswordChangeButton.js b/src/app/(app)/settings/profile/PasswordChangeButton.jssimilarity index 91%rename from src/components/pages/settings/profile/PasswordChangeButton.jsrename to src/app/(app)/settings/profile/PasswordChangeButton.jsindex 81324eaab..692f6d6e5 100644--- a/src/components/pages/settings/profile/PasswordChangeButton.js+++ b/src/app/(app)/settings/profile/PasswordChangeButton.js@@ -1,5 +1,5 @@import { Button, Icon, Text, useToasts, ModalTrigger, Modal } from 'react-basics';-import PasswordEditForm from 'components/pages/settings/profile/PasswordEditForm';+import PasswordEditForm from 'app/(app)/settings/profile/PasswordEditForm';import Icons from 'components/icons';import useMessages from 'components/hooks/useMessages';diff --git a/src/components/pages/settings/profile/PasswordEditForm.js b/src/app/(app)/settings/profile/PasswordEditForm.jssimilarity index 100%rename from src/components/pages/settings/profile/PasswordEditForm.jsrename to src/app/(app)/settings/profile/PasswordEditForm.jsdiff --git a/src/app/(app)/settings/profile/ProfileHeader.js b/src/app/(app)/settings/profile/ProfileHeader.jsnew file mode 100644index 000000000..35aeb0e65--- /dev/null+++ b/src/app/(app)/settings/profile/ProfileHeader.js@@ -0,0 +1,11 @@+'use client';+import PageHeader from 'components/layout/PageHeader';+import { useMessages } from 'components/hooks';++export function ProfileHeader() {+ const { formatMessage, labels } = useMessages();++ return <PageHeader title={formatMessage(labels.profile)}></PageHeader>;+}++export default ProfileHeader;diff --git a/src/components/pages/settings/profile/ProfileDetails.js b/src/app/(app)/settings/profile/ProfileSettings.jssimilarity index 79%rename from src/components/pages/settings/profile/ProfileDetails.jsrename to src/app/(app)/settings/profile/ProfileSettings.jsindex d4a3a7d58..8510efbbd 100644--- a/src/components/pages/settings/profile/ProfileDetails.js+++ b/src/app/(app)/settings/profile/ProfileSettings.js@@ -1,14 +1,15 @@+'use client';import { Form, FormRow } from 'react-basics';-import TimezoneSetting from 'components/pages/settings/profile/TimezoneSetting';-import DateRangeSetting from 'components/pages/settings/profile/DateRangeSetting';-import LanguageSetting from 'components/pages/settings/profile/LanguageSetting';-import ThemeSetting from 'components/pages/settings/profile/ThemeSetting';+import TimezoneSetting from 'app/(app)/settings/profile/TimezoneSetting';+import DateRangeSetting from 'app/(app)/settings/profile/DateRangeSetting';+import LanguageSetting from 'app/(app)/settings/profile/LanguageSetting';+import ThemeSetting from 'app/(app)/settings/profile/ThemeSetting';import PasswordChangeButton from './PasswordChangeButton';import useUser from 'components/hooks/useUser';import useMessages from 'components/hooks/useMessages';import { ROLES } from 'lib/constants';-export function ProfileDetails() {+export function ProfileSettings() {const { user } = useUser();const { formatMessage, labels } = useMessages();const cloudMode = Boolean(process.env.cloudMode);@@ -58,4 +59,4 @@ export function ProfileDetails() {);}-export default ProfileDetails;+export default ProfileSettings;diff --git a/src/components/pages/settings/profile/ThemeSetting.js b/src/app/(app)/settings/profile/ThemeSetting.jssimilarity index 100%rename from src/components/pages/settings/profile/ThemeSetting.jsrename to src/app/(app)/settings/profile/ThemeSetting.jsdiff --git a/src/components/pages/settings/profile/ThemeSetting.module.css b/src/app/(app)/settings/profile/ThemeSetting.module.csssimilarity index 100%rename from src/components/pages/settings/profile/ThemeSetting.module.cssrename to src/app/(app)/settings/profile/ThemeSetting.module.cssdiff --git a/src/components/pages/settings/profile/TimezoneSetting.js b/src/app/(app)/settings/profile/TimezoneSetting.jssimilarity index 100%rename from src/components/pages/settings/profile/TimezoneSetting.jsrename to src/app/(app)/settings/profile/TimezoneSetting.jsdiff --git a/src/app/(app)/settings/profile/page.js b/src/app/(app)/settings/profile/page.jsnew file mode 100644index 000000000..c1ea676bc--- /dev/null+++ b/src/app/(app)/settings/profile/page.js@@ -0,0 +1,11 @@+import ProfileHeader from './ProfileHeader';+import ProfileSettings from './ProfileSettings';++export default function () {+ return (+ <>+ <ProfileHeader />+ <ProfileSettings />+ </>+ );+}diff --git a/src/components/pages/settings/teams/TeamAddForm.js b/src/app/(app)/settings/teams/TeamAddForm.jssimilarity index 100%rename from src/components/pages/settings/teams/TeamAddForm.jsrename to src/app/(app)/settings/teams/TeamAddForm.jsdiff --git a/src/app/(app)/settings/teams/TeamDeleteButton.js b/src/app/(app)/settings/teams/TeamDeleteButton.jsnew file mode 100644index 000000000..5e4a41ea0--- /dev/null+++ b/src/app/(app)/settings/teams/TeamDeleteButton.js@@ -0,0 +1,25 @@+import { Button, Icon, Icons, Modal, ModalTrigger, Text } from 'react-basics';+import useMessages from 'components/hooks/useMessages';+import TeamDeleteForm from './TeamDeleteForm';++export function TeamDeleteButton({ teamId, teamName, onDelete }) {+ const { formatMessage, labels } = useMessages();++ return (+ <ModalTrigger>+ <Button>+ <Icon>+ <Icons.Trash />+ </Icon>+ <Text>{formatMessage(labels.delete)}</Text>+ </Button>+ <Modal title={formatMessage(labels.deleteTeam)}>+ {close => (+ <TeamDeleteForm teamId={teamId} teamName={teamName} onSave={onDelete} onClose={close} />+ )}+ </Modal>+ </ModalTrigger>+ );+}++export default TeamDeleteButton;diff --git a/src/components/pages/settings/teams/TeamDeleteForm.js b/src/app/(app)/settings/teams/TeamDeleteForm.jssimilarity index 100%rename from src/components/pages/settings/teams/TeamDeleteForm.jsrename to src/app/(app)/settings/teams/TeamDeleteForm.jsdiff --git a/src/components/pages/settings/teams/TeamJoinForm.js b/src/app/(app)/settings/teams/TeamJoinForm.jssimilarity index 100%rename from src/components/pages/settings/teams/TeamJoinForm.jsrename to src/app/(app)/settings/teams/TeamJoinForm.jsdiff --git a/src/app/(app)/settings/teams/TeamLeaveButton.js b/src/app/(app)/settings/teams/TeamLeaveButton.jsnew file mode 100644index 000000000..8cc854877--- /dev/null+++ b/src/app/(app)/settings/teams/TeamLeaveButton.js@@ -0,0 +1,35 @@+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 TeamDeleteForm from './TeamLeaveForm';++export function TeamLeaveButton({ teamId, teamName, onLeave }) {+ const { formatMessage, labels } = useMessages();+ const { dir } = useLocale();+ const { user } = useUser();++ return (+ <ModalTrigger>+ <Button>+ <Icon rotate={dir === 'rtl' ? 180 : 0}>+ <Icons.ArrowRight />+ </Icon>+ <Text>{formatMessage(labels.leave)}</Text>+ </Button>+ <Modal title={formatMessage(labels.leaveTeam)}>+ {close => (+ <TeamDeleteForm+ teamId={teamId}+ userId={user.id}+ teamName={teamName}+ onSave={onLeave}+ onClose={close}+ />+ )}+ </Modal>+ </ModalTrigger>+ );+}++export default TeamLeaveButton;diff --git a/src/components/pages/settings/teams/TeamLeaveForm.js b/src/app/(app)/settings/teams/TeamLeaveForm.jssimilarity index 100%rename from src/components/pages/settings/teams/TeamLeaveForm.jsrename to src/app/(app)/settings/teams/TeamLeaveForm.jsdiff --git a/src/components/pages/settings/teams/TeamWebsiteRemoveButton.js b/src/app/(app)/settings/teams/TeamWebsiteRemoveButton.jssimilarity index 100%rename from src/components/pages/settings/teams/TeamWebsiteRemoveButton.jsrename to src/app/(app)/settings/teams/TeamWebsiteRemoveButton.jsdiff --git a/src/app/(app)/settings/teams/TeamsAddButton.js b/src/app/(app)/settings/teams/TeamsAddButton.jsnew file mode 100644index 000000000..b7850812b--- /dev/null+++ b/src/app/(app)/settings/teams/TeamsAddButton.js@@ -0,0 +1,24 @@+import { Button, Icon, Modal, ModalTrigger, Text } from 'react-basics';+import Icons from 'components/icons';+import useMessages from 'components/hooks/useMessages';+import TeamAddForm from './TeamAddForm';++export function TeamsAddButton({ onAdd }) {+ const { formatMessage, labels } = useMessages();++ return (+ <ModalTrigger>+ <Button variant="primary">+ <Icon>+ <Icons.Plus />+ </Icon>+ <Text>{formatMessage(labels.createTeam)}</Text>+ </Button>+ <Modal title={formatMessage(labels.createTeam)}>+ {close => <TeamAddForm onSave={onAdd} onClose={close} />}+ </Modal>+ </ModalTrigger>+ );+}++export default TeamsAddButton;diff --git a/src/app/(app)/settings/teams/TeamsHeader.js b/src/app/(app)/settings/teams/TeamsHeader.jsnew file mode 100644index 000000000..444f87030--- /dev/null+++ b/src/app/(app)/settings/teams/TeamsHeader.js@@ -0,0 +1,24 @@+'use client';+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 TeamsJoinButton from './TeamsJoinButton';+import TeamsAddButton from './TeamsAddButton';++export function TeamsHeader() {+ const { formatMessage, labels } = useMessages();+ const { user } = useUser();++ return (+ <PageHeader title={formatMessage(labels.teams)}>+ <Flexbox gap={10}>+ <TeamsJoinButton />+ {user.role !== ROLES.viewOnly && <TeamsAddButton />}+ </Flexbox>+ </PageHeader>+ );+}++export default TeamsHeader;diff --git a/src/app/(app)/settings/teams/TeamsJoinButton.js b/src/app/(app)/settings/teams/TeamsJoinButton.jsnew file mode 100644index 000000000..f8d2fa238--- /dev/null+++ b/src/app/(app)/settings/teams/TeamsJoinButton.js@@ -0,0 +1,29 @@+import { Button, Icon, Modal, ModalTrigger, Text, useToasts } from 'react-basics';+import Icons from 'components/icons';+import useMessages from 'components/hooks/useMessages';+import TeamJoinForm from './TeamJoinForm';++export function TeamsJoinButton() {+ const { formatMessage, labels, messages } = useMessages();+ const { showToast } = useToasts();++ const handleJoin = () => {+ showToast({ message: formatMessage(messages.saved), variant: 'success' });+ };++ return (+ <ModalTrigger>+ <Button variant="secondary">+ <Icon>+ <Icons.AddUser />+ </Icon>+ <Text>{formatMessage(labels.joinTeam)}</Text>+ </Button>+ <Modal title={formatMessage(labels.joinTeam)}>+ {close => <TeamJoinForm onSave={handleJoin} onClose={close} />}+ </Modal>+ </ModalTrigger>+ );+}++export default TeamsJoinButton;diff --git a/src/app/(app)/settings/teams/TeamsList.js b/src/app/(app)/settings/teams/TeamsList.jsnew file mode 100644index 000000000..78e0c2992--- /dev/null+++ b/src/app/(app)/settings/teams/TeamsList.js@@ -0,0 +1,19 @@+'use client';+import DataTable from 'components/common/DataTable';+import TeamsTable from 'app/(app)/settings/teams/TeamsTable';+import useApi from 'components/hooks/useApi';+import useFilterQuery from 'components/hooks/useFilterQuery';++export function TeamsList() {+ const { get } = useApi();+ const filterQuery = useFilterQuery(['teams'], params => {+ return get(`/teams`, {+ ...params,+ });+ });+ const { getProps } = filterQuery;++ return <DataTable {...getProps()}>{({ data }) => <TeamsTable data={data} />}</DataTable>;+}++export default TeamsList;diff --git a/src/app/(app)/settings/teams/TeamsTable.js b/src/app/(app)/settings/teams/TeamsTable.jsnew file mode 100644index 000000000..2254e5f7f--- /dev/null+++ b/src/app/(app)/settings/teams/TeamsTable.js@@ -0,0 +1,46 @@+'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, Flexbox, GridColumn, GridTable, Icon, Icons, Text } from 'react-basics';+import TeamDeleteButton from './TeamDeleteButton';+import TeamLeaveButton from './TeamLeaveButton';++export function TeamsTable({ data = [] }) {+ const { formatMessage, labels } = useMessages();+ const { user } = useUser();++ return (+ <GridTable data={data}>+ <GridColumn name="name" label={formatMessage(labels.name)} />+ <GridColumn name="owner" label={formatMessage(labels.owner)}>+ {row => row.teamUser.find(({ role }) => role === ROLES.teamOwner)?.user?.username}+ </GridColumn>+ <GridColumn name="action" label=" " alignment="end">+ {row => {+ const { id, name, teamUser } = row;+ const owner = teamUser.find(({ role }) => role === ROLES.teamOwner);+ const showDelete = user.id === owner?.userId;++ return (+ <Flexbox gap={10}>+ <Link href={`/settings/teams/${id}`}>+ <Button>+ <Icon>+ <Icons.Edit />+ </Icon>+ <Text>{formatMessage(labels.view)}</Text>+ </Button>+ </Link>+ {showDelete && <TeamDeleteButton teamId={id} teamName={name} />}+ {!showDelete && <TeamLeaveButton teamId={id} teamName={name} />}+ </Flexbox>+ );+ }}+ </GridColumn>+ </GridTable>+ );+}++export default TeamsTable;diff --git a/src/components/pages/settings/teams/WebsiteTags.js b/src/app/(app)/settings/teams/WebsiteTags.jssimilarity index 100%rename from src/components/pages/settings/teams/WebsiteTags.jsrename to src/app/(app)/settings/teams/WebsiteTags.jsdiff --git a/src/components/pages/settings/teams/WebsiteTags.module.css b/src/app/(app)/settings/teams/WebsiteTags.module.csssimilarity index 100%rename from src/components/pages/settings/teams/WebsiteTags.module.cssrename to src/app/(app)/settings/teams/WebsiteTags.module.cssdiff --git a/src/components/pages/settings/teams/TeamAddWebsiteForm.js b/src/app/(app)/settings/teams/[id]/TeamAddWebsiteForm.jssimilarity index 98%rename from src/components/pages/settings/teams/TeamAddWebsiteForm.jsrename to src/app/(app)/settings/teams/[id]/TeamAddWebsiteForm.jsindex 23e3e1360..503ad1110 100644--- a/src/components/pages/settings/teams/TeamAddWebsiteForm.js+++ b/src/app/(app)/settings/teams/[id]/TeamAddWebsiteForm.js@@ -1,7 +1,7 @@import useApi from 'components/hooks/useApi';import { useRef, useState } from 'react';import { Button, Dropdown, Form, FormButtons, FormRow, Item, SubmitButton } from 'react-basics';-import WebsiteTags from './WebsiteTags';+import WebsiteTags from '../WebsiteTags';import useMessages from 'components/hooks/useMessages';export function TeamAddWebsiteForm({ teamId, onSave, onClose }) {diff --git a/src/components/pages/settings/teams/TeamEditForm.js b/src/app/(app)/settings/teams/[id]/TeamEditForm.jssimilarity index 100%rename from src/components/pages/settings/teams/TeamEditForm.jsrename to src/app/(app)/settings/teams/[id]/TeamEditForm.jsdiff --git a/src/components/pages/settings/teams/TeamMemberRemoveButton.js b/src/app/(app)/settings/teams/[id]/TeamMemberRemoveButton.jssimilarity index 100%rename from src/components/pages/settings/teams/TeamMemberRemoveButton.jsrename to src/app/(app)/settings/teams/[id]/TeamMemberRemoveButton.jsdiff --git a/src/components/pages/settings/teams/TeamMembers.js b/src/app/(app)/settings/teams/[id]/TeamMembers.jssimilarity index 94%rename from src/components/pages/settings/teams/TeamMembers.jsrename to src/app/(app)/settings/teams/[id]/TeamMembers.jsindex 207ad72d4..6e29f0cf3 100644--- a/src/components/pages/settings/teams/TeamMembers.js+++ b/src/app/(app)/settings/teams/[id]/TeamMembers.js@@ -1,8 +1,8 @@import { Loading, useToasts } from 'react-basics';-import TeamMembersTable from 'components/pages/settings/teams/TeamMembersTable';import useApi from 'components/hooks/useApi';import useMessages from 'components/hooks/useMessages';import useApiFilter from 'components/hooks/useApiFilter';+import TeamMembersTable from './TeamMembersTable';export function TeamMembers({ teamId, readOnly }) {const { showToast } = useToasts();diff --git a/src/components/pages/settings/teams/TeamMembersTable.js b/src/app/(app)/settings/teams/[id]/TeamMembersTable.jssimilarity index 100%rename from src/components/pages/settings/teams/TeamMembersTable.jsrename to src/app/(app)/settings/teams/[id]/TeamMembersTable.jsdiff --git a/src/components/pages/settings/teams/TeamSettings.js b/src/app/(app)/settings/teams/[id]/TeamSettings.jssimilarity index 92%rename from src/components/pages/settings/teams/TeamSettings.jsrename to src/app/(app)/settings/teams/[id]/TeamSettings.jsindex 8c4fe8f49..7c38430de 100644--- a/src/components/pages/settings/teams/TeamSettings.js+++ b/src/app/(app)/settings/teams/[id]/TeamSettings.js@@ -1,6 +1,6 @@+'use client';import { useEffect, useState } from 'react';-import { Item, Tabs, useToasts } from 'react-basics';-import Page from 'components/layout/Page';+import { Item, Loading, Tabs, useToasts } from 'react-basics';import PageHeader from 'components/layout/PageHeader';import { ROLES } from 'lib/constants';import useUser from 'components/hooks/useUser';@@ -41,8 +41,12 @@ export function TeamSettings({ teamId }) {}}, [data]);+ if (isLoading || !values) {+ return <Loading />;+ }+return (- <Page loading={isLoading || !values}>+ <><PageHeader title={values?.name} /><Tabs selectedKey={tab} onSelect={setTab} style={{ marginBottom: 30 }}><Item key="details">{formatMessage(labels.details)}</Item>@@ -54,7 +58,7 @@ export function TeamSettings({ teamId }) {)}{tab === 'members' && <TeamMembers teamId={teamId} readOnly={!canEdit} />}{tab === 'websites' && <TeamWebsites teamId={teamId} readOnly={!canEdit} />}- </Page>+ </>);}diff --git a/src/components/pages/settings/teams/TeamWebsites.js b/src/app/(app)/settings/teams/[id]/TeamWebsites.jssimilarity index 92%rename from src/components/pages/settings/teams/TeamWebsites.jsrename to src/app/(app)/settings/teams/[id]/TeamWebsites.jsindex 27fe2f852..f7d67860c 100644--- a/src/components/pages/settings/teams/TeamWebsites.js+++ b/src/app/(app)/settings/teams/[id]/TeamWebsites.js@@ -9,8 +9,8 @@ import {Text,useToasts,} from 'react-basics';-import TeamWebsitesTable from 'components/pages/settings/teams/TeamWebsitesTable';-import TeamAddWebsiteForm from 'components/pages/settings/teams/TeamAddWebsiteForm';+import TeamWebsitesTable from './TeamWebsitesTable';+import TeamAddWebsiteForm from './TeamAddWebsiteForm';import useApi from 'components/hooks/useApi';import useMessages from 'components/hooks/useMessages';import useApiFilter from 'components/hooks/useApiFilter';diff --git a/src/components/pages/settings/teams/TeamWebsitesTable.js b/src/app/(app)/settings/teams/[id]/TeamWebsitesTable.jssimilarity index 96%rename from src/components/pages/settings/teams/TeamWebsitesTable.jsrename to src/app/(app)/settings/teams/[id]/TeamWebsitesTable.jsindex 5ce08f355..47d3af41f 100644--- a/src/components/pages/settings/teams/TeamWebsitesTable.js+++ b/src/app/(app)/settings/teams/[id]/TeamWebsitesTable.js@@ -2,7 +2,7 @@ import useMessages from 'components/hooks/useMessages';import useUser from 'components/hooks/useUser';import Link from 'next/link';import { Button, Icon, Icons, Text } from 'react-basics';-import TeamWebsiteRemoveButton from './TeamWebsiteRemoveButton';+import TeamWebsiteRemoveButton from '../TeamWebsiteRemoveButton';import SettingsTable from 'components/common/SettingsTable';export function TeamWebsitesTable({diff --git a/src/app/(app)/settings/teams/[id]/page.js b/src/app/(app)/settings/teams/[id]/page.jsnew file mode 100644index 000000000..652e65c14--- /dev/null+++ b/src/app/(app)/settings/teams/[id]/page.js@@ -0,0 +1,9 @@+import TeamSettings from './TeamSettings';++export default function ({ params }) {+ if (process.env.cloudMode) {+ return null;+ }++ return <TeamSettings teamId={params.id} />;+}diff --git a/src/app/(app)/settings/teams/page.js b/src/app/(app)/settings/teams/page.jsnew file mode 100644index 000000000..606c45728--- /dev/null+++ b/src/app/(app)/settings/teams/page.js@@ -0,0 +1,15 @@+import TeamsList from 'app/(app)/settings/teams/TeamsList';+import TeamsHeader from './TeamsHeader';++export default function () {+ if (process.env.cloudMode) {+ return null;+ }++ return (+ <>+ <TeamsHeader />+ <TeamsList />+ </>+ );+}diff --git a/src/components/pages/settings/users/UserAddButton.js b/src/app/(app)/settings/users/UserAddButton.jssimilarity index 100%rename from src/components/pages/settings/users/UserAddButton.jsrename to src/app/(app)/settings/users/UserAddButton.jsdiff --git a/src/components/pages/settings/users/UserAddForm.js b/src/app/(app)/settings/users/UserAddForm.jssimilarity index 100%rename from src/components/pages/settings/users/UserAddForm.jsrename to src/app/(app)/settings/users/UserAddForm.jsdiff --git a/src/app/(app)/settings/users/UserDeleteButton.js b/src/app/(app)/settings/users/UserDeleteButton.jsnew file mode 100644index 000000000..22d931713--- /dev/null+++ b/src/app/(app)/settings/users/UserDeleteButton.js@@ -0,0 +1,27 @@+import { Button, Icon, Icons, Modal, ModalTrigger, Text } from 'react-basics';+import useMessages from 'components/hooks/useMessages';+import useUser from 'components/hooks/useUser';+import UserDeleteForm from './UserDeleteForm';++export function UserDeleteButton({ userId, username, onDelete }) {+ const { formatMessage, labels } = useMessages();+ const { user } = useUser();++ return (+ <ModalTrigger disabled={userId === user?.id}>+ <Button disabled={userId === user?.id}>+ <Icon>+ <Icons.Trash />+ </Icon>+ <Text>{formatMessage(labels.delete)}</Text>+ </Button>+ <Modal title={formatMessage(labels.deleteUser)}>+ {close => (+ <UserDeleteForm userId={userId} username={username} onSave={onDelete} onClose={close} />+ )}+ </Modal>+ </ModalTrigger>+ );+}++export default UserDeleteButton;diff --git a/src/components/pages/settings/users/UserDeleteForm.js b/src/app/(app)/settings/users/UserDeleteForm.jssimilarity index 100%rename from src/components/pages/settings/users/UserDeleteForm.jsrename to src/app/(app)/settings/users/UserDeleteForm.jsdiff --git a/src/components/pages/settings/users/UserEditForm.js b/src/app/(app)/settings/users/UserEditForm.jssimilarity index 100%rename from src/components/pages/settings/users/UserEditForm.jsrename to src/app/(app)/settings/users/UserEditForm.jsdiff --git a/src/components/pages/settings/users/UserWebsites.js b/src/app/(app)/settings/users/UserWebsites.jssimilarity index 92%rename from src/components/pages/settings/users/UserWebsites.jsrename to src/app/(app)/settings/users/UserWebsites.jsindex 14127275f..f88ec78a3 100644--- a/src/components/pages/settings/users/UserWebsites.js+++ b/src/app/(app)/settings/users/UserWebsites.js@@ -1,6 +1,6 @@import Page from 'components/layout/Page';import useApi from 'components/hooks/useApi';-import WebsitesTable from 'components/pages/settings/websites/WebsitesTable';+import WebsitesTable from 'app/(app)/settings/websites/WebsitesTable';import useApiFilter from 'components/hooks/useApiFilter';export function UserWebsites({ userId }) {diff --git a/src/app/(app)/settings/users/UsersHeader.js b/src/app/(app)/settings/users/UsersHeader.jsnew file mode 100644index 000000000..caf1f913f--- /dev/null+++ b/src/app/(app)/settings/users/UsersHeader.js@@ -0,0 +1,16 @@+'use client';+import PageHeader from 'components/layout/PageHeader';+import useMessages from 'components/hooks/useMessages';+import UserAddButton from './UserAddButton';++export function UsersHeader({ onAdd }) {+ const { formatMessage, labels } = useMessages();++ return (+ <PageHeader title={formatMessage(labels.users)}>+ <UserAddButton onSave={onAdd} />+ </PageHeader>+ );+}++export default UsersHeader;diff --git a/src/app/(app)/settings/users/UsersList.js b/src/app/(app)/settings/users/UsersList.jsnew file mode 100644index 000000000..0bb908963--- /dev/null+++ b/src/app/(app)/settings/users/UsersList.js@@ -0,0 +1,25 @@+'use client';+import useApi from 'components/hooks/useApi';+import useFilterQuery from 'components/hooks/useFilterQuery';+import DataTable from 'components/common/DataTable';+import UsersTable from './UsersTable';+import UsersHeader from './UsersHeader';++export function UsersList() {+ const { get } = useApi();+ const filterQuery = useFilterQuery(['users'], params => {+ return get(`/users`, {+ ...params,+ });+ });+ const { getProps } = filterQuery;++ return (+ <>+ <UsersHeader />+ <DataTable {...getProps()}>{({ data }) => <UsersTable data={data} />}</DataTable>+ </>+ );+}++export default UsersList;diff --git a/src/app/(app)/settings/users/UsersTable.js b/src/app/(app)/settings/users/UsersTable.jsnew file mode 100644index 000000000..16cf065a0--- /dev/null+++ b/src/app/(app)/settings/users/UsersTable.js@@ -0,0 +1,57 @@+import { Button, Text, Icon, Icons, GridTable, GridColumn, Flexbox } from 'react-basics';+import { 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 UserDeleteButton from './UserDeleteButton';++export function UsersTable({ data = [] }) {+ const { formatMessage, labels } = useMessages();+ const { dateLocale } = useLocale();++ return (+ <GridTable data={data}>+ <GridColumn+ name="username"+ label={formatMessage(labels.username)}+ width={'minmax(200px, 2fr)'}+ />+ <GridColumn name="role" label={formatMessage(labels.role)}>+ {row =>+ formatMessage(+ labels[Object.keys(ROLES).find(key => ROLES[key] === row.role)] || labels.unknown,+ )+ }+ </GridColumn>+ <GridColumn name="created" label={formatMessage(labels.created)}>+ {row =>+ formatDistance(new Date(row.createdAt), new Date(), {+ addSuffix: true,+ locale: dateLocale,+ })+ }+ </GridColumn>+ <GridColumn name="action" label=" " alignment="end">+ {row => {+ const { id, username } = row;+ return (+ <Flexbox gap={10}>+ <Link href={`/settings/users/${id}`}>+ <Button>+ <Icon>+ <Icons.Edit />+ </Icon>+ <Text>{formatMessage(labels.edit)}</Text>+ </Button>+ </Link>+ <UserDeleteButton userId={id} username={username} />+ </Flexbox>+ );+ }}+ </GridColumn>+ </GridTable>+ );+}++export default UsersTable;diff --git a/src/components/pages/settings/users/UserSettings.js b/src/app/(app)/settings/users/[id]/UserSettings.jssimilarity index 84%rename from src/components/pages/settings/users/UserSettings.jsrename to src/app/(app)/settings/users/[id]/UserSettings.jsindex 5fadf1a17..ea340ab79 100644--- a/src/components/pages/settings/users/UserSettings.js+++ b/src/app/(app)/settings/users/[id]/UserSettings.js@@ -1,10 +1,10 @@+'use client';import { useEffect, useState } from 'react';-import { Item, Tabs, useToasts } from 'react-basics';-import UserEditForm from 'components/pages/settings/users/UserEditForm';-import Page from 'components/layout/Page';+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 UserWebsites from './UserWebsites';+import UserWebsites from '../UserWebsites';import useMessages from 'components/hooks/useMessages';export function UserSettings({ userId }) {@@ -41,8 +41,12 @@ export function UserSettings({ userId }) {}}, [data]);+ if (isLoading || !values) {+ return <Loading size="lg" />;+ }+return (- <Page loading={isLoading || !values}>+ <><PageHeader title={values?.username} /><Tabs selectedKey={tab} onSelect={setTab} style={{ marginBottom: 30, fontSize: 14 }}><Item key="details">{formatMessage(labels.details)}</Item>@@ -50,7 +54,7 @@ export function UserSettings({ userId }) {</Tabs>{tab === 'details' && <UserEditForm userId={userId} data={values} onSave={handleSave} />}{tab === 'websites' && <UserWebsites userId={userId} />}- </Page>+ </>);}diff --git a/src/app/(app)/settings/users/[id]/page.js b/src/app/(app)/settings/users/[id]/page.jsnew file mode 100644index 000000000..7a6378aa4--- /dev/null+++ b/src/app/(app)/settings/users/[id]/page.js@@ -0,0 +1,9 @@+import UserSettings from './UserSettings';++export default function ({ params }) {+ if (process.env.cloudMode) {+ return null;+ }++ return <UserSettings userId={params.id} />;+}diff --git a/src/app/(app)/settings/users/page.tsx b/src/app/(app)/settings/users/page.tsxnew file mode 100644index 000000000..25545083c--- /dev/null+++ b/src/app/(app)/settings/users/page.tsx@@ -0,0 +1,13 @@+import UsersList from 'app/(app)/settings/users/UsersList';+import { Metadata } from 'next';++export default function () {+ if (process.env.cloudMode) {+ return null;+ }++ return <UsersList />;+}+export const metadata: Metadata = {+ title: 'Users | umami',+};diff --git a/src/app/(app)/settings/websites/WebsiteAddButton.js b/src/app/(app)/settings/websites/WebsiteAddButton.jsnew file mode 100644index 000000000..1e9dff137--- /dev/null+++ b/src/app/(app)/settings/websites/WebsiteAddButton.js@@ -0,0 +1,29 @@+import { Button, Icon, Icons, Modal, ModalTrigger, Text, useToasts } from 'react-basics';+import WebsiteAddForm from './WebsiteAddForm';+import useMessages from 'components/hooks/useMessages';++export function WebsiteAddButton({ onSave }) {+ const { formatMessage, labels, messages } = useMessages();+ const { showToast } = useToasts();++ const handleSave = async () => {+ showToast({ message: formatMessage(messages.saved), variant: 'success' });+ onSave?.();+ };++ return (+ <ModalTrigger>+ <Button variant="primary">+ <Icon>+ <Icons.Plus />+ </Icon>+ <Text>{formatMessage(labels.addWebsite)}</Text>+ </Button>+ <Modal title={formatMessage(labels.addWebsite)}>+ {close => <WebsiteAddForm onSave={handleSave} onClose={close} />}+ </Modal>+ </ModalTrigger>+ );+}++export default WebsiteAddButton;diff --git a/src/components/pages/settings/websites/WebsiteAddForm.js b/src/app/(app)/settings/websites/WebsiteAddForm.jssimilarity index 100%rename from src/components/pages/settings/websites/WebsiteAddForm.jsrename to src/app/(app)/settings/websites/WebsiteAddForm.jsdiff --git a/src/components/pages/settings/websites/WebsiteSettings.js b/src/app/(app)/settings/websites/WebsiteSettings.jssimilarity index 80%rename from src/components/pages/settings/websites/WebsiteSettings.jsrename to src/app/(app)/settings/websites/WebsiteSettings.jsindex 63e898148..71d5fe233 100644--- a/src/components/pages/settings/websites/WebsiteSettings.js+++ b/src/app/(app)/settings/websites/WebsiteSettings.js@@ -1,13 +1,13 @@+'use client';import { useEffect, useState } from 'react';import { Item, Tabs, useToasts, Button, Text, Icon, Icons } from 'react-basics';-import { useRouter } from 'next/router';+import { useRouter } from 'next/navigation';import Link from 'next/link';-import Page from 'components/layout/Page';import PageHeader from 'components/layout/PageHeader';-import WebsiteEditForm from 'components/pages/settings/websites/WebsiteEditForm';-import WebsiteData from 'components/pages/settings/websites/WebsiteData';-import TrackingCode from 'components/pages/settings/websites/TrackingCode';-import ShareUrl from 'components/pages/settings/websites/ShareUrl';+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';@@ -16,11 +16,10 @@ export function WebsiteSettings({ websiteId, openExternal = false, analyticsUrlconst { formatMessage, labels, messages } = useMessages();const { get, useQuery } = useApi();const { showToast } = useToasts();- const { data, isLoading } = useQuery(- ['website', websiteId],- () => get(`/websites/${websiteId}`),- { enabled: !!websiteId, cacheTime: 0 },- );+ const { data } = useQuery(['website', websiteId], () => get(`/websites/${websiteId}`), {+ enabled: !!websiteId,+ cacheTime: 0,+ });const [values, setValues] = useState(null);const [tab, setTab] = useState('details');@@ -48,7 +47,7 @@ export function WebsiteSettings({ websiteId, openExternal = false, analyticsUrl}, [data]);return (- <Page loading={isLoading || !values}>+ <><PageHeader title={values?.name}><Link href={`/websites/${websiteId}`} target={openExternal ? '_blank' : null}><Button variant="primary">@@ -78,7 +77,7 @@ export function WebsiteSettings({ websiteId, openExternal = false, analyticsUrl/>)}{tab === 'data' && <WebsiteData websiteId={websiteId} onSave={handleReset} />}- </Page>+ </>);}diff --git a/src/app/(app)/settings/websites/WebsitesHeader.js b/src/app/(app)/settings/websites/WebsitesHeader.jsnew file mode 100644index 000000000..6ce58d1ef--- /dev/null+++ b/src/app/(app)/settings/websites/WebsitesHeader.js@@ -0,0 +1,16 @@+'use client';+import useMessages from 'components/hooks/useMessages';+import PageHeader from 'components/layout/PageHeader';+import WebsiteAddButton from './WebsiteAddButton';++export function WebsitesHeader() {+ const { formatMessage, labels } = useMessages();++ return (+ <PageHeader title={formatMessage(labels.websites)}>+ {!process.env.cloudMode && <WebsiteAddButton />}+ </PageHeader>+ );+}++export default WebsitesHeader;diff --git a/src/app/(app)/settings/websites/WebsitesList.js b/src/app/(app)/settings/websites/WebsitesList.jsnew file mode 100644index 000000000..45f839ecc--- /dev/null+++ b/src/app/(app)/settings/websites/WebsitesList.js@@ -0,0 +1,43 @@+'use client';+import WebsitesTable from 'app/(app)/settings/websites/WebsitesTable';+import useUser from 'components/hooks/useUser';+import useApi from 'components/hooks/useApi';+import DataTable from 'components/common/DataTable';+import useFilterQuery from 'components/hooks/useFilterQuery';+import WebsitesHeader from './WebsitesHeader';++export function WebsitesList({+ showHeader = true,+ showEditButton = true,+ showTeam,+ includeTeams,+ onlyTeams,+}) {+ const { user } = useUser();+ const { get } = useApi();+ const filterQuery = useFilterQuery(+ ['websites', { includeTeams, onlyTeams }],+ params => {+ return get(`/users/${user?.id}/websites`, {+ includeTeams,+ onlyTeams,+ ...params,+ });+ },+ { enabled: !!user },+ );+ const { getProps } = filterQuery;++ return (+ <>+ {showHeader && <WebsitesHeader />}+ <DataTable {...getProps()}>+ {({ data }) => (+ <WebsitesTable data={data} showTeam={showTeam} showEditButton={showEditButton} />+ )}+ </DataTable>+ </>+ );+}++export default WebsitesList;diff --git a/src/components/pages/websites/WebsiteList.module.css b/src/app/(app)/settings/websites/WebsitesList.module.csssimilarity index 100%rename from src/components/pages/websites/WebsiteList.module.cssrename to src/app/(app)/settings/websites/WebsitesList.module.cssdiff --git a/src/components/pages/settings/websites/WebsitesTable.js b/src/app/(app)/settings/websites/WebsitesTable.jssimilarity index 100%rename from src/components/pages/settings/websites/WebsitesTable.jsrename to src/app/(app)/settings/websites/WebsitesTable.jsdiff --git a/src/components/pages/settings/websites/WebsitesTable.module.css b/src/app/(app)/settings/websites/WebsitesTable.module.csssimilarity index 100%rename from src/components/pages/settings/websites/WebsitesTable.module.cssrename to src/app/(app)/settings/websites/WebsitesTable.module.cssdiff --git a/src/components/pages/settings/websites/ShareUrl.js b/src/app/(app)/settings/websites/[id]/ShareUrl.jssimilarity index 91%rename from src/components/pages/settings/websites/ShareUrl.jsrename to src/app/(app)/settings/websites/[id]/ShareUrl.jsindex f4569ca38..72ba217cc 100644--- a/src/components/pages/settings/websites/ShareUrl.js+++ b/src/app/(app)/settings/websites/[id]/ShareUrl.js@@ -10,7 +10,6 @@ import {} from 'react-basics';import { useEffect, useMemo, useRef, useState } from 'react';import { getRandomChars } from 'next-basics';-import { useRouter } from 'next/router';import useApi from 'components/hooks/useApi';import useMessages from 'components/hooks/useMessages';@@ -21,14 +20,16 @@ export function ShareUrl({ websiteId, data, analyticsUrl, onSave }) {const { name, shareId } = data;const [id, setId] = useState(shareId);const { post, useMutation } = useApi();- const { basePath } = useRouter();const { mutate, error } = useMutation(({ shareId }) =>post(`/websites/${websiteId}`, { shareId }),);const ref = useRef(null);const url = useMemo(- () => `${analyticsUrl || location.origin}${basePath}/share/${id}/${encodeURIComponent(name)}`,- [id, name, basePath],+ () =>+ `${analyticsUrl || location.origin}${process.env.basePath}/share/${id}/${encodeURIComponent(+ name,+ )}`,+ [id, name],);const handleSubmit = async data => {diff --git a/src/components/pages/settings/websites/TrackingCode.js b/src/app/(app)/settings/websites/[id]/TrackingCode.jssimilarity index 82%rename from src/components/pages/settings/websites/TrackingCode.jsrename to src/app/(app)/settings/websites/[id]/TrackingCode.jsindex 298cd17aa..368368d76 100644--- a/src/components/pages/settings/websites/TrackingCode.js+++ b/src/app/(app)/settings/websites/[id]/TrackingCode.js@@ -1,11 +1,9 @@import { TextArea } from 'react-basics';import useMessages from 'components/hooks/useMessages';import useConfig from 'components/hooks/useConfig';-import { useRouter } from 'next/router';export function TrackingCode({ websiteId, analyticsUrl }) {const { formatMessage, messages } = useMessages();- const { basePath } = useRouter();const config = useConfig();const trackerScriptName =@@ -13,7 +11,7 @@ export function TrackingCode({ websiteId, analyticsUrl }) {const url = trackerScriptName?.startsWith('http')? trackerScriptName- : `${analyticsUrl || location.origin}${basePath}/${trackerScriptName}`;+ : `${analyticsUrl || location.origin}${process.env.basePath}/${trackerScriptName}`;const code = `<script async src="${url}" data-website-id="${websiteId}"></script>`;diff --git a/src/components/pages/settings/websites/WebsiteData.js b/src/app/(app)/settings/websites/[id]/WebsiteData.jssimilarity index 89%rename from src/components/pages/settings/websites/WebsiteData.jsrename to src/app/(app)/settings/websites/[id]/WebsiteData.jsindex 08d6702e1..07dc92575 100644--- a/src/components/pages/settings/websites/WebsiteData.js+++ b/src/app/(app)/settings/websites/[id]/WebsiteData.js@@ -1,6 +1,6 @@import { Button, Modal, ModalTrigger, ActionForm } from 'react-basics';-import WebsiteDeleteForm from 'components/pages/settings/websites/WebsiteDeleteForm';-import WebsiteResetForm from 'components/pages/settings/websites/WebsiteResetForm';+import WebsiteDeleteForm from './WebsiteDeleteForm';+import WebsiteResetForm from './WebsiteResetForm';import useMessages from 'components/hooks/useMessages';export function WebsiteData({ websiteId, onSave }) {diff --git a/src/components/pages/settings/websites/WebsiteDeleteForm.js b/src/app/(app)/settings/websites/[id]/WebsiteDeleteForm.jssimilarity index 100%rename from src/components/pages/settings/websites/WebsiteDeleteForm.jsrename to src/app/(app)/settings/websites/[id]/WebsiteDeleteForm.jsdiff --git a/src/components/pages/settings/websites/WebsiteEditForm.js b/src/app/(app)/settings/websites/[id]/WebsiteEditForm.jssimilarity index 100%rename from src/components/pages/settings/websites/WebsiteEditForm.jsrename to src/app/(app)/settings/websites/[id]/WebsiteEditForm.jsdiff --git a/src/components/pages/settings/websites/WebsiteResetForm.js b/src/app/(app)/settings/websites/[id]/WebsiteResetForm.jssimilarity index 100%rename from src/components/pages/settings/websites/WebsiteResetForm.jsrename to src/app/(app)/settings/websites/[id]/WebsiteResetForm.jsdiff --git a/src/app/(app)/settings/websites/[id]/page.js b/src/app/(app)/settings/websites/[id]/page.jsnew file mode 100644index 000000000..bdf3b076f--- /dev/null+++ b/src/app/(app)/settings/websites/[id]/page.js@@ -0,0 +1,15 @@+import WebsiteSettings from '../WebsiteSettings';++async function getDisabled() {+ return !!process.env.CLOUD_MODE;+}++export default async function WebsiteSettingsPage({ params }) {+ const disabled = await getDisabled();++ if (!params.id || disabled) {+ return null;+ }++ return <WebsiteSettings websiteId={params.id} />;+}diff --git a/src/app/(app)/settings/websites/page.js b/src/app/(app)/settings/websites/page.jsnew file mode 100644index 000000000..ade3e3adf--- /dev/null+++ b/src/app/(app)/settings/websites/page.js@@ -0,0 +1,9 @@+import WebsitesList from 'app/(app)/settings/websites/WebsitesList';++export default function () {+ if (process.env.cloudMode) {+ return null;+ }++ return <WebsitesList />;+}diff --git a/src/components/pages/websites/WebsiteTableView.js b/src/app/(app)/websites/WebsiteTableView.jssimilarity index 100%rename from src/components/pages/websites/WebsiteTableView.jsrename to src/app/(app)/websites/WebsiteTableView.jsdiff --git a/src/components/pages/websites/WebsiteTableView.module.css b/src/app/(app)/websites/WebsiteTableView.module.csssimilarity index 100%rename from src/components/pages/websites/WebsiteTableView.module.cssrename to src/app/(app)/websites/WebsiteTableView.module.cssdiff --git a/src/components/pages/websites/WebsiteChart.js b/src/app/(app)/websites/[id]/WebsiteChart.jssimilarity index 100%rename from src/components/pages/websites/WebsiteChart.jsrename to src/app/(app)/websites/[id]/WebsiteChart.jsdiff --git a/src/components/pages/websites/WebsiteChart.module.css b/src/app/(app)/websites/[id]/WebsiteChart.module.csssimilarity index 100%rename from src/components/pages/websites/WebsiteChart.module.cssrename to src/app/(app)/websites/[id]/WebsiteChart.module.cssdiff --git a/src/components/pages/websites/WebsiteChartList.js b/src/app/(app)/websites/[id]/WebsiteChartList.jssimilarity index 90%rename from src/components/pages/websites/WebsiteChartList.jsrename to src/app/(app)/websites/[id]/WebsiteChartList.jsindex 56cbe157b..23764dbb8 100644--- a/src/components/pages/websites/WebsiteChartList.js+++ b/src/app/(app)/websites/[id]/WebsiteChartList.js@@ -2,9 +2,8 @@ import { Button, Text, Icon } from 'react-basics';import { useMemo } from 'react';import { firstBy } from 'thenby';import Link from 'next/link';-import WebsiteChart from 'components/pages/websites/WebsiteChart';+import WebsiteChart from './WebsiteChart';import useDashboard from 'store/dashboard';-import styles from './WebsiteList.module.css';import WebsiteHeader from './WebsiteHeader';import { WebsiteMetricsBar } from './WebsiteMetricsBar';import { useMessages, useLocale } from 'components/hooks';@@ -27,7 +26,7 @@ export default function WebsiteChartList({ websites, showCharts, limit }) {<div>{ordered.map(({ id }, index) => {return index < limit ? (- <div key={id} className={styles.website}>+ <div key={id}><WebsiteHeader websiteId={id} showLinks={false}><Link href={`/websites/${id}`}><Button variant="primary">diff --git a/src/components/pages/websites/WebsiteDetailsPage.js b/src/app/(app)/websites/[id]/WebsiteDetails.jssimilarity index 74%rename from src/components/pages/websites/WebsiteDetailsPage.jsrename to src/app/(app)/websites/[id]/WebsiteDetails.jsindex 222d94d9e..4e7ed19d9 100644--- a/src/components/pages/websites/WebsiteDetailsPage.js+++ b/src/app/(app)/websites/[id]/WebsiteDetails.js@@ -1,26 +1,31 @@+'use client';import { Loading } from 'react-basics';-import { useRouter } from 'next/router';+import { usePathname } from 'next/navigation';import Page from 'components/layout/Page';-import WebsiteChart from 'components/pages/websites/WebsiteChart';import FilterTags from 'components/metrics/FilterTags';import usePageQuery from 'components/hooks/usePageQuery';-import WebsiteTableView from './WebsiteTableView';-import WebsiteMenuView from './WebsiteMenuView';import { useWebsite } from 'components/hooks';+import WebsiteChart from './WebsiteChart';+import WebsiteMenuView from './WebsiteMenuView';import WebsiteHeader from './WebsiteHeader';-import { WebsiteMetricsBar } from './WebsiteMetricsBar';+import WebsiteMetricsBar from './WebsiteMetricsBar';+import WebsiteTableView from '../WebsiteTableView';-export default function WebsiteDetailsPage({ websiteId }) {+export default function WebsiteDetails({ websiteId }) {const { data: website, isLoading, error } = useWebsite(websiteId);- const { pathname } = useRouter();+ const pathname = usePathname();const showLinks = !pathname.includes('/share/');const {query: { view, url, referrer, os, browser, device, country, region, city, title },} = usePageQuery();+ if (isLoading || error) {+ return <Page isLoading={isLoading} error={error} />;+ }+return (- <Page loading={isLoading} error={error}>+ <><WebsiteHeader websiteId={websiteId} showLinks={showLinks} /><FilterTagswebsiteId={websiteId}@@ -35,6 +40,6 @@ export default function WebsiteDetailsPage({ websiteId }) {{view && <WebsiteMenuView websiteId={websiteId} />}</>)}- </Page>+ </>);}diff --git a/src/components/pages/websites/WebsiteHeader.js b/src/app/(app)/websites/[id]/WebsiteHeader.jssimilarity index 95%rename from src/components/pages/websites/WebsiteHeader.jsrename to src/app/(app)/websites/[id]/WebsiteHeader.jsindex fb4e09863..daedfd435 100644--- a/src/components/pages/websites/WebsiteHeader.js+++ b/src/app/(app)/websites/[id]/WebsiteHeader.js@@ -1,7 +1,8 @@+'use client';import classNames from 'classnames';import { Row, Column, Text, Button, Icon } from 'react-basics';import Link from 'next/link';-import { useRouter } from 'next/router';+import { usePathname } from 'next/navigation';import Favicon from 'components/common/Favicon';import ActiveUsers from 'components/metrics/ActiveUsers';import Icons from 'components/icons';@@ -10,7 +11,7 @@ import styles from './WebsiteHeader.module.css';export function WebsiteHeader({ websiteId, showLinks = true, children }) {const { formatMessage, labels } = useMessages();- const { pathname } = useRouter();+ const pathname = usePathname();const { data: website } = useWebsite(websiteId);const { name, domain } = website || {};diff --git a/src/components/pages/websites/WebsiteHeader.module.css b/src/app/(app)/websites/[id]/WebsiteHeader.module.csssimilarity index 100%rename from src/components/pages/websites/WebsiteHeader.module.cssrename to src/app/(app)/websites/[id]/WebsiteHeader.module.cssdiff --git a/src/components/pages/websites/WebsiteMenuView.js b/src/app/(app)/websites/[id]/WebsiteMenuView.jssimilarity index 98%rename from src/components/pages/websites/WebsiteMenuView.jsrename to src/app/(app)/websites/[id]/WebsiteMenuView.jsindex 8c74d6151..55c617fc6 100644--- a/src/components/pages/websites/WebsiteMenuView.js+++ b/src/app/(app)/websites/[id]/WebsiteMenuView.js@@ -14,7 +14,7 @@ import ReferrersTable from 'components/metrics/ReferrersTable';import ScreenTable from 'components/metrics/ScreenTable';import EventsTable from 'components/metrics/EventsTable';import Icons from 'components/icons';-import SideNav from 'components/layout/SideNav';+import SideNav from '../../settings/SideNav';import usePageQuery from 'components/hooks/usePageQuery';import useMessages from 'components/hooks/useMessages';import styles from './WebsiteMenuView.module.css';diff --git a/src/components/pages/websites/WebsiteMenuView.module.css b/src/app/(app)/websites/[id]/WebsiteMenuView.module.csssimilarity index 100%rename from src/components/pages/websites/WebsiteMenuView.module.cssrename to src/app/(app)/websites/[id]/WebsiteMenuView.module.cssdiff --git a/src/components/pages/websites/WebsiteMetricsBar.js b/src/app/(app)/websites/[id]/WebsiteMetricsBar.jssimilarity index 97%rename from src/components/pages/websites/WebsiteMetricsBar.jsrename to src/app/(app)/websites/[id]/WebsiteMetricsBar.jsindex 7ba4a8012..44165fb3a 100644--- a/src/components/pages/websites/WebsiteMetricsBar.js+++ b/src/app/(app)/websites/[id]/WebsiteMetricsBar.js@@ -3,8 +3,8 @@ import { useApi, useDateRange, useMessages, usePageQuery, useSticky } from 'compimport WebsiteDateFilter from 'components/input/WebsiteDateFilter';import MetricCard from 'components/metrics/MetricCard';import MetricsBar from 'components/metrics/MetricsBar';-import FilterSelectForm from 'components/pages/reports/FilterSelectForm';-import PopupForm from 'components/pages/reports/PopupForm';+import FilterSelectForm from '../../reports/FilterSelectForm';+import PopupForm from '../../reports/PopupForm';import { formatShortTime } from 'lib/format';import { Button, Column, Icon, Icons, Popup, PopupTrigger, Row } from 'react-basics';import styles from './WebsiteMetricsBar.module.css';diff --git a/src/components/pages/websites/WebsiteMetricsBar.module.css b/src/app/(app)/websites/[id]/WebsiteMetricsBar.module.csssimilarity index 100%rename from src/components/pages/websites/WebsiteMetricsBar.module.cssrename to src/app/(app)/websites/[id]/WebsiteMetricsBar.module.cssdiff --git a/src/components/pages/event-data/EventDataMetricsBar.js b/src/app/(app)/websites/[id]/event-data/EventDataMetricsBar.jssimilarity index 100%rename from src/components/pages/event-data/EventDataMetricsBar.jsrename to src/app/(app)/websites/[id]/event-data/EventDataMetricsBar.jsdiff --git a/src/components/pages/event-data/EventDataMetricsBar.module.css b/src/app/(app)/websites/[id]/event-data/EventDataMetricsBar.module.csssimilarity index 100%rename from src/components/pages/event-data/EventDataMetricsBar.module.cssrename to src/app/(app)/websites/[id]/event-data/EventDataMetricsBar.module.cssdiff --git a/src/components/pages/event-data/EventDataTable.js b/src/app/(app)/websites/[id]/event-data/EventDataTable.jssimilarity index 100%rename from src/components/pages/event-data/EventDataTable.jsrename to src/app/(app)/websites/[id]/event-data/EventDataTable.jsdiff --git a/src/components/pages/event-data/EventDataValueTable.js b/src/app/(app)/websites/[id]/event-data/EventDataValueTable.jssimilarity index 100%rename from src/components/pages/event-data/EventDataValueTable.jsrename to src/app/(app)/websites/[id]/event-data/EventDataValueTable.jsdiff --git a/src/components/pages/websites/WebsiteEventData.js b/src/app/(app)/websites/[id]/event-data/WebsiteEventData.jssimilarity index 83%rename from src/components/pages/websites/WebsiteEventData.jsrename to src/app/(app)/websites/[id]/event-data/WebsiteEventData.jsindex d38ca1adb..dc5a0b9ce 100644--- a/src/components/pages/websites/WebsiteEventData.js+++ b/src/app/(app)/websites/[id]/event-data/WebsiteEventData.js@@ -1,7 +1,8 @@+'use client';import { Flexbox, Loading } from 'react-basics';-import EventDataTable from 'components/pages/event-data/EventDataTable';-import EventDataValueTable from 'components/pages/event-data/EventDataValueTable';-import { EventDataMetricsBar } from 'components/pages/event-data/EventDataMetricsBar';+import EventDataTable from './EventDataTable';+import EventDataValueTable from './EventDataValueTable';+import { EventDataMetricsBar } from './EventDataMetricsBar';import { useDateRange, useApi, usePageQuery } from 'components/hooks';import styles from './WebsiteEventData.module.css';diff --git a/src/components/pages/websites/WebsiteEventData.module.css b/src/app/(app)/websites/[id]/event-data/WebsiteEventData.module.csssimilarity index 100%rename from src/components/pages/websites/WebsiteEventData.module.cssrename to src/app/(app)/websites/[id]/event-data/WebsiteEventData.module.cssdiff --git a/src/app/(app)/websites/[id]/event-data/page.js b/src/app/(app)/websites/[id]/event-data/page.jsnew file mode 100644index 000000000..66d1df66f--- /dev/null+++ b/src/app/(app)/websites/[id]/event-data/page.js@@ -0,0 +1,15 @@+import WebsiteHeader from '../WebsiteHeader';+import WebsiteEventData from './WebsiteEventData';++export default function ({ params: { id } }) {+ if (!id) {+ return null;+ }++ return (+ <>+ <WebsiteHeader websiteId={id} />+ <WebsiteEventData websiteId={id} />+ </>+ );+}diff --git a/src/app/(app)/websites/[id]/page.tsx b/src/app/(app)/websites/[id]/page.tsxnew file mode 100644index 000000000..2a0f37943--- /dev/null+++ b/src/app/(app)/websites/[id]/page.tsx@@ -0,0 +1,9 @@+import WebsiteDetails from './WebsiteDetails';++export default function ({ params: { id } }) {+ if (!id) {+ return null;+ }++ return <WebsiteDetails websiteId={id} />;+}diff --git a/src/app/(app)/websites/[id]/realtime/Realtime.js b/src/app/(app)/websites/[id]/realtime/Realtime.jsnew file mode 100644index 000000000..0ec92f054--- /dev/null+++ b/src/app/(app)/websites/[id]/realtime/Realtime.js@@ -0,0 +1,122 @@+'use client';+import { useMemo, useState, useEffect } from 'react';+import { subMinutes, startOfMinute } from 'date-fns';+import firstBy from 'thenby';+import { GridRow, GridColumn } from 'components/layout/Grid';+import Page from 'components/layout/Page';+import RealtimeChart from 'components/metrics/RealtimeChart';+import WorldMap from 'components/common/WorldMap';+import RealtimeLog from './RealtimeLog';+import RealtimeHeader from './RealtimeHeader';+import RealtimeUrls from './RealtimeUrls';+import RealtimeCountries from './RealtimeCountries';+import WebsiteHeader from '../WebsiteHeader';+import useApi from 'components/hooks/useApi';+import { percentFilter } from 'lib/filters';+import { REALTIME_RANGE, REALTIME_INTERVAL } from 'lib/constants';+import { useWebsite } from 'components/hooks';+import styles from './Realtime.module.css';++function mergeData(state = [], data = [], time) {+ const ids = state.map(({ __id }) => __id);+ return state+ .concat(data.filter(({ __id }) => !ids.includes(__id)))+ .filter(({ timestamp }) => timestamp >= time);+}++export function Realtime({ websiteId }) {+ const [currentData, setCurrentData] = useState();+ const { get, useQuery } = useApi();+ const { data: website } = useWebsite(websiteId);+ const { data, isLoading, error } = useQuery(+ ['realtime', websiteId],+ () => get(`/realtime/${websiteId}`, { startAt: currentData?.timestamp || 0 }),+ {+ enabled: !!(websiteId && website),+ refetchInterval: REALTIME_INTERVAL,+ cache: false,+ },+ );++ useEffect(() => {+ if (data) {+ const date = subMinutes(startOfMinute(new Date()), REALTIME_RANGE);+ const time = date.getTime();++ setCurrentData(state => ({+ pageviews: mergeData(state?.pageviews, data.pageviews, time),+ sessions: mergeData(state?.sessions, data.sessions, time),+ events: mergeData(state?.events, data.events, time),+ timestamp: data.timestamp,+ }));+ }+ }, [data]);++ const realtimeData = useMemo(() => {+ if (!currentData) {+ return { pageviews: [], sessions: [], events: [], countries: [], visitors: [] };+ }++ currentData.countries = percentFilter(+ currentData.sessions+ .reduce((arr, data) => {+ if (!arr.find(({ id }) => id === data.id)) {+ return arr.concat(data);+ }+ return arr;+ }, [])+ .reduce((arr, { country }) => {+ if (country) {+ const row = arr.find(({ x }) => x === country);++ if (!row) {+ arr.push({ x: country, y: 1 });+ } else {+ row.y += 1;+ }+ }+ return arr;+ }, [])+ .sort(firstBy('y', -1)),+ );++ currentData.visitors = currentData.sessions.reduce((arr, val) => {+ if (!arr.find(({ id }) => id === val.id)) {+ return arr.concat(val);+ }+ return arr;+ }, []);++ return currentData;+ }, [currentData]);++ if (isLoading || error) {+ return <Page loading={isLoading} error={error} />;+ }++ return (+ <>+ <WebsiteHeader websiteId={websiteId} />+ <RealtimeHeader websiteId={websiteId} data={currentData} />+ <RealtimeChart className={styles.chart} data={realtimeData} unit="minute" />+ <GridRow>+ <GridColumn xs={12} sm={12} md={12} lg={4} xl={4}>+ <RealtimeUrls websiteId={websiteId} websiteDomain={website?.domain} data={realtimeData} />+ </GridColumn>+ <GridColumn xs={12} sm={12} md={12} lg={8} xl={8}>+ <RealtimeLog websiteId={websiteId} websiteDomain={website?.domain} data={realtimeData} />+ </GridColumn>+ </GridRow>+ <GridRow>+ <GridColumn xs={12} lg={4}>+ <RealtimeCountries data={realtimeData?.countries} />+ </GridColumn>+ <GridColumn xs={12} lg={8}>+ <WorldMap data={realtimeData?.countries} />+ </GridColumn>+ </GridRow>+ </>+ );+}++export default Realtime;diff --git a/src/components/pages/realtime/RealtimePage.module.css b/src/app/(app)/websites/[id]/realtime/Realtime.module.csssimilarity index 100%rename from src/components/pages/realtime/RealtimePage.module.cssrename to src/app/(app)/websites/[id]/realtime/Realtime.module.cssdiff --git a/src/components/pages/realtime/RealtimeCountries.js b/src/app/(app)/websites/[id]/realtime/RealtimeCountries.jssimilarity index 81%rename from src/components/pages/realtime/RealtimeCountries.jsrename to src/app/(app)/websites/[id]/realtime/RealtimeCountries.jsindex 7a61651a2..6f484b091 100644--- a/src/components/pages/realtime/RealtimeCountries.js+++ b/src/app/(app)/websites/[id]/realtime/RealtimeCountries.js@@ -1,5 +1,4 @@import { useCallback } from 'react';-import { useRouter } from 'next/router';import ListTable from 'components/metrics/ListTable';import useLocale from 'components/hooks/useLocale';import useCountryNames from 'components/hooks/useCountryNames';@@ -11,16 +10,18 @@ export function RealtimeCountries({ data }) {const { formatMessage, labels } = useMessages();const { locale } = useLocale();const countryNames = useCountryNames(locale);- const { basePath } = useRouter();const renderCountryName = useCallback(({ x: code }) => (<span className={classNames(locale, styles.row)}>- <img src={`${basePath}/images/flags/${code?.toLowerCase() || 'xx'}.png`} alt={code} />+ <img+ src={`${process.env.basePath}/images/flags/${code?.toLowerCase() || 'xx'}.png`}+ alt={code}+ />{countryNames[code]}</span>),- [countryNames, locale, basePath],+ [countryNames, locale],);return (diff --git a/src/components/pages/realtime/RealtimeCountries.module.css b/src/app/(app)/websites/[id]/realtime/RealtimeCountries.module.csssimilarity index 100%rename from src/components/pages/realtime/RealtimeCountries.module.cssrename to src/app/(app)/websites/[id]/realtime/RealtimeCountries.module.cssdiff --git a/src/components/pages/realtime/RealtimeHeader.js b/src/app/(app)/websites/[id]/realtime/RealtimeHeader.jssimilarity index 100%rename from src/components/pages/realtime/RealtimeHeader.jsrename to src/app/(app)/websites/[id]/realtime/RealtimeHeader.jsdiff --git a/src/components/pages/realtime/RealtimeHeader.module.css b/src/app/(app)/websites/[id]/realtime/RealtimeHeader.module.csssimilarity index 100%rename from src/components/pages/realtime/RealtimeHeader.module.cssrename to src/app/(app)/websites/[id]/realtime/RealtimeHeader.module.cssdiff --git a/src/components/pages/realtime/RealtimeHome.js b/src/app/(app)/websites/[id]/realtime/RealtimeHome.jssimilarity index 95%rename from src/components/pages/realtime/RealtimeHome.jsrename to src/app/(app)/websites/[id]/realtime/RealtimeHome.jsindex 4f2f62794..dbaeb541a 100644--- a/src/components/pages/realtime/RealtimeHome.js+++ b/src/app/(app)/websites/[id]/realtime/RealtimeHome.js@@ -1,5 +1,5 @@import { useEffect } from 'react';-import { useRouter } from 'next/router';+import { useRouter } from 'next/navigation';import Page from 'components/layout/Page';import PageHeader from 'components/layout/PageHeader';import useApi from 'components/hooks/useApi';diff --git a/src/components/pages/realtime/RealtimeLog.js b/src/app/(app)/websites/[id]/realtime/RealtimeLog.jssimilarity index 100%rename from src/components/pages/realtime/RealtimeLog.jsrename to src/app/(app)/websites/[id]/realtime/RealtimeLog.jsdiff --git a/src/components/pages/realtime/RealtimeLog.module.css b/src/app/(app)/websites/[id]/realtime/RealtimeLog.module.csssimilarity index 98%rename from src/components/pages/realtime/RealtimeLog.module.cssrename to src/app/(app)/websites/[id]/realtime/RealtimeLog.module.cssindex dc78f818d..f400cc1bc 100644--- a/src/components/pages/realtime/RealtimeLog.module.css+++ b/src/app/(app)/websites/[id]/realtime/RealtimeLog.module.css@@ -55,7 +55,6 @@text-overflow: ellipsis;display: -webkit-box;-webkit-line-clamp: 2;- line-clamp: 2;-webkit-box-orient: vertical;}diff --git a/src/components/pages/realtime/RealtimePage.js b/src/app/(app)/websites/[id]/realtime/RealtimePage.jssimilarity index 90%rename from src/components/pages/realtime/RealtimePage.jsrename to src/app/(app)/websites/[id]/realtime/RealtimePage.jsindex f26a28695..9363d0e78 100644--- a/src/components/pages/realtime/RealtimePage.js+++ b/src/app/(app)/websites/[id]/realtime/RealtimePage.js@@ -5,16 +5,16 @@ import { GridRow, GridColumn } from 'components/layout/Grid';import Page from 'components/layout/Page';import RealtimeChart from 'components/metrics/RealtimeChart';import WorldMap from 'components/common/WorldMap';-import RealtimeLog from 'components/pages/realtime/RealtimeLog';-import RealtimeHeader from 'components/pages/realtime/RealtimeHeader';-import RealtimeUrls from 'components/pages/realtime/RealtimeUrls';-import RealtimeCountries from 'components/pages/realtime/RealtimeCountries';-import WebsiteHeader from 'components/pages/websites/WebsiteHeader';+import RealtimeLog from './RealtimeLog';+import RealtimeHeader from './RealtimeHeader';+import RealtimeUrls from './RealtimeUrls';+import RealtimeCountries from './RealtimeCountries';+import WebsiteHeader from '../WebsiteHeader';import useApi from 'components/hooks/useApi';import { percentFilter } from 'lib/filters';import { REALTIME_RANGE, REALTIME_INTERVAL } from 'lib/constants';-import styles from './RealtimePage.module.css';import { useWebsite } from 'components/hooks';+import styles from './Realtime.module.css';function mergeData(state = [], data = [], time) {const ids = state.map(({ __id }) => __id);diff --git a/src/components/pages/realtime/RealtimeUrls.js b/src/app/(app)/websites/[id]/realtime/RealtimeUrls.jssimilarity index 100%rename from src/components/pages/realtime/RealtimeUrls.jsrename to src/app/(app)/websites/[id]/realtime/RealtimeUrls.jsdiff --git a/src/app/(app)/websites/[id]/realtime/page.tsx b/src/app/(app)/websites/[id]/realtime/page.tsxnew file mode 100644index 000000000..89e5ae540--- /dev/null+++ b/src/app/(app)/websites/[id]/realtime/page.tsx@@ -0,0 +1,9 @@+import Realtime from './Realtime';++export default function ({ params: { id } }) {+ if (!id) {+ return null;+ }++ return <Realtime websiteId={id} />;+}diff --git a/src/components/pages/websites/WebsiteReportsPage.js b/src/app/(app)/websites/[id]/reports/WebsiteReports.jssimilarity index 79%rename from src/components/pages/websites/WebsiteReportsPage.jsrename to src/app/(app)/websites/[id]/reports/WebsiteReports.jsindex 40631839e..f5d9aca94 100644--- a/src/components/pages/websites/WebsiteReportsPage.js+++ b/src/app/(app)/websites/[id]/reports/WebsiteReports.js@@ -1,12 +1,13 @@+'use client';import Page from 'components/layout/Page';import Empty from 'components/common/Empty';-import ReportsTable from 'components/pages/reports/ReportsTable';+import ReportsTable from 'app/(app)/reports/ReportsTable';import { useMessages, useWebsiteReports } from 'components/hooks';import Link from 'next/link';import { Button, Flexbox, Icon, Icons, Text } from 'react-basics';-import WebsiteHeader from './WebsiteHeader';+import WebsiteHeader from '../WebsiteHeader';-export function WebsiteReportsPage({ websiteId }) {+export function WebsiteReports({ websiteId }) {const { formatMessage, labels } = useMessages();const {reports,@@ -25,11 +26,15 @@ export function WebsiteReportsPage({ websiteId }) {await deleteReport(id);};+ if (isLoading || error) {+ return <Page loading={isLoading} error={error} />;+ }+return (- <Page loading={isLoading} error={error}>+ <><WebsiteHeader websiteId={websiteId} /><Flexbox alignItems="center" justifyContent="end">- <Link href="/reports/create">+ <Link href={`/reports/create`}><Button variant="primary"><Icon><Icons.Plus />@@ -49,8 +54,8 @@ export function WebsiteReportsPage({ websiteId }) {/>)}{!hasData && <Empty />}- </Page>+ </>);}-export default WebsiteReportsPage;+export default WebsiteReports;diff --git a/src/app/(app)/websites/[id]/reports/page.tsx b/src/app/(app)/websites/[id]/reports/page.tsxnew file mode 100644index 000000000..bf564025d--- /dev/null+++ b/src/app/(app)/websites/[id]/reports/page.tsx@@ -0,0 +1,9 @@+import WebsiteReports from './WebsiteReports';++export default function WebsiteReportsPage({ params: { id } }) {+ if (!id) {+ return null;+ }++ return <WebsiteReports websiteId={id} />;+}diff --git a/src/app/(app)/websites/page.js b/src/app/(app)/websites/page.jsnew file mode 100644index 000000000..7772c252f--- /dev/null+++ b/src/app/(app)/websites/page.js@@ -0,0 +1,30 @@+'use client';+import WebsiteList from 'app/(app)/settings/websites/WebsitesList';+import { useMessages } from 'components/hooks';+import { useState } from 'react';+import { Item, Tabs } from 'react-basics';+import WebsitesHeader from '../settings/websites/WebsitesHeader';++const TABS = {+ myWebsites: 'my-websites',+ teamWebsites: 'team-websites',+};++export default function WebsitesPage() {+ const { formatMessage, labels } = useMessages();+ const [tab, setTab] = useState(TABS.myWebsites);++ return (+ <>+ <WebsitesHeader />+ <Tabs selectedKey={tab} onSelect={setTab} style={{ marginBottom: 30 }}>+ <Item key={TABS.myWebsites}>{formatMessage(labels.myWebsites)}</Item>+ <Item key={TABS.teamWebsites}>{formatMessage(labels.teamWebsites)}</Item>+ </Tabs>+ {tab === TABS.myWebsites && <WebsiteList showHeader={false} />}+ {tab === TABS.teamWebsites && (+ <WebsiteList showHeader={false} showTeam={true} onlyTeams={true} />+ )}+ </>+ );+}diff --git a/src/app/Providers.tsx b/src/app/Providers.tsxnew file mode 100644index 000000000..c3d626993--- /dev/null+++ b/src/app/Providers.tsx@@ -0,0 +1,39 @@+'use client';+import { IntlProvider } from 'react-intl';+import { QueryClient, QueryClientProvider } from '@tanstack/react-query';+import { ReactBasicsProvider } from 'react-basics';+import ErrorBoundary from 'components/common/ErrorBoundary';+import useLocale from 'components/hooks/useLocale';+import 'chartjs-adapter-date-fns';++const client = new QueryClient({+ defaultOptions: {+ queries: {+ retry: false,+ refetchOnWindowFocus: false,+ },+ },+});++function MessagesProvider({ children }) {+ const { locale, messages } = useLocale();+ return (+ <IntlProvider locale={locale} messages={messages[locale]} onError={() => null}>+ {children}+ </IntlProvider>+ );+}++export function Providers({ children }) {+ return (+ <MessagesProvider>+ <QueryClientProvider client={client}>+ <ReactBasicsProvider>+ <ErrorBoundary>{children}</ErrorBoundary>+ </ReactBasicsProvider>+ </QueryClientProvider>+ </MessagesProvider>+ );+}++export default Providers;diff --git a/src/app/layout.tsx b/src/app/layout.tsxnew file mode 100644index 000000000..5858239eb--- /dev/null+++ b/src/app/layout.tsx@@ -0,0 +1,36 @@+import { Metadata } from 'next';+import Providers from './Providers';+import '@fontsource/inter/400.css';+import '@fontsource/inter/700.css';+import '@fontsource/inter/800.css';+import 'react-basics/dist/styles.css';+import 'styles/variables.css';+import 'styles/locale.css';+import 'styles/index.css';++export default function RootLayout({ children }) {+ return (+ <html lang="en" data-scroll="0">+ <head>+ <link rel="icon" href={`favicon.ico`} />+ <link rel="apple-touch-icon" sizes="180x180" href={`apple-touch-icon.png`} />+ <link rel="icon" type="image/png" sizes="32x32" href={`favicon-32x32.png`} />+ <link rel="icon" type="image/png" sizes="16x16" href={`favicon-16x16.png`} />+ <link rel="manifest" href={`site.webmanifest`} />+ <link rel="mask-icon" href={`safari-pinned-tab.svg`} color="#5bbad5" />+ <meta name="msapplication-TileColor" content="#da532c" />+ <meta name="theme-color" content="#fafafa" media="(prefers-color-scheme: light)" />+ <meta name="theme-color" content="#2f2f2f" media="(prefers-color-scheme: dark)" />+ <meta name="viewport" content="width=device-width, initial-scale=1" />+ <meta name="robots" content="noindex,nofollow" />+ </head>+ <body>+ <Providers>{children}</Providers>+ </body>+ </html>+ );+}++export const metadata: Metadata = {+ title: 'umami',+};diff --git a/src/components/pages/login/LoginForm.js b/src/app/login/LoginForm.jssimilarity index 96%rename from src/components/pages/login/LoginForm.jsrename to src/app/login/LoginForm.jsindex 797eea14d..59d145bf3 100644--- a/src/components/pages/login/LoginForm.js+++ b/src/app/login/LoginForm.js@@ -1,3 +1,4 @@+'use client';import { useMutation } from '@tanstack/react-query';import {Form,@@ -9,7 +10,7 @@ import {SubmitButton,Icon,} from 'react-basics';-import { useRouter } from 'next/router';+import { useRouter } from 'next/navigation';import useApi from 'components/hooks/useApi';import { setUser } from 'store/app';import { setClientAuthToken } from 'lib/client';diff --git a/src/components/pages/login/LoginForm.module.css b/src/app/login/LoginForm.module.csssimilarity index 100%rename from src/components/pages/login/LoginForm.module.cssrename to src/app/login/LoginForm.module.cssdiff --git a/src/components/pages/login/LoginLayout.module.css b/src/app/login/page.module.csssimilarity index 76%rename from src/components/pages/login/LoginLayout.module.cssrename to src/app/login/page.module.cssindex d12306ea8..45115d5b6 100644--- a/src/components/pages/login/LoginLayout.module.css+++ b/src/app/login/page.module.css@@ -1,6 +1,5 @@-.layout {+.page {display: flex;- flex-direction: column;align-items: center;justify-content: center;height: 100vh;diff --git a/src/app/login/page.tsx b/src/app/login/page.tsxnew file mode 100644index 000000000..2ac3f7244--- /dev/null+++ b/src/app/login/page.tsx@@ -0,0 +1,25 @@+import LoginForm from './LoginForm';+import { Metadata } from 'next';+import styles from './page.module.css';++async function getDisabled() {+ return !!process.env.LOGIN_DISABLED;+}++export default async function LoginPage() {+ const disabled = await getDisabled();++ if (disabled) {+ return null;+ }++ return (+ <div className={styles.page}>+ <LoginForm />+ </div>+ );+}++export const metadata: Metadata = {+ title: 'Login | umami',+};diff --git a/src/pages/logout.js b/src/app/logout/page.tsxsimilarity index 73%rename from src/pages/logout.jsrename to src/app/logout/page.tsxindex ef89080c3..74ae006dd 100644--- a/src/pages/logout.js+++ b/src/app/logout/page.tsx@@ -1,10 +1,16 @@+'use client';import { useEffect } from 'react';import { useRouter } from 'next/router';import useApi from 'components/hooks/useApi';import { setUser } from 'store/app';import { removeClientAuthToken } from 'lib/client';-export default function ({ disabled }) {+async function getDisabled() {+ return !!(process.env.DISABLE_LOGIN || process.env.CLOUD_MODE);+}++export default async function LogoutPage() {+ const disabled = await getDisabled();const router = useRouter();const { post } = useApi();@@ -26,11 +32,3 @@ export default function ({ disabled }) {return null;}--export async function getServerSideProps() {- return {- props: {- disabled: !!(process.env.DISABLE_LOGIN || process.env.CLOUD_MODE),- },- };-}diff --git a/src/app/not-found.tsx b/src/app/not-found.tsxnew file mode 100644index 000000000..b8b456056--- /dev/null+++ b/src/app/not-found.tsx@@ -0,0 +1,13 @@+'use client';+import { Flexbox } from 'react-basics';+import useMessages from 'components/hooks/useMessages';++export default function Custom404() {+ const { formatMessage, labels } = useMessages();++ return (+ <Flexbox alignItems="center" justifyContent="center" flex={1} style={{ minHeight: 600 }}>+ <h1>{formatMessage(labels.pageNotFound)}</h1>+ </Flexbox>+ );+}diff --git a/src/app/page.tsx b/src/app/page.tsxnew file mode 100644index 000000000..6a146801d--- /dev/null+++ b/src/app/page.tsx@@ -0,0 +1,6 @@+'use client';+import { redirect } from 'next/navigation';++export default function RootPage() {+ redirect('/dashboard');+}diff --git a/src/components/layout/Footer.js b/src/app/share/[...id]/Footer.jssimilarity index 100%rename from src/components/layout/Footer.jsrename to src/app/share/[...id]/Footer.jsdiff --git a/src/components/layout/Footer.module.css b/src/app/share/[...id]/Footer.module.csssimilarity index 100%rename from src/components/layout/Footer.module.cssrename to src/app/share/[...id]/Footer.module.cssdiff --git a/src/app/share/[...id]/Header.js b/src/app/share/[...id]/Header.jsnew file mode 100644index 000000000..ab9078ecf--- /dev/null+++ b/src/app/share/[...id]/Header.js@@ -0,0 +1,29 @@+import { Icon, Text } from 'react-basics';+import Link from 'next/link';+import LanguageButton from 'components/input/LanguageButton';+import ThemeButton from 'components/input/ThemeButton';+import SettingsButton from 'components/input/SettingsButton';+import Icons from 'components/icons';+import styles from './Header.module.css';++export function Header() {+ return (+ <header className={styles.header}>+ <div>+ <Link href="https://umami.is" target="_blank" className={styles.title}>+ <Icon size="lg">+ <Icons.Logo />+ </Icon>+ <Text>umami</Text>+ </Link>+ </div>+ <div className={styles.buttons}>+ <ThemeButton tooltipPosition="bottom" />+ <LanguageButton tooltipPosition="bottom" menuPosition="bottom" />+ <SettingsButton />+ </div>+ </header>+ );+}++export default Header;diff --git a/src/components/layout/Header.module.css b/src/app/share/[...id]/Header.module.csssimilarity index 100%rename from src/components/layout/Header.module.cssrename to src/app/share/[...id]/Header.module.cssdiff --git a/src/app/share/[...id]/page.tsx b/src/app/share/[...id]/page.tsxnew file mode 100644index 000000000..1c17255cb--- /dev/null+++ b/src/app/share/[...id]/page.tsx@@ -0,0 +1,17 @@+import Page from 'components/layout/Page';+import WebsiteDetails from 'app/(app)/websites/[id]/WebsiteDetails';+import useShareToken from 'components/hooks/useShareToken';++export default function SharePage({ params }) {+ const shareToken = useShareToken(params.id);++ if (!shareToken) {+ return null;+ }++ return (+ <Page>+ <WebsiteDetails websiteId={shareToken.websiteId} />+ </Page>+ );+}diff --git a/src/pages/sso.js b/src/app/sso/page.tsxsimilarity index 71%rename from src/pages/sso.jsrename to src/app/sso/page.tsxindex 6e6352061..914efdf18 100644--- a/src/pages/sso.js+++ b/src/app/sso/page.tsx@@ -1,11 +1,12 @@+'use client';import { useEffect } from 'react';import { Loading } from 'react-basics';-import { useRouter } from 'next/router';+import { useRouter } from 'next/navigation';import { setClientAuthToken } from 'lib/client';-export default function () {+export default function ({ params }) {const router = useRouter();- const { token, url } = router.query;+ const { token, url } = params;useEffect(() => {if (url && token) {diff --git a/src/components/common/DataTable.js b/src/components/common/DataTable.tsxsimilarity index 70%rename from src/components/common/DataTable.jsrename to src/components/common/DataTable.tsxindex 94b27281d..489df4759 100644--- a/src/components/common/DataTable.js+++ b/src/components/common/DataTable.tsx@@ -1,17 +1,36 @@+import { ReactNode, Dispatch, SetStateAction } from 'react';+import classNames from 'classnames';import { Banner, Loading, SearchField } from 'react-basics';import { useMessages } from 'components/hooks';import Empty from 'components/common/Empty';import Pager from 'components/common/Pager';import styles from './DataTable.module.css';-import classNames from 'classnames';const DEFAULT_SEARCH_DELAY = 600;-export const DataTableStyles = styles;+export interface DataTableProps {+ result: {+ page: number;+ pageSize: number;+ count: number;+ data: any[];+ };+ params: {+ query: string;+ page: number;+ };+ setParams: Dispatch<SetStateAction<{ query: string; page: number }>>;+ isLoading: boolean;+ error: unknown;+ searchDelay?: number;+ showSearch?: boolean;+ showPaging?: boolean;+ children: ReactNode | ((data: any) => ReactNode);+}export function DataTable({- data = {},- params = {},+ result,+ params,setParams,isLoading,error,@@ -19,11 +38,11 @@ export function DataTable({showSearch = true,showPaging = true,children,-}) {+}: DataTableProps) {const { formatMessage, labels, messages } = useMessages();- const { pageSize, count } = data;- const { query, page } = params;- const hasData = Boolean(!isLoading && data?.data?.length);+ const { pageSize, count } = result || {};+ const { query, page } = params || {};+ const hasData = Boolean(!isLoading && result?.data?.length);const noResults = Boolean(!isLoading && query && !hasData);const handleSearch = query => {@@ -53,7 +72,7 @@ export function DataTable({<divclassName={classNames(styles.body, { [styles.status]: isLoading || noResults || !hasData })}>- {hasData && typeof children === 'function' ? children(data) : children}+ {hasData ? (typeof children === 'function' ? children(result) : children) : null}{isLoading && <Loading icon="dots" />}{!isLoading && !hasData && !query && (<Empty message={formatMessage(messages.noDataAvailable)} />diff --git a/src/components/common/Empty.js b/src/components/common/Empty.tsxsimilarity index 72%rename from src/components/common/Empty.jsrename to src/components/common/Empty.tsxindex c0be761a0..2c7fcd4a2 100644--- a/src/components/common/Empty.js+++ b/src/components/common/Empty.tsx@@ -2,7 +2,12 @@ import classNames from 'classnames';import styles from './Empty.module.css';import useMessages from 'components/hooks/useMessages';-export function Empty({ message, className }) {+export interface EmptyProps {+ message?: string;+ className?: string;+}++export function Empty({ message, className }: EmptyProps) {const { formatMessage, messages } = useMessages();return (diff --git a/src/components/common/MobileMenu.js b/src/components/common/MobileMenu.jsindex de1e9ffa8..83a05dff3 100644--- a/src/components/common/MobileMenu.js+++ b/src/components/common/MobileMenu.js@@ -1,11 +1,11 @@import { createPortal } from 'react-dom';import classNames from 'classnames';-import { useRouter } from 'next/router';+import { usePathname } from 'next/navigation';import Link from 'next/link';import styles from './MobileMenu.module.css';export function MobileMenu({ items = [], onClose }) {- const { pathname } = useRouter();+ const pathname = usePathname();const Items = ({ items, className }) => (<div className={classNames(styles.items, className)}>diff --git a/src/components/common/UpdateNotice.js b/src/components/common/UpdateNotice.jsindex 23907948c..95eb350f1 100644--- a/src/components/common/UpdateNotice.js+++ b/src/components/common/UpdateNotice.js@@ -1,3 +1,4 @@+'use client';import { useEffect, useCallback, useState } from 'react';import { createPortal } from 'react-dom';import { Button, Row, Column } from 'react-basics';@@ -6,12 +7,12 @@ 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 { useRouter } from 'next/router';+import { usePathname } from 'next/navigation';export function UpdateNotice({ user, config }) {const { formatMessage, labels, messages } = useMessages();const { latest, checked, hasUpdate, releaseUrl } = useStore();- const { pathname } = useRouter();+ const pathname = usePathname();const [dismissed, setDismissed] = useState(checked);const allowUpdate =user?.isAdmin &&diff --git a/src/components/common/WorldMap.js b/src/components/common/WorldMap.jsindex 6ae84677e..ff34d5f2b 100644--- a/src/components/common/WorldMap.js+++ b/src/components/common/WorldMap.js@@ -1,5 +1,4 @@import { useState, useMemo } from 'react';-import { useRouter } from 'next/router';import { ComposableMap, Geographies, Geography, ZoomableGroup } from 'react-simple-maps';import classNames from 'classnames';import { colord } from 'colord';@@ -14,7 +13,6 @@ import { percentFilter } from 'lib/filters';import styles from './WorldMap.module.css';export function WorldMap({ data, className }) {- const { basePath } = useRouter();const [tooltip, setTooltipPopup] = useState();const { theme, colors } = useTheme();const { locale } = useLocale();@@ -54,7 +52,7 @@ export function WorldMap({ data, className }) {><ComposableMap projection="geoMercator"><ZoomableGroup zoom={0.8} minZoom={0.7} center={[0, 40]}>- <Geographies geography={`${basePath}${MAP_FILE}`}>+ <Geographies geography={`${process.env.basePath}${MAP_FILE}`}>{({ geographies }) => {return geographies.map(geo => {const code = ISO_COUNTRIES[geo.id];diff --git a/src/components/hooks/useApi.ts b/src/components/hooks/useApi.tsindex f41547a9e..75a928d53 100644--- a/src/components/hooks/useApi.ts+++ b/src/components/hooks/useApi.ts@@ -1,4 +1,3 @@-import { useRouter } from 'next/router';import * as reactQuery from '@tanstack/react-query';import { useApi as nextUseApi } from 'next-basics';import { getClientAuthToken } from 'lib/client';@@ -8,12 +7,11 @@ import useStore from 'store/app';const selector = state => state.shareToken;export function useApi() {- const { basePath } = useRouter();const shareToken = useStore(selector);const { get, post, put, del } = nextUseApi({ authorization: `Bearer ${getClientAuthToken()}`, [SHARE_TOKEN_HEADER]: shareToken?.token },- basePath,+ process.env.basePath,);return { get, post, put, del, ...reactQuery };diff --git a/src/components/hooks/useCountryNames.js b/src/components/hooks/useCountryNames.jsindex 51cabf34c..40611865c 100644--- a/src/components/hooks/useCountryNames.js+++ b/src/components/hooks/useCountryNames.js@@ -1,5 +1,4 @@import { useState, useEffect } from 'react';-import { useRouter } from 'next/router';import { httpGet } from 'next-basics';import enUS from 'public/intl/country/en-US.json';@@ -9,10 +8,9 @@ const countryNames = {export function useCountryNames(locale) {const [list, setList] = useState(countryNames[locale] || enUS);- const { basePath } = useRouter();async function loadData(locale) {- const { data } = await httpGet(`${basePath}/intl/country/${locale}.json`);+ const { data } = await httpGet(`${process.env.basePath}/intl/country/${locale}.json`);if (data) {countryNames[locale] = data;diff --git a/src/components/hooks/useFilterQuery.js b/src/components/hooks/useFilterQuery.jsdeleted file mode 100644index 5dd9b3dff..000000000--- a/src/components/hooks/useFilterQuery.js+++ /dev/null@@ -1,16 +0,0 @@-import { useState } from 'react';-import { useApi } from 'components/hooks/useApi';--export function useFilterQuery(key, fn, options) {- const [params, setParams] = useState({- query: '',- page: 1,- });- const { useQuery } = useApi();-- const result = useQuery([...key, params], fn.bind(null, params), options);-- return { ...result, params, setParams };-}--export default useFilterQuery;diff --git a/src/components/hooks/useFilterQuery.ts b/src/components/hooks/useFilterQuery.tsnew file mode 100644index 000000000..987d3c443--- /dev/null+++ b/src/components/hooks/useFilterQuery.ts@@ -0,0 +1,26 @@+import { useCallback, useState } from 'react';+import { useApi } from 'components/hooks/useApi';++export function useFilterQuery(key: any[], fn, options?: any) {+ const [params, setParams] = useState({+ query: '',+ page: 1,+ });+ const { useQuery } = useApi();++ const result = useQuery<{+ page: number;+ pageSize: number;+ count: number;+ data: any[];+ }>([...key, params], fn.bind(null, params), options);++ const getProps = useCallback(() => {+ const { data, isLoading, error } = result;+ return { result: data, isLoading, error, params, setParams };+ }, [result, params, setParams]);++ return { ...result, getProps };+}++export default useFilterQuery;diff --git a/src/components/hooks/useLanguageNames.js b/src/components/hooks/useLanguageNames.jsindex ff59e93dc..3823a26bd 100644--- a/src/components/hooks/useLanguageNames.js+++ b/src/components/hooks/useLanguageNames.js@@ -1,5 +1,4 @@import { useState, useEffect } from 'react';-import { useRouter } from 'next/router';import { httpGet } from 'next-basics';import enUS from 'public/intl/language/en-US.json';@@ -9,10 +8,9 @@ const languageNames = {export function useLanguageNames(locale) {const [list, setList] = useState(languageNames[locale] || enUS);- const { basePath } = useRouter();async function loadData(locale) {- const { data } = await httpGet(`${basePath}/intl/language/${locale}.json`);+ const { data } = await httpGet(`${process.env.basePath}/intl/language/${locale}.json`);if (data) {languageNames[locale] = data;diff --git a/src/components/hooks/useLocale.js b/src/components/hooks/useLocale.jsindex 1374af81f..71574d86b 100644--- a/src/components/hooks/useLocale.js+++ b/src/components/hooks/useLocale.js@@ -1,5 +1,4 @@import { useEffect } from 'react';-import { useRouter } from 'next/router';import { httpGet, setItem } from 'next-basics';import { LOCALE_CONFIG } from 'lib/constants';import { getDateLocale, getTextDirection } from 'lib/lang';@@ -15,13 +14,12 @@ const selector = state => state.locale;export function useLocale() {const locale = useStore(selector);- const { basePath } = useRouter();const forceUpdate = useForceUpdate();const dir = getTextDirection(locale);const dateLocale = getDateLocale(locale);async function loadMessages(locale) {- const { ok, data } = await httpGet(`${basePath}/intl/messages/${locale}.json`);+ const { ok, data } = await httpGet(`${process.env.basePath}/intl/messages/${locale}.json`);if (ok) {messages[locale] = data;diff --git a/src/components/hooks/usePageQuery.js b/src/components/hooks/usePageQuery.jsindex b275d5807..de87e247e 100644--- a/src/components/hooks/usePageQuery.js+++ b/src/components/hooks/usePageQuery.js@@ -1,30 +1,24 @@import { useMemo } from 'react';-import { useRouter } from 'next/router';+import { usePathname, useRouter, useSearchParams } from 'next/navigation';import { buildUrl } from 'next-basics';export function usePageQuery() {const router = useRouter();- const { pathname, search } = location;- const { asPath } = router;+ const pathname = usePathname();+ const params = useSearchParams();const query = useMemo(() => {- if (!search) {- return {};- }-- const params = search.substring(1).split('&');-- return params.reduce((obj, item) => {- const [key, value] = item.split('=');+ const obj = {};+ for (const [key, value] of params.entries()) {obj[key] = decodeURIComponent(value);+ }- return obj;- }, {});- }, [search]);+ return obj;+ }, [params]);function resolveUrl(params, reset) {- return buildUrl(asPath.split('?')[0], { ...(reset ? {} : query), ...params });+ return buildUrl(pathname, { ...(reset ? {} : query) });}return { pathname, query, resolveUrl, router };diff --git a/src/components/hooks/useRequireLogin.ts b/src/components/hooks/useRequireLogin.tsindex d2f540d45..b0d8029d8 100644--- a/src/components/hooks/useRequireLogin.ts+++ b/src/components/hooks/useRequireLogin.ts@@ -1,10 +1,8 @@import { useEffect } from 'react';-import { useRouter } from 'next/router';import useApi from 'components/hooks/useApi';import useUser from 'components/hooks/useUser';-export function useRequireLogin(handler: (data?: object) => void) {- const { basePath } = useRouter();+export function useRequireLogin(handler?: (data?: object) => void) {const { get } = useApi();const { user, setUser } = useUser();@@ -15,7 +13,7 @@ export function useRequireLogin(handler: (data?: object) => void) {setUser(typeof handler === 'function' ? handler(data) : (data as any)?.user);} catch {- location.href = `${basePath}/login`;+ location.href = `${process.env.basePath}/login`;}}diff --git a/src/components/input/LogoutButton.js b/src/components/input/LogoutButton.jsindex 2b04a78a2..6ca358a12 100644--- a/src/components/input/LogoutButton.js+++ b/src/components/input/LogoutButton.js@@ -5,7 +5,7 @@ import useMessages from 'components/hooks/useMessages';export function LogoutButton({ tooltipPosition = 'top' }) {const { formatMessage, labels } = useMessages();return (- <Link href="/src/pages/logout">+ <Link href="/src/app/logout/logout"><TooltipPopup label={formatMessage(labels.logout)} position={tooltipPosition}><Button variant="quiet"><Icon>diff --git a/src/components/input/ProfileButton.js b/src/components/input/ProfileButton.jsindex 35b0eb454..2c3f86294 100644--- a/src/components/input/ProfileButton.js+++ b/src/components/input/ProfileButton.js@@ -1,5 +1,5 @@import { Icon, Button, PopupTrigger, Popup, Menu, Item, Text } from 'react-basics';-import { useRouter } from 'next/router';+import { useRouter } from 'next/navigation';import Icons from 'components/icons';import useMessages from 'components/hooks/useMessages';import useUser from 'components/hooks/useUser';diff --git a/src/components/input/SettingsButton.js b/src/components/input/SettingsButton.jsindex a6d72a2b0..8c15c615b 100644--- a/src/components/input/SettingsButton.js+++ b/src/components/input/SettingsButton.js@@ -1,6 +1,6 @@import { Button, Icon, PopupTrigger, Popup, Form, FormRow } from 'react-basics';-import TimezoneSetting from 'components/pages/settings/profile/TimezoneSetting';-import DateRangeSetting from 'components/pages/settings/profile/DateRangeSetting';+import TimezoneSetting from 'app/(app)/settings/profile/TimezoneSetting';+import DateRangeSetting from 'app/(app)/settings/profile/DateRangeSetting';import Icons from 'components/icons';import useMessages from 'components/hooks/useMessages';import styles from './SettingsButton.module.css';diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.jsdeleted file mode 100644index 41e2ec0d7..000000000--- a/src/components/layout/AppLayout.js+++ /dev/null@@ -1,32 +0,0 @@-import { Container } from 'react-basics';-import Head from 'next/head';-import NavBar from 'components/layout/NavBar';-import UpdateNotice from 'components/common/UpdateNotice';-import { useRequireLogin, useConfig } from 'components/hooks';-import styles from './AppLayout.module.css';--export function AppLayout({ title, children }) {- const { user } = useRequireLogin();- const config = useConfig();-- if (!user || !config || config?.uiDisabled) {- return null;- }-- return (- <div className={styles.layout}>- <UpdateNotice user={user} config={config} />- <Head>- <title>{title ? `${title} | umami` : 'umami'}</title>- </Head>- <nav className={styles.nav}>- <NavBar />- </nav>- <main className={styles.body}>- <Container>{children}</Container>- </main>- </div>- );-}--export default AppLayout;diff --git a/src/components/layout/Header.js b/src/components/layout/Header.jsdeleted file mode 100644index 21cdd2513..000000000--- a/src/components/layout/Header.js+++ /dev/null@@ -1,31 +0,0 @@-import { Column, Icon, Row, Text } from 'react-basics';-import Link from 'next/link';-import LanguageButton from 'components/input/LanguageButton';-import ThemeButton from 'components/input/ThemeButton';-import SettingsButton from 'components/input/SettingsButton';-import Icons from 'components/icons';-import styles from './Header.module.css';--export function Header() {- return (- <header className={styles.header}>- <Row className={styles.row}>- <Column>- <Link href="https://umami.is" target="_blank" className={styles.title}>- <Icon size="lg">- <Icons.Logo />- </Icon>- <Text>umami</Text>- </Link>- </Column>- <Column className={styles.buttons}>- <ThemeButton tooltipPosition="bottom" />- <LanguageButton tooltipPosition="bottom" menuPosition="bottom" />- <SettingsButton />- </Column>- </Row>- </header>- );-}--export default Header;diff --git a/src/components/layout/NavBar.js b/src/components/layout/NavBar.jsdeleted file mode 100644index 07627e2a2..000000000--- a/src/components/layout/NavBar.js+++ /dev/null@@ -1,63 +0,0 @@-import { Icon, Text, Row, Column } from 'react-basics';-import Link from 'next/link';-import { useRouter } from 'next/router';-import classNames from 'classnames';-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 HamburgerButton from 'components/common/HamburgerButton';-import styles from './NavBar.module.css';--export function NavBar() {- const { pathname } = useRouter();- const { formatMessage, labels } = useMessages();-- const links = [- { label: formatMessage(labels.dashboard), url: '/dashboard' },- { label: formatMessage(labels.websites), url: '/websites' },- { label: formatMessage(labels.reports), url: '/reports' },- { label: formatMessage(labels.settings), url: '/settings' },- ].filter(n => n);-- return (- <div className={classNames(styles.navbar)}>- <Row>- <Column className={styles.left}>- <div className={styles.logo}>- <Icon size="lg">- <Icons.Logo />- </Icon>- <Text className={styles.text}>umami</Text>- </div>- <div className={styles.links}>- {links.map(({ url, label }) => {- return (- <Link- key={url}- href={url}- className={classNames({ [styles.selected]: pathname.startsWith(url) })}- >- <Text>{label}</Text>- </Link>- );- })}- </div>- </Column>- <Column className={styles.right}>- <div className={styles.actions}>- <ThemeButton />- <LanguageButton />- <ProfileButton />- </div>- <div className={styles.mobile}>- <HamburgerButton />- </div>- </Column>- </Row>- </div>- );-}--export default NavBar;diff --git a/src/components/layout/NavGroup.js b/src/components/layout/NavGroup.jsindex 94f9d8e66..361dffb5a 100644--- a/src/components/layout/NavGroup.js+++ b/src/components/layout/NavGroup.js@@ -1,7 +1,7 @@import { useState } from 'react';import { Icon, Text, TooltipPopup } from 'react-basics';import classNames from 'classnames';-import { useRouter } from 'next/router';+import { usePathname } from 'next/navigation';import Link from 'next/link';import Icons from 'components/icons';import styles from './NavGroup.module.css';@@ -13,7 +13,7 @@ export function NavGroup({allowExpand = true,minimized = false,}) {- const { pathname } = useRouter();+ const pathname = usePathname();const [expanded, setExpanded] = useState(defaultExpanded);const handleExpand = () => setExpanded(state => !state);diff --git a/src/components/layout/Page.module.css b/src/components/layout/Page.module.cssindex 100be5bb4..018aecd4a 100644--- a/src/components/layout/Page.module.css+++ b/src/components/layout/Page.module.css@@ -5,4 +5,7 @@background: var(--base50);position: relative;height: 100%;+ max-width: 1320px;+ margin: 0 auto;+ padding: 0 20px;}diff --git a/src/components/layout/Page.js b/src/components/layout/Page.tsxsimilarity index 69%rename from src/components/layout/Page.jsrename to src/components/layout/Page.tsxindex 4f42aa55a..a96e5a4c9 100644--- a/src/components/layout/Page.js+++ b/src/components/layout/Page.tsx@@ -1,16 +1,27 @@+import { ReactNode } from 'react';import classNames from 'classnames';import { Banner, Loading } from 'react-basics';import useMessages from 'components/hooks/useMessages';import styles from './Page.module.css';-export function Page({ className, error, loading, children }) {+export function Page({+ className,+ error,+ isLoading,+ children,+}: {+ className?: string;+ error?: unknown;+ isLoading?: boolean;+ children?: ReactNode;+}) {const { formatMessage, messages } = useMessages();if (error) {return <Banner variant="error">{formatMessage(messages.error)}</Banner>;}- if (loading) {+ if (isLoading) {return <Loading icon="spinner" size="xl" position="page" />;}diff --git a/src/components/layout/PageHeader.js b/src/components/layout/PageHeader.tsxsimilarity index 58%rename from src/components/layout/PageHeader.jsrename to src/components/layout/PageHeader.tsxindex f13631409..d1ea9bf90 100644--- a/src/components/layout/PageHeader.js+++ b/src/components/layout/PageHeader.tsx@@ -1,8 +1,14 @@import classNames from 'classnames';-import React from 'react';+import React, { ReactNode } from 'react';import styles from './PageHeader.module.css';-export function PageHeader({ title, children, className }) {+export interface PageHeaderProps {+ title?: string;+ className?: string;+ children: ReactNode;+}++export function PageHeader({ title, className, children }: PageHeaderProps) {return (<div className={classNames(styles.header, className)}>{title && <div className={styles.title}>{title}</div>}diff --git a/src/components/layout/ReportsLayout.js b/src/components/layout/ReportsLayout.jsdeleted file mode 100644index 374da2635..000000000--- a/src/components/layout/ReportsLayout.js+++ /dev/null@@ -1,23 +0,0 @@-import { Column, Row } from 'react-basics';-import styles from './ReportsLayout.module.css';--export function ReportsLayout({ children, filter, header }) {- return (- <>- <Row>{header}</Row>- <Row>- {filter && (- <Column className={styles.filter} defaultSize={12} md={4} lg={3} xl={3}>- <h2>Filters</h2>- {filter}- </Column>- )}- <Column className={styles.content} defaultSize={12} md={8} lg={9} xl={9}>- {children}- </Column>- </Row>- </>- );-}--export default ReportsLayout;diff --git a/src/components/layout/ReportsLayout.module.css b/src/components/layout/ReportsLayout.module.cssdeleted file mode 100644index 6922665fa..000000000--- a/src/components/layout/ReportsLayout.module.css+++ /dev/null@@ -1,23 +0,0 @@-.filter {- margin-top: 30px;- min-width: 200px;- max-width: 100vw;- padding: 10px;- background: var(--base50);- border-radius: 5px;- border: 1px solid var(--border-color);-}--.filter h2 {- padding-bottom: 20px;-}--.content {- min-height: 50vh;-}--@media only screen and (max-width: 768px) {- .menu {- display: none;- }-}diff --git a/src/components/layout/ShareLayout.js b/src/components/layout/ShareLayout.jsdeleted file mode 100644index c634e1b6d..000000000--- a/src/components/layout/ShareLayout.js+++ /dev/null@@ -1,15 +0,0 @@-import { Container } from 'react-basics';-import Header from './Header';-import Footer from './Footer';--export function ShareLayout({ children }) {- return (- <Container>- <Header />- <main>{children}</main>- <Footer />- </Container>- );-}--export default ShareLayout;diff --git a/src/components/metrics/BrowsersTable.js b/src/components/metrics/BrowsersTable.jsindex e68b159f3..afc536637 100644--- a/src/components/metrics/BrowsersTable.js+++ b/src/components/metrics/BrowsersTable.js@@ -1,4 +1,3 @@-import { useRouter } from 'next/router';import FilterLink from 'components/common/FilterLink';import MetricsTable from 'components/metrics/MetricsTable';import useMessages from 'components/hooks/useMessages';@@ -6,14 +5,13 @@ import useFormat from 'components/hooks/useFormat';export function BrowsersTable({ websiteId, ...props }) {const { formatMessage, labels } = useMessages();- const { basePath } = useRouter();const { formatBrowser } = useFormat();function renderLink({ x: browser }) {return (<FilterLink id="browser" value={browser} label={formatBrowser(browser)}><img- src={`${basePath}/images/browsers/${browser || 'unknown'}.png`}+ src={`${process.env.basePath}/images/browsers/${browser || 'unknown'}.png`}alt={browser}width={16}height={16}diff --git a/src/components/metrics/CitiesTable.js b/src/components/metrics/CitiesTable.jsindex ee11e6765..c5f1b1d73 100644--- a/src/components/metrics/CitiesTable.js+++ b/src/components/metrics/CitiesTable.js@@ -1,4 +1,3 @@-import { useRouter } from 'next/router';import MetricsTable from './MetricsTable';import { emptyFilter } from 'lib/filters';import FilterLink from 'components/common/FilterLink';@@ -9,7 +8,6 @@ import useCountryNames from 'components/hooks/useCountryNames';export function CitiesTable({ websiteId, ...props }) {const { locale } = useLocale();const { formatMessage, labels } = useMessages();- const { basePath } = useRouter();const countryNames = useCountryNames(locale);const renderLabel = (city, country) => {@@ -22,7 +20,7 @@ export function CitiesTable({ websiteId, ...props }) {<FilterLink id="city" value={city} label={renderLabel(city, country)}>{country && (<img- src={`${basePath}/images/flags/${country?.toLowerCase() || 'xx'}.png`}+ src={`${process.env.basePath}/images/flags/${country?.toLowerCase() || 'xx'}.png`}alt={country}/>)}diff --git a/src/components/metrics/CountriesTable.js b/src/components/metrics/CountriesTable.jsindex ec7ab73d5..6f3b75b04 100644--- a/src/components/metrics/CountriesTable.js+++ b/src/components/metrics/CountriesTable.js@@ -1,4 +1,3 @@-import { useRouter } from 'next/router';import FilterLink from 'components/common/FilterLink';import useCountryNames from 'components/hooks/useCountryNames';import { useLocale, useMessages, useFormat } from 'components/hooks';@@ -8,7 +7,6 @@ export function CountriesTable({ websiteId, ...props }) {const { locale } = useLocale();const countryNames = useCountryNames(locale);const { formatMessage, labels } = useMessages();- const { basePath } = useRouter();const { formatCountry } = useFormat();function renderLink({ x: code }) {@@ -19,7 +17,10 @@ export function CountriesTable({ websiteId, ...props }) {value={countryNames[code] && code}label={formatCountry(code)}>- <img src={`${basePath}/images/flags/${code?.toLowerCase() || 'xx'}.png`} alt={code} />+ <img+ src={`${process.env.basePath}/images/flags/${code?.toLowerCase() || 'xx'}.png`}+ alt={code}+ /></FilterLink>);}diff --git a/src/components/metrics/DevicesTable.js b/src/components/metrics/DevicesTable.jsindex 7b5915525..606b020ab 100644--- a/src/components/metrics/DevicesTable.js+++ b/src/components/metrics/DevicesTable.js@@ -1,19 +1,17 @@import MetricsTable from './MetricsTable';import FilterLink from 'components/common/FilterLink';import useMessages from 'components/hooks/useMessages';-import { useRouter } from 'next/router';import { useFormat } from 'components/hooks';export function DevicesTable({ websiteId, ...props }) {const { formatMessage, labels } = useMessages();- const { basePath } = useRouter();const { formatDevice } = useFormat();function renderLink({ x: device }) {return (<FilterLink id="device" value={labels[device] && device} label={formatDevice(device)}><img- src={`${basePath}/images/device/${device?.toLowerCase() || 'unknown'}.png`}+ src={`${process.env.basePath}/images/device/${device?.toLowerCase() || 'unknown'}.png`}alt={device}width={16}height={16}diff --git a/src/components/metrics/MetricsTable.js b/src/components/metrics/MetricsTable.jsindex 6521c4155..1bf8419b7 100644--- a/src/components/metrics/MetricsTable.js+++ b/src/components/metrics/MetricsTable.js@@ -29,7 +29,6 @@ export function MetricsTable({const [{ startDate, endDate, modified }] = useDateRange(websiteId);const {resolveUrl,- router,query: { url, referrer, title, os, browser, device, country, region, city },} = usePageQuery();const { formatMessage, labels } = useMessages();@@ -104,7 +103,7 @@ export function MetricsTable({{data && !error && <ListTable {...props} data={filteredData} className={className} />}<div className={styles.footer}>{data && !error && limit && (- <Link href={router.pathname} as={resolveUrl({ view: type })}>+ <Link href={resolveUrl({ view: type })}><Button variant="quiet"><Text>{formatMessage(labels.more)}</Text><Icon size="sm" rotate={dir === 'rtl' ? 180 : 0}>diff --git a/src/components/metrics/OSTable.js b/src/components/metrics/OSTable.jsindex 90135124c..15570d858 100644--- a/src/components/metrics/OSTable.js+++ b/src/components/metrics/OSTable.js@@ -1,17 +1,15 @@import MetricsTable from './MetricsTable';import FilterLink from 'components/common/FilterLink';import useMessages from 'components/hooks/useMessages';-import { useRouter } from 'next/router';export function OSTable({ websiteId, ...props }) {const { formatMessage, labels } = useMessages();- const { basePath } = useRouter();function renderLink({ x: os }) {return (<FilterLink id="os" value={os}><img- src={`${basePath}/images/os/${+ src={`${process.env.basePath}/images/os/${os?.toLowerCase().replaceAll(/[^\w]+/g, '-') || 'unknown'}.png`}alt={os}diff --git a/src/components/metrics/RegionsTable.js b/src/components/metrics/RegionsTable.jsindex c2ee9b3f8..50b1c3d40 100644--- a/src/components/metrics/RegionsTable.js+++ b/src/components/metrics/RegionsTable.js@@ -1,4 +1,3 @@-import { useRouter } from 'next/router';import FilterLink from 'components/common/FilterLink';import { emptyFilter } from 'lib/filters';import useLocale from 'components/hooks/useLocale';@@ -11,7 +10,6 @@ export function RegionsTable({ websiteId, ...props }) {const { locale } = useLocale();const { formatMessage, labels } = useMessages();const countryNames = useCountryNames(locale);- const { basePath } = useRouter();const renderLabel = (code, country) => {const region = code.includes('-') ? code : `${country}-${code}`;@@ -21,7 +19,10 @@ export function RegionsTable({ websiteId, ...props }) {const renderLink = ({ x: code, country }) => {return (<FilterLink id="region" className={locale} value={code} label={renderLabel(code, country)}>- <img src={`${basePath}/images/flags/${country?.toLowerCase() || 'xx'}.png`} alt={code} />+ <img+ src={`${process.env.basePath}/images/flags/${country?.toLowerCase() || 'xx'}.png`}+ alt={code}+ /></FilterLink>);};diff --git a/src/components/pages/login/LoginLayout.js b/src/components/pages/login/LoginLayout.jsdeleted file mode 100644index d1bf47bbf..000000000--- a/src/components/pages/login/LoginLayout.js+++ /dev/null@@ -1,18 +0,0 @@-import Head from 'next/head';-import useLocale from 'components/hooks/useLocale';-import styles from './LoginLayout.module.css';--export function LoginLayout({ children }) {- const { dir } = useLocale();-- return (- <div className={styles.layout} dir={dir}>- <Head>- <title>{`Login | umami`}</title>- </Head>- {children}- </div>- );-}--export default LoginLayout;diff --git a/src/components/pages/reports/ReportDetails.js b/src/components/pages/reports/ReportDetails.jsdeleted file mode 100644index df1589af7..000000000--- a/src/components/pages/reports/ReportDetails.js+++ /dev/null@@ -1,17 +0,0 @@-import FunnelReport from './funnel/FunnelReport';-import EventDataReport from './event-data/EventDataReport';-import InsightsReport from './insights/InsightsReport';-import RetentionReport from './retention/RetentionReport';--const reports = {- funnel: FunnelReport,- 'event-data': EventDataReport,- insights: InsightsReport,- retention: RetentionReport,-};--export default function ReportDetails({ reportId, reportType }) {- const Report = reports[reportType];-- return <Report reportId={reportId} />;-}diff --git a/src/components/pages/reports/ReportsPage.js b/src/components/pages/reports/ReportsPage.jsdeleted file mode 100644index 9a48d7806..000000000--- a/src/components/pages/reports/ReportsPage.js+++ /dev/null@@ -1,54 +0,0 @@-import PageHeader from 'components/layout/PageHeader';-import { useMessages, useApi } from 'components/hooks';-import Link from 'next/link';-import { Button, Icon, Icons, Text } from 'react-basics';-import ReportsTable from './ReportsTable';-import useFilterQuery from 'components/hooks/useFilterQuery';-import DataTable from 'components/common/DataTable';--function useReports() {- const { get, del, useMutation } = useApi();- const { mutate } = useMutation(reportId => del(`/reports/${reportId}`));- const reports = useFilterQuery(['reports'], params => get(`/reports`, params));-- const deleteReport = id => {- mutate(id, {- onSuccess: () => {- reports.refetch();- },- });- };-- return { reports, deleteReport };-}--export function ReportsPage() {- const { formatMessage, labels } = useMessages();- const { reports, deleteReport } = useReports();-- const handleDelete = async (id, callback) => {- await deleteReport(id);- await reports.refetch();- callback?.();- };-- return (- <>- <PageHeader title={formatMessage(labels.reports)}>- <Link href="/reports/create">- <Button variant="primary">- <Icon>- <Icons.Plus />- </Icon>- <Text>{formatMessage(labels.createReport)}</Text>- </Button>- </Link>- </PageHeader>- <DataTable {...reports}>- {({ data }) => <ReportsTable data={data} showDomain={true} onDelete={handleDelete} />}- </DataTable>- </>- );-}--export default ReportsPage;diff --git a/src/components/pages/settings/profile/ProfileSettings.js b/src/components/pages/settings/profile/ProfileSettings.jsdeleted file mode 100644index a217e52ca..000000000--- a/src/components/pages/settings/profile/ProfileSettings.js+++ /dev/null@@ -1,17 +0,0 @@-import Page from 'components/layout/Page';-import PageHeader from 'components/layout/PageHeader';-import ProfileDetails from './ProfileDetails';-import useMessages from 'components/hooks/useMessages';--export function ProfileSettings() {- const { formatMessage, labels } = useMessages();-- return (- <Page>- <PageHeader title={formatMessage(labels.profile)} />- <ProfileDetails />- </Page>- );-}--export default ProfileSettings;diff --git a/src/components/pages/settings/teams/TeamsList.js b/src/components/pages/settings/teams/TeamsList.jsdeleted file mode 100644index 76a87b0cc..000000000--- a/src/components/pages/settings/teams/TeamsList.js+++ /dev/null@@ -1,118 +0,0 @@-import EmptyPlaceholder from 'components/common/EmptyPlaceholder';-import Icons from 'components/icons';-import Page from 'components/layout/Page';-import PageHeader from 'components/layout/PageHeader';-import TeamAddForm from 'components/pages/settings/teams/TeamAddForm';-import TeamsTable from 'components/pages/settings/teams/TeamsTable';-import useApi from 'components/hooks/useApi';-import useMessages from 'components/hooks/useMessages';-import useUser from 'components/hooks/useUser';-import { ROLES } from 'lib/constants';-import { useState } from 'react';-import { Button, Flexbox, Icon, Modal, ModalTrigger, Text, useToasts } from 'react-basics';-import TeamJoinForm from './TeamJoinForm';-import useApiFilter from 'components/hooks/useApiFilter';--export function TeamsList() {- const { user } = useUser();- const { formatMessage, labels, messages } = useMessages();- const { filter, page, pageSize, handleFilterChange, handlePageChange, handlePageSizeChange } =- useApiFilter();- const [update, setUpdate] = useState(0);-- const { get, useQuery } = useApi();- const { data, isLoading, error } = useQuery(['teams', update, filter, page, pageSize], () => {- return get(`/teams`, {- filter,- page,- pageSize,- });- });-- const hasData = data && data?.data.length !== 0;- const isFiltered = filter;-- const { showToast } = useToasts();-- const handleSave = () => {- setUpdate(state => state + 1);- showToast({ message: formatMessage(messages.saved), variant: 'success' });- };-- const handleJoin = () => {- setUpdate(state => state + 1);- showToast({ message: formatMessage(messages.saved), variant: 'success' });- };-- const handleDelete = () => {- setUpdate(state => state + 1);- showToast({ message: formatMessage(messages.saved), variant: 'success' });- };-- const joinButton = (- <ModalTrigger>- <Button variant="secondary">- <Icon>- <Icons.AddUser />- </Icon>- <Text>{formatMessage(labels.joinTeam)}</Text>- </Button>- <Modal title={formatMessage(labels.joinTeam)}>- {close => <TeamJoinForm onSave={handleJoin} onClose={close} />}- </Modal>- </ModalTrigger>- );-- const createButton = (- <>- {user.role !== ROLES.viewOnly && (- <ModalTrigger>- <Button variant="primary">- <Icon>- <Icons.Plus />- </Icon>- <Text>{formatMessage(labels.createTeam)}</Text>- </Button>- <Modal title={formatMessage(labels.createTeam)}>- {close => <TeamAddForm onSave={handleSave} onClose={close} />}- </Modal>- </ModalTrigger>- )}- </>- );-- return (- <Page loading={isLoading} error={error}>- <PageHeader title={formatMessage(labels.teams)}>- {(hasData || isFiltered) && (- <Flexbox gap={10}>- {joinButton}- {createButton}- </Flexbox>- )}- </PageHeader>-- {(hasData || isFiltered) && (- <TeamsTable- data={data}- onDelete={handleDelete}- onFilterChange={handleFilterChange}- onPageChange={handlePageChange}- onPageSizeChange={handlePageSizeChange}- filterValue={filter}- />- )}-- {!hasData && !isFiltered && (- <EmptyPlaceholder message={formatMessage(messages.noTeams)}>- <Flexbox gap={10}>- {joinButton}- {createButton}- </Flexbox>- </EmptyPlaceholder>- )}- </Page>- );-}--export default TeamsList;diff --git a/src/components/pages/settings/teams/TeamsTable.js b/src/components/pages/settings/teams/TeamsTable.jsdeleted file mode 100644index e17107830..000000000--- a/src/components/pages/settings/teams/TeamsTable.js+++ /dev/null@@ -1,111 +0,0 @@-import SettingsTable from 'components/common/SettingsTable';-import useLocale from 'components/hooks/useLocale';-import useMessages from 'components/hooks/useMessages';-import useUser from 'components/hooks/useUser';-import { ROLES } from 'lib/constants';-import Link from 'next/link';-import { Button, Icon, Icons, Modal, ModalTrigger, Text } from 'react-basics';-import TeamDeleteForm from './TeamDeleteForm';-import TeamLeaveForm from './TeamLeaveForm';--export function TeamsTable({- data = { data: [] },- onDelete,- filterValue,- onFilterChange,- onPageChange,- onPageSizeChange,-}) {- const { formatMessage, labels } = useMessages();- const { user } = useUser();- const { dir } = useLocale();-- const columns = [- { name: 'name', label: formatMessage(labels.name) },- { name: 'owner', label: formatMessage(labels.owner) },- { name: 'action', label: ' ' },- ];-- const cellRender = (row, data, key) => {- if (key === 'owner') {- return row.teamUser.find(({ role }) => role === ROLES.teamOwner)?.user?.username;- }- return data[key];- };-- return (- <SettingsTable- data={data}- columns={columns}- cellRender={cellRender}- showSearch={true}- showPaging={true}- onFilterChange={onFilterChange}- onPageChange={onPageChange}- onPageSizeChange={onPageSizeChange}- filterValue={filterValue}- >- {row => {- const { id, teamUser } = row;- const owner = teamUser.find(({ role }) => role === ROLES.teamOwner);- const showDelete = user.id === owner?.userId;-- return (- <>- <Link href={`/settings/teams/${id}`}>- <Button>- <Icon>- <Icons.Show />- </Icon>- <Text>{formatMessage(labels.view)}</Text>- </Button>- </Link>- {showDelete && (- <ModalTrigger>- <Button>- <Icon>- <Icons.Trash />- </Icon>- <Text>{formatMessage(labels.delete)}</Text>- </Button>- <Modal title={formatMessage(labels.deleteTeam)}>- {close => (- <TeamDeleteForm- teamId={row.id}- teamName={row.name}- onSave={onDelete}- onClose={close}- />- )}- </Modal>- </ModalTrigger>- )}- {!showDelete && (- <ModalTrigger>- <Button>- <Icon rotate={dir === 'rtl' ? 180 : 0}>- <Icons.ArrowRight />- </Icon>- <Text>{formatMessage(labels.leave)}</Text>- </Button>- <Modal title={formatMessage(labels.leaveTeam)}>- {close => (- <TeamLeaveForm- teamId={id}- userId={user.id}- teamName={row.name}- onSave={onDelete}- onClose={close}- />- )}- </Modal>- </ModalTrigger>- )}- </>- );- }}- </SettingsTable>- );-}--export default TeamsTable;diff --git a/src/components/pages/settings/users/UsersList.js b/src/components/pages/settings/users/UsersList.jsdeleted file mode 100644index 0bc8612e5..000000000--- a/src/components/pages/settings/users/UsersList.js+++ /dev/null@@ -1,68 +0,0 @@-import { useToasts } from 'react-basics';-import Page from 'components/layout/Page';-import PageHeader from 'components/layout/PageHeader';-import EmptyPlaceholder from 'components/common/EmptyPlaceholder';-import UsersTable from './UsersTable';-import UserAddButton from './UserAddButton';-import useApi from 'components/hooks/useApi';-import useUser from 'components/hooks/useUser';-import useMessages from 'components/hooks/useMessages';-import useApiFilter from 'components/hooks/useApiFilter';--export function UsersList() {- const { formatMessage, labels, messages } = useMessages();- const { user } = useUser();- const { filter, page, pageSize, handleFilterChange, handlePageChange, handlePageSizeChange } =- useApiFilter();-- const { get, useQuery } = useApi();- const { data, isLoading, error, refetch } = useQuery(- ['user', filter, page, pageSize],- () =>- get(`/users`, {- filter,- page,- pageSize,- }),- {- enabled: !!user,- },- );- const { showToast } = useToasts();- const hasData = data && data.length !== 0;-- const handleSave = () => {- refetch().then(() => showToast({ message: formatMessage(messages.saved), variant: 'success' }));- };-- const handleDelete = () => {- refetch().then(() =>- showToast({ message: formatMessage(messages.userDeleted), variant: 'success' }),- );- };-- return (- <Page loading={isLoading} error={error}>- <PageHeader title={formatMessage(labels.users)}>- <UserAddButton onSave={handleSave} />- </PageHeader>- {(hasData || filter) && (- <UsersTable- data={data}- onDelete={handleDelete}- onFilterChange={handleFilterChange}- onPageChange={handlePageChange}- onPageSizeChange={handlePageSizeChange}- filterValue={filter}- />- )}- {!hasData && !filter && (- <EmptyPlaceholder message={formatMessage(messages.noUsers)}>- <UserAddButton onSave={handleSave} />- </EmptyPlaceholder>- )}- </Page>- );-}--export default UsersList;diff --git a/src/components/pages/settings/users/UsersTable.js b/src/components/pages/settings/users/UsersTable.jsdeleted file mode 100644index 1a93710d0..000000000--- a/src/components/pages/settings/users/UsersTable.js+++ /dev/null@@ -1,93 +0,0 @@-import { Button, Text, Icon, Icons, ModalTrigger, Modal } from 'react-basics';-import { formatDistance } from 'date-fns';-import Link from 'next/link';-import useUser from 'components/hooks/useUser';-import UserDeleteForm from './UserDeleteForm';-import { ROLES } from 'lib/constants';-import useMessages from 'components/hooks/useMessages';-import SettingsTable from 'components/common/SettingsTable';-import useLocale from 'components/hooks/useLocale';--export function UsersTable({- data = { data: [] },- onDelete,- filterValue,- onFilterChange,- onPageChange,- onPageSizeChange,-}) {- const { formatMessage, labels } = useMessages();- const { user } = useUser();- const { dateLocale } = useLocale();-- const columns = [- { name: 'username', label: formatMessage(labels.username) },- { name: 'role', label: formatMessage(labels.role) },- { name: 'created', label: formatMessage(labels.created) },- { name: 'action', label: ' ' },- ];-- const cellRender = (row, data, key) => {- if (key === 'created') {- return formatDistance(new Date(row.createdAt), new Date(), {- addSuffix: true,- locale: dateLocale,- });- }- if (key === 'role') {- return formatMessage(- labels[Object.keys(ROLES).find(key => ROLES[key] === row.role)] || labels.unknown,- );- }- return data[key];- };-- return (- <SettingsTable- data={data}- columns={columns}- cellRender={cellRender}- showSearch={true}- showPaging={true}- onFilterChange={onFilterChange}- onPageChange={onPageChange}- onPageSizeChange={onPageSizeChange}- filterValue={filterValue}- >- {row => {- return (- <>- <Link href={`/settings/users/${row.id}`}>- <Button>- <Icon>- <Icons.Edit />- </Icon>- <Text>{formatMessage(labels.edit)}</Text>- </Button>- </Link>- <ModalTrigger disabled={row.id === user.id}>- <Button disabled={row.id === user.id}>- <Icon>- <Icons.Trash />- </Icon>- <Text>{formatMessage(labels.delete)}</Text>- </Button>- <Modal title={formatMessage(labels.deleteUser)}>- {close => (- <UserDeleteForm- userId={row.id}- username={row.username}- onSave={onDelete}- onClose={close}- />- )}- </Modal>- </ModalTrigger>- </>- );- }}- </SettingsTable>- );-}--export default UsersTable;diff --git a/src/components/pages/settings/websites/WebsitesList.js b/src/components/pages/settings/websites/WebsitesList.jsdeleted file mode 100644index 0dd3aa775..000000000--- a/src/components/pages/settings/websites/WebsitesList.js+++ /dev/null@@ -1,71 +0,0 @@-import PageHeader from 'components/layout/PageHeader';-import WebsiteAddForm from 'components/pages/settings/websites/WebsiteAddForm';-import WebsitesTable from 'components/pages/settings/websites/WebsitesTable';-import useMessages from 'components/hooks/useMessages';-import useUser from 'components/hooks/useUser';-import { ROLES } from 'lib/constants';-import { Button, Icon, Icons, Modal, ModalTrigger, Text, useToasts } from 'react-basics';-import useApi from 'components/hooks/useApi';-import DataTable from 'components/common/DataTable';-import useFilterQuery from 'components/hooks/useFilterQuery';--export function WebsitesList({- showTeam,- showEditButton = true,- showHeader = true,- includeTeams,- onlyTeams,-}) {- const { formatMessage, labels, messages } = useMessages();- const { user } = useUser();- const { get } = useApi();- const filterQuery = useFilterQuery(- ['websites', { includeTeams, onlyTeams }],- params => {- return get(`/users/${user?.id}/websites`, {- includeTeams,- onlyTeams,- ...params,- });- },- { enabled: !!user },- );- const { refetch } = filterQuery;- const { showToast } = useToasts();-- const handleSave = async () => {- await refetch();- showToast({ message: formatMessage(messages.saved), variant: 'success' });- };-- const addButton = (- <ModalTrigger>- <Button variant="primary">- <Icon>- <Icons.Plus />- </Icon>- <Text>{formatMessage(labels.addWebsite)}</Text>- </Button>- <Modal title={formatMessage(labels.addWebsite)}>- {close => <WebsiteAddForm onSave={handleSave} onClose={close} />}- </Modal>- </ModalTrigger>- );-- return (- <>- {showHeader && (- <PageHeader title={formatMessage(labels.websites)}>- {user.role !== ROLES.viewOnly && addButton}- </PageHeader>- )}- <DataTable {...filterQuery}>- {({ data }) => (- <WebsitesTable data={data} showTeam={showTeam} showEditButton={showEditButton} />- )}- </DataTable>- </>- );-}--export default WebsitesList;diff --git a/src/components/pages/websites/WebsiteEventDataPage.js b/src/components/pages/websites/WebsiteEventDataPage.jsdeleted file mode 100644index 08acafb58..000000000--- a/src/components/pages/websites/WebsiteEventDataPage.js+++ /dev/null@@ -1,12 +0,0 @@-import Page from 'components/layout/Page';-import WebsiteHeader from './WebsiteHeader';-import WebsiteEventData from './WebsiteEventData';--export default function WebsiteEventDataPage({ websiteId }) {- return (- <Page>- <WebsiteHeader websiteId={websiteId} />- <WebsiteEventData websiteId={websiteId} />- </Page>- );-}diff --git a/src/components/pages/websites/WebsitesPage.js b/src/components/pages/websites/WebsitesPage.jsdeleted file mode 100644index 4c1ee4091..000000000--- a/src/components/pages/websites/WebsitesPage.js+++ /dev/null@@ -1,77 +0,0 @@-import Page from 'components/layout/Page';-import PageHeader from 'components/layout/PageHeader';-import WebsiteAddForm from 'components/pages/settings/websites/WebsiteAddForm';-import WebsiteList from 'components/pages/settings/websites/WebsitesList';-import { useMessages } from 'components/hooks';-import useUser from 'components/hooks/useUser';-import { ROLES } from 'lib/constants';-import { useState } from 'react';-import {- Button,- Icon,- Icons,- Item,- Modal,- ModalTrigger,- Tabs,- Text,- useToasts,-} from 'react-basics';--const TABS = {- myWebsites: 'my-websites',- teamWebsites: 'team-websites',-};--export function WebsitesPage() {- const { formatMessage, labels, messages } = useMessages();- const [tab, setTab] = useState(TABS.myWebsites);- const { user } = useUser();- const { showToast } = useToasts();- const cloudMode = Boolean(process.env.cloudMode);-- const handleSave = () => {- showToast({ message: formatMessage(messages.saved), variant: 'success' });- };-- const addButton = (- <>- {user.role !== ROLES.viewOnly && (- <ModalTrigger>- <Button variant="primary">- <Icon>- <Icons.Plus />- </Icon>- <Text>{formatMessage(labels.addWebsite)}</Text>- </Button>- <Modal title={formatMessage(labels.addWebsite)}>- {close => <WebsiteAddForm onSave={handleSave} onClose={close} />}- </Modal>- </ModalTrigger>- )}- </>- );-- return (- <Page>- <PageHeader title={formatMessage(labels.websites)}>{!cloudMode && addButton}</PageHeader>- <Tabs selectedKey={tab} onSelect={setTab} style={{ marginBottom: 30 }}>- <Item key={TABS.myWebsites}>{formatMessage(labels.myWebsites)}</Item>- <Item key={TABS.teamWebsites}>{formatMessage(labels.teamWebsites)}</Item>- </Tabs>- {tab === TABS.myWebsites && (- <WebsiteList showEditButton={!cloudMode} showHeader={false} fetch={fetch} />- )}- {tab === TABS.teamWebsites && (- <WebsiteList- showEditButton={!cloudMode}- showHeader={false}- showTeam={true}- onlyTeams={true}- />- )}- </Page>- );-}--export default WebsitesPage;diff --git a/src/index.ts b/src/index.tsindex f2ef13cab..72fe733b2 100644--- a/src/index.ts+++ b/src/index.ts@@ -89,29 +89,29 @@ export * from 'components/hooks/useUser';export * from 'components/hooks/useWebsite';export * from 'components/hooks/useWebsiteReports';-export * from 'components/pages/settings/teams/TeamAddForm';-export * from 'components/pages/settings/teams/TeamAddWebsiteForm';-export * from 'components/pages/settings/teams/TeamDeleteForm';-export * from 'components/pages/settings/teams/TeamEditForm';-export * from 'components/pages/settings/teams/TeamJoinForm';-export * from 'components/pages/settings/teams/TeamLeaveForm';-export * from 'components/pages/settings/teams/TeamMemberRemoveButton';-export * from 'components/pages/settings/teams/TeamMembers';-export * from 'components/pages/settings/teams/TeamMembersTable';-export * from 'components/pages/settings/teams/TeamSettings';-export * from 'components/pages/settings/teams/TeamsList';-export * from 'components/pages/settings/teams/TeamsTable';-export * from 'components/pages/settings/teams/TeamWebsiteRemoveButton';-export * from 'components/pages/settings/teams/TeamWebsites';-export * from 'components/pages/settings/teams/TeamWebsitesTable';-export * from 'components/pages/settings/teams/WebsiteTags';+export * from 'app/(app)/settings/teams/TeamAddForm';+export * from 'app/(app)/settings/teams/[id]/TeamAddWebsiteForm';+export * from 'app/(app)/settings/teams/TeamDeleteForm';+export * from 'app/(app)/settings/teams/[id]/TeamEditForm';+export * from 'app/(app)/settings/teams/TeamJoinForm';+export * from 'app/(app)/settings/teams/TeamLeaveForm';+export * from 'app/(app)/settings/teams/[id]/TeamMemberRemoveButton';+export * from 'app/(app)/settings/teams/[id]/TeamMembers';+export * from 'app/(app)/settings/teams/[id]/TeamMembersTable';+export * from 'app/(app)/settings/teams/[id]/TeamSettings';+export * from 'app/(app)/settings/teams/TeamsList';+export * from 'app/(app)/settings/teams/TeamsTable';+export * from 'app/(app)/settings/teams/TeamWebsiteRemoveButton';+export * from 'app/(app)/settings/teams/[id]/TeamWebsites';+export * from 'app/(app)/settings/teams/[id]/TeamWebsitesTable';+export * from 'app/(app)/settings/teams/WebsiteTags';-export * from 'components/pages/settings/websites/ShareUrl';-export * from 'components/pages/settings/websites/TrackingCode';-export * from 'components/pages/settings/websites/WebsiteAddForm';-export * from 'components/pages/settings/websites/WebsiteDeleteForm';-export * from 'components/pages/settings/websites/WebsiteEditForm';-export * from 'components/pages/settings/websites/WebsiteResetForm';-export * from 'components/pages/settings/websites/WebsiteSettings';-export * from 'components/pages/settings/websites/WebsitesList';-export * from 'components/pages/settings/websites/WebsitesTable';+export * from 'app/(app)/settings/websites/[id]/ShareUrl';+export * from 'app/(app)/settings/websites/[id]/TrackingCode';+export * from 'app/(app)/settings/websites/WebsiteAddForm';+export * from 'app/(app)/settings/websites/[id]/WebsiteDeleteForm';+export * from 'app/(app)/settings/websites/[id]/WebsiteEditForm';+export * from 'app/(app)/settings/websites/[id]/WebsiteResetForm';+export * from 'app/(app)/settings/websites/WebsiteSettings';+export * from 'app/(app)/settings/websites/WebsitesList';+export * from 'app/(app)/settings/websites/WebsitesTable';diff --git a/src/lib/middleware.ts b/src/lib/middleware.tsindex 4be958b6b..e1e2a38b9 100644--- a/src/lib/middleware.ts+++ b/src/lib/middleware.ts@@ -14,7 +14,6 @@ import {} from 'next-basics';import { NextApiRequestCollect } from 'pages/api/send';import { getUserById } from '../queries';-import { NextApiRequestQueryBody } from './types';const log = debug('umami:middleware');@@ -83,14 +82,18 @@ export const useAuth = createMiddleware(async (req, res, next) => {next();});-export const useValidate = createMiddleware(async (req: any, res, next) => {- try {- const { yup } = req as NextApiRequestQueryBody;+export const useValidate = async (schema, req, res) => {+ return createMiddleware(async (req: any, res, next) => {+ try {+ const rules = schema[req.method];- yup[req.method] && yup[req.method].validateSync({ ...req.query, ...req.body });- } catch (e: any) {- return badRequest(res, e.message);- }+ if (rules) {+ rules.validateSync(req.method === 'GET' ? { ...req.query } : { ...req.body });+ }+ } catch (e: any) {+ return badRequest(res, e.message);+ }- next();-});+ next();+ })(req, res);+};diff --git a/src/pages/404.js b/src/pages/404.jsdeleted file mode 100644index 8fa13a9c7..000000000--- a/src/pages/404.js+++ /dev/null@@ -1,19 +0,0 @@-import { Row, Column, Flexbox } from 'react-basics';-import AppLayout from 'components/layout/AppLayout';-import useMessages from 'components/hooks/useMessages';--export default function Custom404() {- const { formatMessage, labels } = useMessages();-- return (- <AppLayout title={formatMessage(labels.pageNotFound)}>- <Row>- <Column>- <Flexbox alignItems="center" justifyContent="center" flex={1} style={{ minHeight: 600 }}>- <h1>{formatMessage(labels.pageNotFound)}</h1>- </Flexbox>- </Column>- </Row>- </AppLayout>- );-}diff --git a/src/pages/_app.js b/src/pages/_app.jsdeleted file mode 100644index 7022772c7..000000000--- a/src/pages/_app.js+++ /dev/null@@ -1,69 +0,0 @@-import { IntlProvider } from 'react-intl';-import { QueryClient, QueryClientProvider } from '@tanstack/react-query';-import { ReactBasicsProvider } from 'react-basics';-import Head from 'next/head';-import Script from 'next/script';-import { useRouter } from 'next/router';-import ErrorBoundary from 'components/common/ErrorBoundary';-import useLocale from 'components/hooks/useLocale';-import '@fontsource/inter/400.css';-import '@fontsource/inter/700.css';-import 'react-basics/dist/styles.css';-import 'styles/variables.css';-import 'styles/locale.css';-import 'styles/index.css';-import 'chartjs-adapter-date-fns';--const client = new QueryClient({- defaultOptions: {- queries: {- retry: false,- refetchOnWindowFocus: false,- },- },-});--export default function App({ Component, pageProps }) {- const { locale, messages } = useLocale();- const { basePath, pathname } = useRouter();-- return (- <QueryClientProvider client={client}>- <IntlProvider locale={locale} messages={messages[locale]} onError={() => null}>- <ReactBasicsProvider>- <ErrorBoundary>- <Head>- <link rel="icon" href={`${basePath}/favicon.ico`} />- <link- rel="apple-touch-icon"- sizes="180x180"- href={`${basePath}/apple-touch-icon.png`}- />- <link- rel="icon"- type="image/png"- sizes="32x32"- href={`${basePath}/favicon-32x32.png`}- />- <link- rel="icon"- type="image/png"- sizes="16x16"- href={`${basePath}/favicon-16x16.png`}- />- <link rel="manifest" href={`${basePath}/site.webmanifest`} />- <link rel="mask-icon" href={`${basePath}/safari-pinned-tab.svg`} color="#5bbad5" />- <meta name="msapplication-TileColor" content="#da532c" />- <meta name="theme-color" content="#fafafa" media="(prefers-color-scheme: light)" />- <meta name="theme-color" content="#2f2f2f" media="(prefers-color-scheme: dark)" />- <meta name="viewport" content="width=device-width, initial-scale=1" />- <meta name="robots" content="noindex,nofollow" />- </Head>- <Component {...pageProps} />- {!pathname.includes('/share/') && <Script src={`${basePath}/telemetry.js`} />}- </ErrorBoundary>- </ReactBasicsProvider>- </IntlProvider>- </QueryClientProvider>- );-}diff --git a/src/pages/api/auth/login.ts b/src/pages/api/auth/login.tsindex 74661e33e..f3d3d4fdd 100644--- a/src/pages/api/auth/login.ts+++ b/src/pages/api/auth/login.ts@@ -43,8 +43,7 @@ export default async (return forbidden(res);}- req.yup = schema;- await useValidate(req, res);+ await useValidate(schema, req, res);if (req.method === 'POST') {const { username, password } = req.body;diff --git a/src/pages/console/[[...id]].js b/src/pages/console/[[...id]].jsdeleted file mode 100644index d13d6f687..000000000--- a/src/pages/console/[[...id]].js+++ /dev/null@@ -1,22 +0,0 @@-import AppLayout from 'components/layout/AppLayout';-import TestConsole from 'components/pages/console/TestConsole';--export default function ({ disabled }) {- if (disabled) {- return null;- }-- return (- <AppLayout>- <TestConsole />- </AppLayout>- );-}--export async function getServerSideProps() {- return {- props: {- disabled: !process.env.ENABLE_TEST_CONSOLE,- },- };-}diff --git a/src/pages/dashboard/index.js b/src/pages/dashboard/index.jsdeleted file mode 100644index c1a3c09e7..000000000--- a/src/pages/dashboard/index.js+++ /dev/null@@ -1,13 +0,0 @@-import AppLayout from 'components/layout/AppLayout';-import Dashboard from 'components/pages/dashboard/Dashboard';-import useMessages from 'components/hooks/useMessages';--export default function DashboardPage() {- const { formatMessage, labels } = useMessages();-- return (- <AppLayout title={formatMessage(labels.dashboard)}>- <Dashboard />- </AppLayout>- );-}diff --git a/src/pages/index.js b/src/pages/index.jsdeleted file mode 100644index bd4c74be7..000000000--- a/src/pages/index.js+++ /dev/null@@ -1,12 +0,0 @@-import { useEffect } from 'react';-import { useRouter } from 'next/router';--export default function () {- const router = useRouter();-- useEffect(() => {- router.push('/dashboard');- }, []);-- return null;-}diff --git a/src/pages/login.js b/src/pages/login.jsdeleted file mode 100644index a43f8c1f2..000000000--- a/src/pages/login.js+++ /dev/null@@ -1,22 +0,0 @@-import LoginLayout from 'components/pages/login/LoginLayout';-import LoginForm from 'components/pages/login/LoginForm';--export default function ({ disabled }) {- if (disabled) {- return null;- }-- return (- <LoginLayout title="login">- <LoginForm />- </LoginLayout>- );-}--export async function getServerSideProps() {- return {- props: {- disabled: !!process.env.DISABLE_LOGIN,- },- };-}diff --git a/src/pages/reports/[id].js b/src/pages/reports/[id].jsdeleted file mode 100644index 101881a13..000000000--- a/src/pages/reports/[id].js+++ /dev/null@@ -1,24 +0,0 @@-import { useRouter } from 'next/router';-import AppLayout from 'components/layout/AppLayout';-import ReportDetails from 'components/pages/reports/ReportDetails';-import { useApi, useMessages } from 'components/hooks';--export default function () {- const { formatMessage, labels } = useMessages();- const router = useRouter();- const { id } = router.query;- const { get, useQuery } = useApi();- const { data: report } = useQuery(['reports', id], () => get(`/reports/${id}`), {- enabled: !!id,- });-- if (!id || !report) {- return null;- }-- return (- <AppLayout title={formatMessage(labels.websites)}>- <ReportDetails reportId={report.id} reportType={report.type} />- </AppLayout>- );-}diff --git a/src/pages/reports/create.js b/src/pages/reports/create.jsdeleted file mode 100644index 08f97f280..000000000--- a/src/pages/reports/create.js+++ /dev/null@@ -1,13 +0,0 @@-import AppLayout from 'components/layout/AppLayout';-import ReportTemplates from 'components/pages/reports/ReportTemplates';-import { useMessages } from 'components/hooks';--export default function () {- const { formatMessage, labels } = useMessages();-- return (- <AppLayout title={formatMessage(labels.reports)}>- <ReportTemplates />- </AppLayout>- );-}diff --git a/src/pages/reports/funnel.js b/src/pages/reports/funnel.jsdeleted file mode 100644index 78174f7b3..000000000--- a/src/pages/reports/funnel.js+++ /dev/null@@ -1,13 +0,0 @@-import AppLayout from 'components/layout/AppLayout';-import FunnelReport from 'components/pages/reports/funnel/FunnelReport';-import useMessages from 'components/hooks/useMessages';--export default function () {- const { formatMessage, labels } = useMessages();-- return (- <AppLayout title={`${formatMessage(labels.funnel)} - ${formatMessage(labels.reports)}`}>- <FunnelReport />- </AppLayout>- );-}diff --git a/src/pages/reports/index.js b/src/pages/reports/index.jsdeleted file mode 100644index a1a13a682..000000000--- a/src/pages/reports/index.js+++ /dev/null@@ -1,13 +0,0 @@-import AppLayout from 'components/layout/AppLayout';-import ReportsPage from 'components/pages/reports/ReportsPage';-import { useMessages } from 'components/hooks';--export default function () {- const { formatMessage, labels } = useMessages();-- return (- <AppLayout title={formatMessage(labels.reports)}>- <ReportsPage />- </AppLayout>- );-}diff --git a/src/pages/reports/insights.js b/src/pages/reports/insights.jsdeleted file mode 100644index c52207219..000000000--- a/src/pages/reports/insights.js+++ /dev/null@@ -1,13 +0,0 @@-import AppLayout from 'components/layout/AppLayout';-import InsightsReport from 'components/pages/reports/insights/InsightsReport';-import { useMessages } from 'components/hooks';--export default function () {- const { formatMessage, labels } = useMessages();-- return (- <AppLayout title={`${formatMessage(labels.insights)} - ${formatMessage(labels.reports)}`}>- <InsightsReport />- </AppLayout>- );-}diff --git a/src/pages/reports/retention.js b/src/pages/reports/retention.jsdeleted file mode 100644index 7f5d4cf26..000000000--- a/src/pages/reports/retention.js+++ /dev/null@@ -1,13 +0,0 @@-import AppLayout from 'components/layout/AppLayout';-import RetentionReport from 'components/pages/reports/retention/RetentionReport';-import useMessages from 'components/hooks/useMessages';--export default function () {- const { formatMessage, labels } = useMessages();-- return (- <AppLayout title={`${formatMessage(labels.retention)} - ${formatMessage(labels.reports)}`}>- <RetentionReport />- </AppLayout>- );-}diff --git a/src/pages/settings/profile/index.js b/src/pages/settings/profile/index.jsdeleted file mode 100644index d340c1930..000000000--- a/src/pages/settings/profile/index.js+++ /dev/null@@ -1,15 +0,0 @@-import AppLayout from 'components/layout/AppLayout';-import SettingsLayout from 'components/layout/SettingsLayout';-import ProfileSettings from 'components/pages/settings/profile/ProfileSettings';-import useMessages from 'components/hooks/useMessages';--export default function () {- const { formatMessage, labels } = useMessages();- return (- <AppLayout title={`${formatMessage(labels.settings)} - ${formatMessage(labels.profile)}`}>- <SettingsLayout>- <ProfileSettings />- </SettingsLayout>- </AppLayout>- );-}diff --git a/src/pages/settings/teams/[id].js b/src/pages/settings/teams/[id].jsdeleted file mode 100644index 775a6a08c..000000000--- a/src/pages/settings/teams/[id].js+++ /dev/null@@ -1,31 +0,0 @@-import AppLayout from 'components/layout/AppLayout';-import SettingsLayout from 'components/layout/SettingsLayout';-import TeamSettings from 'components/pages/settings/teams/TeamSettings';-import { useRouter } from 'next/router';-import useMessages from 'components/hooks/useMessages';--export default function ({ disabled }) {- const router = useRouter();- const { id } = router.query;- const { formatMessage, labels } = useMessages();-- if (!id || disabled) {- return null;- }-- return (- <AppLayout title={`${formatMessage(labels.settings)} - ${formatMessage(labels.teams)}`}>- <SettingsLayout>- <TeamSettings teamId={id} />- </SettingsLayout>- </AppLayout>- );-}--export async function getServerSideProps() {- return {- props: {- disabled: !!process.env.CLOUD_MODE,- },- };-}diff --git a/src/pages/settings/teams/index.js b/src/pages/settings/teams/index.jsdeleted file mode 100644index 7e56a7d73..000000000--- a/src/pages/settings/teams/index.js+++ /dev/null@@ -1,27 +0,0 @@-import AppLayout from 'components/layout/AppLayout';-import SettingsLayout from 'components/layout/SettingsLayout';-import TeamsList from 'components/pages/settings/teams/TeamsList';-import useMessages from 'components/hooks/useMessages';--export default function ({ disabled }) {- const { formatMessage, labels } = useMessages();- if (disabled) {- return null;- }-- return (- <AppLayout title={`${formatMessage(labels.settings)} - ${formatMessage(labels.teams)}`}>- <SettingsLayout>- <TeamsList />- </SettingsLayout>- </AppLayout>- );-}--export async function getServerSideProps() {- return {- props: {- disabled: !!process.env.CLOUD_MODE,- },- };-}diff --git a/src/pages/settings/users/[id].js b/src/pages/settings/users/[id].jsdeleted file mode 100644index fdd708fdc..000000000--- a/src/pages/settings/users/[id].js+++ /dev/null@@ -1,31 +0,0 @@-import AppLayout from 'components/layout/AppLayout';-import SettingsLayout from 'components/layout/SettingsLayout';-import UserSettings from 'components/pages/settings/users/UserSettings';-import { useRouter } from 'next/router';-import useMessages from 'components/hooks/useMessages';--export default function ({ disabled }) {- const router = useRouter();- const { id } = router.query;- const { formatMessage, labels } = useMessages();-- if (!id || disabled) {- return null;- }-- return (- <AppLayout title={`${formatMessage(labels.settings)} - ${formatMessage(labels.users)}`}>- <SettingsLayout>- <UserSettings userId={id} />- </SettingsLayout>- </AppLayout>- );-}--export async function getServerSideProps() {- return {- props: {- disabled: !!process.env.CLOUD_MODE,- },- };-}diff --git a/src/pages/settings/users/index.js b/src/pages/settings/users/index.jsdeleted file mode 100644index 90026d87c..000000000--- a/src/pages/settings/users/index.js+++ /dev/null@@ -1,27 +0,0 @@-import AppLayout from 'components/layout/AppLayout';-import SettingsLayout from 'components/layout/SettingsLayout';-import UsersList from 'components/pages/settings/users/UsersList';-import useMessages from 'components/hooks/useMessages';--export default function ({ disabled }) {- const { formatMessage, labels } = useMessages();- if (disabled) {- return null;- }-- return (- <AppLayout title={`${formatMessage(labels.settings)} - ${formatMessage(labels.users)}`}>- <SettingsLayout>- <UsersList />- </SettingsLayout>- </AppLayout>- );-}--export async function getServerSideProps() {- return {- props: {- disabled: !!process.env.CLOUD_MODE,- },- };-}diff --git a/src/pages/settings/websites/[id].js b/src/pages/settings/websites/[id].jsdeleted file mode 100644index 506da107a..000000000--- a/src/pages/settings/websites/[id].js+++ /dev/null@@ -1,31 +0,0 @@-import AppLayout from 'components/layout/AppLayout';-import { useRouter } from 'next/router';-import WebsiteSettings from 'components/pages/settings/websites/WebsiteSettings';-import SettingsLayout from 'components/layout/SettingsLayout';-import useMessages from 'components/hooks/useMessages';--export default function ({ disabled }) {- const router = useRouter();- const { id } = router.query;- const { formatMessage, labels } = useMessages();-- if (!id || disabled) {- return null;- }-- return (- <AppLayout title={`${formatMessage(labels.settings)} - ${formatMessage(labels.websites)}`}>- <SettingsLayout>- <WebsiteSettings websiteId={id} />- </SettingsLayout>- </AppLayout>- );-}--export async function getServerSideProps() {- return {- props: {- disabled: !!process.env.CLOUD_MODE,- },- };-}diff --git a/src/pages/settings/websites/index.js b/src/pages/settings/websites/index.jsdeleted file mode 100644index f4551f4a8..000000000--- a/src/pages/settings/websites/index.js+++ /dev/null@@ -1,27 +0,0 @@-import AppLayout from 'components/layout/AppLayout';-import SettingsLayout from 'components/layout/SettingsLayout';-import WebsitesList from 'components/pages/settings/websites/WebsitesList';-import useMessages from 'components/hooks/useMessages';--export default function ({ disabled }) {- const { formatMessage, labels } = useMessages();- if (disabled) {- return null;- }-- return (- <AppLayout title={`${formatMessage(labels.settings)} - ${formatMessage(labels.websites)}`}>- <SettingsLayout>- <WebsitesList />- </SettingsLayout>- </AppLayout>- );-}--export async function getServerSideProps() {- return {- props: {- disabled: !!process.env.CLOUD_MODE,- },- };-}diff --git a/src/pages/share/[...id].js b/src/pages/share/[...id].jsdeleted file mode 100644index a2c69df8d..000000000--- a/src/pages/share/[...id].js+++ /dev/null@@ -1,21 +0,0 @@-import { useRouter } from 'next/router';-import ShareLayout from 'components/layout/ShareLayout';-import WebsiteDetailsPage from 'components/pages/websites/WebsiteDetailsPage';-import useShareToken from 'components/hooks/useShareToken';--export default function () {- const router = useRouter();- const { id } = router.query;- const shareId = id?.[0];- const shareToken = useShareToken(shareId);-- if (!shareToken) {- return null;- }-- return (- <ShareLayout>- <WebsiteDetailsPage websiteId={shareToken.websiteId} />- </ShareLayout>- );-}diff --git a/src/pages/websites/[id]/event-data.js b/src/pages/websites/[id]/event-data.jsdeleted file mode 100644index b99d2fc96..000000000--- a/src/pages/websites/[id]/event-data.js+++ /dev/null@@ -1,20 +0,0 @@-import { useRouter } from 'next/router';-import AppLayout from 'components/layout/AppLayout';-import WebsiteEventDataPage from 'components/pages/websites/WebsiteEventDataPage';-import useMessages from 'components/hooks/useMessages';--export default function () {- const { formatMessage, labels } = useMessages();- const router = useRouter();- const { id } = router.query;-- if (!id) {- return null;- }-- return (- <AppLayout title={formatMessage(labels.websites)}>- <WebsiteEventDataPage websiteId={id} />- </AppLayout>- );-}diff --git a/src/pages/websites/[id]/index.js b/src/pages/websites/[id]/index.jsdeleted file mode 100644index d3ec5f938..000000000--- a/src/pages/websites/[id]/index.js+++ /dev/null@@ -1,20 +0,0 @@-import { useRouter } from 'next/router';-import AppLayout from 'components/layout/AppLayout';-import WebsiteDetailsPage from 'components/pages/websites/WebsiteDetailsPage';-import useMessages from 'components/hooks/useMessages';--export default function () {- const { formatMessage, labels } = useMessages();- const router = useRouter();- const { id } = router.query;-- if (!id) {- return null;- }-- return (- <AppLayout title={formatMessage(labels.websites)}>- <WebsiteDetailsPage websiteId={id} />- </AppLayout>- );-}diff --git a/src/pages/websites/[id]/realtime.js b/src/pages/websites/[id]/realtime.jsdeleted file mode 100644index efe486a54..000000000--- a/src/pages/websites/[id]/realtime.js+++ /dev/null@@ -1,18 +0,0 @@-import { useRouter } from 'next/router';-import AppLayout from 'components/layout/AppLayout';-import RealtimePage from 'components/pages/realtime/RealtimePage';--export default function () {- const router = useRouter();- const { id: websiteId } = router.query;-- if (!websiteId) {- return null;- }-- return (- <AppLayout>- <RealtimePage websiteId={websiteId} />- </AppLayout>- );-}diff --git a/src/pages/websites/[id]/reports.js b/src/pages/websites/[id]/reports.jsdeleted file mode 100644index ccd88081e..000000000--- a/src/pages/websites/[id]/reports.js+++ /dev/null@@ -1,18 +0,0 @@-import { useRouter } from 'next/router';-import AppLayout from 'components/layout/AppLayout';-import WebsiteReportsPage from 'components/pages/websites/WebsiteReportsPage';--export default function () {- const router = useRouter();- const { id: websiteId } = router.query;-- if (!websiteId) {- return null;- }-- return (- <AppLayout>- <WebsiteReportsPage websiteId={websiteId} />- </AppLayout>- );-}diff --git a/src/pages/websites/index.js b/src/pages/websites/index.jsdeleted file mode 100644index 43eed640d..000000000--- a/src/pages/websites/index.js+++ /dev/null@@ -1,13 +0,0 @@-import AppLayout from 'components/layout/AppLayout';-import WebsitesPage from 'components/pages/websites/WebsitesPage';-import useMessages from 'components/hooks/useMessages';--export default function () {- const { formatMessage, labels } = useMessages();-- return (- <AppLayout title={formatMessage(labels.websites)}>- <WebsitesPage />- </AppLayout>- );-}diff --git a/tsconfig.json b/tsconfig.jsonindex 71094dd79..9b8b6033f 100644--- a/tsconfig.json+++ b/tsconfig.json@@ -30,8 +30,13 @@"queries/*": ["./queries/*"],"store/*": ["./store/*"],"styles/*": ["./styles/*"]- }+ },+ "plugins": [+ {+ "name": "next"+ }+ ]},- "include": ["**/*.ts", "**/*.tsx", "**/*.js", "**/*.jsx", "next-env.d.ts"],+ "include": ["**/*.ts", "**/*.tsx", "**/*.js", "**/*.jsx", "next-env.d.ts", ".next/types/**/*.ts"],"exclude": ["node_modules"]}diff --git a/yarn.lock b/yarn.lockindex ecb1a7ebe..e6c2c6c11 100644--- a/yarn.lock+++ b/yarn.lock@@ -35,7 +35,7 @@resolved "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.5.tgz"integrity sha512-4Jc/YuIaYqKnDDz892kPIledykKg12Aw1PYX5i/TY28anJtacvM1Rrr8wbieB9GfEJwlzqT0hUEao0CxEebiDA==-"@babel/core@^7.19.6", "@babel/core@^7.21.3", "@babel/core@^7.9.0":+"@babel/core@^7.21.3", "@babel/core@^7.9.0":version "7.22.5"resolved "https://registry.npmjs.org/@babel/core/-/core-7.22.5.tgz"integrity sha512-SBuTAjg91A3eKOvD+bPEz3LlhHZRNu1nFOVts9lzDJTXshHTjII0BAtDS3Y2DAkdZdDKWVZGVwkDfc4Clxn1dg==@@ -777,7 +777,7 @@dependencies:"@babel/helper-plugin-utils" "^7.18.6"-"@babel/plugin-transform-react-constant-elements@^7.18.12", "@babel/plugin-transform-react-constant-elements@^7.21.3":+"@babel/plugin-transform-react-constant-elements@^7.21.3":version "7.21.3"resolved "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.21.3.tgz"integrity sha512-4DVcFeWe/yDYBLp0kBmOGFJ6N2UYg7coGid1gdxb4co62dy/xISDMaYBXBVXEDhfgMk7qkbcYiGtwd5Q/hwDDQ==@@ -893,7 +893,7 @@"@babel/helper-create-regexp-features-plugin" "^7.18.6""@babel/helper-plugin-utils" "^7.18.6"-"@babel/preset-env@^7.19.4", "@babel/preset-env@^7.20.2":+"@babel/preset-env@^7.20.2":version "7.21.4"resolved "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.21.4.tgz"integrity sha512-2W57zHs2yDLm6GD5ZpvNn71lZ0B/iypSdIeq25OurDKji6AdzV07qp4s3n1/x5BqtiGaTrPN3nerlSCaC5qNTw==@@ -997,7 +997,7 @@"@babel/plugin-transform-react-jsx-development" "^7.18.6""@babel/plugin-transform-react-pure-annotations" "^7.18.6"-"@babel/preset-typescript@^7.18.6", "@babel/preset-typescript@^7.21.0":+"@babel/preset-typescript@^7.21.0":version "7.21.4"resolved "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.21.4.tgz"integrity sha512-sMLNWY37TCdRH/bJ6ZeeOH1nPuanED7Ai9Y/vH31IPqalioJ6ZNFUWONsakhv4r4n+I6gm5lmoE0olkgib/j/A==@@ -1331,22 +1331,17 @@resolved "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.17.19.tgz"integrity sha512-lAhycmKnVOuRYNtRtatQR1LPQf2oYCkRGkSFnseDAKPl8lu5SOsK/e1sXe5a0Pc5kHIHe6P2I/ilntNv2xf3cA==-"@eslint-community/eslint-utils@^4.2.0":+"@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0":version "4.4.0"resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59"integrity sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==dependencies:eslint-visitor-keys "^3.3.0"-"@eslint-community/regexpp@^4.4.0":- version "4.6.2"- resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.6.2.tgz#1816b5f6948029c5eaacb0703b850ee0cb37d8f8"- integrity sha512-pPTNuaAG3QMH+buKyBIGJs3g/S5y0caxw0ygM3YyE6yJFySwiGGSzA+mM3KJ8QQvzeLh3blwgSonkFjgQdxzMw==--"@eslint-community/regexpp@^4.6.1":- version "4.8.1"- resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.8.1.tgz#8c4bb756cc2aa7eaf13cfa5e69c83afb3260c20c"- integrity sha512-PWiOzLIUAjN/w5K17PoF4n6sKBw0gqLHPhywmYHP4t1VFQQVYeb1yWsJwnMVEMl3tUHME7X/SJPZLmtG7XBDxQ==+"@eslint-community/regexpp@^4.5.1", "@eslint-community/regexpp@^4.6.1":+ version "4.9.0"+ resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.9.0.tgz#7ccb5f58703fa61ffdcbf39e2c604a109e781162"+ integrity sha512-zJmuCWj2VLBt4c25CfBIbMZLGLyhkvs7LznyVX5HfpzeocThgIj5XQK4L+g3U36mMcx8bPMhGyPpwCATamC4jQ=="@eslint/eslintrc@^2.1.2":version "2.1.2"@@ -1363,10 +1358,10 @@minimatch "^3.1.2"strip-json-comments "^3.1.1"-"@eslint/[email protected]":- version "8.49.0"- resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.49.0.tgz#86f79756004a97fa4df866835093f1df3d03c333"- integrity sha512-1S8uAY/MTJqVx0SC4epBq+N2yhuwtNwLbJYNZyhL2pO1ZVKn5HFXav5T41Ryzy9K9V7ZId2JB2oy/W4aCd9/2w==+"@eslint/[email protected]":+ version "8.50.0"+ resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.50.0.tgz#9e93b850f0f3fa35f5fa59adfd03adae8488e484"+ integrity sha512-NCC3zz2+nvYd+Ckfh87rA47zfu2QsQpvc6k1yzTk+b9KzRj0wkGa8LSoGOXN6Zv4lRf/EIoZ80biDh9HOI+RNQ=="@fastify/accept-negotiator@^1.1.0":version "1.1.0"@@ -1408,6 +1403,14 @@"@formatjs/intl-localematcher" "0.2.25"tslib "^2.1.0"+"@formatjs/[email protected]":+ version "1.17.2"+ resolved "https://registry.yarnpkg.com/@formatjs/ecma402-abstract/-/ecma402-abstract-1.17.2.tgz#d197c6e26b9fd96ff7ba3b3a0cc2f25f1f2dcac3"+ integrity sha512-k2mTh0m+IV1HRdU0xXM617tSQTi53tVR2muvYOsBeYcUgEAyxV1FOC7Qj279th3fBVQ+Dj6muvNJZcHSPNdbKg==+ dependencies:+ "@formatjs/intl-localematcher" "0.4.2"+ tslib "^2.4.0"+"@formatjs/[email protected]":version "1.4.0"resolved "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.4.0.tgz"@@ -1422,12 +1425,12 @@dependencies:tslib "^2.0.1"-"@formatjs/[email protected]":- version "1.2.1"- resolved "https://registry.npmjs.org/@formatjs/fast-memoize/-/fast-memoize-1.2.1.tgz"- integrity sha512-Rg0e76nomkz3vF9IPlKeV+Qynok0r7YZjL6syLz4/urSg0IbjPZCB/iYUMNsYA643gh4mgrX3T7KEIFIxJBQeg==+"@formatjs/[email protected]":+ version "2.2.0"+ resolved "https://registry.yarnpkg.com/@formatjs/fast-memoize/-/fast-memoize-2.2.0.tgz#33bd616d2e486c3e8ef4e68c99648c196887802b"+ integrity sha512-hnk/nY8FyrL5YxwP9e4r9dqeM6cAbo8PeU9UjyXojZMNvVad2Z06FAVHyR3Ecw6fza+0GH7vdJgiKIVXTMbSBA==dependencies:- tslib "^2.1.0"+ tslib "^2.4.0""@formatjs/[email protected]":version "2.1.0"@@ -1438,6 +1441,15 @@"@formatjs/icu-skeleton-parser" "1.3.6"tslib "^2.1.0"+"@formatjs/[email protected]":+ version "2.6.2"+ resolved "https://registry.yarnpkg.com/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.6.2.tgz#9bbb29099416e4ce2c7df50029c48985d4f901b3"+ integrity sha512-nF/Iww7sc5h+1MBCDRm68qpHTCG4xvGzYs/x9HFcDETSGScaJ1Fcadk5U/NXjXeCtzD+DhN4BAwKFVclHfKMdA==+ dependencies:+ "@formatjs/ecma402-abstract" "1.17.2"+ "@formatjs/icu-skeleton-parser" "1.6.2"+ tslib "^2.4.0"+"@formatjs/[email protected]":version "1.3.6"resolved "https://registry.npmjs.org/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.3.6.tgz"@@ -1446,23 +1458,31 @@"@formatjs/ecma402-abstract" "1.11.4"tslib "^2.1.0"-"@formatjs/[email protected]":- version "5.4.3"- resolved "https://registry.npmjs.org/@formatjs/intl-displaynames/-/intl-displaynames-5.4.3.tgz"- integrity sha512-4r12A3mS5dp5hnSaQCWBuBNfi9Amgx2dzhU4lTFfhSxgb5DOAiAbMpg6+7gpWZgl4ahsj3l2r/iHIjdmdXOE2Q==+"@formatjs/[email protected]":+ version "1.6.2"+ resolved "https://registry.yarnpkg.com/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.6.2.tgz#00303034dc08583973c8aa67b96534c49c0bad8d"+ integrity sha512-VtB9Slo4ZL6QgtDFJ8Injvscf0xiDd4bIV93SOJTBjUF4xe2nAWOoSjLEtqIG+hlIs1sNrVKAaFo3nuTI4r5ZA==dependencies:- "@formatjs/ecma402-abstract" "1.11.4"- "@formatjs/intl-localematcher" "0.2.25"- tslib "^2.1.0"+ "@formatjs/ecma402-abstract" "1.17.2"+ tslib "^2.4.0"-"@formatjs/[email protected]":- version "6.5.3"- resolved "https://registry.npmjs.org/@formatjs/intl-listformat/-/intl-listformat-6.5.3.tgz"- integrity sha512-ozpz515F/+3CU+HnLi5DYPsLa6JoCfBggBSSg/8nOB5LYSFW9+ZgNQJxJ8tdhKYeODT+4qVHX27EeJLoxLGLNg==+"@formatjs/[email protected]":+ version "6.5.2"+ resolved "https://registry.yarnpkg.com/@formatjs/intl-displaynames/-/intl-displaynames-6.5.2.tgz#b14ffd0962d5b5cfd71457efc389f0bca83a00db"+ integrity sha512-uC2VBlz+WydGTDDpJwMTQuPH3CUpTricr91WH1QMfz5oEHg2sB7mUERcZONE/lu8MOe1jREIx4vBciZEVTqkmA==dependencies:- "@formatjs/ecma402-abstract" "1.11.4"- "@formatjs/intl-localematcher" "0.2.25"- tslib "^2.1.0"+ "@formatjs/ecma402-abstract" "1.17.2"+ "@formatjs/intl-localematcher" "0.4.2"+ tslib "^2.4.0"++"@formatjs/[email protected]":+ version "7.4.2"+ resolved "https://registry.yarnpkg.com/@formatjs/intl-listformat/-/intl-listformat-7.4.2.tgz#c8d86d3b15eead41f74748d1c79d6450fd1bad82"+ integrity sha512-+6bSVudEQkf12Hh7kuKt8Xv/MyFlqdwA4V4NLnTZW8uYdF9RxlOELDD0rPaOc2++TMKIzI5o6XXwHPvpL6VrPA==+ dependencies:+ "@formatjs/ecma402-abstract" "1.17.2"+ "@formatjs/intl-localematcher" "0.4.2"+ tslib "^2.4.0""@formatjs/[email protected]":version "0.2.25"@@ -1471,6 +1491,13 @@dependencies:tslib "^2.1.0"+"@formatjs/[email protected]":+ version "0.4.2"+ resolved "https://registry.yarnpkg.com/@formatjs/intl-localematcher/-/intl-localematcher-0.4.2.tgz#7e6e596dbaf2f0c5a7c22da5a01d5c55f4c37e9a"+ integrity sha512-BGdtJFmaNJy5An/Zan4OId/yR9Ih1OojFjcduX/xOvq798OgWSyDtd6Qd5jqJXwJs1ipe4Fxu9+cshic5Ox2tA==+ dependencies:+ tslib "^2.4.0"+"@formatjs/intl-numberformat@^5.5.2":version "5.7.6"resolved "https://registry.npmjs.org/@formatjs/intl-numberformat/-/intl-numberformat-5.7.6.tgz"@@ -1479,18 +1506,18 @@"@formatjs/ecma402-abstract" "1.4.0"tslib "^2.0.1"-"@formatjs/[email protected]":- version "2.2.1"- resolved "https://registry.npmjs.org/@formatjs/intl/-/intl-2.2.1.tgz"- integrity sha512-vgvyUOOrzqVaOFYzTf2d3+ToSkH2JpR7x/4U1RyoHQLmvEaTQvXJ7A2qm1Iy3brGNXC/+/7bUlc3lpH+h/LOJA==- dependencies:- "@formatjs/ecma402-abstract" "1.11.4"- "@formatjs/fast-memoize" "1.2.1"- "@formatjs/icu-messageformat-parser" "2.1.0"- "@formatjs/intl-displaynames" "5.4.3"- "@formatjs/intl-listformat" "6.5.3"- intl-messageformat "9.13.0"- tslib "^2.1.0"+"@formatjs/[email protected]":+ version "2.9.3"+ resolved "https://registry.yarnpkg.com/@formatjs/intl/-/intl-2.9.3.tgz#e570c4b1afb173dfb1f80a42624425dde9841329"+ integrity sha512-hclPdyCF1zk2XmhgdXfl5Sd30QEdRBnIijH7Vc1AWz2K0/saVRrxuL3UYn+m3xEyfOa4yDbTWVbmXDL0XEzlsQ==+ dependencies:+ "@formatjs/ecma402-abstract" "1.17.2"+ "@formatjs/fast-memoize" "2.2.0"+ "@formatjs/icu-messageformat-parser" "2.6.2"+ "@formatjs/intl-displaynames" "6.5.2"+ "@formatjs/intl-listformat" "7.4.2"+ intl-messageformat "10.5.3"+ tslib "^2.4.0""@formatjs/[email protected]":version "3.9.4"@@ -1793,10 +1820,10 @@"@netlify/node-cookies" "^0.1.0"urlpattern-polyfill "8.0.2"-"@next/[email protected]":- version "13.5.2"- resolved "https://registry.yarnpkg.com/@next/env/-/env-13.5.2.tgz#1c09e6cf1df8b1edf3cf0ca9c0e0119a49802a5d"- integrity sha512-dUseBIQVax+XtdJPzhwww4GetTjlkRSsXeQnisIJWBaHsnxYcN2RGzsPHi58D6qnkATjnhuAtQTJmR1hKYQQPg==+"@next/[email protected]":+ version "13.5.3"+ resolved "https://registry.yarnpkg.com/@next/env/-/env-13.5.3.tgz#402da9a0af87f93d853519f0c2a602b1ab637c2c"+ integrity sha512-X4te86vsbjsB7iO4usY9jLPtZ827Mbx+WcwNBGUOIuswuTAKQtzsuoxc/6KLxCMvogKG795MhrR1LDhYgDvasg=="@next/[email protected]":version "12.3.4"@@ -1805,50 +1832,50 @@dependencies:glob "7.1.7"-"@next/[email protected]":- version "13.5.2"- resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-13.5.2.tgz#f099a36fdd06b1949eb4e190aee95a52b97d3885"- integrity sha512-7eAyunAWq6yFwdSQliWMmGhObPpHTesiKxMw4DWVxhm5yLotBj8FCR4PXGkpRP2tf8QhaWuVba+/fyAYggqfQg==--"@next/[email protected]":- version "13.5.2"- resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-13.5.2.tgz#b8950fbe150db6f82961619e31fc6e9232fce8f4"- integrity sha512-WxXYWE7zF1ch8rrNh5xbIWzhMVas6Vbw+9BCSyZvu7gZC5EEiyZNJsafsC89qlaSA7BnmsDXVWQmc+s1feSYbQ==--"@next/[email protected]":- version "13.5.2"- resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-13.5.2.tgz#8134d31fa9ad6848561b6969d27a8c07ab090974"- integrity sha512-URSwhRYrbj/4MSBjLlefPTK3/tvg95TTm6mRaiZWBB6Za3hpHKi8vSdnCMw5D2aP6k0sQQIEG6Pzcfwm+C5vrg==--"@next/[email protected]":- version "13.5.2"- resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-13.5.2.tgz#56233fe5140ed437c638194f0a01a3f89821ca89"- integrity sha512-HefiwAdIygFyNmyVsQeiJp+j8vPKpIRYDlmTlF9/tLdcd3qEL/UEBswa1M7cvO8nHcr27ZTKXz5m7dkd56/Esg==--"@next/[email protected]":- version "13.5.2"- resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-13.5.2.tgz#1947a9dc603e6d5d5a8e99db7d42e2240c78e713"- integrity sha512-htGVVroW0tdHgMYwKWkxWvVoG2RlAdDXRO1RQxYDvOBQsaV0nZsgKkw0EJJJ3urTYnwKskn/MXm305cOgRxD2w==--"@next/[email protected]":- version "13.5.2"- resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-13.5.2.tgz#83eea3985eed84fbbbb1004a555d2f093d4ed245"- integrity sha512-UBD333GxbHVGi7VDJPPDD1bKnx30gn2clifNJbla7vo5nmBV+x5adyARg05RiT9amIpda6yzAEEUu+s774ldkw==--"@next/[email protected]":- version "13.5.2"- resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-13.5.2.tgz#c3734235e85458b76ec170dd0d6c13c2fdfac5ed"- integrity sha512-Em9ApaSFIQnWXRT3K6iFnr9uBXymixLc65Xw4eNt7glgH0eiXpg+QhjmgI2BFyc7k4ZIjglfukt9saNpEyolWA==--"@next/[email protected]":- version "13.5.2"- resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-13.5.2.tgz#cf16184af9be8b8f7750833a441c116b7a76b273"- integrity sha512-TBACBvvNYU+87X0yklSuAseqdpua8m/P79P0SG1fWUvWDDA14jASIg7kr86AuY5qix47nZLEJ5WWS0L20jAUNw==--"@next/[email protected]":- version "13.5.2"- resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-13.5.2.tgz#cf8db00763d9219567655b90853b7d484f3fcad6"- integrity sha512-LfTHt+hTL8w7F9hnB3H4nRasCzLD/fP+h4/GUVBTxrkMJOnh/7OZ0XbYDKO/uuWwryJS9kZjhxcruBiYwc5UDw==+"@next/[email protected]":+ version "13.5.3"+ resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-13.5.3.tgz#f72eac8c7b71d33e0768bd3c8baf68b00fea0160"+ integrity sha512-6hiYNJxJmyYvvKGrVThzo4nTcqvqUTA/JvKim7Auaj33NexDqSNwN5YrrQu+QhZJCIpv2tULSHt+lf+rUflLSw==++"@next/[email protected]":+ version "13.5.3"+ resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-13.5.3.tgz#96eda3a1247a713579eb241d76d3f503291c8938"+ integrity sha512-UpBKxu2ob9scbpJyEq/xPgpdrgBgN3aLYlxyGqlYX5/KnwpJpFuIHU2lx8upQQ7L+MEmz+fA1XSgesoK92ppwQ==++"@next/[email protected]":+ version "13.5.3"+ resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-13.5.3.tgz#132e155a029310fffcdfd3e3c4255f7ce9fd2714"+ integrity sha512-5AzM7Yx1Ky+oLY6pHs7tjONTF22JirDPd5Jw/3/NazJ73uGB05NqhGhB4SbeCchg7SlVYVBeRMrMSZwJwq/xoA==++"@next/[email protected]":+ version "13.5.3"+ resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-13.5.3.tgz#981d7d8fdcf040bd0c89588ef4139c28805f5cf1"+ integrity sha512-A/C1shbyUhj7wRtokmn73eBksjTM7fFQoY2v/0rTM5wehpkjQRLOXI8WJsag2uLhnZ4ii5OzR1rFPwoD9cvOgA==++"@next/[email protected]":+ version "13.5.3"+ resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-13.5.3.tgz#b8263663acda7b84bc2c4ffa39ca4b0172a78060"+ integrity sha512-FubPuw/Boz8tKkk+5eOuDHOpk36F80rbgxlx4+xty/U71e3wZZxVYHfZXmf0IRToBn1Crb8WvLM9OYj/Ur815g==++"@next/[email protected]":+ version "13.5.3"+ resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-13.5.3.tgz#cd0bed8ee92032c25090bed9d95602ac698d925f"+ integrity sha512-DPw8nFuM1uEpbX47tM3wiXIR0Qa+atSzs9Q3peY1urkhofx44o7E1svnq+a5Q0r8lAcssLrwiM+OyJJgV/oj7g==++"@next/[email protected]":+ version "13.5.3"+ resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-13.5.3.tgz#7f556674ca97e6936220d10c58252cc36522d80a"+ integrity sha512-zBPSP8cHL51Gub/YV8UUePW7AVGukp2D8JU93IHbVDu2qmhFAn9LWXiOOLKplZQKxnIPUkJTQAJDCWBWU4UWUA==++"@next/[email protected]":+ version "13.5.3"+ resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-13.5.3.tgz#4912721fb8695f11daec4cde42e73dc57bcc479f"+ integrity sha512-ONcL/lYyGUj4W37D4I2I450SZtSenmFAvapkJQNIJhrPMhzDU/AdfLkW98NvH1D2+7FXwe7yclf3+B7v28uzBQ==++"@next/[email protected]":+ version "13.5.3"+ resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-13.5.3.tgz#97340a709febb60ff73003566b99d127d4e5b881"+ integrity sha512-2Vz2tYWaLqJvLcWbbTlJ5k9AN6JD7a5CN2pAeIzpbecK8ZF/yobA39cXtv6e+Z8c5UJuVOmaTldEAIxvsIux/Q=="@nodelib/[email protected]":version "2.1.5"@@ -2176,26 +2203,11 @@resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-8.0.0.tgz#4001f5d5dd87fa13303e36ee106e3ff3a7eb8b22"integrity sha512-b9MIk7yhdS1pMCZM8VeNfUlSKVRhsHZNMl5O9SfaX0l0t5wjdgu4IDzGB8bpnGBBOjGST3rRFVsaaEtI4W6f7g==-"@svgr/babel-plugin-add-jsx-attribute@^6.5.1":- version "6.5.1"- resolved "https://registry.npmjs.org/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-6.5.1.tgz"- integrity sha512-9PYGcXrAxitycIjRmZB+Q0JaN07GZIWaTBIGQzfaZv+qr1n8X1XUEJ5rZ/vx6OVD9RRYlrNnXWExQXcmZeD/BQ==--"@svgr/babel-plugin-remove-jsx-attribute@*":- version "7.0.0"- resolved "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-attribute/-/babel-plugin-remove-jsx-attribute-7.0.0.tgz"- integrity sha512-iiZaIvb3H/c7d3TH2HBeK91uI2rMhZNwnsIrvd7ZwGLkFw6mmunOCoVnjdYua662MqGFxlN9xTq4fv9hgR4VXQ==-"@svgr/[email protected]":version "8.0.0"resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-remove-jsx-attribute/-/babel-plugin-remove-jsx-attribute-8.0.0.tgz#69177f7937233caca3a1afb051906698f2f59186"integrity sha512-BcCkm/STipKvbCl6b7QFrMh/vx00vIP63k2eM66MfHJzPr6O2U0jYEViXkHJWqXqQYjdeA9cuCl5KWmlwjDvbA==-"@svgr/babel-plugin-remove-jsx-empty-expression@*":- version "7.0.0"- resolved "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-empty-expression/-/babel-plugin-remove-jsx-empty-expression-7.0.0.tgz"- integrity sha512-sQQmyo+qegBx8DfFc04PFmIO1FP1MHI1/QEpzcIcclo5OAISsOJPW76ZIs0bDyO/DBSJEa/tDa1W26pVtt0FRw==-"@svgr/[email protected]":version "8.0.0"resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-remove-jsx-empty-expression/-/babel-plugin-remove-jsx-empty-expression-8.0.0.tgz#c2c48104cfd7dcd557f373b70a56e9e3bdae1d44"@@ -2206,51 +2218,26 @@resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-replace-jsx-attribute-value/-/babel-plugin-replace-jsx-attribute-value-8.0.0.tgz#8fbb6b2e91fa26ac5d4aa25c6b6e4f20f9c0ae27"integrity sha512-KVQ+PtIjb1BuYT3ht8M5KbzWBhdAjjUPdlMtpuw/VjT8coTrItWX6Qafl9+ji831JaJcu6PJNKCV0bp01lBNzQ==-"@svgr/babel-plugin-replace-jsx-attribute-value@^6.5.1":- version "6.5.1"- resolved "https://registry.npmjs.org/@svgr/babel-plugin-replace-jsx-attribute-value/-/babel-plugin-replace-jsx-attribute-value-6.5.1.tgz"- integrity sha512-8DPaVVE3fd5JKuIC29dqyMB54sA6mfgki2H2+swh+zNJoynC8pMPzOkidqHOSc6Wj032fhl8Z0TVn1GiPpAiJg==-"@svgr/[email protected]":version "8.0.0"resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-8.0.0.tgz#1d5ba1d281363fc0f2f29a60d6d936f9bbc657b0"integrity sha512-omNiKqwjNmOQJ2v6ge4SErBbkooV2aAWwaPFs2vUY7p7GhVkzRkJ00kILXQvRhA6miHnNpXv7MRnnSjdRjK8og==-"@svgr/babel-plugin-svg-dynamic-title@^6.5.1":- version "6.5.1"- resolved "https://registry.npmjs.org/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-6.5.1.tgz"- integrity sha512-FwOEi0Il72iAzlkaHrlemVurgSQRDFbk0OC8dSvD5fSBPHltNh7JtLsxmZUhjYBZo2PpcU/RJvvi6Q0l7O7ogw==-"@svgr/[email protected]":version "8.0.0"resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-svg-em-dimensions/-/babel-plugin-svg-em-dimensions-8.0.0.tgz#35e08df300ea8b1d41cb8f62309c241b0369e501"integrity sha512-mURHYnu6Iw3UBTbhGwE/vsngtCIbHE43xCRK7kCw4t01xyGqb2Pd+WXekRRoFOBIY29ZoOhUCTEweDMdrjfi9g==-"@svgr/babel-plugin-svg-em-dimensions@^6.5.1":- version "6.5.1"- resolved "https://registry.npmjs.org/@svgr/babel-plugin-svg-em-dimensions/-/babel-plugin-svg-em-dimensions-6.5.1.tgz"- integrity sha512-gWGsiwjb4tw+ITOJ86ndY/DZZ6cuXMNE/SjcDRg+HLuCmwpcjOktwRF9WgAiycTqJD/QXqL2f8IzE2Rzh7aVXA==-"@svgr/[email protected]":version "8.1.0"resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-transform-react-native-svg/-/babel-plugin-transform-react-native-svg-8.1.0.tgz#90a8b63998b688b284f255c6a5248abd5b28d754"integrity sha512-Tx8T58CHo+7nwJ+EhUwx3LfdNSG9R2OKfaIXXs5soiy5HtgoAEkDay9LIimLOcG8dJQH1wPZp/cnAv6S9CrR1Q==-"@svgr/babel-plugin-transform-react-native-svg@^6.5.1":- version "6.5.1"- resolved "https://registry.npmjs.org/@svgr/babel-plugin-transform-react-native-svg/-/babel-plugin-transform-react-native-svg-6.5.1.tgz"- integrity sha512-2jT3nTayyYP7kI6aGutkyfJ7UMGtuguD72OjeGLwVNyfPRBD8zQthlvL+fAbAKk5n9ZNcvFkp/b1lZ7VsYqVJg==-"@svgr/[email protected]":version "8.0.0"resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-8.0.0.tgz#013b4bfca88779711f0ed2739f3f7efcefcf4f7e"integrity sha512-DFx8xa3cZXTdb/k3kfPeaixecQLgKh5NVBMwD0AQxOzcZawK4oo1Jh9LbrcACUivsCA7TLG8eeWgrDXjTMhRmw==-"@svgr/babel-plugin-transform-svg-component@^6.5.1":- version "6.5.1"- resolved "https://registry.npmjs.org/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-6.5.1.tgz"- integrity sha512-a1p6LF5Jt33O3rZoVRBqdxL350oge54iZWHNI6LJB5tQ7EelvD/Mb1mfBiZNAan0dt4i3VArkFRjA4iObuNykQ==-"@svgr/[email protected]":version "8.1.0"resolved "https://registry.yarnpkg.com/@svgr/babel-preset/-/babel-preset-8.1.0.tgz#0e87119aecdf1c424840b9d4565b7137cabf9ece"@@ -2265,20 +2252,6 @@"@svgr/babel-plugin-transform-react-native-svg" "8.1.0""@svgr/babel-plugin-transform-svg-component" "8.0.0"-"@svgr/babel-preset@^6.5.1":- version "6.5.1"- resolved "https://registry.npmjs.org/@svgr/babel-preset/-/babel-preset-6.5.1.tgz"- integrity sha512-6127fvO/FF2oi5EzSQOAjo1LE3OtNVh11R+/8FXa+mHx1ptAaS4cknIjnUA7e6j6fwGGJ17NzaTJFUwOV2zwCw==- dependencies:- "@svgr/babel-plugin-add-jsx-attribute" "^6.5.1"- "@svgr/babel-plugin-remove-jsx-attribute" "*"- "@svgr/babel-plugin-remove-jsx-empty-expression" "*"- "@svgr/babel-plugin-replace-jsx-attribute-value" "^6.5.1"- "@svgr/babel-plugin-svg-dynamic-title" "^6.5.1"- "@svgr/babel-plugin-svg-em-dimensions" "^6.5.1"- "@svgr/babel-plugin-transform-react-native-svg" "^6.5.1"- "@svgr/babel-plugin-transform-svg-component" "^6.5.1"-"@svgr/[email protected]":version "8.1.0"resolved "https://registry.yarnpkg.com/@svgr/core/-/core-8.1.0.tgz#41146f9b40b1a10beaf5cc4f361a16a3c1885e88"@@ -2290,17 +2263,6 @@cosmiconfig "^8.1.3"snake-case "^3.0.4"-"@svgr/core@^6.5.1":- version "6.5.1"- resolved "https://registry.npmjs.org/@svgr/core/-/core-6.5.1.tgz"- integrity sha512-/xdLSWxK5QkqG524ONSjvg3V/FkNyCv538OIBdQqPNaAta3AsXj/Bd2FbvR87yMbXO2hFSWiAe/Q6IkVPDw+mw==- dependencies:- "@babel/core" "^7.19.6"- "@svgr/babel-preset" "^6.5.1"- "@svgr/plugin-jsx" "^6.5.1"- camelcase "^6.2.0"- cosmiconfig "^7.0.1"-"@svgr/[email protected]":version "8.0.0"resolved "https://registry.yarnpkg.com/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-8.0.0.tgz#6952fd9ce0f470e1aded293b792a2705faf4ffd4"@@ -2309,14 +2271,6 @@"@babel/types" "^7.21.3"entities "^4.4.0"-"@svgr/hast-util-to-babel-ast@^6.5.1":- version "6.5.1"- resolved "https://registry.npmjs.org/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-6.5.1.tgz"- integrity sha512-1hnUxxjd83EAxbL4a0JDJoD3Dao3hmjvyvyEV8PzWmLK3B9m9NPlW7GKjFyoWE8nM7HnXzPcmmSyOW8yOddSXw==- dependencies:- "@babel/types" "^7.20.0"- entities "^4.4.0"-"@svgr/[email protected]":version "8.1.0"resolved "https://registry.yarnpkg.com/@svgr/plugin-jsx/-/plugin-jsx-8.1.0.tgz#96969f04a24b58b174ee4cd974c60475acbd6928"@@ -2327,16 +2281,6 @@"@svgr/hast-util-to-babel-ast" "8.0.0"svg-parser "^2.0.4"-"@svgr/plugin-jsx@^6.5.1":- version "6.5.1"- resolved "https://registry.npmjs.org/@svgr/plugin-jsx/-/plugin-jsx-6.5.1.tgz"- integrity sha512-+UdQxI3jgtSjCykNSlEMuy1jSRQlGC7pqBCPvkG/2dATdWo082zHTTK3uhnAju2/6XpE6B5mZ3z4Z8Ns01S8Gw==- dependencies:- "@babel/core" "^7.19.6"- "@svgr/babel-preset" "^6.5.1"- "@svgr/hast-util-to-babel-ast" "^6.5.1"- svg-parser "^2.0.4"-"@svgr/[email protected]":version "8.1.0"resolved "https://registry.yarnpkg.com/@svgr/plugin-svgo/-/plugin-svgo-8.1.0.tgz#b115b7b967b564f89ac58feae89b88c3decd0f00"@@ -2346,15 +2290,6 @@deepmerge "^4.3.1"svgo "^3.0.2"-"@svgr/plugin-svgo@^6.5.1":- version "6.5.1"- resolved "https://registry.npmjs.org/@svgr/plugin-svgo/-/plugin-svgo-6.5.1.tgz"- integrity sha512-omvZKf8ixP9z6GWgwbtmP9qQMPX4ODXi+wzbVZgomNFsUIlHA1sf4fThdwTWSsZGgvGAG6yE+b/F5gWUkcZ/iQ==- dependencies:- cosmiconfig "^7.0.1"- deepmerge "^4.2.2"- svgo "^2.8.0"-"@svgr/rollup@^8.1.0":version "8.1.0"resolved "https://registry.yarnpkg.com/@svgr/rollup/-/rollup-8.1.0.tgz#2c8e09655336cda4b7843799a5d2a5860300b030"@@ -2370,19 +2305,19 @@"@svgr/plugin-jsx" "8.1.0""@svgr/plugin-svgo" "8.1.0"-"@svgr/webpack@^6.2.1":- version "6.5.1"- resolved "https://registry.npmjs.org/@svgr/webpack/-/webpack-6.5.1.tgz"- integrity sha512-cQ/AsnBkXPkEK8cLbv4Dm7JGXq2XrumKnL1dRpJD9rIO2fTIlJI9a1uCciYG1F2aUsox/hJQyNGbt3soDxSRkA==+"@svgr/webpack@^8.1.0":+ version "8.1.0"+ resolved "https://registry.yarnpkg.com/@svgr/webpack/-/webpack-8.1.0.tgz#16f1b5346f102f89fda6ec7338b96a701d8be0c2"+ integrity sha512-LnhVjMWyMQV9ZmeEy26maJk+8HTIbd59cH4F2MJ439k9DqejRisfFNGAPvRYlKETuh9LrImlS8aKsBgKjMA8WA==dependencies:- "@babel/core" "^7.19.6"- "@babel/plugin-transform-react-constant-elements" "^7.18.12"- "@babel/preset-env" "^7.19.4"+ "@babel/core" "^7.21.3"+ "@babel/plugin-transform-react-constant-elements" "^7.21.3"+ "@babel/preset-env" "^7.20.2""@babel/preset-react" "^7.18.6"- "@babel/preset-typescript" "^7.18.6"- "@svgr/core" "^6.5.1"- "@svgr/plugin-jsx" "^6.5.1"- "@svgr/plugin-svgo" "^6.5.1"+ "@babel/preset-typescript" "^7.21.0"+ "@svgr/core" "8.1.0"+ "@svgr/plugin-jsx" "8.1.0"+ "@svgr/plugin-svgo" "8.1.0""@swc/[email protected]":version "0.5.2"@@ -2509,6 +2444,11 @@"@types/react" "*"hoist-non-react-statics "^3.3.0"+"@types/json-schema@^7.0.12":+ version "7.0.13"+ resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.13.tgz#02c24f4363176d2d18fc8b70b9f3c54aba178a85"+ integrity sha512-RbSSoHliUbnXj3ny0CNFOoxrIDV6SUGyStHsvDqosw6CkdPV8TtWGlfecuK4ToyMEAql6pzNxgCFKanovUzlgQ==+"@types/json-schema@^7.0.5", "@types/json-schema@^7.0.9":version "7.0.12"resolved "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.12.tgz"@@ -2555,29 +2495,24 @@integrity sha512-5jY9RhV7c0Z4Jy09G+NIDTsCZ5G0L5n+Z+p+Y7t5VJHM30bgwzSjVtlcBxqAj+6L/swIlvtOSzr8rBk/aNyV2g=="@types/node@^18.11.9":- version "18.17.18"- resolved "https://registry.yarnpkg.com/@types/node/-/node-18.17.18.tgz#acae19ad9011a2ab3d792232501c95085ba1838f"- integrity sha512-/4QOuy3ZpV7Ya1GTRz5CYSz3DgkKpyUptXuQ5PPce7uuyJAOR7r9FhkmxJfvcNUXyklbC63a+YvB3jxy7s9ngw==+ version "18.18.0"+ resolved "https://registry.yarnpkg.com/@types/node/-/node-18.18.0.tgz#bd19d5133a6e5e2d0152ec079ac27c120e7f1763"+ integrity sha512-3xA4X31gHT1F1l38ATDIL9GpRLdwVhnEFC8Uikv5ZLlXATwrCYyPq7ZWHxzxc3J/30SUiwiYT+bQe0/XvKlWbw=="@types/normalize-package-data@^2.4.0":version "2.4.1"resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301"integrity sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==-"@types/parse-json@^4.0.0":- version "4.0.0"- resolved "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz"- integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==-"@types/prop-types@*":- version "15.7.6"- resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.6.tgz#bbf819813d6be21011b8f5801058498bec555572"- integrity sha512-RK/kBbYOQQHLYj9Z95eh7S6t7gq4Ojt/NT8HTk8bWVhA5DaF+5SMnxHKkP4gPNN3wAZkKP+VjAf0ebtYzf+fxg==+ version "15.7.7"+ resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.7.tgz#f9361f7b87fd5d8188b2c998db0a1f47e9fb391a"+ integrity sha512-FbtmBWCcSa2J4zL781Zf1p5YUBXQomPEcep9QZCfRfQgTxz3pJWiDFLebohZ9fFntX5ibzOkSsrJ0TEew8cAog=="@types/react-dom@^18.0.8":- version "18.2.7"- resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.2.7.tgz#67222a08c0a6ae0a0da33c3532348277c70abb63"- integrity sha512-GRaAEriuT4zp9N4p1i8BDBYmEyfo+xQ3yHjJU4eiK5NDa1RmUZG+unZABUTK4/Ox/M+GaHwb6Ow8rUITrtjszA==+ version "18.2.8"+ resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.2.8.tgz#338f1b0a646c9f10e0a97208c1d26b9f473dffd6"+ integrity sha512-bAIvO5lN/U8sPGvs1Xm61rlRHHaq5rp5N3kp9C+NJ/Q41P8iqjkXSu0+/qu8POsjH9pNWb0OYabFez7taP7omw==dependencies:"@types/react" "*"@@ -2591,19 +2526,19 @@hoist-non-react-statics "^3.3.0"redux "^4.0.0"-"@types/react@*", "@types/react@16 || 17 || 18":- version "18.0.25"- resolved "https://registry.npmjs.org/@types/react/-/react-18.0.25.tgz"- integrity sha512-xD6c0KDT4m7n9uD4ZHi02lzskaiqcBxf4zi+tXZY98a04wvc0hi/TcCPC2FOESZi51Nd7tlUeOJY8RofL799/g==+"@types/react@*", "@types/react@^18.0.25":+ version "18.2.23"+ resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.23.tgz#60ad6cf4895e93bed858db0e03bcc4ff97d0410e"+ integrity sha512-qHLW6n1q2+7KyBEYnrZpcsAmU/iiCh9WGCKgXvMxx89+TYdJWRjZohVIo9XTcoLhfX3+/hP0Pbulu3bCZQ9PSA==dependencies:"@types/prop-types" "*""@types/scheduler" "*"csstype "^3.0.2"-"@types/react@^18.0.25":- version "18.2.22"- resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.22.tgz#abe778a1c95a07fa70df40a52d7300a40b949ccb"- integrity sha512-60fLTOLqzarLED2O3UQImc/lsNRgG0jE/a1mPW9KjMemY0LMITWEsbS4VvZ4p6rorEHd5YKxxmMKSDK505GHpA==+"@types/react@16 || 17 || 18":+ version "18.0.25"+ resolved "https://registry.npmjs.org/@types/react/-/react-18.0.25.tgz"+ integrity sha512-xD6c0KDT4m7n9uD4ZHi02lzskaiqcBxf4zi+tXZY98a04wvc0hi/TcCPC2FOESZi51Nd7tlUeOJY8RofL799/g==dependencies:"@types/prop-types" "*""@types/scheduler" "*"@@ -2615,9 +2550,9 @@integrity sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q=="@types/scheduler@*":- version "0.16.3"- resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.3.tgz#cef09e3ec9af1d63d2a6cc5b383a737e24e6dcf5"- integrity sha512-5cJ8CB4yAx7BH1oMvdU0Jh9lrEXyPkar6F9G/ERswkCuvP4KQZfZkSjcMbAICCpQTN4OuZn8tz0HiKv9TGZgrQ==+ version "0.16.4"+ resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.4.tgz#fedc3e5b15c26dc18faae96bf1317487cb3658cf"+ integrity sha512-2L9ifAGl7wmXwP4v3pN4p2FLhD0O1qsJpvKmNin5VA8+UvNVb447UDaAEV6UdrkA+m/Xs58U1RFps44x6TFsVQ=="@types/schema-utils@^2.4.0":version "2.4.0"@@ -2626,26 +2561,27 @@dependencies:schema-utils "*"-"@types/semver@^7.3.12":- version "7.5.0"- resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.0.tgz#591c1ce3a702c45ee15f47a42ade72c2fd78978a"- integrity sha512-G8hZ6XJiHnuhQKR7ZmysCeJWE08o8T0AXtk5darsCaTVsYZhhgUrq53jizaR2FvsoeCwJhlmwTjkXBY5Pn/ZHw==--"@typescript-eslint/eslint-plugin@^5.50.0":- version "5.62.0"- resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz#aeef0328d172b9e37d9bab6dbc13b87ed88977db"- integrity sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==- dependencies:- "@eslint-community/regexpp" "^4.4.0"- "@typescript-eslint/scope-manager" "5.62.0"- "@typescript-eslint/type-utils" "5.62.0"- "@typescript-eslint/utils" "5.62.0"+"@types/semver@^7.5.0":+ version "7.5.3"+ resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.3.tgz#9a726e116beb26c24f1ccd6850201e1246122e04"+ integrity sha512-OxepLK9EuNEIPxWNME+C6WwbRAOOI2o2BaQEGzz5Lu2e4Z5eDnEo+/aVEDMIXywoJitJ7xWd641wrGLZdtwRyw==++"@typescript-eslint/eslint-plugin@^6.7.3":+ version "6.7.3"+ resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.7.3.tgz#d98046e9f7102d49a93d944d413c6055c47fafd7"+ integrity sha512-vntq452UHNltxsaaN+L9WyuMch8bMd9CqJ3zhzTPXXidwbf5mqqKCVXEuvRZUqLJSTLeWE65lQwyXsRGnXkCTA==+ dependencies:+ "@eslint-community/regexpp" "^4.5.1"+ "@typescript-eslint/scope-manager" "6.7.3"+ "@typescript-eslint/type-utils" "6.7.3"+ "@typescript-eslint/utils" "6.7.3"+ "@typescript-eslint/visitor-keys" "6.7.3"debug "^4.3.4"graphemer "^1.4.0"- ignore "^5.2.0"- natural-compare-lite "^1.4.0"- semver "^7.3.7"- tsutils "^3.21.0"+ ignore "^5.2.4"+ natural-compare "^1.4.0"+ semver "^7.5.4"+ ts-api-utils "^1.0.1""@typescript-eslint/parser@^5.21.0":version "5.59.11"@@ -2657,14 +2593,15 @@"@typescript-eslint/typescript-estree" "5.59.11"debug "^4.3.4"-"@typescript-eslint/parser@^5.50.0":- version "5.62.0"- resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.62.0.tgz#1b63d082d849a2fcae8a569248fbe2ee1b8a56c7"- integrity sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==+"@typescript-eslint/parser@^6.7.3":+ version "6.7.3"+ resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.7.3.tgz#aaf40092a32877439e5957e18f2d6a91c82cc2fd"+ integrity sha512-TlutE+iep2o7R8Lf+yoer3zU6/0EAUc8QIBB3GYBc1KGz4c4TRm83xwXUZVPlZ6YCLss4r77jbu6j3sendJoiQ==dependencies:- "@typescript-eslint/scope-manager" "5.62.0"- "@typescript-eslint/types" "5.62.0"- "@typescript-eslint/typescript-estree" "5.62.0"+ "@typescript-eslint/scope-manager" "6.7.3"+ "@typescript-eslint/types" "6.7.3"+ "@typescript-eslint/typescript-estree" "6.7.3"+ "@typescript-eslint/visitor-keys" "6.7.3"debug "^4.3.4""@typescript-eslint/[email protected]":@@ -2675,33 +2612,33 @@"@typescript-eslint/types" "5.59.11""@typescript-eslint/visitor-keys" "5.59.11"-"@typescript-eslint/[email protected]":- version "5.62.0"- resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz#d9457ccc6a0b8d6b37d0eb252a23022478c5460c"- integrity sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==+"@typescript-eslint/[email protected]":+ version "6.7.3"+ resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.7.3.tgz#07e5709c9bdae3eaf216947433ef97b3b8b7d755"+ integrity sha512-wOlo0QnEou9cHO2TdkJmzF7DFGvAKEnB82PuPNHpT8ZKKaZu6Bm63ugOTn9fXNJtvuDPanBc78lGUGGytJoVzQ==dependencies:- "@typescript-eslint/types" "5.62.0"- "@typescript-eslint/visitor-keys" "5.62.0"+ "@typescript-eslint/types" "6.7.3"+ "@typescript-eslint/visitor-keys" "6.7.3"-"@typescript-eslint/[email protected]":- version "5.62.0"- resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.62.0.tgz#286f0389c41681376cdad96b309cedd17d70346a"- integrity sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==+"@typescript-eslint/[email protected]":+ version "6.7.3"+ resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.7.3.tgz#c2c165c135dda68a5e70074ade183f5ad68f3400"+ integrity sha512-Fc68K0aTDrKIBvLnKTZ5Pf3MXK495YErrbHb1R6aTpfK5OdSFj0rVN7ib6Tx6ePrZ2gsjLqr0s98NG7l96KSQw==dependencies:- "@typescript-eslint/typescript-estree" "5.62.0"- "@typescript-eslint/utils" "5.62.0"+ "@typescript-eslint/typescript-estree" "6.7.3"+ "@typescript-eslint/utils" "6.7.3"debug "^4.3.4"- tsutils "^3.21.0"+ ts-api-utils "^1.0.1""@typescript-eslint/[email protected]":version "5.59.11"resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.59.11.tgz#1a9018fe3c565ba6969561f2a49f330cf1fe8db1"integrity sha512-epoN6R6tkvBYSc+cllrz+c2sOFWkbisJZWkOE+y3xHtvYaOE6Wk6B8e114McRJwFRjGvYdJwLXQH5c9osME/AA==-"@typescript-eslint/[email protected]":- version "5.62.0"- resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.62.0.tgz#258607e60effa309f067608931c3df6fed41fd2f"- integrity sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==+"@typescript-eslint/[email protected]":+ version "6.7.3"+ resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.7.3.tgz#0402b5628a63f24f2dc9d4a678e9a92cc50ea3e9"+ integrity sha512-4g+de6roB2NFcfkZb439tigpAMnvEIg3rIjWQ+EM7IBaYt/CdJt6em9BJ4h4UpdgaBWdmx2iWsafHTrqmgIPNw=="@typescript-eslint/[email protected]":version "5.59.11"@@ -2716,32 +2653,31 @@semver "^7.3.7"tsutils "^3.21.0"-"@typescript-eslint/[email protected]":- version "5.62.0"- resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz#7d17794b77fabcac615d6a48fb143330d962eb9b"- integrity sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==+"@typescript-eslint/[email protected]":+ version "6.7.3"+ resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.7.3.tgz#ec5bb7ab4d3566818abaf0e4a8fa1958561b7279"+ integrity sha512-YLQ3tJoS4VxLFYHTw21oe1/vIZPRqAO91z6Uv0Ss2BKm/Ag7/RVQBcXTGcXhgJMdA4U+HrKuY5gWlJlvoaKZ5g==dependencies:- "@typescript-eslint/types" "5.62.0"- "@typescript-eslint/visitor-keys" "5.62.0"+ "@typescript-eslint/types" "6.7.3"+ "@typescript-eslint/visitor-keys" "6.7.3"debug "^4.3.4"globby "^11.1.0"is-glob "^4.0.3"- semver "^7.3.7"- tsutils "^3.21.0"--"@typescript-eslint/[email protected]":- version "5.62.0"- resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.62.0.tgz#141e809c71636e4a75daa39faed2fb5f4b10df86"- integrity sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==- dependencies:- "@eslint-community/eslint-utils" "^4.2.0"- "@types/json-schema" "^7.0.9"- "@types/semver" "^7.3.12"- "@typescript-eslint/scope-manager" "5.62.0"- "@typescript-eslint/types" "5.62.0"- "@typescript-eslint/typescript-estree" "5.62.0"- eslint-scope "^5.1.1"- semver "^7.3.7"+ semver "^7.5.4"+ ts-api-utils "^1.0.1"++"@typescript-eslint/[email protected]":+ version "6.7.3"+ resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.7.3.tgz#96c655816c373135b07282d67407cb577f62e143"+ integrity sha512-vzLkVder21GpWRrmSR9JxGZ5+ibIUSudXlW52qeKpzUEQhRSmyZiVDDj3crAth7+5tmN1ulvgKaCU2f/bPRCzg==+ dependencies:+ "@eslint-community/eslint-utils" "^4.4.0"+ "@types/json-schema" "^7.0.12"+ "@types/semver" "^7.5.0"+ "@typescript-eslint/scope-manager" "6.7.3"+ "@typescript-eslint/types" "6.7.3"+ "@typescript-eslint/typescript-estree" "6.7.3"+ semver "^7.5.4""@typescript-eslint/[email protected]":version "5.59.11"@@ -2751,19 +2687,20 @@"@typescript-eslint/types" "5.59.11"eslint-visitor-keys "^3.3.0"-"@typescript-eslint/[email protected]":- version "5.62.0"- resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz#2174011917ce582875954ffe2f6912d5931e353e"- integrity sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==+"@typescript-eslint/[email protected]":+ version "6.7.3"+ resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.7.3.tgz#83809631ca12909bd2083558d2f93f5747deebb2"+ integrity sha512-HEVXkU9IB+nk9o63CeICMHxFWbHWr3E1mpilIQBe9+7L/lH97rleFLVtYsfnWB+JVMaiFnEaxvknvmIzX+CqVg==dependencies:- "@typescript-eslint/types" "5.62.0"- eslint-visitor-keys "^3.3.0"+ "@typescript-eslint/types" "6.7.3"+ eslint-visitor-keys "^3.4.1"-"@umami/prisma-client@^0.2.0":- version "0.2.0"- resolved "https://registry.npmjs.org/@umami/prisma-client/-/prisma-client-0.2.0.tgz"- integrity sha512-+27dd4DLl8SvbbIYG1mdm6pIZd+UzQI7eZGNjQ9ONeWO0jr+/wiVnPIXUzd8w4R/OoM4ChpI3mBZPqcWa5MAOw==+"@umami/prisma-client@^0.3.0":+ version "0.3.0"+ resolved "https://registry.yarnpkg.com/@umami/prisma-client/-/prisma-client-0.3.0.tgz#fea35a44c76af0e4ce58288107cda3ee76fc80ba"+ integrity sha512-88y/WJX2TEZaUfP+PTretGUL6YdwZCBbhaoeC87eTF3l1aG0Lv3TsmW0lJy5rbKpVqrFJ8zrtvCMP/vt7WeIjg==dependencies:+ chalk "^4.1.2"debug "^4.3.4""@umami/redis-client@^0.15.0":@@ -2969,23 +2906,23 @@ ajv@^8.0.1:require-from-string "^2.0.2"uri-js "^4.2.2"-ansi-colors@^4.1.1:- version "4.1.1"- resolved "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz"- integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==--ansi-escapes@^4.3.0:- version "4.3.2"- resolved "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz"- integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==+ansi-escapes@^5.0.0:+ version "5.0.0"+ resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-5.0.0.tgz#b6a0caf0eef0c41af190e9a749e0c00ec04bb2a6"+ integrity sha512-5GFMVX8HqE/TB+FuBJGuO5XG0WrsA6ptUqoODaT/n9mmUaZFkqnBueB4leqGBCmrUHnCnC4PCZTCd0E7QQ83bA==dependencies:- type-fest "^0.21.3"+ type-fest "^1.0.2"ansi-regex@^5.0.1:version "5.0.1"resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==+ansi-regex@^6.0.1:+ version "6.0.1"+ resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a"+ integrity sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==+ansi-styles@^3.2.1:version "3.2.1"resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"@@ -3000,6 +2937,11 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0:dependencies:color-convert "^2.0.1"+ansi-styles@^6.0.0, ansi-styles@^6.1.0:+ version "6.2.1"+ resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5"+ integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==+anymatch@^3.1.3, anymatch@~3.1.2:version "3.1.3"resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e"@@ -3435,6 +3377,11 @@ caseless@~0.12.0:resolved "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz"integrity sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==+ version "5.3.0"+ resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.3.0.tgz#67c20a7ebef70e7f3970a01f90fa210cb6860385"+ integrity sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==+chalk@^2.4.1, chalk@^2.4.2:version "2.4.2"resolved "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz"@@ -3511,20 +3458,20 @@ clean-stack@^2.0.0:resolved "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz"integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==-cli-cursor@^3.1.0:- version "3.1.0"- resolved "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz"- integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==+cli-cursor@^4.0.0:+ version "4.0.0"+ resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-4.0.0.tgz#3cecfe3734bf4fe02a8361cbdc0f6fe28c6a57ea"+ integrity sha512-VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg==dependencies:- restore-cursor "^3.1.0"+ restore-cursor "^4.0.0"[email protected], cli-truncate@^2.1.0:- version "2.1.0"- resolved "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz"- integrity sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==+cli-truncate@^3.1.0:+ version "3.1.0"+ resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-3.1.0.tgz#3f23ab12535e3d73e839bb43e73c9de487db1389"+ integrity sha512-wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA==dependencies:- slice-ansi "^3.0.0"- string-width "^4.2.0"+ slice-ansi "^5.0.0"+ string-width "^5.0.0"clickhouse@^2.5.0:version "2.6.0"@@ -3609,14 +3556,14 @@ colord@^2.9.1, colord@^2.9.2, colord@^2.9.3:resolved "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz"integrity sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==-colorette@^1.1.0, colorette@^1.4.0:+colorette@^1.1.0:version "1.4.0"resolved "https://registry.npmjs.org/colorette/-/colorette-1.4.0.tgz"integrity sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==-colorette@^2.0.16:+colorette@^2.0.20:version "2.0.20"- resolved "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz"+ resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.20.tgz#9eb793e6833067f7235902fcd3b09917a000a95a"integrity sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==combined-stream@^1.0.6, combined-stream@~1.0.6:@@ -3626,6 +3573,11 @@ combined-stream@^1.0.6, combined-stream@~1.0.6:dependencies:delayed-stream "~1.0.0"+ version "11.0.0"+ resolved "https://registry.yarnpkg.com/commander/-/commander-11.0.0.tgz#43e19c25dbedc8256203538e8d7e9346877a6f67"+ integrity sha512-9HMlXtt/BNoYr8ooyjjNRdIilOTkVJXB+GhxMTtOKwk0R4j4lS4NpjuqmRxroBfnfTSHQIHQB7wryHhXarNjmQ==+commander@2, commander@^2.20.0, commander@^2.20.3:version "2.20.3"resolved "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz"@@ -3636,7 +3588,7 @@ [email protected]:resolved "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz"integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==-commander@8, commander@^8.2.0:+commander@8:version "8.3.0"resolved "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz"integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==@@ -3703,17 +3655,6 @@ cors@^2.8.5:object-assign "^4"vary "^1"-cosmiconfig@^7.0.1:- version "7.1.0"- resolved "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz"- integrity sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==- dependencies:- "@types/parse-json" "^4.0.0"- import-fresh "^3.2.1"- parse-json "^5.0.0"- path-type "^4.0.0"- yaml "^1.10.0"-cosmiconfig@^8.1.3:version "8.1.3"resolved "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.1.3.tgz"@@ -4063,6 +4004,13 @@ debounce@^1.2.1:resolved "https://registry.npmjs.org/debounce/-/debounce-1.2.1.tgz"integrity sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==[email protected], debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.4:+ version "4.3.4"+ resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz"+ integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==+ dependencies:+ ms "2.1.2"+debug@^3.2.7:version "3.2.7"resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"@@ -4070,13 +4018,6 @@ debug@^3.2.7:dependencies:ms "^2.1.1"-debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.4:- version "4.3.4"- resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz"- integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==- dependencies:- ms "2.1.2"-decamelize-keys@^1.1.0:version "1.1.1"resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.1.tgz#04a2d523b2f18d80d0158a43b895d56dff8d19d8"@@ -4302,6 +4243,11 @@ dotenv@^10.0.0:resolved "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz"integrity sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==+eastasianwidth@^0.2.0:+ version "0.2.0"+ resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb"+ integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==+ecc-jsbn@~0.1.1:version "0.1.2"resolved "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz"@@ -4339,13 +4285,6 @@ end-of-stream@^1.1.0, end-of-stream@^1.4.1:dependencies:once "^1.4.0"-enquirer@^2.3.6:- version "2.3.6"- resolved "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz"- integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==- dependencies:- ansi-colors "^4.1.1"-entities@^2.0.0:version "2.2.0"resolved "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz"@@ -4661,14 +4600,6 @@ eslint-plugin-react@^7.31.7:semver "^6.3.0"string.prototype.matchall "^4.0.8"-eslint-scope@^5.1.1:- version "5.1.1"- resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"- integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==- dependencies:- esrecurse "^4.3.0"- estraverse "^4.1.1"-eslint-scope@^7.2.2:version "7.2.2"resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.2.tgz#deb4f92563390f32006894af62a22dba1c46423f"@@ -4683,14 +4614,14 @@ eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==eslint@^8.33.0:- version "8.49.0"- resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.49.0.tgz#09d80a89bdb4edee2efcf6964623af1054bf6d42"- integrity sha512-jw03ENfm6VJI0jA9U+8H5zfl5b+FvuU3YYvZRdZHOlU2ggJkxrlkJH4HcDrZpj6YwD8kuYqvQM8LyesoazrSOQ==+ version "8.50.0"+ resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.50.0.tgz#2ae6015fee0240fcd3f83e1e25df0287f487d6b2"+ integrity sha512-FOnOGSuFuFLv/Sa+FDVRZl4GGVAAFFi8LecRsI5a1tMO5HIE8nCm4ivAlzt4dT3ol/PaaGC0rJEEXQmHJBGoOg==dependencies:"@eslint-community/eslint-utils" "^4.2.0""@eslint-community/regexpp" "^4.6.1""@eslint/eslintrc" "^2.1.2"- "@eslint/js" "8.49.0"+ "@eslint/js" "8.50.0""@humanwhocodes/config-array" "^0.11.11""@humanwhocodes/module-importer" "^1.0.1""@nodelib/fs.walk" "^1.2.8"@@ -4753,11 +4684,6 @@ esrecurse@^4.3.0:dependencies:estraverse "^5.2.0"-estraverse@^4.1.1:- version "4.3.0"- resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"- integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==-estraverse@^5.1.0, estraverse@^5.2.0, estraverse@^5.3.0:version "5.3.0"resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"@@ -4788,6 +4714,26 @@ eventemitter3@^4.0.4:resolved "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz"integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==+eventemitter3@^5.0.1:+ version "5.0.1"+ resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-5.0.1.tgz#53f5ffd0a492ac800721bb42c66b841de96423c4"+ integrity sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==++ version "7.2.0"+ resolved "https://registry.yarnpkg.com/execa/-/execa-7.2.0.tgz#657e75ba984f42a70f38928cedc87d6f2d4fe4e9"+ integrity sha512-UduyVP7TLB5IcAQl+OzLyLcS/l32W/GLg+AhHJ+ow40FOk2U3SAllPwR44v4vmdFwIWqpdwxxpQbF1n5ta9seA==+ dependencies:+ cross-spawn "^7.0.3"+ get-stream "^6.0.1"+ human-signals "^4.3.0"+ is-stream "^3.0.0"+ merge-stream "^2.0.0"+ npm-run-path "^5.1.0"+ onetime "^6.0.0"+ signal-exit "^3.0.7"+ strip-final-newline "^3.0.0"+execa@^5.1.1:version "5.1.1"resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"@@ -5109,17 +5055,12 @@ get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@has-proto "^1.0.1"has-symbols "^1.0.3"-get-own-enumerable-property-symbols@^3.0.0:- version "3.0.2"- resolved "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz"- integrity sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g==-get-port-please@^3.1.1:version "3.1.1"resolved "https://registry.yarnpkg.com/get-port-please/-/get-port-please-3.1.1.tgz#2556623cddb4801d823c0a6a15eec038abb483be"integrity sha512-3UBAyM3u4ZBVYDsxOQfJDxEa6XTbpBDrOjp4mf7ExFRt5BKs/QywQQiJsh2B+hxcZLSapWqCRvElUe8DnKcFHA==-get-stream@^6.0.0:+get-stream@^6.0.0, get-stream@^6.0.1:version "6.0.1"resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==@@ -5426,10 +5367,15 @@ human-signals@^2.1.0:resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==-husky@^7.0.0:- version "7.0.4"- resolved "https://registry.npmjs.org/husky/-/husky-7.0.4.tgz"- integrity sha512-vbaCKN2QLtP/vD4yvs6iz6hBEo6wkSzs8HpRah1Z6aGmF2KW5PdYuAd7uX5a+OyBZHBhd+TFLqgjUgytQr4RvQ==+human-signals@^4.3.0:+ version "4.3.1"+ resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-4.3.1.tgz#ab7f811e851fca97ffbd2c1fe9a958964de321b2"+ integrity sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ==++husky@^8.0.3:+ version "8.0.3"+ resolved "https://registry.yarnpkg.com/husky/-/husky-8.0.3.tgz#4936d7212e46d1dea28fef29bb3a108872cd9184"+ integrity sha512-+dQSyqPh4x1hlO1swXBiNb2HzTDN1I2IGLQx1GrBuiqFJfoMrnZWwVmatvSiO+Iz8fBUnf+lekwNo4c2LlXItg==icss-replace-symbols@^1.1.0:version "1.1.0"@@ -5559,15 +5505,15 @@ intl-messageformat-parser@^5.3.7:dependencies:"@formatjs/intl-numberformat" "^5.5.2"- version "9.13.0"- resolved "https://registry.npmjs.org/intl-messageformat/-/intl-messageformat-9.13.0.tgz"- integrity sha512-7sGC7QnSQGa5LZP7bXLDhVDtQOeKGeBFGHF2Y8LVBwYZoQZCgWeKoPGTa5GMG8g/TzDgeXuYJQis7Ggiw2xTOw==+ version "10.5.3"+ resolved "https://registry.yarnpkg.com/intl-messageformat/-/intl-messageformat-10.5.3.tgz#db0779d4a1988faa2977d76574489b7a25f0d5d0"+ integrity sha512-TzKn1uhJBMyuKTO4zUX47SU+d66fu1W9tVzIiZrQ6hBqQQeYscBMIzKL/qEXnFbJrH9uU5VV3+T5fWib4SIcKA==dependencies:- "@formatjs/ecma402-abstract" "1.11.4"- "@formatjs/fast-memoize" "1.2.1"- "@formatjs/icu-messageformat-parser" "2.1.0"- tslib "^2.1.0"+ "@formatjs/ecma402-abstract" "1.17.2"+ "@formatjs/fast-memoize" "2.2.0"+ "@formatjs/icu-messageformat-parser" "2.6.2"+ tslib "^2.4.0"ioredis@^5.3.2:version "5.3.2"@@ -5713,6 +5659,11 @@ is-fullwidth-code-point@^3.0.0:resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==+is-fullwidth-code-point@^4.0.0:+ version "4.0.0"+ resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz#fae3167c729e7463f8461ce512b080a49268aa88"+ integrity sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==+is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:version "4.0.3"resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"@@ -5747,11 +5698,6 @@ is-number@^7.0.0:resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==-is-obj@^1.0.1:- version "1.0.1"- resolved "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz"- integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8=-is-path-cwd@^2.2.0:version "2.2.0"resolved "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz"@@ -5802,11 +5748,6 @@ is-regex@^1.1.4:call-bind "^1.0.2"has-tostringtag "^1.0.0"-is-regexp@^1.0.0:- version "1.0.0"- resolved "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz"- integrity sha1-/S2INUXEa6xaYz57mgnof6LLUGk=-is-shared-array-buffer@^1.0.2:version "1.0.2"resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79"@@ -5819,6 +5760,11 @@ is-stream@^2.0.0:resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==+is-stream@^3.0.0:+ version "3.0.0"+ resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-3.0.0.tgz#e6bfd7aa6bef69f4f472ce9bb681e3e57b4319ac"+ integrity sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==+is-string@^1.0.5, is-string@^1.0.7:version "1.0.7"resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd"@@ -6120,7 +6066,7 @@ levn@^0.4.1:prelude-ls "^1.2.1"type-check "~0.4.0"-lilconfig@^2.0.3, lilconfig@^2.0.5:[email protected], lilconfig@^2.0.3, lilconfig@^2.0.5:version "2.1.0"resolved "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz"integrity sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==@@ -6130,25 +6076,21 @@ lines-and-columns@^1.1.6:resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632"integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==-lint-staged@^11.0.0:- version "11.2.6"- resolved "https://registry.npmjs.org/lint-staged/-/lint-staged-11.2.6.tgz"- integrity sha512-Vti55pUnpvPE0J9936lKl0ngVeTdSZpEdTNhASbkaWX7J5R9OEifo1INBGQuGW4zmy6OG+TcWPJ3m5yuy5Q8Tg==- dependencies:- cli-truncate "2.1.0"- colorette "^1.4.0"- commander "^8.2.0"- cosmiconfig "^7.0.1"- debug "^4.3.2"- enquirer "^2.3.6"- execa "^5.1.1"- listr2 "^3.12.2"- micromatch "^4.0.4"- normalize-path "^3.0.0"- please-upgrade-node "^3.2.0"- string-argv "0.3.1"- stringify-object "3.3.0"- supports-color "8.1.1"+lint-staged@^14.0.1:+ version "14.0.1"+ resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-14.0.1.tgz#57dfa3013a3d60762d9af5d9c83bdb51291a6232"+ integrity sha512-Mw0cL6HXnHN1ag0mN/Dg4g6sr8uf8sn98w2Oc1ECtFto9tvRF7nkXGJRbx8gPlHyoR0pLyBr2lQHbWwmUHe1Sw==+ dependencies:+ chalk "5.3.0"+ commander "11.0.0"+ debug "4.3.4"+ execa "7.2.0"+ lilconfig "2.1.0"+ listr2 "6.6.1"+ micromatch "4.0.5"+ pidtree "0.6.0"+ string-argv "0.3.2"+ yaml "2.3.1"listhen@^1.2.2, listhen@^1.4.4:version "1.5.5"@@ -6173,19 +6115,17 @@ listhen@^1.2.2, listhen@^1.4.4:untun "^0.1.2"uqr "^0.1.2"-listr2@^3.12.2:- version "3.14.0"- resolved "https://registry.npmjs.org/listr2/-/listr2-3.14.0.tgz"- integrity sha512-TyWI8G99GX9GjE54cJ+RrNMcIFBfwMPxc3XTFiAYGN4s10hWROGtOg7+O6u6LE3mNkyld7RSLE6nrKBvTfcs3g==+ version "6.6.1"+ resolved "https://registry.yarnpkg.com/listr2/-/listr2-6.6.1.tgz#08b2329e7e8ba6298481464937099f4a2cd7f95d"+ integrity sha512-+rAXGHh0fkEWdXBmX+L6mmfmXmXvDGEKzkjxO+8mP3+nI/r/CWznVBvsibXdxda9Zz0OW2e2ikphN3OwCT/jSg==dependencies:- cli-truncate "^2.1.0"- colorette "^2.0.16"- log-update "^4.0.0"- p-map "^4.0.0"+ cli-truncate "^3.1.0"+ colorette "^2.0.20"+ eventemitter3 "^5.0.1"+ log-update "^5.0.1"rfdc "^1.3.0"- rxjs "^7.5.1"- through "^2.3.8"- wrap-ansi "^7.0.0"+ wrap-ansi "^8.1.0"load-json-file@^4.0.0:version "4.0.0"@@ -6286,15 +6226,16 @@ [email protected], lodash@^4.17.21:resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz"integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==-log-update@^4.0.0:- version "4.0.0"- resolved "https://registry.npmjs.org/log-update/-/log-update-4.0.0.tgz"- integrity sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==+log-update@^5.0.1:+ version "5.0.1"+ resolved "https://registry.yarnpkg.com/log-update/-/log-update-5.0.1.tgz#9e928bf70cb183c1f0c9e91d9e6b7115d597ce09"+ integrity sha512-5UtUDQ/6edw4ofyljDNcOVJQ4c7OjDro4h3y8e1GQL5iYElYclVHJ3zeWchylvMaKnDbDilC8irOVyexnA/Slw==dependencies:- ansi-escapes "^4.3.0"- cli-cursor "^3.1.0"- slice-ansi "^4.0.0"- wrap-ansi "^6.2.0"+ ansi-escapes "^5.0.0"+ cli-cursor "^4.0.0"+ slice-ansi "^5.0.0"+ strip-ansi "^7.0.1"+ wrap-ansi "^8.0.1"loose-envify@^1.1.0, loose-envify@^1.4.0:version "1.4.0"@@ -6386,12 +6327,12 @@ mathml-tag-names@^2.1.3:integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==maxmind@^4.3.6:- version "4.3.11"- resolved "https://registry.npmjs.org/maxmind/-/maxmind-4.3.11.tgz"- integrity sha512-tJDrKbUzN6PSA88tWgg0L2R4Ln00XwecYQJPFI+RvlF2k1sx6VQYtuQ1SVxm8+bw5tF7GWV4xyb+3/KyzEpPUw==+ version "4.3.13"+ resolved "https://registry.yarnpkg.com/maxmind/-/maxmind-4.3.13.tgz#41e0339bc299b760e6503909ddab018621278953"+ integrity sha512-9y2WM2UR8kZqfMJjaXeg+PdKFABLwx3ntUlvDlmIQyKJ1GPVfXAMyGLOoc0aNoUB39yqzvBn0xiXCgVMhJDyMQ==dependencies:mmdb-lib "2.0.2"- tiny-lru "11.0.1"+ tiny-lru "11.1.2"version "2.0.14"@@ -6468,7 +6409,7 @@ micro-memoize@^4.1.2:resolved "https://registry.yarnpkg.com/micro-memoize/-/micro-memoize-4.1.2.tgz#ce719c1ba1e41592f1cd91c64c5f41dcbf135f36"integrity sha512-+HzcV2H+rbSJzApgkj0NdTakkC+bnyeiUxgT6/m7mjcz1CmM22KYFKp+EVj1sWe4UYcnriJr5uqHQD/gMHLD+g==-micromatch@^4.0.4, micromatch@^4.0.5:[email protected], micromatch@^4.0.4, micromatch@^4.0.5:version "4.0.5"resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==@@ -6498,6 +6439,11 @@ mimic-fn@^2.1.0:resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==+mimic-fn@^4.0.0:+ version "4.0.0"+ resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-4.0.0.tgz#60a90550d5cb0b239cca65d893b1a53b29871ecc"+ integrity sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==+mimic-response@^3.1.0:version "3.1.0"resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9"@@ -6583,7 +6529,7 @@ mlly@^1.2.0, mlly@^1.4.2:version "2.0.2"- resolved "https://registry.npmjs.org/mmdb-lib/-/mmdb-lib-2.0.2.tgz"+ resolved "https://registry.yarnpkg.com/mmdb-lib/-/mmdb-lib-2.0.2.tgz#fe60404142c0456c19607c72caa15821731ae957"integrity sha512-shi1I+fCPQonhTi7qyb6hr7hi87R7YS69FlfJiMFuJ12+grx0JyL56gLNzGTYXPU7EhAPkMLliGeyHer0K+AVA==moize@^6.1.0:@@ -6653,11 +6599,6 @@ napi-wasm@^1.1.0:resolved "https://registry.yarnpkg.com/napi-wasm/-/napi-wasm-1.1.0.tgz#bbe617823765ae9c1bc12ff5942370eae7b2ba4e"integrity sha512-lHwIAJbmLSjF9VDRm9GoVOy9AGp3aIvkjv+Kvz9h16QR3uSVYH78PNQUnT2U4X53mhlnV2M7wrhibQ3GHicDmg==-natural-compare-lite@^1.4.0:- version "1.4.0"- resolved "https://registry.yarnpkg.com/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz#17b09581988979fddafe0201e931ba933c96cbb4"- integrity sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==-natural-compare@^1.4.0:version "1.4.0"resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"@@ -6672,12 +6613,12 @@ next-basics@^0.36.0:jsonwebtoken "^9.0.0"pure-rand "^6.0.2"- version "13.5.2"- resolved "https://registry.yarnpkg.com/next/-/next-13.5.2.tgz#809dd84e481049e298fe79d28b1d66b587483fca"- integrity sha512-vog4UhUaMYAzeqfiAAmgB/QWLW7p01/sg+2vn6bqc/CxHFYizMzLv6gjxKzl31EVFkfl/F+GbxlKizlkTE9RdA==+ version "13.5.3"+ resolved "https://registry.yarnpkg.com/next/-/next-13.5.3.tgz#631efcbcc9d756c610855d9b94f3d8c4e73ee131"+ integrity sha512-4Nt4HRLYDW/yRpJ/QR2t1v63UOMS55A38dnWv3UDOWGezuY0ZyFO1ABNbD7mulVzs9qVhgy2+ppjdsANpKP1mg==dependencies:- "@next/env" "13.5.2"+ "@next/env" "13.5.3""@swc/helpers" "0.5.2"busboy "1.6.0"caniuse-lite "^1.0.30001406"@@ -6686,15 +6627,15 @@ [email protected]:watchpack "2.4.0"zod "3.21.4"optionalDependencies:- "@next/swc-darwin-arm64" "13.5.2"- "@next/swc-darwin-x64" "13.5.2"- "@next/swc-linux-arm64-gnu" "13.5.2"- "@next/swc-linux-arm64-musl" "13.5.2"- "@next/swc-linux-x64-gnu" "13.5.2"- "@next/swc-linux-x64-musl" "13.5.2"- "@next/swc-win32-arm64-msvc" "13.5.2"- "@next/swc-win32-ia32-msvc" "13.5.2"- "@next/swc-win32-x64-msvc" "13.5.2"+ "@next/swc-darwin-arm64" "13.5.3"+ "@next/swc-darwin-x64" "13.5.3"+ "@next/swc-linux-arm64-gnu" "13.5.3"+ "@next/swc-linux-arm64-musl" "13.5.3"+ "@next/swc-linux-x64-gnu" "13.5.3"+ "@next/swc-linux-x64-musl" "13.5.3"+ "@next/swc-win32-arm64-msvc" "13.5.3"+ "@next/swc-win32-ia32-msvc" "13.5.3"+ "@next/swc-win32-x64-msvc" "13.5.3"nice-try@^1.0.4:version "1.0.5"@@ -6824,6 +6765,13 @@ npm-run-path@^4.0.1:dependencies:path-key "^3.0.0"+npm-run-path@^5.1.0:+ version "5.1.0"+ resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-5.1.0.tgz#bc62f7f3f6952d9894bd08944ba011a6ee7b7e00"+ integrity sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q==+ dependencies:+ path-key "^4.0.0"+nth-check@^2.0.1:version "2.1.1"resolved "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz"@@ -6929,6 +6877,13 @@ onetime@^5.1.0, onetime@^5.1.2:dependencies:mimic-fn "^2.1.0"+onetime@^6.0.0:+ version "6.0.0"+ resolved "https://registry.yarnpkg.com/onetime/-/onetime-6.0.0.tgz#7c24c18ed1fd2e9bca4bd26806a33613c77d34b4"+ integrity sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==+ dependencies:+ mimic-fn "^4.0.0"+optionator@^0.9.3:version "0.9.3"resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.3.tgz#007397d44ed1872fdc6ed31360190f81814e2c64"@@ -7058,6 +7013,11 @@ path-key@^3.0.0, path-key@^3.1.0:resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==+path-key@^4.0.0:+ version "4.0.0"+ resolved "https://registry.yarnpkg.com/path-key/-/path-key-4.0.0.tgz#295588dc3aee64154f877adb9d780b81c554bf18"+ integrity sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==+path-parse@^1.0.7:version "1.0.7"resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"@@ -7100,6 +7060,11 @@ picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1:resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==+ version "0.6.0"+ resolved "https://registry.yarnpkg.com/pidtree/-/pidtree-0.6.0.tgz#90ad7b6d42d5841e69e0a2419ef38f8883aa057c"+ integrity sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==+pidtree@^0.3.0:version "0.3.1"resolved "https://registry.npmjs.org/pidtree/-/pidtree-0.3.1.tgz"@@ -7129,13 +7094,6 @@ pkg-types@^1.0.3:mlly "^1.2.0"pathe "^1.1.0"-please-upgrade-node@^3.2.0:- version "3.2.0"- resolved "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz"- integrity sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg==- dependencies:- semver-compare "^1.0.0"-postcss-attribute-case-insensitive@^5.0.2:version "5.0.2"resolved "https://registry.npmjs.org/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-5.0.2.tgz"@@ -7908,21 +7866,21 @@ react-hook-form@^7.34.2:resolved "https://registry.yarnpkg.com/react-hook-form/-/react-hook-form-7.45.0.tgz#df2bbc8cee598855a63ba446e0bb06f7c8120ccf"integrity sha512-AbHeZ4ad+0dEIknSW9dBgIwcvRDfZ1O97sgj75WaMdOX0eg8TBiUf9wxzVkIjZbk76BBIE9lmFOzyD4PN80ZQg==-react-intl@^5.24.7:- version "5.25.1"- resolved "https://registry.npmjs.org/react-intl/-/react-intl-5.25.1.tgz"- integrity sha512-pkjdQDvpJROoXLMltkP/5mZb0/XqrqLoPGKUCfbdkP8m6U9xbK40K51Wu+a4aQqTEvEK5lHBk0fWzUV72SJ3Hg==+react-intl@^6.4.7:+ version "6.4.7"+ resolved "https://registry.yarnpkg.com/react-intl/-/react-intl-6.4.7.tgz#28ec40350ff791a6a773f5e76b9e12835ae17e19"+ integrity sha512-0hnOHAZhxTFqD1hGTxrF40qNyZJPPYiGhWIIxIz0Udz+3e3c7sdN80qlxArR+AbJ+jb5ALXZkJYH20+GPFCM0Q==dependencies:- "@formatjs/ecma402-abstract" "1.11.4"- "@formatjs/icu-messageformat-parser" "2.1.0"- "@formatjs/intl" "2.2.1"- "@formatjs/intl-displaynames" "5.4.3"- "@formatjs/intl-listformat" "6.5.3"+ "@formatjs/ecma402-abstract" "1.17.2"+ "@formatjs/icu-messageformat-parser" "2.6.2"+ "@formatjs/intl" "2.9.3"+ "@formatjs/intl-displaynames" "6.5.2"+ "@formatjs/intl-listformat" "7.4.2""@types/hoist-non-react-statics" "^3.3.1""@types/react" "16 || 17 || 18"hoist-non-react-statics "^3.3.2"- intl-messageformat "9.13.0"- tslib "^2.1.0"+ intl-messageformat "10.5.3"+ tslib "^2.4.0"react-is@^16.13.1, react-is@^16.7.0:version "16.13.1"@@ -7957,9 +7915,9 @@ react-simple-maps@^2.3.0:topojson-client "^3.1.0"react-spring@^9.4.4:- version "9.7.2"- resolved "https://registry.yarnpkg.com/react-spring/-/react-spring-9.7.2.tgz#218360d0ca53d04d8faac984f0d8683819b967b4"- integrity sha512-cckALtj79yiaJiAOUNAhtZbdqjvv1bdn/FpobgkckIChc8l6vu0E53WQ+zWru60gINI3JT+oRJSIn2hUVlOvlQ==+ version "9.7.3"+ resolved "https://registry.yarnpkg.com/react-spring/-/react-spring-9.7.3.tgz#3211dea4c4d7c5b541260af5100261b87becb5d5"+ integrity sha512-oTxDpFV5gzq7jQX6+bU0SVq+vX8VnuuT5c8Zwn6CpDErOPvCmV+DRkPiEBtaL3Ozgzwiy5yFx83N0h303j/r3A==dependencies:"@react-spring/core" "~9.7.3""@react-spring/konva" "~9.7.3"@@ -8319,10 +8277,10 @@ resolve@^2.0.0-next.3:path-parse "^1.0.7"supports-preserve-symlinks-flag "^1.0.0"-restore-cursor@^3.1.0:- version "3.1.0"- resolved "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz"- integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==+restore-cursor@^4.0.0:+ version "4.0.0"+ resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-4.0.0.tgz#519560a4318975096def6e609d44100edaa4ccb9"+ integrity sha512-I9fPXU9geO9bHOt9pHHOhOkYerIMsmVaWB0rA2AI9ERh/+x/i7MV5HKBNrg+ljO5eoPVgCcnFuRjJ9uH6I/3eg==dependencies:onetime "^5.1.0"signal-exit "^3.0.2"@@ -8424,9 +8382,9 @@ rollup-pluginutils@^2.8.2:estree-walker "^0.6.1"rollup@^3.28.0:- version "3.29.2"- resolved "https://registry.yarnpkg.com/rollup/-/rollup-3.29.2.tgz#cbc76cd5b03b9f9e93be991d23a1dff9c6d5b740"- integrity sha512-CJouHoZ27v6siztc21eEQGo0kIcE5D1gVPA571ez0mMYb25LGYGKnVNXpEj5MGlepmDWGXNjDB5q7uNiPHC11A==+ version "3.29.3"+ resolved "https://registry.yarnpkg.com/rollup/-/rollup-3.29.3.tgz#97769774ccaa6a3059083d4680fcabd8ead01289"+ integrity sha512-T7du6Hum8jOkSWetjRgbwpM6Sy0nECYrYRSmZjayFcOddtKJWU4d17AC3HNUk7HRuqy4p+G7aEZclSHytqUmEg==optionalDependencies:fsevents "~2.3.2"@@ -8447,13 +8405,6 @@ run-parallel@^1.1.9:dependencies:queue-microtask "^1.2.2"-rxjs@^7.5.1:- version "7.5.5"- resolved "https://registry.npmjs.org/rxjs/-/rxjs-7.5.5.tgz"- integrity sha512-sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw==- dependencies:- tslib "^2.1.0"-safe-array-concat@^1.0.1:version "1.0.1"resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.0.1.tgz#91686a63ce3adbea14d61b14c99572a8ff84754c"@@ -8514,11 +8465,6 @@ schema-utils@^2.6.6:ajv "^6.12.4"ajv-keywords "^3.5.2"-semver-compare@^1.0.0:- version "1.0.0"- resolved "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz"- integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w=-"semver@2 || 3 || 4 || 5", semver@^5.5.0:version "5.7.1"resolved "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz"@@ -8616,7 +8562,7 @@ side-channel@^1.0.4:get-intrinsic "^1.0.2"object-inspect "^1.9.0"-signal-exit@^3.0.2, signal-exit@^3.0.3:+signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7:version "3.0.7"resolved "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz"integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==@@ -8662,15 +8608,6 @@ slash@^4.0.0:resolved "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz"integrity sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==-slice-ansi@^3.0.0:- version "3.0.0"- resolved "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz"- integrity sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==- dependencies:- ansi-styles "^4.0.0"- astral-regex "^2.0.0"- is-fullwidth-code-point "^3.0.0"-slice-ansi@^4.0.0:version "4.0.0"resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b"@@ -8680,6 +8617,14 @@ slice-ansi@^4.0.0:astral-regex "^2.0.0"is-fullwidth-code-point "^3.0.0"+slice-ansi@^5.0.0:+ version "5.0.0"+ resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-5.0.0.tgz#b73063c57aa96f9cd881654b15294d95d285c42a"+ integrity sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==+ dependencies:+ ansi-styles "^6.0.0"+ is-fullwidth-code-point "^4.0.0"+snake-case@^3.0.4:version "3.0.4"resolved "https://registry.yarnpkg.com/snake-case/-/snake-case-3.0.4.tgz#4f2bbd568e9935abdfd593f34c691dadb49c452c"@@ -8797,17 +8742,17 @@ streamx@^2.15.0:fast-fifo "^1.1.0"queue-tick "^1.0.1"- version "0.3.1"- resolved "https://registry.npmjs.org/string-argv/-/string-argv-0.3.1.tgz"- integrity sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg==+ version "0.3.2"+ resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.2.tgz#2b6d0ef24b656274d957d54e0a4bbf6153dc02b6"+ integrity sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q==string-hash@^1.1.1:version "1.1.3"resolved "https://registry.npmjs.org/string-hash/-/string-hash-1.1.3.tgz"integrity sha512-kJUvRUFK49aub+a7T1nNE66EJbZBMnBgoC1UbCZ5n6bsZKBRga4KgBRTMn/pFkeCZSYtNeSyMxPDM0AXWELk2A==-string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:+string-width@^4.2.3:version "4.2.3"resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==@@ -8816,6 +8761,15 @@ string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:is-fullwidth-code-point "^3.0.0"strip-ansi "^6.0.1"+string-width@^5.0.0, string-width@^5.0.1:+ version "5.1.2"+ resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794"+ integrity sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==+ dependencies:+ eastasianwidth "^0.2.0"+ emoji-regex "^9.2.2"+ strip-ansi "^7.0.1"+string.prototype.matchall@^4.0.8:version "4.0.8"resolved "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.8.tgz"@@ -8873,22 +8827,20 @@ string_decoder@^1.1.1:dependencies:safe-buffer "~5.2.0"- version "3.3.0"- resolved "https://registry.npmjs.org/stringify-object/-/stringify-object-3.3.0.tgz"- integrity sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw==- dependencies:- get-own-enumerable-property-symbols "^3.0.0"- is-obj "^1.0.1"- is-regexp "^1.0.0"--strip-ansi@^6.0.0, strip-ansi@^6.0.1:+strip-ansi@^6.0.1:version "6.0.1"resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==dependencies:ansi-regex "^5.0.1"+strip-ansi@^7.0.1:+ version "7.1.0"+ resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"+ integrity sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==+ dependencies:+ ansi-regex "^6.0.1"+strip-bom@^3.0.0:version "3.0.0"resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"@@ -8904,6 +8856,11 @@ strip-final-newline@^2.0.0:resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==+strip-final-newline@^3.0.0:+ version "3.0.0"+ resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-3.0.0.tgz#52894c313fbff318835280aed60ff71ebf12b8fd"+ integrity sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==+strip-indent@^3.0.0:version "3.0.0"resolved "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz"@@ -9026,13 +8983,6 @@ stylelint@^15.10.1:table "^6.8.1"write-file-atomic "^5.0.1"- version "8.1.1"- resolved "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz"- integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==- dependencies:- has-flag "^4.0.0"-supports-color@^5.3.0:version "5.5.0"resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"@@ -9070,7 +9020,7 @@ svg-tags@^1.0.0:resolved "https://registry.yarnpkg.com/svg-tags/-/svg-tags-1.0.0.tgz#58f71cee3bd519b59d4b2a843b6c7de64ac04764"integrity sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA==-svgo@^2.7.0, svgo@^2.8.0:+svgo@^2.7.0:version "2.8.0"resolved "https://registry.npmjs.org/svgo/-/svgo-2.8.0.tgz"integrity sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg==@@ -9177,7 +9127,7 @@ thenby@^1.3.4:resolved "https://registry.npmjs.org/thenby/-/thenby-1.3.4.tgz"integrity sha512-89Gi5raiWA3QZ4b2ePcEwswC3me9JIg+ToSgtE0JWeCynLnLxNr/f9G+xfo9K+Oj4AFdom8YNJjibIARTJmapQ==[email protected], "through@>=2.2.7 <3", through@^2.3.8:[email protected], "through@>=2.2.7 <3":version "2.3.8"resolved "https://registry.npmjs.org/through/-/through-2.3.8.tgz"integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==@@ -9203,10 +9153,10 @@ tiny-invariant@^1.0.6:resolved "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.1.tgz"integrity sha512-AD5ih2NlSssTCwsMznbvwMZpJ1cbhkGd2uueNxzv2jDlEeZdU04JQfRnggJQ8DrcVBGjAsCKwFBbDlVNtEMlzw==- version "11.0.1"- resolved "https://registry.npmjs.org/tiny-lru/-/tiny-lru-11.0.1.tgz"- integrity sha512-iNgFugVuQgBKrqeO/mpiTTgmBsTP0WL6yeuLfLs/Ctf0pI/ixGqIRm8sDCwMcXGe9WWvt2sGXI5mNqZbValmJg==+ version "11.1.2"+ resolved "https://registry.yarnpkg.com/tiny-lru/-/tiny-lru-11.1.2.tgz#ef8d5ac74a78fa26a9b841335348b4d71df46ddc"+ integrity sha512-EGJRgd/nY4qMlVWCYLecHdzsN6GJRM073iqlQNk/Xq5KVUGl5zkgWYNnv5pgVClDFvVEAI+7R5wpNBOu/foI2w==to-fast-properties@^2.0.0:version "2.0.0"@@ -9255,6 +9205,11 @@ trim-newlines@^4.0.2:resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-4.1.1.tgz#28c88deb50ed10c7ba6dc2474421904a00139125"integrity sha512-jRKj0n0jXWo6kh62nA5TEh3+4igKDXLvzBJcPpiizP7oOolUrYIxmVBG9TOtHYFHoddUk6YvAkGeGoSVTXfQXQ==+ts-api-utils@^1.0.1:+ version "1.0.3"+ resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.0.3.tgz#f12c1c781d04427313dbac808f453f050e54a331"+ integrity sha512-wNMeqtMz5NtwpT/UZGY5alT+VoKdSsOOP/kqHFcUW1P/VRhH2wJ48+DN2WwUliNbQ976ETwDL0Ifd2VVvgonvg==+ts-node@^10.9.1:version "10.9.1"resolved "https://registry.npmjs.org/ts-node/-/ts-node-10.9.1.tgz"@@ -9345,11 +9300,6 @@ type-fest@^0.20.2:resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==-type-fest@^0.21.3:- version "0.21.3"- resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz"- integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==-type-fest@^0.6.0:version "0.6.0"resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz"@@ -9360,7 +9310,7 @@ type-fest@^0.8.1:resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz"integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==-type-fest@^1.0.1, type-fest@^1.2.1, type-fest@^1.2.2:+type-fest@^1.0.1, type-fest@^1.0.2, type-fest@^1.2.1, type-fest@^1.2.2:version "1.4.0"resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-1.4.0.tgz#e9fb813fe3bf1744ec359d55d1affefa76f14be1"integrity sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==@@ -9689,23 +9639,14 @@ which@^2.0.1:dependencies:isexe "^2.0.0"-wrap-ansi@^6.2.0:- version "6.2.0"- resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz"- integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==- dependencies:- ansi-styles "^4.0.0"- string-width "^4.1.0"- strip-ansi "^6.0.0"--wrap-ansi@^7.0.0:- version "7.0.0"- resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz"- integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==+wrap-ansi@^8.0.1, wrap-ansi@^8.1.0:+ version "8.1.0"+ resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"+ integrity sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==dependencies:- ansi-styles "^4.0.0"- string-width "^4.1.0"- strip-ansi "^6.0.0"+ ansi-styles "^6.1.0"+ string-width "^5.0.1"+ strip-ansi "^7.0.1"wrappy@1:version "1.0.2"@@ -9760,7 +9701,12 @@ yallist@^3.0.2:resolved "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz"integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==-yaml@^1.10.0, yaml@^1.10.2:+ version "2.3.1"+ resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.3.1.tgz#02fe0975d23cd441242aa7204e09fc28ac2ac33b"+ integrity sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==++yaml@^1.10.2:version "1.10.2"resolved "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz"integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==