From ed17d678f63bf274c5cc1ef92d5de9b8fb3d8d80 Mon Sep 17 00:00:00 2001
From: Aiden Bai <aiden.bai05@gmail.com>
Date: Fri, 27 May 2022 18:42:01 -0700
Subject: [PATCH] Fix non-spa fallback
---
layouts/partials/head.html | 58 +++++++++++++++-----------------------
1 file changed, 23 insertions(+), 35 deletions(-)
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index b65bb84..2da259d 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -5,45 +5,31 @@
name="description"
content="{{if .IsHome}}{{$.Site.Data.config.description}}{{else}}{{.Summary}}{{end}}"
/>
- <title>
- {{ if .Title }}{{ .Title }}{{ else }}{{ $.Site.Data.config.page_title }}{{
- end }}
- </title>
+ <title>{{ if .Title }}{{ .Title }}{{ else }}{{ $.Site.Data.config.page_title }}{{ end }}</title>
<meta name="viewport" content="width=device-width, initial-scale=1" />
- <link
- rel="shortcut icon"
- type="image/png"
- href="{{$.Site.BaseURL}}/icon.png"
- />
+ <link rel="shortcut icon" type="image/png" href="{{$.Site.BaseURL}}/icon.png" />
<!-- CSS Stylesheets and Fonts -->
<link
href="https://fonts.googleapis.com/css2?family=Inter:wght@400;600;700&family=Source+Sans+Pro:wght@400;600;700&family=Fira+Code:wght@400;700&display=swap"
rel="stylesheet"
/>
- {{$sass := resources.Match "styles/[!_]*.scss" }}
- {{$css := slice }}
- {{range $sass}}
- {{$scss := . | resources.ToCSS (dict "outputStyle" "compressed") }}
- {{$css = $css | append $scss}}
- {{end}}
- {{$finalCss := $css | resources.Concat "styles.css" | resources.Fingerprint "md5" | resources.Minify }}
+ {{$sass := resources.Match "styles/[!_]*.scss" }} {{$css := slice }} {{range $sass}} {{$scss := .
+ | resources.ToCSS (dict "outputStyle" "compressed") }} {{$css = $css | append $scss}} {{end}}
+ {{$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 }}
+ {{ $darkMode := resources.Get "js/darkmode.js" | resources.Fingerprint "md5" | resources.Minify }}
<script src="{{$darkMode.Permalink}}"></script>
- {{partial "katex.html" .}}
-
- {{ $popover := resources.Get "js/popover.js" | resources.Fingerprint "md5" |
- resources.Minify }}
+ {{partial "katex.html" .}} {{ $popover := resources.Get "js/popover.js" | resources.Fingerprint
+ "md5" | resources.Minify }}
<script src="{{$popover.Permalink}}"></script>
<!-- Preload page vars -->
- {{$linkIndex := resources.Get "indices/linkIndex.json" | resources.Fingerprint
- "md5" | resources.Minify | }} {{$contentIndex := resources.Get
- "indices/contentIndex.json" | resources.Fingerprint "md5" | resources.Minify
- }}
+ {{$linkIndex := resources.Get "indices/linkIndex.json" | resources.Fingerprint "md5" |
+ resources.Minify | }} {{$contentIndex := resources.Get "indices/contentIndex.json" |
+ resources.Fingerprint "md5" | resources.Minify }}
<script>
const BASE_URL = {{.Site.BaseURL}}
const fetchData = Promise.all([
@@ -63,6 +49,8 @@
}))
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 container = document.getElementById("graph-container")
// retry if the graph is not ready
if (!container) return requestAnimationFrame(draw)
@@ -96,19 +84,19 @@
{{end}}
};
</script>
- {{if $.Site.Data.config.enableSPA}}
- {{ $router := resources.Get "js/router.js" | resources.Fingerprint "md5" |
- resources.Minify }}
+ {{if $.Site.Data.config.enableSPA}} {{ $router := resources.Get "js/router.js" |
+ resources.Fingerprint "md5" | resources.Minify }}
<script type="module">
- import { attachSPARouting } from '{{$router.Permalink}}';
- // 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.
-
- attachSPARouting(draw);
+ import { attachSPARouting } from "{{$router.Permalink}}"
+ attachSPARouting(draw)
</script>
{{else}}
<script>
- window.Million.navigate = (url) => window.location.href = url;
- draw();
+ window.Million = {
+ navigate: (url) => (window.location.href = url),
+ prefetch: () => {},
+ }
+ draw()
</script>
{{end}}
</head>