Merge branch 'dev' into dev

2026-01-30 16:31:52 +01:00 · 2024-08-10 11:02:44 +01:00
parent 47b99754e1 8a8ba86ab2
commit addf561a06
67 changed files with 1966 additions and 174 deletions
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -30,10 +30,10 @@
    var oid = "views_{{ $path }}"
    var oid_likes = "likes_{{ $path }}"
  </script>
-  {{ end }}
  {{ $jsPage := resources.Get "js/page.js" }}
  {{ $jsPage = $jsPage | resources.Minify | resources.Fingerprint "sha512" }}
  <script type="text/javascript" src="{{ $jsPage.RelPermalink }}" integrity="{{ $jsPage.Data.Integrity }}"></script>
+  {{ end }}
  </header>
  <section class="{{ if $toc -}}
      mt-12
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -46,7 +46,7 @@
        {{- if $authorData -}}
          {{ range $taxonomyname, $taxonomy := $taxonomies }}
            {{ if (eq $taxonomyname $author) }}
-              {{ $taxonomyLink = delimit (slice $baseURL "/authors/" $author) "" }}
+              {{ $taxonomyLink = delimit (slice $baseURL "authors/" $author "/") "" }}
            {{ end }}
          {{ end }}
          {{ partial "author-extra.html" (dict "context" . "data" $authorData "link" $taxonomyLink) }}
@@ -106,7 +106,7 @@
            {{- if $authorData -}}
              {{ range $taxonomyname, $taxonomy := $taxonomies }}
                {{ if (eq $taxonomyname $author) }}
-                  {{ $taxonomyLink = delimit (slice $baseURL "/authors/" $author) "" }}
+                  {{ $taxonomyLink = delimit (slice $baseURL "authors/" $author "/") "" }}
                {{ end }}
              {{ end }}
              {{ partial "author-extra.html" (dict "context" . "data" $authorData "link" $taxonomyLink) }}
@@ -135,10 +135,10 @@
        var oid = "views_{{ $path }}"
        var oid_likes = "likes_{{ $path }}"
      </script>
-      {{ end }}
      {{ $jsPage := resources.Get "js/page.js" }}
      {{ $jsPage = $jsPage | resources.Minify | resources.Fingerprint "sha512" }}
      <script type="text/javascript" src="{{ $jsPage.RelPermalink }}" integrity="{{ $jsPage.Data.Integrity }}"></script>
+      {{ end }}
  
    </section>
  <footer class="pt-8 max-w-prose print:hidden">
--- a/layouts/_default/taxonomy.html
+++ b/layouts/_default/taxonomy.html
@@ -28,7 +28,6 @@
        {{ .Content }}
      </div>
    </section>
-  {{ end }}
  <script>
    var oid = "views_taxonomy_{{ .Data.Plural }}"
    var oid_likes = "likes_taxonomy_{{ .Data.Plural }}"
@@ -36,7 +35,7 @@
  {{ $jsPage := resources.Get "js/page.js" }}
  {{ $jsPage = $jsPage | resources.Minify | resources.Fingerprint "sha512" }}
  <script type="text/javascript" src="{{ $jsPage.RelPermalink }}" integrity="{{ $jsPage.Data.Integrity }}"></script>
-  
+  {{ end }}

  {{ if .Site.Params.taxonomy.cardView }}

--- a/layouts/_default/term.html
+++ b/layouts/_default/term.html
@@ -1,6 +1,6 @@
 {{ define "main" }}

-{{ .Scratch.Set "scope" "list" }}
+{{ .Scratch.Set "scope" "term" }}
 {{ if .Site.Params.term.showHero | default false }}
 {{ $heroStyle := print "partials/hero/" .Site.Params.term.heroStyle ".html" }}
 {{ if templates.Exists $heroStyle }}
@@ -26,7 +26,6 @@
    <div class="min-w-0 min-h-0 max-w-prose">
      {{ .Content }}
    </div>
-    {{ end }}
    <script>
      var oid = "views_term_{{ .Data.Term }}"
      var oid_likes = "likes_term_{{ .Data.Term }}"
@@ -34,14 +33,15 @@
    {{ $jsPage := resources.Get "js/page.js" }}
    {{ $jsPage = $jsPage | resources.Minify | resources.Fingerprint "sha512" }}
    <script type="text/javascript" src="{{ $jsPage.RelPermalink }}" integrity="{{ $jsPage.Data.Integrity }}"></script>
+    {{ end }}
  </section>


  {{ if gt .Pages 0 }}

-  {{ $cardView := .Params.cardView | default (.Site.Params.list.cardView | default false) }}
-  {{ $cardViewScreenWidth := .Site.Params.list.cardViewScreenWidth | default false }}
-  {{ $groupByYear := .Params.groupByYear | default ($.Site.Params.list.groupByYear | default false) }}
+  {{ $cardView := .Params.cardView | default (.Site.Params.term.cardView | default false) }}
+  {{ $cardViewScreenWidth := .Site.Params.term.cardViewScreenWidth | default false }}
+  {{ $groupByYear := .Params.groupByYear | default ($.Site.Params.term.groupByYear | default false) }}

  {{ if not $cardView }}

@@ -121,7 +121,7 @@
  {{ else }}
  <section class="mt-10 prose dark:prose-invert">
    <p class="py-8 border-t">
-      <em>{{ i18n "list.no_articles" | emojify }}</em>
+      <em>{{ i18n "term.no_articles" | emojify }}</em>
    </p>
  </section>
  {{ end }}
--- a/layouts/partials/analytics/main.html
+++ b/layouts/partials/analytics/main.html
@@ -6,4 +6,7 @@
 {{ end }}
 {{ with site.Params.umamiAnalytics.websiteid }}
 {{ partial "analytics/umami.html" }}
+{{ end }}
+{{ with site.Params.selineAnalytics.token }}
+{{ partial "analytics/seline.html" }}
 {{ end }}
--- a/layouts/partials/analytics/seline.html
+++ b/layouts/partials/analytics/seline.html
@@ -0,0 +1,18 @@
+<script async src="https://cdn.seline.so/seline.js" data-token="{{ site.Params.selineAnalytics.token }}" data-id="seline-script"></script>
+
+{{ if .Site.Params.selineAnalytics.enableTrackEvent | default true }}
+<script type="text/javascript">
+    document.querySelector('script[data-id="seline-script"]')
+        .addEventListener('load', function () {
+            const type = document.head.querySelector('meta[property = "og:type"]').getAttribute('content');
+            let title = document.head.querySelector('meta[property = "og:title"]').getAttribute('content');
+            let url = document.head.querySelector('meta[property = "og:url"]').getAttribute('content');
+
+            seline.track("user:" + type + ':' + title, {
+                type: type,
+                title: title,
+                url: url
+            });
+        });
+</script>
+{{ end }}
--- a/layouts/partials/analytics/umami.html
+++ b/layouts/partials/analytics/umami.html
@@ -10,6 +10,7 @@
 </script>
 {{ end }}

+{{ if .Site.Params.umamiAnalytics.enableTrackEvent | default true }}
 <script type="text/javascript">
    document.querySelector('script[data-id="umami-script"]')
        .addEventListener('load', function () {
@@ -18,4 +19,5 @@
            let url = document.head.querySelector('meta[property = "og:url"]').getAttribute('content');
            umami.track(type + ':' + title, {'url': url});
    });
-</script>
+</script>
+{{ end }}
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -74,7 +74,8 @@
    }}"></script>
  {{ end }}
  {{ if not .Site.Params.disableImageZoom | default true }}
-  <script src="{{ "js/zoom.min.js" | relURL }}"></script>
+  {{ $zoomJS := resources.Get "lib/zoom/zoom.min.js" | resources.Fingerprint "sha512" }}
+  <script src="{{ $zoomJS.RelPermalink }}" integrity="{{ $zoomJS.Data.Integrity }}"></script>
  {{ end }}
  {{/* Icons */}}
  {{ if templates.Exists "partials/favicons.html" }}
--- a/layouts/partials/header/basic.html
+++ b/layouts/partials/header/basic.html
@@ -7,8 +7,14 @@
        <a href="{{ "" | relLangURL }}" class="flex">
            <span class="sr-only">{{ .Site.Title | markdownify }}</span>

+            {{ if eq $logo.MediaType.SubType "svg" }}
+            <span class="logo object-scale-down object-left nozoom">
+                {{ $logo.Content | safeHTML }}
+            </span>
+            {{ else }}
            <img src="{{ $logo.RelPermalink }}" width="{{ div $logo.Width 2 }}" height="{{ div $logo.Height 2 }}"
                class="logo max-h-[5rem] max-w-[5rem] object-scale-down object-left nozoom" alt="{{ .Site.Title }}" />
+            {{ end }}

        </a>
    </div>
--- a/layouts/partials/hero/background.html
+++ b/layouts/partials/hero/background.html
@@ -41,7 +41,7 @@
    style="background-image:url({{ .RelPermalink }});">
    {{ end }}
 {{ else }}
-    {{ with .Resize "1200x" }}
+    {{ with .Resize (print ($.Site.Params.backgroundImageWidth | default "1200") "x") }}
    <div class="fixed inset-x-0 top-0 h-[800px] single_hero_background nozoom"
    style="background-image:url({{ .RelPermalink }});">
    {{ end }}
--- a/layouts/partials/hero/basic.html
+++ b/layouts/partials/hero/basic.html
@@ -26,7 +26,7 @@
            <div class="w-full h-36 md:h-56 lg:h-72 single_hero_basic nozoom" style="background-image:url({{ .RelPermalink }});"></div>
        {{ end }}
    {{ else }}
-        {{ with .Resize "1200x" }}
+        {{ with .Resize (print ($.Site.Params.backgroundImageWidth | default "1200") "x") }}
            <div class="w-full h-36 md:h-56 lg:h-72 single_hero_basic nozoom" style="background-image:url({{ .RelPermalink }});"></div>
        {{ end }}
    {{ end }}
--- a/layouts/partials/hero/big.html
+++ b/layouts/partials/hero/big.html
@@ -48,7 +48,7 @@
        </figure>
        {{ end }}
    {{ else }}
-        {{ with .Resize "1200x" }}
+        {{ with .Resize (print ($.Site.Params.backgroundImageWidth | default "1200") "x") }}
        <figure>
            <img class="w-full rounded-lg single_hero_round nozoom" alt="{{ $alt }}" width="{{ .Width }}" height="{{ .Height }}" src="{{ .RelPermalink }}">
            {{ if $caption }}
--- a/layouts/partials/hero/thumbAndBackground.html
+++ b/layouts/partials/hero/thumbAndBackground.html
@@ -25,7 +25,7 @@
 <div class="w-full rounded-md h-36 md:h-56 lg:h-72 single_hero_basic nozoom" style="background-image:url({{ .RelPermalink }});"></div>
 {{ end }}
 {{ else }}
-{{ with .Resize "1200x" }}
+{{ with .Resize (print ($.Site.Params.backgroundImageWidth | default "1200") "x") }}
 <div class="w-full rounded-md h-36 md:h-56 lg:h-72 single_hero_basic nozoom" style="background-image:url({{ .RelPermalink }});"></div>
 {{ end }}
 {{ end }}
@@ -44,7 +44,7 @@
    </div>
 </div>{{ end }}
 {{ else }}
-{{ with .Resize "1200x" }}
+{{ with .Resize (print ($.Site.Params.backgroundImageWidth | default "1200") "x") }}
 <div class="fixed inset-x-0 top-0 h-[800px] single_hero_background nozoom"
    style="background-image:url({{ .RelPermalink }});">
    <div class="absolute inset-0 bg-gradient-to-t from-neutral dark:from-neutral-800 to-transparent mix-blend-normal">
--- a/layouts/partials/home/background.html
+++ b/layouts/partials/home/background.html
@@ -40,7 +40,7 @@
                        {{ end }}
                        {{ if $authorImage }}
                            {{ if not $disableImageOptimization }}
-                                {{ $authorImage = $authorImage.Fill "288x288" }}
+                                {{ $authorImage = $authorImage.Fill (print "288x288 q" ( $.Site.Author.imagequality | default "96" )) }}
                            {{ end }}
                            <img class="mb-2 rounded-full h-36 w-36" width="144" height="144"
                                alt="{{ $.Site.Author.name | default " Author" }}" src="{{ $authorImage.RelPermalink }}" />
--- a/layouts/partials/home/hero.html
+++ b/layouts/partials/home/hero.html
@@ -37,7 +37,7 @@
                        {{ end }}
                        {{ if $authorImage }}
                            {{ if not $disableImageOptimization }}
-                                {{ $authorImage = $authorImage.Fill "288x288" }}
+                                {{ $authorImage = $authorImage.Fill (print "288x288 q" ( $.Site.Author.imagequality | default "96" )) }}
                            {{ end }}
                            <img class="mb-2 rounded-full h-36 w-36" width="144" height="144"
                                alt="{{ $.Site.Author.name | default " Author" }}" src="{{ $authorImage.RelPermalink }}" />
--- a/layouts/partials/home/profile.html
+++ b/layouts/partials/home/profile.html
@@ -12,7 +12,7 @@
      {{ end }}
      {{ if $authorImage }}
        {{ if not $disableImageOptimization }}
-          {{ $authorImage = $authorImage.Fill "288x288" }}
+          {{ $authorImage = $authorImage.Fill (print "288x288 q" ( $.Site.Author.imagequality | default "96" )) }}
        {{ end }}
        <img class="mb-2 rounded-full h-36 w-36" width="144" height="144" alt="{{ $.Site.Author.name | default " Author" }}"
          src="{{ $authorImage.RelPermalink }}" />
--- a/layouts/partials/meta/date-updated.html
+++ b/layouts/partials/meta/date-updated.html
@@ -1,4 +1,4 @@
 <time datetime="{{ . }}">
-  {{- i18n "article.date_updated" (dict "Date" (partial "functions/date.html" .)) | markdownify -}}
+  {{- i18n "article.date_updated" (dict "Date" (partial "functions/date.html" .)) -}}
 </time>
 {{- /* Trim EOF */ -}}
--- a/layouts/partials/meta/date.html
+++ b/layouts/partials/meta/date.html
@@ -1,4 +1,4 @@
 <time datetime="{{ . }}">
-  {{- i18n "article.date" (dict "Date" (partial "functions/date.html" .)) | markdownify -}}
+  {{- i18n "article.date" (dict "Date" (partial "functions/date.html" .)) -}}
 </time>
 {{- /* Trim EOF */ -}}
--- a/layouts/partials/recent-articles/main.html
+++ b/layouts/partials/recent-articles/main.html
@@ -1,5 +1,5 @@
 {{ $recentArticles := 5 }}
-{{ $showMoreLinkDest := "/posts" }}
+{{ $showMoreLinkDest := "/posts/" }}
 {{ if .Site.Params.homepage.showRecent | default false }}
 {{ if index .Site.Params.homepage "showRecentItems" }}
 {{ $recentArticles = .Site.Params.homepage.showRecentItems }}
--- a/layouts/partials/vendor.html
+++ b/layouts/partials/vendor.html
@@ -1,5 +1,5 @@
 {{/* jQuery */}}
-{{ $jqueryLib := resources.Get "lib/jquery/jquery.slim.min.js" }}
+{{ $jqueryLib := resources.Get "lib/jquery/jquery.slim.min.js" | resources.Fingerprint "sha512" }}
 <script src="{{ $jqueryLib.RelPermalink }}" integrity="{{ $jqueryLib.Data.Integrity }}"></script>

 {{/* Mermaid */}}
@@ -46,7 +46,7 @@

 {{/* TypeIt */}}
 {{ if .Page.HasShortcode "typeit" }}
-{{ $typeitLib := resources.Get "lib/typeit/typeit.umd.js" }}
+{{ $typeitLib := resources.Get "lib/typeit/typeit.umd.js" | resources.Fingerprint "sha512" }}
 <script defer src="{{ $typeitLib.RelPermalink }}" integrity="{{ $typeitLib.Data.Integrity }}"></script>
 {{ end }}

@@ -68,8 +68,8 @@

 {{/* youtubeLite */}}
 {{ if .Page.HasShortcode "youtubeLite" }}
-{{ $youtubeLiteJS := resources.Get "lib/lite-youtube-embed/lite-yt-embed.js" }}
+{{ $youtubeLiteJS := resources.Get "lib/lite-youtube-embed/lite-yt-embed.js" | resources.Fingerprint "sha512" }}
 {{ $youtubeLiteCSS := resources.Get "lib/lite-youtube-embed/lite-yt-embed.css" }}
 <link rel="stylesheet" href="{{ $youtubeLiteCSS.RelPermalink }}" integrity="{{ $youtubeLiteCSS.Data.Integrity }}"/>
 <script src="{{ $youtubeLiteJS.RelPermalink }}" integrity="{{ $youtubeLiteJS.Data.Integrity }}"></script>
-{{ end }}
+{{ end }}
--- a/layouts/shortcodes/codeberg.html
+++ b/layouts/shortcodes/codeberg.html
@@ -1,6 +1,6 @@
 {{ $id := delimit (slice "codeberg" (partial "functions/uid.html" .)) "-" }}
 {{- $codebergURL := print "https://codeberg.org/api/v1/repos/" (.Get "repo") -}}
-{{- $codebergData := getJSON ($codebergURL) -}}
+{{- $codebergData := resources.GetRemote $codebergURL | transform.Unmarshal -}}
 {{- $codebergColors := .Site.Data.codebergColors -}}
 {{- with $codebergData -}}

@@ -34,14 +34,14 @@
      <span class="text-md mr-1 text-neutral-800 dark:text-neutral">
        {{ partial "icon.html" "star" }}
      </span>
-      <div id="{{ $id }}-stargazers" class="m-0 mr-5 text-md text-neutral-800 dark:text-neutral">
+      <div id="{{ $id }}-stars_count" class="m-0 mr-5 text-md text-neutral-800 dark:text-neutral">
        {{ .stars_count }}
      </div>

      <span class="text-md mr-1 text-neutral-800 dark:text-neutral">
        {{ partial "icon.html" "fork" }}
      </span>
-      <div id="{{ $id }}-forks" 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>

@@ -58,7 +58,7 @@
      .then(data => {
        document.getElementById('{{ $id }}-full_name').innerHTML = data.full_name;
        document.getElementById('{{ $id }}-description').innerHTML = data.description;
-        document.getElementById('{{ $id }}-stars_count').innerHTML = data.starts_count;
+        document.getElementById('{{ $id }}-stars_count').innerHTML = data.stars_count;
        document.getElementById('{{ $id }}-forks_count').innerHTML = data.forks_count;
      })
      .catch(error => console.error(error))
--- a/layouts/shortcodes/forgejo.html
+++ b/layouts/shortcodes/forgejo.html
@@ -0,0 +1,67 @@
+{{ $id := delimit (slice "forgejo" (partial "functions/uid.html" .)) "-" }}
+{{- $forgejoURL := print (.Get "server" | default .Site.Params.forgejoDefaultServer) "/api/v1/repos/" (.Get "repo") -}}
+{{- $forgejoData := getJSON ($forgejoURL) -}}
+{{- $forgejoColors := .Site.Data.forgejoColors -}}
+{{- with $forgejoData -}}
+
+<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 shadow-2xl">
+
+    <div class="flex items-center">
+      <span class="text-2xl text-neutral-800 dark:text-neutral" style="margin-right:10px;">
+        {{ partial "icon.html" "forgejo" }}
+      </span>
+      <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 }}
+      </div>
+    </div>
+
+    <p id="{{ $id }}-description" class="m-0 mt-2 text-md text-neutral-800 dark:text-neutral">
+      {{ .description | markdownify }}
+    </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 $forgejoColors .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>
+
+      <span class="text-md mr-1 text-neutral-800 dark:text-neutral">
+        {{ partial "icon.html" "star" }}
+      </span>
+      <div id="{{ $id }}-stars_count" class="m-0 mr-5 text-md text-neutral-800 dark:text-neutral">
+        {{ .stars_count }}
+      </div>
+
+      <span class="text-md mr-1 text-neutral-800 dark:text-neutral">
+        {{ partial "icon.html" "fork" }}
+      </span>
+      <div id="{{ $id }}-forks_count" class="m-0 mr-5 text-md text-neutral-800 dark:text-neutral">
+        {{ .forks_count }}
+      </div>
+
+    </div>
+
+  </div>
+  <script>
+    fetch({{ $forgejoURL }}, {
+      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 }}-stars_count').innerHTML = data.stars_count;
+        document.getElementById('{{ $id }}-forks_count').innerHTML = data.forks_count;
+      })
+      .catch(error => console.error(error))
+  </script>
+</a>
+{{- end -}}
--- a/layouts/shortcodes/gitea.html
+++ b/layouts/shortcodes/gitea.html
@@ -0,0 +1,67 @@
+{{ $id := delimit (slice "gitea" (partial "functions/uid.html" .)) "-" }}
+{{- $giteaURL := print (.Get "server" | default .Site.Params.giteaDefaultServer) "/api/v1/repos/" (.Get "repo") -}}
+{{- $giteaData := getJSON ($giteaURL) -}}
+{{- $giteaColors := .Site.Data.giteaColors -}}
+{{- with $giteaData -}}
+
+<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 shadow-2xl">
+
+    <div class="flex items-center">
+      <span class="text-2xl text-neutral-800 dark:text-neutral" style="margin-right:10px;">
+        {{ partial "icon.html" "gitea" }}
+      </span>
+      <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 }}
+      </div>
+    </div>
+
+    <p id="{{ $id }}-description" class="m-0 mt-2 text-md text-neutral-800 dark:text-neutral">
+      {{ .description | markdownify }}
+    </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 $giteaColors .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>
+
+      <span class="text-md mr-1 text-neutral-800 dark:text-neutral">
+        {{ partial "icon.html" "star" }}
+      </span>
+      <div id="{{ $id }}-stars_count" class="m-0 mr-5 text-md text-neutral-800 dark:text-neutral">
+        {{ .stars_count }}
+      </div>
+
+      <span class="text-md mr-1 text-neutral-800 dark:text-neutral">
+        {{ partial "icon.html" "fork" }}
+      </span>
+      <div id="{{ $id }}-forks_count" class="m-0 mr-5 text-md text-neutral-800 dark:text-neutral">
+        {{ .forks_count }}
+      </div>
+
+    </div>
+
+  </div>
+  <script>
+    fetch({{ $giteaURL }}, {
+      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 }}-stars_count').innerHTML = data.stars_count;
+        document.getElementById('{{ $id }}-forks_count').innerHTML = data.forks_count;
+      })
+      .catch(error => console.error(error))
+  </script>
+</a>
+{{- end -}}
--- a/layouts/shortcodes/github.html
+++ b/layouts/shortcodes/github.html
@@ -1,6 +1,6 @@
 {{ $id := delimit (slice "github" (partial "functions/uid.html" .)) "-" }}
 {{- $githubURL := print "https://api.github.com/repos/" (.Get "repo") -}}
-{{- $githubData := getJSON ($githubURL) -}}
+{{- $githubData := resources.GetRemote $githubURL | transform.Unmarshal -}}
 {{- $githubColors := .Site.Data.githubColors -}}
 {{- with $githubData -}}

--- a/layouts/shortcodes/gitlab.html
+++ b/layouts/shortcodes/gitlab.html
@@ -1,7 +1,7 @@
 {{ $id := delimit (slice "gitlab" (partial "functions/uid.html" .)) "-" }}
 {{- $gitlabURL := print (default "https://gitlab.com/" (.Get "baseURL")) "api/v4/projects/" (.Get "projectID") -}}

-{{- $gitLabData := getJSON ($gitlabURL) -}}
+{{- $gitLabData := resources.GetRemote $gitlabURL | transform.Unmarshal -}}
 {{- with $gitLabData -}}

 <a id="{{ $id }}" target="_blank" href="{{ .web_url }}" class="cursor-pointer">