Muster & Angebot: Vor-/Nachname getrennt, „Ort" statt „Stadt", Angebot als Seite
All checks were successful
Build & Deploy / deploy (push) Successful in 21s

- Muster bestellen + individuelles Angebot: getrennte Felder Vorname/Nachname
  (statt einem Namensfeld).
- Muster-Formular: Feld „Stadt" → „Ort".
- „Individuelles Angebot" öffnet jetzt eine eigene Seite (/angebot) statt Popup.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
s4luorth
2026-09-11 21:15:38 +02:00
parent 1e90b8de09
commit bad4abc945
5 changed files with 42 additions and 16 deletions

View File

@@ -7,6 +7,7 @@ import Auftraege from './routes/Auftraege';
import Stammdaten from './routes/Stammdaten'; import Stammdaten from './routes/Stammdaten';
import Configurator from './routes/Configurator'; import Configurator from './routes/Configurator';
import MusterSeite from './routes/Muster'; import MusterSeite from './routes/Muster';
import AngebotSeite from './routes/Angebot';
import Textmenge from './routes/Textmenge'; import Textmenge from './routes/Textmenge';
import { loadSession } from './lib/api'; import { loadSession } from './lib/api';
@@ -36,8 +37,9 @@ export default function App() {
<Routes> <Routes>
<Route path="/" element={<Configurator />} /> <Route path="/" element={<Configurator />} />
<Route path="/login" element={<Login />} /> <Route path="/login" element={<Login />} />
{/* Muster als eigene Seite (kein Popup) – Direktlink /muster. */} {/* Muster & individuelles Angebot als eigene Seiten (kein Popup). */}
<Route path="/muster" element={<MusterSeite />} /> <Route path="/muster" element={<MusterSeite />} />
<Route path="/angebot" element={<AngebotSeite />} />
{/* Textmengen-Tool – öffentlich, Direktlink /textmenge. */} {/* Textmengen-Tool – öffentlich, Direktlink /textmenge. */}
<Route path="/textmenge" element={<Textmenge />} /> <Route path="/textmenge" element={<Textmenge />} />
<Route <Route

View File

@@ -180,7 +180,7 @@ function Angebot({ onClose, vorbelegung }: { onClose: () => void; vorbelegung?:
export function Muster({ onClose = () => {}, variant = 'dialog' }: { onClose?: () => void; variant?: 'dialog' | 'page' }) { export function Muster({ onClose = () => {}, variant = 'dialog' }: { onClose?: () => void; variant?: 'dialog' | 'page' }) {
const [produkte, setProdukte] = useState<Product[]>([]); const [produkte, setProdukte] = useState<Product[]>([]);
const [form, setForm] = useState({ const [form, setForm] = useState({
product: '', name: '', email: '', phone: '', product: '', first_name: '', last_name: '', email: '', phone: '',
street: '', zip: '', city: '', country: 'Deutschland', message: '', street: '', zip: '', city: '', country: 'Deutschland', message: '',
}); });
const [datenschutz, setDatenschutz] = useState(false); const [datenschutz, setDatenschutz] = useState(false);
@@ -195,7 +195,8 @@ export function Muster({ onClose = () => {}, variant = 'dialog' }: { onClose?: (
fetchMyCustomer() fetchMyCustomer()
.then((c) => c && setForm((f) => ({ .then((c) => c && setForm((f) => ({
...f, ...f,
name: [c.first_name, c.last_name].filter(Boolean).join(' ') || f.name, first_name: c.first_name || f.first_name,
last_name: c.last_name || f.last_name,
email: c.email || f.email, email: c.email || f.email,
phone: c.phone || f.phone, phone: c.phone || f.phone,
}))) })))
@@ -216,7 +217,8 @@ export function Muster({ onClose = () => {}, variant = 'dialog' }: { onClose?: (
try { try {
await sendSampleRequest({ await sendSampleRequest({
product: form.product, product: form.product,
name: form.name.trim(), first_name: form.first_name.trim(),
last_name: form.last_name.trim(),
email: form.email.trim(), email: form.email.trim(),
phone: form.phone.trim() || undefined, phone: form.phone.trim() || undefined,
street: form.street.trim(), street: form.street.trim(),
@@ -259,7 +261,7 @@ export function Muster({ onClose = () => {}, variant = 'dialog' }: { onClose?: (
</div> </div>
); );
const gueltig = form.product && form.name.trim() && istEmail(form.email) && form.phone.trim() const gueltig = form.product && form.first_name.trim() && form.last_name.trim() && istEmail(form.email) && form.phone.trim()
&& form.street.trim() && form.zip.trim() && form.city.trim() && datenschutz; && form.street.trim() && form.zip.trim() && form.city.trim() && datenschutz;
return wrap('Muster bestellen', ( return wrap('Muster bestellen', (
@@ -275,12 +277,13 @@ export function Muster({ onClose = () => {}, variant = 'dialog' }: { onClose?: (
{produkte.map((p) => <option key={p.key} value={p.key}>{p.name}</option>)} {produkte.map((p) => <option key={p.key} value={p.key}>{p.name}</option>)}
</select> </select>
</div> </div>
{feld('name', 'Name')} {feld('first_name', 'Vorname')}
{feld('last_name', 'Nachname')}
{feld('email', 'E-Mail-Adresse', false, 'email')} {feld('email', 'E-Mail-Adresse', false, 'email')}
{feld('phone', 'Telefon', false, 'tel')} {feld('phone', 'Telefon', false, 'tel')}
{feld('street', 'Straße und Hausnummer')} {feld('street', 'Straße und Hausnummer')}
{feld('zip', 'PLZ')} {feld('zip', 'PLZ')}
{feld('city', 'Stadt')} {feld('city', 'Ort')}
<div className="sk-field"> <div className="sk-field">
<label className="sk-label sk-label--required" htmlFor="m-country">Land</label> <label className="sk-label sk-label--required" htmlFor="m-country">Land</label>
<select id="m-country" className="sk-input" value={form.country} onChange={set('country')}> <select id="m-country" className="sk-input" value={form.country} onChange={set('country')}>
@@ -398,10 +401,10 @@ function Sidebar({ onNavigate }: { onNavigate?: () => void }) {
<IconMail /> <IconMail />
<span>Muster bestellen</span> <span>Muster bestellen</span>
</NavLink> </NavLink>
<button className="sk-nav-item sk-nav-item--quiet" onClick={() => { open('angebot'); onNavigate?.(); }}> <NavLink to="/angebot" className="sk-nav-item sk-nav-item--quiet" onClick={onNavigate}>
<IconOffer /> <IconOffer />
<span>Individuelles Angebot</span> <span>Individuelles Angebot</span>
</button> </NavLink>
<button className="sk-nav-item sk-nav-item--quiet" onClick={() => { open('hilfe'); onNavigate?.(); }}> <button className="sk-nav-item sk-nav-item--quiet" onClick={() => { open('hilfe'); onNavigate?.(); }}>
<IconHelp /> <IconHelp />
<span>Hilfe</span> <span>Hilfe</span>

View File

@@ -15,7 +15,7 @@ const istEmail = (e: string) => /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(e.trim());
*/ */
export default function OfferForm({ produkt, onClose }: { produkt?: string; onClose?: () => void }) { export default function OfferForm({ produkt, onClose }: { produkt?: string; onClose?: () => void }) {
const gewaehltesProdukt = produkt?.trim() || ''; const gewaehltesProdukt = produkt?.trim() || '';
const [form, setForm] = useState({ name: '', email: '', phone: '', quantity: '', message: '' }); const [form, setForm] = useState({ first_name: '', last_name: '', email: '', phone: '', quantity: '', message: '' });
const [datenschutz, setDatenschutz] = useState(false); const [datenschutz, setDatenschutz] = useState(false);
const [status, setStatus] = useState<'formular' | 'sendet' | 'fertig'>('formular'); const [status, setStatus] = useState<'formular' | 'sendet' | 'fertig'>('formular');
const [fehler, setFehler] = useState<string[]>([]); const [fehler, setFehler] = useState<string[]>([]);
@@ -28,7 +28,8 @@ export default function OfferForm({ produkt, onClose }: { produkt?: string; onCl
if (!c) return; if (!c) return;
setForm((f) => ({ setForm((f) => ({
...f, ...f,
name: [c.first_name, c.last_name].filter(Boolean).join(' ') || f.name, first_name: c.first_name || f.first_name,
last_name: c.last_name || f.last_name,
email: c.email || f.email, email: c.email || f.email,
phone: c.phone || f.phone, phone: c.phone || f.phone,
})); }));
@@ -49,7 +50,8 @@ export default function OfferForm({ produkt, onClose }: { produkt?: string; onCl
setStatus('sendet'); setStatus('sendet');
try { try {
await sendOfferRequest({ await sendOfferRequest({
name: form.name.trim(), first_name: form.first_name.trim(),
last_name: form.last_name.trim(),
email: form.email.trim(), email: form.email.trim(),
phone: form.phone.trim() || undefined, phone: form.phone.trim() || undefined,
quantity: form.quantity ? Number(form.quantity) : null, quantity: form.quantity ? Number(form.quantity) : null,
@@ -90,8 +92,12 @@ export default function OfferForm({ produkt, onClose }: { produkt?: string; onCl
)} )}
<form style={{ marginTop: 'var(--sk-space-4)' }} onSubmit={absenden}> <form style={{ marginTop: 'var(--sk-space-4)' }} onSubmit={absenden}>
<div className="sk-field"> <div className="sk-field">
<label className="sk-label" htmlFor="a-name">Name</label> <label className="sk-label" htmlFor="a-vorname">Vorname</label>
<input id="a-name" className="sk-input" value={form.name} onChange={set('name')} required /> <input id="a-vorname" className="sk-input" value={form.first_name} onChange={set('first_name')} required />
</div>
<div className="sk-field">
<label className="sk-label" htmlFor="a-nachname">Nachname</label>
<input id="a-nachname" className="sk-input" value={form.last_name} onChange={set('last_name')} required />
</div> </div>
<div className="sk-field"> <div className="sk-field">
<label className="sk-label" htmlFor="a-mail">E-Mail</label> <label className="sk-label" htmlFor="a-mail">E-Mail</label>

View File

@@ -527,7 +527,8 @@ export async function uploadFile(datei: File): Promise<string> {
/* ── Angebotsanfrage ──────────────────────────────────────────────────────── */ /* ── Angebotsanfrage ──────────────────────────────────────────────────────── */
export type OfferRequest = { export type OfferRequest = {
name: string; first_name: string;
last_name: string;
email: string; email: string;
phone?: string; phone?: string;
quantity?: number | null; quantity?: number | null;
@@ -544,7 +545,8 @@ export async function sendOfferRequest(input: OfferRequest) {
export type SampleRequest = { export type SampleRequest = {
product: string; product: string;
name: string; first_name: string;
last_name: string;
email: string; email: string;
phone?: string; phone?: string;
street: string; street: string;

13
src/routes/Angebot.tsx Normal file
View File

@@ -0,0 +1,13 @@
import { useNavigate } from 'react-router-dom';
import OfferForm from '../components/OfferForm';
/** Individuelles Angebot als eigene Seite (Direktlink /angebot) – kein Popup. */
export default function AngebotSeite() {
const navigate = useNavigate();
return (
<div className="sk-view">
<h1>Individuelles Angebot anfordern</h1>
<OfferForm onClose={() => navigate('/')} />
</div>
);
}