Merge branch 'dev' into add-social-features

SamR1 · Nov 18, 2023 · 8207885 · 8207885
2 parents 5cf57e5 + e62d159
commit 8207885
Show file tree

Hide file tree

Showing 412 changed files with 7,917 additions and 12,260 deletions.
diff --git a/.github/workflows/.tests-javascript.yml b/.github/workflows/.tests-javascript.yml
@@ -28,6 +28,9 @@ jobs:
       - name: Lint
         working-directory: ${{env.working-directory}}
         run: yarn lint
+      - name: Type check
+        working-directory: ${{env.working-directory}}
+        run: yarn type-check
       - name: Tests
         working-directory: ${{env.working-directory}}
         run: yarn test:unit

diff --git a/Makefile b/Makefile
@@ -24,9 +24,9 @@ bandit:
 build-client: lint-client
 	cd fittrackee_client && $(NPM) build
 
-check-all: bandit lint-all type-check test-all
+check-all: bandit lint-all type-check-all test-all
 
-check-client: lint-client test-client
+check-client: lint-client type-check-client test-client
 
 check-python: bandit lint-python type-check test-python
 
@@ -98,7 +98,7 @@ docker-run-workers:
 
 docker-serve-client:
 	docker-compose -f docker-compose-dev.yml up -d fittrackee_client
-	docker-compose -f docker-compose-dev.yml exec fittrackee_client yarn serve
+	docker-compose -f docker-compose-dev.yml exec fittrackee_client yarn dev
 
 docker-set-admin:
 	docker-compose -f docker-compose-dev.yml exec fittrackee docker/set-admin.sh $(USERNAME)
@@ -194,7 +194,7 @@ lint-client:
 	cd fittrackee_client && $(NPM) lint
 
 lint-client-fix:
-	cd fittrackee_client && $(NPM) lint-fix
+	cd fittrackee_client && $(NPM) format
 
 lint-python:
 	$(PYTEST) --isort --black -m "isort or black" fittrackee e2e --ignore=fittrackee/migrations
@@ -233,7 +233,7 @@ serve-dev:
 
 serve-client:
     # for dev environments
-	cd fittrackee_client && PORT=3000 $(NPM) serve
+	cd fittrackee_client && PORT=3000 $(NPM) dev
 
 serve-python:
     # for dev environments
@@ -263,12 +263,20 @@ test-python:
 	$(PYTEST) fittrackee --cov-config .coveragerc --cov=fittrackee --cov-report term-missing $(PYTEST_ARGS)
 
 test-client:
-	cd fittrackee_client && $(NPM) test:unit $(MOCHA_ARGS)
+	cd fittrackee_client && $(NPM) test:unit run
+
+test-client-watch:
+	cd fittrackee_client && $(NPM) test:unit watch
 
 type-check:
 	echo 'Running mypy...'
 	$(MYPY) fittrackee
 
+type-check-all: type-check-client type-check
+
+type-check-client:
+	cd fittrackee_client && $(NPM) type-check
+
 upgrade-db:
 	$(FTCLI) db upgrade
 

diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
@@ -36,7 +36,7 @@ services:
     container_name: fittrackee_client
     environment:
       - NODE_ENV=development
-      - VUE_APP_API_URL=http://localhost:5000
+      - VITE_APP_API_URL=http://localhost:5000
     build:
       context: ./fittrackee_client
     volumes:

diff --git a/docs/en/_sources/installation.rst.txt b/docs/en/_sources/installation.rst.txt
@@ -29,7 +29,7 @@ Prerequisites
     - SMTP provider (if email sending is enabled)
     - API key from a `weather data provider <installation.html#weather-data>`__
     - `Poetry <https://poetry.eustace.io>`__ (for installation from sources only)
-    - `Node <https://nodejs.org>`__ 16+ and `Yarn <https://yarnpkg.com>`__ (for development only)
+    - `Node <https://nodejs.org>`__ 18+ and `Yarn <https://yarnpkg.com>`__ (for development only)
     -  Docker and Docker Compose (for development or evaluation purposes)
 
 .. note::
@@ -245,7 +245,9 @@ deployment method.
     Provider for weather data (not mandatory), see `Weather data <installation.html#weather-data>`__.
 
 
-.. envvar:: VUE_APP_API_URL
+.. envvar:: VITE_APP_API_URL
+
+    .. versionchanged:: 0.x.x ⚠️ replaces ``VUE_APP_API_URL``
 
     **FitTrackee** API URL, only needed in dev environment.
 
@@ -818,7 +820,7 @@ Installation
 
 .. versionadded:: 0.4.4
 
-For evaluation purposes, docker files are available, installing **FitTrackee** from **sources**.
+For **evaluation** purposes, docker files are available, installing **FitTrackee** from **sources**.
 
 - To install **FitTrackee**:
 

diff --git a/fittrackee/dist/index.html b/fittrackee/dist/index.html
@@ -1 +1,20 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><!--[if IE]><link rel="icon" href="/favicon.ico"><![endif]--><link rel="stylesheet" href="/static/css/fork-awesome.min.css"/><link rel="stylesheet" href="/static/css/leaflet.css"/><title>FitTrackee</title><script defer="defer" src="/static/js/chunk-vendors.6f625ccc.js"></script><script defer="defer" src="/static/js/app.6d1bd717.js"></script><link href="/static/css/app.a587cef2.css" rel="stylesheet"><link rel="icon" type="image/png" sizes="32x32" href="/img/icons/favicon-32x32.png"><link rel="icon" type="image/png" sizes="16x16" href="/img/icons/favicon-16x16.png"><link rel="manifest" href="/manifest.json"><meta name="theme-color" content="#4DBA87"><meta name="apple-mobile-web-app-capable" content="no"><meta name="apple-mobile-web-app-status-bar-style" content="default"><meta name="apple-mobile-web-app-title" content="fittrackee_client"><link rel="apple-touch-icon" href="/img/icons/apple-touch-icon-152x152.png"><link rel="mask-icon" href="/img/icons/safari-pinned-tab.svg" color="#4DBA87"><meta name="msapplication-TileImage" content="/img/icons/msapplication-icon-144x144.png"><meta name="msapplication-TileColor" content="#000000"></head><body><noscript><strong>We're sorry but FitTrackee doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8">
+    <link rel="icon" href="/favicon.ico">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <link rel="stylesheet" href="/static/css/fork-awesome.min.css"/>
+    <link rel="stylesheet" href="/static/css/leaflet.css"/>
+    <title>FitTrackee</title>
+    <script type="module" crossorigin src="/static/index-51012998.js"></script>
+    <link rel="modulepreload" crossorigin href="/static/charts-ed4ceed1.js">
+    <link rel="modulepreload" crossorigin href="/static/maps-c37c70d1.js">
+    <link rel="stylesheet" href="/static/css/maps-69420918.css">
+    <link rel="stylesheet" href="/static/css/index-827feab5.css">
+  </head>
+  <body>
+    <div id="app"></div>
+
+  </body>
+</html>
diff --git a/fittrackee/dist/manifest.json b/fittrackee/dist/manifest.json
diff --git a/fittrackee/dist/service-worker.js b/fittrackee/dist/service-worker.js