deleted a lot of fluff

Author: jermspeaks

app/templates/_package.json

@@ -46,7 +46,6 @@
     "normalizr": "^1.3.1",
     "react": "^0.14.0-rc1",
     "react-dom": "0.14.0-rc1",
-    "react-highcharts": "^4.0.0",
     "react-redux": "^4.0.0",
     "react-router": "^1.0.0-rc1",
     "redux": "^3.0.4",

app/templates/src/common/components/Footer/Footer.js

@@ -2,33 +2,28 @@ import React, { PropTypes, Component } from 'react';
 import styles from './Footer.scss';
 import withStyles from '../../../common/decorators/withStyles';
 import withViewport from '../../../common/decorators/withViewport';
-import {Link} from 'react-router';
 
-// @withViewport
+@withViewport
 class Footer extends Component {
 
-  // static propTypes = {
-  //   viewport: PropTypes.shape({
-  //     width: PropTypes.number.isRequired,
-  //     height: PropTypes.number.isRequired
-  //   }).isRequired
-  // };
+  static propTypes = {
+    viewport: PropTypes.shape({
+      width: PropTypes.number.isRequired,
+      height: PropTypes.number.isRequired
+    }).isRequired
+  };
 
   render() {
     // This is just an example how one can render CSS
-    // let { width, height } = this.props.viewport;x
-    // this.renderCss(`.Footer-viewport:after {content:' ${width}x${height}';}`);
-    // <span className="Footer-spacer"> | </span>
-    // <span ref="viewport" className="Footer-viewport Footer-text Footer-text--muted">Viewport:</span>
+    let { width, height } = this.props.viewport;
+    this.renderCss(`.Footer-viewport:after {content:' ${width}x${height}';}`);
 
     return (
       <div className="Footer">
         <div className="Footer-container">
-          <span className="Footer-text">© Inform, Inc. 2015</span>
-          <span className="Footer-spacer">·</span>
-          <Link className="Footer-link" to="/">
-            <span>Home</span>
-          </Link>
+          <span className="Footer-text">React & Redux Generator, 2015</span>
+          <span className="Footer-spacer"> | </span>
+          <span ref="viewport" className="Footer-viewport Footer-text Footer-text--muted">Viewport:</span>
         </div>
       </div>
     );

app/templates/src/common/components/Header/Header.js

@@ -7,36 +7,23 @@ class Header extends Component {
 
   static propTypes = {
     username: PropTypes.string,
-    logoutUser: PropTypes.func.isRequired,
   };
 
   constructor(props) {
     super(props);
-    this._logout = this._logout.bind(this);
-  }
-
-  _logout(event) {
-    event.preventDefault();
-    this.props.logoutUser();
   }
 
   render() {
     return (
       <div className="Header">
         <div className="Header-brand">
           <Link to="/">
-            <span className="Header-brandTxt" id="header-brand-text">INFORM&#8482;</span>
+            <span className="Header-brandTxt" id="header-brand-text">Logo</span>
           </Link>
         </div>
         <div className='Navigation' role='navigation'>
           <Link className='Navigation-link' to='/about' >About</Link>
           <span className='Navigation-spacer'> | </span>
-          <div className='Navigation-user'>
-            <span>Welcome, </span>
-            <span className='Navigation-user--username'>{this.props.username}</span>
-            <span className='Navigation-spacer'> | </span>
-            <a className='Navigation-link Navigation-user--logout' onClick={this._logout}>Logout</a>
-          </div>
         </div>
         <div className="clear-float"></div>
       </div>

app/templates/src/common/components/LineChart/LineChart.js

@@ -1,10 +1,8 @@
 import { combineReducers } from 'redux';
 import { routerStateReducer as router } from 'redux-router';
-import auth from '../../auth/reducers/auth';
 
 const rootReducer = combineReducers({
-  router,
-  auth
+  router
 });
 
 export default rootReducer;

app/templates/src/common/components/LineChart/LineChart.scss

@@ -1,6 +1,5 @@
 import React, { PropTypes, Component } from 'react';
 import styles from './AboutPage.scss';
-import LineChart from '../../common/components/LineChart';
 
 class AboutPage extends Component {
 
@@ -11,26 +10,6 @@ class AboutPage extends Component {
   render() {
     let title = 'About Us';
     this.context.onSetTitle(title);
-    const data = [
-      [Date.UTC(2014, 9, 21), 0],
-      [Date.UTC(2014, 10, 4), 0.28],
-      [Date.UTC(2014, 10, 9), 0.25],
-      [Date.UTC(2014, 10, 27), 0.2],
-      [Date.UTC(2014, 11, 2), 0.28],
-      [Date.UTC(2014, 11, 26), 0.28],
-      [Date.UTC(2014, 11, 29), 0.47],
-      [Date.UTC(2015, 0, 11), 0.79],
-      [Date.UTC(2015, 0, 26), 0.72],
-      [Date.UTC(2015, 1, 3), 1.02],
-      [Date.UTC(2015, 1, 11), 1.12],
-      [Date.UTC(2015, 1, 25), 1.2],
-      [Date.UTC(2015, 2, 11), 1.18],
-      [Date.UTC(2015, 3, 11), 1.19],
-      [Date.UTC(2015, 4, 1), 1.85],
-      [Date.UTC(2015, 4, 5), 2.22],
-      [Date.UTC(2015, 4, 19), 1.15],
-      [Date.UTC(2015, 5, 3), 0]
-    ];
 
     return (
       <div className="AboutPage">
@@ -39,8 +18,6 @@ class AboutPage extends Component {
           <p>
             "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
           </p>
-          <h2 className='LineChart-Title'>Annual Revenue over Time</h2>
-          <LineChart series={data} yAxisTitle='Revenue' />
         </div>
       </div>
     );

app/templates/src/common/components/LineChart/package.json

@@ -3,109 +3,33 @@ import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
 import styles from './App.scss';
 import withContext from '../../common/decorators/withContext';
-import { pushState } from 'redux-router';
 import Header from '../../common/components/Header';
 import Footer from '../../common/components/Footer';
-import * as LoginActions from '../../auth/actions/LoginActions';
 
 @withContext
-class App extends Component {
+export default class App extends Component {
 
   static propTypes = {
     children: PropTypes.element.isRequired,
     error: PropTypes.object,
     history: PropTypes.object.isRequired,
     routes: PropTypes.array,
     params: PropTypes.object,
-    auth: PropTypes.object.isRequired,
-    authActions: React.PropTypes.object.isRequired,
-    pushState: PropTypes.func.isRequired,
   };
 
   constructor() {
     super();
   }
 
-  componentWillMount() {
-    this.initializeAuthentication();
-  }
-
-  componentWillUpdate(nextProps) {
-    const routeName = nextProps.routes[this.props.routes.length - 1].name;
-
-    if (!nextProps.auth.authStatus.authenticated && routeName !== 'reset_password') {
-      this.goToLogin();
-    }
-  }
-
-  initializeAuthentication() {
-    const token = localStorage.getItem('jwt');
-    const routeName = this.props.routes[this.props.routes.length - 1].name;
-    const resetToken = this.props.params.token;
-
-    if (this.props.auth.authStatus.authenticated) {
-      // Don't have to do anything here
-    } else if (token) {
-      // CASE: Local storage token found
-      console.info(token);
-    } else if (routeName === 'reset_password' && resetToken) {
-      // CASE: Reset password
-      this.goToResetPassword(resetToken);
-    } else {
-      // CASE: no authentication
-      this.goToLogin();
-    }
-  }
-
-  goToLogin() {
-    this.props.pushState(null, '/login');
-  }
-
-  goToResetPassword(token) {
-    this.props.pushState(null, '/reset_password/' + token);
-  }
-
   render() {
-    const { authActions } = this.props;
-
-    let page;
-    if (!this.props.auth.authStatus.authenticated) {
-      page = (
-        <div>
-          {this.props.children}
-        </div>
-      );
-    } else {
-      page = (
-        <div>
-          <Header username={this.props.auth.user.username} logoutUser={authActions.logoutUser} />
-          <div className='content'>
-            {this.props.children}
-          </div>
-          <Footer />
-        </div>
-      )
-    }
     return (
       <div className='wrapper'>
-        {page}
+        <Header />
+        <div className='content'>
+          {this.props.children}
+        </div>
+        <Footer />
       </div>
     );
   }
-
 }
-
-function mapState(state) {
-  return {
-    auth: state.auth
-  };
-}
-
-function mapDispatch(dispatch) {
-  return {
-    authActions: bindActionCreators(LoginActions, dispatch),
-    pushState: bindActionCreators(pushState, dispatch),
-  };
-}
-
-export default connect(mapState, mapDispatch)(App);