Jun 28 - Update and polish UI/UX
This commit is contained in:
@@ -80,6 +80,10 @@
|
||||
class="{{ 'active' if request.endpoint == 'tenants.provision_tenant' else '' }}">
|
||||
<i class="bi bi-plus-circle"></i> New Tenant
|
||||
</a>
|
||||
<a href="{{ url_for('health.dashboard') }}"
|
||||
class="{{ 'active' if request.endpoint == 'health.dashboard' else '' }}">
|
||||
<i class="bi bi-heart-pulse"></i> Health
|
||||
</a>
|
||||
</nav>
|
||||
<div class="sa-footer">
|
||||
{% if sa_username %}
|
||||
|
||||
@@ -0,0 +1,197 @@
|
||||
{% extends "panel/base.html" %}
|
||||
{% block title %}Health — JQC Control{% endblock %}
|
||||
{% block page_title %}System Health{% endblock %}
|
||||
|
||||
{% block extra_css %}
|
||||
<style>
|
||||
.sub-badge-trial { background:#dbeafe;color:#1d4ed8; }
|
||||
.sub-badge-active { background:#dcfce7;color:#15803d; }
|
||||
.sub-badge-past_due { background:#fef3c7;color:#92400e; }
|
||||
.sub-badge-cancelled { background:#fee2e2;color:#991b1b; }
|
||||
.sub-badge-none { background:#f1f5f9;color:#64748b; }
|
||||
.sub-badge { display:inline-block;padding:.18rem .55rem;border-radius:12px;font-size:.7rem;font-weight:600; }
|
||||
.stat-card { background:#fff;border-radius:8px;padding:1rem 1.25rem;box-shadow:0 1px 3px rgba(0,0,0,.06); }
|
||||
.stat-num { font-size:1.8rem;font-weight:700;line-height:1; }
|
||||
</style>
|
||||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
{# ── Summary stat cards ── #}
|
||||
<div class="row g-3 mb-4">
|
||||
<div class="col-6 col-md-3">
|
||||
<div class="stat-card">
|
||||
<div class="text-muted" style="font-size:.75rem;text-transform:uppercase;letter-spacing:.05em;">Total Tenants</div>
|
||||
<div class="stat-num mt-1">{{ stats.total }}</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-6 col-md-3">
|
||||
<div class="stat-card">
|
||||
<div class="text-muted" style="font-size:.75rem;text-transform:uppercase;letter-spacing:.05em;">Active</div>
|
||||
<div class="stat-num mt-1 text-success">{{ stats.active }}</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-6 col-md-3">
|
||||
<div class="stat-card">
|
||||
<div class="text-muted" style="font-size:.75rem;text-transform:uppercase;letter-spacing:.05em;">Suspended</div>
|
||||
<div class="stat-num mt-1 {{ 'text-warning' if stats.suspended else '' }}">{{ stats.suspended }}</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-6 col-md-3">
|
||||
<div class="stat-card">
|
||||
<div class="text-muted" style="font-size:.75rem;text-transform:uppercase;letter-spacing:.05em;">Schema Behind</div>
|
||||
<div class="stat-num mt-1 {{ 'text-danger' if stats.schema_behind else '' }}">{{ stats.schema_behind }}</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{# ── Subscription breakdown + trial alerts ── #}
|
||||
<div class="row g-3 mb-4">
|
||||
<div class="col-md-6">
|
||||
<div class="card border-0 shadow-sm h-100">
|
||||
<div class="card-header bg-white py-2">
|
||||
<span class="fw-semibold" style="font-size:.9rem;">Subscription Breakdown</span>
|
||||
</div>
|
||||
<div class="card-body py-2">
|
||||
<div class="d-flex flex-wrap gap-2">
|
||||
{% for key, count in stats.sub_counts.items() %}
|
||||
<div class="d-flex align-items-center gap-1">
|
||||
<span class="sub-badge sub-badge-{{ key }}">{{ key }}</span>
|
||||
<span class="fw-semibold">{{ count }}</span>
|
||||
</div>
|
||||
{% endfor %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<div class="card border-0 shadow-sm h-100">
|
||||
<div class="card-header bg-white py-2">
|
||||
<span class="fw-semibold" style="font-size:.9rem;">Trial Alerts</span>
|
||||
</div>
|
||||
<div class="card-body py-2 d-flex flex-column gap-2" style="font-size:.85rem;">
|
||||
{% if stats.trial_expired %}
|
||||
<div class="d-flex align-items-center gap-2 text-danger">
|
||||
<i class="bi bi-x-circle-fill"></i>
|
||||
<span><strong>{{ stats.trial_expired }}</strong> trial{{ 's' if stats.trial_expired != 1 }} expired — workspace locked</span>
|
||||
</div>
|
||||
{% endif %}
|
||||
{% if stats.trial_expiring_soon %}
|
||||
<div class="d-flex align-items-center gap-2 text-warning">
|
||||
<i class="bi bi-hourglass-split"></i>
|
||||
<span><strong>{{ stats.trial_expiring_soon }}</strong> trial{{ 's' if stats.trial_expiring_soon != 1 }} expiring within 3 days</span>
|
||||
</div>
|
||||
{% endif %}
|
||||
{% if not stats.trial_expired and not stats.trial_expiring_soon %}
|
||||
<span class="text-success"><i class="bi bi-check-circle-fill me-1"></i>All trials healthy.</span>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{# ── Tenant table ── #}
|
||||
<div class="card border-0 shadow-sm">
|
||||
<div class="card-header bg-white py-2 d-flex justify-content-between align-items-center">
|
||||
<span class="fw-semibold" style="font-size:.9rem;"><i class="bi bi-table me-1"></i>All Tenants</span>
|
||||
<span class="text-muted" style="font-size:.78rem;">
|
||||
Schema HEAD: <code>{{ chain_head or '?' }}</code>
|
||||
</span>
|
||||
</div>
|
||||
<div class="table-responsive">
|
||||
<table class="table table-sm table-hover mb-0 align-middle" style="font-size:.82rem;">
|
||||
<thead class="table-light">
|
||||
<tr>
|
||||
<th>#</th>
|
||||
<th>Slug / Name</th>
|
||||
<th>Status</th>
|
||||
<th>Plan</th>
|
||||
<th>Subscription</th>
|
||||
<th>Trial / Period</th>
|
||||
<th>Stripe</th>
|
||||
<th>Schema</th>
|
||||
<th>Created</th>
|
||||
<th></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{% for r in rows %}
|
||||
<tr class="{{ 'table-warning' if r.status == 'suspended' else
|
||||
('table-danger' if r.trial_expired and r.subscription_status == 'trial' else '') }}">
|
||||
<td class="text-muted">{{ r.id }}</td>
|
||||
<td>
|
||||
<div class="fw-semibold">{{ r.slug }}</div>
|
||||
<div class="text-muted" style="font-size:.75rem;">{{ r.name }}</div>
|
||||
</td>
|
||||
<td>
|
||||
<span class="status-badge status-{{ r.status }}">{{ r.status }}</span>
|
||||
</td>
|
||||
<td>{{ r.plan_name }}</td>
|
||||
<td>
|
||||
<span class="sub-badge sub-badge-{{ r.subscription_status or 'none' }}">
|
||||
{{ r.subscription_status or '—' }}
|
||||
</span>
|
||||
{% if r.subscription_status == 'past_due' %}
|
||||
<i class="bi bi-exclamation-triangle-fill text-warning ms-1"></i>
|
||||
{% endif %}
|
||||
</td>
|
||||
<td>
|
||||
{% if r.subscription_status == 'trial' and r.trial_ends_at %}
|
||||
{% if r.trial_expired %}
|
||||
<span class="text-danger fw-semibold">
|
||||
<i class="bi bi-x-circle me-1"></i>Expired
|
||||
</span>
|
||||
{% elif r.trial_days_left <= 3 %}
|
||||
<span class="text-warning fw-semibold">
|
||||
{{ r.trial_days_left }}d left
|
||||
</span>
|
||||
{% else %}
|
||||
<span class="text-muted">{{ r.trial_ends_at.strftime('%Y-%m-%d') }}</span>
|
||||
{% endif %}
|
||||
{% elif r.current_period_end %}
|
||||
<span class="text-muted">{{ r.current_period_end.strftime('%Y-%m-%d') }}</span>
|
||||
{% else %}
|
||||
<span class="text-muted">—</span>
|
||||
{% endif %}
|
||||
</td>
|
||||
<td>
|
||||
{% if r.has_stripe %}
|
||||
<i class="bi bi-check-circle-fill text-success"></i>
|
||||
{% else %}
|
||||
<span class="text-muted">—</span>
|
||||
{% endif %}
|
||||
</td>
|
||||
<td class="font-monospace" style="font-size:.72rem;">
|
||||
{% if r.schema_ok is none %}
|
||||
<span class="text-muted">?</span>
|
||||
{% elif r.schema_ok %}
|
||||
<span class="rev-ok"><i class="bi bi-check-circle-fill"></i></span>
|
||||
{% else %}
|
||||
<span class="rev-behind">
|
||||
<i class="bi bi-exclamation-circle-fill me-1"></i>{{ (r.alembic_head or '?')[:10] }}…
|
||||
</span>
|
||||
{% endif %}
|
||||
</td>
|
||||
<td style="color:#64748b;">
|
||||
{{ r.created_at.strftime('%Y-%m-%d') if r.created_at else '—' }}
|
||||
</td>
|
||||
<td>
|
||||
<a href="{{ url_for('tenants.tenant_detail', tenant_id=r.id) }}"
|
||||
class="btn btn-outline-secondary btn-sm" style="font-size:.72rem;padding:.2rem .5rem;">
|
||||
Detail
|
||||
</a>
|
||||
</td>
|
||||
</tr>
|
||||
{% else %}
|
||||
<tr><td colspan="10" class="text-center text-muted py-4">No tenants.</td></tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="text-muted mt-2" style="font-size:.75rem; text-align:right;">
|
||||
Refreshes on page load only. Schema status read from control DB cache (run Detail → Upgrade to live-check).
|
||||
</div>
|
||||
|
||||
{% endblock %}
|
||||
@@ -286,14 +286,16 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{# ── Billing (MT-8, read-only) ── #}
|
||||
{# ── Billing (MT-8) ── #}
|
||||
<div class="card border-0 shadow-sm">
|
||||
<div class="card-header bg-white py-2">
|
||||
<span class="fw-semibold" style="font-size:.9rem;"><i class="bi bi-credit-card me-1"></i>Billing</span>
|
||||
</div>
|
||||
<div class="card-body py-2" style="font-size:.83rem;">
|
||||
<div class="mb-1">
|
||||
<span class="text-muted">Subscription</span>
|
||||
|
||||
{# Read-only info #}
|
||||
<div class="mb-2">
|
||||
<span class="text-muted">Status</span>
|
||||
<div>
|
||||
{% if tenant.subscription_status == 'active' %}
|
||||
<span class="badge bg-success">active</span>
|
||||
@@ -309,44 +311,80 @@
|
||||
</div>
|
||||
</div>
|
||||
{% if tenant.trial_ends_at %}
|
||||
<div class="mb-1">
|
||||
<span class="text-muted">Trial ends</span>
|
||||
<div>{{ tenant.trial_ends_at.strftime('%Y-%m-%d') }}</div>
|
||||
</div>
|
||||
<div class="mb-1"><span class="text-muted">Trial ends</span>
|
||||
<div>{{ tenant.trial_ends_at.strftime('%Y-%m-%d') }}</div></div>
|
||||
{% endif %}
|
||||
{% if tenant.current_period_end %}
|
||||
<div class="mb-1">
|
||||
<span class="text-muted">Period ends</span>
|
||||
<div>{{ tenant.current_period_end.strftime('%Y-%m-%d') }}</div>
|
||||
</div>
|
||||
<div class="mb-1"><span class="text-muted">Period ends</span>
|
||||
<div>{{ tenant.current_period_end.strftime('%Y-%m-%d') }}</div></div>
|
||||
{% endif %}
|
||||
{% if tenant.billing_email %}
|
||||
<div class="mb-1">
|
||||
<span class="text-muted">Billing email</span>
|
||||
<div>{{ tenant.billing_email }}</div>
|
||||
</div>
|
||||
<div class="mb-1"><span class="text-muted">Billing email</span>
|
||||
<div>{{ tenant.billing_email }}</div></div>
|
||||
{% endif %}
|
||||
{% if tenant.stripe_customer_id %}
|
||||
<div class="mb-1">
|
||||
<span class="text-muted">Stripe customer</span>
|
||||
<div class="font-monospace" style="font-size:.75rem;"
|
||||
title="{{ tenant.stripe_customer_id }}">
|
||||
{{ tenant.stripe_customer_id[:20] }}…
|
||||
</div>
|
||||
</div>
|
||||
<div class="mb-1"><span class="text-muted">Stripe customer</span>
|
||||
<div class="font-monospace" style="font-size:.72rem;" title="{{ tenant.stripe_customer_id }}">
|
||||
{{ tenant.stripe_customer_id }}</div></div>
|
||||
{% endif %}
|
||||
{% if tenant.stripe_subscription_id %}
|
||||
<div class="mb-1">
|
||||
<span class="text-muted">Stripe subscription</span>
|
||||
<div class="font-monospace" style="font-size:.75rem;"
|
||||
title="{{ tenant.stripe_subscription_id }}">
|
||||
{{ tenant.stripe_subscription_id[:20] }}…
|
||||
<div class="mb-2"><span class="text-muted">Stripe subscription</span>
|
||||
<div class="font-monospace" style="font-size:.72rem;" title="{{ tenant.stripe_subscription_id }}">
|
||||
{{ tenant.stripe_subscription_id }}</div></div>
|
||||
{% endif %}
|
||||
|
||||
<hr class="my-2">
|
||||
|
||||
{# Set trial #}
|
||||
<form method="POST"
|
||||
action="{{ url_for('tenants.update_billing', tenant_id=tenant.id) }}"
|
||||
class="mb-2">
|
||||
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
|
||||
<input type="hidden" name="action" value="set_trial">
|
||||
<label class="form-label mb-1" style="font-size:.8rem;">Extend / Set Trial</label>
|
||||
<div class="input-group input-group-sm">
|
||||
<input type="number" name="trial_days" value="14" min="1" max="365"
|
||||
class="form-control" style="max-width:70px;">
|
||||
<span class="input-group-text">days</span>
|
||||
<button class="btn btn-outline-info btn-sm">Set Trial</button>
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
{% if not tenant.subscription_status %}
|
||||
<span class="text-muted">No billing configured.</span>
|
||||
</form>
|
||||
|
||||
{# Override status #}
|
||||
<form method="POST"
|
||||
action="{{ url_for('tenants.update_billing', tenant_id=tenant.id) }}"
|
||||
class="mb-2">
|
||||
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
|
||||
<input type="hidden" name="action" value="set_status">
|
||||
<label class="form-label mb-1" style="font-size:.8rem;">Override Status</label>
|
||||
<div class="input-group input-group-sm">
|
||||
<select name="subscription_status" class="form-select">
|
||||
{% for st in ('trial','active','past_due','cancelled') %}
|
||||
<option value="{{ st }}" {{ 'selected' if tenant.subscription_status == st }}>
|
||||
{{ st }}
|
||||
</option>
|
||||
{% endfor %}
|
||||
</select>
|
||||
<button class="btn btn-outline-warning btn-sm">Set</button>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
{# Apply coupon — only if Stripe customer exists #}
|
||||
{% if tenant.stripe_customer_id %}
|
||||
<form method="POST"
|
||||
action="{{ url_for('tenants.update_billing', tenant_id=tenant.id) }}"
|
||||
onsubmit="return confirm('Apply coupon to Stripe customer?')">
|
||||
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
|
||||
<input type="hidden" name="action" value="apply_coupon">
|
||||
<label class="form-label mb-1" style="font-size:.8rem;">Apply Stripe Coupon</label>
|
||||
<div class="input-group input-group-sm">
|
||||
<input type="text" name="coupon_id" class="form-control"
|
||||
placeholder="COUPON_ID" required>
|
||||
<button class="btn btn-outline-success btn-sm">Apply</button>
|
||||
</div>
|
||||
</form>
|
||||
{% endif %}
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user