Merge branch 'release-v0.6.11'

SamR1 · Jul 27, 2022 · 667aad0 · 667aad0
2 parents 268f09d + c8d24a2
commit 667aad0
Show file tree

Hide file tree

Showing 135 changed files with 1,936 additions and 1,185 deletions.
diff --git a/.github/workflows/.tests-python.yml b/.github/workflows/.tests-python.yml
@@ -95,4 +95,4 @@ jobs:
           export TEST_APP_URL=http://$(hostname --ip-address):5000
           sleep 5
           nohup flask worker --processes=1 >> nohup.out 2>&1 &
-          pytest e2e --driver Remote --capability browserName firefox --host selenium --port 4444
+          pytest e2e --driver Remote --capability browserName firefox --selenium-host selenium --selenium-port 4444
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,28 @@
 # Change log
 
-## Version 0.6.10 (2022/07/13)
+## Version 0.6.11 (2022/07/27)
+
+### Issues Closed
+
+#### Bugs Fixed
+
+* [#213](https://github.com/SamR1/FitTrackee/issues/213) - Statistics - When using imperial measurements, ascent/descent should be in ft not mi
+
+### Pull Requests
+
+#### Features
+
+* [#223](https://github.com/SamR1/FitTrackee/pull/223) - Display ascent record icon
+* [#167](https://github.com/SamR1/FitTrackee/pull/167) - Added ascent record to Dashboard 
+* [#162](https://github.com/SamR1/FitTrackee/pull/162) - Added total elevation to dashboard 
+
+Thanks to @Fmstrat
+
+In this release 1 issue was closed.  
+**Note:** This release contains database migration (see upgrade instructions in [documentation](https://samr1.github.io/FitTrackee/installation.html#upgrade))
+
+
+### Version 0.6.10 (2022/07/13)
 
 ### Issues Closed
 

diff --git a/Makefile b/Makefile
@@ -50,11 +50,18 @@ docker-build-all: docker-build docker-build-client
 docker-build-client:
 	docker-compose -f docker-compose-dev.yml build fittrackee_client
 
-docker-init: docker-init-db docker-restart docker-run-workers
+docker-init: docker-run docker-init-db docker-restart docker-run-workers
 
 docker-init-db:
 	docker-compose -f docker-compose-dev.yml exec fittrackee docker/init-database.sh
 
+docker-lint-client:
+	docker-compose -f docker-compose-dev.yml up -d fittrackee_client
+	docker-compose -f docker-compose-dev.yml exec fittrackee_client yarn lint
+
+docker-lint-python: docker-run
+	docker-compose -f docker-compose-dev.yml exec fittrackee docker/lint-python.sh
+
 docker-logs:
 	docker-compose -f docker-compose-dev.yml logs --follow
 
@@ -85,6 +92,18 @@ docker-shell:
 docker-stop:
 	docker-compose -f docker-compose-dev.yml stop
 
+docker-test-client:
+	docker-compose -f docker-compose-dev.yml up -d fittrackee_client
+	docker-compose -f docker-compose-dev.yml exec fittrackee_client yarn test:unit
+
+# needs a running application
+docker-test-e2e: docker-run
+	docker-compose -f docker-compose-dev.yml up -d selenium
+	docker-compose -f docker-compose-dev.yml exec fittrackee docker/test-e2e.sh $(PYTEST_ARGS)
+
+docker-test-python: docker-run
+	docker-compose -f docker-compose-dev.yml exec fittrackee docker/test-python.sh $(PYTEST_ARGS)
+
 docker-up:
 	docker-compose -f docker-compose-dev.yml up fittrackee
 
@@ -184,11 +203,11 @@ set-admin:
 	echo "Deprecated command, will be removed in a next version. Use 'user-set-admin' instead."
 	$(FTCLI) users update $(USERNAME) --set-admin true
 
+test-all: test-client test-python
+
 test-e2e:
 	$(PYTEST) e2e --driver firefox $(PYTEST_ARGS)
 
-test-all: test-client test-python
-
 test-e2e-client:
 	E2E_ARGS=client $(PYTEST) e2e --driver firefox $(PYTEST_ARGS)
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.6.10
+0.6.11
diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
@@ -12,6 +12,8 @@ services:
       - POSTGRES_PASSWORD=postgres
     volumes:
       - ./data/db:/var/lib/postgresql/data
+    networks:
+      - fittrackee-net
 
   fittrackee:
     container_name: fittrackee
@@ -24,14 +26,12 @@ services:
       - fittrackee-db
       - redis
       - mail
-    links:
-      - fittrackee-db
-      - redis
-      - mail
     volumes:
       - .:/usr/src/app
       - ./data/workouts:/usr/src/app/workouts
       - ./data/uploads:/usr/src/app/uploads
+    networks:
+      - fittrackee-net
 
   fittrackee_client:
     container_name: fittrackee_client
@@ -57,10 +57,23 @@ services:
     hostname: redis
     ports:
       - "6379:6379"
+    networks:
+      - fittrackee-net
 
   mail:
     container_name: fittrackee-mailhog
     image: "mailhog/mailhog"
     ports:
       - "1025:1025"
       - "8025:8025"
+    networks:
+      - fittrackee-net
+
+  selenium:
+    image: selenium/standalone-firefox:latest
+    hostname: selenium
+    privileged: true
+    shm_size: 2g
+
+networks:
+  fittrackee-net:
diff --git a/docker/init-database.sh b/docker/init-database.sh
@@ -2,7 +2,7 @@
 set -e
 cd /usr/src/app
 
-source .env.docker
+source .env
 
 ftcli db drop
 ftcli db upgrade
diff --git a/docker/lint-python.sh b/docker/lint-python.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+set -e
+cd /usr/src/app
+
+source .env
+
+mypy fittrackee
+pytest --flake8 --isort --black -m "flake8 or isort or black" fittrackee e2e --ignore=fittrackee/migrations
diff --git a/docker/run-workers.sh b/docker/run-workers.sh
@@ -2,6 +2,6 @@
 set -e
 cd /usr/src/app
 
-source .env.docker
+source .env
 
 flask worker --processes=$WORKERS_PROCESSES >> dramatiq.log  2>&1
diff --git a/docker/set-admin.sh b/docker/set-admin.sh
@@ -2,6 +2,6 @@
 set -e
 cd /usr/src/app
 
-source .env.docker
+source .env
 
 ftcli users update $1 --set-admin true
diff --git a/docker/shell.sh b/docker/shell.sh
@@ -2,6 +2,6 @@
 set -e
 cd /usr/src/app
 
-source .env.docker
+source .env
 
 /bin/bash
diff --git a/docker/test-e2e.sh b/docker/test-e2e.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+set -e
+cd /usr/src/app
+
+source .env
+
+export TEST_APP_URL=http://$(hostname --ip-address):5000
+pytest e2e --driver Remote --capability browserName firefox --selenium-host selenium --selenium-port 4444 $*
diff --git a/docker/test-python.sh b/docker/test-python.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+set -e
+cd /usr/src/app
+
+source .env
+
+pytest fittrackee $*
diff --git a/docs/.buildinfo b/docs/.buildinfo
@@ -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: c52394c093f45e0ad0599926c90fff71
+config: 24f7b5ef8c7dce9de2c87d070aa96591
 tags: 645f666f9bcd5a90fca523b33c5a78b7
diff --git a/docs/_images/fittrackee_screenshot-01.png b/docs/_images/fittrackee_screenshot-01.png
diff --git a/docs/_images/fittrackee_screenshot-02.png b/docs/_images/fittrackee_screenshot-02.png
diff --git a/docs/_images/fittrackee_screenshot-03.png b/docs/_images/fittrackee_screenshot-03.png
diff --git a/docs/_images/fittrackee_screenshot-04.png b/docs/_images/fittrackee_screenshot-04.png
diff --git a/docs/_images/fittrackee_screenshot-05.png b/docs/_images/fittrackee_screenshot-05.png
diff --git a/docs/_images/fittrackee_screenshot-06.png b/docs/_images/fittrackee_screenshot-06.png
diff --git a/docs/_sources/changelog.md.txt b/docs/_sources/changelog.md.txt
@@ -1,6 +1,28 @@
 # Change log
 
-## Version 0.6.10 (2022/07/13)
+## Version 0.6.11 (2022/07/27)
+
+### Issues Closed
+
+#### Bugs Fixed
+
+* [#213](https://github.com/SamR1/FitTrackee/issues/213) - Statistics - When using imperial measurements, ascent/descent should be in ft not mi
+
+### Pull Requests
+
+#### Features
+
+* [#223](https://github.com/SamR1/FitTrackee/pull/223) - Display ascent record icon
+* [#167](https://github.com/SamR1/FitTrackee/pull/167) - Added ascent record to Dashboard 
+* [#162](https://github.com/SamR1/FitTrackee/pull/162) - Added total elevation to dashboard 
+
+Thanks to @Fmstrat
+
+In this release 1 issue was closed.  
+**Note:** This release contains database migration (see upgrade instructions in [documentation](https://samr1.github.io/FitTrackee/installation.html#upgrade))
+
+
+### Version 0.6.10 (2022/07/13)
 
 ### Issues Closed
 

diff --git a/docs/_sources/features.rst.txt b/docs/_sources/features.rst.txt
@@ -45,6 +45,7 @@ Workouts
 - User records by sports:
     - average speed
     - farthest distance
+    - highest ascent (**new in 0.6.11**, can be hidden, see user preferences)
     - longest duration
     - maximum speed
 
@@ -71,6 +72,7 @@ Account & preferences
 - A user can reset his password (*new in 0.3.0*)
 - A user can change his email address (*new in 0.6.0*)
 - A user can choose between metric system and imperial system for distance, elevation and speed display (*new in 0.5.0*)
+- A user can choose to display or hide ascent records and total on Dashboard (*new in 0.6.11*)
 - A user can set sport preferences (*new in 0.5.0*):
      - change sport color (used for sport image and charts)
      - can override stopped speed threshold (for next uploaded gpx files)

diff --git a/docs/_sources/installation.rst.txt b/docs/_sources/installation.rst.txt
@@ -425,13 +425,13 @@ Production environment
 .. warning::
     | Note that FitTrackee is under heavy development, some features may be unstable.
 
--  Download the last release (for now, it is the release v0.6.10):
+-  Download the last release (for now, it is the release v0.6.11):
 
 .. code:: bash
 
-   $ wget https://github.com/SamR1/FitTrackee/archive/v0.6.10.tar.gz
-   $ tar -xzf v0.6.10.tar.gz
-   $ mv FitTrackee-0.6.10 FitTrackee
+   $ wget https://github.com/SamR1/FitTrackee/archive/v0.6.11.tar.gz
+   $ tar -xzf v0.6.11.tar.gz
+   $ mv FitTrackee-0.6.11 FitTrackee
    $ cd FitTrackee
 
 -  Create **.env** from example and update it
@@ -551,13 +551,13 @@ Prod environment
 
 - Change to the directory where FitTrackee directory is located
 
-- Download the last release (for now, it is the release v0.6.10) and overwrite existing files:
+- Download the last release (for now, it is the release v0.6.11) and overwrite existing files:
 
 .. code:: bash
 
-   $ wget https://github.com/SamR1/FitTrackee/archive/v0.6.10.tar.gz
-   $ tar -xzf v0.6.10.tar.gz
-   $ cp -R FitTrackee-0.6.10/* FitTrackee/
+   $ wget https://github.com/SamR1/FitTrackee/archive/v0.6.11.tar.gz
+   $ tar -xzf v0.6.11.tar.gz
+   $ cp -R FitTrackee-0.6.11/* FitTrackee/
    $ cd FitTrackee
 
 - Update **.env** if needed (see `Environment variables <installation.html#environment-variables>`__).
@@ -710,16 +710,22 @@ Installation
 
 For evaluation purposes, docker files are available, installing **FitTrackee** from **sources**.
 
-- To install **FitTrackee** with database initialisation and run the application and dramatiq workers:
+- To install **FitTrackee**:
 
 .. code-block:: bash
 
     $ git clone https://github.com/SamR1/FitTrackee.git
     $ cd FitTrackee
     $ cp .env.docker .env
-    $ make docker-build docker-run docker-init
+    $ make docker-build
 
-Open http://localhost:5000 and register.
+- To initialise database:
+
+.. code-block:: bash
+
+    $ docker-init
+
+- Open http://localhost:5000 and register.
 
 Open http://localhost:8025 to access `MailHog interface <https://github.com/mailhog/MailHog>`_ (email testing tool)
 
@@ -772,4 +778,13 @@ Development
 Open http://localhost:3000
 
 .. note::
-    Some environment variables need to be updated like `UI_URL`
+    Some environment variables need to be updated like `UI_URL`
+
+- to run lint or tests:
+
+.. code-block:: bash
+
+    $ make docker-lint-client  # run lint on javascript files
+    $ make docker-test-client  # run unit tests on Client
+    $ make docker-lint-python  # run type check and lint on python files
+    $ make docker-test-python  # run unit tests on API