charts: Money lives in one place, and the menus are concise
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/push/woodpecker Pipeline was successful
Money was both a tab and a metric of Trends — two doors to one chart, which is what "not consistent" looks like from the outside. The tab is gone; the metric stays, and the nav is Members · Model usage · Trends. Period wording now matches the dashboard exactly: 30 days · 90 days · All time. Titles come from the shared module (Members · Requests · Spend · Money · Energy · Carbon), so both apps offer the same six options in the same order.
This commit is contained in:
1 parent
92de0c25f0
commit
e7eb34d787
3 files changed
+8
-18
No files matched your search
+4
-4
@@ -276,9 +276,9 @@
|
|||||||
const CHART_METRICS = [
|
const CHART_METRICS = [
|
||||||
{ id: "members", title: "Members", kind: "line", cont: false, fmt: "count",
|
{ id: "members", title: "Members", kind: "line", cont: false, fmt: "count",
|
||||||
val: r => r.members_total },
|
val: r => r.members_total },
|
||||||
{ id: "requests", title: "Requests per day", kind: "bar", cont: false, fmt: "count",
|
{ id: "requests", title: "Requests", kind: "bar", cont: false, fmt: "count",
|
||||||
val: r => r.requests },
|
val: r => r.requests },
|
||||||
{ id: "spend", title: "Token spend per day", kind: "bar", cont: true, fmt: "money",
|
{ id: "spend", title: "Spend", kind: "bar", cont: true, fmt: "money",
|
||||||
val: r => r.spend_usd },
|
val: r => r.spend_usd },
|
||||||
{ id: "money", title: "Money", kind: "multi", cont: true, fmt: "money",
|
{ id: "money", title: "Money", kind: "multi", cont: true, fmt: "money",
|
||||||
aria: "Cumulative revenue, token spend and OC balance over time",
|
aria: "Cumulative revenue, token spend and OC balance over time",
|
||||||
@@ -287,9 +287,9 @@
|
|||||||
{ name: "Token spend", key: "spend_cum", color: "#4a6a8a" },
|
{ name: "Token spend", key: "spend_cum", color: "#4a6a8a" },
|
||||||
{ name: "OC balance", key: "oc_balance", color: "#a97a2a", dotSingle: true }
|
{ name: "OC balance", key: "oc_balance", color: "#a97a2a", dotSingle: true }
|
||||||
] },
|
] },
|
||||||
{ id: "energy", title: "Energy per day", kind: "bar", cont: true, fmt: "wh",
|
{ id: "energy", title: "Energy", kind: "bar", cont: true, fmt: "wh",
|
||||||
val: r => r.energy_wh },
|
val: r => r.energy_wh },
|
||||||
{ id: "co2e", title: "Carbon per day", kind: "bar", cont: true, fmt: "g",
|
{ id: "co2e", title: "Carbon", kind: "bar", cont: true, fmt: "g",
|
||||||
val: r => r.co2e_g }
|
val: r => r.co2e_g }
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|||||||
+3
-13
@@ -487,14 +487,13 @@ PAGE_HTML = """<!DOCTYPE html>
|
|||||||
<button class="tab-btn active" id="tab-members" onclick="switchView('members')">Members</button>
|
<button class="tab-btn active" id="tab-members" onclick="switchView('members')">Members</button>
|
||||||
<button class="tab-btn" id="tab-models" onclick="switchView('models')">Model usage</button>
|
<button class="tab-btn" id="tab-models" onclick="switchView('models')">Model usage</button>
|
||||||
<button class="tab-btn" id="tab-trends" onclick="switchView('trends')">Trends</button>
|
<button class="tab-btn" id="tab-trends" onclick="switchView('trends')">Trends</button>
|
||||||
<button class="tab-btn" id="tab-money" onclick="showMoney()">Money</button>
|
|
||||||
<span class="range-group" id="member-mode-group">
|
<span class="range-group" id="member-mode-group">
|
||||||
<button class="range-btn active" id="mmode-balance" onclick="setMemberMode('balance')">Balance</button>
|
<button class="range-btn active" id="mmode-balance" onclick="setMemberMode('balance')">Balance</button>
|
||||||
<button class="range-btn" id="mmode-all" onclick="setMemberMode('all')">All time</button>
|
<button class="range-btn" id="mmode-all" onclick="setMemberMode('all')">All time</button>
|
||||||
</span>
|
</span>
|
||||||
<span class="range-group" id="range-group" style="display:none;">
|
<span class="range-group" id="range-group" style="display:none;">
|
||||||
<span class="range-label">Period</span>
|
<span class="range-label">Period</span>
|
||||||
<button class="range-btn" id="range-30" onclick="setRange(30)">Last 30 days</button>
|
<button class="range-btn" id="range-30" onclick="setRange(30)">30 days</button>
|
||||||
<button class="range-btn active" id="range-all" onclick="setRange(0)">All time</button>
|
<button class="range-btn active" id="range-all" onclick="setRange(0)">All time</button>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
@@ -565,8 +564,8 @@ PAGE_HTML = """<!DOCTYPE html>
|
|||||||
</span>
|
</span>
|
||||||
<span class="range-group">
|
<span class="range-group">
|
||||||
<span class="range-label">Period</span>
|
<span class="range-label">Period</span>
|
||||||
<button class="range-btn" id="tr-30" onclick="setTrendDays(30)">Last 30 days</button>
|
<button class="range-btn" id="tr-30" onclick="setTrendDays(30)">30 days</button>
|
||||||
<button class="range-btn active" id="tr-90" onclick="setTrendDays(90)">Last 90 days</button>
|
<button class="range-btn active" id="tr-90" onclick="setTrendDays(90)">90 days</button>
|
||||||
<button class="range-btn" id="tr-all" onclick="setTrendDays(0)">All time</button>
|
<button class="range-btn" id="tr-all" onclick="setTrendDays(0)">All time</button>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
@@ -908,14 +907,6 @@ function clearArrows(table, sortState) {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
// Money: a shortcut into Trends with the money metric selected — one chart
|
|
||||||
// area, one code path, the same chart the member dashboard draws.
|
|
||||||
function showMoney() {
|
|
||||||
buildMetricButtons();
|
|
||||||
switchView('trends');
|
|
||||||
setTrendMetric('money');
|
|
||||||
}
|
|
||||||
|
|
||||||
function switchView(view) {
|
function switchView(view) {
|
||||||
currentView = view;
|
currentView = view;
|
||||||
hideChartTip();
|
hideChartTip();
|
||||||
@@ -930,7 +921,6 @@ function switchView(view) {
|
|||||||
$('tab-members').className = 'tab-btn' + (view === 'members' ? ' active' : '');
|
$('tab-members').className = 'tab-btn' + (view === 'members' ? ' active' : '');
|
||||||
$('tab-models').className = 'tab-btn' + (view === 'models' ? ' active' : '');
|
$('tab-models').className = 'tab-btn' + (view === 'models' ? ' active' : '');
|
||||||
$('tab-trends').className = 'tab-btn' + (view === 'trends' ? ' active' : '');
|
$('tab-trends').className = 'tab-btn' + (view === 'trends' ? ' active' : '');
|
||||||
// Money is a metric of Trends, so its tab shows the Trends title.
|
|
||||||
$('view-title').textContent = view === 'members' ? 'Members' : (view === 'models' ? 'Model usage' : 'Trends');
|
$('view-title').textContent = view === 'members' ? 'Members' : (view === 'models' ? 'Model usage' : 'Trends');
|
||||||
// Mode groups: Balance/All-time for members; Period for models; the guest
|
// Mode groups: Balance/All-time for members; Period for models; the guest
|
||||||
// invite form belongs to the members view too.
|
// invite form belongs to the members view too.
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ import sys
|
|||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
|
|
||||||
ROOT = Path(__file__).resolve().parent.parent
|
ROOT = Path(__file__).resolve().parent.parent
|
||||||
CANONICAL_SHA256 = "233c39faa7b40a9827fefd21aeb5505fdfa770833de2decebc8fe8bbbaee1903"
|
CANONICAL_SHA256 = "d25195d5079da499d6c3788b5678b86af65d9fee8e366cfb08fd5a0201ec1a2e"
|
||||||
SPLICE = 'PAGE_HTML = PAGE_HTML.replace("/*@@CHART_MODULE@@*/", CHART_MODULE_JS)'
|
SPLICE = 'PAGE_HTML = PAGE_HTML.replace("/*@@CHART_MODULE@@*/", CHART_MODULE_JS)'
|
||||||
|
|
||||||
failures = []
|
failures = []
|
||||||
|
|||||||
Reference in new issue
Block a user