aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton@traccar.org>2022-07-31 07:27:14 -0700
committerAnton Tananaev <anton@traccar.org>2022-07-31 07:27:14 -0700
commit24e927d6a51fd2bbbe1c307b169653d0ba041d70 (patch)
treee4274f15582ee14e37b91ed122f358f82ecdffd1
parent25eaee59556b82ca02d4ecb398da93aa0f94cb08 (diff)
downloadtrackermap-web-24e927d6a51fd2bbbe1c307b169653d0ba041d70.tar.gz
trackermap-web-24e927d6a51fd2bbbe1c307b169653d0ba041d70.tar.bz2
trackermap-web-24e927d6a51fd2bbbe1c307b169653d0ba041d70.zip
Other modern cleanup
-rw-r--r--.eslintignore1
-rw-r--r--modern/src/index.js4
-rwxr-xr-xtools/package.sh2
3 files changed, 2 insertions, 5 deletions
diff --git a/.eslintignore b/.eslintignore
index efc30224..934888f4 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,5 +1,4 @@
web/simple/app.js
web/app.min.js
web/load.js
-web/modern
web/lib
diff --git a/modern/src/index.js b/modern/src/index.js
index 6af059cf..2f5f509b 100644
--- a/modern/src/index.js
+++ b/modern/src/index.js
@@ -16,8 +16,6 @@ import ServerProvider from './ServerProvider';
preloadImages();
-const base = window.location.href.indexOf('modern') >= 0 ? '/modern' : '/';
-
ReactDOM.render(
(
<Provider store={store}>
@@ -26,7 +24,7 @@ ReactDOM.render(
<ThemeProvider theme={theme}>
<CssBaseline />
<ServerProvider>
- <BrowserRouter basename={base}>
+ <BrowserRouter>
<Navigation />
</BrowserRouter>
</ServerProvider>
diff --git a/tools/package.sh b/tools/package.sh
index 3e893c97..1d43ff39 100755
--- a/tools/package.sh
+++ b/tools/package.sh
@@ -9,6 +9,6 @@ npm run build
cd modern
-rm -rf ../web/modern
+rm -rf build
npm ci
npm run build