Merge pull request 'develop' (#225) from develop into main

Reviewed-on: #225

.forgejo/workflows/build-deploy.yml

@@ -3,11 +3,30 @@ 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 English Version
+        run: npm run build:dev
+      - name: Build German Version
+        run: npm run build:dev:de
+      - uses: actions/upload-artifact@v3
+        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
@@ -25,7 +44,7 @@ jobs:
     runs-on: docker
     container:
       image: node:lts-alpine
-    needs: [build]
+    needs: [build-dev]
     if: github.ref == 'refs/heads/develop'
     steps:
       - uses: actions/download-artifact@v3

README.md

@@ -1,5 +1,3 @@
-[![Build Status](https://ci.sp-codes.de/api/badges/samuel-p/samuel-philipp.de/status.svg)](https://ci.sp-codes.de/samuel-p/samuel-philipp.de)
-
 # samuel-philipp.de
 
 Website for [samuel-philipp.de](https://samuel-philipp.de) and [samuel-philipp.com](https://samuel-philipp.com)

package.json

@@ -8,7 +8,9 @@
     "start": "eleventy --serve --watch",
     "start:de": "LANGUAGE=de eleventy --serve --watch",
     "build": "eleventy && npm run minify-css",
-    "build:de": "LANGUAGE=de eleventy && npm run minify-css"
+    "build:de": "LANGUAGE=de eleventy && npm run minify-css",
+    "build:dev": "BUILD=dev eleventy && npm run minify-css",
+    "build:dev:de": "BUILD=dev LANGUAGE=de eleventy && npm run minify-css"
   },
   "author": "samuel-p",
   "repository": {
@@ -25,7 +27,6 @@
     "@node-minify/crass": "^8.0.6",
     "@node-minify/html-minifier": "^8.0.6",
     "@sardine/eleventy-plugin-tinyhtml": "^0.2.0",
-    "cpx": "^1.5.0",
     "eleventy-plugin-rev": "^2.0.0",
     "eleventy-sass": "^2.2.4",
     "glob": "^10.3.12",

src/_data/global.dev.json

@@ -0,0 +1,16 @@
+{
+  "languages": [
+    {
+      "label": "Deutsch",
+      "code": "de",
+      "icon": "de",
+      "url": "https://dev.samuel-philipp.de"
+    },
+    {
+      "label": "English",
+      "code": "en",
+      "icon": "us",
+      "url": "https://dev.samuel-philipp.com"
+    }
+  ]
+}

src/_data/global.json

@@ -4,17 +4,17 @@
   "description": "Samuel Philipp - Full-Stack Developer / SysAdmin / Magician",
   "author": "Samuel Philipp",
   "languages": [
-    {
-      "label": "English",
-      "code": "en",
-      "icon": "us",
-      "url": "https://samuel-philipp.com"
-    },
     {
       "label": "Deutsch",
       "code": "de",
       "icon": "de",
       "url": "https://samuel-philipp.de"
+    },
+    {
+      "label": "English",
+      "code": "en",
+      "icon": "us",
+      "url": "https://samuel-philipp.com"
     }
   ],
   "menu": {

src/_data/site.js

@@ -1,6 +1,11 @@
+const fs = require("fs");
 const site = require("./global.json");
 
-site.buildTime = new Date();
+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.lang = process.env.LANGUAGE || 'en';
 site.language = site.languages.find(l => l.code === site.lang);
 site.strings = require(`./i18n/${site.lang}.json`);

src/index.html

@@ -79,10 +79,10 @@ title: {{site.title}}
                                         class="i-stackoverflow i-2x i-fw"></i></a></li>
                             </ul>
                             <ul class="social-icons">
-                                <li class="m-2"><a href="https://samuel-philipp.de"><span class="fi fi-de i-2x"></span></a>
-                                </li>
-                                <li class="m-2"><a href="https://samuel-philipp.com"><span class="fi fi-us i-2x"></span></a>
+                                {%- for language in site.languages %}
+                                <li class="m-2"><a href="{{language.url}}"><span class="fi fi-{{language.icon}} i-2x"></span></a>
                                 </li>
+                                {%- endfor %}
                             </ul>
                         </div>
                         <div class="scroll-down-outer">