aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--modern/src/GeofencesList.js2
-rw-r--r--modern/src/admin/StatisticsPage.js11
-rw-r--r--modern/src/admin/UsersPage.js7
-rw-r--r--modern/src/settings/CalendarsPage.js7
-rw-r--r--modern/src/settings/CommandsPage.js7
-rw-r--r--modern/src/settings/ComputedAttributesPage.js7
-rw-r--r--modern/src/settings/DriversPage.js7
-rw-r--r--modern/src/settings/GroupsPage.js7
-rw-r--r--modern/src/settings/MaintenancesPage.js7
-rw-r--r--modern/src/settings/NotificationsPage.js7
-rw-r--r--modern/src/theme/palette.js7
11 files changed, 54 insertions, 22 deletions
diff --git a/modern/src/GeofencesList.js b/modern/src/GeofencesList.js
index 1883edf3..73bcb520 100644
--- a/modern/src/GeofencesList.js
+++ b/modern/src/GeofencesList.js
@@ -37,7 +37,7 @@ const GeofenceView = ({ onMenuClick }) => {
<ListItem button key={item.id} onClick={() => dispatch(devicesActions.select(item.id))}>
<ListItemText primary={item.name} />
<ListItemSecondaryAction>
- <IconButton onClick={(event) => onMenuClick(event.currentTarget, item.id)}>
+ <IconButton size="small" onClick={(event) => onMenuClick(event.currentTarget, item.id)}>
<MoreVertIcon />
</IconButton>
</ListItemSecondaryAction>
diff --git a/modern/src/admin/StatisticsPage.js b/modern/src/admin/StatisticsPage.js
index 9d075fef..c2e160dc 100644
--- a/modern/src/admin/StatisticsPage.js
+++ b/modern/src/admin/StatisticsPage.js
@@ -1,12 +1,18 @@
import React, { useState } from 'react';
import {
- FormControl, InputLabel, Select, MenuItem, TextField, Button, TableContainer, Table, TableRow, TableCell, TableHead, TableBody, Paper,
+ FormControl, InputLabel, Select, MenuItem, TextField, Button, TableContainer, Table, TableRow, TableCell, TableHead, TableBody, makeStyles,
} from '@material-ui/core';
import moment from 'moment';
import { formatDate } from '../common/formatter';
import OptionsLayout from '../settings/OptionsLayout';
import { useTranslation } from '../LocalizationProvider';
+const useStyles = makeStyles((theme) => ({
+ table: {
+ backgroundColor: theme.palette.colors.white,
+ },
+}));
+
const Filter = ({ setItems }) => {
const t = useTranslation();
@@ -97,6 +103,7 @@ const Filter = ({ setItems }) => {
};
const StatisticsPage = () => {
+ const classes = useStyles();
const t = useTranslation();
const [items, setItems] = useState([]);
@@ -104,7 +111,7 @@ const StatisticsPage = () => {
return (
<OptionsLayout>
<Filter setItems={setItems} />
- <TableContainer component={Paper}>
+ <TableContainer className={classes.table}>
<Table>
<TableHead>
<TableRow>
diff --git a/modern/src/admin/UsersPage.js b/modern/src/admin/UsersPage.js
index 289598e7..fd17bd35 100644
--- a/modern/src/admin/UsersPage.js
+++ b/modern/src/admin/UsersPage.js
@@ -10,6 +10,9 @@ import OptionsLayout from '../settings/OptionsLayout';
import { useTranslation } from '../LocalizationProvider';
const useStyles = makeStyles((theme) => ({
+ table: {
+ backgroundColor: theme.palette.colors.white,
+ },
columnAction: {
width: theme.spacing(1),
padding: theme.spacing(0, 1),
@@ -30,7 +33,7 @@ const UsersView = ({ updateTimestamp, onMenuClick }) => {
}, [updateTimestamp]);
return (
- <TableContainer>
+ <TableContainer className={classes.table}>
<Table>
<TableHead>
<TableRow>
@@ -45,7 +48,7 @@ const UsersView = ({ updateTimestamp, onMenuClick }) => {
{items.map((item) => (
<TableRow key={item.id}>
<TableCell className={classes.columnAction} padding="none">
- <IconButton onClick={(event) => onMenuClick(event.currentTarget, item.id)}>
+ <IconButton size="small" onClick={(event) => onMenuClick(event.currentTarget, item.id)}>
<MoreVertIcon />
</IconButton>
</TableCell>
diff --git a/modern/src/settings/CalendarsPage.js b/modern/src/settings/CalendarsPage.js
index 076f30ca..71611ea5 100644
--- a/modern/src/settings/CalendarsPage.js
+++ b/modern/src/settings/CalendarsPage.js
@@ -9,6 +9,9 @@ import OptionsLayout from './OptionsLayout';
import { useTranslation } from '../LocalizationProvider';
const useStyles = makeStyles((theme) => ({
+ table: {
+ backgroundColor: theme.palette.colors.white,
+ },
columnAction: {
width: theme.spacing(1),
padding: theme.spacing(0, 1),
@@ -29,7 +32,7 @@ const CalendarsView = ({ updateTimestamp, onMenuClick }) => {
}, [updateTimestamp]);
return (
- <TableContainer>
+ <TableContainer className={classes.table}>
<Table>
<TableHead>
<TableRow>
@@ -41,7 +44,7 @@ const CalendarsView = ({ updateTimestamp, onMenuClick }) => {
{items.map((item) => (
<TableRow key={item.id}>
<TableCell className={classes.columnAction} padding="none">
- <IconButton onClick={(event) => onMenuClick(event.currentTarget, item.id)}>
+ <IconButton size="small" onClick={(event) => onMenuClick(event.currentTarget, item.id)}>
<MoreVertIcon />
</IconButton>
</TableCell>
diff --git a/modern/src/settings/CommandsPage.js b/modern/src/settings/CommandsPage.js
index e8422467..ef524957 100644
--- a/modern/src/settings/CommandsPage.js
+++ b/modern/src/settings/CommandsPage.js
@@ -11,6 +11,9 @@ import { formatBoolean } from '../common/formatter';
import { prefixString } from '../common/stringUtils';
const useStyles = makeStyles((theme) => ({
+ table: {
+ backgroundColor: theme.palette.colors.white,
+ },
columnAction: {
width: theme.spacing(1),
padding: theme.spacing(0, 1),
@@ -31,7 +34,7 @@ const CommandsView = ({ updateTimestamp, onMenuClick }) => {
}, [updateTimestamp]);
return (
- <TableContainer>
+ <TableContainer className={classes.table}>
<Table>
<TableHead>
<TableRow>
@@ -45,7 +48,7 @@ const CommandsView = ({ updateTimestamp, onMenuClick }) => {
{items.map((item) => (
<TableRow key={item.id}>
<TableCell className={classes.columnAction} padding="none">
- <IconButton onClick={(event) => onMenuClick(event.currentTarget, item.id)}>
+ <IconButton size="small" onClick={(event) => onMenuClick(event.currentTarget, item.id)}>
<MoreVertIcon />
</IconButton>
</TableCell>
diff --git a/modern/src/settings/ComputedAttributesPage.js b/modern/src/settings/ComputedAttributesPage.js
index 78842e33..d9b19de0 100644
--- a/modern/src/settings/ComputedAttributesPage.js
+++ b/modern/src/settings/ComputedAttributesPage.js
@@ -10,6 +10,9 @@ import { useTranslation } from '../LocalizationProvider';
import { useAdministrator } from '../common/permissions';
const useStyles = makeStyles((theme) => ({
+ table: {
+ backgroundColor: theme.palette.colors.white,
+ },
columnAction: {
width: theme.spacing(1),
padding: theme.spacing(0, 1),
@@ -31,7 +34,7 @@ const ComputedAttributeView = ({ updateTimestamp, onMenuClick }) => {
}, [updateTimestamp]);
return (
- <TableContainer>
+ <TableContainer className={classes.table}>
<Table>
<TableHead>
<TableRow>
@@ -47,7 +50,7 @@ const ComputedAttributeView = ({ updateTimestamp, onMenuClick }) => {
<TableRow key={item.id}>
{administrator && (
<TableCell className={classes.columnAction} padding="none">
- <IconButton onClick={(event) => onMenuClick(event.currentTarget, item.id)}>
+ <IconButton size="small" onClick={(event) => onMenuClick(event.currentTarget, item.id)}>
<MoreVertIcon />
</IconButton>
</TableCell>
diff --git a/modern/src/settings/DriversPage.js b/modern/src/settings/DriversPage.js
index 11419cf1..2f0f2f07 100644
--- a/modern/src/settings/DriversPage.js
+++ b/modern/src/settings/DriversPage.js
@@ -9,6 +9,9 @@ import OptionsLayout from './OptionsLayout';
import { useTranslation } from '../LocalizationProvider';
const useStyles = makeStyles((theme) => ({
+ table: {
+ backgroundColor: theme.palette.colors.white,
+ },
columnAction: {
width: theme.spacing(1),
padding: theme.spacing(0, 1),
@@ -29,7 +32,7 @@ const DriversView = ({ updateTimestamp, onMenuClick }) => {
}, [updateTimestamp]);
return (
- <TableContainer>
+ <TableContainer className={classes.table}>
<Table>
<TableHead>
<TableRow>
@@ -42,7 +45,7 @@ const DriversView = ({ updateTimestamp, onMenuClick }) => {
{items.map((item) => (
<TableRow key={item.id}>
<TableCell className={classes.columnAction} padding="none">
- <IconButton onClick={(event) => onMenuClick(event.currentTarget, item.id)}>
+ <IconButton size="small" onClick={(event) => onMenuClick(event.currentTarget, item.id)}>
<MoreVertIcon />
</IconButton>
</TableCell>
diff --git a/modern/src/settings/GroupsPage.js b/modern/src/settings/GroupsPage.js
index 0b28e7bf..2e5fb3ef 100644
--- a/modern/src/settings/GroupsPage.js
+++ b/modern/src/settings/GroupsPage.js
@@ -9,6 +9,9 @@ import OptionsLayout from './OptionsLayout';
import { useTranslation } from '../LocalizationProvider';
const useStyles = makeStyles((theme) => ({
+ table: {
+ backgroundColor: theme.palette.colors.white,
+ },
columnAction: {
width: theme.spacing(1),
padding: theme.spacing(0, 1),
@@ -29,7 +32,7 @@ const GroupsView = ({ updateTimestamp, onMenuClick }) => {
}, [updateTimestamp]);
return (
- <TableContainer>
+ <TableContainer className={classes.table}>
<Table>
<TableHead>
<TableRow>
@@ -41,7 +44,7 @@ const GroupsView = ({ updateTimestamp, onMenuClick }) => {
{items.map((item) => (
<TableRow key={item.id}>
<TableCell className={classes.columnAction} padding="none">
- <IconButton onClick={(event) => onMenuClick(event.currentTarget, item.id)}>
+ <IconButton size="small" onClick={(event) => onMenuClick(event.currentTarget, item.id)}>
<MoreVertIcon />
</IconButton>
</TableCell>
diff --git a/modern/src/settings/MaintenancesPage.js b/modern/src/settings/MaintenancesPage.js
index 2246b090..e9f9d9cd 100644
--- a/modern/src/settings/MaintenancesPage.js
+++ b/modern/src/settings/MaintenancesPage.js
@@ -13,6 +13,9 @@ import OptionsLayout from './OptionsLayout';
import { useTranslation } from '../LocalizationProvider';
const useStyles = makeStyles((theme) => ({
+ table: {
+ backgroundColor: theme.palette.colors.white,
+ },
columnAction: {
width: theme.spacing(1),
padding: theme.spacing(0, 1),
@@ -53,7 +56,7 @@ const MaintenancesView = ({ updateTimestamp, onMenuClick }) => {
};
return (
- <TableContainer>
+ <TableContainer className={classes.table}>
<Table>
<TableHead>
<TableRow>
@@ -68,7 +71,7 @@ const MaintenancesView = ({ updateTimestamp, onMenuClick }) => {
{items.map((item) => (
<TableRow key={item.id}>
<TableCell className={classes.columnAction} padding="none">
- <IconButton onClick={(event) => onMenuClick(event.currentTarget, item.id)}>
+ <IconButton size="small" onClick={(event) => onMenuClick(event.currentTarget, item.id)}>
<MoreVertIcon />
</IconButton>
</TableCell>
diff --git a/modern/src/settings/NotificationsPage.js b/modern/src/settings/NotificationsPage.js
index 0d49d5ab..8efc8579 100644
--- a/modern/src/settings/NotificationsPage.js
+++ b/modern/src/settings/NotificationsPage.js
@@ -11,6 +11,9 @@ import OptionsLayout from './OptionsLayout';
import { useTranslation } from '../LocalizationProvider';
const useStyles = makeStyles((theme) => ({
+ table: {
+ backgroundColor: theme.palette.colors.white,
+ },
columnAction: {
width: theme.spacing(1),
padding: theme.spacing(0, 1),
@@ -42,7 +45,7 @@ const NotificationsView = ({ updateTimestamp, onMenuClick }) => {
};
return (
- <TableContainer>
+ <TableContainer className={classes.table}>
<Table>
<TableHead>
<TableRow>
@@ -57,7 +60,7 @@ const NotificationsView = ({ updateTimestamp, onMenuClick }) => {
{items.map((item) => (
<TableRow key={item.id}>
<TableCell className={classes.columnAction} padding="none">
- <IconButton onClick={(event) => onMenuClick(event.currentTarget, item.id)}>
+ <IconButton size="small" onClick={(event) => onMenuClick(event.currentTarget, item.id)}>
<MoreVertIcon />
</IconButton>
</TableCell>
diff --git a/modern/src/theme/palette.js b/modern/src/theme/palette.js
index 4b07dff5..02261950 100644
--- a/modern/src/theme/palette.js
+++ b/modern/src/theme/palette.js
@@ -3,11 +3,12 @@ export default {
main: '#1a237e',
},
secondary: {
- main: '#4CAF50',
- contrastText: '#FFFFFF',
+ main: '#4caf50',
+ contrastText: '#ffffff',
},
colors: {
- positive: '#4CAF50',
+ white: '#ffffff',
+ positive: '#4caf50',
medium: '#ffa000',
negative: '#f44336',
neutral: '#9e9e9e',
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-23 19:43:35 +0000