Merge 187edf3 into 5130ba3

.env-sample

@@ -0,0 +1 @@
+baseURL=

.eslintrc.js

@@ -14,6 +14,7 @@ module.exports = {
 	},
 	"plugins": ["jest", "react"],
 	"rules": {
+		"no-param-reassign":"off",
 		"max-len": [1, 80, 2],
 		"react/jsx-uses-react":1,
 		"react/react-in-jsx-scope": 1,

.gitignore

@@ -2,3 +2,4 @@
 node_modules/
 coverage/
 src/.DS_Store
+.env

package.json

@@ -56,6 +56,7 @@
     "babel-eslint": "^10.0.1",
     "babel-loader": "^8.0.5",
     "coveralls": "^3.0.3",
+    "dotenv": "^8.0.0",
     "enzyme-to-json": "^3.3.5",
     "eslint": "^5.16.0",
     "eslint-config-airbnb": "^17.1.0",

src/actions/signupSigninActions.js

@@ -1,10 +1,9 @@
 import { notify } from 'react-notify-toast';
 import axios from 'axios';
-import config from '../../dist/config';
 
 export const signUpUser = (user, history) => () => {
   axios
-    .post(`${config.baseURL}/register/`, user)
+    .post(`${process.env.baseURL}/users/register/`, user)
     .then(() => {
       notify.show('Registration successful', 'success', 4000);
       history.push('/login');
@@ -18,7 +17,7 @@ export const signUpUser = (user, history) => () => {
 
 export const signInUser = (user, history) => () => {
   axios
-    .post(`${config.baseURL}/login/`, user)
+    .post(`${process.env.baseURL}/users/login/`, user)
     .then((response) => {
       localStorage.setItem('accessToken', response.data.user.token);
       notify.show('Login successful', 'success', 4000);

src/helpers/axiosInstance.js

@@ -1,15 +1,16 @@
 import axios from 'axios';
 
 const axiosInstance = axios.create({
-    baseURL: 'https://ah-backend.herokuapp.com',
-    headers: { Authorization: `Bearer ${localStorage.getItem('accessToken')}` }
+  baseURL: process.env.baseURL,
+  headers: { Authorization: `Bearer ${localStorage.getItem('accessToken')}` },
 });
 
 axiosInstance.interceptors.request.use((config) => {
-    if (localStorage.getItem('accessToken') && config.headers.Authorization === 'Bearer null') {
-      config.headers.Authorization = `Bearer ${localStorage.getItem('accessToken')}`;
-    }
-    return config;
-  });
+  if (localStorage.getItem('accessToken')
+  && config.headers.Authorization === 'Bearer null') {
+    config.headers.Authorization = `Bearer ${localStorage.getItem('accessToken')}`;
+  }
+  return config;
+});
 
 export default axiosInstance;

webpack.config.js

@@ -1,6 +1,15 @@
 const path = require('path');
+const webpack = require('webpack');
+const dotenv = require('dotenv');
 const HtmlWebPackPlugin = require('html-webpack-plugin');
 
+const env = dotenv.config().parsed;
+
+const envKeys = Object.keys(env).reduce((prev, next) => {
+  const previous = prev;
+  previous[`process.env.${next}`] = JSON.stringify(env[next]);
+  return previous;
+}, {});
 
 module.exports = {
   entry: './src/index.jsx',
@@ -39,13 +48,13 @@ module.exports = {
           },
         ],
       },
-
     ],
   },
   plugins: [
     new HtmlWebPackPlugin({
       template: './src/index.html',
     }),
+    new webpack.DefinePlugin(envKeys),
   ],
   devServer: {
     historyApiFallback: true,