Alexander/FitTrackee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into v0.2.3

Browse Source
This commit is contained in:
Sam 2019-12-28 21:22:00 +01:00
commit f1298aa7ba
41 changed files with 629 additions and 514 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -1,5 +1,5 @@
language: node_js
node_js: '11'
node_js: '12'
dist: trusty
sudo: required

12
CHANGELOG.md
View File

@ -1,5 +1,15 @@
# Change log
## Version 0.2.2 - Statistics fix (2019/09/23)
### Issues Closed
#### Bugs Fixed
* [#41](https://github.com/SamR1/Fittrackee/issues/41) - User statistics are incorrect
In this release 1 issue was closed.
## Version 0.2.1 - Fix and improvements (2019/09/01)
### Issues Closed
@ -22,7 +32,7 @@
* **[Poetry](https://poetry.eustace.io/)** replaces **[pipenv](https://docs.pipenv.org)** for Python packages management
In this release 8 issue were closed.
In this release 8 issues were closed.
## Version 0.2.0 - Statistics (2019/07/07)

2
VERSION
View File

@ -1 +1 @@
0.3.0-beta
0.2.2-beta

2
docs/.buildinfo
View File

@ -1,4 +1,4 @@
# Sphinx build info version 1
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
config: 1d5e3d179f11af85040b3641826fc93b
config: 2e25d511f5471e8c16adb580060795db
tags: 645f666f9bcd5a90fca523b33c5a78b7

BIN
docs/_images/fittrackee_screenshot-01.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 431 KiB

After

Width:  |  Height:  |  Size: 547 KiB

BIN
docs/_images/fittrackee_screenshot-02.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 539 KiB

After

Width:  |  Height:  |  Size: 539 KiB

BIN
docs/_images/fittrackee_screenshot-03.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 178 KiB

After

Width:  |  Height:  |  Size: 178 KiB

BIN
docs/_images/fittrackee_screenshot-04.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 52 KiB

After

Width:  |  Height:  |  Size: 53 KiB

12
docs/_sources/changelog.md.txt
View File

@ -1,5 +1,15 @@
# Change log
## Version 0.2.2 - Statistics fix (2019/09/23)
### Issues Closed
#### Bugs Fixed
* [#41](https://github.com/SamR1/Fittrackee/issues/41) - User statistics are incorrect
In this release 1 issue was closed.
## Version 0.2.1 - Fix and improvements (2019/09/01)
### Issues Closed
@ -22,7 +32,7 @@
* **[Poetry](https://poetry.eustace.io/)** replaces **[pipenv](https://docs.pipenv.org)** for Python packages management
In this release 8 issue were closed.
In this release 8 issues were closed.
## Version 0.2.0 - Statistics (2019/07/07)

8
docs/_sources/installation.rst.txt
View File

@ -87,13 +87,13 @@ Prod environment
.. warning::
Note that FitTrackee is not production-ready yet
- Download the last release (for now, it is the beta release v0.2.1):
- Download the last release (for now, it is the beta release v0.2.2):
.. code:: bash
$ wget https://github.com/SamR1/FitTrackee/archive/v0.2.1-beta.tar.gz
$ tar -xzf v0.2.1-beta.tar.gz
$ mv FitTrackee-0.2.1-beta FitTrackee
$ wget https://github.com/SamR1/FitTrackee/archive/v0.2.2-beta.tar.gz
$ tar -xzf v0.2.2-beta.tar.gz
$ mv FitTrackee-0.2.2-beta FitTrackee
$ cd FitTrackee
- Update **Makefile.config** file if needed and copy/paste the

2
docs/_static/documentation_options.js vendored
View File

@ -1,6 +1,6 @@
var DOCUMENTATION_OPTIONS = {
URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'),
VERSION: '0.3.0-beta',
VERSION: '0.2.2-beta',
LANGUAGE: 'None',
COLLAPSE_INDEX: false,
BUILDER: 'html',

4
docs/api/activities.html
View File

@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta charset="utf-8" />
<title>Activities &#8212; FitTrackee 0.3.0-beta
<title>Activities &#8212; FitTrackee 0.2.2-beta
documentation</title>
<link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
<link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@ -39,7 +39,7 @@
</button>
<a class="navbar-brand" href="../index.html">
FitTrackee</a>
<span class="navbar-text navbar-version pull-left"><b>0.3.0</b></span>
<span class="navbar-text navbar-version pull-left"><b>0.2.2</b></span>
</div>
<div class="collapse navbar-collapse nav-collapse">

4
docs/api/auth.html
View File

@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta charset="utf-8" />
<title>Authentication &#8212; FitTrackee 0.3.0-beta
<title>Authentication &#8212; FitTrackee 0.2.2-beta
documentation</title>
<link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
<link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@ -39,7 +39,7 @@
</button>
<a class="navbar-brand" href="../index.html">
FitTrackee</a>
<span class="navbar-text navbar-version pull-left"><b>0.3.0</b></span>
<span class="navbar-text navbar-version pull-left"><b>0.2.2</b></span>
</div>
<div class="collapse navbar-collapse nav-collapse">

4
docs/api/index.html
View File

@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta charset="utf-8" />
<title>API documentation &#8212; FitTrackee 0.3.0-beta
<title>API documentation &#8212; FitTrackee 0.2.2-beta
documentation</title>
<link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
<link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@ -39,7 +39,7 @@
</button>
<a class="navbar-brand" href="../index.html">
FitTrackee</a>
<span class="navbar-text navbar-version pull-left"><b>0.3.0</b></span>
<span class="navbar-text navbar-version pull-left"><b>0.2.2</b></span>
</div>
<div class="collapse navbar-collapse nav-collapse">

4
docs/api/records.html
View File

@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta charset="utf-8" />
<title>Records &#8212; FitTrackee 0.3.0-beta
<title>Records &#8212; FitTrackee 0.2.2-beta
documentation</title>
<link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
<link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@ -39,7 +39,7 @@
</button>
<a class="navbar-brand" href="../index.html">
FitTrackee</a>
<span class="navbar-text navbar-version pull-left"><b>0.3.0</b></span>
<span class="navbar-text navbar-version pull-left"><b>0.2.2</b></span>
</div>
<div class="collapse navbar-collapse nav-collapse">

4
docs/api/sports.html
View File

@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta charset="utf-8" />
<title>Sports &#8212; FitTrackee 0.3.0-beta
<title>Sports &#8212; FitTrackee 0.2.2-beta
documentation</title>
<link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
<link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@ -39,7 +39,7 @@
</button>
<a class="navbar-brand" href="../index.html">
FitTrackee</a>
<span class="navbar-text navbar-version pull-left"><b>0.3.0</b></span>
<span class="navbar-text navbar-version pull-left"><b>0.2.2</b></span>
</div>
<div class="collapse navbar-collapse nav-collapse">

4
docs/api/stats.html
View File

@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta charset="utf-8" />
<title>Statistics &#8212; FitTrackee 0.3.0-beta
<title>Statistics &#8212; FitTrackee 0.2.2-beta
documentation</title>
<link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
<link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@ -39,7 +39,7 @@
</button>
<a class="navbar-brand" href="../index.html">
FitTrackee</a>
<span class="navbar-text navbar-version pull-left"><b>0.3.0</b></span>
<span class="navbar-text navbar-version pull-left"><b>0.2.2</b></span>
</div>
<div class="collapse navbar-collapse nav-collapse">

4
docs/api/users.html
View File

@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta charset="utf-8" />
<title>Users &#8212; FitTrackee 0.3.0-beta
<title>Users &#8212; FitTrackee 0.2.2-beta
documentation</title>
<link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
<link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@ -39,7 +39,7 @@
</button>
<a class="navbar-brand" href="../index.html">
FitTrackee</a>
<span class="navbar-text navbar-version pull-left"><b>0.3.0</b></span>
<span class="navbar-text navbar-version pull-left"><b>0.2.2</b></span>
</div>
<div class="collapse navbar-collapse nav-collapse">

86
docs/changelog.html
View File

@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta charset="utf-8" />
<title>Change log &#8212; FitTrackee 0.3.0-beta
<title>Change log &#8212; FitTrackee 0.2.2-beta
documentation</title>
<link rel="stylesheet" href="_static/bootstrap-sphinx.css" type="text/css" />
<link rel="stylesheet" href="_static/pygments.css" type="text/css" />
@ -38,7 +38,7 @@
</button>
<a class="navbar-brand" href="index.html">
FitTrackee</a>
<span class="navbar-text navbar-version pull-left"><b>0.3.0</b></span>
<span class="navbar-text navbar-version pull-left"><b>0.2.2</b></span>
</div>
<div class="collapse navbar-collapse nav-collapse">
@ -75,34 +75,41 @@
role="menu"
aria-labelledby="dLabelLocalToc"><ul>
<li><a class="reference internal" href="#">Change log</a><ul>
<li><a class="reference internal" href="#version-0-2-1-fix-and-improvements-2019-09-01">Version 0.2.1 - Fix and improvements (2019/09/01)</a><ul>
<li><a class="reference internal" href="#version-0-2-2-statistics-fix-2019-09-23">Version 0.2.2 - Statistics fix (2019/09/23)</a><ul>
<li><a class="reference internal" href="#issues-closed">Issues Closed</a><ul>
<li><a class="reference internal" href="#new-features">New Features</a></li>
<li><a class="reference internal" href="#bugs-fixed">Bugs Fixed</a></li>
</ul>
</li>
</ul>
</li>
<li><a class="reference internal" href="#version-0-2-1-fix-and-improvements-2019-09-01">Version 0.2.1 - Fix and improvements (2019/09/01)</a><ul>
<li><a class="reference internal" href="#id1">Issues Closed</a><ul>
<li><a class="reference internal" href="#new-features">New Features</a></li>
<li><a class="reference internal" href="#id2">Bugs Fixed</a></li>
</ul>
</li>
<li><a class="reference internal" href="#misc">Misc</a></li>
</ul>
</li>
<li><a class="reference internal" href="#version-0-2-0-statistics-2019-07-07">Version 0.2.0 - Statistics (2019/07/07)</a><ul>
<li><a class="reference internal" href="#id1">Issues Closed</a><ul>
<li><a class="reference internal" href="#id2">New Features</a></li>
<li><a class="reference internal" href="#id3">Issues Closed</a><ul>
<li><a class="reference internal" href="#id4">New Features</a></li>
</ul>
</li>
<li><a class="reference internal" href="#id3">Misc</a></li>
<li><a class="reference internal" href="#id5">Misc</a></li>
</ul>
</li>
<li><a class="reference internal" href="#version-0-1-1-fix-and-improvements-2019-02-07">Version 0.1.1 - Fix and improvements (2019/02/07)</a><ul>
<li><a class="reference internal" href="#id4">Issues Closed</a><ul>
<li><a class="reference internal" href="#id5">New Features</a></li>
<li><a class="reference internal" href="#id6">Bugs Fixed</a></li>
<li><a class="reference internal" href="#id6">Issues Closed</a><ul>
<li><a class="reference internal" href="#id7">New Features</a></li>
<li><a class="reference internal" href="#id8">Bugs Fixed</a></li>
</ul>
</li>
</ul>
</li>
<li><a class="reference internal" href="#version-0-1-0-first-release-2018-07-04">Version 0.1.0 - First release 🎉 (2018-07-04)</a><ul>
<li><a class="reference internal" href="#id7">Issues Closed</a><ul>
<li><a class="reference internal" href="#id8">New Features</a></li>
<li><a class="reference internal" href="#id9">Issues Closed</a><ul>
<li><a class="reference internal" href="#id10">New Features</a></li>
</ul>
</li>
</ul>
@ -154,10 +161,23 @@
<div class="section" id="change-log">
<h1>Change log<a class="headerlink" href="#change-log" title="Permalink to this headline"></a></h1>
<div class="section" id="version-0-2-1-fix-and-improvements-2019-09-01">
<h2>Version 0.2.1 - Fix and improvements (2019/09/01)<a class="headerlink" href="#version-0-2-1-fix-and-improvements-2019-09-01" title="Permalink to this headline"></a></h2>
<div class="section" id="version-0-2-2-statistics-fix-2019-09-23">
<h2>Version 0.2.2 - Statistics fix (2019/09/23)<a class="headerlink" href="#version-0-2-2-statistics-fix-2019-09-23" title="Permalink to this headline"></a></h2>
<div class="section" id="issues-closed">
<h3>Issues Closed<a class="headerlink" href="#issues-closed" title="Permalink to this headline"></a></h3>
<div class="section" id="bugs-fixed">
<h4>Bugs Fixed<a class="headerlink" href="#bugs-fixed" title="Permalink to this headline"></a></h4>
<ul class="simple">
<li><p><a class="reference external" href="https://github.com/SamR1/Fittrackee/issues/41">#41</a> - User statistics are incorrect</p></li>
</ul>
<p>In this release 1 issue was closed.</p>
</div>
</div>
</div>
<div class="section" id="version-0-2-1-fix-and-improvements-2019-09-01">
<h2>Version 0.2.1 - Fix and improvements (2019/09/01)<a class="headerlink" href="#version-0-2-1-fix-and-improvements-2019-09-01" title="Permalink to this headline"></a></h2>
<div class="section" id="id1">
<h3>Issues Closed<a class="headerlink" href="#id1" title="Permalink to this headline"></a></h3>
<div class="section" id="new-features">
<h4>New Features<a class="headerlink" href="#new-features" title="Permalink to this headline"></a></h4>
<ul class="simple">
@ -170,8 +190,8 @@
<li><p><a class="reference external" href="https://github.com/SamR1/Fittrackee/issues/37">#37</a> - Display map on activities list</p></li>
</ul>
</div>
<div class="section" id="bugs-fixed">
<h4>Bugs Fixed<a class="headerlink" href="#bugs-fixed" title="Permalink to this headline"></a></h4>
<div class="section" id="id2">
<h4>Bugs Fixed<a class="headerlink" href="#id2" title="Permalink to this headline"></a></h4>
<ul class="simple">
<li><p><a class="reference external" href="https://github.com/SamR1/Fittrackee/issues/34">#34</a> - Weather is not displayed anymore</p></li>
</ul>
@ -182,22 +202,22 @@
<ul class="simple">
<li><p><strong><a class="reference external" href="https://poetry.eustace.io/">Poetry</a></strong> replaces <strong><a class="reference external" href="https://docs.pipenv.org">pipenv</a></strong> for Python packages management</p></li>
</ul>
<p>In this release 8 issue were closed.</p>
<p>In this release 8 issues were closed.</p>
</div>
</div>
<div class="section" id="version-0-2-0-statistics-2019-07-07">
<h2>Version 0.2.0 - Statistics (2019/07/07)<a class="headerlink" href="#version-0-2-0-statistics-2019-07-07" title="Permalink to this headline"></a></h2>
<div class="section" id="id1">
<h3>Issues Closed<a class="headerlink" href="#id1" title="Permalink to this headline"></a></h3>
<div class="section" id="id2">
<h4>New Features<a class="headerlink" href="#id2" title="Permalink to this headline"></a></h4>
<div class="section" id="id3">
<h3>Issues Closed<a class="headerlink" href="#id3" title="Permalink to this headline"></a></h3>
<div class="section" id="id4">
<h4>New Features<a class="headerlink" href="#id4" title="Permalink to this headline"></a></h4>
<ul class="simple">
<li><p><a class="reference external" href="https://github.com/SamR1/Fittrackee/issues/13">#13</a> - Detailed statistics</p></li>
</ul>
</div>
</div>
<div class="section" id="id3">
<h3>Misc<a class="headerlink" href="#id3" title="Permalink to this headline"></a></h3>
<div class="section" id="id5">
<h3>Misc<a class="headerlink" href="#id5" title="Permalink to this headline"></a></h3>
<ul class="simple">
<li><p>Update dependencies</p></li>
</ul>
@ -206,17 +226,17 @@
</div>
<div class="section" id="version-0-1-1-fix-and-improvements-2019-02-07">
<h2>Version 0.1.1 - Fix and improvements (2019/02/07)<a class="headerlink" href="#version-0-1-1-fix-and-improvements-2019-02-07" title="Permalink to this headline"></a></h2>
<div class="section" id="id4">
<h3>Issues Closed<a class="headerlink" href="#id4" title="Permalink to this headline"></a></h3>
<div class="section" id="id5">
<h4>New Features<a class="headerlink" href="#id5" title="Permalink to this headline"></a></h4>
<div class="section" id="id6">
<h3>Issues Closed<a class="headerlink" href="#id6" title="Permalink to this headline"></a></h3>
<div class="section" id="id7">
<h4>New Features<a class="headerlink" href="#id7" title="Permalink to this headline"></a></h4>
<ul class="simple">
<li><p><a class="reference external" href="https://github.com/SamR1/FitTrackee/issues/25">#25</a> - Display records on calendar</p></li>
<li><p><a class="reference external" href="https://github.com/SamR1/FitTrackee/issues/22">#22</a> - Add a total on current month statistics</p></li>
</ul>
</div>
<div class="section" id="id6">
<h4>Bugs Fixed<a class="headerlink" href="#id6" title="Permalink to this headline"></a></h4>
<div class="section" id="id8">
<h4>Bugs Fixed<a class="headerlink" href="#id8" title="Permalink to this headline"></a></h4>
<ul class="simple">
<li><p><a class="reference external" href="https://github.com/SamR1/FitTrackee/issues/31">#31</a> - Use moving duration for stats</p></li>
<li><p><a class="reference external" href="https://github.com/SamR1/FitTrackee/issues/29">#29</a> - Pause duration calculation with segments</p></li>
@ -265,10 +285,10 @@
<li><p>no administration for now</p></li>
</ul>
<p>➡️ more informations: see <a class="reference external" href="https://github.com/SamR1/mpwo/wiki">wiki</a> and <a class="reference external" href="https://github.com/SamR1/mpwo/issues">current issues</a></p>
<div class="section" id="id7">
<h3>Issues Closed<a class="headerlink" href="#id7" title="Permalink to this headline"></a></h3>
<div class="section" id="id8">
<h4>New Features<a class="headerlink" href="#id8" title="Permalink to this headline"></a></h4>
<div class="section" id="id9">
<h3>Issues Closed<a class="headerlink" href="#id9" title="Permalink to this headline"></a></h3>
<div class="section" id="id10">
<h4>New Features<a class="headerlink" href="#id10" title="Permalink to this headline"></a></h4>
<ul class="simple">
<li><p><a class="reference external" href="https://github.com/SamR1/FitTrackee/issues/11">#11</a> - Timezone support</p></li>
<li><p><a class="reference external" href="https://github.com/SamR1/FitTrackee/issues/10">#10</a> - Add a note to an activity</p></li>

4
docs/features.html
View File

@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta charset="utf-8" />
<title>Features &#8212; FitTrackee 0.3.0-beta
<title>Features &#8212; FitTrackee 0.2.2-beta
documentation</title>
<link rel="stylesheet" href="_static/bootstrap-sphinx.css" type="text/css" />
<link rel="stylesheet" href="_static/pygments.css" type="text/css" />
@ -39,7 +39,7 @@
</button>
<a class="navbar-brand" href="index.html">
FitTrackee</a>
<span class="navbar-text navbar-version pull-left"><b>0.3.0</b></span>
<span class="navbar-text navbar-version pull-left"><b>0.2.2</b></span>
</div>
<div class="collapse navbar-collapse nav-collapse">

4
docs/genindex.html
View File

@ -4,7 +4,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta charset="utf-8" />
<title>Index &#8212; FitTrackee 0.3.0-beta
<title>Index &#8212; FitTrackee 0.2.2-beta
documentation</title>
<link rel="stylesheet" href="_static/bootstrap-sphinx.css" type="text/css" />
<link rel="stylesheet" href="_static/pygments.css" type="text/css" />
@ -38,7 +38,7 @@
</button>
<a class="navbar-brand" href="index.html">
FitTrackee</a>
<span class="navbar-text navbar-version pull-left"><b>0.3.0</b></span>
<span class="navbar-text navbar-version pull-left"><b>0.2.2</b></span>
</div>
<div class="collapse navbar-collapse nav-collapse">

4
docs/http-routingtable.html
View File

@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta charset="utf-8" />
<title>HTTP Routing Table &#8212; FitTrackee 0.3.0-beta
<title>HTTP Routing Table &#8212; FitTrackee 0.2.2-beta
documentation</title>
<link rel="stylesheet" href="_static/bootstrap-sphinx.css" type="text/css" />
<link rel="stylesheet" href="_static/pygments.css" type="text/css" />
@ -44,7 +44,7 @@
</button>
<a class="navbar-brand" href="index.html">
FitTrackee</a>
<span class="navbar-text navbar-version pull-left"><b>0.3.0</b></span>
<span class="navbar-text navbar-version pull-left"><b>0.2.2</b></span>
</div>
<div class="collapse navbar-collapse nav-collapse">

5
docs/index.html
View File

@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta charset="utf-8" />
<title>FitTrackee &#8212; FitTrackee 0.3.0-beta
<title>FitTrackee &#8212; FitTrackee 0.2.2-beta
documentation</title>
<link rel="stylesheet" href="_static/bootstrap-sphinx.css" type="text/css" />
<link rel="stylesheet" href="_static/pygments.css" type="text/css" />
@ -38,7 +38,7 @@
</button>
<a class="navbar-brand" href="#">
FitTrackee</a>
<span class="navbar-text navbar-version pull-left"><b>0.3.0</b></span>
<span class="navbar-text navbar-version pull-left"><b>0.2.2</b></span>
</div>
<div class="collapse navbar-collapse nav-collapse">
@ -180,6 +180,7 @@ Map</a>.</div>
</ul>
</li>
<li class="toctree-l1"><a class="reference internal" href="changelog.html">Change log</a><ul>
<li class="toctree-l2"><a class="reference internal" href="changelog.html#version-0-2-2-statistics-fix-2019-09-23">Version 0.2.2 - Statistics fix (2019/09/23)</a></li>
<li class="toctree-l2"><a class="reference internal" href="changelog.html#version-0-2-1-fix-and-improvements-2019-09-01">Version 0.2.1 - Fix and improvements (2019/09/01)</a></li>
<li class="toctree-l2"><a class="reference internal" href="changelog.html#version-0-2-0-statistics-2019-07-07">Version 0.2.0 - Statistics (2019/07/07)</a></li>
<li class="toctree-l2"><a class="reference internal" href="changelog.html#version-0-1-1-fix-and-improvements-2019-02-07">Version 0.1.1 - Fix and improvements (2019/02/07)</a></li>

12
docs/installation.html
View File

@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta charset="utf-8" />
<title>Installation &#8212; FitTrackee 0.3.0-beta
<title>Installation &#8212; FitTrackee 0.2.2-beta
documentation</title>
<link rel="stylesheet" href="_static/bootstrap-sphinx.css" type="text/css" />
<link rel="stylesheet" href="_static/pygments.css" type="text/css" />
@ -39,7 +39,7 @@
</button>
<a class="navbar-brand" href="index.html">
FitTrackee</a>
<span class="navbar-text navbar-version pull-left"><b>0.3.0</b></span>
<span class="navbar-text navbar-version pull-left"><b>0.2.2</b></span>
</div>
<div class="collapse navbar-collapse nav-collapse">
@ -231,11 +231,11 @@ and the password <code class="docutils literal notranslate"><span class="pre">mp
<p>Note that FitTrackee is not production-ready yet</p>
</div>
<ul class="simple">
<li><p>Download the last release (for now, it is the beta release v0.2.1):</p></li>
<li><p>Download the last release (for now, it is the beta release v0.2.2):</p></li>
</ul>
<div class="highlight-bash notranslate"><div class="highlight"><pre><span></span>$ wget https://github.com/SamR1/FitTrackee/archive/v0.2.1-beta.tar.gz
$ tar -xzf v0.2.1-beta.tar.gz
$ mv FitTrackee-0.2.1-beta FitTrackee
<div class="highlight-bash notranslate"><div class="highlight"><pre><span></span>$ wget https://github.com/SamR1/FitTrackee/archive/v0.2.2-beta.tar.gz
$ tar -xzf v0.2.2-beta.tar.gz
$ mv FitTrackee-0.2.2-beta FitTrackee
$ <span class="nb">cd</span> FitTrackee
</pre></div>
</div>

BIN
docs/objects.inv
View File

Binary file not shown.

4
docs/search.html
View File

@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta charset="utf-8" />
<title>Search &#8212; FitTrackee 0.3.0-beta
<title>Search &#8212; FitTrackee 0.2.2-beta
documentation</title>
<link rel="stylesheet" href="_static/bootstrap-sphinx.css" type="text/css" />
<link rel="stylesheet" href="_static/pygments.css" type="text/css" />
@ -43,7 +43,7 @@
</button>
<a class="navbar-brand" href="index.html">
FitTrackee</a>
<span class="navbar-text navbar-version pull-left"><b>0.3.0</b></span>
<span class="navbar-text navbar-version pull-left"><b>0.2.2</b></span>
</div>
<div class="collapse navbar-collapse nav-collapse">

4
docs/troubleshooting/administrator.html
View File

@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta charset="utf-8" />
<title>Administrator &#8212; FitTrackee 0.3.0-beta
<title>Administrator &#8212; FitTrackee 0.2.2-beta
documentation</title>
<link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
<link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@ -39,7 +39,7 @@
</button>
<a class="navbar-brand" href="../index.html">
FitTrackee</a>
<span class="navbar-text navbar-version pull-left"><b>0.3.0</b></span>
<span class="navbar-text navbar-version pull-left"><b>0.2.2</b></span>
</div>
<div class="collapse navbar-collapse nav-collapse">

4
docs/troubleshooting/index.html
View File

@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta charset="utf-8" />
<title>Troubleshooting &#8212; FitTrackee 0.3.0-beta
<title>Troubleshooting &#8212; FitTrackee 0.2.2-beta
documentation</title>
<link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
<link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@ -39,7 +39,7 @@
</button>
<a class="navbar-brand" href="../index.html">
FitTrackee</a>
<span class="navbar-text navbar-version pull-left"><b>0.3.0</b></span>
<span class="navbar-text navbar-version pull-left"><b>0.2.2</b></span>
</div>
<div class="collapse navbar-collapse nav-collapse">

4
docs/troubleshooting/user.html
View File

@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta charset="utf-8" />
<title>User &#8212; FitTrackee 0.3.0-beta
<title>User &#8212; FitTrackee 0.2.2-beta
documentation</title>
<link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
<link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@ -39,7 +39,7 @@
</button>
<a class="navbar-brand" href="../index.html">
FitTrackee</a>
<span class="navbar-text navbar-version pull-left"><b>0.3.0</b></span>
<span class="navbar-text navbar-version pull-left"><b>0.2.2</b></span>
</div>
<div class="collapse navbar-collapse nav-collapse">

8
docsrc/source/installation.rst
View File

@ -87,13 +87,13 @@ Prod environment
.. warning::
Note that FitTrackee is not production-ready yet
- Download the last release (for now, it is the beta release v0.2.1):
- Download the last release (for now, it is the beta release v0.2.2):
.. code:: bash
$ wget https://github.com/SamR1/FitTrackee/archive/v0.2.1-beta.tar.gz
$ tar -xzf v0.2.1-beta.tar.gz
$ mv FitTrackee-0.2.1-beta FitTrackee
$ wget https://github.com/SamR1/FitTrackee/archive/v0.2.2-beta.tar.gz
$ tar -xzf v0.2.2-beta.tar.gz
$ mv FitTrackee-0.2.2-beta FitTrackee
$ cd FitTrackee
- Update **Makefile.config** file if needed and copy/paste the

60
fittrackee_api/fittrackee_api/tests/test_users_api.py
View File

@ -198,6 +198,66 @@ def test_users_list(app, user_1, user_2, user_3):
assert data['data']['users'][2]['total_duration'] == '0:00:00'
def test_users_list_with_activities(
app,
user_1,
user_2,
user_3,
sport_1_cycling,
activity_cycling_user_1,
sport_2_running,
activity_running_user_1,
activity_cycling_user_2,
):
client = app.test_client()
resp_login = client.post(
'/api/auth/login',
data=json.dumps(dict(email='test@test.com', password='12345678')),
content_type='application/json',
)
response = client.get(
'/api/users',
headers=dict(
Authorization='Bearer '
+ json.loads(resp_login.data.decode())['auth_token']
),
)
data = json.loads(response.data.decode())
assert response.status_code == 200
assert 'success' in data['status']
assert len(data['data']['users']) == 3
assert 'created_at' in data['data']['users'][0]
assert 'created_at' in data['data']['users'][1]
assert 'created_at' in data['data']['users'][2]
assert 'test' in data['data']['users'][0]['username']
assert 'toto' in data['data']['users'][1]['username']
assert 'sam' in data['data']['users'][2]['username']
assert 'test@test.com' in data['data']['users'][0]['email']
assert 'toto@toto.com' in data['data']['users'][1]['email']
assert 'sam@test.com' in data['data']['users'][2]['email']
assert data['data']['users'][0]['timezone'] is None
assert data['data']['users'][0]['weekm'] is False
assert data['data']['users'][0]['nb_activities'] == 2
assert data['data']['users'][0]['nb_sports'] == 2
assert data['data']['users'][0]['total_distance'] == 22.0
assert data['data']['users'][0]['total_duration'] == '1:57:04'
assert data['data']['users'][1]['timezone'] is None
assert data['data']['users'][1]['weekm'] is False
assert data['data']['users'][1]['nb_activities'] == 1
assert data['data']['users'][1]['nb_sports'] == 1
assert data['data']['users'][1]['total_distance'] == 15
assert data['data']['users'][1]['total_duration'] == '1:00:00'
assert data['data']['users'][2]['timezone'] is None
assert data['data']['users'][2]['weekm'] is True
assert data['data']['users'][2]['nb_activities'] == 0
assert data['data']['users'][2]['nb_sports'] == 0
assert data['data']['users'][2]['total_distance'] == 0
assert data['data']['users'][2]['total_duration'] == '0:00:00'
def test_encode_auth_token(app, user_1):
"""=> Ensure correct auth token generation"""
auth_token = user_1.encode_auth_token(user_1.id)

9
fittrackee_api/fittrackee_api/users/models.py
View File

@ -97,12 +97,17 @@ class User(db.Model):
if nb_activity > 0:
sports = (
db.session.query(func.count(Activity.sport_id))
.filter(Activity.user_id == self.id)
.group_by(Activity.sport_id)
.all()
)
total = db.session.query(
total = (
db.session.query(
func.sum(Activity.distance), func.sum(Activity.duration)
).first()
)
.filter(Activity.user_id == self.id)
.first()
)
return {
'id': self.id,
'username': self.username,

2
fittrackee_api/pyproject.toml
View File

@ -1,6 +1,6 @@
[tool.poetry]
name = "fittrackee_api"
version = "0.2.1-beta"
version = "0.2.2-beta"
description = ""
authors = ["Your Name <you@example.com>"]
license = "GPL-3.0"

2
fittrackee_client/src/utils/index.js
View File

@ -10,7 +10,7 @@ const getFileSize = fileSize => {
)
}
export const version = '0.3.0-beta' // version stored in 'utils' for now
export const version = '0.2.2-beta' // version stored in 'utils' for now
export const apiUrl = `${process.env.REACT_APP_API_URL}/api/`
/* prettier-ignore */
export const thunderforestApiKey = `${

BIN
misc/images/fittrackee_screenshot-01.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 431 KiB

After

Width:  |  Height:  |  Size: 547 KiB

BIN
misc/images/fittrackee_screenshot-02.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 539 KiB

After

Width:  |  Height:  |  Size: 539 KiB

BIN
misc/images/fittrackee_screenshot-03.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 178 KiB

After

Width:  |  Height:  |  Size: 178 KiB

BIN
misc/images/fittrackee_screenshot-04.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 52 KiB

After

Width:  |  Height:  |  Size: 53 KiB

18
package.json
View File

@ -5,22 +5,22 @@
"dependencies": {
"@mapbox/togeojson": "^0.16.0",
"connected-react-router": "^6.5.2",
"date-fns": "^2.1.0",
"history": "^4.9.0",
"i18next": "^17.0.13",
"date-fns": "^2.2.1",
"history": "^4.10.1",
"i18next": "^17.0.16",
"i18next-browser-languagedetector": "^3.0.3",
"i18next-xhr-backend": "^3.1.2",
"leaflet": "^1.5.1",
"luxon": "^1.17.2",
"luxon": "^1.19.2",
"object-hash": "^1.3.1",
"react": "^16.9.0",
"react-dom": "^16.9.0",
"react-helmet": "^6.0.0-beta",
"react-i18next": "^10.12.2",
"react-i18next": "^10.12.5",
"react-leaflet": "^2.4.0",
"react-redux": "^7.1.1",
"react-router-dom": "^5.0.1",
"react-scripts": "^3.1.1",
"react-scripts": "^3.1.2",
"react-timezone": "^2.4.0",
"recharts": "^1.7.1",
"redux": "^4.0.4",
@ -44,11 +44,11 @@
"not op_mini all"
],
"devDependencies": {
"eslint-config-prettier": "^6.2.0",
"eslint-plugin-prettier": "^3.1.0",
"eslint-config-prettier": "^6.3.0",
"eslint-plugin-prettier": "^3.1.1",
"eslint-plugin-testcafe": "^0.2.1",
"prettier": "^1.18.2",
"randomstring": "^1.1.5",
"testcafe": "^1.4.3"
"testcafe": "^1.5.0"
}
}

2
test.sh
View File

@ -14,7 +14,7 @@ inspect $? api
docker-compose -f docker-compose-ci.yml run fittrackee-api flask db upgrade
docker-compose -f docker-compose-ci.yml run fittrackee-api flask initdata
testcafe chrome fittrackee_client/e2e
testcafe chrome fittrackee_client/e2e -e
inspect $? e2e
if [ -n "${fails}" ];

841
yarn.lock
View File

File diff suppressed because it is too large Load Diff