mirror of
https://github.com/BetterCorp/BetterFrame.git
synced 2026-05-26 23:26:34 +00:00
66653af360
Adds tenant management for PostgreSQL deployments. Each tenant gets its own PG schema (tenant_<slug>) with a full set of BetterFrame tables. SQLite deployments stay single-tenant with no behavior change. Key changes: - Run PUBLIC_MIGRATIONS (tenants + global_admins tables) during PG init - Auto-create "default" tenant (schema=public) on first boot - createTenantSchema() runs TENANT_MIGRATIONS in a new PG schema - DbAdapter.setSearchPath() for per-request schema switching (PG) - Tenant CRUD in Repository (listTenants, create, update, delete) - Middleware resolves bf_tenant cookie and sets search_path per request - Admin UI: /admin/tenants with CRUD + tenant switching via cookie - Tenant dropdown in topbar (Layout) when >1 tenant exists - Tenant nav item in sidebar Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
299 lines
13 KiB
TypeScript
299 lines
13 KiB
TypeScript
/**
|
|
* Base HTML layout for all admin pages.
|
|
* Server-side rendered via jsx-htmx — returns string.
|
|
*/
|
|
import { css, js } from "jsx-htmx";
|
|
import { serverVersion } from "../shared/version.js";
|
|
import type { Tenant } from "../shared/types.js";
|
|
|
|
// ---- Shared types -----------------------------------------------------------
|
|
|
|
export interface PageProps {
|
|
title: string;
|
|
/** Username shown in navbar; omit for unauthenticated pages. */
|
|
user?: string;
|
|
/** If true, hide the sidebar nav (used for login/setup). */
|
|
minimal?: boolean;
|
|
/** Optional flash message. */
|
|
flash?: { type: "success" | "error" | "info"; message: string };
|
|
/** Active nav item key. */
|
|
activeNav?: string;
|
|
/** Available tenants for tenant switcher (PG multi-tenant only). */
|
|
tenants?: Tenant[];
|
|
/** Currently selected tenant slug. */
|
|
currentTenantSlug?: string;
|
|
children?: string | string[];
|
|
}
|
|
|
|
// ---- Components -------------------------------------------------------------
|
|
|
|
function NavItem(props: { href: string; label: string; icon: string; active?: boolean }) {
|
|
return (
|
|
<a
|
|
href={props.href}
|
|
class={`nav-item${props.active ? " active" : ""}`}
|
|
>
|
|
<span class="nav-icon">{props.icon}</span>
|
|
{props.label}
|
|
</a>
|
|
);
|
|
}
|
|
|
|
function Sidebar(props: { activeNav?: string }) {
|
|
const a = props.activeNav;
|
|
return (
|
|
<aside class="sidebar">
|
|
<div class="sidebar-brand">
|
|
<img src="/static/betterframe-mark.svg" alt="" class="brand-mark" />
|
|
<strong>BetterFrame</strong>
|
|
</div>
|
|
<nav class="sidebar-nav">
|
|
<NavItem href="/admin/" label="Overview" icon="■" active={a === "overview"} />
|
|
<NavItem href="/admin/health" label="Health" icon="♥" active={a === "health"} />
|
|
<NavItem href="/admin/cameras" label="Cameras" icon="⚫" active={a === "cameras"} />
|
|
<NavItem href="/admin/entities" label="Entities" icon="⚇" active={a === "entities"} />
|
|
<NavItem href="/admin/layouts" label="Layouts" icon="▦" active={a === "layouts"} />
|
|
<NavItem href="/admin/displays" label="Displays" icon="▪" active={a === "displays"} />
|
|
<NavItem href="/admin/kiosks" label="Kiosks" icon="◈" active={a === "kiosks"} />
|
|
<NavItem href="/admin/firmware" label="Firmware" icon="▲" active={a === "firmware"} />
|
|
<NavItem href="/admin/os-updates" label="OS Updates" icon="●" active={a === "os-updates"} />
|
|
<NavItem href="/admin/cloud-accounts" label="Cloud Cams" icon="☁" active={a === "cloud"} />
|
|
<NavItem href="/admin/labels" label="Labels" icon="◆" active={a === "labels"} />
|
|
<NavItem href="/admin/audit" label="Audit" icon="◎" active={a === "audit"} />
|
|
<NavItem href="/admin/backup" label="Backup" icon="☼" active={a === "backup"} />
|
|
<NavItem href="/admin/tenants" label="Tenants" icon="☷" active={a === "tenants"} />
|
|
<hr />
|
|
<NavItem href="/admin/account" label="Account" icon="●" active={a === "account"} />
|
|
<NavItem href="/admin/nodered" label="Node-RED" icon="→" active={a === "nodered"} />
|
|
</nav>
|
|
</aside>
|
|
);
|
|
}
|
|
|
|
// ---- Layout -----------------------------------------------------------------
|
|
|
|
export function Layout(props: PageProps) {
|
|
const version = serverVersion();
|
|
return (
|
|
<html lang="en">
|
|
<head>
|
|
<meta charset="utf-8" />
|
|
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
|
<title>{props.title} — BetterFrame</title>
|
|
<link rel="icon" href="/static/betterframe-mark.svg" type="image/svg+xml" />
|
|
<link rel="stylesheet" href="/static/app.css" />
|
|
<style>{css(baseStyles as Parameters<typeof css>[0])}</style>
|
|
</head>
|
|
<body class={props.minimal ? "minimal" : "has-sidebar"}>
|
|
{!props.minimal && <Sidebar activeNav={props.activeNav} />}
|
|
<div class="main-wrap">
|
|
{!props.minimal && props.user && (
|
|
<header class="topbar">
|
|
<span class="topbar-title">{props.title}</span>
|
|
<div class="topbar-right">
|
|
{props.tenants && props.tenants.length > 1 ? (
|
|
<form method="post" action="/admin/tenants/switch" style="display:inline-flex; align-items:center; gap:0.35rem">
|
|
<label style="font-size:0.8rem; color:#666; white-space:nowrap">Tenant:</label>
|
|
<select
|
|
name="tenant_slug"
|
|
class="form-input"
|
|
style="width:auto; padding:0.25rem 0.5rem; font-size:0.8rem"
|
|
{...{"onchange": "this.form.submit()"}}
|
|
>
|
|
{props.tenants.map((t) => (
|
|
<option value={t.slug} selected={t.slug === props.currentTenantSlug}>
|
|
{t.name}
|
|
</option>
|
|
))}
|
|
</select>
|
|
</form>
|
|
) : props.currentTenantSlug && props.currentTenantSlug !== "default" ? (
|
|
<span class="badge badge-blue" style="font-size:0.75rem">
|
|
tenant: {props.currentTenantSlug}
|
|
</span>
|
|
) : null}
|
|
<span class="topbar-user">{props.user}</span>
|
|
<form method="post" action="/auth/logout" style="display:inline">
|
|
<button type="submit" class="btn btn-sm btn-ghost">Logout</button>
|
|
</form>
|
|
</div>
|
|
</header>
|
|
)}
|
|
{props.flash && (
|
|
<div class={`flash flash-${props.flash.type}`}>{props.flash.message}</div>
|
|
)}
|
|
<main class="content">{props.children}</main>
|
|
{!props.minimal && (
|
|
<footer class="app-footer">
|
|
<span>Copyright BetterCorp (PTY) Ltd 2016 - 2026 - All Rights Reserved</span>
|
|
<span>Server: <code>{version}</code></span>
|
|
</footer>
|
|
)}
|
|
</div>
|
|
<script src="/static/htmx.min.js"></script>
|
|
</body>
|
|
</html>
|
|
);
|
|
}
|
|
|
|
/** Minimal centered layout for login/setup pages. */
|
|
export function MinimalLayout(props: { title: string; flash?: PageProps["flash"]; children?: string | string[] }) {
|
|
return (
|
|
<Layout title={props.title} minimal flash={props.flash}>
|
|
<div class="center-card">
|
|
<div class="card">
|
|
<img src="/static/betterframe-logo.svg" alt="BetterFrame" class="auth-logo" />
|
|
<h1 class="card-title">{props.title}</h1>
|
|
{props.children}
|
|
</div>
|
|
</div>
|
|
</Layout>
|
|
);
|
|
}
|
|
|
|
// ---- Styles -----------------------------------------------------------------
|
|
|
|
const baseStyles = {
|
|
"*, *::before, *::after": { boxSizing: "border-box" as const },
|
|
body: {
|
|
margin: "0",
|
|
fontFamily: "system-ui, -apple-system, sans-serif",
|
|
backgroundColor: "#f4f5f7",
|
|
color: "#1a1a2e",
|
|
fontSize: "14px",
|
|
lineHeight: "1.5",
|
|
},
|
|
"a": { color: "#2563eb", textDecoration: "none" },
|
|
"a:hover": { textDecoration: "underline" },
|
|
".has-sidebar": { display: "grid", gridTemplateColumns: "220px 1fr", minHeight: "100vh" },
|
|
".sidebar": {
|
|
backgroundColor: "#1a1a2e",
|
|
color: "#e0e0e0",
|
|
display: "flex",
|
|
flexDirection: "column",
|
|
position: "sticky" as const,
|
|
top: "0",
|
|
height: "100vh",
|
|
overflowY: "auto" as const,
|
|
},
|
|
".sidebar-brand": {
|
|
display: "flex",
|
|
alignItems: "center",
|
|
gap: "0.65rem",
|
|
padding: "1rem",
|
|
fontSize: "1.1rem",
|
|
borderBottom: "1px solid #2a2a4e",
|
|
},
|
|
".brand-mark": { width: "2rem", height: "2rem", display: "block", flex: "0 0 auto" },
|
|
".sidebar-nav": { padding: "0.5rem 0", display: "flex", flexDirection: "column", gap: "2px" },
|
|
".nav-item": {
|
|
display: "flex",
|
|
alignItems: "center",
|
|
gap: "0.5rem",
|
|
padding: "0.5rem 1rem",
|
|
color: "#c0c0d0",
|
|
textDecoration: "none",
|
|
fontSize: "0.875rem",
|
|
borderRadius: "0",
|
|
},
|
|
".nav-item:hover": { backgroundColor: "#2a2a4e", color: "#fff", textDecoration: "none" },
|
|
".nav-item.active": { backgroundColor: "#2563eb", color: "#fff" },
|
|
".nav-icon": { fontSize: "0.75rem", width: "1.25rem", textAlign: "center" as const },
|
|
".sidebar hr": { border: "none", borderTop: "1px solid #2a2a4e", margin: "0.5rem 0" },
|
|
".topbar": {
|
|
display: "flex",
|
|
justifyContent: "space-between",
|
|
alignItems: "center",
|
|
padding: "0.75rem 1.5rem",
|
|
backgroundColor: "#fff",
|
|
borderBottom: "1px solid #e0e0e0",
|
|
},
|
|
".topbar-title": { fontWeight: "600", fontSize: "1rem" },
|
|
".topbar-right": { display: "flex", alignItems: "center", gap: "0.75rem" },
|
|
".topbar-user": { color: "#666", fontSize: "0.85rem" },
|
|
".main-wrap": { display: "flex", flexDirection: "column", minHeight: "100vh" },
|
|
".content": { flex: "1", padding: "1.5rem" },
|
|
".app-footer": {
|
|
display: "flex",
|
|
justifyContent: "space-between",
|
|
gap: "1rem",
|
|
padding: "0.75rem 1.5rem",
|
|
color: "#666",
|
|
fontSize: "0.8rem",
|
|
borderTop: "1px solid #e0e0e0",
|
|
backgroundColor: "#fff",
|
|
},
|
|
".app-footer code": { color: "#374151", fontSize: "0.8rem" },
|
|
".minimal .content": { display: "flex", justifyContent: "center", alignItems: "center", minHeight: "100vh" },
|
|
".center-card": { width: "100%", maxWidth: "420px" },
|
|
".auth-logo": { display: "block", width: "220px", maxWidth: "100%", height: "auto", margin: "0 0 1.25rem" },
|
|
".card": {
|
|
backgroundColor: "#fff",
|
|
borderRadius: "8px",
|
|
boxShadow: "0 1px 3px rgba(0,0,0,0.1)",
|
|
padding: "1.5rem",
|
|
},
|
|
".card-title": { margin: "0 0 1.25rem", fontSize: "1.25rem", fontWeight: "600" },
|
|
".form-group": { marginBottom: "1rem" },
|
|
".form-group label": { display: "block", marginBottom: "0.25rem", fontWeight: "500", fontSize: "0.85rem" },
|
|
".form-input": {
|
|
width: "100%",
|
|
padding: "0.5rem 0.75rem",
|
|
border: "1px solid #d0d0d0",
|
|
borderRadius: "4px",
|
|
fontSize: "0.9rem",
|
|
backgroundColor: "#fff",
|
|
},
|
|
".form-input:focus": { outline: "none", borderColor: "#2563eb", boxShadow: "0 0 0 2px rgba(37,99,235,0.15)" },
|
|
".form-hint": { fontSize: "0.8rem", color: "#666", marginTop: "0.25rem" },
|
|
".form-error": { fontSize: "0.8rem", color: "#dc2626", marginTop: "0.25rem" },
|
|
".btn": {
|
|
display: "inline-flex",
|
|
alignItems: "center",
|
|
justifyContent: "center",
|
|
padding: "0.5rem 1rem",
|
|
borderRadius: "4px",
|
|
border: "none",
|
|
cursor: "pointer",
|
|
fontSize: "0.9rem",
|
|
fontWeight: "500",
|
|
textDecoration: "none",
|
|
gap: "0.5rem",
|
|
},
|
|
".btn-primary": { backgroundColor: "#2563eb", color: "#fff" },
|
|
".btn-primary:hover": { backgroundColor: "#1d4ed8" },
|
|
".btn-success": { backgroundColor: "#16a34a", color: "#fff" },
|
|
".btn-success:hover": { backgroundColor: "#15803d" },
|
|
".btn-danger": { backgroundColor: "#dc2626", color: "#fff" },
|
|
".btn-danger:hover": { backgroundColor: "#b91c1c" },
|
|
".btn-ghost": { backgroundColor: "transparent", color: "#666", border: "1px solid #d0d0d0" },
|
|
".btn-ghost:hover": { backgroundColor: "#f0f0f0" },
|
|
".btn-sm": { padding: "0.25rem 0.5rem", fontSize: "0.8rem" },
|
|
".btn-block": { width: "100%", justifyContent: "center" },
|
|
".flash": { padding: "0.75rem 1rem", borderRadius: "4px", marginBottom: "1rem", fontSize: "0.9rem" },
|
|
".flash-success": { backgroundColor: "#d1fae5", color: "#065f46", border: "1px solid #6ee7b7" },
|
|
".flash-error": { backgroundColor: "#fee2e2", color: "#991b1b", border: "1px solid #fca5a5" },
|
|
".flash-info": { backgroundColor: "#dbeafe", color: "#1e40af", border: "1px solid #93c5fd" },
|
|
".stats-grid": { display: "grid", gridTemplateColumns: "repeat(auto-fit, minmax(180px, 1fr))", gap: "1rem", marginBottom: "1.5rem" },
|
|
".stat-card": { backgroundColor: "#fff", borderRadius: "8px", padding: "1.25rem", boxShadow: "0 1px 3px rgba(0,0,0,0.08)" },
|
|
".stat-label": { fontSize: "0.8rem", color: "#666", textTransform: "uppercase" as const, letterSpacing: "0.05em" },
|
|
".stat-value": { fontSize: "1.75rem", fontWeight: "700", marginTop: "0.25rem" },
|
|
".table-wrap": { backgroundColor: "#fff", borderRadius: "8px", overflow: "hidden", boxShadow: "0 1px 3px rgba(0,0,0,0.08)" },
|
|
table: { width: "100%", borderCollapse: "collapse" as const },
|
|
"th, td": { textAlign: "left" as const, padding: "0.75rem 1rem", borderBottom: "1px solid #eee" },
|
|
th: { backgroundColor: "#f9fafb", fontWeight: "600", fontSize: "0.8rem", textTransform: "uppercase" as const, letterSpacing: "0.05em", color: "#666" },
|
|
"tr:hover td": { backgroundColor: "#f9fafb" },
|
|
".badge": { display: "inline-block", padding: "0.15rem 0.5rem", borderRadius: "12px", fontSize: "0.75rem", fontWeight: "500" },
|
|
".badge-green": { backgroundColor: "#d1fae5", color: "#065f46" },
|
|
".badge-gray": { backgroundColor: "#e5e7eb", color: "#374151" },
|
|
".badge-blue": { backgroundColor: "#dbeafe", color: "#1e40af" },
|
|
".badge-red": { backgroundColor: "#fee2e2", color: "#991b1b" },
|
|
".section-header": { display: "flex", justifyContent: "space-between", alignItems: "center", marginBottom: "1rem" },
|
|
".section-title": { fontSize: "1rem", fontWeight: "600", margin: "0" },
|
|
".radio-group": { display: "flex", gap: "1rem", marginBottom: "0.5rem" },
|
|
".radio-group label": { display: "flex", alignItems: "center", gap: "0.35rem", fontWeight: "400", cursor: "pointer" },
|
|
".two-col": { display: "grid", gridTemplateColumns: "1fr 1fr", gap: "1.5rem" },
|
|
"@media (max-width: 768px)": { ".two-col": { gridTemplateColumns: "1fr" } },
|
|
".code-grid": { display: "grid", gridTemplateColumns: "repeat(2, 1fr)", gap: "0.5rem", fontFamily: "monospace", fontSize: "1rem" },
|
|
".code-item": { padding: "0.5rem", backgroundColor: "#f9fafb", borderRadius: "4px", textAlign: "center" as const },
|
|
};
|