From 6bee8cb1944677f8c3ede0a0bf799c92b86e08a0 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Wed, 25 Mar 2020 00:50:37 -0700
Subject: Simple localization support

---
 modern/src/MainToolbar.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'modern/src/MainToolbar.js')

diff --git a/modern/src/MainToolbar.js b/modern/src/MainToolbar.js
index 6e2e4d6..41382b0 100644
--- a/modern/src/MainToolbar.js
+++ b/modern/src/MainToolbar.js
@@ -1,3 +1,4 @@
+import t from './common/localization'
 import React, { Component, Fragment } from 'react';
 import { withStyles } from '@material-ui/core/styles';
 import AppBar from '@material-ui/core/AppBar';
@@ -80,7 +81,7 @@ class MainToobar extends Component {
             <Typography variant="h6" color="inherit" className={classes.flex}>
               Traccar
             </Typography>
-            <Button color="inherit" onClick={this.handleLogout}>Logout</Button>
+            <Button color="inherit" onClick={this.handleLogout}>{t('loginLogout')}</Button>
           </Toolbar>
         </AppBar>
         <Drawer open={this.state.drawer} onClose={this.closeDrawer}>
@@ -95,13 +96,13 @@ class MainToobar extends Component {
                 <ListItemIcon>
                   <DashboardIcon />
                 </ListItemIcon>
-                <ListItemText primary="Dashboard" />
+                <ListItemText primary={t('mapTitle')} />
               </ListItem>
               <ListItem button disabled>
                 <ListItemIcon>
                   <BarChartIcon />
                 </ListItemIcon>
-                <ListItemText primary="Reports" />
+                <ListItemText primary={t('reportTitle')} />
               </ListItem>
             </List>
             <Divider />
@@ -110,7 +111,7 @@ class MainToobar extends Component {
                 <ListItemIcon>
                   <SettingsIcon />
                 </ListItemIcon>
-                <ListItemText primary="Settings" />
+                <ListItemText primary={t('settingsTitle')} />
               </ListItem>
             </List>
           </div>
-- 
cgit v1.2.3


From 94e7e64ec481cd004546f02869c1c0dd2904a406 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Wed, 25 Mar 2020 23:50:06 -0700
Subject: Add menu options

---
 modern/src/App.js             |  2 ++
 modern/src/MainToolbar.js     | 64 ++++++++++++++++++++++++++++++++++++++++---
 modern/src/RouteReportPage.js | 23 ++++++++++++++++
 3 files changed, 85 insertions(+), 4 deletions(-)
 create mode 100644 modern/src/RouteReportPage.js

(limited to 'modern/src/MainToolbar.js')

diff --git a/modern/src/App.js b/modern/src/App.js
index 31b8b69..0a7ad12 100644
--- a/modern/src/App.js
+++ b/modern/src/App.js
@@ -3,6 +3,7 @@ import { Switch, Route } from 'react-router-dom'
 import CssBaseline from '@material-ui/core/CssBaseline';
 import MainPage from './MainPage';
 import LoginPage from './LoginPage';
+import RouteReportPage from './RouteReportPage';
 
 class App extends Component {
   render() {
@@ -12,6 +13,7 @@ class App extends Component {
         <Switch>
           <Route exact path='/' component={MainPage} />
           <Route exact path='/login' component={LoginPage} />
+          <Route exact path='/reports/route' component={RouteReportPage} />
         </Switch>
       </Fragment>
     );
diff --git a/modern/src/MainToolbar.js b/modern/src/MainToolbar.js
index 41382b0..fc3281c 100644
--- a/modern/src/MainToolbar.js
+++ b/modern/src/MainToolbar.js
@@ -9,6 +9,7 @@ import IconButton from '@material-ui/core/IconButton';
 import MenuIcon from '@material-ui/icons/Menu';
 import Drawer from '@material-ui/core/Drawer';
 import List from '@material-ui/core/List';
+import ListSubheader from '@material-ui/core/ListSubheader';
 import Divider from '@material-ui/core/Divider';
 import ListItem from '@material-ui/core/ListItem';
 import ListItemIcon from '@material-ui/core/ListItemIcon';
@@ -92,26 +93,81 @@ class MainToobar extends Component {
             onClick={this.closeDrawer}
             onKeyDown={this.closeDrawer}>
             <List>
-              <ListItem button>
+              <ListItem button onClick={() => this.props.history.push('/')}>
                 <ListItemIcon>
                   <DashboardIcon />
                 </ListItemIcon>
                 <ListItemText primary={t('mapTitle')} />
               </ListItem>
+            </List>
+            <Divider />
+            <List
+              subheader={
+                <ListSubheader>
+                  {t('reportTitle')}
+                </ListSubheader>
+              }>
+              <ListItem button onClick={() => this.props.history.push('/reports/route')}>
+                <ListItemIcon>
+                  <BarChartIcon />
+                </ListItemIcon>
+                <ListItemText primary={t('reportRoute')} />
+              </ListItem>
               <ListItem button disabled>
                 <ListItemIcon>
                   <BarChartIcon />
                 </ListItemIcon>
-                <ListItemText primary={t('reportTitle')} />
+                <ListItemText primary={t('reportEvents')} />
+              </ListItem>
+              <ListItem button disabled>
+                <ListItemIcon>
+                  <BarChartIcon />
+                </ListItemIcon>
+                <ListItemText primary={t('reportTrips')} />
+              </ListItem>
+              <ListItem button disabled>
+                <ListItemIcon>
+                  <BarChartIcon />
+                </ListItemIcon>
+                <ListItemText primary={t('reportStops')} />
+              </ListItem>
+              <ListItem button disabled>
+                <ListItemIcon>
+                  <BarChartIcon />
+                </ListItemIcon>
+                <ListItemText primary={t('reportSummary')} />
+              </ListItem>
+              <ListItem button disabled>
+                <ListItemIcon>
+                  <BarChartIcon />
+                </ListItemIcon>
+                <ListItemText primary={t('reportChart')} />
               </ListItem>
             </List>
             <Divider />
-            <List>
+            <List
+              subheader={
+                <ListSubheader>
+                  {t('settingsTitle')}
+                </ListSubheader>
+              }>
+              <ListItem button disabled>
+                <ListItemIcon>
+                  <SettingsIcon />
+                </ListItemIcon>
+                <ListItemText primary={t('settingsUser')} />
+              </ListItem>
+              <ListItem button disabled>
+                <ListItemIcon>
+                  <SettingsIcon />
+                </ListItemIcon>
+                <ListItemText primary={t('settingsServer')} />
+              </ListItem>
               <ListItem button disabled>
                 <ListItemIcon>
                   <SettingsIcon />
                 </ListItemIcon>
-                <ListItemText primary={t('settingsTitle')} />
+                <ListItemText primary={t('sharedNotifications')} />
               </ListItem>
             </List>
           </div>
diff --git a/modern/src/RouteReportPage.js b/modern/src/RouteReportPage.js
new file mode 100644
index 0000000..c444ffb
--- /dev/null
+++ b/modern/src/RouteReportPage.js
@@ -0,0 +1,23 @@
+import React, { Component } from 'react';
+import ContainerDimensions from 'react-container-dimensions';
+import MainToobar from './MainToolbar';
+import MainMap from './MainMap';
+import Drawer from '@material-ui/core/Drawer';
+import withStyles from '@material-ui/core/styles/withStyles';
+import SocketController from './SocketController';
+import withWidth, { isWidthUp } from '@material-ui/core/withWidth';
+import DeviceList from './DeviceList';
+
+const styles = theme => ({});
+
+class ReouteReportPage extends Component {
+  render() {
+    return (
+      <div>
+        <MainToobar history={this.props.history} />
+      </div>
+    );
+  }
+}
+
+export default withWidth()(withStyles(styles)(ReouteReportPage));
-- 
cgit v1.2.3