Merge branch 'dev' into feat/thumbnail-team-memory

src/app/(collect)/p/[slug]/route.ts

@@ -1,11 +1,11 @@
 export const dynamic = 'force-dynamic';
 
 import { NextResponse } from 'next/server';
-import { notFound } from '@/lib/response';
-import redis from '@/lib/redis';
-import { findPixel } from '@/queries/prisma';
-import { Pixel } from '@/generated/prisma/client';
 import { POST } from '@/app/api/send/route';
+import type { Pixel } from '@/generated/prisma/client';
+import redis from '@/lib/redis';
+import { notFound } from '@/lib/response';
+import { findPixel } from '@/queries/prisma';
 
 const image = Buffer.from('R0lGODlhAQABAIAAAP///wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw', 'base64');
 

src/app/(collect)/q/[slug]/route.ts

@@ -1,11 +1,11 @@
 export const dynamic = 'force-dynamic';
 
 import { NextResponse } from 'next/server';
+import { POST } from '@/app/api/send/route';
+import type { Link } from '@/generated/prisma/client';
+import redis from '@/lib/redis';
 import { notFound } from '@/lib/response';
 import { findLink } from '@/queries/prisma';
-import { POST } from '@/app/api/send/route';
-import { Link } from '@/generated/prisma/client';
-import redis from '@/lib/redis';
 
 export async function GET(request: Request, { params }: { params: Promise<{ slug: string }> }) {
   const { slug } = await params;

src/app/(main)/App.tsx

@@ -1,13 +1,13 @@
 'use client';
-import { Grid, Loading, Column, Row } from '@umami/react-zen';
+import { Column, Grid, Loading, Row } from '@umami/react-zen';
 import Script from 'next/script';
-import { UpdateNotice } from './UpdateNotice';
-import { SideNav } from '@/app/(main)/SideNav';
-import { useLoginQuery, useConfig, useNavigation } from '@/components/hooks';
-import { MobileNav } from '@/app/(main)/MobileNav';
 import { useEffect } from 'react';
-import { removeItem, setItem } from '@/lib/storage';
+import { MobileNav } from '@/app/(main)/MobileNav';
+import { SideNav } from '@/app/(main)/SideNav';
+import { useConfig, useLoginQuery, useNavigation } from '@/components/hooks';
 import { LAST_TEAM_CONFIG } from '@/lib/constants';
+import { removeItem, setItem } from '@/lib/storage';
+import { UpdateNotice } from './UpdateNotice';
 
 export function App({ children }) {
   const { user, isLoading, error } = useLoginQuery();
@@ -27,7 +27,9 @@ export function App({ children }) {
   }
 
   if (error) {
-    window.location.href = `${process.env.basePath || ''}/login`;
+    window.location.href = config.cloudMode
+      ? `${process.env.cloudUrl}/login`
+      : `${process.env.basePath || ''}/login`;
     return null;
   }
 

src/app/(main)/MobileNav.tsx

@@ -1,11 +1,11 @@
+import { Grid, IconLabel, NavMenu, NavMenuItem, Row, Text } from '@umami/react-zen';
+import Link from 'next/link';
 import { WebsiteNav } from '@/app/(main)/websites/[websiteId]/WebsiteNav';
 import { useMessages, useNavigation } from '@/components/hooks';
 import { Globe, Grid2x2, LinkIcon } from '@/components/icons';
 import { MobileMenuButton } from '@/components/input/MobileMenuButton';
 import { NavButton } from '@/components/input/NavButton';
 import { Logo } from '@/components/svg';
-import { Grid, IconLabel, NavMenu, NavMenuItem, Row, Text } from '@umami/react-zen';
-import Link from 'next/link';
 import { AdminNav } from './admin/AdminNav';
 import { SettingsNav } from './settings/SettingsNav';
 

src/app/(main)/SideNav.tsx

@@ -1,20 +1,20 @@
-import { Key } from 'react';
-import Link from 'next/link';
 import {
-  Sidebar,
-  SidebarSection,
-  SidebarItem,
-  SidebarHeader,
   Row,
-  SidebarProps,
+  Sidebar,
+  SidebarHeader,
+  SidebarItem,
+  type SidebarProps,
+  SidebarSection,
   ThemeButton,
 } from '@umami/react-zen';
-import { Globe, LinkIcon, Grid2x2, PanelLeft } from '@/components/icons';
-import { Logo } from '@/components/svg';
-import { useMessages, useNavigation, useGlobalState } from '@/components/hooks';
+import Link from 'next/link';
+import type { Key } from 'react';
+import { useGlobalState, useMessages, useNavigation } from '@/components/hooks';
+import { Globe, Grid2x2, LinkIcon, PanelLeft } from '@/components/icons';
+import { LanguageButton } from '@/components/input/LanguageButton';
 import { NavButton } from '@/components/input/NavButton';
 import { PanelButton } from '@/components/input/PanelButton';
-import { LanguageButton } from '@/components/input/LanguageButton';
+import { Logo } from '@/components/svg';
 
 export function SideNav(props: SidebarProps) {
   const { formatMessage, labels } = useMessages();

src/app/(main)/TopNav.tsx

@@ -1,4 +1,4 @@
-import { ThemeButton, Row } from '@umami/react-zen';
+import { Row, ThemeButton } from '@umami/react-zen';
 import { LanguageButton } from '@/components/input/LanguageButton';
 import { ProfileButton } from '@/components/input/ProfileButton';
 

src/app/(main)/UpdateNotice.tsx

@@ -1,10 +1,10 @@
-import { useEffect, useCallback, useState } from 'react';
-import { Button, AlertBanner, Column, Row } from '@umami/react-zen';
-import { setItem } from '@/lib/storage';
-import { useVersion, checkVersion } from '@/store/version';
-import { REPO_URL, VERSION_CHECK } from '@/lib/constants';
-import { useMessages } from '@/components/hooks';
+import { AlertBanner, Button, Column, Row } from '@umami/react-zen';
 import { usePathname } from 'next/navigation';
+import { useCallback, useEffect, useState } from 'react';
+import { useMessages } from '@/components/hooks';
+import { REPO_URL, VERSION_CHECK } from '@/lib/constants';
+import { setItem } from '@/lib/storage';
+import { checkVersion, useVersion } from '@/store/version';
 
 export function UpdateNotice({ user, config }) {
   const { formatMessage, labels, messages } = useMessages();

src/app/(main)/admin/AdminLayout.tsx

@@ -1,8 +1,8 @@
 'use client';
+import { Column, Grid } from '@umami/react-zen';
+import type { ReactNode } from 'react';
 import { PageBody } from '@/components/common/PageBody';
 import { useLoginQuery } from '@/components/hooks';
-import { Column, Grid } from '@umami/react-zen';
-import { ReactNode } from 'react';
 import { AdminNav } from './AdminNav';
 
 export function AdminLayout({ children }: { children: ReactNode }) {

src/app/(main)/admin/layout.tsx

@@ -1,4 +1,4 @@
-import { Metadata } from 'next';
+import type { Metadata } from 'next';
 import { AdminLayout } from './AdminLayout';
 
 export default function ({ children }) {

src/app/(main)/admin/teams/AdminTeamsDataTable.tsx

@@ -1,7 +1,7 @@
+import type { ReactNode } from 'react';
 import { DataGrid } from '@/components/common/DataGrid';
 import { useTeamsQuery } from '@/components/hooks';
 import { AdminTeamsTable } from './AdminTeamsTable';
-import { ReactNode } from 'react';
 
 export function AdminTeamsDataTable({
   showActions,

src/app/(main)/admin/teams/AdminTeamsPage.tsx

@@ -1,9 +1,9 @@
 'use client';
-import { AdminTeamsDataTable } from './AdminTeamsDataTable';
 import { Column } from '@umami/react-zen';
-import { useMessages } from '@/components/hooks';
 import { PageHeader } from '@/components/common/PageHeader';
 import { Panel } from '@/components/common/Panel';
+import { useMessages } from '@/components/hooks';
+import { AdminTeamsDataTable } from './AdminTeamsDataTable';
 
 export function AdminTeamsPage() {
   const { formatMessage, labels } = useMessages();

src/app/(main)/admin/teams/AdminTeamsTable.tsx

@@ -1,11 +1,11 @@
+import { DataColumn, DataTable, Dialog, Icon, MenuItem, Modal, Row, Text } from '@umami/react-zen';
+import Link from 'next/link';
+import { useState } from 'react';
 import { DateDistance } from '@/components/common/DateDistance';
 import { useMessages } from '@/components/hooks';
 import { Edit, Trash } from '@/components/icons';
 import { MenuButton } from '@/components/input/MenuButton';
-import { DataColumn, DataTable, Dialog, Icon, MenuItem, Modal, Row, Text } from '@umami/react-zen';
 import { TeamDeleteForm } from '../../teams/[teamId]/TeamDeleteForm';
-import Link from 'next/link';
-import { useState } from 'react';
 
 export function AdminTeamsTable({
   data = [],

src/app/(main)/admin/teams/[teamId]/page.tsx

@@ -1,5 +1,5 @@
+import type { Metadata } from 'next';
 import { AdminTeamPage } from './AdminTeamPage';
-import { Metadata } from 'next';
 
 export default async function ({ params }: { params: Promise<{ teamId: string }> }) {
   const { teamId } = await params;

src/app/(main)/admin/teams/page.tsx

@@ -1,4 +1,4 @@
-import { Metadata } from 'next';
+import type { Metadata } from 'next';
 import { AdminTeamsPage } from './AdminTeamsPage';
 
 export default function () {

src/app/(main)/admin/users/UserAddButton.tsx

@@ -1,7 +1,7 @@
-import { Button, Icon, Text, Modal, DialogTrigger, Dialog, useToast } from '@umami/react-zen';
-import { UserAddForm } from './UserAddForm';
+import { Button, Dialog, DialogTrigger, Icon, Modal, Text, useToast } from '@umami/react-zen';
 import { useMessages, useModified } from '@/components/hooks';
 import { Plus } from '@/components/icons';
+import { UserAddForm } from './UserAddForm';
 
 export function UserAddButton({ onSave }: { onSave?: () => void }) {
   const { formatMessage, labels, messages } = useMessages();

src/app/(main)/admin/users/UserAddForm.tsx

@@ -1,13 +1,13 @@
 import {
-  Select,
-  ListItem,
-  Form,
-  FormField,
-  FormButtons,
-  FormSubmitButton,
-  TextField,
-  PasswordField,
   Button,
+  Form,
+  FormButtons,
+  FormField,
+  FormSubmitButton,
+  ListItem,
+  PasswordField,
+  Select,
+  TextField,
 } from '@umami/react-zen';
 import { useMessages, useUpdateQuery } from '@/components/hooks';
 import { ROLES } from '@/lib/constants';

src/app/(main)/admin/users/UserDeleteButton.tsx

@@ -1,5 +1,5 @@
-import { Button, Icon, Modal, DialogTrigger, Dialog, Text } from '@umami/react-zen';
-import { useMessages, useLoginQuery } from '@/components/hooks';
+import { Button, Dialog, DialogTrigger, Icon, Modal, Text } from '@umami/react-zen';
+import { useLoginQuery, useMessages } from '@/components/hooks';
 import { Trash } from '@/components/icons';
 import { UserDeleteForm } from './UserDeleteForm';
 

src/app/(main)/admin/users/UsersDataTable.tsx

@@ -1,7 +1,7 @@
+import type { ReactNode } from 'react';
 import { DataGrid } from '@/components/common/DataGrid';
 import { useUsersQuery } from '@/components/hooks';
 import { UsersTable } from './UsersTable';
-import { ReactNode } from 'react';
 
 export function UsersDataTable({ showActions }: { showActions?: boolean; children?: ReactNode }) {
   const queryResult = useUsersQuery();

src/app/(main)/admin/users/UsersPage.tsx

@@ -1,10 +1,10 @@
 'use client';
-import { UsersDataTable } from './UsersDataTable';
 import { Column } from '@umami/react-zen';
-import { useMessages } from '@/components/hooks';
-import { UserAddButton } from './UserAddButton';
 import { PageHeader } from '@/components/common/PageHeader';
 import { Panel } from '@/components/common/Panel';
+import { useMessages } from '@/components/hooks';
+import { UserAddButton } from './UserAddButton';
+import { UsersDataTable } from './UsersDataTable';
 
 export function UsersPage() {
   const { formatMessage, labels } = useMessages();

src/app/(main)/admin/users/UsersTable.tsx

@@ -1,13 +1,12 @@
-import { useState } from 'react';
-import { Row, Text, Icon, DataTable, DataColumn, MenuItem, Modal } from '@umami/react-zen';
+import { DataColumn, DataTable, Icon, MenuItem, Modal, Row, Text } from '@umami/react-zen';
 import Link from 'next/link';
-import { ROLES } from '@/lib/constants';
-import { Trash } from '@/components/icons';
-import { useMessages } from '@/components/hooks';
-import { Edit } from '@/components/icons';
-import { MenuButton } from '@/components/input/MenuButton';
-import { UserDeleteForm } from './UserDeleteForm';
+import { useState } from 'react';
 import { DateDistance } from '@/components/common/DateDistance';
+import { useMessages } from '@/components/hooks';
+import { Edit, Trash } from '@/components/icons';
+import { MenuButton } from '@/components/input/MenuButton';
+import { ROLES } from '@/lib/constants';
+import { UserDeleteForm } from './UserDeleteForm';
 
 export function UsersTable({
   data = [],

src/app/(main)/admin/users/[userId]/UserEditForm.tsx

@@ -1,12 +1,12 @@
 import {
-  Select,
-  ListItem,
   Form,
-  FormField,
   FormButtons,
-  TextField,
+  FormField,
   FormSubmitButton,
+  ListItem,
   PasswordField,
+  Select,
+  TextField,
 } from '@umami/react-zen';
 import { useLoginQuery, useMessages, useUpdateQuery, useUser } from '@/components/hooks';
 import { ROLES } from '@/lib/constants';
@@ -30,7 +30,7 @@ export function UserEditForm({ userId, onSave }: { userId: string; onSave?: () =
   };
 
   return (
-    <Form onSubmit={handleSubmit} error={getMessage(error?.['code'])} values={user}>
+    <Form onSubmit={handleSubmit} error={getMessage(error?.code)} values={user}>
       <FormField name="username" label={formatMessage(labels.username)}>
         <TextField data-test="input-username" />
       </FormField>

src/app/(main)/admin/users/[userId]/UserHeader.tsx

@@ -1,6 +1,6 @@
-import { User } from '@/components/icons';
 import { PageHeader } from '@/components/common/PageHeader';
 import { useUser } from '@/components/hooks';
+import { User } from '@/components/icons';
 
 export function UserHeader() {
   const user = useUser();

src/app/(main)/admin/users/[userId]/UserPage.tsx

@@ -1,9 +1,9 @@
 'use client';
 import { Column } from '@umami/react-zen';
-import { UserSettings } from './UserSettings';
-import { UserProvider } from './UserProvider';
 import { UserHeader } from '@/app/(main)/admin/users/[userId]/UserHeader';
 import { Panel } from '@/components/common/Panel';
+import { UserProvider } from './UserProvider';
+import { UserSettings } from './UserSettings';
 
 export function UserPage({ userId }: { userId: string }) {
   return (

src/app/(main)/admin/users/[userId]/UserProvider.tsx

@@ -1,7 +1,7 @@
-import { createContext, ReactNode } from 'react';
 import { Loading } from '@umami/react-zen';
-import { User } from '@/generated/prisma/client';
+import { createContext, type ReactNode } from 'react';
 import { useUserQuery } from '@/components/hooks/queries/useUserQuery';
+import type { User } from '@/generated/prisma/client';
 
 export const UserContext = createContext<User>(null);
 

src/app/(main)/admin/users/[userId]/UserSettings.tsx

@@ -1,6 +1,6 @@
-import { Column, Tabs, Tab, TabList, TabPanel } from '@umami/react-zen';
-import { UserEditForm } from './UserEditForm';
+import { Column, Tab, TabList, TabPanel, Tabs } from '@umami/react-zen';
 import { useMessages } from '@/components/hooks';
+import { UserEditForm } from './UserEditForm';
 import { UserWebsites } from './UserWebsites';
 
 export function UserSettings({ userId }: { userId: string }) {

src/app/(main)/admin/users/[userId]/UserWebsites.tsx

@@ -1,6 +1,6 @@
+import { WebsitesTable } from '@/app/(main)/websites/WebsitesTable';
 import { DataGrid } from '@/components/common/DataGrid';
 import { useUserWebsitesQuery } from '@/components/hooks';
-import { WebsitesTable } from '@/app/(main)/websites/WebsitesTable';
 
 export function UserWebsites({ userId }) {
   const queryResult = useUserWebsitesQuery({ userId });

src/app/(main)/admin/users/[userId]/page.tsx

@@ -1,5 +1,5 @@
+import type { Metadata } from 'next';
 import { UserPage } from './UserPage';
-import { Metadata } from 'next';
 
 export default async function ({ params }: { params: Promise<{ userId: string }> }) {
   const { userId } = await params;

src/app/(main)/admin/users/page.tsx

@@ -1,4 +1,4 @@
-import { Metadata } from 'next';
+import type { Metadata } from 'next';
 import { UsersPage } from './UsersPage';
 
 export default function () {

src/app/(main)/admin/websites/AdminWebsitesPage.tsx

@@ -1,9 +1,9 @@
 'use client';
-import { AdminWebsitesDataTable } from './AdminWebsitesDataTable';
 import { Column } from '@umami/react-zen';
-import { useMessages } from '@/components/hooks';
 import { PageHeader } from '@/components/common/PageHeader';
 import { Panel } from '@/components/common/Panel';
+import { useMessages } from '@/components/hooks';
+import { AdminWebsitesDataTable } from './AdminWebsitesDataTable';
 
 export function AdminWebsitesPage() {
   const { formatMessage, labels } = useMessages();

src/app/(main)/admin/websites/AdminWebsitesTable.tsx

@@ -1,12 +1,11 @@
-import { useState } from 'react';
+import { DataColumn, DataTable, Dialog, Icon, MenuItem, Modal, Row, Text } from '@umami/react-zen';
 import Link from 'next/link';
-import { Row, Text, Icon, DataTable, DataColumn, MenuItem, Modal, Dialog } from '@umami/react-zen';
-import { Trash, Users } from '@/components/icons';
-import { useMessages } from '@/components/hooks';
-import { Edit } from '@/components/icons';
-import { MenuButton } from '@/components/input/MenuButton';
-import { DateDistance } from '@/components/common/DateDistance';
+import { useState } from 'react';
 import { WebsiteDeleteForm } from '@/app/(main)/websites/[websiteId]/settings/WebsiteDeleteForm';
+import { DateDistance } from '@/components/common/DateDistance';
+import { useMessages } from '@/components/hooks';
+import { Edit, Trash, Users } from '@/components/icons';
+import { MenuButton } from '@/components/input/MenuButton';
 
 export function AdminWebsitesTable({ data = [] }: { data: any[] }) {
   const { formatMessage, labels } = useMessages();

src/app/(main)/admin/websites/[websiteId]/page.tsx

@@ -1,4 +1,4 @@
-import { Metadata } from 'next';
+import type { Metadata } from 'next';
 import { WebsiteSettingsPage } from '@/app/(main)/settings/websites/[websiteId]/WebsiteSettingsPage';
 
 export default async function ({ params }: { params: Promise<{ websiteId: string }> }) {

src/app/(main)/admin/websites/page.tsx

@@ -1,4 +1,4 @@
-import { Metadata } from 'next';
+import type { Metadata } from 'next';
 import { AdminWebsitesPage } from './AdminWebsitesPage';
 
 export default function () {

src/app/(main)/boards/BoardAddButton.tsx

@@ -1,5 +1,5 @@
+import { Button, Dialog, DialogTrigger, Icon, Modal, Text, useToast } from '@umami/react-zen';
 import { useMessages, useModified, useNavigation } from '@/components/hooks';
-import { Button, Icon, Modal, Dialog, DialogTrigger, Text, useToast } from '@umami/react-zen';
 import { Plus } from '@/components/icons';
 import { BoardAddForm } from './BoardAddForm';
 

src/app/(main)/boards/BoardAddForm.tsx

@@ -1,5 +1,5 @@
-import { Form, FormField, FormSubmitButton, Row, TextField, Button } from '@umami/react-zen';
-import { useUpdateQuery, useMessages } from '@/components/hooks';
+import { Button, Form, FormField, FormSubmitButton, Row, TextField } from '@umami/react-zen';
+import { useMessages, useUpdateQuery } from '@/components/hooks';
 import { DOMAIN_REGEX } from '@/lib/constants';
 
 export function BoardAddForm({

src/app/(main)/boards/BoardsPage.tsx

@@ -1,7 +1,7 @@
 'use client';
 import { Column } from '@umami/react-zen';
-import { PageHeader } from '@/components/common/PageHeader';
 import { PageBody } from '@/components/common/PageBody';
+import { PageHeader } from '@/components/common/PageHeader';
 import { BoardAddButton } from './BoardAddButton';
 
 export function BoardsPage() {

src/app/(main)/boards/[boardId]/page.tsx

@@ -1,4 +1,4 @@
-import { Metadata } from 'next';
+import type { Metadata } from 'next';
 import { Board } from './Board';
 
 export default async function ({ params }: { params: Promise<{ boardId: string }> }) {

src/app/(main)/boards/page.tsx

@@ -1,4 +1,4 @@
-import { Metadata } from 'next';
+import type { Metadata } from 'next';
 import { BoardsPage } from './BoardsPage';
 
 export default function () {

src/app/(main)/console/[websiteId]/TestConsolePage.tsx

@@ -1,25 +1,25 @@
 'use client';
-import { Button, Grid, Column, Heading } from '@umami/react-zen';
+import { Button, Column, Grid, Heading } from '@umami/react-zen';
 import Link from 'next/link';
 import Script from 'next/script';
-import { Panel } from '@/components/common/Panel';
-import { PageBody } from '@/components/common/PageBody';
-import { EventsChart } from '@/components/metrics/EventsChart';
 import { WebsiteChart } from '@/app/(main)/websites/[websiteId]/WebsiteChart';
-import { useWebsiteQuery } from '@/components/hooks';
+import { PageBody } from '@/components/common/PageBody';
 import { PageHeader } from '@/components/common/PageHeader';
+import { Panel } from '@/components/common/Panel';
+import { useWebsiteQuery } from '@/components/hooks';
+import { EventsChart } from '@/components/metrics/EventsChart';
 
 export function TestConsolePage({ websiteId }: { websiteId: string }) {
   const { data } = useWebsiteQuery(websiteId);
 
   function handleRunScript() {
-    window['umami'].track(props => ({
+    window.umami.track(props => ({
       ...props,
       url: '/page-view',
       referrer: 'https://www.google.com',
     }));
-    window['umami'].track('track-event-no-data');
-    window['umami'].track('track-event-with-data', {
+    window.umami.track('track-event-no-data');
+    window.umami.track('track-event-with-data', {
       test: 'test-data',
       boolean: true,
       booleanError: 'true',
@@ -40,32 +40,32 @@ export function TestConsolePage({ websiteId }: { websiteId: string }) {
   }
 
   function handleRunRevenue() {
-    window['umami'].track(props => ({
+    window.umami.track(props => ({
       ...props,
       url: '/checkout-cart',
       referrer: 'https://www.google.com',
     }));
-    window['umami'].track('checkout-cart', {
+    window.umami.track('checkout-cart', {
       revenue: parseFloat((Math.random() * 1000).toFixed(2)),
       currency: 'USD',
     });
-    window['umami'].track('affiliate-link', {
+    window.umami.track('affiliate-link', {
       revenue: parseFloat((Math.random() * 1000).toFixed(2)),
       currency: 'USD',
     });
-    window['umami'].track('promotion-link', {
+    window.umami.track('promotion-link', {
       revenue: parseFloat((Math.random() * 1000).toFixed(2)),
       currency: 'USD',
     });
-    window['umami'].track('checkout-cart', {
+    window.umami.track('checkout-cart', {
       revenue: parseFloat((Math.random() * 1000).toFixed(2)),
       currency: 'EUR',
     });
-    window['umami'].track('promotion-link', {
+    window.umami.track('promotion-link', {
       revenue: parseFloat((Math.random() * 1000).toFixed(2)),
       currency: 'EUR',
     });
-    window['umami'].track('affiliate-link', {
+    window.umami.track('affiliate-link', {
       item1: {
         productIdentity: 'ABC424',
         revenue: parseFloat((Math.random() * 10000).toFixed(2)),
@@ -80,7 +80,7 @@ export function TestConsolePage({ websiteId }: { websiteId: string }) {
   }
 
   function handleRunIdentify() {
-    window['umami'].identify({
+    window.umami.identify({
       userId: 123,
       name: 'brian',
       number: Math.random() * 100,

src/app/(main)/console/[websiteId]/page.tsx

@@ -1,4 +1,4 @@
-import { Metadata } from 'next';
+import type { Metadata } from 'next';
 import { TestConsolePage } from './TestConsolePage';
 
 async function getEnabled() {

src/app/(main)/dashboard/DashboardPage.tsx

@@ -1,8 +1,8 @@
 'use client';
 import { Column } from '@umami/react-zen';
+import { PageBody } from '@/components/common/PageBody';
 import { PageHeader } from '@/components/common/PageHeader';
 import { useMessages } from '@/components/hooks';
-import { PageBody } from '@/components/common/PageBody';
 
 export function DashboardPage() {
   const { formatMessage, labels } = useMessages();

src/app/(main)/dashboard/page.tsx

@@ -1,4 +1,4 @@
-import { Metadata } from 'next';
+import type { Metadata } from 'next';
 import { DashboardPage } from './DashboardPage';
 
 export default async function () {

src/app/(main)/layout.tsx

@@ -1,5 +1,5 @@
+import type { Metadata } from 'next';
 import { Suspense } from 'react';
-import { Metadata } from 'next';
 import { App } from './App';
 
 export default function ({ children }) {

src/app/(main)/links/LinkAddButton.tsx

@@ -1,7 +1,7 @@
 import { useMessages } from '@/components/hooks';
 import { Plus } from '@/components/icons';
-import { LinkEditForm } from './LinkEditForm';
 import { DialogButton } from '@/components/input/DialogButton';
+import { LinkEditForm } from './LinkEditForm';
 
 export function LinkAddButton({ teamId }: { teamId?: string }) {
   const { formatMessage, labels } = useMessages();

src/app/(main)/links/LinkDeleteButton.tsx

@@ -1,8 +1,8 @@
-import { Trash } from '@/components/icons';
 import { ConfirmationForm } from '@/components/common/ConfirmationForm';
-import { messages } from '@/components/messages';
 import { useDeleteQuery, useMessages } from '@/components/hooks';
+import { Trash } from '@/components/icons';
 import { DialogButton } from '@/components/input/DialogButton';
+import { messages } from '@/components/messages';
 
 export function LinkDeleteButton({
   linkId,

src/app/(main)/links/LinkEditButton.tsx

@@ -1,7 +1,7 @@
-import { Edit } from '@/components/icons';
-import { LinkEditForm } from './LinkEditForm';
 import { useMessages } from '@/components/hooks';
+import { Edit } from '@/components/icons';
 import { DialogButton } from '@/components/input/DialogButton';
+import { LinkEditForm } from './LinkEditForm';
 
 export function LinkEditButton({ linkId }: { linkId: string }) {
   const { formatMessage, labels } = useMessages();

src/app/(main)/links/LinkEditForm.tsx

@@ -1,22 +1,21 @@
-import { useState, useEffect } from 'react';
 import {
+  Button,
+  Column,
   Form,
   FormField,
   FormSubmitButton,
+  Icon,
+  Label,
+  Loading,
   Row,
   TextField,
-  Button,
-  Label,
-  Column,
-  Icon,
-  Loading,
 } from '@umami/react-zen';
-import { useConfig, useLinkQuery } from '@/components/hooks';
-import { useMessages } from '@/components/hooks';
-import { RefreshCw } from '@/components/icons';
-import { getRandomChars } from '@/lib/generate';
+import { useEffect, useState } from 'react';
+import { useConfig, useLinkQuery, useMessages } from '@/components/hooks';
 import { useUpdateQuery } from '@/components/hooks/queries/useUpdateQuery';
+import { RefreshCw } from '@/components/icons';
 import { LINKS_URL } from '@/lib/constants';
+import { getRandomChars } from '@/lib/generate';
 import { isValidUrl } from '@/lib/url';
 
 const generateId = () => getRandomChars(9);

src/app/(main)/links/LinkProvider.tsx

@@ -1,8 +1,8 @@
 'use client';
-import { createContext, ReactNode } from 'react';
 import { Loading } from '@umami/react-zen';
-import { Link } from '@/generated/prisma/client';
+import { createContext, type ReactNode } from 'react';
 import { useLinkQuery } from '@/components/hooks/queries/useLinkQuery';
+import type { Link } from '@/generated/prisma/client';
 
 export const LinkContext = createContext<Link>(null);
 

src/app/(main)/links/LinksDataTable.tsx

@@ -1,6 +1,6 @@
+import { DataGrid } from '@/components/common/DataGrid';
 import { useLinksQuery, useNavigation } from '@/components/hooks';
 import { LinksTable } from './LinksTable';
-import { DataGrid } from '@/components/common/DataGrid';
 
 export function LinksDataTable() {
   const { teamId } = useNavigation();

src/app/(main)/links/LinksPage.tsx

@@ -1,11 +1,11 @@
 'use client';
-import { PageBody } from '@/components/common/PageBody';
 import { Column } from '@umami/react-zen';
-import { PageHeader } from '@/components/common/PageHeader';
-import { LinkAddButton } from './LinkAddButton';
-import { useMessages, useNavigation } from '@/components/hooks';
 import { LinksDataTable } from '@/app/(main)/links/LinksDataTable';
+import { PageBody } from '@/components/common/PageBody';
+import { PageHeader } from '@/components/common/PageHeader';
 import { Panel } from '@/components/common/Panel';
+import { useMessages, useNavigation } from '@/components/hooks';
+import { LinkAddButton } from './LinkAddButton';
 
 export function LinksPage() {
   const { formatMessage, labels } = useMessages();

src/app/(main)/links/LinksTable.tsx

@@ -1,10 +1,10 @@
+import { DataColumn, DataTable, type DataTableProps, Row } from '@umami/react-zen';
 import Link from 'next/link';
-import { DataTable, DataColumn, Row, DataTableProps } from '@umami/react-zen';
-import { useMessages, useNavigation, useSlug } from '@/components/hooks';
 import { DateDistance } from '@/components/common/DateDistance';
 import { ExternalLink } from '@/components/common/ExternalLink';
-import { LinkEditButton } from './LinkEditButton';
+import { useMessages, useNavigation, useSlug } from '@/components/hooks';
 import { LinkDeleteButton } from './LinkDeleteButton';
+import { LinkEditButton } from './LinkEditButton';
 
 export function LinksTable(props: DataTableProps) {
   const { formatMessage, labels } = useMessages();

src/app/(main)/links/[linkId]/LinkControls.tsx

@@ -1,9 +1,9 @@
 import { Column, Row } from '@umami/react-zen';
-import { WebsiteFilterButton } from '@/components/input/WebsiteFilterButton';
-import { WebsiteDateFilter } from '@/components/input/WebsiteDateFilter';
+import { ExportButton } from '@/components/input/ExportButton';
 import { FilterBar } from '@/components/input/FilterBar';
 import { MonthFilter } from '@/components/input/MonthFilter';
-import { ExportButton } from '@/components/input/ExportButton';
+import { WebsiteDateFilter } from '@/components/input/WebsiteDateFilter';
+import { WebsiteFilterButton } from '@/components/input/WebsiteFilterButton';
 
 export function LinkControls({
   linkId: websiteId,

src/app/(main)/links/[linkId]/LinkHeader.tsx

@@ -1,8 +1,8 @@
-import { useLink, useMessages, useSlug } from '@/components/hooks';
-import { PageHeader } from '@/components/common/PageHeader';
 import { Icon, Text } from '@umami/react-zen';
-import { ExternalLink, Link } from '@/components/icons';
 import { LinkButton } from '@/components/common/LinkButton';
+import { PageHeader } from '@/components/common/PageHeader';
+import { useLink, useMessages, useSlug } from '@/components/hooks';
+import { ExternalLink, Link } from '@/components/icons';
 
 export function LinkHeader() {
   const { formatMessage, labels } = useMessages();

src/app/(main)/links/[linkId]/LinkMetricsBar.tsx

@@ -1,9 +1,9 @@
+import { LoadingPanel } from '@/components/common/LoadingPanel';
 import { useDateRange, useMessages } from '@/components/hooks';
+import { useWebsiteStatsQuery } from '@/components/hooks/queries/useWebsiteStatsQuery';
 import { MetricCard } from '@/components/metrics/MetricCard';
 import { MetricsBar } from '@/components/metrics/MetricsBar';
 import { formatLongNumber } from '@/lib/format';
-import { useWebsiteStatsQuery } from '@/components/hooks/queries/useWebsiteStatsQuery';
-import { LoadingPanel } from '@/components/common/LoadingPanel';
 
 export function LinkMetricsBar({
   linkId,

src/app/(main)/links/[linkId]/LinkPage.tsx

@@ -1,14 +1,14 @@
 'use client';
-import { PageBody } from '@/components/common/PageBody';
-import { LinkProvider } from '@/app/(main)/links/LinkProvider';
-import { LinkHeader } from '@/app/(main)/links/[linkId]/LinkHeader';
-import { Panel } from '@/components/common/Panel';
-import { WebsiteChart } from '@/app/(main)/websites/[websiteId]/WebsiteChart';
-import { LinkMetricsBar } from '@/app/(main)/links/[linkId]/LinkMetricsBar';
-import { LinkControls } from '@/app/(main)/links/[linkId]/LinkControls';
-import { LinkPanels } from '@/app/(main)/links/[linkId]/LinkPanels';
 import { Column, Grid } from '@umami/react-zen';
+import { LinkControls } from '@/app/(main)/links/[linkId]/LinkControls';
+import { LinkHeader } from '@/app/(main)/links/[linkId]/LinkHeader';
+import { LinkMetricsBar } from '@/app/(main)/links/[linkId]/LinkMetricsBar';
+import { LinkPanels } from '@/app/(main)/links/[linkId]/LinkPanels';
+import { LinkProvider } from '@/app/(main)/links/LinkProvider';
 import { ExpandedViewModal } from '@/app/(main)/websites/[websiteId]/ExpandedViewModal';
+import { WebsiteChart } from '@/app/(main)/websites/[websiteId]/WebsiteChart';
+import { PageBody } from '@/components/common/PageBody';
+import { Panel } from '@/components/common/Panel';
 
 const excludedIds = ['path', 'entry', 'exit', 'title', 'language', 'screen', 'event'];
 

src/app/(main)/links/[linkId]/LinkPanels.tsx

@@ -1,9 +1,9 @@
-import { Grid, Tabs, Tab, TabList, TabPanel, Heading } from '@umami/react-zen';
+import { Grid, Heading, Tab, TabList, TabPanel, Tabs } from '@umami/react-zen';
 import { GridRow } from '@/components/common/GridRow';
 import { Panel } from '@/components/common/Panel';
-import { WorldMap } from '@/components/metrics/WorldMap';
-import { MetricsTable } from '@/components/metrics/MetricsTable';
 import { useMessages } from '@/components/hooks';
+import { MetricsTable } from '@/components/metrics/MetricsTable';
+import { WorldMap } from '@/components/metrics/WorldMap';
 
 export function LinkPanels({ linkId }: { linkId: string }) {
   const { formatMessage, labels } = useMessages();

src/app/(main)/links/[linkId]/page.tsx

@@ -1,5 +1,5 @@
+import type { Metadata } from 'next';
 import { LinkPage } from './LinkPage';
-import { Metadata } from 'next';
 
 export default async function ({ params }: { params: Promise<{ linkId: string }> }) {
   const { linkId } = await params;

src/app/(main)/links/page.tsx

@@ -1,5 +1,5 @@
+import type { Metadata } from 'next';
 import { LinksPage } from './LinksPage';
-import { Metadata } from 'next';
 
 export default function () {
   return <LinksPage />;

src/app/(main)/pixels/PixelAddButton.tsx

@@ -1,7 +1,7 @@
 import { useMessages } from '@/components/hooks';
 import { Plus } from '@/components/icons';
-import { PixelEditForm } from './PixelEditForm';
 import { DialogButton } from '@/components/input/DialogButton';
+import { PixelEditForm } from './PixelEditForm';
 
 export function PixelAddButton({ teamId }: { teamId?: string }) {
   const { formatMessage, labels } = useMessages();

src/app/(main)/pixels/PixelDeleteButton.tsx

@@ -1,8 +1,8 @@
-import { Trash } from '@/components/icons';
 import { ConfirmationForm } from '@/components/common/ConfirmationForm';
-import { messages } from '@/components/messages';
 import { useDeleteQuery, useMessages, useModified } from '@/components/hooks';
+import { Trash } from '@/components/icons';
 import { DialogButton } from '@/components/input/DialogButton';
+import { messages } from '@/components/messages';
 
 export function PixelDeleteButton({
   pixelId,

src/app/(main)/pixels/PixelEditButton.tsx

@@ -1,7 +1,7 @@
-import { Edit } from '@/components/icons';
-import { PixelEditForm } from './PixelEditForm';
 import { useMessages } from '@/components/hooks';
+import { Edit } from '@/components/icons';
 import { DialogButton } from '@/components/input/DialogButton';
+import { PixelEditForm } from './PixelEditForm';
 
 export function PixelEditButton({ pixelId }: { pixelId: string }) {
   const { formatMessage, labels } = useMessages();

src/app/(main)/pixels/PixelEditForm.tsx

@@ -1,22 +1,21 @@
 import {
+  Button,
+  Column,
   Form,
   FormField,
   FormSubmitButton,
+  Icon,
+  Label,
+  Loading,
   Row,
   TextField,
-  Button,
-  Label,
-  Column,
-  Icon,
-  Loading,
 } from '@umami/react-zen';
-import { useConfig, usePixelQuery } from '@/components/hooks';
-import { useMessages } from '@/components/hooks';
-import { RefreshCw } from '@/components/icons';
-import { getRandomChars } from '@/lib/generate';
-import { useUpdateQuery } from '@/components/hooks/queries/useUpdateQuery';
 import { useEffect, useState } from 'react';
+import { useConfig, useMessages, usePixelQuery } from '@/components/hooks';
+import { useUpdateQuery } from '@/components/hooks/queries/useUpdateQuery';
+import { RefreshCw } from '@/components/icons';
 import { PIXELS_URL } from '@/lib/constants';
+import { getRandomChars } from '@/lib/generate';
 
 const generateId = () => getRandomChars(9);
 

src/app/(main)/pixels/PixelProvider.tsx

@@ -1,8 +1,8 @@
 'use client';
-import { createContext, ReactNode } from 'react';
 import { Loading } from '@umami/react-zen';
-import { Pixel } from '@/generated/prisma/client';
+import { createContext, type ReactNode } from 'react';
 import { usePixelQuery } from '@/components/hooks/queries/usePixelQuery';
+import type { Pixel } from '@/generated/prisma/client';
 
 export const PixelContext = createContext<Pixel>(null);
 

src/app/(main)/pixels/PixelsDataTable.tsx

@@ -1,6 +1,6 @@
-import { usePixelsQuery, useNavigation } from '@/components/hooks';
-import { PixelsTable } from './PixelsTable';
 import { DataGrid } from '@/components/common/DataGrid';
+import { useNavigation, usePixelsQuery } from '@/components/hooks';
+import { PixelsTable } from './PixelsTable';
 
 export function PixelsDataTable() {
   const { teamId } = useNavigation();

src/app/(main)/pixels/PixelsPage.tsx

@@ -1,11 +1,11 @@
 'use client';
-import { PageBody } from '@/components/common/PageBody';
 import { Column } from '@umami/react-zen';
+import { PageBody } from '@/components/common/PageBody';
 import { PageHeader } from '@/components/common/PageHeader';
-import { PixelAddButton } from './PixelAddButton';
-import { useMessages, useNavigation } from '@/components/hooks';
-import { PixelsDataTable } from './PixelsDataTable';
 import { Panel } from '@/components/common/Panel';
+import { useMessages, useNavigation } from '@/components/hooks';
+import { PixelAddButton } from './PixelAddButton';
+import { PixelsDataTable } from './PixelsDataTable';
 
 export function PixelsPage() {
   const { formatMessage, labels } = useMessages();

src/app/(main)/pixels/PixelsTable.tsx

@@ -1,10 +1,10 @@
+import { DataColumn, DataTable, type DataTableProps, Row } from '@umami/react-zen';
 import Link from 'next/link';
-import { DataTable, DataColumn, Row, DataTableProps } from '@umami/react-zen';
-import { useMessages, useNavigation, useSlug } from '@/components/hooks';
 import { DateDistance } from '@/components/common/DateDistance';
-import { PixelEditButton } from './PixelEditButton';
-import { PixelDeleteButton } from './PixelDeleteButton';
 import { ExternalLink } from '@/components/common/ExternalLink';
+import { useMessages, useNavigation, useSlug } from '@/components/hooks';
+import { PixelDeleteButton } from './PixelDeleteButton';
+import { PixelEditButton } from './PixelEditButton';
 
 export function PixelsTable(props: DataTableProps) {
   const { formatMessage, labels } = useMessages();

src/app/(main)/pixels/[pixelId]/PixelControls.tsx

@@ -1,9 +1,9 @@
 import { Column, Row } from '@umami/react-zen';
-import { WebsiteFilterButton } from '@/components/input/WebsiteFilterButton';
-import { WebsiteDateFilter } from '@/components/input/WebsiteDateFilter';
+import { ExportButton } from '@/components/input/ExportButton';
 import { FilterBar } from '@/components/input/FilterBar';
 import { MonthFilter } from '@/components/input/MonthFilter';
-import { ExportButton } from '@/components/input/ExportButton';
+import { WebsiteDateFilter } from '@/components/input/WebsiteDateFilter';
+import { WebsiteFilterButton } from '@/components/input/WebsiteFilterButton';
 
 export function PixelControls({
   pixelId: websiteId,

src/app/(main)/pixels/[pixelId]/PixelHeader.tsx

@@ -1,8 +1,8 @@
-import { usePixel, useMessages, useSlug } from '@/components/hooks';
-import { PageHeader } from '@/components/common/PageHeader';
 import { Icon, Text } from '@umami/react-zen';
-import { ExternalLink, Grid2x2 } from '@/components/icons';
 import { LinkButton } from '@/components/common/LinkButton';
+import { PageHeader } from '@/components/common/PageHeader';
+import { useMessages, usePixel, useSlug } from '@/components/hooks';
+import { ExternalLink, Grid2x2 } from '@/components/icons';
 
 export function PixelHeader() {
   const { formatMessage, labels } = useMessages();

src/app/(main)/pixels/[pixelId]/PixelMetricsBar.tsx

@@ -1,9 +1,9 @@
+import { LoadingPanel } from '@/components/common/LoadingPanel';
 import { useDateRange, useMessages } from '@/components/hooks';
+import { useWebsiteStatsQuery } from '@/components/hooks/queries/useWebsiteStatsQuery';
 import { MetricCard } from '@/components/metrics/MetricCard';
 import { MetricsBar } from '@/components/metrics/MetricsBar';
 import { formatLongNumber } from '@/lib/format';
-import { useWebsiteStatsQuery } from '@/components/hooks/queries/useWebsiteStatsQuery';
-import { LoadingPanel } from '@/components/common/LoadingPanel';
 
 export function PixelMetricsBar({
   pixelId,

src/app/(main)/pixels/[pixelId]/PixelPage.tsx

@@ -1,14 +1,14 @@
 'use client';
-import { PageBody } from '@/components/common/PageBody';
-import { PixelProvider } from '@/app/(main)/pixels/PixelProvider';
-import { PixelHeader } from '@/app/(main)/pixels/[pixelId]/PixelHeader';
-import { Panel } from '@/components/common/Panel';
-import { WebsiteChart } from '@/app/(main)/websites/[websiteId]/WebsiteChart';
-import { PixelMetricsBar } from '@/app/(main)/pixels/[pixelId]/PixelMetricsBar';
-import { PixelControls } from '@/app/(main)/pixels/[pixelId]/PixelControls';
-import { PixelPanels } from '@/app/(main)/pixels/[pixelId]/PixelPanels';
 import { Column, Grid } from '@umami/react-zen';
+import { PixelControls } from '@/app/(main)/pixels/[pixelId]/PixelControls';
+import { PixelHeader } from '@/app/(main)/pixels/[pixelId]/PixelHeader';
+import { PixelMetricsBar } from '@/app/(main)/pixels/[pixelId]/PixelMetricsBar';
+import { PixelPanels } from '@/app/(main)/pixels/[pixelId]/PixelPanels';
+import { PixelProvider } from '@/app/(main)/pixels/PixelProvider';
 import { ExpandedViewModal } from '@/app/(main)/websites/[websiteId]/ExpandedViewModal';
+import { WebsiteChart } from '@/app/(main)/websites/[websiteId]/WebsiteChart';
+import { PageBody } from '@/components/common/PageBody';
+import { Panel } from '@/components/common/Panel';
 
 const excludedIds = ['path', 'entry', 'exit', 'title', 'language', 'screen', 'event'];
 

src/app/(main)/pixels/[pixelId]/PixelPanels.tsx

@@ -1,9 +1,9 @@
-import { Grid, Tabs, Tab, TabList, TabPanel, Heading } from '@umami/react-zen';
+import { Grid, Heading, Tab, TabList, TabPanel, Tabs } from '@umami/react-zen';
 import { GridRow } from '@/components/common/GridRow';
 import { Panel } from '@/components/common/Panel';
-import { WorldMap } from '@/components/metrics/WorldMap';
-import { MetricsTable } from '@/components/metrics/MetricsTable';
 import { useMessages } from '@/components/hooks';
+import { MetricsTable } from '@/components/metrics/MetricsTable';
+import { WorldMap } from '@/components/metrics/WorldMap';
 
 export function PixelPanels({ pixelId }: { pixelId: string }) {
   const { formatMessage, labels } = useMessages();

src/app/(main)/pixels/[pixelId]/page.tsx

@@ -1,5 +1,5 @@
+import type { Metadata } from 'next';
 import { PixelPage } from './PixelPage';
-import { Metadata } from 'next';
 
 export default async function ({ params }: { params: { pixelId: string } }) {
   const { pixelId } = await params;

src/app/(main)/pixels/page.tsx

@@ -1,5 +1,5 @@
+import type { Metadata } from 'next';
 import { PixelsPage } from './PixelsPage';
-import { Metadata } from 'next';
 
 export default function () {
   return <PixelsPage />;

src/app/(main)/settings/SettingsLayout.tsx

@@ -1,7 +1,7 @@
 'use client';
-import { PageBody } from '@/components/common/PageBody';
 import { Column, Grid } from '@umami/react-zen';
-import { ReactNode } from 'react';
+import type { ReactNode } from 'react';
+import { PageBody } from '@/components/common/PageBody';
 import { SettingsNav } from './SettingsNav';
 
 export function SettingsLayout({ children }: { children: ReactNode }) {

src/app/(main)/settings/layout.tsx

@@ -1,4 +1,4 @@
-import { Metadata } from 'next';
+import type { Metadata } from 'next';
 import { SettingsLayout } from './SettingsLayout';
 
 export default function ({ children }) {

src/app/(main)/settings/preferences/DateRangeSetting.tsx

@@ -1,9 +1,9 @@
-import { useState } from 'react';
-import { DateFilter } from '@/components/input/DateFilter';
 import { Button, Row } from '@umami/react-zen';
+import { useState } from 'react';
 import { useMessages } from '@/components/hooks';
+import { DateFilter } from '@/components/input/DateFilter';
 import { DATE_RANGE_CONFIG, DEFAULT_DATE_RANGE_VALUE } from '@/lib/constants';
-import { setItem, getItem } from '@/lib/storage';
+import { getItem, setItem } from '@/lib/storage';
 
 export function DateRangeSetting() {
   const { formatMessage, labels } = useMessages();

src/app/(main)/settings/preferences/LanguageSetting.tsx

@@ -1,5 +1,5 @@
+import { Button, ListItem, Row, Select } from '@umami/react-zen';
 import { useState } from 'react';
-import { Button, Select, ListItem, Row } from '@umami/react-zen';
 import { useLocale, useMessages } from '@/components/hooks';
 import { DEFAULT_LOCALE } from '@/lib/constants';
 import { languages } from '@/lib/lang';

src/app/(main)/settings/preferences/PreferenceSettings.tsx

@@ -1,9 +1,9 @@
 import { Column, Label } from '@umami/react-zen';
 import { useLoginQuery, useMessages } from '@/components/hooks';
-import { TimezoneSetting } from './TimezoneSetting';
 import { DateRangeSetting } from './DateRangeSetting';
 import { LanguageSetting } from './LanguageSetting';
 import { ThemeSetting } from './ThemeSetting';
+import { TimezoneSetting } from './TimezoneSetting';
 
 export function PreferenceSettings() {
   const { user } = useLoginQuery();

src/app/(main)/settings/preferences/PreferencesPage.tsx

@@ -1,10 +1,10 @@
 'use client';
 import { Column } from '@umami/react-zen';
-import { useMessages } from '@/components/hooks';
-import { Panel } from '@/components/common/Panel';
-import { PreferenceSettings } from './PreferenceSettings';
-import { PageHeader } from '@/components/common/PageHeader';
 import { PageBody } from '@/components/common/PageBody';
+import { PageHeader } from '@/components/common/PageHeader';
+import { Panel } from '@/components/common/Panel';
+import { useMessages } from '@/components/hooks';
+import { PreferenceSettings } from './PreferenceSettings';
 
 export function PreferencesPage() {
   const { formatMessage, labels } = useMessages();

src/app/(main)/settings/preferences/ThemeSetting.tsx

@@ -1,5 +1,5 @@
-import { Row, Button, Icon, useTheme } from '@umami/react-zen';
-import { Sun, Moon } from '@/components/icons';
+import { Button, Icon, Row, useTheme } from '@umami/react-zen';
+import { Moon, Sun } from '@/components/icons';
 
 export function ThemeSetting() {
   const { theme, setTheme } = useTheme();

src/app/(main)/settings/preferences/TimezoneSetting.tsx

@@ -1,6 +1,6 @@
+import { Button, ListItem, Row, Select } from '@umami/react-zen';
 import { useState } from 'react';
-import { Row, Select, ListItem, Button } from '@umami/react-zen';
-import { useTimezone, useMessages } from '@/components/hooks';
+import { useMessages, useTimezone } from '@/components/hooks';
 import { getTimezone } from '@/lib/date';
 
 const timezones = Intl.supportedValuesOf('timeZone');

src/app/(main)/settings/preferences/page.tsx

@@ -1,4 +1,4 @@
-import { Metadata } from 'next';
+import type { Metadata } from 'next';
 import { PreferencesPage } from './PreferencesPage';
 
 export default function () {

src/app/(main)/settings/profile/PasswordChangeButton.tsx

@@ -1,7 +1,7 @@
-import { Button, Icon, Text, useToast, DialogTrigger, Dialog, Modal } from '@umami/react-zen';
-import { PasswordEditForm } from './PasswordEditForm';
-import { LockKeyhole } from '@/components/icons';
+import { Button, Dialog, DialogTrigger, Icon, Modal, Text, useToast } from '@umami/react-zen';
 import { useMessages } from '@/components/hooks';
+import { LockKeyhole } from '@/components/icons';
+import { PasswordEditForm } from './PasswordEditForm';
 
 export function PasswordChangeButton() {
   const { formatMessage, labels, messages } = useMessages();

src/app/(main)/settings/profile/PasswordEditForm.tsx

@@ -1,10 +1,10 @@
 import {
-  Form,
-  FormField,
-  FormButtons,
-  PasswordField,
   Button,
+  Form,
+  FormButtons,
+  FormField,
   FormSubmitButton,
+  PasswordField,
 } from '@umami/react-zen';
 import { useMessages, useUpdateQuery } from '@/components/hooks';
 

src/app/(main)/settings/profile/ProfilePage.tsx

@@ -1,10 +1,10 @@
 'use client';
-import { ProfileSettings } from './ProfileSettings';
-import { useMessages } from '@/components/hooks';
-import { Panel } from '@/components/common/Panel';
 import { Column } from '@umami/react-zen';
-import { PageHeader } from '@/components/common/PageHeader';
 import { PageBody } from '@/components/common/PageBody';
+import { PageHeader } from '@/components/common/PageHeader';
+import { Panel } from '@/components/common/Panel';
+import { useMessages } from '@/components/hooks';
+import { ProfileSettings } from './ProfileSettings';
 
 export function ProfilePage() {
   const { formatMessage, labels } = useMessages();

src/app/(main)/settings/profile/ProfileSettings.tsx

@@ -1,4 +1,4 @@
-import { Row, Column, Label } from '@umami/react-zen';
+import { Column, Label, Row } from '@umami/react-zen';
 import { useConfig, useLoginQuery, useMessages } from '@/components/hooks';
 import { ROLES } from '@/lib/constants';
 import { PasswordChangeButton } from './PasswordChangeButton';

src/app/(main)/settings/profile/page.tsx

@@ -1,4 +1,4 @@
-import { Metadata } from 'next';
+import type { Metadata } from 'next';
 import { ProfilePage } from './ProfilePage';
 
 export default function () {

src/app/(main)/settings/teams/TeamsSettingsPage.tsx

@@ -1,7 +1,7 @@
 'use client';
+import { Column } from '@umami/react-zen';
 import { TeamsDataTable } from '@/app/(main)/teams/TeamsDataTable';
 import { TeamsHeader } from '@/app/(main)/teams/TeamsHeader';
-import { Column } from '@umami/react-zen';
 import { Panel } from '@/components/common/Panel';
 
 export function TeamsSettingsPage() {

src/app/(main)/settings/teams/[teamId]/TeamSettingsPage.tsx

@@ -1,6 +1,6 @@
 'use client';
-import { TeamProvider } from '@/app/(main)/teams/TeamProvider';
 import { TeamSettings } from '@/app/(main)/teams/[teamId]/TeamSettings';
+import { TeamProvider } from '@/app/(main)/teams/TeamProvider';
 
 export function TeamSettingsPage({ teamId }: { teamId: string }) {
   return (

src/app/(main)/settings/teams/[teamId]/page.tsx

@@ -1,4 +1,4 @@
-import { Metadata } from 'next';
+import type { Metadata } from 'next';
 import { TeamSettingsPage } from './TeamSettingsPage';
 
 export default async function ({ params }: { params: Promise<{ teamId: string }> }) {

src/app/(main)/settings/teams/page.tsx

@@ -1,4 +1,4 @@
-import { Metadata } from 'next';
+import type { Metadata } from 'next';
 import { TeamsSettingsPage } from './TeamsSettingsPage';
 
 export default function () {

src/app/(main)/settings/websites/WebsitesSettingsPage.tsx

@@ -1,8 +1,8 @@
 'use client';
 import { Column } from '@umami/react-zen';
-import { useMessages } from '@/components/hooks';
 import { WebsitesDataTable } from '@/app/(main)/websites/WebsitesDataTable';
 import { SectionHeader } from '@/components/common/SectionHeader';
+import { useMessages } from '@/components/hooks';
 
 export function WebsitesSettingsPage({ teamId }: { teamId: string }) {
   const { formatMessage, labels } = useMessages();

src/app/(main)/settings/websites/[websiteId]/WebsiteSettingsPage.tsx

@@ -1,8 +1,8 @@
 'use client';
-import { WebsiteProvider } from '@/app/(main)/websites/WebsiteProvider';
+import { Column } from '@umami/react-zen';
 import { WebsiteSettings } from '@/app/(main)/websites/[websiteId]/settings/WebsiteSettings';
 import { WebsiteSettingsHeader } from '@/app/(main)/websites/[websiteId]/settings/WebsiteSettingsHeader';
-import { Column } from '@umami/react-zen';
+import { WebsiteProvider } from '@/app/(main)/websites/WebsiteProvider';
 
 export function WebsiteSettingsPage({ websiteId }: { websiteId: string }) {
   return (

src/app/(main)/settings/websites/[websiteId]/page.tsx

@@ -1,5 +1,5 @@
+import type { Metadata } from 'next';
 import { WebsiteSettingsPage } from './WebsiteSettingsPage';
-import { Metadata } from 'next';
 
 export default async function ({ params }: { params: Promise<{ websiteId: string }> }) {
   const { websiteId } = await params;

src/app/(main)/settings/websites/page.tsx

@@ -1,4 +1,4 @@
-import { Metadata } from 'next';
+import type { Metadata } from 'next';
 import { WebsitesSettingsPage } from './WebsitesSettingsPage';
 
 export default async function ({ params }: { params: Promise<{ teamId: string }> }) {

src/app/(main)/teams/TeamAddForm.tsx

@@ -1,4 +1,3 @@
-import { useMessages, useUpdateQuery } from '@/components/hooks';
 import {
   Button,
   Form,
@@ -7,6 +6,7 @@ import {
   FormSubmitButton,
   TextField,
 } from '@umami/react-zen';
+import { useMessages, useUpdateQuery } from '@/components/hooks';
 
 export function TeamAddForm({ onSave, onClose }: { onSave: () => void; onClose: () => void }) {
   const { formatMessage, labels, getErrorMessage } = useMessages();

src/app/(main)/teams/TeamJoinForm.tsx

@@ -1,10 +1,10 @@
 import {
-  Form,
-  FormField,
-  FormButtons,
-  TextField,
   Button,
+  Form,
+  FormButtons,
+  FormField,
   FormSubmitButton,
+  TextField,
 } from '@umami/react-zen';
 import { useMessages, useUpdateQuery } from '@/components/hooks';
 

src/app/(main)/teams/TeamLeaveButton.tsx

@@ -1,6 +1,6 @@
-import { useLoginQuery, useMessages, useModified } from '@/components/hooks';
+import { Button, Dialog, DialogTrigger, Icon, Modal, Text } from '@umami/react-zen';
 import { useRouter } from 'next/navigation';
-import { Button, Icon, Modal, DialogTrigger, Dialog, Text } from '@umami/react-zen';
+import { useLoginQuery, useMessages, useModified } from '@/components/hooks';
 import { LogOut } from '@/components/icons';
 import { TeamLeaveForm } from './TeamLeaveForm';
 

src/app/(main)/teams/TeamLeaveForm.tsx

@@ -1,5 +1,5 @@
-import { useDeleteQuery, useMessages, useModified } from '@/components/hooks';
 import { ConfirmationForm } from '@/components/common/ConfirmationForm';
+import { useDeleteQuery, useMessages, useModified } from '@/components/hooks';
 
 export function TeamLeaveForm({
   teamId,

src/app/(main)/teams/TeamProvider.tsx

@@ -1,8 +1,8 @@
 'use client';
-import { createContext, ReactNode } from 'react';
 import { Loading } from '@umami/react-zen';
+import { createContext, type ReactNode } from 'react';
 import { useTeamQuery } from '@/components/hooks/queries/useTeamQuery';
-import { Team } from '@/generated/prisma/client';
+import type { Team } from '@/generated/prisma/client';
 
 export const TeamContext = createContext<Team>(null);
 

src/app/(main)/teams/TeamsAddButton.tsx

@@ -1,8 +1,8 @@
-import { Button, Icon, Modal, DialogTrigger, Dialog, Text, useToast } from '@umami/react-zen';
-import { Plus } from '@/components/icons';
+import { Button, Dialog, DialogTrigger, Icon, Modal, Text, useToast } from '@umami/react-zen';
 import { useMessages, useModified } from '@/components/hooks';
-import { TeamAddForm } from './TeamAddForm';
+import { Plus } from '@/components/icons';
 import { messages } from '@/components/messages';
+import { TeamAddForm } from './TeamAddForm';
 
 export function TeamsAddButton({ onSave }: { onSave?: () => void }) {
   const { formatMessage, labels } = useMessages();