Compare commits
5
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c71df05598 | ||
|
|
998434e4eb | ||
|
|
1d047c06a7 | ||
|
|
bdc864cf94 | ||
|
|
da4d67ea47 |
No files matched your search
@@ -1,8 +1,11 @@
|
||||
"use server";
|
||||
|
||||
import { error } from "console";
|
||||
//import { error } from "console";
|
||||
import Papa from "papaparse";
|
||||
import { addSongToSongbook } from "@/lib/db/managing";
|
||||
import { createSong } from "@/lib/db/song";
|
||||
//import { createSongBook } from "@/lib/db/songbook.ts";
|
||||
import { addSongToBook } from "@/lib/db/songbooksongs.ts";
|
||||
|
||||
|
||||
interface CSVRow {
|
||||
nummer: string;
|
||||
|
||||
+45
-52
@@ -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<Songbook[]>([]);
|
||||
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<string | null>(null);
|
||||
|
||||
|
||||
//
|
||||
|
||||
const [songbooks, setSongbooks] = useState<SongBook[]>([]);
|
||||
|
||||
|
||||
|
||||
const [selectedSong, setSelectedSong] = useState<Song | null>(null);
|
||||
const [songInfos, setSongInfos] = useState<SongInfo[]>([])
|
||||
const [songInfos, setSongInfos] = useState<SongDetailed[]>([])
|
||||
|
||||
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,7 +83,7 @@ export default function AdminPage() {
|
||||
}, []);
|
||||
|
||||
const addSong = async () => {
|
||||
if (!selectedSongbookId || !number || !title) {
|
||||
if (!addSongSelectedSongbookId || !number || !title) {
|
||||
alert("Alle Felder ausfüllen!");
|
||||
return;
|
||||
}
|
||||
@@ -100,7 +93,7 @@ export default function AdminPage() {
|
||||
method: "POST",
|
||||
headers: { "Content-Type": "application/json" },
|
||||
body: JSON.stringify({
|
||||
songbookId: Number(selectedSongbookId),
|
||||
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!");
|
||||
@@ -215,8 +208,8 @@ export default function AdminPage() {
|
||||
<Input.Text
|
||||
type="text"
|
||||
placeholder="z.B. Gesangbuch"
|
||||
value={newBookName}
|
||||
onChange={(e) => setNewBookName(e.target.value)}
|
||||
value={newBookTitle}
|
||||
onChange={(e) => setNewBookTitle(e.target.value)}
|
||||
/>
|
||||
</div>
|
||||
<div>
|
||||
@@ -242,13 +235,13 @@ export default function AdminPage() {
|
||||
<div>
|
||||
<Input.Label>Liederbuch wählen</Input.Label>
|
||||
<Input.Select
|
||||
value={selectedSongbookId}
|
||||
onChange={(e) => setSelectedSongbookId(e.target.value)}
|
||||
value={addSongSelectedSongbookId}
|
||||
onChange={(e) => addSongSetSelectedSongbookId(e.target.value)}
|
||||
>
|
||||
<option value="">-- Bitte wählen --</option>
|
||||
{songbooks.map((book) => (
|
||||
<option key={book.id} value={String(book.id)}>
|
||||
{book.name}{book.language ? ` (${book.language})` : ""}
|
||||
{book.title}{book.language ? ` (${book.language})` : ""}
|
||||
</option>
|
||||
))}
|
||||
</Input.Select>
|
||||
@@ -279,18 +272,18 @@ export default function AdminPage() {
|
||||
|
||||
<Card title="CSV-Massenimport">
|
||||
<form action={handleCSVUpload} className="flex flex-col justify-between">
|
||||
<input type="hidden" name="songbookId" value={selectedSongbookId} />
|
||||
<input type="hidden" name="songbookId" value={addSongSelectedSongbookId} />
|
||||
<div className="space-y-4">
|
||||
<div>
|
||||
<Input.Label>Ziel-Liederbuch</Input.Label>
|
||||
<Input.Select
|
||||
value={selectedSongbookId}
|
||||
onChange={(e) => setSelectedSongbookId(e.target.value)}
|
||||
value={addSongSelectedSongbookId}
|
||||
onChange={(e) => addSongSetSelectedSongbookId(e.target.value)}
|
||||
>
|
||||
<option value="">-- Bitte wählen --</option>
|
||||
{songbooks.map((book) => (
|
||||
<option key={book.id} value={String(book.id)}>
|
||||
{book.name}{book.language ? ` (${book.language})` : ""}
|
||||
{book.title}{book.language ? ` (${book.language})` : ""}
|
||||
</option>
|
||||
))}
|
||||
</Input.Select>
|
||||
@@ -329,7 +322,7 @@ export default function AdminPage() {
|
||||
<Input.Text value={selectedSong ? selectedSong.title : ""} disabled></Input.Text>
|
||||
<Card title="Informationen" className="mt-4">
|
||||
<div className="text-sm space-y-1">
|
||||
<p><span className="font-semibold">Lied-ID:</span> {selectedSong?.song_id ?? "-"}</p>
|
||||
<p><span className="font-semibold">Lied-ID:</span> {selectedSong?.id ?? "-"}</p>
|
||||
<p><span className="font-semibold">In Liederbüchern:</span></p>
|
||||
{songInfos.length > 0 ? (
|
||||
<ul className="list-disc list-inside pl-2 text-xs text-neutral-400">
|
||||
@@ -350,13 +343,13 @@ export default function AdminPage() {
|
||||
<div>
|
||||
<Input.Label>Ziel-Liederbuch</Input.Label>
|
||||
<Input.Select
|
||||
value={selectedSongbookId}
|
||||
onChange={(e) => setSelectedSongbookId(e.target.value)}
|
||||
value={addSongSelectedSongbookId}
|
||||
onChange={(e) => addSongSetSelectedSongbookId(e.target.value)}
|
||||
>
|
||||
<option value="">-- Bitte wählen --</option>
|
||||
{songbooks.map((book) => (
|
||||
<option key={book.id} value={String(book.id)}>
|
||||
{book.name}{book.language ? ` (${book.language})` : ""}
|
||||
{book.title}{book.language ? ` (${book.language})` : ""}
|
||||
</option>
|
||||
))}
|
||||
</Input.Select>
|
||||
@@ -383,8 +376,8 @@ export default function AdminPage() {
|
||||
<div>
|
||||
<Input.Label>Ziel-Liederbuch</Input.Label>
|
||||
<Input.Select
|
||||
value={selectedSongbookId}
|
||||
onChange={(e) => setSelectedSongbookId(e.target.value)}
|
||||
value={addSongSelectedSongbookId}
|
||||
onChange={(e) => addSongSetSelectedSongbookId(e.target.value)}
|
||||
>
|
||||
<option value="">-- Bitte wählen --</option>
|
||||
{songInfos.length > 0 ? (
|
||||
|
||||
@@ -1,6 +1,11 @@
|
||||
import { NextResponse } from "next/server";
|
||||
import { getSongBookById, updateSongBook, deleteSongBook } from "@/lib/db/songbook";
|
||||
// import { parseInt } from "@/lib/helper/checkvar";
|
||||
|
||||
interface RouteParams {
|
||||
params: Promise<{
|
||||
songBookId: string;
|
||||
}>;
|
||||
};
|
||||
|
||||
/**
|
||||
* @openapi
|
||||
@@ -28,12 +33,12 @@ import { getSongBookById, updateSongBook, deleteSongBook } from "@/lib/db/songbo
|
||||
*/
|
||||
|
||||
|
||||
export async function GET(request: Request, { params }) {
|
||||
export async function GET(_request: Request, { params }: RouteParams) {
|
||||
try {
|
||||
const { songBookId } = await params;
|
||||
|
||||
|
||||
const res = await getSongBookById(songBookId);
|
||||
const res = await getSongBookById(parseInt(songBookId));
|
||||
|
||||
|
||||
if (!res.success) {
|
||||
@@ -81,11 +86,11 @@ export async function GET(request: Request, { params }) {
|
||||
* 500:
|
||||
* description: Serverfehler
|
||||
*/
|
||||
export async function PATCH(request: Request, { params }) {
|
||||
export async function PATCH(request: Request, { params }: RouteParams) {
|
||||
try {
|
||||
const { songBookId } = await params;
|
||||
const data = await request.json();
|
||||
const res = await updateSongBook(songBookId, data);
|
||||
const res = await updateSongBook(parseInt(songBookId), data);
|
||||
|
||||
if (!res.success) {
|
||||
return NextResponse.json({ message: res.error }, { status: res.status });
|
||||
@@ -126,10 +131,10 @@ export async function PATCH(request: Request, { params }) {
|
||||
* 500:
|
||||
* description: Serverfehler
|
||||
*/
|
||||
export async function DELETE(request: Request, { params }) {
|
||||
export async function DELETE(_request: Request, { params }: RouteParams) {
|
||||
try {
|
||||
const { songBookId } = await params;
|
||||
const res = await deleteSongBook(songBookId);
|
||||
const res = await deleteSongBook(parseInt(songBookId));
|
||||
|
||||
if (!res.success) {
|
||||
return NextResponse.json({ message: res.error }, { status: res.status });
|
||||
|
||||
@@ -1,6 +1,12 @@
|
||||
import { NextResponse } from "next/server";
|
||||
import { addSongToBook, updateSongInBook, removeSongFromBook } from "@/lib/db/songbooksongs";
|
||||
// import { parseInt } from "@/lib/helper/checkvar";
|
||||
|
||||
interface RouteParams {
|
||||
params: Promise<{
|
||||
songBookId: string;
|
||||
songId: string;
|
||||
}>;
|
||||
};
|
||||
|
||||
/**
|
||||
* @openapi
|
||||
@@ -45,13 +51,13 @@ import { addSongToBook, updateSongInBook, removeSongFromBook } from "@/lib/db/so
|
||||
* 500:
|
||||
* description: Serverfehler
|
||||
*/
|
||||
export async function POST(request: Request, { params }) {
|
||||
export async function POST(request: Request, { params }: RouteParams) {
|
||||
try {
|
||||
const { songBookId, songId } = await params;
|
||||
const data = await request.json();
|
||||
|
||||
|
||||
const res = await addSongToBook(songId, songBookId, data.number);
|
||||
const res = await addSongToBook(parseInt(songId), parseInt(songBookId), String(data.number));
|
||||
|
||||
|
||||
if (!res.success) {
|
||||
@@ -114,11 +120,11 @@ export async function POST(request: Request, { params }) {
|
||||
* 500:
|
||||
* description: Serverfehler
|
||||
*/
|
||||
export async function PATCH(request: Request, { params }) {
|
||||
export async function PATCH(request: Request, { params }: RouteParams) {
|
||||
try {
|
||||
const { songBookId, songId } = await params;
|
||||
const data = await request.json();
|
||||
const res = await updateSongInBook(songId, songBookId, data);
|
||||
const res = await updateSongInBook(parseInt(songId), parseInt(songBookId), data);
|
||||
|
||||
if (!res.success) {
|
||||
return NextResponse.json({ message: res.error }, { status: res.status });
|
||||
@@ -165,11 +171,11 @@ export async function PATCH(request: Request, { params }) {
|
||||
* 500:
|
||||
* description: Serverfehler
|
||||
*/
|
||||
export async function DELETE(request: Request, { params }) {
|
||||
export async function DELETE(_request: Request, { params }: RouteParams) {
|
||||
try {
|
||||
const { songBookId, songId } = await params;
|
||||
|
||||
const res = await removeSongFromBook(songId, songBookId);
|
||||
const res = await removeSongFromBook(parseInt(songId), parseInt(songBookId));
|
||||
|
||||
if (!res.success) {
|
||||
return NextResponse.json({ message: res.error }, { status: res.status });
|
||||
|
||||
@@ -1,6 +1,11 @@
|
||||
import { NextResponse } from "next/server";
|
||||
import { getSongByNumber } from "@/lib/db/songbooksongs";
|
||||
|
||||
interface RouteParams {
|
||||
params: Promise<{
|
||||
songBookId: string;
|
||||
}>;
|
||||
};
|
||||
|
||||
/**
|
||||
* @openapi
|
||||
@@ -26,14 +31,14 @@ import { getSongByNumber } from "@/lib/db/songbooksongs";
|
||||
* 500:
|
||||
* description: Serverfehler
|
||||
*/
|
||||
export async function GET(request: Request, { params }) {
|
||||
export async function GET(request: Request, { params }: RouteParams) {
|
||||
try {
|
||||
const { songBookId } = await params;
|
||||
const { searchParams } = new URL(request.url);
|
||||
const number = searchParams.get("number") || searchParams.get("n");
|
||||
|
||||
if(number){
|
||||
const res = await getSongByNumber(songBookId, number);
|
||||
const res = await getSongByNumber(parseInt(songBookId), number);
|
||||
|
||||
if (!res.success) {
|
||||
return NextResponse.json({ message: res.error }, { status: res.status });
|
||||
|
||||
@@ -1,7 +1,11 @@
|
||||
import { NextResponse } from "next/server";
|
||||
import { getSongById, updateSong, deleteSong } from "@/lib/db/song";
|
||||
// import { parseInt } from "@/lib/helper/checkvar";
|
||||
|
||||
interface RouteParams {
|
||||
params: Promise<{
|
||||
songId: string;
|
||||
}>;
|
||||
};
|
||||
|
||||
/**
|
||||
* @openapi
|
||||
@@ -27,10 +31,10 @@ import { getSongById, updateSong, deleteSong } from "@/lib/db/song";
|
||||
* 500:
|
||||
* description: Serverfehler
|
||||
*/
|
||||
export async function GET(request: Request, { params }) {
|
||||
export async function GET(_request: Request, { params }: RouteParams) {
|
||||
try {
|
||||
const { songId } = await params;
|
||||
const res = await getSongById(songId);
|
||||
const res = await getSongById(parseInt(songId));
|
||||
|
||||
if (!res.success) {
|
||||
return NextResponse.json({ message: res.error }, { status: res.status });
|
||||
@@ -77,11 +81,11 @@ export async function GET(request: Request, { params }) {
|
||||
* 500:
|
||||
* description: Serverfehler
|
||||
*/
|
||||
export async function PATCH(request: Request, { params }) {
|
||||
export async function PATCH(request: Request, { params }: RouteParams) {
|
||||
try {
|
||||
const { songId } = await params;
|
||||
const data = await request.json();
|
||||
const res = await updateSong(songId, data);
|
||||
const res = await updateSong(parseInt(songId), data);
|
||||
|
||||
if (!res.success) {
|
||||
return NextResponse.json({ message: res.error }, { status: res.status });
|
||||
@@ -122,10 +126,10 @@ export async function PATCH(request: Request, { params }) {
|
||||
* 500:
|
||||
* description: Serverfehler
|
||||
*/
|
||||
export async function DELETE(request: Request, { params }) {
|
||||
export async function DELETE(_request: Request, { params }: RouteParams) {
|
||||
try {
|
||||
const { songId } = await params;
|
||||
const res = await deleteSong(songId);
|
||||
const res = await deleteSong(parseInt(songId));
|
||||
|
||||
if (!res.success) {
|
||||
return NextResponse.json({ message: res.error }, { status: res.status });
|
||||
|
||||
@@ -1,52 +0,0 @@
|
||||
// @wikiCategory: Stream
|
||||
|
||||
import { NextResponse } from "next/server";
|
||||
import { getSong } from "@/lib/db/managing";
|
||||
|
||||
let currentSong = {
|
||||
songID: "",
|
||||
songbook: "",
|
||||
number: "",
|
||||
title: ""
|
||||
};
|
||||
|
||||
// @wikiDescription: Akutell gestreamtes Lied abrufen
|
||||
export async function GET() {
|
||||
return NextResponse.json(currentSong)
|
||||
}
|
||||
|
||||
// @wikiDescription: Lied zum Streamen festlegen
|
||||
export async function POST(request: Request) {
|
||||
try {
|
||||
const data = await request.json();
|
||||
const songID = data.songID;
|
||||
const songbookID = data.songbookID;
|
||||
|
||||
if (!songID || !songbookID) {
|
||||
return NextResponse.json({ success: false, error: "Fields incomplete!" }, { status: 400 });
|
||||
}
|
||||
|
||||
const song = await getSong(Number(songbookID), String(songID));
|
||||
|
||||
if (song) {
|
||||
currentSong = {
|
||||
songID: String(songID),
|
||||
songbook: song.songbook_name,
|
||||
number: song.number,
|
||||
title: song.song_title,
|
||||
};
|
||||
} else {
|
||||
currentSong = {
|
||||
songID: "",
|
||||
songbook: "",
|
||||
number: "",
|
||||
title: "",
|
||||
};
|
||||
}
|
||||
console.log(currentSong);
|
||||
|
||||
return NextResponse.json({ success: true });
|
||||
} catch (error) {
|
||||
return NextResponse.json({ success: false, error: "Server-Fehler" }, { status: 500 });
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,67 @@
|
||||
// @wikiCategory: Stream
|
||||
|
||||
import { NextResponse } from "next/server";
|
||||
|
||||
|
||||
let currentSong = {
|
||||
number: "",
|
||||
song: "",
|
||||
songbook: "",
|
||||
};
|
||||
const clients = new Set<ReadableStreamDefaultController>();
|
||||
|
||||
|
||||
// @wikiDescription: Akutell gestreamtes Lied abrufen
|
||||
export async function GET() {
|
||||
let controllerRef: ReadableStreamDefaultController;
|
||||
|
||||
const stream = new ReadableStream({
|
||||
start(controller) {
|
||||
controllerRef = controller;
|
||||
clients.add(controller);
|
||||
|
||||
if (currentSong.song) {
|
||||
controller.enqueue(`data: ${JSON.stringify(currentSong)}\n\n`);
|
||||
}
|
||||
|
||||
},
|
||||
cancel() {
|
||||
clients.delete(controllerRef);
|
||||
},
|
||||
});
|
||||
return new NextResponse(stream, {
|
||||
headers: {
|
||||
'Content-Type': 'text/event-stream',
|
||||
'Cache-Control': 'no-cache',
|
||||
'Connection': 'keep-alive',
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
// @wikiDescription: Lied zum Streamen festlegen
|
||||
export async function POST(request: Request) {
|
||||
try {
|
||||
const data = await request.json();
|
||||
const song = data.song?.trim() ?? null;
|
||||
const songbook = data.songBook?.trim() ?? null;
|
||||
const number = data.number?.trim() ?? null;
|
||||
|
||||
if (song == null || songbook == null || number == null) {
|
||||
return NextResponse.json({ success: false, error: "Fields incomplete!" }, { status: 400 });
|
||||
}
|
||||
|
||||
currentSong = {
|
||||
song,
|
||||
songbook,
|
||||
number
|
||||
};
|
||||
|
||||
clients.forEach((controller) => {
|
||||
controller.enqueue(`data: ${JSON.stringify(currentSong)}\n\n`);
|
||||
});
|
||||
|
||||
return NextResponse.json({ success: true , currentSong }, { status: 200 });
|
||||
} catch (error) {
|
||||
return NextResponse.json({ success: false, error: "Server-Fehler" }, { status: 500 });
|
||||
}
|
||||
}
|
||||
+3
-2
@@ -26,10 +26,11 @@ export default function RootLayout({
|
||||
}>) {
|
||||
return (
|
||||
<html lang="de">
|
||||
<body className="min-h-screen flex flex-col">
|
||||
<body className="min-h-screen min-w-80 flex flex-col">
|
||||
|
||||
<Header />
|
||||
|
||||
<main className="mt-20 mx-auto min-w-200 max-w-full">{children}</main>
|
||||
<main className="mt-28 sm:mt-20 mx-auto w-full max-w-6xl px-4 sm:px-6 lg:px-8">{children}</main>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
|
||||
+6
-76
@@ -1,97 +1,27 @@
|
||||
"use client";
|
||||
|
||||
import { useState, useEffect } from "react";
|
||||
|
||||
import { Input } from "@/components/FormElements";
|
||||
import { Screens } from "@/components/DatabaseOverview";
|
||||
|
||||
interface Songbook {
|
||||
id: number;
|
||||
name: string;
|
||||
language: string;
|
||||
}
|
||||
|
||||
interface Song {
|
||||
song_id: number;
|
||||
songbook_id: number;
|
||||
song_number: string;
|
||||
title: string;
|
||||
}
|
||||
import { Screens } from "@/components/AllSongsTable";
|
||||
|
||||
export default function SenderPage() {
|
||||
const [songbooks, setSongbooks] = useState<Songbook[]>([]);
|
||||
const [song_search_name, setSongSearchName] = useState("");
|
||||
const [allSongs, setAllSongs] = useState<Song[]>([]);
|
||||
const [searchResults, setSearchResults] = useState<Song[]>([]);
|
||||
|
||||
const getSongslist = async () => {
|
||||
const sendSong = async (title: string, bookTitle: string, number: string) => {
|
||||
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!");
|
||||
}
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
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();
|
||||
}, []);
|
||||
|
||||
const sendID = async (sID: string, sbID: string) => {
|
||||
if (!sID || !sbID) {
|
||||
alert("Bitte Liederbuch UND SongID auswählen/eingeben!");
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
const res = await fetch("/api/stream/currentID", {
|
||||
const res = await fetch("/api/stream", {
|
||||
method: "POST",
|
||||
headers: { "Content-Type": "application/json" },
|
||||
body: JSON.stringify({ songbookID: sbID, songID: sID }),
|
||||
body: JSON.stringify({ song: title, songBook: bookTitle, number }),
|
||||
});
|
||||
if (!res.ok) {
|
||||
alert("Fehler beim Senden.");
|
||||
}
|
||||
} catch (error) {
|
||||
console.error("Failed sending current songID:", error);
|
||||
}
|
||||
};
|
||||
|
||||
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);
|
||||
console.error("Failed sending current song:", error);
|
||||
}
|
||||
};
|
||||
|
||||
return (
|
||||
<Screens.Songs
|
||||
actionName="Anzeigen"
|
||||
onSelectSong={(song) => sendID(String(song.song_id), String(song.songbook_id))}
|
||||
onSelectSong={(song, book, number) => sendSong(song.title, book.title, number)}
|
||||
/>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,117 @@
|
||||
import { useState, useEffect, useMemo, ComponentPropsWithoutRef } from "react";
|
||||
|
||||
import Card from "./Card"
|
||||
import { Input } from "./FormElements"
|
||||
import { Song, SongBookDetailed } from "@/lib/db/response";
|
||||
|
||||
interface SongsProps extends Omit<ComponentPropsWithoutRef<typeof Card>, "title" | "children"> {
|
||||
onSelectSong?: (song: Song, book: { id: number; title: string }, songNumber: string) => void;
|
||||
actionName?: string;
|
||||
songBooks?: SongBookDetailed[];
|
||||
}
|
||||
|
||||
function Songs({ actionName, onSelectSong, songBooks, className = "", ...props }: SongsProps) {
|
||||
const [query, setQuery] = useState("");
|
||||
const [fetchedBooks, setFetchedBooks] = useState<SongBookDetailed[]>([]);
|
||||
|
||||
useEffect(() => {
|
||||
if (songBooks) return;
|
||||
async function load() {
|
||||
try {
|
||||
const res = await fetch("/api/songbooks");
|
||||
if (!res.ok) return;
|
||||
const list: { id: number }[] = await res.json();
|
||||
|
||||
const details = await Promise.all(
|
||||
list.map(async (b) => {
|
||||
const r = await fetch(`/api/songbooks/${b.id}`);
|
||||
return r.ok ? await r.json() : null;
|
||||
})
|
||||
);
|
||||
setFetchedBooks(details.filter(Boolean));
|
||||
} catch (error) {
|
||||
console.error("Loading songbooks failed: ", error);
|
||||
}
|
||||
}
|
||||
load();
|
||||
}, [songBooks]);
|
||||
|
||||
const books = songBooks ?? fetchedBooks;
|
||||
|
||||
// Pro Buch filtern; Bücher ohne Treffer werden ausgeblendet
|
||||
const groups = useMemo(() => {
|
||||
const q = query.trim().toLowerCase();
|
||||
return books
|
||||
.map((book) => {
|
||||
const bookMatches = q !== "" && book.title.toLowerCase().includes(q);
|
||||
const songs = (book.songs ?? []).filter(
|
||||
(e) =>
|
||||
!q ||
|
||||
bookMatches ||
|
||||
e.song.title.toLowerCase().includes(q) ||
|
||||
String(e.songNumber).toLowerCase().includes(q)
|
||||
);
|
||||
return { book, songs };
|
||||
})
|
||||
.filter((g) => g.songs.length > 0);
|
||||
}, [books, query]);
|
||||
|
||||
return (
|
||||
<Card {...props} title="Alle Lieder" className={className}>
|
||||
<div className="mb-3">
|
||||
<Input.Text
|
||||
type="text"
|
||||
placeholder="Titel, Nummer oder Liederbuch suchen..."
|
||||
value={query}
|
||||
onChange={(e) => setQuery(e.target.value)}
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div className="max-h-[65vh] overflow-y-auto border border-neutral-200 dark:border-neutral-800 rounded-lg bg-white dark:bg-black">
|
||||
{groups.length === 0 ? (
|
||||
<p className="p-8 text-center text-neutral-400 dark:text-neutral-500">
|
||||
Keine Lieder gefunden
|
||||
</p>
|
||||
) : (
|
||||
groups.map(({ book, songs }) => (
|
||||
<section key={book.id}>
|
||||
<h3 className="sticky top-0 z-10 px-3 py-2 text-sm font-bold bg-neutral-100 dark:bg-neutral-900 text-neutral-900 dark:text-white border-y border-neutral-200 dark:border-neutral-800">
|
||||
{book.title}
|
||||
{book.language && (
|
||||
<span className="ml-2 text-xs font-normal text-neutral-500">
|
||||
({book.language})
|
||||
</span>
|
||||
)}
|
||||
</h3>
|
||||
<ul className="divide-y divide-neutral-200 dark:divide-neutral-800">
|
||||
{songs.map((entry) => (
|
||||
<li
|
||||
key={`${book.id}-${entry.song.id}`}
|
||||
className="flex flex-wrap items-center gap-x-3 gap-y-2 px-3 py-2.5"
|
||||
>
|
||||
<span className="w-12 shrink-0 text-center font-mono font-bold text-blue-600 dark:text-blue-400">
|
||||
{entry.songNumber}
|
||||
</span>
|
||||
<span className="flex-1 min-w-40 break-words font-medium text-neutral-900 dark:text-white">
|
||||
{entry.song.title}
|
||||
</span>
|
||||
<Input.Button
|
||||
onClick={() => onSelectSong?.(entry.song, { id: book.id, title: book.title }, String(entry.songNumber))}
|
||||
className="shrink-0 w-auto px-3 py-2 text-xs"
|
||||
>
|
||||
{actionName}
|
||||
</Input.Button>
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
</section>
|
||||
))
|
||||
)}
|
||||
</div>
|
||||
</Card>
|
||||
)
|
||||
}
|
||||
|
||||
export const Screens = {
|
||||
Songs: Songs,
|
||||
}
|
||||
+1
-1
@@ -17,7 +17,7 @@ export default function Card({ title, hasLeftBorder = false, children, className
|
||||
</h2>
|
||||
|
||||
{/* border-l-2 fügt den Strich links ein, pl-4 macht Platz zum Inhalt */}
|
||||
<div className={`flex-1 min-h-0 flex flex-col border-neutral-200 dark:border-neutral-800 ${hasLeftBorder ? "border-l-2 pl-4}" : ""}`}>
|
||||
<div className={`flex-1 min-h-0 flex flex-col border-neutral-200 dark:border-neutral-800 ${hasLeftBorder ? "border-l-2 pl-4" : ""}`}>
|
||||
{children}
|
||||
</div>
|
||||
</section>
|
||||
|
||||
@@ -1,143 +0,0 @@
|
||||
import { useState, useEffect, ComponentPropsWithoutRef } from "react";
|
||||
|
||||
import Card from "./Card"
|
||||
import { Input } from "./FormElements"
|
||||
|
||||
interface SongsProps extends Omit<ComponentPropsWithoutRef<typeof Card>, "title" | "children"> {
|
||||
onSelectSong?: (song: Song) => void;
|
||||
actionName?: string;
|
||||
}
|
||||
|
||||
interface Song {
|
||||
song_id: number;
|
||||
songbook_id: number;
|
||||
song_number: string;
|
||||
title: string;
|
||||
}
|
||||
|
||||
interface Songbook {
|
||||
id: number;
|
||||
name: string;
|
||||
language: string;
|
||||
}
|
||||
|
||||
function Songs({ actionName, onSelectSong, className = "", ...props }: SongsProps) {
|
||||
const [song_search_name, setSongSearchName] = useState("");
|
||||
const [searchResults, setSearchResults] = useState<Song[]>([]);
|
||||
const [allSongs, setAllSongs] = useState<Song[]>([]);
|
||||
const [songbooks, setSongbooks] = useState<Songbook[]>([]);
|
||||
|
||||
|
||||
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 (
|
||||
<Card
|
||||
{...props}
|
||||
title="Alle Lieder"
|
||||
className={`h-[500px] ${className}`}
|
||||
>
|
||||
<div className="mb-4">
|
||||
<Input.Text
|
||||
type="text"
|
||||
placeholder="Nach Songtitel oder Nummer suchen..."
|
||||
value={song_search_name}
|
||||
onChange={(e) => search(e.target.value)}
|
||||
/>
|
||||
</div>
|
||||
{/* 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">
|
||||
<table className="w-full text-left border-collapse text-sm">
|
||||
<thead className="bg-neutral-100 dark:bg-neutral-900 sticky top-0 border-b border-neutral-200 dark:border-neutral-800 z-10">
|
||||
<tr>
|
||||
<th className="p-3 text-xs font-semibold text-neutral-600 dark:text-neutral-400 uppercase tracking-wider">Titel</th>
|
||||
<th className="p-3 text-xs font-semibold text-neutral-600 dark:text-neutral-400 uppercase tracking-wider">Liederbuch</th>
|
||||
<th className="p-3 text-xs font-semibold text-neutral-600 dark:text-neutral-400 uppercase tracking-wider text-center">Nummer</th>
|
||||
<th className="p-3 text-xs font-semibold text-neutral-600 dark:text-neutral-400 uppercase tracking-wider text-right">Aktion</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody className="divide-y divide-neutral-200 dark:divide-neutral-800">
|
||||
{searchResults.length === 0 ? (
|
||||
<tr>
|
||||
<td colSpan={4} className="p-8 text-center text-neutral-400 dark:text-neutral-500">Keine Lieder gefunden</td>
|
||||
</tr>
|
||||
) : (
|
||||
searchResults.map((song) => {
|
||||
const songBook = songbooks.find((book) => book.id === song.songbook_id);
|
||||
return (
|
||||
<tr key={`${song.songbook_id}-${song.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">
|
||||
{song.title}
|
||||
<span className="block text-xs text-neutral-500 dark:text-neutral-400 sm:hidden mt-0.5">
|
||||
{songBook ? songBook.name : "Unbekannt"}
|
||||
</span>
|
||||
</td>
|
||||
<td className="p-3 text-neutral-700 dark:text-neutral-300 hidden sm:table-cell">
|
||||
{songBook ? songBook.name : "Unbekannt"}
|
||||
</td>
|
||||
<td className="p-3 text-center font-mono text-blue-600 dark:text-blue-400 font-bold">
|
||||
{song.song_number}
|
||||
</td>
|
||||
<td className="p-3 text-right">
|
||||
<Input.Button
|
||||
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"
|
||||
>
|
||||
{actionName}
|
||||
</Input.Button>
|
||||
</td>
|
||||
</tr>
|
||||
);
|
||||
})
|
||||
)}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</Card>
|
||||
)
|
||||
}
|
||||
|
||||
export const Screens = {
|
||||
Songs: Songs,
|
||||
}
|
||||
@@ -36,10 +36,10 @@ function File({ ...props }: ComponentPropsWithoutRef<"input">) {
|
||||
);
|
||||
}
|
||||
|
||||
function Button({ children, ...props }: ComponentPropsWithoutRef<"button">) {
|
||||
function Button({ children, className = "", ...props }: ComponentPropsWithoutRef<"button">) {
|
||||
return (
|
||||
<button
|
||||
className="w-full bg-blue-600 hover:bg-blue-700 text-white font-semibold rounded-lg px-4 py-2.5 transition text-sm shadow-sm"
|
||||
className={`bg-blue-600 hover:bg-blue-700 text-white font-semibold rounded-lg px-4 py-2.5 transition text-sm shadow-sm ${className || "w-full"}`}
|
||||
{...props}
|
||||
>
|
||||
{children}
|
||||
|
||||
@@ -2,9 +2,9 @@ import NavItem from "./NavItem";
|
||||
|
||||
export default function Header() {
|
||||
return (
|
||||
<header className="fixed top-0 left-0 w-full z-50 p-4 flex justify-between items-center backdrop-blur-md border-b-2 border-slate-500">
|
||||
<header className="fixed top-0 left-0 w-full min-w-80 z-50 p-3 sm:p-4 flex flex-wrap gap-2 justify-between items-center backdrop-blur-md border-b-2 border-slate-500">
|
||||
<div className="font-bold text-xl">PsalmTafel</div>
|
||||
<nav className="flex gap-4 border-2 rounded-full">
|
||||
<nav className="flex flex-wrap gap-1 sm:gap-4 border-2 rounded-full text-sm">
|
||||
<NavItem path="/dashboard">Dashboard</NavItem>
|
||||
<NavItem path="/sender">Sender</NavItem>
|
||||
<NavItem path="/receiver">Empfänger</NavItem>
|
||||
|
||||
@@ -0,0 +1,52 @@
|
||||
export interface Song {
|
||||
id: number;
|
||||
title: string;
|
||||
}
|
||||
|
||||
export interface SongBook {
|
||||
id: number;
|
||||
title: string;
|
||||
language?: string;
|
||||
}
|
||||
|
||||
export interface SongDetailed {
|
||||
song: {
|
||||
id: number;
|
||||
title: string;
|
||||
songBooks?:{songNumber: number; book:SongBook}[]
|
||||
|
||||
};
|
||||
}
|
||||
|
||||
export interface SongBookDetailed {
|
||||
id: number;
|
||||
title: string;
|
||||
language: string;
|
||||
songs?: {
|
||||
songNumber: string;
|
||||
song: Song;
|
||||
}[]
|
||||
}
|
||||
|
||||
export type APIResponse<T> =
|
||||
| { success: true; status: number; data: T }
|
||||
| { success: false; status: number; error: string };
|
||||
|
||||
export type GetSongsResponse = APIResponse<Song[]>;
|
||||
export type GetSongDetailedResponse =
|
||||
| {
|
||||
success: true;
|
||||
status: number;
|
||||
song: SongDetailed
|
||||
}
|
||||
| { success: false; status: number; error: string };
|
||||
|
||||
export type GetSongsDelailedResponse =
|
||||
| {
|
||||
success: true;
|
||||
status: number;
|
||||
songs: SongDetailed[]
|
||||
}
|
||||
| { success: false; status: number; error: string };
|
||||
|
||||
export type CreateSongsResponse = APIResponse<Song>;
|
||||
+15
-8
@@ -1,7 +1,14 @@
|
||||
import { prisma } from "@/lib/db/prisma";
|
||||
import { parseInt } from "@/lib/helper/checkvar";
|
||||
import type * as API from "./response";
|
||||
// For Error checking use this import: import { Prisma } from "@prisma/client";
|
||||
|
||||
interface Response {
|
||||
success: boolean;
|
||||
status: number;
|
||||
songs?: [];
|
||||
error?: string;
|
||||
}
|
||||
|
||||
/**
|
||||
* GetSongs
|
||||
@@ -9,7 +16,7 @@ import { parseInt } from "@/lib/helper/checkvar";
|
||||
*
|
||||
* @returns {"success": boolean, "status": number, "songs": [{"id":number, "title": string},...]}
|
||||
*/
|
||||
export async function getSongs() {
|
||||
export async function getSongs(): Promise<API.GetSongsResponse> {
|
||||
try{
|
||||
const songs = await prisma.song.findMany({
|
||||
select: {
|
||||
@@ -35,7 +42,7 @@ export async function getSongs() {
|
||||
* @param id - ID indicatin the song
|
||||
* @returns {"success": boolean, "status": number, "song": {"id":number, "title": string, "songBooks": [{"songNumber": number, "book": {"title": string, "language": string}},...]}}
|
||||
*/
|
||||
export async function getSongById(rawId: number) {
|
||||
export async function getSongById(rawId: number): Promise<API.GetSongDetailedResponse> {
|
||||
try{
|
||||
const id = parseInt(rawId);
|
||||
if (!id) {
|
||||
@@ -78,13 +85,13 @@ export async function getSongById(rawId: number) {
|
||||
*
|
||||
* @param query - The search term for the song title.
|
||||
* @param limit - Max number of songs returned for performance (default: 20).
|
||||
* @returns @returns {"success": boolean, "status": number, "song": {"id":number, "title": string, "songBooks": [{"songNumber": number, "book": {"title": string, "language": string}},...]}}
|
||||
* @returns {"success": boolean, "status": number, "song": {"id":number, "title": string, "songBooks": [{"songNumber": number, "book": {"title": string, "language": string}},...]}}
|
||||
*/
|
||||
export async function searchSongsByTitle(query: string, limit: number = 20) {
|
||||
export async function searchSongsByTitle(query: string, limit: number = 20): Promise<API.GetSongsDelailedResponse> {
|
||||
try {
|
||||
const cleanQuery = query.trim();
|
||||
if (!cleanQuery) {
|
||||
return { success: true, songBooks: [] };
|
||||
return { success: true, status: 200, songs: [] };
|
||||
}
|
||||
|
||||
const songs = await prisma.song.findMany({
|
||||
@@ -124,7 +131,7 @@ export async function searchSongsByTitle(query: string, limit: number = 20) {
|
||||
* @param data - object with title
|
||||
* @returns {"success": boolean, "status": number, "song": {"id":number, "title": string}}
|
||||
*/
|
||||
export async function createSong(data: { title: string }) {
|
||||
export async function createSong(data: { title: string }): Promise<API.CreateSongsResponse> {
|
||||
try{
|
||||
if(!data.title){
|
||||
return { success: false, status: 400, error: "Field 'title' is required" };
|
||||
@@ -164,7 +171,7 @@ export async function createSong(data: { title: string }) {
|
||||
export async function updateSong(
|
||||
rawId: number,
|
||||
data: { title?: string }
|
||||
) {
|
||||
): Promise<API.CreateSongsResponse> {
|
||||
try {
|
||||
const id = parseInt(rawId);
|
||||
if (!id) {
|
||||
@@ -213,7 +220,7 @@ export async function updateSong(
|
||||
* @param id - ID indicatin the song
|
||||
* @returns {"success": boolean, "status": number, "song": {"id": number, "title": string}}
|
||||
*/
|
||||
export async function deleteSong(rawId: number) {
|
||||
export async function deleteSong(rawId: number): Promise<API.CreateSongsResponse> {
|
||||
try {
|
||||
const id = parseInt(rawId);
|
||||
if (!id) {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
|
||||
|
||||
export function parseInt(rawInteger){
|
||||
export function parseInt(rawInteger: number){
|
||||
const integer = Number.parseInt(rawInteger);
|
||||
|
||||
if (Number.isNaN(integer) || !Number.isInteger(integer)) {
|
||||
|
||||
Reference in new issue
Block a user