Refactored Frontend with gemini

This commit is contained in:
simon 2026-02-08 19:11:24 +01:00
parent 2fd19db88d
commit f4f3c695af
3 changed files with 289 additions and 339 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 130 KiB

View File

@ -1,10 +1,10 @@
<!doctype html>
<html>
<head>
<link href="www/bootstrap.min.css" rel="stylesheet" />
<script src="www/bootstrap.bundle.min.js"></script>
<script defer src="www/alpinejs.min.js"></script>
<script defer src="www/windows.js"></script>
<link href="bootstrap.min.css" rel="stylesheet" />
<script src="bootstrap.bundle.min.js"></script>
<script defer src="windows.js"></script>
<script defer src="alpinejs.min.js"></script>
<style>
[x-cloak] {
@ -13,197 +13,118 @@
body {
background-color: #f8f9fa;
/* Create 20px x 20px Grid */
background-image:
linear-gradient(90deg, rgba(0, 0, 0, 0.03) 1px, transparent 1px),
linear-gradient(rgba(0, 0, 0, 0.03) 1px, transparent 1px);
background-size: 20px 20px;
height: 100vh;
margin: 0;
padding-top: 56px; /* Space for navbar */
overflow: hidden;
}
.draggable-card {
width: 450px;
z-index: 1000;
user-select: none;
}
.drag-handle {
cursor: move;
}
.card {
transition:
width 0.1s ease,
height 0.1s ease,
left 0.1s ease,
top 0.1s ease;
}
.card[style*="cursor: move"] {
transition: none;
}
.navbar {
z-index: 2000; /* Above windows */
}
.ws-indicator {
width: 12px;
height: 12px;
border: 1px solid rgba(255, 255, 255, 0.3);
transition: all 0.3s ease;
}
.glow-success {
box-shadow: 0 0 10px #198754;
}
.glow-danger {
box-shadow: 0 0 10px #dc3545;
}
</style>
<script>
document.addEventListener("alpine:init", () => {
Alpine.store("ui", {
topZ: 1000,
getNewZ() {
return ++this.topZ;
},
Alpine.store("sys", {
ws_connected: false,
adapters: ["/dev/ttyUSB0"],
selected_adapter: "",
baudrates: ["115200", "916000"],
selected_baudrate: "",
uart_connected: false,
});
Alpine.store("adapters", ["can0", "can1", "vcan0"]);
Alpine.store("selected_adapter", "");
Alpine.store("selected_bitrate", "");
Alpine.store("can_connected", false);
});
</script>
<script>
let socket = new WebSocket("ws://localhost:8000/echo");
let socket;
socket.onopen = function (e) {
function connectWS() {
socket = new WebSocket("ws://" + window.location.host + "/ws");
socket.onopen = () => {
console.log("[open] Connection established");
console.log("Sending to server");
Alpine.store("sys").ws_connected = true;
};
socket.onmessage = function (event) {
console.log(`[message] Data received from server: ${event.data}`);
let mes;
socket.onmessage = (event) => {
try {
mes = JSON.parse(event.data);
} catch {
mes = null;
let mes = JSON.parse(event.data);
if (mes && mes.cmd === "value") {
Alpine.store(mes.name, mes.value);
}
if (mes != null) {
handleCommand(mes);
} else {
console.log(`${event.data} is not valid JSON`);
} catch (e) {
console.log("Invalid JSON:", event.data);
}
};
socket.onclose = function (event) {
if (event.wasClean) {
alert(
`[close] Connection closed cleanly, code=${event.code} reason=${event.reason}`,
);
} else {
// e.g. server process killed or network down
// event.code is usually 1006 in this case
socket.onclose = () => {
console.log("[close] Connection died");
}
Alpine.store("sys").ws_connected = false;
setTimeout(connectWS, 2000);
};
socket.onerror = function (error) {
console.log(`[error]`);
socket.onerror = (error) => {
console.log("[error]");
socket.close();
};
}
function handleCommand(command) {
switch (command.cmd) {
case "value":
console.log("CHANGE VALUE");
Alpine.store(command.name, command.value);
break;
}
}
connectWS();
</script>
</head>
<body>
<h1>Alox Debug Tool</h1>
<body x-data>
<!-- Top Navbar -->
<nav class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top shadow">
<div class="container-fluid">
<a class="navbar-brand fw-bold" href="#">
<span class="text-primary">Alox</span> Debug Tool
</a>
<div class="d-flex align-items-center gap-2">
<span class="text-light small opacity-75">Websocket:</span>
<div
x-data="windowBox('window_id' ,100, 100)"
@mousemove.window="onDrag"
@mouseup.window="stopDrag"
@mousedown="focus"
class="card shadow-lg position-absolute"
:class="{ 'w-100 h-100 m-0 shadow-none': fullscreen }"
:style="`left: ${pos.x}px; top: ${pos.y}px; z-index: ${zIndex}; width: ${fullscreen ? '100vw' : '400px'};`"
x-cloak
>
<div
class="card-header bg-dark text-white d-flex justify-content-between align-items-center drag-handle"
@mousedown="startDrag"
@dblclick="toggleFullscreen"
>
<h6 class="mb-0">CAN Interface</h6>
<div class="d-flex align-items-center gap-1">
<span
class="badge me-1"
:class="socket.readyState === 1 ? 'bg-success' : 'bg-danger'"
>WS</span
>
<button
class="btn btn-sm btn-outline-light py-0 px-2"
@click="toggleFullscreen"
>
<span></span>
</button>
<button
class="btn btn-sm btn-outline-light py-0 px-2"
@click="minimized = !minimized"
>
<span x-text="minimized ? '+' : ''"></span>
</button>
class="rounded-circle ws-indicator"
:class="$store.sys.ws_connected ? 'bg-success glow-success' : 'bg-danger glow-danger'"
></div>
</div>
</div>
</nav>
<div x-show="!minimized" class="flex-grow-1 overflow-auto">
<div class="card-body">
<p>HIER DER INHALT DER COMPONENT</p>
</div>
</div>
</div>
<div
x-data="windowBox('can_config', 100, 100)"
@mousemove.window="onDrag"
@mouseup.window="stopDrag"
@mousedown="focus"
class="card shadow-lg position-absolute"
:class="{ 'w-100 h-100 m-0 shadow-none': fullscreen }"
:style="`left: ${pos.x}px; top: ${pos.y}px; z-index: ${zIndex}; width: ${fullscreen ? '100vw' : '400px'};`"
x-cloak
<!-- UART Configuration Window -->
<yet-window
id="uart_config"
title="UART Configuration"
x="50"
y="80"
width="400px"
>
<div
class="card-header bg-dark text-white d-flex justify-content-between align-items-center drag-handle"
@mousedown="startDrag"
@dblclick="toggleFullscreen"
>
<h6 class="mb-0">CAN Interface</h6>
<div class="d-flex align-items-center gap-1">
<span
class="badge me-1"
:class="socket.readyState === 1 ? 'bg-success' : 'bg-danger'"
>WS</span
>
<button
class="btn btn-sm btn-outline-light py-0 px-2"
@click="toggleFullscreen"
>
<span></span>
</button>
<button
class="btn btn-sm btn-outline-light py-0 px-2"
@click="minimized = !minimized"
>
<span x-text="minimized ? '+' : ''"></span>
</button>
</div>
</div>
<div x-show="!minimized" class="flex-grow-1 overflow-auto">
<div class="card-body">
<label class="form-label small fw-bold text-uppercase text-muted"
>Interface</label
>
@ -216,23 +137,18 @@
class="btn btn-outline-secondary dropdown-toggle"
type="button"
@click="open = !open"
:disabled="$store.can_connected"
:disabled="$store.sys.uart_connected"
>
Adapter
</button>
<ul
class="dropdown-menu"
:class="{ 'show': open }"
x-show="open"
style="display: block"
>
<template x-for="adapter in $store.adapters">
<ul class="dropdown-menu" :class="{ 'show': open }" x-show="open">
<template x-for="adapter in $store.sys.adapters">
<li>
<button
class="dropdown-item"
type="button"
x-text="adapter"
@click="$store.selected_adapter = adapter; open = false"
@click="$store.sys.selected_adapter = adapter; open = false"
></button>
</li>
</template>
@ -241,12 +157,12 @@
type="text"
class="form-control bg-light"
readonly
:value="$store.selected_adapter || 'Select Interface...'"
:value="$store.sys.selected_adapter || 'Select Interface...'"
/>
</div>
<label class="form-label small fw-bold text-uppercase text-muted"
>Bitrate (kbps)</label
>Baudrate</label
>
<div
class="input-group mb-4"
@ -257,25 +173,18 @@
class="btn btn-outline-secondary dropdown-toggle"
type="button"
@click="open = !open"
:disabled="$store.can_connected"
:disabled="$store.sys.uart_connected"
>
Speed
</button>
<ul
class="dropdown-menu"
:class="{ 'show': open }"
x-show="open"
style="display: block"
>
<template
x-for="rate in ['10', '20', '50', '100', '125', '250', '500', '800', '1000']"
>
<ul class="dropdown-menu" :class="{ 'show': open }" x-show="open">
<template x-for="rate in $store.sys.baudrates">
<li>
<button
class="dropdown-item"
type="button"
x-text="rate + ' kbps'"
@click="$store.selected_bitrate = rate; open = false"
x-text="rate"
@click="$store.sys.selected_baudrate = rate; open = false"
></button>
</li>
</template>
@ -284,23 +193,22 @@
type="text"
class="form-control bg-light"
readonly
:value="$store.selected_bitrate ? $store.selected_bitrate + ' kbps' : 'Select Speed...'"
:value="$store.sys.selected_baudrate || 'Select Baudrate...'"
/>
</div>
<div class="d-grid">
<button
x-show="!$store.can_connected"
x-show="!$store.sys.uart_connected"
class="btn btn-primary btn-lg"
type="button"
:disabled="!$store.selected_adapter || !$store.selected_bitrate"
@click="socket.send(JSON.stringify({cmd: 'connect', adapter: $store.selected_adapter, bitrate: parseInt($store.selected_bitrate)}))"
:disabled="!$store.sys.selected_adapter || !$store.sys.selected_baudrate"
@click="socket.send(JSON.stringify({cmd: 'connect', adapter: $store.sys.selected_adapter, baudrate: parseInt($store.sys.selected_baudrate)}))"
>
Connect to CAN
Connect to UART
</button>
<button
x-show="$store.can_connected"
x-show="$store.sys.uart_connected"
x-cloak
class="btn btn-danger btn-lg"
type="button"
@ -309,41 +217,25 @@
Disconnect
</button>
</div>
</div>
</div>
</div>
</yet-window>
<div
x-data="windowBox('can_log', 500, 50)"
@mousemove.window="onDrag"
@mouseup.window="stopDrag"
@mousedown="focus"
class="card shadow-lg position-absolute draggable-card"
:style="`left: ${pos.x}px; top: ${pos.y}px; z-index: ${zIndex}; width: ${fullscreen ? '100vw' : '500px'};`"
x-cloak
<!-- UART Log Window -->
<yet-window
id="uart_log"
title="UART Log"
x="500"
y="80"
width="550px"
header-class="bg-primary text-white"
>
<div
class="card-header bg-primary text-white d-flex justify-content-between align-items-center drag-handle"
@mousedown="startDrag"
class="bg-dark text-success font-monospace small p-2 rounded shadow-inner"
style="height: 400px; overflow-y: auto"
>
<h6 class="mb-0">📜 CAN Log</h6>
<div class="d-flex gap-1">
<button
class="btn btn-sm btn-outline-light py-0"
@click="toggleMinimize"
>
<span x-text="minimized ? '+' : ''"></span>
</button>
</div>
</div>
<div
x-show="!minimized"
class="card-body bg-dark text-success font-monospace small"
style="height: 200px; overflow-y: auto"
>
<div>[0.001] ID: 0x123 Data: FF AA 00</div>
<div>[0.005] ID: 0x456 Data: 12 34 56</div>
<div class="text-muted small mt-2">
// UART log data will appear here...
</div>
</div>
</yet-window>
</body>
</html>

View File

@ -1,32 +1,45 @@
function windowBox(id, initialX = 50, initialY = 50) {
// Load saved data or user defaults
const saved = JSON.parse(localStorage.getItem(`win_${id}`)) || {
x: initialX,
y: initialY,
min: false,
};
// windows.js
return {
document.addEventListener("alpine:init", () => {
// 1. Globaler Store for Window Managment
Alpine.store("Yet_WM", {
topZ: 1000,
getNewZ() {
return ++this.topZ;
},
});
Alpine.data("YetWindow", (id, initialX = 50, initialY = 50) => ({
id: id,
pos: { x: saved.x, y: saved.y },
lastPos: { x: saved.x, y: saved.y },
pos: { x: parseInt(initialX), y: parseInt(initialY) },
lastPos: { x: 0, y: 0 },
dragging: false,
minimized: saved.min,
minimized: false,
fullscreen: false,
zIndex: Alpine.store("ui").topZ,
zIndex: 1000,
offset: { x: 0, y: 0 },
init() {
// Move window in viewport when browser is other size
// Lade gespeicherten Zustand (einheitlicher Key: yet_win_)
const saved = JSON.parse(localStorage.getItem(`yet_win_${this.id}`));
if (saved) {
this.pos = { x: saved.x, y: saved.y };
this.minimized = saved.min;
}
this.focus();
this.keepInBounds();
},
focus() {
this.zIndex = Alpine.store("ui").getNewZ();
this.zIndex = Alpine.store("Yet_WM").getNewZ();
},
startDrag(e) {
if (e.target.closest("button") || this.fullscreen) return;
// Verhindert Text-Markierung während des Verschiebens
e.preventDefault();
this.focus();
this.dragging = true;
this.offset.x = e.clientX - this.pos.x;
@ -35,44 +48,19 @@ function windowBox(id, initialX = 50, initialY = 50) {
onDrag(e) {
if (!this.dragging) return;
// Calc new position
let newX = e.clientX - this.offset.x;
let newY = e.clientY - this.offset.y;
// Boundary Check
const margin = 20;
this.pos.x = Math.max(
margin - 350,
Math.min(newX, window.innerWidth - 50),
);
this.pos.x = Math.max(margin - 350, Math.min(newX, window.innerWidth - 50));
this.pos.y = Math.max(0, Math.min(newY, window.innerHeight - 40));
},
stopDrag() {
if (this.dragging) {
this.dragging = false;
this.save();
},
keepInBounds() {
if (this.pos.x > window.innerWidth) this.pos.x = window.innerWidth - 400;
if (this.pos.y > window.innerHeight) this.pos.y = 50;
},
save() {
localStorage.setItem(
`win_${this.id}`,
JSON.stringify({
x: this.pos.x,
y: this.pos.y,
min: this.minimized,
}),
);
},
reset() {
localStorage.removeItem(`win_${this.id}`);
location.reload();
}
},
toggleMinimize() {
@ -82,14 +70,84 @@ function windowBox(id, initialX = 50, initialY = 50) {
toggleFullscreen() {
if (!this.fullscreen) {
this.lastPos = { ...this.pos }; // Save Position
this.lastPos = { ...this.pos };
this.pos = { x: 0, y: 0 };
this.fullscreen = true;
} else {
this.pos = { ...this.lastPos }; // Back to old Position
this.pos = { ...this.lastPos };
this.fullscreen = false;
}
this.focus();
},
};
save() {
localStorage.setItem(
`yet_win_${this.id}`,
JSON.stringify({
x: this.pos.x,
y: this.pos.y,
min: this.minimized,
})
);
},
keepInBounds() {
if (this.pos.x > window.innerWidth) this.pos.x = 50;
if (this.pos.y > window.innerHeight) this.pos.y = 50;
},
}));
});
// Definition der Web Component
class YetWindowElement extends HTMLElement {
connectedCallback() {
const id = this.getAttribute("id") || "win_" + Math.random().toString(36).substr(2, 9);
const title = this.getAttribute("title") || "Window";
const x = this.getAttribute("x") || "50";
const y = this.getAttribute("y") || "50";
const width = this.getAttribute("width") || "450px";
const headerClass = this.getAttribute("header-class") || "bg-dark text-white";
const content = this.innerHTML;
this.innerHTML = `
<div
x-data="YetWindow('${id}', ${x}, ${y})"
@mousemove.window="onDrag"
@mouseup.window="stopDrag"
@mousedown="focus"
class="card shadow-lg position-absolute"
:class="{ 'w-100 h-100 m-0 shadow-none': fullscreen }"
:style="\`left: \${pos.x}px; top: \${pos.y}px; z-index: \${zIndex}; width: \${fullscreen ? '100vw' : '${width}'}; user-select: \${dragging ? 'none' : 'auto'};\`"
x-cloak
>
<div
class="card-header d-flex justify-content-between align-items-center drag-handle ${headerClass}"
@mousedown="startDrag"
@dblclick="toggleFullscreen"
style="user-select: none;"
>
<h6 class="mb-0">${title}</h6>
<div class="d-flex align-items-center gap-1">
<button class="btn btn-sm btn-outline-light py-0 px-2" @click="toggleFullscreen">
<span></span>
</button>
<button class="btn btn-sm btn-outline-light py-0 px-2" @click="toggleMinimize">
<span x-text="minimized ? '+' : ''"></span>
</button>
</div>
</div>
<div x-show="!minimized" class="flex-grow-1 overflow-auto">
<div class="card-body">
${content}
</div>
</div>
</div>
`;
}
}
customElements.define("yet-window", YetWindowElement);