merged in main

.github/workflows/eslint.yml

@@ -9,7 +9,6 @@ name: ES Lint the repo
 on:
   workflow_dispatch:
   push:
-  pull_request:
 
 jobs:
   eslint:

.github/workflows/image-push.yml

@@ -49,7 +49,8 @@ jobs:
             APP_VERSION=${{ steps.get_version.outputs.VERSION }}
             APP_GS_DATA_URL=${{ secrets.GS_DATA_URL }}
             APP_UI_DATA_URL=${{ secrets.UI_DATA_URL }}
-            APP_UI_DATA_TOKEN=${{ secrets.TOKEN }}
+            APP_UI_DATA_TOKEN=${{ secrets.UI_DATA_TOKEN }}
+            APP_UI_MAPBOX_TOKEN=${{ secrets.UI_MAPBOX_TOKEN }}
 
           tags: |
             ${{ env.REGISTRY }}:latest

.gitignore

@@ -2,3 +2,5 @@ dist
 node_modules
 
 .env*
+.DS_Store
+src/.DS_Store

Dockerfile

@@ -25,16 +25,19 @@ ARG APP_VERSION=$(APP_VERSION)
 ARG APP_GS_DATA_URL=$(APP_GS_DATA_URL)
 ARG APP_UI_DATA_URL=$(APP_UI_DATA_URL)
 ARG APP_UI_DATA_TOKEN=$(APP_UI_DATA_TOKEN)
+ARG APP_UI_MAPBOX_TOKEN=$(APP_UI_MAPBOX_TOKEN)
 
 # now add the values into ENV params
 ENV REACT_APP_VERSION=$APP_VERSION
 ENV REACT_APP_GS_DATA_URL=$APP_GS_DATA_URL
 ENV REACT_APP_UI_DATA_URL=$APP_UI_DATA_URL
 ENV REACT_APP_UI_DATA_TOKEN=$APP_UI_DATA_TOKEN
+ENV REACT_APP_MAPBOX_TOKEN=$APP_UI_MAPBOX_TOKEN
 
 # create the env file
 RUN printf "NODE_ENV=production\nREACT_APP_VERSION=$APP_VERSION\nREACT_APP_GS_DATA_URL=$APP_GS_DATA_URL\n" > .env
 RUN printf "REACT_APP_UI_DATA_URL=$APP_UI_DATA_URL\nREACT_APP_UI_DATA_TOKEN=$APP_UI_DATA_TOKEN\n" >> .env
+RUN printf "REACT_APP_MAPBOX_TOKEN=$REACT_APP_MAPBOX_TOKEN\n" >> .env
 
 # Copy in source files
 COPY . /src