Compare commits

..
75 Commits
Author SHA1 Message Date
robin 96370fa97a Merge pull request 'Feat dashboard' (#13) from feat-dashboard into main
Deploy Next.js via Docker / deploy (push) Successful in 36s
Reviewed-on: Schanbro/PsalmTafel#13
2026-07-29 11:15:47 +00:00
robin 08b667113b update version number 2026-07-29 13:15:18 +02:00
robin abb451fa47 refactor: update metadata 2026-07-29 12:56:31 +02:00
robin b259f0fbcf Merge pull request 'Main' (#21) from main into feat-dashboard
Reviewed-on: Schanbro/PsalmTafel#21
2026-07-29 10:48:34 +00:00
robin f4c4898c06 Merge pull request 'Feat/admin options' (#14) from feat/admin-options into main
Deploy Next.js via Docker / deploy (push) Successful in 37s
Reviewed-on: Schanbro/PsalmTafel#14
2026-07-28 15:05:03 +00:00
robin cf78d7cea2 feat: add ability to remove song from songbook 2026-07-28 17:03:28 +02:00
robin dc75753f41 feat: add api for removeSongFromSongbook 2026-07-28 16:29:44 +02:00
robin 57ea3907b6 feat: add removeSongFromSongbook to db managing.ts 2026-07-28 16:27:25 +02:00
robin 297b4a9664 Merge branch 'feat/admin-options' of https://git.schamagusa.de/Schanbro/PsalmTafel into feat/admin-options 2026-07-28 16:18:22 +02:00
robin f312217b7c fix: fix typo in admin page 2026-07-28 16:17:20 +02:00
robin fc37aa6e1e Merge branch 'main' into feat/admin-options 2026-07-28 14:16:40 +00:00
robin d8f2235de7 Merge pull request 'Ui-corrections' (#19) from ui-corrections into main
Deploy Next.js via Docker / deploy (push) Successful in 39s
Reviewed-on: Schanbro/PsalmTafel#19
2026-07-28 14:00:39 +00:00
robin e3115df0bd feat: add abilty to attach song to songbook 2026-07-28 15:53:51 +02:00
robin 001a0d6ef8 feat: add API for attachSongToSongbook 2026-07-28 15:40:33 +02:00
robin 8910a1ff05 feat: add attachSongToSongbook to db managing.ts 2026-07-28 15:32:48 +02:00
robin d871bddc99 feat: add api for getSongInfos
feat: show song informations of selected song
2026-07-28 15:00:48 +02:00
robin d6fb6ec16d feat: add getSongInfos to db managing.ts 2026-07-28 14:48:28 +02:00
robin 011f1b6e0b style: rearranged content 2026-07-27 18:50:12 +02:00
robin 5799eee961 style: - 2026-07-27 18:46:36 +02:00
robin f68d9cd9e5 feat: show raw informations about selected song 2026-07-27 18:39:26 +02:00
robin 9b73ce99e7 style: fix margin issue 2026-07-27 18:32:29 +02:00
robin ec9bfce3a7 style: add slate border to the header 2026-07-27 18:26:47 +02:00
robin 089a7fd76b fix: filled children (unimportant) 2026-07-27 17:51:01 +02:00
robin cb1f70e90d Merge pull request 'Main' (#18) from main into feat/admin-options
Reviewed-on: Schanbro/PsalmTafel#18
2026-07-27 15:01:48 +00:00
robin d769273f43 Merge pull request 'Ui corrections' (#17) from ui-corrections into main
Deploy Next.js via Docker / deploy (push) Successful in 32s
Reviewed-on: Schanbro/PsalmTafel#17
2026-07-27 15:01:06 +00:00
robin 4f1686bdfe Merge branch 'main' into ui-corrections 2026-07-27 15:00:57 +00:00
robin 7548429936 remove preview elements 2026-07-27 17:00:11 +02:00
robin cbe0bd6e1d style: redesigned card component 2026-07-27 16:58:41 +02:00
robin 43054e98ad style: add option for left border (unstyled) 2026-07-27 16:50:49 +02:00
robin 3064112595 style: changed arrangement of elements in admin 2026-07-27 16:39:00 +02:00
robin 154b5ee0a1 feat: add ability to select a song 2026-07-27 16:35:28 +02:00
robin 65edd735f1 Merge pull request 'Main' (#16) from main into feat/admin-options
Reviewed-on: Schanbro/PsalmTafel#16
2026-07-27 14:28:04 +00:00
robin 854597ad2f Merge pull request 'Ui corrections' (#15) from ui-corrections into main
Deploy Next.js via Docker / deploy (push) Successful in 2m16s
Reviewed-on: Schanbro/PsalmTafel#15
2026-07-27 14:24:26 +00:00
robin b4084fdb1b style: add Label to FormElements 2026-07-27 16:23:30 +02:00
robin 09c5df8aae Feat: "...props" added to Input.Text 2026-07-27 16:16:16 +02:00
robin 1892314610 feat: add individual actionName 2026-07-27 16:06:43 +02:00
robin ca02fe9e30 style: allow props to the songs screen 2026-07-27 15:10:59 +02:00
robin 0712740eb2 feat: add Songs screen to admin page 2026-07-27 14:59:47 +02:00
robin e51ff6e738 refactor: create and use Songs-Screen in sender 2026-07-27 14:43:44 +02:00
robin 1a0f2614f2 feat: add DatabaseOverview.tsx (component songs) 2026-07-27 14:33:26 +02:00
robin 6773b903d6 Feat: add one card for all songs 2026-07-27 14:10:10 +02:00
robin 8b6d5c09a6 Merge branch 'main' into feat-dashboard 2026-07-27 11:54:27 +00:00
robin 00b3a987f3 Merge pull request 'create tag automaticly' (#11) from environment into main
Deploy Next.js via Docker / deploy (push) Successful in 42s
Reviewed-on: Schanbro/PsalmTafel#11
2026-07-26 09:18:06 +00:00
robin f73660b09f create tag automaticly 2026-07-26 09:17:33 +00:00
robin 1fa44998c4 change version number 2026-07-26 09:50:55 +02:00
robin f6920b0b8c fix: update dashboard route in the navigation 2026-07-26 09:47:14 +02:00
robin 29e0652566 refactor: add redirection from / to /dashboard 2026-07-26 09:46:35 +02:00
robin b9486274a8 refactor: move / route to /dashboard 2026-07-26 09:45:14 +02:00
robin 3f4c528ac7 Merge pull request 'LICENSE aktualisiert' (#10) from environment into main
Deploy Next.js via Docker / deploy (push) Successful in 40s
Reviewed-on: Schanbro/PsalmTafel#10
2026-07-25 18:52:23 +00:00
robin 71324e52c2 LICENSE aktualisiert 2026-07-25 18:51:30 +00:00
robin b41c488a60 Merge pull request 'Environment' (#9) from environment into main
Deploy Next.js via Docker / deploy (push) Successful in 34s
Reviewed-on: Schanbro/PsalmTafel#9
2026-07-25 18:47:57 +00:00
robin fa82153cc7 README.md aktualisiert 2026-07-25 18:45:46 +00:00
robin ddf185e683 LICENSE hinzugefügt 2026-07-25 18:44:21 +00:00
robin 08e2fd088c Merge pull request 'Environment' (#8) from environment into main
Deploy Next.js via Docker / deploy (push) Successful in 6m29s
Reviewed-on: Schanbro/PsalmTafel#8
2026-07-25 18:26:41 +00:00
robin a9b93b5624 change name to psalm-tafel
update version number
2026-07-25 20:23:26 +02:00
robin 55c7837202 change textes to english
removed unnecessary comments
2026-07-25 20:21:36 +02:00
robin 9a23742479 .gitea/workflows/deploy.yaml aktualisiert
Deploy Next.js via Docker / deploy (push) Successful in 2m1s
2026-07-25 18:04:41 +00:00
robin 20c853d7f9 chane version number
Deploy Next.js via Docker / deploy (push) Canceled after 3m27s
2026-07-25 20:01:07 +02:00
robin c32189e8aa automaticly create release
Deploy Next.js via Docker / deploy (push) Failing after 36s
2026-07-25 17:57:57 +00:00
robin 47375c6b9f Merge pull request 'Ui update' (#7) from ui-update into main
Deploy Next.js via Docker / deploy (push) Successful in 28s
Reviewed-on: Schanbro/PsalmTafel#7
2026-07-25 17:51:18 +00:00
robin f5b619ae37 style: fix style issue 2026-07-25 19:39:39 +02:00
robin ccf36197fe refactor: add Button in FormElements 2026-07-25 19:36:17 +02:00
robin 41bea34b2f refactor: add File in FormElements 2026-07-25 19:21:19 +02:00
robin a3cb0616c1 refactor: add Select (Dropdown) in FormElements 2026-07-25 18:57:41 +02:00
robin 9aa5443229 refactor: summarized components in FormElements 2026-07-25 18:50:55 +02:00
robin b97e5ea7bb feat: add Textfield component 2026-07-25 18:41:32 +02:00
robin f26060cf6b feat: add Card component
feat: create Textfield component
style: more light and dark mode support
2026-07-25 18:27:40 +02:00
robin 2ffbae76a6 style: fixed some issues 2026-07-24 17:23:46 +02:00
robin 90cc938b8c style: added border to navigation bar 2026-07-24 17:14:48 +02:00
robin 746c032586 style: more light- and darkmode support 2026-07-24 17:13:16 +02:00
robin 50542523b1 style: changed children-width
chore: updated Dashboard-text to "comming soon"-info
2026-07-24 17:04:15 +02:00
robin 3107dba079 style: light- and darkmode support for header 2026-07-24 16:50:36 +02:00
robin be9bd26c88 feat: add NavItem component
feat: add Header component with blur effect
feat: first steps into dark- and light-mode support
2026-07-24 16:37:58 +02:00
robin c2f97547e5 Test change
Deploy Next.js via Docker / deploy (push) Successful in 29s
2026-07-20 16:21:53 +00:00
robin b6841a0db7 Test change
Deploy Next.js via Docker / deploy (push) Successful in 28s
2026-07-10 18:06:42 +02:00
20 changed files with 1076 additions and 268 deletions

No files matched your search

+70 -7
View File
@@ -11,29 +11,92 @@ jobs:
container: container:
image: docker:latest image: docker:latest
steps: steps:
- name: Code auschecken - name: Checkout code
run: | run: |
apk add --no-cache curl unzip apk add --no-cache curl unzip
curl -L -H "Authorization: token ${{ secrets.GITEA_TOKEN }}" \ curl -L -H "Authorization: token ${{ secrets.GITEA_TOKEN }}" \
"http://172.17.0.1:3000/api/v1/repos/${{ github.repository }}/archive/main.zip" -o repo.zip "http://172.17.0.1:3000/api/v1/repos/${{ github.repository }}/archive/main.zip" -o repo.zip
unzip repo.zip unzip repo.zip
# Verschiebt alle Dateien aus dem Zip-Unterordner direkt hierher ins Hauptverzeichnis
mv PsalmTafel/* . 2>/dev/null || mv psalmtafel/* . 2>/dev/null || mv */* . 2>/dev/null mv PsalmTafel/* . 2>/dev/null || mv psalmtafel/* . 2>/dev/null || mv */* . 2>/dev/null
rm repo.zip rm repo.zip
- name: Docker Container aktualisieren - name: Create tag in Gitea (based on package.json version)
run: | run: |
# Kein 'cd' mehr! Wir sind schon im richtigen Ordner, wo dein Dockerfile liegt. apk add --no-cache jq curl
echo "Baue das neue Next.js Docker-Image..."
VERSION=$(jq -r '.version' package.json)
TAG="v${VERSION}"
echo "Tag: $TAG"
# Hole commit SHA von main (damit Tag korrekt gesetzt wird)
SHA=$(curl -s \
-H "Authorization: token ${{ secrets.GITEA_TOKEN }}" \
"http://172.17.0.1:3000/api/v1/repos/${{ github.repository }}/branches/main" \
| jq -r '.commit.id')
echo "main commit SHA: $SHA"
# Prüfen, ob Tag existiert
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 }}/repository/tags/${TAG}")
if [ "$HTTP_STATUS" -eq 404 ]; then
echo "Tag $TAG existiert nicht. Erstelle ihn..."
# Gitea: Tag erstellen via /git/refs
curl -X POST \
-H "Authorization: token ${{ secrets.GITEA_TOKEN }}" \
-H "Content-Type: application/json" \
-d "{
\"ref\": \"refs/tags/${TAG}\",
\"sha\": \"${SHA}\"
}" \
"http://172.17.0.1:3000/api/v1/repos/${{ github.repository }}/git/refs"
else
echo "Tag $TAG existiert bereits. Überspringe Erstellung."
fi
- name: Update Docker container
run: |
echo "Building new Next.js Docker image..."
docker build -t psalmtafel-app . docker build -t psalmtafel-app .
echo "Stoppe alten Container, falls er läuft..." echo "Stopping old container if running..."
docker stop psalmtafel-container || true docker stop psalmtafel-container || true
docker rm psalmtafel-container || true docker rm psalmtafel-container || true
echo "Starte neuen Container..." echo "Starting new container..."
docker run -d \ docker run -d \
--name psalmtafel-container \ --name psalmtafel-container \
-p 8443:3000 \ -p 8443:3000 \
--restart always \ --restart always \
psalmtafel-app psalmtafel-app
- name: Create release in Gitea
run: |
apk add --no-cache jq
VERSION=$(jq -r '.version' package.json)
echo "Current version: v$VERSION"
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")
if [ "$HTTP_STATUS" -eq 404 ]; then
echo "Creating new release v$VERSION..."
curl -X POST \
-H "Authorization: token ${{ secrets.GITEA_TOKEN }}" \
-H "Content-Type: application/json" \
-d "{
\"tag_name\": \"v$VERSION\",
\"target_commitish\": \"main\",
\"name\": \"Release v$VERSION\",
\"body\": \"Automated release for version v$VERSION\",
\"draft\": false,
\"prerelease\": false
}" \
"http://172.17.0.1:3000/api/v1/repos/${{ github.repository }}/releases"
else
echo "Release v$VERSION already exists. Skipping creation."
fi
+234
View File
@@ -0,0 +1,234 @@
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
Copyright © 2007 Free Software Foundation, Inc. <https://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
Preamble
The GNU General Public License is a free, copyleft license for software and other kinds of works.
The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free software for all its users. We, the Free Software Foundation, use the GNU General Public License for most of our software; it applies also to any other work released this way by its authors. You can apply it to your programs, too.
When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things.
To protect your rights, we need to prevent others from denying you these rights or asking you to surrender the rights. Therefore, you have certain responsibilities if you distribute copies of the software, or if you modify it: responsibilities to respect the freedom of others.
For example, if you distribute copies of such a program, whether gratis or for a fee, you must pass on to the recipients the same freedoms that you received. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.
Developers that use the GNU GPL protect your rights with two steps: (1) assert copyright on the software, and (2) offer you this License giving you legal permission to copy, distribute and/or modify it.
For the developers' and authors' protection, the GPL clearly explains that there is no warranty for this free software. For both users' and authors' sake, the GPL requires that modified versions be marked as changed, so that their problems will not be attributed erroneously to authors of previous versions.
Some devices are designed to deny users access to install or run modified versions of the software inside them, although the manufacturer can do so. This is fundamentally incompatible with the aim of protecting users' freedom to change the software. The systematic pattern of such abuse occurs in the area of products for individuals to use, which is precisely where it is most unacceptable. Therefore, we have designed this version of the GPL to prohibit the practice for those products. If such problems arise substantially in other domains, we stand ready to extend this provision to those domains in future versions of the GPL, as needed to protect the freedom of users.
Finally, every program is threatened constantly by software patents. States should not allow patents to restrict development and use of software on general-purpose computers, but in those that do, we wish to avoid the special danger that patents applied to a free program could make it effectively proprietary. To prevent this, the GPL assures that patents cannot be used to render the program non-free.
The precise terms and conditions for copying, distribution and modification follow.
TERMS AND CONDITIONS
0. Definitions.
“This License” refers to version 3 of the GNU General Public License.
“Copyright” also means copyright-like laws that apply to other kinds of works, such as semiconductor masks.
“The Program” refers to any copyrightable work licensed under this License. Each licensee is addressed as “you”. “Licensees” and “recipients” may be individuals or organizations.
To “modify” a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy. The resulting work is called a “modified version” of the earlier work or a work “based on” the earlier work.
A “covered work” means either the unmodified Program or a work based on the Program.
To “propagate” a work means to do anything with it that, without permission, would make you directly or secondarily liable for infringement under applicable copyright law, except executing it on a computer or modifying a private copy. Propagation includes copying, distribution (with or without modification), making available to the public, and in some countries other activities as well.
To “convey” a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying.
An interactive user interface displays “Appropriate Legal Notices” to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion.
1. Source Code.
The “source code” for a work means the preferred form of the work for making modifications to it. “Object code” means any non-source form of a work.
A “Standard Interface” means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language.
The “System Libraries” of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form. A “Major Component”, in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it.
The “Corresponding Source” for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities. However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those subprograms and other parts of the work.
The Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source.
The Corresponding Source for a work in source code form is that same work.
2. Basic Permissions.
All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met. This License explicitly affirms your unlimited permission to run the unmodified Program. The output from running a covered work is covered by this License only if the output, given its content, constitutes a covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law.
You may make, run and propagate covered works that you do not convey, without conditions so long as your license otherwise remains in force. You may convey covered works to others for the sole purpose of having them make modifications exclusively for you, or provide you with facilities for running those works, provided that you comply with the terms of this License in conveying all material for which you do not control copyright. Those thus making or running the covered works for you must do so exclusively on your behalf, under your direction and control, on terms that prohibit them from making any copies of your copyrighted material outside their relationship with you.
Conveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary.
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention of such measures.
When you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intention to limit operation or modification of the work as a means of enforcing, against the work's users, your or third parties' legal rights to forbid circumvention of technological measures.
4. Conveying Verbatim Copies.
You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any non-permissive terms added in accord with section 7 apply to the code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program.
You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee.
5. Conveying Modified Source Versions.
You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions:
a) The work must carry prominent notices stating that you modified it, and giving a relevant date.
b) The work must carry prominent notices stating that it is released under this License and any conditions added under section 7. This requirement modifies the requirement in section 4 to “keep intact all notices”.
c) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, regardless of how they are packaged. This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it.
d) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so.
A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an “aggregate” if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation's users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate.
6. Conveying Non-Source Forms.
You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways:
a) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange.
b) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for that product model, to give anyone who possesses the object code either (1) a copy of the Corresponding Source for all the software in the product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price no more than your reasonable cost of physically performing this conveying of source, or (2) access to copy the Corresponding Source from a network server at no charge.
c) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding Source. This alternative is allowed only occasionally and noncommercially, and only if you received the object code with such an offer, in accord with subsection 6b.
d) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no further charge. You need not require recipients to copy the Corresponding Source along with the object code. If the place to copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided you maintain clear directions next to the object code saying where to find the Corresponding Source. Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requirements.
e) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d.
A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work.
A “User Product” is either (1) a “consumer product”, which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage. For a particular product received by a particular user, “normally used” refers to a typical or common use of that class of product, regardless of the status of the particular user or of the way in which the particular user actually uses, or expects or is expected to use, the product. A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product.
“Installation Information” for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source. The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made.
If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied by the Installation Information. But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM).
The requirement to provide Installation Information does not include a requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been modified or installed. Access to a network may be denied when the modification itself materially and adversely affects the operation of the network or violates the rules and protocols for communication across the network.
Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying.
7. Additional Terms.
“Additional permissions” are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent that they are valid under applicable law. If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions.
When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it. (Additional permissions may be written to require their own removal in certain cases when you modify the work.) You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission.
Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms:
a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or
b) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or
c) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or
d) Limiting the use for publicity purposes of names of licensors or authors of the material; or
e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or
f) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions directly impose on those licensors and authors.
All other non-permissive additional terms are considered “further restrictions” within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying.
If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms.
Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way.
8. Termination.
You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses granted under the third paragraph of section 11).
However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation.
Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice.
Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10.
9. Acceptance Not Required for Having Copies.
You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require acceptance. However, nothing other than this License grants you permission to propagate or modify any covered work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so.
10. Automatic Licensing of Downstream Recipients.
Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by third parties with this License.
An “entity transaction” is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts.
You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it.
11. Patents.
A “contributor” is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The work thus licensed is called the contributor's “contributor version”.
A contributor's “essential patent claims” are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version. For purposes of this definition, “control” includes the right to grant patent sublicenses in a manner consistent with the requirements of this License.
Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version.
In the following three paragraphs, a “patent license” is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement). To “grant” such a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party.
If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner consistent with the requirements of this License, to extend the patent license to downstream recipients. “Knowingly relying” means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid.
If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagate, modify or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered work and works based on it.
A patent license is “discriminatory” if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You may not convey a covered work if you are a party to an arrangement with a third party that is in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007.
Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law.
12. No Surrender of Others' Freedom.
If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot convey a covered work so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not convey it at all. For example, if you agree to terms that obligate you to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program.
13. Use with the GNU Affero General Public License.
Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed under version 3 of the GNU Affero General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, but the special requirements of the GNU Affero General Public License, section 13, concerning interaction through a network will apply to the combination as such.
14. Revised Versions of this License.
The Free Software Foundation may publish revised and/or new versions of the GNU General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU General Public License “or any later version” applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the GNU General Public License, you may choose any version ever published by the Free Software Foundation.
If the Program specifies that a proxy can decide which future versions of the GNU General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program.
Later license versions may give you additional or different permissions. However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version.
15. Disclaimer of Warranty.
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
16. Limitation of Liability.
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
17. Interpretation of Sections 15 and 16.
If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms.
To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the “copyright” line and a pointer to where the full notice is found.
robin.schamagusa.de
Copyright (C) 2026 Robin Schanbacher
This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>.
Also add information on how to contact you by electronic and paper mail.
If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode:
robin.schamagusa.de
Copyright (C) 2026 Robin Schanbacher
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details.
The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, your program's commands might be different; for a GUI interface, you would use an “about box”.
You should also get your employer (if you work as a programmer) or school, if any, to sign a “copyright disclaimer” for the program, if necessary. For more information on this, and how to apply and follow the GNU GPL, see <https://www.gnu.org/licenses/>.
The GNU General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read <https://www.gnu.org/philosophy/why-not-lgpl.html>.
+46 -9
View File
@@ -1,16 +1,53 @@
# PsalmTafel # PsalmTafel
von Robin (und Rudi) Schanbacher
Developed by Robin (and Rudi) Schanbacher
> [!WARNING] > [!WARNING]
> Dieses Projekt befindet sich noch in der aktiven Entwicklungsphase. Bitte verwende es noch nicht für den produktiven Einsatz. > This project is currently in active development. Please do not use it in production environments yet.
## Funktion ---
Dieses Projekt wurde entwickelt, um einem Chor die aktuelle Liednummer und das dazugehörige Liederbuch anzuzeigen. Die Chorleitung wählt ein Lied über die (kommende) App aus. Ein Tablet oder ein anderes browserfähiges Gerät kann dann verwendet werden, um den Sängern die Liednummer, das Liederbuch und den Titel anzuzeigen.
## Features ## Overview
* **Echtzeit-Synchronisation:** Sobald die Chorleitung das Lied wechselt, aktualisiert sich die Anzeige innerhalb 5 Sekunden.
* **Flexibles Design (Responsive):** Funktioniert auf Tablets, Smartphones, Smart-TVs oder alten Laptops. ### Purpose
* **Unterstützung für mehrere Liederbücher:** Parallele Verwaltung verschiedener Gesangbücher möglich. PsalmTafel is a real-time display system designed for choirs. It enables the choir director to select and switch songs seamlessly via a web application or app. A tablet, TV, or any browser-capable device then displays the active song number, songbook, and title to the choir members.
### Key Features
* **Real-time Synchronization:** The display automatically updates within 5 seconds whenever a song is changed.
* **Fully Responsive:** Optimised for tablets, smartphones, desktop browsers, and Smart TVs.
* **Multi-Songbook Support:** Easily manage and switch between multiple songbooks concurrently.
* **Dark & Light Mode Support:** Modern, clean UI built for clear readability in any lighting condition.
---
## Installation & Setup ## Installation & Setup
![Wiki](https://git.schamagusa.de/Schanbro/PsalmTafel/wiki/Installation)
For detailed installation guides and deployment instructions, please visit our Wiki:
* [PsalmTafel Wiki – Installation Guide](https://git.schamagusa.de/Schanbro/PsalmTafel/wiki/Installation)
---
## Contributing
We welcome contributions of all kinds! Please take a moment to review the guidelines below before getting started.
> [!IMPORTANT]
> **Language Policy:** While the user interface (UI) is primarily in German, **all code, comments, variables, documentation, and issue descriptions must be written in English** to keep the project accessible to international contributors.
### How to Contribute
1. **Reporting Issues:**
* Before creating a new issue, please check existing issues to avoid duplicates.
* Use clear titles and provide detailed descriptions (including steps to reproduce bugs).
2. **Submitting Pull Requests (PRs):**
* Fork or branch off the main repository (e.g., `feat/my-new-feature` or `fix/issue-description`).
* Keep your commits clean using Conventional Commits (e.g., `feat:`, `fix:`, `style:`, `refactor:`).
* Open a **Draft Pull Request** early if you want feedback on work-in-progress code.
---
## License
This project is licensed under the GPL-3.0 License.
+248 -101
View File
@@ -1,7 +1,11 @@
"use client"; "use client";
import { uploadCSVAction } from "./actions"; 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";
import { Screens } from "@/components/DatabaseOverview";
interface Songbook { interface Songbook {
id: number; id: number;
@@ -9,6 +13,20 @@ interface Songbook {
language: string; 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() { export default function AdminPage() {
const [songbooks, setSongbooks] = useState<Songbook[]>([]); const [songbooks, setSongbooks] = useState<Songbook[]>([]);
const [selectedSongbookId, setSelectedSongbookId] = useState(""); const [selectedSongbookId, setSelectedSongbookId] = useState("");
@@ -21,6 +39,9 @@ export default function AdminPage() {
const [uploadStatus, setUploadStatus] = useState<string | null>(null); const [uploadStatus, setUploadStatus] = useState<string | null>(null);
const [selectedSong, setSelectedSong] = useState<Song | null>(null);
const [songInfos, setSongInfos] = useState<SongInfo[]>([])
async function handleCSVUpload(formData: FormData) { async function handleCSVUpload(formData: FormData) {
setUploadStatus("Verarbeite..."); setUploadStatus("Verarbeite...");
const result = await uploadCSVAction(formData); const result = await uploadCSVAction(formData);
@@ -32,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(() => { useEffect(() => {
async function loadSongbooks() { async function loadSongbooks() {
try { try {
@@ -75,6 +117,57 @@ 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 () => { const addSongbook = async () => {
if (!newBookName) { if (!newBookName) {
alert("Der Name des Liederbuches darf nicht leer sein!"); alert("Der Name des Liederbuches darf nicht leer sein!");
@@ -103,66 +196,52 @@ export default function AdminPage() {
}; };
return ( return (
<div className="min-h-screen bg-black text-white font-sans p-4 sm:p-6 lg:p-8"> <div className="font-sans p-4 sm:p-6 lg:p-8">
<div className="max-w-6xl mx-auto space-y-6"> <div className="max-w-6xl mx-auto space-y-6">
{/* HEADER */} {/* HEADER */}
<header className="border-b border-neutral-800 pb-4">
<h1 className="text-2xl sm:text-3xl font-bold tracking-tight text-white">Chor-Anzeige Admin Panel</h1> <h2 className="text-lg font-semibold mb-3 flex items-center gap-2">
<p className="text-neutral-400 text-sm mt-1">Datenbank verwalten, neue Bücher erstellen und Lieder einpflegen.</p> Datenbank verwalten, neue Bücher erstellen und Lieder einpflegen
</header> </h2>
{/* DREISPALTIRES GRID */} {/* DREISPALTIRES GRID */}
<div className="grid grid-cols-1 lg:grid-cols-3 gap-6"> <div className="grid grid-cols-1 lg:grid-cols-3 gap-6">
{/* KARTE 1: NEUES LIEDERBUCH */} <Card title="Neues Liederbuch">
<section className="bg-neutral-900 border border-neutral-800 rounded-xl p-5 shadow-md flex flex-col justify-between"> <div className="space-y-4">
<div> <div>
<h2 className="text-lg font-semibold text-white mb-4 flex items-center gap-2"> <Input.Label>Name des Buchs</Input.Label>
<span className="h-2 w-2 rounded-full bg-blue-400"></span> Neues Liederbuch <Input.Text
</h2> type="text"
<div className="space-y-4"> placeholder="z.B. Gesangbuch"
<div> value={newBookName}
<label className="block text-xs font-semibold text-neutral-400 uppercase tracking-wider mb-1.5">Name des Buchs</label> onChange={(e) => setNewBookName(e.target.value)}
<input />
type="text"
placeholder="z.B. Gesangbuch"
className="w-full bg-black border border-neutral-700 rounded-lg px-3 py-2 text-white placeholder-neutral-500 focus:outline-none focus:border-blue-400 text-sm"
value={newBookName}
onChange={(e) => setNewBookName(e.target.value)}
/>
</div>
<div>
<label className="block text-xs font-semibold text-neutral-400 uppercase tracking-wider mb-1.5">Sprache (Optional)</label>
<input
type="text"
placeholder="z.B. Deutsch"
className="w-full bg-black border border-neutral-700 rounded-lg px-3 py-2 text-white placeholder-neutral-500 focus:outline-none focus:border-blue-400 text-sm"
value={newBookLanguage}
onChange={(e) => setNewBookLanguage(e.target.value)}
/>
</div>
</div> </div>
<div>
<Input.Label>Sprache (Optional)</Input.Label>
<Input.Text
type="text"
placeholder="z.B. Deutsch"
value={newBookLanguage}
onChange={(e) => setNewBookLanguage(e.target.value)}
/>
</div>
<Input.Button
onClick={addSongbook}
className="w-full mt-6 bg-blue-600 hover:bg-blue-700 text-white font-semibold rounded-lg px-4 py-2.5 transition text-sm shadow-sm"
>
Liederbuch erstellen
</Input.Button>
</div> </div>
<button </Card>
onClick={addSongbook}
className="w-full mt-6 bg-blue-600 hover:bg-blue-700 text-white font-semibold rounded-lg px-4 py-2.5 transition text-sm shadow-sm"
>
Liederbuch erstellen
</button>
</section>
{/* KARTE 2: LIED HINZUFÜGEN */} <Card title="Lied hinzufügen">
<section className="bg-neutral-900 border border-neutral-800 rounded-xl p-5 shadow-md flex flex-col justify-between"> <div className="space-y-4">
<div>
<h2 className="text-lg font-semibold text-white mb-4 flex items-center gap-2">
<span className="h-2 w-2 rounded-full bg-blue-400"></span> Lied hinzufügen
</h2>
<div className="space-y-4">
<div> <div>
<label className="block text-xs font-semibold text-neutral-400 uppercase tracking-wider mb-1.5">Liederbuch wählen</label> <Input.Label>Liederbuch wählen</Input.Label>
<select <Input.Select
className="w-full bg-black border border-neutral-700 rounded-lg px-3 py-2 text-white focus:outline-none focus:border-blue-400 text-sm h-[38px]"
value={selectedSongbookId} value={selectedSongbookId}
onChange={(e) => setSelectedSongbookId(e.target.value)} onChange={(e) => setSelectedSongbookId(e.target.value)}
> >
@@ -172,53 +251,105 @@ export default function AdminPage() {
{book.name}{book.language ? ` (${book.language})` : ""} {book.name}{book.language ? ` (${book.language})` : ""}
</option> </option>
))} ))}
</select> </Input.Select>
</div> </div>
<div className="grid grid-cols-3 gap-2"> <div className="grid grid-cols-3 gap-2">
<div className="col-span-1"> <div className="col-span-1">
<label className="block text-xs font-semibold text-neutral-400 uppercase tracking-wider mb-1.5">Nummer</label> <Input.Label>Nummer</Input.Label>
<input <Input.Text
type="text" type="text"
placeholder="12a" placeholder="12a"
className="w-full bg-black border border-neutral-700 rounded-lg px-3 py-2 text-white placeholder-neutral-500 focus:outline-none focus:border-blue-400 text-sm"
value={number} value={number}
onChange={(e) => setNumber(e.target.value)} onChange={(e) => setNumber(e.target.value)}
/> />
</div> </div>
<div className="col-span-2"> <div className="col-span-2">
<label className="block text-xs font-semibold text-neutral-400 uppercase tracking-wider mb-1.5">Liedtitel</label> <Input.Label>Titel</Input.Label>
<input <Input.Text
type="text" type="text"
placeholder="Großer Gott, wir..." placeholder="Großer Gott, wir..."
className="w-full bg-black border border-neutral-700 rounded-lg px-3 py-2 text-white placeholder-neutral-500 focus:outline-none focus:border-blue-400 text-sm"
value={title} value={title}
onChange={(e) => setTitle(e.target.value)} onChange={(e) => setTitle(e.target.value)}
/> />
</div> </div>
</div> </div>
<Input.Button onClick={addSong} className="w-full mt-6 bg-blue-600 hover:bg-blue-700 text-white font-semibold rounded-lg px-4 py-2.5 transition text-sm shadow-sm">Lied speichern</Input.Button>
</div> </div>
</div> </Card>
<button
onClick={addSong}
className="w-full mt-6 bg-blue-600 hover:bg-blue-700 text-white font-semibold rounded-lg px-4 py-2.5 transition text-sm shadow-sm"
>
Lied speichern
</button>
</section>
{/* KARTE 3: CSV IMPORT */} <Card title="CSV-Massenimport">
<section className="bg-neutral-900 border border-neutral-800 rounded-xl p-5 shadow-md flex flex-col justify-between"> <form action={handleCSVUpload} className="flex flex-col justify-between">
<form action={handleCSVUpload} className="h-full flex flex-col justify-between">
<div>
<h2 className="text-lg font-semibold text-white mb-4 flex items-center gap-2">
<span className="h-2 w-2 rounded-full bg-blue-400"></span> CSV-Massenimport
</h2>
<input type="hidden" name="songbookId" value={selectedSongbookId} /> <input type="hidden" name="songbookId" value={selectedSongbookId} />
<div className="space-y-4"> <div className="space-y-4">
<div> <div>
<label className="block text-xs font-semibold text-neutral-400 uppercase tracking-wider mb-1.5">Ziel-Liederbuch</label> <Input.Label>Ziel-Liederbuch</Input.Label>
<select <Input.Select
className="w-full bg-black border border-neutral-700 rounded-lg px-3 py-2 text-white focus:outline-none focus:border-blue-400 text-sm h-[38px]" value={selectedSongbookId}
onChange={(e) => setSelectedSongbookId(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})` : ""}
</option>
))}
</Input.Select>
</div>
<div>
<Input.Label>Datei auswählen (.csv)</Input.Label>
<Input.File
name="csvFile"
accept=".csv"
required
/>
</div>
<div className="mt-6 space-y-3">
<Input.Button
type="submit"
>
Hochladen & Verarbeiten
</Input.Button >
{uploadStatus && (
<p className="text-xs text-center font-medium px-3 py-2 rounded-md bg-black border border-neutral-800 text-blue-400">
{uploadStatus}
</p>
)}
</div>
</div>
</form>
</Card>
</div>
<div className="grid grid-cols-1 lg:grid-cols-2 gap-6">
<Screens.Songs
actionName="Auswählen"
onSelectSong={(song) => setSelectedSong(song)}
className=""
/>
<Card title="Ausgewähltes Lied">
<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">In Liederbüchern:</span></p>
{songInfos.length > 0 ? (
<ul className="list-disc list-inside pl-2 text-xs text-neutral-400">
{songInfos.map((info) => (
<li key={info.songbook_id}>
{info.songbook_name} (Nr. {info.song_number})
</li>
))}
</ul>
) : (
<p className="text-xs text-neutral-500">Keine Daten geladen</p>
)}
</div>
</Card>
<Card title="Aktionen">
<Card title="Zu Liederbuch hinzufügen">
<div className="space-y-4">
<div>
<Input.Label>Ziel-Liederbuch</Input.Label>
<Input.Select
value={selectedSongbookId} value={selectedSongbookId}
onChange={(e) => setSelectedSongbookId(e.target.value)} onChange={(e) => setSelectedSongbookId(e.target.value)}
> >
@@ -228,37 +359,53 @@ export default function AdminPage() {
{book.name}{book.language ? ` (${book.language})` : ""} {book.name}{book.language ? ` (${book.language})` : ""}
</option> </option>
))} ))}
</select> </Input.Select>
</div> </div>
<div> <div>
<label className="block text-xs font-semibold text-neutral-400 uppercase tracking-wider mb-1.5">Datei auswählen (.csv)</label> <Input.Label>Nummer</Input.Label>
<input <Input.Text
type="file" type="text"
name="csvFile" placeholder="12a"
accept=".csv" value={number}
required onChange={(e) => setNumber(e.target.value)}
className="w-full text-sm text-neutral-400 file:mr-4 file:py-2 file:px-4 file:rounded-md file:border-0 file:text-xs file:font-semibold file:bg-neutral-800 file:text-neutral-200 hover:file:bg-neutral-700 file:transition cursor-pointer"
/> />
</div> </div>
<Input.Button
onClick={attachSong}
className="w-full mt-6 bg-blue-600 hover:bg-blue-700 text-white font-semibold rounded-lg px-4 py-2.5 transition text-sm shadow-sm"
>
Lied hinzufügen
</Input.Button>
</div> </div>
</div> </Card>
<Card title="Aus Liederbuch löschen">
<div className="mt-6 space-y-3"> <div className="space-y-4">
<button <div>
type="submit" <Input.Label>Ziel-Liederbuch</Input.Label>
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" <Input.Select
> value={selectedSongbookId}
Hochladen & Verarbeiten onChange={(e) => setSelectedSongbookId(e.target.value)}
</button> >
{uploadStatus && ( <option value="">-- Bitte wählen --</option>
<p className="text-xs text-center font-medium px-3 py-2 rounded-md bg-black border border-neutral-800 text-blue-400"> {songInfos.length > 0 ? (
{uploadStatus} songInfos.map((info) => (
</p> <option key={info.songbook_id} value={String(info.songbook_id)}>
)} {info.songbook_name} (Nr. {info.song_number})
</div> </option>
</form> ))
</section> ): ""}
</Input.Select>
</div>
<Input.Button
onClick={removeSong}
className="w-full mt-6 bg-blue-600 hover:bg-blue-700 text-white font-semibold rounded-lg px-4 py-2.5 transition text-sm shadow-sm"
>
Lied aus Liederbuch löschen
</Input.Button>
</div>
</Card>
</Card>
</Card>
</div> </div>
</div> </div>
</div> </div>
+20
View File
@@ -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 }
);
}
}
+40
View File
@@ -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 (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 }
);
}
}
+39
View File
@@ -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 }
);
}
}
+23
View File
@@ -0,0 +1,23 @@
import Image from "next/image";
export default function DashboardPage() {
return (
<>
{/* Das Hintergrundbild brecht aus allen Containern aus und füllt das Fenster */}
<div className="fixed inset-0 -z-10 h-screen w-screen overflow-hidden">
{/* <Image
src="/fakurian_purple.jpg"
alt="Hintergrund"
fill
className="object-cover"
priority
/> */}
</div>
{/* Dein Inhalt auf dieser Seite */}
<div className="relative">
<p>Dashboard is comming soon...</p>
</div>
</>
);
}
+11 -7
View File
@@ -2,6 +2,8 @@ import type { Metadata } from "next";
import { Geist, Geist_Mono } from "next/font/google"; import { Geist, Geist_Mono } from "next/font/google";
import "./globals.css"; import "./globals.css";
import Header from "@/components/Header"
const geistSans = Geist({ const geistSans = Geist({
variable: "--font-geist-sans", variable: "--font-geist-sans",
subsets: ["latin"], subsets: ["latin"],
@@ -13,8 +15,8 @@ const geistMono = Geist_Mono({
}); });
export const metadata: Metadata = { export const metadata: Metadata = {
title: "Create Next App", title: "PsalmTafel",
description: "Generated by create next app", description: "Liedernummer-Anzeige für den Chor ",
}; };
export default function RootLayout({ export default function RootLayout({
@@ -23,11 +25,13 @@ export default function RootLayout({
children: React.ReactNode; children: React.ReactNode;
}>) { }>) {
return ( return (
<html <html lang="de">
lang="en" <body className="min-h-screen flex flex-col">
className={`${geistSans.variable} ${geistMono.variable} h-full antialiased`} <Header />
>
<body className="min-h-full flex flex-col">{children}</body> <main className="mt-20 mx-auto min-w-200 max-w-full">{children}</main>
</body>
</html> </html>
); );
} }
+3 -63
View File
@@ -1,65 +1,5 @@
import Image from "next/image"; import { redirect } from "next/navigation";
export default function Home() { export default function Page() {
return ( redirect("/dashboard")
<div className="flex flex-col flex-1 items-center justify-center bg-zinc-50 font-sans dark:bg-black">
<main className="flex flex-1 w-full max-w-3xl flex-col items-center justify-between py-32 px-16 bg-white dark:bg-black sm:items-start">
<Image
className="dark:invert"
src="/next.svg"
alt="Next.js logo"
width={100}
height={20}
priority
/>
<div className="flex flex-col items-center gap-6 text-center sm:items-start sm:text-left">
<h1 className="max-w-xs text-3xl font-semibold leading-10 tracking-tight text-black dark:text-zinc-50">
Hello, PsalmTafel wurde aktualisiert! (v0.0.1)
</h1>
<p className="max-w-md text-lg leading-8 text-zinc-600 dark:text-zinc-400">
Looking for a starting point or more instructions? Head over to{" "}
<a
href="https://vercel.com/templates?framework=next.js&utm_source=create-next-app&utm_medium=appdir-template-tw&utm_campaign=create-next-app"
className="font-medium text-zinc-950 dark:text-zinc-50"
>
Templates
</a>{" "}
or the{" "}
<a
href="https://nextjs.org/learn?utm_source=create-next-app&utm_medium=appdir-template-tw&utm_campaign=create-next-app"
className="font-medium text-zinc-950 dark:text-zinc-50"
>
Learning
</a>{" "}
center.
</p>
</div>
<div className="flex flex-col gap-4 text-base font-medium sm:flex-row">
<a
className="flex h-12 w-full items-center justify-center gap-2 rounded-full bg-foreground px-5 text-background transition-colors hover:bg-[#383838] dark:hover:bg-[#ccc] md:w-[158px]"
href="https://vercel.com/new?utm_source=create-next-app&utm_medium=appdir-template-tw&utm_campaign=create-next-app"
target="_blank"
rel="noopener noreferrer"
>
<Image
className="dark:invert"
src="/vercel.svg"
alt="Vercel logomark"
width={16}
height={16}
/>
Deploy Now
</a>
<a
className="flex h-12 w-full items-center justify-center rounded-full border border-solid border-black/[.08] px-5 transition-colors hover:border-transparent hover:bg-black/[.04] dark:border-white/[.145] dark:hover:bg-[#1a1a1a] md:w-[158px]"
href="https://nextjs.org/docs?utm_source=create-next-app&utm_medium=appdir-template-tw&utm_campaign=create-next-app"
target="_blank"
rel="noopener noreferrer"
>
Documentation
</a>
</div>
</main>
</div>
);
} }
+7 -77
View File
@@ -2,6 +2,9 @@
import { useState, useEffect } from "react"; import { useState, useEffect } from "react";
import { Input } from "@/components/FormElements";
import { Screens } from "@/components/DatabaseOverview";
interface Songbook { interface Songbook {
id: number; id: number;
name: string; name: string;
@@ -86,82 +89,9 @@ export default function SenderPage() {
}; };
return ( return (
<div className="min-h-screen bg-black text-white font-sans p-4 sm:p-6 lg:p-8"> <Screens.Songs
<div className="max-w-4xl mx-auto space-y-6"> actionName="Anzeigen"
onSelectSong={(song) => sendID(String(song.song_id), String(song.songbook_id))}
{/* TITEL DER SEITE */} />
<header className="border-b border-neutral-800 pb-4">
<h1 className="text-2xl sm:text-3xl font-bold tracking-tight text-white">Chor-Anzeige Bedienfeld</h1>
<p className="text-neutral-400 text-sm mt-1">Lieder auswählen und live auf das Display übertragen.</p>
</header>
{/* LIEDERSUCHE */}
<div className="bg-neutral-900 border border-neutral-800 rounded-xl p-4 sm:p-6 shadow-md flex flex-col h-[500px]">
<h2 className="text-lg font-semibold text-white mb-3 flex items-center gap-2">
<span className="h-2 w-2 rounded-full bg-blue-400"></span> Liedersuche & Datenbank
</h2>
<div className="mb-4">
<input
type="text"
placeholder="Nach Songtitel oder Nummer suchen..."
className="w-full bg-black border border-neutral-700 rounded-lg px-4 py-2.5 text-white placeholder-neutral-500 focus:outline-none focus:border-blue-400 text-sm"
value={song_search_name}
onChange={(e) => search(e.target.value)}
/>
</div>
{/* TABELLE */}
<div className="flex-1 overflow-auto border border-neutral-800 rounded-lg bg-black">
<table className="w-full text-left border-collapse text-sm">
<thead className="bg-neutral-900 sticky top-0 border-b border-neutral-800 z-10">
<tr>
<th className="p-3 text-xs font-semibold text-neutral-400 uppercase tracking-wider">Titel</th>
<th className="p-3 text-xs font-semibold text-neutral-400 uppercase tracking-wider hidden sm:table-cell">Liederbuch</th>
<th className="p-3 text-xs font-semibold text-neutral-400 uppercase tracking-wider text-center">Nummer</th>
<th className="p-3 text-xs font-semibold text-neutral-400 uppercase tracking-wider text-right">Aktion</th>
</tr>
</thead>
<tbody className="divide-y divide-neutral-800">
{searchResults.length === 0 ? (
<tr>
<td colSpan={4} className="p-8 text-center 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-900/40 transition">
<td className="p-3 font-medium text-white max-w-[180px] sm:max-w-none truncate">
{song.title}
<span className="block text-xs text-neutral-400 sm:hidden mt-0.5">
{songBook ? songBook.name : "Unbekannt"}
</span>
</td>
<td className="p-3 text-neutral-300 hidden sm:table-cell">
{songBook ? songBook.name : "Unbekannt"}
</td>
<td className="p-3 text-center font-mono text-blue-400 font-bold">
{song.song_number}
</td>
<td className="p-3 text-right">
<button
onClick={() => sendID(String(song.song_id), String(song.songbook_id))}
className="bg-black hover:bg-blue-600 border border-neutral-700 hover:border-blue-500 text-neutral-200 hover:text-white font-medium rounded-md px-3 py-1.5 transition text-xs"
>
Anzeigen
</button>
</td>
</tr>
);
})
)}
</tbody>
</table>
</div>
</div>
</div>
</div>
); );
} }
+25
View File
@@ -0,0 +1,25 @@
import { ReactNode, ComponentPropsWithoutRef } 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 (
<section
className={`p-5 flex flex-col justify-between ${className} bg-slate-400/30 dark:bg-slate-700/30 rounded-xl`}
{...props}
>
<h2 className="text-lg font-semibold mb-4 flex items-center gap-2">
{title}
</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}" : ""}`}>
{children}
</div>
</section>
);
}
+143
View File
@@ -0,0 +1,143 @@
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,
}
+64
View File
@@ -0,0 +1,64 @@
import { ChangeEvent, ReactNode } from "react";
import { ComponentPropsWithoutRef } from "react";
interface TextfieldProps extends ComponentPropsWithoutRef<"input"> {}
function Textfield({value, onChange, placeholder, ...props}: TextfieldProps) {
return (
<input
className="w-full border border-neutral-700 rounded-lg px-4 py-2.5 placeholder-neutral-500 focus:outline-none focus:border-blue-400 text-sm"
value={value}
onChange={onChange}
placeholder={placeholder}
{...props}
/>
)
}
function Dropdown({ children, ...props }: ComponentPropsWithoutRef<"select">) {
return (
<select
className="w-full border border-neutral-700 rounded-lg px-3 py-2 focus:outline-none focus:border-blue-400 text-sm h-[38px]"
{...props}
>
{children}
</select>
);
}
function File({ ...props }: ComponentPropsWithoutRef<"input">) {
return (
<input
type="file"
className="p-1 text-sm w-full rounded-lg border border-neutral-300 dark:border-neutral-700 bg-white dark:bg-black text-black dark:text-white cursor-pointer file:mr-4 file:py-2 file:px-4 file:rounded-sm file:border-0 file:font-semibold file:transition file:bg-neutral-100 file:text-neutral-900 dark:file:bg-neutral-800 dark:file:text-white hover:file:bg-neutral-900 hover:file:text-white dark:hover:file:bg-white dark:hover:file:text-black"
{...props}
/>
);
}
function Button({ children, ...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"
{...props}
>
{children}
</button>
)
}
function Label( {children}: ComponentPropsWithoutRef<"label">) {
return (
<label className="block text-xs font-semibold text-neutral-400 uppercase tracking-wider mb-1.5">
{children}
</label>
)
}
export const Input = {
Text: Textfield,
Select: Dropdown,
File: File,
Button: Button,
Label: Label,
};
+15
View File
@@ -0,0 +1,15 @@
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">
<div className="font-bold text-xl">PsalmTafel</div>
<nav className="flex gap-4 border-2 rounded-full">
<NavItem path="/dashboard">Dashboard</NavItem>
<NavItem path="/sender">Sender</NavItem>
<NavItem path="/receiver">Empfänger</NavItem>
<NavItem path="/admin">Verwaltung</NavItem>
</nav>
</header>
);
}
+19
View File
@@ -0,0 +1,19 @@
"use client";
import Link from "next/link";
import { usePathname } from "next/navigation";
import { ReactNode } from "react";
export default function NavItem({ path, children }: { path: string; children: ReactNode }) {
const pathname = usePathname();
const isActive = pathname === path;
return (
<Link
href={path}
className={`px-3 py-1 rounded-full border border-transparent hover:border-current transition-all ${
isActive ? "bg-black text-white dark:bg-white dark:text-black" : ""
}`}
>{children}</Link>
);
}
+67 -2
View File
@@ -1,5 +1,4 @@
import Database from "better-sqlite3"; import Database from "better-sqlite3";
import { Noto_Sans_Tamil_Supplement } from "next/font/google";
import path from "path"; import path from "path";
const dbPath = path.join(process.cwd(), "songs.db"); 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) { export async function addSongToSongbook(title:string, songbookId:number, number:string) {
try { try {
const runTransaction = db.transaction(() => { const runTransaction = db.transaction(() => {
@@ -95,6 +120,46 @@ export async function addSongToSongbook(title:string, songbookId:number, number:
} }
} }
export async function attachSongToSongbook(songId: number, songbookId: number, number: string) {
try {
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 attachSongToSongbook:", error);
return { success: false };
}
}
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() { export async function getSongbooks() {
try { try {
const songbooks = db.prepare('SELECT id, name, language FROM songbooks ORDER BY name ASC').all(); const songbooks = db.prepare('SELECT id, name, language FROM songbooks ORDER BY name ASC').all();
@@ -104,7 +169,7 @@ export async function getSongbooks() {
} }
} }
export async function addSongbook(name:String, language:String) { export async function addSongbook(name: string, language: string) {
try { try {
const info = db.prepare(` const info = db.prepare(`
INSERT INTO songbooks (name, language) INSERT INTO songbooks (name, language)
+2 -2
View File
@@ -1,6 +1,6 @@
{ {
"name": "lied-nummer-anzeige", "name": "psalm-talel",
"version": "0.1.0", "version": "0.0.5",
"private": true, "private": true,
"scripts": { "scripts": {
"dev": "next dev", "dev": "next dev",
BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 518 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 520 KiB