fix: create song
This commit is contained in:
1 parent
583ef90a7b
commit
fde1f27745
4 files changed
+62
-47
No files matched your search
@@ -2,7 +2,6 @@
|
|||||||
|
|
||||||
import { error } from "console";
|
import { error } from "console";
|
||||||
import Papa from "papaparse";
|
import Papa from "papaparse";
|
||||||
import { addSongToSongbook } from "@/lib/db/managing";
|
|
||||||
|
|
||||||
interface CSVRow {
|
interface CSVRow {
|
||||||
nummer: string;
|
nummer: string;
|
||||||
@@ -31,8 +30,8 @@ export async function uploadCSVAction(formData:FormData) {
|
|||||||
|
|
||||||
console.log("Data:", rows);
|
console.log("Data:", rows);
|
||||||
rows.forEach(row => {
|
rows.forEach(row => {
|
||||||
//console.log(`Nummer: ${row.number}, Titel: ${row.titel}`);
|
console.log(`Nummer: ${row.nummer}, Titel: ${row.titel}`);
|
||||||
addSongToSongbook(String(row.titel), Number(songbookId), String(row.nummer))
|
//addSongToSongbook(String(row.titel), Number(songbookId), String(row.nummer))
|
||||||
});
|
});
|
||||||
|
|
||||||
return { success: true, message: `${rows.length} Zeilen erfolgreich importiert.`};
|
return { success: true, message: `${rows.length} Zeilen erfolgreich importiert.`};
|
||||||
|
|||||||
+42
-31
@@ -9,7 +9,7 @@ import { Screens } from "@/components/DatabaseOverview";
|
|||||||
|
|
||||||
interface Songbook {
|
interface Songbook {
|
||||||
id: number;
|
id: number;
|
||||||
name: string;
|
title: string;
|
||||||
language: string;
|
language: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -22,7 +22,7 @@ interface Song {
|
|||||||
|
|
||||||
interface SongInfo {
|
interface SongInfo {
|
||||||
songbook_id: number;
|
songbook_id: number;
|
||||||
songbook_name: string;
|
songbook_title: string;
|
||||||
song_number: string;
|
song_number: string;
|
||||||
title: string;
|
title: string;
|
||||||
}
|
}
|
||||||
@@ -34,7 +34,7 @@ export default function AdminPage() {
|
|||||||
const [number, setNumber] = useState("");
|
const [number, setNumber] = useState("");
|
||||||
const [title, setTitle] = useState("");
|
const [title, setTitle] = useState("");
|
||||||
|
|
||||||
const [newBookName, setNewBookName] = useState("");
|
const [newBookTitle, setNewBookTitle] = useState("");
|
||||||
const [newBookLanguage, setNewBookLanguage] = useState("");
|
const [newBookLanguage, setNewBookLanguage] = useState("");
|
||||||
|
|
||||||
const [uploadStatus, setUploadStatus] = useState<string | null>(null);
|
const [uploadStatus, setUploadStatus] = useState<string | null>(null);
|
||||||
@@ -96,21 +96,34 @@ export default function AdminPage() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const res = await fetch("/api/songs", {
|
// Create song
|
||||||
|
const res1 = await fetch("/api/songs", {
|
||||||
method: "POST",
|
method: "POST",
|
||||||
headers: { "Content-Type": "application/json" },
|
headers: { "Content-Type": "application/json" },
|
||||||
body: JSON.stringify({
|
body: JSON.stringify({
|
||||||
songbookId: Number(selectedSongbookId),
|
|
||||||
number: number,
|
|
||||||
title: title
|
title: title
|
||||||
})
|
})
|
||||||
});
|
})
|
||||||
if (res.ok) {
|
if (res1.ok) {
|
||||||
alert("Lied erfolgreich hinzugefügt!");
|
console.log("Lied erfolgreich erstellt!");
|
||||||
setNumber("");
|
|
||||||
setTitle("");
|
|
||||||
} else {
|
} else {
|
||||||
alert("Fehler beim Senden.");
|
console.log("Lied erstellen fehlgeschlagen!");
|
||||||
|
}
|
||||||
|
|
||||||
|
// Attach song to songbook
|
||||||
|
const data = await res1.json()
|
||||||
|
const songId = data.song.id;
|
||||||
|
const res2 = await fetch(`/api/songbooks/${Number(selectedSongbookId)}/songs/${songId}`, {
|
||||||
|
method: "POST",
|
||||||
|
headers: { "Content-Type": "application/json" },
|
||||||
|
body: JSON.stringify({
|
||||||
|
number: number
|
||||||
|
})
|
||||||
|
})
|
||||||
|
if (res2.ok) {
|
||||||
|
console.log("Lied erfolgreich dem Liederbuch zugewiesen!");
|
||||||
|
} else {
|
||||||
|
console.log("Fehler");
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error("Failed sending current songID:", error);
|
console.error("Failed sending current songID:", error);
|
||||||
@@ -124,19 +137,17 @@ export default function AdminPage() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const res = await fetch("/api/songs/attach", {
|
const res2 = await fetch(`/api/songbooks/${Number(selectedSongbookId)}/songs/${selectedSong.song_id}`, {
|
||||||
method: "POST",
|
method: "POST",
|
||||||
headers: { "Content-Type": "application/json" },
|
headers: { "Content-Type": "application/json" },
|
||||||
body: JSON.stringify({
|
body: JSON.stringify({
|
||||||
songbookId: selectedSongbookId,
|
number: number
|
||||||
songId: selectedSong.song_id,
|
|
||||||
number: number,
|
|
||||||
})
|
})
|
||||||
});
|
})
|
||||||
if (res.ok) {
|
if (res2.ok) {
|
||||||
alert("Lied erfolgreich zum Liederbuch hinzugefügt!");
|
console.log("Lied erfolgreich dem Liederbuch zugewiesen!");
|
||||||
} else {
|
} else {
|
||||||
alert("Fehler beim Senden.");
|
console.log("Fehler");
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error("Failed sending current songID:", error);
|
console.error("Failed sending current songID:", error);
|
||||||
@@ -169,8 +180,8 @@ export default function AdminPage() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const addSongbook = async () => {
|
const addSongbook = async () => {
|
||||||
if (!newBookName) {
|
if (!newBookTitle) {
|
||||||
alert("Der Name des Liederbuches darf nicht leer sein!");
|
alert("Der Title des Liederbuches darf nicht leer sein!");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -178,14 +189,14 @@ export default function AdminPage() {
|
|||||||
const res = await fetch("/api/songbooks", {
|
const res = await fetch("/api/songbooks", {
|
||||||
method: "POST",
|
method: "POST",
|
||||||
headers: { "Content-Type": "application/json" },
|
headers: { "Content-Type": "application/json" },
|
||||||
body: JSON.stringify({ name: newBookName, language: newBookLanguage })
|
body: JSON.stringify({ title: newBookTitle, language: newBookLanguage })
|
||||||
});
|
});
|
||||||
|
|
||||||
if (res.ok) {
|
if (res.ok) {
|
||||||
const createdBook = await res.json();
|
const createdBook = await res.json();
|
||||||
setSongbooks([...songbooks, createdBook]);
|
setSongbooks([...songbooks, createdBook]);
|
||||||
alert("Liederbuch erfolgreich erstellt!");
|
alert("Liederbuch erfolgreich erstellt!");
|
||||||
setNewBookName("");
|
setNewBookTitle("");
|
||||||
setNewBookLanguage("");
|
setNewBookLanguage("");
|
||||||
} else {
|
} else {
|
||||||
alert("Failed adding songbook!");
|
alert("Failed adding songbook!");
|
||||||
@@ -215,8 +226,8 @@ export default function AdminPage() {
|
|||||||
<Input.Text
|
<Input.Text
|
||||||
type="text"
|
type="text"
|
||||||
placeholder="z.B. Gesangbuch"
|
placeholder="z.B. Gesangbuch"
|
||||||
value={newBookName}
|
value={newBookTitle}
|
||||||
onChange={(e) => setNewBookName(e.target.value)}
|
onChange={(e) => setNewBookTitle(e.target.value)}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
@@ -248,7 +259,7 @@ export default function AdminPage() {
|
|||||||
<option value="">-- Bitte wählen --</option>
|
<option value="">-- Bitte wählen --</option>
|
||||||
{songbooks.map((book) => (
|
{songbooks.map((book) => (
|
||||||
<option key={book.id} value={String(book.id)}>
|
<option key={book.id} value={String(book.id)}>
|
||||||
{book.name}{book.language ? ` (${book.language})` : ""}
|
{book.title}{book.language ? ` (${book.language})` : ""}
|
||||||
</option>
|
</option>
|
||||||
))}
|
))}
|
||||||
</Input.Select>
|
</Input.Select>
|
||||||
@@ -290,7 +301,7 @@ export default function AdminPage() {
|
|||||||
<option value="">-- Bitte wählen --</option>
|
<option value="">-- Bitte wählen --</option>
|
||||||
{songbooks.map((book) => (
|
{songbooks.map((book) => (
|
||||||
<option key={book.id} value={String(book.id)}>
|
<option key={book.id} value={String(book.id)}>
|
||||||
{book.name}{book.language ? ` (${book.language})` : ""}
|
{book.title}{book.language ? ` (${book.language})` : ""}
|
||||||
</option>
|
</option>
|
||||||
))}
|
))}
|
||||||
</Input.Select>
|
</Input.Select>
|
||||||
@@ -335,7 +346,7 @@ export default function AdminPage() {
|
|||||||
<ul className="list-disc list-inside pl-2 text-xs text-neutral-400">
|
<ul className="list-disc list-inside pl-2 text-xs text-neutral-400">
|
||||||
{songInfos.map((info) => (
|
{songInfos.map((info) => (
|
||||||
<li key={info.songbook_id}>
|
<li key={info.songbook_id}>
|
||||||
{info.songbook_name} (Nr. {info.song_number})
|
{info.songbook_title} (Nr. {info.song_number})
|
||||||
</li>
|
</li>
|
||||||
))}
|
))}
|
||||||
</ul>
|
</ul>
|
||||||
@@ -356,7 +367,7 @@ export default function AdminPage() {
|
|||||||
<option value="">-- Bitte wählen --</option>
|
<option value="">-- Bitte wählen --</option>
|
||||||
{songbooks.map((book) => (
|
{songbooks.map((book) => (
|
||||||
<option key={book.id} value={String(book.id)}>
|
<option key={book.id} value={String(book.id)}>
|
||||||
{book.name}{book.language ? ` (${book.language})` : ""}
|
{book.title}{book.language ? ` (${book.language})` : ""}
|
||||||
</option>
|
</option>
|
||||||
))}
|
))}
|
||||||
</Input.Select>
|
</Input.Select>
|
||||||
@@ -390,7 +401,7 @@ export default function AdminPage() {
|
|||||||
{songInfos.length > 0 ? (
|
{songInfos.length > 0 ? (
|
||||||
songInfos.map((info) => (
|
songInfos.map((info) => (
|
||||||
<option key={info.songbook_id} value={String(info.songbook_id)}>
|
<option key={info.songbook_id} value={String(info.songbook_id)}>
|
||||||
{info.songbook_name} (Nr. {info.song_number})
|
{info.songbook_title} (Nr. {info.song_number})
|
||||||
</option>
|
</option>
|
||||||
))
|
))
|
||||||
): ""}
|
): ""}
|
||||||
|
|||||||
@@ -110,7 +110,10 @@ export async function POST(request: Request) {
|
|||||||
|
|
||||||
if (!res.success) {
|
if (!res.success) {
|
||||||
return NextResponse.json(
|
return NextResponse.json(
|
||||||
{ message: res.error },
|
{
|
||||||
|
message: res.error,
|
||||||
|
song: res.song
|
||||||
|
},
|
||||||
{ status: res.status }
|
{ status: res.status }
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import { useState, useEffect, ComponentPropsWithoutRef } from "react";
|
import { useState, useEffect, ComponentPropsWithoutRef } from "react";
|
||||||
|
|
||||||
import Card from "./Card"
|
import Card from "./Card";
|
||||||
import { Input } from "./FormElements"
|
import { Input } from "./FormElements";
|
||||||
|
|
||||||
interface SongsProps extends Omit<ComponentPropsWithoutRef<typeof Card>, "title" | "children"> {
|
interface SongsProps extends Omit<ComponentPropsWithoutRef<typeof Card>, "title" | "children"> {
|
||||||
onSelectSong?: (song: Song) => void;
|
onSelectSong?: (song: Song) => void;
|
||||||
@@ -9,7 +9,7 @@ interface SongsProps extends Omit<ComponentPropsWithoutRef<typeof Card>, "title"
|
|||||||
}
|
}
|
||||||
|
|
||||||
interface Song {
|
interface Song {
|
||||||
song_id: number;
|
id: number;
|
||||||
songbook_id: number;
|
songbook_id: number;
|
||||||
song_number: string;
|
song_number: string;
|
||||||
title: string;
|
title: string;
|
||||||
@@ -17,17 +17,16 @@ interface Song {
|
|||||||
|
|
||||||
interface Songbook {
|
interface Songbook {
|
||||||
id: number;
|
id: number;
|
||||||
name: string;
|
title: string;
|
||||||
language: string;
|
language: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
function Songs({ actionName, onSelectSong, className = "", ...props }: SongsProps) {
|
function Songs({ actionName = "Auswählen", onSelectSong, className = "", ...props }: SongsProps) {
|
||||||
const [song_search_name, setSongSearchName] = useState("");
|
const [song_search_name, setSongSearchName] = useState("");
|
||||||
const [searchResults, setSearchResults] = useState<Song[]>([]);
|
const [searchResults, setSearchResults] = useState<Song[]>([]);
|
||||||
const [allSongs, setAllSongs] = useState<Song[]>([]);
|
const [allSongs, setAllSongs] = useState<Song[]>([]);
|
||||||
const [songbooks, setSongbooks] = useState<Songbook[]>([]);
|
const [songbooks, setSongbooks] = useState<Songbook[]>([]);
|
||||||
|
|
||||||
|
|
||||||
const search = (query: string) => {
|
const search = (query: string) => {
|
||||||
setSongSearchName(query);
|
setSongSearchName(query);
|
||||||
if (query.trim() !== "") {
|
if (query.trim() !== "") {
|
||||||
@@ -53,7 +52,7 @@ function Songs({ actionName, onSelectSong, className = "", ...props }: SongsProp
|
|||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
setAllSongs([]);
|
setAllSongs([]);
|
||||||
console.error("Failed fetching songslist!");
|
console.error("Failed fetching songslist!", error);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -68,6 +67,7 @@ function Songs({ actionName, onSelectSong, className = "", ...props }: SongsProp
|
|||||||
console.error("Loading songbooks failed: ", error);
|
console.error("Loading songbooks failed: ", error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
loadSongbooks();
|
loadSongbooks();
|
||||||
getSongslist();
|
getSongslist();
|
||||||
}, []);
|
}, []);
|
||||||
@@ -86,6 +86,7 @@ function Songs({ actionName, onSelectSong, className = "", ...props }: SongsProp
|
|||||||
onChange={(e) => search(e.target.value)}
|
onChange={(e) => search(e.target.value)}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* TABELLE */}
|
{/* TABELLE */}
|
||||||
<div className="flex-1 min-h-0 overflow-auto border border-neutral-200 dark:border-neutral-800 rounded-lg bg-white dark:bg-black">
|
<div className="flex-1 min-h-0 overflow-auto border border-neutral-200 dark:border-neutral-800 rounded-lg bg-white dark:bg-black">
|
||||||
<table className="w-full text-left border-collapse text-sm">
|
<table className="w-full text-left border-collapse text-sm">
|
||||||
@@ -105,16 +106,17 @@ function Songs({ actionName, onSelectSong, className = "", ...props }: SongsProp
|
|||||||
) : (
|
) : (
|
||||||
searchResults.map((song) => {
|
searchResults.map((song) => {
|
||||||
const songBook = songbooks.find((book) => book.id === song.songbook_id);
|
const songBook = songbooks.find((book) => book.id === song.songbook_id);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<tr key={`${song.songbook_id}-${song.song_id}`} className="hover:bg-neutral-100/60 dark:hover:bg-neutral-900/40 transition">
|
<tr key={`${song.songbook_id}-${song.id}`} className="hover:bg-neutral-100/60 dark:hover:bg-neutral-900/40 transition">
|
||||||
<td className="p-3 font-medium text-neutral-900 dark:text-white max-w-[180px] sm:max-w-none truncate">
|
<td className="p-3 font-medium text-neutral-900 dark:text-white max-w-[180px] sm:max-w-none truncate">
|
||||||
{song.title}
|
{song.title}
|
||||||
<span className="block text-xs text-neutral-500 dark:text-neutral-400 sm:hidden mt-0.5">
|
<span className="block text-xs text-neutral-500 dark:text-neutral-400 sm:hidden mt-0.5">
|
||||||
{songBook ? songBook.name : "Unbekannt"}
|
{songBook ? songBook.title : "Unbekannt"}
|
||||||
</span>
|
</span>
|
||||||
</td>
|
</td>
|
||||||
<td className="p-3 text-neutral-700 dark:text-neutral-300 hidden sm:table-cell">
|
<td className="p-3 text-neutral-700 dark:text-neutral-300 hidden sm:table-cell">
|
||||||
{songBook ? songBook.name : "Unbekannt"}
|
{songBook ? songBook.title : "Unbekannt"}
|
||||||
</td>
|
</td>
|
||||||
<td className="p-3 text-center font-mono text-blue-600 dark:text-blue-400 font-bold">
|
<td className="p-3 text-center font-mono text-blue-600 dark:text-blue-400 font-bold">
|
||||||
{song.song_number}
|
{song.song_number}
|
||||||
@@ -135,9 +137,9 @@ function Songs({ actionName, onSelectSong, className = "", ...props }: SongsProp
|
|||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
</Card>
|
</Card>
|
||||||
)
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
export const Screens = {
|
export const Screens = {
|
||||||
Songs: Songs,
|
Songs: Songs,
|
||||||
}
|
};
|
||||||
Reference in new issue
Block a user