From 77d2decf86ba9e1d3d8d8dab4b6c30c53e573664 Mon Sep 17 00:00:00 2001 From: Dillon Date: Mon, 3 Feb 2020 20:47:49 +0800 Subject: [PATCH] fix(image): fix image safeURL bug --- assets/css/_page/_post.scss | 13 + assets/css/_variables.scss | 2 +- exampleSite/config.toml | 4 +- exampleSite/zh/config.toml | 4 +- .../content/posts/Basic-Markdown-Preview.md | 4 +- exampleSite/zh/content/posts/test.md | 316 ++++++++++++++++++ layouts/_default/_markup/render-image.html | 2 +- layouts/partials/image.html | 2 +- layouts/partials/scripts.html | 282 ++++++++-------- 9 files changed, 478 insertions(+), 151 deletions(-) create mode 100644 exampleSite/zh/content/posts/test.md diff --git a/assets/css/_page/_post.scss b/assets/css/_page/_post.scss index 01230ac..19ecbed 100644 --- a/assets/css/_page/_post.scss +++ b/assets/css/_page/_post.scss @@ -60,6 +60,19 @@ visibility: hidden; } + h1, + h2, + h3, + h4, + h5, + h6 { + font-weight: bold; + + .dark-theme & { + font-weight: bolder; + } + } + h2, h3, h4, diff --git a/assets/css/_variables.scss b/assets/css/_variables.scss index 9b82340..00b4af5 100644 --- a/assets/css/_variables.scss +++ b/assets/css/_variables.scss @@ -18,7 +18,7 @@ $global-font-color-dark: #a9a9b3 !default; // Color of the secondary text $global-font-secondary-color: #a9a9b3 !default; -$global-font-secondary-color-dark: #87878d !default; +$global-font-secondary-color-dark: #5d5d5f !default; // Color of the link $global-link-color: #161209 !default; diff --git a/exampleSite/config.toml b/exampleSite/config.toml index aee4015..925d4d6 100644 --- a/exampleSite/config.toml +++ b/exampleSite/config.toml @@ -124,7 +124,7 @@ dateFormatToUse = "2006-01-02" # Footer CopyRight Info ## Site creation time - since = 2018 + since = 2019 ## ICP info only in China (HTML format is allowed) icp = "" ## license info (HTML format is allowed) @@ -133,6 +133,8 @@ dateFormatToUse = "2006-01-02" # public git repo url to link lastmod git commit only then enableGitInfo is true gitRepo = "" + # whether to render mathematical formulas + math = true # whether to show link to Raw Markdown content of the post linkToMarkdown = true diff --git a/exampleSite/zh/config.toml b/exampleSite/zh/config.toml index a9b35d8..beee52f 100644 --- a/exampleSite/zh/config.toml +++ b/exampleSite/zh/config.toml @@ -124,7 +124,7 @@ dateFormatToUse = "2006-01-02" # 页面底部版权信息设置 ## 网站创立年份 - since = 2018 + since = 2019 ## ICP 备案信息，仅在中国使用 (允许使用 HTML 格式) icp = "" ## 许可协议信息 (允许使用 HTML 格式) @@ -133,6 +133,8 @@ dateFormatToUse = "2006-01-02" # 用于生成文章上次修改时间的公共 git 仓库路径，仅在 enableGitInfo 设为 true 时有效 gitRepo = "" + # 是否渲染数学公式 + math = true # 是否在文章页面显示原始 Markdown 文档链接 linkToMarkdown = true diff --git a/exampleSite/zh/content/posts/Basic-Markdown-Preview.md b/exampleSite/zh/content/posts/Basic-Markdown-Preview.md index 94198c9..65c50c7 100644 --- a/exampleSite/zh/content/posts/Basic-Markdown-Preview.md +++ b/exampleSite/zh/content/posts/Basic-Markdown-Preview.md @@ -435,7 +435,7 @@ Web image ![Web Picture](https://static.dillonzq.com/images/20190817130904-U6cPUk.jpg "Web Picture") Local image -![Local Picture](logo-revolunet-carre.jpg "Local Picture") +![Local Picture](/images/Apple-Devices-Preview.png) contact@revolunet.com @@ -456,7 +456,7 @@ Web image ![Web Picture](https://static.dillonzq.com/images/20190817130904-U6cPUk.jpg "Web Picture") Local image -![Local Picture](/苹果-touch-icon.png "Local Picture") +![Local Picture](/images/Apple-Devices-Preview.png) diff --git a/exampleSite/zh/content/posts/test.md b/exampleSite/zh/content/posts/test.md new file mode 100644 index 0000000..513d81e --- /dev/null +++ b/exampleSite/zh/content/posts/test.md @@ -0,0 +1,316 @@ +--- +author: "" +author_link: "" +title: "Test Page" +date: 2019-08-04T22:49:56+08:00 +lastmod: 2019-08-17T22:41:56+08:00 +draft: true +description: "This is a test page." +show_in_homepage: false +show_description: false +license: "" + +tags: [ + "Hugo", + "主题", +] +categories: [ + "预览", +] + +featured_image: "" +featured_image_preview: "" + +comment: false +toc: true +auto_collapse_toc: true +math: true +dev: true +--- + +## This is a test page + +Test all features in development[^link test]. + +[^link test]: https://www.google.com/ + + + +## Test ECharts + +{{< dev/echarts >}} +title : { + text: '某站点用户访问来源', + subtext: '纯属虚构', + x:'center' +}, +tooltip : { + trigger: 'item', + formatter: "{a}
{b} : {c} ({d}%)" +}, +legend: { + orient: 'vertical', + left: 'left', + data: ['直接访问','邮件营销','联盟广告','视频广告','搜索引擎'] +}, +series : [ + { + name: '访问来源', + type: 'pie', + radius : '55%', + center: ['50%', '60%'], + data:[ + {value:335, name:'直接访问'}, + {value:310, name:'邮件营销'}, + {value:234, name:'联盟广告'}, + {value:135, name:'视频广告'}, + {value:1548, name:'搜索引擎'} + ], + itemStyle: { + emphasis: { + shadowBlur: 10, + shadowOffsetX: 0, + shadowColor: 'rgba(0, 0, 0, 0.5)' + } + } + } +] +{{< /dev/echarts >}} + +## Test Mermaid + +{{< mermaid >}} +classDiagram + Animal <|-- Duck + Animal <|-- Fish + Animal <|-- Zebra + Animal : +int age + Animal : +String gender + Animal: +isMammal() + Animal: +mate() + class Duck{ + +String beakColor + +swim() + +quack() + } + class Fish{ + -int sizeInFeet + -canEat() + } + class Zebra{ + +bool is_wild + +run() + } +{{< /mermaid >}} + +## Test Ruby + +人最重要的特点是会思考，建站初衷无非是保存思维的电子快照。 +当然各种文档工具亦或是简单的文本编辑器也能随时记录点滴， +选择建个人网站无非是想满足 [技术爱好者]^(Technology enthusiast) 的偏执。 + +## Test Music + +## Test Toc + +Toc + +### Toc1 + +Toc + +#### Toc 1-1 + +Toc + +#### Toc 1-2 + +Toc + +#### Toc 1-3 + +Toc + +### Toc2 + +Toc + +#### Toc 2-1 + +Toc + +#### Toc 2-2 + +Toc + +### Toc3 + +Toc + +## Test Table + +| Tables | Are | Cool | +| :------------ |:-------------:| -----:| +| col 3 is | right-aligned | $1600 | +| col 2 is | centered | $12 | +| zebra stripes | are neat | $1 | + +## Test kbd + +ctrl+alt+del + +## Test Mixed Lists + +Mixed Lists + +- item 1 + * [X] item A + * [ ] item B + more text + 1. item a + 2. itemb + 3. item c + * [X] item C +- item 2 +- item 3 + +Really Mixed Lists + +- item 1 + * [X] item A + - item B + more text + 1. item a + + itemb + + [ ] item c + 1. item C +1. item 2 +- [X] item 3 + +## Test fa (Font Awesome) + +:(fab fa-weixin fa-2x): + +## Test Footnote + +This is a footnote[^1] + +[^1]: This is a footnote + +## Test Admonition + +{{% admonition quote %}} +biu biu biu. +{{% /admonition %}} + +{{% admonition quote "I'm title!" false %}} +biu biu biu. +{{% /admonition %}} + +{{% admonition example "I'm title!" false %}} +biu biu biu. +{{% /admonition %}} + +{{% admonition bug "I'm title!" false %}} +biu biu biu. +{{% /admonition %}} + +{{% admonition danger "I'm title!" false %}} +biu biu biu. +{{% /admonition %}} + +{{% admonition failure "I'm title!" false %}} +biu biu biu. +{{% /admonition %}} + +{{% admonition warning "I'm title!" false %}} +biu biu biu. +{{% /admonition %}} + +{{% admonition question "I'm title!" false %}} +biu biu biu. +{{% /admonition %}} + +{{% admonition success "I'm title!" false %}} +biu biu biu. +{{% /admonition %}} + +{{% admonition tip "I'm title!" false %}} +biu biu biu. +{{% /admonition %}} + +{{% admonition info "I'm title!" true %}} +**biu biu biu.** +{{% /admonition %}} + +{{% admonition note "I'm title!" false %}} +**biu biu biu.** +{{% /admonition %}} + +{{% admonition type="abstract" title="Test Admonition" %}} +This is a Admonition. +{{% /admonition %}} + +## Test Highlight + +`ls` 命令 + +```go +// You can edit this code! +// Click here and start typing. +package main + +import "fmt" + +func main() { + fmt.Println("Hello, 世界", "Hello, 世界", "Hello, 世界", "Hello, 世界", "Hello, 世界", "Hello, 世界", "Hello, 世界", "Hello, 世界") +} +``` + +- This is a list that contains multiple code blocks. + + - Here is an indented block + + ```Code + This will still be parsed + as a normal indented code block. + ``` + + - Here is a fenced code block: + + ```Code + This will still be parsed + as a fenced code block. + ``` + + > ```Code + > Blockquotes? + > Not a problem! + > ``` + +## Test Typeit + +{{< typeit group="test" tag="h3" >}} +Here is a story about love... +{{< /typeit >}} + +{{< typeit group="test" code="java" >}} +u.accepted(); // [2018/01/05](/since/) special +int a = 1; +{{< /typeit >}} + +## Test Img + +![Gif](https://static.dillonzq.com/images/20190817130904-U6cPUk.jpg "Title") + +## Test Align + +{{% align right %}} +**Test Text** +{{% /align %}} + +## Test Katex + +$$ c = \pm\sqrt{a^2 + b^2} $$ + +Left \\( c = \pm\sqrt{a^2 + b^2} \\) Right diff --git a/layouts/_default/_markup/render-image.html b/layouts/_default/_markup/render-image.html index 402f4fe..1ce94c1 100644 --- a/layouts/_default/_markup/render-image.html +++ b/layouts/_default/_markup/render-image.html @@ -1,7 +1,7 @@
{{- /* Lazyload */ -}} {{- $loading := resources.Get "svg/loading.svg" | minify -}} - {{ .Text }} + {{ .Text }} {{- $caption := .Title | default .Text -}} {{- with $caption -}}
diff --git a/layouts/partials/image.html b/layouts/partials/image.html index 75b2189..c76f886 100644 --- a/layouts/partials/image.html +++ b/layouts/partials/image.html @@ -1,3 +1,3 @@ {{- /* Lazyload */ -}} {{- $res := resources.Get "svg/loading.svg" | minify -}} -featured image \ No newline at end of file +featured image \ No newline at end of file diff --git a/layouts/partials/scripts.html b/layouts/partials/scripts.html index 7925398..cef3853 100644 --- a/layouts/partials/scripts.html +++ b/layouts/partials/scripts.html @@ -1,3 +1,8 @@ +{{- /* Google analytics async */ -}} +{{- if eq (getenv "HUGO_ENV") "production" | and .Site.GoogleAnalytics -}} + {{- template "_internal/google_analytics_async.html" . -}} +{{- end -}} + {{- /* jQuery https://github.com/jquery/jquery */ -}} {{- $jquery := "" -}} {{- if eq (getenv "HUGO_ENV") "production" | and .Site.Params.cdn.jquery_js -}} @@ -6,6 +11,7 @@ {{- $res := resources.Get "js/lib/jquery/jquery.slim.min.js" -}} {{- $jquery = printf "" $res.RelPermalink -}} {{- end -}} +{{- $jquery | safeHTML -}} {{- /* lazysizes https://github.com/aFarkas/lazysizes */ -}} {{- $lazysizes := "" -}} @@ -15,6 +21,7 @@ {{- $res := resources.Get "js/lib/lazysizes/lazysizes.min.js" -}} {{- $lazysizes = printf "" $res.RelPermalink -}} {{- end -}} +{{- $lazysizes | safeHTML -}} {{- /* Smooth Scroll https://github.com/cferdinandi/smooth-scroll */ -}} {{- $smooth_scroll := "" -}} @@ -25,148 +32,17 @@ {{- $smooth_scroll = printf "" $res.RelPermalink -}} {{- end -}} {{- $smooth_scroll = delimit (slice $smooth_scroll "") "" -}} - -{{- /* KaTeX https://github.com/KaTeX/KaTeX */ -}} -{{- $katex_css := "" -}} -{{- if eq (getenv "HUGO_ENV") "production" | and .Site.Params.cdn.katex_css -}} - {{- $katex_css = .Site.Params.cdn.katex_css -}} -{{- else -}} - {{- $res := resources.Get "css/lib/katex/katex.min.css" -}} - {{- $katex_css = printf "" $res.RelPermalink -}} -{{- end -}} -{{- $katex_js := "" -}} -{{- if eq (getenv "HUGO_ENV") "production" | and .Site.Params.cdn.katex_js -}} - {{- $katex_js = .Site.Params.cdn.katex_js -}} -{{- else -}} - {{- $res := resources.Get "js/lib/katex/katex.min.js" -}} - {{- $katex_js = printf "" $res.RelPermalink -}} -{{- end -}} -{{- $katex_auto_render_js := "" -}} -{{- if eq (getenv "HUGO_ENV") "production" | and .Site.Params.cdn.katex_auto_render_js -}} - {{- $katex_auto_render_js = .Site.Params.cdn.katex_auto_render_js -}} -{{- else -}} - {{- $res := resources.Get "js/lib/katex/auto-render.min.js" -}} - {{- $katex_auto_render_js = printf "" $res.RelPermalink -}} -{{- end -}} -{{- $katex := delimit (slice $katex_css $katex_js $katex_auto_render_js) "" -}} - -{{- /* mermaid https://github.com/knsv/mermaid */ -}} -{{- $mermaid := "" -}} -{{- if eq (getenv "HUGO_ENV") "production" | and .Site.Params.cdn.mermaid_js -}} - {{- $mermaid = .Site.Params.cdn.mermaid_js -}} -{{- else -}} - {{- $res := resources.Get "js/lib/mermaid/mermaid.min.js" -}} - {{- $mermaid = printf "" $res.RelPermalink -}} -{{- end -}} -{{- $mermaidInit := "" -}} -{{- $mermaid = delimit (slice $mermaid $mermaidInit) "" -}} - -{{- /* TypeIt https://github.com/alexmacarthur/typeit */ -}} -{{- $typeit := "" -}} -{{- if eq (getenv "HUGO_ENV") "production" | and .Site.Params.cdn.typeit_js -}} - {{- $typeit = .Site.Params.cdn.typeit_js -}} -{{- else -}} - {{- $res := resources.Get "js/lib/typeit/typeit.min.js" -}} - {{- $typeit = printf "" $res.RelPermalink -}} -{{- end -}} - -{{- /* jQuery.countdown https://github.com/hilios/jQuery.countdown */ -}} -{{- $countdown := "" -}} -{{- if eq (getenv "HUGO_ENV") "production" | and .Site.Params.cdn.jquery_countdown_js -}} - {{- $countdown = .Site.Params.cdn.jquery_countdown_js -}} -{{- else -}} - {{- $res := resources.Get "js/lib/jquery-countdown/jquery.countdown.min.js" -}} - {{- $countdown = printf "" $res.RelPermalink -}} -{{- end -}} - -{{- /* APlayer https://github.com/MoePlayer/APlayer */ -}} -{{- $aplayer_css := "" -}} -{{- if eq (getenv "HUGO_ENV") "production" | and .Site.Params.cdn.aplayer_css -}} - {{- $aplayer_css = .Site.Params.cdn.aplayer_css -}} -{{- else -}} - {{- $res := resources.Get "css/lib/aplayer/APlayer.min.css" -}} - {{- $aplayer_css = printf "" $res.RelPermalink -}} -{{- end -}} -{{- $aplayer_js := "" -}} -{{- if eq (getenv "HUGO_ENV") "production" | and .Site.Params.cdn.aplayer_js -}} - {{- $aplayer_js = .Site.Params.cdn.aplayer_js -}} -{{- else -}} - {{- $res := resources.Get "js/lib/aplayer/APlayer.min.js" -}} - {{- $aplayer_js = printf "" $res.RelPermalink -}} -{{- end -}} -{{- $aplayer := delimit (slice $aplayer_css $aplayer_js) "" -}} - -{{- /* MetingJS https://github.com/metowolf/MetingJS */ -}} -{{- $meting := "" -}} -{{- if eq (getenv "HUGO_ENV") "production" | and .Site.Params.cdn.meting_js -}} - {{- $meting = .Site.Params.cdn.meting_js -}} -{{- else -}} - {{- $res := resources.Get "js/lib/meting/Meting.min.js" -}} - {{- $meting = printf "" $res.RelPermalink -}} -{{- end -}} - -{{- /* ECharts https://github.com/apache/incubator-echarts */ -}} -{{- $echarts_js := "" -}} -{{- if eq (getenv "HUGO_ENV") "production" | and .Site.Params.cdn.echarts_js -}} -{{- $echarts_js = .Site.Params.cdn.echarts_js -}} -{{- else -}} -{{- $res := resources.Get "js/lib/echarts/echarts.min.js" -}} -{{- $echarts_js = printf "" $res.RelPermalink -}} -{{- end -}} -{{- $echarts_macarons_js := "" -}} -{{- if eq (getenv "HUGO_ENV") "production" | and .Site.Params.cdn.echarts_macarons_js -}} -{{- $echarts_macarons_js = .Site.Params.cdn.echarts_macarons_js -}} -{{- else -}} -{{- $res := resources.Get "js/lib/echarts/macarons.js" | minify -}} -{{- $echarts_macarons_js = printf "" $res.RelPermalink -}} -{{- end -}} -{{- $echarts := delimit (slice $echarts_js $echarts_macarons_js) "" -}} - -{{- $jquery | safeHTML -}} -{{- $lazysizes | safeHTML -}} {{- $smooth_scroll | safeHTML -}} -{{- if .IsPage -}} - {{- with .Scratch.Get "mermaidMap" -}} - {{- $mermaid | safeHTML -}} - - {{- end -}} - - {{- if or .Params.math .Site.Params.math -}} - {{- $katex | safeHTML -}} - {{- end -}} - - {{- if .Scratch.Get "music" -}} - {{- $aplayer | safeHTML -}} - {{- $meting | safeHTML -}} - {{- end -}} - - {{- with .Scratch.Get "countdownMap" -}} - {{- $countdown | safeHTML -}} - - {{- end -}} - - {{- /* dev feature */ -}} - {{- if .Params.dev -}} - {{- with .Scratch.Get "echartsMap" -}} - {{- $echarts | safeHTML -}} - - {{- end -}} - {{- end -}} -{{- end -}} - +{{- /* TypeIt https://github.com/alexmacarthur/typeit */ -}} {{- with .Scratch.Get "typeitMap" -}} + {{- $typeit := "" -}} + {{- if eq (getenv "HUGO_ENV") "production" | and .Site.Params.cdn.typeit_js -}} + {{- $typeit = .Site.Params.cdn.typeit_js -}} + {{- else -}} + {{- $res := resources.Get "js/lib/typeit/typeit.min.js" -}} + {{- $typeit = printf "" $res.RelPermalink -}} + {{- end -}} {{- $typeit | safeHTML -}} {{- $typeitArr := slice -}} {{- range $key, $val := . -}} @@ -177,9 +53,127 @@ {{- end -}} -{{- $res := resources.Get "/js/blog.js" | minify -}} - +{{- /* KaTeX https://github.com/KaTeX/KaTeX */ -}} +{{- if .Site.Params.math | and (ne .Params.math false) -}} + {{- $katex_css := "" -}} + {{- if eq (getenv "HUGO_ENV") "production" | and .Site.Params.cdn.katex_css -}} + {{- $katex_css = .Site.Params.cdn.katex_css -}} + {{- else -}} + {{- $res := resources.Get "css/lib/katex/katex.min.css" -}} + {{- $katex_css = printf "" $res.RelPermalink -}} + {{- end -}} + {{- $katex_js := "" -}} + {{- if eq (getenv "HUGO_ENV") "production" | and .Site.Params.cdn.katex_js -}} + {{- $katex_js = .Site.Params.cdn.katex_js -}} + {{- else -}} + {{- $res := resources.Get "js/lib/katex/katex.min.js" -}} + {{- $katex_js = printf "" $res.RelPermalink -}} + {{- end -}} + {{- $katex_auto_render_js := "" -}} + {{- if eq (getenv "HUGO_ENV") "production" | and .Site.Params.cdn.katex_auto_render_js -}} + {{- $katex_auto_render_js = .Site.Params.cdn.katex_auto_render_js -}} + {{- else -}} + {{- $res := resources.Get "js/lib/katex/auto-render.min.js" -}} + {{- $katex_auto_render_js = printf "" $res.RelPermalink -}} + {{- end -}} + {{- $katex := delimit (slice $katex_css $katex_js $katex_auto_render_js) "" -}} + {{- $katex | safeHTML -}} +{{- end -}} -{{- if eq (getenv "HUGO_ENV") "production" | and .Site.GoogleAnalytics -}} - {{- template "_internal/google_analytics_async.html" . -}} -{{- end -}} \ No newline at end of file +{{- /* mermaid https://github.com/knsv/mermaid */ -}} +{{- with .Scratch.Get "mermaidMap" -}} + {{- $mermaid := "" -}} + {{- if eq (getenv "HUGO_ENV") "production" | and .Site.Params.cdn.mermaid_js -}} + {{- $mermaid = .Site.Params.cdn.mermaid_js -}} + {{- else -}} + {{- $res := resources.Get "js/lib/mermaid/mermaid.min.js" -}} + {{- $mermaid = printf "" $res.RelPermalink -}} + {{- end -}} + {{- $mermaidInit := "" -}} + {{- $mermaid = delimit (slice $mermaid $mermaidInit) "" -}} + {{- $mermaid | safeHTML -}} + +{{- end -}} + +{{- /* Music */ -}} +{{- if .Scratch.Get "music" -}} + {{- /* APlayer https://github.com/MoePlayer/APlayer */ -}} + {{- $aplayer_css := "" -}} + {{- if eq (getenv "HUGO_ENV") "production" | and .Site.Params.cdn.aplayer_css -}} + {{- $aplayer_css = .Site.Params.cdn.aplayer_css -}} + {{- else -}} + {{- $res := resources.Get "css/lib/aplayer/APlayer.min.css" -}} + {{- $aplayer_css = printf "" $res.RelPermalink -}} + {{- end -}} + {{- $aplayer_js := "" -}} + {{- if eq (getenv "HUGO_ENV") "production" | and .Site.Params.cdn.aplayer_js -}} + {{- $aplayer_js = .Site.Params.cdn.aplayer_js -}} + {{- else -}} + {{- $res := resources.Get "js/lib/aplayer/APlayer.min.js" -}} + {{- $aplayer_js = printf "" $res.RelPermalink -}} + {{- end -}} + {{- $aplayer := delimit (slice $aplayer_css $aplayer_js) "" -}} + {{- $aplayer | safeHTML -}} + + {{- /* MetingJS https://github.com/metowolf/MetingJS */ -}} + {{- $meting := "" -}} + {{- if eq (getenv "HUGO_ENV") "production" | and .Site.Params.cdn.meting_js -}} + {{- $meting = .Site.Params.cdn.meting_js -}} + {{- else -}} + {{- $res := resources.Get "js/lib/meting/Meting.min.js" -}} + {{- $meting = printf "" $res.RelPermalink -}} + {{- end -}} + {{- $meting | safeHTML -}} +{{- end -}} + +{{- /* jQuery.countdown https://github.com/hilios/jQuery.countdown */ -}} +{{- with .Scratch.Get "countdownMap" -}} + {{- $countdown := "" -}} + {{- if eq (getenv "HUGO_ENV") "production" | and .Site.Params.cdn.jquery_countdown_js -}} + {{- $countdown = .Site.Params.cdn.jquery_countdown_js -}} + {{- else -}} + {{- $res := resources.Get "js/lib/jquery-countdown/jquery.countdown.min.js" -}} + {{- $countdown = printf "" $res.RelPermalink -}} + {{- end -}} + {{- $countdown | safeHTML -}} + +{{- end -}} + +{{- /* dev feature */ -}} +{{- if .Params.dev -}} + {{- /* ECharts https://github.com/apache/incubator-echarts */ -}} + {{- with .Scratch.Get "echartsMap" -}} + {{- $echarts_js := "" -}} + {{- if eq (getenv "HUGO_ENV") "production" | and .Site.Params.cdn.echarts_js -}} + {{- $echarts_js = .Site.Params.cdn.echarts_js -}} + {{- else -}} + {{- $res := resources.Get "js/lib/echarts/echarts.min.js" -}} + {{- $echarts_js = printf "" $res.RelPermalink -}} + {{- end -}} + {{- $echarts_macarons_js := "" -}} + {{- if eq (getenv "HUGO_ENV") "production" | and .Site.Params.cdn.echarts_macarons_js -}} + {{- $echarts_macarons_js = .Site.Params.cdn.echarts_macarons_js -}} + {{- else -}} + {{- $res := resources.Get "js/lib/echarts/macarons.js" | minify -}} + {{- $echarts_macarons_js = printf "" $res.RelPermalink -}} + {{- end -}} + {{- $echarts := delimit (slice $echarts_js $echarts_macarons_js) "" -}} + {{- $echarts | safeHTML -}} + + {{- end -}} +{{- end -}} + +{{- /* Blog script */ -}} +{{- $res := resources.Get "/js/blog.js" | minify -}} + \ No newline at end of file