Convert most TSX pages to Typescript

UW-Macrostrat · Jan 21, 2024 · 19af62d · 19af62d
1 parent a38ad7a
commit 19af62d
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 69 deletions.
diff --git a/src/pages/+Page.ts b/src/pages/+Page.ts
@@ -0,0 +1,13 @@
+import h from "@macrostrat/hyper";
+import { Link } from "~/renderer/Link";
+
+export function Page() {
+  return h([
+    h("h1", "Macrostrat dev"),
+    h("ul", [
+      h("li", h(Link, { href: "map" }, "Map")),
+      h("li", h(Link, { href: "maps" }, "Map index")),
+      h("li", h(Link, { href: "dev" }, "Dev layers")),
+    ]),
+  ]);
+}
diff --git a/src/pages/+Page.tsx b/src/pages/+Page.tsx
diff --git a/src/pages/_error/+Page.ts b/src/pages/_error/+Page.ts
@@ -0,0 +1,14 @@
+export { Page };
+
+import h from "@macrostrat/hyper";
+
+function Page({ is404 }: { is404: boolean }) {
+  if (is404) {
+    return h([
+      h("h1", "404 Page Not Found"),
+      h("p", "This page could not be found."),
+    ]);
+  } else {
+    return h([h("h1", "500 Internal Error"), h("p", "Something went wrong.")]);
+  }
+}
diff --git a/src/pages/_error/+Page.tsx b/src/pages/_error/+Page.tsx
diff --git a/src/pages/about/+Page.tsx b/src/pages/about/+Page.tsx
diff --git a/src/pages/about/code.css b/src/pages/about/code.css
diff --git a/src/renderer/+onRenderClient.tsx → src/renderer/+onRenderClient.ts b/src/renderer/+onRenderClient.tsx → src/renderer/+onRenderClient.ts
@@ -1,6 +1,7 @@
 export { render as onRenderClient };
 
 import { FocusStyleManager } from "@blueprintjs/core";
+import h from "@macrostrat/hyper";
 import { hydrateRoot } from "react-dom/client";
 import { PageShell } from "./page-shell";
 import type { PageContextClient } from "./types";
@@ -18,12 +19,7 @@ async function render(pageContext: PageContextClient) {
   console.log("Rendering on client");
   const root = document.getElementById("app-container");
   if (!root) throw new Error("DOM element #react-root not found");
-  hydrateRoot(
-    root,
-    <PageShell pageContext={pageContext}>
-      <Page {...pageProps} />
-    </PageShell>
-  );
+  hydrateRoot(root, h(PageShell, { pageContext }, h(Page, pageProps)));
 }
 
 /* To enable Client-side Routing:

diff --git a/src/renderer/+onRenderHtml.tsx → src/renderer/+onRenderHtml.ts b/src/renderer/+onRenderHtml.tsx → src/renderer/+onRenderHtml.ts
@@ -1,6 +1,7 @@
 export { render as onRenderHtml };
 // See https://vike.dev/data-fetching
 
+import h from "@macrostrat/hyper";
 import ReactDOMServer from "react-dom/server";
 import { dangerouslySkipEscape, escapeInject } from "vike/server";
 import { PageShell } from "./page-shell";
@@ -12,9 +13,7 @@ async function render(pageContext: PageContextServer) {
   if (!Page)
     throw new Error("render() hook expects pageContext.Page to be defined");
   const pageHtml = ReactDOMServer.renderToString(
-    <PageShell pageContext={pageContext}>
-      <Page {...pageProps} />
-    </PageShell>
+    h(PageShell, { pageContext }, h(Page, pageProps))
   );
 
   // See https://vike.dev/head

diff --git a/src/renderer/Link.tsx → src/renderer/Link.ts b/src/renderer/Link.tsx → src/renderer/Link.ts
@@ -1,3 +1,4 @@
+import h from "@macrostrat/hyper";
 import { usePageContext } from "./page-context";
 
 export function Link(props: {
@@ -12,5 +13,5 @@ export function Link(props: {
   ]
     .filter(Boolean)
     .join(" ");
-  return <a {...props} className={className} />;
+  return h("a", { ...props, className });
 }