Skip to content

Commit 3403ae6

Browse files
committed
Flux - 6 - Refactor to Separate Rendering and Routing
1 parent f268536 commit 3403ae6

File tree

3 files changed

+27
-40
lines changed

3 files changed

+27
-40
lines changed

imgur-client/src/app.jsx

Lines changed: 2 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,4 @@
11
var React = require('react');
2-
var ReactRouter = require('react-router');
3-
var HashHistory = require('react-router/lib/hashhistory');
4-
var Router = ReactRouter.Router;
5-
var Route = ReactRouter.Route;
2+
var Routes = require('./routes');
63

7-
var Hello = React.createClass({
8-
render: function() {
9-
return <h1 className="red">
10-
{this.props.children}
11-
</h1>
12-
}
13-
});
14-
15-
var Child1 = React.createClass({
16-
render: function() {
17-
return <h1>
18-
I'm child1
19-
{this.props.children}
20-
</h1>
21-
}
22-
});
23-
24-
var Child2 = React.createClass({
25-
render: function() {
26-
return <h1>I'm the other child, Child2.</h1>
27-
}
28-
})
29-
30-
var routes = (
31-
<Router history={new HashHistory}>
32-
<Route path="/" component={Hello}>
33-
<Route path="1" component={Child1}>
34-
<Route path="2" component={Child2} />
35-
</Route>
36-
<Route path="2" component={Child2} />
37-
</Route>
38-
</Router>
39-
)
40-
41-
// var element = React.createElement(Hello, {});
42-
React.render(routes, document.querySelector('.container'));
4+
React.render(Routes, document.querySelector('.container'));

imgur-client/src/components/main.jsx

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
var React = require('react');
2+
3+
module.exports = React.createClass({
4+
render: function() {
5+
return <div>
6+
I'm a header.
7+
{this.props.children}
8+
</div>
9+
}
10+
});

imgur-client/src/routes.jsx

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
var React = require('react');
2+
var ReactRouter = require('react-router');
3+
var HashHistory = require('react-router/lib/hashhistory');
4+
var Router = ReactRouter.Router;
5+
var Route = ReactRouter.Route;
6+
7+
var Main = require('./components/main');
8+
9+
module.exports = (
10+
<Router history={new HashHistory}>
11+
<Route path="/" component={Main}>
12+
13+
</Route>
14+
</Router>
15+
)

0 commit comments

Comments
 (0)