aboutsummaryrefslogtreecommitdiff
path: root/modern/src/App.js
diff options
context:
space:
mode:
Diffstat (limited to 'modern/src/App.js')
-rw-r--r--modern/src/App.js45
1 files changed, 24 insertions, 21 deletions
diff --git a/modern/src/App.js b/modern/src/App.js
index 702006f3..6305d487 100644
--- a/modern/src/App.js
+++ b/modern/src/App.js
@@ -15,7 +15,7 @@ import NotificationsPage from './settings/NotificationsPage';
import NotificationPage from './settings/NotificationPage';
import GroupsPage from './settings/GroupsPage';
import GroupPage from './settings/GroupPage';
-import PositionPage from './main/PositionPage';
+import PositionPage from './other/PositionPage';
import EventReportPage from './reports/EventReportPage';
import ReplayPage from './other/ReplayPage';
import TripReportPage from './reports/TripReportPage';
@@ -111,39 +111,42 @@ const App = () => {
<div className={classes.page}>
<Switch>
<Route exact path="/" component={MainPage} />
- <Route exact path="/replay" component={ReplayPage} />
+
<Route exact path="/position/:id?" component={PositionPage} />
<Route exact path="/event/:id?" component={EventPage} />
- <Route exact path="/user/:id?" component={UserPage} />
- <Route exact path="/device/:id?" component={DevicePage} />
- <Route exact path="/geofence/:id?" component={GeofencePage} />
+ <Route exact path="/replay" component={ReplayPage} />
<Route exact path="/geofences" component={GeofencesPage} />
+
<Route exact path="/settings/accumulators/:deviceId?" component={AccumulatorsPage} />
- <Route exact path="/settings/preferences" component={PreferencesPage} />
- <Route exact path="/settings/notifications" component={NotificationsPage} />
- <Route exact path="/settings/notification/:id?" component={NotificationPage} />
- <Route exact path="/settings/groups" component={GroupsPage} />
- <Route exact path="/settings/group/:id?" component={GroupPage} />
- <Route exact path="/settings/drivers" component={DriversPage} />
- <Route exact path="/settings/driver/:id?" component={DriverPage} />
<Route exact path="/settings/calendars" component={CalendarsPage} />
<Route exact path="/settings/calendar/:id?" component={CalendarPage} />
+ <Route exact path="/settings/commands" component={CommandsPage} />
+ <Route exact path="/settings/command/:id?" component={CommandPage} />
+ <Route exact path="/settings/command-send/:deviceId?" component={CommandSendPage} />
<Route exact path="/settings/attributes" component={ComputedAttributesPage} />
<Route exact path="/settings/attribute/:id?" component={ComputedAttributePage} />
+ <Route exact path="/settings/device/:id?" component={DevicePage} />
+ <Route exact path="/settings/drivers" component={DriversPage} />
+ <Route exact path="/settings/driver/:id?" component={DriverPage} />
+ <Route exact path="/settings/geofence/:id?" component={GeofencePage} />
+ <Route exact path="/settings/groups" component={GroupsPage} />
+ <Route exact path="/settings/group/:id?" component={GroupPage} />
<Route exact path="/settings/maintenances" component={MaintenancesPage} />
<Route exact path="/settings/maintenance/:id?" component={MaintenancePage} />
- <Route exact path="/settings/commands" component={CommandsPage} />
- <Route exact path="/settings/command/:id?" component={CommandPage} />
- <Route exact path="/command/:deviceId?" component={CommandSendPage} />
- <Route exact path="/admin/server" component={ServerPage} />
- <Route exact path="/admin/users" component={UsersPage} />
- <Route exact path="/admin/statistics" component={StatisticsPage} />
- <Route exact path="/reports/route" component={RouteReportPage} />
+ <Route exact path="/settings/notifications" component={NotificationsPage} />
+ <Route exact path="/settings/notification/:id?" component={NotificationPage} />
+ <Route exact path="/settings/preferences" component={PreferencesPage} />
+ <Route exact path="/settings/server" component={ServerPage} />
+ <Route exact path="/settings/users" component={UsersPage} />
+ <Route exact path="/settings/user/:id?" component={UserPage} />
+
+ <Route exact path="/reports/chart" component={ChartReportPage} />
<Route exact path="/reports/event" component={EventReportPage} />
- <Route exact path="/reports/trip" component={TripReportPage} />
+ <Route exact path="/reports/route" component={RouteReportPage} />
+ <Route exact path="/reports/statistics" component={StatisticsPage} />
<Route exact path="/reports/stop" component={StopReportPage} />
<Route exact path="/reports/summary" component={SummaryReportPage} />
- <Route exact path="/reports/chart" component={ChartReportPage} />
+ <Route exact path="/reports/trip" component={TripReportPage} />
</Switch>
</div>
{!desktop && (