fix gitea fetching & cosmetics

.github/workflows/deploy.yml

@@ -123,6 +123,7 @@ jobs:
           INDIEKIT_URL: http://10.100.0.20:3000
           FUNKWHALE_INSTANCE: http://10.100.0.40:5000
           GITEA_URL: https://gitea.giersig.eu
+          GITEA_INTERNAL_URL: http://127.0.0.1:3000
           GITEA_ORG: giersig.eu
 
       - name: Deploy via rsync

_data/githubActivity.js

@@ -5,7 +5,7 @@
 
 import EleventyFetch from "@11ty/eleventy-fetch";
 
-const GITEA_URL = process.env.GITEA_URL || "https://gitea.giersig.eu";
+const GITEA_URL = process.env.GITEA_INTERNAL_URL || process.env.GITEA_URL || "https://gitea.giersig.eu";
 const GITEA_ORG = process.env.GITEA_ORG || "giersig.eu";
 const GITEA_REPOS = (process.env.GITEA_REPOS || "indiekit-blog,indiekit-server").split(",").filter(Boolean);
 

_data/githubRepos.js

@@ -5,7 +5,7 @@
 
 import { cachedFetch } from "../lib/data-fetch.js";
 
-const GITEA_URL = process.env.GITEA_URL || "https://gitea.giersig.eu";
+const GITEA_URL = process.env.GITEA_INTERNAL_URL || process.env.GITEA_URL || "https://gitea.giersig.eu";
 const GITEA_ORG = process.env.GITEA_ORG || "giersig.eu";
 
 export default async function () {

_includes/components/blog-sidebar.njk

@@ -38,7 +38,7 @@
     {% if widget.type == "social-activity" %}
       {% set widgetIcon = "globe" %}{% set widgetIconClass = "w-5 h-5 text-[#0085ff]" %}{% set widgetBorder = "border-l-[3px] border-l-[#0085ff]" %}
     {% elif widget.type == "github-repos" %}
-      {% set widgetIcon = "github" %}{% set widgetIconClass = "w-5 h-5 text-surface-800 dark:text-surface-200" %}{% set widgetBorder = "border-l-[3px] border-l-surface-400 dark:border-l-surface-500" %}
+      {% set widgetIcon = "gitea" %}{% set widgetIconClass = "w-5 h-5" %}{% set widgetBorder = "border-l-[3px] border-l-[#609926]" %}
     {% elif widget.type == "funkwhale" %}
       {% set widgetIcon = "headphones" %}{% set widgetIconClass = "w-5 h-5 text-purple-500" %}{% set widgetBorder = "border-l-[3px] border-l-purple-400 dark:border-l-purple-500" %}
     {% elif widget.type == "blogroll" %}

_includes/components/homepage-sidebar.njk

@@ -29,7 +29,7 @@
     {% if widget.type == "social-activity" %}
       {% set widgetIcon = "globe" %}{% set widgetIconClass = "w-5 h-5 text-[#0085ff]" %}{% set widgetBorder = "border-l-[3px] border-l-[#0085ff]" %}
     {% elif widget.type == "github-repos" %}
-      {% set widgetIcon = "github" %}{% set widgetIconClass = "w-5 h-5 text-surface-800 dark:text-surface-200" %}{% set widgetBorder = "border-l-[3px] border-l-surface-400 dark:border-l-surface-500" %}
+      {% set widgetIcon = "gitea" %}{% set widgetIconClass = "w-5 h-5" %}{% set widgetBorder = "border-l-[3px] border-l-[#609926]" %}
     {% elif widget.type == "funkwhale" %}
       {% set widgetIcon = "headphones" %}{% set widgetIconClass = "w-5 h-5 text-purple-500" %}{% set widgetBorder = "border-l-[3px] border-l-purple-400 dark:border-l-purple-500" %}
     {% elif widget.type == "blogroll" %}

_includes/components/icon.njk

@@ -47,6 +47,8 @@
 <svg class="{{ cls }}" fill="none" stroke="currentColor" viewBox="0 0 24 24" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><circle cx="12" cy="12" r="10"/><line x1="2" y1="12" x2="22" y2="12"/><path d="M12 2a15.3 15.3 0 014 10 15.3 15.3 0 01-4 10 15.3 15.3 0 01-4-10 15.3 15.3 0 014-10z"/></svg>
 {%- elif name == "github" -%}
 <svg class="{{ cls }}" fill="currentColor" viewBox="0 0 24 24" aria-hidden="true"><path fill-rule="evenodd" d="M12 2C6.477 2 2 6.484 2 12.017c0 4.425 2.865 8.18 6.839 9.504.5.092.682-.217.682-.483 0-.237-.008-.868-.013-1.703-2.782.605-3.369-1.343-3.369-1.343-.454-1.158-1.11-1.466-1.11-1.466-.908-.62.069-.608.069-.608 1.003.07 1.531 1.032 1.531 1.032.892 1.53 2.341 1.088 2.91.832.092-.647.35-1.088.636-1.338-2.22-.253-4.555-1.113-4.555-4.951 0-1.093.39-1.988 1.029-2.688-.103-.253-.446-1.272.098-2.65 0 0 .84-.27 2.75 1.026A9.564 9.564 0 0112 6.844c.85.004 1.705.115 2.504.337 1.909-1.296 2.747-1.027 2.747-1.027.546 1.379.202 2.398.1 2.651.64.7 1.028 1.595 1.028 2.688 0 3.848-2.339 4.695-4.566 4.943.359.309.678.92.678 1.855 0 1.338-.012 2.419-.012 2.747 0 .268.18.58.688.482A10.019 10.019 0 0022 12.017C22 6.484 17.522 2 12 2z" clip-rule="evenodd"/></svg>
+{%- elif name == "gitea" -%}
+<svg class="{{ cls }}" viewBox="0 0 24 24" fill="none" aria-hidden="true"><ellipse cx="12" cy="12" rx="10" ry="10" fill="#609926"/><path d="M7.5 13.5c.5 2 2.5 4 4.5 4s4-2 4.5-4c.5-2-1-3-2-3.5-.5-.5-1.5-.5-2.5-.5s-2 .1-2.5.5c-1 .5-2.5 1.5-2 3.5z" fill="#fff"/><circle cx="9.5" cy="13.5" r=".7" fill="#609926"/><circle cx="14.5" cy="13.5" r=".7" fill="#609926"/></svg>
 {%- elif name == "list" -%}
 <svg class="{{ cls }}" fill="none" stroke="currentColor" viewBox="0 0 24 24" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><line x1="8" y1="6" x2="21" y2="6"/><line x1="8" y1="12" x2="21" y2="12"/><line x1="8" y1="18" x2="21" y2="18"/><line x1="3" y1="6" x2="3.01" y2="6"/><line x1="3" y1="12" x2="3.01" y2="12"/><line x1="3" y1="18" x2="3.01" y2="18"/></svg>
 {%- elif name == "share" -%}

_includes/components/sidebar.njk

@@ -33,7 +33,7 @@
     {% if widget.type == "social-activity" %}
       {% set widgetIcon = "globe" %}{% set widgetIconClass = "w-5 h-5 text-[#0085ff]" %}{% set widgetBorder = "border-l-[3px] border-l-[#0085ff]" %}
     {% elif widget.type == "github-repos" %}
-      {% set widgetIcon = "github" %}{% set widgetIconClass = "w-5 h-5 text-surface-800 dark:text-surface-200" %}{% set widgetBorder = "border-l-[3px] border-l-surface-400 dark:border-l-surface-500" %}
+      {% set widgetIcon = "gitea" %}{% set widgetIconClass = "w-5 h-5" %}{% set widgetBorder = "border-l-[3px] border-l-[#609926]" %}
     {% elif widget.type == "funkwhale" %}
       {% set widgetIcon = "headphones" %}{% set widgetIconClass = "w-5 h-5 text-purple-500" %}{% set widgetBorder = "border-l-[3px] border-l-purple-400 dark:border-l-purple-500" %}
     {% elif widget.type == "blogroll" %}