aboutsummaryrefslogtreecommitdiff
path: root/modern
diff options
context:
space:
mode:
Diffstat (limited to 'modern')
-rw-r--r--modern/src/App.js2
-rw-r--r--modern/src/LoginPage.js143
-rw-r--r--modern/src/Logo.js31
-rw-r--r--modern/src/Theme.js50
-rw-r--r--modern/src/theme/dimensions.js7
-rw-r--r--modern/src/theme/index.js12
-rw-r--r--modern/src/theme/overrides.js48
-rw-r--r--modern/src/theme/palette.js19
8 files changed, 188 insertions, 124 deletions
diff --git a/modern/src/App.js b/modern/src/App.js
index 7ff090ac..7db5f128 100644
--- a/modern/src/App.js
+++ b/modern/src/App.js
@@ -32,7 +32,7 @@ import MaintenancePage from './settings/MaintenancePage';
import StatisticsPage from './admin/StatisticsPage';
import CachingController from './CachingController';
-import theme from './Theme';
+import theme from './theme';
const App = () => {
const initialized = useSelector(state => !!state.session.server && !!state.session.user);
diff --git a/modern/src/LoginPage.js b/modern/src/LoginPage.js
index 068b1565..18638d21 100644
--- a/modern/src/LoginPage.js
+++ b/modern/src/LoginPage.js
@@ -2,21 +2,13 @@ import React, { useState } from 'react';
import { useDispatch } from 'react-redux';
import { useHistory } from 'react-router-dom';
import { sessionActions } from './store';
-import { Grid,
- useMediaQuery,
- makeStyles,
- InputLabel,
- Select,
- MenuItem,
- FormControl,
- Button,
- TextField,
- Paper } from '@material-ui/core';
+import { Grid, useMediaQuery, makeStyles, InputLabel, Select, MenuItem, FormControl, Button, TextField, Paper } from '@material-ui/core';
import { useTheme } from '@material-ui/core/styles';
import RegisterDialog from './RegisterDialog';
import { useSelector } from 'react-redux';
import t from './common/localization';
+import Logo from './Logo';
const useStyles = makeStyles(theme => ({
root: {
@@ -28,7 +20,11 @@ const useStyles = makeStyles(theme => ({
justifyContent: 'center',
alignItems: 'center',
background: theme.palette.common.purple,
- width: '28%',
+ paddingBottom: theme.spacing(5),
+ width: `${theme.dimensions.sidebarWidth}%`,
+ [theme.breakpoints.down('md')]: {
+ width: `${theme.dimensions.minSidebarWidth}px`,
+ },
[theme.breakpoints.down('xs')]: {
width: '0px',
},
@@ -38,19 +34,13 @@ const useStyles = makeStyles(theme => ({
flexDirection: 'column',
justifyContent: 'center',
alignItems: 'center',
- width: '100%',
- padding: theme.spacing(8, 4),
+ flex: 1,
+ //padding: theme.spacing(0, 25, 0, 0),
boxShadow: '-2px 0px 16px rgba(0, 0, 0, 0.25)'
},
form: {
- marginTop: theme.spacing(1),
- },
- submit: {
- margin: theme.spacing(3, 0, 2),
+ maxWidth: theme.dimensions.maxFormWidth,
},
- register: {
- marginTop: theme.spacing(2),
- }
}));
const LoginPage = () => {
@@ -99,66 +89,73 @@ const LoginPage = () => {
return (
<main className={classes.root}>
<div className={classes.sidebar}>
- {!matches && <img src='/logo.svg' alt='Traccar' />}
+ {!matches && <Logo fill='#fff'/> }
</div>
<Paper className={classes.paper}>
- {matches && <img src='/logo_main.svg' alt='Traccar' />}
<form className={classes.form} onSubmit={handleLogin}>
- <TextField
- margin='normal'
- required
- fullWidth
- error={failed}
- label={t('userEmail')}
- name='email'
- value={email}
- autoComplete='email'
- autoFocus
- onChange={handleEmailChange}
- helperText={failed && 'Invalid username or password'}
- variant='filled' />
- <TextField
- margin='normal'
- required
- fullWidth
- error={failed}
- label={t('userPassword')}
- name='password'
- value={password}
- type='password'
- autoComplete='current-password'
- onChange={handlePasswordChange}
- variant='filled' />
- <Button
- type='submit'
- variant='contained'
- color='secondary'
- className={classes.submit}
- disabled={!email || !password}
- fullWidth>
- {t('loginLogin')}
- </Button>
- <Grid container>
- <Grid item xs={3}>
- <Button className={classes.register} onClick={handleRegister} disabled={!registrationEnabled} color="secondary">
- {t('loginRegister')}
- </Button>
+ <Grid container direction='column' spacing={3}>
+ <Grid item>
+ {matches && <Logo fill='#333366'/>}
</Grid>
- <Grid item xs={9}>
- <FormControl variant="filled" margin="normal" fullWidth>
- <InputLabel>{t('loginLanguage')}</InputLabel>
- <Select>
- <MenuItem value="en">English</MenuItem>
- </Select>
- </FormControl>
+ <Grid item>
+ <TextField
+ required
+ fullWidth
+ error={failed}
+ label={t('userEmail')}
+ name='email'
+ value={email}
+ autoComplete='email'
+ autoFocus
+ onChange={handleEmailChange}
+ helperText={failed && 'Invalid username or password'}
+ variant='filled' />
+ </Grid>
+ <Grid item>
+ <TextField
+ required
+ fullWidth
+ error={failed}
+ label={t('userPassword')}
+ name='password'
+ value={password}
+ type='password'
+ autoComplete='current-password'
+ onChange={handlePasswordChange}
+ variant='filled' />
</Grid>
- </Grid>
- <Grid container justify="flex-end">
<Grid item>
- <Button color="primary">
- {t('loginReset')}
- </Button>
+ <Button
+ type='submit'
+ variant='contained'
+ color='secondary'
+ disabled={!email || !password}
+ fullWidth>
+ {t('loginLogin')}
+ </Button>
+ </Grid>
+ <Grid item container>
+ <Grid item>
+ <Button onClick={handleRegister} disabled={!registrationEnabled} color="secondary">
+ {t('loginRegister')}
+ </Button>
+ </Grid>
+ <Grid item xs>
+ <FormControl variant="filled" fullWidth>
+ <InputLabel>{t('loginLanguage')}</InputLabel>
+ <Select>
+ <MenuItem value="en">English</MenuItem>
+ </Select>
+ </FormControl>
+ </Grid>
</Grid>
+ <Grid container justify="flex-end">
+ <Grid item>
+ <Button color="primary">
+ {t('loginReset')}
+ </Button>
+ </Grid>
+ </Grid>
</Grid>
</form>
</Paper>
diff --git a/modern/src/Logo.js b/modern/src/Logo.js
new file mode 100644
index 00000000..bea14d8c
--- /dev/null
+++ b/modern/src/Logo.js
@@ -0,0 +1,31 @@
+import React from 'react';
+
+const Logo = ({ fill }) => {
+
+ return (
+ <svg xmlns='http://www.w3.org/2000/svg' height="64" viewBox="0 0 240 64" width="240" version="1.1">
+ <g id="layer1">
+ <rect id="rect3778" height="64" width="236.1" y="0" x="0" fill="none"/>
+ <ellipse id="path3038" rx="28.995" ry="28.995" transform="rotate(-30)" cy="43.713" cx="11.713" stroke-width="10.699" fill="#fff"/>
+ <g fill= {fill}>
+ <circle id="path2993" strokeWidth="1.3262" transform="rotate(-30)" cy="43.713" cx="9.4364" r="2.2765"/>
+ <path id="path3004" d="m37.012 24.177-2.8428 3.6128c0.66345 0.52205 1.3255 1.1576 1.7734 1.9333 0.4479 0.77578 0.66726 1.6669 0.78764 2.5025l4.5502-0.65558c-0.193-1.42-0.633-2.804-1.394-4.123s-1.74-2.391-2.874-3.27z" strokeWidth="1.0095"/>
+ <path id="path3014" d="m42.504 16.9-2.8428 3.6128c1.607 1.2355 3.0914 2.7935 4.1679 4.6581s1.6835 3.9291 1.95 5.9386l4.5502-0.65558c-0.33967-2.5954-1.1669-5.1513-2.5573-7.5594-1.3903-2.4081-3.1901-4.4025-5.268-5.9944z" strokeWidth="1.0095"/>
+ <path id="path3036" d="m2.607 52.819a9.1058 9.1058 0 0 1 -7.8859 -4.5529 9.1058 9.1058 0 0 1 0 -9.1058 9.1058 9.1058 0 0 1 7.8859 -4.5529l-2e-7 9.1058z" transform="rotate(-30)" strokeWidth="3.6204"/>
+ <path id="path3038-8" d="m17.502 6.8895c-13.868 8.0065-18.619 25.74-10.612 39.608 8.006 13.868 25.739 18.619 39.608 10.613 13.868-8.007 18.619-25.74 10.613-39.609-8.007-13.868-25.74-18.619-39.609-10.612zm1.706 2.9541c12.237-7.0648 27.884-2.8722 34.948 9.3644 7.065 12.237 2.873 27.884-9.364 34.948-12.237 7.065-27.884 2.873-34.948-9.364-7.0652-12.237-2.8726-27.884 9.364-34.948z" strokeWidth="1.0095"/>
+ <g id="text3003" ariaLabel="Traccar">
+ <path id="path4172" d="m89.719 48.671h-3.915v-30.192h-10.663v-3.4775h25.241v3.4775h-10.663v30.192z"/>
+ <path id="path4174" d="m116.36 22.969q1.6812 0 3.0169 0.27636l-0.52968 3.5466q-1.566-0.34544-2.7636-0.34544-3.063 0-5.2508 2.4872-2.1648 2.4872-2.1648 6.195v13.541h-3.8229v-25.241h3.1551l0.43756 4.675h0.18424q1.4048-2.4642 3.3854-3.7999t4.3526-1.3357z"/>
+ <path id="path4176" d="m139.62 48.671-0.75998-3.5926h-0.18424q-1.8884 2.3721-3.7769 3.2242-1.8654 0.82907-4.675 0.82907-3.7538 0-5.8956-1.9345-2.1187-1.9345-2.1187-5.5041 0-7.6459 12.229-8.0143l4.2835-0.13818v-1.566q0-2.9708-1.2897-4.3756-1.2666-1.4278-4.0763-1.4278-3.1551 0-7.1392 1.9345l-1.1745-2.9248q1.8654-1.0133 4.0762-1.589 2.2339-0.57574 4.4678-0.57574 4.5138 0 6.6786 2.0036 2.1878 2.0036 2.1878 6.4253v17.226h-2.8326zm-8.6361-2.6945q3.5696 0 5.5962-1.9575 2.0496-1.9575 2.0496-5.4811v-2.2799l-3.8229 0.16121q-4.5599 0.16121-6.5865 1.4278-2.0036 1.2436-2.0036 3.892 0 2.0727 1.2436 3.1551 1.2666 1.0824 3.5236 1.0824z"/>
+ <path id="path4178" d="m160.44 49.131q-5.4811 0-8.498-3.3623-2.9939-3.3854-2.9939-9.5573 0-6.3332 3.0399-9.7876 3.063-3.4545 8.7052-3.4545 1.8194 0 3.6387 0.3915t2.8557 0.92119l-1.1745 3.2472q-1.2666-0.50665-2.7636-0.82907-1.4969-0.34544-2.6484-0.34544-7.6919 0-7.6919 9.8106 0 4.652 1.8654 7.1392 1.8884 2.4872 5.5732 2.4872 3.1551 0 6.4713-1.3588v3.3854q-2.5333 1.3127-6.3792 1.3127z"/>
+ <path id="path4180" d="m182.92 49.131q-5.4811 0-8.498-3.3623-2.9939-3.3854-2.9939-9.5573 0-6.3332 3.0399-9.7876 3.063-3.4545 8.7052-3.4545 1.8193 0 3.6387 0.3915t2.8557 0.92119l-1.1745 3.2472q-1.2666-0.50665-2.7636-0.82907-1.4969-0.34544-2.6484-0.34544-7.6919 0-7.6919 9.8106 0 4.652 1.8654 7.1392 1.8884 2.4872 5.5732 2.4872 3.1551 0 6.4714-1.3588v3.3854q-2.5333 1.3127-6.3792 1.3127z"/>
+ <path id="path4182" d="m210.83 48.671-0.75998-3.5926h-0.18424q-1.8884 2.3721-3.7769 3.2242-1.8654 0.82907-4.675 0.82907-3.7538 0-5.8956-1.9345-2.1187-1.9345-2.1187-5.5041 0-7.6459 12.229-8.0143l4.2835-0.13818v-1.566q0-2.9708-1.2897-4.3756-1.2666-1.4278-4.0762-1.4278-3.1551 0-7.1392 1.9345l-1.1745-2.9248q1.8654-1.0133 4.0762-1.589 2.2339-0.57574 4.4678-0.57574 4.5138 0 6.6786 2.0036 2.1878 2.0036 2.1878 6.4253v17.226h-2.8326zm-8.6361-2.6945q3.5696 0 5.5962-1.9575 2.0496-1.9575 2.0496-5.4811v-2.2799l-3.8229 0.16121q-4.5599 0.16121-6.5865 1.4278-2.0036 1.2436-2.0036 3.892 0 2.0727 1.2436 3.1551 1.2666 1.0824 3.5235 1.0824z"/>
+ <path id="path4184" d="m233.08 22.969q1.6812 0 3.0169 0.27636l-0.52968 3.5466q-1.566-0.34544-2.7636-0.34544-3.0629 0-5.2508 2.4872-2.1648 2.4872-2.1648 6.195v13.541h-3.8229v-25.241h3.1551l0.43757 4.675h0.18423q1.4048-2.4642 3.3854-3.7999t4.3526-1.3357z"/>
+ </g>
+ </g>
+ </g>
+ </svg>
+ )
+}
+
+export default Logo;
diff --git a/modern/src/Theme.js b/modern/src/Theme.js
deleted file mode 100644
index 4d534a43..00000000
--- a/modern/src/Theme.js
+++ /dev/null
@@ -1,50 +0,0 @@
-import { createMuiTheme } from '@material-ui/core/styles';
-
-const traccarPurple = '#333366';
-const traccarGreen = '#4CAF50';
-const traccarWhite = '#FFF';
-
-export default createMuiTheme({
- palette: {
- common: {
- purple: traccarPurple,
- green: traccarGreen
- },
- primary: {
- main: traccarPurple
- },
- secondary: {
- main: traccarGreen,
- contrastText: traccarWhite
- }
- },
- overrides: {
- MuiFormControl: {
- root: {
- height: '42px',
- }
- },
- MuiFilledInput: {
- root: {
- height: '42px',
- borderRadius: '4px'
- },
- underline: {
- "&:before": {
- borderBottom: 'none',
- },
- "&:after": {
- borderBottom: 'none',
- },
- "&:hover:before": {
- borderBottom: 'none',
- },
- }
- },
- MuiButton: {
- root: {
- height: '42px',
- }
- }
- }
-});
diff --git a/modern/src/theme/dimensions.js b/modern/src/theme/dimensions.js
new file mode 100644
index 00000000..bc20cb91
--- /dev/null
+++ b/modern/src/theme/dimensions.js
@@ -0,0 +1,7 @@
+export default {
+ inputHeight: 42,
+ borderRadius: 4,
+ maxFormWidth: 335,
+ sidebarWidth: 28,
+ minSidebarWidth: 52
+};
diff --git a/modern/src/theme/index.js b/modern/src/theme/index.js
new file mode 100644
index 00000000..5a3b2a9c
--- /dev/null
+++ b/modern/src/theme/index.js
@@ -0,0 +1,12 @@
+import { createMuiTheme } from '@material-ui/core/styles';
+import palette from './palette';
+import overrides from './overrides';
+import dimensions from './dimensions';
+
+const theme = createMuiTheme({
+ palette,
+ overrides,
+ dimensions
+});
+
+export default theme;
diff --git a/modern/src/theme/overrides.js b/modern/src/theme/overrides.js
new file mode 100644
index 00000000..021770b7
--- /dev/null
+++ b/modern/src/theme/overrides.js
@@ -0,0 +1,48 @@
+import dimensions from './dimensions';
+
+export default {
+ MuiFormControl: {
+ root: {
+ height: dimensions.inputHeight,
+ }
+ },
+ MuiInputLabel: {
+ filled: {
+ transform: 'translate(12px, 14px) scale(1)',
+ '&$shrink' :{
+ transform: 'translate(12px, -12px) scale(0.75)'
+ }
+ },
+ },
+ MuiFilledInput: {
+ root: {
+ height: dimensions.inputHeight,
+ borderRadius: dimensions.borderRadius,
+ },
+ input: {
+ height: dimensions.inputHeight,
+ borderRadius: dimensions.borderRadius,
+ paddingTop: '10px',
+ boxSizing: 'border-box',
+ '&:-webkit-autofill': {
+ WebkitBoxShadow: '0 0 0 100px #eeeeee inset',
+ },
+ },
+ underline: {
+ "&:before": {
+ borderBottom: 'none',
+ },
+ "&:after": {
+ borderBottom: 'none',
+ },
+ "&:hover:before": {
+ borderBottom: 'none',
+ },
+ }
+ },
+ MuiButton: {
+ root: {
+ height: dimensions.inputHeight,
+ }
+ }
+};
diff --git a/modern/src/theme/palette.js b/modern/src/theme/palette.js
new file mode 100644
index 00000000..24aefce1
--- /dev/null
+++ b/modern/src/theme/palette.js
@@ -0,0 +1,19 @@
+import { deepPurple, green } from '@material-ui/core/colors';
+
+const traccarPurple = deepPurple[500];
+const traccarGreen = green[500];
+const traccarWhite = '#FFF';
+
+export default {
+ common: {
+ purple: traccarPurple,
+ green: traccarGreen
+ },
+ primary: {
+ main: traccarPurple
+ },
+ secondary: {
+ main: traccarGreen,
+ contrastText: traccarWhite
+ }
+};
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-08 21:40:19 +0000