Skip to content

Commit

Permalink
Redirect to Create Receipt Page on startup
Browse files Browse the repository at this point in the history
  • Loading branch information
hql287 committed Aug 10, 2017
1 parent 5f0715e commit 1c65845
Show file tree
Hide file tree
Showing 9 changed files with 56 additions and 41 deletions.
26 changes: 5 additions & 21 deletions app/App.jsx
Original file line number Diff line number Diff line change
@@ -1,33 +1,17 @@
// Libraries
import React, {Component} from 'react';

// React Router
import {browserHistory} from 'history';
import {BrowserRouter as Router, Route} from 'react-router-dom';

// Custom Components
import AppNav from './components/shared/AppNav.jsx';
import Form from './containers/Form.jsx';
import Receipts from './containers/Receipts.jsx';
import Settings from './containers/Settings.jsx';
import Contacts from './containers/Contacts.jsx';
import AppMain from './components/shared/AppMain.jsx';

// Components
class App extends Component {
render = () =>
<Router history={browserHistory}>
<div className="appWrapper">
<div className="sideBarWrapper">
<AppNav />
</div>
<div className="mainContentWrapper">
<Route exact path="/" component={Receipts} />
<Route path="/form" component={Form} />
<Route path="/contacts" component={Contacts} />
<Route path="/settings" component={Settings} />
</div>
</div>
</Router>;
<div className="appWrapper">
<AppNav />
<AppMain/>
</div>;
}

export default App;
26 changes: 26 additions & 0 deletions app/components/shared/AppMain.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
// Libraries
import React, {Component} from 'react';

// React Router
import {Redirect, Switch, Route} from 'react-router-dom';

// Custom Components
import Form from '../../containers/Form.jsx';
import Receipts from '../../containers/Receipts.jsx';
import Settings from '../../containers/Settings.jsx';
import Contacts from '../../containers/Contacts.jsx';

class AppMain extends Component {
render = () =>
<div className='mainContentWrapper'>
<Redirect to='/form'/>
<Switch>
<Route path='/form' component={Form} />
<Route path='/receipts' component={Receipts} />
<Route path='/contacts' component={Contacts} />
<Route path='/settings' component={Settings} />
</Switch>
</div>;
}

export default AppMain;
29 changes: 14 additions & 15 deletions app/components/shared/AppNav.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,36 +3,35 @@ import React, {Component} from 'react';
import {NavLink} from 'react-router-dom';

class AppNav extends Component {
render() {
return (
<ul className="sideBar">
render = () =>
<div className='sideBarWrapper'>
<ul className='sideBar'>
<li>
<NavLink exact to="/">
<i id="icon-archive" className="ion-ios-box" />
Receipts
<NavLink to='/form'>
<i id='icon-form' className='ion-android-list' />
Create
</NavLink>
</li>
<li>
<NavLink exact to="/form">
<i id="icon-form" className="ion-android-list" />
New Receipt
<NavLink to='/receipts'>
<i id='icon-archive' className='ion-ios-box' />
Receipts
</NavLink>
</li>
<li>
<NavLink exact to="/contacts">
<i id="icon-contacts" className="ion-person" />
<NavLink to='/contacts'>
<i id='icon-contacts' className='ion-person' />
Contacts
</NavLink>
</li>
<li>
<NavLink exact to="/settings">
<i id="icon-settings" className="ion-ios-gear" />
<NavLink to='/settings'>
<i id='icon-settings' className='ion-ios-gear' />
Settings
</NavLink>
</li>
</ul>
);
}
</div>;
}

export default AppNav;
4 changes: 2 additions & 2 deletions app/containers/Receipts.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import Receipt from '../components/receipts/Receipt.jsx';
import EmptyMessage from '../components/shared/EmptyMessage.jsx';

// Component
class Receipts extends Component {
class List extends Component {
state = { openPrevWinHint: false };

// Will Mount
Expand Down Expand Up @@ -113,4 +113,4 @@ class Receipts extends Component {

export default connect(state => ({
receipts: state.ReceiptsReducer,
}))(Receipts);
}))(List);
8 changes: 7 additions & 1 deletion app/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,19 @@ const AppStore = createStore(
composeEnhancers(applyMiddleware(ReduxThunk, Logger))
);

// React Router
import {browserHistory} from 'history';
import {BrowserRouter as Router} from 'react-router-dom';

// Main App
import App from './App';

// Render App
ReactDOM.render(
<Provider store={AppStore}>
<App />
<Router history={browserHistory}>
<App />
</Router>
</Provider>,
document.getElementById('root')
);
2 changes: 1 addition & 1 deletion modal/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ <h4 id="modalTitle"></h4>
</script>

<!-- Renderer -->
<script src="./modal.js"></script>
<script src="./modal_index.js"></script>

<script>if (window.module) module = window.module;</script>
</body>
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion preview/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
</script>

<!-- Renderer -->
<script src="./index.js"></script>
<script src="./preview_index.js"></script>

<script>if (window.module) module = window.module;</script>
</body>
Expand Down
File renamed without changes.

0 comments on commit 1c65845

Please sign in to comment.