From b99d4cd8ce99ea1e52a97654ab153774a6bc598a Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Sun, 20 Aug 2023 21:05:37 +0000
Subject: [PATCH] recent notes css fixes
---
quartz/plugins/emitters/folderPage.tsx | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/quartz/plugins/emitters/folderPage.tsx b/quartz/plugins/emitters/folderPage.tsx
index f5bc7a6..8d62f7b 100644
--- a/quartz/plugins/emitters/folderPage.tsx
+++ b/quartz/plugins/emitters/folderPage.tsx
@@ -6,7 +6,14 @@
import { ProcessedContent, defaultProcessedContent } from "../vfile"
import { FullPageLayout } from "../../cfg"
import path from "path"
-import { CanonicalSlug, FilePath, ServerSlug, canonicalizeServer, joinSegments } from "../../path"
+import {
+ FilePath,
+ FullSlug,
+ SimpleSlug,
+ _stripSlashes,
+ joinSegments,
+ simplifySlug,
+} from "../../util/path"
import { defaultListPageLayout, sharedPageComponents } from "../../../quartz.layout"
import { FolderContent } from "../../components"
@@ -32,10 +39,10 @@
const allFiles = content.map((c) => c[1].data)
const cfg = ctx.cfg.configuration
- const folders: Set<CanonicalSlug> = new Set(
+ const folders: Set<SimpleSlug> = new Set(
allFiles.flatMap((data) => {
const slug = data.slug
- const folderName = path.dirname(slug ?? "") as CanonicalSlug
+ const folderName = path.dirname(slug ?? "") as SimpleSlug
if (slug && folderName !== "." && folderName !== "tags") {
return [folderName]
}
@@ -47,21 +54,21 @@
[...folders].map((folder) => [
folder,
defaultProcessedContent({
- slug: joinSegments(folder, "index") as ServerSlug,
+ slug: joinSegments(folder, "index") as FullSlug,
frontmatter: { title: `Folder: ${folder}`, tags: [] },
}),
]),
)
for (const [tree, file] of content) {
- const slug = canonicalizeServer(file.data.slug!)
+ const slug = _stripSlashes(simplifySlug(file.data.slug!)) as SimpleSlug
if (folders.has(slug)) {
folderDescriptions[slug] = [tree, file]
}
}
for (const folder of folders) {
- const slug = folder
+ const slug = joinSegments(folder, "index") as FullSlug
const externalResources = pageResources(slug, resources)
const [tree, file] = folderDescriptions[folder]
const componentData: QuartzComponentProps = {
@@ -76,7 +83,7 @@
const content = renderPage(slug, componentData, opts, externalResources)
const fp = await emit({
content,
- slug: file.data.slug!,
+ slug,
ext: ".html",
})
--
Gitblit v1.10.0