Compare commits

...
61 Commits
Author SHA1 Message Date
robin e1f928d376 Merge pull request 'Chore' (#59) from chore into main
Build, Package & Release Next.js / Build & Push Docker Image (push) Successful in 7m35s
Build, Package & Release Next.js / Create Gitea Release (push) Successful in 8s
Reviewed-on: Schanbro/PsalmTafel#59
2026-09-03 14:12:49 +00:00
robin a7e7cbf5f8 Merge branch 'main' into chore 2026-09-03 14:12:35 +00:00
robin f101e0aaaf ci: switched from branch to version 2026-09-03 14:12:28 +00:00
robin 1544608eeb chore: changed version number 2026-09-03 14:10:55 +00:00
robin bdc23cc8dc Merge pull request '.gitea/workflows/deploy.yaml aktualisiert' (#58) from chore into main
Build, Package & Release Next.js / Build & Push Docker Image (push) Successful in 7m57s
Build, Package & Release Next.js / Create Gitea Release (push) Successful in 9s
Reviewed-on: Schanbro/PsalmTafel#58
2026-09-03 13:58:35 +00:00
robin 8008742be3 Merge branch 'main' into chore 2026-09-03 13:58:03 +00:00
robin 702332c299 .gitea/workflows/deploy.yaml aktualisiert 2026-09-03 13:57:56 +00:00
robin f843fcd090 Merge pull request 'ci: switched to manuel REGISTRY_TOKEN' (#57) from chore into main
Build, Package & Release Next.js / Build & Push Docker Image (push) Failing after 20s
Build, Package & Release Next.js / Create Gitea Release (push) Skipped
Reviewed-on: Schanbro/PsalmTafel#57
2026-09-03 13:55:39 +00:00
robin a2115f6af4 Merge branch 'main' into chore 2026-09-03 13:55:31 +00:00
robin 12056afa87 ci: switched to manuel REGISTRY_TOKEN 2026-09-03 13:55:24 +00:00
robin 6a547f55a3 Merge pull request '.gitea/workflows/deploy.yaml aktualisiert' (#56) from chore into main
Build, Package & Release Next.js / Build & Push Docker Image (push) Failing after 10s
Build, Package & Release Next.js / Create Gitea Release (push) Skipped
Reviewed-on: Schanbro/PsalmTafel#56
2026-09-03 13:51:32 +00:00
robin 009124c286 Merge branch 'main' into chore 2026-09-03 13:51:23 +00:00
robin d6475f1c5b .gitea/workflows/deploy.yaml aktualisiert 2026-09-03 13:51:17 +00:00
robin 2aee8ece58 Merge pull request '.gitea/workflows/deploy.yaml aktualisiert' (#55) from chore into main
Build, Package & Release Next.js / Build & Push Docker Image (push) Failing after 13s
Build, Package & Release Next.js / Create Gitea Release (push) Skipped
Reviewed-on: Schanbro/PsalmTafel#55
2026-09-03 13:48:07 +00:00
robin 157609225f Merge branch 'main' into chore 2026-09-03 13:47:59 +00:00
robin 82279f946d .gitea/workflows/deploy.yaml aktualisiert 2026-09-03 13:47:52 +00:00
robin 2b99460964 Merge pull request 'ci: changes' (#54) from chore into main
Build, Package & Release Next.js / Build & Push Docker Image (push) Failing after 9s
Build, Package & Release Next.js / Create Gitea Release (push) Skipped
Reviewed-on: Schanbro/PsalmTafel#54
2026-09-03 13:45:18 +00:00
robin 8ccc2008c4 Merge branch 'main' into chore 2026-09-03 13:45:09 +00:00
robin a290a109b5 ci: changes 2026-09-03 13:45:02 +00:00
robin 5ed91068a5 Merge pull request 'ci: changes' (#53) from chore into main
Build, Package & Release Next.js / Build & Push Docker Image (push) Failing after 18s
Build, Package & Release Next.js / Create Gitea Release (push) Skipped
Reviewed-on: Schanbro/PsalmTafel#53
2026-09-03 13:41:59 +00:00
robin 72bd7f26ea Merge branch 'main' into chore 2026-09-03 13:41:51 +00:00
robin 5aa5631d7a ci: changes 2026-09-03 13:41:44 +00:00
robin 7514c7d846 Merge pull request 'ci: changes' (#52) from chore into main
Build, Package & Release Next.js / Build & Push Docker Image (push) Failing after 18s
Build, Package & Release Next.js / Create Gitea Release (push) Skipped
Reviewed-on: Schanbro/PsalmTafel#52
2026-09-03 13:37:09 +00:00
robin 26caaadf56 Merge branch 'main' into chore 2026-09-03 13:37:00 +00:00
robin e174200d96 ci: changes 2026-09-03 13:36:54 +00:00
robin e978e2fb99 Merge pull request 'ci: switched to my brothers solution' (#51) from chore into main
Build, Package & Release Next.js / Build & Push Docker Image (push) Failing after 18s
Build, Package & Release Next.js / Create Gitea Release (push) Skipped
Reviewed-on: Schanbro/PsalmTafel#51
2026-09-03 13:34:43 +00:00
robin 28fb46b5bf Merge branch 'main' into chore 2026-09-03 13:34:34 +00:00
robin 4ad6175e43 ci: switched to my brothers solution 2026-09-03 13:34:26 +00:00
robin 194492200c Merge pull request 'ci: clean up docker build step after host daemon configuration' (#50) from chore into main
Build, Package & Release Next.js / Build & Push Docker Image (push) Failing after 8s
Build, Package & Release Next.js / Create Gitea Release (push) Skipped
Reviewed-on: Schanbro/PsalmTafel#50
2026-09-03 13:33:11 +00:00
robin 0346be16f7 Merge branch 'main' into chore 2026-09-03 13:33:02 +00:00
robin eba825b451 ci: clean up docker build step after host daemon configuration 2026-09-03 13:32:55 +00:00
robin 08e8fa4c70 Merge pull request 'fix: switch to docker cli build' (#49) from chore into main
Build, Package & Release Next.js / Build & Push Docker Image (push) Failing after 8s
Build, Package & Release Next.js / Create Gitea Release (push) Skipped
Reviewed-on: Schanbro/PsalmTafel#49
2026-09-03 13:29:50 +00:00
robin 7dc324d331 Merge branch 'main' into chore 2026-09-03 13:29:33 +00:00
robin 4ab5f40782 fix: switch to docker cli build 2026-09-03 13:29:27 +00:00
robin 08dd5e12a7 Merge pull request 'ci: configure insecure registry for gitea container registry' (#48) from chore into main
Build, Package & Release Next.js / Build & Push Docker Image (push) Failing after 10s
Build, Package & Release Next.js / Create Gitea Release (push) Skipped
Reviewed-on: Schanbro/PsalmTafel#48
2026-09-03 13:27:47 +00:00
robin 39eb5ba72e Merge branch 'main' into chore 2026-09-03 13:27:41 +00:00
robin 0c4871bda4 ci: configure insecure registry for gitea container registry 2026-09-03 13:27:35 +00:00
robin 3b504bda1e Merge pull request 'fix: use docker cli login for http registry support' (#47) from chore into main
Build, Package & Release Next.js / Build & Push Docker Image (push) Failing after 11s
Build, Package & Release Next.js / Create Gitea Release (push) Skipped
Reviewed-on: Schanbro/PsalmTafel#47
2026-09-03 13:23:03 +00:00
robin d8ef8490d1 Merge branch 'main' into chore 2026-09-03 13:22:55 +00:00
robin eaf82d0c34 fix: use docker cli login for http registry support 2026-09-03 13:22:48 +00:00
robin a8d939481f Merge pull request 'ci: fix protocoll issue' (#46) from chore into main
Build, Package & Release Next.js / Build & Push Docker Image (push) Failing after 20s
Build, Package & Release Next.js / Create Gitea Release (push) Skipped
Reviewed-on: Schanbro/PsalmTafel#46
2026-09-03 13:20:22 +00:00
robin 0ec3ba7bf5 Merge branch 'main' into chore 2026-09-03 13:19:52 +00:00
robin 1560ff4c06 ci: fix protocoll issue 2026-09-03 13:19:45 +00:00
robin af71466c9f Merge pull request 'ci: use gitea container hostname for internal network communication' (#45) from chore into main
Build, Package & Release Next.js / Build & Push Docker Image (push) Failing after 14m10s
Build, Package & Release Next.js / Create Gitea Release (push) Skipped
Reviewed-on: Schanbro/PsalmTafel#45
2026-09-03 13:00:47 +00:00
robin d892a0b410 Merge branch 'main' into chore 2026-09-03 13:00:39 +00:00
robin 31a3877183 ci: use gitea container hostname for internal network communication 2026-09-03 13:00:31 +00:00
robin f1f52ee002 Merge pull request 'ci: fix checkout repository url for both jobs' (#44) from chore into main
Build, Package & Release Next.js / Create Gitea Release (push) Canceled after 0s
Build, Package & Release Next.js / Build & Push Docker Image (push) Canceled after 44s
Reviewed-on: Schanbro/PsalmTafel#44
2026-09-03 12:32:49 +00:00
robin 5277e98b32 Merge branch 'main' into chore 2026-09-03 12:32:40 +00:00
robin 5e0e00b3ca ci: fix checkout repository url for both jobs 2026-09-03 12:32:25 +00:00
robin 11cd39aced Merge pull request 'ci: refactor workflow to use standard actions' (#43) from chore into main
Build, Package & Release Next.js / Create Gitea Release (push) Canceled after 0s
Build, Package & Release Next.js / Build & Push Docker Image (push) Canceled after 6m26s
Reviewed-on: Schanbro/PsalmTafel#43
2026-09-03 12:23:07 +00:00
robin 4b587b543c ci: refactor workflow with docker actions and gitea release api 2026-09-03 12:22:44 +00:00
robin f688952ed8 ci: refactor workflow to use standard actions 2026-09-03 12:21:20 +00:00
robin 941f7aa729 Merge pull request 'Style/adjust receiver page' (#42) from style/adjust-receiver-page into main
Deploy Next.js via Docker / deploy (push) Successful in 1m11s
Reviewed-on: Schanbro/PsalmTafel#42
2026-08-27 09:45:29 +00:00
robin 1088cfd5fd fix: merged conflicts 2026-08-27 11:44:23 +02:00
robin b3870265f6 Merge remote-tracking branch 'Gitea/main' into style/adjust-receiver-page 2026-08-27 11:44:18 +02:00
robin 9c7029bad5 style: adjust receiver page 2026-08-26 15:28:41 +02:00
robin 5afdae2b20 Merge pull request 'Feat/wiki' (#40) from feat/wiki into main
Deploy Next.js via Docker / deploy (push) Successful in 1m2s
Reviewed-on: Schanbro/PsalmTafel#40
2026-08-26 12:47:35 +00:00
robin 6f15860beb style: move information screen to foreground 2026-07-31 12:49:37 +02:00
robin c28a5031f6 refactor: changed to rem 2026-07-30 10:48:34 +02:00
robin 4948946c0d Merge pull request 'add automatic prerelease mark' (#25) from environment into main
Deploy Next.js via Docker / deploy (push) Successful in 2m37s
Reviewed-on: Schanbro/PsalmTafel#25
2026-07-30 08:09:37 +00:00
robin 1ec3bb667d add automatic prerelease mark
release as prerelease if version number starts with "0."
2026-07-30 08:08:25 +00:00
3 changed files with 179 additions and 69 deletions

No files matched your search

+67 -52
View File
@@ -1,4 +1,4 @@
name: Deploy Next.js via Docker name: Build, Package & Release Next.js
on: on:
push: push:
@@ -6,64 +6,79 @@ on:
- main - main
jobs: jobs:
deploy: build-and-push:
name: Build & Push Docker Image
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: permissions:
image: docker:latest contents: read
packages: write
steps: steps:
- name: Checkout code - name: Checkout Code
uses: actions/checkout@v4
with:
repository: ${{ github.repository }}
token: ${{ secrets.GITHUB_TOKEN }}
repository-url: http://gitea:3000/${{ github.repository }}
ref: main
- name: Read Version & Lowercase Repo Name
run: | run: |
apk add --no-cache curl unzip
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
unzip repo.zip
mv PsalmTafel/* . 2>/dev/null || mv psalmtafel/* . 2>/dev/null || mv */* . 2>/dev/null
rm repo.zip
- name: Update Docker container
run: |
echo "Building new Next.js Docker image..."
docker build -t psalmtafel-app .
echo "Stopping old container if running..."
docker stop psalmtafel-container || true
docker rm psalmtafel-container || true
echo "Starting new container..."
docker run -d \
--name psalmtafel-container \
-p 8443:3000 \
--restart always \
psalmtafel-app
- name: Create release in Gitea
run: |
apk add --no-cache jq curl
VERSION=$(jq -r '.version' package.json) VERSION=$(jq -r '.version' package.json)
echo "Current version: v$VERSION" echo "VERSION=$VERSION" >> $GITHUB_ENV
# Shell-kompatible Prüfung (funktioniert zuverlässig in Alpine/sh) REPO_LOWER=$(echo "${{ github.repository }}" | tr '[:upper:]' '[:lower:]')
case "$VERSION" in echo "REPO_LOWER=$REPO_LOWER" >> $GITHUB_ENV
0.*)
IS_PRERELEASE="true" - name: Log in to Gitea Container Registry
echo "Version starts with 0. Setting prerelease to true." run: |
;; USER_LOWER=$(echo "${{ github.actor }}" | tr '[:upper:]' '[:lower:]')
*) echo "${{ secrets.REGISTRY_TOKEN }}" | docker login gitea:3000 -u "$USER_LOWER" --password-stdin
IS_PRERELEASE="false"
echo "Setting prerelease to false." - name: Docker Image bauen (nur lokal im Runner)
;; uses: docker/build-push-action@v5
esac with:
context: .
push: false
tags: |
gitea:3000/${{ env.REPO_LOWER }}:v${{ env.VERSION }}
gitea:3000/${{ env.REPO_LOWER }}:latest
- name: Images zu Gitea pushen
run: |
docker push gitea:3000/${{ env.REPO_LOWER }}:v${{ env.VERSION }}
docker push gitea:3000/${{ env.REPO_LOWER }}:latest
create-release:
name: Create Gitea Release
needs: build-and-push
runs-on: ubuntu-latest
steps:
- name: Checkout Code
uses: actions/checkout@v4
with:
repository: ${{ github.repository }}
token: ${{ secrets.GITHUB_TOKEN }}
repository-url: http://gitea:3000/${{ github.repository }}
ref: main
- name: Create Release via Gitea API
run: |
VERSION=$(jq -r '.version' package.json)
if [[ "$VERSION" == 0.* ]]; then
PRERELEASE="true"
else
PRERELEASE="false"
fi
# Prüfen, ob das Release bereits existiert
HTTP_STATUS=$(curl -s -o /dev/null -w "%{http_code}" \ HTTP_STATUS=$(curl -s -o /dev/null -w "%{http_code}" \
-H "Authorization: token ${{ secrets.GITEA_TOKEN }}" \ -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
"http://172.17.0.1:3000/api/v1/repos/${{ github.repository }}/releases/tags/v$VERSION") "http://gitea:3000/api/v1/repos/${{ github.repository }}/releases/tags/v$VERSION")
if [ "$HTTP_STATUS" -eq 404 ]; then if [ "$HTTP_STATUS" -eq 404 ]; then
echo "Creating new release v$VERSION..." echo "Creating release v$VERSION in Gitea..."
# Gitea erstellt bei diesem Call automatisch auch den Tag v$VERSION auf 'main'
curl -X POST \ curl -X POST \
-H "Authorization: token ${{ secrets.GITEA_TOKEN }}" \ -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
-H "Content-Type: application/json" \ -H "Content-Type: application/json" \
-d "{ -d "{
\"tag_name\": \"v$VERSION\", \"tag_name\": \"v$VERSION\",
@@ -71,9 +86,9 @@ jobs:
\"name\": \"Release v$VERSION\", \"name\": \"Release v$VERSION\",
\"body\": \"Automated release for version v$VERSION\", \"body\": \"Automated release for version v$VERSION\",
\"draft\": false, \"draft\": false,
\"prerelease\": $IS_PRERELEASE \"prerelease\": $PRERELEASE
}" \ }" \
"http://172.17.0.1:3000/api/v1/repos/${{ github.repository }}/releases" "http://gitea:3000/api/v1/repos/${{ github.repository }}/releases"
else else
echo "Release v$VERSION already exists. Skipping creation." echo "Release v$VERSION exists already. Skipping."
fi fi
+111 -16
View File
@@ -3,11 +3,65 @@
import { useState, useEffect } from "react"; import { useState, useEffect } from "react";
export default function SenderPage() { export default function SenderPage() {
const [isFullscreen, setIsFullscreen] = useState(false);
const [songID, setSongID] = useState(""); const [songID, setSongID] = useState("");
const [songbook, setSongbook] = useState(""); const [songbook, setSongbook] = useState("");
const [number, setNumber] = useState(""); const [number, setNumber] = useState("");
const [title, setTitle] = useState(""); const [title, setTitle] = useState("");
// --- Screen Wake Lock API Integration ---
useEffect(() => {
let wakeLock: WakeLockSentinel | null = null;
const requestWakeLock = async () => {
try {
if ("wakeLock" in navigator) {
wakeLock = await navigator.wakeLock.request("screen");
}
} catch (err) {
console.error("Wake Lock Fehler:", err);
}
};
requestWakeLock();
// Erneutes Anfordern, falls der Tab/die App gewechselt wurde
const handleVisibilityChange = () => {
if (document.visibilityState === "visible") {
requestWakeLock();
}
};
document.addEventListener("visibilitychange", handleVisibilityChange);
return () => {
document.removeEventListener("visibilitychange", handleVisibilityChange);
if (wakeLock) {
wakeLock.release();
}
};
}, []);
// --- Fullscreen Steuerung ---
const toggleFullscreen = () => {
if (!document.fullscreenElement) {
document.documentElement
.requestFullscreen()
.then(() => {
setIsFullscreen(true);
})
.catch((err) => {
console.error("Vollbild fehlgeschlagen:", err);
});
} else {
document.exitFullscreen().then(() => {
setIsFullscreen(false);
});
}
};
// --- Daten abrufen ---
const getID = async () => { const getID = async () => {
try { try {
const res = await fetch("/api/stream/currentID"); const res = await fetch("/api/stream/currentID");
@@ -28,22 +82,63 @@ export default function SenderPage() {
}, []); }, []);
return ( return (
<div className="flex h-screen w-screen flex-col items-center justify-between bg-black text-white font-sans select-none overflow-hidden"> <div
<div className="w-full text-center py-2"> className={`absolute top-0 left-0 z-50 flex h-screen w-screen flex-col items-center justify-between bg-black text-white select-none overflow-hidden p-2`}
<span className="text-[7rem] md:text-[11rem] font-black uppercase block leading-none"> >
{songbook} {/* 1. Liederbuch */}
</span> <header className="w-full flex-[1.5] flex items-center justify-center overflow-hidden py-1">
</div> <svg viewBox="0 0 1000 200" className="w-full h-full max-h-full">
<div className="flex-1 flex items-center justify-center w-full"> <text
<h1 className="text-[14rem] md:text-[20rem] font-black leading-none tracking-tighter text-white"> x="50%"
{number} y="50%"
</h1> dominantBaseline="central"
</div> textAnchor="middle"
<div className="w-full text-center pb-2 px-4"> className="fill-amber-300 font-black uppercase"
<p className="text-3xl md:text-6xl font-medium text-neutral-400 truncate"> fontSize="220"
{title} >
</p> {songbook}
</div> </text>
</svg>
</header>
{/* 2. Nummer */}
<main className="w-full flex-[5] flex items-center justify-center overflow-hidden py-1">
<svg viewBox="0 0 1000 500" className="w-full h-full max-h-full">
<text
x="50%"
y="50%"
dominantBaseline="central"
textAnchor="middle"
className="fill-white font-black"
fontSize="520"
>
{number}
</text>
</svg>
</main>
{/* 3. Titel */}
<footer className="w-full flex-[1] flex items-center justify-center overflow-hidden py-1">
<svg viewBox="0 0 1000 120" className="w-full h-full max-h-full">
<text
x="50%"
y="50%"
dominantBaseline="central"
textAnchor="middle"
className="fill-zinc-200 font-semibold"
fontSize="90"
>
{title}
</text>
</svg>
</footer>
<button
onClick={toggleFullscreen}
className="fixed top-4 right-4 z-50 bg-neutral-800 hover:bg-neutral-700 text-white px-4 py-2 rounded-lg opacity-40 hover:opacity-100 transition-opacity"
>
{isFullscreen ? "Vollbild beenden" : "Vollbild starten"}
</button>
</div> </div>
); );
} }
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "psalm-tafel", "name": "psalm-tafel",
"version": "0.0.5.1", "version": "0.0.5.2",
"private": true, "private": true,
"scripts": { "scripts": {
"dev": "next dev", "dev": "next dev",