Dev #2

Merged
Mboehmlaender merged 25 commits from dev into master 2025-09-25 09:27:00 +00:00
3 changed files with 169 additions and 49 deletions
Showing only changes of commit 716cd13c53 - Show all commits
+56 -23
View File
@@ -6,37 +6,59 @@ export default function Stacks() {
const [stacks, setStacks] = useState([]); const [stacks, setStacks] = useState([]);
const [loading, setLoading] = useState(true); const [loading, setLoading] = useState(true);
const [error, setError] = useState(""); const [error, setError] = useState("");
// Map: { [stackId]: boolean }
const [redeploying, setRedeploying] = useState({}); const [redeploying, setRedeploying] = useState({});
// WebSocket initialisieren // -------------------------
// WebSocket: connect + events
// -------------------------
useEffect(() => { useEffect(() => {
const socket = io("/"); // wenn Frontend und Backend auf verschiedenen Hosts/Ports laufen:
console.log("Socket connected"); // const socket = io("http://localhost:4001");
const socket = io(); // gleiche Origin (Express static) -> passt normalerweise
socket.on("connect", () => console.log("Socket connected:", socket.id));
socket.on("redeployStatus", async ({ stackId, status }) => { socket.on("redeployStatus", async ({ stackId, status }) => {
// sofort den lokalen map-state setzen (optimistisch)
setRedeploying(prev => ({ ...prev, [stackId]: status })); setRedeploying(prev => ({ ...prev, [stackId]: status }));
// Wenn Redeploy beendet, Stack-Status neu laden // Wenn der Redeploy zu false geht, holen wir die aktuellen Stacks (aktualisieren UI)
if (!status) { if (!status) {
try { try {
const res = await axios.get("/api/stacks"); const res = await axios.get("/api/stacks");
const sortedStacks = res.data.sort((a, b) => a.Name.localeCompare(b.Name)); const sortedStacks = res.data.sort((a, b) => a.Name.localeCompare(b.Name));
setStacks(sortedStacks); setStacks(sortedStacks);
// Map aus API-Daten aufbauen (wichtig für F5 / Konsistenz)
const map = {};
sortedStacks.forEach(s => { map[s.Id] = !!s.redeploying; });
setRedeploying(map);
} catch (err) { } catch (err) {
console.error("Fehler beim Aktualisieren des Status nach Redeploy:", err); console.error("Fehler beim Aktualisieren des Status nach Redeploy:", err);
} }
} }
}); });
return () => socket.disconnect(); return () => {
socket.off("redeployStatus");
socket.disconnect();
};
}, []); }, []);
// Stacks initial laden // -------------------------
// Initiale Stacks laden (auch setzt redeploying map)
// -------------------------
const fetchStacks = async () => { const fetchStacks = async () => {
setLoading(true);
try { try {
const res = await axios.get("/api/stacks"); const res = await axios.get("/api/stacks");
const sortedStacks = res.data.sort((a, b) => a.Name.localeCompare(b.Name)); const sortedStacks = res.data.sort((a, b) => a.Name.localeCompare(b.Name));
setStacks(sortedStacks); setStacks(sortedStacks);
// Wichtig: redeploying-Map aus API-Daten setzen, damit F5 den echten Zustand zeigt
const map = {};
sortedStacks.forEach(s => { map[s.Id] = !!s.redeploying; });
setRedeploying(map);
} catch (err) { } catch (err) {
console.error("❌ Fehler beim Abrufen der Stacks:", err); console.error("❌ Fehler beim Abrufen der Stacks:", err);
setError("Fehler beim Laden der Stacks"); setError("Fehler beim Laden der Stacks");
@@ -49,60 +71,71 @@ export default function Stacks() {
fetchStacks(); fetchStacks();
}, []); }, []);
// Redeploy eines Stacks // -------------------------
// Redeploy Trigger
// -------------------------
const handleRedeploy = async (stackId) => { const handleRedeploy = async (stackId) => {
// sofort UI-Feedback
setRedeploying(prev => ({ ...prev, [stackId]: true })); setRedeploying(prev => ({ ...prev, [stackId]: true }));
try { try {
await axios.put(`/api/stacks/${stackId}/redeploy`); await axios.put(`/api/stacks/${stackId}/redeploy`);
// kein sofortiges setRedeploying(false) Backend sendet das finale Event
} catch (err) { } catch (err) {
console.error("❌ Fehler beim Redeploy:", err); console.error("❌ Fehler beim Redeploy:", err);
// Fehlerfall: wieder auf false setzen damit UI nicht hängen bleibt
setRedeploying(prev => ({ ...prev, [stackId]: false })); setRedeploying(prev => ({ ...prev, [stackId]: false }));
} }
}; };
// -------------------------
// Render
// -------------------------
if (loading) return <p className="text-gray-400">Lade Stacks...</p>; if (loading) return <p className="text-gray-400">Lade Stacks...</p>;
if (error) return <p className="text-red-400">{error}</p>; if (error) return <p className="text-red-400">{error}</p>;
return ( return (
<div className="grid grid-cols-1 md:grid-cols-2 gap-6 p-6"> <div className="grid grid-cols-1 md:grid-cols-2 gap-6 p-6">
{stacks.map(stack => { {stacks.map(stack => {
const isRedeploying = redeploying[stack.Id] || false; const isRedeploying = Boolean(redeploying[stack.Id]);
const isUpToDate = stack.updateStatus === "✅";
return ( return (
<div <div
key={stack.Id} key={stack.Id}
// wenn redeploying -> "gedämpfter" Container (sichtbar deaktiviert)
className={`flex justify-between items-center p-5 rounded-xl shadow-lg transition className={`flex justify-between items-center p-5 rounded-xl shadow-lg transition
${isRedeploying ? "bg-gray-700 cursor-not-allowed" : "bg-gray-800 hover:bg-gray-700"}`} ${isRedeploying ? "bg-gray-700 opacity-60" : "bg-gray-800 hover:bg-gray-700"}`}
aria-disabled={isRedeploying}
> >
<div className="flex items-center space-x-4"> <div className="flex items-center space-x-4">
{/* Status Indicator */}
<div className={`w-12 h-12 flex items-center justify-center rounded-full <div className={`w-12 h-12 flex items-center justify-center rounded-full
${stack.updateStatus === "✅" ? "bg-green-500" : ${stack.updateStatus === "✅" ? "bg-green-500" :
stack.updateStatus === "⚠️" ? "bg-yellow-500" : stack.updateStatus === "⚠️" ? "bg-yellow-500" :
"bg-red-500"}`} "bg-red-500"}`}
> />
</div>
<div> <div>
<p className="text-lg font-semibold text-white">{stack.Name}</p> <p className="text-lg font-semibold text-white">{stack.Name}</p>
<p className="text-sm text-gray-400">ID: {stack.Id}</p> <p className="text-sm text-gray-400">ID: {stack.Id}</p>
</div> </div>
</div> </div>
{!isUpToDate && ( {/* Button ist jetzt immer sichtbar */}
<button <button
onClick={() => handleRedeploy(stack.Id)} onClick={() => handleRedeploy(stack.Id)}
disabled={isRedeploying} disabled={isRedeploying}
className={`px-5 py-2 rounded-lg font-medium transition className={`px-5 py-2 rounded-lg font-medium transition
${isRedeploying ? "bg-orange-500 cursor-not-allowed" : "bg-blue-500 hover:bg-blue-600"}`} ${isRedeploying
> ? "bg-orange-500 cursor-not-allowed"
{isRedeploying ? "Redeploying" : "Redeploy"} : "bg-blue-500 hover:bg-blue-600"}`}
</button> // Browser-Default Disabled-Opacity überschreiben
)} style={isRedeploying ? { opacity: 1 } : {}}
>
{isRedeploying ? "Redeploying…" : "Redeploy"}
</button>
</div> </div>
); );
})} })}
{stacks.length === 0 && <p className="text-gray-400">Keine Stacks gefunden.</p>} {stacks.length === 0 && <p className="text-gray-400">Keine Stacks gefunden.</p>}
</div> </div>
); );
+109
View File
@@ -0,0 +1,109 @@
import React, { useEffect, useState } from "react";
import axios from "axios";
import { io } from "socket.io-client";
export default function Stacks() {
const [stacks, setStacks] = useState([]);
const [loading, setLoading] = useState(true);
const [error, setError] = useState("");
const [redeploying, setRedeploying] = useState({});
// WebSocket initialisieren
useEffect(() => {
const socket = io("/");
console.log("Socket connected");
socket.on("redeployStatus", async ({ stackId, status }) => {
setRedeploying(prev => ({ ...prev, [stackId]: status }));
// Wenn Redeploy beendet, Stack-Status neu laden
if (!status) {
try {
const res = await axios.get("/api/stacks");
const sortedStacks = res.data.sort((a, b) => a.Name.localeCompare(b.Name));
setStacks(sortedStacks);
} catch (err) {
console.error("Fehler beim Aktualisieren des Status nach Redeploy:", err);
}
}
});
return () => socket.disconnect();
}, []);
// Stacks initial laden
const fetchStacks = async () => {
try {
const res = await axios.get("/api/stacks");
const sortedStacks = res.data.sort((a, b) => a.Name.localeCompare(b.Name));
setStacks(sortedStacks);
} catch (err) {
console.error("❌ Fehler beim Abrufen der Stacks:", err);
setError("Fehler beim Laden der Stacks");
} finally {
setLoading(false);
}
};
useEffect(() => {
fetchStacks();
}, []);
// Redeploy eines Stacks
const handleRedeploy = async (stackId) => {
setRedeploying(prev => ({ ...prev, [stackId]: true }));
try {
await axios.put(`/api/stacks/${stackId}/redeploy`);
} catch (err) {
console.error("❌ Fehler beim Redeploy:", err);
setRedeploying(prev => ({ ...prev, [stackId]: false }));
}
};
if (loading) return <p className="text-gray-400">Lade Stacks...</p>;
if (error) return <p className="text-red-400">{error}</p>;
return (
<div className="grid grid-cols-1 md:grid-cols-2 gap-6 p-6">
{stacks.map(stack => {
const isRedeploying = redeploying[stack.Id] || false;
const isUpToDate = stack.updateStatus === "✅";
return (
<div
key={stack.Id}
className={`flex justify-between items-center p-5 rounded-xl shadow-lg transition
${isRedeploying ? "bg-gray-700 cursor-not-allowed" : "bg-gray-800 hover:bg-gray-700"}`}
>
<div className="flex items-center space-x-4">
{/* Status Indicator */}
<div className={`w-12 h-12 flex items-center justify-center rounded-full
${stack.updateStatus === "✅" ? "bg-green-500" :
stack.updateStatus === "⚠️" ? "bg-yellow-500" :
"bg-red-500"}`}
>
</div>
<div>
<p className="text-lg font-semibold text-white">{stack.Name}</p>
<p className="text-sm text-gray-400">ID: {stack.Id}</p>
</div>
</div>
{!isUpToDate && (
<button
onClick={() => handleRedeploy(stack.Id)}
disabled={isRedeploying}
className={`px-5 py-2 rounded-lg font-medium transition
${isRedeploying ? "bg-orange-500 cursor-not-allowed" : "bg-blue-500 hover:bg-blue-600"}`}
>
{isRedeploying ? "Redeploying" : "Redeploy"}
</button>
)}
</div>
);
})}
{stacks.length === 0 && <p className="text-gray-400">Keine Stacks gefunden.</p>}
</div>
);
}
Regular → Executable
+4 -26
View File
@@ -2,8 +2,8 @@
set -e set -e
# --- Konfiguration --- # --- Konfiguration ---
GHCR_USERNAME="<dein-github-username>" GHCR_USERNAME="mboehmlaender"
REPO_NAME="<dein-repo-name>" REPO_NAME="stackpulse"
# --- Branch prüfen --- # --- Branch prüfen ---
BRANCH=$(git rev-parse --abbrev-ref HEAD) BRANCH=$(git rev-parse --abbrev-ref HEAD)
@@ -14,32 +14,10 @@ fi
# --- Versionsnummer abfragen --- # --- Versionsnummer abfragen ---
while true; do while true; do
read -p "Bitte Versionsnummer für das Release eingeben (z.B. v0.2.0): " VERSION_TAG read -p "Bitte Versionsnummer für das Docker-Image eingeben (z.B. v0.1): " VERSION_TAG
if [[ -n "$VERSION_TAG" ]]; then break; else echo "Versionsnummer darf nicht leer sein."; fi if [[ -n "$VERSION_TAG" ]]; then break; else echo "Versionsnummer darf nicht leer sein."; fi
done done
# --- Git: Pull und Merge sicherstellen ---
git pull origin master
# --- Git: Commit ausstehender Änderungen ---
git add .
read -p "Commit-Nachricht eingeben (default: 'Release $VERSION_TAG'): " COMMIT_MSG
COMMIT_MSG=${COMMIT_MSG:-"Release $VERSION_TAG"}
git commit -m "$COMMIT_MSG" || echo "Keine Änderungen zum Committen."
# --- Git: Tag setzen ---
if git rev-parse "$VERSION_TAG" >/dev/null 2>&1; then
echo "Tag $VERSION_TAG existiert bereits. Bitte zuerst löschen oder neuen Tag wählen."
exit 1
fi
git tag -a "$VERSION_TAG" -m "Release $VERSION_TAG"
# --- Git: Push master + Tag ---
git push origin master
git push origin "$VERSION_TAG"
echo "Tag $VERSION_TAG gesetzt und auf master gepusht."
# --- Docker: Login --- # --- Docker: Login ---
if [ -z "$CR_PAT" ]; then if [ -z "$CR_PAT" ]; then
echo "CR_PAT (GitHub Token) nicht gesetzt! Bitte export CR_PAT=<token>" echo "CR_PAT (GitHub Token) nicht gesetzt! Bitte export CR_PAT=<token>"
@@ -55,4 +33,4 @@ docker tag ghcr.io/$GHCR_USERNAME/$REPO_NAME:$VERSION_TAG ghcr.io/$GHCR_USERNAME
docker push ghcr.io/$GHCR_USERNAME/$REPO_NAME:$VERSION_TAG docker push ghcr.io/$GHCR_USERNAME/$REPO_NAME:$VERSION_TAG
docker push ghcr.io/$GHCR_USERNAME/$REPO_NAME:latest docker push ghcr.io/$GHCR_USERNAME/$REPO_NAME:latest
echo "Release $VERSION_TAG erfolgreich auf master + GHCR gepusht!" echo "Docker-Release $VERSION_TAG erfolgreich gebaut und zu GHCR gepusht!"