Update actions/upload-artifact action to v4

.forgejo/workflows/build-deploy.yml

@@ -3,28 +3,11 @@ name: Build and Deploy Website
 on: [push]
 
 jobs:
-  build-dev:
-    name: Build Dev Website
-    runs-on: docker
-    container:
-      image: node:lts
-    if: github.ref != 'refs/heads/main'
-    steps:
-      - uses: actions/checkout@v4
-      - name: Install Dependencies
-        run: npm install
-      - name: Build Website
-        run: npm run build:dev
-      - uses: actions/upload-artifact@v4
-        with:
-          name: build
-          path: dist/
   build:
     name: Build Website
     runs-on: docker
     container:
       image: node:lts
-    if: github.ref == 'refs/heads/main'
     steps:
       - uses: actions/checkout@v4
       - name: Install Dependencies
@@ -40,7 +23,7 @@ jobs:
     runs-on: docker
     container:
       image: node:lts-alpine
-    needs: [build-dev]
+    needs: [build]
     if: github.ref == 'refs/heads/develop'
     steps:
       - uses: actions/download-artifact@v3

README.md

@@ -1,5 +1,7 @@
 # sp-codes.de
 
+[![Build Status](https://ci.sp-codes.de/api/badges/samuel-p/sp-codes.de/status.svg?branch=main)](https://ci.sp-codes.de/samuel-p/sp-codes.de)
+
 Website for [sp-codes.de](https://sp-codes.de)
 
 ## Additional Header Parameters

package.json

@@ -4,10 +4,9 @@
   "description": "website for sp-codes.de",
   "scripts": {
     "minify-css": "uncss -n -H dist/ -o dist/css/main-*.css dist/**/*.html dist/**/**/*.html dist/**/**/**/*.html dist/**/**/**/**/*.html dist/**/**/**/**/**/*.html",
-    "add-index": "cpx dist/de/index.html dist/ && replace-in-file sp-codes.de/de/ sp-codes.de/ dist/index.html",
     "start": "eleventy --serve --watch",
-    "build": "eleventy && npm run minify-css && npm run add-index",
-    "build:dev": "BUILD=dev eleventy && npm run minify-css && npm run add-index"
+    "build": "eleventy && npm run move-index && npm run minify-css",
+    "move-index": "cpx dist/de/index.html dist/"
   },
   "author": "samuel-p",
   "repository": {
@@ -30,7 +29,6 @@
     "glob": "^10.3.12",
     "minify": "^11.1.1",
     "postcss": "^8.4.38",
-    "replace-in-file": "^7.1.0",
     "sass": "^1.72.0",
     "uncss": "^0.17.3"
   },

src/_data/global.dev.json

@@ -1,4 +0,0 @@
-{
-  "title": "DEV sp-codes",
-  "url": "https://dev.sp-codes.de"
-}

src/_data/site.js

@@ -1,10 +1,3 @@
-const fs = require("fs");
 const site = require("./global.json");
-
-site.buildName = process.env.BUILD || 'prod';
-if (fs.existsSync(`${__dirname}/global.${site.buildName}.json`)) {
-    Object.assign(site, require(`./global.${site.buildName}.json`));
-}
-site.buildTime = new Date().toISOString();
-
+site.buildTime = new Date();
 module.exports = site;

src/_includes/layouts/base.njk

@@ -23,12 +23,12 @@
     <meta property="og:title" content="{{ site.title }} - {{ title }}">
     <meta property="og:description" content="{{ summary }}">
     <meta property="og:site_name" content="{{ site.title }} - {{ title }}">
-    <meta property="og:image" content="{{ site.url }}/img/og.png">
+    <meta property="og:image" content="https://sp-codes.de/img/og.png">
     <meta property="og:updated_time" content="{{ site.buildTime }}">
     <meta name="twitter:card" content="summary_large_image">
     <meta name="twitter:title" content="{{ site.title }} - {{ title }}">
     <meta name="twitter:description" content="{{ summary }}">
-    <meta name="twitter:image" content="{{ site.url }}/img/og.png">
+    <meta name="twitter:image" content="https://sp-codes.de/img/og.png">
     <link rel="shortcut icon" href="favicon.ico">
     <link rel="icon" type="image/png" href="favicon.png">
     <link rel="stylesheet" href="{{ '/css/main.css' | rev }}">

src/de/donate.html

@@ -12,7 +12,7 @@ eleventyNavigation:
 <h1><i class="i-hand-holding-heart"></i> Unterstützen</h1>
 
 <p>Alle öffentlichen Dienste sind kostenfrei nutzbar. Wenn du dich trotzdem an den Kosten für die Server-Infrastruktur
-    beteiligen oder mir eine kleine Anerkennung zukommen lassen willst, kannst du mich über die
+    beteiligen oder mir eine kleine Anerkennung lassen willst, kannst du mich über die
     folgenden Wege unterstützen<sup>1</sup>:</p>
 
 <div class="row justify-content-center mb-5">

src/de/imprint.html

@@ -15,14 +15,14 @@ summary: Impressum von sp-codes – Informationen zu Rechtsinhaber und Kontaktan
     <h2>Kontakt</h2>
     <p>
         <strong>E-Mail-Adresse:</strong> mail@sp-codes.de<br>
-        <strong>Weitere Kontaktmöglichkeiten:</strong>  <a href="/{{locale}}/contact">{{ site.url }}/{{locale}}/contact</a><br>
+        <strong>Weitere Kontaktmöglichkeiten:</strong>  <a href="/{{locale}}/contact">https://sp-codes.de/{{locale}}/contact</a><br>
     </p>
 </div>
 <div class="mb-3 pt-4 border-top">
     <h2>Domains</h2>
     <ul>
         <li><a href="https://samuel-philipp.de">samuel-philipp.de</a></li>
-        <li><a href="{{ site.url }}">sp-codes.de</a></li>
+        <li><a href="https://sp-codes.de">sp-codes.de</a></li>
         <li><a href="https://sp-magic.de">sp-magic.de</a></li>
     </ul>
 </div>

src/de/privacy.html

@@ -14,8 +14,8 @@ summary: Datenschutzerklärung von sp-codes – Informationen zur Datenverarbeit
     <p>
         <strong>E-Mail-Adresse:</strong> mail@sp-codes.de<br>
         <strong>Kontaktmöglichkeiten:</strong> <a
-            href="/{{locale}}/contact">{{ site.url }}/{{locale}}/contact</a><br>
-        <strong>Impressum:</strong> <a href="/{{locale}}/imprint">{{ site.url }}/{{locale}}/imprint</a>
+            href="/{{locale}}/contact">https://sp-codes.de/{{locale}}/contact</a><br>
+        <strong>Impressum:</strong> <a href="/{{locale}}/imprint">https://sp-codes.de/{{locale}}/imprint</a>
     </p>
 </div>
 <div class="mb-3">

src/en/donate.html

@@ -12,13 +12,14 @@ eleventyNavigation:
 <h1><i class="i-hand-holding-heart"></i> Donate</h1>
 
 <p>All public services can be used for free. If you still want to contribute to the costs for server infrastructure or
-    send me a small donation, you can support me in the following ways<sup>1</sup>:</p>
+    send me a small donation for my blog, you can support me in the following ways<sup>1</sup>:</p>
 
 <div class="row justify-content-center">
     <div class="col-12 col-md-10 col-lg-8">
         <div class="card mb-3">
             <h2><i class="i-comments m-2"></i>Recommend</h2>
-            <div>You are welcome to recommend my services. I am very glad if I can make you happy with it.
+            <div>You are welcome to recommend my services and my blog posts. I am very glad if I can make you happy with
+                it.
             </div>
         </div>
         <div class="card mb-3">

src/en/imprint.html

@@ -15,14 +15,14 @@ summary: Imprint of sp-codes - Information on legal owner and contact details.
     <h2>Contact</h2>
     <p>
         <strong>E-Mail-Address:</strong> mail@sp-codes.de<br>
-        <strong>More contact options:</strong>  <a href="/{{locale}}/contact">{{ site.url }}/{{locale}}/contact</a><br>
+        <strong>More contact options:</strong>  <a href="/{{locale}}/contact">https://sp-codes.de/{{locale}}/contact</a><br>
     </p>
 </div>
 <div class="mb-3 pt-4 border-top">
     <h2>Domains</h2>
     <ul>
         <li><a href="https://samuel-philipp.de">samuel-philipp.de</a></li>
-        <li><a href="{{ site.url }}">sp-codes.de</a></li>
+        <li><a href="https://sp-codes.de">sp-codes.de</a></li>
         <li><a href="https://sp-magic.de">sp-magic.de</a></li>
     </ul>
 </div>