fix: per-page meta information

SquiggleTools · Sep 11, 2024 · 3351b94 · 3351b94
1 parent 6027215
commit 3351b94
Show file tree

Hide file tree

Showing 14 changed files with 59 additions and 16 deletions.
diff --git a/src/components/Head.astro b/src/components/Head.astro
@@ -1,16 +1,31 @@
 ---
-const description = "A Boston conference focused on excellent web dev tooling.";
+export interface Props {
+	description: string;
+	title?: string;
+}
+
+const { description } = Astro.props;
+
 const image = new URL("favicon.png", Astro.site).toString();
-const title = "SquiggleConf | Supercharging web devs and their tools.";
+
 const keywords = [
 	"squiggleconf",
 	"conference",
 	"devtools",
 	"javascript",
 	"typescript",
+	"rust",
 	"static analysis",
 ];
 
+const title = [
+	Astro.props.title,
+	"SquiggleConf",
+	"Supercharging web devs and their tools",
+]
+	.filter(Boolean)
+	.join(" | ");
+
 const metaPairs = [
 	{
 		content: description,

diff --git a/src/layouts/AdLayout.astro b/src/layouts/AdLayout.astro
@@ -14,7 +14,7 @@ interface Props {
 ---
 
 <html lang="en">
-	<Head />
+	<Head description="Internal ad page." title="Ad" />
 	<body>
 		<main>
 			<DeepBlueSea class="deep-blue-ad" unmasked={Astro.props.unmasked}>

diff --git a/src/layouts/BadgeLayout.astro b/src/layouts/BadgeLayout.astro
@@ -10,7 +10,7 @@ import "./normalize.css";
 ---
 
 <html lang="en">
-	<Head />
+	<Head description="Internal badge page." title="Badge" />
 	<body>
 		<main class="badge">
 			<DeepBlueSea class="deep-blue-badge" light="top">

diff --git a/src/layouts/BaseLayout.astro b/src/layouts/BaseLayout.astro
@@ -2,14 +2,16 @@
 import "@fontsource-variable/josefin-sans";
 import "@fontsource/urbanist";
 
-import Head from "~/components/Head.astro";
+import Head, { Props as HeadProps } from "~/components/Head.astro";
 
 import "./base.css";
 import "./normalize.css";
+
+type Props = HeadProps;
 ---
 
 <html lang="en">
-	<Head />
+	<Head {...Astro.props} />
 	<body>
 		<slot />
 	</body>

diff --git a/src/layouts/ContentLayout.astro b/src/layouts/ContentLayout.astro
@@ -3,13 +3,16 @@ import "@fontsource-variable/josefin-sans";
 import "@fontsource/urbanist";
 import { SkipLinks } from "accessible-astro-components";
 
+import { Props as HeadProps } from "~/components/Head.astro";
 import Footer from "~/components/Footer.astro";
 import Header from "~/components/Header.astro";
 
 import BaseLayout from "./BaseLayout.astro";
+
+type Props = HeadProps;
 ---
 
-<BaseLayout>
+<BaseLayout {...Astro.props}>
 	<SkipLinks />
 	<main id="main-content">
 		<Header />

diff --git a/src/pages/about.astro b/src/pages/about.astro
@@ -56,7 +56,10 @@ const bios: Omit<BioProps, "size">[] = [
 ] as const;
 ---
 
-<ContentLayout>
+<ContentLayout
+	description="About SquiggleConf: a Boston conference focused on excellent web dev tooling."
+	title="About Us"
+>
 	<HeroForPage>About Us</HeroForPage>
 
 	<PrimaryContents>

diff --git a/src/pages/ad/[type]/[slug].astro b/src/pages/ad/[type]/[slug].astro
@@ -33,7 +33,7 @@ const entity =
 ---
 
 <html lang="en">
-	<Head />
+	<Head description="Internal ad page." title="Ad" />
 	<body>
 		<main>
 			<DeepBlueSea class="deep-blue-ad">

diff --git a/src/pages/code-of-conduct.astro b/src/pages/code-of-conduct.astro
@@ -5,7 +5,10 @@ import PrimaryContents from "~/components/PrimaryContents.astro";
 import ContentLayout from "~/layouts/ContentLayout.astro";
 ---
 
-<ContentLayout>
+<ContentLayout
+	description="Code of Conduct for SquiggleConf: a Boston conference focused on excellent web dev tooling."
+	title="Code of Conduct"
+>
 	<HeroForPage>Code of Conduct</HeroForPage>
 
 	<PrimaryContents>

diff --git a/src/pages/faqs.astro b/src/pages/faqs.astro
@@ -6,7 +6,10 @@ import BodyText from "~/components/BodyText.astro";
 import PrimaryContents from "~/components/PrimaryContents.astro";
 ---
 
-<ContentLayout>
+<ContentLayout
+	description="FAQs for SquiggleConf: a Boston conference focused on excellent web dev tooling."
+	title="FAQs"
+>
 	<HeroForPage>Frequently Asked Questions</HeroForPage>
 
 	<PrimaryContents class="primary-faq-contents">

diff --git a/src/pages/index.astro b/src/pages/index.astro
@@ -11,7 +11,9 @@ import Sponsors from "~/components/Sponsors.astro";
 import ContentLayout from "~/layouts/ContentLayout.astro";
 ---
 
-<ContentLayout>
+<ContentLayout
+	description="A Boston conference focused on excellent web dev tooling."
+>
 	<PrimaryHero />
 	<PrimaryContents>
 		<div class="contents">

diff --git a/src/pages/schedule.astro b/src/pages/schedule.astro
@@ -8,7 +8,10 @@ import { days } from "~/data/schedule";
 import BodyText from "~/components/BodyText.astro";
 ---
 
-<ContentLayout>
+<ContentLayout
+	description="Schedule at SquiggleConf: a Boston conference focused on excellent web dev tooling."
+	title="Schedule"
+>
 	<HeroForPage>Schedule</HeroForPage>
 
 	<BodyText class="schedule-body-text" width="lean">

diff --git a/src/pages/sessions.astro b/src/pages/sessions.astro
@@ -32,7 +32,10 @@ const sections = [
 ] as const;
 ---
 
-<ContentLayout>
+<ContentLayout
+	description="Sessions at SquiggleConf: a Boston conference focused on excellent web dev tooling."
+	title="Sessions"
+>
 	<HeroForPage>Sessions</HeroForPage>
 
 	<PrimaryContents>

diff --git a/src/pages/speakers.astro b/src/pages/speakers.astro
@@ -13,7 +13,10 @@ const speakersToExclude = new Set([
 ]);
 ---
 
-<ContentLayout>
+<ContentLayout
+	description="Speakers at SquiggleConf: a Boston conference focused on excellent web dev tooling."
+	title="Speakers"
+>
 	<HeroForPage>Speakers</HeroForPage>
 
 	<PrimaryContents>

diff --git a/src/pages/travel.astro b/src/pages/travel.astro
@@ -6,7 +6,10 @@ import PrimaryContents from "~/components/PrimaryContents.astro";
 import ContentLayout from "~/layouts/ContentLayout.astro";
 ---
 
-<ContentLayout>
+<ContentLayout
+	description="Traveling to SquiggleConf: a Boston conference focused on excellent web dev tooling."
+	title="Travel Info"
+>
 	<HeroForPage>Travel</HeroForPage>
 
 	<PrimaryContents>