Merge branch 'v0.5.0-markus' of gitlab.mpcdf.mpg.de:nomad-lab/nomad-FAIR into v0.5.0-markus

gui/src/components/App.js

@@ -7,7 +7,7 @@ import classNames from 'classnames'
 import { MuiThemeProvider, withStyles } from '@material-ui/core/styles'
 import { IconButton, LinearProgress, ListItemIcon, ListItemText,
   MenuList, MenuItem, Typography, Drawer, AppBar, Toolbar, Divider, Button, DialogContent, DialogTitle, DialogActions, Dialog, Tooltip } from '@material-ui/core'
-import { BrowserRouter, Switch, Route, Link, withRouter } from 'react-router-dom'
+import { Switch, Route, Link, withRouter } from 'react-router-dom'
 import BackupIcon from '@material-ui/icons/Backup'
 import SearchIcon from '@material-ui/icons/Search'
 import AboutIcon from '@material-ui/icons/Help'
@@ -444,7 +444,6 @@ export default class App extends React.Component {
     return (
       <MuiThemeProvider theme={genTheme}>
         <ErrorSnacks>
-          {/* <BrowserRouter basename={process.env.PUBLIC_URL}> */}
           <ApiProvider>
             <DomainProvider>
               <Navigation>
@@ -461,7 +460,6 @@ export default class App extends React.Component {
               </Navigation>
             </DomainProvider>
           </ApiProvider>
-          {/* </BrowserRouter> */}
         </ErrorSnacks>
         <LicenseAgreement />
       </MuiThemeProvider>

gui/src/history.js

 import { createBrowserHistory } from 'history'
-export default createBrowserHistory()
+export default createBrowserHistory({basename: process.env.PUBLIC_URL})