mario-core 2.9.239-release → 2.9.241-release

package/dist/index.js

@@ -853,7 +853,7 @@ var academic_year = "AcademicYear";
 var all_of_the_students_report_manageable_stress_levels = "All of the students report manageable stress levels";
 var growth = "growth";
 var relationships = "relationships";
-var productivity = "productivity";
+var productivity = "Productivity";
 var academics = "academics";
 var percent = "percent";
 var unmotivated = "Unmotivated";
@@ -4791,7 +4791,7 @@ var academic_year$1 = "AcademicYear";
 var all_of_the_students_report_manageable_stress_levels$1 = "All of the students report manageable stress levels";
 var growth$1 = "growth";
 var relationships$1 = "relationships";
-var productivity$1 = "productivity";
+var productivity$1 = "Productivity";
 var academics$1 = "academics";
 var percent$1 = "percent";
 var unmotivated$1 = "Unmotivated";
@@ -12606,14 +12606,14 @@ var academic_year$3 = "Año académico";
 var all_of_the_students_report_manageable_stress_levels$3 = "Todos los estudiantes reportan niveles de estrés manejables";
 var growth$3 = "crecimiento";
 var relationships$3 = "relaciones";
-var productivity$3 = "productividad";
+var productivity$3 = "Productividad";
 var academics$3 = "académica";
 var percent$3 = "por ciento";
 var unmotivated$3 = "Desmotivado";
 var comfort$3 = "Comodidad";
 var stretch$3 = "Estirar";
 var strain$3 = "Cepa";
-var overwhelmed_overwhelmed = "ABURRADOAbrumado";
+var overwhelmed$3 = "ABURRADOAbrumado";
 var edit_student_profile$3 = "Editar perfil de estudiante";
 var teacher$3 = "maestro";
 var created$3 = "creado";
@@ -14546,7 +14546,7 @@ var lang_es = {
 	comfort: comfort$3,
 	stretch: stretch$3,
 	strain: strain$3,
-	overwhelmed_overwhelmed: overwhelmed_overwhelmed,
+	overwhelmed: overwhelmed$3,
 	edit_student_profile: edit_student_profile$3,
 	teacher: teacher$3,
 	created: created$3,
@@ -16514,7 +16514,7 @@ var unmotivated$4 = "无动力";
 var comfort$4 = "舒适";
 var stretch$4 = "伸展";
 var strain$4 = "紧张";
-var overwhelmed_overwhelmed$1 = "不知所措";
+var overwhelmed$4 = "不知所措";
 var edit_student_profile$4 = "编辑学生资料";
 var teacher$4 = "老师";
 var created$4 = "创建";
@@ -18476,7 +18476,7 @@ var lang_zh = {
 	comfort: comfort$4,
 	stretch: stretch$4,
 	strain: strain$4,
-	overwhelmed_overwhelmed: overwhelmed_overwhelmed$1,
+	overwhelmed: overwhelmed$4,
 	edit_student_profile: edit_student_profile$4,
 	teacher: teacher$4,
 	created: created$4,
@@ -19632,6 +19632,7 @@ var GOOGLE_RECAPTCHA_KEY = "6LfNtLUaAAAAAL24lbBV11jS-gBtt1mhtxb4NXs0";
 var INIT_AMPLITUDE_KEY_PROD = "860fa99c52ae79d98e904b4c862ddaac";
 var INIT_AMPLITUDE_KEY_STAGE = "adf89d0ed9b0d5fcc0d1bcfd535345dc";
 var ACCESS_TOKEN = "ACCESS_TOKEN";
+var IS_USER_SESSION_BROWSER = "IS_USER_SESSION_BROWSER";
 var DEFAULT_PAGE_SIZE_VALUES = [{
   label: "10",
   value: 10
@@ -19828,7 +19829,7 @@ function _catch(body, recover) {
 	return result;
 }
 
-var styles = {"btn-login-google":"_2HqmH","notification-count":"_2sew7","text-introduction":"_3OgWF","btn-trans-border":"_r9cAh","contact":"_NszFe","learn-more":"_MDjzH","title-quote":"_1Swkw","descriptions-quote":"_gi8vj","box-login":"_38Lo1","block-verification":"_1OzGy","block-login":"_wWIyO","title-login":"_3nuns","title-forgot-password":"_21qb6","btn-close":"_NhW9l","btn-login":"_3IL10","digital-privacy-icon":"_141p1","return-to-login":"_Ce3Kg","recover-account":"_2t6d9","link-to-login":"_3bDsd","remember":"_11FZt","term-and-conditions":"_3LXoI","descriptions-forgot-pass":"_PMcjT","content-icon":"_2rZY6","descriptions-icon":"_3SOdX","title-icon":"_y9lM2","nav-home":"_1TT1q","box-introduction":"_32V6L","icon":"_20YJX","form-user-name":"_39BJD","input":"_ozRAq","checkbox-remember":"_2K9b2","btn-rounder":"_2VvIr","btn-active":"_2A0HF","block-reset-password":"_23Sua","block-forgot-pass":"_3CWP6","page-not-login":"_3Wmco","content-quote":"_13Rk0","home-page":"_o6HKW","bg-animate":"_30npl","active":"_3oAH-","show":"_16rY4","fade-in":"_26nbh","behind":"_3A7Vv","login":"_F-hjL","login-content":"_149oA","logo-home":"_24U3W","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","box-sidebar":"_2vcmv","sidebar-logo":"_1hXpy","sidebar-nav-links":"_3vb3s","c-active":"_36jSM","sidebar-nav-links-hover":"_DNrus","box-sidebar-header":"_3NEZj","box-logout":"_1wUDG","sidebar-btn-minimized":"_1S7Px","sidebar-minimized-logo":"_3846X","sidebar-logout":"_2P85D","nav-mobile":"_1qjbW","filter-media-file":"_1I62C","div":"_3cLcM","dropdown-menu":"_1krbH","header-avatar":"_RQaHE","dropdown-menu-flag":"_XK8oS","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","dropdown-content-language":"_3ajui","dropdown-item-language":"_3Y_y4","dropdown-item-language-active":"_CzNMi","popover__sort__item":"_1ocBa","popover__sort__item--active":"_18NhM","popover__search__icon":"_2bquW","popover__search__input":"_3A4G4","popover__options":"_1MsEW","button-export":"_2rTzM","button-content":"_18y0w","button-icon":"_3cZAT","hide-in-mobile":"_1INnO","hamburger-menu":"_2yRc8","box-content-home-page":"_ABUIP","collapse-box":"_WX97m","hide-in-desktop":"_2LIqK","control-input":"_2Zz97","custom-control":"_3-yp5","item-select-role":"_1KcY7","item-role-active":"_dOVso","model-switch-roles":"_3ZqxI","title":"_g-p72","btn-login-with-sso":"_DrSlA","app-alert":"_3Vgah","app-alert--success":"_1jraB"};
+var styles = {"btn-login-google":"_2HqmH","notification-count":"_2sew7","text-introduction":"_3OgWF","btn-trans-border":"_r9cAh","contact":"_NszFe","learn-more":"_MDjzH","title-quote":"_1Swkw","descriptions-quote":"_gi8vj","box-login":"_38Lo1","block-verification":"_1OzGy","block-login":"_wWIyO","title-login":"_3nuns","title-forgot-password":"_21qb6","btn-close":"_NhW9l","btn-login":"_3IL10","school-icon":"_2OUwW","school-name":"_2Owso","login-description":"_fx-kA","digital-privacy-icon":"_141p1","return-to-login":"_Ce3Kg","recover-account":"_2t6d9","link-to-login":"_3bDsd","privacy-policy":"_I4SVu","remember":"_11FZt","term-and-conditions":"_3LXoI","descriptions-forgot-pass":"_PMcjT","content-icon":"_2rZY6","descriptions-icon":"_3SOdX","title-icon":"_y9lM2","nav-home":"_1TT1q","box-introduction":"_32V6L","icon":"_20YJX","checkbox-keep-login":"_1AiX0","label-keep-login":"_2uNvW","option-text":"_pqn4y","form-user-name":"_39BJD","input":"_ozRAq","checkbox-remember":"_2K9b2","btn-rounder":"_2VvIr","btn-active":"_2A0HF","block-reset-password":"_23Sua","block-forgot-pass":"_3CWP6","page-not-login":"_3Wmco","content-quote":"_13Rk0","home-page":"_o6HKW","bg-animate":"_30npl","active":"_3oAH-","show":"_16rY4","fade-in":"_26nbh","behind":"_3A7Vv","login":"_F-hjL","login-content":"_149oA","logo-home":"_24U3W","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","box-sidebar":"_2vcmv","sidebar-logo":"_1hXpy","sidebar-nav-links":"_3vb3s","c-active":"_36jSM","sidebar-nav-links-hover":"_DNrus","box-sidebar-header":"_3NEZj","box-logout":"_1wUDG","sidebar-btn-minimized":"_1S7Px","sidebar-minimized-logo":"_3846X","sidebar-logout":"_2P85D","nav-mobile":"_1qjbW","filter-media-file":"_1I62C","div":"_3cLcM","dropdown-menu":"_1krbH","header-avatar":"_RQaHE","dropdown-menu-flag":"_XK8oS","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","dropdown-content-language":"_3ajui","dropdown-item-language":"_3Y_y4","dropdown-item-language-active":"_CzNMi","popover__sort__item":"_1ocBa","popover__sort__item--active":"_18NhM","popover__search__icon":"_2bquW","popover__search__input":"_3A4G4","popover__options":"_1MsEW","button-export":"_2rTzM","button-content":"_18y0w","button-icon":"_3cZAT","hide-in-mobile":"_1INnO","hamburger-menu":"_2yRc8","box-content-home-page":"_ABUIP","collapse-box":"_WX97m","hide-in-desktop":"_2LIqK","control-input":"_2Zz97","custom-control":"_3-yp5","item-select-role":"_1KcY7","item-role-active":"_dOVso","model-switch-roles":"_3ZqxI","title":"_g-p72","btn-login-with-sso":"_DrSlA","app-alert":"_3Vgah","app-alert--success":"_1jraB"};
 
 var style = {
   fontSize: "0.85rem"
@@ -37050,13 +37051,14 @@ var containerStyle = {
   position: "relative"
 };
 var inputStyle = {
-  backgroundColor: "#f7f9fc",
+  backgroundColor: "#ffffff",
   paddingRight: "50px"
 };
 var eyeIconStyle = {
   fontSize: "20px",
   position: "absolute",
-  right: "10px"
+  right: "10px",
+  color: "#316CD9"
 };
 
 var PasswordInput = function PasswordInput(_ref) {
@@ -37167,7 +37169,8 @@ function _createForOfIteratorHelperLoose(o, allowArrayLike) {
 
 var getAccessToken = (function () {
   try {
-    return localStorage.getItem(ACCESS_TOKEN);
+    var isSessionUserBrowser = sessionStorage.getItem(IS_USER_SESSION_BROWSER);
+    return !isSessionUserBrowser ? localStorage.getItem(ACCESS_TOKEN) : sessionStorage.getItem(ACCESS_TOKEN);
   } catch (err) {
     return null;
   }
@@ -37265,6 +37268,8 @@ var apiUpload = axios.create({
       }
 
       localStorage.removeItem(ACCESS_TOKEN);
+      sessionStorage.removeItem(ACCESS_TOKEN);
+      sessionStorage.removeItem(IS_USER_SESSION_BROWSER);
       localStorage.removeItem("USER_EMAIL");
       localStorage.removeItem("ROLES");
       window.location.href = "/login";
@@ -37343,6 +37348,9 @@ var SCHOOL_URL = BASE_URL + "/api/school";
 var getSchoolSettings = function getSchoolSettings() {
   return api.get(SCHOOL_URL + "/settings");
 };
+var getInfo$1 = function getInfo() {
+  return api.get(SCHOOL_URL + "/info");
+};
 
 var TypeLogin;
 
@@ -37402,11 +37410,13 @@ var msalConfig = {
   }
 };
 
+var _sessionStorage$getIt;
 var defaultInfo = {
   email: "",
   password: "",
   captcha: "",
-  rememberMe: false
+  rememberMe: false,
+  isSessionUserBrowser: (_sessionStorage$getIt = !!sessionStorage.getItem(IS_USER_SESSION_BROWSER)) != null ? _sessionStorage$getIt : false
 };
 var HOMEPAGE_TEACHER = "/home";
 var HOMEPAGE_STUDENT = "/home";
@@ -37446,17 +37456,24 @@ var useLogin = function useLogin() {
   var _useState4 = React.useState(false),
       openModelAssign = _useState4[0];
 
-  var _useState5 = React.useState(),
-      msalInstance = _useState5[0],
-      setMsalInstance = _useState5[1];
+  var _useState5 = React.useState({
+    schoolName: "",
+    schoolLogo: ""
+  }),
+      school = _useState5[0],
+      setSchool = _useState5[1];
+
+  var _useState6 = React.useState(),
+      msalInstance = _useState6[0],
+      setMsalInstance = _useState6[1];
 
   var toggle = React.useCallback(function () {
     setOpenLogin(!openLogin);
   }, [openLogin]);
 
-  var _useState6 = React.useState(false),
-      isShowPassword = _useState6[0],
-      setIsShowPassword = _useState6[1];
+  var _useState7 = React.useState(false),
+      isShowPassword = _useState7[0],
+      setIsShowPassword = _useState7[1];
 
   React.useEffect(function () {
     document.title = TITLE;
@@ -37467,6 +37484,7 @@ var useLogin = function useLogin() {
 
   var handleCancelModelAssign = function handleCancelModelAssign() {
     localStorage.removeItem(ACCESS_TOKEN);
+    sessionStorage.removeItem(ACCESS_TOKEN);
     localStorage.removeItem("USER_EMAIL");
   };
 
@@ -37516,7 +37534,7 @@ var useLogin = function useLogin() {
   };
 
   var isDistrict = window.location.host.includes("-district");
-  var userLogin = React.useCallback(function (data) {
+  var getSchoolInfo = React.useCallback(function () {
     try {
       var _temp7 = function _temp7() {
         dispatch(setLoading(false));
@@ -37525,8 +37543,37 @@ var useLogin = function useLogin() {
       dispatch(setLoading(true));
 
       var _temp8 = _catch(function () {
-        var _data$email, _data$password;
+        return Promise.resolve(getInfo$1()).then(function (res) {
+          if (!!res.data) {
+            setSchool(res.data);
+          }
+        });
+      }, function (err) {
+        var _err$response2, _err$response2$data;
+
+        dispatch(setAlert({
+          type: "danger",
+          message: ((_err$response2 = err.response) === null || _err$response2 === void 0 ? void 0 : (_err$response2$data = _err$response2.data) === null || _err$response2$data === void 0 ? void 0 : _err$response2$data.title) || err.message
+        }));
+      });
+
+      return Promise.resolve(_temp8 && _temp8.then ? _temp8.then(_temp7) : _temp7(_temp8));
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  }, []);
+  var userLogin = React.useCallback(function (data) {
+    try {
+      var _temp11 = function _temp11() {
+        dispatch(setLoading(false));
+      };
+
+      dispatch(setLoading(true));
 
+      var _temp12 = _catch(function () {
+        var _data$isSessionUserBr, _data$email, _data$password;
+
+        var isSessionUserBrowser = (_data$isSessionUserBr = data === null || data === void 0 ? void 0 : data.isSessionUserBrowser) != null ? _data$isSessionUserBr : false;
         return Promise.resolve(logIn(_extends({}, data, {
           email: data === null || data === void 0 ? void 0 : (_data$email = data.email) === null || _data$email === void 0 ? void 0 : _data$email.trim(),
           password: data === null || data === void 0 ? void 0 : (_data$password = data.password) === null || _data$password === void 0 ? void 0 : _data$password.trim()
@@ -37540,7 +37587,15 @@ var useLogin = function useLogin() {
               email = _res$data2.email,
               profileImageFileName = _res$data2.profileImageFileName,
               isLoginFirst = _res$data2.isLoginFirst;
-          localStorage.setItem(ACCESS_TOKEN, token);
+
+          if (!isSessionUserBrowser) {
+            sessionStorage.removeItem(IS_USER_SESSION_BROWSER);
+            localStorage.setItem(ACCESS_TOKEN, token);
+          } else {
+            sessionStorage.setItem(ACCESS_TOKEN, token);
+            sessionStorage.setItem(IS_USER_SESSION_BROWSER, isSessionUserBrowser);
+          }
+
           localStorage.removeItem(NOTIFICATION_ALERT_KEY);
           dispatch(setUser({
             id: id,
@@ -37601,16 +37656,17 @@ var useLogin = function useLogin() {
           }
         });
       }, function (err) {
-        var _err$response2, _err$response2$data;
+        var _err$response3, _err$response3$data;
 
         dispatch(setAlert({
           type: "danger",
-          message: ((_err$response2 = err.response) === null || _err$response2 === void 0 ? void 0 : (_err$response2$data = _err$response2.data) === null || _err$response2$data === void 0 ? void 0 : _err$response2$data.title) || err.message || "Login failed"
+          message: ((_err$response3 = err.response) === null || _err$response3 === void 0 ? void 0 : (_err$response3$data = _err$response3.data) === null || _err$response3$data === void 0 ? void 0 : _err$response3$data.title) || err.message || "Login failed"
         }));
         localStorage.removeItem(ACCESS_TOKEN);
+        sessionStorage.removeItem(ACCESS_TOKEN);
       });
 
-      return Promise.resolve(_temp8 && _temp8.then ? _temp8.then(_temp7) : _temp7(_temp8));
+      return Promise.resolve(_temp12 && _temp12.then ? _temp12.then(_temp11) : _temp11(_temp12));
     } catch (e) {
       return Promise.reject(e);
     }
@@ -37618,21 +37674,21 @@ var useLogin = function useLogin() {
 
   var getInfoGoogle = function getInfoGoogle() {
     try {
-      var _temp10 = _catch(function () {
+      var _temp14 = _catch(function () {
         return Promise.resolve(getGoogleClientId()).then(function (res) {
           setGoogleClientId(res.data.googleClientId);
           setGoogleRecaptchaId(res.data.googleCaptchaId);
         });
       }, function (err) {
-        var _err$response3, _err$response3$data;
+        var _err$response4, _err$response4$data;
 
         dispatch(setAlert({
           type: "danger",
-          message: ((_err$response3 = err.response) === null || _err$response3 === void 0 ? void 0 : (_err$response3$data = _err$response3.data) === null || _err$response3$data === void 0 ? void 0 : _err$response3$data.title) || err.message || "Login failed"
+          message: ((_err$response4 = err.response) === null || _err$response4 === void 0 ? void 0 : (_err$response4$data = _err$response4.data) === null || _err$response4$data === void 0 ? void 0 : _err$response4$data.title) || err.message || "Login failed"
         }));
       });
 
-      return Promise.resolve(_temp10 && _temp10.then ? _temp10.then(function () {}) : void 0);
+      return Promise.resolve(_temp14 && _temp14.then ? _temp14.then(function () {}) : void 0);
     } catch (e) {
       return Promise.reject(e);
     }
@@ -37640,19 +37696,19 @@ var useLogin = function useLogin() {
 
   var fnIsCheckLogin = React.useCallback(function (type, data, token, clickHandler) {
     try {
-      var _temp16 = function _temp16() {
+      var _temp20 = function _temp20() {
         dispatch(setLoading(false));
       };
 
       dispatch(setLoading(true));
 
-      var _temp17 = _catch(function () {
+      var _temp21 = _catch(function () {
         return Promise.resolve(checkUserGoogle(type, data)).then(function (res) {
           var checkUser = res.data;
 
-          var _temp13 = function () {
+          var _temp17 = function () {
             if (checkUser) {
-              var _temp18 = function _temp18() {
+              var _temp22 = function _temp22() {
                 return Promise.resolve(userLogin(_dataUser)).then(function () {
                   dispatch(setIsLoginGoogle(false));
                 });
@@ -37668,7 +37724,7 @@ var useLogin = function useLogin() {
                 loginType: LoginType.Google
               };
 
-              var _temp19 = function () {
+              var _temp23 = function () {
                 if (clickHandler != null) {
                   return Promise.resolve(clickHandler()).then(function (clickHandlerRes) {
                     _dataUser.captcha = clickHandlerRes;
@@ -37676,24 +37732,24 @@ var useLogin = function useLogin() {
                 }
               }();
 
-              return _temp19 && _temp19.then ? _temp19.then(_temp18) : _temp18(_temp19);
+              return _temp23 && _temp23.then ? _temp23.then(_temp22) : _temp22(_temp23);
             } else {
               dispatch(setIsLoginGoogle(true));
             }
           }();
 
-          if (_temp13 && _temp13.then) return _temp13.then(function () {});
+          if (_temp17 && _temp17.then) return _temp17.then(function () {});
         });
       }, function (err) {
-        var _err$response4, _err$response4$data;
+        var _err$response5, _err$response5$data;
 
         dispatch(setAlert({
           type: "danger",
-          message: ((_err$response4 = err.response) === null || _err$response4 === void 0 ? void 0 : (_err$response4$data = _err$response4.data) === null || _err$response4$data === void 0 ? void 0 : _err$response4$data.title) || err.message || "Login failed"
+          message: ((_err$response5 = err.response) === null || _err$response5 === void 0 ? void 0 : (_err$response5$data = _err$response5.data) === null || _err$response5$data === void 0 ? void 0 : _err$response5$data.title) || err.message || "Login failed"
         }));
       });
 
-      return Promise.resolve(_temp17 && _temp17.then ? _temp17.then(_temp16) : _temp16(_temp17));
+      return Promise.resolve(_temp21 && _temp21.then ? _temp21.then(_temp20) : _temp20(_temp21));
     } catch (e) {
       return Promise.reject(e);
     }
@@ -37701,14 +37757,14 @@ var useLogin = function useLogin() {
 
   var submitLogin = function submitLogin(teacherId, clickHandler) {
     try {
-      var _temp23 = function _temp23() {
+      var _temp27 = function _temp27() {
         dispatch(setIsLoginGoogle(false));
         dispatch(setLoading(false));
       };
 
       dispatch(setLoading(true));
 
-      var _temp24 = _catch(function () {
+      var _temp28 = _catch(function () {
         var data = {
           firstName: infoUser.firstName,
           lastName: infoUser.lastName,
@@ -37719,7 +37775,7 @@ var useLogin = function useLogin() {
           teacherId: teacherId
         };
         return Promise.resolve(registerUserStudent(data)).then(function (res) {
-          var _temp20 = function () {
+          var _temp24 = function () {
             if (res.data) {
               return Promise.resolve(clickHandler()).then(function (clickHandlerRes) {
                 var dataLogin = {
@@ -37739,18 +37795,18 @@ var useLogin = function useLogin() {
             }
           }();
 
-          if (_temp20 && _temp20.then) return _temp20.then(function () {});
+          if (_temp24 && _temp24.then) return _temp24.then(function () {});
         });
       }, function (err) {
-        var _err$response5, _err$response5$data;
+        var _err$response6, _err$response6$data;
 
         dispatch(setAlert({
           type: "danger",
-          message: ((_err$response5 = err.response) === null || _err$response5 === void 0 ? void 0 : (_err$response5$data = _err$response5.data) === null || _err$response5$data === void 0 ? void 0 : _err$response5$data.title) || err.message || "Login failed"
+          message: ((_err$response6 = err.response) === null || _err$response6 === void 0 ? void 0 : (_err$response6$data = _err$response6.data) === null || _err$response6$data === void 0 ? void 0 : _err$response6$data.title) || err.message || "Login failed"
         }));
       });
 
-      return Promise.resolve(_temp24 && _temp24.then ? _temp24.then(_temp23) : _temp23(_temp24));
+      return Promise.resolve(_temp28 && _temp28.then ? _temp28.then(_temp27) : _temp27(_temp28));
     } catch (e) {
       return Promise.reject(e);
     }
@@ -37758,15 +37814,16 @@ var useLogin = function useLogin() {
 
   var getInformationSetting = function getInformationSetting() {
     try {
-      var _temp26 = _catch(function () {
+      var _temp30 = _catch(function () {
         return Promise.resolve(getSchoolSettings()).then(function (res) {
           dispatch(setSandboxMode(res.data.isSandboxMode));
+          setSchool(res.data);
         });
       }, function (err) {
         console.error(err);
       });
 
-      return Promise.resolve(_temp26 && _temp26.then ? _temp26.then(function () {}) : void 0);
+      return Promise.resolve(_temp30 && _temp30.then ? _temp30.then(function () {}) : void 0);
     } catch (e) {
       return Promise.reject(e);
     }
@@ -37776,11 +37833,11 @@ var useLogin = function useLogin() {
     try {
       msalInstance.handleRedirectPromise().then(function (tokenResponse) {
         try {
-          var _temp29 = function () {
+          var _temp33 = function () {
             if (!tokenResponse) {
               var accounts = msalInstance.getAllAccounts();
 
-              var _temp30 = function () {
+              var _temp34 = function () {
                 if (accounts.length === 0) {
                   msalInstance.loginRedirect();
                 } else {
@@ -37789,14 +37846,14 @@ var useLogin = function useLogin() {
                 }
               }();
 
-              if (_temp30 && _temp30.then) return _temp30.then(function () {});
+              if (_temp34 && _temp34.then) return _temp34.then(function () {});
             } else {
               var currentAccount = tokenResponse.account;
               return Promise.resolve(getCurrentAccount(currentAccount, clickHandler)).then(function () {});
             }
           }();
 
-          return Promise.resolve(_temp29 && _temp29.then ? _temp29.then(function () {}) : void 0);
+          return Promise.resolve(_temp33 && _temp33.then ? _temp33.then(function () {}) : void 0);
         } catch (e) {
           return Promise.reject(e);
         }
@@ -37849,6 +37906,7 @@ var useLogin = function useLogin() {
   React.useEffect(function () {
     getInformationSetting();
     initInformationSSO();
+    getSchoolInfo();
   }, []);
   return {
     defaultInfo: defaultInfo,
@@ -37865,7 +37923,8 @@ var useLogin = function useLogin() {
     googleRecaptchaId: googleRecaptchaId,
     handleCancelModelAssign: handleCancelModelAssign,
     openModelAssign: openModelAssign,
-    fnLoginSSO: fnLoginSSO
+    fnLoginSSO: fnLoginSSO,
+    school: school
   };
 };
 
@@ -38020,6 +38079,11 @@ var getStaticFileUrl = function getStaticFileUrl(url) {
   if (url.startsWith("/")) return "" + (isStage ? STAGE_DOMAIN : MARIO_SUCCESS_BASE_URL) + url;else return (isStage ? STAGE_DOMAIN : MARIO_SUCCESS_BASE_URL) + "/" + url;
 };
 
+var getFileUrl = function getFileUrl(fileName) {
+  if (!fileName || !fileName.trim()) return "";
+  return BASE_URL + "/api/file/viewer?key=" + fileName;
+};
+
 var schema = yup.object({
   email: yup.string().email("Email is invalid").required("Email is required"),
   password: yup.string().required("Password is required"),
@@ -38028,7 +38092,8 @@ var schema = yup.object({
 
 var BlockLogin = function BlockLogin(_ref) {
   var defaultInfo = _ref.defaultInfo,
-      userLogin = _ref.userLogin;
+      userLogin = _ref.userLogin,
+      school = _ref.school;
 
   var _useLogin = useLogin(),
       isShowPassword = _useLogin.isShowPassword,
@@ -38079,7 +38144,6 @@ var BlockLogin = function BlockLogin(_ref) {
         return;
       }
 
-      console.log("assss");
       var infoLogin = {
         firstName: givenName,
         lastName: familyName,
@@ -38123,21 +38187,25 @@ var BlockLogin = function BlockLogin(_ref) {
         setFieldValue = formikProps.setFieldValue;
     var emailError = touched.email && errors.email;
     var passwordError = touched.password && errors.password;
-    return React__default.createElement(reactstrap.Row, {
-      className: "" + styles["box-login"]
-    }, React__default.createElement(reactstrap.Col, {
-      className: "p-0"
+    return React__default.createElement("div", {
+      className: styles["box-login"] + " w-100"
     }, React__default.createElement(reactstrap.Form, {
       className: "" + styles["block-login"],
       onSubmit: handleSubmit
     }, React__default.createElement("div", {
       className: "" + styles["block-form"]
+    }, React__default.createElement("div", {
+      className: "d-flex align-items-center mb-4"
     }, React__default.createElement("img", {
-      src: "" + getStaticFileUrl("/images/horizontal-logo-blue.svg"),
-      className: "" + styles["img-login-rectangle"]
+      src: "" + (school !== null && school !== void 0 && school.schoolLogo ? getFileUrl("" + (school === null || school === void 0 ? void 0 : school.schoolLogo)) : getStaticFileUrl("/images/logoR.png")),
+      className: styles["school-icon"] + " mr-3"
     }), React__default.createElement("p", {
+      className: styles["school-name"] + " mb-0"
+    }, school.schoolName)), React__default.createElement("p", {
       className: "" + styles["title-login"]
-    }, "Sign in"), React__default.createElement(reactstrap.FormGroup, {
+    }, "Welcome Back!"), React__default.createElement("p", {
+      className: styles["login-description"] + " mb-5"
+    }, "Please enter your MARIO Education account details"), React__default.createElement(reactstrap.FormGroup, {
       className: "" + styles["form-user-name"]
     }, React__default.createElement(reactstrap.Input, {
       type: "text",
@@ -38161,45 +38229,53 @@ var BlockLogin = function BlockLogin(_ref) {
     })), React__default.createElement(reactstrap.FormGroup, null, React__default.createElement(reactGoogleRecaptchaV3.GoogleReCaptcha, {
       action: "login",
       onVerify: handleVerify
-    })), React__default.createElement(reactstrap.Col, {
-      className: "p-0 mt-5"
-    }, React__default.createElement("button", {
-      className: "" + styles["btn-login"],
+    })), React__default.createElement("div", {
+      className: "d-flex justify-content-between"
+    }, React__default.createElement("div", {
+      className: "d-flex align-items-center"
+    }, React__default.createElement("input", {
+      type: "checkbox",
+      checked: !values.isSessionUserBrowser,
+      className: "" + styles["checkbox-keep-login"],
+      onChange: function onChange() {
+        return setFieldValue("isSessionUserBrowser", !values.isSessionUserBrowser);
+      }
+    }), React__default.createElement("p", {
+      className: styles["label-keep-login"] + " mb-0 ml-2"
+    }, "Keep me logged in")), React__default.createElement(reactRouterDom.Link, {
+      to: "/forgot-password",
+      className: "" + styles["link-to-login"]
+    }, "Forgot password?")), React__default.createElement("button", {
+      className: styles["btn-login"] + " mt-5",
       type: "submit"
-    }, "LOGIN")), !!googleClientId && React__default.createElement(reactstrap.Col, {
-      className: "p-0 mt-1 mb-4"
-    }, React__default.createElement(GoogleLogin, {
+    }, "LOG IN"), React__default.createElement("p", {
+      className: styles["option-text"] + " my-3 text-center"
+    }, "OR"), React__default.createElement(reactstrap.Row, {
+      className: "mb-4"
+    }, React__default.createElement(reactstrap.Col, {
+      lg: 6,
+      md: 6,
+      xs: 12,
+      className: "pr-md-2"
+    }, !!googleClientId && React__default.createElement(GoogleLogin, {
       clientId: googleClientId,
-      buttonText: "Login",
+      buttonText: "GOOGLE",
       onSuccess: onSuccessGoogle,
-      cookiePolicy: 'single_host_origin',
-      className: "" + styles["btn-login-google"]
-    })), React__default.createElement("div", {
-      className: styles["btn-login-sso"] + " mb-3"
+      cookiePolicy: "single_host_origin",
+      className: styles["btn-login-google"] + " p-0 mb-4 mb-md-0"
+    })), React__default.createElement(reactstrap.Col, {
+      lg: 6,
+      md: 6,
+      xs: 12,
+      className: styles["btn-login-sso"] + " pl-md-2"
     }, React__default.createElement("div", {
       className: styles["btn-login-with-sso"],
       onClick: function onClick() {
         return fnLoginSSO(clickHandler);
       }
     }, React__default.createElement("img", {
-      src: "images/Single-Sign-On.png"
-    }), " Login with SSO")), React__default.createElement("div", {
-      className: "d-flex justify-content-between"
-    }, React__default.createElement(reactRouterDom.Link, {
-      to: "/forgot-password",
-      className: "" + styles["link-to-login"]
-    }, "Forgot password?"), React__default.createElement("a", {
-      href: "/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: "" + getStaticFileUrl("/images/img-login.jpg"),
-      className: "" + styles["img-login"]
-    })));
+      src: "images/microsoft-logo.png"
+    }), React__default.createElement("p", null, "MICROSOFT")))))));
   }), isLoginGoogle && React__default.createElement(BlockSelectTeacher$1, {
     onSubmit: function onSubmit(e) {
       return submitLogin(e, clickHandler);
@@ -38289,6 +38365,7 @@ var useForgotPassword = function useForgotPassword() {
           message: ((_err$response = err.response) === null || _err$response === void 0 ? void 0 : (_err$response$data = _err$response.data) === null || _err$response$data === void 0 ? void 0 : _err$response$data.title) || err.message || "Error occured"
         }));
         localStorage.removeItem(ACCESS_TOKEN);
+        sessionStorage.removeItem(ACCESS_TOKEN);
       });
 
       return Promise.resolve(_temp4 && _temp4.then ? _temp4.then(_temp3) : _temp3(_temp4));
@@ -38350,6 +38427,7 @@ var useForgotPassword = function useForgotPassword() {
           message: ((_err$response2 = err.response) === null || _err$response2 === void 0 ? void 0 : (_err$response2$data = _err$response2.data) === null || _err$response2$data === void 0 ? void 0 : _err$response2$data.title) || err.message || "Error occured"
         }));
         localStorage.removeItem(ACCESS_TOKEN);
+        sessionStorage.removeItem(ACCESS_TOKEN);
       });
 
       return Promise.resolve(_temp12 && _temp12.then ? _temp12.then(_temp11) : _temp11(_temp12));
@@ -38399,7 +38477,9 @@ var forgotPasswordSchema = yup.object({
   email: yup.string().email("Email is invalid").required("Email is required")
 });
 
-var BlockForgetPassword = function BlockForgetPassword() {
+var BlockForgetPassword = function BlockForgetPassword(_ref) {
+  var school = _ref.school;
+
   var _useForgotPassword = useForgotPassword(),
       forgotPasswordRequest = _useForgotPassword.forgotPasswordRequest,
       clickHandler = _useForgotPassword.clickHandler,
@@ -38426,15 +38506,20 @@ var BlockForgetPassword = function BlockForgetPassword() {
         values = formikProps.values,
         touched = formikProps.touched,
         errors = formikProps.errors;
-    return React__default.createElement(reactstrap.Row, {
+    return React__default.createElement("div", {
       className: "" + styles["box-login"]
-    }, React__default.createElement(reactstrap.Col, {
-      className: "p-0"
     }, React__default.createElement("div", {
       className: "" + styles["block-login"]
     }, React__default.createElement("div", {
       className: "" + styles["block-form"]
-    }, React__default.createElement("p", {
+    }, React__default.createElement("div", {
+      className: "d-flex align-items-center mb-4"
+    }, React__default.createElement("img", {
+      src: "" + getStaticFileUrl("/images/isb-icon.png"),
+      className: styles["school-icon"] + " mr-3"
+    }), React__default.createElement("p", {
+      className: styles["school-name"] + " mb-0"
+    }, school.schoolName)), React__default.createElement("p", {
       className: styles["title-login"] + " "
     }, "Forgot password"), React__default.createElement("p", {
       className: styles["recover-account"] + " mb-5"
@@ -38449,7 +38534,10 @@ var BlockForgetPassword = function BlockForgetPassword() {
       value: values.email
     }), touched.email && errors.email && React__default.createElement(ErrorHandler, {
       text: errors.email
-    })), React__default.createElement(reactGoogleRecaptchaV3.GoogleReCaptcha, {
+    })), React__default.createElement(reactRouterDom.Link, {
+      to: "/login",
+      className: styles["link-to-login"] + " mt-2"
+    }, "Return to login"), React__default.createElement(reactGoogleRecaptchaV3.GoogleReCaptcha, {
       action: "forgetPass",
       onVerify: handleVerify
     }), React__default.createElement(reactstrap.Col, {
@@ -38459,23 +38547,7 @@ var BlockForgetPassword = function BlockForgetPassword() {
       onClick: function onClick() {
         return handleSubmit();
       }
-    }, "Continue")), React__default.createElement("p", {
-      className: "d-flex justify-content-between"
-    }, React__default.createElement(reactRouterDom.Link, {
-      to: "/login",
-      className: "" + styles["link-to-login"]
-    }, "Return to login"), React__default.createElement("a", {
-      href: "/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: getStaticFileUrl("/images/img-login.jpg"),
-      className: "" + styles["img-login"]
-    })));
+    }, "Continue")))));
   });
 };
 
@@ -38576,7 +38648,7 @@ var BlockResetPassword = function BlockResetPassword() {
       md: 4,
       className: "" + styles["img-box"]
     }, React__default.createElement("img", {
-      src: getStaticFileUrl("/images/img-login.jpg"),
+      src: getStaticFileUrl("/images/img-login.png"),
       className: "" + styles["img-login"]
     })));
   });
@@ -38664,6 +38736,7 @@ var useCreatePassword = function useCreatePassword() {
           message: ((_err$response = err.response) === null || _err$response === void 0 ? void 0 : (_err$response$data = _err$response.data) === null || _err$response$data === void 0 ? void 0 : _err$response$data.title) || err.message || "Error occured"
         }));
         localStorage.removeItem(ACCESS_TOKEN);
+        sessionStorage.removeItem(ACCESS_TOKEN);
       });
 
       return Promise.resolve(_temp8 && _temp8.then ? _temp8.then(_temp7) : _temp7(_temp8));
@@ -38808,7 +38881,7 @@ var BlockCreatePassword = function BlockCreatePassword() {
       md: 4,
       className: "" + styles["img-box"]
     }, React__default.createElement("img", {
-      src: "/images/img-login.jpg",
+      src: "/images/img-login.png",
       className: "" + styles["img-login"]
     })));
   });
@@ -38829,6 +38902,7 @@ var Login = function Login(props) {
       userLogin = _useLogin.userLogin,
       googleRecaptchaId = _useLogin.googleRecaptchaId,
       handleCancelModelAssign = _useLogin.handleCancelModelAssign,
+      school = _useLogin.school,
       openModelAssign = _useLogin.openModelAssign;
 
   React.useEffect(function () {
@@ -38841,10 +38915,10 @@ var Login = function Login(props) {
   }, React__default.createElement(reactstrap.Row, {
     className: "h-100"
   }, React__default.createElement(reactstrap.Col, {
-    lg: 12,
+    lg: 8,
     md: 12,
     xs: 12,
-    className: "d-flex justify-content-center h-100 align-items-center"
+    className: "d-flex justify-content-center h-100 align-items-center p-3 flex-column"
   }, !!googleRecaptchaId && React__default.createElement(reactGoogleRecaptchaV3.GoogleReCaptchaProvider, {
     useRecaptchaNet: true,
     reCaptchaKey: googleRecaptchaId,
@@ -38857,8 +38931,23 @@ var Login = function Login(props) {
     userLogin: userLogin,
     defaultInfo: defaultInfo,
     onCancelModelAssign: handleCancelModelAssign,
-    openModelAssign: openModelAssign
-  }), isForgotPassword && React__default.createElement(BlockForgetPassword, null)), isResetPassword && React__default.createElement(BlockResetPassword, null), isCreatePassword && React__default.createElement(BlockCreatePassword, null))));
+    openModelAssign: openModelAssign,
+    school: school
+  }), isForgotPassword && React__default.createElement(BlockForgetPassword, {
+    school: school
+  })), isResetPassword && React__default.createElement(BlockResetPassword, null), isCreatePassword && React__default.createElement(BlockCreatePassword, null), React__default.createElement("a", {
+    href: "/privacy-policy/",
+    target: "blank",
+    className: "" + styles["privacy-policy"]
+  }, "Privacy Policy")), React__default.createElement(reactstrap.Col, {
+    className: "p-3 mh-100 d-flex justify-content-end",
+    lg: 4,
+    md: 12,
+    xs: 12
+  }, React__default.createElement("img", {
+    src: "" + getStaticFileUrl(window.innerWidth > 992 ? "/images/img-login.png" : "/images/img-login-tablet.png"),
+    className: "" + styles["img-login"]
+  }))));
 };
 
 var QuoteContent = function QuoteContent() {
@@ -39075,6 +39164,7 @@ var TheSidebar = function TheSidebar(_ref) {
 
   var signOut = React.useCallback(function () {
     localStorage.removeItem(ACCESS_TOKEN);
+    sessionStorage.removeItem(ACCESS_TOKEN);
     localStorage.removeItem("ROLES");
     dispatch(reset());
     history.push("/");
@@ -39238,11 +39328,6 @@ var NotificationButton = function NotificationButton(_ref) {
   }, unReadNotification)));
 };
 
-var getFileUrl = function getFileUrl(fileName) {
-  if (!fileName || !fileName.trim()) return "";
-  return BASE_URL + "/api/file/viewer?key=" + fileName;
-};
-
 var DEFAULT_USER_AVATAR = "/avatars/default-avatar.png";
 var ADMIN_ROLE = "Admin";
 var TEACHER_ROLE = "Teacher";
@@ -39272,6 +39357,7 @@ var TheHeaderDropdown = function TheHeaderDropdown(_ref) {
   var isTeacher = roles.includes(TEACHER_ROLE);
   var signOut = React.useCallback(function () {
     localStorage.removeItem(ACCESS_TOKEN);
+    sessionStorage.removeItem(ACCESS_TOKEN);
     localStorage.removeItem("ROLES");
     dispatch(reset());
     history.push("/");
@@ -42127,6 +42213,7 @@ var useUserList = function useUserList() {
   }, [JSON.stringify(filters)]);
 
   var redirectLoginUser = function redirectLoginUser(res) {
+    var isSessionUserBrowser = sessionStorage.getItem(IS_USER_SESSION_BROWSER);
     var _res$data2 = res.data,
         token = _res$data2.token,
         id = _res$data2.id,
@@ -42135,7 +42222,12 @@ var useUserList = function useUserList() {
         roles = _res$data2.roles,
         email = _res$data2.email,
         profileImageFileName = _res$data2.profileImageFileName;
-    localStorage.setItem(ACCESS_TOKEN, token);
+
+    if (!isSessionUserBrowser) {
+      localStorage.setItem(ACCESS_TOKEN, token);
+    } else {
+      sessionStorage.setItem(ACCESS_TOKEN, token);
+    }
 
     if (roles.includes("Admin")) {
       localStorage.setItem("ROLES", "Admin");
@@ -45316,9 +45408,9 @@ var NotificationLogoutModal = function NotificationLogoutModal() {
   };
 
   React.useEffect(function () {
-    var getAccessToken = localStorage.getItem(ACCESS_TOKEN);
+    var accessToken = getAccessToken();
 
-    if (getAccessToken) {
+    if (accessToken) {
       var interval = setInterval(function () {
         checkOpenModalLogout();
       }, 60 * 1000);
@@ -48642,6 +48734,7 @@ var TheLayout = function TheLayout(_ref) {
 
   var resetAuth = function resetAuth() {
     localStorage.removeItem(ACCESS_TOKEN);
+    sessionStorage.removeItem(ACCESS_TOKEN);
     localStorage.removeItem("ROLES");
     history.push("/");
   };
@@ -48716,6 +48809,7 @@ exports.GOOGLE_RECAPTCHA_KEY = GOOGLE_RECAPTCHA_KEY;
 exports.GalleryList = GalleryList;
 exports.INIT_AMPLITUDE_KEY_PROD = INIT_AMPLITUDE_KEY_PROD;
 exports.INIT_AMPLITUDE_KEY_STAGE = INIT_AMPLITUDE_KEY_STAGE;
+exports.IS_USER_SESSION_BROWSER = IS_USER_SESSION_BROWSER;
 exports.Images = Images;
 exports.LANGUAGES = LANGUAGES;
 exports.LICENSE_AGGRID = LICENSE_AGGRID;