@@ -3,14 +3,12 @@ import { bindActionCreators } from 'redux'
3
3
import { connect } from 'react-redux'
4
4
import { Switch , Route , Redirect } from 'react-router-dom'
5
5
import { withStyles } from '@material-ui/core/styles'
6
- import CssBaseline from '@material-ui/core/CssBaseline'
7
- import Grid from '@material-ui/core/Grid'
8
6
9
7
import 'bootstrap/dist/css/bootstrap.min.css'
10
8
import '../../assets/scss/main.scss'
11
9
12
10
import Header from '../../components/Header/Header.js'
13
- import Sidebar from '../../components/Sidebar/Sidebar .js'
11
+ import ToolBar from '../../components/ToolBar/ToolBar .js'
14
12
import Messenger from '../../views/Messenger/Messenger.js'
15
13
import Avatar from '../../views/Avatar/Avatar.js'
16
14
import Spinner from '../../views/Spinner/Spinner.js'
@@ -46,15 +44,11 @@ class App extends Component {
46
44
47
45
render ( ) {
48
46
return (
49
- < div className = 'app' >
50
- < CssBaseline />
51
- < Grid className = 'wrapper' container spacing = { 0 } direction = 'row' alignItems = 'flex-start' justify = 'flex-start' >
52
- < Header routes = { appRoutes } { ...this . props } Avatar = { Avatar } />
53
- < Sidebar routes = { appRoutes } { ...this . props } />
54
- < main className = 'container' >
55
- { switchRoutes }
56
- </ main >
57
- </ Grid >
47
+ < div className = 'app container-fluid' >
48
+ < Header routes = { appRoutes } { ...this . props } Avatar = { Avatar } ToolBar = { ToolBar } />
49
+ < main className = 'container-fluid' >
50
+ { switchRoutes }
51
+ </ main >
58
52
< Messenger />
59
53
< Spinner />
60
54
</ div >
0 commit comments