Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Upgrade meteor to use new ReduxAdapter #895

Merged
merged 3 commits into from Mar 17, 2017
Merged

Upgrade meteor to use new ReduxAdapter #895

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f9cbdd5
Upgraded to latest react-server 0.6.0
ptomasroos Mar 13, 2017
6ad5bd6
Updated example to use ReduxAdapter
ptomasroos Mar 13, 2017
1eb0ff3
Upgraded to 0.6.1 to remove missing key warnings
ptomasroos Mar 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions packages/react-server-examples/meteor-site/package.json
View file
Open in desktop
Expand Up @@ -18,13 +18,14 @@
"react": "^15.4.1",
"react-dom": "^15.4.1",
"react-redux": "^4.4.6",
"react-server": "^0.5.1",
"react-server": "^0.6.1",
"react-server-redux": "^0.6.1",
"redux": "3.6.0",
"redux-thunk": "2.1.0",
"superagent": "1.8.4"
},
"devDependencies": {
"babel-preset-react-server": "^0.4.10",
"react-server-cli": "^0.5.1"
"react-server-cli": "^0.6.1"
}
}
13 changes: 7 additions & 6 deletions packages/react-server-examples/meteor-site/pages/Homepage.js
View file
Open in desktop
@@ -1,8 +1,7 @@
import { default as React } from "react";
import { RootElement, TheFold } from "react-server";
import Q from "q";
import { Provider } from "react-redux";

import { RootProvider, ReduxAdapter } from "react-server-redux";
import configureStore from "../stores";
import { Header, Footer, MeteorMap, MeteorTable } from "../components";
import { selectSort, fetchPostsIfNeeded } from "../stores/actions";
Expand All @@ -22,6 +21,8 @@ export default class Homepage {
const sort = params.sort ? params.sort : "name";

this.meteorStore = configureStore();
this.storeAdapter = new ReduxAdapter(this.meteorStore);

this.storePromise = this.meteorStore.dispatch(fetchPostsIfNeeded())
.then(() => this.meteorStore.dispatch(selectSort(sort)));

Expand All @@ -33,8 +34,8 @@ export default class Homepage {
// A basic component
<Header />,
// More complex container components using redux
<RootElement key={1} when={this.storePromise}>
<Provider store={this.meteorStore}>
<RootProvider store={this.meteorStore}>
<RootElement key={1} when={this.storeAdapter.when(['meteors'])}>
<div className="row">
<div className="col-md-6">
<MeteorMap />
Expand All @@ -43,8 +44,8 @@ export default class Homepage {
<MeteorTable />
</div>
</div>
</Provider>
</RootElement>,
</RootElement>
</RootProvider>,
// Mark when we want our js/css to bind on the client side
<TheFold />,
// A delayed loaded component
Expand Down
6 changes: 4 additions & 2 deletions packages/react-server-examples/meteor-site/stores/index.js
View file
Open in desktop
@@ -1,12 +1,14 @@
import { createStore, applyMiddleware } from "redux";
import { createStore, applyMiddleware, compose } from "redux";
import thunkMiddleware from "redux-thunk";
import reducers from "./reducers";

const composeEnhancers = typeof window !== 'undefined' && window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose;

const configureStore = (preloadedState) => {
const store = createStore(
reducers,
preloadedState,
applyMiddleware(thunkMiddleware)
composeEnhancers(applyMiddleware(thunkMiddleware))
);

// https://github.com/reactjs/react-redux/releases/tag/v2.0.0
Expand Down