develop #221

Merged
samuel-p merged 67 commits from develop into main 2024-04-01 14:00:02 +00:00
10 changed files with 41 additions and 14 deletions
Showing only changes of commit a915cee61c - Show all commits

View file

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

View file

@ -1,7 +1,5 @@
# sp-codes.de # 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) Website for [sp-codes.de](https://sp-codes.de)
## Additional Header Parameters ## Additional Header Parameters

View file

@ -5,8 +5,8 @@
"scripts": { "scripts": {
"minify-css": "uncss -n -H dist/ -o dist/css/main-*.css dist/**/*.html dist/**/**/*.html dist/**/**/**/*.html dist/**/**/**/**/*.html dist/**/**/**/**/**/*.html", "minify-css": "uncss -n -H dist/ -o dist/css/main-*.css dist/**/*.html dist/**/**/*.html dist/**/**/**/*.html dist/**/**/**/**/*.html dist/**/**/**/**/**/*.html",
"start": "eleventy --serve --watch", "start": "eleventy --serve --watch",
"build": "eleventy && npm run move-index && npm run minify-css", "build": "eleventy && npm run minify-css",
"move-index": "cpx dist/de/index.html dist/" "build:dev": "BUILD=dev eleventy"
}, },
"author": "samuel-p", "author": "samuel-p",
"repository": { "repository": {

View file

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

View file

@ -1,3 +1,10 @@
const fs = require("fs");
const site = require("./global.json"); 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();
module.exports = site; module.exports = site;

View file

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

View file

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

View file

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

View file

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

1
src/index.html Symbolic link
View file

@ -0,0 +1 @@
de/index.html