Skip to content

Open-source status page, incident response and uptime monitoring

chore: stpg improvements (#1362)

Maximilian Kaske762630dd9274
diff --git a/apps/status-page/src/app/(status-page)/[domain]/(public)/layout.tsx b/apps/status-page/src/app/(status-page)/[domain]/(public)/layout.tsx
index b2f16ca1b..5005dcf13 100644
--- a/apps/status-page/src/app/(status-page)/[domain]/(public)/layout.tsx
+++ b/apps/status-page/src/app/(status-page)/[domain]/(public)/layout.tsx
@@ -1,9 +1,5 @@
-import { defaultMetadata, ogMetadata, twitterMetadata } from "@/app/metadata";
import { Footer } from "@/components/nav/footer";
import { Header } from "@/components/nav/header";
-import { getQueryClient, trpc } from "@/lib/trpc/server";
-import type { Metadata } from "next";
-import { notFound } from "next/navigation";
export default function Layout({ children }: { children: React.ReactNode }) {
return (
@@ -16,48 +12,3 @@ export default function Layout({ children }: { children: React.ReactNode }) {
</div>
);
}
-
-export async function generateMetadata({
- params,
-}: {
- params: Promise<{ domain: string }>;
-}): Promise<Metadata> {
- const queryClient = getQueryClient();
- const { domain } = await params;
- const page = await queryClient.fetchQuery(
- trpc.statusPage.get.queryOptions({ slug: domain }),
- );
-
- if (!page) return notFound();
-
- return {
- ...defaultMetadata,
- title: {
- template: `%s | ${page.title}`,
- default: page?.title,
- },
- description: page?.description,
- icons: page?.icon,
- alternates: {
- canonical: page?.customDomain
- ? `https://${page.customDomain}`
- : `https://${page.slug}.openstatus.dev`,
- },
- twitter: {
- ...twitterMetadata,
- images: [
- `/api/og/page?slug=${page?.slug}&passwordProtected=${page?.passwordProtected}`,
- ],
- title: page?.title,
- description: page?.description,
- },
- openGraph: {
- ...ogMetadata,
- images: [
- `/api/og/page?slug=${page?.slug}&passwordProtected=${page?.passwordProtected}`,
- ],
- title: page?.title,
- description: page?.description,
- },
- };
-}
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 b7bf4cdab..fde5590d5 100644
--- a/apps/status-page/src/app/(status-page)/[domain]/layout.tsx
+++ b/apps/status-page/src/app/(status-page)/[domain]/layout.tsx
@@ -1,3 +1,4 @@
+import { defaultMetadata, ogMetadata, twitterMetadata } from "@/app/metadata";
import {
FloatingButton,
StatusPageProvider,
@@ -5,6 +6,8 @@ import {
import { ThemeProvider } from "@/components/theme-provider";
import { Toaster } from "@/components/ui/sonner";
import { HydrateClient, getQueryClient, trpc } from "@/lib/trpc/server";
+import type { Metadata } from "next";
+import { notFound } from "next/navigation";
import { z } from "zod";
export const schema = z.object({
@@ -55,3 +58,48 @@ export default async function Layout({
</HydrateClient>
);
}
+
+export async function generateMetadata({
+ params,
+}: {
+ params: Promise<{ domain: string }>;
+}): Promise<Metadata> {
+ const queryClient = getQueryClient();
+ const { domain } = await params;
+ const page = await queryClient.fetchQuery(
+ trpc.statusPage.get.queryOptions({ slug: domain }),
+ );
+
+ if (!page) return notFound();
+
+ return {
+ ...defaultMetadata,
+ title: {
+ template: `%s | ${page.title}`,
+ default: page?.title,
+ },
+ description: page?.description,
+ icons: page?.icon,
+ alternates: {
+ canonical: page?.customDomain
+ ? `https://${page.customDomain}`
+ : `https://${page.slug}.openstatus.dev`,
+ },
+ twitter: {
+ ...twitterMetadata,
+ images: [
+ `/api/og/page?slug=${page?.slug}&passwordProtected=${page?.passwordProtected}`,
+ ],
+ title: page?.title,
+ description: page?.description,
+ },
+ openGraph: {
+ ...ogMetadata,
+ images: [
+ `/api/og/page?slug=${page?.slug}&passwordProtected=${page?.passwordProtected}`,
+ ],
+ title: page?.title,
+ description: page?.description,
+ },
+ };
+}
diff --git a/apps/status-page/src/app/apple.ico b/apps/status-page/src/app/apple.ico
deleted file mode 100644
index 511817033..000000000
Binary files a/apps/status-page/src/app/apple.ico and /dev/null differ
diff --git a/apps/status-page/src/app/favicon.ico b/apps/status-page/src/app/favicon.ico
deleted file mode 100644
index 511817033..000000000
Binary files a/apps/status-page/src/app/favicon.ico and /dev/null differ
diff --git a/apps/status-page/src/app/metadata.ts b/apps/status-page/src/app/metadata.ts
index fd9971e17..d133ade2b 100644
--- a/apps/status-page/src/app/metadata.ts
+++ b/apps/status-page/src/app/metadata.ts
@@ -14,6 +14,7 @@ export const defaultMetadata: Metadata = {
template: `%s | ${TITLE}`,
default: TITLE,
},
+ icons: "https://www.openstatus.dev/favicon.ico",
description: DESCRIPTION,
metadataBase: new URL("https://www.openstatus.dev"),
};
diff --git a/apps/status-page/src/components/nav/footer.tsx b/apps/status-page/src/components/nav/footer.tsx
index 4563fa1d3..e328e706a 100644
--- a/apps/status-page/src/components/nav/footer.tsx
+++ b/apps/status-page/src/components/nav/footer.tsx
@@ -20,7 +20,7 @@ export function Footer(props: React.ComponentProps<"footer">) {
return (
<footer {...props}>
- <div className="mx-auto flex gap-4 max-w-2xl items-center justify-between px-3 py-2">
+ <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={cn(
diff --git a/apps/status-page/src/components/nav/header.tsx b/apps/status-page/src/components/nav/header.tsx
index cb89b79b8..a69997769 100644
--- a/apps/status-page/src/components/nav/header.tsx
+++ b/apps/status-page/src/components/nav/header.tsx
@@ -10,11 +10,17 @@ import {
SheetTitle,
SheetTrigger,
} from "@/components/ui/sheet";
+import {
+ Tooltip,
+ TooltipContent,
+ TooltipProvider,
+ TooltipTrigger,
+} from "@/components/ui/tooltip";
import { usePathnamePrefix } from "@/hooks/use-pathname-prefix";
import { useTRPC } from "@/lib/trpc/client";
import { cn } from "@/lib/utils";
import { useMutation, useQuery } from "@tanstack/react-query";
-import { Menu } from "lucide-react";
+import { Menu, MessageCircleMore } from "lucide-react";
import NextLink from "next/link";
import { useParams, usePathname } from "next/navigation";
import { useState } from "react";
@@ -62,6 +68,8 @@ export function Header(props: React.ComponentProps<"header">) {
}),
);
+ const hasSubscribers = page?.workspacePlan !== "free";
+
const types = (
page?.workspacePlan === "free" ? ["rss", "atom"] : ["email", "rss", "atom"]
) satisfies ("email" | "rss" | "atom")[];
@@ -70,8 +78,13 @@ export function Header(props: React.ComponentProps<"header">) {
<header {...props}>
<nav className="mx-auto flex max-w-2xl items-center justify-between gap-3 px-3 py-2">
{/* NOTE: same width as the `StatusUpdates` button */}
- <div className="w-[105px] shrink-0">
- <Link href="/">
+ <div className="w-[150px] shrink-0">
+ <Link
+ href={page?.homepageUrl ?? "/"}
+ target={page?.homepageUrl ? "_blank" : undefined}
+ rel={page?.homepageUrl ? "noreferrer" : undefined}
+ className="rounded-full"
+ >
{page?.icon ? (
<img
src={page.icon}
@@ -82,23 +95,23 @@ export function Header(props: React.ComponentProps<"header">) {
</Link>
</div>
<NavDesktop className="hidden md:flex" />
- <StatusUpdates
- className="hidden md:block"
- types={types}
- onSubscribe={async (email) => {
- await subscribeMutation.mutateAsync({ slug: domain, email });
- }}
- slug={page?.slug}
- />
- <div className="flex gap-3 md:hidden">
- <NavMobile />
- <StatusUpdates
- types={types}
- onSubscribe={async (email) => {
- await subscribeMutation.mutateAsync({ slug: domain, email });
- }}
- slug={page?.slug}
- />
+ <div className="flex min-w-[150px] items-center justify-end gap-2">
+ {page?.contactUrl ? (
+ <GetInTouch
+ buttonType={!hasSubscribers ? "text" : "icon"}
+ link={page.contactUrl}
+ />
+ ) : null}
+ {hasSubscribers ? (
+ <StatusUpdates
+ types={types}
+ onSubscribe={async (email) => {
+ await subscribeMutation.mutateAsync({ slug: domain, email });
+ }}
+ slug={page?.slug}
+ />
+ ) : null}
+ <NavMobile className="md:hidden" />
</div>
</nav>
</header>
@@ -138,7 +151,7 @@ function NavMobile({
<Button
variant="secondary"
size="sm"
- className={cn("size-8", className)}
+ className={cn("size-8 border", className)}
{...props}
>
<Menu />
@@ -171,3 +184,52 @@ function NavMobile({
</Sheet>
);
}
+
+function GetInTouch({
+ buttonType,
+ className,
+ link,
+ ...props
+}: React.ComponentProps<typeof Button> & {
+ buttonType: "icon" | "text";
+ link: string;
+}) {
+ if (buttonType === "text") {
+ return (
+ <Button
+ variant="outline"
+ size="sm"
+ type="button"
+ className={className}
+ asChild
+ {...props}
+ >
+ <a href={link} target="_blank" rel="noreferrer">
+ Get in touch
+ </a>
+ </Button>
+ );
+ }
+ return (
+ <TooltipProvider>
+ <Tooltip>
+ <TooltipTrigger asChild>
+ <Button
+ variant="ghost"
+ size="icon"
+ type="button"
+ className={cn("size-8", className)}
+ {...props}
+ >
+ <a href={link} target="_blank" rel="noreferrer">
+ <MessageCircleMore />
+ </a>
+ </Button>
+ </TooltipTrigger>
+ <TooltipContent>
+ <p>Get in touch</p>
+ </TooltipContent>
+ </Tooltip>
+ </TooltipProvider>
+ );
+}