mario-core 2.6.6 → 2.7.0

package/dist/containers/User/hooks/useUserDetail.d.ts

@@ -11,7 +11,7 @@ declare type UserDetail = {
 };
 declare const useUserDetail: (id?: string | undefined) => {
     userDetail: UserDetail;
-    backToList: () => void;
+    backToList: (user?: string | undefined) => void;
     confirmData: (data: any) => Promise<void>;
     file: any;
     setFile: import("react").Dispatch<any>;

package/dist/containers/User/hooks/useUserList.d.ts

@@ -2,6 +2,7 @@ declare const useUserList: () => {
     userList: any;
     totalItems: any;
     filters: import("../../..").Filter;
+    fullName: string | null;
     getData: () => Promise<void>;
     removeData: (id: string) => void;
     changeFilters: (updatedFilters: any) => void;

package/dist/index.css

@@ -212,7 +212,7 @@
     width: 70%; }
 
 ._wWIyO {
-  padding: 89px 50px;
+  padding: 60px 50px;
   position: relative; }
   ._wWIyO label:not(._11FZt) {
     color: #8f9bb3;
@@ -490,10 +490,6 @@
   ._1INnO {
     display: none; } }
 
-@media (min-width: 992px) {
-  ._2e7fZ {
-    width: 80%; } }
-
 @media (min-width: 992px) and (max-width: 1199px) {
   ._2LIqK {
     display: none; } }

package/dist/index.js

@@ -46,7 +46,7 @@ function _catch(body, recover) {
 	return result;
 }
 
-var styles = {"notification-count":"_2sew7","text-introduction":"_3OgWF","btn-trans-border":"_r9cAh","contact":"_NszFe","learn-more":"_MDjzH","title-quote":"_1Swkw","descriptions-quote":"_gi8vj","descriptions-icon":"_3SOdX","box-login":"_38Lo1","block-verification":"_1OzGy","block-login":"_wWIyO","title-login":"_3nuns","title-forgot-password":"_21qb6","btn-close":"_NhW9l","btn-login":"_3IL10","return-to-login":"_Ce3Kg","recover-account":"_2t6d9","link-to-login":"_3bDsd","remember":"_11FZt","term-and-conditions":"_3LXoI","descriptions-forgot-pass":"_PMcjT","content-icon":"_2rZY6","title-icon":"_y9lM2","nav-home":"_1TT1q","box-introduction":"_32V6L","icon":"_20YJX","form-user-name":"_39BJD","checkbox-remember":"_2K9b2","block-reset-password":"_23Sua","block-forgot-pass":"_3CWP6","page-not-login":"_3Wmco","content-quote":"_13Rk0","home-page":"_o6HKW","red-background":"_jOY7o","login":"_F-hjL","img-box":"_2v-L_","img-login":"_3ncTL","img-login-rectangle":"_2kOvJ","c-main":"_39l0X","container-fluid":"_1BMwK","input-file-label":"_1XNpH","delete-avatar-button":"_1z5h9","header-logo":"_Gewcf","sidebar-logo":"_1hXpy","nav-mobile":"_1qjbW","filter-media-file":"_1I62C","div":"_3cLcM","dropdown-menu":"_1krbH","header-avatar":"_RQaHE","dropdown-content":"_3ys4W","dropdown-change":"_ToOW_","item-address":"_3sQlR","item-logout":"_3bqSM","title-address":"_1jgSI","img-avatar":"_35Ttz","item-contact":"_1wc7o","logout":"_1_9tV","content-text":"_3S4f2","hide-in-mobile":"_1INnO","block-form":"_2e7fZ","hide-in-desktop":"_2LIqK","control-input":"_2Zz97","custom-control":"_3-yp5"};
+var styles = {"notification-count":"_2sew7","text-introduction":"_3OgWF","btn-trans-border":"_r9cAh","contact":"_NszFe","learn-more":"_MDjzH","title-quote":"_1Swkw","descriptions-quote":"_gi8vj","descriptions-icon":"_3SOdX","box-login":"_38Lo1","block-verification":"_1OzGy","block-login":"_wWIyO","title-login":"_3nuns","title-forgot-password":"_21qb6","btn-close":"_NhW9l","btn-login":"_3IL10","return-to-login":"_Ce3Kg","recover-account":"_2t6d9","link-to-login":"_3bDsd","remember":"_11FZt","term-and-conditions":"_3LXoI","descriptions-forgot-pass":"_PMcjT","content-icon":"_2rZY6","title-icon":"_y9lM2","nav-home":"_1TT1q","box-introduction":"_32V6L","icon":"_20YJX","form-user-name":"_39BJD","checkbox-remember":"_2K9b2","block-reset-password":"_23Sua","block-forgot-pass":"_3CWP6","page-not-login":"_3Wmco","content-quote":"_13Rk0","home-page":"_o6HKW","red-background":"_jOY7o","login":"_F-hjL","img-box":"_2v-L_","img-login":"_3ncTL","img-login-rectangle":"_2kOvJ","c-main":"_39l0X","container-fluid":"_1BMwK","input-file-label":"_1XNpH","delete-avatar-button":"_1z5h9","header-logo":"_Gewcf","sidebar-logo":"_1hXpy","nav-mobile":"_1qjbW","filter-media-file":"_1I62C","div":"_3cLcM","dropdown-menu":"_1krbH","header-avatar":"_RQaHE","dropdown-content":"_3ys4W","dropdown-change":"_ToOW_","item-address":"_3sQlR","item-logout":"_3bqSM","title-address":"_1jgSI","img-avatar":"_35Ttz","item-contact":"_1wc7o","logout":"_1_9tV","content-text":"_3S4f2","hide-in-mobile":"_1INnO","hide-in-desktop":"_2LIqK","control-input":"_2Zz97","custom-control":"_3-yp5"};
 
 var style = {
   fontSize: "0.85rem"
@@ -536,16 +536,20 @@ var BlockLogin = function BlockLogin(_ref) {
       className: "" + styles["btn-login"],
       type: "submit"
     }, "LOGIN")), React__default.createElement("div", {
-      className: "d-flex justify-content-end"
+      className: "d-flex justify-content-between"
     }, React__default.createElement(reactRouterDom.Link, {
       to: "/forgot-password",
       className: "" + styles["link-to-login"]
-    }, "Forgot password ?"))))), React__default.createElement(reactstrap.Col, {
+    }, "Forgot password?"), React__default.createElement("a", {
+      href: "https://marioframework.com/privacy-policy/",
+      target: "blank",
+      className: "" + styles["link-to-login"]
+    }, "Privacy Policy"))))), React__default.createElement(reactstrap.Col, {
       lg: 4,
       md: 4,
       className: "" + styles["img-box"]
     }, React__default.createElement("img", {
-      src: "/images/img-login.png",
+      src: "/images/img-login.jpg",
       className: "" + styles["img-login"]
     })));
   });
@@ -773,16 +777,20 @@ var BlockForgetPassword = function BlockForgetPassword() {
         return handleSubmit();
       }
     }, "Continue")), React__default.createElement("p", {
-      className: "d-flex justify-content-end"
+      className: "d-flex justify-content-between"
     }, React__default.createElement(reactRouterDom.Link, {
       to: "/login",
       className: "" + styles["link-to-login"]
-    }, "Return to login"))))), React__default.createElement(reactstrap.Col, {
+    }, "Return to login"), React__default.createElement("a", {
+      href: "https://marioframework.com/privacy-policy/",
+      target: "blank",
+      className: "" + styles["link-to-login"]
+    }, "Privacy Policy"))))), React__default.createElement(reactstrap.Col, {
       lg: 4,
       md: 4,
       className: "" + styles["img-box"]
     }, React__default.createElement("img", {
-      src: "/images/img-login.png",
+      src: "/images/img-login.jpg",
       className: "" + styles["img-login"]
     })));
   });
@@ -879,16 +887,20 @@ var BlockResetPassword = function BlockResetPassword() {
         return handleSubmit();
       }
     }, "Confirm")), React__default.createElement("p", {
-      className: "d-flex justify-content-end"
+      className: "d-flex justify-content-between"
     }, React__default.createElement(reactRouterDom.Link, {
       to: "/login",
       className: "" + styles["link-to-login"]
-    }, "Return to login"))))), React__default.createElement(reactstrap.Col, {
+    }, "Return to login"), React__default.createElement("a", {
+      href: "https://marioframework.com/privacy-policy/",
+      target: "blank",
+      className: "" + styles["link-to-login"]
+    }, "Privacy Policy"))))), React__default.createElement(reactstrap.Col, {
       lg: 4,
       md: 4,
       className: "" + styles["img-box"]
     }, React__default.createElement("img", {
-      src: "/images/img-login.png",
+      src: "/images/img-login.jpg",
       className: "" + styles["img-login"]
     })));
   });
@@ -1116,16 +1128,20 @@ var BlockTwoFactorLogin = function BlockTwoFactorLogin() {
         return handleSubmit();
       }
     }, "Confirm")), React__default.createElement("p", {
-      className: "d-flex justify-content-end"
+      className: "d-flex justify-content-between"
     }, React__default.createElement(reactRouterDom.Link, {
       to: "/login",
       className: "" + styles["link-to-login"]
-    }, "Return to login"))))), React__default.createElement(reactstrap.Col, {
+    }, "Return to login"), React__default.createElement("a", {
+      href: "https://marioframework.com/privacy-policy/",
+      target: "blank",
+      className: "" + styles["link-to-login"]
+    }, "Privacy Policy"))))), React__default.createElement(reactstrap.Col, {
       lg: 4,
       md: 4,
       className: "" + styles["img-box"]
     }, React__default.createElement("img", {
-      src: "/images/img-login.png",
+      src: "/images/img-login.jpg",
       className: "" + styles["img-login"]
     })));
   });
@@ -1213,7 +1229,7 @@ var data = {
     content: "Understand yourself better through helpful feedback."
   }, {
     scrIcon: "/images/177_9_Brain.svg",
-    content: "Grow together as both learners and educators create and share personalized learning journeys."
+    content: "Create, explore, and share exciting personalized learning journeys."
   }, {
     scrIcon: "/images/177_6_Goal.svg",
     content: "Set, monitor, and achieve your goals."
@@ -4063,6 +4079,8 @@ var TITLE$8 = "User list";
 
 var useUserList = function useUserList() {
   var history = reactRouterDom.useHistory();
+  var query = new URLSearchParams(location.search);
+  var fullName = query.get("query");
   var userList = reactRedux.useSelector(function (state) {
     return state.users.userList;
   });
@@ -4113,6 +4131,11 @@ var useUserList = function useUserList() {
   React.useEffect(function () {
     getData();
   }, [filters]);
+  React.useEffect(function () {
+    changeFilters({
+      searchString: fullName
+    });
+  }, [fullName]);
   var removeData = React.useCallback(function (id) {
     dispatch(setLoading(true));
 
@@ -4158,6 +4181,7 @@ var useUserList = function useUserList() {
     userList: userList,
     totalItems: totalItems,
     filters: filters,
+    fullName: fullName,
     getData: getData,
     removeData: removeData,
     changeFilters: changeFilters,
@@ -4234,6 +4258,7 @@ var header$2 = "User";
 
 var UserList = function UserList() {
   var _useUserList = useUserList(),
+      fullName = _useUserList.fullName,
       userList = _useUserList.userList,
       totalItems = _useUserList.totalItems,
       filters = _useUserList.filters,
@@ -4254,7 +4279,7 @@ var UserList = function UserList() {
     onClick: function onClick() {
       return reDirectDetailPage();
     },
-    initValue: "",
+    initValue: !!fullName ? fullName : '',
     onSearch: function onSearch(searchString) {
       return changeFilters({
         searchString: searchString
@@ -4493,8 +4518,8 @@ var useUserDetail = function useUserDetail(id) {
       return Promise.reject(e);
     }
   }, [id]);
-  var backToList = React.useCallback(function () {
-    history.push(USER_LIST_URL);
+  var backToList = React.useCallback(function (user) {
+    !!user ? history.push(USER_LIST_URL + ("?query=" + user)) : history.push(USER_LIST_URL);
   }, []);
   var confirmData = React.useCallback(function (data) {
     try {
@@ -4508,12 +4533,17 @@ var useUserDetail = function useUserDetail(id) {
         function _temp6() {
           var next = !!id ? update$3 : create$3;
           !id && delete data.id;
-          return Promise.resolve(next(data)).then(function () {
+          return Promise.resolve(next(data)).then(function (result) {
+            if (!!result) {
+              getById$3(result.data.id).then(function (e) {
+                backToList(e.data.fullName);
+              });
+            }
+
             dispatch(setAlert({
               type: "success",
               message: (!!id ? "Update" : "Create") + " user successfully"
             }));
-            backToList();
           });
         }