Implemented react-router-dom v4

This commit is contained in:
Keven van Zuijlen
2017-03-28 14:21:25 +02:00
committed by Steve Sanderson
parent 7a11cf97fd
commit d2c56d19d0
4 changed files with 17 additions and 17 deletions

View File

@@ -2,7 +2,7 @@ import * as React from 'react';
import { NavMenu } from './NavMenu';
export interface LayoutProps {
body: React.ReactElement<any>;
children?: React.ReactNode;
}
export class Layout extends React.Component<LayoutProps, {}> {
@@ -13,7 +13,7 @@ export class Layout extends React.Component<LayoutProps, {}> {
<NavMenu />
</div>
<div className='col-sm-9'>
{ this.props.body }
{ this.props.children }
</div>
</div>
</div>;

View File

@@ -1,5 +1,5 @@
import * as React from 'react';
import { Link } from 'react-router';
import { Link, NavLink } from 'react-router-dom';
export class NavMenu extends React.Component<{}, {}> {
public render() {
@@ -18,19 +18,19 @@ export class NavMenu extends React.Component<{}, {}> {
<div className='navbar-collapse collapse'>
<ul className='nav navbar-nav'>
<li>
<Link to={ '/' } activeClassName='active'>
<NavLink to={ '/' } exact activeClassName='active'>
<span className='glyphicon glyphicon-home'></span> Home
</Link>
</NavLink>
</li>
<li>
<Link to={ '/counter' } activeClassName='active'>
<NavLink to={ '/counter' } activeClassName='active'>
<span className='glyphicon glyphicon-education'></span> Counter
</Link>
</NavLink>
</li>
<li>
<Link to={ '/fetchdata' } activeClassName='active'>
<NavLink to={ '/fetchdata' } activeClassName='active'>
<span className='glyphicon glyphicon-th-list'></span> Fetch data
</Link>
</NavLink>
</li>
</ul>
</div>