added netlify.toml and more eslint fixes

Author: samsaksfithian

netlify.toml

@@ -0,0 +1,13 @@
+[[redirects]]
+  from = "/*"
+  to = "/index.html"
+  status = 200
+
+[context.production.environment]
+  REACT_APP_SVR_API = "https://stonehaven-academy.herokuapp.com/api"
+
+[context.branch-deploy.environment]
+  REACT_APP_SVR_API = "https://stonehaven-server-staging.herokuapp.com/api"
+
+[context.deploy-preview.environment]
+  REACT_APP_SVR_API = "https://stonehaven-server-staging.herokuapp.com/api"

src/App.js

@@ -2,8 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { Switch, Route, Redirect } from 'react-router-dom';
 import DUMMY_DATA from './DUMMY_DATA';
-import tokenServices from './utils/tokenServices';
-import ProtectedRoute from './utils/ProtectedRoute';
+import { tokenServices, ProtectedRoute } from './utils';
 import {
   NavBar,
   HomePage,
@@ -38,11 +37,11 @@ class App extends React.Component {
     };
   }
 
-  componentWillMount = () => {
-    const { history, location } = this.props;
-    console.log(history);
-    console.log(location);
-  }
+  // componentWillMount = () => {
+  //   const { history, location } = this.props;
+  //   console.log(history);
+  //   console.log(location);
+  // }
 
   /**
    * get user data from database
@@ -52,7 +51,7 @@ class App extends React.Component {
     if (user) {
       this.setState({ isAuthenticated: true, user });
     }
-  }
+  };
 
   handleLogin = () => {
     const user = tokenServices.getToken();
@@ -61,19 +60,24 @@ class App extends React.Component {
     } else {
       this.setState({ isAuthenticated: null, user: null });
     }
-  }
+  };
 
-  handleLogoff = () =>{
+  handleLogoff = () => {
     tokenServices.removeToken();
-    this.setState({isAuthenticated: false, user: null});
-  }
+    this.setState({ isAuthenticated: false, user: null });
+  };
 
   render() {
     const { courses } = DUMMY_DATA;
-    // const { user, isAuthenticated } = this.state;
+    const { user, isAuthenticated } = this.state;
+
     return (
       <div id="start-page">
-        <NavBar links={links} isAuthenticated={this.state.isAuthenticated} handleLogoff={this.handleLogoff} />
+        <NavBar
+          links={links}
+          isAuthenticated={isAuthenticated}
+          handleLogoff={this.handleLogoff}
+        />
         <Switch>
           <Route exact path="/" component={HomePage} />
           <Route
@@ -85,15 +89,15 @@ class App extends React.Component {
           {/* Login Protected Route */}
           <ProtectedRoute
             path={links.login}
-            isAuthenticated={!this.state.isAuthenticated}
+            isAuthenticated={!isAuthenticated}
             redirectLink={links.dashboard}
             component={RegistrationPage}
             handleLogin={this.handleLogin}
           />
           {/* Dashboard Protected Route */}
           <ProtectedRoute
             path={links.dashboard}
-            isAuthenticated={this.state.isAuthenticated}
+            isAuthenticated={isAuthenticated}
             redirectLink={links.login}
             component={DashboardPage}
           />

src/components/registration/LogIn.js

@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import Axios from 'axios';
+import axios from 'axios';
 import '../../css/registration/LogIn.scss';
 
 const { REACT_APP_SVR_API } = process.env;
@@ -22,7 +22,8 @@ class LogIn extends Component {
       password,
     };
 
-    Axios.post(`${REACT_APP_SVR_API}/user/login`, data)
+    axios
+      .post(`${REACT_APP_SVR_API}/user/login`, data)
       .then(response => {
         localStorage.setItem('app-token', response.data.token);
         // this.props.history.push("/dashboard");
@@ -68,13 +69,13 @@ class LogIn extends Component {
             onChange={event => this.setState({ password: event.target.value })}
           />
           <button id="submit-button" type="button" onClick={this.LogInHandler}>
-            Submit
+            {`Submit`}
           </button>
         </form>
         <p>
-          Don't have an account,{' '}
+          {`Don't have an account, `}
           <button id="signup-button" type="button" onClick={changeToSignup()}>
-            Sign up!
+            {`Sign up!`}
           </button>
         </p>
       </div>

src/components/registration/SignUp.js

@@ -53,7 +53,7 @@ class SignUp extends Component {
     axios
       .post(`${REACT_APP_SVR_API}/user/`, data)
       .then(response => {
-        console.log(response);
+        // console.log(response);
         // Stores token in local storeage for the time being
         localStorage.setItem('app-token', response.data.token);
         // Sweet Alert for successful registration
@@ -74,6 +74,7 @@ class SignUp extends Component {
             console.error('An unknown error has occurred');
           }
         } catch (ex) {
+          alert('Something went wrong...');
           Promise.reject(ex);
         }
       });

src/utils/index.js

@@ -1,2 +1,4 @@
 export { FontAwesomeIcon } from './fontAwesome';
 export { default as userAPI } from './userAPI';
+export { default as tokenServices } from './tokenServices';
+export { default as ProtectedRoute } from './ProtectedRoute';