From b33f13ccaf4ec14a94ee0ee467dda04cf4981d00 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Mon, 01 Jan 2024 22:20:34 +0000
Subject: [PATCH] fix: dont show last page if folder
---
quartz/plugins/emitters/contentPage.tsx | 128 ++++++++++++++++++++----------------------
1 files changed, 60 insertions(+), 68 deletions(-)
diff --git a/quartz/plugins/emitters/contentPage.tsx b/quartz/plugins/emitters/contentPage.tsx
index d44b709..338bfae 100644
--- a/quartz/plugins/emitters/contentPage.tsx
+++ b/quartz/plugins/emitters/contentPage.tsx
@@ -1,80 +1,72 @@
-import { StaticResources } from "../../resources"
-import { EmitCallback, QuartzEmitterPlugin } from "../types"
-import { ProcessedContent } from "../vfile"
-import { render } from "preact-render-to-string"
-import { GlobalConfiguration } from "../../cfg"
-import { QuartzComponent } from "../../components/types"
-import { resolveToRoot } from "../../path"
-import Header from "../../components/Header"
+import { QuartzEmitterPlugin } from "../types"
import { QuartzComponentProps } from "../../components/types"
-import Body from "../../components/Body"
+import HeaderConstructor from "../../components/Header"
+import BodyConstructor from "../../components/Body"
+import { pageResources, renderPage } from "../../components/renderPage"
+import { FullPageLayout } from "../../cfg"
+import { FilePath, pathToRoot } from "../../util/path"
+import { defaultContentPageLayout, sharedPageComponents } from "../../../quartz.layout"
+import { Content } from "../../components"
+import chalk from "chalk"
-interface Options {
- head: QuartzComponent
- header: QuartzComponent[],
- body: QuartzComponent[]
-}
-
-export class ContentPage extends QuartzEmitterPlugin {
- name = "ContentPage"
- opts: Options
-
- constructor(opts: Options) {
- super()
- this.opts = opts
+export const ContentPage: QuartzEmitterPlugin<Partial<FullPageLayout>> = (userOpts) => {
+ const opts: FullPageLayout = {
+ ...sharedPageComponents,
+ ...defaultContentPageLayout,
+ pageBody: Content(),
+ ...userOpts,
}
- getQuartzComponents(): QuartzComponent[] {
- return [this.opts.head, Header, ...this.opts.header, ...this.opts.body]
- }
+ const { head: Head, header, beforeBody, pageBody, left, right, footer: Footer } = opts
+ const Header = HeaderConstructor()
+ const Body = BodyConstructor()
- async emit(cfg: GlobalConfiguration, content: ProcessedContent[], resources: StaticResources, emit: EmitCallback): Promise<string[]> {
- const fps: string[] = []
+ return {
+ name: "ContentPage",
+ getQuartzComponents() {
+ return [Head, Header, Body, ...header, ...beforeBody, pageBody, ...left, ...right, Footer]
+ },
+ async emit(ctx, content, resources, emit): Promise<FilePath[]> {
+ const cfg = ctx.cfg.configuration
+ const fps: FilePath[] = []
+ const allFiles = content.map((c) => c[1].data)
- const { head: Head, header, body } = this.opts
- 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" },
- ...resources.js,
- { src: baseDir + "/postscript.js", loadTime: "afterDOMReady", type: 'module' }
- ]
+ let containsIndex = false
+ for (const [tree, file] of content) {
+ const slug = file.data.slug!
+ if (slug === "index") {
+ containsIndex = true
+ }
+
+ const externalResources = pageResources(pathToRoot(slug), resources)
+ const componentData: QuartzComponentProps = {
+ fileData: file.data,
+ externalResources,
+ cfg,
+ children: [],
+ tree,
+ allFiles,
+ }
+
+ const content = renderPage(slug, componentData, opts, externalResources)
+ const fp = await emit({
+ content,
+ slug,
+ ext: ".html",
+ })
+
+ fps.push(fp)
}
- const componentData: QuartzComponentProps = {
- fileData: file.data,
- externalResources: pageResources,
- cfg,
- children: [],
- tree
+ if (!containsIndex) {
+ console.log(
+ chalk.yellow(
+ `\nWarning: you seem to be missing an \`index.md\` home page file at the root of your \`${ctx.argv.directory}\` folder. This may cause errors when deploying.`,
+ ),
+ )
}
- const doc = <html>
- <Head {...componentData} />
- <body>
- <div id="quartz-root" class="page">
- <Header {...componentData} >
- {header.map(HeaderComponent => <HeaderComponent {...componentData} position="header" />)}
- </Header>
- <Body {...componentData}>
- {body.map(BodyComponent => <BodyComponent {...componentData } position="body" />)}
- </Body>
- </div>
- </body>
- {pageResources.js.filter(resource => resource.loadTime === "afterDOMReady").map(resource => <script key={resource.src} {...resource} />)}
- </html>
-
- const fp = file.data.slug + ".html"
- await emit({
- content: "<!DOCTYPE html>\n" + render(doc),
- slug: file.data.slug!,
- ext: ".html",
- })
-
- fps.push(fp)
- }
- return fps
+ return fps
+ },
}
}
--
Gitblit v1.10.0