Bugfixes im Dating und im Profil

2026-04-04 15:45:55 +02:00
parent d386f5a7a9
commit b81ad25c9f
427 changed files with 4796 additions and 324 deletions
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -55,6 +55,7 @@ server.port=8080
 server.servlet.context-path=/
 server.shutdown=graceful
 spring.lifecycle.timeout-per-shutdown-phase=5s
+server.tomcat.max-http-header-size=65536

 # Jackson – Datumsformat als ISO-8601 String statt numerischem Array
 spring.jackson.serialization.write-dates-as-timestamps=false
--- a/src/main/resources/static/community/benutzer.html
+++ b/src/main/resources/static/community/benutzer.html
@@ -74,22 +74,60 @@
        .profil-actions {
            display: flex;
            gap: 0.5rem;
-            justify-content: center;
-            flex-wrap: wrap;
+            align-items: center;
            width: 100%;
            padding: 0.85rem 0;
            border-top: 1px solid var(--color-secondary);
            border-bottom: 1px solid var(--color-secondary);
            margin: 0.5rem 0 0.25rem;
        }
-
        .profil-actions:empty { display: none; }
+        .profil-actions-spacer { flex: 1; }
+
+        /* Aktionen-Dropdown */
+        .aktionen-wrap { position: relative; }
+        .aktionen-btn {
+            background: none; border: 1px solid var(--color-secondary);
+            color: var(--color-muted); border-radius: 6px;
+            padding: 0.55rem 1.2rem; cursor: pointer;
+            display: flex; align-items: center; gap: 0.35rem; margin: 0; width: auto;
+        }
+        .aktionen-btn:hover { color: var(--color-text); }
+        .aktionen-menu {
+            display: none; position: absolute; right: 0; top: calc(100% + 6px);
+            background: var(--color-card); border: 1px solid var(--color-secondary);
+            border-radius: 8px; min-width: 190px; z-index: 200;
+            box-shadow: 0 6px 24px rgba(0,0,0,0.55); overflow: hidden;
+        }
+        .aktionen-menu.open { display: block; }
+        .aktionen-wrap .aktionen-menu button {
+            display: block; width: 100%; text-align: left; box-sizing: border-box;
+            background: none; border: none;
+            border-bottom: 1px solid var(--color-secondary);
+            color: var(--color-text); padding: 0.65rem 1rem;
+            font-size: 0.9rem; cursor: pointer; margin: 0; border-radius: 0;
+        }
+        .aktionen-wrap .aktionen-menu button:last-child { border-bottom: none; }
+        .aktionen-wrap .aktionen-menu button:hover { background: var(--color-secondary); }
+        .aktionen-wrap .aktionen-menu button.danger { color: #c0392b; }
+        .aktionen-wrap .aktionen-menu button:disabled { color: var(--color-muted); cursor: default; }
+
+        /* Match-Name */
+        .profil-name.is-match {
+            border: 2px solid var(--color-primary);
+            border-radius: 8px; padding: 0.15rem 0.75rem;
+        }

        .profil-actions button,
        .profil-actions a.btn {
            margin-top: 0;
            width: auto;
            padding: 0.55rem 1.2rem;
+            display: inline-flex;
+            align-items: center;
+            line-height: 1;
+            box-sizing: border-box;
+            font-size: 0.9rem;
        }

        /* ── Section labels ── */
@@ -104,6 +142,86 @@
            padding-top: 1.5rem;
        }

+        /* ── Profil-Dates ── */
+        #datesList {
+            display: grid;
+            grid-template-columns: repeat(auto-fill, minmax(220px, 1fr));
+            gap: 1rem;
+        }
+        .date-card {
+            background: var(--color-card);
+            border: 1px solid var(--color-secondary);
+            border-radius: 12px;
+            overflow: hidden;
+            cursor: pointer;
+            transition: border-color 0.15s, box-shadow 0.15s;
+            display: flex;
+            flex-direction: column;
+        }
+        .date-card:hover { border-color: var(--color-primary); box-shadow: 0 4px 18px rgba(0,0,0,0.35); }
+        .date-card-img {
+            width: 100%; aspect-ratio: 16/9;
+            background: var(--color-secondary);
+            display: flex; align-items: center; justify-content: center;
+            font-size: 2.5rem; color: var(--color-muted);
+            overflow: hidden; flex-shrink: 0;
+        }
+        .date-card-img img { width: 100%; height: 100%; object-fit: cover; }
+        .date-card-body { padding: 0.75rem; display: flex; flex-direction: column; gap: 0.4rem; flex: 1; }
+        .date-card-title { font-weight: 700; font-size: 0.95rem; line-height: 1.3; }
+        .date-card-desc {
+            font-size: 0.78rem; color: var(--color-muted); line-height: 1.4;
+            overflow: hidden; display: -webkit-box;
+            -webkit-line-clamp: 2; -webkit-box-orient: vertical;
+        }
+        .date-card-footer {
+            display: flex; align-items: center; gap: 0.5rem;
+            padding: 0.5rem 0.75rem;
+            border-top: 1px solid var(--color-secondary);
+            font-size: 0.76rem; flex-shrink: 0;
+        }
+        .date-card-meta { color: var(--color-muted); white-space: nowrap; }
+        .date-card-date { color: var(--color-muted); font-size: 0.73rem; }
+        /* ── Profil-Date-Dialog (gleiche Optik wie auf der Dates-Seite) ── */
+        .date-dialog-bg {
+            display: none; position: fixed; inset: 0;
+            background: rgba(0,0,0,0.65); z-index: 500;
+            align-items: center; justify-content: center; padding: 1rem;
+        }
+        .date-dialog-bg.open { display: flex; }
+        .date-dialog {
+            background: var(--color-card); border-radius: 16px;
+            width: 100%; max-width: 520px; max-height: 92vh;
+            overflow-y: auto; position: relative; display: flex; flex-direction: column;
+        }
+        .date-dialog-img {
+            width: 100%; aspect-ratio: 16/9; background: var(--color-secondary);
+            display: flex; align-items: center; justify-content: center;
+            font-size: 3rem; color: var(--color-muted);
+            overflow: hidden; flex-shrink: 0; border-radius: 16px 16px 0 0;
+        }
+        .date-dialog-img img { width: 100%; height: 100%; object-fit: cover; }
+        .date-dialog-body { padding: 1.25rem; display: flex; flex-direction: column; gap: 0.75rem; }
+        .date-dialog-close {
+            position: absolute; top: 0.75rem; right: 0.85rem;
+            background: rgba(0,0,0,0.45); border: none; color: #fff;
+            width: 2rem; height: 2rem; border-radius: 50%;
+            font-size: 1rem; cursor: pointer;
+            display: flex; align-items: center; justify-content: center;
+            padding: 0; z-index: 1;
+        }
+        .date-dialog-close:hover { background: rgba(0,0,0,0.65); }
+        .date-dialog-title { font-size: 1.2rem; font-weight: 700; line-height: 1.3; }
+        .date-dialog-when { display: flex; align-items: center; gap: 0.4rem; font-size: 0.85rem; color: var(--color-muted); }
+        .date-dialog-desc {
+            background: var(--color-secondary); border-radius: 8px;
+            padding: 0.85rem 1rem; font-size: 0.9rem; line-height: 1.55; white-space: pre-wrap;
+        }
+        .date-dialog-stats { font-size: 0.82rem; color: var(--color-muted); }
+        .date-dialog-actions { display: flex; gap: 0.6rem; flex-wrap: wrap; }
+        .date-interest-btn { flex: 1; min-width: 120px; }
+        .date-interest-btn.active { background: var(--color-primary); color: #fff; }
+
        /* ── Gallery Carousel ── */
        .gallery-strip {
            display: grid;
@@ -183,7 +301,8 @@
            align-items: center;
            gap: 0.3rem;
            cursor: pointer;
-            flex: 0 0 calc(20% - 0.6rem);
+            flex: 0 0 76px;
+            width: 76px;
            min-width: 0;
        }

@@ -208,7 +327,7 @@
            white-space: nowrap;
            overflow: hidden;
            text-overflow: ellipsis;
-            max-width: 64px;
+            width: 76px;
        }

        .friend-thumb:hover span { color: var(--color-primary); }
@@ -397,7 +516,8 @@
        /* ── Post / Bild Lightbox ── */
        .lightbox { display:none; position:fixed; inset:0; background:rgba(0,0,0,0.88); z-index:400; align-items:center; justify-content:center; }
        .lightbox.open { display:flex; }
-        .lb-layout { display:flex; max-width:920px; width:95vw; max-height:90vh; background:var(--color-card); border-radius:12px; overflow:hidden; position:relative; }
+        .lb-layout { display:flex; max-width:min(1340px, calc(100vw - 2rem)); width:95vw; height:min(90vh, 1100px); background:var(--color-card); border-radius:12px; overflow:hidden; position:relative; }
+        .lb-post-side .post-bild { max-height:1024px; }
        .lb-close { position:absolute; top:0.6rem; right:0.6rem; background:rgba(0,0,0,0.55); border:none; color:#fff; font-size:1.1rem; width:2rem; height:2rem; border-radius:50%; cursor:pointer; z-index:10; display:flex; align-items:center; justify-content:center; padding:0; margin:0; }
        .lb-post-side { flex:1; overflow-y:auto; padding:1.25rem; border-right:1px solid var(--color-secondary); min-width:0; }
        .lb-comments-panel { width:300px; flex-shrink:0; display:flex; flex-direction:column; }
@@ -410,7 +530,7 @@
        .lb-comment-compose button { width:auto; margin:0; padding:0.35rem 0.75rem; font-size:0.8rem; }
        .lb-img-nav { display:flex; gap:0.75rem; align-items:center; justify-content:center; margin-top:0.75rem; flex-wrap:wrap; }
        .compose-action-btn { background:none; border:1px solid var(--color-secondary); color:var(--color-muted); border-radius:6px; padding:0.35rem 0.6rem; font-size:0.95rem; cursor:pointer; margin:0; width:auto; }
-        @media (max-width:650px) { .lb-layout { flex-direction:column; max-height:95vh; } .lb-post-side { border-right:none; border-bottom:1px solid var(--color-secondary); max-height:55vh; } .lb-comments-panel { width:100%; } }
+        @media (max-width:650px) { .lb-layout { flex-direction:column; height:95vh; } .lb-post-side { border-right:none; border-bottom:1px solid var(--color-secondary); max-height:55vh; } .lb-comments-panel { width:100%; } }
    </style>
 </head>
 <body class="app">
@@ -450,15 +570,23 @@
                <div id="vorliebenDisplay"></div>
            </div>

+            <!-- Dates -->
+            <div id="datesSection" style="display:none; margin-top:1rem;">
+                <div class="section-label">Dates</div>
+                <div id="datesList"></div>
+            </div>
+
            <!-- Freunde -->
            <div id="friendsSection" style="display:none; margin-top:1rem;">
-                <div class="section-label">Freunde <span id="friendsCount" style="font-weight:400;color:var(--color-muted);font-size:0.85rem;"></span></div>
-                <div class="friends-strip" id="friendsStrip"></div>
-                <div class="gallery-nav" id="friendsNav" style="display:none;">
-                    <button id="friendsPrev" onclick="friendsPage(-1)" disabled>&#8592;</button>
-                    <span class="gallery-pos" id="friendsPos"></span>
-                    <button id="friendsNext" onclick="friendsPage(1)">&#8594;</button>
+                <div style="display:flex; align-items:center; justify-content:space-between;">
+                    <div class="section-label" style="margin-bottom:0.5rem;">Freunde <span id="friendsCount" style="font-weight:400;color:var(--color-muted);font-size:0.85rem;"></span></div>
+                    <div id="friendsNav" style="display:none; align-items:center; gap:0.3rem; flex-shrink:0;">
+                        <button id="friendsPrev" onclick="friendsPage(-1)" disabled style="padding:0.2rem 0.6rem; font-size:0.85rem;">&#8592;</button>
+                        <span class="gallery-pos" id="friendsPos"></span>
+                        <button id="friendsNext" onclick="friendsPage(1)" style="padding:0.2rem 0.6rem; font-size:0.85rem;">&#8594;</button>
+                    </div>
                </div>
+                <div class="friends-strip" id="friendsStrip"></div>
            </div>

            <!-- Tabs: Feed | Pinnwand | Spielhistorie | Keyholder-Angebote -->
@@ -617,6 +745,11 @@
                renderGallery();
            }

+            // ── Dates (nur wenn Besucher selbst Dating aktiviert hat und Profil-User auch) ──
+            if (me && me.datingAktiv && profile.datingAktiv) {
+                loadProfilDates(profile.userId);
+            }
+
            // ── Freunde ──
            if (canSee(profile.sichtbarkeitFreunde, isFriend, isOwnProfile)) {
                loadFriends();
@@ -691,30 +824,91 @@
            // eigenes Profil im Preview-Modus – keine Aktionsbuttons anzeigen
            actions.innerHTML = '';
        } else {
-            let html = '';
            if (!blockedByMe) {
-                html += `<a href="/community/nachrichten.html?userId=${profile.userId}" class="btn">✉ Nachricht</a>`;
+                let friendItem = '';
                if (profile.friendStatus === 'PENDING_SENT') {
-                    html += ` <button disabled>Anfrage gesendet</button>`;
+                    friendItem = `<button disabled>Anfrage gesendet</button>`;
                } else if (profile.friendStatus === 'PENDING_RECEIVED') {
-                    html += ` <button id="friendActionBtn" onclick="acceptFriend()">✓ Anfrage annehmen</button>`;
+                    friendItem = `<button id="friendActionBtn" onclick="closeAktionen();acceptFriend()">✓ Anfrage annehmen</button>`;
                } else if (profile.friendStatus !== 'FRIEND') {
-                    html += ` <button id="friendActionBtn" onclick="addFriend()">+ Freund hinzufügen</button>`;
+                    friendItem = `<button id="friendActionBtn" onclick="closeAktionen();addFriend()">+ Freund hinzufügen</button>`;
                }
-                html += ` <button onclick="openMeldungDialog('PROFIL','${profile.userId}')" style="background:none;border:1px solid var(--color-secondary);color:var(--color-muted);border-radius:6px;padding:0.4rem 0.8rem;cursor:pointer;font-size:0.85rem;">⚑ Melden</button>`;
-                html += ` <button onclick="confirmBlock('${profile.userId}','${esc(profile.name)}')" style="background:none;border:1px solid #7a1a1a;color:#c0392b;border-radius:6px;padding:0.4rem 0.8rem;cursor:pointer;font-size:0.85rem;">⊘ Blockieren</button>`;
+                actions.innerHTML = `
+                    <div class="profil-actions-spacer"></div>
+                    <div id="profileActionsCenter" style="display:flex;gap:0.5rem;align-items:center;">
+                        <a href="/community/nachrichten.html?userId=${profile.userId}" class="btn">✉ Nachricht</a>
+                        ${friendItem}
+                        <div class="aktionen-wrap">
+                            <button class="aktionen-btn" onclick="toggleAktionen(event)">Aktionen ▾</button>
+                            <div class="aktionen-menu" id="aktionenMenu">
+                                <button onclick="closeAktionen();openMeldungDialog('PROFIL','${profile.userId}')">⚑ Melden</button>
+                                <button class="danger" onclick="closeAktionen();confirmBlock('${profile.userId}','${esc(profile.name)}')">⊘ Blockieren</button>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="profil-actions-spacer"></div>`;
            } else {
-                html += `<button onclick="unblockUser('${profile.userId}')" style="background:none;border:1px solid var(--color-secondary);color:var(--color-muted);border-radius:6px;padding:0.4rem 0.8rem;cursor:pointer;font-size:0.85rem;">Blockierung aufheben</button>`;
+                actions.innerHTML = `<button onclick="unblockUser('${profile.userId}')" style="background:none;border:1px solid var(--color-secondary);color:var(--color-muted);border-radius:6px;padding:0.4rem 0.8rem;cursor:pointer;font-size:0.85rem;">Blockierung aufheben</button>`;
            }
-            actions.innerHTML = html;

            // Dating-Like-Button – nur anzeigen wenn Ziel-User Dating aktiviert hat und nicht blockiert
            if (profile.datingAktiv && !blockedByMe) {
                loadDatingLikeButton(profile.userId);
            }
+
+            // Match-Badge laden
+            if (!blockedByMe) {
+                loadMatchBadge(profile.userId, profile.name);
+            }
        }
    }

+    async function loadMatchBadge(userId, userName) {
+        try {
+            const res = await fetch('/dating/match/' + userId);
+            if (!res.ok) return;
+            const data = await res.json();
+            if (!data.isMatch) return;
+            // Wrap name with heart emojis + red border
+            const nameEl = document.getElementById('profileName');
+            nameEl.textContent = `💕 ${nameEl.textContent} 💕`;
+            nameEl.classList.add('is-match');
+            // Add "Match auflösen" to Aktionen dropdown
+            const menu = document.getElementById('aktionenMenu');
+            if (menu) {
+                const btn = document.createElement('button');
+                btn.className = 'danger';
+                btn.textContent = '💔 Match auflösen';
+                btn.onclick = () => { closeAktionen(); confirmUnmatch(userId, userName); };
+                menu.appendChild(btn);
+            }
+        } catch { /* Dating evtl. nicht aktiv – ignorieren */ }
+    }
+
+    async function confirmUnmatch(userId, userName) {
+        if (!confirm(`Match mit ${userName} wirklich auflösen?\n\nBeide Likes werden entfernt.`)) return;
+        try {
+            await fetch('/dating/match/' + userId, { method: 'DELETE' });
+            // Remove match styling from name
+            const nameEl = document.getElementById('profileName');
+            nameEl.textContent = nameEl.textContent.replace(/^💕 /, '').replace(/ 💕$/, '');
+            nameEl.classList.remove('is-match');
+            // Remove button from dropdown
+            document.getElementById('aktionenMenu')?.querySelectorAll('button').forEach(b => {
+                if (b.textContent.includes('Match auflösen')) b.remove();
+            });
+        } catch { alert('Fehler beim Auflösen des Matches.'); }
+    }
+
+    window.toggleAktionen = function(e) {
+        e.stopPropagation();
+        document.getElementById('aktionenMenu')?.classList.toggle('open');
+    };
+    window.closeAktionen = function() {
+        document.getElementById('aktionenMenu')?.classList.remove('open');
+    };
+    document.addEventListener('click', () => closeAktionen());
+
    // ── Privacy helpers ──
    function canSee(sichtbarkeit, isFriend, isOwn) {
        if (isOwn || !sichtbarkeit) return true;
@@ -754,6 +948,107 @@

    }

+    // ── Profil-Dates ──
+    async function loadProfilDates(userId) {
+        try {
+            const res = await fetch('/dating/dates/by-user/' + userId);
+            if (!res.ok) return;
+            const dates = await res.json();
+            if (!dates.length) return;
+
+            const section = document.getElementById('datesSection');
+            const list    = document.getElementById('datesList');
+            list.innerHTML = '';
+            dates.forEach(d => {
+                const card = document.createElement('div');
+                card.className = 'date-card';
+                const thumb = d.imageData
+                    ? `<img src="${escV(d.imageData)}" alt="">`
+                    : '📅';
+                const dateHint = d.scheduledAt
+                    ? `<div class="date-card-date">🗓️ ${formatProfilDate(d.scheduledAt)}</div>` : '';
+                card.innerHTML = `
+                    <div class="date-card-img">${thumb}</div>
+                    <div class="date-card-body">
+                        <div class="date-card-title">${escV(d.title)}</div>
+                        <div class="date-card-desc">${escV(d.description)}</div>
+                        ${dateHint}
+                    </div>
+                    <div class="date-card-footer">
+                        <span class="date-card-meta">♥ ${d.interestCount}</span>
+                    </div>`;
+                card.addEventListener('click', () => openProfilDateDialog(d));
+                list.appendChild(card);
+            });
+            section.style.display = '';
+        } catch(e) { /* ignorieren */ }
+    }
+
+    function formatProfilDate(iso) {
+        if (!iso) return '';
+        try {
+            const d = new Date(iso);
+            return d.toLocaleString('de-DE', { day:'2-digit', month:'2-digit', year:'numeric', hour:'2-digit', minute:'2-digit' });
+        } catch { return iso; }
+    }
+
+    // ── Profil-Date-Dialog ──
+    let _profilDateCurrent = null;
+
+    function openProfilDateDialog(d) {
+        _profilDateCurrent = d;
+
+        document.getElementById('pddImg').innerHTML = d.imageData
+            ? `<img src="${escV(d.imageData)}" alt="">` : '📅';
+
+        document.getElementById('pddTitle').textContent = d.title;
+
+        const whenEl = document.getElementById('pddWhen');
+        if (d.scheduledAt) {
+            whenEl.textContent = '🗓️ ' + formatProfilDate(d.scheduledAt);
+            whenEl.style.display = '';
+        } else {
+            whenEl.style.display = 'none';
+        }
+
+        document.getElementById('pddDesc').textContent = d.description;
+        document.getElementById('pddStats').textContent =
+            d.interestCount + ' Person' + (d.interestCount === 1 ? '' : 'en') + ' interessiert';
+
+        const btn = document.getElementById('pddInterestBtn');
+        btn.className = 'btn date-interest-btn' + (d.myInterest ? ' active' : '');
+        btn.textContent = d.myInterest ? '♥ Interesse bekundet' : '♥ Interesse bekunden';
+        btn.disabled = false;
+
+        document.getElementById('profilDateDialogBg').classList.add('open');
+    }
+
+    window.closeProfilDateDialog = function(e) {
+        if (e && e.target !== document.getElementById('profilDateDialogBg')) return;
+        document.getElementById('profilDateDialogBg').classList.remove('open');
+    };
+    window.closeProfilDateDialogBtn = function() {
+        document.getElementById('profilDateDialogBg').classList.remove('open');
+    };
+
+    window.toggleProfilDateInterest = async function() {
+        if (!_profilDateCurrent) return;
+        const btn = document.getElementById('pddInterestBtn');
+        btn.disabled = true;
+        try {
+            const res = await fetch('/dating/dates/' + _profilDateCurrent.dateId + '/interest', { method: 'POST' });
+            if (!res.ok) return;
+            const data = await res.json();
+            _profilDateCurrent = { ..._profilDateCurrent, myInterest: data.myInterest, interestCount: data.interestCount };
+            btn.className = 'btn date-interest-btn' + (data.myInterest ? ' active' : '');
+            btn.textContent = data.myInterest ? '♥ Interesse bekundet' : '♥ Interesse bekunden';
+            document.getElementById('pddStats').textContent =
+                data.interestCount + ' Person' + (data.interestCount === 1 ? '' : 'en') + ' interessiert';
+        } finally {
+            btn.disabled = false;
+        }
+    };
+
    // ── Vorlieben anzeigen ──
    const BEWERTUNG_ORDER = ['UNBEDINGT','MAG_ICH','WILL_AUSPROBIEREN','NEUTRAL','EHER_NICHT','GEHT_GAR_NICHT'];
    const BEWERTUNG_LABEL = {
@@ -792,6 +1087,7 @@
                if (!grouped[bw]) grouped[bw] = [];
                grouped[bw].push(itemNames[itemId] || itemId);
            });
+            Object.values(grouped).forEach(names => names.sort((a, b) => a.localeCompare(b, 'de')));

            const visibleGroups = BEWERTUNG_ORDER.filter(bw => grouped[bw]?.length);
            if (!visibleGroups.length) {
@@ -919,7 +1215,7 @@

        const nav = document.getElementById('friendsNav');
        if (allFriends.length > FRIENDS_PAGE) {
-            nav.style.display = '';
+            nav.style.display = 'flex';
            document.getElementById('friendsPrev').disabled = friendsOffset === 0;
            document.getElementById('friendsNext').disabled = friendsOffset + FRIENDS_PAGE >= allFriends.length;
            const cur = Math.floor(friendsOffset / FRIENDS_PAGE) + 1;
@@ -959,7 +1255,7 @@
        const likeClass = img.likedByMe ? ' active' : '';
        document.getElementById('lbPostBody').innerHTML = `
            <img src="data:image/jpeg;base64,${img.imageData}" alt=""
-                 style="width:100%;max-height:360px;object-fit:contain;border-radius:8px;display:block;">
+                 style="width:100%;max-height:1024px;object-fit:contain;border-radius:8px;display:block;">
            <div class="lb-img-nav">
                <button class="post-action-btn" ${prevDisabled} onclick="lbGalleryNav(-1)">← Zurück</button>
                ${!isOwnProfile ? `<button class="post-action-btn${likeClass}" id="lbImgLikeBtn" onclick="lbToggleImageLike()">
@@ -1473,8 +1769,8 @@
        const btn = document.createElement('button');
        btn.id = 'datingLikeBtn';
        btn.title = liked ? 'Unlike' : 'Like';
-        btn.style.cssText = 'padding:0.4rem 0.9rem;font-size:0.9rem;' +
-            (liked ? 'background:var(--color-primary);color:#fff;' : 'background:none;border:1px solid var(--color-primary);color:var(--color-primary);') +
+        btn.style.cssText = 'padding:0.55rem 1.2rem;font-size:0.9rem;' +
+            (liked ? 'background:var(--color-primary);color:#fff;border:none;' : 'background:none;border:1px solid var(--color-primary);color:var(--color-primary);') +
            'border-radius:6px;cursor:pointer;';
        btn.textContent = liked ? '♥ Liked' : '♥ Liken';
        btn.addEventListener('click', async () => {
@@ -1504,8 +1800,35 @@
                btn.disabled = false;
            }
        });
-        document.getElementById('profileActions').appendChild(btn);
+        const center = document.getElementById('profileActionsCenter');
+        if (center) {
+            const aktionenWrap = center.querySelector('.aktionen-wrap');
+            if (aktionenWrap) {
+                center.insertBefore(btn, aktionenWrap);
+            } else {
+                center.appendChild(btn);
+            }
+        } else {
+            document.getElementById('profileActions').appendChild(btn);
+        }
    }
 </script>
+
+<!-- ── Profil-Date-Dialog ── -->
+<div id="profilDateDialogBg" class="date-dialog-bg" onclick="closeProfilDateDialog(event)">
+    <div class="date-dialog">
+        <button class="date-dialog-close" onclick="closeProfilDateDialogBtn()">✕</button>
+        <div class="date-dialog-img" id="pddImg"></div>
+        <div class="date-dialog-body">
+            <div class="date-dialog-title" id="pddTitle"></div>
+            <div class="date-dialog-when" id="pddWhen" style="display:none;"></div>
+            <div class="date-dialog-desc" id="pddDesc"></div>
+            <div class="date-dialog-stats" id="pddStats"></div>
+            <div class="date-dialog-actions">
+                <button id="pddInterestBtn" class="btn date-interest-btn" onclick="toggleProfilDateInterest()">♥ Interesse bekunden</button>
+            </div>
+        </div>
+    </div>
+</div>
 </body>
 </html>
--- a/src/main/resources/static/community/feed.html
+++ b/src/main/resources/static/community/feed.html
@@ -71,7 +71,8 @@
        /* Lightbox */
        .lightbox { display:none; position:fixed; inset:0; background:rgba(0,0,0,0.88); z-index:300; align-items:center; justify-content:center; }
        .lightbox.open { display:flex; }
-        .lb-layout { display:flex; max-width:920px; width:95vw; max-height:90vh; background:var(--color-card); border-radius:12px; overflow:hidden; position:relative; }
+        .lb-layout { display:flex; max-width:min(1340px, calc(100vw - 2rem)); width:95vw; height:min(90vh, 1100px); background:var(--color-card); border-radius:12px; overflow:hidden; position:relative; }
+        .lb-post-side .post-bild { max-height:1024px; }
        .lb-close { position:absolute; top:0.6rem; right:0.6rem; background:rgba(0,0,0,0.55); border:none; color:#fff; font-size:1.1rem; width:2rem; height:2rem; border-radius:50%; cursor:pointer; z-index:10; display:flex; align-items:center; justify-content:center; padding:0; margin:0; }
        .lb-post-side { flex:1; overflow-y:auto; padding:1.25rem; border-right:1px solid var(--color-secondary); min-width:0; }
        .lb-comments-panel { width:300px; flex-shrink:0; display:flex; flex-direction:column; }
@@ -82,7 +83,7 @@
        .lb-comment-compose textarea:focus { border-color:var(--color-primary); }
        .lb-comment-compose-actions { display:flex; gap:0.5rem; justify-content:flex-end; }
        .lb-comment-compose button { width:auto; margin:0; padding:0.35rem 0.75rem; font-size:0.8rem; }
-        @media (max-width:650px) { .lb-layout { flex-direction:column; max-height:95vh; } .lb-post-side { border-right:none; border-bottom:1px solid var(--color-secondary); max-height:55vh; } .lb-comments-panel { width:100%; } }
+        @media (max-width:650px) { .lb-layout { flex-direction:column; height:95vh; } .lb-post-side { border-right:none; border-bottom:1px solid var(--color-secondary); max-height:55vh; } .lb-comments-panel { width:100%; } }

        /* Comment + Like-Stile kommen aus shared.js */
    </style>
--- a/src/main/resources/static/community/gruppe.html
+++ b/src/main/resources/static/community/gruppe.html
@@ -114,7 +114,8 @@
        /* Post lightbox */
        .lightbox { display:none; position:fixed; inset:0; background:rgba(0,0,0,0.88); z-index:300; align-items:center; justify-content:center; }
        .lightbox.open { display:flex; }
-        .lb-layout { display:flex; max-width:920px; width:95vw; max-height:90vh; background:var(--color-card); border-radius:12px; overflow:hidden; position:relative; }
+        .lb-layout { display:flex; max-width:min(1340px, calc(100vw - 2rem)); width:95vw; height:min(90vh, 1100px); background:var(--color-card); border-radius:12px; overflow:hidden; position:relative; }
+        .lb-post-side .post-bild { max-height:1024px; }
        .lb-close { position:absolute; top:0.6rem; right:0.6rem; background:rgba(0,0,0,0.55); border:none; color:#fff; font-size:1.1rem; width:2rem; height:2rem; border-radius:50%; cursor:pointer; z-index:10; display:flex; align-items:center; justify-content:center; padding:0; margin:0; }
        .lb-post-side { flex:1; overflow-y:auto; padding:1.25rem; border-right:1px solid var(--color-secondary); min-width:0; }
        .lb-comments-panel { width:300px; flex-shrink:0; display:flex; flex-direction:column; }
@@ -125,7 +126,7 @@
        .lb-comment-compose-actions { display:flex; gap:0.5rem; justify-content:flex-end; }
        .lb-comment-compose button { width:auto; margin:0; padding:0.35rem 0.75rem; font-size:0.8rem; }
        @media (max-width:650px) {
-            .lb-layout { flex-direction:column; max-height:95vh; }
+            .lb-layout { flex-direction:column; height:95vh; }
            .lb-post-side { border-right:none; border-bottom:1px solid var(--color-secondary); max-height:55vh; }
            .lb-comments-panel { width:100%; }
        }
--- a/src/main/resources/static/dating.html
+++ b/src/main/resources/static/dating.html
--- a/src/main/resources/static/js/image-viewer.js
+++ b/src/main/resources/static/js/image-viewer.js
@@ -147,8 +147,8 @@ class ImageViewer {
        s.textContent = `
 #imageViewer{display:none;position:fixed;inset:0;background:rgba(0,0,0,0.88);z-index:500;align-items:center;justify-content:center;padding:2rem}
 #imageViewer.open{display:flex}
-#ivLayout{display:flex;flex-direction:row;gap:1rem;height:min(78vh,660px);max-width:calc(100vw - 4rem);align-items:stretch}
-#ivImageSide{width:660px;flex-shrink:1;min-width:0;display:flex;flex-direction:column}
+#ivLayout{display:flex;flex-direction:row;gap:1rem;height:min(90vh,1024px);max-width:min(1340px,calc(100vw - 4rem));align-items:stretch}
+#ivImageSide{width:1024px;flex-shrink:1;min-width:0;display:flex;flex-direction:column}
 .iv-image-box{flex:1;position:relative;background:var(--color-card);border:1px solid var(--color-secondary);border-radius:12px;overflow:hidden;display:flex;align-items:center;justify-content:center}
 #ivImg{width:100%;height:100%;object-fit:contain;display:block}
 .iv-overlay{position:absolute;bottom:0;left:0;right:0;background:linear-gradient(transparent,rgba(0,0,0,0.6));border-radius:0 0 12px 12px;padding:2rem 0.75rem 0.6rem;display:flex;align-items:center;justify-content:space-between;gap:0.5rem}
--- a/src/main/resources/static/konto/einstellungen.html
+++ b/src/main/resources/static/konto/einstellungen.html
@@ -806,6 +806,20 @@
    </div>
 </div>

+<!-- Dating-Alter-Hinweis Modal -->
+<div class="modal-backdrop" id="datingAlterModal">
+    <div class="modal" style="max-width:360px;text-align:center;">
+        <h2>Geburtsdatum erforderlich</h2>
+        <p style="font-size:0.9rem;color:var(--color-muted);margin:0.5rem 0 1rem;">
+            Um Dating zu aktivieren, musst du zuerst dein Geburtsdatum hinterlegen.
+        </p>
+        <div class="modal-actions">
+            <button class="secondary" onclick="closeDatingAlterModal()">Abbrechen</button>
+            <button onclick="closeDatingAlterModal(); openGeburtsdatumDialog();">Jetzt eintragen</button>
+        </div>
+    </div>
+</div>
+
 <!-- Geburtsdatum Modal -->
 <div class="modal-backdrop" id="geburtsdatumModal">
    <div class="modal">
@@ -1067,7 +1081,7 @@
    }

    // Modal-Backdrop-Klick schließt Modals
-    ['nameModal','geburtsdatumModal','emailModal','deleteModal'].forEach(id => {
+    ['nameModal','geburtsdatumModal','emailModal','deleteModal','datingAlterModal'].forEach(id => {
        document.getElementById(id).addEventListener('click', e => {
            if (e.target === document.getElementById(id)) document.getElementById(id).classList.remove('visible');
        });
@@ -1245,10 +1259,13 @@

    // ── Dating ──────────────────────────────────────────────────────────────

+    let _myAge = null;
+
    async function loadDating() {
        const res = await fetch('/login/me');
        if (!res.ok) return;
        const user = await res.json();
+        if (user.alter != null) _myAge = user.alter;
        document.getElementById('datingAktiv').checked = !!user.datingAktiv;
        if (user.datingStadt) {
            const input = document.getElementById('datingStadt');
@@ -1333,10 +1350,51 @@
        updateDatingAgeSlider();
    })();

+    function closeDatingAlterModal() {
+        document.getElementById('datingAlterModal').classList.remove('visible');
+    }
+
    function onDatingToggle() {
-        const show = document.getElementById('datingAktiv').checked ? '' : 'none';
-        document.getElementById('datingStadtRow').style.display = show;
-        document.getElementById('datingSucheRow').style.display = show;
+        const aktiv = document.getElementById('datingAktiv').checked;
+
+        if (aktiv && _myAge == null) {
+            document.getElementById('datingAktiv').checked = false;
+            document.getElementById('datingAlterModal').classList.add('visible');
+            return;
+        }
+
+        document.getElementById('datingStadtRow').style.display  = aktiv ? '' : 'none';
+        document.getElementById('datingSucheRow').style.display  = aktiv ? '' : 'none';
+
+        if (!aktiv) {
+            // Alle Felder zurücksetzen
+            const stadtInput = document.getElementById('datingStadt');
+            stadtInput.value    = '';
+            stadtInput.readOnly = false;
+            document.getElementById('datingStadtClear').style.display = 'none';
+            _datingLat = null;
+            _datingLon = null;
+            document.getElementById('sucheWeiblich').checked  = false;
+            document.getElementById('sucheMaennlich').checked = false;
+            document.getElementById('sucheDivers').checked    = false;
+            document.getElementById('datingMaxDistanz').value = 50;
+            document.getElementById('datingDistValDisplay').textContent = '50 km';
+            _datingAgeFrom = 18;
+            _datingAgeTo   = 60;
+            updateDatingAgeSlider();
+        } else {
+            // Standardwerte setzen
+            document.getElementById('datingMaxDistanz').value = 50;
+            document.getElementById('datingDistValDisplay').textContent = '50 km';
+            if (_myAge != null) {
+                _datingAgeFrom = Math.max(18, _myAge - 10);
+                _datingAgeTo   = _myAge + 10;
+            } else {
+                _datingAgeFrom = 18;
+                _datingAgeTo   = 60;
+            }
+            updateDatingAgeSlider();
+        }
    }

    let _stadtSuggestTimer = null;
@@ -1436,6 +1494,13 @@
            msgEl.style.color = 'var(--color-primary)';
            return;
        }
+        const geschlechter = ['sucheWeiblich','sucheMaennlich','sucheDivers']
+            .filter(id => document.getElementById(id).checked);
+        if (aktiv && geschlechter.length === 0) {
+            msgEl.textContent = 'Bitte mindestens ein Geschlecht auswählen.';
+            msgEl.style.color = 'var(--color-primary)';
+            return;
+        }
        const btn = document.getElementById('saveDatingBtn');
        btn.disabled = true;
        try {
@@ -1447,9 +1512,7 @@
                    datingStadt: stadt || null,
                    datingLat: _datingLat,
                    datingLon: _datingLon,
-                    datingGeschlechter: ['sucheWeiblich','sucheMaennlich','sucheDivers']
-                        .filter(id => document.getElementById(id).checked)
-                        .map(id => document.getElementById(id).value),
+                    datingGeschlechter: geschlechter.map(id => document.getElementById(id).value),
                    datingMaxDistanzKm: parseInt(document.getElementById('datingMaxDistanz').value),
                    datingMinAlter: _datingAgeFrom,
                    datingMaxAlter: _datingAgeTo
--- a/src/main/resources/static/konto/profile.html
+++ b/src/main/resources/static/konto/profile.html
@@ -367,6 +367,24 @@

        <button class="full-width" id="saveBtn" onclick="saveProfile()">Profil speichern</button>

+        <div id="datingInfoSection" style="display:none;margin-top:1.5rem;">
+            <div class="gallery-section-label">Dating</div>
+            <div style="display:flex;flex-direction:column;gap:0.5rem;background:var(--color-secondary);border-radius:8px;padding:0.85rem 1rem;font-size:0.9rem;">
+                <div style="display:flex;align-items:center;gap:0.5rem;">
+                    <span style="color:var(--color-muted);min-width:90px;">Wohnort</span>
+                    <span id="datingInfoStadt" style="font-weight:600;">—</span>
+                </div>
+                <div style="display:flex;align-items:baseline;gap:0.5rem;">
+                    <span style="color:var(--color-muted);min-width:90px;">Suche nach</span>
+                    <div id="datingInfoGeschlechter" style="display:flex;flex-wrap:wrap;gap:0.35rem;"></div>
+                </div>
+            </div>
+            <a href="/konto/einstellungen.html#sec-dating"
+               style="display:inline-block;margin-top:0.5rem;font-size:0.8rem;color:var(--color-muted);">
+                → Dating-Einstellungen ändern
+            </a>
+        </div>
+
        <div class="gallery-section-label" style="margin-top:1.5rem;">Vorlieben</div>
        <p class="vorlieben-hint">Wähle für jede Vorliebe aus, wie du dazu stehst. Nicht ausgefüllte Einträge werden nicht angezeigt.</p>
        <div id="vorliebenSection"><p style="color:var(--color-muted);font-size:0.85rem;">Wird geladen…</p></div>
@@ -422,6 +440,15 @@
                updateCharCount();
            }
            myUserId = user.userId;
+            if (user.datingAktiv) {
+                document.getElementById('datingInfoSection').style.display = '';
+                document.getElementById('datingInfoStadt').textContent = user.datingStadt || '—';
+                const g = user.datingGeschlechter || [];
+                const labels = { WEIBLICH: '♀ weiblich', MAENNLICH: '♂ männlich', DIVERS: '⚧ divers' };
+                document.getElementById('datingInfoGeschlechter').innerHTML = g.length
+                    ? g.map(v => `<span style="padding:0.15rem 0.55rem;border-radius:20px;background:var(--color-card);font-size:0.8rem;">${labels[v] || v}</span>`).join('')
+                    : '<span style="color:var(--color-muted);">—</span>';
+            }
            loadOwnGallery();
            loadVorliebenEdit();
        })
--- a/src/main/resources/static/userhome.html
+++ b/src/main/resources/static/userhome.html
@@ -115,56 +115,55 @@
        <h1 style="margin:0 0 0.15rem;">Home</h1>
        <p class="welcome" id="greeting"></p>

-        <div class="game-grid">
-            <div class="game-card">
-                <div class="game-card-icon">♡</div>
-                <h2 class="game-card-title">Vanilla Game</h2>
-                <p class="game-card-desc">
-                    Entdecke spielerische Rollenspiele und Aufgaben in einem entspannten Rahmen.
-                    Ideal für den Einstieg – ohne Regeln, nur Spaß zu zweit oder in der Gruppe.
-                </p>
-                <a href="/games/vanilla/sessionvanilla.html"><button class="game-card-btn">Neue Session starten</button></a>
-            </div>
-
-            <div class="game-card">
-                <div class="game-card-icon">◆</div>
-                <h2 class="game-card-title">BDSM Game</h2>
-                <p class="game-card-desc">
-                    Tauche ein in strukturierte Sessions mit Aufgaben, Toys und klaren Rollen.
-                    Definiere Grenzen, vergib Aufgaben und erlebe intensive Momente mit deinem Partner.
-                </p>
-                <a href="/games/bdsm/neubdsm.html"><button class="game-card-btn">Neue Session starten</button></a>
-            </div>
-
-            <div class="game-card">
-                <div class="game-card-icon">⊗</div>
-                <h2 class="game-card-title">Chastity Game</h2>
-                <p class="game-card-desc">
-                    Erlebe Keuschheit auf eine neue Art: Kartenbasierte Locks, Keyholder-System,
-                    Community-Abstimmungen und tägliche Verifizierungen machen jedes Lock einzigartig.
-                </p>
-                <a href="/games/chastity/neulock.html"><button class="game-card-btn">Neues Lock erstellen</button></a>
-            </div>
-        </div>
-
        <!-- Profilbesucher -->
        <div id="visitorsSection" style="display:none;">
-            <div class="section-label">Profilbesucher</div>
+            <div class="section-label">Profilbesucher 👀</div>
            <div class="visitors-strip" id="visitorsStrip"></div>
        </div>

        <!-- Wer hat mich geliked (Dating) -->
        <div id="likesSection" style="display:none;">
-            <div class="section-label">Dating – Wer mag mich ♥</div>
+            <div class="section-label">Likes ❤️</div>
            <div class="dating-strip" id="likesStrip"></div>
        </div>

        <!-- Matches -->
        <div id="matchesSection" style="display:none;">
-            <div class="section-label">Dating – Matches 🎉</div>
+            <div class="section-label">Matches 💕</div>
            <div class="dating-strip" id="matchesStrip"></div>
        </div>
    </div>
+
+	<div class="game-grid">
+	    <div class="game-card">
+	        <div class="game-card-icon">❤️</div>
+	        <h2 class="game-card-title">Vanilla Game</h2>
+	        <p class="game-card-desc">
+	            
+	        </p>
+	        <a href="/games/vanilla/sessionvanilla.html"><button class="game-card-btn">Neue Session starten</button></a>
+	    </div>
+
+	    <div class="game-card">
+	        <div class="game-card-icon">⛓️</div>
+	        <h2 class="game-card-title">BDSM Game</h2>
+	        <p class="game-card-desc">
+	            Tauche ein in strukturierte Sessions mit Aufgaben, Toys und klaren Rollen.
+	            Definiere Grenzen, vergib Aufgaben und erlebe intensive Momente mit deinen Spielpartner*Innen.
+	        </p>
+	        <a href="/games/bdsm/neubdsm.html"><button class="game-card-btn">Neue Session starten</button></a>
+	    </div>
+
+	    <div class="game-card">
+	        <div class="game-card-icon">🔒</div>
+	        <h2 class="game-card-title">Chastity Game</h2>
+	        <p class="game-card-desc">
+	            Erlebe Keuschheit auf eine neue Art: Kartenbasierte Locks, Keyholder-System,
+	            Community-Abstimmungen und tägliche Verifizierungen machen jedes Lock einzigartig.
+	        </p>
+	        <a href="/games/chastity/neulock.html"><button class="game-card-btn">Neues Lock erstellen</button></a>
+	    </div>
+	</div>
 </div>

 <script src="/js/icons.js"></script>