From 0c199975f2d469ecdfd7efcf2ddd16ffa1dc492b Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Thu, 17 Aug 2023 07:55:28 +0000
Subject: [PATCH] various path fixes for links to extensions, fix relative paths in links
---
quartz/components/renderPage.tsx | 136 ++++++++++++++++++++++++++++----------------
1 files changed, 86 insertions(+), 50 deletions(-)
diff --git a/quartz/components/renderPage.tsx b/quartz/components/renderPage.tsx
index c70f092..171c414 100644
--- a/quartz/components/renderPage.tsx
+++ b/quartz/components/renderPage.tsx
@@ -1,22 +1,25 @@
-import { render } from "preact-render-to-string";
-import { QuartzComponent, QuartzComponentProps } from "./types";
+import { render } from "preact-render-to-string"
+import { QuartzComponent, QuartzComponentProps } from "./types"
import HeaderConstructor from "./Header"
import BodyConstructor from "./Body"
-import { JSResourceToScriptElement, StaticResources } from "../resources";
-import { resolveToRoot } from "../path";
+import { JSResourceToScriptElement, StaticResources } from "../util/resources"
+import { CanonicalSlug, pathToRoot } from "../util/path"
interface RenderComponents {
head: QuartzComponent
- header: QuartzComponent[],
- beforeBody: QuartzComponent[],
- pageBody: QuartzComponent,
- left: QuartzComponent[],
- right: QuartzComponent[],
- footer: QuartzComponent,
+ header: QuartzComponent[]
+ beforeBody: QuartzComponent[]
+ pageBody: QuartzComponent
+ left: QuartzComponent[]
+ right: QuartzComponent[]
+ footer: QuartzComponent
}
-export function pageResources(slug: string, staticResources: StaticResources): StaticResources {
- const baseDir = resolveToRoot(slug)
+export function pageResources(
+ slug: CanonicalSlug,
+ staticResources: StaticResources,
+): StaticResources {
+ const baseDir = pathToRoot(slug)
const contentIndexPath = baseDir + "/static/contentIndex.json"
const contentIndexScript = `const fetchData = fetch(\`${contentIndexPath}\`).then(data => data.json())`
@@ -25,56 +28,89 @@
css: [baseDir + "/index.css", ...staticResources.css],
js: [
{ src: baseDir + "/prescript.js", loadTime: "beforeDOMReady", contentType: "external" },
- { loadTime: "afterDOMReady", contentType: "inline", spaPreserve: true, script: contentIndexScript },
+ {
+ loadTime: "beforeDOMReady",
+ contentType: "inline",
+ spaPreserve: true,
+ script: contentIndexScript,
+ },
...staticResources.js,
- { src: baseDir + "/postscript.js", loadTime: "afterDOMReady", moduleType: 'module', contentType: "external" }
- ]
+ {
+ src: baseDir + "/postscript.js",
+ loadTime: "afterDOMReady",
+ moduleType: "module",
+ contentType: "external",
+ },
+ ],
}
}
-export function renderPage(slug: string, componentData: QuartzComponentProps, components: RenderComponents, pageResources: StaticResources): string {
- const { head: Head, header, beforeBody, pageBody: Content, left, right, footer: Footer } = components
+export function renderPage(
+ slug: CanonicalSlug,
+ componentData: QuartzComponentProps,
+ components: RenderComponents,
+ pageResources: StaticResources,
+): string {
+ const {
+ head: Head,
+ header,
+ beforeBody,
+ pageBody: Content,
+ left,
+ right,
+ footer: Footer,
+ } = components
const Header = HeaderConstructor()
const Body = BodyConstructor()
- const LeftComponent =
- <div class="left">
- <div class="left-inner">
- {left.map(BodyComponent => <BodyComponent {...componentData} />)}
- </div>
+ const LeftComponent = (
+ <div class="left sidebar">
+ {left.map((BodyComponent) => (
+ <BodyComponent {...componentData} />
+ ))}
</div>
+ )
- const RightComponent =
- <div class="right">
- <div class="right-inner">
- {right.map(BodyComponent => <BodyComponent {...componentData} />)}
- </div>
+ const RightComponent = (
+ <div class="right sidebar">
+ {right.map((BodyComponent) => (
+ <BodyComponent {...componentData} />
+ ))}
</div>
+ )
- const doc = <html>
- <Head {...componentData} />
- <body data-slug={slug}>
- <div id="quartz-root" class="page">
- <div class="page-header">
- <Header {...componentData} >
- {header.map(HeaderComponent => <HeaderComponent {...componentData} />)}
- </Header>
- <div class="popover-hint">
- {beforeBody.map(BodyComponent => <BodyComponent {...componentData} />)}
- </div>
+ const doc = (
+ <html>
+ <Head {...componentData} />
+ <body data-slug={slug}>
+ <div id="quartz-root" class="page">
+ <Body {...componentData}>
+ {LeftComponent}
+ <div class="center">
+ <div class="page-header">
+ <Header {...componentData}>
+ {header.map((HeaderComponent) => (
+ <HeaderComponent {...componentData} />
+ ))}
+ </Header>
+ <div class="popover-hint">
+ {beforeBody.map((BodyComponent) => (
+ <BodyComponent {...componentData} />
+ ))}
+ </div>
+ </div>
+ <Content {...componentData} />
+ </div>
+ {RightComponent}
+ </Body>
+ <Footer {...componentData} />
</div>
- <Body {...componentData}>
- {LeftComponent}
- <div class="center">
- <Content {...componentData} />
- <Footer {...componentData} />
- </div>
- {RightComponent}
- </Body>
- </div>
- </body>
- {pageResources.js.filter(resource => resource.loadTime === "afterDOMReady").map(res => JSResourceToScriptElement(res))}
- </html>
+ </body>
+ {pageResources.js
+ .filter((resource) => resource.loadTime === "afterDOMReady")
+ .map((res) => JSResourceToScriptElement(res))}
+ </html>
+ )
return "<!DOCTYPE html>\n" + render(doc)
}
--
Gitblit v1.10.0