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
Moved code into src folder. Added build for component library.
Mike Caoede658771e95
diff --git a/.eslintrc.json b/.eslintrc.jsonindex f6d90ccab..a77ed5bd8 100644--- a/.eslintrc.json+++ b/.eslintrc.json@@ -19,22 +19,21 @@"plugin:@typescript-eslint/recommended","next"],-"plugins": ["@typescript-eslint", "prettier"],"settings": {"import/resolver": {"alias": {"map": [- ["assets", "./assets"],- ["components", "./components"],+ ["assets", "./src/assets"],+ ["components", "./src/components"],["db", "./db"],- ["hooks", "./hooks"],- ["lang", "./lang"],- ["lib", "./lib"],+ ["hooks", "./src/components/hooks"],+ ["lang", "./src/lang"],+ ["lib", "./src/lib"],["public", "./public"],- ["queries", "./queries"],- ["store", "./store"],- ["styles", "./styles"]+ ["queries", "./src/queries"],+ ["store", "./src/store"],+ ["styles", "./src/styles"]],"extensions": [".ts", ".tsx", ".js", ".jsx", ".json"]}diff --git a/jsconfig.json b/jsconfig.jsonindex b639b0f8f..738e8a465 100644--- a/jsconfig.json+++ b/jsconfig.json@@ -1,5 +1,5 @@{"compilerOptions": {- "baseUrl": "."+ "baseUrl": "./src"}-}\ No newline at end of file+}diff --git a/package.components.json b/package.components.jsonnew file mode 100644index 000000000..4596caa23--- /dev/null+++ b/package.components.json@@ -0,0 +1,10 @@+{+ "name": "@umami/components",+ "version": "0.1.0",+ "description": "Umami React components.",+ "author": "Mike Cao <[email protected]>",+ "license": "MIT",+ "main": "dist/index.js",+ "module": "dist/index.mjs",+ "types": "dist/index.d.ts"+}diff --git a/package.json b/package.jsonindex e1361d208..4f1eaa795 100644--- a/package.json+++ b/package.json@@ -18,7 +18,8 @@"start-env": "node scripts/start-env.js","start-server": "node server.js","build-app": "next build",- "build-tracker": "rollup -c rollup.tracker.config.js",+ "build-components": "rollup -c rollup.components.config.mjs",+ "build-tracker": "rollup -c rollup.tracker.config.mjs","build-db": "npm-run-all copy-db-files build-db-client","build-lang": "npm-run-all format-lang compile-lang download-country-names download-language-names","build-geo": "node scripts/build-geo.js",@@ -115,13 +116,16 @@"@formatjs/cli": "^4.2.29","@netlify/plugin-nextjs": "^4.27.3","@rollup/plugin-alias": "^5.0.0",- "@rollup/plugin-buble": "^0.21.3",- "@rollup/plugin-commonjs": "^24.1.0",+ "@rollup/plugin-buble": "^1.0.2",+ "@rollup/plugin-commonjs": "^25.0.4","@rollup/plugin-json": "^6.0.0",- "@rollup/plugin-node-resolve": "^15.0.2",- "@rollup/plugin-replace": "^4.0.0",- "@svgr/rollup": "^7.0.0",+ "@rollup/plugin-node-resolve": "^15.2.0",+ "@rollup/plugin-replace": "^5.0.2",+ "@svgr/rollup": "^8.1.0","@svgr/webpack": "^6.2.1",+ "@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","cross-env": "^7.0.3",@@ -143,11 +147,12 @@"prettier": "^2.6.2","prisma": "5.0.0","prompts": "2.4.2",- "rollup": "^2.70.1",+ "rollup": "^3.28.0",+ "rollup-plugin-copy": "^3.4.0","rollup-plugin-delete": "^2.0.0",- "rollup-plugin-dts": "^5.3.0",+ "rollup-plugin-dts": "^6.0.0","rollup-plugin-esbuild": "^5.0.0",- "rollup-plugin-node-externals": "^5.1.2",+ "rollup-plugin-node-externals": "^6.1.1","rollup-plugin-postcss": "^4.0.2","rollup-plugin-terser": "^7.0.2","stylelint": "^15.10.1",@@ -156,6 +161,6 @@"stylelint-config-recommended": "^9.0.0","tar": "^6.1.2","ts-node": "^10.9.1",- "typescript": "^4.9.5"+ "typescript": "^5.1.6"}}diff --git a/rollup.components.config.mjs b/rollup.components.config.mjsnew file mode 100644index 000000000..5c8722b4c--- /dev/null+++ b/rollup.components.config.mjs@@ -0,0 +1,99 @@+import path from 'path';+import crypto from 'crypto';+import resolve from '@rollup/plugin-node-resolve';+import alias from '@rollup/plugin-alias';+import json from '@rollup/plugin-json';+import postcss from 'rollup-plugin-postcss';+import copy from 'rollup-plugin-copy';+import del from 'rollup-plugin-delete';+import nodeExternals from 'rollup-plugin-node-externals';+import esbuild from 'rollup-plugin-esbuild';+import dts from 'rollup-plugin-dts';+import svgr from '@svgr/rollup';++const md5 = str => crypto.createHash('md5').update(str).digest('hex');++const customResolver = resolve({+ extensions: ['.js', '.jsx', '.ts', '.tsx'],+});++const aliasConfig = {+ entries: [+ { find: /^components/, replacement: path.resolve('./src/components') },+ { find: /^hooks/, replacement: path.resolve('./src/hooks') },+ { find: /^lib/, replacement: path.resolve('./src/lib') },+ { find: /^store/, replacement: path.resolve('./src/store') },+ { find: /^public/, replacement: path.resolve('./public') },+ { find: /^assets/, replacement: path.resolve('./src/assets') },+ ],+ customResolver,+};++const external = [+ 'react',+ 'react-dom',+ 'react/jsx-runtime',+ 'react-intl',+ 'react-basics',+ 'classnames',+ 'next',+];++const jsBundle = {+ input: 'src/index.ts',+ output: [+ {+ file: 'dist/index.js',+ format: 'cjs',+ sourcemap: true,+ },+ {+ file: 'dist/index.mjs',+ format: 'es',+ sourcemap: true,+ },+ ],+ plugins: [+ del({ targets: 'dist/*', runOnce: true }),+ copy({ targets: [{ src: './package.components.json', dest: 'dist', rename: 'package.json' }] }),+ postcss({+ config: false,+ extract: 'styles.css',+ sourceMap: true,+ minimize: true,+ modules: {+ generateScopedName: function (name, filename, css) {+ const file = path.basename(filename, '.css').replace('.module', '');+ const hash = Buffer.from(md5(`${name}:${filename}:${css}`))+ .toString('base64')+ .substring(0, 5);++ return `${file}-${name}--${hash}`;+ },+ },+ }),+ svgr({ icon: true }),+ nodeExternals(),+ json(),+ alias(aliasConfig),+ esbuild({+ target: 'es6',+ jsx: 'transform',+ loaders: {+ '.js': 'jsx',+ },+ }),+ ],+};++const dtsBundle = {+ input: 'src/index.ts',+ output: {+ file: 'dist/index.d.ts',+ format: 'es',+ },+ plugins: [alias(aliasConfig), nodeExternals(), json(), dts()],+ external: [/\.css/],+};++export default [jsBundle, dtsBundle];diff --git a/rollup.tracker.config.js b/rollup.tracker.config.mjssimilarity index 93%rename from rollup.tracker.config.jsrename to rollup.tracker.config.mjsindex f4e7223c6..465e1af36 100644--- a/rollup.tracker.config.js+++ b/rollup.tracker.config.mjs@@ -4,7 +4,7 @@ import replace from '@rollup/plugin-replace';import { terser } from 'rollup-plugin-terser';export default {- input: 'tracker/index.js',+ input: 'src/tracker/index.js',output: {file: 'public/script.js',format: 'iife',diff --git a/scripts/check-lang.js b/scripts/check-lang.jsindex e5a0bf095..a1b604310 100644--- a/scripts/check-lang.js+++ b/scripts/check-lang.js@@ -2,7 +2,7 @@const fs = require('fs');const path = require('path');const chalk = require('chalk');-const messages = require('../lang/en-US.json');+const messages = require('../src/lang/en-US.json');const ignore = require('../lang-ignore.json');const dir = path.resolve(__dirname, '../lang');diff --git a/assets/add-user.svg b/src/assets/add-user.svgsimilarity index 100%rename from assets/add-user.svgrename to src/assets/add-user.svgdiff --git a/assets/bar-chart.svg b/src/assets/bar-chart.svgsimilarity index 100%rename from assets/bar-chart.svgrename to src/assets/bar-chart.svgdiff --git a/assets/bars.svg b/src/assets/bars.svgsimilarity index 100%rename from assets/bars.svgrename to src/assets/bars.svgdiff --git a/assets/bolt.svg b/src/assets/bolt.svgsimilarity index 100%rename from assets/bolt.svgrename to src/assets/bolt.svgdiff --git a/assets/calendar.svg b/src/assets/calendar.svgsimilarity index 100%rename from assets/calendar.svgrename to src/assets/calendar.svgdiff --git a/assets/clock.svg b/src/assets/clock.svgsimilarity index 100%rename from assets/clock.svgrename to src/assets/clock.svgdiff --git a/assets/dashboard.svg b/src/assets/dashboard.svgsimilarity index 100%rename from assets/dashboard.svgrename to src/assets/dashboard.svgdiff --git a/assets/expand.svg b/src/assets/expand.svgsimilarity index 100%rename from assets/expand.svgrename to src/assets/expand.svgdiff --git a/assets/eye.svg b/src/assets/eye.svgsimilarity index 100%rename from assets/eye.svgrename to src/assets/eye.svgdiff --git a/assets/funnel.svg b/src/assets/funnel.svgsimilarity index 100%rename from assets/funnel.svgrename to src/assets/funnel.svgdiff --git a/assets/gear.svg b/src/assets/gear.svgsimilarity index 100%rename from assets/gear.svgrename to src/assets/gear.svgdiff --git a/assets/globe.svg b/src/assets/globe.svgsimilarity index 100%rename from assets/globe.svgrename to src/assets/globe.svgdiff --git a/assets/lightbulb.svg b/src/assets/lightbulb.svgsimilarity index 100%rename from assets/lightbulb.svgrename to src/assets/lightbulb.svgdiff --git a/assets/link.svg b/src/assets/link.svgsimilarity index 100%rename from assets/link.svgrename to src/assets/link.svgdiff --git a/assets/lock.svg b/src/assets/lock.svgsimilarity index 100%rename from assets/lock.svgrename to src/assets/lock.svgdiff --git a/assets/logo.svg b/src/assets/logo.svgsimilarity index 100%rename from assets/logo.svgrename to src/assets/logo.svgdiff --git a/assets/magnet.svg b/src/assets/magnet.svgsimilarity index 100%rename from assets/magnet.svgrename to src/assets/magnet.svgdiff --git a/assets/moon.svg b/src/assets/moon.svgsimilarity index 100%rename from assets/moon.svgrename to src/assets/moon.svgdiff --git a/assets/nodes.svg b/src/assets/nodes.svgsimilarity index 100%rename from assets/nodes.svgrename to src/assets/nodes.svgdiff --git a/assets/overview.svg b/src/assets/overview.svgsimilarity index 100%rename from assets/overview.svgrename to src/assets/overview.svgdiff --git a/assets/profile.svg b/src/assets/profile.svgsimilarity index 100%rename from assets/profile.svgrename to src/assets/profile.svgdiff --git a/assets/redo.svg b/src/assets/redo.svgsimilarity index 100%rename from assets/redo.svgrename to src/assets/redo.svgdiff --git a/assets/reports.svg b/src/assets/reports.svgsimilarity index 100%rename from assets/reports.svgrename to src/assets/reports.svgdiff --git a/assets/sun.svg b/src/assets/sun.svgsimilarity index 100%rename from assets/sun.svgrename to src/assets/sun.svgdiff --git a/assets/user.svg b/src/assets/user.svgsimilarity index 100%rename from assets/user.svgrename to src/assets/user.svgdiff --git a/assets/users.svg b/src/assets/users.svgsimilarity index 100%rename from assets/users.svgrename to src/assets/users.svgdiff --git a/assets/visitor.svg b/src/assets/visitor.svgsimilarity index 100%rename from assets/visitor.svgrename to src/assets/visitor.svgdiff --git a/assets/website.svg b/src/assets/website.svgsimilarity index 100%rename from assets/website.svgrename to src/assets/website.svgdiff --git a/components/common/ConfirmDeleteForm.js b/src/components/common/ConfirmDeleteForm.jssimilarity index 93%rename from components/common/ConfirmDeleteForm.jsrename to src/components/common/ConfirmDeleteForm.jsindex 3496a3053..fed618da9 100644--- a/components/common/ConfirmDeleteForm.js+++ b/src/components/common/ConfirmDeleteForm.js@@ -1,6 +1,6 @@import { useState } from 'react';import { Button, LoadingButton, Form, FormButtons } from 'react-basics';-import useMessages from 'hooks/useMessages';+import useMessages from 'components/hooks/useMessages';export function ConfirmDeleteForm({ name, onConfirm, onClose }) {const [loading, setLoading] = useState(false);diff --git a/components/common/Empty.js b/src/components/common/Empty.jssimilarity index 86%rename from components/common/Empty.jsrename to src/components/common/Empty.jsindex 95681b167..c0be761a0 100644--- a/components/common/Empty.js+++ b/src/components/common/Empty.js@@ -1,6 +1,6 @@import classNames from 'classnames';import styles from './Empty.module.css';-import useMessages from 'hooks/useMessages';+import useMessages from 'components/hooks/useMessages';export function Empty({ message, className }) {const { formatMessage, messages } = useMessages();diff --git a/components/common/Empty.module.css b/src/components/common/Empty.module.csssimilarity index 100%rename from components/common/Empty.module.cssrename to src/components/common/Empty.module.cssdiff --git a/components/common/EmptyPlaceholder.js b/src/components/common/EmptyPlaceholder.jssimilarity index 100%rename from components/common/EmptyPlaceholder.jsrename to src/components/common/EmptyPlaceholder.jsdiff --git a/components/common/ErrorBoundary.js b/src/components/common/ErrorBoundary.jssimilarity index 93%rename from components/common/ErrorBoundary.jsrename to src/components/common/ErrorBoundary.jsindex f97fd92c2..32cedb398 100644--- a/components/common/ErrorBoundary.js+++ b/src/components/common/ErrorBoundary.js@@ -1,7 +1,7 @@/* eslint-disable no-console */import { ErrorBoundary as Boundary } from 'react-error-boundary';import { Button } from 'react-basics';-import useMessages from 'hooks/useMessages';+import useMessages from 'components/hooks/useMessages';import styles from './ErrorBoundry.module.css';const logError = (error, info) => {diff --git a/components/common/ErrorBoundry.module.css b/src/components/common/ErrorBoundry.module.csssimilarity index 100%rename from components/common/ErrorBoundry.module.cssrename to src/components/common/ErrorBoundry.module.cssdiff --git a/components/common/ErrorMessage.js b/src/components/common/ErrorMessage.jssimilarity index 88%rename from components/common/ErrorMessage.jsrename to src/components/common/ErrorMessage.jsindex e2b227478..f8129c6b0 100644--- a/components/common/ErrorMessage.js+++ b/src/components/common/ErrorMessage.js@@ -1,6 +1,6 @@import { Icon, Icons, Text } from 'react-basics';import styles from './ErrorMessage.module.css';-import useMessages from 'hooks/useMessages';+import useMessages from 'components/hooks/useMessages';export function ErrorMessage() {const { formatMessage, messages } = useMessages();diff --git a/components/common/ErrorMessage.module.css b/src/components/common/ErrorMessage.module.csssimilarity index 100%rename from components/common/ErrorMessage.module.cssrename to src/components/common/ErrorMessage.module.cssdiff --git a/components/common/Favicon.js b/src/components/common/Favicon.jssimilarity index 100%rename from components/common/Favicon.jsrename to src/components/common/Favicon.jsdiff --git a/components/common/Favicon.module.css b/src/components/common/Favicon.module.csssimilarity index 100%rename from components/common/Favicon.module.cssrename to src/components/common/Favicon.module.cssdiff --git a/components/common/FilterButtons.js b/src/components/common/FilterButtons.jssimilarity index 100%rename from components/common/FilterButtons.jsrename to src/components/common/FilterButtons.jsdiff --git a/components/common/FilterLink.js b/src/components/common/FilterLink.jssimilarity index 91%rename from components/common/FilterLink.jsrename to src/components/common/FilterLink.jsindex 30cdc025b..2a95e011d 100644--- a/components/common/FilterLink.js+++ b/src/components/common/FilterLink.js@@ -2,8 +2,8 @@ import { Icon, Icons } from 'react-basics';import classNames from 'classnames';import Link from 'next/link';import { safeDecodeURI } from 'next-basics';-import usePageQuery from 'hooks/usePageQuery';-import useMessages from 'hooks/useMessages';+import usePageQuery from 'components/hooks/usePageQuery';+import useMessages from 'components/hooks/useMessages';import styles from './FilterLink.module.css';export function FilterLink({ id, value, label, externalUrl, children, className }) {diff --git a/components/common/FilterLink.module.css b/src/components/common/FilterLink.module.csssimilarity index 100%rename from components/common/FilterLink.module.cssrename to src/components/common/FilterLink.module.cssdiff --git a/components/common/HamburgerButton.js b/src/components/common/HamburgerButton.jssimilarity index 93%rename from components/common/HamburgerButton.jsrename to src/components/common/HamburgerButton.jsindex 48c807708..9feee67b7 100644--- a/components/common/HamburgerButton.js+++ b/src/components/common/HamburgerButton.js@@ -2,8 +2,8 @@ import { Button, Icon } from 'react-basics';import { useState } from 'react';import MobileMenu from './MobileMenu';import Icons from 'components/icons';-import useMessages from 'hooks/useMessages';-import useConfig from 'hooks/useConfig';+import useMessages from 'components/hooks/useMessages';+import useConfig from 'components/hooks/useConfig';export function HamburgerButton() {const { formatMessage, labels } = useMessages();diff --git a/components/common/HamburgerButton.module.css b/src/components/common/HamburgerButton.module.csssimilarity index 100%rename from components/common/HamburgerButton.module.cssrename to src/components/common/HamburgerButton.module.cssdiff --git a/components/common/HoverTooltip.js b/src/components/common/HoverTooltip.jssimilarity index 100%rename from components/common/HoverTooltip.jsrename to src/components/common/HoverTooltip.jsdiff --git a/components/common/HoverTooltip.module.css b/src/components/common/HoverTooltip.module.csssimilarity index 100%rename from components/common/HoverTooltip.module.cssrename to src/components/common/HoverTooltip.module.cssdiff --git a/components/common/LinkButton.js b/src/components/common/LinkButton.jssimilarity index 77%rename from components/common/LinkButton.jsrename to src/components/common/LinkButton.jsindex 8c0501475..54c7fa631 100644--- a/components/common/LinkButton.js+++ b/src/components/common/LinkButton.js@@ -2,7 +2,7 @@ import Link from 'next/link';import { Icon, Icons, Text } from 'react-basics';import styles from './LinkButton.module.css';-export default function LinkButton({ href, icon, children }) {+export function LinkButton({ href, icon, children }) {return (<Link className={styles.button} href={href}><Icon>{icon || <Icons.ArrowRight />}</Icon>@@ -10,3 +10,5 @@ export default function LinkButton({ href, icon, children }) {</Link>);}++export default LinkButton;diff --git a/components/common/LinkButton.module.css b/src/components/common/LinkButton.module.csssimilarity index 100%rename from components/common/LinkButton.module.cssrename to src/components/common/LinkButton.module.cssdiff --git a/components/common/MobileMenu.js b/src/components/common/MobileMenu.jssimilarity index 100%rename from components/common/MobileMenu.jsrename to src/components/common/MobileMenu.jsdiff --git a/components/common/MobileMenu.module.css b/src/components/common/MobileMenu.module.csssimilarity index 100%rename from components/common/MobileMenu.module.cssrename to src/components/common/MobileMenu.module.cssdiff --git a/components/common/Pager.js b/src/components/common/Pager.jssimilarity index 95%rename from components/common/Pager.jsrename to src/components/common/Pager.jsindex aaeffbaec..7a5e7ed5f 100644--- a/components/common/Pager.js+++ b/src/components/common/Pager.js@@ -1,6 +1,6 @@import styles from './Pager.module.css';import { Button, Flexbox, Icon, Icons } from 'react-basics';-import useMessages from 'hooks/useMessages';+import useMessages from 'components/hooks/useMessages';export function Pager({ page, pageSize, count, onPageChange }) {const { formatMessage, labels } = useMessages();diff --git a/components/common/Pager.module.css b/src/components/common/Pager.module.csssimilarity index 100%rename from components/common/Pager.module.cssrename to src/components/common/Pager.module.cssdiff --git a/components/common/SettingsTable.js b/src/components/common/SettingsTable.jssimilarity index 98%rename from components/common/SettingsTable.jsrename to src/components/common/SettingsTable.jsindex eb7a64112..2df3b391b 100644--- a/components/common/SettingsTable.js+++ b/src/components/common/SettingsTable.js@@ -1,5 +1,5 @@import Empty from 'components/common/Empty';-import useMessages from 'hooks/useMessages';+import useMessages from 'components/hooks/useMessages';import { useState } from 'react';import {SearchField,diff --git a/components/common/SettingsTable.module.css b/src/components/common/SettingsTable.module.csssimilarity index 100%rename from components/common/SettingsTable.module.cssrename to src/components/common/SettingsTable.module.cssdiff --git a/components/common/UpdateNotice.js b/src/components/common/UpdateNotice.jssimilarity index 96%rename from components/common/UpdateNotice.jsrename to src/components/common/UpdateNotice.jsindex bef6be982..e3edc70c1 100644--- a/components/common/UpdateNotice.js+++ b/src/components/common/UpdateNotice.js@@ -4,7 +4,7 @@ import { setItem } from 'next-basics';import useStore, { checkVersion } from 'store/version';import { REPO_URL, VERSION_CHECK } from 'lib/constants';import styles from './UpdateNotice.module.css';-import useMessages from 'hooks/useMessages';+import useMessages from 'components/hooks/useMessages';import { useRouter } from 'next/router';export function UpdateNotice({ user, config }) {diff --git a/components/common/UpdateNotice.module.css b/src/components/common/UpdateNotice.module.csssimilarity index 100%rename from components/common/UpdateNotice.module.cssrename to src/components/common/UpdateNotice.module.cssdiff --git a/components/common/WorldMap.js b/src/components/common/WorldMap.jssimilarity index 94%rename from components/common/WorldMap.jsrename to src/components/common/WorldMap.jsindex 9c91e4a47..b593099b7 100644--- a/components/common/WorldMap.js+++ b/src/components/common/WorldMap.js@@ -5,9 +5,9 @@ import classNames from 'classnames';import { colord } from 'colord';import HoverTooltip from 'components/common/HoverTooltip';import { ISO_COUNTRIES, MAP_FILE } from 'lib/constants';-import useTheme from 'hooks/useTheme';-import useCountryNames from 'hooks/useCountryNames';-import useLocale from 'hooks/useLocale';+import useTheme from 'components/hooks/useTheme';+import useCountryNames from 'components/hooks/useCountryNames';+import useLocale from 'components/hooks/useLocale';import { formatLongNumber } from 'lib/format';import { percentFilter } from 'lib/filters';import styles from './WorldMap.module.css';diff --git a/components/common/WorldMap.module.css b/src/components/common/WorldMap.module.csssimilarity index 100%rename from components/common/WorldMap.module.cssrename to src/components/common/WorldMap.module.cssdiff --git a/components/declarations.d.ts b/src/components/declarations.d.tssimilarity index 100%rename from components/declarations.d.tsrename to src/components/declarations.d.tsdiff --git a/hooks/index.js b/src/components/hooks/index.jssimilarity index 100%rename from hooks/index.jsrename to src/components/hooks/index.jsdiff --git a/hooks/useApi.ts b/src/components/hooks/useApi.tssimilarity index 100%rename from hooks/useApi.tsrename to src/components/hooks/useApi.tsdiff --git a/hooks/useApiFilter.ts b/src/components/hooks/useApiFilter.tssimilarity index 100%rename from hooks/useApiFilter.tsrename to src/components/hooks/useApiFilter.tsdiff --git a/hooks/useConfig.js b/src/components/hooks/useConfig.jssimilarity index 91%rename from hooks/useConfig.jsrename to src/components/hooks/useConfig.jsindex 2dead15a8..6b37c87b0 100644--- a/hooks/useConfig.js+++ b/src/components/hooks/useConfig.js@@ -1,6 +1,6 @@import { useEffect } from 'react';import useStore, { setConfig } from 'store/app';-import useApi from 'hooks/useApi';+import useApi from 'components/hooks/useApi';let loading = false;diff --git a/hooks/useCountryNames.js b/src/components/hooks/useCountryNames.jssimilarity index 100%rename from hooks/useCountryNames.jsrename to src/components/hooks/useCountryNames.jsdiff --git a/hooks/useDateRange.js b/src/components/hooks/useDateRange.jssimilarity index 100%rename from hooks/useDateRange.jsrename to src/components/hooks/useDateRange.jsdiff --git a/hooks/useDocumentClick.js b/src/components/hooks/useDocumentClick.jssimilarity index 100%rename from hooks/useDocumentClick.jsrename to src/components/hooks/useDocumentClick.jsdiff --git a/hooks/useEscapeKey.js b/src/components/hooks/useEscapeKey.jssimilarity index 100%rename from hooks/useEscapeKey.jsrename to src/components/hooks/useEscapeKey.jsdiff --git a/hooks/useFilters.js b/src/components/hooks/useFilters.jssimilarity index 97%rename from hooks/useFilters.jsrename to src/components/hooks/useFilters.jsindex 089f2ee84..e1a9a8858 100644--- a/hooks/useFilters.js+++ b/src/components/hooks/useFilters.js@@ -1,4 +1,4 @@-import { useMessages } from 'hooks';+import { useMessages } from './useMessages';import { OPERATORS } from 'lib/constants';export function useFilters() {diff --git a/hooks/useForceUpdate.js b/src/components/hooks/useForceUpdate.jssimilarity index 100%rename from hooks/useForceUpdate.jsrename to src/components/hooks/useForceUpdate.jsdiff --git a/hooks/useFormat.js b/src/components/hooks/useFormat.jssimilarity index 100%rename from hooks/useFormat.jsrename to src/components/hooks/useFormat.jsdiff --git a/hooks/useLanguageNames.js b/src/components/hooks/useLanguageNames.jssimilarity index 100%rename from hooks/useLanguageNames.jsrename to src/components/hooks/useLanguageNames.jsdiff --git a/hooks/useLocale.js b/src/components/hooks/useLocale.jssimilarity index 96%rename from hooks/useLocale.jsrename to src/components/hooks/useLocale.jsindex 86ca99042..6353b0333 100644--- a/hooks/useLocale.js+++ b/src/components/hooks/useLocale.js@@ -4,7 +4,7 @@ import { httpGet, setItem } from 'next-basics';import { LOCALE_CONFIG } from 'lib/constants';import { getDateLocale, getTextDirection } from 'lib/lang';import useStore, { setLocale } from 'store/app';-import useForceUpdate from 'hooks/useForceUpdate';+import useForceUpdate from 'components/hooks/useForceUpdate';import enUS from 'public/intl/messages/en-US.json';const messages = {diff --git a/hooks/useMessages.js b/src/components/hooks/useMessages.jssimilarity index 100%rename from hooks/useMessages.jsrename to src/components/hooks/useMessages.jsdiff --git a/hooks/usePageQuery.js b/src/components/hooks/usePageQuery.jssimilarity index 100%rename from hooks/usePageQuery.jsrename to src/components/hooks/usePageQuery.jsdiff --git a/hooks/useReport.js b/src/components/hooks/useReport.jssimilarity index 100%rename from hooks/useReport.jsrename to src/components/hooks/useReport.jsdiff --git a/hooks/useReports.js b/src/components/hooks/useReports.jssimilarity index 94%rename from hooks/useReports.jsrename to src/components/hooks/useReports.jsindex 932fa6dc4..d9292aeb4 100644--- a/hooks/useReports.js+++ b/src/components/hooks/useReports.js@@ -1,6 +1,6 @@import { useState } from 'react';import useApi from './useApi';-import useApiFilter from 'hooks/useApiFilter';+import useApiFilter from 'components/hooks/useApiFilter';export function useReports() {const [modified, setModified] = useState(Date.now());diff --git a/hooks/useRequireLogin.js b/src/components/hooks/useRequireLogin.jssimilarity index 84%rename from hooks/useRequireLogin.jsrename to src/components/hooks/useRequireLogin.jsindex 3a95c9888..82a6d220a 100644--- a/hooks/useRequireLogin.js+++ b/src/components/hooks/useRequireLogin.js@@ -1,7 +1,7 @@import { useEffect } from 'react';import { useRouter } from 'next/router';-import useApi from 'hooks/useApi';-import useUser from 'hooks/useUser';+import useApi from 'components/hooks/useApi';+import useUser from 'components/hooks/useUser';export function useRequireLogin() {const router = useRouter();diff --git a/hooks/useShareToken.js b/src/components/hooks/useShareToken.jssimilarity index 100%rename from hooks/useShareToken.jsrename to src/components/hooks/useShareToken.jsdiff --git a/hooks/useSticky.js b/src/components/hooks/useSticky.jssimilarity index 100%rename from hooks/useSticky.jsrename to src/components/hooks/useSticky.jsdiff --git a/hooks/useTheme.js b/src/components/hooks/useTheme.jssimilarity index 100%rename from hooks/useTheme.jsrename to src/components/hooks/useTheme.jsdiff --git a/hooks/useTimezone.js b/src/components/hooks/useTimezone.jssimilarity index 100%rename from hooks/useTimezone.jsrename to src/components/hooks/useTimezone.jsdiff --git a/hooks/useUser.js b/src/components/hooks/useUser.jssimilarity index 100%rename from hooks/useUser.jsrename to src/components/hooks/useUser.jsdiff --git a/hooks/useWebsite.js b/src/components/hooks/useWebsite.jssimilarity index 100%rename from hooks/useWebsite.jsrename to src/components/hooks/useWebsite.jsdiff --git a/hooks/useWebsiteReports.js b/src/components/hooks/useWebsiteReports.jssimilarity index 94%rename from hooks/useWebsiteReports.jsrename to src/components/hooks/useWebsiteReports.jsindex 3b7ec4155..c637bc76a 100644--- a/hooks/useWebsiteReports.js+++ b/src/components/hooks/useWebsiteReports.js@@ -1,6 +1,6 @@import { useState } from 'react';import useApi from './useApi';-import useApiFilter from 'hooks/useApiFilter';+import useApiFilter from 'components/hooks/useApiFilter';export function useWebsiteReports(websiteId) {const [modified, setModified] = useState(Date.now());diff --git a/components/icons.ts b/src/components/icons.tssimilarity index 98%rename from components/icons.tsrename to src/components/icons.tsindex 01d7caf5a..8eb1f8b05 100644--- a/components/icons.ts+++ b/src/components/icons.ts@@ -22,7 +22,7 @@ import User from 'assets/user.svg';import Users from 'assets/users.svg';import Visitor from 'assets/visitor.svg';-const icons = {+const icons: any = {...Icons,AddUser,Bars,diff --git a/components/input/DateFilter.js b/src/components/input/DateFilter.jssimilarity index 96%rename from components/input/DateFilter.jsrename to src/components/input/DateFilter.jsindex af4b69dde..ffbcff690 100644--- a/components/input/DateFilter.js+++ b/src/components/input/DateFilter.js@@ -2,10 +2,10 @@ import { useState } from 'react';import { Icon, Modal, Dropdown, Item, Text, Flexbox } from 'react-basics';import { endOfYear, isSameDay } from 'date-fns';import DatePickerForm from 'components/metrics/DatePickerForm';-import useLocale from 'hooks/useLocale';+import useLocale from 'components/hooks/useLocale';import { formatDate } from 'lib/date';import Icons from 'components/icons';-import useMessages from 'hooks/useMessages';+import useMessages from 'components/hooks/useMessages';export function DateFilter({value,diff --git a/components/input/LanguageButton.js b/src/components/input/LanguageButton.jssimilarity index 96%rename from components/input/LanguageButton.jsrename to src/components/input/LanguageButton.jsindex d4c1cbc39..3c0d0cd6f 100644--- a/components/input/LanguageButton.js+++ b/src/components/input/LanguageButton.js@@ -1,7 +1,7 @@import { Icon, Button, PopupTrigger, Popup, Text } from 'react-basics';import classNames from 'classnames';import { languages } from 'lib/lang';-import useLocale from 'hooks/useLocale';+import useLocale from 'components/hooks/useLocale';import Icons from 'components/icons';import styles from './LanguageButton.module.css';diff --git a/components/input/LanguageButton.module.css b/src/components/input/LanguageButton.module.csssimilarity index 100%rename from components/input/LanguageButton.module.cssrename to src/components/input/LanguageButton.module.cssdiff --git a/components/input/LogoutButton.js b/src/components/input/LogoutButton.jssimilarity index 84%rename from components/input/LogoutButton.jsrename to src/components/input/LogoutButton.jsindex 4a15cd68b..2b04a78a2 100644--- a/components/input/LogoutButton.js+++ b/src/components/input/LogoutButton.js@@ -1,11 +1,11 @@import { Button, Icon, Icons, TooltipPopup } from 'react-basics';import Link from 'next/link';-import useMessages from 'hooks/useMessages';+import useMessages from 'components/hooks/useMessages';export function LogoutButton({ tooltipPosition = 'top' }) {const { formatMessage, labels } = useMessages();return (- <Link href="/logout">+ <Link href="/src/pages/logout"><TooltipPopup label={formatMessage(labels.logout)} position={tooltipPosition}><Button variant="quiet"><Icon>diff --git a/components/input/MonthSelect.js b/src/components/input/MonthSelect.jssimilarity index 97%rename from components/input/MonthSelect.jsrename to src/components/input/MonthSelect.jsindex 88373fddf..fb1bf5354 100644--- a/components/input/MonthSelect.js+++ b/src/components/input/MonthSelect.js@@ -10,7 +10,7 @@ import {} from 'react-basics';import { startOfMonth, endOfMonth } from 'date-fns';import Icons from 'components/icons';-import { useLocale } from 'hooks';+import { useLocale } from 'components/hooks';import { formatDate } from 'lib/date';import { getDateLocale } from 'lib/lang';import styles from './MonthSelect.module.css';diff --git a/components/input/MonthSelect.module.css b/src/components/input/MonthSelect.module.csssimilarity index 100%rename from components/input/MonthSelect.module.cssrename to src/components/input/MonthSelect.module.cssdiff --git a/components/input/ProfileButton.js b/src/components/input/ProfileButton.jssimilarity index 88%rename from components/input/ProfileButton.jsrename to src/components/input/ProfileButton.jsindex bbd84af5d..cfb89cf80 100644--- a/components/input/ProfileButton.js+++ b/src/components/input/ProfileButton.js@@ -1,11 +1,11 @@import { Icon, Button, PopupTrigger, Popup, Menu, Item, Text } from 'react-basics';import { useRouter } from 'next/router';import Icons from 'components/icons';-import useMessages from 'hooks/useMessages';-import useUser from 'hooks/useUser';-import useConfig from 'hooks/useConfig';+import useMessages from 'components/hooks/useMessages';+import useUser from 'components/hooks/useUser';+import useConfig from 'components/hooks/useConfig';import styles from './ProfileButton.module.css';-import useLocale from 'hooks/useLocale';+import useLocale from 'components/hooks/useLocale';export function ProfileButton() {const { formatMessage, labels } = useMessages();diff --git a/components/input/ProfileButton.module.css b/src/components/input/ProfileButton.module.csssimilarity index 100%rename from components/input/ProfileButton.module.cssrename to src/components/input/ProfileButton.module.cssdiff --git a/components/input/RefreshButton.js b/src/components/input/RefreshButton.jssimilarity index 86%rename from components/input/RefreshButton.jsrename to src/components/input/RefreshButton.jsindex de7ce8cfa..81bca45f7 100644--- a/components/input/RefreshButton.js+++ b/src/components/input/RefreshButton.js@@ -1,8 +1,8 @@import { LoadingButton, Icon, TooltipPopup } from 'react-basics';import { setWebsiteDateRange } from 'store/websites';-import useDateRange from 'hooks/useDateRange';+import useDateRange from 'components/hooks/useDateRange';import Icons from 'components/icons';-import useMessages from 'hooks/useMessages';+import useMessages from 'components/hooks/useMessages';export function RefreshButton({ websiteId, isLoading }) {const { formatMessage, labels } = useMessages();diff --git a/components/input/SettingsButton.js b/src/components/input/SettingsButton.jssimilarity index 94%rename from components/input/SettingsButton.jsrename to src/components/input/SettingsButton.jsindex 6f2012d47..a6d72a2b0 100644--- a/components/input/SettingsButton.js+++ b/src/components/input/SettingsButton.js@@ -2,7 +2,7 @@ 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 Icons from 'components/icons';-import useMessages from 'hooks/useMessages';+import useMessages from 'components/hooks/useMessages';import styles from './SettingsButton.module.css';export function SettingsButton() {diff --git a/components/input/SettingsButton.module.css b/src/components/input/SettingsButton.module.csssimilarity index 100%rename from components/input/SettingsButton.module.cssrename to src/components/input/SettingsButton.module.cssdiff --git a/components/input/ThemeButton.js b/src/components/input/ThemeButton.jssimilarity index 95%rename from components/input/ThemeButton.jsrename to src/components/input/ThemeButton.jsindex 8ab0cdcd5..3a6a9d148 100644--- a/components/input/ThemeButton.js+++ b/src/components/input/ThemeButton.js@@ -1,6 +1,6 @@import { useTransition, animated } from 'react-spring';import { Button, Icon } from 'react-basics';-import useTheme from 'hooks/useTheme';+import useTheme from 'components/hooks/useTheme';import Icons from 'components/icons';import styles from './ThemeButton.module.css';diff --git a/components/input/ThemeButton.module.css b/src/components/input/ThemeButton.module.csssimilarity index 100%rename from components/input/ThemeButton.module.cssrename to src/components/input/ThemeButton.module.cssdiff --git a/components/input/WebsiteDateFilter.js b/src/components/input/WebsiteDateFilter.jssimilarity index 76%rename from components/input/WebsiteDateFilter.jsrename to src/components/input/WebsiteDateFilter.jsindex 47e6f0160..2796b7490 100644--- a/components/input/WebsiteDateFilter.js+++ b/src/components/input/WebsiteDateFilter.js@@ -1,8 +1,8 @@-import useDateRange from 'hooks/useDateRange';+import useDateRange from 'components/hooks/useDateRange';import DateFilter from './DateFilter';import styles from './WebsiteDateFilter.module.css';-export default function WebsiteDateFilter({ websiteId }) {+export function WebsiteDateFilter({ websiteId }) {const [dateRange, setDateRange] = useDateRange(websiteId);const { value, startDate, endDate } = dateRange;@@ -21,3 +21,5 @@ export default function WebsiteDateFilter({ websiteId }) {/>);}++export default WebsiteDateFilter;diff --git a/components/input/WebsiteDateFilter.module.css b/src/components/input/WebsiteDateFilter.module.csssimilarity index 100%rename from components/input/WebsiteDateFilter.module.cssrename to src/components/input/WebsiteDateFilter.module.cssdiff --git a/components/input/WebsiteSelect.js b/src/components/input/WebsiteSelect.jssimilarity index 87%rename from components/input/WebsiteSelect.jsrename to src/components/input/WebsiteSelect.jsindex ae3ceb46a..1bdc4608a 100644--- a/components/input/WebsiteSelect.js+++ b/src/components/input/WebsiteSelect.js@@ -1,6 +1,6 @@import { Dropdown, Item } from 'react-basics';-import useApi from 'hooks/useApi';-import useMessages from 'hooks/useMessages';+import useApi from 'components/hooks/useApi';+import useMessages from 'components/hooks/useMessages';export function WebsiteSelect({ websiteId, onSelect }) {const { formatMessage, labels } = useMessages();diff --git a/components/layout/AppLayout.js b/src/components/layout/AppLayout.jssimilarity index 92%rename from components/layout/AppLayout.jsrename to src/components/layout/AppLayout.jsindex 7ab74351b..8fd637f36 100644--- a/components/layout/AppLayout.js+++ b/src/components/layout/AppLayout.js@@ -2,7 +2,7 @@ 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 'hooks';+import { useRequireLogin, useConfig } from 'components/hooks';import styles from './AppLayout.module.css';export function AppLayout({ title, children }) {diff --git a/components/layout/AppLayout.module.css b/src/components/layout/AppLayout.module.csssimilarity index 100%rename from components/layout/AppLayout.module.cssrename to src/components/layout/AppLayout.module.cssdiff --git a/components/layout/Footer.js b/src/components/layout/Footer.jssimilarity index 100%rename from components/layout/Footer.jsrename to src/components/layout/Footer.jsdiff --git a/components/layout/Footer.module.css b/src/components/layout/Footer.module.csssimilarity index 100%rename from components/layout/Footer.module.cssrename to src/components/layout/Footer.module.cssdiff --git a/components/layout/Grid.js b/src/components/layout/Grid.jssimilarity index 100%rename from components/layout/Grid.jsrename to src/components/layout/Grid.jsdiff --git a/components/layout/Grid.module.css b/src/components/layout/Grid.module.csssimilarity index 100%rename from components/layout/Grid.module.cssrename to src/components/layout/Grid.module.cssdiff --git a/components/layout/Header.js b/src/components/layout/Header.jssimilarity index 100%rename from components/layout/Header.jsrename to src/components/layout/Header.jsdiff --git a/components/layout/Header.module.css b/src/components/layout/Header.module.csssimilarity index 100%rename from components/layout/Header.module.cssrename to src/components/layout/Header.module.cssdiff --git a/components/layout/NavBar.js b/src/components/layout/NavBar.jssimilarity index 94%rename from components/layout/NavBar.jsrename to src/components/layout/NavBar.jsindex e896b4046..ec0881755 100644--- a/components/layout/NavBar.js+++ b/src/components/layout/NavBar.js@@ -6,8 +6,8 @@ import ThemeButton from 'components/input/ThemeButton';import LanguageButton from 'components/input/LanguageButton';import ProfileButton from 'components/input/ProfileButton';import styles from './NavBar.module.css';-import useConfig from 'hooks/useConfig';-import useMessages from 'hooks/useMessages';+import useConfig from 'components/hooks/useConfig';+import useMessages from 'components/hooks/useMessages';import { useRouter } from 'next/router';import HamburgerButton from '../common/HamburgerButton';diff --git a/components/layout/NavBar.module.css b/src/components/layout/NavBar.module.csssimilarity index 100%rename from components/layout/NavBar.module.cssrename to src/components/layout/NavBar.module.cssdiff --git a/components/layout/NavGroup.js b/src/components/layout/NavGroup.jssimilarity index 100%rename from components/layout/NavGroup.jsrename to src/components/layout/NavGroup.jsdiff --git a/components/layout/NavGroup.module.css b/src/components/layout/NavGroup.module.csssimilarity index 100%rename from components/layout/NavGroup.module.cssrename to src/components/layout/NavGroup.module.cssdiff --git a/components/layout/Page.js b/src/components/layout/Page.jssimilarity index 90%rename from components/layout/Page.jsrename to src/components/layout/Page.jsindex 30abde508..4f42aa55a 100644--- a/components/layout/Page.js+++ b/src/components/layout/Page.js@@ -1,6 +1,6 @@import classNames from 'classnames';import { Banner, Loading } from 'react-basics';-import useMessages from 'hooks/useMessages';+import useMessages from 'components/hooks/useMessages';import styles from './Page.module.css';export function Page({ className, error, loading, children }) {diff --git a/components/layout/Page.module.css b/src/components/layout/Page.module.csssimilarity index 100%rename from components/layout/Page.module.cssrename to src/components/layout/Page.module.cssdiff --git a/components/layout/PageHeader.js b/src/components/layout/PageHeader.jssimilarity index 100%rename from components/layout/PageHeader.jsrename to src/components/layout/PageHeader.jsdiff --git a/components/layout/PageHeader.module.css b/src/components/layout/PageHeader.module.csssimilarity index 100%rename from components/layout/PageHeader.module.cssrename to src/components/layout/PageHeader.module.cssdiff --git a/components/layout/ReportsLayout.js b/src/components/layout/ReportsLayout.jssimilarity index 83%rename from components/layout/ReportsLayout.jsrename to src/components/layout/ReportsLayout.jsindex fd63a67e7..374da2635 100644--- a/components/layout/ReportsLayout.js+++ b/src/components/layout/ReportsLayout.js@@ -1,7 +1,7 @@import { Column, Row } from 'react-basics';import styles from './ReportsLayout.module.css';-export function SettingsLayout({ children, filter, header }) {+export function ReportsLayout({ children, filter, header }) {return (<><Row>{header}</Row>@@ -20,4 +20,4 @@ export function SettingsLayout({ children, filter, header }) {);}-export default SettingsLayout;+export default ReportsLayout;diff --git a/components/layout/ReportsLayout.module.css b/src/components/layout/ReportsLayout.module.csssimilarity index 100%rename from components/layout/ReportsLayout.module.cssrename to src/components/layout/ReportsLayout.module.cssdiff --git a/components/layout/SettingsLayout.js b/src/components/layout/SettingsLayout.jssimilarity index 88%rename from components/layout/SettingsLayout.jsrename to src/components/layout/SettingsLayout.jsindex c79f09092..851c366a4 100644--- a/components/layout/SettingsLayout.js+++ b/src/components/layout/SettingsLayout.js@@ -1,9 +1,9 @@import { Row, Column } from 'react-basics';import { useRouter } from 'next/router';import SideNav from './SideNav';-import useUser from 'hooks/useUser';-import useMessages from 'hooks/useMessages';-import useConfig from 'hooks/useConfig';+import useUser from 'components/hooks/useUser';+import useMessages from 'components/hooks/useMessages';+import useConfig from 'components/hooks/useConfig';import styles from './SettingsLayout.module.css';export function SettingsLayout({ children }) {diff --git a/components/layout/SettingsLayout.module.css b/src/components/layout/SettingsLayout.module.csssimilarity index 100%rename from components/layout/SettingsLayout.module.cssrename to src/components/layout/SettingsLayout.module.cssdiff --git a/components/layout/ShareLayout.js b/src/components/layout/ShareLayout.jssimilarity index 100%rename from components/layout/ShareLayout.jsrename to src/components/layout/ShareLayout.jsdiff --git a/components/layout/SideNav.js b/src/components/layout/SideNav.jssimilarity index 100%rename from components/layout/SideNav.jsrename to src/components/layout/SideNav.jsdiff --git a/components/layout/SideNav.module.css b/src/components/layout/SideNav.module.csssimilarity index 100%rename from components/layout/SideNav.module.cssrename to src/components/layout/SideNav.module.cssdiff --git a/components/messages.js b/src/components/messages.jssimilarity index 100%rename from components/messages.jsrename to src/components/messages.jsdiff --git a/components/metrics/ActiveUsers.js b/src/components/metrics/ActiveUsers.jssimilarity index 89%rename from components/metrics/ActiveUsers.jsrename to src/components/metrics/ActiveUsers.jsindex 640519462..3074d0df9 100644--- a/components/metrics/ActiveUsers.js+++ b/src/components/metrics/ActiveUsers.js@@ -1,7 +1,7 @@import { useMemo } from 'react';import { StatusLight } from 'react-basics';-import useApi from 'hooks/useApi';-import useMessages from 'hooks/useMessages';+import useApi from 'components/hooks/useApi';+import useMessages from 'components/hooks/useMessages';import styles from './ActiveUsers.module.css';export function ActiveUsers({ websiteId, value, refetchInterval = 60000 }) {diff --git a/components/metrics/ActiveUsers.module.css b/src/components/metrics/ActiveUsers.module.csssimilarity index 100%rename from components/metrics/ActiveUsers.module.cssrename to src/components/metrics/ActiveUsers.module.cssdiff --git a/components/metrics/BarChart.js b/src/components/metrics/BarChart.jssimilarity index 97%rename from components/metrics/BarChart.jsrename to src/components/metrics/BarChart.jsindex c086017e8..7b94c1470 100644--- a/components/metrics/BarChart.js+++ b/src/components/metrics/BarChart.js@@ -4,8 +4,8 @@ import classNames from 'classnames';import Chart from 'chart.js/auto';import HoverTooltip from 'components/common/HoverTooltip';import Legend from 'components/metrics/Legend';-import useLocale from 'hooks/useLocale';-import useTheme from 'hooks/useTheme';+import useLocale from 'components/hooks/useLocale';+import useTheme from 'components/hooks/useTheme';import { DEFAULT_ANIMATION_DURATION } from 'lib/constants';import { renderNumberLabels } from 'lib/charts';import styles from './BarChart.module.css';diff --git a/components/metrics/BarChart.module.css b/src/components/metrics/BarChart.module.csssimilarity index 100%rename from components/metrics/BarChart.module.cssrename to src/components/metrics/BarChart.module.cssdiff --git a/components/metrics/BrowsersTable.js b/src/components/metrics/BrowsersTable.jssimilarity index 89%rename from components/metrics/BrowsersTable.jsrename to src/components/metrics/BrowsersTable.jsindex bf4d0aaab..e68b159f3 100644--- a/components/metrics/BrowsersTable.js+++ b/src/components/metrics/BrowsersTable.js@@ -1,8 +1,8 @@import { useRouter } from 'next/router';import FilterLink from 'components/common/FilterLink';import MetricsTable from 'components/metrics/MetricsTable';-import useMessages from 'hooks/useMessages';-import useFormat from 'hooks/useFormat';+import useMessages from 'components/hooks/useMessages';+import useFormat from 'components/hooks/useFormat';export function BrowsersTable({ websiteId, ...props }) {const { formatMessage, labels } = useMessages();diff --git a/components/metrics/CitiesTable.js b/src/components/metrics/CitiesTable.jssimilarity index 86%rename from components/metrics/CitiesTable.jsrename to src/components/metrics/CitiesTable.jsindex 2e74780d4..fcdc8f886 100644--- a/components/metrics/CitiesTable.js+++ b/src/components/metrics/CitiesTable.js@@ -1,8 +1,8 @@import MetricsTable from './MetricsTable';import { emptyFilter } from 'lib/filters';import FilterLink from 'components/common/FilterLink';-import useLocale from 'hooks/useLocale';-import useMessages from 'hooks/useMessages';+import useLocale from 'components/hooks/useLocale';+import useMessages from 'components/hooks/useMessages';export function CitiesTable({ websiteId, ...props }) {const { locale } = useLocale();diff --git a/components/metrics/CountriesTable.js b/src/components/metrics/CountriesTable.jssimilarity index 88%rename from components/metrics/CountriesTable.jsrename to src/components/metrics/CountriesTable.jsindex 283fdaf29..ec7ab73d5 100644--- a/components/metrics/CountriesTable.js+++ b/src/components/metrics/CountriesTable.js@@ -1,7 +1,7 @@import { useRouter } from 'next/router';import FilterLink from 'components/common/FilterLink';-import useCountryNames from 'hooks/useCountryNames';-import { useLocale, useMessages, useFormat } from 'hooks';+import useCountryNames from 'components/hooks/useCountryNames';+import { useLocale, useMessages, useFormat } from 'components/hooks';import MetricsTable from './MetricsTable';export function CountriesTable({ websiteId, ...props }) {diff --git a/components/metrics/DataTable.js b/src/components/metrics/DataTable.jssimilarity index 98%rename from components/metrics/DataTable.jsrename to src/components/metrics/DataTable.jsindex e2e9462df..b578ffde6 100644--- a/components/metrics/DataTable.js+++ b/src/components/metrics/DataTable.js@@ -5,7 +5,7 @@ import { useSpring, animated, config } from 'react-spring';import classNames from 'classnames';import Empty from 'components/common/Empty';import { formatNumber, formatLongNumber } from 'lib/format';-import useMessages from 'hooks/useMessages';+import useMessages from 'components/hooks/useMessages';import styles from './DataTable.module.css';export function DataTable({diff --git a/components/metrics/DataTable.module.css b/src/components/metrics/DataTable.module.csssimilarity index 100%rename from components/metrics/DataTable.module.cssrename to src/components/metrics/DataTable.module.cssdiff --git a/components/metrics/DatePickerForm.js b/src/components/metrics/DatePickerForm.jssimilarity index 96%rename from components/metrics/DatePickerForm.jsrename to src/components/metrics/DatePickerForm.jsindex 53f027bb6..fa45b64ac 100644--- a/components/metrics/DatePickerForm.js+++ b/src/components/metrics/DatePickerForm.js@@ -1,10 +1,10 @@import { useState } from 'react';import { Button, ButtonGroup, Calendar } from 'react-basics';import { isAfter, isBefore, isSameDay } from 'date-fns';-import useLocale from 'hooks/useLocale';+import useLocale from 'components/hooks/useLocale';import { getDateLocale } from 'lib/lang';import { FILTER_DAY, FILTER_RANGE } from 'lib/constants';-import useMessages from 'hooks/useMessages';+import useMessages from 'components/hooks/useMessages';import styles from './DatePickerForm.module.css';export function DatePickerForm({diff --git a/components/metrics/DatePickerForm.module.css b/src/components/metrics/DatePickerForm.module.csssimilarity index 100%rename from components/metrics/DatePickerForm.module.cssrename to src/components/metrics/DatePickerForm.module.cssdiff --git a/components/metrics/DevicesTable.js b/src/components/metrics/DevicesTable.jssimilarity index 90%rename from components/metrics/DevicesTable.jsrename to src/components/metrics/DevicesTable.jsindex 98690d0a7..7b5915525 100644--- a/components/metrics/DevicesTable.js+++ b/src/components/metrics/DevicesTable.js@@ -1,8 +1,8 @@import MetricsTable from './MetricsTable';import FilterLink from 'components/common/FilterLink';-import useMessages from 'hooks/useMessages';+import useMessages from 'components/hooks/useMessages';import { useRouter } from 'next/router';-import { useFormat } from 'hooks';+import { useFormat } from 'components/hooks';export function DevicesTable({ websiteId, ...props }) {const { formatMessage, labels } = useMessages();diff --git a/components/metrics/EventsChart.js b/src/components/metrics/EventsChart.jssimilarity index 98%rename from components/metrics/EventsChart.jsrename to src/components/metrics/EventsChart.jsindex 82b8c8f71..f1964c159 100644--- a/components/metrics/EventsChart.js+++ b/src/components/metrics/EventsChart.js@@ -3,7 +3,7 @@ import { Loading } from 'react-basics';import { colord } from 'colord';import BarChart from './BarChart';import { getDateArray } from 'lib/date';-import { useApi, useLocale, useDateRange, useTimezone, usePageQuery } from 'hooks';+import { useApi, useLocale, useDateRange, useTimezone, usePageQuery } from 'components/hooks';import { EVENT_COLORS } from 'lib/constants';import { renderDateLabels, renderStatusTooltipPopup } from 'lib/charts';diff --git a/components/metrics/EventsChart.module.css b/src/components/metrics/EventsChart.module.csssimilarity index 100%rename from components/metrics/EventsChart.module.cssrename to src/components/metrics/EventsChart.module.cssdiff --git a/components/metrics/EventsTable.js b/src/components/metrics/EventsTable.jssimilarity index 89%rename from components/metrics/EventsTable.jsrename to src/components/metrics/EventsTable.jsindex eb23a2817..a8ae82aa2 100644--- a/components/metrics/EventsTable.js+++ b/src/components/metrics/EventsTable.js@@ -1,5 +1,5 @@import MetricsTable from './MetricsTable';-import useMessages from 'hooks/useMessages';+import useMessages from 'components/hooks/useMessages';export function EventsTable({ websiteId, ...props }) {const { formatMessage, labels } = useMessages();diff --git a/components/metrics/FilterTags.js b/src/components/metrics/FilterTags.jssimilarity index 92%rename from components/metrics/FilterTags.jsrename to src/components/metrics/FilterTags.jsindex ad3ff60b2..30857a6b9 100644--- a/components/metrics/FilterTags.js+++ b/src/components/metrics/FilterTags.js@@ -1,8 +1,8 @@import { safeDecodeURI } from 'next-basics';import { Button, Icon, Icons, Text } from 'react-basics';-import usePageQuery from 'hooks/usePageQuery';+import usePageQuery from 'components/hooks/usePageQuery';import styles from './FilterTags.module.css';-import useMessages from 'hooks/useMessages';+import useMessages from 'components/hooks/useMessages';export function FilterTags({ params }) {const { formatMessage, labels } = useMessages();diff --git a/components/metrics/FilterTags.module.css b/src/components/metrics/FilterTags.module.csssimilarity index 100%rename from components/metrics/FilterTags.module.cssrename to src/components/metrics/FilterTags.module.cssdiff --git a/components/metrics/LanguagesTable.js b/src/components/metrics/LanguagesTable.jssimilarity index 81%rename from components/metrics/LanguagesTable.jsrename to src/components/metrics/LanguagesTable.jsindex e90a34257..7d2208293 100644--- a/components/metrics/LanguagesTable.js+++ b/src/components/metrics/LanguagesTable.js@@ -1,8 +1,8 @@import MetricsTable from './MetricsTable';import { percentFilter } from 'lib/filters';-import useLanguageNames from 'hooks/useLanguageNames';-import useLocale from 'hooks/useLocale';-import useMessages from 'hooks/useMessages';+import useLanguageNames from 'components/hooks/useLanguageNames';+import useLocale from 'components/hooks/useLocale';+import useMessages from 'components/hooks/useMessages';export function LanguagesTable({ websiteId, onDataLoad, ...props }) {const { formatMessage, labels } = useMessages();diff --git a/components/metrics/Legend.js b/src/components/metrics/Legend.jssimilarity index 89%rename from components/metrics/Legend.jsrename to src/components/metrics/Legend.jsindex 91135acb2..ce8a33817 100644--- a/components/metrics/Legend.js+++ b/src/components/metrics/Legend.js@@ -2,8 +2,8 @@ import { useEffect } from 'react';import { StatusLight } from 'react-basics';import { colord } from 'colord';import classNames from 'classnames';-import useLocale from 'hooks/useLocale';-import useForceUpdate from 'hooks/useForceUpdate';+import useLocale from 'components/hooks/useLocale';+import useForceUpdate from 'components/hooks/useForceUpdate';import styles from './Legend.module.css';export function Legend({ chart }) {@@ -22,7 +22,7 @@ export function Legend({ chart }) {useEffect(() => {forceUpdate();- }, [locale]);+ }, [locale, forceUpdate]);if (!chart?.legend?.legendItems.find(({ text }) => text)) {return null;diff --git a/components/metrics/Legend.module.css b/src/components/metrics/Legend.module.csssimilarity index 100%rename from components/metrics/Legend.module.cssrename to src/components/metrics/Legend.module.cssdiff --git a/components/metrics/MetricCard.js b/src/components/metrics/MetricCard.jssimilarity index 100%rename from components/metrics/MetricCard.jsrename to src/components/metrics/MetricCard.jsdiff --git a/components/metrics/MetricCard.module.css b/src/components/metrics/MetricCard.module.csssimilarity index 100%rename from components/metrics/MetricCard.module.cssrename to src/components/metrics/MetricCard.module.cssdiff --git a/components/metrics/MetricsBar.js b/src/components/metrics/MetricsBar.jssimilarity index 100%rename from components/metrics/MetricsBar.jsrename to src/components/metrics/MetricsBar.jsdiff --git a/components/metrics/MetricsBar.module.css b/src/components/metrics/MetricsBar.module.csssimilarity index 100%rename from components/metrics/MetricsBar.module.cssrename to src/components/metrics/MetricsBar.module.cssdiff --git a/components/metrics/MetricsTable.js b/src/components/metrics/MetricsTable.jssimilarity index 90%rename from components/metrics/MetricsTable.jsrename to src/components/metrics/MetricsTable.jsindex 502627984..893427a5f 100644--- a/components/metrics/MetricsTable.js+++ b/src/components/metrics/MetricsTable.js@@ -3,17 +3,17 @@ import { Loading, Icon, Text, Button } from 'react-basics';import Link from 'next/link';import firstBy from 'thenby';import classNames from 'classnames';-import useApi from 'hooks/useApi';+import useApi from 'components/hooks/useApi';import { percentFilter } from 'lib/filters';-import useDateRange from 'hooks/useDateRange';-import usePageQuery from 'hooks/usePageQuery';+import useDateRange from 'components/hooks/useDateRange';+import usePageQuery from 'components/hooks/usePageQuery';import ErrorMessage from 'components/common/ErrorMessage';import DataTable from './DataTable';import { DEFAULT_ANIMATION_DURATION } from 'lib/constants';import Icons from 'components/icons';-import useMessages from 'hooks/useMessages';+import useMessages from 'components/hooks/useMessages';import styles from './MetricsTable.module.css';-import useLocale from 'hooks/useLocale';+import useLocale from 'components/hooks/useLocale';export function MetricsTable({websiteId,@@ -34,6 +34,7 @@ export function MetricsTable({} = usePageQuery();const { formatMessage, labels } = useMessages();const { get, useQuery } = useApi();+ const { dir } = useLocale();const { data, isLoading, isFetched, error } = useQuery([@@ -97,8 +98,7 @@ export function MetricsTable({return items.sort(firstBy('y', -1).thenBy('x'));}return [];- }, [data, error, dataFilter, filterOptions]);- const { dir } = useLocale();+ }, [data, error, dataFilter, filterOptions, limit]);return (<div className={classNames(styles.container, className)}>diff --git a/components/metrics/MetricsTable.module.css b/src/components/metrics/MetricsTable.module.csssimilarity index 100%rename from components/metrics/MetricsTable.module.cssrename to src/components/metrics/MetricsTable.module.cssdiff --git a/components/metrics/OSTable.js b/src/components/metrics/OSTable.jssimilarity index 93%rename from components/metrics/OSTable.jsrename to src/components/metrics/OSTable.jsindex e4bc32340..90135124c 100644--- a/components/metrics/OSTable.js+++ b/src/components/metrics/OSTable.js@@ -1,6 +1,6 @@import MetricsTable from './MetricsTable';import FilterLink from 'components/common/FilterLink';-import useMessages from 'hooks/useMessages';+import useMessages from 'components/hooks/useMessages';import { useRouter } from 'next/router';export function OSTable({ websiteId, ...props }) {diff --git a/components/metrics/PagesTable.js b/src/components/metrics/PagesTable.jssimilarity index 91%rename from components/metrics/PagesTable.jsrename to src/components/metrics/PagesTable.jsindex 47e703188..f310643e3 100644--- a/components/metrics/PagesTable.js+++ b/src/components/metrics/PagesTable.js@@ -1,8 +1,8 @@import FilterLink from 'components/common/FilterLink';import FilterButtons from 'components/common/FilterButtons';import MetricsTable from './MetricsTable';-import useMessages from 'hooks/useMessages';-import usePageQuery from 'hooks/usePageQuery';+import useMessages from 'components/hooks/useMessages';+import usePageQuery from 'components/hooks/usePageQuery';import { emptyFilter } from 'lib/filters';export function PagesTable({ websiteId, showFilters, ...props }) {diff --git a/components/metrics/PageviewsChart.js b/src/components/metrics/PageviewsChart.jssimilarity index 90%rename from components/metrics/PageviewsChart.jsrename to src/components/metrics/PageviewsChart.jsindex 1b481c481..096278f3d 100644--- a/components/metrics/PageviewsChart.js+++ b/src/components/metrics/PageviewsChart.js@@ -1,6 +1,6 @@import { useMemo } from 'react';import BarChart from './BarChart';-import { useLocale, useTheme, useMessages } from 'hooks';+import { useLocale, useTheme, useMessages } from 'components/hooks';import { renderDateLabels, renderStatusTooltipPopup } from 'lib/charts';export function PageviewsChart({ websiteId, data, unit, loading, ...props }) {@@ -25,7 +25,7 @@ export function PageviewsChart({ websiteId, data, unit, loading, ...props }) {...colors.chart.views,},];- }, [data, locale, colors]);+ }, [data, colors, formatMessage, labels]);return (<BarChartdiff --git a/components/metrics/QueryParametersTable.js b/src/components/metrics/QueryParametersTable.jssimilarity index 96%rename from components/metrics/QueryParametersTable.jsrename to src/components/metrics/QueryParametersTable.jsindex 23193c2e1..47266eb24 100644--- a/components/metrics/QueryParametersTable.js+++ b/src/components/metrics/QueryParametersTable.js@@ -4,7 +4,7 @@ import FilterButtons from 'components/common/FilterButtons';import { emptyFilter, paramFilter } from 'lib/filters';import { FILTER_RAW, FILTER_COMBINED } from 'lib/constants';import MetricsTable from './MetricsTable';-import useMessages from 'hooks/useMessages';+import useMessages from 'components/hooks/useMessages';import styles from './QueryParametersTable.module.css';const filters = {diff --git a/components/metrics/QueryParametersTable.module.css b/src/components/metrics/QueryParametersTable.module.csssimilarity index 100%rename from components/metrics/QueryParametersTable.module.cssrename to src/components/metrics/QueryParametersTable.module.cssdiff --git a/components/metrics/RealtimeChart.js b/src/components/metrics/RealtimeChart.jssimilarity index 98%rename from components/metrics/RealtimeChart.jsrename to src/components/metrics/RealtimeChart.jsindex 07d73a7f9..43b175a31 100644--- a/components/metrics/RealtimeChart.js+++ b/src/components/metrics/RealtimeChart.js@@ -46,7 +46,7 @@ export function RealtimeChart({ data, unit, ...props }) {return 0;}return DEFAULT_ANIMATION_DURATION;- }, [data, endDate]);+ }, [endDate]);return (<PageviewsChartdiff --git a/components/metrics/ReferrersTable.js b/src/components/metrics/ReferrersTable.jssimilarity index 93%rename from components/metrics/ReferrersTable.jsrename to src/components/metrics/ReferrersTable.jsindex 3cdcb02f5..b925b24ae 100644--- a/components/metrics/ReferrersTable.js+++ b/src/components/metrics/ReferrersTable.js@@ -1,6 +1,6 @@import MetricsTable from './MetricsTable';import FilterLink from 'components/common/FilterLink';-import useMessages from 'hooks/useMessages';+import useMessages from 'components/hooks/useMessages';export function ReferrersTable({ websiteId, ...props }) {const { formatMessage, labels } = useMessages();diff --git a/components/metrics/RegionsTable.js b/src/components/metrics/RegionsTable.jssimilarity index 87%rename from components/metrics/RegionsTable.jsrename to src/components/metrics/RegionsTable.jsindex d7b614f75..2e260e41d 100644--- a/components/metrics/RegionsTable.js+++ b/src/components/metrics/RegionsTable.js@@ -1,9 +1,9 @@import { useRouter } from 'next/router';import FilterLink from 'components/common/FilterLink';import { emptyFilter } from 'lib/filters';-import useLocale from 'hooks/useLocale';-import useMessages from 'hooks/useMessages';-import useCountryNames from 'hooks/useCountryNames';+import useLocale from 'components/hooks/useLocale';+import useMessages from 'components/hooks/useMessages';+import useCountryNames from 'components/hooks/useCountryNames';import MetricsTable from './MetricsTable';import regions from 'public/iso-3166-2.json';diff --git a/components/metrics/ScreenTable.js b/src/components/metrics/ScreenTable.jssimilarity index 87%rename from components/metrics/ScreenTable.jsrename to src/components/metrics/ScreenTable.jsindex f8ef5f2e6..8ed5c05a0 100644--- a/components/metrics/ScreenTable.js+++ b/src/components/metrics/ScreenTable.js@@ -1,5 +1,5 @@import MetricsTable from './MetricsTable';-import useMessages from 'hooks/useMessages';+import useMessages from 'components/hooks/useMessages';export function ScreenTable({ websiteId, ...props }) {const { formatMessage, labels } = useMessages();diff --git a/components/pages/console/TestConsole.js b/src/components/pages/console/TestConsole.jssimilarity index 99%rename from components/pages/console/TestConsole.jsrename to src/components/pages/console/TestConsole.jsindex 060314fd2..71eb27b48 100644--- a/components/pages/console/TestConsole.js+++ b/src/components/pages/console/TestConsole.js@@ -3,7 +3,7 @@ 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 useApi from 'hooks/useApi';+import useApi from 'components/hooks/useApi';import Head from 'next/head';import Link from 'next/link';import { useRouter } from 'next/router';diff --git a/components/pages/console/TestConsole.module.css b/src/components/pages/console/TestConsole.module.csssimilarity index 100%rename from components/pages/console/TestConsole.module.cssrename to src/components/pages/console/TestConsole.module.cssdiff --git a/components/pages/dashboard/Dashboard.js b/src/components/pages/dashboard/Dashboard.jssimilarity index 93%rename from components/pages/dashboard/Dashboard.jsrename to src/components/pages/dashboard/Dashboard.jsindex 601e741b0..8248cc81a 100644--- a/components/pages/dashboard/Dashboard.js+++ b/src/components/pages/dashboard/Dashboard.js@@ -7,10 +7,10 @@ import WebsiteChartList from 'components/pages/websites/WebsiteChartList';import DashboardSettingsButton from 'components/pages/dashboard/DashboardSettingsButton';import DashboardEdit from 'components/pages/dashboard/DashboardEdit';import EmptyPlaceholder from 'components/common/EmptyPlaceholder';-import useApi from 'hooks/useApi';+import useApi from 'components/hooks/useApi';import useDashboard from 'store/dashboard';-import useMessages from 'hooks/useMessages';-import useLocale from 'hooks/useLocale';+import useMessages from 'components/hooks/useMessages';+import useLocale from 'components/hooks/useLocale';export function Dashboard() {const { formatMessage, labels, messages } = useMessages();diff --git a/components/pages/dashboard/DashboardEdit.js b/src/components/pages/dashboard/DashboardEdit.jssimilarity index 98%rename from components/pages/dashboard/DashboardEdit.jsrename to src/components/pages/dashboard/DashboardEdit.jsindex 1810ee9bf..4eb259d61 100644--- a/components/pages/dashboard/DashboardEdit.js+++ b/src/components/pages/dashboard/DashboardEdit.js@@ -4,7 +4,7 @@ import classNames from 'classnames';import { Button } from 'react-basics';import { firstBy } from 'thenby';import useDashboard, { saveDashboard } from 'store/dashboard';-import useMessages from 'hooks/useMessages';+import useMessages from 'components/hooks/useMessages';import styles from './DashboardEdit.module.css';const dragId = 'dashboard-website-ordering';diff --git a/components/pages/dashboard/DashboardEdit.module.css b/src/components/pages/dashboard/DashboardEdit.module.csssimilarity index 100%rename from components/pages/dashboard/DashboardEdit.module.cssrename to src/components/pages/dashboard/DashboardEdit.module.cssdiff --git a/components/pages/dashboard/DashboardSettingsButton.js b/src/components/pages/dashboard/DashboardSettingsButton.jssimilarity index 86%rename from components/pages/dashboard/DashboardSettingsButton.jsrename to src/components/pages/dashboard/DashboardSettingsButton.jsindex 99dab14f7..eeb1f9471 100644--- a/components/pages/dashboard/DashboardSettingsButton.js+++ b/src/components/pages/dashboard/DashboardSettingsButton.js@@ -1,7 +1,7 @@-import { TooltipPopup, Icon, Text, Flexbox, Popup, Item, Button } from 'react-basics';+import { TooltipPopup, Icon, Text, Flexbox, Button } from 'react-basics';import Icons from 'components/icons';import { saveDashboard } from 'store/dashboard';-import useMessages from 'hooks/useMessages';+import useMessages from 'components/hooks/useMessages';export function DashboardSettingsButton() {const { formatMessage, labels } = useMessages();diff --git a/components/pages/dashboard/DashboardSettingsButton.module.css b/src/components/pages/dashboard/DashboardSettingsButton.module.csssimilarity index 100%rename from components/pages/dashboard/DashboardSettingsButton.module.cssrename to src/components/pages/dashboard/DashboardSettingsButton.module.cssdiff --git a/components/pages/event-data/EventDataMetricsBar.js b/src/components/pages/event-data/EventDataMetricsBar.jssimilarity index 94%rename from components/pages/event-data/EventDataMetricsBar.jsrename to src/components/pages/event-data/EventDataMetricsBar.jsindex 90f065d5f..5d984bea8 100644--- a/components/pages/event-data/EventDataMetricsBar.js+++ b/src/components/pages/event-data/EventDataMetricsBar.js@@ -1,7 +1,7 @@import { Column, Row } from 'react-basics';-import { useApi, useDateRange } from 'hooks';+import { useApi, useDateRange } from 'components/hooks';import MetricCard from 'components/metrics/MetricCard';-import useMessages from 'hooks/useMessages';+import useMessages from 'components/hooks/useMessages';import WebsiteDateFilter from 'components/input/WebsiteDateFilter';import MetricsBar from 'components/metrics/MetricsBar';import styles from './EventDataMetricsBar.module.css';diff --git a/components/pages/event-data/EventDataMetricsBar.module.css b/src/components/pages/event-data/EventDataMetricsBar.module.csssimilarity index 100%rename from components/pages/event-data/EventDataMetricsBar.module.cssrename to src/components/pages/event-data/EventDataMetricsBar.module.cssdiff --git a/components/pages/event-data/EventDataTable.js b/src/components/pages/event-data/EventDataTable.jssimilarity index 94%rename from components/pages/event-data/EventDataTable.jsrename to src/components/pages/event-data/EventDataTable.jsindex b0d11b9d4..c79916ce5 100644--- a/components/pages/event-data/EventDataTable.js+++ b/src/components/pages/event-data/EventDataTable.js@@ -1,6 +1,6 @@import Link from 'next/link';import { GridTable, GridColumn } from 'react-basics';-import { useMessages, usePageQuery } from 'hooks';+import { useMessages, usePageQuery } from 'components/hooks';import Empty from 'components/common/Empty';import { DATA_TYPES } from 'lib/constants';diff --git a/components/pages/event-data/EventDataValueTable.js b/src/components/pages/event-data/EventDataValueTable.jssimilarity index 96%rename from components/pages/event-data/EventDataValueTable.jsrename to src/components/pages/event-data/EventDataValueTable.jsindex 69ed10a7a..75c11e32b 100644--- a/components/pages/event-data/EventDataValueTable.js+++ b/src/components/pages/event-data/EventDataValueTable.js@@ -1,5 +1,5 @@import { GridTable, GridColumn, Button, Icon, Text } from 'react-basics';-import { useMessages, usePageQuery } from 'hooks';+import { useMessages, usePageQuery } from 'components/hooks';import Link from 'next/link';import Icons from 'components/icons';import PageHeader from 'components/layout/PageHeader';diff --git a/components/pages/login/LoginForm.js b/src/components/pages/login/LoginForm.jssimilarity index 94%rename from components/pages/login/LoginForm.jsrename to src/components/pages/login/LoginForm.jsindex 67057759c..797eea14d 100644--- a/components/pages/login/LoginForm.js+++ b/src/components/pages/login/LoginForm.js@@ -10,10 +10,10 @@ import {Icon,} from 'react-basics';import { useRouter } from 'next/router';-import useApi from 'hooks/useApi';+import useApi from 'components/hooks/useApi';import { setUser } from 'store/app';import { setClientAuthToken } from 'lib/client';-import useMessages from 'hooks/useMessages';+import useMessages from 'components/hooks/useMessages';import Logo from 'assets/logo.svg';import styles from './LoginForm.module.css';diff --git a/components/pages/login/LoginForm.module.css b/src/components/pages/login/LoginForm.module.csssimilarity index 100%rename from components/pages/login/LoginForm.module.cssrename to src/components/pages/login/LoginForm.module.cssdiff --git a/components/pages/login/LoginLayout.js b/src/components/pages/login/LoginLayout.jssimilarity index 86%rename from components/pages/login/LoginLayout.jsrename to src/components/pages/login/LoginLayout.jsindex fc8ad4617..d1bf47bbf 100644--- a/components/pages/login/LoginLayout.js+++ b/src/components/pages/login/LoginLayout.js@@ -1,5 +1,5 @@import Head from 'next/head';-import useLocale from 'hooks/useLocale';+import useLocale from 'components/hooks/useLocale';import styles from './LoginLayout.module.css';export function LoginLayout({ children }) {diff --git a/components/pages/login/LoginLayout.module.css b/src/components/pages/login/LoginLayout.module.csssimilarity index 100%rename from components/pages/login/LoginLayout.module.cssrename to src/components/pages/login/LoginLayout.module.cssdiff --git a/components/pages/realtime/RealtimeCountries.js b/src/components/pages/realtime/RealtimeCountries.jssimilarity index 84%rename from components/pages/realtime/RealtimeCountries.jsrename to src/components/pages/realtime/RealtimeCountries.jsindex 62964eaba..3aecad5ff 100644--- a/components/pages/realtime/RealtimeCountries.js+++ b/src/components/pages/realtime/RealtimeCountries.js@@ -1,9 +1,9 @@import { useCallback } from 'react';import { useRouter } from 'next/router';import DataTable from 'components/metrics/DataTable';-import useLocale from 'hooks/useLocale';-import useCountryNames from 'hooks/useCountryNames';-import useMessages from 'hooks/useMessages';+import useLocale from 'components/hooks/useLocale';+import useCountryNames from 'components/hooks/useCountryNames';+import useMessages from 'components/hooks/useMessages';import classNames from 'classnames';import styles from './RealtimeCountries.module.css';diff --git a/components/pages/realtime/RealtimeCountries.module.css b/src/components/pages/realtime/RealtimeCountries.module.csssimilarity index 100%rename from components/pages/realtime/RealtimeCountries.module.cssrename to src/components/pages/realtime/RealtimeCountries.module.cssdiff --git a/components/pages/realtime/RealtimeHeader.js b/src/components/pages/realtime/RealtimeHeader.jssimilarity index 95%rename from components/pages/realtime/RealtimeHeader.jsrename to src/components/pages/realtime/RealtimeHeader.jsindex 5f5809f6a..75f2f2d43 100644--- a/components/pages/realtime/RealtimeHeader.js+++ b/src/components/pages/realtime/RealtimeHeader.js@@ -1,5 +1,5 @@import MetricCard from 'components/metrics/MetricCard';-import useMessages from 'hooks/useMessages';+import useMessages from 'components/hooks/useMessages';import styles from './RealtimeHeader.module.css';export function RealtimeHeader({ data = {} }) {diff --git a/components/pages/realtime/RealtimeHeader.module.css b/src/components/pages/realtime/RealtimeHeader.module.csssimilarity index 100%rename from components/pages/realtime/RealtimeHeader.module.cssrename to src/components/pages/realtime/RealtimeHeader.module.cssdiff --git a/components/pages/realtime/RealtimeHome.js b/src/components/pages/realtime/RealtimeHome.jssimilarity index 90%rename from components/pages/realtime/RealtimeHome.jsrename to src/components/pages/realtime/RealtimeHome.jsindex 3d7987ca0..4f2f62794 100644--- a/components/pages/realtime/RealtimeHome.js+++ b/src/components/pages/realtime/RealtimeHome.js@@ -2,9 +2,9 @@ import { useEffect } from 'react';import { useRouter } from 'next/router';import Page from 'components/layout/Page';import PageHeader from 'components/layout/PageHeader';-import useApi from 'hooks/useApi';+import useApi from 'components/hooks/useApi';import EmptyPlaceholder from 'components/common/EmptyPlaceholder';-import useMessages from 'hooks/useMessages';+import useMessages from 'components/hooks/useMessages';export function RealtimeHome() {const { formatMessage, labels, messages } = useMessages();diff --git a/components/pages/realtime/RealtimeLog.js b/src/components/pages/realtime/RealtimeLog.jssimilarity index 96%rename from components/pages/realtime/RealtimeLog.jsrename to src/components/pages/realtime/RealtimeLog.jsindex 6486f707f..b388b37b5 100644--- a/components/pages/realtime/RealtimeLog.js+++ b/src/components/pages/realtime/RealtimeLog.js@@ -4,15 +4,15 @@ import { FixedSizeList } from 'react-window';import firstBy from 'thenby';import FilterButtons from 'components/common/FilterButtons';import Empty from 'components/common/Empty';-import useLocale from 'hooks/useLocale';-import useCountryNames from 'hooks/useCountryNames';+import useLocale from 'components/hooks/useLocale';+import useCountryNames from 'components/hooks/useCountryNames';import { BROWSERS } from 'lib/constants';import { stringToColor } from 'lib/format';import { formatDate } from 'lib/date';import { safeDecodeURI } from 'next-basics';import Icons from 'components/icons';import styles from './RealtimeLog.module.css';-import useMessages from 'hooks/useMessages';+import useMessages from 'components/hooks/useMessages';const TYPE_ALL = 'all';const TYPE_PAGEVIEW = 'pageview';diff --git a/components/pages/realtime/RealtimeLog.module.css b/src/components/pages/realtime/RealtimeLog.module.csssimilarity index 100%rename from components/pages/realtime/RealtimeLog.module.cssrename to src/components/pages/realtime/RealtimeLog.module.cssdiff --git a/components/pages/realtime/RealtimePage.js b/src/components/pages/realtime/RealtimePage.jssimilarity index 97%rename from components/pages/realtime/RealtimePage.jsrename to src/components/pages/realtime/RealtimePage.jsindex 507c123c7..f26a28695 100644--- a/components/pages/realtime/RealtimePage.js+++ b/src/components/pages/realtime/RealtimePage.js@@ -10,11 +10,11 @@ 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 useApi from 'hooks/useApi';+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 'hooks';+import { useWebsite } from 'components/hooks';function mergeData(state = [], data = [], time) {const ids = state.map(({ __id }) => __id);diff --git a/components/pages/realtime/RealtimePage.module.css b/src/components/pages/realtime/RealtimePage.module.csssimilarity index 100%rename from components/pages/realtime/RealtimePage.module.cssrename to src/components/pages/realtime/RealtimePage.module.cssdiff --git a/components/pages/realtime/RealtimeUrls.js b/src/components/pages/realtime/RealtimeUrls.jssimilarity index 97%rename from components/pages/realtime/RealtimeUrls.jsrename to src/components/pages/realtime/RealtimeUrls.jsindex 18d8f2f65..4041a5d8c 100644--- a/components/pages/realtime/RealtimeUrls.js+++ b/src/components/pages/realtime/RealtimeUrls.js@@ -4,7 +4,7 @@ import firstBy from 'thenby';import { percentFilter } from 'lib/filters';import DataTable from 'components/metrics/DataTable';import { FILTER_PAGES, FILTER_REFERRERS } from 'lib/constants';-import useMessages from 'hooks/useMessages';+import useMessages from 'components/hooks/useMessages';export function RealtimeUrls({ websiteDomain, data = {} }) {const { formatMessage, labels } = useMessages();diff --git a/components/pages/reports/BaseParameters.js b/src/components/pages/reports/BaseParameters.jssimilarity index 97%rename from components/pages/reports/BaseParameters.jsrename to src/components/pages/reports/BaseParameters.jsindex 76c35a581..44a9da5bd 100644--- a/components/pages/reports/BaseParameters.js+++ b/src/components/pages/reports/BaseParameters.js@@ -4,7 +4,7 @@ import WebsiteSelect from 'components/input/WebsiteSelect';import { parseDateRange } from 'lib/date';import { useContext } from 'react';import { ReportContext } from './Report';-import { useMessages } from 'hooks';+import { useMessages } from 'components/hooks';export function BaseParameters({showWebsiteSelect = true,diff --git a/components/pages/reports/FieldAddForm.js b/src/components/pages/reports/FieldAddForm.jssimilarity index 100%rename from components/pages/reports/FieldAddForm.jsrename to src/components/pages/reports/FieldAddForm.jsdiff --git a/components/pages/reports/FieldAddForm.module.css b/src/components/pages/reports/FieldAddForm.module.csssimilarity index 100%rename from components/pages/reports/FieldAddForm.module.cssrename to src/components/pages/reports/FieldAddForm.module.cssdiff --git a/components/pages/reports/FieldAggregateForm.js b/src/components/pages/reports/FieldAggregateForm.jssimilarity index 96%rename from components/pages/reports/FieldAggregateForm.jsrename to src/components/pages/reports/FieldAggregateForm.jsindex abd1dbd94..34b679808 100644--- a/components/pages/reports/FieldAggregateForm.js+++ b/src/components/pages/reports/FieldAggregateForm.js@@ -1,5 +1,5 @@import { Form, FormRow, Menu, Item } from 'react-basics';-import { useMessages } from 'hooks';+import { useMessages } from 'components/hooks';export default function FieldAggregateForm({ name, type, onSelect }) {const { formatMessage, labels } = useMessages();diff --git a/components/pages/reports/FieldFilterForm.js b/src/components/pages/reports/FieldFilterForm.jssimilarity index 96%rename from components/pages/reports/FieldFilterForm.jsrename to src/components/pages/reports/FieldFilterForm.jsindex 3df8f7456..96e96697e 100644--- a/components/pages/reports/FieldFilterForm.js+++ b/src/components/pages/reports/FieldFilterForm.js@@ -1,6 +1,6 @@import { useState } from 'react';import { Form, FormRow, Item, Flexbox, Dropdown, Button } from 'react-basics';-import { useMessages, useFilters, useFormat } from 'hooks';+import { useMessages, useFilters, useFormat } from 'components/hooks';import styles from './FieldFilterForm.module.css';export default function FieldFilterForm({ name, label, type, values, onSelect }) {diff --git a/components/pages/reports/FieldFilterForm.module.css b/src/components/pages/reports/FieldFilterForm.module.csssimilarity index 100%rename from components/pages/reports/FieldFilterForm.module.cssrename to src/components/pages/reports/FieldFilterForm.module.cssdiff --git a/components/pages/reports/FieldSelectForm.js b/src/components/pages/reports/FieldSelectForm.jssimilarity index 94%rename from components/pages/reports/FieldSelectForm.jsrename to src/components/pages/reports/FieldSelectForm.jsindex 434a5ae75..e7661511d 100644--- a/components/pages/reports/FieldSelectForm.js+++ b/src/components/pages/reports/FieldSelectForm.js@@ -1,5 +1,5 @@import { Menu, Item, Form, FormRow } from 'react-basics';-import { useMessages } from 'hooks';+import { useMessages } from 'components/hooks';import styles from './FieldSelectForm.module.css';export default function FieldSelectForm({ items, onSelect, showType = true }) {diff --git a/components/pages/reports/FieldSelectForm.module.css b/src/components/pages/reports/FieldSelectForm.module.csssimilarity index 100%rename from components/pages/reports/FieldSelectForm.module.cssrename to src/components/pages/reports/FieldSelectForm.module.cssdiff --git a/components/pages/reports/FilterSelectForm.js b/src/components/pages/reports/FilterSelectForm.jssimilarity index 96%rename from components/pages/reports/FilterSelectForm.jsrename to src/components/pages/reports/FilterSelectForm.jsindex 38094bcad..274a00eae 100644--- a/components/pages/reports/FilterSelectForm.js+++ b/src/components/pages/reports/FilterSelectForm.js@@ -1,7 +1,7 @@import { useState } from 'react';import FieldSelectForm from './FieldSelectForm';import FieldFilterForm from './FieldFilterForm';-import { useApi } from 'hooks';+import { useApi } from 'components/hooks';import { Loading } from 'react-basics';function useValues(websiteId, type) {diff --git a/components/pages/reports/ParameterList.js b/src/components/pages/reports/ParameterList.jssimilarity index 95%rename from components/pages/reports/ParameterList.jsrename to src/components/pages/reports/ParameterList.jsindex a097cbdc3..bf77dd9d2 100644--- a/components/pages/reports/ParameterList.js+++ b/src/components/pages/reports/ParameterList.js@@ -1,7 +1,7 @@import { Icon, TooltipPopup } from 'react-basics';import Icons from 'components/icons';import Empty from 'components/common/Empty';-import { useMessages } from 'hooks';+import { useMessages } from 'components/hooks';import styles from './ParameterList.module.css';export function ParameterList({ items = [], children, onRemove }) {diff --git a/components/pages/reports/ParameterList.module.css b/src/components/pages/reports/ParameterList.module.csssimilarity index 100%rename from components/pages/reports/ParameterList.module.cssrename to src/components/pages/reports/ParameterList.module.cssdiff --git a/components/pages/reports/PopupForm.js b/src/components/pages/reports/PopupForm.jssimilarity index 100%rename from components/pages/reports/PopupForm.jsrename to src/components/pages/reports/PopupForm.jsdiff --git a/components/pages/reports/PopupForm.module.css b/src/components/pages/reports/PopupForm.module.csssimilarity index 100%rename from components/pages/reports/PopupForm.module.cssrename to src/components/pages/reports/PopupForm.module.cssdiff --git a/components/pages/reports/Report.js b/src/components/pages/reports/Report.jssimilarity index 92%rename from components/pages/reports/Report.jsrename to src/components/pages/reports/Report.jsindex 685ebb9fe..de17aca62 100644--- a/components/pages/reports/Report.js+++ b/src/components/pages/reports/Report.js@@ -1,7 +1,7 @@import { createContext } from 'react';import Page from 'components/layout/Page';import styles from './reports.module.css';-import { useReport } from 'hooks';+import { useReport } from 'components/hooks';export const ReportContext = createContext(null);diff --git a/components/pages/reports/ReportBody.js b/src/components/pages/reports/ReportBody.jssimilarity index 100%rename from components/pages/reports/ReportBody.jsrename to src/components/pages/reports/ReportBody.jsdiff --git a/components/pages/reports/ReportDetails.js b/src/components/pages/reports/ReportDetails.jssimilarity index 100%rename from components/pages/reports/ReportDetails.jsrename to src/components/pages/reports/ReportDetails.jsdiff --git a/components/pages/reports/ReportHeader.js b/src/components/pages/reports/ReportHeader.jssimilarity index 97%rename from components/pages/reports/ReportHeader.jsrename to src/components/pages/reports/ReportHeader.jsindex 394b1951f..e81f66fe8 100644--- a/components/pages/reports/ReportHeader.js+++ b/src/components/pages/reports/ReportHeader.js@@ -2,7 +2,7 @@ import { useContext } from 'react';import { useRouter } from 'next/router';import { Icon, LoadingButton, InlineEditField, useToasts } from 'react-basics';import PageHeader from 'components/layout/PageHeader';-import { useMessages, useApi } from 'hooks';+import { useMessages, useApi } from 'components/hooks';import { ReportContext } from './Report';import styles from './ReportHeader.module.css';import reportStyles from './reports.module.css';diff --git a/components/pages/reports/ReportHeader.module.css b/src/components/pages/reports/ReportHeader.module.csssimilarity index 100%rename from components/pages/reports/ReportHeader.module.cssrename to src/components/pages/reports/ReportHeader.module.cssdiff --git a/components/pages/reports/ReportMenu.js b/src/components/pages/reports/ReportMenu.jssimilarity index 100%rename from components/pages/reports/ReportMenu.jsrename to src/components/pages/reports/ReportMenu.jsdiff --git a/components/pages/reports/ReportTemplates.js b/src/components/pages/reports/ReportTemplates.jssimilarity index 97%rename from components/pages/reports/ReportTemplates.jsrename to src/components/pages/reports/ReportTemplates.jsindex 57cb113ee..2b934434e 100644--- a/components/pages/reports/ReportTemplates.js+++ b/src/components/pages/reports/ReportTemplates.js@@ -6,7 +6,7 @@ import Funnel from 'assets/funnel.svg';import Lightbulb from 'assets/lightbulb.svg';import Magnet from 'assets/magnet.svg';import styles from './ReportTemplates.module.css';-import { useMessages } from 'hooks';+import { useMessages } from 'components/hooks';function ReportItem({ title, description, url, icon }) {return (diff --git a/components/pages/reports/ReportTemplates.module.css b/src/components/pages/reports/ReportTemplates.module.csssimilarity index 100%rename from components/pages/reports/ReportTemplates.module.cssrename to src/components/pages/reports/ReportTemplates.module.cssdiff --git a/components/pages/reports/ReportsPage.js b/src/components/pages/reports/ReportsPage.jssimilarity index 96%rename from components/pages/reports/ReportsPage.jsrename to src/components/pages/reports/ReportsPage.jsindex 7ae102b02..bbb15a365 100644--- a/components/pages/reports/ReportsPage.js+++ b/src/components/pages/reports/ReportsPage.js@@ -1,7 +1,7 @@import EmptyPlaceholder from 'components/common/EmptyPlaceholder';import Page from 'components/layout/Page';import PageHeader from 'components/layout/PageHeader';-import { useMessages, useReports } from 'hooks';+import { useMessages, useReports } from 'components/hooks';import Link from 'next/link';import { Button, Icon, Icons, Text } from 'react-basics';import ReportsTable from './ReportsTable';diff --git a/components/pages/reports/ReportsTable.js b/src/components/pages/reports/ReportsTable.jssimilarity index 95%rename from components/pages/reports/ReportsTable.jsrename to src/components/pages/reports/ReportsTable.jsindex 98f5267a4..4073fbec0 100644--- a/components/pages/reports/ReportsTable.js+++ b/src/components/pages/reports/ReportsTable.js@@ -1,8 +1,8 @@import ConfirmDeleteForm from 'components/common/ConfirmDeleteForm';import LinkButton from 'components/common/LinkButton';import SettingsTable from 'components/common/SettingsTable';-import { useMessages } from 'hooks';-import useUser from 'hooks/useUser';+import { useMessages } from 'components/hooks';+import useUser from 'components/hooks/useUser';import { useState } from 'react';import { Button, Flexbox, Icon, Icons, Modal, Text } from 'react-basics';diff --git a/components/pages/reports/event-data/EventDataParameters.js b/src/components/pages/reports/event-data/EventDataParameters.jssimilarity index 98%rename from components/pages/reports/event-data/EventDataParameters.jsrename to src/components/pages/reports/event-data/EventDataParameters.jsindex 8d4dbb623..a01a29722 100644--- a/components/pages/reports/event-data/EventDataParameters.js+++ b/src/components/pages/reports/event-data/EventDataParameters.js@@ -1,5 +1,5 @@import { useContext, useRef } from 'react';-import { useApi, useMessages } from 'hooks';+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 Empty from 'components/common/Empty';diff --git a/components/pages/reports/event-data/EventDataParameters.module.css b/src/components/pages/reports/event-data/EventDataParameters.module.csssimilarity index 100%rename from components/pages/reports/event-data/EventDataParameters.module.cssrename to src/components/pages/reports/event-data/EventDataParameters.module.cssdiff --git a/components/pages/reports/event-data/EventDataReport.js b/src/components/pages/reports/event-data/EventDataReport.jssimilarity index 100%rename from components/pages/reports/event-data/EventDataReport.jsrename to src/components/pages/reports/event-data/EventDataReport.jsdiff --git a/components/pages/reports/event-data/EventDataTable.js b/src/components/pages/reports/event-data/EventDataTable.jssimilarity index 92%rename from components/pages/reports/event-data/EventDataTable.jsrename to src/components/pages/reports/event-data/EventDataTable.jsindex 81b9cad14..b64502612 100644--- a/components/pages/reports/event-data/EventDataTable.js+++ b/src/components/pages/reports/event-data/EventDataTable.js@@ -1,6 +1,6 @@import { useContext } from 'react';import { GridTable, GridColumn } from 'react-basics';-import { useMessages } from 'hooks';+import { useMessages } from 'components/hooks';import { ReportContext } from '../Report';export function EventDataTable() {diff --git a/components/pages/reports/funnel/FunnelChart.js b/src/components/pages/reports/funnel/FunnelChart.jssimilarity index 92%rename from components/pages/reports/funnel/FunnelChart.jsrename to src/components/pages/reports/funnel/FunnelChart.jsindex c35afe4e6..829a30086 100644--- a/components/pages/reports/funnel/FunnelChart.js+++ b/src/components/pages/reports/funnel/FunnelChart.js@@ -1,7 +1,7 @@import { useCallback, useContext, useMemo } from 'react';import { Loading, StatusLight } from 'react-basics';-import useMessages from 'hooks/useMessages';-import useTheme from 'hooks/useTheme';+import useMessages from 'components/hooks/useMessages';+import useTheme from 'components/hooks/useTheme';import BarChart from 'components/metrics/BarChart';import { formatLongNumber } from 'lib/format';import styles from './FunnelChart.module.css';@@ -52,7 +52,7 @@ export function FunnelChart({ className, loading }) {...colors.chart.visitors,},];- }, [data]);+ }, [data, colors, formatMessage, labels]);if (loading) {return <Loading icon="dots" className={styles.loading} />;diff --git a/components/pages/reports/funnel/FunnelChart.module.css b/src/components/pages/reports/funnel/FunnelChart.module.csssimilarity index 100%rename from components/pages/reports/funnel/FunnelChart.module.cssrename to src/components/pages/reports/funnel/FunnelChart.module.cssdiff --git a/components/pages/reports/funnel/FunnelParameters.js b/src/components/pages/reports/funnel/FunnelParameters.jssimilarity index 98%rename from components/pages/reports/funnel/FunnelParameters.jsrename to src/components/pages/reports/funnel/FunnelParameters.jsindex 03898db3e..2c99a032e 100644--- a/components/pages/reports/funnel/FunnelParameters.js+++ b/src/components/pages/reports/funnel/FunnelParameters.js@@ -1,5 +1,5 @@import { useContext, useRef } from 'react';-import { useMessages } from 'hooks';+import { useMessages } from 'components/hooks';import {Icon,Form,diff --git a/components/pages/reports/funnel/FunnelReport.js b/src/components/pages/reports/funnel/FunnelReport.jssimilarity index 100%rename from components/pages/reports/funnel/FunnelReport.jsrename to src/components/pages/reports/funnel/FunnelReport.jsdiff --git a/components/pages/reports/funnel/FunnelReport.module.css b/src/components/pages/reports/funnel/FunnelReport.module.csssimilarity index 100%rename from components/pages/reports/funnel/FunnelReport.module.cssrename to src/components/pages/reports/funnel/FunnelReport.module.cssdiff --git a/components/pages/reports/funnel/FunnelTable.js b/src/components/pages/reports/funnel/FunnelTable.jssimilarity index 90%rename from components/pages/reports/funnel/FunnelTable.jsrename to src/components/pages/reports/funnel/FunnelTable.jsindex 9ae8ab583..86e63a5bc 100644--- a/components/pages/reports/funnel/FunnelTable.js+++ b/src/components/pages/reports/funnel/FunnelTable.js@@ -1,6 +1,6 @@import { useContext } from 'react';import DataTable from 'components/metrics/DataTable';-import { useMessages } from 'hooks';+import { useMessages } from 'components/hooks';import { ReportContext } from '../Report';export function FunnelTable() {diff --git a/components/pages/reports/funnel/UrlAddForm.js b/src/components/pages/reports/funnel/UrlAddForm.jssimilarity index 95%rename from components/pages/reports/funnel/UrlAddForm.jsrename to src/components/pages/reports/funnel/UrlAddForm.jsindex ce2021162..3e77ce156 100644--- a/components/pages/reports/funnel/UrlAddForm.js+++ b/src/components/pages/reports/funnel/UrlAddForm.js@@ -1,5 +1,5 @@import { useState } from 'react';-import { useMessages } from 'hooks';+import { useMessages } from 'components/hooks';import { Button, Form, FormRow, TextField, Flexbox } from 'react-basics';import styles from './UrlAddForm.module.css';diff --git a/components/pages/reports/funnel/UrlAddForm.module.css b/src/components/pages/reports/funnel/UrlAddForm.module.csssimilarity index 100%rename from components/pages/reports/funnel/UrlAddForm.module.cssrename to src/components/pages/reports/funnel/UrlAddForm.module.cssdiff --git a/components/pages/reports/insights/InsightsParameters.js b/src/components/pages/reports/insights/InsightsParameters.jssimilarity index 98%rename from components/pages/reports/insights/InsightsParameters.jsrename to src/components/pages/reports/insights/InsightsParameters.jsindex 9f3571e6d..db0c1d4ea 100644--- a/components/pages/reports/insights/InsightsParameters.js+++ b/src/components/pages/reports/insights/InsightsParameters.js@@ -1,5 +1,5 @@import { useContext, useRef } from 'react';-import { useFormat, useMessages, useFilters } from 'hooks';+import { useFormat, useMessages, useFilters } from 'components/hooks';import {Form,FormRow,diff --git a/components/pages/reports/insights/InsightsParameters.module.css b/src/components/pages/reports/insights/InsightsParameters.module.csssimilarity index 100%rename from components/pages/reports/insights/InsightsParameters.module.cssrename to src/components/pages/reports/insights/InsightsParameters.module.cssdiff --git a/components/pages/reports/insights/InsightsReport.js b/src/components/pages/reports/insights/InsightsReport.jssimilarity index 100%rename from components/pages/reports/insights/InsightsReport.jsrename to src/components/pages/reports/insights/InsightsReport.jsdiff --git a/components/pages/reports/insights/InsightsTable.js b/src/components/pages/reports/insights/InsightsTable.jssimilarity index 95%rename from components/pages/reports/insights/InsightsTable.jsrename to src/components/pages/reports/insights/InsightsTable.jsindex d5422c9ef..88bd02756 100644--- a/components/pages/reports/insights/InsightsTable.js+++ b/src/components/pages/reports/insights/InsightsTable.js@@ -1,6 +1,6 @@import { useContext, useEffect, useState } from 'react';import { GridTable, GridColumn } from 'react-basics';-import { useFormat, useMessages } from 'hooks';+import { useFormat, useMessages } from 'components/hooks';import { ReportContext } from '../Report';import EmptyPlaceholder from 'components/common/EmptyPlaceholder';diff --git a/components/pages/reports/reports.module.css b/src/components/pages/reports/reports.module.csssimilarity index 100%rename from components/pages/reports/reports.module.cssrename to src/components/pages/reports/reports.module.cssdiff --git a/components/pages/reports/retention/RetentionParameters.js b/src/components/pages/reports/retention/RetentionParameters.jssimilarity index 96%rename from components/pages/reports/retention/RetentionParameters.jsrename to src/components/pages/reports/retention/RetentionParameters.jsindex d98608ae7..aa81cf472 100644--- a/components/pages/reports/retention/RetentionParameters.js+++ b/src/components/pages/reports/retention/RetentionParameters.js@@ -1,5 +1,5 @@import { useContext, useRef } from 'react';-import { useMessages } from 'hooks';+import { useMessages } from 'components/hooks';import { Form, FormButtons, FormRow, SubmitButton } from 'react-basics';import { ReportContext } from 'components/pages/reports/Report';import { MonthSelect } from 'components/input/MonthSelect';diff --git a/components/pages/reports/retention/RetentionReport.js b/src/components/pages/reports/retention/RetentionReport.jssimilarity index 100%rename from components/pages/reports/retention/RetentionReport.jsrename to src/components/pages/reports/retention/RetentionReport.jsdiff --git a/components/pages/reports/retention/RetentionReport.module.css b/src/components/pages/reports/retention/RetentionReport.module.csssimilarity index 100%rename from components/pages/reports/retention/RetentionReport.module.cssrename to src/components/pages/reports/retention/RetentionReport.module.cssdiff --git a/components/pages/reports/retention/RetentionTable.js b/src/components/pages/reports/retention/RetentionTable.jssimilarity index 97%rename from components/pages/reports/retention/RetentionTable.jsrename to src/components/pages/reports/retention/RetentionTable.jsindex df0b0f99f..09ef2948f 100644--- a/components/pages/reports/retention/RetentionTable.js+++ b/src/components/pages/reports/retention/RetentionTable.js@@ -2,7 +2,7 @@ import { useContext } from 'react';import classNames from 'classnames';import { ReportContext } from '../Report';import EmptyPlaceholder from 'components/common/EmptyPlaceholder';-import { useMessages } from 'hooks';+import { useMessages } from 'components/hooks';import { formatDate } from 'lib/date';import styles from './RetentionTable.module.css';diff --git a/components/pages/reports/retention/RetentionTable.module.css b/src/components/pages/reports/retention/RetentionTable.module.csssimilarity index 100%rename from components/pages/reports/retention/RetentionTable.module.cssrename to src/components/pages/reports/retention/RetentionTable.module.cssdiff --git a/components/pages/settings/profile/DateRangeSetting.js b/src/components/pages/settings/profile/DateRangeSetting.jssimilarity index 87%rename from components/pages/settings/profile/DateRangeSetting.jsrename to src/components/pages/settings/profile/DateRangeSetting.jsindex 16db3c07a..85ad6d795 100644--- a/components/pages/settings/profile/DateRangeSetting.js+++ b/src/components/pages/settings/profile/DateRangeSetting.js@@ -1,8 +1,8 @@import DateFilter from 'components/input/DateFilter';import { Button, Flexbox } from 'react-basics';-import useDateRange from 'hooks/useDateRange';+import useDateRange from 'components/hooks/useDateRange';import { DEFAULT_DATE_RANGE } from 'lib/constants';-import useMessages from 'hooks/useMessages';+import useMessages from 'components/hooks/useMessages';export function DateRangeSetting() {const { formatMessage, labels } = useMessages();diff --git a/components/pages/settings/profile/LanguageSetting.js b/src/components/pages/settings/profile/LanguageSetting.jssimilarity index 89%rename from components/pages/settings/profile/LanguageSetting.jsrename to src/components/pages/settings/profile/LanguageSetting.jsindex a85e12a23..f1b196260 100644--- a/components/pages/settings/profile/LanguageSetting.js+++ b/src/components/pages/settings/profile/LanguageSetting.js@@ -1,8 +1,8 @@import { Button, Dropdown, Item, Flexbox } from 'react-basics';-import useLocale from 'hooks/useLocale';+import useLocale from 'components/hooks/useLocale';import { DEFAULT_LOCALE } from 'lib/constants';import { languages } from 'lib/lang';-import useMessages from 'hooks/useMessages';+import useMessages from 'components/hooks/useMessages';export function LanguageSetting() {const { formatMessage, labels } = useMessages();diff --git a/components/pages/settings/profile/PasswordChangeButton.js b/src/components/pages/settings/profile/PasswordChangeButton.jssimilarity index 94%rename from components/pages/settings/profile/PasswordChangeButton.jsrename to src/components/pages/settings/profile/PasswordChangeButton.jsindex 03bf74bc6..81324eaab 100644--- a/components/pages/settings/profile/PasswordChangeButton.js+++ b/src/components/pages/settings/profile/PasswordChangeButton.js@@ -1,7 +1,7 @@import { Button, Icon, Text, useToasts, ModalTrigger, Modal } from 'react-basics';import PasswordEditForm from 'components/pages/settings/profile/PasswordEditForm';import Icons from 'components/icons';-import useMessages from 'hooks/useMessages';+import useMessages from 'components/hooks/useMessages';export function PasswordChangeButton() {const { formatMessage, labels, messages } = useMessages();diff --git a/components/pages/settings/profile/PasswordEditForm.js b/src/components/pages/settings/profile/PasswordEditForm.jssimilarity index 95%rename from components/pages/settings/profile/PasswordEditForm.jsrename to src/components/pages/settings/profile/PasswordEditForm.jsindex 8e920471e..39ecfb770 100644--- a/components/pages/settings/profile/PasswordEditForm.js+++ b/src/components/pages/settings/profile/PasswordEditForm.js@@ -1,7 +1,7 @@import { useRef } from 'react';import { Form, FormRow, FormInput, FormButtons, PasswordField, Button } from 'react-basics';-import useApi from 'hooks/useApi';-import useMessages from 'hooks/useMessages';+import useApi from 'components/hooks/useApi';+import useMessages from 'components/hooks/useMessages';export function PasswordEditForm({ onSave, onClose }) {const { formatMessage, labels, messages } = useMessages();diff --git a/components/pages/settings/profile/ProfileDetails.js b/src/components/pages/settings/profile/ProfileDetails.jssimilarity index 91%rename from components/pages/settings/profile/ProfileDetails.jsrename to src/components/pages/settings/profile/ProfileDetails.jsindex d1690220c..f9dc652b9 100644--- a/components/pages/settings/profile/ProfileDetails.js+++ b/src/components/pages/settings/profile/ProfileDetails.js@@ -4,9 +4,9 @@ import DateRangeSetting from 'components/pages/settings/profile/DateRangeSettingimport LanguageSetting from 'components/pages/settings/profile/LanguageSetting';import ThemeSetting from 'components/pages/settings/profile/ThemeSetting';import PasswordChangeButton from './PasswordChangeButton';-import useUser from 'hooks/useUser';-import useMessages from 'hooks/useMessages';-import useConfig from 'hooks/useConfig';+import useUser from 'components/hooks/useUser';+import useMessages from 'components/hooks/useMessages';+import useConfig from 'components/hooks/useConfig';import { ROLES } from 'lib/constants';export function ProfileDetails() {diff --git a/components/pages/settings/profile/ProfileSettings.js b/src/components/pages/settings/profile/ProfileSettings.jssimilarity index 87%rename from components/pages/settings/profile/ProfileSettings.jsrename to src/components/pages/settings/profile/ProfileSettings.jsindex 6062dfbfa..a217e52ca 100644--- a/components/pages/settings/profile/ProfileSettings.js+++ b/src/components/pages/settings/profile/ProfileSettings.js@@ -1,7 +1,7 @@import Page from 'components/layout/Page';import PageHeader from 'components/layout/PageHeader';import ProfileDetails from './ProfileDetails';-import useMessages from 'hooks/useMessages';+import useMessages from 'components/hooks/useMessages';export function ProfileSettings() {const { formatMessage, labels } = useMessages();diff --git a/components/pages/settings/profile/ThemeSetting.js b/src/components/pages/settings/profile/ThemeSetting.jssimilarity index 93%rename from components/pages/settings/profile/ThemeSetting.jsrename to src/components/pages/settings/profile/ThemeSetting.jsindex 54a8dac8b..aa3a67a21 100644--- a/components/pages/settings/profile/ThemeSetting.js+++ b/src/components/pages/settings/profile/ThemeSetting.js@@ -1,6 +1,6 @@import classNames from 'classnames';import { Button, Icon } from 'react-basics';-import useTheme from 'hooks/useTheme';+import useTheme from 'components/hooks/useTheme';import Sun from 'assets/sun.svg';import Moon from 'assets/moon.svg';import styles from './ThemeSetting.module.css';diff --git a/components/pages/settings/profile/ThemeSetting.module.css b/src/components/pages/settings/profile/ThemeSetting.module.csssimilarity index 100%rename from components/pages/settings/profile/ThemeSetting.module.cssrename to src/components/pages/settings/profile/ThemeSetting.module.cssdiff --git a/components/pages/settings/profile/TimezoneSetting.js b/src/components/pages/settings/profile/TimezoneSetting.jssimilarity index 87%rename from components/pages/settings/profile/TimezoneSetting.jsrename to src/components/pages/settings/profile/TimezoneSetting.jsindex 5976f3932..fc3180819 100644--- a/components/pages/settings/profile/TimezoneSetting.js+++ b/src/components/pages/settings/profile/TimezoneSetting.js@@ -1,7 +1,7 @@import { Dropdown, Item, Button, Flexbox } from 'react-basics';import { listTimeZones } from 'timezone-support';-import useTimezone from 'hooks/useTimezone';-import useMessages from 'hooks/useMessages';+import useTimezone from 'components/hooks/useTimezone';+import useMessages from 'components/hooks/useMessages';import { getTimezone } from 'lib/date';export function TimezoneSetting() {diff --git a/components/pages/settings/teams/TeamAddForm.js b/src/components/pages/settings/teams/TeamAddForm.jssimilarity index 92%rename from components/pages/settings/teams/TeamAddForm.jsrename to src/components/pages/settings/teams/TeamAddForm.jsindex 8ac361172..7910e0980 100644--- a/components/pages/settings/teams/TeamAddForm.js+++ b/src/components/pages/settings/teams/TeamAddForm.js@@ -8,8 +8,8 @@ import {Button,SubmitButton,} from 'react-basics';-import useApi from 'hooks/useApi';-import useMessages from 'hooks/useMessages';+import useApi from 'components/hooks/useApi';+import useMessages from 'components/hooks/useMessages';export function TeamAddForm({ onSave, onClose }) {const { formatMessage, labels } = useMessages();diff --git a/components/pages/settings/teams/TeamAddWebsiteForm.js b/src/components/pages/settings/teams/TeamAddWebsiteForm.jssimilarity index 95%rename from components/pages/settings/teams/TeamAddWebsiteForm.jsrename to src/components/pages/settings/teams/TeamAddWebsiteForm.jsindex 4a74de6ea..23e3e1360 100644--- a/components/pages/settings/teams/TeamAddWebsiteForm.js+++ b/src/components/pages/settings/teams/TeamAddWebsiteForm.js@@ -1,8 +1,8 @@-import useApi from 'hooks/useApi';+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 useMessages from 'hooks/useMessages';+import useMessages from 'components/hooks/useMessages';export function TeamAddWebsiteForm({ teamId, onSave, onClose }) {const { formatMessage, labels } = useMessages();diff --git a/components/pages/settings/teams/TeamDeleteForm.js b/src/components/pages/settings/teams/TeamDeleteForm.jssimilarity index 90%rename from components/pages/settings/teams/TeamDeleteForm.jsrename to src/components/pages/settings/teams/TeamDeleteForm.jsindex 4261aff17..210c8ada3 100644--- a/components/pages/settings/teams/TeamDeleteForm.js+++ b/src/components/pages/settings/teams/TeamDeleteForm.js@@ -1,6 +1,6 @@import { Button, Form, FormButtons, SubmitButton } from 'react-basics';-import useApi from 'hooks/useApi';-import useMessages from 'hooks/useMessages';+import useApi from 'components/hooks/useApi';+import useMessages from 'components/hooks/useMessages';export function TeamDeleteForm({ teamId, teamName, onSave, onClose }) {const { formatMessage, labels, messages, FormattedMessage } = useMessages();diff --git a/components/pages/settings/teams/TeamEditForm.js b/src/components/pages/settings/teams/TeamEditForm.jssimilarity index 95%rename from components/pages/settings/teams/TeamEditForm.jsrename to src/components/pages/settings/teams/TeamEditForm.jsindex faeb4e7c5..b1dc58545 100644--- a/components/pages/settings/teams/TeamEditForm.js+++ b/src/components/pages/settings/teams/TeamEditForm.js@@ -10,8 +10,8 @@ import {} from 'react-basics';import { getRandomChars } from 'next-basics';import { useRef, useState } from 'react';-import useApi from 'hooks/useApi';-import useMessages from 'hooks/useMessages';+import useApi from 'components/hooks/useApi';+import useMessages from 'components/hooks/useMessages';const generateId = () => getRandomChars(16);diff --git a/components/pages/settings/teams/TeamJoinForm.js b/src/components/pages/settings/teams/TeamJoinForm.jssimilarity index 91%rename from components/pages/settings/teams/TeamJoinForm.jsrename to src/components/pages/settings/teams/TeamJoinForm.jsindex 34153aa1a..23abcf006 100644--- a/components/pages/settings/teams/TeamJoinForm.js+++ b/src/components/pages/settings/teams/TeamJoinForm.js@@ -8,8 +8,8 @@ import {Button,SubmitButton,} from 'react-basics';-import useApi from 'hooks/useApi';-import useMessages from 'hooks/useMessages';+import useApi from 'components/hooks/useApi';+import useMessages from 'components/hooks/useMessages';export function TeamJoinForm({ onSave, onClose }) {const { formatMessage, labels, getMessage } = useMessages();diff --git a/components/pages/settings/teams/TeamLeaveForm.js b/src/components/pages/settings/teams/TeamLeaveForm.jssimilarity index 90%rename from components/pages/settings/teams/TeamLeaveForm.jsrename to src/components/pages/settings/teams/TeamLeaveForm.jsindex 954006abb..8af2932db 100644--- a/components/pages/settings/teams/TeamLeaveForm.js+++ b/src/components/pages/settings/teams/TeamLeaveForm.js@@ -1,6 +1,6 @@import { Button, Form, FormButtons, SubmitButton } from 'react-basics';-import useApi from 'hooks/useApi';-import useMessages from 'hooks/useMessages';+import useApi from 'components/hooks/useApi';+import useMessages from 'components/hooks/useMessages';export function TeamLeaveForm({ teamId, userId, teamName, onSave, onClose }) {const { formatMessage, labels, messages, FormattedMessage } = useMessages();diff --git a/components/pages/settings/teams/TeamMemberRemoveButton.js b/src/components/pages/settings/teams/TeamMemberRemoveButton.jssimilarity index 88%rename from components/pages/settings/teams/TeamMemberRemoveButton.jsrename to src/components/pages/settings/teams/TeamMemberRemoveButton.jsindex 9f3264763..44fd30abe 100644--- a/components/pages/settings/teams/TeamMemberRemoveButton.js+++ b/src/components/pages/settings/teams/TeamMemberRemoveButton.js@@ -1,5 +1,5 @@-import useApi from 'hooks/useApi';-import useMessages from 'hooks/useMessages';+import useApi from 'components/hooks/useApi';+import useMessages from 'components/hooks/useMessages';import { Icon, Icons, LoadingButton, Text } from 'react-basics';export function TeamMemberRemoveButton({ teamId, userId, disabled, onSave }) {diff --git a/components/pages/settings/teams/TeamMembers.js b/src/components/pages/settings/teams/TeamMembers.jssimilarity index 88%rename from components/pages/settings/teams/TeamMembers.jsrename to src/components/pages/settings/teams/TeamMembers.jsindex 9762ef297..1420f6def 100644--- a/components/pages/settings/teams/TeamMembers.js+++ b/src/components/pages/settings/teams/TeamMembers.js@@ -1,8 +1,8 @@import { Loading, useToasts } from 'react-basics';import TeamMembersTable from 'components/pages/settings/teams/TeamMembersTable';-import useApi from 'hooks/useApi';-import useMessages from 'hooks/useMessages';-import useApiFilter from 'hooks/useApiFilter';+import useApi from 'components/hooks/useApi';+import useMessages from 'components/hooks/useMessages';+import useApiFilter from 'components/hooks/useApiFilter';export function TeamMembers({ teamId, readOnly }) {const { showToast } = useToasts();diff --git a/components/pages/settings/teams/TeamMembersTable.js b/src/components/pages/settings/teams/TeamMembersTable.jssimilarity index 93%rename from components/pages/settings/teams/TeamMembersTable.jsrename to src/components/pages/settings/teams/TeamMembersTable.jsindex daa4acc6d..e1f29e19e 100644--- a/components/pages/settings/teams/TeamMembersTable.js+++ b/src/components/pages/settings/teams/TeamMembersTable.js@@ -1,5 +1,5 @@-import useMessages from 'hooks/useMessages';-import useUser from 'hooks/useUser';+import useMessages from 'components/hooks/useMessages';+import useUser from 'components/hooks/useUser';import { ROLES } from 'lib/constants';import TeamMemberRemoveButton from './TeamMemberRemoveButton';import SettingsTable from 'components/common/SettingsTable';diff --git a/components/pages/settings/teams/TeamSettings.js b/src/components/pages/settings/teams/TeamSettings.jssimilarity index 93%rename from components/pages/settings/teams/TeamSettings.jsrename to src/components/pages/settings/teams/TeamSettings.jsindex 64160578d..245e64b1a 100644--- a/components/pages/settings/teams/TeamSettings.js+++ b/src/components/pages/settings/teams/TeamSettings.js@@ -4,9 +4,9 @@ import Link from 'next/link';import Page from 'components/layout/Page';import PageHeader from 'components/layout/PageHeader';import { ROLES } from 'lib/constants';-import useUser from 'hooks/useUser';-import useApi from 'hooks/useApi';-import useMessages from 'hooks/useMessages';+import useUser from 'components/hooks/useUser';+import useApi from 'components/hooks/useApi';+import useMessages from 'components/hooks/useMessages';import TeamEditForm from './TeamEditForm';import TeamMembers from './TeamMembers';import TeamWebsites from './TeamWebsites';diff --git a/components/pages/settings/teams/TeamWebsiteRemoveButton.js b/src/components/pages/settings/teams/TeamWebsiteRemoveButton.jssimilarity index 87%rename from components/pages/settings/teams/TeamWebsiteRemoveButton.jsrename to src/components/pages/settings/teams/TeamWebsiteRemoveButton.jsindex a752313f1..2ea773fcd 100644--- a/components/pages/settings/teams/TeamWebsiteRemoveButton.js+++ b/src/components/pages/settings/teams/TeamWebsiteRemoveButton.js@@ -1,5 +1,5 @@-import useApi from 'hooks/useApi';-import useMessages from 'hooks/useMessages';+import useApi from 'components/hooks/useApi';+import useMessages from 'components/hooks/useMessages';import { Icon, Icons, LoadingButton, Text } from 'react-basics';export function TeamWebsiteRemoveButton({ teamId, websiteId, onSave }) {diff --git a/components/pages/settings/teams/TeamWebsites.js b/src/components/pages/settings/teams/TeamWebsites.jssimilarity index 92%rename from components/pages/settings/teams/TeamWebsites.jsrename to src/components/pages/settings/teams/TeamWebsites.jsindex 2ae344f57..27fe2f852 100644--- a/components/pages/settings/teams/TeamWebsites.js+++ b/src/components/pages/settings/teams/TeamWebsites.js@@ -11,9 +11,9 @@ import {} from 'react-basics';import TeamWebsitesTable from 'components/pages/settings/teams/TeamWebsitesTable';import TeamAddWebsiteForm from 'components/pages/settings/teams/TeamAddWebsiteForm';-import useApi from 'hooks/useApi';-import useMessages from 'hooks/useMessages';-import useApiFilter from 'hooks/useApiFilter';+import useApi from 'components/hooks/useApi';+import useMessages from 'components/hooks/useMessages';+import useApiFilter from 'components/hooks/useApiFilter';export function TeamWebsites({ teamId }) {const { showToast } = useToasts();diff --git a/components/pages/settings/teams/TeamWebsitesTable.js b/src/components/pages/settings/teams/TeamWebsitesTable.jssimilarity index 92%rename from components/pages/settings/teams/TeamWebsitesTable.jsrename to src/components/pages/settings/teams/TeamWebsitesTable.jsindex f89a91661..848f82078 100644--- a/components/pages/settings/teams/TeamWebsitesTable.js+++ b/src/components/pages/settings/teams/TeamWebsitesTable.js@@ -1,10 +1,10 @@-import useMessages from 'hooks/useMessages';-import useUser from 'hooks/useUser';+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 SettingsTable from 'components/common/SettingsTable';-import useConfig from 'hooks/useConfig';+import useConfig from 'components/hooks/useConfig';export function TeamWebsitesTable({data = [],diff --git a/components/pages/settings/teams/TeamsList.js b/src/components/pages/settings/teams/TeamsList.jssimilarity index 94%rename from components/pages/settings/teams/TeamsList.jsrename to src/components/pages/settings/teams/TeamsList.jsindex 061100f64..e4e5be7ba 100644--- a/components/pages/settings/teams/TeamsList.js+++ b/src/components/pages/settings/teams/TeamsList.js@@ -4,14 +4,14 @@ 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 'hooks/useApi';-import useMessages from 'hooks/useMessages';-import useUser from 'hooks/useUser';+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 'hooks/useApiFilter';+import useApiFilter from 'components/hooks/useApiFilter';export default function TeamsList() {const { user } = useUser();diff --git a/components/pages/settings/teams/TeamsTable.js b/src/components/pages/settings/teams/TeamsTable.jssimilarity index 95%rename from components/pages/settings/teams/TeamsTable.jsrename to src/components/pages/settings/teams/TeamsTable.jsindex e35fb839b..e17107830 100644--- a/components/pages/settings/teams/TeamsTable.js+++ b/src/components/pages/settings/teams/TeamsTable.js@@ -1,7 +1,7 @@import SettingsTable from 'components/common/SettingsTable';-import useLocale from 'hooks/useLocale';-import useMessages from 'hooks/useMessages';-import useUser from 'hooks/useUser';+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';diff --git a/components/pages/settings/teams/WebsiteTags.js b/src/components/pages/settings/teams/WebsiteTags.jssimilarity index 100%rename from components/pages/settings/teams/WebsiteTags.jsrename to src/components/pages/settings/teams/WebsiteTags.jsdiff --git a/components/pages/settings/teams/WebsiteTags.module.css b/src/components/pages/settings/teams/WebsiteTags.module.csssimilarity index 100%rename from components/pages/settings/teams/WebsiteTags.module.cssrename to src/components/pages/settings/teams/WebsiteTags.module.cssdiff --git a/components/pages/settings/users/UserAddButton.js b/src/components/pages/settings/users/UserAddButton.jssimilarity index 92%rename from components/pages/settings/users/UserAddButton.jsrename to src/components/pages/settings/users/UserAddButton.jsindex a461f39d7..8b6913627 100644--- a/components/pages/settings/users/UserAddButton.js+++ b/src/components/pages/settings/users/UserAddButton.js@@ -1,6 +1,6 @@import { Button, Icon, Text, Modal, Icons, ModalTrigger } from 'react-basics';import UserAddForm from './UserAddForm';-import useMessages from 'hooks/useMessages';+import useMessages from 'components/hooks/useMessages';export function UserAddButton({ onSave }) {const { formatMessage, labels } = useMessages();diff --git a/components/pages/settings/users/UserAddForm.js b/src/components/pages/settings/users/UserAddForm.jssimilarity index 95%rename from components/pages/settings/users/UserAddForm.jsrename to src/components/pages/settings/users/UserAddForm.jsindex bb4087495..38c1bedd7 100644--- a/components/pages/settings/users/UserAddForm.js+++ b/src/components/pages/settings/users/UserAddForm.js@@ -10,9 +10,9 @@ import {SubmitButton,Button,} from 'react-basics';-import useApi from 'hooks/useApi';+import useApi from 'components/hooks/useApi';import { ROLES } from 'lib/constants';-import useMessages from 'hooks/useMessages';+import useMessages from 'components/hooks/useMessages';export function UserAddForm({ onSave, onClose }) {const { post, useMutation } = useApi();diff --git a/components/pages/settings/users/UserDeleteForm.js b/src/components/pages/settings/users/UserDeleteForm.jssimilarity index 91%rename from components/pages/settings/users/UserDeleteForm.jsrename to src/components/pages/settings/users/UserDeleteForm.jsindex bd412e440..5a47fdc12 100644--- a/components/pages/settings/users/UserDeleteForm.js+++ b/src/components/pages/settings/users/UserDeleteForm.js@@ -1,7 +1,7 @@import { useMutation } from '@tanstack/react-query';import { Button, Form, FormButtons, SubmitButton } from 'react-basics';-import useApi from 'hooks/useApi';-import useMessages from 'hooks/useMessages';+import useApi from 'components/hooks/useApi';+import useMessages from 'components/hooks/useMessages';export function UserDeleteForm({ userId, username, onSave, onClose }) {const { formatMessage, FormattedMessage, labels, messages } = useMessages();diff --git a/components/pages/settings/users/UserEditForm.js b/src/components/pages/settings/users/UserEditForm.jssimilarity index 95%rename from components/pages/settings/users/UserEditForm.jsrename to src/components/pages/settings/users/UserEditForm.jsindex 887531e87..157c9ad69 100644--- a/components/pages/settings/users/UserEditForm.js+++ b/src/components/pages/settings/users/UserEditForm.js@@ -9,9 +9,9 @@ import {SubmitButton,PasswordField,} from 'react-basics';-import useApi from 'hooks/useApi';+import useApi from 'components/hooks/useApi';import { ROLES } from 'lib/constants';-import useMessages from 'hooks/useMessages';+import useMessages from 'components/hooks/useMessages';export function UserEditForm({ userId, data, onSave }) {const { formatMessage, labels, messages } = useMessages();diff --git a/components/pages/settings/users/UserSettings.js b/src/components/pages/settings/users/UserSettings.jssimilarity index 91%rename from components/pages/settings/users/UserSettings.jsrename to src/components/pages/settings/users/UserSettings.jsindex d703e9646..596e09f06 100644--- a/components/pages/settings/users/UserSettings.js+++ b/src/components/pages/settings/users/UserSettings.js@@ -1,12 +1,12 @@import { useEffect, useState } from 'react';import { Breadcrumbs, Item, Tabs, useToasts } from 'react-basics';import Link from 'next/link';-import UserEditForm from 'components/pages/settings/users//UserEditForm';+import UserEditForm from 'components/pages/settings/users/UserEditForm';import Page from 'components/layout/Page';import PageHeader from 'components/layout/PageHeader';-import useApi from 'hooks/useApi';+import useApi from 'components/hooks/useApi';import UserWebsites from './UserWebsites';-import useMessages from 'hooks/useMessages';+import useMessages from 'components/hooks/useMessages';export function UserSettings({ userId }) {const { formatMessage, labels, messages } = useMessages();diff --git a/components/pages/settings/users/UserWebsites.js b/src/components/pages/settings/users/UserWebsites.jssimilarity index 90%rename from components/pages/settings/users/UserWebsites.jsrename to src/components/pages/settings/users/UserWebsites.jsindex df8c9f572..14127275f 100644--- a/components/pages/settings/users/UserWebsites.js+++ b/src/components/pages/settings/users/UserWebsites.js@@ -1,7 +1,7 @@import Page from 'components/layout/Page';-import useApi from 'hooks/useApi';+import useApi from 'components/hooks/useApi';import WebsitesTable from 'components/pages/settings/websites/WebsitesTable';-import useApiFilter from 'hooks/useApiFilter';+import useApiFilter from 'components/hooks/useApiFilter';export function UserWebsites({ userId }) {const { filter, page, pageSize, handleFilterChange, handlePageChange, handlePageSizeChange } =diff --git a/components/pages/settings/users/UsersList.js b/src/components/pages/settings/users/UsersList.jssimilarity index 90%rename from components/pages/settings/users/UsersList.jsrename to src/components/pages/settings/users/UsersList.jsindex 614aabefb..0bc8612e5 100644--- a/components/pages/settings/users/UsersList.js+++ b/src/components/pages/settings/users/UsersList.js@@ -4,10 +4,10 @@ import PageHeader from 'components/layout/PageHeader';import EmptyPlaceholder from 'components/common/EmptyPlaceholder';import UsersTable from './UsersTable';import UserAddButton from './UserAddButton';-import useApi from 'hooks/useApi';-import useUser from 'hooks/useUser';-import useMessages from 'hooks/useMessages';-import useApiFilter from 'hooks/useApiFilter';+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();diff --git a/components/pages/settings/users/UsersTable.js b/src/components/pages/settings/users/UsersTable.jssimilarity index 93%rename from components/pages/settings/users/UsersTable.jsrename to src/components/pages/settings/users/UsersTable.jsindex f4c9dd77a..1a93710d0 100644--- a/components/pages/settings/users/UsersTable.js+++ b/src/components/pages/settings/users/UsersTable.js@@ -1,12 +1,12 @@import { Button, Text, Icon, Icons, ModalTrigger, Modal } from 'react-basics';import { formatDistance } from 'date-fns';import Link from 'next/link';-import useUser from 'hooks/useUser';+import useUser from 'components/hooks/useUser';import UserDeleteForm from './UserDeleteForm';import { ROLES } from 'lib/constants';-import useMessages from 'hooks/useMessages';+import useMessages from 'components/hooks/useMessages';import SettingsTable from 'components/common/SettingsTable';-import useLocale from 'hooks/useLocale';+import useLocale from 'components/hooks/useLocale';export function UsersTable({data = { data: [] },@@ -54,7 +54,7 @@ export function UsersTable({onPageSizeChange={onPageSizeChange}filterValue={filterValue}>- {(row, keys, rowIndex) => {+ {row => {return (<><Link href={`/settings/users/${row.id}`}>diff --git a/components/pages/settings/websites/ShareUrl.js b/src/components/pages/settings/websites/ShareUrl.jssimilarity index 94%rename from components/pages/settings/websites/ShareUrl.jsrename to src/components/pages/settings/websites/ShareUrl.jsindex 7f0b352cc..a7b7fc2f2 100644--- a/components/pages/settings/websites/ShareUrl.js+++ b/src/components/pages/settings/websites/ShareUrl.js@@ -11,8 +11,8 @@ import {import { useEffect, useMemo, useRef, useState } from 'react';import { getRandomChars } from 'next-basics';import { useRouter } from 'next/router';-import useApi from 'hooks/useApi';-import useMessages from 'hooks/useMessages';+import useApi from 'components/hooks/useApi';+import useMessages from 'components/hooks/useMessages';const generateId = () => getRandomChars(16);@@ -31,7 +31,7 @@ export function ShareUrl({ websiteId, data, onSave }) {`${process.env.analyticsUrl || location.origin}${basePath}/share/${id}/${encodeURIComponent(name,)}`,- [id, name],+ [id, name, basePath],);const handleSubmit = async data => {diff --git a/components/pages/settings/websites/TrackingCode.js b/src/components/pages/settings/websites/TrackingCode.jssimilarity index 85%rename from components/pages/settings/websites/TrackingCode.jsrename to src/components/pages/settings/websites/TrackingCode.jsindex c847ed0d2..5159ff914 100644--- a/components/pages/settings/websites/TrackingCode.js+++ b/src/components/pages/settings/websites/TrackingCode.js@@ -1,6 +1,6 @@import { TextArea } from 'react-basics';-import useMessages from 'hooks/useMessages';-import useConfig from 'hooks/useConfig';+import useMessages from 'components/hooks/useMessages';+import useConfig from 'components/hooks/useConfig';export function TrackingCode({ websiteId }) {const { formatMessage, messages } = useMessages();diff --git a/components/pages/settings/websites/WebsiteAddForm.js b/src/components/pages/settings/websites/WebsiteAddForm.jssimilarity index 93%rename from components/pages/settings/websites/WebsiteAddForm.jsrename to src/components/pages/settings/websites/WebsiteAddForm.jsindex 77b850b43..371343ba5 100644--- a/components/pages/settings/websites/WebsiteAddForm.js+++ b/src/components/pages/settings/websites/WebsiteAddForm.js@@ -7,9 +7,9 @@ import {Button,SubmitButton,} from 'react-basics';-import useApi from 'hooks/useApi';+import useApi from 'components/hooks/useApi';import { DOMAIN_REGEX } from 'lib/constants';-import useMessages from 'hooks/useMessages';+import useMessages from 'components/hooks/useMessages';export function WebsiteAddForm({ onSave, onClose }) {const { formatMessage, labels, messages } = useMessages();diff --git a/components/pages/settings/websites/WebsiteData.js b/src/components/pages/settings/websites/WebsiteData.jssimilarity index 96%rename from components/pages/settings/websites/WebsiteData.jsrename to src/components/pages/settings/websites/WebsiteData.jsindex a2bc6bfae..08d6702e1 100644--- a/components/pages/settings/websites/WebsiteData.js+++ b/src/components/pages/settings/websites/WebsiteData.js@@ -1,7 +1,7 @@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 useMessages from 'hooks/useMessages';+import useMessages from 'components/hooks/useMessages';export function WebsiteData({ websiteId, onSave }) {const { formatMessage, labels, messages } = useMessages();diff --git a/components/pages/settings/websites/WebsiteDeleteForm.js b/src/components/pages/settings/websites/WebsiteDeleteForm.jssimilarity index 92%rename from components/pages/settings/websites/WebsiteDeleteForm.jsrename to src/components/pages/settings/websites/WebsiteDeleteForm.jsindex c9e302fc4..1548bddbd 100644--- a/components/pages/settings/websites/WebsiteDeleteForm.js+++ b/src/components/pages/settings/websites/WebsiteDeleteForm.js@@ -7,8 +7,8 @@ import {SubmitButton,TextField,} from 'react-basics';-import useApi from 'hooks/useApi';-import useMessages from 'hooks/useMessages';+import useApi from 'components/hooks/useApi';+import useMessages from 'components/hooks/useMessages';const CONFIRM_VALUE = 'DELETE';diff --git a/components/pages/settings/websites/WebsiteEditForm.js b/src/components/pages/settings/websites/WebsiteEditForm.jssimilarity index 94%rename from components/pages/settings/websites/WebsiteEditForm.jsrename to src/components/pages/settings/websites/WebsiteEditForm.jsindex 89c62889d..18ad0ac98 100644--- a/components/pages/settings/websites/WebsiteEditForm.js+++ b/src/components/pages/settings/websites/WebsiteEditForm.js@@ -1,8 +1,8 @@import { SubmitButton, Form, FormInput, FormRow, FormButtons, TextField } from 'react-basics';import { useRef } from 'react';-import useApi from 'hooks/useApi';+import useApi from 'components/hooks/useApi';import { DOMAIN_REGEX } from 'lib/constants';-import useMessages from 'hooks/useMessages';+import useMessages from 'components/hooks/useMessages';export function WebsiteEditForm({ websiteId, data, onSave }) {const { formatMessage, labels, messages } = useMessages();diff --git a/components/pages/settings/websites/WebsiteResetForm.js b/src/components/pages/settings/websites/WebsiteResetForm.jssimilarity index 92%rename from components/pages/settings/websites/WebsiteResetForm.jsrename to src/components/pages/settings/websites/WebsiteResetForm.jsindex 5fc0acf7a..9886429ba 100644--- a/components/pages/settings/websites/WebsiteResetForm.js+++ b/src/components/pages/settings/websites/WebsiteResetForm.js@@ -7,8 +7,8 @@ import {SubmitButton,TextField,} from 'react-basics';-import useApi from 'hooks/useApi';-import useMessages from 'hooks/useMessages';+import useApi from 'components/hooks/useApi';+import useMessages from 'components/hooks/useMessages';const CONFIRM_VALUE = 'RESET';diff --git a/components/pages/settings/websites/WebsiteSettings.js b/src/components/pages/settings/websites/WebsiteSettings.jssimilarity index 95%rename from components/pages/settings/websites/WebsiteSettings.jsrename to src/components/pages/settings/websites/WebsiteSettings.jsindex 5a96fa8c5..cdd0fe041 100644--- a/components/pages/settings/websites/WebsiteSettings.js+++ b/src/components/pages/settings/websites/WebsiteSettings.js@@ -8,9 +8,9 @@ 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 useApi from 'hooks/useApi';-import useMessages from 'hooks/useMessages';-import useConfig from 'hooks/useConfig';+import useApi from 'components/hooks/useApi';+import useMessages from 'components/hooks/useMessages';+import useConfig from 'components/hooks/useConfig';export function WebsiteSettings({ websiteId }) {const router = useRouter();diff --git a/components/pages/settings/websites/WebsitesList.js b/src/components/pages/settings/websites/WebsitesList.jssimilarity index 91%rename from components/pages/settings/websites/WebsitesList.jsrename to src/components/pages/settings/websites/WebsitesList.jsindex f1a2eb0f8..0cec3832b 100644--- a/components/pages/settings/websites/WebsitesList.js+++ b/src/components/pages/settings/websites/WebsitesList.js@@ -2,10 +2,10 @@ import Page from 'components/layout/Page';import PageHeader from 'components/layout/PageHeader';import WebsiteAddForm from 'components/pages/settings/websites/WebsiteAddForm';import WebsitesTable from 'components/pages/settings/websites/WebsitesTable';-import useApi from 'hooks/useApi';-import useApiFilter from 'hooks/useApiFilter';-import useMessages from 'hooks/useMessages';-import useUser from 'hooks/useUser';+import useApi from 'components/hooks/useApi';+import useApiFilter from 'components/hooks/useApiFilter';+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';diff --git a/components/pages/settings/websites/WebsitesTable.js b/src/components/pages/settings/websites/WebsitesTable.jssimilarity index 94%rename from components/pages/settings/websites/WebsitesTable.jsrename to src/components/pages/settings/websites/WebsitesTable.jsindex 89898c811..d35da7575 100644--- a/components/pages/settings/websites/WebsitesTable.js+++ b/src/components/pages/settings/websites/WebsitesTable.js@@ -2,9 +2,9 @@ import Link from 'next/link';import { Button, Text, Icon, Icons } from 'react-basics';import SettingsTable from 'components/common/SettingsTable';import Empty from 'components/common/Empty';-import useMessages from 'hooks/useMessages';-import useConfig from 'hooks/useConfig';-import useUser from 'hooks/useUser';+import useMessages from 'components/hooks/useMessages';+import useConfig from 'components/hooks/useConfig';+import useUser from 'components/hooks/useUser';export function WebsitesTable({data = [],diff --git a/components/pages/settings/websites/WebsitesTable.module.css b/src/components/pages/settings/websites/WebsitesTable.module.csssimilarity index 100%rename from components/pages/settings/websites/WebsitesTable.module.cssrename to src/components/pages/settings/websites/WebsitesTable.module.cssdiff --git a/components/pages/websites/WebsiteChart.js b/src/components/pages/websites/WebsiteChart.jssimilarity index 98%rename from components/pages/websites/WebsiteChart.jsrename to src/components/pages/websites/WebsiteChart.jsindex fac0fb379..7e20e7854 100644--- a/components/pages/websites/WebsiteChart.js+++ b/src/components/pages/websites/WebsiteChart.js@@ -1,6 +1,6 @@import { useMemo } from 'react';import PageviewsChart from 'components/metrics/PageviewsChart';-import { useApi, useDateRange, useTimezone, usePageQuery } from 'hooks';+import { useApi, useDateRange, useTimezone, usePageQuery } from 'components/hooks';import { getDateArray } from 'lib/date';export function WebsiteChart({ websiteId }) {diff --git a/components/pages/websites/WebsiteChart.module.css b/src/components/pages/websites/WebsiteChart.module.csssimilarity index 100%rename from components/pages/websites/WebsiteChart.module.cssrename to src/components/pages/websites/WebsiteChart.module.cssdiff --git a/components/pages/websites/WebsiteChartList.js b/src/components/pages/websites/WebsiteChartList.jssimilarity index 96%rename from components/pages/websites/WebsiteChartList.jsrename to src/components/pages/websites/WebsiteChartList.jsindex 62b05a4d9..f6f3f7656 100644--- a/components/pages/websites/WebsiteChartList.js+++ b/src/components/pages/websites/WebsiteChartList.js@@ -7,7 +7,7 @@ import useDashboard from 'store/dashboard';import styles from './WebsiteList.module.css';import WebsiteHeader from './WebsiteHeader';import { WebsiteMetricsBar } from './WebsiteMetricsBar';-import { useMessages, useLocale } from 'hooks';+import { useMessages, useLocale } from 'components/hooks';import Icons from 'components/icons';export default function WebsiteChartList({ websites, showCharts, limit }) {diff --git a/components/pages/websites/WebsiteDetailsPage.js b/src/components/pages/websites/WebsiteDetailsPage.jssimilarity index 93%rename from components/pages/websites/WebsiteDetailsPage.jsrename to src/components/pages/websites/WebsiteDetailsPage.jsindex 9e0519b25..c5ac47758 100644--- a/components/pages/websites/WebsiteDetailsPage.js+++ b/src/components/pages/websites/WebsiteDetailsPage.js@@ -3,10 +3,10 @@ import { useRouter } from 'next/router';import Page from 'components/layout/Page';import WebsiteChart from 'components/pages/websites/WebsiteChart';import FilterTags from 'components/metrics/FilterTags';-import usePageQuery from 'hooks/usePageQuery';+import usePageQuery from 'components/hooks/usePageQuery';import WebsiteTableView from './WebsiteTableView';import WebsiteMenuView from './WebsiteMenuView';-import { useWebsite } from 'hooks';+import { useWebsite } from 'components/hooks';import WebsiteHeader from './WebsiteHeader';import { WebsiteMetricsBar } from './WebsiteMetricsBar';diff --git a/components/pages/websites/WebsiteEventData.js b/src/components/pages/websites/WebsiteEventData.jssimilarity index 94%rename from components/pages/websites/WebsiteEventData.jsrename to src/components/pages/websites/WebsiteEventData.jsindex 7f9a68294..ea8e473b0 100644--- a/components/pages/websites/WebsiteEventData.js+++ b/src/components/pages/websites/WebsiteEventData.js@@ -2,7 +2,7 @@ import { Flexbox } 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 { useDateRange, useApi, usePageQuery } from 'hooks';+import { useDateRange, useApi, usePageQuery } from 'components/hooks';import styles from './WebsiteEventData.module.css';function useData(websiteId, event) {diff --git a/components/pages/websites/WebsiteEventData.module.css b/src/components/pages/websites/WebsiteEventData.module.csssimilarity index 100%rename from components/pages/websites/WebsiteEventData.module.cssrename to src/components/pages/websites/WebsiteEventData.module.cssdiff --git a/components/pages/websites/WebsiteEventDataPage.js b/src/components/pages/websites/WebsiteEventDataPage.jssimilarity index 100%rename from components/pages/websites/WebsiteEventDataPage.jsrename to src/components/pages/websites/WebsiteEventDataPage.jsdiff --git a/components/pages/websites/WebsiteHeader.js b/src/components/pages/websites/WebsiteHeader.jssimilarity index 94%rename from components/pages/websites/WebsiteHeader.jsrename to src/components/pages/websites/WebsiteHeader.jsindex 0790397fb..fb4e09863 100644--- a/components/pages/websites/WebsiteHeader.js+++ b/src/components/pages/websites/WebsiteHeader.js@@ -1,11 +1,11 @@import classNames from 'classnames';-import { Flexbox, Row, Column, Text, Button, Icon } from 'react-basics';+import { Row, Column, Text, Button, Icon } from 'react-basics';import Link from 'next/link';import { useRouter } from 'next/router';import Favicon from 'components/common/Favicon';import ActiveUsers from 'components/metrics/ActiveUsers';import Icons from 'components/icons';-import { useMessages, useWebsite } from 'hooks';+import { useMessages, useWebsite } from 'components/hooks';import styles from './WebsiteHeader.module.css';export function WebsiteHeader({ websiteId, showLinks = true, children }) {diff --git a/components/pages/websites/WebsiteHeader.module.css b/src/components/pages/websites/WebsiteHeader.module.csssimilarity index 100%rename from components/pages/websites/WebsiteHeader.module.cssrename to src/components/pages/websites/WebsiteHeader.module.cssdiff --git a/components/pages/websites/WebsiteList.module.css b/src/components/pages/websites/WebsiteList.module.csssimilarity index 100%rename from components/pages/websites/WebsiteList.module.cssrename to src/components/pages/websites/WebsiteList.module.cssdiff --git a/components/pages/websites/WebsiteMenuView.js b/src/components/pages/websites/WebsiteMenuView.jssimilarity index 96%rename from components/pages/websites/WebsiteMenuView.jsrename to src/components/pages/websites/WebsiteMenuView.jsindex 39adb188f..8c74d6151 100644--- a/components/pages/websites/WebsiteMenuView.js+++ b/src/components/pages/websites/WebsiteMenuView.js@@ -15,10 +15,10 @@ import ScreenTable from 'components/metrics/ScreenTable';import EventsTable from 'components/metrics/EventsTable';import Icons from 'components/icons';import SideNav from 'components/layout/SideNav';-import usePageQuery from 'hooks/usePageQuery';-import useMessages from 'hooks/useMessages';+import usePageQuery from 'components/hooks/usePageQuery';+import useMessages from 'components/hooks/useMessages';import styles from './WebsiteMenuView.module.css';-import useLocale from 'hooks/useLocale';+import useLocale from 'components/hooks/useLocale';const views = {url: PagesTable,diff --git a/components/pages/websites/WebsiteMenuView.module.css b/src/components/pages/websites/WebsiteMenuView.module.csssimilarity index 100%rename from components/pages/websites/WebsiteMenuView.module.cssrename to src/components/pages/websites/WebsiteMenuView.module.cssdiff --git a/components/pages/websites/WebsiteMetricsBar.js b/src/components/pages/websites/WebsiteMetricsBar.jssimilarity index 99%rename from components/pages/websites/WebsiteMetricsBar.jsrename to src/components/pages/websites/WebsiteMetricsBar.jsindex 3683310c1..ad68a9fa3 100644--- a/components/pages/websites/WebsiteMetricsBar.js+++ b/src/components/pages/websites/WebsiteMetricsBar.js@@ -5,7 +5,7 @@ import MetricCard from 'components/metrics/MetricCard';import RefreshButton from 'components/input/RefreshButton';import WebsiteDateFilter from 'components/input/WebsiteDateFilter';import MetricsBar from 'components/metrics/MetricsBar';-import { useApi, useDateRange, usePageQuery, useMessages, useSticky } from 'hooks';+import { useApi, useDateRange, usePageQuery, useMessages, useSticky } from 'components/hooks';import styles from './WebsiteMetricsBar.module.css';export function WebsiteMetricsBar({ websiteId, sticky }) {diff --git a/components/pages/websites/WebsiteMetricsBar.module.css b/src/components/pages/websites/WebsiteMetricsBar.module.csssimilarity index 100%rename from components/pages/websites/WebsiteMetricsBar.module.cssrename to src/components/pages/websites/WebsiteMetricsBar.module.cssdiff --git a/components/pages/websites/WebsiteReportsPage.js b/src/components/pages/websites/WebsiteReportsPage.jssimilarity index 95%rename from components/pages/websites/WebsiteReportsPage.jsrename to src/components/pages/websites/WebsiteReportsPage.jsindex be4ee8002..40631839e 100644--- a/components/pages/websites/WebsiteReportsPage.js+++ b/src/components/pages/websites/WebsiteReportsPage.js@@ -1,7 +1,7 @@import Page from 'components/layout/Page';import Empty from 'components/common/Empty';import ReportsTable from 'components/pages/reports/ReportsTable';-import { useMessages, useWebsiteReports } from 'hooks';+import { useMessages, useWebsiteReports } from 'components/hooks';import Link from 'next/link';import { Button, Flexbox, Icon, Icons, Text } from 'react-basics';import WebsiteHeader from './WebsiteHeader';diff --git a/components/pages/websites/WebsiteTableView.js b/src/components/pages/websites/WebsiteTableView.jssimilarity index 100%rename from components/pages/websites/WebsiteTableView.jsrename to src/components/pages/websites/WebsiteTableView.jsdiff --git a/components/pages/websites/WebsiteTableView.module.css b/src/components/pages/websites/WebsiteTableView.module.csssimilarity index 100%rename from components/pages/websites/WebsiteTableView.module.cssrename to src/components/pages/websites/WebsiteTableView.module.cssdiff --git a/components/pages/websites/WebsitesPage.js b/src/components/pages/websites/WebsitesPage.jssimilarity index 93%rename from components/pages/websites/WebsitesPage.jsrename to src/components/pages/websites/WebsitesPage.jsindex fafc62afd..2eb060d31 100644--- a/components/pages/websites/WebsitesPage.js+++ b/src/components/pages/websites/WebsitesPage.js@@ -2,9 +2,9 @@ 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 'hooks';-import useUser from 'hooks/useUser';-import useConfig from 'hooks/useConfig';+import { useMessages } from 'components/hooks';+import useUser from 'components/hooks/useUser';+import useConfig from 'components/hooks/useConfig';import { ROLES } from 'lib/constants';import { useState } from 'react';import {diff --git a/src/index.ts b/src/index.tsnew file mode 100644index 000000000..52e5e19c3--- /dev/null+++ b/src/index.ts@@ -0,0 +1,61 @@+export * from 'components/common/ConfirmDeleteForm';+export * from 'components/common/Empty';+export * from 'components/common/EmptyPlaceholder';+export * from 'components/common/ErrorBoundary';+export * from 'components/common/ErrorMessage';+export * from 'components/common/Favicon';+export * from 'components/common/FilterButtons';+export * from 'components/common/FilterLink';+export * from 'components/common/HamburgerButton';+export * from 'components/common/HoverTooltip';+export * from 'components/common/LinkButton';+export * from 'components/common/MobileMenu';+export * from 'components/common/Pager';+export * from 'components/common/SettingsTable';+export * from 'components/common/UpdateNotice';+export * from 'components/common/WorldMap';+export * from 'components/hooks/useApi';+export * from 'components/hooks/useConfig';+export * from 'components/hooks/useCountryNames';+export * from 'components/hooks/useDateRange';+export * from 'components/hooks/useDocumentClick';+export * from 'components/hooks/useEscapeKey';+export * from 'components/hooks/useFilters';+export * from 'components/hooks/useForceUpdate';+export * from 'components/hooks/useFormat';+export * from 'components/hooks/useLanguageNames';+export * from 'components/hooks/useLocale';+export * from 'components/hooks/useMessages';+export * from 'components/hooks/usePageQuery';+export * from 'components/hooks/useReport';+export * from 'components/hooks/useReports';+export * from 'components/hooks/useRequireLogin';+export * from 'components/hooks/useShareToken';+export * from 'components/hooks/useSticky';+export * from 'components/hooks/useTheme';+export * from 'components/hooks/useTimezone';+export * from 'components/hooks/useUser';+export * from 'components/hooks/useWebsite';+export * from 'components/hooks/useWebsiteReports';+export * from 'components/input/DateFilter';+export * from 'components/input/LanguageButton';+export * from 'components/input/LogoutButton';+export * from 'components/input/MonthSelect';+export * from 'components/input/ProfileButton';+export * from 'components/input/RefreshButton';+export * from 'components/input/SettingsButton';+export * from 'components/input/ThemeButton';+export * from 'components/input/WebsiteDateFilter';+export * from 'components/input/WebsiteSelect';+export * from 'components/layout/AppLayout';+export * from 'components/layout/Footer';+export * from 'components/layout/Grid';+export * from 'components/layout/Header';+export * from 'components/layout/NavBar';+export * from 'components/layout/NavGroup';+export * from 'components/layout/Page';+export * from 'components/layout/PageHeader';+export * from 'components/layout/ReportsLayout';+export * from 'components/layout/SettingsLayout';+export * from 'components/layout/ShareLayout';+export * from 'components/layout/SideNav';diff --git a/lang/am-ET.json b/src/lang/am-ET.jsonsimilarity index 100%rename from lang/am-ET.jsonrename to src/lang/am-ET.jsondiff --git a/lang/ar-SA.json b/src/lang/ar-SA.jsonsimilarity index 100%rename from lang/ar-SA.jsonrename to src/lang/ar-SA.jsondiff --git a/lang/be-BY.json b/src/lang/be-BY.jsonsimilarity index 100%rename from lang/be-BY.jsonrename to src/lang/be-BY.jsondiff --git a/lang/bn-BD.json b/src/lang/bn-BD.jsonsimilarity index 100%rename from lang/bn-BD.jsonrename to src/lang/bn-BD.jsondiff --git a/lang/ca-ES.json b/src/lang/ca-ES.jsonsimilarity index 100%rename from lang/ca-ES.jsonrename to src/lang/ca-ES.jsondiff --git a/lang/cs-CZ.json b/src/lang/cs-CZ.jsonsimilarity index 100%rename from lang/cs-CZ.jsonrename to src/lang/cs-CZ.jsondiff --git a/lang/da-DK.json b/src/lang/da-DK.jsonsimilarity index 100%rename from lang/da-DK.jsonrename to src/lang/da-DK.jsondiff --git a/lang/de-CH.json b/src/lang/de-CH.jsonsimilarity index 100%rename from lang/de-CH.jsonrename to src/lang/de-CH.jsondiff --git a/lang/de-DE.json b/src/lang/de-DE.jsonsimilarity index 100%rename from lang/de-DE.jsonrename to src/lang/de-DE.jsondiff --git a/lang/el-GR.json b/src/lang/el-GR.jsonsimilarity index 100%rename from lang/el-GR.jsonrename to src/lang/el-GR.jsondiff --git a/lang/en-GB.json b/src/lang/en-GB.jsonsimilarity index 100%rename from lang/en-GB.jsonrename to src/lang/en-GB.jsondiff --git a/lang/en-US.json b/src/lang/en-US.jsonsimilarity index 100%rename from lang/en-US.jsonrename to src/lang/en-US.jsondiff --git a/lang/es-ES.json b/src/lang/es-ES.jsonsimilarity index 100%rename from lang/es-ES.jsonrename to src/lang/es-ES.jsondiff --git a/lang/es-MX.json b/src/lang/es-MX.jsonsimilarity index 100%rename from lang/es-MX.jsonrename to src/lang/es-MX.jsondiff --git a/lang/fa-IR.json b/src/lang/fa-IR.jsonsimilarity index 100%rename from lang/fa-IR.jsonrename to src/lang/fa-IR.jsondiff --git a/lang/fi-FI.json b/src/lang/fi-FI.jsonsimilarity index 100%rename from lang/fi-FI.jsonrename to src/lang/fi-FI.jsondiff --git a/lang/fo-FO.json b/src/lang/fo-FO.jsonsimilarity index 100%rename from lang/fo-FO.jsonrename to src/lang/fo-FO.jsondiff --git a/lang/fr-FR.json b/src/lang/fr-FR.jsonsimilarity index 100%rename from lang/fr-FR.jsonrename to src/lang/fr-FR.jsondiff --git a/lang/ga-ES.json b/src/lang/ga-ES.jsonsimilarity index 100%rename from lang/ga-ES.jsonrename to src/lang/ga-ES.jsondiff --git a/lang/he-IL.json b/src/lang/he-IL.jsonsimilarity index 100%rename from lang/he-IL.jsonrename to src/lang/he-IL.jsondiff --git a/lang/hi-IN.json b/src/lang/hi-IN.jsonsimilarity index 100%rename from lang/hi-IN.jsonrename to src/lang/hi-IN.jsondiff --git a/lang/hr-HR.json b/src/lang/hr-HR.jsonsimilarity index 100%rename from lang/hr-HR.jsonrename to src/lang/hr-HR.jsondiff --git a/lang/hu-HU.json b/src/lang/hu-HU.jsonsimilarity index 100%rename from lang/hu-HU.jsonrename to src/lang/hu-HU.jsondiff --git a/lang/id-ID.json b/src/lang/id-ID.jsonsimilarity index 100%rename from lang/id-ID.jsonrename to src/lang/id-ID.jsondiff --git a/lang/it-IT.json b/src/lang/it-IT.jsonsimilarity index 100%rename from lang/it-IT.jsonrename to src/lang/it-IT.jsondiff --git a/lang/ja-JP.json b/src/lang/ja-JP.jsonsimilarity index 100%rename from lang/ja-JP.jsonrename to src/lang/ja-JP.jsondiff --git a/lang/km-KH.json b/src/lang/km-KH.jsonsimilarity index 100%rename from lang/km-KH.jsonrename to src/lang/km-KH.jsondiff --git a/lang/ko-KR.json b/src/lang/ko-KR.jsonsimilarity index 100%rename from lang/ko-KR.jsonrename to src/lang/ko-KR.jsondiff --git a/lang/lt-LT.json b/src/lang/lt-LT.jsonsimilarity index 100%rename from lang/lt-LT.jsonrename to src/lang/lt-LT.jsondiff --git a/lang/mn-MN.json b/src/lang/mn-MN.jsonsimilarity index 100%rename from lang/mn-MN.jsonrename to src/lang/mn-MN.jsondiff --git a/lang/ms-MY.json b/src/lang/ms-MY.jsonsimilarity index 100%rename from lang/ms-MY.jsonrename to src/lang/ms-MY.jsondiff --git a/lang/my-MM.json b/src/lang/my-MM.jsonsimilarity index 100%rename from lang/my-MM.jsonrename to src/lang/my-MM.jsondiff --git a/lang/nb-NO.json b/src/lang/nb-NO.jsonsimilarity index 100%rename from lang/nb-NO.jsonrename to src/lang/nb-NO.jsondiff --git a/lang/nl-NL.json b/src/lang/nl-NL.jsonsimilarity index 100%rename from lang/nl-NL.jsonrename to src/lang/nl-NL.jsondiff --git a/lang/pl-PL.json b/src/lang/pl-PL.jsonsimilarity index 100%rename from lang/pl-PL.jsonrename to src/lang/pl-PL.jsondiff --git a/lang/pt-BR.json b/src/lang/pt-BR.jsonsimilarity index 100%rename from lang/pt-BR.jsonrename to src/lang/pt-BR.jsondiff --git a/lang/pt-PT.json b/src/lang/pt-PT.jsonsimilarity index 100%rename from lang/pt-PT.jsonrename to src/lang/pt-PT.jsondiff --git a/lang/ro-RO.json b/src/lang/ro-RO.jsonsimilarity index 100%rename from lang/ro-RO.jsonrename to src/lang/ro-RO.jsondiff --git a/lang/ru-RU.json b/src/lang/ru-RU.jsonsimilarity index 100%rename from lang/ru-RU.jsonrename to src/lang/ru-RU.jsondiff --git a/lang/si-LK.json b/src/lang/si-LK.jsonsimilarity index 100%rename from lang/si-LK.jsonrename to src/lang/si-LK.jsondiff --git a/lang/sk-SK.json b/src/lang/sk-SK.jsonsimilarity index 100%rename from lang/sk-SK.jsonrename to src/lang/sk-SK.jsondiff --git a/lang/sl-SI.json b/src/lang/sl-SI.jsonsimilarity index 100%rename from lang/sl-SI.jsonrename to src/lang/sl-SI.jsondiff --git a/lang/sv-SE.json b/src/lang/sv-SE.jsonsimilarity index 100%rename from lang/sv-SE.jsonrename to src/lang/sv-SE.jsondiff --git a/lang/ta-IN.json b/src/lang/ta-IN.jsonsimilarity index 100%rename from lang/ta-IN.jsonrename to src/lang/ta-IN.jsondiff --git a/lang/th-TH.json b/src/lang/th-TH.jsonsimilarity index 100%rename from lang/th-TH.jsonrename to src/lang/th-TH.jsondiff --git a/lang/tr-TR.json b/src/lang/tr-TR.jsonsimilarity index 100%rename from lang/tr-TR.jsonrename to src/lang/tr-TR.jsondiff --git a/lang/uk-UA.json b/src/lang/uk-UA.jsonsimilarity index 100%rename from lang/uk-UA.jsonrename to src/lang/uk-UA.jsondiff --git a/lang/ur-PK.json b/src/lang/ur-PK.jsonsimilarity index 100%rename from lang/ur-PK.jsonrename to src/lang/ur-PK.jsondiff --git a/lang/vi-VN.json b/src/lang/vi-VN.jsonsimilarity index 100%rename from lang/vi-VN.jsonrename to src/lang/vi-VN.jsondiff --git a/lang/zh-CN.json b/src/lang/zh-CN.jsonsimilarity index 100%rename from lang/zh-CN.jsonrename to src/lang/zh-CN.jsondiff --git a/lang/zh-TW.json b/src/lang/zh-TW.jsonsimilarity index 100%rename from lang/zh-TW.jsonrename to src/lang/zh-TW.jsondiff --git a/lib/auth.ts b/src/lib/auth.tssimilarity index 100%rename from lib/auth.tsrename to src/lib/auth.tsdiff --git a/lib/cache.ts b/src/lib/cache.tssimilarity index 100%rename from lib/cache.tsrename to src/lib/cache.tsdiff --git a/lib/charts.js b/src/lib/charts.jssimilarity index 100%rename from lib/charts.jsrename to src/lib/charts.jsdiff --git a/lib/clickhouse.ts b/src/lib/clickhouse.tssimilarity index 100%rename from lib/clickhouse.tsrename to src/lib/clickhouse.tsdiff --git a/lib/client.ts b/src/lib/client.tssimilarity index 100%rename from lib/client.tsrename to src/lib/client.tsdiff --git a/lib/constants.ts b/src/lib/constants.tssimilarity index 100%rename from lib/constants.tsrename to src/lib/constants.tsdiff --git a/lib/crypto.js b/src/lib/crypto.jssimilarity index 100%rename from lib/crypto.jsrename to src/lib/crypto.jsdiff --git a/lib/data.ts b/src/lib/data.tssimilarity index 100%rename from lib/data.tsrename to src/lib/data.tsdiff --git a/lib/date.js b/src/lib/date.jssimilarity index 100%rename from lib/date.jsrename to src/lib/date.jsdiff --git a/lib/db.js b/src/lib/db.jssimilarity index 100%rename from lib/db.jsrename to src/lib/db.jsdiff --git a/lib/detect.ts b/src/lib/detect.tssimilarity index 100%rename from lib/detect.tsrename to src/lib/detect.tsdiff --git a/lib/filters.js b/src/lib/filters.jssimilarity index 100%rename from lib/filters.jsrename to src/lib/filters.jsdiff --git a/lib/format.js b/src/lib/format.jssimilarity index 100%rename from lib/format.jsrename to src/lib/format.jsdiff --git a/lib/kafka.ts b/src/lib/kafka.tssimilarity index 100%rename from lib/kafka.tsrename to src/lib/kafka.tsdiff --git a/lib/lang.js b/src/lib/lang.jssimilarity index 100%rename from lib/lang.jsrename to src/lib/lang.jsdiff --git a/lib/load.ts b/src/lib/load.tssimilarity index 100%rename from lib/load.tsrename to src/lib/load.tsdiff --git a/lib/middleware.ts b/src/lib/middleware.tssimilarity index 100%rename from lib/middleware.tsrename to src/lib/middleware.tsdiff --git a/lib/prisma.ts b/src/lib/prisma.tssimilarity index 100%rename from lib/prisma.tsrename to src/lib/prisma.tsdiff --git a/lib/query.ts b/src/lib/query.tssimilarity index 100%rename from lib/query.tsrename to src/lib/query.tsdiff --git a/lib/session.ts b/src/lib/session.tssimilarity index 100%rename from lib/session.tsrename to src/lib/session.tsdiff --git a/lib/sql.ts b/src/lib/sql.tssimilarity index 100%rename from lib/sql.tsrename to src/lib/sql.tsdiff --git a/lib/types.ts b/src/lib/types.tssimilarity index 100%rename from lib/types.tsrename to src/lib/types.tsdiff --git a/lib/yup.ts b/src/lib/yup.tssimilarity index 100%rename from lib/yup.tsrename to src/lib/yup.tsdiff --git a/pages/404.js b/src/pages/404.jssimilarity index 90%rename from pages/404.jsrename to src/pages/404.jsindex 4a5f4bd95..8fa13a9c7 100644--- a/pages/404.js+++ b/src/pages/404.js@@ -1,6 +1,6 @@import { Row, Column, Flexbox } from 'react-basics';import AppLayout from 'components/layout/AppLayout';-import useMessages from 'hooks/useMessages';+import useMessages from 'components/hooks/useMessages';export default function Custom404() {const { formatMessage, labels } = useMessages();diff --git a/pages/_app.js b/src/pages/_app.jssimilarity index 96%rename from pages/_app.jsrename to src/pages/_app.jsindex 8d5497732..e88b2d863 100644--- a/pages/_app.js+++ b/src/pages/_app.js@@ -5,8 +5,8 @@ import Head from 'next/head';import Script from 'next/script';import { useRouter } from 'next/router';import ErrorBoundary from 'components/common/ErrorBoundary';-import useLocale from 'hooks/useLocale';-import useConfig from 'hooks/useConfig';+import useLocale from 'components/hooks/useLocale';+import useConfig from 'components/hooks/useConfig';import '@fontsource/inter/400.css';import '@fontsource/inter/700.css';import 'react-basics/dist/styles.css';diff --git a/pages/api/auth/login.ts b/src/pages/api/auth/login.tssimilarity index 100%rename from pages/api/auth/login.tsrename to src/pages/api/auth/login.tsdiff --git a/pages/api/auth/logout.ts b/src/pages/api/auth/logout.tssimilarity index 100%rename from pages/api/auth/logout.tsrename to src/pages/api/auth/logout.tsdiff --git a/pages/api/auth/sso.ts b/src/pages/api/auth/sso.tssimilarity index 100%rename from pages/api/auth/sso.tsrename to src/pages/api/auth/sso.tsdiff --git a/pages/api/auth/verify.ts b/src/pages/api/auth/verify.tssimilarity index 100%rename from pages/api/auth/verify.tsrename to src/pages/api/auth/verify.tsdiff --git a/pages/api/config.ts b/src/pages/api/config.tssimilarity index 100%rename from pages/api/config.tsrename to src/pages/api/config.tsdiff --git a/pages/api/event-data/events.ts b/src/pages/api/event-data/events.tssimilarity index 100%rename from pages/api/event-data/events.tsrename to src/pages/api/event-data/events.tsdiff --git a/pages/api/event-data/fields.ts b/src/pages/api/event-data/fields.tssimilarity index 100%rename from pages/api/event-data/fields.tsrename to src/pages/api/event-data/fields.tsdiff --git a/pages/api/event-data/stats.ts b/src/pages/api/event-data/stats.tssimilarity index 100%rename from pages/api/event-data/stats.tsrename to src/pages/api/event-data/stats.tsdiff --git a/pages/api/heartbeat.ts b/src/pages/api/heartbeat.tssimilarity index 100%rename from pages/api/heartbeat.tsrename to src/pages/api/heartbeat.tsdiff --git a/pages/api/me/index.ts b/src/pages/api/me/index.tssimilarity index 100%rename from pages/api/me/index.tsrename to src/pages/api/me/index.tsdiff --git a/pages/api/me/password.ts b/src/pages/api/me/password.tssimilarity index 100%rename from pages/api/me/password.tsrename to src/pages/api/me/password.tsdiff --git a/pages/api/me/teams.ts b/src/pages/api/me/teams.tssimilarity index 100%rename from pages/api/me/teams.tsrename to src/pages/api/me/teams.tsdiff --git a/pages/api/me/websites.ts b/src/pages/api/me/websites.tssimilarity index 100%rename from pages/api/me/websites.tsrename to src/pages/api/me/websites.tsdiff --git a/pages/api/realtime/[id].ts b/src/pages/api/realtime/[id].tssimilarity index 100%rename from pages/api/realtime/[id].tsrename to src/pages/api/realtime/[id].tsdiff --git a/pages/api/reports/[id].ts b/src/pages/api/reports/[id].tssimilarity index 100%rename from pages/api/reports/[id].tsrename to src/pages/api/reports/[id].tsdiff --git a/pages/api/reports/funnel.ts b/src/pages/api/reports/funnel.tssimilarity index 100%rename from pages/api/reports/funnel.tsrename to src/pages/api/reports/funnel.tsdiff --git a/pages/api/reports/index.ts b/src/pages/api/reports/index.tssimilarity index 100%rename from pages/api/reports/index.tsrename to src/pages/api/reports/index.tsdiff --git a/pages/api/reports/insights.ts b/src/pages/api/reports/insights.tssimilarity index 100%rename from pages/api/reports/insights.tsrename to src/pages/api/reports/insights.tsdiff --git a/pages/api/reports/retention.ts b/src/pages/api/reports/retention.tssimilarity index 100%rename from pages/api/reports/retention.tsrename to src/pages/api/reports/retention.tsdiff --git a/pages/api/scripts/telemetry.js b/src/pages/api/scripts/telemetry.jssimilarity index 100%rename from pages/api/scripts/telemetry.jsrename to src/pages/api/scripts/telemetry.jsdiff --git a/pages/api/send.ts b/src/pages/api/send.tssimilarity index 100%rename from pages/api/send.tsrename to src/pages/api/send.tsdiff --git a/pages/api/share/[id].ts b/src/pages/api/share/[id].tssimilarity index 100%rename from pages/api/share/[id].tsrename to src/pages/api/share/[id].tsdiff --git a/pages/api/teams/[id]/index.ts b/src/pages/api/teams/[id]/index.tssimilarity index 100%rename from pages/api/teams/[id]/index.tsrename to src/pages/api/teams/[id]/index.tsdiff --git a/pages/api/teams/[id]/users/[userId].ts b/src/pages/api/teams/[id]/users/[userId].tssimilarity index 100%rename from pages/api/teams/[id]/users/[userId].tsrename to src/pages/api/teams/[id]/users/[userId].tsdiff --git a/pages/api/teams/[id]/users/index.ts b/src/pages/api/teams/[id]/users/index.tssimilarity index 100%rename from pages/api/teams/[id]/users/index.tsrename to src/pages/api/teams/[id]/users/index.tsdiff --git a/pages/api/teams/[id]/websites/[websiteId].ts b/src/pages/api/teams/[id]/websites/[websiteId].tssimilarity index 100%rename from pages/api/teams/[id]/websites/[websiteId].tsrename to src/pages/api/teams/[id]/websites/[websiteId].tsdiff --git a/pages/api/teams/[id]/websites/index.ts b/src/pages/api/teams/[id]/websites/index.tssimilarity index 100%rename from pages/api/teams/[id]/websites/index.tsrename to src/pages/api/teams/[id]/websites/index.tsdiff --git a/pages/api/teams/index.ts b/src/pages/api/teams/index.tssimilarity index 100%rename from pages/api/teams/index.tsrename to src/pages/api/teams/index.tsdiff --git a/pages/api/teams/join.ts b/src/pages/api/teams/join.tssimilarity index 100%rename from pages/api/teams/join.tsrename to src/pages/api/teams/join.tsdiff --git a/pages/api/users/[id]/index.ts b/src/pages/api/users/[id]/index.tssimilarity index 100%rename from pages/api/users/[id]/index.tsrename to src/pages/api/users/[id]/index.tsdiff --git a/pages/api/users/[id]/teams.ts b/src/pages/api/users/[id]/teams.tssimilarity index 100%rename from pages/api/users/[id]/teams.tsrename to src/pages/api/users/[id]/teams.tsdiff --git a/pages/api/users/[id]/usage.ts b/src/pages/api/users/[id]/usage.tssimilarity index 100%rename from pages/api/users/[id]/usage.tsrename to src/pages/api/users/[id]/usage.tsdiff --git a/pages/api/users/[id]/websites.ts b/src/pages/api/users/[id]/websites.tssimilarity index 100%rename from pages/api/users/[id]/websites.tsrename to src/pages/api/users/[id]/websites.tsdiff --git a/pages/api/users/index.ts b/src/pages/api/users/index.tssimilarity index 100%rename from pages/api/users/index.tsrename to src/pages/api/users/index.tsdiff --git a/pages/api/websites/[id]/active.ts b/src/pages/api/websites/[id]/active.tssimilarity index 100%rename from pages/api/websites/[id]/active.tsrename to src/pages/api/websites/[id]/active.tsdiff --git a/pages/api/websites/[id]/daterange.ts b/src/pages/api/websites/[id]/daterange.tssimilarity index 100%rename from pages/api/websites/[id]/daterange.tsrename to src/pages/api/websites/[id]/daterange.tsdiff --git a/pages/api/websites/[id]/events.ts b/src/pages/api/websites/[id]/events.tssimilarity index 100%rename from pages/api/websites/[id]/events.tsrename to src/pages/api/websites/[id]/events.tsdiff --git a/pages/api/websites/[id]/index.ts b/src/pages/api/websites/[id]/index.tssimilarity index 100%rename from pages/api/websites/[id]/index.tsrename to src/pages/api/websites/[id]/index.tsdiff --git a/pages/api/websites/[id]/metrics.ts b/src/pages/api/websites/[id]/metrics.tssimilarity index 100%rename from pages/api/websites/[id]/metrics.tsrename to src/pages/api/websites/[id]/metrics.tsdiff --git a/pages/api/websites/[id]/pageviews.ts b/src/pages/api/websites/[id]/pageviews.tssimilarity index 100%rename from pages/api/websites/[id]/pageviews.tsrename to src/pages/api/websites/[id]/pageviews.tsdiff --git a/pages/api/websites/[id]/reports.ts b/src/pages/api/websites/[id]/reports.tssimilarity index 100%rename from pages/api/websites/[id]/reports.tsrename to src/pages/api/websites/[id]/reports.tsdiff --git a/pages/api/websites/[id]/reset.ts b/src/pages/api/websites/[id]/reset.tssimilarity index 100%rename from pages/api/websites/[id]/reset.tsrename to src/pages/api/websites/[id]/reset.tsdiff --git a/pages/api/websites/[id]/stats.ts b/src/pages/api/websites/[id]/stats.tssimilarity index 100%rename from pages/api/websites/[id]/stats.tsrename to src/pages/api/websites/[id]/stats.tsdiff --git a/pages/api/websites/[id]/values.ts b/src/pages/api/websites/[id]/values.tssimilarity index 100%rename from pages/api/websites/[id]/values.tsrename to src/pages/api/websites/[id]/values.tsdiff --git a/pages/api/websites/index.ts b/src/pages/api/websites/index.tssimilarity index 100%rename from pages/api/websites/index.tsrename to src/pages/api/websites/index.tsdiff --git a/pages/console/[[...id]].js b/src/pages/console/[[...id]].jssimilarity index 100%rename from pages/console/[[...id]].jsrename to src/pages/console/[[...id]].jsdiff --git a/pages/dashboard/index.js b/src/pages/dashboard/index.jssimilarity index 85%rename from pages/dashboard/index.jsrename to src/pages/dashboard/index.jsindex 061697f44..c1a3c09e7 100644--- a/pages/dashboard/index.js+++ b/src/pages/dashboard/index.js@@ -1,6 +1,6 @@import AppLayout from 'components/layout/AppLayout';import Dashboard from 'components/pages/dashboard/Dashboard';-import useMessages from 'hooks/useMessages';+import useMessages from 'components/hooks/useMessages';export default function DashboardPage() {const { formatMessage, labels } = useMessages();diff --git a/pages/index.js b/src/pages/index.jssimilarity index 100%rename from pages/index.jsrename to src/pages/index.jsdiff --git a/pages/login.js b/src/pages/login.jssimilarity index 100%rename from pages/login.jsrename to src/pages/login.jsdiff --git a/pages/logout.js b/src/pages/logout.jssimilarity index 93%rename from pages/logout.jsrename to src/pages/logout.jsindex 675f1932d..ef89080c3 100644--- a/pages/logout.js+++ b/src/pages/logout.js@@ -1,6 +1,6 @@import { useEffect } from 'react';import { useRouter } from 'next/router';-import useApi from 'hooks/useApi';+import useApi from 'components/hooks/useApi';import { setUser } from 'store/app';import { removeClientAuthToken } from 'lib/client';diff --git a/pages/reports/[id].js b/src/pages/reports/[id].jssimilarity index 92%rename from pages/reports/[id].jsrename to src/pages/reports/[id].jsindex 2520e87db..101881a13 100644--- a/pages/reports/[id].js+++ b/src/pages/reports/[id].js@@ -1,7 +1,7 @@import { useRouter } from 'next/router';import AppLayout from 'components/layout/AppLayout';import ReportDetails from 'components/pages/reports/ReportDetails';-import { useApi, useMessages } from 'hooks';+import { useApi, useMessages } from 'components/hooks';export default function () {const { formatMessage, labels } = useMessages();diff --git a/pages/reports/create.js b/src/pages/reports/create.jssimilarity index 87%rename from pages/reports/create.jsrename to src/pages/reports/create.jsindex 763e2c63f..08f97f280 100644--- a/pages/reports/create.js+++ b/src/pages/reports/create.js@@ -1,6 +1,6 @@import AppLayout from 'components/layout/AppLayout';import ReportTemplates from 'components/pages/reports/ReportTemplates';-import { useMessages } from 'hooks';+import { useMessages } from 'components/hooks';export default function () {const { formatMessage, labels } = useMessages();diff --git a/pages/reports/funnel.js b/src/pages/reports/funnel.jssimilarity index 86%rename from pages/reports/funnel.jsrename to src/pages/reports/funnel.jsindex 4acdef37d..78174f7b3 100644--- a/pages/reports/funnel.js+++ b/src/pages/reports/funnel.js@@ -1,6 +1,6 @@import AppLayout from 'components/layout/AppLayout';import FunnelReport from 'components/pages/reports/funnel/FunnelReport';-import useMessages from 'hooks/useMessages';+import useMessages from 'components/hooks/useMessages';export default function () {const { formatMessage, labels } = useMessages();diff --git a/pages/reports/index.js b/src/pages/reports/index.jssimilarity index 86%rename from pages/reports/index.jsrename to src/pages/reports/index.jsindex ff3b4e862..a1a13a682 100644--- a/pages/reports/index.js+++ b/src/pages/reports/index.js@@ -1,6 +1,6 @@import AppLayout from 'components/layout/AppLayout';import ReportsPage from 'components/pages/reports/ReportsPage';-import { useMessages } from 'hooks';+import { useMessages } from 'components/hooks';export default function () {const { formatMessage, labels } = useMessages();diff --git a/pages/reports/insights.js b/src/pages/reports/insights.jssimilarity index 88%rename from pages/reports/insights.jsrename to src/pages/reports/insights.jsindex 45236e10e..c52207219 100644--- a/pages/reports/insights.js+++ b/src/pages/reports/insights.js@@ -1,6 +1,6 @@import AppLayout from 'components/layout/AppLayout';import InsightsReport from 'components/pages/reports/insights/InsightsReport';-import { useMessages } from 'hooks';+import { useMessages } from 'components/hooks';export default function () {const { formatMessage, labels } = useMessages();diff --git a/pages/reports/retention.js b/src/pages/reports/retention.jssimilarity index 86%rename from pages/reports/retention.jsrename to src/pages/reports/retention.jsindex b7f0bd0f8..7f5d4cf26 100644--- a/pages/reports/retention.js+++ b/src/pages/reports/retention.js@@ -1,6 +1,6 @@import AppLayout from 'components/layout/AppLayout';import RetentionReport from 'components/pages/reports/retention/RetentionReport';-import useMessages from 'hooks/useMessages';+import useMessages from 'components/hooks/useMessages';export default function () {const { formatMessage, labels } = useMessages();diff --git a/pages/settings/profile/index.js b/src/pages/settings/profile/index.jssimilarity index 89%rename from pages/settings/profile/index.jsrename to src/pages/settings/profile/index.jsindex 8827f1daa..d340c1930 100644--- a/pages/settings/profile/index.js+++ b/src/pages/settings/profile/index.js@@ -1,7 +1,7 @@import AppLayout from 'components/layout/AppLayout';import SettingsLayout from 'components/layout/SettingsLayout';import ProfileSettings from 'components/pages/settings/profile/ProfileSettings';-import useMessages from 'hooks/useMessages';+import useMessages from 'components/hooks/useMessages';export default function () {const { formatMessage, labels } = useMessages();diff --git a/pages/settings/teams/[id].js b/src/pages/settings/teams/[id].jssimilarity index 93%rename from pages/settings/teams/[id].jsrename to src/pages/settings/teams/[id].jsindex a68ef80c3..775a6a08c 100644--- a/pages/settings/teams/[id].js+++ b/src/pages/settings/teams/[id].js@@ -2,7 +2,7 @@ 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 'hooks/useMessages';+import useMessages from 'components/hooks/useMessages';export default function ({ disabled }) {const router = useRouter();diff --git a/pages/settings/teams/index.js b/src/pages/settings/teams/index.jssimilarity index 91%rename from pages/settings/teams/index.jsrename to src/pages/settings/teams/index.jsindex 51739c316..7e56a7d73 100644--- a/pages/settings/teams/index.js+++ b/src/pages/settings/teams/index.js@@ -1,7 +1,7 @@import AppLayout from 'components/layout/AppLayout';import SettingsLayout from 'components/layout/SettingsLayout';import TeamsList from 'components/pages/settings/teams/TeamsList';-import useMessages from 'hooks/useMessages';+import useMessages from 'components/hooks/useMessages';export default function ({ disabled }) {const { formatMessage, labels } = useMessages();diff --git a/pages/settings/users/[id].js b/src/pages/settings/users/[id].jssimilarity index 93%rename from pages/settings/users/[id].jsrename to src/pages/settings/users/[id].jsindex d1e53419b..fdd708fdc 100644--- a/pages/settings/users/[id].js+++ b/src/pages/settings/users/[id].js@@ -2,7 +2,7 @@ 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 'hooks/useMessages';+import useMessages from 'components/hooks/useMessages';export default function ({ disabled }) {const router = useRouter();diff --git a/pages/settings/users/index.js b/src/pages/settings/users/index.jssimilarity index 91%rename from pages/settings/users/index.jsrename to src/pages/settings/users/index.jsindex ee325adca..90026d87c 100644--- a/pages/settings/users/index.js+++ b/src/pages/settings/users/index.js@@ -1,7 +1,7 @@import AppLayout from 'components/layout/AppLayout';import SettingsLayout from 'components/layout/SettingsLayout';import UsersList from 'components/pages/settings/users/UsersList';-import useMessages from 'hooks/useMessages';+import useMessages from 'components/hooks/useMessages';export default function ({ disabled }) {const { formatMessage, labels } = useMessages();diff --git a/pages/settings/websites/[id].js b/src/pages/settings/websites/[id].jssimilarity index 93%rename from pages/settings/websites/[id].jsrename to src/pages/settings/websites/[id].jsindex f828369e0..506da107a 100644--- a/pages/settings/websites/[id].js+++ b/src/pages/settings/websites/[id].js@@ -2,7 +2,7 @@ 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 'hooks/useMessages';+import useMessages from 'components/hooks/useMessages';export default function ({ disabled }) {const router = useRouter();diff --git a/pages/settings/websites/index.js b/src/pages/settings/websites/index.jssimilarity index 92%rename from pages/settings/websites/index.jsrename to src/pages/settings/websites/index.jsindex 899ad7c71..f4551f4a8 100644--- a/pages/settings/websites/index.js+++ b/src/pages/settings/websites/index.js@@ -1,7 +1,7 @@import AppLayout from 'components/layout/AppLayout';import SettingsLayout from 'components/layout/SettingsLayout';import WebsitesList from 'components/pages/settings/websites/WebsitesList';-import useMessages from 'hooks/useMessages';+import useMessages from 'components/hooks/useMessages';export default function ({ disabled }) {const { formatMessage, labels } = useMessages();diff --git a/pages/share/[...id].js b/src/pages/share/[...id].jssimilarity index 89%rename from pages/share/[...id].jsrename to src/pages/share/[...id].jsindex 1e4243821..a2c69df8d 100644--- a/pages/share/[...id].js+++ b/src/pages/share/[...id].js@@ -1,7 +1,7 @@import { useRouter } from 'next/router';import ShareLayout from 'components/layout/ShareLayout';import WebsiteDetailsPage from 'components/pages/websites/WebsiteDetailsPage';-import useShareToken from 'hooks/useShareToken';+import useShareToken from 'components/hooks/useShareToken';export default function () {const router = useRouter();diff --git a/pages/sso.js b/src/pages/sso.jssimilarity index 100%rename from pages/sso.jsrename to src/pages/sso.jsdiff --git a/pages/websites/[id]/event-data.js b/src/pages/websites/[id]/event-data.jssimilarity index 89%rename from pages/websites/[id]/event-data.jsrename to src/pages/websites/[id]/event-data.jsindex 8b44616d9..b99d2fc96 100644--- a/pages/websites/[id]/event-data.js+++ b/src/pages/websites/[id]/event-data.js@@ -1,7 +1,7 @@import { useRouter } from 'next/router';import AppLayout from 'components/layout/AppLayout';import WebsiteEventDataPage from 'components/pages/websites/WebsiteEventDataPage';-import useMessages from 'hooks/useMessages';+import useMessages from 'components/hooks/useMessages';export default function () {const { formatMessage, labels } = useMessages();diff --git a/pages/websites/[id]/index.js b/src/pages/websites/[id]/index.jssimilarity index 89%rename from pages/websites/[id]/index.jsrename to src/pages/websites/[id]/index.jsindex bec7a45f6..d3ec5f938 100644--- a/pages/websites/[id]/index.js+++ b/src/pages/websites/[id]/index.js@@ -1,7 +1,7 @@import { useRouter } from 'next/router';import AppLayout from 'components/layout/AppLayout';import WebsiteDetailsPage from 'components/pages/websites/WebsiteDetailsPage';-import useMessages from 'hooks/useMessages';+import useMessages from 'components/hooks/useMessages';export default function () {const { formatMessage, labels } = useMessages();diff --git a/pages/websites/[id]/realtime.js b/src/pages/websites/[id]/realtime.jssimilarity index 100%rename from pages/websites/[id]/realtime.jsrename to src/pages/websites/[id]/realtime.jsdiff --git a/pages/websites/[id]/reports.js b/src/pages/websites/[id]/reports.jssimilarity index 100%rename from pages/websites/[id]/reports.jsrename to src/pages/websites/[id]/reports.jsdiff --git a/pages/websites/index.js b/src/pages/websites/index.jssimilarity index 84%rename from pages/websites/index.jsrename to src/pages/websites/index.jsindex 42a327bcc..43eed640d 100644--- a/pages/websites/index.js+++ b/src/pages/websites/index.js@@ -1,6 +1,6 @@import AppLayout from 'components/layout/AppLayout';import WebsitesPage from 'components/pages/websites/WebsitesPage';-import useMessages from 'hooks/useMessages';+import useMessages from 'components/hooks/useMessages';export default function () {const { formatMessage, labels } = useMessages();diff --git a/queries/admin/report.ts b/src/queries/admin/report.tssimilarity index 100%rename from queries/admin/report.tsrename to src/queries/admin/report.tsdiff --git a/queries/admin/team.ts b/src/queries/admin/team.tssimilarity index 100%rename from queries/admin/team.tsrename to src/queries/admin/team.tsdiff --git a/queries/admin/teamUser.ts b/src/queries/admin/teamUser.tssimilarity index 100%rename from queries/admin/teamUser.tsrename to src/queries/admin/teamUser.tsdiff --git a/queries/admin/teamWebsite.ts b/src/queries/admin/teamWebsite.tssimilarity index 100%rename from queries/admin/teamWebsite.tsrename to src/queries/admin/teamWebsite.tsdiff --git a/queries/admin/user.ts b/src/queries/admin/user.tssimilarity index 100%rename from queries/admin/user.tsrename to src/queries/admin/user.tsdiff --git a/queries/admin/website.ts b/src/queries/admin/website.tssimilarity index 100%rename from queries/admin/website.tsrename to src/queries/admin/website.tsdiff --git a/queries/analytics/eventData/getEventDataEvents.ts b/src/queries/analytics/eventData/getEventDataEvents.tssimilarity index 100%rename from queries/analytics/eventData/getEventDataEvents.tsrename to src/queries/analytics/eventData/getEventDataEvents.tsdiff --git a/queries/analytics/eventData/getEventDataFields.ts b/src/queries/analytics/eventData/getEventDataFields.tssimilarity index 100%rename from queries/analytics/eventData/getEventDataFields.tsrename to src/queries/analytics/eventData/getEventDataFields.tsdiff --git a/queries/analytics/eventData/getEventDataStats.ts b/src/queries/analytics/eventData/getEventDataStats.tssimilarity index 100%rename from queries/analytics/eventData/getEventDataStats.tsrename to src/queries/analytics/eventData/getEventDataStats.tsdiff --git a/queries/analytics/eventData/getEventDataUsage.ts b/src/queries/analytics/eventData/getEventDataUsage.tssimilarity index 100%rename from queries/analytics/eventData/getEventDataUsage.tsrename to src/queries/analytics/eventData/getEventDataUsage.tsdiff --git a/queries/analytics/eventData/saveEventData.ts b/src/queries/analytics/eventData/saveEventData.tssimilarity index 100%rename from queries/analytics/eventData/saveEventData.tsrename to src/queries/analytics/eventData/saveEventData.tsdiff --git a/queries/analytics/events/getEventMetrics.ts b/src/queries/analytics/events/getEventMetrics.tssimilarity index 100%rename from queries/analytics/events/getEventMetrics.tsrename to src/queries/analytics/events/getEventMetrics.tsdiff --git a/queries/analytics/events/getEventUsage.ts b/src/queries/analytics/events/getEventUsage.tssimilarity index 100%rename from queries/analytics/events/getEventUsage.tsrename to src/queries/analytics/events/getEventUsage.tsdiff --git a/queries/analytics/events/getEvents.ts b/src/queries/analytics/events/getEvents.tssimilarity index 100%rename from queries/analytics/events/getEvents.tsrename to src/queries/analytics/events/getEvents.tsdiff --git a/queries/analytics/events/saveEvent.ts b/src/queries/analytics/events/saveEvent.tssimilarity index 100%rename from queries/analytics/events/saveEvent.tsrename to src/queries/analytics/events/saveEvent.tsdiff --git a/queries/analytics/getActiveVisitors.ts b/src/queries/analytics/getActiveVisitors.tssimilarity index 100%rename from queries/analytics/getActiveVisitors.tsrename to src/queries/analytics/getActiveVisitors.tsdiff --git a/queries/analytics/getRealtimeData.ts b/src/queries/analytics/getRealtimeData.tssimilarity index 100%rename from queries/analytics/getRealtimeData.tsrename to src/queries/analytics/getRealtimeData.tsdiff --git a/queries/analytics/getValues.ts b/src/queries/analytics/getValues.tssimilarity index 100%rename from queries/analytics/getValues.tsrename to src/queries/analytics/getValues.tsdiff --git a/queries/analytics/getWebsiteDateRange.ts b/src/queries/analytics/getWebsiteDateRange.tssimilarity index 100%rename from queries/analytics/getWebsiteDateRange.tsrename to src/queries/analytics/getWebsiteDateRange.tsdiff --git a/queries/analytics/getWebsiteStats.ts b/src/queries/analytics/getWebsiteStats.tssimilarity index 100%rename from queries/analytics/getWebsiteStats.tsrename to src/queries/analytics/getWebsiteStats.tsdiff --git a/queries/analytics/pageviews/getPageviewMetrics.ts b/src/queries/analytics/pageviews/getPageviewMetrics.tssimilarity index 100%rename from queries/analytics/pageviews/getPageviewMetrics.tsrename to src/queries/analytics/pageviews/getPageviewMetrics.tsdiff --git a/queries/analytics/pageviews/getPageviewStats.ts b/src/queries/analytics/pageviews/getPageviewStats.tssimilarity index 100%rename from queries/analytics/pageviews/getPageviewStats.tsrename to src/queries/analytics/pageviews/getPageviewStats.tsdiff --git a/queries/analytics/reports/getFunnel.ts b/src/queries/analytics/reports/getFunnel.tssimilarity index 100%rename from queries/analytics/reports/getFunnel.tsrename to src/queries/analytics/reports/getFunnel.tsdiff --git a/queries/analytics/reports/getInsights.ts b/src/queries/analytics/reports/getInsights.tssimilarity index 100%rename from queries/analytics/reports/getInsights.tsrename to src/queries/analytics/reports/getInsights.tsdiff --git a/queries/analytics/reports/getRetention.ts b/src/queries/analytics/reports/getRetention.tssimilarity index 100%rename from queries/analytics/reports/getRetention.tsrename to src/queries/analytics/reports/getRetention.tsdiff --git a/queries/analytics/sessions/createSession.ts b/src/queries/analytics/sessions/createSession.tssimilarity index 100%rename from queries/analytics/sessions/createSession.tsrename to src/queries/analytics/sessions/createSession.tsdiff --git a/queries/analytics/sessions/getSession.ts b/src/queries/analytics/sessions/getSession.tssimilarity index 100%rename from queries/analytics/sessions/getSession.tsrename to src/queries/analytics/sessions/getSession.tsdiff --git a/queries/analytics/sessions/getSessionMetrics.ts b/src/queries/analytics/sessions/getSessionMetrics.tssimilarity index 100%rename from queries/analytics/sessions/getSessionMetrics.tsrename to src/queries/analytics/sessions/getSessionMetrics.tsdiff --git a/queries/analytics/sessions/getSessionStats.ts b/src/queries/analytics/sessions/getSessionStats.tssimilarity index 100%rename from queries/analytics/sessions/getSessionStats.tsrename to src/queries/analytics/sessions/getSessionStats.tsdiff --git a/queries/analytics/sessions/getSessions.ts b/src/queries/analytics/sessions/getSessions.tssimilarity index 100%rename from queries/analytics/sessions/getSessions.tsrename to src/queries/analytics/sessions/getSessions.tsdiff --git a/queries/analytics/sessions/saveSessionData.ts b/src/queries/analytics/sessions/saveSessionData.tssimilarity index 100%rename from queries/analytics/sessions/saveSessionData.tsrename to src/queries/analytics/sessions/saveSessionData.tsdiff --git a/queries/index.js b/src/queries/index.jssimilarity index 100%rename from queries/index.jsrename to src/queries/index.jsdiff --git a/store/app.js b/src/store/app.jssimilarity index 100%rename from store/app.jsrename to src/store/app.jsdiff --git a/store/dashboard.js b/src/store/dashboard.jssimilarity index 100%rename from store/dashboard.jsrename to src/store/dashboard.jsdiff --git a/store/queries.js b/src/store/queries.jssimilarity index 100%rename from store/queries.jsrename to src/store/queries.jsdiff --git a/store/version.js b/src/store/version.jssimilarity index 100%rename from store/version.jsrename to src/store/version.jsdiff --git a/store/websites.ts b/src/store/websites.tssimilarity index 100%rename from store/websites.tsrename to src/store/websites.tsdiff --git a/styles/index.css b/src/styles/index.csssimilarity index 100%rename from styles/index.cssrename to src/styles/index.cssdiff --git a/styles/locale.css b/src/styles/locale.csssimilarity index 100%rename from styles/locale.cssrename to src/styles/locale.cssdiff --git a/styles/variables.css b/src/styles/variables.csssimilarity index 100%rename from styles/variables.cssrename to src/styles/variables.cssdiff --git a/tracker/index.d.ts b/src/tracker/index.d.tssimilarity index 100%rename from tracker/index.d.tsrename to src/tracker/index.d.tsdiff --git a/tracker/index.js b/src/tracker/index.jssimilarity index 100%rename from tracker/index.jsrename to src/tracker/index.jsdiff --git a/tsconfig.json b/tsconfig.jsonindex b022d603e..78b225f49 100644--- a/tsconfig.json+++ b/tsconfig.json@@ -6,7 +6,6 @@"moduleResolution": "node","resolveJsonModule": true,"isolatedModules": true,- "incremental": true,"lib": ["dom", "dom.iterable", "esnext"],"skipLibCheck": true,"esModuleInterop": true,@@ -18,10 +17,11 @@"forceConsistentCasingInFileNames": true,"allowJs": true,"strict": true,- "baseUrl": ".",+ "baseUrl": "./src","strictNullChecks": false,"noEmit": true,- "jsx": "preserve"+ "jsx": "preserve",+ "incremental": true},"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"],"exclude": ["node_modules"]diff --git a/yarn.lock b/yarn.lockindex e18f833ca..fead5bc58 100644--- a/yarn.lock+++ b/yarn.lock@@ -15,13 +15,21 @@"@jridgewell/gen-mapping" "^0.3.0""@jridgewell/trace-mapping" "^0.3.9"-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.18.6", "@babel/code-frame@^7.22.5":+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.22.5":version "7.22.5"resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.5.tgz"integrity sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ==dependencies:"@babel/highlight" "^7.22.5"+"@babel/code-frame@^7.22.10":+ version "7.22.10"+ resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.22.10.tgz#1c20e612b768fefa75f6e90d6ecb86329247f0a3"+ integrity sha512-/KKIMG4UEL35WmI9OlvMhurwtytjvXoFcGNrOvyG9zIzA8YmPjVtIZUf7b05+TPO7G7/GEmLHDaoCgACHl9hhA==+ dependencies:+ "@babel/highlight" "^7.22.10"+ chalk "^2.4.2"+"@babel/compat-data@^7.17.7", "@babel/compat-data@^7.20.5", "@babel/compat-data@^7.21.4", "@babel/compat-data@^7.22.5":version "7.22.5"resolved "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.5.tgz"@@ -301,6 +309,15 @@"@babel/traverse" "^7.22.5""@babel/types" "^7.22.5"+"@babel/highlight@^7.22.10":+ version "7.22.10"+ resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.10.tgz#02a3f6d8c1cb4521b2fd0ab0da8f4739936137d7"+ integrity sha512-78aUtVcT7MUscr0K5mIEnkwxPE0MaxkR5RxRwuHaQ+JuU5AmTPhY+do2mdzVTnIJJpyBglql2pehuBIWHug+WQ==+ dependencies:+ "@babel/helper-validator-identifier" "^7.22.5"+ chalk "^2.4.2"+ js-tokens "^4.0.0"+"@babel/highlight@^7.22.5":version "7.22.5"resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.5.tgz#aa6c05c5407a67ebce408162b7ede789b4d22031"@@ -1550,7 +1567,7 @@resolved "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz"integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==-"@jridgewell/sourcemap-codec@^1.4.13":+"@jridgewell/sourcemap-codec@^1.4.13", "@jridgewell/sourcemap-codec@^1.4.15":version "1.4.15"resolved "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz"integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==@@ -1969,19 +1986,19 @@dependencies:slash "^4.0.0"-"@rollup/plugin-buble@^0.21.3":- version "0.21.3"- resolved "https://registry.npmjs.org/@rollup/plugin-buble/-/plugin-buble-0.21.3.tgz"- integrity sha512-Iv8cCuFPnMdqV4pcyU+OrfjOfagPArRQ1PyQjx5KgHk3dARedI+8PNTLSMpJts0lQJr8yF2pAU4GxpxCBJ9HYw==+"@rollup/plugin-buble@^1.0.2":+ version "1.0.2"+ resolved "https://registry.yarnpkg.com/@rollup/plugin-buble/-/plugin-buble-1.0.2.tgz#30af390341b0888490f781fcf17e469198d118a2"+ integrity sha512-Hz9+AigRWwS93vmorrVrhyG9SdSCZAkBDx614w09iFQYFUAP2HmdUrQyZsb1WO2n+iDvPFznrTE16la+eGNcEQ==dependencies:- "@rollup/pluginutils" "^3.0.8"+ "@rollup/pluginutils" "^5.0.1""@types/buble" "^0.19.2"buble "^0.20.0"-"@rollup/plugin-commonjs@^24.1.0":- version "24.1.0"- resolved "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-24.1.0.tgz"- integrity sha512-eSL45hjhCWI0jCCXcNtLVqM5N1JlBGvlFfY0m6oOYnLCJ6N0qEXoZql4sY2MOUArzhH4SA/qBpTxvvZp2Sc+DQ==+"@rollup/plugin-commonjs@^25.0.4":+ version "25.0.4"+ resolved "https://registry.yarnpkg.com/@rollup/plugin-commonjs/-/plugin-commonjs-25.0.4.tgz#a7547a0c4ec3fa79818eb313e1de0023e548f4e6"+ integrity sha512-L92Vz9WUZXDnlQQl3EwbypJR4+DM2EbsO+/KOcEkP4Mc6Ct453EeDB2uH9lgRwj4w5yflgNpq9pHOiY8aoUXBQ==dependencies:"@rollup/pluginutils" "^5.0.1"commondir "^1.0.1"@@ -1992,15 +2009,15 @@"@rollup/plugin-json@^6.0.0":version "6.0.0"- resolved "https://registry.npmjs.org/@rollup/plugin-json/-/plugin-json-6.0.0.tgz"+ resolved "https://registry.yarnpkg.com/@rollup/plugin-json/-/plugin-json-6.0.0.tgz#199fea6670fd4dfb1f4932250569b14719db234a"integrity sha512-i/4C5Jrdr1XUarRhVu27EEwjt4GObltD7c+MkCIpO2QIbojw8MUs+CCTqOphQi3Qtg1FLmYt+l+6YeoIf51J7w==dependencies:"@rollup/pluginutils" "^5.0.1"-"@rollup/plugin-node-resolve@^15.0.2":- version "15.1.0"- resolved "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.1.0.tgz"- integrity sha512-xeZHCgsiZ9pzYVgAo9580eCGqwh/XCEUM9q6iQfGNocjgkufHAqC3exA+45URvhiYV8sBF9RlBai650eNs7AsA==+"@rollup/plugin-node-resolve@^15.2.0":+ version "15.2.0"+ resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.2.0.tgz#982053b237f81471aace570472e88a456d211621"+ integrity sha512-mKur03xNGT8O9ODO6FtT43ITGqHWZbKPdVJHZb+iV9QYcdlhUUB0wgknvA4KCUmC5oHJF6O2W1EgmyOQyVUI4Q==dependencies:"@rollup/pluginutils" "^5.0.1""@types/resolve" "1.20.2"@@ -2009,22 +2026,13 @@is-module "^1.0.0"resolve "^1.22.1"-"@rollup/plugin-replace@^4.0.0":- version "4.0.0"- resolved "https://registry.npmjs.org/@rollup/plugin-replace/-/plugin-replace-4.0.0.tgz"- integrity sha512-+rumQFiaNac9y64OHtkHGmdjm7us9bo1PlbgQfdihQtuNxzjpaB064HbRnewUOggLQxVCCyINfStkgmBeQpv1g==- dependencies:- "@rollup/pluginutils" "^3.1.0"- magic-string "^0.25.7"--"@rollup/pluginutils@^3.0.8", "@rollup/pluginutils@^3.1.0":- version "3.1.0"- resolved "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz"- integrity sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==+"@rollup/plugin-replace@^5.0.2":+ version "5.0.2"+ resolved "https://registry.yarnpkg.com/@rollup/plugin-replace/-/plugin-replace-5.0.2.tgz#45f53501b16311feded2485e98419acb8448c61d"+ integrity sha512-M9YXNekv/C/iHHK+cvORzfRYfPbq0RDD8r0G+bMiTXjNGKulPnCT9O3Ss46WfhI6ZOCgApOP7xAdmCQJ+U2LAA==dependencies:- "@types/estree" "0.0.39"- estree-walker "^1.0.1"- picomatch "^2.2.2"+ "@rollup/pluginutils" "^5.0.1"+ magic-string "^0.27.0""@rollup/pluginutils@^5.0.1", "@rollup/pluginutils@^5.0.2":version "5.0.2"@@ -2040,75 +2048,99 @@resolved "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.2.0.tgz"integrity sha512-sXo/qW2/pAcmT43VoRKOJbDOfV3cYpq3szSVfIThQXNt+E4DfKj361vaAt3c88U5tPUxzEswam7GW48PJqtKAg==+"@svgr/[email protected]":+ version "8.0.0"+ 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-add-jsx-attribute@^7.0.0":- version "7.0.0"- resolved "https://registry.npmjs.org/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-7.0.0.tgz"- integrity sha512-khWbXesWIP9v8HuKCl2NU2HNAyqpSQ/vkIl36Nbn4HIwEYSRWL0H7Gs6idJdha2DkpFDWlsqMELvoCE8lfFY6Q==--"@svgr/babel-plugin-remove-jsx-attribute@*", "@svgr/babel-plugin-remove-jsx-attribute@^7.0.0":+"@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/babel-plugin-remove-jsx-empty-expression@*", "@svgr/babel-plugin-remove-jsx-empty-expression@^7.0.0":+"@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"+ integrity sha512-5BcGCBfBxB5+XSDSWnhTThfI9jcO5f0Ai2V24gZpG+wXF14BzwxxdDb4g6trdOux0rhibGs385BeFMSmxtS3uA==++"@svgr/[email protected]":+ version "8.0.0"+ 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/babel-plugin-replace-jsx-attribute-value@^7.0.0":- version "7.0.0"- resolved "https://registry.npmjs.org/@svgr/babel-plugin-replace-jsx-attribute-value/-/babel-plugin-replace-jsx-attribute-value-7.0.0.tgz"- integrity sha512-i6MaAqIZXDOJeikJuzocByBf8zO+meLwfQ/qMHIjCcvpnfvWf82PFvredEZElErB5glQFJa2KVKk8N2xV6tRRA==+"@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/babel-plugin-svg-dynamic-title@^7.0.0":- version "7.0.0"- resolved "https://registry.npmjs.org/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-7.0.0.tgz"- integrity sha512-BoVSh6ge3SLLpKC0pmmN9DFlqgFy4NxNgdZNLPNJWBUU7TQpDWeBuyVuDW88iXydb5Cv0ReC+ffa5h3VrKfk1w==+"@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/babel-plugin-svg-em-dimensions@^7.0.0":- version "7.0.0"- resolved "https://registry.npmjs.org/@svgr/babel-plugin-svg-em-dimensions/-/babel-plugin-svg-em-dimensions-7.0.0.tgz"- integrity sha512-tNDcBa+hYn0gO+GkP/AuNKdVtMufVhU9fdzu+vUQsR18RIJ9RWe7h/pSBY338RO08wArntwbDk5WhQBmhf2PaA==+"@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/babel-plugin-transform-react-native-svg@^7.0.0":- version "7.0.0"- resolved "https://registry.npmjs.org/@svgr/babel-plugin-transform-react-native-svg/-/babel-plugin-transform-react-native-svg-7.0.0.tgz"- integrity sha512-qw54u8ljCJYL2KtBOjI5z7Nzg8LnSvQOP5hPKj77H4VQL4+HdKbAT5pnkkZLmHKYwzsIHSYKXxHouD8zZamCFQ==+"@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/babel-plugin-transform-svg-component@^7.0.0":- version "7.0.0"- resolved "https://registry.npmjs.org/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-7.0.0.tgz"- integrity sha512-CcFECkDj98daOg9jE3Bh3uyD9kzevCAnZ+UtzG6+BQG/jOQ2OA3jHnX6iG4G1MCJkUQFnUvEv33NvQfqrb/F3A==+"@svgr/[email protected]":+ version "8.1.0"+ resolved "https://registry.yarnpkg.com/@svgr/babel-preset/-/babel-preset-8.1.0.tgz#0e87119aecdf1c424840b9d4565b7137cabf9ece"+ integrity sha512-7EYDbHE7MxHpv4sxvnVPngw5fuR6pw79SkcrILHJ/iMpuKySNCl5W1qcwPEpU+LgyRXOaAFgH0KhwD18wwg6ug==+ dependencies:+ "@svgr/babel-plugin-add-jsx-attribute" "8.0.0"+ "@svgr/babel-plugin-remove-jsx-attribute" "8.0.0"+ "@svgr/babel-plugin-remove-jsx-empty-expression" "8.0.0"+ "@svgr/babel-plugin-replace-jsx-attribute-value" "8.0.0"+ "@svgr/babel-plugin-svg-dynamic-title" "8.0.0"+ "@svgr/babel-plugin-svg-em-dimensions" "8.0.0"+ "@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"@@ -2124,19 +2156,16 @@"@svgr/babel-plugin-transform-react-native-svg" "^6.5.1""@svgr/babel-plugin-transform-svg-component" "^6.5.1"-"@svgr/babel-preset@^7.0.0":- version "7.0.0"- resolved "https://registry.npmjs.org/@svgr/babel-preset/-/babel-preset-7.0.0.tgz"- integrity sha512-EX/NHeFa30j5UjldQGVQikuuQNHUdGmbh9kEpBKofGUtF0GUPJ4T4rhoYiqDAOmBOxojyot36JIFiDUHUK1ilQ==- dependencies:- "@svgr/babel-plugin-add-jsx-attribute" "^7.0.0"- "@svgr/babel-plugin-remove-jsx-attribute" "^7.0.0"- "@svgr/babel-plugin-remove-jsx-empty-expression" "^7.0.0"- "@svgr/babel-plugin-replace-jsx-attribute-value" "^7.0.0"- "@svgr/babel-plugin-svg-dynamic-title" "^7.0.0"- "@svgr/babel-plugin-svg-em-dimensions" "^7.0.0"- "@svgr/babel-plugin-transform-react-native-svg" "^7.0.0"- "@svgr/babel-plugin-transform-svg-component" "^7.0.0"+"@svgr/[email protected]":+ version "8.1.0"+ resolved "https://registry.yarnpkg.com/@svgr/core/-/core-8.1.0.tgz#41146f9b40b1a10beaf5cc4f361a16a3c1885e88"+ integrity sha512-8QqtOQT5ACVlmsvKOJNEaWmRPmcojMOzCz4Hs2BGG/toAp/K38LcsMRyLp349glq5AzJbCEeimEoxaX6v/fLrA==+ dependencies:+ "@babel/core" "^7.21.3"+ "@svgr/babel-preset" "8.1.0"+ camelcase "^6.2.0"+ cosmiconfig "^8.1.3"+ snake-case "^3.0.4""@svgr/core@^6.5.1":version "6.5.1"@@ -2149,15 +2178,13 @@camelcase "^6.2.0"cosmiconfig "^7.0.1"-"@svgr/core@^7.0.0":- version "7.0.0"- resolved "https://registry.npmjs.org/@svgr/core/-/core-7.0.0.tgz"- integrity sha512-ztAoxkaKhRVloa3XydohgQQCb0/8x9T63yXovpmHzKMkHO6pkjdsIAWKOS4bE95P/2quVh1NtjSKlMRNzSBffw==+"@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"+ integrity sha512-EbDKwO9GpfWP4jN9sGdYwPBU0kdomaPIL2Eu4YwmgP+sJeXT+L7bMwJUBnhzfH8Q2qMBqZ4fJwpCyYsAN3mt2Q==dependencies:- "@babel/core" "^7.21.3"- "@svgr/babel-preset" "^7.0.0"- camelcase "^6.2.0"- cosmiconfig "^8.1.3"+ "@babel/types" "^7.21.3"+ entities "^4.4.0""@svgr/hast-util-to-babel-ast@^6.5.1":version "6.5.1"@@ -2167,13 +2194,15 @@"@babel/types" "^7.20.0"entities "^4.4.0"-"@svgr/hast-util-to-babel-ast@^7.0.0":- version "7.0.0"- resolved "https://registry.npmjs.org/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-7.0.0.tgz"- integrity sha512-42Ej9sDDEmsJKjrfQ1PHmiDiHagh/u9AHO9QWbeNx4KmD9yS5d1XHmXUNINfUcykAU+4431Cn+k6Vn5mWBYimQ==+"@svgr/[email protected]":+ version "8.1.0"+ resolved "https://registry.yarnpkg.com/@svgr/plugin-jsx/-/plugin-jsx-8.1.0.tgz#96969f04a24b58b174ee4cd974c60475acbd6928"+ integrity sha512-0xiIyBsLlr8quN+WyuxooNW9RJ0Dpr8uOnH/xrCVO8GLUcwHISwj1AG0k+LFzteTkAA0GbX0kj9q6Dk70PTiPA==dependencies:- "@babel/types" "^7.21.3"- entities "^4.4.0"+ "@babel/core" "^7.21.3"+ "@svgr/babel-preset" "8.1.0"+ "@svgr/hast-util-to-babel-ast" "8.0.0"+ svg-parser "^2.0.4""@svgr/plugin-jsx@^6.5.1":version "6.5.1"@@ -2185,15 +2214,14 @@"@svgr/hast-util-to-babel-ast" "^6.5.1"svg-parser "^2.0.4"-"@svgr/plugin-jsx@^7.0.0":- version "7.0.0"- resolved "https://registry.npmjs.org/@svgr/plugin-jsx/-/plugin-jsx-7.0.0.tgz"- integrity sha512-SWlTpPQmBUtLKxXWgpv8syzqIU8XgFRvyhfkam2So8b3BE0OS0HPe5UfmlJ2KIC+a7dpuuYovPR2WAQuSyMoPw==+"@svgr/[email protected]":+ version "8.1.0"+ resolved "https://registry.yarnpkg.com/@svgr/plugin-svgo/-/plugin-svgo-8.1.0.tgz#b115b7b967b564f89ac58feae89b88c3decd0f00"+ integrity sha512-Ywtl837OGO9pTLIN/onoWLmDQ4zFUycI1g76vuKGEz6evR/ZTJlJuz3G/fIkb6OVBJ2g0o6CGJzaEjfmEo3AHA==dependencies:- "@babel/core" "^7.21.3"- "@svgr/babel-preset" "^7.0.0"- "@svgr/hast-util-to-babel-ast" "^7.0.0"- svg-parser "^2.0.4"+ cosmiconfig "^8.1.3"+ deepmerge "^4.3.1"+ svgo "^3.0.2""@svgr/plugin-svgo@^6.5.1":version "6.5.1"@@ -2204,19 +2232,10 @@deepmerge "^4.2.2"svgo "^2.8.0"-"@svgr/plugin-svgo@^7.0.0":- version "7.0.0"- resolved "https://registry.npmjs.org/@svgr/plugin-svgo/-/plugin-svgo-7.0.0.tgz"- integrity sha512-263znzlu3qTKj71/ot5G9l2vpL4CW+pr2IexBFIwwB+fRAXE9Xnw2rUFgE6P4+37N9siOuC4lKkgBfUCOLFRKQ==- dependencies:- cosmiconfig "^8.1.3"- deepmerge "^4.3.1"- svgo "^3.0.2"--"@svgr/rollup@^7.0.0":- version "7.0.0"- resolved "https://registry.npmjs.org/@svgr/rollup/-/rollup-7.0.0.tgz"- integrity sha512-zlx0lxtxTnrXFF+ISuff+hht2XcWXa6uXEliwQbz+o0/qRIrcqyB9ShalO9ekVWB5icgxCWQ5lDaULJTt/pTlA==+"@svgr/rollup@^8.1.0":+ version "8.1.0"+ resolved "https://registry.yarnpkg.com/@svgr/rollup/-/rollup-8.1.0.tgz#2c8e09655336cda4b7843799a5d2a5860300b030"+ integrity sha512-0XR1poYvPQoPpmfDYLEqUGu5ePAQ4pdgN3VFsZBNAeze7qubVpsIY1o1R6PZpKep/DKu33GSm2NhwpCLkMs2Cw==dependencies:"@babel/core" "^7.21.3""@babel/plugin-transform-react-constant-elements" "^7.21.3"@@ -2224,9 +2243,9 @@"@babel/preset-react" "^7.18.6""@babel/preset-typescript" "^7.21.0""@rollup/pluginutils" "^5.0.2"- "@svgr/core" "^7.0.0"- "@svgr/plugin-jsx" "^7.0.0"- "@svgr/plugin-svgo" "^7.0.0"+ "@svgr/core" "8.1.0"+ "@svgr/plugin-jsx" "8.1.0"+ "@svgr/plugin-svgo" "8.1.0""@svgr/webpack@^6.2.1":version "6.5.1"@@ -2332,16 +2351,18 @@resolved "https://registry.npmjs.org/@types/estree/-/estree-1.0.1.tgz"integrity sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA==-"@types/[email protected]":- version "0.0.39"- resolved "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz"- integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==-"@types/estree@^0.0.50":version "0.0.50"resolved "https://registry.npmjs.org/@types/estree/-/estree-0.0.50.tgz"integrity sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==+"@types/fs-extra@^8.0.1":+ version "8.1.2"+ resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-8.1.2.tgz#7125cc2e4bdd9bd2fc83005ffdb1d0ba00cca61f"+ integrity sha512-SvSrYXfWSc7R4eqnOzbQF4TZmfpNSM9FrSWLU3EUnWBuyZqNBOrv1B1JA3byUDPUl9z4Ab3jeZG2eDdySlgNMg==+ dependencies:+ "@types/node" "*"+"@types/fs-extra@^9.0.1":version "9.0.13"resolved "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.13.tgz"@@ -2410,6 +2431,11 @@resolved "https://registry.npmjs.org/@types/node/-/node-17.0.38.tgz"integrity sha512-5jY9RhV7c0Z4Jy09G+NIDTsCZ5G0L5n+Z+p+Y7t5VJHM30bgwzSjVtlcBxqAj+6L/swIlvtOSzr8rBk/aNyV2g==+"@types/node@^18.11.9":+ version "18.17.6"+ resolved "https://registry.yarnpkg.com/@types/node/-/node-18.17.6.tgz#0296e9a30b22d2a8fcaa48d3c45afe51474ca55b"+ integrity sha512-fGmT/P7z7ecA6bv/ia5DlaWCH4YeZvAQMNpUhrJjtAhOhZfoxS1VLUgU2pdk63efSjQaOJWdXMuAJsws+8I6dg==+"@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"@@ -2425,6 +2451,13 @@resolved "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz"integrity sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==+"@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==+ dependencies:+ "@types/react" "*"+"@types/react-redux@^7.1.20":version "7.1.24"resolved "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.24.tgz"@@ -2444,6 +2477,15 @@"@types/scheduler" "*"csstype "^3.0.2"+"@types/react@^18.0.25":+ version "18.2.20"+ resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.20.tgz#1605557a83df5c8a2cc4eeb743b3dfc0eb6aaeb2"+ integrity sha512-WKNtmsLWJM/3D5mG4U84cysVY31ivmyw85dE84fOCk5Hx78wezB/XEjVPWl2JTZ5FkEeaTJf+VgUAUn3PE7Isw==+ dependencies:+ "@types/prop-types" "*"+ "@types/scheduler" "*"+ csstype "^3.0.2"+"@types/[email protected]":version "1.20.2"resolved "https://registry.npmjs.org/@types/resolve/-/resolve-1.20.2.tgz"@@ -3432,7 +3474,7 @@ 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.4.0:+colorette@^1.1.0, colorette@^1.4.0:version "1.4.0"resolved "https://registry.npmjs.org/colorette/-/colorette-1.4.0.tgz"integrity sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==@@ -4097,6 +4139,14 @@ domutils@^3.0.1:domelementtype "^2.3.0"domhandler "^5.0.1"+dot-case@^3.0.4:+ version "3.0.4"+ resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.4.tgz#9b2b670d00a431667a8a75ba29cd1b98809ce751"+ integrity sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==+ dependencies:+ no-case "^3.0.4"+ tslib "^2.0.3"+dotenv@^10.0.0:version "10.0.0"resolved "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz"@@ -4560,11 +4610,6 @@ estree-walker@^0.6.1:resolved "https://registry.npmjs.org/estree-walker/-/estree-walker-0.6.1.tgz"integrity sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==-estree-walker@^1.0.1:- version "1.0.1"- resolved "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz"- integrity sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==-estree-walker@^2.0.2:version "2.0.2"resolved "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz"@@ -4822,6 +4867,15 @@ fs-extra@^11.0.0:jsonfile "^6.0.1"universalify "^2.0.0"+fs-extra@^8.1.0:+ version "8.1.0"+ resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"+ integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==+ dependencies:+ graceful-fs "^4.2.0"+ jsonfile "^4.0.0"+ universalify "^0.1.0"+fs-extra@^9.0.0:version "9.1.0"resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz"@@ -5020,6 +5074,20 @@ [email protected]:resolved "https://registry.yarnpkg.com/globalyzer/-/globalyzer-0.1.0.tgz#cb76da79555669a1519d5a8edf093afaa0bf1465"integrity sha512-40oNTM9UfG6aBmuKxk/giHn5nQ8RVz/SS4Ir6zgzOv9/qC3kKZ9v4etGTcJbEl/NyVQH7FGU7d+X1egr57Md2Q==+ version "10.0.1"+ resolved "https://registry.yarnpkg.com/globby/-/globby-10.0.1.tgz#4782c34cb75dd683351335c5829cc3420e606b22"+ integrity sha512-sSs4inE1FB2YQiymcmTv6NWENryABjUNPeWhOvmn4SjtKybglsyPZxFB3U1/+L1bYi0rNZDqCLlHyLYDl1Pq5A==+ dependencies:+ "@types/glob" "^7.1.1"+ array-union "^2.1.0"+ dir-glob "^3.0.1"+ fast-glob "^3.0.3"+ glob "^7.1.3"+ ignore "^5.1.1"+ merge2 "^1.2.3"+ slash "^3.0.0"+globby@^10.0.1:version "10.0.2"resolved "https://registry.npmjs.org/globby/-/globby-10.0.2.tgz"@@ -5532,6 +5600,11 @@ is-plain-obj@^2.0.0:resolved "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz"integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==+is-plain-object@^3.0.0:+ version "3.0.1"+ resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-3.0.1.tgz#662d92d24c0aa4302407b0d45d21f2251c85f85b"+ integrity sha512-Xnpx182SBMrr/aBik8y+GuR4U1L9FqMSojwDQwPMmxyC6bvEqly9UBCxhauBF5vNh2gwWJNX6oDV7O+OM4z34g==+is-plain-object@^5.0.0:version "5.0.0"resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344"@@ -5752,6 +5825,13 @@ jsonc-parser@^3.2.0:resolved "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz"integrity sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==+jsonfile@^4.0.0:+ version "4.0.0"+ resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"+ integrity sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==+ optionalDependencies:+ graceful-fs "^4.1.6"+jsonfile@^6.0.1:version "6.1.0"resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae"@@ -6041,6 +6121,13 @@ loud-rejection@^2.2.0:currently-unhandled "^0.4.1"signal-exit "^3.0.2"+lower-case@^2.0.2:+ version "2.0.2"+ resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.2.tgz#6fa237c63dbdc4a82ca0fd882e4722dc5e634e28"+ integrity sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==+ dependencies:+ tslib "^2.0.3"+lru-cache@^10.0.0:version "10.0.0"resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.0.0.tgz#b9e2a6a72a129d81ab317202d93c7691df727e61"@@ -6074,12 +6161,12 @@ magic-string@^0.27.0:dependencies:"@jridgewell/sourcemap-codec" "^1.4.13"-magic-string@^0.30.0:- version "0.30.0"- resolved "https://registry.npmjs.org/magic-string/-/magic-string-0.30.0.tgz"- integrity sha512-LA+31JYDJLs82r2ScLrlz1GjSgu66ZV518eyWT+S8VhyQn/JL0u9MeBOvQMGYiPk1DBiSN9DDMOcXvigJZaViQ==+magic-string@^0.30.2:+ version "0.30.2"+ resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.2.tgz#dcf04aad3d0d1314bc743d076c50feb29b3c7aca"+ integrity sha512-lNZdu7pewtq/ZvWUp9Wpf/x7WzMTsR26TWV03BRZrXFsv+BI6dy8RAiKgm1uM/kyR0rCfUcqvOlXKG66KhIGug==dependencies:- "@jridgewell/sourcemap-codec" "^1.4.13"+ "@jridgewell/sourcemap-codec" "^1.4.15"make-dir@^3.0.0:version "3.1.0"@@ -6407,6 +6494,14 @@ nice-try@^1.0.4:resolved "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz"integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==+no-case@^3.0.4:+ version "3.0.4"+ resolved "https://registry.yarnpkg.com/no-case/-/no-case-3.0.4.tgz#d361fd5c9800f558551a8369fc0dcd4662b6124d"+ integrity sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==+ dependencies:+ lower-case "^2.0.2"+ tslib "^2.0.3"+node-abi@^3.3.0:version "3.45.0"resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.45.0.tgz#f568f163a3bfca5aacfce1fbeee1fa2cc98441f5"@@ -6788,7 +6883,7 @@ picocolors@^1.0.0:resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==-picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2, picomatch@^2.3.1:+picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1:version "2.3.1"resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==@@ -8023,6 +8118,17 @@ rimraf@^3.0.0, rimraf@^3.0.2:dependencies:glob "^7.1.3"+rollup-plugin-copy@^3.4.0:+ version "3.4.0"+ resolved "https://registry.yarnpkg.com/rollup-plugin-copy/-/rollup-plugin-copy-3.4.0.tgz#f1228a3ffb66ffad8606e2f3fb7ff23141ed3286"+ integrity sha512-rGUmYYsYsceRJRqLVlE9FivJMxJ7X6jDlP79fmFkL8sJs7VVMSVyA2yfyL+PGyO/vJs4A87hwhgVfz61njI+uQ==+ dependencies:+ "@types/fs-extra" "^8.0.1"+ colorette "^1.1.0"+ fs-extra "^8.1.0"+ globby "10.0.1"+ is-plain-object "^3.0.0"+rollup-plugin-delete@^2.0.0:version "2.0.0"resolved "https://registry.npmjs.org/rollup-plugin-delete/-/rollup-plugin-delete-2.0.0.tgz"@@ -8030,14 +8136,14 @@ rollup-plugin-delete@^2.0.0:dependencies:del "^5.1.0"-rollup-plugin-dts@^5.3.0:- version "5.3.0"- resolved "https://registry.npmjs.org/rollup-plugin-dts/-/rollup-plugin-dts-5.3.0.tgz"- integrity sha512-8FXp0ZkyZj1iU5klkIJYLjIq/YZSwBoERu33QBDxm/1yw5UU4txrEtcmMkrq+ZiKu3Q4qvPCNqc3ovX6rjqzbQ==+rollup-plugin-dts@^6.0.0:+ version "6.0.0"+ resolved "https://registry.yarnpkg.com/rollup-plugin-dts/-/rollup-plugin-dts-6.0.0.tgz#c916072c20261c079344351bb5184f41e486a7b6"+ integrity sha512-A996xSZDAqnx/KfFttzC8mDEuyMjsRpiLCrlGc8effhK8KhE3AG0g1woQiITgFc5HSE8HWU7ccR9CiQ3vXgUlQ==dependencies:- magic-string "^0.30.0"+ magic-string "^0.30.2"optionalDependencies:- "@babel/code-frame" "^7.18.6"+ "@babel/code-frame" "^7.22.10"rollup-plugin-esbuild@^5.0.0:version "5.0.0"@@ -8050,10 +8156,10 @@ rollup-plugin-esbuild@^5.0.0:joycon "^3.1.1"jsonc-parser "^3.2.0"-rollup-plugin-node-externals@^5.1.2:- version "5.1.3"- resolved "https://registry.npmjs.org/rollup-plugin-node-externals/-/rollup-plugin-node-externals-5.1.3.tgz"- integrity sha512-Q3VMjsn39r0/mjKrX++rFlC7kwL7YZdScdyU7BEo+PrEremal3mnol/1X+wQUU++7NeqC1ZNAeRYnHGtsTu9GQ==+rollup-plugin-node-externals@^6.1.1:+ version "6.1.1"+ resolved "https://registry.yarnpkg.com/rollup-plugin-node-externals/-/rollup-plugin-node-externals-6.1.1.tgz#dff1a85073fe3c0b2c423b280259fe80392026a8"+ integrity sha512-127OFMkpH5rBVlRHRBDUMk1m1sGuzbGy7so5aj/IkpUb2r3+wOWjR/erUzd2ChEQWPsxsyQG6xpYYvPBAdcBRA==rollup-plugin-postcss@^4.0.2:version "4.0.2"@@ -8091,10 +8197,10 @@ rollup-pluginutils@^2.8.2:dependencies:estree-walker "^0.6.1"-rollup@^2.70.1:- version "2.79.1"- resolved "https://registry.npmjs.org/rollup/-/rollup-2.79.1.tgz"- integrity sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==+rollup@^3.28.0:+ version "3.28.0"+ resolved "https://registry.yarnpkg.com/rollup/-/rollup-3.28.0.tgz#a3c70004b01934760c0cb8df717c7a1d932389a2"+ integrity sha512-d7zhvo1OUY2SXSM6pfNjgD5+d0Nz87CUp4mt8l/GgVP3oBsPwzNvSzyu1me6BSG9JIgWNTVcafIXBIyM8yQ3yw==optionalDependencies:fsevents "~2.3.2"@@ -8339,6 +8445,14 @@ slice-ansi@^4.0.0:astral-regex "^2.0.0"is-fullwidth-code-point "^3.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"+ integrity sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==+ dependencies:+ dot-case "^3.0.4"+ tslib "^2.0.3"+sort-keys@^4.0.0:version "4.2.0"resolved "https://registry.npmjs.org/sort-keys/-/sort-keys-4.2.0.tgz"@@ -8940,6 +9054,11 @@ tslib@^2.0.1, tslib@^2.1.0:resolved "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz"integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==+tslib@^2.0.3:+ version "2.6.2"+ resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae"+ integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==+tslib@^2.4.0:version "2.5.0"resolved "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz"@@ -9052,11 +9171,16 @@ typedarray-to-buffer@^3.1.5:dependencies:is-typedarray "^1.0.0"-typescript@^4.0, typescript@^4.5, typescript@^4.9.5:+typescript@^4.0, typescript@^4.5:version "4.9.5"resolved "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz"integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==+typescript@^5.1.6:+ version "5.1.6"+ resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.1.6.tgz#02f8ac202b6dad2c0dd5e0913745b47a37998274"+ integrity sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==+ufo@^1.0.0, ufo@^1.1.2:version "1.1.2"resolved "https://registry.yarnpkg.com/ufo/-/ufo-1.1.2.tgz#d0d9e0fa09dece0c31ffd57bd363f030a35cfe76"@@ -9128,6 +9252,11 @@ unicode-property-aliases-ecmascript@^2.0.0:resolved "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz"integrity sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==+universalify@^0.1.0:+ version "0.1.2"+ resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"+ integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==+universalify@^2.0.0:version "2.0.0"resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"