From 998434e4eb78a20ce657b5c288539d0af59f755a Mon Sep 17 00:00:00 2001 From: Rudi Date: Tue, 13 Oct 2026 21:25:53 +0200 Subject: [PATCH] Changed the name to 'AllSongsTable' --- app/admin/page.tsx | 115 ++++++++---------- app/sender/page.tsx | 2 +- ...DatabaseOverview.tsx => AllSongsTable.tsx} | 0 3 files changed, 55 insertions(+), 62 deletions(-) rename components/{DatabaseOverview.tsx => AllSongsTable.tsx} (100%) diff --git a/app/admin/page.tsx b/app/admin/page.tsx index 72af9c2..f20948c 100644 --- a/app/admin/page.tsx +++ b/app/admin/page.tsx @@ -1,46 +1,39 @@ "use client"; import { uploadCSVAction } from "./actions"; -import { JSXElementConstructor, Key, ReactElement, ReactNode, ReactPortal, useEffect, useState } from "react"; +import { useEffect, useState } from "react"; import Card from "@/components/Card" import { Input } from "@/components/FormElements"; -import { Screens } from "@/components/DatabaseOverview"; +import { Screens } from "@/components/AllSongsTable"; -interface Songbook { - id: number; - name: string; - language: string; -} +import { Song, SongBook, SongDetailed } from "@/lib/db/response"; -interface Song { - song_id: number; - songbook_id: number; - song_number: string; - title: string; -} -interface SongInfo { - songbook_id: number; - songbook_name: string; - song_number: string; - title: string; -} export default function AdminPage() { - const [songbooks, setSongbooks] = useState([]); - const [selectedSongbookId, setSelectedSongbookId] = useState(""); + // New Songbook + const [newBookTitle, setNewBookTitle] = useState(""); + const [newBookLanguage, setNewBookLanguage] = useState(""); + // New Song + const [addSongSelectedSongbookId, addSongSetSelectedSongbookId] = useState(""); const [number, setNumber] = useState(""); const [title, setTitle] = useState(""); - const [newBookName, setNewBookName] = useState(""); - const [newBookLanguage, setNewBookLanguage] = useState(""); - + // Import Songs + const [importSelectedSongbookId, importSetSelectedSongbookId] = useState(""); const [uploadStatus, setUploadStatus] = useState(null); + + // + + const [songbooks, setSongbooks] = useState([]); + + + const [selectedSong, setSelectedSong] = useState(null); - const [songInfos, setSongInfos] = useState([]) + const [songInfos, setSongInfos] = useState([]) async function handleCSVUpload(formData: FormData) { setUploadStatus("Verarbeite..."); @@ -61,7 +54,7 @@ export default function AdminPage() { async function fetchSongInfos() { try { - const res = await fetch(`/api/songs/${selectedSong?.song_id}`); + const res = await fetch(`/api/songs/${selectedSong?.id}`); if (res.ok) { const data = await res.json(); setSongInfos(data); @@ -90,17 +83,17 @@ export default function AdminPage() { }, []); const addSong = async () => { - if (!selectedSongbookId || !number || !title) { + if (!addSongSelectedSongbookId || !number || !title) { alert("Alle Felder ausfüllen!"); return; } - + try { const res = await fetch("/api/songs", { method: "POST", headers: { "Content-Type": "application/json" }, - body: JSON.stringify({ - songbookId: Number(selectedSongbookId), + body: JSON.stringify({ + songbookId: Number(addSongSelectedSongbookId), number: number, title: title }) @@ -118,7 +111,7 @@ export default function AdminPage() { }; const attachSong = async () => { - if (!selectedSongbookId || !number || !selectedSong) { + if (!addSongSelectedSongbookId || !number || !selectedSong) { alert("Alle Felder ausfüllen!"); return; } @@ -128,8 +121,8 @@ export default function AdminPage() { method: "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify({ - songbookId: selectedSongbookId, - songId: selectedSong.song_id, + songbookId: addSongSelectedSongbookId, + songId: selectedSong.id, number: number, }) }); @@ -144,7 +137,7 @@ export default function AdminPage() { } const removeSong = async () => { - if (!selectedSongbookId || !selectedSong) { + if (!addSongSelectedSongbookId || !selectedSong) { alert("Alle Felder ausfüllen!"); return; } @@ -154,8 +147,8 @@ export default function AdminPage() { method: "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify({ - songbookId: selectedSongbookId, - songId: selectedSong.song_id + songbookId: addSongSelectedSongbookId, + songId: selectedSong.id }) }); if (res.ok) { @@ -169,7 +162,7 @@ export default function AdminPage() { } const addSongbook = async () => { - if (!newBookName) { + if (!newBookTitle) { alert("Der Name des Liederbuches darf nicht leer sein!"); return; } @@ -178,14 +171,14 @@ export default function AdminPage() { const res = await fetch("/api/songbooks", { method: "POST", headers: { "Content-Type": "application/json" }, - body: JSON.stringify({ name: newBookName, language: newBookLanguage }) + body: JSON.stringify({ name: newBookTitle, language: newBookLanguage }) }); if (res.ok) { const createdBook = await res.json(); setSongbooks([...songbooks, createdBook]); alert("Liederbuch erfolgreich erstellt!"); - setNewBookName(""); + setNewBookTitle(""); setNewBookLanguage(""); } else { alert("Failed adding songbook!"); @@ -198,9 +191,9 @@ export default function AdminPage() { return (
- + {/* HEADER */} - +

Datenbank verwalten, neue Bücher erstellen und Lieder einpflegen

@@ -215,8 +208,8 @@ export default function AdminPage() { setNewBookName(e.target.value)} + value={newBookTitle} + onChange={(e) => setNewBookTitle(e.target.value)} />
@@ -228,7 +221,7 @@ export default function AdminPage() { onChange={(e) => setNewBookLanguage(e.target.value)} />
- @@ -242,13 +235,13 @@ export default function AdminPage() {
Liederbuch wählen setSelectedSongbookId(e.target.value)} + value={addSongSelectedSongbookId} + onChange={(e) => addSongSetSelectedSongbookId(e.target.value)} > {songbooks.map((book) => ( ))} @@ -279,18 +272,18 @@ export default function AdminPage() {
- +
Ziel-Liederbuch setSelectedSongbookId(e.target.value)} + value={addSongSelectedSongbookId} + onChange={(e) => addSongSetSelectedSongbookId(e.target.value)} > {songbooks.map((book) => ( ))} @@ -304,7 +297,7 @@ export default function AdminPage() { />
- Hochladen & Verarbeiten @@ -329,7 +322,7 @@ export default function AdminPage() {
-

Lied-ID: {selectedSong?.song_id ?? "-"}

+

Lied-ID: {selectedSong?.id ?? "-"}

In Liederbüchern:

{songInfos.length > 0 ? (
    @@ -350,13 +343,13 @@ export default function AdminPage() {
    Ziel-Liederbuch setSelectedSongbookId(e.target.value)} + value={addSongSelectedSongbookId} + onChange={(e) => addSongSetSelectedSongbookId(e.target.value)} > {songbooks.map((book) => ( ))} @@ -370,7 +363,7 @@ export default function AdminPage() { onChange={(e) => setNumber(e.target.value)} />
    - @@ -383,8 +376,8 @@ export default function AdminPage() {
    Ziel-Liederbuch setSelectedSongbookId(e.target.value)} + value={addSongSelectedSongbookId} + onChange={(e) => addSongSetSelectedSongbookId(e.target.value)} > {songInfos.length > 0 ? ( @@ -396,7 +389,7 @@ export default function AdminPage() { ): ""}
    - @@ -410,4 +403,4 @@ export default function AdminPage() {
); -} \ No newline at end of file +} diff --git a/app/sender/page.tsx b/app/sender/page.tsx index c8962f2..6c9cedc 100644 --- a/app/sender/page.tsx +++ b/app/sender/page.tsx @@ -1,6 +1,6 @@ "use client"; -import { Screens } from "@/components/DatabaseOverview"; +import { Screens } from "@/components/AllSongsTable"; export default function SenderPage() { const sendSong = async (title: string, bookTitle: string, number: string) => { diff --git a/components/DatabaseOverview.tsx b/components/AllSongsTable.tsx similarity index 100% rename from components/DatabaseOverview.tsx rename to components/AllSongsTable.tsx