aboutsummaryrefslogtreecommitdiff
path: root/modern/src
diff options
context:
space:
mode:
Diffstat (limited to 'modern/src')
-rw-r--r--modern/src/App.js12
-rw-r--r--modern/src/login/LoginLayout.js (renamed from modern/src/StartPage.js)4
-rw-r--r--modern/src/login/LoginPage.js (renamed from modern/src/components/registration/LoginForm.js)16
-rw-r--r--modern/src/login/RegisterPage.js (renamed from modern/src/components/registration/RegisterForm.js)14
-rw-r--r--modern/src/login/ResetPasswordPage.js (renamed from modern/src/components/registration/ResetPasswordForm.js)16
5 files changed, 31 insertions, 31 deletions
diff --git a/modern/src/App.js b/modern/src/App.js
index e44fd412..ab13f992 100644
--- a/modern/src/App.js
+++ b/modern/src/App.js
@@ -35,9 +35,9 @@ import CommandPage from './settings/CommandPage';
import StatisticsPage from './admin/StatisticsPage';
import CachingController from './CachingController';
-import LoginForm from './components/registration/LoginForm';
-import RegisterForm from './components/registration/RegisterForm';
-import ResetPasswordForm from './components/registration/ResetPasswordForm';
+import LoginPage from './login/LoginPage';
+import RegisterPage from './login/RegisterPage';
+import ResetPasswordPage from './login/ResetPasswordPage';
import theme from './theme';
import GeofencesPage from './GeofencesPage';
@@ -109,9 +109,9 @@ const App = () => {
<SocketController />
<CachingController />
<Switch>
- <Route exact path="/login" component={LoginForm} />
- <Route exact path="/register" component={RegisterForm} />
- <Route exact path="/reset-password" component={ResetPasswordForm} />
+ <Route exact path="/login" component={LoginPage} />
+ <Route exact path="/register" component={RegisterPage} />
+ <Route exact path="/reset-password" component={ResetPasswordPage} />
<Route>
{!initialized ? (<LinearProgress />) : (
<div className={classes.root}>
diff --git a/modern/src/StartPage.js b/modern/src/login/LoginLayout.js
index 4584f26d..4a2bf43a 100644
--- a/modern/src/StartPage.js
+++ b/modern/src/login/LoginLayout.js
@@ -46,7 +46,7 @@ const useStyles = makeStyles((theme) => ({
},
}));
-const StartPage = ({ children }) => {
+const LoginLayout = ({ children }) => {
const classes = useStyles();
const theme = useTheme();
@@ -75,4 +75,4 @@ const StartPage = ({ children }) => {
);
};
-export default StartPage;
+export default LoginLayout;
diff --git a/modern/src/components/registration/LoginForm.js b/modern/src/login/LoginPage.js
index 3d030a89..64570b24 100644
--- a/modern/src/components/registration/LoginForm.js
+++ b/modern/src/login/LoginPage.js
@@ -7,10 +7,10 @@ import CachedIcon from '@material-ui/icons/Cached';
import { useTheme } from '@material-ui/core/styles';
import { useDispatch, useSelector } from 'react-redux';
import { useHistory } from 'react-router-dom';
-import { sessionActions } from '../../store';
-import { useLocalization, useTranslation } from '../../LocalizationProvider';
-import StartPage from '../../StartPage';
-import usePersistedState from '../../common/usePersistedState';
+import { sessionActions } from '../store';
+import { useLocalization, useTranslation } from '../LocalizationProvider';
+import LoginLayout from './LoginLayout';
+import usePersistedState from '../common/usePersistedState';
const useStyles = makeStyles((theme) => ({
legacy: {
@@ -27,7 +27,7 @@ const useStyles = makeStyles((theme) => ({
},
}));
-const LoginForm = () => {
+const LoginPage = () => {
const classes = useStyles();
const dispatch = useDispatch();
const history = useHistory();
@@ -71,7 +71,7 @@ const LoginForm = () => {
};
return (
- <StartPage>
+ <LoginLayout>
<Tooltip title="Switch to Legacy App" className={classes.legacy}>
<IconButton onClick={() => window.localStorage.setItem('legacyApp', true) || window.location.replace('/')}>
<CachedIcon />
@@ -163,8 +163,8 @@ const LoginForm = () => {
)}
/>
</Grid>
- </StartPage>
+ </LoginLayout>
);
};
-export default LoginForm;
+export default LoginPage;
diff --git a/modern/src/components/registration/RegisterForm.js b/modern/src/login/RegisterPage.js
index 11dd510e..f622f679 100644
--- a/modern/src/components/registration/RegisterForm.js
+++ b/modern/src/login/RegisterPage.js
@@ -4,9 +4,9 @@ import {
} from '@material-ui/core';
import { useHistory } from 'react-router-dom';
import ArrowBackIcon from '@material-ui/icons/ArrowBack';
-import StartPage from '../../StartPage';
-import { useTranslation } from '../../LocalizationProvider';
-import { snackBarDurationShortMs } from '../../common/duration';
+import LoginLayout from './LoginLayout';
+import { useTranslation } from '../LocalizationProvider';
+import { snackBarDurationShortMs } from '../common/duration';
const useStyles = makeStyles((theme) => ({
title: {
@@ -23,7 +23,7 @@ const useStyles = makeStyles((theme) => ({
},
}));
-const RegisterForm = () => {
+const RegisterPage = () => {
const classes = useStyles();
const history = useHistory();
const t = useTranslation();
@@ -45,7 +45,7 @@ const RegisterForm = () => {
};
return (
- <StartPage>
+ <LoginLayout>
<Snackbar
anchorOrigin={{ vertical: 'top', horizontal: 'center' }}
open={snackbarOpen}
@@ -119,8 +119,8 @@ const RegisterForm = () => {
</Button>
</Grid>
</Grid>
- </StartPage>
+ </LoginLayout>
);
};
-export default RegisterForm;
+export default RegisterPage;
diff --git a/modern/src/components/registration/ResetPasswordForm.js b/modern/src/login/ResetPasswordPage.js
index 6c41a9ea..27c30763 100644
--- a/modern/src/components/registration/ResetPasswordForm.js
+++ b/modern/src/login/ResetPasswordPage.js
@@ -4,10 +4,10 @@ import {
} from '@material-ui/core';
import { useHistory } from 'react-router-dom';
import ArrowBackIcon from '@material-ui/icons/ArrowBack';
-import StartPage from '../../StartPage';
-import { useTranslation } from '../../LocalizationProvider';
-import useQuery from '../../common/useQuery';
-import { snackBarDurationShortMs } from '../../common/duration';
+import LoginLayout from './LoginLayout';
+import { useTranslation } from '../LocalizationProvider';
+import useQuery from '../common/useQuery';
+import { snackBarDurationShortMs } from '../common/duration';
const useStyles = makeStyles((theme) => ({
title: {
@@ -24,7 +24,7 @@ const useStyles = makeStyles((theme) => ({
},
}));
-const ResetPasswordForm = () => {
+const ResetPasswordPage = () => {
const classes = useStyles();
const history = useHistory();
const t = useTranslation();
@@ -56,7 +56,7 @@ const ResetPasswordForm = () => {
};
return (
- <StartPage>
+ <LoginLayout>
<Snackbar
anchorOrigin={{ vertical: 'top', horizontal: 'center' }}
open={snackbarOpen}
@@ -122,8 +122,8 @@ const ResetPasswordForm = () => {
</Button>
</Grid>
</Grid>
- </StartPage>
+ </LoginLayout>
);
};
-export default ResetPasswordForm;
+export default ResetPasswordPage;