Merge remote-tracking branch 'upstream/master'

2024-03-03 09:39:46 +08:00 · 2024-03-03 09:39:46 +08:00 · de53b64274
parent 3a77cd3d27 2f9306502d
commit de53b64274
9 changed files with 141 additions and 42 deletions
--- a/config.yaml
+++ b/config.yaml
@ -51,6 +51,12 @@ params:
            issueTerm: pathname
            label:

+        beaudar:
+            repo:
+            issueTerm: pathname
+            label:
+            theme:        
+
        remark42:
            host:
            site:
@ -64,7 +70,7 @@ params:
            clientSecret:
            autoCreateIssue: false

-        # Waline client configuration see: https://waline.js.org/en/reference/client.html
+        # Waline client configuration see: https://waline.js.org/en/reference/client/props.html
        waline:
            serverURL:
            lang:
@ -75,9 +81,9 @@ params:
            requiredMeta:
                - nick
                - mail
-            placeholder:
            locale:
                admin: Admin
+                placeholder:

        twikoo:
            envId:
--- a/exampleSite/config.yaml
+++ b/exampleSite/config.yaml
@ -1,10 +1,18 @@
 baseurl: https://example.com
 languageCode: en-us
 theme: hugo-theme-stack
-paginate: 5
+paginate: 3
 title: Example Site
 copyright: Example Person

+# Theme i18n support
+# Available values: ar, bn, ca, de, el, en, es, fr, hu, id, it, ja, ko, nl, pt-br, th, uk, zh-cn, zh-hk, zh-tw
+DefaultContentLanguage: en
+
+# Set hasCJKLanguage to true if DefaultContentLanguage is in [zh-cn ja ko]
+# This will make .Summary and .WordCount behave correctly for CJK languages.
+hasCJKLanguage: false
+
 languages:
    en:
        languageName: English
@ -26,19 +34,13 @@ languages:
        params:
            description: وصف تجريبي

-# Change it to your Disqus shortname before using
-disqusShortname: hugo-theme-stack
-
-# GA Tracking ID
-googleAnalytics:
-
-# Theme i18n support
-# Available values: ar, bn, ca, de, el, en, es, fr, hu, id, it, ja, ko, nl, pt-br, th, uk, zh-cn, zh-hk, zh-tw
-DefaultContentLanguage: en
-
-# Set hasCJKLanguage to true if DefaultContentLanguage is in [zh-cn ja ko]
-# This will make .Summary and .WordCount behave correctly for CJK languages.
-hasCJKLanguage: false
+services:
+    # Change it to your Disqus shortname before using
+    disqus:
+        shortname: "hugo-theme-stack"
+    # GA Tracking ID
+    googleAnalytics:
+        id:

 permalinks:
    post: /p/:slug/
@ -49,7 +51,7 @@ params:
        - post
    featuredImageField: image
    rssFullContent: true
-    favicon:  # e.g.: favicon placed in `static/favicon.ico` of your site folder, then set this field to `/favicon.ico` (`/` is necessary)
+    favicon: # e.g.: favicon placed in `static/favicon.ico` of your site folder, then set this field to `/favicon.ico` (`/` is necessary)

    footer:
        since: 2020
@ -91,6 +93,12 @@ params:
            issueTerm: pathname
            label:

+        beaudar:
+            repo:
+            issueTerm: pathname
+            label:
+            theme:        
+
        remark42:
            host:
            site:
--- a/i18n/zh-tw.yaml
+++ b/i18n/zh-tw.yaml
@ -14,6 +14,17 @@ list:
        one: 小節
        other: 小節

+article:
+    back:
+        other: 返回
+
+    section:
+        other: 段落
+
+    subsection:
+        one: 小節
+        other: 小節
+
 article:
    back: 返回
    tableOfContents: 目錄
@ -21,15 +32,32 @@ article:
    lastUpdatedOn: 最後更新
    readingTime: "閱讀時間: {{ .Count }} 分鐘"

+    readingTime:
+        one: "閱讀時間: {{ .Count }} 分鐘"
+        other: "閱讀時間: {{ .Count }} 分鐘"
+
 notFound:
-    title: 404 錯誤
-    subtitle: 頁面不存在
+    title:
+        other: 404 錯誤
+
+    subtitle:
+        other: 頁面不存在

 widget:
    archives:
        title: 紀錄
        more: 更多

+        more:
+            other: 更多
+
+    tagCloud:
+        title:
+            other: 標籤雲
+    categoriesCloud:
+        title:
+            other: 分類
+
 search:
    title: 搜尋
    placeholder: 輸入關鍵字...
--- a/layouts/partials/comments/provider/beaudar.html
+++ b/layouts/partials/comments/provider/beaudar.html
@ -0,0 +1,46 @@
+<script
+  src="https://beaudar.lipk.org/client.js"
+  repo="{{ .Site.Params.comments.beaudar.repo }}"
+  issue-term="{{ .Site.Params.comments.beaudar.issueTerm }}"
+  {{ with .Site.Params.comments.beaudar.label }}
+  label="{{ . }}"
+  {{ end }}
+  theme="{{ .Site.Params.comments.beaudar.theme }}"
+  crossorigin="anonymous"
+  async
+></script>
+
+<style>
+  .beaudar {
+    max-width: unset;
+  }
+</style>
+
+<script>
+  let beaudarLoaded = false;
+
+  function setBeaudarTheme(theme) {
+    let beaudar = document.querySelector(".beaudar iframe");
+    if (beaudar) {
+      beaudar.contentWindow.postMessage(
+        {
+          type: "set-theme",
+          theme: `github-${theme}`,
+        },
+        "https://beaudar.lipk.org"
+      );
+    }
+  }
+
+  addEventListener("message", (event) => {
+    if (event.origin !== "https://beaudar.lipk.org") return;
+    /// Called when Beaudar is ready
+    beaudarLoaded = true;
+    setBeaudarTheme(document.documentElement.dataset.scheme);
+  });
+
+  window.addEventListener("onColorSchemeChange", (e) => {
+    if (!beaudarLoaded) return;
+    setBeaudarTheme(e.detail);
+  });
+</script>
--- a/layouts/partials/comments/provider/remark42.html
+++ b/layouts/partials/comments/provider/remark42.html
@ -6,11 +6,16 @@
        components: ['embed'],
        url: '{{ $.Permalink }}',
    };
-</script>
-<script>
-    !function (e, n) { for (var o = 0; o < e.length; o++) { var r = n.createElement("script"), c = ".js", d = n.head || n.body; "noModule" in r ? (r.type = "module", c = ".mjs") : r.async = !0, r.defer = !0, r.src = remark_config.host + "/web/" + e[o] + c, d.appendChild(r) } }(remark_config.components || ["embed"], document);
-</script>
-<script>
+
+    !function(e, n) {
+        for (var o = 0; o < e.length; o++) {
+            var r = n.createElement('script'),
+            c = '.js',
+            d = n.head || n.body;
+            'noModule' in r ? (r.type = 'module', c = '.mjs') : r.async = !0, r.defer = !0, r.src = remark_config.host + '/web/' + e[o] + c, d.appendChild(r)
+        }
+    }(remark_config.components || ['embed'], document);
+
    window.addEventListener('onColorSchemeChange', (e) => {
        window.REMARK42.changeTheme(e.detail);
    })
--- a/layouts/partials/comments/provider/twikoo.html
+++ b/layouts/partials/comments/provider/twikoo.html
@ -1,4 +1,4 @@
-<script src="//cdn.jsdelivr.net/npm/twikoo@1.6.16/dist/twikoo.all.min.js"></script>
+<script src="//cdn.jsdelivr.net/npm/twikoo@1.6.21/dist/twikoo.all.min.js"></script>
 <div id="tcomment"></div>
 <style>
    .twikoo {
--- a/layouts/partials/head/head.html
+++ b/layouts/partials/head/head.html
@ -5,7 +5,7 @@
 <meta name='description' content='{{ $description }}'>
 {{ with .Params.Keywords }}<meta name="keywords" content="{{ delimit . ", " }}">{{ end }}

-{{- $title := partialCached "data/title" . .RelPermalink -}}
+{{- $title := partial "data/title" . -}}
 <title>{{ $title }}</title>

 <link rel='canonical' href='{{ .Permalink }}'>
--- a/layouts/partials/sidebar/left.html
+++ b/layouts/partials/sidebar/left.html
@ -63,27 +63,30 @@
            </a>
        </li>
        {{ end }}
-
-        <div class="menu-bottom-section">
+    </ol>
+    <div class="menu-bottom-section">
+        <ol class="menu">
            {{- $currentLanguageCode := .Language.Lang -}}
-            {{ with .Site.Home.AllTranslations }}
-                <li id="i18n-switch">  
-                    {{ partial "helper/icon" "language" }}
-                    <select name="language" onchange="window.location.href = this.selectedOptions[0].value">
-                        {{ range . }}
-                            <option value="{{ .Permalink }}" {{ if eq .Language.Lang $currentLanguageCode }}selected{{ end }}>{{ .Language.LanguageName }}</option>
-                        {{ end }}
-                    </select>
-                </li>
+            {{ if ( compare.Gt .Site.Home.AllTranslations.Len 1 ) }}
+                {{ with .Site.Home.AllTranslations }}
+                    <li id="i18n-switch">  
+                        {{ partial "helper/icon" "language" }}
+                        <select name="language" title="language" onchange="window.location.href = this.selectedOptions[0].value">
+                            {{ range . }}
+                                <option value="{{ .Permalink }}" {{ if eq .Language.Lang $currentLanguageCode }}selected{{ end }}>{{ .Language.LanguageName }}</option>
+                            {{ end }}
+                        </select>
+                    </li>
+                {{ end }}
            {{ end }}
-            
-            {{ if .Site.Params.colorScheme.toggle }}
+
+            {{ if (default false .Site.Params.colorScheme.toggle) }}
                <li id="dark-mode-toggle">
                    {{ partial "helper/icon" "toggle-left" }}
                    {{ partial "helper/icon" "toggle-right" }}
                    <span>{{ T "darkMode" }}</span>
                </li>
            {{ end }}
-        </div>
-    </ol>
+        </ol>
+    </div>
 </aside>
--- a/layouts/partials/sidebar/right.html
+++ b/layouts/partials/sidebar/right.html
@ -4,7 +4,10 @@
    <aside class="sidebar right-sidebar sticky">
        {{ range $widget := . }}
            {{ if templates.Exists (printf "partials/widget/%s.html" .type) }}
-                {{ partial (printf "widget/%s" .type) (dict "Context" $context "Params" .params) }}
+                <!-- Ensure that the `params` is not nil -->
+                {{- $params := default dict .params -}}
+
+                {{ partial (printf "widget/%s" .type) (dict "Context" $context "Params" $params) }}
            {{ else }}
                {{ warnf "Widget %s not found" .type }}
            {{ end }}