Skip to content

Agent Mesh

console: clickable stat cards, readable leases, no inline styles

Antonio Ojea2bbcb61641db
diff --git a/cmd/sam-console/public/app.js b/cmd/sam-console/public/app.js
index 5e103a43..91864650 100644
--- a/cmd/sam-console/public/app.js
+++ b/cmd/sam-console/public/app.js
@@ -595,11 +595,12 @@ function renderRouterTopography(routers) {
const dhtSize = r.DHTSize || 0;
const peerID = String(r.PeerID || '');
- // Calculate remaining lease time in seconds
- let elapsed = 0;
+ let remaining = 0;
if (r.ExpiresAt) {
- elapsed = Math.max(0, Math.floor((new Date(r.ExpiresAt) - new Date()) / 1000));
+ remaining = Math.max(0, Math.floor((new Date(r.ExpiresAt) - new Date()) / 1000));
}
+ const leaseClass = remaining === 0 ? 'badge-rejected' : 'badge-approved';
+ const leaseLabel = remaining === 0 ? 'Lease expired' : `Lease: ${formatDuration(remaining)}`;
const peersHTML = conns.length === 0
? '<li>No connected peers</li>'
@@ -609,7 +610,7 @@ function renderRouterTopography(routers) {
<div class="router-item-card">
<div class="router-header">
<span class="router-peer-id" title="${escapeHTML(peerID)}">${escapeHTML(peerID.substring(0, 12))}...${escapeHTML(peerID.slice(-8))}</span>
- <span class="badge badge-approved">Lease: ${elapsed}s</span>
+ <span class="badge ${leaseClass}">${escapeHTML(leaseLabel)}</span>
</div>
<div class="router-metrics">
<div class="router-metric-item">
@@ -812,3 +813,16 @@ function escapeHTML(str) {
tag => ({ '&': '&amp;', '<': '&lt;', '>': '&gt;', "'": '&#39;', '"': '&quot;' }[tag] || tag)
);
}
+
+function formatDuration(seconds) {
+ if (seconds < 60) {
+ return `${seconds}s`;
+ }
+ const minutes = Math.floor(seconds / 60);
+ if (minutes < 60) {
+ return `${minutes}m`;
+ }
+ const hours = Math.floor(minutes / 60);
+ const rest = minutes % 60;
+ return rest === 0 ? `${hours}h` : `${hours}h ${rest}m`;
+}
diff --git a/cmd/sam-console/public/index.html b/cmd/sam-console/public/index.html
index 9b56154a..5a6f6bfd 100644
--- a/cmd/sam-console/public/index.html
+++ b/cmd/sam-console/public/index.html
@@ -16,20 +16,20 @@
</div>
<p class="subtitle">Securely manage your global mesh network.</p>
- <div class="auth-buttons" id="sso-login-group" style="display: none; margin-bottom: 24px;">
- <p style="text-align: left; font-size: 0.85rem; color: var(--text-secondary); margin-bottom: 8px;">Interactive Single Sign-On</p>
- <button class="btn btn-primary" onclick="redirectToSSO()" style="width: 100%;">
+ <div class="auth-buttons auth-group" id="sso-login-group">
+ <p class="auth-label">Interactive Single Sign-On</p>
+ <button class="btn btn-primary btn-block" onclick="redirectToSSO()">
Log In with OIDC (Redirect)
</button>
- <div class="divider" style="margin: 1.5rem 0;"><span>or use manual tokens</span></div>
+ <div class="divider divider-spaced"><span>or use manual tokens</span></div>
</div>
<div class="auth-buttons">
- <p style="text-align: left; font-size: 0.85rem; color: var(--text-secondary); margin-bottom: 8px;">Sign In via OIDC Token</p>
+ <p class="auth-label">Sign In via OIDC Token</p>
<div class="input-group">
<input type="password" id="oidc-token-input" placeholder="OIDC JWT Token">
</div>
- <button class="btn btn-primary" onclick="loginOIDC()" style="width: 100%; margin-top: 12px; margin-bottom: 24px;">
+ <button class="btn btn-primary btn-block auth-submit" onclick="loginOIDC()">
Sign In with Token
</button>
</div>
@@ -43,7 +43,7 @@
<div class="input-group">
<input type="password" id="admin-token-input" placeholder="Bearer Token">
</div>
- <button class="btn btn-primary" onclick="saveAdminToken()" style="width: 100%; margin-top: 16px;">
+ <button class="btn btn-primary btn-block auth-submit" onclick="saveAdminToken()">
Login as Admin
</button>
</div>
@@ -51,7 +51,7 @@
</div>
<!-- Main Dashboard Application -->
- <div class="app-container" id="app-container" style="display: none;">
+ <div class="app-container" id="app-container">
<!-- Sidebar Navigation -->
<aside class="sidebar">
<div class="sidebar-header">
@@ -106,7 +106,7 @@
<div class="user-profile">
<div class="avatar" aria-hidden="true">A</div>
<span>Admin</span>
- <button class="btn btn-sm btn-secondary" onclick="logout()" style="margin-left: 12px; padding: 4px 8px; font-size: 0.8rem; background: var(--border-color); border: 1px solid var(--border-color);">Logout</button>
+ <button class="btn btn-sm btn-logout" onclick="logout()">Logout</button>
</div>
</header>
@@ -123,30 +123,31 @@
</button>
</div>
+ <!-- Each card links to the view that lists what it counts. -->
<div class="stats-grid">
- <div class="stat-card">
+ <a class="stat-card" href="#users">
<div class="stat-title">Active Users</div>
<div class="stat-value" id="stat-users">0</div>
- </div>
- <div class="stat-card">
+ </a>
+ <a class="stat-card" href="#nodes">
<div class="stat-title">Enrolled Nodes</div>
<div class="stat-value" id="stat-nodes">0</div>
- </div>
- <div class="stat-card">
+ </a>
+ <a class="stat-card" href="#routers">
<div class="stat-title">Active Routers</div>
<div class="stat-value" id="stat-routers">0</div>
- </div>
- <div class="stat-card">
+ </a>
+ <a class="stat-card" href="#enrollments">
<div class="stat-title">Pending Enrollments</div>
<div class="stat-value" id="stat-pending">0</div>
- </div>
+ </a>
</div>
- <div class="section-header" style="margin-top: 2rem;">
+ <div class="section-header section-header-spaced">
<h2>Network Topography</h2>
</div>
<div id="router-topography-list" class="router-cards-grid">
- <div class="text-center" style="grid-column: 1/-1; padding: 2rem; color: var(--text-secondary);">Loading topography...</div>
+ <div class="grid-placeholder">Loading topography...</div>
</div>
</section>
@@ -250,46 +251,45 @@
<div class="section-header">
<h2>Bootstrap Tokens</h2>
</div>
- <div class="card" style="margin-bottom: 2rem; padding: 2rem;">
+ <div class="card card-form">
<h3>Generate Bootstrap Token</h3>
- <form id="form-generate-token" onsubmit="event.preventDefault(); generateBootstrapToken();" style="display: grid; gap: 1rem; max-width: 500px; margin-top: 1rem;">
- <div class="input-group" style="display: flex; flex-direction: column; gap: 4px;">
- <label for="token-role" style="font-size: 0.85rem; color: var(--text-secondary);">Role</label>
- <select id="token-role" class="form-control" style="background: rgba(0,0,0,0.2); border: 1px solid var(--border-color); color: var(--text-primary); border-radius: 4px; padding: 8px;">
+ <form id="form-generate-token" class="stacked-form" onsubmit="event.preventDefault(); generateBootstrapToken();">
+ <div class="input-group field">
+ <label for="token-role" class="field-label">Role</label>
+ <select id="token-role" class="form-control field-input">
<option value="sam:role:node">Node (sam:role:node)</option>
<option value="sam:role:router">Router (sam:role:router)</option>
<option value="sam:role:sambox">Box (sam:role:sambox)</option>
</select>
</div>
- <div class="input-group" style="display: flex; flex-direction: column; gap: 4px;">
- <label for="token-owner" style="font-size: 0.85rem; color: var(--text-secondary);">Owner ID <span style="opacity: 0.7;">(optional)</span></label>
- <input type="text" id="token-owner" placeholder="Leave blank to use your own identity" style="background: rgba(0,0,0,0.2); border: 1px solid var(--border-color); color: var(--text-primary); border-radius: 4px; padding: 8px;">
- <small id="token-owner-hint" style="font-size: 0.75rem; color: var(--text-secondary); opacity: 0.8;">Admins only: issue this token on behalf of another user. The user must have logged in at least once.</small>
+ <div class="input-group field">
+ <label for="token-owner" class="field-label">Owner ID <span class="field-optional">(optional)</span></label>
+ <input type="text" id="token-owner" class="field-input" placeholder="Leave blank to use your own identity">
+ <small id="token-owner-hint" class="field-hint">Admins only: issue this token on behalf of another user. The user must have logged in at least once.</small>
</div>
- <div class="input-group" style="display: flex; flex-direction: column; gap: 4px;">
- <label for="token-usages" style="font-size: 0.85rem; color: var(--text-secondary);">Max Usages</label>
- <input type="number" id="token-usages" value="1" min="1" style="background: rgba(0,0,0,0.2); border: 1px solid var(--border-color); color: var(--text-primary); border-radius: 4px; padding: 8px;" required>
+ <div class="input-group field">
+ <label for="token-usages" class="field-label">Max Usages</label>
+ <input type="number" id="token-usages" class="field-input" value="1" min="1" required>
</div>
- <div class="input-group" style="display: flex; flex-direction: column; gap: 4px;">
- <label for="token-ttl" style="font-size: 0.85rem; color: var(--text-secondary);">TTL (hours)</label>
- <input type="number" id="token-ttl" value="24" min="1" style="background: rgba(0,0,0,0.2); border: 1px solid var(--border-color); color: var(--text-primary); border-radius: 4px; padding: 8px;" required>
+ <div class="input-group field">
+ <label for="token-ttl" class="field-label">TTL (hours)</label>
+ <input type="number" id="token-ttl" class="field-input" value="24" min="1" required>
</div>
- <div class="input-group" style="display: flex; flex-direction: column; gap: 4px;">
- <label for="token-desc" style="font-size: 0.85rem; color: var(--text-secondary);">Description</label>
- <input type="text" id="token-desc" placeholder="Token purpose" style="background: rgba(0,0,0,0.2); border: 1px solid var(--border-color); color: var(--text-primary); border-radius: 4px; padding: 8px;">
+ <div class="input-group field">
+ <label for="token-desc" class="field-label">Description</label>
+ <input type="text" id="token-desc" class="field-input" placeholder="Token purpose">
</div>
- <button type="submit" class="btn btn-primary" style="margin-top: 12px; max-width: 200px;">Generate Token</button>
+ <button type="submit" class="btn btn-primary form-submit">Generate Token</button>
</form>
- <div id="token-result" hidden style="margin-top: 1.5rem; max-width: 500px; border: 1px solid var(--border-color); border-radius: 6px; padding: 1rem; background: rgba(0,0,0,0.2);">
- <div style="font-size: 0.85rem; color: var(--text-secondary); margin-bottom: 8px;">
+ <div id="token-result" class="token-result" hidden>
+ <div class="token-result-note">
Token generated for owner <code id="token-result-owner"></code>. Copy it now &mdash; it is not stored and will not be shown again.
</div>
- <div style="display: flex; gap: 8px; align-items: center;">
- <input type="text" id="token-result-value" readonly onfocus="this.select();"
- style="flex: 1; font-family: monospace; background: rgba(0,0,0,0.35); border: 1px solid var(--border-color); color: var(--text-primary); border-radius: 4px; padding: 8px;">
+ <div class="token-result-row">
+ <input type="text" id="token-result-value" class="token-result-value" readonly onfocus="this.select();">
<button type="button" class="btn" id="token-copy-btn" onclick="copyGeneratedToken();">Copy</button>
</div>
- <div style="font-size: 0.75rem; color: var(--text-secondary); margin-top: 8px;">
+ <div class="token-result-hint">
Join a node with: <code id="token-result-cmd"></code>
</div>
</div>
diff --git a/cmd/sam-console/public/style.css b/cmd/sam-console/public/style.css
index 4cee9153..782e4264 100644
--- a/cmd/sam-console/public/style.css
+++ b/cmd/sam-console/public/style.css
@@ -165,6 +165,150 @@ body {
font-size: 0.85rem;
}
+/* Landing page auth */
+#app-container {
+ display: none;
+}
+
+#sso-login-group {
+ display: none;
+}
+
+.auth-group {
+ margin-bottom: 24px;
+}
+
+.auth-label {
+ text-align: left;
+ font-size: 0.85rem;
+ color: var(--text-secondary);
+ margin-bottom: 8px;
+}
+
+.btn-block {
+ width: 100%;
+ justify-content: center;
+}
+
+.auth-submit {
+ margin-top: 12px;
+ margin-bottom: 24px;
+}
+
+.admin-login-section .auth-submit {
+ margin-top: 16px;
+ margin-bottom: 0;
+}
+
+.divider-spaced {
+ margin: 1.5rem 0;
+}
+
+.btn-logout {
+ margin-left: 12px;
+ padding: 4px 8px;
+ font-size: 0.8rem;
+ background: var(--border-color);
+ border: 1px solid var(--border-color);
+ color: var(--text-primary);
+}
+
+.section-header-spaced {
+ margin-top: 2rem;
+}
+
+.grid-placeholder {
+ grid-column: 1 / -1;
+ text-align: center;
+ padding: 2rem;
+ color: var(--text-secondary);
+}
+
+/* Stacked forms */
+.card-form {
+ margin-bottom: 2rem;
+ padding: 2rem;
+}
+
+.stacked-form {
+ display: grid;
+ gap: 1rem;
+ max-width: 500px;
+ margin-top: 1rem;
+}
+
+.field {
+ display: flex;
+ flex-direction: column;
+ gap: 4px;
+}
+
+.field-label {
+ font-size: 0.85rem;
+ color: var(--text-secondary);
+}
+
+.field-optional {
+ opacity: 0.7;
+}
+
+.field-input {
+ background: rgba(0, 0, 0, 0.2);
+ border: 1px solid var(--border-color);
+ color: var(--text-primary);
+ border-radius: 4px;
+ padding: 8px;
+}
+
+.field-hint {
+ font-size: 0.75rem;
+ color: var(--text-secondary);
+ opacity: 0.8;
+}
+
+.form-submit {
+ margin-top: 12px;
+ max-width: 200px;
+}
+
+/* Generated token panel */
+.token-result {
+ margin-top: 1.5rem;
+ max-width: 500px;
+ border: 1px solid var(--border-color);
+ border-radius: 6px;
+ padding: 1rem;
+ background: rgba(0, 0, 0, 0.2);
+}
+
+.token-result-note {
+ font-size: 0.85rem;
+ color: var(--text-secondary);
+ margin-bottom: 8px;
+}
+
+.token-result-row {
+ display: flex;
+ gap: 8px;
+ align-items: center;
+}
+
+.token-result-value {
+ flex: 1;
+ font-family: ui-monospace, SFMono-Regular, Menlo, Consolas, monospace;
+ background: rgba(0, 0, 0, 0.35);
+ border: 1px solid var(--border-color);
+ color: var(--text-primary);
+ border-radius: 4px;
+ padding: 8px;
+}
+
+.token-result-hint {
+ font-size: 0.75rem;
+ color: var(--text-secondary);
+ margin-top: 8px;
+}
+
/* Layout */
.app-container {
display: flex;
@@ -431,17 +575,21 @@ body {
}
.stat-card {
+ display: block;
background: var(--bg-card);
border: 1px solid var(--border-color);
border-radius: 16px;
padding: 24px;
backdrop-filter: blur(12px);
transition: transform 0.2s ease, box-shadow 0.2s ease;
+ color: inherit;
+ text-decoration: none;
}
.stat-card:hover {
transform: translateY(-4px);
box-shadow: 0 12px 24px rgba(0, 0, 0, 0.2);
+ border-color: var(--accent);
}
.stat-title {
diff --git a/tests/ui/console.spec.js b/tests/ui/console.spec.js
index ef71e5e2..ea2950fe 100644
--- a/tests/ui/console.spec.js
+++ b/tests/ui/console.spec.js
@@ -295,3 +295,20 @@ test('invalid YAML is reported inline and blocks saving', async ({ page }) => {
await expect(error).toBeHidden();
await expect(page.locator('#policy-save')).toBeEnabled();
});
+
+test('stat cards link to the view that lists what they count', async ({ page }) => {
+ await login(page);
+
+ await page.click('.stat-card[href="#routers"]');
+ await expect(page.locator('#view-routers')).toBeVisible();
+ await expect(page).toHaveURL(/#routers$/);
+});
+
+// Styling belongs in the stylesheet: a style attribute in the markup would need
+// style-src 'unsafe-inline' to survive any strict CSP. Styles the scripts set at
+// runtime go through the CSSOM, which CSP allows, so check what is served rather
+// than the live DOM.
+test('the served markup carries no inline style attribute', async ({ request }) => {
+ const html = await (await request.get('/index.html')).text();
+ expect(html).not.toMatch(/<[^>]+\sstyle=/);
+});