Merge pull request #1041 from nunocoracao/dev

🔖 v2.44.0

assets/css/compiled/main.css

@@ -1,6 +1,6 @@
 /*! Blowfish | MIT License | https://github.com/nunocoracao/blowfish */
 
-/*! tailwindcss v3.3.4 | MIT License | https://tailwindcss.com */
+/*! tailwindcss v3.3.5 | MIT License | https://tailwindcss.com */
 
 /*
 1. Prevent padding and border from affecting element width. (https://github.com/mozdevs/cssremedy/issues/4)

assets/icons/x-twitter.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="currentColor" d="M389.2 48h70.6L305.6 224.2 487 464H345L233.7 318.6 106.5 464H35.8L200.7 275.5 26.8 48H172.4L272.9 180.9 389.2 48zM364.4 421.8h39.1L151.1 88h-42L364.4 421.8z"/></svg>

config.toml

@@ -2,4 +2,4 @@
   [module.hugoVersion]
     extended = true
     min = "0.87.0"
-    max = "0.119.0"
+    max = "0.120.3"

config/_default/languages.en.toml

@@ -58,6 +58,7 @@ title = "Blowfish"
 #     { tumblr = "https://username.tumblr.com" },
 #     { twitch = "https://twitch.tv/username" },
 #     { twitter = "https://twitter.com/username" },
+#     { x-twitter = "https://twitter.com/username" },
 #     { whatsapp = "https://wa.me/phone-number" },
 #     { youtube = "https://youtube.com/username" },
 #     { ko-fi = "https://ko-fi.com/username" },

data/sharing.json

@@ -25,7 +25,7 @@
     "url": "https://reddit.com/submit/?url=%s&resubmit=true&title=%s"
   },
   "twitter": {
-    "icon": "twitter",
+    "icon": "x-twitter",
     "title": "sharing.twitter",
     "url": "https://twitter.com/intent/tweet/?url=%s&text=%s"
   },

exampleSite/config/_default/languages.en.toml

@@ -19,7 +19,7 @@ title = "Blowfish"
   headline = "A powerful, lightweight theme for Hugo built with Tailwind CSS."
   bio = "A powerful, lightweight theme for Hugo built with Tailwind CSS."
   links = [
-    { twitter = "https://twitter.com/burufugu" },
+    { x-twitter = "https://twitter.com/burufugu" },
     { mastodon = "https://masto.ai/@blowfish" },
     { github = "https://github.com/nunocoracao/blowfish" },
   ]

exampleSite/config/_default/menus.en.toml

@@ -58,7 +58,7 @@
 
 [[main]]
   identifier = "twitter"
-  pre = "twitter"
+  pre = "x-twitter"
   url = "https://twitter.com/burufugu"
   weight = 200
 

exampleSite/content/samples/icons/index.md

@@ -106,5 +106,6 @@ The full list of built-in icons and their corresponding names can referenced bel
 | twitter              | {{< icon twitter >}}              |
 | wand-magic-sparkles  | {{< icon wand-magic-sparkles >}}  |
 | whatsapp             | {{< icon whatsapp >}}             |
+| x-twitter            | {{< icon x-twitter >}}            |
 | xmark                | {{< icon xmark >}}                |
 | youtube              | {{< icon youtube >}}              |

exampleSite/content/users/adilhyz.github.io/index.md

@@ -2,7 +2,7 @@
                 title: "adilhyz.github.io"
                 tags: [Personal site]
                 externalUrl: "https://adilhyz.github.io"
-                date: 9938-08-08
+                date: 9939-08-08
                 showDate: false
                 showAuthor: false
                 showReadingTime: false

exampleSite/content/users/bbagwang.com/index.md

@@ -2,7 +2,7 @@
                 title: "bbagwang.com"
                 tags: [Personal site]
                 externalUrl: "https://bbagwang.com"
-                date: 9944-08-08
+                date: 9945-08-08
                 showDate: false
                 showAuthor: false
                 showReadingTime: false

exampleSite/content/users/deepumohan.com-tech/index.md

@@ -2,7 +2,7 @@
                 title: "deepumohan.com/tech"
                 tags: [Technology Blog]
                 externalUrl: "https://deepumohan.com/tech/"
-                date: 9935-08-08
+                date: 9936-08-08
                 showDate: false
                 showAuthor: false
                 showReadingTime: false

exampleSite/content/users/gma.name/index.md

@@ -2,7 +2,7 @@
                 title: "gma.name"
                 tags: [Personal site]
                 externalUrl: "https://gma.name"
-                date: 9941-08-08
+                date: 9942-08-08
                 showDate: false
                 showAuthor: false
                 showReadingTime: false

exampleSite/content/users/jamiemoxon.tech/index.md

@@ -2,7 +2,7 @@
                 title: "jamiemoxon.tech"
                 tags: [Personal site]
                 externalUrl: "https://jamiemoxon.tech"
-                date: 9943-08-08
+                date: 9944-08-08
                 showDate: false
                 showAuthor: false
                 showReadingTime: false

exampleSite/content/users/joush007.github.io/index.md

@@ -2,7 +2,7 @@
                 title: "joush007.github.io"
                 tags: [Personal Site]
                 externalUrl: "https://joush007.github.io"
-                date: 9933-08-08
+                date: 9934-08-08
                 showDate: false
                 showAuthor: false
                 showReadingTime: false

exampleSite/content/users/jundimubarok.com/index.md

@@ -2,7 +2,7 @@
                 title: "jundimubarok.com"
                 tags: [Personal site]
                 externalUrl: "https://jundimubarok.com/"
-                date: 9946-08-08
+                date: 9947-08-08
                 showDate: false
                 showAuthor: false
                 showReadingTime: false

exampleSite/content/users/kylemalloy.com/index.md

@@ -2,7 +2,7 @@
                 title: "kylemalloy.com"
                 tags: [Personal site]
                 externalUrl: "https://kylemalloy.com"
-                date: 9934-08-08
+                date: 9935-08-08
                 showDate: false
                 showAuthor: false
                 showReadingTime: false

exampleSite/content/users/mayer.life/index.md

@@ -2,7 +2,7 @@
                 title: "mayer.life"
                 tags: [Personal site]
                 externalUrl: "https://mayer.life"
-                date: 9940-08-08
+                date: 9941-08-08
                 showDate: false
                 showAuthor: false
                 showReadingTime: false

exampleSite/content/users/ohdmire.github.io/index.md

@@ -2,7 +2,7 @@
                 title: "ohdmire.github.io"
                 tags: [Personal site]
                 externalUrl: "https://ohdmire.github.io"
-                date: 9937-08-08
+                date: 9938-08-08
                 showDate: false
                 showAuthor: false
                 showReadingTime: false

exampleSite/content/users/rejowski.xyz/index.md

@@ -1,8 +1,8 @@
 ---
-                title: "jahsehj.github.io"
-                tags: [Personal site mainly in Chinese]
-                externalUrl: "https://jahsehj.github.io/"
-                date: 9947-08-08
+                title: "rejowski.xyz"
+                tags: [Personal Site]
+                externalUrl: "https://rejowski.xyz/"
+                date: 9933-08-08
                 showDate: false
                 showAuthor: false
                 showReadingTime: false

exampleSite/content/users/ricklan.photography/index.md

@@ -2,7 +2,7 @@
                 title: "ricklan.photography"
                 tags: [Personal site]
                 externalUrl: "https://ricklan.photography"
-                date: 9936-08-08
+                date: 9937-08-08
                 showDate: false
                 showAuthor: false
                 showReadingTime: false

exampleSite/content/users/scottmckendry.tech/index.md

@@ -2,7 +2,7 @@
                 title: "scottmckendry.tech"
                 tags: [Personal site]
                 externalUrl: "https://scottmckendry.tech"
-                date: 9939-08-08
+                date: 9940-08-08
                 showDate: false
                 showAuthor: false
                 showReadingTime: false

exampleSite/content/users/theindiecoder.cloud/index.md

@@ -2,7 +2,7 @@
                 title: "theindiecoder.cloud"
                 tags: [Personal site]
                 externalUrl: "https://theindiecoder.cloud"
-                date: 9942-08-08
+                date: 9943-08-08
                 showDate: false
                 showAuthor: false
                 showReadingTime: false

exampleSite/content/users/users.json

@@ -364,13 +364,6 @@
       "Personal site"
     ]
   },
-  {
-    "title": "jahsehj.github.io",
-    "url": "https://jahsehj.github.io/",
-    "tags": [
-      "Personal site mainly in Chinese"
-    ]
-  },
   {
     "title": "jundimubarok.com",
     "url": "https://jundimubarok.com/",
@@ -468,5 +461,12 @@
     "tags": [
       "Personal Site"
     ]
+  },
+  {
+    "title": "rejowski.xyz",
+    "url": "https://rejowski.xyz/",
+    "tags": [
+      "Personal Site"
+    ]
   }
 ]

exampleSite/content/users/vkmki001.github.io/index.md

@@ -2,7 +2,7 @@
                 title: "vkmki001.github.io"
                 tags: [Personal site]
                 externalUrl: "https://vkmki001.github.io/"
-                date: 9945-08-08
+                date: 9946-08-08
                 showDate: false
                 showAuthor: false
                 showReadingTime: false

layouts/partials/article-meta/basic.html

@@ -50,7 +50,7 @@
 <div class="flex flex-row flex-wrap items-center">
   {{/* Output partials */}}
   {{ with ($meta.Get "partials") }}
-  {{ delimit . "<span class=\"px-2 text-primary-500\">&middot;</span>" }}
+  {{ delimit . "<span class=\"px-2 text-primary-500\">&middot;</span>" | safeHTML }}
   {{ end }}
 
   {{/* Output draft label */}}

layouts/partials/article-meta/list.html

@@ -29,7 +29,7 @@
 <div class="flex flex-row flex-wrap items-center">
   {{/* Output partials */}}
   {{ with ($meta.Get "partials") }}
-  {{ delimit . "<span class=\"px-2 text-primary-500\">&middot;</span>" }}
+  {{ delimit . "<span class=\"px-2 text-primary-500\">&middot;</span>" | safeHTML}}
   {{ end }}
 </div>
 

layouts/partials/article-meta/taxonomy.html

@@ -29,7 +29,7 @@
 <div class="flex flex-row flex-wrap items-center">
   {{/* Output partials */}}
   {{ with ($meta.Get "partials") }}
-  {{ delimit . "<span class=\"px-2 text-primary-500\">&middot;</span>" }}
+  {{ delimit . "<span class=\"px-2 text-primary-500\">&middot;</span>" | safeHTML}}
   {{ end }}
 </div>
 

layouts/partials/article-meta/term.html

@@ -29,7 +29,7 @@
 <div class="flex flex-row flex-wrap items-center">
   {{/* Output partials */}}
   {{ with ($meta.Get "partials") }}
-  {{ delimit . "<span class=\"px-2 text-primary-500\">&middot;</span>" }}
+  {{ delimit . "<span class=\"px-2 text-primary-500\">&middot;</span>" | safeHTML}}
   {{ end }}
 </div>
 

layouts/shortcodes/carousel.html

@@ -3,7 +3,7 @@
 {{ $images := .Page.Resources.Match (.Get "images") }}
 {{ $interval := default "2000" (.Get "interval") }}
 
-<div id="{{ $id }}" class="relative" data-te-carousel-init data-te-carousel-slide>
+<div id="{{ $id }}" class="relative" data-te-carousel-init data-te-ride="carousel">
     <div class="absolute right-0 bottom-0 left-0 z-[2] mx-[15%] mb-10 flex list-none justify-center p-0"
         data-te-carousel-indicators>
 

layouts/shortcodes/github.html

@@ -1,26 +1,32 @@
-{{- $githubData := getJSON (print "https://api.github.com/repos/" (.Get "repo")) -}}
+{{ $id := delimit (slice "github" .Ordinal now.UnixNano) "-" }}
+{{- $githubURL := print "https://api.github.com/repos/" (.Get "repo") -}}
+{{- $githubData := getJSON ($githubURL) -}}
 {{- $githubColors := .Site.Data.githubColors -}}
 {{- with $githubData -}}
 
-<a target="_blank" href="{{ .html_url }}" class="cursor-pointer">
-  <div class="w-full md:w-auto pt-3 p-5 border border-neutral-200 dark:border-neutral-700 border rounded-md backdrop-blur shadow-2xl">
+<a id="{{ $id }}" target="_blank" href="{{ .html_url }}" class="cursor-pointer">
+  <div
+    class="w-full md:w-auto pt-3 p-5 border border-neutral-200 dark:border-neutral-700 border rounded-md backdrop-blur shadow-2xl">
 
     <div class="flex items-center">
       <span class="text-2xl text-neutral-800 dark:text-neutral" style="margin-right:10px;">
         {{ partial "icon.html" "github" }}
       </span>
-      <div class="m-0 font-bold text-xl text-neutral-800 decoration-primary-500 hover:underline hover:underline-offset-2 dark:text-neutral">
+      <div
+        id="{{ $id }}-full_name"
+        class="m-0 font-bold text-xl text-neutral-800 decoration-primary-500 hover:underline hover:underline-offset-2 dark:text-neutral">
         {{ .full_name | markdownify | emojify }}
       </div>
     </div>
 
-    <p class="m-0 mt-2 text-md text-neutral-800 dark:text-neutral">
+    <p id="{{ $id }}-description" class="m-0 mt-2 text-md text-neutral-800 dark:text-neutral">
       {{ .description | markdownify | emojify }}
     </p>
 
     <div class="m-0 mt-2 flex items-center">
 
-      <span class="mr-1 inline-block h-3 w-3 rounded-full" style="background-color: {{ if .language }} {{- index $githubColors .language -}} {{ else }} #0077b6 {{ end }}"></span>
+      <span class="mr-1 inline-block h-3 w-3 rounded-full"
+        style="background-color: {{ if .language }} {{- index $githubColors .language -}} {{ else }} #0077b6 {{ end }}"></span>
       <div class="m-0 mr-5 text-md text-neutral-800 dark:text-neutral">
         {{ if .language }} {{ .language }} {{ else }} null {{ end }}
       </div>
@@ -28,19 +34,34 @@
       <span class="text-md mr-1 text-neutral-800 dark:text-neutral">
         {{ partial "icon.html" "star" }}
       </span>
-      <div class="m-0 mr-5 text-md text-neutral-800 dark:text-neutral">
+      <div id="{{ $id }}-stargazers" class="m-0 mr-5 text-md text-neutral-800 dark:text-neutral">
         {{ .stargazers_count }}
       </div>
 
       <span class="text-md mr-1 text-neutral-800 dark:text-neutral">
         {{ partial "icon.html" "fork" }}
       </span>
-      <div class="m-0 mr-5 text-md text-neutral-800 dark:text-neutral">
+      <div id="{{ $id }}-forks" class="m-0 mr-5 text-md text-neutral-800 dark:text-neutral">
         {{ .forks }}
       </div>
 
     </div>
 
   </div>
+  <script>
+    fetch({{ $githubURL }}, {
+      headers: new Headers({
+        'User-agent': 'Mozilla/4.0 Custom User Agent'
+      })
+    })
+      .then(response => response.json())
+      .then(data => {
+        document.getElementById('{{ $id }}-full_name').innerHTML = data.full_name;
+        document.getElementById('{{ $id }}-description').innerHTML = data.description;
+        document.getElementById('{{ $id }}-stargazers').innerHTML = data.stargazers_count;
+        document.getElementById('{{ $id }}-forks').innerHTML = data.forks;
+      })
+      .catch(error => console.error(error))
+  </script>
 </a>
 {{- end -}}

layouts/shortcodes/gitlab.html

@@ -1,4 +1,7 @@
-{{- $gitLabData := getJSON (print (default "https://gitlab.com/" (.Get "baseURL")) "api/v4/projects/" (.Get "projectID")) -}}
+{{ $id := delimit (slice "gitlab" .Ordinal now.UnixNano) "-" }}
+{{- $gitlabURL := print (default "https://gitlab.com/" (.Get "baseURL")) "api/v4/projects/" (.Get "projectID") -}}
+
+{{- $gitLabData := getJSON ($gitlabURL) -}}
 {{- with $gitLabData -}}
 
 <a target="_blank" href="{{ .html_url }}" class="cursor-pointer">
@@ -8,12 +11,12 @@
       <span class="text-2xl text-neutral-800 dark:text-neutral" style="margin-right:10px;">
         {{ partial "icon.html" "gitlab" }}
       </span>
-      <div class="m-0 font-bold text-xl text-neutral-800 decoration-primary-500 hover:underline hover:underline-offset-2 dark:text-neutral">
+      <div id="{{ $id }}-name_with_namespace" class="m-0 font-bold text-xl text-neutral-800 decoration-primary-500 hover:underline hover:underline-offset-2 dark:text-neutral">
         {{ .name_with_namespace | markdownify | emojify }}
       </div>
     </div>
 
-    <p class="m-0 mt-2 text-md text-neutral-800 dark:text-neutral">
+    <p id="{{ $id }}-description" class="m-0 mt-2 text-md text-neutral-800 dark:text-neutral">
       {{ .description | markdownify | emojify }}
     </p>
 
@@ -21,19 +24,36 @@
       <span class="text-md mr-1 text-neutral-800 dark:text-neutral">
         {{ partial "icon.html" "star" }}
       </span>
-      <div class="m-0 mr-5 text-md text-neutral-800 dark:text-neutral">
+      <div id="{{ $id }}-star_count" class="m-0 mr-5 text-md text-neutral-800 dark:text-neutral">
         {{ .star_count }}
       </div>
 
       <span class="text-md mr-1 text-neutral-800 dark:text-neutral">
         {{ partial "icon.html" "fork" }}
       </span>
-      <div class="m-0 mr-5 text-md text-neutral-800 dark:text-neutral">
+      <div id="{{ $id }}-forks_count" class="m-0 mr-5 text-md text-neutral-800 dark:text-neutral">
         {{ .forks_count }}
       </div>
 
     </div>
 
   </div>
+  <script>
+    console.log({{ $gitlabURL }})
+    fetch({{ $gitlabURL }}, {
+      headers: new Headers({
+        'User-agent': 'Mozilla/4.0 Custom User Agent'
+      })
+    })
+      .then(response => response.json())
+      .then(data => {
+        console.log(data)
+        document.getElementById('{{ $id }}-name_with_namespace').innerHTML = data.name_with_namespace;
+        document.getElementById('{{ $id }}-description').innerHTML = data.description;
+        document.getElementById('{{ $id }}-star_count').innerHTML = data.star_count;
+        document.getElementById('{{ $id }}-forks_count').innerHTML = data.forks_count;
+      })
+      .catch(error => console.error(error))
+  </script>
 </a>
 {{- end -}}

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "hugo-blowfish-theme",
-  "version": "2.43.0",
+  "version": "2.44.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "hugo-blowfish-theme",
-      "version": "2.43.0",
+      "version": "2.44.0",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
@@ -18,7 +18,7 @@
       "devDependencies": {
         "@tailwindcss/typography": "^0.5.10",
         "chart.js": "^4.4.0",
-        "fuse.js": "^6.6.2",
+        "fuse.js": "^7.0.0",
         "jquery": "^3.7.1",
         "katex": "^0.16.9",
         "packery": "^2.1.2",
@@ -27,7 +27,7 @@
         "prettier-plugin-tailwindcss": "^0.5.6",
         "puppeteer": "^21.4.1",
         "rimraf": "^5.0.5",
-        "tailwindcss": "^3.3.4",
+        "tailwindcss": "^3.3.5",
         "tw-elements": "1.0.0",
         "typeit": "^8.7.1",
         "vendor-copy": "^3.0.1"
@@ -1123,9 +1123,9 @@
       "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
     },
     "node_modules/fuse.js": {
-      "version": "6.6.2",
-      "resolved": "https://registry.npmjs.org/fuse.js/-/fuse.js-6.6.2.tgz",
-      "integrity": "sha512-cJaJkxCCxC8qIIcPBF9yGxY0W/tVZS3uEISDxhYIdtk8OL93pe+6Zj7LjCqVV4dzbqcriOZ+kQ/NE4RXZHsIGA==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/fuse.js/-/fuse.js-7.0.0.tgz",
+      "integrity": "sha512-14F4hBIxqKvD4Zz/XjDc3y94mNZN6pRv3U13Udo0lNLCWRBUsrMv2xwcF/y/Z5sV6+FQW+/ow68cHpm4sunt8Q==",
       "dev": true,
       "engines": {
         "node": ">=10"
@@ -2651,9 +2651,9 @@
       }
     },
     "node_modules/tailwindcss": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.4.tgz",
-      "integrity": "sha512-JXZNOkggUAc9T5E7nCrimoXHcSf9h3NWFe5sh36CGD/3M5TRLuQeFnQoDsit2uVTqgoOZHLx5rTykLUu16vsMQ==",
+      "version": "3.3.5",
+      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.5.tgz",
+      "integrity": "sha512-5SEZU4J7pxZgSkv7FP1zY8i2TIAOooNZ1e/OGtxIEv6GltpoiXUqWvLy89+a10qYTB1N5Ifkuw9lqQkN9sscvA==",
       "dependencies": {
         "@alloc/quick-lru": "^5.2.0",
         "arg": "^5.0.2",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hugo-blowfish-theme",
-  "version": "2.43.1",
+  "version": "2.44.0",
   "description": "Blowfish theme for Hugo",
   "scripts": {
     "fullinstall": "npm run preinstall && npm install && npm run postinstall",
@@ -36,7 +36,7 @@
   "devDependencies": {
     "@tailwindcss/typography": "^0.5.10",
     "chart.js": "^4.4.0",
-    "fuse.js": "^6.6.2",
+    "fuse.js": "^7.0.0",
     "jquery": "^3.7.1",
     "katex": "^0.16.9",
     "packery": "^2.1.2",
@@ -45,7 +45,7 @@
     "prettier-plugin-tailwindcss": "^0.5.6",
     "puppeteer": "^21.4.1",
     "rimraf": "^5.0.5",
-    "tailwindcss": "^3.3.4",
+    "tailwindcss": "^3.3.5",
     "tw-elements": "1.0.0",
     "typeit": "^8.7.1",
     "vendor-copy": "^3.0.1"