Skip to content

Open-source status page, incident response and uptime monitoring

wip: lots of stuff (#71)

Maximilian Kaskeaf407f4dc7fe
diff --git a/apps/web/package.json b/apps/web/package.json
index 553fc5a24..b276583a0 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -22,8 +22,11 @@
"@radix-ui/react-dropdown-menu": "^2.0.5",
"@radix-ui/react-hover-card": "^1.0.6",
"@radix-ui/react-label": "^2.0.2",
+ "@radix-ui/react-popover": "^1.0.6",
"@radix-ui/react-select": "^1.2.2",
+ "@radix-ui/react-separator": "^1.0.3",
"@radix-ui/react-slot": "^1.0.2",
+ "@radix-ui/react-switch": "^1.0.3",
"@radix-ui/react-toast": "^1.1.4",
"@radix-ui/react-tooltip": "^1.0.6",
"@t3-oss/env-nextjs": "0.4.1",
@@ -43,6 +46,7 @@
"next": "13.4.8",
"next-plausible": "3.7.2",
"react": "18.2.0",
+ "react-day-picker": "^8.8.0",
"react-dom": "18.2.0",
"react-hook-form": "^7.45.1",
"resend": "^0.15.3",
diff --git a/apps/web/src/app/app/(dashboard)/[workspaceId]/dashboard/page.tsx b/apps/web/src/app/app/(dashboard)/[workspaceId]/dashboard/page.tsx
new file mode 100644
index 000000000..fe6a2f81a
--- /dev/null
+++ b/apps/web/src/app/app/(dashboard)/[workspaceId]/dashboard/page.tsx
@@ -0,0 +1,23 @@
+import * as React from "react";
+
+import { Container } from "@/components/dashboard/container";
+import { Header } from "@/components/dashboard/header";
+import { api } from "@/trpc/server";
+import Loading from "../loading";
+
+export default async function DashboardPage() {
+ const workspace = await api.workspace.getUserWithWorkspace.query();
+ if (!workspace) {
+ return <Loading />;
+ }
+
+ return (
+ <div className="grid gap-6 md:grid-cols-2 md:gap-8">
+ <div className="col-span-full flex w-full justify-between">
+ <Header title="Dashboard" description="Overview of all your websites" />
+ </div>
+ <Container title="Hello"></Container>
+ <Container title="World"></Container>
+ </div>
+ );
+}
diff --git a/apps/web/src/app/app/(dashboard)/[workspaceId]/incidents/loading.tsx b/apps/web/src/app/app/(dashboard)/[workspaceId]/incidents/loading.tsx
deleted file mode 100644
index 3c4e9f583..000000000
--- a/apps/web/src/app/app/(dashboard)/[workspaceId]/incidents/loading.tsx
+++ /dev/null
@@ -1,13 +0,0 @@
-import { Container } from "@/components/dashboard/container";
-import { Header } from "@/components/dashboard/header";
-
-export default function Loading() {
- return (
- <div className="grid gap-6 md:grid-cols-2 md:gap-8">
- <Header.Skeleton />
- <Container.Skeleton />
- <Container.Skeleton />
- <Container.Skeleton />
- </div>
- );
-}
diff --git a/apps/web/src/app/app/(dashboard)/[workspaceId]/monitors/[id]/data/loading.tsx b/apps/web/src/app/app/(dashboard)/[workspaceId]/monitors/[id]/data/loading.tsx
new file mode 100644
index 000000000..48991511e
--- /dev/null
+++ b/apps/web/src/app/app/(dashboard)/[workspaceId]/monitors/[id]/data/loading.tsx
@@ -0,0 +1,18 @@
+import { Container } from "@/components/dashboard/container";
+import { Header } from "@/components/dashboard/header";
+import { Skeleton } from "@/components/ui/skeleton";
+
+export default function Loading() {
+ return (
+ <div className="grid gap-6 md:gap-8">
+ <Header.Skeleton />
+ <div className="grid gap-3">
+ <div className="flex items-center justify-between gap-3">
+ <Skeleton className="h-8 w-64" />
+ <Skeleton className="h-8 w-64" />
+ </div>
+ <Container.Skeleton />
+ </div>
+ </div>
+ );
+}
diff --git a/apps/web/src/app/app/(dashboard)/[workspaceId]/monitors/[id]/data/page.tsx b/apps/web/src/app/app/(dashboard)/[workspaceId]/monitors/[id]/data/page.tsx
new file mode 100644
index 000000000..f3f324554
--- /dev/null
+++ b/apps/web/src/app/app/(dashboard)/[workspaceId]/monitors/[id]/data/page.tsx
@@ -0,0 +1,54 @@
+import * as React from "react";
+import { notFound } from "next/navigation";
+import * as z from "zod";
+
+import { availableRegions } from "@openstatus/tinybird";
+
+import { Header } from "@/components/dashboard/header";
+import { columns } from "@/components/data-table/columns";
+import { DataTable } from "@/components/data-table/data-table";
+import { getResponseListData } from "@/lib/tb";
+import { api } from "@/trpc/server";
+
+/**
+ * allowed URL search params
+ */
+const searchParamsSchema = z.object({
+ statusCode: z.coerce.number().optional(),
+ region: z.enum(availableRegions).optional(),
+ cronTimestamp: z.coerce.number().optional(),
+ fromDate: z.coerce.number().optional(),
+ toDate: z.coerce.number().optional(),
+});
+
+export default async function Page({
+ params,
+ searchParams,
+}: {
+ params: { workspaceId: string; id: string };
+ searchParams: { [key: string]: string | string[] | undefined };
+}) {
+ const workspaceId = Number(params.workspaceId);
+ const id = Number(params.id);
+ const search = searchParamsSchema.safeParse(searchParams);
+
+ const monitor = await api.monitor.getMonitorById.query({
+ id,
+ });
+
+ if (!monitor || !search.success) {
+ return notFound();
+ }
+
+ const data = await getResponseListData({
+ siteId: "openstatus", // TODO: use monitorId
+ ...search.data,
+ });
+
+ return (
+ <div className="grid gap-6 md:gap-8">
+ <Header title={monitor.name} description={monitor.description}></Header>
+ {data && <DataTable columns={columns} data={data} />}
+ </div>
+ );
+}
diff --git a/apps/web/src/app/app/(dashboard)/[workspaceId]/monitors/_components/action-button.tsx b/apps/web/src/app/app/(dashboard)/[workspaceId]/monitors/_components/action-button.tsx
index 11544a9b7..54443cef5 100644
--- a/apps/web/src/app/app/(dashboard)/[workspaceId]/monitors/_components/action-button.tsx
+++ b/apps/web/src/app/app/(dashboard)/[workspaceId]/monitors/_components/action-button.tsx
@@ -1,7 +1,8 @@
"use client";
import * as React from "react";
-import { useRouter } from "next/navigation";
+import Link from "next/link";
+import { useParams, usePathname, useRouter } from "next/navigation";
import { MoreVertical } from "lucide-react";
import type * as z from "zod";
@@ -43,6 +44,7 @@ type Schema = z.infer<typeof insertMonitorSchema>;
export function ActionButton(props: Schema) {
const router = useRouter();
+ const pathname = usePathname();
const [dialogOpen, setDialogOpen] = React.useState(false);
const [alertOpen, setAlertOpen] = React.useState(false);
const [saving, setSaving] = React.useState(false);
@@ -73,7 +75,7 @@ export function ActionButton(props: Schema) {
<DropdownMenuTrigger asChild>
<Button
variant="ghost"
- className="absolute right-6 top-6 h-8 w-8 p-0"
+ className="data-[state=open]:bg-accent absolute right-6 top-6 h-8 w-8 p-0"
>
<span className="sr-only">Open menu</span>
<MoreVertical className="h-4 w-4" />
@@ -83,6 +85,13 @@ export function ActionButton(props: Schema) {
<DialogTrigger asChild>
<DropdownMenuItem>Edit</DropdownMenuItem>
</DialogTrigger>
+ <DropdownMenuItem asChild>
+ <Link
+ href={`/app/${props.workspaceId}/monitors/${props.id}/data`}
+ >
+ View data
+ </Link>
+ </DropdownMenuItem>
<AlertDialogTrigger asChild>
<DropdownMenuItem className="text-destructive focus:bg-destructive focus:text-background">
Delete
diff --git a/apps/web/src/app/app/(dashboard)/[workspaceId]/monitors/loading.tsx b/apps/web/src/app/app/(dashboard)/[workspaceId]/monitors/loading.tsx
deleted file mode 100644
index 42b107881..000000000
--- a/apps/web/src/app/app/(dashboard)/[workspaceId]/monitors/loading.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import { Container } from "@/components/dashboard/container";
-import { Header } from "@/components/dashboard/header";
-import { Skeleton } from "@/components/ui/skeleton";
-
-export default function Loading() {
- return (
- <div className="grid gap-6 md:grid-cols-2 md:gap-8">
- <div className="col-span-full flex w-full justify-between">
- <Header.Skeleton>
- <Skeleton className="h-9 w-20" />
- </Header.Skeleton>
- </div>
- <Container.Skeleton />
- <Container.Skeleton />
- <Container.Skeleton />
- </div>
- );
-}
diff --git a/apps/web/src/app/app/(dashboard)/[workspaceId]/monitors/page.tsx b/apps/web/src/app/app/(dashboard)/[workspaceId]/monitors/page.tsx
index 1d6f8b4b9..c6ec15850 100644
--- a/apps/web/src/app/app/(dashboard)/[workspaceId]/monitors/page.tsx
+++ b/apps/web/src/app/app/(dashboard)/[workspaceId]/monitors/page.tsx
@@ -2,6 +2,8 @@ import * as React from "react";
import { Container } from "@/components/dashboard/container";
import { Header } from "@/components/dashboard/header";
+import { Badge } from "@/components/ui/badge";
+import { cn } from "@/lib/utils";
import { api } from "@/trpc/server";
import { ActionButton } from "./_components/action-button";
import { CreateForm } from "./_components/create-form";
@@ -22,8 +24,43 @@ export default async function MonitorPage({
<CreateForm {...{ workspaceId }} />
</Header>
{monitors.map((monitor, index) => (
- <Container key={index} title={monitor.name} description={monitor.url}>
+ <Container
+ key={index}
+ title={monitor.name}
+ description={monitor.description}
+ >
<ActionButton {...monitor} />
+ <dl className="[&_dt]:text-muted-foreground grid gap-2 [&>*]:text-sm [&_dt]:font-light">
+ <div className="flex min-w-0 items-center justify-between gap-3">
+ <dt>Status</dt>
+ <dd>
+ <Badge
+ variant={monitor.status === "active" ? "default" : "outline"}
+ className="capitalize"
+ >
+ {monitor.status}
+ <span
+ className={cn(
+ "ml-1 h-1.5 w-1.5 rounded-full",
+ monitor.status === "active"
+ ? "bg-green-500"
+ : "bg-red-500",
+ )}
+ />
+ </Badge>
+ </dd>
+ </div>
+ <div className="flex min-w-0 items-center justify-between gap-3">
+ <dt>Periodicity</dt>
+ <dd className="font-mono">{monitor.periodicity}</dd>
+ </div>
+ <div className="flex min-w-0 items-center justify-between gap-3">
+ <dt>URL</dt>
+ <dd className="overflow-hidden text-ellipsis font-semibold">
+ {monitor.url}
+ </dd>
+ </div>
+ </dl>
</Container>
))}
</div>
diff --git a/apps/web/src/app/app/(dashboard)/[workspaceId]/page.tsx b/apps/web/src/app/app/(dashboard)/[workspaceId]/page.tsx
index 50275cdf1..50d246e24 100644
--- a/apps/web/src/app/app/(dashboard)/[workspaceId]/page.tsx
+++ b/apps/web/src/app/app/(dashboard)/[workspaceId]/page.tsx
@@ -1,24 +1,9 @@
-import * as React from "react";
+import { redirect } from "next/navigation";
-import { Container } from "@/components/dashboard/container";
-import { Header } from "@/components/dashboard/header";
-import { StatusPageCreateForm } from "@/components/forms/status-page-form";
-import { api } from "@/trpc/server";
-import Loading from "./loading";
-
-export default async function DashboardPage() {
- const workspace = await api.workspace.getUserWithWorkspace.query();
- if (!workspace) {
- return <Loading />;
- }
-
- return (
- <div className="grid gap-6 md:grid-cols-2 md:gap-8">
- <div className="col-span-full flex w-full justify-between">
- <Header title="Dashboard" description="Overview of all your websites" />
- </div>
- <Container title="Hello"></Container>
- <Container title="World"></Container>
- </div>
- );
+export default function DiscordRedirect({
+ params,
+}: {
+ params: { workspaceId: string };
+}) {
+ return redirect(`/app/${params.workspaceId}/dashboard`);
}
diff --git a/apps/web/src/app/app/(dashboard)/[workspaceId]/status-pages/_components/action-button.tsx b/apps/web/src/app/app/(dashboard)/[workspaceId]/status-pages/_components/action-button.tsx
new file mode 100644
index 000000000..9664da159
--- /dev/null
+++ b/apps/web/src/app/app/(dashboard)/[workspaceId]/status-pages/_components/action-button.tsx
@@ -0,0 +1,144 @@
+"use client";
+
+import * as React from "react";
+import Link from "next/link";
+import { useParams, usePathname, useRouter } from "next/navigation";
+import { MoreVertical } from "lucide-react";
+import type * as z from "zod";
+
+import type { insertPageSchema } from "@openstatus/db/src/schema";
+
+import { StatusPageForm } from "@/components/forms/status-page-form";
+import { LoadingAnimation } from "@/components/loading-animation";
+import {
+ AlertDialog,
+ AlertDialogAction,
+ AlertDialogCancel,
+ AlertDialogContent,
+ AlertDialogDescription,
+ AlertDialogFooter,
+ AlertDialogHeader,
+ AlertDialogTitle,
+ AlertDialogTrigger,
+} from "@/components/ui/alert-dialog";
+import { Button } from "@/components/ui/button";
+import {
+ Dialog,
+ DialogContent,
+ DialogDescription,
+ DialogFooter,
+ DialogHeader,
+ DialogTitle,
+ DialogTrigger,
+} from "@/components/ui/dialog";
+import {
+ DropdownMenu,
+ DropdownMenuContent,
+ DropdownMenuItem,
+ DropdownMenuTrigger,
+} from "@/components/ui/dropdown-menu";
+import { wait } from "@/lib/utils";
+import { api } from "@/trpc/client";
+
+type Schema = z.infer<typeof insertPageSchema>;
+
+export function ActionButton(props: Schema) {
+ const router = useRouter();
+ const [dialogOpen, setDialogOpen] = React.useState(false);
+ const [alertOpen, setAlertOpen] = React.useState(false);
+ const [saving, setSaving] = React.useState(false);
+
+ async function onUpdate(values: Schema) {
+ setSaving(true);
+ // await api.monitor.updateMonitor.mutate({ id: props.id, ...values });
+ await wait(1000);
+ router.refresh();
+ setSaving(false);
+ setDialogOpen(false);
+ }
+
+ async function onDelete() {
+ setSaving(true);
+ // await api.monitor.deleteMonitor.mutate({ monitorId: Number(props.id) });
+ await wait(1000);
+ router.refresh();
+ setSaving(false);
+ setAlertOpen(false);
+ }
+
+ return (
+ <Dialog open={dialogOpen} onOpenChange={(value) => setDialogOpen(value)}>
+ <AlertDialog
+ open={alertOpen}
+ onOpenChange={(value) => setAlertOpen(value)}
+ >
+ <DropdownMenu>
+ <DropdownMenuTrigger asChild>
+ <Button
+ variant="ghost"
+ className="data-[state=open]:bg-accent absolute right-6 top-6 h-8 w-8 p-0"
+ >
+ <span className="sr-only">Open menu</span>
+ <MoreVertical className="h-4 w-4" />
+ </Button>
+ </DropdownMenuTrigger>
+ <DropdownMenuContent align="end">
+ <DialogTrigger asChild>
+ <DropdownMenuItem>Edit</DropdownMenuItem>
+ </DialogTrigger>
+ <AlertDialogTrigger asChild>
+ <DropdownMenuItem className="text-destructive focus:bg-destructive focus:text-background">
+ Delete
+ </DropdownMenuItem>
+ </AlertDialogTrigger>
+ </DropdownMenuContent>
+ </DropdownMenu>
+ <AlertDialogContent>
+ <AlertDialogHeader>
+ <AlertDialogTitle>Are you absolutely sure?</AlertDialogTitle>
+ <AlertDialogDescription>
+ This action cannot be undone. This will permanently delete the
+ monitor.
+ </AlertDialogDescription>
+ </AlertDialogHeader>
+ <AlertDialogFooter>
+ <AlertDialogCancel>Cancel</AlertDialogCancel>
+ <AlertDialogAction
+ onClick={(e) => {
+ e.preventDefault();
+ onDelete();
+ }}
+ disabled={saving}
+ className="bg-destructive text-destructive-foreground hover:bg-destructive/90"
+ >
+ {!saving ? "Delete" : <LoadingAnimation />}
+ </AlertDialogAction>
+ </AlertDialogFooter>
+ </AlertDialogContent>
+ </AlertDialog>
+ <DialogContent>
+ <DialogHeader>
+ <DialogTitle>Update Page</DialogTitle>
+ <DialogDescription>Change your settings.</DialogDescription>
+ </DialogHeader>
+ <StatusPageForm
+ id="status-page-update"
+ onSubmit={onUpdate}
+ defaultValues={props}
+ />
+ <DialogFooter>
+ <Button
+ type="submit"
+ form="status-page-update"
+ disabled={saving}
+ onSubmit={(e) => {
+ e.preventDefault();
+ }}
+ >
+ {!saving ? "Confirm" : <LoadingAnimation />}
+ </Button>
+ </DialogFooter>
+ </DialogContent>
+ </Dialog>
+ );
+}
diff --git a/apps/web/src/app/app/(dashboard)/[workspaceId]/status-pages/_components/create-form.tsx b/apps/web/src/app/app/(dashboard)/[workspaceId]/status-pages/_components/create-form.tsx
new file mode 100644
index 000000000..5d1d2f0bb
--- /dev/null
+++ b/apps/web/src/app/app/(dashboard)/[workspaceId]/status-pages/_components/create-form.tsx
@@ -0,0 +1,60 @@
+"use client";
+
+import * as React from "react";
+import { useRouter } from "next/navigation";
+import type * as z from "zod";
+
+import type { insertPageSchema } from "@openstatus/db/src/schema";
+
+import { StatusPageForm } from "@/components/forms/status-page-form";
+import { LoadingAnimation } from "@/components/loading-animation";
+import { Button } from "@/components/ui/button";
+import {
+ Dialog,
+ DialogContent,
+ DialogDescription,
+ DialogFooter,
+ DialogHeader,
+ DialogTitle,
+ DialogTrigger,
+} from "@/components/ui/dialog";
+import { api } from "@/trpc/client";
+
+interface Props {
+ workspaceId: number;
+}
+
+export function CreateForm({ workspaceId }: Props) {
+ const router = useRouter();
+ const [open, setOpen] = React.useState(false);
+ const [saving, setSaving] = React.useState(false);
+
+ async function onCreate(values: z.infer<typeof insertPageSchema>) {
+ setSaving(true);
+ // await api.monitor.getMonitorsByWorkspace.revalidate();
+ await api.page.createPage.mutate({ ...values, workspaceId });
+ router.refresh();
+ setSaving(false);
+ setOpen(false);
+ }
+
+ return (
+ <Dialog open={open} onOpenChange={(value) => setOpen(value)}>
+ <DialogTrigger asChild>
+ <Button>Create</Button>
+ </DialogTrigger>
+ <DialogContent>
+ <DialogHeader>
+ <DialogTitle>Create Status Page</DialogTitle>
+ <DialogDescription>Choose the settings.</DialogDescription>
+ </DialogHeader>
+ <StatusPageForm id="status-page-create" onSubmit={onCreate} />
+ <DialogFooter>
+ <Button type="submit" form="status-page-create" disabled={saving}>
+ {!saving ? "Confirm" : <LoadingAnimation />}
+ </Button>
+ </DialogFooter>
+ </DialogContent>
+ </Dialog>
+ );
+}
diff --git a/apps/web/src/app/app/(dashboard)/[workspaceId]/status-pages/loading.tsx b/apps/web/src/app/app/(dashboard)/[workspaceId]/status-pages/loading.tsx
deleted file mode 100644
index 42b107881..000000000
--- a/apps/web/src/app/app/(dashboard)/[workspaceId]/status-pages/loading.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import { Container } from "@/components/dashboard/container";
-import { Header } from "@/components/dashboard/header";
-import { Skeleton } from "@/components/ui/skeleton";
-
-export default function Loading() {
- return (
- <div className="grid gap-6 md:grid-cols-2 md:gap-8">
- <div className="col-span-full flex w-full justify-between">
- <Header.Skeleton>
- <Skeleton className="h-9 w-20" />
- </Header.Skeleton>
- </div>
- <Container.Skeleton />
- <Container.Skeleton />
- <Container.Skeleton />
- </div>
- );
-}
diff --git a/apps/web/src/app/app/(dashboard)/[workspaceId]/status-pages/page.tsx b/apps/web/src/app/app/(dashboard)/[workspaceId]/status-pages/page.tsx
index 9c1d4f193..25541c192 100644
--- a/apps/web/src/app/app/(dashboard)/[workspaceId]/status-pages/page.tsx
+++ b/apps/web/src/app/app/(dashboard)/[workspaceId]/status-pages/page.tsx
@@ -2,16 +2,18 @@ import * as React from "react";
import { Container } from "@/components/dashboard/container";
import { Header } from "@/components/dashboard/header";
-import { StatusPageCreateForm } from "@/components/forms/status-page-form";
import { api } from "@/trpc/server";
+import { ActionButton } from "./_components/action-button";
+import { CreateForm } from "./_components/create-form";
export default async function Page({
params,
}: {
params: { workspaceId: string };
}) {
+ const workspaceId = Number(params.workspaceId);
const pages = await api.page.getPageByWorkspace.query({
- workspaceId: Number(params.workspaceId),
+ workspaceId,
});
// iterate over pages
return (
@@ -20,10 +22,22 @@ export default async function Page({
title="Status Page"
description="Overview of all your status page."
>
- <StatusPageCreateForm />
+ <CreateForm {...{ workspaceId }} />
</Header>
{pages.map((page, index) => (
- <Container key={index} title={page.title}></Container>
+ <Container
+ key={index}
+ title={page.title}
+ description={page.description}
+ >
+ <ActionButton {...page} />
+ <dl className="[&_dt]:text-muted-foreground grid gap-2 [&>*]:text-sm [&_dt]:font-light">
+ <div className="flex min-w-0 items-center justify-between gap-3">
+ <dt>Slug</dt>
+ <dd className="font-mono">{page.slug}</dd>
+ </div>
+ </dl>
+ </Container>
))}
</div>
);
diff --git a/apps/web/src/app/app/(dashboard)/layout.tsx b/apps/web/src/app/app/(dashboard)/layout.tsx
index 047a71baf..aecab5fcf 100644
--- a/apps/web/src/app/app/(dashboard)/layout.tsx
+++ b/apps/web/src/app/app/(dashboard)/layout.tsx
@@ -8,18 +8,16 @@ import { Footer } from "@/components/layout/footer";
export default function AppLayout({ children }: { children: React.ReactNode }) {
return (
- <div className="container mx-auto flex min-h-screen w-full flex-col items-center justify-center space-y-6 p-4 md:p-8">
+ <div className="container relative mx-auto flex min-h-screen w-full flex-col items-center justify-center gap-6 p-4 lg:p-8">
<AppHeader />
- <div className="flex w-full flex-1 gap-6 md:gap-8">
- <Shell className="hidden max-w-min md:block">
- <nav>
- <AppSidebar />
- </nav>
+ <div className="flex w-full flex-1 gap-6 lg:gap-8">
+ <Shell className="hidden max-h-[calc(100vh-9rem)] max-w-min shrink-0 lg:sticky lg:top-20 lg:block">
+ <AppSidebar />
</Shell>
<main className="z-10 flex w-full flex-1 flex-col items-start justify-center">
<Shell className="relative flex-1">
{/* The `top-4` is represented in Shell with a `py-4` class */}
- <nav className="absolute right-4 top-4 block md:hidden">
+ <nav className="absolute right-4 top-4 block md:right-6 md:top-6 lg:hidden">
<AppMenu />
</nav>
{children}
diff --git a/apps/web/src/app/layout.tsx b/apps/web/src/app/layout.tsx
index 2ec4b5de7..aa4261cda 100644
--- a/apps/web/src/app/layout.tsx
+++ b/apps/web/src/app/layout.tsx
@@ -6,6 +6,7 @@ import LocalFont from "next/font/local";
import { ClerkProvider } from "@clerk/nextjs";
import PlausibleProvider from "next-plausible";
+import { TailwindIndicator } from "@/components/tailwind-indicator";
import { Toaster } from "@/components/ui/toaster";
import Background from "./_components/background";
@@ -51,6 +52,7 @@ export default function RootLayout({
<body className={`${inter.className} ${calSans.variable}`}>
<Background>{children}</Background>
<Toaster />
+ <TailwindIndicator />
</body>
</PlausibleProvider>
</html>
diff --git a/apps/web/src/app/monitor/[id]/page.tsx b/apps/web/src/app/monitor/[id]/page.tsx
index 7b2225e71..10f2ae51a 100644
--- a/apps/web/src/app/monitor/[id]/page.tsx
+++ b/apps/web/src/app/monitor/[id]/page.tsx
@@ -2,8 +2,8 @@ import * as z from "zod";
import { availableRegions } from "@openstatus/tinybird";
-import { columns } from "@/components/monitor/columns";
-import { DataTable } from "@/components/monitor/data-table";
+import { columns } from "@/components/data-table/columns";
+import { DataTable } from "@/components/data-table/data-table";
import { getResponseListData } from "@/lib/tb";
//
@@ -30,6 +30,6 @@ export default async function Monitor({
const data = search.success
? await getResponseListData({ siteId: params.id, ...search.data })
: await getResponseListData({ siteId: params.id });
- if (!data) return <div>Something went wrong</div>;
+ if (!data || !search.success) return <div>Something went wrong</div>;
return <DataTable columns={columns} data={data} />;
}
diff --git a/apps/web/src/app/page.tsx b/apps/web/src/app/page.tsx
index ab0e8a56f..72f3ba119 100644
--- a/apps/web/src/app/page.tsx
+++ b/apps/web/src/app/page.tsx
@@ -1,7 +1,7 @@
import Link from "next/link";
import { Footer } from "@/components/layout/footer";
-import { Tracker } from "@/components/monitor/tracker";
+import { Tracker } from "@/components/tracker";
import { Badge } from "@/components/ui/badge";
import { Button } from "@/components/ui/button";
import { getMonitorListData } from "@/lib/tb";
diff --git a/apps/web/src/app/play/@modal/(..)monitor/[id]/modal.tsx b/apps/web/src/app/play/@modal/(..)monitor/[id]/modal.tsx
index b68a28bb0..750ec233b 100644
--- a/apps/web/src/app/play/@modal/(..)monitor/[id]/modal.tsx
+++ b/apps/web/src/app/play/@modal/(..)monitor/[id]/modal.tsx
@@ -16,7 +16,7 @@ export function Modal({ children }: { children: React.ReactNode }) {
return (
<Dialog open onOpenChange={handleOpenChange}>
{/* overflow-auto should happen inside content table */}
- <DialogContent className="max-h-screen w-full overflow-auto sm:max-w-3xl">
+ <DialogContent className="max-h-screen w-full overflow-auto sm:max-w-3xl sm:p-8">
{children}
</DialogContent>
</Dialog>
diff --git a/apps/web/src/app/play/@modal/(..)monitor/[id]/page.tsx b/apps/web/src/app/play/@modal/(..)monitor/[id]/page.tsx
index 3466db56e..9940a2c0f 100644
--- a/apps/web/src/app/play/@modal/(..)monitor/[id]/page.tsx
+++ b/apps/web/src/app/play/@modal/(..)monitor/[id]/page.tsx
@@ -2,8 +2,8 @@ import * as z from "zod";
import { availableRegions } from "@openstatus/tinybird";
-import { columns } from "@/components/monitor/columns";
-import { DataTable } from "@/components/monitor/data-table";
+import { columns } from "@/components/data-table/columns";
+import { DataTable } from "@/components/data-table/data-table";
import { getResponseListData } from "@/lib/tb";
import { Modal } from "./modal";
diff --git a/apps/web/src/app/play/page.tsx b/apps/web/src/app/play/page.tsx
index 9f64530fb..21fe1a4ad 100644
--- a/apps/web/src/app/play/page.tsx
+++ b/apps/web/src/app/play/page.tsx
@@ -2,7 +2,7 @@ import * as z from "zod";
import { groupByRange } from "@openstatus/tinybird";
-import { Tracker } from "@/components/monitor/tracker";
+import { Tracker } from "@/components/tracker";
import { getMonitorListData } from "@/lib/tb";
import { ToggleButton } from "./toggle-button";
diff --git a/apps/web/src/components/dashboard/header.tsx b/apps/web/src/components/dashboard/header.tsx
index 8631fa7f8..d78965fe3 100644
--- a/apps/web/src/components/dashboard/header.tsx
+++ b/apps/web/src/components/dashboard/header.tsx
@@ -13,7 +13,7 @@ function Header({ title, description, className, children }: HeaderProps) {
return (
<div
className={cn(
- "col-span-full mr-12 flex justify-between md:mr-0",
+ "col-span-full mr-12 flex justify-between lg:mr-0",
className,
)}
>
@@ -30,7 +30,7 @@ function Header({ title, description, className, children }: HeaderProps) {
function HeaderSkeleton({ children }: { children?: React.ReactNode }) {
return (
- <div className="col-span-full mr-12 flex w-full justify-between md:mr-0">
+ <div className="col-span-full mr-12 flex w-full justify-between lg:mr-0">
<div className="grid w-full gap-3">
<Skeleton className="h-8 w-full max-w-[200px]" />
<Skeleton className="h-4 w-full max-w-[300px]" />
diff --git a/apps/web/src/components/monitor/columns.tsx b/apps/web/src/components/data-table/columns.tsx
similarity index 83%
rename from apps/web/src/components/monitor/columns.tsx
rename to apps/web/src/components/data-table/columns.tsx
index 41acb30de..95cb37abe 100644
--- a/apps/web/src/components/monitor/columns.tsx
+++ b/apps/web/src/components/data-table/columns.tsx
@@ -6,6 +6,7 @@ import { format } from "date-fns";
import type { Ping } from "@openstatus/tinybird";
import { Badge } from "@/components/ui/badge";
+import { regionsDict } from "@/data/regions-dictionary";
import { cn } from "@/lib/utils";
import { DataTableColumnHeader } from "./data-table-column-header";
import { DataTableRowActions } from "./data-table-row-action";
@@ -19,7 +20,7 @@ export const columns: ColumnDef<Ping>[] = [
cell: ({ row }) => {
return (
<div>
- {format(new Date(row.getValue("timestamp")), "dd/MM/yy HH:mm")}
+ {format(new Date(row.getValue("timestamp")), "LLL dd, y HH:mm")}
</div>
);
},
@@ -58,7 +59,7 @@ export const columns: ColumnDef<Ping>[] = [
{
accessorKey: "latency",
header: ({ column }) => (
- <DataTableColumnHeader column={column} title="Latency" />
+ <DataTableColumnHeader column={column} title="Latency (ms)" />
),
},
{
@@ -66,6 +67,13 @@ export const columns: ColumnDef<Ping>[] = [
header: ({ column }) => (
<DataTableColumnHeader column={column} title="Region" />
),
+ cell: ({ row }) => {
+ const region = String(row.getValue("region"));
+ return <div>{regionsDict[region]?.location}</div>;
+ },
+ filterFn: (row, id, value) => {
+ return value.includes(row.getValue(id));
+ },
},
{
accessorKey: "url",
diff --git a/apps/web/src/components/monitor/data-table-column-header.tsx b/apps/web/src/components/data-table/data-table-column-header.tsx
similarity index 100%
rename from apps/web/src/components/monitor/data-table-column-header.tsx
rename to apps/web/src/components/data-table/data-table-column-header.tsx
diff --git a/apps/web/src/components/data-table/data-table-date-ranger-picker.tsx b/apps/web/src/components/data-table/data-table-date-ranger-picker.tsx
new file mode 100644
index 000000000..d5b71262a
--- /dev/null
+++ b/apps/web/src/components/data-table/data-table-date-ranger-picker.tsx
@@ -0,0 +1,90 @@
+"use client";
+
+import * as React from "react";
+import { usePathname, useRouter, useSearchParams } from "next/navigation";
+import { format } from "date-fns";
+import { Calendar as CalendarIcon } from "lucide-react";
+import type { DateRange } from "react-day-picker";
+
+import { Button } from "@/components/ui/button";
+import { Calendar } from "@/components/ui/calendar";
+import {
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
+} from "@/components/ui/popover";
+import useUpdateSearchParams from "@/hooks/use-update-search-params";
+import { cn } from "@/lib/utils";
+
+type DataTableDateRangePicker = React.HTMLAttributes<HTMLDivElement>;
+
+export function DataTableDateRangePicker({
+ className,
+}: DataTableDateRangePicker) {
+ const router = useRouter();
+ const pathname = usePathname();
+ const searchParams = useSearchParams();
+ const updateSearchParams = useUpdateSearchParams();
+ const [date, setDate] = React.useState<DateRange | undefined>();
+
+ React.useEffect(() => {
+ if (searchParams) {
+ const from =
+ (searchParams.has("fromDate") && searchParams.get("fromDate")) ||
+ undefined;
+ const to =
+ (searchParams.has("toDate") && searchParams.get("toDate")) || undefined;
+ setDate({
+ from: from ? new Date(Number(from)) : undefined,
+ to: to ? new Date(Number(to)) : undefined,
+ });
+ }
+ }, [searchParams]);
+
+ return (
+ <div className={cn("grid gap-2", className)}>
+ <Popover>
+ <PopoverTrigger asChild>
+ <Button
+ id="date"
+ variant="outline"
+ className={cn(
+ "w-[250px] justify-start text-left font-normal",
+ !date && "text-muted-foreground",
+ )}
+ >
+ <CalendarIcon className="mr-2 h-4 w-4" />
+ {date?.from ? (
+ date.to ? (
+ <>
+ {format(date.from, "LLL dd, y")} -{" "}
+ {format(date.to, "LLL dd, y")}
+ </>
+ ) : (
+ format(date.from, "LLL dd, y")
+ )
+ ) : (
+ <span>Pick a date</span>
+ )}
+ </Button>
+ </PopoverTrigger>
+ <PopoverContent className="w-auto p-0" align="start">
+ <Calendar
+ initialFocus
+ mode="range"
+ defaultMonth={date?.from}
+ selected={date}
+ onSelect={(e) => {
+ setDate(e);
+ const searchParams = updateSearchParams({
+ fromDate: e?.from?.getTime() || null,
+ toDate: e?.to?.getTime() || null,
+ });
+ router.replace(`${pathname}?${searchParams}`);
+ }}
+ />
+ </PopoverContent>
+ </Popover>
+ </div>
+ );
+}
diff --git a/apps/web/src/components/data-table/data-table-faceted-filter.tsx b/apps/web/src/components/data-table/data-table-faceted-filter.tsx
new file mode 100644
index 000000000..5bfff9c9a
--- /dev/null
+++ b/apps/web/src/components/data-table/data-table-faceted-filter.tsx
@@ -0,0 +1,147 @@
+import * as React from "react";
+import type { Column } from "@tanstack/react-table";
+import { Check, PlusCircle } from "lucide-react";
+
+import { Badge } from "@/components/ui/badge";
+import { Button } from "@/components/ui/button";
+import {
+ Command,
+ CommandEmpty,
+ CommandGroup,
+ CommandInput,
+ CommandItem,
+ CommandList,
+ CommandSeparator,
+} from "@/components/ui/command";
+import {
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
+} from "@/components/ui/popover";
+import { Separator } from "@/components/ui/separator";
+import { cn } from "@/lib/utils";
+
+interface DataTableFacetedFilter<TData, TValue> {
+ column?: Column<TData, TValue>;
+ title?: string;
+ options: {
+ label: string;
+ value: string;
+ icon?: React.ComponentType<{ className?: string }>;
+ }[];
+}
+
+export function DataTableFacetedFilter<TData, TValue>({
+ column,
+ title,
+ options,
+}: DataTableFacetedFilter<TData, TValue>) {
+ const facets = column?.getFacetedUniqueValues();
+ const selectedValues = new Set(column?.getFilterValue() as string[]);
+
+ return (
+ <Popover>
+ <PopoverTrigger asChild>
+ <Button variant="outline" size="sm" className="h-8 border-dashed">
+ <PlusCircle className="mr-2 h-4 w-4" />
+ {title}
+ {selectedValues?.size > 0 && (
+ <>
+ <Separator orientation="vertical" className="mx-2 h-4" />
+ <Badge
+ variant="secondary"
+ className="rounded-sm px-1 font-normal lg:hidden"
+ >
+ {selectedValues.size}
+ </Badge>
+ <div className="hidden space-x-1 lg:flex">
+ {selectedValues.size > 2 ? (
+ <Badge
+ variant="secondary"
+ className="rounded-sm px-1 font-normal"
+ >
+ {selectedValues.size} selected
+ </Badge>
+ ) : (
+ options
+ .filter((option) => selectedValues.has(option.value))
+ .map((option) => (
+ <Badge
+ variant="secondary"
+ key={option.value}
+ className="rounded-sm px-1 font-normal"
+ >
+ {option.label}
+ </Badge>
+ ))
+ )}
+ </div>
+ </>
+ )}
+ </Button>
+ </PopoverTrigger>
+ <PopoverContent className="w-[200px] p-0" align="start">
+ <Command>
+ <CommandInput placeholder={title} />
+ <CommandList>
+ <CommandEmpty>No results found.</CommandEmpty>
+ <CommandGroup>
+ {options.map((option) => {
+ const isSelected = selectedValues.has(option.value);
+ return (
+ <CommandItem
+ key={option.value}
+ onSelect={() => {
+ if (isSelected) {
+ selectedValues.delete(option.value);
+ } else {
+ selectedValues.add(option.value);
+ }
+ const filterValues = Array.from(selectedValues);
+ column?.setFilterValue(
+ filterValues.length ? filterValues : undefined,
+ );
+ }}
+ >
+ <div
+ className={cn(
+ "border-primary mr-2 flex h-4 w-4 items-center justify-center rounded-sm border",
+ isSelected
+ ? "bg-primary text-primary-foreground"
+ : "opacity-50 [&_svg]:invisible",
+ )}
+ >
+ <Check className={cn("h-4 w-4")} />
+ </div>
+ {option.icon && (
+ <option.icon className="text-muted-foreground mr-2 h-4 w-4" />
+ )}
+ <span>{option.label}</span>
+ {facets?.get(option.value) && (
+ <span className="ml-auto flex h-4 w-4 items-center justify-center font-mono text-xs">
+ {facets.get(option.value)}
+ </span>
+ )}
+ </CommandItem>
+ );
+ })}
+ </CommandGroup>
+ {selectedValues.size > 0 && (
+ <>
+ <CommandSeparator />
+ <CommandGroup>
+ <CommandItem
+ onSelect={() => column?.setFilterValue(undefined)}
+ className="justify-center text-center"
+ >
+ Clear filters
+ </CommandItem>
+ </CommandGroup>
+ </>
+ )}
+ </CommandList>
+ </Command>
+ </PopoverContent>
+ </Popover>
+ );
+}
diff --git a/apps/web/src/components/monitor/data-table-filter-input.tsx b/apps/web/src/components/data-table/data-table-filter-input.tsx
similarity index 100%
rename from apps/web/src/components/monitor/data-table-filter-input.tsx
rename to apps/web/src/components/data-table/data-table-filter-input.tsx
diff --git a/apps/web/src/components/monitor/data-table-pagination.tsx b/apps/web/src/components/data-table/data-table-pagination.tsx
similarity index 100%
rename from apps/web/src/components/monitor/data-table-pagination.tsx
rename to apps/web/src/components/data-table/data-table-pagination.tsx
diff --git a/apps/web/src/components/data-table/data-table-region-select.tsx b/apps/web/src/components/data-table/data-table-region-select.tsx
new file mode 100644
index 000000000..55052d578
--- /dev/null
+++ b/apps/web/src/components/data-table/data-table-region-select.tsx
@@ -0,0 +1,3 @@
+export default function DataTableRegionSelect() {
+ return <div></div>;
+}
diff --git a/apps/web/src/components/monitor/data-table-row-action.tsx b/apps/web/src/components/data-table/data-table-row-action.tsx
similarity index 100%
rename from apps/web/src/components/monitor/data-table-row-action.tsx
rename to apps/web/src/components/data-table/data-table-row-action.tsx
diff --git a/apps/web/src/components/data-table/data-table-toolbar.tsx b/apps/web/src/components/data-table/data-table-toolbar.tsx
new file mode 100644
index 000000000..68be088f4
--- /dev/null
+++ b/apps/web/src/components/data-table/data-table-toolbar.tsx
@@ -0,0 +1,49 @@
+"use client";
+
+import type { Table } from "@tanstack/react-table";
+import { X } from "lucide-react";
+
+import { Button } from "@/components/ui/button";
+import { regionsDict } from "@/data/regions-dictionary";
+import { DataTableDateRangePicker } from "./data-table-date-ranger-picker";
+import { DataTableFacetedFilter } from "./data-table-faceted-filter";
+import { DataTableFilterInput } from "./data-table-filter-input";
+
+interface DataTableToolbarProps<TData> {
+ table: Table<TData>;
+}
+
+export function DataTableToolbar<TData>({
+ table,
+}: DataTableToolbarProps<TData>) {
+ const isFiltered = table.getState().columnFilters.length > 0;
+
+ return (
+ <div className="flex flex-wrap items-center justify-between gap-3">
+ <div className="flex flex-1 items-center gap-2">
+ <DataTableFilterInput table={table} />
+ {table.getColumn("region") && (
+ <DataTableFacetedFilter
+ column={table.getColumn("region")}
+ title="Region"
+ options={Object.keys(regionsDict).map((key) => ({
+ label: regionsDict[key].location,
+ value: regionsDict[key].code,
+ }))}
+ />
+ )}
+ {isFiltered && (
+ <Button
+ variant="ghost"
+ onClick={() => table.resetColumnFilters()}
+ className="h-8 px-2 lg:px-3"
+ >
+ Reset
+ <X className="ml-2 h-4 w-4" />
+ </Button>
+ )}
+ </div>
+ <DataTableDateRangePicker />
+ </div>
+ );
+}
diff --git a/apps/web/src/components/monitor/data-table.tsx b/apps/web/src/components/data-table/data-table.tsx
similarity index 96%
rename from apps/web/src/components/monitor/data-table.tsx
rename to apps/web/src/components/data-table/data-table.tsx
index 5917a9772..3bb440e07 100644
--- a/apps/web/src/components/monitor/data-table.tsx
+++ b/apps/web/src/components/data-table/data-table.tsx
@@ -23,8 +23,8 @@ import {
TableHeader,
TableRow,
} from "@/components/ui/table";
-import { DataTableFilterInput } from "./data-table-filter-input";
import { DataTablePagination } from "./data-table-pagination";
+import { DataTableToolbar } from "./data-table-toolbar";
interface DataTableProps<TData, TValue> {
columns: ColumnDef<TData, TValue>[];
@@ -58,7 +58,7 @@ export function DataTable<TData, TValue>({
return (
<div className="space-y-3">
- <DataTableFilterInput table={table} />
+ <DataTableToolbar table={table} />
<div className="rounded-md border">
<Table>
<TableHeader>
diff --git a/apps/web/src/components/forms/montitor-form.tsx b/apps/web/src/components/forms/montitor-form.tsx
index 18aa47d21..962f25e37 100644
--- a/apps/web/src/components/forms/montitor-form.tsx
+++ b/apps/web/src/components/forms/montitor-form.tsx
@@ -26,7 +26,8 @@ import {
SelectItem,
SelectTrigger,
SelectValue,
-} from "../ui/select";
+} from "@/components/ui/select";
+import { Switch } from "@/components/ui/switch";
type Schema = z.infer<typeof insertMonitorSchema>;
@@ -44,6 +45,7 @@ export function MonitorForm({ id, defaultValues, onSubmit }: Props) {
name: defaultValues?.name || "",
description: defaultValues?.description || "",
periodicity: defaultValues?.periodicity || undefined,
+ status: defaultValues?.status || "inactive",
},
});
@@ -99,6 +101,32 @@ export function MonitorForm({ id, defaultValues, onSubmit }: Props) {
</FormItem>
)}
/>
+ <FormField
+ control={form.control}
+ name="status"
+ render={({ field }) => (
+ <FormItem className="flex flex-row items-center justify-between">
+ <div className="space-y-0.5">
+ <FormLabel>Active</FormLabel>
+ <FormDescription>
+ This will start ping your endpoint on based on the selected
+ frequence.
+ </FormDescription>
+ </div>
+ <FormControl>
+ {/* TODO: make the monitor.active a boolean value */}
+ <Switch
+ checked={field.value === "active" ? true : false}
+ onCheckedChange={(value) =>
+ field.onChange(value ? "active" : "inactive")
+ }
+ disabled
+ />
+ </FormControl>
+ <FormMessage />
+ </FormItem>
+ )}
+ />
<FormField
control={form.control}
name="periodicity"
@@ -133,7 +161,7 @@ export function MonitorForm({ id, defaultValues, onSubmit }: Props) {
</SelectContent>
</Select>
<FormDescription>
- How often your endpoint will be checked
+ Frequency of how often your endpoint will be pinged.
</FormDescription>
<FormMessage />
</FormItem>
diff --git a/apps/web/src/components/forms/status-page-form.tsx b/apps/web/src/components/forms/status-page-form.tsx
index cd73085ab..d5eab5af3 100644
--- a/apps/web/src/components/forms/status-page-form.tsx
+++ b/apps/web/src/components/forms/status-page-form.tsx
@@ -1,25 +1,11 @@
"use client";
-import { useState } from "react";
-import { useParams, useRouter } from "next/navigation";
import { zodResolver } from "@hookform/resolvers/zod";
-import { Loader2 } from "lucide-react";
import { useForm } from "react-hook-form";
import type * as z from "zod";
-import type { insertMonitorSchema } from "@openstatus/db/src/schema";
-import { insertPageSchema, periodicityEnum } from "@openstatus/db/src/schema";
+import { insertPageSchema } from "@openstatus/db/src/schema";
-import { Button } from "@/components/ui/button";
-import {
- Dialog,
- DialogContent,
- DialogDescription,
- DialogFooter,
- DialogHeader,
- DialogTitle,
- DialogTrigger,
-} from "@/components/ui/dialog";
import {
Form,
FormControl,
@@ -30,110 +16,77 @@ import {
FormMessage,
} from "@/components/ui/form";
import { Input } from "@/components/ui/input";
-import { api } from "@/trpc/client";
-// EXAMPLE
-export function StatusPageCreateForm() {
- const [saving, setSaving] = useState(false);
- const [open, setOpen] = useState(false);
- const params = useParams();
- const router = useRouter();
+type Schema = z.infer<typeof insertPageSchema>;
+
+interface Props {
+ id: string;
+ defaultValues?: Schema;
+ onSubmit: (values: Schema) => Promise<void>;
+}
- const form = useForm<z.infer<typeof insertPageSchema>>({
+export function StatusPageForm({ id, defaultValues, onSubmit }: Props) {
+ const form = useForm<Schema>({
resolver: zodResolver(insertPageSchema),
defaultValues: {
- title: "",
- slug: "",
- description: "",
- workspaceId: Number(params.workspaceId),
+ title: defaultValues?.title || "",
+ slug: defaultValues?.slug || "",
+ description: defaultValues?.description || "",
},
});
- // either like that or with a user action
- async function onSubmit(values: z.infer<typeof insertPageSchema>) {
- setSaving(true);
- // await api.monitor.getMonitorsByWorkspace.revalidate();
- await api.page.createPage.mutate(values);
- router.refresh();
- setOpen(false);
- setSaving(false);
- }
-
return (
- <Dialog open={open} onOpenChange={(value) => setOpen(value)}>
- <DialogTrigger asChild>
- <Button>Create</Button>
- </DialogTrigger>
- <DialogContent>
- <DialogHeader>
- <DialogTitle>Create Monitor</DialogTitle>
- <DialogDescription>Create a monitor</DialogDescription>
- </DialogHeader>
- <Form {...form}>
- <form
- onSubmit={form.handleSubmit(onSubmit, (e) => {
- console.log(e);
- })}
- id="monitor"
- >
- <div className="grid w-full items-center space-y-6">
- <FormField
- control={form.control}
- name="title"
- render={({ field }) => (
- <FormItem>
- <FormLabel>Title</FormLabel>
- <FormControl>
- <Input placeholder="" {...field} />
- </FormControl>
- <FormDescription>
- This is title of your page.
- </FormDescription>
- <FormMessage />
- </FormItem>
- )}
- />
- <FormField
- control={form.control}
- name="slug"
- render={({ field }) => (
- <FormItem>
- <FormLabel>Slug</FormLabel>
- <FormControl>
- <Input placeholder="" {...field} />
- </FormControl>
- <FormDescription>
- This is your url of your page.
- </FormDescription>
- <FormMessage />
- </FormItem>
- )}
- />
- <FormField
- control={form.control}
- name="description"
- render={({ field }) => (
- <FormItem>
- <FormLabel>Description</FormLabel>
- <FormControl>
- <Input placeholder="" {...field} />
- </FormControl>
- <FormDescription>
- Give your user some information about it.
- </FormDescription>
- <FormMessage />
- </FormItem>
- )}
- />
- </div>
- </form>
- </Form>
- <DialogFooter>
- <Button type="submit" form="monitor" disabled={saving}>
- {!saving ? "Confirm" : <Loader2 className="h-4 w-4 animate-spin" />}
- </Button>
- </DialogFooter>
- </DialogContent>
- </Dialog>
+ <Form {...form}>
+ <form onSubmit={form.handleSubmit(onSubmit)} id={id}>
+ <div className="grid w-full items-center space-y-6">
+ <FormField
+ control={form.control}
+ name="title"
+ render={({ field }) => (
+ <FormItem>
+ <FormLabel>Title</FormLabel>
+ <FormControl>
+ <Input placeholder="" {...field} />
+ </FormControl>
+ <FormDescription>This is title of your page.</FormDescription>
+ <FormMessage />
+ </FormItem>
+ )}
+ />
+ <FormField
+ control={form.control}
+ name="slug"
+ render={({ field }) => (
+ <FormItem>
+ <FormLabel>Slug</FormLabel>
+ <FormControl>
+ <Input placeholder="" {...field} />
+ </FormControl>
+ <FormDescription>
+ This is your url of your page.
+ </FormDescription>
+ <FormMessage />
+ </FormItem>
+ )}
+ />
+ <FormField
+ control={form.control}
+ name="description"
+ render={({ field }) => (
+ <FormItem>
+ <FormLabel>Description</FormLabel>
+ <FormControl>
+ <Input placeholder="" {...field} />
+ </FormControl>
+ <FormDescription>
+ Give your user some information about it.
+ </FormDescription>
+ <FormMessage />
+ </FormItem>
+ )}
+ />
+ </div>
+ </form>
+ </Form>
);
}
diff --git a/apps/web/src/components/icons.tsx b/apps/web/src/components/icons.tsx
index af6ca2a8e..c7196493c 100644
--- a/apps/web/src/components/icons.tsx
+++ b/apps/web/src/components/icons.tsx
@@ -1,4 +1,11 @@
-import { Activity, LayoutDashboard, Link, PanelTop, Siren } from "lucide-react";
+import {
+ Activity,
+ LayoutDashboard,
+ Link,
+ PanelTop,
+ Siren,
+ Table,
+} from "lucide-react";
import type { Icon as LucideIcon, LucideProps } from "lucide-react";
export type Icon = LucideIcon;
@@ -10,4 +17,5 @@ export const Icons = {
link: Link,
siren: Siren,
"panel-top": PanelTop,
+ table: Table,
} as const;
diff --git a/apps/web/src/components/layout/app-header.tsx b/apps/web/src/components/layout/app-header.tsx
index a36b7229b..ce746296a 100644
--- a/apps/web/src/components/layout/app-header.tsx
+++ b/apps/web/src/components/layout/app-header.tsx
@@ -3,25 +3,27 @@
import Link from "next/link";
import { UserButton, useUser } from "@clerk/nextjs";
+import { Shell } from "../dashboard/shell";
import { Skeleton } from "../ui/skeleton";
export function AppHeader() {
const { isLoaded, isSignedIn } = useUser();
return (
- // use `h-8` to avoid header layout shift on load
- <header className="z-10 flex h-8 w-full items-center justify-between">
- <Link
- href="/"
- className="font-cal text-muted-foreground hover:text-foreground text-lg"
- >
- openstatus
- </Link>
- {!isLoaded && !isSignedIn ? (
- <Skeleton className="h-8 w-8 rounded-full" />
- ) : (
- <UserButton />
- )}
+ <header className="border-border sticky top-3 z-50 w-full">
+ <Shell className="bg-background/70 flex w-full items-center justify-between px-3 py-3 backdrop-blur-lg md:px-6 md:py-3">
+ <Link
+ href="/app"
+ className="font-cal text-muted-foreground hover:text-foreground text-lg"
+ >
+ openstatus
+ </Link>
+ {!isLoaded && !isSignedIn ? (
+ <Skeleton className="h-8 w-8 rounded-full" />
+ ) : (
+ <UserButton />
+ )}
+ </Shell>
</header>
);
}
diff --git a/apps/web/src/components/layout/app-sidebar.tsx b/apps/web/src/components/layout/app-sidebar.tsx
index 858d813d5..1e1164a05 100644
--- a/apps/web/src/components/layout/app-sidebar.tsx
+++ b/apps/web/src/components/layout/app-sidebar.tsx
@@ -21,7 +21,7 @@ export function AppSidebar() {
href={link}
className={cn(
"hover:bg-muted/50 hover:text-foreground text-muted-foreground group flex w-full min-w-[200px] items-center rounded-md border border-transparent px-3 py-1",
- pathname === link &&
+ pathname.startsWith(link) &&
"bg-muted/50 border-border text-foreground",
disabled && "pointer-events-none opacity-60",
)}
diff --git a/apps/web/src/components/status-page/monitor.tsx b/apps/web/src/components/status-page/monitor.tsx
index f8a1ad686..121add762 100644
--- a/apps/web/src/components/status-page/monitor.tsx
+++ b/apps/web/src/components/status-page/monitor.tsx
@@ -3,7 +3,7 @@ import type { z } from "zod";
import type { selectMonitorSchema } from "@openstatus/db/src/schema";
import { getMonitorListData } from "@/lib/tb";
-import { Tracker } from "../monitor/tracker";
+import { Tracker } from "../tracker";
export const Monitor = async ({
monitor,
diff --git a/apps/web/src/components/tailwind-indicator.tsx b/apps/web/src/components/tailwind-indicator.tsx
new file mode 100644
index 000000000..b2ada3c52
--- /dev/null
+++ b/apps/web/src/components/tailwind-indicator.tsx
@@ -0,0 +1,14 @@
+export function TailwindIndicator() {
+ if (process.env.NODE_ENV === "production") return null;
+
+ return (
+ <div className="fixed bottom-1 left-1 z-50 flex h-6 w-6 items-center justify-center rounded-full bg-gray-800 p-3 font-mono text-xs text-white">
+ <div className="block sm:hidden">xs</div>
+ <div className="hidden sm:block md:hidden">sm</div>
+ <div className="hidden md:block lg:hidden">md</div>
+ <div className="hidden lg:block xl:hidden">lg</div>
+ <div className="hidden xl:block 2xl:hidden">xl</div>
+ <div className="hidden 2xl:block">2xl</div>
+ </div>
+ );
+}
diff --git a/apps/web/src/components/monitor/tracker.tsx b/apps/web/src/components/tracker.tsx
similarity index 100%
rename from apps/web/src/components/monitor/tracker.tsx
rename to apps/web/src/components/tracker.tsx
diff --git a/apps/web/src/components/ui/calendar.tsx b/apps/web/src/components/ui/calendar.tsx
new file mode 100644
index 000000000..1d1181516
--- /dev/null
+++ b/apps/web/src/components/ui/calendar.tsx
@@ -0,0 +1,64 @@
+"use client";
+
+import * as React from "react";
+import { ChevronLeft, ChevronRight } from "lucide-react";
+import { DayPicker } from "react-day-picker";
+
+import { buttonVariants } from "@/components/ui/button";
+import { cn } from "@/lib/utils";
+
+export type CalendarProps = React.ComponentProps<typeof DayPicker>;
+
+function Calendar({
+ className,
+ classNames,
+ showOutsideDays = true,
+ ...props
+}: CalendarProps) {
+ return (
+ <DayPicker
+ showOutsideDays={showOutsideDays}
+ className={cn("p-3", className)}
+ classNames={{
+ months: "flex flex-col sm:flex-row space-y-4 sm:space-x-4 sm:space-y-0",
+ month: "space-y-4",
+ caption: "flex justify-center pt-1 relative items-center",
+ caption_label: "text-sm font-medium",
+ nav: "space-x-1 flex items-center",
+ nav_button: cn(
+ buttonVariants({ variant: "outline" }),
+ "h-7 w-7 bg-transparent p-0 opacity-50 hover:opacity-100",
+ ),
+ nav_button_previous: "absolute left-1",
+ nav_button_next: "absolute right-1",
+ table: "w-full border-collapse space-y-1",
+ head_row: "flex",
+ head_cell:
+ "text-muted-foreground rounded-md w-8 font-normal text-[0.8rem]",
+ row: "flex w-full mt-2",
+ cell: "text-center text-sm p-0 relative [&:has([aria-selected])]:bg-accent first:[&:has([aria-selected])]:rounded-l-md last:[&:has([aria-selected])]:rounded-r-md focus-within:relative focus-within:z-20",
+ day: cn(
+ buttonVariants({ variant: "ghost" }),
+ "h-8 w-8 p-0 font-normal aria-selected:opacity-100",
+ ),
+ day_selected:
+ "bg-primary text-primary-foreground hover:bg-primary hover:text-primary-foreground focus:bg-primary focus:text-primary-foreground",
+ day_today: "bg-accent text-accent-foreground",
+ day_outside: "text-muted-foreground opacity-50",
+ day_disabled: "text-muted-foreground opacity-50",
+ day_range_middle:
+ "aria-selected:bg-accent aria-selected:text-accent-foreground",
+ day_hidden: "invisible",
+ ...classNames,
+ }}
+ components={{
+ IconLeft: ({ ...props }) => <ChevronLeft className="h-4 w-4" />,
+ IconRight: ({ ...props }) => <ChevronRight className="h-4 w-4" />,
+ }}
+ {...props}
+ />
+ );
+}
+Calendar.displayName = "Calendar";
+
+export { Calendar };
diff --git a/apps/web/src/components/ui/popover.tsx b/apps/web/src/components/ui/popover.tsx
new file mode 100644
index 000000000..a361ba7d8
--- /dev/null
+++ b/apps/web/src/components/ui/popover.tsx
@@ -0,0 +1,31 @@
+"use client";
+
+import * as React from "react";
+import * as PopoverPrimitive from "@radix-ui/react-popover";
+
+import { cn } from "@/lib/utils";
+
+const Popover = PopoverPrimitive.Root;
+
+const PopoverTrigger = PopoverPrimitive.Trigger;
+
+const PopoverContent = React.forwardRef<
+ React.ElementRef<typeof PopoverPrimitive.Content>,
+ React.ComponentPropsWithoutRef<typeof PopoverPrimitive.Content>
+>(({ className, align = "center", sideOffset = 4, ...props }, ref) => (
+ <PopoverPrimitive.Portal>
+ <PopoverPrimitive.Content
+ ref={ref}
+ align={align}
+ sideOffset={sideOffset}
+ className={cn(
+ "bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 w-72 rounded-md border p-4 shadow-md outline-none",
+ className,
+ )}
+ {...props}
+ />
+ </PopoverPrimitive.Portal>
+));
+PopoverContent.displayName = PopoverPrimitive.Content.displayName;
+
+export { Popover, PopoverTrigger, PopoverContent };
diff --git a/apps/web/src/components/ui/separator.tsx b/apps/web/src/components/ui/separator.tsx
new file mode 100644
index 000000000..3b9f2b849
--- /dev/null
+++ b/apps/web/src/components/ui/separator.tsx
@@ -0,0 +1,31 @@
+"use client";
+
+import * as React from "react";
+import * as SeparatorPrimitive from "@radix-ui/react-separator";
+
+import { cn } from "@/lib/utils";
+
+const Separator = React.forwardRef<
+ React.ElementRef<typeof SeparatorPrimitive.Root>,
+ React.ComponentPropsWithoutRef<typeof SeparatorPrimitive.Root>
+>(
+ (
+ { className, orientation = "horizontal", decorative = true, ...props },
+ ref,
+ ) => (
+ <SeparatorPrimitive.Root
+ ref={ref}
+ decorative={decorative}
+ orientation={orientation}
+ className={cn(
+ "bg-border shrink-0",
+ orientation === "horizontal" ? "h-[1px] w-full" : "h-full w-[1px]",
+ className,
+ )}
+ {...props}
+ />
+ ),
+);
+Separator.displayName = SeparatorPrimitive.Root.displayName;
+
+export { Separator };
diff --git a/apps/web/src/components/ui/switch.tsx b/apps/web/src/components/ui/switch.tsx
new file mode 100644
index 000000000..359b57951
--- /dev/null
+++ b/apps/web/src/components/ui/switch.tsx
@@ -0,0 +1,29 @@
+"use client";
+
+import * as React from "react";
+import * as SwitchPrimitives from "@radix-ui/react-switch";
+
+import { cn } from "@/lib/utils";
+
+const Switch = React.forwardRef<
+ React.ElementRef<typeof SwitchPrimitives.Root>,
+ React.ComponentPropsWithoutRef<typeof SwitchPrimitives.Root>
+>(({ className, ...props }, ref) => (
+ <SwitchPrimitives.Root
+ className={cn(
+ "focus-visible:ring-ring focus-visible:ring-offset-background data-[state=checked]:bg-primary data-[state=unchecked]:bg-input peer inline-flex h-[24px] w-[44px] shrink-0 cursor-pointer items-center rounded-full border-2 border-transparent transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50",
+ className,
+ )}
+ {...props}
+ ref={ref}
+ >
+ <SwitchPrimitives.Thumb
+ className={cn(
+ "bg-background pointer-events-none block h-5 w-5 rounded-full shadow-lg ring-0 transition-transform data-[state=checked]:translate-x-5 data-[state=unchecked]:translate-x-0",
+ )}
+ />
+ </SwitchPrimitives.Root>
+));
+Switch.displayName = SwitchPrimitives.Root.displayName;
+
+export { Switch };
diff --git a/apps/web/src/config/pages.ts b/apps/web/src/config/pages.ts
index 85da29809..e43b0602a 100644
--- a/apps/web/src/config/pages.ts
+++ b/apps/web/src/config/pages.ts
@@ -8,14 +8,14 @@ type Page = {
disabled?: boolean;
};
+// TODO: add to <Header id="dashboard" /> to easily access title and description - ideally allow both
export const pagesConfig: Page[] = [
{
title: "Dashboard",
description: "Get an overview of what's hot.",
- href: "",
+ href: "/dashboard",
icon: "layout-dashboard",
},
-
{
title: "Monitors",
description: "Check all the responses in one place.",
diff --git a/apps/web/src/lib/utils.ts b/apps/web/src/lib/utils.ts
index a109f460a..c1fc72ef7 100644
--- a/apps/web/src/lib/utils.ts
+++ b/apps/web/src/lib/utils.ts
@@ -12,5 +12,5 @@ export function wait(ms: number) {
}
export function formatDate(date: Date) {
- return format(date, "dd/MM/yyyy");
+ return format(date, "LLL dd, y");
}
diff --git a/apps/web/src/middleware.ts b/apps/web/src/middleware.ts
index 04631969c..7989e6b7f 100644
--- a/apps/web/src/middleware.ts
+++ b/apps/web/src/middleware.ts
@@ -85,7 +85,7 @@ export default authMiddleware({
if (result.length) {
const orgSelection = new URL(
- `/app/${result[0].users_to_workspaces.workspaceId}`,
+ `/app/${result[0].users_to_workspaces.workspaceId}/dashboard`,
req.url,
);
return NextResponse.redirect(orgSelection);
diff --git a/packages/api/src/router/page.ts b/packages/api/src/router/page.ts
index 71e71a8d0..ac5ff2893 100644
--- a/packages/api/src/router/page.ts
+++ b/packages/api/src/router/page.ts
@@ -5,6 +5,7 @@ import { insertPageSchema, page } from "@openstatus/db/src/schema";
import { createTRPCRouter, protectedProcedure, publicProcedure } from "../trpc";
+// TODO: deletePageById - updatePageById
export const pageRouter = createTRPCRouter({
createPage: protectedProcedure
.input(insertPageSchema)
diff --git a/packages/db/src/schema/monitor.ts b/packages/db/src/schema/monitor.ts
index 168452042..81f718d14 100644
--- a/packages/db/src/schema/monitor.ts
+++ b/packages/db/src/schema/monitor.ts
@@ -1,5 +1,6 @@
import { relations } from "drizzle-orm";
import {
+ boolean,
int,
mysqlEnum,
mysqlTable,
@@ -28,10 +29,14 @@ export const monitor = mysqlTable("monitor", {
])
.default("other")
.notNull(),
+
+ // TBD: if we keep or not?!?
status: mysqlEnum("status", ["active", "inactive"])
.default("inactive")
.notNull(),
+ active: boolean("active").default(false),
+
url: varchar("url", { length: 512 }).notNull(),
name: varchar("name", { length: 256 }).default("").notNull(),
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index ff47929c6..e95ff43d0 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -74,12 +74,21 @@ importers:
'@radix-ui/react-label':
specifier: ^2.0.2
+ '@radix-ui/react-popover':
+ specifier: ^1.0.6
'@radix-ui/react-select':
specifier: ^1.2.2
+ '@radix-ui/react-separator':
+ specifier: ^1.0.3
'@radix-ui/react-slot':
specifier: ^1.0.2
version: 1.0.2(@types/[email protected])([email protected])
+ '@radix-ui/react-switch':
+ specifier: ^1.0.3
'@radix-ui/react-toast':
specifier: ^1.1.4
@@ -137,6 +146,9 @@ importers:
react:
specifier: 18.2.0
version: 18.2.0
+ react-day-picker:
+ specifier: ^8.8.0
react-dom:
specifier: 18.2.0
version: 18.2.0([email protected])
@@ -2518,6 +2530,41 @@ packages:
react-remove-scroll: 2.5.5(@types/[email protected])([email protected])
dev: false
+ resolution: {integrity: sha512-cZ4defGpkZ0qTRtlIBzJLSzL6ht7ofhhW4i1+pkemjV1IKXm0wgCRnee154qlV6r9Ttunmh2TNZhMfV2bavUyA==}
+ 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.22.5
+ '@radix-ui/primitive': 1.0.1
+ '@radix-ui/react-compose-refs': 1.0.1(@types/[email protected])([email protected])
+ '@radix-ui/react-context': 1.0.1(@types/[email protected])([email protected])
+ '@radix-ui/react-dismissable-layer': 1.0.4(@types/[email protected])(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-focus-guards': 1.0.1(@types/[email protected])([email protected])
+ '@radix-ui/react-focus-scope': 1.0.3(@types/[email protected])(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-id': 1.0.1(@types/[email protected])([email protected])
+ '@radix-ui/react-popper': 1.1.2(@types/[email protected])(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-portal': 1.0.3(@types/[email protected])(@types/[email protected])([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-slot': 1.0.2(@types/[email protected])([email protected])
+ '@radix-ui/react-use-controllable-state': 1.0.1(@types/[email protected])([email protected])
+ '@types/react': 18.2.12
+ '@types/react-dom': 18.2.5
+ aria-hidden: 1.2.3
+ react: 18.2.0
+ react-dom: 18.2.0([email protected])
+ react-remove-scroll: 2.5.5(@types/[email protected])([email protected])
+ dev: false
+
resolution: {integrity: sha512-1CnGGfFi/bbqtJZZ0P/NQY20xdG3E0LALJaLUEoKwPLwl6PPPfbeiCqMVQnhoFRAxjJj4RpBRJzDmUgsex2tSg==}
peerDependencies:
@@ -2719,6 +2766,27 @@ packages:
react-remove-scroll: 2.5.5(@types/[email protected])([email protected])
dev: false
+ resolution: {integrity: sha512-itYmTy/kokS21aiV5+Z56MZB54KrhPgn6eHDKkFeOLR34HMN2s8PaN47qZZAGnvupcjxHaFZnW4pQEh0BvvVuw==}
+ 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.22.5
+ '@radix-ui/react-primitive': 1.0.3(@types/[email protected])(@types/[email protected])([email protected])([email protected])
+ '@types/react': 18.2.12
+ '@types/react-dom': 18.2.5
+ react: 18.2.0
+ react-dom: 18.2.0([email protected])
+ dev: false
+
resolution: {integrity: sha512-3mrKauI/tWXo1Ll+gN5dHcxDPdm/Df1ufcDLCecn+pnCIVcdWE7CujXo8QaXOWRJyZyQWWbpB8eFwHzWXlv5mQ==}
peerDependencies:
@@ -2744,6 +2812,33 @@ packages:
react: 18.2.0
dev: false
+ resolution: {integrity: sha512-mxm87F88HyHztsI7N+ZUmEoARGkC22YVW5CaC+Byc+HRpuvCrOBPTAnXgf+tZ/7i0Sg/eOePGdMhUKhPaQEqow==}
+ 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.22.5
+ '@radix-ui/primitive': 1.0.1
+ '@radix-ui/react-compose-refs': 1.0.1(@types/[email protected])([email protected])
+ '@radix-ui/react-context': 1.0.1(@types/[email protected])([email protected])
+ '@radix-ui/react-primitive': 1.0.3(@types/[email protected])(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-use-controllable-state': 1.0.1(@types/[email protected])([email protected])
+ '@radix-ui/react-use-previous': 1.0.1(@types/[email protected])([email protected])
+ '@radix-ui/react-use-size': 1.0.1(@types/[email protected])([email protected])
+ '@types/react': 18.2.12
+ '@types/react-dom': 18.2.5
+ react: 18.2.0
+ react-dom: 18.2.0([email protected])
+ dev: false
+
resolution: {integrity: sha512-wf+fc8DOywrpRK3jlPlWVe+ELYGHdKDaaARJZNuUTWyWYq7+ANCFLp4rTjZ/mcGkJJQ/vZ949Zis9xxEpfq9OA==}
peerDependencies:
@@ -7216,6 +7311,16 @@ packages:
strip-json-comments: 2.0.1
dev: true
+ resolution: {integrity: sha512-QIC3uOuyGGbtypbd5QEggsCSqVaPNu8kzUWquZ7JjW9fuWB9yv7WyixKmnaFelTLXFdq7h7zU6n/aBleBqe/dA==}
+ peerDependencies:
+ date-fns: ^2.28.0
+ react: ^16.8.0 || ^17.0.0 || ^18.0.0
+ dependencies:
+ date-fns: 2.30.0
+ react: 18.2.0
+ dev: false
+
resolution: {integrity: sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==}
peerDependencies: