diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 5451689..61f0ae4 100644 --- a/.github/workflows/deploy.yml +++ b/.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 diff --git a/_data/githubActivity.js b/_data/githubActivity.js index 303a197..50d0fa5 100644 --- a/_data/githubActivity.js +++ b/_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); diff --git a/_data/githubRepos.js b/_data/githubRepos.js index 3a77298..ce971f1 100644 --- a/_data/githubRepos.js +++ b/_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 () { diff --git a/_includes/components/blog-sidebar.njk b/_includes/components/blog-sidebar.njk index 3630a2c..1c927f8 100644 --- a/_includes/components/blog-sidebar.njk +++ b/_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" %} diff --git a/_includes/components/homepage-sidebar.njk b/_includes/components/homepage-sidebar.njk index c5fba9f..9906f1b 100644 --- a/_includes/components/homepage-sidebar.njk +++ b/_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" %} diff --git a/_includes/components/icon.njk b/_includes/components/icon.njk index 69c0036..6b11416 100644 --- a/_includes/components/icon.njk +++ b/_includes/components/icon.njk @@ -47,6 +47,8 @@ {%- elif name == "github" -%} +{%- elif name == "gitea" -%} + {%- elif name == "list" -%} {%- elif name == "share" -%} diff --git a/_includes/components/sidebar.njk b/_includes/components/sidebar.njk index d1d7c81..08a569d 100644 --- a/_includes/components/sidebar.njk +++ b/_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" %}