aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2022-01-17 21:15:25 -0800
committerAnton Tananaev <anton.tananaev@gmail.com>2022-01-17 21:15:25 -0800
commit9e1c0b44189136ec6abf05720c698027a689fa08 (patch)
treeb8fc5bd23b471902e2d46cb4b51c0fbfe86b4539
parent3a0bb02de89b559a185ec2c166aac4efa635dff9 (diff)
downloadtrackermap-web-9e1c0b44189136ec6abf05720c698027a689fa08.tar.gz
trackermap-web-9e1c0b44189136ec6abf05720c698027a689fa08.tar.bz2
trackermap-web-9e1c0b44189136ec6abf05720c698027a689fa08.zip
Fix modern app issuesv4.15
-rw-r--r--modern/src/components/SideNav.js2
-rw-r--r--modern/src/map/Map.js2
-rw-r--r--modern/src/reports/ReportFilter.js4
-rw-r--r--modern/src/theme/index.js4
4 files changed, 6 insertions, 6 deletions
diff --git a/modern/src/components/SideNav.js b/modern/src/components/SideNav.js
index bcf8ecd5..62c64fd2 100644
--- a/modern/src/components/SideNav.js
+++ b/modern/src/components/SideNav.js
@@ -21,7 +21,7 @@ const SideNav = ({ routes }) => {
key={route.href || route.subheader}
button
to={route.href}
- selected={location.pathname.match(route.match || route.href)}
+ selected={location.pathname.match(route.match || route.href) !== null}
>
<ListItemIcon>{route.icon}</ListItemIcon>
<ListItemText primary={route.name} />
diff --git a/modern/src/map/Map.js b/modern/src/map/Map.js
index dcf5a925..b020423a 100644
--- a/modern/src/map/Map.js
+++ b/modern/src/map/Map.js
@@ -107,7 +107,7 @@ const Map = ({ children }) => {
{ id: 'mapboxSatellite', title: t('mapMapboxSatellite'), uri: styleMapbox('satellite-v9') },
{ id: 'mapTilerBasic', title: t('mapMapTilerBasic'), uri: styleMapTiler('basic', mapTilerKey) },
{ id: 'mapTilerHybrid', title: t('mapMapTilerHybrid'), uri: styleMapTiler('hybrid', mapTilerKey) },
- ], 'locationIqStreets');
+ ], 'osm');
}, [mapTilerKey]);
useEffect(() => {
diff --git a/modern/src/reports/ReportFilter.js b/modern/src/reports/ReportFilter.js
index 23c7fc00..bfd8a540 100644
--- a/modern/src/reports/ReportFilter.js
+++ b/modern/src/reports/ReportFilter.js
@@ -60,13 +60,13 @@ const ReportFilter = ({ children, handleSubmit, showOnly }) => {
};
return (
- <Grid container spacing={2} justify="flex-end">
+ <Grid container spacing={2} justifyContent="flex-end">
<Grid item xs={12} sm={period === 'custom' ? 3 : 6}>
<FormControl variant="filled" fullWidth>
<InputLabel>{t('reportDevice')}</InputLabel>
<Select value={deviceId} onChange={(e) => setDeviceId(e.target.value)}>
{devices.map((device) => (
- <MenuItem value={device.id}>{device.name}</MenuItem>
+ <MenuItem key={device.id} value={device.id}>{device.name}</MenuItem>
))}
</Select>
</FormControl>
diff --git a/modern/src/theme/index.js b/modern/src/theme/index.js
index dc0a35bf..02865c23 100644
--- a/modern/src/theme/index.js
+++ b/modern/src/theme/index.js
@@ -1,9 +1,9 @@
-import { createMuiTheme } from '@material-ui/core/styles';
+import { createTheme } from '@material-ui/core/styles';
import palette from './palette';
import overrides from './overrides';
import dimensions from './dimensions';
-const theme = createMuiTheme({
+const theme = createTheme({
palette,
overrides,
dimensions,