contentoh-components-library 21.0.48 → 21.0.51

package/dist/components/molecules/EmailResetPasswordLogin/index.js

@@ -62,7 +62,7 @@ var EmailResetPasswordLogin = function EmailResetPasswordLogin(props) {
               valid = true;
               setShowErrors(true);
               e.preventDefault();
-              email = document.querySelector("#emailInput").value;
+              email = document.querySelector("#emailInput").value.trim();
               email === "" ? setEmptyEmail(true) : setEmptyEmail(false);
               !/^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/.test(email) ? setInvalidEmail(true) : setInvalidEmail(false);
               emptyEmail && (valid = false);

package/dist/components/molecules/RegistrationFirstStep/index.js

@@ -35,7 +35,7 @@ var RegistrationFirstStep = function RegistrationFirstStep(props) {
       emptyName = _useState2[0],
       setEmptyName = _useState2[1];
 
-  var _useState3 = (0, _react.useState)(true),
+  var _useState3 = (0, _react.useState)(false),
       _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
       emptyLastName = _useState4[0],
       setEmptyLastName = _useState4[1];

package/dist/components/molecules/RegistrationThirdStep/index.js

@@ -27,7 +27,7 @@ var _GeneralButton = require("../../atoms/GeneralButton");
 
 var _jsxRuntime = require("react/jsx-runtime");
 
-var RegistrationThirdStep = function RegistrationThirdStep() {
+var RegistrationThirdStep = function RegistrationThirdStep(props) {
   var _useState = (0, _react.useState)(false),
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),
       emptyCommercialName = _useState2[0],
@@ -48,6 +48,8 @@ var RegistrationThirdStep = function RegistrationThirdStep() {
       emptyFiscalAddress = _useState8[0],
       setEmptyFiscalAddress = _useState8[1];
 
+  var nuevoRegistro = JSON.parse(sessionStorage.getItem("nuevoRegistro"));
+
   var validate = function validate(e) {
     e.preventDefault();
     var valid = true;
@@ -64,8 +66,14 @@ var RegistrationThirdStep = function RegistrationThirdStep() {
       valid = false;
     }
 
-    valid && sessionStorage.setItem("nuevoRegistro", JSON.stringify(nuevoRegistro));
-    valid && props.setPaso(props.paso + 1);
+    if (valid) {
+      nuevoRegistro.commercialName = commercialName;
+      nuevoRegistro.companyName = bussinesName;
+      nuevoRegistro.rfc = RFC;
+      nuevoRegistro.adress = FiscalAddress;
+      sessionStorage.setItem("nuevoRegistro", JSON.stringify(nuevoRegistro));
+      props.setPaso(props.paso + 1);
+    }
   };
 
   var loginRight = [/*#__PURE__*/(0, _jsxRuntime.jsx)(_LogoImage.LogoImage, {}, "1"), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {

package/dist/components/molecules/SignInLogin/index.js

@@ -84,7 +84,7 @@ var SignInLogin = function SignInLogin(props) {
               setShowErrors(true);
               e.preventDefault();
               valid = true;
-              email = document.querySelector("#emailInput").value;
+              email = document.querySelector("#emailInput").value.trim();
               password = document.querySelector("#passwordInput").value;
               !/^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/.test(email) ? setInvalidEmail(true) : setInvalidEmail(false);
 

package/dist/components/molecules/SignInLoginCreationApp/index.js

@@ -80,11 +80,11 @@ var SignInLoginCreationApp = function SignInLoginCreationApp(props) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
+              e.preventDefault();
               setSignInError("");
               setShowErrors(true);
-              e.preventDefault();
               valid = true;
-              email = document.querySelector("#emailInput").value;
+              email = document.querySelector("#emailInput").value.trim();
               password = document.querySelector("#passwordInput").value;
               !/^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/.test(email) ? setInvalidEmail(true) : setInvalidEmail(false);
 
@@ -103,14 +103,14 @@ var SignInLoginCreationApp = function SignInLoginCreationApp(props) {
               }
 
               if (!valid) {
-                _context.next = 34;
+                _context.next = 33;
                 break;
               }
 
               _context.prev = 10;
               setLoading(true);
               _context.next = 14;
-              return props.Auth.signIn(email, password);
+              return Auth.signIn(email, password);
 
             case 14:
               session = _context.sent;
@@ -138,11 +138,12 @@ var SignInLoginCreationApp = function SignInLoginCreationApp(props) {
               response = _context.sent;
               userGroupValue = typeof userGroup === "string" ? userGroup : userGroup[0];
 
-              if (userGroupValue === "usuario_contentoh") {
+              if (userGroupValue === "colaboradores_contentoh") {
                 sessionStorage.setItem("auth", true);
                 sessionStorage.setItem("jwt", session.signInUserSession.idToken.jwtToken);
                 user = JSON.parse(response.data.body).data[0];
-                company = JSON.parse(response.data.body).data[1];
+                company = JSON.parse(response.data.body).data[1]; // const picture = getProfilePicture(user.id_user, 83, 83);
+
                 caches.keys().then(function (names) {
                   names.forEach(function (name) {
                     caches.delete(name);
@@ -158,7 +159,7 @@ var SignInLoginCreationApp = function SignInLoginCreationApp(props) {
               }
 
             case 26:
-              _context.next = 34;
+              _context.next = 33;
               break;
 
             case 28:
@@ -166,20 +167,17 @@ var SignInLoginCreationApp = function SignInLoginCreationApp(props) {
               _context.t0 = _context["catch"](10);
               console.log(_context.t0);
               setLoading(false);
-              console.log("error 1");
 
               if (_context.t0.code === "NotAuthorizedException") {
                 setSignInError("NotAuthorizedException");
               } else if (_context.t0.code === "UserNotConfirmedException") {
-                sessionStorage.setItem("email", JSON.stringify(document.querySelector("#usernameInput").value.trim()));
-                sessionStorage.setItem("email", JSON.stringify(email));
+                sessionStorage.setItem("email", JSON.stringify(document.querySelector("#usernameInput").value));
                 props.setPaso(5);
               } else {
                 setSignInError("Error");
-                console.log("error 2");
               }
 
-            case 34:
+            case 33:
             case "end":
               return _context.stop();
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "contentoh-components-library",
-  "version": "21.0.48",
+  "version": "21.0.51",
   "dependencies": {
     "@aws-amplify/auth": "^4.5.3",
     "@aws-amplify/datastore": "^3.11.0",

package/src/components/molecules/EmailResetPasswordLogin/index.js

@@ -17,7 +17,7 @@ export const EmailResetPasswordLogin = (props) => {
     let valid = true;
     setShowErrors(true);
     e.preventDefault();
-    const email = document.querySelector("#emailInput").value;
+    const email = document.querySelector("#emailInput").value.trim();
     email === "" ? setEmptyEmail(true) : setEmptyEmail(false);
     !/^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/.test(
       email

package/src/components/molecules/RegistrationFirstStep/index.js

@@ -10,7 +10,7 @@ import { GeneralInput } from "../../atoms/GeneralInput";
 
 export const RegistrationFirstStep = (props) => {
   const [emptyName, setEmptyName] = useState(false);
-  const [emptyLastName, setEmptyLastName] = useState(true);
+  const [emptyLastName, setEmptyLastName] = useState(false);
   const [emptyEmail, setEmptyEmail] = useState(false);
   const [emptyJob, setEmptyJob] = useState(false);
   const [emptyPhone, setEmptyPhone] = useState(false);

package/src/components/molecules/RegistrationThirdStep/index.js

@@ -7,12 +7,14 @@ import { GlobalColors, FontFamily } from "../../../global-files/variables";
 import { TagAndInput } from "../../molecules/TagAndInput";
 import { Button } from "../../atoms/GeneralButton";
 
-export const RegistrationThirdStep = () => {
+export const RegistrationThirdStep = (props) => {
   const [emptyCommercialName, setEmptyCommercialName] = useState(false);
   const [emptyBussinesName, setEmptyBussinesName] = useState(false);
   const [emptyRFC, setEmptyRFC] = useState(false);
   const [emptyFiscalAddress, setEmptyFiscalAddress] = useState(false);
 
+  let nuevoRegistro = JSON.parse(sessionStorage.getItem("nuevoRegistro"));
+
   const validate = (e) => {
     e.preventDefault();
     let valid = true;
@@ -38,8 +40,14 @@ export const RegistrationThirdStep = () => {
     ) {
       valid = false;
     }
-    valid && sessionStorage.setItem("nuevoRegistro", JSON.stringify(nuevoRegistro));
-    valid && props.setPaso(props.paso + 1);
+    if (valid) {
+      nuevoRegistro.commercialName = commercialName;
+      nuevoRegistro.companyName = bussinesName;
+      nuevoRegistro.rfc = RFC;
+      nuevoRegistro.adress = FiscalAddress;
+      sessionStorage.setItem("nuevoRegistro", JSON.stringify(nuevoRegistro));
+      props.setPaso(props.paso + 1);
+    }
   };
 
   const loginRight = [

package/src/components/molecules/SignInLogin/index.js

@@ -23,7 +23,7 @@ export const SignInLogin = (props) => {
     setShowErrors(true);
     e.preventDefault();
     let valid = true;
-    const email = document.querySelector("#emailInput").value;
+    const email = document.querySelector("#emailInput").value.trim();
     const password = document.querySelector("#passwordInput").value;
     !/^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/.test(
       email

package/src/components/molecules/SignInLoginCreationApp/index.js

@@ -19,11 +19,11 @@ export const SignInLoginCreationApp = (props) => {
   const [loading, setLoading] = useState(false);
   const [upgradePlanRedirect, setUpgradePlanRedirect] = useState(false);
   const validate = async (e) => {
+    e.preventDefault();
     setSignInError("");
     setShowErrors(true);
-    e.preventDefault();
     let valid = true;
-    const email = document.querySelector("#emailInput").value;
+    const email = document.querySelector("#emailInput").value.trim();
     const password = document.querySelector("#passwordInput").value;
     !/^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/.test(
       email
@@ -45,7 +45,7 @@ export const SignInLoginCreationApp = (props) => {
     if (valid) {
       try {
         setLoading(true);
-        const session = await props.Auth.signIn(email, password);
+        const session = await Auth.signIn(email, password);
         if (session.challengeName === "NEW_PASSWORD_REQUIRED") {
           props.setUser(session);
           props.setPaso(8);
@@ -60,9 +60,10 @@ export const SignInLoginCreationApp = (props) => {
               },
             }
           );
+
           const userGroupValue =
             typeof userGroup === "string" ? userGroup : userGroup[0];
-          if (userGroupValue === "usuario_contentoh") {
+          if (userGroupValue === "colaboradores_contentoh") {
             sessionStorage.setItem("auth", true);
             sessionStorage.setItem(
               "jwt",
@@ -70,6 +71,7 @@ export const SignInLoginCreationApp = (props) => {
             );
             const user = JSON.parse(response.data.body).data[0];
             const company = JSON.parse(response.data.body).data[1];
+            // const picture = getProfilePicture(user.id_user, 83, 83);
             caches.keys().then((names) => {
               names.forEach((name) => {
                 caches.delete(name);
@@ -91,21 +93,16 @@ export const SignInLoginCreationApp = (props) => {
       } catch (error) {
         console.log(error);
         setLoading(false);
-        console.log("error 1");
         if (error.code === "NotAuthorizedException") {
           setSignInError("NotAuthorizedException");
         } else if (error.code === "UserNotConfirmedException") {
           sessionStorage.setItem(
             "email",
-            JSON.stringify(
-              document.querySelector("#usernameInput").value.trim()
-            )
+            JSON.stringify(document.querySelector("#usernameInput").value)
           );
-          sessionStorage.setItem("email", JSON.stringify(email));
           props.setPaso(5);
         } else {
           setSignInError("Error");
-          console.log("error 2");
         }
       }
     }