From 188ac1fb18bc22396f0f758ab866660e59fb2d90 Mon Sep 17 00:00:00 2001
From: Alberto Defendi <1369-ahl-berto@users.noreply.gitlab.inf.unibz.it>
Date: Sat, 20 Mar 2021 17:22:26 +0100
Subject: [PATCH] Moved isEmailValid
---
src/components/TestForm/emailValidator.ts | 10 ++++++++++
src/components/TestForm/index.tsx | 14 ++------------
2 files changed, 12 insertions(+), 12 deletions(-)
create mode 100644 src/components/TestForm/emailValidator.ts
diff --git a/src/components/TestForm/emailValidator.ts b/src/components/TestForm/emailValidator.ts
new file mode 100644
index 0000000..122f501
--- /dev/null
+++ b/src/components/TestForm/emailValidator.ts
@@ -0,0 +1,10 @@
+export const isEmailValid = (email: string): boolean => {
+ /**
+ * The following is the RFC 5322 valid email regex
+ * Hinted from question https://stackoverflow.com/questions/201323/how-to-validate-an-email-address-using-a-regular-expression
+ * More on http://emailregex.com/
+ */
+ // eslint-disable-next-line
+ const VALID_EMAIL_REGEX = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
+ return VALID_EMAIL_REGEX.test(String(email).toLowerCase());
+};
diff --git a/src/components/TestForm/index.tsx b/src/components/TestForm/index.tsx
index a747935..fea60f6 100644
--- a/src/components/TestForm/index.tsx
+++ b/src/components/TestForm/index.tsx
@@ -2,6 +2,7 @@ import React, { useState } from 'react';
import { createStyles, makeStyles, Theme } from '@material-ui/core/styles';
import TextField from '@material-ui/core/TextField';
import Button from '@material-ui/core/Button';
+import { isEmailValid } from './emailValidator';
const useStyles = makeStyles((theme: Theme) =>
createStyles({
@@ -34,21 +35,10 @@ export const Form: React.FC = () => {
};
const [formValues, setFormValues] = useState<formData>(defaultValues);
- const isEmailValid = (): boolean => {
- /**
- * The following is the RFC 5322 valid email regex
- * Hinted from question https://stackoverflow.com/questions/201323/how-to-validate-an-email-address-using-a-regular-expression
- * More on http://emailregex.com/
- */
- // eslint-disable-next-line
- const VALID_EMAIL_REGEX = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
- return VALID_EMAIL_REGEX.test(String(formValues.email).toLowerCase());
- };
-
const handleSubmit = (event: React.FormEvent): void => {
event.preventDefault();
const errors: Array<string> = [];
- if (!isEmailValid()) {
+ if (!isEmailValid(formValues.email)) {
errors.push('email');
console.log('Email address not valid');
} else {
--
GitLab