merge: resolve conflict in deploy-test.yml with main
All checks were successful
Deploy Feature Branch to Test / PHP Syntax Check (push) Successful in 35s
Deploy Feature Branch to Test / CSS Lint (stylelint) (push) Successful in 1m13s
Deploy Feature Branch to Test / HTML Lint (htmlhint) (push) Successful in 1m12s
Lint / PHP Syntax Check (push) Successful in 33s
Lint / CSS Lint (stylelint) (push) Successful in 1m13s
Lint / HTML Lint (htmlhint) (push) Successful in 1m7s
Lint / PHP Syntax Check (pull_request) Successful in 31s
Lint / CSS Lint (stylelint) (pull_request) Successful in 1m12s
Lint / HTML Lint (htmlhint) (pull_request) Successful in 1m9s
Deploy Feature Branch to Test / Deploy to Test Environment (push) Successful in 25s
All checks were successful
Deploy Feature Branch to Test / PHP Syntax Check (push) Successful in 35s
Deploy Feature Branch to Test / CSS Lint (stylelint) (push) Successful in 1m13s
Deploy Feature Branch to Test / HTML Lint (htmlhint) (push) Successful in 1m12s
Lint / PHP Syntax Check (push) Successful in 33s
Lint / CSS Lint (stylelint) (push) Successful in 1m13s
Lint / HTML Lint (htmlhint) (push) Successful in 1m7s
Lint / PHP Syntax Check (pull_request) Successful in 31s
Lint / CSS Lint (stylelint) (pull_request) Successful in 1m12s
Lint / HTML Lint (htmlhint) (pull_request) Successful in 1m9s
Deploy Feature Branch to Test / Deploy to Test Environment (push) Successful in 25s
This commit is contained in:
@@ -109,6 +109,7 @@ jobs:
|
||||
--exclude='scripts/' \
|
||||
./ /deploy/
|
||||
|
||||
|
||||
echo "✅ Deployment complete!"
|
||||
|
||||
- name: Set permissions
|
||||
|
||||
@@ -36,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) |
|
||||
|
||||
16
README.md
16
README.md
@@ -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/
|
||||
@@ -172,6 +172,20 @@ npm run lint
|
||||
|
||||
## Git-Workflow
|
||||
|
||||
### Pre-Commit Hooks aktivieren
|
||||
|
||||
Die Pre-Commit Hooks (Husky + lint-staged) werden automatisch beim Installieren der Abhängigkeiten eingerichtet:
|
||||
|
||||
```bash
|
||||
npm install
|
||||
```
|
||||
|
||||
Der `prepare`-Script in `package.json` (`"prepare": "husky"`) sorgt dafür, dass Husky die Git Hooks im `.husky/`-Verzeichnis registriert. Nach `npm install` sind die Hooks aktiv – kein manueller Schritt nötig.
|
||||
|
||||
> **Falls Hooks nicht laufen:** Prüfe ob `.husky/pre-commit` ausführbar ist (`chmod +x .husky/pre-commit`) und ob `core.hooksPath` nicht überschrieben wurde (`git config core.hooksPath`).
|
||||
|
||||
### Was wird beim Commit geprüft?
|
||||
|
||||
Beim Committen führt **Husky** automatisch den Pre-Commit Hook (`.husky/pre-commit`) aus, der **lint-staged** startet.
|
||||
|
||||
### lint-staged prüft automatisch:
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -176,40 +176,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").addEventListener("submit", function (e) {
|
||||
e.preventDefault();
|
||||
|
||||
var fname = document.getElementById("fname").value.trim();
|
||||
var lname = document.getElementById("lname").value.trim();
|
||||
var email = document.getElementById("email").value.trim();
|
||||
var phone = document.getElementById("phone").value.trim();
|
||||
var interest = document.getElementById("interest").value;
|
||||
var message = document.getElementById("message").value.trim();
|
||||
|
||||
var subject = "Kontaktanfrage: " + interest;
|
||||
var body = "Von: " + fname + " " + lname + "\n";
|
||||
body += "E-Mail: " + email + "\n";
|
||||
if (phone) body += "Telefon: " + phone + "\n";
|
||||
body += "Anliegen: " + interest + "\n\n";
|
||||
body += message;
|
||||
|
||||
var mailto =
|
||||
"mailto:mki@kies-media.de" +
|
||||
"?subject=" + encodeURIComponent(subject) +
|
||||
"&body=" + encodeURIComponent(body);
|
||||
|
||||
window.location.href = mailto;
|
||||
|
||||
// Show success message
|
||||
this.style.display = "none";
|
||||
var success = document.getElementById("formSuccess");
|
||||
success.style.display = "block";
|
||||
success.style.opacity = "0";
|
||||
success.style.transition = "opacity 0.4s ease";
|
||||
requestAnimationFrame(function () {
|
||||
success.style.opacity = "1";
|
||||
});
|
||||
// Success feedback is shown via #form-result after server redirect.
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
User-agent: *
|
||||
Allow: /
|
||||
Sitemap: https://haus-schleusingen.de/haus-schleusingen.html
|
||||
Sitemap: https://haus-schleusingen.de/
|
||||
|
||||
Reference in New Issue
Block a user