fix tag pages to emit to tag/index.html to override content and folder pages
This commit is contained in:
parent
83d47f7aaa
commit
01d7d8e554
@ -128,16 +128,6 @@ yargs(hideBin(process.argv))
|
|||||||
]
|
]
|
||||||
}))
|
}))
|
||||||
|
|
||||||
// TODO
|
|
||||||
const linkResolutionStrategy = exitIfCancel(await select({
|
|
||||||
message: `Choose how Quartz should resolve links in your content. You can change this later in \`quartz.config.ts\`.`,
|
|
||||||
options: [
|
|
||||||
{ value: 'absolute', label: "Treat links as absolute path", hint: "for content made for Quartz 3 and Hugo" },
|
|
||||||
{ value: 'shortest', label: "Treat links as shortest path", hint: "for most Obsidian vaults" },
|
|
||||||
{ value: 'relative', label: "Treat links as relative paths", hint: "for just normal Markdown files" },
|
|
||||||
]
|
|
||||||
}))
|
|
||||||
|
|
||||||
async function rmContentFolder() {
|
async function rmContentFolder() {
|
||||||
const contentStat = await fs.promises.lstat(contentFolder)
|
const contentStat = await fs.promises.lstat(contentFolder)
|
||||||
if (contentStat) {
|
if (contentStat) {
|
||||||
@ -183,6 +173,16 @@ See the [documentation](https://quartz.jzhao.xyz) for how to get started.
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// get a prefered link resolution strategy
|
||||||
|
const linkResolutionStrategy = exitIfCancel(await select({
|
||||||
|
message: `Choose how Quartz should resolve links in your content. You can change this later in \`quartz.config.ts\`.`,
|
||||||
|
options: [
|
||||||
|
{ value: 'absolute', label: "Treat links as absolute path", hint: "for content made for Quartz 3 and Hugo" },
|
||||||
|
{ value: 'shortest', label: "Treat links as shortest path", hint: "for most Obsidian vaults" },
|
||||||
|
{ value: 'relative', label: "Treat links as relative paths", hint: "for just normal Markdown files" },
|
||||||
|
]
|
||||||
|
}))
|
||||||
|
|
||||||
// now, do config changes
|
// now, do config changes
|
||||||
const configFilePath = path.join(cwd, "quartz.config.ts")
|
const configFilePath = path.join(cwd, "quartz.config.ts")
|
||||||
let configContent = await fs.promises.readFile(configFilePath, { encoding: 'utf-8' })
|
let configContent = await fs.promises.readFile(configFilePath, { encoding: 'utf-8' })
|
||||||
|
@ -61,7 +61,11 @@ export default async function buildQuartz(argv: Argv, version: string) {
|
|||||||
directoryListing: false,
|
directoryListing: false,
|
||||||
})
|
})
|
||||||
const status = res.statusCode
|
const status = res.statusCode
|
||||||
const statusString = status === 200 ? chalk.green(`[${status}]`) : chalk.red(`[${status}]`)
|
const statusString = (status >= 200 && status < 300) ?
|
||||||
|
chalk.green(`[${status}]`) :
|
||||||
|
(status >= 300 && status < 400) ?
|
||||||
|
chalk.yellow(`[${status}]`) :
|
||||||
|
chalk.red(`[${status}]`)
|
||||||
console.log(statusString + chalk.grey(` ${req.url}`))
|
console.log(statusString + chalk.grey(` ${req.url}`))
|
||||||
})
|
})
|
||||||
server.listen(argv.port)
|
server.listen(argv.port)
|
||||||
|
@ -29,15 +29,12 @@ export const FolderPage: QuartzEmitterPlugin<FullPageLayout> = (opts) => {
|
|||||||
const folders: Set<CanonicalSlug> = new Set(allFiles.flatMap(data => {
|
const folders: Set<CanonicalSlug> = new Set(allFiles.flatMap(data => {
|
||||||
const slug = data.slug
|
const slug = data.slug
|
||||||
const folderName = path.dirname(slug ?? "") as CanonicalSlug
|
const folderName = path.dirname(slug ?? "") as CanonicalSlug
|
||||||
if (slug && folderName !== ".") {
|
if (slug && folderName !== "." && folderName !== "tags") {
|
||||||
return [folderName]
|
return [folderName]
|
||||||
}
|
}
|
||||||
return []
|
return []
|
||||||
}))
|
}))
|
||||||
|
|
||||||
// remove special prefixes
|
|
||||||
folders.delete("tags" as CanonicalSlug)
|
|
||||||
|
|
||||||
const folderDescriptions: Record<string, ProcessedContent> = Object.fromEntries([...folders].map(folder => ([
|
const folderDescriptions: Record<string, ProcessedContent> = Object.fromEntries([...folders].map(folder => ([
|
||||||
folder, defaultProcessedContent({ slug: joinSegments(folder, "index") as ServerSlug, frontmatter: { title: `Folder: ${folder}`, tags: [] } })
|
folder, defaultProcessedContent({ slug: joinSegments(folder, "index") as ServerSlug, frontmatter: { title: `Folder: ${folder}`, tags: [] } })
|
||||||
])))
|
])))
|
||||||
|
@ -5,7 +5,7 @@ import BodyConstructor from "../../components/Body"
|
|||||||
import { pageResources, renderPage } from "../../components/renderPage"
|
import { pageResources, renderPage } from "../../components/renderPage"
|
||||||
import { ProcessedContent, defaultProcessedContent } from "../vfile"
|
import { ProcessedContent, defaultProcessedContent } from "../vfile"
|
||||||
import { FullPageLayout } from "../../cfg"
|
import { FullPageLayout } from "../../cfg"
|
||||||
import { CanonicalSlug, FilePath, ServerSlug } from "../../path"
|
import { CanonicalSlug, FilePath, ServerSlug, joinSegments } from "../../path"
|
||||||
|
|
||||||
export const TagPage: QuartzEmitterPlugin<FullPageLayout> = (opts) => {
|
export const TagPage: QuartzEmitterPlugin<FullPageLayout> = (opts) => {
|
||||||
if (!opts) {
|
if (!opts) {
|
||||||
@ -27,13 +27,13 @@ export const TagPage: QuartzEmitterPlugin<FullPageLayout> = (opts) => {
|
|||||||
|
|
||||||
const tags: Set<string> = new Set(allFiles.flatMap(data => data.frontmatter?.tags ?? []))
|
const tags: Set<string> = new Set(allFiles.flatMap(data => data.frontmatter?.tags ?? []))
|
||||||
const tagDescriptions: Record<string, ProcessedContent> = Object.fromEntries([...tags].map(tag => ([
|
const tagDescriptions: Record<string, ProcessedContent> = Object.fromEntries([...tags].map(tag => ([
|
||||||
tag, defaultProcessedContent({ slug: `tags/${tag}` as ServerSlug, frontmatter: { title: `Tag: ${tag}`, tags: [] } })
|
tag, defaultProcessedContent({ slug: `tags/${tag}/index` as ServerSlug, frontmatter: { title: `Tag: ${tag}`, tags: [] } })
|
||||||
])))
|
])))
|
||||||
|
|
||||||
for (const [tree, file] of content) {
|
for (const [tree, file] of content) {
|
||||||
const slug = file.data.slug!
|
const slug = file.data.slug!
|
||||||
if (slug.startsWith("tags/")) {
|
if (slug.startsWith("tags/")) {
|
||||||
const tag = slug.slice("tags/".length)
|
const tag = joinSegments(slug.slice("tags/".length), "index")
|
||||||
if (tags.has(tag)) {
|
if (tags.has(tag)) {
|
||||||
tagDescriptions[tag] = [tree, file]
|
tagDescriptions[tag] = [tree, file]
|
||||||
}
|
}
|
||||||
@ -41,7 +41,7 @@ export const TagPage: QuartzEmitterPlugin<FullPageLayout> = (opts) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
for (const tag of tags) {
|
for (const tag of tags) {
|
||||||
const slug = `tags/${tag}` as CanonicalSlug
|
const slug = `tags/${tag}/index` as CanonicalSlug
|
||||||
const externalResources = pageResources(slug, resources)
|
const externalResources = pageResources(slug, resources)
|
||||||
const [tree, file] = tagDescriptions[tag]
|
const [tree, file] = tagDescriptions[tag]
|
||||||
const componentData: QuartzComponentProps = {
|
const componentData: QuartzComponentProps = {
|
||||||
|
Loading…
Reference in New Issue
Block a user