Compare commits
19 Commits
7999d63e6d
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e58e9156d6 | ||
|
|
8c16c72489 | ||
|
|
be7eda63e2 | ||
|
|
2a99f545ef | ||
|
|
6be813fb00 | ||
|
|
71c7f2aab5 | ||
|
|
096682929d | ||
|
|
cebdf7a5a2 | ||
|
|
afbdb74516 | ||
|
|
9372264174 | ||
|
|
25680a19b6 | ||
|
|
fb3e4c10dd | ||
|
|
b7293a4614 | ||
|
|
830e91fdff | ||
|
|
bc95af8027 | ||
|
|
56461fe0bb | ||
|
|
989654f62e | ||
|
|
bf9fbe37c0 | ||
|
|
c83dc7a5e5 |
@@ -24,10 +24,12 @@ COPY --from=deps /app/node_modules ./node_modules
|
|||||||
COPY . .
|
COPY . .
|
||||||
|
|
||||||
# Extract version: use build arg if provided, otherwise get from git, fallback to package.json
|
# 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 \
|
RUN if [ -n "$APP_VERSION" ]; then \
|
||||||
echo "$APP_VERSION" > /tmp/version.txt; \
|
echo "$APP_VERSION" > /tmp/version.txt; \
|
||||||
else \
|
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/') || \
|
(grep -o '"version": "[^"]*"' package.json 2>/dev/null | cut -d'"' -f4 | sed 's/^/v/') || \
|
||||||
echo "dev") > /tmp/version.txt; \
|
echo "dev") > /tmp/version.txt; \
|
||||||
fi && \
|
fi && \
|
||||||
|
|||||||
95
app/api/covers/[filename]/route.ts
Normal file
95
app/api/covers/[filename]/route.ts
Normal file
@@ -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 });
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,9 +1,14 @@
|
|||||||
import { NextRequest, NextResponse } from 'next/server';
|
import { NextRequest, NextResponse } from 'next/server';
|
||||||
import { PrismaClient } from '@prisma/client';
|
import { PrismaClient } from '@prisma/client';
|
||||||
import { requireStaffAuth } from '@/lib/auth';
|
import { requireStaffAuth } from '@/lib/auth';
|
||||||
|
import { access } from 'fs/promises';
|
||||||
|
import path from 'path';
|
||||||
|
|
||||||
const prisma = new PrismaClient();
|
const prisma = new PrismaClient();
|
||||||
|
|
||||||
|
// Mark route as dynamic to prevent caching
|
||||||
|
export const dynamic = 'force-dynamic';
|
||||||
|
|
||||||
export async function GET(
|
export async function GET(
|
||||||
request: NextRequest,
|
request: NextRequest,
|
||||||
{ params }: { params: Promise<{ id: string }> }
|
{ params }: { params: Promise<{ id: string }> }
|
||||||
@@ -52,13 +57,40 @@ export async function GET(
|
|||||||
return NextResponse.json({ error: 'Special not found' }, { status: 404 });
|
return NextResponse.json({ error: 'Special not found' }, { status: 404 });
|
||||||
}
|
}
|
||||||
|
|
||||||
// Filtere Songs ohne vollständige Song-Daten (song, song.filename)
|
// Filtere Songs ohne vollständige Song-Daten und prüfe Datei-Existenz
|
||||||
// Dies verhindert Fehler im Frontend, wenn Songs gelöscht wurden oder Daten fehlen
|
// Dies verhindert Fehler im Frontend, wenn Songs gelöscht wurden, Daten fehlen
|
||||||
const filteredSongs = special.songs.filter(ss => ss.song && ss.song.filename);
|
// 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({
|
return NextResponse.json({
|
||||||
...special,
|
...special,
|
||||||
songs: filteredSongs,
|
songs: availableSongs,
|
||||||
|
}, {
|
||||||
|
headers: {
|
||||||
|
'Cache-Control': 'no-store, no-cache, must-revalidate, proxy-revalidate',
|
||||||
|
'Pragma': 'no-cache',
|
||||||
|
'Expires': '0',
|
||||||
|
},
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1615,7 +1615,7 @@ export default function CuratorPageClient() {
|
|||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
<div style={{ overflowX: 'auto' }}>
|
<div style={{ overflowX: 'auto', position: 'relative' }}>
|
||||||
<table
|
<table
|
||||||
style={{
|
style={{
|
||||||
width: '100%',
|
width: '100%',
|
||||||
@@ -1686,7 +1686,17 @@ export default function CuratorPageClient() {
|
|||||||
{t('columnRating')} {sortField === 'averageRating' && (sortDirection === 'asc' ? '↑' : '↓')}
|
{t('columnRating')} {sortField === 'averageRating' && (sortDirection === 'asc' ? '↑' : '↓')}
|
||||||
</th>
|
</th>
|
||||||
<th style={{ padding: '0.5rem' }}>{t('columnExcludeGlobal')}</th>
|
<th style={{ padding: '0.5rem' }}>{t('columnExcludeGlobal')}</th>
|
||||||
<th style={{ padding: '0.5rem' }}>{t('columnActions')}</th>
|
<th
|
||||||
|
style={{
|
||||||
|
padding: '0.5rem',
|
||||||
|
position: 'sticky',
|
||||||
|
right: 0,
|
||||||
|
backgroundColor: 'white',
|
||||||
|
zIndex: 10,
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{t('columnActions')}
|
||||||
|
</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
@@ -1701,12 +1711,13 @@ export default function CuratorPageClient() {
|
|||||||
|
|
||||||
const isSelected = selectedSongIds.has(song.id);
|
const isSelected = selectedSongIds.has(song.id);
|
||||||
|
|
||||||
|
const rowBackgroundColor = isSelected ? '#eff6ff' : 'white';
|
||||||
return (
|
return (
|
||||||
<tr
|
<tr
|
||||||
key={song.id}
|
key={song.id}
|
||||||
style={{
|
style={{
|
||||||
borderBottom: '1px solid #f3f4f6',
|
borderBottom: '1px solid #f3f4f6',
|
||||||
backgroundColor: isSelected ? '#eff6ff' : 'transparent',
|
backgroundColor: rowBackgroundColor,
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<td style={{ padding: '0.5rem' }}>
|
<td style={{ padding: '0.5rem' }}>
|
||||||
@@ -1810,7 +1821,7 @@ export default function CuratorPageClient() {
|
|||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<img
|
<img
|
||||||
src={`/uploads/covers/${song.coverImage}`}
|
src={`/api/covers/${song.coverImage}`}
|
||||||
alt={`Cover für ${song.title}`}
|
alt={`Cover für ${song.title}`}
|
||||||
style={{
|
style={{
|
||||||
width: '200px',
|
width: '200px',
|
||||||
@@ -2010,6 +2021,10 @@ export default function CuratorPageClient() {
|
|||||||
style={{
|
style={{
|
||||||
padding: '0.5rem',
|
padding: '0.5rem',
|
||||||
whiteSpace: 'nowrap',
|
whiteSpace: 'nowrap',
|
||||||
|
position: 'sticky',
|
||||||
|
right: 0,
|
||||||
|
backgroundColor: rowBackgroundColor,
|
||||||
|
zIndex: 10,
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{isEditing ? (
|
{isEditing ? (
|
||||||
@@ -2025,6 +2040,7 @@ export default function CuratorPageClient() {
|
|||||||
border: 'none',
|
border: 'none',
|
||||||
borderRadius: '0.25rem',
|
borderRadius: '0.25rem',
|
||||||
cursor: 'pointer',
|
cursor: 'pointer',
|
||||||
|
whiteSpace: 'nowrap',
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
💾
|
💾
|
||||||
@@ -2038,6 +2054,7 @@ export default function CuratorPageClient() {
|
|||||||
border: 'none',
|
border: 'none',
|
||||||
borderRadius: '0.25rem',
|
borderRadius: '0.25rem',
|
||||||
cursor: 'pointer',
|
cursor: 'pointer',
|
||||||
|
whiteSpace: 'nowrap',
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
✖
|
✖
|
||||||
|
|||||||
@@ -32,6 +32,7 @@ export default function CuratorSpecialEditorPage() {
|
|||||||
}
|
}
|
||||||
const res = await fetch(`/api/curator/specials/${specialId}`, {
|
const res = await fetch(`/api/curator/specials/${specialId}`, {
|
||||||
headers: getCuratorAuthHeaders(),
|
headers: getCuratorAuthHeaders(),
|
||||||
|
cache: 'no-store',
|
||||||
});
|
});
|
||||||
if (res.status === 403) {
|
if (res.status === 403) {
|
||||||
setError(t('specialForbidden'));
|
setError(t('specialForbidden'));
|
||||||
|
|||||||
@@ -22,8 +22,8 @@ const AudioPlayer = forwardRef<AudioPlayerRef, AudioPlayerProps>(({ src, unlocke
|
|||||||
const [progress, setProgress] = useState(0);
|
const [progress, setProgress] = useState(0);
|
||||||
const [hasPlayedOnce, setHasPlayedOnce] = useState(false);
|
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(() => {
|
useEffect(() => {
|
||||||
console.log('[AudioPlayer] MOUNTED');
|
console.log('[AudioPlayer] MOUNTED');
|
||||||
@@ -41,7 +41,7 @@ const AudioPlayer = forwardRef<AudioPlayerRef, AudioPlayerProps>(({ src, unlocke
|
|||||||
let startPos = startTime;
|
let startPos = startTime;
|
||||||
|
|
||||||
// If same song but more time unlocked, start from where previous segment ended
|
// 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;
|
startPos = startTime + processedUnlockedSeconds;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -62,8 +62,11 @@ const AudioPlayer = forwardRef<AudioPlayerRef, AudioPlayerProps>(({ src, unlocke
|
|||||||
const initialPercent = unlockedSeconds > 0 ? (initialElapsed / unlockedSeconds) * 100 : 0;
|
const initialPercent = unlockedSeconds > 0 ? (initialElapsed / unlockedSeconds) * 100 : 0;
|
||||||
setProgress(Math.min(initialPercent, 100));
|
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
|
||||||
|
if (processedSrc !== null && src !== processedSrc) {
|
||||||
|
setHasPlayedOnce(false); // Reset for new song
|
||||||
onHasPlayedChange?.(false); // Notify parent
|
onHasPlayedChange?.(false); // Notify parent
|
||||||
|
}
|
||||||
|
|
||||||
// Update processed state
|
// Update processed state
|
||||||
setProcessedSrc(src);
|
setProcessedSrc(src);
|
||||||
@@ -72,7 +75,11 @@ const AudioPlayer = forwardRef<AudioPlayerRef, AudioPlayerProps>(({ src, unlocke
|
|||||||
if (autoPlay) {
|
if (autoPlay) {
|
||||||
// Delay play slightly to ensure currentTime sticks
|
// Delay play slightly to ensure currentTime sticks
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
const playPromise = audioRef.current?.play();
|
if (audioRef.current) {
|
||||||
|
// Use startPos (which may be startTime + processedUnlockedSeconds if more time was unlocked)
|
||||||
|
// instead of always using startTime
|
||||||
|
audioRef.current.currentTime = startPos;
|
||||||
|
const playPromise = audioRef.current.play();
|
||||||
if (playPromise !== undefined) {
|
if (playPromise !== undefined) {
|
||||||
playPromise
|
playPromise
|
||||||
.then(() => {
|
.then(() => {
|
||||||
@@ -86,8 +93,16 @@ const AudioPlayer = forwardRef<AudioPlayerRef, AudioPlayerProps>(({ src, unlocke
|
|||||||
setIsPlaying(false);
|
setIsPlaying(false);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}, 150);
|
}, 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]);
|
}, [src, unlockedSeconds, startTime, autoPlay, processedSrc, processedUnlockedSeconds]);
|
||||||
@@ -97,6 +112,16 @@ const AudioPlayer = forwardRef<AudioPlayerRef, AudioPlayerProps>(({ src, unlocke
|
|||||||
play: () => {
|
play: () => {
|
||||||
if (!audioRef.current) return;
|
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();
|
const playPromise = audioRef.current.play();
|
||||||
if (playPromise !== undefined) {
|
if (playPromise !== undefined) {
|
||||||
playPromise
|
playPromise
|
||||||
@@ -121,8 +146,35 @@ const AudioPlayer = forwardRef<AudioPlayerRef, AudioPlayerProps>(({ src, unlocke
|
|||||||
|
|
||||||
if (isPlaying) {
|
if (isPlaying) {
|
||||||
audioRef.current.pause();
|
audioRef.current.pause();
|
||||||
|
setIsPlaying(false);
|
||||||
} else {
|
} 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();
|
audioRef.current.play();
|
||||||
|
setIsPlaying(true);
|
||||||
onPlay?.();
|
onPlay?.();
|
||||||
|
|
||||||
if (hasPlayedOnce) {
|
if (hasPlayedOnce) {
|
||||||
@@ -132,7 +184,6 @@ const AudioPlayer = forwardRef<AudioPlayerRef, AudioPlayerProps>(({ src, unlocke
|
|||||||
onHasPlayedChange?.(true); // Notify parent
|
onHasPlayedChange?.(true); // Notify parent
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
setIsPlaying(!isPlaying);
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const handleTimeUpdate = () => {
|
const handleTimeUpdate = () => {
|
||||||
|
|||||||
@@ -184,7 +184,7 @@ export default function CurateSpecialEditor({
|
|||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
<WaveformEditor
|
<WaveformEditor
|
||||||
audioUrl={`/uploads/${selectedSpecialSong.song.filename}`}
|
audioUrl={`/api/audio/${selectedSpecialSong.song.filename}`}
|
||||||
startTime={pendingStartTime ?? selectedSpecialSong.startTime}
|
startTime={pendingStartTime ?? selectedSpecialSong.startTime}
|
||||||
duration={totalDuration}
|
duration={totalDuration}
|
||||||
unlockSteps={unlockSteps}
|
unlockSteps={unlockSteps}
|
||||||
|
|||||||
@@ -96,6 +96,10 @@ export default function Game({ dailyPuzzle, genre = null, isSpecial = false, max
|
|||||||
if (gameState.isSolved && !gameState.yearGuessed && dailyPuzzle?.releaseYear) {
|
if (gameState.isSolved && !gameState.yearGuessed && dailyPuzzle?.releaseYear) {
|
||||||
setShowYearModal(true);
|
setShowYearModal(true);
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
// Reset states when gameState is null (e.g., during loading)
|
||||||
|
setHasWon(false);
|
||||||
|
setHasLost(false);
|
||||||
}
|
}
|
||||||
}, [gameState, dailyPuzzle]);
|
}, [gameState, dailyPuzzle]);
|
||||||
|
|
||||||
@@ -164,6 +168,12 @@ export default function Game({ dailyPuzzle, genre = null, isSpecial = false, max
|
|||||||
);
|
);
|
||||||
if (!gameState) return <div>{t('loadingState')}</div>;
|
if (!gameState) return <div>{t('loadingState')}</div>;
|
||||||
|
|
||||||
|
// Use gameState directly for isSolved/isFailed to ensure consistency when returning to completed puzzles
|
||||||
|
// Always use gameState values directly - they are the source of truth
|
||||||
|
// This ensures that when returning to a completed puzzle, the result is shown immediately
|
||||||
|
const isSolved = Boolean(gameState.isSolved);
|
||||||
|
const isFailed = Boolean(gameState.isFailed);
|
||||||
|
|
||||||
const handleGuess = (song: any) => {
|
const handleGuess = (song: any) => {
|
||||||
if (isProcessingGuess) return;
|
if (isProcessingGuess) return;
|
||||||
// Prevent guessing if already solved or failed
|
// Prevent guessing if already solved or failed
|
||||||
@@ -176,6 +186,7 @@ export default function Game({ dailyPuzzle, genre = null, isSpecial = false, max
|
|||||||
if (song.id === dailyPuzzle.songId) {
|
if (song.id === dailyPuzzle.songId) {
|
||||||
addGuess(song.title, true);
|
addGuess(song.title, true);
|
||||||
setHasWon(true);
|
setHasWon(true);
|
||||||
|
// gameState.isSolved will be updated by useGameState
|
||||||
// Track puzzle solved event
|
// Track puzzle solved event
|
||||||
if (typeof window !== 'undefined' && window.plausible) {
|
if (typeof window !== 'undefined' && window.plausible) {
|
||||||
window.plausible('puzzle_solved', {
|
window.plausible('puzzle_solved', {
|
||||||
@@ -196,6 +207,7 @@ export default function Game({ dailyPuzzle, genre = null, isSpecial = false, max
|
|||||||
if (gameState.guesses.length + 1 >= maxAttempts) {
|
if (gameState.guesses.length + 1 >= maxAttempts) {
|
||||||
setHasLost(true);
|
setHasLost(true);
|
||||||
setHasWon(false);
|
setHasWon(false);
|
||||||
|
// gameState.isFailed will be updated by useGameState
|
||||||
// Track puzzle lost event
|
// Track puzzle lost event
|
||||||
if (typeof window !== 'undefined' && window.plausible) {
|
if (typeof window !== 'undefined' && window.plausible) {
|
||||||
window.plausible('puzzle_solved', {
|
window.plausible('puzzle_solved', {
|
||||||
@@ -236,6 +248,7 @@ export default function Game({ dailyPuzzle, genre = null, isSpecial = false, max
|
|||||||
if (gameState.guesses.length + 1 >= maxAttempts) {
|
if (gameState.guesses.length + 1 >= maxAttempts) {
|
||||||
setHasLost(true);
|
setHasLost(true);
|
||||||
setHasWon(false);
|
setHasWon(false);
|
||||||
|
// gameState.isFailed will be updated by useGameState
|
||||||
// Track puzzle lost event
|
// Track puzzle lost event
|
||||||
if (typeof window !== 'undefined' && window.plausible) {
|
if (typeof window !== 'undefined' && window.plausible) {
|
||||||
window.plausible('puzzle_solved', {
|
window.plausible('puzzle_solved', {
|
||||||
@@ -260,6 +273,7 @@ export default function Game({ dailyPuzzle, genre = null, isSpecial = false, max
|
|||||||
giveUp(); // Ensure game is marked as failed and score reset to 0
|
giveUp(); // Ensure game is marked as failed and score reset to 0
|
||||||
setHasLost(true);
|
setHasLost(true);
|
||||||
setHasWon(false);
|
setHasWon(false);
|
||||||
|
// gameState.isFailed will be updated by useGameState
|
||||||
// Track puzzle lost event
|
// Track puzzle lost event
|
||||||
if (typeof window !== 'undefined' && window.plausible) {
|
if (typeof window !== 'undefined' && window.plausible) {
|
||||||
window.plausible('puzzle_solved', {
|
window.plausible('puzzle_solved', {
|
||||||
@@ -409,19 +423,19 @@ export default function Game({ dailyPuzzle, genre = null, isSpecial = false, max
|
|||||||
if (i < gameState.guesses.length) {
|
if (i < gameState.guesses.length) {
|
||||||
if (gameState.guesses[i] === 'SKIPPED') {
|
if (gameState.guesses[i] === 'SKIPPED') {
|
||||||
emojiGrid += '⬛';
|
emojiGrid += '⬛';
|
||||||
} else if (hasWon && i === gameState.guesses.length - 1) {
|
} else if (isSolved && i === gameState.guesses.length - 1) {
|
||||||
emojiGrid += '🟩';
|
emojiGrid += '🟩';
|
||||||
} else {
|
} else {
|
||||||
emojiGrid += '🟥';
|
emojiGrid += '🟥';
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// If game is lost, fill remaining slots with black squares
|
// 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` : '';
|
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
|
// Use current domain from window.location to support both hoerdle.de and hördle.de
|
||||||
@@ -534,7 +548,7 @@ export default function Game({ dailyPuzzle, genre = null, isSpecial = false, max
|
|||||||
src={dailyPuzzle.audioUrl}
|
src={dailyPuzzle.audioUrl}
|
||||||
unlockedSeconds={unlockedSeconds}
|
unlockedSeconds={unlockedSeconds}
|
||||||
startTime={dailyPuzzle.startTime}
|
startTime={dailyPuzzle.startTime}
|
||||||
autoPlay={lastAction === 'SKIP' || (lastAction === 'GUESS' && !hasWon && !hasLost)}
|
autoPlay={lastAction === 'SKIP' || (lastAction === 'GUESS' && !isSolved && !isFailed)}
|
||||||
onReplay={addReplay}
|
onReplay={addReplay}
|
||||||
onHasPlayedChange={setHasPlayedAudio}
|
onHasPlayedChange={setHasPlayedAudio}
|
||||||
/>
|
/>
|
||||||
@@ -543,7 +557,7 @@ export default function Game({ dailyPuzzle, genre = null, isSpecial = false, max
|
|||||||
|
|
||||||
<div className="guess-list">
|
<div className="guess-list">
|
||||||
{gameState.guesses.map((guess, i) => {
|
{gameState.guesses.map((guess, i) => {
|
||||||
const isCorrect = hasWon && i === gameState.guesses.length - 1;
|
const isCorrect = isSolved && i === gameState.guesses.length - 1;
|
||||||
return (
|
return (
|
||||||
<div key={i} className="guess-item">
|
<div key={i} className="guess-item">
|
||||||
<span className="guess-number">#{i + 1}</span>
|
<span className="guess-number">#{i + 1}</span>
|
||||||
@@ -555,7 +569,7 @@ export default function Game({ dailyPuzzle, genre = null, isSpecial = false, max
|
|||||||
})}
|
})}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{!hasWon && !hasLost && (
|
{!isSolved && !isFailed && (
|
||||||
<>
|
<>
|
||||||
<div id="tour-input">
|
<div id="tour-input">
|
||||||
<GuessInput onGuess={handleGuess} disabled={isProcessingGuess} />
|
<GuessInput onGuess={handleGuess} disabled={isProcessingGuess} />
|
||||||
@@ -586,13 +600,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' }}>
|
<h2 style={{ fontSize: '1.5rem', fontWeight: 'bold', marginBottom: '0.5rem' }}>
|
||||||
{hasWon ? t('won') : t('lost')}
|
{isSolved ? t('won') : t('lost')}
|
||||||
</h2>
|
</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}
|
{t('score')}: {gameState.score}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -610,7 +624,7 @@ export default function Game({ dailyPuzzle, genre = null, isSpecial = false, max
|
|||||||
</ul>
|
</ul>
|
||||||
</details>
|
</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' }}>
|
<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
|
<img
|
||||||
|
|||||||
88
docs/TESTING.md
Normal file
88
docs/TESTING.md
Normal file
@@ -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`.
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "hoerdle",
|
"name": "hoerdle",
|
||||||
"version": "0.1.6.29",
|
"version": "0.1.6.38",
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "next dev",
|
"dev": "next dev",
|
||||||
|
|||||||
@@ -63,10 +63,44 @@ fi
|
|||||||
./scripts/backup-restic.sh
|
./scripts/backup-restic.sh
|
||||||
|
|
||||||
# Nur neueste Version holen (shallow fetch), vollständiges Repo ist im Deployment nicht nötig
|
# 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
|
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
|
# Prüfe und erstelle/repariere Netzwerk falls nötig
|
||||||
echo "🌐 Prüfe Docker-Netzwerk..."
|
echo "🌐 Prüfe Docker-Netzwerk..."
|
||||||
if ! docker network ls | grep -q "hoerdle_default"; then
|
if ! docker network ls | grep -q "hoerdle_default"; then
|
||||||
@@ -82,7 +116,7 @@ echo ""
|
|||||||
|
|
||||||
# Build new image in background (doesn't stop running container)
|
# Build new image in background (doesn't stop running container)
|
||||||
echo "🔨 Building new Docker image (this runs while app is still online)..."
|
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
|
# Quick restart with pre-built image
|
||||||
echo "🔄 Restarting with new image (minimal downtime)..."
|
echo "🔄 Restarting with new image (minimal downtime)..."
|
||||||
|
|||||||
Reference in New Issue
Block a user