1 files changed, 39 insertions, 32 deletions

diff --git a/modern/src/components/registration/LoginForm.js b/modern/src/components/registration/LoginForm.js
index 382b4fd..e083541 100644
--- a/modern/src/components/registration/LoginForm.js
+++ b/modern/src/components/registration/LoginForm.js
@@ -1,24 +1,25 @@
 import React, { useState } from 'react';
-import { Grid, useMediaQuery, makeStyles, InputLabel, Select, MenuItem, FormControl, Button, TextField, Link } from '@material-ui/core';
+import {
+  Grid, useMediaQuery, makeStyles, InputLabel, Select, MenuItem, FormControl, Button, TextField, Link,
+} from '@material-ui/core';
 import { useTheme } from '@material-ui/core/styles';
 import { useDispatch, useSelector } from 'react-redux';
 import { useHistory } from 'react-router-dom';
 import { sessionActions } from '../../store';
 import t from '../../common/localization';
-import StartPage from './../../StartPage';
+import StartPage from '../../StartPage';
 
-const useStyles = makeStyles(theme => ({
+const useStyles = makeStyles((theme) => ({
   logoContainer: {
     textAlign: 'center',
     color: theme.palette.primary.main,
   },
   resetPassword: {
     cursor: 'pointer',
-  }
+  },
 }));
 
 const LoginForm = () => {
-
   const classes = useStyles();
   const dispatch = useDispatch();
   const history = useHistory();
@@ -27,16 +28,16 @@ const LoginForm = () => {
   const [failed, setFailed] = useState(false);
   const [email, setEmail] = useState('');
   const [password, setPassword] = useState('');
-  const registrationEnabled =  useSelector(state => state.session.server ? state.session.server['registration'] : false);
-  const emailEnabled =  useSelector(state => state.session.server ? state.session.server['emailEnabled'] : false);
+  const registrationEnabled = useSelector((state) => (state.session.server ? state.session.server.registration : false));
+  const emailEnabled = useSelector((state) => (state.session.server ? state.session.server.emailEnabled : false));
 
   const handleEmailChange = (event) => {
     setEmail(event.target.value);
-  }
+  };
 
   const handlePasswordChange = (event) => {
     setPassword(event.target.value);
-  }
+  };
 
   const handleLogin = async (event) => {
     event.preventDefault();
@@ -49,38 +50,40 @@ const LoginForm = () => {
       setFailed(true);
       setPassword('');
     }
-  }
+  };
 
-  const handleSpecialKey = e => {
+  const handleSpecialKey = (e) => {
     if (e.keyCode === 13 && email && password) {
       handleLogin(e);
     }
-  }
+  };
 
   return (
     <StartPage>
-      <Grid container direction='column' spacing={2}>
-        {useMediaQuery(theme.breakpoints.down('md')) &&
+      <Grid container direction="column" spacing={2}>
+        {useMediaQuery(theme.breakpoints.down('md'))
+          && (
           <Grid item className={classes.logoContainer}>
             <svg height="64" width="240">
-              <use xlinkHref="/logo.svg#img"></use>
+              <use xlinkHref="/logo.svg#img" />
             </svg>
           </Grid>
-        }
+          )}
         <Grid item>
           <TextField
             required
             fullWidth
             error={failed}
             label={t('userEmail')}
-            name='email'
+            name="email"
             value={email}
-            autoComplete='email'
+            autoComplete="email"
             autoFocus
             onChange={handleEmailChange}
             onKeyUp={handleSpecialKey}
             helperText={failed && 'Invalid username or password'}
-            variant='filled' />
+            variant="filled"
+          />
         </Grid>
         <Grid item>
           <TextField
@@ -88,22 +91,24 @@ const LoginForm = () => {
             fullWidth
             error={failed}
             label={t('userPassword')}
-            name='password'
+            name="password"
             value={password}
-            type='password'
-            autoComplete='current-password'
+            type="password"
+            autoComplete="current-password"
             onChange={handlePasswordChange}
             onKeyUp={handleSpecialKey}
-            variant='filled' />
+            variant="filled"
+          />
         </Grid>
         <Grid item>
-          <Button 
+          <Button
             onClick={handleLogin}
             onKeyUp={handleSpecialKey}
-            variant='contained' 
-            color='secondary'
+            variant="contained"
+            color="secondary"
             disabled={!email || !password}
-            fullWidth>
+            fullWidth
+          >
             {t('loginLogin')}
           </Button>
         </Grid>
@@ -122,14 +127,16 @@ const LoginForm = () => {
             </FormControl>
           </Grid>
         </Grid>
-        {emailEnabled && <Grid item container justify="flex-end">
+        {emailEnabled && (
+        <Grid item container justify="flex-end">
           <Grid item>
-            <Link onClick={() => history.push('/reset-password')} className={classes.resetPassword} underline="none">{t('loginReset')}</Link>              
+            <Link onClick={() => history.push('/reset-password')} className={classes.resetPassword} underline="none">{t('loginReset')}</Link>
           </Grid>
-        </Grid>}           
+        </Grid>
+        )}
       </Grid>
     </StartPage>
-  )
-}
+  );
+};
 
 export default LoginForm;