Skip to content

Open-source status page, incident response and uptime monitoring

chore(status-page): style updates (#1438)

Maximilian Kaske89c4e8f6b21a
diff --git a/apps/status-page/src/app/(public)/layout.tsx b/apps/status-page/src/app/(public)/layout.tsx
index 90fc15fd7..49369e003 100644
--- a/apps/status-page/src/app/(public)/layout.tsx
+++ b/apps/status-page/src/app/(public)/layout.tsx
@@ -1,5 +1,5 @@
import { Link } from "@/components/common/link";
-import { ThemeProvider } from "@/components/theme-provider";
+import { ThemeProvider } from "@/components/themes/theme-provider";
import { Toaster } from "@/components/ui/sonner";
import type { Metadata } from "next";
import PlausibleProvider from "next-plausible";
diff --git a/apps/status-page/src/app/(status-page)/[domain]/(public)/events/(list)/page.tsx b/apps/status-page/src/app/(status-page)/[domain]/(public)/events/(list)/page.tsx
index ea821ebd7..dd832538c 100644
--- a/apps/status-page/src/app/(status-page)/[domain]/(public)/events/(list)/page.tsx
+++ b/apps/status-page/src/app/(status-page)/[domain]/(public)/events/(list)/page.tsx
@@ -10,16 +10,17 @@ import {
import {
StatusEvent,
StatusEventAffected,
+ StatusEventAffectedBadge,
StatusEventAside,
StatusEventContent,
+ StatusEventDate,
+ StatusEventGroup,
StatusEventTimelineMaintenance,
StatusEventTimelineReport,
StatusEventTitle,
StatusEventTitleCheck,
} from "@/components/status-page/status-events";
-import { Badge } from "@/components/ui/badge";
import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
-import { formatDate } from "@/lib/formatter";
import { useTRPC } from "@/lib/trpc/client";
import { useQuery } from "@tanstack/react-query";
import Link from "next/link";
@@ -51,126 +52,123 @@ export default function Page() {
<TabsTrigger value="reports">Reports</TabsTrigger>
<TabsTrigger value="maintenances">Maintenances</TabsTrigger>
</TabsList>
- <TabsContent value="reports" className="flex flex-col gap-4">
- {statusReports.length > 0 ? (
- statusReports.map((report) => {
- const updates = report.statusReportUpdates.sort(
- (a, b) => b.date.getTime() - a.date.getTime(),
- );
- const firstUpdate = updates[updates.length - 1];
- const lastUpdate = updates[0];
- // NOTE: updates are sorted descending by date
- const startedAt = firstUpdate.date;
- // HACKY: LEGACY: only resolved via report and not via report update
- const isReportResolvedOnly =
- report.status === "resolved" && lastUpdate.status !== "resolved";
- return (
- <StatusEvent key={report.id}>
- <StatusEventAside>
- <span className="font-medium text-foreground/80">
- {formatDate(startedAt, { month: "short" })}
- </span>
- </StatusEventAside>
- <Link
- href={`./events/report/${report.id}`}
- className="rounded-lg"
- >
- <StatusEventContent>
- <StatusEventTitle className="inline-flex gap-1">
- {report.title}
- {isReportResolvedOnly ? <StatusEventTitleCheck /> : null}
- </StatusEventTitle>
- {report.monitorsToStatusReports.length > 0 ? (
- <StatusEventAffected className="flex flex-wrap gap-1">
- {report.monitorsToStatusReports.map((affected) => (
- <Badge
- key={affected.monitor.id}
- variant="outline"
- className="text-[10px]"
- >
- {affected.monitor.name}
- </Badge>
- ))}
- </StatusEventAffected>
- ) : null}
- <StatusEventTimelineReport
- updates={report.statusReportUpdates}
- />
- </StatusEventContent>
- </Link>
- </StatusEvent>
- );
- })
- ) : (
- <StatusBlankContainer>
- <div className="relative mt-8 flex w-full flex-col items-center justify-center">
- <StatusBlankReport className="-top-16 absolute scale-60 opacity-50" />
- <StatusBlankReport className="-top-8 absolute scale-80 opacity-80" />
- <StatusBlankReport />
- </div>
- <StatusBlankContent>
- <StatusBlankTitle>No reports found</StatusBlankTitle>
- <StatusBlankDescription>
- No reports found for this status page.
- </StatusBlankDescription>
- </StatusBlankContent>
- </StatusBlankContainer>
- )}
+ <TabsContent value="reports">
+ <StatusEventGroup>
+ {statusReports.length > 0 ? (
+ statusReports.map((report) => {
+ const updates = report.statusReportUpdates.sort(
+ (a, b) => b.date.getTime() - a.date.getTime(),
+ );
+ const firstUpdate = updates[updates.length - 1];
+ const lastUpdate = updates[0];
+ // NOTE: updates are sorted descending by date
+ const startedAt = firstUpdate.date;
+ // HACKY: LEGACY: only resolved via report and not via report update
+ const isReportResolvedOnly =
+ report.status === "resolved" &&
+ lastUpdate.status !== "resolved";
+ return (
+ <StatusEvent key={report.id}>
+ <StatusEventAside>
+ <StatusEventDate date={startedAt} />
+ </StatusEventAside>
+ <Link
+ href={`./events/report/${report.id}`}
+ className="rounded-lg"
+ >
+ <StatusEventContent>
+ <StatusEventTitle className="inline-flex gap-1">
+ {report.title}
+ {isReportResolvedOnly ? (
+ <StatusEventTitleCheck />
+ ) : null}
+ </StatusEventTitle>
+ {report.monitorsToStatusReports.length > 0 ? (
+ <StatusEventAffected>
+ {report.monitorsToStatusReports.map((affected) => (
+ <StatusEventAffectedBadge key={affected.monitor.id}>
+ {affected.monitor.name}
+ </StatusEventAffectedBadge>
+ ))}
+ </StatusEventAffected>
+ ) : null}
+ <StatusEventTimelineReport
+ updates={report.statusReportUpdates}
+ />
+ </StatusEventContent>
+ </Link>
+ </StatusEvent>
+ );
+ })
+ ) : (
+ <StatusBlankContainer>
+ <div className="relative mt-8 flex w-full flex-col items-center justify-center">
+ <StatusBlankReport className="-top-16 absolute scale-60 opacity-50" />
+ <StatusBlankReport className="-top-8 absolute scale-80 opacity-80" />
+ <StatusBlankReport />
+ </div>
+ <StatusBlankContent>
+ <StatusBlankTitle>No reports found</StatusBlankTitle>
+ <StatusBlankDescription>
+ No reports found for this status page.
+ </StatusBlankDescription>
+ </StatusBlankContent>
+ </StatusBlankContainer>
+ )}
+ </StatusEventGroup>
</TabsContent>
- <TabsContent value="maintenances" className="flex flex-col gap-4">
- {maintenances.length > 0 ? (
- maintenances.map((maintenance) => {
- const isFuture = maintenance.from > new Date();
- return (
- <StatusEvent key={maintenance.id}>
- <StatusEventAside>
- <span className="font-medium text-foreground/80">
- {formatDate(maintenance.from, { month: "short" })}
- </span>
- {isFuture ? (
- <span className="text-info text-sm">Upcoming</span>
- ) : null}
- </StatusEventAside>
- <Link
- href={`./events/maintenance/${maintenance.id}`}
- className="rounded-lg"
- >
- <StatusEventContent>
- <StatusEventTitle>{maintenance.title}</StatusEventTitle>
- {maintenance.maintenancesToMonitors.length > 0 ? (
- <StatusEventAffected className="flex flex-wrap gap-1">
- {maintenance.maintenancesToMonitors.map((affected) => (
- <Badge
- key={affected.monitor.id}
- variant="outline"
- className="text-[10px]"
- >
- {affected.monitor.name}
- </Badge>
- ))}
- </StatusEventAffected>
- ) : null}
- <StatusEventTimelineMaintenance maintenance={maintenance} />
- </StatusEventContent>
- </Link>
- </StatusEvent>
- );
- })
- ) : (
- <StatusBlankContainer>
- <div className="relative mt-8 flex w-full flex-col items-center justify-center">
- <StatusBlankReport className="-top-16 absolute scale-60 opacity-50" />
- <StatusBlankReport className="-top-8 absolute scale-80 opacity-80" />
- <StatusBlankReport />
- </div>
- <StatusBlankContent>
- <StatusBlankTitle>No maintenances found</StatusBlankTitle>
- <StatusBlankDescription>
- No maintenances found for this status page.
- </StatusBlankDescription>
- </StatusBlankContent>
- </StatusBlankContainer>
- )}
+ <TabsContent value="maintenances">
+ <StatusEventGroup>
+ {maintenances.length > 0 ? (
+ maintenances.map((maintenance) => {
+ return (
+ <StatusEvent key={maintenance.id}>
+ <StatusEventAside>
+ <StatusEventDate date={maintenance.from} />
+ </StatusEventAside>
+ <Link
+ href={`./events/maintenance/${maintenance.id}`}
+ className="rounded-lg"
+ >
+ <StatusEventContent>
+ <StatusEventTitle>{maintenance.title}</StatusEventTitle>
+ {maintenance.maintenancesToMonitors.length > 0 ? (
+ <StatusEventAffected>
+ {maintenance.maintenancesToMonitors.map(
+ (affected) => (
+ <StatusEventAffectedBadge
+ key={affected.monitor.id}
+ >
+ {affected.monitor.name}
+ </StatusEventAffectedBadge>
+ ),
+ )}
+ </StatusEventAffected>
+ ) : null}
+ <StatusEventTimelineMaintenance
+ maintenance={maintenance}
+ />
+ </StatusEventContent>
+ </Link>
+ </StatusEvent>
+ );
+ })
+ ) : (
+ <StatusBlankContainer>
+ <div className="relative mt-8 flex w-full flex-col items-center justify-center">
+ <StatusBlankReport className="-top-16 absolute scale-60 opacity-50" />
+ <StatusBlankReport className="-top-8 absolute scale-80 opacity-80" />
+ <StatusBlankReport />
+ </div>
+ <StatusBlankContent>
+ <StatusBlankTitle>No maintenances found</StatusBlankTitle>
+ <StatusBlankDescription>
+ No maintenances found for this status page.
+ </StatusBlankDescription>
+ </StatusBlankContent>
+ </StatusBlankContainer>
+ )}
+ </StatusEventGroup>
</TabsContent>
</Tabs>
);
diff --git a/apps/status-page/src/app/(status-page)/[domain]/(public)/events/(view)/maintenance/[id]/page.tsx b/apps/status-page/src/app/(status-page)/[domain]/(public)/events/(view)/maintenance/[id]/page.tsx
index 1bf307bfc..f7aba17de 100644
--- a/apps/status-page/src/app/(status-page)/[domain]/(public)/events/(view)/maintenance/[id]/page.tsx
+++ b/apps/status-page/src/app/(status-page)/[domain]/(public)/events/(view)/maintenance/[id]/page.tsx
@@ -3,19 +3,18 @@
import { useTRPC } from "@/lib/trpc/client";
import { useQuery } from "@tanstack/react-query";
-import { formatDate } from "@/lib/formatter";
-
import { ButtonBack } from "@/components/button/button-back";
import { ButtonCopyLink } from "@/components/button/button-copy-link";
import {
StatusEvent,
StatusEventAffected,
+ StatusEventAffectedBadge,
StatusEventAside,
StatusEventContent,
+ StatusEventDate,
StatusEventTimelineMaintenance,
StatusEventTitle,
} from "@/components/status-page/status-events";
-import { Badge } from "@/components/ui/badge";
import { useParams } from "next/navigation";
export default function MaintenancePage() {
@@ -30,7 +29,6 @@ export default function MaintenancePage() {
if (!maintenance) return null;
- const isFuture = maintenance.from > new Date();
return (
<div className="flex flex-col gap-4">
<div className="flex w-full flex-row items-center justify-between gap-2 py-0.5">
@@ -39,24 +37,15 @@ export default function MaintenancePage() {
</div>
<StatusEvent>
<StatusEventAside>
- <span className="font-medium text-foreground/80">
- {formatDate(maintenance.from, { month: "short" })}
- </span>
- {isFuture ? (
- <span className="text-info text-sm">Upcoming</span>
- ) : null}
+ <StatusEventDate date={maintenance.from} />
</StatusEventAside>
<StatusEventContent hoverable={false}>
<StatusEventTitle>{maintenance.title}</StatusEventTitle>
- <StatusEventAffected className="flex flex-wrap gap-1">
+ <StatusEventAffected>
{maintenance.maintenancesToMonitors.map((affected) => (
- <Badge
- key={affected.monitor.id}
- variant="outline"
- className="text-[10px]"
- >
+ <StatusEventAffectedBadge key={affected.monitor.id}>
{affected.monitor.name}
- </Badge>
+ </StatusEventAffectedBadge>
))}
</StatusEventAffected>
<StatusEventTimelineMaintenance maintenance={maintenance} />
diff --git a/apps/status-page/src/app/(status-page)/[domain]/(public)/events/(view)/report/[id]/page.tsx b/apps/status-page/src/app/(status-page)/[domain]/(public)/events/(view)/report/[id]/page.tsx
index b081bb028..96582e9b9 100644
--- a/apps/status-page/src/app/(status-page)/[domain]/(public)/events/(view)/report/[id]/page.tsx
+++ b/apps/status-page/src/app/(status-page)/[domain]/(public)/events/(view)/report/[id]/page.tsx
@@ -1,19 +1,18 @@
"use client";
-import { formatDate } from "@/lib/formatter";
-
import { ButtonBack } from "@/components/button/button-back";
import { ButtonCopyLink } from "@/components/button/button-copy-link";
import {
StatusEvent,
StatusEventAffected,
+ StatusEventAffectedBadge,
StatusEventAside,
StatusEventContent,
+ StatusEventDate,
StatusEventTimelineReport,
StatusEventTitle,
StatusEventTitleCheck,
} from "@/components/status-page/status-events";
-import { Badge } from "@/components/ui/badge";
import { useTRPC } from "@/lib/trpc/client";
import { useQuery } from "@tanstack/react-query";
import { useParams } from "next/navigation";
@@ -45,9 +44,7 @@ export default function ReportPage() {
</div>
<StatusEvent>
<StatusEventAside>
- <span className="font-medium text-foreground/80">
- {formatDate(firstUpdate.date, { month: "short" })}
- </span>
+ <StatusEventDate date={firstUpdate.date} />
</StatusEventAside>
<StatusEventContent hoverable={false}>
<StatusEventTitle className="inline-flex gap-1">
@@ -55,15 +52,11 @@ export default function ReportPage() {
{isReportResolvedOnly ? <StatusEventTitleCheck /> : null}
</StatusEventTitle>
{report.monitorsToStatusReports.length > 0 ? (
- <StatusEventAffected className="flex flex-wrap gap-1">
+ <StatusEventAffected>
{report.monitorsToStatusReports.map((affected) => (
- <Badge
- key={affected.monitor.id}
- variant="outline"
- className="text-[10px]"
- >
+ <StatusEventAffectedBadge key={affected.monitor.id}>
{affected.monitor.name}
- </Badge>
+ </StatusEventAffectedBadge>
))}
</StatusEventAffected>
) : null}
diff --git a/apps/status-page/src/app/(status-page)/[domain]/layout.tsx b/apps/status-page/src/app/(status-page)/[domain]/layout.tsx
index 1cdb28379..9c3b566d7 100644
--- a/apps/status-page/src/app/(status-page)/[domain]/layout.tsx
+++ b/apps/status-page/src/app/(status-page)/[domain]/layout.tsx
@@ -4,7 +4,7 @@ import {
StatusPageProvider,
} from "@/components/status-page/floating-button";
import { FloatingTheme } from "@/components/status-page/floating-theme";
-import { ThemeProvider } from "@/components/theme-provider";
+import { ThemeProvider } from "@/components/themes/theme-provider";
import { Toaster } from "@/components/ui/sonner";
import { HydrateClient, getQueryClient, trpc } from "@/lib/trpc/server";
import type { Metadata } from "next";
diff --git a/apps/status-page/src/components/nav/footer.tsx b/apps/status-page/src/components/nav/footer.tsx
index 5c9af32a5..ad5c6d1bd 100644
--- a/apps/status-page/src/components/nav/footer.tsx
+++ b/apps/status-page/src/components/nav/footer.tsx
@@ -2,10 +2,10 @@
import { Link } from "@/components/common/link";
import { TimestampHoverCard } from "@/components/content/timestamp-hover-card";
-import { ThemeToggle } from "@/components/theme-toggle";
+import { ThemeDropdown } from "@/components/themes/theme-dropdown";
import { useTRPC } from "@/lib/trpc/client";
import { useQuery } from "@tanstack/react-query";
-import { format } from "date-fns";
+import { Clock } from "lucide-react";
import { useParams } from "next/navigation";
export function Footer(props: React.ComponentProps<"footer">) {
@@ -14,6 +14,7 @@ export function Footer(props: React.ComponentProps<"footer">) {
const { data: page, dataUpdatedAt } = useQuery(
trpc.statusPage.get.queryOptions({ slug: domain }),
);
+ const timezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
if (!page) return null;
@@ -21,16 +22,29 @@ export function Footer(props: React.ComponentProps<"footer">) {
<footer {...props}>
<div className="mx-auto flex max-w-2xl items-center justify-between gap-4 px-3 py-2">
<div>
- <p className="font-mono text-muted-foreground text-sm leading-none">
- powered by <Link href="https://openstatus.dev">openstatus</Link>
+ <p className="font-mono text-muted-foreground text-xs leading-none sm:text-sm">
+ powered by{" "}
+ <Link
+ href="https://openstatus.dev"
+ target="_blank"
+ rel="noreferrer"
+ >
+ openstatus.dev
+ </Link>
</p>
- <TimestampHoverCard date={new Date(dataUpdatedAt)} side="top">
- <span className="text-muted-foreground/70 text-xs">
- {format(new Date(dataUpdatedAt), "LLL dd, y HH:mm:ss")}
- </span>
+ </div>
+ <div className="flex items-center gap-4">
+ <TimestampHoverCard
+ date={new Date(dataUpdatedAt)}
+ side="top"
+ align="end"
+ className="flex items-center gap-1.5 text-muted-foreground/70"
+ >
+ <Clock className="size-3" />
+ <span className="font-mono text-xs">{timezone}</span>
</TimestampHoverCard>
+ <ThemeDropdown />
</div>
- <ThemeToggle className="w-[140px]" />
</div>
</footer>
);
diff --git a/apps/status-page/src/components/nav/header.tsx b/apps/status-page/src/components/nav/header.tsx
index d31d0004e..b8ab42eaf 100644
--- a/apps/status-page/src/components/nav/header.tsx
+++ b/apps/status-page/src/components/nav/header.tsx
@@ -130,12 +130,16 @@ export function Header(props: React.ComponentProps<"header">) {
function NavDesktop({ className, ...props }: React.ComponentProps<"ul">) {
const nav = useNav();
return (
- <ul className={cn("flex flex-row gap-2", className)} {...props}>
+ <ul className={cn("flex flex-row gap-0.5", className)} {...props}>
{nav.map((item) => {
return (
<li key={item.label}>
<Button
variant={item.isActive ? "secondary" : "ghost"}
+ className={cn(
+ "border",
+ item.isActive ? "border-input" : "border-transparent",
+ )}
size="sm"
asChild
>
diff --git a/apps/status-page/src/components/status-page/floating-button.tsx b/apps/status-page/src/components/status-page/floating-button.tsx
index d1f26ddcb..4d8587c6c 100644
--- a/apps/status-page/src/components/status-page/floating-button.tsx
+++ b/apps/status-page/src/components/status-page/floating-button.tsx
@@ -1,6 +1,6 @@
"use client";
-import { ThemeToggle } from "@/components/theme-toggle";
+import { ThemeSelect } from "@/components/themes/theme-select";
import { Button } from "@/components/ui/button";
import { Label } from "@/components/ui/label";
import {
@@ -310,7 +310,7 @@ export function FloatingButton({
{IS_DEV ? (
<div className="space-y-2">
<Label htmlFor="theme">Theme</Label>
- <ThemeToggle id="theme" className="w-full" />
+ <ThemeSelect id="theme" className="w-full" />
</div>
) : null}
<div className="space-y-2">
diff --git a/apps/status-page/src/components/status-page/floating-theme.tsx b/apps/status-page/src/components/status-page/floating-theme.tsx
index 9d45b589d..a33a2771b 100644
--- a/apps/status-page/src/components/status-page/floating-theme.tsx
+++ b/apps/status-page/src/components/status-page/floating-theme.tsx
@@ -1,6 +1,6 @@
"use client";
-import { ThemeToggle } from "@/components/theme-toggle";
+import { ThemeSelect } from "@/components/themes/theme-select";
import { Button } from "@/components/ui/button";
import { Label } from "@/components/ui/label";
import {
@@ -66,7 +66,7 @@ export function FloatingTheme({ className }: { className?: string }) {
</div>
<div className="space-y-2">
<Label htmlFor="theme">Theme</Label>
- <ThemeToggle id="theme" className="w-full" />
+ <ThemeSelect id="theme" className="w-full" />
</div>
<div className="space-y-2">
<Label htmlFor="community-theme">Community Theme</Label>
diff --git a/apps/status-page/src/components/status-page/status-events.tsx b/apps/status-page/src/components/status-page/status-events.tsx
index 7d776a2f6..b4a560d03 100644
--- a/apps/status-page/src/components/status-page/status-events.tsx
+++ b/apps/status-page/src/components/status-page/status-events.tsx
@@ -1,5 +1,6 @@
import { ProcessMessage } from "@/components/content/process-message";
import { TimestampHoverCard } from "@/components/content/timestamp-hover-card";
+import { Badge } from "@/components/ui/badge";
import { Separator } from "@/components/ui/separator";
import {
Tooltip,
@@ -7,12 +8,24 @@ import {
TooltipProvider,
TooltipTrigger,
} from "@/components/ui/tooltip";
-import { formatDateRange, formatDateTime } from "@/lib/formatter";
+import { formatDate, formatDateRange, formatDateTime } from "@/lib/formatter";
import { cn } from "@/lib/utils";
import { formatDistanceStrict } from "date-fns";
import { Check } from "lucide-react";
import { status } from "./messages";
+export function StatusEventGroup({
+ className,
+ children,
+ ...props
+}: React.ComponentProps<"div">) {
+ return (
+ <div className={cn("flex flex-col gap-4", className)} {...props}>
+ {children}
+ </div>
+ );
+}
+
export function StatusEvent({
className,
children,
@@ -67,7 +80,7 @@ export function StatusEventTitleCheck({
...props
}: React.ComponentProps<"div">) {
return (
- <div className={cn("mt-1 ml-1.5", className)} {...props}>
+ <div className={cn("flex items-center pl-1", className)} {...props}>
<TooltipProvider>
<Tooltip>
<TooltipTrigger>
@@ -91,8 +104,49 @@ export function StatusEventAffected({
...props
}: React.ComponentProps<"div">) {
return (
- <div className={cn("text-muted-foreground text-sm", className)} {...props}>
+ <div className={cn("flex flex-wrap gap-0.5", className)} {...props}>
+ {children}
+ </div>
+ );
+}
+
+export function StatusEventAffectedBadge({
+ className,
+ children,
+ ...props
+}: React.ComponentProps<"div">) {
+ return (
+ <Badge
+ variant="secondary"
+ className={cn("text-[10px]", className)}
+ {...props}
+ >
{children}
+ </Badge>
+ );
+}
+
+export function StatusEventDate({
+ className,
+ date,
+ ...props
+}: React.ComponentProps<"div"> & {
+ date: Date;
+}) {
+ const isFuture = date > new Date();
+ return (
+ <div className={cn("flex gap-2 lg:flex-col", className)} {...props}>
+ <div className="font-medium text-foreground">
+ {formatDate(date, { month: "short" })}
+ </div>{" "}
+ {isFuture ? (
+ <Badge
+ variant="secondary"
+ className="bg-info text-[10px] text-background dark:text-foreground"
+ >
+ Upcoming
+ </Badge>
+ ) : null}
</div>
);
}
@@ -103,14 +157,8 @@ export function StatusEventAside({
...props
}: React.ComponentProps<"div">) {
return (
- <div className="lg:-left-32 lg:absolute lg:top-0 lg:h-full">
- <div
- className={cn(
- "flex flex-col gap-1 lg:sticky lg:top-0 lg:left-0",
- className,
- )}
- {...props}
- >
+ <div className="lg:-left-32 border border-transparent lg:absolute lg:top-0 lg:h-full">
+ <div className={cn("lg:sticky lg:top-0 lg:left-0", className)} {...props}>
{children}
</div>
</div>
@@ -203,7 +251,6 @@ function StatusEventTimelineReportUpdate({
<div className={cn(isLast ? "mb-0" : "mb-2")}>
<StatusEventTimelineTitle>
<span>{status[report.status]}</span>{" "}
- {/* underline decoration-dashed underline-offset-2 decoration-muted-foreground/30 */}
<span className="font-mono text-muted-foreground text-xs">
<TimestampHoverCard date={new Date(report.date)} asChild>
<span>{formatDateTime(report.date)}</span>
@@ -311,10 +358,7 @@ export function StatusEventTimelineMessage({
}: React.ComponentProps<"div">) {
return (
<div
- className={cn(
- "py-1.5 font-mono text-foreground/90 text-sm/relaxed",
- className,
- )}
+ className={cn("py-1.5 font-mono text-muted-foreground", className)}
{...props}
>
{children}
diff --git a/apps/status-page/src/components/status-page/status-feed.tsx b/apps/status-page/src/components/status-page/status-feed.tsx
index 287f6898a..0955b3b24 100644
--- a/apps/status-page/src/components/status-page/status-feed.tsx
+++ b/apps/status-page/src/components/status-page/status-feed.tsx
@@ -1,9 +1,5 @@
"use client";
-
-import { Badge } from "@/components/ui/badge";
import { usePathnamePrefix } from "@/hooks/use-pathname-prefix";
-import { formatDate } from "@/lib/formatter";
-import { cn } from "@/lib/utils";
import Link from "next/link";
import {
StatusBlankContainer,
@@ -16,8 +12,11 @@ import {
import {
StatusEvent,
StatusEventAffected,
+ StatusEventAffectedBadge,
StatusEventAside,
StatusEventContent,
+ StatusEventDate,
+ StatusEventGroup,
StatusEventTimelineMaintenance,
StatusEventTimelineReport,
StatusEventTitle,
@@ -52,7 +51,6 @@ type UnifiedEvent = {
};
export function StatusFeed({
- className,
statusReports = [],
maintenances = [],
...props
@@ -102,16 +100,14 @@ export function StatusFeed({
}
return (
- <div className={cn("flex flex-col gap-4", className)} {...props}>
+ <StatusEventGroup {...props}>
{unifiedEvents.map((event) => {
if (event.type === "report") {
const report = event.data as StatusReport;
return (
<StatusEvent key={`report-${event.id}`}>
<StatusEventAside>
- <span className="font-medium text-foreground/80">
- {formatDate(event.startDate, { month: "short" })}
- </span>
+ <StatusEventDate date={event.startDate} />
</StatusEventAside>
<Link
href={`${prefix ? `/${prefix}` : ""}/events/report/${
@@ -122,15 +118,11 @@ export function StatusFeed({
<StatusEventContent>
<StatusEventTitle>{report.title}</StatusEventTitle>
{report.affected.length > 0 && (
- <StatusEventAffected className="flex flex-wrap gap-1">
+ <StatusEventAffected>
{report.affected.map((affected, index) => (
- <Badge
- key={index}
- variant="outline"
- className="text-[10px]"
- >
+ <StatusEventAffectedBadge key={index}>
{affected}
- </Badge>
+ </StatusEventAffectedBadge>
))}
</StatusEventAffected>
)}
@@ -143,16 +135,10 @@ export function StatusFeed({
if (event.type === "maintenance") {
const maintenance = event.data as Maintenance;
- const isFuture = maintenance.from > new Date();
return (
<StatusEvent key={`maintenance-${event.id}`}>
<StatusEventAside>
- <span className="font-medium text-foreground/80">
- {formatDate(event.startDate, { month: "short" })}
- </span>
- {isFuture ? (
- <span className="text-info text-sm">Upcoming</span>
- ) : null}
+ <StatusEventDate date={event.startDate} />
</StatusEventAside>
<Link
href={`${prefix ? `/${prefix}` : ""}/events/maintenance/${
@@ -163,15 +149,11 @@ export function StatusFeed({
<StatusEventContent>
<StatusEventTitle>{maintenance.title}</StatusEventTitle>
{maintenance.affected.length > 0 && (
- <StatusEventAffected className="flex flex-wrap gap-1">
+ <StatusEventAffected>
{maintenance.affected.map((affected, index) => (
- <Badge
- key={index}
- variant="outline"
- className="text-[10px]"
- >
+ <StatusEventAffectedBadge key={index}>
{affected}
- </Badge>
+ </StatusEventAffectedBadge>
))}
</StatusEventAffected>
)}
@@ -196,6 +178,6 @@ export function StatusFeed({
>
View events history
</StatusBlankLink>
- </div>
+ </StatusEventGroup>
);
}
diff --git a/apps/status-page/src/components/themes/theme-dropdown.tsx b/apps/status-page/src/components/themes/theme-dropdown.tsx
new file mode 100644
index 000000000..1c0502d04
--- /dev/null
+++ b/apps/status-page/src/components/themes/theme-dropdown.tsx
@@ -0,0 +1,59 @@
+"use client";
+
+import { useTheme } from "next-themes";
+import type * as React from "react";
+
+import { Button } from "@/components/ui/button";
+import {
+ DropdownMenu,
+ DropdownMenuContent,
+ DropdownMenuItem,
+ DropdownMenuTrigger,
+} from "@/components/ui/dropdown-menu";
+import { cn } from "@/lib/utils";
+import { Laptop, Moon, Sun } from "lucide-react";
+import { useState } from "react";
+import { useEffect } from "react";
+import { Skeleton } from "../ui/skeleton";
+
+function getThemeIcon(theme?: string | null) {
+ if (theme === "light") return <Sun className="h-4 w-4" />;
+ if (theme === "dark") return <Moon className="h-4 w-4" />;
+ if (theme === "system") return <Laptop className="h-4 w-4" />;
+ return null;
+}
+
+export function ThemeDropdown({
+ className,
+ ...props
+}: React.ComponentProps<typeof DropdownMenuTrigger>) {
+ const { setTheme, theme } = useTheme();
+ const [mounted, setMounted] = useState(false);
+
+ useEffect(() => {
+ setMounted(true);
+ }, []);
+
+ if (!mounted) {
+ return <Skeleton className={cn("size-9", className)} />;
+ }
+
+ return (
+ <DropdownMenu>
+ <DropdownMenuTrigger className={cn(className)} asChild {...props}>
+ <Button variant="outline" size="icon">
+ {getThemeIcon(theme ?? "system")}
+ <span className="sr-only">{theme ?? "system"}</span>
+ </Button>
+ </DropdownMenuTrigger>
+ <DropdownMenuContent align="end">
+ {["light", "dark", "system"].map((theme) => (
+ <DropdownMenuItem key={theme} onClick={() => setTheme(theme)}>
+ {getThemeIcon(theme)}
+ <span className="capitalize">{theme}</span>
+ </DropdownMenuItem>
+ ))}
+ </DropdownMenuContent>
+ </DropdownMenu>
+ );
+}
diff --git a/apps/status-page/src/components/theme-provider.tsx b/apps/status-page/src/components/themes/theme-provider.tsx
similarity index 100%
rename from apps/status-page/src/components/theme-provider.tsx
rename to apps/status-page/src/components/themes/theme-provider.tsx
diff --git a/apps/status-page/src/components/theme-toggle.tsx b/apps/status-page/src/components/themes/theme-select.tsx
similarity index 98%
rename from apps/status-page/src/components/theme-toggle.tsx
rename to apps/status-page/src/components/themes/theme-select.tsx
index 422d42ae8..30ebd2da1 100644
--- a/apps/status-page/src/components/theme-toggle.tsx
+++ b/apps/status-page/src/components/themes/theme-select.tsx
@@ -15,7 +15,7 @@ import { Laptop, Moon, Sun } from "lucide-react";
import { useState } from "react";
import { useEffect } from "react";
-export function ThemeToggle({
+export function ThemeSelect({
className,
...props
}: React.ComponentProps<typeof SelectTrigger>) {
diff --git a/packages/api/src/router/statusPage.ts b/packages/api/src/router/statusPage.ts
index a346c6a79..79e87bf2f 100644
--- a/packages/api/src/router/statusPage.ts
+++ b/packages/api/src/router/statusPage.ts
@@ -50,7 +50,8 @@ export const statusPageRouter = createTRPCRouter({
with: {
workspace: true,
statusReports: {
- orderBy: (reports, { desc }) => desc(reports.createdAt),
+ // TODO: we need to order the based on statusReportUpdates instead
+ // orderBy: (reports, { desc }) => desc(reports.createdAt),
with: {
statusReportUpdates: {
orderBy: (reports, { desc }) => desc(reports.date),
@@ -150,7 +151,20 @@ export const statusPageRouter = createTRPCRouter({
..._page,
monitors,
incidents: monitors.flatMap((m) => m.incidents) ?? [],
- statusReports: _page.statusReports ?? [],
+ statusReports:
+ // NOTE: we need to sort the status reports by the first update date
+ _page.statusReports.sort((a, b) => {
+ if (a.statusReportUpdates.length === 0) return -1;
+ if (b.statusReportUpdates.length === 0) return -1;
+ return (
+ b.statusReportUpdates[
+ b.statusReportUpdates.length - 1
+ ].date.getTime() -
+ a.statusReportUpdates[
+ a.statusReportUpdates.length - 1
+ ].date.getTime()
+ );
+ }) ?? [],
maintenances: _page.maintenances ?? [],
workspacePlan: _page.workspace.plan,
status,