Frontend - repo cleanup

.github/workflows/Continuous_Deployment_Frontend_Dev.yml

@@ -5,8 +5,11 @@ on:
     branches:
       - dev
     paths:
-      - 'src/**'
-      - 'public/**'
+      - 'client/**'
+
+defaults:
+  run:
+    working-directory: client
 
 jobs:
   build:
@@ -20,14 +23,14 @@ jobs:
       run: npm install
     - name: Setup environment
       run: |
-        echo MAPBOX_TOKEN=${{ secrets.MAPBOX_TOKEN }} > src/.env
-        echo MAPBOX_STREETS_URL=${{ secrets.MAPBOX_STREETS_URL }} >> src/.env
-        echo MAPBOX_SATELLITE_URL=${{ secrets.MAPBOX_SATELLITE_URL }} >> src/.env
-        echo API_URL=${{ secrets.API_URL_DEV }} >> src/.env
-        echo MIXPANEL_ENABLED=${{ secrets.MIXPANEL_ENABLED }} >> src/.env
-        echo MIXPANEL_TOKEN_PROD=${{ secrets.MIXPANEL_TOKEN_PROD }} >> src/.env
-        echo MIXPANEL_TOKEN_DEV=${{ secrets.MIXPANEL_TOKEN_DEV }} >> src/.env
-        echo GITHUB_SHA=${{ github.sha }} >> src/.env
+        echo MAPBOX_TOKEN=${{ secrets.MAPBOX_TOKEN }} > .env
+        echo MAPBOX_STREETS_URL=${{ secrets.MAPBOX_STREETS_URL }} >> .env
+        echo MAPBOX_SATELLITE_URL=${{ secrets.MAPBOX_SATELLITE_URL }} >> .env
+        echo API_URL=${{ secrets.API_URL_DEV }} >> .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
     - name: Configure AWS Credentials

.github/workflows/Continuous_Deployment_Frontend_Prod.yml

@@ -5,8 +5,11 @@ on:
     branches:
       - master
     paths:
-      - 'src/**'
-      - 'public/**'
+      - 'client/**'
+
+defaults:
+  run:
+    working-directory: client
 
 jobs:
   build:
@@ -20,14 +23,14 @@ jobs:
       run: npm install
     - name: Setup environment
       run: |
-        echo MAPBOX_TOKEN=${{ secrets.MAPBOX_TOKEN }} > src/.env
-        echo MAPBOX_STREETS_URL=${{ secrets.MAPBOX_STREETS_URL }} >> src/.env
-        echo MAPBOX_SATELLITE_URL=${{ secrets.MAPBOX_SATELLITE_URL }} >> src/.env
-        echo API_URL=${{ secrets.API_URL_PROD }} >> src/.env
-        echo MIXPANEL_ENABLED=${{ secrets.MIXPANEL_ENABLED }} >> src/.env
-        echo MIXPANEL_TOKEN_PROD=${{ secrets.MIXPANEL_TOKEN_PROD }} >> src/.env
-        echo MIXPANEL_TOKEN_DEV=${{ secrets.MIXPANEL_TOKEN_DEV }} >> src/.env
-        echo GITHUB_SHA=${{ github.sha }} >> src/.env
+        echo MAPBOX_TOKEN=${{ secrets.MAPBOX_TOKEN }} > .env
+        echo MAPBOX_STREETS_URL=${{ secrets.MAPBOX_STREETS_URL }} >> .env
+        echo MAPBOX_SATELLITE_URL=${{ secrets.MAPBOX_SATELLITE_URL }} >> .env
+        echo API_URL=${{ secrets.API_URL_PROD }} >> .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
     - name: Configure AWS Credentials

.github/workflows/Continuous_Integration_Frontend.yml

@@ -3,8 +3,11 @@ name: CI_Frontend
 on:
   pull_request:
     paths:
-      - 'src/**'
-      - 'public/**'
+      - 'client/**'
+
+defaults:
+  run:
+    working-directory: client
 
 jobs:
   build:
@@ -17,13 +20,13 @@ jobs:
       run: npm run lint
     - name: Setup environment
       run: |
-        echo MAPBOX_TOKEN=${{ secrets.MAPBOX_TOKEN }} > src/.env
-        echo MAPBOX_STREETS_URL=${{ secrets.MAPBOX_STREETS_URL }} >> src/.env
-        echo MAPBOX_SATELLITE_URL=${{ secrets.MAPBOX_SATELLITE_URL }} >> src/.env
-        echo API_URL=${{ secrets.API_URL_PROD }} >> src/.env
-        echo MIXPANEL_ENABLED=${{ secrets.MIXPANEL_ENABLED }} >> src/.env
-        echo MIXPANEL_TOKEN_PROD=${{ secrets.MIXPANEL_TOKEN_PROD }} >> src/.env
-        echo MIXPANEL_TOKEN_DEV=${{ secrets.MIXPANEL_TOKEN_DEV }} >> src/.env
+        echo MAPBOX_TOKEN=${{ secrets.MAPBOX_TOKEN }} > .env
+        echo MAPBOX_STREETS_URL=${{ secrets.MAPBOX_STREETS_URL }} >> .env
+        echo MAPBOX_SATELLITE_URL=${{ secrets.MAPBOX_SATELLITE_URL }} >> .env
+        echo API_URL=${{ secrets.API_URL_PROD }} >> .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

.gitignore

@@ -1,6 +1,4 @@
 
-dist/
-
 # Test results
 coverage/
 
@@ -22,10 +20,6 @@ npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
 
-/package-lock.json
-
-node_modules_non_es5
-
 # config
 config.js
 .env

client/.gitignore

@@ -0,0 +1,9 @@
+# secrets
+.env
+
+# dependencies
+/node_modules/
+node_modules_non_es5
+
+# production build
+dist/

src/README.md → client/README.md

@@ -2,15 +2,15 @@
 
 ### Setting up the project for the first time?
 
-  - `npm run setup` to install front end dependencies and create an `.env` file
+  - From this directory, `npm run setup` to install front end dependencies and create an `.env` file
   - get a [Mapbox](https://account.mapbox.com/auth/signin/) API token and add that to your `.env` file as the `MAPBOX_TOKEN`
   - get the `API_URL` from a team member and add that to your `.env` file
 
 Setup complete!
 
 ### Development
 
-  - `npm start` to check your `.env` file and start webpack dev server
+  - From this directory, `npm start` to check your `.env` file and start webpack dev server
 
 Your browser should open to `0.0.0.0:3000` and the site should render. Webpack will detect saved code changes, rebuild the bundle in memory, and update the site in your browser.
 
@@ -23,5 +23,5 @@ npm run check-env             # checks .env file exists and has all required key
 npm start                     # check .env file and start webpack dev server
 npm run dev                   # start webpack dev server (no .env check)
 npm run build                 # run webpack in production mode - output is placed in dist directory
-npm run lint                  # lint javascript in src directory
+npm run lint                  # lint javascript in client directory
 ```