Merge pull request #607 from adamkendis/514-FRONT-routerFix

React Router basename fix

.example.env

@@ -1,3 +1,2 @@
 REACT_APP_MAPBOX_TOKEN=REDACTED
 DB_URL=REDACTED
-BASE_URL=/311-data

.github/workflows/Continuous_Delivery.yml

@@ -24,7 +24,6 @@ jobs:
       run: |
         echo REACT_APP_MAPBOX_TOKEN=${{ secrets.MAPBOX_TOKEN }} > .env
         echo DB_URL=${{ secrets.DB_URL }} >> .env
-        echo BASE_URL=${{ secrets.BASE_URL }} >> .env
         echo GITHUB_SHA=${{ github.sha }} >> .env
     - name: Build project
       run: npm run build
@@ -36,7 +35,6 @@ jobs:
         ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }}
         REACT_APP_MAPBOX_TOKEN: ${{ secrets.MAPBOX_TOKEN }}
         DB_URL: ${{ secrets.DB_URL }}
-        BASE_URL: ${{ secrets.BASE_URL }}
         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.

Orchestration/docker-compose-example.yml

@@ -26,7 +26,6 @@ services:
    environment:
      REACT_APP_MAPBOX_TOKEN: REDACTED
      DB_URL: http://localhost:5000
-     BASE_URL: ''
    ports:
      - 3000:3000
 

copyEnv.sh

@@ -1,5 +1,4 @@
 echo REACT_APP_MAPBOX_TOKEN=$REACT_APP_MAPBOX_TOKEN > .env
 echo DB_URL=$DB_URL >> .env
-echo BASE_URL=$BASE_URL >> .env
 webpack
 node server.js

src/App.jsx

@@ -11,8 +11,6 @@ import Footer from './components/main/footer/Footer';
 import StaticFooter from './components/main/footer/StaticFooter';
 import { SnapshotRenderer } from './components/export/SnapshotService';
 
-const basename = process.env.NODE_ENV === 'development' ? '/' : process.env.BASE_URL || '/';
-
 const App = ({
   getMetadata,
 }) => {
@@ -21,7 +19,7 @@ const App = ({
   });
 
   return (
-    <Router basename={basename}>
+    <Router>
       <Header />
       <Routes />
       <Switch>