From 1406ee0f05dc688e1b7635d3ce14e63d1c42a973 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Sun, 04 Jun 2023 17:37:43 +0000
Subject: [PATCH] update spinners
---
quartz/plugins/emitters/contentPage.tsx | 47 ++++++++++++++++++++++++++++++++---------------
1 files changed, 32 insertions(+), 15 deletions(-)
diff --git a/quartz/plugins/emitters/contentPage.tsx b/quartz/plugins/emitters/contentPage.tsx
index 56a2a15..05c4c4b 100644
--- a/quartz/plugins/emitters/contentPage.tsx
+++ b/quartz/plugins/emitters/contentPage.tsx
@@ -1,15 +1,18 @@
import { toJsxRuntime } from "hast-util-to-jsx-runtime"
-import { resolveToRoot } from "../../path"
import { StaticResources } from "../../resources"
import { EmitCallback, QuartzEmitterPlugin } from "../types"
import { ProcessedContent } from "../vfile"
import { Fragment, jsx, jsxs } from 'preact/jsx-runtime'
import { render } from "preact-render-to-string"
-import { ComponentType } from "preact"
import { HeadProps } from "../../components/Head"
+import { GlobalConfiguration } from "../../cfg"
+import { HeaderProps } from "../../components/Header"
+import { QuartzComponent } from "../../components/types"
+import { resolveToRoot } from "../../path"
interface Options {
- Head: ComponentType<HeadProps>
+ Head: QuartzComponent<HeadProps>
+ Header: QuartzComponent<HeaderProps>
}
export class ContentPage extends QuartzEmitterPlugin {
@@ -21,31 +24,45 @@
this.opts = opts
}
- async emit(content: ProcessedContent[], resources: StaticResources, emit: EmitCallback): Promise<string[]> {
- const fps: string[] = []
- for (const [tree, file] of content) {
+ getQuartzComponents(): QuartzComponent<any>[] {
+ return [...Object.values(this.opts)]
+ }
+ async emit(cfg: GlobalConfiguration, content: ProcessedContent[], resources: StaticResources, emit: EmitCallback): Promise<string[]> {
+ const fps: string[] = []
+
+ const { Head, Header } = this.opts
+ for (const [tree, file] of content) {
// @ts-ignore (preact makes it angry)
const content = toJsxRuntime(tree, { Fragment, jsx, jsxs, elementAttributeNameCase: 'html' })
- const { Head } = this.opts
+ const baseDir = resolveToRoot(file.data.slug!)
+ const pageResources: StaticResources = {
+ css: [baseDir + "/index.css", ...resources.css,],
+ js: [
+ { src: baseDir + "/prescript.js", loadTime: "beforeDOMReady", type: 'module' },
+ ...resources.js,
+ { src: baseDir + "/postscript.js", loadTime: "afterDOMReady", type: 'module' }
+ ]
+ }
+
+ const title = file.data.frontmatter?.title
const doc = <html>
- <Head
- title={file.data.frontmatter?.title ?? "Untitled"}
+ <Head.Component
+ title={title ?? "Untitled"}
description={file.data.description ?? "No description provided"}
slug={file.data.slug!}
- externalResources={resources} />
+ externalResources={pageResources} />
<body>
- <div id="quartz-root">
- <header>
- <h1>{file.data.frontmatter?.title}</h1>
- </header>
+ <div id="quartz-root" class="page">
+ <Header.Component title={cfg.siteTitle} slug={file.data.slug!} />
<article>
+ {file.data.slug !== "index" && <h1>{title}</h1>}
{content}
</article>
</div>
</body>
- {resources.js.filter(resource => resource.loadTime === "afterDOMReady").map(resource => <script key={resource.src} src={resource.src} />)}
+ {pageResources.js.filter(resource => resource.loadTime === "afterDOMReady").map(resource => <script key={resource.src} {...resource} />)}
</html>
const fp = file.data.slug + ".html"
--
Gitblit v1.10.0