diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index 7a2bf19..9f5aa10 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -75,10 +75,18 @@ jobs: - name: Create release in Gitea run: | - apk add --no-cache jq + apk add --no-cache jq curl VERSION=$(jq -r '.version' package.json) echo "Current version: v$VERSION" + if [[ "$VERSION" == 0.* ]]; then + IS_PRERELEASE=true + echo "Version startet mit 0. -> Markiere als Prerelease." + else + IS_PRERELEASE=false + echo "Version startet nicht mit 0. -> Normales Release." + fi + HTTP_STATUS=$(curl -s -o /dev/null -w "%{http_code}" \ -H "Authorization: token ${{ secrets.GITEA_TOKEN }}" \ "http://172.17.0.1:3000/api/v1/repos/${{ github.repository }}/releases/tags/v$VERSION") @@ -94,7 +102,7 @@ jobs: \"name\": \"Release v$VERSION\", \"body\": \"Automated release for version v$VERSION\", \"draft\": false, - \"prerelease\": false + \"prerelease\": $IS_PRERELEASE }" \ "http://172.17.0.1:3000/api/v1/repos/${{ github.repository }}/releases" else diff --git a/app/admin/page.tsx b/app/admin/page.tsx index 72af9c2..e9eb936 100644 --- a/app/admin/page.tsx +++ b/app/admin/page.tsx @@ -1,11 +1,10 @@ "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"; interface Songbook { id: number; @@ -13,20 +12,6 @@ interface Songbook { language: string; } -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(""); @@ -39,9 +24,6 @@ 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..."); const result = await uploadCSVAction(formData); @@ -53,27 +35,6 @@ 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 { @@ -117,57 +78,6 @@ 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("Lied erfolgreich zum Liederbuch hinzugefügt!"); - } else { - alert("Fehler beim Senden."); - } - } catch (error) { - console.error("Failed sending current songID:", error); - } - } - - 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!"); @@ -211,7 +121,7 @@ export default function AdminPage() {
- Name des Buchs +
- Sprache (Optional) +
- Liederbuch wählen + setSelectedSongbookId(e.target.value)} @@ -255,7 +165,7 @@ export default function AdminPage() {
- Nummer +
- Titel + -
+
- Ziel-Liederbuch + setSelectedSongbookId(e.target.value)} @@ -296,7 +206,7 @@ export default function AdminPage() {
- Datei auswählen (.csv) +
-
- setSelectedSong(song)} - className="" - /> - - - -
-

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

-

In Liederbüchern:

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

Keine Daten geladen

- )} -
-
- - -
-
- Ziel-Liederbuch - setSelectedSongbookId(e.target.value)} - > - - {songbooks.map((book) => ( - - ))} - -
-
- Nummer - setNumber(e.target.value)} - /> -
- - Lied hinzufügen - -
-
- -
-
- Ziel-Liederbuch - setSelectedSongbookId(e.target.value)} - > - - {songInfos.length > 0 ? ( - songInfos.map((info) => ( - - )) - ): ""} - -
- - Lied aus Liederbuch löschen - -
-
-
-
-
); diff --git a/app/api/songs/[id]/route.ts b/app/api/songs/[id]/route.ts deleted file mode 100644 index 7b43176..0000000 --- a/app/api/songs/[id]/route.ts +++ /dev/null @@ -1,20 +0,0 @@ -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 diff --git a/app/api/songs/attach/route.ts b/app/api/songs/attach/route.ts deleted file mode 100644 index cceaddb..0000000 --- a/app/api/songs/attach/route.ts +++ /dev/null @@ -1,40 +0,0 @@ -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 (isNaN(songId) || isNaN(songbookId) || !number) { - return NextResponse.json( - { error: "Ungültige IDs oder fehlende Nummer." }, - { 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 diff --git a/app/api/songs/remove/route.ts b/app/api/songs/remove/route.ts deleted file mode 100644 index 42745b6..0000000 --- a/app/api/songs/remove/route.ts +++ /dev/null @@ -1,39 +0,0 @@ -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 diff --git a/app/dashboard/page.tsx b/app/dashboard/page.tsx deleted file mode 100644 index 71c7436..0000000 --- a/app/dashboard/page.tsx +++ /dev/null @@ -1,23 +0,0 @@ -import Image from "next/image"; - -export default function DashboardPage() { - return ( - <> - {/* Das Hintergrundbild brecht aus allen Containern aus und füllt das Fenster */} -
- {/* Hintergrund */} -
- - {/* Dein Inhalt auf dieser Seite */} -
-

Dashboard is comming soon...

-
- - ); -} \ No newline at end of file diff --git a/app/layout.tsx b/app/layout.tsx index c540393..eeeac3b 100644 --- a/app/layout.tsx +++ b/app/layout.tsx @@ -15,8 +15,8 @@ const geistMono = Geist_Mono({ }); export const metadata: Metadata = { - title: "PsalmTafel", - description: "Liedernummer-Anzeige für den Chor ", + title: "Create Next App", + description: "Generated by create next app", }; export default function RootLayout({ diff --git a/app/page.tsx b/app/page.tsx index e1e2b7e..71c7436 100644 --- a/app/page.tsx +++ b/app/page.tsx @@ -1,5 +1,23 @@ -import { redirect } from "next/navigation"; +import Image from "next/image"; -export default function Page() { - redirect("/dashboard") +export default function DashboardPage() { + return ( + <> + {/* Das Hintergrundbild brecht aus allen Containern aus und füllt das Fenster */} +
+ {/* Hintergrund */} +
+ + {/* Dein Inhalt auf dieser Seite */} +
+

Dashboard is comming soon...

+
+ + ); } \ No newline at end of file diff --git a/app/sender/page.tsx b/app/sender/page.tsx index 71e4465..a5a3486 100644 --- a/app/sender/page.tsx +++ b/app/sender/page.tsx @@ -3,7 +3,6 @@ import { useState, useEffect } from "react"; import { Input } from "@/components/FormElements"; -import { Screens } from "@/components/DatabaseOverview"; interface Songbook { id: number; @@ -89,9 +88,71 @@ export default function SenderPage() { }; return ( - sendID(String(song.song_id), String(song.songbook_id))} - /> +
+ {/* 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 + +
+
+
+
); } \ No newline at end of file diff --git a/components/Card.tsx b/components/Card.tsx index 495b328..0a8450d 100644 --- a/components/Card.tsx +++ b/components/Card.tsx @@ -1,25 +1,14 @@ -import { ReactNode, ComponentPropsWithoutRef } from "react"; +import { ReactNode } from "react"; -interface CardProps extends ComponentPropsWithoutRef<"section"> { - title: string; - children: ReactNode; - hasLeftBorder?: boolean; -} - -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} -
-
- ); +export default function Card({title, children}: {title: string, children: ReactNode}) { + return ( +
+

+ {title} +

+
+ {children} +
+
+ ); } \ No newline at end of file diff --git a/components/DatabaseOverview.tsx b/components/DatabaseOverview.tsx deleted file mode 100644 index 1e327f7..0000000 --- a/components/DatabaseOverview.tsx +++ /dev/null @@ -1,143 +0,0 @@ -import { useState, useEffect, ComponentPropsWithoutRef } from "react"; - -import Card from "./Card" -import { Input } from "./FormElements" - -interface SongsProps extends Omit, "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([]); - 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" - > - {actionName} - -
-
-
- ) -} - -export const Screens = { - Songs: Songs, -} \ No newline at end of file diff --git a/components/FormElements.tsx b/components/FormElements.tsx index fd78cad..d2f722c 100644 --- a/components/FormElements.tsx +++ b/components/FormElements.tsx @@ -3,14 +3,13 @@ import { ComponentPropsWithoutRef } from "react"; interface TextfieldProps extends ComponentPropsWithoutRef<"input"> {} -function Textfield({value, onChange, placeholder, ...props}: TextfieldProps) { +function Textfield({value, onChange, placeholder}: TextfieldProps) { return ( ) } @@ -47,18 +46,9 @@ function Button({ children, ...props }: ComponentPropsWithoutRef<"button">) { ) } -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 diff --git a/components/Header.tsx b/components/Header.tsx index d0711fc..3aa6a89 100644 --- a/components/Header.tsx +++ b/components/Header.tsx @@ -2,10 +2,10 @@ import NavItem from "./NavItem"; export default function Header() { return ( -
+
PsalmTafel