From fa6c02d3213dfd4e6da8e78bd3a2e7004555fd01 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Wed, 24 Jan 2024 01:08:56 +0000
Subject: [PATCH] fix: make search result card block
---
quartz/plugins/emitters/contentPage.tsx | 61 +++++++++++++++++++-----------
1 files changed, 39 insertions(+), 22 deletions(-)
diff --git a/quartz/plugins/emitters/contentPage.tsx b/quartz/plugins/emitters/contentPage.tsx
index 889cf60..f8e6404 100644
--- a/quartz/plugins/emitters/contentPage.tsx
+++ b/quartz/plugins/emitters/contentPage.tsx
@@ -4,54 +4,71 @@
import BodyConstructor from "../../components/Body"
import { pageResources, renderPage } from "../../components/renderPage"
import { FullPageLayout } from "../../cfg"
-import { FilePath, canonicalizeServer } from "../../path"
+import { FilePath, pathToRoot } from "../../util/path"
+import { defaultContentPageLayout, sharedPageComponents } from "../../../quartz.layout"
+import { Content } from "../../components"
+import chalk from "chalk"
+import { write } from "./helpers"
-export const ContentPage: QuartzEmitterPlugin<FullPageLayout> = (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, beforeBody, pageBody: Content, left, right, footer: Footer } = opts
+ const { head: Head, header, beforeBody, pageBody, left, right, footer: Footer } = opts
const Header = HeaderConstructor()
const Body = BodyConstructor()
return {
name: "ContentPage",
getQuartzComponents() {
- return [Head, Header, Body, ...header, ...beforeBody, Content, ...left, ...right, Footer]
+ return [Head, Header, Body, ...header, ...beforeBody, pageBody, ...left, ...right, Footer]
},
- async emit(_contentDir, cfg, content, resources, emit): Promise<FilePath[]> {
+ async emit(ctx, content, resources): Promise<FilePath[]> {
+ const cfg = ctx.cfg.configuration
const fps: FilePath[] = []
- const allFiles = content.map(c => c[1].data)
+ const allFiles = content.map((c) => c[1].data)
+
+ let containsIndex = false
for (const [tree, file] of content) {
- const slug = canonicalizeServer(file.data.slug!)
- const externalResources = pageResources(slug, resources)
+ 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
+ allFiles,
}
- const content = renderPage(
- slug,
- componentData,
- opts,
- externalResources
- )
-
- const fp = file.data.slug + ".html" as FilePath
- await emit({
+ const content = renderPage(slug, componentData, opts, externalResources)
+ const fp = await write({
+ ctx,
content,
- slug: file.data.slug!,
+ slug,
ext: ".html",
})
fps.push(fp)
}
+
+ 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.`,
+ ),
+ )
+ }
+
return fps
- }
+ },
}
}
--
Gitblit v1.10.0