Many stuff modified

7 files changed, 23 insertions, 14 deletions

diff --git a/modern/src/MainToolbar.js b/modern/src/MainToolbar.js
index 1e4dabe..cd7abe0 100644
--- a/modern/src/MainToolbar.js
+++ b/modern/src/MainToolbar.js
@@ -8,6 +8,7 @@ import Typography from '@material-ui/core/Typography';
 import Button from '@material-ui/core/Button';
 import IconButton from '@material-ui/core/IconButton';
 import MenuIcon from '@material-ui/icons/Menu';
+import CloseIcon from '@material-ui/icons/Close';
 import Drawer from '@material-ui/core/Drawer';
 import List from '@material-ui/core/List';
 import ListItem from '@material-ui/core/ListItem';
@@ -50,12 +51,8 @@ const MainToolbar = () => {
   const openDrawer = () => { setDrawer(true); };
   const closeDrawer = () => { setDrawer(false); };
 
-  const handleLogout = async () => {
-    const response = await fetch('/api/session', { method: 'DELETE' });
-    if (response.ok) {
-      dispatch(sessionActions.updateUser(null));
-      history.push('/login');
-    }
+  const handleClose = async () => {
+    history.push ('/');
   };
 
   return (
@@ -72,7 +69,12 @@ const MainToolbar = () => {
           <Typography variant="h6" color="inherit" className={classes.flex}>
             Traccar
           </Typography>
-          <Button color="inherit" onClick={handleLogout}>{t('loginLogout')}</Button>
+          <IconButton
+            color="inherit"
+            onClick={handleClose}
+          >
+            <CloseIcon />
+          </IconButton>
         </Toolbar>
       </AppBar>
       <Drawer open={drawer} onClose={closeDrawer}>
diff --git a/modern/src/index.js b/modern/src/index.js
index 155bf62..32cf990 100644
--- a/modern/src/index.js
+++ b/modern/src/index.js
@@ -16,4 +16,4 @@ ReactDOM.render((
   </Provider>
 ), document.getElementById('root'));
 
-serviceWorker.register();
+serviceWorker.unregister();
diff --git a/modern/src/map/Map.js b/modern/src/map/Map.js
index d02fae1..8c9bf51 100644
--- a/modern/src/map/Map.js
+++ b/modern/src/map/Map.js
@@ -103,7 +103,7 @@ const Map = ({ children }) => {
       { id: 'gmapsSatellite', title: t('mapGmapsSatellite'), uri: styleGmapsSatellite() },
       { id: 'gmapsHybrid', title: t('mapGmapsHybrid'), uri: styleGmapsHybrid() },
     ], 'gmapsStreets');
-  }, [mapTilerKey]);
+  }, [locationIqKey]);
 
   useEffect(() => {
     const listener = (ready) => setMapReady(ready);
diff --git a/modern/src/map/PositionsMap.js b/modern/src/map/PositionsMap.js
index ba23289..1e7571b 100644
--- a/modern/src/map/PositionsMap.js
+++ b/modern/src/map/PositionsMap.js
@@ -22,7 +22,7 @@ const PositionsMap = ({ positions }) => {
     if (position) {
       if (position.attributes.ignition) {
         return 'green';
-      } else if (position.attributes.ignition == undefined) {
+      } else if (position.attributes.ignition === undefined) {
         return 'gray';
       } else {
         return 'red';
diff --git a/modern/src/map/StatusView.js b/modern/src/map/StatusView.js
index 5526e14..47a7516 100644
--- a/modern/src/map/StatusView.js
+++ b/modern/src/map/StatusView.js
@@ -9,9 +9,9 @@ import ListItemText from '@material-ui/core/ListItemText';
 import { useSelector } from 'react-redux';
 
 import ReplayIcon from '@material-ui/icons/Replay';
-import ExitToAppIcon from '@material-ui/icons/ExitToApp';
 import EditIcon from '@material-ui/icons/Edit';
 import DeleteIcon from '@material-ui/icons/Delete';
+import LinkIcon from '@material-ui/icons/Link';
 
 import {
   formatPosition, getStatusColor, getBatteryStatus, formatDistance, formatSpeed,
@@ -62,6 +62,11 @@ const StatusView = ({
     setRemoveDialogShown(false);
   };
 
+  const handleGotoLink = () => {
+    const url = `https://maps.google.com/maps?q=${position.latitude},${position.longitude}&z=18`;
+    window.open(url, "_blank");
+  }
+
   return (
     <>
       <Paper className={classes.paper} elevation={0} square>
@@ -106,7 +111,7 @@ const StatusView = ({
           </Grid>
           <Grid item container>
             <Grid item>
-              <Button color="secondary" onClick={handleClick}>More Info</Button>
+              <Button color="secondary" onClick={handleClick}>{t('sharedShowInfo')}</Button>
             </Grid>
             <Grid item>
               <IconButton onClick={onShowHistory}>
@@ -114,8 +119,8 @@ const StatusView = ({
               </IconButton>
             </Grid>
             <Grid item>
-              <IconButton>
-                <ExitToAppIcon />
+              <IconButton onClick={handleGotoLink}>
+                <LinkIcon />
               </IconButton>
             </Grid>
             <Grid item>
diff --git a/web/l10n/en.json b/web/l10n/en.json
index 34585d2..3721436 100644
--- a/web/l10n/en.json
+++ b/web/l10n/en.json
@@ -77,6 +77,7 @@
     "sharedNew": "New…",
     "sharedShowAddress": "Show Address",
     "sharedShowDetails": "More Details",
+    "sharedShowInfo": "More Info",
     "sharedDisabled": "Disabled",
     "sharedMaintenance": "Maintenance",
     "sharedDeviceAccumulators": "Accumulators",
diff --git a/web/l10n/es.json b/web/l10n/es.json
index d981c73..002b521 100644
--- a/web/l10n/es.json
+++ b/web/l10n/es.json
@@ -77,6 +77,7 @@
     "sharedNew": "Nuevo...",
     "sharedShowAddress": "Mostrar Dirección",
     "sharedShowDetails": "Más detalles",
+    "sharedShowInfo": "Más info",
     "sharedDisabled": "Deshabilitado",
     "sharedMaintenance": "Mantenimientos",
     "sharedDeviceAccumulators": "Acumulador",