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/components/PageList.tsx | 111 ++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 73 insertions(+), 38 deletions(-)
diff --git a/quartz/components/PageList.tsx b/quartz/components/PageList.tsx
index da1bf9f..eb34f02 100644
--- a/quartz/components/PageList.tsx
+++ b/quartz/components/PageList.tsx
@@ -1,52 +1,87 @@
-import { CanonicalSlug, canonicalizeServer, resolveRelative } from "../path"
+import { FullSlug, resolveRelative } from "../util/path"
import { QuartzPluginData } from "../plugins/vfile"
-import { Date } from "./Date"
+import { Date, getDate } from "./Date"
import { QuartzComponentProps } from "./types"
+import { GlobalConfiguration } from "../cfg"
-function byDateAndAlphabetical(f1: QuartzPluginData, f2: QuartzPluginData): number {
- if (f1.dates && f2.dates) {
- // sort descending by last modified
- return f2.dates.modified.getTime() - f1.dates.modified.getTime()
- } else if (f1.dates && !f2.dates) {
- // prioritize files with dates
- return -1
- } else if (!f1.dates && f2.dates) {
- return 1
+export function byDateAndAlphabetical(
+ cfg: GlobalConfiguration,
+): (f1: QuartzPluginData, f2: QuartzPluginData) => number {
+ return (f1, f2) => {
+ if (f1.dates && f2.dates) {
+ // sort descending
+ return getDate(cfg, f2)!.getTime() - getDate(cfg, f1)!.getTime()
+ } else if (f1.dates && !f2.dates) {
+ // prioritize files with dates
+ return -1
+ } else if (!f1.dates && f2.dates) {
+ return 1
+ }
+
+ // otherwise, sort lexographically by title
+ const f1Title = f1.frontmatter?.title.toLowerCase() ?? ""
+ const f2Title = f2.frontmatter?.title.toLowerCase() ?? ""
+ return f1Title.localeCompare(f2Title)
}
-
- // otherwise, sort lexographically by title
- const f1Title = f1.frontmatter?.title.toLowerCase() ?? ""
- const f2Title = f2.frontmatter?.title.toLowerCase() ?? ""
- return f1Title.localeCompare(f2Title)
}
-export function PageList({ fileData, allFiles }: QuartzComponentProps) {
- const slug = canonicalizeServer(fileData.slug!)
- return <ul class="section-ul">
- {allFiles.sort(byDateAndAlphabetical).map(page => {
- const title = page.frontmatter?.title
- const pageSlug = canonicalizeServer(page.slug!)
- const tags = page.frontmatter?.tags ?? []
+type Props = {
+ limit?: number
+} & QuartzComponentProps
- return <li class="section-li">
- <div class="section">
- {page.dates && <p class="meta">
- <Date date={page.dates.modified} />
- </p>}
- <div class="desc">
- <h3><a href={resolveRelative(slug, pageSlug)} class="internal">{title}</a></h3>
- </div>
- <ul class="tags">
- {tags.map(tag => <li><a class="internal" href={resolveRelative(slug, `tags/${tag}` as CanonicalSlug)}>#{tag}</a></li>)}
- </ul>
- </div>
- </li>
- })}
- </ul>
+export function PageList({ cfg, fileData, allFiles, limit }: Props) {
+ let list = allFiles.sort(byDateAndAlphabetical(cfg))
+ if (limit) {
+ list = list.slice(0, limit)
+ }
+
+ return (
+ <ul class="section-ul">
+ {list.map((page) => {
+ const title = page.frontmatter?.title
+ const tags = page.frontmatter?.tags ?? []
+
+ return (
+ <li class="section-li">
+ <div class="section">
+ {page.dates && (
+ <p class="meta">
+ <Date date={getDate(cfg, page)!} />
+ </p>
+ )}
+ <div class="desc">
+ <h3>
+ <a href={resolveRelative(fileData.slug!, page.slug!)} class="internal">
+ {title}
+ </a>
+ </h3>
+ </div>
+ <ul class="tags">
+ {tags.map((tag) => (
+ <li>
+ <a
+ class="internal tag-link"
+ href={resolveRelative(fileData.slug!, `tags/${tag}` as FullSlug)}
+ >
+ #{tag}
+ </a>
+ </li>
+ ))}
+ </ul>
+ </div>
+ </li>
+ )
+ })}
+ </ul>
+ )
}
PageList.css = `
.section h3 {
margin: 0;
}
+
+.section > .tags {
+ margin: 0;
+}
`
--
Gitblit v1.10.0