Skip to content

Added react-router + redux-localstorage #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
Feb 1, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions app/client/components/LoggedIn.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import React, { Component } from 'react';

export default class LoggedIn extends Component {
render() {
return (
<div>
<h2>Logged in as {this.props.user.username}</h2>
</div>
);
}
}
10 changes: 8 additions & 2 deletions app/client/components/Login.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
import React from 'react';
import React, { Component, PropTypes } from 'react';

export default class Login extends Component {
static propTypes = {
onLogin: PropTypes.func.isRequired
};

export default class App extends React.Component {
handleLogin() {
const { onLogin } = this.props;
const username = this.refs.username.value;

onLogin({ username, loggedIn: true });

this.props.router.push('/loggedin');
}

render() {
Expand Down
22 changes: 9 additions & 13 deletions app/client/containers/App.js
Original file line number Diff line number Diff line change
@@ -1,19 +1,15 @@
import React from 'react';
import { bindActionCreators } from 'redux';
import { connect } from 'react-redux';
import userActions from '../actions/user';
import Login from '../components/Login';
import React, { Component, PropTypes } from 'react';

@connect((state) => state)
export default class App extends React.Component {
render() {
const { user, dispatch } = this.props;
const boundUserActions = bindActionCreators(userActions, dispatch);
export default class App extends Component {
static propTypes = {
children: PropTypes.element.isRequired
};

render() {
return (
!user.loggedIn ?
<Login onLogin={ boundUserActions.login } /> :
<div>Hi { user.username }!</div>
<div>
{this.props.children}
</div>
);
}
}
Expand Down
12 changes: 12 additions & 0 deletions app/client/containers/LoggedInPage.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import { connect } from 'react-redux';
import LoggedIn from '../components/LoggedIn';

const mapStateToProps = (state) => {
return state;
};

const mapDispatchToProps = (dispatch) => { // eslint-disable-line no-unused-vars
return {};
};

export default connect(mapStateToProps, mapDispatchToProps)(LoggedIn);
17 changes: 17 additions & 0 deletions app/client/containers/LoginPage.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import { connect } from 'react-redux';
import { bindActionCreators } from 'redux';
import Login from '../components/Login';
import userActions from '../actions/user';

const mapStateToProps = (state) => {
return state;
};

const mapDispatchToProps = (dispatch) => {
const user = bindActionCreators(userActions, dispatch);
return {
onLogin: user.login
};
};

export default connect(mapStateToProps, mapDispatchToProps)(Login);
12 changes: 7 additions & 5 deletions app/client/main.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
import React from 'react';
import ReactDOM from 'react-dom';
import { Provider } from 'react-redux';
import App from './containers/App';
import configureStore from './store/default';
import { Router, hashHistory } from 'react-router';
import { syncHistoryWithStore } from 'react-router-redux';
import routes from './routes';
import configureStore from './store';

const initialState = {};
const store = configureStore(initialState);
const routerHistory = syncHistoryWithStore(hashHistory, store);

const rootElement = document.querySelector(document.currentScript.getAttribute('data-container'));

ReactDOM.render(
<Provider store={store}>
<div>
<App />
</div>
<Router history={routerHistory} routes={routes} />
</Provider>,
rootElement
);
13 changes: 13 additions & 0 deletions app/client/routes.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import React from 'react';
import { Route, IndexRoute } from 'react-router';

import App from './containers/App';
import LoginPage from './containers/LoginPage';
import LoggedInPage from './containers/LoggedInPage';

export default (
<Route path="/" component={App}>
<IndexRoute component={LoginPage} />
<Route path="loggedin" component={LoggedInPage} />
</Route>
);
23 changes: 15 additions & 8 deletions app/client/store/default.js → app/client/store.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,25 @@
import { createStore, applyMiddleware, combineReducers, compose } from 'redux';
import { hashHistory } from 'react-router';
import { routerMiddleware, routerReducer as routing, push } from 'react-router-redux';
import persistState from 'redux-localstorage';
import thunk from 'redux-thunk';

import user from '../reducers/user';
import userActions from '../actions/user';
import user from './reducers/user';
import userActions from './actions/user';

const router = routerMiddleware(hashHistory);

const actionCreators = {
...userActions
...userActions,
push
};

const reducers = {
user
user,
routing
};

const middlewares = [thunk];
const middlewares = [ thunk, router ];

const composeEnhancers = (() => {
const compose_ = window && window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__;
Expand All @@ -22,9 +29,9 @@ const composeEnhancers = (() => {
return compose;
})();

const enhancer = composeEnhancers(applyMiddleware(...middlewares));
const rootReducer = combineReducers(reducers);

export default function configureStore(initialState) {
const enhancer = composeEnhancers(applyMiddleware(...middlewares), persistState());
const rootReducer = combineReducers(reducers);

return createStore(rootReducer, initialState, enhancer);
}
3 changes: 3 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,11 @@
"react": "^15.4.2",
"react-dom": "^15.4.2",
"react-redux": "^5.0.2",
"react-router": "^3.0.2",
"react-router-redux": "^4.0.7",
"redux": "^3.0.0",
"redux-actions": "^1.2.1",
"redux-localstorage": "^0.4.1",
"redux-thunk": "^2.2.0"
},
"devDependencies": {
Expand Down