geo-activity-playground 0.25.0__tar.gz → 0.26.1__tar.gz

{geo_activity_playground-0.25.0 → geo_activity_playground-0.26.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: geo-activity-playground
-Version: 0.25.0
+Version: 0.26.1
 Summary: Analysis of geo data activities like rides, runs or hikes.
 License: MIT
 Author: Martin Ueding

{geo_activity_playground-0.25.0 → geo_activity_playground-0.26.1}/geo_activity_playground/core/tasks.py

@@ -46,7 +46,7 @@ def work_tracker(path: pathlib.Path):
     yield s
 
     with open(path, "w") as f:
-        json.dump(list(s), f)
+        json.dump(list(s), f, indent=2, sort_keys=True)
 
 
 class WorkTracker:

{geo_activity_playground-0.25.0 → geo_activity_playground-0.26.1}/geo_activity_playground/importers/strava_checkout.py

@@ -161,7 +161,7 @@ def import_from_strava_checkout() -> None:
     activities_ids_to_parse = [
         activity_id
         for activity_id in activities_ids_to_parse
-        if not (activity_extracted_meta_dir() / f"{activity_id.pickle}").exists()
+        if not (activity_extracted_meta_dir() / f"{activity_id}.pickle").exists()
     ]
 
     for activity_id in tqdm(activities_ids_to_parse, desc="Import from Strava export"):
@@ -190,11 +190,11 @@ def import_from_strava_checkout() -> None:
                 dateutil.parser.parse(row["Activity Date"], dayfirst=dayfirst)
             ),
         }
-        meta_path = activity_extracted_meta_dir / f"{activity_id}.pickle"
+        meta_path = activity_extracted_meta_dir() / f"{activity_id}.pickle"
         with open(meta_path, "wb") as f:
-            pickle.dump(table_activity_meta, meta_path)
+            pickle.dump(table_activity_meta, f)
 
-        time_series_path = activity_extracted_time_series_dir / f"{activity_id}.parquet"
+        time_series_path = activity_extracted_time_series_dir() / f"{activity_id}.parquet"
         if time_series_path.exists():
             time_series = pd.read_parquet(time_series_path)
         else:

geo_activity_playground-0.26.1/geo_activity_playground/webui/static/bootstrap-dark-mode.js

@@ -0,0 +1,78 @@
+/*!
+ * Color mode toggler for Bootstrap's docs (https://getbootstrap.com/)
+ * Copyright 2011-2024 The Bootstrap Authors
+ * Licensed under the Creative Commons Attribution 3.0 Unported License.
+ */
+
+(() => {
+    'use strict'
+
+    const getStoredTheme = () => localStorage.getItem('theme')
+    const setStoredTheme = theme => localStorage.setItem('theme', theme)
+
+    const getPreferredTheme = () => {
+        const storedTheme = getStoredTheme()
+        if (storedTheme) {
+            return storedTheme
+        }
+
+        return window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light'
+    }
+
+    const setTheme = theme => {
+        if (theme === 'auto') {
+            document.documentElement.setAttribute('data-bs-theme', (window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light'))
+        } else {
+            document.documentElement.setAttribute('data-bs-theme', theme)
+        }
+    }
+
+    setTheme(getPreferredTheme())
+
+    const showActiveTheme = (theme, focus = false) => {
+        const themeSwitcher = document.querySelector('#bd-theme')
+
+        if (!themeSwitcher) {
+            return
+        }
+
+        const themeSwitcherText = document.querySelector('#bd-theme-text')
+        const btnToActive = document.querySelector(`[data-bs-theme-value="${theme}"]`)
+
+        document.querySelectorAll('[data-bs-theme-value]').forEach(element => {
+            element.classList.remove('active')
+            element.setAttribute('aria-pressed', 'false')
+        })
+
+        btnToActive.classList.add('active')
+        btnToActive.setAttribute('aria-pressed', 'true')
+        const themeSwitcherLabel = `${themeSwitcherText.textContent} (${btnToActive.dataset.bsThemeValue})`
+        themeSwitcher.setAttribute('aria-label', themeSwitcherLabel)
+
+        if (focus) {
+            themeSwitcher.focus()
+        }
+    }
+
+    window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', () => {
+        const storedTheme = getStoredTheme()
+        if (storedTheme !== 'light' && storedTheme !== 'dark') {
+            setTheme(getPreferredTheme())
+        }
+    })
+
+    window.addEventListener('DOMContentLoaded', () => {
+        showActiveTheme(getPreferredTheme())
+
+        document.querySelectorAll('[data-bs-theme-value]')
+            .forEach(toggle => {
+                toggle.addEventListener('click', () => {
+                    const theme = toggle.getAttribute('data-bs-theme-value')
+                    setStoredTheme(theme)
+                    setTheme(theme)
+                    showActiveTheme(theme, true)
+                })
+            })
+    })
+})()
+

{geo_activity_playground-0.25.0 → geo_activity_playground-0.26.1}/geo_activity_playground/webui/strava/controller.py

@@ -42,6 +42,8 @@ class StravaController:
                     "code": self._code,
                 },
                 f,
+                indent=2,
+                sort_keys=True,
             )
 
         return {}

{geo_activity_playground-0.25.0 → geo_activity_playground-0.26.1}/geo_activity_playground/webui/strava/templates/strava/client-id.html.j2

@@ -5,7 +5,17 @@
 <h1 class="mb-3">Strava Connect</h1>
 
 <div class="row mb-3">
-    <div class="col-md-4">
+    <div class="col-md-6">
+        <p>You can connect to Strava such that it automatically downloads your activities.</p>
+
+        <p>The Strava API has rather strict rate limiting. If you don't mind waiting a bit, you can just use the "client
+            ID" and "client secret" that are provided to use a pre-defined Strava app. In that case, just click on the
+            button. If you don't want to share the API limits with other people, go the <a
+                href="https://www.strava.com/settings/api">Strava API page</a> and create your own app. Then fill in
+            "client ID" and "client secret" in the form.</p>
+    </div>
+
+    <div class="col-md-6">
         <form action="/strava/post-client-id" method="POST">
             <div class="mb-3">
                 <label for="client_id" class="form-label">Client ID</label>

{geo_activity_playground-0.25.0 → geo_activity_playground-0.26.1}/geo_activity_playground/webui/strava/templates/strava/connected.html.j2

@@ -5,7 +5,7 @@
 <h1 class="mb-3">Strava Connect</h1>
 
 <div class="row mb-3">
-    <div class="col-md-4">
+    <div class="col">
         <p>You're now connected to Strava. Please restart the webserver to start loading actvities.</p>
     </div>
 </div>

{geo_activity_playground-0.25.0 → geo_activity_playground-0.26.1}/geo_activity_playground/webui/templates/page.html.j2

@@ -33,6 +33,9 @@
     <script src="https://cdn.jsdelivr.net/npm/vega-embed@6"></script>
 
 
+    <script src="/static/bootstrap-dark-mode.js"></script>
+
+
     <!-- Favicon. -->
     <link rel="apple-touch-icon" sizes="180x180" href="/static/apple-touch-icon.png">
     <link rel="icon" type="image/png" sizes="32x32" href="/static/favicon-32x32.png">
@@ -59,39 +62,65 @@
                     <ul class="navbar-nav me-auto mb-2 mb-lg-0">
 
                         <li class="nav-item">
-                            <a class="nav-link active" aria-current="page"
-                                href="{{ url_for('summary.index') }}">Summary</a>
+                            <a class="nav-link" aria-current="page" href="{{ url_for('summary.index') }}">Summary</a>
                         </li>
                         <li class="nav-item">
-                            <a class="nav-link active" aria-current="page"
-                                href="{{ url_for('calendar.index') }}">Calendar</a>
+                            <a class="nav-link" aria-current="page" href="{{ url_for('calendar.index') }}">Calendar</a>
                         </li>
                         <li class="nav-item">
-                            <a class="nav-link active" aria-current="page"
+                            <a class="nav-link" aria-current="page"
                                 href="{{ url_for('explorer.map', zoom=14) }}">Explorer</a>
                         </li>
                         <li class="nav-item">
-                            <a class="nav-link active" aria-current="page"
+                            <a class="nav-link" aria-current="page"
                                 href="{{ url_for('explorer.map', zoom=17) }}">Squadratinhos</a>
                         </li>
                         <li class="nav-item">
-                            <a class="nav-link active" aria-current="page"
-                                href="{{ url_for('heatmap.index') }}">Heatmap</a>
+                            <a class="nav-link" aria-current="page" href="{{ url_for('heatmap.index') }}">Heatmap</a>
                         </li>
                         <li class="nav-item">
-                            <a class="nav-link active" aria-current="page"
+                            <a class="nav-link" aria-current="page"
                                 href="{{ url_for('eddington.index') }}">Eddington</a>
                         </li>
                         <li class="nav-item">
-                            <a class="nav-link active" aria-current="page"
+                            <a class="nav-link" aria-current="page"
                                 href="{{ url_for('equipment.index') }}">Equipment</a>
                         </li>
                         <li class="nav-item">
-                            <a class="nav-link active" aria-current="page"
-                                href="{{ url_for('upload.index') }}">Upload</a>
+                            <a class="nav-link" aria-current="page" href="{{ url_for('upload.index') }}">Upload</a>
                         </li>
                         <li class="nav-item">
-                            <a class="nav-link active" aria-current="page" href="{{ url_for('settings') }}">Settings</a>
+                            <a class="nav-link" aria-current="page" href="{{ url_for('settings') }}">Settings</a>
+                        </li>
+
+
+                        <li class="nav-item dropdown">
+                            <button
+                                class="btn btn-link nav-link py-2 px-0 px-lg-2 dropdown-toggle d-flex align-items-center"
+                                id="bd-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown"
+                                data-bs-display="static" aria-label="Toggle theme (dark)">
+                                <span id="bd-theme-text">Theme</span>
+                            </button>
+                            <ul class="dropdown-menu dropdown-menu-end" aria-labelledby="bd-theme-text">
+                                <li>
+                                    <button type="button" class="dropdown-item d-flex align-items-center"
+                                        data-bs-theme-value="light" aria-pressed="false">
+                                        ☀️ Light
+                                    </button>
+                                </li>
+                                <li>
+                                    <button type="button" class="dropdown-item d-flex align-items-center active"
+                                        data-bs-theme-value="dark" aria-pressed="true">
+                                        🌙 Dark
+                                    </button>
+                                </li>
+                                <li>
+                                    <button type="button" class="dropdown-item d-flex align-items-center"
+                                        data-bs-theme-value="auto" aria-pressed="false">
+                                        ⚙️ Auto
+                                    </button>
+                                </li>
+                            </ul>
                         </li>
                     </ul>
                 </div>

geo_activity_playground-0.26.1/geo_activity_playground/webui/templates/settings.html.j2

@@ -0,0 +1,24 @@
+{% extends "page.html.j2" %}
+
+{% block container %}
+<div class="row mb-3">
+    <div class="col">
+        <h1>Settings</h1>
+    </div>
+</div>
+
+<div class="row mb-3">
+    <div class="row row-cols-1 row-cols-md-3 g-2">
+        <div class="col">
+            <div class="card">
+                <div class="card-body">
+                    <h5 class="card-title">Strava API</h5>
+                    <p class="card-text">Connect to the Strava API to download activities from there.</p>
+                    <a href="{{ url_for('strava.setup') }}" class="btn btn-primary">Set up Strava API</a>
+                </div>
+            </div>
+        </div>
+
+    </div>
+</div>
+{% endblock %}

{geo_activity_playground-0.25.0 → geo_activity_playground-0.26.1}/geo_activity_playground/webui/upload/controller.py

@@ -98,7 +98,7 @@ def scan_for_activities(
     if pathlib.Path("Activities").exists():
         import_from_directory(config.get("metadata_extraction_regexes", []))
     if pathlib.Path("Strava Export").exists():
-        import_from_strava_checkout(repository)
+        import_from_strava_checkout()
     if (_strava_dynamic_config_path.exists() or "strava" in config) and not skip_strava:
         import_from_strava_api()
 

{geo_activity_playground-0.25.0 → geo_activity_playground-0.26.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "geo-activity-playground"
-version = "0.25.0"
+version = "0.26.1"
 description = "Analysis of geo data activities like rides, runs or hikes."
 authors = ["Martin Ueding <mu@martin-ueding.de>"]
 license = "MIT"

geo_activity_playground-0.25.0/geo_activity_playground/webui/templates/settings.html.j2

@@ -1,15 +0,0 @@
-{% extends "page.html.j2" %}
-
-{% block container %}
-<div class="row mb-3">
-    <div class="col">
-        <h1>Settings</h1>
-    </div>
-</div>
-
-<div class="row mb-3">
-    <div class="col">
-        <p><a href="{{ url_for('strava.setup') }}">Set up Strava API</a>.</p>
-    </div>
-</div>
-{% endblock %}