From 154b5ee0a11adae4efef0b5bfb19d32c2244ace5 Mon Sep 17 00:00:00 2001 From: Robin Schanbacher Date: Mon, 27 Jul 2026 16:35:28 +0200 Subject: [PATCH 01/16] feat: add ability to select a song --- app/admin/page.tsx | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/app/admin/page.tsx b/app/admin/page.tsx index 95e699e..4652282 100644 --- a/app/admin/page.tsx +++ b/app/admin/page.tsx @@ -13,6 +13,13 @@ interface Songbook { language: string; } +interface Song { + song_id: number; + songbook_id: number; + song_number: string; + title: string; +} + export default function AdminPage() { const [songbooks, setSongbooks] = useState([]); const [selectedSongbookId, setSelectedSongbookId] = useState(""); @@ -25,6 +32,8 @@ export default function AdminPage() { const [uploadStatus, setUploadStatus] = useState(null); + const [selectedSong, setSelectedSong] = useState(null); + async function handleCSVUpload(formData: FormData) { setUploadStatus("Verarbeite..."); const result = await uploadCSVAction(formData); @@ -233,11 +242,11 @@ export default function AdminPage() {
console.log(song)} + onSelectSong={(song) => setSelectedSong(song)} className="" /> - +
From 3064112595e3845dd3ef5c28068817c75b898797 Mon Sep 17 00:00:00 2001 From: Robin Schanbacher Date: Mon, 27 Jul 2026 16:39:00 +0200 Subject: [PATCH 02/16] style: changed arrangement of elements in admin --- app/admin/page.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/admin/page.tsx b/app/admin/page.tsx index 4652282..b6e5a24 100644 --- a/app/admin/page.tsx +++ b/app/admin/page.tsx @@ -245,8 +245,11 @@ export default function AdminPage() { onSelectSong={(song) => setSelectedSong(song)} className="" /> - + + + + From 089a7fd76b9b0fb0287966cdd0909165e506df5e Mon Sep 17 00:00:00 2001 From: Robin Schanbacher Date: Mon, 27 Jul 2026 17:51:01 +0200 Subject: [PATCH 03/16] fix: filled children (unimportant) --- app/admin/page.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/admin/page.tsx b/app/admin/page.tsx index b6e5a24..a9c2f5e 100644 --- a/app/admin/page.tsx +++ b/app/admin/page.tsx @@ -248,7 +248,7 @@ export default function AdminPage() { - +

Content is comming soon

From 9b73ce99e7963c3ee737c2e32252d691e1b70954 Mon Sep 17 00:00:00 2001 From: Robin Schanbacher Date: Mon, 27 Jul 2026 18:32:29 +0200 Subject: [PATCH 04/16] style: fix margin issue --- app/admin/page.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/admin/page.tsx b/app/admin/page.tsx index a9c2f5e..6642516 100644 --- a/app/admin/page.tsx +++ b/app/admin/page.tsx @@ -247,7 +247,7 @@ export default function AdminPage() { /> - +

Content is comming soon

From f68d9cd9e5bc24b0a3dc02816be8c6415e6929bc Mon Sep 17 00:00:00 2001 From: Robin Schanbacher Date: Mon, 27 Jul 2026 18:39:26 +0200 Subject: [PATCH 05/16] feat: show raw informations about selected song --- app/admin/page.tsx | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/app/admin/page.tsx b/app/admin/page.tsx index 6642516..2366914 100644 --- a/app/admin/page.tsx +++ b/app/admin/page.tsx @@ -247,8 +247,23 @@ export default function AdminPage() { /> - -

Content is comming soon

+ +

Liederbuch-ID: {selectedSong?.songbook_id}

+

Nummer: {selectedSong?.song_number}

+

Lied-ID: {selectedSong?.song_id}

+
+ + setSelectedSongbookId(e.target.value)} + > + + {songbooks.map((book) => ( + + ))} +
From 5799eee96194db4f7d4231bf05bd34607811333e Mon Sep 17 00:00:00 2001 From: Robin Schanbacher Date: Mon, 27 Jul 2026 18:46:36 +0200 Subject: [PATCH 06/16] style: - --- app/admin/page.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/admin/page.tsx b/app/admin/page.tsx index 2366914..f9effee 100644 --- a/app/admin/page.tsx +++ b/app/admin/page.tsx @@ -198,7 +198,7 @@ export default function AdminPage() {
-
+
From 011f1b6e0b21cfe842b7e1a14f13fb433221fbda Mon Sep 17 00:00:00 2001 From: Robin Schanbacher Date: Mon, 27 Jul 2026 18:50:12 +0200 Subject: [PATCH 07/16] style: rearranged content --- app/admin/page.tsx | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/app/admin/page.tsx b/app/admin/page.tsx index f9effee..ea322aa 100644 --- a/app/admin/page.tsx +++ b/app/admin/page.tsx @@ -252,18 +252,20 @@ export default function AdminPage() {

Nummer: {selectedSong?.song_number}

Lied-ID: {selectedSong?.song_id}

- - setSelectedSongbookId(e.target.value)} - > - - {songbooks.map((book) => ( - - ))} - + + + setSelectedSongbookId(e.target.value)} + > + + {songbooks.map((book) => ( + + ))} + +
From d6fb6ec16dfd8d75e8b55a77c3e041da14047359 Mon Sep 17 00:00:00 2001 From: Robin Schanbacher Date: Tue, 28 Jul 2026 14:48:28 +0200 Subject: [PATCH 08/16] feat: add getSongInfos to db managing.ts --- lib/db/managing.ts | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/lib/db/managing.ts b/lib/db/managing.ts index 11b2071..f36e703 100644 --- a/lib/db/managing.ts +++ b/lib/db/managing.ts @@ -1,5 +1,4 @@ import Database from "better-sqlite3"; -import { Noto_Sans_Tamil_Supplement } from "next/font/google"; import path from "path"; const dbPath = path.join(process.cwd(), "songs.db"); @@ -69,6 +68,32 @@ export async function getSong(songbookId: number, songId: string) { } } +export async function getSongInfos(songId: string) { + try { + const songRecords = db.prepare(` + SELECT + ss.songbook_id, + sb.name AS songbook_name, + ss.song_number, + s.title + FROM songbook_songs ss + JOIN songbooks sb ON ss.songbook_id = sb.id + JOIN songs s ON ss.song_id = s.id + WHERE s.id = ? + `).all(songId) as { + songbook_id: number; + songbook_name: string; + song_number: string; + title: string; + }[] | undefined + + return songRecords || null; + } catch (error) { + console.error("Fehler in getSong:", error); + return null; + } +} + export async function addSongToSongbook(title:string, songbookId:number, number:string) { try { const runTransaction = db.transaction(() => { From d871bddc992d6d9150e07a8da6b1b7fe707e7f4f Mon Sep 17 00:00:00 2001 From: Robin Schanbacher Date: Tue, 28 Jul 2026 15:00:48 +0200 Subject: [PATCH 09/16] feat: add api for getSongInfos feat: show song informations of selected song --- app/admin/page.tsx | 47 ++++++++++++++++++++++++++++++++++--- app/api/songs/[id]/route.ts | 20 ++++++++++++++++ 2 files changed, 64 insertions(+), 3 deletions(-) create mode 100644 app/api/songs/[id]/route.ts diff --git a/app/admin/page.tsx b/app/admin/page.tsx index ea322aa..6270d9a 100644 --- a/app/admin/page.tsx +++ b/app/admin/page.tsx @@ -20,6 +20,13 @@ interface Song { 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(""); @@ -33,6 +40,7 @@ export default function AdminPage() { const [uploadStatus, setUploadStatus] = useState(null); const [selectedSong, setSelectedSong] = useState(null); + const [songInfos, setSongInfos] = useState([]) async function handleCSVUpload(formData: FormData) { setUploadStatus("Verarbeite..."); @@ -45,6 +53,27 @@ export default function AdminPage() { } } + useEffect(() => { + if (!selectedSong) { + setSongInfos([]); + return; + } + + async function fetchSongInfos() { + try { + const res = await fetch(`/api/songs/${selectedSong?.song_id}`); + if (res.ok) { + const data = await res.json(); + setSongInfos(data); + } + } catch (error) { + console.error("Fehler beim Laden der Songinfos:", error); + } + } + + fetchSongInfos(); + }, [selectedSong]); + useEffect(() => { async function loadSongbooks() { try { @@ -248,9 +277,21 @@ export default function AdminPage() { -

Liederbuch-ID: {selectedSong?.songbook_id}

-

Nummer: {selectedSong?.song_number}

-

Lied-ID: {selectedSong?.song_id}

+
+

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

+

In Liederbüchern:

+ {songInfos.length > 0 ? ( +
    + {songInfos.map((info) => ( +
  • + {info.songbook_name} (Nr. {info.song_number}) +
  • + ))} +
+ ) : ( +

Keine Daten geladen

+ )} +
diff --git a/app/api/songs/[id]/route.ts b/app/api/songs/[id]/route.ts new file mode 100644 index 0000000..7b43176 --- /dev/null +++ b/app/api/songs/[id]/route.ts @@ -0,0 +1,20 @@ +import { NextResponse } from "next/server"; +import { getSongInfos } from "@/lib/db/managing"; + +export async function GET( + request: Request, + { params }: { params: Promise<{ id: string }> } +) { + try { + const { id } = await params; + const songInfos = await getSongInfos(id); + + return NextResponse.json(songInfos || []); + } catch (error) { + console.error("API Error:", error); + return NextResponse.json( + { error: "Fehler beim Laden der Songinfos" }, + { status: 500 } + ); + } +} \ No newline at end of file From 8910a1ff0565dc4a13bf3a0c04f125db55c56768 Mon Sep 17 00:00:00 2001 From: Robin Schanbacher Date: Tue, 28 Jul 2026 15:32:48 +0200 Subject: [PATCH 10/16] feat: add attachSongToSongbook to db managing.ts --- app/admin/page.tsx | 46 +++++++++++++++++++++++++++++++++++----------- lib/db/managing.ts | 20 ++++++++++++++++++-- 2 files changed, 53 insertions(+), 13 deletions(-) diff --git a/app/admin/page.tsx b/app/admin/page.tsx index 6270d9a..99b4f3e 100644 --- a/app/admin/page.tsx +++ b/app/admin/page.tsx @@ -117,6 +117,10 @@ export default function AdminPage() { } }; + const attachSong = async () => { + + } + const addSongbook = async () => { if (!newBookName) { alert("Der Name des Liederbuches darf nicht leer sein!"); @@ -295,17 +299,37 @@ export default function AdminPage() { - setSelectedSongbookId(e.target.value)} - > - - {songbooks.map((book) => ( - - ))} - +
+
+ Ziel-Liederbuch + setSelectedSongbookId(e.target.value)} + > + + {songbooks.map((book) => ( + + ))} + +
+
+ Nummer + setTitle(e.target.value)} + /> +
+ + Lied hinzufügen + +
diff --git a/lib/db/managing.ts b/lib/db/managing.ts index f36e703..05b4399 100644 --- a/lib/db/managing.ts +++ b/lib/db/managing.ts @@ -86,7 +86,7 @@ export async function getSongInfos(songId: string) { song_number: string; title: string; }[] | undefined - + return songRecords || null; } catch (error) { console.error("Fehler in getSong:", error); @@ -120,6 +120,22 @@ export async function addSongToSongbook(title:string, songbookId:number, number: } } +export async function attachSongToSongbook(songId: number, songbookId: number, number: string) { + try { + const runTransaction = db.transaction(() => { + db.prepare(` + INSERT OR REPLACE INTO songbook_songs (songbook_id, song_id, song_number) + VALUES (?, ?, ?) + `).run(songbookId, songId, number); + }) + runTransaction(); + return { success: true } + } catch (error) { + console.error("Error in addSongToSongbook:", error); + return { success: false }; + } +} + export async function getSongbooks() { try { const songbooks = db.prepare('SELECT id, name, language FROM songbooks ORDER BY name ASC').all(); @@ -129,7 +145,7 @@ export async function getSongbooks() { } } -export async function addSongbook(name:String, language:String) { +export async function addSongbook(name: string, language: string) { try { const info = db.prepare(` INSERT INTO songbooks (name, language) From 001a0d6ef8dff14d957473c4bbe2d9a405e55c54 Mon Sep 17 00:00:00 2001 From: Robin Schanbacher Date: Tue, 28 Jul 2026 15:40:33 +0200 Subject: [PATCH 11/16] feat: add API for attachSongToSongbook --- app/api/songs/attach/route.ts | 40 +++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 app/api/songs/attach/route.ts diff --git a/app/api/songs/attach/route.ts b/app/api/songs/attach/route.ts new file mode 100644 index 0000000..ea385b5 --- /dev/null +++ b/app/api/songs/attach/route.ts @@ -0,0 +1,40 @@ +import { NextResponse } from "next/server"; +import { attachSongToSongbook } from "@/lib/db/managing"; + +export async function POST(request: Request) { + try { + const body = await request.json(); + const { songId, songbookId, number } = body; + + if (!songId || !songbookId || !number) { + return NextResponse.json( + { error: "songId, songbookId und number sind erforderlich." }, + { status: 400 } + ); + } + + const result = await attachSongToSongbook( + Number(songId), + Number(songbookId), + String(number) + ); + + if (result.success) { + return NextResponse.json( + { message: "Lied erfolgreich verknüpft!" }, + { status: 200 } + ); + } else { + return NextResponse.json( + { error: "Fehler beim Verknüpfen in der Datenbank." }, + { status: 500 } + ); + } + } catch (error) { + console.error("API Error in /api/songs/attach:", error); + return NextResponse.json( + { error: "Ungültiges JSON oder Serverfehler." }, + { status: 500 } + ); + } +} \ No newline at end of file From e3115df0bdcf24f1339c77c0a8e7c6521c078594 Mon Sep 17 00:00:00 2001 From: Robin Schanbacher Date: Tue, 28 Jul 2026 15:53:51 +0200 Subject: [PATCH 12/16] feat: add abilty to attach song to songbook --- app/admin/page.tsx | 28 +++++++++++++++++++++++++--- app/api/songs/attach/route.ts | 4 ++-- lib/db/managing.ts | 28 +++++++++++++++++++--------- 3 files changed, 46 insertions(+), 14 deletions(-) diff --git a/app/admin/page.tsx b/app/admin/page.tsx index 99b4f3e..727c07b 100644 --- a/app/admin/page.tsx +++ b/app/admin/page.tsx @@ -118,7 +118,29 @@ export default function AdminPage() { }; const attachSong = async () => { - + if (!selectedSongbookId || !number || !selectedSong) { + alert("Alle Felder ausfüllen!"); + return; + } + + try { + const res = await fetch("/api/songs/attach", { + method: "POST", + headers: { "Content-Type": "application/json" }, + body: JSON.stringify({ + songbookId: selectedSongbookId, + songId: selectedSong.song_id, + number: number, + }) + }); + if (res.ok) { + alert("Loed erfolgreich zum Liederbuch hinzugefügt!"); + } else { + alert("Fehler beim Senden."); + } + } catch (error) { + console.error("Failed sending current songID:", error); + } } const addSongbook = async () => { @@ -319,8 +341,8 @@ export default function AdminPage() { setTitle(e.target.value)} + value={number} + onChange={(e) => setNumber(e.target.value)} />
{ - db.prepare(` - INSERT OR REPLACE INTO songbook_songs (songbook_id, song_id, song_number) - VALUES (?, ?, ?) - `).run(songbookId, songId, number); - }) - runTransaction(); - return { success: true } + const songExists = db.prepare("SELECT id FROM songs WHERE id = ?").get(songId); + if (!songExists) { + console.error(`Song mit ID ${songId} existiert nicht in DB.`); + return { success: false, error: "Song nicht gefunden." }; + } + + const bookExists = db.prepare("SELECT id FROM songbooks WHERE id = ?").get(songbookId); + if (!bookExists) { + console.error(`Songbook mit ID ${songbookId} existiert nicht in DB.`); + return { success: false, error: "Liederbuch nicht gefunden." }; + } + + db.prepare(` + INSERT OR REPLACE INTO songbook_songs (songbook_id, song_id, song_number) + VALUES (?, ?, ?) + `).run(songbookId, songId, number); + + return { success: true }; } catch (error) { - console.error("Error in addSongToSongbook:", error); + console.error("Error in attachSongToSongbook:", error); return { success: false }; } } From f312217b7c6117e364905d05b0599d9511dd2001 Mon Sep 17 00:00:00 2001 From: Robin Schanbacher Date: Tue, 28 Jul 2026 16:17:20 +0200 Subject: [PATCH 13/16] fix: fix typo in admin page --- app/admin/page.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/admin/page.tsx b/app/admin/page.tsx index 727c07b..0dc873c 100644 --- a/app/admin/page.tsx +++ b/app/admin/page.tsx @@ -134,7 +134,7 @@ export default function AdminPage() { }) }); if (res.ok) { - alert("Loed erfolgreich zum Liederbuch hinzugefügt!"); + alert("Lied erfolgreich zum Liederbuch hinzugefügt!"); } else { alert("Fehler beim Senden."); } From 57ea3907b6a198b0e43b3ecfe3a7f4ba06c97847 Mon Sep 17 00:00:00 2001 From: Robin Schanbacher Date: Tue, 28 Jul 2026 16:27:25 +0200 Subject: [PATCH 14/16] feat: add removeSongFromSongbook to db managing.ts --- lib/db/managing.ts | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/lib/db/managing.ts b/lib/db/managing.ts index 2336fd1..f3c69b1 100644 --- a/lib/db/managing.ts +++ b/lib/db/managing.ts @@ -146,6 +146,20 @@ export async function attachSongToSongbook(songId: number, songbookId: number, n } } +export async function removeSongfromSongbook(songId: number, songbookId: number) { + try { + const info = db.prepare(` + DELETE FROM songbook_songs + WHERE songbook_id = ? AND song_id = ? + `).run(songbookId, songId); + + return { success: info.changes > 0 }; + } catch (error) { + console.error("Error in removeSongfromSongbook:", error); + return { success: false }; + } +} + export async function getSongbooks() { try { const songbooks = db.prepare('SELECT id, name, language FROM songbooks ORDER BY name ASC').all(); From dc75753f4177a63aee89d69ee661debd29e08d80 Mon Sep 17 00:00:00 2001 From: Robin Schanbacher Date: Tue, 28 Jul 2026 16:29:44 +0200 Subject: [PATCH 15/16] feat: add api for removeSongFromSongbook --- app/api/songs/remove/route.ts | 39 +++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 app/api/songs/remove/route.ts diff --git a/app/api/songs/remove/route.ts b/app/api/songs/remove/route.ts new file mode 100644 index 0000000..42745b6 --- /dev/null +++ b/app/api/songs/remove/route.ts @@ -0,0 +1,39 @@ +import { NextResponse } from "next/server"; +import { removeSongfromSongbook } from "@/lib/db/managing"; + +export async function POST(request: Request) { + try { + const body = await request.json(); + const { songId, songbookId } = body; + + if (isNaN(songId) || isNaN(songbookId)) { + return NextResponse.json( + { error: "Ungültige IDs." }, + { status: 400 } + ); + } + + const result = await removeSongfromSongbook( + Number(songId), + Number(songbookId) + ); + + if (result.success) { + return NextResponse.json( + { message: "Lied erfolgreich aus dem Liederbuch gelöscht!" }, + { status: 200 } + ); + } else { + return NextResponse.json( + { error: "Fehler beim Löschen aus dem Liederbuch." }, + { status: 500 } + ); + } + } catch (error) { + console.error("API Error in /api/songs/remove:", error); + return NextResponse.json( + { error: "Ungültiges JSON oder Serverfehler." }, + { status: 500 } + ); + } +} \ No newline at end of file From cf78d7cea230765a6c7b700de6d1d9c95c7a1667 Mon Sep 17 00:00:00 2001 From: Robin Schanbacher Date: Tue, 28 Jul 2026 17:03:28 +0200 Subject: [PATCH 16/16] feat: add ability to remove song from songbook --- app/admin/page.tsx | 53 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) diff --git a/app/admin/page.tsx b/app/admin/page.tsx index 0dc873c..72af9c2 100644 --- a/app/admin/page.tsx +++ b/app/admin/page.tsx @@ -1,7 +1,7 @@ "use client"; import { uploadCSVAction } from "./actions"; -import { useEffect, useState } from "react"; +import { JSXElementConstructor, Key, ReactElement, ReactNode, ReactPortal, useEffect, useState } from "react"; import Card from "@/components/Card" import { Input } from "@/components/FormElements"; @@ -143,6 +143,31 @@ export default function AdminPage() { } } + const removeSong = async () => { + if (!selectedSongbookId || !selectedSong) { + alert("Alle Felder ausfüllen!"); + return; + } + + try { + const res = await fetch("/api/songs/remove", { + method: "POST", + headers: { "Content-Type": "application/json" }, + body: JSON.stringify({ + songbookId: selectedSongbookId, + songId: selectedSong.song_id + }) + }); + if (res.ok) { + alert("Lied erfolgreich aus dem Liederbuch gelöscht!"); + } else { + alert("Fehler beim Senden."); + } + } catch (error) { + console.error("Failed sending current songID:", error); + } + } + const addSongbook = async () => { if (!newBookName) { alert("Der Name des Liederbuches darf nicht leer sein!"); @@ -353,6 +378,32 @@ export default function AdminPage() { + +
+
+ Ziel-Liederbuch + setSelectedSongbookId(e.target.value)} + > + + {songInfos.length > 0 ? ( + songInfos.map((info) => ( + + )) + ): ""} + +
+ + Lied aus Liederbuch löschen + +
+