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

Add freeze points with friends #431

Merged
merged 1 commit into from
Jan 21, 2025
+188 −190
Merged

Add freeze points with friends #431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 4 additions & 11 deletions freezing/web/static/css/styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ body {
grid-template-rows: auto 1fr auto;
}

@view-transition {
navigation: auto;
}

/* padding for the gallery */
div.row > div > div.row, .big-bottom {
margin-bottom: 15px;
Expand Down Expand Up @@ -227,17 +231,6 @@ nav.bg-light {
overflow-x: auto;
}

.extra-padding {
padding-left: 40px;
padding-right: 40px;
margin-top: 30px;
margin-bottom: 20px;
}

.extra-margin {
margin: 15px 25px 30px 25px
}

.menu-subheading {
font-variant: small-caps;
line-height: 1;
Expand Down
25 changes: 14 additions & 11 deletions freezing/web/templates/alt_scoring/indiv_freeze.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,37 @@
{% extends "base.html" %}
{% block content %}
<h2 class="mb-3">
Freeze Points{{' with Friends' if friends else ''}}
</h2>
<p>
Thanks to VVill for coming up with this, (<a href="https://www.bikearlingtonforum.com/forums/topic/freeze-points-metric/">explained here</a>). Basically you get more points for riding in the cold, but distance doesn't matter so much.
</p>
<p>
See also <a href="/leaderboard/indiv_freeze{{'' if friends else '?friends=true'}}">Freeze Points {{'without' if friends else 'with'}} Friends</a>.
</p>
<div class="card">
<h5 class="card-header">
Freeze Points
</h5>
<div class="card-body">
<p>
Thanks to VVill for coming up with this, (<a href="https://www.bikearlingtonforum.com/forums/topic/freeze-points-metric/">explained here</a>). Basically you get more points for riding in the cold, but distance doesn't matter so much.
</p>
<div class="card-body py-1">
<table class="table table-condensed">
<tr>
<th>
<th class="number rank">
Rank
</th>
<th>
Team
</th>
<th>
<th class="number">
Points
</th>
</tr>
{% for a, b in indiv_freeze %}
<tr>
<td>
<td class="number rank">
{{ loop.index }}
</td>
<td>
{{ a }}
</td>
<td>
<td class="number">
{{ '%0.1f' % b }}
</td>
</tr>
Expand Down
30 changes: 15 additions & 15 deletions freezing/web/templates/alt_scoring/indiv_hains.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
{% extends "base.html" %}
{% block content %}
<h2 class="mb-3">
Hains Point Laps
</h2>
<p class="lead">
We're looking for the hamsterest hamster who ever hamstered.
</p>
<p>
Segment Miles is based on the 2.5 mile <a href="https://www.strava.com/segments/1081507">Gate
to Gate segment</a>, so it undercounts your mileage if you did a full lap.
However, since this segment is the official measure of "A Hains Point Lap" as far as
this contest is concerned, it was thought best to use 2.5 miles.
</p>
<p>
If you feel the wrong decision has been made here, please be reminded that you are a hamster, and hamsters don't get the admin password to the web server.
</p>
<div class="card">
<h5 class="card-header">
Hains Point Laps
</h5>
<div class="card-body">
<p class="lead">
We're looking for the hamsterest hamster who ever hamstered.
</p>
<p>
Segment Miles is based on the 2.5 mile <a href="https://www.strava.com/segments/1081507">Gate
to Gate segment</a>, so it undercounts your mileage if you did a full lap.
However, since this segment is the official measure of "A Hains Point Lap" as far as
this contest is concerned, it was thought best to use 2.5 miles.
</p>
<p>
If you feel the wrong decision has been made here, please be reminded that you are a hamster, and hamsters don't get the admin password to the web server.
</p>
<div class="table-responsive">
<table id="hamster" class="table table-condensed">
<thead>
Expand Down
22 changes: 11 additions & 11 deletions freezing/web/templates/alt_scoring/indiv_sleaze.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
{% extends "base.html" %}
{% block content %}
<h2 class="mb-3">
Sleaze Rides
</h2>
<p>
If we really want to be pedantic, and <strong>of course</strong> we want to be pedantic, it's actually Sleaze <strong>Days</strong>. Two one mile rides in a day gets you no sleaze ride credit. Since no one <strong>wants</strong> sleaze ride credit, this is a good thing.
</p>
<div class="card">
<h5 class="card-header">
Sleaze Rides
</h5>
<div class="card-body">
<p>
If we really want to be pedantic, and <strong>of course</strong> we want to be pedantic, it's actually Sleaze <strong>Days</strong>. Two one mile rides in a day gets you no sleaze ride credit. Since no one <strong>wants</strong> sleaze ride credit, this is a good thing.
</p>
<div class="card-body py-1">
<table class="table table-condensed">
<tr>
<th>
<th class="number rank">
Rank
</th>
<th>
Name
</th>
<th>
<th class="number">
Sleaze Rides
</th>
</tr>
{% for a, b in indiv_sleaze %}
<tr>
<td>
<td class="number rank">
{{ loop.index }}
</td>
<td>
{{ a }}
</td>
<td>
<td class="number">
{{ b }}
</td>
</tr>
Expand Down
22 changes: 11 additions & 11 deletions freezing/web/templates/alt_scoring/team_hains.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
{% extends "base.html" %}
{% block content %}
<h2 class="mb-3">
Team Hains Point Laps
</h2>
<p>
Certainly hope at least some of these were together as a team.
</p>
<div class="card">
<h5 class="card-header">
Team Hains Point Laps
</h5>
<div class="card-body">
<p>
Certainly hope at least some of these were together as a team.
</p>
<div class="card-body py-1">
<table class="table table-condensed">
<tr>
<th>
<th class="number rank">
Rank
</th>
<th>
Team
</th>
<th>
<th class="number">
Laps
</th>
</tr>
{% for a, b in team_hains %}
<tr>
<td>
<td class="number rank">
{{ loop.index }}
</td>
<td>
{{ a }}
</td>
<td>
<td class="number">
{{ b }}
</td>
</tr>
Expand Down
28 changes: 14 additions & 14 deletions freezing/web/templates/alt_scoring/team_sleaze.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
{% extends "base.html" %}
{% block content %}
<h2 class="mb-3">
Team Sleaze
</h2>
<p>
Now, you know it's up to you whether or not you want to just do the bare minimum. People can go for a bike ride anywhere, okay? They do Freezing Saddles for the camaraderie and the soul-crushing cold.
</p>
<p>
Look, we want you to ride your bike, okay? Now if you feel that the bare minimum is enough, then okay. But some people choose to ride more and we encourage that, okay? You do want to ride your bike, don't you?
</p>
<div class="card">
<h5 class="card-header">
Team Sleaze
</h5>
<div class="card-body">
<p>
Now, you know it's up to you whether or not you want to just do the bare minimum. People can go for a bike ride anywhere, okay? They do Freezing Saddles for the camaraderie and the soul-crushing cold.
</p>
<p>
Look, we want you to ride your bike, okay? Now if you feel that the bare minimum is enough, then okay. But some people choose to ride more and we encourage that, okay? You do want to ride your bike, don't you?
</p>
<div class="card-body py-1">
<table class="table table-condensed">
<tr>
<th>
<th class="number rank">
Rank
</th>
<th>
Team
</th>
<th>
<th class="number">
Sleaze Rides
</th>
</tr>
{% for a, b in team_sleaze %}
<tr>
<td>
<td class="number rank">
{{ loop.index }}
</td>
<td>
{{ a }}
</td>
<td>
<td class="number">
{{ b }}
</td>
</tr>
Expand Down
10 changes: 5 additions & 5 deletions freezing/web/templates/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,13 +118,13 @@
<hr class="dropdown-divider">
</li>
<li>
<a class="dropdown-item" href="/alt_scoring/team_hains">Team Hains Point Laps</a>
<a class="dropdown-item" href="/leaderboard/team_hains">Team Hains Point Laps</a>
</li>
<li>
<a class="dropdown-item" href="/leaderboard/team_various">Team Pointless (Various)</a>
</li>
<li>
<a class="dropdown-item" href="/alt_scoring/team_sleaze">Team Sleaze Rides</a>
<a class="dropdown-item" href="/leaderboard/team_sleaze">Team Sleaze Rides</a>
</li>
<li>
<hr class="dropdown-divider">
Expand All @@ -139,16 +139,16 @@
<hr class="dropdown-divider">
</li>
<li>
<a class="dropdown-item" href="/alt_scoring/indiv_hains">Individual Hains Point Laps</a>
<a class="dropdown-item" href="/leaderboard/indiv_hains">Individual Hains Point Laps</a>
</li>
<li>
<a class="dropdown-item" href="/alt_scoring/indiv_freeze">Individual Freeze Points</a>
<a class="dropdown-item" href="/leaderboard/indiv_freeze">Individual Freeze Points</a>
</li>
<li>
<a class="dropdown-item" href="/leaderboard/individual_various">Individual Pointless (Various)</a>
</li>
<li>
<a class="dropdown-item" href="/alt_scoring/indiv_sleaze">Individual Sleaze Rides</a>
<a class="dropdown-item" href="/leaderboard/indiv_sleaze">Individual Sleaze Rides</a>
</li>
<li>
<hr class="dropdown-divider">
Expand Down
2 changes: 1 addition & 1 deletion freezing/web/templates/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ <h4 class="modal-title text-truncate" id="myLargeModalLabel-1">
<div class="modal-body d-flex flex-column align-items-center ekko-lightbox-container">
{# djlint:off H006 #}
<img src="{{ photo.img_l }}"
class="img-responsive center-block"
class="img-responsive"
alt="{{ photo.caption }}">
{# djlint:on #}
</div>
Expand Down
4 changes: 2 additions & 2 deletions freezing/web/templates/leaderboard/indiv_various.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,9 @@
</script>
{% endblock %}
{% block content %}
<h1>
<h2 class="mb-3">
Individual Leaderboards
</h1>
</h2>
<form action="#" id="choose_api" class="d-flex">
<select class="form-select" name="api_method" id="api_method">
<option value="indiv_elev_gain" selected="selected">
Expand Down
4 changes: 2 additions & 2 deletions freezing/web/templates/leaderboard/team_various.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,9 @@
</script>
{% endblock %}
{% block content %}
<h1>
<h2 class="mb-3">
Team Leaderboards
</h1>
</h2>
<form action="#" id="choose_api" class="d-flex">
<select class="form-select" name="api_method" id="api_method">
<option value="team_elev_gain" selected="selected">
Expand Down
22 changes: 11 additions & 11 deletions freezing/web/templates/tribes/leaderboard.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{% extends "base.html" %}
{% block content %}
<span class="float-end mt-1">
{% if g.logged_in %}
<a href="/tribes/my">My Tribes</a>
{% else %}
Log in to join tribes
{% endif %}
</span>
<h2 class="mb-3">
Bike Tribes
</h2>
<div class="card">
<h5 class="card-header">
Bike Tribes
<span class="float-end">
{% if g.logged_in %}
<a href="/tribes/my">My Tribes</a>
{% else %}
Log in to join tribes
{% endif %}
</span>
</h5>
<div class="card-body">
<div class="card-body pb-0">
{% for group in tribal_groups %}
<h4>
{{ group.name }}
Expand Down
14 changes: 7 additions & 7 deletions freezing/web/templates/tribes/my.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{% extends "base.html" %}
{% block content %}
<span class="float-end mt-1">
<a href="/tribes/leaderboard">Cancel</a>
</span>
<h2 class="mb-3">
My Tribes
</h2>
<div class="card">
<h5 class="card-header">
My Tribes
<span class="float-end">
<a href="/tribes/leaderboard">Cancel</a>
</span>
</h5>
<div class="card-body">
<form method="post">
{% for group in tribal_groups %}
Expand All @@ -27,7 +27,7 @@ <h4>
{% endfor %}
</select>
{% endfor %}
<button type="submit" class="btn btn-primary center-block extra-padding">
<button type="submit" class="btn btn-primary px-4">
Submit
</button>
</form>
Expand Down
Loading
Loading