Compare commits
24 Commits
v0.1.6.21
...
56461fe0bb
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
56461fe0bb | ||
|
|
989654f62e | ||
|
|
bf9fbe37c0 | ||
|
|
c83dc7a5e5 | ||
|
|
7999d63e6d | ||
|
|
2bf21fd75f | ||
|
|
e48d823c92 | ||
|
|
84822e79ca | ||
|
|
17856ef09b | ||
|
|
fb833a7976 | ||
|
|
a4e61de53f | ||
|
|
73c1c1cf89 | ||
|
|
83e1281079 | ||
|
|
2e1f1e599b | ||
|
|
71c4e2509f | ||
|
|
9cef1c78d3 | ||
|
|
6741eeb7fa | ||
|
|
71b8e98f23 | ||
|
|
bc2c0bad59 | ||
|
|
812d6ff10d | ||
|
|
aed300b1bb | ||
|
|
e93b3b9096 | ||
|
|
cdd2ff15d5 | ||
|
|
adcfbfa811 |
@@ -73,7 +73,9 @@ export default async function GenrePage({ params }: PageProps) {
|
|||||||
// Sort
|
// Sort
|
||||||
genres.sort((a, b) => getLocalizedValue(a.name, locale).localeCompare(getLocalizedValue(b.name, locale)));
|
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)));
|
specials.sort((a, b) => getLocalizedValue(a.name, locale).localeCompare(getLocalizedValue(b.name, locale)));
|
||||||
|
|
||||||
const now = new Date();
|
const now = new Date();
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -43,7 +43,9 @@ export default async function Home({
|
|||||||
const genres = await prisma.genre.findMany({
|
const genres = await prisma.genre.findMany({
|
||||||
where: { active: true },
|
where: { active: true },
|
||||||
});
|
});
|
||||||
const specials = await prisma.special.findMany();
|
const specials = await prisma.special.findMany({
|
||||||
|
where: { hidden: false },
|
||||||
|
});
|
||||||
|
|
||||||
// Sort in memory
|
// Sort in memory
|
||||||
genres.sort((a, b) => getLocalizedValue(a.name, locale).localeCompare(getLocalizedValue(b.name, locale)));
|
genres.sort((a, b) => getLocalizedValue(a.name, locale).localeCompare(getLocalizedValue(b.name, locale)));
|
||||||
|
|||||||
@@ -86,6 +86,7 @@ export default async function SpecialPage({ params }: PageProps) {
|
|||||||
specials.sort((a, b) => getLocalizedValue(a.name, locale).localeCompare(getLocalizedValue(b.name, locale)));
|
specials.sort((a, b) => getLocalizedValue(a.name, locale).localeCompare(getLocalizedValue(b.name, locale)));
|
||||||
|
|
||||||
const activeSpecials = specials.filter(s => {
|
const activeSpecials = specials.filter(s => {
|
||||||
|
if (s.hidden) return false;
|
||||||
const sStarted = !s.launchDate || s.launchDate <= now;
|
const sStarted = !s.launchDate || s.launchDate <= now;
|
||||||
const sEnded = s.endDate && s.endDate < now;
|
const sEnded = s.endDate && s.endDate < now;
|
||||||
return sStarted && !sEnded;
|
return sStarted && !sEnded;
|
||||||
|
|||||||
@@ -1,14 +0,0 @@
|
|||||||
import type { Metadata } from "next";
|
|
||||||
|
|
||||||
export const metadata: Metadata = {
|
|
||||||
title: "Hördle Admin Dashboard",
|
|
||||||
description: "Admin dashboard for managing songs and daily puzzles",
|
|
||||||
};
|
|
||||||
|
|
||||||
export default function AdminLayout({
|
|
||||||
children,
|
|
||||||
}: {
|
|
||||||
children: React.ReactNode;
|
|
||||||
}) {
|
|
||||||
return <>{children}</>;
|
|
||||||
}
|
|
||||||
1160
app/admin/page.tsx
1160
app/admin/page.tsx
File diff suppressed because it is too large
Load Diff
23
app/api/admin/reset-activations/route.ts
Normal file
23
app/api/admin/reset-activations/route.ts
Normal file
@@ -0,0 +1,23 @@
|
|||||||
|
import { NextRequest, NextResponse } from 'next/server';
|
||||||
|
import { PrismaClient } from '@prisma/client';
|
||||||
|
|
||||||
|
const prisma = new PrismaClient();
|
||||||
|
|
||||||
|
export async function POST(req: NextRequest) {
|
||||||
|
try {
|
||||||
|
// Delete all daily puzzles (activations)
|
||||||
|
const result = await prisma.dailyPuzzle.deleteMany({});
|
||||||
|
|
||||||
|
return NextResponse.json({
|
||||||
|
success: true,
|
||||||
|
message: `Successfully deleted ${result.count} daily puzzles (activations)`,
|
||||||
|
count: result.count,
|
||||||
|
});
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Error resetting activations:', error);
|
||||||
|
return NextResponse.json(
|
||||||
|
{ error: 'Failed to reset activations' },
|
||||||
|
{ status: 500 }
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
28
app/api/admin/reset-ratings/route.ts
Normal file
28
app/api/admin/reset-ratings/route.ts
Normal file
@@ -0,0 +1,28 @@
|
|||||||
|
import { NextRequest, NextResponse } from 'next/server';
|
||||||
|
import { PrismaClient } from '@prisma/client';
|
||||||
|
|
||||||
|
const prisma = new PrismaClient();
|
||||||
|
|
||||||
|
export async function POST(req: NextRequest) {
|
||||||
|
try {
|
||||||
|
// Reset all song ratings to 0
|
||||||
|
const result = await prisma.song.updateMany({
|
||||||
|
data: {
|
||||||
|
averageRating: 0,
|
||||||
|
ratingCount: 0,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
return NextResponse.json({
|
||||||
|
success: true,
|
||||||
|
message: `Successfully reset ratings for ${result.count} songs`,
|
||||||
|
count: result.count,
|
||||||
|
});
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Error resetting ratings:', error);
|
||||||
|
return NextResponse.json(
|
||||||
|
{ error: 'Failed to reset ratings' },
|
||||||
|
{ 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,7 +57,41 @@ export async function GET(
|
|||||||
return NextResponse.json({ error: 'Special not found' }, { status: 404 });
|
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',
|
||||||
|
},
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -43,18 +43,20 @@ export async function PUT(
|
|||||||
try {
|
try {
|
||||||
const { id } = await params;
|
const { id } = await params;
|
||||||
const specialId = parseInt(id);
|
const specialId = parseInt(id);
|
||||||
const { name, maxAttempts, unlockSteps, launchDate, endDate, curator } = await request.json();
|
const { name, maxAttempts, unlockSteps, launchDate, endDate, curator, hidden } = await request.json();
|
||||||
|
|
||||||
|
const updateData: any = {};
|
||||||
|
if (name !== undefined) updateData.name = name;
|
||||||
|
if (maxAttempts !== undefined) updateData.maxAttempts = maxAttempts;
|
||||||
|
if (unlockSteps !== undefined) updateData.unlockSteps = typeof unlockSteps === 'string' ? unlockSteps : JSON.stringify(unlockSteps);
|
||||||
|
if (launchDate !== undefined) updateData.launchDate = launchDate ? new Date(launchDate) : null;
|
||||||
|
if (endDate !== undefined) updateData.endDate = endDate ? new Date(endDate) : null;
|
||||||
|
if (curator !== undefined) updateData.curator = curator || null;
|
||||||
|
if (hidden !== undefined) updateData.hidden = Boolean(hidden);
|
||||||
|
|
||||||
const special = await prisma.special.update({
|
const special = await prisma.special.update({
|
||||||
where: { id: specialId },
|
where: { id: specialId },
|
||||||
data: {
|
data: updateData
|
||||||
name,
|
|
||||||
maxAttempts,
|
|
||||||
unlockSteps: typeof unlockSteps === 'string' ? unlockSteps : JSON.stringify(unlockSteps),
|
|
||||||
launchDate: launchDate ? new Date(launchDate) : null,
|
|
||||||
endDate: endDate ? new Date(endDate) : null,
|
|
||||||
curator: curator || null,
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
|
|
||||||
return NextResponse.json(special);
|
return NextResponse.json(special);
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ export async function POST(request: Request) {
|
|||||||
const authError = await requireAdminAuth(request as any);
|
const authError = await requireAdminAuth(request as any);
|
||||||
if (authError) return authError;
|
if (authError) return authError;
|
||||||
|
|
||||||
const { name, subtitle, maxAttempts = 7, unlockSteps = '[2,4,7,11,16,30,60]', launchDate, endDate, curator } = await request.json();
|
const { name, subtitle, maxAttempts = 7, unlockSteps = '[2,4,7,11,16,30,60]', launchDate, endDate, curator, hidden = false } = await request.json();
|
||||||
if (!name) {
|
if (!name) {
|
||||||
return NextResponse.json({ error: 'Name is required' }, { status: 400 });
|
return NextResponse.json({ error: 'Name is required' }, { status: 400 });
|
||||||
}
|
}
|
||||||
@@ -68,6 +68,7 @@ export async function POST(request: Request) {
|
|||||||
launchDate: launchDate ? new Date(launchDate) : null,
|
launchDate: launchDate ? new Date(launchDate) : null,
|
||||||
endDate: endDate ? new Date(endDate) : null,
|
endDate: endDate ? new Date(endDate) : null,
|
||||||
curator: curator || null,
|
curator: curator || null,
|
||||||
|
hidden: Boolean(hidden),
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
return NextResponse.json(special);
|
return NextResponse.json(special);
|
||||||
@@ -91,7 +92,7 @@ export async function PUT(request: Request) {
|
|||||||
const authError = await requireAdminAuth(request as any);
|
const authError = await requireAdminAuth(request as any);
|
||||||
if (authError) return authError;
|
if (authError) return authError;
|
||||||
|
|
||||||
const { id, name, subtitle, maxAttempts, unlockSteps, launchDate, endDate, curator } = await request.json();
|
const { id, name, subtitle, maxAttempts, unlockSteps, launchDate, endDate, curator, hidden } = await request.json();
|
||||||
if (!id) {
|
if (!id) {
|
||||||
return NextResponse.json({ error: 'ID required' }, { status: 400 });
|
return NextResponse.json({ error: 'ID required' }, { status: 400 });
|
||||||
}
|
}
|
||||||
@@ -119,6 +120,7 @@ export async function PUT(request: Request) {
|
|||||||
if (launchDate !== undefined) updateData.launchDate = launchDate ? new Date(launchDate) : null;
|
if (launchDate !== undefined) updateData.launchDate = launchDate ? new Date(launchDate) : null;
|
||||||
if (endDate !== undefined) updateData.endDate = endDate ? new Date(endDate) : null;
|
if (endDate !== undefined) updateData.endDate = endDate ? new Date(endDate) : null;
|
||||||
if (curator !== undefined) updateData.curator = curator || null;
|
if (curator !== undefined) updateData.curator = curator || null;
|
||||||
|
if (hidden !== undefined) updateData.hidden = Boolean(hidden);
|
||||||
|
|
||||||
const updated = await prisma.special.update({
|
const updated = await prisma.special.update({
|
||||||
where: { id: Number(id) },
|
where: { id: Number(id) },
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ interface Song {
|
|||||||
filename: string;
|
filename: string;
|
||||||
createdAt: string;
|
createdAt: string;
|
||||||
releaseYear: number | null;
|
releaseYear: number | null;
|
||||||
|
coverImage: string | null;
|
||||||
activations?: number;
|
activations?: number;
|
||||||
puzzles?: any[];
|
puzzles?: any[];
|
||||||
genres: Genre[];
|
genres: Genre[];
|
||||||
@@ -128,6 +129,7 @@ export default function CuratorPageClient() {
|
|||||||
const [itemsPerPage, setItemsPerPage] = useState(10);
|
const [itemsPerPage, setItemsPerPage] = useState(10);
|
||||||
const [playingSongId, setPlayingSongId] = useState<number | null>(null);
|
const [playingSongId, setPlayingSongId] = useState<number | null>(null);
|
||||||
const [audioElement, setAudioElement] = useState<HTMLAudioElement | null>(null);
|
const [audioElement, setAudioElement] = useState<HTMLAudioElement | null>(null);
|
||||||
|
const [hoveredCoverSongId, setHoveredCoverSongId] = useState<number | null>(null);
|
||||||
|
|
||||||
// Comments state
|
// Comments state
|
||||||
const [comments, setComments] = useState<CuratorComment[]>([]);
|
const [comments, setComments] = useState<CuratorComment[]>([]);
|
||||||
@@ -1663,6 +1665,7 @@ export default function CuratorPageClient() {
|
|||||||
>
|
>
|
||||||
{t('columnYear')} {sortField === 'releaseYear' && (sortDirection === 'asc' ? '↑' : '↓')}
|
{t('columnYear')} {sortField === 'releaseYear' && (sortDirection === 'asc' ? '↑' : '↓')}
|
||||||
</th>
|
</th>
|
||||||
|
<th style={{ padding: '0.5rem' }}>{t('columnCover')}</th>
|
||||||
<th style={{ padding: '0.5rem' }}>{t('columnGenresSpecials')}</th>
|
<th style={{ padding: '0.5rem' }}>{t('columnGenresSpecials')}</th>
|
||||||
<th
|
<th
|
||||||
style={{ padding: '0.5rem', cursor: 'pointer' }}
|
style={{ padding: '0.5rem', cursor: 'pointer' }}
|
||||||
@@ -1778,6 +1781,48 @@ export default function CuratorPageClient() {
|
|||||||
'-'
|
'-'
|
||||||
)}
|
)}
|
||||||
</td>
|
</td>
|
||||||
|
<td
|
||||||
|
style={{
|
||||||
|
padding: '0.5rem',
|
||||||
|
textAlign: 'center',
|
||||||
|
position: 'relative',
|
||||||
|
cursor: song.coverImage ? 'pointer' : 'default'
|
||||||
|
}}
|
||||||
|
onMouseEnter={() => song.coverImage && setHoveredCoverSongId(song.id)}
|
||||||
|
onMouseLeave={() => setHoveredCoverSongId(null)}
|
||||||
|
>
|
||||||
|
{song.coverImage ? '✓' : '-'}
|
||||||
|
{hoveredCoverSongId === song.id && song.coverImage && (
|
||||||
|
<div
|
||||||
|
style={{
|
||||||
|
position: 'absolute',
|
||||||
|
top: '100%',
|
||||||
|
left: '50%',
|
||||||
|
transform: 'translateX(-50%)',
|
||||||
|
marginTop: '0.5rem',
|
||||||
|
zIndex: 1000,
|
||||||
|
padding: '0.5rem',
|
||||||
|
background: 'white',
|
||||||
|
border: '1px solid #d1d5db',
|
||||||
|
borderRadius: '0.5rem',
|
||||||
|
boxShadow: '0 4px 6px -1px rgba(0, 0, 0, 0.1)',
|
||||||
|
pointerEvents: 'none',
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<img
|
||||||
|
src={`/uploads/covers/${song.coverImage}`}
|
||||||
|
alt={`Cover für ${song.title}`}
|
||||||
|
style={{
|
||||||
|
width: '200px',
|
||||||
|
height: '200px',
|
||||||
|
objectFit: 'cover',
|
||||||
|
borderRadius: '0.25rem',
|
||||||
|
display: 'block',
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</td>
|
||||||
<td style={{ padding: '0.5rem' }}>
|
<td style={{ padding: '0.5rem' }}>
|
||||||
{isEditing ? (
|
{isEditing ? (
|
||||||
<div style={{ display: 'flex', flexDirection: 'column', gap: '0.25rem' }}>
|
<div style={{ display: 'flex', flexDirection: 'column', gap: '0.25rem' }}>
|
||||||
|
|||||||
@@ -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'));
|
||||||
|
|||||||
@@ -1,141 +0,0 @@
|
|||||||
.page {
|
|
||||||
--background: #fafafa;
|
|
||||||
--foreground: #fff;
|
|
||||||
|
|
||||||
--text-primary: #000;
|
|
||||||
--text-secondary: #666;
|
|
||||||
|
|
||||||
--button-primary-hover: #383838;
|
|
||||||
--button-secondary-hover: #f2f2f2;
|
|
||||||
--button-secondary-border: #ebebeb;
|
|
||||||
|
|
||||||
display: flex;
|
|
||||||
min-height: 100vh;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
font-family: var(--font-geist-sans);
|
|
||||||
background-color: var(--background);
|
|
||||||
}
|
|
||||||
|
|
||||||
.main {
|
|
||||||
display: flex;
|
|
||||||
min-height: 100vh;
|
|
||||||
width: 100%;
|
|
||||||
max-width: 800px;
|
|
||||||
flex-direction: column;
|
|
||||||
align-items: flex-start;
|
|
||||||
justify-content: space-between;
|
|
||||||
background-color: var(--foreground);
|
|
||||||
padding: 120px 60px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.intro {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
align-items: flex-start;
|
|
||||||
text-align: left;
|
|
||||||
gap: 24px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.intro h1 {
|
|
||||||
max-width: 320px;
|
|
||||||
font-size: 40px;
|
|
||||||
font-weight: 600;
|
|
||||||
line-height: 48px;
|
|
||||||
letter-spacing: -2.4px;
|
|
||||||
text-wrap: balance;
|
|
||||||
color: var(--text-primary);
|
|
||||||
}
|
|
||||||
|
|
||||||
.intro p {
|
|
||||||
max-width: 440px;
|
|
||||||
font-size: 18px;
|
|
||||||
line-height: 32px;
|
|
||||||
text-wrap: balance;
|
|
||||||
color: var(--text-secondary);
|
|
||||||
}
|
|
||||||
|
|
||||||
.intro a {
|
|
||||||
font-weight: 500;
|
|
||||||
color: var(--text-primary);
|
|
||||||
}
|
|
||||||
|
|
||||||
.ctas {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: row;
|
|
||||||
width: 100%;
|
|
||||||
max-width: 440px;
|
|
||||||
gap: 16px;
|
|
||||||
font-size: 14px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.ctas a {
|
|
||||||
display: flex;
|
|
||||||
justify-content: center;
|
|
||||||
align-items: center;
|
|
||||||
height: 40px;
|
|
||||||
padding: 0 16px;
|
|
||||||
border-radius: 128px;
|
|
||||||
border: 1px solid transparent;
|
|
||||||
transition: 0.2s;
|
|
||||||
cursor: pointer;
|
|
||||||
width: fit-content;
|
|
||||||
font-weight: 500;
|
|
||||||
}
|
|
||||||
|
|
||||||
a.primary {
|
|
||||||
background: var(--text-primary);
|
|
||||||
color: var(--background);
|
|
||||||
gap: 8px;
|
|
||||||
}
|
|
||||||
|
|
||||||
a.secondary {
|
|
||||||
border-color: var(--button-secondary-border);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Enable hover only on non-touch devices */
|
|
||||||
@media (hover: hover) and (pointer: fine) {
|
|
||||||
a.primary:hover {
|
|
||||||
background: var(--button-primary-hover);
|
|
||||||
border-color: transparent;
|
|
||||||
}
|
|
||||||
|
|
||||||
a.secondary:hover {
|
|
||||||
background: var(--button-secondary-hover);
|
|
||||||
border-color: transparent;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@media (max-width: 600px) {
|
|
||||||
.main {
|
|
||||||
padding: 48px 24px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.intro {
|
|
||||||
gap: 16px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.intro h1 {
|
|
||||||
font-size: 32px;
|
|
||||||
line-height: 40px;
|
|
||||||
letter-spacing: -1.92px;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@media (prefers-color-scheme: dark) {
|
|
||||||
.logo {
|
|
||||||
filter: invert();
|
|
||||||
}
|
|
||||||
|
|
||||||
.page {
|
|
||||||
--background: #000;
|
|
||||||
--foreground: #000;
|
|
||||||
|
|
||||||
--text-primary: #ededed;
|
|
||||||
--text-secondary: #999;
|
|
||||||
|
|
||||||
--button-primary-hover: #ccc;
|
|
||||||
--button-secondary-hover: #1a1a1a;
|
|
||||||
--button-secondary-border: #1a1a1a;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -62,11 +62,14 @@ export default function CurateSpecialEditor({
|
|||||||
saveChangesLabel = '💾 Save Changes',
|
saveChangesLabel = '💾 Save Changes',
|
||||||
savedLabel = '✓ Saved',
|
savedLabel = '✓ Saved',
|
||||||
}: CurateSpecialEditorProps) {
|
}: 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>(
|
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>(
|
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 [hasUnsavedChanges, setHasUnsavedChanges] = useState(false);
|
||||||
const [saving, setSaving] = useState(false);
|
const [saving, setSaving] = useState(false);
|
||||||
@@ -77,7 +80,7 @@ export default function CurateSpecialEditor({
|
|||||||
const unlockSteps = JSON.parse(special.unlockSteps);
|
const unlockSteps = JSON.parse(special.unlockSteps);
|
||||||
const totalDuration = unlockSteps[unlockSteps.length - 1];
|
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) => {
|
const handleStartTimeChange = (newStartTime: number) => {
|
||||||
setPendingStartTime(newStartTime);
|
setPendingStartTime(newStartTime);
|
||||||
@@ -111,7 +114,7 @@ export default function CurateSpecialEditor({
|
|||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{special.songs.length === 0 ? (
|
{validSongs.length === 0 ? (
|
||||||
<div style={{ padding: '2rem', background: '#f3f4f6', borderRadius: '0.5rem', textAlign: 'center' }}>
|
<div style={{ padding: '2rem', background: '#f3f4f6', borderRadius: '0.5rem', textAlign: 'center' }}>
|
||||||
<p>{noSongsHint}</p>
|
<p>{noSongsHint}</p>
|
||||||
<p style={{ fontSize: '0.875rem', color: '#666', marginTop: '0.5rem' }}>
|
<p style={{ fontSize: '0.875rem', color: '#666', marginTop: '0.5rem' }}>
|
||||||
@@ -125,7 +128,7 @@ export default function CurateSpecialEditor({
|
|||||||
Select Song to Curate
|
Select Song to Curate
|
||||||
</h2>
|
</h2>
|
||||||
<div style={{ display: 'grid', gridTemplateColumns: 'repeat(auto-fill, minmax(250px, 1fr))', gap: '1rem' }}>
|
<div style={{ display: 'grid', gridTemplateColumns: 'repeat(auto-fill, minmax(250px, 1fr))', gap: '1rem' }}>
|
||||||
{special.songs.map(ss => (
|
{validSongs.map(ss => (
|
||||||
<div
|
<div
|
||||||
key={ss.songId}
|
key={ss.songId}
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
@@ -152,7 +155,7 @@ export default function CurateSpecialEditor({
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{selectedSpecialSong && (
|
{selectedSpecialSong && selectedSpecialSong.song && selectedSpecialSong.song.filename ? (
|
||||||
<div>
|
<div>
|
||||||
<h2 style={{ fontSize: '1.25rem', fontWeight: 'bold', marginBottom: '1rem' }}>
|
<h2 style={{ fontSize: '1.25rem', fontWeight: 'bold', marginBottom: '1rem' }}>
|
||||||
Curate: {selectedSpecialSong.song.title}
|
Curate: {selectedSpecialSong.song.title}
|
||||||
@@ -181,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}
|
||||||
@@ -189,7 +192,13 @@ export default function CurateSpecialEditor({
|
|||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</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>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -12,11 +12,14 @@ interface WaveformEditorProps {
|
|||||||
|
|
||||||
export default function WaveformEditor({ audioUrl, startTime, duration, unlockSteps, onStartTimeChange }: WaveformEditorProps) {
|
export default function WaveformEditor({ audioUrl, startTime, duration, unlockSteps, onStartTimeChange }: WaveformEditorProps) {
|
||||||
const canvasRef = useRef<HTMLCanvasElement>(null);
|
const canvasRef = useRef<HTMLCanvasElement>(null);
|
||||||
|
const timelineRef = useRef<HTMLCanvasElement>(null);
|
||||||
const [audioBuffer, setAudioBuffer] = useState<AudioBuffer | null>(null);
|
const [audioBuffer, setAudioBuffer] = useState<AudioBuffer | null>(null);
|
||||||
const [audioDuration, setAudioDuration] = useState(0);
|
const [audioDuration, setAudioDuration] = useState(0);
|
||||||
const [isPlaying, setIsPlaying] = useState(false);
|
const [isPlaying, setIsPlaying] = useState(false);
|
||||||
const [playingSegment, setPlayingSegment] = useState<number | null>(null);
|
const [playingSegment, setPlayingSegment] = useState<number | null>(null);
|
||||||
const [isPlayingFullTitle, setIsPlayingFullTitle] = useState(false);
|
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 [zoom, setZoom] = useState(1); // 1 = full view, higher = zoomed in
|
||||||
const [viewOffset, setViewOffset] = useState(0); // Offset in seconds for panning
|
const [viewOffset, setViewOffset] = useState(0); // Offset in seconds for panning
|
||||||
const [playbackPosition, setPlaybackPosition] = useState<number | null>(null); // Current playback position in seconds
|
const [playbackPosition, setPlaybackPosition] = useState<number | null>(null); // Current playback position in seconds
|
||||||
@@ -56,6 +59,80 @@ export default function WaveformEditor({ audioUrl, startTime, duration, unlockSt
|
|||||||
};
|
};
|
||||||
}, [audioUrl]);
|
}, [audioUrl]);
|
||||||
|
|
||||||
|
// Draw timeline
|
||||||
|
useEffect(() => {
|
||||||
|
if (!audioDuration || !timelineRef.current) return;
|
||||||
|
|
||||||
|
const timeline = timelineRef.current;
|
||||||
|
const ctx = timeline.getContext('2d');
|
||||||
|
if (!ctx) return;
|
||||||
|
|
||||||
|
const width = timeline.width;
|
||||||
|
const height = timeline.height;
|
||||||
|
|
||||||
|
// Calculate visible range based on zoom and offset (same as waveform)
|
||||||
|
const visibleDuration = audioDuration / zoom;
|
||||||
|
const visibleStart = Math.max(0, Math.min(viewOffset, audioDuration - visibleDuration));
|
||||||
|
const visibleEnd = Math.min(audioDuration, visibleStart + visibleDuration);
|
||||||
|
|
||||||
|
// Clear timeline
|
||||||
|
ctx.fillStyle = '#ffffff';
|
||||||
|
ctx.fillRect(0, 0, width, height);
|
||||||
|
|
||||||
|
// Draw border
|
||||||
|
ctx.strokeStyle = '#e5e7eb';
|
||||||
|
ctx.lineWidth = 1;
|
||||||
|
ctx.strokeRect(0, 0, width, height);
|
||||||
|
|
||||||
|
// Calculate appropriate time interval based on visible duration
|
||||||
|
let timeInterval = 1; // Start with 1 second
|
||||||
|
if (visibleDuration > 60) timeInterval = 10;
|
||||||
|
else if (visibleDuration > 30) timeInterval = 5;
|
||||||
|
else if (visibleDuration > 10) timeInterval = 2;
|
||||||
|
else if (visibleDuration > 5) timeInterval = 1;
|
||||||
|
else if (visibleDuration > 1) timeInterval = 0.5;
|
||||||
|
else timeInterval = 0.1;
|
||||||
|
|
||||||
|
// Draw time markers
|
||||||
|
ctx.strokeStyle = '#9ca3af';
|
||||||
|
ctx.lineWidth = 1;
|
||||||
|
ctx.fillStyle = '#374151';
|
||||||
|
ctx.font = '10px sans-serif';
|
||||||
|
ctx.textAlign = 'center';
|
||||||
|
ctx.textBaseline = 'top';
|
||||||
|
|
||||||
|
const startTimeMarker = Math.floor(visibleStart / timeInterval) * timeInterval;
|
||||||
|
for (let time = startTimeMarker; time <= visibleEnd; time += timeInterval) {
|
||||||
|
const timePx = ((time - visibleStart) / visibleDuration) * width;
|
||||||
|
|
||||||
|
if (timePx >= 0 && timePx <= width) {
|
||||||
|
// Draw tick mark
|
||||||
|
ctx.beginPath();
|
||||||
|
ctx.moveTo(timePx, 0);
|
||||||
|
ctx.lineTo(timePx, height);
|
||||||
|
ctx.stroke();
|
||||||
|
|
||||||
|
// Draw time label
|
||||||
|
const timeLabel = time.toFixed(timeInterval < 1 ? 1 : 0);
|
||||||
|
ctx.fillText(`${timeLabel}s`, timePx, 2);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Draw current playback position if playing
|
||||||
|
if (playbackPosition !== null) {
|
||||||
|
const playbackPx = ((playbackPosition - visibleStart) / visibleDuration) * width;
|
||||||
|
if (playbackPx >= 0 && playbackPx <= width) {
|
||||||
|
ctx.strokeStyle = '#10b981';
|
||||||
|
ctx.lineWidth = 2;
|
||||||
|
ctx.beginPath();
|
||||||
|
ctx.moveTo(playbackPx, 0);
|
||||||
|
ctx.lineTo(playbackPx, height);
|
||||||
|
ctx.stroke();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}, [audioDuration, zoom, viewOffset, playbackPosition]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!audioBuffer || !canvasRef.current) return;
|
if (!audioBuffer || !canvasRef.current) return;
|
||||||
|
|
||||||
@@ -234,12 +311,21 @@ export default function WaveformEditor({ audioUrl, startTime, duration, unlockSt
|
|||||||
setHoverPreviewTime(null);
|
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();
|
sourceRef.current?.stop();
|
||||||
setIsPlaying(false);
|
setIsPlaying(false);
|
||||||
setPlayingSegment(null);
|
setPlayingSegment(null);
|
||||||
setIsPlayingFullTitle(false);
|
setIsPlayingFullTitle(false);
|
||||||
setPlaybackPosition(null);
|
|
||||||
if (animationFrameRef.current) {
|
if (animationFrameRef.current) {
|
||||||
cancelAnimationFrame(animationFrameRef.current);
|
cancelAnimationFrame(animationFrameRef.current);
|
||||||
animationFrameRef.current = null;
|
animationFrameRef.current = null;
|
||||||
@@ -307,35 +393,55 @@ export default function WaveformEditor({ audioUrl, startTime, duration, unlockSt
|
|||||||
const handlePlayFull = () => {
|
const handlePlayFull = () => {
|
||||||
if (!audioBuffer || !audioContextRef.current) return;
|
if (!audioBuffer || !audioContextRef.current) return;
|
||||||
|
|
||||||
// If full selection playback is already playing, stop it
|
// If full selection playback is already playing, pause it
|
||||||
if (isPlaying && playingSegment === null && !isPlayingFullTitle) {
|
if (isPlaying && playingSegment === null && !isPlayingFullTitle) {
|
||||||
stopPlayback();
|
stopPlayback(true); // Save position
|
||||||
|
setPausedType('selection');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Stop any current playback (segment, full selection, or full title)
|
// Stop any current playback (segment, full selection, or full title)
|
||||||
stopPlayback();
|
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
|
// Start full selection playback
|
||||||
const source = audioContextRef.current.createBufferSource();
|
const source = audioContextRef.current.createBufferSource();
|
||||||
source.buffer = audioBuffer;
|
source.buffer = audioBuffer;
|
||||||
source.connect(audioContextRef.current.destination);
|
source.connect(audioContextRef.current.destination);
|
||||||
|
|
||||||
playbackStartTimeRef.current = audioContextRef.current.currentTime;
|
playbackStartTimeRef.current = audioContextRef.current.currentTime;
|
||||||
playbackOffsetRef.current = startTime;
|
playbackOffsetRef.current = resumePosition;
|
||||||
|
|
||||||
source.start(0, startTime, duration);
|
source.start(0, resumePosition, remainingDuration);
|
||||||
sourceRef.current = source;
|
sourceRef.current = source;
|
||||||
setIsPlaying(true);
|
setIsPlaying(true);
|
||||||
setPlayingSegment(null);
|
setPlayingSegment(null);
|
||||||
setIsPlayingFullTitle(false);
|
setIsPlayingFullTitle(false);
|
||||||
setPlaybackPosition(startTime);
|
setPausedPosition(null);
|
||||||
|
setPausedType(null);
|
||||||
|
setPlaybackPosition(resumePosition);
|
||||||
|
|
||||||
source.onended = () => {
|
source.onended = () => {
|
||||||
setIsPlaying(false);
|
setIsPlaying(false);
|
||||||
setPlayingSegment(null);
|
setPlayingSegment(null);
|
||||||
setIsPlayingFullTitle(false);
|
setIsPlayingFullTitle(false);
|
||||||
setPlaybackPosition(null);
|
setPlaybackPosition(null);
|
||||||
|
setPausedPosition(null);
|
||||||
|
setPausedType(null);
|
||||||
if (animationFrameRef.current) {
|
if (animationFrameRef.current) {
|
||||||
cancelAnimationFrame(animationFrameRef.current);
|
cancelAnimationFrame(animationFrameRef.current);
|
||||||
animationFrameRef.current = null;
|
animationFrameRef.current = null;
|
||||||
@@ -346,35 +452,55 @@ export default function WaveformEditor({ audioUrl, startTime, duration, unlockSt
|
|||||||
const handlePlayFullTitle = () => {
|
const handlePlayFullTitle = () => {
|
||||||
if (!audioBuffer || !audioContextRef.current) return;
|
if (!audioBuffer || !audioContextRef.current) return;
|
||||||
|
|
||||||
// If full title playback is already playing, stop it
|
// If full title playback is already playing, pause it
|
||||||
if (isPlaying && isPlayingFullTitle) {
|
if (isPlaying && isPlayingFullTitle) {
|
||||||
stopPlayback();
|
stopPlayback(true); // Save position
|
||||||
|
setPausedType('title');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Stop any current playback (segment, full selection, or full title)
|
// Stop any current playback (segment, full selection, or full title)
|
||||||
stopPlayback();
|
stopPlayback();
|
||||||
|
|
||||||
// Start full title playback (from 0 to audioDuration)
|
// 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();
|
const source = audioContextRef.current.createBufferSource();
|
||||||
source.buffer = audioBuffer;
|
source.buffer = audioBuffer;
|
||||||
source.connect(audioContextRef.current.destination);
|
source.connect(audioContextRef.current.destination);
|
||||||
|
|
||||||
playbackStartTimeRef.current = audioContextRef.current.currentTime;
|
playbackStartTimeRef.current = audioContextRef.current.currentTime;
|
||||||
playbackOffsetRef.current = 0;
|
playbackOffsetRef.current = resumePosition;
|
||||||
|
|
||||||
source.start(0, 0, audioDuration);
|
source.start(0, resumePosition, remainingDuration);
|
||||||
sourceRef.current = source;
|
sourceRef.current = source;
|
||||||
setIsPlaying(true);
|
setIsPlaying(true);
|
||||||
setPlayingSegment(null);
|
setPlayingSegment(null);
|
||||||
setIsPlayingFullTitle(true);
|
setIsPlayingFullTitle(true);
|
||||||
setPlaybackPosition(0);
|
setPausedPosition(null);
|
||||||
|
setPausedType(null);
|
||||||
|
setPlaybackPosition(resumePosition);
|
||||||
|
|
||||||
source.onended = () => {
|
source.onended = () => {
|
||||||
setIsPlaying(false);
|
setIsPlaying(false);
|
||||||
setPlayingSegment(null);
|
setPlayingSegment(null);
|
||||||
setIsPlayingFullTitle(false);
|
setIsPlayingFullTitle(false);
|
||||||
setPlaybackPosition(null);
|
setPlaybackPosition(null);
|
||||||
|
setPausedPosition(null);
|
||||||
|
setPausedType(null);
|
||||||
if (animationFrameRef.current) {
|
if (animationFrameRef.current) {
|
||||||
cancelAnimationFrame(animationFrameRef.current);
|
cancelAnimationFrame(animationFrameRef.current);
|
||||||
animationFrameRef.current = null;
|
animationFrameRef.current = null;
|
||||||
@@ -440,21 +566,38 @@ export default function WaveformEditor({ audioUrl, startTime, duration, unlockSt
|
|||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<canvas
|
<div style={{ position: 'relative' }}>
|
||||||
ref={canvasRef}
|
<canvas
|
||||||
width={800}
|
ref={canvasRef}
|
||||||
height={150}
|
width={800}
|
||||||
onClick={handleCanvasClick}
|
height={150}
|
||||||
onMouseMove={handleCanvasMouseMove}
|
onClick={handleCanvasClick}
|
||||||
onMouseLeave={handleCanvasMouseLeave}
|
onMouseMove={handleCanvasMouseMove}
|
||||||
style={{
|
onMouseLeave={handleCanvasMouseLeave}
|
||||||
width: '100%',
|
style={{
|
||||||
height: 'auto',
|
width: '100%',
|
||||||
cursor: 'pointer',
|
height: 'auto',
|
||||||
border: '1px solid #e5e7eb',
|
cursor: 'pointer',
|
||||||
borderRadius: '0.5rem'
|
border: '1px solid #e5e7eb',
|
||||||
}}
|
borderRadius: '0.5rem 0.5rem 0 0',
|
||||||
/>
|
display: 'block'
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
<canvas
|
||||||
|
ref={timelineRef}
|
||||||
|
width={800}
|
||||||
|
height={30}
|
||||||
|
style={{
|
||||||
|
width: '100%',
|
||||||
|
height: '30px',
|
||||||
|
border: '1px solid #e5e7eb',
|
||||||
|
borderTop: 'none',
|
||||||
|
borderRadius: '0 0 0.5rem 0.5rem',
|
||||||
|
display: 'block',
|
||||||
|
background: '#ffffff'
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
{/* Playback Controls */}
|
{/* Playback Controls */}
|
||||||
<div style={{ marginTop: '1rem', display: 'flex', gap: '1rem', alignItems: 'center', flexWrap: 'wrap' }}>
|
<div style={{ marginTop: '1rem', display: 'flex', gap: '1rem', alignItems: 'center', flexWrap: 'wrap' }}>
|
||||||
@@ -470,7 +613,11 @@ export default function WaveformEditor({ audioUrl, startTime, duration, unlockSt
|
|||||||
fontWeight: 'bold'
|
fontWeight: 'bold'
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{isPlaying && playingSegment === null && !isPlayingFullTitle ? '⏸ Pause' : '▶ Play Full Selection'}
|
{isPlaying && playingSegment === null && !isPlayingFullTitle
|
||||||
|
? '⏸ Pause'
|
||||||
|
: (pausedType === 'selection' && pausedPosition !== null
|
||||||
|
? '▶ Resume'
|
||||||
|
: '▶ Play Full Selection')}
|
||||||
</button>
|
</button>
|
||||||
<button
|
<button
|
||||||
onClick={handlePlayFullTitle}
|
onClick={handlePlayFullTitle}
|
||||||
@@ -484,7 +631,11 @@ export default function WaveformEditor({ audioUrl, startTime, duration, unlockSt
|
|||||||
fontWeight: 'bold'
|
fontWeight: 'bold'
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{isPlaying && isPlayingFullTitle ? '⏸ Pause' : '▶ Play Full Title'}
|
{isPlaying && isPlayingFullTitle
|
||||||
|
? '⏸ Pause'
|
||||||
|
: (pausedType === 'title' && pausedPosition !== null
|
||||||
|
? '▶ Resume'
|
||||||
|
: '▶ Play Full Title')}
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
<div style={{ fontSize: '0.875rem', color: '#666' }}>
|
<div style={{ fontSize: '0.875rem', color: '#666' }}>
|
||||||
|
|||||||
@@ -231,6 +231,7 @@
|
|||||||
"columnTitle": "Titel",
|
"columnTitle": "Titel",
|
||||||
"columnArtist": "Artist",
|
"columnArtist": "Artist",
|
||||||
"columnYear": "Jahr",
|
"columnYear": "Jahr",
|
||||||
|
"columnCover": "Cover",
|
||||||
"columnGenresSpecials": "Genres / Specials",
|
"columnGenresSpecials": "Genres / Specials",
|
||||||
"columnAdded": "Hinzugefügt",
|
"columnAdded": "Hinzugefügt",
|
||||||
"columnActivations": "Aktivierungen",
|
"columnActivations": "Aktivierungen",
|
||||||
|
|||||||
@@ -231,6 +231,7 @@
|
|||||||
"columnTitle": "Title",
|
"columnTitle": "Title",
|
||||||
"columnArtist": "Artist",
|
"columnArtist": "Artist",
|
||||||
"columnYear": "Year",
|
"columnYear": "Year",
|
||||||
|
"columnCover": "Cover",
|
||||||
"columnGenresSpecials": "Genres / Specials",
|
"columnGenresSpecials": "Genres / Specials",
|
||||||
"columnAdded": "Added",
|
"columnAdded": "Added",
|
||||||
"columnActivations": "Activations",
|
"columnActivations": "Activations",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "hoerdle",
|
"name": "hoerdle",
|
||||||
"version": "0.1.6.21",
|
"version": "0.1.6.31",
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "next dev",
|
"dev": "next dev",
|
||||||
@@ -32,4 +32,4 @@
|
|||||||
"eslint-config-next": "^16.0.7",
|
"eslint-config-next": "^16.0.7",
|
||||||
"typescript": "^5"
|
"typescript": "^5"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
-- RedefineTables
|
||||||
|
PRAGMA defer_foreign_keys=ON;
|
||||||
|
PRAGMA foreign_keys=OFF;
|
||||||
|
CREATE TABLE "new_Special" (
|
||||||
|
"id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
|
||||||
|
"name" JSONB NOT NULL,
|
||||||
|
"subtitle" JSONB,
|
||||||
|
"maxAttempts" INTEGER NOT NULL DEFAULT 7,
|
||||||
|
"unlockSteps" TEXT NOT NULL,
|
||||||
|
"createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||||
|
"launchDate" DATETIME,
|
||||||
|
"endDate" DATETIME,
|
||||||
|
"curator" TEXT,
|
||||||
|
"hidden" BOOLEAN NOT NULL DEFAULT false
|
||||||
|
);
|
||||||
|
INSERT INTO "new_Special" ("createdAt", "curator", "endDate", "id", "launchDate", "maxAttempts", "name", "subtitle", "unlockSteps") SELECT "createdAt", "curator", "endDate", "id", "launchDate", "maxAttempts", "name", "subtitle", "unlockSteps" FROM "Special";
|
||||||
|
DROP TABLE "Special";
|
||||||
|
ALTER TABLE "new_Special" RENAME TO "Special";
|
||||||
|
PRAGMA foreign_keys=ON;
|
||||||
|
PRAGMA defer_foreign_keys=OFF;
|
||||||
@@ -47,6 +47,7 @@ model Special {
|
|||||||
launchDate DateTime?
|
launchDate DateTime?
|
||||||
endDate DateTime?
|
endDate DateTime?
|
||||||
curator String?
|
curator String?
|
||||||
|
hidden Boolean @default(false)
|
||||||
songs SpecialSong[]
|
songs SpecialSong[]
|
||||||
puzzles DailyPuzzle[]
|
puzzles DailyPuzzle[]
|
||||||
news News[]
|
news News[]
|
||||||
|
|||||||
@@ -9,6 +9,79 @@ if [ -f "$HOME/.restic-env" ]; then
|
|||||||
. "$HOME/.restic-env"
|
. "$HOME/.restic-env"
|
||||||
fi
|
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..."
|
echo "💾 Creating Restic backup..."
|
||||||
|
|
||||||
if ! command -v restic >/dev/null 2>&1; then
|
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
|
if [ $RESTIC_EXIT_CODE -eq 0 ]; then
|
||||||
echo "✅ Restic backup completed successfully"
|
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
|
exit 0
|
||||||
elif [ $RESTIC_EXIT_CODE -eq 3 ]; then
|
elif [ $RESTIC_EXIT_CODE -eq 3 ]; then
|
||||||
echo "⚠️ Restic backup completed with warnings (some files could not be read), continuing..."
|
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
|
exit 0
|
||||||
else
|
else
|
||||||
echo "⚠️ Restic backup failed (exit code: $RESTIC_EXIT_CODE), continuing deployment..."
|
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
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user