Bump version to 0.1.6.37

- Verwende gameState.isSolved/isFailed direkt für UI-Logik
- Behebt Problem, dass Solve/Give Up Button bei zurückkehrenden Rätseln angezeigt wurde
- isSolved/isFailed werden jetzt direkt aus gameState gelesen für sofortige Konsistenz

Dockerfile

@@ -24,10 +24,12 @@ COPY --from=deps /app/node_modules ./node_modules
 COPY . .
 
 # Extract version: use build arg if provided, otherwise get from git, fallback to package.json
+# Only use tags that are reachable from the current commit to ensure version matches the code
 RUN if [ -n "$APP_VERSION" ]; then \
     echo "$APP_VERSION" > /tmp/version.txt; \
     else \
-    (git describe --tags --always 2>/dev/null || \
+    (git describe --tags --exact-match 2>/dev/null || \
+     git describe --tags --abbrev=0 2>/dev/null || \
      (grep -o '"version": "[^"]*"' package.json 2>/dev/null | cut -d'"' -f4 | sed 's/^/v/') || \
      echo "dev") > /tmp/version.txt; \
     fi && \

app/[locale]/[genre]/page.tsx

@@ -73,7 +73,9 @@ export default async function GenrePage({ params }: PageProps) {
     // Sort
     genres.sort((a, b) => getLocalizedValue(a.name, locale).localeCompare(getLocalizedValue(b.name, locale)));
 
-    const specials = await prisma.special.findMany();
+    const specials = await prisma.special.findMany({
+        where: { hidden: false },
+    });
     specials.sort((a, b) => getLocalizedValue(a.name, locale).localeCompare(getLocalizedValue(b.name, locale)));
 
     const now = new Date();

app/admin/specials/[id]/page.tsx

@@ -0,0 +1,89 @@
+'use client';
+
+import { useEffect, useState } from 'react';
+import { useParams, useRouter, usePathname } from 'next/navigation';
+import CurateSpecialEditor, { CurateSpecial } from '@/components/CurateSpecialEditor';
+
+export default function SpecialEditorPage() {
+    const params = useParams();
+    const router = useRouter();
+    const pathname = usePathname();
+    const specialId = params.id as string;
+
+    // Locale aus dem Pfad ableiten (/en/..., /de/...)
+    const localeFromPath = pathname?.split('/')[1] as 'de' | 'en' | undefined;
+    const locale: 'de' | 'en' = localeFromPath === 'de' || localeFromPath === 'en' ? localeFromPath : 'en';
+
+    const [special, setSpecial] = useState<CurateSpecial | null>(null);
+    const [loading, setLoading] = useState(true);
+
+    const fetchSpecial = async (showLoading = true) => {
+        try {
+            if (showLoading) {
+                setLoading(true);
+            }
+            const res = await fetch(`/api/specials/${specialId}`);
+            if (res.ok) {
+                const data = await res.json();
+                setSpecial(data);
+            }
+        } catch (error) {
+            console.error('Error fetching special:', error);
+        } finally {
+            if (showLoading) {
+                setLoading(false);
+            }
+        }
+    };
+
+    useEffect(() => {
+        fetchSpecial(true);
+    }, [specialId]);
+
+    const handleSaveStartTime = async (songId: number, startTime: number) => {
+        const res = await fetch(`/api/specials/${specialId}/songs`, {
+            method: 'PUT',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({ songId, startTime }),
+        });
+
+        if (!res.ok) {
+            const errorText = await res.text().catch(() => res.statusText || 'Unknown error');
+            console.error('Error updating special song (admin):', res.status, errorText);
+            throw new Error(`Failed to save start time: ${errorText}`);
+        } else {
+            // Reload special data to update the start time in the song list
+            await fetchSpecial(false);
+        }
+    };
+
+    if (loading) {
+        return (
+            <div style={{ padding: '2rem', textAlign: 'center' }}>
+                <p>Loading...</p>
+            </div>
+        );
+    }
+
+    if (!special) {
+        return (
+            <div style={{ padding: '2rem', textAlign: 'center' }}>
+                <p>Special not found</p>
+                <button onClick={() => router.push('/admin')}>Back to Admin</button>
+            </div>
+        );
+    }
+
+    return (
+        <CurateSpecialEditor
+            special={special}
+            locale={locale}
+            onBack={() => router.push('/admin')}
+            onSaveStartTime={handleSaveStartTime}
+            backLabel="← Back to Admin"
+            headerPrefix="Edit Special:"
+            noSongsSubHint="Go back to the admin dashboard to add songs to this special."
+        />
+    );
+}
+

app/api/covers/[filename]/route.ts

@@ -0,0 +1,95 @@
+import { NextRequest, NextResponse } from 'next/server';
+import { stat } from 'fs/promises';
+import { createReadStream } from 'fs';
+import path from 'path';
+
+export async function GET(
+    request: NextRequest,
+    { params }: { params: Promise<{ filename: string }> }
+) {
+    try {
+        const { filename } = await params;
+
+        // Security: Prevent path traversal attacks
+        // Allow alphanumeric, hyphens, underscores, and dots for image filenames
+        // Support common image formats: jpg, jpeg, png, gif, webp
+        const safeFilenamePattern = /^[a-zA-Z0-9_\-\.]+\.(jpg|jpeg|png|gif|webp)$/i;
+        if (!safeFilenamePattern.test(filename)) {
+            return new NextResponse('Invalid filename', { status: 400 });
+        }
+
+        // Additional check: ensure no path separators
+        if (filename.includes('/') || filename.includes('\\') || filename.includes('..')) {
+            return new NextResponse('Invalid filename', { status: 400 });
+        }
+
+        const filePath = path.join(process.cwd(), 'public/uploads/covers', filename);
+
+        // Security: Verify the resolved path is still within covers directory
+        const coversDir = path.join(process.cwd(), 'public/uploads/covers');
+        const resolvedPath = path.resolve(filePath);
+        if (!resolvedPath.startsWith(coversDir)) {
+            return new NextResponse('Forbidden', { status: 403 });
+        }
+
+        const stats = await stat(filePath);
+        const fileSize = stats.size;
+
+        // Determine content type based on file extension
+        const ext = filename.toLowerCase().split('.').pop();
+        const contentTypeMap: Record<string, string> = {
+            'jpg': 'image/jpeg',
+            'jpeg': 'image/jpeg',
+            'png': 'image/png',
+            'gif': 'image/gif',
+            'webp': 'image/webp',
+        };
+        const contentType = contentTypeMap[ext || ''] || 'image/jpeg';
+
+        const stream = createReadStream(filePath);
+
+        // Convert Node stream to Web stream
+        const readable = new ReadableStream({
+            start(controller) {
+                let isClosed = false;
+
+                stream.on('data', (chunk: any) => {
+                    if (isClosed) return;
+                    try {
+                        controller.enqueue(chunk);
+                    } catch (e) {
+                        isClosed = true;
+                        stream.destroy();
+                    }
+                });
+
+                stream.on('end', () => {
+                    if (isClosed) return;
+                    isClosed = true;
+                    controller.close();
+                });
+
+                stream.on('error', (err: any) => {
+                    if (isClosed) return;
+                    isClosed = true;
+                    controller.error(err);
+                });
+            },
+            cancel() {
+                stream.destroy();
+            }
+        });
+
+        return new NextResponse(readable, {
+            status: 200,
+            headers: {
+                'Content-Length': fileSize.toString(),
+                'Content-Type': contentType,
+                'Cache-Control': 'public, max-age=3600, must-revalidate',
+            },
+        });
+    } catch (error) {
+        console.error('Error serving cover image:', error);
+        return new NextResponse('Internal Server Error', { status: 500 });
+    }
+}

app/api/curator/specials/[id]/route.ts

@@ -1,9 +1,14 @@
 import { NextRequest, NextResponse } from 'next/server';
 import { PrismaClient } from '@prisma/client';
 import { requireStaffAuth } from '@/lib/auth';
+import { access } from 'fs/promises';
+import path from 'path';
 
 const prisma = new PrismaClient();
 
+// Mark route as dynamic to prevent caching
+export const dynamic = 'force-dynamic';
+
 export async function GET(
     request: NextRequest,
     { params }: { params: Promise<{ id: string }> }
@@ -52,7 +57,41 @@ export async function GET(
         return NextResponse.json({ error: 'Special not found' }, { status: 404 });
     }
 
-    return NextResponse.json(special);
+    // Filtere Songs ohne vollständige Song-Daten und prüfe Datei-Existenz
+    // Dies verhindert Fehler im Frontend, wenn Songs gelöscht wurden, Daten fehlen
+    // oder Dateien noch nicht im Container verfügbar sind (Volume Mount Delay)
+    const uploadsDir = path.join(process.cwd(), 'public/uploads');
+    
+    const filteredSongs = await Promise.all(
+        special.songs
+            .filter(ss => ss.song && ss.song.filename)
+            .map(async (ss) => {
+                const filePath = path.join(uploadsDir, ss.song.filename);
+                try {
+                    // Prüfe ob Datei existiert und zugänglich ist
+                    await access(filePath);
+                    return ss;
+                } catch (error) {
+                    // Datei existiert nicht oder ist nicht zugänglich
+                    console.warn(`[API] Song file not available: ${ss.song.filename} (may be syncing)`);
+                    return null;
+                }
+            })
+    );
+
+    // Entferne null-Werte (Songs ohne verfügbare Dateien)
+    const availableSongs = filteredSongs.filter((ss): ss is typeof special.songs[0] => ss !== null);
+
+    return NextResponse.json({
+        ...special,
+        songs: availableSongs,
+    }, {
+        headers: {
+            'Cache-Control': 'no-store, no-cache, must-revalidate, proxy-revalidate',
+            'Pragma': 'no-cache',
+            'Expires': '0',
+        },
+    });
 }
 
 

app/curator/help/CuratorHelpClient.tsx

@@ -0,0 +1,171 @@
+'use client';
+
+import { useTranslations, useLocale } from 'next-intl';
+import { Link } from '@/lib/navigation';
+
+export default function CuratorHelpClient() {
+    const t = useTranslations('CuratorHelp');
+    const locale = useLocale();
+
+    return (
+        <main style={{ maxWidth: '960px', margin: '2rem auto', padding: '1rem' }}>
+            <header style={{ marginBottom: '2rem' }}>
+                <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center' }}>
+                    <h1 style={{ fontSize: '1.75rem', marginBottom: '0.25rem' }}>{t('title')}</h1>
+                    <Link
+                        href="/curator"
+                        style={{
+                            padding: '0.5rem 1rem',
+                            background: '#6b7280',
+                            color: 'white',
+                            textDecoration: 'none',
+                            borderRadius: '0.375rem',
+                            fontSize: '0.9rem',
+                        }}
+                    >
+                        {t('backToDashboard')}
+                    </Link>
+                </div>
+            </header>
+
+            <div style={{ display: 'flex', flexDirection: 'column', gap: '2rem' }}>
+                {/* Einführung */}
+                <section>
+                    <h2 style={{ fontSize: '1.5rem', marginBottom: '1rem', borderBottom: '2px solid #e5e7eb', paddingBottom: '0.5rem' }}>
+                        {t('introductionTitle')}
+                    </h2>
+                    <div style={{ fontSize: '0.95rem', lineHeight: '1.7' }}>
+                        <p style={{ marginBottom: '1rem' }}>{t('introductionText')}</p>
+                        <h3 style={{ fontSize: '1.1rem', marginTop: '1.5rem', marginBottom: '0.75rem' }}>{t('permissionsTitle')}</h3>
+                        <ul style={{ marginLeft: '1.5rem', marginBottom: '1rem' }}>
+                            <li style={{ marginBottom: '0.5rem' }}>{t('permission1')}</li>
+                            <li style={{ marginBottom: '0.5rem' }}>{t('permission2')}</li>
+                            <li style={{ marginBottom: '0.5rem' }}>{t('permission3')}</li>
+                            <li style={{ marginBottom: '0.5rem' }}>{t('permission4')}</li>
+                        </ul>
+                        <p style={{ marginTop: '1rem', padding: '0.75rem', background: '#fef3c7', borderRadius: '0.375rem', border: '1px solid #fbbf24' }}>
+                            <strong>{t('note')}:</strong> {t('permissionNote')}
+                        </p>
+                    </div>
+                </section>
+
+                {/* Song-Upload */}
+                <section>
+                    <h2 style={{ fontSize: '1.5rem', marginBottom: '1rem', borderBottom: '2px solid #e5e7eb', paddingBottom: '0.5rem' }}>
+                        {t('uploadTitle')}
+                    </h2>
+                    <div style={{ fontSize: '0.95rem', lineHeight: '1.7' }}>
+                        <h3 style={{ fontSize: '1.1rem', marginTop: '1rem', marginBottom: '0.75rem' }}>{t('uploadStepsTitle')}</h3>
+                        <ol style={{ marginLeft: '1.5rem', marginBottom: '1rem' }}>
+                            <li style={{ marginBottom: '0.5rem' }}>{t('uploadStep1')}</li>
+                            <li style={{ marginBottom: '0.5rem' }}>{t('uploadStep2')}</li>
+                            <li style={{ marginBottom: '0.5rem' }}>{t('uploadStep3')}</li>
+                            <li style={{ marginBottom: '0.5rem' }}>{t('uploadStep4')}</li>
+                        </ol>
+                        <h3 style={{ fontSize: '1.1rem', marginTop: '1.5rem', marginBottom: '0.75rem' }}>{t('uploadBestPracticesTitle')}</h3>
+                        <ul style={{ marginLeft: '1.5rem', marginBottom: '1rem' }}>
+                            <li style={{ marginBottom: '0.5rem' }}>{t('uploadBestPractice1')}</li>
+                            <li style={{ marginBottom: '0.5rem' }}>{t('uploadBestPractice2')}</li>
+                            <li style={{ marginBottom: '0.5rem' }}>{t('uploadBestPractice3')}</li>
+                        </ul>
+                        <p style={{ marginTop: '1rem', padding: '0.75rem', background: '#dbeafe', borderRadius: '0.375rem', border: '1px solid #3b82f6' }}>
+                            <strong>{t('tip')}:</strong> {t('uploadTip')}
+                        </p>
+                    </div>
+                </section>
+
+                {/* Song-Bearbeitung */}
+                <section>
+                    <h2 style={{ fontSize: '1.5rem', marginBottom: '1rem', borderBottom: '2px solid #e5e7eb', paddingBottom: '0.5rem' }}>
+                        {t('editingTitle')}
+                    </h2>
+                    <div style={{ fontSize: '0.95rem', lineHeight: '1.7' }}>
+                        <h3 style={{ fontSize: '1.1rem', marginTop: '1rem', marginBottom: '0.75rem' }}>{t('singleEditTitle')}</h3>
+                        <p style={{ marginBottom: '1rem' }}>{t('singleEditText')}</p>
+                        <h3 style={{ fontSize: '1.1rem', marginTop: '1.5rem', marginBottom: '0.75rem' }}>{t('batchEditTitle')}</h3>
+                        <p style={{ marginBottom: '1rem' }}>{t('batchEditText')}</p>
+                        <ul style={{ marginLeft: '1.5rem', marginBottom: '1rem' }}>
+                            <li style={{ marginBottom: '0.5rem' }}>{t('batchEditFeature1')}</li>
+                            <li style={{ marginBottom: '0.5rem' }}>{t('batchEditFeature2')}</li>
+                            <li style={{ marginBottom: '0.5rem' }}>{t('batchEditFeature3')}</li>
+                            <li style={{ marginBottom: '0.5rem' }}>{t('batchEditFeature4')}</li>
+                        </ul>
+                        <h3 style={{ fontSize: '1.1rem', marginTop: '1.5rem', marginBottom: '0.75rem' }}>{t('genreSpecialAssignmentTitle')}</h3>
+                        <p style={{ marginBottom: '1rem' }}>{t('genreSpecialAssignmentText')}</p>
+                    </div>
+                </section>
+
+                {/* Specials kuratieren */}
+                <section>
+                    <h2 style={{ fontSize: '1.5rem', marginBottom: '1rem', borderBottom: '2px solid #e5e7eb', paddingBottom: '0.5rem' }}>
+                        {t('curateSpecialsHelpTitle')}
+                    </h2>
+                    <div style={{ fontSize: '0.95rem', lineHeight: '1.7' }}>
+                        <p style={{ marginBottom: '1rem' }}>{t('curateSpecialsHelpIntro')}</p>
+                        <h3 style={{ fontSize: '1.1rem', marginTop: '1rem', marginBottom: '0.75rem' }}>
+                            {t('curateSpecialsHelpStepsTitle')}
+                        </h3>
+                        <ol style={{ marginLeft: '1.5rem', marginBottom: '1rem' }}>
+                            <li style={{ marginBottom: '0.5rem' }}>{t('curateSpecialsHelpStep1')}</li>
+                            <li style={{ marginBottom: '0.5rem' }}>{t('curateSpecialsHelpStep2')}</li>
+                            <li style={{ marginBottom: '0.5rem' }}>{t('curateSpecialsHelpStep3')}</li>
+                            <li style={{ marginBottom: '0.5rem' }}>{t('curateSpecialsHelpStep4')}</li>
+                        </ol>
+                        <p style={{ marginTop: '1rem', padding: '0.75rem', background: '#fef3c7', borderRadius: '0.375rem', border: '1px solid #fbbf24' }}>
+                            <strong>{t('note')}:</strong> {t('curateSpecialsPermissionsNote')}
+                        </p>
+                    </div>
+                </section>
+
+                {/* Kommentar-Verwaltung */}
+                <section>
+                    <h2 style={{ fontSize: '1.5rem', marginBottom: '1rem', borderBottom: '2px solid #e5e7eb', paddingBottom: '0.5rem' }}>
+                        {t('commentsTitle')}
+                    </h2>
+                    <div style={{ fontSize: '0.95rem', lineHeight: '1.7' }}>
+                        <p style={{ marginBottom: '1rem' }}>{t('commentsText')}</p>
+                        <h3 style={{ fontSize: '1.1rem', marginTop: '1rem', marginBottom: '0.75rem' }}>{t('commentsActionsTitle')}</h3>
+                        <ul style={{ marginLeft: '1.5rem', marginBottom: '1rem' }}>
+                            <li style={{ marginBottom: '0.5rem' }}><strong>{t('markAsRead')}:</strong> {t('markAsReadText')}</li>
+                            <li style={{ marginBottom: '0.5rem' }}><strong>{t('archive')}:</strong> {t('archiveText')}</li>
+                        </ul>
+                    </div>
+                </section>
+
+                {/* Best Practices */}
+                <section>
+                    <h2 style={{ fontSize: '1.5rem', marginBottom: '1rem', borderBottom: '2px solid #e5e7eb', paddingBottom: '0.5rem' }}>
+                        {t('bestPracticesTitle')}
+                    </h2>
+                    <div style={{ fontSize: '0.95rem', lineHeight: '1.7' }}>
+                        <ul style={{ marginLeft: '1.5rem', marginBottom: '1rem' }}>
+                            <li style={{ marginBottom: '0.75rem' }}>{t('bestPractice1')}</li>
+                            <li style={{ marginBottom: '0.75rem' }}>{t('bestPractice2')}</li>
+                            <li style={{ marginBottom: '0.75rem' }}>{t('bestPractice3')}</li>
+                            <li style={{ marginBottom: '0.75rem' }}>{t('bestPractice4')}</li>
+                            <li style={{ marginBottom: '0.75rem' }}>{t('bestPractice5')}</li>
+                        </ul>
+                    </div>
+                </section>
+
+                {/* Troubleshooting */}
+                <section>
+                    <h2 style={{ fontSize: '1.5rem', marginBottom: '1rem', borderBottom: '2px solid #e5e7eb', paddingBottom: '0.5rem' }}>
+                        {t('troubleshootingTitle')}
+                    </h2>
+                    <div style={{ fontSize: '0.95rem', lineHeight: '1.7' }}>
+                        <h3 style={{ fontSize: '1.1rem', marginTop: '1rem', marginBottom: '0.75rem' }}>{t('troubleshootingQ1')}</h3>
+                        <p style={{ marginBottom: '1rem', marginLeft: '1rem' }}>{t('troubleshootingA1')}</p>
+                        <h3 style={{ fontSize: '1.1rem', marginTop: '1rem', marginBottom: '0.75rem' }}>{t('troubleshootingQ2')}</h3>
+                        <p style={{ marginBottom: '1rem', marginLeft: '1rem' }}>{t('troubleshootingA2')}</p>
+                        <h3 style={{ fontSize: '1.1rem', marginTop: '1rem', marginBottom: '0.75rem' }}>{t('troubleshootingQ3')}</h3>
+                        <p style={{ marginBottom: '1rem', marginLeft: '1rem' }}>{t('troubleshootingA3')}</p>
+                        <h3 style={{ fontSize: '1.1rem', marginTop: '1rem', marginBottom: '0.75rem' }}>{t('troubleshootingQ4')}</h3>
+                        <p style={{ marginBottom: '1rem', marginLeft: '1rem' }}>{t('troubleshootingA4')}</p>
+                    </div>
+                </section>
+            </div>
+        </main>
+    );
+}
+

app/curator/help/page.tsx

@@ -0,0 +1,8 @@
+export const dynamic = 'force-dynamic';
+
+import CuratorHelpClient from './CuratorHelpClient';
+
+export default function CuratorHelpPage() {
+    return <CuratorHelpClient />;
+}
+

app/curator/page.tsx

@@ -0,0 +1,11 @@
+// Server-Wrapper für die Kuratoren-Seite.
+// Markiert die Route als dynamisch und rendert die eigentliche Client-Komponente.
+export const dynamic = 'force-dynamic';
+
+import CuratorPageClient from './CuratorPageClient';
+
+export default function CuratorPage() {
+    return <CuratorPageClient />;
+}
+
+

app/curator/specials/CuratorSpecialsClient.tsx

@@ -0,0 +1,156 @@
+'use client';
+
+import { useEffect, useState } from 'react';
+import { useRouter, usePathname } from 'next/navigation';
+import { useLocale, useTranslations } from 'next-intl';
+import { Link } from '@/lib/navigation';
+import { getCuratorAuthHeaders } from '@/lib/curatorAuth';
+import { getLocalizedValue } from '@/lib/i18n';
+
+interface CuratorSpecial {
+    id: number;
+    name: string | { de?: string; en?: string };
+    songCount: number;
+}
+
+export default function CuratorSpecialsClient() {
+    const router = useRouter();
+    const pathname = usePathname();
+    const urlLocale = pathname?.split('/')[1] as 'de' | 'en' | undefined;
+    const intlLocale = useLocale() as 'de' | 'en';
+    const locale: 'de' | 'en' = urlLocale === 'de' || urlLocale === 'en' ? urlLocale : intlLocale;
+    const t = useTranslations('Curator');
+
+    const [specials, setSpecials] = useState<CuratorSpecial[]>([]);
+    const [loading, setLoading] = useState(true);
+    const [error, setError] = useState<string | null>(null);
+
+    useEffect(() => {
+        const fetchSpecials = async () => {
+            try {
+                setLoading(true);
+                const res = await fetch('/api/curator/specials', {
+                    headers: getCuratorAuthHeaders(),
+                });
+                if (!res.ok) {
+                    if (res.status === 403) {
+                        setError(t('specialForbidden'));
+                    } else {
+                        setError('Failed to load specials');
+                    }
+                    return;
+                }
+                const data = await res.json();
+                setSpecials(data);
+            } catch (e) {
+                setError('Failed to load specials');
+            } finally {
+                setLoading(false);
+            }
+        };
+
+        fetchSpecials();
+    }, [t]);
+
+    if (loading) {
+        return (
+            <div style={{ maxWidth: '960px', margin: '2rem auto', padding: '1rem' }}>
+                <p>{t('loading')}</p>
+            </div>
+        );
+    }
+
+    if (error) {
+        return (
+            <div style={{ maxWidth: '960px', margin: '2rem auto', padding: '1rem' }}>
+                <p style={{ color: 'red' }}>{error}</p>
+                <Link
+                    href="/curator"
+                    style={{
+                        display: 'inline-block',
+                        marginTop: '1rem',
+                        padding: '0.5rem 1rem',
+                        background: '#6b7280',
+                        color: 'white',
+                        textDecoration: 'none',
+                        borderRadius: '0.375rem',
+                        fontSize: '0.9rem',
+                    }}
+                >
+                    {t('backToDashboard') || 'Back to Dashboard'}
+                </Link>
+            </div>
+        );
+    }
+
+    return (
+        <div style={{ maxWidth: '960px', margin: '2rem auto', padding: '1rem' }}>
+            <header style={{ marginBottom: '2rem' }}>
+                <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center' }}>
+                    <h1 style={{ fontSize: '1.75rem', marginBottom: '0.25rem' }}>
+                        {t('curateSpecialsTitle') || 'Curate Specials'}
+                    </h1>
+                    <Link
+                        href="/curator"
+                        style={{
+                            padding: '0.5rem 1rem',
+                            background: '#6b7280',
+                            color: 'white',
+                            textDecoration: 'none',
+                            borderRadius: '0.375rem',
+                            fontSize: '0.9rem',
+                        }}
+                    >
+                        {t('backToDashboard') || 'Back to Dashboard'}
+                    </Link>
+                </div>
+            </header>
+
+            {specials.length === 0 ? (
+                <div style={{ padding: '2rem', textAlign: 'center', color: '#666' }}>
+                    <p>{t('noSpecialsAssigned') || 'No specials assigned to you.'}</p>
+                </div>
+            ) : (
+                <div style={{ display: 'flex', flexDirection: 'column', gap: '1rem' }}>
+                    {specials.map((special) => (
+                        <Link
+                            key={special.id}
+                            href={`/curator/specials/${special.id}`}
+                            style={{
+                                display: 'block',
+                                padding: '1.5rem',
+                                background: '#f9fafb',
+                                border: '1px solid #e5e7eb',
+                                borderRadius: '0.5rem',
+                                textDecoration: 'none',
+                                color: 'inherit',
+                                transition: 'all 0.2s',
+                            }}
+                            onMouseEnter={(e) => {
+                                e.currentTarget.style.background = '#f3f4f6';
+                                e.currentTarget.style.borderColor = '#d1d5db';
+                            }}
+                            onMouseLeave={(e) => {
+                                e.currentTarget.style.background = '#f9fafb';
+                                e.currentTarget.style.borderColor = '#e5e7eb';
+                            }}
+                        >
+                            <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center' }}>
+                                <div>
+                                    <h2 style={{ fontSize: '1.25rem', marginBottom: '0.5rem', color: '#111827' }}>
+                                        {getLocalizedValue(special.name, locale)}
+                                    </h2>
+                                    <p style={{ fontSize: '0.875rem', color: '#6b7280' }}>
+                                        {special.songCount} {special.songCount === 1 ? 'song' : 'songs'}
+                                    </p>
+                                </div>
+                                <div style={{ fontSize: '1.5rem', color: '#10b981' }}>→</div>
+                            </div>
+                        </Link>
+                    ))}
+                </div>
+            )}
+        </div>
+    );
+}
+

app/curator/specials/[id]/page.tsx

@@ -0,0 +1,178 @@
+'use client';
+
+export const dynamic = 'force-dynamic';
+
+import { useEffect, useState } from 'react';
+import { useParams, useRouter, usePathname } from 'next/navigation';
+import { useLocale, useTranslations } from 'next-intl';
+import CurateSpecialEditor, { CurateSpecial } from '@/components/CurateSpecialEditor';
+import { getCuratorAuthHeaders } from '@/lib/curatorAuth';
+import HelpTooltip from '@/components/HelpTooltip';
+
+export default function CuratorSpecialEditorPage() {
+    const params = useParams();
+    const router = useRouter();
+    const pathname = usePathname();
+    const urlLocale = pathname?.split('/')[1] as 'de' | 'en' | undefined;
+    const intlLocale = useLocale() as 'de' | 'en';
+    const locale: 'de' | 'en' = urlLocale === 'de' || urlLocale === 'en' ? urlLocale : intlLocale;
+    const t = useTranslations('Curator');
+    const tHelp = useTranslations('CuratorHelp');
+
+    const specialId = params?.id as string;
+
+    const [special, setSpecial] = useState<CurateSpecial | null>(null);
+    const [loading, setLoading] = useState(true);
+    const [error, setError] = useState<string | null>(null);
+
+    const fetchSpecial = async (showLoading = true) => {
+        try {
+            if (showLoading) {
+                setLoading(true);
+            }
+            const res = await fetch(`/api/curator/specials/${specialId}`, {
+                headers: getCuratorAuthHeaders(),
+                cache: 'no-store',
+            });
+            if (res.status === 403) {
+                setError(t('specialForbidden'));
+                return;
+            }
+            if (!res.ok) {
+                setError('Failed to load special');
+                return;
+            }
+            const data = await res.json();
+            setSpecial(data);
+        } catch (e) {
+            setError('Failed to load special');
+        } finally {
+            if (showLoading) {
+                setLoading(false);
+            }
+        }
+    };
+
+    useEffect(() => {
+        if (specialId) {
+            fetchSpecial(true);
+        }
+    }, [specialId, t]);
+
+    const handleSaveStartTime = async (songId: number, startTime: number) => {
+        const res = await fetch(`/api/curator/specials/${specialId}/songs`, {
+            method: 'PUT',
+            headers: {
+                ...getCuratorAuthHeaders(),
+                'Content-Type': 'application/json',
+            },
+            body: JSON.stringify({ songId, startTime }),
+        });
+        if (res.status === 403) {
+            setError(t('specialForbidden'));
+        } else if (!res.ok) {
+            setError('Failed to save changes');
+        } else {
+            // Reload special data to update the start time in the song list
+            await fetchSpecial(false);
+        }
+    };
+
+    if (loading) {
+        return (
+            <div style={{ padding: '2rem', textAlign: 'center' }}>
+                <p>{t('loadingData')}</p>
+            </div>
+        );
+    }
+
+    if (error) {
+        return (
+            <div style={{ padding: '2rem', textAlign: 'center' }}>
+                <p>{error}</p>
+                <button
+                    onClick={() => router.push(`/${locale}/curator`)}
+                    style={{
+                        marginTop: '1rem',
+                        padding: '0.5rem 1rem',
+                        borderRadius: '0.5rem',
+                        border: 'none',
+                        background: '#e5e7eb',
+                        cursor: 'pointer',
+                    }}
+                >
+                    {t('backToDashboard')}
+                </button>
+            </div>
+        );
+    }
+
+    if (!special) {
+        return (
+            <div style={{ padding: '2rem', textAlign: 'center' }}>
+                <p>{t('specialNotFound')}</p>
+                <button
+                    onClick={() => router.push(`/${locale}/curator`)}
+                    style={{
+                        marginTop: '1rem',
+                        padding: '0.5rem 1rem',
+                        borderRadius: '0.5rem',
+                        border: 'none',
+                        background: '#e5e7eb',
+                        cursor: 'pointer',
+                    }}
+                >
+                    {t('backToDashboard')}
+                </button>
+            </div>
+        );
+    }
+
+    return (
+        <div style={{ padding: '2rem', maxWidth: '1200px', margin: '0 auto' }}>
+            <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginBottom: '1rem' }}>
+                <div style={{ display: 'flex', alignItems: 'center', gap: '0.5rem' }}>
+                    <h1 style={{ fontSize: '1.75rem', fontWeight: 'bold' }}>
+                        {t('curateSpecialHeaderPrefix')}
+                    </h1>
+                    <HelpTooltip
+                        shortText={tHelp('tooltipCurateSpecialEditorShort')}
+                        longText={tHelp('tooltipCurateSpecialEditorLong')}
+                        position="bottom"
+                    />
+                </div>
+                <button
+                    type="button"
+                    onClick={() => router.push(`/${locale}/curator/specials`)}
+                    style={{
+                        padding: '0.5rem 1rem',
+                        background: '#e5e7eb',
+                        borderRadius: '0.5rem',
+                        border: 'none',
+                        cursor: 'pointer',
+                        fontSize: '0.9rem',
+                    }}
+                >
+                    {t('backToCuratorSpecials')}
+                </button>
+            </div>
+
+            <CurateSpecialEditor
+                special={special}
+                locale={locale}
+                onBack={() => router.push(`/${locale}/curator/specials`)}
+                onSaveStartTime={handleSaveStartTime}
+                backLabel={t('backToCuratorSpecials')}
+                headerPrefix={t('curateSpecialHeaderPrefix')}
+                noSongsHint={t('curateSpecialNoSongs')}
+                noSongsSubHint={t('curateSpecialNoSongsSub')}
+                instructionsText={t('curateSpecialInstructions')}
+                savingLabel={t('saving')}
+                saveChangesLabel={t('saveChanges')}
+                savedLabel={t('saved')}
+            />
+        </div>
+    );
+}
+
+

app/curator/specials/page.tsx

@@ -0,0 +1,13 @@
+'use client';
+
+// Root /curator/specials route without locale:
+// redirect users to the default English locale version.
+
+import { redirect } from 'next/navigation';
+
+export default function CuratorSpecialsPage() {
+    redirect('/en/curator/specials');
+}
+
+
+

components/AudioPlayer.tsx

@@ -22,8 +22,8 @@ const AudioPlayer = forwardRef<AudioPlayerRef, AudioPlayerProps>(({ src, unlocke
     const [progress, setProgress] = useState(0);
     const [hasPlayedOnce, setHasPlayedOnce] = useState(false);
 
-    const [processedSrc, setProcessedSrc] = useState(src);
+    const [processedSrc, setProcessedSrc] = useState<string | null>(null);
-    const [processedUnlockedSeconds, setProcessedUnlockedSeconds] = useState(unlockedSeconds);
+    const [processedUnlockedSeconds, setProcessedUnlockedSeconds] = useState<number | null>(null);
 
     useEffect(() => {
         console.log('[AudioPlayer] MOUNTED');
@@ -41,7 +41,7 @@ const AudioPlayer = forwardRef<AudioPlayerRef, AudioPlayerProps>(({ src, unlocke
                 let startPos = startTime;
 
                 // If same song but more time unlocked, start from where previous segment ended
-                if (src === processedSrc && unlockedSeconds > processedUnlockedSeconds) {
+                if (processedSrc !== null && src === processedSrc && processedUnlockedSeconds !== null && unlockedSeconds > processedUnlockedSeconds) {
                     startPos = startTime + processedUnlockedSeconds;
                 }
 
@@ -62,8 +62,11 @@ const AudioPlayer = forwardRef<AudioPlayerRef, AudioPlayerProps>(({ src, unlocke
                 const initialPercent = unlockedSeconds > 0 ? (initialElapsed / unlockedSeconds) * 100 : 0;
                 setProgress(Math.min(initialPercent, 100));
 
-                setHasPlayedOnce(false); // Reset for new segment
+                // Only reset hasPlayedOnce if the song changed, not if just more time was unlocked
-                onHasPlayedChange?.(false); // Notify parent
+                if (processedSrc !== null && src !== processedSrc) {
+                    setHasPlayedOnce(false); // Reset for new song
+                    onHasPlayedChange?.(false); // Notify parent
+                }
 
                 // Update processed state
                 setProcessedSrc(src);
@@ -72,22 +75,34 @@ const AudioPlayer = forwardRef<AudioPlayerRef, AudioPlayerProps>(({ src, unlocke
                 if (autoPlay) {
                     // Delay play slightly to ensure currentTime sticks
                     setTimeout(() => {
-                        const playPromise = audioRef.current?.play();
+                        if (audioRef.current) {
-                        if (playPromise !== undefined) {
+                            // Use startPos (which may be startTime + processedUnlockedSeconds if more time was unlocked)
-                            playPromise
+                            // instead of always using startTime
-                                .then(() => {
+                            audioRef.current.currentTime = startPos;
-                                    setIsPlaying(true);
+                            const playPromise = audioRef.current.play();
-                                    onPlay?.();
+                            if (playPromise !== undefined) {
-                                    setHasPlayedOnce(true);
+                                playPromise
-                                    onHasPlayedChange?.(true); // Notify parent
+                                    .then(() => {
-                                })
+                                        setIsPlaying(true);
-                                .catch(error => {
+                                        onPlay?.();
-                                    console.log("Autoplay prevented:", error);
+                                        setHasPlayedOnce(true);
-                                    setIsPlaying(false);
+                                        onHasPlayedChange?.(true); // Notify parent
-                                });
+                                    })
+                                    .catch(error => {
+                                        console.log("Autoplay prevented:", error);
+                                        setIsPlaying(false);
+                                    });
+                            }
                         }
                     }, 150);
                 }
+            } else if (startTime !== undefined && startTime > 0) {
+                // If startTime is set and we haven't processed changes, ensure currentTime is at least at startTime
+                // This handles the case where the audio element was reset or reloaded, or when manually playing for the first time
+                const current = audioRef.current.currentTime;
+                if (current < startTime) {
+                    audioRef.current.currentTime = startTime;
+                }
             }
         }
     }, [src, unlockedSeconds, startTime, autoPlay, processedSrc, processedUnlockedSeconds]);
@@ -97,6 +112,16 @@ const AudioPlayer = forwardRef<AudioPlayerRef, AudioPlayerProps>(({ src, unlocke
         play: () => {
             if (!audioRef.current) return;
 
+            // Check if we need to reset to startTime
+            const current = audioRef.current.currentTime;
+            const elapsed = current - startTime;
+            
+            // Reset if: never played before, current position is before startTime, or we've exceeded the unlocked segment
+            if (!hasPlayedOnce || current < startTime || elapsed >= unlockedSeconds) {
+                // Reset to start of segment
+                audioRef.current.currentTime = startTime;
+            }
+            
             const playPromise = audioRef.current.play();
             if (playPromise !== undefined) {
                 playPromise
@@ -121,8 +146,35 @@ const AudioPlayer = forwardRef<AudioPlayerRef, AudioPlayerProps>(({ src, unlocke
 
         if (isPlaying) {
             audioRef.current.pause();
+            setIsPlaying(false);
         } else {
+            // Ensure we're at the correct position before playing
+            const current = audioRef.current.currentTime;
+            const elapsed = current - startTime;
+            
+            // Determine target position
+            let targetPos = startTime;
+            
+            // If we've played before and we're within the unlocked segment, continue from current position
+            if (hasPlayedOnce && current >= startTime && elapsed < unlockedSeconds) {
+                targetPos = current; // Continue from current position
+            } else {
+                // Reset to start of segment if: never played, before startTime, or exceeded unlocked segment
+                targetPos = startTime;
+            }
+            
+            // Set position before playing
+            audioRef.current.currentTime = targetPos;
+            
+            // Ensure position sticks (browser might reset it)
+            setTimeout(() => {
+                if (audioRef.current && Math.abs(audioRef.current.currentTime - targetPos) > 0.5) {
+                    audioRef.current.currentTime = targetPos;
+                }
+            }, 50);
+            
             audioRef.current.play();
+            setIsPlaying(true);
             onPlay?.();
 
             if (hasPlayedOnce) {
@@ -132,7 +184,6 @@ const AudioPlayer = forwardRef<AudioPlayerRef, AudioPlayerProps>(({ src, unlocke
                 onHasPlayedChange?.(true); // Notify parent
             }
         }
-        setIsPlaying(!isPlaying);
     };
 
     const handleTimeUpdate = () => {

components/CurateSpecialEditor.tsx

@@ -62,11 +62,14 @@ export default function CurateSpecialEditor({
     saveChangesLabel = '💾 Save Changes',
     savedLabel = '✓ Saved',
 }: CurateSpecialEditorProps) {
+    // Filtere Songs ohne vollständige Song-Daten (song, song.filename)
+    const validSongs = special.songs.filter(ss => ss.song && ss.song.filename);
+    
     const [selectedSongId, setSelectedSongId] = useState<number | null>(
-        special.songs.length > 0 ? special.songs[0].songId : null
+        validSongs.length > 0 ? validSongs[0].songId : null
     );
     const [pendingStartTime, setPendingStartTime] = useState<number | null>(
-        special.songs.length > 0 ? special.songs[0].startTime : null
+        validSongs.length > 0 ? validSongs[0].startTime : null
     );
     const [hasUnsavedChanges, setHasUnsavedChanges] = useState(false);
     const [saving, setSaving] = useState(false);
@@ -77,7 +80,7 @@ export default function CurateSpecialEditor({
     const unlockSteps = JSON.parse(special.unlockSteps);
     const totalDuration = unlockSteps[unlockSteps.length - 1];
 
-    const selectedSpecialSong = special.songs.find(ss => ss.songId === selectedSongId) ?? null;
+    const selectedSpecialSong = validSongs.find(ss => ss.songId === selectedSongId) ?? null;
 
     const handleStartTimeChange = (newStartTime: number) => {
         setPendingStartTime(newStartTime);
@@ -111,7 +114,7 @@ export default function CurateSpecialEditor({
                 </p>
             </div>
 
-            {special.songs.length === 0 ? (
+            {validSongs.length === 0 ? (
                 <div style={{ padding: '2rem', background: '#f3f4f6', borderRadius: '0.5rem', textAlign: 'center' }}>
                     <p>{noSongsHint}</p>
                     <p style={{ fontSize: '0.875rem', color: '#666', marginTop: '0.5rem' }}>
@@ -125,7 +128,7 @@ export default function CurateSpecialEditor({
                             Select Song to Curate
                         </h2>
                         <div style={{ display: 'grid', gridTemplateColumns: 'repeat(auto-fill, minmax(250px, 1fr))', gap: '1rem' }}>
-                            {special.songs.map(ss => (
+                            {validSongs.map(ss => (
                                 <div
                                     key={ss.songId}
                                     onClick={() => {
@@ -152,7 +155,7 @@ export default function CurateSpecialEditor({
                         </div>
                     </div>
 
-                    {selectedSpecialSong && (
+                    {selectedSpecialSong && selectedSpecialSong.song && selectedSpecialSong.song.filename ? (
                         <div>
                             <h2 style={{ fontSize: '1.25rem', fontWeight: 'bold', marginBottom: '1rem' }}>
                                 Curate: {selectedSpecialSong.song.title}
@@ -181,7 +184,7 @@ export default function CurateSpecialEditor({
                                     </button>
                                 </div>
                                 <WaveformEditor
-                                    audioUrl={`/uploads/${selectedSpecialSong.song.filename}`}
+                                    audioUrl={`/api/audio/${selectedSpecialSong.song.filename}`}
                                     startTime={pendingStartTime ?? selectedSpecialSong.startTime}
                                     duration={totalDuration}
                                     unlockSteps={unlockSteps}
@@ -189,7 +192,13 @@ export default function CurateSpecialEditor({
                                 />
                             </div>
                         </div>
-                    )}
+                    ) : selectedSpecialSong ? (
+                        <div style={{ padding: '2rem', background: '#fee2e2', borderRadius: '0.5rem', textAlign: 'center' }}>
+                            <p style={{ color: '#991b1b', fontWeight: 'bold' }}>
+                                Fehler: Song-Daten unvollständig. Bitte wählen Sie einen anderen Song.
+                            </p>
+                        </div>
+                    ) : null}
                 </div>
             )}
         </div>

components/Game.tsx

@@ -96,6 +96,10 @@ export default function Game({ dailyPuzzle, genre = null, isSpecial = false, max
             if (gameState.isSolved && !gameState.yearGuessed && dailyPuzzle?.releaseYear) {
                 setShowYearModal(true);
             }
+        } else {
+            // Reset states when gameState is null (e.g., during loading)
+            setHasWon(false);
+            setHasLost(false);
         }
     }, [gameState, dailyPuzzle]);
 
@@ -164,6 +168,10 @@ export default function Game({ dailyPuzzle, genre = null, isSpecial = false, max
     );
     if (!gameState) return <div>{t('loadingState')}</div>;
     
+    // Use gameState directly for isSolved/isFailed to ensure consistency when returning to completed puzzles
+    const isSolved = gameState?.isSolved ?? hasWon;
+    const isFailed = gameState?.isFailed ?? hasLost;
+
     const handleGuess = (song: any) => {
         if (isProcessingGuess) return;
         // Prevent guessing if already solved or failed
@@ -176,6 +184,7 @@ export default function Game({ dailyPuzzle, genre = null, isSpecial = false, max
         if (song.id === dailyPuzzle.songId) {
             addGuess(song.title, true);
             setHasWon(true);
+            // gameState.isSolved will be updated by useGameState
             // Track puzzle solved event
             if (typeof window !== 'undefined' && window.plausible) {
                 window.plausible('puzzle_solved', {
@@ -196,6 +205,7 @@ export default function Game({ dailyPuzzle, genre = null, isSpecial = false, max
             if (gameState.guesses.length + 1 >= maxAttempts) {
                 setHasLost(true);
                 setHasWon(false);
+                // gameState.isFailed will be updated by useGameState
                 // Track puzzle lost event
                 if (typeof window !== 'undefined' && window.plausible) {
                     window.plausible('puzzle_solved', {
@@ -236,6 +246,7 @@ export default function Game({ dailyPuzzle, genre = null, isSpecial = false, max
         if (gameState.guesses.length + 1 >= maxAttempts) {
             setHasLost(true);
             setHasWon(false);
+            // gameState.isFailed will be updated by useGameState
             // Track puzzle lost event
             if (typeof window !== 'undefined' && window.plausible) {
                 window.plausible('puzzle_solved', {
@@ -260,6 +271,7 @@ export default function Game({ dailyPuzzle, genre = null, isSpecial = false, max
         giveUp(); // Ensure game is marked as failed and score reset to 0
         setHasLost(true);
         setHasWon(false);
+        // gameState.isFailed will be updated by useGameState
         // Track puzzle lost event
         if (typeof window !== 'undefined' && window.plausible) {
             window.plausible('puzzle_solved', {
@@ -409,19 +421,19 @@ export default function Game({ dailyPuzzle, genre = null, isSpecial = false, max
             if (i < gameState.guesses.length) {
                 if (gameState.guesses[i] === 'SKIPPED') {
                     emojiGrid += '⬛';
-                } else if (hasWon && i === gameState.guesses.length - 1) {
+                } else if (isSolved && i === gameState.guesses.length - 1) {
                     emojiGrid += '🟩';
                 } else {
                     emojiGrid += '🟥';
                 }
             } else {
                 // If game is lost, fill remaining slots with black squares
-                emojiGrid += hasLost ? '⬛' : '⬜';
+                emojiGrid += isFailed ? '⬛' : '⬜';
             }
         }
 
-        const speaker = hasWon ? '🔉' : '🔇';
+        const speaker = isSolved ? '🔉' : '🔇';
-        const bonusStar = (hasWon && gameState.yearGuessed && dailyPuzzle.releaseYear && gameState.scoreBreakdown.some(item => item.reason === 'Bonus: Correct Year')) ? '⭐' : '';
+        const bonusStar = (isSolved && gameState.yearGuessed && dailyPuzzle.releaseYear && gameState.scoreBreakdown.some(item => item.reason === 'Bonus: Correct Year')) ? '⭐' : '';
         const genreText = genre ? `${isSpecial ? t('special') : t('genre')}: ${genre}\n` : '';
 
         // Use current domain from window.location to support both hoerdle.de and hördle.de
@@ -534,7 +546,7 @@ export default function Game({ dailyPuzzle, genre = null, isSpecial = false, max
                             src={dailyPuzzle.audioUrl}
                             unlockedSeconds={unlockedSeconds}
                             startTime={dailyPuzzle.startTime}
-                            autoPlay={lastAction === 'SKIP' || (lastAction === 'GUESS' && !hasWon && !hasLost)}
+                            autoPlay={lastAction === 'SKIP' || (lastAction === 'GUESS' && !isSolved && !isFailed)}
                             onReplay={addReplay}
                             onHasPlayedChange={setHasPlayedAudio}
                         />
@@ -543,7 +555,7 @@ export default function Game({ dailyPuzzle, genre = null, isSpecial = false, max
 
                 <div className="guess-list">
                     {gameState.guesses.map((guess, i) => {
-                        const isCorrect = hasWon && i === gameState.guesses.length - 1;
+                        const isCorrect = isSolved && i === gameState.guesses.length - 1;
                         return (
                             <div key={i} className="guess-item">
                                 <span className="guess-number">#{i + 1}</span>
@@ -555,7 +567,7 @@ export default function Game({ dailyPuzzle, genre = null, isSpecial = false, max
                     })}
                 </div>
 
-                {!hasWon && !hasLost && (
+                {!isSolved && !isFailed && (
                     <>
                         <div id="tour-input">
                             <GuessInput onGuess={handleGuess} disabled={isProcessingGuess} />
@@ -586,13 +598,13 @@ export default function Game({ dailyPuzzle, genre = null, isSpecial = false, max
                     </>
                 )}
 
-                {(hasWon || hasLost) && (
+                {(isSolved || isFailed) && (
-                    <div className={`message-box ${hasWon ? 'success' : 'failure'}`}>
+                    <div className={`message-box ${isSolved ? 'success' : 'failure'}`}>
                         <h2 style={{ fontSize: '1.5rem', fontWeight: 'bold', marginBottom: '0.5rem' }}>
-                            {hasWon ? t('won') : t('lost')}
+                            {isSolved ? t('won') : t('lost')}
                         </h2>
 
-                        <div style={{ fontSize: '2rem', fontWeight: 'bold', margin: '1rem 0', color: hasWon ? 'var(--success)' : 'var(--danger)' }}>
+                        <div style={{ fontSize: '2rem', fontWeight: 'bold', margin: '1rem 0', color: isSolved ? 'var(--success)' : 'var(--danger)' }}>
                             {t('score')}: {gameState.score}
                         </div>
 
@@ -610,7 +622,7 @@ export default function Game({ dailyPuzzle, genre = null, isSpecial = false, max
                             </ul>
                         </details>
 
-                        <p>{hasWon ? t('comeBackTomorrow') : t('theSongWas')}</p>
+                        <p>{isSolved ? t('comeBackTomorrow') : t('theSongWas')}</p>
 
                         <div style={{ margin: '1.5rem 0', padding: '1rem', background: 'rgba(255,255,255,0.5)', borderRadius: '0.5rem', display: 'flex', flexDirection: 'column', alignItems: 'center' }}>
                             <img

docs/TESTING.md

@@ -0,0 +1,88 @@
+# Integration Testing
+
+Hördle uses [Playwright](https://playwright.dev/) for end-to-end (E2E) integration testing. These tests ensure that critical flows like gameplay, authentication, and admin management function correctly across different browsers.
+
+## Prerequisites
+
+Ensure you have the Playwright browsers installed:
+
+```bash
+npx playwright install
+```
+
+## Running Tests
+
+### Headless Mode (CI/CLI)
+
+To run all tests in headless mode (Chromium, Firefox, WebKit):
+
+```bash
+npm run test:e2e
+```
+
+### UI Mode (Interactive)
+
+To run tests with a UI to inspect traces and watch execution:
+
+```bash
+npm run test:e2e:ui
+```
+
+### Specific Test File
+
+To run a specific test file:
+
+```bash
+npx playwright test tests/gameplay.spec.ts
+```
+
+### Specific Project (Browser)
+
+To run tests only on a specific browser (e.g., Chromium):
+
+```bash
+npx playwright test --project=chromium
+```
+
+## Configuration
+
+The Playwright configuration is located in `playwright.config.ts`. It sets up the base URL (default: `http://localhost:3000`) and the web server command to start the app if it's not running.
+
+### Environment Variables
+
+*   **`ADMIN_PASSWORD`**: The tests assume the admin password is `'admin123'`. 
+    *   In `app/api/admin/login/route.ts`, the login logic has been enhanced to check if `ADMIN_PASSWORD` is a bcrypt hash (starts with `$2b$`) or plain text. 
+    *   For local testing, you can set `ADMIN_PASSWORD="admin123"` in your `.env` or `.env.local` (though the default fallback in the code also handles this).
+*   **Curator Credentials**: The mock Curator login page (`app/[locale]/curator/page.tsx`) mocks validation for testing.
+    *   Username: `elpatron`
+    *   Password: `example_password`
+
+## Test Structure
+
+Tests are located in the `tests/` directory:
+
+*   **`auth.spec.ts`**: Verifies public access and admin login flows.
+*   **`admin.spec.ts`**: Checks the Admin Dashboard, including access protection and visibility of sections (Dashboard, Daily Puzzles, etc.).
+*   **`curator.spec.ts`**: Verifies the Curator login form and authentication flows (valid/invalid credentials).
+*   **`gameplay.spec.ts`**: Tests the core game loop: loading the game, playing audio, interaction with the prompt, and submitting a guess.
+
+## Troubleshooting & Known Issues
+
+### Next.js Development Overlay (`nextjs-portal`)
+
+In development mode (`npm run dev`), Next.js injects an overlay (`<nextjs-portal>`) for hot reloading feedback. This overlay can sometimes intercept clicks intended for UI elements, causing tests to fail with "element is not clickable" or timeout errors.
+
+**Solution:** 
+We inject a CSS style in the `beforeEach` hook of our tests to hide this overlay:
+
+```typescript
+test.beforeEach(async ({ page }) => {
+    await page.addStyleTag({ content: 'nextjs-portal, #nextjs-dev-overlay, [data-nextjs-dev-overlay] { display: none !important; }' });
+});
+```
+
+### WebKit (Safari) Stability
+
+WebKit can be slower or more sensitive to timing in some environments. If tests fail on WebKit but pass on other browsers:
+1.  Try increasing the timeout in `playwright.config.ts`.
+2.  Use `await page.waitForTimeout(500)` or specific assertions like `await expect(page).toHaveURL(...)` to allow for transition times, as implemented in `tests/admin.spec.ts`.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hoerdle",
-  "version": "0.1.6.26",
+  "version": "0.1.6.37",
   "private": true,
   "scripts": {
     "dev": "next dev",

scripts/backup-restic.sh

@@ -9,6 +9,79 @@ if [ -f "$HOME/.restic-env" ]; then
     . "$HOME/.restic-env"
 fi
 
+# Extract Gotify variables from .env file if not set (ignore comments and empty lines)
+if [ -z "$GOTIFY_URL" ] && [ -f ".env" ]; then
+    GOTIFY_URL=$(grep -v '^#' .env | grep -v '^$' | grep '^GOTIFY_URL=' | head -1 | cut -d'=' -f2- | tr -d '"' | tr -d "'" | xargs || echo "")
+fi
+
+if [ -z "$GOTIFY_APP_TOKEN" ] && [ -f ".env" ]; then
+    GOTIFY_APP_TOKEN=$(grep -v '^#' .env | grep -v '^$' | grep '^GOTIFY_APP_TOKEN=' | head -1 | cut -d'=' -f2- | tr -d '"' | tr -d "'" | xargs || echo "")
+fi
+
+# Extract Gotify variables from docker-compose.yml if not set
+if [ -z "$GOTIFY_URL" ] && [ -f "docker-compose.yml" ]; then
+    GOTIFY_URL=$(grep -oP 'GOTIFY_URL=\K[^\s]+' docker-compose.yml | head -1 | tr -d '"' | tr -d "'" || echo "")
+fi
+
+if [ -z "$GOTIFY_APP_TOKEN" ] && [ -f "docker-compose.yml" ]; then
+    GOTIFY_APP_TOKEN=$(grep -oP 'GOTIFY_APP_TOKEN=\K[^\s]+' docker-compose.yml | head -1 | tr -d '"' | tr -d "'" || echo "")
+fi
+
+# Function to send Gotify notification
+send_gotify_notification() {
+    local title="$1"
+    local message="$2"
+    local priority="${3:-5}"
+    
+    # Check if Gotify is configured
+    if [ -z "$GOTIFY_URL" ] || [ -z "$GOTIFY_APP_TOKEN" ]; then
+        echo "⚠️  Gotify not configured (GOTIFY_URL or GOTIFY_APP_TOKEN not set), skipping notification"
+        return 0
+    fi
+    
+    echo "📢 Sending Gotify notification..."
+    
+    # Send notification (fire and forget, don't fail on error)
+    # Use jq if available for proper JSON encoding, otherwise use simple approach
+    if command -v jq >/dev/null 2>&1; then
+        local json_payload
+        json_payload=$(jq -n \
+            --arg title "$title" \
+            --arg message "$message" \
+            --argjson priority "$priority" \
+            '{title: $title, message: $message, priority: $priority}')
+        
+        local curl_exit_code=0
+        curl -sSf -X POST "${GOTIFY_URL}/message?token=${GOTIFY_APP_TOKEN}" \
+            -H "Content-Type: application/json" \
+            -d "$json_payload" \
+            >/dev/null 2>&1 || curl_exit_code=$?
+        
+        if [ $curl_exit_code -eq 0 ]; then
+            echo "✅ Gotify notification sent successfully"
+        else
+            echo "⚠️  Failed to send Gotify notification (curl exit code: $curl_exit_code)"
+        fi
+    else
+        # Fallback: simple JSON encoding (replace " with \" and newlines with \n)
+        local escaped_title escaped_message
+        escaped_title=$(echo "$title" | sed 's/"/\\"/g')
+        escaped_message=$(echo "$message" | sed 's/"/\\"/g' | sed ':a;N;$!ba;s/\n/\\n/g')
+        
+        local curl_exit_code=0
+        curl -sSf -X POST "${GOTIFY_URL}/message?token=${GOTIFY_APP_TOKEN}" \
+            -H "Content-Type: application/json" \
+            -d "{\"title\":\"${escaped_title}\",\"message\":\"${escaped_message}\",\"priority\":${priority}}" \
+            >/dev/null 2>&1 || curl_exit_code=$?
+        
+        if [ $curl_exit_code -eq 0 ]; then
+            echo "✅ Gotify notification sent successfully"
+        else
+            echo "⚠️  Failed to send Gotify notification (curl exit code: $curl_exit_code)"
+        fi
+    fi
+}
+
 echo "💾 Creating Restic backup..."
 
 if ! command -v restic >/dev/null 2>&1; then
@@ -71,12 +144,32 @@ restic -r "$RESTIC_REPO" backup \
 
 if [ $RESTIC_EXIT_CODE -eq 0 ]; then
     echo "✅ Restic backup completed successfully"
+    
+    # Send success notification
+    send_gotify_notification \
+        "Hördle Backup: Erfolgreich" \
+        "Restic Backup wurde erfolgreich abgeschlossen.\nDatum: ${CURRENT_DATE}\nCommit: ${CURRENT_COMMIT_SHORT}" \
+        5
+    
     exit 0
 elif [ $RESTIC_EXIT_CODE -eq 3 ]; then
     echo "⚠️  Restic backup completed with warnings (some files could not be read), continuing..."
+    
+    # Send warning notification
+    send_gotify_notification \
+        "Hördle Backup: Mit Warnungen" \
+        "Restic Backup wurde mit Warnungen abgeschlossen (einige Dateien konnten nicht gelesen werden).\nDatum: ${CURRENT_DATE}\nCommit: ${CURRENT_COMMIT_SHORT}" \
+        7
+    
     exit 0
 else
     echo "⚠️  Restic backup failed (exit code: $RESTIC_EXIT_CODE), continuing deployment..."
+    
+    # Send error notification
+    send_gotify_notification \
+        "Hördle Backup: Fehlgeschlagen" \
+        "Restic Backup ist fehlgeschlagen (Exit Code: ${RESTIC_EXIT_CODE}).\nDatum: ${CURRENT_DATE}\nCommit: ${CURRENT_COMMIT_SHORT}" \
+        9
+    
     exit 0
 fi
-

scripts/deploy.sh

@@ -63,10 +63,44 @@ fi
 ./scripts/backup-restic.sh
 
 # Nur neueste Version holen (shallow fetch), vollständiges Repo ist im Deployment nicht nötig
-echo "📥 Fetching latest commit (shallow clone) from git..."
+# Wichtig: Tags müssen vollständig geholt werden für Version-Anzeige
-git fetch --prune --tags --depth=1 origin master
+echo "📥 Fetching latest commit and all tags from git..."
+git fetch --prune --tags origin master
+git fetch --tags origin
 git reset --hard origin/master
 
+# Determine version: try git tag first, then package.json
+echo "🏷️  Determining version..."
+APP_VERSION=""
+# Try to get exact tag if we're on a tagged commit
+if git describe --tags --exact-match HEAD 2>/dev/null; then
+    APP_VERSION=$(git describe --tags --exact-match HEAD 2>/dev/null)
+    echo "   Found exact tag: $APP_VERSION"
+else
+    # Try to get latest tag
+    LATEST_TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "")
+    if [ -n "$LATEST_TAG" ]; then
+        APP_VERSION="$LATEST_TAG"
+        echo "   Using latest tag: $APP_VERSION"
+    else
+        # Fallback to package.json
+        if [ -f "package.json" ]; then
+            PACKAGE_VERSION=$(grep -o '"version": "[^"]*"' package.json 2>/dev/null | cut -d'"' -f4)
+            if [ -n "$PACKAGE_VERSION" ]; then
+                APP_VERSION="v${PACKAGE_VERSION}"
+                echo "   Using package.json version: $APP_VERSION"
+            fi
+        fi
+    fi
+fi
+
+if [ -z "$APP_VERSION" ]; then
+    echo "⚠️  Could not determine version, using 'dev'"
+    APP_VERSION="dev"
+fi
+
+echo "📦 Building with version: $APP_VERSION"
+
 # Prüfe und erstelle/repariere Netzwerk falls nötig
 echo "🌐 Prüfe Docker-Netzwerk..."
 if ! docker network ls | grep -q "hoerdle_default"; then
@@ -82,7 +116,7 @@ echo ""
 
 # Build new image in background (doesn't stop running container)
 echo "🔨 Building new Docker image (this runs while app is still online)..."
-docker compose build
+docker compose build --build-arg APP_VERSION="$APP_VERSION"
 
 # Quick restart with pre-built image
 echo "🔄 Restarting with new image (minimal downtime)..."