From 8da2860e0a77955ee59c49252b741ce82f5e2853 Mon Sep 17 00:00:00 2001
From: Chris Amico <eyeseast@gmail.com>
Date: Thu, 16 Jan 2025 13:53:45 -0500
Subject: [PATCH] Don't just catch everything as a flat page

---
 .../(pages)/{[...path] => about}/+page.svelte |  2 +-
 src/routes/(pages)/about/+page.ts             | 26 +++++++++++++++++++
 .../(pages)/help/[...path]/+page.svelte       | 14 ++++++++++
 .../(pages)/{ => help}/[...path]/+page.ts     |  5 ++--
 4 files changed, 44 insertions(+), 3 deletions(-)
 rename src/routes/(pages)/{[...path] => about}/+page.svelte (74%)
 create mode 100644 src/routes/(pages)/about/+page.ts
 create mode 100644 src/routes/(pages)/help/[...path]/+page.svelte
 rename src/routes/(pages)/{ => help}/[...path]/+page.ts (73%)

diff --git a/src/routes/(pages)/[...path]/+page.svelte b/src/routes/(pages)/about/+page.svelte
similarity index 74%
rename from src/routes/(pages)/[...path]/+page.svelte
rename to src/routes/(pages)/about/+page.svelte
index fe1c76220..f1309d212 100644
--- a/src/routes/(pages)/[...path]/+page.svelte
+++ b/src/routes/(pages)/about/+page.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import Flatpage from "@/lib/components/layouts/Flatpage.svelte";
+  import Flatpage from "$lib/components/layouts/Flatpage.svelte";
 
   export let data;
 
diff --git a/src/routes/(pages)/about/+page.ts b/src/routes/(pages)/about/+page.ts
new file mode 100644
index 000000000..87f5f662d
--- /dev/null
+++ b/src/routes/(pages)/about/+page.ts
@@ -0,0 +1,26 @@
+import { error } from "@sveltejs/kit";
+
+import { PAGE_MAX_AGE } from "@/config/config.js";
+import * as flatpages from "$lib/api/flatpages";
+
+export const trailingSlash = "always";
+
+const path = "/about/";
+
+export async function load({ fetch, setHeaders }) {
+  const { data, error: err } = await flatpages.get(path, fetch);
+
+  if (err) {
+    return error(err.status, { message: err.message });
+  }
+
+  if (!data) {
+    return error(404, "Page not found");
+  }
+
+  setHeaders({
+    "cache-control": `public, max-age=${PAGE_MAX_AGE}`,
+  });
+
+  return data;
+}
diff --git a/src/routes/(pages)/help/[...path]/+page.svelte b/src/routes/(pages)/help/[...path]/+page.svelte
new file mode 100644
index 000000000..f1309d212
--- /dev/null
+++ b/src/routes/(pages)/help/[...path]/+page.svelte
@@ -0,0 +1,14 @@
+<script lang="ts">
+  import Flatpage from "$lib/components/layouts/Flatpage.svelte";
+
+  export let data;
+
+  $: title = data.title;
+  $: content = data.content;
+</script>
+
+<svelte:head>
+  <title>{title} | DocumentCloud</title>
+</svelte:head>
+
+<Flatpage {content} />
diff --git a/src/routes/(pages)/[...path]/+page.ts b/src/routes/(pages)/help/[...path]/+page.ts
similarity index 73%
rename from src/routes/(pages)/[...path]/+page.ts
rename to src/routes/(pages)/help/[...path]/+page.ts
index 51a4da8bf..a252ee74d 100644
--- a/src/routes/(pages)/[...path]/+page.ts
+++ b/src/routes/(pages)/help/[...path]/+page.ts
@@ -4,10 +4,11 @@ import { error } from "@sveltejs/kit";
 import { PAGE_MAX_AGE } from "@/config/config.js";
 import * as flatpages from "$lib/api/flatpages";
 
-export const trailingSlash = "ignore";
+export const trailingSlash = "always";
 
 export async function load({ fetch, params, setHeaders }) {
-  const { data, error: err } = await flatpages.get(params.path, fetch);
+  const path = ["help", ...params.path.split("/")].join("/");
+  const { data, error: err } = await flatpages.get(path, fetch);
 
   if (err) {
     return error(err.status, { message: err.message });