From f418231b6b2f5e030a0d2dcc390c314602b1f740 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sat, 6 Apr 2024 09:22:10 -0700 Subject: [PATCH] Move modern to the top --- modern/.env => .env | 0 modern/.eslintrc.json => .eslintrc.json | 0 .gitignore | 35 +++++++++++------- modern/.npmrc => .npmrc | 0 {modern/.vscode => .vscode}/launch.json | 0 modern/index.html => index.html | 0 modern/.gitignore | 21 ----------- modern/package-lock.json => package-lock.json | 0 modern/package.json => package.json | 0 .../apple-touch-icon-180x180.png | Bin {modern/public => public}/favicon.ico | Bin {modern/public => public}/logo.svg | 0 .../maskable-icon-512x512.png | Bin {modern/public => public}/pwa-192x192.png | Bin {modern/public => public}/pwa-512x512.png | Bin {modern/public => public}/pwa-64x64.png | Bin {modern/public => public}/styles.css | 0 {modern/src => src}/App.jsx | 0 {modern/src => src}/AppThemeProvider.jsx | 0 {modern/src => src}/CachingController.js | 0 {modern/src => src}/ErrorBoundary.jsx | 0 {modern/src => src}/Navigation.jsx | 0 {modern/src => src}/ServerProvider.jsx | 0 {modern/src => src}/SocketController.jsx | 0 {modern/src => src}/UpdateController.jsx | 0 .../common/attributes/useCommandAttributes.js | 0 .../attributes/useCommonDeviceAttributes.js | 0 .../attributes/useCommonUserAttributes.js | 0 .../common/attributes/useDeviceAttributes.js | 0 .../attributes/useGeofenceAttributes.js | 0 .../common/attributes/useGroupAttributes.js | 0 .../attributes/usePositionAttributes.js | 0 .../common/attributes/useServerAttributes.js | 0 .../common/attributes/useUserAttributes.js | 0 .../common/components/AddressValue.jsx | 0 .../common/components/BottomMenu.jsx | 0 .../common/components/DriverValue.js | 0 .../common/components/ErrorHandler.jsx | 0 .../common/components/GeofencesValue.js | 0 .../common/components/LinkField.jsx | 0 .../components/LocalizationProvider.jsx | 0 .../common/components/NativeInterface.js | 0 .../src => src}/common/components/NavBar.jsx | 0 .../common/components/PageLayout.jsx | 0 .../common/components/PositionValue.jsx | 0 .../common/components/RemoveDialog.jsx | 0 .../common/components/SelectField.jsx | 0 .../src => src}/common/components/SideNav.jsx | 0 .../common/components/SplitButton.jsx | 0 .../common/components/StatusCard.jsx | 0 .../common/components/TableShimmer.jsx | 0 .../src => src}/common/theme/components.js | 0 .../src => src}/common/theme/dimensions.js | 0 {modern/src => src}/common/theme/index.js | 0 {modern/src => src}/common/theme/palette.js | 0 {modern/src => src}/common/util/converter.js | 0 .../common/util/deviceCategories.js | 0 {modern/src => src}/common/util/duration.js | 0 {modern/src => src}/common/util/formatter.js | 0 .../src => src}/common/util/permissions.js | 0 .../src => src}/common/util/preferences.js | 0 .../src => src}/common/util/stringUtils.js | 0 .../src => src}/common/util/useFeatures.js | 0 .../common/util/usePersistedState.js | 0 {modern/src => src}/common/util/useQuery.js | 0 {modern/src => src}/index.jsx | 0 .../src => src}/login/ChangeServerPage.jsx | 0 {modern/src => src}/login/LoginLayout.jsx | 0 {modern/src => src}/login/LoginPage.jsx | 0 {modern/src => src}/login/LogoImage.jsx | 0 {modern/src => src}/login/RegisterPage.jsx | 0 .../src => src}/login/ResetPasswordPage.jsx | 0 {modern/src => src}/main/DeviceList.jsx | 0 {modern/src => src}/main/DeviceRow.jsx | 0 {modern/src => src}/main/EventsDrawer.jsx | 0 {modern/src => src}/main/MainMap.jsx | 0 {modern/src => src}/main/MainPage.jsx | 0 {modern/src => src}/main/MainToolbar.jsx | 0 {modern/src => src}/main/useFilter.js | 0 {modern/src => src}/map/MapCamera.js | 0 {modern/src => src}/map/MapCurrentLocation.js | 0 {modern/src => src}/map/MapGeofence.js | 0 {modern/src => src}/map/MapMarkers.js | 0 {modern/src => src}/map/MapPadding.js | 0 {modern/src => src}/map/MapPositions.js | 0 {modern/src => src}/map/MapRoutePath.js | 0 {modern/src => src}/map/MapRoutePoints.js | 0 {modern/src => src}/map/MapScale.js | 0 {modern/src => src}/map/core/MapView.jsx | 0 {modern/src => src}/map/core/mapUtil.js | 0 {modern/src => src}/map/core/preloadImages.js | 0 {modern/src => src}/map/core/useMapStyles.js | 0 .../src => src}/map/draw/MapGeofenceEdit.js | 0 {modern/src => src}/map/draw/theme.js | 0 .../src => src}/map/geocoder/MapGeocoder.js | 0 {modern/src => src}/map/geocoder/geocoder.css | 0 {modern/src => src}/map/main/MapAccuracy.js | 0 .../src => src}/map/main/MapDefaultCamera.js | 0 {modern/src => src}/map/main/MapLiveRoutes.js | 0 .../src => src}/map/main/MapSelectedDevice.js | 0 {modern/src => src}/map/main/PoiMap.js | 0 .../map/notification/MapNotification.js | 0 .../map/notification/notification.css | 0 {modern/src => src}/map/overlay/MapOverlay.js | 0 .../src => src}/map/overlay/useMapOverlays.js | 0 {modern/src => src}/map/switcher/switcher.css | 0 {modern/src => src}/map/switcher/switcher.js | 0 {modern/src => src}/other/EventPage.jsx | 0 {modern/src => src}/other/GeofencesList.jsx | 0 {modern/src => src}/other/GeofencesPage.jsx | 0 {modern/src => src}/other/NetworkPage.jsx | 0 {modern/src => src}/other/PositionPage.jsx | 0 {modern/src => src}/other/ReplayPage.jsx | 0 {modern/src => src}/reactHelper.js | 0 .../src => src}/reports/ChartReportPage.jsx | 0 .../reports/CombinedReportPage.jsx | 0 .../src => src}/reports/EventReportPage.jsx | 0 {modern/src => src}/reports/LogsPage.jsx | 0 .../src => src}/reports/RouteReportPage.jsx | 0 {modern/src => src}/reports/ScheduledPage.jsx | 0 .../src => src}/reports/StatisticsPage.jsx | 0 .../src => src}/reports/StopReportPage.jsx | 0 .../src => src}/reports/SummaryReportPage.jsx | 0 .../src => src}/reports/TripReportPage.jsx | 0 .../reports/common/scheduleReport.js | 0 .../reports/common/useReportStyles.js | 0 .../reports/components/ColumnSelect.jsx | 0 .../reports/components/ReportFilter.jsx | 0 .../reports/components/ReportsMenu.jsx | 0 {modern/src => src}/resources/alarm.mp3 | Bin .../src => src}/resources/images/arrow.svg | 0 .../resources/images/background.svg | 0 .../resources/images/data/engine.svg | 0 .../resources/images/direction.svg | 0 .../resources/images/icon/animal.svg | 0 .../resources/images/icon/bicycle.svg | 0 .../resources/images/icon/boat.svg | 0 .../src => src}/resources/images/icon/bus.svg | 0 .../resources/images/icon/camper.svg | 0 .../src => src}/resources/images/icon/car.svg | 0 .../resources/images/icon/crane.svg | 0 .../resources/images/icon/default.svg | 0 .../resources/images/icon/helicopter.svg | 0 .../resources/images/icon/motorcycle.svg | 0 .../resources/images/icon/offroad.svg | 0 .../resources/images/icon/person.svg | 0 .../resources/images/icon/pickup.svg | 0 .../resources/images/icon/plane.svg | 0 .../resources/images/icon/scooter.svg | 0 .../resources/images/icon/ship.svg | 0 .../resources/images/icon/tractor.svg | 0 .../resources/images/icon/train.svg | 0 .../resources/images/icon/tram.svg | 0 .../resources/images/icon/trolleybus.svg | 0 .../resources/images/icon/truck.svg | 0 .../src => src}/resources/images/icon/van.svg | 0 {modern/src => src}/resources/images/logo.svg | 0 {modern/src => src}/resources/l10n/af.json | 0 {modern/src => src}/resources/l10n/ar.json | 0 {modern/src => src}/resources/l10n/az.json | 0 {modern/src => src}/resources/l10n/bg.json | 0 {modern/src => src}/resources/l10n/bn.json | 0 {modern/src => src}/resources/l10n/ca.json | 0 {modern/src => src}/resources/l10n/cs.json | 0 {modern/src => src}/resources/l10n/da.json | 0 {modern/src => src}/resources/l10n/de.json | 0 {modern/src => src}/resources/l10n/el.json | 0 {modern/src => src}/resources/l10n/en.json | 0 {modern/src => src}/resources/l10n/es.json | 0 {modern/src => src}/resources/l10n/fa.json | 0 {modern/src => src}/resources/l10n/fi.json | 0 {modern/src => src}/resources/l10n/fr.json | 0 {modern/src => src}/resources/l10n/gl.json | 0 {modern/src => src}/resources/l10n/he.json | 0 {modern/src => src}/resources/l10n/hi.json | 0 {modern/src => src}/resources/l10n/hr.json | 0 {modern/src => src}/resources/l10n/hu.json | 0 {modern/src => src}/resources/l10n/id.json | 0 {modern/src => src}/resources/l10n/it.json | 0 {modern/src => src}/resources/l10n/ja.json | 0 {modern/src => src}/resources/l10n/ka.json | 0 {modern/src => src}/resources/l10n/kk.json | 0 {modern/src => src}/resources/l10n/km.json | 0 {modern/src => src}/resources/l10n/ko.json | 0 {modern/src => src}/resources/l10n/lo.json | 0 {modern/src => src}/resources/l10n/lt.json | 0 {modern/src => src}/resources/l10n/lv.json | 0 {modern/src => src}/resources/l10n/mk.json | 0 {modern/src => src}/resources/l10n/ml.json | 0 {modern/src => src}/resources/l10n/mn.json | 0 {modern/src => src}/resources/l10n/ms.json | 0 {modern/src => src}/resources/l10n/nb.json | 0 {modern/src => src}/resources/l10n/ne.json | 0 {modern/src => src}/resources/l10n/nl.json | 0 {modern/src => src}/resources/l10n/nn.json | 0 {modern/src => src}/resources/l10n/pl.json | 0 {modern/src => src}/resources/l10n/pt.json | 0 {modern/src => src}/resources/l10n/pt_BR.json | 0 {modern/src => src}/resources/l10n/ro.json | 0 {modern/src => src}/resources/l10n/ru.json | 0 {modern/src => src}/resources/l10n/si.json | 0 {modern/src => src}/resources/l10n/sk.json | 0 {modern/src => src}/resources/l10n/sl.json | 0 {modern/src => src}/resources/l10n/sq.json | 0 {modern/src => src}/resources/l10n/sr.json | 0 {modern/src => src}/resources/l10n/sv.json | 0 {modern/src => src}/resources/l10n/ta.json | 0 {modern/src => src}/resources/l10n/th.json | 0 {modern/src => src}/resources/l10n/tr.json | 0 {modern/src => src}/resources/l10n/uk.json | 0 {modern/src => src}/resources/l10n/uz.json | 0 {modern/src => src}/resources/l10n/vi.json | 0 {modern/src => src}/resources/l10n/zh.json | 0 {modern/src => src}/resources/l10n/zh_TW.json | 0 .../src => src}/settings/AccumulatorsPage.jsx | 0 .../src => src}/settings/AnnouncementPage.jsx | 0 {modern/src => src}/settings/CalendarPage.jsx | 0 .../src => src}/settings/CalendarsPage.jsx | 0 .../settings/CommandDevicePage.jsx | 0 .../src => src}/settings/CommandGroupPage.jsx | 0 {modern/src => src}/settings/CommandPage.jsx | 0 {modern/src => src}/settings/CommandsPage.jsx | 0 .../settings/ComputedAttributePage.jsx | 0 .../settings/ComputedAttributesPage.jsx | 0 .../settings/DeviceConnectionsPage.jsx | 0 {modern/src => src}/settings/DevicePage.jsx | 0 {modern/src => src}/settings/DevicesPage.jsx | 0 {modern/src => src}/settings/DriverPage.jsx | 0 {modern/src => src}/settings/DriversPage.jsx | 0 {modern/src => src}/settings/GeofencePage.jsx | 0 .../settings/GroupConnectionsPage.jsx | 0 {modern/src => src}/settings/GroupPage.jsx | 0 {modern/src => src}/settings/GroupsPage.jsx | 0 .../src => src}/settings/MaintenancePage.jsx | 0 .../src => src}/settings/MaintenancesPage.jsx | 0 .../src => src}/settings/NotificationPage.jsx | 0 .../settings/NotificationsPage.jsx | 0 .../src => src}/settings/PreferencesPage.jsx | 0 {modern/src => src}/settings/ServerPage.jsx | 0 {modern/src => src}/settings/SharePage.jsx | 0 .../settings/UserConnectionsPage.jsx | 0 {modern/src => src}/settings/UserPage.jsx | 0 {modern/src => src}/settings/UsersPage.jsx | 0 .../settings/common/useSettingsStyles.js | 0 .../components/AddAttributeDialog.jsx | 0 .../settings/components/BaseCommandView.jsx | 0 .../settings/components/CollectionActions.jsx | 0 .../settings/components/CollectionFab.jsx | 0 .../components/EditAttributesAccordion.jsx | 0 .../settings/components/EditItemView.jsx | 0 .../settings/components/SearchHeader.jsx | 0 .../settings/components/SettingsMenu.jsx | 0 {modern/src => src}/store/calendars.js | 0 {modern/src => src}/store/devices.js | 0 {modern/src => src}/store/drivers.js | 0 {modern/src => src}/store/errors.js | 0 {modern/src => src}/store/events.js | 0 {modern/src => src}/store/geofences.js | 0 {modern/src => src}/store/groups.js | 0 {modern/src => src}/store/index.js | 0 {modern/src => src}/store/maintenances.js | 0 {modern/src => src}/store/reports.js | 0 {modern/src => src}/store/session.js | 0 .../src => src}/store/throttleMiddleware.js | 0 modern/vite.config.js => vite.config.js | 0 265 files changed, 22 insertions(+), 34 deletions(-) rename modern/.env => .env (100%) rename modern/.eslintrc.json => .eslintrc.json (100%) rename modern/.npmrc => .npmrc (100%) rename {modern/.vscode => .vscode}/launch.json (100%) rename modern/index.html => index.html (100%) delete mode 100644 modern/.gitignore rename modern/package-lock.json => package-lock.json (100%) rename modern/package.json => package.json (100%) rename {modern/public => public}/apple-touch-icon-180x180.png (100%) rename {modern/public => public}/favicon.ico (100%) rename {modern/public => public}/logo.svg (100%) rename {modern/public => public}/maskable-icon-512x512.png (100%) rename {modern/public => public}/pwa-192x192.png (100%) rename {modern/public => public}/pwa-512x512.png (100%) rename {modern/public => public}/pwa-64x64.png (100%) rename {modern/public => public}/styles.css (100%) rename {modern/src => src}/App.jsx (100%) rename {modern/src => src}/AppThemeProvider.jsx (100%) rename {modern/src => src}/CachingController.js (100%) rename {modern/src => src}/ErrorBoundary.jsx (100%) rename {modern/src => src}/Navigation.jsx (100%) rename {modern/src => src}/ServerProvider.jsx (100%) rename {modern/src => src}/SocketController.jsx (100%) rename {modern/src => src}/UpdateController.jsx (100%) rename {modern/src => src}/common/attributes/useCommandAttributes.js (100%) rename {modern/src => src}/common/attributes/useCommonDeviceAttributes.js (100%) rename {modern/src => src}/common/attributes/useCommonUserAttributes.js (100%) rename {modern/src => src}/common/attributes/useDeviceAttributes.js (100%) rename {modern/src => src}/common/attributes/useGeofenceAttributes.js (100%) rename {modern/src => src}/common/attributes/useGroupAttributes.js (100%) rename {modern/src => src}/common/attributes/usePositionAttributes.js (100%) rename {modern/src => src}/common/attributes/useServerAttributes.js (100%) rename {modern/src => src}/common/attributes/useUserAttributes.js (100%) rename {modern/src => src}/common/components/AddressValue.jsx (100%) rename {modern/src => src}/common/components/BottomMenu.jsx (100%) rename {modern/src => src}/common/components/DriverValue.js (100%) rename {modern/src => src}/common/components/ErrorHandler.jsx (100%) rename {modern/src => src}/common/components/GeofencesValue.js (100%) rename {modern/src => src}/common/components/LinkField.jsx (100%) rename {modern/src => src}/common/components/LocalizationProvider.jsx (100%) rename {modern/src => src}/common/components/NativeInterface.js (100%) rename {modern/src => src}/common/components/NavBar.jsx (100%) rename {modern/src => src}/common/components/PageLayout.jsx (100%) rename {modern/src => src}/common/components/PositionValue.jsx (100%) rename {modern/src => src}/common/components/RemoveDialog.jsx (100%) rename {modern/src => src}/common/components/SelectField.jsx (100%) rename {modern/src => src}/common/components/SideNav.jsx (100%) rename {modern/src => src}/common/components/SplitButton.jsx (100%) rename {modern/src => src}/common/components/StatusCard.jsx (100%) rename {modern/src => src}/common/components/TableShimmer.jsx (100%) rename {modern/src => src}/common/theme/components.js (100%) rename {modern/src => src}/common/theme/dimensions.js (100%) rename {modern/src => src}/common/theme/index.js (100%) rename {modern/src => src}/common/theme/palette.js (100%) rename {modern/src => src}/common/util/converter.js (100%) rename {modern/src => src}/common/util/deviceCategories.js (100%) rename {modern/src => src}/common/util/duration.js (100%) rename {modern/src => src}/common/util/formatter.js (100%) rename {modern/src => src}/common/util/permissions.js (100%) rename {modern/src => src}/common/util/preferences.js (100%) rename {modern/src => src}/common/util/stringUtils.js (100%) rename {modern/src => src}/common/util/useFeatures.js (100%) rename {modern/src => src}/common/util/usePersistedState.js (100%) rename {modern/src => src}/common/util/useQuery.js (100%) rename {modern/src => src}/index.jsx (100%) rename {modern/src => src}/login/ChangeServerPage.jsx (100%) rename {modern/src => src}/login/LoginLayout.jsx (100%) rename {modern/src => src}/login/LoginPage.jsx (100%) rename {modern/src => src}/login/LogoImage.jsx (100%) rename {modern/src => src}/login/RegisterPage.jsx (100%) rename {modern/src => src}/login/ResetPasswordPage.jsx (100%) rename {modern/src => src}/main/DeviceList.jsx (100%) rename {modern/src => src}/main/DeviceRow.jsx (100%) rename {modern/src => src}/main/EventsDrawer.jsx (100%) rename {modern/src => src}/main/MainMap.jsx (100%) rename {modern/src => src}/main/MainPage.jsx (100%) rename {modern/src => src}/main/MainToolbar.jsx (100%) rename {modern/src => src}/main/useFilter.js (100%) rename {modern/src => src}/map/MapCamera.js (100%) rename {modern/src => src}/map/MapCurrentLocation.js (100%) rename {modern/src => src}/map/MapGeofence.js (100%) rename {modern/src => src}/map/MapMarkers.js (100%) rename {modern/src => src}/map/MapPadding.js (100%) rename {modern/src => src}/map/MapPositions.js (100%) rename {modern/src => src}/map/MapRoutePath.js (100%) rename {modern/src => src}/map/MapRoutePoints.js (100%) rename {modern/src => src}/map/MapScale.js (100%) rename {modern/src => src}/map/core/MapView.jsx (100%) rename {modern/src => src}/map/core/mapUtil.js (100%) rename {modern/src => src}/map/core/preloadImages.js (100%) rename {modern/src => src}/map/core/useMapStyles.js (100%) rename {modern/src => src}/map/draw/MapGeofenceEdit.js (100%) rename {modern/src => src}/map/draw/theme.js (100%) rename {modern/src => src}/map/geocoder/MapGeocoder.js (100%) rename {modern/src => src}/map/geocoder/geocoder.css (100%) rename {modern/src => src}/map/main/MapAccuracy.js (100%) rename {modern/src => src}/map/main/MapDefaultCamera.js (100%) rename {modern/src => src}/map/main/MapLiveRoutes.js (100%) rename {modern/src => src}/map/main/MapSelectedDevice.js (100%) rename {modern/src => src}/map/main/PoiMap.js (100%) rename {modern/src => src}/map/notification/MapNotification.js (100%) rename {modern/src => src}/map/notification/notification.css (100%) rename {modern/src => src}/map/overlay/MapOverlay.js (100%) rename {modern/src => src}/map/overlay/useMapOverlays.js (100%) rename {modern/src => src}/map/switcher/switcher.css (100%) rename {modern/src => src}/map/switcher/switcher.js (100%) rename {modern/src => src}/other/EventPage.jsx (100%) rename {modern/src => src}/other/GeofencesList.jsx (100%) rename {modern/src => src}/other/GeofencesPage.jsx (100%) rename {modern/src => src}/other/NetworkPage.jsx (100%) rename {modern/src => src}/other/PositionPage.jsx (100%) rename {modern/src => src}/other/ReplayPage.jsx (100%) rename {modern/src => src}/reactHelper.js (100%) rename {modern/src => src}/reports/ChartReportPage.jsx (100%) rename {modern/src => src}/reports/CombinedReportPage.jsx (100%) rename {modern/src => src}/reports/EventReportPage.jsx (100%) rename {modern/src => src}/reports/LogsPage.jsx (100%) rename {modern/src => src}/reports/RouteReportPage.jsx (100%) rename {modern/src => src}/reports/ScheduledPage.jsx (100%) rename {modern/src => src}/reports/StatisticsPage.jsx (100%) rename {modern/src => src}/reports/StopReportPage.jsx (100%) rename {modern/src => src}/reports/SummaryReportPage.jsx (100%) rename {modern/src => src}/reports/TripReportPage.jsx (100%) rename {modern/src => src}/reports/common/scheduleReport.js (100%) rename {modern/src => src}/reports/common/useReportStyles.js (100%) rename {modern/src => src}/reports/components/ColumnSelect.jsx (100%) rename {modern/src => src}/reports/components/ReportFilter.jsx (100%) rename {modern/src => src}/reports/components/ReportsMenu.jsx (100%) rename {modern/src => src}/resources/alarm.mp3 (100%) rename {modern/src => src}/resources/images/arrow.svg (100%) rename {modern/src => src}/resources/images/background.svg (100%) rename {modern/src => src}/resources/images/data/engine.svg (100%) rename {modern/src => src}/resources/images/direction.svg (100%) rename {modern/src => src}/resources/images/icon/animal.svg (100%) rename {modern/src => src}/resources/images/icon/bicycle.svg (100%) rename {modern/src => src}/resources/images/icon/boat.svg (100%) rename {modern/src => src}/resources/images/icon/bus.svg (100%) rename {modern/src => src}/resources/images/icon/camper.svg (100%) rename {modern/src => src}/resources/images/icon/car.svg (100%) rename {modern/src => src}/resources/images/icon/crane.svg (100%) rename {modern/src => src}/resources/images/icon/default.svg (100%) rename {modern/src => src}/resources/images/icon/helicopter.svg (100%) rename {modern/src => src}/resources/images/icon/motorcycle.svg (100%) rename {modern/src => src}/resources/images/icon/offroad.svg (100%) rename {modern/src => src}/resources/images/icon/person.svg (100%) rename {modern/src => src}/resources/images/icon/pickup.svg (100%) rename {modern/src => src}/resources/images/icon/plane.svg (100%) rename {modern/src => src}/resources/images/icon/scooter.svg (100%) rename {modern/src => src}/resources/images/icon/ship.svg (100%) rename {modern/src => src}/resources/images/icon/tractor.svg (100%) rename {modern/src => src}/resources/images/icon/train.svg (100%) rename {modern/src => src}/resources/images/icon/tram.svg (100%) rename {modern/src => src}/resources/images/icon/trolleybus.svg (100%) rename {modern/src => src}/resources/images/icon/truck.svg (100%) rename {modern/src => src}/resources/images/icon/van.svg (100%) rename {modern/src => src}/resources/images/logo.svg (100%) rename {modern/src => src}/resources/l10n/af.json (100%) rename {modern/src => src}/resources/l10n/ar.json (100%) rename {modern/src => src}/resources/l10n/az.json (100%) rename {modern/src => src}/resources/l10n/bg.json (100%) rename {modern/src => src}/resources/l10n/bn.json (100%) rename {modern/src => src}/resources/l10n/ca.json (100%) rename {modern/src => src}/resources/l10n/cs.json (100%) rename {modern/src => src}/resources/l10n/da.json (100%) rename {modern/src => src}/resources/l10n/de.json (100%) rename {modern/src => src}/resources/l10n/el.json (100%) rename {modern/src => src}/resources/l10n/en.json (100%) rename {modern/src => src}/resources/l10n/es.json (100%) rename {modern/src => src}/resources/l10n/fa.json (100%) rename {modern/src => src}/resources/l10n/fi.json (100%) rename {modern/src => src}/resources/l10n/fr.json (100%) rename {modern/src => src}/resources/l10n/gl.json (100%) rename {modern/src => src}/resources/l10n/he.json (100%) rename {modern/src => src}/resources/l10n/hi.json (100%) rename {modern/src => src}/resources/l10n/hr.json (100%) rename {modern/src => src}/resources/l10n/hu.json (100%) rename {modern/src => src}/resources/l10n/id.json (100%) rename {modern/src => src}/resources/l10n/it.json (100%) rename {modern/src => src}/resources/l10n/ja.json (100%) rename {modern/src => src}/resources/l10n/ka.json (100%) rename {modern/src => src}/resources/l10n/kk.json (100%) rename {modern/src => src}/resources/l10n/km.json (100%) rename {modern/src => src}/resources/l10n/ko.json (100%) rename {modern/src => src}/resources/l10n/lo.json (100%) rename {modern/src => src}/resources/l10n/lt.json (100%) rename {modern/src => src}/resources/l10n/lv.json (100%) rename {modern/src => src}/resources/l10n/mk.json (100%) rename {modern/src => src}/resources/l10n/ml.json (100%) rename {modern/src => src}/resources/l10n/mn.json (100%) rename {modern/src => src}/resources/l10n/ms.json (100%) rename {modern/src => src}/resources/l10n/nb.json (100%) rename {modern/src => src}/resources/l10n/ne.json (100%) rename {modern/src => src}/resources/l10n/nl.json (100%) rename {modern/src => src}/resources/l10n/nn.json (100%) rename {modern/src => src}/resources/l10n/pl.json (100%) rename {modern/src => src}/resources/l10n/pt.json (100%) rename {modern/src => src}/resources/l10n/pt_BR.json (100%) rename {modern/src => src}/resources/l10n/ro.json (100%) rename {modern/src => src}/resources/l10n/ru.json (100%) rename {modern/src => src}/resources/l10n/si.json (100%) rename {modern/src => src}/resources/l10n/sk.json (100%) rename {modern/src => src}/resources/l10n/sl.json (100%) rename {modern/src => src}/resources/l10n/sq.json (100%) rename {modern/src => src}/resources/l10n/sr.json (100%) rename {modern/src => src}/resources/l10n/sv.json (100%) rename {modern/src => src}/resources/l10n/ta.json (100%) rename {modern/src => src}/resources/l10n/th.json (100%) rename {modern/src => src}/resources/l10n/tr.json (100%) rename {modern/src => src}/resources/l10n/uk.json (100%) rename {modern/src => src}/resources/l10n/uz.json (100%) rename {modern/src => src}/resources/l10n/vi.json (100%) rename {modern/src => src}/resources/l10n/zh.json (100%) rename {modern/src => src}/resources/l10n/zh_TW.json (100%) rename {modern/src => src}/settings/AccumulatorsPage.jsx (100%) rename {modern/src => src}/settings/AnnouncementPage.jsx (100%) rename {modern/src => src}/settings/CalendarPage.jsx (100%) rename {modern/src => src}/settings/CalendarsPage.jsx (100%) rename {modern/src => src}/settings/CommandDevicePage.jsx (100%) rename {modern/src => src}/settings/CommandGroupPage.jsx (100%) rename {modern/src => src}/settings/CommandPage.jsx (100%) rename {modern/src => src}/settings/CommandsPage.jsx (100%) rename {modern/src => src}/settings/ComputedAttributePage.jsx (100%) rename {modern/src => src}/settings/ComputedAttributesPage.jsx (100%) rename {modern/src => src}/settings/DeviceConnectionsPage.jsx (100%) rename {modern/src => src}/settings/DevicePage.jsx (100%) rename {modern/src => src}/settings/DevicesPage.jsx (100%) rename {modern/src => src}/settings/DriverPage.jsx (100%) rename {modern/src => src}/settings/DriversPage.jsx (100%) rename {modern/src => src}/settings/GeofencePage.jsx (100%) rename {modern/src => src}/settings/GroupConnectionsPage.jsx (100%) rename {modern/src => src}/settings/GroupPage.jsx (100%) rename {modern/src => src}/settings/GroupsPage.jsx (100%) rename {modern/src => src}/settings/MaintenancePage.jsx (100%) rename {modern/src => src}/settings/MaintenancesPage.jsx (100%) rename {modern/src => src}/settings/NotificationPage.jsx (100%) rename {modern/src => src}/settings/NotificationsPage.jsx (100%) rename {modern/src => src}/settings/PreferencesPage.jsx (100%) rename {modern/src => src}/settings/ServerPage.jsx (100%) rename {modern/src => src}/settings/SharePage.jsx (100%) rename {modern/src => src}/settings/UserConnectionsPage.jsx (100%) rename {modern/src => src}/settings/UserPage.jsx (100%) rename {modern/src => src}/settings/UsersPage.jsx (100%) rename {modern/src => src}/settings/common/useSettingsStyles.js (100%) rename {modern/src => src}/settings/components/AddAttributeDialog.jsx (100%) rename {modern/src => src}/settings/components/BaseCommandView.jsx (100%) rename {modern/src => src}/settings/components/CollectionActions.jsx (100%) rename {modern/src => src}/settings/components/CollectionFab.jsx (100%) rename {modern/src => src}/settings/components/EditAttributesAccordion.jsx (100%) rename {modern/src => src}/settings/components/EditItemView.jsx (100%) rename {modern/src => src}/settings/components/SearchHeader.jsx (100%) rename {modern/src => src}/settings/components/SettingsMenu.jsx (100%) rename {modern/src => src}/store/calendars.js (100%) rename {modern/src => src}/store/devices.js (100%) rename {modern/src => src}/store/drivers.js (100%) rename {modern/src => src}/store/errors.js (100%) rename {modern/src => src}/store/events.js (100%) rename {modern/src => src}/store/geofences.js (100%) rename {modern/src => src}/store/groups.js (100%) rename {modern/src => src}/store/index.js (100%) rename {modern/src => src}/store/maintenances.js (100%) rename {modern/src => src}/store/reports.js (100%) rename {modern/src => src}/store/session.js (100%) rename {modern/src => src}/store/throttleMiddleware.js (100%) rename modern/vite.config.js => vite.config.js (100%) diff --git a/modern/.env b/.env similarity index 100% rename from modern/.env rename to .env diff --git a/modern/.eslintrc.json b/.eslintrc.json similarity index 100% rename from modern/.eslintrc.json rename to .eslintrc.json diff --git a/.gitignore b/.gitignore index 14e457d8..68641e2c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,14 +1,23 @@ -.project -.settings -.tern-project -.DS_Store -nbproject/ -legacy/web/app.min.js -legacy/web/theme -legacy/web/modern -legacy/web/lib -sencha-error-* -node_modules +# See https://help.github.com/ignore-files/ for more about ignoring files. -.*.swp -*~ +# dependencies +/node_modules + +# testing +/coverage + +# production +/build + +# misc +.DS_Store +.env.local +.env.development.local +.env.test.local +.env.production.local + +npm-debug.log* +yarn-debug.log* +yarn-error.log* + +/legacy/web/lib diff --git a/modern/.npmrc b/.npmrc similarity index 100% rename from modern/.npmrc rename to .npmrc diff --git a/modern/.vscode/launch.json b/.vscode/launch.json similarity index 100% rename from modern/.vscode/launch.json rename to .vscode/launch.json diff --git a/modern/index.html b/index.html similarity index 100% rename from modern/index.html rename to index.html diff --git a/modern/.gitignore b/modern/.gitignore deleted file mode 100644 index d30f40ef..00000000 --- a/modern/.gitignore +++ /dev/null @@ -1,21 +0,0 @@ -# See https://help.github.com/ignore-files/ for more about ignoring files. - -# dependencies -/node_modules - -# testing -/coverage - -# production -/build - -# misc -.DS_Store -.env.local -.env.development.local -.env.test.local -.env.production.local - -npm-debug.log* -yarn-debug.log* -yarn-error.log* diff --git a/modern/package-lock.json b/package-lock.json similarity index 100% rename from modern/package-lock.json rename to package-lock.json diff --git a/modern/package.json b/package.json similarity index 100% rename from modern/package.json rename to package.json diff --git a/modern/public/apple-touch-icon-180x180.png b/public/apple-touch-icon-180x180.png similarity index 100% rename from modern/public/apple-touch-icon-180x180.png rename to public/apple-touch-icon-180x180.png diff --git a/modern/public/favicon.ico b/public/favicon.ico similarity index 100% rename from modern/public/favicon.ico rename to public/favicon.ico diff --git a/modern/public/logo.svg b/public/logo.svg similarity index 100% rename from modern/public/logo.svg rename to public/logo.svg diff --git a/modern/public/maskable-icon-512x512.png b/public/maskable-icon-512x512.png similarity index 100% rename from modern/public/maskable-icon-512x512.png rename to public/maskable-icon-512x512.png diff --git a/modern/public/pwa-192x192.png b/public/pwa-192x192.png similarity index 100% rename from modern/public/pwa-192x192.png rename to public/pwa-192x192.png diff --git a/modern/public/pwa-512x512.png b/public/pwa-512x512.png similarity index 100% rename from modern/public/pwa-512x512.png rename to public/pwa-512x512.png diff --git a/modern/public/pwa-64x64.png b/public/pwa-64x64.png similarity index 100% rename from modern/public/pwa-64x64.png rename to public/pwa-64x64.png diff --git a/modern/public/styles.css b/public/styles.css similarity index 100% rename from modern/public/styles.css rename to public/styles.css diff --git a/modern/src/App.jsx b/src/App.jsx similarity index 100% rename from modern/src/App.jsx rename to src/App.jsx diff --git a/modern/src/AppThemeProvider.jsx b/src/AppThemeProvider.jsx similarity index 100% rename from modern/src/AppThemeProvider.jsx rename to src/AppThemeProvider.jsx diff --git a/modern/src/CachingController.js b/src/CachingController.js similarity index 100% rename from modern/src/CachingController.js rename to src/CachingController.js diff --git a/modern/src/ErrorBoundary.jsx b/src/ErrorBoundary.jsx similarity index 100% rename from modern/src/ErrorBoundary.jsx rename to src/ErrorBoundary.jsx diff --git a/modern/src/Navigation.jsx b/src/Navigation.jsx similarity index 100% rename from modern/src/Navigation.jsx rename to src/Navigation.jsx diff --git a/modern/src/ServerProvider.jsx b/src/ServerProvider.jsx similarity index 100% rename from modern/src/ServerProvider.jsx rename to src/ServerProvider.jsx diff --git a/modern/src/SocketController.jsx b/src/SocketController.jsx similarity index 100% rename from modern/src/SocketController.jsx rename to src/SocketController.jsx diff --git a/modern/src/UpdateController.jsx b/src/UpdateController.jsx similarity index 100% rename from modern/src/UpdateController.jsx rename to src/UpdateController.jsx diff --git a/modern/src/common/attributes/useCommandAttributes.js b/src/common/attributes/useCommandAttributes.js similarity index 100% rename from modern/src/common/attributes/useCommandAttributes.js rename to src/common/attributes/useCommandAttributes.js diff --git a/modern/src/common/attributes/useCommonDeviceAttributes.js b/src/common/attributes/useCommonDeviceAttributes.js similarity index 100% rename from modern/src/common/attributes/useCommonDeviceAttributes.js rename to src/common/attributes/useCommonDeviceAttributes.js diff --git a/modern/src/common/attributes/useCommonUserAttributes.js b/src/common/attributes/useCommonUserAttributes.js similarity index 100% rename from modern/src/common/attributes/useCommonUserAttributes.js rename to src/common/attributes/useCommonUserAttributes.js diff --git a/modern/src/common/attributes/useDeviceAttributes.js b/src/common/attributes/useDeviceAttributes.js similarity index 100% rename from modern/src/common/attributes/useDeviceAttributes.js rename to src/common/attributes/useDeviceAttributes.js diff --git a/modern/src/common/attributes/useGeofenceAttributes.js b/src/common/attributes/useGeofenceAttributes.js similarity index 100% rename from modern/src/common/attributes/useGeofenceAttributes.js rename to src/common/attributes/useGeofenceAttributes.js diff --git a/modern/src/common/attributes/useGroupAttributes.js b/src/common/attributes/useGroupAttributes.js similarity index 100% rename from modern/src/common/attributes/useGroupAttributes.js rename to src/common/attributes/useGroupAttributes.js diff --git a/modern/src/common/attributes/usePositionAttributes.js b/src/common/attributes/usePositionAttributes.js similarity index 100% rename from modern/src/common/attributes/usePositionAttributes.js rename to src/common/attributes/usePositionAttributes.js diff --git a/modern/src/common/attributes/useServerAttributes.js b/src/common/attributes/useServerAttributes.js similarity index 100% rename from modern/src/common/attributes/useServerAttributes.js rename to src/common/attributes/useServerAttributes.js diff --git a/modern/src/common/attributes/useUserAttributes.js b/src/common/attributes/useUserAttributes.js similarity index 100% rename from modern/src/common/attributes/useUserAttributes.js rename to src/common/attributes/useUserAttributes.js diff --git a/modern/src/common/components/AddressValue.jsx b/src/common/components/AddressValue.jsx similarity index 100% rename from modern/src/common/components/AddressValue.jsx rename to src/common/components/AddressValue.jsx diff --git a/modern/src/common/components/BottomMenu.jsx b/src/common/components/BottomMenu.jsx similarity index 100% rename from modern/src/common/components/BottomMenu.jsx rename to src/common/components/BottomMenu.jsx diff --git a/modern/src/common/components/DriverValue.js b/src/common/components/DriverValue.js similarity index 100% rename from modern/src/common/components/DriverValue.js rename to src/common/components/DriverValue.js diff --git a/modern/src/common/components/ErrorHandler.jsx b/src/common/components/ErrorHandler.jsx similarity index 100% rename from modern/src/common/components/ErrorHandler.jsx rename to src/common/components/ErrorHandler.jsx diff --git a/modern/src/common/components/GeofencesValue.js b/src/common/components/GeofencesValue.js similarity index 100% rename from modern/src/common/components/GeofencesValue.js rename to src/common/components/GeofencesValue.js diff --git a/modern/src/common/components/LinkField.jsx b/src/common/components/LinkField.jsx similarity index 100% rename from modern/src/common/components/LinkField.jsx rename to src/common/components/LinkField.jsx diff --git a/modern/src/common/components/LocalizationProvider.jsx b/src/common/components/LocalizationProvider.jsx similarity index 100% rename from modern/src/common/components/LocalizationProvider.jsx rename to src/common/components/LocalizationProvider.jsx diff --git a/modern/src/common/components/NativeInterface.js b/src/common/components/NativeInterface.js similarity index 100% rename from modern/src/common/components/NativeInterface.js rename to src/common/components/NativeInterface.js diff --git a/modern/src/common/components/NavBar.jsx b/src/common/components/NavBar.jsx similarity index 100% rename from modern/src/common/components/NavBar.jsx rename to src/common/components/NavBar.jsx diff --git a/modern/src/common/components/PageLayout.jsx b/src/common/components/PageLayout.jsx similarity index 100% rename from modern/src/common/components/PageLayout.jsx rename to src/common/components/PageLayout.jsx diff --git a/modern/src/common/components/PositionValue.jsx b/src/common/components/PositionValue.jsx similarity index 100% rename from modern/src/common/components/PositionValue.jsx rename to src/common/components/PositionValue.jsx diff --git a/modern/src/common/components/RemoveDialog.jsx b/src/common/components/RemoveDialog.jsx similarity index 100% rename from modern/src/common/components/RemoveDialog.jsx rename to src/common/components/RemoveDialog.jsx diff --git a/modern/src/common/components/SelectField.jsx b/src/common/components/SelectField.jsx similarity index 100% rename from modern/src/common/components/SelectField.jsx rename to src/common/components/SelectField.jsx diff --git a/modern/src/common/components/SideNav.jsx b/src/common/components/SideNav.jsx similarity index 100% rename from modern/src/common/components/SideNav.jsx rename to src/common/components/SideNav.jsx diff --git a/modern/src/common/components/SplitButton.jsx b/src/common/components/SplitButton.jsx similarity index 100% rename from modern/src/common/components/SplitButton.jsx rename to src/common/components/SplitButton.jsx diff --git a/modern/src/common/components/StatusCard.jsx b/src/common/components/StatusCard.jsx similarity index 100% rename from modern/src/common/components/StatusCard.jsx rename to src/common/components/StatusCard.jsx diff --git a/modern/src/common/components/TableShimmer.jsx b/src/common/components/TableShimmer.jsx similarity index 100% rename from modern/src/common/components/TableShimmer.jsx rename to src/common/components/TableShimmer.jsx diff --git a/modern/src/common/theme/components.js b/src/common/theme/components.js similarity index 100% rename from modern/src/common/theme/components.js rename to src/common/theme/components.js diff --git a/modern/src/common/theme/dimensions.js b/src/common/theme/dimensions.js similarity index 100% rename from modern/src/common/theme/dimensions.js rename to src/common/theme/dimensions.js diff --git a/modern/src/common/theme/index.js b/src/common/theme/index.js similarity index 100% rename from modern/src/common/theme/index.js rename to src/common/theme/index.js diff --git a/modern/src/common/theme/palette.js b/src/common/theme/palette.js similarity index 100% rename from modern/src/common/theme/palette.js rename to src/common/theme/palette.js diff --git a/modern/src/common/util/converter.js b/src/common/util/converter.js similarity index 100% rename from modern/src/common/util/converter.js rename to src/common/util/converter.js diff --git a/modern/src/common/util/deviceCategories.js b/src/common/util/deviceCategories.js similarity index 100% rename from modern/src/common/util/deviceCategories.js rename to src/common/util/deviceCategories.js diff --git a/modern/src/common/util/duration.js b/src/common/util/duration.js similarity index 100% rename from modern/src/common/util/duration.js rename to src/common/util/duration.js diff --git a/modern/src/common/util/formatter.js b/src/common/util/formatter.js similarity index 100% rename from modern/src/common/util/formatter.js rename to src/common/util/formatter.js diff --git a/modern/src/common/util/permissions.js b/src/common/util/permissions.js similarity index 100% rename from modern/src/common/util/permissions.js rename to src/common/util/permissions.js diff --git a/modern/src/common/util/preferences.js b/src/common/util/preferences.js similarity index 100% rename from modern/src/common/util/preferences.js rename to src/common/util/preferences.js diff --git a/modern/src/common/util/stringUtils.js b/src/common/util/stringUtils.js similarity index 100% rename from modern/src/common/util/stringUtils.js rename to src/common/util/stringUtils.js diff --git a/modern/src/common/util/useFeatures.js b/src/common/util/useFeatures.js similarity index 100% rename from modern/src/common/util/useFeatures.js rename to src/common/util/useFeatures.js diff --git a/modern/src/common/util/usePersistedState.js b/src/common/util/usePersistedState.js similarity index 100% rename from modern/src/common/util/usePersistedState.js rename to src/common/util/usePersistedState.js diff --git a/modern/src/common/util/useQuery.js b/src/common/util/useQuery.js similarity index 100% rename from modern/src/common/util/useQuery.js rename to src/common/util/useQuery.js diff --git a/modern/src/index.jsx b/src/index.jsx similarity index 100% rename from modern/src/index.jsx rename to src/index.jsx diff --git a/modern/src/login/ChangeServerPage.jsx b/src/login/ChangeServerPage.jsx similarity index 100% rename from modern/src/login/ChangeServerPage.jsx rename to src/login/ChangeServerPage.jsx diff --git a/modern/src/login/LoginLayout.jsx b/src/login/LoginLayout.jsx similarity index 100% rename from modern/src/login/LoginLayout.jsx rename to src/login/LoginLayout.jsx diff --git a/modern/src/login/LoginPage.jsx b/src/login/LoginPage.jsx similarity index 100% rename from modern/src/login/LoginPage.jsx rename to src/login/LoginPage.jsx diff --git a/modern/src/login/LogoImage.jsx b/src/login/LogoImage.jsx similarity index 100% rename from modern/src/login/LogoImage.jsx rename to src/login/LogoImage.jsx diff --git a/modern/src/login/RegisterPage.jsx b/src/login/RegisterPage.jsx similarity index 100% rename from modern/src/login/RegisterPage.jsx rename to src/login/RegisterPage.jsx diff --git a/modern/src/login/ResetPasswordPage.jsx b/src/login/ResetPasswordPage.jsx similarity index 100% rename from modern/src/login/ResetPasswordPage.jsx rename to src/login/ResetPasswordPage.jsx diff --git a/modern/src/main/DeviceList.jsx b/src/main/DeviceList.jsx similarity index 100% rename from modern/src/main/DeviceList.jsx rename to src/main/DeviceList.jsx diff --git a/modern/src/main/DeviceRow.jsx b/src/main/DeviceRow.jsx similarity index 100% rename from modern/src/main/DeviceRow.jsx rename to src/main/DeviceRow.jsx diff --git a/modern/src/main/EventsDrawer.jsx b/src/main/EventsDrawer.jsx similarity index 100% rename from modern/src/main/EventsDrawer.jsx rename to src/main/EventsDrawer.jsx diff --git a/modern/src/main/MainMap.jsx b/src/main/MainMap.jsx similarity index 100% rename from modern/src/main/MainMap.jsx rename to src/main/MainMap.jsx diff --git a/modern/src/main/MainPage.jsx b/src/main/MainPage.jsx similarity index 100% rename from modern/src/main/MainPage.jsx rename to src/main/MainPage.jsx diff --git a/modern/src/main/MainToolbar.jsx b/src/main/MainToolbar.jsx similarity index 100% rename from modern/src/main/MainToolbar.jsx rename to src/main/MainToolbar.jsx diff --git a/modern/src/main/useFilter.js b/src/main/useFilter.js similarity index 100% rename from modern/src/main/useFilter.js rename to src/main/useFilter.js diff --git a/modern/src/map/MapCamera.js b/src/map/MapCamera.js similarity index 100% rename from modern/src/map/MapCamera.js rename to src/map/MapCamera.js diff --git a/modern/src/map/MapCurrentLocation.js b/src/map/MapCurrentLocation.js similarity index 100% rename from modern/src/map/MapCurrentLocation.js rename to src/map/MapCurrentLocation.js diff --git a/modern/src/map/MapGeofence.js b/src/map/MapGeofence.js similarity index 100% rename from modern/src/map/MapGeofence.js rename to src/map/MapGeofence.js diff --git a/modern/src/map/MapMarkers.js b/src/map/MapMarkers.js similarity index 100% rename from modern/src/map/MapMarkers.js rename to src/map/MapMarkers.js diff --git a/modern/src/map/MapPadding.js b/src/map/MapPadding.js similarity index 100% rename from modern/src/map/MapPadding.js rename to src/map/MapPadding.js diff --git a/modern/src/map/MapPositions.js b/src/map/MapPositions.js similarity index 100% rename from modern/src/map/MapPositions.js rename to src/map/MapPositions.js diff --git a/modern/src/map/MapRoutePath.js b/src/map/MapRoutePath.js similarity index 100% rename from modern/src/map/MapRoutePath.js rename to src/map/MapRoutePath.js diff --git a/modern/src/map/MapRoutePoints.js b/src/map/MapRoutePoints.js similarity index 100% rename from modern/src/map/MapRoutePoints.js rename to src/map/MapRoutePoints.js diff --git a/modern/src/map/MapScale.js b/src/map/MapScale.js similarity index 100% rename from modern/src/map/MapScale.js rename to src/map/MapScale.js diff --git a/modern/src/map/core/MapView.jsx b/src/map/core/MapView.jsx similarity index 100% rename from modern/src/map/core/MapView.jsx rename to src/map/core/MapView.jsx diff --git a/modern/src/map/core/mapUtil.js b/src/map/core/mapUtil.js similarity index 100% rename from modern/src/map/core/mapUtil.js rename to src/map/core/mapUtil.js diff --git a/modern/src/map/core/preloadImages.js b/src/map/core/preloadImages.js similarity index 100% rename from modern/src/map/core/preloadImages.js rename to src/map/core/preloadImages.js diff --git a/modern/src/map/core/useMapStyles.js b/src/map/core/useMapStyles.js similarity index 100% rename from modern/src/map/core/useMapStyles.js rename to src/map/core/useMapStyles.js diff --git a/modern/src/map/draw/MapGeofenceEdit.js b/src/map/draw/MapGeofenceEdit.js similarity index 100% rename from modern/src/map/draw/MapGeofenceEdit.js rename to src/map/draw/MapGeofenceEdit.js diff --git a/modern/src/map/draw/theme.js b/src/map/draw/theme.js similarity index 100% rename from modern/src/map/draw/theme.js rename to src/map/draw/theme.js diff --git a/modern/src/map/geocoder/MapGeocoder.js b/src/map/geocoder/MapGeocoder.js similarity index 100% rename from modern/src/map/geocoder/MapGeocoder.js rename to src/map/geocoder/MapGeocoder.js diff --git a/modern/src/map/geocoder/geocoder.css b/src/map/geocoder/geocoder.css similarity index 100% rename from modern/src/map/geocoder/geocoder.css rename to src/map/geocoder/geocoder.css diff --git a/modern/src/map/main/MapAccuracy.js b/src/map/main/MapAccuracy.js similarity index 100% rename from modern/src/map/main/MapAccuracy.js rename to src/map/main/MapAccuracy.js diff --git a/modern/src/map/main/MapDefaultCamera.js b/src/map/main/MapDefaultCamera.js similarity index 100% rename from modern/src/map/main/MapDefaultCamera.js rename to src/map/main/MapDefaultCamera.js diff --git a/modern/src/map/main/MapLiveRoutes.js b/src/map/main/MapLiveRoutes.js similarity index 100% rename from modern/src/map/main/MapLiveRoutes.js rename to src/map/main/MapLiveRoutes.js diff --git a/modern/src/map/main/MapSelectedDevice.js b/src/map/main/MapSelectedDevice.js similarity index 100% rename from modern/src/map/main/MapSelectedDevice.js rename to src/map/main/MapSelectedDevice.js diff --git a/modern/src/map/main/PoiMap.js b/src/map/main/PoiMap.js similarity index 100% rename from modern/src/map/main/PoiMap.js rename to src/map/main/PoiMap.js diff --git a/modern/src/map/notification/MapNotification.js b/src/map/notification/MapNotification.js similarity index 100% rename from modern/src/map/notification/MapNotification.js rename to src/map/notification/MapNotification.js diff --git a/modern/src/map/notification/notification.css b/src/map/notification/notification.css similarity index 100% rename from modern/src/map/notification/notification.css rename to src/map/notification/notification.css diff --git a/modern/src/map/overlay/MapOverlay.js b/src/map/overlay/MapOverlay.js similarity index 100% rename from modern/src/map/overlay/MapOverlay.js rename to src/map/overlay/MapOverlay.js diff --git a/modern/src/map/overlay/useMapOverlays.js b/src/map/overlay/useMapOverlays.js similarity index 100% rename from modern/src/map/overlay/useMapOverlays.js rename to src/map/overlay/useMapOverlays.js diff --git a/modern/src/map/switcher/switcher.css b/src/map/switcher/switcher.css similarity index 100% rename from modern/src/map/switcher/switcher.css rename to src/map/switcher/switcher.css diff --git a/modern/src/map/switcher/switcher.js b/src/map/switcher/switcher.js similarity index 100% rename from modern/src/map/switcher/switcher.js rename to src/map/switcher/switcher.js diff --git a/modern/src/other/EventPage.jsx b/src/other/EventPage.jsx similarity index 100% rename from modern/src/other/EventPage.jsx rename to src/other/EventPage.jsx diff --git a/modern/src/other/GeofencesList.jsx b/src/other/GeofencesList.jsx similarity index 100% rename from modern/src/other/GeofencesList.jsx rename to src/other/GeofencesList.jsx diff --git a/modern/src/other/GeofencesPage.jsx b/src/other/GeofencesPage.jsx similarity index 100% rename from modern/src/other/GeofencesPage.jsx rename to src/other/GeofencesPage.jsx diff --git a/modern/src/other/NetworkPage.jsx b/src/other/NetworkPage.jsx similarity index 100% rename from modern/src/other/NetworkPage.jsx rename to src/other/NetworkPage.jsx diff --git a/modern/src/other/PositionPage.jsx b/src/other/PositionPage.jsx similarity index 100% rename from modern/src/other/PositionPage.jsx rename to src/other/PositionPage.jsx diff --git a/modern/src/other/ReplayPage.jsx b/src/other/ReplayPage.jsx similarity index 100% rename from modern/src/other/ReplayPage.jsx rename to src/other/ReplayPage.jsx diff --git a/modern/src/reactHelper.js b/src/reactHelper.js similarity index 100% rename from modern/src/reactHelper.js rename to src/reactHelper.js diff --git a/modern/src/reports/ChartReportPage.jsx b/src/reports/ChartReportPage.jsx similarity index 100% rename from modern/src/reports/ChartReportPage.jsx rename to src/reports/ChartReportPage.jsx diff --git a/modern/src/reports/CombinedReportPage.jsx b/src/reports/CombinedReportPage.jsx similarity index 100% rename from modern/src/reports/CombinedReportPage.jsx rename to src/reports/CombinedReportPage.jsx diff --git a/modern/src/reports/EventReportPage.jsx b/src/reports/EventReportPage.jsx similarity index 100% rename from modern/src/reports/EventReportPage.jsx rename to src/reports/EventReportPage.jsx diff --git a/modern/src/reports/LogsPage.jsx b/src/reports/LogsPage.jsx similarity index 100% rename from modern/src/reports/LogsPage.jsx rename to src/reports/LogsPage.jsx diff --git a/modern/src/reports/RouteReportPage.jsx b/src/reports/RouteReportPage.jsx similarity index 100% rename from modern/src/reports/RouteReportPage.jsx rename to src/reports/RouteReportPage.jsx diff --git a/modern/src/reports/ScheduledPage.jsx b/src/reports/ScheduledPage.jsx similarity index 100% rename from modern/src/reports/ScheduledPage.jsx rename to src/reports/ScheduledPage.jsx diff --git a/modern/src/reports/StatisticsPage.jsx b/src/reports/StatisticsPage.jsx similarity index 100% rename from modern/src/reports/StatisticsPage.jsx rename to src/reports/StatisticsPage.jsx diff --git a/modern/src/reports/StopReportPage.jsx b/src/reports/StopReportPage.jsx similarity index 100% rename from modern/src/reports/StopReportPage.jsx rename to src/reports/StopReportPage.jsx diff --git a/modern/src/reports/SummaryReportPage.jsx b/src/reports/SummaryReportPage.jsx similarity index 100% rename from modern/src/reports/SummaryReportPage.jsx rename to src/reports/SummaryReportPage.jsx diff --git a/modern/src/reports/TripReportPage.jsx b/src/reports/TripReportPage.jsx similarity index 100% rename from modern/src/reports/TripReportPage.jsx rename to src/reports/TripReportPage.jsx diff --git a/modern/src/reports/common/scheduleReport.js b/src/reports/common/scheduleReport.js similarity index 100% rename from modern/src/reports/common/scheduleReport.js rename to src/reports/common/scheduleReport.js diff --git a/modern/src/reports/common/useReportStyles.js b/src/reports/common/useReportStyles.js similarity index 100% rename from modern/src/reports/common/useReportStyles.js rename to src/reports/common/useReportStyles.js diff --git a/modern/src/reports/components/ColumnSelect.jsx b/src/reports/components/ColumnSelect.jsx similarity index 100% rename from modern/src/reports/components/ColumnSelect.jsx rename to src/reports/components/ColumnSelect.jsx diff --git a/modern/src/reports/components/ReportFilter.jsx b/src/reports/components/ReportFilter.jsx similarity index 100% rename from modern/src/reports/components/ReportFilter.jsx rename to src/reports/components/ReportFilter.jsx diff --git a/modern/src/reports/components/ReportsMenu.jsx b/src/reports/components/ReportsMenu.jsx similarity index 100% rename from modern/src/reports/components/ReportsMenu.jsx rename to src/reports/components/ReportsMenu.jsx diff --git a/modern/src/resources/alarm.mp3 b/src/resources/alarm.mp3 similarity index 100% rename from modern/src/resources/alarm.mp3 rename to src/resources/alarm.mp3 diff --git a/modern/src/resources/images/arrow.svg b/src/resources/images/arrow.svg similarity index 100% rename from modern/src/resources/images/arrow.svg rename to src/resources/images/arrow.svg diff --git a/modern/src/resources/images/background.svg b/src/resources/images/background.svg similarity index 100% rename from modern/src/resources/images/background.svg rename to src/resources/images/background.svg diff --git a/modern/src/resources/images/data/engine.svg b/src/resources/images/data/engine.svg similarity index 100% rename from modern/src/resources/images/data/engine.svg rename to src/resources/images/data/engine.svg diff --git a/modern/src/resources/images/direction.svg b/src/resources/images/direction.svg similarity index 100% rename from modern/src/resources/images/direction.svg rename to src/resources/images/direction.svg diff --git a/modern/src/resources/images/icon/animal.svg b/src/resources/images/icon/animal.svg similarity index 100% rename from modern/src/resources/images/icon/animal.svg rename to src/resources/images/icon/animal.svg diff --git a/modern/src/resources/images/icon/bicycle.svg b/src/resources/images/icon/bicycle.svg similarity index 100% rename from modern/src/resources/images/icon/bicycle.svg rename to src/resources/images/icon/bicycle.svg diff --git a/modern/src/resources/images/icon/boat.svg b/src/resources/images/icon/boat.svg similarity index 100% rename from modern/src/resources/images/icon/boat.svg rename to src/resources/images/icon/boat.svg diff --git a/modern/src/resources/images/icon/bus.svg b/src/resources/images/icon/bus.svg similarity index 100% rename from modern/src/resources/images/icon/bus.svg rename to src/resources/images/icon/bus.svg diff --git a/modern/src/resources/images/icon/camper.svg b/src/resources/images/icon/camper.svg similarity index 100% rename from modern/src/resources/images/icon/camper.svg rename to src/resources/images/icon/camper.svg diff --git a/modern/src/resources/images/icon/car.svg b/src/resources/images/icon/car.svg similarity index 100% rename from modern/src/resources/images/icon/car.svg rename to src/resources/images/icon/car.svg diff --git a/modern/src/resources/images/icon/crane.svg b/src/resources/images/icon/crane.svg similarity index 100% rename from modern/src/resources/images/icon/crane.svg rename to src/resources/images/icon/crane.svg diff --git a/modern/src/resources/images/icon/default.svg b/src/resources/images/icon/default.svg similarity index 100% rename from modern/src/resources/images/icon/default.svg rename to src/resources/images/icon/default.svg diff --git a/modern/src/resources/images/icon/helicopter.svg b/src/resources/images/icon/helicopter.svg similarity index 100% rename from modern/src/resources/images/icon/helicopter.svg rename to src/resources/images/icon/helicopter.svg diff --git a/modern/src/resources/images/icon/motorcycle.svg b/src/resources/images/icon/motorcycle.svg similarity index 100% rename from modern/src/resources/images/icon/motorcycle.svg rename to src/resources/images/icon/motorcycle.svg diff --git a/modern/src/resources/images/icon/offroad.svg b/src/resources/images/icon/offroad.svg similarity index 100% rename from modern/src/resources/images/icon/offroad.svg rename to src/resources/images/icon/offroad.svg diff --git a/modern/src/resources/images/icon/person.svg b/src/resources/images/icon/person.svg similarity index 100% rename from modern/src/resources/images/icon/person.svg rename to src/resources/images/icon/person.svg diff --git a/modern/src/resources/images/icon/pickup.svg b/src/resources/images/icon/pickup.svg similarity index 100% rename from modern/src/resources/images/icon/pickup.svg rename to src/resources/images/icon/pickup.svg diff --git a/modern/src/resources/images/icon/plane.svg b/src/resources/images/icon/plane.svg similarity index 100% rename from modern/src/resources/images/icon/plane.svg rename to src/resources/images/icon/plane.svg diff --git a/modern/src/resources/images/icon/scooter.svg b/src/resources/images/icon/scooter.svg similarity index 100% rename from modern/src/resources/images/icon/scooter.svg rename to src/resources/images/icon/scooter.svg diff --git a/modern/src/resources/images/icon/ship.svg b/src/resources/images/icon/ship.svg similarity index 100% rename from modern/src/resources/images/icon/ship.svg rename to src/resources/images/icon/ship.svg diff --git a/modern/src/resources/images/icon/tractor.svg b/src/resources/images/icon/tractor.svg similarity index 100% rename from modern/src/resources/images/icon/tractor.svg rename to src/resources/images/icon/tractor.svg diff --git a/modern/src/resources/images/icon/train.svg b/src/resources/images/icon/train.svg similarity index 100% rename from modern/src/resources/images/icon/train.svg rename to src/resources/images/icon/train.svg diff --git a/modern/src/resources/images/icon/tram.svg b/src/resources/images/icon/tram.svg similarity index 100% rename from modern/src/resources/images/icon/tram.svg rename to src/resources/images/icon/tram.svg diff --git a/modern/src/resources/images/icon/trolleybus.svg b/src/resources/images/icon/trolleybus.svg similarity index 100% rename from modern/src/resources/images/icon/trolleybus.svg rename to src/resources/images/icon/trolleybus.svg diff --git a/modern/src/resources/images/icon/truck.svg b/src/resources/images/icon/truck.svg similarity index 100% rename from modern/src/resources/images/icon/truck.svg rename to src/resources/images/icon/truck.svg diff --git a/modern/src/resources/images/icon/van.svg b/src/resources/images/icon/van.svg similarity index 100% rename from modern/src/resources/images/icon/van.svg rename to src/resources/images/icon/van.svg diff --git a/modern/src/resources/images/logo.svg b/src/resources/images/logo.svg similarity index 100% rename from modern/src/resources/images/logo.svg rename to src/resources/images/logo.svg diff --git a/modern/src/resources/l10n/af.json b/src/resources/l10n/af.json similarity index 100% rename from modern/src/resources/l10n/af.json rename to src/resources/l10n/af.json diff --git a/modern/src/resources/l10n/ar.json b/src/resources/l10n/ar.json similarity index 100% rename from modern/src/resources/l10n/ar.json rename to src/resources/l10n/ar.json diff --git a/modern/src/resources/l10n/az.json b/src/resources/l10n/az.json similarity index 100% rename from modern/src/resources/l10n/az.json rename to src/resources/l10n/az.json diff --git a/modern/src/resources/l10n/bg.json b/src/resources/l10n/bg.json similarity index 100% rename from modern/src/resources/l10n/bg.json rename to src/resources/l10n/bg.json diff --git a/modern/src/resources/l10n/bn.json b/src/resources/l10n/bn.json similarity index 100% rename from modern/src/resources/l10n/bn.json rename to src/resources/l10n/bn.json diff --git a/modern/src/resources/l10n/ca.json b/src/resources/l10n/ca.json similarity index 100% rename from modern/src/resources/l10n/ca.json rename to src/resources/l10n/ca.json diff --git a/modern/src/resources/l10n/cs.json b/src/resources/l10n/cs.json similarity index 100% rename from modern/src/resources/l10n/cs.json rename to src/resources/l10n/cs.json diff --git a/modern/src/resources/l10n/da.json b/src/resources/l10n/da.json similarity index 100% rename from modern/src/resources/l10n/da.json rename to src/resources/l10n/da.json diff --git a/modern/src/resources/l10n/de.json b/src/resources/l10n/de.json similarity index 100% rename from modern/src/resources/l10n/de.json rename to src/resources/l10n/de.json diff --git a/modern/src/resources/l10n/el.json b/src/resources/l10n/el.json similarity index 100% rename from modern/src/resources/l10n/el.json rename to src/resources/l10n/el.json diff --git a/modern/src/resources/l10n/en.json b/src/resources/l10n/en.json similarity index 100% rename from modern/src/resources/l10n/en.json rename to src/resources/l10n/en.json diff --git a/modern/src/resources/l10n/es.json b/src/resources/l10n/es.json similarity index 100% rename from modern/src/resources/l10n/es.json rename to src/resources/l10n/es.json diff --git a/modern/src/resources/l10n/fa.json b/src/resources/l10n/fa.json similarity index 100% rename from modern/src/resources/l10n/fa.json rename to src/resources/l10n/fa.json diff --git a/modern/src/resources/l10n/fi.json b/src/resources/l10n/fi.json similarity index 100% rename from modern/src/resources/l10n/fi.json rename to src/resources/l10n/fi.json diff --git a/modern/src/resources/l10n/fr.json b/src/resources/l10n/fr.json similarity index 100% rename from modern/src/resources/l10n/fr.json rename to src/resources/l10n/fr.json diff --git a/modern/src/resources/l10n/gl.json b/src/resources/l10n/gl.json similarity index 100% rename from modern/src/resources/l10n/gl.json rename to src/resources/l10n/gl.json diff --git a/modern/src/resources/l10n/he.json b/src/resources/l10n/he.json similarity index 100% rename from modern/src/resources/l10n/he.json rename to src/resources/l10n/he.json diff --git a/modern/src/resources/l10n/hi.json b/src/resources/l10n/hi.json similarity index 100% rename from modern/src/resources/l10n/hi.json rename to src/resources/l10n/hi.json diff --git a/modern/src/resources/l10n/hr.json b/src/resources/l10n/hr.json similarity index 100% rename from modern/src/resources/l10n/hr.json rename to src/resources/l10n/hr.json diff --git a/modern/src/resources/l10n/hu.json b/src/resources/l10n/hu.json similarity index 100% rename from modern/src/resources/l10n/hu.json rename to src/resources/l10n/hu.json diff --git a/modern/src/resources/l10n/id.json b/src/resources/l10n/id.json similarity index 100% rename from modern/src/resources/l10n/id.json rename to src/resources/l10n/id.json diff --git a/modern/src/resources/l10n/it.json b/src/resources/l10n/it.json similarity index 100% rename from modern/src/resources/l10n/it.json rename to src/resources/l10n/it.json diff --git a/modern/src/resources/l10n/ja.json b/src/resources/l10n/ja.json similarity index 100% rename from modern/src/resources/l10n/ja.json rename to src/resources/l10n/ja.json diff --git a/modern/src/resources/l10n/ka.json b/src/resources/l10n/ka.json similarity index 100% rename from modern/src/resources/l10n/ka.json rename to src/resources/l10n/ka.json diff --git a/modern/src/resources/l10n/kk.json b/src/resources/l10n/kk.json similarity index 100% rename from modern/src/resources/l10n/kk.json rename to src/resources/l10n/kk.json diff --git a/modern/src/resources/l10n/km.json b/src/resources/l10n/km.json similarity index 100% rename from modern/src/resources/l10n/km.json rename to src/resources/l10n/km.json diff --git a/modern/src/resources/l10n/ko.json b/src/resources/l10n/ko.json similarity index 100% rename from modern/src/resources/l10n/ko.json rename to src/resources/l10n/ko.json diff --git a/modern/src/resources/l10n/lo.json b/src/resources/l10n/lo.json similarity index 100% rename from modern/src/resources/l10n/lo.json rename to src/resources/l10n/lo.json diff --git a/modern/src/resources/l10n/lt.json b/src/resources/l10n/lt.json similarity index 100% rename from modern/src/resources/l10n/lt.json rename to src/resources/l10n/lt.json diff --git a/modern/src/resources/l10n/lv.json b/src/resources/l10n/lv.json similarity index 100% rename from modern/src/resources/l10n/lv.json rename to src/resources/l10n/lv.json diff --git a/modern/src/resources/l10n/mk.json b/src/resources/l10n/mk.json similarity index 100% rename from modern/src/resources/l10n/mk.json rename to src/resources/l10n/mk.json diff --git a/modern/src/resources/l10n/ml.json b/src/resources/l10n/ml.json similarity index 100% rename from modern/src/resources/l10n/ml.json rename to src/resources/l10n/ml.json diff --git a/modern/src/resources/l10n/mn.json b/src/resources/l10n/mn.json similarity index 100% rename from modern/src/resources/l10n/mn.json rename to src/resources/l10n/mn.json diff --git a/modern/src/resources/l10n/ms.json b/src/resources/l10n/ms.json similarity index 100% rename from modern/src/resources/l10n/ms.json rename to src/resources/l10n/ms.json diff --git a/modern/src/resources/l10n/nb.json b/src/resources/l10n/nb.json similarity index 100% rename from modern/src/resources/l10n/nb.json rename to src/resources/l10n/nb.json diff --git a/modern/src/resources/l10n/ne.json b/src/resources/l10n/ne.json similarity index 100% rename from modern/src/resources/l10n/ne.json rename to src/resources/l10n/ne.json diff --git a/modern/src/resources/l10n/nl.json b/src/resources/l10n/nl.json similarity index 100% rename from modern/src/resources/l10n/nl.json rename to src/resources/l10n/nl.json diff --git a/modern/src/resources/l10n/nn.json b/src/resources/l10n/nn.json similarity index 100% rename from modern/src/resources/l10n/nn.json rename to src/resources/l10n/nn.json diff --git a/modern/src/resources/l10n/pl.json b/src/resources/l10n/pl.json similarity index 100% rename from modern/src/resources/l10n/pl.json rename to src/resources/l10n/pl.json diff --git a/modern/src/resources/l10n/pt.json b/src/resources/l10n/pt.json similarity index 100% rename from modern/src/resources/l10n/pt.json rename to src/resources/l10n/pt.json diff --git a/modern/src/resources/l10n/pt_BR.json b/src/resources/l10n/pt_BR.json similarity index 100% rename from modern/src/resources/l10n/pt_BR.json rename to src/resources/l10n/pt_BR.json diff --git a/modern/src/resources/l10n/ro.json b/src/resources/l10n/ro.json similarity index 100% rename from modern/src/resources/l10n/ro.json rename to src/resources/l10n/ro.json diff --git a/modern/src/resources/l10n/ru.json b/src/resources/l10n/ru.json similarity index 100% rename from modern/src/resources/l10n/ru.json rename to src/resources/l10n/ru.json diff --git a/modern/src/resources/l10n/si.json b/src/resources/l10n/si.json similarity index 100% rename from modern/src/resources/l10n/si.json rename to src/resources/l10n/si.json diff --git a/modern/src/resources/l10n/sk.json b/src/resources/l10n/sk.json similarity index 100% rename from modern/src/resources/l10n/sk.json rename to src/resources/l10n/sk.json diff --git a/modern/src/resources/l10n/sl.json b/src/resources/l10n/sl.json similarity index 100% rename from modern/src/resources/l10n/sl.json rename to src/resources/l10n/sl.json diff --git a/modern/src/resources/l10n/sq.json b/src/resources/l10n/sq.json similarity index 100% rename from modern/src/resources/l10n/sq.json rename to src/resources/l10n/sq.json diff --git a/modern/src/resources/l10n/sr.json b/src/resources/l10n/sr.json similarity index 100% rename from modern/src/resources/l10n/sr.json rename to src/resources/l10n/sr.json diff --git a/modern/src/resources/l10n/sv.json b/src/resources/l10n/sv.json similarity index 100% rename from modern/src/resources/l10n/sv.json rename to src/resources/l10n/sv.json diff --git a/modern/src/resources/l10n/ta.json b/src/resources/l10n/ta.json similarity index 100% rename from modern/src/resources/l10n/ta.json rename to src/resources/l10n/ta.json diff --git a/modern/src/resources/l10n/th.json b/src/resources/l10n/th.json similarity index 100% rename from modern/src/resources/l10n/th.json rename to src/resources/l10n/th.json diff --git a/modern/src/resources/l10n/tr.json b/src/resources/l10n/tr.json similarity index 100% rename from modern/src/resources/l10n/tr.json rename to src/resources/l10n/tr.json diff --git a/modern/src/resources/l10n/uk.json b/src/resources/l10n/uk.json similarity index 100% rename from modern/src/resources/l10n/uk.json rename to src/resources/l10n/uk.json diff --git a/modern/src/resources/l10n/uz.json b/src/resources/l10n/uz.json similarity index 100% rename from modern/src/resources/l10n/uz.json rename to src/resources/l10n/uz.json diff --git a/modern/src/resources/l10n/vi.json b/src/resources/l10n/vi.json similarity index 100% rename from modern/src/resources/l10n/vi.json rename to src/resources/l10n/vi.json diff --git a/modern/src/resources/l10n/zh.json b/src/resources/l10n/zh.json similarity index 100% rename from modern/src/resources/l10n/zh.json rename to src/resources/l10n/zh.json diff --git a/modern/src/resources/l10n/zh_TW.json b/src/resources/l10n/zh_TW.json similarity index 100% rename from modern/src/resources/l10n/zh_TW.json rename to src/resources/l10n/zh_TW.json diff --git a/modern/src/settings/AccumulatorsPage.jsx b/src/settings/AccumulatorsPage.jsx similarity index 100% rename from modern/src/settings/AccumulatorsPage.jsx rename to src/settings/AccumulatorsPage.jsx diff --git a/modern/src/settings/AnnouncementPage.jsx b/src/settings/AnnouncementPage.jsx similarity index 100% rename from modern/src/settings/AnnouncementPage.jsx rename to src/settings/AnnouncementPage.jsx diff --git a/modern/src/settings/CalendarPage.jsx b/src/settings/CalendarPage.jsx similarity index 100% rename from modern/src/settings/CalendarPage.jsx rename to src/settings/CalendarPage.jsx diff --git a/modern/src/settings/CalendarsPage.jsx b/src/settings/CalendarsPage.jsx similarity index 100% rename from modern/src/settings/CalendarsPage.jsx rename to src/settings/CalendarsPage.jsx diff --git a/modern/src/settings/CommandDevicePage.jsx b/src/settings/CommandDevicePage.jsx similarity index 100% rename from modern/src/settings/CommandDevicePage.jsx rename to src/settings/CommandDevicePage.jsx diff --git a/modern/src/settings/CommandGroupPage.jsx b/src/settings/CommandGroupPage.jsx similarity index 100% rename from modern/src/settings/CommandGroupPage.jsx rename to src/settings/CommandGroupPage.jsx diff --git a/modern/src/settings/CommandPage.jsx b/src/settings/CommandPage.jsx similarity index 100% rename from modern/src/settings/CommandPage.jsx rename to src/settings/CommandPage.jsx diff --git a/modern/src/settings/CommandsPage.jsx b/src/settings/CommandsPage.jsx similarity index 100% rename from modern/src/settings/CommandsPage.jsx rename to src/settings/CommandsPage.jsx diff --git a/modern/src/settings/ComputedAttributePage.jsx b/src/settings/ComputedAttributePage.jsx similarity index 100% rename from modern/src/settings/ComputedAttributePage.jsx rename to src/settings/ComputedAttributePage.jsx diff --git a/modern/src/settings/ComputedAttributesPage.jsx b/src/settings/ComputedAttributesPage.jsx similarity index 100% rename from modern/src/settings/ComputedAttributesPage.jsx rename to src/settings/ComputedAttributesPage.jsx diff --git a/modern/src/settings/DeviceConnectionsPage.jsx b/src/settings/DeviceConnectionsPage.jsx similarity index 100% rename from modern/src/settings/DeviceConnectionsPage.jsx rename to src/settings/DeviceConnectionsPage.jsx diff --git a/modern/src/settings/DevicePage.jsx b/src/settings/DevicePage.jsx similarity index 100% rename from modern/src/settings/DevicePage.jsx rename to src/settings/DevicePage.jsx diff --git a/modern/src/settings/DevicesPage.jsx b/src/settings/DevicesPage.jsx similarity index 100% rename from modern/src/settings/DevicesPage.jsx rename to src/settings/DevicesPage.jsx diff --git a/modern/src/settings/DriverPage.jsx b/src/settings/DriverPage.jsx similarity index 100% rename from modern/src/settings/DriverPage.jsx rename to src/settings/DriverPage.jsx diff --git a/modern/src/settings/DriversPage.jsx b/src/settings/DriversPage.jsx similarity index 100% rename from modern/src/settings/DriversPage.jsx rename to src/settings/DriversPage.jsx diff --git a/modern/src/settings/GeofencePage.jsx b/src/settings/GeofencePage.jsx similarity index 100% rename from modern/src/settings/GeofencePage.jsx rename to src/settings/GeofencePage.jsx diff --git a/modern/src/settings/GroupConnectionsPage.jsx b/src/settings/GroupConnectionsPage.jsx similarity index 100% rename from modern/src/settings/GroupConnectionsPage.jsx rename to src/settings/GroupConnectionsPage.jsx diff --git a/modern/src/settings/GroupPage.jsx b/src/settings/GroupPage.jsx similarity index 100% rename from modern/src/settings/GroupPage.jsx rename to src/settings/GroupPage.jsx diff --git a/modern/src/settings/GroupsPage.jsx b/src/settings/GroupsPage.jsx similarity index 100% rename from modern/src/settings/GroupsPage.jsx rename to src/settings/GroupsPage.jsx diff --git a/modern/src/settings/MaintenancePage.jsx b/src/settings/MaintenancePage.jsx similarity index 100% rename from modern/src/settings/MaintenancePage.jsx rename to src/settings/MaintenancePage.jsx diff --git a/modern/src/settings/MaintenancesPage.jsx b/src/settings/MaintenancesPage.jsx similarity index 100% rename from modern/src/settings/MaintenancesPage.jsx rename to src/settings/MaintenancesPage.jsx diff --git a/modern/src/settings/NotificationPage.jsx b/src/settings/NotificationPage.jsx similarity index 100% rename from modern/src/settings/NotificationPage.jsx rename to src/settings/NotificationPage.jsx diff --git a/modern/src/settings/NotificationsPage.jsx b/src/settings/NotificationsPage.jsx similarity index 100% rename from modern/src/settings/NotificationsPage.jsx rename to src/settings/NotificationsPage.jsx diff --git a/modern/src/settings/PreferencesPage.jsx b/src/settings/PreferencesPage.jsx similarity index 100% rename from modern/src/settings/PreferencesPage.jsx rename to src/settings/PreferencesPage.jsx diff --git a/modern/src/settings/ServerPage.jsx b/src/settings/ServerPage.jsx similarity index 100% rename from modern/src/settings/ServerPage.jsx rename to src/settings/ServerPage.jsx diff --git a/modern/src/settings/SharePage.jsx b/src/settings/SharePage.jsx similarity index 100% rename from modern/src/settings/SharePage.jsx rename to src/settings/SharePage.jsx diff --git a/modern/src/settings/UserConnectionsPage.jsx b/src/settings/UserConnectionsPage.jsx similarity index 100% rename from modern/src/settings/UserConnectionsPage.jsx rename to src/settings/UserConnectionsPage.jsx diff --git a/modern/src/settings/UserPage.jsx b/src/settings/UserPage.jsx similarity index 100% rename from modern/src/settings/UserPage.jsx rename to src/settings/UserPage.jsx diff --git a/modern/src/settings/UsersPage.jsx b/src/settings/UsersPage.jsx similarity index 100% rename from modern/src/settings/UsersPage.jsx rename to src/settings/UsersPage.jsx diff --git a/modern/src/settings/common/useSettingsStyles.js b/src/settings/common/useSettingsStyles.js similarity index 100% rename from modern/src/settings/common/useSettingsStyles.js rename to src/settings/common/useSettingsStyles.js diff --git a/modern/src/settings/components/AddAttributeDialog.jsx b/src/settings/components/AddAttributeDialog.jsx similarity index 100% rename from modern/src/settings/components/AddAttributeDialog.jsx rename to src/settings/components/AddAttributeDialog.jsx diff --git a/modern/src/settings/components/BaseCommandView.jsx b/src/settings/components/BaseCommandView.jsx similarity index 100% rename from modern/src/settings/components/BaseCommandView.jsx rename to src/settings/components/BaseCommandView.jsx diff --git a/modern/src/settings/components/CollectionActions.jsx b/src/settings/components/CollectionActions.jsx similarity index 100% rename from modern/src/settings/components/CollectionActions.jsx rename to src/settings/components/CollectionActions.jsx diff --git a/modern/src/settings/components/CollectionFab.jsx b/src/settings/components/CollectionFab.jsx similarity index 100% rename from modern/src/settings/components/CollectionFab.jsx rename to src/settings/components/CollectionFab.jsx diff --git a/modern/src/settings/components/EditAttributesAccordion.jsx b/src/settings/components/EditAttributesAccordion.jsx similarity index 100% rename from modern/src/settings/components/EditAttributesAccordion.jsx rename to src/settings/components/EditAttributesAccordion.jsx diff --git a/modern/src/settings/components/EditItemView.jsx b/src/settings/components/EditItemView.jsx similarity index 100% rename from modern/src/settings/components/EditItemView.jsx rename to src/settings/components/EditItemView.jsx diff --git a/modern/src/settings/components/SearchHeader.jsx b/src/settings/components/SearchHeader.jsx similarity index 100% rename from modern/src/settings/components/SearchHeader.jsx rename to src/settings/components/SearchHeader.jsx diff --git a/modern/src/settings/components/SettingsMenu.jsx b/src/settings/components/SettingsMenu.jsx similarity index 100% rename from modern/src/settings/components/SettingsMenu.jsx rename to src/settings/components/SettingsMenu.jsx diff --git a/modern/src/store/calendars.js b/src/store/calendars.js similarity index 100% rename from modern/src/store/calendars.js rename to src/store/calendars.js diff --git a/modern/src/store/devices.js b/src/store/devices.js similarity index 100% rename from modern/src/store/devices.js rename to src/store/devices.js diff --git a/modern/src/store/drivers.js b/src/store/drivers.js similarity index 100% rename from modern/src/store/drivers.js rename to src/store/drivers.js diff --git a/modern/src/store/errors.js b/src/store/errors.js similarity index 100% rename from modern/src/store/errors.js rename to src/store/errors.js diff --git a/modern/src/store/events.js b/src/store/events.js similarity index 100% rename from modern/src/store/events.js rename to src/store/events.js diff --git a/modern/src/store/geofences.js b/src/store/geofences.js similarity index 100% rename from modern/src/store/geofences.js rename to src/store/geofences.js diff --git a/modern/src/store/groups.js b/src/store/groups.js similarity index 100% rename from modern/src/store/groups.js rename to src/store/groups.js diff --git a/modern/src/store/index.js b/src/store/index.js similarity index 100% rename from modern/src/store/index.js rename to src/store/index.js diff --git a/modern/src/store/maintenances.js b/src/store/maintenances.js similarity index 100% rename from modern/src/store/maintenances.js rename to src/store/maintenances.js diff --git a/modern/src/store/reports.js b/src/store/reports.js similarity index 100% rename from modern/src/store/reports.js rename to src/store/reports.js diff --git a/modern/src/store/session.js b/src/store/session.js similarity index 100% rename from modern/src/store/session.js rename to src/store/session.js diff --git a/modern/src/store/throttleMiddleware.js b/src/store/throttleMiddleware.js similarity index 100% rename from modern/src/store/throttleMiddleware.js rename to src/store/throttleMiddleware.js diff --git a/modern/vite.config.js b/vite.config.js similarity index 100% rename from modern/vite.config.js rename to vite.config.js