Skip to content

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

make onboarding + create client easier

Carl-Gerhard Lindesvärd83816fa1049d
diff --git a/apps/dashboard/package.json b/apps/dashboard/package.json
index 2799069ea..40a0519c7 100644
--- a/apps/dashboard/package.json
+++ b/apps/dashboard/package.json
@@ -33,6 +33,7 @@
"@radix-ui/react-progress": "^1.0.3",
"@radix-ui/react-scroll-area": "^1.0.5",
"@radix-ui/react-slot": "^1.0.2",
+ "@radix-ui/react-tabs": "^1.0.4",
"@radix-ui/react-toast": "^1.1.5",
"@radix-ui/react-toggle": "^1.0.3",
"@radix-ui/react-toggle-group": "^1.0.4",
diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/create-client.tsx b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/create-client.tsx
deleted file mode 100644
index 71757a877..000000000
--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/create-client.tsx
+++ /dev/null
@@ -1,252 +0,0 @@
-'use client';
-
-import { useEffect, useState } from 'react';
-import { Button } from '@/components/ui/button';
-import { CheckboxInput } from '@/components/ui/checkbox';
-import {
- Dialog,
- DialogContent,
- DialogDescription,
- DialogFooter,
- DialogHeader,
- DialogTitle,
-} from '@/components/ui/dialog';
-import { Input } from '@/components/ui/input';
-import { Label } from '@/components/ui/label';
-import { useAppParams } from '@/hooks/useAppParams';
-import { clipboard } from '@/utils/clipboard';
-import { zodResolver } from '@hookform/resolvers/zod';
-import { Copy, SaveIcon } from 'lucide-react';
-import Link from 'next/link';
-import { useRouter } from 'next/navigation';
-import type { SubmitHandler } from 'react-hook-form';
-import { Controller, useForm, useWatch } 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),
- domain: z.string().optional(),
- withSecret: z.boolean().optional(),
-});
-
-type IForm = z.infer<typeof validation>;
-
-export function CreateClient() {
- const [open, setOpen] = useState(false);
- const { organizationId, projectId } = useAppParams();
- const clients = api.client.list.useQuery({
- organizationId,
- });
- const clientsCount = clients.data?.length;
-
- useEffect(() => {
- if (clientsCount === 0) {
- setOpen(true);
- }
- }, [clientsCount]);
-
- const router = useRouter();
- const form = useForm<IForm>({
- resolver: zodResolver(validation),
- defaultValues: {
- withSecret: false,
- name: '',
- domain: '',
- },
- });
- const mutation = api.client.create2.useMutation({
- onError: handleError,
- onSuccess() {
- toast.success('Client created');
- router.refresh();
- },
- });
- const onSubmit: SubmitHandler<IForm> = (values) => {
- mutation.mutate({
- name: values.name,
- domain: values.withSecret ? undefined : values.domain,
- organizationId,
- projectId,
- });
- };
-
- const watch = useWatch({
- control: form.control,
- name: 'withSecret',
- });
-
- return (
- <Dialog open={open}>
- {mutation.isSuccess ? (
- <>
- <DialogContent
- className="sm:max-w-[425px]"
- onClose={() => setOpen(false)}
- >
- <DialogHeader>
- <DialogTitle>Success</DialogTitle>
- <DialogDescription>
- {mutation.data.clientSecret
- ? 'Use your client id and secret with our SDK to send events to us. '
- : 'Use your client id with our SDK to send events to us. '}
- See our{' '}
- <Link href="https//openpanel.dev/docs" className="underline">
- documentation
- </Link>
- </DialogDescription>
- </DialogHeader>
- <div className="grid gap-4 py-4">
- <button
- className="mt-4 text-left"
- onClick={() => clipboard(mutation.data.clientId)}
- >
- <Label>Client ID</Label>
- <div className="flex items-center justify-between rounded bg-gray-100 p-2 px-3">
- {mutation.data.clientId}
- <Copy size={16} />
- </div>
- </button>
- {mutation.data.clientSecret ? (
- <button
- className="mt-4 text-left"
- onClick={() => clipboard(mutation.data.clientId)}
- >
- <Label>Secret</Label>
- <div className="flex items-center justify-between rounded bg-gray-100 p-2 px-3">
- {mutation.data.clientSecret}
- <Copy size={16} />
- </div>
- </button>
- ) : (
- <div className="mt-4 text-left">
- <Label>Cors settings</Label>
- <div className="flex items-center justify-between rounded bg-gray-100 p-2 px-3">
- {mutation.data.cors}
- </div>
- <div className="text-sm italic mt-1">
- You can update cors settings{' '}
- <Link className="underline" href="/qwe/qwe/">
- here
- </Link>
- </div>
- </div>
- )}
- </div>
- <DialogFooter>
- <Button
- type="button"
- variant={'secondary'}
- onClick={() => setOpen(false)}
- >
- Close
- </Button>
- </DialogFooter>
- </DialogContent>
- </>
- ) : (
- <>
- <DialogContent
- className="sm:max-w-[425px]"
- onClose={() => setOpen(false)}
- >
- <DialogHeader>
- <DialogTitle>Let's connect</DialogTitle>
- <DialogDescription>
- Create a client so you can start send events to us 🚀
- </DialogDescription>
- </DialogHeader>
- <form
- className="flex flex-col gap-4"
- onSubmit={form.handleSubmit(onSubmit)}
- >
- <div className="grid gap-4 py-4">
- <div>
- <Label>Client name</Label>
- <Input
- placeholder="Eg. My App Client"
- error={form.formState.errors.name?.message}
- {...form.register('name')}
- />
- </div>
- <Controller
- name="withSecret"
- control={form.control}
- render={({ field }) => (
- <CheckboxInput
- defaultChecked={field.value}
- onCheckedChange={(checked) => {
- field.onChange(!checked);
- }}
- >
- This is a website
- </CheckboxInput>
- )}
- />
- <div>
- <Label>Your domain name</Label>
- <Input
- placeholder="https://...."
- error={form.formState.errors.domain?.message}
- {...form.register('domain')}
- disabled={watch}
- />
- </div>
- </div>
- <DialogFooter>
- <Button
- type="button"
- variant={'secondary'}
- onClick={() => setOpen(false)}
- >
- Cancel
- </Button>
- <Button
- type="submit"
- icon={SaveIcon}
- loading={mutation.isLoading}
- >
- Create
- </Button>
- </DialogFooter>
- </form>
- </DialogContent>
- </>
- )}
- </Dialog>
- );
-}
-
-// <div>
-// <div className="text-lg">
-// Select your framework and we'll generate a client for you.
-// </div>
-// <div className="flex flex-wrap gap-2 mt-8">
-// <FeatureButton
-// name="React"
-// logo="https://upload.wikimedia.org/wikipedia/commons/thumb/a/a7/React-icon.svg/2300px-React-icon.svg.png"
-// />
-// <FeatureButton
-// name="React Native"
-// logo="https://upload.wikimedia.org/wikipedia/commons/thumb/a/a7/React-icon.svg/2300px-React-icon.svg.png"
-// />
-// <FeatureButton
-// name="Next.js"
-// logo="https://static-00.iconduck.com/assets.00/nextjs-icon-512x512-y563b8iq.png"
-// />
-// <FeatureButton
-// name="Remix"
-// logo="https://www.datocms-assets.com/205/1642515307-square-logo.svg"
-// />
-// <FeatureButton
-// name="Vue"
-// logo="https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcQ0UhQnp6TUPCwAr3ruTEwBDiTN5HLAWaoUD3AJIgtepQ&s"
-// />
-// <FeatureButton
-// name="HTML"
-// logo="https://upload.wikimedia.org/wikipedia/commons/thumb/6/61/HTML5_logo_and_wordmark.svg/240px-HTML5_logo_and_wordmark.svg.png"
-// />
-// </div>
-// </div>
diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/layout-menu.tsx b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/layout-menu.tsx
index f0028c597..660ae7c3d 100644
--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/layout-menu.tsx
+++ b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/layout-menu.tsx
@@ -4,11 +4,10 @@ import { useEffect } from 'react';
import { useAppParams } from '@/hooks/useAppParams';
import { cn } from '@/utils/cn';
import { useUser } from '@clerk/nextjs';
-import type { IServiceDashboards } from '@openpanel/db';
import {
+ BookmarkIcon,
BuildingIcon,
CogIcon,
- DotIcon,
GanttChartIcon,
KeySquareIcon,
LayoutPanelTopIcon,
@@ -21,6 +20,8 @@ import type { LucideProps } from 'lucide-react';
import Link from 'next/link';
import { usePathname } from 'next/navigation';
+import type { IServiceDashboards } from '@openpanel/db';
+
function LinkWithIcon({
href,
icon: Icon,
@@ -127,7 +128,7 @@ export default function LayoutMenu({ dashboards }: LayoutMenuProps) {
href={`/${params.organizationId}/${projectId}/settings/profile`}
/>
<LinkWithIcon
- icon={UserIcon}
+ icon={BookmarkIcon}
label="References"
href={`/${params.organizationId}/${projectId}/settings/references`}
/>
diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/page.tsx b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/page.tsx
index 33bfc9feb..737aa546f 100644
--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/page.tsx
+++ b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/page.tsx
@@ -10,10 +10,10 @@ import OverviewTopGeo from '@/components/overview/overview-top-geo';
import OverviewTopPages from '@/components/overview/overview-top-pages';
import OverviewTopSources from '@/components/overview/overview-top-sources';
import { getExists } from '@/server/pageExists';
+
import { db } from '@openpanel/db';
import OverviewMetrics from '../../../../components/overview/overview-metrics';
-import { CreateClient } from './create-client';
import { StickyBelowHeader } from './layout-sticky-below-header';
import { OverviewReportRange } from './overview-sticky-header';
@@ -38,7 +38,6 @@ export default async function Page({
return (
<PageLayout title="Overview" organizationSlug={organizationId}>
- <CreateClient />
<StickyBelowHeader>
<div className="p-4 flex gap-2 justify-between">
<div className="flex gap-2">
diff --git a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/profile/logout.tsx b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/profile/logout.tsx
index e4e14826e..a599d5f43 100644
--- a/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/profile/logout.tsx
+++ b/apps/dashboard/src/app/(app)/[organizationId]/[projectId]/settings/profile/logout.tsx
@@ -1,19 +1,23 @@
'use client';
+import { buttonVariants } from '@/components/ui/button';
import { Widget, WidgetBody, WidgetHead } from '@/components/Widget';
import { SignOutButton } from '@clerk/nextjs';
export function Logout() {
return (
<Widget className="border-destructive">
- <WidgetHead className="border-destructive">
- <span className="title text-destructive">Sad part</span>
+ <WidgetHead>
+ <span className="title">Sad part</span>
</WidgetHead>
<WidgetBody>
<p className="mb-4">
Sometime&apos;s you need to go. See you next time
</p>
- <SignOutButton />
+ <SignOutButton
+ // @ts-expect-error
+ className={buttonVariants({ variant: 'destructive' })}
+ />
</WidgetBody>
</Widget>
);
diff --git a/apps/dashboard/src/app/(app)/[organizationId]/create-project.tsx b/apps/dashboard/src/app/(app)/[organizationId]/create-project.tsx
index 59c132a86..8d5852450 100644
--- a/apps/dashboard/src/app/(app)/[organizationId]/create-project.tsx
+++ b/apps/dashboard/src/app/(app)/[organizationId]/create-project.tsx
@@ -2,7 +2,6 @@
import { LogoSquare } from '@/components/Logo';
import { Button } from '@/components/ui/button';
-import { Checkbox } from '@/components/ui/checkbox';
import { Input } from '@/components/ui/input';
import { Label } from '@/components/ui/label';
import { useAppParams } from '@/hooks/useAppParams';
@@ -79,35 +78,3 @@ export function CreateProject() {
</>
);
}
-
-// <div>
-// <div className="text-lg">
-// Select your framework and we'll generate a client for you.
-// </div>
-// <div className="flex flex-wrap gap-2 mt-8">
-// <FeatureButton
-// name="React"
-// logo="https://upload.wikimedia.org/wikipedia/commons/thumb/a/a7/React-icon.svg/2300px-React-icon.svg.png"
-// />
-// <FeatureButton
-// name="React Native"
-// logo="https://upload.wikimedia.org/wikipedia/commons/thumb/a/a7/React-icon.svg/2300px-React-icon.svg.png"
-// />
-// <FeatureButton
-// name="Next.js"
-// logo="https://static-00.iconduck.com/assets.00/nextjs-icon-512x512-y563b8iq.png"
-// />
-// <FeatureButton
-// name="Remix"
-// logo="https://www.datocms-assets.com/205/1642515307-square-logo.svg"
-// />
-// <FeatureButton
-// name="Vue"
-// logo="https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcQ0UhQnp6TUPCwAr3ruTEwBDiTN5HLAWaoUD3AJIgtepQ&s"
-// />
-// <FeatureButton
-// name="HTML"
-// logo="https://upload.wikimedia.org/wikipedia/commons/thumb/6/61/HTML5_logo_and_wordmark.svg/240px-HTML5_logo_and_wordmark.svg.png"
-// />
-// </div>
-// </div>
diff --git a/apps/dashboard/src/app/(app)/[organizationId]/page.tsx b/apps/dashboard/src/app/(app)/[organizationId]/page.tsx
index ea705c603..f4e5738e5 100644
--- a/apps/dashboard/src/app/(app)/[organizationId]/page.tsx
+++ b/apps/dashboard/src/app/(app)/[organizationId]/page.tsx
@@ -30,7 +30,7 @@ export default async function Page({ params: { organizationId } }: PageProps) {
const isAccepted = await isWaitlistUserAccepted();
if (!isAccepted) {
return (
- <div className="flex items-center justify-center h-screen">
+ <div className="p-4 flex items-center justify-center h-screen">
<div className="max-w-lg w-full">
<LogoSquare className="w-20 md:w-28 mb-8" />
<h1 className="font-medium text-3xl">Not quite there yet</h1>
@@ -46,7 +46,7 @@ export default async function Page({ params: { organizationId } }: PageProps) {
if (projects.length === 0) {
return (
- <div className="flex items-center justify-center h-screen">
+ <div className="flex items-center justify-center h-screen p-4 ">
<div className="max-w-lg w-full">
<CreateProject />
</div>
@@ -59,7 +59,7 @@ export default async function Page({ params: { organizationId } }: PageProps) {
}
return (
- <div className="max-w-xl w-full mx-auto flex flex-col gap-4 pt-20">
+ <div className="max-w-xl w-full mx-auto flex flex-col gap-4 pt-20 p-4 ">
<h1 className="font-medium text-xl">Select project</h1>
{projects.map((item) => (
<ProjectCard key={item.id} {...item} />
diff --git a/apps/dashboard/src/app/(app)/create-organization.tsx b/apps/dashboard/src/app/(app)/create-organization.tsx
index 755038299..ea2357576 100644
--- a/apps/dashboard/src/app/(app)/create-organization.tsx
+++ b/apps/dashboard/src/app/(app)/create-organization.tsx
@@ -1,11 +1,16 @@
'use client';
+import { useState } from 'react';
+import { CreateClientSuccess } from '@/components/clients/create-client-success';
import { LogoSquare } from '@/components/Logo';
-import { Button } from '@/components/ui/button';
+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 { cn } from '@/utils/cn';
import { zodResolver } from '@hookform/resolvers/zod';
-import { SaveIcon } from 'lucide-react';
+import { SaveIcon, WallpaperIcon } from 'lucide-react';
+import Link from 'next/link';
import { useRouter } from 'next/navigation';
import type { SubmitHandler } from 'react-hook-form';
import { useForm } from 'react-hook-form';
@@ -13,10 +18,21 @@ import { z } from 'zod';
import { api, handleError } from '../_trpc/client';
-const validation = z.object({
- organization: z.string().min(4),
- project: z.string().optional(),
-});
+const validation = z
+ .object({
+ organization: z.string().min(3),
+ project: z.string().min(3),
+ cors: z.string().nullable(),
+ tab: z.string(),
+ })
+ .refine(
+ (data) =>
+ data.tab === 'other' || (data.tab === 'website' && data.cors !== ''),
+ {
+ message: 'Cors is required',
+ path: ['cors'],
+ }
+ );
type IForm = z.infer<typeof validation>;
@@ -24,63 +40,117 @@ export function CreateOrganization() {
const router = useRouter();
const form = useForm<IForm>({
resolver: zodResolver(validation),
+ defaultValues: {
+ organization: '',
+ project: '',
+ cors: '',
+ tab: 'website',
+ },
});
const mutation = api.onboarding.organziation.useMutation({
onError: handleError,
- onSuccess({ organization, project }) {
- let url = `/${organization.slug}`;
- if (project) {
- url += `/${project.id}`;
- }
- router.replace(url);
- },
});
const onSubmit: SubmitHandler<IForm> = (values) => {
- mutation.mutate(values);
+ mutation.mutate({
+ ...values,
+ cors: values.tab === 'website' ? values.cors : null,
+ });
};
+
+ if (mutation.isSuccess && mutation.data.client) {
+ return (
+ <div className="card p-4 md:p-8">
+ <LogoSquare className="w-20 mb-4" />
+ <h1 className="font-medium text-3xl">Nice job!</h1>
+ <div className="mb-4">
+ You're ready to start using our SDK. Save the client ID and secret (if
+ you have any)
+ </div>
+ <CreateClientSuccess {...mutation.data.client} />
+ <div className="flex gap-4 mt-4">
+ <a
+ className={cn(buttonVariants({ variant: 'secondary' }), 'flex-1')}
+ href="https://docs.openpanel.dev/docs"
+ target="_blank"
+ >
+ Read docs
+ </a>
+ <Button
+ className="flex-1"
+ onClick={() => router.refresh()}
+ icon={WallpaperIcon}
+ >
+ Dashboard
+ </Button>
+ </div>
+ </div>
+ );
+ }
+
return (
- <>
- <div>
- <LogoSquare className="w-20 md:w-28 mb-8" />
- <h1 className="font-medium text-3xl">Welcome to Openpanel</h1>
- <div className="text-lg">
- Create your organization below (can be personal or a company) and
- optionally your first project 🤠
+ <div className="card p-4 md:p-8">
+ <LogoSquare className="w-20 mb-4" />
+ <h1 className="font-medium text-3xl">Welcome to Openpanel</h1>
+ <div className="text-lg">
+ Create your organization below (can be personal or a company) and your
+ first project.
+ </div>
+ <form
+ className="mt-8 flex flex-col gap-4"
+ onSubmit={form.handleSubmit(onSubmit)}
+ >
+ <div>
+ <Label>Organization name *</Label>
+ <Input
+ placeholder="Organization name"
+ error={form.formState.errors.organization?.message}
+ {...form.register('organization')}
+ />
+ </div>
+ <div>
+ <Label>Project name *</Label>
+ <Input
+ placeholder="Project name"
+ error={form.formState.errors.project?.message}
+ {...form.register('project')}
+ />
</div>
- <form
- className="mt-8 flex flex-col gap-4"
- onSubmit={form.handleSubmit(onSubmit)}
+
+ <Tabs
+ defaultValue="website"
+ onValueChange={(val) => form.setValue('tab', val)}
+ className="h-28"
>
- <div>
- <Label>Organization name *</Label>
- <Input
- placeholder="Organization name"
- size="large"
- error={form.formState.errors.organization?.message}
- {...form.register('organization')}
- />
- </div>
- <div>
- <Label>Project name</Label>
+ <TabsList className="bg-slate-200">
+ <TabsTrigger value="website">Website</TabsTrigger>
+ <TabsTrigger value="other">Other</TabsTrigger>
+ </TabsList>
+ <TabsContent value="website">
+ <Label>Cors *</Label>
<Input
- placeholder="Project name"
- size="large"
- error={form.formState.errors.project?.message}
- {...form.register('project')}
+ placeholder="https://example.com"
+ error={form.formState.errors.cors?.message}
+ {...form.register('cors')}
/>
- </div>
- <div className="flex justify-end">
- <Button
- type="submit"
- size="lg"
- icon={SaveIcon}
- loading={mutation.isLoading}
- >
- Create
- </Button>
- </div>
- </form>
- </div>
- </>
+ </TabsContent>
+ <TabsContent value="other">
+ <div className="p-2 px-3 bg-white rounded text-sm">
+ 🔑 You will get a secret to use for your API requests.
+ </div>
+ </TabsContent>
+ </Tabs>
+
+ <div className="flex justify-end">
+ <Button
+ type="submit"
+ size="lg"
+ icon={SaveIcon}
+ loading={mutation.isLoading}
+ >
+ Create
+ </Button>
+ </div>
+ </form>
+ </div>
);
}
diff --git a/apps/dashboard/src/components/clients/create-client-success.tsx b/apps/dashboard/src/components/clients/create-client-success.tsx
new file mode 100644
index 000000000..ba723e818
--- /dev/null
+++ b/apps/dashboard/src/components/clients/create-client-success.tsx
@@ -0,0 +1,47 @@
+import { Alert, AlertDescription, AlertTitle } from '@/components/ui/alert';
+import { clipboard } from '@/utils/clipboard';
+import { Copy, RocketIcon } from 'lucide-react';
+import Link from 'next/link';
+
+import type { IServiceClient } from '@openpanel/db';
+
+import { Label } from '../ui/label';
+
+type Props = IServiceClient;
+
+export function CreateClientSuccess({ id, secret, cors }: Props) {
+ return (
+ <div className="grid gap-4">
+ <button className="text-left" onClick={() => clipboard(id)}>
+ <Label>Client ID</Label>
+ <div className="flex items-center justify-between rounded bg-gray-100 p-2 px-3">
+ {id}
+ <Copy size={16} />
+ </div>
+ </button>
+ {secret ? (
+ <button className="text-left" onClick={() => clipboard(secret)}>
+ <Label>Secret</Label>
+ <div className="flex items-center justify-between rounded bg-gray-100 p-2 px-3">
+ {secret}
+ <Copy size={16} />
+ </div>
+ </button>
+ ) : (
+ <div className="text-left">
+ <Label>Cors settings</Label>
+ <div className="flex items-center justify-between rounded bg-gray-100 p-2 px-3">
+ {cors}
+ </div>
+ </div>
+ )}
+ <Alert>
+ <RocketIcon className="h-4 w-4" />
+ <AlertTitle>Get started!</AlertTitle>
+ <AlertDescription>
+ Read our documentation to get started. Easy peasy!
+ </AlertDescription>
+ </Alert>
+ </div>
+ );
+}
diff --git a/apps/dashboard/src/components/ui/input.tsx b/apps/dashboard/src/components/ui/input.tsx
index 772c9e0e1..0a7ae2e3e 100644
--- a/apps/dashboard/src/components/ui/input.tsx
+++ b/apps/dashboard/src/components/ui/input.tsx
@@ -29,6 +29,8 @@ const Input = React.forwardRef<HTMLInputElement, InputProps>(
({ className, error, type, size, ...props }, ref) => {
return (
<input
+ autoComplete="off"
+ autoCorrect="off"
type={type}
className={cn(
inputVariant({ size, className }),
diff --git a/apps/dashboard/src/components/ui/tabs.tsx b/apps/dashboard/src/components/ui/tabs.tsx
new file mode 100644
index 000000000..003982cea
--- /dev/null
+++ b/apps/dashboard/src/components/ui/tabs.tsx
@@ -0,0 +1,53 @@
+import * as React from "react"
+import * as TabsPrimitive from "@radix-ui/react-tabs"
+
+import { cn } from "@/utils/cn"
+
+const Tabs = TabsPrimitive.Root
+
+const TabsList = React.forwardRef<
+ React.ElementRef<typeof TabsPrimitive.List>,
+ React.ComponentPropsWithoutRef<typeof TabsPrimitive.List>
+>(({ className, ...props }, ref) => (
+ <TabsPrimitive.List
+ ref={ref}
+ className={cn(
+ "inline-flex h-10 items-center justify-center rounded-md bg-muted p-1 text-muted-foreground",
+ className
+ )}
+ {...props}
+ />
+))
+TabsList.displayName = TabsPrimitive.List.displayName
+
+const TabsTrigger = React.forwardRef<
+ React.ElementRef<typeof TabsPrimitive.Trigger>,
+ React.ComponentPropsWithoutRef<typeof TabsPrimitive.Trigger>
+>(({ className, ...props }, ref) => (
+ <TabsPrimitive.Trigger
+ ref={ref}
+ className={cn(
+ "inline-flex items-center justify-center whitespace-nowrap rounded-sm px-3 py-1.5 text-sm font-medium ring-offset-background transition-all 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=active]:bg-background data-[state=active]:text-foreground data-[state=active]:shadow-sm",
+ className
+ )}
+ {...props}
+ />
+))
+TabsTrigger.displayName = TabsPrimitive.Trigger.displayName
+
+const TabsContent = React.forwardRef<
+ React.ElementRef<typeof TabsPrimitive.Content>,
+ React.ComponentPropsWithoutRef<typeof TabsPrimitive.Content>
+>(({ className, ...props }, ref) => (
+ <TabsPrimitive.Content
+ ref={ref}
+ className={cn(
+ "mt-2 ring-offset-background focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2",
+ className
+ )}
+ {...props}
+ />
+))
+TabsContent.displayName = TabsPrimitive.Content.displayName
+
+export { Tabs, TabsList, TabsTrigger, TabsContent }
diff --git a/apps/dashboard/src/modals/AddClient.tsx b/apps/dashboard/src/modals/AddClient.tsx
index d700145e0..60b4a6904 100644
--- a/apps/dashboard/src/modals/AddClient.tsx
+++ b/apps/dashboard/src/modals/AddClient.tsx
@@ -1,38 +1,42 @@
'use client';
-import { useEffect } from 'react';
import { api, handleError } from '@/app/_trpc/client';
-import { Button } from '@/components/ui/button';
-import { CheckboxInput } from '@/components/ui/checkbox';
+import { CreateClientSuccess } from '@/components/clients/create-client-success';
+import { Button, buttonVariants } from '@/components/ui/button';
import { Combobox } from '@/components/ui/combobox';
-import {
- DialogDescription,
- DialogFooter,
- DialogHeader,
- DialogTitle,
-} from '@/components/ui/dialog';
+import { DialogFooter } from '@/components/ui/dialog';
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 { clipboard } from '@/utils/clipboard';
+import { cn } from '@/utils/cn';
import { zodResolver } from '@hookform/resolvers/zod';
-import { Copy, SaveIcon } from 'lucide-react';
+import { SaveIcon, WallpaperIcon } from 'lucide-react';
import Link from 'next/link';
import { useRouter } from 'next/navigation';
import type { SubmitHandler } from 'react-hook-form';
-import { Controller, useForm, useWatch } from 'react-hook-form';
+import { Controller, useForm } from 'react-hook-form';
import { toast } from 'sonner';
import { z } from 'zod';
import { popModal } from '.';
import { ModalContent, ModalHeader } from './Modal/Container';
-const validation = z.object({
- name: z.string().min(1),
- domain: z.string().optional(),
- withSecret: z.boolean().optional(),
- projectId: z.string(),
-});
+const validation = z
+ .object({
+ name: z.string().min(1),
+ cors: z.string().nullable(),
+ tab: z.string(),
+ projectId: z.string(),
+ })
+ .refine(
+ (data) =>
+ data.tab === 'other' || (data.tab === 'website' && data.cors !== ''),
+ {
+ message: 'Cors is required',
+ path: ['cors'],
+ }
+ );
type IForm = z.infer<typeof validation>;
@@ -42,13 +46,13 @@ export default function AddClient() {
const form = useForm<IForm>({
resolver: zodResolver(validation),
defaultValues: {
- withSecret: false,
name: '',
- domain: '',
+ cors: '',
+ tab: 'website',
projectId,
},
});
- const mutation = api.client.create2.useMutation({
+ const mutation = api.client.create.useMutation({
onError: handleError,
onSuccess() {
toast.success('Client created');
@@ -61,81 +65,30 @@ export default function AddClient() {
const onSubmit: SubmitHandler<IForm> = (values) => {
mutation.mutate({
name: values.name,
- domain: values.withSecret ? undefined : values.domain,
+ cors: values.tab === 'website' ? values.cors : null,
projectId: values.projectId,
organizationId,
});
};
- const watch = useWatch({
- control: form.control,
- name: 'withSecret',
- });
-
return (
<ModalContent>
{mutation.isSuccess ? (
<>
- <ModalHeader
- title="Success"
- text={
- <>
- {mutation.data.clientSecret
- ? 'Use your client id and secret with our SDK to send events to us. '
- : 'Use your client id with our SDK to send events to us. '}
- See our{' '}
- <Link href="https//openpanel.dev/docs" className="underline">
- documentation
- </Link>
- </>
- }
- />
- <div className="grid gap-4">
- <button
- className="mt-4 text-left"
- onClick={() => clipboard(mutation.data.clientId)}
- >
- <Label>Client ID</Label>
- <div className="flex items-center justify-between rounded bg-gray-100 p-2 px-3">
- {mutation.data.clientId}
- <Copy size={16} />
- </div>
- </button>
- {mutation.data.clientSecret ? (
- <button
- className="mt-4 text-left"
- onClick={() => clipboard(mutation.data.clientId)}
- >
- <Label>Secret</Label>
- <div className="flex items-center justify-between rounded bg-gray-100 p-2 px-3">
- {mutation.data.clientSecret}
- <Copy size={16} />
- </div>
- </button>
- ) : (
- <div className="mt-4 text-left">
- <Label>Cors settings</Label>
- <div className="flex items-center justify-between rounded bg-gray-100 p-2 px-3">
- {mutation.data.cors}
- </div>
- <div className="text-sm italic mt-1">
- You can update cors settings{' '}
- <Link className="underline" href="/qwe/qwe/">
- here
- </Link>
- </div>
- </div>
- )}
- </div>
- <DialogFooter>
- <Button
- type="button"
- variant={'secondary'}
- onClick={() => popModal()}
+ <ModalHeader title="Success" text={'Your client is created'} />
+ <CreateClientSuccess {...mutation.data} />
+ <div className="flex gap-4 mt-4">
+ <a
+ className={cn(buttonVariants({ variant: 'secondary' }), 'flex-1')}
+ href="https://docs.openpanel.dev/docs"
+ target="_blank"
>
+ Read docs
+ </a>
+ <Button className="flex-1" onClick={() => popModal()}>
Close
</Button>
- </DialogFooter>
+ </div>
</>
) : (
<>
@@ -144,37 +97,6 @@ export default function AddClient() {
className="flex flex-col gap-4"
onSubmit={form.handleSubmit(onSubmit)}
>
- <div>
- <Label>Client name</Label>
- <Input
- placeholder="Eg. My App Client"
- error={form.formState.errors.name?.message}
- {...form.register('name')}
- />
- </div>
- <Controller
- name="withSecret"
- control={form.control}
- render={({ field }) => (
- <CheckboxInput
- defaultChecked={!field.value}
- onCheckedChange={(checked) => {
- field.onChange(!checked);
- }}
- >
- This is a website
- </CheckboxInput>
- )}
- />
- <div>
- <Label>Your domain name</Label>
- <Input
- placeholder="https://...."
- error={form.formState.errors.domain?.message}
- {...form.register('domain')}
- disabled={watch}
- />
- </div>
<div>
<Controller
control={form.control}
@@ -202,6 +124,37 @@ export default function AddClient() {
}}
/>
</div>
+ <div>
+ <Label>Client name</Label>
+ <Input
+ placeholder="Eg. My App Client"
+ error={form.formState.errors.name?.message}
+ {...form.register('name')}
+ />
+ </div>
+ <Tabs
+ defaultValue="website"
+ onValueChange={(val) => form.setValue('tab', val)}
+ className="h-28"
+ >
+ <TabsList className="bg-slate-200">
+ <TabsTrigger value="website">Website</TabsTrigger>
+ <TabsTrigger value="other">Other</TabsTrigger>
+ </TabsList>
+ <TabsContent value="website">
+ <Label>Cors</Label>
+ <Input
+ placeholder="https://example.com"
+ error={form.formState.errors.cors?.message}
+ {...form.register('cors')}
+ />
+ </TabsContent>
+ <TabsContent value="other">
+ <div className="p-2 px-3 bg-white rounded text-sm">
+ 🔑 You will get a secret to use for your API requests.
+ </div>
+ </TabsContent>
+ </Tabs>
<DialogFooter>
<Button
type="button"
diff --git a/apps/dashboard/src/server/api/routers/client.ts b/apps/dashboard/src/server/api/routers/client.ts
index 17698c57d..07f241657 100644
--- a/apps/dashboard/src/server/api/routers/client.ts
+++ b/apps/dashboard/src/server/api/routers/client.ts
@@ -1,9 +1,10 @@
import { randomUUID } from 'crypto';
import { createTRPCRouter, protectedProcedure } from '@/server/api/trpc';
import { db } from '@/server/db';
-import { hashPassword } from '@openpanel/common';
import { z } from 'zod';
+import { hashPassword } from '@openpanel/common';
+
export const clientRouter = createTRPCRouter({
list: protectedProcedure
.input(
@@ -59,33 +60,7 @@ export const clientRouter = createTRPCRouter({
name: z.string(),
projectId: z.string(),
organizationId: z.string(),
- withCors: z.boolean().default(true),
- })
- )
- .mutation(async ({ input }) => {
- const secret = randomUUID();
- const client = await db.client.create({
- data: {
- organization_slug: input.organizationId,
- project_id: input.projectId,
- name: input.name,
- secret: input.withCors ? null : await hashPassword(secret),
- },
- });
-
- return {
- clientSecret: input.withCors ? null : secret,
- clientId: client.id,
- cors: client.cors,
- };
- }),
- create2: protectedProcedure
- .input(
- z.object({
- name: z.string(),
- projectId: z.string(),
- organizationId: z.string(),
- domain: z.string().nullish(),
+ cors: z.string().nullable(),
})
)
.mutation(async ({ input }) => {
@@ -95,15 +70,14 @@ export const clientRouter = createTRPCRouter({
organization_slug: input.organizationId,
project_id: input.projectId,
name: input.name,
- secret: input.domain ? undefined : await hashPassword(secret),
- cors: input.domain || undefined,
+ secret: input.cors ? null : await hashPassword(secret),
+ cors: input.cors || undefined,
},
});
return {
- clientSecret: input.domain ? null : secret,
- clientId: client.id,
- cors: client.cors,
+ ...client,
+ secret: input.cors ? null : secret,
};
}),
remove: protectedProcedure
diff --git a/apps/dashboard/src/server/api/routers/onboarding.ts b/apps/dashboard/src/server/api/routers/onboarding.ts
index cf60c6878..1f544a5ac 100644
--- a/apps/dashboard/src/server/api/routers/onboarding.ts
+++ b/apps/dashboard/src/server/api/routers/onboarding.ts
@@ -1,14 +1,18 @@
+import { randomUUID } from 'crypto';
import { createTRPCRouter, protectedProcedure } from '@/server/api/trpc';
import { clerkClient } from '@clerk/nextjs';
-import { db } from '@openpanel/db';
import { z } from 'zod';
+import { hashPassword } from '@openpanel/common';
+import { db } from '@openpanel/db';
+
export const onboardingRouter = createTRPCRouter({
organziation: protectedProcedure
.input(
z.object({
organization: z.string(),
- project: z.string().optional(),
+ project: z.string(),
+ cors: z.string().nullable(),
})
)
.mutation(async ({ input, ctx }) => {
@@ -17,7 +21,7 @@ export const onboardingRouter = createTRPCRouter({
createdBy: ctx.session.userId,
});
- if (org.slug && input.project) {
+ if (org.slug) {
const project = await db.project.create({
data: {
name: input.project,
@@ -25,13 +29,29 @@ export const onboardingRouter = createTRPCRouter({
},
});
+ const secret = randomUUID();
+ const client = await db.client.create({
+ data: {
+ name: `${project.name} Client`,
+ organization_slug: org.slug,
+ project_id: project.id,
+ cors: input.cors ?? '*',
+ secret: input.cors ? null : await hashPassword(secret),
+ },
+ });
+
return {
+ client: {
+ ...client,
+ secret,
+ },
project,
organization: org,
};
}
return {
+ client: null,
project: null,
organization: org,
};
diff --git a/apps/dashboard/src/server/api/routers/reference.ts b/apps/dashboard/src/server/api/routers/reference.ts
index 70d8c467c..c07168d13 100644
--- a/apps/dashboard/src/server/api/routers/reference.ts
+++ b/apps/dashboard/src/server/api/routers/reference.ts
@@ -1,7 +1,12 @@
-import { createTRPCRouter, protectedProcedure } from '@/server/api/trpc';
+import {
+ createTRPCRouter,
+ protectedProcedure,
+ publicProcedure,
+} from '@/server/api/trpc';
+import { z } from 'zod';
+
import { db, getReferences } from '@openpanel/db';
import { zCreateReference, zRange } from '@openpanel/validation';
-import { z } from 'zod';
import { getChartStartEndDate } from './chart.helpers';
@@ -29,7 +34,7 @@ export const referenceRouter = createTRPCRouter({
},
});
}),
- getChartReferences: protectedProcedure
+ getChartReferences: publicProcedure
.input(
z.object({
projectId: z.string(),
diff --git a/apps/docs/src/pages/docs/nextjs.mdx b/apps/docs/src/pages/docs/nextjs.mdx
index 494a34532..e3f693df8 100644
--- a/apps/docs/src/pages/docs/nextjs.mdx
+++ b/apps/docs/src/pages/docs/nextjs.mdx
@@ -36,6 +36,8 @@ export default RootLayout({ children }) {
trackScreenViews={true}
// trackAttributes={true}
// trackOutgoingLinks={true}
+ // If you have a user id, you can pass it here to identify the user
+ // profileId={'123'}
/>
{children}
</>
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 24e01d911..baeab2c74 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -171,6 +171,9 @@ importers:
'@radix-ui/react-slot':
specifier: ^1.0.2
version: 1.0.2(@types/[email protected])([email protected])
+ '@radix-ui/react-tabs':
+ specifier: ^1.0.4
'@radix-ui/react-toast':
specifier: ^1.1.5
@@ -5462,6 +5465,34 @@ packages:
react: 18.2.0
dev: false
+ resolution: {integrity: sha512-egZfYY/+wRNCflXNHx+dePvnz9FbmssDTJBtgRfDY7e8SE5oIo3Py2eCB1ckAbh1Q7cQ/6yJZThJ++sgbxibog==}
+ peerDependencies:
+ '@types/react': '*'
+ '@types/react-dom': '*'
+ react: ^16.8 || ^17.0 || ^18.0
+ react-dom: ^16.8 || ^17.0 || ^18.0
+ peerDependenciesMeta:
+ '@types/react':
+ optional: true
+ '@types/react-dom':
+ optional: true
+ dependencies:
+ '@babel/runtime': 7.23.9
+ '@radix-ui/primitive': 1.0.1
+ '@radix-ui/react-context': 1.0.1(@types/[email protected])([email protected])
+ '@radix-ui/react-direction': 1.0.1(@types/[email protected])([email protected])
+ '@radix-ui/react-id': 1.0.1(@types/[email protected])([email protected])
+ '@radix-ui/react-presence': 1.0.1(@types/[email protected])(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-primitive': 1.0.3(@types/[email protected])(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-roving-focus': 1.0.4(@types/[email protected])(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-use-controllable-state': 1.0.1(@types/[email protected])([email protected])
+ '@types/react': 18.2.56
+ '@types/react-dom': 18.2.19
+ react: 18.2.0
+ react-dom: 18.2.0([email protected])
+ dev: false
+
resolution: {integrity: sha512-fRLn227WHIBRSzuRzGJ8W+5YALxofH23y0MlPLddaIpLpCDqdE0NZlS2NRQDRiptfxDeeCjgFIpexB1/zkxDlw==}
peerDependencies: