split admin js

res/include/script/admin.js

@@ -0,0 +1,149 @@
+// Draw usage graph
+
+Chart.defaults.global.defaultFontColor = "#b3b3b3";
+Chart.defaults.global.defaultFontSize = 15;
+Chart.defaults.global.defaultFontFamily = "Ubuntu";
+Chart.defaults.global.maintainAspectRatio = false;
+Chart.defaults.global.elements.point.radius = 0;
+Chart.defaults.global.tooltips.mode = "index";
+Chart.defaults.global.tooltips.axis = "x";
+Chart.defaults.global.tooltips.intersect = false;
+
+var graph = new Chart(
+	document.getElementById('bandwidth_chart'),
+	{
+		type: 'line',
+		data: {
+			datasets: [
+				{
+					label: "Bandwidth",
+					backgroundColor: "rgba(64, 255, 64, .01)",
+					borderColor: "rgba(96, 255, 96, 1)",
+					borderWidth: 2,
+					lineTension: 0.2,
+					fill: true,
+					yAxisID: "y_bandwidth"
+				}, {
+					label: "Views",
+					backgroundColor: "rgba(64, 64, 255, .01)",
+					borderColor: "rgba(64, 64, 255, 1)",
+					borderWidth: 2,
+					lineTension: 0.2,
+					fill: true,
+					yAxisID: "y_views"
+				}
+			]
+		},
+		options: {
+			scales: {
+				yAxes: [
+					{
+						type: "linear",
+						display: true,
+						position: "left",
+						id: "y_bandwidth",
+						scaleLabel: {
+							display: true,
+							labelString: "Bandwidth"
+						},
+						ticks: {
+							callback: function(value, index, values) {
+								return formatDataVolume(value, 3);
+							}
+						},
+						gridLines: {
+							color: "rgba(100, 255, 100, .05)"
+						}
+					}, {
+						type: "linear",
+						display: true,
+						position: "right",
+						id: "y_views",
+						scaleLabel: {
+							display: true,
+							labelString: "Views"
+						},
+						gridLines: {
+							color: "rgba(128, 128, 255, .05)"
+						}
+					}
+				],
+				xAxes: [
+					{
+						ticks: {
+							maxRotation: 20
+						},
+						gridLines: {
+							display: false
+						}
+					}
+				]
+			}
+		}
+	}
+);
+
+function setData(days, interval){
+	let today = new Date()
+	let start = new Date()
+	start.setDate(start.getDate()-days)
+
+	fetch(
+		apiEndpoint+"/admin/files/timeseries" +
+		"?start="+start.toISOString() +
+		"&end="+today.toISOString() +
+		"&interval="+interval
+	).then(resp => {
+		if (!resp.ok) { return Promise.reject("Error: "+resp.status);}
+		return resp.json();
+	}).then(resp => {
+		if (resp.success) {
+			window.graph.data.labels = resp.labels;
+			window.graph.data.datasets[0].data = resp.downloads;
+			window.graph.data.datasets[1].data = resp.views;
+			window.graph.update();
+		}
+	}).catch(e => {
+		alert("Error requesting time series: "+e);
+	})
+}
+setData(7, 60);
+
+// Load performance statistics
+
+function getStats(order) {
+	fetch(apiEndpoint+"/status").then(
+		resp => resp.json()
+	).then(resp => {
+		let t = document.getElementById("tstat_body")
+		t.innerHTML = ""
+
+		resp.query_statistics.sort((a, b) => {
+			if (typeof(a[order]) === "number") {
+				// Sort ints from high to low
+				return b[order] - a[order]
+			} else {
+				// Sort strings alphabetically
+				return a[order].localeCompare(b[order])
+			}
+		})
+
+		resp.query_statistics.forEach((v) => {
+			let callers = ""
+			v.callers.sort((a, b) => b.count - a.count)
+			v.callers.forEach((v1) => {
+				callers += `${v1.count}x ${v1.name}<br/>`
+			})
+
+			let row = document.createElement("tr")
+			row.innerHTML = `\
+			<td>${v.query_name}</td>
+			<td>${v.calls}</td>
+			<td>${formatDuration(v.average_duration)}</td>
+			<td>${formatDuration(v.total_duration)}</td>
+			<td>${callers}</td>`
+			t.appendChild(row)
+		})
+	})
+}
+getStats("calls")

res/template/admin.html

@@ -24,124 +24,6 @@
 				<div id="chart_container" class="chart-container" style="position: relative; width: 100%; height: 400px;">
 					<canvas id="bandwidth_chart"></canvas>
 				</div>
-
-				<script src="/res/script/Chart.min.js"></script>
-				<script>
-				var apiEndpoint = '{{.APIEndpoint}}';
-
-				{{template `util.js`}}
-
-				Chart.defaults.global.defaultFontColor = "#b3b3b3";
-				Chart.defaults.global.defaultFontSize = 15;
-				Chart.defaults.global.defaultFontFamily = "Ubuntu";
-				Chart.defaults.global.maintainAspectRatio = false;
-				Chart.defaults.global.elements.point.radius = 0;
-				Chart.defaults.global.tooltips.mode = "index";
-				Chart.defaults.global.tooltips.axis = "x";
-				Chart.defaults.global.tooltips.intersect = false;
-
-				var graph = new Chart(
-					document.getElementById('bandwidth_chart'),
-					{
-						type: 'line',
-						data: {
-							datasets: [
-								{
-									label: "Bandwidth",
-									backgroundColor: "rgba(64, 255, 64, .01)",
-									borderColor: "rgba(96, 255, 96, 1)",
-									borderWidth: 2,
-									lineTension: 0.2,
-									fill: true,
-									yAxisID: "y_bandwidth"
-								}, {
-									label: "Views",
-									backgroundColor: "rgba(64, 64, 255, .01)",
-									borderColor: "rgba(64, 64, 255, 1)",
-									borderWidth: 2,
-									lineTension: 0.2,
-									fill: true,
-									yAxisID: "y_views"
-								}
-							]
-						},
-						options: {
-							scales: {
-								yAxes: [
-									{
-										type: "linear",
-										display: true,
-										position: "left",
-										id: "y_bandwidth",
-										scaleLabel: {
-											display: true,
-											labelString: "Bandwidth"
-										},
-										ticks: {
-											callback: function(value, index, values) {
-												return formatDataVolume(value, 3);
-											}
-										},
-										gridLines: {
-											color: "rgba(100, 255, 100, .05)"
-										}
-									}, {
-										type: "linear",
-										display: true,
-										position: "right",
-										id: "y_views",
-										scaleLabel: {
-											display: true,
-											labelString: "Views"
-										},
-										gridLines: {
-											color: "rgba(128, 128, 255, .05)"
-										}
-									}
-								],
-								xAxes: [
-									{
-										ticks: {
-											maxRotation: 20
-										},
-										gridLines: {
-											display: false
-										}
-									}
-								]
-							}
-						}
-					}
-				);
-
-				function setData(days, interval){
-					let today = new Date()
-					let start = new Date()
-					start.setDate(start.getDate()-days)
-
-					fetch(
-						apiEndpoint+"/admin/files/timeseries" +
-						"?start="+start.toISOString() +
-						"&end="+today.toISOString() +
-						"&interval="+interval
-					).then(resp => {
-						if (!resp.ok) { return Promise.reject("Error: "+resp.status);}
-						return resp.json();
-					}).then(resp => {
-						if (resp.success) {
-							window.graph.data.labels = resp.labels;
-							window.graph.data.datasets[0].data = resp.downloads;
-							window.graph.data.datasets[1].data = resp.views;
-							window.graph.update();
-						}
-					}).catch(e => {
-						alert("Error requesting time series: "+e);
-					})
-				}
-
-				setData(7, 60);
-				</script>
-
 				<hr/>
 				<div class="limit_width">
 					<a href="/admin/globals">Update global settings</a>
@@ -149,57 +31,24 @@
 					<table>
 						<thead>
 							<tr>
-								<td onclick="getStats('query_name')">Query</td>
+								<td style="cursor: pointer;" onclick="getStats('query_name')">Query</td>
-								<td onclick="getStats('calls')">Calls</td>
+								<td style="cursor: pointer;" onclick="getStats('calls')">Calls</td>
-								<td onclick="getStats('average_duration')">Average Duration</td>
+								<td style="cursor: pointer;" onclick="getStats('average_duration')">Average Duration</td>
-								<td onclick="getStats('total_duration')">Total Duration</td>
+								<td style="cursor: pointer;" onclick="getStats('total_duration')">Total Duration</td>
 								<td>Callers</td>
 							</tr>
 						</thead>
 						<tbody id="tstat_body"></tbody>
 					</table>
-					<script>
-						function getStats(order) {
-							fetch(apiEndpoint+"/status").then(
-								resp => resp.json()
-							).then(resp => {
-								let t = document.getElementById("tstat_body")
-								t.innerHTML = ""
-
-								resp.query_statistics.sort((a, b) => {
-									if (typeof(a[order]) === "number") {
-										// Sort ints from high to low
-										return b[order] - a[order]
-									} else {
-										// Sort strings alphabetically
-										return a[order].localeCompare(b[order])
-									}
-								})
-
-								resp.query_statistics.forEach((v) => {
-									let callers = ""
-									v.callers.sort((a, b) => b.count - a.count)
-									v.callers.forEach((v1) => {
-										callers += `${v1.count}x ${v1.name}<br/>`
-									})
-
-									let row = document.createElement("tr")
-									row.innerHTML = `\
-									<td>${v.query_name}</td>
-									<td>${v.calls}</td>
-									<td>${formatDuration(v.average_duration)}</td>
-									<td>${formatDuration(v.total_duration)}</td>
-									<td>${callers}</td>`
-									t.appendChild(row)
-								})
-							})
-						}
-						getStats("average_duration")
-					</script>
 				</div>
-
+				<script src="/res/script/Chart.min.js"></script>
+				<script>
+					var apiEndpoint = '{{.APIEndpoint}}';
+					{{template `util.js`}}
+					{{template `admin.js`}}
+				</script>
 				{{else}}
-				<h1 style="text-align: center;">;)</h1>
+				<h1 style="text-align: center;">;-)</h1>
 				{{end}}
 			</div>
 			{{template "page_bottom" .}}