From f0ab1c08e5b75efc6e2966841fde39a7bcfbb43e Mon Sep 17 00:00:00 2001 From: Ashutosh Bishnoi Date: Thu, 17 Jun 2021 13:56:59 +0530 Subject: Change file name from LoginPage to StartPage --- modern/src/App.js | 2 +- modern/src/LoginPage.js | 65 ---------------------- modern/src/StartPage.js | 65 ++++++++++++++++++++++ modern/src/components/registration/LoginForm.js | 8 +-- modern/src/components/registration/RegisterForm.js | 6 +- 5 files changed, 73 insertions(+), 73 deletions(-) delete mode 100644 modern/src/LoginPage.js create mode 100644 modern/src/StartPage.js diff --git a/modern/src/App.js b/modern/src/App.js index 36cd2b5..3641339 100644 --- a/modern/src/App.js +++ b/modern/src/App.js @@ -48,7 +48,7 @@ const App = () => { - + {!initialized ? () : ( diff --git a/modern/src/LoginPage.js b/modern/src/LoginPage.js deleted file mode 100644 index 4c19dff..0000000 --- a/modern/src/LoginPage.js +++ /dev/null @@ -1,65 +0,0 @@ -import React from 'react'; -import { useMediaQuery, makeStyles, Paper } from '@material-ui/core'; -import { useTheme } from '@material-ui/core/styles'; - -const useStyles = makeStyles(theme => ({ - root: { - display: 'flex', - height: '100vh', - }, - sidebar: { - display: 'flex', - justifyContent: 'center', - alignItems: 'center', - color: theme.palette.secondary.contrastText, - background: theme.palette.common.purple, - paddingBottom: theme.spacing(5), - width: theme.dimensions.sidebarWidth, - [theme.breakpoints.down('md')]: { - width: theme.dimensions.tabletSidebarWidth, - }, - [theme.breakpoints.down('xs')]: { - width: '0px', - }, - }, - paper: { - display:'flex', - flexDirection: 'column', - justifyContent: 'center', - alignItems: 'center', - flex: 1, - boxShadow: '-2px 0px 16px rgba(0, 0, 0, 0.25)', - [theme.breakpoints.up('lg')]: { - padding: theme.spacing(0, 25, 0, 0) - }, - }, - form: { - maxWidth: theme.spacing(52), - padding: theme.spacing(5), - width: "100%", - }, -})); - -const LoginPage = ({ children }) => { - const classes = useStyles(); - const theme = useTheme(); - - return ( -
-
- {!useMediaQuery(theme.breakpoints.down('md')) && - - - - } -
- -
- { children } -
-
-
- ) -} - -export default LoginPage; diff --git a/modern/src/StartPage.js b/modern/src/StartPage.js new file mode 100644 index 0000000..0a08617 --- /dev/null +++ b/modern/src/StartPage.js @@ -0,0 +1,65 @@ +import React from 'react'; +import { useMediaQuery, makeStyles, Paper } from '@material-ui/core'; +import { useTheme } from '@material-ui/core/styles'; + +const useStyles = makeStyles(theme => ({ + root: { + display: 'flex', + height: '100vh', + }, + sidebar: { + display: 'flex', + justifyContent: 'center', + alignItems: 'center', + color: theme.palette.secondary.contrastText, + background: theme.palette.common.purple, + paddingBottom: theme.spacing(5), + width: theme.dimensions.sidebarWidth, + [theme.breakpoints.down('md')]: { + width: theme.dimensions.tabletSidebarWidth, + }, + [theme.breakpoints.down('xs')]: { + width: '0px', + }, + }, + paper: { + display:'flex', + flexDirection: 'column', + justifyContent: 'center', + alignItems: 'center', + flex: 1, + boxShadow: '-2px 0px 16px rgba(0, 0, 0, 0.25)', + [theme.breakpoints.up('lg')]: { + padding: theme.spacing(0, 25, 0, 0) + }, + }, + form: { + maxWidth: theme.spacing(52), + padding: theme.spacing(5), + width: "100%", + }, +})); + +const StartPage = ({ children }) => { + const classes = useStyles(); + const theme = useTheme(); + + return ( +
+
+ {!useMediaQuery(theme.breakpoints.down('md')) && + + + + } +
+ +
+ { children } +
+
+
+ ) +} + +export default StartPage; diff --git a/modern/src/components/registration/LoginForm.js b/modern/src/components/registration/LoginForm.js index 8de8b5e..d2a57a2 100644 --- a/modern/src/components/registration/LoginForm.js +++ b/modern/src/components/registration/LoginForm.js @@ -5,7 +5,7 @@ import { useDispatch, useSelector } from 'react-redux'; import { useHistory } from 'react-router-dom'; import { sessionActions } from '../../store'; import t from '../../common/localization'; -import LoginPage from './../../LoginPage'; +import StartPage from './../../StartPage'; const useStyles = makeStyles(theme => ({ logoContainer: { @@ -58,7 +58,7 @@ const LoginForm = () => { } return ( - + {useMediaQuery(theme.breakpoints.down('md')) && @@ -124,11 +124,11 @@ const LoginForm = () => { {emailEnabled && - history.push('/resetpassword')} className={classes.resetPassword} underline="none">{t('loginReset')} + history.push('/reset-password')} className={classes.resetPassword} underline="none">{t('loginReset')} } - + ) } diff --git a/modern/src/components/registration/RegisterForm.js b/modern/src/components/registration/RegisterForm.js index 62605eb..a532d09 100644 --- a/modern/src/components/registration/RegisterForm.js +++ b/modern/src/components/registration/RegisterForm.js @@ -2,7 +2,7 @@ import React, { useState } from 'react'; import { Grid, Button, TextField, Typography, Link, makeStyles, Snackbar } from '@material-ui/core'; import { useHistory } from 'react-router-dom'; import ArrowBackIcon from '@material-ui/icons/ArrowBack'; -import LoginPage from './../../LoginPage'; +import StartPage from './../../StartPage'; import t from './../../common/localization'; const useStyles = makeStyles(theme => ({ @@ -45,7 +45,7 @@ const RegisterForm = () => { } return ( - + { - + ) } -- cgit v1.2.3