Merge branch 'dev'

Author: gondzo

README.md

@@ -10,14 +10,18 @@
 
 
 ## Configuration
-Configuration files are located under `config` dir.
+Configuration files are located under `config` and `src/config` directories.
 See Guild https://github.com/lorenwest/node-config/wiki/Configuration-Files
 
 |Name|Description|
 |----|-----------|
 |`PORT`| The port to listen|
 |`GOOGLE_API_KEY`| The google api key see (https://developers.google.com/maps/documentation/javascript/get-api-key#key)|
 |`API_BASE_URL`| The base URL for Drone API |
+|`REACT_APP_API_BASE_PATH`| The React app  api base path`|
+|`REACT_APP_SOCKET_URL`| The React app app socket url`|
+|`REACT_APP_AUTH0_CLIEND_ID`| The React app auth0 client id`|
+|`REACT_APP_AUTH0_DOMAIN`| The React app auth0 domain`|
 
 
 ## Install dependencies

config/default.js

@@ -8,5 +8,4 @@ module.exports = {
 
   // below env variables are visible in frontend
   GOOGLE_API_KEY: process.env.GOOGLE_API_KEY || 'AIzaSyCrL-O319wNJK8kk8J_JAYsWgu6yo5YsDI',
-  API_BASE_PATH: process.env.API_BASE_PATH || 'https://kb-dsp-server-dev.herokuapp.com',
 };

config/development.js

@@ -8,5 +8,4 @@ module.exports = {
 
   // below env variables are visible in frontend
   GOOGLE_API_KEY: process.env.GOOGLE_API_KEY || 'AIzaSyCrL-O319wNJK8kk8J_JAYsWgu6yo5YsDI',
-  API_BASE_PATH: process.env.API_BASE_PATH || 'https://kb-dsp-server-dev.herokuapp.com',
 };

config/production.js

@@ -8,5 +8,4 @@ module.exports = {
 
   // below env variables are visible in frontend
   GOOGLE_API_KEY: process.env.GOOGLE_API_KEY || 'AIzaSyCrL-O319wNJK8kk8J_JAYsWgu6yo5YsDI',
-  API_BASE_PATH: process.env.API_BASE_PATH || 'https://kb-dsp-server-dev.herokuapp.com',
 };

config/staging.js

@@ -8,5 +8,4 @@ module.exports = {
 
   // below env variables are visible in frontend
   GOOGLE_API_KEY: process.env.GOOGLE_API_KEY || 'AIzaSyCrL-O319wNJK8kk8J_JAYsWgu6yo5YsDI',
-  API_BASE_PATH: process.env.API_BASE_PATH || 'https://kb-dsp-server-dev.herokuapp.com',
 };

config/test.js

@@ -8,5 +8,4 @@ module.exports = {
 
   // below env variables are visible in frontend
   GOOGLE_API_KEY: process.env.GOOGLE_API_KEY || 'AIzaSyCrL-O319wNJK8kk8J_JAYsWgu6yo5YsDI',
-  API_BASE_PATH: process.env.API_BASE_PATH || 'https://kb-dsp-server-dev.herokuapp.com',
 };

webpack.config.js

@@ -2,7 +2,6 @@
 
 const path = require('path');
 const _ = require('lodash');
-const ip = require('ip');
 const webpack = require('webpack');
 const config = require('config');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
@@ -100,7 +99,10 @@ module.exports = {
       'process.env': {
         NODE_ENV: JSON.stringify(process.env.NODE_ENV),
         GOOGLE_API_KEY: JSON.stringify(process.env.GOOGLE_API_KEY),
-        API_BASE_URL: JSON.stringify(process.env.API_BASE_URL),
+        REACT_APP_API_BASE_PATH: JSON.stringify(process.env.REACT_APP_API_BASE_PATH),
+        REACT_APP_SOCKET_URL: JSON.stringify(process.env.REACT_APP_SOCKET_URL),
+        REACT_APP_AUTH0_CLIEND_ID: JSON.stringify(process.env.REACT_APP_AUTH0_CLIEND_ID),
+        REACT_APP_AUTH0_DOMAIN: JSON.stringify(process.env.REACT_APP_AUTH0_DOMAIN),
       },
     }),
     new HtmlWebpackPlugin({