add onboarding and reports improvements
This commit is contained in:
Carl-Gerhard Lindesvärd
@@ -0,0 +1,252 @@
|
||||
'use client';
|
||||
|
||||
import { useEffect, useState } from 'react';
|
||||
import { Button } from '@/components/ui/button';
|
||||
import { Checkbox, 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>
|
||||
@@ -9,10 +9,12 @@ import OverviewTopEvents from '@/components/overview/overview-top-events';
|
||||
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 { Dialog } from '@/components/ui/dialog';
|
||||
import { getExists } from '@/server/pageExists';
|
||||
|
||||
import { db } from '@mixan/db';
|
||||
|
||||
import { CreateClient } from './create-client';
|
||||
import { StickyBelowHeader } from './layout-sticky-below-header';
|
||||
import OverviewMetrics from './overview-metrics';
|
||||
import { OverviewReportRange } from './overview-sticky-header';
|
||||
@@ -38,6 +40,7 @@ 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">
|
||||
|
||||
113
apps/web/src/app/(app)/[organizationId]/create-project.tsx
Normal file
113
apps/web/src/app/(app)/[organizationId]/create-project.tsx
Normal file
@@ -0,0 +1,113 @@
|
||||
'use client';
|
||||
|
||||
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';
|
||||
import { zodResolver } from '@hookform/resolvers/zod';
|
||||
import { SaveIcon } from 'lucide-react';
|
||||
import { useRouter } from 'next/navigation';
|
||||
import type { SubmitHandler } from 'react-hook-form';
|
||||
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),
|
||||
});
|
||||
|
||||
type IForm = z.infer<typeof validation>;
|
||||
|
||||
export function CreateProject() {
|
||||
const params = useAppParams();
|
||||
const router = useRouter();
|
||||
const form = useForm<IForm>({
|
||||
resolver: zodResolver(validation),
|
||||
});
|
||||
const mutation = api.project.create.useMutation({
|
||||
onError: handleError,
|
||||
onSuccess() {
|
||||
toast.success('Project created');
|
||||
router.refresh();
|
||||
},
|
||||
});
|
||||
const onSubmit: SubmitHandler<IForm> = (values) => {
|
||||
mutation.mutate({
|
||||
name: values.name,
|
||||
organizationId: params.organizationId,
|
||||
});
|
||||
};
|
||||
|
||||
return (
|
||||
<>
|
||||
<div>
|
||||
<LogoSquare className="w-20 md:w-28 mb-8" />
|
||||
<h1 className="font-medium text-3xl">Create your first project</h1>
|
||||
<div className="text-lg">
|
||||
A project is just a container for your events. You can create as many
|
||||
as you want.
|
||||
</div>
|
||||
<form
|
||||
className="mt-8 flex flex-col gap-4"
|
||||
onSubmit={form.handleSubmit(onSubmit)}
|
||||
>
|
||||
<div>
|
||||
<Label>Project name</Label>
|
||||
<Input
|
||||
placeholder="My App"
|
||||
size="large"
|
||||
error={form.formState.errors.name?.message}
|
||||
{...form.register('name')}
|
||||
/>
|
||||
</div>
|
||||
<div className="flex justify-end">
|
||||
<Button
|
||||
type="submit"
|
||||
size="lg"
|
||||
icon={SaveIcon}
|
||||
loading={mutation.isLoading}
|
||||
>
|
||||
Create project
|
||||
</Button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
||||
// <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>
|
||||
@@ -1,8 +1,9 @@
|
||||
import { getOrganizationBySlug } from '@mixan/db';
|
||||
import { getProjectWithMostEvents } from '@mixan/db';
|
||||
import { LogoSquare } from '@/components/Logo';
|
||||
import { notFound, redirect } from 'next/navigation';
|
||||
|
||||
import PageLayout from './[projectId]/page-layout';
|
||||
import { getOrganizationBySlug, getProjectWithMostEvents } from '@mixan/db';
|
||||
|
||||
import { CreateProject } from './create-project';
|
||||
|
||||
interface PageProps {
|
||||
params: {
|
||||
@@ -20,15 +21,30 @@ export default async function Page({ params: { organizationId } }: PageProps) {
|
||||
return notFound();
|
||||
}
|
||||
|
||||
if (process.env.BLOCK) {
|
||||
return (
|
||||
<div className="flex items-center justify-center h-screen">
|
||||
<div className="max-w-lg w-full">
|
||||
<LogoSquare className="w-20 md:w-28 mb-8" />
|
||||
<h1 className="font-medium text-3xl">Not quite there yet</h1>
|
||||
<div className="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!
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
if (project) {
|
||||
return redirect(`/${organizationId}/${project.id}`);
|
||||
}
|
||||
|
||||
return (
|
||||
<PageLayout title="Projects" organizationSlug={organizationId}>
|
||||
<div className="p-4">
|
||||
<h1>Create your first project</h1>
|
||||
<div className="flex items-center justify-center h-screen">
|
||||
<div className="max-w-lg w-full">
|
||||
<CreateProject />
|
||||
</div>
|
||||
</PageLayout>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
86
apps/web/src/app/(app)/create-organization.tsx
Normal file
86
apps/web/src/app/(app)/create-organization.tsx
Normal file
@@ -0,0 +1,86 @@
|
||||
'use client';
|
||||
|
||||
import { LogoSquare } from '@/components/Logo';
|
||||
import { Button } from '@/components/ui/button';
|
||||
import { Input } from '@/components/ui/input';
|
||||
import { Label } from '@/components/ui/label';
|
||||
import { zodResolver } from '@hookform/resolvers/zod';
|
||||
import { SaveIcon } from 'lucide-react';
|
||||
import { useRouter } from 'next/navigation';
|
||||
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(4),
|
||||
project: z.string().optional(),
|
||||
});
|
||||
|
||||
type IForm = z.infer<typeof validation>;
|
||||
|
||||
export function CreateOrganization() {
|
||||
const router = useRouter();
|
||||
const form = useForm<IForm>({
|
||||
resolver: zodResolver(validation),
|
||||
});
|
||||
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);
|
||||
};
|
||||
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>
|
||||
<form
|
||||
className="mt-8 flex flex-col gap-4"
|
||||
onSubmit={form.handleSubmit(onSubmit)}
|
||||
>
|
||||
<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>
|
||||
<Input
|
||||
placeholder="Project name"
|
||||
size="large"
|
||||
error={form.formState.errors.project?.message}
|
||||
{...form.register('project')}
|
||||
/>
|
||||
</div>
|
||||
<div className="flex justify-end">
|
||||
<Button
|
||||
type="submit"
|
||||
size="lg"
|
||||
icon={SaveIcon}
|
||||
loading={mutation.isLoading}
|
||||
>
|
||||
Create
|
||||
</Button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</>
|
||||
);
|
||||
}
|
||||
@@ -1,14 +1,39 @@
|
||||
import { CreateOrganization } from '@clerk/nextjs';
|
||||
// import { CreateOrganization } from '@clerk/nextjs';
|
||||
|
||||
import { LogoSquare } from '@/components/Logo';
|
||||
import { redirect } from 'next/navigation';
|
||||
|
||||
import { getCurrentOrganizations } from '@mixan/db';
|
||||
|
||||
import { CreateOrganization } from './create-organization';
|
||||
|
||||
export default async function Page() {
|
||||
const organizations = await getCurrentOrganizations();
|
||||
|
||||
if (organizations.length === 0) {
|
||||
return <CreateOrganization />;
|
||||
if (process.env.BLOCK) {
|
||||
return (
|
||||
<div className="flex items-center justify-center h-screen">
|
||||
<div className="max-w-lg w-full">
|
||||
<LogoSquare className="w-20 md:w-28 mb-8" />
|
||||
<h1 className="font-medium text-3xl">Not quite there yet</h1>
|
||||
<div className="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!
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
return redirect(`/${organizations[0]?.slug}`);
|
||||
if (organizations.length > 0) {
|
||||
return redirect(`/${organizations[0]?.slug}`);
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="flex items-center justify-center h-screen">
|
||||
<div className="max-w-lg w-full">
|
||||
<CreateOrganization />
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user