From 2352071211b61c10fa5bf5736baaff7809d18bf0 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton@traccar.org>
Date: Sun, 8 May 2022 11:48:09 -0700
Subject: Organize common code

---
 modern/src/reports/ChartReportPage.js   | 6 +++---
 modern/src/reports/EventReportPage.js   | 4 ++--
 modern/src/reports/ReplayPage.js        | 2 +-
 modern/src/reports/ReportLayout.js      | 4 ++--
 modern/src/reports/RouteReportPage.js   | 4 ++--
 modern/src/reports/StopReportPage.js    | 4 ++--
 modern/src/reports/SummaryReportPage.js | 4 ++--
 modern/src/reports/TripReportPage.js    | 4 ++--
 8 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'modern/src/reports')

diff --git a/modern/src/reports/ChartReportPage.js b/modern/src/reports/ChartReportPage.js
index 3639b98a..8803f2be 100644
--- a/modern/src/reports/ChartReportPage.js
+++ b/modern/src/reports/ChartReportPage.js
@@ -5,9 +5,9 @@ import {
 import ReportLayout from './ReportLayout';
 import ReportFilter from './ReportFilter';
 import Graph from './Graph';
-import { useAttributePreference } from '../common/preferences';
-import { formatDate } from '../common/formatter';
-import { speedFromKnots } from '../common/converter';
+import { useAttributePreference } from '../common/util/preferences';
+import { formatDate } from '../common/util/formatter';
+import { speedFromKnots } from '../common/util/converter';
 import { useTranslation } from '../LocalizationProvider';
 
 const Filter = ({ children, setItems }) => {
diff --git a/modern/src/reports/EventReportPage.js b/modern/src/reports/EventReportPage.js
index b76ee955..45bb4c25 100644
--- a/modern/src/reports/EventReportPage.js
+++ b/modern/src/reports/EventReportPage.js
@@ -5,10 +5,10 @@ import {
 } from '@material-ui/core';
 import { useTheme } from '@material-ui/core/styles';
 import { useSelector } from 'react-redux';
-import { formatDate } from '../common/formatter';
+import { formatDate } from '../common/util/formatter';
 import ReportFilter from './ReportFilter';
 import ReportLayout from './ReportLayout';
-import { prefixString } from '../common/stringUtils';
+import { prefixString } from '../common/util/stringUtils';
 import { useTranslation } from '../LocalizationProvider';
 
 const Filter = ({ setItems }) => {
diff --git a/modern/src/reports/ReplayPage.js b/modern/src/reports/ReplayPage.js
index 3f05aec8..a8d4844f 100644
--- a/modern/src/reports/ReplayPage.js
+++ b/modern/src/reports/ReplayPage.js
@@ -13,7 +13,7 @@ import { useSelector } from 'react-redux';
 import Map from '../map/core/Map';
 import ReplayPathMap from '../map/ReplayPathMap';
 import PositionsMap from '../map/PositionsMap';
-import { formatTime } from '../common/formatter';
+import { formatTime } from '../common/util/formatter';
 import ReportFilter from './ReportFilter';
 import { useTranslation } from '../LocalizationProvider';
 
diff --git a/modern/src/reports/ReportLayout.js b/modern/src/reports/ReportLayout.js
index bacebddf..b2be2ac1 100644
--- a/modern/src/reports/ReportLayout.js
+++ b/modern/src/reports/ReportLayout.js
@@ -11,8 +11,8 @@ import FormatListBulletedIcon from '@material-ui/icons/FormatListBulleted';
 import TrendingUpIcon from '@material-ui/icons/TrendingUp';
 import ArrowBackIcon from '@material-ui/icons/ArrowBack';
 
-import SideNav from '../components/SideNav';
-import NavBar from '../components/NavBar';
+import SideNav from '../common/components/SideNav';
+import NavBar from '../common/components/NavBar';
 import { useTranslation } from '../LocalizationProvider';
 
 const useStyles = makeStyles((theme) => ({
diff --git a/modern/src/reports/RouteReportPage.js b/modern/src/reports/RouteReportPage.js
index 3be2107b..a3549924 100644
--- a/modern/src/reports/RouteReportPage.js
+++ b/modern/src/reports/RouteReportPage.js
@@ -4,10 +4,10 @@ import { DataGrid } from '@material-ui/data-grid';
 import { useTheme } from '@material-ui/core/styles';
 import {
   formatDistance, formatSpeed, formatBoolean, formatDate, formatCoordinate,
-} from '../common/formatter';
+} from '../common/util/formatter';
 import ReportFilter from './ReportFilter';
 import ReportLayout from './ReportLayout';
-import { useAttributePreference, usePreference } from '../common/preferences';
+import { useAttributePreference, usePreference } from '../common/util/preferences';
 import { useTranslation } from '../LocalizationProvider';
 
 const Filter = ({ setItems }) => {
diff --git a/modern/src/reports/StopReportPage.js b/modern/src/reports/StopReportPage.js
index aa668d57..b0c5169f 100644
--- a/modern/src/reports/StopReportPage.js
+++ b/modern/src/reports/StopReportPage.js
@@ -3,10 +3,10 @@ import { DataGrid } from '@material-ui/data-grid';
 import { useTheme } from '@material-ui/core/styles';
 import {
   formatDistance, formatHours, formatDate, formatVolume,
-} from '../common/formatter';
+} from '../common/util/formatter';
 import ReportFilter from './ReportFilter';
 import ReportLayout from './ReportLayout';
-import { useAttributePreference } from '../common/preferences';
+import { useAttributePreference } from '../common/util/preferences';
 import { useTranslation } from '../LocalizationProvider';
 
 const Filter = ({ setItems }) => {
diff --git a/modern/src/reports/SummaryReportPage.js b/modern/src/reports/SummaryReportPage.js
index d993d2e8..f86a55fe 100644
--- a/modern/src/reports/SummaryReportPage.js
+++ b/modern/src/reports/SummaryReportPage.js
@@ -4,10 +4,10 @@ import { Grid, FormControlLabel, Checkbox } from '@material-ui/core';
 import { useTheme } from '@material-ui/core/styles';
 import {
   formatDistance, formatHours, formatDate, formatSpeed, formatVolume,
-} from '../common/formatter';
+} from '../common/util/formatter';
 import ReportFilter from './ReportFilter';
 import ReportLayout from './ReportLayout';
-import { useAttributePreference } from '../common/preferences';
+import { useAttributePreference } from '../common/util/preferences';
 import { useTranslation } from '../LocalizationProvider';
 
 const Filter = ({ setItems }) => {
diff --git a/modern/src/reports/TripReportPage.js b/modern/src/reports/TripReportPage.js
index 632da7cc..7a74e673 100644
--- a/modern/src/reports/TripReportPage.js
+++ b/modern/src/reports/TripReportPage.js
@@ -3,10 +3,10 @@ import { DataGrid } from '@material-ui/data-grid';
 import { useTheme } from '@material-ui/core/styles';
 import {
   formatDistance, formatSpeed, formatHours, formatDate, formatVolume,
-} from '../common/formatter';
+} from '../common/util/formatter';
 import ReportFilter from './ReportFilter';
 import ReportLayout from './ReportLayout';
-import { useAttributePreference } from '../common/preferences';
+import { useAttributePreference } from '../common/util/preferences';
 import { useTranslation } from '../LocalizationProvider';
 
 const Filter = ({ setItems }) => {
-- 
cgit v1.2.3