Compare commits

...

6 Commits

Author SHA1 Message Date
Hördle Bot
616cfec3e7 Bump version to 0.1.6.16 2025-12-05 20:41:40 +01:00
Hördle Bot
ac12e45393 Fix curator specials page: resolve redirect loop and add missing translations 2025-12-05 20:41:38 +01:00
Hördle Bot
223eb62973 Bump version to 0.1.6.15 2025-12-05 20:13:31 +01:00
Hördle Bot
dc4bdd36c7 Fix textarea alignment: add box-sizing border-box to prevent overflow 2025-12-05 20:13:27 +01:00
Hördle Bot
136f881252 Bump version to 0.1.6.14 2025-12-05 18:43:15 +01:00
Hördle Bot
fd11048f2c Fix daily puzzle selection: always select from songs with minimum activations 2025-12-05 18:43:09 +01:00
7 changed files with 197 additions and 40 deletions

View File

@@ -1,7 +1,9 @@
'use client'; 'use client';
import CuratorSpecialsPage from '@/app/curator/specials/page'; import CuratorSpecialsClient from '@/app/curator/specials/CuratorSpecialsClient';
export default CuratorSpecialsPage; export default function CuratorSpecialsPage() {
return <CuratorSpecialsClient />;
}

View File

@@ -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>
);
}

View File

@@ -681,7 +681,8 @@ export default function Game({ dailyPuzzle, genre = null, isSpecial = false, max
fontFamily: 'inherit', fontFamily: 'inherit',
resize: 'vertical', resize: 'vertical',
marginBottom: '0.5rem', marginBottom: '0.5rem',
display: 'block' // Ensure block display for proper alignment display: 'block',
boxSizing: 'border-box' // Ensure padding and border are included in width
}} }}
disabled={commentSending} disabled={commentSending}
/> />

View File

@@ -29,9 +29,7 @@ export async function getOrCreateDailyPuzzle(genre: Genre | null = null) {
const allSongs = await prisma.song.findMany({ const allSongs = await prisma.song.findMany({
where: whereClause, where: whereClause,
include: { include: {
puzzles: { puzzles: true, // Load ALL puzzles, not just for this genre (to use total activations)
where: { genreId: genreId }
},
}, },
}); });
@@ -40,28 +38,24 @@ export async function getOrCreateDailyPuzzle(genre: Genre | null = null) {
return null; return null;
} }
// Calculate weights // Find songs with the minimum number of activations (all puzzles, not just for this genre)
const weightedSongs = allSongs.map(song => ({ // Only select from songs with the fewest activations to ensure fair distribution
const songsWithActivations = allSongs.map(song => ({
song, song,
weight: 1.0 / (song.puzzles.length + 1), activations: song.puzzles.length,
})); }));
// Calculate total weight // Find minimum activations
const totalWeight = weightedSongs.reduce((sum, item) => sum + item.weight, 0); const minActivations = Math.min(...songsWithActivations.map(item => item.activations));
// Pick a random song based on weights using cumulative weights // Filter to only songs with minimum activations
// This ensures proper distribution and handles edge cases const songsWithMinActivations = songsWithActivations
let random = Math.random() * totalWeight; .filter(item => item.activations === minActivations)
let selectedSong = weightedSongs[weightedSongs.length - 1].song; // Fallback to last song .map(item => item.song);
let cumulativeWeight = 0; // Randomly select from songs with minimum activations
for (const item of weightedSongs) { const randomIndex = Math.floor(Math.random() * songsWithMinActivations.length);
cumulativeWeight += item.weight; const selectedSong = songsWithMinActivations[randomIndex];
if (random <= cumulativeWeight) {
selectedSong = item.song;
break;
}
}
// Create the daily puzzle // Create the daily puzzle
try { try {
@@ -141,7 +135,7 @@ export async function getOrCreateSpecialPuzzle(special: Special) {
song: { song: {
include: { include: {
puzzles: { puzzles: {
where: { specialId: special.id } where: { specialId: special.id } // For specials, only count puzzles within this special
} }
} }
} }
@@ -150,25 +144,25 @@ export async function getOrCreateSpecialPuzzle(special: Special) {
if (specialSongs.length === 0) return null; if (specialSongs.length === 0) return null;
// Calculate weights // Find songs with the minimum number of activations within this special
const weightedSongs = specialSongs.map(specialSong => ({ // Note: For specials, we only count puzzles within the special (not all puzzles),
// since specials are curated, separate lists
const songsWithActivations = specialSongs.map(specialSong => ({
specialSong, specialSong,
weight: 1.0 / (specialSong.song.puzzles.length + 1), activations: specialSong.song.puzzles.length,
})); }));
const totalWeight = weightedSongs.reduce((sum, item) => sum + item.weight, 0); // Find minimum activations
let random = Math.random() * totalWeight; const minActivations = Math.min(...songsWithActivations.map(item => item.activations));
let selectedSpecialSong = weightedSongs[weightedSongs.length - 1].specialSong; // Fallback to last song
// Pick a random song based on weights using cumulative weights // Filter to only songs with minimum activations
let cumulativeWeight = 0; const songsWithMinActivations = songsWithActivations
for (const item of weightedSongs) { .filter(item => item.activations === minActivations)
cumulativeWeight += item.weight; .map(item => item.specialSong);
if (random <= cumulativeWeight) {
selectedSpecialSong = item.specialSong; // Randomly select from songs with minimum activations
break; const randomIndex = Math.floor(Math.random() * songsWithMinActivations.length);
} const selectedSpecialSong = songsWithMinActivations[randomIndex];
}
try { try {
dailyPuzzle = await prisma.dailyPuzzle.create({ dailyPuzzle = await prisma.dailyPuzzle.create({

View File

@@ -279,11 +279,13 @@
"batchUpdateError": "Fehler: {error}", "batchUpdateError": "Fehler: {error}",
"batchUpdateNetworkError": "Netzwerkfehler bei der Batch-Aktualisierung", "batchUpdateNetworkError": "Netzwerkfehler bei der Batch-Aktualisierung",
"backToDashboard": "Zurück zum Dashboard", "backToDashboard": "Zurück zum Dashboard",
"loading": "Laden...",
"curateSpecialsButton": "Specials kuratieren", "curateSpecialsButton": "Specials kuratieren",
"curateSpecialsTitle": "Deine Specials kuratieren", "curateSpecialsTitle": "Deine Specials kuratieren",
"curateSpecialsDescription": "Hier kannst du die Startzeiten der Songs in deinen zugewiesenen Specials für das Rätsel feinjustieren.", "curateSpecialsDescription": "Hier kannst du die Startzeiten der Songs in deinen zugewiesenen Specials für das Rätsel feinjustieren.",
"noSpecialPermissions": "Dir sind keine Specials zugeordnet.", "noSpecialPermissions": "Dir sind keine Specials zugeordnet.",
"noSpecialsInScope": "Keine Specials zum Kuratieren vorhanden.", "noSpecialsInScope": "Keine Specials zum Kuratieren vorhanden.",
"noSpecialsAssigned": "Dir sind keine Specials zugeordnet.",
"curateSpecialSongCount": "{count, plural, one {# Song} other {# Songs}} in diesem Special", "curateSpecialSongCount": "{count, plural, one {# Song} other {# Songs}} in diesem Special",
"curateSpecialOpen": "Öffnen", "curateSpecialOpen": "Öffnen",
"specialForbidden": "Du darfst dieses Special nicht bearbeiten.", "specialForbidden": "Du darfst dieses Special nicht bearbeiten.",

View File

@@ -279,11 +279,13 @@
"batchUpdateError": "Error: {error}", "batchUpdateError": "Error: {error}",
"batchUpdateNetworkError": "Network error during batch update", "batchUpdateNetworkError": "Network error during batch update",
"backToDashboard": "Back to dashboard", "backToDashboard": "Back to dashboard",
"loading": "Loading...",
"curateSpecialsButton": "Curate Specials", "curateSpecialsButton": "Curate Specials",
"curateSpecialsTitle": "Curate your Specials", "curateSpecialsTitle": "Curate your Specials",
"curateSpecialsDescription": "Here you can fine-tune the start times of the songs in your assigned specials for the puzzle.", "curateSpecialsDescription": "Here you can fine-tune the start times of the songs in your assigned specials for the puzzle.",
"noSpecialPermissions": "You do not have any specials assigned to you.", "noSpecialPermissions": "You do not have any specials assigned to you.",
"noSpecialsInScope": "No specials available for you to curate.", "noSpecialsInScope": "No specials available for you to curate.",
"noSpecialsAssigned": "No specials assigned to you.",
"curateSpecialSongCount": "{count, plural, one {# song} other {# songs}} in this special", "curateSpecialSongCount": "{count, plural, one {# song} other {# songs}} in this special",
"curateSpecialOpen": "Open", "curateSpecialOpen": "Open",
"specialForbidden": "You are not allowed to edit this special.", "specialForbidden": "You are not allowed to edit this special.",

View File

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