Skip to content

OpenPanel is an open-source web and product analytics platform, an open-source alternative to Mixpanel with optional self-hosting.

🧹 clean up duty 🧹

Carl-Gerhard Lindesvärd444e553b74eb
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 1e76b8a05..d9aacae88 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -4,7 +4,6 @@
},
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true,
- "eslint.rules.customizations": [{ "rule": "*", "severity": "warn" }],
"eslint.workingDirectories": [
{ "pattern": "apps/*/" },
{ "pattern": "packages/*/" },
diff --git a/README.md b/README.md
index d32ca5adc..d922995f3 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# openpanel
+# Openpanel
Openpanel is a simple analytics tool for logging events on web and react-native. My goal is to make a minimal mixpanel copy with the most basic features (for now).
diff --git a/apps/api/scripts/test-events.ts b/apps/api/scripts/test-events.ts
deleted file mode 100644
index fe456aafa..000000000
--- a/apps/api/scripts/test-events.ts
+++ /dev/null
@@ -1,224 +0,0 @@
-import { omit, prop, uniqBy } from 'ramda';
-
-import { generateProfileId, getTime, toISOString } from '@openpanel/common';
-import type { Event, IServiceCreateEventPayload } from '@openpanel/db';
-import {
- createEvent as createClickhouseEvent,
- db,
- formatClickhouseDate,
- getSalts,
-} from '@openpanel/db';
-
-import { parseIp } from '../src/utils/parseIp';
-import { parseUserAgent } from '../src/utils/parseUserAgent';
-
-const clean = omit([
- 'ip',
- 'os',
- 'ua',
- 'url',
- 'hash',
- 'host',
- 'path',
- 'device',
- 'screen',
- 'hostname',
- 'language',
- 'referrer',
- 'timezone',
-]);
-async function main() {
- const events = await db.event.findMany({
- where: {
- project_id: '4e2798cb-e255-4e9d-960d-c9ad095aabd7',
- name: 'screen_view',
- createdAt: {
- gte: new Date('2024-01-01'),
- lt: new Date('2024-02-04'),
- },
- },
- orderBy: {
- createdAt: 'asc',
- },
- });
-
- const grouped: Record<string, Event[]> = {};
- let index = 0;
- for (const event of events.slice()) {
- // console.log(index, event.name, event.createdAt.toISOString());
- index++;
-
- const properties = event.properties as Record<string, any>;
-
- if (properties.ua?.includes('bot')) {
- // console.log('IGNORE', event.id);
- continue;
- }
-
- if (!event.profile_id) {
- // console.log('IGNORE', event.id);
- continue;
- }
- const hej = grouped[event.profile_id];
- if (hej) {
- hej.push(event);
- } else {
- grouped[event.profile_id] = [event];
- }
- }
-
- console.log('Total users', Object.keys(grouped).length);
-
- let uidx = -1;
- for (const profile_id of Object.keys(grouped)) {
- uidx++;
- console.log(`User index ${uidx}`);
-
- const events = uniqBy(prop('createdAt'), grouped[profile_id] || []);
-
- if (events) {
- let lastSessionStart = null;
- let screenViews = 0;
- let totalDuration = 0;
- console.log('new user...');
- let eidx = -1;
- for (const event of events) {
- eidx++;
- const prevEvent = events[eidx - 1];
- const prevEventAt = prevEvent?.createdAt;
-
- const nextEvent = events[eidx + 1];
-
- const properties = event.properties as Record<string, any>;
- const projectId = event.project_id;
- const path = properties.path!;
- const ip = properties.ip!;
- const origin = 'https://openpanel.kiddo.se';
- const ua = properties.ua!;
- const uaInfo = parseUserAgent(ua);
- const salts = await getSalts();
- const profileId = generateProfileId({
- salt: salts.current,
- origin,
- ip,
- ua,
- });
-
- const geo = parseIp(ip);
-
- const isNextEventNewSession =
- nextEvent &&
- nextEvent.createdAt.getTime() - event.createdAt.getTime() >
- 1000 * 60 * 30;
-
- const payload: IServiceCreateEventPayload = {
- name: event.name,
- profileId,
- projectId,
- properties: clean(properties),
- createdAt: event.createdAt.toISOString(),
- country: geo.country,
- city: geo.city,
- region: geo.region,
- continent: geo.continent,
- os: uaInfo.os,
- osVersion: uaInfo.osVersion,
- browser: uaInfo.browser,
- browserVersion: uaInfo.browserVersion,
- device: uaInfo.device,
- brand: uaInfo.brand,
- model: uaInfo.model,
- duration:
- nextEvent && !isNextEventNewSession
- ? nextEvent.createdAt.getTime() - event.createdAt.getTime()
- : 0,
- path,
- referrer: properties?.referrer?.host ?? '', // TODO
- referrerName: properties?.referrer?.host ?? '', // TODO
- };
-
- if (!prevEventAt) {
- lastSessionStart = await createSessionStart(payload);
- } else if (
- event.createdAt.getTime() - prevEventAt.getTime() >
- 1000 * 60 * 30
- ) {
- if (eidx > 0 && prevEventAt && lastSessionStart) {
- await createSessionEnd(prevEventAt, lastSessionStart, {
- screenViews,
- totalDuration,
- });
- totalDuration = 0;
- screenViews = 0;
- lastSessionStart = await createSessionStart(payload);
- }
- }
-
- screenViews++;
- totalDuration += payload.duration;
- await createEvent(payload);
- } // for each user event
-
- const prevEventAt = events[events.length - 1]?.createdAt;
- if (prevEventAt && lastSessionStart) {
- await createSessionEnd(prevEventAt, lastSessionStart, {
- screenViews,
- totalDuration,
- });
- }
- }
- }
-}
-
-async function createEvent(event: IServiceCreateEventPayload) {
- console.log(
- `Create ${event.name} - ${event.path} - ${formatClickhouseDate(
- event.createdAt
- )} - ${event.duration / 1000} sec`
- );
- await createClickhouseEvent(event);
-}
-
-async function createSessionStart(event: IServiceCreateEventPayload) {
- const session: IServiceCreateEventPayload = {
- ...event,
- duration: 0,
- name: 'session_start',
- createdAt: toISOString(getTime(event.createdAt) - 100),
- };
-
- await createEvent(session);
- return session;
-}
-
-async function createSessionEnd(
- prevEventAt: Date,
- sessionStart: IServiceCreateEventPayload,
- options: {
- screenViews: number;
- totalDuration: number;
- }
-) {
- const properties: Record<string, unknown> = {};
- if (options.screenViews === 1) {
- properties.__bounce = true;
- } else {
- properties.__bounce = false;
- }
-
- const session: IServiceCreateEventPayload = {
- ...sessionStart,
- properties: {
- ...properties,
- ...sessionStart.properties,
- },
- duration: options.totalDuration,
- name: 'session_end',
- createdAt: toISOString(prevEventAt.getTime() + 10),
- };
-
- await createEvent(session);
- return session;
-}
-
-main();
diff --git a/apps/api/scripts/test-ua.ts b/apps/api/scripts/test-ua.ts
deleted file mode 100644
index 005477998..000000000
--- a/apps/api/scripts/test-ua.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-//@ts-nocheck
-
-async function main() {
- const crypto = require('crypto');
-
- function createHash(data, len) {
- return crypto
- .createHash('shake256', { outputLength: len })
- .update(data)
- .digest('hex');
- }
-
- console.log(createHash('foo', 2));
- // 1af9
- console.log(createHash('foo', 32));
- // 1af97f7818a28edf}
-}
-main();
diff --git a/apps/api/src/controllers/event.controller.ts b/apps/api/src/controllers/event.controller.ts
index 6d50f1288..afefb11ea 100644
--- a/apps/api/src/controllers/event.controller.ts
+++ b/apps/api/src/controllers/event.controller.ts
@@ -18,7 +18,7 @@ import type { PostEventPayload } from '@openpanel/sdk';
const SESSION_TIMEOUT = 1000 * 60 * 30;
const SESSION_END_TIMEOUT = SESSION_TIMEOUT + 1000;
-async function withTiming<T>(name: string, promise: T) {
+async function withTiming<T>(name: string, promise: Promise<T>) {
try {
const start = Date.now();
const res = await promise;
diff --git a/apps/api/tsconfig.json b/apps/api/tsconfig.json
index a291eef2f..754acf08c 100644
--- a/apps/api/tsconfig.json
+++ b/apps/api/tsconfig.json
@@ -8,5 +8,5 @@
"tsBuildInfoFile": "node_modules/.cache/tsbuildinfo.json"
},
"include": ["."],
- "exclude": ["node_modules"]
+ "exclude": ["node_modules", "dist"]
}
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.tsx
index 2b37693dc..0494a50b2 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
@@ -1,11 +1,11 @@
'use client';
-import { api, handleErrorToastOptions } from '@/app/_trpc/client';
import { Card, CardActions, CardActionsItem } from '@/components/card';
import { FullPageEmptyState } from '@/components/full-page-empty-state';
import { Button } from '@/components/ui/button';
import { useAppParams } from '@/hooks/useAppParams';
import { pushModal } from '@/modals';
+import { api, handleErrorToastOptions } from '@/trpc/client';
import { LayoutPanelTopIcon, Pencil, PlusIcon, Trash } from 'lucide-react';
import Link from 'next/link';
import { useRouter } from 'next/navigation';
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.tsx
index b54af6cc7..89299eae6 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
@@ -184,7 +184,7 @@ export function EventDetails({ event, open, setOpen }: Props) {
key={item.name}
name={item.name}
value={item.value}
- onClick={item.onClick}
+ onClick={() => item.onClick?.()}
/>
))}
</div>
@@ -225,7 +225,7 @@ export function EventDetails({ event, open, setOpen }: Props) {
className="w-full"
onClick={() => setIsEditOpen(true)}
>
- Customize "{name}"
+ Customize &quot;{name}&quot;
</Button>
</SheetFooter>
</SheetContent>
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.tsx
index 6b1586493..decbb11bd 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
@@ -1,6 +1,5 @@
import type { Dispatch, SetStateAction } from 'react';
import { useEffect, useState } from 'react';
-import { api } from '@/app/_trpc/client';
import { Button } from '@/components/ui/button';
import { Checkbox } from '@/components/ui/checkbox';
import { Label } from '@/components/ui/label';
@@ -11,6 +10,7 @@ import {
SheetHeader,
SheetTitle,
} from '@/components/ui/sheet';
+import { api } from '@/trpc/client';
import { cn } from '@/utils/cn';
import { useRouter } from 'next/navigation';
import { toast } from 'sonner';
@@ -78,7 +78,7 @@ export function EventEdit({ event, open, setOpen }: Props) {
<Sheet open={open} onOpenChange={setOpen}>
<SheetContent>
<SheetHeader>
- <SheetTitle>Edit "{name}"</SheetTitle>
+ <SheetTitle>Edit &quot;{name}&quot;</SheetTitle>
</SheetHeader>
<div className="my-8 flex flex-col gap-8">
<div>
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.tsx
index efd5c96e0..030045793 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
@@ -1,5 +1,4 @@
import { useEffect, useState } from 'react';
-import { api } from '@/app/_trpc/client';
import { Button } from '@/components/ui/button';
import { Checkbox } from '@/components/ui/checkbox';
import { Label } from '@/components/ui/label';
@@ -12,6 +11,7 @@ import {
SheetTrigger,
} from '@/components/ui/sheet';
import { Tooltip, TooltipContent } from '@/components/ui/tooltip';
+import { api } from '@/trpc/client';
import { cn } from '@/utils/cn';
import { TooltipTrigger } from '@radix-ui/react-tooltip';
import type { VariantProps } from 'class-variance-authority';
diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/layout-organization-selector.tsx b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/layout-organization-selector.tsx
index 692ff0f71..e540c025f 100644
--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/layout-organization-selector.tsx
+++ b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/layout-organization-selector.tsx
@@ -36,7 +36,7 @@ export default function LayoutOrganizationSelector({
.filter((item) => item.slug)
.map((item) => ({
label: item.name,
- value: item.slug!,
+ value: item.slug,
})) ?? []
}
onChange={(value) => {
diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/edit-organization.tsx b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/edit-organization.tsx
index 518be8e56..7a8febbaf 100644
--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/edit-organization.tsx
+++ b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/edit-organization.tsx
@@ -1,9 +1,9 @@
'use client';
-import { api, handleError } from '@/app/_trpc/client';
import { InputWithLabel } from '@/components/forms/input-with-label';
import { Button } from '@/components/ui/button';
import { Widget, WidgetBody, WidgetHead } from '@/components/widget';
+import { api, handleError } from '@/trpc/client';
import { useRouter } from 'next/navigation';
import { useForm } from 'react-hook-form';
import { toast } from 'sonner';
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.tsx
index 701c0f040..6b292339a 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
@@ -1,4 +1,3 @@
-import { api } from '@/app/_trpc/client';
import { InputWithLabel } from '@/components/forms/input-with-label';
import { Button } from '@/components/ui/button';
import { ComboboxAdvanced } from '@/components/ui/combobox-advanced';
@@ -15,6 +14,7 @@ import {
SheetTrigger,
} from '@/components/ui/sheet';
import { useAppParams } from '@/hooks/useAppParams';
+import { api } from '@/trpc/client';
import { zodResolver } from '@hookform/resolvers/zod';
import { PlusIcon, SendIcon } from 'lucide-react';
import { useRouter } from 'next/navigation';
diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/members/members.tsx b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/members/members.tsx
index 4fd1d6b5a..e3c2e49bd 100644
--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/members/members.tsx
+++ b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/organization/members/members.tsx
@@ -1,7 +1,6 @@
'use client';
import { useState } from 'react';
-import { api } from '@/app/_trpc/client';
import { ComboboxAdvanced } from '@/components/ui/combobox-advanced';
import {
Table,
@@ -12,6 +11,7 @@ import {
TableRow,
} from '@/components/ui/table';
import { Widget, WidgetHead } from '@/components/widget';
+import { api } from '@/trpc/client';
import type { IServiceMember, IServiceProject } from '@openpanel/db';
diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/profile/edit-profile.tsx b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/profile/edit-profile.tsx
index 72072a563..5d6af336f 100644
--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/profile/edit-profile.tsx
+++ b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/profile/edit-profile.tsx
@@ -1,9 +1,9 @@
'use client';
-import { api, handleError } from '@/app/_trpc/client';
import { InputWithLabel } from '@/components/forms/input-with-label';
import { Button } from '@/components/ui/button';
import { Widget, WidgetBody, WidgetHead } from '@/components/widget';
+import { api, handleError } from '@/trpc/client';
import { zodResolver } from '@hookform/resolvers/zod';
import { useRouter } from 'next/navigation';
import { useForm } from 'react-hook-form';
diff --git a/apps/dashboard/src/app/(app)/[organizationId]/create-project.tsx b/apps/dashboard/src/app/(app)/[organizationId]/create-project.tsx
index 4990d30ef..df131a3db 100644
--- a/apps/dashboard/src/app/(app)/[organizationId]/create-project.tsx
+++ b/apps/dashboard/src/app/(app)/[organizationId]/create-project.tsx
@@ -5,6 +5,7 @@ import { Button } from '@/components/ui/button';
import { Input } from '@/components/ui/input';
import { Label } from '@/components/ui/label';
import { useAppParams } from '@/hooks/useAppParams';
+import { api, handleError } from '@/trpc/client';
import { zodResolver } from '@hookform/resolvers/zod';
import { SaveIcon } from 'lucide-react';
import { useRouter } from 'next/navigation';
@@ -13,8 +14,6 @@ import { useForm } from 'react-hook-form';
import { toast } from 'sonner';
import { z } from 'zod';
-import { api, handleError } from '../../_trpc/client';
-
const validation = z.object({
name: z.string().min(1),
});
diff --git a/apps/dashboard/src/app/(app)/[organizationId]/page.tsx b/apps/dashboard/src/app/(app)/[organizationId]/page.tsx
index 655fd66b3..deaeb0331 100644
--- a/apps/dashboard/src/app/(app)/[organizationId]/page.tsx
+++ b/apps/dashboard/src/app/(app)/[organizationId]/page.tsx
@@ -5,7 +5,6 @@ import { notFound, redirect } from 'next/navigation';
import {
getCurrentProjects,
getOrganizationBySlug,
- getProjectsByOrganizationSlug,
isWaitlistUserAccepted,
} from '@openpanel/db';
@@ -36,8 +35,8 @@ export default async function Page({ params: { organizationId } }: PageProps) {
<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!
+ We&apos;re still working on Openpanel, but we&apos;re not quite
+ there yet. We&apos;ll let you know when we&apos;re ready to go!
</div>
</div>
</div>
diff --git a/apps/dashboard/src/app/(app)/create-organization.tsx b/apps/dashboard/src/app/(app)/create-organization.tsx
index c2559edf5..9d4d5d594 100644
--- a/apps/dashboard/src/app/(app)/create-organization.tsx
+++ b/apps/dashboard/src/app/(app)/create-organization.tsx
@@ -6,6 +6,7 @@ import { Button, buttonVariants } from '@/components/ui/button';
import { Input } from '@/components/ui/input';
import { Label } from '@/components/ui/label';
import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/components/ui/tabs';
+import { api, handleError } from '@/trpc/client';
import { cn } from '@/utils/cn';
import { zodResolver } from '@hookform/resolvers/zod';
import { SaveIcon, WallpaperIcon } from 'lucide-react';
@@ -14,8 +15,6 @@ import type { SubmitHandler } from 'react-hook-form';
import { useForm } from 'react-hook-form';
import { z } from 'zod';
-import { api, handleError } from '../_trpc/client';
-
const validation = z
.object({
organization: z.string().min(3),
@@ -61,8 +60,8 @@ export function CreateOrganization() {
<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 (if
- you have any)
+ You&apos;re ready to start using our SDK. Save the client ID and
+ secret (if you have any)
</div>
<CreateClientSuccess {...mutation.data.client} />
<div className="mt-4 flex gap-4">
diff --git a/apps/dashboard/src/app/(app)/page.tsx b/apps/dashboard/src/app/(app)/page.tsx
index 46c3948a6..bab924544 100644
--- a/apps/dashboard/src/app/(app)/page.tsx
+++ b/apps/dashboard/src/app/(app)/page.tsx
@@ -18,8 +18,8 @@ export default async function Page() {
<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!
+ We&apos;re still working on Openpanel, but we&apos;re not quite
+ there yet. We&apos;ll let you know when we&apos;re ready to go!
</div>
</div>
</div>
diff --git a/apps/dashboard/src/app/api/clerk/webhook/route.ts b/apps/dashboard/src/app/api/clerk/webhook/route.ts
index 7f4ab6ad3..0aa9adc33 100644
--- a/apps/dashboard/src/app/api/clerk/webhook/route.ts
+++ b/apps/dashboard/src/app/api/clerk/webhook/route.ts
@@ -32,6 +32,6 @@ export async function POST(request: Request) {
return Response.json({ message: 'Webhook received!' });
}
-export async function GET() {
+export function GET() {
return Response.json({ message: 'Hello World!' });
}
diff --git a/apps/dashboard/src/app/api/trpc/[trpc]/route.ts b/apps/dashboard/src/app/api/trpc/[trpc]/route.ts
index ca979c6eb..d6c26d34d 100644
--- a/apps/dashboard/src/app/api/trpc/[trpc]/route.ts
+++ b/apps/dashboard/src/app/api/trpc/[trpc]/route.ts
@@ -1,4 +1,4 @@
-import { appRouter } from '@/server/api/root';
+import { appRouter } from '@/trpc/api/root';
import { getAuth } from '@clerk/nextjs/server';
import { fetchRequestHandler } from '@trpc/server/adapters/fetch';
@@ -7,7 +7,7 @@ const handler = (req: Request) =>
endpoint: '/api/trpc',
req,
router: appRouter,
- async createContext({ req }) {
+ createContext({ req }) {
const session = getAuth(req as any);
return {
session,
diff --git a/apps/dashboard/src/app/global-error.jsx b/apps/dashboard/src/app/global-error.jsx
deleted file mode 100644
index 2e6130a15..000000000
--- a/apps/dashboard/src/app/global-error.jsx
+++ /dev/null
@@ -1,19 +0,0 @@
-"use client";
-
-import * as Sentry from "@sentry/nextjs";
-import Error from "next/error";
-import { useEffect } from "react";
-
-export default function GlobalError({ error }) {
- useEffect(() => {
- Sentry.captureException(error);
- }, [error]);
-
- return (
- <html>
- <body>
- <Error />
- </body>
- </html>
- );
-}
diff --git a/apps/dashboard/src/app/global-error.tsx b/apps/dashboard/src/app/global-error.tsx
new file mode 100644
index 000000000..8aa74d7b2
--- /dev/null
+++ b/apps/dashboard/src/app/global-error.tsx
@@ -0,0 +1,23 @@
+'use client';
+
+import { useEffect } from 'react';
+import * as Sentry from '@sentry/nextjs';
+
+export default function GlobalError({
+ error,
+}: {
+ error: Error & { digest?: string };
+ reset: () => void;
+}) {
+ useEffect(() => {
+ Sentry.captureException(error);
+ }, [error]);
+
+ return (
+ <html lang="en">
+ <body>
+ <h1>Something went wrong</h1>
+ </body>
+ </html>
+ );
+}
diff --git a/apps/dashboard/src/app/providers.tsx b/apps/dashboard/src/app/providers.tsx
index 9c7868afe..0fb0149fd 100644
--- a/apps/dashboard/src/app/providers.tsx
+++ b/apps/dashboard/src/app/providers.tsx
@@ -1,11 +1,11 @@
'use client';
import React, { useRef, useState } from 'react';
-import { api } from '@/app/_trpc/client';
import { TooltipProvider } from '@/components/ui/tooltip';
import { ModalProvider } from '@/modals';
import type { AppStore } from '@/redux';
import makeStore from '@/redux';
+import { api } from '@/trpc/client';
import { ClerkProvider, useAuth } from '@clerk/nextjs';
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
import { httpLink } from '@trpc/client';
diff --git a/apps/dashboard/src/components/clients/client-actions.tsx b/apps/dashboard/src/components/clients/client-actions.tsx
index cf1636859..f4bdc1517 100644
--- a/apps/dashboard/src/components/clients/client-actions.tsx
+++ b/apps/dashboard/src/components/clients/client-actions.tsx
@@ -1,7 +1,7 @@
'use client';
-import { api } from '@/app/_trpc/client';
import { pushModal, showConfirm } from '@/modals';
+import { api } from '@/trpc/client';
import { clipboard } from '@/utils/clipboard';
import { MoreHorizontal } from 'lucide-react';
import { useRouter } from 'next/navigation';
diff --git a/apps/dashboard/src/components/dark-mode-toggle.tsx b/apps/dashboard/src/components/dark-mode-toggle.tsx
index 9368d2296..dff96bc03 100644
--- a/apps/dashboard/src/components/dark-mode-toggle.tsx
+++ b/apps/dashboard/src/components/dark-mode-toggle.tsx
@@ -11,13 +11,17 @@ import {
import { MoonIcon, SunIcon } from 'lucide-react';
import { useTheme } from 'next-themes';
-export default function DarkModeToggle() {
+interface Props {
+ className?: string;
+}
+
+export default function DarkModeToggle({ className }: Props) {
const { setTheme } = useTheme();
return (
<DropdownMenu>
<DropdownMenuTrigger asChild>
- <Button variant="outline" size="icon">
+ <Button variant="outline" size="icon" className={className}>
<SunIcon className="h-[1.2rem] w-[1.2rem] rotate-0 scale-100 transition-all dark:-rotate-90 dark:scale-0" />
<MoonIcon className="absolute h-[1.2rem] w-[1.2rem] rotate-90 scale-0 transition-all dark:rotate-0 dark:scale-100" />
<span className="sr-only">Toggle theme</span>
diff --git a/apps/dashboard/src/components/overview/overview-live-histogram.tsx b/apps/dashboard/src/components/overview/overview-live-histogram.tsx
index e8a005640..d6067c14e 100644
--- a/apps/dashboard/src/components/overview/overview-live-histogram.tsx
+++ b/apps/dashboard/src/components/overview/overview-live-histogram.tsx
@@ -1,7 +1,7 @@
'use client';
import { Fragment } from 'react';
-import { api } from '@/app/_trpc/client';
+import { api } from '@/trpc/client';
import { cn } from '@/utils/cn';
import AnimateHeight from 'react-animate-height';
@@ -118,7 +118,7 @@ export function OverviewLiveHistogram({
</TooltipTrigger>
<TooltipContent side="top">
<div>{minute.count} active users</div>
- <div>@ {new Date(minute.date).toLocaleTimeString()}</div>
+ <div>@ {new Date(minute.date).toLocaleTimeString()}</div>
</TooltipContent>
</Tooltip>
);
diff --git a/apps/dashboard/src/components/overview/overview-share.tsx b/apps/dashboard/src/components/overview/overview-share.tsx
index 1635c5948..251d40cb7 100644
--- a/apps/dashboard/src/components/overview/overview-share.tsx
+++ b/apps/dashboard/src/components/overview/overview-share.tsx
@@ -1,7 +1,7 @@
'use client';
-import { api } from '@/app/_trpc/client';
import { pushModal } from '@/modals';
+import { api } from '@/trpc/client';
import { EyeIcon, Globe2Icon, LockIcon } from 'lucide-react';
import Link from 'next/link';
import { useRouter } from 'next/navigation';
diff --git a/apps/dashboard/src/components/projects/project-actions.tsx b/apps/dashboard/src/components/projects/project-actions.tsx
index 510ad8a11..5c946b36b 100644
--- a/apps/dashboard/src/components/projects/project-actions.tsx
+++ b/apps/dashboard/src/components/projects/project-actions.tsx
@@ -1,7 +1,7 @@
'use client';
-import { api } from '@/app/_trpc/client';
import { pushModal, showConfirm } from '@/modals';
+import { api } from '@/trpc/client';
import { clipboard } from '@/utils/clipboard';
import { MoreHorizontal } from 'lucide-react';
import { useRouter } from 'next/navigation';
diff --git a/apps/dashboard/src/components/report/ReportSaveButton.tsx b/apps/dashboard/src/components/report/ReportSaveButton.tsx
index 9fb874b90..aa5f0f110 100644
--- a/apps/dashboard/src/components/report/ReportSaveButton.tsx
+++ b/apps/dashboard/src/components/report/ReportSaveButton.tsx
@@ -1,10 +1,10 @@
'use client';
-import { api, handleError } from '@/app/_trpc/client';
import { Button } from '@/components/ui/button';
import { useAppParams } from '@/hooks/useAppParams';
import { pushModal } from '@/modals';
import { useDispatch, useSelector } from '@/redux';
+import { api, handleError } from '@/trpc/client';
import { SaveIcon } from 'lucide-react';
import { toast } from 'sonner';
diff --git a/apps/dashboard/src/components/report/chart/Chart.tsx b/apps/dashboard/src/components/report/chart/Chart.tsx
index 220b80d81..cc9fa9697 100644
--- a/apps/dashboard/src/components/report/chart/Chart.tsx
+++ b/apps/dashboard/src/components/report/chart/Chart.tsx
@@ -1,6 +1,6 @@
'use client';
-import { api } from '@/app/_trpc/client';
+import { api } from '@/trpc/client';
import type { IChartInput } from '@openpanel/validation';
diff --git a/apps/dashboard/src/components/report/chart/ChartAnimation.tsx b/apps/dashboard/src/components/report/chart/ChartAnimation.tsx
deleted file mode 100644
index fe1e3e647..000000000
--- a/apps/dashboard/src/components/report/chart/ChartAnimation.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import airplane from '@/lottie/airplane.json';
-import ballon from '@/lottie/ballon.json';
-import noData from '@/lottie/no-data.json';
-import { cn } from '@/utils/cn';
-import type { LottieComponentProps } from 'lottie-react';
-import Lottie from 'lottie-react';
-
-const animations = {
- airplane,
- ballon,
- noData,
-};
-type Animations = keyof typeof animations;
-
-export const ChartAnimation = ({
- name,
- ...props
-}: Omit<LottieComponentProps, 'animationData'> & {
- name: Animations;
-}) => <Lottie animationData={animations[name]} loop={true} {...props} />;
-
-export const ChartAnimationContainer = (
- props: React.ButtonHTMLAttributes<HTMLDivElement>
-) => (
- <div
- {...props}
- className={cn(
- 'rounded-md border border-border bg-background p-8',
- props.className
- )}
- />
-);
diff --git a/apps/dashboard/src/components/report/chart/ChartProvider.tsx b/apps/dashboard/src/components/report/chart/ChartProvider.tsx
index 6cbd98b19..cfe8799d3 100644
--- a/apps/dashboard/src/components/report/chart/ChartProvider.tsx
+++ b/apps/dashboard/src/components/report/chart/ChartProvider.tsx
@@ -9,7 +9,7 @@ import {
useMemo,
useState,
} from 'react';
-import type { IChartSerie } from '@/server/api/routers/chart';
+import type { IChartSerie } from '@/trpc/api/routers/chart';
import type { IChartInput } from '@openpanel/validation';
diff --git a/apps/dashboard/src/components/report/chart/MetricCard.tsx b/apps/dashboard/src/components/report/chart/MetricCard.tsx
index 2d81cabfa..7bccf9f49 100644
--- a/apps/dashboard/src/components/report/chart/MetricCard.tsx
+++ b/apps/dashboard/src/components/report/chart/MetricCard.tsx
@@ -1,8 +1,8 @@
'use client';
-import type { IChartData } from '@/app/_trpc/client';
import { ColorSquare } from '@/components/color-square';
import { fancyMinutes, useNumber } from '@/hooks/useNumerFormatter';
+import type { IChartData } from '@/trpc/client';
import { theme } from '@/utils/theme';
import AutoSizer from 'react-virtualized-auto-sizer';
import { Area, AreaChart } from 'recharts';
diff --git a/apps/dashboard/src/components/report/chart/ReportAreaChart.tsx b/apps/dashboard/src/components/report/chart/ReportAreaChart.tsx
index 1f1e54ece..9e156d85f 100644
--- a/apps/dashboard/src/components/report/chart/ReportAreaChart.tsx
+++ b/apps/dashboard/src/components/report/chart/ReportAreaChart.tsx
@@ -1,9 +1,9 @@
import React from 'react';
-import type { IChartData } from '@/app/_trpc/client';
import { useFormatDateInterval } from '@/hooks/useFormatDateInterval';
import { useNumber } from '@/hooks/useNumerFormatter';
import { useRechartDataModel } from '@/hooks/useRechartDataModel';
import { useVisibleSeries } from '@/hooks/useVisibleSeries';
+import type { IChartData } from '@/trpc/client';
import { getChartColor } from '@/utils/theme';
import {
Area,
diff --git a/apps/dashboard/src/components/report/chart/ReportBarChart.tsx b/apps/dashboard/src/components/report/chart/ReportBarChart.tsx
index e8630faf5..ca51a9002 100644
--- a/apps/dashboard/src/components/report/chart/ReportBarChart.tsx
+++ b/apps/dashboard/src/components/report/chart/ReportBarChart.tsx
@@ -1,9 +1,9 @@
'use client';
import { useMemo } from 'react';
-import type { IChartData } from '@/app/_trpc/client';
import { Progress } from '@/components/ui/progress';
import { useNumber } from '@/hooks/useNumerFormatter';
+import type { IChartData } from '@/trpc/client';
import { cn } from '@/utils/cn';
import { getChartColor } from '@/utils/theme';
diff --git a/apps/dashboard/src/components/report/chart/ReportHistogramChart.tsx b/apps/dashboard/src/components/report/chart/ReportHistogramChart.tsx
index 6a63526d5..ef7c1f418 100644
--- a/apps/dashboard/src/components/report/chart/ReportHistogramChart.tsx
+++ b/apps/dashboard/src/components/report/chart/ReportHistogramChart.tsx
@@ -1,9 +1,9 @@
import React from 'react';
-import type { IChartData } from '@/app/_trpc/client';
import { useFormatDateInterval } from '@/hooks/useFormatDateInterval';
import { useNumber } from '@/hooks/useNumerFormatter';
import { useRechartDataModel } from '@/hooks/useRechartDataModel';
import { useVisibleSeries } from '@/hooks/useVisibleSeries';
+import type { IChartData } from '@/trpc/client';
import { getChartColor, theme } from '@/utils/theme';
import { Bar, BarChart, CartesianGrid, Tooltip, XAxis, YAxis } from 'recharts';
diff --git a/apps/dashboard/src/components/report/chart/ReportLineChart.tsx b/apps/dashboard/src/components/report/chart/ReportLineChart.tsx
index e59034eb6..8d9cdac78 100644
--- a/apps/dashboard/src/components/report/chart/ReportLineChart.tsx
+++ b/apps/dashboard/src/components/report/chart/ReportLineChart.tsx
@@ -1,11 +1,11 @@
'use client';
import React from 'react';
-import type { IChartData } from '@/app/_trpc/client';
import { useFormatDateInterval } from '@/hooks/useFormatDateInterval';
import { useNumber } from '@/hooks/useNumerFormatter';
import { useRechartDataModel } from '@/hooks/useRechartDataModel';
import { useVisibleSeries } from '@/hooks/useVisibleSeries';
+import type { IChartData } from '@/trpc/client';
import { getChartColor } from '@/utils/theme';
import {
CartesianGrid,
diff --git a/apps/dashboard/src/components/report/chart/ReportMapChart.tsx b/apps/dashboard/src/components/report/chart/ReportMapChart.tsx
index 2b83b8757..d14401c02 100644
--- a/apps/dashboard/src/components/report/chart/ReportMapChart.tsx
+++ b/apps/dashboard/src/components/report/chart/ReportMapChart.tsx
@@ -1,6 +1,6 @@
import { useMemo } from 'react';
-import type { IChartData } from '@/app/_trpc/client';
import { useVisibleSeries } from '@/hooks/useVisibleSeries';
+import type { IChartData } from '@/trpc/client';
import { theme } from '@/utils/theme';
import WorldMap from 'react-svg-worldmap';
import AutoSizer from 'react-virtualized-auto-sizer';
diff --git a/apps/dashboard/src/components/report/chart/ReportMetricChart.tsx b/apps/dashboard/src/components/report/chart/ReportMetricChart.tsx
index 500bda10f..2474e3dc6 100644
--- a/apps/dashboard/src/components/report/chart/ReportMetricChart.tsx
+++ b/apps/dashboard/src/components/report/chart/ReportMetricChart.tsx
@@ -1,7 +1,7 @@
'use client';
-import type { IChartData } from '@/app/_trpc/client';
import { useVisibleSeries } from '@/hooks/useVisibleSeries';
+import type { IChartData } from '@/trpc/client';
import { cn } from '@/utils/cn';
import { useChartContext } from './ChartProvider';
diff --git a/apps/dashboard/src/components/report/chart/ReportPieChart.tsx b/apps/dashboard/src/components/report/chart/ReportPieChart.tsx
index c57746f8c..30cb63e81 100644
--- a/apps/dashboard/src/components/report/chart/ReportPieChart.tsx
+++ b/apps/dashboard/src/components/report/chart/ReportPieChart.tsx
@@ -1,6 +1,6 @@
-import type { IChartData } from '@/app/_trpc/client';
import { AutoSizer } from '@/components/react-virtualized-auto-sizer';
import { useVisibleSeries } from '@/hooks/useVisibleSeries';
+import type { IChartData } from '@/trpc/client';
import { cn } from '@/utils/cn';
import { round } from '@/utils/math';
import { getChartColor } from '@/utils/theme';
diff --git a/apps/dashboard/src/components/report/chart/ReportTable.tsx b/apps/dashboard/src/components/report/chart/ReportTable.tsx
index 6bb6575e7..64dca2dde 100644
--- a/apps/dashboard/src/components/report/chart/ReportTable.tsx
+++ b/apps/dashboard/src/components/report/chart/ReportTable.tsx
@@ -1,5 +1,4 @@
import * as React from 'react';
-import type { IChartData } from '@/app/_trpc/client';
import { Pagination, usePagination } from '@/components/pagination';
import { Badge } from '@/components/ui/badge';
import { Checkbox } from '@/components/ui/checkbox';
@@ -20,6 +19,7 @@ import { useFormatDateInterval } from '@/hooks/useFormatDateInterval';
import { useMappings } from '@/hooks/useMappings';
import { useNumber } from '@/hooks/useNumerFormatter';
import { useSelector } from '@/redux';
+import type { IChartData } from '@/trpc/client';
import { getChartColor } from '@/utils/theme';
import { PreviousDiffIndicator } from '../PreviousDiffIndicator';
diff --git a/apps/dashboard/src/components/report/funnel/Funnel.tsx b/apps/dashboard/src/components/report/funnel/Funnel.tsx
index 727cc5b5b..295798ee6 100644
--- a/apps/dashboard/src/components/report/funnel/Funnel.tsx
+++ b/apps/dashboard/src/components/report/funnel/Funnel.tsx
@@ -1,6 +1,5 @@
'use client';
-import type { RouterOutputs } from '@/app/_trpc/client';
import {
Carousel,
CarouselContent,
@@ -8,6 +7,7 @@ import {
CarouselNext,
CarouselPrevious,
} from '@/components/ui/carousel';
+import type { RouterOutputs } from '@/trpc/client';
import { cn } from '@/utils/cn';
import { round } from '@/utils/math';
import { ArrowRight, ArrowRightIcon } from 'lucide-react';
diff --git a/apps/dashboard/src/components/report/funnel/index.tsx b/apps/dashboard/src/components/report/funnel/index.tsx
index 3ce8342cd..0bb4a8a25 100644
--- a/apps/dashboard/src/components/report/funnel/index.tsx
+++ b/apps/dashboard/src/components/report/funnel/index.tsx
@@ -1,7 +1,7 @@
'use client';
-import type { RouterOutputs } from '@/app/_trpc/client';
-import { api } from '@/app/_trpc/client';
+import type { RouterOutputs } from '@/trpc/client';
+import { api } from '@/trpc/client';
import type { IChartInput } from '@openpanel/validation';
diff --git a/apps/dashboard/src/components/report/sidebar/EventPropertiesCombobox.tsx b/apps/dashboard/src/components/report/sidebar/EventPropertiesCombobox.tsx
index 2cc68a524..a021774ad 100644
--- a/apps/dashboard/src/components/report/sidebar/EventPropertiesCombobox.tsx
+++ b/apps/dashboard/src/components/report/sidebar/EventPropertiesCombobox.tsx
@@ -1,7 +1,7 @@
-import { api } from '@/app/_trpc/client';
import { Combobox } from '@/components/ui/combobox';
import { useAppParams } from '@/hooks/useAppParams';
import { useDispatch } from '@/redux';
+import { api } from '@/trpc/client';
import { cn } from '@/utils/cn';
import { DatabaseIcon } from 'lucide-react';
diff --git a/apps/dashboard/src/components/report/sidebar/ReportBreakdowns.tsx b/apps/dashboard/src/components/report/sidebar/ReportBreakdowns.tsx
index 60e49148b..f0541c033 100644
--- a/apps/dashboard/src/components/report/sidebar/ReportBreakdowns.tsx
+++ b/apps/dashboard/src/components/report/sidebar/ReportBreakdowns.tsx
@@ -1,10 +1,10 @@
'use client';
-import { api } from '@/app/_trpc/client';
import { ColorSquare } from '@/components/color-square';
import { Combobox } from '@/components/ui/combobox';
import { useAppParams } from '@/hooks/useAppParams';
import { useDispatch, useSelector } from '@/redux';
+import { api } from '@/trpc/client';
import { SplitIcon } from 'lucide-react';
import type { IChartBreakdown } from '@openpanel/validation';
diff --git a/apps/dashboard/src/components/report/sidebar/filters/FilterItem.tsx b/apps/dashboard/src/components/report/sidebar/filters/FilterItem.tsx
index 816bf370b..f05d2e3da 100644
--- a/apps/dashboard/src/components/report/sidebar/filters/FilterItem.tsx
+++ b/apps/dashboard/src/components/report/sidebar/filters/FilterItem.tsx
@@ -1,4 +1,3 @@
-import { api } from '@/app/_trpc/client';
import { ColorSquare } from '@/components/color-square';
import { Button } from '@/components/ui/button';
import { ComboboxAdvanced } from '@/components/ui/combobox-advanced';
@@ -7,6 +6,7 @@ import { RenderDots } from '@/components/ui/RenderDots';
import { useAppParams } from '@/hooks/useAppParams';
import { useMappings } from '@/hooks/useMappings';
import { useDispatch } from '@/redux';
+import { api } from '@/trpc/client';
import { SlidersHorizontal, Trash } from 'lucide-react';
import { operators } from '@openpanel/constants';
diff --git a/apps/dashboard/src/components/report/sidebar/filters/FiltersCombobox.tsx b/apps/dashboard/src/components/report/sidebar/filters/FiltersCombobox.tsx
index 29bcbb026..6226a5900 100644
--- a/apps/dashboard/src/components/report/sidebar/filters/FiltersCombobox.tsx
+++ b/apps/dashboard/src/components/report/sidebar/filters/FiltersCombobox.tsx
@@ -1,7 +1,7 @@
-import { api } from '@/app/_trpc/client';
import { Combobox } from '@/components/ui/combobox';
import { useAppParams } from '@/hooks/useAppParams';
import { useDispatch } from '@/redux';
+import { api } from '@/trpc/client';
import { FilterIcon } from 'lucide-react';
import type { IChartEvent } from '@openpanel/validation';
diff --git a/apps/dashboard/src/components/ui/alert.tsx b/apps/dashboard/src/components/ui/alert.tsx
index 4b16e600c..90ba5e38f 100644
--- a/apps/dashboard/src/components/ui/alert.tsx
+++ b/apps/dashboard/src/components/ui/alert.tsx
@@ -35,12 +35,14 @@ Alert.displayName = 'Alert';
const AlertTitle = React.forwardRef<
HTMLParagraphElement,
React.HTMLAttributes<HTMLHeadingElement>
->(({ className, ...props }, ref) => (
+>(({ className, children, ...props }, ref) => (
<h5
ref={ref}
className={cn('mb-1 font-medium leading-none tracking-tight', className)}
{...props}
- />
+ >
+ {children}
+ </h5>
));
AlertTitle.displayName = 'AlertTitle';
diff --git a/apps/dashboard/src/components/ui/toggle.tsx b/apps/dashboard/src/components/ui/toggle.tsx
index 451519206..2d4d4c7fa 100644
--- a/apps/dashboard/src/components/ui/toggle.tsx
+++ b/apps/dashboard/src/components/ui/toggle.tsx
@@ -1,7 +1,8 @@
import * as React from 'react';
import { cn } from '@/utils/cn';
import * as TogglePrimitive from '@radix-ui/react-toggle';
-import { cva, type VariantProps } from 'class-variance-authority';
+import { cva } from 'class-variance-authority';
+import type { VariantProps } from 'class-variance-authority';
const toggleVariants = cva(
'inline-flex items-center justify-center rounded-md text-sm font-medium ring-offset-background transition-colors hover:bg-muted hover:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 data-[state=on]:bg-accent data-[state=on]:text-accent-foreground',
diff --git a/apps/dashboard/src/hooks/useEventNames.ts b/apps/dashboard/src/hooks/useEventNames.ts
index 41dcb0516..e5c1ce12b 100644
--- a/apps/dashboard/src/hooks/useEventNames.ts
+++ b/apps/dashboard/src/hooks/useEventNames.ts
@@ -1,4 +1,4 @@
-import { api } from '@/app/_trpc/client';
+import { api } from '@/trpc/client';
export function useEventNames(projectId: string) {
const query = api.chart.events.useQuery({
diff --git a/apps/dashboard/src/hooks/useEventProperties.ts b/apps/dashboard/src/hooks/useEventProperties.ts
index 2bd5f1ff8..732a1fcaf 100644
--- a/apps/dashboard/src/hooks/useEventProperties.ts
+++ b/apps/dashboard/src/hooks/useEventProperties.ts
@@ -1,4 +1,4 @@
-import { api } from '@/app/_trpc/client';
+import { api } from '@/trpc/client';
export function useEventProperties(projectId: string, event?: string) {
const query = api.chart.properties.useQuery({
diff --git a/apps/dashboard/src/hooks/useEventValues.ts b/apps/dashboard/src/hooks/useEventValues.ts
index 22f8cd191..6eda81be4 100644
--- a/apps/dashboard/src/hooks/useEventValues.ts
+++ b/apps/dashboard/src/hooks/useEventValues.ts
@@ -1,4 +1,4 @@
-import { api } from '@/app/_trpc/client';
+import { api } from '@/trpc/client';
export function useEventValues(
projectId: string,
diff --git a/apps/dashboard/src/hooks/useProfileProperties.ts b/apps/dashboard/src/hooks/useProfileProperties.ts
index 154db512c..f61ef0059 100644
--- a/apps/dashboard/src/hooks/useProfileProperties.ts
+++ b/apps/dashboard/src/hooks/useProfileProperties.ts
@@ -1,4 +1,4 @@
-import { api } from '@/app/_trpc/client';
+import { api } from '@/trpc/client';
export function useProfileProperties(projectId: string) {
const query = api.profile.properties.useQuery({
diff --git a/apps/dashboard/src/hooks/useProfileValues.ts b/apps/dashboard/src/hooks/useProfileValues.ts
index 09cdf9244..fe0964f0c 100644
--- a/apps/dashboard/src/hooks/useProfileValues.ts
+++ b/apps/dashboard/src/hooks/useProfileValues.ts
@@ -1,4 +1,4 @@
-import { api } from '@/app/_trpc/client';
+import { api } from '@/trpc/client';
export function useProfileValues(projectId: string, property: string) {
const query = api.profile.values.useQuery({
diff --git a/apps/dashboard/src/hooks/useRechartDataModel.ts b/apps/dashboard/src/hooks/useRechartDataModel.ts
index dd4439550..811dc0ef4 100644
--- a/apps/dashboard/src/hooks/useRechartDataModel.ts
+++ b/apps/dashboard/src/hooks/useRechartDataModel.ts
@@ -1,7 +1,7 @@
'use client';
import { useMemo } from 'react';
-import type { IChartData, IChartSerieDataItem } from '@/app/_trpc/client';
+import type { IChartData, IChartSerieDataItem } from '@/trpc/client';
import { getChartColor } from '@/utils/theme';
export type IRechartPayloadItem = IChartSerieDataItem & { color: string };
diff --git a/apps/dashboard/src/hooks/useVisibleSeries.ts b/apps/dashboard/src/hooks/useVisibleSeries.ts
index 0fb0b2094..708982344 100644
--- a/apps/dashboard/src/hooks/useVisibleSeries.ts
+++ b/apps/dashboard/src/hooks/useVisibleSeries.ts
@@ -1,7 +1,7 @@
'use client';
import { useEffect, useMemo, useState } from 'react';
-import type { IChartData } from '@/app/_trpc/client';
+import type { IChartData } from '@/trpc/client';
export type IVisibleSeries = ReturnType<typeof useVisibleSeries>['series'];
export function useVisibleSeries(data: IChartData, limit?: number | undefined) {
diff --git a/apps/dashboard/src/lottie/airplane.json b/apps/dashboard/src/lottie/airplane.json
deleted file mode 100644
index 9b368a17d..000000000
--- a/apps/dashboard/src/lottie/airplane.json
+++ /dev/null
@@ -1,714 +0,0 @@
-{
- "v": "5.5.8",
- "fr": 50,
- "ip": 0,
- "op": 147,
- "w": 800,
- "h": 600,
- "nm": "Paperplane",
- "ddd": 0,
- "assets": [
- {
- "id": "comp_0",
- "layers": [
- {
- "ddd": 0,
- "ind": 1,
- "ty": 4,
- "nm": "planete Outlines - Group 4",
- "sr": 1,
- "ks": {
- "o": {
- "a": 1,
- "k": [
- {
- "i": { "x": [0.833], "y": [0.833] },
- "o": { "x": [0.167], "y": [0.167] },
- "t": 0,
- "s": [0]
- },
- {
- "i": { "x": [0.833], "y": [0.833] },
- "o": { "x": [0.167], "y": [0.167] },
- "t": 38,
- "s": [50]
- },
- {
- "i": { "x": [0.833], "y": [0.833] },
- "o": { "x": [0.167], "y": [0.167] },
- "t": 88,
- "s": [50]
- },
- { "t": 120, "s": [0] }
- ],
- "ix": 11
- },
- "r": { "a": 0, "k": 0, "ix": 10 },
- "p": {
- "a": 1,
- "k": [
- {
- "i": { "x": 0.833, "y": 0.833 },
- "o": { "x": 0.167, "y": 0.167 },
- "t": 0,
- "s": [468.336, 323.378, 0],
- "to": [-29, 0, 0],
- "ti": [29, 0, 0]
- },
- { "t": 102, "s": [294.336, 323.378, 0] }
- ],
- "ix": 2
- },
- "a": { "a": 0, "k": [453.672, 304.756, 0], "ix": 1 },
- "s": { "a": 0, "k": [50, 50, 100], "ix": 6 }
- },
- "ao": 0,
- "shapes": [
- {
- "ty": "gr",
- "it": [
- {
- "ind": 0,
- "ty": "sh",
- "ix": 1,
- "ks": {
- "a": 0,
- "k": {
- "i": [
- [6.742, 0],
- [0.741, -0.14],
- [0, 0.074],
- [13.484, 0],
- [1.669, -0.361],
- [19.79, 0],
- [3.317, -19.082],
- [2.691, 0],
- [0, -13.484],
- [-0.048, -0.629],
- [2.405, 0],
- [0, -6.742],
- [-6.742, 0],
- [0, 0],
- [0, 6.743]
- ],
- "o": [
- [-0.781, 0],
- [0.001, -0.074],
- [0, -13.484],
- [-1.778, 0],
- [-3.594, -18.742],
- [-20.03, 0],
- [-2.421, -0.804],
- [-13.485, 0],
- [0, 0.642],
- [-1.89, -1.199],
- [-6.742, 0],
- [0, 6.743],
- [0, 0],
- [6.742, 0],
- [0, -6.742]
- ],
- "v": [
- [75.134, 16.175],
- [72.85, 16.396],
- [72.856, 16.175],
- [48.44, -8.241],
- [43.262, -7.685],
- [3.406, -40.591],
- [-36.571, -6.995],
- [-44.269, -8.241],
- [-68.685, 16.175],
- [-68.604, 18.079],
- [-75.133, 16.175],
- [-87.341, 28.383],
- [-75.133, 40.592],
- [75.134, 40.592],
- [87.342, 28.383]
- ],
- "c": true
- },
- "ix": 2
- },
- "nm": "Path 1",
- "mn": "ADBE Vector Shape - Group",
- "hd": false
- },
- {
- "ty": "fl",
- "c": {
- "a": 0,
- "k": [0.815686334348, 0.823529471603, 0.827451040231, 1],
- "ix": 4
- },
- "o": { "a": 0, "k": 100, "ix": 5 },
- "r": 1,
- "bm": 0,
- "nm": "Fill 1",
- "mn": "ADBE Vector Graphic - Fill",
- "hd": false
- },
- {
- "ty": "tr",
- "p": { "a": 0, "k": [453.672, 304.756], "ix": 2 },
- "a": { "a": 0, "k": [0, 0], "ix": 1 },
- "s": { "a": 0, "k": [100, 100], "ix": 3 },
- "r": { "a": 0, "k": 0, "ix": 6 },
- "o": { "a": 0, "k": 100, "ix": 7 },
- "sk": { "a": 0, "k": 0, "ix": 4 },
- "sa": { "a": 0, "k": 0, "ix": 5 },
- "nm": "Transform"
- }
- ],
- "nm": "Group 4",
- "np": 2,
- "cix": 2,
- "bm": 0,
- "ix": 1,
- "mn": "ADBE Vector Group",
- "hd": false
- }
- ],
- "ip": 0,
- "op": 151,
- "st": 0,
- "bm": 0
- },
- {
- "ddd": 0,
- "ind": 2,
- "ty": 4,
- "nm": "Merged Shape Layer",
- "sr": 1,
- "ks": {
- "o": { "a": 0, "k": 100, "ix": 11 },
- "r": {
- "a": 1,
- "k": [
- {
- "i": { "x": [0.667], "y": [1] },
- "o": { "x": [0.547], "y": [0] },
- "t": 0,
- "s": [0]
- },
- {
- "i": { "x": [0.845], "y": [1] },
- "o": { "x": [0.333], "y": [0] },
- "t": 77,
- "s": [35]
- },
- { "t": 150, "s": [0] }
- ],
- "ix": 10
- },
- "p": {
- "a": 1,
- "k": [
- {
- "i": { "x": 0.667, "y": 1 },
- "o": { "x": 0.333, "y": 0 },
- "t": 0,
- "s": [390.319, 298.2, 0],
- "to": [0, -2.583, 0],
- "ti": [0, 0, 0]
- },
- {
- "i": { "x": 0.667, "y": 1 },
- "o": { "x": 0.333, "y": 0 },
- "t": 44,
- "s": [390.319, 282.7, 0],
- "to": [0, 0, 0],
- "ti": [0, 0, 0]
- },
- {
- "i": { "x": 0.667, "y": 1 },
- "o": { "x": 0.333, "y": 0 },
- "t": 110,
- "s": [390.319, 319.25, 0],
- "to": [0, 0, 0],
- "ti": [0, 0, 0]
- },
- { "t": 150, "s": [390.319, 298.2, 0] }
- ],
- "ix": 2
- },
- "a": { "a": 0, "k": [664.319, 256.2, 0], "ix": 1 },
- "s": { "a": 0, "k": [100, 100, 100], "ix": 6 }
- },
- "ao": 0,
- "shapes": [
- {
- "ty": "gr",
- "it": [
- {
- "ty": "gr",
- "it": [
- {
- "ind": 0,
- "ty": "sh",
- "ix": 1,
- "ks": {
- "a": 0,
- "k": {
- "i": [
- [0, 0],
- [0, 0],
- [0, 0]
- ],
- "o": [
- [0, 0],
- [0, 0],
- [0, 0]
- ],
- "v": [
- [18.967, -3.189],
- [-18.967, 19.935],
- [-0.949, -19.935]
- ],
- "c": true
- },
- "ix": 2
- },
- "nm": "Path 1",
- "mn": "ADBE Vector Shape - Group",
- "hd": false
- },
- {
- "ty": "fl",
- "c": {
- "a": 0,
- "k": [
- 0.223528981209, 0.192156970501, 0.674510002136, 1
- ],
- "ix": 4
- },
- "o": { "a": 0, "k": 100, "ix": 5 },
- "r": 1,
- "bm": 0,
- "nm": "Fill 1",
- "mn": "ADBE Vector Graphic - Fill",
- "hd": false
- },
- {
- "ty": "tr",
- "p": { "a": 0, "k": [236.879, 292.737], "ix": 2 },
- "a": { "a": 0, "k": [0, 0], "ix": 1 },
- "s": { "a": 0, "k": [100, 100], "ix": 3 },
- "r": { "a": 0, "k": 0, "ix": 6 },
- "o": { "a": 0, "k": 100, "ix": 7 },
- "sk": { "a": 0, "k": 0, "ix": 4 },
- "sa": { "a": 0, "k": 0, "ix": 5 },
- "nm": "Transform"
- }
- ],
- "nm": "Group 1",
- "np": 2,
- "cix": 2,
- "bm": 0,
- "ix": 1,
- "mn": "ADBE Vector Group",
- "hd": false
- },
- {
- "ty": "tr",
- "p": { "a": 0, "k": [633.939, 275.369], "ix": 2 },
- "a": { "a": 0, "k": [236.879, 292.737], "ix": 1 },
- "s": { "a": 0, "k": [50, 50], "ix": 3 },
- "r": { "a": 0, "k": 0, "ix": 6 },
- "o": { "a": 0, "k": 100, "ix": 7 },
- "sk": { "a": 0, "k": 0, "ix": 4 },
- "sa": { "a": 0, "k": 0, "ix": 5 },
- "nm": "Transform"
- }
- ],
- "nm": "planete Outlines - Group 1",
- "np": 1,
- "cix": 2,
- "bm": 0,
- "ix": 1,
- "mn": "ADBE Vector Group",
- "hd": false
- },
- {
- "ty": "gr",
- "it": [
- {
- "ty": "gr",
- "it": [
- {
- "ind": 0,
- "ty": "sh",
- "ix": 1,
- "ks": {
- "a": 0,
- "k": {
- "i": [
- [0, 0],
- [0, 0],
- [0, 0],
- [0, 0]
- ],
- "o": [
- [0, 0],
- [0, 0],
- [0, 0],
- [0, 0]
- ],
- "v": [
- [-98.335, 64.79],
- [-105.619, 4.984],
- [105.619, -64.79],
- [-80.316, 24.919]
- ],
- "c": true
- },
- "ix": 2
- },
- "nm": "Path 1",
- "mn": "ADBE Vector Shape - Group",
- "hd": false
- },
- {
- "ty": "fl",
- "c": {
- "a": 0,
- "k": [
- 0.278430998325, 0.294117987156, 0.847059011459, 1
- ],
- "ix": 4
- },
- "o": { "a": 0, "k": 100, "ix": 5 },
- "r": 1,
- "bm": 0,
- "nm": "Fill 1",
- "mn": "ADBE Vector Graphic - Fill",
- "hd": false
- },
- {
- "ty": "tr",
- "p": { "a": 0, "k": [316.247, 247.882], "ix": 2 },
- "a": { "a": 0, "k": [0, 0], "ix": 1 },
- "s": { "a": 0, "k": [100, 100], "ix": 3 },
- "r": { "a": 0, "k": 0, "ix": 6 },
- "o": { "a": 0, "k": 100, "ix": 7 },
- "sk": { "a": 0, "k": 0, "ix": 4 },
- "sa": { "a": 0, "k": 0, "ix": 5 },
- "nm": "Transform"
- }
- ],
- "nm": "Group 2",
- "np": 2,
- "cix": 2,
- "bm": 0,
- "ix": 1,
- "mn": "ADBE Vector Group",
- "hd": false
- },
- {
- "ty": "tr",
- "p": { "a": 0, "k": [673.623, 252.941], "ix": 2 },
- "a": { "a": 0, "k": [316.247, 247.882], "ix": 1 },
- "s": { "a": 0, "k": [50, 50], "ix": 3 },
- "r": { "a": 0, "k": 0, "ix": 6 },
- "o": { "a": 0, "k": 100, "ix": 7 },
- "sk": { "a": 0, "k": 0, "ix": 4 },
- "sa": { "a": 0, "k": 0, "ix": 5 },
- "nm": "Transform"
- }
- ],
- "nm": "planete Outlines - Group 2",
- "np": 1,
- "cix": 2,
- "bm": 0,
- "ix": 2,
- "mn": "ADBE Vector Group",
- "hd": false
- },
- {
- "ty": "gr",
- "it": [
- {
- "ty": "gr",
- "it": [
- {
- "ind": 0,
- "ty": "sh",
- "ix": 1,
- "ks": {
- "a": 0,
- "k": {
- "i": [
- [0, 0],
- [0, 0],
- [0, 0],
- [0, 0],
- [0, 0],
- [0, 0]
- ],
- "o": [
- [0, 0],
- [0, 0],
- [0, 0],
- [0, 0],
- [0, 0],
- [0, 0]
- ],
- "v": [
- [-133.812, -42.171],
- [133.812, -75.141],
- [5.765, 75.141],
- [-61.708, 18.402],
- [124.227, -71.307],
- [-87.011, -1.534]
- ],
- "c": true
- },
- "ix": 2
- },
- "nm": "Path 1",
- "mn": "ADBE Vector Shape - Group",
- "hd": false
- },
- {
- "ty": "fl",
- "c": {
- "a": 0,
- "k": [
- 0.365000009537, 0.407999992371, 0.976000010967, 1
- ],
- "ix": 4
- },
- "o": { "a": 0, "k": 100, "ix": 5 },
- "r": 1,
- "bm": 0,
- "nm": "Fill 1",
- "mn": "ADBE Vector Graphic - Fill",
- "hd": false
- },
- {
- "ty": "tr",
- "p": { "a": 0, "k": [297.638, 254.4], "ix": 2 },
- "a": { "a": 0, "k": [0, 0], "ix": 1 },
- "s": { "a": 0, "k": [100, 100], "ix": 3 },
- "r": { "a": 0, "k": 0, "ix": 6 },
- "o": { "a": 0, "k": 100, "ix": 7 },
- "sk": { "a": 0, "k": 0, "ix": 4 },
- "sa": { "a": 0, "k": 0, "ix": 5 },
- "nm": "Transform"
- }
- ],
- "nm": "Group 3",
- "np": 2,
- "cix": 2,
- "bm": 0,
- "ix": 1,
- "mn": "ADBE Vector Group",
- "hd": false
- },
- {
- "ty": "tr",
- "p": { "a": 0, "k": [664.319, 256.2], "ix": 2 },
- "a": { "a": 0, "k": [297.638, 254.4], "ix": 1 },
- "s": { "a": 0, "k": [50, 50], "ix": 3 },
- "r": { "a": 0, "k": 0, "ix": 6 },
- "o": { "a": 0, "k": 100, "ix": 7 },
- "sk": { "a": 0, "k": 0, "ix": 4 },
- "sa": { "a": 0, "k": 0, "ix": 5 },
- "nm": "Transform"
- }
- ],
- "nm": "planete Outlines - Group 3",
- "np": 1,
- "cix": 2,
- "bm": 0,
- "ix": 3,
- "mn": "ADBE Vector Group",
- "hd": false
- }
- ],
- "ip": 0,
- "op": 151,
- "st": 0,
- "bm": 0
- },
- {
- "ddd": 0,
- "ind": 3,
- "ty": 4,
- "nm": "planete Outlines - Group 5",
- "sr": 1,
- "ks": {
- "o": {
- "a": 1,
- "k": [
- {
- "i": { "x": [0.667], "y": [1] },
- "o": { "x": [0.333], "y": [0] },
- "t": 0,
- "s": [0]
- },
- {
- "i": { "x": [0.667], "y": [1] },
- "o": { "x": [0.333], "y": [0] },
- "t": 45,
- "s": [100]
- },
- {
- "i": { "x": [0.667], "y": [1] },
- "o": { "x": [0.333], "y": [0] },
- "t": 102,
- "s": [100]
- },
- { "t": 150, "s": [0] }
- ],
- "ix": 11
- },
- "r": { "a": 0, "k": 0, "ix": 10 },
- "p": {
- "a": 1,
- "k": [
- {
- "i": { "x": 0.833, "y": 0.833 },
- "o": { "x": 0.167, "y": 0.167 },
- "t": 0,
- "s": [327.38, 267.583, 0],
- "to": [25.833, 0, 0],
- "ti": [-25.833, 0, 0]
- },
- { "t": 150, "s": [482.38, 267.583, 0] }
- ],
- "ix": 2
- },
- "a": { "a": 0, "k": [171.76, 193.166, 0], "ix": 1 },
- "s": { "a": 0, "k": [50, 50, 100], "ix": 6 }
- },
- "ao": 0,
- "shapes": [
- {
- "ty": "gr",
- "it": [
- {
- "ind": 0,
- "ty": "sh",
- "ix": 1,
- "ks": {
- "a": 0,
- "k": {
- "i": [
- [13.485, 0],
- [4.38, -4.171],
- [21.913, 0],
- [3.575, -18.765],
- [1.851, 0],
- [0, -13.484],
- [-0.011, -0.291],
- [1.599, 0],
- [0, -6.743],
- [-6.742, 0],
- [0, 0],
- [0, 13.485]
- ],
- "o": [
- [-6.526, 0],
- [-0.793, -21.719],
- [-19.806, 0],
- [-1.734, -0.391],
- [-13.485, 0],
- [0, 0.293],
- [-1.4, -0.559],
- [-6.742, 0],
- [0, 6.742],
- [0, 0],
- [13.485, 0],
- [0, -13.484]
- ],
- "v": [
- [59.669, -8.242],
- [42.84, -1.506],
- [2.287, -40.592],
- [-37.576, -7.638],
- [-42.962, -8.242],
- [-67.378, 16.174],
- [-67.356, 17.049],
- [-71.878, 16.174],
- [-84.086, 28.383],
- [-71.878, 40.591],
- [59.669, 40.591],
- [84.086, 16.174]
- ],
- "c": true
- },
- "ix": 2
- },
- "nm": "Path 1",
- "mn": "ADBE Vector Shape - Group",
- "hd": false
- },
- {
- "ty": "fl",
- "c": {
- "a": 0,
- "k": [0.816000007181, 0.823999980852, 0.827000038297, 1],
- "ix": 4
- },
- "o": { "a": 0, "k": 100, "ix": 5 },
- "r": 1,
- "bm": 0,
- "nm": "Fill 1",
- "mn": "ADBE Vector Graphic - Fill",
- "hd": false
- },
- {
- "ty": "tr",
- "p": { "a": 0, "k": [171.76, 193.166], "ix": 2 },
- "a": { "a": 0, "k": [0, 0], "ix": 1 },
- "s": { "a": 0, "k": [100, 100], "ix": 3 },
- "r": { "a": 0, "k": 0, "ix": 6 },
- "o": { "a": 0, "k": 100, "ix": 7 },
- "sk": { "a": 0, "k": 0, "ix": 4 },
- "sa": { "a": 0, "k": 0, "ix": 5 },
- "nm": "Transform"
- }
- ],
- "nm": "Group 5",
- "np": 2,
- "cix": 2,
- "bm": 0,
- "ix": 1,
- "mn": "ADBE Vector Group",
- "hd": false
- }
- ],
- "ip": 0,
- "op": 151,
- "st": 0,
- "bm": 0
- }
- ]
- }
- ],
- "layers": [
- {
- "ddd": 0,
- "ind": 1,
- "ty": 0,
- "nm": "Pre-comp 1",
- "refId": "comp_0",
- "sr": 1,
- "ks": {
- "o": { "a": 0, "k": 100, "ix": 11 },
- "r": { "a": 0, "k": 0, "ix": 10 },
- "p": { "a": 0, "k": [406, 306, 0], "ix": 2 },
- "a": { "a": 0, "k": [400, 300, 0], "ix": 1 },
- "s": { "a": 0, "k": [179, 179, 100], "ix": 6 }
- },
- "ao": 0,
- "w": 800,
- "h": 600,
- "ip": 0,
- "op": 147,
- "st": 0,
- "bm": 0
- }
- ],
- "markers": []
-}
diff --git a/apps/dashboard/src/lottie/ballon.json b/apps/dashboard/src/lottie/ballon.json
deleted file mode 100644
index 4e48787ed..000000000
--- a/apps/dashboard/src/lottie/ballon.json
+++ /dev/null
@@ -1,1102 +0,0 @@
-{
- "v": "4.7.0",
- "fr": 29.9700012207031,
- "ip": 0,
- "op": 90.0000036657751,
- "w": 720,
- "h": 720,
- "nm": "Comp 1",
- "ddd": 0,
- "assets": [],
- "layers": [
- {
- "ddd": 0,
- "ind": 1,
- "ty": 4,
- "nm": "Shape Layer 12",
- "ks": {
- "o": { "a": 0, "k": 100 },
- "r": { "a": 0, "k": 0 },
- "p": { "a": 0, "k": [360, 360, 0] },
- "a": { "a": 0, "k": [0, 0, 0] },
- "s": { "a": 0, "k": [100, 100, 100] }
- },
- "ao": 0,
- "shapes": [],
- "ip": 0,
- "op": 90.0000036657751,
- "st": 0,
- "bm": 0,
- "sr": 1
- },
- {
- "ddd": 0,
- "ind": 2,
- "ty": 4,
- "nm": "eye",
- "ks": {
- "o": { "a": 0, "k": 100 },
- "r": { "a": 0, "k": 0 },
- "p": { "a": 0, "k": [435.703, 334.578, 0] },
- "a": { "a": 0, "k": [75.656, -25.094, 0] },
- "s": {
- "a": 1,
- "k": [
- {
- "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
- "o": { "x": [0.333, 0.333, 0.333], "y": [0, 0, 0] },
- "n": ["0p667_1_0p333_0", "0p667_1_0p333_0", "0p667_1_0p333_0"],
- "t": 55,
- "s": [68.389, 68.389, 100],
- "e": [100, 0, 100]
- },
- {
- "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
- "o": { "x": [0.333, 0.333, 0.333], "y": [0, 0, 0] },
- "n": ["0p667_1_0p333_0", "0p667_1_0p333_0", "0p667_1_0p333_0"],
- "t": 71,
- "s": [100, 0, 100],
- "e": [68.389, 68.389, 100]
- },
- { "t": 90.0000036657751 }
- ]
- }
- },
- "ao": 0,
- "shapes": [
- {
- "ty": "gr",
- "it": [
- {
- "d": 1,
- "ty": "el",
- "s": { "a": 0, "k": [20.563, 20.563] },
- "p": { "a": 0, "k": [0, 0] },
- "nm": "Ellipse Path 1",
- "mn": "ADBE Vector Shape - Ellipse"
- },
- {
- "ty": "fl",
- "c": { "a": 0, "k": [0.6705883, 0.6442907, 0.6442907, 1] },
- "o": { "a": 0, "k": 100 },
- "r": 1,
- "nm": "Fill 1",
- "mn": "ADBE Vector Graphic - Fill"
- },
- {
- "ty": "tr",
- "p": { "a": 0, "k": [75.656, -25.094], "ix": 2 },
- "a": { "a": 0, "k": [0, 0], "ix": 1 },
- "s": { "a": 0, "k": [100, 100], "ix": 3 },
- "r": { "a": 0, "k": 0, "ix": 6 },
- "o": { "a": 0, "k": 100, "ix": 7 },
- "sk": { "a": 0, "k": 0, "ix": 4 },
- "sa": { "a": 0, "k": 0, "ix": 5 },
- "nm": "Transform"
- }
- ],
- "nm": "Ellipse 1",
- "np": 2,
- "cix": 2,
- "ix": 1,
- "mn": "ADBE Vector Group"
- }
- ],
- "ip": 0,
- "op": 90.0000036657751,
- "st": 0,
- "bm": 0,
- "sr": 1
- },
- {
- "ddd": 0,
- "ind": 3,
- "ty": 4,
- "nm": "out eye",
- "ks": {
- "o": { "a": 0, "k": 100 },
- "r": { "a": 0, "k": 0 },
- "p": { "a": 0, "k": [359.953, 360.328, 0] },
- "a": { "a": 0, "k": [0, 0, 0] },
- "s": { "a": 0, "k": [100, 100, 100] }
- },
- "ao": 0,
- "shapes": [
- {
- "ty": "gr",
- "it": [
- {
- "d": 1,
- "ty": "el",
- "s": { "a": 0, "k": [27.5, 27.5] },
- "p": { "a": 0, "k": [0, 0] },
- "nm": "Ellipse Path 1",
- "mn": "ADBE Vector Shape - Ellipse"
- },
- {
- "ty": "fl",
- "c": { "a": 0, "k": [0.9294118, 0.8783852, 0.8783852, 1] },
- "o": { "a": 0, "k": 100 },
- "r": 1,
- "nm": "Fill 1",
- "mn": "ADBE Vector Graphic - Fill"
- },
- {
- "ty": "tr",
- "p": { "a": 0, "k": [75.75, -25.75], "ix": 2 },
- "a": { "a": 0, "k": [0, 0], "ix": 1 },
- "s": { "a": 0, "k": [100, 100], "ix": 3 },
- "r": { "a": 0, "k": 0, "ix": 6 },
- "o": { "a": 0, "k": 100, "ix": 7 },
- "sk": { "a": 0, "k": 0, "ix": 4 },
- "sa": { "a": 0, "k": 0, "ix": 5 },
- "nm": "Transform"
- }
- ],
- "nm": "Ellipse 1",
- "np": 2,
- "cix": 2,
- "ix": 1,
- "mn": "ADBE Vector Group"
- }
- ],
- "ip": 0,
- "op": 90.0000036657751,
- "st": 0,
- "bm": 0,
- "sr": 1
- },
- {
- "ddd": 0,
- "ind": 4,
- "ty": 4,
- "nm": "duoi",
- "ks": {
- "o": { "a": 0, "k": 100 },
- "r": {
- "a": 1,
- "k": [
- {
- "i": { "x": [0.833], "y": [0.833] },
- "o": { "x": [0.167], "y": [0.167] },
- "n": ["0p833_0p833_0p167_0p167"],
- "t": 17,
- "s": [0],
- "e": [-32]
- },
- {
- "i": { "x": [0.833], "y": [0.833] },
- "o": { "x": [0.167], "y": [0.167] },
- "n": ["0p833_0p833_0p167_0p167"],
- "t": 47,
- "s": [-32],
- "e": [0]
- },
- { "t": 76.0000030955435 }
- ]
- },
- "p": { "a": 0, "k": [232.901, 264.898, 0] },
- "a": { "a": 0, "k": [-146.691, -122.142, 0] },
- "s": { "a": 0, "k": [108.07, 100, 100] }
- },
- "ao": 0,
- "shapes": [
- {
- "ty": "gr",
- "it": [
- {
- "ind": 0,
- "ty": "sh",
- "ix": 1,
- "ks": {
- "a": 0,
- "k": {
- "i": [
- [0, 0],
- [-0.257, -29.886],
- [-0.011, 0.582],
- [0, 0],
- [-8.139, -12.838],
- [-17.886, 27.356]
- ],
- "o": [
- [0, 0],
- [0.004, 0.509],
- [0.5, -26.125],
- [0, 0],
- [17.343, 27.356],
- [8.5, -13]
- ],
- "v": [
- [-95.5, -206.75],
- [-132.419, -164.682],
- [-132.209, -166.586],
- [-168.75, -202.5],
- [-167.25, -169],
- [-98.605, -168.936]
- ],
- "c": true
- }
- },
- "nm": "Path 1",
- "mn": "ADBE Vector Shape - Group"
- },
- {
- "ty": "fl",
- "c": { "a": 0, "k": [0.4745098, 0.7490196, 0.827451, 1] },
- "o": { "a": 0, "k": 100 },
- "r": 1,
- "nm": "Fill 1",
- "mn": "ADBE Vector Graphic - Fill"
- },
- {
- "ty": "tr",
- "p": { "a": 0, "k": [-146.5, -122.5], "ix": 2 },
- "a": { "a": 0, "k": [-131.308, -148.646], "ix": 1 },
- "s": { "a": 0, "k": [72.59, 72.59], "ix": 3 },
- "r": { "a": 0, "k": -39.108, "ix": 6 },
- "o": { "a": 0, "k": 100, "ix": 7 },
- "sk": { "a": 0, "k": 0, "ix": 4 },
- "sa": { "a": 0, "k": 0, "ix": 5 },
- "nm": "Transform"
- }
- ],
- "nm": "Shape 1",
- "np": 2,
- "cix": 2,
- "ix": 1,
- "mn": "ADBE Vector Group"
- }
- ],
- "ip": 0,
- "op": 90.0000036657751,
- "st": 0,
- "bm": 0,
- "sr": 1
- },
- {
- "ddd": 0,
- "ind": 5,
- "ty": 4,
- "nm": "a1",
- "ks": {
- "o": { "a": 0, "k": 100 },
- "r": { "a": 0, "k": 0 },
- "p": { "a": 0, "k": [360, 360, 0] },
- "a": { "a": 0, "k": [0, 0, 0] },
- "s": { "a": 0, "k": [100, 100, 100] }
- },
- "ao": 0,
- "shapes": [
- {
- "ind": 0,
- "ty": "sh",
- "ix": 1,
- "ks": {
- "a": 1,
- "k": [
- {
- "i": { "x": 0.667, "y": 1 },
- "o": { "x": 0.333, "y": 0 },
- "n": "0p667_1_0p333_0",
- "t": 0,
- "s": [
- {
- "i": [
- [81.462, 0],
- [26.998, -29.979],
- [3.641, -5.283],
- [2.87, -5.56],
- [0, -24.352],
- [-49.64, 11.681],
- [-39.551, -6.305],
- [-22.411, 0.678],
- [0, 64.505]
- ],
- "o": [
- [-43.52, 0],
- [-4.281, 4.754],
- [-3.529, 5.12],
- [-10.45, 20.243],
- [0, 57.766],
- [68.927, -16.219],
- [34.5, 5.5],
- [59.831, -1.811],
- [0, -81.462]
- ],
- "v": [
- [0, -147.5],
- [-107.887, -100.173],
- [-132.786, -102.352],
- [-131.148, -67.568],
- [-147.5, 0],
- [-84.927, 26.219],
- [-39, 77.5],
- [36.911, 23.822],
- [147.5, 0]
- ],
- "c": true
- }
- ],
- "e": [
- {
- "i": [
- [81.462, 0],
- [26.998, -29.979],
- [3.641, -5.283],
- [2.87, -5.56],
- [0, -24.352],
- [-49.64, 11.681],
- [-39.551, -6.305],
- [-22.411, 0.678],
- [0, 64.505]
- ],
- "o": [
- [-43.52, 0],
- [-4.281, 4.754],
- [-3.529, 5.12],
- [-10.45, 20.243],
- [0, 57.766],
- [68.927, -16.219],
- [34.5, 5.5],
- [59.831, -1.811],
- [0, -81.462]
- ],
- "v": [
- [0, -147.5],
- [-107.887, -100.173],
- [-132.786, -102.352],
- [-131.148, -67.568],
- [-147.5, 0],
- [-84.927, 26.219],
- [-67, 61.5],
- [36.911, 23.822],
- [147.5, 0]
- ],
- "c": true
- }
- ]
- },
- {
- "i": { "x": 0.667, "y": 1 },
- "o": { "x": 0.333, "y": 0 },
- "n": "0p667_1_0p333_0",
- "t": 15,
- "s": [
- {
- "i": [
- [81.462, 0],
- [26.998, -29.979],
- [3.641, -5.283],
- [2.87, -5.56],
- [0, -24.352],
- [-49.64, 11.681],
- [-39.551, -6.305],
- [-22.411, 0.678],
- [0, 64.505]
- ],
- "o": [
- [-43.52, 0],
- [-4.281, 4.754],
- [-3.529, 5.12],
- [-10.45, 20.243],
- [0, 57.766],
- [68.927, -16.219],
- [34.5, 5.5],
- [59.831, -1.811],
- [0, -81.462]
- ],
- "v": [
- [0, -147.5],
- [-107.887, -100.173],
- [-132.786, -102.352],
- [-131.148, -67.568],
- [-147.5, 0],
- [-84.927, 26.219],
- [-67, 61.5],
- [36.911, 23.822],
- [147.5, 0]
- ],
- "c": true
- }
- ],
- "e": [
- {
- "i": [
- [81.462, 0],
- [26.998, -29.979],
- [3.641, -5.283],
- [2.87, -5.56],
- [0, -24.352],
- [-49.64, 11.681],
- [-39.551, -6.305],
- [-22.411, 0.678],
- [0, 64.505]
- ],
- "o": [
- [-43.52, 0],
- [-4.281, 4.754],
- [-3.529, 5.12],
- [-10.45, 20.243],
- [0, 57.766],
- [68.927, -16.219],
- [34.5, 5.5],
- [59.831, -1.811],
- [0, -81.462]
- ],
- "v": [
- [0, -147.5],
- [-107.887, -100.173],
- [-132.786, -102.352],
- [-131.148, -67.568],
- [-147.5, 0],
- [-84.927, 26.219],
- [-39, 77.5],
- [36.911, 23.822],
- [147.5, 0]
- ],
- "c": true
- }
- ]
- },
- {
- "i": { "x": 0.667, "y": 1 },
- "o": { "x": 0.333, "y": 0 },
- "n": "0p667_1_0p333_0",
- "t": 33,
- "s": [
- {
- "i": [
- [81.462, 0],
- [26.998, -29.979],
- [3.641, -5.283],
- [2.87, -5.56],
- [0, -24.352],
- [-49.64, 11.681],
- [-39.551, -6.305],
- [-22.411, 0.678],
- [0, 64.505]
- ],
- "o": [
- [-43.52, 0],
- [-4.281, 4.754],
- [-3.529, 5.12],
- [-10.45, 20.243],
- [0, 57.766],
- [68.927, -16.219],
- [34.5, 5.5],
- [59.831, -1.811],
- [0, -81.462]
- ],
- "v": [
- [0, -147.5],
- [-107.887, -100.173],
- [-132.786, -102.352],
- [-131.148, -67.568],
- [-147.5, 0],
- [-84.927, 26.219],
- [-39, 77.5],
- [36.911, 23.822],
- [147.5, 0]
- ],
- "c": true
- }
- ],
- "e": [
- {
- "i": [
- [81.462, 0],
- [26.998, -29.979],
- [3.641, -5.283],
- [2.87, -5.56],
- [0, -24.352],
- [-49.64, 11.681],
- [-39.551, -6.305],
- [-22.411, 0.678],
- [0, 64.505]
- ],
- "o": [
- [-43.52, 0],
- [-4.281, 4.754],
- [-3.529, 5.12],
- [-10.45, 20.243],
- [0, 57.766],
- [68.927, -16.219],
- [34.5, 5.5],
- [59.831, -1.811],
- [0, -81.462]
- ],
- "v": [
- [0, -147.5],
- [-107.887, -100.173],
- [-132.786, -102.352],
- [-131.148, -67.568],
- [-147.5, 0],
- [-84.927, 26.219],
- [-39, 77.5],
- [36.911, 23.822],
- [147.5, 0]
- ],
- "c": true
- }
- ]
- },
- {
- "i": { "x": 0.667, "y": 1 },
- "o": { "x": 0.333, "y": 0 },
- "n": "0p667_1_0p333_0",
- "t": 49,
- "s": [
- {
- "i": [
- [81.462, 0],
- [26.998, -29.979],
- [3.641, -5.283],
- [2.87, -5.56],
- [0, -24.352],
- [-49.64, 11.681],
- [-39.551, -6.305],
- [-22.411, 0.678],
- [0, 64.505]
- ],
- "o": [
- [-43.52, 0],
- [-4.281, 4.754],
- [-3.529, 5.12],
- [-10.45, 20.243],
- [0, 57.766],
- [68.927, -16.219],
- [34.5, 5.5],
- [59.831, -1.811],
- [0, -81.462]
- ],
- "v": [
- [0, -147.5],
- [-107.887, -100.173],
- [-132.786, -102.352],
- [-131.148, -67.568],
- [-147.5, 0],
- [-84.927, 26.219],
- [-39, 77.5],
- [36.911, 23.822],
- [147.5, 0]
- ],
- "c": true
- }
- ],
- "e": [
- {
- "i": [
- [81.462, 0],
- [26.998, -29.979],
- [3.641, -5.283],
- [2.87, -5.56],
- [0, -24.352],
- [-49.64, 11.681],
- [-39.551, -6.305],
- [-22.411, 0.678],
- [0, 64.505]
- ],
- "o": [
- [-43.52, 0],
- [-4.281, 4.754],
- [-3.529, 5.12],
- [-10.45, 20.243],
- [0, 57.766],
- [68.927, -16.219],
- [34.5, 5.5],
- [59.831, -1.811],
- [0, -81.462]
- ],
- "v": [
- [0, -147.5],
- [-107.887, -100.173],
- [-132.786, -102.352],
- [-131.148, -67.568],
- [-147.5, 0],
- [-84.927, 26.219],
- [-67, 61.5],
- [36.911, 23.822],
- [147.5, 0]
- ],
- "c": true
- }
- ]
- },
- {
- "i": { "x": 0.667, "y": 1 },
- "o": { "x": 0.333, "y": 0 },
- "n": "0p667_1_0p333_0",
- "t": 75,
- "s": [
- {
- "i": [
- [81.462, 0],
- [26.998, -29.979],
- [3.641, -5.283],
- [2.87, -5.56],
- [0, -24.352],
- [-49.64, 11.681],
- [-39.551, -6.305],
- [-22.411, 0.678],
- [0, 64.505]
- ],
- "o": [
- [-43.52, 0],
- [-4.281, 4.754],
- [-3.529, 5.12],
- [-10.45, 20.243],
- [0, 57.766],
- [68.927, -16.219],
- [34.5, 5.5],
- [59.831, -1.811],
- [0, -81.462]
- ],
- "v": [
- [0, -147.5],
- [-107.887, -100.173],
- [-132.786, -102.352],
- [-131.148, -67.568],
- [-147.5, 0],
- [-84.927, 26.219],
- [-67, 61.5],
- [36.911, 23.822],
- [147.5, 0]
- ],
- "c": true
- }
- ],
- "e": [
- {
- "i": [
- [81.462, 0],
- [26.998, -29.979],
- [3.641, -5.283],
- [2.87, -5.56],
- [0, -24.352],
- [-49.64, 11.681],
- [-39.551, -6.305],
- [-22.411, 0.678],
- [0, 64.505]
- ],
- "o": [
- [-43.52, 0],
- [-4.281, 4.754],
- [-3.529, 5.12],
- [-10.45, 20.243],
- [0, 57.766],
- [68.927, -16.219],
- [34.5, 5.5],
- [59.831, -1.811],
- [0, -81.462]
- ],
- "v": [
- [0, -147.5],
- [-107.887, -100.173],
- [-132.786, -102.352],
- [-131.148, -67.568],
- [-147.5, 0],
- [-84.927, 26.219],
- [-39, 77.5],
- [36.911, 23.822],
- [147.5, 0]
- ],
- "c": true
- }
- ]
- },
- {
- "i": { "x": 0.833, "y": 0.833 },
- "o": { "x": 0.333, "y": 0 },
- "n": "0p833_0p833_0p333_0",
- "t": 89,
- "s": [
- {
- "i": [
- [81.462, 0],
- [26.998, -29.979],
- [3.641, -5.283],
- [2.87, -5.56],
- [0, -24.352],
- [-49.64, 11.681],
- [-39.551, -6.305],
- [-22.411, 0.678],
- [0, 64.505]
- ],
- "o": [
- [-43.52, 0],
- [-4.281, 4.754],
- [-3.529, 5.12],
- [-10.45, 20.243],
- [0, 57.766],
- [68.927, -16.219],
- [34.5, 5.5],
- [59.831, -1.811],
- [0, -81.462]
- ],
- "v": [
- [0, -147.5],
- [-107.887, -100.173],
- [-132.786, -102.352],
- [-131.148, -67.568],
- [-147.5, 0],
- [-84.927, 26.219],
- [-39, 77.5],
- [36.911, 23.822],
- [147.5, 0]
- ],
- "c": true
- }
- ],
- "e": [
- {
- "i": [
- [81.462, 0],
- [26.998, -29.979],
- [3.641, -5.283],
- [2.87, -5.56],
- [0, -24.352],
- [-49.64, 11.681],
- [-39.551, -6.305],
- [-22.411, 0.678],
- [0, 64.505]
- ],
- "o": [
- [-43.52, 0],
- [-4.281, 4.754],
- [-3.529, 5.12],
- [-10.45, 20.243],
- [0, 57.766],
- [68.927, -16.219],
- [34.5, 5.5],
- [59.831, -1.811],
- [0, -81.462]
- ],
- "v": [
- [0, -147.5],
- [-107.887, -100.173],
- [-132.786, -102.352],
- [-131.148, -67.568],
- [-147.5, 0],
- [-84.927, 26.219],
- [-39, 77.5],
- [36.911, 23.822],
- [147.5, 0]
- ],
- "c": true
- }
- ]
- },
- { "t": 100.000004073084 }
- ]
- },
- "nm": "Path 1",
- "mn": "ADBE Vector Shape - Group"
- },
- {
- "ty": "fl",
- "c": { "a": 0, "k": [0.4737563, 0.7483898, 0.827451, 1] },
- "o": { "a": 0, "k": 100 },
- "r": 1,
- "nm": "Fill 1",
- "mn": "ADBE Vector Graphic - Fill"
- }
- ],
- "ip": 0,
- "op": 90.0000036657751,
- "st": 0,
- "bm": 0,
- "sr": 1
- },
- {
- "ddd": 0,
- "ind": 6,
- "ty": 4,
- "nm": "Shape Layer 8",
- "ks": {
- "o": { "a": 0, "k": 100 },
- "r": { "a": 0, "k": 0 },
- "p": { "a": 0, "k": [360, 360, 0] },
- "a": { "a": 0, "k": [0, 0, 0] },
- "s": { "a": 0, "k": [100, 100, 100] }
- },
- "ao": 0,
- "shapes": [],
- "ip": 0,
- "op": 90.0000036657751,
- "st": 0,
- "bm": 0,
- "sr": 1
- },
- {
- "ddd": 0,
- "ind": 7,
- "ty": 4,
- "nm": "Shape Layer 7",
- "ks": {
- "o": { "a": 0, "k": 100 },
- "r": { "a": 0, "k": 0 },
- "p": { "a": 0, "k": [360, 360, 0] },
- "a": { "a": 0, "k": [0, 0, 0] },
- "s": { "a": 0, "k": [100, 100, 100] }
- },
- "ao": 0,
- "shapes": [
- {
- "ty": "gr",
- "it": [
- {
- "ty": "st",
- "c": { "a": 0, "k": [1, 0, 0, 1] },
- "o": { "a": 0, "k": 100 },
- "w": { "a": 0, "k": 5 },
- "lc": 1,
- "lj": 1,
- "ml": 4,
- "nm": "Stroke 1",
- "mn": "ADBE Vector Graphic - Stroke"
- },
- {
- "ty": "fl",
- "c": { "a": 0, "k": [0.929412, 0.929412, 0.929412, 1] },
- "o": { "a": 0, "k": 100 },
- "r": 1,
- "nm": "Fill 1",
- "mn": "ADBE Vector Graphic - Fill"
- },
- {
- "ty": "tr",
- "p": { "a": 0, "k": [220, -157.5], "ix": 2 },
- "a": { "a": 0, "k": [0, 0], "ix": 1 },
- "s": { "a": 0, "k": [100, 100], "ix": 3 },
- "r": { "a": 0, "k": 0, "ix": 6 },
- "o": { "a": 0, "k": 100, "ix": 7 },
- "sk": { "a": 0, "k": 0, "ix": 4 },
- "sa": { "a": 0, "k": 0, "ix": 5 },
- "nm": "Transform"
- }
- ],
- "nm": "Rectangle 1",
- "np": 2,
- "cix": 2,
- "ix": 1,
- "mn": "ADBE Vector Group"
- }
- ],
- "ip": 0,
- "op": 90.0000036657751,
- "st": 0,
- "bm": 0,
- "sr": 1
- },
- {
- "ddd": 0,
- "ind": 8,
- "ty": 4,
- "nm": "Shape Layer 6",
- "ks": {
- "o": { "a": 0, "k": 100 },
- "r": { "a": 0, "k": 0 },
- "p": { "a": 0, "k": [360, 360, 0] },
- "a": { "a": 0, "k": [0, 0, 0] },
- "s": { "a": 0, "k": [100, 100, 100] }
- },
- "ao": 0,
- "shapes": [
- {
- "ty": "gr",
- "it": [
- {
- "ty": "st",
- "c": { "a": 0, "k": [1, 0, 0, 1] },
- "o": { "a": 0, "k": 100 },
- "w": { "a": 0, "k": 5 },
- "lc": 1,
- "lj": 1,
- "ml": 4,
- "nm": "Stroke 1",
- "mn": "ADBE Vector Graphic - Stroke"
- },
- {
- "ty": "fl",
- "c": { "a": 0, "k": [0.929412, 0.929412, 0.929412, 1] },
- "o": { "a": 0, "k": 100 },
- "r": 1,
- "nm": "Fill 1",
- "mn": "ADBE Vector Graphic - Fill"
- },
- {
- "ty": "tr",
- "p": { "a": 0, "k": [0, 0], "ix": 2 },
- "a": { "a": 0, "k": [0, 0], "ix": 1 },
- "s": { "a": 0, "k": [100, 100], "ix": 3 },
- "r": { "a": 0, "k": 0, "ix": 6 },
- "o": { "a": 0, "k": 100, "ix": 7 },
- "sk": { "a": 0, "k": 0, "ix": 4 },
- "sa": { "a": 0, "k": 0, "ix": 5 },
- "nm": "Transform"
- }
- ],
- "nm": "Shape 1",
- "np": 2,
- "cix": 2,
- "ix": 1,
- "mn": "ADBE Vector Group"
- }
- ],
- "ip": 0,
- "op": 90.0000036657751,
- "st": 0,
- "bm": 0,
- "sr": 1
- },
- {
- "ddd": 0,
- "ind": 9,
- "ty": 4,
- "nm": "Shape Layer 4",
- "ks": {
- "o": { "a": 0, "k": 100 },
- "r": { "a": 0, "k": 0 },
- "p": { "a": 0, "k": [300.5, 360, 0] },
- "a": { "a": 0, "k": [0, 0, 0] },
- "s": { "a": 0, "k": [100, 100, 100] }
- },
- "ao": 0,
- "shapes": [
- {
- "d": 1,
- "ty": "el",
- "s": { "a": 0, "k": [175, 175] },
- "p": { "a": 0, "k": [0, 0] },
- "nm": "Ellipse Path 1",
- "mn": "ADBE Vector Shape - Ellipse"
- },
- {
- "ty": "fl",
- "c": { "a": 0, "k": [1, 1, 1, 1] },
- "o": { "a": 0, "k": 100 },
- "r": 1,
- "nm": "Fill 1",
- "mn": "ADBE Vector Graphic - Fill"
- }
- ],
- "ip": 0,
- "op": 90.0000036657751,
- "st": 0,
- "bm": 0,
- "sr": 1
- },
- {
- "ddd": 0,
- "ind": 10,
- "ty": 4,
- "nm": "Shape Layer 3",
- "ks": {
- "o": { "a": 0, "k": 100 },
- "r": { "a": 0, "k": 0 },
- "p": { "a": 0, "k": [320, 360, 0] },
- "a": { "a": 0, "k": [0, 0, 0] },
- "s": { "a": 0, "k": [100, 100, 100] }
- },
- "ao": 0,
- "shapes": [
- {
- "d": 1,
- "ty": "el",
- "s": { "a": 0, "k": [215, 215] },
- "p": { "a": 0, "k": [0, 0] },
- "nm": "Ellipse Path 1",
- "mn": "ADBE Vector Shape - Ellipse"
- },
- {
- "ty": "fl",
- "c": { "a": 0, "k": [0.9254902, 0.9254902, 0.9254902, 1] },
- "o": { "a": 0, "k": 100 },
- "r": 1,
- "nm": "Fill 1",
- "mn": "ADBE Vector Graphic - Fill"
- }
- ],
- "ip": 0,
- "op": 90.0000036657751,
- "st": 0,
- "bm": 0,
- "sr": 1
- },
- {
- "ddd": 0,
- "ind": 11,
- "ty": 4,
- "nm": "Shape Layer 2",
- "ks": {
- "o": { "a": 0, "k": 100 },
- "r": { "a": 0, "k": 0 },
- "p": { "a": 0, "k": [340.5, 360, 0] },
- "a": { "a": 0, "k": [0, 0, 0] },
- "s": { "a": 0, "k": [100, 100, 100] }
- },
- "ao": 0,
- "shapes": [
- {
- "d": 1,
- "ty": "el",
- "s": { "a": 0, "k": [255, 255] },
- "p": { "a": 0, "k": [0, 0] },
- "nm": "Ellipse Path 1",
- "mn": "ADBE Vector Shape - Ellipse"
- },
- {
- "ty": "fl",
- "c": { "a": 0, "k": [0.8862745, 0.8862745, 0.8862745, 1] },
- "o": { "a": 0, "k": 100 },
- "r": 1,
- "nm": "Fill 1",
- "mn": "ADBE Vector Graphic - Fill"
- }
- ],
- "ip": 0,
- "op": 90.0000036657751,
- "st": 0,
- "bm": 0,
- "sr": 1
- },
- {
- "ddd": 0,
- "ind": 12,
- "ty": 4,
- "nm": "Shape Layer 1",
- "ks": {
- "o": { "a": 0, "k": 100 },
- "r": { "a": 0, "k": 0 },
- "p": { "a": 0, "k": [360, 360, 0] },
- "a": { "a": 0, "k": [0, 0, 0] },
- "s": { "a": 0, "k": [100, 100, 100] }
- },
- "ao": 0,
- "shapes": [
- {
- "d": 1,
- "ty": "el",
- "s": { "a": 0, "k": [295, 295] },
- "p": { "a": 0, "k": [0, 0] },
- "nm": "Ellipse Path 1",
- "mn": "ADBE Vector Shape - Ellipse"
- },
- {
- "ty": "fl",
- "c": { "a": 0, "k": [0.8039216, 0.8039216, 0.8039216, 1] },
- "o": { "a": 0, "k": 100 },
- "r": 1,
- "nm": "Fill 1",
- "mn": "ADBE Vector Graphic - Fill"
- }
- ],
- "ip": 0,
- "op": 90.0000036657751,
- "st": 0,
- "bm": 0,
- "sr": 1
- }
- ]
-}
diff --git a/apps/dashboard/src/lottie/no-data.json b/apps/dashboard/src/lottie/no-data.json
deleted file mode 100644
index 03bc2a393..000000000
--- a/apps/dashboard/src/lottie/no-data.json
+++ /dev/null
@@ -1,1941 +0,0 @@
-{
- "v": "5.5.9",
- "fr": 60,
- "ip": 0,
- "op": 180,
- "w": 426,
- "h": 290,
- "nm": "search_empty",
- "ddd": 0,
- "assets": [
- {
- "id": "comp_0",
- "layers": [
- {
- "ddd": 0,
- "ind": 1,
- "ty": 4,
- "nm": "mouth",
- "sr": 1,
- "ks": {
- "o": { "a": 0, "k": 100, "ix": 11 },
- "r": { "a": 0, "k": 0, "ix": 10 },
- "p": {
- "a": 1,
- "k": [
- {
- "i": { "x": 0.833, "y": 0.833 },
- "o": { "x": 0.167, "y": 0.167 },
- "t": 44,
- "s": [211, 145, 0],
- "to": [0, 0.667, 0],
- "ti": [0, -0.667, 0]
- },
- { "t": 69, "s": [211, 149, 0] }
- ],
- "ix": 2
- },
- "a": { "a": 0, "k": [0, 0, 0], "ix": 1 },
- "s": {
- "a": 1,
- "k": [
- {
- "i": {
- "x": [0.833, 0.833, 0.833],
- "y": [0.833, 0.833, 0.833]
- },
- "o": {
- "x": [0.167, 0.167, 0.167],
- "y": [0.167, 0.167, 0.167]
- },
- "t": 44,
- "s": [100, 100, 100]
- },
- { "t": 68, "s": [105, 105, 100] }
- ],
- "ix": 6
- }
- },
- "ao": 0,
- "shapes": [
- {
- "ty": "gr",
- "it": [
- {
- "ind": 0,
- "ty": "sh",
- "ix": 1,
- "ks": {
- "a": 0,
- "k": {
- "i": [
- [0.5, 0.25],
- [-1.715, 0.372]
- ],
- "o": [
- [-13.025, -6.512],
- [7.5, -1.625]
- ],
- "v": [
- [-10, 12.25],
- [-31.75, 12.625]
- ],
- "c": true
- },
- "ix": 2
- },
- "nm": "Path 1",
- "mn": "ADBE Vector Shape - Group",
- "hd": false
- },
- {
- "ty": "fl",
- "c": {
- "a": 0,
- "k": [
- 0.40784313725490196, 0.4627450980392157,
- 0.5176470588235295, 1
- ],
- "ix": 4
- },
- "o": { "a": 0, "k": 100, "ix": 5 },
- "r": 1,
- "bm": 0,
- "nm": "Fill 1",
- "mn": "ADBE Vector Graphic - Fill",
- "hd": false
- },
- {
- "ty": "tr",
- "p": { "a": 0, "k": [0, 0], "ix": 2 },
- "a": { "a": 0, "k": [0, 0], "ix": 1 },
- "s": { "a": 0, "k": [100, 100], "ix": 3 },
- "r": { "a": 0, "k": 0, "ix": 6 },
- "o": { "a": 0, "k": 100, "ix": 7 },
- "sk": { "a": 0, "k": 0, "ix": 4 },
- "sa": { "a": 0, "k": 0, "ix": 5 },
- "nm": "Transform"
- }
- ],
- "nm": "Shape 1",
- "np": 3,
- "cix": 2,
- "bm": 0,
- "ix": 1,
- "mn": "ADBE Vector Group",
- "hd": false
- }
- ],
- "ip": 0,
- "op": 3600,
- "st": 0,
- "bm": 0
- },
- {
- "ddd": 0,
- "ind": 2,
- "ty": 4,
- "nm": "汗",
- "sr": 1,
- "ks": {
- "o": {
- "a": 1,
- "k": [
- {
- "i": { "x": [0.667], "y": [1] },
- "o": { "x": [0.333], "y": [0] },
- "t": 51,
- "s": [0]
- },
- { "t": 95, "s": [100] }
- ],
- "ix": 11
- },
- "r": { "a": 0, "k": 0, "ix": 10 },
- "p": {
- "a": 1,
- "k": [
- {
- "i": { "x": 0.667, "y": 1 },
- "o": { "x": 0.333, "y": 0 },
- "t": 51,
- "s": [248, 95.252, 0],
- "to": [0, 1.5, 0],
- "ti": [0, -1.5, 0]
- },
- { "t": 94, "s": [248, 104.252, 0] }
- ],
- "ix": 2
- },
- "a": { "a": 0, "k": [0, -19.333, 0], "ix": 1 },
- "s": {
- "a": 1,
- "k": [
- {
- "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
- "o": { "x": [0.333, 0.333, 0.333], "y": [0, 0, 0] },
- "t": 51,
- "s": [40, 40, 100]
- },
- { "t": 95, "s": [100, 100, 100] }
- ],
- "ix": 6
- }
- },
- "ao": 0,
- "shapes": [
- {
- "ty": "gr",
- "it": [
- {
- "ind": 0,
- "ty": "sh",
- "ix": 1,
- "ks": {
- "a": 0,
- "k": {
- "i": [
- [-9.94, 0],
- [0, 7.27],
- [0, 0],
- [0, -7.27]
- ],
- "o": [
- [9.94, 0],
- [0, -7.27],
- [0, 0],
- [0, 7.27]
- ],
- "v": [
- [0, 19],
- [18, 5.84],
- [0, -19],
- [-18, 5.84]
- ],
- "c": true
- },
- "ix": 2
- },
- "nm": "Path 1",
- "mn": "ADBE Vector Shape - Group",
- "hd": false
- },
- {
- "ty": "gf",
- "o": { "a": 0, "k": 100, "ix": 10 },
- "r": 1,
- "bm": 0,
- "g": {
- "p": 3,
- "k": {
- "a": 0,
- "k": [
- 0, 0.69, 0.976, 1, 0.5, 0.714, 0.954, 0.997, 1, 0.738,
- 0.932, 0.994
- ],
- "ix": 9
- }
- },
- "s": { "a": 0, "k": [0.019, -9.236], "ix": 5 },
- "e": { "a": 0, "k": [10.208, 19], "ix": 6 },
- "t": 1,
- "nm": "Gradient Fill 1",
- "mn": "ADBE Vector Graphic - G-Fill",
- "hd": false
- },
- {
- "ty": "tr",
- "p": { "a": 0, "k": [0, 0], "ix": 2 },
- "a": { "a": 0, "k": [0, 0], "ix": 1 },
- "s": { "a": 0, "k": [100, 100], "ix": 3 },
- "r": { "a": 0, "k": 0, "ix": 6 },
- "o": { "a": 0, "k": 100, "ix": 7 },
- "sk": { "a": 0, "k": 0, "ix": 4 },
- "sa": { "a": 0, "k": 0, "ix": 5 },
- "nm": "Transform"
- }
- ],
- "nm": "汗",
- "np": 2,
- "cix": 2,
- "bm": 0,
- "ix": 1,
- "mn": "ADBE Vector Group",
- "hd": false
- }
- ],
- "ip": 0,
- "op": 569,
- "st": 0,
- "bm": 0
- },
- {
- "ddd": 0,
- "ind": 3,
- "ty": 4,
- "nm": "eye",
- "parent": 1,
- "sr": 1,
- "ks": {
- "o": { "a": 0, "k": 92, "ix": 11 },
- "r": { "a": 0, "k": 0, "ix": 10 },
- "p": { "a": 0, "k": [-7.064, -11.347, 0], "ix": 2 },
- "a": { "a": 0, "k": [0, 0, 0], "ix": 1 },
- "s": {
- "a": 1,
- "k": [
- {
- "i": {
- "x": [0.833, 0.833, 0.833],
- "y": [0.833, 0.833, 0.833]
- },
- "o": {
- "x": [0.167, 0.167, 0.167],
- "y": [0.167, 0.167, 0.167]
- },
- "t": 0,
- "s": [100, 100, 100]
- },
- {
- "i": {
- "x": [0.833, 0.833, 0.833],
- "y": [0.833, 0.833, 0.833]
- },
- "o": {
- "x": [0.167, 0.167, 0.167],
- "y": [0.167, 0.167, 0.167]
- },
- "t": 3,
- "s": [100, 20, 100]
- },
- {
- "i": {
- "x": [0.833, 0.833, 0.833],
- "y": [0.833, 0.833, 0.833]
- },
- "o": {
- "x": [0.167, 0.167, 0.167],
- "y": [0.167, 0.167, 0.167]
- },
- "t": 6,
- "s": [100, 100, 100]
- },
- {
- "i": {
- "x": [0.833, 0.833, 0.833],
- "y": [0.833, 0.833, 0.833]
- },
- "o": {
- "x": [0.167, 0.167, 0.167],
- "y": [0.167, 0.167, 0.167]
- },
- "t": 9,
- "s": [100, 20, 100]
- },
- {
- "i": {
- "x": [0.833, 0.833, 0.833],
- "y": [0.833, 0.833, 0.833]
- },
- "o": {
- "x": [0.167, 0.167, 0.167],
- "y": [0.167, 0.167, 0.167]
- },
- "t": 12,
- "s": [100, 100, 100]
- },
- {
- "i": {
- "x": [0.833, 0.833, 0.833],
- "y": [0.833, 0.833, 0.833]
- },
- "o": {
- "x": [0.167, 0.167, 0.167],
- "y": [0.167, 0.167, 0.167]
- },
- "t": 50,
- "s": [100, 100, 100]
- },
- {
- "i": {
- "x": [0.833, 0.833, 0.833],
- "y": [0.833, 0.833, 0.833]
- },
- "o": {
- "x": [0.167, 0.167, 0.167],
- "y": [0.167, 0.167, 0.167]
- },
- "t": 53,
- "s": [100, 20, 100]
- },
- { "t": 56, "s": [100, 100, 100] }
- ],
- "ix": 6
- }
- },
- "ao": 0,
- "shapes": [
- {
- "ty": "gr",
- "it": [
- {
- "d": 1,
- "ty": "el",
- "s": { "a": 0, "k": [8.466, 16.135], "ix": 2 },
- "p": { "a": 0, "k": [0, 0], "ix": 3 },
- "nm": "Ellipse Path 1",
- "mn": "ADBE Vector Shape - Ellipse",
- "hd": false
- },
- {
- "ty": "fl",
- "c": {
- "a": 0,
- "k": [
- 0.23529411764705882, 0.26666666666666666,
- 0.29411764705882354, 1
- ],
- "ix": 4
- },
- "o": { "a": 0, "k": 100, "ix": 5 },
- "r": 1,
- "bm": 0,
- "nm": "Fill 1",
- "mn": "ADBE Vector Graphic - Fill",
- "hd": false
- },
- {
- "ty": "tr",
- "p": { "a": 0, "k": [0, 0], "ix": 2 },
- "a": { "a": 0, "k": [0, 0], "ix": 1 },
- "s": { "a": 0, "k": [100, 100], "ix": 3 },
- "r": { "a": 0, "k": 0, "ix": 6 },
- "o": { "a": 0, "k": 100, "ix": 7 },
- "sk": { "a": 0, "k": 0, "ix": 4 },
- "sa": { "a": 0, "k": 0, "ix": 5 },
- "nm": "Transform"
- }
- ],
- "nm": "eye",
- "np": 2,
- "cix": 2,
- "bm": 0,
- "ix": 1,
- "mn": "ADBE Vector Group",
- "hd": false
- }
- ],
- "ip": 0,
- "op": 569,
- "st": 0,
- "bm": 0
- },
- {
- "ddd": 0,
- "ind": 4,
- "ty": 4,
- "nm": "eye",
- "parent": 1,
- "sr": 1,
- "ks": {
- "o": { "a": 0, "k": 92, "ix": 11 },
- "r": { "a": 0, "k": 0, "ix": 10 },
- "p": { "a": 0, "k": [-33.767, -11.347, 0], "ix": 2 },
- "a": { "a": 0, "k": [0, 0, 0], "ix": 1 },
- "s": {
- "a": 1,
- "k": [
- {
- "i": {
- "x": [0.833, 0.833, 0.833],
- "y": [0.833, 0.833, 0.833]
- },
- "o": {
- "x": [0.167, 0.167, 0.167],
- "y": [0.167, 0.167, 0.167]
- },
- "t": 0,
- "s": [100, 100, 100]
- },
- {
- "i": {
- "x": [0.833, 0.833, 0.833],
- "y": [0.833, 0.833, 0.833]
- },
- "o": {
- "x": [0.167, 0.167, 0.167],
- "y": [0.167, 0.167, 0.167]
- },
- "t": 3,
- "s": [100, 20, 100]
- },
- {
- "i": {
- "x": [0.833, 0.833, 0.833],
- "y": [0.833, 0.833, 0.833]
- },
- "o": {
- "x": [0.167, 0.167, 0.167],
- "y": [0.167, 0.167, 0.167]
- },
- "t": 6,
- "s": [100, 100, 100]
- },
- {
- "i": {
- "x": [0.833, 0.833, 0.833],
- "y": [0.833, 0.833, 0.833]
- },
- "o": {
- "x": [0.167, 0.167, 0.167],
- "y": [0.167, 0.167, 0.167]
- },
- "t": 9,
- "s": [100, 20, 100]
- },
- {
- "i": {
- "x": [0.833, 0.833, 0.833],
- "y": [0.833, 0.833, 0.833]
- },
- "o": {
- "x": [0.167, 0.167, 0.167],
- "y": [0.167, 0.167, 0.167]
- },
- "t": 12,
- "s": [100, 100, 100]
- },
- {
- "i": {
- "x": [0.833, 0.833, 0.833],
- "y": [0.833, 0.833, 0.833]
- },
- "o": {
- "x": [0.167, 0.167, 0.167],
- "y": [0.167, 0.167, 0.167]
- },
- "t": 50,
- "s": [100, 100, 100]
- },
- {
- "i": {
- "x": [0.833, 0.833, 0.833],
- "y": [0.833, 0.833, 0.833]
- },
- "o": {
- "x": [0.167, 0.167, 0.167],
- "y": [0.167, 0.167, 0.167]
- },
- "t": 53,
- "s": [100, 20, 100]
- },
- { "t": 56, "s": [100, 100, 100] }
- ],
- "ix": 6
- }
- },
- "ao": 0,
- "shapes": [
- {
- "ty": "gr",
- "it": [
- {
- "d": 1,
- "ty": "el",
- "s": { "a": 0, "k": [8.466, 16.135], "ix": 2 },
- "p": { "a": 0, "k": [0, 0], "ix": 3 },
- "nm": "Ellipse Path 1",
- "mn": "ADBE Vector Shape - Ellipse",
- "hd": false
- },
- {
- "ty": "fl",
- "c": {
- "a": 0,
- "k": [
- 0.23529411764705882, 0.26666666666666666,
- 0.29411764705882354, 1
- ],
- "ix": 4
- },
- "o": { "a": 0, "k": 100, "ix": 5 },
- "r": 1,
- "bm": 0,
- "nm": "Fill 1",
- "mn": "ADBE Vector Graphic - Fill",
- "hd": false
- },
- {
- "ty": "tr",
- "p": { "a": 0, "k": [0, 0], "ix": 2 },
- "a": { "a": 0, "k": [0, 0], "ix": 1 },
- "s": { "a": 0, "k": [100, 100], "ix": 3 },
- "r": { "a": 0, "k": 0, "ix": 6 },
- "o": { "a": 0, "k": 100, "ix": 7 },
- "sk": { "a": 0, "k": 0, "ix": 4 },
- "sa": { "a": 0, "k": 0, "ix": 5 },
- "nm": "Transform"
- }
- ],
- "nm": "eye",
- "np": 2,
- "cix": 2,
- "bm": 0,
- "ix": 1,
- "mn": "ADBE Vector Group",
- "hd": false
- }
- ],
- "ip": 0,
- "op": 569,
- "st": 0,
- "bm": 0
- },
- {
- "ddd": 0,
- "ind": 5,
- "ty": 0,
- "nm": "magnifier",
- "refId": "comp_1",
- "sr": 1,
- "ks": {
- "o": { "a": 0, "k": 100, "ix": 11 },
- "r": { "a": 0, "k": 0, "ix": 10 },
- "p": { "a": 0, "k": [213, 145, 0], "ix": 2 },
- "a": { "a": 0, "k": [213, 145, 0], "ix": 1 },
- "s": { "a": 0, "k": [100, 100, 100], "ix": 6 }
- },
- "ao": 0,
- "w": 426,
- "h": 290,
- "ip": 0,
- "op": 569,
- "st": 0,
- "bm": 0
- }
- ]
- },
- {
- "id": "comp_1",
- "layers": [
- {
- "ddd": 0,
- "ind": 1,
- "ty": 4,
- "nm": "Shape Layer 1",
- "sr": 1,
- "ks": {
- "o": { "a": 0, "k": 100, "ix": 11 },
- "r": { "a": 0, "k": 0, "ix": 10 },
- "p": { "a": 0, "k": [213, 145, 0], "ix": 2 },
- "a": { "a": 0, "k": [0, 0, 0], "ix": 1 },
- "s": { "a": 0, "k": [100, 100, 100], "ix": 6 }
- },
- "ao": 0,
- "shapes": [
- {
- "ty": "gr",
- "it": [
- {
- "ty": "st",
- "c": {
- "a": 0,
- "k": [
- 0.40784313725490196, 0.4627450980392157,
- 0.5176470588235295, 1
- ],
- "ix": 3
- },
- "o": { "a": 0, "k": 100, "ix": 4 },
- "w": { "a": 0, "k": 2, "ix": 5 },
- "lc": 1,
- "lj": 1,
- "ml": 4,
- "bm": 0,
- "nm": "Stroke 1",
- "mn": "ADBE Vector Graphic - Stroke",
- "hd": false
- },
- {
- "ty": "tr",
- "p": { "a": 0, "k": [0, 0], "ix": 2 },
- "a": { "a": 0, "k": [0, 0], "ix": 1 },
- "s": { "a": 0, "k": [100, 100], "ix": 3 },
- "r": { "a": 0, "k": 0, "ix": 6 },
- "o": { "a": 0, "k": 100, "ix": 7 },
- "sk": { "a": 0, "k": 0, "ix": 4 },
- "sa": { "a": 0, "k": 0, "ix": 5 },
- "nm": "Transform"
- }
- ],
- "nm": "Shape 1",
- "np": 2,
- "cix": 2,
- "bm": 0,
- "ix": 1,
- "mn": "ADBE Vector Group",
- "hd": false
- }
- ],
- "ip": 0,
- "op": 3600,
- "st": 0,
- "bm": 0
- },
- {
- "ddd": 0,
- "ind": 3,
- "ty": 4,
- "nm": "橢圓形",
- "sr": 1,
- "ks": {
- "o": { "a": 0, "k": 100, "ix": 11 },
- "r": { "a": 0, "k": -5, "ix": 10 },
- "p": { "a": 0, "k": [190.106, 142.222, 0], "ix": 2 },
- "a": { "a": 0, "k": [0, 0, 0], "ix": 1 },
- "s": { "a": 0, "k": [100, 100, 100], "ix": 6 }
- },
- "ao": 0,
- "shapes": [
- {
- "ty": "gr",
- "it": [
- {
- "d": 1,
- "ty": "el",
- "s": { "a": 0, "k": [99.994, 100.091], "ix": 2 },
- "p": { "a": 0, "k": [0, 0], "ix": 3 },
- "nm": "Ellipse Path 1",
- "mn": "ADBE Vector Shape - Ellipse",
- "hd": false
- },
- {
- "ty": "fl",
- "c": { "a": 0, "k": [1, 1, 1, 1], "ix": 4 },
- "o": { "a": 0, "k": 100, "ix": 5 },
- "r": 1,
- "bm": 0,
- "nm": "Fill 1",
- "mn": "ADBE Vector Graphic - Fill",
- "hd": false
- },
- {
- "ty": "tr",
- "p": { "a": 0, "k": [0, 0], "ix": 2 },
- "a": { "a": 0, "k": [0, 0], "ix": 1 },
- "s": { "a": 0, "k": [100, 100], "ix": 3 },
- "r": { "a": 0, "k": -40, "ix": 6 },
- "o": { "a": 0, "k": 100, "ix": 7 },
- "sk": { "a": 0, "k": 0, "ix": 4 },
- "sa": { "a": 0, "k": 0, "ix": 5 },
- "nm": "Transform"
- }
- ],
- "nm": "橢圓形",
- "np": 2,
- "cix": 2,
- "bm": 0,
- "ix": 1,
- "mn": "ADBE Vector Group",
- "hd": false
- }
- ],
- "ip": 0,
- "op": 3600,
- "st": 0,
- "bm": 0
- },
- {
- "ddd": 0,
- "ind": 4,
- "ty": 4,
- "nm": "橢圓形",
- "sr": 1,
- "ks": {
- "o": { "a": 0, "k": 100, "ix": 11 },
- "r": { "a": 0, "k": -5, "ix": 10 },
- "p": { "a": 0, "k": [192.013, 142.223, 0], "ix": 2 },
- "a": { "a": 0, "k": [0, 0, 0], "ix": 1 },
- "s": { "a": 0, "k": [100, 100, 100], "ix": 6 }
- },
- "ao": 0,
- "shapes": [
- {
- "ty": "gr",
- "it": [
- {
- "ind": 0,
- "ty": "sh",
- "ix": 1,
- "ks": {
- "a": 0,
- "k": {
- "i": [
- [-26.81, 22.62],
- [22.49, 26.96],
- [26.8, -22.62],
- [-22.5, -26.95]
- ],
- "o": [
- [26.81, -22.62],
- [-22.49, -26.96],
- [-26.81, 22.62],
- [22.49, 26.96]
- ],
- "v": [
- [40.727, 48.812],
- [48.537, -40.958],
- [-40.723, -48.808],
- [-48.533, 40.952]
- ],
- "c": true
- },
- "ix": 2
- },
- "nm": "Path 1",
- "mn": "ADBE Vector Shape - Group",
- "hd": false
- },
- {
- "ty": "fl",
- "c": {
- "a": 0,
- "k": [0.3764705882352941, 0.596078431372549, 1, 1],
- "ix": 4
- },
- "o": { "a": 0, "k": 100, "ix": 5 },
- "r": 1,
- "bm": 0,
- "nm": "Fill 1",
- "mn": "ADBE Vector Graphic - Fill",
- "hd": false
- },
- {
- "ty": "tr",
- "p": { "a": 0, "k": [0, 0], "ix": 2 },
- "a": { "a": 0, "k": [0, 0], "ix": 1 },
- "s": { "a": 0, "k": [100, 100], "ix": 3 },
- "r": { "a": 0, "k": 0, "ix": 6 },
- "o": { "a": 0, "k": 100, "ix": 7 },
- "sk": { "a": 0, "k": 0, "ix": 4 },
- "sa": { "a": 0, "k": 0, "ix": 5 },
- "nm": "Transform"
- }
- ],
- "nm": "橢圓形",
- "np": 2,
- "cix": 2,
- "bm": 0,
- "ix": 1,
- "mn": "ADBE Vector Group",
- "hd": false
- }
- ],
- "ip": 0,
- "op": 3600,
- "st": 0,
- "bm": 0
- },
- {
- "ddd": 0,
- "ind": 5,
- "ty": 4,
- "nm": "矩形",
- "sr": 1,
- "ks": {
- "o": { "a": 0, "k": 100, "ix": 11 },
- "r": { "a": 0, "k": -5, "ix": 10 },
- "p": { "a": 0, "k": [268.024, 226.941, 0], "ix": 2 },
- "a": { "a": 0, "k": [0, 0, 0], "ix": 1 },
- "s": { "a": 0, "k": [100, 100, 100], "ix": 6 }
- },
- "ao": 0,
- "shapes": [
- {
- "ty": "gr",
- "it": [
- {
- "ty": "rc",
- "d": 1,
- "s": { "a": 0, "k": [42.094, 74.507], "ix": 2 },
- "p": { "a": 0, "k": [0, 0], "ix": 3 },
- "r": { "a": 0, "k": 10, "ix": 4 },
- "nm": "Rectangle Path 1",
- "mn": "ADBE Vector Shape - Rect",
- "hd": false
- },
- {
- "ty": "fl",
- "c": {
- "a": 0,
- "k": [
- 0.2980392156862745, 0.49019607843137253,
- 0.8392156862745098, 1
- ],
- "ix": 4
- },
- "o": { "a": 0, "k": 100, "ix": 5 },
- "r": 1,
- "bm": 0,
- "nm": "Fill 1",
- "mn": "ADBE Vector Graphic - Fill",
- "hd": false
- },
- {
- "ty": "tr",
- "p": { "a": 0, "k": [0, 0], "ix": 2 },
- "a": { "a": 0, "k": [0, 0], "ix": 1 },
- "s": { "a": 0, "k": [100, 100], "ix": 3 },
- "r": { "a": 0, "k": -40, "ix": 6 },
- "o": { "a": 0, "k": 100, "ix": 7 },
- "sk": { "a": 0, "k": 0, "ix": 4 },
- "sa": { "a": 0, "k": 0, "ix": 5 },
- "nm": "Transform"
- }
- ],
- "nm": "矩形",
- "np": 2,
- "cix": 2,
- "bm": 0,
- "ix": 1,
- "mn": "ADBE Vector Group",
- "hd": false
- }
- ],
- "ip": 0,
- "op": 3600,
- "st": 0,
- "bm": 0
- },
- {
- "ddd": 0,
- "ind": 6,
- "ty": 4,
- "nm": "矩形",
- "sr": 1,
- "ks": {
- "o": { "a": 0, "k": 100, "ix": 11 },
- "r": { "a": 0, "k": -5, "ix": 10 },
- "p": { "a": 0, "k": [238.933, 197.25, 0], "ix": 2 },
- "a": { "a": 0, "k": [0, 0, 0], "ix": 1 },
- "s": { "a": 0, "k": [100, 100, 100], "ix": 6 }
- },
- "ao": 0,
- "shapes": [
- {
- "ty": "gr",
- "it": [
- {
- "ty": "rc",
- "d": 1,
- "s": { "a": 0, "k": [24.446, 44.702], "ix": 2 },
- "p": { "a": 0, "k": [0, 0], "ix": 3 },
- "r": { "a": 0, "k": 0, "ix": 4 },
- "nm": "Rectangle Path 1",
- "mn": "ADBE Vector Shape - Rect",
- "hd": false
- },
- {
- "ty": "fl",
- "c": {
- "a": 0,
- "k": [0.847000002861, 0.847000002861, 0.847000002861, 1],
- "ix": 4
- },
- "o": { "a": 0, "k": 100, "ix": 5 },
- "r": 1,
- "bm": 0,
- "nm": "Fill 1",
- "mn": "ADBE Vector Graphic - Fill",
- "hd": false
- },
- {
- "ty": "tr",
- "p": { "a": 0, "k": [0, 0], "ix": 2 },
- "a": { "a": 0, "k": [0, 0], "ix": 1 },
- "s": { "a": 0, "k": [100, 100], "ix": 3 },
- "r": { "a": 0, "k": -40, "ix": 6 },
- "o": { "a": 0, "k": 100, "ix": 7 },
- "sk": { "a": 0, "k": 0, "ix": 4 },
- "sa": { "a": 0, "k": 0, "ix": 5 },
- "nm": "Transform"
- }
- ],
- "nm": "矩形",
- "np": 2,
- "cix": 2,
- "bm": 0,
- "ix": 1,
- "mn": "ADBE Vector Group",
- "hd": false
- }
- ],
- "ip": 0,
- "op": 3600,
- "st": 0,
- "bm": 0
- }
- ]
- },
- {
- "id": "comp_2",
- "layers": [
- {
- "ddd": 0,
- "ind": 1,
- "ty": 4,
- "nm": "合併形狀",
- "sr": 1,
- "ks": {
- "o": { "a": 0, "k": 100, "ix": 11 },
- "r": {
- "a": 1,
- "k": [
- {
- "i": { "x": [0.833], "y": [0.833] },
- "o": { "x": [0.167], "y": [0.167] },
- "t": 60,
- "s": [0]
- },
- { "t": 265, "s": [360] }
- ],
- "ix": 10
- },
- "p": { "a": 0, "k": [208, 27, 0], "ix": 2 },
- "a": { "a": 0, "k": [0, 0, 0], "ix": 1 },
- "s": { "a": 0, "k": [100, 100, 100], "ix": 6 }
- },
- "ao": 0,
- "shapes": [
- {
- "ty": "gr",
- "it": [
- {
- "ty": "rc",
- "d": 1,
- "s": { "a": 0, "k": [16, 2], "ix": 2 },
- "p": { "a": 0, "k": [0, 0], "ix": 3 },
- "r": { "a": 0, "k": 0, "ix": 4 },
- "nm": "Rectangle Path 1",
- "mn": "ADBE Vector Shape - Rect",
- "hd": false
- },
- {
- "ty": "rc",
- "d": 1,
- "s": { "a": 0, "k": [2, 18], "ix": 2 },
- "p": { "a": 0, "k": [0, 0], "ix": 3 },
- "r": { "a": 0, "k": 0, "ix": 4 },
- "nm": "Rectangle Path 2",
- "mn": "ADBE Vector Shape - Rect",
- "hd": false
- },
- {
- "ty": "mm",
- "mm": 2,
- "nm": "Merge Paths 1",
- "mn": "ADBE Vector Filter - Merge",
- "hd": false
- },
- {
- "ty": "fl",
- "c": {
- "a": 0,
- "k": [0.796078026295, 0.835294008255, 0.843137025833, 1],
- "ix": 4
- },
- "o": { "a": 0, "k": 100, "ix": 5 },
- "r": 1,
- "bm": 0,
- "nm": "Fill 1",
- "mn": "ADBE Vector Graphic - Fill",
- "hd": false
- },
- {
- "ty": "tr",
- "p": { "a": 0, "k": [0, 0], "ix": 2 },
- "a": { "a": 0, "k": [0, 0], "ix": 1 },
- "s": { "a": 0, "k": [100, 100], "ix": 3 },
- "r": { "a": 0, "k": 0, "ix": 6 },
- "o": { "a": 0, "k": 100, "ix": 7 },
- "sk": { "a": 0, "k": 0, "ix": 4 },
- "sa": { "a": 0, "k": 0, "ix": 5 },
- "nm": "Transform"
- }
- ],
- "nm": "合併形狀",
- "np": 4,
- "cix": 2,
- "bm": 0,
- "ix": 1,
- "mn": "ADBE Vector Group",
- "hd": false
- }
- ],
- "ip": 0,
- "op": 3600,
- "st": 0,
- "bm": 0
- },
- {
- "ddd": 0,
- "ind": 2,
- "ty": 4,
- "nm": "合併形狀",
- "sr": 1,
- "ks": {
- "o": { "a": 0, "k": 100, "ix": 11 },
- "r": {
- "a": 1,
- "k": [
- {
- "i": { "x": [0.833], "y": [0.833] },
- "o": { "x": [0.167], "y": [0.167] },
- "t": 5,
- "s": [0]
- },
- { "t": 358, "s": [360] }
- ],
- "ix": 10
- },
- "p": { "a": 0, "k": [418, 107, 0], "ix": 2 },
- "a": { "a": 0, "k": [0, 0, 0], "ix": 1 },
- "s": { "a": 0, "k": [100, 100, 100], "ix": 6 }
- },
- "ao": 0,
- "shapes": [
- {
- "ty": "gr",
- "it": [
- {
- "ty": "rc",
- "d": 1,
- "s": { "a": 0, "k": [16, 2], "ix": 2 },
- "p": { "a": 0, "k": [0, 0], "ix": 3 },
- "r": { "a": 0, "k": 0, "ix": 4 },
- "nm": "Rectangle Path 1",
- "mn": "ADBE Vector Shape - Rect",
- "hd": false
- },
- {
- "ty": "rc",
- "d": 1,
- "s": { "a": 0, "k": [2, 18], "ix": 2 },
- "p": { "a": 0, "k": [0, 0], "ix": 3 },
- "r": { "a": 0, "k": 0, "ix": 4 },
- "nm": "Rectangle Path 2",
- "mn": "ADBE Vector Shape - Rect",
- "hd": false
- },
- {
- "ty": "mm",
- "mm": 2,
- "nm": "Merge Paths 1",
- "mn": "ADBE Vector Filter - Merge",
- "hd": false
- },
- {
- "ty": "fl",
- "c": {
- "a": 0,
- "k": [0.796078026295, 0.835294008255, 0.843137025833, 1],
- "ix": 4
- },
- "o": { "a": 0, "k": 100, "ix": 5 },
- "r": 1,
- "bm": 0,
- "nm": "Fill 1",
- "mn": "ADBE Vector Graphic - Fill",
- "hd": false
- },
- {
- "ty": "tr",
- "p": { "a": 0, "k": [0, 0], "ix": 2 },
- "a": { "a": 0, "k": [0, 0], "ix": 1 },
- "s": { "a": 0, "k": [100, 100], "ix": 3 },
- "r": { "a": 0, "k": 0, "ix": 6 },
- "o": { "a": 0, "k": 100, "ix": 7 },
- "sk": { "a": 0, "k": 0, "ix": 4 },
- "sa": { "a": 0, "k": 0, "ix": 5 },
- "nm": "Transform"
- }
- ],
- "nm": "合併形狀",
- "np": 4,
- "cix": 2,
- "bm": 0,
- "ix": 1,
- "mn": "ADBE Vector Group",
- "hd": false
- }
- ],
- "ip": 0,
- "op": 3600,
- "st": 0,
- "bm": 0
- },
- {
- "ddd": 0,
- "ind": 3,
- "ty": 4,
- "nm": "合併形狀",
- "sr": 1,
- "ks": {
- "o": { "a": 0, "k": 100, "ix": 11 },
- "r": {
- "a": 1,
- "k": [
- {
- "i": { "x": [0.833], "y": [0.833] },
- "o": { "x": [0.167], "y": [0.167] },
- "t": 5,
- "s": [0]
- },
- { "t": 281, "s": [360] }
- ],
- "ix": 10
- },
- "p": { "a": 0, "k": [31, 196, 0], "ix": 2 },
- "a": { "a": 0, "k": [0, 0, 0], "ix": 1 },
- "s": { "a": 0, "k": [100, 100, 100], "ix": 6 }
- },
- "ao": 0,
- "shapes": [
- {
- "ty": "gr",
- "it": [
- {
- "ty": "rc",
- "d": 1,
- "s": { "a": 0, "k": [16, 2], "ix": 2 },
- "p": { "a": 0, "k": [0, 0], "ix": 3 },
- "r": { "a": 0, "k": 0, "ix": 4 },
- "nm": "Rectangle Path 1",
- "mn": "ADBE Vector Shape - Rect",
- "hd": false
- },
- {
- "ty": "rc",
- "d": 1,
- "s": { "a": 0, "k": [2, 18], "ix": 2 },
- "p": { "a": 0, "k": [0, 0], "ix": 3 },
- "r": { "a": 0, "k": 0, "ix": 4 },
- "nm": "Rectangle Path 2",
- "mn": "ADBE Vector Shape - Rect",
- "hd": false
- },
- {
- "ty": "mm",
- "mm": 2,
- "nm": "Merge Paths 1",
- "mn": "ADBE Vector Filter - Merge",
- "hd": false
- },
- {
- "ty": "fl",
- "c": {
- "a": 0,
- "k": [0.796078026295, 0.835294008255, 0.843137025833, 1],
- "ix": 4
- },
- "o": { "a": 0, "k": 100, "ix": 5 },
- "r": 1,
- "bm": 0,
- "nm": "Fill 1",
- "mn": "ADBE Vector Graphic - Fill",
- "hd": false
- },
- {
- "ty": "tr",
- "p": { "a": 0, "k": [0, 0], "ix": 2 },
- "a": { "a": 0, "k": [0, 0], "ix": 1 },
- "s": { "a": 0, "k": [100, 100], "ix": 3 },
- "r": { "a": 0, "k": 0, "ix": 6 },
- "o": { "a": 0, "k": 100, "ix": 7 },
- "sk": { "a": 0, "k": 0, "ix": 4 },
- "sa": { "a": 0, "k": 0, "ix": 5 },
- "nm": "Transform"
- }
- ],
- "nm": "合併形狀",
- "np": 4,
- "cix": 2,
- "bm": 0,
- "ix": 1,
- "mn": "ADBE Vector Group",
- "hd": false
- }
- ],
- "ip": 0,
- "op": 3600,
- "st": 0,
- "bm": 0
- },
- {
- "ddd": 0,
- "ind": 4,
- "ty": 4,
- "nm": "橢圓形",
- "sr": 1,
- "ks": {
- "o": { "a": 0, "k": 100, "ix": 11 },
- "r": {
- "a": 1,
- "k": [
- {
- "i": { "x": [0.833], "y": [0.833] },
- "o": { "x": [0.167], "y": [0.167] },
- "t": 0,
- "s": [0]
- },
- { "t": 281, "s": [360] }
- ],
- "ix": 10
- },
- "p": { "a": 0, "k": [70, 33, 0], "ix": 2 },
- "a": { "a": 0, "k": [0, 0, 0], "ix": 1 },
- "s": { "a": 0, "k": [100, 100, 100], "ix": 6 }
- },
- "ao": 0,
- "shapes": [
- {
- "ty": "gr",
- "it": [
- {
- "d": 1,
- "ty": "el",
- "s": { "a": 0, "k": [24, 24], "ix": 2 },
- "p": { "a": 0, "k": [0, 0], "ix": 3 },
- "nm": "Ellipse Path 1",
- "mn": "ADBE Vector Shape - Ellipse",
- "hd": false
- },
- {
- "ty": "st",
- "c": {
- "a": 0,
- "k": [0.701960980892, 0.756862998009, 0.776471018791, 1],
- "ix": 3
- },
- "o": { "a": 0, "k": 100, "ix": 4 },
- "w": { "a": 0, "k": 2, "ix": 5 },
- "lc": 1,
- "lj": 1,
- "ml": 4,
- "bm": 0,
- "nm": "Stroke 1",
- "mn": "ADBE Vector Graphic - Stroke",
- "hd": false
- },
- {
- "ty": "tr",
- "p": { "a": 0, "k": [0, 0], "ix": 2 },
- "a": { "a": 0, "k": [0, 0], "ix": 1 },
- "s": { "a": 0, "k": [100, 100], "ix": 3 },
- "r": { "a": 0, "k": 0, "ix": 6 },
- "o": { "a": 0, "k": 100, "ix": 7 },
- "sk": { "a": 0, "k": 0, "ix": 4 },
- "sa": { "a": 0, "k": 0, "ix": 5 },
- "nm": "Transform"
- }
- ],
- "nm": "橢圓形",
- "np": 2,
- "cix": 2,
- "bm": 0,
- "ix": 1,
- "mn": "ADBE Vector Group",
- "hd": false
- }
- ],
- "ip": 0,
- "op": 3600,
- "st": 0,
- "bm": 0
- }
- ]
- },
- {
- "id": "comp_3",
- "layers": [
- {
- "ddd": 0,
- "ind": 1,
- "ty": 4,
- "nm": "橢圓形",
- "sr": 1,
- "ks": {
- "o": { "a": 0, "k": 100, "ix": 11 },
- "r": { "a": 0, "k": 0, "ix": 10 },
- "p": { "a": 0, "k": [306, 9, 0], "ix": 2 },
- "a": { "a": 0, "k": [0, 0, 0], "ix": 1 },
- "s": { "a": 0, "k": [100, 100, 100], "ix": 6 }
- },
- "ao": 0,
- "shapes": [
- {
- "ty": "gr",
- "it": [
- {
- "d": 1,
- "ty": "el",
- "s": { "a": 0, "k": [16, 16], "ix": 2 },
- "p": { "a": 0, "k": [0, 0], "ix": 3 },
- "nm": "Ellipse Path 1",
- "mn": "ADBE Vector Shape - Ellipse",
- "hd": false
- },
- {
- "ty": "st",
- "c": {
- "a": 0,
- "k": [0.701960980892, 0.756862998009, 0.776471018791, 1],
- "ix": 3
- },
- "o": { "a": 0, "k": 100, "ix": 4 },
- "w": { "a": 0, "k": 2, "ix": 5 },
- "lc": 1,
- "lj": 1,
- "ml": 4,
- "bm": 0,
- "nm": "Stroke 1",
- "mn": "ADBE Vector Graphic - Stroke",
- "hd": false
- },
- {
- "ty": "tr",
- "p": { "a": 0, "k": [0, 0], "ix": 2 },
- "a": { "a": 0, "k": [0, 0], "ix": 1 },
- "s": { "a": 0, "k": [100, 100], "ix": 3 },
- "r": { "a": 0, "k": 0, "ix": 6 },
- "o": { "a": 0, "k": 100, "ix": 7 },
- "sk": { "a": 0, "k": 0, "ix": 4 },
- "sa": { "a": 0, "k": 0, "ix": 5 },
- "nm": "Transform"
- }
- ],
- "nm": "橢圓形",
- "np": 2,
- "cix": 2,
- "bm": 0,
- "ix": 1,
- "mn": "ADBE Vector Group",
- "hd": false
- }
- ],
- "ip": 0,
- "op": 3600,
- "st": 0,
- "bm": 0
- },
- {
- "ddd": 0,
- "ind": 2,
- "ty": 4,
- "nm": "橢圓形",
- "sr": 1,
- "ks": {
- "o": { "a": 0, "k": 100, "ix": 11 },
- "r": { "a": 0, "k": 0, "ix": 10 },
- "p": { "a": 0, "k": [376, 179, 0], "ix": 2 },
- "a": { "a": 0, "k": [0, 0, 0], "ix": 1 },
- "s": { "a": 0, "k": [100, 100, 100], "ix": 6 }
- },
- "ao": 0,
- "shapes": [
- {
- "ty": "gr",
- "it": [
- {
- "d": 1,
- "ty": "el",
- "s": { "a": 0, "k": [16, 16], "ix": 2 },
- "p": { "a": 0, "k": [0, 0], "ix": 3 },
- "nm": "Ellipse Path 1",
- "mn": "ADBE Vector Shape - Ellipse",
- "hd": false
- },
- {
- "ty": "fl",
- "c": {
- "a": 0,
- "k": [0.701960980892, 0.768626987934, 0.776471018791, 1],
- "ix": 4
- },
- "o": { "a": 0, "k": 100, "ix": 5 },
- "r": 1,
- "bm": 0,
- "nm": "Fill 1",
- "mn": "ADBE Vector Graphic - Fill",
- "hd": false
- },
- {
- "ty": "tr",
- "p": { "a": 0, "k": [0, 0], "ix": 2 },
- "a": { "a": 0, "k": [0, 0], "ix": 1 },
- "s": { "a": 0, "k": [100, 100], "ix": 3 },
- "r": { "a": 0, "k": 0, "ix": 6 },
- "o": { "a": 0, "k": 100, "ix": 7 },
- "sk": { "a": 0, "k": 0, "ix": 4 },
- "sa": { "a": 0, "k": 0, "ix": 5 },
- "nm": "Transform"
- }
- ],
- "nm": "橢圓形",
- "np": 2,
- "cix": 2,
- "bm": 0,
- "ix": 1,
- "mn": "ADBE Vector Group",
- "hd": false
- }
- ],
- "ip": 0,
- "op": 3600,
- "st": 0,
- "bm": 0
- },
- {
- "ddd": 0,
- "ind": 3,
- "ty": 4,
- "nm": "橢圓形",
- "sr": 1,
- "ks": {
- "o": { "a": 0, "k": 100, "ix": 11 },
- "r": { "a": 0, "k": 0, "ix": 10 },
- "p": { "a": 0, "k": [8, 115, 0], "ix": 2 },
- "a": { "a": 0, "k": [0, 0, 0], "ix": 1 },
- "s": { "a": 0, "k": [100, 100, 100], "ix": 6 }
- },
- "ao": 0,
- "shapes": [
- {
- "ty": "gr",
- "it": [
- {
- "d": 1,
- "ty": "el",
- "s": { "a": 0, "k": [16, 16], "ix": 2 },
- "p": { "a": 0, "k": [0, 0], "ix": 3 },
- "nm": "Ellipse Path 1",
- "mn": "ADBE Vector Shape - Ellipse",
- "hd": false
- },
- {
- "ty": "fl",
- "c": {
- "a": 0,
- "k": [0.701960980892, 0.768626987934, 0.776471018791, 1],
- "ix": 4
- },
- "o": { "a": 0, "k": 100, "ix": 5 },
- "r": 1,
- "bm": 0,
- "nm": "Fill 1",
- "mn": "ADBE Vector Graphic - Fill",
- "hd": false
- },
- {
- "ty": "tr",
- "p": { "a": 0, "k": [0, 0], "ix": 2 },
- "a": { "a": 0, "k": [0, 0], "ix": 1 },
- "s": { "a": 0, "k": [100, 100], "ix": 3 },
- "r": { "a": 0, "k": 0, "ix": 6 },
- "o": { "a": 0, "k": 100, "ix": 7 },
- "sk": { "a": 0, "k": 0, "ix": 4 },
- "sa": { "a": 0, "k": 0, "ix": 5 },
- "nm": "Transform"
- }
- ],
- "nm": "橢圓形",
- "np": 2,
- "cix": 2,
- "bm": 0,
- "ix": 1,
- "mn": "ADBE Vector Group",
- "hd": false
- }
- ],
- "ip": 0,
- "op": 3600,
- "st": 0,
- "bm": 0
- }
- ]
- }
- ],
- "layers": [
- {
- "ddd": 0,
- "ind": 1,
- "ty": 4,
- "nm": "shadow",
- "sr": 1,
- "ks": {
- "o": { "a": 0, "k": 100, "ix": 11 },
- "r": { "a": 0, "k": 0, "ix": 10 },
- "p": { "a": 0, "k": [191, 145, 0], "ix": 2 },
- "a": { "a": 0, "k": [0, 0, 0], "ix": 1 },
- "s": {
- "a": 1,
- "k": [
- {
- "i": { "x": [0.833, 0.833, 0.833], "y": [0.833, 0.833, 0.833] },
- "o": { "x": [0.167, 0.167, 0.167], "y": [0.167, 0.167, 0.167] },
- "t": 0,
- "s": [70, 100, 100]
- },
- {
- "i": { "x": [0.833, 0.833, 0.833], "y": [0.833, 0.833, 0.833] },
- "o": { "x": [0.167, 0.167, 0.167], "y": [0.167, 0.167, 0.167] },
- "t": 30,
- "s": [50, 100, 100]
- },
- {
- "i": { "x": [0.833, 0.833, 0.833], "y": [0.833, 0.833, 0.833] },
- "o": { "x": [0.167, 0.167, 0.167], "y": [0.167, 0.167, 0.167] },
- "t": 60,
- "s": [70, 100, 100]
- },
- {
- "i": { "x": [0.833, 0.833, 0.833], "y": [0.833, 0.833, 0.833] },
- "o": { "x": [0.167, 0.167, 0.167], "y": [0.167, 0.167, 0.167] },
- "t": 90,
- "s": [50, 100, 100]
- },
- {
- "i": { "x": [0.833, 0.833, 0.833], "y": [0.833, 0.833, 0.833] },
- "o": { "x": [0.167, 0.167, 0.167], "y": [0.167, 0.167, 0.167] },
- "t": 120,
- "s": [70, 100, 100]
- },
- {
- "i": { "x": [0.833, 0.833, 0.833], "y": [0.833, 0.833, 0.833] },
- "o": { "x": [0.167, 0.167, 0.167], "y": [0.167, 0.167, 0.167] },
- "t": 150,
- "s": [50, 100, 100]
- },
- {
- "i": { "x": [0.833, 0.833, 0.833], "y": [0.833, 0.833, 0.833] },
- "o": { "x": [0.167, 0.167, 0.167], "y": [0.167, 0.167, 0.167] },
- "t": 180,
- "s": [70, 100, 100]
- },
- {
- "i": { "x": [0.833, 0.833, 0.833], "y": [0.833, 0.833, 0.833] },
- "o": { "x": [0.167, 0.167, 0.167], "y": [0.167, 0.167, 0.167] },
- "t": 210,
- "s": [50, 100, 100]
- },
- {
- "i": { "x": [0.833, 0.833, 0.833], "y": [0.833, 0.833, 0.833] },
- "o": { "x": [0.167, 0.167, 0.167], "y": [0.167, 0.167, 0.167] },
- "t": 240,
- "s": [70, 100, 100]
- },
- {
- "i": { "x": [0.833, 0.833, 0.833], "y": [0.833, 0.833, 0.833] },
- "o": { "x": [0.167, 0.167, 0.167], "y": [0.167, 0.167, 0.167] },
- "t": 270,
- "s": [50, 100, 100]
- },
- { "t": 295, "s": [70, 100, 100] }
- ],
- "ix": 6
- }
- },
- "ao": 0,
- "shapes": [
- {
- "ty": "gr",
- "it": [
- {
- "d": 1,
- "ty": "el",
- "s": { "a": 0, "k": [56.697, 6.631], "ix": 2 },
- "p": { "a": 0, "k": [0, 0], "ix": 3 },
- "nm": "Ellipse Path 1",
- "mn": "ADBE Vector Shape - Ellipse",
- "hd": false
- },
- {
- "ty": "fl",
- "c": {
- "a": 0,
- "k": [0.848757874732, 0.861812935623, 0.876608455882, 1],
- "ix": 4
- },
- "o": { "a": 0, "k": 100, "ix": 5 },
- "r": 1,
- "bm": 0,
- "nm": "Fill 1",
- "mn": "ADBE Vector Graphic - Fill",
- "hd": false
- },
- {
- "ty": "tr",
- "p": { "a": 0, "k": [-9.651, 124.815], "ix": 2 },
- "a": { "a": 0, "k": [0, 0], "ix": 1 },
- "s": { "a": 0, "k": [100, 100], "ix": 3 },
- "r": { "a": 0, "k": 0, "ix": 6 },
- "o": { "a": 0, "k": 100, "ix": 7 },
- "sk": { "a": 0, "k": 0, "ix": 4 },
- "sa": { "a": 0, "k": 0, "ix": 5 },
- "nm": "Transform"
- }
- ],
- "nm": "Ellipse 1",
- "np": 3,
- "cix": 2,
- "bm": 0,
- "ix": 1,
- "mn": "ADBE Vector Group",
- "hd": false
- }
- ],
- "ip": 0,
- "op": 300,
- "st": 0,
- "bm": 0
- },
- {
- "ddd": 0,
- "ind": 2,
- "ty": 0,
- "nm": "main",
- "refId": "comp_0",
- "sr": 1,
- "ks": {
- "o": { "a": 0, "k": 100, "ix": 11 },
- "r": { "a": 0, "k": 0, "ix": 10 },
- "p": {
- "a": 1,
- "k": [
- {
- "i": { "x": 0.833, "y": 0.833 },
- "o": { "x": 0.167, "y": 0.167 },
- "t": 0,
- "s": [213, 145, 0],
- "to": [0, 0.833, 0],
- "ti": [0, 0, 0]
- },
- {
- "i": { "x": 0.833, "y": 0.833 },
- "o": { "x": 0.167, "y": 0.167 },
- "t": 30,
- "s": [213, 150, 0],
- "to": [0, 0, 0],
- "ti": [0, 0, 0]
- },
- {
- "i": { "x": 0.833, "y": 0.833 },
- "o": { "x": 0.167, "y": 0.167 },
- "t": 60,
- "s": [213, 145, 0],
- "to": [0, 0, 0],
- "ti": [0, 0, 0]
- },
- {
- "i": { "x": 0.833, "y": 0.833 },
- "o": { "x": 0.167, "y": 0.167 },
- "t": 90,
- "s": [213, 150, 0],
- "to": [0, 0, 0],
- "ti": [0, 0, 0]
- },
- {
- "i": { "x": 0.833, "y": 0.833 },
- "o": { "x": 0.167, "y": 0.167 },
- "t": 120,
- "s": [213, 145, 0],
- "to": [0, 0, 0],
- "ti": [0, 0, 0]
- },
- {
- "i": { "x": 0.833, "y": 0.833 },
- "o": { "x": 0.167, "y": 0.167 },
- "t": 150,
- "s": [213, 150, 0],
- "to": [0, 0, 0],
- "ti": [0, 0, 0]
- },
- {
- "i": { "x": 0.833, "y": 0.833 },
- "o": { "x": 0.167, "y": 0.167 },
- "t": 180,
- "s": [213, 145, 0],
- "to": [0, 0, 0],
- "ti": [0, 0, 0]
- },
- {
- "i": { "x": 0.833, "y": 0.833 },
- "o": { "x": 0.167, "y": 0.167 },
- "t": 210,
- "s": [213, 150, 0],
- "to": [0, 0, 0],
- "ti": [0, 0, 0]
- },
- {
- "i": { "x": 0.833, "y": 0.833 },
- "o": { "x": 0.167, "y": 0.167 },
- "t": 240,
- "s": [213, 145, 0],
- "to": [0, 0, 0],
- "ti": [0, -0.833, 0]
- },
- { "t": 270, "s": [213, 150, 0] }
- ],
- "ix": 2
- },
- "a": { "a": 0, "k": [213, 145, 0], "ix": 1 },
- "s": { "a": 0, "k": [100, 100, 100], "ix": 6 }
- },
- "ao": 0,
- "w": 426,
- "h": 290,
- "ip": 0,
- "op": 3600,
- "st": 0,
- "bm": 0
- },
- {
- "ddd": 0,
- "ind": 3,
- "ty": 0,
- "nm": "decoration1",
- "refId": "comp_2",
- "sr": 1,
- "ks": {
- "o": {
- "a": 1,
- "k": [
- {
- "i": { "x": [0.981], "y": [1.128] },
- "o": { "x": [0.39], "y": [0.019] },
- "t": 8,
- "s": [0]
- },
- {
- "i": { "x": [0.833], "y": [1] },
- "o": { "x": [0.167], "y": [0] },
- "t": 40,
- "s": [100]
- },
- {
- "i": { "x": [0.833], "y": [1] },
- "o": { "x": [0.167], "y": [0] },
- "t": 72,
- "s": [80]
- },
- { "t": 73, "s": [100] }
- ],
- "ix": 11
- },
- "r": { "a": 0, "k": 0, "ix": 10 },
- "p": { "a": 0, "k": [213, 289, 0], "ix": 2 },
- "a": { "a": 0, "k": [213, 289, 0], "ix": 1 },
- "s": {
- "a": 1,
- "k": [
- {
- "i": { "x": [0.833, 0.833, 0.667], "y": [0.866, 0.866, 1] },
- "o": { "x": [0.37, 0.37, 0.333], "y": [-0.029, -0.029, 0] },
- "t": 0,
- "s": [0, 0, 100]
- },
- {
- "i": { "x": [0.833, 0.833, 0.833], "y": [1, 1, 1] },
- "o": { "x": [0.333, 0.333, 0.333], "y": [0, 0, 0] },
- "t": 40,
- "s": [100, 100, 100]
- },
- {
- "i": { "x": [0.833, 0.833, 0.833], "y": [1, 1, 1] },
- "o": { "x": [0.167, 0.167, 0.167], "y": [0, 0, 0] },
- "t": 72,
- "s": [80, 80, 100]
- },
- { "t": 133, "s": [90, 90, 100] }
- ],
- "ix": 6
- }
- },
- "ao": 0,
- "w": 426,
- "h": 290,
- "ip": 0,
- "op": 569,
- "st": 0,
- "bm": 0
- },
- {
- "ddd": 0,
- "ind": 4,
- "ty": 0,
- "nm": "decoratio2",
- "refId": "comp_3",
- "sr": 1,
- "ks": {
- "o": {
- "a": 1,
- "k": [
- {
- "i": { "x": [0.833], "y": [0.833] },
- "o": { "x": [0.167], "y": [0.167] },
- "t": 0,
- "s": [0]
- },
- {
- "i": { "x": [0.833], "y": [0.833] },
- "o": { "x": [0.167], "y": [0.167] },
- "t": 41,
- "s": [100]
- },
- { "t": 72, "s": [100] }
- ],
- "ix": 11
- },
- "r": { "a": 0, "k": 0, "ix": 10 },
- "p": { "a": 0, "k": [211, 291, 0], "ix": 2 },
- "a": { "a": 0, "k": [211, 291, 0], "ix": 1 },
- "s": {
- "a": 1,
- "k": [
- {
- "i": { "x": [0.833, 0.833, 0.833], "y": [0.833, 0.833, 0.833] },
- "o": { "x": [0.167, 0.167, 0.167], "y": [0.167, 0.167, 0.167] },
- "t": 0,
- "s": [0, 0, 100]
- },
- {
- "i": { "x": [0.833, 0.833, 0.833], "y": [0.833, 0.833, 0.833] },
- "o": { "x": [0.167, 0.167, 0.167], "y": [0.167, 0.167, 0.167] },
- "t": 43,
- "s": [99.442, 99.442, 100]
- },
- {
- "i": { "x": [0.833, 0.833, 0.833], "y": [0.833, 0.833, 0.833] },
- "o": { "x": [0.167, 0.167, 0.167], "y": [0.167, 0.167, 0.167] },
- "t": 72,
- "s": [84.442, 84.442, 100]
- },
- { "t": 133, "s": [90, 90, 100] }
- ],
- "ix": 6
- }
- },
- "ao": 0,
- "w": 426,
- "h": 290,
- "ip": 0,
- "op": 569,
- "st": 0,
- "bm": 0
- }
- ],
- "markers": [
- { "tm": 180, "cm": "1", "dr": 0 },
- { "tm": 3600, "cm": "2", "dr": 0 }
- ]
-}
diff --git a/apps/dashboard/src/modals/AddClient.tsx b/apps/dashboard/src/modals/AddClient.tsx
index 15a2015a8..318ba53c1 100644
--- a/apps/dashboard/src/modals/AddClient.tsx
+++ b/apps/dashboard/src/modals/AddClient.tsx
@@ -1,6 +1,5 @@
'use client';
-import { api, handleError } from '@/app/_trpc/client';
import { CreateClientSuccess } from '@/components/clients/create-client-success';
import { Button, buttonVariants } from '@/components/ui/button';
import { Combobox } from '@/components/ui/combobox';
@@ -9,6 +8,7 @@ import { Input } from '@/components/ui/input';
import { Label } from '@/components/ui/label';
import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/components/ui/tabs';
import { useAppParams } from '@/hooks/useAppParams';
+import { api, handleError } from '@/trpc/client';
import { cn } from '@/utils/cn';
import { zodResolver } from '@hookform/resolvers/zod';
import { SaveIcon, WallpaperIcon } from 'lucide-react';
diff --git a/apps/dashboard/src/modals/AddDashboard.tsx b/apps/dashboard/src/modals/AddDashboard.tsx
index 64f8059a0..99e60b806 100644
--- a/apps/dashboard/src/modals/AddDashboard.tsx
+++ b/apps/dashboard/src/modals/AddDashboard.tsx
@@ -1,10 +1,10 @@
'use client';
-import { api, handleError } from '@/app/_trpc/client';
import { ButtonContainer } from '@/components/button-container';
import { InputWithLabel } from '@/components/forms/input-with-label';
import { Button } from '@/components/ui/button';
import { useAppParams } from '@/hooks/useAppParams';
+import { api, handleError } from '@/trpc/client';
import { zodResolver } from '@hookform/resolvers/zod';
import { useRouter } from 'next/navigation';
import { useForm } from 'react-hook-form';
diff --git a/apps/dashboard/src/modals/AddProject.tsx b/apps/dashboard/src/modals/AddProject.tsx
index 6032cc033..380903075 100644
--- a/apps/dashboard/src/modals/AddProject.tsx
+++ b/apps/dashboard/src/modals/AddProject.tsx
@@ -1,9 +1,9 @@
'use client';
-import { api, handleError } from '@/app/_trpc/client';
import { ButtonContainer } from '@/components/button-container';
import { InputWithLabel } from '@/components/forms/input-with-label';
import { Button } from '@/components/ui/button';
+import { api, handleError } from '@/trpc/client';
import { zodResolver } from '@hookform/resolvers/zod';
import { useRouter } from 'next/navigation';
import { useForm } from 'react-hook-form';
diff --git a/apps/dashboard/src/modals/AddReference.tsx b/apps/dashboard/src/modals/AddReference.tsx
index 833f0d909..853d6faff 100644
--- a/apps/dashboard/src/modals/AddReference.tsx
+++ b/apps/dashboard/src/modals/AddReference.tsx
@@ -1,11 +1,11 @@
'use client';
-import { api, handleError } from '@/app/_trpc/client';
import { ButtonContainer } from '@/components/button-container';
import { InputWithLabel } from '@/components/forms/input-with-label';
import { Button } from '@/components/ui/button';
import { Calendar } from '@/components/ui/calendar';
import { useAppParams } from '@/hooks/useAppParams';
+import { api, handleError } from '@/trpc/client';
import { zodResolver } from '@hookform/resolvers/zod';
import { useRouter } from 'next/navigation';
import { Controller, useForm } from 'react-hook-form';
diff --git a/apps/dashboard/src/modals/EditClient.tsx b/apps/dashboard/src/modals/EditClient.tsx
index 962a4696d..68582f246 100644
--- a/apps/dashboard/src/modals/EditClient.tsx
+++ b/apps/dashboard/src/modals/EditClient.tsx
@@ -1,9 +1,9 @@
'use client';
-import { api, handleError } from '@/app/_trpc/client';
import { ButtonContainer } from '@/components/button-container';
import { InputWithLabel } from '@/components/forms/input-with-label';
import { Button } from '@/components/ui/button';
+import { api, handleError } from '@/trpc/client';
import { zodResolver } from '@hookform/resolvers/zod';
import { useRouter } from 'next/navigation';
import { useForm } from 'react-hook-form';
diff --git a/apps/dashboard/src/modals/EditDashboard.tsx b/apps/dashboard/src/modals/EditDashboard.tsx
index a9b1e424b..9d25ef2e1 100644
--- a/apps/dashboard/src/modals/EditDashboard.tsx
+++ b/apps/dashboard/src/modals/EditDashboard.tsx
@@ -1,9 +1,9 @@
'use client';
-import { api, handleError } from '@/app/_trpc/client';
import { ButtonContainer } from '@/components/button-container';
import { InputWithLabel } from '@/components/forms/input-with-label';
import { Button } from '@/components/ui/button';
+import { api, handleError } from '@/trpc/client';
import { zodResolver } from '@hookform/resolvers/zod';
import { useRouter } from 'next/navigation';
import { useForm } from 'react-hook-form';
diff --git a/apps/dashboard/src/modals/EditProject.tsx b/apps/dashboard/src/modals/EditProject.tsx
index e148a67a7..38a1920c3 100644
--- a/apps/dashboard/src/modals/EditProject.tsx
+++ b/apps/dashboard/src/modals/EditProject.tsx
@@ -1,9 +1,9 @@
'use client';
-import { api, handleError } from '@/app/_trpc/client';
import { ButtonContainer } from '@/components/button-container';
import { InputWithLabel } from '@/components/forms/input-with-label';
import { Button } from '@/components/ui/button';
+import { api, handleError } from '@/trpc/client';
import { zodResolver } from '@hookform/resolvers/zod';
import { useRouter } from 'next/navigation';
import { useForm } from 'react-hook-form';
diff --git a/apps/dashboard/src/modals/SaveReport.tsx b/apps/dashboard/src/modals/SaveReport.tsx
index b1ca490f1..cacbc8146 100644
--- a/apps/dashboard/src/modals/SaveReport.tsx
+++ b/apps/dashboard/src/modals/SaveReport.tsx
@@ -1,12 +1,12 @@
'use client';
-import { api, handleError } from '@/app/_trpc/client';
import { ButtonContainer } from '@/components/button-container';
import { InputWithLabel } from '@/components/forms/input-with-label';
import { Button } from '@/components/ui/button';
import { Combobox } from '@/components/ui/combobox';
import { Label } from '@/components/ui/label';
import { useAppParams } from '@/hooks/useAppParams';
+import { api, handleError } from '@/trpc/client';
import { zodResolver } from '@hookform/resolvers/zod';
import { useRouter, useSearchParams } from 'next/navigation';
import { Controller, useForm } from 'react-hook-form';
diff --git a/apps/dashboard/src/modals/ShareOverviewModal.tsx b/apps/dashboard/src/modals/ShareOverviewModal.tsx
index 789db6087..bba3fa3ba 100644
--- a/apps/dashboard/src/modals/ShareOverviewModal.tsx
+++ b/apps/dashboard/src/modals/ShareOverviewModal.tsx
@@ -1,11 +1,11 @@
'use client';
-import { api, handleError } from '@/app/_trpc/client';
import { ButtonContainer } from '@/components/button-container';
import { InputWithLabel } from '@/components/forms/input-with-label';
import { Button } from '@/components/ui/button';
import { Checkbox } from '@/components/ui/checkbox';
import { useAppParams } from '@/hooks/useAppParams';
+import { api, handleError } from '@/trpc/client';
import { zodResolver } from '@hookform/resolvers/zod';
import { useRouter } from 'next/navigation';
import { Controller, useForm } from 'react-hook-form';
diff --git a/apps/dashboard/src/server/api/root.ts b/apps/dashboard/src/trpc/api/root.ts
similarity index 95%
rename from apps/dashboard/src/server/api/root.ts
rename to apps/dashboard/src/trpc/api/root.ts
index 17fecfc41..30a5907dd 100644
--- a/apps/dashboard/src/server/api/root.ts
+++ b/apps/dashboard/src/trpc/api/root.ts
@@ -1,4 +1,4 @@
-import { createTRPCRouter } from '@/server/api/trpc';
+import { createTRPCRouter } from '@/trpc/api/trpc';
import { chartRouter } from './routers/chart';
import { clientRouter } from './routers/client';
diff --git a/apps/dashboard/src/server/api/routers/chart.helpers.ts b/apps/dashboard/src/trpc/api/routers/chart.helpers.ts
similarity index 100%
rename from apps/dashboard/src/server/api/routers/chart.helpers.ts
rename to apps/dashboard/src/trpc/api/routers/chart.helpers.ts
diff --git a/apps/dashboard/src/server/api/routers/chart.ts b/apps/dashboard/src/trpc/api/routers/chart.ts
similarity index 99%
rename from apps/dashboard/src/server/api/routers/chart.ts
rename to apps/dashboard/src/trpc/api/routers/chart.ts
index 20be96e70..5177b1a8d 100644
--- a/apps/dashboard/src/server/api/routers/chart.ts
+++ b/apps/dashboard/src/trpc/api/routers/chart.ts
@@ -2,7 +2,7 @@ import {
createTRPCRouter,
protectedProcedure,
publicProcedure,
-} from '@/server/api/trpc';
+} from '@/trpc/api/trpc';
import { average, max, min, round, sum } from '@/utils/math';
import { flatten, map, pipe, prop, sort, uniq } from 'ramda';
import { z } from 'zod';
diff --git a/apps/dashboard/src/server/api/routers/client.ts b/apps/dashboard/src/trpc/api/routers/client.ts
similarity index 96%
rename from apps/dashboard/src/server/api/routers/client.ts
rename to apps/dashboard/src/trpc/api/routers/client.ts
index f88b1a193..a6981a409 100644
--- a/apps/dashboard/src/server/api/routers/client.ts
+++ b/apps/dashboard/src/trpc/api/routers/client.ts
@@ -1,5 +1,5 @@
import { randomUUID } from 'crypto';
-import { createTRPCRouter, protectedProcedure } from '@/server/api/trpc';
+import { createTRPCRouter, protectedProcedure } from '@/trpc/api/trpc';
import { z } from 'zod';
import { hashPassword, stripTrailingSlash } from '@openpanel/common';
diff --git a/apps/dashboard/src/server/api/routers/dashboard.ts b/apps/dashboard/src/trpc/api/routers/dashboard.ts
similarity index 96%
rename from apps/dashboard/src/server/api/routers/dashboard.ts
rename to apps/dashboard/src/trpc/api/routers/dashboard.ts
index cf8754074..bef7ceb36 100644
--- a/apps/dashboard/src/server/api/routers/dashboard.ts
+++ b/apps/dashboard/src/trpc/api/routers/dashboard.ts
@@ -1,4 +1,4 @@
-import { createTRPCRouter, protectedProcedure } from '@/server/api/trpc';
+import { createTRPCRouter, protectedProcedure } from '@/trpc/api/trpc';
import { getId } from '@/utils/getDbId';
import { PrismaError } from 'prisma-error-enum';
import { z } from 'zod';
diff --git a/apps/dashboard/src/server/api/routers/event.ts b/apps/dashboard/src/trpc/api/routers/event.ts
similarity index 90%
rename from apps/dashboard/src/server/api/routers/event.ts
rename to apps/dashboard/src/trpc/api/routers/event.ts
index 69a8f7eb5..b0a665dc4 100644
--- a/apps/dashboard/src/server/api/routers/event.ts
+++ b/apps/dashboard/src/trpc/api/routers/event.ts
@@ -1,4 +1,4 @@
-import { createTRPCRouter, protectedProcedure } from '@/server/api/trpc';
+import { createTRPCRouter, protectedProcedure } from '@/trpc/api/trpc';
import { z } from 'zod';
import { db } from '@openpanel/db';
diff --git a/apps/dashboard/src/server/api/routers/onboarding.ts b/apps/dashboard/src/trpc/api/routers/onboarding.ts
similarity index 95%
rename from apps/dashboard/src/server/api/routers/onboarding.ts
rename to apps/dashboard/src/trpc/api/routers/onboarding.ts
index 9da3096dd..28ecc684f 100644
--- a/apps/dashboard/src/server/api/routers/onboarding.ts
+++ b/apps/dashboard/src/trpc/api/routers/onboarding.ts
@@ -1,5 +1,5 @@
import { randomUUID } from 'crypto';
-import { createTRPCRouter, protectedProcedure } from '@/server/api/trpc';
+import { createTRPCRouter, protectedProcedure } from '@/trpc/api/trpc';
import { clerkClient } from '@clerk/nextjs';
import { z } from 'zod';
diff --git a/apps/dashboard/src/server/api/routers/organization.ts b/apps/dashboard/src/trpc/api/routers/organization.ts
similarity index 97%
rename from apps/dashboard/src/server/api/routers/organization.ts
rename to apps/dashboard/src/trpc/api/routers/organization.ts
index 8a816bc92..6c0f83e06 100644
--- a/apps/dashboard/src/server/api/routers/organization.ts
+++ b/apps/dashboard/src/trpc/api/routers/organization.ts
@@ -1,4 +1,4 @@
-import { createTRPCRouter, protectedProcedure } from '@/server/api/trpc';
+import { createTRPCRouter, protectedProcedure } from '@/trpc/api/trpc';
import { clerkClient } from '@clerk/nextjs';
import { z } from 'zod';
diff --git a/apps/dashboard/src/server/api/routers/profile.ts b/apps/dashboard/src/trpc/api/routers/profile.ts
similarity index 98%
rename from apps/dashboard/src/server/api/routers/profile.ts
rename to apps/dashboard/src/trpc/api/routers/profile.ts
index 5d3c6a78b..f1212d74b 100644
--- a/apps/dashboard/src/server/api/routers/profile.ts
+++ b/apps/dashboard/src/trpc/api/routers/profile.ts
@@ -2,7 +2,7 @@ import {
createTRPCRouter,
protectedProcedure,
publicProcedure,
-} from '@/server/api/trpc';
+} from '@/trpc/api/trpc';
import { flatten, map, pipe, prop, sort, uniq } from 'ramda';
import { z } from 'zod';
diff --git a/apps/dashboard/src/server/api/routers/project.ts b/apps/dashboard/src/trpc/api/routers/project.ts
similarity index 95%
rename from apps/dashboard/src/server/api/routers/project.ts
rename to apps/dashboard/src/trpc/api/routers/project.ts
index 61ffa9bbc..a7868364a 100644
--- a/apps/dashboard/src/server/api/routers/project.ts
+++ b/apps/dashboard/src/trpc/api/routers/project.ts
@@ -1,4 +1,4 @@
-import { createTRPCRouter, protectedProcedure } from '@/server/api/trpc';
+import { createTRPCRouter, protectedProcedure } from '@/trpc/api/trpc';
import { getId } from '@/utils/getDbId';
import { z } from 'zod';
diff --git a/apps/dashboard/src/server/api/routers/reference.ts b/apps/dashboard/src/trpc/api/routers/reference.ts
similarity index 98%
rename from apps/dashboard/src/server/api/routers/reference.ts
rename to apps/dashboard/src/trpc/api/routers/reference.ts
index c07168d13..3a03eb14b 100644
--- a/apps/dashboard/src/server/api/routers/reference.ts
+++ b/apps/dashboard/src/trpc/api/routers/reference.ts
@@ -2,7 +2,7 @@ import {
createTRPCRouter,
protectedProcedure,
publicProcedure,
-} from '@/server/api/trpc';
+} from '@/trpc/api/trpc';
import { z } from 'zod';
import { db, getReferences } from '@openpanel/db';
diff --git a/apps/dashboard/src/server/api/routers/report.ts b/apps/dashboard/src/trpc/api/routers/report.ts
similarity index 96%
rename from apps/dashboard/src/server/api/routers/report.ts
rename to apps/dashboard/src/trpc/api/routers/report.ts
index 95a68860e..a52468025 100644
--- a/apps/dashboard/src/server/api/routers/report.ts
+++ b/apps/dashboard/src/trpc/api/routers/report.ts
@@ -1,4 +1,4 @@
-import { createTRPCRouter, protectedProcedure } from '@/server/api/trpc';
+import { createTRPCRouter, protectedProcedure } from '@/trpc/api/trpc';
import { z } from 'zod';
import { db } from '@openpanel/db';
diff --git a/apps/dashboard/src/server/api/routers/share.ts b/apps/dashboard/src/trpc/api/routers/share.ts
similarity index 91%
rename from apps/dashboard/src/server/api/routers/share.ts
rename to apps/dashboard/src/trpc/api/routers/share.ts
index 2b4569407..a365c3972 100644
--- a/apps/dashboard/src/server/api/routers/share.ts
+++ b/apps/dashboard/src/trpc/api/routers/share.ts
@@ -1,4 +1,4 @@
-import { createTRPCRouter, protectedProcedure } from '@/server/api/trpc';
+import { createTRPCRouter, protectedProcedure } from '@/trpc/api/trpc';
import ShortUniqueId from 'short-unique-id';
import { db } from '@openpanel/db';
diff --git a/apps/dashboard/src/server/api/routers/user.ts b/apps/dashboard/src/trpc/api/routers/user.ts
similarity index 87%
rename from apps/dashboard/src/server/api/routers/user.ts
rename to apps/dashboard/src/trpc/api/routers/user.ts
index 69e586ebd..16aedcd0d 100644
--- a/apps/dashboard/src/server/api/routers/user.ts
+++ b/apps/dashboard/src/trpc/api/routers/user.ts
@@ -1,4 +1,4 @@
-import { createTRPCRouter, protectedProcedure } from '@/server/api/trpc';
+import { createTRPCRouter, protectedProcedure } from '@/trpc/api/trpc';
import { clerkClient } from '@clerk/nextjs';
import { z } from 'zod';
diff --git a/apps/dashboard/src/server/api/trpc.ts b/apps/dashboard/src/trpc/api/trpc.ts
similarity index 100%
rename from apps/dashboard/src/server/api/trpc.ts
rename to apps/dashboard/src/trpc/api/trpc.ts
diff --git a/apps/dashboard/src/app/_trpc/client.tsx b/apps/dashboard/src/trpc/client.tsx
similarity index 95%
rename from apps/dashboard/src/app/_trpc/client.tsx
rename to apps/dashboard/src/trpc/client.tsx
index 83d94d8c9..cde4a6126 100644
--- a/apps/dashboard/src/app/_trpc/client.tsx
+++ b/apps/dashboard/src/trpc/client.tsx
@@ -1,4 +1,4 @@
-import type { AppRouter } from '@/server/api/root';
+import type { AppRouter } from '@/trpc/api/root';
import type { TRPCClientErrorBase } from '@trpc/react-query';
import { createTRPCReact } from '@trpc/react-query';
import type { inferRouterInputs, inferRouterOutputs } from '@trpc/server';
diff --git a/apps/docs/src/components/device-id-warning.tsx b/apps/docs/src/components/device-id-warning.tsx
index dc210b7df..5a6ca3777 100644
--- a/apps/docs/src/components/device-id-warning.tsx
+++ b/apps/docs/src/components/device-id-warning.tsx
@@ -6,7 +6,7 @@ export function DeviceIdWarning() {
<Callout>
Read more about{' '}
<Link href="/docs/device-id">device id and why you might want it</Link>.
- **We recommend not to but it's up to you.**
+ **We recommend not to but it&apos;s up to you.**
</Callout>
);
}
diff --git a/apps/docs/src/pages/docs/_meta.json b/apps/docs/src/pages/docs/_meta.json
index 1f71ac396..c3475cc5b 100644
--- a/apps/docs/src/pages/docs/_meta.json
+++ b/apps/docs/src/pages/docs/_meta.json
@@ -17,5 +17,6 @@
"title": "Others"
},
"javascript": "Javascript SDK",
- "web": "Web SDK"
+ "web": "Web SDK",
+ "api": "API"
}
diff --git a/apps/public/src/app/(static)/privacy/page.tsx b/apps/public/src/app/(static)/privacy/page.tsx
index 1eeb9966c..7bbbeef31 100644
--- a/apps/public/src/app/(static)/privacy/page.tsx
+++ b/apps/public/src/app/(static)/privacy/page.tsx
@@ -41,9 +41,9 @@ export default function Page() {
<p>
<strong>Affiliate</strong> means an entity that controls, is
controlled by or is under common control with a party, where
- "control" means ownership of 50% or more of the shares, equity
- interest or other securities entitled to vote for election of
- directors or other managing authority.
+ &quot;control&quot; means ownership of 50% or more of the shares,
+ equity interest or other securities entitled to vote for election
+ of directors or other managing authority.
</p>
</li>
<li>
@@ -54,9 +54,10 @@ export default function Page() {
</li>
<li>
<p>
- <strong>Company</strong> (referred to as either "the Company",
- "We", "Us" or "Our" in this Agreement) refers to Coderax AB, Sankt
- Eriksgatan 100, 113 31, Stockholm.
+ <strong>Company</strong> (referred to as either &quot;the
+ Company&quot;, &quot;We&quot;, &quot;Us&quot; or &quot;Our&quot;
+ in this Agreement) refers to Coderax AB, Sankt Eriksgatan 100, 113
+ 31, Stockholm.
</p>
</li>
<li>
@@ -151,7 +152,7 @@ export default function Page() {
<h4>Usage Data</h4>
<p>Usage Data is collected automatically when using the Service.</p>
<p>
- Usage Data may include information such as Your Device's Internet
+ Usage Data may include information such as Your Device&apos;s Internet
Protocol address (e.g. IP address), browser type, browser version, the
pages of our Service that You visit, the time and date of Your visit,
the time spent on those pages, unique device identifiers and other
@@ -198,10 +199,10 @@ export default function Page() {
</li>
</ul>
<p>
- Cookies can be "Persistent" or "Session" Cookies. Persistent Cookies
- remain on Your personal computer or mobile device when You go offline,
- while Session Cookies are deleted as soon as You close Your web
- browser. You can learn more about cookies{' '}
+ Cookies can be &quot;Persistent&quot; or &quot;Session&quot; Cookies.
+ Persistent Cookies remain on Your personal computer or mobile device
+ when You go offline, while Session Cookies are deleted as soon as You
+ close Your web browser. You can learn more about cookies{' '}
<a
href="https://www.termsfeed.com/blog/cookies/#What_Are_Cookies"
target="_blank"
@@ -291,11 +292,11 @@ export default function Page() {
<p>
<strong>To contact You:</strong> To contact You by email,
telephone calls, SMS, or other equivalent forms of electronic
- communication, such as a mobile application's push notifications
- regarding updates or informative communications related to the
- functionalities, products or contracted services, including the
- security updates, when necessary or reasonable for their
- implementation.
+ communication, such as a mobile application&apos;s push
+ notifications regarding updates or informative communications
+ related to the functionalities, products or contracted services,
+ including the security updates, when necessary or reasonable for
+ their implementation.
</p>
</li>
<li>
@@ -391,12 +392,12 @@ export default function Page() {
<h3>Transfer of Your Personal Data</h3>
<p>
Your information, including Personal Data, is processed at the
- Company's operating offices and in any other places where the parties
- involved in the processing are located. It means that this information
- may be transferred to — and maintained on — computers located outside
- of Your state, province, country or other governmental jurisdiction
- where the data protection laws may differ than those from Your
- jurisdiction.
+ Company&apos;s operating offices and in any other places where the
+ parties involved in the processing are located. It means that this
+ information may be transferred to — and maintained on — computers
+ located outside of Your state, province, country or other governmental
+ jurisdiction where the data protection laws may differ than those from
+ Your jurisdiction.
</p>
<p>
Your consent to this Privacy Policy followed by Your submission of
@@ -468,7 +469,7 @@ export default function Page() {
acceptable means to protect Your Personal Data, We cannot guarantee
its absolute security.
</p>
- <h2>Children's Privacy</h2>
+ <h2>Children&apos;s Privacy</h2>
<p>
Our Service does not address anyone under the age of 13. We do not
knowingly collect personally identifiable information from anyone
@@ -481,15 +482,15 @@ export default function Page() {
<p>
If We need to rely on consent as a legal basis for processing Your
information and Your country requires consent from a parent, We may
- require Your parent's consent before We collect and use that
+ require Your parent&apos;s consent before We collect and use that
information.
</p>
<h2>Links to Other Websites</h2>
<p>
Our Service may contain links to other websites that are not operated
by Us. If You click on a third party link, You will be directed to
- that third party's site. We strongly advise You to review the Privacy
- Policy of every site You visit.
+ that third party&apos;s site. We strongly advise You to review the
+ Privacy Policy of every site You visit.
</p>
<p>
We have no control over and assume no responsibility for the content,
@@ -502,8 +503,8 @@ export default function Page() {
</p>
<p>
We will let You know via email and/or a prominent notice on Our
- Service, prior to the change becoming effective and update the "Last
- updated" date at the top of this Privacy Policy.
+ Service, prior to the change becoming effective and update the
+ &quot;Last updated&quot; date at the top of this Privacy Policy.
</p>
<p>
You are advised to review this Privacy Policy periodically for any
diff --git a/apps/public/src/app/(static)/terms/page.tsx b/apps/public/src/app/(static)/terms/page.tsx
index bc4fb008c..859d39aea 100644
--- a/apps/public/src/app/(static)/terms/page.tsx
+++ b/apps/public/src/app/(static)/terms/page.tsx
@@ -313,7 +313,7 @@ export default function Page() {
of the Company and any of its suppliers under any provision of this
Terms and Your exclusive remedy for all of the foregoing shall be
limited to the amount actually paid by You through the Service or 100
- USD if You haven't purchased anything through the Service.
+ USD if You haven&apos;t purchased anything through the Service.
</p>
<p>
To the maximum extent permitted by applicable law, in no event shall
@@ -332,8 +332,8 @@ export default function Page() {
Some states do not allow the exclusion of implied warranties or
limitation of liability for incidental or consequential damages, which
means that some of the above limitations may not apply. In these
- states, each party's liability will be limited to the greatest extent
- permitted by law.
+ states, each party&apos;s liability will be limited to the greatest
+ extent permitted by law.
</p>
<h2>&quot;AS IS&quot; and &quot;AS AVAILABLE&quot; Disclaimer</h2>
<p>
@@ -357,9 +357,9 @@ export default function Page() {
</p>
<p>
Without limiting the foregoing, neither the Company nor any of the
- company's provider makes any representation or warranty of any kind,
- express or implied: (i) as to the operation or availability of the
- Service, or the information, content, and materials or products
+ company&apos;s provider makes any representation or warranty of any
+ kind, express or implied: (i) as to the operation or availability of
+ the Service, or the information, content, and materials or products
included thereon; (ii) that the Service will be uninterrupted or
error-free; (iii) as to the accuracy, reliability, or currency of any
information or content provided through the Service; or (iv) that the
@@ -420,7 +420,7 @@ export default function Page() {
<p>
Except as provided herein, the failure to exercise a right or to
require performance of an obligation under these Terms shall not
- affect a party's ability to exercise such right or require such
+ affect a party&apos;s ability to exercise such right or require such
performance at any time thereafter nor shall the waiver of a breach
constitute a waiver of any subsequent breach.
</p>
@@ -434,9 +434,9 @@ export default function Page() {
<p>
We reserve the right, at Our sole discretion, to modify or replace
these Terms at any time. If a revision is material We will make
- reasonable efforts to provide at least 30 days' notice prior to any
- new terms taking effect. What constitutes a material change will be
- determined at Our sole discretion.
+ reasonable efforts to provide at least 30 days&apos; notice prior to
+ any new terms taking effect. What constitutes a material change will
+ be determined at Our sole discretion.
</p>
<p>
By continuing to access or use Our Service after those revisions
diff --git a/apps/public/src/app/api/waitlist/route.ts b/apps/public/src/app/api/waitlist/route.ts
index 06fb05484..41ec8918d 100644
--- a/apps/public/src/app/api/waitlist/route.ts
+++ b/apps/public/src/app/api/waitlist/route.ts
@@ -18,7 +18,7 @@ export async function POST(req: Request) {
await db.waitlist.create({
data: {
- email: body.email.toLowerCase(),
+ email: String(body.email).toLowerCase(),
},
});
diff --git a/apps/public/src/app/features.tsx b/apps/public/src/app/features.tsx
index 8ec01a9fb..82eda9835 100644
--- a/apps/public/src/app/features.tsx
+++ b/apps/public/src/app/features.tsx
@@ -87,8 +87,8 @@ const features: FeatureItem[] = [
description: (
<>
<p>
- Deep dive into your user's behavior and understand how they interact
- with your app/website.
+ Deep dive into your user&apos;s behavior and understand how they
+ interact with your app/website.
</p>
</>
),
diff --git a/apps/public/src/app/join-waitlist-hero.tsx b/apps/public/src/app/join-waitlist-hero.tsx
index 3bc68494d..d4266eccb 100644
--- a/apps/public/src/app/join-waitlist-hero.tsx
+++ b/apps/public/src/app/join-waitlist-hero.tsx
@@ -34,8 +34,8 @@ export function JoinWaitlistHero({ className }: JoinWaitlistProps) {
<DialogHeader>
<DialogTitle>Thanks so much!</DialogTitle>
<DialogDescription>
- You're now on the waiting list. We'll let you know when we're
- ready. Should be within a month or two 🚀
+ You&apos;re now on the waiting list. We&apos;ll let you know when
+ we&apos;re ready. Should be within a month or two 🚀
</DialogDescription>
</DialogHeader>
diff --git a/apps/public/src/app/join-waitlist.tsx b/apps/public/src/app/join-waitlist.tsx
index f524fa27a..c05145ece 100644
--- a/apps/public/src/app/join-waitlist.tsx
+++ b/apps/public/src/app/join-waitlist.tsx
@@ -34,8 +34,8 @@ export function JoinWaitlist({ className }: JoinWaitlistProps) {
<DialogHeader>
<DialogTitle>Thanks so much!</DialogTitle>
<DialogDescription>
- You're now on the waiting list. We'll let you know when we're
- ready. Should be within a month or two 🚀
+ You&apos;re now on the waiting list. We&apos;ll let you know when
+ we&apos;re ready. Should be within a month or two 🚀
</DialogDescription>
</DialogHeader>
diff --git a/apps/public/src/app/page.tsx b/apps/public/src/app/page.tsx
index e497fb2c5..53f6f250e 100644
--- a/apps/public/src/app/page.tsx
+++ b/apps/public/src/app/page.tsx
@@ -57,14 +57,15 @@ export default function Page() {
<h3 className="text-blue-dark text-lg font-bold">TL;DR</h3>
<Paragraph>
Our open-source analytic library fills a crucial gap by combining
- the strengths of Mixpanel's powerful features with Plausible's
- clear overview page. Motivated by the lack of an open-source
- alternative to Mixpanel and inspired by Plausible's simplicity, we
- aim to create an intuitive platform with predictable pricing. With
- a single-tier pricing model and limits only on monthly event
- counts, our goal is to democratize analytics, offering
- unrestricted access to all features while ensuring affordability
- and transparency for users of all project sizes.
+ the strengths of Mixpanel&apos;s powerful features with
+ Plausible&apos;s clear overview page. Motivated by the lack of an
+ open-source alternative to Mixpanel and inspired by
+ Plausible&apos;s simplicity, we aim to create an intuitive
+ platform with predictable pricing. With a single-tier pricing
+ model and limits only on monthly event counts, our goal is to
+ democratize analytics, offering unrestricted access to all
+ features while ensuring affordability and transparency for users
+ of all project sizes.
</Paragraph>
<h3 className="text-blue-dark mt-12 text-lg font-bold">The why</h3>
@@ -72,10 +73,10 @@ export default function Page() {
Our open-source analytic library emerged from a clear need within
the analytics community. While platforms like Mixpanel offer
powerful and user-friendly features, they lack a comprehensive
- overview page akin to Plausible's, which succinctly summarizes
- essential metrics. Recognizing this gap, we saw an opportunity to
- combine the strengths of both platforms while addressing their
- respective shortcomings.
+ overview page akin to Plausible&apos;s, which succinctly
+ summarizes essential metrics. Recognizing this gap, we saw an
+ opportunity to combine the strengths of both platforms while
+ addressing their respective shortcomings.
</Paragraph>
<Paragraph>
@@ -87,7 +88,7 @@ export default function Page() {
</Paragraph>
<Paragraph>
- Inspired by Plausible's exemplary approach to simplicity and
+ Inspired by Plausible&apos;s exemplary approach to simplicity and
clarity, we aim to build upon their foundation and further refine
the user experience. By harnessing the best practices demonstrated
by Plausible, we aspire to create an intuitive and streamlined
@@ -108,12 +109,13 @@ export default function Page() {
<Paragraph>
In line with our commitment to fairness and accessibility, our
pricing model will only impose limits on the number of events
- users can send each month. This approach, akin to Plausible's,
- ensures that users have the freedom to explore and utilize our
- platform to its fullest potential without arbitrary restrictions
- on reports or user counts. Ultimately, our goal is to democratize
- analytics by offering a reliable, transparent, and cost-effective
- solution for projects of all sizes.
+ users can send each month. This approach, akin to
+ Plausible&apos;s, ensures that users have the freedom to explore
+ and utilize our platform to its fullest potential without
+ arbitrary restrictions on reports or user counts. Ultimately, our
+ goal is to democratize analytics by offering a reliable,
+ transparent, and cost-effective solution for projects of all
+ sizes.
</Paragraph>
</div>
</div>
diff --git a/apps/public/src/app/punch-lines.tsx b/apps/public/src/app/punch-lines.tsx
index 77cd56a43..bf449ed53 100644
--- a/apps/public/src/app/punch-lines.tsx
+++ b/apps/public/src/app/punch-lines.tsx
@@ -19,8 +19,9 @@ const items = [
title: 'Own Your Own Data',
description: (
<p>
- We believe that you should own your own data. That's why we don't sell
- your data to third parties. <strong>Ever. Period.</strong>
+ We believe that you should own your own data. That&apos;s why we
+ don&apos;t sell your data to third parties.{' '}
+ <strong>Ever. Period.</strong>
</p>
),
icon: KeyIcon,
diff --git a/apps/public/src/components/ui/button.tsx b/apps/public/src/components/ui/button.tsx
index 78f787b4b..5561dd124 100644
--- a/apps/public/src/components/ui/button.tsx
+++ b/apps/public/src/components/ui/button.tsx
@@ -89,11 +89,16 @@ export interface ALinkProps
extends React.AnchorHTMLAttributes<HTMLAnchorElement>,
VariantProps<typeof buttonVariants> {}
-export const ALink = ({ variant, size, className, ...props }: ALinkProps) => {
+export const ALink = ({
+ variant,
+ size,
+ className,
+ children,
+ ...props
+}: ALinkProps) => {
return (
- <a
- {...props}
- className={cn(buttonVariants({ variant, size, className }))}
- />
+ <a {...props} className={cn(buttonVariants({ variant, size, className }))}>
+ {children}
+ </a>
);
};
diff --git a/apps/public/tsconfig.json b/apps/public/tsconfig.json
index d17f2ec20..ac1bc6970 100644
--- a/apps/public/tsconfig.json
+++ b/apps/public/tsconfig.json
@@ -14,5 +14,5 @@
"strictNullChecks": true
},
"include": [".", ".next/types/**/*.ts"],
- "exclude": ["node_modules"]
+ "exclude": ["node_modules", "public"]
}
diff --git a/apps/test/README.md b/apps/test/README.md
deleted file mode 100644
index fba19edac..000000000
--- a/apps/test/README.md
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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.
diff --git a/apps/test/next-env.d.ts b/apps/test/next-env.d.ts
deleted file mode 100644
index fd36f9494..000000000
--- a/apps/test/next-env.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-/// <reference types="next" />
-/// <reference types="next/image-types/global" />
-/// <reference types="next/navigation-types/compat/navigation" />
-
-// NOTE: This file should not be edited
-// see https://nextjs.org/docs/basic-features/typescript for more information.
diff --git a/apps/test/next.config.mjs b/apps/test/next.config.mjs
deleted file mode 100644
index d3309c597..000000000
--- a/apps/test/next.config.mjs
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * Run `build` or `dev` with `SKIP_ENV_VALIDATION` to skip env validation. This is especially useful
- * for Docker builds.
- */
-
-/** @type {import("next").NextConfig} */
-const config = {
- reactStrictMode: false,
- transpilePackages: ['@openpanel/sdk', '@openpanel/web', '@openpanel/nextjs'],
- eslint: { ignoreDuringBuilds: true },
- typescript: { ignoreBuildErrors: true },
- /**
- * If you are using `appDir` then you must comment the below `i18n` config out.
- *
- * @see https://github.com/vercel/next.js/issues/41980
- */
- i18n: {
- locales: ['en'],
- defaultLocale: 'en',
- },
-};
-
-export default config;
diff --git a/apps/test/package.json b/apps/test/package.json
deleted file mode 100644
index 4de60c785..000000000
--- a/apps/test/package.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
- "name": "@openpanel/test",
- "version": "0.1.0",
- "private": true,
- "scripts": {
- "dev": "next dev -p 3002",
- "testing": "pnpm dev",
- "build": "next build",
- "start": "next start",
- "lint": "eslint .",
- "format": "prettier --check \"**/*.{tsx,mjs,ts,md,json}\"",
- "typecheck": "tsc --noEmit"
- },
- "dependencies": {
- "@openpanel-test/nextjs": "workspace:@openpanel/nextjs@*",
- "@openpanel-test/sdk": "workspace:@openpanel/sdk@*",
- "@openpanel-test/web": "workspace:@openpanel/web@*",
- "next": "~14.1.0",
- "react": "18.2.0",
- "react-dom": "18.2.0"
- },
- "devDependencies": {
- "@openpanel/eslint-config": "workspace:*",
- "@openpanel/prettier-config": "workspace:*",
- "@openpanel/tsconfig": "workspace:*",
- "@types/react": "^18.2.20",
- "@types/react-dom": "^18.2.7",
- "@types/react-syntax-highlighter": "^15.5.9",
- "@typescript-eslint/eslint-plugin": "^6.6.0",
- "@typescript-eslint/parser": "^6.6.0",
- "autoprefixer": "^10.4.14",
- "eslint": "^8.48.0",
- "postcss": "^8.4.27",
- "prettier": "^3.0.3",
- "prettier-plugin-tailwindcss": "^0.5.1",
- "tailwindcss": "^3.3.3",
- "typescript": "^5.2.2"
- },
- "ct3aMetadata": {
- "initVersion": "7.21.0"
- },
- "eslintConfig": {
- "root": true,
- "extends": [
- "@openpanel/eslint-config/base",
- "@openpanel/eslint-config/nextjs",
- "@openpanel/eslint-config/react"
- ]
- },
- "prettier": "@openpanel/prettier-config"
-}
diff --git a/apps/test/postcss.config.cjs b/apps/test/postcss.config.cjs
deleted file mode 100644
index e305dd92a..000000000
--- a/apps/test/postcss.config.cjs
+++ /dev/null
@@ -1,8 +0,0 @@
-const config = {
- plugins: {
- tailwindcss: {},
- autoprefixer: {},
- },
-};
-
-module.exports = config;
diff --git a/apps/test/public/favicon.ico b/apps/test/public/favicon.ico
deleted file mode 100644
index b5336a48e..000000000
Binary files a/apps/test/public/favicon.ico and /dev/null differ
diff --git a/apps/test/public/op.js b/apps/test/public/op.js
deleted file mode 100644
index e1ea2a440..000000000
--- a/apps/test/public/op.js
+++ /dev/null
@@ -1,2 +0,0 @@
-"use strict";(()=>{function v(s){return Promise.all(Object.entries(s).map(async([e,i])=>[e,await i??""])).then(e=>Object.fromEntries(e))}function m(s){let e={"Content-Type":"application/json"};return{headers:e,async fetch(i,t,n){let r=`${s}${i}`,o,d=await v(e);return new Promise(a=>{let p=c=>{clearTimeout(o),fetch(r,{headers:d,method:"POST",body:JSON.stringify(t??{}),keepalive:!0,...n??{}}).then(async l=>{if(l.status===401)return null;if(l.status!==200&&l.status!==202)return f(c,a);let g=await l.text();if(!g)return a(null);a(g)}).catch(()=>f(c,a))};function f(c,l){if(c>1)return l(null);o=setTimeout(()=>{p(c+1)},Math.pow(2,c)*500)}p(0)})}}}var u=class{constructor(e){this.state={properties:{}};this.options=e,this.api=m(e.url??"https://api.openpanel.dev"),this.api.headers["openpanel-client-id"]=e.clientId,this.options.clientSecret&&(this.api.headers["openpanel-client-secret"]=this.options.clientSecret)}setProfileId(e){this.state.profileId=e}setProfile(e){this.setProfileId(e.profileId),this.api.fetch("/profile",{...e,properties:{...this.state.properties,...e.properties}})}increment(e,i,t){let n=t?.profileId??this.state.profileId;if(!n)return console.log("No profile id");this.api.fetch("/profile/increment",{profileId:n,property:e,value:i})}decrement(e,i,t){let n=t?.profileId??this.state.profileId;if(!n)return console.log("No profile id");this.api.fetch("/profile/decrement",{profileId:n,property:e,value:i})}event(e,i){let t=i?.profileId??this.state.profileId;delete i?.profileId,this.api.fetch("/event",{name:e,properties:{...this.state.properties,...i??{}},timestamp:this.timestamp(),deviceId:this.getDeviceId(),profileId:t}).then(n=>{this.options.setDeviceId&&n&&this.options.setDeviceId(n)})}setGlobalProperties(e){this.state.properties={...this.state.properties,...e}}clear(){this.state.deviceId=void 0,this.state.profileId=void 0,this.options.removeDeviceId&&this.options.removeDeviceId()}timestamp(){return new Date().toISOString()}getDeviceId(){if(this.state.deviceId)return this.state.deviceId;this.options.getDeviceId&&(this.state.deviceId=this.options.getDeviceId()||void 0)}};function b(s){return s.replace(/([-_][a-z])/gi,e=>e.toUpperCase().replace("-","").replace("_",""))}var h=class extends u{constructor(i){super(i);this.lastPath="";this.isServer()||(this.setGlobalProperties({__referrer:document.referrer}),this.options.trackOutgoingLinks&&this.trackOutgoingLinks(),this.options.trackScreenViews&&this.trackScreenViews(),this.options.trackAttributes&&this.trackAttributes())}isServer(){return typeof document>"u"}trackOutgoingLinks(){this.isServer()||document.addEventListener("click",i=>{let t=i.target,n=t.closest("a");if(n&&t){let r=n.getAttribute("href");r?.startsWith("http")&&super.event("link_out",{href:r,text:n.innerText||n.getAttribute("title")||t.getAttribute("alt")||t.getAttribute("title")})}})}trackScreenViews(){if(this.isServer())return;let i=history.pushState;history.pushState=function(...r){let o=i.apply(this,r);return window.dispatchEvent(new Event("pushstate")),window.dispatchEvent(new Event("locationchange")),o};let t=history.replaceState;history.replaceState=function(...r){let o=t.apply(this,r);return window.dispatchEvent(new Event("replacestate")),window.dispatchEvent(new Event("locationchange")),o},window.addEventListener("popstate",()=>window.dispatchEvent(new Event("locationchange"))),this.options.hash?window.addEventListener("hashchange",()=>this.screenView()):window.addEventListener("locationchange",()=>this.screenView()),setTimeout(()=>{this.screenView()},50)}trackAttributes(){this.isServer()||document.addEventListener("click",i=>{let t=i.target,n=t.closest("button"),r=t.closest("a"),o=n?.getAttribute("data-event")?n:r?.getAttribute("data-event")?r:null;if(o){let d={};for(let p of o.attributes)p.name.startsWith("data-")&&p.name!=="data-event"&&(d[b(p.name.replace(/^data-/,""))]=p.value);let a=o.getAttribute("data-event");a&&super.event(a,d)}})}screenView(i){if(this.isServer())return;let t=window.location.href;this.lastPath!==t&&(this.lastPath=t,super.event("screen_view",{...i??{},__path:t,__title:document.title}))}};(s=>{if(s.op&&"q"in s.op){let e=s.op.q||[],i=new h(e.shift()[1]);e.forEach(t=>{t[0]in i&&i[t[0]](...t.slice(1))}),s.op=(t,...n)=>{let r=i[t].bind(i);typeof r=="function"&&r(...n)}}})(window);})();
-//# sourceMappingURL=cdn.global.js.map
\ No newline at end of file
diff --git a/apps/test/public/op.js.map b/apps/test/public/op.js.map
deleted file mode 100644
index cffe941b6..000000000
--- a/apps/test/public/op.js.map
+++ /dev/null
@@ -1,51 +0,0 @@
-{
- "version": 3,
- "sources": [
- "../../sdk/index.ts",
- "../index.ts",
- "../cdn.ts"
- ],
- "sourcesContent": [
- "import type { PostEventPayload } from '@openpanel/types';\n\nexport interface OpenpanelOptions {\n url: string;\n clientId: string;\n clientSecret?: string;\n verbose?: boolean;\n setProfileId?: (profileId: string) => void;\n getProfileId?: () => string | null | undefined;\n removeProfileId?: () => void;\n}\n\nexport interface OpenpanelState {\n profileId?: string;\n properties: Record<string, unknown>;\n}\n\nfunction createApi(_url: string, clientId: string, clientSecret?: string) {\n return function post<ReqBody, ResBody>(\n path: string,\n data: ReqBody,\n options?: RequestInit\n ): Promise<ResBody | null> {\n const url = `${_url}${path}`;\n let timer: ReturnType<typeof setTimeout>;\n const headers: Record<string, string> = {\n 'openpanel-client-id': clientId,\n 'Content-Type': 'application/json',\n };\n if (clientSecret) {\n headers['openpanel-client-secret'] = clientSecret;\n }\n return new Promise((resolve) => {\n const wrappedFetch = (attempt: number) => {\n clearTimeout(timer);\n fetch(url, {\n headers,\n method: 'POST',\n body: JSON.stringify(data ?? {}),\n keepalive: true,\n ...(options ?? {}),\n })\n .then(async (res) => {\n if (res.status !== 200) {\n return retry(attempt, resolve);\n }\n\n const response = await res.json();\n\n if (!response) {\n return resolve(null);\n }\n\n resolve(response as ResBody);\n })\n .catch(() => {\n return retry(attempt, resolve);\n });\n };\n\n function retry(\n attempt: number,\n resolve: (value: ResBody | null) => void\n ) {\n if (attempt > 1) {\n return resolve(null);\n }\n\n timer = setTimeout(\n () => {\n wrappedFetch(attempt + 1);\n },\n Math.pow(2, attempt) * 500\n );\n }\n\n wrappedFetch(0);\n });\n };\n}\n\nexport class Openpanel<Options extends OpenpanelOptions = OpenpanelOptions> {\n public options: Options;\n private api: ReturnType<typeof createApi>;\n private state: OpenpanelState = {\n properties: {},\n };\n\n constructor(options: Options) {\n this.options = options;\n this.api = createApi(options.url, options.clientId, options.clientSecret);\n }\n\n // Public\n\n public init(properties?: Record<string, unknown>) {\n this.state.properties = properties ?? {};\n }\n\n // public setUser(payload: Omit<BatchUpdateProfilePayload, 'profileId'>) {\n // this.batcher.add({\n // type: 'update_profile',\n // payload: {\n // ...payload,\n // properties: payload.properties ?? {},\n // profileId: this.state.profileId,\n // },\n // });\n // }\n\n // public increment(name: string, value: number) {\n // this.batcher.add({\n // type: 'increment',\n // payload: {\n // name,\n // value,\n // profileId: this.state.profileId,\n // },\n // });\n // }\n\n // public decrement(name: string, value: number) {\n // this.batcher.add({\n // type: 'decrement',\n // payload: {\n // name,\n // value,\n // profileId: this.state.profileId,\n // },\n // });\n // }\n\n private getProfileId() {\n if (this.state.profileId) {\n return this.state.profileId;\n } else if (this.options.getProfileId) {\n this.state.profileId = this.options.getProfileId() || undefined;\n }\n }\n\n public async event(name: string, properties?: Record<string, unknown>) {\n const profileId = await this.api<PostEventPayload, string>('/event', {\n name,\n properties: {\n ...this.state.properties,\n ...(properties ?? {}),\n },\n timestamp: this.timestamp(),\n profileId: this.getProfileId(),\n });\n\n if (this.options.setProfileId && profileId) {\n this.options.setProfileId(profileId);\n }\n }\n\n public setGlobalProperties(properties: Record<string, unknown>) {\n this.state.properties = {\n ...this.state.properties,\n ...properties,\n };\n }\n\n public clear() {\n this.state.profileId = undefined;\n if (this.options.removeProfileId) {\n this.options.removeProfileId();\n }\n }\n\n public setUserProperty(name: string, value: unknown, update = true) {\n // this.batcher.add({\n // type: 'set_profile_property',\n // payload: {\n // name,\n // value,\n // update,\n // profileId: this.state.profileId,\n // },\n // });\n }\n\n // Private\n\n private timestamp() {\n return new Date().toISOString();\n }\n}\n",
- "import type { OpenpanelOptions } from '@openpanel/sdk';\nimport { Openpanel } from '@openpanel/sdk';\n\ntype OpenpanelWebOptions = OpenpanelOptions & {\n trackOutgoingLinks?: boolean;\n trackScreenViews?: boolean;\n hash?: boolean;\n};\n\nexport class OpenpanelWeb extends Openpanel<OpenpanelWebOptions> {\n constructor(options: OpenpanelWebOptions) {\n super(options);\n\n if (this.options.trackOutgoingLinks) {\n this.trackOutgoingLinks();\n }\n\n if (this.options.trackScreenViews) {\n this.trackScreenViews();\n }\n }\n\n private isServer() {\n return typeof document === 'undefined';\n }\n\n private getTimezone() {\n try {\n return Intl.DateTimeFormat().resolvedOptions().timeZone;\n } catch (e) {\n return undefined;\n }\n }\n\n public trackOutgoingLinks() {\n if (this.isServer()) {\n return;\n }\n\n document.addEventListener('click', (event) => {\n const target = event.target as HTMLElement;\n if (target.tagName === 'A') {\n const href = target.getAttribute('href');\n if (href?.startsWith('http')) {\n super.event('link_out', {\n href,\n text: target.innerText,\n });\n }\n }\n });\n }\n\n public trackScreenViews() {\n if (this.isServer()) {\n return;\n }\n\n const oldPushState = history.pushState;\n history.pushState = function pushState(...args) {\n const ret = oldPushState.apply(this, args);\n window.dispatchEvent(new Event('pushstate'));\n window.dispatchEvent(new Event('locationchange'));\n return ret;\n };\n\n const oldReplaceState = history.replaceState;\n history.replaceState = function replaceState(...args) {\n const ret = oldReplaceState.apply(this, args);\n window.dispatchEvent(new Event('replacestate'));\n window.dispatchEvent(new Event('locationchange'));\n return ret;\n };\n\n window.addEventListener('popstate', () =>\n window.dispatchEvent(new Event('locationchange'))\n );\n\n if (this.options.hash) {\n window.addEventListener('hashchange', () => this.screenView());\n } else {\n window.addEventListener('locationchange', () => this.screenView());\n }\n }\n\n public screenView(properties?: Record<string, unknown>): void {\n if (this.isServer()) {\n return;\n }\n\n super.event('screen_view', {\n ...(properties ?? {}),\n path: window.location.href,\n title: document.title,\n referrer: document.referrer,\n });\n }\n}\n",
- "// @ts-nocheck\n\nimport { OpenpanelWeb as Openpanel } from './index';\n\nconst el = document.currentScript;\nif (el) {\n window.openpanel = new Openpanel({\n url: el?.getAttribute('data-url'),\n clientId: el?.getAttribute('data-client-id'),\n clientSecret: el?.getAttribute('data-client-secret'),\n trackOutgoingLinks: !!el?.getAttribute('data-track-outgoing-links'),\n trackScreenViews: !!el?.getAttribute('data-track-screen-views'),\n });\n}\n"
- ],
- "mappings": "mBAiBA,SAASA,EAAUC,EAAcC,EAAkBC,EAAuB,CACxE,OAAO,SACLC,EACAC,EACAC,EACyB,CACzB,IAAMC,EAAM,GAAGN,CAAI,GAAGG,CAAI,GACtBI,EACEC,EAAkC,CACtC,kBAAmBP,EACnB,eAAgB,kBAClB,EACA,OAAIC,IACFM,EAAQ,qBAAqB,EAAIN,GAE5B,IAAI,QAASO,GAAY,CAC9B,IAAMC,EAAgBC,GAAoB,CACxC,aAAaJ,CAAK,EAClB,MAAMD,EAAK,CACT,QAAAE,EACA,OAAQ,OACR,KAAM,KAAK,UAAUJ,GAAQ,CAAC,CAAC,EAC/B,UAAW,GACX,GAAIC,GAAW,CAAC,CAClB,CAAC,EACE,KAAK,MAAOO,GAAQ,CACnB,GAAIA,EAAI,SAAW,IACjB,OAAOC,EAAMF,EAASF,CAAO,EAG/B,IAAMK,EAAW,MAAMF,EAAI,KAAK,EAEhC,GAAI,CAACE,EACH,OAAOL,EAAQ,IAAI,EAGrBA,EAAQK,CAAmB,CAC7B,CAAC,EACA,MAAM,IACED,EAAMF,EAASF,CAAO,CAC9B,CACL,EAEA,SAASI,EACPF,EACAF,EACA,CACA,GAAIE,EAAU,EACZ,OAAOF,EAAQ,IAAI,EAGrBF,EAAQ,WACN,IAAM,CACJG,EAAaC,EAAU,CAAC,CAC1B,EACA,KAAK,IAAI,EAAGA,CAAO,EAAI,GACzB,CACF,CAEAD,EAAa,CAAC,CAChB,CAAC,CACH,CACF,CAEO,IAAMK,EAAN,KAAyD,CACvD,QACC,IACA,MAAoB,CAC1B,WAAY,CAAC,CACf,EAEA,YAAYV,EAAkB,CAC5B,KAAK,QAAUA,EACf,KAAK,IAAMN,EAAUM,EAAQ,IAAKA,EAAQ,SAAUA,EAAQ,YAAY,CAC1E,CAIO,KAAKW,EAAsC,CAChD,KAAK,MAAM,WAAaA,GAAc,CAAC,CACzC,CAmCQ,cAAe,CACrB,GAAI,KAAK,MAAM,UACb,OAAO,KAAK,MAAM,UACT,KAAK,QAAQ,eACtB,KAAK,MAAM,UAAY,KAAK,QAAQ,aAAa,GAAK,OAE1D,CAEA,MAAa,MAAMC,EAAcD,EAAsC,CACrE,IAAME,EAAY,MAAM,KAAK,IAA8B,SAAU,CACnE,KAAAD,EACA,WAAY,CACV,GAAG,KAAK,MAAM,WACd,GAAID,GAAc,CAAC,CACrB,EACA,UAAW,KAAK,UAAU,EAC1B,UAAW,KAAK,aAAa,CAC/B,CAAC,EAEG,KAAK,QAAQ,cAAgBE,GAC/B,KAAK,QAAQ,aAAaA,CAAS,CAEvC,CAEO,oBAAoBF,EAAqC,CAC9D,KAAK,MAAM,WAAa,CACtB,GAAG,KAAK,MAAM,WACd,GAAGA,CACL,CACF,CAEO,OAAQ,CACb,KAAK,MAAM,UAAY,OACnB,KAAK,QAAQ,iBACf,KAAK,QAAQ,gBAAgB,CAEjC,CAEO,gBAAgBC,EAAcE,EAAgBC,EAAS,GAAM,CAUpE,CAIQ,WAAY,CAClB,OAAO,IAAI,KAAK,EAAE,YAAY,CAChC,CACF,EClLO,IAAMC,EAAN,cAAuBC,CAAuB,CACnD,YAAYC,EAA0B,CACpC,MAAMA,CAAO,EAET,KAAK,QAAQ,oBACf,KAAK,mBAAmB,EAGtB,KAAK,QAAQ,kBACf,KAAK,iBAAiB,CAE1B,CAEQ,UAAW,CACjB,OAAO,OAAO,SAAa,GAC7B,CAEQ,aAAc,CACpB,GAAI,CACF,OAAO,KAAK,eAAe,EAAE,gBAAgB,EAAE,QACjD,MAAY,CACV,MACF,CACF,CAEO,oBAAqB,CACtB,KAAK,SAAS,GAIlB,SAAS,iBAAiB,QAAUC,GAAU,CAC5C,IAAMC,EAASD,EAAM,OACrB,GAAIC,EAAO,UAAY,IAAK,CAC1B,IAAMC,EAAOD,EAAO,aAAa,MAAM,EACnCC,GAAM,WAAW,MAAM,GACzB,MAAM,MAAM,WAAY,CACtB,KAAAA,EACA,KAAMD,EAAO,SACf,CAAC,CAEL,CACF,CAAC,CACH,CAEO,kBAAmB,CACxB,GAAI,KAAK,SAAS,EAChB,OAGF,IAAME,EAAe,QAAQ,UAC7B,QAAQ,UAAY,YAAsBC,EAAM,CAC9C,IAAMC,EAAMF,EAAa,MAAM,KAAMC,CAAI,EACzC,cAAO,cAAc,IAAI,MAAM,WAAW,CAAC,EAC3C,OAAO,cAAc,IAAI,MAAM,gBAAgB,CAAC,EACzCC,CACT,EAEA,IAAMC,EAAkB,QAAQ,aAChC,QAAQ,aAAe,YAAyBF,EAAM,CACpD,IAAMC,EAAMC,EAAgB,MAAM,KAAMF,CAAI,EAC5C,cAAO,cAAc,IAAI,MAAM,cAAc,CAAC,EAC9C,OAAO,cAAc,IAAI,MAAM,gBAAgB,CAAC,EACzCC,CACT,EAEA,OAAO,iBAAiB,WAAY,IAClC,OAAO,cAAc,IAAI,MAAM,gBAAgB,CAAC,CAClD,EAEI,KAAK,QAAQ,KACf,OAAO,iBAAiB,aAAc,IAAM,KAAK,WAAW,CAAC,EAE7D,OAAO,iBAAiB,iBAAkB,IAAM,KAAK,WAAW,CAAC,CAErE,CAEO,WAAWE,EAA4C,CACxD,KAAK,SAAS,GAIlB,MAAM,MAAM,cAAe,CACzB,GAAIA,GAAc,CAAC,EACnB,KAAM,OAAO,SAAS,KACtB,MAAO,SAAS,MAChB,SAAU,SAAS,QACrB,CAAC,CACH,CACF,EC7FA,IAAMC,EAAK,SAAS,cAChBA,IACF,OAAO,UAAY,IAAIC,EAAU,CAC/B,IAAKD,GAAI,aAAa,UAAU,EAChC,SAAUA,GAAI,aAAa,gBAAgB,EAC3C,aAAcA,GAAI,aAAa,oBAAoB,EACnD,mBAAoB,CAAC,CAACA,GAAI,aAAa,2BAA2B,EAClE,iBAAkB,CAAC,CAACA,GAAI,aAAa,yBAAyB,CAChE,CAAC",
- "names": [
- "createApi",
- "_url",
- "clientId",
- "clientSecret",
- "path",
- "data",
- "options",
- "url",
- "timer",
- "headers",
- "resolve",
- "wrappedFetch",
- "attempt",
- "res",
- "retry",
- "response",
- "Openpanel",
- "properties",
- "name",
- "profileId",
- "value",
- "update",
- "OpenpanelWeb",
- "Openpanel",
- "options",
- "event",
- "target",
- "href",
- "oldPushState",
- "args",
- "ret",
- "oldReplaceState",
- "properties",
- "el",
- "OpenpanelWeb"
- ]
-}
diff --git a/apps/test/src/analytics.ts b/apps/test/src/analytics.ts
deleted file mode 100644
index 2932b5bee..000000000
--- a/apps/test/src/analytics.ts
+++ /dev/null
@@ -1,127 +0,0 @@
-import type { FastifyReply, FastifyRequest } from 'fastify';
-import icoToPng from 'ico-to-png';
-import sharp from 'sharp';
-
-import { createHash } from '@openpanel/common';
-import { redis } from '@openpanel/redis';
-
-interface GetFaviconParams {
- url: string;
-}
-
-async function getImageBuffer(url: string) {
- try {
- const res = await fetch(url);
- const contentType = res.headers.get('content-type');
-
- if (!contentType?.includes('image')) {
- return null;
- }
-
- if (!res.ok) {
- return null;
- }
-
- if (contentType === 'image/x-icon' || url.endsWith('.ico')) {
- const arrayBuffer = await res.arrayBuffer();
- const buffer = Buffer.from(arrayBuffer);
- return await icoToPng(buffer, 30);
- }
-
- return await sharp(await res.arrayBuffer())
- .resize(30, 30, {
- fit: 'cover',
- })
- .png()
- .toBuffer();
- } catch (e) {
- console.log('Failed to get image from url', url);
- console.log(e);
- }
-}
-
-const imageExtensions = ['svg', 'png', 'jpg', 'jpeg', 'gif', 'webp', 'ico'];
-
-export async function getFavicon(
- request: FastifyRequest<{
- Querystring: GetFaviconParams;
- }>,
- reply: FastifyReply
-) {
- function sendBuffer(buffer: Buffer, cacheKey?: string) {
- if (cacheKey) {
- redis.set(`favicon:${cacheKey}`, buffer.toString('base64'));
- }
- reply.type('image/png');
- console.log('buffer', buffer.byteLength);
-
- return reply.send(buffer);
- }
-
- if (!request.query.url) {
- return reply.status(404).send('Not found');
- }
-
- const url = decodeURIComponent(request.query.url);
-
- // DIRECT IMAGE
- if (imageExtensions.find((ext) => url.endsWith(ext))) {
- const cacheKey = createHash(url, 32);
- const cache = await redis.get(`favicon:${cacheKey}`);
- if (cache) {
- return sendBuffer(Buffer.from(cache, 'base64'));
- }
- const buffer = await getImageBuffer(url);
- if (buffer && buffer.byteLength > 0) {
- return sendBuffer(buffer, cacheKey);
- }
- }
-
- const { hostname, origin } = new URL(url);
- const cache = await redis.get(`favicon:${hostname}`);
- if (cache) {
- return sendBuffer(Buffer.from(cache, 'base64'));
- }
-
- // TRY FAVICON.ICO
- const buffer = await getImageBuffer(`${origin}/favicon.ico`);
- if (buffer && buffer.byteLength > 0) {
- return sendBuffer(buffer, hostname);
- }
-
- // PARSE HTML
- const res = await fetch(url).then((res) => res.text());
-
- function findFavicon(res: string) {
- const match = res.match(
- /(\<link(.+?)image\/x-icon(.+?)\>|\<link(.+?)shortcut\sicon(.+?)\>)/
- );
- if (!match) {
- return null;
- }
-
- return match[0].match(/href="(.+?)"/)?.[1] ?? null;
- }
-
- const favicon = findFavicon(res);
- if (favicon) {
- const buffer = await getImageBuffer(favicon);
-
- if (buffer && buffer.byteLength > 0) {
- return sendBuffer(buffer, hostname);
- }
- }
-
- return reply.status(404).send('Not found');
-}
-
-export async function clearFavicons(
- request: FastifyRequest,
- reply: FastifyReply
-) {
- const keys = await redis.keys('favicon:*');
- for (const key of keys) {
- await redis.del(key);
- }
- return reply.status(404).send('OK');
-}
diff --git a/apps/test/src/app/app-dir/page.component.tsx b/apps/test/src/app/app-dir/page.component.tsx
deleted file mode 100644
index 594515181..000000000
--- a/apps/test/src/app/app-dir/page.component.tsx
+++ /dev/null
@@ -1,12 +0,0 @@
-'use client';
-
-export default function TestPage({ triggerEvent }: { triggerEvent: any }) {
- return (
- <>
- <button onClick={() => triggerEvent()}>Event (server action)</button>
- <button data-event="yolo" data-yolo="123" data-hihi="taaa-daaaaa">
- Event (data-attributes)
- </button>
- </>
- );
-}
diff --git a/apps/test/src/app/app-dir/page.tsx b/apps/test/src/app/app-dir/page.tsx
deleted file mode 100644
index 5bb787c89..000000000
--- a/apps/test/src/app/app-dir/page.tsx
+++ /dev/null
@@ -1,113 +0,0 @@
-import { getClientIp, parseIp } from '@/utils/parseIp';
-import { isUserAgentSet, parseUserAgent } from '@/utils/parseUserAgent';
-import type { FastifyReply, FastifyRequest } from 'fastify';
-import { assocPath, pathOr } from 'ramda';
-
-import { getProfileById, upsertProfile } from '@openpanel/db';
-import type {
- IncrementProfilePayload,
- UpdateProfilePayload,
-} from '@openpanel/sdk';
-
-export async function updateProfile(
- request: FastifyRequest<{
- Body: UpdateProfilePayload;
- }>,
- reply: FastifyReply
-) {
- const { profileId, properties, ...rest } = request.body;
- const projectId = request.projectId;
- const ip = getClientIp(request)!;
- const ua = request.headers['user-agent']!;
- const uaInfo = parseUserAgent(ua);
- const geo = await parseIp(ip);
-
- await upsertProfile({
- id: profileId,
- projectId,
- properties: {
- ...(properties ?? {}),
- ...(ip ? geo : {}),
- ...(isUserAgentSet(ua) ? uaInfo : {}),
- },
- ...rest,
- });
-
- reply.status(202).send(profileId);
-}
-
-export async function incrementProfileProperty(
- request: FastifyRequest<{
- Body: IncrementProfilePayload;
- }>,
- reply: FastifyReply
-) {
- const { profileId, property, value } = request.body;
- const projectId = request.projectId;
-
- const profile = await getProfileById(profileId);
- if (!profile) {
- return reply.status(404).send('Not found');
- }
-
- const parsed = parseInt(
- pathOr<string>('0', property.split('.'), profile.properties),
- 10
- );
-
- if (isNaN(parsed)) {
- return reply.status(400).send('Not number');
- }
-
- profile.properties = assocPath(
- property.split('.'),
- parsed + value,
- profile.properties
- );
-
- await upsertProfile({
- id: profile.id,
- projectId,
- properties: profile.properties,
- });
-
- reply.status(202).send(profile.id);
-}
-
-export async function decrementProfileProperty(
- request: FastifyRequest<{
- Body: IncrementProfilePayload;
- }>,
- reply: FastifyReply
-) {
- const { profileId, property, value } = request.body;
- const projectId = request.projectId;
-
- const profile = await getProfileById(profileId);
- if (!profile) {
- return reply.status(404).send('Not found');
- }
-
- const parsed = parseInt(
- pathOr<string>('0', property.split('.'), profile.properties),
- 10
- );
-
- if (isNaN(parsed)) {
- return reply.status(400).send('Not number');
- }
-
- profile.properties = assocPath(
- property.split('.'),
- parsed - value,
- profile.properties
- );
-
- await upsertProfile({
- id: profile.id,
- projectId,
- properties: profile.properties,
- });
-
- reply.status(202).send(profile.id);
-}
diff --git a/apps/test/src/app/layout.tsx b/apps/test/src/app/layout.tsx
deleted file mode 100644
index f15c9cd8d..000000000
--- a/apps/test/src/app/layout.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-import { OpenpanelProvider } from '@openpanel-test/nextjs';
-
-export default function Layout({ children }: { children: React.ReactNode }) {
- return (
- <html lang="en">
- <head>
- <meta charSet="UTF-8" />
- <meta name="viewport" content="width=device-width, initial-scale=1.0" />
- </head>
- <body>
- <OpenpanelProvider
- clientId="0acce97f-1126-4439-b7ee-5d384e2fc94b"
- url="http://localhost:3333"
- trackScreenViews
- trackAttributes
- trackOutgoingLinks
- />
- {children}
- </body>
- </html>
- );
-}
diff --git a/apps/test/src/pages/_app.tsx b/apps/test/src/pages/_app.tsx
deleted file mode 100644
index 22c38e90e..000000000
--- a/apps/test/src/pages/_app.tsx
+++ /dev/null
@@ -1,15 +0,0 @@
-import { OpenpanelProvider } from '@openpanel-test/nextjs';
-import type { AppProps } from 'next/app';
-
-export default function MyApp({ Component, pageProps }: AppProps) {
- return (
- <>
- <OpenpanelProvider
- clientId="0acce97f-1126-4439-b7ee-5d384e2fc94b"
- url="http://localhost:3333"
- trackScreenViews
- />
- <Component {...pageProps} />
- </>
- );
-}
diff --git a/apps/test/src/pages/index.tsx b/apps/test/src/pages/index.tsx
deleted file mode 100644
index 396a6ece0..000000000
--- a/apps/test/src/pages/index.tsx
+++ /dev/null
@@ -1,14 +0,0 @@
-import Link from 'next/link';
-
-export default function Home() {
- return (
- <div className="flex flex-col gap-2">
- <Link href="/test">Test</Link>
- <a href="https://google.se">Google</a>
- <a href="https://kiddokitchen.se">KiddoKitchen</a>
- <a href="https://kiddokitchen.se" target="_blank" rel="noreferrer">
- KiddoKitchen (_blank)
- </a>
- </div>
- );
-}
diff --git a/apps/test/src/pages/test.tsx b/apps/test/src/pages/test.tsx
deleted file mode 100644
index d93d42415..000000000
--- a/apps/test/src/pages/test.tsx
+++ /dev/null
@@ -1,121 +0,0 @@
-import { useEffect, useState } from 'react';
-import {
- clear,
- decrement,
- increment,
- setProfile,
- trackEvent,
-} from '@openpanel-test/nextjs';
-import Link from 'next/link';
-
-export default function Test() {
- const [id, setId] = useState('');
- const [auth, setAuth] = useState<string | null>(null);
-
- function handleLogin() {
- if (id) {
- localStorage.setItem('auth', id);
- setAuth(id);
- }
- }
-
- function handleLogout() {
- localStorage.removeItem('auth');
- setAuth(null);
- }
-
- useEffect(() => {
- setAuth(localStorage.getItem('auth') ?? null);
- }, []);
-
- useEffect(() => {
- console.log('auth', auth);
-
- if (auth) {
- console.log('set profile?', auth);
-
- setProfile({
- profileId: auth,
- });
- } else {
- clear();
- }
- }, [auth]);
-
- if (auth === null) {
- return (
- <div>
- <input
- type="text"
- placeholder="Login with user id"
- onChange={(e) => setId(e.target.value)}
- />
- <button onClick={handleLogin}>Login</button>
- </div>
- );
- }
- return (
- <div>
- <Link href="/">Home</Link>
- <button
- onClick={() => {
- setProfile({
- firstName: 'Maja',
- lastName: 'Klara',
- profileId: auth,
- });
- }}
- >
- Set user
- </button>
- <button
- onClick={() => {
- increment('app_open', 1);
- }}
- >
- Increment
- </button>
- <button
- onClick={() => {
- decrement('app_open', 1);
- }}
- >
- Decrement
- </button>
- <button
- onClick={() => {
- localStorage.clear();
- window.location.reload();
- }}
- >
- Clear storage and reload
- </button>
- <button
- onClick={() => {
- trackEvent('custom_click', {
- custom_string: 'test',
- custom_number: 1,
- });
- }}
- >
- Trigger event
- </button>
- <button onClick={handleLogout}>Logout</button>
-
- <div>
- {['a', 'b', 'c', 'd', 'f'].map((letter) => (
- <button
- key={letter}
- onClick={() => {
- trackEvent(letter, {
- foo: 'bar',
- });
- }}
- >
- {letter.toUpperCase()}
- </button>
- ))}
- </div>
- </div>
- );
-}
diff --git a/apps/test/tailwind.config.js b/apps/test/tailwind.config.js
deleted file mode 100644
index 931a5665b..000000000
--- a/apps/test/tailwind.config.js
+++ /dev/null
@@ -1,102 +0,0 @@
-const colors = [
- '#7856ff',
- '#ff7557',
- '#7fe1d8',
- '#f8bc3c',
- '#b3596e',
- '#72bef4',
- '#ffb27a',
- '#0f7ea0',
- '#3ba974',
- '#febbb2',
- '#cb80dc',
- '#5cb7af',
-];
-
-/** @type {import('tailwindcss').Config} */
-const config = {
- safelist: [...colors.map((color) => `chart-${color}`)],
- content: [
- './pages/**/*.{ts,tsx}',
- './components/**/*.{ts,tsx}',
- './app/**/*.{ts,tsx}',
- './src/**/*.{ts,tsx}',
- ],
- theme: {
- container: {
- center: true,
- padding: '2rem',
- screens: {
- '2xl': '1400px',
- },
- },
- extend: {
- colors: {
- border: 'hsl(var(--border))',
- input: 'hsl(var(--input))',
- ring: 'hsl(var(--ring))',
- background: 'hsl(var(--background))',
- foreground: 'hsl(var(--foreground))',
- primary: {
- DEFAULT: 'hsl(var(--primary))',
- foreground: 'hsl(var(--primary-foreground))',
- },
- secondary: {
- DEFAULT: 'hsl(var(--secondary))',
- foreground: 'hsl(var(--secondary-foreground))',
- },
- destructive: {
- DEFAULT: 'hsl(var(--destructive))',
- foreground: 'hsl(var(--destructive-foreground))',
- },
- muted: {
- DEFAULT: 'hsl(var(--muted))',
- foreground: 'hsl(var(--muted-foreground))',
- },
- accent: {
- DEFAULT: 'hsl(var(--accent))',
- foreground: 'hsl(var(--accent-foreground))',
- },
- popover: {
- DEFAULT: 'hsl(var(--popover))',
- foreground: 'hsl(var(--popover-foreground))',
- },
- card: {
- DEFAULT: 'hsl(var(--card))',
- foreground: 'hsl(var(--card-foreground))',
- },
- ...colors.reduce((acc, color, index) => {
- return {
- ...acc,
- [`chart-${index}`]: color,
- };
- }, {}),
- },
- borderRadius: {
- lg: 'var(--radius)',
- md: 'calc(var(--radius) - 2px)',
- sm: 'calc(var(--radius) - 4px)',
- },
- boxShadow: {
- DEFAULT: '0 5px 10px rgb(0 0 0 / 5%)',
- },
- keyframes: {
- 'accordion-down': {
- from: { height: '0px' },
- to: { height: 'var(--radix-accordion-content-height)' },
- },
- 'accordion-up': {
- from: { height: 'var(--radix-accordion-content-height)' },
- to: { height: '0px' },
- },
- },
- animation: {
- 'accordion-down': 'accordion-down 0.2s ease-out',
- 'accordion-up': 'accordion-up 0.2s ease-out',
- },
- },
- },
- plugins: [require('tailwindcss-animate')],
-};
-
-export default config;
diff --git a/apps/test/tsconfig.json b/apps/test/tsconfig.json
deleted file mode 100644
index d17f2ec20..000000000
--- a/apps/test/tsconfig.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
- "extends": "@openpanel/tsconfig/base.json",
- "compilerOptions": {
- "baseUrl": ".",
- "paths": {
- "@/*": ["./src/*"]
- },
- "plugins": [
- {
- "name": "next"
- }
- ],
- "tsBuildInfoFile": "node_modules/.cache/tsbuildinfo.json",
- "strictNullChecks": true
- },
- "include": [".", ".next/types/**/*.ts"],
- "exclude": ["node_modules"]
-}
diff --git a/apps/worker/tsconfig.json b/apps/worker/tsconfig.json
index d17f2ec20..6f9c5b170 100644
--- a/apps/worker/tsconfig.json
+++ b/apps/worker/tsconfig.json
@@ -13,6 +13,6 @@
"tsBuildInfoFile": "node_modules/.cache/tsbuildinfo.json",
"strictNullChecks": true
},
- "include": [".", ".next/types/**/*.ts"],
- "exclude": ["node_modules"]
+ "include": ["."],
+ "exclude": ["node_modules", "dist"]
}
diff --git a/packages/db/scripts/insert.ts b/packages/db/scripts/insert.ts
deleted file mode 100644
index 5f270b237..000000000
--- a/packages/db/scripts/insert.ts
+++ /dev/null
@@ -1,162 +0,0 @@
-// @ts-nocheck
-
-import { createEvent } from '@/services/event.service';
-import { last, omit } from 'ramda';
-
-import type { Event } from '../src/prisma-client';
-import { db } from '../src/prisma-client';
-
-async function push(event: Event) {
- if (event.properties.ip && Number.isNaN(parseInt(event.properties.ip[0]))) {
- return console.log('IGNORE', event.id);
- }
- await fetch('http://localhost:3030/api/event', {
- method: 'POST',
- body: JSON.stringify({
- name: event.name,
- timestamp: event.createdAt.toISOString(),
- path: event.properties.path,
- properties: omit(
- [
- 'ip',
- 'os',
- 'ua',
- 'url',
- 'hash',
- 'host',
- 'path',
- 'device',
- 'screen',
- 'hostname',
- 'language',
- 'referrer',
- 'timezone',
- ],
- event.properties
- ),
- referrer: event.properties?.referrer?.host ?? undefined,
- }),
- headers: {
- 'Content-Type': 'application/json',
- 'User-Agent': event.properties.ua,
- 'X-Forwarded-For': event.properties.ip,
- 'openpanel-client-id': 'c8b4962e-bc3d-4b23-8ea4-505c8fbdf09e',
- origin: 'https://openpanel.kiddo.se',
- },
- }).catch(() => {});
-}
-
-async function main() {
- const events = await db.event.findMany({
- where: {
- project_id: '4e2798cb-e255-4e9d-960d-c9ad095aabd7',
- name: 'screen_view',
- createdAt: {
- gte: new Date('2024-01-14'),
- lt: new Date('2024-01-18'),
- },
- },
- orderBy: {
- createdAt: 'asc',
- },
- });
-
- const grouped: Record<string, Event[]> = {};
- let index = 0;
- for (const event of events.slice()) {
- console.log(index, event.name, event.createdAt.toISOString());
- index++;
-
- if (event.properties.ua?.includes('bot')) {
- console.log('IGNORE', event.id);
- continue;
- }
-
- if (grouped[event.profile_id]) {
- grouped[event.profile_id].push(event);
- } else {
- grouped[event.profile_id] = [event];
- }
- }
-
- for (const profile_id of Object.keys(grouped).slice(0, 10)) {
- const events = grouped[profile_id];
-
- if (events) {
- console.log('new user...');
- let eidx = -1;
- for (const event of events) {
- eidx++;
- const lastEventAt = events[eidx - 1]?.createdAt;
-
- const profileId: string | null = null;
- const projectId = event.project_id;
- const path = event.properties.path as string;
- const ip = event.properties.ip as string;
- const origin = 'https://openpanel.kiddo.se';
- const ua = event.properties.ua as string;
- const uaInfo = parseUserAgent(ua);
- const salts = await getSalts();
- const currentProfileId = generateProfileId({
- salt: salts.current,
- origin,
- ip,
- ua,
- });
- const previousProfileId = generateProfileId({
- salt: salts.previous,
- origin,
- ip,
- ua,
- });
-
- const [geo, eventsJobs] = Promise.all([
- parseIp(ip),
- eventsQueue.getJobs(['delayed']),
- ]);
- const payload: IServiceCreateEventPayload = {
- name: body.name,
- profileId,
- projectId,
- properties: body.properties,
- createdAt: body.timestamp,
- country: geo.country,
- city: geo.city,
- region: geo.region,
- continent: geo.continent,
- os: uaInfo.os,
- osVersion: uaInfo.osVersion,
- browser: uaInfo.browser,
- browserVersion: uaInfo.browserVersion,
- device: uaInfo.device,
- brand: uaInfo.brand,
- model: uaInfo.model,
- duration: 0,
- path,
- referrer: body.referrer, // TODO
- referrerName: body.referrer, // TODO
- };
-
- if (!lastEventAt) {
- createEvent({});
- continue;
- }
-
- if (
- event.createdAt.getTime() - lastEventAt.getTime() >
- 1000 * 60 * 30
- ) {
- console.log(
- 'new Session?',
- event.createdAt.toISOString(),
- event.properties.path
- );
- } else {
- console.log('Same session?');
- }
- }
- }
- }
-}
-
-main();
diff --git a/packages/db/scripts/test-funnel.ts b/packages/db/scripts/test-funnel.ts
deleted file mode 100644
index 9bc50ba86..000000000
--- a/packages/db/scripts/test-funnel.ts
+++ /dev/null
@@ -1,101 +0,0 @@
-import { createEvent } from '../src/services/event.service';
-
-function c(name: string, createdAt: Date, session_id: string) {
- return createEvent({
- name,
- deviceId: '',
- profileId: '',
- projectId: '',
- sessionId: session_id,
- properties: {},
- createdAt,
- country: '',
- city: '',
- region: '',
- continent: '',
- os: '',
- osVersion: '',
- browser: '',
- browserVersion: '',
- device: '',
- brand: '',
- model: '',
- duration: 0,
- path: '/',
- referrer: '',
- referrerName: '',
- referrerType: '',
- profile: undefined,
- meta: undefined,
- });
-}
-
-async function main() {
- // Level 5
- const s = Math.random().toString(36).substring(7);
- await c('session_start', new Date('2024-02-24 10:10:00'), s);
-
- // // Level 2
- // s = 's2';
- // await c('session_start', new Date('2024-02-24 10:10:00'), '');
- // await c('a', new Date('2024-02-24 10:10:00'), s);
- // await c('b', new Date('2024-02-24 10:10:02'), s);
-
- // // Level 5
- // s = 's3';
- // await c('session_start', new Date('2024-02-24 10:10:00'), '');
- // await c('a', new Date('2024-02-24 10:10:00'), s);
- // await c('b', new Date('2024-02-24 10:10:02'), s);
- // await c('c', new Date('2024-02-24 10:10:03'), s);
- // await c('d', new Date('2024-02-24 10:10:04'), s);
- // await c('f', new Date('2024-02-24 10:10:10'), s);
-
- // // Level 4
- // s = 's4';
- // await c('session_start', new Date('2024-02-24 10:10:00'), '');
- // await c('a', new Date('2024-02-24 10:10:00'), s);
- // await c('b', new Date('2024-02-24 10:10:02'), s);
- // await c('c', new Date('2024-02-24 10:10:03'), s);
- // await c('d', new Date('2024-02-24 10:10:04'), s);
-
- // // Level 3
- // s = 's5';
- // await c('session_start', new Date('2024-02-24 10:10:00'), '');
- // await c('a', new Date('2024-02-24 10:10:00'), s);
- // await c('b', new Date('2024-02-24 10:10:02'), s);
- // await c('c', new Date('2024-02-24 10:10:03'), s);
-
- // // Level 3
- // s = 's6';
- // await c('session_start', new Date('2024-02-24 10:10:00'), '');
- // await c('a', new Date('2024-02-24 10:10:00'), s);
- // await c('b', new Date('2024-02-24 10:10:02'), s);
- // await c('c', new Date('2024-02-24 10:10:03'), s);
-
- // // Level 2
- // s = 's7';
- // await c('session_start', new Date('2024-02-24 10:10:00'), '');
- // await c('a', new Date('2024-02-24 10:10:00'), s);
- // await c('b', new Date('2024-02-24 10:10:02'), s);
-
- // // Level 5
- // s = 's8';
- // await c('session_start', new Date('2024-02-24 10:10:00'), '');
- // await c('a', new Date('2024-02-24 10:10:00'), s);
- // await c('b', new Date('2024-02-24 10:10:02'), s);
- // await c('c', new Date('2024-02-24 10:10:03'), s);
- // await c('d', new Date('2024-02-24 10:10:04'), s);
- // await c('f', new Date('2024-02-24 10:10:10'), s);
-
- // // Level 4
- // s = 's9';
- // await c('session_start', new Date('2024-02-24 10:10:00'), '');
- // await c('a', new Date('2024-02-24 10:10:00'), s);
- // await c('b', new Date('2024-02-24 10:10:02'), s);
- // await c('c', new Date('2024-02-24 10:10:03'), s);
- // await c('d', new Date('2024-02-24 10:10:04'), s);
-
- process.exit();
-}
-
-main();
diff --git a/packages/sdks/nextjs/tsconfig.json b/packages/sdks/nextjs/tsconfig.json
index 145f03d29..fa4341f12 100644
--- a/packages/sdks/nextjs/tsconfig.json
+++ b/packages/sdks/nextjs/tsconfig.json
@@ -3,5 +3,6 @@
"compilerOptions": {
"incremental": false,
"outDir": "dist"
- }
+ },
+ "exclude": ["dist"]
}
diff --git a/packages/sdks/react-native/tsconfig.json b/packages/sdks/react-native/tsconfig.json
index 145f03d29..fa4341f12 100644
--- a/packages/sdks/react-native/tsconfig.json
+++ b/packages/sdks/react-native/tsconfig.json
@@ -3,5 +3,6 @@
"compilerOptions": {
"incremental": false,
"outDir": "dist"
- }
+ },
+ "exclude": ["dist"]
}
diff --git a/packages/sdks/sdk/tsconfig.json b/packages/sdks/sdk/tsconfig.json
index 145f03d29..fa4341f12 100644
--- a/packages/sdks/sdk/tsconfig.json
+++ b/packages/sdks/sdk/tsconfig.json
@@ -3,5 +3,6 @@
"compilerOptions": {
"incremental": false,
"outDir": "dist"
- }
+ },
+ "exclude": ["dist"]
}
diff --git a/packages/sdks/web/cdn.ts b/packages/sdks/web/cdn.ts
index 2f456717e..b9ce999ef 100644
--- a/packages/sdks/web/cdn.ts
+++ b/packages/sdks/web/cdn.ts
@@ -1,3 +1,5 @@
+/* eslint-disable @typescript-eslint/no-unsafe-call */
+
import { Openpanel } from './index';
declare global {
diff --git a/packages/sdks/web/index.ts b/packages/sdks/web/index.ts
index 7a32ca4a7..cf2cb08f8 100644
--- a/packages/sdks/web/index.ts
+++ b/packages/sdks/web/index.ts
@@ -1,3 +1,5 @@
+/* eslint-disable @typescript-eslint/unbound-method */
+
import type { OpenpanelSdkOptions, PostEventPayload } from '@openpanel/sdk';
import { OpenpanelSdk } from '@openpanel/sdk';
diff --git a/packages/sdks/web/tsconfig.json b/packages/sdks/web/tsconfig.json
index 145f03d29..fa4341f12 100644
--- a/packages/sdks/web/tsconfig.json
+++ b/packages/sdks/web/tsconfig.json
@@ -3,5 +3,6 @@
"compilerOptions": {
"incremental": false,
"outDir": "dist"
- }
+ },
+ "exclude": ["dist"]
}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 63822359f..36e8af582 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -628,73 +628,6 @@ importers:
specifier: ^5.2.2
version: 5.3.3
- apps/test:
- dependencies:
- '@openpanel-test/nextjs':
- specifier: workspace:@openpanel/nextjs@*
- version: link:../../packages/sdks/nextjs
- '@openpanel-test/sdk':
- specifier: workspace:@openpanel/sdk@*
- version: link:../../packages/sdks/sdk
- '@openpanel-test/web':
- specifier: workspace:@openpanel/web@*
- version: link:../../packages/sdks/web
- next:
- specifier: ~14.1.0
- react:
- specifier: 18.2.0
- version: 18.2.0
- react-dom:
- specifier: 18.2.0
- version: 18.2.0([email protected])
- devDependencies:
- '@openpanel/eslint-config':
- specifier: workspace:*
- version: link:../../tooling/eslint
- '@openpanel/prettier-config':
- specifier: workspace:*
- version: link:../../tooling/prettier
- '@openpanel/tsconfig':
- specifier: workspace:*
- version: link:../../tooling/typescript
- '@types/react':
- specifier: ^18.2.20
- version: 18.2.56
- '@types/react-dom':
- specifier: ^18.2.7
- version: 18.2.19
- '@types/react-syntax-highlighter':
- specifier: ^15.5.9
- version: 15.5.11
- '@typescript-eslint/eslint-plugin':
- specifier: ^6.6.0
- version: 6.21.0(@typescript-eslint/[email protected])([email protected])([email protected])
- '@typescript-eslint/parser':
- specifier: ^6.6.0
- autoprefixer:
- specifier: ^10.4.14
- version: 10.4.17([email protected])
- eslint:
- specifier: ^8.48.0
- version: 8.56.0
- postcss:
- specifier: ^8.4.27
- version: 8.4.35
- prettier:
- specifier: ^3.0.3
- version: 3.2.5
- prettier-plugin-tailwindcss:
- specifier: ^0.5.1
- version: 0.5.11(@ianvs/[email protected])([email protected])
- tailwindcss:
- specifier: ^3.3.3
- version: 3.4.1
- typescript:
- specifier: ^5.2.2
- version: 5.3.3
-
apps/worker:
dependencies:
'@bull-board/api':
@@ -821,7 +754,7 @@ importers:
dependencies:
'@clerk/nextjs':
specifier: ^4.29.7
'@clickhouse/client':
specifier: ^0.2.9
version: 0.2.9
@@ -2811,26 +2744,6 @@ packages:
tslib: 2.4.1
dev: false
- resolution: {integrity: sha512-tPvIp4GXCsjcKankLRpPPQGDWmpmlB2tm+p656/OUUmzPMeDnk5Euc86HjSk+5C9BAHVatrveRth6fHa4yzNhQ==}
- engines: {node: '>=14'}
- peerDependencies:
- next: '>=10'
- react: ^17.0.2 || ^18.0.0-0
- react-dom: ^17.0.2 || ^18.0.0-0
- dependencies:
- '@clerk/backend': 0.38.1([email protected])
- '@clerk/clerk-react': 4.30.5([email protected])
- '@clerk/clerk-sdk-node': 4.13.9([email protected])
- '@clerk/shared': 1.3.1([email protected])
- '@clerk/types': 3.62.0
- path-to-regexp: 6.2.1
- react: 18.2.0
- react-dom: 18.2.0([email protected])
- tslib: 2.4.1
- dev: false
-
resolution: {integrity: sha512-nzv4+uA90I/eQp55zfK9a1Po9VgCYlzlNhuZnKqyRsPyJ38l4gpIf3B3qSHHdN0+MTx9cWGFrik1CnpftdOBXQ==}
peerDependencies:
diff --git a/tooling/eslint/base.js b/tooling/eslint/base.js
index 5954b0a1f..7ad6389d7 100644
--- a/tooling/eslint/base.js
+++ b/tooling/eslint/base.js
@@ -47,6 +47,7 @@ const config = {
'**/*.config.cjs',
'.next',
'dist',
+ 'public',
'pnpm-lock.yaml',
],
reportUnusedDisableDirectives: true,
diff --git a/tooling/eslint/react.js b/tooling/eslint/react.js
index 5b657e14a..3324e6468 100644
--- a/tooling/eslint/react.js
+++ b/tooling/eslint/react.js
@@ -8,7 +8,8 @@ const config = {
rules: {
'react/prop-types': 'off',
'react/no-unknown-property': 'off',
- 'jsx-a11y/click-events-have-key-events': 'off'
+ 'jsx-a11y/click-events-have-key-events': 'off',
+ 'jsx-a11y/label-has-associated-control': 'off',
},
globals: {
React: 'writable',
diff --git a/tooling/publish/publish.ts b/tooling/publish/publish.ts
index 9206e9aff..9889093bb 100644
--- a/tooling/publish/publish.ts
+++ b/tooling/publish/publish.ts
@@ -81,6 +81,7 @@ function main() {
delete properties.type;
}
+ // eslint-disable-next-line @typescript-eslint/no-var-requires
const pkgJson = require(
workspacePath(`./packages/sdks/${name}/package.json`)
);