Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate core leaderboards to c3 #417

Merged
merged 2 commits into from
Jan 19, 2025
+174 −121
Merged

Migrate core leaderboards to c3 #417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5128473
migrate core leaderboards to c3
merlinorg Jan 19, 2025
9d9b350
show rank in tooltip
merlinorg Jan 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions freezing/web/static/css/styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,23 @@ nav.bg-light {
line-height: 1;
}

.c3 path, .c3 line {
stroke: var(--bs-body-color) !important;
}

.c3 text {
font-size: 15px;
}

.c3-axis text, .c3-legend-item text {
fill: var(--bs-body-color) !important;
}

.c3-tooltip-container td, .c3-tooltip-container th {
background: var(--bs-body-bg) !important;
color: var(--bs-body-color) !important;
}

@media (min-width: 576px) {
.stats-card {
flex-direction: row;
Expand Down
12 changes: 0 additions & 12 deletions freezing/web/templates/explore/distance_by_lowtemp.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,18 +78,6 @@
requestData();
});
</script>
<style>
.c3 path, .c3 line {
stroke: var(--bs-body-color);
}
.c3-axis text, .c3-legend-item text {
fill: var(--bs-body-color);
}
.c3-tooltip-container td, .c3-tooltip-container th {
background: var(--bs-body-bg);
color: var(--bs-body-color);
}
</style>
{% endblock %}
{% block content %}
<!--Div that will hold our leaderboard chart-->
Expand Down
94 changes: 61 additions & 33 deletions freezing/web/templates/leaderboard/indiv.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,42 +1,70 @@
{% extends "base.html" %}
{% block head %}
{% block foot %}
<link rel="stylesheet"
href="https://cdnjs.cloudflare.com/ajax/libs/c3/0.7.20/c3.css"
integrity="sha384-ztqQYuF0ztQOO26+6hbRTtSQ6HGLosUJRQI9kx0L9OpJiESTtsiriiQNqwBIBl9a"
crossorigin="anonymous">
<script src="https://cdnjs.cloudflare.com/ajax/libs/d3/5.8.0/d3.min.js"
integrity="sha384-Nth41CoN2s0hj2li43h7cs5a1J0zroMLa7ugSGFSdWJMF1OuKrJwZaritPHBnk3E"
crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/c3/0.7.20/c3.min.js"
integrity="sha384-xOzJ6ocROuPNeY/PUgXyXgiPyvvePCiWVkKXro4Lb1gWoGJOtrJw+zrpf3NBx1B5"
crossorigin="anonymous"></script>
<script type="text/javascript">
// Load the Visualization API and the corechart package.
google.charts.load('visualization', '1.0', {'packages':['corechart']});

// Set a callback to run when the Google Visualization API is loaded.
google.charts.setOnLoadCallback(drawIndivChart);

// Callback that creates and populates a data table,
// instantiates the pie chart, passes in the data and
// draws it.

function drawIndivChart() {
$(() => {
$.ajax({
url: "/chartdata/indiv_leaderboard",
dataType:"json",
}).done(function(jsonData) {
// Create our data table out of JSON data loaded from server.
var data = new google.visualization.DataTable(jsonData);

// Instantiate and draw our chart, passing in some options.
var chart = new google.visualization.BarChart(document.getElementById('chart_indiv_leaderboard'));
var width = $('#chart_indiv_leaderboard').width();
var rows = jsonData.rows.length;

var options = {
'title':'Individual Points',
'width':width,
'height':120 + rows * 24,
'legend': {'position': 'none'},
'chartArea': {'left':width / 4,'top':70,'width': width * 3 / 4 - 50,'height': rows * 24},
'hAxis': {'minValue': 0, 'textStyle': {'fontSize': 16}},
'vAxis': {'textStyle': {'fontSize': 16}}
};

chart.draw(data, options);
$('#chart_indiv_leaderboard').height(jsonData.labels.length * 19 + 35)
var chart = c3.generate({
bindto: '#chart_indiv_leaderboard',
height: 400,
bar: {
width: 17,
space: 2
},
padding: {
left: 200
},
data: {
x: 'x',
columns:
[
['x', ...jsonData.labels],
['points', ...jsonData.values],
['rank', ...jsonData.ranks],
],
type: 'bar',
labels: {
format: (value) => Math.round(value)
},
hide: ['rank']
},
axis: {
rotated: true,
x: {
type: 'category',
tick: {
width: 200,
multiline: true,
multilineMax: 1,
}
}
},
tooltip: {
grouped: true,
format: {
title: (i) => '#' + jsonData.ranks[i] + ': ' + jsonData.labels[i],
value: (value) => Math.round(value),
}
},
legend: {
show: false
}
});
});
}
});
</script>
{% endblock %}
{% block content %}
Expand All @@ -47,7 +75,7 @@ <h1>
This leaderboard is also available as a <a href="/leaderboard/individual_text">text-only version</a>.
</p>
<!--Div that will hold our leaderboard chart-->
<div id="chart_indiv_leaderboard" class="g-chart">
<div id="chart_indiv_leaderboard" style="width:100%">
<svg width="48"
height="48"
viewBox="0 0 24 24"
Expand Down
2 changes: 1 addition & 1 deletion freezing/web/templates/leaderboard/indiv_text.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ <h1>
Individual Leaderboard (Text)
</h1>
<p>
This leaderboard is also available as a <a href="/leaderboard/individual">Google-charts version</a>.
This leaderboard is also available as a <a href="/leaderboard/individual">chart version</a>.
</p>
<ol>
{% for indiv_row in indiv_rows[:10] %}
Expand Down
96 changes: 61 additions & 35 deletions freezing/web/templates/leaderboard/team.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,44 +1,70 @@
{% extends "base.html" %}
{% block head %}
{% block foot %}
<link rel="stylesheet"
href="https://cdnjs.cloudflare.com/ajax/libs/c3/0.7.20/c3.css"
integrity="sha384-ztqQYuF0ztQOO26+6hbRTtSQ6HGLosUJRQI9kx0L9OpJiESTtsiriiQNqwBIBl9a"
crossorigin="anonymous">
<script src="https://cdnjs.cloudflare.com/ajax/libs/d3/5.8.0/d3.min.js"
integrity="sha384-Nth41CoN2s0hj2li43h7cs5a1J0zroMLa7ugSGFSdWJMF1OuKrJwZaritPHBnk3E"
crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/c3/0.7.20/c3.min.js"
integrity="sha384-xOzJ6ocROuPNeY/PUgXyXgiPyvvePCiWVkKXro4Lb1gWoGJOtrJw+zrpf3NBx1B5"
crossorigin="anonymous"></script>
<script type="text/javascript">
// Load the Visualization API and the corechart package.
google.charts.load('visualization', '1.0', {'packages':['corechart']});

// Set a callback to run when the Google Visualization API is loaded.
google.charts.setOnLoadCallback(drawTeamChart);
google.charts.setOnLoadCallback(drawIndivChart);

// Callback that creates and populates a data table,
// instantiates the pie chart, passes in the data and
// draws it.

function drawTeamChart() {

$(() => {
$.ajax({
url: "/chartdata/team_leaderboard",
dataType:"json",
}).done(function(jsonData) {
// Create our data table out of JSON data loaded from server.
var data = new google.visualization.DataTable(jsonData);

// Instantiate and draw our chart, passing in some options.
var chart = new google.visualization.BarChart(document.getElementById('chart_team_leaderboard'));
var width = $('#chart_team_leaderboard').width();
var rows = jsonData.rows.length;

var options = {
'title': 'Team Points',
'width': width,
'height': 120 + rows * 24,
'legend': {'position': 'none'},
'chartArea': {'left': width / 4, 'top': 70, 'width': width * 3 / 4 - 50, 'height': rows * 24},
'hAxis': {'minValue': 0, 'textStyle': {'fontSize': 16}},
'vAxis': {'textStyle': {'fontSize': 16}},
};

chart.draw(data, options);
$('#chart_team_leaderboard').height(jsonData.labels.length * 23 + 35)
var chart = c3.generate({
bindto: '#chart_team_leaderboard',
height: 400,
bar: {
width: 21,
space: 2
},
padding: {
left: 300
},
data: {
x: 'x',
columns:
[
['x', ...jsonData.labels],
['points', ...jsonData.values],
['rank', ...jsonData.ranks],
],
type: 'bar',
labels: {
format: (value) => Math.round(value)
},
hide: ['rank']
},
axis: {
rotated: true,
x: {
type: 'category',
tick: {
width: 300,
multiline: true,
multilineMax: 1,
}
}
},
tooltip: {
grouped: true,
format: {
title: (i) => '#' + jsonData.ranks[i] + ': ' + jsonData.labels[i],
value: (value) => Math.round(value)
},
},
legend: {
show: false
}
});
});
}
});
</script>
{% endblock %}
{% block content %}
Expand All @@ -49,7 +75,7 @@ <h1>
This leaderboard is also available as a <a href="/leaderboard/team_text">text-only version</a>.
</p>
<!--Div that will hold our leaderboard chart-->
<div id="chart_team_leaderboard" class="g-chart">
<div id="chart_team_leaderboard" style="width:100%">
<svg width="48"
height="48"
viewBox="0 0 24 24"
Expand Down
2 changes: 1 addition & 1 deletion freezing/web/templates/leaderboard/team_text.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ <h1>
Team Leaderboard (Text)
</h1>
<p>
This leaderboard is also available as a <a href="/leaderboard/team">Google-charts version</a>.
This leaderboard is also available as a <a href="/leaderboard/team">chart version</a>.
</p>
<ol>
{% for team_row in team_rows %}
Expand Down
15 changes: 12 additions & 3 deletions freezing/web/views/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,7 +466,10 @@ def track_map_all():
else f"track_map/all/{limit}.json.gz"
),
lambda: gzip.compress(
json.dumps(_track_map(hash_tag=hash_tag, limit=limit)).encode("utf8"), 5
json.dumps(
_track_map(hash_tag=hash_tag, limit=limit), indent=None
).encode("utf8"),
5,
),
)
)
Expand All @@ -483,7 +486,10 @@ def track_map_my():
f"track_map/athlete/{athlete_id}-{limit}.json.gz",
lambda: gzip.compress(
json.dumps(
_track_map(athlete_id=athlete_id, include_private=True, limit=limit)
_track_map(
athlete_id=athlete_id, include_private=True, limit=limit
),
indent=None,
).encode("utf8"),
5,
),
Expand All @@ -500,7 +506,10 @@ def track_map_team(team_id: int):
_get_cached(
f"track_map/team/{team_id}-{limit}.json.gz",
lambda: gzip.compress(
json.dumps(_track_map(team_id=team_id, limit=limit)).encode("utf8"), 5
json.dumps(
_track_map(team_id=team_id, limit=limit), indent=None
).encode("utf8"),
5,
),
)
)
Loading
Loading