From 9b8e0c9d1aa5857db3d27bfae229c03b2c8a8b59 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Fri, 02 Feb 2024 07:55:11 +0000
Subject: [PATCH] chore(cleanup): misc refactoring for cleanup, fix some search bugs
---
quartz/components/Head.tsx | 59 ++++++++++++++++++++++++++++++++++-------------------------
1 files changed, 34 insertions(+), 25 deletions(-)
diff --git a/quartz/components/Head.tsx b/quartz/components/Head.tsx
index b370054..2bf2638 100644
--- a/quartz/components/Head.tsx
+++ b/quartz/components/Head.tsx
@@ -1,34 +1,43 @@
-import { canonicalizeServer, pathToRoot } from "../path"
-import { JSResourceToScriptElement } from "../resources"
+import { FullSlug, _stripSlashes, joinSegments, pathToRoot } from "../util/path"
+import { JSResourceToScriptElement } from "../util/resources"
import { QuartzComponentConstructor, QuartzComponentProps } from "./types"
export default (() => {
- function Head({ fileData, externalResources }: QuartzComponentProps) {
- const slug = canonicalizeServer(fileData.slug!)
+ function Head({ cfg, fileData, externalResources }: QuartzComponentProps) {
const title = fileData.frontmatter?.title ?? "Untitled"
- const description = fileData.description ?? "No description provided"
+ const description = fileData.description?.trim() ?? "No description provided"
const { css, js } = externalResources
- const baseDir = pathToRoot(slug)
- const iconPath = baseDir + "/static/icon.png"
- const ogImagePath = baseDir + "/static/og-image.png"
- return <head>
- <title>{title}</title>
- <meta charSet="utf-8" />
- <meta name="viewport" content="width=device-width, initial-scale=1" />
- <meta property="og:title" content={title} />
- <meta property="og:description" content={title} />
- <meta property="og:image" content={ogImagePath} />
- <meta property="og:width" content="1200" />
- <meta property="og:height" content="675" />
- <link rel="icon" href={iconPath} />
- <meta name="description" content={description} />
- <meta name="generator" content="Quartz" />
- <link rel="preconnect" href="https://fonts.googleapis.com"/>
- <link rel="preconnect" href="https://fonts.gstatic.com"/>
- {css.map(href => <link key={href} href={href} rel="stylesheet" type="text/css" spa-preserve />)}
- {js.filter(resource => resource.loadTime === "beforeDOMReady").map(res => JSResourceToScriptElement(res, true))}
- </head>
+ const url = new URL(`https://${cfg.baseUrl ?? "example.com"}`)
+ const path = url.pathname as FullSlug
+ const baseDir = fileData.slug === "404" ? path : pathToRoot(fileData.slug!)
+
+ const iconPath = joinSegments(baseDir, "static/icon.png")
+ const ogImagePath = `https://${cfg.baseUrl}/static/og-image.png`
+
+ return (
+ <head>
+ <title>{title}</title>
+ <meta charSet="utf-8" />
+ <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+ <meta property="og:title" content={title} />
+ <meta property="og:description" content={description} />
+ {cfg.baseUrl && <meta property="og:image" content={ogImagePath} />}
+ <meta property="og:width" content="1200" />
+ <meta property="og:height" content="675" />
+ <link rel="icon" href={iconPath} />
+ <meta name="description" content={description} />
+ <meta name="generator" content="Quartz" />
+ <link rel="preconnect" href="https://fonts.googleapis.com" />
+ <link rel="preconnect" href="https://fonts.gstatic.com" />
+ {css.map((href) => (
+ <link key={href} href={href} rel="stylesheet" type="text/css" spa-preserve />
+ ))}
+ {js
+ .filter((resource) => resource.loadTime === "beforeDOMReady")
+ .map((res) => JSResourceToScriptElement(res, true))}
+ </head>
+ )
}
return Head
--
Gitblit v1.10.0