Skip to content
Snippets Groups Projects
Commit 32c32392 authored by Defendi Alberto's avatar Defendi Alberto
Browse files

Merge branch 'fix-test' into 'master'

Remove react-intl due failing tests

See merge request !22
parents 8d695c84 40380a73
No related branches found
No related tags found
1 merge request!22Remove react-intl due failing tests
Pipeline #11727 passed
import React, { FC } from 'react'; import React, { FC } from 'react';
import { BrowserRouter as Router, Switch, Route } from 'react-router-dom'; import { BrowserRouter as Router, Switch, Route } from 'react-router-dom';
import { HomePage } from './components/HomePage/HomePage'; import { HomePage } from 'components/HomePage/HomePage';
import { AuthUser } from './components/AuthUser/AuthUser'; import { AuthUser } from 'components/AuthUser/AuthUser';
import { LandingPage } from './components/LandingPage/LandingPage'; import { LandingPage } from 'components/LandingPage/LandingPage';
export const App: FC = () => ( export const App: FC = () => (
<Router> <Router>
......
import React, { FC } from 'react'; import React, { FC } from 'react';
import axios from 'axios'; import axios from 'axios';
import { SubmitHandler, useForm } from 'react-hook-form'; import { SubmitHandler, useForm } from 'react-hook-form';
import { useIntl } from 'react-intl';
import { createStyles, makeStyles, Theme } from '@material-ui/core/styles'; import { createStyles, makeStyles, Theme } from '@material-ui/core/styles';
import { Button } from '@material-ui/core'; import { Button } from '@material-ui/core';
import { DevTool } from '@hookform/devtools'; import { DevTool } from '@hookform/devtools';
import { InputField } from './InputField'; import { InputField } from 'components/AuthUser/SignInForm/InputField/InputField';
const useStyles = makeStyles((theme: Theme) => const useStyles = makeStyles((theme: Theme) =>
createStyles({ createStyles({
...@@ -54,7 +53,6 @@ export const SignInForm: FC = () => { ...@@ -54,7 +53,6 @@ export const SignInForm: FC = () => {
}, },
); );
}; };
const intl = useIntl();
const classes = useStyles(); const classes = useStyles();
return ( return (
<> <>
...@@ -71,12 +69,12 @@ export const SignInForm: FC = () => { ...@@ -71,12 +69,12 @@ export const SignInForm: FC = () => {
/^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}$/i.test(value), /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}$/i.test(value),
required: { required: {
value: true, value: true,
message: intl.formatMessage({ id: 'email' }), message: 'Email is not valid',
}, },
}} }}
label={intl.formatMessage({ id: 'email' })} label="Email"
error={!!errors.email} error={!!errors.email}
errorMessage={intl.formatMessage({ id: 'email-error' })} errorMessage="Insert email"
/> />
<InputField <InputField
...@@ -87,20 +85,20 @@ export const SignInForm: FC = () => { ...@@ -87,20 +85,20 @@ export const SignInForm: FC = () => {
maxLength: 60, maxLength: 60,
required: { required: {
value: true, value: true,
message: intl.formatMessage({ id: 'password' }), message: 'Insert valid password',
}, },
}} }}
label={intl.formatMessage({ id: 'password' })} label="Password"
error={!!errors.password} error={!!errors.password}
errorMessage={intl.formatMessage({ id: 'password-error' })} errorMessage="Insert valid password"
/> />
<Button <Button
data-testid="Submit"
type="submit" type="submit"
fullWidth fullWidth
variant="contained" variant="contained"
color="primary" color="primary"
data-testid="Submit"
className={classes.submit} className={classes.submit}
> >
Sign In Sign In
......
import React from 'react'; import React from 'react';
import ReactDOM from 'react-dom'; import ReactDOM from 'react-dom';
import { IntlProvider } from 'react-intl';
import CssBaseline from '@material-ui/core/CssBaseline'; import CssBaseline from '@material-ui/core/CssBaseline';
import MESSAGES_EN from './intl/en.json'; import { App } from 'App';
import { App } from './App';
ReactDOM.render( ReactDOM.render(
<React.StrictMode> <React.StrictMode>
<IntlProvider locale="en" messages={MESSAGES_EN}> <CssBaseline />
<CssBaseline /> <App />,
<App />
</IntlProvider>
,
</React.StrictMode>, </React.StrictMode>,
document.getElementById('root'), document.getElementById('root'),
); );
{
"email": "Email address",
"password": "Password",
"email-error": "Insert valid email address",
"password-error": "Insert valid password"
}
\ No newline at end of file
...@@ -14,7 +14,8 @@ ...@@ -14,7 +14,8 @@
"resolveJsonModule": true, "resolveJsonModule": true,
"isolatedModules": true, "isolatedModules": true,
"noEmit": true, "noEmit": true,
"jsx": "react-jsx" "jsx": "react-jsx",
"baseUrl": "src",
}, },
"include": ["src"] "include": ["src"]
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment