BitcoinBay · LKloosterman · May 23, 2019 · May 23, 2019 · May 24, 2019 · May 24, 2019
diff --git a/package.json b/package.json
@@ -3,30 +3,37 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "@chris.troutner/bitbox-js": "https://github.com/christroutner/bitbox-js",
+    "@chris.troutner/bitbox-js": "https://github.com/BitcoinBay/bitbox-js",
+    "@material-ui/core": "^4.1.3",
     "@types/jest": "^24.0.13",
     "@types/node": "^12.0.2",
     "@types/react": "^16.8.17",
     "@types/react-dom": "^16.8.4",
     "axios": "^0.18.0",
+    "babel-plugin-react-css-modules": "^5.2.6",
     "bitbox-sdk": "^7.3.0",
     "classnames": "^2.2.6",
+    "eslint": "^5.16.0",
+    "ethereumjs-wallet": "^0.6.3",
     "is-empty": "^1.2.0",
     "jwt-decode": "^2.2.0",
     "link-react": "^3.0.0",
-    "materialize-css": "^1.0.0-rc.2",
+    "materialize-css": "^1.0.0",
     "node-sass": "^4.12.0",
     "qrcode.react": "^0.9.3",
     "rc-if-else": "^1.1.0",
     "react": "^16.8.6",
     "react-bootstrap": "^1.0.0-beta.8",
     "react-dom": "^16.8.6",
     "react-helmet": "^5.2.1",
+    "react-jss": "^8.6.1",
     "react-native-qrcode": "^0.2.7",
     "react-qr-code": "^0.1.3",
     "react-redux": "^7.0.3",
     "react-router-dom": "^5.0.0",
     "react-scripts": "3.0.1",
+    "react-super-responsive-table": "^4.3.12",
+    "react-table": "^6.10.0",
     "redux": "^4.0.1",
     "redux-thunk": "^2.3.0",
     "semantic-ui-react": "^0.87.1",

diff --git a/public/index.html b/public/index.html
@@ -6,11 +6,11 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <meta name="theme-color" content="#000000">
     <link rel="manifest" href="%PUBLIC_URL%/manifest.json">
-    <!-- Compiled and minified CSS -->
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/css/materialize.min.css">
     <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
     <link href="https://fonts.googleapis.com/css?family=Lato" rel="stylesheet">
-    <title>MERN Auth App</title>
+    <link href="https://fonts.googleapis.com/css?family=Poppins|Roboto:300,400,500,700&display=swap" rel="stylesheet"> 
+    <title>Bitcoin Bay</title>
   </head>
   <body>
     <noscript>

diff --git a/src/App.js b/src/App.js
@@ -1,62 +1,46 @@
 
 import React, { Component } from "react";
-import { BrowserRouter as Router, Route, Switch } from "react-router-dom";
-import jwt_decode from "jwt-decode";
+import { BrowserRouter as Router, Route } from "react-router-dom";
 import setAuthToken from "./utils/setAuthToken";
 
-import { setCurrentUser, logoutUser } from "./actions/authActions";
 import { Provider } from "react-redux";
 import store from "./store";
 
-import Navbar from "./components/layout/Navbar";
+//import Navbar from "./components/layout/Navbar";
 import Landing from "./components/layout/Landing";
 import Cashier from "./components/layout/Cashier";
 import Customer from "./components/layout/Customer";
 import Register from "./components/auth/Register";
 import Login from "./components/auth/Login";
-import PrivateRoute from "./components/private-route/PrivateRoute";
 import Dashboard from "./components/dashboard/Dashboard";
 import CreatePoS from "./components/create-pos/CreatePoS";
+import POSDashboard from "./components/pos-dashboard/POSDashboard";
+import TransactionList from "./components/layout/TransactionList";
 
 import "./App.css";
-import PaymentSucess from "./components/layout/PaymentSucess";
 
 // Check for token to keep user logged in
 if (localStorage.jwtToken) {
   // Set auth token header auth
   const token = localStorage.jwtToken;
   setAuthToken(token);
-  // Decode token and get user info and exp
-  const decoded = jwt_decode(token);
-  // Set user and isAuthenticated
-  store.dispatch(setCurrentUser(decoded));
-  // Check for expired token
-  const currentTime = Date.now() / 1000; // to get in milliseconds
-  if (decoded.exp < currentTime) {
-    // Logout user
-    store.dispatch(logoutUser());
-
-    // Redirect to login
-    window.location.href = "./login";
-  }
 }
+
 class App extends Component {
   render() {
     return (
       <Provider store={store}>
         <Router>
           <div className="App">
-            <Navbar />
             <Route exact path="/" component={Landing} />
             <Route exact path="/register" component={Register} />
             <Route exact path="/login" component={Login} />
-            <Switch>
-              <PrivateRoute exact path="/dashboard" component={Dashboard} />
-              <PrivateRoute exact path="/cashier" component={Cashier} />
-              <PrivateRoute exact path="/customer" component={Customer} />
-              <PrivateRoute exact path="/PaymentSucess" component= {PaymentSucess}/>
-              <PrivateRoute exact path="/create-pos" component={CreatePoS} />
-            </Switch>
+            <Route exact path="/dashboard" component={Dashboard} />
+            <Route exact path="/cashier" component={Cashier} />
+            <Route exact path="/customer" component={Customer} />
+            <Route exact path="/create-pos" component={CreatePoS} />
+            <Route exact path="/pos-dashboard" component={POSDashboard} />
+            <Route exact path="/transactions" component={TransactionList}/>
           </div>
         </Router>
       </Provider>

diff --git a/src/actions/authActions.js b/src/actions/authActions.js
@@ -1,8 +1,7 @@
 import axios from "axios";
 import setAuthToken from "../utils/setAuthToken";
-import jwt_decode from "jwt-decode";
 
-import { GET_ERRORS, SET_CURRENT_USER, USER_LOADING } from "./types";
+import { GET_ERRORS } from "./types";
 
 // Register User
 export const registerUser = (userData, history) => dispatch => {
@@ -18,21 +17,18 @@ export const registerUser = (userData, history) => dispatch => {
 };
 
 // Login - get user token
-export const loginUser = userData => dispatch => {
+export const loginUser = (userData, history) => dispatch => {
   axios
     .post("/api/users/login", userData)
     .then(res => {
-      // Save to localStorage
-
       // Set token to localStorage
       const { token } = res.data;
       localStorage.setItem("jwtToken", token);
+
       // Set token to Auth header
       setAuthToken(token);
-      // Decode token to get user data
-      const decoded = jwt_decode(token);
-      // Set current user
-      dispatch(setCurrentUser(decoded));
+
+      history.push("/dashboard");
     })
     .catch(err =>
       dispatch({
@@ -42,27 +38,12 @@ export const loginUser = userData => dispatch => {
     );
 };
 
-// Set logged in user
-export const setCurrentUser = decoded => {
-  return {
-    type: SET_CURRENT_USER,
-    payload: decoded
-  };
-};
-
-// User loading
-export const setUserLoading = () => {
-  return {
-    type: USER_LOADING
-  };
-};
-
 // Log user out
-export const logoutUser = () => dispatch => {
+export const logoutUser = (history) => dispatch => {
   // Remove token from local storage
   localStorage.removeItem("jwtToken");
   // Remove auth header for future requests
   setAuthToken(false);
-  // Set current user to empty object {} which will set isAuthenticated to false
-  dispatch(setCurrentUser({}));
+
+  history.push("/login");
 };
diff --git a/src/actions/types.js b/src/actions/types.js
@@ -1,3 +1,2 @@
 export const GET_ERRORS = "GET_ERRORS";
-export const USER_LOADING = "USER_LOADING";
-export const SET_CURRENT_USER = "SET_CURRENT_USER";
+export const SET_POS = "SET_POS";
diff --git a/src/components/QRAddress21.js b/src/components/QRAddress21.js
@@ -2,6 +2,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 // import QRCode from 'qrcode-react';
+
 var QRCode = require('qrcode.react');
 
 export default class QRAddress21 extends React.Component {
@@ -16,10 +17,13 @@ export default class QRAddress21 extends React.Component {
 
     return(
       <div  >
-      <QRCode value={ value } size={parseInt(this.state.size)}/>
+        <QRCode value={ value } size={parseInt(this.state.size)} />
         <p className="add">{ value }</p>
       </div>
     );
   }
 };
 
+QRAddress21.propTypes = {
+  value: PropTypes.string
+};
diff --git a/src/components/auth/Login.js b/src/components/auth/Login.js
@@ -16,14 +16,13 @@ class Login extends Component {
   }
 
   componentDidMount() {
-    // If logged in and user navigates to Login page, should redirect them to dashboard
-    if (this.props.auth.isAuthenticated) {
+    if (localStorage.getItem("jwtToken")) {
       this.props.history.push("/dashboard");
     }
   }
 
   componentWillReceiveProps(nextProps) {
-    if (nextProps.auth.isAuthenticated) {
+    if (localStorage.getItem("jwtToken")) {
       this.props.history.push("/dashboard");
     }
 
@@ -46,7 +45,7 @@ class Login extends Component {
       password: this.state.password
     };
 
-    this.props.loginUser(userData);
+    this.props.loginUser(userData, this.props.history);
   };
 
   render() {

diff --git a/src/components/auth/Register.js b/src/components/auth/Register.js
@@ -19,7 +19,7 @@ class Register extends Component {
 
   componentDidMount() {
     // If logged in and user navigates to Register page, should redirect them to dashboard
-    if (this.props.auth.isAuthenticated) {
+    if (localStorage.getItem("jwtToken")) {
       this.props.history.push("/dashboard");
     }
   }