mario-core 2.4.8 → 2.5.3

package/dist/index.modern.js

@@ -1,7 +1,7 @@
 import 'bootstrap/dist/css/bootstrap.min.css';
 import React, { useState, useCallback, useEffect, Suspense, useMemo, memo, Fragment, forwardRef, useImperativeHandle, useRef } from 'react';
-import { Input, Form, FormGroup, Label, Col, Row, Dropdown, DropdownToggle, DropdownMenu, NavLink, DropdownItem, Button, Alert, Pagination, PaginationItem, PaginationLink, Table, Modal, ModalHeader, ModalBody, ModalFooter, CustomInput, Nav, NavItem, TabContent, TabPane, Card, CardImg, CardBody, CardTitle, CardHeader, CardText } from 'reactstrap';
-import { Link, useHistory, useLocation, Switch, Route, Prompt, useParams } from 'react-router-dom';
+import { Input, Row, Col, Form, FormGroup, Label, Dropdown, DropdownToggle, DropdownMenu, NavLink, DropdownItem, Button, Alert, Pagination, PaginationItem, PaginationLink, Table, Modal, ModalHeader, ModalBody, ModalFooter, CustomInput, Nav, NavItem, TabContent, TabPane, Card, CardImg, CardBody, CardTitle, CardHeader, CardText } from 'reactstrap';
+import { useHistory, Link, useLocation, Switch, Route, Prompt, useParams } from 'react-router-dom';
 import { Formik } from 'formik';
 import { object, string, boolean, number, array } from 'yup';
 import { useDispatch, useSelector } from 'react-redux';
@@ -43,7 +43,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","block-login":"_wWIyO","title-login":"_3nuns","title-forgot-password":"_21qb6","btn-close":"_NhW9l","btn-login":"_3IL10","return-to-login":"_Ce3Kg","recover-account":"_2t6d9","forgot-password":"_2oh2a","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-forgot-password":"_2TucC","block-reset-password":"_23Sua","block-forgot-pass":"_3CWP6","page-not-login":"_3Wmco","content-quote":"_13Rk0","home-page":"_o6HKW","login":"_F-hjL","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-tablet":"_2uvkV","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","login":"_F-hjL","img-box":"_2v-L_","img-login":"_3ncTL","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-tablet":"_2uvkV","hide-in-desktop":"_2LIqK","control-input":"_2Zz97","custom-control":"_3-yp5"};
 
 var style = {
   fontSize: "0.85rem"
@@ -57,14 +57,6 @@ var ErrorHandler = function ErrorHandler(_ref) {
   }, text);
 };
 
-var CloseBlock = function CloseBlock(_ref) {
-  var to = _ref.to;
-  return React.createElement(Link, {
-    to: to,
-    className: "" + styles["btn-close"]
-  }, "\xD7");
-};
-
 var containerStyle = {
   height: "40px",
   backgroundColor: "#f7f9fc",
@@ -90,7 +82,7 @@ var PasswordInput = function PasswordInput(_ref) {
     className: "d-flex align-items-center w-100",
     style: containerStyle
   }, React.createElement(Input, {
-    className: "border border-0 password-input",
+    className: "border password-input",
     style: inputStyle,
     type: isShowPassword ? "text" : "password",
     name: "password",
@@ -215,7 +207,7 @@ var CHAT_CHANNEL = "chat-channel";
 var NOTIFICATION_CHANNEL = "NOTIFICATION_CHANNEL";
 var NEW_NOTIFICATION = "NEW_NOTIFICATION";
 var DEFAULT_IMAGE_URL = "https://tleliteracy.com/wp-content/uploads/2017/02/default-avatar.png";
-var EMOTIONS = ["Excited", "Happy", "Satisfied", "Bored", "Nervous", "Stressed", "Tired", "Sad", "Mad", "Sick"];
+var EMOTIONS = ["Unwell", "Mad", "Stressed", "Easygoing", "Proud", "Inspired"];
 var TAB_COLORS = {
   reflect: "#c08497",
   goal: "#00979b"
@@ -290,10 +282,10 @@ var apiUpload = axios.create({
   }, function (error) {
     if (error.response.status === 401) {
       localStorage.clear();
-      window.location.href = "/";
+      window.location.href = "/login";
     }
 
-    return Promise.reject(error.message);
+    return Promise.reject(error);
   });
 });
 
@@ -330,8 +322,8 @@ var defaultInfo = {
   captcha: "",
   rememberMe: false
 };
-var HOMEPAGE_TEACHER = "/home";
-var HOMEPAGE_STUDENT = "/studenthome";
+var HOMEPAGE_TEACHER = "/my-one-to-one/up-coming";
+var HOMEPAGE_STUDENT = "/my-one-to-one/up-coming";
 var HOMEPAGE_ADMIN = "/admin/dashboard";
 var HOMEPAGE_PARENT = "/parent";
 var HOMEPAGE_DISTRICT = "/admin/schools";
@@ -499,30 +491,39 @@ var BlockLogin = function BlockLogin(_ref) {
         setFieldValue = formikProps.setFieldValue;
     var emailError = touched.email && errors.email;
     var passwordError = touched.password && errors.password;
-    return React.createElement(Form, {
+    return React.createElement(Row, {
+      className: "" + styles["box-login"]
+    }, React.createElement(Col, {
+      lg: 4,
+      md: 4,
+      className: "" + styles["img-box"]
+    }, React.createElement("img", {
+      src: "/images/img-login.png",
+      className: "" + styles["img-login"]
+    })), React.createElement(Col, {
+      className: "p-0"
+    }, React.createElement(Form, {
       className: "" + styles["block-login"],
       onSubmit: handleSubmit
-    }, React.createElement(CloseBlock, {
-      to: "/"
-    }), React.createElement("p", {
+    }, React.createElement("div", {
+      className: "" + styles["block-form"]
+    }, React.createElement("p", {
       className: "" + styles["title-login"]
-    }, "Login"), React.createElement(FormGroup, {
+    }, "Sign in"), React.createElement("p", {
+      className: "recover-account"
+    }, "Lorem ipsum dolor sit amet, consectetur adipiscing elit."), React.createElement(FormGroup, {
       className: "" + styles["form-user-name"]
-    }, React.createElement(Label, {
-      "for": "userName"
-    }, "user name"), React.createElement(Input, {
+    }, React.createElement(Input, {
       type: "text",
       name: "email",
-      placeholder: "User name",
+      placeholder: "Email",
       value: values.email,
       onChange: handleChange,
       onBlur: handleBlur("email"),
       required: true
     }), emailError && React.createElement(ErrorHandler, {
       text: errors.email
-    })), React.createElement(FormGroup, null, React.createElement(Label, {
-      "for": "password"
-    }, "Password"), React.createElement(PasswordInput, {
+    })), React.createElement(FormGroup, null, React.createElement(PasswordInput, {
       isShowPassword: isShowPassword,
       togglePasswordVisible: togglePasswordVisible,
       onChange: function onChange(e) {
@@ -533,19 +534,17 @@ var BlockLogin = function BlockLogin(_ref) {
     })), React.createElement(FormGroup, null, React.createElement(GoogleReCaptcha, {
       action: "login",
       onVerify: handleVerify
-    })), React.createElement(Col, null, React.createElement("button", {
+    })), React.createElement(Col, {
+      className: "p-0 mt-5"
+    }, React.createElement("button", {
       className: "" + styles["btn-login"],
       type: "submit"
-    }, "Login")), React.createElement("div", {
-      className: "d-flex justify-content-center"
+    }, "LOGIN")), React.createElement("div", {
+      className: "d-flex justify-content-end"
     }, React.createElement(Link, {
       to: "/forgot-password",
-      className: "" + styles["forgot-password"]
-    }, "Forgot password or username?")), React.createElement("p", {
-      className: "" + styles["term-and-conditions"]
-    }, "Check out our ", React.createElement("a", {
-      href: ""
-    }, "Terms and Conditions")));
+      className: "" + styles["link-to-login"]
+    }, "Forgot password ?"))))));
   });
 };
 
@@ -735,16 +734,25 @@ var BlockForgetPassword = function BlockForgetPassword() {
         values = formikProps.values,
         touched = formikProps.touched,
         errors = formikProps.errors;
-    return React.createElement("div", {
-      className: styles["block-forgot-password"] + " " + styles["block-login"] + " d-flex flex-column align-items-center"
+    return React.createElement(Row, {
+      className: "" + styles["box-login"]
+    }, React.createElement(Col, {
+      lg: 4,
+      md: 4,
+      className: "" + styles["img-box"]
+    }, React.createElement("img", {
+      src: "/images/img-login.png",
+      className: "" + styles["img-login"]
+    })), React.createElement(Col, {
+      className: "p-0"
     }, React.createElement("div", {
-      className: "w-100"
-    }, React.createElement(CloseBlock, {
-      to: "/"
-    })), React.createElement("p", {
-      className: styles["title-login"] + " " + styles["title-forgot-password"]
+      className: "" + styles["block-login"]
+    }, React.createElement("div", {
+      className: "" + styles["block-form"]
+    }, React.createElement("p", {
+      className: styles["title-login"] + " "
     }, "Forgot password"), React.createElement("p", {
-      className: "" + styles["recover-account"]
+      className: styles["recover-account"] + " mb-5"
     }, "Enter email to recover your account"), React.createElement("div", {
       className: "w-100"
     }, React.createElement(Label, {
@@ -761,28 +769,22 @@ var BlockForgetPassword = function BlockForgetPassword() {
     })), React.createElement(GoogleReCaptcha, {
       action: "forgetPass",
       onVerify: handleVerify
-    }), React.createElement(Col, null, React.createElement("button", {
-      className: styles["btn-login"] + " mt-4",
+    }), React.createElement(Col, {
+      className: "p-0"
+    }, React.createElement("button", {
+      className: styles["btn-login"] + " mt-5",
       onClick: function onClick() {
         return handleSubmit();
       }
     }, "Continue")), React.createElement("p", {
-      className: styles[""] + " w-100 d-flex justify-content-center align-items-end flex-grow-1"
+      className: "d-flex justify-content-end"
     }, React.createElement(Link, {
       to: "/login",
-      className: styles[""] + " " + styles["return-to-login"]
-    }, "Return to login")));
+      className: "" + styles["link-to-login"]
+    }, "Return to login"))))));
   });
 };
 
-var CloseButton = function CloseButton(_ref) {
-  var toggle = _ref.toggle;
-  return React.createElement("a", {
-    onClick: toggle,
-    className: "" + styles["btn-close"]
-  }, "\xD7");
-};
-
 var initialValues$1 = {
   token: "",
   password: "",
@@ -808,12 +810,6 @@ var BlockResetPassword = function BlockResetPassword() {
       isShowReTypePassword = _useForgotPassword.isShowReTypePassword,
       setIsShowReTypePassword = _useForgotPassword.setIsShowReTypePassword;
 
-  var history = useHistory();
-
-  var close = function close() {
-    history.push("/login");
-  };
-
   useEffect(function () {
     checkResetTokenRequest(token);
   }, []);
@@ -832,15 +828,22 @@ var BlockResetPassword = function BlockResetPassword() {
     useEffect(function () {
       setFieldValue("token", token);
     }, []);
-    return React.createElement("div", {
-      className: styles["block-login"] + " " + styles["block-reset-password"] + " d-flex flex-column align-items-center"
+    return React.createElement(Row, {
+      className: "" + styles["box-login"]
+    }, React.createElement(Col, {
+      lg: 4,
+      md: 4,
+      className: "" + styles["img-box"]
+    }, React.createElement("img", {
+      src: "/images/img-login.png",
+      className: "" + styles["img-login"]
+    })), React.createElement(Col, {
+      className: "p-0"
     }, React.createElement("div", {
-      className: "w-100"
-    }, React.createElement(CloseButton, {
-      toggle: function toggle() {
-        return close();
-      }
-    })), React.createElement("p", {
+      className: "" + styles["block-login"]
+    }, React.createElement("div", {
+      className: "" + styles["block-form"]
+    }, React.createElement("p", {
       className: "" + styles["title-login"]
     }, "Reset Password"), React.createElement("div", {
       className: "w-100"
@@ -869,20 +872,22 @@ var BlockResetPassword = function BlockResetPassword() {
     }), touched.reEnterPassword && errors.reEnterPassword && React.createElement(ErrorHandler, {
       text: errors.reEnterPassword
     })) : React.createElement(React.Fragment, null, React.createElement("p", {
-      className: "w-100 text-center"
+      className: styles["recover-account"] + " mb-5"
     }, "Invalid reset password link"), React.createElement("p", {
       className: "w-100"
-    }, "It may have been accessed before or expired or you have just tried to reset another account's password"))), validLink && React.createElement(Col, null, React.createElement("button", {
+    }, "It may have been accessed before or expired or you have just tried to reset another account's password"))), validLink && React.createElement(Col, {
+      className: "p-0"
+    }, React.createElement("button", {
       className: styles["btn-login"] + " mt-4",
       onClick: function onClick() {
         return handleSubmit();
       }
     }, "Confirm")), React.createElement("p", {
-      className: "w-100 d-flex justify-content-center align-items-end flex-grow-1"
+      className: "d-flex justify-content-end"
     }, React.createElement(Link, {
       to: "/login",
-      className: "" + styles["return-to-login"]
-    }, "Return to login")));
+      className: "" + styles["link-to-login"]
+    }, "Return to login"))))));
   });
 };
 
@@ -965,8 +970,8 @@ function _createForOfIteratorHelperLoose(o, allowArrayLike) {
   return it.next.bind(it);
 }
 
-var HOMEPAGE_TEACHER$1 = "/home";
-var HOMEPAGE_STUDENT$1 = "/studenthome";
+var HOMEPAGE_TEACHER$1 = "/my-one-to-one/up-coming";
+var HOMEPAGE_STUDENT$1 = "/my-one-to-one/up-coming";
 var HOMEPAGE_ADMIN$1 = "/admin/dashboard";
 var HOMEPAGE_PARENT$1 = "/parent";
 var HOMEPAGE_DISTRICT$1 = "/admin/schools";
@@ -1056,12 +1061,6 @@ var BlockTwoFactorLogin = function BlockTwoFactorLogin() {
   var _useLoginTwoFactor = useLoginTwoFactor(),
       userLoginTwoFactor = _useLoginTwoFactor.userLoginTwoFactor;
 
-  var history = useHistory();
-
-  var close = function close() {
-    history.push("/login");
-  };
-
   return React.createElement(Formik, {
     initialValues: _extends({}, initialValues$2, {
       id: id
@@ -1078,21 +1077,26 @@ var BlockTwoFactorLogin = function BlockTwoFactorLogin() {
         handleSubmit = formikProps.handleSubmit,
         touched = formikProps.touched,
         errors = formikProps.errors;
-    return React.createElement("div", {
-      className: styles["block-login"] + " " + styles["block-reset-password"] + " d-flex flex-column align-items-center"
+    return React.createElement(Row, {
+      className: "" + styles["box-login"]
+    }, React.createElement(Col, {
+      lg: 4,
+      md: 4,
+      className: "" + styles["img-box"]
+    }, React.createElement("img", {
+      src: "/images/img-login.png",
+      className: "" + styles["img-login"]
+    })), React.createElement(Col, {
+      className: "p-0"
     }, React.createElement("div", {
-      className: "w-100"
-    }, React.createElement(CloseButton, {
-      toggle: function toggle() {
-        return close();
-      }
-    })), React.createElement("p", {
+      className: "" + styles["block-login"]
+    }, React.createElement("div", {
+      className: "" + styles["block-form"]
+    }, React.createElement("p", {
       className: "" + styles["title-login"]
     }, "Additional Verification"), React.createElement("p", {
-      className: "text-small text-secondary"
-    }, React.createElement("i", null, "Check your email to get Additional Verification. This code will be expired in 5 minutes")), React.createElement("div", {
-      className: "w-100"
-    }, React.createElement(FormGroup, null, React.createElement(Label, null, "Additional Verification"), React.createElement(Input, {
+      className: "recover-account"
+    }, "Check your email to get Additional Verification. This code will be expired in 5 minutes"), React.createElement("div", null, React.createElement(FormGroup, null, React.createElement(Label, null, "Additional Verification"), React.createElement(Input, {
       name: "twoFactorCode",
       value: values.twoFactorCode,
       onChange: handleChange
@@ -1108,17 +1112,19 @@ var BlockTwoFactorLogin = function BlockTwoFactorLogin() {
     }), React.createElement(Label, {
       "for": "rememberMe",
       className: "" + styles["remember"]
-    }, "Remember my browser & IP"))), React.createElement(Col, null, React.createElement("button", {
-      className: styles["btn-login"] + " mt-4",
+    }, "Remember my browser & IP"))), React.createElement(Col, {
+      className: "p-0 mt-5"
+    }, React.createElement("button", {
+      className: styles["btn-login"] + " ",
       onClick: function onClick() {
         return handleSubmit();
       }
     }, "Confirm")), React.createElement("p", {
-      className: "w-100 d-flex justify-content-center align-items-end flex-grow-1"
+      className: "d-flex justify-content-end"
     }, React.createElement(Link, {
       to: "/login",
-      className: "" + styles["return-to-login"]
-    }, "Return to login")));
+      className: "" + styles["link-to-login"]
+    }, "Return to login"))))));
   });
 };
 
@@ -1146,10 +1152,10 @@ var Login = function Login(props) {
   }, React.createElement(Row, {
     className: "h-100"
   }, React.createElement(Col, {
-    lg: 6,
+    lg: 12,
     md: 12,
     xs: 12,
-    className: "offset-lg-6 d-flex justify-content-center h-100 align-items-center"
+    className: "d-flex justify-content-center h-100 align-items-center"
   }, React.createElement(GoogleReCaptchaProvider, {
     useRecaptchaNet: true,
     reCaptchaKey: GOOGLE_RECAPTCHA_KEY,
@@ -1917,7 +1923,7 @@ var useFilters = function useFilters() {
   var changeFilters = function changeFilters(updatedFilters) {
     var newFilters = _extends({}, filters, updatedFilters);
 
-    if (!!newFilters.searchString) {
+    if (!!newFilters.searchString && !!updatedFilters.searchString && updatedFilters.searchString != filters.searchString) {
       newFilters.currentPage = 1;
     }