Some style housekeeping
This commit is contained in:
+1
-13
@@ -64,17 +64,7 @@ function ServiceList({
|
||||
);
|
||||
return (
|
||||
<div class="flex flex-col gap-2 mt-4">
|
||||
{/*
|
||||
<input
|
||||
type="search"
|
||||
class="gap-3"
|
||||
placeholder="Filter"
|
||||
className="input"
|
||||
value={searchQuery}
|
||||
onInput={(e) => setSearchQuery(e.currentTarget.value)}
|
||||
/>
|
||||
*/}
|
||||
<label className="input">
|
||||
<label className="input w-full">
|
||||
<svg
|
||||
className="h-[1em] opacity-50"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
@@ -98,8 +88,6 @@ function ServiceList({
|
||||
value={searchQuery}
|
||||
onInput={(e) => setSearchQuery(e.currentTarget.value)}
|
||||
/>
|
||||
<kbd className="kbd kbd-sm">⌘</kbd>
|
||||
<kbd className="kbd kbd-sm">K</kbd>
|
||||
</label>
|
||||
<div class="grid gap-3 mt-2 md:grid-cols-2 lg:grid-cols-3">
|
||||
{filteredServices.map((s) => (
|
||||
|
||||
@@ -1,45 +1,94 @@
|
||||
import { useState } from "preact/hooks";
|
||||
import { createClient } from "@connectrpc/connect";
|
||||
import { createConnectTransport } from "@connectrpc/connect-web";
|
||||
import { Container, Info, Server, X } from "lucide-preact";
|
||||
import { Container, Server, X } from "lucide-preact";
|
||||
import type { Service } from "../gen/homelab/v1/homelab_pb";
|
||||
import { HomelabService, ServiceKind, ServiceOp } from "../gen/homelab/v1/homelab_pb";
|
||||
import {
|
||||
HomelabService,
|
||||
ServiceKind,
|
||||
ServiceOp,
|
||||
} from "../gen/homelab/v1/homelab_pb";
|
||||
|
||||
const client = createClient(HomelabService, createConnectTransport({ baseUrl: "" }));
|
||||
const client = createClient(
|
||||
HomelabService,
|
||||
createConnectTransport({ baseUrl: "" }),
|
||||
);
|
||||
|
||||
/** Бейдж статуса: systemd — active/failed/выключен (not-found = намеренно disabled, не ошибка), docker — агрегат проекта. */
|
||||
function badge(s: Service) {
|
||||
if (s.error) return <span class="badge badge-error badge-sm" title={s.error}>ошибка</span>;
|
||||
if (s.error)
|
||||
return (
|
||||
<span class="badge badge-error badge-sm" title={s.error}>
|
||||
ошибка
|
||||
</span>
|
||||
);
|
||||
if (s.kind === ServiceKind.DOCKER) {
|
||||
if (s.state === "active") return <span class="badge badge-success badge-sm">работает {s.substate}</span>;
|
||||
if (s.state === "partial") return <span class="badge badge-warning badge-sm">частично {s.substate}</span>;
|
||||
if (s.state === "active")
|
||||
return (
|
||||
<span class="badge badge-success badge-sm">работает {s.substate}</span>
|
||||
);
|
||||
if (s.state === "partial")
|
||||
return (
|
||||
<span class="badge badge-warning badge-sm">частично {s.substate}</span>
|
||||
);
|
||||
return <span class="badge badge-ghost badge-sm">остановлен</span>;
|
||||
}
|
||||
if (s.loadState === "not-found") return <span class="badge badge-ghost badge-sm">выключен</span>;
|
||||
if (s.state === "active") return <span class="badge badge-success badge-sm">{s.substate || "активен"}</span>;
|
||||
if (s.state === "failed") return <span class="badge badge-error badge-sm">сбой</span>;
|
||||
if (s.loadState === "not-found")
|
||||
return <span class="badge badge-ghost badge-sm">выключен</span>;
|
||||
if (s.state === "active")
|
||||
return (
|
||||
<span class="badge badge-success badge-sm">
|
||||
{s.substate || "активен"}
|
||||
</span>
|
||||
);
|
||||
if (s.state === "failed")
|
||||
return <span class="badge badge-error badge-sm">сбой</span>;
|
||||
return <span class="badge badge-ghost badge-sm">остановлен</span>;
|
||||
}
|
||||
|
||||
/** Кнопки контроля; вынесены, чтобы переиспользовать на карточке и в модалке. */
|
||||
function Controls({ s, onAct, busy }: { s: Service; onAct: (op: ServiceOp) => void; busy: boolean }) {
|
||||
const disabled = s.kind === ServiceKind.SYSTEMD && s.loadState === "not-found";
|
||||
function Controls({
|
||||
s,
|
||||
onAct,
|
||||
busy,
|
||||
}: {
|
||||
s: Service;
|
||||
onAct: (op: ServiceOp) => void;
|
||||
busy: boolean;
|
||||
}) {
|
||||
const disabled =
|
||||
s.kind === ServiceKind.SYSTEMD && s.loadState === "not-found";
|
||||
const btn = (op: ServiceOp, label: string, title?: string) => (
|
||||
<button class="btn btn-xs btn-outline" disabled={busy || disabled} title={title} onClick={() => onAct(op)}>
|
||||
<button
|
||||
class="btn btn-xs btn-outline"
|
||||
disabled={busy || disabled}
|
||||
title={title}
|
||||
onClick={() => onAct(op)}
|
||||
>
|
||||
{label}
|
||||
</button>
|
||||
);
|
||||
return (
|
||||
<div class="flex flex-wrap gap-2 items-center">
|
||||
{btn(ServiceOp.START, "start")}
|
||||
{btn(ServiceOp.STOP, "stop", "docker stop: контейнер не поднимется при ребуте (unless-stopped)")}
|
||||
{btn(
|
||||
ServiceOp.STOP,
|
||||
"stop",
|
||||
"docker stop: контейнер не поднимется при ребуте (unless-stopped)",
|
||||
)}
|
||||
{btn(ServiceOp.RESTART, "restart")}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
/** Карточка сервиса: systemd-юнит или docker-проект, start/stop/restart через ServiceAction, info — статус-вывод в модалке. */
|
||||
export function ServiceCard({ s, refresh }: { s: Service; refresh: () => void }) {
|
||||
export function ServiceCard({
|
||||
s,
|
||||
refresh,
|
||||
}: {
|
||||
s: Service;
|
||||
refresh: () => void;
|
||||
}) {
|
||||
const [busy, setBusy] = useState(false);
|
||||
const [error, setError] = useState("");
|
||||
const [info, setInfo] = useState<string | null>(null);
|
||||
@@ -66,7 +115,9 @@ export function ServiceCard({ s, refresh }: { s: Service; refresh: () => void })
|
||||
setInfoBusy(true);
|
||||
setError("");
|
||||
try {
|
||||
setInfo((await client.serviceInfo({ name: s.name, kind: s.kind })).output);
|
||||
setInfo(
|
||||
(await client.serviceInfo({ name: s.name, kind: s.kind })).output,
|
||||
);
|
||||
} catch (e) {
|
||||
setError(String(e).replace(/^.*real error: /, ""));
|
||||
} finally {
|
||||
@@ -83,33 +134,34 @@ export function ServiceCard({ s, refresh }: { s: Service; refresh: () => void })
|
||||
|
||||
return (
|
||||
<div class="card bg-base-200 shadow">
|
||||
<div class="card-body p-4 gap-2">
|
||||
<div class="card-body p-4 gap-2" onClick={openInfo}>
|
||||
<div class="flex items-center gap-2">
|
||||
{kindIcon}
|
||||
<span class="font-medium text-sm flex-1 truncate">{s.name}</span>
|
||||
{badge(s)}
|
||||
</div>
|
||||
{error && <div role="alert" class="alert alert-error text-sm py-2">{error}</div>}
|
||||
{error && (
|
||||
<div role="alert" class="alert alert-error text-sm py-2">
|
||||
{error}
|
||||
</div>
|
||||
)}
|
||||
<div class="flex flex-wrap gap-2 items-center">
|
||||
<Controls s={s} onAct={act} busy={busy} />
|
||||
<button
|
||||
class="btn btn-xs btn-ghost btn-square ml-auto"
|
||||
title="status"
|
||||
disabled={infoBusy}
|
||||
onClick={openInfo}
|
||||
>
|
||||
<Info size={14} />
|
||||
</button>
|
||||
</div>
|
||||
{s.containers.length > 0 && (
|
||||
<p class="text-xs text-base-content/50 font-mono break-all">{s.containers.join(", ")}</p>
|
||||
<p class="text-xs text-base-content/50 font-mono break-all">
|
||||
{s.containers.join(", ")}
|
||||
</p>
|
||||
)}
|
||||
</div>
|
||||
|
||||
{info !== null && (
|
||||
<div class="modal modal-open">
|
||||
<div class="modal-box max-w-2xl">
|
||||
<button class="btn btn-sm btn-circle btn-ghost absolute right-2 top-2" onClick={() => setInfo(null)}>
|
||||
<button
|
||||
class="btn btn-sm btn-circle btn-ghost absolute right-2 top-2"
|
||||
onClick={() => setInfo(null)}
|
||||
>
|
||||
<X size={16} />
|
||||
</button>
|
||||
<h3 class="font-bold text-lg flex items-center gap-2">
|
||||
|
||||
Reference in New Issue
Block a user