Merge branch 'master' into v0.3.0

Conflicts:
	docs/objects.inv
	docs/searchindex.js
	fittrackee_api/poetry.lock
	fittrackee_api/pyproject.toml
	fittrackee_client/src/actions/index.js
	fittrackee_client/src/components/App.jsx
	fittrackee_client/src/utils/index.js

fittrackee_client/src/actions/activities.js

@@ -52,7 +52,10 @@ export const addActivity = form => dispatch =>
       }
       dispatch(setLoading(false))
     })
-    .catch(error => dispatch(setError(`activities|${error}`)))
+    .catch(error => {
+      dispatch(setLoading(false))
+      dispatch(setError(`activities|${error}`))
+    })
 
 export const addActivityWithoutGpx = form => dispatch =>
   FitTrackeeGenericApi.addData('activities/no_gpx', form)
@@ -154,7 +157,10 @@ export const editActivity = form => dispatch =>
       }
       dispatch(setLoading(false))
     })
-    .catch(error => dispatch(setError(`activities|${error}`)))
+    .catch(error => {
+      dispatch(setLoading(false))
+      dispatch(setError(`activities|${error}`))
+    })
 
 export const getMoreActivities = params => dispatch =>
   FitTrackeeGenericApi.getData('activities', params)

fittrackee_client/src/actions/index.js

@@ -28,14 +28,15 @@ export const updateSportsData = data => ({
   type: 'UPDATE_SPORT_DATA',
   data,
 })
-
 export const getOrUpdateData = (
   action,
   target,
   data,
   canDispatch = true
 ) => dispatch => {
+  dispatch(setLoading(true))
   if (data && data.id && isNaN(data.id)) {
+    dispatch(setLoading(false))
     return dispatch(setError(`${target}|Incorrect id`))
   }
   dispatch(setError(''))
@@ -50,8 +51,12 @@ export const getOrUpdateData = (
       } else {
         dispatch(setError(`${target}|${ret.message || ret.status}`))
       }
+      dispatch(setLoading(false))
+    })
+    .catch(error => {
+      dispatch(setLoading(false))
+      dispatch(setError(`${target}|${error}`))
     })
-    .catch(error => dispatch(setError(`${target}|${error}`)))
 }
 
 export const addData = (target, data) => dispatch =>