Compare commits
16 Commits
feature/ph
...
b0f769d186
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b0f769d186 | ||
|
|
85cf4f3b03 | ||
| 45368bb607 | |||
| b774bd0363 | |||
| ad4284733c | |||
| 1a72210608 | |||
| b6f745e144 | |||
| e7f2875287 | |||
| 0c6f8cac5a | |||
| 2b5b0afd91 | |||
| e896831b36 | |||
| 3db7dc8971 | |||
| e30bc5704b | |||
| 25a48e9958 | |||
| 148b4849fd | |||
|
|
fb646eba85 |
@@ -6,8 +6,67 @@ on:
|
||||
- "feature/**"
|
||||
|
||||
jobs:
|
||||
deploy:
|
||||
lint-php:
|
||||
name: PHP Syntax Check
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
- name: Install PHP
|
||||
run: apt-get update -qq && apt-get install -y -qq php-cli > /dev/null 2>&1
|
||||
|
||||
- name: PHP Lint
|
||||
run: |
|
||||
errors=0
|
||||
while IFS= read -r file; do
|
||||
if ! php -l "$file" > /dev/null 2>&1; then
|
||||
echo "❌ Syntax error in $file"
|
||||
php -l "$file"
|
||||
errors=1
|
||||
fi
|
||||
done < <(find . -name "*.php" -not -path "./vendor/*")
|
||||
if [ "$errors" -eq 1 ]; then
|
||||
echo "::error::PHP lint check failed"
|
||||
exit 1
|
||||
fi
|
||||
echo "✅ All PHP files pass syntax check"
|
||||
|
||||
lint-css:
|
||||
name: CSS Lint (stylelint)
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
- name: Install Node.js & stylelint
|
||||
run: |
|
||||
apt-get update -qq && apt-get install -y -qq npm nodejs > /dev/null 2>&1
|
||||
npm install -g stylelint stylelint-config-standard stylelint-prettier > /dev/null 2>&1
|
||||
|
||||
- name: CSS Lint
|
||||
run: |
|
||||
npx stylelint "**/*.css" --config .stylelintrc.json --allow-empty-input
|
||||
echo "✅ All CSS files pass lint"
|
||||
|
||||
lint-html:
|
||||
name: HTML Lint (htmlhint)
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
- name: Install Node.js & htmlhint
|
||||
run: |
|
||||
apt-get update -qq && apt-get install -y -qq npm nodejs > /dev/null 2>&1
|
||||
npm install -g htmlhint > /dev/null 2>&1
|
||||
|
||||
- name: HTML Lint
|
||||
run: |
|
||||
npx htmlhint "**/*.html" --config .htmlhintrc
|
||||
echo "✅ All HTML files pass lint"
|
||||
|
||||
deploy:
|
||||
name: Deploy to Test Environment
|
||||
runs-on: ubuntu-latest
|
||||
needs: [lint-php, lint-css, lint-html]
|
||||
container:
|
||||
volumes:
|
||||
- /var/www/test/html:/deploy
|
||||
@@ -20,6 +79,7 @@ jobs:
|
||||
echo "=== Deploying branch: ${{ gitea.ref_name }} ==="
|
||||
echo "=== Commit: ${{ gitea.sha }} ==="
|
||||
echo "=== By: ${{ gitea.actor }} ==="
|
||||
echo "=== All lint checks passed ✅ ==="
|
||||
date
|
||||
|
||||
- name: Deploy to test environment
|
||||
@@ -37,17 +97,18 @@ jobs:
|
||||
--exclude='.htmlhintrc' \
|
||||
--exclude='.gitignore' \
|
||||
--exclude='.dockerignore' \
|
||||
--exclude='.continue' \
|
||||
--exclude='Dockerfile' \
|
||||
--exclude='nginx.conf' \
|
||||
--exclude='eslint.config.js' \
|
||||
--exclude='package.json' \
|
||||
--exclude='package-lock.json' \
|
||||
--exclude='docs/' \
|
||||
--exclude='AGENTS.md' \
|
||||
--exclude='README.md' \
|
||||
--exclude='scripts/' \
|
||||
./ /deploy/
|
||||
|
||||
# Set haus-schleusingen.html as index
|
||||
cp /deploy/haus-schleusingen.html /deploy/index.html 2>/dev/null || true
|
||||
|
||||
echo "✅ Deployment complete!"
|
||||
|
||||
@@ -64,6 +125,7 @@ jobs:
|
||||
echo "=========================================="
|
||||
echo " Branch: ${{ gitea.ref_name }}"
|
||||
echo " Commit: ${{ gitea.sha }}"
|
||||
echo " Target: http://178.104.150.0/"
|
||||
echo " Target: http://178.104.150.0:6427/"
|
||||
echo " Lint: ✅ All checks passed"
|
||||
echo " Time: $(date)"
|
||||
echo "=========================================="
|
||||
|
||||
@@ -1 +1,3 @@
|
||||
npx lint-staged
|
||||
# Delegiert an scripts/pre-commit-checks.sh
|
||||
# (gleiche Logik wie safe-commit.sh-Safety-Net, nur einmalig)
|
||||
./scripts/pre-commit-checks.sh
|
||||
|
||||
23
AGENTS.md
23
AGENTS.md
@@ -1,8 +1,27 @@
|
||||
# Agent-Richtlinien für dieses Projekt
|
||||
|
||||
## ⚠️ WICHTIG: Pre-Commit Hooks sind Pflicht
|
||||
|
||||
**Jeder Commit MUSS die Pre-Commit Lint-Checks durchlaufen. Niemals `--no-verify` verwenden!**
|
||||
|
||||
### Für AI-Agents (Claw etc.):
|
||||
- Verwende `./scripts/safe-commit.sh "Nachricht"` statt `git commit -m "..."`
|
||||
- Das Script garantiert dass lint-staged läuft (PHP, HTML, CSS, JS, Prettier)
|
||||
- Wenn ein Linter fehlschlägt: **Fehler beheben, nicht überspringen!**
|
||||
- Niemals `git commit --no-verify` verwenden
|
||||
|
||||
### Lint-Checks die laufen:
|
||||
- **PHP:** `php -l` Syntax-Check (via `scripts/lint-php.sh`)
|
||||
- **HTML:** htmlhint
|
||||
- **CSS:** stylelint + prettier
|
||||
- **JS:** eslint + prettier
|
||||
- **JSON/MD:** prettier
|
||||
|
||||
---
|
||||
|
||||
## Systemumgebung
|
||||
|
||||
- **Betriebssystem: Windows** – Alle Befehle und Pfade müssen Windows-kompatibel sein (z. B. Pfadtrennzeichen `\`, PowerShell-Syntax).
|
||||
- **Betriebssystem: Linux** – Befehle und Pfade sind Linux-kompatibel.
|
||||
|
||||
---
|
||||
|
||||
@@ -17,7 +36,7 @@
|
||||
|
||||
| Pfad | Beschreibung |
|
||||
| --------------------------- | -------------------------------------------- |
|
||||
| `haus-schleusingen.html` | Einstiegsseite (einzige HTML-Datei) |
|
||||
| `public/index.php` | Einstiegsseite (PHP-Entry-Point) |
|
||||
| `css/haus-schleusingen.css` | Hauptstylesheet |
|
||||
| `js/haus-schleusingen.js` | Haupt-JavaScript |
|
||||
| `js/masonry.pkgd.min.js` | Masonry-Layout-Bibliothek (nicht bearbeiten) |
|
||||
|
||||
@@ -44,7 +44,7 @@ Das Projekt basiert auf reinem HTML, CSS und JavaScript und wird über einen Ngi
|
||||
## Projektstruktur
|
||||
|
||||
```
|
||||
├── haus-schleusingen.html # Einstiegsseite (einzige HTML-Datei)
|
||||
├── public/index.php # Einstiegsseite (PHP-Entry-Point)
|
||||
├── css/
|
||||
│ └── haus-schleusingen.css # Hauptstylesheet
|
||||
├── js/
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
</ul>
|
||||
<button
|
||||
class="nav-cta"
|
||||
onclick="$('html').animate({ scrollTop: $('#kontakt').offset().top }, 700)"
|
||||
onclick="document.getElementById('kontakt').scrollIntoView({behavior:'smooth'})"
|
||||
>
|
||||
Jetzt anfragen
|
||||
</button>
|
||||
@@ -393,7 +393,7 @@
|
||||
<div class="lage-icon">📍</div>
|
||||
<div>
|
||||
<div class="lage-title">Genaue Adresse</div>
|
||||
<div class="lage-desc">Schleusinger Bahnhofstraße 10<br />98533 Schleusingen, Thüringen</div>
|
||||
<div class="lage-desc">Schleusinger Bahnhofstraße 10<br />98553 Schleusingen, Thüringen</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -3,7 +3,7 @@ server {
|
||||
server_name localhost;
|
||||
|
||||
root /usr/share/nginx/html;
|
||||
index haus-schleusingen.html;
|
||||
index index.php;
|
||||
|
||||
# Gzip aktivieren
|
||||
gzip on;
|
||||
@@ -12,7 +12,7 @@ server {
|
||||
gzip_vary on;
|
||||
|
||||
location / {
|
||||
try_files $uri $uri/ /haus-schleusingen.html;
|
||||
try_files $uri $uri/ /index.php;
|
||||
}
|
||||
|
||||
# Lange Cache-Dauer für Bilder und statische Assets
|
||||
|
||||
@@ -7,12 +7,16 @@
|
||||
"lint:html": "htmlhint \"**/*.html\"",
|
||||
"lint:css": "stylelint \"css/**/*.css\" \"fonts/**/*.css\" && echo Stylelint: No errors found",
|
||||
"lint:js": "eslint \"js/**/*.js\" --ignore-pattern \"**/*.min.js\" && echo ESLint: No errors found",
|
||||
"lint": "npm run lint:html && npm run lint:css && npm run lint:js",
|
||||
"lint": "npm run lint:php && npm run lint:html && npm run lint:css && npm run lint:js",
|
||||
"format": "prettier --write \"**/*.{html,css,js,json,md}\" --ignore-path .prettierignore",
|
||||
"format:check": "prettier --check \"**/*.{html,css,js,json,md}\" --ignore-path .prettierignore",
|
||||
"prepare": "husky"
|
||||
"prepare": "husky",
|
||||
"lint:php": "find . -name \"*.php\" -not -path \"./vendor/*\" -exec php -l {} \\; > /dev/null 2>&1 && echo \"PHP syntax OK\" || (echo \"PHP lint failed\" && exit 1)"
|
||||
},
|
||||
"lint-staged": {
|
||||
"*.{php}": [
|
||||
"scripts/lint-php.sh"
|
||||
],
|
||||
"*.{html}": [
|
||||
"htmlhint",
|
||||
"prettier --write"
|
||||
|
||||
@@ -94,10 +94,11 @@ nav {
|
||||
}
|
||||
|
||||
nav.scrolled {
|
||||
background: rgb(253 252 250 / 96%);
|
||||
backdrop-filter: blur(12px);
|
||||
background: var(--white);
|
||||
backdrop-filter: none;
|
||||
padding: 0.85rem 3rem;
|
||||
border-bottom: 1px solid rgb(158 148 133 / 20%);
|
||||
border-bottom: 1px solid var(--warm);
|
||||
box-shadow: 0 1px 8px rgb(0 0 0 / 6%);
|
||||
}
|
||||
|
||||
.nav-logo {
|
||||
|
||||
@@ -1,16 +1,23 @@
|
||||
document.addEventListener("DOMContentLoaded", function () {
|
||||
// Navbar scroll
|
||||
var navbar = document.getElementById("navbar");
|
||||
window.addEventListener("scroll", function () {
|
||||
function checkScroll() {
|
||||
if (window.scrollY > 60) navbar.classList.add("scrolled");
|
||||
else navbar.classList.remove("scrolled");
|
||||
});
|
||||
}
|
||||
// Check immediately on load (for non-hero pages already scrolled)
|
||||
checkScroll();
|
||||
window.addEventListener("scroll", checkScroll);
|
||||
|
||||
// Hero animation on load
|
||||
// Hero animation on load (only if hero elements exist)
|
||||
var heroContent = document.getElementById("heroContent");
|
||||
var heroBg = document.getElementById("heroBg");
|
||||
if (heroContent || heroBg) {
|
||||
setTimeout(function () {
|
||||
document.getElementById("heroContent").classList.add("visible");
|
||||
document.getElementById("heroBg").classList.add("loaded");
|
||||
if (heroContent) heroContent.classList.add("visible");
|
||||
if (heroBg) heroBg.classList.add("loaded");
|
||||
}, 200);
|
||||
}
|
||||
|
||||
// Scroll animations via IntersectionObserver
|
||||
var animElements = document.querySelectorAll(".fact, [data-animate]");
|
||||
@@ -176,9 +183,7 @@ document.addEventListener("DOMContentLoaded", function () {
|
||||
});
|
||||
|
||||
// Form submit is handled server-side by PHP – no JS intervention needed.
|
||||
// Form submit – opens email client with pre-filled mailto: link
|
||||
document.getElementById("contactForm")
|
||||
});
|
||||
// Success feedback is shown via #form-result after server redirect.
|
||||
});
|
||||
|
||||
// Mobile hamburger menu (vanilla JS)
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
User-agent: *
|
||||
Allow: /
|
||||
Sitemap: https://haus-schleusingen.de/haus-schleusingen.html
|
||||
Sitemap: https://haus-schleusingen.de/
|
||||
|
||||
28
scripts/lint-php.sh
Executable file
28
scripts/lint-php.sh
Executable file
@@ -0,0 +1,28 @@
|
||||
#!/usr/bin/env bash
|
||||
# Pre-commit PHP syntax check for lint-staged
|
||||
# Called with staged .php files as arguments
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
if ! command -v php &>/dev/null; then
|
||||
echo "❌ PHP not found. Install php-cli to commit PHP files."
|
||||
echo " Ubuntu/Debian: sudo apt-get install php-cli"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
errors=0
|
||||
for file in "$@"; do
|
||||
if ! php -l "$file" >/dev/null 2>&1; then
|
||||
echo "❌ Syntax error in $file"
|
||||
php -l "$file"
|
||||
errors=1
|
||||
fi
|
||||
done
|
||||
|
||||
if [ "$errors" -eq 1 ]; then
|
||||
echo ""
|
||||
echo "❌ PHP lint failed. Fix errors before committing."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "✅ PHP syntax OK"
|
||||
77
scripts/pre-commit-checks.sh
Executable file
77
scripts/pre-commit-checks.sh
Executable file
@@ -0,0 +1,77 @@
|
||||
#!/usr/bin/env bash
|
||||
# pre-commit-checks.sh – Pre-Commit Checks (Lint + PHPUnit)
|
||||
# Wird vom Husky-Hook (.husky/pre-commit) und von scripts/safe-commit.sh aufgerufen.
|
||||
#
|
||||
# Abbruch mit Exit-Code != 0 bei Fehler.
|
||||
set -euo pipefail
|
||||
|
||||
REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||
cd "$REPO_ROOT"
|
||||
|
||||
# ─────────────────────────────────────────────────────────────
|
||||
# 1) lint-staged (HTML, CSS, JS, JSON, MD, PHP-Syntax)
|
||||
# ─────────────────────────────────────────────────────────────
|
||||
if command -v npx >/dev/null 2>&1 && [ -f "node_modules/.bin/lint-staged" ]; then
|
||||
echo "🔍 Pre-Commit: lint-staged laeuft..."
|
||||
if ! npx lint-staged; then
|
||||
echo ""
|
||||
echo "❌ Pre-Commit: lint-staged fehlgeschlagen. Commit abgebrochen."
|
||||
exit 1
|
||||
fi
|
||||
echo "✅ Pre-Commit: lint-staged OK"
|
||||
fi
|
||||
|
||||
# ─────────────────────────────────────────────────────────────
|
||||
# 2) PHPUnit nur, wenn PHP-relevante Dateien gestaged sind
|
||||
# - *.php Quellcode & Tests
|
||||
# - phpunit.xml Test-Konfiguration
|
||||
# - composer.json PHP-Abhaengigkeiten
|
||||
# - composer.lock Lock-File
|
||||
# ─────────────────────────────────────────────────────────────
|
||||
PHP_TOUCHED=$(git diff --cached --name-only --diff-filter=ACMR \
|
||||
| grep -E '\.(php)$|^phpunit\.xml$|^composer\.(json|lock)$' || true)
|
||||
|
||||
if [ -n "$PHP_TOUCHED" ]; then
|
||||
echo ""
|
||||
echo "==> PHP-Dateien geaendert -> PHPUnit wird ausgefuehrt"
|
||||
echo " Betroffene Dateien:"
|
||||
printf ' - %s\n' $PHP_TOUCHED
|
||||
|
||||
# Safety-Check: alle gestaged PHP-Dateien muessen auf der Disk existieren.
|
||||
# Sonst wuerde PHPUnit eine inkonsistente Codebasis testen (Staged != Working Tree).
|
||||
MISSING=""
|
||||
for f in $PHP_TOUCHED; do
|
||||
[ -f "$f" ] || MISSING="$MISSING $f"
|
||||
done
|
||||
if [ -n "$MISSING" ]; then
|
||||
echo ""
|
||||
echo "FEHLER: Gestaged PHP-Dateien existieren nicht auf der Disk:"
|
||||
printf ' - %s\n' $MISSING
|
||||
echo " Loesung: 'git restore --staged <datei>' oder Working-Tree synchronisieren."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Composer-Deps nur installieren, falls noetig (Cache-Hit fuer wiederholte Commits)
|
||||
if [ ! -f "vendor/bin/phpunit" ]; then
|
||||
echo ""
|
||||
echo "==> vendor/ fehlt -> composer install laeuft"
|
||||
if ! command -v composer >/dev/null 2>&1; then
|
||||
echo "FEHLER: 'composer' ist nicht installiert."
|
||||
echo " Installation: https://getcomposer.org/download/"
|
||||
exit 1
|
||||
fi
|
||||
composer install --no-interaction --prefer-dist --no-progress
|
||||
fi
|
||||
|
||||
echo ""
|
||||
echo "==> PHPUnit laeuft..."
|
||||
if ! vendor/bin/phpunit; then
|
||||
echo ""
|
||||
echo "FEHLER: PHPUnit-Tests fehlgeschlagen. Commit abgebrochen."
|
||||
echo " Behebe die Fehler und versuche es erneut."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo ""
|
||||
echo "==> PHPUnit OK"
|
||||
fi
|
||||
29
scripts/safe-commit.sh
Executable file
29
scripts/safe-commit.sh
Executable file
@@ -0,0 +1,29 @@
|
||||
#!/usr/bin/env bash
|
||||
# safe-commit.sh – Commit with pre-commit hooks guaranteed to run
|
||||
# Usage: ./scripts/safe-commit.sh "commit message"
|
||||
#
|
||||
# This script ensures lint + PHPUnit checks always execute, even when committing
|
||||
# from non-interactive contexts (CI, AI agents, etc.).
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
if [ -z "${1:-}" ]; then
|
||||
echo "❌ Usage: ./scripts/safe-commit.sh \"commit message\""
|
||||
exit 1
|
||||
fi
|
||||
|
||||
MSG="$1"
|
||||
REPO_ROOT="$(cd "$(dirname "$0")/.." && pwd)"
|
||||
cd "$REPO_ROOT"
|
||||
|
||||
# Ensure hooks directory exists and is configured
|
||||
if [ -d ".husky" ]; then
|
||||
git config core.hooksPath .husky
|
||||
fi
|
||||
|
||||
# Run pre-commit checks manually as a safety net (in case hook is skipped)
|
||||
# Same logic as .husky/pre-commit, just in case the hook is bypassed.
|
||||
./scripts/pre-commit-checks.sh
|
||||
|
||||
# Commit with hooks enabled (no --no-verify)
|
||||
git commit -m "$MSG"
|
||||
Reference in New Issue
Block a user