Merge pull request #657 from adamkendis/FRONT-workflowUpdates

Front - workflow updates
hackforla · May 27, 2020 · 91f7e97 · 91f7e97
2 parents b6936c2 + ccd532f
commit 91f7e97
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 1 deletion.
diff --git a/.github/workflows/Continuous_Delivery.yml b/.github/workflows/Continuous_Delivery.yml
@@ -24,6 +24,9 @@ jobs:
       run: |
         echo REACT_APP_MAPBOX_TOKEN=${{ secrets.MAPBOX_TOKEN }} > .env
         echo DB_URL=${{ secrets.DB_URL }} >> .env
+        echo MIXPANEL_ENABLED=${{ secrets.MIXPANEL_ENABLED }} >> .env
+        echo MIXPANEL_TOKEN_PROD=${{ secrets.MIXPANEL_TOKEN_PROD }} >> .env
+        echo MIXPANEL_TOKEN_DEV=${{ secrets.MIXPANEL_TOKEN_DEV }} >> .env
         echo GITHUB_SHA=${{ github.sha }} >> .env
     - name: Build project
       run: npm run build
@@ -35,6 +38,9 @@ jobs:
         ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }}
         REACT_APP_MAPBOX_TOKEN: ${{ secrets.MAPBOX_TOKEN }}
         DB_URL: ${{ secrets.DB_URL }}
+        MIXPANEL_ENABLED: ${{ secrets.MIXPANEL_ENABLED }}
+        MIXPANEL_TOKEN_PROD: ${{ secrets.MIXPANEL_TOKEN_PROD }}
+        MIXPANEL_TOKEN_DEV: ${{ secrets.MIXPANEL_TOKEN_DEV }}
         BASE_BRANCH: master # The branch the action should deploy from.
         BRANCH: gh-pages # The branch the action should deploy to.
         FOLDER: dist # The folder the action should deploy.

diff --git a/.github/workflows/Continuous_Integration_Frontend.yml b/.github/workflows/Continuous_Integration_Frontend.yml
@@ -14,6 +14,9 @@ jobs:
       run: |
         echo REACT_APP_MAPBOX_TOKEN=${{ secrets.MAPBOX_TOKEN }} > .env
         echo DB_URL=${{ secrets.DB_URL }} >> .env
+        echo MIXPANEL_ENABLED=${{ secrets.MIXPANEL_ENABLED }} >> .env
+        echo MIXPANEL_TOKEN_PROD=${{ secrets.MIXPANEL_TOKEN_PROD }} >> .env
+        echo MIXPANEL_TOKEN_DEV=${{ secrets.MIXPANEL_TOKEN_DEV }} >> .env
     - name: Build project
       run: npm run build
     - name: Run Tests

diff --git a/Orchestration/docker-compose-example.yml b/Orchestration/docker-compose-example.yml
@@ -31,6 +31,9 @@ services:
    environment:
      REACT_APP_MAPBOX_TOKEN: REDACTED
      DB_URL: http://localhost:5000
+     MIXPANEL_ENABLED: -1
+     MIXPANEL_TOKEN_PROD: REDACTED
+     MIXPANEL_TOKEN_DEV: REDACTED
    ports:
      - 3000:3000
 

diff --git a/copyEnv.sh b/copyEnv.sh
@@ -1,4 +1,7 @@
 echo REACT_APP_MAPBOX_TOKEN=$REACT_APP_MAPBOX_TOKEN > .env
 echo DB_URL=$DB_URL >> .env
+echo MIXPANEL_ENABLED=$MIXPANEL_ENABLED >> .env
+echo MIXPANEL_TOKEN_PROD=$MIXPANEL_TOKEN_PROD >> .env
+echo MIXPANEL_TOKEN_DEV=$MIXPANEL_TOKEN_DEV >> .env
 webpack
 node server.js
diff --git a/src/components/main/footer/Footer.jsx b/src/components/main/footer/Footer.jsx
@@ -50,7 +50,7 @@ const mapStateToProps = state => ({
 });
 
 Footer.propTypes = {
-  lastUpdated: propTypes.number,
+  lastUpdated: propTypes.string,
   version: propTypes.string,
   backendSha: propTypes.string,
   menuIsOpen: propTypes.bool.isRequired,