Remove all hard coded env variables

.gitignore

@@ -8,4 +8,5 @@ client/.env
 /.idea
 test.db
 globalConfig.json
-videos/
+videos/
+screenshots/

backend/config/database.js

@@ -1,4 +1,2 @@
-exports.PORT = process.env.PORT || 4000;
-exports.DATABASE_URL = process.env.DATABASE_URL || 'mongodb://localhost:27017/testdb';
-exports.TEST_DATABASE_URL = process.env.TEST_DATABASE_URL || 'mongodb://localhost:27017/testdb';
-exports.LIVE_DATABASE_URL = process.env.LIVE_DATABASE_URL || 'mongodb://localhost:27017/testdb';
+exports.PORT = process.env.BACKEND_PORT;
+exports.DATABASE_URL = process.env.DATABASE_URL;

backend/package.json

@@ -42,6 +42,5 @@
   },
   "jest": {
     "testEnvironment": "node"
-  },
-  "proxy": "http://localhost:3000/"
+  }
 }

client/package.json

@@ -6,8 +6,12 @@
   "dependencies": {
     "@babel/plugin-transform-react-jsx-self": "^7.10.4",
     "classnames": "^2.2.6",
+    "cross-env": "^7.0.2",
+    "cross-var": "^1.1.0",
     "d3": "^5.15.1",
+    "dotenv-cli": "^3.2.0",
     "firebase": "^7.15.1",
+    "http-proxy-middleware": "^1.0.5",
     "local-storage": "^2.0.0",
     "mathjs": "^6.6.2",
     "minimist": "^1.2.3",
@@ -20,7 +24,7 @@
     "react-scripts": "^3.4.1"
   },
   "scripts": {
-    "start": "react-scripts start",
+    "start": "dotenv -e .env -- cross-var cross-env PORT=%CLIENT_PORT% react-scripts start",
     "build": "react-scripts build",
     "test": "react-scripts test --watchAll=false",
     "test:watch": "react-scripts test",
@@ -30,7 +34,6 @@
   "eslintConfig": {
     "extends": "react-app"
   },
-  "proxy": "http://localhost:4000/",
   "browserslist": {
     "production": [
       ">0.2%",

client/src/setupProxy.js

@@ -0,0 +1,10 @@
+const { createProxyMiddleware } = require("http-proxy-middleware");
+module.exports = function (app) {
+  app.use(
+    "/api",
+    createProxyMiddleware({
+      target: process.env.REACT_APP_PROXY,
+      changeOrigin: true,
+    })
+  );
+};