Open-source status page, incident response and uptime monitoring
TypeScript alertingincident-managementmcpmcp-servermonitoringmonitoring-as-codeobservabilityon-callopen-sourcesrestatus-pagestatuspagesynthetic-monitoringterraformtinybirdtursouptimeuptime-checkeruptime-monitor
feat: status pages (#942)
Maximilian Kaske0d5829a19b5b
diff --git a/apps/web/public/assets/changelog/status-page-colors-and-more.png b/apps/web/public/assets/changelog/status-page-colors-and-more.pngnew file mode 100644index 000000000..e57ef2ab8Binary files /dev/null and b/apps/web/public/assets/changelog/status-page-colors-and-more.png differdiff --git a/apps/web/src/app/(content)/features/mock.ts b/apps/web/src/app/(content)/features/mock.tsindex 4514c3ded..ac706270d 100644--- a/apps/web/src/app/(content)/features/mock.ts+++ b/apps/web/src/app/(content)/features/mock.ts@@ -1014,17 +1014,20 @@ export const mockChartData = {};export const maintenanceData = {- id: 0,- from: new Date("2024-07-09T21:02:43.000Z"),- to: new Date("2024-07-09T21:05:43.000Z"),- title: "Maintenance",- message:- "We are performing maintenance on our environment. Services and projects may be unavailable for a few minutes.",- createdAt: null,- updatedAt: null,- workspaceId: null,- pageId: null,- monitors: undefined,+ maintenance: {+ id: 0,+ from: new Date("2024-07-09T21:02:43.000Z"),+ to: new Date("2024-07-09T21:05:43.000Z"),+ title: "Maintenance",+ message:+ "We are performing maintenance on our environment. Services and projects may be unavailable for a few minutes.",+ createdAt: null,+ updatedAt: null,+ workspaceId: null,+ pageId: null,+ monitors: undefined,+ },+ monitors: [],};export const statusReportData = {diff --git a/apps/web/src/app/(content)/features/status-page/page.tsx b/apps/web/src/app/(content)/features/status-page/page.tsxindex 9544d6bd8..ada838f36 100644--- a/apps/web/src/app/(content)/features/status-page/page.tsx+++ b/apps/web/src/app/(content)/features/status-page/page.tsx@@ -5,7 +5,7 @@ import {} from "@/app/shared-metadata";import { PasswordFormSuspense } from "@/app/status-page/[domain]/_components/password-form";import { SubscribeButton } from "@/app/status-page/[domain]/_components/subscribe-button";-import { MaintenanceBanner } from "@/components/status-page/maintenance-banner";+import { MaintenanceContainer } from "@/components/status-page/maintenance";import { StatusCheck } from "@/components/status-page/status-check";import { StatusReport } from "@/components/status-page/status-report";import { Tracker } from "@/components/tracker/tracker";@@ -93,7 +93,7 @@ export default function FeaturePage() {subTitle="Down't let your users in the dark and show what's wrong."component={<div className="-translate-y-6 m-auto scale-[0.80]">- <StatusReport {...statusReportData} />+ <StatusReport isDemo {...statusReportData} /></div>}col={1}@@ -118,11 +118,7 @@ export default function FeaturePage() {iconText="Keep it simple"title="Build trust."subTitle="Showcase your reliability to your users, and reduce the number of customer service tickets."- component={- <div className="m-auto max-w-lg">- <StatusCheck />- </div>- }+ component={<StatusCheck />}action={<div className="mt-2"><Button variant="outline" className="rounded-full" asChild>@@ -139,8 +135,11 @@ export default function FeaturePage() {title="Maintenance."subTitle="Mute your monitors for a specific period and inform the users about upcoming maintenance."component={- <div className="m-auto">- <MaintenanceBanner {...maintenanceData} />+ <div className="m-auto scale-[0.80]">+ <MaintenanceContainer+ className="rounded-lg border-status-monitoring/10 bg-status-monitoring/5"+ {...maintenanceData}+ /></div>}col={2}diff --git a/apps/web/src/app/api/og/_components/status-check.tsx b/apps/web/src/app/api/og/_components/status-check.tsxindex daebb51ba..6ae9f13ce 100644--- a/apps/web/src/app/api/og/_components/status-check.tsx+++ b/apps/web/src/app/api/og/_components/status-check.tsx@@ -4,7 +4,6 @@ import { cn } from "@/lib/utils";export function StatusCheck({ tracker }: { tracker: Tracker }) {const details = tracker.currentDetails;- const className = tracker.currentClassName;// FIXME: move icons into @openstatus/tracker libfunction getVariant() {@@ -22,11 +21,32 @@ export function StatusCheck({ tracker }: { tracker: Tracker }) {}}+ // REMINDER: we cannot use custom tailwind utility colors like `bg-status-operational/90` here+ function getClassName() {+ switch (details.variant) {+ case "maintenance":+ return "bg-blue-500/90 border-blue-500";+ case "down":+ return "bg-rose-500/90 border-rose-500";+ case "degraded":+ return "bg-amber-500/90 border-amber-500";+ case "incident":+ return "bg-rose-500/90 border-rose-500";+ default:+ return "bg-green-500/90 border-green-500";+ }+ }+const Icon = getVariant();return (<div tw="flex flex-col justify-center items-center w-full">- <div tw={cn("flex text-white rounded-full p-3 border-2 mb-2", className)}>+ <div+ tw={cn(+ "flex text-white rounded-full p-3 border-2 mb-2",+ getClassName(),+ )}+ ><Icon /></div><p style={{ fontFamily: "Cal" }} tw="text-4xl">diff --git a/apps/web/src/app/api/og/_components/tracker.tsx b/apps/web/src/app/api/og/_components/tracker.tsxindex 985477296..9d3cfc86f 100644--- a/apps/web/src/app/api/og/_components/tracker.tsx+++ b/apps/web/src/app/api/og/_components/tracker.tsx@@ -23,8 +23,11 @@ export function Tracker({ data }: { data: Monitor[] }) {const isBlackListed = Boolean(item.blacklist);if (isBlackListed) {return (- // biome-ignore lint/suspicious/noArrayIndexKey: <explanation>- <div key={i} tw="h-16 w-3 rounded-full mr-1 bg-green-400" />+ <div+ // biome-ignore lint/suspicious/noArrayIndexKey: <explanation>+ key={i}+ tw="h-16 w-3 rounded-full mr-1 bg-status-operational/90"+ />);}return (diff --git a/apps/web/src/app/status-page/[domain]/_components/footer.tsx b/apps/web/src/app/status-page/[domain]/_components/footer.tsxindex 569c1a834..5dc16d3b1 100644--- a/apps/web/src/app/status-page/[domain]/_components/footer.tsx+++ b/apps/web/src/app/status-page/[domain]/_components/footer.tsx@@ -5,15 +5,18 @@ import { ThemeToggle } from "@/components/theme-toggle";interface Props {plan: WorkspacePlan;+ timeZone?: string | null;}-export function Footer({ plan }: Props) {+export function Footer({ plan, timeZone }: Props) {const isWhiteLabel = allPlans[plan].limits["white-label"];return (- <footer className="z-10 mx-auto flex w-full items-center justify-between">- <div />+ <footer className="z-10 mx-auto grid w-full grid-cols-5 items-center justify-between gap-4">+ <p className="truncate font-light text-muted-foreground text-xs">+ {timeZone}+ </p>{!isWhiteLabel ? (- <p className="text-center text-muted-foreground text-sm">+ <p className="col-span-3 text-center text-muted-foreground text-sm">powered by{" "}<ahref="https://www.openstatus.dev"@@ -25,7 +28,9 @@ export function Footer({ plan }: Props) {</a></p>) : null}- <ThemeToggle />+ <div className="text-right">+ <ThemeToggle />+ </div></footer>);}diff --git a/apps/web/src/app/status-page/[domain]/_components/header.tsx b/apps/web/src/app/status-page/[domain]/_components/header.tsxindex 9a9d285ef..d0b0626a8 100644--- a/apps/web/src/app/status-page/[domain]/_components/header.tsx+++ b/apps/web/src/app/status-page/[domain]/_components/header.tsx@@ -9,6 +9,8 @@ import type { WorkspacePlan } from "@openstatus/db/src/schema/workspaces/validatimport { Shell } from "@/components/dashboard/shell";import { TabsContainer, TabsLink } from "@/components/dashboard/tabs-link";+import { cn } from "@/lib/utils";+import Link from "next/link";import { Menu } from "./menu";import { SubscribeButton } from "./subscribe-button";@@ -25,14 +27,14 @@ type Props = {export function Header({ navigation, plan, page }: Props) {const selectedSegment = useSelectedLayoutSegment();- const isSubscribers = allPlans[plan].limits["status-subscribers"];+ const isSubscribers = allPlans[plan].limits["status-subscribers"]; // FIXME: use the workspace.limitsreturn (- <header className="w-full">- <Shell className="flex items-center justify-between gap-4 px-3 py-3 md:px-6 md:py-3">- <div className="relative sm:w-[100px]">+ <header className="sticky top-3 z-10 w-full">+ <div className="flex w-full items-center justify-between gap-8 rounded-full border border-border px-2.5 py-1.5 backdrop-blur-lg md:top-6">+ <div className="relative sm:w-[120px]">{page?.icon ? (- <div className="flex h-7 w-7 items-center justify-center overflow-hidden rounded-full border border-border bg-muted">+ <div className="flex h-9 w-9 items-center justify-center overflow-hidden rounded-full border border-border bg-muted"><Imageheight={36}width={36}@@ -43,25 +45,33 @@ export function Header({ navigation, plan, page }: Props) {</div>) : null}</div>- <TabsContainer className="-mb-[14px] hidden sm:block">+ <ul className="hidden items-center space-x-1 sm:flex">{navigation.map(({ label, href, disabled, segment }) => {const active = segment === selectedSegment;return (- <TabsLink key={segment} {...{ active, href, label, disabled }}>- {label}- </TabsLink>+ <li key={segment}>+ <Link+ className={cn(+ "h-9 rounded-full bg-transparent px-4 py-2 font-medium text-muted-foreground hover:bg-accent/50",+ { "text-foreground": active },+ )}+ {...{ href, disabled }}+ >+ {label}+ </Link>+ </li>);})}- </TabsContainer>- <div className="flex items-center gap-4">- <div className="text-end sm:w-[100px]">- {isSubscribers ? <SubscribeButton slug={page.slug} /> : null}- </div>+ </ul>+ <div className="flex items-center gap-3"><div className="block sm:hidden"><Menu navigation={navigation} /></div>+ <div className="text-end sm:w-[120px]">+ {isSubscribers ? <SubscribeButton slug={page.slug} /> : null}+ </div></div>- </Shell>+ </div></header>);}diff --git a/apps/web/src/app/status-page/[domain]/_components/subscribe-button.tsx b/apps/web/src/app/status-page/[domain]/_components/subscribe-button.tsxindex 3c44d89bf..1ea0ce81f 100644--- a/apps/web/src/app/status-page/[domain]/_components/subscribe-button.tsx+++ b/apps/web/src/app/status-page/[domain]/_components/subscribe-button.tsx@@ -26,11 +26,11 @@ export function SubscribeButton({ slug, isDemo = false }: Props) {return (<Popover><PopoverTrigger asChild>- <Button size="sm" variant="outline">+ <Button variant="outline" className="rounded-full">Get updates</Button></PopoverTrigger>- <PopoverContent>+ <PopoverContent align="end"><div className="grid gap-4"><div className="space-y-2"><h4 className="flex items-center font-medium leading-none">diff --git a/apps/web/src/app/status-page/[domain]/events/page.tsx b/apps/web/src/app/status-page/[domain]/events/page.tsxnew file mode 100644index 000000000..8d58880bb--- /dev/null+++ b/apps/web/src/app/status-page/[domain]/events/page.tsx@@ -0,0 +1,55 @@+import { Header } from "@/components/dashboard/header";+import { SearchParamsPreset } from "@/components/monitor-dashboard/search-params-preset"; // TOO: move to shared components+import { Feed } from "@/components/status-page/feed";+import { api } from "@/trpc/server";+import { notFound } from "next/navigation";+import { z } from "zod";+import { formatter } from "./utils";++const searchParamsSchema = z.object({+ filter: z.enum(["all", "maintenances", "reports"]).optional().default("all"),+});++type Props = {+ params: { domain: string };+ searchParams: { [key: string]: string | string[] | undefined };+};++export const revalidate = 120;++export default async function Page({ params, searchParams }: Props) {+ const page = await api.page.getPageBySlug.query({ slug: params.domain });+ const search = searchParamsSchema.safeParse(searchParams);++ if (!page) return notFound();++ const filter = search.success ? search.data.filter : "all";++ return (+ <div className="grid gap-8">+ <Header+ title={page.title}+ description={page.description}+ actions={+ <SearchParamsPreset+ searchParam="filter"+ defaultValue={filter}+ values={["all", "maintenances", "reports"]}+ className="w-auto sm:w-[150px]"+ formatter={formatter}+ />+ }+ className="text-left"+ />+ <Feed+ monitors={page.monitors}+ maintenances={+ ["all", "maintenances"].includes(filter) ? page.maintenances : []+ }+ statusReports={+ ["all", "reports"].includes(filter) ? page.statusReports : []+ }+ />+ </div>+ );+}diff --git a/apps/web/src/app/status-page/[domain]/incidents/[id]/_components/copy-link-button.tsx b/apps/web/src/app/status-page/[domain]/events/report/[id]/_components/copy-link-button.tsxsimilarity index 100%rename from apps/web/src/app/status-page/[domain]/incidents/[id]/_components/copy-link-button.tsxrename to apps/web/src/app/status-page/[domain]/events/report/[id]/_components/copy-link-button.tsxdiff --git a/apps/web/src/app/status-page/[domain]/events/report/[id]/page.tsx b/apps/web/src/app/status-page/[domain]/events/report/[id]/page.tsxnew file mode 100644index 000000000..a9c9b4abf--- /dev/null+++ b/apps/web/src/app/status-page/[domain]/events/report/[id]/page.tsx@@ -0,0 +1,58 @@+import { notFound } from "next/navigation";++import { Header } from "@/components/dashboard/header";+import { DateTimeTooltip } from "@/components/status-page/datetime-tooltip";+import { StatusReportUpdates } from "@/components/status-page/status-report";+import { api } from "@/trpc/server";+import { Badge } from "@openstatus/ui";+import { CopyLinkButton } from "./_components/copy-link-button";++export default async function IncidentPage({+ params,+}: {+ params: { domain: string; id: string };+}) {+ const report = await api.statusReport.getPublicStatusReportById.query({+ slug: params.domain,+ id: Number(params.id),+ });++ if (!report) return notFound();++ const affectedMonitors = report.monitorsToStatusReports.map(+ ({ monitor }) => monitor,+ );++ const firstUpdate =+ report.statusReportUpdates[report.statusReportUpdates.length - 1] ||+ undefined;++ return (+ <div className="grid gap-8 text-left">+ <Header+ title={report.title}+ description={+ <div className="mt-2 flex flex-wrap items-center gap-2">+ <p className="text-muted-foreground text-sm tracking-wide">+ Started at <DateTimeTooltip date={firstUpdate?.date} />+ </p>+ {affectedMonitors.length > 0 ? (+ <>+ <span className="text-muted-foreground/50 text-xs">•</span>+ <div className="flex flex-wrap gap-2">+ {affectedMonitors.map((monitor) => (+ <Badge key={monitor.id} variant="secondary">+ {monitor.name}+ </Badge>+ ))}+ </div>+ </>+ ) : null}+ </div>+ }+ actions={<CopyLinkButton />}+ />+ <StatusReportUpdates updates={report.statusReportUpdates} />+ </div>+ );+}diff --git a/apps/web/src/app/status-page/[domain]/events/utils.tsx b/apps/web/src/app/status-page/[domain]/events/utils.tsxnew file mode 100644index 000000000..5355a84ba--- /dev/null+++ b/apps/web/src/app/status-page/[domain]/events/utils.tsx@@ -0,0 +1,5 @@+"use client";++export function formatter(value: string) {+ return <span className="capitalize">{value}</span>;+}diff --git a/apps/web/src/app/status-page/[domain]/incidents/[id]/page.tsx b/apps/web/src/app/status-page/[domain]/incidents/[id]/page.tsxindex 9916358c4..a990e429a 100644--- a/apps/web/src/app/status-page/[domain]/incidents/[id]/page.tsx+++ b/apps/web/src/app/status-page/[domain]/incidents/[id]/page.tsx@@ -1,43 +1,9 @@-import { notFound } from "next/navigation";--import { Header } from "@/components/dashboard/header";-import {- StatusReportDescription,- StatusReportUpdates,-} from "@/components/status-page/status-report";-import { api } from "@/trpc/server";-import { CopyLinkButton } from "./_components/copy-link-button";+import { redirect } from "next/navigation";export default async function IncidentPage({params,}: {params: { domain: string; id: string };}) {- const report = await api.statusReport.getPublicStatusReportById.query({- slug: params.domain,- id: Number(params.id),- });-- if (!report) return notFound();-- const affectedMonitors = report.monitorsToStatusReports.map(- ({ monitor }) => monitor,- );-- return (- <div className="grid gap-8 text-left">- <Header- title={report.title}- description={- <StatusReportDescription- report={report}- monitors={affectedMonitors}- className="mt-2"- />- }- actions={<CopyLinkButton />}- />- <StatusReportUpdates report={report} />- </div>- );+ redirect(`../events/report/${params.id}`);}diff --git a/apps/web/src/app/status-page/[domain]/incidents/page.tsx b/apps/web/src/app/status-page/[domain]/incidents/page.tsxindex a288a9377..c1f98cf1c 100644--- a/apps/web/src/app/status-page/[domain]/incidents/page.tsx+++ b/apps/web/src/app/status-page/[domain]/incidents/page.tsx@@ -1,31 +1,5 @@-import { notFound } from "next/navigation";+import { redirect } from "next/navigation";-import { Header } from "@/components/dashboard/header";-import { StatusReportList } from "@/components/status-page/status-report-list";-import { api } from "@/trpc/server";--type Props = {- params: { domain: string };- searchParams: { [key: string]: string | string[] | undefined };-};--export default async function Page({ params }: Props) {- if (!params.domain) return notFound();-- const page = await api.page.getPageBySlug.query({ slug: params.domain });- if (!page) return notFound();-- return (- <div className="grid gap-8">- <Header- title={page.title}- description={page.description}- className="text-left"- />- <StatusReportList- statusReports={page.statusReports}- monitors={page.monitors}- />- </div>- );+export default async function Page() {+ redirect("./events?filter=reports");}diff --git a/apps/web/src/app/status-page/[domain]/layout.tsx b/apps/web/src/app/status-page/[domain]/layout.tsxindex eb62e8339..18dfe57bc 100644--- a/apps/web/src/app/status-page/[domain]/layout.tsx+++ b/apps/web/src/app/status-page/[domain]/layout.tsx@@ -8,6 +8,7 @@ import {twitterMetadata,} from "@/app/shared-metadata";import { Shell } from "@/components/dashboard/shell";+import { getRequestHeaderTimezone } from "@/lib/timezone";import { api } from "@/trpc/server";import { Footer } from "./_components/footer";import { Header } from "./_components/header";@@ -21,6 +22,7 @@ type Props = {export default async function StatusPageLayout({ children, params }: Props) {const page = await api.page.getPageBySlug.query({ slug: params.domain });+ const timeZone = getRequestHeaderTimezone();if (!page) return notFound();@@ -33,22 +35,14 @@ export default async function StatusPageLayout({ children, params }: Props) {href: setPrefixUrl("/", params),},{- label: "Maintenances",- segment: "maintenances",- href: setPrefixUrl("/maintenances", params),- disabled: page.maintenances.length === 0,- },- {- label: "Incidents",- segment: "incidents",- href: setPrefixUrl("/incidents", params),+ label: "Events",+ segment: "events",+ href: setPrefixUrl("/events", params),},{label: "Monitors",segment: "monitors",href: setPrefixUrl("/monitors", params),- disabled:- page.monitors.filter((monitor) => Boolean(monitor.public)).length === 0,},];@@ -64,12 +58,14 @@ export default async function StatusPageLayout({ children, params }: Props) {}return (- <div className="mx-auto flex min-h-screen w-full max-w-3xl flex-col space-y-6 p-4 md:p-8">+ <div className="relative mx-auto flex min-h-screen w-full max-w-4xl flex-col space-y-6 p-4 md:p-8"><Header navigation={navigation} plan={plan} page={page} /><main className="flex h-full w-full flex-1 flex-col">- <Shell className="mx-auto h-full flex-1 px-4 py-4">{children}</Shell>+ <Shell className="mx-auto h-full flex-1 rounded-2xl px-4 py-4 md:p-8">+ {children}+ </Shell></main>- <Footer plan={plan} />+ <Footer plan={plan} timeZone={timeZone} /></div>);}diff --git a/apps/web/src/app/status-page/[domain]/maintenances/page.tsx b/apps/web/src/app/status-page/[domain]/maintenances/page.tsxindex 4751742e6..83c50ade6 100644--- a/apps/web/src/app/status-page/[domain]/maintenances/page.tsx+++ b/apps/web/src/app/status-page/[domain]/maintenances/page.tsx@@ -1,31 +1,5 @@-import { notFound } from "next/navigation";+import { redirect } from "next/navigation";-import { Header } from "@/components/dashboard/header";-import { MaintenanceList } from "@/components/status-page/maintenance-list";-import { api } from "@/trpc/server";--type Props = {- params: { domain: string };- searchParams: { [key: string]: string | string[] | undefined };-};--export default async function Page({ params }: Props) {- if (!params.domain) return notFound();-- const page = await api.page.getPageBySlug.query({ slug: params.domain });- if (!page) return notFound();-- return (- <div className="grid gap-8">- <Header- title={page.title}- description={page.description}- className="text-left"- />- <MaintenanceList- maintenances={page.maintenances}- monitors={page.monitors}- />- </div>- );+export default async function Page() {+ redirect("./events?filter=maintenances");}diff --git a/apps/web/src/app/status-page/[domain]/monitors/page.tsx b/apps/web/src/app/status-page/[domain]/monitors/page.tsxindex fe82e48a5..6820ed341 100644--- a/apps/web/src/app/status-page/[domain]/monitors/page.tsx+++ b/apps/web/src/app/status-page/[domain]/monitors/page.tsx@@ -6,6 +6,7 @@ import { z } from "zod";import { OSTinybird } from "@openstatus/tinybird";import { Button } from "@openstatus/ui";+import { EmptyState } from "@/components/dashboard/empty-state";import { Header } from "@/components/dashboard/header";import { SimpleChart } from "@/components/monitor-charts/simple-chart";import { groupDataByTimestamp } from "@/components/monitor-charts/utils";@@ -111,9 +112,11 @@ export default async function Page({</ul></div>) : (- <p className="text-center font-light text-muted-foreground text-sm">- No public monitor.- </p>+ <EmptyState+ icon="activity"+ title="No public monitors"+ description="No public monitors have been added to this page."+ />)}</div>);diff --git a/apps/web/src/app/status-page/[domain]/page.tsx b/apps/web/src/app/status-page/[domain]/page.tsxindex e5ffac604..a48d604bb 100644--- a/apps/web/src/app/status-page/[domain]/page.tsx+++ b/apps/web/src/app/status-page/[domain]/page.tsx@@ -1,14 +1,13 @@import { subDays } from "date-fns";import { notFound } from "next/navigation";-import { Separator } from "@openstatus/ui";-+import { EmptyState } from "@/components/dashboard/empty-state";import { Header } from "@/components/dashboard/header";-import { MaintenanceBanner } from "@/components/status-page/maintenance-banner";+import { Feed } from "@/components/status-page/feed";import { MonitorList } from "@/components/status-page/monitor-list";import { StatusCheck } from "@/components/status-page/status-check";-import { StatusReportList } from "@/components/status-page/status-report-list";import { api } from "@/trpc/server";+import { Separator } from "@openstatus/ui";type Props = {params: { domain: string };@@ -21,14 +20,18 @@ export default async function Page({ params }: Props) {const page = await api.page.getPageBySlug.query({ slug: params.domain });if (!page) return notFound();- const currentMaintenances = page.maintenances.filter(- (maintenance) =>- maintenance.to.getTime() > Date.now() &&- maintenance.from.getTime() < Date.now(),- );+ const lastMaintenances = page.maintenances.filter((maintenance) => {+ return maintenance.from.getTime() > subDays(new Date(), 7).getTime();+ });++ const lastStatusReports = page.statusReports.filter((report) => {+ return report.statusReportUpdates.some(+ (update) => update.date.getTime() > subDays(new Date(), 7).getTime(),+ );+ });return (- <div className="mx-auto flex w-full flex-col gap-8">+ <div className="mx-auto flex w-full flex-col gap-12"><Headertitle={page.title}description={page.description}@@ -39,34 +42,43 @@ export default async function Page({ params }: Props) {incidents={page.incidents}maintenances={page.maintenances}/>- {currentMaintenances.length ? (- <div className="grid w-full gap-3">- {currentMaintenances.map((maintenance) => (- <MaintenanceBanner key={maintenance.id} {...maintenance} />- ))}- </div>- ) : null}- <MonitorList- monitors={page.monitors}- statusReports={page.statusReports}- incidents={page.incidents}- maintenances={page.maintenances}- />- <Separator />- <div className="grid gap-6">- <div>- <h2 className="font-semibold text-xl">Last updates</h2>- <p className="text-muted-foreground text-sm">- Reports of the last 7 days or incidents that have not been resolved- yet.- </p>- </div>- <StatusReportList+ {page.monitors.length ? (+ <MonitorList+ monitors={page.monitors}statusReports={page.statusReports}+ incidents={page.incidents}+ maintenances={page.maintenances}+ />+ ) : (+ <EmptyState+ icon="activity"+ title="No monitors"+ description="The status page has no connected monitors."+ />+ )}+ <Separator />+ {lastStatusReports.length || lastMaintenances.length ? (+ <Feedmonitors={page.monitors}- filter={{ date: subDays(Date.now(), 7), open: true }}+ maintenances={lastMaintenances.filter((maintenance) => {+ return (+ maintenance.from.getTime() > subDays(new Date(), 7).getTime()+ );+ })}+ statusReports={lastStatusReports.filter((report) => {+ return report.statusReportUpdates.some(+ (update) =>+ update.date.getTime() > subDays(new Date(), 7).getTime(),+ );+ })}+ />+ ) : (+ <EmptyState+ icon="newspaper"+ title="No recent notices"+ description="There have been no reports within the last 7 days."/>- </div>+ )}</div>);}diff --git a/apps/web/src/app/status/utils.ts b/apps/web/src/app/status/utils.tsindex dfc998be5..c33c61401 100644--- a/apps/web/src/app/status/utils.ts+++ b/apps/web/src/app/status/utils.ts@@ -34,19 +34,19 @@ export type AtlassianDescriptionEnum = z.infer<typeof atlassianDescriptionEnum>;export function getClassname(status: ExternalStatus) {switch (status.status_description) {case "All Systems Operational":- return "text-green-500";+ return "text-status-operational";case "Major System Outage":- return "text-rose-500";+ return "text-status-down";case "Partial System Outage":- return "text-orange-500";+ return "text-status-degraded";case "Minor Service Outage":- return "text-amber-500";+ return "text-status-degraded";case "Degraded System Service":- return "text-amber-500";+ return "text-status-degraded";case "Partially Degraded Service":- return "text-amber-500";+ return "text-status-degraded";case "Service Under Maintenance":- return "text-blue-500";+ return "text-status-monitoring";default:return "text-gray-500";}diff --git a/apps/web/src/components/data-table/data-table-status-badge.tsx b/apps/web/src/components/data-table/data-table-status-badge.tsxindex c69dffc04..c11d68fdf 100644--- a/apps/web/src/components/data-table/data-table-status-badge.tsx+++ b/apps/web/src/components/data-table/data-table-status-badge.tsx@@ -9,14 +9,7 @@ export function DataTableStatusBadge({statusCode: Ping["statusCode"];}) {if (!statusCode) {- return (- <Badge- variant="outline"- className="border-rose-500/20 bg-rose-500/10 text-rose-800 dark:text-rose-300"- >- Error- </Badge>- );+ return <Badge variant="destructive">Error</Badge>;}return <StatusCodeBadge statusCode={statusCode} />;}diff --git a/apps/web/src/components/data-table/status-page/columns.tsx b/apps/web/src/components/data-table/status-page/columns.tsxindex 560a51694..62cd03083 100644--- a/apps/web/src/components/data-table/status-page/columns.tsx+++ b/apps/web/src/components/data-table/status-page/columns.tsx@@ -29,7 +29,7 @@ export const columns: ColumnDef<cell: ({ row }) => {return (<Link- href={`./status-pages/${row.original.id}/edit`}+ href={`./status-pages/${row.original.id}/reports`}className="group flex items-center gap-2"><span className="max-w-[125px] truncate group-hover:underline">diff --git a/apps/web/src/components/forms/monitor/section-limits.tsx b/apps/web/src/components/forms/monitor/section-limits.tsxindex 17611fc5e..bc7edb6d3 100644--- a/apps/web/src/components/forms/monitor/section-limits.tsx+++ b/apps/web/src/components/forms/monitor/section-limits.tsx@@ -60,7 +60,8 @@ export function SectionLimits({ form }: Props) {</Select><FormDescription>When the response time exceeds this limit, the monitor is will be- considered as <span className="text-amber-500">degraded</span>.+ considered as{" "}+ <span className="text-status-degraded">degraded</span>.</FormDescription><FormMessage /></FormItem>@@ -91,7 +92,7 @@ export function SectionLimits({ form }: Props) {</Select><FormDescription>When the response time exceeds this limit, the monitor is will be- considered as <span className="text-rose-500">failed</span>.+ considered as <span className="text-status-down">failed</span>.</FormDescription><FormMessage /></FormItem>diff --git a/apps/web/src/components/layout/header/user-nav.tsx b/apps/web/src/components/layout/header/user-nav.tsxindex a2651ea69..08677c610 100644--- a/apps/web/src/components/layout/header/user-nav.tsx+++ b/apps/web/src/components/layout/header/user-nav.tsx@@ -1,4 +1,5 @@import { signOut, useSession } from "next-auth/react";+import { useTheme } from "next-themes";import Link from "next/link";import { useParams } from "next/navigation";@@ -8,11 +9,16 @@ import {AvatarImage,Button,DropdownMenu,+ DropdownMenuCheckboxItem,DropdownMenuContent,DropdownMenuGroup,DropdownMenuItem,DropdownMenuLabel,+ DropdownMenuPortal,DropdownMenuSeparator,+ DropdownMenuSub,+ DropdownMenuSubContent,+ DropdownMenuSubTrigger,DropdownMenuTrigger,Skeleton,} from "@openstatus/ui";@@ -20,6 +26,7 @@ import {export function UserNav() {const session = useSession();const { workspaceSlug } = useParams<{ workspaceSlug: string }>();+ const { setTheme, theme } = useTheme();if (session.status !== "authenticated") {return <Skeleton className="h-8 w-8 rounded-full" />;@@ -41,7 +48,7 @@ export function UserNav() {</Avatar></Button></DropdownMenuTrigger>- <DropdownMenuContent className="w-56" align="end" forceMount>+ <DropdownMenuContent className="w-52" align="end" forceMount><DropdownMenuLabel className="font-normal"><div className="flex flex-col space-y-1"><p className="truncate font-medium text-sm leading-none">@@ -61,6 +68,27 @@ export function UserNav() {<DropdownMenuItem asChild><Link href={`/app/${workspaceSlug}/settings/user`}>Profile</Link></DropdownMenuItem>+ </DropdownMenuGroup>{" "}+ <DropdownMenuSeparator />+ <DropdownMenuGroup>+ <DropdownMenuSub>+ <DropdownMenuSubTrigger>Switch theme</DropdownMenuSubTrigger>+ <DropdownMenuPortal>+ <DropdownMenuSubContent>+ <DropdownMenuLabel>Appearance</DropdownMenuLabel>+ {["light", "dark", "system"].map((option) => (+ <DropdownMenuCheckboxItem+ key={option}+ checked={theme === option}+ onClick={() => setTheme(option)}+ className="capitalize"+ >+ {option}+ </DropdownMenuCheckboxItem>+ ))}+ </DropdownMenuSubContent>+ </DropdownMenuPortal>+ </DropdownMenuSub></DropdownMenuGroup><DropdownMenuSeparator /><DropdownMenuItem onClick={() => signOut()}>Log out</DropdownMenuItem>diff --git a/apps/web/src/components/marketing/monitor/card.tsx b/apps/web/src/components/marketing/monitor/card.tsxindex ed645c391..c39e52d76 100644--- a/apps/web/src/components/marketing/monitor/card.tsx+++ b/apps/web/src/components/marketing/monitor/card.tsx@@ -29,10 +29,13 @@ export function MonitoringCard() {// biome-ignore lint/suspicious/noArrayIndexKey: <explanation><CardFeature key={i} {...feature} />))}- <div className="order-first text-center md:order-none">- <Button asChild variant="outline" className="rounded-full">+ <div className="order-first flex items-center justify-center gap-2 text-center md:order-none">+ <Button variant="outline" className="rounded-full" asChild><Link href="/play/checker">Playground</Link></Button>+ <Button className="rounded-full" asChild>+ <Link href="/features/monitoring">Learn more</Link>+ </Button></div></CardFeatureContainer></CardContent>diff --git a/apps/web/src/components/marketing/pricing/enterprice-plan.tsx b/apps/web/src/components/marketing/pricing/enterprice-plan.tsxindex da2a72a29..7f1352c7c 100644--- a/apps/web/src/components/marketing/pricing/enterprice-plan.tsx+++ b/apps/web/src/components/marketing/pricing/enterprice-plan.tsx@@ -6,7 +6,7 @@ export function EnterpricePlan() {<div className="flex-1"><div className="flex items-end justify-between gap-4"><div>- <p className="mb-2 font-cal text-xl">Custom</p>+ <p className="mb-2 font-cal text-2xl">Custom</p><p className="text-muted-foreground">Want more regions? Want to host it on your own server? Wantsomething else? We can help you with that.@@ -15,7 +15,7 @@ export function EnterpricePlan() {</div></div><div>- <Button asChild>+ <Button className="rounded-full" asChild><ahref="https://cal.com/team/openstatus/30min"target="_blank"diff --git a/apps/web/src/components/marketing/status-page/tracker-example.tsx b/apps/web/src/components/marketing/status-page/tracker-example.tsxindex f8c13e239..4e4aa0b51 100644--- a/apps/web/src/components/marketing/status-page/tracker-example.tsx+++ b/apps/web/src/components/marketing/status-page/tracker-example.tsx@@ -17,8 +17,8 @@ export async function TrackerExample() {<ExampleTracker /></Suspense></div>- <Button asChild variant="outline" className="rounded-full">- <Link href="/play/status">Playground</Link>+ <Button className="rounded-full" asChild>+ <Link href="/features/status-page">Learn more</Link></Button></div>);diff --git a/apps/web/src/components/monitor-dashboard/search-params-preset.tsx b/apps/web/src/components/monitor-dashboard/search-params-preset.tsxindex 5d4caad9d..732faecb0 100644--- a/apps/web/src/components/monitor-dashboard/search-params-preset.tsx+++ b/apps/web/src/components/monitor-dashboard/search-params-preset.tsx@@ -13,6 +13,7 @@ import type { ReactNode } from "react";import { Icons } from "@/components/icons";import type { ValidIcon } from "@/components/icons";import useUpdateSearchParams from "@/hooks/use-update-search-params";+import { cn } from "@/lib/utils";export function SearchParamsPreset<T extends string>({disabled,@@ -22,6 +23,7 @@ export function SearchParamsPreset<T extends string>({icon,placeholder,formatter,+ className,}: {disabled?: boolean;defaultValue?: T;@@ -30,6 +32,7 @@ export function SearchParamsPreset<T extends string>({icon?: ValidIcon;placeholder?: string;formatter?(value: T): ReactNode;+ className?: string;}) {const router = useRouter();const pathname = usePathname();@@ -48,7 +51,9 @@ export function SearchParamsPreset<T extends string>({onValueChange={onSelect}disabled={disabled}>- <SelectTrigger className="w-[150px] bg-background text-left">+ <SelectTrigger+ className={cn("w-[150px] bg-background text-left", className)}+ ><span className="flex items-center gap-2">{Icon ? <Icon className="h-4 w-4" /> : null}<SelectValue placeholder={placeholder} />diff --git a/apps/web/src/components/monitor/status-dot.tsx b/apps/web/src/components/monitor/status-dot.tsxindex f8ffc4ce4..a27c620f6 100644--- a/apps/web/src/components/monitor/status-dot.tsx+++ b/apps/web/src/components/monitor/status-dot.tsx@@ -10,39 +10,39 @@ export function StatusDot({ active, status, maintenance }: StatusDotProps) {if (!active) {return (<span className="relative flex h-2 w-2">- <span className="absolute inline-flex h-2 w-2 rounded-full bg-orange-500" />+ <span className="absolute inline-flex h-2 w-2 rounded-full bg-muted-foreground/80" /></span>);}if (maintenance) {return (<span className="relative flex h-2 w-2">- <span className="absolute inline-flex h-full w-full animate-ping rounded-full bg-blue-500/80 opacity-75 duration-[2000ms]" />- <span className="relative inline-flex h-2 w-2 rounded-full bg-blue-500" />+ <span className="absolute inline-flex h-full w-full animate-ping rounded-full bg-status-monitoring/80 opacity-75 duration-[2000ms]" />+ <span className="relative inline-flex h-2 w-2 rounded-full bg-status-monitoring" /></span>);}if (status === "error") {return (<span className="relative flex h-2 w-2">- <span className="absolute inline-flex h-full w-full animate-ping rounded-full bg-red-500/80 opacity-75 duration-[2000ms]" />- <span className="absolute inline-flex h-2 w-2 rounded-full bg-red-500" />+ <span className="absolute inline-flex h-full w-full animate-ping rounded-full bg-status-down/80 opacity-75 duration-[2000ms]" />+ <span className="absolute inline-flex h-2 w-2 rounded-full bg-status-down" /></span>);}if (status === "degraded") {return (<span className="relative flex h-2 w-2">- <span className="absolute inline-flex h-full w-full animate-ping rounded-full bg-yellow-500/80 opacity-75 duration-[2000ms]" />- <span className="relative inline-flex h-2 w-2 rounded-full bg-yellow-500" />+ <span className="absolute inline-flex h-full w-full animate-ping rounded-full bg-status-degraded/80 opacity-75 duration-[2000ms]" />+ <span className="relative inline-flex h-2 w-2 rounded-full bg-status-degraded" /></span>);}return (<span className="relative flex h-2 w-2">- <span className="absolute inline-flex h-full w-full animate-ping rounded-full bg-green-500/80 opacity-75 duration-[2000ms]" />- <span className="relative inline-flex h-2 w-2 rounded-full bg-green-500" />+ <span className="absolute inline-flex h-full w-full animate-ping rounded-full bg-status-operational/80 opacity-75 duration-[2000ms]" />+ <span className="relative inline-flex h-2 w-2 rounded-full bg-status-operational" /></span>);}diff --git a/apps/web/src/components/status-page/datetime-tooltip.tsx b/apps/web/src/components/status-page/datetime-tooltip.tsxindex 4dce774ec..64c8a06a5 100644--- a/apps/web/src/components/status-page/datetime-tooltip.tsx+++ b/apps/web/src/components/status-page/datetime-tooltip.tsx@@ -17,6 +17,7 @@ export function DateTimeTooltip({}: {date?: Date;className?: string;+ // formatter?: (date: Date) => string;}) {const [open, setOpen] = useState(false);return (@@ -25,15 +26,14 @@ export function DateTimeTooltip({<TooltipTriggeronClick={() => setOpen(false)}className={cn(- "text-muted-foreground underline decoration-muted-foreground/30 decoration-dashed underline-offset-4",+ "font-mono text-muted-foreground underline decoration-muted-foreground/30 decoration-dashed underline-offset-4",className,)}- asChild>- <span>{formatInTimeZone(date, "UTC", "LLL dd, y HH:mm (z)")}</span>+ {formatInTimeZone(date, "UTC", "LLL dd, y HH:mm (z)")}</TooltipTrigger><TooltipContent>- <p className="text-muted-foreground text-xs">+ <p className="font-mono text-muted-foreground text-xs">{format(date, "LLL dd, y HH:mm (z)")}</p></TooltipContent>diff --git a/apps/web/src/components/status-page/day-header.tsx b/apps/web/src/components/status-page/day-header.tsxnew file mode 100644index 000000000..2dabbc138--- /dev/null+++ b/apps/web/src/components/status-page/day-header.tsx@@ -0,0 +1,17 @@+import { Badge, Separator } from "@openstatus/ui";+import { format } from "date-fns";++export function DayHeader({ date }: { date: Date }) {+ const isInFuture = date.getTime() > new Date().getTime();+ return (+ <div className="grid gap-2">+ <div className="flex items-center justify-between">+ <p className="font-mono text-muted-foreground text-sm">+ {format(date, "LLL dd, y")}+ </p>+ {isInFuture ? <Badge>Coming up</Badge> : null}+ </div>+ <Separator />+ </div>+ );+}diff --git a/apps/web/src/components/status-page/feed.tsx b/apps/web/src/components/status-page/feed.tsxnew file mode 100644index 000000000..4cdbd4fba--- /dev/null+++ b/apps/web/src/components/status-page/feed.tsx@@ -0,0 +1,149 @@+import { notEmpty } from "@/lib/utils";+import type {+ Maintenance,+ PublicMonitor,+ StatusReportWithUpdates,+} from "@openstatus/db/src/schema";+import { EmptyState } from "../dashboard/empty-state";+import { DayHeader } from "./day-header";+import { MaintenanceContainer } from "./maintenance";+import { StatusReport } from "./status-report";++function isMaintenanceType(value: unknown): value is Maintenance {+ return (value as Maintenance).from !== undefined;+}++function isStatusReportType(value: unknown): value is StatusReportWithUpdates {+ return (value as StatusReportWithUpdates).statusReportUpdates !== undefined;+}++export function Feed({+ maintenances,+ monitors,+ statusReports,+}: {+ maintenances: Maintenance[];+ statusReports: StatusReportWithUpdates[];+ monitors: PublicMonitor[];+}) {+ if ([...maintenances, ...statusReports].length === 0) {+ return (+ <EmptyState icon="newspaper" title="No entries found." description="" />+ );+ }++ function groupByDay(+ maintenances: Maintenance[],+ statusReports: StatusReportWithUpdates[],+ ) {+ const grouped = [...maintenances, ...statusReports].reduce(+ (acc, element) => {+ const isMaintenance = isMaintenanceType(element);+ const isStatusReport = isStatusReportType(element);++ if (isMaintenance) {+ const date = new Date(element.from.toDateString()).getTime();++ const exists = acc.find((item) => item.timestamp === date);++ if (exists) {+ exists.list.push({ type: "maintenance", value: element });+ } else {+ acc.push({+ timestamp: date,+ list: [{ type: "maintenance", value: element }],+ });+ }+ }++ if (isStatusReport) {+ const firstUpdate = element.statusReportUpdates[0]; // make sure we get the correct order from backend query!+ const date = (+ firstUpdate+ ? new Date(firstUpdate?.date.toDateString())+ : new Date(new Date().toDateString())+ ).getTime();++ const exists = acc.find((item) => item.timestamp === date);++ if (exists) {+ exists.list.push({ type: "report", value: element });+ } else {+ acc.push({+ timestamp: date,+ list: [{ type: "report", value: element }],+ });+ }+ }++ return acc;+ },+ [] as {+ timestamp: number;+ list: (+ | {+ type: "maintenance";+ value: Maintenance;+ }+ | {+ type: "report";+ value: StatusReportWithUpdates;+ }+ )[];+ }[],+ );++ grouped.sort((a, b) => b.timestamp - a.timestamp);++ return grouped;+ }++ return (+ <div className="grid gap-8">+ {groupByDay(maintenances, statusReports).map((group) => {+ return (+ <div key={group.timestamp} className="grid gap-4">+ <DayHeader date={new Date(group.timestamp)} />+ {group.list.map((item, _i) => {+ if (item.type === "maintenance") {+ const affectedMonitors = item.value.monitors+ ?.map((monitorId) => {+ const monitor = monitors.find(({ id }) => monitorId === id);+ return monitor || undefined;+ })+ .filter(notEmpty);++ return (+ <MaintenanceContainer+ key={item.value.id}+ maintenance={item.value}+ monitors={affectedMonitors || []}+ className="rounded-lg border-status-monitoring/10 bg-status-monitoring/5"+ />+ );+ }+ if (item.type === "report") {+ const affectedMonitors = item.value.monitorsToStatusReports+ .map(({ monitorId }) => {+ const monitor = monitors.find(({ id }) => monitorId === id);+ return monitor || undefined;+ })+ .filter(notEmpty);++ return (+ <div key={item.value.id} className="grid gap-6">+ <StatusReport+ monitors={affectedMonitors}+ report={item.value}+ />+ </div>+ );+ }+ return null;+ })}+ </div>+ );+ })}+ </div>+ );+}diff --git a/apps/web/src/components/status-page/maintenance-banner.tsx b/apps/web/src/components/status-page/maintenance-banner.tsxdeleted file mode 100644index 68a31baa8..000000000--- a/apps/web/src/components/status-page/maintenance-banner.tsx+++ /dev/null@@ -1,21 +0,0 @@-import { format, isSameDay } from "date-fns";-import { Hammer } from "lucide-react";--import type { Maintenance } from "@openstatus/db/src/schema";-import { Alert, AlertDescription, AlertTitle } from "@openstatus/ui";--export function MaintenanceBanner(props: Maintenance) {- return (- <Alert className="border-blue-500/20 bg-blue-500/10">- <Hammer className="h-4 w-4" />- <AlertTitle>{props.title}</AlertTitle>- <AlertDescription>{props.message}</AlertDescription>- <AlertDescription className="mt-2 font-mono">- {format(props.from, "LLL dd, y HH:mm")} -{" "}- {isSameDay(props.from, props.to)- ? format(props.to, "HH:mm")- : format(props.to, "LLL dd, y HH:mm")}- </AlertDescription>- </Alert>- );-}diff --git a/apps/web/src/components/status-page/maintenance-list.tsx b/apps/web/src/components/status-page/maintenance-list.tsxdeleted file mode 100644index 940b14be8..000000000--- a/apps/web/src/components/status-page/maintenance-list.tsx+++ /dev/null@@ -1,62 +0,0 @@-import { notEmpty } from "@/lib/utils";-import type { Maintenance, PublicMonitor } from "@openstatus/db/src/schema";-import { Badge } from "@openstatus/ui";-import { format, isSameDay } from "date-fns";--export function MaintenanceList({- maintenances,- monitors,-}: {- maintenances: Maintenance[];- monitors: PublicMonitor[];-}) {- if (!maintenances.length) {- return <EmptyState />;- }-- return (- <ul className="grid gap-6">- {maintenances.map((maintenance) => {- const maintenanceMonitors = maintenance.monitors- ?.map((id) => {- return monitors.find((monitor) => monitor.id === id);- })- .filter(notEmpty);- return (- <li key={maintenance.id} className="grid gap-3">- <div>- <h3 className="font-semibold text-xl">{maintenance.title}</h3>- <div className="flex flex-wrap items-center gap-2">- <span className="font-mono text-muted-foreground text-sm">- {format(maintenance.from, "LLL dd, y HH:mm")} -{" "}- {isSameDay(maintenance.from, maintenance.to)- ? format(maintenance.to, "HH:mm")- : format(maintenance.to, "LLL dd, y HH:mm")}- </span>- {maintenanceMonitors?.length ? (- <>- <span className="text-muted-foreground/50 text-xs">•</span>- {maintenanceMonitors.map((monitor) => (- <Badge key={monitor.id} variant="secondary">- {monitor.name}- </Badge>- ))}- </>- ) : null}- </div>- </div>- <p>{maintenance.message}</p>- </li>- );- })}- </ul>- );-}--function EmptyState() {- return (- <p className="text-center font-light text-muted-foreground text-sm">- No maintenances reported.- </p>- );-}diff --git a/apps/web/src/components/status-page/maintenance.tsx b/apps/web/src/components/status-page/maintenance.tsxnew file mode 100644index 000000000..95b6f8369--- /dev/null+++ b/apps/web/src/components/status-page/maintenance.tsx@@ -0,0 +1,38 @@+import { cn } from "@/lib/utils";+import type { Maintenance, PublicMonitor } from "@openstatus/db/src/schema";+import { DateTimeTooltip } from "./datetime-tooltip";+import { StatusReportHeader, StatusReportUpdates } from "./status-report";++export function MaintenanceContainer({+ maintenance,+ monitors,+ className,+}: {+ maintenance: Maintenance;+ monitors: PublicMonitor[];+ className?: string;+}) {+ return (+ <div className={cn("grid gap-4 border border-transparent p-3", className)}>+ <StatusReportHeader+ title={maintenance.title}+ monitors={monitors || []}+ actions={+ <p className="font-mono text-muted-foreground text-xs">+ <DateTimeTooltip date={maintenance.from} /> -{" "}+ <DateTimeTooltip date={maintenance.to} />+ </p>+ }+ />+ <StatusReportUpdates+ updates={[+ {+ message: maintenance.message,+ id: maintenance.id,+ status: "maintenance",+ },+ ]}+ />+ </div>+ );+}diff --git a/apps/web/src/components/status-page/status-check.tsx b/apps/web/src/components/status-page/status-check.tsxindex 145d1a4a6..0870de347 100644--- a/apps/web/src/components/status-page/status-check.tsx+++ b/apps/web/src/components/status-page/status-check.tsx@@ -24,16 +24,17 @@ export async function StatusCheck({const details = tracker.currentDetails;return (- <div className="flex flex-col items-center gap-3">- <div className="flex items-center gap-3">+ <div+ className={cn(+ "flex items-center gap-3 rounded-lg border p-3",+ containerClassName(details.variant),+ )}+ >+ <span className={cn("rounded-full border p-1.5", className)}>+ <StatusIcon variant={details.variant} />+ </span>+ <div className="flex w-full flex-wrap items-center justify-between gap-1"><h2 className="font-semibold text-xl">{details.long}</h2>- <span className={cn("rounded-full border p-1.5", className)}>- <StatusIcon variant={details.variant} />- </span>- </div>- <div className="flex flex-wrap gap-2">- <p className="text-muted-foreground text-xs">Status Check</p>- <span className="text-muted-foreground/50 text-xs">•</span>{" "}<p className="text-xs"><DateTimeTooltip date={new Date()} /></p>@@ -42,6 +43,16 @@ export async function StatusCheck({);}+function containerClassName(variant: StatusVariant) {+ if (variant === "incident") return "bg-status-down/10 border-status-down/20";+ if (variant === "maintenance")+ return "bg-status-monitoring/10 border-status-monitoring/20";+ if (variant === "degraded")+ return "bg-status-degraded/10 border-status-degraded/20";+ if (variant === "down") return "bg-status-down/10 border-status-down/20";+ return "bg-status-operational/10 border-status-operational/20";+}+export function StatusIcon({ variant }: { variant: StatusVariant }) {if (variant === "incident") {const AlertTriangleIcon = Icons["alert-triangle"];diff --git a/apps/web/src/components/status-page/status-report-list.tsx b/apps/web/src/components/status-page/status-report-list.tsxdeleted file mode 100644index fc8612c3a..000000000--- a/apps/web/src/components/status-page/status-report-list.tsx+++ /dev/null@@ -1,69 +0,0 @@-"use client";--import type {- PublicMonitor,- StatusReportWithUpdates,-} from "@openstatus/db/src/schema";-import { Separator } from "@openstatus/ui";--import { notEmpty } from "@/lib/utils";-import { StatusReport } from "./status-report";--export const StatusReportList = ({- statusReports,- monitors,- filter,-}: {- statusReports: StatusReportWithUpdates[];- monitors: PublicMonitor[];- filter?: { date: Date; open?: boolean };-}) => {- function getFilteredReports() {- if (!filter?.date) return statusReports;- return statusReports.filter((report) => {- if (filter.open && report.status !== "resolved") return true;- return report.statusReportUpdates.some(- (update) => update.date.getTime() > filter?.date?.getTime(),- );- });- }-- const reports = getFilteredReports().sort((a, b) => {- if (a.updatedAt === undefined || a.updatedAt === null) return 1;- if (b?.updatedAt === undefined || b.updatedAt === null) return -1;- return b.updatedAt.getTime() - a.updatedAt.getTime();- });-- if (!reports.length) {- return <EmptyState />;- }-- return (- <div className="grid gap-8">- {reports.map((report, i) => {- const affectedMonitors = report.monitorsToStatusReports- .map(({ monitorId }) => {- const monitor = monitors.find(({ id }) => monitorId === id);- return monitor || undefined;- })- .filter(notEmpty);- const isLast = reports.length - 1 === i;-- return (- <div key={report.id} className="grid gap-6">- <StatusReport monitors={affectedMonitors} report={report} />- {!isLast ? <Separator /> : null}- </div>- );- })}- </div>- );-};--function EmptyState() {- return (- <p className="text-center font-light text-muted-foreground text-sm">- No incident reported.- </p>- );-}diff --git a/apps/web/src/components/status-page/status-report.tsx b/apps/web/src/components/status-page/status-report.tsxindex 85056b229..b835492e0 100644--- a/apps/web/src/components/status-page/status-report.tsx+++ b/apps/web/src/components/status-page/status-report.tsx@@ -3,109 +3,140 @@import { ChevronRight } from "lucide-react";import Link from "next/link";import { useParams } from "next/navigation";-import { Fragment } from "react";import type {PublicMonitor,StatusReportWithUpdates,} from "@openstatus/db/src/schema";-import { Badge, Button } from "@openstatus/ui";+import { Badge } from "@openstatus/ui";import { setPrefixUrl } from "@/app/status-page/[domain]/utils";+import { statusDict } from "@/data/incidents-dictionary";import { cn } from "@/lib/utils";-import { StatusBadge } from "../status-update/status-badge";+import { Icons } from "../icons";import { DateTimeTooltip } from "./datetime-tooltip";import { ProcessMessage } from "./process-message";function StatusReport({report,monitors,+ actions,+ isDemo,}: {report: StatusReportWithUpdates;monitors: PublicMonitor[];+ actions?: React.ReactNode;+ isDemo?: boolean;}) {- return (- <div className="group grid gap-4">- <div className="grid gap-1">- <StatusReportHeader {...{ report }} />- <StatusReportDescription {...{ report, monitors }} />+ const params = useParams<{ domain: string }>();++ if (isDemo) {+ return (+ <div className="group grid gap-4 rounded-lg border border-transparent p-3 hover:border-border hover:bg-muted/20">+ <StatusReportHeader title={report.title} {...{ monitors, actions }} />+ <StatusReportUpdates updates={report.statusReportUpdates} /></div>- <StatusReportUpdates {...{ report }} />- </div>- );-}+ );+ }-function StatusReportHeader({ report }: { report: StatusReportWithUpdates }) {- const params = useParams<{ domain: string }>();return (- <div className="flex items-center gap-2">- <h3 className="font-semibold text-xl">{report.title}</h3>- {report.id ? (- <Button- variant="ghost"- size="icon"- className="text-muted-foreground/50 group-hover:text-foreground"- asChild- >- <Link href={setPrefixUrl(`/incidents/${report.id}`, params)}>- <ChevronRight className="h-4 w-4" />- </Link>- </Button>- ) : null}- </div>+ <Link href={setPrefixUrl(`/events/report/${report.id}`, params)}>+ <div className="group grid gap-4 rounded-lg border border-transparent p-3 hover:border-border hover:bg-muted/20">+ <StatusReportHeader title={report.title} {...{ monitors, actions }} />+ <StatusReportUpdates updates={report.statusReportUpdates} />+ </div>+ </Link>);}-function StatusReportDescription({- report,+// REMINDER: we had the report?.id in the link href to features page to be clickable+function StatusReportHeader({+ title,monitors,- className,+ actions,}: {- report: StatusReportWithUpdates;+ title: StatusReportWithUpdates["title"];monitors: PublicMonitor[];- className?: string;+ actions?: React.ReactNode;}) {- const firstReport =- report.statusReportUpdates[report.statusReportUpdates.length - 1];-return (- <div className={cn("flex flex-wrap items-center gap-2", className)}>- <p className="text-muted-foreground text-sm">- Started at <DateTimeTooltip date={firstReport.date} />- </p>- <span className="text-muted-foreground/50 text-xs">•</span>- <StatusBadge status={report.status} />- {monitors.length > 0 ? (- <>- <span className="text-muted-foreground/50 text-xs">•</span>+ <div className="flex flex-wrap items-center justify-between gap-2">+ <div className="flex flex-wrap items-center gap-2">+ <h3 className="font-semibold text-xl">{title}</h3>+ <ul className="flex flex-wrap gap-2">{monitors.map((monitor) => (- <Badge key={monitor.id} variant="secondary">- {monitor.name}- </Badge>+ <li key={monitor.id}>+ <Badge variant="secondary">{monitor.name}</Badge>+ </li>))}- </>- ) : null}+ </ul>+ </div>+ <div>+ {/* NOT IDEAL BUT IT WORKS */}+ {actions ? (+ actions+ ) : (+ <ChevronRight className="h-4 w-4 text-muted-foreground group-hover:text-foreground" />+ )}+ </div></div>);}-// reports are already `orderBy: desc(report.date)` within the query itself-function StatusReportUpdates({ report }: { report: StatusReportWithUpdates }) {+interface StatusReportUpdatesProps {+ updates: {+ date?: Date;+ id: number;+ status:+ | "investigating"+ | "identified"+ | "monitoring"+ | "resolved"+ | "maintenance";+ message: string;+ }[];+}++function StatusReportUpdates({ updates }: StatusReportUpdatesProps) {return (- <div className="grid gap-2 md:grid-cols-10 md:gap-4">- {report.statusReportUpdates.map((update) => {+ <div className="grid gap-4">+ {updates.map((update, i) => {+ const { icon, label, color } = statusDict[update.status];+ const StatusIcon = Icons[icon];return (- <Fragment key={update.id}>- <div className="flex items-center gap-2 md:col-span-3 md:flex-col md:items-start md:gap-1">- <p className="font-medium capitalize">{update.status}</p>- <p className="font-mono text-muted-foreground text-sm md:text-xs">- <DateTimeTooltip date={update.date} />- </p>+ <div+ key={update.id}+ className={cn(+ "group -m-2 relative flex gap-4 border border-transparent p-2",+ )}+ >+ <div className="relative">+ <div+ className={cn(+ "rounded-full border border-border bg-background p-2",+ i === 0 ? color : null,+ )}+ >+ <StatusIcon className="h-4 w-4" />+ </div>+ {i !== updates.length - 1 ? (+ <div className="absolute inset-x-0 mx-auto h-full w-[2px] bg-muted" />+ ) : null}</div>- <div className="prose dark:prose-invert md:col-span-7">- <ProcessMessage value={update.message} />+ <div className="mt-2 grid flex-1 gap-1">+ <div className="flex items-center justify-between gap-2">+ <p className="font-medium text-sm">{label}</p>+ {update.date ? (+ <p className="mt-px text-muted-foreground text-xs">+ <DateTimeTooltip date={new Date(update.date)} />+ </p>+ ) : null}+ </div>+ <div className="prose dark:prose-invert">+ <ProcessMessage value={update.message} />+ </div></div>- </Fragment>+ </div>);})}</div>@@ -113,12 +144,6 @@ function StatusReportUpdates({ report }: { report: StatusReportWithUpdates }) {}StatusReport.Header = StatusReportHeader;-StatusReport.Description = StatusReportDescription;StatusReport.Updates = StatusReportUpdates;-export {- StatusReport,- StatusReportDescription,- StatusReportHeader,- StatusReportUpdates,-};+export { StatusReport, StatusReportHeader, StatusReportUpdates };diff --git a/apps/web/src/components/status-update/status-badge.tsx b/apps/web/src/components/status-update/status-badge.tsxindex 34b9bad25..36d08d191 100644--- a/apps/web/src/components/status-update/status-badge.tsx+++ b/apps/web/src/components/status-update/status-badge.tsx@@ -5,13 +5,6 @@ import { statusDict } from "@/data/incidents-dictionary";import { cn } from "@/lib/utils";import { Icons } from "../icons";-const variant = {- investigating: "border-rose-500/20 bg-rose-500/10 text-rose-500",- identified: "border-amber-500/20 bg-amber-500/10 text-amber-500",- monitoring: "border-blue-500/20 bg-blue-500/10 text-blue-500",- resolved: "border-green-500/20 bg-green-500/10 text-green-500",-} satisfies Record<StatusReport["status"], string>;-export function StatusBadge({status,className,@@ -19,13 +12,10 @@ export function StatusBadge({status: StatusReport["status"];className?: string;}) {- const { label, icon } = statusDict[status];+ const { label, icon, color } = statusDict[status];const Icon = Icons[icon];return (- <Badge- variant="outline"- className={cn("font-normal", variant[status], className)}- >+ <Badge variant="outline" className={cn("font-normal", color, className)}><Icon className="mr-1 h-3 w-3" />{label}</Badge>diff --git a/apps/web/src/components/tracker/tracker.tsx b/apps/web/src/components/tracker/tracker.tsxindex 6905ed5c5..1f3bcee2a 100644--- a/apps/web/src/components/tracker/tracker.tsx+++ b/apps/web/src/components/tracker/tracker.tsx@@ -35,18 +35,18 @@ import { cn } from "@/lib/utils";const tracker = cva("h-10 rounded-full flex-1", {variants: {variant: {- blacklist: "bg-green-500/80 data-[state=open]:bg-green-500",+ blacklist:+ "bg-status-operational/80 data-[state=open]:bg-status-operational",...classNames,},report: {- 0: "",- // IDEA: data-[state=open]:from-40% data-[state=open]:to-40%- 30: "bg-gradient-to-t from-blue-500/90 hover:from-blue-500 from-30% to-transparent to-30%",+ false: "",+ true: classNames.degraded,},},defaultVariants: {variant: "empty",- report: 0,+ report: false,},});@@ -132,7 +132,7 @@ export const Bar = ({const [open, setOpen] = React.useState(false);const rootClassName = tracker({- report: statusReports && statusReports.length > 0 ? 30 : undefined,+ report: statusReports.length > 0,variant: blacklist ? "blacklist" : variant,});@@ -167,10 +167,12 @@ export const Bar = ({</div><div className="flex justify-between gap-8 font-light text-muted-foreground text-xs"><p>- <code className="text-green-500">{count}</code> requests+ <code className="text-status-operational">{count}</code>{" "}+ requests</p><p>- <code className="text-red-500">{count - ok}</code> failed+ <code className="text-status-down">{count - ok}</code>{" "}+ failed</p></div></div>@@ -201,11 +203,11 @@ export function StatusReportList({ reports }: { reports: StatusReport[] }) {<li key={report.id} className="text-muted-foreground text-sm"><Link// TODO: include setPrefixUrl for local development- href={`./incidents/${report.id}`}+ href={`./events/report/${report.id}`}className="group flex items-center justify-between gap-2 hover:text-foreground"><span className="truncate">{report.title}</span>- <ChevronRight className="h-4 w-4" />+ <ChevronRight className="h-4 w-4 shrink-0" /></Link></li>))}@@ -247,7 +249,7 @@ export function DowntimeText({return (<p className="text-muted-foreground text-xs">- Down for{" "}+ Downtime for{" "}{formatDuration({ minutes, hours, days },{ format: ["days", "hours", "minutes", "seconds"], zero: false },diff --git a/apps/web/src/content/changelog/status-page-colors-and-more.mdx b/apps/web/src/content/changelog/status-page-colors-and-more.mdxnew file mode 100644index 000000000..e090df78b--- /dev/null+++ b/apps/web/src/content/changelog/status-page-colors-and-more.mdx@@ -0,0 +1,12 @@+---+title: Status Page rework+description: New status specific colors, improved navigation and more.+publishedAt: 2024-07-21+image: /assets/changelog/status-page-colors-and-more.png+---++We have reworked our status page!++- **less flashy colors** for _operational_, _degraded_, _downtime_ and _maintenance_+- **new sticky navigation** bar, merging _maintenances_ and _incidents_ into an _events_ page (your old links will still work)+- redesign of **status reports**\ No newline at end of filediff --git a/apps/web/src/data/incidents-dictionary.ts b/apps/web/src/data/incidents-dictionary.tsindex c6d3ceb0c..d51ef8e25 100644--- a/apps/web/src/data/incidents-dictionary.ts+++ b/apps/web/src/data/incidents-dictionary.ts@@ -3,24 +3,40 @@ export const statusDict = {value: "investigating",label: "Investigating",icon: "search",+ color: "border-status-down/20 bg-status-down/10 text-status-down",order: 1,},identified: {value: "identified",label: "Identified",icon: "fingerprint",+ color:+ "border-status-degraded/20 bg-status-degraded/10 text-status-degraded",order: 2,},monitoring: {value: "monitoring",label: "Monitoring",icon: "activity",+ color:+ "border-status-monitoring/20 bg-status-monitoring/10 text-status-monitoring",order: 3,},resolved: {value: "resolved",label: "Resolved",icon: "search-check",+ color:+ "border-status-operational/20 bg-status-operational/10 text-status-operational",order: 4,},+ // FIXME: check source of thruth+ maintenance: {+ value: "maintenance",+ label: "Maintenance",+ icon: "hammer",+ color:+ "border-status-monitoring/20 bg-status-monitoring/10 text-status-monitoring",+ order: 0,+ },} as const;diff --git a/apps/web/src/styles/globals.css b/apps/web/src/styles/globals.cssindex 31bd52034..6b884836e 100644--- a/apps/web/src/styles/globals.css+++ b/apps/web/src/styles/globals.css@@ -34,6 +34,12 @@--ring: 215 20.2% 65.1%;--radius: 0.5rem;++ /* Status Tracker Colors - Radix Color */+ --status-degraded: 26 100% 56%; /* Orange 10 */+ --status-operational: 131 39% 51%; /* Grass 10 */+ --status-down: 11 82% 59%; /* Tomato 10 */+ --status-monitoring: 210 100% 62%; /* Blue 10 */}.dark {@@ -65,6 +71,12 @@--destructive-foreground: 0 85.7% 97.3%;--ring: 217.2 32.6% 17.5%;++ /* Status Tracker Colors - Radix Color */+ --status-degraded: 26 100% 56%; /* Orange 10 */+ --status-operational: 131 39% 51%; /* Grass 10 */+ --status-down: 11 82% 59%; /* Tomato 10 */+ --status-monitoring: 210 100% 62%; /* Blue 10 */}}diff --git a/apps/web/tailwind.config.ts b/apps/web/tailwind.config.tsindex fceea32e2..a9cf64916 100644--- a/apps/web/tailwind.config.ts+++ b/apps/web/tailwind.config.ts@@ -69,6 +69,21 @@ module.exports = {DEFAULT: "hsl(var(--card))",foreground: "hsl(var(--card-foreground))",},+ /* Status Tracker */+ status: {+ operational: {+ DEFAULT: "hsl(var(--status-operational))",+ },+ degraded: {+ DEFAULT: "hsl(var(--status-degraded))",+ },+ down: {+ DEFAULT: "hsl(var(--status-down))",+ },+ monitoring: {+ DEFAULT: "hsl(var(--status-monitoring))",+ },+ },/* Tremor */// light modetremor: {diff --git a/packages/api/src/router/page.ts b/packages/api/src/router/page.tsindex 0265ba85d..48623e04a 100644--- a/packages/api/src/router/page.ts+++ b/packages/api/src/router/page.ts@@ -269,33 +269,15 @@ export const pageRouter = createTRPCRouter({({ monitors_to_pages }) => monitors_to_pages.monitorId,);- const monitorsToStatusReportResult =- monitorsId.length > 0- ? await opts.ctx.db- .select()- .from(monitorsToStatusReport)- .where(inArray(monitorsToStatusReport.monitorId, monitorsId))- .all()- : [];-- const monitorStatusReportIds = monitorsToStatusReportResult.map(- ({ statusReportId }) => statusReportId,- );-- const statusReportIds = Array.from(new Set([...monitorStatusReportIds]));-- const statusReports =- statusReportIds.length > 0- ? await opts.ctx.db.query.statusReport.findMany({- where: eq(statusReport.pageId, result.id),- with: {- statusReportUpdates: {- orderBy: (reports, { desc }) => desc(reports.date),- },- monitorsToStatusReports: { with: { monitor: true } },- },- })- : [];+ const statusReports = await opts.ctx.db.query.statusReport.findMany({+ where: eq(statusReport.pageId, result.id),+ with: {+ statusReportUpdates: {+ orderBy: (reports, { desc }) => desc(reports.date),+ },+ monitorsToStatusReports: { with: { monitor: true } },+ },+ });// TODO: monitorsToPagesResult has the result already, no need to query againconst monitors =diff --git a/packages/tracker/src/config.ts b/packages/tracker/src/config.tsindex 2b3f8685a..9e6a887c5 100644--- a/packages/tracker/src/config.ts+++ b/packages/tracker/src/config.ts@@ -41,10 +41,13 @@ export const statusDetails: Record<Status, StatusDetails> = {// REMINDER: add `@openstatus/tracker/src/**/*.ts into tailwindcss content prop */export const classNames: Record<StatusVariant, string> = {- up: "bg-green-500/90 data-[state=open]:bg-green-500 border-green-500",- degraded: "bg-amber-500/90 data-[state=open]:bg-amber-500 border-amber-500",- down: "bg-red-500/90 data-[state=open]:bg-red-500 border-red-500",+ up: "bg-status-operational/90 data-[state=open]:bg-status-operational border-status-operational",+ degraded:+ "bg-status-degraded/90 data-[state=open]:bg-status-degraded border-status-degraded",+ down: "bg-status-down/90 data-[state=open]:bg-status-down border-status-down",empty: "bg-muted-foreground/20 data-[state=open]:bg-muted-foreground/30",- incident: "bg-red-500/90 data-[state=open]:bg-red-500 border-red-500",- maintenance: "bg-blue-500/90 data-[state=open]:bg-blue-500 border-blue-500",+ incident:+ "bg-status-down/90 data-[state=open]:bg-status-down border-status-down",+ maintenance:+ "bg-status-monitoring/90 data-[state=open]:bg-status-monitoring border-status-monitoring",};diff --git a/packages/tracker/src/tracker.ts b/packages/tracker/src/tracker.tsindex f3ccc1f6b..6384bd7f7 100644--- a/packages/tracker/src/tracker.ts+++ b/packages/tracker/src/tracker.ts@@ -187,14 +187,21 @@ export class Tracker {const isMissingData = props.count === 0;- // FIXME:+ /**+ * 1. Maintenance+ * 2. Status Reports (Degraded Performance)+ * 3. Incidents+ * 4. Uptime Status (Operational, Degraded Performance, Partial Outage, Major Outage)+ */const status = maintenances.length? Status.UnderMaintenance- : incidents.length- ? Status.Incident- : isMissingData- ? Status.Unknown- : this.calculateUptimeStatus([props]);+ : statusReports.length+ ? Status.DegradedPerformance+ : incidents.length+ ? Status.Incident+ : isMissingData+ ? Status.Unknown+ : this.calculateUptimeStatus([props]);const variant = statusDetails[status].variant;const label = statusDetails[status].short;