Merge pull request #369 from nunocoracao/368-bug-likes-in-taxonomies-and-terms-is-shared-globally

🐛 fixed likes and view counters for taxonomies and terms

.github/workflows/firebase-preview.yml

@@ -7,7 +7,7 @@ jobs:
     steps:
       
       - name: Hugo setup
-        uses: peaceiris/actions-hugo@v2.4.12
+        uses: peaceiris/actions-hugo@v2.6.0
         env:
           ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
 

.github/workflows/firebase-production.yml

@@ -9,7 +9,7 @@ jobs:
     steps:
       
       - name: Hugo setup
-        uses: peaceiris/actions-hugo@v2.4.12
+        uses: peaceiris/actions-hugo@v2.6.0
         env:
           ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
 

.github/workflows/test.yml

@@ -16,7 +16,7 @@ jobs:
           fetch-depth: 0
 
       - name: Setup Hugo
-        uses: peaceiris/actions-hugo@v2
+        uses: peaceiris/actions-hugo@v2.6.0
         with:
           hugo-version: "latest"
 

config/_default/config.toml

@@ -6,6 +6,8 @@
 # baseURL = "https://your_domain.com/"
 defaultContentLanguage = "en"
 
+# pluralizeListTitles = "true" # hugo function useful for non-english languages, find out more in  https://gohugo.io/getting-started/configuration/#pluralizelisttitles
+
 enableRobotsTXT = true
 paginate = 20
 summaryLength = 30

config/_default/params.toml

@@ -65,7 +65,7 @@ enableCodeCopy = true
   showAuthorsBadges = false 
   showWordCount = true
   showSummary = true
-  sharingLinks = [ "linkedin", "twitter", "whatsapp", "pinterest", "reddit", "facebook", "email"]
+  sharingLinks = [ "linkedin", "twitter", "reddit", "pinterest", "facebook", "email"]
 
 [list]
   #showHero = true

data/sharing.json

@@ -1,34 +1,32 @@
 {
-  "links": {
+  "email": {
-    "email": {
+    "icon": "email",
-      "icon": "email",
+    "title": "sharing.email",
-      "title": "sharing.email",
+    "url": "mailto:?body=%s&subject=%s"
-      "url": "mailto:?body=%s&subject=%s"
+  },
-    },
+  "facebook": {
-    "facebook": {
+    "icon": "facebook",
-      "icon": "facebook",
+    "title": "sharing.facebook",
-      "title": "sharing.facebook",
+    "url": "https://www.facebook.com/sharer/sharer.php?u=%s&quote=%s"
-      "url": "https://www.facebook.com/sharer/sharer.php?u=%s&quote=%s"
+  },
-    },
+  "linkedin": {
-    "linkedin": {
+    "icon": "linkedin",
-      "icon": "linkedin",
+    "title": "sharing.linkedin",
-      "title": "sharing.linkedin",
+    "url": "https://www.linkedin.com/shareArticle?mini=true&url=%s&title=%s"
-      "url": "https://www.linkedin.com/shareArticle?mini=true&url=%s&title=%s"
+  },
-    },
+  "pinterest": {
-    "pinterest": {
+    "icon": "pinterest",
-      "icon": "pinterest",
+    "title": "sharing.pinterest",
-      "title": "sharing.pinterest",
+    "url": "https://pinterest.com/pin/create/bookmarklet/?url=%s&description=%s"
-      "url": "https://pinterest.com/pin/create/bookmarklet/?url=%s&description=%s"
+  },
-    },
+  "reddit": {
-    "reddit": {
+    "icon": "reddit",
-      "icon": "reddit",
+    "title": "sharing.reddit",
-      "title": "sharing.reddit",
+    "url": "https://reddit.com/submit/?url=%s&resubmit=true&title=%s"
-      "url": "https://reddit.com/submit/?url=%s&resubmit=true&title=%s"
+  },
-    },
+  "twitter": {
-    "twitter": {
+    "icon": "twitter",
-      "icon": "twitter",
+    "title": "sharing.twitter",
-      "title": "sharing.twitter",
+    "url": "https://twitter.com/intent/tweet/?url=%s&text=%s"
-      "url": "https://twitter.com/intent/tweet/?url=%s&text=%s"
-    }
   }
-}
+}

exampleSite/config/_default/config.toml

@@ -6,6 +6,8 @@ theme = "blowfish"
 baseURL = "https://nunocoracao.github.io/blowfish"
 defaultContentLanguage = "en"
 
+# pluralizeListTitles = "true" # hugo function useful for non-english languages, find out more in  https://gohugo.io/getting-started/configuration/#pluralizelisttitles
+
 enableRobotsTXT = true
 paginate = 20
 summaryLength = 30

exampleSite/config/_default/params.toml

@@ -64,7 +64,7 @@ defaultBackgroundImage = "/img/iceland.jpg"
   showAuthorsBadges = true 
   showWordCount = false
   showSummary = true
-  sharingLinks = [ "linkedin", "twitter", "whatsapp", "pinterest", "reddit", "facebook", "email"]
+  sharingLinks = [ "linkedin", "twitter", "reddit", "pinterest", "facebook", "email"]
 
 [list]
   showHero = true

exampleSite/content/users/index.md

@@ -53,6 +53,7 @@ Real websites that are built with Blowfish.
 | [sdehm.dev](https://sdehm.dev)                                        | Personal site                |
 | [dizzytech.de](https://dizzytech.de)                                  | Personal site                |
 | [blog.rotrixx.eu](https://blog.rotrixx.eu)                            | Personal site                |
+| [hexwiki.cz](https://hexwiki.cz/)                                     | Personal site                |
 
 
 

layouts/_default/baseof.html

@@ -25,7 +25,7 @@
   <div class="relative flex flex-col grow">
     <main id="main-content" class="grow">
       {{ block "main" . }}{{ end }}
-      {{ if and (.Site.Params.footer.showScrollToTop | default true) (gt .WordCount 200) }}
+      {{ if and (.Site.Params.footer.showScrollToTop | default true) (gt .WordCount 1) }}
       <div class="pointer-events-none absolute top-[100vh] bottom-0 w-12 ltr:right-0 rtl:left-0">
         <a href="#the-top"
           class="pointer-events-auto sticky top-[calc(100vh-5.5rem)] flex h-12 w-12 mb-16 items-center justify-center rounded-full bg-neutral/50 text-xl text-neutral-700 backdrop-blur hover:text-primary-600 dark:bg-neutral-800/50 dark:text-neutral dark:hover:text-primary-400"

layouts/_default/taxonomy.html

@@ -30,8 +30,8 @@
     </section>
   {{ end }}
   <script>
-    var oid = "views_{{ .File.Path }}"
+    var oid = "views_taxonomy_{{ .Data.Plural }}"
-    var oid_likes = "likes_{{ .File.Path }}"
+    var oid_likes = "likes_taxonomy_{{ .Data.Plural }}"
   </script>
   {{ $jsPage := resources.Get "js/page.js" }}
   {{ $jsPage = $jsPage | resources.Minify | resources.Fingerprint "sha512" }}

layouts/_default/term.html

@@ -28,8 +28,8 @@
     </div>
     {{ end }}
     <script>
-      var oid = "views_{{ .File.Path }}"
+      var oid = "views_term_{{ .Data.Term }}"
-      var oid_likes = "likes_{{ .File.Path }}"
+      var oid_likes = "likes_term_{{ .Data.Term }}"
     </script>
     {{ $jsPage := resources.Get "js/page.js" }}
     {{ $jsPage = $jsPage | resources.Minify | resources.Fingerprint "sha512" }}

layouts/partials/header/fixed.html

@@ -1,7 +1,7 @@
 <div class="min-h-[148px]"></div>
-<div class="fixed inset-x-0 h-[120px] pl-[24px] pr-[24px] sbackdrop-blur-xl sshadown-2xl" style="z-index:100">
+<div class="fixed inset-x-0 pl-[24px] pr-[24px] sbackdrop-blur-xl sshadown-2xl" style="z-index:100">
   <div id="menu-blur" class="absolute opacity-0 inset-x-0 top-0 h-full single_hero_background nozoom backdrop-blur-2xl shadow-2xl"></div>
-  <div class="relative max-w-[64rem] h-[100px] ml-auto mr-auto">
+  <div class="relative max-w-[64rem] ml-auto mr-auto">
     {{ partial "partials/header/basic.html" . }}
   </div>
 </div>

layouts/partials/meta/likes.html

@@ -1,5 +1,11 @@
 <span>
+    {{ if eq .Kind "taxonomy"}}
+    <span id="likes_taxonomy_{{ .Page.Data.Plural }}" title="likes">0</span> 
+    {{ else if eq .Kind "term"}}
+    <span id="likes_term_{{ .Page.Data.Term }}" title="likes">0</span> 
+    {{ else }}
     <span id="likes_{{ .File.Path }}" title="likes">0</span> 
+    {{ end }}
     <span class="inline-block align-text-bottom">{{ partial "icon.html" "heart" }}</span>
 </span>
 {{- /* Trim EOF */ -}}

layouts/partials/meta/views.html

@@ -1,5 +1,11 @@
 <span>
+    {{ if eq .Kind "taxonomy"}}
+    <span id="views_taxonomy_{{ .Page.Data.Plural }}" title="views">0</span> 
+    {{ else if eq .Kind "term"}}
+    <span id="views_term_{{ .Page.Data.Term }}" title="views">0</span> 
+    {{ else }}
     <span id="views_{{ .File.Path }}" title="views">0</span> 
+    {{ end }}
     <span class="inline-block align-text-bottom">{{ partial "icon.html" "eye" }}</span>
 </span>
 {{- /* Trim EOF */ -}}

layouts/partials/series-closed.html

@@ -4,7 +4,9 @@
         class="py-1 text-lg font-semibold cursor-pointer bg-primary-200 text-neutral-800 ltr:-ml-5 ltr:pl-5 rtl:-mr-5 rtl:pr-5 dark:bg-primary-800 dark:text-neutral-100">
         {{ index .Params.series 0 }} - {{ i18n "article.part_of_series" }}
     </summary>
-    {{ range $post := sort (index .Site.Taxonomies.series (index .Params.series 0 | urlize)) "Params.series_order" }}
+    {{ $seriesName := strings.ToLower (index .Params.series 0) }}
+    {{ $seriesNameURL := strings.Replace $seriesName " " "-" }}
+    {{ range $post := sort (index .Site.Taxonomies.series $seriesNameURL) "Params.series_order" }}
     {{ if eq $post.Permalink $.Page.Permalink }}
     <div
         class="py-1 border-dotted border-neutral-300 ltr:-ml-5 ltr:border-l ltr:pl-5 rtl:-mr-5 rtl:border-r rtl:pr-5 dark:border-neutral-600">
@@ -21,4 +23,4 @@
     {{end}}
 
 </details>
-{{end}}
+{{end}}

layouts/partials/series.html

@@ -5,7 +5,9 @@
         class="py-1 text-lg font-semibold cursor-pointer bg-primary-200 text-neutral-800 ltr:-ml-5 ltr:pl-5 rtl:-mr-5 rtl:pr-5 dark:bg-primary-800 dark:text-neutral-100">
         {{ index .Params.series 0 }} - {{ i18n "article.part_of_series" }}
     </summary>
-    {{ range $post := sort (index .Site.Taxonomies.series (index .Params.series 0 | urlize)) "Params.series_order" }}
+    {{ $seriesName := strings.ToLower (index .Params.series 0) }}
+    {{ $seriesNameURL := strings.Replace $seriesName " " "-" }}
+    {{ range $post := sort (index .Site.Taxonomies.series $seriesNameURL) "Params.series_order" }}
     {{ if eq $post.Permalink $.Page.Permalink }}
     <div
         class="py-1 border-dotted border-neutral-300 ltr:-ml-5 ltr:border-l ltr:pl-5 rtl:-mr-5 rtl:border-r rtl:pr-5 dark:border-neutral-600">
@@ -22,4 +24,4 @@
     {{end}}
 
 </details>
-{{end}}
+{{end}}

layouts/partials/sharing-links.html

@@ -1,16 +1,17 @@
 {{ with .Params.sharingLinks | default (.Site.Params.article.sharingLinks | default false) }}
+  {{ $links := site.Data.sharing }}
   <section class="flex flex-row flex-wrap justify-center pt-4 text-xl">
-    {{ range $.Site.Data.sharing.links }}
+    {{ range . }}
-      {{ with . }}
+      {{ with index $links . }}
-        <a
+      <a
-          target="_blank"
+      target="_blank"
-          class="m-1 rounded bg-neutral-300 p-1.5 text-neutral-700 hover:bg-primary-500 hover:text-neutral dark:bg-neutral-700 dark:text-neutral-300 dark:hover:bg-primary-400 dark:hover:text-neutral-800"
+      class="m-1 rounded bg-neutral-300 p-1.5 text-neutral-700 hover:bg-primary-500 hover:text-neutral dark:bg-neutral-700 dark:text-neutral-300 dark:hover:bg-primary-400 dark:hover:text-neutral-800"
-          href="{{ printf .url $.Permalink $.Title }}"
+      href="{{ printf .url $.Permalink $.Title }}"
-          title="{{ i18n .title }}"
+      title="{{ i18n .title }}"
-          aria-label="{{ i18n .title }}"
+      aria-label="{{ i18n .title }}"
-          >
+      >
-          {{ partial "icon.html" .icon }}
+      {{ partial "icon.html" .icon }}
-        </a>
+    </a>
       {{ end }}
     {{ end }}
   </section>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hugo-blowfish-theme",
-  "version": "2.22.0",
+  "version": "2.22.2",
   "description": "Blowfish theme for Hugo",
   "scripts": {
     "fullinstall": "npm run preinstall && npm install && npm run postinstall",