feat: use Page.GetTerms

closes #67
reuixiy · Feb 20, 2020 · 110064a · 110064a
1 parent 299c218
commit 110064a
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 41 deletions.
diff --git a/layouts/index.sectionsatom.xml b/layouts/index.sectionsatom.xml
@@ -82,12 +82,8 @@
             {{ with $.Site.Taxonomies }}
                 {{ range $taxonomy, $terms := . }}
                     {{ with $page.Param $taxonomy }}
-                        {{ range $index, $term := . }}
-                            {{ $url := urls.Parse ($term | urlize) }}
-                            {{ $path := $url.Path }}
-                            {{ with $.Site.GetPage (printf "/%s/%s" $taxonomy $path) }}
-                                <category scheme="{{ .Permalink }}" term="{{ .Title | default $term }}" label="{{ .Title | default $term }}" />
-                            {{ end }}
+                        {{ range ($page.GetTerms $taxonomy) }}
+                            <category scheme="{{ .Permalink }}" term="{{ .Title }}" label="{{ .Title }}" />
                         {{ end }}
                     {{ end }}
                 {{ end }}

diff --git a/layouts/index.sectionsrss.xml b/layouts/index.sectionsrss.xml
@@ -75,12 +75,8 @@
                 {{ with $.Site.Taxonomies }}
                     {{ range $taxonomy, $terms := . }}
                         {{ with $page.Param $taxonomy }}
-                            {{ range $index, $term := . }}
-                                {{ $url := urls.Parse ($term | urlize) }}
-                                {{ $path := $url.Path }}
-                                {{ with $.Site.GetPage (printf "/%s/%s" $taxonomy $path) }}
-                                    <category domain="{{ .Permalink }}">{{ .Title | default $term }}</category>
-                                {{ end }}
+                            {{ range ($page.GetTerms $taxonomy) }}
+                                <category scheme="{{ .Permalink }}" term="{{ .Title }}" label="{{ .Title }}" />
                             {{ end }}
                         {{ end }}
                     {{ end }}

diff --git a/layouts/partials/components/minimal-footer.html b/layouts/partials/components/minimal-footer.html
@@ -3,14 +3,10 @@
         {{ with .Params.tags }}
             {{ $length := sub (len .) 1 }}
             <div class="post-tag">
-                {{- range $index, $tag := . -}}
-                    {{- $url := urls.Parse ($tag | urlize) -}}
-                    {{- $path := $url.Path -}}
-                    {{- with $.Site.GetPage (printf `/tags/%s` $path) -}}
-                        <a href="{{ .RelPermalink }}" rel="tag" class="post-tag-link">#{{ .Slug | default .LinkTitle | default $tag | lower | anchorize }}</a>
-                        {{- if lt $index $length -}}
-                            {{- print " " -}}
-                        {{- end -}}
+                {{- range $index, $tag := ($.GetTerms "tags") -}}
+                    <a href="{{ .RelPermalink }}" rel="tag" class="post-tag-link">#{{ .Slug | default .LinkTitle | default $tag | lower | anchorize }}</a>
+                    {{- if lt $index $length -}}
+                        {{- print " " -}}
                     {{- end -}}
                 {{- end -}}
             </div>
@@ -103,18 +99,14 @@
                         {{- end -}}
                     {{ else }}
                         {{ $length := sub (len .) 1 }}
-                        {{- range $index, $category := . -}}
+                        {{- range $index, $category := ($.GetTerms "categories") -}}
                             {{- if lt $index $length -}}
                                 {{- $.Scratch.Set "delimiter" ($.Site.Params.categoryDelimiter | default "/") -}}
                             {{- else -}}
                                 {{- $.Scratch.Set "delimiter" "" -}}
                             {{- end -}}
                             {{- $delimiter := ($.Scratch.Get "delimiter") -}}
-                            {{- $url := urls.Parse ($category | urlize) -}}
-                            {{- $path := $url.Path -}}
-                            {{- with $.Site.GetPage (printf `/categories/%s` $path) -}}
-                                {{- printf `<a href="%s" class="post-category-link">%s</a>%s` .RelPermalink (.Slug | default .LinkTitle | default $category | lower | anchorize) $delimiter | safeHTML -}}
-                            {{- end -}}
+                            {{- printf `<a href="%s" class="post-category-link">%s</a>%s` .RelPermalink (.Slug | default .LinkTitle | default $category | lower | anchorize) $delimiter | safeHTML -}}
                         {{- end -}}
                     {{ end }}
                 </div>

diff --git a/layouts/partials/components/post-meta.html b/layouts/partials/components/post-meta.html
@@ -55,18 +55,14 @@
                 {{ $length := sub (len .) 1 }}
                 <span class="post-meta-item category">
                     {{- printf `%s&nbsp;` $icon | safeHTML -}}
-                    {{- range $index, $category := . -}}
-                        {{- $url := urls.Parse ($category | urlize) -}}
-                        {{- $path := $url.Path -}}
+                    {{- range $index, $category := ($Deliver.GetTerms "categories") -}}
                         {{- if lt $index $length -}}
                             {{- $Deliver.Scratch.Set "delimiter" ($Deliver.Site.Params.categoryDelimiter | default "/") -}}
                         {{- else -}}
                             {{- $Deliver.Scratch.Set "delimiter" "" -}}
                         {{- end -}}
                         {{- $delimiter := ($Deliver.Scratch.Get "delimiter") -}}
-                        {{- with $Deliver.Site.GetPage (printf `/categories/%s` $path) -}}
-                            {{- printf `<a href="%s" class="category-link">%s</a>%s` .RelPermalink (.LinkTitle | default $category) $delimiter | safeHTML -}}
-                        {{- end -}}
+                        {{- printf `<a href="%s" class="category-link">%s</a>%s` .RelPermalink (.LinkTitle | default $category) $delimiter | safeHTML -}}
                     {{- end -}}
                 </span>
             {{ end }}

diff --git a/layouts/partials/components/post-tags.html b/layouts/partials/components/post-tags.html
@@ -1,14 +1,9 @@
 {{ if .Site.Params.enablePostTags }}
     {{ with .Params.tags }}
         <div class="post-tags">
-            {{ range . }}
-                {{ $tag := . }}
-                {{ $url := urls.Parse (. | urlize) }}
-                {{ $path := $url.Path }}
-                {{ with $.Site.GetPage (printf `/tags/%s` $path) }}
-                    {{ $icon := (replace (index $.Site.Data.SVG $.Site.Params.postTagsIcon) "icon" "icon tag-icon") }}
-                    <a href="{{ .RelPermalink }}" rel="tag" class="post-tags-link">{{ $icon | safeHTML }}{{ .LinkTitle | default $tag }}</a>
-                {{ end }}
+            {{ range ($.GetTerms "tags") }}
+                {{ $icon := (replace (index $.Site.Data.SVG $.Site.Params.postTagsIcon) "icon" "icon tag-icon") }}
+                <a href="{{ .RelPermalink }}" rel="tag" class="post-tags-link">{{ $icon | safeHTML }}{{ .LinkTitle }}</a>
             {{ end }}
         </div>
     {{ end }}

diff --git a/theme.toml b/theme.toml
@@ -8,7 +8,7 @@ description = "MemE is a powerful and highly customizable GoHugo theme for perso
 homepage = "https://github.com/reuixiy/hugo-theme-meme/"
 tags = ["Blog", "Minimal", "Clean", "Typography", "Multilingual"]
 features = ["Dark Mode", "InstantClick", "KaTeX", "JSON-LD", "Drop Cap", "PWA", "TOC"]
-min_version = "0.62.2"
+min_version = "0.65.0"
 
 [author]
 name = "reuixiy"