mario-core 2.9.239-release → 2.9.241-release

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -3,7 +3,7 @@ import i18n from 'i18next';
3
3
  import { initReactI18next, useTranslation } from 'react-i18next';
4
4
  export { I18nextProvider, useTranslation } from 'react-i18next';
5
5
  import React, { useState, useCallback, useEffect, forwardRef, useRef, Suspense, memo, Fragment, useImperativeHandle, useMemo } from 'react';
6
- import { Input, Modal, ModalHeader, ModalBody, ModalFooter, Button, Row, Col, Form, FormGroup, Navbar, NavbarBrand, Collapse, Nav, NavItem, NavLink, Dropdown, DropdownToggle, DropdownMenu, DropdownItem, Alert, Pagination, PaginationItem, PaginationLink, Table, Label, Popover, PopoverBody, TabContent, TabPane, CardText, CustomInput, Card, CardImg, CardBody, CardTitle, CardHeader } from 'reactstrap';
6
+ import { Input, Modal, ModalHeader, ModalBody, ModalFooter, Button, Form, FormGroup, Row, Col, Navbar, NavbarBrand, Collapse, Nav, NavItem, NavLink, Dropdown, DropdownToggle, DropdownMenu, DropdownItem, Alert, Pagination, PaginationItem, PaginationLink, Table, Label, Popover, PopoverBody, TabContent, TabPane, CardText, CustomInput, Card, CardImg, CardBody, CardTitle, CardHeader } from 'reactstrap';
7
7
  import { useHistory, Link, useLocation, Switch, Route, Prompt, useParams } from 'react-router-dom';
8
8
  import { useDispatch, useSelector } from 'react-redux';
9
9
  import { Formik } from 'formik';
@@ -851,7 +851,7 @@ var academic_year = "AcademicYear";
851
851
  var all_of_the_students_report_manageable_stress_levels = "All of the students report manageable stress levels";
852
852
  var growth = "growth";
853
853
  var relationships = "relationships";
854
- var productivity = "productivity";
854
+ var productivity = "Productivity";
855
855
  var academics = "academics";
856
856
  var percent = "percent";
857
857
  var unmotivated = "Unmotivated";
@@ -4789,7 +4789,7 @@ var academic_year$1 = "AcademicYear";
4789
4789
  var all_of_the_students_report_manageable_stress_levels$1 = "All of the students report manageable stress levels";
4790
4790
  var growth$1 = "growth";
4791
4791
  var relationships$1 = "relationships";
4792
- var productivity$1 = "productivity";
4792
+ var productivity$1 = "Productivity";
4793
4793
  var academics$1 = "academics";
4794
4794
  var percent$1 = "percent";
4795
4795
  var unmotivated$1 = "Unmotivated";
@@ -12604,14 +12604,14 @@ var academic_year$3 = "Año académico";
12604
12604
  var all_of_the_students_report_manageable_stress_levels$3 = "Todos los estudiantes reportan niveles de estrés manejables";
12605
12605
  var growth$3 = "crecimiento";
12606
12606
  var relationships$3 = "relaciones";
12607
- var productivity$3 = "productividad";
12607
+ var productivity$3 = "Productividad";
12608
12608
  var academics$3 = "académica";
12609
12609
  var percent$3 = "por ciento";
12610
12610
  var unmotivated$3 = "Desmotivado";
12611
12611
  var comfort$3 = "Comodidad";
12612
12612
  var stretch$3 = "Estirar";
12613
12613
  var strain$3 = "Cepa";
12614
- var overwhelmed_overwhelmed = "ABURRADOAbrumado";
12614
+ var overwhelmed$3 = "ABURRADOAbrumado";
12615
12615
  var edit_student_profile$3 = "Editar perfil de estudiante";
12616
12616
  var teacher$3 = "maestro";
12617
12617
  var created$3 = "creado";
@@ -14544,7 +14544,7 @@ var lang_es = {
14544
14544
  comfort: comfort$3,
14545
14545
  stretch: stretch$3,
14546
14546
  strain: strain$3,
14547
- overwhelmed_overwhelmed: overwhelmed_overwhelmed,
14547
+ overwhelmed: overwhelmed$3,
14548
14548
  edit_student_profile: edit_student_profile$3,
14549
14549
  teacher: teacher$3,
14550
14550
  created: created$3,
@@ -16512,7 +16512,7 @@ var unmotivated$4 = "无动力";
16512
16512
  var comfort$4 = "舒适";
16513
16513
  var stretch$4 = "伸展";
16514
16514
  var strain$4 = "紧张";
16515
- var overwhelmed_overwhelmed$1 = "不知所措";
16515
+ var overwhelmed$4 = "不知所措";
16516
16516
  var edit_student_profile$4 = "编辑学生资料";
16517
16517
  var teacher$4 = "老师";
16518
16518
  var created$4 = "创建";
@@ -18474,7 +18474,7 @@ var lang_zh = {
18474
18474
  comfort: comfort$4,
18475
18475
  stretch: stretch$4,
18476
18476
  strain: strain$4,
18477
- overwhelmed_overwhelmed: overwhelmed_overwhelmed$1,
18477
+ overwhelmed: overwhelmed$4,
18478
18478
  edit_student_profile: edit_student_profile$4,
18479
18479
  teacher: teacher$4,
18480
18480
  created: created$4,
@@ -19630,6 +19630,7 @@ var GOOGLE_RECAPTCHA_KEY = "6LfNtLUaAAAAAL24lbBV11jS-gBtt1mhtxb4NXs0";
19630
19630
  var INIT_AMPLITUDE_KEY_PROD = "860fa99c52ae79d98e904b4c862ddaac";
19631
19631
  var INIT_AMPLITUDE_KEY_STAGE = "adf89d0ed9b0d5fcc0d1bcfd535345dc";
19632
19632
  var ACCESS_TOKEN = "ACCESS_TOKEN";
19633
+ var IS_USER_SESSION_BROWSER = "IS_USER_SESSION_BROWSER";
19633
19634
  var DEFAULT_PAGE_SIZE_VALUES = [{
19634
19635
  label: "10",
19635
19636
  value: 10
@@ -19826,7 +19827,7 @@ function _catch(body, recover) {
19826
19827
  return result;
19827
19828
  }
19828
19829
 
19829
- 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"};
19830
+ 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"};
19830
19831
 
19831
19832
  var style = {
19832
19833
  fontSize: "0.85rem"
@@ -37048,13 +37049,14 @@ var containerStyle = {
37048
37049
  position: "relative"
37049
37050
  };
37050
37051
  var inputStyle = {
37051
- backgroundColor: "#f7f9fc",
37052
+ backgroundColor: "#ffffff",
37052
37053
  paddingRight: "50px"
37053
37054
  };
37054
37055
  var eyeIconStyle = {
37055
37056
  fontSize: "20px",
37056
37057
  position: "absolute",
37057
- right: "10px"
37058
+ right: "10px",
37059
+ color: "#316CD9"
37058
37060
  };
37059
37061
 
37060
37062
  var PasswordInput = function PasswordInput(_ref) {
@@ -37165,7 +37167,8 @@ function _createForOfIteratorHelperLoose(o, allowArrayLike) {
37165
37167
 
37166
37168
  var getAccessToken = (function () {
37167
37169
  try {
37168
- return localStorage.getItem(ACCESS_TOKEN);
37170
+ var isSessionUserBrowser = sessionStorage.getItem(IS_USER_SESSION_BROWSER);
37171
+ return !isSessionUserBrowser ? localStorage.getItem(ACCESS_TOKEN) : sessionStorage.getItem(ACCESS_TOKEN);
37169
37172
  } catch (err) {
37170
37173
  return null;
37171
37174
  }
@@ -37263,6 +37266,8 @@ var apiUpload = axios.create({
37263
37266
  }
37264
37267
 
37265
37268
  localStorage.removeItem(ACCESS_TOKEN);
37269
+ sessionStorage.removeItem(ACCESS_TOKEN);
37270
+ sessionStorage.removeItem(IS_USER_SESSION_BROWSER);
37266
37271
  localStorage.removeItem("USER_EMAIL");
37267
37272
  localStorage.removeItem("ROLES");
37268
37273
  window.location.href = "/login";
@@ -37341,6 +37346,9 @@ var SCHOOL_URL = BASE_URL + "/api/school";
37341
37346
  var getSchoolSettings = function getSchoolSettings() {
37342
37347
  return api.get(SCHOOL_URL + "/settings");
37343
37348
  };
37349
+ var getInfo$1 = function getInfo() {
37350
+ return api.get(SCHOOL_URL + "/info");
37351
+ };
37344
37352
 
37345
37353
  var TypeLogin;
37346
37354
 
@@ -37400,11 +37408,13 @@ var msalConfig = {
37400
37408
  }
37401
37409
  };
37402
37410
 
37411
+ var _sessionStorage$getIt;
37403
37412
  var defaultInfo = {
37404
37413
  email: "",
37405
37414
  password: "",
37406
37415
  captcha: "",
37407
- rememberMe: false
37416
+ rememberMe: false,
37417
+ isSessionUserBrowser: (_sessionStorage$getIt = !!sessionStorage.getItem(IS_USER_SESSION_BROWSER)) != null ? _sessionStorage$getIt : false
37408
37418
  };
37409
37419
  var HOMEPAGE_TEACHER = "/home";
37410
37420
  var HOMEPAGE_STUDENT = "/home";
@@ -37444,17 +37454,24 @@ var useLogin = function useLogin() {
37444
37454
  var _useState4 = useState(false),
37445
37455
  openModelAssign = _useState4[0];
37446
37456
 
37447
- var _useState5 = useState(),
37448
- msalInstance = _useState5[0],
37449
- setMsalInstance = _useState5[1];
37457
+ var _useState5 = useState({
37458
+ schoolName: "",
37459
+ schoolLogo: ""
37460
+ }),
37461
+ school = _useState5[0],
37462
+ setSchool = _useState5[1];
37463
+
37464
+ var _useState6 = useState(),
37465
+ msalInstance = _useState6[0],
37466
+ setMsalInstance = _useState6[1];
37450
37467
 
37451
37468
  var toggle = useCallback(function () {
37452
37469
  setOpenLogin(!openLogin);
37453
37470
  }, [openLogin]);
37454
37471
 
37455
- var _useState6 = useState(false),
37456
- isShowPassword = _useState6[0],
37457
- setIsShowPassword = _useState6[1];
37472
+ var _useState7 = useState(false),
37473
+ isShowPassword = _useState7[0],
37474
+ setIsShowPassword = _useState7[1];
37458
37475
 
37459
37476
  useEffect(function () {
37460
37477
  document.title = TITLE;
@@ -37465,6 +37482,7 @@ var useLogin = function useLogin() {
37465
37482
 
37466
37483
  var handleCancelModelAssign = function handleCancelModelAssign() {
37467
37484
  localStorage.removeItem(ACCESS_TOKEN);
37485
+ sessionStorage.removeItem(ACCESS_TOKEN);
37468
37486
  localStorage.removeItem("USER_EMAIL");
37469
37487
  };
37470
37488
 
@@ -37514,7 +37532,7 @@ var useLogin = function useLogin() {
37514
37532
  };
37515
37533
 
37516
37534
  var isDistrict = window.location.host.includes("-district");
37517
- var userLogin = useCallback(function (data) {
37535
+ var getSchoolInfo = useCallback(function () {
37518
37536
  try {
37519
37537
  var _temp7 = function _temp7() {
37520
37538
  dispatch(setLoading(false));
@@ -37523,8 +37541,37 @@ var useLogin = function useLogin() {
37523
37541
  dispatch(setLoading(true));
37524
37542
 
37525
37543
  var _temp8 = _catch(function () {
37526
- var _data$email, _data$password;
37544
+ return Promise.resolve(getInfo$1()).then(function (res) {
37545
+ if (!!res.data) {
37546
+ setSchool(res.data);
37547
+ }
37548
+ });
37549
+ }, function (err) {
37550
+ var _err$response2, _err$response2$data;
37551
+
37552
+ dispatch(setAlert({
37553
+ type: "danger",
37554
+ 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
37555
+ }));
37556
+ });
37557
+
37558
+ return Promise.resolve(_temp8 && _temp8.then ? _temp8.then(_temp7) : _temp7(_temp8));
37559
+ } catch (e) {
37560
+ return Promise.reject(e);
37561
+ }
37562
+ }, []);
37563
+ var userLogin = useCallback(function (data) {
37564
+ try {
37565
+ var _temp11 = function _temp11() {
37566
+ dispatch(setLoading(false));
37567
+ };
37568
+
37569
+ dispatch(setLoading(true));
37527
37570
 
37571
+ var _temp12 = _catch(function () {
37572
+ var _data$isSessionUserBr, _data$email, _data$password;
37573
+
37574
+ var isSessionUserBrowser = (_data$isSessionUserBr = data === null || data === void 0 ? void 0 : data.isSessionUserBrowser) != null ? _data$isSessionUserBr : false;
37528
37575
  return Promise.resolve(logIn(_extends({}, data, {
37529
37576
  email: data === null || data === void 0 ? void 0 : (_data$email = data.email) === null || _data$email === void 0 ? void 0 : _data$email.trim(),
37530
37577
  password: data === null || data === void 0 ? void 0 : (_data$password = data.password) === null || _data$password === void 0 ? void 0 : _data$password.trim()
@@ -37538,7 +37585,15 @@ var useLogin = function useLogin() {
37538
37585
  email = _res$data2.email,
37539
37586
  profileImageFileName = _res$data2.profileImageFileName,
37540
37587
  isLoginFirst = _res$data2.isLoginFirst;
37541
- localStorage.setItem(ACCESS_TOKEN, token);
37588
+
37589
+ if (!isSessionUserBrowser) {
37590
+ sessionStorage.removeItem(IS_USER_SESSION_BROWSER);
37591
+ localStorage.setItem(ACCESS_TOKEN, token);
37592
+ } else {
37593
+ sessionStorage.setItem(ACCESS_TOKEN, token);
37594
+ sessionStorage.setItem(IS_USER_SESSION_BROWSER, isSessionUserBrowser);
37595
+ }
37596
+
37542
37597
  localStorage.removeItem(NOTIFICATION_ALERT_KEY);
37543
37598
  dispatch(setUser({
37544
37599
  id: id,
@@ -37599,16 +37654,17 @@ var useLogin = function useLogin() {
37599
37654
  }
37600
37655
  });
37601
37656
  }, function (err) {
37602
- var _err$response2, _err$response2$data;
37657
+ var _err$response3, _err$response3$data;
37603
37658
 
37604
37659
  dispatch(setAlert({
37605
37660
  type: "danger",
37606
- 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"
37661
+ 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"
37607
37662
  }));
37608
37663
  localStorage.removeItem(ACCESS_TOKEN);
37664
+ sessionStorage.removeItem(ACCESS_TOKEN);
37609
37665
  });
37610
37666
 
37611
- return Promise.resolve(_temp8 && _temp8.then ? _temp8.then(_temp7) : _temp7(_temp8));
37667
+ return Promise.resolve(_temp12 && _temp12.then ? _temp12.then(_temp11) : _temp11(_temp12));
37612
37668
  } catch (e) {
37613
37669
  return Promise.reject(e);
37614
37670
  }
@@ -37616,21 +37672,21 @@ var useLogin = function useLogin() {
37616
37672
 
37617
37673
  var getInfoGoogle = function getInfoGoogle() {
37618
37674
  try {
37619
- var _temp10 = _catch(function () {
37675
+ var _temp14 = _catch(function () {
37620
37676
  return Promise.resolve(getGoogleClientId()).then(function (res) {
37621
37677
  setGoogleClientId(res.data.googleClientId);
37622
37678
  setGoogleRecaptchaId(res.data.googleCaptchaId);
37623
37679
  });
37624
37680
  }, function (err) {
37625
- var _err$response3, _err$response3$data;
37681
+ var _err$response4, _err$response4$data;
37626
37682
 
37627
37683
  dispatch(setAlert({
37628
37684
  type: "danger",
37629
- 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"
37685
+ 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"
37630
37686
  }));
37631
37687
  });
37632
37688
 
37633
- return Promise.resolve(_temp10 && _temp10.then ? _temp10.then(function () {}) : void 0);
37689
+ return Promise.resolve(_temp14 && _temp14.then ? _temp14.then(function () {}) : void 0);
37634
37690
  } catch (e) {
37635
37691
  return Promise.reject(e);
37636
37692
  }
@@ -37638,19 +37694,19 @@ var useLogin = function useLogin() {
37638
37694
 
37639
37695
  var fnIsCheckLogin = useCallback(function (type, data, token, clickHandler) {
37640
37696
  try {
37641
- var _temp16 = function _temp16() {
37697
+ var _temp20 = function _temp20() {
37642
37698
  dispatch(setLoading(false));
37643
37699
  };
37644
37700
 
37645
37701
  dispatch(setLoading(true));
37646
37702
 
37647
- var _temp17 = _catch(function () {
37703
+ var _temp21 = _catch(function () {
37648
37704
  return Promise.resolve(checkUserGoogle(type, data)).then(function (res) {
37649
37705
  var checkUser = res.data;
37650
37706
 
37651
- var _temp13 = function () {
37707
+ var _temp17 = function () {
37652
37708
  if (checkUser) {
37653
- var _temp18 = function _temp18() {
37709
+ var _temp22 = function _temp22() {
37654
37710
  return Promise.resolve(userLogin(_dataUser)).then(function () {
37655
37711
  dispatch(setIsLoginGoogle(false));
37656
37712
  });
@@ -37666,7 +37722,7 @@ var useLogin = function useLogin() {
37666
37722
  loginType: LoginType.Google
37667
37723
  };
37668
37724
 
37669
- var _temp19 = function () {
37725
+ var _temp23 = function () {
37670
37726
  if (clickHandler != null) {
37671
37727
  return Promise.resolve(clickHandler()).then(function (clickHandlerRes) {
37672
37728
  _dataUser.captcha = clickHandlerRes;
@@ -37674,24 +37730,24 @@ var useLogin = function useLogin() {
37674
37730
  }
37675
37731
  }();
37676
37732
 
37677
- return _temp19 && _temp19.then ? _temp19.then(_temp18) : _temp18(_temp19);
37733
+ return _temp23 && _temp23.then ? _temp23.then(_temp22) : _temp22(_temp23);
37678
37734
  } else {
37679
37735
  dispatch(setIsLoginGoogle(true));
37680
37736
  }
37681
37737
  }();
37682
37738
 
37683
- if (_temp13 && _temp13.then) return _temp13.then(function () {});
37739
+ if (_temp17 && _temp17.then) return _temp17.then(function () {});
37684
37740
  });
37685
37741
  }, function (err) {
37686
- var _err$response4, _err$response4$data;
37742
+ var _err$response5, _err$response5$data;
37687
37743
 
37688
37744
  dispatch(setAlert({
37689
37745
  type: "danger",
37690
- 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"
37746
+ 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"
37691
37747
  }));
37692
37748
  });
37693
37749
 
37694
- return Promise.resolve(_temp17 && _temp17.then ? _temp17.then(_temp16) : _temp16(_temp17));
37750
+ return Promise.resolve(_temp21 && _temp21.then ? _temp21.then(_temp20) : _temp20(_temp21));
37695
37751
  } catch (e) {
37696
37752
  return Promise.reject(e);
37697
37753
  }
@@ -37699,14 +37755,14 @@ var useLogin = function useLogin() {
37699
37755
 
37700
37756
  var submitLogin = function submitLogin(teacherId, clickHandler) {
37701
37757
  try {
37702
- var _temp23 = function _temp23() {
37758
+ var _temp27 = function _temp27() {
37703
37759
  dispatch(setIsLoginGoogle(false));
37704
37760
  dispatch(setLoading(false));
37705
37761
  };
37706
37762
 
37707
37763
  dispatch(setLoading(true));
37708
37764
 
37709
- var _temp24 = _catch(function () {
37765
+ var _temp28 = _catch(function () {
37710
37766
  var data = {
37711
37767
  firstName: infoUser.firstName,
37712
37768
  lastName: infoUser.lastName,
@@ -37717,7 +37773,7 @@ var useLogin = function useLogin() {
37717
37773
  teacherId: teacherId
37718
37774
  };
37719
37775
  return Promise.resolve(registerUserStudent(data)).then(function (res) {
37720
- var _temp20 = function () {
37776
+ var _temp24 = function () {
37721
37777
  if (res.data) {
37722
37778
  return Promise.resolve(clickHandler()).then(function (clickHandlerRes) {
37723
37779
  var dataLogin = {
@@ -37737,18 +37793,18 @@ var useLogin = function useLogin() {
37737
37793
  }
37738
37794
  }();
37739
37795
 
37740
- if (_temp20 && _temp20.then) return _temp20.then(function () {});
37796
+ if (_temp24 && _temp24.then) return _temp24.then(function () {});
37741
37797
  });
37742
37798
  }, function (err) {
37743
- var _err$response5, _err$response5$data;
37799
+ var _err$response6, _err$response6$data;
37744
37800
 
37745
37801
  dispatch(setAlert({
37746
37802
  type: "danger",
37747
- 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"
37803
+ 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"
37748
37804
  }));
37749
37805
  });
37750
37806
 
37751
- return Promise.resolve(_temp24 && _temp24.then ? _temp24.then(_temp23) : _temp23(_temp24));
37807
+ return Promise.resolve(_temp28 && _temp28.then ? _temp28.then(_temp27) : _temp27(_temp28));
37752
37808
  } catch (e) {
37753
37809
  return Promise.reject(e);
37754
37810
  }
@@ -37756,15 +37812,16 @@ var useLogin = function useLogin() {
37756
37812
 
37757
37813
  var getInformationSetting = function getInformationSetting() {
37758
37814
  try {
37759
- var _temp26 = _catch(function () {
37815
+ var _temp30 = _catch(function () {
37760
37816
  return Promise.resolve(getSchoolSettings()).then(function (res) {
37761
37817
  dispatch(setSandboxMode(res.data.isSandboxMode));
37818
+ setSchool(res.data);
37762
37819
  });
37763
37820
  }, function (err) {
37764
37821
  console.error(err);
37765
37822
  });
37766
37823
 
37767
- return Promise.resolve(_temp26 && _temp26.then ? _temp26.then(function () {}) : void 0);
37824
+ return Promise.resolve(_temp30 && _temp30.then ? _temp30.then(function () {}) : void 0);
37768
37825
  } catch (e) {
37769
37826
  return Promise.reject(e);
37770
37827
  }
@@ -37774,11 +37831,11 @@ var useLogin = function useLogin() {
37774
37831
  try {
37775
37832
  msalInstance.handleRedirectPromise().then(function (tokenResponse) {
37776
37833
  try {
37777
- var _temp29 = function () {
37834
+ var _temp33 = function () {
37778
37835
  if (!tokenResponse) {
37779
37836
  var accounts = msalInstance.getAllAccounts();
37780
37837
 
37781
- var _temp30 = function () {
37838
+ var _temp34 = function () {
37782
37839
  if (accounts.length === 0) {
37783
37840
  msalInstance.loginRedirect();
37784
37841
  } else {
@@ -37787,14 +37844,14 @@ var useLogin = function useLogin() {
37787
37844
  }
37788
37845
  }();
37789
37846
 
37790
- if (_temp30 && _temp30.then) return _temp30.then(function () {});
37847
+ if (_temp34 && _temp34.then) return _temp34.then(function () {});
37791
37848
  } else {
37792
37849
  var currentAccount = tokenResponse.account;
37793
37850
  return Promise.resolve(getCurrentAccount(currentAccount, clickHandler)).then(function () {});
37794
37851
  }
37795
37852
  }();
37796
37853
 
37797
- return Promise.resolve(_temp29 && _temp29.then ? _temp29.then(function () {}) : void 0);
37854
+ return Promise.resolve(_temp33 && _temp33.then ? _temp33.then(function () {}) : void 0);
37798
37855
  } catch (e) {
37799
37856
  return Promise.reject(e);
37800
37857
  }
@@ -37847,6 +37904,7 @@ var useLogin = function useLogin() {
37847
37904
  useEffect(function () {
37848
37905
  getInformationSetting();
37849
37906
  initInformationSSO();
37907
+ getSchoolInfo();
37850
37908
  }, []);
37851
37909
  return {
37852
37910
  defaultInfo: defaultInfo,
@@ -37863,7 +37921,8 @@ var useLogin = function useLogin() {
37863
37921
  googleRecaptchaId: googleRecaptchaId,
37864
37922
  handleCancelModelAssign: handleCancelModelAssign,
37865
37923
  openModelAssign: openModelAssign,
37866
- fnLoginSSO: fnLoginSSO
37924
+ fnLoginSSO: fnLoginSSO,
37925
+ school: school
37867
37926
  };
37868
37927
  };
37869
37928
 
@@ -38018,6 +38077,11 @@ var getStaticFileUrl = function getStaticFileUrl(url) {
38018
38077
  if (url.startsWith("/")) return "" + (isStage ? STAGE_DOMAIN : MARIO_SUCCESS_BASE_URL) + url;else return (isStage ? STAGE_DOMAIN : MARIO_SUCCESS_BASE_URL) + "/" + url;
38019
38078
  };
38020
38079
 
38080
+ var getFileUrl = function getFileUrl(fileName) {
38081
+ if (!fileName || !fileName.trim()) return "";
38082
+ return BASE_URL + "/api/file/viewer?key=" + fileName;
38083
+ };
38084
+
38021
38085
  var schema = object({
38022
38086
  email: string().email("Email is invalid").required("Email is required"),
38023
38087
  password: string().required("Password is required"),
@@ -38026,7 +38090,8 @@ var schema = object({
38026
38090
 
38027
38091
  var BlockLogin = function BlockLogin(_ref) {
38028
38092
  var defaultInfo = _ref.defaultInfo,
38029
- userLogin = _ref.userLogin;
38093
+ userLogin = _ref.userLogin,
38094
+ school = _ref.school;
38030
38095
 
38031
38096
  var _useLogin = useLogin(),
38032
38097
  isShowPassword = _useLogin.isShowPassword,
@@ -38077,7 +38142,6 @@ var BlockLogin = function BlockLogin(_ref) {
38077
38142
  return;
38078
38143
  }
38079
38144
 
38080
- console.log("assss");
38081
38145
  var infoLogin = {
38082
38146
  firstName: givenName,
38083
38147
  lastName: familyName,
@@ -38121,21 +38185,25 @@ var BlockLogin = function BlockLogin(_ref) {
38121
38185
  setFieldValue = formikProps.setFieldValue;
38122
38186
  var emailError = touched.email && errors.email;
38123
38187
  var passwordError = touched.password && errors.password;
38124
- return React.createElement(Row, {
38125
- className: "" + styles["box-login"]
38126
- }, React.createElement(Col, {
38127
- className: "p-0"
38188
+ return React.createElement("div", {
38189
+ className: styles["box-login"] + " w-100"
38128
38190
  }, React.createElement(Form, {
38129
38191
  className: "" + styles["block-login"],
38130
38192
  onSubmit: handleSubmit
38131
38193
  }, React.createElement("div", {
38132
38194
  className: "" + styles["block-form"]
38195
+ }, React.createElement("div", {
38196
+ className: "d-flex align-items-center mb-4"
38133
38197
  }, React.createElement("img", {
38134
- src: "" + getStaticFileUrl("/images/horizontal-logo-blue.svg"),
38135
- className: "" + styles["img-login-rectangle"]
38198
+ src: "" + (school !== null && school !== void 0 && school.schoolLogo ? getFileUrl("" + (school === null || school === void 0 ? void 0 : school.schoolLogo)) : getStaticFileUrl("/images/logoR.png")),
38199
+ className: styles["school-icon"] + " mr-3"
38136
38200
  }), React.createElement("p", {
38201
+ className: styles["school-name"] + " mb-0"
38202
+ }, school.schoolName)), React.createElement("p", {
38137
38203
  className: "" + styles["title-login"]
38138
- }, "Sign in"), React.createElement(FormGroup, {
38204
+ }, "Welcome Back!"), React.createElement("p", {
38205
+ className: styles["login-description"] + " mb-5"
38206
+ }, "Please enter your MARIO Education account details"), React.createElement(FormGroup, {
38139
38207
  className: "" + styles["form-user-name"]
38140
38208
  }, React.createElement(Input, {
38141
38209
  type: "text",
@@ -38159,45 +38227,53 @@ var BlockLogin = function BlockLogin(_ref) {
38159
38227
  })), React.createElement(FormGroup, null, React.createElement(GoogleReCaptcha, {
38160
38228
  action: "login",
38161
38229
  onVerify: handleVerify
38162
- })), React.createElement(Col, {
38163
- className: "p-0 mt-5"
38164
- }, React.createElement("button", {
38165
- className: "" + styles["btn-login"],
38230
+ })), React.createElement("div", {
38231
+ className: "d-flex justify-content-between"
38232
+ }, React.createElement("div", {
38233
+ className: "d-flex align-items-center"
38234
+ }, React.createElement("input", {
38235
+ type: "checkbox",
38236
+ checked: !values.isSessionUserBrowser,
38237
+ className: "" + styles["checkbox-keep-login"],
38238
+ onChange: function onChange() {
38239
+ return setFieldValue("isSessionUserBrowser", !values.isSessionUserBrowser);
38240
+ }
38241
+ }), React.createElement("p", {
38242
+ className: styles["label-keep-login"] + " mb-0 ml-2"
38243
+ }, "Keep me logged in")), React.createElement(Link, {
38244
+ to: "/forgot-password",
38245
+ className: "" + styles["link-to-login"]
38246
+ }, "Forgot password?")), React.createElement("button", {
38247
+ className: styles["btn-login"] + " mt-5",
38166
38248
  type: "submit"
38167
- }, "LOGIN")), !!googleClientId && React.createElement(Col, {
38168
- className: "p-0 mt-1 mb-4"
38169
- }, React.createElement(GoogleLogin, {
38249
+ }, "LOG IN"), React.createElement("p", {
38250
+ className: styles["option-text"] + " my-3 text-center"
38251
+ }, "OR"), React.createElement(Row, {
38252
+ className: "mb-4"
38253
+ }, React.createElement(Col, {
38254
+ lg: 6,
38255
+ md: 6,
38256
+ xs: 12,
38257
+ className: "pr-md-2"
38258
+ }, !!googleClientId && React.createElement(GoogleLogin, {
38170
38259
  clientId: googleClientId,
38171
- buttonText: "Login",
38260
+ buttonText: "GOOGLE",
38172
38261
  onSuccess: onSuccessGoogle,
38173
- cookiePolicy: 'single_host_origin',
38174
- className: "" + styles["btn-login-google"]
38175
- })), React.createElement("div", {
38176
- className: styles["btn-login-sso"] + " mb-3"
38262
+ cookiePolicy: "single_host_origin",
38263
+ className: styles["btn-login-google"] + " p-0 mb-4 mb-md-0"
38264
+ })), React.createElement(Col, {
38265
+ lg: 6,
38266
+ md: 6,
38267
+ xs: 12,
38268
+ className: styles["btn-login-sso"] + " pl-md-2"
38177
38269
  }, React.createElement("div", {
38178
38270
  className: styles["btn-login-with-sso"],
38179
38271
  onClick: function onClick() {
38180
38272
  return fnLoginSSO(clickHandler);
38181
38273
  }
38182
38274
  }, React.createElement("img", {
38183
- src: "images/Single-Sign-On.png"
38184
- }), " Login with SSO")), React.createElement("div", {
38185
- className: "d-flex justify-content-between"
38186
- }, React.createElement(Link, {
38187
- to: "/forgot-password",
38188
- className: "" + styles["link-to-login"]
38189
- }, "Forgot password?"), React.createElement("a", {
38190
- href: "/privacy-policy/",
38191
- target: "blank",
38192
- className: "" + styles["link-to-login"]
38193
- }, "Privacy Policy"))))), React.createElement(Col, {
38194
- lg: 4,
38195
- md: 4,
38196
- className: "" + styles["img-box"]
38197
- }, React.createElement("img", {
38198
- src: "" + getStaticFileUrl("/images/img-login.jpg"),
38199
- className: "" + styles["img-login"]
38200
- })));
38275
+ src: "images/microsoft-logo.png"
38276
+ }), React.createElement("p", null, "MICROSOFT")))))));
38201
38277
  }), isLoginGoogle && React.createElement(BlockSelectTeacher$1, {
38202
38278
  onSubmit: function onSubmit(e) {
38203
38279
  return submitLogin(e, clickHandler);
@@ -38287,6 +38363,7 @@ var useForgotPassword = function useForgotPassword() {
38287
38363
  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"
38288
38364
  }));
38289
38365
  localStorage.removeItem(ACCESS_TOKEN);
38366
+ sessionStorage.removeItem(ACCESS_TOKEN);
38290
38367
  });
38291
38368
 
38292
38369
  return Promise.resolve(_temp4 && _temp4.then ? _temp4.then(_temp3) : _temp3(_temp4));
@@ -38348,6 +38425,7 @@ var useForgotPassword = function useForgotPassword() {
38348
38425
  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"
38349
38426
  }));
38350
38427
  localStorage.removeItem(ACCESS_TOKEN);
38428
+ sessionStorage.removeItem(ACCESS_TOKEN);
38351
38429
  });
38352
38430
 
38353
38431
  return Promise.resolve(_temp12 && _temp12.then ? _temp12.then(_temp11) : _temp11(_temp12));
@@ -38397,7 +38475,9 @@ var forgotPasswordSchema = object({
38397
38475
  email: string().email("Email is invalid").required("Email is required")
38398
38476
  });
38399
38477
 
38400
- var BlockForgetPassword = function BlockForgetPassword() {
38478
+ var BlockForgetPassword = function BlockForgetPassword(_ref) {
38479
+ var school = _ref.school;
38480
+
38401
38481
  var _useForgotPassword = useForgotPassword(),
38402
38482
  forgotPasswordRequest = _useForgotPassword.forgotPasswordRequest,
38403
38483
  clickHandler = _useForgotPassword.clickHandler,
@@ -38424,15 +38504,20 @@ var BlockForgetPassword = function BlockForgetPassword() {
38424
38504
  values = formikProps.values,
38425
38505
  touched = formikProps.touched,
38426
38506
  errors = formikProps.errors;
38427
- return React.createElement(Row, {
38507
+ return React.createElement("div", {
38428
38508
  className: "" + styles["box-login"]
38429
- }, React.createElement(Col, {
38430
- className: "p-0"
38431
38509
  }, React.createElement("div", {
38432
38510
  className: "" + styles["block-login"]
38433
38511
  }, React.createElement("div", {
38434
38512
  className: "" + styles["block-form"]
38435
- }, React.createElement("p", {
38513
+ }, React.createElement("div", {
38514
+ className: "d-flex align-items-center mb-4"
38515
+ }, React.createElement("img", {
38516
+ src: "" + getStaticFileUrl("/images/isb-icon.png"),
38517
+ className: styles["school-icon"] + " mr-3"
38518
+ }), React.createElement("p", {
38519
+ className: styles["school-name"] + " mb-0"
38520
+ }, school.schoolName)), React.createElement("p", {
38436
38521
  className: styles["title-login"] + " "
38437
38522
  }, "Forgot password"), React.createElement("p", {
38438
38523
  className: styles["recover-account"] + " mb-5"
@@ -38447,7 +38532,10 @@ var BlockForgetPassword = function BlockForgetPassword() {
38447
38532
  value: values.email
38448
38533
  }), touched.email && errors.email && React.createElement(ErrorHandler, {
38449
38534
  text: errors.email
38450
- })), React.createElement(GoogleReCaptcha, {
38535
+ })), React.createElement(Link, {
38536
+ to: "/login",
38537
+ className: styles["link-to-login"] + " mt-2"
38538
+ }, "Return to login"), React.createElement(GoogleReCaptcha, {
38451
38539
  action: "forgetPass",
38452
38540
  onVerify: handleVerify
38453
38541
  }), React.createElement(Col, {
@@ -38457,23 +38545,7 @@ var BlockForgetPassword = function BlockForgetPassword() {
38457
38545
  onClick: function onClick() {
38458
38546
  return handleSubmit();
38459
38547
  }
38460
- }, "Continue")), React.createElement("p", {
38461
- className: "d-flex justify-content-between"
38462
- }, React.createElement(Link, {
38463
- to: "/login",
38464
- className: "" + styles["link-to-login"]
38465
- }, "Return to login"), React.createElement("a", {
38466
- href: "/privacy-policy",
38467
- target: "blank",
38468
- className: "" + styles["link-to-login"]
38469
- }, "Privacy Policy"))))), React.createElement(Col, {
38470
- lg: 4,
38471
- md: 4,
38472
- className: "" + styles["img-box"]
38473
- }, React.createElement("img", {
38474
- src: getStaticFileUrl("/images/img-login.jpg"),
38475
- className: "" + styles["img-login"]
38476
- })));
38548
+ }, "Continue")))));
38477
38549
  });
38478
38550
  };
38479
38551
 
@@ -38574,7 +38646,7 @@ var BlockResetPassword = function BlockResetPassword() {
38574
38646
  md: 4,
38575
38647
  className: "" + styles["img-box"]
38576
38648
  }, React.createElement("img", {
38577
- src: getStaticFileUrl("/images/img-login.jpg"),
38649
+ src: getStaticFileUrl("/images/img-login.png"),
38578
38650
  className: "" + styles["img-login"]
38579
38651
  })));
38580
38652
  });
@@ -38662,6 +38734,7 @@ var useCreatePassword = function useCreatePassword() {
38662
38734
  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"
38663
38735
  }));
38664
38736
  localStorage.removeItem(ACCESS_TOKEN);
38737
+ sessionStorage.removeItem(ACCESS_TOKEN);
38665
38738
  });
38666
38739
 
38667
38740
  return Promise.resolve(_temp8 && _temp8.then ? _temp8.then(_temp7) : _temp7(_temp8));
@@ -38806,7 +38879,7 @@ var BlockCreatePassword = function BlockCreatePassword() {
38806
38879
  md: 4,
38807
38880
  className: "" + styles["img-box"]
38808
38881
  }, React.createElement("img", {
38809
- src: "/images/img-login.jpg",
38882
+ src: "/images/img-login.png",
38810
38883
  className: "" + styles["img-login"]
38811
38884
  })));
38812
38885
  });
@@ -38827,6 +38900,7 @@ var Login = function Login(props) {
38827
38900
  userLogin = _useLogin.userLogin,
38828
38901
  googleRecaptchaId = _useLogin.googleRecaptchaId,
38829
38902
  handleCancelModelAssign = _useLogin.handleCancelModelAssign,
38903
+ school = _useLogin.school,
38830
38904
  openModelAssign = _useLogin.openModelAssign;
38831
38905
 
38832
38906
  useEffect(function () {
@@ -38839,10 +38913,10 @@ var Login = function Login(props) {
38839
38913
  }, React.createElement(Row, {
38840
38914
  className: "h-100"
38841
38915
  }, React.createElement(Col, {
38842
- lg: 12,
38916
+ lg: 8,
38843
38917
  md: 12,
38844
38918
  xs: 12,
38845
- className: "d-flex justify-content-center h-100 align-items-center"
38919
+ className: "d-flex justify-content-center h-100 align-items-center p-3 flex-column"
38846
38920
  }, !!googleRecaptchaId && React.createElement(GoogleReCaptchaProvider, {
38847
38921
  useRecaptchaNet: true,
38848
38922
  reCaptchaKey: googleRecaptchaId,
@@ -38855,8 +38929,23 @@ var Login = function Login(props) {
38855
38929
  userLogin: userLogin,
38856
38930
  defaultInfo: defaultInfo,
38857
38931
  onCancelModelAssign: handleCancelModelAssign,
38858
- openModelAssign: openModelAssign
38859
- }), isForgotPassword && React.createElement(BlockForgetPassword, null)), isResetPassword && React.createElement(BlockResetPassword, null), isCreatePassword && React.createElement(BlockCreatePassword, null))));
38932
+ openModelAssign: openModelAssign,
38933
+ school: school
38934
+ }), isForgotPassword && React.createElement(BlockForgetPassword, {
38935
+ school: school
38936
+ })), isResetPassword && React.createElement(BlockResetPassword, null), isCreatePassword && React.createElement(BlockCreatePassword, null), React.createElement("a", {
38937
+ href: "/privacy-policy/",
38938
+ target: "blank",
38939
+ className: "" + styles["privacy-policy"]
38940
+ }, "Privacy Policy")), React.createElement(Col, {
38941
+ className: "p-3 mh-100 d-flex justify-content-end",
38942
+ lg: 4,
38943
+ md: 12,
38944
+ xs: 12
38945
+ }, React.createElement("img", {
38946
+ src: "" + getStaticFileUrl(window.innerWidth > 992 ? "/images/img-login.png" : "/images/img-login-tablet.png"),
38947
+ className: "" + styles["img-login"]
38948
+ }))));
38860
38949
  };
38861
38950
 
38862
38951
  var QuoteContent = function QuoteContent() {
@@ -39073,6 +39162,7 @@ var TheSidebar = function TheSidebar(_ref) {
39073
39162
 
39074
39163
  var signOut = useCallback(function () {
39075
39164
  localStorage.removeItem(ACCESS_TOKEN);
39165
+ sessionStorage.removeItem(ACCESS_TOKEN);
39076
39166
  localStorage.removeItem("ROLES");
39077
39167
  dispatch(reset());
39078
39168
  history.push("/");
@@ -39236,11 +39326,6 @@ var NotificationButton = function NotificationButton(_ref) {
39236
39326
  }, unReadNotification)));
39237
39327
  };
39238
39328
 
39239
- var getFileUrl = function getFileUrl(fileName) {
39240
- if (!fileName || !fileName.trim()) return "";
39241
- return BASE_URL + "/api/file/viewer?key=" + fileName;
39242
- };
39243
-
39244
39329
  var DEFAULT_USER_AVATAR = "/avatars/default-avatar.png";
39245
39330
  var ADMIN_ROLE = "Admin";
39246
39331
  var TEACHER_ROLE = "Teacher";
@@ -39270,6 +39355,7 @@ var TheHeaderDropdown = function TheHeaderDropdown(_ref) {
39270
39355
  var isTeacher = roles.includes(TEACHER_ROLE);
39271
39356
  var signOut = useCallback(function () {
39272
39357
  localStorage.removeItem(ACCESS_TOKEN);
39358
+ sessionStorage.removeItem(ACCESS_TOKEN);
39273
39359
  localStorage.removeItem("ROLES");
39274
39360
  dispatch(reset());
39275
39361
  history.push("/");
@@ -42125,6 +42211,7 @@ var useUserList = function useUserList() {
42125
42211
  }, [JSON.stringify(filters)]);
42126
42212
 
42127
42213
  var redirectLoginUser = function redirectLoginUser(res) {
42214
+ var isSessionUserBrowser = sessionStorage.getItem(IS_USER_SESSION_BROWSER);
42128
42215
  var _res$data2 = res.data,
42129
42216
  token = _res$data2.token,
42130
42217
  id = _res$data2.id,
@@ -42133,7 +42220,12 @@ var useUserList = function useUserList() {
42133
42220
  roles = _res$data2.roles,
42134
42221
  email = _res$data2.email,
42135
42222
  profileImageFileName = _res$data2.profileImageFileName;
42136
- localStorage.setItem(ACCESS_TOKEN, token);
42223
+
42224
+ if (!isSessionUserBrowser) {
42225
+ localStorage.setItem(ACCESS_TOKEN, token);
42226
+ } else {
42227
+ sessionStorage.setItem(ACCESS_TOKEN, token);
42228
+ }
42137
42229
 
42138
42230
  if (roles.includes("Admin")) {
42139
42231
  localStorage.setItem("ROLES", "Admin");
@@ -45314,9 +45406,9 @@ var NotificationLogoutModal = function NotificationLogoutModal() {
45314
45406
  };
45315
45407
 
45316
45408
  useEffect(function () {
45317
- var getAccessToken = localStorage.getItem(ACCESS_TOKEN);
45409
+ var accessToken = getAccessToken();
45318
45410
 
45319
- if (getAccessToken) {
45411
+ if (accessToken) {
45320
45412
  var interval = setInterval(function () {
45321
45413
  checkOpenModalLogout();
45322
45414
  }, 60 * 1000);
@@ -48640,6 +48732,7 @@ var TheLayout = function TheLayout(_ref) {
48640
48732
 
48641
48733
  var resetAuth = function resetAuth() {
48642
48734
  localStorage.removeItem(ACCESS_TOKEN);
48735
+ sessionStorage.removeItem(ACCESS_TOKEN);
48643
48736
  localStorage.removeItem("ROLES");
48644
48737
  history.push("/");
48645
48738
  };
@@ -48668,5 +48761,5 @@ var TheLayout = function TheLayout(_ref) {
48668
48761
 
48669
48762
  var amplitudeClient$1 = amplitude.getInstance();
48670
48763
 
48671
- export { ACCESS_TOKEN, ANSWER_EDITOR_HEIGHT, AcademicClassSelector, AddButton, BASE_URL, CHAT_CHANNEL, CategorySelector, CommonAlert, CommonHeader, CommonModal$1 as CommonModal, CreatableSelector, CustomPagination, CustomSelector, CustomTabs as CustomTab, DATE_FORMAT, DATE_RESULT, DEFAULT_FILTER, DEFAULT_LANGUAGE_CODE, Dashboard, DeleteButtonIcon, DetailActionButtons, EMOTIONS, EditButtonIcon, EmailTemplateDetail, EmailTemplateList, EmptyDataAlert, ErrorHandler, FULL_DATE_RESULT, FaqList, InputFile as FileInput, GOOGLE_RECAPTCHA_KEY, GalleryList, INIT_AMPLITUDE_KEY_PROD, INIT_AMPLITUDE_KEY_STAGE, Images, LANGUAGES, LICENSE_AGGRID, LinkEditButton, Loading, Login, MediaList, NOTIFICATION_ALERT_KEY, NOTIFICATION_CHANNEL, NotFound, NotificationList, NotificationLogoutModal, NotificationModal, QUESTION_TYPES, QUESTION_TYPES_OPTIONS, QuestionCategorySelector, QuestionTypeSelector, QuitPrompt, ReactNotification, RequiredLabel$1 as RequiredLabel, SANDBOX_NOTIFICATION, SUPPORTED_LANGUAGES_CODE, SandboxAlert, SchoolList, ScrollToTop, SearchBox$1 as SearchBox, SearchBoxContainer, SkillList, StarRatingSelector, SuggestionCategorySelector, TAB_COLORS, TINY_MCE_API_KEY, TheContent$1 as TheContent, TheLayout, ToggleButton, UploadFileButton, UserContainer, UserDetail, UserList, addTab, amplitudeClient$1 as amplitudeClient, answerQuestion, answerQuestionDataPlayer, api, apiUpload, canAccess as canAccessRoute, changeNote, changeTags, clearTab, closeTab, debounce, editTab, editorConfig, firstCheckToken, generateRandomString, getCookieValue, getFileUrl, getInfo, getStaticFileUrl, getTextFromHTML, i18n, initAmplitude, isInViewport, isLocalhost, reset, setAlert, setAssessmentList, setAssignmentList, setAssistantList, setBadgeList, setBandScoreList, setCertificateList, setClassList, setConferenceRubricList, setConversationOneToOne, setCurrentStudentId, setCurrentStudentName, setCurrentStudentUserId, setCustomAlertList, setDataPlayer, setEditItemQuesion, setEnableIEP, setEnableSurvey, setFeedbackList, setFilterWidget, setGoalExampleList, setImproveMyClass, setLanguage, setLearningSupportCategoryList, setLoading, setMailCategory, setModal, setMoveItemQuestion, setMyStudent, setOpenModelCongratulation, setQuestionByCategory, setQuestionCateList, setQuestionList, setReflectionList, setReflectionResultList, setResetQuestionList, setSandboxMode, setSchoolBlankDayList, setSelectQuestion, setSemesterList, setSessionPlayer, setSessionTemplateGeneralClassList, setSessionTemplateList, setStartTime, setStrategyList, setStudentIdSelectedByTeacher, setStudentList, setSubjectList, setSuggestionList, setTurnOffPassWhenChangeMode, setTutorialScreenList, setUser, setUserList, setWeeklyQuestList, showFontSize, showMenuBar, store, systemCertificateUpload, systemStudentBadge, uploadFile, useFilters, useGalleryList, utcToLocalTime };
48764
+ export { ACCESS_TOKEN, ANSWER_EDITOR_HEIGHT, AcademicClassSelector, AddButton, BASE_URL, CHAT_CHANNEL, CategorySelector, CommonAlert, CommonHeader, CommonModal$1 as CommonModal, CreatableSelector, CustomPagination, CustomSelector, CustomTabs as CustomTab, DATE_FORMAT, DATE_RESULT, DEFAULT_FILTER, DEFAULT_LANGUAGE_CODE, Dashboard, DeleteButtonIcon, DetailActionButtons, EMOTIONS, EditButtonIcon, EmailTemplateDetail, EmailTemplateList, EmptyDataAlert, ErrorHandler, FULL_DATE_RESULT, FaqList, InputFile as FileInput, GOOGLE_RECAPTCHA_KEY, GalleryList, INIT_AMPLITUDE_KEY_PROD, INIT_AMPLITUDE_KEY_STAGE, IS_USER_SESSION_BROWSER, Images, LANGUAGES, LICENSE_AGGRID, LinkEditButton, Loading, Login, MediaList, NOTIFICATION_ALERT_KEY, NOTIFICATION_CHANNEL, NotFound, NotificationList, NotificationLogoutModal, NotificationModal, QUESTION_TYPES, QUESTION_TYPES_OPTIONS, QuestionCategorySelector, QuestionTypeSelector, QuitPrompt, ReactNotification, RequiredLabel$1 as RequiredLabel, SANDBOX_NOTIFICATION, SUPPORTED_LANGUAGES_CODE, SandboxAlert, SchoolList, ScrollToTop, SearchBox$1 as SearchBox, SearchBoxContainer, SkillList, StarRatingSelector, SuggestionCategorySelector, TAB_COLORS, TINY_MCE_API_KEY, TheContent$1 as TheContent, TheLayout, ToggleButton, UploadFileButton, UserContainer, UserDetail, UserList, addTab, amplitudeClient$1 as amplitudeClient, answerQuestion, answerQuestionDataPlayer, api, apiUpload, canAccess as canAccessRoute, changeNote, changeTags, clearTab, closeTab, debounce, editTab, editorConfig, firstCheckToken, generateRandomString, getCookieValue, getFileUrl, getInfo, getStaticFileUrl, getTextFromHTML, i18n, initAmplitude, isInViewport, isLocalhost, reset, setAlert, setAssessmentList, setAssignmentList, setAssistantList, setBadgeList, setBandScoreList, setCertificateList, setClassList, setConferenceRubricList, setConversationOneToOne, setCurrentStudentId, setCurrentStudentName, setCurrentStudentUserId, setCustomAlertList, setDataPlayer, setEditItemQuesion, setEnableIEP, setEnableSurvey, setFeedbackList, setFilterWidget, setGoalExampleList, setImproveMyClass, setLanguage, setLearningSupportCategoryList, setLoading, setMailCategory, setModal, setMoveItemQuestion, setMyStudent, setOpenModelCongratulation, setQuestionByCategory, setQuestionCateList, setQuestionList, setReflectionList, setReflectionResultList, setResetQuestionList, setSandboxMode, setSchoolBlankDayList, setSelectQuestion, setSemesterList, setSessionPlayer, setSessionTemplateGeneralClassList, setSessionTemplateList, setStartTime, setStrategyList, setStudentIdSelectedByTeacher, setStudentList, setSubjectList, setSuggestionList, setTurnOffPassWhenChangeMode, setTutorialScreenList, setUser, setUserList, setWeeklyQuestList, showFontSize, showMenuBar, store, systemCertificateUpload, systemStudentBadge, uploadFile, useFilters, useGalleryList, utcToLocalTime };
48672
48765
  //# sourceMappingURL=index.modern.js.map