Merge branch 'master' into v0.3.0

fittrackee_client/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:11.10.1
+FROM node:13.13.0
 
 MAINTAINER SamR1@users.noreply.github.com
 
@@ -13,9 +13,11 @@ ENV PATH /usr/src/app/node_modules/.bin:$PATH
 ARG REACT_APP_API_URL
 ARG NODE_ENV
 ARG REACT_APP_ALLOW_REGISTRATION
+ARG CI
 ENV NODE_ENV $NODE_ENV
 ENV REACT_APP_API_URL $REACT_APP_API_URL
 ENV REACT_APP_ALLOW_REGISTRATION $REACT_APP_ALLOW_REGISTRATION
+ENV CI $CI
 
 # install and cache app dependencies
 COPY package.json /usr/src/app/package.json

fittrackee_client/src/components/Activity/ActivityDisplay/ActivitySegments.jsx

@@ -18,8 +18,9 @@ export default function ActivitySegments(props) {
                     key={`segment-${index}`}
                   >
                     <Link
-                      to={`/activities/${segment.activity_id}/segment/${index +
-                        1}`}
+                      to={`/activities/${segment.activity_id}/segment/${
+                        index + 1
+                      }`}
                     >
                       {t('activities:segment')} {index + 1}
                     </Link>{' '}