@@ -6,10 +6,10 @@ import { withRouter } from 'react-router';
66import { renderRoutes } from 'react-router-config' ;
77import { provideHooks } from 'redial' ;
88import { IndexLinkContainer , LinkContainer } from 'react-router-bootstrap' ;
9- import Navbar from 'react-bootstrap/lib/ Navbar' ;
10- import Nav from 'react-bootstrap/lib/ Nav' ;
11- import NavItem from 'react-bootstrap/lib/NavItem ' ;
12- import Alert from 'react-bootstrap/lib/Alert' ;
9+ import Navbar from 'react-bootstrap/Navbar' ;
10+ import Nav from 'react-bootstrap/Nav' ;
11+ import Alert from 'react-bootstrap/Alert ' ;
12+
1313import Helmet from 'react-helmet' ;
1414import qs from 'qs' ;
1515import { isLoaded as isInfoLoaded , load as loadInfo } from 'redux/modules/info' ;
@@ -100,42 +100,39 @@ class App extends Component {
100100 return (
101101 < div className = { styles . app } >
102102 < Helmet { ...config . app . head } />
103- < Navbar fixedTop >
104- < Navbar . Header >
105- < Navbar . Brand >
106- < IndexLinkContainer to = "/" activeStyle = { { color : '#33e0ff' } } className = { styles . title } >
107- < div className = { styles . brand } >
108- < span > { config . app . title } </ span >
109- </ div >
110- </ IndexLinkContainer >
111- </ Navbar . Brand >
112- < Navbar . Toggle />
113- </ Navbar . Header >
114-
115- < Navbar . Collapse >
116- < Nav navbar >
103+ < Navbar bg = "light" >
104+ < Navbar . Brand >
105+ < IndexLinkContainer to = "/" activeStyle = { { color : '#33e0ff' } } className = { styles . title } >
106+ < div className = { styles . brand } >
107+ < span > { config . app . title } </ span >
108+ </ div >
109+ </ IndexLinkContainer >
110+ </ Navbar . Brand >
111+ < Navbar . Toggle aria-controls = "basic-navbar-nav" />
112+ < Navbar . Collapse id = "basic-navbar-nav" >
113+ < Nav className = "mr-auto" >
117114 < LinkContainer to = "/chat" >
118- < NavItem > Chat</ NavItem >
115+ < Nav . Link > Chat</ Nav . Link >
119116 </ LinkContainer >
120117 < LinkContainer to = "/about" >
121- < NavItem > About Us</ NavItem >
118+ < Nav . Link > About Us</ Nav . Link >
122119 </ LinkContainer >
123120
124121 { ! user && (
125122 < LinkContainer to = "/login" >
126- < NavItem > Login</ NavItem >
123+ < Nav . Link > Login</ Nav . Link >
127124 </ LinkContainer >
128125 ) }
129126 { ! user && (
130127 < LinkContainer to = "/register" >
131- < NavItem > Register</ NavItem >
128+ < Nav . Link > Register</ Nav . Link >
132129 </ LinkContainer >
133130 ) }
134131 { user && (
135132 < LinkContainer to = "/logout" >
136- < NavItem className = "logout-link" onClick = { this . handleLogout } >
133+ < Nav . Link className = "logout-link" onClick = { this . handleLogout } >
137134 Logout
138- </ NavItem >
135+ </ Nav . Link >
139136 </ LinkContainer >
140137 ) }
141138 </ Nav >
@@ -144,18 +141,17 @@ class App extends Component {
144141 < strong > { user . email } </ strong >
145142 </ p >
146143 ) }
147- < Nav navbar pullRight >
148- < NavItem
144+ < Nav >
145+ < Nav . Link
149146 target = "_blank"
150147 title = "View on Github"
151148 href = "https://github.com/bertho-zero/react-redux-universal-hot-example"
152149 >
153150 < i className = "fa fa-github" />
154- </ NavItem >
151+ </ Nav . Link >
155152 </ Nav >
156153 </ Navbar . Collapse >
157154 </ Navbar >
158-
159155 < div className = { styles . appContent } >
160156 { notifs . global && (
161157 < div className = "container" >
0 commit comments