OpenPanel is an open-source web and product analytics platform, an open-source alternative to Mixpanel with optional self-hosting.
add tailwind prettier and some clean up
Carl-Gerhard Lindesvärd44c66dbed44c
diff --git a/apps/dashboard/README.md b/apps/dashboard/README.mdindex fba19edac..5c6b25c47 100644--- a/apps/dashboard/README.md+++ b/apps/dashboard/README.md@@ -1,28 +1 @@-# Create T3 App--This is a [T3 Stack](https://create.t3.gg/) project bootstrapped with `create-t3-app`.--## What's next? How do I make an app with this?--We try to keep this project as simple as possible, so you can start with just the scaffolding we set up for you, and add additional things later when they become necessary.--If you are not familiar with the different technologies used in this project, please refer to the respective docs. If you still are in the wind, please join our [Discord](https://t3.gg/discord) and ask for help.--- [Next.js](https://nextjs.org)-- [NextAuth.js](https://next-auth.js.org)-- [Prisma](https://prisma.io)-- [Tailwind CSS](https://tailwindcss.com)-- [tRPC](https://trpc.io)--## Learn More--To learn more about the [T3 Stack](https://create.t3.gg/), take a look at the following resources:--- [Documentation](https://create.t3.gg/)-- [Learn the T3 Stack](https://create.t3.gg/en/faq#what-learning-resources-are-currently-available) — Check out these awesome tutorials--You can check out the [create-t3-app GitHub repository](https://github.com/t3-oss/create-t3-app) — your feedback and contributions are welcome!--## How do I deploy this?--Follow our deployment guides for [Vercel](https://create.t3.gg/en/deployment/vercel), [Netlify](https://create.t3.gg/en/deployment/netlify) and [Docker](https://create.t3.gg/en/deployment/docker) for more information.+# Dashboarddiff --git a/apps/dashboard/TOOODOO.md b/apps/dashboard/TOOODOO.mddeleted file mode 100644index d61d9b44a..000000000--- a/apps/dashboard/TOOODOO.md+++ /dev/null@@ -1,6 +0,0 @@-- new org-- create project-- all trpc mutations seems to break in prod-- top event convertions- - create events_meta (name, color, icon)- - edit event convertiondiff --git a/apps/dashboard/next.config.mjs b/apps/dashboard/next.config.mjsindex e59b87382..2f855fdcb 100644--- a/apps/dashboard/next.config.mjs+++ b/apps/dashboard/next.config.mjs@@ -53,12 +53,12 @@ export default withSentryConfig(widenClientFileUpload: true,// Transpiles SDK to be compatible with IE11 (increases bundle size)- transpileClientSDK: true,+ transpileClientSDK: false,// Routes browser requests to Sentry through a Next.js rewrite to circumvent ad-blockers. (increases server load)// Note: Check that the configured route will not match with your Next.js middleware, otherwise reporting of client-// side errors will fail.- tunnelRoute: '/monitoring',+ // tunnelRoute: '/monitoring',// Hides source maps from generated client bundleshideSourceMaps: true,@@ -70,6 +70,6 @@ export default withSentryConfig(// See the following for more information:// https://docs.sentry.io/product/crons/// https://vercel.com/docs/cron-jobs- automaticVercelMonitors: true,+ automaticVercelMonitors: false,});diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/dashboards/[dashboardId]/list-reports.tsx b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/dashboards/[dashboardId]/list-reports.tsxindex e451c55fe..058273754 100644--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/dashboards/[dashboardId]/list-reports.tsx+++ b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/dashboards/[dashboardId]/list-reports.tsx@@ -36,7 +36,7 @@ export function ListReports({ reports }: ListReportsProps) {return (<>- <StickyBelowHeader className="p-4 items-center justify-between flex">+ <StickyBelowHeader className="flex items-center justify-between p-4"><OverviewReportRange /><Buttonicon={PlusIcon}@@ -54,20 +54,20 @@ export function ListReports({ reports }: ListReportsProps) {<span className="sm:hidden">Report</span></Button></StickyBelowHeader>- <div className="grid grid-cols-1 sm:grid-cols-2 gap-4 p-4">+ <div className="grid grid-cols-1 gap-4 p-4 sm:grid-cols-2">{reports.map((report) => {const chartRange = report.range; // timeRanges[report.range];return (<div className="card" key={report.id}><Linkhref={`/${params.organizationId}/${params.projectId}/reports/${report.id}`}- className="flex border-b border-border p-4 leading-none [&_svg]:hover:opacity-100 items-center justify-between"+ className="flex items-center justify-between border-b border-border p-4 leading-none [&_svg]:hover:opacity-100"shallow><div><div className="font-medium">{report.name}</div>{chartRange !== null && (- <div className="mt-2 text-sm flex gap-2">+ <div className="mt-2 flex gap-2 text-sm"><spanclassName={range !== null || (startDate && endDate)@@ -87,7 +87,7 @@ export function ListReports({ reports }: ListReportsProps) {</div><div className="flex items-center gap-4"><DropdownMenu>- <DropdownMenuTrigger className="h-8 w-8 hover:border rounded justify-center items-center flex">+ <DropdownMenuTrigger className="flex h-8 w-8 items-center justify-center rounded hover:border"><MoreHorizontal size={16} /></DropdownMenuTrigger><DropdownMenuContent align="end" className="w-[200px]">@@ -116,7 +116,7 @@ export function ListReports({ reports }: ListReportsProps) {<divclassName={cn('p-4',- report.chartType === 'bar' && 'overflow-auto max-h-[300px]'+ report.chartType === 'bar' && 'max-h-[300px] overflow-auto')}><LazyChartdiff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/dashboards/header-dashboards.tsx b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/dashboards/header-dashboards.tsxindex 62e50b998..1b5fd45f5 100644--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/dashboards/header-dashboards.tsx+++ b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/dashboards/header-dashboards.tsx@@ -9,7 +9,7 @@ import { StickyBelowHeader } from '../layout-sticky-below-header';export function HeaderDashboards() {return (<StickyBelowHeader>- <div className="p-4 flex justify-between items-center">+ <div className="flex items-center justify-between p-4"><div /><Buttonicon={PlusIcon}diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/dashboards/list-dashboards.tsx b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/dashboards/list-dashboards.tsxindex 59b75752b..2b37693dc 100644--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/dashboards/list-dashboards.tsx+++ b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/dashboards/list-dashboards.tsx@@ -60,13 +60,13 @@ export function ListDashboards({ dashboards }: ListDashboardsProps) {return (<>- <div className="grid sm:grid-cols-2 gap-4 p-4">+ <div className="grid gap-4 p-4 sm:grid-cols-2">{dashboards.map((item) => (<Card key={item.id} hover><div><Linkhref={`/${organizationId}/${projectId}/dashboards/${item.id}`}- className="block p-4 flex flex-col"+ className="block flex flex-col p-4"><span className="font-medium">{item.name}</span></Link>@@ -83,7 +83,7 @@ export function ListDashboards({ dashboards }: ListDashboardsProps) {Edit</button></CardActionsItem>- <CardActionsItem className="text-destructive w-full" asChild>+ <CardActionsItem className="w-full text-destructive" asChild><buttononClick={() => {deletion.mutate({diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/charts/events-per-day-chart.tsx b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/charts/events-per-day-chart.tsxindex 4a61f20ae..f4a0d8a26 100644--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/charts/events-per-day-chart.tsx+++ b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/charts/events-per-day-chart.tsx@@ -20,7 +20,7 @@ export function EventsPerDayChart({ projectId, filters, events }: Props) {];return (- <div className="card p-4 mb-8">+ <div className="card mb-8 p-4"><ChartSwitchShortcutprojectId={projectId}range="1m"diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/event-conversions-list/event-conversions-list.tsx b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/event-conversions-list/event-conversions-list.tsxindex 240bc8a93..f4218bc92 100644--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/event-conversions-list/event-conversions-list.tsx+++ b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/event-conversions-list/event-conversions-list.tsx@@ -22,13 +22,13 @@ export function EventConversionsList({ data }: EventListProps) {<WidgetHead><div className="title">Conversions</div></WidgetHead>- <div className="flex flex-col gap-2 overflow-y-auto max-h-80 p-4">+ <div className="flex max-h-80 flex-col gap-2 overflow-y-auto p-4">{data.map((item, index, list) => (<Fragment key={item.id}>{showDateHeader(item.createdAt, list[index - 1]?.createdAt) && (<div className="flex flex-row justify-between gap-2 [&:not(:first-child)]:mt-12"><div className="flex gap-2">- <div className="bg-slate-100 border border-slate-300 rounded h-8 px-3 leading-none flex items-center text-sm font-medium gap-2">+ <div className="flex h-8 items-center gap-2 rounded border border-slate-300 bg-slate-100 px-3 text-sm font-medium leading-none">{item.createdAt.toLocaleDateString()}</div></div>diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/event-details.tsx b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/event-details.tsxindex d180e2010..b54af6cc7 100644--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/event-details.tsx+++ b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/event-details.tsx@@ -157,8 +157,8 @@ export function EventDetails({ event, open, setOpen }: Props) {{properties.length > 0 && (<div>- <div className="text-sm font-medium mb-2">Params</div>- <div className="flex gap-2 flex-wrap">+ <div className="mb-2 text-sm font-medium">Params</div>+ <div className="flex flex-wrap gap-2">{properties.map((item) => (<KeyValuekey={item.name}@@ -177,8 +177,8 @@ export function EventDetails({ event, open, setOpen }: Props) {</div>)}<div>- <div className="text-sm font-medium mb-2">Common</div>- <div className="flex gap-2 flex-wrap">+ <div className="mb-2 text-sm font-medium">Common</div>+ <div className="flex flex-wrap gap-2">{common.map((item) => (<KeyValuekey={item.name}@@ -191,10 +191,10 @@ export function EventDetails({ event, open, setOpen }: Props) {</div><div>- <div className="flex justify-between text-sm font-medium mb-2">+ <div className="mb-2 flex justify-between text-sm font-medium"><div>Similar events</div><button- className="hover:underline text-muted-foreground"+ className="text-muted-foreground hover:underline"onClick={() => {setEvents([event.name]);setOpen(false);diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/event-edit.tsx b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/event-edit.tsxindex 659b6c820..32b6b8359 100644--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/event-edit.tsx+++ b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/event-edit.tsx@@ -80,10 +80,10 @@ export function EventEdit({ event, open, setOpen }: Props) {<SheetHeader><SheetTitle>Edit "{name}"</SheetTitle></SheetHeader>- <div className="flex flex-col gap-8 my-8">+ <div className="my-8 flex flex-col gap-8"><div><Label className="mb-4 block">Conversion</Label>- <label className="cursor-pointer flex items-center select-none border border-border rounded-md p-4 gap-4">+ <label className="flex cursor-pointer select-none items-center gap-4 rounded-md border border-border p-4"><Checkboxchecked={conversion}onCheckedChange={(checked) => {@@ -106,7 +106,7 @@ export function EventEdit({ event, open, setOpen }: Props) {setIcon(name);}}className={cn(- 'flex-shrink-0 rounded-md w-8 h-8 cursor-pointer inline-flex transition-all bg-slate-100 flex items-center justify-center',+ 'flex inline-flex h-8 w-8 flex-shrink-0 cursor-pointer items-center justify-center rounded-md bg-slate-100 transition-all',name === selectedIcon? 'scale-110 ring-1 ring-black': '[&_svg]:opacity-50'@@ -127,7 +127,7 @@ export function EventEdit({ event, open, setOpen }: Props) {setColor(color);}}className={cn(- 'flex-shrink-0 rounded-md w-8 h-8 cursor-pointer transition-all flex justify-center items-center',+ 'flex h-8 w-8 flex-shrink-0 cursor-pointer items-center justify-center rounded-md transition-all',color === selectedColor ? 'ring-1 ring-black' : '',getBg(color))}diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/event-icon.tsx b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/event-icon.tsxindex b3c7407ae..efd5c96e0 100644--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/event-icon.tsx+++ b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/event-icon.tsx@@ -23,11 +23,11 @@ import { toast } from 'sonner';import type { EventMeta } from '@openpanel/db';-const variants = cva('flex items-center justify-center shrink-0 rounded-full', {+const variants = cva('flex shrink-0 items-center justify-center rounded-full', {variants: {size: {- sm: 'w-6 h-6',- default: 'w-10 h-10',+ sm: 'h-6 w-6',+ default: 'h-10 w-10',},},defaultVariants: {diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/event-list-item.tsx b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/event-list-item.tsxindex 7f5534764..44f8a6f42 100644--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/event-list-item.tsx+++ b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/event-list-item.tsx@@ -55,11 +55,11 @@ export function EventListItem(props: EventListItemProps) {<buttononClick={() => setIsDetailsOpen(true)}className={cn(- 'w-full card p-4 flex hover:bg-slate-50 rounded-lg transition-colors justify-between items-center',+ 'card flex w-full items-center justify-between rounded-lg p-4 transition-colors hover:bg-slate-50',meta?.conversion && `bg-${meta.color}-50 hover:bg-${meta.color}-100`)}>- <div className="flex gap-4 items-center text-left text-sm">+ <div className="flex items-center gap-4 text-left text-sm"><EventIcon size="sm" name={name} meta={meta} projectId={projectId} /><span><span className="font-medium">{renderName()}</span>@@ -77,14 +77,14 @@ export function EventListItem(props: EventListItemProps) {e.stopPropagation();}}href={`/${organizationId}/${projectId}/profiles/${profile?.id}`}- className="text-muted-foreground text-sm hover:underline whitespace-nowrap max-w-[80px] overflow-hidden text-ellipsis"+ className="max-w-[80px] overflow-hidden text-ellipsis whitespace-nowrap text-sm text-muted-foreground hover:underline">{profile?.firstName} {profile?.lastName}</Link></Tooltiper><Tooltiper asChild content={createdAt.toLocaleString()}>- <div className="text-muted-foreground text-sm">+ <div className="text-sm text-muted-foreground">{createdAt.toLocaleTimeString()}</div></Tooltiper>diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/event-list.tsx b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/event-list.tsxindex 9d8b0282a..e39fd3dbd 100644--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/event-list.tsx+++ b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/event-list.tsx@@ -67,7 +67,7 @@ export function EventList({ data, count }: EventListProps) {<div className="flex flex-row justify-between gap-2 [&:not(:first-child)]:mt-12">{index === 0 ? <EventListener /> : <div />}<div className="flex gap-2">- <div className="bg-slate-100 border border-slate-300 rounded h-8 px-3 leading-none flex items-center text-sm font-medium gap-2">+ <div className="flex h-8 items-center gap-2 rounded border border-slate-300 bg-slate-100 px-3 text-sm font-medium leading-none">{item.createdAt.toLocaleDateString()}</div>{index === 0 && (diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/event-listener.tsx b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/event-listener.tsxindex 3496eec3c..b5673daaf 100644--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/event-listener.tsx+++ b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/event-listener.tsx@@ -49,17 +49,17 @@ export default function EventListener() {setCounter(0);router.refresh();}}- className="bg-white border border-border rounded h-8 px-3 leading-none flex items-center text-sm font-medium gap-2"+ className="flex h-8 items-center gap-2 rounded border border-border bg-white px-3 text-sm font-medium leading-none"><div className="relative"><divclassName={cn(- 'bg-emerald-500 h-3 w-3 rounded-full animate-ping opacity-100 transition-all'+ 'h-3 w-3 animate-ping rounded-full bg-emerald-500 opacity-100 transition-all')}></div><divclassName={cn(- 'bg-emerald-500 h-3 w-3 rounded-full absolute top-0 left-0 transition-all'+ 'absolute left-0 top-0 h-3 w-3 rounded-full bg-emerald-500 transition-all')}></div></div>diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/page.tsx b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/page.tsxindex 264da7a2c..6721a48ba 100644--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/page.tsx+++ b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/events/page.tsx@@ -57,7 +57,7 @@ export default async function Page({return (<PageLayout title="Events" organizationSlug={organizationId}>- <StickyBelowHeader className="p-4 flex justify-between">+ <StickyBelowHeader className="flex justify-between p-4"><OverviewFiltersDrawermode="events"projectId={projectId}@@ -65,11 +65,11 @@ export default async function Page({enableEventsFilter/><OverviewFiltersButtons- className="p-0 justify-end"+ className="justify-end p-0"nuqsOptions={nuqsOptions}/></StickyBelowHeader>- <div className="grid md:grid-cols-2 p-4 gap-4">+ <div className="grid gap-4 p-4 md:grid-cols-2"><div><EventList data={events} count={count} /></div>diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/layout-menu.tsx b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/layout-menu.tsxindex 660ae7c3d..04038e2df 100644--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/layout-menu.tsx+++ b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/layout-menu.tsx@@ -40,7 +40,7 @@ function LinkWithIcon({return (<LinkclassName={cn(- 'text-slate-800 text-sm font-medium flex gap-2 items-center px-3 py-2 transition-colors hover:bg-blue-100 leading-none rounded-md transition-all',+ 'flex items-center gap-2 rounded-md px-3 py-2 text-sm font-medium leading-none text-slate-800 transition-all transition-colors hover:bg-blue-100',active && 'bg-blue-50',className)}@@ -106,7 +106,7 @@ export default function LayoutMenu({ dashboards }: LayoutMenuProps) {href={`/${params.organizationId}/${projectId}/settings/organization`}/>{pathname?.includes('/settings/') && (- <div className="pl-7 flex flex-col gap-1">+ <div className="flex flex-col gap-1 pl-7"><LinkWithIconicon={BuildingIcon}label="Organization"@@ -136,14 +136,14 @@ export default function LayoutMenu({ dashboards }: LayoutMenuProps) {)}{dashboards.length > 0 && (<div className="mt-8">- <div className="font-medium mb-2 text-sm">Your dashboards</div>+ <div className="mb-2 text-sm font-medium">Your dashboards</div><div className="flex flex-col gap-2">{dashboards.map((item) => (<LinkWithIconkey={item.id}icon={LayoutPanelTopIcon}label={- <div className="flex justify-between gap-0.5 items-center">+ <div className="flex items-center justify-between gap-0.5"><span>{item.name}</span><span className="text-xs text-muted-foreground">{item.project.name}diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/layout-sidebar.tsx b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/layout-sidebar.tsxindex 1b5552b3a..bca3175a2 100644--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/layout-sidebar.tsx+++ b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/layout-sidebar.tsx@@ -38,35 +38,35 @@ export function LayoutSidebar({<buttononClick={() => setActive(false)}className={cn(- 'fixed top-0 left-0 right-0 bottom-0 backdrop-blur-sm z-30 transition-opacity',+ 'fixed bottom-0 left-0 right-0 top-0 z-30 backdrop-blur-sm transition-opacity',active- ? 'opacity-100 pointer-events-auto'- : 'opacity-0 pointer-events-none'+ ? 'pointer-events-auto opacity-100'+ : 'pointer-events-none opacity-0')}/><divclassName={cn(- 'fixed top-0 left-0 h-screen border-r border-border w-72 bg-white flex flex-col z-30 transition-transform',+ 'fixed left-0 top-0 z-30 flex h-screen w-72 flex-col border-r border-border bg-white transition-transform','-translate-x-72 lg:-translate-x-0', // responsiveactive && 'translate-x-0' // force active on mobile)}>- <div className="absolute -right-12 h-16 flex items-center lg:hidden">+ <div className="absolute -right-12 flex h-16 items-center lg:hidden"><Hamburger toggled={active} onToggle={setActive} size={20} /></div>- <div className="h-16 border-b border-border px-4 shrink-0 flex items-center">+ <div className="flex h-16 shrink-0 items-center border-b border-border px-4"><Link href="/"><Logo /></Link></div>- <div className="flex flex-col p-4 gap-2 flex-grow overflow-auto">+ <div className="flex flex-grow flex-col gap-2 overflow-auto p-4"><LayoutMenu dashboards={dashboards} />{/* Placeholder for LayoutOrganizationSelector */}- <div className="h-32 block shrink-0"></div>+ <div className="block h-32 shrink-0"></div></div><div className="fixed bottom-0 left-0 right-0">- <div className="bg-gradient-to-t from-white to-white/0 h-8 w-full"></div>- <div className="bg-white p-4 pt-0 flex flex-col gap-2">+ <div className="h-8 w-full bg-gradient-to-t from-white to-white/0"></div>+ <div className="flex flex-col gap-2 bg-white p-4 pt-0"><LinkclassName={cn('flex gap-2', buttonVariants())}href={`/${organizationId}/${projectId}/reports`}diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/layout-sticky-below-header.tsx b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/layout-sticky-below-header.tsxindex b0cd9b5e8..22578f9d5 100644--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/layout-sticky-below-header.tsx+++ b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/layout-sticky-below-header.tsx@@ -12,7 +12,7 @@ export function StickyBelowHeader({return (<divclassName={cn(- 'md:sticky bg-white border-b border-border z-20 [[id=dashboard]_&]:top-16 [[id=dashboard]_&]:rounded-none rounded-lg top-0',+ 'top-0 z-20 rounded-lg border-b border-border bg-white md:sticky [[id=dashboard]_&]:top-16 [[id=dashboard]_&]:rounded-none',className)}>diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/layout.tsx b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/layout.tsxindex 74f4844b2..091c86400 100644--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/layout.tsx+++ b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/layout.tsx@@ -55,7 +55,7 @@ export default async function AppLayout({<LayoutSidebar{...{ organizationId, projectId, organizations, dashboards }}/>- <div className="lg:pl-72 transition-all">{children}</div>+ <div className="transition-all lg:pl-72">{children}</div></div>);}diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/page-layout.tsx b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/page-layout.tsxindex 7e382560a..016b94f0d 100644--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/page-layout.tsx+++ b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/page-layout.tsx@@ -20,7 +20,7 @@ export default async function PageLayout({return (<>- <div className="h-16 border-b border-border flex-shrink-0 sticky top-0 bg-white px-4 flex items-center justify-between z-20 pl-12 lg:pl-4">+ <div className="sticky top-0 z-20 flex h-16 flex-shrink-0 items-center justify-between border-b border-border bg-white px-4 pl-12 lg:pl-4"><div className="text-xl font-medium">{title}</div>{projects.length > 0 && <LayoutProjectSelector projects={projects} />}</div>diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/page.tsx b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/page.tsxindex 62c984f80..94eab5fba 100644--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/page.tsx+++ b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/page.tsx@@ -35,7 +35,7 @@ export default async function Page({return (<PageLayout title="Overview" organizationSlug={organizationId}><StickyBelowHeader>- <div className="p-4 flex gap-2 justify-between">+ <div className="flex justify-between gap-2 p-4"><div className="flex gap-2"><OverviewReportRange /><OverviewFiltersDrawer projectId={projectId} mode="events" />@@ -47,7 +47,7 @@ export default async function Page({</div><OverviewFiltersButtons /></StickyBelowHeader>- <div className="p-4 grid gap-4 grid-cols-6">+ <div className="grid grid-cols-6 gap-4 p-4"><div className="col-span-6"><OverviewLiveHistogram projectId={projectId} /></div>diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/profiles/[profileId]/page.tsx b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/profiles/[profileId]/page.tsxindex 793a6e1a5..7d464b47a 100644--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/profiles/[profileId]/page.tsx+++ b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/profiles/[profileId]/page.tsx@@ -133,7 +133,7 @@ export default async function Page({</div>}>- <StickyBelowHeader className="p-4 flex justify-between">+ <StickyBelowHeader className="flex justify-between p-4"><OverviewFiltersDrawerprojectId={projectId}mode="events"@@ -141,11 +141,11 @@ export default async function Page({/><OverviewFiltersButtonsnuqsOptions={{ shallow: false }}- className="p-0 justify-end"+ className="justify-end p-0"/></StickyBelowHeader><div className="p-4">- <div className="grid gap-4 grid-cols-1 md:grid-cols-2 mb-8">+ <div className="mb-8 grid grid-cols-1 gap-4 md:grid-cols-2"><div><EventList data={events} count={count} /></div>@@ -159,7 +159,7 @@ export default async function Page({</WidgetBody></Widget><Widget className="w-full">- <WidgetHead className="flex justify-between items-center">+ <WidgetHead className="flex items-center justify-between"><span className="title">Profile</span><ProfileAvatar {...profile} /></WidgetHead>@@ -199,10 +199,10 @@ function ValueRow({ name, value }: { name: string; value?: unknown }) {}return (<div className="flex flex-row justify-between p-2 px-4">- <div className="font-medium text-muted-foreground capitalize">+ <div className="font-medium capitalize text-muted-foreground">{name.replace('_', ' ')}</div>- <div className="flex gap-2 items-center text-right">+ <div className="flex items-center gap-2 text-right">{typeof value === 'string' ? (<><SerieIcon name={value} /> {value}diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/profiles/page.tsx b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/profiles/page.tsxindex aa69df260..1563f8a36 100644--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/profiles/page.tsx+++ b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/profiles/page.tsx@@ -30,18 +30,18 @@ export default function Page({}: PageProps) {return (<PageLayout title="Profiles" organizationSlug={organizationId}>- <StickyBelowHeader className="p-4 flex justify-between">+ <StickyBelowHeader className="flex justify-between p-4"><OverviewFiltersDrawerprojectId={projectId}nuqsOptions={nuqsOptions}mode="events"/><OverviewFiltersButtons- className="p-0 justify-end"+ className="justify-end p-0"nuqsOptions={nuqsOptions}/></StickyBelowHeader>- <div className="p-4 grid grid-cols-1 md:grid-cols-2 gap-4">+ <div className="grid grid-cols-1 gap-4 p-4 md:grid-cols-2"><ProfileListServerprojectId={projectId}cursor={parseAsInteger.parseServerSide(cursor ?? '') ?? undefined}diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/profiles/profile-last-seen/index.tsx b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/profiles/profile-last-seen/index.tsxindex 174668b31..59a106516 100644--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/profiles/profile-last-seen/index.tsx+++ b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/profiles/profile-last-seen/index.tsx@@ -29,11 +29,11 @@ export default async function ProfileLastSeenServer({ projectId }: Props) {const renderItem = (item: Row) => (<divkey={item.days}- className="flex-1 shrink-0 h-full flex flex-col items-center"+ className="flex h-full flex-1 shrink-0 flex-col items-center"><Tooltip><TooltipTrigger asChild>- <div className="w-full flex-1 bg-slate-200 rounded flex flex-col justify-end">+ <div className="flex w-full flex-1 flex-col justify-end rounded bg-slate-200"><divclassName={cn('w-full rounded',@@ -50,7 +50,7 @@ export default async function ProfileLastSeenServer({ projectId }: Props) {{item.days === 0 ? 'today' : `${item.days} days ago`}</TooltipContent></Tooltip>- <div className="text-xs mt-1">{item.days}</div>+ <div className="mt-1 text-xs">{item.days}</div></div>);return (@@ -59,7 +59,7 @@ export default async function ProfileLastSeenServer({ projectId }: Props) {<div className="title">Last seen</div></WidgetHead><WidgetBody>- <div className="flex aspect-[3/1] w-full gap-1 items-end">+ <div className="flex aspect-[3/1] w-full items-end gap-1">{res.length >= 18 ? (<>{res.slice(0, split).map(renderItem)}diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/profiles/profile-list/profile-list.tsx b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/profiles/profile-list/profile-list.tsxindex e290487f7..2f9d23b49 100644--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/profiles/profile-list/profile-list.tsx+++ b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/profiles/profile-list/profile-list.tsx@@ -25,7 +25,7 @@ export function ProfileList({ data, count }: ProfileListProps) {const { cursor, setCursor } = useCursor();return (<Widget>- <WidgetHead className="flex justify-between items-center">+ <WidgetHead className="flex items-center justify-between"><div className="title">Profiles</div><Paginationsize="sm"@@ -47,7 +47,7 @@ export function ProfileList({ data, count }: ProfileListProps) {return (<Linkhref={`/${organizationId}/${projectId}/profiles/${profile.id}`}- className="flex gap-2 items-center font-medium"+ className="flex items-center gap-2 font-medium"><ProfileAvatar size="sm" {...profile} />{getProfileName(profile)}@@ -69,7 +69,7 @@ export function ProfileList({ data, count }: ProfileListProps) {asChildcontent={profile.createdAt.toLocaleString()}>- <div className="text-muted-foreground text-sm">+ <div className="text-sm text-muted-foreground">{profile.createdAt.toLocaleTimeString()}</div></Tooltiper>@@ -78,7 +78,7 @@ export function ProfileList({ data, count }: ProfileListProps) {},]}/>- <div className="p-4 border-t border-border">+ <div className="border-t border-border p-4"><Paginationcursor={cursor}setCursor={setCursor}diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/profiles/profile-top/index.tsx b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/profiles/profile-top/index.tsxindex 7db8f422c..2abb87394 100644--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/profiles/profile-top/index.tsx+++ b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/profiles/profile-top/index.tsx@@ -44,7 +44,7 @@ export default async function ProfileTopServer({return (<Linkhref={`/${organizationId}/${projectId}/profiles/${profile.id}`}- className="flex gap-2 items-center font-medium"+ className="flex items-center gap-2 font-medium"><ProfileAvatar size="sm" {...profile} />{getProfileName(profile)}diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/reports/[reportId]/page.tsx b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/reports/[reportId]/page.tsxindex 1051caf92..2f512a6d6 100644--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/reports/[reportId]/page.tsx+++ b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/reports/[reportId]/page.tsx@@ -27,7 +27,7 @@ export default async function Page({<PageLayoutorganizationSlug={organizationId}title={- <div className="flex gap-2 items-center cursor-pointer">+ <div className="flex cursor-pointer items-center gap-2">{report.name}<Pencil size={16} /></div>diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/reports/page.tsx b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/reports/page.tsxindex c2d2ee609..5c5f91b55 100644--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/reports/page.tsx+++ b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/reports/page.tsx@@ -15,7 +15,7 @@ export default function Page({ params: { organizationId } }: PageProps) {<PageLayoutorganizationSlug={organizationId}title={- <div className="flex gap-2 items-center cursor-pointer">+ <div className="flex cursor-pointer items-center gap-2">Unnamed report<Pencil size={16} /></div>diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/reports/report-editor.tsx b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/reports/report-editor.tsxindex b2301658a..eecd33557 100644--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/reports/report-editor.tsx+++ b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/reports/report-editor.tsx@@ -53,7 +53,7 @@ export default function ReportEditor({return (<Sheet>- <StickyBelowHeader className="p-4 grid grid-cols-2 gap-2 md:grid-cols-6">+ <StickyBelowHeader className="grid grid-cols-2 gap-2 p-4 md:grid-cols-6"><SheetTrigger asChild><div><Button icon={GanttChartSquareIcon} variant="cta">@@ -61,7 +61,7 @@ export default function ReportEditor({</Button></div></SheetTrigger>- <div className="grid grid-cols-2 md:grid-cols-4 gap-2 col-span-4">+ <div className="col-span-4 grid grid-cols-2 gap-2 md:grid-cols-4"><ReportChartType className="min-w-0 flex-1" /><ReportRangeclassName="min-w-0 flex-1"@@ -93,7 +93,7 @@ export default function ReportEditor({<ReportInterval className="min-w-0 flex-1" /><ReportLineType className="min-w-0 flex-1" /></div>- <div className="col-start-2 md:col-start-6 row-start-1 text-right">+ <div className="col-start-2 row-start-1 text-right md:col-start-6"><ReportSaveButton /></div></StickyBelowHeader>diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/clients/list-clients.tsx b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/clients/list-clients.tsxindex f8e615093..fb3c26f1c 100644--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/clients/list-clients.tsx+++ b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/clients/list-clients.tsx@@ -16,7 +16,7 @@ export default function ListClients({ clients }: ListClientsProps) {return (<><StickyBelowHeader>- <div className="p-4 flex items-center justify-between">+ <div className="flex items-center justify-between p-4"><div /><Button icon={PlusIcon} onClick={() => pushModal('AddClient')}><span className="max-sm:hidden">Create client</span>diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/invites/create-invite.tsx b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/invites/create-invite.tsxindex 428cc392e..701c0f040 100644--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/invites/create-invite.tsx+++ b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/invites/create-invite.tsx@@ -123,7 +123,7 @@ export default function CreateInvite({ projects }: Props) {value: item.id,}))}/>- <p className="text-xs text-muted-foreground mt-1">+ <p className="mt-1 text-xs text-muted-foreground">Leave empty to give access to all projects</p></div>diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/invites/invites.tsx b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/invites/invites.tsxindex adf4537e5..b5a2510bf 100644--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/invites/invites.tsx+++ b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/invites/invites.tsx@@ -73,7 +73,7 @@ function Item({{new Date(createdAt).toLocaleDateString()}</TooltipComplete></TableCell>- <TableCell className="capitalize flex items-center gap-2">+ <TableCell className="flex items-center gap-2 capitalize"><DotclassName={cn(status === 'accepted' && 'bg-emerald-600',diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/page.tsx b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/page.tsxindex 9ced455d5..aef8fb8c9 100644--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/page.tsx+++ b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/page.tsx@@ -26,7 +26,7 @@ export default async function Page({return (<PageLayout title={organization.name} organizationSlug={organizationSlug}>- <div className="p-4 grid grid-cols-1 gap-8">+ <div className="grid grid-cols-1 gap-8 p-4"><EditOrganization organization={organization} /><MembersServer organizationSlug={organizationSlug} /><InvitesServer organizationSlug={organizationSlug} />diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/profile/page.tsx b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/profile/page.tsxindex bbe12f3b0..650969b3a 100644--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/profile/page.tsx+++ b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/profile/page.tsx@@ -17,7 +17,7 @@ export default async function Page({ params: { organizationId } }: PageProps) {return (<PageLayout title={profile.lastName} organizationSlug={organizationId}>- <div className="p-4 flex flex-col gap-4">+ <div className="flex flex-col gap-4 p-4"><EditProfile profile={profile} /><Logout /></div>diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/projects/list-projects.tsx b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/projects/list-projects.tsxindex 3112a8a0d..d04efdfe4 100644--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/projects/list-projects.tsx+++ b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/projects/list-projects.tsx@@ -18,7 +18,7 @@ export default function ListProjects({ projects }: ListProjectsProps) {return (<><StickyBelowHeader>- <div className="p-4 flex items-center justify-between">+ <div className="flex items-center justify-between p-4"><div /><Buttonicon={PlusIcon}diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/references/list-references.tsx b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/references/list-references.tsxindex 2f284563c..0040cc796 100644--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/references/list-references.tsx+++ b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/references/list-references.tsx@@ -17,7 +17,7 @@ export default function ListReferences({ data }: ListProjectsProps) {return (<><StickyBelowHeader>- <div className="p-4 flex items-center justify-between">+ <div className="flex items-center justify-between p-4"><div /><Button icon={PlusIcon} onClick={() => pushModal('AddReference')}><span className="max-sm:hidden">Create reference</span>diff --git a/apps/dashboard/src/app/(app)/[organizationId]/create-project.tsx b/apps/dashboard/src/app/(app)/[organizationId]/create-project.tsxindex 8ebecfb47..4990d30ef 100644--- a/apps/dashboard/src/app/(app)/[organizationId]/create-project.tsx+++ b/apps/dashboard/src/app/(app)/[organizationId]/create-project.tsx@@ -44,8 +44,8 @@ export function CreateProject() {return (<><div>- <LogoSquare className="w-20 md:w-28 mb-8" />- <h1 className="font-medium text-3xl">Create your first project</h1>+ <LogoSquare className="mb-8 w-20 md:w-28" />+ <h1 className="text-3xl font-medium">Create your first project</h1><div className="text-lg">A project is just a container for your events. You can create as manyas you want.diff --git a/apps/dashboard/src/app/(app)/[organizationId]/page.tsx b/apps/dashboard/src/app/(app)/[organizationId]/page.tsxindex 6675966a2..655fd66b3 100644--- a/apps/dashboard/src/app/(app)/[organizationId]/page.tsx+++ b/apps/dashboard/src/app/(app)/[organizationId]/page.tsx@@ -31,10 +31,10 @@ export default async function Page({ params: { organizationId } }: PageProps) {const isAccepted = await isWaitlistUserAccepted();if (!isAccepted) {return (- <div className="p-4 flex items-center justify-center h-screen">- <div className="max-w-lg w-full">- <LogoSquare className="w-20 md:w-28 mb-8" />- <h1 className="font-medium text-3xl">Not quite there yet</h1>+ <div className="flex h-screen items-center justify-center p-4">+ <div className="w-full max-w-lg">+ <LogoSquare className="mb-8 w-20 md:w-28" />+ <h1 className="text-3xl font-medium">Not quite there yet</h1><div className="text-lg">We're still working on Openpanel, but we're not quite there yet.We'll let you know when we're ready to go!@@ -47,8 +47,8 @@ export default async function Page({ params: { organizationId } }: PageProps) {if (projects.length === 0) {return (- <div className="flex items-center justify-center h-screen p-4 ">- <div className="max-w-lg w-full">+ <div className="flex h-screen items-center justify-center p-4 ">+ <div className="w-full max-w-lg"><CreateProject /></div></div>@@ -60,8 +60,8 @@ export default async function Page({ params: { organizationId } }: PageProps) {}return (- <div className="max-w-xl w-full mx-auto flex flex-col gap-4 pt-20 p-4 ">- <h1 className="font-medium text-xl">Select project</h1>+ <div className="mx-auto flex w-full max-w-xl flex-col gap-4 p-4 pt-20 ">+ <h1 className="text-xl font-medium">Select project</h1>{projects.map((item) => (<ProjectCard key={item.id} {...item} />))}diff --git a/apps/dashboard/src/app/(app)/create-organization.tsx b/apps/dashboard/src/app/(app)/create-organization.tsxindex 2800bc76c..331918284 100644--- a/apps/dashboard/src/app/(app)/create-organization.tsx+++ b/apps/dashboard/src/app/(app)/create-organization.tsx@@ -58,14 +58,14 @@ export function CreateOrganization() {if (mutation.isSuccess && mutation.data.client) {return (<div className="card p-4 md:p-8">- <LogoSquare className="w-20 mb-4" />- <h1 className="font-medium text-3xl">Nice job!</h1>+ <LogoSquare className="mb-4 w-20" />+ <h1 className="text-3xl font-medium">Nice job!</h1><div className="mb-4">You're ready to start using our SDK. Save the client ID and secret (ifyou have any)</div><CreateClientSuccess {...mutation.data.client} />- <div className="flex gap-4 mt-4">+ <div className="mt-4 flex gap-4"><aclassName={cn(buttonVariants({ variant: 'secondary' }), 'flex-1')}href="https://docs.openpanel.dev/docs"@@ -87,8 +87,8 @@ export function CreateOrganization() {return (<div className="card p-4 md:p-8">- <LogoSquare className="w-20 mb-4" />- <h1 className="font-medium text-3xl">Welcome to Openpanel</h1>+ <LogoSquare className="mb-4 w-20" />+ <h1 className="text-3xl font-medium">Welcome to Openpanel</h1><div className="text-lg">Create your organization below (can be personal or a company) and yourfirst project.@@ -132,7 +132,7 @@ export function CreateOrganization() {/></TabsContent><TabsContent value="other">- <div className="p-2 px-3 bg-white rounded text-sm">+ <div className="rounded bg-white p-2 px-3 text-sm">🔑 You will get a secret to use for your API requests.</div></TabsContent>diff --git a/apps/dashboard/src/app/(app)/page.tsx b/apps/dashboard/src/app/(app)/page.tsxindex a519f0074..46c3948a6 100644--- a/apps/dashboard/src/app/(app)/page.tsx+++ b/apps/dashboard/src/app/(app)/page.tsx@@ -13,10 +13,10 @@ export default async function Page() {const isAccepted = await isWaitlistUserAccepted();if (!isAccepted) {return (- <div className="flex items-center justify-center h-screen">- <div className="max-w-lg w-full">- <LogoSquare className="w-20 md:w-28 mb-8" />- <h1 className="font-medium text-3xl">Not quite there yet</h1>+ <div className="flex h-screen items-center justify-center">+ <div className="w-full max-w-lg">+ <LogoSquare className="mb-8 w-20 md:w-28" />+ <h1 className="text-3xl font-medium">Not quite there yet</h1><div className="text-lg">We're still working on Openpanel, but we're not quite there yet.We'll let you know when we're ready to go!@@ -32,8 +32,8 @@ export default async function Page() {}return (- <div className="flex items-center justify-center h-screen">- <div className="max-w-lg w-full">+ <div className="flex h-screen items-center justify-center">+ <div className="w-full max-w-lg"><CreateOrganization /></div></div>diff --git a/apps/dashboard/src/app/(public)/share/overview/[id]/page.tsx b/apps/dashboard/src/app/(public)/share/overview/[id]/page.tsxindex b8253f866..e6d86f257 100644--- a/apps/dashboard/src/app/(public)/share/overview/[id]/page.tsx+++ b/apps/dashboard/src/app/(public)/share/overview/[id]/page.tsx@@ -32,12 +32,12 @@ export default async function Page({ params: { id } }: PageProps) {const organization = await getOrganizationBySlug(share.organization_slug);return (- <div className="p-4 md:p-16 bg-gradient-to-tl from-blue-950 to-blue-600">- <div className="max-w-6xl mx-auto">- <div className="flex justify-between items-end mb-4">+ <div className="bg-gradient-to-tl from-blue-950 to-blue-600 p-4 md:p-16">+ <div className="mx-auto max-w-6xl">+ <div className="mb-4 flex items-end justify-between"><div className="leading-none">- <span className="text-white mb-4">{organization?.name}</span>- <h1 className="text-white text-xl font-medium">+ <span className="mb-4 text-white">{organization?.name}</span>+ <h1 className="text-xl font-medium text-white">{share.project?.name}</h1></div>@@ -45,9 +45,9 @@ export default async function Page({ params: { id } }: PageProps) {<Logo className="text-white max-sm:[&_span]:hidden" /></a></div>- <div className="max-sm:-mx-3 bg-slate-100 rounded-lg shadow ring-8 ring-blue-600/50">+ <div className="rounded-lg bg-slate-100 shadow ring-8 ring-blue-600/50 max-sm:-mx-3"><StickyBelowHeader>- <div className="p-4 flex gap-2 justify-between">+ <div className="flex justify-between gap-2 p-4"><div className="flex gap-2"><OverviewReportRange />{/* <OverviewFiltersDrawer projectId={projectId} mode="events" /> */}@@ -58,7 +58,7 @@ export default async function Page({ params: { id } }: PageProps) {</div><OverviewFiltersButtons /></StickyBelowHeader>- <div className="p-4 grid gap-4 grid-cols-6">+ <div className="grid grid-cols-6 gap-4 p-4"><div className="col-span-6"><OverviewLiveHistogram projectId={projectId} /></div>diff --git a/apps/dashboard/src/app/auth.tsx b/apps/dashboard/src/app/auth.tsxindex 497eff0dd..7fbda21d6 100644--- a/apps/dashboard/src/app/auth.tsx+++ b/apps/dashboard/src/app/auth.tsx@@ -28,8 +28,8 @@ export default function Auth() {const pathname = usePathname();const [state, setState] = useState<string | null>(null);return (- <div className="flex items-center justify-center flex-col h-screen p-4">- <Widget className="max-w-md w-full mb-4">+ <div className="flex h-screen flex-col items-center justify-center p-4">+ <Widget className="mb-4 w-full max-w-md"><WidgetBody><div className="flex justify-center py-8"><Logo />diff --git a/apps/dashboard/src/app/layout.tsx b/apps/dashboard/src/app/layout.tsxindex 65f850adc..c42e89cfd 100644--- a/apps/dashboard/src/app/layout.tsx+++ b/apps/dashboard/src/app/layout.tsx@@ -24,7 +24,7 @@ export default function RootLayout({return (<html lang="en" className="light"><body- className={cn('min-h-screen font-sans antialiased grainy bg-slate-100')}+ className={cn('grainy min-h-screen bg-slate-100 font-sans antialiased')}><Providers>{children}</Providers></body>diff --git a/apps/dashboard/src/components/button-container.tsx b/apps/dashboard/src/components/button-container.tsxindex 2ec188414..7d5d2eea5 100644--- a/apps/dashboard/src/components/button-container.tsx+++ b/apps/dashboard/src/components/button-container.tsx@@ -6,6 +6,6 @@ export function ButtonContainer({...props}: HtmlProps<HTMLDivElement>) {return (- <div className={cn('flex justify-between mt-6', className)} {...props} />+ <div className={cn('mt-6 flex justify-between', className)} {...props} />);}diff --git a/apps/dashboard/src/components/card.tsx b/apps/dashboard/src/components/card.tsxindex ad3763a53..46c3870e3 100644--- a/apps/dashboard/src/components/card.tsx+++ b/apps/dashboard/src/components/card.tsx@@ -34,9 +34,9 @@ interface CardActionsProps {}export function CardActions({ children }: CardActionsProps) {return (- <div className="absolute top-2 right-2 z-10">+ <div className="absolute right-2 top-2 z-10"><DropdownMenu>- <DropdownMenuTrigger className="h-8 w-8 hover:border rounded justify-center items-center flex">+ <DropdownMenuTrigger className="flex h-8 w-8 items-center justify-center rounded hover:border"><MoreHorizontal size={16} /></DropdownMenuTrigger><DropdownMenuContent align="end" className="w-[200px]">diff --git a/apps/dashboard/src/components/forms/input-with-label.tsx b/apps/dashboard/src/components/forms/input-with-label.tsxindex 32fbbdb16..e2d91c66c 100644--- a/apps/dashboard/src/components/forms/input-with-label.tsx+++ b/apps/dashboard/src/components/forms/input-with-label.tsx@@ -13,12 +13,12 @@ export const InputWithLabel = forwardRef<HTMLInputElement, InputWithLabelProps>(({ label, className, ...props }, ref) => {return (<div className={className}>- <div className="block mb-2 flex justify-between">+ <div className="mb-2 block flex justify-between"><Label className="mb-0" htmlFor={label}>{label}</Label>{props.error && (- <span className="text-sm text-destructive leading-none">+ <span className="text-sm leading-none text-destructive">{props.error}</span>)}diff --git a/apps/dashboard/src/components/full-page-empty-state.tsx b/apps/dashboard/src/components/full-page-empty-state.tsxindex 6c74dfbc6..4e0165db6 100644--- a/apps/dashboard/src/components/full-page-empty-state.tsx+++ b/apps/dashboard/src/components/full-page-empty-state.tsx@@ -16,13 +16,13 @@ export function FullPageEmptyState({className,}: FullPageEmptyStateProps) {return (- <div className={cn('p-4 flex items-center justify-center', className)}>- <div className="p-8 w-full max-w-xl flex flex-col items-center justify-center">- <div className="w-24 h-24 bg-white shadow-sm rounded-full flex justify-center items-center mb-6">+ <div className={cn('flex items-center justify-center p-4', className)}>+ <div className="flex w-full max-w-xl flex-col items-center justify-center p-8">+ <div className="mb-6 flex h-24 w-24 items-center justify-center rounded-full bg-white shadow-sm"><Icon size={60} strokeWidth={1} /></div>- <h1 className="text-xl font-medium mb-1">{title}</h1>+ <h1 className="mb-1 text-xl font-medium">{title}</h1>{children}</div>diff --git a/apps/dashboard/src/components/logo.tsx b/apps/dashboard/src/components/logo.tsxindex 700db9023..71a70b149 100644--- a/apps/dashboard/src/components/logo.tsx+++ b/apps/dashboard/src/components/logo.tsx@@ -17,7 +17,7 @@ export function LogoSquare({ className }: LogoProps) {export function Logo({ className }: LogoProps) {return (<div- className={cn('text-xl font-medium flex gap-2 items-center', className)}+ className={cn('flex items-center gap-2 text-xl font-medium', className)}><LogoSquare className="max-h-8" /><span>openpanel.dev</span>diff --git a/apps/dashboard/src/components/overview/filters/overview-filters-drawer-content.tsx b/apps/dashboard/src/components/overview/filters/overview-filters-drawer-content.tsxindex 807561904..4da8cd889 100644--- a/apps/dashboard/src/components/overview/filters/overview-filters-drawer-content.tsx+++ b/apps/dashboard/src/components/overview/filters/overview-filters-drawer-content.tsx@@ -76,7 +76,7 @@ export function OverviewFiltersDrawerContent({/></div>- <div className="flex flex-col gap-4 mt-8">+ <div className="mt-8 flex flex-col gap-4">{filters.filter((filter) => filter.value[0] !== null).map((filter) => {@@ -120,7 +120,7 @@ export function FilterOptionEvent({);return (- <div className="flex gap-2 items-center">+ <div className="flex items-center gap-2"><div>{filter.name}</div><ComboboxclassName="flex-1"@@ -160,7 +160,7 @@ export function FilterOptionProfile({const values = useProfileValues(projectId, filter.name);return (- <div className="flex gap-2 items-center">+ <div className="flex items-center gap-2"><div>{filter.name}</div><ComboboxclassName="flex-1"diff --git a/apps/dashboard/src/components/overview/filters/overview-filters-drawer.tsx b/apps/dashboard/src/components/overview/filters/overview-filters-drawer.tsxindex 5a3d8842f..7eaa9cb27 100644--- a/apps/dashboard/src/components/overview/filters/overview-filters-drawer.tsx+++ b/apps/dashboard/src/components/overview/filters/overview-filters-drawer.tsx@@ -17,7 +17,7 @@ export function OverviewFiltersDrawer(Filters</Button></SheetTrigger>- <SheetContent className="!max-w-lg w-full" side="right">+ <SheetContent className="w-full !max-w-lg" side="right"><OverviewFiltersDrawerContent {...props} /></SheetContent></Sheet>diff --git a/apps/dashboard/src/components/overview/live-counter/live-counter.tsx b/apps/dashboard/src/components/overview/live-counter/live-counter.tsxindex 2b5c1cf8e..0173f0f81 100644--- a/apps/dashboard/src/components/overview/live-counter/live-counter.tsx+++ b/apps/dashboard/src/components/overview/live-counter/live-counter.tsx@@ -58,18 +58,18 @@ export default function LiveCounter({ data = 0, projectId }: LiveCounterProps) {<TooltipTrigger asChild><buttononClick={() => setLiveHistogram((p) => !p)}- className="border border-border rounded h-8 px-3 leading-none flex items-center font-medium gap-2"+ className="flex h-8 items-center gap-2 rounded border border-border px-3 font-medium leading-none"><div className="relative"><divclassName={cn(- 'bg-emerald-500 h-3 w-3 rounded-full animate-ping opacity-100 transition-all',+ 'h-3 w-3 animate-ping rounded-full bg-emerald-500 opacity-100 transition-all',counter === 0 && 'bg-destructive opacity-0')}></div><divclassName={cn(- 'bg-emerald-500 h-3 w-3 rounded-full absolute top-0 left-0 transition-all',+ 'absolute left-0 top-0 h-3 w-3 rounded-full bg-emerald-500 transition-all',counter === 0 && 'bg-destructive')}></div>diff --git a/apps/dashboard/src/components/overview/overview-live-histogram.tsx b/apps/dashboard/src/components/overview/overview-live-histogram.tsxindex a375a4b45..983806c40 100644--- a/apps/dashboard/src/components/overview/overview-live-histogram.tsx+++ b/apps/dashboard/src/components/overview/overview-live-histogram.tsx@@ -85,7 +85,7 @@ export function OverviewLiveHistogram({{staticArray.map((percent, i) => (<divkey={i}- className="flex-1 rounded-md bg-slate-200 animate-pulse"+ className="flex-1 animate-pulse rounded-md bg-slate-200"style={{ height: `${percent}%` }}/>))}@@ -105,7 +105,7 @@ export function OverviewLiveHistogram({<TooltipTrigger asChild><divclassName={cn(- 'flex-1 rounded-md hover:scale-110 transition-all ease-in-out',+ 'flex-1 rounded-md transition-all ease-in-out hover:scale-110',minute.count === 0 ? 'bg-slate-200' : 'bg-blue-600')}style={{@@ -136,14 +136,14 @@ interface WrapperProps {function Wrapper({ open, children, count }: WrapperProps) {return (<AnimateHeight duration={500} height={open ? 'auto' : 0}>- <div className="flex items-end flex-col md:flex-row">- <div className="md:mr-2 flex md:flex-col max-md:justify-between items-end max-md:w-full max-md:mb-2 md:card md:p-4">+ <div className="flex flex-col items-end md:flex-row">+ <div className="md:card flex items-end max-md:mb-2 max-md:w-full max-md:justify-between md:mr-2 md:flex-col md:p-4"><div className="text-sm max-md:mb-1">Last 30 minutes</div>- <div className="text-2xl font-bold text-ellipsis overflow-hidden whitespace-nowrap">+ <div className="overflow-hidden text-ellipsis whitespace-nowrap text-2xl font-bold">{count}</div></div>- <div className="max-h-[150px] aspect-[5/1] flex flex-1 gap-0.5 md:gap-2 items-end w-full relative">+ <div className="relative flex aspect-[5/1] max-h-[150px] w-full flex-1 items-end gap-0.5 md:gap-2"><div className="absolute -top-3 right-0 text-xs text-muted-foreground">NOW</div>diff --git a/apps/dashboard/src/components/overview/overview-metrics.tsx b/apps/dashboard/src/components/overview/overview-metrics.tsxindex 827d00f44..dd0db21e4 100644--- a/apps/dashboard/src/components/overview/overview-metrics.tsx+++ b/apps/dashboard/src/components/overview/overview-metrics.tsx@@ -192,13 +192,13 @@ export default function OverviewMetrics({ projectId }: OverviewMetricsProps) {return (<>- <div className="grid grid-cols-6 col-span-6 gap-1">+ <div className="col-span-6 grid grid-cols-6 gap-1">{reports.map((report, index) => (<buttonkey={index}className={cn(- 'relative col-span-3 md:col-span-2 lg:col-span-1 group transition-all scale-95',- index === metric && 'shadow-md rounded-xl scale-105 z-10'+ 'group relative col-span-3 scale-95 transition-all md:col-span-2 lg:col-span-1',+ index === metric && 'z-10 scale-105 rounded-xl shadow-md')}onClick={() => {setMetric(index);diff --git a/apps/dashboard/src/components/overview/overview-widget.tsx b/apps/dashboard/src/components/overview/overview-widget.tsxindex 28d0d6d03..89108cf8d 100644--- a/apps/dashboard/src/components/overview/overview-widget.tsx+++ b/apps/dashboard/src/components/overview/overview-widget.tsx@@ -20,7 +20,7 @@ export function WidgetHead({ className, ...props }: WidgetHeadProps) {return (<WidgetHeadBaseclassName={cn(- 'flex flex-col p-0 [&_.title]:p-4 [&_.title]:flex [&_.title]:justify-between [&_.title]:items-center',+ 'flex flex-col p-0 [&_.title]:flex [&_.title]:items-center [&_.title]:justify-between [&_.title]:p-4',className)}{...props}@@ -85,7 +85,7 @@ export function WidgetButtons({<divref={container}className={cn(- 'px-4 self-stretch justify-start transition-opacity flex flex-wrap [&_button]:text-xs [&_button]:opacity-50 [&_button]:whitespace-nowrap [&_button.active]:opacity-100 [&_button.active]:border-b [&_button.active]:border-black [&_button]:py-1',+ 'flex flex-wrap justify-start self-stretch px-4 transition-opacity [&_button.active]:border-b [&_button.active]:border-black [&_button.active]:opacity-100 [&_button]:whitespace-nowrap [&_button]:py-1 [&_button]:text-xs [&_button]:opacity-50',className)}style={{ gap }}@@ -102,7 +102,7 @@ export function WidgetButtons({<DropdownMenuTrigger asChild><buttonclassName={cn(- 'flex items-center gap-1 select-none',+ 'flex select-none items-center gap-1',sizes.current.length - 1 === slice ? hidden : 'opacity-50')}>diff --git a/apps/dashboard/src/components/pagination.tsx b/apps/dashboard/src/components/pagination.tsxindex b9fb37ebc..8a46e361b 100644--- a/apps/dashboard/src/components/pagination.tsx+++ b/apps/dashboard/src/components/pagination.tsx@@ -48,9 +48,9 @@ export function Pagination({>{size === 'base' && (<>- <div className="font-medium text-xs">Page: {cursor + 1}</div>+ <div className="text-xs font-medium">Page: {cursor + 1}</div>{typeof count === 'number' && (- <div className="font-medium text-xs">Total rows: {count}</div>+ <div className="text-xs font-medium">Total rows: {count}</div>)}</>)}diff --git a/apps/dashboard/src/components/projects/project-card.tsx b/apps/dashboard/src/components/projects/project-card.tsxindex c01c0d41d..61d8630da 100644--- a/apps/dashboard/src/components/projects/project-card.tsx+++ b/apps/dashboard/src/components/projects/project-card.tsx@@ -34,30 +34,30 @@ export async function ProjectCard({return (<Linkhref={`/${organizationSlug}/${id}`}- className="card p-4 inline-flex flex-col gap-2 hover:-translate-y-1 transition-transform"+ className="card inline-flex flex-col gap-2 p-4 transition-transform hover:-translate-y-1"><div className="font-medium">{name}</div>- <div className="aspect-[15/1] -mx-4">+ <div className="-mx-4 aspect-[15/1]"><ChartSSR data={chart.map((d) => ({ ...d, date: new Date(d.date) }))} /></div>- <div className="flex gap-4 justify-between text-muted-foreground text-sm">+ <div className="flex justify-between gap-4 text-sm text-muted-foreground"><div className="font-medium">Visitors</div><div className="flex gap-4">- <div className="flex flex-col md:flex-row gap-2">+ <div className="flex flex-col gap-2 md:flex-row"><div>Total</div>- <span className="text-black font-medium">+ <span className="font-medium text-black">{shortNumber('en')(data?.total)}</span></div>- <div className="flex flex-col md:flex-row gap-2">+ <div className="flex flex-col gap-2 md:flex-row"><div>Month</div>- <span className="text-black font-medium">+ <span className="font-medium text-black">{shortNumber('en')(data?.month)}</span></div>- <div className="flex flex-col md:flex-row gap-2">+ <div className="flex flex-col gap-2 md:flex-row"><div>24h</div>- <span className="text-black font-medium">+ <span className="font-medium text-black">{shortNumber('en')(data?.day)}</span></div>diff --git a/apps/dashboard/src/components/report/PreviousDiffIndicator.tsx b/apps/dashboard/src/components/report/PreviousDiffIndicator.tsxindex 92993552a..9c4b00927 100644--- a/apps/dashboard/src/components/report/PreviousDiffIndicator.tsx+++ b/apps/dashboard/src/components/report/PreviousDiffIndicator.tsx@@ -95,7 +95,7 @@ export function PreviousDiffIndicatorText({return (<divclassName={cn([- 'flex gap-0.5 items-center',+ 'flex items-center gap-0.5',getDiffIndicator(previousIndicatorInverted,state,diff --git a/apps/dashboard/src/components/report/ReportRange.tsx b/apps/dashboard/src/components/report/ReportRange.tsxindex 208f8b7a6..d2a82d6d0 100644--- a/apps/dashboard/src/components/report/ReportRange.tsx+++ b/apps/dashboard/src/components/report/ReportRange.tsx@@ -62,7 +62,7 @@ export function ReportRange({</Button></PopoverTrigger><PopoverContent className="w-auto p-0" align="start">- <div className="p-4 border-b border-border">+ <div className="border-b border-border p-4"><ToggleGroupvalue={range}onValueChange={(value) => {diff --git a/apps/dashboard/src/components/report/chart/ChartAnimation.tsx b/apps/dashboard/src/components/report/chart/ChartAnimation.tsxindex d9d48c0b4..641c34385 100644--- a/apps/dashboard/src/components/report/chart/ChartAnimation.tsx+++ b/apps/dashboard/src/components/report/chart/ChartAnimation.tsx@@ -25,7 +25,7 @@ export const ChartAnimationContainer = (<div{...props}className={cn(- 'border border-border rounded-md p-8 bg-white',+ 'rounded-md border border-border bg-white p-8',props.className)}/>diff --git a/apps/dashboard/src/components/report/chart/ChartEmpty.tsx b/apps/dashboard/src/components/report/chart/ChartEmpty.tsxindex 738b60d13..d2f862c32 100644--- a/apps/dashboard/src/components/report/chart/ChartEmpty.tsx+++ b/apps/dashboard/src/components/report/chart/ChartEmpty.tsx@@ -22,7 +22,7 @@ export function ChartEmpty() {return (<divclassName={- 'aspect-video w-full max-h-[300px] min-h-[200px] flex justify-center items-center'+ 'flex aspect-video max-h-[300px] min-h-[200px] w-full items-center justify-center'}>No datadiff --git a/apps/dashboard/src/components/report/chart/ChartLoading.tsx b/apps/dashboard/src/components/report/chart/ChartLoading.tsxindex e3dfe1b2b..d93fd9a3b 100644--- a/apps/dashboard/src/components/report/chart/ChartLoading.tsx+++ b/apps/dashboard/src/components/report/chart/ChartLoading.tsx@@ -7,7 +7,7 @@ export function ChartLoading({ className }: ChartLoadingProps) {return (<divclassName={cn(- 'aspect-video w-full bg-slate-200 animate-pulse rounded max-h-[300px] min-h-[200px]',+ 'aspect-video max-h-[300px] min-h-[200px] w-full animate-pulse rounded bg-slate-200',className)}/>diff --git a/apps/dashboard/src/components/report/chart/MetricCard.tsx b/apps/dashboard/src/components/report/chart/MetricCard.tsxindex 3c7a528d0..de92ffa2e 100644--- a/apps/dashboard/src/components/report/chart/MetricCard.tsx+++ b/apps/dashboard/src/components/report/chart/MetricCard.tsx@@ -56,10 +56,10 @@ export function MetricCard({return (<div- className="group relative card p-4 overflow-hidden h-24"+ className="card group relative h-24 overflow-hidden p-4"key={serie.name}>- <div className="absolute inset-0 -left-1 -right-1 z-0 opacity-20 transition-opacity duration-300 group-hover:opacity-50 rounded-md">+ <div className="absolute inset-0 -left-1 -right-1 z-0 rounded-md opacity-20 transition-opacity duration-300 group-hover:opacity-50"><AutoSizer>{({ width, height }) => (<AreaChart@@ -82,21 +82,21 @@ export function MetricCard({</div><div className="relative"><div className="flex items-center justify-between gap-2">- <div className="flex items-center gap-2 font-medium text-left min-w-0">+ <div className="flex min-w-0 items-center gap-2 text-left font-medium"><ColorSquare>{serie.event.id}</ColorSquare>- <span className="text-ellipsis overflow-hidden whitespace-nowrap">+ <span className="overflow-hidden text-ellipsis whitespace-nowrap">{serie.name || serie.event.displayName || serie.event.name}</span></div>{/* <PreviousDiffIndicator {...serie.metrics.previous[metric]} /> */}</div>- <div className="flex justify-between items-end mt-2">- <div className="text-2xl font-bold text-ellipsis overflow-hidden whitespace-nowrap">+ <div className="mt-2 flex items-end justify-between">+ <div className="overflow-hidden text-ellipsis whitespace-nowrap text-2xl font-bold">{renderValue(serie.metrics[metric], 'ml-1 font-light text-xl')}</div><PreviousDiffIndicatorText{...serie.metrics.previous[metric]}- className="font-medium text-xs mb-0.5"+ className="mb-0.5 text-xs font-medium"/></div></div>@@ -106,8 +106,8 @@ export function MetricCard({export function MetricCardEmpty() {return (- <div className="card p-4 h-24">- <div className="flex items-center justify-center h-full text-slate-600">+ <div className="card h-24 p-4">+ <div className="flex h-full items-center justify-center text-slate-600">No data</div></div>@@ -116,9 +116,9 @@ export function MetricCardEmpty() {export function MetricCardLoading() {return (- <div className="h-24 p-4 py-5 flex flex-col card">- <div className="bg-slate-200 rounded animate-pulse h-4 w-1/2"></div>- <div className="bg-slate-200 rounded animate-pulse h-6 w-1/5 mt-auto"></div>+ <div className="card flex h-24 flex-col p-4 py-5">+ <div className="h-4 w-1/2 animate-pulse rounded bg-slate-200"></div>+ <div className="mt-auto h-6 w-1/5 animate-pulse rounded bg-slate-200"></div></div>);}diff --git a/apps/dashboard/src/components/report/chart/ReportBarChart.tsx b/apps/dashboard/src/components/report/chart/ReportBarChart.tsxindex 6b8846cb0..c6ed10872 100644--- a/apps/dashboard/src/components/report/chart/ReportBarChart.tsx+++ b/apps/dashboard/src/components/report/chart/ReportBarChart.tsx@@ -29,8 +29,8 @@ export function ReportBarChart({ data }: ReportBarChartProps) {return (<divclassName={cn(- 'flex flex-col w-full text-xs -mx-2',- editMode && 'text-base card p-4'+ '-mx-2 flex w-full flex-col text-xs',+ editMode && 'card p-4 text-base')}>{series.map((serie, index) => {@@ -39,17 +39,17 @@ export function ReportBarChart({ data }: ReportBarChartProps) {<divkey={serie.name}className={cn(- 'relative py-3 px-2 flex flex-1 w-full gap-4 items-center even:bg-slate-50 rounded overflow-hidden',- '[&_[role=progressbar]]:even:bg-white [&_[role=progressbar]]:shadow-sm',+ 'relative flex w-full flex-1 items-center gap-4 overflow-hidden rounded px-2 py-3 even:bg-slate-50',+ '[&_[role=progressbar]]:shadow-sm [&_[role=progressbar]]:even:bg-white',isClickable && 'cursor-pointer hover:!bg-slate-100')}{...(isClickable ? { onClick: () => onClick(serie) } : {})}>- <div className="flex-1 break-all flex items-center gap-2 font-medium">+ <div className="flex flex-1 items-center gap-2 break-all font-medium"><SerieIcon name={serie.name} />{serie.name}</div>- <div className="flex-shrink-0 flex w-1/4 gap-4 items-center justify-end">+ <div className="flex w-1/4 flex-shrink-0 items-center justify-end gap-4"><PreviousDiffIndicatorText{...serie.metrics.previous[metric]}className="text-xs font-medium"diff --git a/apps/dashboard/src/components/report/chart/ReportChartTooltip.tsx b/apps/dashboard/src/components/report/chart/ReportChartTooltip.tsxindex a05dac986..a83546e19 100644--- a/apps/dashboard/src/components/report/chart/ReportChartTooltip.tsx+++ b/apps/dashboard/src/components/report/chart/ReportChartTooltip.tsx@@ -39,7 +39,7 @@ export function ReportChartTooltip({const hidden = sorted.slice(limit);return (- <div className="flex flex-col gap-2 rounded-xl border bg-white p-3 text-sm shadow-xl min-w-[180px]">+ <div className="flex min-w-[180px] flex-col gap-2 rounded-xl border bg-white p-3 text-sm shadow-xl">{visible.map((item, index) => {// If we have a <Cell /> component, payload can be nestedconst payload = item.payload.payload ?? item.payload;@@ -62,7 +62,7 @@ export function ReportChartTooltip({className="w-[3px] rounded-full"style={{ background: data.color }}/>- <div className="flex flex-col flex-1">+ <div className="flex flex-1 flex-col"><div className="min-w-0 max-w-[200px] overflow-hidden text-ellipsis whitespace-nowrap font-medium">{getLabel(data.label)}</div>diff --git a/apps/dashboard/src/components/report/chart/ReportTable.tsx b/apps/dashboard/src/components/report/chart/ReportTable.tsxindex 0fd1f6a79..6bb6575e7 100644--- a/apps/dashboard/src/components/report/chart/ReportTable.tsx+++ b/apps/dashboard/src/components/report/chart/ReportTable.tsx@@ -55,8 +55,8 @@ export function ReportTable({return (<>- <div className="grid grid-cols-[200px_1fr] border border-border rounded-md overflow-hidden">- <Table className="rounded-none border-t-0 border-l-0 border-b-0">+ <div className="grid grid-cols-[200px_1fr] overflow-hidden rounded-md border border-border">+ <Table className="rounded-none border-b-0 border-l-0 border-t-0"><TableHeader><TableRow><TableHead>Name</TableHead>@@ -88,7 +88,7 @@ export function ReportTable({/><Tooltip delayDuration={200}><TooltipTrigger asChild>- <div className="min-w-0 overflow-hidden whitespace-nowrap text-ellipsis">+ <div className="min-w-0 overflow-hidden text-ellipsis whitespace-nowrap">{getLabel(serie.name)}</div></TooltipTrigger>@@ -157,8 +157,8 @@ export function ReportTable({</Table></div></div>- <div className="flex flex-col-reverse gap-4 md:flex-row md:justify-between md:items-center">- <div className="flex gap-1 flex-wrap">+ <div className="flex flex-col-reverse gap-4 md:flex-row md:items-center md:justify-between">+ <div className="flex flex-wrap gap-1"><Badge>Total: {number.format(data.metrics.sum)}</Badge><Badge>Average: {number.format(data.metrics.average)}</Badge><Badge>Min: {number.format(data.metrics.min)}</Badge>diff --git a/apps/dashboard/src/components/report/chart/ResponsiveContainer.tsx b/apps/dashboard/src/components/report/chart/ResponsiveContainer.tsxindex 55205f2a5..b499b0134 100644--- a/apps/dashboard/src/components/report/chart/ResponsiveContainer.tsx+++ b/apps/dashboard/src/components/report/chart/ResponsiveContainer.tsx@@ -17,7 +17,7 @@ export function ResponsiveContainer({ children }: ResponsiveContainerProps) {maxHeight,minHeight,}}- className={cn('max-sm:-mx-3 aspect-video w-full', editMode && 'card p-4')}+ className={cn('aspect-video w-full max-sm:-mx-3', editMode && 'card p-4')}><AutoSizer disableHeight>{({ width }) =>diff --git a/apps/dashboard/src/components/report/chart/SerieIcon.flags.tsx b/apps/dashboard/src/components/report/chart/SerieIcon.flags.tsxindex a74e837e2..67e07bfe3 100644--- a/apps/dashboard/src/components/report/chart/SerieIcon.flags.tsx+++ b/apps/dashboard/src/components/report/chart/SerieIcon.flags.tsx@@ -4,7 +4,7 @@ const createFlagIcon = (url: string) => {return function (_props: LucideProps) {return (<span- className={`rounded-[2px] overflow-hidden !block !leading-[1rem] fi fi-${url}`}+ className={`fi !block overflow-hidden rounded-[2px] !leading-[1rem] fi-${url}`}></span>);} as LucideIcon;diff --git a/apps/dashboard/src/components/report/chart/SerieIcon.tsx b/apps/dashboard/src/components/report/chart/SerieIcon.tsxindex 6acca2f0f..c06edff25 100644--- a/apps/dashboard/src/components/report/chart/SerieIcon.tsx+++ b/apps/dashboard/src/components/report/chart/SerieIcon.tsx@@ -29,7 +29,7 @@ function getProxyImage(url: string) {const createImageIcon = (url: string) => {return function (_props: LucideProps) {- return <img className="h-4 object-contain rounded-[2px]" src={url} />;+ return <img className="h-4 rounded-[2px] object-contain" src={url} />;} as LucideIcon;};@@ -81,7 +81,7 @@ export function SerieIcon({ name, ...props }: SerieIconProps) {}, [name]);return Icon ? (- <div className="h-4 flex-shrink-0 relative [&_a]:![&_a]:!h-4 [&_svg]:!rounded-[2px]">+ <div className="[&_a]:![&_a]:!h-4 relative h-4 flex-shrink-0 [&_svg]:!rounded-[2px]"><Icon size={16} {...props} /></div>) : null;diff --git a/apps/dashboard/src/components/report/funnel/Funnel.tsx b/apps/dashboard/src/components/report/funnel/Funnel.tsxindex 43c97e85c..5dc4b2d2b 100644--- a/apps/dashboard/src/components/report/funnel/Funnel.tsx+++ b/apps/dashboard/src/components/report/funnel/Funnel.tsx@@ -94,7 +94,7 @@ export function FunnelSteps({return (<CarouselItemclassName={cn(- 'flex-[0_0_250px] max-w-full p-0 px-1',+ 'max-w-full flex-[0_0_250px] p-0 px-1',editMode && 'flex-[0_0_320px]')}key={step.event.id}@@ -106,13 +106,13 @@ export function FunnelSteps({{step.event.displayName || step.event.name}</h3></div>- <div className="aspect-square relative">+ <div className="relative aspect-square"><FunnelChart from={step.prevPercent} to={step.percent} />- <div className="absolute top-0 left-0 right-0 p-4 flex flex-col bg-white/40">- <div className="uppercase font-medium text-muted-foreground">+ <div className="absolute left-0 right-0 top-0 flex flex-col bg-white/40 p-4">+ <div className="font-medium uppercase text-muted-foreground">Sessions</div>- <div className="uppercase text-3xl font-bold flex items-center">+ <div className="flex items-center text-3xl font-bold uppercase"><span className="text-muted-foreground">{step.before}</span>@@ -130,34 +130,34 @@ export function FunnelSteps({</div></div>{finalStep ? (- <div className={cn('p-4 flex flex-col items-center')}>- <div className="uppercase text-xs font-medium">+ <div className={cn('flex flex-col items-center p-4')}>+ <div className="text-xs font-medium uppercase">Conversion</div><divclassName={cn(- 'uppercase text-3xl font-bold',+ 'text-3xl font-bold uppercase',getDropoffColor(step.dropoff.percent))}>{round(step.percent, 1)}%</div>- <div className="uppercase text-sm mt-0 font-medium text-muted-foreground">+ <div className="mt-0 text-sm font-medium uppercase text-muted-foreground">Converted {step.current} of {totalSessions} sessions</div></div>) : (- <div className={cn('p-4 flex flex-col items-center')}>- <div className="uppercase text-xs font-medium">Dropoff</div>+ <div className={cn('flex flex-col items-center p-4')}>+ <div className="text-xs font-medium uppercase">Dropoff</div><divclassName={cn(- 'uppercase text-3xl font-bold',+ 'text-3xl font-bold uppercase',getDropoffColor(step.dropoff.percent))}>{round(step.dropoff.percent, 1)}%</div>- <div className="uppercase text-sm mt-0 font-medium text-muted-foreground">+ <div className="mt-0 text-sm font-medium uppercase text-muted-foreground">Lost {step.dropoff.count} sessions</div></div>diff --git a/apps/dashboard/src/components/report/sidebar/EventPropertiesCombobox.tsx b/apps/dashboard/src/components/report/sidebar/EventPropertiesCombobox.tsxindex a46989aa4..2cc68a524 100644--- a/apps/dashboard/src/components/report/sidebar/EventPropertiesCombobox.tsx+++ b/apps/dashboard/src/components/report/sidebar/EventPropertiesCombobox.tsx@@ -51,7 +51,7 @@ export function EventPropertiesCombobox({><buttonclassName={cn(- 'flex items-center gap-1 rounded-md border border-border p-1 px-2 font-medium leading-none text-xs',+ 'flex items-center gap-1 rounded-md border border-border p-1 px-2 text-xs font-medium leading-none',!event.property && 'border-destructive text-destructive')}>diff --git a/apps/dashboard/src/components/report/sidebar/ReportEvents.tsx b/apps/dashboard/src/components/report/sidebar/ReportEvents.tsxindex 67b433a35..86196e117 100644--- a/apps/dashboard/src/components/report/sidebar/ReportEvents.tsx+++ b/apps/dashboard/src/components/report/sidebar/ReportEvents.tsx@@ -135,7 +135,7 @@ export function ReportEvents() {]}label="Segment">- <button className="flex items-center gap-1 rounded-md border border-border p-1 px-2 font-medium leading-none text-xs bg-white">+ <button className="flex items-center gap-1 rounded-md border border-border bg-white p-1 px-2 text-xs font-medium leading-none">{event.segment === 'user' ? (<><Users size={12} /> Unique users@@ -203,7 +203,7 @@ export function ReportEvents() {/></div><label- className="flex items-center gap-2 cursor-pointer select-none text-sm font-medium mt-4"+ className="mt-4 flex cursor-pointer select-none items-center gap-2 text-sm font-medium"htmlFor="previous"><Checkboxdiff --git a/apps/dashboard/src/components/report/sidebar/filters/FiltersCombobox.tsx b/apps/dashboard/src/components/report/sidebar/filters/FiltersCombobox.tsxindex cb1c0341e..69e914cc9 100644--- a/apps/dashboard/src/components/report/sidebar/filters/FiltersCombobox.tsx+++ b/apps/dashboard/src/components/report/sidebar/filters/FiltersCombobox.tsx@@ -54,7 +54,7 @@ export function FiltersCombobox({ event }: FiltersComboboxProps) {);}}>- <button className="flex items-center gap-1 rounded-md border border-border p-1 px-2 font-medium leading-none text-xs bg-white">+ <button className="flex items-center gap-1 rounded-md border border-border bg-white p-1 px-2 text-xs font-medium leading-none"><FilterIcon size={12} /> Add filter</button></Combobox>diff --git a/apps/dashboard/src/components/ui/alert.tsx b/apps/dashboard/src/components/ui/alert.tsxindex 27093d2aa..4b16e600c 100644--- a/apps/dashboard/src/components/ui/alert.tsx+++ b/apps/dashboard/src/components/ui/alert.tsx@@ -4,7 +4,7 @@ import { cva } from 'class-variance-authority';import type { VariantProps } from 'class-variance-authority';const alertVariants = cva(- 'relative w-full rounded-lg border p-4 [&>svg~*]:pl-7 [&>svg+div]:translate-y-[-3px] [&>svg]:absolute [&>svg]:left-4 [&>svg]:top-4 [&>svg]:text-foreground',+ 'relative w-full rounded-lg border p-4 [&>svg+div]:translate-y-[-3px] [&>svg]:absolute [&>svg]:left-4 [&>svg]:top-4 [&>svg]:text-foreground [&>svg~*]:pl-7',{variants: {variant: {diff --git a/apps/dashboard/src/components/ui/badge.tsx b/apps/dashboard/src/components/ui/badge.tsxindex 60b45ea9d..3b4907340 100644--- a/apps/dashboard/src/components/ui/badge.tsx+++ b/apps/dashboard/src/components/ui/badge.tsx@@ -6,7 +6,7 @@ import { cva } from 'class-variance-authority';import type { VariantProps } from 'class-variance-authority';const badgeVariants = cva(- 'inline-flex items-center rounded-full border px-1.5 h-[20px] text-[10px] font-semibold transition-colors focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2',+ 'inline-flex h-[20px] items-center rounded-full border px-1.5 text-[10px] font-semibold transition-colors focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2',{variants: {variant: {diff --git a/apps/dashboard/src/components/ui/button.tsx b/apps/dashboard/src/components/ui/button.tsxindex ca40c6f11..1df7e9980 100644--- a/apps/dashboard/src/components/ui/button.tsx+++ b/apps/dashboard/src/components/ui/button.tsx@@ -9,7 +9,7 @@ import type { LucideIcon } from 'lucide-react';import { Loader2 } from 'lucide-react';const buttonVariants = cva(- 'flex-shrink-0 inline-flex items-center justify-center rounded-md text-sm font-medium ring-offset-background whitespace-nowrap transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50',+ 'inline-flex flex-shrink-0 items-center justify-center whitespace-nowrap rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50',{variants: {variant: {@@ -75,7 +75,7 @@ const Button = React.forwardRef<HTMLButtonElement, ButtonProps>({Icon && (<IconclassName={cn(- 'h-4 w-4 mr-2 flex-shrink-0',+ 'mr-2 h-4 w-4 flex-shrink-0',responsive && 'mr-0 sm:mr-2',loading && 'animate-spin')}diff --git a/apps/dashboard/src/components/ui/checkbox.tsx b/apps/dashboard/src/components/ui/checkbox.tsxindex 0e02bc1a4..aa91bd4bb 100644--- a/apps/dashboard/src/components/ui/checkbox.tsx+++ b/apps/dashboard/src/components/ui/checkbox.tsx@@ -30,7 +30,7 @@ const CheckboxInput = React.forwardRef<React.ElementRef<typeof CheckboxPrimitive.Root>,React.ComponentPropsWithoutRef<typeof CheckboxPrimitive.Root>>((props, ref) => (- <label className="cursor-pointer flex items-center select-none border border-border rounded-md px-3 gap-4 min-h-10">+ <label className="flex min-h-10 cursor-pointer select-none items-center gap-4 rounded-md border border-border px-3"><Checkbox ref={ref} {...props} /><div className="text-sm font-medium">{props.children}</div></label>diff --git a/apps/dashboard/src/components/ui/combobox-advanced.tsx b/apps/dashboard/src/components/ui/combobox-advanced.tsxindex 667bf144c..11905048e 100644--- a/apps/dashboard/src/components/ui/combobox-advanced.tsx+++ b/apps/dashboard/src/components/ui/combobox-advanced.tsx@@ -63,7 +63,7 @@ export function ComboboxAdvanced({: [...value, item.value]);}}- className={'cursor-pointer flex items-center gap-2'}+ className={'flex cursor-pointer items-center gap-2'}><Checkbox checked={checked} className="pointer-events-none" />{item?.label ?? item?.value}@@ -84,7 +84,7 @@ export function ComboboxAdvanced({onClick={() => setOpen((prev) => !prev)}className={className}>- <div className="flex gap-1 flex-wrap w-full">+ <div className="flex w-full flex-wrap gap-1">{value.length === 0 && placeholder}{value.map((value) => {const item = items.find((item) => item.value === value) ?? {diff --git a/apps/dashboard/src/components/ui/combobox.tsx b/apps/dashboard/src/components/ui/combobox.tsxindex 1e88e49af..e259c8b08 100644--- a/apps/dashboard/src/components/ui/combobox.tsx+++ b/apps/dashboard/src/components/ui/combobox.tsx@@ -117,7 +117,7 @@ export function Combobox<T extends string>({) : (<CommandEmpty>Nothing selected</CommandEmpty>)}- <div className="max-h-[300px] overflow-y-auto over-x-hidden">+ <div className="over-x-hidden max-h-[300px] overflow-y-auto"><CommandGroup>{items.map((item) => (<CommandItemdiff --git a/apps/dashboard/src/components/ui/dialog.tsx b/apps/dashboard/src/components/ui/dialog.tsxindex 0465e161e..c0070c5e8 100644--- a/apps/dashboard/src/components/ui/dialog.tsx+++ b/apps/dashboard/src/components/ui/dialog.tsx@@ -77,7 +77,7 @@ const DialogFooter = ({}: React.HTMLAttributes<HTMLDivElement>) => (<divclassName={cn(- 'flex flex-col-reverse sm:flex-row sm:justify-end gap-2',+ 'flex flex-col-reverse gap-2 sm:flex-row sm:justify-end',className)}{...props}diff --git a/apps/dashboard/src/components/ui/gradient-background.tsx b/apps/dashboard/src/components/ui/gradient-background.tsxindex f88c3e408..64e6ca70c 100644--- a/apps/dashboard/src/components/ui/gradient-background.tsx+++ b/apps/dashboard/src/components/ui/gradient-background.tsx@@ -13,12 +13,12 @@ export function GradientBackground({return (<divclassName={cn(- 'bg-gradient-to-tr from-slate-100 to-white rounded-md',+ 'rounded-md bg-gradient-to-tr from-slate-100 to-white',className)}{...props}>- <div className="p-4 flex flex-col gap-4">{children}</div>+ <div className="flex flex-col gap-4 p-4">{children}</div></div>);}diff --git a/apps/dashboard/src/components/ui/key-value.tsx b/apps/dashboard/src/components/ui/key-value.tsxindex 7fe01bbfd..070a5772b 100644--- a/apps/dashboard/src/components/ui/key-value.tsx+++ b/apps/dashboard/src/components/ui/key-value.tsx@@ -15,15 +15,15 @@ export function KeyValue({ href, onClick, name, value }: KeyValueProps) {return (<ComponentclassName={cn(- 'group overflow-hidden flex border border-border rounded-md text-xs divide-x font-medium self-start min-w-0 max-w-full transition-transform',+ 'group flex min-w-0 max-w-full divide-x self-start overflow-hidden rounded-md border border-border text-xs font-medium transition-transform',clickable && 'hover:-translate-y-0.5')}{...{ href, onClick }}>- <div className="p-1 px-2 bg-black/5">{name}</div>+ <div className="bg-black/5 p-1 px-2">{name}</div><divclassName={cn(- 'p-1 px-2 font-mono text-blue-700 bg-white whitespace-nowrap overflow-hidden text-ellipsis shadow-[inset_0_0_0_1px_#fff]',+ 'overflow-hidden text-ellipsis whitespace-nowrap bg-white p-1 px-2 font-mono text-blue-700 shadow-[inset_0_0_0_1px_#fff]',clickable && 'group-hover:underline')}>diff --git a/apps/dashboard/src/components/ui/label.tsx b/apps/dashboard/src/components/ui/label.tsxindex 198599168..75c2d449c 100644--- a/apps/dashboard/src/components/ui/label.tsx+++ b/apps/dashboard/src/components/ui/label.tsx@@ -7,7 +7,7 @@ import { cva } from 'class-variance-authority';import type { VariantProps } from 'class-variance-authority';const labelVariants = cva(- 'text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70 block mb-2'+ 'mb-2 block text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70');const Label = React.forwardRef<diff --git a/apps/dashboard/src/components/ui/radio-group.tsx b/apps/dashboard/src/components/ui/radio-group.tsxindex 357aee181..f7d29fd7e 100644--- a/apps/dashboard/src/components/ui/radio-group.tsx+++ b/apps/dashboard/src/components/ui/radio-group.tsx@@ -1,8 +1,7 @@-import * as React from "react"-import * as RadioGroupPrimitive from "@radix-ui/react-radio-group"-import { Circle } from "lucide-react"--import { cn } from "@/utils/cn"+import * as React from 'react';+import { cn } from '@/utils/cn';+import * as RadioGroupPrimitive from '@radix-ui/react-radio-group';+import { Circle } from 'lucide-react';const RadioGroup = React.forwardRef<React.ElementRef<typeof RadioGroupPrimitive.Root>,@@ -10,13 +9,13 @@ const RadioGroup = React.forwardRef<>(({ className, ...props }, ref) => {return (<RadioGroupPrimitive.Root- className={cn("grid gap-2", className)}+ className={cn('grid gap-2', className)}{...props}ref={ref}/>- )-})-RadioGroup.displayName = RadioGroupPrimitive.Root.displayName+ );+});+RadioGroup.displayName = RadioGroupPrimitive.Root.displayName;const RadioGroupItem = React.forwardRef<React.ElementRef<typeof RadioGroupPrimitive.Item>,@@ -26,7 +25,7 @@ const RadioGroupItem = React.forwardRef<<RadioGroupPrimitive.Itemref={ref}className={cn(- "aspect-square h-4 w-4 rounded-full border border-primary text-primary ring-offset-background focus:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50",+ 'aspect-square h-4 w-4 rounded-full border border-primary text-primary ring-offset-background focus:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50',className)}{...props}@@ -35,8 +34,8 @@ const RadioGroupItem = React.forwardRef<<Circle className="h-2.5 w-2.5 fill-current text-current" /></RadioGroupPrimitive.Indicator></RadioGroupPrimitive.Item>- )-})-RadioGroupItem.displayName = RadioGroupPrimitive.Item.displayName+ );+});+RadioGroupItem.displayName = RadioGroupPrimitive.Item.displayName;-export { RadioGroup, RadioGroupItem }+export { RadioGroup, RadioGroupItem };diff --git a/apps/dashboard/src/components/ui/sheet.tsx b/apps/dashboard/src/components/ui/sheet.tsxindex 225ed9af4..2561925ff 100644--- a/apps/dashboard/src/components/ui/sheet.tsx+++ b/apps/dashboard/src/components/ui/sheet.tsx@@ -31,16 +31,16 @@ const SheetOverlay = React.forwardRef<SheetOverlay.displayName = SheetPrimitive.Overlay.displayName;const sheetVariants = cva(- 'flex flex-col max-sm:w-[calc(100%-theme(spacing.8))] overflow-y-auto fixed z-50 gap-4 bg-background p-6 rounded-lg shadow-lg transition ease-in-out data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:duration-300 data-[state=open]:duration-500',+ 'fixed z-50 flex flex-col gap-4 overflow-y-auto rounded-lg bg-background p-6 shadow-lg transition ease-in-out data-[state=closed]:duration-300 data-[state=open]:duration-500 data-[state=open]:animate-in data-[state=closed]:animate-out max-sm:w-[calc(100%-theme(spacing.8))]',{variants: {side: {top: 'inset-x-4 top-4 border-b data-[state=closed]:slide-out-to-top data-[state=open]:slide-in-from-top',bottom:'inset-x-4 bottom-4 border-t data-[state=closed]:slide-out-to-bottom data-[state=open]:slide-in-from-bottom',- left: 'top-4 bottom-4 left-4 w-3/4 border-r data-[state=closed]:slide-out-to-left data-[state=open]:slide-in-from-left sm:max-w-sm',+ left: 'bottom-4 left-4 top-4 w-3/4 border-r data-[state=closed]:slide-out-to-left data-[state=open]:slide-in-from-left sm:max-w-sm',right:- 'top-4 bottom-4 right-4 w-3/4 border-l data-[state=closed]:slide-out-to-right data-[state=open]:slide-in-from-right sm:max-w-sm',+ 'bottom-4 right-4 top-4 w-3/4 border-l data-[state=closed]:slide-out-to-right data-[state=open]:slide-in-from-right sm:max-w-sm',},},defaultVariants: {diff --git a/apps/dashboard/src/components/ui/table.tsx b/apps/dashboard/src/components/ui/table.tsxindex 56d4727ae..a31ac0451 100644--- a/apps/dashboard/src/components/ui/table.tsx+++ b/apps/dashboard/src/components/ui/table.tsx@@ -75,7 +75,7 @@ const TableHead = React.forwardRef<<thref={ref}className={cn(- 'px-4 h-10 text-left align-middle font-medium text-muted-foreground [&:has([role=checkbox])]:pr-0 shadow-[0_0_0_0.5px] shadow-border',+ 'h-10 px-4 text-left align-middle font-medium text-muted-foreground shadow-[0_0_0_0.5px] shadow-border [&:has([role=checkbox])]:pr-0',className)}{...props}@@ -90,7 +90,7 @@ const TableCell = React.forwardRef<<tdref={ref}className={cn(- 'px-4 h-12 align-middle [&:has([role=checkbox])]:pr-0 shadow-[0_0_0_0.5px] shadow-border whitespace-nowrap',+ 'h-12 whitespace-nowrap px-4 align-middle shadow-[0_0_0_0.5px] shadow-border [&:has([role=checkbox])]:pr-0',className)}{...props}diff --git a/apps/dashboard/src/components/widget-table.tsx b/apps/dashboard/src/components/widget-table.tsxindex a8a4c48ad..6357b8025 100644--- a/apps/dashboard/src/components/widget-table.tsx+++ b/apps/dashboard/src/components/widget-table.tsx@@ -10,7 +10,7 @@ interface Props<T> {export function WidgetTable<T>({ columns, data, keyExtractor }: Props<T>) {return (<table className="w-full">- <thead className="bg-slate-50 border-b border-border text-slate-500 [&_th]:font-medium text-sm [&_th]:p-4 [&_th]:py-2 [&_th]:text-left [&_th:last-child]:text-right [&_th]:whitespace-nowrap">+ <thead className="border-b border-border bg-slate-50 text-sm text-slate-500 [&_th:last-child]:text-right [&_th]:whitespace-nowrap [&_th]:p-4 [&_th]:py-2 [&_th]:text-left [&_th]:font-medium"><tr>{columns.map((column) => (<th key={column.name}>{column.name}</th>@@ -21,7 +21,7 @@ export function WidgetTable<T>({ columns, data, keyExtractor }: Props<T>) {{data.map((item) => (<trkey={keyExtractor(item)}- className="text-sm border-b border-border last:border-0 [&_td]:p-4 [&_td:first-child]:text-left text-right"+ className="border-b border-border text-right text-sm last:border-0 [&_td:first-child]:text-left [&_td]:p-4">{columns.map((column) => (<td key={column.name}>{column.render(item)}</td>diff --git a/apps/dashboard/src/components/widget.tsx b/apps/dashboard/src/components/widget.tsxindex 41ecc8dd4..4d7512bff 100644--- a/apps/dashboard/src/components/widget.tsx+++ b/apps/dashboard/src/components/widget.tsx@@ -8,7 +8,7 @@ export function WidgetHead({ children, className }: WidgetHeadProps) {return (<divclassName={cn(- 'p-4 border-b border-border [&_.title]:font-medium [&_.title]:whitespace-nowrap',+ 'border-b border-border p-4 [&_.title]:whitespace-nowrap [&_.title]:font-medium',className)}>diff --git a/apps/dashboard/src/middleware.ts b/apps/dashboard/src/middleware.tsindex 1c966765d..1ae838c97 100644--- a/apps/dashboard/src/middleware.ts+++ b/apps/dashboard/src/middleware.ts@@ -4,7 +4,12 @@ import { authMiddleware } from '@clerk/nextjs';// Please edit this to allow other routes to be public as needed.// See https://clerk.com/docs/references/nextjs/auth-middleware for more information about configuring your Middlewareexport default authMiddleware({- publicRoutes: ['/share/overview/:id', '/api/trpc(.*)', '/api/clerk/(.*)?'],+ publicRoutes: [+ '/share/overview/:id',+ '/api/trpc(.*)',+ '/api/clerk/(.*)?',+ '/monitoring',+ ],});export const config = {diff --git a/apps/dashboard/src/modals/AddClient.tsx b/apps/dashboard/src/modals/AddClient.tsxindex 60b4a6904..17b8164b4 100644--- a/apps/dashboard/src/modals/AddClient.tsx+++ b/apps/dashboard/src/modals/AddClient.tsx@@ -77,7 +77,7 @@ export default function AddClient() {<><ModalHeader title="Success" text={'Your client is created'} /><CreateClientSuccess {...mutation.data} />- <div className="flex gap-4 mt-4">+ <div className="mt-4 flex gap-4"><aclassName={cn(buttonVariants({ variant: 'secondary' }), 'flex-1')}href="https://docs.openpanel.dev/docs"@@ -150,7 +150,7 @@ export default function AddClient() {/></TabsContent><TabsContent value="other">- <div className="p-2 px-3 bg-white rounded text-sm">+ <div className="rounded bg-white p-2 px-3 text-sm">🔑 You will get a secret to use for your API requests.</div></TabsContent>diff --git a/apps/dashboard/src/modals/Modal/Container.tsx b/apps/dashboard/src/modals/Modal/Container.tsxindex 692f4b685..8b660a082 100644--- a/apps/dashboard/src/modals/Modal/Container.tsx+++ b/apps/dashboard/src/modals/Modal/Container.tsx@@ -25,9 +25,9 @@ interface ModalHeaderProps {export function ModalHeader({ title, text, onClose }: ModalHeaderProps) {return (- <div className="flex justify-between mb-6">+ <div className="mb-6 flex justify-between"><div>- <div className="font-medium mt-0.5">{title}</div>+ <div className="mt-0.5 font-medium">{title}</div>{!!text && <div className="text-sm text-muted-foreground">{text}</div>}</div>{onClose !== false && (diff --git a/apps/dashboard/src/modals/ShareOverviewModal.tsx b/apps/dashboard/src/modals/ShareOverviewModal.tsxindex 1e79e8c6b..789db6087 100644--- a/apps/dashboard/src/modals/ShareOverviewModal.tsx+++ b/apps/dashboard/src/modals/ShareOverviewModal.tsx@@ -63,7 +63,7 @@ export default function ShareOverviewModal() {render={({ field }) => (<labelhtmlFor="public"- className="flex items-center gap-2 text-sm font-medium leading-none mb-4"+ className="mb-4 flex items-center gap-2 text-sm font-medium leading-none"><Checkboxid="public"diff --git a/apps/dashboard/src/modals/index.tsx b/apps/dashboard/src/modals/index.tsxindex febfd5c18..f5c4ec890 100644--- a/apps/dashboard/src/modals/index.tsx+++ b/apps/dashboard/src/modals/index.tsx@@ -9,7 +9,7 @@ import { useOnClickOutside } from 'usehooks-ts';import type { ConfirmProps } from './Confirm';const Loading = () => (- <div className="fixed left-0 top-0 z-50 flex h-screen w-screen items-center justify-center overflow-auto bg-backdrop">+ <div className="bg-backdrop fixed left-0 top-0 z-50 flex h-screen w-screen items-center justify-center overflow-auto"><Loader className="mb-8 animate-spin" size={40} /></div>);@@ -162,7 +162,7 @@ export function ModalProvider() {return (<>{!!state.length && (- <div className="fixed top-0 left-0 right-0 bottom-0 bg-[rgba(0,0,0,0.2)] z-50"></div>+ <div className="fixed bottom-0 left-0 right-0 top-0 z-50 bg-[rgba(0,0,0,0.2)]"></div>)}{state.map((item, index) => {const Modal = modals[item.name];diff --git a/apps/docs/src/components/brand-logo.tsx b/apps/docs/src/components/brand-logo.tsxindex 5c7d10576..afaa38db5 100644--- a/apps/docs/src/components/brand-logo.tsx+++ b/apps/docs/src/components/brand-logo.tsx@@ -5,11 +5,11 @@ interface Props {export function BrandLogo({ src, isDark }: Props) {if (isDark) {return (- <div className="w-9 h-9 p-1 rounded-full bg-white">- <img className="w-full h-full object-contain" src={src} />+ <div className="h-9 w-9 rounded-full bg-white p-1">+ <img className="h-full w-full object-contain" src={src} /></div>);}- return <img className="w-9 h-9 object-contain" src={src} />;+ return <img className="h-9 w-9 object-contain" src={src} />;}diff --git a/apps/public/src/app/(static)/layout.tsx b/apps/public/src/app/(static)/layout.tsxindex e3d7d5f94..e2c1313e7 100644--- a/apps/public/src/app/(static)/layout.tsx+++ b/apps/public/src/app/(static)/layout.tsx@@ -9,7 +9,7 @@ export default function Layout({ children }: Props) {<><Navbar darkText /><div- className="opacity-50 w-full h-screen text-blue-950 bg-[radial-gradient(circle_at_2px_2px,#D9DEF6_2px,transparent_0)] absolute top-0 left-0 right-0 z-0"+ className="absolute left-0 right-0 top-0 z-0 h-screen w-full bg-[radial-gradient(circle_at_2px_2px,#D9DEF6_2px,transparent_0)] text-blue-950 opacity-50"style={{backgroundSize: '70px 70px',}}diff --git a/apps/public/src/app/copy.tsx b/apps/public/src/app/copy.tsxindex 2a7eb39db..13e58ae85 100644--- a/apps/public/src/app/copy.tsx+++ b/apps/public/src/app/copy.tsx@@ -7,7 +7,7 @@ interface Props {export function Lead({ children, className }: Props) {return (- <p className={cn('text-xl md:text-2xl font-light', className)}>+ <p className={cn('text-xl font-light md:text-2xl', className)}>{children}</p>);@@ -15,7 +15,7 @@ export function Lead({ children, className }: Props) {export function Lead2({ children, className }: Props) {return (- <p className={cn('text-lg md:text-xl font-light', className)}>{children}</p>+ <p className={cn('text-lg font-light md:text-xl', className)}>{children}</p>);}@@ -27,7 +27,7 @@ export function Heading1({ children, className }: Props) {return (<h1className={cn(- 'text-4xl md:text-5xl font-bold text-slate-900 !leading-tight font-serif',+ 'font-serif text-4xl font-bold !leading-tight text-slate-900 md:text-5xl',className)}>@@ -40,7 +40,7 @@ export function Heading2({ children, className }: Props) {return (<h2className={cn(- 'text-4xl md:text-5xl font-bold text-slate-900 font-serif',+ 'font-serif text-4xl font-bold text-slate-900 md:text-5xl',className)}>@@ -53,7 +53,7 @@ export function Heading3({ children, className }: Props) {return (<h3className={cn(- 'text-2xl md:text-3xl font-bold text-slate-900 font-serif',+ 'font-serif text-2xl font-bold text-slate-900 md:text-3xl',className)}>@@ -66,7 +66,7 @@ export function Heading4({ children, className }: Props) {return (<h3className={cn(- 'text-xl md:text-2xl font-bold text-slate-900 font-serif',+ 'font-serif text-xl font-bold text-slate-900 md:text-2xl',className)}>diff --git a/apps/public/src/app/features.tsx b/apps/public/src/app/features.tsxindex 21884d9a1..8ec01a9fb 100644--- a/apps/public/src/app/features.tsx+++ b/apps/public/src/app/features.tsx@@ -59,21 +59,21 @@ const features: FeatureItem[] = [Create beautiful charts and graphs to visualize your data and sharethem with your team.</p>- <div className="flex gap-2 flex-wrap">- <div className="border border-border px-3 py-1 rounded">+ <div className="flex flex-wrap gap-2">+ <div className="rounded border border-border px-3 py-1">✅ Linear</div>- <div className="border border-border px-3 py-1 rounded">✅ Area</div>- <div className="border border-border px-3 py-1 rounded">✅ Bar</div>- <div className="border border-border px-3 py-1 rounded">✅ Map</div>- <div className="border border-border px-3 py-1 rounded">✅ Pie</div>- <div className="border border-border px-3 py-1 rounded">+ <div className="rounded border border-border px-3 py-1">✅ Area</div>+ <div className="rounded border border-border px-3 py-1">✅ Bar</div>+ <div className="rounded border border-border px-3 py-1">✅ Map</div>+ <div className="rounded border border-border px-3 py-1">✅ Pie</div>+ <div className="rounded border border-border px-3 py-1">✅ Funnels</div>- <div className="border border-border px-3 py-1 rounded">+ <div className="rounded border border-border px-3 py-1">✅ Histogram</div>- <div className="border border-border px-3 py-1 rounded">+ <div className="rounded border border-border px-3 py-1">✅ Metrics</div></div>@@ -119,14 +119,14 @@ export function Feature({even,}: FeatureItem & { even: boolean; children: React.ReactNode }) {return (- <section className={cn('py-16 group', className)}>+ <section className={cn('group py-16', className)}><divclassName={cn(- 'container flex min-h-[300px] items-center gap-16 justify-between max-md:flex-col-reverse',+ 'container flex min-h-[300px] items-center justify-between gap-16 max-md:flex-col-reverse',!even && 'md:flex-row-reverse')}>- <div className="flex flex-col w-full">+ <div className="flex w-full flex-col"><Heading3 className="mb-2">{title}</Heading3><div className="prose-xl">{children}</div></div>@@ -136,7 +136,7 @@ export function Feature({alt={title}width={600}height={400}- className="border-8 border-black/5 rounded-xl w-full max-w-xl group-hover:rotate-1 group-hover:scale-[101%] transition-transform duration-500"+ className="w-full max-w-xl rounded-xl border-8 border-black/5 transition-transform duration-500 group-hover:rotate-1 group-hover:scale-[101%]"/></div></div>diff --git a/apps/public/src/app/footer.tsx b/apps/public/src/app/footer.tsxindex dd33682dd..217209a94 100644--- a/apps/public/src/app/footer.tsx+++ b/apps/public/src/app/footer.tsx@@ -7,20 +7,20 @@ import { JoinWaitlist } from './join-waitlist';export default function Footer() {return (- <footer className="bg-blue-darker text-white relative mt-40 relative">- <div className="inset-0 absolute h-full w-full bg-[radial-gradient(circle,rgba(255,255,255,0.2)_0%,rgba(255,255,255,0)_100%)]"></div>- <div className="relative container flex flex-col items-center text-center">+ <footer className="bg-blue-darker relative relative mt-40 text-white">+ <div className="absolute inset-0 h-full w-full bg-[radial-gradient(circle,rgba(255,255,255,0.2)_0%,rgba(255,255,255,0)_100%)]"></div>+ <div className="container relative flex flex-col items-center text-center"><div className="my-24">- <Heading2 className="text-white mb-2">Get early access</Heading2>+ <Heading2 className="mb-2 text-white">Get early access</Heading2><Lead2>Ready to set your analytics free? Get on our waitlist.</Lead2><div className="mt-8">- <JoinWaitlist className="text-white bg-white/20 border-white/30 focus:ring-white" />+ <JoinWaitlist className="border-white/30 bg-white/20 text-white focus:ring-white" /></div></div><div className="overflow-hidden rounded-xl">- <div className="p-2 bg-white/20">+ <div className="bg-white/20 p-2"><Imagesrc="/demo-2/1.png"width={1080}@@ -31,13 +31,13 @@ export default function Footer() {</div></div></div>- <div className="-mt-8 relative z-10">+ <div className="relative z-10 -mt-8"><div className="h-px w-full bg-[radial-gradient(circle,rgba(255,255,255,0.7)_0%,rgba(255,255,255,0.7)_50%,rgba(255,255,255,0)_100%)]"></div>- <div className="p-4 bg-blue-darker">+ <div className="bg-blue-darker p-4"><div className="container">- <div className="flex flex-col gap-4 md:flex-row md:justify-between md:items-center text-sm">+ <div className="flex flex-col gap-4 text-sm md:flex-row md:items-center md:justify-between"><Logo />- <div className="flex flex-col md:flex-row gap-4">+ <div className="flex flex-col gap-4 md:flex-row"><Link className="hover:underline" href="/terms">Terms and Conditions</Link>diff --git a/apps/public/src/app/hero.tsx b/apps/public/src/app/hero.tsxindex eed294311..289faada9 100644--- a/apps/public/src/app/hero.tsx+++ b/apps/public/src/app/hero.tsx@@ -6,8 +6,8 @@ export function Hero() {return (<div className="relative overflow-hidden">{/* <div className="bg-blue-50 w-2/5 h-full absolute top-0 right-0"></div> */}- <div className="container md:h-screen min-h-[700px] flex flex-col md:flex-row items-center relative max-md:pt-32 gap-4 md:gap-8">- <div className="flex-1 lg:min-w-[400px] sm:min-w-[350px] max-md:text-center">+ <div className="container relative flex min-h-[700px] flex-col items-center gap-4 max-md:pt-32 md:h-screen md:flex-row md:gap-8">+ <div className="flex-1 max-md:text-center sm:min-w-[350px] lg:min-w-[400px]"><Heading1 className="mb-4 text-slate-950">An open-source<br />@@ -20,11 +20,11 @@ export function Hero() {<JoinWaitlistHero /><SocialProofServer className="mt-6" /></div>- <div className="mt-16 md:pt-16 w-full">- <div className="bg-black/5 md:p-2 rounded-2xl h-[max(90vh,650px)] flex">+ <div className="mt-16 w-full md:pt-16">+ <div className="flex h-[max(90vh,650px)] rounded-2xl bg-black/5 md:p-2"><iframesrc="https://dashboard.openpanel.dev/share/overview/ZQsEhG"- className="w-full h-full rounded-xl h-[max(90vh,650px)]"+ className="h-[max(90vh,650px)] h-full w-full rounded-xl"title="Openpanel Dashboard"scrolling="no"/>diff --git a/apps/public/src/app/join-waitlist-hero.tsx b/apps/public/src/app/join-waitlist-hero.tsxindex bb9886911..3bc68494d 100644--- a/apps/public/src/app/join-waitlist-hero.tsx+++ b/apps/public/src/app/join-waitlist-hero.tsx@@ -65,7 +65,7 @@ export function JoinWaitlistHero({ className }: JoinWaitlistProps) {<inputplaceholder="Enter your email"className={cn(- 'border border-slate-100 rounded-md shadow-sm bg-white h-12 w-full px-4 outline-none focus:ring-1 ring-black text-blue-darker',+ 'text-blue-darker h-12 w-full rounded-md border border-slate-100 bg-white px-4 shadow-sm outline-none ring-black focus:ring-1',className)}value={value}diff --git a/apps/public/src/app/join-waitlist.tsx b/apps/public/src/app/join-waitlist.tsxindex 00993ae6a..f524fa27a 100644--- a/apps/public/src/app/join-waitlist.tsx+++ b/apps/public/src/app/join-waitlist.tsx@@ -65,7 +65,7 @@ export function JoinWaitlist({ className }: JoinWaitlistProps) {<inputplaceholder="Enter your email"className={cn(- 'border border-slate-100 rounded-md shadow-sm bg-white h-12 w-full px-4 outline-none focus:ring-1 ring-black text-blue-darker',+ 'text-blue-darker h-12 w-full rounded-md border border-slate-100 bg-white px-4 shadow-sm outline-none ring-black focus:ring-1',className)}value={value}diff --git a/apps/public/src/app/layout.tsx b/apps/public/src/app/layout.tsxindex 3cf2e84eb..c595dffd7 100644--- a/apps/public/src/app/layout.tsx+++ b/apps/public/src/app/layout.tsx@@ -40,7 +40,7 @@ export default function RootLayout({<html lang="en" className="light"><bodyclassName={cn(- 'min-h-screen antialiased grainy text-slate-900 font-sans',+ 'grainy min-h-screen font-sans text-slate-900 antialiased',head.variable,body.variable)}diff --git a/apps/public/src/app/navbar.tsx b/apps/public/src/app/navbar.tsxindex 0399c52e9..4677e6df8 100644--- a/apps/public/src/app/navbar.tsx+++ b/apps/public/src/app/navbar.tsx@@ -15,9 +15,9 @@ export function Navbar({ darkText = false, className }: Props) {const textColor = darkText ? 'text-blue-dark' : 'text-white';return (<div- className={cn('absolute top-0 left-0 right-0 z-10', textColor, className)}+ className={cn('absolute left-0 right-0 top-0 z-10', textColor, className)}>- <div className="container flex justify-between items-center py-4">+ <div className="container flex items-center justify-between py-4"><Logo className="max-sm:[&_span]:hidden" /><nav className="flex gap-4">{pathname !== '/' && <Link href="/">Home</Link>}diff --git a/apps/public/src/app/page.tsx b/apps/public/src/app/page.tsxindex 82146210a..e497fb2c5 100644--- a/apps/public/src/app/page.tsx+++ b/apps/public/src/app/page.tsx@@ -14,9 +14,9 @@ export default function Page() {return (<div><Hero />- <div className="py-24 bg-gradient-to-bl from-blue-600 to-blue-800">+ <div className="bg-gradient-to-bl from-blue-600 to-blue-800 py-24"><div className="container">- <Heading2 className="md:text-5xl mb-2 leading-none text-white">+ <Heading2 className="mb-2 leading-none text-white md:text-5xl">Analytics should be easy<br />and powerful@@ -32,7 +32,7 @@ export default function Page() {variant={'outline'}>Check out the demo- <ExternalLinkIcon className="w-4 h-4 ml-2" />+ <ExternalLinkIcon className="ml-2 h-4 w-4" /></ALink></div></div>@@ -44,8 +44,8 @@ export default function Page() {<Pricing /><div className="container mt-40">- <div className="flex flex-col md:flex-row gap-8">- <div className="mb-4 md:w-1/2 flex-shrink-0 relative">+ <div className="flex flex-col gap-8 md:flex-row">+ <div className="relative mb-4 flex-shrink-0 md:w-1/2"><Heading2>Another analytic tool? Really?</Heading2>{/* <SirenIconstrokeWidth={0.5}@@ -53,8 +53,8 @@ export default function Page() {className="opacity-10 absolute -rotate-12 -left-20 -top-10"/> */}</div>- <div className="flex flex-col gap-4 max-w-3xl">- <h3 className="text-lg font-bold text-blue-dark">TL;DR</h3>+ <div className="flex max-w-3xl flex-col gap-4">+ <h3 className="text-blue-dark text-lg font-bold">TL;DR</h3><Paragraph>Our open-source analytic library fills a crucial gap by combiningthe strengths of Mixpanel's powerful features with Plausible's@@ -67,7 +67,7 @@ export default function Page() {and transparency for users of all project sizes.</Paragraph>- <h3 className="text-lg font-bold text-blue-dark mt-12">The why</h3>+ <h3 className="text-blue-dark mt-12 text-lg font-bold">The why</h3><Paragraph>Our open-source analytic library emerged from a clear need withinthe analytics community. While platforms like Mixpanel offerdiff --git a/apps/public/src/app/pricing.tsx b/apps/public/src/app/pricing.tsxindex 5fc352c2e..398a20c44 100644--- a/apps/public/src/app/pricing.tsx+++ b/apps/public/src/app/pricing.tsx@@ -16,7 +16,7 @@ const pricing = [export function Pricing() {return (<div className="bg-slate-100 py-32" id="pricing">- <div className="sm:max-w-xl md:max-w-3xl mx-auto px-4">+ <div className="mx-auto px-4 sm:max-w-xl md:max-w-3xl"><section className="flex flex-col gap-6"><div className="flex w-full flex-col gap-4 md:max-w-[58rem]"><Heading2>Simple, transparent pricing</Heading2>@@ -45,20 +45,20 @@ export function Pricing() {<CheckIcon className="mr-2 h-4 w-4" /> Yes, its that simple</li></ul>- <div className="grid md:grid-cols-2 gap-6">+ <div className="grid gap-6 md:grid-cols-2">{pricing.map((item) => (<divkey={item.price}- className="relative bg-white rounded-lg border border-blue-dark p-6 flex flex-col gap-1"+ className="border-blue-dark relative flex flex-col gap-1 rounded-lg border bg-white p-6">{item.hint && (- <div className="absolute top-2 right-2 bg-blue-600 text-white text-xs px-2 py-1 rounded flex gap-2 items-center">+ <div className="absolute right-2 top-2 flex items-center gap-2 rounded bg-blue-600 px-2 py-1 text-xs text-white"><StarIcon size={12} />{item.hint}</div>)}<div className="text-3xl font-bold">{item.price}</div>- <div className="text-lg flex justify-between">+ <div className="flex justify-between text-lg"><span>{new Intl.NumberFormat('en').format(item.events)} events</span>diff --git a/apps/public/src/app/punch-lines.tsx b/apps/public/src/app/punch-lines.tsxindex 0ff5583aa..77cd56a43 100644--- a/apps/public/src/app/punch-lines.tsx+++ b/apps/public/src/app/punch-lines.tsx@@ -128,24 +128,24 @@ const items = [export function PunchLines() {return (- <div className="bg-blue-darker py-32 relative">- <div className="inset-0 absolute h-full w-full bg-[radial-gradient(circle,rgba(255,255,255,0.2)_0%,rgba(255,255,255,0)_100%)]"></div>+ <div className="bg-blue-darker relative py-32">+ <div className="absolute inset-0 h-full w-full bg-[radial-gradient(circle,rgba(255,255,255,0.2)_0%,rgba(255,255,255,0)_100%)]"></div><div className="relative">- <Heading2 className="text-white text-center mb-16">+ <Heading2 className="mb-16 text-center text-white">Not convinced?</Heading2><div className="container">- <div className="grid md:grid-cols-2 lg:grid-cols-3 gap-8">+ <div className="grid gap-8 md:grid-cols-2 lg:grid-cols-3">{items.map((item) => {const Icon = item.icon;return (<div- className="border border-border p-6 rounded-xl bg-white"+ className="rounded-xl border border-border bg-white p-6"key={item.title}><divclassName={cn(- 'h-14 w-14 rounded-full flex items-center justify-center mb-4',+ 'mb-4 flex h-14 w-14 items-center justify-center rounded-full',item.color)}style={{ background: item.color }}diff --git a/apps/public/src/components/Logo.tsx b/apps/public/src/components/Logo.tsxindex c68ef0804..0a281e75b 100644--- a/apps/public/src/components/Logo.tsx+++ b/apps/public/src/components/Logo.tsx@@ -10,7 +10,7 @@ export function Logo({ className }: LogoProps) {return (<Linkhref="/"- className={cn('text-xl font-medium flex gap-2 items-center', className)}+ className={cn('flex items-center gap-2 text-xl font-medium', className)}><Imagesrc="/logo.svg"diff --git a/apps/public/src/components/ui/button.tsx b/apps/public/src/components/ui/button.tsxindex 70e38d7be..78f787b4b 100644--- a/apps/public/src/components/ui/button.tsx+++ b/apps/public/src/components/ui/button.tsx@@ -9,7 +9,7 @@ import type { LucideIcon } from 'lucide-react';import { Loader2 } from 'lucide-react';const buttonVariants = cva(- 'flex-shrink-0 inline-flex items-center justify-center rounded-md text-sm font-medium ring-offset-background whitespace-nowrap transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50',+ 'inline-flex flex-shrink-0 items-center justify-center whitespace-nowrap rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50',{variants: {variant: {@@ -71,7 +71,7 @@ const Button = React.forwardRef<HTMLButtonElement, ButtonProps>({...props}>{Icon && (- <Icon className={cn('h-4 w-4 mr-2', loading && 'animate-spin')} />+ <Icon className={cn('mr-2 h-4 w-4', loading && 'animate-spin')} />)}{children}</Comp>diff --git a/apps/public/src/components/ui/dialog.tsx b/apps/public/src/components/ui/dialog.tsxindex f84db2146..98801586b 100644--- a/apps/public/src/components/ui/dialog.tsx+++ b/apps/public/src/components/ui/dialog.tsx@@ -37,7 +37,7 @@ const DialogContent = React.forwardRef<<DialogPrimitive.Contentref={ref}className={cn(- 'fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-100%] md:translate-y-[-50%] gap-4 border bg-background p-6 shadow-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] sm:rounded-lg md:w-full',+ 'fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-100%] gap-4 border bg-background p-6 shadow-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] sm:rounded-lg md:w-full md:translate-y-[-50%]',className)}{...props}diff --git a/docker/Dockerfile-composed b/docker/Dockerfile-composeddeleted file mode 100644index d08bcf35a..000000000--- a/docker/Dockerfile-composed+++ /dev/null@@ -1,101 +0,0 @@-# Docker file that contains all the necessary services to run the app-# EXCEPT the database. The database is run in a separate container.--# Services: web, worker (queue), redis-# Excluded: db (postgres)--FROM --platform=linux/amd64 node:20-slim AS base--ARG DATABASE_URL="postgresql://[email protected]:5432/openpanel?schema=public"-ENV DATABASE_URL=$DATABASE_URL--ARG NEXTAUTH_SECRET="secret_sauce"-ENV NEXTAUTH_SECRET=$NEXTAUTH_SECRET--ARG REDIS_URL="redis://127.0.0.1:6379"-ENV REDIS_URL=$REDIS_URL--ENV PNPM_HOME="/pnpm"--ENV PATH="$PNPM_HOME:$PATH"--RUN corepack enable--ARG NODE_VERSION=20--RUN apt update \- && apt install -y curl supervisor redis \- && curl -L https://raw.githubusercontent.com/tj/n/master/bin/n -o n \- && bash n $NODE_VERSION \- && rm n \- && npm install -g n--WORKDIR /app--COPY package.json package.json-COPY pnpm-lock.yaml pnpm-lock.yaml-COPY pnpm-workspace.yaml pnpm-workspace.yaml-COPY apps/dashboard/package.json apps/dashboard/package.json-COPY apps/worker/package.json apps/worker/package.json-COPY packages/db/package.json packages/db/package.json-COPY packages/queue/package.json packages/queue/package.json-COPY packages/common/package.json packages/common/package.json-COPY packages/sdks/sdk/package.json packages/sdks/sdk/package.json--# BUILD-FROM base AS build--WORKDIR /app/apps/dashboard-RUN pnpm install --frozen-lockfile --ignore-scripts--WORKDIR /app/apps/worker-RUN pnpm install --frozen-lockfile --ignore-scripts--WORKDIR /app-COPY apps apps-COPY packages packages-COPY tooling tooling-RUN pnpm db:codegen--WORKDIR /app/apps/dashboard-RUN pnpm run build--WORKDIR /app/apps/worker-RUN pnpm run build--# PROD-FROM base AS prod--WORKDIR /app-RUN pnpm install --frozen-lockfile --prod --ignore-scripts--# FINAL-FROM base AS runner--COPY --from=build /app/package.json /app/package.json-COPY --from=prod /app/node_modules /app/node_modules-# Apps-COPY --from=build /app/apps/dashboard /app/apps/dashboard-COPY --from=build /app/apps/worker /app/apps/worker-# Apps node_modules-COPY --from=prod /app/apps/dashboard/node_modules /app/apps/dashboard/node_modules-COPY --from=prod /app/apps/worker/node_modules /app/apps/worker/node_modules-# Packages-COPY --from=build /app/packages/db /app/packages/db-COPY --from=build /app/packages/queue /app/packages/queue-# Packages node_modules-COPY --from=prod /app/packages/db/node_modules /app/packages/db/node_modules-COPY --from=prod /app/packages/queue/node_modules /app/packages/queue/node_modules--RUN pnpm db:codegen--RUN mkdir -p /var/log/supervisor /data-COPY docker/supervisord.conf /etc/supervisor/conf.d/supervisord.conf-COPY docker/redis.conf /etc/redis/redis.conf--# Redis data-VOLUME [ "/data" ]--EXPOSE 3000 3001--CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf"]\ No newline at end of filediff --git a/docker/Dockerfile-web b/docker/Dockerfile-webdeleted file mode 100644index c59eade34..000000000--- a/docker/Dockerfile-web+++ /dev/null@@ -1,83 +0,0 @@-# Dockerfile that builds the web app only--FROM --platform=linux/amd64 node:20-slim AS base--ARG DATABASE_URL="postgresql://[email protected]:5432/openpanel?schema=public"-ENV DATABASE_URL=$DATABASE_URL--ARG NEXTAUTH_SECRET="secret_sauce"-ENV NEXTAUTH_SECRET=$NEXTAUTH_SECRET--ARG REDIS_URL="redis://127.0.0.1:6379"-ENV REDIS_URL=$REDIS_URL--ENV PNPM_HOME="/pnpm"--ENV PATH="$PNPM_HOME:$PATH"--RUN corepack enable--ARG NODE_VERSION=20--RUN apt update \- && apt install -y curl \- && curl -L https://raw.githubusercontent.com/tj/n/master/bin/n -o n \- && bash n $NODE_VERSION \- && rm n \- && npm install -g n--WORKDIR /app--COPY package.json package.json-COPY pnpm-lock.yaml pnpm-lock.yaml-COPY pnpm-workspace.yaml pnpm-workspace.yaml-COPY apps/dashboard/package.json apps/dashboard/package.json-COPY packages/db/package.json packages/db/package.json-COPY packages/queue/package.json packages/queue/package.json-COPY packages/common/package.json packages/common/package.json-COPY packages/sdks/sdk/package.json packages/sdks/sdk/package.json--# BUILD-FROM base AS build--WORKDIR /app/apps/dashboard-RUN pnpm install --frozen-lockfile --ignore-scripts--WORKDIR /app-COPY apps apps-COPY packages packages-COPY tooling tooling-RUN pnpm db:codegen--WORKDIR /app/apps/dashboard-RUN pnpm run build--# PROD-FROM base AS prod--WORKDIR /app/apps/dashboard-RUN pnpm install --frozen-lockfile --prod --ignore-scripts--# FINAL-FROM base AS runner--COPY --from=build /app/package.json /app/package.json-COPY --from=prod /app/node_modules /app/node_modules-# Apps-COPY --from=build /app/apps/dashboard /app/apps/dashboard-# Apps node_modules-COPY --from=prod /app/apps/dashboard/node_modules /app/apps/dashboard/node_modules-# Packages-COPY --from=build /app/packages/db /app/packages/db-COPY --from=build /app/packages/queue /app/packages/queue-# Packages node_modules-COPY --from=prod /app/packages/db/node_modules /app/packages/db/node_modules-COPY --from=prod /app/packages/queue/node_modules /app/packages/queue/node_modules--RUN pnpm db:codegen--WORKDIR /app/apps/dashboard--EXPOSE 3000--CMD ["pnpm", "start"]\ No newline at end of filediff --git a/docker/Dockerfile-worker b/docker/Dockerfile-workerdeleted file mode 100644index a9f5e07da..000000000--- a/docker/Dockerfile-worker+++ /dev/null@@ -1,80 +0,0 @@-# Dockerfile that builds the worker only--FROM --platform=linux/amd64 node:20-slim AS base--ARG DATABASE_URL="postgresql://[email protected]:5432/openpanel?schema=public"-ENV DATABASE_URL=$DATABASE_URL--ARG REDIS_URL="redis://127.0.0.1:6379"-ENV REDIS_URL=$REDIS_URL--ENV PNPM_HOME="/pnpm"--ENV PATH="$PNPM_HOME:$PATH"--RUN corepack enable--ARG NODE_VERSION=20--RUN apt update \- && apt install -y curl \- && curl -L https://raw.githubusercontent.com/tj/n/master/bin/n -o n \- && bash n $NODE_VERSION \- && rm n \- && npm install -g n--WORKDIR /app--COPY package.json package.json-COPY pnpm-lock.yaml pnpm-lock.yaml-COPY pnpm-workspace.yaml pnpm-workspace.yaml-COPY apps/worker/package.json apps/worker/package.json-COPY packages/db/package.json packages/db/package.json-COPY packages/queue/package.json packages/queue/package.json-COPY packages/common/package.json packages/common/package.json-COPY packages/sdks/sdk/package.json packages/sdks/sdk/package.json--# BUILD-FROM base AS build--WORKDIR /app/apps/worker-RUN pnpm install --frozen-lockfile --ignore-scripts--WORKDIR /app-COPY apps apps-COPY packages packages-COPY tooling tooling-RUN pnpm db:codegen--WORKDIR /app/apps/worker-RUN pnpm run build--# PROD-FROM base AS prod--WORKDIR /app/apps/worker-RUN pnpm install --frozen-lockfile --prod --ignore-scripts--# FINAL-FROM base AS runner--COPY --from=build /app/package.json /app/package.json-COPY --from=prod /app/node_modules /app/node_modules-# Apps-COPY --from=build /app/apps/worker /app/apps/worker-# Apps node_modules-COPY --from=prod /app/apps/worker/node_modules /app/apps/worker/node_modules-# Packages-COPY --from=build /app/packages/db /app/packages/db-COPY --from=build /app/packages/queue /app/packages/queue-# Packages node_modules-COPY --from=prod /app/packages/db/node_modules /app/packages/db/node_modules-COPY --from=prod /app/packages/queue/node_modules /app/packages/queue/node_modules--RUN pnpm db:codegen--WORKDIR /app/apps/worker--EXPOSE 3000--CMD ["pnpm", "start"]\ No newline at end of filediff --git a/docker/build-composed b/docker/build-composeddeleted file mode 100755index cb872e52e..000000000--- a/docker/build-composed+++ /dev/null@@ -1,10 +0,0 @@-#!/bin/bash--docker build \- --build-arg DATABASE_URL="postgresql://[email protected]:5432/openpanel?schema=public" \- --build-arg NEXTAUTH_SECRET="secret_sauce" \- --build-arg REDIS_URL="redis://127.0.0.1:6379" \- -t openpanel/composed:latest \- -t openpanel/composed:1.0 \- -f docker/Dockerfile-composed \- .\ No newline at end of filediff --git a/docker/redis.conf b/docker/redis.confdeleted file mode 100644index 6b90d0f77..000000000--- a/docker/redis.conf+++ /dev/null@@ -1,1329 +0,0 @@-###############################-#-# NOTICE-#-# - The protection-mode is shutdown for development convenience, please-# setup a password by requirepass option for security if online.-#-# - The RDB is shutdown, please enable it by yourself if necessary.-#-# - The AOF is shutdown, please enable it by yourself if necessary.-#-###############################--# Redis configuration file example.-#-# Note that in order to read the configuration file, Redis must be-# started with the file path as first argument:-#-# ./redis-server /path/to/redis.conf--# Note on units: when memory size is needed, it is possible to specify-# it in the usual form of 1k 5GB 4M and so forth:-#-# 1k => 1000 bytes-# 1kb => 1024 bytes-# 1m => 1000000 bytes-# 1mb => 1024*1024 bytes-# 1g => 1000000000 bytes-# 1gb => 1024*1024*1024 bytes-#-# units are case insensitive so 1GB 1Gb 1gB are all the same.--################################## INCLUDES ###################################--# Include one or more other config files here. This is useful if you-# have a standard template that goes to all Redis servers but also need-# to customize a few per-server settings. Include files can include-# other files, so use this wisely.-#-# Notice option "include" won't be rewritten by command "CONFIG REWRITE"-# from admin or Redis Sentinel. Since Redis always uses the last processed-# line as value of a configuration directive, you'd better put includes-# at the beginning of this file to avoid overwriting config change at runtime.-#-# If instead you are interested in using includes to override configuration-# options, it is better to use include as the last line.-#-# include /path/to/local.conf-# include /path/to/other.conf--################################## MODULES #####################################--# Load modules at startup. If the server is not able to load modules-# it will abort. It is possible to use multiple loadmodule directives.-#-# loadmodule /path/to/my_module.so-# loadmodule /path/to/other_module.so--################################## NETWORK #####################################--# By default, if no "bind" configuration directive is specified, Redis listens-# for connections from all the network interfaces available on the server.-# It is possible to listen to just one or multiple selected interfaces using-# the "bind" configuration directive, followed by one or more IP addresses.-#-# Examples:-#-# bind 192.168.1.100 10.0.0.1-# bind 127.0.0.1 ::1-#-# ~~~ WARNING ~~~ If the computer running Redis is directly exposed to the-# internet, binding to all the interfaces is dangerous and will expose the-# instance to everybody on the internet. So by default we uncomment the-# following bind directive, that will force Redis to listen only into-# the IPv4 lookback interface address (this means Redis will be able to-# accept connections only from clients running into the same computer it-# is running).-#-# IF YOU ARE SURE YOU WANT YOUR INSTANCE TO LISTEN TO ALL THE INTERFACES-# JUST COMMENT THE FOLLOWING LINE.-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-bind 0.0.0.0--# Protected mode is a layer of security protection, in order to avoid that-# Redis instances left open on the internet are accessed and exploited.-#-# When protected mode is on and if:-#-# 1) The server is not binding explicitly to a set of addresses using the-# "bind" directive.-# 2) No password is configured.-#-# The server only accepts connections from clients connecting from the-# IPv4 and IPv6 loopback addresses 127.0.0.1 and ::1, and from Unix domain-# sockets.-#-# By default protected mode is enabled. You should disable it only if-# you are sure you want clients from other hosts to connect to Redis-# even if no authentication is configured, nor a specific set of interfaces-# are explicitly listed using the "bind" directive.-protected-mode yes--# Accept connections on the specified port, default is 6379 (IANA #815344).-# If port 0 is specified Redis will not listen on a TCP socket.-port 6379--# TCP listen() backlog.-#-# In high requests-per-second environments you need an high backlog in order-# to avoid slow clients connections issues. Note that the Linux kernel-# will silently truncate it to the value of /proc/sys/net/core/somaxconn so-# make sure to raise both the value of somaxconn and tcp_max_syn_backlog-# in order to get the desired effect.-tcp-backlog 511--# Unix socket.-#-# Specify the path for the Unix socket that will be used to listen for-# incoming connections. There is no default, so Redis will not listen-# on a unix socket when not specified.-#-# unixsocket /tmp/redis.sock-# unixsocketperm 700--# Close the connection after a client is idle for N seconds (0 to disable)-timeout 0--# TCP keepalive.-#-# If non-zero, use SO_KEEPALIVE to send TCP ACKs to clients in absence-# of communication. This is useful for two reasons:-#-# 1) Detect dead peers.-# 2) Take the connection alive from the point of view of network-# equipment in the middle.-#-# On Linux, the specified value (in seconds) is the period used to send ACKs.-# Note that to close the connection the double of the time is needed.-# On other kernels the period depends on the kernel configuration.-#-# A reasonable value for this option is 300 seconds, which is the new-# Redis default starting with Redis 3.2.1.-tcp-keepalive 300--################################# GENERAL #####################################--# By default Redis does not run as a daemon. Use 'yes' if you need it.-# Note that Redis will write a pid file in /var/run/redis.pid when daemonized.-daemonize no--# If you run Redis from upstart or systemd, Redis can interact with your-# supervision tree. Options:-# supervised no - no supervision interaction-# supervised upstart - signal upstart by putting Redis into SIGSTOP mode-# supervised systemd - signal systemd by writing READY=1 to $NOTIFY_SOCKET-# supervised auto - detect upstart or systemd method based on-# UPSTART_JOB or NOTIFY_SOCKET environment variables-# Note: these supervision methods only signal "process is ready."-# They do not enable continuous liveness pings back to your supervisor.-supervised no--# If a pid file is specified, Redis writes it where specified at startup-# and removes it at exit.-#-# When the server runs non daemonized, no pid file is created if none is-# specified in the configuration. When the server is daemonized, the pid file-# is used even if not specified, defaulting to "/var/run/redis.pid".-#-# Creating a pid file is best effort: if Redis is not able to create it-# nothing bad happens, the server will start and run normally.-pidfile /var/run/redis_6379.pid--# Specify the server verbosity level.-# This can be one of:-# debug (a lot of information, useful for development/testing)-# verbose (many rarely useful info, but not a mess like the debug level)-# notice (moderately verbose, what you want in production probably)-# warning (only very important / critical messages are logged)-loglevel notice--# Specify the log file name. Also the empty string can be used to force-# Redis to log on the standard output. Note that if you use standard-# output for logging but daemonize, logs will be sent to /dev/null-logfile ""--# To enable logging to the system logger, just set 'syslog-enabled' to yes,-# and optionally update the other syslog parameters to suit your needs.-# syslog-enabled no--# Specify the syslog identity.-# syslog-ident redis--# Specify the syslog facility. Must be USER or between LOCAL0-LOCAL7.-# syslog-facility local0--# Set the number of databases. The default database is DB 0, you can select-# a different one on a per-connection basis using SELECT <dbid> where-# dbid is a number between 0 and 'databases'-1-databases 16--# By default Redis shows an ASCII art logo only when started to log to the-# standard output and if the standard output is a TTY. Basically this means-# that normally a logo is displayed only in interactive sessions.-#-# However it is possible to force the pre-4.0 behavior and always show a-# ASCII art logo in startup logs by setting the following option to yes.-always-show-logo yes--################################ SNAPSHOTTING ################################-#-# Save the DB on disk:-#-# save <seconds> <changes>-#-# Will save the DB if both the given number of seconds and the given-# number of write operations against the DB occurred.-#-# In the example below the behaviour will be to save:-# after 900 sec (15 min) if at least 1 key changed-# after 300 sec (5 min) if at least 10 keys changed-# after 60 sec if at least 10000 keys changed-#-# Note: you can disable saving completely by commenting out all "save" lines.-#-# It is also possible to remove all the previously configured save-# points by adding a save directive with a single empty string argument-# like in the following example:-#-# save ""--save 900 1-save 300 10-save 60 10000--# By default Redis will stop accepting writes if RDB snapshots are enabled-# (at least one save point) and the latest background save failed.-# This will make the user aware (in a hard way) that data is not persisting-# on disk properly, otherwise chances are that no one will notice and some-# disaster will happen.-#-# If the background saving process will start working again Redis will-# automatically allow writes again.-#-# However if you have setup your proper monitoring of the Redis server-# and persistence, you may want to disable this feature so that Redis will-# continue to work as usual even if there are problems with disk,-# permissions, and so forth.-stop-writes-on-bgsave-error yes--# Compress string objects using LZF when dump .rdb databases?-# For default that's set to 'yes' as it's almost always a win.-# If you want to save some CPU in the saving child set it to 'no' but-# the dataset will likely be bigger if you have compressible values or keys.-rdbcompression yes--# Since version 5 of RDB a CRC64 checksum is placed at the end of the file.-# This makes the format more resistant to corruption but there is a performance-# hit to pay (around 10%) when saving and loading RDB files, so you can disable it-# for maximum performances.-#-# RDB files created with checksum disabled have a checksum of zero that will-# tell the loading code to skip the check.-rdbchecksum yes--# The filename where to dump the DB-dbfilename dump.rdb--# The working directory.-#-# The DB will be written inside this directory, with the filename specified-# above using the 'dbfilename' configuration directive.-#-# The Append Only File will also be created inside this directory.-#-# Note that you must specify a directory here, not a file name.-dir /data/--################################# REPLICATION #################################--# Master-Slave replication. Use slaveof to make a Redis instance a copy of-# another Redis server. A few things to understand ASAP about Redis replication.-#-# 1) Redis replication is asynchronous, but you can configure a master to-# stop accepting writes if it appears to be not connected with at least-# a given number of slaves.-# 2) Redis slaves are able to perform a partial resynchronization with the-# master if the replication link is lost for a relatively small amount of-# time. You may want to configure the replication backlog size (see the next-# sections of this file) with a sensible value depending on your needs.-# 3) Replication is automatic and does not need user intervention. After a-# network partition slaves automatically try to reconnect to masters-# and resynchronize with them.-#-# slaveof <masterip> <masterport>--# If the master is password protected (using the "requirepass" configuration-# directive below) it is possible to tell the slave to authenticate before-# starting the replication synchronization process, otherwise the master will-# refuse the slave request.-#-# masterauth <master-password>--# When a slave loses its connection with the master, or when the replication-# is still in progress, the slave can act in two different ways:-#-# 1) if slave-serve-stale-data is set to 'yes' (the default) the slave will-# still reply to client requests, possibly with out of date data, or the-# data set may just be empty if this is the first synchronization.-#-# 2) if slave-serve-stale-data is set to 'no' the slave will reply with-# an error "SYNC with master in progress" to all the kind of commands-# but to INFO and SLAVEOF.-#-slave-serve-stale-data yes--# You can configure a slave instance to accept writes or not. Writing against-# a slave instance may be useful to store some ephemeral data (because data-# written on a slave will be easily deleted after resync with the master) but-# may also cause problems if clients are writing to it because of a-# misconfiguration.-#-# Since Redis 2.6 by default slaves are read-only.-#-# Note: read only slaves are not designed to be exposed to untrusted clients-# on the internet. It's just a protection layer against misuse of the instance.-# Still a read only slave exports by default all the administrative commands-# such as CONFIG, DEBUG, and so forth. To a limited extent you can improve-# security of read only slaves using 'rename-command' to shadow all the-# administrative / dangerous commands.-slave-read-only yes--# Replication SYNC strategy: disk or socket.-#-# --------------------------------------------------------# WARNING: DISKLESS REPLICATION IS EXPERIMENTAL CURRENTLY-# --------------------------------------------------------#-# New slaves and reconnecting slaves that are not able to continue the replication-# process just receiving differences, need to do what is called a "full-# synchronization". An RDB file is transmitted from the master to the slaves.-# The transmission can happen in two different ways:-#-# 1) Disk-backed: The Redis master creates a new process that writes the RDB-# file on disk. Later the file is transferred by the parent-# process to the slaves incrementally.-# 2) Diskless: The Redis master creates a new process that directly writes the-# RDB file to slave sockets, without touching the disk at all.-#-# With disk-backed replication, while the RDB file is generated, more slaves-# can be queued and served with the RDB file as soon as the current child producing-# the RDB file finishes its work. With diskless replication instead once-# the transfer starts, new slaves arriving will be queued and a new transfer-# will start when the current one terminates.-#-# When diskless replication is used, the master waits a configurable amount of-# time (in seconds) before starting the transfer in the hope that multiple slaves-# will arrive and the transfer can be parallelized.-#-# With slow disks and fast (large bandwidth) networks, diskless replication-# works better.-repl-diskless-sync no--# When diskless replication is enabled, it is possible to configure the delay-# the server waits in order to spawn the child that transfers the RDB via socket-# to the slaves.-#-# This is important since once the transfer starts, it is not possible to serve-# new slaves arriving, that will be queued for the next RDB transfer, so the server-# waits a delay in order to let more slaves arrive.-#-# The delay is specified in seconds, and by default is 5 seconds. To disable-# it entirely just set it to 0 seconds and the transfer will start ASAP.-repl-diskless-sync-delay 5--# Slaves send PINGs to server in a predefined interval. It's possible to change-# this interval with the repl_ping_slave_period option. The default value is 10-# seconds.-#-# repl-ping-slave-period 10--# The following option sets the replication timeout for:-#-# 1) Bulk transfer I/O during SYNC, from the point of view of slave.-# 2) Master timeout from the point of view of slaves (data, pings).-# 3) Slave timeout from the point of view of masters (REPLCONF ACK pings).-#-# It is important to make sure that this value is greater than the value-# specified for repl-ping-slave-period otherwise a timeout will be detected-# every time there is low traffic between the master and the slave.-#-# repl-timeout 60--# Disable TCP_NODELAY on the slave socket after SYNC?-#-# If you select "yes" Redis will use a smaller number of TCP packets and-# less bandwidth to send data to slaves. But this can add a delay for-# the data to appear on the slave side, up to 40 milliseconds with-# Linux kernels using a default configuration.-#-# If you select "no" the delay for data to appear on the slave side will-# be reduced but more bandwidth will be used for replication.-#-# By default we optimize for low latency, but in very high traffic conditions-# or when the master and slaves are many hops away, turning this to "yes" may-# be a good idea.-repl-disable-tcp-nodelay no--# Set the replication backlog size. The backlog is a buffer that accumulates-# slave data when slaves are disconnected for some time, so that when a slave-# wants to reconnect again, often a full resync is not needed, but a partial-# resync is enough, just passing the portion of data the slave missed while-# disconnected.-#-# The bigger the replication backlog, the longer the time the slave can be-# disconnected and later be able to perform a partial resynchronization.-#-# The backlog is only allocated once there is at least a slave connected.-#-# repl-backlog-size 1mb--# After a master has no longer connected slaves for some time, the backlog-# will be freed. The following option configures the amount of seconds that-# need to elapse, starting from the time the last slave disconnected, for-# the backlog buffer to be freed.-#-# Note that slaves never free the backlog for timeout, since they may be-# promoted to masters later, and should be able to correctly "partially-# resynchronize" with the slaves: hence they should always accumulate backlog.-#-# A value of 0 means to never release the backlog.-#-# repl-backlog-ttl 3600--# The slave priority is an integer number published by Redis in the INFO output.-# It is used by Redis Sentinel in order to select a slave to promote into a-# master if the master is no longer working correctly.-#-# A slave with a low priority number is considered better for promotion, so-# for instance if there are three slaves with priority 10, 100, 25 Sentinel will-# pick the one with priority 10, that is the lowest.-#-# However a special priority of 0 marks the slave as not able to perform the-# role of master, so a slave with priority of 0 will never be selected by-# Redis Sentinel for promotion.-#-# By default the priority is 100.-slave-priority 100--# It is possible for a master to stop accepting writes if there are less than-# N slaves connected, having a lag less or equal than M seconds.-#-# The N slaves need to be in "online" state.-#-# The lag in seconds, that must be <= the specified value, is calculated from-# the last ping received from the slave, that is usually sent every second.-#-# This option does not GUARANTEE that N replicas will accept the write, but-# will limit the window of exposure for lost writes in case not enough slaves-# are available, to the specified number of seconds.-#-# For example to require at least 3 slaves with a lag <= 10 seconds use:-#-# min-slaves-to-write 3-# min-slaves-max-lag 10-#-# Setting one or the other to 0 disables the feature.-#-# By default min-slaves-to-write is set to 0 (feature disabled) and-# min-slaves-max-lag is set to 10.--# A Redis master is able to list the address and port of the attached-# slaves in different ways. For example the "INFO replication" section-# offers this information, which is used, among other tools, by-# Redis Sentinel in order to discover slave instances.-# Another place where this info is available is in the output of the-# "ROLE" command of a master.-#-# The listed IP and address normally reported by a slave is obtained-# in the following way:-#-# IP: The address is auto detected by checking the peer address-# of the socket used by the slave to connect with the master.-#-# Port: The port is communicated by the slave during the replication-# handshake, and is normally the port that the slave is using to-# list for connections.-#-# However when port forwarding or Network Address Translation (NAT) is-# used, the slave may be actually reachable via different IP and port-# pairs. The following two options can be used by a slave in order to-# report to its master a specific set of IP and port, so that both INFO-# and ROLE will report those values.-#-# There is no need to use both the options if you need to override just-# the port or the IP address.-#-# slave-announce-ip 5.5.5.5-# slave-announce-port 1234--################################## SECURITY ###################################--# Require clients to issue AUTH <PASSWORD> before processing any other-# commands. This might be useful in environments in which you do not trust-# others with access to the host running redis-server.-#-# This should stay commented out for backward compatibility and because most-# people do not need auth (e.g. they run their own servers).-#-# Warning: since Redis is pretty fast an outside user can try up to-# 150k passwords per second against a good box. This means that you should-# use a very strong password otherwise it will be very easy to break.-#-# requirepass foobared--# Command renaming.-#-# It is possible to change the name of dangerous commands in a shared-# environment. For instance the CONFIG command may be renamed into something-# hard to guess so that it will still be available for internal-use tools-# but not available for general clients.-#-# Example:-#-# rename-command CONFIG b840fc02d524045429941cc15f59e41cb7be6c52-#-# It is also possible to completely kill a command by renaming it into-# an empty string:-#-# rename-command CONFIG ""-#-# Please note that changing the name of commands that are logged into the-# AOF file or transmitted to slaves may cause problems.--################################### CLIENTS ####################################--# Set the max number of connected clients at the same time. By default-# this limit is set to 10000 clients, however if the Redis server is not-# able to configure the process file limit to allow for the specified limit-# the max number of allowed clients is set to the current file limit-# minus 32 (as Redis reserves a few file descriptors for internal uses).-#-# Once the limit is reached Redis will close all the new connections sending-# an error 'max number of clients reached'.-#-# maxclients 10000--############################## MEMORY MANAGEMENT ################################--# Set a memory usage limit to the specified amount of bytes.-# When the memory limit is reached Redis will try to remove keys-# according to the eviction policy selected (see maxmemory-policy).-#-# If Redis can't remove keys according to the policy, or if the policy is-# set to 'noeviction', Redis will start to reply with errors to commands-# that would use more memory, like SET, LPUSH, and so on, and will continue-# to reply to read-only commands like GET.-#-# This option is usually useful when using Redis as an LRU or LFU cache, or to-# set a hard memory limit for an instance (using the 'noeviction' policy).-#-# WARNING: If you have slaves attached to an instance with maxmemory on,-# the size of the output buffers needed to feed the slaves are subtracted-# from the used memory count, so that network problems / resyncs will-# not trigger a loop where keys are evicted, and in turn the output-# buffer of slaves is full with DELs of keys evicted triggering the deletion-# of more keys, and so forth until the database is completely emptied.-#-# In short... if you have slaves attached it is suggested that you set a lower-# limit for maxmemory so that there is some free RAM on the system for slave-# output buffers (but this is not needed if the policy is 'noeviction').-#-maxmemory 268435456--# MAXMEMORY POLICY: how Redis will select what to remove when maxmemory-# is reached. You can select among five behaviors:-#-# volatile-lru -> Evict using approximated LRU among the keys with an expire set.-# allkeys-lru -> Evict any key using approximated LRU.-# volatile-lfu -> Evict using approximated LFU among the keys with an expire set.-# allkeys-lfu -> Evict any key using approximated LFU.-# volatile-random -> Remove a random key among the ones with an expire set.-# allkeys-random -> Remove a random key, any key.-# volatile-ttl -> Remove the key with the nearest expire time (minor TTL)-# noeviction -> Don't evict anything, just return an error on write operations.-#-# LRU means Least Recently Used-# LFU means Least Frequently Used-#-# Both LRU, LFU and volatile-ttl are implemented using approximated-# randomized algorithms.-#-# Note: with any of the above policies, Redis will return an error on write-# operations, when there are no suitable keys for eviction.-#-# At the date of writing these commands are: set setnx setex append-# incr decr rpush lpush rpushx lpushx linsert lset rpoplpush sadd-# sinter sinterstore sunion sunionstore sdiff sdiffstore zadd zincrby-# zunionstore zinterstore hset hsetnx hmset hincrby incrby decrby-# getset mset msetnx exec sort-#-# The default is:-#-# maxmemory-policy noeviction--# LRU, LFU and minimal TTL algorithms are not precise algorithms but approximated-# algorithms (in order to save memory), so you can tune it for speed or-# accuracy. For default Redis will check five keys and pick the one that was-# used less recently, you can change the sample size using the following-# configuration directive.-#-# The default of 5 produces good enough results. 10 Approximates very closely-# true LRU but costs more CPU. 3 is faster but not very accurate.-#-# maxmemory-samples 5--############################# LAZY FREEING ####################################--# Redis has two primitives to delete keys. One is called DEL and is a blocking-# deletion of the object. It means that the server stops processing new commands-# in order to reclaim all the memory associated with an object in a synchronous-# way. If the key deleted is associated with a small object, the time needed-# in order to execute the DEL command is very small and comparable to most other-# O(1) or O(log_N) commands in Redis. However if the key is associated with an-# aggregated value containing millions of elements, the server can block for-# a long time (even seconds) in order to complete the operation.-#-# For the above reasons Redis also offers non blocking deletion primitives-# such as UNLINK (non blocking DEL) and the ASYNC option of FLUSHALL and-# FLUSHDB commands, in order to reclaim memory in background. Those commands-# are executed in constant time. Another thread will incrementally free the-# object in the background as fast as possible.-#-# DEL, UNLINK and ASYNC option of FLUSHALL and FLUSHDB are user-controlled.-# It's up to the design of the application to understand when it is a good-# idea to use one or the other. However the Redis server sometimes has to-# delete keys or flush the whole database as a side effect of other operations.-# Specifically Redis deletes objects independently of a user call in the-# following scenarios:-#-# 1) On eviction, because of the maxmemory and maxmemory policy configurations,-# in order to make room for new data, without going over the specified-# memory limit.-# 2) Because of expire: when a key with an associated time to live (see the-# EXPIRE command) must be deleted from memory.-# 3) Because of a side effect of a command that stores data on a key that may-# already exist. For example the RENAME command may delete the old key-# content when it is replaced with another one. Similarly SUNIONSTORE-# or SORT with STORE option may delete existing keys. The SET command-# itself removes any old content of the specified key in order to replace-# it with the specified string.-# 4) During replication, when a slave performs a full resynchronization with-# its master, the content of the whole database is removed in order to-# load the RDB file just transfered.-#-# In all the above cases the default is to delete objects in a blocking way,-# like if DEL was called. However you can configure each case specifically-# in order to instead release memory in a non-blocking way like if UNLINK-# was called, using the following configuration directives:--lazyfree-lazy-eviction no-lazyfree-lazy-expire no-lazyfree-lazy-server-del no-slave-lazy-flush no--############################## APPEND ONLY MODE ###############################--# By default Redis asynchronously dumps the dataset on disk. This mode is-# good enough in many applications, but an issue with the Redis process or-# a power outage may result into a few minutes of writes lost (depending on-# the configured save points).-#-# The Append Only File is an alternative persistence mode that provides-# much better durability. For instance using the default data fsync policy-# (see later in the config file) Redis can lose just one second of writes in a-# dramatic event like a server power outage, or a single write if something-# wrong with the Redis process itself happens, but the operating system is-# still running correctly.-#-# AOF and RDB persistence can be enabled at the same time without problems.-# If the AOF is enabled on startup Redis will load the AOF, that is the file-# with the better durability guarantees.-#-# Please check http://redis.io/topics/persistence for more information.--appendonly no--# The name of the append only file (default: "appendonly.aof")--appendfilename "appendonly.aof"--# The fsync() call tells the Operating System to actually write data on disk-# instead of waiting for more data in the output buffer. Some OS will really flush-# data on disk, some other OS will just try to do it ASAP.-#-# Redis supports three different modes:-#-# no: don't fsync, just let the OS flush the data when it wants. Faster.-# always: fsync after every write to the append only log. Slow, Safest.-# everysec: fsync only one time every second. Compromise.-#-# The default is "everysec", as that's usually the right compromise between-# speed and data safety. It's up to you to understand if you can relax this to-# "no" that will let the operating system flush the output buffer when-# it wants, for better performances (but if you can live with the idea of-# some data loss consider the default persistence mode that's snapshotting),-# or on the contrary, use "always" that's very slow but a bit safer than-# everysec.-#-# More details please check the following article:-# http://antirez.com/post/redis-persistence-demystified.html-#-# If unsure, use "everysec".--# appendfsync always-appendfsync everysec-# appendfsync no--# When the AOF fsync policy is set to always or everysec, and a background-# saving process (a background save or AOF log background rewriting) is-# performing a lot of I/O against the disk, in some Linux configurations-# Redis may block too long on the fsync() call. Note that there is no fix for-# this currently, as even performing fsync in a different thread will block-# our synchronous write(2) call.-#-# In order to mitigate this problem it's possible to use the following option-# that will prevent fsync() from being called in the main process while a-# BGSAVE or BGREWRITEAOF is in progress.-#-# This means that while another child is saving, the durability of Redis is-# the same as "appendfsync none". In practical terms, this means that it is-# possible to lose up to 30 seconds of log in the worst scenario (with the-# default Linux settings).-#-# If you have latency problems turn this to "yes". Otherwise leave it as-# "no" that is the safest pick from the point of view of durability.--no-appendfsync-on-rewrite no--# Automatic rewrite of the append only file.-# Redis is able to automatically rewrite the log file implicitly calling-# BGREWRITEAOF when the AOF log size grows by the specified percentage.-#-# This is how it works: Redis remembers the size of the AOF file after the-# latest rewrite (if no rewrite has happened since the restart, the size of-# the AOF at startup is used).-#-# This base size is compared to the current size. If the current size is-# bigger than the specified percentage, the rewrite is triggered. Also-# you need to specify a minimal size for the AOF file to be rewritten, this-# is useful to avoid rewriting the AOF file even if the percentage increase-# is reached but it is still pretty small.-#-# Specify a percentage of zero in order to disable the automatic AOF-# rewrite feature.--auto-aof-rewrite-percentage 100-auto-aof-rewrite-min-size 64mb--# An AOF file may be found to be truncated at the end during the Redis-# startup process, when the AOF data gets loaded back into memory.-# This may happen when the system where Redis is running-# crashes, especially when an ext4 filesystem is mounted without the-# data=ordered option (however this can't happen when Redis itself-# crashes or aborts but the operating system still works correctly).-#-# Redis can either exit with an error when this happens, or load as much-# data as possible (the default now) and start if the AOF file is found-# to be truncated at the end. The following option controls this behavior.-#-# If aof-load-truncated is set to yes, a truncated AOF file is loaded and-# the Redis server starts emitting a log to inform the user of the event.-# Otherwise if the option is set to no, the server aborts with an error-# and refuses to start. When the option is set to no, the user requires-# to fix the AOF file using the "redis-check-aof" utility before to restart-# the server.-#-# Note that if the AOF file will be found to be corrupted in the middle-# the server will still exit with an error. This option only applies when-# Redis will try to read more data from the AOF file but not enough bytes-# will be found.-aof-load-truncated yes--# When rewriting the AOF file, Redis is able to use an RDB preamble in the-# AOF file for faster rewrites and recoveries. When this option is turned-# on the rewritten AOF file is composed of two different stanzas:-#-# [RDB file][AOF tail]-#-# When loading Redis recognizes that the AOF file starts with the "REDIS"-# string and loads the prefixed RDB file, and continues loading the AOF-# tail.-#-# This is currently turned off by default in order to avoid the surprise-# of a format change, but will at some point be used as the default.-aof-use-rdb-preamble no--################################ LUA SCRIPTING ###############################--# Max execution time of a Lua script in milliseconds.-#-# If the maximum execution time is reached Redis will log that a script is-# still in execution after the maximum allowed time and will start to-# reply to queries with an error.-#-# When a long running script exceeds the maximum execution time only the-# SCRIPT KILL and SHUTDOWN NOSAVE commands are available. The first can be-# used to stop a script that did not yet called write commands. The second-# is the only way to shut down the server in the case a write command was-# already issued by the script but the user doesn't want to wait for the natural-# termination of the script.-#-# Set it to 0 or a negative value for unlimited execution without warnings.-lua-time-limit 5000--################################ REDIS CLUSTER ###############################-#-# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-# WARNING EXPERIMENTAL: Redis Cluster is considered to be stable code, however-# in order to mark it as "mature" we need to wait for a non trivial percentage-# of users to deploy it in production.-# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-#-# Normal Redis instances can't be part of a Redis Cluster; only nodes that are-# started as cluster nodes can. In order to start a Redis instance as a-# cluster node enable the cluster support uncommenting the following:-#-# cluster-enabled yes--# Every cluster node has a cluster configuration file. This file is not-# intended to be edited by hand. It is created and updated by Redis nodes.-# Every Redis Cluster node requires a different cluster configuration file.-# Make sure that instances running in the same system do not have-# overlapping cluster configuration file names.-#-# cluster-config-file nodes-6379.conf--# Cluster node timeout is the amount of milliseconds a node must be unreachable-# for it to be considered in failure state.-# Most other internal time limits are multiple of the node timeout.-#-# cluster-node-timeout 15000--# A slave of a failing master will avoid to start a failover if its data-# looks too old.-#-# There is no simple way for a slave to actually have an exact measure of-# its "data age", so the following two checks are performed:-#-# 1) If there are multiple slaves able to failover, they exchange messages-# in order to try to give an advantage to the slave with the best-# replication offset (more data from the master processed).-# Slaves will try to get their rank by offset, and apply to the start-# of the failover a delay proportional to their rank.-#-# 2) Every single slave computes the time of the last interaction with-# its master. This can be the last ping or command received (if the master-# is still in the "connected" state), or the time that elapsed since the-# disconnection with the master (if the replication link is currently down).-# If the last interaction is too old, the slave will not try to failover-# at all.-#-# The point "2" can be tuned by user. Specifically a slave will not perform-# the failover if, since the last interaction with the master, the time-# elapsed is greater than:-#-# (node-timeout * slave-validity-factor) + repl-ping-slave-period-#-# So for example if node-timeout is 30 seconds, and the slave-validity-factor-# is 10, and assuming a default repl-ping-slave-period of 10 seconds, the-# slave will not try to failover if it was not able to talk with the master-# for longer than 310 seconds.-#-# A large slave-validity-factor may allow slaves with too old data to failover-# a master, while a too small value may prevent the cluster from being able to-# elect a slave at all.-#-# For maximum availability, it is possible to set the slave-validity-factor-# to a value of 0, which means, that slaves will always try to failover the-# master regardless of the last time they interacted with the master.-# (However they'll always try to apply a delay proportional to their-# offset rank).-#-# Zero is the only value able to guarantee that when all the partitions heal-# the cluster will always be able to continue.-#-# cluster-slave-validity-factor 10--# Cluster slaves are able to migrate to orphaned masters, that are masters-# that are left without working slaves. This improves the cluster ability-# to resist to failures as otherwise an orphaned master can't be failed over-# in case of failure if it has no working slaves.-#-# Slaves migrate to orphaned masters only if there are still at least a-# given number of other working slaves for their old master. This number-# is the "migration barrier". A migration barrier of 1 means that a slave-# will migrate only if there is at least 1 other working slave for its master-# and so forth. It usually reflects the number of slaves you want for every-# master in your cluster.-#-# Default is 1 (slaves migrate only if their masters remain with at least-# one slave). To disable migration just set it to a very large value.-# A value of 0 can be set but is useful only for debugging and dangerous-# in production.-#-# cluster-migration-barrier 1--# By default Redis Cluster nodes stop accepting queries if they detect there-# is at least an hash slot uncovered (no available node is serving it).-# This way if the cluster is partially down (for example a range of hash slots-# are no longer covered) all the cluster becomes, eventually, unavailable.-# It automatically returns available as soon as all the slots are covered again.-#-# However sometimes you want the subset of the cluster which is working,-# to continue to accept queries for the part of the key space that is still-# covered. In order to do so, just set the cluster-require-full-coverage-# option to no.-#-# cluster-require-full-coverage yes--# This option, when set to yes, prevents slaves from trying to failover its-# master during master failures. However the master can still perform a-# manual failover, if forced to do so.-#-# This is useful in different scenarios, especially in the case of multiple-# data center operations, where we want one side to never be promoted if not-# in the case of a total DC failure.-#-# cluster-slave-no-failover no--# In order to setup your cluster make sure to read the documentation-# available at http://redis.io web site.--########################## CLUSTER DOCKER/NAT support ########################--# In certain deployments, Redis Cluster nodes address discovery fails, because-# addresses are NAT-ted or because ports are forwarded (the typical case is-# Docker and other containers).-#-# In order to make Redis Cluster working in such environments, a static-# configuration where each node knows its public address is needed. The-# following two options are used for this scope, and are:-#-# * cluster-announce-ip-# * cluster-announce-port-# * cluster-announce-bus-port-#-# Each instruct the node about its address, client port, and cluster message-# bus port. The information is then published in the header of the bus packets-# so that other nodes will be able to correctly map the address of the node-# publishing the information.-#-# If the above options are not used, the normal Redis Cluster auto-detection-# will be used instead.-#-# Note that when remapped, the bus port may not be at the fixed offset of-# clients port + 10000, so you can specify any port and bus-port depending-# on how they get remapped. If the bus-port is not set, a fixed offset of-# 10000 will be used as usually.-#-# Example:-#-# cluster-announce-ip 10.1.1.5-# cluster-announce-port 6379-# cluster-announce-bus-port 6380--################################## SLOW LOG ###################################--# The Redis Slow Log is a system to log queries that exceeded a specified-# execution time. The execution time does not include the I/O operations-# like talking with the client, sending the reply and so forth,-# but just the time needed to actually execute the command (this is the only-# stage of command execution where the thread is blocked and can not serve-# other requests in the meantime).-#-# You can configure the slow log with two parameters: one tells Redis-# what is the execution time, in microseconds, to exceed in order for the-# command to get logged, and the other parameter is the length of the-# slow log. When a new command is logged the oldest one is removed from the-# queue of logged commands.--# The following time is expressed in microseconds, so 1000000 is equivalent-# to one second. Note that a negative number disables the slow log, while-# a value of zero forces the logging of every command.-slowlog-log-slower-than 10000--# There is no limit to this length. Just be aware that it will consume memory.-# You can reclaim memory used by the slow log with SLOWLOG RESET.-slowlog-max-len 128--################################ LATENCY MONITOR ##############################--# The Redis latency monitoring subsystem samples different operations-# at runtime in order to collect data related to possible sources of-# latency of a Redis instance.-#-# Via the LATENCY command this information is available to the user that can-# print graphs and obtain reports.-#-# The system only logs operations that were performed in a time equal or-# greater than the amount of milliseconds specified via the-# latency-monitor-threshold configuration directive. When its value is set-# to zero, the latency monitor is turned off.-#-# By default latency monitoring is disabled since it is mostly not needed-# if you don't have latency issues, and collecting data has a performance-# impact, that while very small, can be measured under big load. Latency-# monitoring can easily be enabled at runtime using the command-# "CONFIG SET latency-monitor-threshold <milliseconds>" if needed.-latency-monitor-threshold 0--############################# EVENT NOTIFICATION ##############################--# Redis can notify Pub/Sub clients about events happening in the key space.-# This feature is documented at http://redis.io/topics/notifications-#-# For instance if keyspace events notification is enabled, and a client-# performs a DEL operation on key "foo" stored in the Database 0, two-# messages will be published via Pub/Sub:-#-# PUBLISH __keyspace@0__:foo del-# PUBLISH __keyevent@0__:del foo-#-# It is possible to select the events that Redis will notify among a set-# of classes. Every class is identified by a single character:-#-# K Keyspace events, published with __keyspace@<db>__ prefix.-# E Keyevent events, published with __keyevent@<db>__ prefix.-# g Generic commands (non-type specific) like DEL, EXPIRE, RENAME, ...-# $ String commands-# l List commands-# s Set commands-# h Hash commands-# z Sorted set commands-# x Expired events (events generated every time a key expires)-# e Evicted events (events generated when a key is evicted for maxmemory)-# A Alias for g$lshzxe, so that the "AKE" string means all the events.-#-# The "notify-keyspace-events" takes as argument a string that is composed-# of zero or multiple characters. The empty string means that notifications-# are disabled.-#-# Example: to enable list and generic events, from the point of view of the-# event name, use:-#-# notify-keyspace-events Elg-#-# Example 2: to get the stream of the expired keys subscribing to channel-# name __keyevent@0__:expired use:-#-# notify-keyspace-events Ex-#-# By default all notifications are disabled because most users don't need-# this feature and the feature has some overhead. Note that if you don't-# specify at least one of K or E, no events will be delivered.-notify-keyspace-events ""--############################### ADVANCED CONFIG ###############################--# Hashes are encoded using a memory efficient data structure when they have a-# small number of entries, and the biggest entry does not exceed a given-# threshold. These thresholds can be configured using the following directives.-hash-max-ziplist-entries 512-hash-max-ziplist-value 64--# Lists are also encoded in a special way to save a lot of space.-# The number of entries allowed per internal list node can be specified-# as a fixed maximum size or a maximum number of elements.-# For a fixed maximum size, use -5 through -1, meaning:-# -5: max size: 64 Kb <-- not recommended for normal workloads-# -4: max size: 32 Kb <-- not recommended-# -3: max size: 16 Kb <-- probably not recommended-# -2: max size: 8 Kb <-- good-# -1: max size: 4 Kb <-- good-# Positive numbers mean store up to _exactly_ that number of elements-# per list node.-# The highest performing option is usually -2 (8 Kb size) or -1 (4 Kb size),-# but if your use case is unique, adjust the settings as necessary.-list-max-ziplist-size -2--# Lists may also be compressed.-# Compress depth is the number of quicklist ziplist nodes from *each* side of-# the list to *exclude* from compression. The head and tail of the list-# are always uncompressed for fast push/pop operations. Settings are:-# 0: disable all list compression-# 1: depth 1 means "don't start compressing until after 1 node into the list,-# going from either the head or tail"-# So: [head]->node->node->...->node->[tail]-# [head], [tail] will always be uncompressed; inner nodes will compress.-# 2: [head]->[next]->node->node->...->node->[prev]->[tail]-# 2 here means: don't compress head or head->next or tail->prev or tail,-# but compress all nodes between them.-# 3: [head]->[next]->[next]->node->node->...->node->[prev]->[prev]->[tail]-# etc.-list-compress-depth 0--# Sets have a special encoding in just one case: when a set is composed-# of just strings that happen to be integers in radix 10 in the range-# of 64 bit signed integers.-# The following configuration setting sets the limit in the size of the-# set in order to use this special memory saving encoding.-set-max-intset-entries 512--# Similarly to hashes and lists, sorted sets are also specially encoded in-# order to save a lot of space. This encoding is only used when the length and-# elements of a sorted set are below the following limits:-zset-max-ziplist-entries 128-zset-max-ziplist-value 64--# HyperLogLog sparse representation bytes limit. The limit includes the-# 16 bytes header. When an HyperLogLog using the sparse representation crosses-# this limit, it is converted into the dense representation.-#-# A value greater than 16000 is totally useless, since at that point the-# dense representation is more memory efficient.-#-# The suggested value is ~ 3000 in order to have the benefits of-# the space efficient encoding without slowing down too much PFADD,-# which is O(N) with the sparse encoding. The value can be raised to-# ~ 10000 when CPU is not a concern, but space is, and the data set is-# composed of many HyperLogLogs with cardinality in the 0 - 15000 range.-hll-sparse-max-bytes 3000--# Active rehashing uses 1 millisecond every 100 milliseconds of CPU time in-# order to help rehashing the main Redis hash table (the one mapping top-level-# keys to values). The hash table implementation Redis uses (see dict.c)-# performs a lazy rehashing: the more operation you run into a hash table-# that is rehashing, the more rehashing "steps" are performed, so if the-# server is idle the rehashing is never complete and some more memory is used-# by the hash table.-#-# The default is to use this millisecond 10 times every second in order to-# actively rehash the main dictionaries, freeing memory when possible.-#-# If unsure:-# use "activerehashing no" if you have hard latency requirements and it is-# not a good thing in your environment that Redis can reply from time to time-# to queries with 2 milliseconds delay.-#-# use "activerehashing yes" if you don't have such hard requirements but-# want to free memory asap when possible.-activerehashing yes--# The client output buffer limits can be used to force disconnection of clients-# that are not reading data from the server fast enough for some reason (a-# common reason is that a Pub/Sub client can't consume messages as fast as the-# publisher can produce them).-#-# The limit can be set differently for the three different classes of clients:-#-# normal -> normal clients including MONITOR clients-# slave -> slave clients-# pubsub -> clients subscribed to at least one pubsub channel or pattern-#-# The syntax of every client-output-buffer-limit directive is the following:-#-# client-output-buffer-limit <class> <hard limit> <soft limit> <soft seconds>-#-# A client is immediately disconnected once the hard limit is reached, or if-# the soft limit is reached and remains reached for the specified number of-# seconds (continuously).-# So for instance if the hard limit is 32 megabytes and the soft limit is-# 16 megabytes / 10 seconds, the client will get disconnected immediately-# if the size of the output buffers reach 32 megabytes, but will also get-# disconnected if the client reaches 16 megabytes and continuously overcomes-# the limit for 10 seconds.-#-# By default normal clients are not limited because they don't receive data-# without asking (in a push way), but just after a request, so only-# asynchronous clients may create a scenario where data is requested faster-# than it can read.-#-# Instead there is a default limit for pubsub and slave clients, since-# subscribers and slaves receive data in a push fashion.-#-# Both the hard or the soft limit can be disabled by setting them to zero.-client-output-buffer-limit normal 0 0 0-client-output-buffer-limit slave 256mb 64mb 60-client-output-buffer-limit pubsub 32mb 8mb 60--# Client query buffers accumulate new commands. They are limited to a fixed-# amount by default in order to avoid that a protocol desynchronization (for-# instance due to a bug in the client) will lead to unbound memory usage in-# the query buffer. However you can configure it here if you have very special-# needs, such us huge multi/exec requests or alike.-#-# client-query-buffer-limit 1gb--# In the Redis protocol, bulk requests, that are, elements representing single-# strings, are normally limited ot 512 mb. However you can change this limit-# here.-#-# proto-max-bulk-len 512mb--# Redis calls an internal function to perform many background tasks, like-# closing connections of clients in timeout, purging expired keys that are-# never requested, and so forth.-#-# Not all tasks are performed with the same frequency, but Redis checks for-# tasks to perform according to the specified "hz" value.-#-# By default "hz" is set to 10. Raising the value will use more CPU when-# Redis is idle, but at the same time will make Redis more responsive when-# there are many keys expiring at the same time, and timeouts may be-# handled with more precision.-#-# The range is between 1 and 500, however a value over 100 is usually not-# a good idea. Most users should use the default of 10 and raise this up to-# 100 only in environments where very low latency is required.-hz 10--# When a child rewrites the AOF file, if the following option is enabled-# the file will be fsync-ed every 32 MB of data generated. This is useful-# in order to commit the file to the disk more incrementally and avoid-# big latency spikes.-aof-rewrite-incremental-fsync yes--# Redis LFU eviction (see maxmemory setting) can be tuned. However it is a good-# idea to start with the default settings and only change them after investigating-# how to improve the performances and how the keys LFU change over time, which-# is possible to inspect via the OBJECT FREQ command.-#-# There are two tunable parameters in the Redis LFU implementation: the-# counter logarithm factor and the counter decay time. It is important to-# understand what the two parameters mean before changing them.-#-# The LFU counter is just 8 bits per key, it's maximum value is 255, so Redis-# uses a probabilistic increment with logarithmic behavior. Given the value-# of the old counter, when a key is accessed, the counter is incremented in-# this way:-#-# 1. A random number R between 0 and 1 is extracted.-# 2. A probability P is calculated as 1/(old_value*lfu_log_factor+1).-# 3. The counter is incremented only if R < P.-#-# The default lfu-log-factor is 10. This is a table of how the frequency-# counter changes with a different number of accesses with different-# logarithmic factors:-#-# +--------+------------+------------+------------+------------+------------+-# | factor | 100 hits | 1000 hits | 100K hits | 1M hits | 10M hits |-# +--------+------------+------------+------------+------------+------------+-# | 0 | 104 | 255 | 255 | 255 | 255 |-# +--------+------------+------------+------------+------------+------------+-# | 1 | 18 | 49 | 255 | 255 | 255 |-# +--------+------------+------------+------------+------------+------------+-# | 10 | 10 | 18 | 142 | 255 | 255 |-# +--------+------------+------------+------------+------------+------------+-# | 100 | 8 | 11 | 49 | 143 | 255 |-# +--------+------------+------------+------------+------------+------------+-#-# NOTE: The above table was obtained by running the following commands:-#-# redis-benchmark -n 1000000 incr foo-# redis-cli object freq foo-#-# NOTE 2: The counter initial value is 5 in order to give new objects a chance-# to accumulate hits.-#-# The counter decay time is the time, in minutes, that must elapse in order-# for the key counter to be divided by two (or decremented if it has a value-# less <= 10).-#-# The default value for the lfu-decay-time is 1. A Special value of 0 means to-# decay the counter every time it happens to be scanned.-#-# lfu-log-factor 10-# lfu-decay-time 1--########################### ACTIVE DEFRAGMENTATION #######################-#-# WARNING THIS FEATURE IS EXPERIMENTAL. However it was stress tested-# even in production and manually tested by multiple engineers for some-# time.-#-# What is active defragmentation?-# --------------------------------#-# Active (online) defragmentation allows a Redis server to compact the-# spaces left between small allocations and deallocations of data in memory,-# thus allowing to reclaim back memory.-#-# Fragmentation is a natural process that happens with every allocator (but-# less so with Jemalloc, fortunately) and certain workloads. Normally a server-# restart is needed in order to lower the fragmentation, or at least to flush-# away all the data and create it again. However thanks to this feature-# implemented by Oran Agra for Redis 4.0 this process can happen at runtime-# in an "hot" way, while the server is running.-#-# Basically when the fragmentation is over a certain level (see the-# configuration options below) Redis will start to create new copies of the-# values in contiguous memory regions by exploiting certain specific Jemalloc-# features (in order to understand if an allocation is causing fragmentation-# and to allocate it in a better place), and at the same time, will release the-# old copies of the data. This process, repeated incrementally for all the keys-# will cause the fragmentation to drop back to normal values.-#-# Important things to understand:-#-# 1. This feature is disabled by default, and only works if you compiled Redis-# to use the copy of Jemalloc we ship with the source code of Redis.-# This is the default with Linux builds.-#-# 2. You never need to enable this feature if you don't have fragmentation-# issues.-#-# 3. Once you experience fragmentation, you can enable this feature when-# needed with the command "CONFIG SET activedefrag yes".-#-# The configuration parameters are able to fine tune the behavior of the-# defragmentation process. If you are not sure about what they mean it is-# a good idea to leave the defaults untouched.--# Enabled active defragmentation-# activedefrag yes--# Minimum amount of fragmentation waste to start active defrag-# active-defrag-ignore-bytes 100mb--# Minimum percentage of fragmentation to start active defrag-# active-defrag-threshold-lower 10--# Maximum percentage of fragmentation at which we use maximum effort-# active-defrag-threshold-upper 100--# Minimal effort for defrag in CPU percentage-# active-defrag-cycle-min 25--# Maximal effort for defrag in CPU percentage-# active-defrag-cycle-max 75\ No newline at end of filediff --git a/docker/supervisord.conf b/docker/supervisord.confdeleted file mode 100644index 8bec40164..000000000--- a/docker/supervisord.conf+++ /dev/null@@ -1,34 +0,0 @@-[supervisord]-nodaemon=true-user=root-logfile=/dev/null-logfile_maxbytes=0--[include]-files = /etc/supervisor/conf.d/*.conf--[program:web]-directory=/app/apps/dashboard-command=pnpm start-autostart=true-autorestart=true-stdout_logfile=/dev/fd/1-stdout_logfile_maxbytes=0-redirect_stderr=true--[program:worker]-directory=/app/apps/worker-command=pnpm start-autostart=true-autorestart=true-stdout_logfile=/dev/fd/1-stdout_logfile_maxbytes=0-redirect_stderr=true--[program:redis]-command=redis-server /etc/redis/redis.conf-autostart=true-autorestart=true-user=root-stdout_logfile=/var/log/redis/stdout.log-stderr_logfile=/var/log/redis/stderr.log\ No newline at end of filediff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex 1f4feb2f5..63822359f 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -417,7 +417,7 @@ importers:version: 3.2.5prettier-plugin-tailwindcss:specifier: ^0.5.11- version: 0.5.11([email protected])+ version: 0.5.11(@ianvs/[email protected])([email protected])tailwindcss:specifier: ^3.4.1version: 3.4.1@@ -620,7 +620,7 @@ importers:version: 3.2.5prettier-plugin-tailwindcss:specifier: ^0.5.1- version: 0.5.11([email protected])+ version: 0.5.11(@ianvs/[email protected])([email protected])tailwindcss:specifier: ^3.3.3version: 3.4.1@@ -687,7 +687,7 @@ importers:version: 3.2.5prettier-plugin-tailwindcss:specifier: ^0.5.1- version: 0.5.11([email protected])+ version: 0.5.11(@ianvs/[email protected])([email protected])tailwindcss:specifier: ^3.3.3version: 3.4.1@@ -1160,6 +1160,9 @@ importers:'@ianvs/prettier-plugin-sort-imports':specifier: ^4.1.0version: 4.1.1([email protected])+ prettier-plugin-tailwindcss:+ specifier: ^0.5.11+ version: 0.5.11(@ianvs/[email protected])([email protected])devDependencies:'@openpanel/tsconfig':specifier: workspace:*@@ -1233,7 +1236,6 @@ packages:dependencies:'@jridgewell/gen-mapping': 0.3.3'@jridgewell/trace-mapping': 0.3.22- dev: false/@babel/[email protected]:resolution: {integrity: sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==}@@ -1247,12 +1249,10 @@ packages:dependencies:'@babel/highlight': 7.23.4chalk: 2.4.2- dev: false/@babel/[email protected]:resolution: {integrity: sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==}engines: {node: '>=6.9.0'}- dev: false/@babel/[email protected]:resolution: {integrity: sha512-5q0175NOjddqpvvzU+kDiSOAk4PfdO6FvwCWoQ6RO7rTzEe8vlo+4HVfcnAREhD4npMs0e9uZypjTwzZPCf/cw==}@@ -1275,7 +1275,6 @@ packages:semver: 6.3.1transitivePeerDependencies:- supports-color- dev: false/@babel/[email protected]:resolution: {integrity: sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==}@@ -1285,7 +1284,6 @@ packages:'@jridgewell/gen-mapping': 0.3.3'@jridgewell/trace-mapping': 0.3.22jsesc: 2.5.2- dev: false/@babel/[email protected]:resolution: {integrity: sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==}@@ -1310,7 +1308,6 @@ packages:browserslist: 4.23.0lru-cache: 5.1.1semver: 6.3.1- dev: false/@babel/[email protected](@babel/[email protected]):resolution: {integrity: sha512-2XpP2XhkXzgxecPNEEK8Vz8Asj9aRxt08oKOqtiZoqV2UGZ5T+EkyP9sXQ9nwMxBIG34a7jmasVqoMop7VdPUw==}@@ -1360,7 +1357,6 @@ packages:/@babel/[email protected]:resolution: {integrity: sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==}engines: {node: '>=6.9.0'}- dev: false/@babel/[email protected]:resolution: {integrity: sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==}@@ -1368,14 +1364,12 @@ packages:dependencies:'@babel/template': 7.23.9'@babel/types': 7.23.9- dev: false/@babel/[email protected]:resolution: {integrity: sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==}engines: {node: '>=6.9.0'}dependencies:'@babel/types': 7.23.9- dev: false/@babel/[email protected]:resolution: {integrity: sha512-6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA==}@@ -1389,7 +1383,6 @@ packages:engines: {node: '>=6.9.0'}dependencies:'@babel/types': 7.23.9- dev: false/@babel/[email protected](@babel/[email protected]):resolution: {integrity: sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==}@@ -1403,7 +1396,6 @@ packages:'@babel/helper-simple-access': 7.22.5'@babel/helper-split-export-declaration': 7.22.6'@babel/helper-validator-identifier': 7.22.20- dev: false/@babel/[email protected]:resolution: {integrity: sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==}@@ -1446,7 +1438,6 @@ packages:engines: {node: '>=6.9.0'}dependencies:'@babel/types': 7.23.9- dev: false/@babel/[email protected]:resolution: {integrity: sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==}@@ -1460,22 +1451,18 @@ packages:engines: {node: '>=6.9.0'}dependencies:'@babel/types': 7.23.9- dev: false/@babel/[email protected]:resolution: {integrity: sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==}engines: {node: '>=6.9.0'}- dev: false/@babel/[email protected]:resolution: {integrity: sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==}engines: {node: '>=6.9.0'}- dev: false/@babel/[email protected]:resolution: {integrity: sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==}engines: {node: '>=6.9.0'}- dev: false/@babel/[email protected]:resolution: {integrity: sha512-pms/UwkOpnQe/PDAEdV/d7dVCoBbB+R4FvYoHGZz+4VPcg7RtYy2KP7S2lbuWM6FCSgob5wshfGESbC/hzNXZw==}@@ -1495,7 +1482,6 @@ packages:'@babel/types': 7.23.9transitivePeerDependencies:- supports-color- dev: false/@babel/[email protected]:resolution: {integrity: sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==}@@ -1504,7 +1490,6 @@ packages:'@babel/helper-validator-identifier': 7.22.20chalk: 2.4.2js-tokens: 4.0.0- dev: false/@babel/[email protected]:resolution: {integrity: sha512-9tcKgqKbs3xGJ+NtKF2ndOBBLVwPjl1SHxPQkd36r3Dlirw3xWUeGaTbqr7uGZcTaxkVNwc+03SVP7aCdWrTlA==}@@ -1512,7 +1497,6 @@ packages:hasBin: truedependencies:'@babel/types': 7.23.9- dev: false/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.23.3(@babel/[email protected]):resolution: {integrity: sha512-iRkKcCqb7iGnq9+3G6rZ+Ciz5VywC4XNRHe57lKM+jOeYAoR0lVqdeeDRfh0tQcTfw/+vBhHn926FmQhLtlFLQ==}@@ -2701,7 +2685,6 @@ packages:'@babel/code-frame': 7.23.5'@babel/parser': 7.23.9'@babel/types': 7.23.9- dev: false/@babel/[email protected]:resolution: {integrity: sha512-I/4UJ9vs90OkBtY6iiiTORVMyIhJ4kAVmsKo9KFc8UOxMeUfi2hvtIBsET5u9GizXE6/GFSuKCTNfgCswuEjRg==}@@ -2719,7 +2702,6 @@ packages:globals: 11.12.0transitivePeerDependencies:- supports-color- dev: false/@babel/[email protected]:resolution: {integrity: sha512-dQjSq/7HaSjRM43FFGnv5keM2HsxpmyV1PfaSVm0nzzjwwTmjOe6J4bC8e3+pTEIgHaHj+1ZlLThRJ2auc/w1Q==}@@ -2728,7 +2710,6 @@ packages:'@babel/helper-string-parser': 7.23.4'@babel/helper-validator-identifier': 7.22.20to-fast-properties: 2.0.0- dev: false/@braintree/[email protected]:resolution: {integrity: sha512-s3jaWicZd0pkP0jf5ysyHUI/RE7MHos6qlToFcGWXVp+ykHOy77OUMrfbgJ9it2C5bow7OIQwYYaHjk9XlBQ2A==}@@ -3707,7 +3688,6 @@ packages:semver: 7.6.0transitivePeerDependencies:- supports-color- dev: false/@img/[email protected]:resolution: {integrity: sha512-itHBs1rPmsmGF9p4qRe++CzCgd+kFYktnsoR1sbIAfsRMrJZau0Tt1AH9KVnufc2/tU02Gf6Ibujx+15qRE03w==}@@ -7447,7 +7427,6 @@ packages:engines: {node: '>=4'}dependencies:color-convert: 1.9.3- dev: falseresolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==}@@ -8183,7 +8162,6 @@ packages:ansi-styles: 3.2.1escape-string-regexp: 1.0.5supports-color: 5.5.0- dev: falseresolution: {integrity: sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==}@@ -8420,7 +8398,6 @@ packages:resolution: {integrity: sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==}dependencies:color-name: 1.1.3- dev: falseresolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==}@@ -8430,7 +8407,6 @@ packages:resolution: {integrity: sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==}- dev: falseresolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==}@@ -8583,7 +8559,6 @@ packages:resolution: {integrity: sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==}- dev: falseresolution: {integrity: sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==}@@ -9622,7 +9597,6 @@ packages:resolution: {integrity: sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==}engines: {node: '>=0.8.0'}- dev: falseresolution: {integrity: sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==}@@ -10662,7 +10636,6 @@ packages:resolution: {integrity: sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==}engines: {node: '>=6.9.0'}- dev: falseresolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==}@@ -10817,7 +10790,6 @@ packages:resolution: {integrity: sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==}engines: {node: '>=4'}- dev: falseresolution: {integrity: sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==}@@ -10901,7 +10873,6 @@ packages:resolution: {integrity: sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==}engines: {node: '>=4'}- dev: falseresolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==}@@ -11843,7 +11814,6 @@ packages:resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}- dev: falseresolution: {integrity: sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==}@@ -11913,7 +11883,6 @@ packages:resolution: {integrity: sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==}engines: {node: '>=4'}hasBin: true- dev: falseresolution: {integrity: sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==}@@ -11963,7 +11932,6 @@ packages:resolution: {integrity: sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==}engines: {node: '>=6'}hasBin: true- dev: falseresolution: {integrity: sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==}@@ -12338,7 +12306,6 @@ packages:resolution: {integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==}dependencies:yallist: 3.1.1- dev: falseresolution: {integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==}@@ -14509,7 +14476,7 @@ packages:resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}engines: {node: '>= 0.8.0'}resolution: {integrity: sha512-AvI/DNyMctyyxGOjyePgi/gqj5hJYClZ1avtQvLlqMT3uDZkRbi4HhGUpok3DRzv9z7Lti85Kdj3s3/1CeNI0w==}engines: {node: '>=14.21.3'}peerDependencies:@@ -14558,8 +14525,8 @@ packages:prettier-plugin-twig-melody:optional: truedependencies:+ '@ianvs/prettier-plugin-sort-imports': 4.1.1([email protected])prettier: 3.2.5- dev: trueresolution: {integrity: sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==}@@ -15737,7 +15704,6 @@ packages:resolution: {integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==}hasBin: true- dev: falseresolution: {integrity: sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==}@@ -16346,7 +16312,6 @@ packages:engines: {node: '>=4'}dependencies:has-flag: 3.0.0- dev: falseresolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==}@@ -16573,7 +16538,6 @@ packages:resolution: {integrity: sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==}engines: {node: '>=4'}- dev: falseresolution: {integrity: sha512-Z3g735FxuZY8rodxV4gH7LxClE4H0hTIyHNIHdk+vpQxjLm0cwnKXq/OFVZ76SOQmto7txVcwSCwkU5kqp+FKg==}@@ -17538,7 +17502,6 @@ packages:resolution: {integrity: sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==}- dev: falseresolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==}diff --git a/tooling/prettier/index.mjs b/tooling/prettier/index.mjsindex bb2243ac8..c0fb43b81 100644--- a/tooling/prettier/index.mjs+++ b/tooling/prettier/index.mjs@@ -1,9 +1,19 @@-/** @typedef {import("prettier").Config} PrettierConfig */-/** @typedef {import("@ianvs/prettier-plugin-sort-imports").PluginConfig} SortImportsConfig */+import { fileURLToPath } from 'url';-/** @type { PrettierConfig | SortImportsConfig } */+/** @typedef {import("prettier").Config} PrettierConfig */+/** @typedef {import("prettier-plugin-tailwindcss").PluginOptions} TailwindConfig */+/** @typedef {import("@ianvs/prettier-plugin-sort-imports").PluginConfig} SortImportsConfig */++/** @type { PrettierConfig | SortImportsConfig | TailwindConfig } */const config = {- plugins: ['@ianvs/prettier-plugin-sort-imports'],+ plugins: [+ '@ianvs/prettier-plugin-sort-imports',+ 'prettier-plugin-tailwindcss',+ ],+ tailwindConfig: fileURLToPath(+ new URL('../../apps/dashboard/tailwind.config.js', import.meta.url)+ ),+ tailwindFunctions: ['cn', 'cva'],importOrder: ['^(react/(.*)$)|^(react$)|^(react-native(.*)$)','<THIRD_PARTY_MODULES>',diff --git a/tooling/prettier/package.json b/tooling/prettier/package.jsonindex def347a7d..c96988f94 100644--- a/tooling/prettier/package.json+++ b/tooling/prettier/package.json@@ -3,11 +3,13 @@"version": "0.1.0","private": true,"main": "index.mjs",+ "type": "module","scripts": {"clean": "rm -rf .turbo node_modules"},"dependencies": {- "@ianvs/prettier-plugin-sort-imports": "^4.1.0"+ "@ianvs/prettier-plugin-sort-imports": "^4.1.0",+ "prettier-plugin-tailwindcss": "^0.5.11"},"devDependencies": {"@openpanel/tsconfig": "workspace:*",diff --git a/tooling/prettier/tsconfig.json b/tooling/prettier/tsconfig.jsonindex fb0dc1a37..1ac3efcc5 100644--- a/tooling/prettier/tsconfig.json+++ b/tooling/prettier/tsconfig.json@@ -1,6 +1,7 @@{"extends": "@openpanel/tsconfig/base.json","compilerOptions": {+ "checkJs": false,"tsBuildInfoFile": "node_modules/.cache/tsbuildinfo.json"},"include": ["."],