From 9f03f9a7c9916b347c31e1b8488538c85cc0f074 Mon Sep 17 00:00:00 2001
From: Markus Scheidgen <markus.scheidgen@gmail.com>
Date: Thu, 8 Aug 2019 12:36:09 +0200
Subject: [PATCH] Fixed history object to use right base path.
---
gui/src/components/App.js | 4 +---
gui/src/history.js | 2 +-
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/gui/src/components/App.js b/gui/src/components/App.js
index 5a7f850c4f..6159efb4ab 100644
--- a/gui/src/components/App.js
+++ b/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>
diff --git a/gui/src/history.js b/gui/src/history.js
index 19409ad2dc..33b67793e0 100644
--- a/gui/src/history.js
+++ b/gui/src/history.js
@@ -1,2 +1,2 @@
import { createBrowserHistory } from 'history'
-export default createBrowserHistory()
+export default createBrowserHistory({basename: process.env.PUBLIC_URL})
--
GitLab