Compare commits
16 Commits
223eb62973
...
v0.1.6.23
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
aed300b1bb | ||
|
|
e93b3b9096 | ||
|
|
cdd2ff15d5 | ||
|
|
adcfbfa811 | ||
|
|
0cdfe90476 | ||
|
|
1715ca02ed | ||
|
|
ece3991d37 | ||
|
|
fa3b64f490 | ||
|
|
fa6f1097dd | ||
|
|
d2ec0119ce | ||
|
|
8914c552cd | ||
|
|
d816422419 | ||
|
|
da777ffcf3 | ||
|
|
0d806daf66 | ||
|
|
616cfec3e7 | ||
|
|
ac12e45393 |
@@ -115,6 +115,7 @@ export default function AdminPage({ params }: { params: { locale: string } }) {
|
||||
const [newSpecialSubtitle, setNewSpecialSubtitle] = useState({ de: '', en: '' });
|
||||
const [newSpecialMaxAttempts, setNewSpecialMaxAttempts] = useState(7);
|
||||
const [newSpecialUnlockSteps, setNewSpecialUnlockSteps] = useState('[2,4,7,11,16,30,60]');
|
||||
const [newSpecialUnlockStepsError, setNewSpecialUnlockStepsError] = useState<string | null>(null);
|
||||
const [newSpecialLaunchDate, setNewSpecialLaunchDate] = useState('');
|
||||
const [newSpecialEndDate, setNewSpecialEndDate] = useState('');
|
||||
const [newSpecialCurator, setNewSpecialCurator] = useState('');
|
||||
@@ -124,6 +125,7 @@ export default function AdminPage({ params }: { params: { locale: string } }) {
|
||||
const [editSpecialSubtitle, setEditSpecialSubtitle] = useState({ de: '', en: '' });
|
||||
const [editSpecialMaxAttempts, setEditSpecialMaxAttempts] = useState(7);
|
||||
const [editSpecialUnlockSteps, setEditSpecialUnlockSteps] = useState('[2,4,7,11,16,30,60]');
|
||||
const [editSpecialUnlockStepsError, setEditSpecialUnlockStepsError] = useState<string | null>(null);
|
||||
const [editSpecialLaunchDate, setEditSpecialLaunchDate] = useState('');
|
||||
const [editSpecialEndDate, setEditSpecialEndDate] = useState('');
|
||||
const [editSpecialCurator, setEditSpecialCurator] = useState('');
|
||||
@@ -239,6 +241,25 @@ export default function AdminPage({ params }: { params: { locale: string } }) {
|
||||
}
|
||||
};
|
||||
|
||||
// Validate JSON for unlock steps
|
||||
const validateUnlockSteps = (value: string): string | null => {
|
||||
if (!value.trim()) {
|
||||
return t('unlockStepsRequired');
|
||||
}
|
||||
try {
|
||||
const parsed = JSON.parse(value);
|
||||
if (!Array.isArray(parsed)) {
|
||||
return t('unlockStepsMustBeArray');
|
||||
}
|
||||
if (parsed.some((item: any) => typeof item !== 'number' || item < 1)) {
|
||||
return t('unlockStepsMustBePositiveNumbers');
|
||||
}
|
||||
return null;
|
||||
} catch (e) {
|
||||
return t('unlockStepsInvalidJson');
|
||||
}
|
||||
};
|
||||
|
||||
const handleLogout = () => {
|
||||
localStorage.removeItem('hoerdle_admin_auth');
|
||||
setIsAuthenticated(false);
|
||||
@@ -352,6 +373,15 @@ export default function AdminPage({ params }: { params: { locale: string } }) {
|
||||
const handleCreateSpecial = async (e: React.FormEvent) => {
|
||||
e.preventDefault();
|
||||
if (!newSpecialName.de.trim() && !newSpecialName.en.trim()) return;
|
||||
|
||||
// Validate unlock steps
|
||||
const unlockStepsError = validateUnlockSteps(newSpecialUnlockSteps);
|
||||
if (unlockStepsError) {
|
||||
setNewSpecialUnlockStepsError(unlockStepsError);
|
||||
return;
|
||||
}
|
||||
setNewSpecialUnlockStepsError(null);
|
||||
|
||||
const res = await fetch('/api/specials', {
|
||||
method: 'POST',
|
||||
headers: getAuthHeaders(),
|
||||
@@ -370,12 +400,14 @@ export default function AdminPage({ params }: { params: { locale: string } }) {
|
||||
setNewSpecialSubtitle({ de: '', en: '' });
|
||||
setNewSpecialMaxAttempts(7);
|
||||
setNewSpecialUnlockSteps('[2,4,7,11,16,30,60]');
|
||||
setNewSpecialUnlockStepsError(null);
|
||||
setNewSpecialLaunchDate('');
|
||||
setNewSpecialEndDate('');
|
||||
setNewSpecialCurator('');
|
||||
fetchSpecials();
|
||||
} else {
|
||||
alert('Failed to create special');
|
||||
const errorData = await res.json().catch(() => ({}));
|
||||
alert(errorData.error || 'Failed to create special');
|
||||
}
|
||||
};
|
||||
|
||||
@@ -455,6 +487,7 @@ export default function AdminPage({ params }: { params: { locale: string } }) {
|
||||
setEditSpecialSubtitle(special.subtitle ? (typeof special.subtitle === 'string' ? { de: special.subtitle, en: special.subtitle } : special.subtitle) : { de: '', en: '' });
|
||||
setEditSpecialMaxAttempts(special.maxAttempts);
|
||||
setEditSpecialUnlockSteps(special.unlockSteps);
|
||||
setEditSpecialUnlockStepsError(null);
|
||||
setEditSpecialLaunchDate(special.launchDate ? new Date(special.launchDate).toISOString().split('T')[0] : '');
|
||||
setEditSpecialEndDate(special.endDate ? new Date(special.endDate).toISOString().split('T')[0] : '');
|
||||
setEditSpecialCurator(special.curator || '');
|
||||
@@ -462,6 +495,15 @@ export default function AdminPage({ params }: { params: { locale: string } }) {
|
||||
|
||||
const saveEditedSpecial = async () => {
|
||||
if (editingSpecialId === null) return;
|
||||
|
||||
// Validate unlock steps
|
||||
const unlockStepsError = validateUnlockSteps(editSpecialUnlockSteps);
|
||||
if (unlockStepsError) {
|
||||
setEditSpecialUnlockStepsError(unlockStepsError);
|
||||
return;
|
||||
}
|
||||
setEditSpecialUnlockStepsError(null);
|
||||
|
||||
const res = await fetch('/api/specials', {
|
||||
method: 'PUT',
|
||||
headers: getAuthHeaders(),
|
||||
@@ -478,9 +520,11 @@ export default function AdminPage({ params }: { params: { locale: string } }) {
|
||||
});
|
||||
if (res.ok) {
|
||||
setEditingSpecialId(null);
|
||||
setEditSpecialUnlockStepsError(null);
|
||||
fetchSpecials();
|
||||
} else {
|
||||
alert('Failed to update special');
|
||||
const errorData = await res.json().catch(() => ({}));
|
||||
alert(errorData.error || 'Failed to update special');
|
||||
}
|
||||
};
|
||||
|
||||
@@ -1300,8 +1344,38 @@ export default function AdminPage({ params }: { params: { locale: string } }) {
|
||||
<input type="number" placeholder={t('maxAttempts')} value={newSpecialMaxAttempts} onChange={e => setNewSpecialMaxAttempts(Number(e.target.value))} className="form-input" min={1} style={{ width: '80px' }} />
|
||||
</div>
|
||||
<div style={{ display: 'flex', flexDirection: 'column' }}>
|
||||
<label style={{ fontSize: '0.75rem', color: '#666' }}>{t('unlockSteps')}</label>
|
||||
<input type="text" placeholder={t('unlockSteps')} value={newSpecialUnlockSteps} onChange={e => setNewSpecialUnlockSteps(e.target.value)} className="form-input" style={{ width: '200px' }} />
|
||||
<label style={{ fontSize: '0.75rem', color: '#666', display: 'flex', alignItems: 'center', gap: '0.25rem' }}>
|
||||
{t('unlockSteps')}
|
||||
{newSpecialUnlockStepsError && (
|
||||
<span
|
||||
title={newSpecialUnlockStepsError}
|
||||
style={{
|
||||
color: '#ef4444',
|
||||
cursor: 'help',
|
||||
fontSize: '0.875rem'
|
||||
}}
|
||||
>
|
||||
⚠️
|
||||
</span>
|
||||
)}
|
||||
</label>
|
||||
<input
|
||||
type="text"
|
||||
placeholder={t('unlockSteps')}
|
||||
value={newSpecialUnlockSteps}
|
||||
onChange={e => {
|
||||
const value = e.target.value;
|
||||
setNewSpecialUnlockSteps(value);
|
||||
const error = validateUnlockSteps(value);
|
||||
setNewSpecialUnlockStepsError(error);
|
||||
}}
|
||||
className="form-input"
|
||||
title={newSpecialUnlockStepsError || undefined}
|
||||
style={{
|
||||
width: '200px',
|
||||
borderColor: newSpecialUnlockStepsError ? '#ef4444' : undefined
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
<div style={{ display: 'flex', flexDirection: 'column' }}>
|
||||
<label style={{ fontSize: '0.75rem', color: '#666' }}>{t('launchDate')}</label>
|
||||
@@ -1315,7 +1389,18 @@ export default function AdminPage({ params }: { params: { locale: string } }) {
|
||||
<label style={{ fontSize: '0.75rem', color: '#666' }}>{t('curator')}</label>
|
||||
<input type="text" placeholder={t('curator')} value={newSpecialCurator} onChange={e => setNewSpecialCurator(e.target.value)} className="form-input" />
|
||||
</div>
|
||||
<button type="submit" className="btn-primary" style={{ height: '38px' }}>{t('addSpecial')}</button>
|
||||
<button
|
||||
type="submit"
|
||||
className="btn-primary"
|
||||
style={{
|
||||
height: '38px',
|
||||
opacity: newSpecialUnlockStepsError ? 0.5 : 1,
|
||||
cursor: newSpecialUnlockStepsError ? 'not-allowed' : 'pointer'
|
||||
}}
|
||||
disabled={!!newSpecialUnlockStepsError}
|
||||
>
|
||||
{t('addSpecial')}
|
||||
</button>
|
||||
</div>
|
||||
</form>
|
||||
<div style={{ display: 'flex', flexWrap: 'wrap', gap: '0.5rem' }}>
|
||||
@@ -1379,8 +1464,37 @@ export default function AdminPage({ params }: { params: { locale: string } }) {
|
||||
<input type="number" value={editSpecialMaxAttempts} onChange={e => setEditSpecialMaxAttempts(Number(e.target.value))} className="form-input" min={1} style={{ width: '80px' }} />
|
||||
</div>
|
||||
<div style={{ display: 'flex', flexDirection: 'column' }}>
|
||||
<label style={{ fontSize: '0.75rem', color: '#666' }}>{t('unlockSteps')}</label>
|
||||
<input type="text" value={editSpecialUnlockSteps} onChange={e => setEditSpecialUnlockSteps(e.target.value)} className="form-input" style={{ width: '200px' }} />
|
||||
<label style={{ fontSize: '0.75rem', color: '#666', display: 'flex', alignItems: 'center', gap: '0.25rem' }}>
|
||||
{t('unlockSteps')}
|
||||
{editSpecialUnlockStepsError && (
|
||||
<span
|
||||
title={editSpecialUnlockStepsError}
|
||||
style={{
|
||||
color: '#ef4444',
|
||||
cursor: 'help',
|
||||
fontSize: '0.875rem'
|
||||
}}
|
||||
>
|
||||
⚠️
|
||||
</span>
|
||||
)}
|
||||
</label>
|
||||
<input
|
||||
type="text"
|
||||
value={editSpecialUnlockSteps}
|
||||
onChange={e => {
|
||||
const value = e.target.value;
|
||||
setEditSpecialUnlockSteps(value);
|
||||
const error = validateUnlockSteps(value);
|
||||
setEditSpecialUnlockStepsError(error);
|
||||
}}
|
||||
className="form-input"
|
||||
title={editSpecialUnlockStepsError || undefined}
|
||||
style={{
|
||||
width: '200px',
|
||||
borderColor: editSpecialUnlockStepsError ? '#ef4444' : undefined
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
<div style={{ display: 'flex', flexDirection: 'column' }}>
|
||||
<label style={{ fontSize: '0.75rem', color: '#666' }}>{t('launchDate')}</label>
|
||||
@@ -1394,7 +1508,18 @@ export default function AdminPage({ params }: { params: { locale: string } }) {
|
||||
<label style={{ fontSize: '0.75rem', color: '#666' }}>{t('curator')}</label>
|
||||
<input type="text" value={editSpecialCurator} onChange={e => setEditSpecialCurator(e.target.value)} className="form-input" />
|
||||
</div>
|
||||
<button onClick={saveEditedSpecial} className="btn-primary" style={{ height: '38px' }}>{t('save')}</button>
|
||||
<button
|
||||
onClick={saveEditedSpecial}
|
||||
className="btn-primary"
|
||||
style={{
|
||||
height: '38px',
|
||||
opacity: editSpecialUnlockStepsError ? 0.5 : 1,
|
||||
cursor: editSpecialUnlockStepsError ? 'not-allowed' : 'pointer'
|
||||
}}
|
||||
disabled={!!editSpecialUnlockStepsError}
|
||||
>
|
||||
{t('save')}
|
||||
</button>
|
||||
<button onClick={() => setEditingSpecialId(null)} className="btn-secondary" style={{ height: '38px' }}>{t('cancel')}</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1,7 +1,9 @@
|
||||
'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 />;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -17,22 +17,27 @@ export default function SpecialEditorPage() {
|
||||
const [special, setSpecial] = useState<CurateSpecial | null>(null);
|
||||
const [loading, setLoading] = useState(true);
|
||||
|
||||
useEffect(() => {
|
||||
const fetchSpecial = async () => {
|
||||
try {
|
||||
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 {
|
||||
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);
|
||||
}
|
||||
};
|
||||
}
|
||||
};
|
||||
|
||||
fetchSpecial();
|
||||
useEffect(() => {
|
||||
fetchSpecial(true);
|
||||
}, [specialId]);
|
||||
|
||||
const handleSaveStartTime = async (songId: number, startTime: number) => {
|
||||
@@ -46,6 +51,9 @@ export default function SpecialEditorPage() {
|
||||
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);
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
@@ -40,6 +40,21 @@ export async function POST(request: Request) {
|
||||
return NextResponse.json({ error: 'Name is required' }, { status: 400 });
|
||||
}
|
||||
|
||||
// Validate unlockSteps JSON
|
||||
if (unlockSteps) {
|
||||
try {
|
||||
const parsed = JSON.parse(unlockSteps);
|
||||
if (!Array.isArray(parsed)) {
|
||||
return NextResponse.json({ error: 'Unlock steps must be a JSON array' }, { status: 400 });
|
||||
}
|
||||
if (parsed.some((item: any) => typeof item !== 'number' || item < 1)) {
|
||||
return NextResponse.json({ error: 'All unlock step values must be positive numbers' }, { status: 400 });
|
||||
}
|
||||
} catch (e) {
|
||||
return NextResponse.json({ error: 'Invalid JSON format for unlock steps. Please use an array of numbers, e.g. [2,4,7,11,16,30,60]' }, { status: 400 });
|
||||
}
|
||||
}
|
||||
|
||||
// Ensure name is stored as JSON
|
||||
const nameData = typeof name === 'string' ? { de: name, en: name } : name;
|
||||
const subtitleData = subtitle ? (typeof subtitle === 'string' ? { de: subtitle, en: subtitle } : subtitle) : null;
|
||||
@@ -81,6 +96,21 @@ export async function PUT(request: Request) {
|
||||
return NextResponse.json({ error: 'ID required' }, { status: 400 });
|
||||
}
|
||||
|
||||
// Validate unlockSteps JSON if provided
|
||||
if (unlockSteps !== undefined) {
|
||||
try {
|
||||
const parsed = JSON.parse(unlockSteps);
|
||||
if (!Array.isArray(parsed)) {
|
||||
return NextResponse.json({ error: 'Unlock steps must be a JSON array' }, { status: 400 });
|
||||
}
|
||||
if (parsed.some((item: any) => typeof item !== 'number' || item < 1)) {
|
||||
return NextResponse.json({ error: 'All unlock step values must be positive numbers' }, { status: 400 });
|
||||
}
|
||||
} catch (e) {
|
||||
return NextResponse.json({ error: 'Invalid JSON format for unlock steps. Please use an array of numbers, e.g. [2,4,7,11,16,30,60]' }, { status: 400 });
|
||||
}
|
||||
}
|
||||
|
||||
const updateData: any = {};
|
||||
if (name) updateData.name = typeof name === 'string' ? { de: name, en: name } : name;
|
||||
if (subtitle !== undefined) updateData.subtitle = subtitle ? (typeof subtitle === 'string' ? { de: subtitle, en: subtitle } : subtitle) : null;
|
||||
|
||||
156
app/curator/specials/CuratorSpecialsClient.tsx
Normal file
156
app/curator/specials/CuratorSpecialsClient.tsx
Normal 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>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -25,32 +25,36 @@ export default function CuratorSpecialEditorPage() {
|
||||
const [loading, setLoading] = useState(true);
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
|
||||
useEffect(() => {
|
||||
const fetchSpecial = async () => {
|
||||
try {
|
||||
const fetchSpecial = async (showLoading = true) => {
|
||||
try {
|
||||
if (showLoading) {
|
||||
setLoading(true);
|
||||
const res = await fetch(`/api/curator/specials/${specialId}`, {
|
||||
headers: getCuratorAuthHeaders(),
|
||||
});
|
||||
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) {
|
||||
}
|
||||
const res = await fetch(`/api/curator/specials/${specialId}`, {
|
||||
headers: getCuratorAuthHeaders(),
|
||||
});
|
||||
if (res.status === 403) {
|
||||
setError(t('specialForbidden'));
|
||||
return;
|
||||
}
|
||||
if (!res.ok) {
|
||||
setError('Failed to load special');
|
||||
} finally {
|
||||
return;
|
||||
}
|
||||
const data = await res.json();
|
||||
setSpecial(data);
|
||||
} catch (e) {
|
||||
setError('Failed to load special');
|
||||
} finally {
|
||||
if (showLoading) {
|
||||
setLoading(false);
|
||||
}
|
||||
};
|
||||
}
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
if (specialId) {
|
||||
fetchSpecial();
|
||||
fetchSpecial(true);
|
||||
}
|
||||
}, [specialId, t]);
|
||||
|
||||
@@ -67,6 +71,9 @@ export default function CuratorSpecialEditorPage() {
|
||||
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);
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
@@ -98,19 +98,6 @@ export default function CurateSpecialEditor({
|
||||
return (
|
||||
<div style={{ padding: '2rem', maxWidth: '1200px', margin: '0 auto' }}>
|
||||
<div style={{ marginBottom: '2rem' }}>
|
||||
<button
|
||||
onClick={onBack}
|
||||
style={{
|
||||
padding: '0.5rem 1rem',
|
||||
background: '#e5e7eb',
|
||||
border: 'none',
|
||||
borderRadius: '0.5rem',
|
||||
cursor: 'pointer',
|
||||
marginBottom: '1rem'
|
||||
}}
|
||||
>
|
||||
{backLabel}
|
||||
</button>
|
||||
<h1 style={{ fontSize: '2rem', fontWeight: 'bold' }}>
|
||||
{headerPrefix} {specialName}
|
||||
</h1>
|
||||
|
||||
@@ -16,6 +16,9 @@ export default function WaveformEditor({ audioUrl, startTime, duration, unlockSt
|
||||
const [audioDuration, setAudioDuration] = useState(0);
|
||||
const [isPlaying, setIsPlaying] = useState(false);
|
||||
const [playingSegment, setPlayingSegment] = useState<number | null>(null);
|
||||
const [isPlayingFullTitle, setIsPlayingFullTitle] = useState(false);
|
||||
const [pausedPosition, setPausedPosition] = useState<number | null>(null); // Position when paused
|
||||
const [pausedType, setPausedType] = useState<'selection' | 'title' | null>(null); // Type of playback that was paused
|
||||
const [zoom, setZoom] = useState(1); // 1 = full view, higher = zoomed in
|
||||
const [viewOffset, setViewOffset] = useState(0); // Offset in seconds for panning
|
||||
const [playbackPosition, setPlaybackPosition] = useState<number | null>(null); // Current playback position in seconds
|
||||
@@ -133,6 +136,24 @@ export default function WaveformEditor({ audioUrl, startTime, duration, unlockSt
|
||||
|
||||
cumulativeTime = step;
|
||||
});
|
||||
|
||||
// Draw end marker for the last segment (at startTime + duration)
|
||||
const endTime = startTime + duration;
|
||||
const endPx = ((endTime - visibleStart) / visibleDuration) * width;
|
||||
if (endPx >= 0 && endPx <= width) {
|
||||
ctx.beginPath();
|
||||
ctx.moveTo(endPx, 0);
|
||||
ctx.lineTo(endPx, height);
|
||||
ctx.stroke();
|
||||
|
||||
// Draw "End" label
|
||||
ctx.setLineDash([]);
|
||||
ctx.fillStyle = '#ef4444';
|
||||
ctx.font = 'bold 12px sans-serif';
|
||||
ctx.fillText('End', endPx + 3, 15);
|
||||
ctx.setLineDash([5, 5]);
|
||||
}
|
||||
|
||||
ctx.setLineDash([]);
|
||||
|
||||
// Draw hover preview (semi-transparent)
|
||||
@@ -215,11 +236,21 @@ export default function WaveformEditor({ audioUrl, startTime, duration, unlockSt
|
||||
setHoverPreviewTime(null);
|
||||
};
|
||||
|
||||
const stopPlayback = () => {
|
||||
const stopPlayback = (savePosition = false) => {
|
||||
if (savePosition && playbackPosition !== null) {
|
||||
// Save current position for resume
|
||||
setPausedPosition(playbackPosition);
|
||||
// Keep playbackPosition visible (don't set to null) so cursor stays visible
|
||||
} else {
|
||||
// Clear paused position if stopping completely
|
||||
setPausedPosition(null);
|
||||
setPausedType(null);
|
||||
setPlaybackPosition(null);
|
||||
}
|
||||
sourceRef.current?.stop();
|
||||
setIsPlaying(false);
|
||||
setPlayingSegment(null);
|
||||
setPlaybackPosition(null);
|
||||
setIsPlayingFullTitle(false);
|
||||
if (animationFrameRef.current) {
|
||||
cancelAnimationFrame(animationFrameRef.current);
|
||||
animationFrameRef.current = null;
|
||||
@@ -287,30 +318,119 @@ export default function WaveformEditor({ audioUrl, startTime, duration, unlockSt
|
||||
const handlePlayFull = () => {
|
||||
if (!audioBuffer || !audioContextRef.current) return;
|
||||
|
||||
if (isPlaying) {
|
||||
stopPlayback();
|
||||
} else {
|
||||
const source = audioContextRef.current.createBufferSource();
|
||||
source.buffer = audioBuffer;
|
||||
source.connect(audioContextRef.current.destination);
|
||||
|
||||
playbackStartTimeRef.current = audioContextRef.current.currentTime;
|
||||
playbackOffsetRef.current = startTime;
|
||||
|
||||
source.start(0, startTime, duration);
|
||||
sourceRef.current = source;
|
||||
setIsPlaying(true);
|
||||
setPlaybackPosition(startTime);
|
||||
|
||||
source.onended = () => {
|
||||
setIsPlaying(false);
|
||||
setPlaybackPosition(null);
|
||||
if (animationFrameRef.current) {
|
||||
cancelAnimationFrame(animationFrameRef.current);
|
||||
animationFrameRef.current = null;
|
||||
}
|
||||
};
|
||||
// If full selection playback is already playing, pause it
|
||||
if (isPlaying && playingSegment === null && !isPlayingFullTitle) {
|
||||
stopPlayback(true); // Save position
|
||||
setPausedType('selection');
|
||||
return;
|
||||
}
|
||||
|
||||
// Stop any current playback (segment, full selection, or full title)
|
||||
stopPlayback();
|
||||
|
||||
// Determine start position (resume from pause or start from beginning)
|
||||
const resumePosition = pausedType === 'selection' && pausedPosition !== null
|
||||
? pausedPosition
|
||||
: startTime;
|
||||
const remainingDuration = resumePosition >= startTime + duration
|
||||
? 0
|
||||
: (startTime + duration) - resumePosition;
|
||||
|
||||
if (remainingDuration <= 0) {
|
||||
// Already finished, reset
|
||||
setPausedPosition(null);
|
||||
setPausedType(null);
|
||||
return;
|
||||
}
|
||||
|
||||
// Start full selection playback
|
||||
const source = audioContextRef.current.createBufferSource();
|
||||
source.buffer = audioBuffer;
|
||||
source.connect(audioContextRef.current.destination);
|
||||
|
||||
playbackStartTimeRef.current = audioContextRef.current.currentTime;
|
||||
playbackOffsetRef.current = resumePosition;
|
||||
|
||||
source.start(0, resumePosition, remainingDuration);
|
||||
sourceRef.current = source;
|
||||
setIsPlaying(true);
|
||||
setPlayingSegment(null);
|
||||
setIsPlayingFullTitle(false);
|
||||
setPausedPosition(null);
|
||||
setPausedType(null);
|
||||
setPlaybackPosition(resumePosition);
|
||||
|
||||
source.onended = () => {
|
||||
setIsPlaying(false);
|
||||
setPlayingSegment(null);
|
||||
setIsPlayingFullTitle(false);
|
||||
setPlaybackPosition(null);
|
||||
setPausedPosition(null);
|
||||
setPausedType(null);
|
||||
if (animationFrameRef.current) {
|
||||
cancelAnimationFrame(animationFrameRef.current);
|
||||
animationFrameRef.current = null;
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
const handlePlayFullTitle = () => {
|
||||
if (!audioBuffer || !audioContextRef.current) return;
|
||||
|
||||
// If full title playback is already playing, pause it
|
||||
if (isPlaying && isPlayingFullTitle) {
|
||||
stopPlayback(true); // Save position
|
||||
setPausedType('title');
|
||||
return;
|
||||
}
|
||||
|
||||
// Stop any current playback (segment, full selection, or full title)
|
||||
stopPlayback();
|
||||
|
||||
// Determine start position (resume from pause or start from beginning)
|
||||
const resumePosition = pausedType === 'title' && pausedPosition !== null
|
||||
? pausedPosition
|
||||
: 0;
|
||||
const remainingDuration = resumePosition >= audioDuration
|
||||
? 0
|
||||
: audioDuration - resumePosition;
|
||||
|
||||
if (remainingDuration <= 0) {
|
||||
// Already finished, reset
|
||||
setPausedPosition(null);
|
||||
setPausedType(null);
|
||||
return;
|
||||
}
|
||||
|
||||
// Start full title playback (from resumePosition to audioDuration)
|
||||
const source = audioContextRef.current.createBufferSource();
|
||||
source.buffer = audioBuffer;
|
||||
source.connect(audioContextRef.current.destination);
|
||||
|
||||
playbackStartTimeRef.current = audioContextRef.current.currentTime;
|
||||
playbackOffsetRef.current = resumePosition;
|
||||
|
||||
source.start(0, resumePosition, remainingDuration);
|
||||
sourceRef.current = source;
|
||||
setIsPlaying(true);
|
||||
setPlayingSegment(null);
|
||||
setIsPlayingFullTitle(true);
|
||||
setPausedPosition(null);
|
||||
setPausedType(null);
|
||||
setPlaybackPosition(resumePosition);
|
||||
|
||||
source.onended = () => {
|
||||
setIsPlaying(false);
|
||||
setPlayingSegment(null);
|
||||
setIsPlayingFullTitle(false);
|
||||
setPlaybackPosition(null);
|
||||
setPausedPosition(null);
|
||||
setPausedType(null);
|
||||
if (animationFrameRef.current) {
|
||||
cancelAnimationFrame(animationFrameRef.current);
|
||||
animationFrameRef.current = null;
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
const handleZoomIn = () => setZoom(prev => Math.min(prev * 1.5, 10));
|
||||
@@ -401,7 +521,29 @@ export default function WaveformEditor({ audioUrl, startTime, duration, unlockSt
|
||||
fontWeight: 'bold'
|
||||
}}
|
||||
>
|
||||
{isPlaying && playingSegment === null ? '⏸ Pause' : '▶ Play Full Selection'}
|
||||
{isPlaying && playingSegment === null && !isPlayingFullTitle
|
||||
? '⏸ Pause'
|
||||
: (pausedType === 'selection' && pausedPosition !== null
|
||||
? '▶ Resume'
|
||||
: '▶ Play Full Selection')}
|
||||
</button>
|
||||
<button
|
||||
onClick={handlePlayFullTitle}
|
||||
style={{
|
||||
padding: '0.5rem 1rem',
|
||||
background: '#10b981',
|
||||
color: 'white',
|
||||
border: 'none',
|
||||
borderRadius: '0.5rem',
|
||||
cursor: 'pointer',
|
||||
fontWeight: 'bold'
|
||||
}}
|
||||
>
|
||||
{isPlaying && isPlayingFullTitle
|
||||
? '⏸ Pause'
|
||||
: (pausedType === 'title' && pausedPosition !== null
|
||||
? '▶ Resume'
|
||||
: '▶ Play Full Title')}
|
||||
</button>
|
||||
|
||||
<div style={{ fontSize: '0.875rem', color: '#666' }}>
|
||||
|
||||
@@ -149,6 +149,10 @@
|
||||
"subtitle": "Untertitel",
|
||||
"maxAttempts": "Max. Versuche",
|
||||
"unlockSteps": "Freischalt-Schritte",
|
||||
"unlockStepsRequired": "Freischalt-Schritte sind erforderlich",
|
||||
"unlockStepsInvalidJson": "Ungültiges JSON-Format. Bitte verwende ein Array von Zahlen, z.B. [2,4,7,11,16,30,60]",
|
||||
"unlockStepsMustBeArray": "Freischalt-Schritte müssen ein Array sein",
|
||||
"unlockStepsMustBePositiveNumbers": "Alle Werte müssen positive Zahlen sein",
|
||||
"launchDate": "Startdatum",
|
||||
"endDate": "Enddatum",
|
||||
"curator": "Kurator",
|
||||
@@ -279,11 +283,13 @@
|
||||
"batchUpdateError": "Fehler: {error}",
|
||||
"batchUpdateNetworkError": "Netzwerkfehler bei der Batch-Aktualisierung",
|
||||
"backToDashboard": "Zurück zum Dashboard",
|
||||
"loading": "Laden...",
|
||||
"curateSpecialsButton": "Specials kuratieren",
|
||||
"curateSpecialsTitle": "Deine Specials kuratieren",
|
||||
"curateSpecialsDescription": "Hier kannst du die Startzeiten der Songs in deinen zugewiesenen Specials für das Rätsel feinjustieren.",
|
||||
"noSpecialPermissions": "Dir sind keine Specials zugeordnet.",
|
||||
"noSpecialsInScope": "Keine Specials zum Kuratieren vorhanden.",
|
||||
"noSpecialsAssigned": "Dir sind keine Specials zugeordnet.",
|
||||
"curateSpecialSongCount": "{count, plural, one {# Song} other {# Songs}} in diesem Special",
|
||||
"curateSpecialOpen": "Öffnen",
|
||||
"specialForbidden": "Du darfst dieses Special nicht bearbeiten.",
|
||||
|
||||
@@ -149,6 +149,10 @@
|
||||
"subtitle": "Subtitle",
|
||||
"maxAttempts": "Max Attempts",
|
||||
"unlockSteps": "Unlock Steps",
|
||||
"unlockStepsRequired": "Unlock steps are required",
|
||||
"unlockStepsInvalidJson": "Invalid JSON format. Please use an array of numbers, e.g. [2,4,7,11,16,30,60]",
|
||||
"unlockStepsMustBeArray": "Unlock steps must be an array",
|
||||
"unlockStepsMustBePositiveNumbers": "All values must be positive numbers",
|
||||
"launchDate": "Launch Date",
|
||||
"endDate": "End Date",
|
||||
"curator": "Curator",
|
||||
@@ -279,11 +283,13 @@
|
||||
"batchUpdateError": "Error: {error}",
|
||||
"batchUpdateNetworkError": "Network error during batch update",
|
||||
"backToDashboard": "Back to dashboard",
|
||||
"loading": "Loading...",
|
||||
"curateSpecialsButton": "Curate Specials",
|
||||
"curateSpecialsTitle": "Curate your Specials",
|
||||
"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.",
|
||||
"noSpecialsInScope": "No specials available for you to curate.",
|
||||
"noSpecialsAssigned": "No specials assigned to you.",
|
||||
"curateSpecialSongCount": "{count, plural, one {# song} other {# songs}} in this special",
|
||||
"curateSpecialOpen": "Open",
|
||||
"specialForbidden": "You are not allowed to edit this special.",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "hoerdle",
|
||||
"version": "0.1.6.15",
|
||||
"version": "0.1.6.23",
|
||||
"private": true,
|
||||
"scripts": {
|
||||
"dev": "next dev",
|
||||
|
||||
Reference in New Issue
Block a user