contentoh-components-library 21.0.54 → 21.0.55

package/dist/components/atoms/Loading/index.js

@@ -11,6 +11,7 @@ var _jsxRuntime = require("react/jsx-runtime");
 
 var Loading = function Loading() {
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_styles.Container, {
+    className: "loading",
     children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_styles.Loader, {
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
         className: "first"

package/dist/components/atoms/LogoImage/index.js

@@ -15,6 +15,7 @@ var _jsxRuntime = require("react/jsx-runtime");
 
 var LogoImage = function LogoImage() {
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_styles.Container, {
+    className: "logo",
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)("img", {
       src: _logoLogin.default,
       alt: "logo"

package/dist/components/molecules/LogoLoading/Loading.stories.js

@@ -14,7 +14,7 @@ var _index = require("./index");
 var _jsxRuntime = require("react/jsx-runtime");
 
 var _default = {
-  title: "Components/atoms/LogoLoading",
+  title: "Components/molecules/LogoLoading",
   component: _index.LogoLoading
 };
 exports.default = _default;

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

@@ -7,20 +7,15 @@ exports.LogoLoading = void 0;
 
 var _styles = require("./styles");
 
+var _Loading = require("../../atoms/Loading");
+
+var _LogoImage = require("../../atoms/LogoImage");
+
 var _jsxRuntime = require("react/jsx-runtime");
 
 var LogoLoading = function LogoLoading() {
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_styles.Container, {
-    children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
-      className: "loader",
-      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
-        className: "first"
-      }), /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
-        className: "second"
-      }), /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
-        className: "third"
-      })]
-    })
+  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_styles.Container, {
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_LogoImage.LogoImage, {}), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Loading.Loading, {})]
   });
 };
 

package/dist/components/molecules/LogoLoading/styles.js

@@ -13,6 +13,6 @@ var _styledComponents = _interopRequireDefault(require("styled-components"));
 
 var _templateObject;
 
-var Container = _styledComponents.default.div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  justify-content: center;\n  align-items: center;\n  height: 100vh;\n  width: 50%;\n  position: relative;\n  img {\n    width: 75%;\n    position: absolute;\n    bottom: 55%;\n    left: 10%;\n  }\n"])));
+var Container = _styledComponents.default.div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  height: 100vh;\n  width: 50%;\n  padding-top: 25%;\n  .logo {\n    text-align: center;\n    img {\n      width: 65%;\n    }\n  }\n  .loading {\n    height: 10%;\n  }\n"])));
 
 exports.Container = Container;

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

@@ -103,7 +103,7 @@ var SignInLogin = function SignInLogin(props) {
               }
 
               if (!valid) {
-                _context.next = 34;
+                _context.next = 36;
                 break;
               }
 
@@ -122,7 +122,7 @@ var SignInLogin = function SignInLogin(props) {
 
               props.setUser(session);
               props.setPaso(8);
-              _context.next = 26;
+              _context.next = 28;
               break;
 
             case 20:
@@ -136,6 +136,8 @@ var SignInLogin = function SignInLogin(props) {
 
             case 23:
               response = _context.sent;
+              console.log(userGroup);
+              console.log(userGroup[0]);
               userGroupValue = typeof userGroup === "string" ? userGroup : userGroup[0];
 
               if (userGroupValue === "usuario_contentoh") {
@@ -157,12 +159,12 @@ var SignInLogin = function SignInLogin(props) {
                 setLoading(false);
               }
 
-            case 26:
-              _context.next = 34;
+            case 28:
+              _context.next = 36;
               break;
 
-            case 28:
-              _context.prev = 28;
+            case 30:
+              _context.prev = 30;
               _context.t0 = _context["catch"](10);
               console.log(_context.t0);
               setLoading(false);
@@ -179,12 +181,12 @@ var SignInLogin = function SignInLogin(props) {
                 console.log("error 2");
               }
 
-            case 34:
+            case 36:
             case "end":
               return _context.stop();
           }
         }
-      }, _callee, null, [[10, 28]]);
+      }, _callee, null, [[10, 30]]);
     }));
 
     return function validate(_x) {
@@ -258,7 +260,7 @@ var SignInLogin = function SignInLogin(props) {
               return validate(e);
             }
           })
-        }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+        }), props.registration && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
           className: "new-login",
           children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("p", {
             className: "pre-registro",

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

@@ -103,48 +103,48 @@ var SignInLoginCreationApp = function SignInLoginCreationApp(props) {
               }
 
               if (!valid) {
-                _context.next = 34;
+                _context.next = 35;
                 break;
               }
 
               _context.prev = 10;
               setLoading(true);
-              console.log("try");
-              _context.next = 15;
+              _context.next = 14;
               return props.Auth.signIn(email, password);
 
-            case 15:
+            case 14:
               session = _context.sent;
 
               if (!(session.challengeName === "NEW_PASSWORD_REQUIRED")) {
-                _context.next = 21;
+                _context.next = 20;
                 break;
               }
 
               props.setUser(session);
               props.setPaso(8);
-              _context.next = 27;
+              _context.next = 28;
               break;
 
-            case 21:
+            case 20:
               userGroup = session.signInUserSession.accessToken.payload["cognito:groups"];
-              _context.next = 24;
+              _context.next = 23;
               return _axios.default.get(process.env.REACT_APP_USER_ENDPOINT, {
                 headers: {
                   Authorization: session.signInUserSession.idToken.jwtToken
                 }
               });
 
-            case 24:
+            case 23:
               response = _context.sent;
+              console.log(userGroup);
+              console.log(userGroup[0]);
               userGroupValue = typeof userGroup === "string" ? userGroup : userGroup[0];
 
               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]; // const picture = getProfilePicture(user.id_user, 83, 83);
-
+                company = JSON.parse(response.data.body).data[1];
                 caches.keys().then(function (names) {
                   names.forEach(function (name) {
                     caches.delete(name);
@@ -159,12 +159,12 @@ var SignInLoginCreationApp = function SignInLoginCreationApp(props) {
                 setLoading(false);
               }
 
-            case 27:
-              _context.next = 34;
+            case 28:
+              _context.next = 35;
               break;
 
-            case 29:
-              _context.prev = 29;
+            case 30:
+              _context.prev = 30;
               _context.t0 = _context["catch"](10);
               console.log(_context.t0);
               setLoading(false);
@@ -178,12 +178,12 @@ var SignInLoginCreationApp = function SignInLoginCreationApp(props) {
                 setSignInError("Error");
               }
 
-            case 34:
+            case 35:
             case "end":
               return _context.stop();
           }
         }
-      }, _callee, null, [[10, 29]]);
+      }, _callee, null, [[10, 30]]);
     }));
 
     return function validate(_x) {

package/package.json

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

package/src/components/atoms/Loading/index.js

@@ -2,7 +2,7 @@ import { Container,Loader } from "./styles";
 
 export const Loading = () => {
   return (
-    <Container >
+    <Container className="loading">
       <Loader>
         <span className="first"></span>
         <span className="second"></span>

package/src/components/atoms/LogoImage/index.js

@@ -3,7 +3,7 @@ import logoLogin from "../../../assets/images/logo/logoLogin.svg";
 
 export const LogoImage = () => {
   return (
-    <Container key={`logo`}>
+    <Container key={`logo`} className="logo">
       <img src={logoLogin} alt={"logo"} />
     </Container>
   );

package/src/components/molecules/LogoLoading/Loading.stories.js

@@ -1,7 +1,7 @@
 import { LogoLoading } from "./index";
 
 export default {
-  title: "Components/atoms/LogoLoading",
+  title: "Components/molecules/LogoLoading",
   component: LogoLoading,
 };
 const Template = (args) => <LogoLoading {...args} />;

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

@@ -1,13 +1,12 @@
 import { Container } from "./styles";
+import { Loading } from "../../atoms/Loading";
+import { LogoImage } from "../../atoms/LogoImage";
 
 export const LogoLoading = () => {
   return (
-    <Container >
-      <div className="loader">
-        <span className="first"></span>
-        <span className="second"></span>
-        <span className="third"></span>
-      </div>
+    <Container>
+      <LogoImage/>
+      <Loading/>
     </Container>
   );
 };

package/src/components/molecules/LogoLoading/styles.js

@@ -1,15 +1,16 @@
 import styled from "styled-components";
 
 export const Container = styled.div`
-  justify-content: center;
-  align-items: center;
   height: 100vh;
   width: 50%;
-  position: relative;
-  img {
-    width: 75%;
-    position: absolute;
-    bottom: 55%;
-    left: 10%;
+  padding-top: 25%;
+  .logo {
+    text-align: center;
+    img {
+      width: 65%;
+    }
+  }
+  .loading {
+    height: 10%;
   }
 `;

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

@@ -60,6 +60,8 @@ export const SignInLogin = (props) => {
               },
             }
           );
+          console.log(userGroup);
+          console.log(userGroup[0]);
           const userGroupValue =
             typeof userGroup === "string" ? userGroup : userGroup[0];
           if (userGroupValue === "usuario_contentoh") {
@@ -175,32 +177,34 @@ export const SignInLogin = (props) => {
               onClick={(e) => validate(e)}
             />
           </div>
-          <div className="new-login">
-            <p
-              className="pre-registro"
-              onClick={() => {
-                props.setPaso(1);
-                sessionStorage.setItem(
-                  "nuevoRegistro",
-                  JSON.stringify({
-                    name: "",
-                    lastName: "",
-                    email: "",
-                    position: "",
-                    country: "",
-                    phone: "",
-                    commercialName: "",
-                    companyName: "",
-                    rfc: "",
-                    adress: "",
-                  })
-                );
-                sessionStorage.setItem("countryCode", JSON.stringify("+52"));
-              }}
-            >
-              ¿Aún no tienes cuenta?<span> Regístrate</span>
-            </p>
-          </div>
+          {props.registration && (
+            <div className="new-login">
+              <p
+                className="pre-registro"
+                onClick={() => {
+                  props.setPaso(1);
+                  sessionStorage.setItem(
+                    "nuevoRegistro",
+                    JSON.stringify({
+                      name: "",
+                      lastName: "",
+                      email: "",
+                      position: "",
+                      country: "",
+                      phone: "",
+                      commercialName: "",
+                      companyName: "",
+                      rfc: "",
+                      adress: "",
+                    })
+                  );
+                  sessionStorage.setItem("countryCode", JSON.stringify("+52"));
+                }}
+              >
+                ¿Aún no tienes cuenta?<span> Regístrate</span>
+              </p>
+            </div>
+          )}
         </div>
       </Container>
       {upgradePlanRedirect && <Redirect to={{ pathname: "/dashboard" }} />}

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

@@ -46,7 +46,6 @@ export const SignInLoginCreationApp = (props) => {
     if (valid) {
       try {
         setLoading(true);
-        console.log("try")
         const session = await props.Auth.signIn(email, password);
         if (session.challengeName === "NEW_PASSWORD_REQUIRED") {
           props.setUser(session);
@@ -62,7 +61,8 @@ export const SignInLoginCreationApp = (props) => {
               },
             }
           );
-
+          console.log(userGroup);
+          console.log(userGroup[0]);
           const userGroupValue =
             typeof userGroup === "string" ? userGroup : userGroup[0];
           if (userGroupValue === "colaboradores_contentoh") {
@@ -73,7 +73,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);