Skip to content

Commit 4a3f96d

Browse files
author
ryanwest91
committed
clean urls
1 parent 9a90445 commit 4a3f96d

File tree

5 files changed

+31
-6
lines changed

5 files changed

+31
-6
lines changed

index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<html>
33
<meta charset=utf-8/>
44
<title>My First React Router App</title>
5-
<link rel=stylesheet href=index.css />
5+
<link rel=stylesheet href=/index.css />
66

77
<div id=app></div>
8-
<script src="bundle.js"></script>
8+
<script src="/bundle.js"></script>
99

index.js

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,26 @@
22

33
import React from 'react'
44
import { render } from 'react-dom'
5-
import { Router, Route, hashHistory } from 'react-router'
5+
import { Router, Route, browserHistory, IndexRoute } from 'react-router'
66

77
import App from './modules/App'
88
import About from './modules/About'
99
import Repos from './modules/Repos'
1010
import Repo from './modules/Repo.js'
11+
import Home from './modules/Home.js'
1112

1213
render((
13-
<Router history={hashHistory}>
14+
<Router history={browserHistory}>
1415
<Route path="/" component={App}>
16+
17+
<IndexRoute component={Home}/>
18+
1519
<Route path="/about" component={About}/>
20+
1621
<Route path="/repos" component={Repos}>
1722
<Route path="/repos/:userName/:repoName" component={Repo}/>
1823
</Route>
24+
1925
</Route>
2026
</Router>),
2127
document.getElementById('app')

modules/App.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import React from 'react'
44
import { Link } from 'react-router'
55
import NavLink from './NavLink.js'
66

7+
78
export default React.createClass({
89
render() {
910
return (
@@ -16,6 +17,9 @@ export default React.createClass({
1617
<li>
1718
<NavLink to="/repos">Repos</NavLink>
1819
</li>
20+
<li>
21+
<NavLink to="/" onlyActiveOnIndex>Home</NavLink>
22+
</li>
1923
</ul>
2024

2125
{this.props.children}

modules/Home.js

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
// modules/Home.js
2+
3+
import React from 'react'
4+
5+
export default React.createClass({
6+
7+
render(){
8+
return(
9+
10+
<div>Home</div>
11+
12+
)
13+
}
14+
15+
})

modules/Repos.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ export default React.createClass({
1212
<h2>Repos</h2>
1313
<ul>
1414
<li>
15-
<NavLink to="repos/rackt/react-router">React Router</NavLink>
15+
<NavLink to="/repos/rackt/react-router">React Router</NavLink>
1616
</li>
1717
<li>
18-
<NavLink to="repos/facebook/react">React</NavLink>
18+
<NavLink to="/repos/facebook/react">React</NavLink>
1919
</li>
2020
</ul>
2121

0 commit comments

Comments
 (0)