aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--asset-sources/theme.scss26
-rw-r--r--fietsboek/locale/de/LC_MESSAGES/messages.mobin21874 -> 23262 bytes
-rw-r--r--fietsboek/locale/de/LC_MESSAGES/messages.po190
-rw-r--r--fietsboek/locale/en/LC_MESSAGES/messages.mobin20594 -> 21871 bytes
-rw-r--r--fietsboek/locale/en/LC_MESSAGES/messages.po188
-rw-r--r--fietsboek/locale/fietslog.pot185
-rw-r--r--fietsboek/routes.py1
-rw-r--r--fietsboek/static/theme.css21
-rw-r--r--fietsboek/static/theme.css.map2
-rw-r--r--fietsboek/templates/climb_browse.jinja2196
-rw-r--r--fietsboek/templates/details.jinja21
-rw-r--r--fietsboek/templates/layout.jinja23
-rw-r--r--fietsboek/util.py86
-rw-r--r--fietsboek/views/browse.py61
-rw-r--r--fietsboek/views/climb.py197
-rw-r--r--fietsboek/views/detail.py40
16 files changed, 965 insertions, 232 deletions
diff --git a/asset-sources/theme.scss b/asset-sources/theme.scss
index fbb836e..82bd8d7 100644
--- a/asset-sources/theme.scss
+++ b/asset-sources/theme.scss
@@ -241,6 +241,32 @@ strong {
}
/* </Climbs> */
+/* <Climb-Browse> */
+.climb-browse-card {
+ .card-body {
+ padding: 0;
+ display: grid;
+ grid-template-areas:
+ "map stats"
+ "map profile";
+ grid-template-rows: 190px 110px;
+ }
+
+ .climb-profile {
+ grid-area: profile;
+ width: 300px;
+ height: 110px;
+ }
+}
+
+.climb-browse-list {
+ display: flex;
+ flex-wrap: wrap;
+ gap: 1rem;
+ justify-content: center;
+}
+/* </Climb-Browse> */
+
.count-field {
width: 50px;
display: inline-block;
diff --git a/fietsboek/locale/de/LC_MESSAGES/messages.mo b/fietsboek/locale/de/LC_MESSAGES/messages.mo
index 18f9e00..c7761f2 100644
--- a/fietsboek/locale/de/LC_MESSAGES/messages.mo
+++ b/fietsboek/locale/de/LC_MESSAGES/messages.mo
Binary files differ
diff --git a/fietsboek/locale/de/LC_MESSAGES/messages.po b/fietsboek/locale/de/LC_MESSAGES/messages.po
index 2775efc..4c4d09c 100644
--- a/fietsboek/locale/de/LC_MESSAGES/messages.po
+++ b/fietsboek/locale/de/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2026-10-15 00:03+0200\n"
+"POT-Creation-Date: 2026-11-14 11:05+0100\n"
"PO-Revision-Date: 2022-07-02 17:35+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language: de\n"
@@ -18,11 +18,11 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 2.18.0\n"
-#: fietsboek/actions.py:271
+#: fietsboek/actions.py:255
msgid "email.verify_mail.subject"
msgstr "Fietsboek Konto Bestätigung"
-#: fietsboek/actions.py:274
+#: fietsboek/actions.py:258
msgid "email.verify.text"
msgstr ""
"Um Dein Fietsboek-Konto zu bestätigen, nutze diesen Link: {}\n"
@@ -67,43 +67,43 @@ msgid_plural "page.profile.contribution_card.tooltips"
msgstr[0] "${count} Strecke am ${date}"
msgstr[1] "${count} Strecken am ${date}"
-#: fietsboek/util.py:299
+#: fietsboek/util.py:384
msgid "password_constraint.mismatch"
msgstr "Passwörter stimmen nicht überein"
-#: fietsboek/util.py:301
+#: fietsboek/util.py:386
msgid "password_constraint.length"
msgstr "Passwort zu kurz"
-#: fietsboek/models/track.py:777
+#: fietsboek/models/track.py:817
msgid "tooltip.table.length"
msgstr "Länge"
-#: fietsboek/models/track.py:778
+#: fietsboek/models/track.py:818
msgid "tooltip.table.people"
msgstr "# Personen"
-#: fietsboek/models/track.py:779
+#: fietsboek/models/track.py:819
msgid "tooltip.table.uphill"
msgstr "Bergauf"
-#: fietsboek/models/track.py:780
+#: fietsboek/models/track.py:820
msgid "tooltip.table.downhill"
msgstr "Bergab"
-#: fietsboek/models/track.py:781 fietsboek/templates/home.jinja2:7
+#: fietsboek/models/track.py:821 fietsboek/templates/home.jinja2:7
msgid "tooltip.table.moving_time"
msgstr "Fahrzeit"
-#: fietsboek/models/track.py:782 fietsboek/templates/home.jinja2:8
+#: fietsboek/models/track.py:822 fietsboek/templates/home.jinja2:8
msgid "tooltip.table.stopped_time"
msgstr "Haltezeit"
-#: fietsboek/models/track.py:784
+#: fietsboek/models/track.py:824
msgid "tooltip.table.max_speed"
msgstr "Maximalgeschwindigkeit"
-#: fietsboek/models/track.py:788
+#: fietsboek/models/track.py:828
msgid "tooltip.table.avg_speed"
msgstr "Durchschnittsgeschwindigkeit"
@@ -322,14 +322,17 @@ msgid "page.browse.filter.me_tagged_only"
msgstr "Zeige nur Strecken, in denen ich markiert bin"
#: fietsboek/templates/browse.jinja2:129
+#: fietsboek/templates/climb_browse.jinja2:95
msgid "page.browse.filters.apply"
msgstr "Filter anwenden"
#: fietsboek/templates/browse.jinja2:133
+#: fietsboek/templates/climb_browse.jinja2:99
msgid "page.browse.filters.clear_all"
msgstr "Filter zurücksetzen"
#: fietsboek/templates/browse.jinja2:136
+#: fietsboek/templates/climb_browse.jinja2:102
msgid "page.browse.filters.expand_advanced"
msgstr "Erweitert"
@@ -439,10 +442,14 @@ msgid "page.browse.download_multiple"
msgstr "ausgewählte Herunterladen"
#: fietsboek/templates/browse.jinja2:244 fietsboek/templates/browse.jinja2:248
+#: fietsboek/templates/climb_browse.jinja2:171
+#: fietsboek/templates/climb_browse.jinja2:175
msgid "pagination.previous"
msgstr "Vorherige"
#: fietsboek/templates/browse.jinja2:253 fietsboek/templates/browse.jinja2:257
+#: fietsboek/templates/climb_browse.jinja2:180
+#: fietsboek/templates/climb_browse.jinja2:184
msgid "pagination.next"
msgstr "Nächste"
@@ -456,6 +463,102 @@ msgstr ""
"Es wurden keine Strecken gefunden, auf die Du Zugriff hast. Versuche, "
"Dich anzumelden."
+#: fietsboek/templates/climb_browse.jinja2:4
+msgid "page.climb_browse.title"
+msgstr "Steigen"
+
+#: fietsboek/templates/climb_browse.jinja2:11
+msgid "page.climb_browse.filter.search_terms"
+msgstr "Suchbegriffe"
+
+#: fietsboek/templates/climb_browse.jinja2:20
+msgid "page.climb_browse.filter.length_minimum"
+msgstr "Minimale Länge"
+
+#: fietsboek/templates/climb_browse.jinja2:26
+msgid "page.climb_browse.filter.length_boundaries"
+msgstr "Längenbeschränkungen"
+
+#: fietsboek/templates/climb_browse.jinja2:32
+msgid "page.climb_browse.filter.length_maximum"
+msgstr "Maximale Länge"
+
+#: fietsboek/templates/climb_browse.jinja2:40
+msgid "page.climb_browse.filter.grade_minimum"
+msgstr "Minimale Steigung"
+
+#: fietsboek/templates/climb_browse.jinja2:46
+msgid "page.climb_browse.filter.grade_boundaries"
+msgstr "Steigungsgrenzen"
+
+#: fietsboek/templates/climb_browse.jinja2:52
+msgid "page.climb_browse.filter.grade_maximum"
+msgstr "Maximale Steigung"
+
+#: fietsboek/templates/climb_browse.jinja2:65
+msgid "page.climb_browse.filter.date_boundaries"
+msgstr "Datumsgrenzen"
+
+#: fietsboek/templates/climb_browse.jinja2:84
+msgid "page.climb_browse.filter.uncategorized"
+msgstr "Unkategorisiert"
+
+#: fietsboek/templates/climb_browse.jinja2:107
+#: fietsboek/templates/climb_browse.jinja2:108
+msgid "page.climb_browse.sort.date"
+msgstr "Nach Datum sortieren"
+
+#: fietsboek/templates/climb_browse.jinja2:109
+#: fietsboek/templates/climb_browse.jinja2:110
+msgid "page.climb_browse.sort.length"
+msgstr "Nach Länge sortieren"
+
+#: fietsboek/templates/climb_browse.jinja2:111
+#: fietsboek/templates/climb_browse.jinja2:112
+msgid "page.climb_browse.sort.grade"
+msgstr "Nach Steigung sortieren"
+
+#: fietsboek/templates/climb_browse.jinja2:113
+#: fietsboek/templates/climb_browse.jinja2:114
+msgid "page.climb_browse.sort.category"
+msgstr "Nach Kategorie sortieren"
+
+#: fietsboek/templates/climb_browse.jinja2:122
+msgid "page.climb_browse.num_climb"
+msgid_plural "page.climb_browse.num_climbs"
+msgstr[0] "%(num)d Steige gefunden"
+msgstr[1] "%(num)d Steigen gefunden"
+
+#: fietsboek/templates/climb_browse.jinja2:145
+#: fietsboek/templates/details.jinja2:221
+msgid "page.details.climb.length"
+msgstr "Länge"
+
+#: fietsboek/templates/climb_browse.jinja2:149
+#: fietsboek/templates/details.jinja2:225
+msgid "page.details.climb.average_grade"
+msgstr "Anstieg"
+
+#: fietsboek/templates/climb_browse.jinja2:153
+#: fietsboek/templates/details.jinja2:229
+msgid "page.details.climb.lowest_elevation"
+msgstr "Niedrigster Punkt"
+
+#: fietsboek/templates/climb_browse.jinja2:157
+#: fietsboek/templates/details.jinja2:233
+msgid "page.details.climb.highest_elevation"
+msgstr "Höchster Punkt"
+
+#: fietsboek/templates/climb_browse.jinja2:191
+msgid "page.climb_browse.no_results"
+msgstr "Es wurden keine Steigen gefunden, die den Filtern entsprechen."
+
+#: fietsboek/templates/climb_browse.jinja2:193
+msgid "page.climb_browse.no_climbs"
+msgstr ""
+"Es wurden keine Steigen gefunden, auf die Du Zugriff hast. Versuche, Dich"
+" anzumelden."
+
#: fietsboek/templates/create_account.jinja2:5
msgid "page.create_account.title"
msgstr "Konto Erstellen"
@@ -582,47 +685,31 @@ msgstr "Steigen"
msgid "page.details.climbs.mark_on_map"
msgstr "Steigen auf Karte anzeigen"
-#: fietsboek/templates/details.jinja2:203
+#: fietsboek/templates/details.jinja2:204
msgid "page.details.climbs.climb"
msgstr "Steige"
-#: fietsboek/templates/details.jinja2:220
-msgid "page.details.climb.length"
-msgstr "Länge"
-
-#: fietsboek/templates/details.jinja2:224
-msgid "page.details.climb.average_grade"
-msgstr "Anstieg"
-
-#: fietsboek/templates/details.jinja2:228
-msgid "page.details.climb.lowest_elevation"
-msgstr "Niedrigster Punkt"
-
-#: fietsboek/templates/details.jinja2:232
-msgid "page.details.climb.highest_elevation"
-msgstr "Höchster Punkt"
-
-#: fietsboek/templates/details.jinja2:273
+#: fietsboek/templates/details.jinja2:274
msgid "page.details.comments"
msgstr "Kommentare"
-#: fietsboek/templates/details.jinja2:277
+#: fietsboek/templates/details.jinja2:278
msgid "page.details.comments.author"
msgstr "Kommentar von {}"
-#: fietsboek/templates/details.jinja2:294
+#: fietsboek/templates/details.jinja2:295
msgid "page.details.comments.new.title"
msgstr "Kommentar erstellen"
-#: fietsboek/templates/details.jinja2:297
+#: fietsboek/templates/details.jinja2:298
msgid "page.details.comments.new.input_title"
msgstr "Titel"
-#: fietsboek/templates/details.jinja2:298
+#: fietsboek/templates/details.jinja2:299
msgid "page.details.comments.new.input_comment"
msgstr "Kommentar"
-#: fietsboek/templates/details.jinja2:301
+#: fietsboek/templates/details.jinja2:302
msgid "page.details.comments.new.submit"
msgstr "Absenden"
@@ -920,39 +1007,43 @@ msgstr "Stöbern"
msgid "page.navbar.journeys"
msgstr "Reisen"
-#: fietsboek/templates/layout.jinja2:65
+#: fietsboek/templates/layout.jinja2:64
+msgid "page.navbar.climb-browse"
+msgstr "Steigen"
+
+#: fietsboek/templates/layout.jinja2:68
msgid "page.navbar.upload"
msgstr "Hochladen"
-#: fietsboek/templates/layout.jinja2:74
+#: fietsboek/templates/layout.jinja2:77
msgid "page.navbar.user"
msgstr "Nutzer"
-#: fietsboek/templates/layout.jinja2:78
+#: fietsboek/templates/layout.jinja2:81
msgid "page.navbar.welcome_user"
msgstr "Willkommen, {}!"
-#: fietsboek/templates/layout.jinja2:81
+#: fietsboek/templates/layout.jinja2:84
msgid "page.navbar.logout"
msgstr "Abmelden"
-#: fietsboek/templates/layout.jinja2:84
+#: fietsboek/templates/layout.jinja2:87
msgid "page.navbar.profile"
msgstr "Profil"
-#: fietsboek/templates/layout.jinja2:87
+#: fietsboek/templates/layout.jinja2:90
msgid "page.navbar.user_data"
msgstr "Persönliche Daten"
-#: fietsboek/templates/layout.jinja2:91
+#: fietsboek/templates/layout.jinja2:94
msgid "page.navbar.admin"
msgstr "Admin"
-#: fietsboek/templates/layout.jinja2:97
+#: fietsboek/templates/layout.jinja2:100
msgid "page.navbar.login"
msgstr "Anmelden"
-#: fietsboek/templates/layout.jinja2:101
+#: fietsboek/templates/layout.jinja2:104
msgid "page.navbar.create_account"
msgstr "Konto Erstellen"
@@ -1248,8 +1339,7 @@ msgstr "Höhenprofil glätten"
#: fietsboek/transformers/elevation.py:203
msgid "transformers.smooth-elevation.description"
-msgstr ""
-"Diese Transformation glättet das Höhenprofil, um Rauschen zu verringern."
+msgstr "Diese Transformation glättet das Höhenprofil, um Rauschen zu verringern."
#: fietsboek/views/account.py:54
msgid "flash.invalid_name"
@@ -1263,15 +1353,15 @@ msgstr "Ungültige E-Mail-Adresse"
msgid "flash.a_confirmation_link_has_been_sent"
msgstr "Ein Bestätigungslink wurde versandt"
-#: fietsboek/views/admin.py:197
+#: fietsboek/views/admin.py:210
msgid "flash.badge_added"
msgstr "Wappen hinzugefügt"
-#: fietsboek/views/admin.py:221
+#: fietsboek/views/admin.py:234
msgid "flash.badge_modified"
msgstr "Wappen bearbeitet"
-#: fietsboek/views/admin.py:241
+#: fietsboek/views/admin.py:254
msgid "flash.badge_deleted"
msgstr "Wappen gelöscht"
diff --git a/fietsboek/locale/en/LC_MESSAGES/messages.mo b/fietsboek/locale/en/LC_MESSAGES/messages.mo
index a0470e0..601c2b1 100644
--- a/fietsboek/locale/en/LC_MESSAGES/messages.mo
+++ b/fietsboek/locale/en/LC_MESSAGES/messages.mo
Binary files differ
diff --git a/fietsboek/locale/en/LC_MESSAGES/messages.po b/fietsboek/locale/en/LC_MESSAGES/messages.po
index c950e36..007cdab 100644
--- a/fietsboek/locale/en/LC_MESSAGES/messages.po
+++ b/fietsboek/locale/en/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2026-10-15 00:03+0200\n"
+"POT-Creation-Date: 2026-11-14 11:05+0100\n"
"PO-Revision-Date: 2023-04-03 20:42+0200\n"
"Last-Translator: \n"
"Language: en\n"
@@ -18,11 +18,11 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 2.18.0\n"
-#: fietsboek/actions.py:271
+#: fietsboek/actions.py:255
msgid "email.verify_mail.subject"
msgstr "Fietsboek Account Verification"
-#: fietsboek/actions.py:274
+#: fietsboek/actions.py:258
msgid "email.verify.text"
msgstr ""
"To verify your Fietsboek account, please use this link: {}\n"
@@ -67,43 +67,43 @@ msgid_plural "page.profile.contribution_card.tooltips"
msgstr[0] "${count} track on ${date}"
msgstr[1] "${count} tracks on ${date}"
-#: fietsboek/util.py:299
+#: fietsboek/util.py:384
msgid "password_constraint.mismatch"
msgstr "Passwords don't match"
-#: fietsboek/util.py:301
+#: fietsboek/util.py:386
msgid "password_constraint.length"
msgstr "Password not long enough"
-#: fietsboek/models/track.py:777
+#: fietsboek/models/track.py:817
msgid "tooltip.table.length"
msgstr "Length"
-#: fietsboek/models/track.py:778
+#: fietsboek/models/track.py:818
msgid "tooltip.table.people"
msgstr "# People"
-#: fietsboek/models/track.py:779
+#: fietsboek/models/track.py:819
msgid "tooltip.table.uphill"
msgstr "Uphill"
-#: fietsboek/models/track.py:780
+#: fietsboek/models/track.py:820
msgid "tooltip.table.downhill"
msgstr "Downhill"
-#: fietsboek/models/track.py:781 fietsboek/templates/home.jinja2:7
+#: fietsboek/models/track.py:821 fietsboek/templates/home.jinja2:7
msgid "tooltip.table.moving_time"
msgstr "Moving Time"
-#: fietsboek/models/track.py:782 fietsboek/templates/home.jinja2:8
+#: fietsboek/models/track.py:822 fietsboek/templates/home.jinja2:8
msgid "tooltip.table.stopped_time"
msgstr "Stopped Time"
-#: fietsboek/models/track.py:784
+#: fietsboek/models/track.py:824
msgid "tooltip.table.max_speed"
msgstr "Max Speed"
-#: fietsboek/models/track.py:788
+#: fietsboek/models/track.py:828
msgid "tooltip.table.avg_speed"
msgstr "Average Speed"
@@ -322,14 +322,17 @@ msgid "page.browse.filter.me_tagged_only"
msgstr "Show only tracks in which I'm tagged"
#: fietsboek/templates/browse.jinja2:129
+#: fietsboek/templates/climb_browse.jinja2:95
msgid "page.browse.filters.apply"
msgstr "Apply filters"
#: fietsboek/templates/browse.jinja2:133
+#: fietsboek/templates/climb_browse.jinja2:99
msgid "page.browse.filters.clear_all"
msgstr "Remove filters"
#: fietsboek/templates/browse.jinja2:136
+#: fietsboek/templates/climb_browse.jinja2:102
msgid "page.browse.filters.expand_advanced"
msgstr "Advanced"
@@ -439,10 +442,14 @@ msgid "page.browse.download_multiple"
msgstr "Download selected"
#: fietsboek/templates/browse.jinja2:244 fietsboek/templates/browse.jinja2:248
+#: fietsboek/templates/climb_browse.jinja2:171
+#: fietsboek/templates/climb_browse.jinja2:175
msgid "pagination.previous"
msgstr "Previous"
#: fietsboek/templates/browse.jinja2:253 fietsboek/templates/browse.jinja2:257
+#: fietsboek/templates/climb_browse.jinja2:180
+#: fietsboek/templates/climb_browse.jinja2:184
msgid "pagination.next"
msgstr "Next"
@@ -454,6 +461,100 @@ msgstr "No results matching the filters were found."
msgid "page.browse.no_tracks"
msgstr "You currently do not have access to any tracks. Try logging in."
+#: fietsboek/templates/climb_browse.jinja2:4
+msgid "page.climb_browse.title"
+msgstr "Climbs"
+
+#: fietsboek/templates/climb_browse.jinja2:11
+msgid "page.climb_browse.filter.search_terms"
+msgstr "Search terms"
+
+#: fietsboek/templates/climb_browse.jinja2:20
+msgid "page.climb_browse.filter.length_minimum"
+msgstr "Minimum length"
+
+#: fietsboek/templates/climb_browse.jinja2:26
+msgid "page.climb_browse.filter.length_boundaries"
+msgstr "Length limits"
+
+#: fietsboek/templates/climb_browse.jinja2:32
+msgid "page.climb_browse.filter.length_maximum"
+msgstr "Maximum length"
+
+#: fietsboek/templates/climb_browse.jinja2:40
+msgid "page.climb_browse.filter.grade_minimum"
+msgstr "Minimum grade"
+
+#: fietsboek/templates/climb_browse.jinja2:46
+msgid "page.climb_browse.filter.grade_boundaries"
+msgstr "Grade limits"
+
+#: fietsboek/templates/climb_browse.jinja2:52
+msgid "page.climb_browse.filter.grade_maximum"
+msgstr "Maximum grade"
+
+#: fietsboek/templates/climb_browse.jinja2:65
+msgid "page.climb_browse.filter.date_boundaries"
+msgstr "Date limits"
+
+#: fietsboek/templates/climb_browse.jinja2:84
+msgid "page.climb_browse.filter.uncategorized"
+msgstr "Uncategorized"
+
+#: fietsboek/templates/climb_browse.jinja2:107
+#: fietsboek/templates/climb_browse.jinja2:108
+msgid "page.climb_browse.sort.date"
+msgstr "Sort by date"
+
+#: fietsboek/templates/climb_browse.jinja2:109
+#: fietsboek/templates/climb_browse.jinja2:110
+msgid "page.climb_browse.sort.length"
+msgstr "Sort by length"
+
+#: fietsboek/templates/climb_browse.jinja2:111
+#: fietsboek/templates/climb_browse.jinja2:112
+msgid "page.climb_browse.sort.grade"
+msgstr "Sort by grade"
+
+#: fietsboek/templates/climb_browse.jinja2:113
+#: fietsboek/templates/climb_browse.jinja2:114
+msgid "page.climb_browse.sort.category"
+msgstr "Sort by category"
+
+#: fietsboek/templates/climb_browse.jinja2:122
+msgid "page.climb_browse.num_climb"
+msgid_plural "page.climb_browse.num_climbs"
+msgstr[0] "%(num)d climb found"
+msgstr[1] "%(num)d climbs found"
+
+#: fietsboek/templates/climb_browse.jinja2:145
+#: fietsboek/templates/details.jinja2:221
+msgid "page.details.climb.length"
+msgstr "Length"
+
+#: fietsboek/templates/climb_browse.jinja2:149
+#: fietsboek/templates/details.jinja2:225
+msgid "page.details.climb.average_grade"
+msgstr "Grade"
+
+#: fietsboek/templates/climb_browse.jinja2:153
+#: fietsboek/templates/details.jinja2:229
+msgid "page.details.climb.lowest_elevation"
+msgstr "Lowest point"
+
+#: fietsboek/templates/climb_browse.jinja2:157
+#: fietsboek/templates/details.jinja2:233
+msgid "page.details.climb.highest_elevation"
+msgstr "Highest point"
+
+#: fietsboek/templates/climb_browse.jinja2:191
+msgid "page.climb_browse.no_results"
+msgstr "No results matching the filters were found."
+
+#: fietsboek/templates/climb_browse.jinja2:193
+msgid "page.climb_browse.no_climbs"
+msgstr "You currently do not have access to any climbs. Try logging in."
+
#: fietsboek/templates/create_account.jinja2:5
msgid "page.create_account.title"
msgstr "Create Account"
@@ -578,47 +679,31 @@ msgstr "Climbs"
msgid "page.details.climbs.mark_on_map"
msgstr "Show climbs on map"
-#: fietsboek/templates/details.jinja2:203
+#: fietsboek/templates/details.jinja2:204
msgid "page.details.climbs.climb"
msgstr "Climb"
-#: fietsboek/templates/details.jinja2:220
-msgid "page.details.climb.length"
-msgstr "Length"
-
-#: fietsboek/templates/details.jinja2:224
-msgid "page.details.climb.average_grade"
-msgstr "Grade"
-
-#: fietsboek/templates/details.jinja2:228
-msgid "page.details.climb.lowest_elevation"
-msgstr "Lowest point"
-
-#: fietsboek/templates/details.jinja2:232
-msgid "page.details.climb.highest_elevation"
-msgstr "Highest point"
-
-#: fietsboek/templates/details.jinja2:273
+#: fietsboek/templates/details.jinja2:274
msgid "page.details.comments"
msgstr "Comments"
-#: fietsboek/templates/details.jinja2:277
+#: fietsboek/templates/details.jinja2:278
msgid "page.details.comments.author"
msgstr "Comment by {}"
-#: fietsboek/templates/details.jinja2:294
+#: fietsboek/templates/details.jinja2:295
msgid "page.details.comments.new.title"
msgstr "Create a new comment"
-#: fietsboek/templates/details.jinja2:297
+#: fietsboek/templates/details.jinja2:298
msgid "page.details.comments.new.input_title"
msgstr "Title"
-#: fietsboek/templates/details.jinja2:298
+#: fietsboek/templates/details.jinja2:299
msgid "page.details.comments.new.input_comment"
msgstr "Comment"
-#: fietsboek/templates/details.jinja2:301
+#: fietsboek/templates/details.jinja2:302
msgid "page.details.comments.new.submit"
msgstr "Submit"
@@ -914,39 +999,43 @@ msgstr "Browse"
msgid "page.navbar.journeys"
msgstr "Journeys"
-#: fietsboek/templates/layout.jinja2:65
+#: fietsboek/templates/layout.jinja2:64
+msgid "page.navbar.climb-browse"
+msgstr "Climbs"
+
+#: fietsboek/templates/layout.jinja2:68
msgid "page.navbar.upload"
msgstr "Upload"
-#: fietsboek/templates/layout.jinja2:74
+#: fietsboek/templates/layout.jinja2:77
msgid "page.navbar.user"
msgstr "User"
-#: fietsboek/templates/layout.jinja2:78
+#: fietsboek/templates/layout.jinja2:81
msgid "page.navbar.welcome_user"
msgstr "Welcome, {}!"
-#: fietsboek/templates/layout.jinja2:81
+#: fietsboek/templates/layout.jinja2:84
msgid "page.navbar.logout"
msgstr "Logout"
-#: fietsboek/templates/layout.jinja2:84
+#: fietsboek/templates/layout.jinja2:87
msgid "page.navbar.profile"
msgstr "Profile"
-#: fietsboek/templates/layout.jinja2:87
+#: fietsboek/templates/layout.jinja2:90
msgid "page.navbar.user_data"
msgstr "Personal Data"
-#: fietsboek/templates/layout.jinja2:91
+#: fietsboek/templates/layout.jinja2:94
msgid "page.navbar.admin"
msgstr "Admin"
-#: fietsboek/templates/layout.jinja2:97
+#: fietsboek/templates/layout.jinja2:100
msgid "page.navbar.login"
msgstr "Login"
-#: fietsboek/templates/layout.jinja2:101
+#: fietsboek/templates/layout.jinja2:104
msgid "page.navbar.create_account"
msgstr "Create Account"
@@ -1239,7 +1328,8 @@ msgstr "Smooth elevation profile"
#: fietsboek/transformers/elevation.py:203
msgid "transformers.smooth-elevation.description"
msgstr ""
-"This transformer applies a smoothing to the elevation profile to reduce noise."
+"This transformer applies a smoothing to the elevation profile to reduce "
+"noise."
#: fietsboek/views/account.py:54
msgid "flash.invalid_name"
@@ -1253,15 +1343,15 @@ msgstr "Invalid email"
msgid "flash.a_confirmation_link_has_been_sent"
msgstr "A confirmation link has been sent"
-#: fietsboek/views/admin.py:197
+#: fietsboek/views/admin.py:210
msgid "flash.badge_added"
msgstr "Badge has been added"
-#: fietsboek/views/admin.py:221
+#: fietsboek/views/admin.py:234
msgid "flash.badge_modified"
msgstr "Badge has been modified"
-#: fietsboek/views/admin.py:241
+#: fietsboek/views/admin.py:254
msgid "flash.badge_deleted"
msgstr "Badge has been deleted"
diff --git a/fietsboek/locale/fietslog.pot b/fietsboek/locale/fietslog.pot
index 12638f0..38e50c1 100644
--- a/fietsboek/locale/fietslog.pot
+++ b/fietsboek/locale/fietslog.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2026-10-15 00:03+0200\n"
+"POT-Creation-Date: 2026-11-14 11:05+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,11 +17,11 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 2.18.0\n"
-#: fietsboek/actions.py:271
+#: fietsboek/actions.py:255
msgid "email.verify_mail.subject"
msgstr ""
-#: fietsboek/actions.py:274
+#: fietsboek/actions.py:258
msgid "email.verify.text"
msgstr ""
@@ -63,43 +63,43 @@ msgid_plural "page.profile.contribution_card.tooltips"
msgstr[0] ""
msgstr[1] ""
-#: fietsboek/util.py:299
+#: fietsboek/util.py:384
msgid "password_constraint.mismatch"
msgstr ""
-#: fietsboek/util.py:301
+#: fietsboek/util.py:386
msgid "password_constraint.length"
msgstr ""
-#: fietsboek/models/track.py:777
+#: fietsboek/models/track.py:817
msgid "tooltip.table.length"
msgstr ""
-#: fietsboek/models/track.py:778
+#: fietsboek/models/track.py:818
msgid "tooltip.table.people"
msgstr ""
-#: fietsboek/models/track.py:779
+#: fietsboek/models/track.py:819
msgid "tooltip.table.uphill"
msgstr ""
-#: fietsboek/models/track.py:780
+#: fietsboek/models/track.py:820
msgid "tooltip.table.downhill"
msgstr ""
-#: fietsboek/models/track.py:781 fietsboek/templates/home.jinja2:7
+#: fietsboek/models/track.py:821 fietsboek/templates/home.jinja2:7
msgid "tooltip.table.moving_time"
msgstr ""
-#: fietsboek/models/track.py:782 fietsboek/templates/home.jinja2:8
+#: fietsboek/models/track.py:822 fietsboek/templates/home.jinja2:8
msgid "tooltip.table.stopped_time"
msgstr ""
-#: fietsboek/models/track.py:784
+#: fietsboek/models/track.py:824
msgid "tooltip.table.max_speed"
msgstr ""
-#: fietsboek/models/track.py:788
+#: fietsboek/models/track.py:828
msgid "tooltip.table.avg_speed"
msgstr ""
@@ -316,14 +316,17 @@ msgid "page.browse.filter.me_tagged_only"
msgstr ""
#: fietsboek/templates/browse.jinja2:129
+#: fietsboek/templates/climb_browse.jinja2:95
msgid "page.browse.filters.apply"
msgstr ""
#: fietsboek/templates/browse.jinja2:133
+#: fietsboek/templates/climb_browse.jinja2:99
msgid "page.browse.filters.clear_all"
msgstr ""
#: fietsboek/templates/browse.jinja2:136
+#: fietsboek/templates/climb_browse.jinja2:102
msgid "page.browse.filters.expand_advanced"
msgstr ""
@@ -433,10 +436,14 @@ msgid "page.browse.download_multiple"
msgstr ""
#: fietsboek/templates/browse.jinja2:244 fietsboek/templates/browse.jinja2:248
+#: fietsboek/templates/climb_browse.jinja2:171
+#: fietsboek/templates/climb_browse.jinja2:175
msgid "pagination.previous"
msgstr ""
#: fietsboek/templates/browse.jinja2:253 fietsboek/templates/browse.jinja2:257
+#: fietsboek/templates/climb_browse.jinja2:180
+#: fietsboek/templates/climb_browse.jinja2:184
msgid "pagination.next"
msgstr ""
@@ -448,6 +455,100 @@ msgstr ""
msgid "page.browse.no_tracks"
msgstr ""
+#: fietsboek/templates/climb_browse.jinja2:4
+msgid "page.climb_browse.title"
+msgstr ""
+
+#: fietsboek/templates/climb_browse.jinja2:11
+msgid "page.climb_browse.filter.search_terms"
+msgstr ""
+
+#: fietsboek/templates/climb_browse.jinja2:20
+msgid "page.climb_browse.filter.length_minimum"
+msgstr ""
+
+#: fietsboek/templates/climb_browse.jinja2:26
+msgid "page.climb_browse.filter.length_boundaries"
+msgstr ""
+
+#: fietsboek/templates/climb_browse.jinja2:32
+msgid "page.climb_browse.filter.length_maximum"
+msgstr ""
+
+#: fietsboek/templates/climb_browse.jinja2:40
+msgid "page.climb_browse.filter.grade_minimum"
+msgstr ""
+
+#: fietsboek/templates/climb_browse.jinja2:46
+msgid "page.climb_browse.filter.grade_boundaries"
+msgstr ""
+
+#: fietsboek/templates/climb_browse.jinja2:52
+msgid "page.climb_browse.filter.grade_maximum"
+msgstr ""
+
+#: fietsboek/templates/climb_browse.jinja2:65
+msgid "page.climb_browse.filter.date_boundaries"
+msgstr ""
+
+#: fietsboek/templates/climb_browse.jinja2:84
+msgid "page.climb_browse.filter.uncategorized"
+msgstr ""
+
+#: fietsboek/templates/climb_browse.jinja2:107
+#: fietsboek/templates/climb_browse.jinja2:108
+msgid "page.climb_browse.sort.date"
+msgstr ""
+
+#: fietsboek/templates/climb_browse.jinja2:109
+#: fietsboek/templates/climb_browse.jinja2:110
+msgid "page.climb_browse.sort.length"
+msgstr ""
+
+#: fietsboek/templates/climb_browse.jinja2:111
+#: fietsboek/templates/climb_browse.jinja2:112
+msgid "page.climb_browse.sort.grade"
+msgstr ""
+
+#: fietsboek/templates/climb_browse.jinja2:113
+#: fietsboek/templates/climb_browse.jinja2:114
+msgid "page.climb_browse.sort.category"
+msgstr ""
+
+#: fietsboek/templates/climb_browse.jinja2:122
+msgid "page.climb_browse.num_climb"
+msgid_plural "page.climb_browse.num_climbs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: fietsboek/templates/climb_browse.jinja2:145
+#: fietsboek/templates/details.jinja2:221
+msgid "page.details.climb.length"
+msgstr ""
+
+#: fietsboek/templates/climb_browse.jinja2:149
+#: fietsboek/templates/details.jinja2:225
+msgid "page.details.climb.average_grade"
+msgstr ""
+
+#: fietsboek/templates/climb_browse.jinja2:153
+#: fietsboek/templates/details.jinja2:229
+msgid "page.details.climb.lowest_elevation"
+msgstr ""
+
+#: fietsboek/templates/climb_browse.jinja2:157
+#: fietsboek/templates/details.jinja2:233
+msgid "page.details.climb.highest_elevation"
+msgstr ""
+
+#: fietsboek/templates/climb_browse.jinja2:191
+msgid "page.climb_browse.no_results"
+msgstr ""
+
+#: fietsboek/templates/climb_browse.jinja2:193
+msgid "page.climb_browse.no_climbs"
+msgstr ""
+
#: fietsboek/templates/create_account.jinja2:5
msgid "page.create_account.title"
msgstr ""
@@ -570,47 +671,31 @@ msgstr ""
msgid "page.details.climbs.mark_on_map"
msgstr ""
-#: fietsboek/templates/details.jinja2:203
+#: fietsboek/templates/details.jinja2:204
msgid "page.details.climbs.climb"
msgstr ""
-#: fietsboek/templates/details.jinja2:220
-msgid "page.details.climb.length"
-msgstr ""
-
-#: fietsboek/templates/details.jinja2:224
-msgid "page.details.climb.average_grade"
-msgstr ""
-
-#: fietsboek/templates/details.jinja2:228
-msgid "page.details.climb.lowest_elevation"
-msgstr ""
-
-#: fietsboek/templates/details.jinja2:232
-msgid "page.details.climb.highest_elevation"
-msgstr ""
-
-#: fietsboek/templates/details.jinja2:273
+#: fietsboek/templates/details.jinja2:274
msgid "page.details.comments"
msgstr ""
-#: fietsboek/templates/details.jinja2:277
+#: fietsboek/templates/details.jinja2:278
msgid "page.details.comments.author"
msgstr ""
-#: fietsboek/templates/details.jinja2:294
+#: fietsboek/templates/details.jinja2:295
msgid "page.details.comments.new.title"
msgstr ""
-#: fietsboek/templates/details.jinja2:297
+#: fietsboek/templates/details.jinja2:298
msgid "page.details.comments.new.input_title"
msgstr ""
-#: fietsboek/templates/details.jinja2:298
+#: fietsboek/templates/details.jinja2:299
msgid "page.details.comments.new.input_comment"
msgstr ""
-#: fietsboek/templates/details.jinja2:301
+#: fietsboek/templates/details.jinja2:302
msgid "page.details.comments.new.submit"
msgstr ""
@@ -904,39 +989,43 @@ msgstr ""
msgid "page.navbar.journeys"
msgstr ""
-#: fietsboek/templates/layout.jinja2:65
+#: fietsboek/templates/layout.jinja2:64
+msgid "page.navbar.climb-browse"
+msgstr ""
+
+#: fietsboek/templates/layout.jinja2:68
msgid "page.navbar.upload"
msgstr ""
-#: fietsboek/templates/layout.jinja2:74
+#: fietsboek/templates/layout.jinja2:77
msgid "page.navbar.user"
msgstr ""
-#: fietsboek/templates/layout.jinja2:78
+#: fietsboek/templates/layout.jinja2:81
msgid "page.navbar.welcome_user"
msgstr ""
-#: fietsboek/templates/layout.jinja2:81
+#: fietsboek/templates/layout.jinja2:84
msgid "page.navbar.logout"
msgstr ""
-#: fietsboek/templates/layout.jinja2:84
+#: fietsboek/templates/layout.jinja2:87
msgid "page.navbar.profile"
msgstr ""
-#: fietsboek/templates/layout.jinja2:87
+#: fietsboek/templates/layout.jinja2:90
msgid "page.navbar.user_data"
msgstr ""
-#: fietsboek/templates/layout.jinja2:91
+#: fietsboek/templates/layout.jinja2:94
msgid "page.navbar.admin"
msgstr ""
-#: fietsboek/templates/layout.jinja2:97
+#: fietsboek/templates/layout.jinja2:100
msgid "page.navbar.login"
msgstr ""
-#: fietsboek/templates/layout.jinja2:101
+#: fietsboek/templates/layout.jinja2:104
msgid "page.navbar.create_account"
msgstr ""
@@ -1236,15 +1325,15 @@ msgstr ""
msgid "flash.a_confirmation_link_has_been_sent"
msgstr ""
-#: fietsboek/views/admin.py:197
+#: fietsboek/views/admin.py:210
msgid "flash.badge_added"
msgstr ""
-#: fietsboek/views/admin.py:221
+#: fietsboek/views/admin.py:234
msgid "flash.badge_modified"
msgstr ""
-#: fietsboek/views/admin.py:241
+#: fietsboek/views/admin.py:254
msgid "flash.badge_deleted"
msgstr ""
diff --git a/fietsboek/routes.py b/fietsboek/routes.py
index da9ed04..636c62a 100644
--- a/fietsboek/routes.py
+++ b/fietsboek/routes.py
@@ -70,6 +70,7 @@ def includeme(config):
"/climb/{climb_id}/profile",
factory="fietsboek.models.Climb.factory",
)
+ config.add_route("climb-browse", "/climb/")
config.add_route("journey-list", "/journey/")
config.add_route(
diff --git a/fietsboek/static/theme.css b/fietsboek/static/theme.css
index 6b9e1c2..f4920e2 100644
--- a/fietsboek/static/theme.css
+++ b/fietsboek/static/theme.css
@@ -232,6 +232,27 @@ strong {
}
/* </Climbs> */
+/* <Climb-Browse> */
+.climb-browse-card .card-body {
+ padding: 0;
+ display: grid;
+ grid-template-areas: "map stats" "map profile";
+ grid-template-rows: 190px 110px;
+}
+.climb-browse-card .climb-profile {
+ grid-area: profile;
+ width: 300px;
+ height: 110px;
+}
+
+.climb-browse-list {
+ display: flex;
+ flex-wrap: wrap;
+ gap: 1rem;
+ justify-content: center;
+}
+
+/* </Climb-Browse> */
.count-field {
width: 50px;
display: inline-block;
diff --git a/fietsboek/static/theme.css.map b/fietsboek/static/theme.css.map
index 30b9235..c717ba9 100644
--- a/fietsboek/static/theme.css.map
+++ b/fietsboek/static/theme.css.map
@@ -1 +1 @@
-{"version":3,"sourceRoot":"","sources":["../../asset-sources/theme.scss"],"names":[],"mappings":"AAAA;EACE;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;;;AAGF;EACE;;AAEA;EACE;EACA;EACA;;;AAIJ;EACE;EACA;;;AAGF;EACE;EACA;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;;;AAGF;EACE;EACA;;;AAIA;EACE;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;;AAlCJ;EAqCE;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACI;;;AAGJ;EACE;EACA;;;AAGF;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;;;AAGF;EACE;;;AAGF;EACE;EACA;EACA;;AAEA;EACE;EACA;;AAGF;EACE;;;AAIJ;EACE;;;AAGF;EACE;;;AAGF;AACA;EACE;EACA;EACA;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;;;AAIA;EACE;;;AAGJ;AAEA;EACE;EACA;EACA;EACA;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;EACA;EACA;;;AAGF;EACE;;;AAEF;EACE;EACA;;;AAEF;EACE;;AAEA;EACE;EACA;;AAGF;EACE;EACA;;AAGF;EACE;EACA;;AAEA;EACE;EACA;;AAGF;EACE;EACA;;AAIJ;EACE;;AAEF;EACE;;AACA;EACE;;AAGJ;EACE;;AACA;EACE;;AAGJ;EACE;;AACA;EACE;;AAGJ;EACE;;AACA;EACE;;AAGJ;EACE;EACA;;AACA;EACE;;AAIJ;EACE;EACA;;;AAKF;EACE;EACA;EAEA;EACA;;;AAIJ;EACE;EACA;;;AAGF;EACE;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EACE;;;AAGF;EACE;;;AAGF;AACA;EACE;;;AAGF;EACE;EACA;;AAEA;EAJF;IAKI,eACE;;;AAIJ;EACE;;AAGF;EACE;;AAEA;EAHF;IAII;;;AAGF;EACE;EACA;;AAIJ;EACE;EACA;;;AAIJ;EACE;;;AAGF;AACA;EACE;EACA;AACA;AAAA;AAAA;EAGA;EACA;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;;AAEA;EACE;;;AAIJ;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE","file":"theme.css"} \ No newline at end of file
+{"version":3,"sourceRoot":"","sources":["../../asset-sources/theme.scss"],"names":[],"mappings":"AAAA;EACE;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;;;AAGF;EACE;;AAEA;EACE;EACA;EACA;;;AAIJ;EACE;EACA;;;AAGF;EACE;EACA;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;;;AAGF;EACE;EACA;;;AAIA;EACE;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;;AAlCJ;EAqCE;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACI;;;AAGJ;EACE;EACA;;;AAGF;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;;;AAGF;EACE;;;AAGF;EACE;EACA;EACA;;AAEA;EACE;EACA;;AAGF;EACE;;;AAIJ;EACE;;;AAGF;EACE;;;AAGF;AACA;EACE;EACA;EACA;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;;;AAIA;EACE;;;AAGJ;AAEA;AAEE;EACE;EACA;EACA,qBACE;EAEF;;AAGF;EACE;EACA;EACA;;;AAIJ;EACE;EACA;EACA;EACA;;;AAEF;AAEA;EACE;EACA;EACA;EACA;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;EACA;EACA;;;AAGF;EACE;;;AAEF;EACE;EACA;;;AAEF;EACE;;AAEA;EACE;EACA;;AAGF;EACE;EACA;;AAGF;EACE;EACA;;AAEA;EACE;EACA;;AAGF;EACE;EACA;;AAIJ;EACE;;AAEF;EACE;;AACA;EACE;;AAGJ;EACE;;AACA;EACE;;AAGJ;EACE;;AACA;EACE;;AAGJ;EACE;;AACA;EACE;;AAGJ;EACE;EACA;;AACA;EACE;;AAIJ;EACE;EACA;;;AAKF;EACE;EACA;EAEA;EACA;;;AAIJ;EACE;EACA;;;AAGF;EACE;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EACE;;;AAGF;EACE;;;AAGF;AACA;EACE;;;AAGF;EACE;EACA;;AAEA;EAJF;IAKI,eACE;;;AAIJ;EACE;;AAGF;EACE;;AAEA;EAHF;IAII;;;AAGF;EACE;EACA;;AAIJ;EACE;EACA;;;AAIJ;EACE;;;AAGF;AACA;EACE;EACA;AACA;AAAA;AAAA;EAGA;EACA;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;;AAEA;EACE;;;AAIJ;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE","file":"theme.css"} \ No newline at end of file
diff --git a/fietsboek/templates/climb_browse.jinja2 b/fietsboek/templates/climb_browse.jinja2
new file mode 100644
index 0000000..0201d22
--- /dev/null
+++ b/fietsboek/templates/climb_browse.jinja2
@@ -0,0 +1,196 @@
+{% extends "layout.jinja2" %}
+{% block content %}
+<div class="container">
+ <h1>{{ _("page.climb_browse.title") }}</h1>
+ <div class="mb-3">
+ <form id="browseFilter">
+ <div class="row g-3 mb-3">
+ <div class="col-12">
+ <div class="input-group">
+ <button type="button" class="btn btn-outline-secondary button-clear-input"><i class="bi bi-eraser-fill"></i></button>
+ <input name="search-terms" type="text" class="form-control ui-element" placeholder="{{ _("page.climb_browse.filter.search_terms") }}" value="{{ request.params.get('search-terms', '') }}">
+ </div>
+ </div>
+ </div>
+
+ <div class="collapse row g-3 mb-3" id="advancedSearch">
+ <div class="col-md-4">
+ <div class="input-group">
+ <button type="button" class="btn btn-outline-secondary button-clear-input"><i class="bi bi-eraser-fill"></i></button>
+ <input name="min-length" type="number" class="form-control ui-element" placeholder="{{ _("page.climb_browse.filter.length_minimum") }}" value="{{ request.params.get('min-length', '') }}">
+ <span class="input-group-text ui-element">km</span>
+ </div>
+ </div>
+
+ <div class="col-md-4 fs-5 d-flex align-items-center justify-content-center ui-element">
+ {{ _("page.climb_browse.filter.length_boundaries") }}
+ </div>
+
+ <div class="col-md-4">
+ <div class="input-group">
+ <button type="button" class="btn btn-outline-secondary button-clear-input"><i class="bi bi-eraser-fill"></i></button>
+ <input name="max-length" type="number" class="form-control ui-element" placeholder="{{ _("page.climb_browse.filter.length_maximum") }}" value="{{ request.params.get('max-length', '') }}">
+ <span class="input-group-text ui-element">km</span>
+ </div>
+ </div>
+
+ <div class="col-md-4">
+ <div class="input-group">
+ <button type="button" class="btn btn-outline-secondary button-clear-input"><i class="bi bi-eraser-fill"></i></button>
+ <input name="min-grade" type="number" class="form-control ui-element" placeholder="{{ _("page.climb_browse.filter.grade_minimum") }}" value="{{ request.params.get('min-grade', '') }}" step="0.01">
+ <span class="input-group-text ui-element">%</span>
+ </div>
+ </div>
+
+ <div class="col-md-4 fs-5 d-flex align-items-center justify-content-center ui-element">
+ {{ _("page.climb_browse.filter.grade_boundaries") }}
+ </div>
+
+ <div class="col-md-4">
+ <div class="input-group">
+ <button type="button" class="btn btn-outline-secondary button-clear-input"><i class="bi bi-eraser-fill"></i></button>
+ <input name="max-grade" type="number" class="form-control ui-element" placeholder="{{ _("page.climb_browse.filter.grade_maximum") }}" value="{{ request.params.get('max-grade', '') }}" step="0.01">
+ <span class="input-group-text ui-element">%</span>
+ </div>
+ </div>
+
+ <div class="col-md-4">
+ <div class="input-group">
+ <button type="button" class="btn btn-outline-secondary button-clear-input"><i class="bi bi-eraser-fill"></i></button>
+ <input name="min-date" type="date" class="form-control ui-element" value="{{ request.params.get('min-date', '') }}">
+ </div>
+ </div>
+
+ <div class="col-md-4 fs-5 d-flex align-items-center justify-content-center ui-element">
+ {{ _("page.climb_browse.filter.date_boundaries") }}
+ </div>
+
+ <div class="col-md-4">
+ <div class="input-group">
+ <button type="button" class="btn btn-outline-secondary button-clear-input"><i class="bi bi-eraser-fill"></i></button>
+ <input name="max-date" type="date" class="form-control ui-element" value="{{ request.params.get('max-date', '') }}">
+ </div>
+ </div>
+
+ <div class="col-md-12">
+ <div class="input-group">
+ <button type="button" class="btn btn-outline-secondary button-clear-input"><i class="bi bi-eraser-fill"></i></button>
+ <select class="form-select ui-element" size="6" name="category[]" multiple>
+ <option value="0"{% if "0" in request.params.getall("category[]") %} selected{% endif %}>HC</option>
+ <option value="1"{% if "1" in request.params.getall("category[]") %} selected{% endif %}>1</option>
+ <option value="2"{% if "2" in request.params.getall("category[]") %} selected{% endif %}>2</option>
+ <option value="3"{% if "3" in request.params.getall("category[]") %} selected{% endif %}>3</option>
+ <option value="4"{% if "4" in request.params.getall("category[]") %} selected{% endif %}>4</option>
+ <option value="-1"{% if "-1" in request.params.getall("category[]") %} selected{% endif %}>{{ _("page.climb_browse.filter.uncategorized") }}</option>
+ </select>
+ </div>
+ </div>
+
+ </div>
+
+ <div class="row g-3 mb-3">
+ <div class="col">
+ <button type="submit" class="btn btn-primary ui-element">
+ <i class="bi bi-funnel-fill"></i>
+ {{ _("page.browse.filters.apply") }}
+ </button>
+ <a class="btn btn-info ui-element" href="{{ request.route_path('climb-browse') }}">
+ <i class="bi bi-x-octagon"></i>
+ {{ _("page.browse.filters.clear_all") }}
+ </a>
+ <button class="btn btn-secondary ui-element" type="button" data-bs-toggle="collapse" data-bs-target="#advancedSearch" aria-expanded="false" aria-controls="advancedSearch">
+ {{ _("page.browse.filters.expand_advanced") }}
+ </button>
+ </div>
+ <div class="col">
+ <select class="form-select ui-element" name="sort">
+ <option value="DATE_DESC" {% if request.params.get("sort") == "DATE_DESC" %}selected{% endif %}>{{ _("page.climb_browse.sort.date") }} &ShortDownArrow;</option>
+ <option value="DATE_ASC" {% if request.params.get("sort") == "DATE_ASC" %}selected{% endif %}>{{ _("page.climb_browse.sort.date") }} &ShortUpArrow;</option>
+ <option value="LENGTH_DESC" {% if request.params.get("sort") == "LENGTH_DESC" %}selected{% endif %}>{{ _("page.climb_browse.sort.length") }} &ShortDownArrow;</option>
+ <option value="LENGTH_ASC" {% if request.params.get("sort") == "LENGTH_ASC" %}selected{% endif %}>{{ _("page.climb_browse.sort.length") }} &ShortUpArrow;</option>
+ <option value="GRADE_DESC" {% if request.params.get("sort") == "GRADE_DESC" %}selected{% endif %}>{{ _("page.climb_browse.sort.grade") }} &ShortDownArrow;</option>
+ <option value="GRADE_ASC" {% if request.params.get("sort") == "GRADE_ASC" %}selected{% endif %}>{{ _("page.climb_browse.sort.grade") }} &ShortUpArrow;</option>
+ <option value="CATEGORY_DESC" {% if request.params.get("sort") == "CATEGORY_DESC" %}selected{% endif %}>{{ _("page.climb_browse.sort.category") }} &ShortDownArrow;</option>
+ <option value="CATEGORY_ASC" {% if request.params.get("sort") == "CATEGORY_ASC" %}selected{% endif %}>{{ _("page.climb_browse.sort.category") }} &ShortUpArrow;</option>
+ </select>
+ </div>
+ </div>
+ </form>
+ </div>
+ {% if climbs %}
+ <p clas="mb-3">
+ {{ ngettext("page.climb_browse.num_climb", "page.climb_browse.num_climbs", total_count) }}
+ </p>
+ <div class="climb-browse-list mb-3">
+ {% for climb in climbs %}
+ <div class="card climb-browse-card">
+ <h5 class="card-header">
+ <a href="{{ request.route_url('details', track_id=climb.track_id) }}#climb-{{ climb.id }}">
+ {{ climb.display_name() }}
+ </a>
+ {% if climb.category is not none %}
+ <div class="climb-category climb-category-{{ climb.category }}">
+ {% if climb.category == 0 %}
+ HC
+ {% else %}
+ {{ climb.category }}
+ {% endif %}
+ </div>
+ {% endif %}
+ </h5>
+ <div class="card-body">
+ <img src="{{ request.route_url('climb-preview', climb_id=climb.id) }}" style="grid-area: map;">
+ <table class="table climb-details" style="grid-area: stats;">
+ <tr>
+ <th scope="row">{{ _("page.details.climb.length") }}</th>
+ <td>{{ (climb.length / 1000) | round(2) | format_decimal }} km</td>
+ </tr>
+ <tr>
+ <th scope="row">{{ _("page.details.climb.average_grade") }}</th>
+ <td>{{ (climb.avg_grade * 100) | round(2) | format_decimal }} %</td>
+ </tr>
+ <tr>
+ <th scope="row">{{ _("page.details.climb.lowest_elevation") }}</th>
+ <td>{{ climb.lowest_elevation | round(2) | format_decimal }} m</td>
+ </tr>
+ <tr>
+ <th scope="row">{{ _("page.details.climb.highest_elevation") }}</th>
+ <td>{{ climb.highest_elevation | round(2) | format_decimal }} m</td>
+ </tr>
+ </table>
+ <img class="climb-profile" src="{{ request.route_url('climb-profile', climb_id=climb.id) }}">
+ </div>
+ </div>
+ {% endfor %}
+ </div>
+
+ <nav aria-label="Page navigation">
+ <ul class="pagination justify-content-center">
+ {% if page_previous is none %}
+ <li class="page-item disabled">
+ <span class="page-link">{{ _("pagination.previous") }}</span>
+ </li>
+ {% else %}
+ <li class="page-item">
+ <a class="page-link" href="{{ page_previous | safe }}">{{ _("pagination.previous") }}</a>
+ </li>
+ {% endif %}
+ {% if page_next is none %}
+ <li class="page-item disabled">
+ <span class="page-link">{{ _("pagination.next") }}</span>
+ </li>
+ {% else %}
+ <li class="page-item">
+ <a class="page-link" href="{{ page_next | safe }}">{{ _("pagination.next") }}</a>
+ </li>
+ {% endif %}
+ </ul>
+ </nav>
+
+ {% elif used_filters %}
+ <p>{{ _("page.climb_browse.no_results") }}</p>
+ {% else %}
+ <p>{{ _("page.climb_browse.no_climbs") }}</p>
+ {% endif %}
+</div>
+{% endblock %}
diff --git a/fietsboek/templates/details.jinja2 b/fietsboek/templates/details.jinja2
index 210e301..0fd7d30 100644
--- a/fietsboek/templates/details.jinja2
+++ b/fietsboek/templates/details.jinja2
@@ -199,6 +199,7 @@
<div class="climbs">
{% for climb in track.climbs %}
<div class="climb card">
+ <a name="climb-{{ climb.id }}">
<h5 class="card-header">
{{ climb.display_name() | default(_("page.details.climbs.climb"), true) }}
{% if climb.category is not none %}
diff --git a/fietsboek/templates/layout.jinja2 b/fietsboek/templates/layout.jinja2
index 3058553..d7f8086 100644
--- a/fietsboek/templates/layout.jinja2
+++ b/fietsboek/templates/layout.jinja2
@@ -60,6 +60,9 @@ const Legende = false;
<li class="nav-item">
<a class="nav-link" href="{{ request.route_url('journey-list') }}">{{ _("page.navbar.journeys") }}</a>
</li>
+ <li class="nav-item">
+ <a class="nav-link" href="{{ request.route_url('climb-browse') }}">{{ _("page.navbar.climb-browse") }}</a>
+ </li>
{% if request.identity is not none %}
<li class="nav-item">
<a class="nav-link" href="{{ request.route_url('upload') }}">{{ _("page.navbar.upload") }}</a>
diff --git a/fietsboek/util.py b/fietsboek/util.py
index ecb3f43..93ad48c 100644
--- a/fietsboek/util.py
+++ b/fietsboek/util.py
@@ -6,6 +6,8 @@ import os
import re
import secrets
import unicodedata
+import urllib.parse
+from enum import Enum
from pathlib import Path
from typing import Optional, TypeVar
@@ -23,6 +25,8 @@ from sqlalchemy import select
T = TypeVar("T")
+E = TypeVar("E", bound=Enum)
+
ALLOWED_TAGS = (
# Those were the bleach defaults, they worked fine
{"a", "abbr", "acronym", "b", "blockquote", "code", "em", "i", "li", "ol", "strong", "ul"}
@@ -278,6 +282,87 @@ def retrieve_multiple(
return objects
+def get_enum(enum: type[E], value: str) -> E:
+ """Retrieve an enum value by a string name.
+
+ This is equivalent to ``enum[value]``, but raises an appropriate HTTP exception on errors.
+ Therefore, this function is useful to parse query parameters.
+
+ :param enum: The enum class.
+ :param value: Name of the value.
+ :return: The enum item.
+ :raises HTTPBadRequest: If the string does not represent a valid item.
+ """
+ try:
+ return enum[value]
+ except KeyError as exc:
+ raise HTTPBadRequest(f"Invalid enum value {value!r}") from exc
+
+
+def get_int(request: Request, name: str) -> int:
+ """Retrieve an integer from a query parameter.
+
+ This raises an HTTP exception if the integer could not be parsed.
+
+ :param request: The HTTP request.
+ :param name: Name of the query parameter.
+ :return: The converted integer.
+ :raises HTTPBadRequest: If the request parameter could not be converted to an integer.
+ """
+ try:
+ return int(request.params.get(name))
+ except ValueError as exc:
+ raise HTTPBadRequest(f"Invalid integer in {name!r}") from exc
+
+
+def get_float(request: Request, name: str) -> float:
+ """Retrieve a float from a query parameter.
+
+ This raises an HTTP exception if the float could not be parsed.
+
+ :param request: The HTTP request.
+ :param name: Name of the query parameter.
+ :return: The converted float.
+ :raises HTTPBadRequest: If the request parameter could not be converted to a float.
+ """
+ try:
+ return float(request.params.get(name))
+ except ValueError as exc:
+ raise HTTPBadRequest(f"Invalid float in {name!r}") from exc
+
+
+def get_date(request: Request, name: str) -> datetime.date:
+ """Retrieve a date from a query parameter.
+
+ This raises an HTTP exception if the date could not be parsed.
+
+ :param request: The HTTP request.
+ :param name: Name of the query parameter.
+ :return: The converted date.
+ :raises HTTPBadRequest: If the request parameter could not be converted to a date.
+ """
+ try:
+ return datetime.date.fromisoformat(request.params.get(name))
+ except ValueError as exc:
+ raise HTTPBadRequest(f"Invalid date in {name!r}") from exc
+
+
+def qs_replace(url: str, **kwargs: str) -> str:
+ """Construct a new url based on the given one, with the query parameters replaced as given by
+ kwargs.
+
+ :param url: The original url.
+ :parma kwargs: The query string items to replace.
+ :return: The new URL.
+ """
+ parsed = urllib.parse.urlparse(url)
+ query = urllib.parse.parse_qs(parsed.query)
+ for k, v in kwargs.items():
+ query[k] = [v]
+ new_qs = urllib.parse.urlencode(query, doseq=True)
+ return urllib.parse.urlunparse(parsed._replace(query=new_qs))
+
+
def check_password_constraints(password: str, repeat_password: Optional[str] = None):
"""Verifies that the password constraints match for the given password.
@@ -501,6 +586,7 @@ __all__ = [
"day_name",
"random_link_secret",
"retrieve_multiple",
+ "get_enum",
"check_password_constraints",
"read_localized_resource",
"locale_display_name",
diff --git a/fietsboek/views/browse.py b/fietsboek/views/browse.py
index 490b9b4..b71fccc 100644
--- a/fietsboek/views/browse.py
+++ b/fietsboek/views/browse.py
@@ -2,14 +2,13 @@
import datetime
import json
-import urllib.parse
from collections.abc import Callable, Iterable
from enum import Enum
from io import RawIOBase
-from typing import Iterator, TypeVar
+from typing import Iterator
from zipfile import ZIP_DEFLATED, ZipFile
-from pyramid.httpexceptions import HTTPBadRequest, HTTPForbidden, HTTPNotFound
+from pyramid.httpexceptions import HTTPForbidden, HTTPNotFound
from pyramid.request import Request
from pyramid.response import Response
from pyramid.view import view_config
@@ -21,7 +20,6 @@ from .. import models, util
from ..models.track import TrackType, TrackWithMetadata
TRACKS_PER_PAGE = 20
-T = TypeVar("T", bound=Enum)
AliasedTrack = type[models.Track]
@@ -51,35 +49,6 @@ class Stream(RawIOBase):
return b"".join(buf)
-def _get_int(request: Request, name: str) -> int:
- try:
- return int(request.params.get(name))
- except ValueError as exc:
- raise HTTPBadRequest(f"Invalid integer in {name!r}") from exc
-
-
-def _get_date(request: Request, name: str) -> datetime.date:
- try:
- return datetime.date.fromisoformat(request.params.get(name))
- except ValueError as exc:
- raise HTTPBadRequest(f"Invalid date in {name!r}") from exc
-
-
-def _get_enum(enum: type[T], value: str) -> T:
- try:
- return enum[value]
- except KeyError as exc:
- raise HTTPBadRequest(f"Invalid enum value {value!r}") from exc
-
-
-def _with_page(url: str, num: int) -> str:
- parsed = urllib.parse.urlparse(url)
- query = urllib.parse.parse_qs(parsed.query)
- query["page"] = [str(num)]
- new_qs = urllib.parse.urlencode(query, doseq=True)
- return urllib.parse.urlunparse(parsed._replace(query=new_qs))
-
-
class ResultOrder(Enum):
"""Enum representing the different ways in which the tracks can be sorted
in the result."""
@@ -315,7 +284,7 @@ class FilterCollection(Filter):
if request.params.get("min-length"):
# Value is given in km, so convert it to m
- min_length = _get_int(request, "min-length") * 1000
+ min_length = util.get_int(request, "min-length") * 1000
filters.append(
LambdaFilter(
lambda query, track: query.where(
@@ -329,7 +298,7 @@ class FilterCollection(Filter):
)
if request.params.get("max-length"):
- max_length = _get_int(request, "max-length") * 1000
+ max_length = util.get_int(request, "max-length") * 1000
filters.append(
LambdaFilter(
lambda query, track: query.where(
@@ -343,7 +312,7 @@ class FilterCollection(Filter):
)
if request.params.get("min-uphill"):
- min_uphill = _get_int(request, "min-uphill")
+ min_uphill = util.get_int(request, "min-uphill")
filters.append(
LambdaFilter(
lambda query, track: query.where(
@@ -357,7 +326,7 @@ class FilterCollection(Filter):
)
if request.params.get("max-uphill"):
- max_uphill = _get_int(request, "max-uphill")
+ max_uphill = util.get_int(request, "max-uphill")
filters.append(
LambdaFilter(
lambda query, track: query.where(
@@ -371,7 +340,7 @@ class FilterCollection(Filter):
)
if request.params.get("min-date"):
- min_date = _get_date(request, "min-date")
+ min_date = util.get_date(request, "min-date")
min_date = datetime.datetime.combine(min_date, datetime.time.min)
filters.append(
LambdaFilter(
@@ -381,7 +350,7 @@ class FilterCollection(Filter):
)
if request.params.get("max-date"):
- max_date = _get_date(request, "max-date")
+ max_date = util.get_date(request, "max-date")
max_date = datetime.datetime.combine(max_date, datetime.time.max)
filters.append(
LambdaFilter(
@@ -411,7 +380,7 @@ class FilterCollection(Filter):
filters.append(UserTaggedFilter(request.identity))
if "type[]" in request.params:
- types = {_get_enum(TrackType, value) for value in request.params.getall("type[]")}
+ types = {util.get_enum(TrackType, value) for value in request.params.getall("type[]")}
filters.append(
LambdaFilter(
lambda query, track: query.where(track.type.in_(types)),
@@ -518,13 +487,13 @@ def browse(request: Request) -> Response:
query = filters.compile(query, track)
if "page" in request.params:
- page = _get_int(request, "page")
+ page = util.get_int(request, "page")
else:
page = 1
order = ResultOrder.DATE_DESC
if request.params.get("sort"):
- order = _get_enum(ResultOrder, request.params.get("sort"))
+ order = util.get_enum(ResultOrder, request.params.get("sort"))
query = apply_order(query, track, order)
tracks = list(
@@ -554,8 +523,12 @@ def browse(request: Request) -> Response:
"tracks": tracks[:TRACKS_PER_PAGE],
"mps_to_kph": util.mps_to_kph,
"used_filters": bool(filters),
- "page_previous": None if page == 1 else _with_page(request.url, page - 1),
- "page_next": None if len(tracks) <= TRACKS_PER_PAGE else _with_page(request.url, page + 1),
+ "page_previous": None if page == 1 else util.qs_replace(request.url, page=str(page - 1)),
+ "page_next": (
+ None
+ if len(tracks) <= TRACKS_PER_PAGE
+ else util.qs_replace(request.url, page=str(page + 1))
+ ),
}
diff --git a/fietsboek/views/climb.py b/fietsboek/views/climb.py
new file mode 100644
index 0000000..5d9fcf6
--- /dev/null
+++ b/fietsboek/views/climb.py
@@ -0,0 +1,197 @@
+"""Climb related endpoints."""
+
+import gzip
+import logging
+from enum import Enum
+
+from pyramid.httpexceptions import HTTPBadRequest, HTTPNotAcceptable
+from pyramid.request import Request
+from pyramid.response import Response
+from pyramid.view import view_config
+from sqlalchemy import and_, nulls_first, nulls_last, or_, select
+from sqlalchemy.orm import aliased
+from sqlalchemy.sql import Select
+
+from .. import models, util
+
+LOGGER = logging.getLogger(__name__)
+
+CLIMBS_PER_PAGE = 40
+
+
+class ResultOrder(Enum):
+ """Enum representing the different ways in which the climbs can be sorted
+ in the result."""
+
+ # pylint: disable=duplicate-code
+
+ DATE_ASC = "date-asc"
+ DATE_DESC = "date-desc"
+ LENGTH_ASC = "length-asc"
+ LENGTH_DESC = "length-desc"
+ GRADE_ASC = "grade-asc"
+ GRADE_DESC = "grade-desc"
+ CATEGORY_ASC = "category-asc"
+ CATEGORY_DESC = "category-desc"
+
+
+def _apply_order(query: Select, order: ResultOrder) -> Select:
+ match order:
+ case ResultOrder.DATE_ASC:
+ query = query.order_by(models.Track.date_raw.asc())
+ case ResultOrder.DATE_DESC:
+ query = query.order_by(models.Track.date_raw.desc())
+ case ResultOrder.LENGTH_ASC:
+ query = query.order_by(models.Climb.length.asc())
+ case ResultOrder.LENGTH_DESC:
+ query = query.order_by(models.Climb.length.desc())
+ case ResultOrder.GRADE_ASC:
+ query = query.order_by(models.Climb.avg_grade.asc())
+ case ResultOrder.GRADE_DESC:
+ query = query.order_by(models.Climb.avg_grade.desc())
+ case ResultOrder.CATEGORY_ASC:
+ query = query.order_by(nulls_first(models.Climb.category.desc()))
+ case ResultOrder.CATEGORY_DESC:
+ query = query.order_by(nulls_last(models.Climb.category.asc()))
+ return query
+
+
+def _apply_filters(query: Select, request: Request) -> Select:
+ if request.params.get("search-terms"):
+ terms = request.params.get("search-terms").split()
+ clauses = []
+ for term in terms:
+ escaped = term.replace("/", "//").replace("%", "/%").replace("_", "/_")
+ clauses.append(models.Climb.automatic_name.ilike(f"%{escaped}%"))
+ query = query.where(and_(*clauses))
+
+ if request.params.get("min-length"):
+ min_length = util.get_int(request, "min-length")
+ query = query.where(models.Climb.length >= min_length * 1000)
+
+ if request.params.get("max-length"):
+ max_length = util.get_int(request, "max-length")
+ query = query.where(models.Climb.length <= max_length * 1000)
+
+ if request.params.get("min-grade"):
+ min_grade = util.get_float(request, "min-grade")
+ query = query.where(models.Climb.avg_grade >= min_grade / 100)
+
+ if request.params.get("max-grade"):
+ max_grade = util.get_float(request, "max-grade")
+ query = query.where(models.Climb.avg_grade <= max_grade / 100)
+
+ if request.params.get("min-date"):
+ min_date = util.get_date(request, "min-date")
+ query = query.where(models.Track.date_raw >= min_date)
+
+ if request.params.get("max-date"):
+ max_date = util.get_date(request, "max-date")
+ query = query.where(models.Track.date_raw <= max_date)
+
+ if request.params.get("category[]"):
+ try:
+ categories = [int(c) for c in request.params.getall("category[]")]
+ except ValueError:
+ raise HTTPBadRequest("invalid category") from None
+ if -1 in categories:
+ query = query.where(
+ or_(models.Climb.category.in_(categories), models.Climb.category.is_(None))
+ )
+ else:
+ query = query.where(models.Climb.category.in_(categories))
+
+ return query
+
+
+@view_config(
+ route_name="climb-browse",
+ renderer="fietsboek:templates/climb_browse.jinja2",
+ request_method="GET",
+)
+def climb_browse(request: Request):
+ """Endpoint to return the list of climbs.
+
+ :param request: The pyramid request.
+ :return: The HTTP response.
+ """
+ tracks_qry = aliased(
+ models.Track, models.User.visible_tracks_query(request.identity).subquery()
+ )
+ climbs_qry = (
+ select(models.Climb)
+ .filter(models.Climb.track_id.in_(select(tracks_qry.id)))
+ .join(models.Climb.track)
+ )
+
+ order = ResultOrder.DATE_DESC
+ if request.params.get("sort"):
+ order = util.get_enum(ResultOrder, request.params.get("sort"))
+ climbs_qry = _apply_order(climbs_qry, order)
+
+ climbs_qry = _apply_filters(climbs_qry, request)
+
+ page = 1
+ if request.params.get("page"):
+ page = util.get_int(request, "page")
+
+ start = (page - 1) * CLIMBS_PER_PAGE
+ stop = start + CLIMBS_PER_PAGE + 1
+ climbs = list(request.dbsession.execute(climbs_qry).scalars())
+ total_count = len(climbs)
+ climbs = climbs[start:stop]
+ return {
+ "total_count": total_count,
+ "climbs": climbs[:CLIMBS_PER_PAGE],
+ "page_previous": None if page <= 1 else util.qs_replace(request.url, page=str(page - 1)),
+ "page_next": (
+ None
+ if len(climbs) <= CLIMBS_PER_PAGE
+ else util.qs_replace(request.url, page=str(page + 1))
+ ),
+ }
+
+
+@view_config(route_name="climb-preview", permission="track.view")
+def climb_preview(request: Request):
+ """Endpoint to return the climb's preview image.
+
+ :param request: The pyramid request.
+ :return: The HTTP response.
+ """
+ climb: models.Climb = request.context
+ response = Response(climb.image, content_type="image/png")
+ return response
+
+
+@view_config(route_name="climb-profile", permission="track.view")
+def climb_profile(request: Request):
+ """Endpoint to return the climb's profile image.
+
+ :param request: The pyramid request.
+ :return: The HTTP response.
+ """
+ climb: models.Climb = request.context
+ accepted = request.accept_encoding.acceptable_offers(["gzip", "identity"])
+ for encoding, _qvalue in accepted:
+ if encoding == "gzip":
+ response = Response(
+ climb.profile,
+ content_type="image/svg+xml",
+ content_encoding="gzip",
+ )
+ break
+ if encoding == "identity":
+ data = gzip.decompress(climb.profile)
+ response = Response(data, content_type="image/svg+xml")
+ break
+ else:
+ return HTTPNotAcceptable("No data with acceptable encoding found")
+ return response
+
+
+__all__ = [
+ "climb_browse",
+ "climb_preview",
+ "climb_profile",
+]
diff --git a/fietsboek/views/detail.py b/fietsboek/views/detail.py
index 91778fd..d6e8653 100644
--- a/fietsboek/views/detail.py
+++ b/fietsboek/views/detail.py
@@ -312,44 +312,6 @@ def track_pdf(request: Request):
return response
-@view_config(route_name="climb-preview", permission="track.view")
-def climb_preview(request: Request):
- """Endpoint to return the climb's preview image.
-
- :param request: The pyramid request.
- :return: The HTTP response.
- """
- climb: models.Climb = request.context
- response = Response(climb.image, content_type="image/png")
- return response
-
-
-@view_config(route_name="climb-profile", permission="track.view")
-def climb_profile(request: Request):
- """Endpoint to return the climb's profile image.
-
- :param request: The pyramid request.
- :return: The HTTP response.
- """
- climb: models.Climb = request.context
- accepted = request.accept_encoding.acceptable_offers(["gzip", "identity"])
- for encoding, _qvalue in accepted:
- if encoding == "gzip":
- response = Response(
- climb.profile,
- content_type="image/svg+xml",
- content_encoding="gzip",
- )
- break
- if encoding == "identity":
- data = gzip.decompress(climb.profile)
- response = Response(data, content_type="image/svg+xml")
- break
- else:
- return HTTPNotAcceptable("No data with acceptable encoding found")
- return response
-
-
__all__ = [
"details",
"gpx",
@@ -360,6 +322,4 @@ __all__ = [
"add_comment",
"track_map",
"track_pdf",
- "climb_preview",
- "climb_profile",
]