diff --git a/adilson-fernando/README.md b/adilson-fernando/README.md index 9f75554..161f5bb 100644 --- a/adilson-fernando/README.md +++ b/adilson-fernando/README.md @@ -1,6 +1,6 @@ # PROJETO DESAFIO 5 - ADILSON FERNANDO NEVES ORNELLAS - TYPESCRIPT E REACT - PROJETO REALIZADO ENTRE OS DIAS 27/12/2022 E 15/01/2023 + PROJETO REALIZADO ENTRE OS DIAS 27/12/2022 E 08/01/2023 # LEYOUT DO PROJETO @@ -24,4 +24,5 @@ - MENU MODEL - ACCORDION - FORMIK - - YUP \ No newline at end of file + - YUP + - CPF VALIDADOR \ No newline at end of file diff --git a/adilson-fernando/package-lock.json b/adilson-fernando/package-lock.json index b7c604c..0cae276 100644 --- a/adilson-fernando/package-lock.json +++ b/adilson-fernando/package-lock.json @@ -17,6 +17,7 @@ "@types/react-dom": "^18.0.10", "accordion": "^3.0.2", "cpf": "^2.0.1", + "cpf-cnpj-validator": "^1.0.3", "date-fns": "^2.28.0", "formik": "^2.2.9", "module-name": "^0.0.1-security", @@ -2219,6 +2220,53 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/@hapi/address": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/@hapi/address/-/address-4.1.0.tgz", + "integrity": "sha512-SkszZf13HVgGmChdHo/PxchnSaCJ6cetVqLzyciudzZRT0jcOouIF/Q93mgjw8cce+D+4F4C1Z/WrfFN+O3VHQ==", + "deprecated": "Moved to 'npm install @sideway/address'", + "dependencies": { + "@hapi/hoek": "^9.0.0" + } + }, + "node_modules/@hapi/formula": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@hapi/formula/-/formula-2.0.0.tgz", + "integrity": "sha512-V87P8fv7PI0LH7LiVi8Lkf3x+KCO7pQozXRssAHNXXL9L1K+uyu4XypLXwxqVDKgyQai6qj3/KteNlrqDx4W5A==", + "deprecated": "Moved to 'npm install @sideway/formula'" + }, + "node_modules/@hapi/hoek": { + "version": "9.3.0", + "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz", + "integrity": "sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==" + }, + "node_modules/@hapi/joi": { + "version": "17.1.1", + "resolved": "https://registry.npmjs.org/@hapi/joi/-/joi-17.1.1.tgz", + "integrity": "sha512-p4DKeZAoeZW4g3u7ZeRo+vCDuSDgSvtsB/NpfjXEHTUjSeINAi/RrVOWiVQ1isaoLzMvFEhe8n5065mQq1AdQg==", + "deprecated": "Switch to 'npm install joi'", + "dependencies": { + "@hapi/address": "^4.0.1", + "@hapi/formula": "^2.0.0", + "@hapi/hoek": "^9.0.0", + "@hapi/pinpoint": "^2.0.0", + "@hapi/topo": "^5.0.0" + } + }, + "node_modules/@hapi/pinpoint": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@hapi/pinpoint/-/pinpoint-2.0.0.tgz", + "integrity": "sha512-vzXR5MY7n4XeIvLpfl3HtE3coZYO4raKXW766R6DZw/6aLqR26iuZ109K7a0NtF2Db0jxqh7xz2AxkUwpUFybw==", + "deprecated": "Moved to 'npm install @sideway/pinpoint'" + }, + "node_modules/@hapi/topo": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-5.1.0.tgz", + "integrity": "sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==", + "dependencies": { + "@hapi/hoek": "^9.0.0" + } + }, "node_modules/@humanwhocodes/config-array": { "version": "0.11.8", "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz", @@ -5729,6 +5777,14 @@ "resolved": "https://registry.npmjs.org/cpf/-/cpf-2.0.1.tgz", "integrity": "sha512-YpRbrpjQCDkZgMUOLxLfme8wE8X56fHXOGMGDsYA48f7UrjaCHU0TP8d+CKmxvNVjBDVtHiCUiBw8vfstdslbw==" }, + "node_modules/cpf-cnpj-validator": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/cpf-cnpj-validator/-/cpf-cnpj-validator-1.0.3.tgz", + "integrity": "sha512-Slh7iv+sf2FhP9xFRMExuaDF7ndERVzmjBZHqwWG+GqHSqPmEggvLuKUUFJZxb+G804rjqRnnu5eCkbeChqM/Q==", + "dependencies": { + "@hapi/joi": "^17.1.0" + } + }, "node_modules/cross-env": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz", @@ -18804,6 +18860,49 @@ } } }, + "@hapi/address": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/@hapi/address/-/address-4.1.0.tgz", + "integrity": "sha512-SkszZf13HVgGmChdHo/PxchnSaCJ6cetVqLzyciudzZRT0jcOouIF/Q93mgjw8cce+D+4F4C1Z/WrfFN+O3VHQ==", + "requires": { + "@hapi/hoek": "^9.0.0" + } + }, + "@hapi/formula": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@hapi/formula/-/formula-2.0.0.tgz", + "integrity": "sha512-V87P8fv7PI0LH7LiVi8Lkf3x+KCO7pQozXRssAHNXXL9L1K+uyu4XypLXwxqVDKgyQai6qj3/KteNlrqDx4W5A==" + }, + "@hapi/hoek": { + "version": "9.3.0", + "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz", + "integrity": "sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==" + }, + "@hapi/joi": { + "version": "17.1.1", + "resolved": "https://registry.npmjs.org/@hapi/joi/-/joi-17.1.1.tgz", + "integrity": "sha512-p4DKeZAoeZW4g3u7ZeRo+vCDuSDgSvtsB/NpfjXEHTUjSeINAi/RrVOWiVQ1isaoLzMvFEhe8n5065mQq1AdQg==", + "requires": { + "@hapi/address": "^4.0.1", + "@hapi/formula": "^2.0.0", + "@hapi/hoek": "^9.0.0", + "@hapi/pinpoint": "^2.0.0", + "@hapi/topo": "^5.0.0" + } + }, + "@hapi/pinpoint": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@hapi/pinpoint/-/pinpoint-2.0.0.tgz", + "integrity": "sha512-vzXR5MY7n4XeIvLpfl3HtE3coZYO4raKXW766R6DZw/6aLqR26iuZ109K7a0NtF2Db0jxqh7xz2AxkUwpUFybw==" + }, + "@hapi/topo": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-5.1.0.tgz", + "integrity": "sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==", + "requires": { + "@hapi/hoek": "^9.0.0" + } + }, "@humanwhocodes/config-array": { "version": "0.11.8", "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz", @@ -21430,6 +21529,14 @@ "resolved": "https://registry.npmjs.org/cpf/-/cpf-2.0.1.tgz", "integrity": "sha512-YpRbrpjQCDkZgMUOLxLfme8wE8X56fHXOGMGDsYA48f7UrjaCHU0TP8d+CKmxvNVjBDVtHiCUiBw8vfstdslbw==" }, + "cpf-cnpj-validator": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/cpf-cnpj-validator/-/cpf-cnpj-validator-1.0.3.tgz", + "integrity": "sha512-Slh7iv+sf2FhP9xFRMExuaDF7ndERVzmjBZHqwWG+GqHSqPmEggvLuKUUFJZxb+G804rjqRnnu5eCkbeChqM/Q==", + "requires": { + "@hapi/joi": "^17.1.0" + } + }, "cross-env": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz", diff --git a/adilson-fernando/package.json b/adilson-fernando/package.json index 34f69cf..e4a7be8 100644 --- a/adilson-fernando/package.json +++ b/adilson-fernando/package.json @@ -12,6 +12,7 @@ "@types/react-dom": "^18.0.10", "accordion": "^3.0.2", "cpf": "^2.0.1", + "cpf-cnpj-validator": "^1.0.3", "date-fns": "^2.28.0", "formik": "^2.2.9", "module-name": "^0.0.1-security", diff --git a/adilson-fernando/src/components/Main/ContatoSchema.ts b/adilson-fernando/src/components/Main/ContatoSchema.ts index fa13912..34a82e5 100644 --- a/adilson-fernando/src/components/Main/ContatoSchema.ts +++ b/adilson-fernando/src/components/Main/ContatoSchema.ts @@ -1,11 +1,12 @@ import * as Yup from "yup"; + export default Yup.object().shape({ nome: Yup.string().required("*Campo Obrigatório").min(3,"Nome inválido"), - email: Yup.string().email("Email inválido").required("*Campo Obrigatório"), + email: Yup.string().required("*Campo Obrigatório").email("Email inválido"), cpf: Yup.string().required("*Campo Obrigatório"), data: Yup.date().required("*Campo Obrigatório"), telefone: Yup.string().required("*Campo Obrigatório"), diff --git a/adilson-fernando/src/components/Whatsapp.tsx b/adilson-fernando/src/components/Whatsapp.tsx index 663e814..2d9febd 100644 --- a/adilson-fernando/src/components/Whatsapp.tsx +++ b/adilson-fernando/src/components/Whatsapp.tsx @@ -10,7 +10,7 @@ import styles from "../styles/Whatsapp.module.scss"; const Whatsapp = () =>{ return (
- + Whatsapp