From df02ea20d7e12e8b9ffdd2968afaf5893c433488 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Fri, 11 Aug 2023 04:32:11 +0000
Subject: [PATCH] spacing fix
---
quartz/plugins/emitters/contentPage.tsx | 80 +++++++++++++--------------------------
1 files changed, 27 insertions(+), 53 deletions(-)
diff --git a/quartz/plugins/emitters/contentPage.tsx b/quartz/plugins/emitters/contentPage.tsx
index 7afab9d..dcf2829 100644
--- a/quartz/plugins/emitters/contentPage.tsx
+++ b/quartz/plugins/emitters/contentPage.tsx
@@ -1,75 +1,49 @@
-import { JSResourceToScriptElement, StaticResources } from "../../resources"
import { QuartzEmitterPlugin } from "../types"
-import { render } from "preact-render-to-string"
-import { QuartzComponent } from "../../components/types"
-import { resolveToRoot } from "../../path"
-import HeaderConstructor from "../../components/Header"
import { QuartzComponentProps } from "../../components/types"
+import HeaderConstructor from "../../components/Header"
import BodyConstructor from "../../components/Body"
+import { pageResources, renderPage } from "../../components/renderPage"
+import { FullPageLayout } from "../../cfg"
+import { FilePath, canonicalizeServer } from "../../path"
+import { defaultContentPageLayout, sharedPageComponents } from "../../../quartz.layout"
+import { Content } from "../../components"
-interface Options {
- head: QuartzComponent
- header: QuartzComponent[],
- body: QuartzComponent[],
- left: QuartzComponent[],
- right: QuartzComponent[],
- footer: QuartzComponent[],
-}
-
-export const ContentPage: QuartzEmitterPlugin<Options> = (opts) => {
- if (!opts) {
- throw new Error("ContentPage must be initialized with options specifiying the components to use")
+export const ContentPage: QuartzEmitterPlugin<Partial<FullPageLayout>> = (userOpts) => {
+ const opts: FullPageLayout = {
+ ...sharedPageComponents,
+ ...defaultContentPageLayout,
+ pageBody: Content(),
+ ...userOpts,
}
- const { head: Head, header, body } = opts
+ const { head: Head, header, beforeBody, pageBody, left, right, footer: Footer } = opts
const Header = HeaderConstructor()
const Body = BodyConstructor()
return {
name: "ContentPage",
getQuartzComponents() {
- return [opts.head, Header, Body, ...opts.header, ...opts.body, ...opts.left, ...opts.right, ...opts.footer]
+ return [Head, Header, Body, ...header, ...beforeBody, pageBody, ...left, ...right, Footer]
},
- async emit(_contentDir, cfg, content, resources, emit): Promise<string[]> {
- const fps: string[] = []
-
+ async emit(ctx, content, resources, emit): Promise<FilePath[]> {
+ const cfg = ctx.cfg.configuration
+ const fps: FilePath[] = []
+ const allFiles = content.map((c) => c[1].data)
for (const [tree, file] of content) {
- const baseDir = resolveToRoot(file.data.slug!)
- const pageResources: StaticResources = {
- css: [baseDir + "/index.css", ...resources.css],
- js: [
- { src: baseDir + "/prescript.js", loadTime: "beforeDOMReady", contentType: "external" },
- ...resources.js,
- { src: baseDir + "/postscript.js", loadTime: "afterDOMReady", moduleType: 'module', contentType: "external" }
- ]
- }
-
+ const slug = canonicalizeServer(file.data.slug!)
+ const externalResources = pageResources(slug, resources)
const componentData: QuartzComponentProps = {
fileData: file.data,
- externalResources: pageResources,
+ externalResources,
cfg,
children: [],
- tree
+ tree,
+ allFiles,
}
- const doc = <html>
- <Head {...componentData} />
- <body data-slug={file.data.slug}>
- <div id="quartz-root" class="page">
- <Header {...componentData} >
- {header.map(HeaderComponent => <HeaderComponent {...componentData} />)}
- </Header>
- <Body {...componentData}>
- {body.map(BodyComponent => <BodyComponent {...componentData} />)}
- </Body>
- </div>
- </body>
- {pageResources.js.filter(resource => resource.loadTime === "afterDOMReady").map(res => JSResourceToScriptElement(res))}
- </html>
-
- const fp = file.data.slug + ".html"
- await emit({
- content: "<!DOCTYPE html>\n" + render(doc),
+ const content = renderPage(slug, componentData, opts, externalResources)
+ const fp = await emit({
+ content,
slug: file.data.slug!,
ext: ".html",
})
@@ -77,6 +51,6 @@
fps.push(fp)
}
return fps
- }
+ },
}
}
--
Gitblit v1.10.0