Open-source status page, incident response and uptime monitoring
TypeScript alertingincident-managementmcpmcp-servermonitoringmonitoring-as-codeobservabilityon-callopen-sourcesrestatus-pagestatuspagesynthetic-monitoringterraformtinybirdtursouptimeuptime-checkeruptime-monitor
feat: new app layout (#654)
Maximilian Kaske1bd550470953
diff --git a/apps/web/next.config.js b/apps/web/next.config.jsindex 7dbd17e02..7d6de6596 100644--- a/apps/web/next.config.js+++ b/apps/web/next.config.js@@ -4,26 +4,22 @@ const { withContentlayer } = require("next-contentlayer");const nextConfig = {reactStrictMode: true,swcMinify: true,- transpilePackages: [- "@openstatus/ui",- "@openstatus/api",- ],-+ transpilePackages: ["@openstatus/ui", "@openstatus/api"],experimental: {- serverActions: true,serverComponentsExternalPackages: ["libsql","@react-email/components","@react-email/render",- '@google-cloud/tasks',+ "@google-cloud/tasks",// "@libsql/client",// "better-sqlite3"],- logging: {- level: "verbose",+ optimizePackageImports: ["@tremor/react"],+ },+ logging: {+ fetches: {fullUrl: true,},- optimizePackageImports: ["@tremor/react"],},images: {remotePatterns: [diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/incidents/(overview)/layout.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/incidents/(overview)/layout.tsxindex e7b305681..a30b6ae73 100644--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/incidents/(overview)/layout.tsx+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/incidents/(overview)/layout.tsx@@ -1,7 +1,7 @@import * as React from "react";import { Header } from "@/components/dashboard/header";-import { HelpCallout } from "@/components/dashboard/help-callout";+import AppPageLayout from "@/components/layout/app-page-layout";export default async function Layout({children,@@ -9,16 +9,13 @@ export default async function Layout({children: React.ReactNode;}) {return (- <div className="grid min-h-full grid-cols-1 grid-rows-[auto,1fr,auto] gap-6 md:grid-cols-2 md:gap-8">+ <AppPageLayout withHelpCallout><Headertitle="Incidents"description="Overview of all your incidents."actions={undefined}/>- <div className="col-span-full">{children}</div>- <div className="mt-8 md:mt-12">- <HelpCallout />- </div>- </div>+ {children}+ </AppPageLayout>);}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/incidents/(overview)/page.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/incidents/(overview)/page.tsxindex a5dd2d635..78e7eef1e 100644--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/incidents/(overview)/page.tsx+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/incidents/(overview)/page.tsx@@ -12,7 +12,7 @@ export default async function IncidentPage() {return (<EmptyStateicon="activity"- title="No Incidents "+ title="No Incidents"description="Hopefully you will see this screen for a long time."action={undefined}/>diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/incidents/[id]/layout.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/incidents/[id]/layout.tsxindex 487a83961..c54ed93b1 100644--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/incidents/[id]/layout.tsx+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/incidents/[id]/layout.tsx@@ -1,5 +1,6 @@import { notFound } from "next/navigation";+import AppPageWithSidebarLayout from "@/components/layout/app-page-with-sidebar-layout";import { api } from "@/trpc/server";export default async function Layout({@@ -19,5 +20,9 @@ export default async function Layout({return notFound();}- return <div className="grid grid-cols-1 gap-6 md:gap-8">{children}</div>;+ return (+ <AppPageWithSidebarLayout id="incidents">+ {children}+ </AppPageWithSidebarLayout>+ );}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/layout.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/layout.tsxindex 4a1728946..806634c47 100644--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/layout.tsx+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/layout.tsx@@ -2,9 +2,8 @@ import * as React from "react";import { notFound } from "next/navigation";import { Shell } from "@/components/dashboard/shell";-import { AppHeader } from "@/components/layout/app-header";-import { AppMenu } from "@/components/layout/app-menu";import { AppSidebar } from "@/components/layout/app-sidebar";+import { AppHeader } from "@/components/layout/header/app-header";import { api } from "@/trpc/server";import { WorkspaceClientCookie } from "../worskpace-client-cookie";@@ -24,23 +23,11 @@ export default async function AppLayout({return notFound();return (- <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">+ <div className="container relative mx-auto flex min-h-screen w-full flex-col items-center justify-center gap-6 p-4"><AppHeader />- <div className="flex w-full flex-1 gap-6 lg:gap-8">- {/* FIXME: max-h-[] results into weird behavior when shrinking window height */}- <Shell className="hidden max-h-[calc(100vh-9rem)] max-w-min shrink-0 lg:sticky lg:top-28 lg:block">- <AppSidebar />- </Shell>- <main className="z-10 flex w-full flex-1 flex-col items-start justify-center">- <Shell className="relative flex-1 overflow-x-hidden">- {/* The `top-4` is represented in Shell with a `py-4` class */}- <nav className="absolute right-4 top-4 block md:right-6 md:top-6 lg:hidden">- <AppMenu />- </nav>- {children}- </Shell>- </main>- </div>+ <main className="z-10 flex w-full flex-1 flex-col items-start justify-center">+ {children}+ </main><WorkspaceClientCookie {...{ workspaceSlug }} /></div>);diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/(overview)/layout.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/(overview)/layout.tsxindex 67239c3b7..4e228f0d2 100644--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/(overview)/layout.tsx+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/(overview)/layout.tsx@@ -4,7 +4,7 @@ import Link from "next/link";import { ButtonWithDisableTooltip } from "@openstatus/ui";import { Header } from "@/components/dashboard/header";-import { HelpCallout } from "@/components/dashboard/help-callout";+import AppPageLayout from "@/components/layout/app-page-layout";import { api } from "@/trpc/server";export default async function Layout({@@ -15,7 +15,7 @@ export default async function Layout({const isLimitReached = await api.monitor.isMonitorLimitReached.query();return (- <div className="grid min-h-full grid-cols-1 grid-rows-[auto,1fr,auto] gap-6 md:grid-cols-2 md:gap-8">+ <AppPageLayout withHelpCallout><Headertitle="Monitors"description="Overview of all your monitors."@@ -29,10 +29,7 @@ export default async function Layout({</ButtonWithDisableTooltip>}/>- <div className="col-span-full">{children}</div>- <div className="mt-8 md:mt-12">- <HelpCallout />- </div>- </div>+ {children}+ </AppPageLayout>);}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/(overview)/page.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/(overview)/page.tsxindex 7041d00a9..24696426a 100644--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/(overview)/page.tsx+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/(overview)/page.tsx@@ -30,7 +30,7 @@ export default async function MonitorPage() {return (<><DataTable columns={columns} data={monitors} />- <div className="mt-3">{isLimitReached ? <Limit /> : null}</div>+ {isLimitReached ? <Limit /> : null}</>);}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/metrics.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/metrics.tsxindex 29d54e32b..87e56306c 100644--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/metrics.tsx+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/_components/metrics.tsx@@ -35,8 +35,6 @@ export function Metrics({const failures = current.ok === 0 ? 0 : current.count - current.ok;const lastFailures = last.count - last.ok;- console.log(metrics);-const distance = current.lastTimestamp? formatDistanceToNowStrict(new Date(current.lastTimestamp)): undefined;diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/layout.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/layout.tsxindex 9e3fb1455..1eeda2bc7 100644--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/layout.tsx+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/[id]/layout.tsx@@ -1,7 +1,7 @@import { notFound } from "next/navigation";import { Header } from "@/components/dashboard/header";-import { Navbar } from "@/components/dashboard/navbar";+import AppPageWithSidebarLayout from "@/components/layout/app-page-with-sidebar-layout";import { api } from "@/trpc/server";export default async function Layout({@@ -21,29 +21,10 @@ export default async function Layout({return notFound();}- const navigation = [- {- label: "Overview",- href: `/app/${params.workspaceSlug}/monitors/${id}/overview`,- segment: "overview",- },- {- label: "Requests Log",- href: `/app/${params.workspaceSlug}/monitors/${id}/data`,- segment: "data",- },- {- label: "Settings",- href: `/app/${params.workspaceSlug}/monitors/${id}/edit`,- segment: "edit",- },- ];-return (- <div className="grid grid-cols-1 gap-6 md:gap-8">+ <AppPageWithSidebarLayout id="monitors"><Header title={monitor.name} description={monitor.url} />- <Navbar className="col-span-full" navigation={navigation} />{children}- </div>+ </AppPageWithSidebarLayout>);}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/new/layout.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/new/layout.tsxindex 5d98ef75a..47b1517f6 100644--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/new/layout.tsx+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/monitors/new/layout.tsx@@ -1,4 +1,5 @@import { Header } from "@/components/dashboard/header";+import AppPageLayout from "@/components/layout/app-page-layout";export default async function Layout({children,@@ -6,9 +7,9 @@ export default async function Layout({children: React.ReactNode;}) {return (- <div className="grid gap-6 md:grid-cols-2 md:gap-8">+ <AppPageLayout><Header title="Monitor" description="Create your monitor" />- <div className="col-span-full">{children}</div>- </div>+ {children}+ </AppPageLayout>);}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/notifications/(overview)/layout.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/notifications/(overview)/layout.tsxnew file mode 100644index 000000000..4492d2d5f--- /dev/null+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/notifications/(overview)/layout.tsx@@ -0,0 +1,34 @@+import Link from "next/link";++import { ButtonWithDisableTooltip } from "@openstatus/ui";++import { Header } from "@/components/dashboard/header";+import AppPageLayout from "@/components/layout/app-page-layout";+import { api } from "@/trpc/server";++export default async function Layout({+ children,+}: {+ children: React.ReactNode;+}) {+ const isLimitReached =+ await api.notification.isNotificationLimitReached.query();+ return (+ <AppPageLayout withHelpCallout>+ <Header+ title="Notifications"+ description="Overview of all your notification channels."+ actions={+ <ButtonWithDisableTooltip+ tooltip="You reached the limits"+ asChild={!isLimitReached}+ disabled={isLimitReached}+ >+ <Link href="./notifications/new">Create</Link>+ </ButtonWithDisableTooltip>+ }+ />+ {children}+ </AppPageLayout>+ );+}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/notifications/(overview)/loading.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/notifications/(overview)/loading.tsxnew file mode 100644index 000000000..ae51d6a5b--- /dev/null+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/notifications/(overview)/loading.tsx@@ -0,0 +1,5 @@+import { DataTableSkeleton } from "@/components/data-table/data-table-skeleton";++export default function Loading() {+ return <DataTableSkeleton />;+}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/notifications/(overview)/page.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/notifications/(overview)/page.tsxnew file mode 100644index 000000000..0af96050d--- /dev/null+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/notifications/(overview)/page.tsx@@ -0,0 +1,39 @@+import * as React from "react";+import Link from "next/link";++import { Button } from "@openstatus/ui";++import { EmptyState } from "@/components/dashboard/empty-state";+import { Limit } from "@/components/dashboard/limit";+import { columns } from "@/components/data-table/notification/columns";+import { DataTable } from "@/components/data-table/notification/data-table";+import { api } from "@/trpc/server";++export default async function NotificationPage() {+ const notifications =+ await api.notification.getNotificationsByWorkspace.query();+ const isLimitReached =+ await api.notification.isNotificationLimitReached.query();++ if (notifications.length === 0) {+ return (+ <EmptyState+ icon="bell"+ title="No notifications"+ description="Create your first notification channel"+ action={+ <Button asChild>+ <Link href="./notifications/new">Create</Link>+ </Button>+ }+ />+ );+ }++ return (+ <>+ <DataTable columns={columns} data={notifications} />+ {isLimitReached ? <Limit /> : null}+ </>+ );+}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/[id]/update/edit/loading.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/notifications/[id]/edit/loading.tsxsimilarity index 100%rename from apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/[id]/update/edit/loading.tsxrename to apps/web/src/app/app/[workspaceSlug]/(dashboard)/notifications/[id]/edit/loading.tsxdiff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/notifications/[id]/edit/page.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/notifications/[id]/edit/page.tsxnew file mode 100644index 000000000..3cc74dae2--- /dev/null+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/notifications/[id]/edit/page.tsx@@ -0,0 +1,21 @@+import { NotificationForm } from "@/components/forms/notification-form";+import { api } from "@/trpc/server";++export default async function EditPage({+ params,+}: {+ params: { workspaceSlug: string; id: string };+}) {+ const workspace = await api.workspace.getWorkspace.query();++ const notification = await api.notification.getNotificationById.query({+ id: Number(params.id),+ });++ return (+ <NotificationForm+ defaultValues={notification}+ workspacePlan={workspace.plan}+ />+ );+}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/notifications/[id]/layout.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/notifications/[id]/layout.tsxnew file mode 100644index 000000000..c06126a65--- /dev/null+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/notifications/[id]/layout.tsx@@ -0,0 +1,30 @@+import { notFound } from "next/navigation";++import { Header } from "@/components/dashboard/header";+import AppPageWithSidebarLayout from "@/components/layout/app-page-with-sidebar-layout";+import { api } from "@/trpc/server";++export default async function Layout({+ children,+ params,+}: {+ children: React.ReactNode;+ params: { workspaceSlug: string; id: string };+}) {+ const id = params.id;++ const notification = await api.notification.getNotificationById.query({+ id: Number(id),+ });++ if (!notification) {+ return notFound();+ }++ return (+ <AppPageWithSidebarLayout id="notifications">+ <Header title={notification.name} description={notification.provider} />+ {children}+ </AppPageWithSidebarLayout>+ );+}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/notifications/[id]/page.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/notifications/[id]/page.tsxnew file mode 100644index 000000000..293f97b0f--- /dev/null+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/notifications/[id]/page.tsx@@ -0,0 +1,9 @@+import { redirect } from "next/navigation";++export default function Page({+ params,+}: {+ params: { workspaceSlug: string; id: string };+}) {+ return redirect(`./${params.id}/edit`);+}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/notifications/_components/empty-state.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/notifications/_components/empty-state.tsxdeleted file mode 100644index a228a1ac5..000000000--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/notifications/_components/empty-state.tsx+++ /dev/null@@ -1,20 +0,0 @@-import Link from "next/link";--import { Button } from "@openstatus/ui";--import { EmptyState as DefaultEmptyState } from "@/components/dashboard/empty-state";--export function EmptyState() {- return (- <DefaultEmptyState- icon="bell"- title="No notifications"- description="Create your first notification channel"- action={- <Button asChild>- <Link href="./notifications/edit">Create</Link>- </Button>- }- />- );-}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/notifications/edit/loading.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/notifications/edit/loading.tsxdeleted file mode 100644index 41fdbbaa9..000000000--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/notifications/edit/loading.tsx+++ /dev/null@@ -1,19 +0,0 @@-import { Skeleton } from "@openstatus/ui";--import { Header } from "@/components/dashboard/header";-import { SkeletonForm } from "@/components/forms/skeleton-form";--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>- <div className="col-span-full">- <SkeletonForm />- </div>- </div>- );-}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/notifications/edit/page.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/notifications/edit/page.tsxdeleted file mode 100644index 84b1d66c5..000000000--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/notifications/edit/page.tsx+++ /dev/null@@ -1,52 +0,0 @@-import { notFound } from "next/navigation";-import * as z from "zod";--import { Header } from "@/components/dashboard/header";-import { NotificationForm } from "@/components/forms/notification-form";-import { api } from "@/trpc/server";--/**- * allowed URL search params- */-const searchParamsSchema = z.object({- id: z.coerce.number().optional(),-});--export default async function EditPage({- searchParams,-}: {- params: { workspaceSlug: string };- searchParams: { [key: string]: string | string[] | undefined };-}) {- const search = searchParamsSchema.safeParse(searchParams);-- if (!search.success) {- return notFound();- }- const workspace = await api.workspace.getWorkspace.query();-- const { id } = search.data;-- const notification = id- ? await api.notification.getNotificationById.query({ id })- : undefined;-- return (- <div className="grid gap-6 md:grid-cols-2 md:gap-8">- <Header- title="Notification"- description={- notification- ? "Update your notification channel"- : "Create your notification channel"- }- />- <div className="col-span-full">- <NotificationForm- defaultValues={notification}- workspacePlan={workspace.plan}- />- </div>- </div>- );-}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/notifications/loading.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/notifications/loading.tsxdeleted file mode 100644index 5fab49f41..000000000--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/notifications/loading.tsx+++ /dev/null@@ -1,19 +0,0 @@-import { Skeleton } from "@openstatus/ui";--import { Header } from "@/components/dashboard/header";-import { DataTableSkeleton } from "@/components/data-table/data-table-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>- <div className="col-span-full w-full">- <DataTableSkeleton />- </div>- </div>- );-}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/notifications/new/layout.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/notifications/new/layout.tsxnew file mode 100644index 000000000..18fcbe75a--- /dev/null+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/notifications/new/layout.tsx@@ -0,0 +1,15 @@+import { Header } from "@/components/dashboard/header";+import AppPageLayout from "@/components/layout/app-page-layout";++export default async function Layout({+ children,+}: {+ children: React.ReactNode;+}) {+ return (+ <AppPageLayout>+ <Header title="Notifications" description="Create your notification" />+ {children}+ </AppPageLayout>+ );+}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/notifications/new/loading.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/notifications/new/loading.tsxnew file mode 100644index 000000000..b269200de--- /dev/null+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/notifications/new/loading.tsx@@ -0,0 +1,5 @@+import { SkeletonForm } from "@/components/forms/skeleton-form";++export default function Loading() {+ return <SkeletonForm />;+}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/notifications/new/page.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/notifications/new/page.tsxnew file mode 100644index 000000000..92d03c402--- /dev/null+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/notifications/new/page.tsx@@ -0,0 +1,13 @@+import { notFound } from "next/navigation";+import * as z from "zod";++import { NotificationForm } from "@/components/forms/notification-form";+import { api } from "@/trpc/server";++export default async function EditPage({}: {+ params: { workspaceSlug: string };+}) {+ const workspace = await api.workspace.getWorkspace.query();++ return <NotificationForm workspacePlan={workspace.plan} nextUrl="./" />;+}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/notifications/page.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/notifications/page.tsxdeleted file mode 100644index d30d54a32..000000000--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/notifications/page.tsx+++ /dev/null@@ -1,48 +0,0 @@-import * as React from "react";-import Link from "next/link";--import { ButtonWithDisableTooltip } from "@openstatus/ui";--import { Header } from "@/components/dashboard/header";-import { HelpCallout } from "@/components/dashboard/help-callout";-import { columns } from "@/components/data-table/notification/columns";-import { DataTable } from "@/components/data-table/notification/data-table";-import { api } from "@/trpc/server";-import { EmptyState } from "./_components/empty-state";--export default async function NotificationPage() {- const notifications =- await api.notification.getNotificationsByWorkspace.query();- const isLimitReached =- await api.notification.isNotificationLimitReached.query();-- return (- <div className="grid min-h-full grid-cols-1 grid-rows-[auto,1fr,auto] gap-6 md:grid-cols-2 md:gap-8">- <Header- title="Notifications"- description="Overview of all your notification channels."- actions={- <ButtonWithDisableTooltip- tooltip="You reached the limits"- asChild={!isLimitReached}- disabled={isLimitReached}- >- <Link href="./notifications/edit">Create</Link>- </ButtonWithDisableTooltip>- }- />- {notifications && notifications.length > 0 ? (- <div className="col-span-full">- <DataTable columns={columns} data={notifications} />- </div>- ) : (- <div className="col-span-full">- <EmptyState />- </div>- )}- <div className="mt-8 md:mt-12">- <HelpCallout />- </div>- </div>- );-}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/api-token/_components/card.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/api-token/_components/card.tsxindex 1ec304699..228814ff5 100644--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/api-token/_components/card.tsx+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/api-token/_components/card.tsx@@ -23,31 +23,45 @@ export async function ApiKeys({ ownerId }: { ownerId: number }) {const key = data.result.keys?.[0] || undefined;return (- <Container- title="API Token"- description="Use our API endpoints to create your monitors programmatically."- actions={- <>- {key ? (- <RevokeButton keyId={key.id} />- ) : (- <CreateForm ownerId={ownerId} />- )}- </>- }- >- {key ? (- <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>Token</dt>- <dd className="font-mono">{key.start}...</dd>- </div>- <div className="flex min-w-0 items-center justify-between gap-3">- <dt>Created At</dt>- <dd>{formatDate(new Date(key.createdAt!))}</dd>- </div>- </dl>- ) : null}- </Container>+ <>+ <Container+ title="API Token"+ description="Use our API endpoints to create your monitors programmatically."+ actions={+ <>+ {key ? (+ <RevokeButton keyId={key.id} />+ ) : (+ <CreateForm ownerId={ownerId} />+ )}+ </>+ }+ >+ {key ? (+ <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>Token</dt>+ <dd className="font-mono">{key.start}...</dd>+ </div>+ <div className="flex min-w-0 items-center justify-between gap-3">+ <dt>Created At</dt>+ <dd>{formatDate(new Date(key.createdAt!))}</dd>+ </div>+ </dl>+ ) : null}+ </Container>+ <p className="text-foreground text-sm">+ Read more about APIs in our{" "}+ <a+ className="text-foreground underline underline-offset-4 hover:no-underline"+ href="https://docs.openstatus.dev/api-reference/auth"+ target="_blank"+ rel="noreferrer"+ >+ docs+ </a>+ .+ </p>+ </>);}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/api-token/layout.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/api-token/layout.tsxnew file mode 100644index 000000000..623bd9ff9--- /dev/null+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/api-token/layout.tsx@@ -0,0 +1,13 @@+import { Header } from "@/components/dashboard/header";+import { getPageBySegment } from "@/config/pages";++const page = getPageBySegment(["settings", "api-token"]);++export default function Layout({ children }: { children: React.ReactNode }) {+ return (+ <>+ <Header title={page?.title} description={page?.description} />+ {children}+ </>+ );+}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/api-token/loading.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/api-token/loading.tsxnew file mode 100644index 000000000..5eb7326c5--- /dev/null+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/api-token/loading.tsx@@ -0,0 +1,7 @@+import { Skeleton } from "@openstatus/ui";++// TODO: can be improved...++export default function Loading() {+ return <Skeleton className="h-72 w-full" />;+}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/appearance/layout.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/appearance/layout.tsxnew file mode 100644index 000000000..ba87ef307--- /dev/null+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/appearance/layout.tsx@@ -0,0 +1,13 @@+import { Header } from "@/components/dashboard/header";+import { getPageBySegment } from "@/config/pages";++const page = getPageBySegment(["settings", "appearance"]);++export default function Layout({ children }: { children: React.ReactNode }) {+ return (+ <>+ <Header title={page?.title} description={page?.description} />+ {children}+ </>+ );+}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/appearance/loading.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/appearance/loading.tsxnew file mode 100644index 000000000..5eb7326c5--- /dev/null+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/appearance/loading.tsx@@ -0,0 +1,7 @@+import { Skeleton } from "@openstatus/ui";++// TODO: can be improved...++export default function Loading() {+ return <Skeleton className="h-72 w-full" />;+}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/billing/layout.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/billing/layout.tsxnew file mode 100644index 000000000..0491884e5--- /dev/null+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/billing/layout.tsx@@ -0,0 +1,13 @@+import { Header } from "@/components/dashboard/header";+import { getPageBySegment } from "@/config/pages";++const page = getPageBySegment(["settings", "billing"]);++export default function Layout({ children }: { children: React.ReactNode }) {+ return (+ <>+ <Header title={page?.title} description={page?.description} />+ {children}+ </>+ );+}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/billing/loading.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/billing/loading.tsxnew file mode 100644index 000000000..5eb7326c5--- /dev/null+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/billing/loading.tsx@@ -0,0 +1,7 @@+import { Skeleton } from "@openstatus/ui";++// TODO: can be improved...++export default function Loading() {+ return <Skeleton className="h-72 w-full" />;+}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/general/layout.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/general/layout.tsxnew file mode 100644index 000000000..bead2fc4b--- /dev/null+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/general/layout.tsx@@ -0,0 +1,13 @@+import { Header } from "@/components/dashboard/header";+import { getPageBySegment } from "@/config/pages";++const page = getPageBySegment(["settings", "general"]);++export default function Layout({ children }: { children: React.ReactNode }) {+ return (+ <>+ <Header title={page?.title} description={page?.description} />+ {children}+ </>+ );+}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/general/loading.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/general/loading.tsxnew file mode 100644index 000000000..5eb7326c5--- /dev/null+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/general/loading.tsx@@ -0,0 +1,7 @@+import { Skeleton } from "@openstatus/ui";++// TODO: can be improved...++export default function Loading() {+ return <Skeleton className="h-72 w-full" />;+}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/layout.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/layout.tsxindex 9d493d628..45fee0cbb 100644--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/layout.tsx+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/layout.tsx@@ -1,49 +1,13 @@-import { Header } from "@/components/dashboard/header";-import { Navbar } from "@/components/dashboard/navbar";+import AppPageWithSidebarLayout from "@/components/layout/app-page-with-sidebar-layout";export default function SettingsLayout({- params,children,}: {- params: { workspaceSlug: string };children: React.ReactNode;}) {- const navigation = [- {- label: "General",- href: `/app/${params.workspaceSlug}/settings/general`,- segment: "general",- },- {- label: "Team",- href: `/app/${params.workspaceSlug}/settings/team`,- segment: "team",- },- {- label: "API Token",- href: `/app/${params.workspaceSlug}/settings/api-token`,- segment: "api-token",- },- {- label: "Billing",- href: `/app/${params.workspaceSlug}/settings/billing`,- segment: "billing",- },- {- label: "Appearance",- href: `/app/${params.workspaceSlug}/settings/appearance`,- segment: "appearance",- },- ];-return (- <div className="grid gap-6 md:grid-cols-2 md:gap-8">- <Header- title="Settings"- description="Your OpenStatus workspace settings."- />- <Navbar className="col-span-full" {...{ navigation }} />- <div className="col-span-full">{children}</div>- </div>+ <AppPageWithSidebarLayout id="settings">+ {children}+ </AppPageWithSidebarLayout>);}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/loading.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/loading.tsxdeleted file mode 100644index 5b2000e22..000000000--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/loading.tsx+++ /dev/null@@ -1,11 +0,0 @@-import { Skeleton } from "@openstatus/ui";--// TODO: can be improved...--export default function Loading() {- return (- <div className="grid gap-6 md:grid-cols-1 md:gap-8">- <Skeleton className="h-72 w-full" />- </div>- );-}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/team/layout.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/team/layout.tsxnew file mode 100644index 000000000..4e727f5fe--- /dev/null+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/team/layout.tsx@@ -0,0 +1,13 @@+import { Header } from "@/components/dashboard/header";+import { getPageBySegment } from "@/config/pages";++const page = getPageBySegment(["settings", "team"]);++export default function Layout({ children }: { children: React.ReactNode }) {+ return (+ <>+ <Header title={page?.title} description={page?.description} />+ {children}+ </>+ );+}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/team/loading.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/team/loading.tsxnew file mode 100644index 000000000..5eb7326c5--- /dev/null+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/settings/team/loading.tsx@@ -0,0 +1,7 @@+import { Skeleton } from "@openstatus/ui";++// TODO: can be improved...++export default function Loading() {+ return <Skeleton className="h-72 w-full" />;+}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-pages/(overview)/layout.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-pages/(overview)/layout.tsxindex ca2c53e22..5a7d56e99 100644--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-pages/(overview)/layout.tsx+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-pages/(overview)/layout.tsx@@ -4,7 +4,7 @@ import Link from "next/link";import { ButtonWithDisableTooltip } from "@openstatus/ui";import { Header } from "@/components/dashboard/header";-import { HelpCallout } from "@/components/dashboard/help-callout";+import AppPageLayout from "@/components/layout/app-page-layout";import { api } from "@/trpc/server";export default async function Layout({@@ -15,7 +15,7 @@ export default async function Layout({const isLimitReached = await api.page.isPageLimitReached.query();return (- <div className="grid min-h-full grid-cols-1 grid-rows-[auto,1fr,auto] gap-6 md:grid-cols-2 md:gap-8">+ <AppPageLayout withHelpCallout><Headertitle="Pages"description="Overview of all your pages."@@ -29,10 +29,7 @@ export default async function Layout({</ButtonWithDisableTooltip>}/>- <div className="col-span-full">{children}</div>- <div className="mt-8 md:mt-12">- <HelpCallout />- </div>- </div>+ {children}+ </AppPageLayout>);}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-pages/(overview)/page.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-pages/(overview)/page.tsxindex 03a83c6f3..ccaf21b5b 100644--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-pages/(overview)/page.tsx+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-pages/(overview)/page.tsx@@ -30,7 +30,7 @@ export default async function MonitorPage() {return (<><DataTable columns={columns} data={pages} />- <div className="mt-3">{isLimitReached ? <Limit /> : null}</div>+ {isLimitReached ? <Limit /> : null}</>);}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-pages/[id]/layout.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-pages/[id]/layout.tsxindex fc72cf508..09f620731 100644--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-pages/[id]/layout.tsx+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-pages/[id]/layout.tsx@@ -4,7 +4,7 @@ import { notFound } from "next/navigation";import { Button } from "@openstatus/ui";import { Header } from "@/components/dashboard/header";-import { Navbar } from "@/components/dashboard/navbar";+import AppPageWithSidebarLayout from "@/components/layout/app-page-with-sidebar-layout";import { api } from "@/trpc/server";export default async function Layout({@@ -24,26 +24,8 @@ export default async function Layout({return notFound();}- const navigation = [- {- label: "Settings",- href: `/app/${params.workspaceSlug}/status-pages/${id}/edit`,- segment: "edit",- },- {- label: "Domain",- href: `/app/${params.workspaceSlug}/status-pages/${id}/domain`,- segment: "domain",- },- {- label: "Subscribers",- href: `/app/${params.workspaceSlug}/status-pages/${id}/subscribers`,- segment: "subscribers",- },- ];-return (- <div className="grid grid-cols-1 gap-6 md:gap-8">+ <AppPageWithSidebarLayout id="status-pages"><Headertitle={page.title}description={page.description}@@ -55,8 +37,7 @@ export default async function Layout({</Button>}/>- <Navbar className="col-span-full" navigation={navigation} />{children}- </div>+ </AppPageWithSidebarLayout>);}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-pages/new/layout.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-pages/new/layout.tsxindex c3e43da32..51db6af91 100644--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-pages/new/layout.tsx+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-pages/new/layout.tsx@@ -1,4 +1,5 @@import { Header } from "@/components/dashboard/header";+import AppPageLayout from "@/components/layout/app-page-layout";export default async function Layout({children,@@ -6,9 +7,9 @@ export default async function Layout({children: React.ReactNode;}) {return (- <div className="grid gap-6 md:grid-cols-2 md:gap-8">+ <AppPageLayout><Header title="Pages" description="Create your page." />- <div className="col-span-full">{children}</div>- </div>+ {children}+ </AppPageLayout>);}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/(overview)/layout.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/(overview)/layout.tsxindex 913b34569..4bb5bd19a 100644--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/(overview)/layout.tsx+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/(overview)/layout.tsx@@ -4,7 +4,7 @@ import Link from "next/link";import { Button } from "@openstatus/ui";import { Header } from "@/components/dashboard/header";-import { HelpCallout } from "@/components/dashboard/help-callout";+import AppPageLayout from "@/components/layout/app-page-layout";export default async function Layout({children,@@ -12,7 +12,7 @@ export default async function Layout({children: React.ReactNode;}) {return (- <div className="grid min-h-full grid-cols-1 grid-rows-[auto,1fr,auto] gap-6 md:grid-cols-2 md:gap-8">+ <AppPageLayout withHelpCallout><Headertitle="Status Reports"description="Overview of all your status reports and updates."@@ -22,10 +22,7 @@ export default async function Layout({</Button>}/>- <div className="col-span-full">{children}</div>- <div className="mt-8 md:mt-12">- <HelpCallout />- </div>- </div>+ {children}+ </AppPageLayout>);}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/[id]/_components/status-update-button.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/[id]/_components/status-update-button.tsxindex 0332d2ea9..a5a4b5270 100644--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/[id]/_components/status-update-button.tsx+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/[id]/_components/status-update-button.tsx@@ -1,20 +1,42 @@"use client";-import Link from "next/link";-import { usePathname } from "next/navigation";+import { useState } from "react";-import { Button } from "@openstatus/ui";+import {+ Button,+ Dialog,+ DialogContent,+ DialogDescription,+ DialogHeader,+ DialogTitle,+ DialogTrigger,+} from "@openstatus/ui";-export function StatusUpdateButton() {- const pathname = usePathname();-- if (pathname.endsWith("/update/edit")) {- return <Button disabled>Status Update</Button>;- }+import { StatusReportUpdateForm } from "@/components/forms/status-report-update/form";+export function StatusUpdateButton({+ statusReportId,+}: {+ statusReportId: number;+}) {+ const [open, setOpen] = useState(false);return (- <Button asChild>- <Link href="./update/edit">Status Update</Link>- </Button>+ <Dialog open={open} onOpenChange={setOpen}>+ <DialogTrigger asChild>+ <Button>Status Update</Button>+ </DialogTrigger>+ <DialogContent className="max-h-screen overflow-y-scroll sm:max-w-[650px]">+ <DialogHeader>+ <DialogTitle>New Status Report</DialogTitle>+ <DialogDescription>+ Provide a status update and add it to the report history.+ </DialogDescription>+ </DialogHeader>+ <StatusReportUpdateForm+ statusReportId={statusReportId}+ onSubmit={() => setOpen(false)}+ />+ </DialogContent>+ </Dialog>);}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/[id]/layout.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/[id]/layout.tsxindex 73b9d9eb2..ddb33d7c2 100644--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/[id]/layout.tsx+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/[id]/layout.tsx@@ -1,7 +1,7 @@import { notFound } from "next/navigation";import { Header } from "@/components/dashboard/header";-import { Navbar } from "@/components/dashboard/navbar";+import AppPageWithSidebarLayout from "@/components/layout/app-page-with-sidebar-layout";import { api } from "@/trpc/server";import { StatusUpdateButton } from "./_components/status-update-button";@@ -22,24 +22,13 @@ export default async function Layout({return notFound();}- const navigation = [- {- label: "Overview",- href: `/app/${params.workspaceSlug}/status-reports/${id}/overview`,- segment: "overview",- },- {- label: "Settings",- href: `/app/${params.workspaceSlug}/status-reports/${id}/edit`,- segment: "edit",- },- ];-return (- <div className="grid grid-cols-1 gap-6 md:gap-8">- <Header title={statusReport.title} actions={<StatusUpdateButton />} />- <Navbar className="col-span-full" navigation={navigation} />+ <AppPageWithSidebarLayout id="status-reports">+ <Header+ title={statusReport.title}+ actions={<StatusUpdateButton statusReportId={Number(id)} />}+ />{children}- </div>+ </AppPageWithSidebarLayout>);}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/[id]/update/edit/page.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/[id]/update/edit/page.tsxdeleted file mode 100644index f2b1bbc84..000000000--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/[id]/update/edit/page.tsx+++ /dev/null@@ -1,42 +0,0 @@-import { notFound } from "next/navigation";-import * as z from "zod";--import { StatusReportUpdateForm } from "@/components/forms/status-report-update-form";-import { api } from "@/trpc/server";--/**- * allowed URL search params- */-const searchParamsSchema = z.object({- statusUpdate: z.coerce.number().optional(), // TODO: call it id as we do it everywhere else-});--export default async function EditPage({- params,- searchParams,-}: {- params: { workspaceSlug: string; id: string };- searchParams: { [key: string]: string | string[] | undefined };-}) {- const search = searchParamsSchema.safeParse(searchParams);-- if (!search.success) {- return notFound();- }-- const { statusUpdate } = search.data;-- const data = statusUpdate- ? await api.statusReport.getStatusReportUpdateById.query({- id: statusUpdate,- })- : undefined;-- return (- <StatusReportUpdateForm- statusReportId={parseInt(params.id)}- defaultValues={data || undefined}- nextUrl={"../overview"}- />- );-}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/edit/page.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/edit/page.tsxindex 4cf02abe2..df0f12535 100644--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/edit/page.tsx+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/edit/page.tsx@@ -3,6 +3,7 @@ import * as z from "zod";import { Header } from "@/components/dashboard/header";import { StatusReportForm } from "@/components/forms/status-report-form";+import AppPageLayout from "@/components/layout/app-page-layout";import { api } from "@/trpc/server";/**@@ -38,34 +39,32 @@ export default async function EditPage({const pages = await api.page.getPagesByWorkspace.query();return (- <div className="grid gap-6 md:grid-cols-2 md:gap-8">+ <AppPageLayout><Headertitle="Status Report"description="Create a public report for your incident"/>- <div className="col-span-full">- <StatusReportForm- monitors={monitors}- pages={pages}- defaultValues={- statusUpdate- ? // TODO: we should move the mapping to the trpc layer- // so we don't have to do this in the UI- // it should be something like defaultValues={statusReport}- {- ...statusUpdate,- monitors: statusUpdate?.monitorsToStatusReports.map(- ({ monitorId }) => monitorId,- ),- pages: statusUpdate?.pagesToStatusReports.map(- ({ pageId }) => pageId,- ),- message: "",- }- : undefined- }- />- </div>- </div>+ <StatusReportForm+ monitors={monitors}+ pages={pages}+ defaultValues={+ statusUpdate+ ? // TODO: we should move the mapping to the trpc layer+ // so we don't have to do this in the UI+ // it should be something like defaultValues={statusReport}+ {+ ...statusUpdate,+ monitors: statusUpdate?.monitorsToStatusReports.map(+ ({ monitorId }) => monitorId,+ ),+ pages: statusUpdate?.pagesToStatusReports.map(+ ({ pageId }) => pageId,+ ),+ message: "",+ }+ : undefined+ }+ />+ </AppPageLayout>);}diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/new/layout.tsx b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/new/layout.tsxindex 469ad2131..1555095d7 100644--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/new/layout.tsx+++ b/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/new/layout.tsx@@ -1,4 +1,5 @@import { Header } from "@/components/dashboard/header";+import AppPageLayout from "@/components/layout/app-page-layout";export default async function Layout({children,@@ -6,12 +7,12 @@ export default async function Layout({children: React.ReactNode;}) {return (- <div className="grid gap-6 md:grid-cols-2 md:gap-8">+ <AppPageLayout><Headertitle="Status Report"description="Create a public report for your incident."/>- <div className="col-span-full">{children}</div>- </div>+ {children}+ </AppPageLayout>);}diff --git a/apps/web/src/app/app/[workspaceSlug]/onboarding/layout.tsx b/apps/web/src/app/app/[workspaceSlug]/onboarding/layout.tsxindex a56f82c11..fd929288a 100644--- a/apps/web/src/app/app/[workspaceSlug]/onboarding/layout.tsx+++ b/apps/web/src/app/app/[workspaceSlug]/onboarding/layout.tsx@@ -1,7 +1,7 @@import * as React from "react";import { Shell } from "@/components/dashboard/shell";-import { AppHeader } from "@/components/layout/app-header";+import { AppHeader } from "@/components/layout/header/app-header";import { WorkspaceClientCookie } from "../worskpace-client-cookie";// TODO: make the container min-h-screen and the footer below!@@ -14,7 +14,7 @@ export default async function AppLayout({}) {const { workspaceSlug } = params;return (- <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">+ <div className="container relative mx-auto flex min-h-screen w-full flex-col items-center justify-center gap-6 p-4"><AppHeader /><div className="flex w-full flex-1 gap-6 lg:gap-8"><main className="z-10 flex w-full flex-1 flex-col items-start justify-center">diff --git a/apps/web/src/app/app/invite/layout.tsx b/apps/web/src/app/app/invite/layout.tsxindex e4485cc58..356beebd4 100644--- a/apps/web/src/app/app/invite/layout.tsx+++ b/apps/web/src/app/app/invite/layout.tsx@@ -1,7 +1,7 @@import * as React from "react";import { Shell } from "@/components/dashboard/shell";-import { AppHeader } from "@/components/layout/app-header";+import { AppHeader } from "@/components/layout/header/app-header";export default async function AppLayout({children,diff --git a/apps/web/src/app/app/page.tsx b/apps/web/src/app/app/page.tsxindex a41fbce4a..839a67fa8 100644--- a/apps/web/src/app/app/page.tsx+++ b/apps/web/src/app/app/page.tsx@@ -4,7 +4,7 @@ import * as React from "react";import { useRouter } from "next/navigation";import { Shell } from "@/components/dashboard/shell";-import { AppHeader } from "@/components/layout/app-header";+import { AppHeader } from "@/components/layout/header/app-header";import { LoadingAnimation } from "@/components/loading-animation";// TODO: discuss how to make that page a bit more enjoyable@@ -22,23 +22,23 @@ export default function Page() {<Shell className="relative flex flex-1 flex-col items-center justify-center"><div className="grid gap-4"><div className="text-center">- <p className="mb-1 text-lg font-bold">Creating Workspace</p>- <p className="text-muted-foreground mb-3">+ <p className="font-cal mb-1 text-3xl">Creating Workspace</p>+ <p className="text-muted-foreground mb-5 text-xl">Should be done in a second.</p>- <p className="text-muted-foreground text-sm font-light">+ <p className="text-muted-foreground">If you are stuck for longer, please contact us via{" "}<ahref="https://openstatus.dev/discord"target="_blank"- className="font-normal"+ className="text-foreground underline underline-offset-4 hover:no-underline">Discord</a>{" "}or{" "}<ahref="mailto:[email protected]"- className="font-normal"+ className="text-foreground underline underline-offset-4 hover:no-underline"></a>diff --git a/apps/web/src/app/global-error.tsx b/apps/web/src/app/global-error.tsxnew file mode 100644index 000000000..4ff81b2dd--- /dev/null+++ b/apps/web/src/app/global-error.tsx@@ -0,0 +1,24 @@+"use client";++import { useEffect } from "react";+import NextError from "next/error";+import * as Sentry from "@sentry/nextjs";++export default function GlobalError({+ error,+}: {+ error: Error & { digest?: string };+}) {+ useEffect(() => {+ Sentry.captureException(error);+ }, [error]);++ return (+ <html>+ <body>+ {/* This is the default Next.js error component but it doesn't allow omitting the statusCode property yet. */}+ <NextError statusCode={undefined as any} />+ </body>+ </html>+ );+}diff --git a/apps/web/src/app/play/checker/[id]/page.tsx b/apps/web/src/app/play/checker/[id]/page.tsxindex bfc3f6a84..fb6c9edf3 100644--- a/apps/web/src/app/play/checker/[id]/page.tsx+++ b/apps/web/src/app/play/checker/[id]/page.tsx@@ -17,8 +17,6 @@ import { CopyLinkButton } from "./_components/copy-link-button";import { MultiRegionTabs } from "./_components/multi-region-tabs";import { RegionInfo } from "./_components/region-info";import { ResponseDetailTabs } from "./_components/response-detail-tabs";-import { ResponseHeaderTable } from "./_components/response-header-table";-import { ResponseTimingTable } from "./_components/response-timing-table";import { SelectRegion } from "./_components/select-region";import { getCheckerDataById, timestampFormatter } from "./utils";@@ -51,7 +49,7 @@ export default async function CheckPage({ params, searchParams }: Props) {return (<><BackButton href="/play/checker" />- <Shell className="grid gap-8">+ <Shell className="flex flex-col gap-8"><div className="flex items-center justify-between gap-4"><div className="flex flex-col gap-1"><h1 className="text-3xl font-semibold">@@ -67,7 +65,7 @@ export default async function CheckPage({ params, searchParams }: Props) {</div><MultiRegionTabs regions={data.checks} /><Separator />- <div className="grid gap-8">+ <div className="flex flex-col gap-8"><div className="grid gap-8 md:grid-cols-2"><div><SelectRegion defaultValue={region} />diff --git a/apps/web/src/app/play/checker/_components/checker-play.tsx b/apps/web/src/app/play/checker/_components/checker-play.tsxindex 82d4ab819..b65b19d92 100644--- a/apps/web/src/app/play/checker/_components/checker-play.tsx+++ b/apps/web/src/app/play/checker/_components/checker-play.tsx@@ -4,7 +4,7 @@ import { CheckerForm } from "./checker-form";export default async function CheckerPlay() {return (- <Shell className="grid gap-8">+ <Shell className="flex flex-col gap-8"><HeaderPlaytitle="Is your endpoint fast?"description="Check the performance of your website, API from the different continents."diff --git a/apps/web/src/app/pricing/page.tsx b/apps/web/src/app/pricing/page.tsxindex e4e4c6d16..92f1b5823 100644--- a/apps/web/src/app/pricing/page.tsx+++ b/apps/web/src/app/pricing/page.tsx@@ -1,3 +1,4 @@+import type { Metadata } from "next";import Link from "next/link";import { Shell } from "@/components/dashboard/shell";@@ -5,6 +6,25 @@ import { MarketingLayout } from "@/components/layout/marketing-layout";import { FAQs } from "@/components/marketing/faqs";import { EnterpricePlan } from "@/components/marketing/pricing/enterprice-plan";import { PricingWrapper } from "@/components/marketing/pricing/pricing-wrapper";+import {+ defaultMetadata,+ ogMetadata,+ twitterMetadata,+} from "../shared-metadata";++export const metadata: Metadata = {+ ...defaultMetadata,+ title: "Pricing",+ openGraph: {+ ...ogMetadata,+ title: "Pricing",+ url: "https://www.openstatus.dev/pricing",+ },+ twitter: {+ ...twitterMetadata,+ title: "Pricing",+ },+};export default function PricingPage() {return (diff --git a/apps/web/src/components/dashboard/header.tsx b/apps/web/src/components/dashboard/header.tsxindex d2a3f2cba..9f8c73a05 100644--- a/apps/web/src/components/dashboard/header.tsx+++ b/apps/web/src/components/dashboard/header.tsx@@ -3,7 +3,7 @@ import { Skeleton } from "@openstatus/ui";import { cn } from "@/lib/utils";interface HeaderProps extends React.HTMLAttributes<HTMLDivElement> {- title: string;+ title?: string;description?: string | null;actions?: React.ReactNode | React.ReactNode[];}@@ -15,11 +15,11 @@ function Header({ title, description, className, actions }: HeaderProps) {return (<divclassName={cn(- "col-span-full mr-12 flex items-start justify-between gap-1 lg:mr-0",+ "col-span-full flex items-start justify-between gap-1",className,)}>- <div className="flex flex-col gap-1">+ <div className="flex min-w-0 flex-col gap-1"><h1 className="font-cal text-3xl">{title}</h1>{description ? (<p className="text-muted-foreground">{description}</p>@@ -42,7 +42,7 @@ function HeaderSkeleton({withDescription?: boolean;}) {return (- <div className="col-span-full mr-12 flex w-full justify-between lg:mr-0">+ <div className="col-span-full flex w-full justify-between"><div className="grid w-full gap-3"><Skeleton className="h-8 w-full max-w-[200px]" />{withDescription && <Skeleton className="h-4 w-full max-w-[300px]" />}diff --git a/apps/web/src/components/dashboard/help-callout.tsx b/apps/web/src/components/dashboard/help-callout.tsxindex 3af7642ee..423823ea9 100644--- a/apps/web/src/components/dashboard/help-callout.tsx+++ b/apps/web/src/components/dashboard/help-callout.tsx@@ -4,7 +4,7 @@ import { Alert, AlertDescription, AlertTitle } from "@openstatus/ui";export function HelpCallout() {return (- <Alert className="max-w-xl">+ <Alert className="max-w-md"><HelpCircle className="h-4 w-4" /><AlertTitle className="">Need help?</AlertTitle><AlertDescription className="text-muted-foreground">diff --git a/apps/web/src/components/dashboard/tabs-link.tsx b/apps/web/src/components/dashboard/tabs-link.tsxindex 390c96920..b72830f6e 100644--- a/apps/web/src/components/dashboard/tabs-link.tsx+++ b/apps/web/src/components/dashboard/tabs-link.tsx@@ -9,39 +9,56 @@ import { Separator } from "@openstatus/ui";import { cn } from "@/lib/utils";export interface TabsContainerProps- extends React.HTMLAttributes<HTMLDivElement> {}+ extends React.HTMLAttributes<HTMLDivElement> {+ hideSeparator?: boolean;+}-export function TabsContainer({ className, children }: TabsContainerProps) {+export function TabsContainer({+ className,+ children,+ hideSeparator = false,+}: TabsContainerProps) {return (<nav className={cn(className)}><div className="flex w-full items-center overflow-x-auto"><ul className="flex flex-row">{children}</ul></div>- <Separator />+ {/* TODO: move into border-b instead to allow overwrite via className `border-b-0`? */}+ {hideSeparator ? null : <Separator />}</nav>);}export interface TabsLinkProps extends LinkProps {children: React.ReactNode;+ className?: string;active?: boolean;+ disabled?: boolean;}-export function TabsLink({ href, children, active }: TabsLinkProps) {+export function TabsLink({+ children,+ active,+ className,+ disabled,+ ...props+}: TabsLinkProps) {return (<liclassName={cn("flex shrink-0 list-none border-b-2 border-transparent", {"border-primary": active,+ "pointer-events-none opacity-70": disabled,})}><Link- href={href}className={cn("text-muted-foreground hover:text-primary rounded-md px-4 pb-3 pt-2 text-sm font-medium",{"text-primary": active,},+ className,)}+ {...props}>{children}</Link>diff --git a/apps/web/src/components/data-table/notification/data-table-row-actions.tsx b/apps/web/src/components/data-table/notification/data-table-row-actions.tsxindex d6f03ca07..2631fe59f 100644--- a/apps/web/src/components/data-table/notification/data-table-row-actions.tsx+++ b/apps/web/src/components/data-table/notification/data-table-row-actions.tsx@@ -43,7 +43,6 @@ export function DataTableRowActions<TData>({async function onDelete() {startTransition(async () => {- console.log({ notification });try {if (!notification.id) return;await api.notification.deleteNotification.mutate({@@ -71,7 +70,7 @@ export function DataTableRowActions<TData>({</Button></DropdownMenuTrigger><DropdownMenuContent align="end">- <Link href={`./notifications/edit?id=${notification.id}`}>+ <Link href={`./notifications/${notification.id}/edit`}><DropdownMenuItem>Edit</DropdownMenuItem></Link><AlertDialogTrigger asChild>diff --git a/apps/web/src/components/forms/notification-form.tsx b/apps/web/src/components/forms/notification-form.tsxindex 27795c89c..003f851f3 100644--- a/apps/web/src/components/forms/notification-form.tsx+++ b/apps/web/src/components/forms/notification-form.tsx@@ -101,12 +101,14 @@ interface Props {defaultValues?: InsertNotification;onSubmit?: () => void;workspacePlan: WorkspacePlan;+ nextUrl?: string;}export function NotificationForm({defaultValues,onSubmit: onExternalSubmit,workspacePlan,+ nextUrl,}: Props) {const [isPending, startTransition] = useTransition();const [isTestPending, startTestTransition] = useTransition();@@ -147,6 +149,9 @@ export function NotificationForm({...rest,});}+ if (nextUrl) {+ router.push(nextUrl);+ }router.refresh();toast("saved");} catch {@@ -175,6 +180,7 @@ export function NotificationForm({<formonSubmit={form.handleSubmit(onSubmit)}className="grid w-full gap-6"+ id="notification-form" // we use a form id to connect the submit button to the form (as we also have the form nested inside of `MonitorForm`)><div className="grid gap-4 sm:grid-cols-3"><div className="my-1.5 flex flex-col gap-2">@@ -300,7 +306,12 @@ export function NotificationForm({)}</Button>)}- <Button className="w-full sm:w-auto" size="lg" disabled={isPending}>+ <Button+ form="notification-form"+ className="w-full sm:w-auto"+ size="lg"+ disabled={isPending}+ >{!isPending ? "Confirm" : <LoadingAnimation />}</Button></div>diff --git a/apps/web/src/components/forms/status-page-form.tsx b/apps/web/src/components/forms/status-page-form.tsxindex 7a94940f6..80a283038 100644--- a/apps/web/src/components/forms/status-page-form.tsx+++ b/apps/web/src/components/forms/status-page-form.tsx@@ -55,7 +55,6 @@ export function StatusPageForm({checkAllMonitors,nextUrl,}: Props) {- console.log({ defaultValues });const form = useForm<InsertPage>({resolver: zodResolver(insertPageSchema),defaultValues: {diff --git a/apps/web/src/components/forms/status-report-form.tsx b/apps/web/src/components/forms/status-report-form.tsxindex b43efcd64..698ceb229 100644--- a/apps/web/src/components/forms/status-report-form.tsx+++ b/apps/web/src/components/forms/status-report-form.tsx@@ -22,7 +22,7 @@ import {AccordionTrigger,Button,Checkbox,- DateTimePicker,+ DateTimePickerPopover,Form,FormControl,FormDescription,@@ -376,7 +376,7 @@ export function StatusReportForm({render={({ field }) => (<FormItem className="flex flex-col sm:col-span-full"><FormLabel>Date</FormLabel>- <DateTimePicker+ <DateTimePickerPopoverdate={field.value ? new Date(field.value) : new Date()}diff --git a/apps/web/src/components/forms/status-report-update-form.tsx b/apps/web/src/components/forms/status-report-update-form.tsxindex d5482fc21..f91656ff8 100644--- a/apps/web/src/components/forms/status-report-update-form.tsx+++ b/apps/web/src/components/forms/status-report-update-form.tsx@@ -40,13 +40,13 @@ import { api } from "@/trpc/client";interface Props {defaultValues?: InsertStatusReportUpdate;statusReportId: number;- nextUrl?: string;+ onSubmit?: () => void;}export function StatusReportUpdateForm({defaultValues,statusReportId,- nextUrl,+ onSubmit,}: Props) {const form = useForm<InsertStatusReportUpdate>({resolver: zodResolver(insertStatusReportUpdateSchema),@@ -62,7 +62,7 @@ export function StatusReportUpdateForm({const [isPending, startTransition] = React.useTransition();const { toast } = useToastAction();- const onSubmit = ({ ...props }: InsertStatusReportUpdate) => {+ const handleSubmit = ({ ...props }: InsertStatusReportUpdate) => {startTransition(async () => {try {if (defaultValues) {@@ -71,9 +71,7 @@ export function StatusReportUpdateForm({await api.statusReport.createStatusReportUpdate.mutate({ ...props });}toast("saved");- if (nextUrl) {- router.push(nextUrl);- }+ onSubmit?.();router.refresh();} catch {toast("error");@@ -86,7 +84,7 @@ export function StatusReportUpdateForm({<formonSubmit={async (e) => {e.preventDefault();- form.handleSubmit(onSubmit)(e);+ form.handleSubmit(handleSubmit)(e);}}className="grid w-full gap-6">diff --git a/apps/web/src/components/forms/status-report-update/form.tsx b/apps/web/src/components/forms/status-report-update/form.tsxnew file mode 100644index 000000000..b28bb29d6--- /dev/null+++ b/apps/web/src/components/forms/status-report-update/form.tsx@@ -0,0 +1,95 @@+"use client";++import * as React from "react";+import { useRouter } from "next/navigation";+import { zodResolver } from "@hookform/resolvers/zod";+import { useForm } from "react-hook-form";++import type { InsertStatusReportUpdate } from "@openstatus/db/src/schema";+import { insertStatusReportUpdateSchema } from "@openstatus/db/src/schema";+import { Button, Form } from "@openstatus/ui";++import {+ Tabs,+ TabsContent,+ TabsList,+ TabsTrigger,+} from "@/components/dashboard/tabs";+import { LoadingAnimation } from "@/components/loading-animation";+import { useToastAction } from "@/hooks/use-toast-action";+import { api } from "@/trpc/client";+import { General } from "./general";+import { SectionDate } from "./section-date";+import { SectionMessage } from "./section-message";++interface Props {+ defaultValues?: InsertStatusReportUpdate;+ statusReportId: number;+ onSubmit?: () => void;+}++export function StatusReportUpdateForm({+ defaultValues,+ statusReportId,+ onSubmit,+}: Props) {+ const form = useForm<InsertStatusReportUpdate>({+ resolver: zodResolver(insertStatusReportUpdateSchema),+ defaultValues: {+ id: defaultValues?.id || 0,+ status: defaultValues?.status || "investigating",+ message: defaultValues?.message,+ date: defaultValues?.date || new Date(),+ statusReportId,+ },+ });+ const router = useRouter();+ const [isPending, startTransition] = React.useTransition();+ const { toast } = useToastAction();++ const handleSubmit = ({ ...props }: InsertStatusReportUpdate) => {+ startTransition(async () => {+ try {+ if (defaultValues) {+ await api.statusReport.updateStatusReportUpdate.mutate({ ...props });+ } else {+ await api.statusReport.createStatusReportUpdate.mutate({ ...props });+ }+ toast("saved");+ onSubmit?.();+ router.refresh();+ } catch {+ toast("error");+ }+ });+ };++ return (+ <Form {...form}>+ <form+ onSubmit={async (e) => {+ e.preventDefault();+ form.handleSubmit(handleSubmit)(e);+ }}+ className="grid w-full gap-6"+ >+ <General form={form} />+ <Tabs defaultValue="message">+ <TabsList>+ <TabsTrigger value="message">Message</TabsTrigger>+ <TabsTrigger value="date">Date & Time</TabsTrigger>+ </TabsList>+ <TabsContent value="message">+ <SectionMessage form={form} />+ </TabsContent>+ <TabsContent value="date">+ <SectionDate form={form} />+ </TabsContent>+ </Tabs>+ <Button className="w-full sm:w-auto" size="lg">+ {!isPending ? "Confirm" : <LoadingAnimation />}+ </Button>+ </form>+ </Form>+ );+}diff --git a/apps/web/src/components/forms/status-report-update/general.tsx b/apps/web/src/components/forms/status-report-update/general.tsxnew file mode 100644index 000000000..5649c3479--- /dev/null+++ b/apps/web/src/components/forms/status-report-update/general.tsx@@ -0,0 +1,64 @@+"use client";++import type { UseFormReturn } from "react-hook-form";++import {+ statusReportStatus,+ statusReportStatusSchema,+} from "@openstatus/db/src/schema";+import type { InsertStatusReportUpdate } from "@openstatus/db/src/schema";+import {+ FormControl,+ FormField,+ FormItem,+ FormLabel,+ FormMessage,+ RadioGroup,+ RadioGroupItem,+} from "@openstatus/ui";++import { Icons } from "@/components/icons";+import { statusDict } from "@/data/incidents-dictionary";++interface Props {+ form: UseFormReturn<InsertStatusReportUpdate>;+}+export function General({ form }: Props) {+ return (+ <FormField+ control={form.control}+ name="status"+ render={({ field }) => (+ <FormItem className="space-y-1 sm:col-span-full">+ <FormLabel>Status</FormLabel>+ <FormMessage />+ <RadioGroup+ onValueChange={(value) =>+ field.onChange(statusReportStatusSchema.parse(value))+ } // value is a string+ defaultValue={field.value}+ className="grid grid-cols-2 gap-4 sm:grid-cols-4"+ >+ {statusReportStatus.map((status) => {+ const { value, label, icon } = statusDict[status];+ const Icon = Icons[icon];+ return (+ <FormItem key={value}>+ <FormLabel className="[&:has([data-state=checked])>div]:border-primary [&:has([data-state=checked])>div]:text-foreground">+ <FormControl>+ <RadioGroupItem value={value} className="sr-only" />+ </FormControl>+ <div className="border-border text-muted-foreground flex w-full items-center justify-center rounded-lg border px-3 py-2 text-center text-sm">+ <Icon className="mr-2 h-4 w-4 shrink-0" />+ <span className="truncate">{label}</span>+ </div>+ </FormLabel>+ </FormItem>+ );+ })}+ </RadioGroup>+ </FormItem>+ )}+ />+ );+}diff --git a/apps/web/src/components/forms/status-report-update/section-date.tsx b/apps/web/src/components/forms/status-report-update/section-date.tsxnew file mode 100644index 000000000..95d96c5f7--- /dev/null+++ b/apps/web/src/components/forms/status-report-update/section-date.tsx@@ -0,0 +1,41 @@+"use client";++import type { UseFormReturn } from "react-hook-form";++import type { InsertStatusReportUpdate } from "@openstatus/db/src/schema";+import {+ DateTimePicker,+ FormDescription,+ FormField,+ FormItem,+ FormLabel,+ FormMessage,+} from "@openstatus/ui";++interface Props {+ form: UseFormReturn<InsertStatusReportUpdate>;+}+export function SectionDate({ form }: Props) {+ return (+ <FormField+ control={form.control}+ name="date"+ render={({ field }) => (+ <FormItem>+ <FormLabel>Date</FormLabel>+ <DateTimePicker+ className="max-w-min rounded-md border"+ date={new Date(field.value)}+ setDate={(date) => {+ field.onChange(date);+ }}+ />+ <FormDescription>+ The date and time when the incident took place.+ </FormDescription>+ <FormMessage />+ </FormItem>+ )}+ />+ );+}diff --git a/apps/web/src/components/forms/status-report-update/section-message.tsx b/apps/web/src/components/forms/status-report-update/section-message.tsxnew file mode 100644index 000000000..3fb735313--- /dev/null+++ b/apps/web/src/components/forms/status-report-update/section-message.tsx@@ -0,0 +1,60 @@+"use client";++import type { UseFormReturn } from "react-hook-form";++import type { InsertStatusReportUpdate } from "@openstatus/db/src/schema";+import {+ FormControl,+ FormDescription,+ FormField,+ FormItem,+ FormLabel,+ FormMessage,+ Tabs,+ TabsContent,+ TabsList,+ TabsTrigger,+ Textarea,+} from "@openstatus/ui";++import { Preview } from "@/components/content/preview";++interface Props {+ form: UseFormReturn<InsertStatusReportUpdate>;+}+export function SectionMessage({ form }: Props) {+ return (+ <FormField+ control={form.control}+ name="message"+ render={({ field }) => (+ <FormItem className="sm:col-span-full">+ <FormLabel>Message</FormLabel>+ <Tabs defaultValue="write">+ <TabsList>+ <TabsTrigger value="write">Write</TabsTrigger>+ <TabsTrigger value="preview">Preview</TabsTrigger>+ </TabsList>+ <TabsContent value="write">+ <FormControl>+ <Textarea+ placeholder="We are encountering..."+ className="h-auto w-full resize-none"+ rows={9}+ {...field}+ />+ </FormControl>+ </TabsContent>+ <TabsContent value="preview">+ <Preview md={form.getValues("message")} />+ </TabsContent>+ </Tabs>+ <FormDescription>+ Tell your user what's happening. Supports markdown.+ </FormDescription>+ <FormMessage />+ </FormItem>+ )}+ />+ );+}diff --git a/apps/web/src/components/icons.tsx b/apps/web/src/components/icons.tsxindex f8c6a586b..d256bcc0f 100644--- a/apps/web/src/components/icons.tsx+++ b/apps/web/src/components/icons.tsx@@ -2,15 +2,18 @@ import {Activity,AlertTriangle,Bell,+ Book,Bot,Calendar,Check,Clock,Cog,Copy,+ CreditCard,Fingerprint,Globe2,Image,+ KeyRound,Laptop,LayoutDashboard,LineChart,@@ -20,6 +23,7 @@ import {MessageCircle,Minus,Moon,+ Newspaper,PanelTop,Pencil,Play,@@ -36,6 +40,7 @@ import {ToyBrick,Trash,TwitterIcon,+ Users,Webhook,Youtube,Zap,@@ -73,6 +78,9 @@ export const Icons = {image: Image,bell: Bell,zap: Zap,+ users: Users,+ key: KeyRound,+ "credit-card": CreditCard,"alert-triangle": AlertTriangle,megaphone: Megaphone,webhook: Webhook,@@ -85,6 +93,8 @@ export const Icons = {clock: Clock,"line-chart": LineChart,linkedin: Linkedin,+ book: Book,+ newspaper: Newspaper,youtube: Youtube,discord: ({ ...props }: LucideProps) => (<svg viewBox="0 0 640 512" {...props}>diff --git a/apps/web/src/components/layout/app-header.tsx b/apps/web/src/components/layout/app-header.tsxdeleted file mode 100644index a08ce4b30..000000000--- a/apps/web/src/components/layout/app-header.tsx+++ /dev/null@@ -1,52 +0,0 @@-"use client";--import Link from "next/link";-import { UserButton, useUser } from "@clerk/nextjs";-import { ArrowUpRight } from "lucide-react";--import { Button, Skeleton } from "@openstatus/ui";--import { Shell } from "../dashboard/shell";--/**- * TODO: work on a better breadcrumb navigation like Vercel- * [workspace/project/deploymenents/deployment]- * This will allow us to 'only' save, and not redirect the user to the other pages- * and therefore, can after saving the monitor/page go to the next tab!- * Probably, we will need to use useSegements() from vercel, but once done properly, it could be really nice to share- */--export function AppHeader() {- const { isLoaded, isSignedIn } = useUser();-- return (- <header className="border-border sticky top-3 z-50 w-full md:top-6">- <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={`/${isSignedIn ? "app" : ""}`}- className="font-cal text-muted-foreground hover:text-foreground text-lg"- >- OpenStatus- </Link>- <div className="flex items-center gap-4">- <ul className="flex gap-2">- <li className="w-full">- <Button variant="link" asChild>- <Link href="/docs" target="_blank">- Docs- <ArrowUpRight className="ml-1 h-4 w-4 flex-shrink-0" />- </Link>- </Button>- </li>- </ul>- <div className="relative">- <Skeleton className="h-8 w-8 rounded-full" />- <div className="absolute inset-0">- {isLoaded && isSignedIn && <UserButton />}- </div>- </div>- </div>- </Shell>- </header>- );-}diff --git a/apps/web/src/components/layout/app-link.tsx b/apps/web/src/components/layout/app-link.tsxindex 0948b04ed..f1eaa6ac3 100644--- a/apps/web/src/components/layout/app-link.tsx+++ b/apps/web/src/components/layout/app-link.tsx@@ -2,7 +2,6 @@import Link from "next/link";import type { LinkProps } from "next/link";-import { useSelectedLayoutSegment } from "next/navigation";import { cva } from "class-variance-authority";import { cn } from "@/lib/utils";@@ -15,8 +14,8 @@ const linkVariants = cva(variants: {variant: {default: "hover:bg-muted/50 hover:text-foreground border-transparent",- active: "bg-muted/50 border-border text-foreground",- disabled: "pointer-events-none opacity-60",+ active: "bg-muted/50 border-border text-foreground font-medium",+ disabled: "pointer-events-none opacity-60 border-transparent",},},defaultVariants: {@@ -27,9 +26,9 @@ const linkVariants = cva(interface AppLinkProps extends LinkProps {label: string;- segment?: string | null;icon?: ValidIcon;className?: string;+ active?: boolean;disabled?: boolean;}@@ -39,14 +38,12 @@ export function AppLink({icon,disabled,className,- segment,+ active,...props}: AppLinkProps) {- const selectedSegment = useSelectedLayoutSegment();const Icon = icon && Icons[icon];- const isActive = segment === selectedSegment;- const variant = disabled ? "disabled" : isActive ? "active" : "default";+ const variant = disabled ? "disabled" : active ? "active" : "default";return (<Linkdiff --git a/apps/web/src/components/layout/app-menu.tsx b/apps/web/src/components/layout/app-menu.tsxindex 0a1a95cd9..076e96655 100644--- a/apps/web/src/components/layout/app-menu.tsx+++ b/apps/web/src/components/layout/app-menu.tsx@@ -1,44 +1,51 @@"use client";import * as React from "react";-import { usePathname, useSearchParams } from "next/navigation";-import { Menu } from "lucide-react";+import {+ usePathname,+ useSearchParams,+ useSelectedLayoutSegment,+} from "next/navigation";+import { ChevronsUpDown } from "lucide-react";import {- Button,- Sheet,- SheetContent,- SheetHeader,- SheetTitle,- SheetTrigger,+ Collapsible,+ CollapsibleContent,+ CollapsibleTrigger,} from "@openstatus/ui";+import type { Page } from "@/config/pages";import { AppSidebar } from "./app-sidebar";-export function AppMenu() {+export function AppMenu({ page }: { page?: Page }) {const [open, setOpen] = React.useState(false);const pathname = usePathname();const searchParams = useSearchParams();+ const selectedSegment = useSelectedLayoutSegment();React.useEffect(() => {setOpen(false);}, [pathname, searchParams]); // remove searchParams if not needed+ if (!page) return null;++ const activeChild = page?.children?.find(+ ({ segment }) => segment === selectedSegment,+ );+return (- <Sheet open={open} onOpenChange={(value) => setOpen(value)}>- <SheetTrigger asChild>- <Button size="icon" variant="outline">- <Menu className="h-6 w-6" />- </Button>- </SheetTrigger>- <SheetContent side="top" className="flex flex-col">- <SheetHeader>- <SheetTitle className="ml-2 text-left">Menu</SheetTitle>- </SheetHeader>- <div className="flex-1">- <AppSidebar />- </div>- </SheetContent>- </Sheet>+ <Collapsible open={open} onOpenChange={(value) => setOpen(value)}>+ <CollapsibleTrigger className="flex w-full items-center justify-between">+ <span className="text-foreground font-medium">+ {activeChild?.title}+ </span>+ <span className="focus-visible:ring-ring hover:bg-accent hover:text-accent-foreground inline-flex h-9 w-9 items-center justify-center rounded-md text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-1 disabled:pointer-events-none disabled:opacity-50">+ <ChevronsUpDown className="h-4 w-4" />+ </span>+ </CollapsibleTrigger>+ <CollapsibleContent className="mt-2">+ <AppSidebar page={page} />+ </CollapsibleContent>+ </Collapsible>);}diff --git a/apps/web/src/components/layout/app-page-layout.tsx b/apps/web/src/components/layout/app-page-layout.tsxnew file mode 100644index 000000000..adf830ea2--- /dev/null+++ b/apps/web/src/components/layout/app-page-layout.tsx@@ -0,0 +1,24 @@+import { Shell } from "@/components/dashboard/shell";+import { cn } from "@/lib/utils";+import { HelpCallout } from "../dashboard/help-callout";++export default function AppPageLayout({+ children,+ className,+ withHelpCallout = false,+}: {+ children: React.ReactNode;+ className?: string;+ withHelpCallout?: boolean;+}) {+ return (+ <Shell className="relative flex flex-1 flex-col overflow-x-hidden">+ <div+ className={cn("flex h-full flex-1 flex-col gap-6 md:gap-8", className)}+ >+ {children}+ </div>+ {withHelpCallout ? <HelpCallout /> : null}+ </Shell>+ );+}diff --git a/apps/web/src/components/layout/app-page-with-sidebar-layout.tsx b/apps/web/src/components/layout/app-page-with-sidebar-layout.tsxnew file mode 100644index 000000000..34ac25dba--- /dev/null+++ b/apps/web/src/components/layout/app-page-with-sidebar-layout.tsx@@ -0,0 +1,39 @@+import { Shell } from "@/components/dashboard/shell";+import type { PageId } from "@/config/pages";+import { pagesConfig } from "@/config/pages";+import { cn } from "@/lib/utils";+import { AppMenu } from "./app-menu";+import { AppSidebar } from "./app-sidebar";++export default function AppPageWithSidebarLayout({+ id,+ className,+ children,+}: {+ id?: PageId;+ className?: string;+ children: React.ReactNode;+}) {+ const page = pagesConfig.find((page) => page.segment === id);++ return (+ <div className="flex w-full flex-1 flex-col gap-6 lg:flex-row lg:gap-8">+ <Shell className="block py-3 md:py-3 lg:hidden">+ <AppMenu page={page} />+ </Shell>+ <Shell className="hidden max-h-[calc(100vh-8rem)] max-w-min shrink-0 lg:sticky lg:top-28 lg:block">+ <AppSidebar page={page} />+ </Shell>+ <Shell className="relative flex-1 overflow-x-hidden">+ <div+ className={cn(+ "flex h-full flex-1 flex-col gap-6 md:gap-8",+ className,+ )}+ >+ {children}+ </div>+ </Shell>+ </div>+ );+}diff --git a/apps/web/src/components/layout/app-sidebar.tsx b/apps/web/src/components/layout/app-sidebar.tsxindex f6749f03b..eabe7c6a0 100644--- a/apps/web/src/components/layout/app-sidebar.tsx+++ b/apps/web/src/components/layout/app-sidebar.tsx@@ -1,50 +1,41 @@"use client";-import { useParams } from "next/navigation";+import { useSelectedLayoutSegment } from "next/navigation";-import { pagesConfig } from "@/config/pages";+import type { Page } from "@/config/pages";import { ProBanner } from "../billing/pro-banner";-import { SelectWorkspace } from "../workspace/select-workspace";import { AppLink } from "./app-link";-// import { socialsConfig } from "@/config/socials";-// import { SocialIconButton } from "./social-icon-button";+export function AppSidebar({ page }: { page?: Page }) {+ const selectedSegment = useSelectedLayoutSegment();-export function AppSidebar() {- const params = useParams();+ if (!page) return null;return (- <div className="flex h-full flex-col justify-between gap-6">- <ul className="grid gap-1">- {pagesConfig.map(({ title, href, icon, disabled }) => {- return (- <li key={title} className="w-full">- <AppLink- label={title}- href={`/app/${params?.workspaceSlug}${href}`}- disabled={disabled}- segment={href.replace("/", "")}- icon={icon}- />- </li>- );- })}- </ul>- <ul className="grid gap-2">- {/* <li className="w-full">Help & Support</li> */}- <li className="w-full">- <ProBanner />- </li>- {/* <li className="flex w-full gap-1">- {socialsConfig.map((props, i) => (- <SocialIconButton key={i} {...props} />- ))}- </li> */}- {/* maybe add the icons of the socials in here... */}- <li className="w-full">- <SelectWorkspace />- </li>- </ul>+ <div className="flex h-full flex-col justify-between">+ <div className="grid gap-2">+ <p className="text-foreground hidden px-3 text-lg font-medium lg:block">+ {page?.title}+ </p>+ <ul className="grid gap-2">+ {page?.children?.map(({ title, segment, icon, disabled }) => {+ return (+ <li key={title} className="w-full">+ <AppLink+ label={title}+ href={`./${segment}`}+ disabled={disabled}+ active={segment === selectedSegment}+ icon={icon}+ />+ </li>+ );+ })}+ </ul>+ </div>+ <div className="hidden lg:block">+ <ProBanner />+ </div></div>);}diff --git a/apps/web/src/components/layout/brand-name.tsx b/apps/web/src/components/layout/brand-name.tsxindex 1188cfb9f..652030e6f 100644--- a/apps/web/src/components/layout/brand-name.tsx+++ b/apps/web/src/components/layout/brand-name.tsx@@ -17,7 +17,7 @@ export function BrandName() {<ContextMenuTrigger><Linkhref="/"- className="font-cal text-muted-foreground hover:text-foreground"+ className="font-cal text-muted-foreground hover:text-foreground text-lg">OpenStatus</Link>diff --git a/apps/web/src/components/layout/breadcrumbs.tsx b/apps/web/src/components/layout/breadcrumbs.tsxdeleted file mode 100644index bb64497f9..000000000--- a/apps/web/src/components/layout/breadcrumbs.tsx+++ /dev/null@@ -1,27 +0,0 @@-"use client";--import { Fragment } from "react";-import { usePathname } from "next/navigation";-import { ChevronRight } from "lucide-react";--// TODO: create place to put into layout.tsx--export function Breadcrumbs() {- const pathname = usePathname();- const result = pathname.split("/").slice(3);-- return (- <ul className="flex items-center">- {result.map((path, i) => {- return (- <Fragment key={i}>- <li>{path}</li>- {i !== result.length - 1 ? (- <ChevronRight className="text-muted-foreground mx-2 h-3 w-3" />- ) : null}- </Fragment>- );- })}- </ul>- );-}diff --git a/apps/web/src/components/layout/header/app-header.tsx b/apps/web/src/components/layout/header/app-header.tsxnew file mode 100644index 000000000..b87eca25a--- /dev/null+++ b/apps/web/src/components/layout/header/app-header.tsx@@ -0,0 +1,49 @@+"use client";++import Link from "next/link";+import { UserButton, useUser } from "@clerk/nextjs";+import { ArrowUpRight } from "lucide-react";++import { Button, Skeleton } from "@openstatus/ui";++import { Shell } from "@/components/dashboard/shell";+import { ChangelogViewedButton } from "@/components/workspace/changelog-viewed-button";+import { AppTabs } from "./app-tabs";+import { Breadcrumbs } from "./breadcrumbs";++export function AppHeader() {+ const { isLoaded, isSignedIn } = useUser();+ return (+ // TODO: discuss amount of top-3 and top-6+ <header className="border-border sticky top-2 z-50 w-full">+ <Shell className="bg-background/70 px-3 py-3 backdrop-blur-lg md:px-6 md:py-3">+ <div className="flex w-full items-center justify-between">+ <Breadcrumbs />+ {/* */}+ <div className="flex items-center gap-1">+ <ul className="hidden gap-1 sm:flex">+ <li className="w-full">+ <ChangelogViewedButton />+ </li>+ <li className="w-full">+ <Button variant="link" asChild>+ <Link href="/docs" target="_blank">+ Docs+ <ArrowUpRight className="ml-1 h-4 w-4 flex-shrink-0" />+ </Link>+ </Button>+ </li>+ </ul>+ <div className="relative">+ <Skeleton className="h-8 w-8 rounded-full" />+ <div className="absolute inset-0">+ {isLoaded && isSignedIn && <UserButton />}+ </div>+ </div>+ </div>+ </div>+ <AppTabs />+ </Shell>+ </header>+ );+}diff --git a/apps/web/src/components/layout/header/app-tabs.tsx b/apps/web/src/components/layout/header/app-tabs.tsxnew file mode 100644index 000000000..68b73aa5d--- /dev/null+++ b/apps/web/src/components/layout/header/app-tabs.tsx@@ -0,0 +1,30 @@+import { useParams, useSelectedLayoutSegment } from "next/navigation";++import { TabsContainer, TabsLink } from "@/components/dashboard/tabs-link";+import { pagesConfig } from "@/config/pages";++export function AppTabs() {+ const params = useParams();+ const selectedSegment = useSelectedLayoutSegment();++ if (!params?.workspaceSlug) return null;++ return (+ <div className="-mb-3">+ <TabsContainer hideSeparator>+ {pagesConfig.map(({ title, segment, href }) => {+ const active = segment === selectedSegment;+ return (+ <TabsLink+ key={title}+ active={active}+ href={`/app/${params?.workspaceSlug}${href}`}+ >+ {title}+ </TabsLink>+ );+ })}+ </TabsContainer>+ </div>+ );+}diff --git a/apps/web/src/components/layout/header/breadcrumbs.tsx b/apps/web/src/components/layout/header/breadcrumbs.tsxnew file mode 100644index 000000000..ea49cbc0e--- /dev/null+++ b/apps/web/src/components/layout/header/breadcrumbs.tsx@@ -0,0 +1,107 @@+"use client";++import { Fragment, useEffect, useState } from "react";+import Image from "next/image";+import Link from "next/link";+import {+ useParams,+ useSelectedLayoutSegment,+ useSelectedLayoutSegments,+} from "next/navigation";+import { Slash } from "lucide-react";++import { SelectWorkspace } from "@/components/workspace/select-workspace";+import { pagesConfig } from "@/config/pages";+import { notEmpty } from "@/lib/utils";+import { api } from "@/trpc/client";++export function Breadcrumbs() {+ const params = useParams();+ // const selectedSegment = useSelectedLayoutSegment();+ // const selectedSegments = useSelectedLayoutSegments();+ // const label = useIdLabel();++ // // remove route groups like '(overview)' from the segments+ // const segmentsWithoutRouteGroup = selectedSegments.filter(+ // (segment) => !segment.startsWith("("),+ // );++ // const isRoot = segmentsWithoutRouteGroup.length <= 1;++ // const page = pagesConfig.find(({ segment }) => segment === selectedSegment);+ const breadcrumbs = [+ // !isRoot ? page?.title : null,+ // label,+ ].filter(notEmpty);++ const isWorkspaceSlug = params.workspaceSlug;++ return (+ <div className="flex items-center">+ <Link href="/app" className="shrink-0">+ <Image+ src="/icon.png"+ alt="OpenStatus"+ height={30}+ width={30}+ className="border-border rounded-full border"+ />+ </Link>+ <Slash className="text-muted-foreground ml-2.5 mr-0.5 h-4 w-4 -rotate-12" />+ {params.workspaceSlug ? (+ <div className="w-40">+ <SelectWorkspace />+ </div>+ ) : null}+ {breadcrumbs.map((breadcrumb) => (+ <Fragment key={breadcrumb}>+ <Slash className="text-muted-foreground ml-0.5 mr-2.5 h-4 w-4 -rotate-12" />+ <p className="text-primary rounded-md text-sm font-medium">+ {breadcrumb}+ </p>+ </Fragment>+ ))}+ </div>+ );+}++// This is a custom hook that returns the label of the current id+function useIdLabel() {+ const params = useParams();+ const selectedSegment = useSelectedLayoutSegment();+ const selectedSegments = useSelectedLayoutSegments();+ const [label, setLabel] = useState<string>();++ // remove route groups like '(overview)' from the segments+ const segmentsWithoutRouteGroup = selectedSegments.filter(+ (segment) => !segment.startsWith("("),+ );++ const isRoot = segmentsWithoutRouteGroup.length <= 1;++ useEffect(() => {+ async function getInfos() {+ const { id } = params;+ if (!isRoot && id) {+ if (selectedSegment === "monitors") {+ const monitor = await api.monitor.getMonitorById.query({+ id: Number(id),+ });+ if (monitor) setLabel(monitor.name);+ }+ if (selectedSegment === "status-pages") {+ const statusPage = await api.page.getPageById.query({+ id: Number(id),+ });+ if (statusPage) setLabel(statusPage.title);+ }+ }+ if (isRoot && label) {+ setLabel(undefined);+ }+ }+ getInfos();+ }, [params, selectedSegment, selectedSegments]);++ return label;+}diff --git a/apps/web/src/components/layout/marketing-header.tsx b/apps/web/src/components/layout/marketing-header.tsxindex 794b81d79..df53a3a52 100644--- a/apps/web/src/components/layout/marketing-header.tsx+++ b/apps/web/src/components/layout/marketing-header.tsx@@ -1,10 +1,12 @@"use client";import Link from "next/link";+import { usePathname } from "next/navigation";import { useUser } from "@clerk/nextjs";import { Button } from "@openstatus/ui";+import { marketingPagesConfig } from "@/config/pages";import { cn } from "@/lib/utils";import { BrandName } from "./brand-name";import { MarketingMenu } from "./marketing-menu";@@ -15,6 +17,7 @@ interface Props {export function MarketingHeader({ className }: Props) {const { isSignedIn } = useUser();+ const pathname = usePathname();return (<header@@ -24,23 +27,23 @@ export function MarketingHeader({ className }: Props) {<BrandName /></div><div className="border-border mx-auto hidden items-center justify-center rounded-full border px-2 backdrop-blur-[2px] md:col-span-3 md:flex md:gap-1">- <Button variant="link" asChild>- <Link href="/blog">Blog</Link>- </Button>- <Button variant="link" asChild>- <Link href="/play">Playground</Link>- </Button>- <Button variant="link" asChild>- <Link href="/changelog">Changelog</Link>- </Button>- <Button variant="link" asChild>- <Link href="/pricing">Pricing</Link>- </Button>- <Button variant="link" asChild>- <Link href="https://docs.openstatus.dev" target="_blank">- Docs- </Link>- </Button>+ {marketingPagesConfig.map(({ href, title, segment }) => {+ const isExternal = href.startsWith("http");+ const externalProps = isExternal ? { target: "_blank" } : {};+ const isActive = pathname.startsWith(href);+ return (+ <Button+ key={segment}+ variant="link"+ className={isActive ? "font-semibold" : undefined}+ asChild+ >+ <Link href={href} {...externalProps}>+ {title}+ </Link>+ </Button>+ );+ })}</div><div className="flex items-center justify-end gap-3 md:col-span-1"><div className="block md:hidden">diff --git a/apps/web/src/components/layout/marketing-menu.tsx b/apps/web/src/components/layout/marketing-menu.tsxindex 5ba02d004..60320804c 100644--- a/apps/web/src/components/layout/marketing-menu.tsx+++ b/apps/web/src/components/layout/marketing-menu.tsx@@ -13,18 +13,11 @@ import {SheetTrigger,} from "@openstatus/ui";+import { marketingPagesConfig } from "@/config/pages";import { socialsConfig } from "@/config/socials";import { AppLink } from "./app-link";import { SocialIconButton } from "./social-icon-button";-const pages = [- { href: "/blog", label: "Blog", segment: "blog" },- { href: "/play", label: "Playground", segment: "play" },- { href: "/changelog", label: "Changelog", segment: "changelog" },- { href: "/pricing", label: "Pricing", segment: "pricing" },- { href: "https://docs.openstatus.dev", label: "Documentation" },-];-export function MarketingMenu() {const [open, setOpen] = React.useState(false);const pathname = usePathname();@@ -52,22 +45,23 @@ export function MarketingMenu() {</SheetHeader><div className="flex flex-1 flex-col justify-between gap-4"><ul className="grid gap-1">- {pages.map(({ href, label, segment }) => {+ {marketingPagesConfig.map(({ href, title, segment }) => {const isExternal = href.startsWith("http");const externalProps = isExternal ? { target: "_blank" } : {};+ const isActive = pathname.startsWith(href);return (<li key={href} className="w-full"><AppLinkhref={href}- label={label}- segment={segment}+ label={title}+ active={isActive}{...externalProps}/></li>);})}</ul>- <ul className="flex gap-1">+ <ul className="flex gap-2">{socialsConfig.map((props, i) => (<li key={i}><SocialIconButton {...props} />diff --git a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/_components/delete-status-update.tsx b/apps/web/src/components/status-update/delete-status-update.tsxsimilarity index 94%rename from apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/_components/delete-status-update.tsxrename to apps/web/src/components/status-update/delete-status-update.tsxindex 69861ed02..29ffa4ebb 100644--- a/apps/web/src/app/app/[workspaceSlug]/(dashboard)/status-reports/_components/delete-status-update.tsx+++ b/apps/web/src/components/status-update/delete-status-update.tsx@@ -1,5 +1,3 @@-// TODO: move to components folder as not being used in any page.tsx or layout.tsx-"use client";import * as React from "react";@@ -48,7 +46,7 @@ export function DeleteStatusReportUpdateButtonIcon({ id }: { id: number }) {<Buttonsize="icon"variant="outline"- className="border-destructive/50 text-destructive/80 hover:text-destructive hover:bg-destructive/10 h-7 w-7 p-0"+ className="border-destructive/50 text-destructive/80 hover:text-destructive hover:bg-destructive/10"><Icons.trash className="h-4 w-4" /></Button>diff --git a/apps/web/src/components/status-update/edit-status-update.tsx b/apps/web/src/components/status-update/edit-status-update.tsxnew file mode 100644index 000000000..e5e2582a2--- /dev/null+++ b/apps/web/src/components/status-update/edit-status-update.tsx@@ -0,0 +1,49 @@+"use client";++import { useState } from "react";++import type { InsertStatusReportUpdate } from "@openstatus/db/src/schema";+import {+ Button,+ Dialog,+ DialogContent,+ DialogDescription,+ DialogHeader,+ DialogTitle,+ DialogTrigger,+} from "@openstatus/ui";++import { StatusReportUpdateForm } from "../forms/status-report-update/form";+import { Icons } from "../icons";++export function EditStatusReportUpdateIconButton({+ statusReportId,+ statusReportUpdate,+}: {+ statusReportId: number;+ statusReportUpdate?: InsertStatusReportUpdate;+}) {+ const [open, setOpen] = useState(false);+ return (+ <Dialog open={open} onOpenChange={setOpen}>+ <DialogTrigger asChild>+ <Button size="icon" variant="outline">+ <Icons.pencil className="h-4 w-4" />+ </Button>+ </DialogTrigger>+ <DialogContent className="max-h-screen overflow-y-scroll sm:max-w-[650px]">+ <DialogHeader>+ <DialogTitle>Edit Status Report</DialogTitle>+ <DialogDescription>+ Update your status report with new information.+ </DialogDescription>+ </DialogHeader>+ <StatusReportUpdateForm+ statusReportId={statusReportId}+ defaultValues={statusReportUpdate}+ onSubmit={() => setOpen(false)}+ />+ </DialogContent>+ </Dialog>+ );+}diff --git a/apps/web/src/components/status-update/events.tsx b/apps/web/src/components/status-update/events.tsxindex 9be201e22..ac838f05e 100644--- a/apps/web/src/components/status-update/events.tsx+++ b/apps/web/src/components/status-update/events.tsx@@ -1,17 +1,19 @@"use client";import * as React from "react";+import Link from "next/link";import { useRouter } from "next/navigation";import { format } from "date-fns";import type { StatusReportUpdate } from "@openstatus/db/src/schema";import { Button } from "@openstatus/ui";-import { DeleteStatusReportUpdateButtonIcon } from "@/app/app/[workspaceSlug]/(dashboard)/status-reports/_components/delete-status-update";import { Icons } from "@/components/icons";import { statusDict } from "@/data/incidents-dictionary";import { useProcessor } from "@/hooks/use-preprocessor";import { cn } from "@/lib/utils";+import { DeleteStatusReportUpdateButtonIcon } from "./delete-status-update";+import { EditStatusReportUpdateIconButton } from "./edit-status-update";export function Events({statusReportUpdates,@@ -63,16 +65,10 @@ export function Events({<div className="mt-1 grid flex-1">{editable ? (<div className="absolute right-2 top-2 hidden gap-2 group-hover:flex group-active:flex">- <Button- size="icon"- variant="outline"- className="h-7 w-7 p-0"- onClick={() => {- router.push(`./update/edit?statusUpdate=${update.id}`);- }}- >- <Icons.pencil className="h-4 w-4" />- </Button>+ <EditStatusReportUpdateIconButton+ statusReportId={update.statusReportId}+ statusReportUpdate={update}+ /><DeleteStatusReportUpdateButtonIcon id={update.id} /></div>) : undefined}diff --git a/apps/web/src/components/workspace/changelog-viewed-button.tsx b/apps/web/src/components/workspace/changelog-viewed-button.tsxnew file mode 100644index 000000000..f2d3227a1--- /dev/null+++ b/apps/web/src/components/workspace/changelog-viewed-button.tsx@@ -0,0 +1,57 @@+import { useEffect, useState } from "react";+import Link from "next/link";+import { allChangelogs } from "contentlayer/generated";++import { Button } from "@openstatus/ui";++const lastChangelog = allChangelogs+ .sort(+ (a, b) =>+ new Date(a.publishedAt).getTime() - new Date(b.publishedAt).getTime(),+ )+ .pop();++export function ChangelogViewedButton() {+ const [show, setShow] = useState(false);++ function onClick() {+ if (document) {+ const date = new Date().toISOString();+ // store the last viewed changelog date in a cookie+ document.cookie = `last-viewed-changelog=${date}; path=/`;+ }+ setShow(false);+ }++ useEffect(() => {+ if (document) {+ const cookie = document.cookie+ .split("; ")+ .find((row) => row.startsWith("last-viewed-changelog"));+ if (!cookie) {+ setShow(true);+ return;+ }+ const lastViewed = new Date(cookie.split("=")[1]);+ if (lastChangelog && lastViewed < new Date(lastChangelog.publishedAt)) {+ setShow(true);+ }+ }+ }, []);++ return (+ <Button variant="link" asChild>+ <Link+ href="/changelog"+ target="_blank"+ onClick={onClick}+ className="relative"+ >+ Changelog+ {show ? (+ <span className="absolute right-1 top-1 h-2 w-2 rounded-full bg-green-500" />+ ) : null}+ </Link>+ </Button>+ );+}diff --git a/apps/web/src/components/workspace/select-workspace.tsx b/apps/web/src/components/workspace/select-workspace.tsxindex a0647b29e..4441499e4 100644--- a/apps/web/src/components/workspace/select-workspace.tsx+++ b/apps/web/src/components/workspace/select-workspace.tsx@@ -43,10 +43,14 @@ export function SelectWorkspace() {<DropdownMenu><DropdownMenuTrigger asChild><Button- variant="outline"+ variant="ghost"className="flex w-full items-center justify-between">- {active ? <span>{active}</span> : <Skeleton className="h-5 w-full" />}+ {active ? (+ <span className="truncate">{active}</span>+ ) : (+ <Skeleton className="h-5 w-full" />+ )}<ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" /></Button></DropdownMenuTrigger>@@ -65,7 +69,7 @@ export function SelectWorkspace() {}}className="justify-between">- {workspace.slug}+ <span className="truncate">{workspace.slug}</span>{active === workspace.slug ? (<Check className="ml-2 h-4 w-4" />) : null}diff --git a/apps/web/src/config/pages.ts b/apps/web/src/config/pages.tsindex c7f009cab..c012134f1 100644--- a/apps/web/src/config/pages.ts+++ b/apps/web/src/config/pages.ts@@ -1,56 +1,232 @@import type { ValidIcon } from "@/components/icons";-type Page = {+export type Page = {title: string;description: string;href: string;icon: ValidIcon;disabled?: boolean;+ segment: string;+ children?: Page[];};-// TODO: add to <Header id="dashboard" /> to easily access title and description - ideally allow both-export const pagesConfig: Page[] = [+export const settingsPagesConfig: Page[] = [+ {+ title: "General",+ description: "General settings for the workspace.",+ href: "/settings/general",+ icon: "cog",+ segment: "general",+ },+ {+ title: "Team",+ description: "Team settings for the workspace.",+ href: "/settings/team",+ icon: "users",+ segment: "team",+ },+ {+ title: "API Token",+ description: "API token settings for the workspace.",+ href: "/settings/api-token",+ icon: "key",+ segment: "api-token",+ },+ {+ title: "Billing",+ description: "Billing settings for the workspace.",+ href: "/settings/billing",+ icon: "credit-card",+ segment: "billing",+ },+ {+ title: "Appearance",+ description: "Appearance settings for the workspace.",+ href: "/settings/appearance",+ icon: "sun",+ segment: "appearance",+ },+];++export const monitorPagesConfig: Page[] = [+ {+ title: "Overview",+ description: "Dashboard with all the metrics and charts.",+ href: "/monitors/[id]/overview",+ icon: "line-chart",+ segment: "overview",+ },+ {+ title: "Response logs",+ description: "Data table with all response details.",+ href: "/monitors/[id]/data",+ icon: "table",+ segment: "data",+ },+ {+ title: "Settings",+ description: "Edit section for the monitor.",+ href: "/monitors/[id]/edit",+ icon: "cog",+ segment: "edit",+ },+];++export const statusPagesPagesConfig: Page[] = [+ {+ title: "Settings",+ description: "Edit section for the status page.",+ href: "/status-pages/[id]/edit",+ icon: "cog",+ segment: "edit",+ },+ {+ title: "Domain",+ description: "Where you can see the domain settings.",+ href: "/status-pages/[id]/domain",+ icon: "globe",+ segment: "domain",+ },+ {+ title: "Subscribers",+ description: "Where you can see all the subscribers.",+ href: "/status-pages/[id]/subscribers",+ icon: "users",+ segment: "subscribers",+ },+];++export const statusReportsPagesConfig: Page[] = [+ {+ title: "Overview",+ description: "Overview of the status report.",+ href: "/status-reports/[id]/overview",+ icon: "megaphone",+ segment: "overview",+ },+ {+ title: "Settings",+ description: "Edit section for the status report.",+ href: "/status-reports/[id]/edit",+ icon: "cog",+ segment: "edit",+ },+];++export const notificationsPagesConfig: Page[] = [+ {+ title: "Settings",+ description: "Edit section for the notifications.",+ href: "/notifications/[id]/edit",+ icon: "cog",+ segment: "edit",+ },+];++export type PageId = (typeof pagesConfig)[number]["segment"];++export const pagesConfig = [{title: "Monitors",description: "Check all the responses in one place.",href: "/monitors",icon: "activity",+ segment: "monitors",+ children: monitorPagesConfig,},{title: "Incidents",description: "All your incidents.",href: "/incidents",icon: "siren",+ segment: "incidents",},{title: "Status Pages",description: "Where you can see all the pages.",href: "/status-pages",icon: "panel-top",+ segment: "status-pages",+ children: statusPagesPagesConfig,},{title: "Status Reports",description: "War room where you handle the incidents.",href: "/status-reports",icon: "megaphone",+ segment: "status-reports",+ children: statusReportsPagesConfig,},{title: "Notifications",description: "Where you can see all the notifications.",href: "/notifications",icon: "bell",+ segment: "notifications",+ children: notificationsPagesConfig,},{title: "Settings",description: "Your workspace settings",- href: "/settings",+ href: "/settings/general",icon: "cog",+ segment: "settings",+ children: settingsPagesConfig,},- // {- // title: "Integrations",- // description: "Where you can see all the integrations.",- // href: "/integrations",- // icon: "plug",- // },- // ...-];+] as const satisfies readonly Page[];++export const marketingPagesConfig = [+ {+ href: "/blog",+ title: "Blog",+ description: "All the latest articles and news from OpenStatus.",+ segment: "blog",+ icon: "book",+ },+ {+ href: "/play",+ title: "Playground",+ description: "All the latest tools build by OpenStatus.",+ segment: "play",+ icon: "toy-brick",+ },+ {+ href: "/changelog",+ title: "Changelog",+ description: "All the latest features, fixes and work to OpenStatus.",+ segment: "changelog",+ icon: "newspaper",+ },+ {+ href: "/pricing",+ title: "Pricing",+ description: "The pricing for OpenStatus.",+ segment: "pricing",+ icon: "credit-card",+ },+ {+ href: "https://docs.openstatus.dev",+ description: "The documentation for OpenStatus.",+ title: "Docs",+ segment: "docs",+ icon: "book",+ },+] as const satisfies readonly Page[];++export function getPageBySegment(+ segment: string | string[],+ currentPage: readonly Page[] = pagesConfig,+): Page | undefined {+ if (typeof segment === "string") {+ const page = currentPage.find((page) => page.segment === segment);+ return page;+ } else if (Array.isArray(segment) && segment.length > 0) {+ const [firstSegment, ...restSegments] = segment;+ const childPage = currentPage.find((page) => page.segment === firstSegment);+ if (childPage && childPage.children) {+ return getPageBySegment(restSegments, childPage.children);+ }+ return childPage;+ }+ return undefined;+}diff --git a/packages/ui/package.json b/packages/ui/package.jsonindex edd36289a..ca02aed48 100644--- a/packages/ui/package.json+++ b/packages/ui/package.json@@ -23,6 +23,7 @@"@radix-ui/react-alert-dialog": "1.0.5","@radix-ui/react-avatar": "1.0.4","@radix-ui/react-checkbox": "1.0.4",+ "@radix-ui/react-collapsible": "^1.0.3","@radix-ui/react-context-menu": "2.1.5","@radix-ui/react-dialog": "1.0.4","@radix-ui/react-dropdown-menu": "2.0.6",diff --git a/packages/ui/src/components/collabsible.tsx b/packages/ui/src/components/collabsible.tsxnew file mode 100644index 000000000..cb003d175--- /dev/null+++ b/packages/ui/src/components/collabsible.tsx@@ -0,0 +1,11 @@+"use client";++import * as CollapsiblePrimitive from "@radix-ui/react-collapsible";++const Collapsible = CollapsiblePrimitive.Root;++const CollapsibleTrigger = CollapsiblePrimitive.CollapsibleTrigger;++const CollapsibleContent = CollapsiblePrimitive.CollapsibleContent;++export { Collapsible, CollapsibleTrigger, CollapsibleContent };diff --git a/packages/ui/src/components/date-time-picker-popover.tsx b/packages/ui/src/components/date-time-picker-popover.tsxnew file mode 100644index 000000000..3047eace6--- /dev/null+++ b/packages/ui/src/components/date-time-picker-popover.tsx@@ -0,0 +1,92 @@+// CREDITS: https://gist.github.com/fernandops26/da681c4b12e52191803b4fcb040cdebb+"use client";++import * as React from "react";+import { Calendar as CalendarIcon } from "lucide-react";+import { DateTime } from "luxon";+import type { SelectSingleEventHandler } from "react-day-picker";++import { cn } from "../lib/utils";+import { Button } from "./button";+import { Calendar } from "./calendar";+import { Input } from "./input";+import { Label } from "./label";+import { Popover, PopoverContent, PopoverTrigger } from "./popover";++interface DateTimePickerProps {+ date: Date;+ setDate: (date: Date) => void;+ className?: string;+}++export function DateTimePickerPopover({+ date,+ setDate,+ className,+}: DateTimePickerProps) {+ const [selectedDateTime, setSelectedDateTime] = React.useState<DateTime>(+ DateTime.fromJSDate(date),+ );++ const handleSelect: SelectSingleEventHandler = (day, selected) => {+ const selectedDay = DateTime.fromJSDate(selected);+ const modifiedDay = selectedDay.set({+ hour: selectedDateTime.hour,+ minute: selectedDateTime.minute,+ });++ setSelectedDateTime(modifiedDay);+ setDate(modifiedDay.toJSDate());+ };++ const handleTimeChange: React.ChangeEventHandler<HTMLInputElement> = (e) => {+ const { value } = e.target;+ const hours = Number.parseInt(value.split(":")[0] || "00", 10);+ const minutes = Number.parseInt(value.split(":")[1] || "00", 10);+ const modifiedDay = selectedDateTime.set({ hour: hours, minute: minutes });++ setSelectedDateTime(modifiedDay);+ setDate(modifiedDay.toJSDate());+ };++ return (+ <Popover>+ <PopoverTrigger asChild className="z-10">+ <Button+ variant={"outline"}+ className={cn(+ "w-[280px] justify-start text-left font-normal",+ !date && "text-muted-foreground",+ className,+ )}+ suppressHydrationWarning // because timestamp is not same, server and client+ >+ <CalendarIcon className="mr-2 h-4 w-4" />+ {date ? (+ selectedDateTime.toFormat("DDD HH:mm")+ ) : (+ <span>Pick a date</span>+ )}+ </Button>+ </PopoverTrigger>+ <PopoverContent className="w-auto p-0">+ <Calendar+ mode="single"+ selected={selectedDateTime.toJSDate()}+ onSelect={handleSelect}+ initialFocus+ />+ <div className="px-4 pb-4 pt-0">+ <Label>Time</Label>+ {/* TODO: style it properly! */}+ <Input+ type="time"+ onChange={handleTimeChange}+ value={selectedDateTime.toFormat("HH:mm")}+ />+ </div>+ {!selectedDateTime && <p>Please pick a day.</p>}+ </PopoverContent>+ </Popover>+ );+}diff --git a/packages/ui/src/components/date-time-picker.tsx b/packages/ui/src/components/date-time-picker.tsxindex 80d71b3b1..3ef8edbed 100644--- a/packages/ui/src/components/date-time-picker.tsx+++ b/packages/ui/src/components/date-time-picker.tsx@@ -2,16 +2,12 @@"use client";import * as React from "react";-import { Calendar as CalendarIcon } from "lucide-react";import { DateTime } from "luxon";import type { SelectSingleEventHandler } from "react-day-picker";-import { Button } from "../components/button";import { Calendar } from "../components/calendar";import { Input } from "../components/input";import { Label } from "../components/label";-import { Popover, PopoverContent, PopoverTrigger } from "../components/popover";-import { cn } from "../lib/utils";interface DateTimePickerProps {date: Date;@@ -50,43 +46,23 @@ export function DateTimePicker({};return (- <Popover>- <PopoverTrigger asChild className="z-10">- <Button- variant={"outline"}- className={cn(- "w-[280px] justify-start text-left font-normal",- !date && "text-muted-foreground",- className,- )}- suppressHydrationWarning // because timestamp is not same, server and client- >- <CalendarIcon className="mr-2 h-4 w-4" />- {date ? (- selectedDateTime.toFormat("DDD HH:mm")- ) : (- <span>Pick a date</span>- )}- </Button>- </PopoverTrigger>- <PopoverContent className="w-auto p-0">- <Calendar- mode="single"- selected={selectedDateTime.toJSDate()}- onSelect={handleSelect}- initialFocus+ <div className={className}>+ <Calendar+ mode="single"+ selected={selectedDateTime.toJSDate()}+ onSelect={handleSelect}+ initialFocus+ />+ <div className="px-4 pb-4 pt-0">+ <Label>Time</Label>+ {/* TODO: style it properly! */}+ <Input+ type="time"+ onChange={handleTimeChange}+ value={selectedDateTime.toFormat("HH:mm")}/>- <div className="px-4 pb-4 pt-0">- <Label>Time</Label>- {/* TODO: style it properly! */}- <Input- type="time"- onChange={handleTimeChange}- value={selectedDateTime.toFormat("HH:mm")}- />- </div>- {!selectedDateTime && <p>Please pick a day.</p>}- </PopoverContent>- </Popover>+ </div>+ {!selectedDateTime && <p>Please pick a day.</p>}+ </div>);}diff --git a/packages/ui/src/index.tsx b/packages/ui/src/index.tsxindex 1394ff6af..d1f3e0add 100644--- a/packages/ui/src/index.tsx+++ b/packages/ui/src/index.tsx@@ -33,7 +33,9 @@ export * from "./components/use-toast";export * from "./components/tooltip";export * from "./components/tabs";export * from "./components/date-time-picker";+export * from "./components/date-time-picker-popover";export * from "./components/sheet";export * from "./components/use-toast";export * from "./components/multi-select";export * from "./components/toggle";+export * from "./components/collabsible";diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex f9245c1d4..08d5859f4 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -16,7 +16,7 @@ importers:version: link:packages/config/eslint'@turbo/gen':specifier: 1.10.12- version: 1.10.12(@types/[email protected])([email protected])+ version: 1.10.12(@types/[email protected])([email protected])eslint:specifier: 8.50.0version: 8.50.0@@ -214,7 +214,7 @@ importers:version: 0.6.3contentlayer:specifier: 0.3.4- version: 0.3.4([email protected])+ version: 0.3.4([email protected])date-fns:specifier: 2.30.0version: 2.30.0@@ -238,7 +238,7 @@ importers:version: 14.1.0(@babel/[email protected])(@opentelemetry/[email protected])([email protected])([email protected])next-contentlayer:specifier: 0.3.4- version: 0.3.4([email protected])([email protected])([email protected])([email protected])([email protected])+ version: 0.3.4([email protected])([email protected])([email protected])([email protected])([email protected])next-plausible:specifier: 3.12.0@@ -347,7 +347,7 @@ importers:dependencies:'@jitsu/js':specifier: 1.3.0- version: 1.3.0(@types/[email protected])+ version: 1.3.0(@types/[email protected])'@t3-oss/env-core':specifier: 0.7.0version: 0.7.0([email protected])([email protected])@@ -755,6 +755,9 @@ importers:'@radix-ui/react-checkbox':specifier: 1.0.4version: 1.0.4(@types/[email protected])(@types/[email protected])([email protected])([email protected])+ '@radix-ui/react-collapsible':+ specifier: ^1.0.3+ version: 1.0.3(@types/[email protected])(@types/[email protected])([email protected])([email protected])'@radix-ui/react-context-menu':specifier: 2.1.5version: 2.1.5(@types/[email protected])(@types/[email protected])([email protected])([email protected])@@ -922,12 +925,12 @@ packages:'@analytics/global-storage-utils': 0.1.7dev: false- /@analytics/[email protected](@types/[email protected]):+ /@analytics/[email protected](@types/[email protected]):resolution: {integrity: sha512-etmIPCoxWLoUZ/o1o2zvIk4cdVHa8I1xUQtTuLA+YXQ4SsFbm75ZoMXJBqWrNSENpqCJgoL6hizl5uTbkNN+1Q==}dependencies:'@analytics/global-storage-utils': 0.1.7'@analytics/type-utils': 0.6.2- analytics-utils: 1.0.12(@types/[email protected])+ analytics-utils: 1.0.12(@types/[email protected])transitivePeerDependencies:- '@types/dlv'dev: false@@ -1259,10 +1262,10 @@ packages:commander: 9.4.1dev: false- /@contentlayer/[email protected]([email protected]):+ /@contentlayer/[email protected]([email protected]):resolution: {integrity: sha512-vNDwgLuhYNu+m70NZ3XK9kexKNguuxPXg7Yvzj3B34cEilQjjzSrcTY/i+AIQm9V7uT5GGshx9ukzPf+SmoszQ==}dependencies:- '@contentlayer/core': 0.3.4([email protected])+ '@contentlayer/core': 0.3.4([email protected])'@contentlayer/utils': 0.3.4clipanion: 3.2.1([email protected])typanion: 3.14.0@@ -1273,10 +1276,10 @@ packages:- supports-colordev: false- /@contentlayer/[email protected]([email protected]):+ /@contentlayer/[email protected]([email protected]):resolution: {integrity: sha512-QSlLyc3y4PtdC5lFw0L4wTZUH8BQnv2nk37hNCsPAqGf+dRO7TLAzdc+2/mVIRgK+vSH+pSOzjLsQpFxxXRTZA==}dependencies:- '@contentlayer/core': 0.3.4([email protected])+ '@contentlayer/core': 0.3.4([email protected])transitivePeerDependencies:- '@effect-ts/otel-node'- esbuild@@ -1284,7 +1287,7 @@ packages:- supports-colordev: false- /@contentlayer/[email protected]([email protected]):+ /@contentlayer/[email protected]([email protected]):resolution: {integrity: sha512-o68oBLwfYZ+2vtgfk1lgHxOl3LoxvRNiUfeQ8IWFWy/L4wnIkKIqLZX01zlRE5IzYM+ZMMN5V0cKQlO7DsyR9g==}peerDependencies:esbuild: 0.17.x || 0.18.x@@ -1298,9 +1301,9 @@ packages:'@contentlayer/utils': 0.3.4camel-case: 4.1.2comment-json: 4.2.3- esbuild: 0.19.5+ esbuild: 0.20.0gray-matter: 4.0.3- mdx-bundler: 9.2.1([email protected])+ mdx-bundler: 9.2.1([email protected])rehype-stringify: 9.0.4remark-frontmatter: 4.0.1remark-parse: 10.0.2@@ -1313,10 +1316,10 @@ packages:- supports-colordev: false- /@contentlayer/[email protected]([email protected]):+ /@contentlayer/[email protected]([email protected]):resolution: {integrity: sha512-4njyn0OFPu7WY4tAjMxiJgWOKeiHuBOGdQ36EYE03iij/pPPRbiWbL+cmLccYXUFEW58mDwpqROZZm6pnxjRDQ==}dependencies:- '@contentlayer/core': 0.3.4([email protected])+ '@contentlayer/core': 0.3.4([email protected])'@contentlayer/utils': 0.3.4chokidar: 3.5.3fast-glob: 3.3.1@@ -1334,11 +1337,11 @@ packages:- supports-colordev: false- /@contentlayer/[email protected]([email protected]):+ /@contentlayer/[email protected]([email protected]):resolution: {integrity: sha512-cyiv4sNUySZvR0uAKlM+kSAELzNd2h2QT1R2e41dRKbwOUVxeLfmGiLugr0aVac6Q3xYcD99dbHyR1xWPV+w9w==}dependencies:- '@contentlayer/core': 0.3.4([email protected])- '@contentlayer/source-files': 0.3.4([email protected])+ '@contentlayer/core': 0.3.4([email protected])+ '@contentlayer/source-files': 0.3.4([email protected])'@contentlayer/utils': 0.3.4transitivePeerDependencies:- '@effect-ts/otel-node'@@ -1463,20 +1466,29 @@ packages:get-tsconfig: 4.7.2dev: true- /@esbuild-plugins/[email protected]([email protected]):+ /@esbuild-plugins/[email protected]([email protected]):resolution: {integrity: sha512-haFQ0qhxEpqtWWY0kx1Y5oE3sMyO1PcoSiWEPrAw6tm/ZOOLXjSs6Q+v1v9eyuVF0nNt50YEvrcrvENmyoMv5g==}peerDependencies:esbuild: '*'dependencies:'@types/resolve': 1.20.4debug: 4.3.4- esbuild: 0.19.5+ esbuild: 0.20.0escape-string-regexp: 4.0.0resolve: 1.22.8transitivePeerDependencies:- supports-colordev: false+ /@esbuild/[email protected]:+ resolution: {integrity: sha512-fGFDEctNh0CcSwsiRPxiaqX0P5rq+AqE0SRhYGZ4PX46Lg1FNR6oCxJghf8YgY0WQEgQuh3lErUFE4KxLeRmmw==}+ engines: {node: '>=12'}+ cpu: [ppc64]+ os: [aix]+ requiresBuild: true+ dev: false+ optional: true+/@esbuild/[email protected]:resolution: {integrity: sha512-VPuTzXFm/m2fcGfN6CiwZTlLzxrKsWbPkG7ArRFpuxyaHUm/XFHQPD4xNwZT6uUmpIHhnSjcaCmcla8COzmZ5Q==}engines: {node: '>=12'}@@ -1495,8 +1507,8 @@ packages:dev: trueoptional: true- /@esbuild/[email protected]:- resolution: {integrity: sha512-5d1OkoJxnYQfmC+Zd8NBFjkhyCNYwM4n9ODrycTFY6Jk1IGiZ+tjVJDDSwDt77nK+tfpGP4T50iMtVi4dEGzhQ==}+ /@esbuild/[email protected]:+ resolution: {integrity: sha512-aVpnM4lURNkp0D3qPoAzSG92VXStYmoVPOgXveAUoQBWRSuQzt51yvSju29J6AHPmwY1BjH49uR29oyfH1ra8Q==}engines: {node: '>=12'}cpu: [arm64]os: [android]@@ -1522,8 +1534,8 @@ packages:dev: trueoptional: true- /@esbuild/[email protected]:- resolution: {integrity: sha512-bhvbzWFF3CwMs5tbjf3ObfGqbl/17ict2/uwOSfr3wmxDE6VdS2GqY/FuzIPe0q0bdhj65zQsvqfArI9MY6+AA==}+ /@esbuild/[email protected]:+ resolution: {integrity: sha512-3bMAfInvByLHfJwYPJRlpTeaQA75n8C/QKpEaiS4HrFWFiJlNI0vzq/zCjBrhAYcPyVPG7Eo9dMrcQXuqmNk5g==}engines: {node: '>=12'}cpu: [arm]os: [android]@@ -1549,8 +1561,8 @@ packages:dev: trueoptional: true- /@esbuild/[email protected]:- resolution: {integrity: sha512-9t+28jHGL7uBdkBjL90QFxe7DVA+KGqWlHCF8ChTKyaKO//VLuoBricQCgwhOjA1/qOczsw843Fy4cbs4H3DVA==}+ /@esbuild/[email protected]:+ resolution: {integrity: sha512-uK7wAnlRvjkCPzh8jJ+QejFyrP8ObKuR5cBIsQZ+qbMunwR8sbd8krmMbxTLSrDhiPZaJYKQAU5Y3iMDcZPhyQ==}engines: {node: '>=12'}cpu: [x64]os: [android]@@ -1576,8 +1588,8 @@ packages:dev: trueoptional: true- /@esbuild/[email protected]:- resolution: {integrity: sha512-mvXGcKqqIqyKoxq26qEDPHJuBYUA5KizJncKOAf9eJQez+L9O+KfvNFu6nl7SCZ/gFb2QPaRqqmG0doSWlgkqw==}+ /@esbuild/[email protected]:+ resolution: {integrity: sha512-AjEcivGAlPs3UAcJedMa9qYg9eSfU6FnGHJjT8s346HSKkrcWlYezGE8VaO2xKfvvlZkgAhyvl06OJOxiMgOYQ==}engines: {node: '>=12'}cpu: [arm64]os: [darwin]@@ -1603,8 +1615,8 @@ packages:dev: trueoptional: true- /@esbuild/[email protected]:- resolution: {integrity: sha512-Ly8cn6fGLNet19s0X4unjcniX24I0RqjPv+kurpXabZYSXGM4Pwpmf85WHJN3lAgB8GSth7s5A0r856S+4DyiA==}+ /@esbuild/[email protected]:+ resolution: {integrity: sha512-bsgTPoyYDnPv8ER0HqnJggXK6RyFy4PH4rtsId0V7Efa90u2+EifxytE9pZnsDgExgkARy24WUQGv9irVbTvIw==}engines: {node: '>=12'}cpu: [x64]os: [darwin]@@ -1630,8 +1642,8 @@ packages:dev: trueoptional: true- /@esbuild/[email protected]:- resolution: {integrity: sha512-GGDNnPWTmWE+DMchq1W8Sd0mUkL+APvJg3b11klSGUDvRXh70JqLAO56tubmq1s2cgpVCSKYywEiKBfju8JztQ==}+ /@esbuild/[email protected]:+ resolution: {integrity: sha512-kQ7jYdlKS335mpGbMW5tEe3IrQFIok9r84EM3PXB8qBFJPSc6dpWfrtsC/y1pyrz82xfUIn5ZrnSHQQsd6jebQ==}engines: {node: '>=12'}cpu: [arm64]os: [freebsd]@@ -1657,8 +1669,8 @@ packages:dev: trueoptional: true- /@esbuild/[email protected]:- resolution: {integrity: sha512-1CCwDHnSSoA0HNwdfoNY0jLfJpd7ygaLAp5EHFos3VWJCRX9DMwWODf96s9TSse39Br7oOTLryRVmBoFwXbuuQ==}+ /@esbuild/[email protected]:+ resolution: {integrity: sha512-uG8B0WSepMRsBNVXAQcHf9+Ko/Tr+XqmK7Ptel9HVmnykupXdS4J7ovSQUIi0tQGIndhbqWLaIL/qO/cWhXKyQ==}engines: {node: '>=12'}cpu: [x64]os: [freebsd]@@ -1684,8 +1696,8 @@ packages:dev: trueoptional: true- /@esbuild/[email protected]:- resolution: {integrity: sha512-o3vYippBmSrjjQUCEEiTZ2l+4yC0pVJD/Dl57WfPwwlvFkrxoSO7rmBZFii6kQB3Wrn/6GwJUPLU5t52eq2meA==}+ /@esbuild/[email protected]:+ resolution: {integrity: sha512-uTtyYAP5veqi2z9b6Gr0NUoNv9F/rOzI8tOD5jKcCvRUn7T60Bb+42NDBCWNhMjkQzI0qqwXkQGo1SY41G52nw==}engines: {node: '>=12'}cpu: [arm64]os: [linux]@@ -1711,8 +1723,8 @@ packages:dev: trueoptional: true- /@esbuild/[email protected]:- resolution: {integrity: sha512-lrWXLY/vJBzCPC51QN0HM71uWgIEpGSjSZZADQhq7DKhPcI6NH1IdzjfHkDQws2oNpJKpR13kv7/pFHBbDQDwQ==}+ /@esbuild/[email protected]:+ resolution: {integrity: sha512-2ezuhdiZw8vuHf1HKSf4TIk80naTbP9At7sOqZmdVwvvMyuoDiZB49YZKLsLOfKIr77+I40dWpHVeY5JHpIEIg==}engines: {node: '>=12'}cpu: [arm]os: [linux]@@ -1738,8 +1750,8 @@ packages:dev: trueoptional: true- /@esbuild/[email protected]:- resolution: {integrity: sha512-MkjHXS03AXAkNp1KKkhSKPOCYztRtK+KXDNkBa6P78F8Bw0ynknCSClO/ztGszILZtyO/lVKpa7MolbBZ6oJtQ==}+ /@esbuild/[email protected]:+ resolution: {integrity: sha512-c88wwtfs8tTffPaoJ+SQn3y+lKtgTzyjkD8NgsyCtCmtoIC8RDL7PrJU05an/e9VuAke6eJqGkoMhJK1RY6z4w==}engines: {node: '>=12'}cpu: [ia32]os: [linux]@@ -1765,8 +1777,8 @@ packages:dev: trueoptional: true- /@esbuild/[email protected]:- resolution: {integrity: sha512-42GwZMm5oYOD/JHqHska3Jg0r+XFb/fdZRX+WjADm3nLWLcIsN27YKtqxzQmGNJgu0AyXg4HtcSK9HuOk3v1Dw==}+ /@esbuild/[email protected]:+ resolution: {integrity: sha512-lR2rr/128/6svngnVta6JN4gxSXle/yZEZL3o4XZ6esOqhyR4wsKyfu6qXAL04S4S5CgGfG+GYZnjFd4YiG3Aw==}engines: {node: '>=12'}cpu: [loong64]os: [linux]@@ -1792,8 +1804,8 @@ packages:dev: trueoptional: true- /@esbuild/[email protected]:- resolution: {integrity: sha512-kcjndCSMitUuPJobWCnwQ9lLjiLZUR3QLQmlgaBfMX23UEa7ZOrtufnRds+6WZtIS9HdTXqND4yH8NLoVVIkcg==}+ /@esbuild/[email protected]:+ resolution: {integrity: sha512-9Sycc+1uUsDnJCelDf6ZNqgZQoK1mJvFtqf2MUz4ujTxGhvCWw+4chYfDLPepMEvVL9PDwn6HrXad5yOrNzIsQ==}engines: {node: '>=12'}cpu: [mips64el]os: [linux]@@ -1819,8 +1831,8 @@ packages:dev: trueoptional: true- /@esbuild/[email protected]:- resolution: {integrity: sha512-yJAxJfHVm0ZbsiljbtFFP1BQKLc8kUF6+17tjQ78QjqjAQDnhULWiTA6u0FCDmYT1oOKS9PzZ2z0aBI+Mcyj7Q==}+ /@esbuild/[email protected]:+ resolution: {integrity: sha512-CoWSaaAXOZd+CjbUTdXIJE/t7Oz+4g90A3VBCHLbfuc5yUQU/nFDLOzQsN0cdxgXd97lYW/psIIBdjzQIwTBGw==}engines: {node: '>=12'}cpu: [ppc64]os: [linux]@@ -1846,8 +1858,8 @@ packages:dev: trueoptional: true- /@esbuild/[email protected]:- resolution: {integrity: sha512-5u8cIR/t3gaD6ad3wNt1MNRstAZO+aNyBxu2We8X31bA8XUNyamTVQwLDA1SLoPCUehNCymhBhK3Qim1433Zag==}+ /@esbuild/[email protected]:+ resolution: {integrity: sha512-mlb1hg/eYRJUpv8h/x+4ShgoNLL8wgZ64SUr26KwglTYnwAWjkhR2GpoKftDbPOCnodA9t4Y/b68H4J9XmmPzA==}engines: {node: '>=12'}cpu: [riscv64]os: [linux]@@ -1873,8 +1885,8 @@ packages:dev: trueoptional: true- /@esbuild/[email protected]:- resolution: {integrity: sha512-Z6JrMyEw/EmZBD/OFEFpb+gao9xJ59ATsoTNlj39jVBbXqoZm4Xntu6wVmGPB/OATi1uk/DB+yeDPv2E8PqZGw==}+ /@esbuild/[email protected]:+ resolution: {integrity: sha512-fgf9ubb53xSnOBqyvWEY6ukBNRl1mVX1srPNu06B6mNsNK20JfH6xV6jECzrQ69/VMiTLvHMicQR/PgTOgqJUQ==}engines: {node: '>=12'}cpu: [s390x]os: [linux]@@ -1900,8 +1912,8 @@ packages:dev: trueoptional: true- /@esbuild/[email protected]:- resolution: {integrity: sha512-psagl+2RlK1z8zWZOmVdImisMtrUxvwereIdyJTmtmHahJTKb64pAcqoPlx6CewPdvGvUKe2Jw+0Z/0qhSbG1A==}+ /@esbuild/[email protected]:+ resolution: {integrity: sha512-H9Eu6MGse++204XZcYsse1yFHmRXEWgadk2N58O/xd50P9EvFMLJTQLg+lB4E1cF2xhLZU5luSWtGTb0l9UeSg==}engines: {node: '>=12'}cpu: [x64]os: [linux]@@ -1927,8 +1939,8 @@ packages:dev: trueoptional: true- /@esbuild/[email protected]:- resolution: {integrity: sha512-kL2l+xScnAy/E/3119OggX8SrWyBEcqAh8aOY1gr4gPvw76la2GlD4Ymf832UCVbmuWeTf2adkZDK+h0Z/fB4g==}+ /@esbuild/[email protected]:+ resolution: {integrity: sha512-lCT675rTN1v8Fo+RGrE5KjSnfY0x9Og4RN7t7lVrN3vMSjy34/+3na0q7RIfWDAj0e0rCh0OL+P88lu3Rt21MQ==}engines: {node: '>=12'}cpu: [x64]os: [netbsd]@@ -1954,8 +1966,8 @@ packages:dev: trueoptional: true- /@esbuild/[email protected]:- resolution: {integrity: sha512-sPOfhtzFufQfTBgRnE1DIJjzsXukKSvZxloZbkJDG383q0awVAq600pc1nfqBcl0ice/WN9p4qLc39WhBShRTA==}+ /@esbuild/[email protected]:+ resolution: {integrity: sha512-HKoUGXz/TOVXKQ+67NhxyHv+aDSZf44QpWLa3I1lLvAwGq8x1k0T+e2HHSRvxWhfJrFxaaqre1+YyzQ99KixoA==}engines: {node: '>=12'}cpu: [x64]os: [openbsd]@@ -1981,8 +1993,8 @@ packages:dev: trueoptional: true- /@esbuild/[email protected]:- resolution: {integrity: sha512-dGZkBXaafuKLpDSjKcB0ax0FL36YXCvJNnztjKV+6CO82tTYVDSH2lifitJ29jxRMoUhgkg9a+VA/B03WK5lcg==}+ /@esbuild/[email protected]:+ resolution: {integrity: sha512-GDwAqgHQm1mVoPppGsoq4WJwT3vhnz/2N62CzhvApFD1eJyTroob30FPpOZabN+FgCjhG+AgcZyOPIkR8dfD7g==}engines: {node: '>=12'}cpu: [x64]os: [sunos]@@ -2008,8 +2020,8 @@ packages:dev: trueoptional: true- /@esbuild/[email protected]:- resolution: {integrity: sha512-dWVjD9y03ilhdRQ6Xig1NWNgfLtf2o/STKTS+eZuF90fI2BhbwD6WlaiCGKptlqXlURVB5AUOxUj09LuwKGDTg==}+ /@esbuild/[email protected]:+ resolution: {integrity: sha512-0vYsP8aC4TvMlOQYozoksiaxjlvUcQrac+muDqj1Fxy6jh9l9CZJzj7zmh8JGfiV49cYLTorFLxg7593pGldwQ==}engines: {node: '>=12'}cpu: [arm64]os: [win32]@@ -2035,8 +2047,8 @@ packages:dev: trueoptional: true- /@esbuild/[email protected]:- resolution: {integrity: sha512-4liggWIA4oDgUxqpZwrDhmEfAH4d0iljanDOK7AnVU89T6CzHon/ony8C5LeOdfgx60x5cnQJFZwEydVlYx4iw==}+ /@esbuild/[email protected]:+ resolution: {integrity: sha512-p98u4rIgfh4gdpV00IqknBD5pC84LCub+4a3MO+zjqvU5MVXOc3hqR2UgT2jI2nh3h8s9EQxmOsVI3tyzv1iFg==}engines: {node: '>=12'}cpu: [ia32]os: [win32]@@ -2062,8 +2074,8 @@ packages:dev: trueoptional: true- /@esbuild/[email protected]:- resolution: {integrity: sha512-czTrygUsB/jlM8qEW5MD8bgYU2Xg14lo6kBDXW6HdxKjh8M5PzETGiSHaz9MtbXBYDloHNUAUW2tMiKW4KM9Mw==}+ /@esbuild/[email protected]:+ resolution: {integrity: sha512-NgJnesu1RtWihtTtXGFMU5YSE6JyyHPMxCwBZK7a6/8d31GuSo9l0Ss7w1Jw5QnKUawG6UEehs883kcXf5fYwg==}engines: {node: '>=12'}cpu: [x64]os: [win32]@@ -2353,10 +2365,10 @@ packages:chalk: 4.1.2dev: false- /@jitsu/[email protected](@types/[email protected]):+ /@jitsu/[email protected](@types/[email protected]):resolution: {integrity: sha512-7k3dM84xqf6Ivaama8VWwGYOcmGI/WWQTUHmHNXao+M/tneU6L72SCNlUE587vgtaxvoN2oROo4sBGO+sTh4ZQ==}dependencies:- analytics: 0.8.9(@types/[email protected])+ analytics: 0.8.9(@types/[email protected])transitivePeerDependencies:- '@types/dlv'dev: false@@ -2535,13 +2547,13 @@ packages:unist-util-visit: 1.4.1dev: false- /@mdx-js/[email protected]([email protected]):+ /@mdx-js/[email protected]([email protected]):resolution: {integrity: sha512-r/vsqsM0E+U4Wr0DK+0EfmABE/eg+8ITW4DjvYdh3ve/tK2safaqHArNnaqbOk1DjYGrhxtoXoGaM3BY8fGBTA==}peerDependencies:esbuild: '>=0.11.0'dependencies:'@mdx-js/mdx': 2.3.0- esbuild: 0.19.5+ esbuild: 0.20.0node-fetch: 3.3.2vfile: 5.3.7transitivePeerDependencies:@@ -5064,7 +5076,7 @@ packages:resolution: {integrity: sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==}dev: trueresolution: {integrity: sha512-noop5+3MBFsgPQ7O2vQpS6YYiah+ZrOioa4cDDpZceUVsKVXvUHFmC2nEVyKSJZhO/8SLvbDE/esB/MGw5b2tw==}hasBin: truedependencies:@@ -5076,7 +5088,7 @@ packages:node-plop: 0.26.3proxy-agent: 6.3.1semver: 7.5.4- ts-node: 10.9.1(@types/[email protected])([email protected])+ ts-node: 10.9.1(@types/[email protected])([email protected])update-check: 1.5.4validate-npm-package-name: 5.0.0transitivePeerDependencies:@@ -5166,8 +5178,8 @@ packages:dependencies:'@types/ms': 0.7.33- /@types/[email protected]:- resolution: {integrity: sha512-u6JdAm9wje4n7vqkK9F6nQI18xSO+MVfXz6RMgN4acJmSZMlV7ZRrEQg4d1wmiQ2txg2xArpc68RS6p4JecVNg==}+ /@types/[email protected]:+ resolution: {integrity: sha512-m8KmImw4Jt+4rIgupwfivrWEOnj1LzkmKkqbh075uG13eTQ1ZxHWT6T0vIdSQhLIjQCiR0n0lZdtyDOPO1x2Mw==}dev: false/@types/[email protected]:@@ -5324,6 +5336,12 @@ packages:resolution: {integrity: sha512-vmYJF0REqDyyU0gviezF/KHq/fYaUbFhkcNbQCuPGFQj6VTbXuHZoxs/Y7mutWe73C8AC6l9fFu8mSYiBAqkGA==}dev: false+ /@types/[email protected]:+ resolution: {integrity: sha512-QmgQZGWu1Yw9TDyAP9ZzpFJKynYNeOvwMJmaxABfieQoVoiVOS6MN1WSpqpRcbeA5+RW82kraAVxCCJg+780Qw==}+ dependencies:+ undici-types: 5.26.5+ dev: true+/@types/[email protected]:resolution: {integrity: sha512-LzcWltT83s1bthcvjBmiBvGJiiUe84NWRHkw+ZV6Fr41z2FbIzvc815dk2nQ3RAKMuN2fkenM/z3Xv2QzEpYxQ==}@@ -5717,20 +5735,20 @@ packages:json-schema-traverse: 0.4.1uri-js: 4.4.1- /[email protected](@types/[email protected]):+ /[email protected](@types/[email protected]):resolution: {integrity: sha512-WvV2YWgsnXLxaY0QYux0crpBAg/0JA763NmbMVz22jKhMPo7dpTBet8G2IlF7ixTjLDzGlkHk1ZaKqqQmjJ+4w==}peerDependencies:'@types/dlv': ^1.0.0dependencies:'@analytics/type-utils': 0.6.2- '@types/dlv': 1.1.3+ '@types/dlv': 1.1.4dlv: 1.1.3dev: false- /[email protected](@types/[email protected]):+ /[email protected](@types/[email protected]):resolution: {integrity: sha512-oTbUzQpncMTslakqfK70GgB6bopk5hY+uuekwnadMkDyqNLgcD02KRzteTnO7q5Ko6wDECVtT8xi/6OuAMZykA==}dependencies:- '@analytics/core': 0.12.7(@types/[email protected])+ '@analytics/core': 0.12.7(@types/[email protected])'@analytics/storage-utils': 0.4.2transitivePeerDependencies:- '@types/dlv'@@ -6452,17 +6470,17 @@ packages:engines: {node: '>= 0.6'}dev: falseresolution: {integrity: sha512-FYDdTUFaN4yqep0waswrhcXjmMJnPD5iXDTtxcUCGdklfuIrXM2xLx51xl748cHmGA6IsC+27YZFxU6Ym13QIA==}engines: {node: '>=14.18'}hasBin: truerequiresBuild: truedependencies:- '@contentlayer/cli': 0.3.4([email protected])- '@contentlayer/client': 0.3.4([email protected])- '@contentlayer/core': 0.3.4([email protected])- '@contentlayer/source-files': 0.3.4([email protected])- '@contentlayer/source-remote-files': 0.3.4([email protected])+ '@contentlayer/cli': 0.3.4([email protected])+ '@contentlayer/client': 0.3.4([email protected])+ '@contentlayer/core': 0.3.4([email protected])+ '@contentlayer/source-files': 0.3.4([email protected])+ '@contentlayer/source-remote-files': 0.3.4([email protected])'@contentlayer/utils': 0.3.4transitivePeerDependencies:- '@effect-ts/otel-node'@@ -7302,34 +7320,35 @@ packages:'@esbuild/win32-x64': 0.18.20dev: true- resolution: {integrity: sha512-bUxalY7b1g8vNhQKdB24QDmHeY4V4tw/s6Ak5z+jJX9laP5MoQseTOMemAr0gxssjNcH0MCViG8ONI2kksvfFQ==}+ resolution: {integrity: sha512-6iwE3Y2RVYCME1jLpBqq7LQWK3MW6vjV2bZy6gt/WrqkY+WE74Spyc0ThAOYpMtITvnjX09CrC6ym7A/m9mebA==}engines: {node: '>=12'}hasBin: truerequiresBuild: trueoptionalDependencies:- '@esbuild/android-arm': 0.19.5- '@esbuild/android-arm64': 0.19.5- '@esbuild/android-x64': 0.19.5- '@esbuild/darwin-arm64': 0.19.5- '@esbuild/darwin-x64': 0.19.5- '@esbuild/freebsd-arm64': 0.19.5- '@esbuild/freebsd-x64': 0.19.5- '@esbuild/linux-arm': 0.19.5- '@esbuild/linux-arm64': 0.19.5- '@esbuild/linux-ia32': 0.19.5- '@esbuild/linux-loong64': 0.19.5- '@esbuild/linux-mips64el': 0.19.5- '@esbuild/linux-ppc64': 0.19.5- '@esbuild/linux-riscv64': 0.19.5- '@esbuild/linux-s390x': 0.19.5- '@esbuild/linux-x64': 0.19.5- '@esbuild/netbsd-x64': 0.19.5- '@esbuild/openbsd-x64': 0.19.5- '@esbuild/sunos-x64': 0.19.5- '@esbuild/win32-arm64': 0.19.5- '@esbuild/win32-ia32': 0.19.5- '@esbuild/win32-x64': 0.19.5+ '@esbuild/aix-ppc64': 0.20.0+ '@esbuild/android-arm': 0.20.0+ '@esbuild/android-arm64': 0.20.0+ '@esbuild/android-x64': 0.20.0+ '@esbuild/darwin-arm64': 0.20.0+ '@esbuild/darwin-x64': 0.20.0+ '@esbuild/freebsd-arm64': 0.20.0+ '@esbuild/freebsd-x64': 0.20.0+ '@esbuild/linux-arm': 0.20.0+ '@esbuild/linux-arm64': 0.20.0+ '@esbuild/linux-ia32': 0.20.0+ '@esbuild/linux-loong64': 0.20.0+ '@esbuild/linux-mips64el': 0.20.0+ '@esbuild/linux-ppc64': 0.20.0+ '@esbuild/linux-riscv64': 0.20.0+ '@esbuild/linux-s390x': 0.20.0+ '@esbuild/linux-x64': 0.20.0+ '@esbuild/netbsd-x64': 0.20.0+ '@esbuild/openbsd-x64': 0.20.0+ '@esbuild/sunos-x64': 0.20.0+ '@esbuild/win32-arm64': 0.20.0+ '@esbuild/win32-ia32': 0.20.0+ '@esbuild/win32-x64': 0.20.0dev: false@@ -9771,17 +9790,17 @@ packages:dependencies:'@types/mdast': 3.0.14resolution: {integrity: sha512-hWEEip1KU9MCNqeH2rqwzAZ1pdqPPbfkx9OTJjADqGPQz4t9BO85fhI7AP9gVYrpmfArf9/xJZUN0yBErg/G/Q==}engines: {node: '>=14', npm: '>=6'}peerDependencies:esbuild: 0.*dependencies:'@babel/runtime': 7.23.2- '@esbuild-plugins/node-resolve': 0.1.4([email protected])+ '@esbuild-plugins/node-resolve': 0.1.4([email protected])'@fal-works/esbuild-plugin-global-externals': 2.1.2- '@mdx-js/esbuild': 2.3.0([email protected])- esbuild: 0.19.5+ '@mdx-js/esbuild': 2.3.0([email protected])+ esbuild: 0.20.0gray-matter: 4.0.3remark-frontmatter: 4.0.1remark-mdx-frontmatter: 1.1.1@@ -10293,7 +10312,7 @@ packages:engines: {node: '>= 0.4.0'}dev: true- /[email protected]([email protected])([email protected])([email protected])([email protected])([email protected]):+ /[email protected]([email protected])([email protected])([email protected])([email protected])([email protected]):resolution: {integrity: sha512-UtUCwgAl159KwfhNaOwyiI7Lg6sdioyKMeh+E7jxx0CJ29JuXGxBEYmCI6+72NxFGIFZKx8lvttbbQhbnYWYSw==}peerDependencies:contentlayer: 0.3.4@@ -10301,9 +10320,9 @@ packages:react: '*'react-dom: '*'dependencies:- '@contentlayer/core': 0.3.4([email protected])+ '@contentlayer/core': 0.3.4([email protected])'@contentlayer/utils': 0.3.4- contentlayer: 0.3.4([email protected])+ contentlayer: 0.3.4([email protected])next: 14.1.0(@babel/[email protected])(@opentelemetry/[email protected])([email protected])([email protected])react: 18.2.0react-dom: 18.2.0([email protected])@@ -12594,7 +12613,7 @@ packages:resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==}resolution: {integrity: sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==}hasBin: truepeerDependencies:@@ -12613,7 +12632,7 @@ packages:'@tsconfig/node12': 1.0.11'@tsconfig/node14': 1.0.3'@tsconfig/node16': 1.0.4- '@types/node': 20.8.0+ '@types/node': 20.11.17acorn: 8.10.0acorn-walk: 8.2.0arg: 4.1.0@@ -12890,6 +12909,10 @@ packages:which-boxed-primitive: 1.0.2dev: false+ resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==}+ dev: true+resolution: {integrity: sha512-nTw6b2G2OqP6btYPyghCgV4hSwjJlL/78FMJatVLCa3otj6PCOQSt6dVtYt82OtNqFz8XsnJ+vsXLADPXjPhqw==}engines: {node: '>=14.0'}