Fix non-spa fallback

This commit is contained in:
Aiden Bai 2022-05-27 18:42:01 -07:00
parent 232bd2f016
commit 8aba612a00
No known key found for this signature in database
GPG Key ID: D37584388675FF3A
1 changed files with 23 additions and 35 deletions

View File

@ -5,45 +5,31 @@
name="description" name="description"
content="{{if .IsHome}}{{$.Site.Data.config.description}}{{else}}{{.Summary}}{{end}}" content="{{if .IsHome}}{{$.Site.Data.config.description}}{{else}}{{.Summary}}{{end}}"
/> />
<title> <title>{{ if .Title }}{{ .Title }}{{ else }}{{ $.Site.Data.config.page_title }}{{ end }}</title>
{{ if .Title }}{{ .Title }}{{ else }}{{ $.Site.Data.config.page_title }}{{
end }}
</title>
<meta name="viewport" content="width=device-width, initial-scale=1" /> <meta name="viewport" content="width=device-width, initial-scale=1" />
<link <link rel="shortcut icon" type="image/png" href="{{$.Site.BaseURL}}/icon.png" />
rel="shortcut icon"
type="image/png"
href="{{$.Site.BaseURL}}/icon.png"
/>
<!-- CSS Stylesheets and Fonts --> <!-- CSS Stylesheets and Fonts -->
<link <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" 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" rel="stylesheet"
/> />
{{$sass := resources.Match "styles/[!_]*.scss" }} {{$sass := resources.Match "styles/[!_]*.scss" }} {{$css := slice }} {{range $sass}} {{$scss := .
{{$css := slice }} | resources.ToCSS (dict "outputStyle" "compressed") }} {{$css = $css | append $scss}} {{end}}
{{range $sass}} {{$finalCss := $css | resources.Concat "styles.css" | resources.Fingerprint "md5" |
{{$scss := . | resources.ToCSS (dict "outputStyle" "compressed") }} resources.Minify }}
{{$css = $css | append $scss}}
{{end}}
{{$finalCss := $css | resources.Concat "styles.css" | resources.Fingerprint "md5" | resources.Minify }}
<link href="{{$finalCss.Permalink}}" rel="stylesheet" /> <link href="{{$finalCss.Permalink}}" rel="stylesheet" />
{{ $darkMode := resources.Get "js/darkmode.js" | resources.Fingerprint "md5" | {{ $darkMode := resources.Get "js/darkmode.js" | resources.Fingerprint "md5" | resources.Minify }}
resources.Minify }}
<script src="{{$darkMode.Permalink}}"></script> <script src="{{$darkMode.Permalink}}"></script>
{{partial "katex.html" .}} {{partial "katex.html" .}} {{ $popover := resources.Get "js/popover.js" | resources.Fingerprint
"md5" | resources.Minify }}
{{ $popover := resources.Get "js/popover.js" | resources.Fingerprint "md5" |
resources.Minify }}
<script src="{{$popover.Permalink}}"></script> <script src="{{$popover.Permalink}}"></script>
<!-- Preload page vars --> <!-- Preload page vars -->
{{$linkIndex := resources.Get "indices/linkIndex.json" | resources.Fingerprint {{$linkIndex := resources.Get "indices/linkIndex.json" | resources.Fingerprint "md5" |
"md5" | resources.Minify | }} {{$contentIndex := resources.Get resources.Minify | }} {{$contentIndex := resources.Get "indices/contentIndex.json" |
"indices/contentIndex.json" | resources.Fingerprint "md5" | resources.Minify resources.Fingerprint "md5" | resources.Minify }}
}}
<script> <script>
const BASE_URL = {{.Site.BaseURL}} const BASE_URL = {{.Site.BaseURL}}
const fetchData = Promise.all([ const fetchData = Promise.all([
@ -63,6 +49,8 @@
})) }))
const draw = () => { 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") const container = document.getElementById("graph-container")
// retry if the graph is not ready // retry if the graph is not ready
if (!container) return requestAnimationFrame(draw) if (!container) return requestAnimationFrame(draw)
@ -96,19 +84,19 @@
{{end}} {{end}}
}; };
</script> </script>
{{if $.Site.Data.config.enableSPA}} {{if $.Site.Data.config.enableSPA}} {{ $router := resources.Get "js/router.js" |
{{ $router := resources.Get "js/router.js" | resources.Fingerprint "md5" | resources.Fingerprint "md5" | resources.Minify }}
resources.Minify }}
<script type="module"> <script type="module">
import { attachSPARouting } from '{{$router.Permalink}}'; 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)
attachSPARouting(draw);
</script> </script>
{{else}} {{else}}
<script> <script>
window.Million.navigate = (url) => window.location.href = url; window.Million = {
draw(); navigate: (url) => (window.location.href = url),
prefetch: () => {},
}
draw()
</script> </script>
{{end}} {{end}}
</head> </head>