Skip to content

Separate <Routes> component from <Route> spec #118

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

Closed
wants to merge 1 commit into from
Closed

Separate <Routes> component from <Route> spec #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 9 additions & 6 deletions examples/auth-flow/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
var React = require('react');
var Router = require('../../modules/main');
var Route = Router.Route;
var Routes = Router.Routes;
var Link = Router.Link;

var App = React.createClass({
Expand Down Expand Up @@ -179,12 +180,14 @@ function pretendRequest(email, pass, cb) {


var routes = (
<Route handler={App}>
<Route name="login" handler={Login}/>
<Route name="logout" handler={Logout}/>
<Route name="about" handler={About}/>
<Route name="dashboard" handler={Dashboard}/>
</Route>
<Routes>
<Route handler={App}>
<Route name="login" handler={Login}/>
<Route name="logout" handler={Logout}/>
<Route name="about" handler={About}/>
<Route name="dashboard" handler={Dashboard}/>
</Route>
</Routes>
);

React.renderComponent(routes, document.body);
9 changes: 6 additions & 3 deletions examples/data-flow/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
var React = require('react');
var Router = require('../../modules/main');
var Route = Router.Route;
var Routes = Router.Routes;
var Link = Router.Link;

var App = React.createClass({
Expand Down Expand Up @@ -64,9 +65,11 @@ var Taco = React.createClass({
});

var routes = (
<Route handler={App}>
<Route name="taco" path="taco/:name" handler={Taco}/>
</Route>
<Routes>
<Route handler={App}>
<Route name="taco" path="taco/:name" handler={Taco}/>
</Route>
</Routes>
);

React.renderComponent(routes, document.body);
11 changes: 7 additions & 4 deletions examples/dynamic-segments/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
var React = require('react');
var Router = require('../../modules/main');
var Route = Router.Route;
var Routes = Router.Routes;
var Link = Router.Link;

var App = React.createClass({
Expand Down Expand Up @@ -45,11 +46,13 @@ var Task = React.createClass({
});

var routes = (
<Route handler={App}>
<Route name="user" path="/user/:userId" handler={User}>
<Route name="task" path="/user/:userId/tasks/:taskId" handler={Task}/>
<Routes>
<Route handler={App}>
<Route name="user" path="/user/:userId" handler={User}>
<Route name="task" path="/user/:userId/tasks/:taskId" handler={Task}/>
</Route>
</Route>
</Route>
</Routes>
);

React.renderComponent(routes, document.body);
13 changes: 8 additions & 5 deletions examples/master-detail/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
var React = require('react');
var Router = require('../../modules/main');
var Route = Router.Route;
var Routes = Router.Routes;
var Link = Router.Link;

var api = 'http://addressbook-api.herokuapp.com/contacts';
Expand Down Expand Up @@ -203,11 +204,13 @@ var NotFound = React.createClass({
});

var routes = (
<Route handler={App}>
<Route name="new" path="contact/new" handler={NewContact}/>
<Route name="not-found" path="contact/not-found" handler={NotFound}/>
<Route name="contact" path="contact/:id" handler={Contact}/>
</Route>
<Routes>
<Route handler={App}>
<Route name="new" path="contact/new" handler={NewContact}/>
<Route name="not-found" path="contact/not-found" handler={NotFound}/>
<Route name="contact" path="contact/:id" handler={Contact}/>
</Route>
</Routes>
);

React.renderComponent(routes, document.body);
Expand Down
11 changes: 7 additions & 4 deletions examples/partial-app-loading/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
var React = require('react');
var Router = require('../../modules/main');
var Route = Router.Route;
var Routes = Router.Routes;
var Link = Router.Link;

var AsyncReactComponent = {
Expand Down Expand Up @@ -59,11 +60,13 @@ var App = React.createClass({
});

var routes = (
<Route handler={App}>
<Route name="dashboard" path="dashboard" handler={PreDashboard}>
<Route name="inbox" path="dashboard/inbox" handler={PreInbox}/>
<Routes>
<Route handler={App}>
<Route name="dashboard" path="dashboard" handler={PreDashboard}>
<Route name="inbox" path="dashboard/inbox" handler={PreInbox}/>
</Route>
</Route>
</Route>
</Routes>
);

React.renderComponent(routes, document.body);
9 changes: 6 additions & 3 deletions examples/query-params/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
var React = require('react');
var Router = require('../../modules/main');
var Route = Router.Route;
var Routes = Router.Routes;
var Link = Router.Link;

var App = React.createClass({
Expand Down Expand Up @@ -32,9 +33,11 @@ var User = React.createClass({
});

var routes = (
<Route handler={App}>
<Route name="user" path="user/:userId" handler={User}/>
</Route>
<Routes>
<Route handler={App}>
<Route name="user" path="user/:userId" handler={User}/>
</Route>
</Routes>
);

React.renderComponent(routes, document.body);
19 changes: 11 additions & 8 deletions examples/shared-root/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
var React = require('react');
var Router = require('../../modules/main');
var Route = Router.Route;
var Routes = Router.Routes;
var Link = Router.Link;

var App = React.createClass({
Expand Down Expand Up @@ -66,15 +67,17 @@ var ForgotPassword = React.createClass({
});

var routes = (
<Route handler={App}>
<Route handler={SignedOut}>
<Route name="signin" handler={SignIn}/>
<Route name="forgot-password" handler={ForgotPassword}/>
<Routes>
<Route handler={App}>
<Route handler={SignedOut}>
<Route name="signin" handler={SignIn}/>
<Route name="forgot-password" handler={ForgotPassword}/>
</Route>
<Route handler={SignedIn}>
<Route name="home" handler={Home}/>
</Route>
</Route>
<Route handler={SignedIn}>
<Route name="home" handler={Home}/>
</Route>
</Route>
</Routes>
);

React.renderComponent(routes, document.body);
1 change: 1 addition & 0 deletions examples/shared-root/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<!doctype html public "superawesome">
<title>Shared Root Example</title>
<link rel="stylesheet" href="../app.css"/>
<body>
<script src="../build/shared-root.js"></script>
9 changes: 6 additions & 3 deletions examples/simple-master-detail/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
var React = require('react');
var Router = require('../../modules/main');
var Route = Router.Route;
var Routes = Router.Routes;
var Link = Router.Link;

var App = React.createClass({
Expand Down Expand Up @@ -50,9 +51,11 @@ var State = React.createClass({
});

var routes = (
<Route handler={App}>
<Route name="state" path="state/:abbr" handler={State}/>
</Route>
<Routes>
<Route handler={App}>
<Route name="state" path="state/:abbr" handler={State}/>
</Route>
</Routes>
);

React.renderComponent(routes, document.body);
Expand Down
11 changes: 7 additions & 4 deletions examples/transitions/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
var React = require('react');
var Router = require('../../modules/main');
var Route = Router.Route;
var Routes = Router.Routes;
var Link = Router.Link;

var App = React.createClass({
Expand Down Expand Up @@ -55,10 +56,12 @@ var Form = React.createClass({
});

var routes = (
<Route handler={App}>
<Route name="dashboard" handler={Dashboard}/>
<Route name="form" handler={Form}/>
</Route>
<Routes>
<Route handler={App}>
<Route name="dashboard" handler={Dashboard}/>
<Route name="form" handler={Form}/>
</Route>
</Routes>
);

React.renderComponent(routes, document.body);
Loading