|
|
@ -1,6 +1,6 @@
|
|
|
|
import * as React from 'react';
|
|
|
|
import * as React from 'react';
|
|
|
|
import { connect } from 'react-redux';
|
|
|
|
import { connect } from 'react-redux';
|
|
|
|
import { HashRouter } from 'react-router-dom';
|
|
|
|
import { BrowserRouter } from 'react-router-dom';
|
|
|
|
import getMuiTheme from 'material-ui/styles/getMuiTheme';
|
|
|
|
import getMuiTheme from 'material-ui/styles/getMuiTheme';
|
|
|
|
import MuiThemeProvider from 'material-ui/styles/MuiThemeProvider';
|
|
|
|
import MuiThemeProvider from 'material-ui/styles/MuiThemeProvider';
|
|
|
|
import { amber500, amber700, lightBlue500, darkBlack, white } from 'material-ui/styles/colors';
|
|
|
|
import { amber500, amber700, lightBlue500, darkBlack, white } from 'material-ui/styles/colors';
|
|
|
@ -95,7 +95,7 @@ class App extends React.Component {
|
|
|
|
|
|
|
|
|
|
|
|
return (
|
|
|
|
return (
|
|
|
|
<MuiThemeProvider muiTheme={muiTheme}>
|
|
|
|
<MuiThemeProvider muiTheme={muiTheme}>
|
|
|
|
<HashRouter>
|
|
|
|
<BrowserRouter>
|
|
|
|
<div>
|
|
|
|
<div>
|
|
|
|
<AppBar
|
|
|
|
<AppBar
|
|
|
|
title={C.appName}
|
|
|
|
title={C.appName}
|
|
|
@ -112,7 +112,7 @@ class App extends React.Component {
|
|
|
|
|
|
|
|
|
|
|
|
<Root />
|
|
|
|
<Root />
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</HashRouter>
|
|
|
|
</BrowserRouter>
|
|
|
|
</MuiThemeProvider>
|
|
|
|
</MuiThemeProvider>
|
|
|
|
);
|
|
|
|
);
|
|
|
|
}
|
|
|
|
}
|
|
|
|