From 6773b903d6b71c1ab368f978cf7ed7948985ff94 Mon Sep 17 00:00:00 2001 From: Robin Schanbacher Date: Mon, 27 Jul 2026 14:10:10 +0200 Subject: [PATCH 01/28] Feat: add one card for all songs --- app/admin/page.tsx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/admin/page.tsx b/app/admin/page.tsx index e9eb936..2c9d906 100644 --- a/app/admin/page.tsx +++ b/app/admin/page.tsx @@ -229,6 +229,9 @@ export default function AdminPage() { + +

Alle Lieder:

+
); From 1a0f2614f2aa46371e21b851f8e0b9294a257b00 Mon Sep 17 00:00:00 2001 From: Robin Schanbacher Date: Mon, 27 Jul 2026 14:33:26 +0200 Subject: [PATCH 02/28] feat: add DatabaseOverview.tsx (component songs) --- components/DatabaseOverview.tsx | 138 ++++++++++++++++++++++++++++++++ 1 file changed, 138 insertions(+) create mode 100644 components/DatabaseOverview.tsx diff --git a/components/DatabaseOverview.tsx b/components/DatabaseOverview.tsx new file mode 100644 index 0000000..245e95f --- /dev/null +++ b/components/DatabaseOverview.tsx @@ -0,0 +1,138 @@ +import { useState, useEffect } from "react"; + +import Card from "./Card" +import { Input } from "./FormElements" + +interface SongsProps { + onSelectSong?: (song: Song) => void; +} + +interface Song { + song_id: number; + songbook_id: number; + song_number: string; + title: string; +} + +interface Songbook { + id: number; + name: string; + language: string; +} + +function Songs({onSelectSong}: SongsProps) { + const [song_search_name, setSongSearchName] = useState(""); + const [searchResults, setSearchResults] = useState([]); + const [allSongs, setAllSongs] = useState([]); + const [songbooks, setSongbooks] = useState([]); + + + const search = (query: string) => { + setSongSearchName(query); + if (query.trim() !== "") { + setSearchResults( + allSongs.filter((song) => + song.title.toLowerCase().includes(query.toLowerCase()) || + song.song_number.includes(query) + ) + ); + } else { + setSearchResults(allSongs); + } + }; + + useEffect(() => { + const getSongslist = async () => { + try { + const res = await fetch("/api/songs"); + if (res.ok) { + const data = await res.json(); + setAllSongs(data); + setSearchResults(data); + } + } catch (error) { + setAllSongs([]); + console.error("Failed fetching songslist!"); + } + }; + + async function loadSongbooks() { + try { + const res = await fetch("/api/songbooks"); + if (res.ok) { + const data = await res.json(); + setSongbooks(data); + } + } catch (error) { + console.error("Loading songbooks failed: ", error); + } + } + loadSongbooks(); + getSongslist(); + }, []); + + return ( + +
+ search(e.target.value)} + /> +
+ {/* TABELLE */} +
+ + + + + + + + + + + {searchResults.length === 0 ? ( + + + + ) : ( + searchResults.map((song) => { + const songBook = songbooks.find((book) => book.id === song.songbook_id); + return ( + + + + + + + ); + }) + )} + +
TitelLiederbuchNummerAktion
Keine Lieder gefunden
+ {song.title} + + {songBook ? songBook.name : "Unbekannt"} + + + {songBook ? songBook.name : "Unbekannt"} + + {song.song_number} + + onSelectSong?.(song)} + className="bg-white dark:bg-black hover:bg-blue-600 dark:hover:bg-blue-600 border border-neutral-300 dark:border-neutral-700 hover:border-blue-600 dark:hover:border-blue-500 hover:text-white font-medium rounded-md px-3 py-1.5 transition text-xs" + > + Anzeigen + +
+
+
+ ) +} + +export const Screens = { + Songs: Songs, +} \ No newline at end of file From e51ff6e7385d37fab22c8c5d3bd5c8bfee7a7000 Mon Sep 17 00:00:00 2001 From: Robin Schanbacher Date: Mon, 27 Jul 2026 14:43:44 +0200 Subject: [PATCH 03/28] refactor: create and use Songs-Screen in sender --- app/sender/page.tsx | 70 ++------------------------ components/Card.tsx | 32 +++++++----- components/DatabaseOverview.tsx | 88 ++++++++++++++++----------------- 3 files changed, 68 insertions(+), 122 deletions(-) diff --git a/app/sender/page.tsx b/app/sender/page.tsx index a5a3486..9d484c3 100644 --- a/app/sender/page.tsx +++ b/app/sender/page.tsx @@ -3,6 +3,7 @@ import { useState, useEffect } from "react"; import { Input } from "@/components/FormElements"; +import { Screens } from "@/components/DatabaseOverview"; interface Songbook { id: number; @@ -88,71 +89,8 @@ export default function SenderPage() { }; return ( -
- {/* LIEDERSUCHE */} -
-

- Liedersuche & Datenbank -

- -
- search(e.target.value)} - /> -
- - {/* TABELLE */} -
- - - - - - - - - - - {searchResults.length === 0 ? ( - - - - ) : ( - searchResults.map((song) => { - const songBook = songbooks.find((book) => book.id === song.songbook_id); - return ( - - - - - - - ); - }) - )} - -
TitelLiederbuchNummerAktion
Keine Lieder gefunden
- {song.title} - - {songBook ? songBook.name : "Unbekannt"} - - - {songBook ? songBook.name : "Unbekannt"} - - {song.song_number} - - sendID(String(song.song_id), String(song.songbook_id))} - className="bg-white dark:bg-black hover:bg-blue-600 dark:hover:bg-blue-600 border border-neutral-300 dark:border-neutral-700 hover:border-blue-600 dark:hover:border-blue-500 hover:text-white font-medium rounded-md px-3 py-1.5 transition text-xs" - > - Anzeigen - -
-
-
-
+ sendID(String(song.song_id), String(song.songbook_id))} + /> ); } \ No newline at end of file diff --git a/components/Card.tsx b/components/Card.tsx index 0a8450d..e5c1377 100644 --- a/components/Card.tsx +++ b/components/Card.tsx @@ -1,14 +1,22 @@ -import { ReactNode } from "react"; +import { ReactNode, ComponentPropsWithoutRef } from "react"; -export default function Card({title, children}: {title: string, children: ReactNode}) { - return ( -
-

- {title} -

-
- {children} -
-
- ); +interface CardProps extends ComponentPropsWithoutRef<"section"> { + title: string; + children: ReactNode; +} + +export default function Card({ title, children, className = "", ...props }: CardProps) { + return ( +
+

+ {title} +

+
+ {children} +
+
+ ); } \ No newline at end of file diff --git a/components/DatabaseOverview.tsx b/components/DatabaseOverview.tsx index 245e95f..808f350 100644 --- a/components/DatabaseOverview.tsx +++ b/components/DatabaseOverview.tsx @@ -72,7 +72,7 @@ function Songs({onSelectSong}: SongsProps) { }, []); return ( - +
{/* TABELLE */} -
- - - - - - - - - - - {searchResults.length === 0 ? ( +
+
TitelLiederbuchNummerAktion
+ - + + + + - ) : ( - searchResults.map((song) => { - const songBook = songbooks.find((book) => book.id === song.songbook_id); - return ( - - - - - + + + {searchResults.length === 0 ? ( + + - ); - }) - )} - -
Keine Lieder gefundenTitelLiederbuchNummerAktion
- {song.title} - - {songBook ? songBook.name : "Unbekannt"} - - - {songBook ? songBook.name : "Unbekannt"} - - {song.song_number} - - onSelectSong?.(song)} - className="bg-white dark:bg-black hover:bg-blue-600 dark:hover:bg-blue-600 border border-neutral-300 dark:border-neutral-700 hover:border-blue-600 dark:hover:border-blue-500 hover:text-white font-medium rounded-md px-3 py-1.5 transition text-xs" - > - Anzeigen - -
Keine Lieder gefunden
+ ) : ( + searchResults.map((song) => { + const songBook = songbooks.find((book) => book.id === song.songbook_id); + return ( + + + {song.title} + + {songBook ? songBook.name : "Unbekannt"} + + + + {songBook ? songBook.name : "Unbekannt"} + + + {song.song_number} + + + onSelectSong?.(song)} + className="bg-white dark:bg-black hover:bg-blue-600 dark:hover:bg-blue-600 border border-neutral-300 dark:border-neutral-700 hover:border-blue-600 dark:hover:border-blue-500 hover:text-white font-medium rounded-md px-3 py-1.5 transition text-xs" + > + Anzeigen + + + + ); + }) + )} + +
) From 0712740eb2d5b07496bbab2dd522b89b85a42347 Mon Sep 17 00:00:00 2001 From: Robin Schanbacher Date: Mon, 27 Jul 2026 14:59:47 +0200 Subject: [PATCH 04/28] feat: add Songs screen to admin page --- app/admin/page.tsx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/admin/page.tsx b/app/admin/page.tsx index 2c9d906..93983ab 100644 --- a/app/admin/page.tsx +++ b/app/admin/page.tsx @@ -5,6 +5,7 @@ import { useEffect, useState } from "react"; import Card from "@/components/Card" import { Input } from "@/components/FormElements"; +import { Screens } from "@/components/DatabaseOverview"; interface Songbook { id: number; @@ -229,9 +230,9 @@ export default function AdminPage() {
- -

Alle Lieder:

-
+ console.log(song)} + /> ); From ca02fe9e30b821c0ab76d44890acb422e01b3afe Mon Sep 17 00:00:00 2001 From: Robin Schanbacher Date: Mon, 27 Jul 2026 15:10:59 +0200 Subject: [PATCH 05/28] style: allow props to the songs screen --- app/admin/page.tsx | 1 + components/DatabaseOverview.tsx | 12 ++++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/app/admin/page.tsx b/app/admin/page.tsx index 93983ab..9872fbd 100644 --- a/app/admin/page.tsx +++ b/app/admin/page.tsx @@ -232,6 +232,7 @@ export default function AdminPage() { console.log(song)} + className="w-[600px]" /> diff --git a/components/DatabaseOverview.tsx b/components/DatabaseOverview.tsx index 808f350..43561ca 100644 --- a/components/DatabaseOverview.tsx +++ b/components/DatabaseOverview.tsx @@ -1,9 +1,9 @@ -import { useState, useEffect } from "react"; +import { useState, useEffect, ComponentPropsWithoutRef } from "react"; import Card from "./Card" import { Input } from "./FormElements" -interface SongsProps { +interface SongsProps extends Omit, "title" | "children"> { onSelectSong?: (song: Song) => void; } @@ -20,7 +20,7 @@ interface Songbook { language: string; } -function Songs({onSelectSong}: SongsProps) { +function Songs({ onSelectSong, className = "", ...props }: SongsProps) { const [song_search_name, setSongSearchName] = useState(""); const [searchResults, setSearchResults] = useState([]); const [allSongs, setAllSongs] = useState([]); @@ -72,7 +72,11 @@ function Songs({onSelectSong}: SongsProps) { }, []); return ( - +
Date: Mon, 27 Jul 2026 16:06:43 +0200 Subject: [PATCH 06/28] feat: add individual actionName --- app/admin/page.tsx | 3 ++- app/sender/page.tsx | 3 ++- components/DatabaseOverview.tsx | 5 +++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/admin/page.tsx b/app/admin/page.tsx index 9872fbd..d9632e3 100644 --- a/app/admin/page.tsx +++ b/app/admin/page.tsx @@ -231,8 +231,9 @@ export default function AdminPage() {
console.log(song)} - className="w-[600px]" + className="w-min" /> diff --git a/app/sender/page.tsx b/app/sender/page.tsx index 9d484c3..71e4465 100644 --- a/app/sender/page.tsx +++ b/app/sender/page.tsx @@ -89,7 +89,8 @@ export default function SenderPage() { }; return ( - sendID(String(song.song_id), String(song.songbook_id))} /> ); diff --git a/components/DatabaseOverview.tsx b/components/DatabaseOverview.tsx index 43561ca..1e327f7 100644 --- a/components/DatabaseOverview.tsx +++ b/components/DatabaseOverview.tsx @@ -5,6 +5,7 @@ import { Input } from "./FormElements" interface SongsProps extends Omit, "title" | "children"> { onSelectSong?: (song: Song) => void; + actionName?: string; } interface Song { @@ -20,7 +21,7 @@ interface Songbook { language: string; } -function Songs({ onSelectSong, className = "", ...props }: SongsProps) { +function Songs({ actionName, onSelectSong, className = "", ...props }: SongsProps) { const [song_search_name, setSongSearchName] = useState(""); const [searchResults, setSearchResults] = useState([]); const [allSongs, setAllSongs] = useState([]); @@ -123,7 +124,7 @@ function Songs({ onSelectSong, className = "", ...props }: SongsProps) { onClick={() => onSelectSong?.(song)} className="bg-white dark:bg-black hover:bg-blue-600 dark:hover:bg-blue-600 border border-neutral-300 dark:border-neutral-700 hover:border-blue-600 dark:hover:border-blue-500 hover:text-white font-medium rounded-md px-3 py-1.5 transition text-xs" > - Anzeigen + {actionName} From 09c5df8aae9104ddd587fe0d8e9f639ce4e61b60 Mon Sep 17 00:00:00 2001 From: Robin Schanbacher Date: Mon, 27 Jul 2026 16:16:16 +0200 Subject: [PATCH 07/28] Feat: "...props" added to Input.Text --- app/admin/page.tsx | 15 ++++++++++----- components/FormElements.tsx | 3 ++- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/app/admin/page.tsx b/app/admin/page.tsx index d9632e3..32b15f4 100644 --- a/app/admin/page.tsx +++ b/app/admin/page.tsx @@ -230,11 +230,16 @@ export default function AdminPage() {
- console.log(song)} - className="w-min" - /> +
+ console.log(song)} + className="" + /> + + + +
); diff --git a/components/FormElements.tsx b/components/FormElements.tsx index d2f722c..a7384f1 100644 --- a/components/FormElements.tsx +++ b/components/FormElements.tsx @@ -3,13 +3,14 @@ import { ComponentPropsWithoutRef } from "react"; interface TextfieldProps extends ComponentPropsWithoutRef<"input"> {} -function Textfield({value, onChange, placeholder}: TextfieldProps) { +function Textfield({value, onChange, placeholder, ...props}: TextfieldProps) { return ( ) } From b4084fdb1b22fec276678136971ea870ea889c18 Mon Sep 17 00:00:00 2001 From: Robin Schanbacher Date: Mon, 27 Jul 2026 16:23:30 +0200 Subject: [PATCH 08/28] style: add Label to FormElements --- app/admin/page.tsx | 14 +++++++------- components/FormElements.tsx | 9 +++++++++ 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/app/admin/page.tsx b/app/admin/page.tsx index 32b15f4..95e699e 100644 --- a/app/admin/page.tsx +++ b/app/admin/page.tsx @@ -122,7 +122,7 @@ export default function AdminPage() {
- + Name des Buchs
- + Sprache (Optional)
- + Liederbuch wählen setSelectedSongbookId(e.target.value)} @@ -166,7 +166,7 @@ export default function AdminPage() {
- + Nummer
- + Titel
- + Ziel-Liederbuch setSelectedSongbookId(e.target.value)} @@ -207,7 +207,7 @@ export default function AdminPage() {
- + Datei auswählen (.csv) ) { ) } +function Label( {children}: ComponentPropsWithoutRef<"label">) { + return ( + + ) +} + export const Input = { Text: Textfield, Select: Dropdown, File: File, Button: Button, + Label: Label, }; \ No newline at end of file From 154b5ee0a11adae4efef0b5bfb19d32c2244ace5 Mon Sep 17 00:00:00 2001 From: Robin Schanbacher Date: Mon, 27 Jul 2026 16:35:28 +0200 Subject: [PATCH 09/28] 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 10/28] 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 43054e98ad14a0033b50f2ec9aa207006d2b45da Mon Sep 17 00:00:00 2001 From: Robin Schanbacher Date: Mon, 27 Jul 2026 16:50:49 +0200 Subject: [PATCH 11/28] style: add option for left border (unstyled) --- components/Card.tsx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/components/Card.tsx b/components/Card.tsx index e5c1377..136c507 100644 --- a/components/Card.tsx +++ b/components/Card.tsx @@ -3,9 +3,10 @@ import { ReactNode, ComponentPropsWithoutRef } from "react"; interface CardProps extends ComponentPropsWithoutRef<"section"> { title: string; children: ReactNode; + hasLeftBorder?: boolean; } -export default function Card({ title, children, className = "", ...props }: CardProps) { +export default function Card({ title, hasLeftBorder = false, children, className = "", ...props }: CardProps) { return (
{title} -
+ + {/* border-l-2 fügt den Strich links ein, pl-4 macht Platz zum Inhalt */} +
{children}
From cbe0bd6e1ddf3adcec30456703a1082d1377434a Mon Sep 17 00:00:00 2001 From: Robin Schanbacher Date: Mon, 27 Jul 2026 16:58:41 +0200 Subject: [PATCH 12/28] style: redesigned card component --- app/admin/page.tsx | 6 ++++++ components/Card.tsx | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/admin/page.tsx b/app/admin/page.tsx index 95e699e..53c8b09 100644 --- a/app/admin/page.tsx +++ b/app/admin/page.tsx @@ -238,6 +238,12 @@ export default function AdminPage() { /> + + + + + +
diff --git a/components/Card.tsx b/components/Card.tsx index 136c507..495b328 100644 --- a/components/Card.tsx +++ b/components/Card.tsx @@ -9,7 +9,7 @@ interface CardProps extends ComponentPropsWithoutRef<"section"> { export default function Card({ title, hasLeftBorder = false, children, className = "", ...props }: CardProps) { return (

From 7548429936d952110f4886da0a4b49d37ad1be42 Mon Sep 17 00:00:00 2001 From: Robin Schanbacher Date: Mon, 27 Jul 2026 17:00:11 +0200 Subject: [PATCH 13/28] remove preview elements --- app/admin/page.tsx | 6 ------ 1 file changed, 6 deletions(-) diff --git a/app/admin/page.tsx b/app/admin/page.tsx index 53c8b09..95e699e 100644 --- a/app/admin/page.tsx +++ b/app/admin/page.tsx @@ -238,12 +238,6 @@ export default function AdminPage() { /> - - - - - -

From 089a7fd76b9b0fb0287966cdd0909165e506df5e Mon Sep 17 00:00:00 2001 From: Robin Schanbacher Date: Mon, 27 Jul 2026 17:51:01 +0200 Subject: [PATCH 14/28] 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 ec9bfce3a717db07444593efc2ac86c6e7f4c3aa Mon Sep 17 00:00:00 2001 From: Robin Schanbacher Date: Mon, 27 Jul 2026 18:26:47 +0200 Subject: [PATCH 15/28] style: add slate border to the header --- components/Header.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/Header.tsx b/components/Header.tsx index c9b3882..d0711fc 100644 --- a/components/Header.tsx +++ b/components/Header.tsx @@ -2,7 +2,7 @@ import NavItem from "./NavItem"; export default function Header() { return ( -
+
PsalmTafel