Merge pull request #242 from nunocoracao/dev

Merge dev

README.md

@@ -1,5 +1,8 @@
 # Blowfish
 
+<a target="_blank" href="https://www.buymeacoffee.com/nunocoracao"><img class="nozoom" src="https://img.buymeacoffee.com/button-api/?text=Buy me a coffee&emoji=&slug=nunocoracao&button_colour=FFDD00&font_colour=000000&font_family=Cookie&outline_colour=000000&coffee_colour=ffffff" /></a>
+<a target="_blank" href="http://tee.pub/lic/qwSlWVBL5zc"><img class="nozoom" src="https://img.buymeacoffee.com/button-api/?text=Merch Store &emoji=💎&slug=nunocoracao&button_colour=5F7FFF&font_colour=ffffff&font_family=Lato&outline_colour=000000&coffee_colour=FFDD00" /></a>
+
 [![Blowfish Docs Deploy](https://github.com/nunocoracao/blowfish/actions/workflows/pages.yml/badge.svg)](https://github.com/nunocoracao/blowfish/actions/workflows/pages.yml)
 [![Minimum Hugo Version](https://img.shields.io/static/v1?label=min-HUGO-version&message=0.87.0&color=blue&logo=hugo)](https://github.com/gohugoio/hugo/releases/tag/v0.87.0)
 [![GitHub](https://img.shields.io/github/license/nunocoracao/blowfish)](https://github.com/nunocoracao/blowfish/blob/main/LICENSE)
@@ -11,6 +14,7 @@ Blowfish is designed to be a powerful, lightweight theme for [Hugo](https://gohu
 
 🌏 [Demo site](https://nunocoracao.github.io/blowfish/)  
 📑 [Theme documentation](https://nunocoracao.github.io/blowfish/docs/)  
+💎 [Merch Store](http://tee.pub/lic/qwSlWVBL5zc)  
 🐛 [Bug reports & issues](https://github.com/nunocoracao/blowfish/issues)  
 💡 [Questions & feature requests](https://github.com/nunocoracao/blowfish/discussions)
 
@@ -31,6 +35,7 @@ Blowfish is designed to be a powerful, lightweight theme for [Hugo](https://gohu
 - Flexible with any content types, taxonomies and menus
 - Multilingual content support inlcuding support for RTL languages
 - Ability to link to posts on third-party websites
+- Buymeacoffee integration
 - Client-side site search powered by Fuse.js
 - Diagrams and visualisations using Mermaid
 - Charts using Chart.js

config/_default/params.toml

@@ -94,6 +94,13 @@ enableCodeCopy = true
   # site = "ABC12345"
   # domain = "llama.yoursite.com"
 
+[buymeacoffee]
+  # identifier = ""
+  # globalWidget = true
+  # globalWidgetMessage = "Hello"
+  # globalWidgetColor = "#FFDD00"
+  # globalWidgetPosition = "Right"
+
 [verification]
   # google = ""
   # bing = ""

exampleSite/config/_default/menus.en.toml

@@ -30,17 +30,22 @@
   pageRef = "users"
   weight = 40
 
+[[main]]
+  name = "Merch"
+  url = "http://tee.pub/lic/qwSlWVBL5zc"
+  weight = 50
+
 [[main]]
   identifier = "github"
   pre = "github"
   url = "https://github.com/nunocoracao/blowfish"
-  weight = 50
+  weight = 60
 
 [[main]]
   identifier = "twitter"
   pre = "twitter"
   url = "https://twitter.com/burufugu"
-  weight = 60
+  weight = 70
 
 
 # -- Footer Menu --

exampleSite/config/_default/params.toml

@@ -94,6 +94,13 @@ mainSections = ["docs"]
   # site = "ABC12345"
   # domain = "llama.yoursite.com"
 
+[buymeacoffee]
+  identifier = "nunocoracao"
+  globalWidget = true
+  globalWidgetMessage = "Thank you for visiting."
+  globalWidgetColor = "#FFDD00"
+  globalWidgetPosition = "Right"
+
 [verification]
   # google = ""
   # bing = ""

exampleSite/content/_index.md

@@ -3,6 +3,12 @@ title: "Welcome to Blowfish! :tada:"
 description: "This is a demo of the Blowfish theme for Hugo."
 ---
 
+<!--center style="display:flex;align-items:center;flex-wrap:wrap;justify-content:space-evenly;">
+<a target="_blank" href="https://www.buymeacoffee.com/nunocoracao"><img class="nozoom" src="https://img.buymeacoffee.com/button-api/?text=Buy me a coffee&emoji=&slug=nunocoracao&button_colour=FFDD00&font_colour=000000&font_family=Cookie&outline_colour=000000&coffee_colour=ffffff" /></a>
+
+<a target="_blank" href="http://tee.pub/lic/qwSlWVBL5zc"><img class="nozoom" src="https://img.buymeacoffee.com/button-api/?text=Merch Store &emoji=💎&slug=nunocoracao&button_colour=5F7FFF&font_colour=ffffff&font_family=Lato&outline_colour=000000&coffee_colour=FFDD00" /></a>
+</center-->
+
 This is a demo site built entirely using Blowfish. It also contains a complete set of [theme documentation]({{< ref "docs" >}}). Blowfish is flexible and is great for both static page-based content (like this demo) or a traditional blog with a feed of recent posts.
 
 <div class="flex px-4 py-2 mb-8 text-base rounded-md bg-primary-100 dark:bg-primary-900">

exampleSite/content/docs/configuration/index.md

@@ -125,7 +125,7 @@ Many of the article defaults here can be overridden on a per article basis by sp
 
 <!-- prettier-ignore-start -->
 | Name                                | Default                | Description                                                                                                                                                                                                                                                                                                        |
-| ------------------------------- | ---------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| ----------------------------------- | ---------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
 | `colorScheme`                       | `"blowfish"`           | The theme colour scheme to use. Valid values are `blowfish` (default), `avocado`, `ocean`, `fire` and `slate`. Refer to the [Colour Schemes]({{< ref "getting-started#colour-schemes" >}}) section for more details.                                                                                               |
 | `defaultAppearance`                 | `"light"`              | The default theme appearance, either `light` or `dark`.                                                                                                                                                                                                                                                            |
 | `autoSwitchAppearance`              | `true`                 | Whether the theme appearance automatically switches based upon the visitor's operating system preference. Set to `false` to force the site to always use the `defaultAppearance`.                                                                                                                                  |
@@ -137,6 +137,7 @@ Many of the article defaults here can be overridden on a per article basis by sp
 | `showLikes`                         | _Not set_              | Whether or not articles and list likes are displayed. This requires firebase integrations to be enabled, look below.                                                                                                                                                                                               |
 | `robots`                            | _Not set_              | String that indicates how robots should handle your site. If set, it will be output in the page head. Refer to [Google's docs](https://developers.google.com/search/docs/advanced/robots/robots_meta_tag#directives) for valid values.                                                                             |
 | `disableImageZoom`                  | `false`                | Disables image zoom feature across all the images in the site.                                                                                                                                                                                                                                                     |
+| `defaultBackgroundImage`            | _Not set_              | Default background image for both `background` homepage layout and `background` hero style |
 | `header.layout`                     | `"basic"`              | Defines the header for the entire site, supported values are `basic` and `fixed`.                                                                                                                                                                                                                                  |
 | `footer.showMenu`                   | `true`                 | Show/hide the footer menu, which can be configured in the `[[footer]]` section of the `config/_default/menus.en.toml` file.                                                                                                                                                                                        |
 | `footer.showCopyright`              | `true`                 | Whether or not to show the copyright string in the site footer. Note that the string itself can be customised using the `copyright` parameter in the [languages configuration](#language-and-i18n).                                                                                                                |
@@ -189,15 +190,20 @@ Many of the article defaults here can be overridden on a per article basis by sp
 | `list.cardViewScreenWidth`          | `false`                | Enhance the width of card galleries in lists to take the full width available.                                                                                                                                                                                                                                     |
 | `sitemap.excludedKinds`             | `["taxonomy", "term"]` | Kinds of content that should be excluded from the generated `/sitemap.xml` file. Refer to the [Hugo docs](https://gohugo.io/templates/section-templates/#page-kinds) for acceptable values.                                                                                                                        |
 | `taxonomy.showTermCount`            | `true`                 | Whether or not the number of articles within a taxonomy term is displayed on the taxonomy listing.                                                                                                                                                                                                                 |
-| `firebase.apiKey`               | _Not set_              | Firebase apiKey, required to integrate against Firebase. Check [this page]({{< ref "firebase-views" >}}) for a guide on how to integrate Firebase into Blowfish                                                                                                                                                    |
+| `firebase.apiKey`                   | _Not set_              | Firebase apiKey, required to integrate against Firebase. Check [this page]({{< ref "firebase-views" >}}) for a guide on how to integrate Firebase into Blowfish.                                                                                                                                                   |
-| `firebase.authDomain`           | _Not set_              | Firebase authDomain, required to integrate against Firebase. Check [this page]({{< ref "firebase-views" >}}) for a guide on how to integrate Firebase into Blowfish                                                                                                                                                |
+| `firebase.authDomain`               | _Not set_              | Firebase authDomain, required to integrate against Firebase. Check [this page]({{< ref "firebase-views" >}}) for a guide on how to integrate Firebase into Blowfish.                                                                                                                                               |
-| `firebase.projectId`            | _Not set_              | Firebase projectId, required to integrate against Firebase. Check [this page]({{< ref "firebase-views" >}}) for a guide on how to integrate Firebase into Blowfish                                                                                                                                                 |
+| `firebase.projectId`                | _Not set_              | Firebase projectId, required to integrate against Firebase. Check [this page]({{< ref "firebase-views" >}}) for a guide on how to integrate Firebase into Blowfish.                                                                                                                                                |
-| `firebase.storageBucket`        | _Not set_              | Firebase storageBucket, required to integrate against Firebase. Check [this page]({{< ref "firebase-views" >}}) for a guide on how to integrate Firebase into Blowfish                                                                                                                                             |
+| `firebase.storageBucket`            | _Not set_              | Firebase storageBucket, required to integrate against Firebase. Check [this page]({{< ref "firebase-views" >}}) for a guide on how to integrate Firebase into Blowfish.                                                                                                                                            |
-| `firebase.messagingSenderId`    | _Not set_              | Firebase messagingSenderId, required to integrate against Firebase. Check [this page]({{< ref "firebase-views" >}}) for a guide on how to integrate Firebase into Blowfish                                                                                                                                         |
+| `firebase.messagingSenderId`        | _Not set_              | Firebase messagingSenderId, required to integrate against Firebase. Check [this page]({{< ref "firebase-views" >}}) for a guide on how to integrate Firebase into Blowfish.                                                                                                                                        |
-| `firebase.appId`                | _Not set_              | Firebase appId, required to integrate against Firebase. Check [this page]({{< ref "firebase-views" >}}) for a guide on how to integrate Firebase into Blowfish                                                                                                                                                     |
+| `firebase.appId`                    | _Not set_              | Firebase appId, required to integrate against Firebase. Check [this page]({{< ref "firebase-views" >}}) for a guide on how to integrate Firebase into Blowfish.                                                                                                                                                    |
-| `firebase.measurementId`        | _Not set_              | Firebase measurementId, required to integrate against Firebase. Check [this page]({{< ref "firebase-views" >}}) for a guide on how to integrate Firebase into Blowfish                                                                                                                                             |
+| `firebase.measurementId`            | _Not set_              | Firebase measurementId, required to integrate against Firebase. Check [this page]({{< ref "firebase-views" >}}) for a guide on how to integrate Firebase into Blowfish.                                                                                                                                            |
 | `fathomAnalytics.site`              | _Not set_              | The site code generated by Fathom Analytics for the website. Refer to the [Analytics docs]({{< ref "partials#analytics" >}}) for more details.                                                                                                                                                                     |
 | `fathomAnalytics.domain`            | _Not set_              | If using a custom domain with Fathom Analytics, provide it here to serve `script.js` from the custom domain.                                                                                                                                                                                                       |
+| `buymeacoffee.identifier`           | _Not set_              | The identifier to the target buymeacoffee account.                                                                                                                                                                                                                                                                 |
+| `buymeacoffee.globalWidget`         | _Not set_              | Activate the global buymeacoffee widget.                                                                                                                                                                                                                                                                           |
+| `buymeacoffee.globalWidgetMessage`  | _Not set_              | Message what will be displayed the first time a new user lands on the site.                                                                                                                                                                                                                                        |
+| `buymeacoffee.globalWidgetColor`    | _Not set_              | Widget color in hex format.                                                                                                                                                                                                                                                                                        |
+| `buymeacoffee.globalWidgetPosition` | _Not set_              | Position of the widget, i.e. "Left" or "Right"                                                                                                                                                                                                                                                                     |
 | `verification.google`               | _Not set_              | The site verification string provided by Google to be included in the site metadata.                                                                                                                                                                                                                               |
 | `verification.bing`                 | _Not set_              | The site verification string provided by Bing to be included in the site metadata.                                                                                                                                                                                                                                 |
 | `verification.pinterest`            | _Not set_              | The site verification string provided by Pinterest to be included in the site metadata.                                                                                                                                                                                                                            |

i18n/bn.yaml

@@ -12,6 +12,12 @@ article:
   word_count:
     one: "{{ .Count }} টি শব্দ"
     other: "{{ .Count }} টি শব্দ"
+  views:
+    one: "{{ .Count }} বার দেখা হয়েছে"
+    other: "{{ .Count }} বার দেখা হয়েছে"
+  likes:
+    one: "{{ .Count }} বার পছন্দ করা হয়েছে"
+    other: "{{ .Count }} বার পছন্দ করা হয়েছে"
 
 author:
   byline_title: "লেখক"
@@ -53,3 +59,6 @@ sharing:
 
 shortcode:
   recent_articles: "সাম্প্রতিক"
+  
+recent:
+  show_more: "আরো দেখুন"

layouts/_default/baseof.html

@@ -1,30 +1,20 @@
 {{- partial "partials/functions/warnings.html" .Site -}}
 <!DOCTYPE html>
-<html
+<html lang="{{ with .Site.Params.isoCode | default (.Site.LanguageCode | default " en") }} {{- . -}} {{ end }}" dir="{{ if .Site.Params.rtl | default false -}}
-  lang="{{ with .Site.Params.isoCode | default (.Site.LanguageCode | default "en") }}
-    {{- . -}}
-  {{ end }}"
-  dir="{{ if .Site.Params.rtl | default false -}}
     rtl
   {{- else -}}
     ltr
-  {{- end }}"
+  {{- end }}" class="scroll-smooth" data-default-appearance="{{ .Site.Params.defaultAppearance | default " light" }}"
-  class="scroll-smooth"
+  data-auto-appearance="{{ .Site.Params.autoSwitchAppearance | default " true" }}">
-  data-default-appearance="{{ .Site.Params.defaultAppearance | default "light" }}"
+{{- partial "head.html" . -}}
-  data-auto-appearance="{{ .Site.Params.autoSwitchAppearance | default "true" }}"
+
->
+<body
-  {{- partial "head.html" . -}}
+  class="flex flex-col h-screen px-6 m-auto text-lg leading-7 max-w-7xl bg-neutral text-neutral-900 dark:bg-neutral-800 dark:text-neutral sm:px-14 md:px-24 lg:px-32">
-  <body
-    class="flex flex-col h-screen px-6 m-auto text-lg leading-7 max-w-7xl bg-neutral text-neutral-900 dark:bg-neutral-800 dark:text-neutral sm:px-14 md:px-24 lg:px-32"
-  >
   <div id="the-top" class="absolute flex self-center">
-      <a
+    <a class="px-3 py-1 text-sm -translate-y-8 rounded-b-lg bg-primary-200 focus:translate-y-0 dark:bg-neutral-600"
-        class="px-3 py-1 text-sm -translate-y-8 rounded-b-lg bg-primary-200 focus:translate-y-0 dark:bg-neutral-600"
+      href="#main-content"><span
-        href="#main-content"
+        class="font-bold text-primary-600 ltr:pr-2 rtl:pl-2 dark:text-primary-400">&darr;</span>{{ i18n
-        ><span class="font-bold text-primary-600 ltr:pr-2 rtl:pl-2 dark:text-primary-400"
+      "nav.skip_to_main" }}</a>
-          >&darr;</span
-        >{{ i18n "nav.skip_to_main" }}</a
-      >
   </div>
   {{ $header := print "partials/header/" .Site.Params.header.layout ".html" }}
   {{ if templates.Exists $header }}
@@ -36,15 +26,10 @@
     <main id="main-content" class="grow">
       {{ block "main" . }}{{ end }}
       {{ if and (.Site.Params.footer.showScrollToTop | default true) (gt .WordCount 200) }}
-          <div
+      <div class="pointer-events-none absolute top-[100vh] bottom-0 w-12 ltr:right-0 rtl:left-0">
-            class="pointer-events-none absolute top-[100vh] bottom-0 w-12 ltr:right-0 rtl:left-0"
+        <a href="#the-top"
-          >
-            <a
-              href="#the-top"
           class="pointer-events-auto sticky top-[calc(100vh-5.5rem)] flex h-12 w-12 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"
-              aria-label="{{ i18n "nav.scroll_to_top_title" }}"
+          aria-label="{{ i18n " nav.scroll_to_top_title" }}" title="{{ i18n " nav.scroll_to_top_title" }}">
-              title="{{ i18n "nav.scroll_to_top_title" }}"
-            >
           &uarr;
         </a>
       </div>
@@ -55,5 +40,10 @@
     {{- partial "search.html" . -}}
     {{ end }}
   </div>
-  </body>
+</body>
+{{ if .Site.Params.buymeacoffee.globalWidget | default false }}
+<script data-name="BMC-Widget" data-cfasync="false" src="https://cdnjs.buymeacoffee.com/1.0.0/widget.prod.min.js"
+  data-id="{{ .Site.Params.buymeacoffee.identifier }}" data-description="Support me on Buy me a coffee!" data-message="{{ .Site.Params.buymeacoffee.globalWidgetMessage | default "" }}"
+  data-color="{{ .Site.Params.buymeacoffee.globalWidgetColor | default "#FFDD00" }}" data-position="{{ .Site.Params.buymeacoffee.globalWidgetPosition | default "Left" }}" data-x_margin="18" data-y_margin="18"></script>
+{{ end }}
 </html>

layouts/_default/list.html

@@ -152,7 +152,7 @@
   </section>
   {{ if gt .Pages 0 }}
 
-  {{ if .Site.Params.list.cardView | default false }}
+  {{ if .Params.cardView | default (.Site.Params.list.cardView | default false) }}
 
   {{ $cardViewScreenWidth := .Site.Params.list.cardViewScreenWidth}}
 

layouts/partials/hero/background.html

@@ -1,6 +1,7 @@
 {{- $images := .Resources.ByType "image" -}}
 {{- $featured := $images.GetMatch "*feature*" -}}
 {{- if not $featured }}{{ $featured = $images.GetMatch "{*cover*,*thumbnail*}" }}{{ end -}}
+{{- if not $featured }}{{ with .Site.Params.defaultBackgroundImage }}{{ $featured = resources.Get . }}{{ end }}{{ end -}}
 {{- with $featured -}}
 {{ with .Resize "1200x" }}
 <div id="hero" class="h-[150px] md:h-[200px]"></div>

layouts/partials/home/background.html

@@ -4,9 +4,10 @@
         <div class="mx-auto max-w-7xl p-0">
             <div class="relative sm:overflow-hidden">
                 <div class="fixed inset-x-0 top-0" style="z-index:-10">
-                    {{ with .Site.Params.homepage.homepageImage }}
+                    {{ $homepageImage := "" }}
-                    {{ $homepageImage := resources.Get . }}
+                    {{ with .Site.Params.defaultBackgroundImage }}{{ $homepageImage = resources.Get . }}{{ end }}
-                    {{ if $homepageImage }}
+                    {{ with .Site.Params.homepage.homepageImage }}{{ $homepageImage = resources.Get . }}{{ end }}
+                    {{ if not (eq $homepageImage "") }}
                     <img class="w-full h-[1000px] object-cover m-0 nozoom" src="{{ $homepageImage.RelPermalink }}">
                     <div
                         class="absolute inset-0 h-[1000px] bg-gradient-to-t from-neutral dark:from-neutral-800 to-transparent mix-blend-normal">
@@ -15,7 +16,6 @@
                         class="opacity-70 absolute inset-0 h-[1000px] bg-gradient-to-t from-neutral dark:from-neutral-800 to-neutral dark:to-neutral-800 mix-blend-normal">
                     </div>
                     {{ end }}
-                    {{ end }}
                 </div>
                 <div class="relative px-4 py-16 sm:px-6 sm:py-24 lg:py-32 lg:px-8 flex flex-col items-center justify-center text-center">
                     {{ with .Site.Author.image }}

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "hugo-blowfish-theme",
-  "version": "2.9.1",
+  "version": "2.11.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "hugo-blowfish-theme",
-      "version": "2.9.1",
+      "version": "2.11.0",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hugo-blowfish-theme",
-  "version": "2.10.0",
+  "version": "2.12.1",
   "description": "Blowfish theme for Hugo",
   "scripts": {
     "preinstall": "rimraf assets/vendor",