diff --git a/package.json b/package.json index 2f5b27dd..8e35c620 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ }, "type": "module", "scripts": { - "dev": "next dev -p 3001 --turbopack", + "dev": "next dev -p 3001 --turbo", "build": "npm-run-all check-env build-db check-db build-tracker build-geo build-app", "start": "next start", "build-docker": "npm-run-all build-db build-tracker build-geo build-app", diff --git a/src/app/(main)/links/[linkId]/LinkControls.tsx b/src/app/(main)/links/[linkId]/LinkControls.tsx index 01c8e2e9..4e43c760 100644 --- a/src/app/(main)/links/[linkId]/LinkControls.tsx +++ b/src/app/(main)/links/[linkId]/LinkControls.tsx @@ -2,7 +2,7 @@ import { Column, Row } from '@umami/react-zen'; import { WebsiteFilterButton } from '@/components/input/WebsiteFilterButton'; import { WebsiteDateFilter } from '@/components/input/WebsiteDateFilter'; import { FilterBar } from '@/components/input/FilterBar'; -import { WebsiteMonthSelect } from '@/components/input/WebsiteMonthSelect'; +import { MonthFilter } from '@/components/input/MonthFilter'; import { ExportButton } from '@/components/input/ExportButton'; export function LinkControls({ @@ -24,7 +24,7 @@ export function LinkControls({ {allowFilter ? :
} {allowDateFilter && } {allowDownload && } - {allowMonthFilter && } + {allowMonthFilter && } {allowFilter && } diff --git a/src/app/(main)/pixels/[pixelId]/PixelControls.tsx b/src/app/(main)/pixels/[pixelId]/PixelControls.tsx index 165b23b9..33f49222 100644 --- a/src/app/(main)/pixels/[pixelId]/PixelControls.tsx +++ b/src/app/(main)/pixels/[pixelId]/PixelControls.tsx @@ -2,7 +2,7 @@ import { Column, Row } from '@umami/react-zen'; import { WebsiteFilterButton } from '@/components/input/WebsiteFilterButton'; import { WebsiteDateFilter } from '@/components/input/WebsiteDateFilter'; import { FilterBar } from '@/components/input/FilterBar'; -import { WebsiteMonthSelect } from '@/components/input/WebsiteMonthSelect'; +import { MonthFilter } from '@/components/input/MonthFilter'; import { ExportButton } from '@/components/input/ExportButton'; export function PixelControls({ @@ -24,7 +24,7 @@ export function PixelControls({ {allowFilter ? :
} {allowDateFilter && } {allowDownload && } - {allowMonthFilter && } + {allowMonthFilter && } {allowFilter && } diff --git a/src/app/(main)/websites/[websiteId]/WebsiteControls.tsx b/src/app/(main)/websites/[websiteId]/WebsiteControls.tsx index 38f86e3a..6b03ef6e 100644 --- a/src/app/(main)/websites/[websiteId]/WebsiteControls.tsx +++ b/src/app/(main)/websites/[websiteId]/WebsiteControls.tsx @@ -2,7 +2,7 @@ import { Column, Row } from '@umami/react-zen'; import { WebsiteFilterButton } from '@/components/input/WebsiteFilterButton'; import { WebsiteDateFilter } from '@/components/input/WebsiteDateFilter'; import { FilterBar } from '@/components/input/FilterBar'; -import { WebsiteMonthSelect } from '@/components/input/WebsiteMonthSelect'; +import { MonthFilter } from '@/components/input/MonthFilter'; import { ExportButton } from '@/components/input/ExportButton'; export function WebsiteControls({ @@ -26,7 +26,7 @@ export function WebsiteControls({ {allowFilter ? :
} {allowDateFilter && } {allowDownload && } - {allowMonthFilter && } + {allowMonthFilter && } {allowFilter && } diff --git a/src/components/input/WebsiteMonthSelect.tsx b/src/components/input/MonthFilter.tsx similarity index 93% rename from src/components/input/WebsiteMonthSelect.tsx rename to src/components/input/MonthFilter.tsx index 8c4b2f5b..dec64b0f 100644 --- a/src/components/input/WebsiteMonthSelect.tsx +++ b/src/components/input/MonthFilter.tsx @@ -2,7 +2,7 @@ import { useDateRange, useNavigation } from '@/components/hooks'; import { getMonthDateRangeValue } from '@/lib/date'; import { MonthSelect } from './MonthSelect'; -export function WebsiteMonthSelect() { +export function MonthFilter() { const { router, updateParams } = useNavigation(); const { dateRange: { startDate }, diff --git a/src/components/input/RefreshButton.tsx b/src/components/input/RefreshButton.tsx index 94c8714c..29b71986 100644 --- a/src/components/input/RefreshButton.tsx +++ b/src/components/input/RefreshButton.tsx @@ -1,7 +1,7 @@ import { LoadingButton, Icon, Tooltip, TooltipTrigger } from '@umami/react-zen'; import { setWebsiteDateRange } from '@/store/websites'; import { useDateRange } from '@/components/hooks'; -import { Refresh } from '@/components/icons'; +import { RefreshCw } from '@/components/icons'; import { useMessages } from '@/components/hooks'; export function RefreshButton({ @@ -24,7 +24,7 @@ export function RefreshButton({ - + {formatMessage(labels.refresh)} diff --git a/src/lib/prisma.ts b/src/lib/prisma.ts index 35f716be..4bc581a7 100644 --- a/src/lib/prisma.ts +++ b/src/lib/prisma.ts @@ -284,7 +284,7 @@ function getClient() { replicaUrl: process.env.DATABASE_REPLICA_URL, }); - if (process.env.NODE_ENV !== 'production') { + if (!globalThis[PRISMA]) { globalThis[PRISMA] = prisma.client; }