Skip to content

Open-source status page, incident response and uptime monitoring

feat: nerd mode (#1375)

Maximilian Kaskefdacaad8e155
diff --git a/apps/dashboard/next-env.d.ts b/apps/dashboard/next-env.d.ts
index 1b3be0840..830fb594c 100644
--- a/apps/dashboard/next-env.d.ts
+++ b/apps/dashboard/next-env.d.ts
@@ -1,5 +1,6 @@
/// <reference types="next" />
/// <reference types="next/image-types/global" />
+/// <reference path="./.next/types/routes.d.ts" />
// NOTE: This file should not be edited
// see https://nextjs.org/docs/app/api-reference/config/typescript for more information.
diff --git a/apps/status-page/next-env.d.ts b/apps/status-page/next-env.d.ts
index 1b3be0840..830fb594c 100644
--- a/apps/status-page/next-env.d.ts
+++ b/apps/status-page/next-env.d.ts
@@ -1,5 +1,6 @@
/// <reference types="next" />
/// <reference types="next/image-types/global" />
+/// <reference path="./.next/types/routes.d.ts" />
// NOTE: This file should not be edited
// see https://nextjs.org/docs/app/api-reference/config/typescript for more information.
diff --git a/apps/status-page/public/fonts/CommitMono-400-Italic.otf b/apps/status-page/public/fonts/CommitMono-400-Italic.otf
new file mode 100644
index 000000000..616bb0797
Binary files /dev/null and b/apps/status-page/public/fonts/CommitMono-400-Italic.otf differ
diff --git a/apps/status-page/public/fonts/CommitMono-400-Regular.otf b/apps/status-page/public/fonts/CommitMono-400-Regular.otf
new file mode 100644
index 000000000..4c029ed36
Binary files /dev/null and b/apps/status-page/public/fonts/CommitMono-400-Regular.otf differ
diff --git a/apps/status-page/public/fonts/CommitMono-700-Italic.otf b/apps/status-page/public/fonts/CommitMono-700-Italic.otf
new file mode 100644
index 000000000..e948f7396
Binary files /dev/null and b/apps/status-page/public/fonts/CommitMono-700-Italic.otf differ
diff --git a/apps/status-page/public/fonts/CommitMono-700-Regular.otf b/apps/status-page/public/fonts/CommitMono-700-Regular.otf
new file mode 100644
index 000000000..da3e6243f
Binary files /dev/null and b/apps/status-page/public/fonts/CommitMono-700-Regular.otf differ
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 0d09eb5d1..4a46fc22b 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
@@ -21,7 +21,7 @@ import {
import { Badge } from "@/components/ui/badge";
import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
import { formatDate } from "@/lib/formatter";
-import { CircleCheck } from "lucide-react";
+import { Check } from "lucide-react";
import Link from "next/link";
// TODO: include ?filter=maintenance/reports
@@ -71,7 +71,11 @@ export default function Page() {
<StatusEventTitle className="inline-flex gap-1">
{report.title}
{isReportResolvedOnly ? (
- <CircleCheck className="size-4 text-success shrink-0 mt-1 ml-1.5" />
+ <div className="mt-1 ml-1.5">
+ <div className="rounded-full border border-success/20 bg-success/10 p-0.5 text-success">
+ <Check className="size-3 shrink-0" />
+ </div>
+ </div>
) : null}
</StatusEventTitle>
{report.monitorsToStatusReports.length > 0 ? (
diff --git a/apps/status-page/src/app/(status-page)/[domain]/(public)/page.tsx b/apps/status-page/src/app/(status-page)/[domain]/(public)/page.tsx
index 63505cfa1..a54352d26 100644
--- a/apps/status-page/src/app/(status-page)/[domain]/(public)/page.tsx
+++ b/apps/status-page/src/app/(status-page)/[domain]/(public)/page.tsx
@@ -12,7 +12,10 @@ import {
StatusBanner,
StatusBannerContainer,
StatusBannerContent,
- StatusBannerTitle,
+ StatusBannerTabs,
+ StatusBannerTabsContent,
+ StatusBannerTabsList,
+ StatusBannerTabsTrigger,
} from "@/components/status-page/status-banner";
import {
StatusEventTimelineMaintenance,
@@ -22,8 +25,8 @@ import { StatusFeed } from "@/components/status-page/status-feed";
import { StatusMonitor } from "@/components/status-page/status-monitor";
import { Separator } from "@/components/ui/separator";
import { useTRPC } from "@/lib/trpc/client";
+import { cn } from "@/lib/utils";
import { useQuery } from "@tanstack/react-query";
-import Link from "next/link";
import { useParams } from "next/navigation";
export default function Page() {
@@ -55,55 +58,72 @@ export default function Page() {
</StatusHeader>
{page.openEvents.length > 0 ? (
<StatusContent>
- {page.openEvents.map((e) => {
- if (e.type === "maintenance") {
- const maintenance = page.maintenances.find(
- (maintenance) => maintenance.id === e.id,
- );
- if (!maintenance) return null;
- return (
- <Link
- href={`./events/maintenance/${e.id}`}
- key={e.id}
- className="rounded-lg"
- >
- <StatusBannerContainer status={e.status}>
- <StatusBannerTitle>{e.name}</StatusBannerTitle>
- <StatusBannerContent>
- <StatusEventTimelineMaintenance
- maintenance={maintenance}
- withDot={false}
- />
- </StatusBannerContent>
- </StatusBannerContainer>
- </Link>
- );
- }
- if (e.type === "report") {
- const report = page.statusReports.find(
- (report) => report.id === e.id,
- );
- if (!report) return null;
- return (
- <Link
- href={`./events/report/${e.id}`}
- key={e.id}
- className="rounded-lg"
- >
- <StatusBannerContainer status={e.status}>
- <StatusBannerTitle>{e.name}</StatusBannerTitle>
- <StatusBannerContent>
- <StatusEventTimelineReport
- updates={report.statusReportUpdates}
- withDot={false}
- />
- </StatusBannerContent>
- </StatusBannerContainer>
- </Link>
- );
- }
- return null;
- })}
+ <StatusBannerTabs
+ defaultValue={`${page.openEvents[0].type}-${page.openEvents[0].id}`}
+ >
+ <StatusBannerTabsList>
+ {page.openEvents.map((e, i) => {
+ return (
+ <StatusBannerTabsTrigger
+ value={`${e.type}-${e.id}`}
+ status={e.status}
+ key={e.id}
+ className={cn(
+ i === 0 && "rounded-tl-lg",
+ i === page.openEvents.length - 1 && "rounded-tr-lg",
+ )}
+ >
+ {e.name}
+ </StatusBannerTabsTrigger>
+ );
+ })}
+ </StatusBannerTabsList>
+ {page.openEvents.map((e) => {
+ if (e.type === "report") {
+ const report = page.statusReports.find(
+ (report) => report.id === e.id,
+ );
+ if (!report) return null;
+ return (
+ <StatusBannerTabsContent
+ value={`${e.type}-${e.id}`}
+ key={e.id}
+ >
+ <StatusBannerContainer status={e.status}>
+ <StatusBannerContent>
+ <StatusEventTimelineReport
+ updates={report.statusReportUpdates}
+ withDot={false}
+ />
+ </StatusBannerContent>
+ </StatusBannerContainer>
+ </StatusBannerTabsContent>
+ );
+ }
+ if (e.type === "maintenance") {
+ const maintenance = page.maintenances.find(
+ (maintenance) => maintenance.id === e.id,
+ );
+ if (!maintenance) return null;
+ return (
+ <StatusBannerTabsContent
+ value={`${e.type}-${e.id}`}
+ key={e.id}
+ >
+ <StatusBannerContainer status={e.status}>
+ <StatusBannerContent>
+ <StatusEventTimelineMaintenance
+ maintenance={maintenance}
+ withDot={false}
+ />
+ </StatusBannerContent>
+ </StatusBannerContainer>
+ </StatusBannerTabsContent>
+ );
+ }
+ return null;
+ })}
+ </StatusBannerTabs>
</StatusContent>
) : (
<StatusBanner status={page.status} />
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 8415013aa..9f5ae61e8 100644
--- a/apps/status-page/src/app/(status-page)/[domain]/layout.tsx
+++ b/apps/status-page/src/app/(status-page)/[domain]/layout.tsx
@@ -19,7 +19,7 @@ export const schema = z.object({
const DISPLAY_FLOATING_BUTTON =
process.env.NODE_ENV === "development" ||
- process.env.ENABLE_FLOATING_BUTTON === "true";
+ process.env.NEXT_PUBLIC_ENABLE_FLOATING_BUTTON === "true";
export default async function Layout({
children,
diff --git a/apps/status-page/src/app/globals.css b/apps/status-page/src/app/globals.css
index 8711e0f91..dbc1a4e15 100644
--- a/apps/status-page/src/app/globals.css
+++ b/apps/status-page/src/app/globals.css
@@ -14,7 +14,7 @@
--color-background: var(--background);
--color-foreground: var(--foreground);
--font-sans: var(--font-geist-sans);
- --font-mono: var(--font-geist-mono);
+ --font-mono: var(--font-commit-mono, var(--font-geist-mono));
--color-sidebar-ring: var(--sidebar-ring);
--color-sidebar-border: var(--sidebar-border);
--color-sidebar-accent-foreground: var(--sidebar-accent-foreground);
@@ -55,7 +55,8 @@
}
:root {
- --radius: 0.625rem;
+ /* --radius: 0.625rem; */
+ --radius: 0px;
--background: oklch(1 0 0);
--foreground: oklch(0.145 0 0);
--card: oklch(1 0 0);
@@ -175,3 +176,10 @@
@apply bg-background text-foreground;
}
}
+
+@layer utilities {
+ /* NOTE: allows us to --radius: 0px and avoid rounding issues - otherwise it is 'infinite * 1px' */
+ .rounded-full {
+ border-radius: calc(var(--radius) * 99999999);
+ }
+}
diff --git a/apps/status-page/src/app/layout.tsx b/apps/status-page/src/app/layout.tsx
index beb3bc68f..5eaad0aaf 100644
--- a/apps/status-page/src/app/layout.tsx
+++ b/apps/status-page/src/app/layout.tsx
@@ -24,6 +24,32 @@ const geistMono = Geist_Mono({
subsets: ["latin"],
});
+const commitMono = LocalFont({
+ src: [
+ {
+ path: "../../public/fonts/CommitMono-400-Regular.otf",
+ weight: "400",
+ style: "normal",
+ },
+ {
+ path: "../../public/fonts/CommitMono-400-Italic.otf",
+ weight: "400",
+ style: "italic",
+ },
+ {
+ path: "../../public/fonts/CommitMono-700-Regular.otf",
+ weight: "700",
+ style: "normal",
+ },
+ {
+ path: "../../public/fonts/CommitMono-700-Italic.otf",
+ weight: "700",
+ style: "italic",
+ },
+ ],
+ variable: "--font-commit-mono",
+});
+
export const metadata: Metadata = {
...defaultMetadata,
twitter: {
@@ -48,6 +74,7 @@ export default function RootLayout({
geistSans.variable,
geistMono.variable,
cal.variable,
+ commitMono.variable,
"antialiased",
)}
>
diff --git a/apps/status-page/src/components/nav/footer.tsx b/apps/status-page/src/components/nav/footer.tsx
index f0b04ea8d..31a8ab54b 100644
--- a/apps/status-page/src/components/nav/footer.tsx
+++ b/apps/status-page/src/components/nav/footer.tsx
@@ -20,9 +20,9 @@ export function Footer(props: React.ComponentProps<"footer">) {
return (
<footer {...props}>
<div className="mx-auto flex max-w-2xl items-center justify-between gap-4 px-3 py-2">
- <div className="leading-[0.9]">
- <p className="text-muted-foreground text-sm">
- Powered by <Link href="#">OpenStatus</Link>
+ <div>
+ <p className="font-mono text-muted-foreground text-sm leading-none">
+ powered by <Link href="#">openstatus</Link>
</p>
<TimestampHoverCard date={new Date(dataUpdatedAt)} side="top">
<span className="text-muted-foreground/70 text-xs">
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 80f5d17a0..771793e79 100644
--- a/apps/status-page/src/components/status-page/floating-button.tsx
+++ b/apps/status-page/src/components/status-page/floating-button.tsx
@@ -154,7 +154,7 @@ export function FloatingButton({ className }: { className?: string }) {
<Button
size="icon"
variant="outline"
- className="size-12 rounded-full"
+ className="size-12 rounded-full dark:bg-background"
>
<Settings className="size-5" />
<span className="sr-only">Open status page settings</span>
diff --git a/apps/status-page/src/components/status-page/status-banner.tsx b/apps/status-page/src/components/status-page/status-banner.tsx
index a3c56be12..2d9772cfd 100644
--- a/apps/status-page/src/components/status-page/status-banner.tsx
+++ b/apps/status-page/src/components/status-page/status-banner.tsx
@@ -1,3 +1,4 @@
+import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
import { cn } from "@/lib/utils";
import {
AlertCircleIcon,
@@ -48,10 +49,10 @@ export function StatusBannerContainer({
data-status={status}
className={cn(
"group/status-banner overflow-hidden rounded-lg border",
- "data-[status=success]:border-success",
- "data-[status=degraded]:border-warning",
- "data-[status=error]:border-destructive",
- "data-[status=info]:border-info",
+ "data-[status=success]:border-success data-[status=success]:bg-success/5 dark:data-[status=success]:bg-success/10",
+ "data-[status=degraded]:border-warning data-[status=degraded]:bg-warning/5 dark:data-[status=degraded]:bg-warning/10",
+ "data-[status=error]:border-destructive data-[status=error]:bg-destructive/5 dark:data-[status=error]:bg-destructive/10",
+ "data-[status=info]:border-info data-[status=info]:bg-info/5 dark:data-[status=info]:bg-info/10",
className,
)}
>
@@ -90,7 +91,7 @@ export function StatusBannerTitle({
return (
<div
className={cn(
- "px-3 py-2 font-medium text-background sm:px-4 sm:py-3",
+ "px-3 py-2 font-medium text-background",
"group-data-[status=success]/status-banner:bg-success",
"group-data-[status=degraded]/status-banner:bg-warning",
"group-data-[status=error]/status-banner:bg-destructive",
@@ -139,3 +140,96 @@ export function StatusBannerIcon({
</div>
);
}
+
+// Tabs Components
+
+export function StatusBannerTabs({
+ className,
+ children,
+ status,
+ ...props
+}: React.ComponentProps<typeof Tabs> & {
+ status?: "success" | "degraded" | "error" | "info";
+}) {
+ return (
+ <Tabs
+ data-slot="status-banner-tabs"
+ data-status={status}
+ className={cn(
+ "gap-0",
+ "data-[status=success]:bg-success/20",
+ "data-[status=degraded]:bg-warning/20",
+ "data-[status=error]:bg-destructive/20",
+ "data-[status=info]:bg-info/20",
+ className,
+ )}
+ {...props}
+ >
+ {children}
+ </Tabs>
+ );
+}
+
+export function StatusBannerTabsList({
+ className,
+ children,
+ ...props
+}: React.ComponentProps<typeof TabsList>) {
+ return (
+ <div className={cn("rounded-t-lg", "w-full overflow-x-auto")}>
+ <TabsList
+ className={cn(
+ "rounded-none rounded-t-lg p-0",
+ "border-none",
+ className,
+ )}
+ {...props}
+ >
+ {children}
+ </TabsList>
+ </div>
+ );
+}
+
+export function StatusBannerTabsTrigger({
+ className,
+ children,
+ status,
+ ...props
+}: React.ComponentProps<typeof TabsTrigger> & {
+ status?: "success" | "degraded" | "error" | "info";
+}) {
+ return (
+ <TabsTrigger
+ data-slot="status-banner-tabs-trigger"
+ data-status={status}
+ className={cn(
+ "font-mono",
+ "rounded-none border-none focus-visible:ring-inset",
+ "h-full text-foreground data-[state=active]:text-background dark:text-foreground dark:data-[state=active]:text-background",
+ "data-[state=active]:data-[status=success]:bg-success data-[status=success]:bg-success/50 dark:data-[state=active]:data-[status=success]:bg-success dark:data-[status=success]:bg-success/50",
+ "data-[state=active]:data-[status=degraded]:bg-warning data-[status=degraded]:bg-warning/50 dark:data-[state=active]:data-[status=degraded]:bg-warning dark:data-[status=degraded]:bg-warning/50",
+ "data-[state=active]:data-[status=error]:bg-destructive data-[status=error]:bg-destructive/50 dark:data-[state=active]:data-[status=error]:bg-destructive dark:data-[status=error]:bg-destructive/50",
+ "data-[state=active]:data-[status=info]:bg-info data-[status=info]:bg-info/50 dark:data-[state=active]:data-[status=info]:bg-info dark:data-[status=info]:bg-info/50",
+ "data-[state=active]:shadow-none",
+ className,
+ )}
+ {...props}
+ >
+ {children}
+ </TabsTrigger>
+ );
+}
+
+// NOTE: tabing into content is not being highlighted
+export function StatusBannerTabsContent({
+ className,
+ children,
+ ...props
+}: React.ComponentProps<typeof TabsContent>) {
+ return (
+ <TabsContent className={cn("-mx-3", className)} {...props}>
+ {children}
+ </TabsContent>
+ );
+}
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 f574aa0e0..b10d2e790 100644
--- a/apps/status-page/src/components/status-page/status-events.tsx
+++ b/apps/status-page/src/components/status-page/status-events.tsx
@@ -124,6 +124,7 @@ export function StatusEventTimelineReport({
}
withSeparator={index !== updates.length - 1}
withDot={withDot}
+ isLast={index === updates.length - 1}
/>
))}
</div>
@@ -135,6 +136,7 @@ function StatusEventTimelineReportUpdate({
duration,
withSeparator = true,
withDot = true,
+ isLast = false,
}: {
report: {
date: Date;
@@ -144,6 +146,7 @@ function StatusEventTimelineReportUpdate({
withSeparator?: boolean;
duration?: string;
withDot?: boolean;
+ isLast?: boolean;
}) {
return (
<div data-variant={report.status} className="group">
@@ -157,7 +160,7 @@ function StatusEventTimelineReportUpdate({
{withSeparator ? <StatusEventTimelineSeparator /> : null}
</div>
) : null}
- <div className="mb-2">
+ <div className={cn(isLast ? "mb-0" : "mb-2")}>
<StatusEventTimelineTitle>
<span>{status[report.status]}</span>{" "}
{/* underline decoration-dashed underline-offset-2 decoration-muted-foreground/30 */}
@@ -209,7 +212,8 @@ export function StatusEventTimelineMaintenance({
</div>
</div>
) : null}
- <div className="mb-2">
+ {/* NOTE: is always last, no need for className="mb-2" */}
+ <div>
<StatusEventTimelineTitle>
<span>Maintenance</span>{" "}
<span className="font-mono text-muted-foreground/70 text-xs">
@@ -259,7 +263,10 @@ export function StatusEventTimelineMessage({
...props
}: React.ComponentProps<"div">) {
return (
- <div className={cn("text-muted-foreground text-sm", className)} {...props}>
+ <div
+ className={cn("font-mono text-muted-foreground text-sm", className)}
+ {...props}
+ >
{children}
</div>
);
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 2eb3fe2d1..2dc23ffd5 100644
--- a/apps/status-page/src/components/status-page/status-feed.tsx
+++ b/apps/status-page/src/components/status-page/status-feed.tsx
@@ -82,7 +82,7 @@ export function StatusFeed({
return (
<StatusEmptyState>
<Newspaper className="size-4 text-muted-foreground" />
- <StatusEmptyStateTitle>No recent reports</StatusEmptyStateTitle>
+ <StatusEmptyStateTitle>No recent notifications</StatusEmptyStateTitle>
<StatusEmptyStateDescription>
There have been no reports within the last 7 days.
</StatusEmptyStateDescription>
diff --git a/apps/status-page/src/components/status-page/status-monitor.tsx b/apps/status-page/src/components/status-page/status-monitor.tsx
index 899a67d3f..4dd2cbe4f 100644
--- a/apps/status-page/src/components/status-page/status-monitor.tsx
+++ b/apps/status-page/src/components/status-page/status-monitor.tsx
@@ -56,7 +56,7 @@ export function StatusMonitor({
{...props}
>
<div className="flex flex-row items-center justify-between gap-4">
- <div className="flex flex-row items-center gap-2">
+ <div className="flex flex-row min-w-0 items-center gap-2">
<StatusMonitorTitle>{monitor.name}</StatusMonitorTitle>
<StatusMonitorDescription>
{monitor.description}
@@ -90,7 +90,13 @@ export function StatusMonitorTitle({
...props
}: React.ComponentProps<"div">) {
return (
- <div className={cn("font-medium", className)} {...props}>
+ <div
+ className={cn(
+ "flex-1 truncate font-medium font-mono text-foreground leading-none",
+ className,
+ )}
+ {...props}
+ >
{children}
</div>
);
@@ -134,7 +140,7 @@ export function StatusMonitorIcon({
return (
<div
className={cn(
- "flex size-4 items-center justify-center rounded-full bg-muted text-background [&>svg]:size-2.5",
+ "flex size-[12.5px] items-center justify-center rounded-full bg-muted text-background [&>svg]:size-[9px]",
"group-data-[variant=success]/monitor:bg-success",
"group-data-[variant=degraded]/monitor:bg-warning",
"group-data-[variant=error]/monitor:bg-destructive",
@@ -159,7 +165,7 @@ export function StatusMonitorFooter({
isLoading?: boolean;
}) {
return (
- <div className="flex flex-row items-center justify-between text-muted-foreground text-xs">
+ <div className="flex flex-row items-center justify-between font-mono text-muted-foreground text-xs">
<div>
{isLoading ? (
<Skeleton className="h-4 w-18" />
@@ -185,7 +191,7 @@ export function StatusMonitorUptime({
return (
<div
{...props}
- className={cn("font-mono text-muted-foreground text-sm", className)}
+ className={cn("font-mono text-foreground text-sm leading-non", className)}
>
{children}
</div>
@@ -206,6 +212,7 @@ export function StatusMonitorStatus({
return (
<div
className={cn(
+ "font-mono",
"group-data-[variant=success]/monitor:text-success",
"group-data-[variant=degraded]/monitor:text-warning",
"group-data-[variant=error]/monitor:text-destructive",
diff --git a/apps/status-page/src/components/status-page/status-tracker.tsx b/apps/status-page/src/components/status-page/status-tracker.tsx
index 8116d7457..f32bbb16a 100644
--- a/apps/status-page/src/components/status-page/status-tracker.tsx
+++ b/apps/status-page/src/components/status-page/status-tracker.tsx
@@ -189,7 +189,7 @@ export function StatusTracker({ data }: { data: UptimeData }) {
<HoverCardTrigger asChild>
<div
className={cn(
- "group relative flex h-full w-full cursor-pointer flex-col px-px outline-none hover:opacity-80 focus-visible:border-ring focus-visible:ring-1 focus-visible:ring-ring/50 data-[aria-pressed=true]:opacity-80",
+ "group relative flex h-full w-full cursor-pointer flex-col px-px outline-none first:pl-0 last:pr-0 hover:opacity-80 focus-visible:border-ring focus-visible:ring-1 focus-visible:ring-ring/50 data-[aria-pressed=true]:opacity-80",
)}
onClick={() => handleBarClick(index)}
onFocus={() => handleBarFocus(index)}
diff --git a/apps/status-page/src/components/status-page/status.tsx b/apps/status-page/src/components/status-page/status.tsx
index 524906920..eb0d85017 100644
--- a/apps/status-page/src/components/status-page/status.tsx
+++ b/apps/status-page/src/components/status-page/status.tsx
@@ -181,7 +181,10 @@ export function StatusEmptyStateDescription({
...props
}: React.ComponentProps<"div">) {
return (
- <div className={cn("text-muted-foreground text-sm", className)} {...props}>
+ <div
+ className={cn("font-mono text-muted-foreground text-sm", className)}
+ {...props}
+ >
{children}
</div>
);
diff --git a/apps/web/next.config.js b/apps/web/next.config.js
index 62a6d84de..aa1f7f798 100644
--- a/apps/web/next.config.js
+++ b/apps/web/next.config.js
@@ -45,7 +45,6 @@ const nextConfig = {
async headers() {
return [{ source: "/(.*)", headers: securityHeaders }];
},
- trailingSlash: true,
async redirects() {
return [
{
@@ -66,6 +65,9 @@ const nextConfig = {
];
},
async rewrites() {
+ const HOST =
+ process.env.NODE_ENV === "development" ? "localhost:3001" : "stpg.dev";
+ const PROTOCOL = process.env.NODE_ENV === "development" ? "http" : "https";
return {
beforeFiles: [
// Proxy app subdomain to /app
@@ -79,9 +81,21 @@ const nextConfig = {
],
destination: "/app/:path*",
},
+ // New design: proxy Next.js assets from external host when cookie indicates "new"
+ {
+ source: "/_next/:path*",
+ has: [
+ { type: "cookie", key: "sp_mode", value: "new" },
+ {
+ type: "host",
+ value: "(?<slug>[^.]+)\\.(openstatus\\.dev|localhost)",
+ },
+ ],
+ destination: `${PROTOCOL}://${HOST}/_next/:path*`,
+ },
// New design: proxy app routes to external host with slug prefix
{
- source: "/:path*",
+ source: "/:path((?!_next/).*)",
has: [
{ type: "cookie", key: "sp_mode", value: "new" },
{
@@ -89,7 +103,8 @@ const nextConfig = {
value: "(?<slug>[^.]+)\\.(openstatus\\.dev|localhost)",
},
],
- destination: "https://:slug.stpg.dev/:path*",
+ // NOTE: might be different on prod and localhost (without :slug)
+ destination: `${PROTOCOL}://${HOST}/:slug/:path*`,
},
],
};