Compare commits

...
Author SHA1 Message Date
Andrew Beveridge 436ef6df0a feat: Add comprehensive modular frontend with full interactive features
- Modular component architecture:
  - JobCard: Collapsible job display with status badges and progress
  - JobActions: Retry, cancel, delete, and show logs
  - JobLogs: Real-time log viewing with level-based coloring
  - OutputLinks: YouTube, Dropbox, and download links
  - InstrumentalSelector: Audio playback and selection UI
  - AudioSearchDialog: Song search results with rich metadata
  - JobSubmission: Unified form for upload, URL, and audio search

- Interactive features:
  - Lyrics review integration (launches in new tab)
  - Audio search with song selection UI
  - Instrumental selection with audio preview
  - Job logs display with filtering
  - Output links (YouTube, Dropbox, downloads)
  - Error handling and retry capabilities

- Testing infrastructure:
  - Jest configuration with jsdom environment
  - JobCard component tests
  - Testing dependencies added to package.json

- Clean architecture:
  - Index files for clean exports
  - Small, focused components (<200 lines each)
  - Separation of concerns
  - Reusable UI components
2025-12-22 03:10:50 -05:00
Andrew Beveridge afe1e01431 feat: Add minimal frontend for job submission and status viewing
- Create single-page application with job submission (file upload & URL)
- Add job status display with real-time polling
- Integrate with backend API at api.nomadkaraoke.com
- Configure Next.js for static export to GitHub Pages
- Update CI workflow to build and deploy frontend
- Support lyrics review links and instrumental selection
- Remove unused multi-page app routes (simplify for MVP)
2025-12-22 02:57:37 -05:00
26 changed files with 1639 additions and 2175 deletions

No files matched your search

+18 -9
View File
@@ -364,21 +364,30 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: '20'
cache: 'npm'
cache-dependency-path: frontend/package-lock.json
- name: Install dependencies
working-directory: frontend
run: npm ci
- name: Build Next.js static export
working-directory: frontend
env:
NEXT_PUBLIC_API_URL: https://api.nomadkaraoke.com
run: npm run build
- name: Setup Pages
uses: actions/configure-pages@v4
- name: Prepare frontend files
run: |
echo "📁 Preparing frontend files for deployment..."
mkdir -p _site
cp -r frontend/* _site/
echo "✅ Frontend files copied to _site/"
ls -la _site/
- name: Upload artifact
uses: actions/upload-pages-artifact@v3
with:
path: "_site"
path: "frontend/out"
- name: Deploy to GitHub Pages
id: deployment
-348
View File
@@ -1,348 +0,0 @@
"use client"
import { useState } from "react"
import { useJobs } from "@/lib/jobs"
import type { JobStatus } from "@/lib/types"
import { AppHeader } from "@/components/app-header"
import { ProtectedRoute } from "@/components/protected-route"
import { Button } from "@/components/ui/button"
import { Input } from "@/components/ui/input"
import { Label } from "@/components/ui/label"
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card"
import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs"
import { StatusBadge } from "@/components/status-badge"
import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table"
import { BarChart3, FileVideo, Ticket, TrendingUp, Activity, ChevronRight } from "lucide-react"
import Link from "next/link"
function AdminContent() {
const { jobs } = useJobs()
const [promoCode, setPromoCode] = useState("")
const [promoCredits, setPromoCredits] = useState("5")
const [generatedCode, setGeneratedCode] = useState("")
const totalJobs = jobs.length
const completedJobs = jobs.filter((j) => j.status === "completed").length
const processingJobs = jobs.filter((j) => j.status === "processing" || j.status === "queued").length
const failedJobs = jobs.filter((j) => j.status === "failed").length
const handleGeneratePromo = () => {
const code = `NOMAD${Math.random().toString(36).substr(2, 6).toUpperCase()}`
setGeneratedCode(code)
setPromoCode("")
}
const statusCounts = {
queued: jobs.filter((j) => j.status === "queued").length,
processing: jobs.filter((j) => j.status === "processing").length,
awaiting_review: jobs.filter((j) => j.status === "awaiting_review").length,
awaiting_instrumental: jobs.filter((j) => j.status === "awaiting_instrumental").length,
completed: completedJobs,
failed: failedJobs,
}
const recentJobs = [...jobs]
.sort((a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime())
.slice(0, 10)
return (
<div className="min-h-screen bg-background">
<AppHeader />
<main className="container mx-auto px-4 py-8">
<div className="mb-8">
<h1 className="text-4xl font-bold mb-2">Admin Dashboard</h1>
<p className="text-muted-foreground">Manage users, jobs, and system analytics</p>
</div>
{/* Stats Grid */}
<div className="grid gap-4 md:grid-cols-2 lg:grid-cols-4 mb-8">
<Card className="bg-gradient-to-br from-primary/10 to-transparent border-primary/20">
<CardHeader className="flex flex-row items-center justify-between pb-2">
<CardTitle className="text-sm font-medium text-muted-foreground">Total Jobs</CardTitle>
<FileVideo className="w-4 h-4 text-primary" />
</CardHeader>
<CardContent>
<div className="text-3xl font-bold text-primary">{totalJobs}</div>
<p className="text-xs text-muted-foreground mt-1">All time</p>
</CardContent>
</Card>
<Card>
<CardHeader className="flex flex-row items-center justify-between pb-2">
<CardTitle className="text-sm font-medium text-muted-foreground">Completed</CardTitle>
<TrendingUp className="w-4 h-4 text-green-400" />
</CardHeader>
<CardContent>
<div className="text-3xl font-bold text-green-400">{completedJobs}</div>
<p className="text-xs text-muted-foreground mt-1">
{((completedJobs / totalJobs) * 100).toFixed(1)}% success rate
</p>
</CardContent>
</Card>
<Card>
<CardHeader className="flex flex-row items-center justify-between pb-2">
<CardTitle className="text-sm font-medium text-muted-foreground">Processing</CardTitle>
<Activity className="w-4 h-4 text-blue-400" />
</CardHeader>
<CardContent>
<div className="text-3xl font-bold text-blue-400">{processingJobs}</div>
<p className="text-xs text-muted-foreground mt-1">Active jobs</p>
</CardContent>
</Card>
<Card>
<CardHeader className="flex flex-row items-center justify-between pb-2">
<CardTitle className="text-sm font-medium text-muted-foreground">Failed</CardTitle>
<BarChart3 className="w-4 h-4 text-destructive" />
</CardHeader>
<CardContent>
<div className="text-3xl font-bold text-destructive">{failedJobs}</div>
<p className="text-xs text-muted-foreground mt-1">
{((failedJobs / totalJobs) * 100).toFixed(1)}% failure rate
</p>
</CardContent>
</Card>
</div>
{/* Tabs */}
<Tabs defaultValue="overview" className="space-y-6">
<TabsList className="grid w-full max-w-md grid-cols-3">
<TabsTrigger value="overview">Overview</TabsTrigger>
<TabsTrigger value="jobs">All Jobs</TabsTrigger>
<TabsTrigger value="promo">Promo Codes</TabsTrigger>
</TabsList>
<TabsContent value="overview" className="space-y-6">
{/* Status Breakdown */}
<Card>
<CardHeader>
<CardTitle>Job Status Breakdown</CardTitle>
<CardDescription>Current distribution of job statuses</CardDescription>
</CardHeader>
<CardContent>
<div className="grid gap-3 sm:grid-cols-2 lg:grid-cols-3">
{Object.entries(statusCounts).map(([status, count]) => (
<div
key={status}
className="flex items-center justify-between p-3 rounded-lg border border-border bg-card"
>
<div className="flex items-center gap-3">
<StatusBadge status={status as JobStatus} size="sm" />
<span className="text-sm text-muted-foreground">Jobs</span>
</div>
<span className="text-lg font-bold">{count}</span>
</div>
))}
</div>
</CardContent>
</Card>
{/* Recent Activity */}
<Card>
<CardHeader className="flex flex-row items-center justify-between">
<div>
<CardTitle>Recent Activity</CardTitle>
<CardDescription>Latest jobs across all users</CardDescription>
</div>
<Button variant="outline" size="sm" asChild>
<Link href="#" onClick={(e) => e.preventDefault()}>
View All
</Link>
</Button>
</CardHeader>
<CardContent>
<div className="space-y-2">
{recentJobs.slice(0, 5).map((job) => (
<Link
key={job.id}
href={`/jobs/${job.id}`}
className="flex items-center justify-between p-3 rounded-lg border border-border hover:border-primary/50 hover:bg-card/50 transition-all group"
>
<div className="flex-1 min-w-0">
<p className="font-medium text-sm truncate group-hover:text-primary transition-colors">
{job.artist} - {job.title}
</p>
<p className="text-xs text-muted-foreground">{new Date(job.createdAt).toLocaleString()}</p>
</div>
<div className="flex items-center gap-2">
<StatusBadge status={job.status} size="sm" />
<ChevronRight className="w-4 h-4 text-muted-foreground group-hover:text-primary transition-colors" />
</div>
</Link>
))}
</div>
</CardContent>
</Card>
</TabsContent>
<TabsContent value="jobs" className="space-y-6">
<Card>
<CardHeader>
<CardTitle>All Jobs</CardTitle>
<CardDescription>Complete list of all karaoke video jobs in the system</CardDescription>
</CardHeader>
<CardContent>
<div className="rounded-md border border-border overflow-auto">
<Table>
<TableHeader>
<TableRow>
<TableHead>Artist - Title</TableHead>
<TableHead>User ID</TableHead>
<TableHead>Status</TableHead>
<TableHead>Created</TableHead>
<TableHead>Progress</TableHead>
<TableHead></TableHead>
</TableRow>
</TableHeader>
<TableBody>
{recentJobs.map((job) => (
<TableRow key={job.id} className="hover:bg-muted/50">
<TableCell className="font-medium">
{job.artist} - {job.title}
</TableCell>
<TableCell className="text-muted-foreground text-sm">{job.userId}</TableCell>
<TableCell>
<StatusBadge status={job.status} size="sm" />
</TableCell>
<TableCell className="text-sm text-muted-foreground">
{new Date(job.createdAt).toLocaleDateString()}
</TableCell>
<TableCell className="text-sm">{job.progress}%</TableCell>
<TableCell>
<Button variant="ghost" size="sm" asChild>
<Link href={`/jobs/${job.id}`}>
<ChevronRight className="w-4 h-4" />
</Link>
</Button>
</TableCell>
</TableRow>
))}
</TableBody>
</Table>
</div>
</CardContent>
</Card>
</TabsContent>
<TabsContent value="promo" className="space-y-6">
<div className="grid gap-6 lg:grid-cols-2">
{/* Generate Promo Code */}
<Card>
<CardHeader>
<CardTitle className="flex items-center gap-2">
<Ticket className="w-5 h-5 text-primary" />
Generate Promo Code
</CardTitle>
<CardDescription>Create promotional codes for users to redeem credits</CardDescription>
</CardHeader>
<CardContent className="space-y-4">
<div className="space-y-2">
<Label htmlFor="promo-credits">Credit Amount</Label>
<Input
id="promo-credits"
type="number"
min="1"
max="100"
value={promoCredits}
onChange={(e) => setPromoCredits(e.target.value)}
/>
<p className="text-xs text-muted-foreground">Number of credits this code will provide</p>
</div>
<Button onClick={handleGeneratePromo} className="w-full bg-primary hover:bg-primary/90">
Generate Code
</Button>
{generatedCode && (
<div className="p-4 rounded-lg bg-primary/10 border border-primary/20">
<p className="text-sm text-muted-foreground mb-2">Generated Promo Code:</p>
<p className="text-2xl font-mono font-bold text-primary">{generatedCode}</p>
<p className="text-xs text-muted-foreground mt-2">Worth {promoCredits} credits</p>
</div>
)}
</CardContent>
</Card>
{/* Active Promo Codes */}
<Card>
<CardHeader>
<CardTitle>Active Promo Codes</CardTitle>
<CardDescription>Currently available promotional codes</CardDescription>
</CardHeader>
<CardContent>
<div className="space-y-3">
<div className="flex items-center justify-between p-3 rounded-lg border border-border bg-card">
<div>
<p className="font-mono font-medium">NOMADWELCOME</p>
<p className="text-xs text-muted-foreground">5 credits • Used 23 times</p>
</div>
<Button variant="ghost" size="sm" className="text-destructive">
Disable
</Button>
</div>
<div className="flex items-center justify-between p-3 rounded-lg border border-border bg-card">
<div>
<p className="font-mono font-medium">LAUNCH2024</p>
<p className="text-xs text-muted-foreground">10 credits • Used 8 times</p>
</div>
<Button variant="ghost" size="sm" className="text-destructive">
Disable
</Button>
</div>
{generatedCode && (
<div className="flex items-center justify-between p-3 rounded-lg border border-primary/20 bg-primary/5">
<div>
<p className="font-mono font-medium text-primary">{generatedCode}</p>
<p className="text-xs text-muted-foreground">{promoCredits} credits • Not used yet</p>
</div>
<Button variant="ghost" size="sm" className="text-destructive">
Disable
</Button>
</div>
)}
</div>
</CardContent>
</Card>
</div>
{/* Usage Statistics */}
<Card>
<CardHeader>
<CardTitle>Promo Code Statistics</CardTitle>
<CardDescription>Usage analytics and performance metrics</CardDescription>
</CardHeader>
<CardContent>
<div className="grid gap-4 sm:grid-cols-3">
<div className="space-y-2">
<p className="text-sm text-muted-foreground">Total Codes</p>
<p className="text-3xl font-bold">12</p>
</div>
<div className="space-y-2">
<p className="text-sm text-muted-foreground">Total Redemptions</p>
<p className="text-3xl font-bold">156</p>
</div>
<div className="space-y-2">
<p className="text-sm text-muted-foreground">Credits Distributed</p>
<p className="text-3xl font-bold text-primary">892</p>
</div>
</div>
</CardContent>
</Card>
</TabsContent>
</Tabs>
</main>
</div>
)
}
export default function AdminPage() {
return (
<ProtectedRoute requireAdmin>
<AdminContent />
</ProtectedRoute>
)
}
-171
View File
@@ -1,171 +0,0 @@
"use client"
import { useRouter } from "next/navigation"
import { useAuth } from "@/lib/auth"
import { useJobs } from "@/lib/jobs"
import { AppHeader } from "@/components/app-header"
import { ProtectedRoute } from "@/components/protected-route"
import { Button } from "@/components/ui/button"
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card"
import { StatusBadge } from "@/components/status-badge"
import { Plus, FileVideo, Clock, CheckCircle2, Loader2 } from "lucide-react"
import Link from "next/link"
function DashboardContent() {
const { user } = useAuth()
const { jobs, getUserJobs } = useJobs()
const router = useRouter()
if (!user) return null
const userJobs = getUserJobs(user.token.includes("demo") ? "demo" : user.token)
const completedJobs = userJobs.filter((j) => j.status === "completed").length
const inProgressJobs = userJobs.filter((j) => j.status === "processing" || j.status === "queued").length
const totalJobs = userJobs.length
const recentJobs = userJobs.slice(0, 5)
return (
<div className="min-h-screen bg-background">
<AppHeader />
<main className="container mx-auto px-4 py-8">
{/* Welcome Section */}
<div className="mb-8">
<h1 className="text-4xl font-bold mb-2">
Welcome back<span className="text-primary">!</span>
</h1>
<p className="text-muted-foreground">Manage your karaoke video projects</p>
</div>
{/* Stats Grid */}
<div className="grid gap-4 md:grid-cols-4 mb-8">
<Card>
<CardHeader className="flex flex-row items-center justify-between pb-2">
<CardTitle className="text-sm font-medium text-muted-foreground">Total Jobs</CardTitle>
<FileVideo className="w-4 h-4 text-muted-foreground" />
</CardHeader>
<CardContent>
<div className="text-3xl font-bold">{totalJobs}</div>
</CardContent>
</Card>
<Card>
<CardHeader className="flex flex-row items-center justify-between pb-2">
<CardTitle className="text-sm font-medium text-muted-foreground">Completed</CardTitle>
<CheckCircle2 className="w-4 h-4 text-green-400" />
</CardHeader>
<CardContent>
<div className="text-3xl font-bold text-green-400">{completedJobs}</div>
</CardContent>
</Card>
<Card>
<CardHeader className="flex flex-row items-center justify-between pb-2">
<CardTitle className="text-sm font-medium text-muted-foreground">In Progress</CardTitle>
<Loader2 className="w-4 h-4 text-blue-400 animate-spin" />
</CardHeader>
<CardContent>
<div className="text-3xl font-bold text-blue-400">{inProgressJobs}</div>
</CardContent>
</Card>
<Card className="bg-gradient-to-br from-primary/10 to-secondary/10 border-primary/20">
<CardHeader className="flex flex-row items-center justify-between pb-2">
<CardTitle className="text-sm font-medium">Credits Remaining</CardTitle>
<div className="w-2 h-2 rounded-full bg-primary animate-pulse" />
</CardHeader>
<CardContent>
<div className="text-3xl font-bold text-primary">{user.credits}</div>
<p className="text-xs text-muted-foreground mt-1">
<Link href="#" className="hover:text-primary transition-colors">
Purchase more
</Link>
</p>
</CardContent>
</Card>
</div>
{/* Create New Job CTA */}
<Card className="mb-8 bg-gradient-to-r from-primary/5 via-card to-secondary/5 border-primary/20">
<CardHeader>
<CardTitle className="text-2xl">Create New Karaoke Video</CardTitle>
<CardDescription>
Transform any song into a professional karaoke video with synchronized lyrics
</CardDescription>
</CardHeader>
<CardContent>
<Button size="lg" className="bg-primary hover:bg-primary/90" onClick={() => router.push("/jobs/new")}>
<Plus className="w-5 h-5 mr-2" />
Create New Job
</Button>
</CardContent>
</Card>
{/* Recent Jobs */}
<Card>
<CardHeader className="flex flex-row items-center justify-between">
<div>
<CardTitle>Recent Jobs</CardTitle>
<CardDescription>Your latest karaoke video projects</CardDescription>
</div>
<Button variant="outline" size="sm" asChild>
<Link href="/jobs">View All</Link>
</Button>
</CardHeader>
<CardContent>
{recentJobs.length === 0 ? (
<div className="text-center py-12">
<FileVideo className="w-12 h-12 mx-auto mb-4 text-muted-foreground" />
<p className="text-muted-foreground mb-4">No jobs yet</p>
<Button onClick={() => router.push("/jobs/new")}>
<Plus className="w-4 h-4 mr-2" />
Create Your First Job
</Button>
</div>
) : (
<div className="space-y-3">
{recentJobs.map((job) => (
<Link
key={job.id}
href={`/jobs/${job.id}`}
className="flex items-center justify-between p-4 rounded-lg border border-border hover:border-primary/50 hover:bg-card/50 transition-all cursor-pointer group"
>
<div className="flex-1">
<div className="flex items-center gap-3 mb-1">
<h3 className="font-medium group-hover:text-primary transition-colors">
{job.artist} - {job.title}
</h3>
<StatusBadge status={job.status} size="sm" />
</div>
<div className="flex items-center gap-4 text-sm text-muted-foreground">
<span className="flex items-center gap-1">
<Clock className="w-3 h-3" />
{new Date(job.createdAt).toLocaleDateString()}
</span>
{job.status === "processing" && <span>{job.progress}% complete</span>}
</div>
</div>
{job.status === "completed" && (
<Button size="sm" variant="outline" className="ml-4 bg-transparent">
Download
</Button>
)}
</Link>
))}
</div>
)}
</CardContent>
</Card>
</main>
</div>
)
}
export default function DashboardPage() {
return (
<ProtectedRoute>
<DashboardContent />
</ProtectedRoute>
)
}
@@ -1,603 +0,0 @@
"use client"
import { useParams, useRouter } from "next/navigation"
import { useState, useEffect, useCallback } from "react"
import { AppHeader } from "@/components/app-header"
import { ProtectedRoute } from "@/components/protected-route"
import { Button } from "@/components/ui/button"
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card"
import { Alert, AlertDescription } from "@/components/ui/alert"
import { Badge } from "@/components/ui/badge"
import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group"
import { Label } from "@/components/ui/label"
import { Skeleton } from "@/components/ui/skeleton"
import {
WaveformDisplay,
AudioPlayer,
RegionSelector,
} from "@/components/instrumental-review"
import {
ArrowLeft,
AlertCircle,
CheckCircle2,
Loader2,
Music,
VolumeX,
Volume2,
} from "lucide-react"
interface AudibleSegment {
start_seconds: number
end_seconds: number
duration_seconds: number
avg_amplitude_db: number
peak_amplitude_db?: number
}
interface MuteRegion {
start_seconds: number
end_seconds: number
}
interface AnalysisData {
has_audible_content: boolean
total_duration_seconds: number
audible_segments: AudibleSegment[]
recommended_selection: string
total_audible_duration_seconds: number
audible_percentage: number
silence_threshold_db: number
}
interface InstrumentalAnalysisResponse {
job_id: string
artist: string
title: string
status: string
analysis: AnalysisData
audio_urls: {
clean_instrumental: string | null
backing_vocals: string | null
with_backing: string | null
custom_instrumental: string | null
}
waveform_url: string | null
has_custom_instrumental: boolean
}
// Get API base URL from environment or default to relative path
const API_BASE = process.env.NEXT_PUBLIC_API_URL || "/api"
function InstrumentalReviewContent() {
const params = useParams()
const router = useRouter()
const jobId = params.id as string
// State
const [isLoading, setIsLoading] = useState(true)
const [error, setError] = useState<string | null>(null)
const [analysisData, setAnalysisData] = useState<InstrumentalAnalysisResponse | null>(null)
const [waveformData, setWaveformData] = useState<{ amplitudes: number[]; duration: number } | null>(null)
const [selectedOption, setSelectedOption] = useState<string>("clean")
const [muteRegions, setMuteRegions] = useState<MuteRegion[]>([])
const [isSelectionMode, setIsSelectionMode] = useState(false)
const [currentTime, setCurrentTime] = useState(0)
const [seekTo, setSeekTo] = useState<number | undefined>(undefined)
const [isCreatingCustom, setIsCreatingCustom] = useState(false)
const [isSubmitting, setIsSubmitting] = useState(false)
const [activeAudio, setActiveAudio] = useState<"clean" | "backing" | "with_backing" | "custom">("backing")
// Fetch analysis data
const fetchAnalysis = useCallback(async () => {
try {
setIsLoading(true)
setError(null)
const response = await fetch(`${API_BASE}/jobs/${jobId}/instrumental-analysis`)
if (!response.ok) {
const errorData = await response.json().catch(() => ({}))
throw new Error(errorData.detail || `Failed to fetch analysis: ${response.status}`)
}
const data: InstrumentalAnalysisResponse = await response.json()
setAnalysisData(data)
// Set initial selection based on recommendation
const recommendation = data.analysis.recommended_selection
if (recommendation === "clean") {
setSelectedOption("clean")
} else if (recommendation === "with_backing") {
setSelectedOption("with_backing")
} else {
// "review_needed" - default to with_backing but user should review
setSelectedOption("with_backing")
}
// Fetch waveform data for interactive display
const waveformResponse = await fetch(`${API_BASE}/jobs/${jobId}/waveform-data?num_points=600`)
if (waveformResponse.ok) {
const waveform = await waveformResponse.json()
setWaveformData(waveform)
}
} catch (err) {
setError(err instanceof Error ? err.message : "Failed to load analysis data")
} finally {
setIsLoading(false)
}
}, [jobId])
useEffect(() => {
fetchAnalysis()
}, [fetchAnalysis])
// Handle seeking from waveform click
const handleSeek = (time: number) => {
setSeekTo(time)
// Reset seekTo after a short delay
setTimeout(() => setSeekTo(undefined), 100)
}
// Handle adding a mute region
const handleAddRegion = (region: MuteRegion) => {
setMuteRegions((prev) => {
// Check for overlaps and merge if needed
const newRegions = [...prev, region].sort((a, b) => a.start_seconds - b.start_seconds)
// Merge overlapping regions
const merged: MuteRegion[] = []
for (const r of newRegions) {
if (merged.length === 0) {
merged.push(r)
} else {
const last = merged[merged.length - 1]
if (r.start_seconds <= last.end_seconds) {
last.end_seconds = Math.max(last.end_seconds, r.end_seconds)
} else {
merged.push(r)
}
}
}
return merged
})
setIsSelectionMode(false)
}
// Handle removing a mute region
const handleRemoveRegion = (index: number) => {
setMuteRegions((prev) => prev.filter((_, i) => i !== index))
}
// Handle clearing all mute regions
const handleClearAll = () => {
setMuteRegions([])
}
// Create custom instrumental
const handleCreateCustom = async () => {
if (muteRegions.length === 0) {
setError("Please select at least one region to mute")
return
}
try {
setIsCreatingCustom(true)
setError(null)
const response = await fetch(`${API_BASE}/jobs/${jobId}/create-custom-instrumental`, {
method: "POST",
headers: { "Content-Type": "application/json" },
body: JSON.stringify({
mute_regions: muteRegions.map((r) => ({
start_seconds: r.start_seconds,
end_seconds: r.end_seconds,
})),
}),
})
if (!response.ok) {
const errorData = await response.json().catch(() => ({}))
throw new Error(errorData.detail || "Failed to create custom instrumental")
}
// Refresh analysis to get updated URLs
await fetchAnalysis()
setSelectedOption("custom")
setActiveAudio("custom")
} catch (err) {
setError(err instanceof Error ? err.message : "Failed to create custom instrumental")
} finally {
setIsCreatingCustom(false)
}
}
// Submit selection
const handleSubmit = async () => {
let selection = selectedOption
// If "review" is selected, determine based on mute regions
if (selectedOption === "review") {
if (muteRegions.length > 0 && analysisData?.has_custom_instrumental) {
selection = "custom"
} else {
selection = "with_backing"
}
}
try {
setIsSubmitting(true)
setError(null)
const response = await fetch(`${API_BASE}/jobs/${jobId}/select-instrumental`, {
method: "POST",
headers: { "Content-Type": "application/json" },
body: JSON.stringify({ selection }),
})
if (!response.ok) {
const errorData = await response.json().catch(() => ({}))
throw new Error(errorData.detail || "Failed to submit selection")
}
// Navigate back to job page
router.push(`/jobs/${jobId}`)
} catch (err) {
setError(err instanceof Error ? err.message : "Failed to submit selection")
} finally {
setIsSubmitting(false)
}
}
// Get current audio URL based on active selection
const getCurrentAudioUrl = () => {
if (!analysisData) return null
switch (activeAudio) {
case "clean":
return analysisData.audio_urls.clean_instrumental
case "backing":
return analysisData.audio_urls.backing_vocals
case "with_backing":
return analysisData.audio_urls.with_backing
case "custom":
return analysisData.audio_urls.custom_instrumental
default:
return null
}
}
// Loading state
if (isLoading) {
return (
<div className="min-h-screen bg-background">
<AppHeader />
<main className="container mx-auto px-4 py-8 max-w-5xl">
<Skeleton className="h-8 w-48 mb-4" />
<Skeleton className="h-4 w-96 mb-8" />
<Skeleton className="h-[200px] w-full mb-4" />
<Skeleton className="h-32 w-full" />
</main>
</div>
)
}
// Error state
if (error && !analysisData) {
return (
<div className="min-h-screen bg-background">
<AppHeader />
<main className="container mx-auto px-4 py-8 max-w-5xl">
<Alert variant="destructive">
<AlertCircle className="h-4 w-4" />
<AlertDescription>{error}</AlertDescription>
</Alert>
<Button variant="outline" className="mt-4" onClick={() => router.push(`/jobs/${jobId}`)}>
<ArrowLeft className="w-4 h-4 mr-2" />
Back to Job
</Button>
</main>
</div>
)
}
const analysis = analysisData?.analysis
return (
<div className="min-h-screen bg-background">
<AppHeader />
<main className="container mx-auto px-4 py-8 max-w-6xl">
{/* Header */}
<Button variant="ghost" className="mb-6" onClick={() => router.push(`/jobs/${jobId}`)}>
<ArrowLeft className="w-4 h-4 mr-2" />
Back to Job
</Button>
<div className="mb-8">
<h1 className="text-3xl font-bold mb-2">
Select Instrumental Track
</h1>
<p className="text-muted-foreground">
{analysisData?.artist} - {analysisData?.title}
</p>
</div>
{/* Error Alert */}
{error && (
<Alert variant="destructive" className="mb-6">
<AlertCircle className="h-4 w-4" />
<AlertDescription>{error}</AlertDescription>
</Alert>
)}
{/* Analysis Summary */}
{analysis && (
<Card className="mb-6">
<CardHeader>
<CardTitle className="text-lg flex items-center gap-2">
<Music className="h-5 w-5" />
Backing Vocals Analysis
</CardTitle>
<CardDescription>
Automated analysis of the backing vocals stem
</CardDescription>
</CardHeader>
<CardContent>
<div className="flex flex-wrap gap-4">
<div className="flex items-center gap-2">
{analysis.has_audible_content ? (
<Volume2 className="h-4 w-4 text-yellow-500" />
) : (
<VolumeX className="h-4 w-4 text-green-500" />
)}
<span className="text-sm">
{analysis.has_audible_content
? "Backing vocals detected"
: "No backing vocals detected"}
</span>
</div>
{analysis.has_audible_content && (
<>
<Badge variant="outline">
{analysis.audible_segments.length} audible segments
</Badge>
<Badge variant="outline">
{analysis.audible_percentage.toFixed(1)}% of track
</Badge>
<Badge variant="outline">
{analysis.total_audible_duration_seconds.toFixed(1)}s total
</Badge>
</>
)}
<Badge
variant={analysis.recommended_selection === "clean" ? "default" : "secondary"}
>
Recommended: {analysis.recommended_selection === "clean" ? "Clean Instrumental" : "Review Needed"}
</Badge>
</div>
</CardContent>
</Card>
)}
{/* Waveform Display */}
{waveformData && analysis && (
<Card className="mb-6">
<CardHeader>
<CardTitle className="text-lg">Backing Vocals Waveform</CardTitle>
<CardDescription>
Click to seek • {isSelectionMode ? "Drag to select mute region" : "Click 'Add Region' to start selecting"}
</CardDescription>
</CardHeader>
<CardContent>
<WaveformDisplay
amplitudes={waveformData.amplitudes}
duration={waveformData.duration}
currentTime={currentTime}
segments={analysis.audible_segments}
muteRegions={muteRegions}
onSeek={handleSeek}
onRegionSelect={handleAddRegion}
isSelecting={isSelectionMode}
width={900}
height={150}
className="w-full overflow-x-auto"
/>
</CardContent>
</Card>
)}
<div className="grid lg:grid-cols-2 gap-6 mb-6">
{/* Audio Players */}
<Card>
<CardHeader>
<CardTitle className="text-lg">Audio Preview</CardTitle>
<CardDescription>
Listen to different instrumental options
</CardDescription>
</CardHeader>
<CardContent className="space-y-4">
{/* Audio source selector */}
<div className="flex flex-wrap gap-2">
<Button
variant={activeAudio === "backing" ? "default" : "outline"}
size="sm"
onClick={() => setActiveAudio("backing")}
>
Backing Vocals
</Button>
<Button
variant={activeAudio === "clean" ? "default" : "outline"}
size="sm"
onClick={() => setActiveAudio("clean")}
>
Clean Instrumental
</Button>
<Button
variant={activeAudio === "with_backing" ? "default" : "outline"}
size="sm"
onClick={() => setActiveAudio("with_backing")}
>
With Backing
</Button>
{analysisData?.has_custom_instrumental && (
<Button
variant={activeAudio === "custom" ? "default" : "outline"}
size="sm"
onClick={() => setActiveAudio("custom")}
>
Custom
</Button>
)}
</div>
{/* Audio player */}
{getCurrentAudioUrl() && (
<AudioPlayer
src={getCurrentAudioUrl()!}
onTimeUpdate={setCurrentTime}
seekTo={seekTo}
label={
activeAudio === "backing"
? "Backing Vocals Only"
: activeAudio === "clean"
? "Clean Instrumental"
: activeAudio === "custom"
? "Custom Instrumental"
: "Instrumental + Backing Vocals"
}
/>
)}
</CardContent>
</Card>
{/* Region Selector */}
<RegionSelector
muteRegions={muteRegions}
audibleSegments={analysis?.audible_segments}
onAddRegion={handleAddRegion}
onRemoveRegion={handleRemoveRegion}
onClearAll={handleClearAll}
onSeekTo={handleSeek}
isSelectionMode={isSelectionMode}
onToggleSelectionMode={() => setIsSelectionMode(!isSelectionMode)}
/>
</div>
{/* Create Custom Button */}
{muteRegions.length > 0 && !analysisData?.has_custom_instrumental && (
<Card className="mb-6">
<CardContent className="py-4">
<div className="flex items-center justify-between">
<div>
<p className="font-medium">Ready to create custom instrumental</p>
<p className="text-sm text-muted-foreground">
{muteRegions.length} region{muteRegions.length > 1 ? "s" : ""} will be muted
</p>
</div>
<Button onClick={handleCreateCustom} disabled={isCreatingCustom}>
{isCreatingCustom ? (
<>
<Loader2 className="h-4 w-4 mr-2 animate-spin" />
Creating...
</>
) : (
"Create Custom Instrumental"
)}
</Button>
</div>
</CardContent>
</Card>
)}
{/* Selection Options */}
<Card className="mb-6">
<CardHeader>
<CardTitle className="text-lg">Final Selection</CardTitle>
<CardDescription>
Choose which instrumental to use for your karaoke video
</CardDescription>
</CardHeader>
<CardContent>
<RadioGroup value={selectedOption} onValueChange={setSelectedOption}>
<div className="space-y-4">
<div className="flex items-center space-x-3">
<RadioGroupItem value="clean" id="clean" />
<Label htmlFor="clean" className="flex-1 cursor-pointer">
<div className="font-medium">Clean Instrumental</div>
<div className="text-sm text-muted-foreground">
Use the instrumental with no backing vocals at all
</div>
</Label>
{analysis?.recommended_selection === "clean" && (
<Badge variant="default" className="bg-green-600">
<CheckCircle2 className="h-3 w-3 mr-1" />
Recommended
</Badge>
)}
</div>
<div className="flex items-center space-x-3">
<RadioGroupItem value="with_backing" id="with_backing" />
<Label htmlFor="with_backing" className="flex-1 cursor-pointer">
<div className="font-medium">Instrumental with Backing Vocals</div>
<div className="text-sm text-muted-foreground">
Use the instrumental with all backing vocals included
</div>
</Label>
</div>
{analysisData?.has_custom_instrumental && (
<div className="flex items-center space-x-3">
<RadioGroupItem value="custom" id="custom" />
<Label htmlFor="custom" className="flex-1 cursor-pointer">
<div className="font-medium">Custom Instrumental</div>
<div className="text-sm text-muted-foreground">
Use your custom instrumental with {muteRegions.length} muted region{muteRegions.length > 1 ? "s" : ""}
</div>
</Label>
<Badge variant="secondary">Custom</Badge>
</div>
)}
</div>
</RadioGroup>
</CardContent>
</Card>
{/* Submit Button */}
<div className="flex gap-4">
<Button
size="lg"
onClick={handleSubmit}
disabled={isSubmitting}
className="flex-1 max-w-md"
>
{isSubmitting ? (
<>
<Loader2 className="h-4 w-4 mr-2 animate-spin" />
Submitting...
</>
) : (
<>
<CheckCircle2 className="h-4 w-4 mr-2" />
Confirm Selection & Continue
</>
)}
</Button>
</div>
</main>
</div>
)
}
export default function InstrumentalReviewPage() {
return (
<ProtectedRoute>
<InstrumentalReviewContent />
</ProtectedRoute>
)
}
-216
View File
@@ -1,216 +0,0 @@
"use client"
import { useParams, useRouter } from "next/navigation"
import { useJobs } from "@/lib/jobs"
import { AppHeader } from "@/components/app-header"
import { ProtectedRoute } from "@/components/protected-route"
import { Button } from "@/components/ui/button"
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card"
import { Progress } from "@/components/ui/progress"
import { StatusBadge } from "@/components/status-badge"
import { Alert, AlertDescription } from "@/components/ui/alert"
import {
ArrowLeft,
Download,
Youtube,
FileAudio,
Calendar,
Clock,
CheckCircle2,
Loader2,
XCircle,
AlertCircle,
} from "lucide-react"
function JobDetailContent() {
const params = useParams()
const router = useRouter()
const { getJobById } = useJobs()
const job = getJobById(params.id as string)
if (!job) {
return (
<div className="min-h-screen bg-background">
<AppHeader />
<main className="container mx-auto px-4 py-8">
<Alert variant="destructive">
<AlertCircle className="h-4 w-4" />
<AlertDescription>Job not found</AlertDescription>
</Alert>
<Button variant="outline" className="mt-4 bg-transparent" onClick={() => router.push("/jobs")}>
<ArrowLeft className="w-4 h-4 mr-2" />
Back to Jobs
</Button>
</main>
</div>
)
}
const getStageIcon = (status: string) => {
switch (status) {
case "completed":
return <CheckCircle2 className="w-5 h-5 text-green-400" />
case "in_progress":
return <Loader2 className="w-5 h-5 text-blue-400 animate-spin" />
case "failed":
return <XCircle className="w-5 h-5 text-destructive" />
default:
return <div className="w-5 h-5 rounded-full border-2 border-muted" />
}
}
return (
<div className="min-h-screen bg-background">
<AppHeader />
<main className="container mx-auto px-4 py-8 max-w-5xl">
<Button variant="ghost" className="mb-6" onClick={() => router.push("/jobs")}>
<ArrowLeft className="w-4 h-4 mr-2" />
Back to Jobs
</Button>
{/* Header */}
<div className="mb-8">
<div className="flex items-start justify-between gap-4 mb-4">
<div className="flex-1">
<h1 className="text-4xl font-bold mb-2 text-balance">
{job.artist} - {job.title}
</h1>
<div className="flex flex-wrap items-center gap-4 text-muted-foreground">
<span className="flex items-center gap-1.5">
<Calendar className="w-4 h-4" />
Created {new Date(job.createdAt).toLocaleDateString()}
</span>
<span className="flex items-center gap-1.5">
<Clock className="w-4 h-4" />
Updated {new Date(job.updatedAt).toLocaleDateString()}
</span>
</div>
</div>
<StatusBadge status={job.status} size="lg" />
</div>
{job.status === "completed" && (
<Button size="lg" className="bg-primary hover:bg-primary/90">
<Download className="w-5 h-5 mr-2" />
Download Karaoke Video
</Button>
)}
</div>
{/* Source Info */}
<Card className="mb-6">
<CardHeader>
<CardTitle className="text-lg">Source Information</CardTitle>
</CardHeader>
<CardContent>
<div className="flex items-center gap-3">
{job.sourceType === "youtube" ? (
<>
<div className="w-10 h-10 rounded-lg bg-red-500/10 flex items-center justify-center">
<Youtube className="w-5 h-5 text-red-500" />
</div>
<div className="flex-1 min-w-0">
<p className="text-sm font-medium">YouTube Video</p>
<p className="text-sm text-muted-foreground truncate">{job.sourceUrl}</p>
</div>
</>
) : (
<>
<div className="w-10 h-10 rounded-lg bg-primary/10 flex items-center justify-center">
<FileAudio className="w-5 h-5 text-primary" />
</div>
<div className="flex-1 min-w-0">
<p className="text-sm font-medium">Uploaded Audio File</p>
<p className="text-sm text-muted-foreground truncate">{job.fileName}</p>
</div>
</>
)}
</div>
</CardContent>
</Card>
{/* Progress Section */}
<Card className="mb-6">
<CardHeader>
<CardTitle className="text-lg">Processing Pipeline</CardTitle>
<CardDescription>Track the progress of your karaoke video generation</CardDescription>
</CardHeader>
<CardContent>
<div className="space-y-6">
{job.stages.map((stage, index) => (
<div key={index} className="flex items-start gap-4">
<div className="pt-1">{getStageIcon(stage.status)}</div>
<div className="flex-1">
<div className="flex items-center justify-between mb-2">
<h3 className="font-medium">{stage.name}</h3>
{stage.status === "in_progress" && (
<span className="text-sm text-muted-foreground">{stage.progress}%</span>
)}
</div>
{stage.status === "in_progress" && <Progress value={stage.progress} className="h-2 bg-muted" />}
{stage.message && <p className="text-sm text-muted-foreground mt-1">{stage.message}</p>}
</div>
</div>
))}
</div>
{job.status === "processing" && (
<div className="mt-6 pt-6 border-t border-border">
<div className="flex items-center justify-between mb-2">
<p className="text-sm font-medium">Overall Progress</p>
<span className="text-sm text-muted-foreground">{job.progress}%</span>
</div>
<Progress value={job.progress} className="h-3" />
</div>
)}
</CardContent>
</Card>
{/* Error Message */}
{job.status === "failed" && job.errorMessage && (
<Alert variant="destructive">
<AlertCircle className="h-4 w-4" />
<AlertDescription>{job.errorMessage}</AlertDescription>
</Alert>
)}
{/* Action Alerts */}
{job.status === "awaiting_review" && (
<Alert className="bg-secondary/10 border-secondary/30">
<AlertCircle className="h-4 w-4 text-secondary" />
<AlertDescription className="text-foreground">
Your karaoke video is ready for review. Please check the lyrics synchronization and approve or request
changes.
</AlertDescription>
</Alert>
)}
{job.status === "awaiting_instrumental" && (
<Alert className="bg-secondary/10 border-secondary/30">
<AlertCircle className="h-4 w-4 text-secondary" />
<AlertDescription className="text-foreground flex items-center justify-between">
<span>Multiple instrumental versions were detected. Please select your preferred version to continue.</span>
<Button
size="sm"
onClick={() => router.push(`/jobs/${job.id}/instrumental-review`)}
className="ml-4"
>
Select Instrumental
</Button>
</AlertDescription>
</Alert>
)}
</main>
</div>
)
}
export default function JobDetailPage() {
return (
<ProtectedRoute>
<JobDetailContent />
</ProtectedRoute>
)
}
-3
View File
@@ -1,3 +0,0 @@
export default function Loading() {
return null
}
-366
View File
@@ -1,366 +0,0 @@
"use client"
import type React from "react"
import { useState } from "react"
import { useRouter } from "next/navigation"
import { useAuth } from "@/lib/auth"
import { useJobs } from "@/lib/jobs"
import { AppHeader } from "@/components/app-header"
import { ProtectedRoute } from "@/components/protected-route"
import { Button } from "@/components/ui/button"
import { Input } from "@/components/ui/input"
import { Label } from "@/components/ui/label"
import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs"
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card"
import { Alert, AlertDescription } from "@/components/ui/alert"
import { Youtube, Upload, AlertCircle, Sparkles } from "lucide-react"
function NewJobContent() {
const { user, updateCredits } = useAuth()
const { addJob } = useJobs()
const router = useRouter()
const [activeTab, setActiveTab] = useState("youtube")
// YouTube form state
const [youtubeUrl, setYoutubeUrl] = useState("")
const [youtubeArtist, setYoutubeArtist] = useState("")
const [youtubeTitle, setYoutubeTitle] = useState("")
// Upload form state
const [uploadFile, setUploadFile] = useState<File | null>(null)
const [uploadArtist, setUploadArtist] = useState("")
const [uploadTitle, setUploadTitle] = useState("")
const [isSubmitting, setIsSubmitting] = useState(false)
const [error, setError] = useState("")
if (!user) return null
const insufficientCredits = user.credits < 1
const handleYoutubeSubmit = async (e: React.FormEvent) => {
e.preventDefault()
setError("")
if (!youtubeUrl.trim()) {
setError("Please enter a YouTube URL")
return
}
if (!youtubeArtist.trim() || !youtubeTitle.trim()) {
setError("Please enter both artist and title")
return
}
if (insufficientCredits) {
setError("Insufficient credits. Please purchase more credits to continue.")
return
}
setIsSubmitting(true)
// Simulate processing
setTimeout(() => {
addJob({
userId: user.token.includes("demo") ? "demo" : user.token,
artist: youtubeArtist,
title: youtubeTitle,
status: "queued",
sourceType: "youtube",
sourceUrl: youtubeUrl,
})
updateCredits(user.credits - 1)
setIsSubmitting(false)
router.push("/jobs")
}, 1000)
}
const handleUploadSubmit = async (e: React.FormEvent) => {
e.preventDefault()
setError("")
if (!uploadFile) {
setError("Please select an audio file")
return
}
if (!uploadArtist.trim() || !uploadTitle.trim()) {
setError("Please enter both artist and title")
return
}
if (insufficientCredits) {
setError("Insufficient credits. Please purchase more credits to continue.")
return
}
setIsSubmitting(true)
// Simulate processing
setTimeout(() => {
addJob({
userId: user.token.includes("demo") ? "demo" : user.token,
artist: uploadArtist,
title: uploadTitle,
status: "queued",
sourceType: "upload",
fileName: uploadFile.name,
})
updateCredits(user.credits - 1)
setIsSubmitting(false)
router.push("/jobs")
}, 1000)
}
const handleFileChange = (e: React.ChangeEvent<HTMLInputElement>) => {
const file = e.target.files?.[0]
if (file) {
const validTypes = ["audio/mpeg", "audio/wav", "audio/flac", "audio/mp4", "audio/ogg"]
if (!validTypes.includes(file.type) && !file.name.match(/\.(mp3|wav|flac|m4a|ogg)$/i)) {
setError("Invalid file type. Please upload MP3, WAV, FLAC, M4A, or OGG files.")
return
}
if (file.size > 50 * 1024 * 1024) {
// 50MB limit
setError("File too large. Maximum size is 50MB.")
return
}
setUploadFile(file)
setError("")
}
}
return (
<div className="min-h-screen bg-background">
<AppHeader />
<main className="container mx-auto px-4 py-8 max-w-3xl">
<div className="mb-8">
<h1 className="text-4xl font-bold mb-2">Create New Karaoke Video</h1>
<p className="text-muted-foreground">Start from a YouTube URL or upload your own audio file</p>
</div>
{insufficientCredits && (
<Alert variant="destructive" className="mb-6">
<AlertCircle className="h-4 w-4" />
<AlertDescription>
You don't have enough credits to create a new job.{" "}
<a href="#" className="underline font-medium">
Purchase more credits
</a>{" "}
to continue.
</AlertDescription>
</Alert>
)}
<Card className="border-border/50">
<CardHeader>
<div className="flex items-center justify-between">
<div>
<CardTitle>Source Selection</CardTitle>
<CardDescription>Choose how you want to provide the audio</CardDescription>
</div>
<div className="flex items-center gap-2 px-3 py-1.5 rounded-lg bg-primary/10 border border-primary/20">
<Sparkles className="w-4 h-4 text-primary" />
<span className="text-sm font-medium text-primary">Cost: 1 credit</span>
</div>
</div>
</CardHeader>
<CardContent>
<Tabs value={activeTab} onValueChange={setActiveTab}>
<TabsList className="grid w-full grid-cols-2">
<TabsTrigger value="youtube" className="gap-2">
<Youtube className="w-4 h-4" />
From YouTube URL
</TabsTrigger>
<TabsTrigger value="upload" className="gap-2">
<Upload className="w-4 h-4" />
Upload Audio File
</TabsTrigger>
</TabsList>
<TabsContent value="youtube" className="mt-6">
<form onSubmit={handleYoutubeSubmit} className="space-y-6">
<div className="space-y-2">
<Label htmlFor="youtube-url">YouTube URL</Label>
<div className="relative">
<Youtube className="absolute left-3 top-1/2 -translate-y-1/2 w-4 h-4 text-muted-foreground" />
<Input
id="youtube-url"
type="url"
placeholder="https://youtube.com/watch?v=..."
value={youtubeUrl}
onChange={(e) => setYoutubeUrl(e.target.value)}
className="pl-10"
disabled={isSubmitting}
/>
</div>
<p className="text-xs text-muted-foreground">
Paste the URL of the YouTube video you want to convert
</p>
</div>
<div className="grid md:grid-cols-2 gap-4">
<div className="space-y-2">
<Label htmlFor="youtube-artist">Artist Name</Label>
<Input
id="youtube-artist"
type="text"
placeholder="Artist name"
value={youtubeArtist}
onChange={(e) => setYoutubeArtist(e.target.value)}
disabled={isSubmitting}
/>
</div>
<div className="space-y-2">
<Label htmlFor="youtube-title">Song Title</Label>
<Input
id="youtube-title"
type="text"
placeholder="Song title"
value={youtubeTitle}
onChange={(e) => setYoutubeTitle(e.target.value)}
disabled={isSubmitting}
/>
</div>
</div>
{error && (
<Alert variant="destructive">
<AlertCircle className="h-4 w-4" />
<AlertDescription>{error}</AlertDescription>
</Alert>
)}
<div className="flex gap-3">
<Button
type="submit"
className="flex-1 bg-primary hover:bg-primary/90"
disabled={isSubmitting || insufficientCredits}
>
{isSubmitting ? "Creating Job..." : "Create Karaoke Video"}
</Button>
<Button
type="button"
variant="outline"
onClick={() => router.push("/dashboard")}
disabled={isSubmitting}
>
Cancel
</Button>
</div>
</form>
</TabsContent>
<TabsContent value="upload" className="mt-6">
<form onSubmit={handleUploadSubmit} className="space-y-6">
<div className="space-y-2">
<Label htmlFor="audio-file">Audio File</Label>
<div
className={`relative border-2 border-dashed rounded-lg p-8 text-center transition-colors ${
uploadFile
? "border-primary bg-primary/5"
: "border-border hover:border-primary/50 hover:bg-card/50"
}`}
>
<Input
id="audio-file"
type="file"
accept=".mp3,.wav,.flac,.m4a,.ogg,audio/*"
onChange={handleFileChange}
className="absolute inset-0 w-full h-full opacity-0 cursor-pointer"
disabled={isSubmitting}
/>
<Upload className="w-8 h-8 mx-auto mb-2 text-muted-foreground" />
{uploadFile ? (
<div>
<p className="font-medium text-foreground">{uploadFile.name}</p>
<p className="text-sm text-muted-foreground">
{(uploadFile.size / 1024 / 1024).toFixed(2)} MB
</p>
</div>
) : (
<div>
<p className="font-medium text-foreground mb-1">Click to upload or drag and drop</p>
<p className="text-sm text-muted-foreground">MP3, WAV, FLAC, M4A, or OGG (max 50MB)</p>
</div>
)}
</div>
</div>
<div className="grid md:grid-cols-2 gap-4">
<div className="space-y-2">
<Label htmlFor="upload-artist">
Artist Name <span className="text-destructive">*</span>
</Label>
<Input
id="upload-artist"
type="text"
placeholder="Artist name"
value={uploadArtist}
onChange={(e) => setUploadArtist(e.target.value)}
required
disabled={isSubmitting}
/>
</div>
<div className="space-y-2">
<Label htmlFor="upload-title">
Song Title <span className="text-destructive">*</span>
</Label>
<Input
id="upload-title"
type="text"
placeholder="Song title"
value={uploadTitle}
onChange={(e) => setUploadTitle(e.target.value)}
required
disabled={isSubmitting}
/>
</div>
</div>
{error && (
<Alert variant="destructive">
<AlertCircle className="h-4 w-4" />
<AlertDescription>{error}</AlertDescription>
</Alert>
)}
<div className="flex gap-3">
<Button
type="submit"
className="flex-1 bg-primary hover:bg-primary/90"
disabled={isSubmitting || insufficientCredits}
>
{isSubmitting ? "Creating Job..." : "Create Karaoke Video"}
</Button>
<Button
type="button"
variant="outline"
onClick={() => router.push("/dashboard")}
disabled={isSubmitting}
>
Cancel
</Button>
</div>
</form>
</TabsContent>
</Tabs>
</CardContent>
</Card>
</main>
</div>
)
}
export default function NewJobPage() {
return (
<ProtectedRoute>
<NewJobContent />
</ProtectedRoute>
)
}
-193
View File
@@ -1,193 +0,0 @@
"use client"
import { useState } from "react"
import { useAuth } from "@/lib/auth"
import { useJobs } from "@/lib/jobs"
import type { JobStatus } from "@/lib/types"
import { AppHeader } from "@/components/app-header"
import { ProtectedRoute } from "@/components/protected-route"
import { Button } from "@/components/ui/button"
import { Input } from "@/components/ui/input"
import { Card, CardContent } from "@/components/ui/card"
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select"
import { StatusBadge } from "@/components/status-badge"
import { Plus, Search, Clock, Download, ChevronRight } from "lucide-react"
import Link from "next/link"
function JobsListContent() {
const { user } = useAuth()
const { jobs, getUserJobs } = useJobs()
const [searchQuery, setSearchQuery] = useState("")
const [statusFilter, setStatusFilter] = useState<JobStatus | "all">("all")
if (!user) return null
const userJobs = getUserJobs(user.token.includes("demo") ? "demo" : user.token)
const filteredJobs = userJobs.filter((job) => {
const matchesSearch =
searchQuery === "" ||
job.artist.toLowerCase().includes(searchQuery.toLowerCase()) ||
job.title.toLowerCase().includes(searchQuery.toLowerCase())
const matchesStatus = statusFilter === "all" || job.status === statusFilter
return matchesSearch && matchesStatus
})
return (
<div className="min-h-screen bg-background">
<AppHeader />
<main className="container mx-auto px-4 py-8">
<div className="flex items-center justify-between mb-8">
<div>
<h1 className="text-4xl font-bold mb-2">My Jobs</h1>
<p className="text-muted-foreground">Manage and track your karaoke video projects</p>
</div>
<Button asChild className="bg-primary hover:bg-primary/90">
<Link href="/jobs/new">
<Plus className="w-4 h-4 mr-2" />
New Job
</Link>
</Button>
</div>
{/* Filters */}
<Card className="mb-6">
<CardContent className="pt-6">
<div className="flex flex-col sm:flex-row gap-4">
<div className="flex-1 relative">
<Search className="absolute left-3 top-1/2 -translate-y-1/2 w-4 h-4 text-muted-foreground" />
<Input
placeholder="Search by artist or title..."
value={searchQuery}
onChange={(e) => setSearchQuery(e.target.value)}
className="pl-10"
/>
</div>
<Select value={statusFilter} onValueChange={(value) => setStatusFilter(value as JobStatus | "all")}>
<SelectTrigger className="w-full sm:w-[200px]">
<SelectValue placeholder="Filter by status" />
</SelectTrigger>
<SelectContent>
<SelectItem value="all">All Status</SelectItem>
<SelectItem value="queued">Queued</SelectItem>
<SelectItem value="processing">Processing</SelectItem>
<SelectItem value="awaiting_review">Awaiting Review</SelectItem>
<SelectItem value="awaiting_instrumental">Select Instrumental</SelectItem>
<SelectItem value="completed">Completed</SelectItem>
<SelectItem value="failed">Failed</SelectItem>
</SelectContent>
</Select>
</div>
</CardContent>
</Card>
{/* Results count */}
<div className="mb-4">
<p className="text-sm text-muted-foreground">
Showing {filteredJobs.length} of {userJobs.length} jobs
</p>
</div>
{/* Jobs List */}
{filteredJobs.length === 0 ? (
<Card>
<CardContent className="text-center py-12">
<div className="w-16 h-16 mx-auto mb-4 rounded-full bg-muted flex items-center justify-center">
<Search className="w-8 h-8 text-muted-foreground" />
</div>
<h3 className="font-semibold mb-2">No jobs found</h3>
<p className="text-muted-foreground mb-4">
{searchQuery || statusFilter !== "all"
? "Try adjusting your filters"
: "Create your first karaoke video to get started"}
</p>
{!searchQuery && statusFilter === "all" && (
<Button asChild>
<Link href="/jobs/new">
<Plus className="w-4 h-4 mr-2" />
Create Job
</Link>
</Button>
)}
</CardContent>
</Card>
) : (
<div className="space-y-3">
{filteredJobs.map((job) => (
<Link key={job.id} href={`/jobs/${job.id}`}>
<Card className="hover:border-primary/50 hover:bg-card/80 transition-all group cursor-pointer">
<CardContent className="p-6">
<div className="flex items-center justify-between gap-4">
<div className="flex-1 min-w-0">
<div className="flex items-center gap-3 mb-2">
<h3 className="font-semibold text-lg group-hover:text-primary transition-colors truncate">
{job.artist} - {job.title}
</h3>
<StatusBadge status={job.status} />
</div>
<div className="flex flex-wrap items-center gap-4 text-sm text-muted-foreground">
<span className="flex items-center gap-1.5">
<Clock className="w-3.5 h-3.5" />
{new Date(job.createdAt).toLocaleDateString("en-US", {
month: "short",
day: "numeric",
year: "numeric",
})}
</span>
<span className="text-xs">
{job.sourceType === "youtube" ? "From YouTube" : "Uploaded File"}
</span>
{(job.status === "processing" || job.status === "queued") && (
<span className="text-xs font-medium">{job.progress}% complete</span>
)}
</div>
{(job.status === "processing" || job.status === "queued") && (
<div className="mt-3 w-full max-w-xs">
<div className="h-1.5 bg-muted rounded-full overflow-hidden">
<div
className="h-full bg-primary transition-all duration-300"
style={{ width: `${job.progress}%` }}
/>
</div>
</div>
)}
</div>
<div className="flex items-center gap-2">
{job.status === "completed" && (
<Button size="sm" variant="outline" onClick={(e) => e.preventDefault()}>
<Download className="w-4 h-4 mr-2" />
Download
</Button>
)}
<ChevronRight className="w-5 h-5 text-muted-foreground group-hover:text-primary transition-colors" />
</div>
</div>
</CardContent>
</Card>
</Link>
))}
</div>
)}
</main>
</div>
)
}
export default function JobsPage() {
return (
<ProtectedRoute>
<JobsListContent />
</ProtectedRoute>
)
}
+4 -15
View File
@@ -1,16 +1,10 @@
import type React from "react"
import type { Metadata } from "next"
import { Geist, Geist_Mono } from "next/font/google"
import { Analytics } from "@vercel/analytics/next"
import "./globals.css"
const _geist = Geist({ subsets: ["latin"] })
const _geistMono = Geist_Mono({ subsets: ["latin"] })
export const metadata: Metadata = {
title: "Nomad Karaoke - Wherever you are, sing!",
description: "Cloud-based karaoke video generation service",
generator: "v0.app",
title: "Karaoke Generator - Nomad Karaoke",
description: "Generate professional karaoke videos with AI-powered vocal separation and synchronized lyrics",
icons: {
icon: [
{
@@ -21,10 +15,6 @@ export const metadata: Metadata = {
url: "/icon-dark-32x32.png",
media: "(prefers-color-scheme: dark)",
},
{
url: "/icon.svg",
type: "image/svg+xml",
},
],
apple: "/apple-icon.png",
},
@@ -36,10 +26,9 @@ export default function RootLayout({
children: React.ReactNode
}>) {
return (
<html lang="en">
<body className={`font-sans antialiased`}>
<html lang="en" className="dark">
<body className="font-sans antialiased bg-slate-950 text-slate-100">
{children}
<Analytics />
</body>
</html>
)
+98 -125
View File
@@ -1,143 +1,116 @@
"use client"
import type React from "react"
import { useState } from "react"
import { useRouter } from "next/navigation"
import { useAuth } from "@/lib/auth"
import { Logo } from "@/components/logo"
import { useState, useEffect } from "react"
import { api, Job } from "@/lib/api"
import { Button } from "@/components/ui/button"
import { Input } from "@/components/ui/input"
import { Label } from "@/components/ui/label"
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card"
import { Sparkles } from "lucide-react"
import { Music2, RefreshCw, Loader2 } from "lucide-react"
import { JobCard } from "@/components/job"
import { JobSubmission } from "@/components/job/JobSubmission"
export default function LandingPage() {
const [token, setToken] = useState("")
const [error, setError] = useState("")
const [isLoading, setIsLoading] = useState(false)
const { login } = useAuth()
const router = useRouter()
export default function HomePage() {
const [jobs, setJobs] = useState<Job[]>([])
const [isLoadingJobs, setIsLoadingJobs] = useState(true)
const handleLogin = async (e: React.FormEvent) => {
e.preventDefault()
setError("")
setIsLoading(true)
// Load jobs on mount
useEffect(() => {
loadJobs()
// Poll for updates every 10 seconds
const interval = setInterval(loadJobs, 10000)
return () => clearInterval(interval)
}, [])
if (!token.trim()) {
setError("Please enter your access token")
setIsLoading(false)
return
}
const success = await login(token)
setIsLoading(false)
if (success) {
router.push("/dashboard")
} else {
setError("Invalid token. Please try again.")
async function loadJobs() {
try {
const data = await api.listJobs({ limit: 20 })
setJobs(data)
} catch (err) {
console.error("Failed to load jobs:", err)
} finally {
setIsLoadingJobs(false)
}
}
return (
<div className="min-h-screen bg-gradient-to-b from-background via-background to-card">
{/* Animated background effects */}
<div className="fixed inset-0 -z-10 overflow-hidden">
<div className="absolute top-1/4 left-1/4 w-96 h-96 bg-primary/10 rounded-full blur-3xl animate-pulse" />
<div className="absolute bottom-1/4 right-1/4 w-96 h-96 bg-secondary/10 rounded-full blur-3xl animate-pulse delay-1000" />
</div>
<div className="container mx-auto px-4 py-8 lg:py-12">
{/* Hero Section - horizontal layout on desktop */}
<div className="max-w-6xl mx-auto">
<div className="grid lg:grid-cols-2 gap-8 lg:gap-12 items-center">
{/* Left: Hero Content */}
<div className="text-center lg:text-left">
<Logo size="lg" className="mb-8 justify-center lg:justify-start" />
<div className="inline-flex items-center gap-2 px-4 py-2 rounded-full bg-primary/10 border border-primary/20 mb-6">
<Sparkles className="w-4 h-4 text-primary" />
<span className="text-sm text-primary font-medium">AI-Powered Karaoke Generation</span>
</div>
<h1 className="text-4xl md:text-4xl lg:text-4xl font-bold mb-4 text-balance leading-tight">
Wherever you are, <span className="text-primary">sing!</span>
</h1>
<p className="text-base md:text-lg text-muted-foreground text-pretty leading-relaxed">
Transform any song into professional karaoke videos with AI-powered vocal separation, synchronized
lyrics, and stunning visuals.
</p>
</div>
{/* Right: Login Card */}
<div className="min-h-screen bg-gradient-to-br from-slate-950 via-slate-900 to-slate-950">
{/* Header */}
<header className="border-b border-slate-800 bg-slate-950/50 backdrop-blur-sm sticky top-0 z-10">
<div className="container mx-auto px-4 py-4 flex items-center justify-between">
<div className="flex items-center gap-3">
<Music2 className="w-8 h-8 text-amber-500" />
<div>
<Card className="border-border/50 backdrop-blur">
<CardHeader>
<CardTitle className="text-2xl">Get Started</CardTitle>
<CardDescription>Enter your access token to begin creating karaoke videos</CardDescription>
</CardHeader>
<CardContent>
<form onSubmit={handleLogin} className="space-y-4">
<div className="space-y-2">
<Label htmlFor="token">Access Token</Label>
<Input
id="token"
type="text"
placeholder="Enter your token"
value={token}
onChange={(e) => setToken(e.target.value)}
className="bg-background"
/>
{error && <p className="text-sm text-destructive">{error}</p>}
</div>
<Button type="submit" className="w-full bg-primary hover:bg-primary/90" disabled={isLoading}>
{isLoading ? "Logging in..." : "Login"}
</Button>
<div className="text-center text-sm text-muted-foreground">
Don't have access?{" "}
<a href="#" className="text-primary hover:underline">
Request a token
</a>{" "}
or{" "}
<a href="#" className="text-primary hover:underline">
purchase access
</a>
</div>
<div className="pt-4 border-t border-border">
<p className="text-xs text-muted-foreground mb-2">Demo tokens:</p>
<div className="flex gap-2">
<Button
type="button"
variant="outline"
size="sm"
className="flex-1 text-xs bg-transparent"
onClick={() => setToken("demo-user-token")}
>
User Demo
</Button>
<Button
type="button"
variant="outline"
size="sm"
className="flex-1 text-xs bg-transparent"
onClick={() => setToken("demo-admin-token")}
>
Admin Demo
</Button>
</div>
</div>
</form>
</CardContent>
</Card>
<h1 className="text-xl font-bold text-white">Karaoke Generator</h1>
<p className="text-xs text-slate-400">by Nomad Karaoke</p>
</div>
</div>
<Button
variant="ghost"
size="sm"
onClick={loadJobs}
disabled={isLoadingJobs}
className="text-slate-400 hover:text-white"
>
<RefreshCw className={`w-4 h-4 mr-2 ${isLoadingJobs ? 'animate-spin' : ''}`} />
Refresh
</Button>
</div>
</div>
</header>
<main className="container mx-auto px-4 py-8 max-w-5xl">
<div className="grid lg:grid-cols-2 gap-8">
{/* Submit Job Card */}
<Card className="border-slate-800 bg-slate-900/50 backdrop-blur">
<CardHeader>
<CardTitle className="text-white">Create Karaoke Video</CardTitle>
<CardDescription className="text-slate-400">
Upload an audio file, provide a YouTube URL, or search for audio by artist & title
</CardDescription>
</CardHeader>
<CardContent>
<JobSubmission onJobCreated={loadJobs} />
</CardContent>
</Card>
{/* Jobs List Card */}
<Card className="border-slate-800 bg-slate-900/50 backdrop-blur">
<CardHeader>
<CardTitle className="text-white flex items-center justify-between">
Recent Jobs
{isLoadingJobs && <Loader2 className="w-4 h-4 animate-spin text-slate-400" />}
</CardTitle>
<CardDescription className="text-slate-400">
{jobs.length} job{jobs.length !== 1 ? 's' : ''} found
</CardDescription>
</CardHeader>
<CardContent>
{jobs.length === 0 ? (
<div className="text-center py-8 text-slate-500">
<Music2 className="w-12 h-12 mx-auto mb-3 opacity-50" />
<p>No jobs yet. Create one to get started!</p>
</div>
) : (
<div className="space-y-3 max-h-[500px] overflow-y-auto pr-2">
{jobs.map((job) => (
<JobCard key={job.job_id} job={job} onRefresh={loadJobs} />
))}
</div>
)}
</CardContent>
</Card>
</div>
</main>
{/* Footer */}
<footer className="border-t border-slate-800 mt-12 py-6">
<div className="container mx-auto px-4 text-center text-sm text-slate-500">
<p>
Powered by{" "}
<a href="https://github.com/nomadkaraoke/karaoke-gen" className="text-amber-500 hover:underline">
karaoke-gen
</a>
</p>
</div>
</footer>
</div>
)
}
@@ -0,0 +1,135 @@
/**
* Tests for JobCard component
*/
import { render, screen, fireEvent } from '@testing-library/react'
import { JobCard } from '../job/JobCard'
import { Job } from '@/lib/api'
// Mock the child components
jest.mock('../job/JobActions', () => ({
JobActions: () => <div data-testid="job-actions">Job Actions</div>
}))
jest.mock('../job/JobLogs', () => ({
JobLogs: () => <div data-testid="job-logs">Job Logs</div>
}))
jest.mock('../job/OutputLinks', () => ({
OutputLinks: () => <div data-testid="output-links">Output Links</div>
}))
jest.mock('../job/InstrumentalSelector', () => ({
InstrumentalSelector: () => <div data-testid="instrumental-selector">Instrumental Selector</div>
}))
jest.mock('../audio-search/AudioSearchDialog', () => ({
AudioSearchDialog: () => <div data-testid="audio-search-dialog">Audio Search Dialog</div>
}))
describe('JobCard', () => {
const mockOnRefresh = jest.fn()
const mockJob: Job = {
job_id: '123',
status: 'processing',
progress: 50,
created_at: '2025-01-01T00:00:00Z',
updated_at: '2025-01-01T00:00:00Z',
artist: 'Test Artist',
title: 'Test Song',
}
beforeEach(() => {
jest.clearAllMocks()
})
it('renders job information', () => {
render(<JobCard job={mockJob} onRefresh={mockOnRefresh} />)
expect(screen.getByText('Test Artist - Test Song')).toBeInTheDocument()
expect(screen.getByText(/Job ID:/)).toBeInTheDocument()
})
it('shows progress bar for processing jobs', () => {
render(<JobCard job={mockJob} onRefresh={mockOnRefresh} />)
// Expand details
fireEvent.click(screen.getByText('Test Artist - Test Song'))
const progressBar = document.querySelector('[style*="width: 50%"]')
expect(progressBar).toBeInTheDocument()
})
it('shows error message for failed jobs', () => {
const failedJob = { ...mockJob, status: 'failed', error_message: 'Something went wrong' }
render(<JobCard job={failedJob} onRefresh={mockOnRefresh} />)
// Expand details
fireEvent.click(screen.getByText('Test Artist - Test Song'))
expect(screen.getByText('Something went wrong')).toBeInTheDocument()
})
it('shows lyrics review button for awaiting_review status', () => {
const reviewJob = { ...mockJob, status: 'awaiting_review' }
render(<JobCard job={reviewJob} onRefresh={mockOnRefresh} />)
// Expand details
fireEvent.click(screen.getByText('Test Artist - Test Song'))
const reviewLink = screen.getByText('Review Lyrics')
expect(reviewLink).toBeInTheDocument()
expect(reviewLink.closest('a')).toHaveAttribute('href', expect.stringContaining('lyrics.nomadkaraoke.com'))
})
it('shows audio search button for awaiting_audio_selection status', () => {
const audioSelectionJob = { ...mockJob, status: 'awaiting_audio_selection' }
render(<JobCard job={audioSelectionJob} onRefresh={mockOnRefresh} />)
// Expand details
fireEvent.click(screen.getByText('Test Artist - Test Song'))
expect(screen.getByText('Select Audio Source')).toBeInTheDocument()
})
it('shows instrumental selection button for awaiting_instrumental_selection status', () => {
const instrumentalJob = { ...mockJob, status: 'awaiting_instrumental_selection' }
render(<JobCard job={instrumentalJob} onRefresh={mockOnRefresh} />)
// Expand details
fireEvent.click(screen.getByText('Test Artist - Test Song'))
expect(screen.getByText('Select Instrumental')).toBeInTheDocument()
})
it('shows output links for complete jobs', () => {
const completeJob = { ...mockJob, status: 'complete' }
render(<JobCard job={completeJob} onRefresh={mockOnRefresh} />)
// Expand details
fireEvent.click(screen.getByText('Test Artist - Test Song'))
expect(screen.getByTestId('output-links')).toBeInTheDocument()
})
it('toggles details on click', () => {
render(<JobCard job={mockJob} onRefresh={mockOnRefresh} />)
// Should not show actions initially
expect(screen.queryByTestId('job-actions')).not.toBeInTheDocument()
// Click to expand
fireEvent.click(screen.getByText('Test Artist - Test Song'))
// Should show actions now
expect(screen.getByTestId('job-actions')).toBeInTheDocument()
// Click to collapse
fireEvent.click(screen.getByText('Test Artist - Test Song'))
// Should hide actions again
expect(screen.queryByTestId('job-actions')).not.toBeInTheDocument()
})
})
@@ -0,0 +1,154 @@
"use client"
import { useState } from "react"
import { api, AudioSearchResult } from "@/lib/api"
import { Button } from "@/components/ui/button"
import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle } from "@/components/ui/dialog"
import { Loader2, Music2, HardDrive, Calendar, Clock } from "lucide-react"
interface AudioSearchDialogProps {
jobId: string
open: boolean
onClose: () => void
onSelect: () => void
}
export function AudioSearchDialog({ jobId, open, onClose, onSelect }: AudioSearchDialogProps) {
const [results, setResults] = useState<AudioSearchResult[]>([])
const [isLoading, setIsLoading] = useState(true)
const [isSelecting, setIsSelecting] = useState(false)
const [error, setError] = useState("")
useState(() => {
if (open) {
loadResults()
}
})
async function loadResults() {
setIsLoading(true)
setError("")
try {
const data = await api.getAudioSearchResults(jobId)
setResults(data.results || [])
} catch (err: any) {
console.error("Failed to load search results:", err)
setError(err.message || "Failed to load search results")
} finally {
setIsLoading(false)
}
}
async function handleSelect(index: number) {
setIsSelecting(true)
try {
await api.selectAudioResult(jobId, index)
onSelect()
onClose()
} catch (err: any) {
console.error("Failed to select audio:", err)
setError(err.message || "Failed to select audio")
} finally {
setIsSelecting(false)
}
}
function formatDuration(seconds?: number): string {
if (!seconds) return ""
const mins = Math.floor(seconds / 60)
const secs = seconds % 60
return `${mins}:${secs.toString().padStart(2, "0")}`
}
return (
<Dialog open={open} onOpenChange={(open) => !open && onClose()}>
<DialogContent className="max-w-3xl max-h-[80vh] overflow-y-auto bg-slate-900 border-slate-700">
<DialogHeader>
<DialogTitle className="text-white">Select Audio Source</DialogTitle>
<DialogDescription className="text-slate-400">
Choose the best quality audio source for your karaoke video
</DialogDescription>
</DialogHeader>
{isLoading ? (
<div className="flex items-center justify-center py-8">
<Loader2 className="w-6 h-6 animate-spin text-slate-400" />
<span className="ml-2 text-slate-400">Loading search results...</span>
</div>
) : error ? (
<div className="text-center py-8 text-red-400">{error}</div>
) : results.length === 0 ? (
<div className="text-center py-8 text-slate-500">
<Music2 className="w-12 h-12 mx-auto mb-3 opacity-50" />
<p>No audio sources found</p>
</div>
) : (
<div className="space-y-2">
{results.map((result) => (
<div
key={result.index}
className="border border-slate-700 rounded-lg p-3 hover:bg-slate-800/50 transition-colors"
>
<div className="flex items-start justify-between gap-3">
<div className="flex-1 min-w-0">
<p className="font-medium text-white truncate">
{result.artist} - {result.title}
</p>
<div className="flex flex-wrap items-center gap-3 mt-1 text-xs text-slate-400">
<span className="flex items-center gap-1">
<HardDrive className="w-3 h-3" />
{result.provider}
</span>
{result.quality && (
<span className={`px-1.5 py-0.5 rounded ${
result.is_lossless ? "bg-green-600/20 text-green-400" : "bg-slate-600/20 text-slate-400"
}`}>
{result.quality}
</span>
)}
{result.duration && (
<span className="flex items-center gap-1">
<Clock className="w-3 h-3" />
{formatDuration(result.duration)}
</span>
)}
{result.year && (
<span className="flex items-center gap-1">
<Calendar className="w-3 h-3" />
{result.year}
</span>
)}
{result.seeders !== undefined && (
<span className="text-green-400">
{result.seeders} seeders
</span>
)}
</div>
{result.album && (
<p className="text-xs text-slate-500 mt-1 truncate">
Album: {result.album}
</p>
)}
</div>
<Button
size="sm"
onClick={() => handleSelect(result.index)}
disabled={isSelecting}
className="bg-amber-600 hover:bg-amber-500 text-white shrink-0"
>
{isSelecting ? (
<Loader2 className="w-3 h-3 animate-spin" />
) : (
"Select"
)}
</Button>
</div>
</div>
))}
</div>
)}
</DialogContent>
</Dialog>
)
}
@@ -0,0 +1,2 @@
export { AudioSearchDialog } from "./AudioSearchDialog"
@@ -0,0 +1,166 @@
"use client"
import { useState, useEffect } from "react"
import { api, InstrumentalOption } from "@/lib/api"
import { Button } from "@/components/ui/button"
import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle } from "@/components/ui/dialog"
import { Loader2, Music2, Play, Pause } from "lucide-react"
interface InstrumentalSelectorProps {
jobId: string
open: boolean
onClose: () => void
onSelect: () => void
}
export function InstrumentalSelector({ jobId, open, onClose, onSelect }: InstrumentalSelectorProps) {
const [options, setOptions] = useState<InstrumentalOption[]>([])
const [isLoading, setIsLoading] = useState(true)
const [isSelecting, setIsSelecting] = useState(false)
const [error, setError] = useState("")
const [playingId, setPlayingId] = useState<string | null>(null)
const [audioElements, setAudioElements] = useState<Map<string, HTMLAudioElement>>(new Map())
useEffect(() => {
if (open) {
loadOptions()
}
return () => {
// Cleanup audio elements
audioElements.forEach(audio => {
audio.pause()
audio.src = ""
})
}
}, [open])
async function loadOptions() {
setIsLoading(true)
setError("")
try {
const data = await api.getInstrumentalOptions(jobId)
setOptions(data.options || [])
} catch (err: any) {
console.error("Failed to load instrumental options:", err)
setError(err.message || "Failed to load options")
} finally {
setIsLoading(false)
}
}
async function handleSelect(selection: 'clean' | 'with_backing') {
setIsSelecting(true)
try {
await api.selectInstrumental(jobId, selection)
onSelect()
onClose()
} catch (err: any) {
console.error("Failed to select instrumental:", err)
setError(err.message || "Failed to select instrumental")
} finally {
setIsSelecting(false)
}
}
function togglePlayback(optionId: string, audioUrl: string) {
if (playingId === optionId) {
// Pause current
const audio = audioElements.get(optionId)
if (audio) {
audio.pause()
}
setPlayingId(null)
} else {
// Stop any currently playing audio
audioElements.forEach(audio => audio.pause())
// Play new audio
let audio = audioElements.get(optionId)
if (!audio) {
audio = new Audio(audioUrl)
audio.addEventListener('ended', () => setPlayingId(null))
audioElements.set(optionId, audio)
setAudioElements(new Map(audioElements))
}
audio.play()
setPlayingId(optionId)
}
}
return (
<Dialog open={open} onOpenChange={(open) => !open && onClose()}>
<DialogContent className="max-w-2xl bg-slate-900 border-slate-700">
<DialogHeader>
<DialogTitle className="text-white">Select Instrumental Version</DialogTitle>
<DialogDescription className="text-slate-400">
Choose between a clean instrumental or one with backing vocals
</DialogDescription>
</DialogHeader>
{isLoading ? (
<div className="flex items-center justify-center py-8">
<Loader2 className="w-6 h-6 animate-spin text-slate-400" />
<span className="ml-2 text-slate-400">Loading options...</span>
</div>
) : error ? (
<div className="text-center py-8 text-red-400">{error}</div>
) : options.length === 0 ? (
<div className="text-center py-8 text-slate-500">
<Music2 className="w-12 h-12 mx-auto mb-3 opacity-50" />
<p>No instrumental options available</p>
</div>
) : (
<div className="space-y-3">
{options.map((option) => (
<div
key={option.id}
className="border border-slate-700 rounded-lg p-4 hover:bg-slate-800/50 transition-colors"
>
<div className="flex items-center justify-between gap-3">
<div className="flex-1">
<p className="font-medium text-white">{option.label}</p>
{option.duration_seconds && (
<p className="text-xs text-slate-400 mt-1">
Duration: {Math.floor(option.duration_seconds / 60)}:
{(option.duration_seconds % 60).toString().padStart(2, '0')}
</p>
)}
</div>
<div className="flex items-center gap-2">
{option.audio_url && (
<Button
size="sm"
variant="ghost"
onClick={() => togglePlayback(option.id, option.audio_url)}
className="text-slate-400 hover:text-white"
>
{playingId === option.id ? (
<Pause className="w-4 h-4" />
) : (
<Play className="w-4 h-4" />
)}
</Button>
)}
<Button
size="sm"
onClick={() => handleSelect(option.id as 'clean' | 'with_backing')}
disabled={isSelecting}
className="bg-pink-600 hover:bg-pink-500 text-white"
>
{isSelecting ? (
<Loader2 className="w-3 h-3 animate-spin" />
) : (
"Select"
)}
</Button>
</div>
</div>
</div>
))}
</div>
)}
</DialogContent>
</Dialog>
)
}
+131
View File
@@ -0,0 +1,131 @@
"use client"
import { useState } from "react"
import { Job, api } from "@/lib/api"
import { Button } from "@/components/ui/button"
import {
Loader2, RotateCcw, XCircle, Trash2, FileText
} from "lucide-react"
interface JobActionsProps {
job: Job
onRefresh: () => void
showLogs: boolean
onToggleLogs: () => void
}
export function JobActions({ job, onRefresh, showLogs, onToggleLogs }: JobActionsProps) {
const [isRetrying, setIsRetrying] = useState(false)
const [isCancelling, setIsCancelling] = useState(false)
const [isDeleting, setIsDeleting] = useState(false)
const canRetry = job.status === "failed"
const canCancel = !["complete", "failed", "cancelled"].includes(job.status)
const canDelete = ["complete", "failed", "cancelled"].includes(job.status)
async function handleRetry() {
setIsRetrying(true)
try {
await api.retryJob(job.job_id)
onRefresh()
} catch (error) {
console.error("Failed to retry job:", error)
} finally {
setIsRetrying(false)
}
}
async function handleCancel() {
if (!confirm("Are you sure you want to cancel this job?")) return
setIsCancelling(true)
try {
await api.cancelJob(job.job_id)
onRefresh()
} catch (error) {
console.error("Failed to cancel job:", error)
} finally {
setIsCancelling(false)
}
}
async function handleDelete() {
if (!confirm("Are you sure you want to delete this job? This will remove all associated files.")) return
setIsDeleting(true)
try {
await api.deleteJob(job.job_id, true)
onRefresh()
} catch (error) {
console.error("Failed to delete job:", error)
} finally {
setIsDeleting(false)
}
}
return (
<div className="flex flex-wrap gap-2" onClick={(e) => e.stopPropagation()}>
<Button
size="sm"
variant="ghost"
onClick={onToggleLogs}
className="text-xs text-slate-400 hover:text-white"
>
<FileText className="w-3 h-3 mr-1" />
{showLogs ? "Hide" : "Show"} Logs
</Button>
{canRetry && (
<Button
size="sm"
variant="ghost"
onClick={handleRetry}
disabled={isRetrying}
className="text-xs text-blue-400 hover:text-blue-300"
>
{isRetrying ? (
<Loader2 className="w-3 h-3 mr-1 animate-spin" />
) : (
<RotateCcw className="w-3 h-3 mr-1" />
)}
Retry
</Button>
)}
{canCancel && (
<Button
size="sm"
variant="ghost"
onClick={handleCancel}
disabled={isCancelling}
className="text-xs text-orange-400 hover:text-orange-300"
>
{isCancelling ? (
<Loader2 className="w-3 h-3 mr-1 animate-spin" />
) : (
<XCircle className="w-3 h-3 mr-1" />
)}
Cancel
</Button>
)}
{canDelete && (
<Button
size="sm"
variant="ghost"
onClick={handleDelete}
disabled={isDeleting}
className="text-xs text-red-400 hover:text-red-300"
>
{isDeleting ? (
<Loader2 className="w-3 h-3 mr-1 animate-spin" />
) : (
<Trash2 className="w-3 h-3 mr-1" />
)}
Delete
</Button>
)}
</div>
)
}
+196
View File
@@ -0,0 +1,196 @@
"use client"
import { useState } from "react"
import { Job } from "@/lib/api"
import { Badge } from "@/components/ui/badge"
import { Button } from "@/components/ui/button"
import {
Loader2, CheckCircle2, XCircle, Clock, AlertCircle,
ChevronDown, ChevronUp, ExternalLink
} from "lucide-react"
import { JobActions } from "./JobActions"
import { JobLogs } from "./JobLogs"
import { OutputLinks } from "./OutputLinks"
import { InstrumentalSelector } from "./InstrumentalSelector"
import { AudioSearchDialog } from "../audio-search/AudioSearchDialog"
// Status badge styling
const statusConfig: Record<string, { color: string; icon: React.ReactNode; label: string }> = {
pending: { color: "bg-slate-500", icon: <Clock className="w-3 h-3" />, label: "Pending" },
searching_audio: { color: "bg-blue-500", icon: <Loader2 className="w-3 h-3 animate-spin" />, label: "Searching Audio" },
awaiting_audio_selection: { color: "bg-orange-500", icon: <AlertCircle className="w-3 h-3" />, label: "Select Audio" },
downloading: { color: "bg-blue-500", icon: <Loader2 className="w-3 h-3 animate-spin" />, label: "Downloading" },
downloading_audio: { color: "bg-blue-500", icon: <Loader2 className="w-3 h-3 animate-spin" />, label: "Downloading" },
separating_stage1: { color: "bg-purple-500", icon: <Loader2 className="w-3 h-3 animate-spin" />, label: "Separating (1/2)" },
separating_stage2: { color: "bg-purple-500", icon: <Loader2 className="w-3 h-3 animate-spin" />, label: "Separating (2/2)" },
audio_complete: { color: "bg-purple-600", icon: <CheckCircle2 className="w-3 h-3" />, label: "Audio Ready" },
transcribing: { color: "bg-amber-500", icon: <Loader2 className="w-3 h-3 animate-spin" />, label: "Transcribing" },
correcting: { color: "bg-amber-500", icon: <Loader2 className="w-3 h-3 animate-spin" />, label: "Correcting" },
lyrics_complete: { color: "bg-amber-600", icon: <CheckCircle2 className="w-3 h-3" />, label: "Lyrics Ready" },
generating_screens: { color: "bg-cyan-500", icon: <Loader2 className="w-3 h-3 animate-spin" />, label: "Generating Screens" },
awaiting_review: { color: "bg-orange-500", icon: <AlertCircle className="w-3 h-3" />, label: "Awaiting Review" },
in_review: { color: "bg-orange-600", icon: <Loader2 className="w-3 h-3 animate-spin" />, label: "In Review" },
review_complete: { color: "bg-teal-500", icon: <CheckCircle2 className="w-3 h-3" />, label: "Review Complete" },
rendering_video: { color: "bg-indigo-500", icon: <Loader2 className="w-3 h-3 animate-spin" />, label: "Rendering Video" },
awaiting_instrumental_selection: { color: "bg-pink-500", icon: <AlertCircle className="w-3 h-3" />, label: "Select Instrumental" },
instrumental_selected: { color: "bg-pink-600", icon: <CheckCircle2 className="w-3 h-3" />, label: "Instrumental Selected" },
generating_video: { color: "bg-violet-500", icon: <Loader2 className="w-3 h-3 animate-spin" />, label: "Generating Video" },
encoding: { color: "bg-violet-600", icon: <Loader2 className="w-3 h-3 animate-spin" />, label: "Encoding" },
packaging: { color: "bg-violet-700", icon: <Loader2 className="w-3 h-3 animate-spin" />, label: "Packaging" },
uploading: { color: "bg-green-500", icon: <Loader2 className="w-3 h-3 animate-spin" />, label: "Uploading" },
complete: { color: "bg-green-600", icon: <CheckCircle2 className="w-3 h-3" />, label: "Complete" },
failed: { color: "bg-red-600", icon: <XCircle className="w-3 h-3" />, label: "Failed" },
cancelled: { color: "bg-gray-500", icon: <XCircle className="w-3 h-3" />, label: "Cancelled" },
}
export function StatusBadge({ status }: { status: string }) {
const config = statusConfig[status] || { color: "bg-gray-500", icon: <Clock className="w-3 h-3" />, label: status }
return (
<Badge className={`${config.color} text-white gap-1`}>
{config.icon}
{config.label}
</Badge>
)
}
interface JobCardProps {
job: Job
onRefresh: () => void
}
export function JobCard({ job, onRefresh }: JobCardProps) {
const [showDetails, setShowDetails] = useState(false)
const [showLogs, setShowLogs] = useState(false)
const [showAudioSearch, setShowAudioSearch] = useState(false)
const [showInstrumentalSelector, setShowInstrumentalSelector] = useState(false)
const createdAt = new Date(job.created_at).toLocaleString()
const isInteractive = job.status === "awaiting_review" ||
job.status === "awaiting_instrumental_selection" ||
job.status === "awaiting_audio_selection"
const isComplete = job.status === "complete"
const isFailed = job.status === "failed"
const isProcessing = !isComplete && !isFailed && job.status !== "cancelled"
return (
<div
className={`rounded-lg border p-3 transition-colors
${isInteractive ? "border-orange-500/50 bg-orange-500/5" : "border-slate-700 bg-slate-800/30"}
${isComplete ? "border-green-500/30" : ""}
${isFailed ? "border-red-500/30" : ""}`}
>
<div
className="flex items-start justify-between gap-3 cursor-pointer"
onClick={() => setShowDetails(!showDetails)}
>
<div className="flex-1 min-w-0">
<p className="font-medium text-white truncate">
{job.artist || "Unknown"} - {job.title || "Unknown"}
</p>
<p className="text-xs text-slate-500 mt-1">{createdAt}</p>
{job.progress > 0 && job.progress < 100 && isProcessing && (
<div className="mt-2 h-1 rounded-full bg-slate-700 overflow-hidden">
<div
className="h-full bg-amber-500 transition-all duration-500"
style={{ width: `${job.progress}%` }}
/>
</div>
)}
</div>
<div className="flex items-center gap-2">
<StatusBadge status={job.status} />
{showDetails ? (
<ChevronUp className="w-4 h-4 text-slate-400" />
) : (
<ChevronDown className="w-4 h-4 text-slate-400" />
)}
</div>
</div>
{showDetails && (
<div className="mt-3 pt-3 border-t border-slate-700 space-y-3">
<p className="text-xs text-slate-400">
<span className="text-slate-500">Job ID:</span> {job.job_id}
</p>
{job.error_message && (
<div className="text-xs text-red-400 bg-red-500/10 rounded p-2 break-words">
{job.error_message}
</div>
)}
{isInteractive && (
<div className="flex flex-wrap gap-2">
{job.status === "awaiting_review" && (
<a
href={`https://lyrics.nomadkaraoke.com/?job=${job.job_id}`}
target="_blank"
rel="noopener noreferrer"
className="inline-flex items-center gap-1 text-xs px-3 py-1.5 rounded bg-orange-600 hover:bg-orange-500 text-white"
onClick={(e) => e.stopPropagation()}
>
<ExternalLink className="w-3 h-3" />
Review Lyrics
</a>
)}
{job.status === "awaiting_audio_selection" && (
<Button
size="sm"
onClick={(e) => {
e.stopPropagation()
setShowAudioSearch(true)
}}
className="text-xs bg-blue-600 hover:bg-blue-500"
>
Select Audio Source
</Button>
)}
{job.status === "awaiting_instrumental_selection" && (
<Button
size="sm"
onClick={(e) => {
e.stopPropagation()
setShowInstrumentalSelector(true)
}}
className="text-xs bg-pink-600 hover:bg-pink-500"
>
Select Instrumental
</Button>
)}
</div>
)}
{isComplete && (
<OutputLinks jobId={job.job_id} />
)}
<JobActions
job={job}
onRefresh={onRefresh}
showLogs={showLogs}
onToggleLogs={() => setShowLogs(!showLogs)}
/>
{showLogs && (
<JobLogs jobId={job.job_id} />
)}
</div>
)}
<AudioSearchDialog
jobId={job.job_id}
open={showAudioSearch}
onClose={() => setShowAudioSearch(false)}
onSelect={onRefresh}
/>
<InstrumentalSelector
jobId={job.job_id}
open={showInstrumentalSelector}
onClose={() => setShowInstrumentalSelector(false)}
onSelect={onRefresh}
/>
</div>
)
}
+87
View File
@@ -0,0 +1,87 @@
"use client"
import { useEffect, useState } from "react"
import { api, JobLog } from "@/lib/api"
import { Loader2, AlertCircle } from "lucide-react"
interface JobLogsProps {
jobId: string
limit?: number
}
export function JobLogs({ jobId, limit = 50 }: JobLogsProps) {
const [logs, setLogs] = useState<JobLog[]>([])
const [isLoading, setIsLoading] = useState(true)
const [error, setError] = useState("")
useEffect(() => {
loadLogs()
}, [jobId])
async function loadLogs() {
setIsLoading(true)
setError("")
try {
const data = await api.getJobLogs(jobId, limit)
setLogs(data)
} catch (err) {
console.error("Failed to load logs:", err)
setError("Failed to load logs")
} finally {
setIsLoading(false)
}
}
if (isLoading) {
return (
<div className="flex items-center justify-center py-4 text-slate-400">
<Loader2 className="w-4 h-4 animate-spin mr-2" />
Loading logs...
</div>
)
}
if (error) {
return (
<div className="flex items-center py-4 text-red-400 text-sm">
<AlertCircle className="w-4 h-4 mr-2" />
{error}
</div>
)
}
if (logs.length === 0) {
return (
<div className="text-center py-4 text-slate-500 text-sm">
No logs available
</div>
)
}
return (
<div className="bg-slate-900 rounded border border-slate-700 p-3 max-h-64 overflow-y-auto">
<div className="space-y-1 font-mono text-xs">
{logs.map((log, index) => (
<div
key={index}
className={`flex gap-2 ${
log.level === "ERROR" ? "text-red-400" :
log.level === "WARNING" ? "text-yellow-400" :
log.level === "INFO" ? "text-blue-400" :
"text-slate-400"
}`}
>
<span className="text-slate-600 shrink-0">
{new Date(log.timestamp).toLocaleTimeString()}
</span>
<span className="shrink-0 font-semibold w-12">
{log.level}
</span>
<span className="break-all">{log.message}</span>
</div>
))}
</div>
</div>
)
}
+338
View File
@@ -0,0 +1,338 @@
"use client"
import { useState } from "react"
import { api, ApiError } from "@/lib/api"
import { Button } from "@/components/ui/button"
import { Input } from "@/components/ui/input"
import { Label } from "@/components/ui/label"
import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs"
import { Upload, Youtube, Music, Loader2 } from "lucide-react"
interface JobSubmissionProps {
onJobCreated: () => void
}
export function JobSubmission({ onJobCreated }: JobSubmissionProps) {
const [activeTab, setActiveTab] = useState("upload")
const [error, setError] = useState("")
const [isSubmitting, setIsSubmitting] = useState(false)
// Upload form
const [uploadFile, setUploadFile] = useState<File | null>(null)
const [uploadArtist, setUploadArtist] = useState("")
const [uploadTitle, setUploadTitle] = useState("")
// URL form
const [youtubeUrl, setYoutubeUrl] = useState("")
const [youtubeArtist, setYoutubeArtist] = useState("")
const [youtubeTitle, setYoutubeTitle] = useState("")
// Audio search form
const [searchArtist, setSearchArtist] = useState("")
const [searchTitle, setSearchTitle] = useState("")
async function handleUploadSubmit(e: React.FormEvent) {
e.preventDefault()
setError("")
if (!uploadFile) {
setError("Please select an audio file")
return
}
if (!uploadArtist.trim() || !uploadTitle.trim()) {
setError("Please enter both artist and title")
return
}
setIsSubmitting(true)
try {
await api.uploadJob(uploadFile, uploadArtist.trim(), uploadTitle.trim())
setUploadFile(null)
setUploadArtist("")
setUploadTitle("")
onJobCreated()
} catch (err) {
if (err instanceof ApiError) {
setError(err.message)
} else {
setError("Failed to create job")
}
} finally {
setIsSubmitting(false)
}
}
async function handleUrlSubmit(e: React.FormEvent) {
e.preventDefault()
setError("")
if (!youtubeUrl.trim()) {
setError("Please enter a URL")
return
}
setIsSubmitting(true)
try {
await api.createJobFromUrl(
youtubeUrl.trim(),
youtubeArtist.trim() || undefined,
youtubeTitle.trim() || undefined
)
setYoutubeUrl("")
setYoutubeArtist("")
setYoutubeTitle("")
onJobCreated()
} catch (err) {
if (err instanceof ApiError) {
setError(err.message)
} else {
setError("Failed to create job")
}
} finally {
setIsSubmitting(false)
}
}
async function handleSearchSubmit(e: React.FormEvent) {
e.preventDefault()
setError("")
if (!searchArtist.trim() || !searchTitle.trim()) {
setError("Please enter both artist and title")
return
}
setIsSubmitting(true)
try {
await api.searchAudio(searchArtist.trim(), searchTitle.trim())
setSearchArtist("")
setSearchTitle("")
onJobCreated()
} catch (err) {
if (err instanceof ApiError) {
setError(err.message)
} else {
setError("Failed to search for audio")
}
} finally {
setIsSubmitting(false)
}
}
function handleFileChange(e: React.ChangeEvent<HTMLInputElement>) {
const file = e.target.files?.[0]
if (file) {
setUploadFile(file)
setError("")
}
}
return (
<Tabs value={activeTab} onValueChange={setActiveTab}>
<TabsList className="grid w-full grid-cols-3 bg-slate-800">
<TabsTrigger value="upload" className="gap-2 data-[state=active]:bg-slate-700">
<Upload className="w-4 h-4" />
Upload
</TabsTrigger>
<TabsTrigger value="url" className="gap-2 data-[state=active]:bg-slate-700">
<Youtube className="w-4 h-4" />
URL
</TabsTrigger>
<TabsTrigger value="search" className="gap-2 data-[state=active]:bg-slate-700">
<Music className="w-4 h-4" />
Search
</TabsTrigger>
</TabsList>
<TabsContent value="upload" className="mt-4">
<form onSubmit={handleUploadSubmit} className="space-y-4">
<div className="space-y-2">
<Label htmlFor="audio-file" className="text-slate-200">Audio File</Label>
<div
className={`relative border-2 border-dashed rounded-lg p-6 text-center transition-colors cursor-pointer
${uploadFile ? "border-amber-500/50 bg-amber-500/5" : "border-slate-700 hover:border-slate-600 bg-slate-800/50"}`}
>
<Input
id="audio-file"
type="file"
accept=".mp3,.wav,.flac,.m4a,.ogg,audio/*"
onChange={handleFileChange}
className="absolute inset-0 w-full h-full opacity-0 cursor-pointer"
disabled={isSubmitting}
/>
<Upload className="w-8 h-8 mx-auto mb-2 text-slate-500" />
{uploadFile ? (
<div>
<p className="font-medium text-white">{uploadFile.name}</p>
<p className="text-sm text-slate-400">{(uploadFile.size / 1024 / 1024).toFixed(2)} MB</p>
</div>
) : (
<div>
<p className="font-medium text-slate-300 mb-1">Click to upload</p>
<p className="text-sm text-slate-500">MP3, WAV, FLAC, M4A, or OGG</p>
</div>
)}
</div>
</div>
<div className="grid grid-cols-2 gap-4">
<div className="space-y-2">
<Label htmlFor="upload-artist" className="text-slate-200">Artist</Label>
<Input
id="upload-artist"
placeholder="Artist name"
value={uploadArtist}
onChange={(e) => setUploadArtist(e.target.value)}
disabled={isSubmitting}
className="bg-slate-800 border-slate-700 text-white placeholder:text-slate-500"
/>
</div>
<div className="space-y-2">
<Label htmlFor="upload-title" className="text-slate-200">Title</Label>
<Input
id="upload-title"
placeholder="Song title"
value={uploadTitle}
onChange={(e) => setUploadTitle(e.target.value)}
disabled={isSubmitting}
className="bg-slate-800 border-slate-700 text-white placeholder:text-slate-500"
/>
</div>
</div>
{error && activeTab === "upload" && (
<p className="text-sm text-red-400 bg-red-500/10 rounded p-2">{error}</p>
)}
<Button
type="submit"
className="w-full bg-amber-600 hover:bg-amber-500 text-white"
disabled={isSubmitting}
>
{isSubmitting ? (
<>
<Loader2 className="w-4 h-4 mr-2 animate-spin" />
Creating Job...
</>
) : (
"Create Karaoke Video"
)}
</Button>
</form>
</TabsContent>
<TabsContent value="url" className="mt-4">
<form onSubmit={handleUrlSubmit} className="space-y-4">
<div className="space-y-2">
<Label htmlFor="youtube-url" className="text-slate-200">YouTube URL</Label>
<div className="relative">
<Youtube className="absolute left-3 top-1/2 -translate-y-1/2 w-4 h-4 text-slate-500" />
<Input
id="youtube-url"
type="url"
placeholder="https://youtube.com/watch?v=..."
value={youtubeUrl}
onChange={(e) => setYoutubeUrl(e.target.value)}
className="pl-10 bg-slate-800 border-slate-700 text-white placeholder:text-slate-500"
disabled={isSubmitting}
/>
</div>
</div>
<div className="grid grid-cols-2 gap-4">
<div className="space-y-2">
<Label htmlFor="youtube-artist" className="text-slate-200">Artist (optional)</Label>
<Input
id="youtube-artist"
placeholder="Auto-detected"
value={youtubeArtist}
onChange={(e) => setYoutubeArtist(e.target.value)}
disabled={isSubmitting}
className="bg-slate-800 border-slate-700 text-white placeholder:text-slate-500"
/>
</div>
<div className="space-y-2">
<Label htmlFor="youtube-title" className="text-slate-200">Title (optional)</Label>
<Input
id="youtube-title"
placeholder="Auto-detected"
value={youtubeTitle}
onChange={(e) => setYoutubeTitle(e.target.value)}
disabled={isSubmitting}
className="bg-slate-800 border-slate-700 text-white placeholder:text-slate-500"
/>
</div>
</div>
{error && activeTab === "url" && (
<p className="text-sm text-red-400 bg-red-500/10 rounded p-2">{error}</p>
)}
<Button
type="submit"
className="w-full bg-amber-600 hover:bg-amber-500 text-white"
disabled={isSubmitting}
>
{isSubmitting ? (
<>
<Loader2 className="w-4 h-4 mr-2 animate-spin" />
Creating Job...
</>
) : (
"Create Karaoke Video"
)}
</Button>
</form>
</TabsContent>
<TabsContent value="search" className="mt-4">
<form onSubmit={handleSearchSubmit} className="space-y-4">
<div className="grid grid-cols-2 gap-4">
<div className="space-y-2">
<Label htmlFor="search-artist" className="text-slate-200">Artist</Label>
<Input
id="search-artist"
placeholder="Artist name"
value={searchArtist}
onChange={(e) => setSearchArtist(e.target.value)}
disabled={isSubmitting}
className="bg-slate-800 border-slate-700 text-white placeholder:text-slate-500"
/>
</div>
<div className="space-y-2">
<Label htmlFor="search-title" className="text-slate-200">Title</Label>
<Input
id="search-title"
placeholder="Song title"
value={searchTitle}
onChange={(e) => setSearchTitle(e.target.value)}
disabled={isSubmitting}
className="bg-slate-800 border-slate-700 text-white placeholder:text-slate-500"
/>
</div>
</div>
{error && activeTab === "search" && (
<p className="text-sm text-red-400 bg-red-500/10 rounded p-2">{error}</p>
)}
<Button
type="submit"
className="w-full bg-amber-600 hover:bg-amber-500 text-white"
disabled={isSubmitting}
>
{isSubmitting ? (
<>
<Loader2 className="w-4 h-4 mr-2 animate-spin" />
Searching...
</>
) : (
"Search & Create Job"
)}
</Button>
</form>
</TabsContent>
</Tabs>
)
}
+142
View File
@@ -0,0 +1,142 @@
"use client"
import { useEffect, useState } from "react"
import { api } from "@/lib/api"
import { Button } from "@/components/ui/button"
import { Download, Loader2, ExternalLink, FolderOpen } from "lucide-react"
interface OutputLinksProps {
jobId: string
}
export function OutputLinks({ jobId }: OutputLinksProps) {
const [downloadUrls, setDownloadUrls] = useState<Record<string, any> | null>(null)
const [youtubeUrl, setYoutubeUrl] = useState<string | null>(null)
const [dropboxUrl, setDropboxUrl] = useState<string | null>(null)
const [isLoading, setIsLoading] = useState(false)
useEffect(() => {
loadOutputLinks()
}, [jobId])
async function loadOutputLinks() {
setIsLoading(true)
try {
const result = await api.getDownloadUrls(jobId)
setDownloadUrls(result.download_urls)
// Extract YouTube and Dropbox URLs from state_data if available
const job = await api.getJob(jobId)
if (job.state_data?.youtube_url) {
setYoutubeUrl(job.state_data.youtube_url)
}
if (job.state_data?.dropbox_folder_url) {
setDropboxUrl(job.state_data.dropbox_folder_url)
}
} catch (err) {
console.error("Failed to load output links:", err)
} finally {
setIsLoading(false)
}
}
if (isLoading) {
return (
<div className="flex items-center gap-2 text-xs text-slate-400">
<Loader2 className="w-3 h-3 animate-spin" />
Loading downloads...
</div>
)
}
return (
<div className="space-y-2">
{/* Distribution Links */}
{(youtubeUrl || dropboxUrl) && (
<div className="space-y-2">
<p className="text-xs text-slate-400 font-medium">Distribution:</p>
<div className="flex flex-wrap gap-2">
{youtubeUrl && (
<a
href={youtubeUrl}
target="_blank"
rel="noopener noreferrer"
className="inline-flex items-center gap-1 text-xs px-3 py-1.5 rounded bg-red-600 hover:bg-red-500 text-white"
onClick={(e) => e.stopPropagation()}
>
<ExternalLink className="w-3 h-3" />
View on YouTube
</a>
)}
{dropboxUrl && (
<a
href={dropboxUrl}
target="_blank"
rel="noopener noreferrer"
className="inline-flex items-center gap-1 text-xs px-3 py-1.5 rounded bg-blue-600 hover:bg-blue-500 text-white"
onClick={(e) => e.stopPropagation()}
>
<FolderOpen className="w-3 h-3" />
Open Dropbox Folder
</a>
)}
</div>
</div>
)}
{/* Download Links */}
{downloadUrls && Object.keys(downloadUrls).length > 0 && (
<div className="space-y-2">
<p className="text-xs text-slate-400 font-medium">Downloads:</p>
<div className="flex flex-wrap gap-2">
{downloadUrls.finals?.lossy_720p && (
<a
href={api.getDownloadUrl(jobId, "finals", "lossy_720p")}
className="inline-flex items-center gap-1 text-xs px-3 py-1.5 rounded bg-green-600 hover:bg-green-500 text-white"
onClick={(e) => e.stopPropagation()}
>
<Download className="w-3 h-3" />
720p Video
</a>
)}
{downloadUrls.finals?.lossy_4k_mp4 && (
<a
href={api.getDownloadUrl(jobId, "finals", "lossy_4k_mp4")}
className="inline-flex items-center gap-1 text-xs px-3 py-1.5 rounded bg-green-600 hover:bg-green-500 text-white"
onClick={(e) => e.stopPropagation()}
>
<Download className="w-3 h-3" />
4K Video
</a>
)}
{downloadUrls.packages?.cdg_zip && (
<a
href={api.getDownloadUrl(jobId, "packages", "cdg_zip")}
className="inline-flex items-center gap-1 text-xs px-2 py-1.5 rounded bg-slate-600 hover:bg-slate-500 text-white"
onClick={(e) => e.stopPropagation()}
>
<Download className="w-3 h-3" />
CDG+MP3
</a>
)}
{downloadUrls.packages?.txt_zip && (
<a
href={api.getDownloadUrl(jobId, "packages", "txt_zip")}
className="inline-flex items-center gap-1 text-xs px-2 py-1.5 rounded bg-slate-600 hover:bg-slate-500 text-white"
onClick={(e) => e.stopPropagation()}
>
<Download className="w-3 h-3" />
TXT+MP3
</a>
)}
</div>
</div>
)}
{!downloadUrls && !youtubeUrl && !dropboxUrl && (
<p className="text-xs text-slate-500">No outputs available yet</p>
)}
</div>
)
}
+6
View File
@@ -0,0 +1,6 @@
export { JobCard, StatusBadge } from "./JobCard"
export { JobActions } from "./JobActions"
export { JobLogs } from "./JobLogs"
export { OutputLinks } from "./OutputLinks"
export { InstrumentalSelector } from "./InstrumentalSelector"
+86 -124
View File
@@ -1,143 +1,105 @@
'use client'
"use client"
import * as React from 'react'
import * as DialogPrimitive from '@radix-ui/react-dialog'
import { XIcon } from 'lucide-react'
import * as React from "react"
import * as DialogPrimitive from "@radix-ui/react-dialog"
import { X } from "lucide-react"
import { cn } from '@/lib/utils'
const Dialog = DialogPrimitive.Root
function Dialog({
...props
}: React.ComponentProps<typeof DialogPrimitive.Root>) {
return <DialogPrimitive.Root data-slot="dialog" {...props} />
}
const DialogTrigger = DialogPrimitive.Trigger
function DialogTrigger({
...props
}: React.ComponentProps<typeof DialogPrimitive.Trigger>) {
return <DialogPrimitive.Trigger data-slot="dialog-trigger" {...props} />
}
const DialogPortal = DialogPrimitive.Portal
function DialogPortal({
...props
}: React.ComponentProps<typeof DialogPrimitive.Portal>) {
return <DialogPrimitive.Portal data-slot="dialog-portal" {...props} />
}
const DialogClose = DialogPrimitive.Close
function DialogClose({
...props
}: React.ComponentProps<typeof DialogPrimitive.Close>) {
return <DialogPrimitive.Close data-slot="dialog-close" {...props} />
}
const DialogOverlay = React.forwardRef<
React.ElementRef<typeof DialogPrimitive.Overlay>,
React.ComponentPropsWithoutRef<typeof DialogPrimitive.Overlay>
>(({ className, ...props }, ref) => (
<DialogPrimitive.Overlay
ref={ref}
className="fixed inset-0 z-50 bg-black/80 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0"
{...props}
/>
))
DialogOverlay.displayName = DialogPrimitive.Overlay.displayName
function DialogOverlay({
const DialogContent = React.forwardRef<
React.ElementRef<typeof DialogPrimitive.Content>,
React.ComponentPropsWithoutRef<typeof DialogPrimitive.Content>
>(({ className, children, ...props }, ref) => (
<DialogPortal>
<DialogOverlay />
<DialogPrimitive.Content
ref={ref}
className="fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 border bg-background p-6 shadow-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] sm:rounded-lg"
{...props}
>
{children}
<DialogPrimitive.Close className="absolute right-4 top-4 rounded-sm opacity-70 ring-offset-background transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:pointer-events-none data-[state=open]:bg-accent data-[state=open]:text-muted-foreground">
<X className="h-4 w-4" />
<span className="sr-only">Close</span>
</DialogPrimitive.Close>
</DialogPrimitive.Content>
</DialogPortal>
))
DialogContent.displayName = DialogPrimitive.Content.displayName
const DialogHeader = ({
className,
...props
}: React.ComponentProps<typeof DialogPrimitive.Overlay>) {
return (
<DialogPrimitive.Overlay
data-slot="dialog-overlay"
className={cn(
'data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 fixed inset-0 z-50 bg-black/50',
className,
)}
{...props}
/>
)
}
}: React.HTMLAttributes<HTMLDivElement>) => (
<div
className="flex flex-col space-y-1.5 text-center sm:text-left"
{...props}
/>
)
DialogHeader.displayName = "DialogHeader"
function DialogContent({
className,
children,
showCloseButton = true,
...props
}: React.ComponentProps<typeof DialogPrimitive.Content> & {
showCloseButton?: boolean
}) {
return (
<DialogPortal data-slot="dialog-portal">
<DialogOverlay />
<DialogPrimitive.Content
data-slot="dialog-content"
className={cn(
'bg-background data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 fixed top-[50%] left-[50%] z-50 grid w-full max-w-[calc(100%-2rem)] translate-x-[-50%] translate-y-[-50%] gap-4 rounded-lg border p-6 shadow-lg duration-200 sm:max-w-lg',
className,
)}
{...props}
>
{children}
{showCloseButton && (
<DialogPrimitive.Close
data-slot="dialog-close"
className="ring-offset-background focus:ring-ring data-[state=open]:bg-accent data-[state=open]:text-muted-foreground absolute top-4 right-4 rounded-xs opacity-70 transition-opacity hover:opacity-100 focus:ring-2 focus:ring-offset-2 focus:outline-hidden disabled:pointer-events-none [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4"
>
<XIcon />
<span className="sr-only">Close</span>
</DialogPrimitive.Close>
)}
</DialogPrimitive.Content>
</DialogPortal>
)
}
function DialogHeader({ className, ...props }: React.ComponentProps<'div'>) {
return (
<div
data-slot="dialog-header"
className={cn('flex flex-col gap-2 text-center sm:text-left', className)}
{...props}
/>
)
}
function DialogFooter({ className, ...props }: React.ComponentProps<'div'>) {
return (
<div
data-slot="dialog-footer"
className={cn(
'flex flex-col-reverse gap-2 sm:flex-row sm:justify-end',
className,
)}
{...props}
/>
)
}
function DialogTitle({
const DialogFooter = ({
className,
...props
}: React.ComponentProps<typeof DialogPrimitive.Title>) {
return (
<DialogPrimitive.Title
data-slot="dialog-title"
className={cn('text-lg leading-none font-semibold', className)}
{...props}
/>
)
}
}: React.HTMLAttributes<HTMLDivElement>) => (
<div
className="flex flex-col-reverse sm:flex-row sm:justify-end sm:space-x-2"
{...props}
/>
)
DialogFooter.displayName = "DialogFooter"
function DialogDescription({
className,
...props
}: React.ComponentProps<typeof DialogPrimitive.Description>) {
return (
<DialogPrimitive.Description
data-slot="dialog-description"
className={cn('text-muted-foreground text-sm', className)}
{...props}
/>
)
}
const DialogTitle = React.forwardRef<
React.ElementRef<typeof DialogPrimitive.Title>,
React.ComponentPropsWithoutRef<typeof DialogPrimitive.Title>
>(({ className, ...props }, ref) => (
<DialogPrimitive.Title
ref={ref}
className="text-lg font-semibold leading-none tracking-tight"
{...props}
/>
))
DialogTitle.displayName = DialogPrimitive.Title.displayName
const DialogDescription = React.forwardRef<
React.ElementRef<typeof DialogPrimitive.Description>,
React.ComponentPropsWithoutRef<typeof DialogPrimitive.Description>
>(({ className, ...props }, ref) => (
<DialogPrimitive.Description
ref={ref}
className="text-sm text-muted-foreground"
{...props}
/>
))
DialogDescription.displayName = DialogPrimitive.Description.displayName
export {
Dialog,
DialogClose,
DialogContent,
DialogDescription,
DialogFooter,
DialogHeader,
DialogOverlay,
DialogPortal,
DialogTitle,
DialogOverlay,
DialogClose,
DialogTrigger,
DialogContent,
DialogHeader,
DialogFooter,
DialogTitle,
DialogDescription,
}
+32
View File
@@ -0,0 +1,32 @@
const nextJest = require('next/jest')
const createJestConfig = nextJest({
// Provide the path to your Next.js app to load next.config.js and .env files in your test environment
dir: './',
})
// Add any custom config to be passed to Jest
const customJestConfig = {
setupFilesAfterEnv: ['<rootDir>/jest.setup.js'],
testEnvironment: 'jest-environment-jsdom',
moduleNameMapper: {
'^@/(.*)$': '<rootDir>/$1',
},
testMatch: [
'**/__tests__/**/*.test.[jt]s?(x)',
'**/?(*.)+(spec|test).[jt]s?(x)'
],
collectCoverageFrom: [
'components/**/*.{js,jsx,ts,tsx}',
'lib/**/*.{js,jsx,ts,tsx}',
'app/**/*.{js,jsx,ts,tsx}',
'!**/*.d.ts',
'!**/node_modules/**',
'!**/.next/**',
'!**/out/**',
],
}
// createJestConfig is exported this way to ensure that next/jest can load the Next.js config which is async
module.exports = createJestConfig(customJestConfig)
+29
View File
@@ -0,0 +1,29 @@
// Learn more: https://github.com/testing-library/jest-dom
import '@testing-library/jest-dom'
// Mock window.matchMedia
Object.defineProperty(window, 'matchMedia', {
writable: true,
value: jest.fn().mockImplementation(query => ({
matches: false,
media: query,
onchange: null,
addListener: jest.fn(),
removeListener: jest.fn(),
addEventListener: jest.fn(),
removeEventListener: jest.fn(),
dispatchEvent: jest.fn(),
})),
})
// Mock IntersectionObserver
global.IntersectionObserver = class IntersectionObserver {
constructor() {}
disconnect() {}
observe() {}
takeRecords() {
return []
}
unobserve() {}
}
+4
View File
@@ -1,11 +1,15 @@
/** @type {import('next').NextConfig} */
const nextConfig = {
output: 'export',
trailingSlash: true,
typescript: {
ignoreBuildErrors: true,
},
images: {
unoptimized: true,
},
// GitHub Pages serves from subdomain, so no basePath needed
// gen.nomadkaraoke.com -> nomadkaraoke.github.io/karaoke-gen
}
export default nextConfig
+10 -1
View File
@@ -6,7 +6,10 @@
"build": "next build",
"dev": "next dev",
"lint": "eslint .",
"start": "next start"
"start": "next start",
"test": "jest --watch",
"test:ci": "jest --ci --coverage --maxWorkers=2",
"test:coverage": "jest --coverage"
},
"dependencies": {
"@hookform/resolvers": "^3.10.0",
@@ -65,9 +68,15 @@
},
"devDependencies": {
"@tailwindcss/postcss": "^4.1.9",
"@testing-library/jest-dom": "^6.1.5",
"@testing-library/react": "^14.1.2",
"@testing-library/user-event": "^14.5.1",
"@types/jest": "^29.5.11",
"@types/node": "^22",
"@types/react": "^19",
"@types/react-dom": "^19",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"postcss": "^8.5",
"tailwindcss": "^4.1.9",
"tw-animate-css": "1.3.3",
+1 -1
View File
@@ -1,6 +1,6 @@
[tool.poetry]
name = "karaoke-gen"
version = "0.75.5"
version = "0.75.6"
description = "Generate karaoke videos with synchronized lyrics. Handles the entire process from downloading audio and lyrics to creating the final video with title screens."
authors = ["Andrew Beveridge <andrew@beveridge.uk>"]
license = "MIT"