From 8fd75ffbfda30edd5a134a1fbf9b81ac3cebb2ff Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Mon, 24 Jul 2023 00:42:00 +0000
Subject: [PATCH] support attachments folder

---
 quartz/components/PageList.tsx |   67 +++++++++++++++++++++------------
 1 files changed, 43 insertions(+), 24 deletions(-)

diff --git a/quartz/components/PageList.tsx b/quartz/components/PageList.tsx
index ec7f104..2f08f62 100644
--- a/quartz/components/PageList.tsx
+++ b/quartz/components/PageList.tsx
@@ -1,7 +1,6 @@
-import { relativeToRoot } from "../path"
+import { CanonicalSlug, canonicalizeServer, resolveRelative } from "../path"
 import { QuartzPluginData } from "../plugins/vfile"
 import { Date } from "./Date"
-import { clientSideSlug } from "./scripts/util"
 import { QuartzComponentProps } from "./types"
 
 function byDateAndAlphabetical(f1: QuartzPluginData, f2: QuartzPluginData): number {
@@ -18,31 +17,51 @@
   // otherwise, sort lexographically by title
   const f1Title = f1.frontmatter?.title.toLowerCase() ?? ""
   const f2Title = f2.frontmatter?.title.toLowerCase() ?? ""
-  return f1Title.localeCompare(f2Title) 
+  return f1Title.localeCompare(f2Title)
 }
 
 export function PageList({ fileData, allFiles }: QuartzComponentProps) {
-  const slug = fileData.slug!
-  return <ul class="section-ul">
-    {allFiles.sort(byDateAndAlphabetical).map(page => {
-      const title = page.frontmatter?.title
-      const pageSlug = page.slug!
-      const tags = page.frontmatter?.tags ?? []
-      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={clientSideSlug(relativeToRoot(slug, pageSlug))} class="internal">{title}</a></h3>
-          </div>
-          <ul class="tags">
-            {tags.map(tag => <li><a class="internal" href={relativeToRoot(slug, `tags/${tag}`)}>#{tag}</a></li>)}
-          </ul>
-        </div>
-      </li>
-    })}
-  </ul>
+  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 ?? []
+
+        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>
+  )
 }
 
 PageList.css = `

--
Gitblit v1.10.0