From 8b2a82a96a2c7c3f40fd5648c756db3408947fdb Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Thu, 14 Jul 2022 05:27:13 +0000
Subject: [PATCH] fix: change / to use base url
---
layouts/partials/head.html | 93 +++++++++++++++++++++++++++++++++++++---------
1 files changed, 74 insertions(+), 19 deletions(-)
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index f10ce14..e3c6967 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -10,11 +10,17 @@
end }}
</title>
<meta name="viewport" content="width=device-width, initial-scale=1" />
- <link
- rel="shortcut icon"
- type="image/png"
- href="{{$.Site.BaseURL}}/icon.png"
- />
+
+ <!-- HTML Favicon -->
+ {{ $favicon := $.Site.Data.config.favicon | default (slice (dict "rel" "shortcut icon" "type" "image/png" "href" "icon.png")) }}
+ {{ $type := (printf "%T" $favicon) }}
+ {{ if eq $type "string" }}
+ {{ $favicon | safeHTML }}
+ {{ else }}
+ {{ range $favicon }}
+ <link rel="{{.rel}}" {{if .type}}type="{{.type}}"{{end}} {{if .sizes}}sizes="{{.sizes}}"{{end}} href="{{$.Site.BaseURL}}/{{.href}}" />
+ {{- end }}
+ {{ end }}
<!-- CSS Stylesheets and Fonts -->
<link
@@ -30,14 +36,32 @@
{{$finalCss := $css | resources.Concat "styles.css" | resources.Fingerprint "md5" | resources.Minify }}
<link href="{{$finalCss.Permalink}}" rel="stylesheet" />
- {{ $darkMode := resources.Get "js/darkmode.js" | resources.Fingerprint "md5" | resources.Minify }}
+ {{$lightSyntax := resources.Get "styles/_light_syntax.scss" | resources.ToCSS (dict "outputStyle" "compressed") | resources.Fingerprint "md5" | resources.Minify }}
+ <link href="{{$lightSyntax.Permalink}}" rel="stylesheet" id="theme-link">
+
+ <!-- Base scripts -->
+ {{ $darkMode := resources.Get "js/darkmode.js" | resources.ExecuteAsTemplate "js/darkmode.js" . | resources.Fingerprint "md5" | resources.Minify }}
<script src="{{$darkMode.Permalink}}"></script>
{{partial "katex.html" .}}
+
+ <script src="https://unpkg.com/@floating-ui/core@0.7.3"></script>
+ <script src="https://unpkg.com/@floating-ui/dom@0.5.4"></script>
{{ $popover := resources.Get "js/popover.js" | resources.Fingerprint "md5" |
resources.Minify }}
<script src="{{$popover.Permalink}}"></script>
+ <!-- Optional scripts -->
+ {{ if $.Site.Data.config.enableCodeBlockTitle }}
+ {{ $codeTitle := resources.Get "js/code-title.js" | resources.Fingerprint "md5" | resources.Minify }}
+ <script src="{{$codeTitle.Permalink}}"></script>
+ {{end}}
+
+ {{ if $.Site.Data.config.enableCodeBlockCopy }}
+ {{ $clipboard := resources.Get "js/clipboard.js" | resources.Fingerprint "md5" | resources.Minify }}
+ <script src="{{$clipboard.Permalink}}"></script>
+ {{ end }}
+
<!-- Preload page vars -->
{{$linkIndex := resources.Get "indices/linkIndex.json" | resources.Fingerprint
"md5" | resources.Minify | }} {{$contentIndex := resources.Get
@@ -61,24 +85,40 @@
content,
}))
- const draw = () => {
- // NOTE: everything within this callback will be executed for every page navigation. This is a good place to put JavaScript that loads or modifies data on the page.
+ const render = () => {
+ // NOTE: everything within this callback will be executed for every page navigation. This is a good place to put JavaScript that loads or modifies data on the page, adds event listeners, etc. If you are only dealing with basic DOM replacement, use the init function
+
+ const siteBaseURL = new URL(BASE_URL);
+ const pathBase = siteBaseURL.pathname;
+ const pathWindow = window.location.pathname;
+ const isHome = pathBase == pathWindow;
+
+ {{if $.Site.Data.config.enableCodeBlockCopy -}}
+ addCopyButtons();
+ {{ end }}
+
+ {{if $.Site.Data.config.enableSPA -}}
+ addTitleToCodeBlocks();
+ {{ end }}
+
{{if $.Site.Data.config.enableFooter}}
const container = document.getElementById("graph-container")
// retry if the graph is not ready
- if (!container) return requestAnimationFrame(draw)
+ if (!container) return requestAnimationFrame(render)
// clear the graph in case there is anything within it
container.textContent = ""
+ const drawGlobal = isHome && {{$.Site.Data.graphConfig.enableGlobalGraph}};
drawGraph(
- {{strings.TrimRight "/" .Site.BaseURL}},
- {{$.Site.Data.graphConfig.paths}},
- {{$.Site.Data.graphConfig.depth}},
- {{$.Site.Data.graphConfig.enableDrag}},
- {{$.Site.Data.graphConfig.enableLegend}},
- {{$.Site.Data.graphConfig.enableZoom}}
- );
+ {{strings.TrimRight "/" .Site.BaseURL}},
+ drawGlobal,
+ {{$.Site.Data.graphConfig.paths}},
+ drawGlobal ? {{$.Site.Data.graphConfig.globalGraph}} : {{$.Site.Data.graphConfig.localGraph}}
+ );
+
{{end}}
+
+
{{if $.Site.Data.config.enableLinkPreview}}
initPopover(
{{strings.TrimRight "/" .Site.BaseURL }},
@@ -86,8 +126,19 @@
{{$.Site.Data.config.enableLatex}}
)
{{end}}
+ }
+
+ const init = (doc = document) => {
+ // NOTE: everything within this callback will be executed for initial page navigation. This is a good place to put JavaScript that only replaces DOM nodes.
+ {{if $.Site.Data.config.enableCodeBlockCopy -}}
+ addCopyButtons();
+ {{ end }}
+
+ {{if $.Site.Data.config.enableCodeBlockTitle -}}
+ addTitleToCodeBlocks();
+ {{- end -}}
{{if $.Site.Data.config.enableLatex}}
- renderMathInElement(document.body, {
+ renderMathInElement(doc.body, {
delimiters: [
{left: '$$', right: '$$', display: true},
{left: '$', right: '$', display: false},
@@ -102,7 +153,7 @@
resources.Minify }}
<script type="module">
import { attachSPARouting } from "{{$router.Permalink}}"
- attachSPARouting(draw)
+ attachSPARouting(init, render)
</script>
{{else}}
<script>
@@ -110,7 +161,11 @@
navigate: (url) => (window.location.href = url),
prefetch: () => {},
}
- draw()
+
+ window.addEventListener("DOMContentLoaded", () => {
+ init()
+ render()
+ })
</script>
{{end}}
</head>
--
Gitblit v1.10.0