From 3ac6b42e16dca5a44ed3fec2c0314f1dbbc2322b Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Sun, 16 Jul 2023 06:02:12 +0000
Subject: [PATCH] finish path refactoring, add sourcemap + better trace support
---
quartz/components/renderPage.tsx | 20 ++++++++------------
1 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/quartz/components/renderPage.tsx b/quartz/components/renderPage.tsx
index 8de60bf..e5cf5eb 100644
--- a/quartz/components/renderPage.tsx
+++ b/quartz/components/renderPage.tsx
@@ -3,7 +3,7 @@
import HeaderConstructor from "./Header"
import BodyConstructor from "./Body"
import { JSResourceToScriptElement, StaticResources } from "../resources";
-import { resolveToRoot } from "../path";
+import { CanonicalSlug, pathToRoot } from "../path";
interface RenderComponents {
head: QuartzComponent
@@ -15,8 +15,8 @@
footer: QuartzComponent,
}
-export function pageResources(slug: string, staticResources: StaticResources): StaticResources {
- const baseDir = resolveToRoot(slug)
+export function pageResources(slug: CanonicalSlug, staticResources: StaticResources): StaticResources {
+ const baseDir = pathToRoot(slug)
const contentIndexPath = baseDir + "/static/contentIndex.json"
const contentIndexScript = `const fetchData = fetch(\`${contentIndexPath}\`).then(data => data.json())`
@@ -32,23 +32,19 @@
}
}
-export function renderPage(slug: string, componentData: QuartzComponentProps, components: RenderComponents, pageResources: StaticResources): string {
+export function renderPage(slug: CanonicalSlug, componentData: QuartzComponentProps, components: RenderComponents, pageResources: StaticResources): string {
const { head: Head, header, beforeBody, pageBody: Content, left, right, footer: Footer } = components
const Header = HeaderConstructor()
const Body = BodyConstructor()
const LeftComponent =
- <div class="left">
- <div class="left-inner">
- {left.map(BodyComponent => <BodyComponent {...componentData} />)}
- </div>
+ <div class="left sidebar">
+ {left.map(BodyComponent => <BodyComponent {...componentData} />)}
</div>
const RightComponent =
- <div class="right">
- <div class="right-inner">
- {right.map(BodyComponent => <BodyComponent {...componentData} />)}
- </div>
+ <div class="right sidebar">
+ {right.map(BodyComponent => <BodyComponent {...componentData} />)}
</div>
const doc = <html>
--
Gitblit v1.10.0