fix/style

Author: Matthew Foyle

public/index.html

@@ -10,6 +10,7 @@
     -->
     <link rel="manifest" href="%PUBLIC_URL%/manifest.json">
     <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/latest/css/bootstrap.min.css"></link>
     <!--
       Notice the use of %PUBLIC_URL% in the tags above.
       It will be replaced with the URL of the `public` folder during the build.

src/actions/index.js

@@ -0,0 +1,8 @@
+import * as types from '../constants/ActionTypes';
+
+export function TFH() {
+  return {
+    type: types.TFH,
+    name
+  };
+}

src/components/Nav.js

@@ -30,7 +30,6 @@ class Nav extends Component {
             <TimeNav />
           </Menu>
 
-
           <Route exact path="/" component={Orders}/>
           <Route path="/revenue" component={Revenue}/>
           <Route path="/best-sellers" component={BestSellers}/>

src/components/Revenue.js

@@ -45,48 +45,50 @@ class Revenue extends Component {
         return moment().subtract(num, frame).format('YYYY-MM-DD');
       };
 
-      var OrdersLessThanX = (oldNum, oldFrame, newNum, newFrame) => {
-        this.state.orders.data.filter(function(order) {
-          return order.meta.timestamps.created_at.slice(0,10) > past(oldNum, oldFrame) && order.meta.timestamps.created_at.slice(0,10) < past(newNum, newFrame);
-        })
-      }
+      // var OrdersLessThanX = (oldNum, oldFrame, newNum, newFrame) => {
+      //   this.state.orders.data.filter(function(order) {
+      //     return order.meta.timestamps.created_at.slice(0,10) > past(oldNum, oldFrame) && order.meta.timestamps.created_at.slice(0,10) < past(newNum, newFrame);
+      //   })
+      // }
 
       var OrdersLessThanSevenDaysAgo = this.state.orders.data.filter(function(order) {
-        return order.meta.timestamps.created_at.slice(0,10) > past(7, 'days');;
-      })
+        return order.meta.timestamps.created_at.slice(0,10) > past(7, 'days');
+      });
 
       OrdersLessThanSevenDaysAgo.forEach(function(order) {
         revenue7 = revenue7 + order.meta.display_price.with_tax.amount/100
-      })
+      });
 
       var OrdersLessThanFourteenDaysAgo = this.state.orders.data.filter(function(order) {
         return order.meta.timestamps.created_at.slice(0,10) > past(14, 'days') && order.meta.timestamps.created_at.slice(0,10) < past(7, 'days');
-      })
+      });
 
       OrdersLessThanFourteenDaysAgo.forEach(function(order) {
         revenue14 = revenue14 + order.meta.display_price.with_tax.amount/100
-      })
+      });
 
 
       var OrdersLessThanOneMonthAgo = this.state.orders.data.filter(function(order) {
         return order.meta.timestamps.created_at.slice(0,10) > past(1, 'month');
-      })
+      });
+
       OrdersLessThanOneMonthAgo.forEach(function(order) {
         revenueMonth = revenueMonth + order.meta.display_price.with_tax.amount/100
-      })
+      });
 
       var OrdersLessThanTwoMonthAgo = this.state.orders.data.filter(function(order) {
         return order.meta.timestamps.created_at.slice(0,10) > past(2, 'months');
-      })
+      });
+
       OrdersLessThanTwoMonthAgo.forEach(function(order) {
         revenueTwoMonths = revenueTwoMonths + order.meta.display_price.with_tax.amount/100
-      })
-
-      var round_revTwoMonths = Math.round(revenueTwoMonths);
-      var formatted_revTwoMonths = format({prefix: '$'})(round_revTwoMonths);
+      });
 
-      var round_revMonth = Math.round(revenueMonth);
-      var formatted_revMonth = format({prefix: '$'})(round_revMonth);
+      // var round_revTwoMonths = Math.round(revenueTwoMonths);
+      // var formatted_revTwoMonths = format({prefix: '$'})(round_revTwoMonths);
+      //
+      // var round_revMonth = Math.round(revenueMonth);
+      // var formatted_revMonth = format({prefix: '$'})(round_revMonth);
 
       var round_rev7 =  Math.round(revenue7);
       var formatted_rev7 = format({prefix: '$'})(round_rev7);
@@ -96,7 +98,6 @@ class Revenue extends Component {
 
       var diff = percentDiff(round_rev14, round_rev7, true);
 
-
       //  console.log(round_revMonth)
       //  console.log(round_revTwoMonths)
 
@@ -137,8 +138,6 @@ class Revenue extends Component {
               </Col>
             </Row>
 
-
-
           </Grid>
         </div>
       )

src/components/TimeNav.js

@@ -2,14 +2,20 @@ import React, { Component } from 'react';
 import { Menu } from 'semantic-ui-react';
 
 class TimeNav extends Component {
-  state = {}
+
+    constructor(props) {
+      super();
+      this.state = {time: null};
+    }
+
+    componentDidMount() {
+    };
 
   handleItemClick = (e, { name }) => this.setState({ activeItem: name })
 
   render() {
     const { activeItem } = this.state
 
-
     return (
       <Menu.Menu position='right'>
         <Menu.Item name='24h' active={activeItem === '24 Hours'} onClick={this.handleItemClick}>

src/constants/ActionTypes.js

@@ -0,0 +1,2 @@
+export const TFH = '24H';
+export const SD = 'SD';

src/index.js

@@ -1,11 +1,18 @@
 import React from 'react';
-import ReactDOM from 'react-dom';
 import App from './App';
-import registerServiceWorker from './registerServiceWorker';
+import { Provider } from 'react-redux';
+import { render } from 'react-dom';
+//import registerServiceWorker from './registerServiceWorker';
+import { createStore } from 'redux';
+import ChartsApp from './reducers/reducers.js';
 import 'semantic-ui-css/semantic.min.css';
 import './index.css';
 
-<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/latest/css/bootstrap.min.css"></link>;
+let store = createStore(ChartsApp)
 
-ReactDOM.render(<App />, document.getElementById('root'));
-registerServiceWorker();
+render(
+  <Provider store={store}>
+    <App />
+  </Provider>,
+   document.getElementById('root')
+  );

src/reducers/reducers.js

@@ -0,0 +1,25 @@
+import * as types from '../constants/ActionTypes';
+
+const ChartsApp = () => {
+
+};
+
+const initialState = {
+  time : 1
+}
+
+
+export function time(state = initialState, action) {
+  switch (action.type) {
+
+    case types.TFH:
+
+      return state;
+
+    default:
+      return state;
+  }
+}
+
+
+export default ChartsApp;