From e51ff6e7385d37fab22c8c5d3bd5c8bfee7a7000 Mon Sep 17 00:00:00 2001 From: Robin Schanbacher Date: Mon, 27 Jul 2026 14:43:44 +0200 Subject: [PATCH] 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 + + + + ); + }) + )} + +
)