touchstudy-core 0.1.69 → 0.1.70

package/dist/index.js

@@ -87,10 +87,10 @@ var encodeParams = function encodeParams(params) {
     if (Array.isArray(params[key])) {
       return params[key].map(function (i) {
         return encodeURIComponent(key) + "=" + encodeURIComponent(i);
-      }).join('&');
+      }).join("&");
     }
     return encodeURIComponent(key) + "=" + encodeURIComponent(params[key]);
-  }).join('&');
+  }).join("&");
 };
 (function (Role) {
   Role["Student"] = "Student";
@@ -102,6 +102,27 @@ var encodeParams = function encodeParams(params) {
   Language["ko"] = "ko";
   Language["en"] = "en";
 })(exports.Language || (exports.Language = {}));
+var RecentUserAction = {
+  ViewedUser: "viewed_user",
+  ViewedQNA: "viewed_QNA",
+  ViewedExamResult: "viewed_exam_result",
+  PrintedExamResult: "printed_exam_result",
+  ViewedAttendance: "viewed_attendance",
+  UpdatedUser: "updated_user",
+  CreatedNewUser: "created_new_user",
+  ImportedUser: "imported_user",
+  ImportedRemoveUser: "imported_remove_user",
+  DeletedUser: "deleted_user",
+  CompletedQNA: "completed_QNA",
+  AnsweredQNA: "answered_QNA",
+  RemoveMessageQNA: "remove_message_QNA",
+  UpdateMessageQNA: "update_message_QNA",
+  UpdatedAttendance: "updated_attendance",
+  AddedTeacherToClass: "added_teacher_to_class",
+  RemovedTeacherFromClass: "removed_teacher_from_class",
+  AddedStudentToClass: "added_student_to_class",
+  RemovedStudentFromClass: "removed_student_from_class"
+};
 var PrintHeaderClassName = "print-header";
 var PrintTitleClassName = "print-title";
 var PrintContentClassName = "print-content";
@@ -144,6 +165,13 @@ function _objectWithoutPropertiesLoose(source, excluded) {
   }
   return target;
 }
+function _taggedTemplateLiteralLoose(strings, raw) {
+  if (!raw) {
+    raw = strings.slice(0);
+  }
+  strings.raw = raw;
+  return strings;
+}
 
 var styles = {"lighter":"#F0FFF6","light":"#89F0B2","less_dark":"#3DC674","dark":"#349056","darker":"#18442A","gray_50":"#FBFBF9","gray_100":"#EAEAE5","gray_300":"#D0D0C8","gray_500":"#9A9A98","gray_700":"#5D5D5B","gray_900":"#363634","btn-login-google":"_2HqmH","block-login":"_wWIyO","box-login":"_38Lo1","btn-primary":"_rd4Uy","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","content-text":"_3S4f2","dropdown-content-language":"_3ajui","dropdown-item-language":"_3Y_y4","dropdown-item-language-active":"_CzNMi","dropdown-academy":"_3CMVp","image-academy":"_2ibYC","academy-btn":"_1JMRU","switch-icon":"_N4FNf","dropdown-content-academy":"_31Dr0","dropdown-academy-item":"_3bjcz","noGutters":"_31ZQk","custom-col-2":"_3yXyK","custom-col-3":"_1RsJQ","custom-col-5":"_L42CP","custom-col-10":"_2u6eL","custom-row":"_8x7OP","custom-col":"_1JmTh","custom-col-4":"_3HO1e","custom-col-8":"_Oy31M","custom-col-12":"_3aUKo","custom-container":"_39LRs","form-label":"__Ut-u","form-control":"_2k4dX","btn-outline-primary":"_2PWdX","sort-icons":"_mQvLF","active":"_3oAH-","form-select":"_3W3aw","truncate":"_3NJzN","headers":"_3xnI5","logo-container":"_3YG70","tabBox":"_1CQPn","routerBox":"_3hx2T","tabText":"_3UyhW","router-link-active":"_1TGKA","router-link":"_1AqMh","userImg":"_2RI6G","disabled-link":"_3aVHg","line-clamp":"_3fpky"};
 
@@ -456,6 +484,9 @@ var apiLoginWithAccessToken = function apiLoginWithAccessToken(body, domain) {
     headers: (_headers = {}, _headers[AcademyHeaders] = domain, _headers)
   });
 };
+var apiLoginSuperAdminWithAccessToken = function apiLoginSuperAdminWithAccessToken(body) {
+  return api.post(AUTH_SUPER_ADMIN_URL + "/login/access-token", body);
+};
 
 var useGoogleSignOut = function useGoogleSignOut(props) {
   var dispatch = reactRedux.useDispatch();
@@ -484,7 +515,10 @@ var useGoogleSignOut = function useGoogleSignOut(props) {
       localStorage.removeItem(ACADEMY_DOMAIN);
     }
     try {
+      var _window$gapi, _window$gapi$auth, _auth2$signOut;
       signOut();
+      var auth2 = (_window$gapi = window.gapi) === null || _window$gapi === void 0 ? void 0 : (_window$gapi$auth = _window$gapi.auth2) === null || _window$gapi$auth === void 0 ? void 0 : _window$gapi$auth.getAuthInstance();
+      auth2 === null || auth2 === void 0 ? void 0 : (_auth2$signOut = auth2.signOut) === null || _auth2$signOut === void 0 ? void 0 : _auth2$signOut.call(auth2);
     } catch (error) {
       console.log({
         error: error
@@ -535,6 +569,10 @@ var useLogin = function useLogin(history, homeAcademyUrl, homeUrl, registerUrl)
     t = _useTranslation.t;
   var _useGoogleSignOut = useGoogleSignOut({}),
     handleSignOut = _useGoogleSignOut.handleSignOut;
+  var user = reactRedux.useSelector(function (state) {
+    var _state$common;
+    return state === null || state === void 0 ? void 0 : (_state$common = state.common) === null || _state$common === void 0 ? void 0 : _state$common.user;
+  });
   var searchParams = new URLSearchParams(window.location.search);
   var paramDomain = searchParams.get('domain');
   var handleLoginGoogle = function handleLoginGoogle(data, isLogout) {
@@ -547,16 +585,28 @@ var useLogin = function useLogin(history, homeAcademyUrl, homeUrl, registerUrl)
       return Promise.resolve(handleLogin(function () {
         return new Promise(function (resolve, reject) {
           try {
-            var _temp = _catch(function () {
+            var _temp3 = _catch(function () {
               return Promise.resolve(academyDomain ? apiLoginGoogle(data) : apiLoginGoogleSuperAdmin(data)).then(function (loginResponse) {
+                function _temp2() {
+                  resolve(result);
+                }
                 var result = loginResponse.data;
-                resolve(result);
+                var _temp = function () {
+                  if (loginResponse.status === 204 && academyDomain) {
+                    localStorage.removeItem(ACADEMY_DOMAIN);
+                    return Promise.resolve(apiLoginGoogleSuperAdmin(data)).then(function (_apiLoginGoogleSuperA) {
+                      loginResponse = _apiLoginGoogleSuperA;
+                      result = loginResponse.data;
+                    });
+                  }
+                }();
+                return _temp && _temp.then ? _temp.then(_temp2) : _temp2(_temp);
               });
             }, function (error) {
               !!academyDomain && localStorage.removeItem(ACADEMY_DOMAIN);
               reject(error);
             });
-            return Promise.resolve(_temp && _temp.then ? _temp.then(function () {}) : void 0);
+            return Promise.resolve(_temp3 && _temp3.then ? _temp3.then(function () {}) : void 0);
           } catch (e) {
             return Promise.reject(e);
           }
@@ -575,15 +625,16 @@ var useLogin = function useLogin(history, homeAcademyUrl, homeUrl, registerUrl)
       return Promise.resolve(handleLogin(function () {
         return new Promise(function (resolve, reject) {
           try {
-            var _temp2 = _catch(function () {
-              return Promise.resolve(apiLoginWithAccessToken(data, domain)).then(function (loginResponse) {
+            var isSuperAdminUser = user && !user.academyDomain;
+            var _temp4 = _catch(function () {
+              return Promise.resolve(isSuperAdminUser ? apiLoginSuperAdminWithAccessToken(data) : apiLoginWithAccessToken(data, domain)).then(function (loginResponse) {
                 var result = loginResponse.data;
                 resolve(result);
               });
             }, function (error) {
               reject(error);
             });
-            return Promise.resolve(_temp2 && _temp2.then ? _temp2.then(function () {}) : void 0);
+            return Promise.resolve(_temp4 && _temp4.then ? _temp4.then(function () {}) : void 0);
           } catch (e) {
             return Promise.reject(e);
           }
@@ -598,11 +649,11 @@ var useLogin = function useLogin(history, homeAcademyUrl, homeUrl, registerUrl)
       isLogout = true;
     }
     try {
-      var _temp4 = function _temp4() {
+      var _temp6 = function _temp6() {
         dispatch(setLoading(false));
       };
       dispatch(setLoading(true));
-      var _temp3 = _catch(function () {
+      var _temp5 = _catch(function () {
         return Promise.resolve(apiLogin()).then(function (loginResponse) {
           var isFirstLogin = loginResponse.isFirstLogin,
             token = loginResponse.token,
@@ -619,7 +670,7 @@ var useLogin = function useLogin(history, homeAcademyUrl, homeUrl, registerUrl)
         alert(getErrorMessage(t, error));
         isLogout && handleSignOut();
       });
-      return Promise.resolve(_temp3 && _temp3.then ? _temp3.then(_temp4) : _temp4(_temp3));
+      return Promise.resolve(_temp5 && _temp5.then ? _temp5.then(_temp6) : _temp6(_temp5));
     } catch (e) {
       return Promise.reject(e);
     }
@@ -944,13 +995,16 @@ var defaultInfo = {
   captcha: "",
   rememberMe: false
 };
-var useLogin$1 = function useLogin() {
+var PAGE_TITLE = "sign_in";
+var useLogin$1 = function useLogin(homeAcademyUrl, homeUrl) {
   var _useState = React.useState(false),
     openLogin = _useState[0],
     setOpenLogin = _useState[1];
   var _useState2 = React.useState(),
     infoUser = _useState2[0],
     setInfoUser = _useState2[1];
+  var _useTranslation = reactI18next.useTranslation(),
+    t = _useTranslation.t;
   var toggle = React.useCallback(function () {
     setOpenLogin(!openLogin);
   }, [openLogin]);
@@ -968,8 +1022,13 @@ var useLogin$1 = function useLogin() {
   }, [gapiScript.gapi]);
   React.useEffect(function () {
     var token = getAccessToken();
-    if (token) window.location.href = "/";
-  }, []);
+    var academyDomain = getAcademyDomain();
+    if (token && academyDomain) window.location.href = homeAcademyUrl;
+    if (token && !academyDomain) window.location.href = homeUrl;
+  }, [homeAcademyUrl, homeUrl]);
+  React.useEffect(function () {
+    document.title = t("study_peak") + " | " + t(PAGE_TITLE);
+  }, [t]);
   return {
     defaultInfo: defaultInfo,
     openLogin: openLogin,
@@ -1079,7 +1138,7 @@ var _excluded = ["history"];
 var Login = function Login(_ref) {
   var history = _ref.history,
     rest = _objectWithoutPropertiesLoose(_ref, _excluded);
-  var _useLogin = useLogin$1(),
+  var _useLogin = useLogin$1(rest.homeAcademyUrl, rest.homeUrl),
     defaultInfo = _useLogin.defaultInfo;
   useLanguage(history);
   return React__default.createElement("div", {
@@ -1361,9 +1420,9 @@ var NotFound = function NotFound(_ref) {
   var history = _ref.history;
   var _useTranslation = reactI18next.useTranslation(),
     t = _useTranslation.t;
-  useLanguage(history);
+  history && useLanguage(history);
   React.useEffect(function () {
-    document.title = t(TITLE);
+    document.title = t("study_peak") + " | " + t(TITLE);
   }, [t]);
   return React__default.createElement("div", {
     className: "not-found d-flex justify-content-center"
@@ -1422,11 +1481,21 @@ var getUserAcademies = function getUserAcademies(role) {
     }
   });
 };
+var getAcademyByDomainApi = function getAcademyByDomainApi(domain, role) {
+  return api.get(SUPER_ADMIN_ACADEMY_URL + "/domain/" + domain, {
+    params: {
+      role: role
+    }
+  });
+};
 var getAcademyDetail = function getAcademyDetail() {
   return api.get(ACADEMY_URL + "/detail");
 };
-var switchAcademy = function switchAcademy(academyId) {
-  return api.post(ACADEMY_URL + "/switch-academy?academyId=" + academyId);
+var switchAcademy = function switchAcademy(academyId, role) {
+  return api.post(ACADEMY_URL + "/" + academyId + "/switch-academy/" + role);
+};
+var switchSuperAdminAcademy = function switchSuperAdminAcademy(academyId, role) {
+  return api.post(SUPER_ADMIN_ACADEMY_URL + "/" + academyId + "/switch-academy/" + role);
 };
 
 var useLayoutContext = function useLayoutContext(role, pusherRegisterUrls) {
@@ -1452,6 +1521,7 @@ var useLayoutContext = function useLayoutContext(role, pusherRegisterUrls) {
   var roles = (user === null || user === void 0 ? void 0 : user.roles) || [];
   var academyDomain = user === null || user === void 0 ? void 0 : user.academyDomain;
   var pathname = window.location.pathname;
+  var search = window.location.search;
   var resetAuth = function resetAuth() {
     handleSignOut();
   };
@@ -1479,7 +1549,7 @@ var useLayoutContext = function useLayoutContext(role, pusherRegisterUrls) {
     }
   };
   var checkRoleUser = React.useCallback(function () {
-    if (!user) return;
+    if (!(user !== null && user !== void 0 && user.email)) return;
     if (!roles.includes(role) && !!academyDomain) {
       alert(t("user_not_allow_to_register_role", {
         user: user.email,
@@ -1487,7 +1557,7 @@ var useLayoutContext = function useLayoutContext(role, pusherRegisterUrls) {
       }));
       resetAuth();
     }
-  }, [role, JSON.stringify(user)]);
+  }, [role, user === null || user === void 0 ? void 0 : user.email, academyDomain, JSON.stringify(roles)]);
   var loadInfo = function loadInfo() {
     try {
       var _temp4 = function _temp4() {
@@ -1495,6 +1565,7 @@ var useLayoutContext = function useLayoutContext(role, pusherRegisterUrls) {
       };
       var token = getAccessToken();
       if (!token) {
+        localStorage.setItem(REDIRECT_URL, "" + pathname + search);
         resetAuth();
         return Promise.resolve();
       }
@@ -1565,8 +1636,10 @@ var useLayoutContext = function useLayoutContext(role, pusherRegisterUrls) {
   }, [pusherRegisterUrls.join(","), academyDomain, pathname, isReadyRegisterPusher, currentPusher === null || currentPusher === void 0 ? void 0 : (_currentPusher$connec2 = currentPusher.connection) === null || _currentPusher$connec2 === void 0 ? void 0 : _currentPusher$connec2.state]);
   React.useEffect(function () {
     !user && loadInfo();
-    !!user && checkRoleUser();
-  }, [JSON.stringify(user)]);
+  }, []);
+  React.useEffect(function () {
+    checkRoleUser();
+  }, [checkRoleUser]);
   React.useEffect(function () {
     handleGetAcademyDetail();
   }, [academyDomain]);
@@ -1578,6 +1651,33 @@ var useLayoutContext = function useLayoutContext(role, pusherRegisterUrls) {
       }
     };
   }, [registerPusher]);
+  return {
+    user: user
+  };
+};
+
+var loadingStyle$1 = {
+  minWidth: "100vw",
+  minHeight: "100vh",
+  position: "fixed",
+  top: 0,
+  left: 0,
+  zIndex: 999999999,
+  backgroundColor: "rgba(0, 0, 0, 0.4)",
+  display: "flex",
+  justifyContent: "center",
+  alignItems: "center"
+};
+var LoadingComponent = function LoadingComponent(_ref) {
+  var isLoading = _ref.isLoading;
+  return isLoading ? React__default.createElement("div", {
+    style: loadingStyle$1
+  }, React__default.createElement("div", {
+    className: "spinner-border text-secondary",
+    role: "status"
+  }, React__default.createElement("span", {
+    className: "sr-only"
+  }))) : null;
 };
 
 var LayoutContext = function LayoutContext(_ref) {
@@ -1585,8 +1685,14 @@ var LayoutContext = function LayoutContext(_ref) {
     role = _ref.role,
     _ref$pusherRegisterUr = _ref.pusherRegisterUrls,
     pusherRegisterUrls = _ref$pusherRegisterUr === void 0 ? [] : _ref$pusherRegisterUr;
+  var user = reactRedux.useSelector(function (state) {
+    var _state$common;
+    return state === null || state === void 0 ? void 0 : (_state$common = state.common) === null || _state$common === void 0 ? void 0 : _state$common.user;
+  });
   useLayoutContext(role, pusherRegisterUrls);
-  return React__default.createElement(React.Fragment, null, children);
+  if (!(user !== null && user !== void 0 && user.email)) return React__default.createElement(LoadingComponent, {
+    isLoading: true
+  });else return React__default.createElement(React.Fragment, null, children);
 };
 
 var ConfirmDialog = function ConfirmDialog(_ref) {
@@ -2182,7 +2288,7 @@ var user_academy = {
 	remove_failed: "아카데미에서 사용자를 제거하지 못했습니다",
 	remove_successfully: "아카데미에서 사용자를 성공적으로 제거했습니다",
 	update_user_roles_failed: "아카데미 사용자 역할 업데이트에 실패했습니다",
-	update_user_roles__successfully: "아카데미 사용자 역할을 성공적으로 제거했습니다",
+	update_user_roles_successfully: "아카데미 사용자 역할을 성공적으로 제거했습니다",
 	get_failed: "아카데미 사용자 가져오기 실패"
 };
 var get_users_failed = "사용자 가져오기 실패";
@@ -2529,6 +2635,82 @@ var messages = {
 var submit = "제출하다";
 var must_select_a_teacher_first = "먼저 교사를 선택해야 합니다";
 var student_grade_is_invalid = "학생 등급은 1에서 12 사이여야 합니다";
+var recent_users = "최근 사용자";
+var recent_students = "최근 학생";
+var viewed_user = "본 사용자";
+var viewed_QNA = "조회한 질문&답변";
+var viewed_exam_result = "시험 결과를 보았습니다";
+var printed_exam_result = "인쇄된 시험 결과";
+var viewed_attendance = "출석 조회";
+var updated_user = "업데이트된 사용자";
+var created_new_user = "새 사용자가 생성되었습니다";
+var imported_user = "가져온 사용자";
+var imported_remove_user = "가져온 사용자 제거";
+var deleted_user = "삭제된 사용자";
+var completed_QNA = "완료된 질문 및 답변";
+var answered_QNA = "답변된 질문&답변";
+var remove_message_QNA = "메시지 질문 및 답변 제거";
+var update_message_QNA = "메시지 질문 및 답변 업데이트";
+var updated_attendance = "업데이트된 출석";
+var added_teacher_to_class = "수업에 교사를 추가했습니다.";
+var removed_teacher_from_class = "수업에서 교사를 제거했습니다";
+var added_student_to_class = "수업에 학생을 추가했습니다.";
+var removed_student_from_class = "수업에서 학생을 제거했습니다.";
+var exam_detail = "시험 세부정보";
+var study_peak = "스터디 피크";
+var enter_pass_code = "비밀번호를 입력하세요";
+var join_an_academy = "아카데미에 가입하세요";
+var select_an_academy = "아카데미를 선택하세요";
+var pass_code = "비밀번호";
+var enter_academy_pass_code = "학원비밀번호를 입력하세요";
+var authentication_failed = "인증 실패!";
+var verifying = "확인 중...";
+var login = "로그인";
+var please_wait_a_moment = "잠시만 기다려주세요";
+var oops_sorry = "이런, 미안해요!";
+var invitation_token_not_provided = "초대 토큰이 제공되지 않았습니다";
+var academy_invitation = "아카데미 초대";
+var join_academy = "아카데미 가입";
+var you_need_to_log_out_of_your_current_academy_to_use_the_invite_link = "초대 링크를 사용하려면 현재 아카데미에서 로그아웃해야 합니다";
+var you_need_to_log_out_of_your_current_academy_to_use_the_academy_join_link = "아카데미 가입 링크를 이용하려면 현재 아카데미에서 로그아웃해야 합니다";
+var enter_academy_passcode = "아카데미 비밀번호를 입력하세요";
+var academy_passcode = "아카데미 비밀번호";
+var academy_invite = "아카데미 초대";
+var academy_invite_new_students = "아카데미 신입생 초대";
+var create_passcode = "비밀번호 생성";
+var update_passcode = "비밀번호 업데이트";
+var is_active = "활성화됨";
+var limited_emails = "제한된 이메일";
+var limited_used_times = "제한된 사용 시간";
+var used_times = "사용시간";
+var update_data_successfully = "데이터 업데이트 성공";
+var reset_data_successfully = "데이터 재설정 성공";
+var limited_used_times_is_required = "제한된 사용 시간이 필요합니다";
+var limited_emails_is_required = "제한된 이메일이 필요합니다";
+var are_you_sure_you_want_to_delete_the_passcode = "비밀번호({{passcode}})를 삭제하시겠습니까?";
+var expired_time = "만료된 시간";
+var expired_time_is_required = "만료된 시간은 필수 항목입니다.";
+var total_emails = "총 이메일";
+var academy_invite_detail = "아카데미 초대 세부정보";
+var are_you_sure_to_delete_academy_invite = "이 아카데미 초대를 삭제하시겠습니까?";
+var day = "낮";
+var days = "날";
+var emails = "이메일";
+var is_accepted = "승인됨";
+var re_send = "다시 보내기";
+var revoke = "취소";
+var resend_invite_successfully = "초대를 다시 보냈습니다.";
+var revoke_invite_successfully = "초대를 취소했습니다.";
+var create_invite_successfully = "초대를 성공적으로 만들었습니다";
+var must_be_a_number = "숫자여야 합니다.";
+var is_revoked = "취소됨";
+var is_sent = "전송됨";
+var is_send = "전송됨";
+var expired_date = "만료일";
+var reset_passcode = "사용된 시간 비밀번호 재설정";
+var at_academy = "학원에서";
+var sent_at = "보낸 시간";
+var create_data_successfully = "데이터를 성공적으로 생성했습니다";
 var lang_ko = {
 	problem_solving: problem_solving,
 	my_story: my_story,
@@ -3193,7 +3375,83 @@ var lang_ko = {
 	messages: messages,
 	submit: submit,
 	must_select_a_teacher_first: must_select_a_teacher_first,
-	student_grade_is_invalid: student_grade_is_invalid
+	student_grade_is_invalid: student_grade_is_invalid,
+	recent_users: recent_users,
+	recent_students: recent_students,
+	viewed_user: viewed_user,
+	viewed_QNA: viewed_QNA,
+	viewed_exam_result: viewed_exam_result,
+	printed_exam_result: printed_exam_result,
+	viewed_attendance: viewed_attendance,
+	updated_user: updated_user,
+	created_new_user: created_new_user,
+	imported_user: imported_user,
+	imported_remove_user: imported_remove_user,
+	deleted_user: deleted_user,
+	completed_QNA: completed_QNA,
+	answered_QNA: answered_QNA,
+	remove_message_QNA: remove_message_QNA,
+	update_message_QNA: update_message_QNA,
+	updated_attendance: updated_attendance,
+	added_teacher_to_class: added_teacher_to_class,
+	removed_teacher_from_class: removed_teacher_from_class,
+	added_student_to_class: added_student_to_class,
+	removed_student_from_class: removed_student_from_class,
+	exam_detail: exam_detail,
+	study_peak: study_peak,
+	enter_pass_code: enter_pass_code,
+	join_an_academy: join_an_academy,
+	select_an_academy: select_an_academy,
+	pass_code: pass_code,
+	enter_academy_pass_code: enter_academy_pass_code,
+	authentication_failed: authentication_failed,
+	verifying: verifying,
+	login: login,
+	please_wait_a_moment: please_wait_a_moment,
+	oops_sorry: oops_sorry,
+	invitation_token_not_provided: invitation_token_not_provided,
+	academy_invitation: academy_invitation,
+	join_academy: join_academy,
+	you_need_to_log_out_of_your_current_academy_to_use_the_invite_link: you_need_to_log_out_of_your_current_academy_to_use_the_invite_link,
+	you_need_to_log_out_of_your_current_academy_to_use_the_academy_join_link: you_need_to_log_out_of_your_current_academy_to_use_the_academy_join_link,
+	enter_academy_passcode: enter_academy_passcode,
+	academy_passcode: academy_passcode,
+	academy_invite: academy_invite,
+	academy_invite_new_students: academy_invite_new_students,
+	create_passcode: create_passcode,
+	update_passcode: update_passcode,
+	is_active: is_active,
+	limited_emails: limited_emails,
+	limited_used_times: limited_used_times,
+	used_times: used_times,
+	update_data_successfully: update_data_successfully,
+	reset_data_successfully: reset_data_successfully,
+	limited_used_times_is_required: limited_used_times_is_required,
+	limited_emails_is_required: limited_emails_is_required,
+	are_you_sure_you_want_to_delete_the_passcode: are_you_sure_you_want_to_delete_the_passcode,
+	expired_time: expired_time,
+	expired_time_is_required: expired_time_is_required,
+	total_emails: total_emails,
+	academy_invite_detail: academy_invite_detail,
+	are_you_sure_to_delete_academy_invite: are_you_sure_to_delete_academy_invite,
+	day: day,
+	days: days,
+	emails: emails,
+	is_accepted: is_accepted,
+	re_send: re_send,
+	revoke: revoke,
+	resend_invite_successfully: resend_invite_successfully,
+	revoke_invite_successfully: revoke_invite_successfully,
+	create_invite_successfully: create_invite_successfully,
+	must_be_a_number: must_be_a_number,
+	is_revoked: is_revoked,
+	is_sent: is_sent,
+	is_send: is_send,
+	expired_date: expired_date,
+	reset_passcode: reset_passcode,
+	at_academy: at_academy,
+	sent_at: sent_at,
+	create_data_successfully: create_data_successfully
 };
 
 var problem_solving$1 = "Problem Solving";
@@ -3845,7 +4103,7 @@ var choose$1 = "Choose";
 var additional_duration$1 = "Additional duration";
 var enter_textbook_name_to_search$1 = "Enter textbook name to search";
 var select_class_placeholder$1 = "Select class...";
-var user_name$1 = "Username";
+var user_name$1 = "User Name";
 var vulnerable_detail$1 = "Other students had a high percentage of correct answers, but I could not answer these questions correctly.";
 var protracted_problem_detail$1 = "Compare the solution time among the correct answers.";
 var number_of_correct_answers$1 = "Number of correct answers";
@@ -3867,6 +4125,81 @@ var messages$1 = {
 var submit$1 = "Submit";
 var must_select_a_teacher_first$1 = "Must select a teacher first";
 var student_grade_is_invalid$1 = "Student grade must be from 1 to 12";
+var recent_users$1 = "Recent Users";
+var recent_students$1 = "Recent Students";
+var viewed_user$1 = "Viewed User";
+var viewed_QNA$1 = "Viewed Question&Answer";
+var viewed_exam_result$1 = "Viewed Exam Results";
+var printed_exam_result$1 = "Printed Exam Result";
+var viewed_attendance$1 = "Viewed Attendance";
+var updated_user$1 = "Updated User";
+var created_new_user$1 = "Created New User";
+var imported_user$1 = "Imported User";
+var imported_remove_user$1 = "Imported Remove User";
+var deleted_user$1 = "Deleted User";
+var completed_QNA$1 = "Completed Question&Answer";
+var answered_QNA$1 = "Answered Question&Answer";
+var remove_message_QNA$1 = "Remove Message Question&Answer";
+var update_message_QNA$1 = "Update Message Question&Answer";
+var updated_attendance$1 = "Updated Attendance";
+var added_teacher_to_class$1 = "Added Teacher To Class";
+var removed_teacher_from_class$1 = "Removed Teacher From Class";
+var added_student_to_class$1 = "Added Student To Class";
+var removed_student_from_class$1 = "Removed Student From Class";
+var exam_detail$1 = "Exam detail";
+var study_peak$1 = "Study Peak";
+var enter_pass_code$1 = "Enter pass code";
+var join_an_academy$1 = "Join an academy";
+var select_an_academy$1 = "Select an academy";
+var pass_code$1 = "Pass Code";
+var enter_academy_pass_code$1 = "Enter academy pass code";
+var authentication_failed$1 = "Authentication failed!";
+var verifying$1 = "Verifying...";
+var login$1 = "Login";
+var please_wait_a_moment$1 = "Please wait a moment";
+var oops_sorry$1 = "Oops, sorry!";
+var invitation_token_not_provided$1 = "Invitation token not provided";
+var academy_invitation$1 = "Academy invitation";
+var join_academy$1 = "Join academy";
+var you_need_to_log_out_of_your_current_academy_to_use_the_invite_link$1 = "You need to log out of your current academy to use the invite link";
+var you_need_to_log_out_of_your_current_academy_to_use_the_academy_join_link$1 = "You need to log out of your current academy to use the academy join link";
+var enter_academy_passcode$1 = "Enter Academy Pass Code";
+var academy_passcode$1 = "Academy Pass Code";
+var academy_invite$1 = "Academy Invite";
+var academy_invite_new_students$1 = "Academy Invite New Students";
+var create_passcode$1 = "Create Pass Code";
+var update_passcode$1 = "Update Pass Code";
+var is_active$1 = "IsActive";
+var limited_emails$1 = "Limited Emails";
+var limited_used_times$1 = "Limited Used Times";
+var used_times$1 = "Used Times";
+var update_data_successfully$1 = "Update Data Successfully";
+var reset_data_successfully$1 = "Reset Data Successfully";
+var limited_used_times_is_required$1 = "Limited Used Times is required";
+var limited_emails_is_required$1 = "Limited Emails is Required";
+var are_you_sure_you_want_to_delete_the_passcode$1 = "Are you sure you want to delete the passcode: {{passcode}}?";
+var expired_time$1 = "Expired Time";
+var expired_time_is_required$1 = "Expiry Time is required";
+var total_emails$1 = "Total Emails";
+var academy_invite_detail$1 = "Academy Invite Detail";
+var are_you_sure_to_delete_academy_invite$1 = "Are you sure to delete this academy invite?";
+var day$1 = "day";
+var days$1 = "days";
+var emails$1 = "Emails";
+var is_accepted$1 = "Is Accepted";
+var re_send$1 = "Resend";
+var revoke$1 = "Revoke";
+var resend_invite_successfully$1 = "Resend invite successfully";
+var revoke_invite_successfully$1 = "Revoke invite successfully";
+var create_invite_successfully$1 = "Create invite successfully";
+var must_be_a_number$1 = "Must be a number";
+var is_revoked$1 = "Is Revoked";
+var is_sent$1 = "Is Sent";
+var is_send$1 = "Is Send";
+var expired_date$1 = "Expired Date";
+var reset_passcode$1 = "Reset Used Times Pass Code";
+var at_academy$1 = "At academy";
+var sent_at$1 = "Sent at";
 var lang_en = {
 	problem_solving: problem_solving$1,
 	my_story: my_story$1,
@@ -4531,7 +4864,82 @@ var lang_en = {
 	messages: messages$1,
 	submit: submit$1,
 	must_select_a_teacher_first: must_select_a_teacher_first$1,
-	student_grade_is_invalid: student_grade_is_invalid$1
+	student_grade_is_invalid: student_grade_is_invalid$1,
+	recent_users: recent_users$1,
+	recent_students: recent_students$1,
+	viewed_user: viewed_user$1,
+	viewed_QNA: viewed_QNA$1,
+	viewed_exam_result: viewed_exam_result$1,
+	printed_exam_result: printed_exam_result$1,
+	viewed_attendance: viewed_attendance$1,
+	updated_user: updated_user$1,
+	created_new_user: created_new_user$1,
+	imported_user: imported_user$1,
+	imported_remove_user: imported_remove_user$1,
+	deleted_user: deleted_user$1,
+	completed_QNA: completed_QNA$1,
+	answered_QNA: answered_QNA$1,
+	remove_message_QNA: remove_message_QNA$1,
+	update_message_QNA: update_message_QNA$1,
+	updated_attendance: updated_attendance$1,
+	added_teacher_to_class: added_teacher_to_class$1,
+	removed_teacher_from_class: removed_teacher_from_class$1,
+	added_student_to_class: added_student_to_class$1,
+	removed_student_from_class: removed_student_from_class$1,
+	exam_detail: exam_detail$1,
+	study_peak: study_peak$1,
+	enter_pass_code: enter_pass_code$1,
+	join_an_academy: join_an_academy$1,
+	select_an_academy: select_an_academy$1,
+	pass_code: pass_code$1,
+	enter_academy_pass_code: enter_academy_pass_code$1,
+	authentication_failed: authentication_failed$1,
+	verifying: verifying$1,
+	login: login$1,
+	please_wait_a_moment: please_wait_a_moment$1,
+	oops_sorry: oops_sorry$1,
+	invitation_token_not_provided: invitation_token_not_provided$1,
+	academy_invitation: academy_invitation$1,
+	join_academy: join_academy$1,
+	you_need_to_log_out_of_your_current_academy_to_use_the_invite_link: you_need_to_log_out_of_your_current_academy_to_use_the_invite_link$1,
+	you_need_to_log_out_of_your_current_academy_to_use_the_academy_join_link: you_need_to_log_out_of_your_current_academy_to_use_the_academy_join_link$1,
+	enter_academy_passcode: enter_academy_passcode$1,
+	academy_passcode: academy_passcode$1,
+	academy_invite: academy_invite$1,
+	academy_invite_new_students: academy_invite_new_students$1,
+	create_passcode: create_passcode$1,
+	update_passcode: update_passcode$1,
+	is_active: is_active$1,
+	limited_emails: limited_emails$1,
+	limited_used_times: limited_used_times$1,
+	used_times: used_times$1,
+	update_data_successfully: update_data_successfully$1,
+	reset_data_successfully: reset_data_successfully$1,
+	limited_used_times_is_required: limited_used_times_is_required$1,
+	limited_emails_is_required: limited_emails_is_required$1,
+	are_you_sure_you_want_to_delete_the_passcode: are_you_sure_you_want_to_delete_the_passcode$1,
+	expired_time: expired_time$1,
+	expired_time_is_required: expired_time_is_required$1,
+	total_emails: total_emails$1,
+	academy_invite_detail: academy_invite_detail$1,
+	are_you_sure_to_delete_academy_invite: are_you_sure_to_delete_academy_invite$1,
+	day: day$1,
+	days: days$1,
+	emails: emails$1,
+	is_accepted: is_accepted$1,
+	re_send: re_send$1,
+	revoke: revoke$1,
+	resend_invite_successfully: resend_invite_successfully$1,
+	revoke_invite_successfully: revoke_invite_successfully$1,
+	create_invite_successfully: create_invite_successfully$1,
+	must_be_a_number: must_be_a_number$1,
+	is_revoked: is_revoked$1,
+	is_sent: is_sent$1,
+	is_send: is_send$1,
+	expired_date: expired_date$1,
+	reset_passcode: reset_passcode$1,
+	at_academy: at_academy$1,
+	sent_at: sent_at$1
 };
 
 i18n.use(reactI18next.initReactI18next).init({
@@ -4627,6 +5035,7 @@ var TheLanguageDropdown = function TheLanguageDropdown(_ref) {
 };
 
 var useSwitchAcademy = function useSwitchAcademy(role, history, homeAcademyUrl, homeUrl, canFetchAcademies) {
+  var _user$roles;
   if (role === void 0) {
     role = exports.Role.Student;
   }
@@ -4702,8 +5111,9 @@ var useSwitchAcademy = function useSwitchAcademy(role, history, homeAcademyUrl,
       isLoading && dispatch(setLoading(true));
       var academyId = selectedAcademy ? selectedAcademy.id : 0;
       var academyDomain = selectedAcademy ? selectedAcademy.domain : undefined;
+      var isSuperAdminUser = user && !user.academyDomain;
       var _temp4 = _catch(function () {
-        return Promise.resolve(switchAcademy(academyId)).then(function (res) {
+        return Promise.resolve(isSuperAdminUser ? switchSuperAdminAcademy(academyId, role) : switchAcademy(academyId, role)).then(function (res) {
           var data = res.data;
           var requestBody = {
             accessToken: data.accessToken,
@@ -4724,16 +5134,15 @@ var useSwitchAcademy = function useSwitchAcademy(role, history, homeAcademyUrl,
       return Promise.reject(e);
     }
   };
-  var handleLogOutAcademy = function handleLogOutAcademy(selectedAcademy, callback) {
+  var handleLogOutAcademy = function handleLogOutAcademy(callback) {
     try {
       var _temp7 = function _temp7() {
         dispatch(setLoading(false));
         callback();
       };
       dispatch(setLoading(true));
-      var academyDomain = selectedAcademy ? selectedAcademy.domain : undefined;
       var _temp6 = _catch(function () {
-        return Promise.resolve(switchAcademy(0)).then(function (res) {
+        return Promise.resolve(switchAcademy(0, role)).then(function (res) {
           var data = res.data;
           var requestBody = {
             accessToken: data.accessToken,
@@ -4741,12 +5150,11 @@ var useSwitchAcademy = function useSwitchAcademy(role, history, homeAcademyUrl,
             academyId: 0,
             role: role
           };
-          academyDomain && localStorage.setItem(ACADEMY_DOMAIN, academyDomain);
-          !academyDomain && localStorage.removeItem(ACADEMY_DOMAIN);
-          return Promise.resolve(handleLoginAccessToken(requestBody, false, user.academyDomain ? academyDomain : undefined)).then(function () {});
+          localStorage.removeItem(ACADEMY_DOMAIN);
+          return Promise.resolve(handleLoginAccessToken(requestBody, false)).then(function () {});
         });
       }, function (error) {
-        academyDomain && localStorage.removeItem(ACADEMY_DOMAIN);
+        localStorage.removeItem(ACADEMY_DOMAIN);
         reactToastify.toast.error(getErrorMessage(t, error));
       });
       return Promise.resolve(_temp6 && _temp6.then ? _temp6.then(_temp7) : _temp7(_temp6));
@@ -4756,7 +5164,7 @@ var useSwitchAcademy = function useSwitchAcademy(role, history, homeAcademyUrl,
   };
   React.useEffect(function () {
     canFetchAcademies && getAcademies();
-  }, [canFetchAcademies, user === null || user === void 0 ? void 0 : user.academyDomain, user === null || user === void 0 ? void 0 : user.email]);
+  }, [canFetchAcademies, user === null || user === void 0 ? void 0 : user.academyDomain, user === null || user === void 0 ? void 0 : user.email, user === null || user === void 0 ? void 0 : (_user$roles = user.roles) === null || _user$roles === void 0 ? void 0 : _user$roles.join(",")]);
   React.useEffect(function () {
     canFetchAcademies && isReFetchUserAcademies && getAcademies(false);
   }, [canFetchAcademies, isReFetchUserAcademies]);
@@ -4852,7 +5260,7 @@ var TheAcademyDropdown = function TheAcademyDropdown(_ref) {
       display: "flex",
       alignItems: "center"
     }
-  }, selectedAcademy !== null && selectedAcademy !== void 0 && selectedAcademy.name ? React__default.createElement(material.Stack, {
+  }, React__default.createElement(material.Stack, {
     flexDirection: "column",
     gap: "2px"
   }, React__default.createElement(material.Typography, {
@@ -4873,28 +5281,7 @@ var TheAcademyDropdown = function TheAcademyDropdown(_ref) {
       lineHeight: '1.5em',
       color: styles.gray_500
     }
-  }, selectedAcademy.name)) : React__default.createElement(material.Stack, {
-    flexDirection: "column",
-    gap: "2px"
-  }, React__default.createElement(material.Typography, {
-    textAlign: "start",
-    className: "" + styles["line-clamp"],
-    sx: {
-      fontSize: 14,
-      fontWeight: 900,
-      lineHeight: '1.5em',
-      color: styles.gray_900
-    }
-  }), React__default.createElement(material.Typography, {
-    textAlign: "start",
-    className: "" + styles["line-clamp"],
-    sx: {
-      fontSize: 14,
-      fontWeight: 600,
-      lineHeight: '1.5em',
-      color: styles.gray_500
-    }
-  }, t("no_academy_selected"))))), React__default.createElement(material.Grid, {
+  }, selectedAcademy !== null && selectedAcademy !== void 0 && selectedAcademy.name ? selectedAcademy.name : t("no_academy_selected"))))), React__default.createElement(material.Grid, {
     item: true,
     xs: 6,
     lg: 2,
@@ -4994,7 +5381,7 @@ var TheAcademyDropdown = function TheAcademyDropdown(_ref) {
       }
     }, option.name))), option.id === (selectedAcademy === null || selectedAcademy === void 0 ? void 0 : selectedAcademy.id) && React__default.createElement("div", {
       onClick: function onClick() {
-        return handleLogOutAcademy(selectedAcademy, handleClose);
+        return handleLogOutAcademy(handleClose);
       }
     }, React__default.createElement(io5.IoCloseCircle, {
       size: 18,
@@ -6499,14 +6886,14 @@ var MessageStatus;
 })(MessageStatus || (MessageStatus = {}));
 
 var types = {
-  __proto__: null,
-  get MessageSortBy () { return MessageSortBy; },
-  get OrderBy () { return OrderBy; },
-  get StudentSortBy () { return StudentSortBy; },
-  get StudentOrderBy () { return StudentOrderBy; },
-  get MessageAction () { return MessageAction; },
-  get MessageSourceType () { return MessageSourceType; },
-  get MessageStatus () { return MessageStatus; }
+    __proto__: null,
+    get MessageSortBy () { return MessageSortBy; },
+    get OrderBy () { return OrderBy; },
+    get StudentSortBy () { return StudentSortBy; },
+    get StudentOrderBy () { return StudentOrderBy; },
+    get MessageAction () { return MessageAction; },
+    get MessageSourceType () { return MessageSourceType; },
+    get MessageStatus () { return MessageStatus; }
 };
 
 var ExamStatus;
@@ -6530,7 +6917,8 @@ var MESSAGE_DEFAULT_FILTER = {
   sortColumnName: MessageSortBy.CreatedAt
 };
 
-var useMessageList = function useMessageList() {
+var useMessageList = function useMessageList(_ref) {
+  var student = _ref.student;
   var _useState = React.useState([]),
     messages = _useState[0],
     setMessages = _useState[1];
@@ -6542,13 +6930,19 @@ var useMessageList = function useMessageList() {
     setLoading = _useState3[1];
   var _useTranslation = reactI18next.useTranslation(),
     t = _useTranslation.t;
+  var roles = reactRedux.useSelector(function (state) {
+    var _state$common, _state$common$user;
+    return (state === null || state === void 0 ? void 0 : (_state$common = state.common) === null || _state$common === void 0 ? void 0 : (_state$common$user = _state$common.user) === null || _state$common$user === void 0 ? void 0 : _state$common$user.roles) || [];
+  });
+  var isTeacher = roles === null || roles === void 0 ? void 0 : roles.includes(exports.Role.Teacher);
+  var isFirst = true;
   var getMessageList = function getMessageList(conversationId) {
     try {
-      var _temp2 = function _temp2() {
+      var _temp3 = function _temp3() {
         setLoading(false);
       };
       setLoading(true);
-      var _temp = _catch(function () {
+      var _temp2 = _catch(function () {
         var filter = _extends({}, messageFilter);
         return Promise.resolve(getMessagesByConversation(conversationId, filter)).then(function (res) {
           return Promise.resolve(updateLastTimeReadConversation(conversationId)).then(function () {
@@ -6560,19 +6954,32 @@ var useMessageList = function useMessageList() {
                 totalPages: res.data.totalPages
               });
             });
+            var _temp = function () {
+              if (isFirst && isTeacher) {
+                return Promise.resolve(createRecentUserActionListApi({
+                  userId: (student === null || student === void 0 ? void 0 : student.id) || 0,
+                  action: RecentUserAction$1.ViewedQNA,
+                  data: "" + conversationId,
+                  roles: [exports.Role.Teacher]
+                })).then(function () {
+                  isFirst = false;
+                });
+              }
+            }();
+            if (_temp && _temp.then) return _temp.then(function () {});
           });
         });
       }, function (error) {
         reactToastify.toast.error(getErrorMessage(t, error));
       });
-      return Promise.resolve(_temp && _temp.then ? _temp.then(_temp2) : _temp2(_temp));
+      return Promise.resolve(_temp2 && _temp2.then ? _temp2.then(_temp3) : _temp3(_temp2));
     } catch (e) {
       return Promise.reject(e);
     }
   };
   var handleLoadMore = function handleLoadMore(conversationId) {
     try {
-      var _temp4 = function _temp4(_result) {
+      var _temp5 = function _temp5(_result) {
         if (_exit) return _result;
         setLoading(false);
         return true;
@@ -6583,7 +6990,7 @@ var useMessageList = function useMessageList() {
         currentPage: ((messageFilter === null || messageFilter === void 0 ? void 0 : messageFilter.currentPage) || 1) + 1
       });
       setLoading(true);
-      var _temp3 = _catch(function () {
+      var _temp4 = _catch(function () {
         return Promise.resolve(getMessagesByConversation(conversationId, filter)).then(function (res) {
           return Promise.resolve(updateLastTimeReadConversation(conversationId)).then(function () {
             if (res.data.items.length) {
@@ -6607,7 +7014,7 @@ var useMessageList = function useMessageList() {
         reactToastify.toast.error(getErrorMessage(t, error));
         _exit = true;
       });
-      return Promise.resolve(_temp3 && _temp3.then ? _temp3.then(_temp4) : _temp4(_temp3));
+      return Promise.resolve(_temp4 && _temp4.then ? _temp4.then(_temp5) : _temp5(_temp4));
     } catch (e) {
       return Promise.reject(e);
     }
@@ -6618,19 +7025,19 @@ var useMessageList = function useMessageList() {
   };
   var handleDeleteMessage = function handleDeleteMessage(conversationId, id, callback) {
     try {
-      var _temp6 = function _temp6(_result2) {
+      var _temp7 = function _temp7(_result2) {
         if (_exit2) return _result2;
         callback();
       };
       var _exit2 = false;
       if (isLoading) return Promise.resolve();
-      var _temp5 = _catch(function () {
+      var _temp6 = _catch(function () {
         return Promise.resolve(deleteMessage(conversationId, id)).then(function () {});
       }, function (error) {
         reactToastify.toast.error(getErrorMessage(t, error));
         _exit2 = true;
       });
-      return Promise.resolve(_temp5 && _temp5.then ? _temp5.then(_temp6) : _temp6(_temp5));
+      return Promise.resolve(_temp6 && _temp6.then ? _temp6.then(_temp7) : _temp7(_temp6));
     } catch (e) {
       return Promise.reject(e);
     }
@@ -6654,19 +7061,19 @@ var useMessageList = function useMessageList() {
   };
   var handleUpdateMessage = function handleUpdateMessage(conversationId, id, message, callback) {
     try {
-      var _temp8 = function _temp8(_result3) {
+      var _temp9 = function _temp9(_result3) {
         if (_exit3) return _result3;
         setLoading(false);
         callback();
       };
       var _exit3 = false;
-      var _temp7 = _catch(function () {
+      var _temp8 = _catch(function () {
         return Promise.resolve(updateMessage(conversationId, id, message)).then(function () {});
       }, function (error) {
         reactToastify.toast.error(getErrorMessage(t, error));
         _exit3 = true;
       });
-      return Promise.resolve(_temp7 && _temp7.then ? _temp7.then(_temp8) : _temp8(_temp7));
+      return Promise.resolve(_temp8 && _temp8.then ? _temp8.then(_temp9) : _temp9(_temp8));
     } catch (e) {
       return Promise.reject(e);
     }
@@ -6721,7 +7128,9 @@ var useChatContainer = function useChatContainer(props) {
   var _useState4 = React.useState(true),
     isScrollToEnd = _useState4[0],
     setScrollToEnd = _useState4[1];
-  var _useMessageList = useMessageList(),
+  var _useMessageList = useMessageList({
+      student: student
+    }),
     isLoadingMessages = _useMessageList.isLoading,
     messages = _useMessageList.messages,
     messageFilter = _useMessageList.messageFilter,
@@ -7004,8 +7413,10 @@ var usePusherConversation = function usePusherConversation(onNewMessageConversat
   return {};
 };
 
+var _templateObject;
+var BorderedTextField = material.styled(material.TextField)(_templateObject || (_templateObject = _taggedTemplateLiteralLoose(["\n    & .MuiOutlinedInput-root {\n        &.Mui-focused fieldset {\n            border-width: 1px;\n            border-color: ", ";\n        }\n    }\n    & .MuiOutlinedInput-root:hover {\n      fieldset {\n          border-width: 1px;\n          border-color: ", ";\n      }\n    }\n"])), styles.dark, styles.less_dark);
 var InputText = function InputText(props) {
-  return React__default.createElement(material.TextField, Object.assign({
+  return React__default.createElement(BorderedTextField, Object.assign({
     sx: {
       "& input": {
         py: "7.5px",
@@ -7797,12 +8208,22 @@ var OrderType;
   OrderType["DESC"] = "DESC";
 })(OrderType || (OrderType = {}));
 
+var RecentUserAction$1;
+(function (RecentUserAction) {
+  RecentUserAction["ViewedUser"] = "ViewedUser";
+  RecentUserAction["ViewedQNA"] = "ViewedQNA";
+  RecentUserAction["ViewedExamResult"] = "ViewedExamResult";
+  RecentUserAction["PrintedExamResult"] = "PrintedExamResult";
+  RecentUserAction["ViewedAttendance"] = "ViewedAttendance";
+})(RecentUserAction$1 || (RecentUserAction$1 = {}));
+
 
 
 var index = {
-  __proto__: null,
-  get OrderType () { return OrderType; },
-  get ExamStatus () { return ExamStatus$1; }
+    __proto__: null,
+    get OrderType () { return OrderType; },
+    get ExamStatus () { return ExamStatus$1; },
+    get RecentUserAction () { return RecentUserAction$1; }
 };
 
 var TextbookSortBy;
@@ -8046,6 +8467,8 @@ var useExam = function useExam(props) {
   };
 };
 
+var PAGE_TITLE_DETAIL = "textbook_detail";
+var PAGE_TITLE_CREATE = "create_textbook";
 var useTextbookDetail = function useTextbookDetail(props) {
   var role = props.role,
     isReadonlyParam = props.isReadonlyParam,
@@ -8747,7 +9170,7 @@ var useTextbookDetail = function useTextbookDetail(props) {
     handleChangeExamRequest(exam);
   };
   React.useEffect(function () {
-    document.title = t("textbooks") + " | " + t(id ? "textbook_detail" : "create_textbook");
+    document.title = t("study_peak") + " | " + t(id ? PAGE_TITLE_DETAIL : PAGE_TITLE_CREATE);
   }, [id, t]);
   React.useEffect(function () {
     setReadonly(textbook.isCreatedByAdmin || !!isReadonlyParam);
@@ -9805,6 +10228,22 @@ var TextbookViewDetail = function TextbookViewDetail(props) {
   }));
 };
 
+var checkSuperUrl = function checkSuperUrl(superUrls, pathname) {
+  return superUrls.some(function (i) {
+    if (i.includes(":")) {
+      var urls = i.split("/");
+      var names = pathname.split("/");
+      if (urls.length != names.length) return false;
+      var isMatches = true;
+      urls.forEach(function (u, index) {
+        if (u != names[index] && !u.startsWith(":")) isMatches = false;
+      });
+      return isMatches;
+    }
+    return pathname.startsWith(i);
+  });
+};
+
 var useAutoAcademyDomain = function useAutoAcademyDomain(logout, history, superUrls, homeUrl, homeAcademyUrl, isAuthPage) {
   if (isAuthPage === void 0) {
     isAuthPage = true;
@@ -9823,9 +10262,7 @@ var useAutoAcademyDomain = function useAutoAcademyDomain(logout, history, superU
     var paramAcademyDomain = searchParams.get("domain");
     var domain = getAcademyDomain();
     if (!!email !== isAuthPage) return;
-    var isSuperUrl = superUrls.some(function (i) {
-      return pathname.startsWith(i);
-    });
+    var isSuperUrl = checkSuperUrl(superUrls, pathname);
     if (!academyDomain) {
       if (!isSuperUrl) {
         !paramAcademyDomain && domain && searchParams.set("domain", domain);
@@ -9866,7 +10303,7 @@ var useAutoAcademyDomain = function useAutoAcademyDomain(logout, history, superU
   };
   React.useEffect(function () {
     changeAcademySearchParams();
-  }, [window.location.pathname, window.location.search, isAuthPage, email, academyDomain]);
+  }, [pathname, window.location.search, isAuthPage, email, academyDomain]);
 };
 
 var DEFAULT_PAGING_RESPONSE = {
@@ -9984,12 +10421,13 @@ var useList = function useList(fetchData, defaultQuery) {
 
 
 var index$1 = {
-  __proto__: null,
-  useLogin: useLogin,
-  useAutoAcademyDomain: useAutoAcademyDomain,
-  useList: useList
+    __proto__: null,
+    useLogin: useLogin,
+    useAutoAcademyDomain: useAutoAcademyDomain,
+    useList: useList
 };
 
+var PAGE_TITLE$1 = "textbooks";
 var useTextbookList = function useTextbookList(props) {
   var role = props.role,
     navigate = props.navigate;
@@ -10053,6 +10491,9 @@ var useTextbookList = function useTextbookList(props) {
       return Promise.reject(e);
     }
   };
+  React.useEffect(function () {
+    document.title = t("study_peak") + " | " + t(PAGE_TITLE$1);
+  }, [t]);
   return {
     filter: filter,
     textSearchRef: textSearchRef,
@@ -10276,9 +10717,9 @@ var TextbookList = function TextbookList(props) {
 
 
 var index$2 = {
-  __proto__: null,
-  TextbookList: TextbookList,
-  TextbookDetail: TextbookViewDetail
+    __proto__: null,
+    TextbookList: TextbookList,
+    TextbookDetail: TextbookViewDetail
 };
 
 var _excluded$5 = ["defaultValue", "options", "isDisabled", "scrollBottom", "value", "isMulti"];
@@ -11186,6 +11627,28 @@ var defaultSeries = function defaultSeries(t) {
   }];
 };
 
+var RECENT_USER_URL = BASE_URL + "/api/recentUsers";
+var getRecentUserActionListApi = function getRecentUserActionListApi(query) {
+  return api.get("" + RECENT_USER_URL, {
+    params: _extends({}, query)
+  });
+};
+var createRecentUserActionListApi = function createRecentUserActionListApi(_ref) {
+  var userId = _ref.userId,
+    action = _ref.action,
+    data = _ref.data,
+    roles = _ref.roles;
+  return api.post("" + RECENT_USER_URL, {
+    userId: userId,
+    action: action,
+    data: data
+  }, {
+    params: {
+      roles: roles
+    }
+  });
+};
+
 var useExamResult = function useExamResult(searchParam, history, examSessionId, studentId, code, handleChangeTab, selectedTab) {
   var _allSeries$dataChartI;
   if (examSessionId === void 0) {
@@ -11210,35 +11673,39 @@ var useExamResult = function useExamResult(searchParam, history, examSessionId,
     var _state$common2;
     return state === null || state === void 0 ? void 0 : (_state$common2 = state.common) === null || _state$common2 === void 0 ? void 0 : _state$common2.language;
   });
-  var _useState = React.useState(),
-    resultData = _useState[0],
-    setResultData = _useState[1];
+  var _useState = React.useState(false),
+    isLoading = _useState[0],
+    setIsLoading = _useState[1];
   var _useState2 = React.useState(),
-    effectSize = _useState2[0],
-    setEffectSize = _useState2[1];
-  var _useState3 = React.useState([]),
-    longTimeSpend = _useState3[0],
-    setLongTimeSpend = _useState3[1];
+    resultData = _useState2[0],
+    setResultData = _useState2[1];
+  var _useState3 = React.useState(),
+    effectSize = _useState3[0],
+    setEffectSize = _useState3[1];
   var _useState4 = React.useState([]),
-    timelyOrderQuestions = _useState4[0],
-    setTimelyOrderQuestions = _useState4[1];
+    longTimeSpend = _useState4[0],
+    setLongTimeSpend = _useState4[1];
   var _useState5 = React.useState([]),
-    categoryResponses = _useState5[0],
-    setCategoryResponses = _useState5[1];
-  var _useState6 = React.useState(0),
-    dataChartIndex = _useState6[0],
-    setDataChartIndex = _useState6[1];
-  var _useState7 = React.useState(""),
-    openProblem = _useState7[0],
-    setOpenProblem = _useState7[1];
+    timelyOrderQuestions = _useState5[0],
+    setTimelyOrderQuestions = _useState5[1];
+  var _useState6 = React.useState([]),
+    categoryResponses = _useState6[0],
+    setCategoryResponses = _useState6[1];
+  var _useState7 = React.useState(0),
+    dataChartIndex = _useState7[0],
+    setDataChartIndex = _useState7[1];
+  var _useState8 = React.useState(""),
+    openProblem = _useState8[0],
+    setOpenProblem = _useState8[1];
   var _useTranslation = reactI18next.useTranslation(),
     t = _useTranslation.t;
   var getStudentData = function getStudentData(examCode) {
     try {
       var _temp2 = function _temp2() {
-        dispatch(setLoading(false));
+        setIsLoading(false);
       };
       if (!examCode) return Promise.resolve();
+      setIsLoading(true);
       var _temp = _catch(function () {
         return Promise.resolve(Promise.all([getResults(examCode), getResultsLongTimeSpend(examCode), getResultsEffectSize(examCode), getResultsTimeOrderQuestion(examCode), getResultsCategories(examCode)])).then(function (result) {
           var _result$0$data, _result$1$data, _result$2$data, _result$3$data, _result$4$data;
@@ -11260,14 +11727,17 @@ var useExamResult = function useExamResult(searchParam, history, examSessionId,
   };
   var getStudentDataByTeacher = function getStudentDataByTeacher(examCode, examSessionId, studentId) {
     try {
-      var _temp4 = function _temp4() {
-        dispatch(setLoading(false));
+      var _temp5 = function _temp5() {
+        setIsLoading(false);
       };
       if (!examCode || !examSessionId || !studentId) return Promise.resolve();
-      dispatch(setLoading(true));
-      var _temp3 = _catch(function () {
+      setIsLoading(true);
+      var _temp4 = _catch(function () {
         return Promise.resolve(Promise.all([getResultsTeacher(examSessionId, studentId), getResultsLongTimeSpendTeacher(examSessionId, studentId), getResultsEffectSizeTeacher(examSessionId, studentId), getResultsTimeOrderQuestionTeacher(examSessionId, studentId), getResultsCategoriesTeacher(examSessionId, studentId)])).then(function (result) {
           var _result$0$data2, _result$1$data2, _result$2$data2, _result$3$data2, _result$4$data2;
+          function _temp3(_createRecentUserActi) {
+            _createRecentUserActi;
+          }
           handleChangeTab(0);
           setDataChartIndex(0);
           setResultData((_result$0$data2 = result[0].data) === null || _result$0$data2 === void 0 ? void 0 : _result$0$data2.data);
@@ -11275,11 +11745,22 @@ var useExamResult = function useExamResult(searchParam, history, examSessionId,
           setEffectSize((_result$2$data2 = result[2].data) === null || _result$2$data2 === void 0 ? void 0 : _result$2$data2.data);
           setTimelyOrderQuestions((_result$3$data2 = result[3].data) === null || _result$3$data2 === void 0 ? void 0 : _result$3$data2.data);
           setCategoryResponses(((_result$4$data2 = result[4].data) === null || _result$4$data2 === void 0 ? void 0 : _result$4$data2.data) || []);
+          return isStudent ? _temp3(!isStudent && createRecentUserActionListApi({
+            userId: studentId,
+            action: RecentUserAction$1.ViewedExamResult,
+            data: "" + examSessionId,
+            roles: [exports.Role.Teacher]
+          })) : Promise.resolve(!isStudent && createRecentUserActionListApi({
+            userId: studentId,
+            action: RecentUserAction$1.ViewedExamResult,
+            data: "" + examSessionId,
+            roles: [exports.Role.Teacher]
+          })).then(_temp3);
         });
       }, function (error) {
         reactToastify.toast.error(getErrorMessage(t, error));
       });
-      return Promise.resolve(_temp3 && _temp3.then ? _temp3.then(_temp4) : _temp4(_temp3));
+      return Promise.resolve(_temp4 && _temp4.then ? _temp4.then(_temp5) : _temp5(_temp4));
     } catch (e) {
       return Promise.reject(e);
     }
@@ -11455,13 +11936,13 @@ var useExamResult = function useExamResult(searchParam, history, examSessionId,
   var series = (_allSeries$dataChartI = allSeries[dataChartIndex]) != null ? _allSeries$dataChartI : defaultSeries(t);
   var handleExportPdf = function handleExportPdf() {
     try {
-      var _temp22 = function _temp22(_result) {
+      var _temp24 = function _temp24(_result) {
         if (_exit) return _result;
         dispatch(setLoading(false));
       };
       var _exit = false;
       dispatch(setLoading(true));
-      var _temp21 = _catch(function () {
+      var _temp23 = _catch(function () {
         var canvas = document.querySelector("#canvas");
         var headerCanvas = document.querySelector("#header-canvas");
         if (!canvas || !headerCanvas) {
@@ -11483,24 +11964,38 @@ var useExamResult = function useExamResult(searchParam, history, examSessionId,
         var imgWidth = WIDTH_PAPER;
         var chartWidth = WIDTH_PAPER - 20;
         return Promise.resolve(html2canvas(headerCanvas)).then(function (header) {
-          function _temp20() {
+          function _temp22() {
+            function _temp20(_createRecentUserActi2) {
+              _createRecentUserActi2;
+            }
             doc.save("download.pdf");
+            return isStudent ? _temp20(!isStudent && createRecentUserActionListApi({
+              userId: studentId,
+              action: RecentUserAction$1.PrintedExamResult,
+              data: "" + examSessionId,
+              roles: [exports.Role.Teacher]
+            })) : Promise.resolve(!isStudent && createRecentUserActionListApi({
+              userId: studentId,
+              action: RecentUserAction$1.PrintedExamResult,
+              data: "" + examSessionId,
+              roles: [exports.Role.Teacher]
+            })).then(_temp20);
           }
           var imgHeaderHeight = header.height * imgWidth / header.width;
           var imgHeaderData = header.toDataURL('image/png');
           doc.addImage(imgHeaderData, 'PNG', 0, 0, imgWidth, imgHeaderHeight);
           line += imgHeaderHeight;
           if (line > HEIGHT_PAPER) breakPage();
-          var _temp19 = function () {
+          var _temp21 = function () {
             if (canvas && canvas.childElementCount > 0) {
               var _index = 0;
-              var _temp18 = _for(function () {
+              var _temp19 = _for(function () {
                 return _index < canvas.childElementCount;
               }, function () {
                 return _index++;
               }, function () {
-                function _temp17() {
-                  function _temp15() {
+                function _temp18() {
+                  function _temp16() {
                     line += 20;
                   }
                   var printChartTitle = function printChartTitle() {
@@ -11515,11 +12010,11 @@ var useExamResult = function useExamResult(searchParam, history, examSessionId,
                       return Promise.reject(e);
                     }
                   };
-                  var _temp14 = function () {
+                  var _temp15 = function () {
                     if (printContainerEls.length) {
-                      var _temp13 = _forTo(printContainerEls, function (i) {
-                        function _temp12() {
-                          function _temp10() {
+                      var _temp14 = _forTo(printContainerEls, function (i) {
+                        function _temp13() {
+                          function _temp11() {
                             var printTitle = function printTitle() {
                               try {
                                 if (!printTitleHeight || !printTitleData) return Promise.resolve();
@@ -11548,10 +12043,10 @@ var useExamResult = function useExamResult(searchParam, history, examSessionId,
                             var printContents = printContainerEl.querySelectorAll("." + PrintContentClassName);
                             if (!printContents.length) return;
                             printTitle();
-                            var _temp8 = _forTo(printContents, function (j) {
+                            var _temp9 = _forTo(printContents, function (j) {
                               var rowItem = printContents[j];
                               return Promise.resolve(html2canvas(rowItem)).then(function (rowItemCanvas) {
-                                function _temp7() {
+                                function _temp8() {
                                   doc.addImage(data, 'PNG', 10, line, chartWidth, height);
                                   line += height;
                                 }
@@ -11559,25 +12054,25 @@ var useExamResult = function useExamResult(searchParam, history, examSessionId,
                                 var data = rowItemCanvas.toDataURL('image/png');
                                 if (i === 0 && j === 0 && line + height + (printHeaderHeight || 0) + ((chartTitleHeight || 0) + 10) + 20 > HEIGHT_PAPER) breakPage();
                                 i === 0 && j === 0 && printChartTitle();
-                                var _temp6 = function () {
+                                var _temp7 = function () {
                                   if (line + height + 20 > HEIGHT_PAPER) {
                                     breakPage();
                                     return Promise.resolve(printHeader()).then(function () {});
                                   } else {
-                                    var _temp23 = function () {
+                                    var _temp25 = function () {
                                       if (j === 0) {
                                         return Promise.resolve(printHeader(10)).then(function () {});
                                       }
                                     }();
-                                    if (_temp23 && _temp23.then) return _temp23.then(function () {});
+                                    if (_temp25 && _temp25.then) return _temp25.then(function () {});
                                   }
                                 }();
-                                return _temp6 && _temp6.then ? _temp6.then(_temp7) : _temp7(_temp6);
+                                return _temp7 && _temp7.then ? _temp7.then(_temp8) : _temp8(_temp7);
                               });
                             });
-                            if (_temp8 && _temp8.then) return _temp8.then(function () {});
+                            if (_temp9 && _temp9.then) return _temp9.then(function () {});
                           }
-                          var _temp9 = function () {
+                          var _temp10 = function () {
                             if (printHeaderEl) {
                               return Promise.resolve(html2canvas(printHeaderEl)).then(function (_html2canvas3) {
                                 printHeaderCanvas = _html2canvas3;
@@ -11586,7 +12081,7 @@ var useExamResult = function useExamResult(searchParam, history, examSessionId,
                               });
                             }
                           }();
-                          return _temp9 && _temp9.then ? _temp9.then(_temp10) : _temp10(_temp9);
+                          return _temp10 && _temp10.then ? _temp10.then(_temp11) : _temp11(_temp10);
                         }
                         var printContainerEl = printContainerEls[i];
                         var printTitleEl = printContainerEl.querySelector("." + PrintTitleClassName);
@@ -11597,7 +12092,7 @@ var useExamResult = function useExamResult(searchParam, history, examSessionId,
                         var printHeaderCanvas = null;
                         var printHeaderHeight = null;
                         var printHeaderData = "";
-                        var _temp11 = function () {
+                        var _temp12 = function () {
                           if (printTitleEl) {
                             return Promise.resolve(html2canvas(printTitleEl)).then(function (_html2canvas2) {
                               printTitleCanvas = _html2canvas2;
@@ -11606,9 +12101,9 @@ var useExamResult = function useExamResult(searchParam, history, examSessionId,
                             });
                           }
                         }();
-                        return _temp11 && _temp11.then ? _temp11.then(_temp12) : _temp12(_temp11);
+                        return _temp12 && _temp12.then ? _temp12.then(_temp13) : _temp13(_temp12);
                       });
-                      if (_temp13 && _temp13.then) return _temp13.then(function () {});
+                      if (_temp14 && _temp14.then) return _temp14.then(function () {});
                     } else {
                       return Promise.resolve(html2canvas(chart)).then(function (chartCanvas) {
                         var imgBodyHeight = chartCanvas.height * chartWidth / chartCanvas.width;
@@ -11621,7 +12116,7 @@ var useExamResult = function useExamResult(searchParam, history, examSessionId,
                       });
                     }
                   }();
-                  return _temp14 && _temp14.then ? _temp14.then(_temp15) : _temp15(_temp14);
+                  return _temp15 && _temp15.then ? _temp15.then(_temp16) : _temp16(_temp15);
                 }
                 var chart = canvas.children.item(_index);
                 if (chart.getAttribute("id") === "header-canvas") return;
@@ -11630,7 +12125,7 @@ var useExamResult = function useExamResult(searchParam, history, examSessionId,
                 var printChartTitleCanvas = null;
                 var chartTitleHeight = null;
                 var chartTitleData = "";
-                var _temp16 = function () {
+                var _temp17 = function () {
                   if (chartTitle && printContainerEls.length) {
                     return Promise.resolve(html2canvas(chartTitle)).then(function (_html2canvas) {
                       printChartTitleCanvas = _html2canvas;
@@ -11639,12 +12134,12 @@ var useExamResult = function useExamResult(searchParam, history, examSessionId,
                     });
                   }
                 }();
-                return _temp16 && _temp16.then ? _temp16.then(_temp17) : _temp17(_temp16);
+                return _temp17 && _temp17.then ? _temp17.then(_temp18) : _temp18(_temp17);
               });
-              if (_temp18 && _temp18.then) return _temp18.then(function () {});
+              if (_temp19 && _temp19.then) return _temp19.then(function () {});
             }
           }();
-          return _temp19 && _temp19.then ? _temp19.then(_temp20) : _temp20(_temp19);
+          return _temp21 && _temp21.then ? _temp21.then(_temp22) : _temp22(_temp21);
         });
       }, function (error) {
         console.log({
@@ -11652,7 +12147,7 @@ var useExamResult = function useExamResult(searchParam, history, examSessionId,
         });
         reactToastify.toast.error(getErrorMessage(t, error));
       });
-      return Promise.resolve(_temp21 && _temp21.then ? _temp21.then(_temp22) : _temp22(_temp21));
+      return Promise.resolve(_temp23 && _temp23.then ? _temp23.then(_temp24) : _temp24(_temp23));
     } catch (e) {
       return Promise.reject(e);
     }
@@ -11664,6 +12159,7 @@ var useExamResult = function useExamResult(searchParam, history, examSessionId,
     return utcToLocalTime(resultData === null || resultData === void 0 ? void 0 : resultData.startTime, "HH:mm") + " ~ " + utcToLocalTime(resultData === null || resultData === void 0 ? void 0 : resultData.finishTime, "HH:mm");
   }, [resultData === null || resultData === void 0 ? void 0 : resultData.startTime, resultData === null || resultData === void 0 ? void 0 : resultData.finishTime]);
   return {
+    isLoading: isLoading,
     examTime: examTime,
     series: series,
     chartOptions: chartOptions,
@@ -14415,6 +14911,7 @@ var ExamResultV2 = function ExamResultV2(_ref) {
     selected = _useTab.selected,
     handleChangeTab = _useTab.handleChangeTab;
   var _useExamResult = useExamResult(searchParams, history, examSessionId, studentId, code, handleChangeTab, selected),
+    isLoading = _useExamResult.isLoading,
     examTime = _useExamResult.examTime,
     series = _useExamResult.series,
     allSeries = _useExamResult.allSeries,
@@ -14439,7 +14936,9 @@ var ExamResultV2 = function ExamResultV2(_ref) {
     openCreateQuestionDialog = _useCreateQuestionDia.openCreateQuestionDialog,
     toggleCreateQuestion = _useCreateQuestionDia.toggleCreateQuestion;
   var isTabletUp = material.useMediaQuery('(min-width:900px)');
-  return React__default.createElement(React.Fragment, null, timelyOrderQuestions[dataChartIndex] && longTimeSpend && resultData && effectSize ? React__default.createElement("div", {
+  return React__default.createElement(React.Fragment, null, React__default.createElement(LoadingComponent, {
+    isLoading: isLoading
+  }), timelyOrderQuestions[dataChartIndex] && longTimeSpend && resultData && effectSize ? React__default.createElement("div", {
     style: {
       width: "100%"
     }
@@ -14873,10 +15372,22 @@ var ExamResultV2 = function ExamResultV2(_ref) {
   })) : React__default.createElement(React.Fragment, null));
 };
 
+var RecentUserActionSortBy;
+(function (RecentUserActionSortBy) {
+  RecentUserActionSortBy["CreatedAt"] = "CreatedAt";
+})(RecentUserActionSortBy || (RecentUserActionSortBy = {}));
+var OrderBy$1;
+(function (OrderBy) {
+  OrderBy["ASC"] = "ASC";
+  OrderBy["DESC"] = "DESC";
+})(OrderBy$1 || (OrderBy$1 = {}));
+
 
 
 var index$3 = {
-  __proto__: null
+    __proto__: null,
+    get OrderBy () { return OrderBy$1; },
+    get RecentUserActionSortBy () { return RecentUserActionSortBy; }
 };
 
 var getLocalDayOfWeek = function getLocalDayOfWeek(utcDateTime, dayOfWeek) {
@@ -14912,12 +15423,12 @@ var getRemainTime = function getRemainTime(startTime, duration) {
 };
 
 var times = {
-  __proto__: null,
-  getLocalDayOfWeek: getLocalDayOfWeek,
-  getUtcDayOfWeek: getUtcDayOfWeek,
-  timeSpanToLocalMoment: timeSpanToLocalMoment,
-  convertHHMMSStoSeconds: convertHHMMSStoSeconds,
-  getRemainTime: getRemainTime
+    __proto__: null,
+    getLocalDayOfWeek: getLocalDayOfWeek,
+    getUtcDayOfWeek: getUtcDayOfWeek,
+    timeSpanToLocalMoment: timeSpanToLocalMoment,
+    convertHHMMSStoSeconds: convertHHMMSStoSeconds,
+    getRemainTime: getRemainTime
 };
 
 var SIGN_IN_SUPER_ADMIN_URL = SUPER_ADMIN_BASE_URL + "/api/auth/login";
@@ -14943,6 +15454,7 @@ var signInSuperAdminApi = function signInSuperAdminApi(_ref2) {
   });
 };
 
+var PAGE_TITLE$2 = "sign_in";
 var useLogin$2 = function useLogin(_ref) {
   var history = _ref.history,
     _ref$role = _ref.role,
@@ -15033,8 +15545,13 @@ var useLogin$2 = function useLogin(_ref) {
   };
   React.useEffect(function () {
     var token = getAccessToken();
-    if (token) window.location.href = "/";
-  }, []);
+    var academyDomain = getAcademyDomain();
+    if (token && academyDomain) window.location.href = homeAcademyUrl;
+    if (token && !academyDomain) window.location.href = homeUrl;
+  }, [homeAcademyUrl, homeUrl]);
+  React.useEffect(function () {
+    document.title = t("study_peak") + " | " + t(PAGE_TITLE$2);
+  }, [t]);
   return {
     handleSubmit: handleSubmit,
     handleClearAcademyDomain: handleClearAcademyDomain,
@@ -15535,15 +16052,14 @@ var Header = function Header(_ref) {
     var path = _ref2.path,
       icon = _ref2.icon,
       label = _ref2.label,
-      isMain = _ref2.isMain,
       activePaths = _ref2.activePaths;
     return React__default.createElement(reactRouterDom.Link, {
       key: path,
       "aria-current": "page",
-      to: !academyDomain && !isMain ? "#" : path,
+      to: !academyDomain ? "#" : path,
       className: "text-decoration-none " + ((activePaths !== null && activePaths !== void 0 && activePaths.length ? activePaths.some(function (a) {
-        return pathname.startsWith(a);
-      }) : pathname.startsWith(path)) ? "" + styles["router-link-active"] : "") + " " + styles["tabText"] + " " + (!academyDomain && !isMain ? styles["disabled-link"] : "")
+        return pathname === a;
+      }) : pathname === path) ? "" + styles["router-link-active"] : "") + " " + styles["tabText"] + " " + (!academyDomain ? styles["disabled-link"] : "")
     }, React__default.createElement(material.Stack, {
       sx: {
         justifyContent: "center",
@@ -15572,7 +16088,7 @@ var Header = function Header(_ref) {
     alignItems: "center"
   }, React__default.createElement(reactRouterDom.Link, {
     "aria-current": "page",
-    to: homeRoute.path,
+    to: academyDomain ? homeRoute.path : academyListRoute.path,
     className: "border-none"
   }, React__default.createElement(material.Stack, {
     justifyContent: "center",
@@ -15590,53 +16106,28 @@ var Header = function Header(_ref) {
   }))));
 };
 
-var ACADEMY_URL$1 = BASE_URL + "/api/academy";
-var getAcademyList$1 = function getAcademyList() {
-  return api.get("" + ACADEMY_URL$1);
-};
-var switchAcademy$1 = function switchAcademy(academyId) {
-  return api.post(ACADEMY_URL$1 + "/switch-academy?academyId=" + academyId);
-};
-
 var useAcademyList = function useAcademyList(history, role, homeAcademyUrl, homeUrl, registerUrl) {
   var dispatch = reactRedux.useDispatch();
   var _useLogin = useLogin(history, homeAcademyUrl, homeUrl, registerUrl),
     handleLoginAccessToken = _useLogin.handleLoginAccessToken;
-  var _useState = React.useState([]),
-    academyList = _useState[0],
-    setAcademyList = _useState[1];
+  var academyList = reactRedux.useSelector(function (state) {
+    var _state$academies;
+    return (state === null || state === void 0 ? void 0 : (_state$academies = state.academies) === null || _state$academies === void 0 ? void 0 : _state$academies.items) || [];
+  });
   var email = reactRedux.useSelector(function (state) {
     var _state$common, _state$common$user;
     return state === null || state === void 0 ? void 0 : (_state$common = state.common) === null || _state$common === void 0 ? void 0 : (_state$common$user = _state$common.user) === null || _state$common$user === void 0 ? void 0 : _state$common$user.email;
   });
   var _useTranslation = reactI18next.useTranslation(),
     t = _useTranslation.t;
-  var getAcademies = function getAcademies() {
+  var handleSwitchAcademy = function handleSwitchAcademy(id, domain) {
     try {
       var _temp2 = function _temp2() {
         dispatch(setLoading(false));
       };
       dispatch(setLoading(true));
       var _temp = _catch(function () {
-        return Promise.resolve(getAcademyList$1()).then(function (res) {
-          setAcademyList(res.data.items || []);
-        });
-      }, function (error) {
-        reactToastify.toast.error(getErrorMessage(t, error));
-      });
-      return Promise.resolve(_temp && _temp.then ? _temp.then(_temp2) : _temp2(_temp));
-    } catch (e) {
-      return Promise.reject(e);
-    }
-  };
-  var handleSwitchAcademy = function handleSwitchAcademy(id, domain) {
-    try {
-      var _temp4 = function _temp4() {
-        dispatch(setLoading(false));
-      };
-      dispatch(setLoading(true));
-      var _temp3 = _catch(function () {
-        return Promise.resolve(switchAcademy$1(id)).then(function (res) {
+        return Promise.resolve(switchSuperAdminAcademy(id, role)).then(function (res) {
           var data = res.data;
           var requestBody = {
             accessToken: data.accessToken,
@@ -15650,14 +16141,11 @@ var useAcademyList = function useAcademyList(history, role, homeAcademyUrl, home
       }, function (error) {
         reactToastify.toast.error(getErrorMessage(t, error));
       });
-      return Promise.resolve(_temp3 && _temp3.then ? _temp3.then(_temp4) : _temp4(_temp3));
+      return Promise.resolve(_temp && _temp.then ? _temp.then(_temp2) : _temp2(_temp));
     } catch (e) {
       return Promise.reject(e);
     }
   };
-  React.useEffect(function () {
-    getAcademies();
-  }, []);
   return {
     academyList: academyList,
     handleSwitchAcademy: handleSwitchAcademy
@@ -15697,6 +16185,220 @@ var AcademyCard = function AcademyCard(_ref) {
   }, t("switch"))));
 };
 
+var PassCodeDialog = function PassCodeDialog(_ref) {
+  var open = _ref.open,
+    onClose = _ref.onClose,
+    onSubmit = _ref.onSubmit,
+    academyDomain = _ref.academyDomain;
+  var _useTranslation = reactI18next.useTranslation(),
+    t = _useTranslation.t;
+  var _useState = React.useState(""),
+    passCode = _useState[0],
+    setPassCode = _useState[1];
+  var handleClose = function handleClose(event, reason) {
+    onClose(event, reason);
+  };
+  var handleSubmit = function handleSubmit() {
+    try {
+      var data = {
+        code: passCode,
+        academyDomain: academyDomain
+      };
+      return Promise.resolve(onSubmit(data, handleClose)).then(function () {});
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  };
+  var handleChangePassCode = function handleChangePassCode(e) {
+    setPassCode(e.target.value);
+  };
+  var theme = material.useTheme();
+  return React__default.createElement(CommonDialog, {
+    open: open,
+    onClose: handleClose,
+    size: "xs",
+    title: t("join_an_academy")
+  }, React__default.createElement(material.DialogContent, {
+    sx: {
+      overflowY: "unset"
+    }
+  }, React__default.createElement(material.Stack, {
+    direction: "column",
+    spacing: 2,
+    zIndex: 1,
+    position: "relative"
+  }, React__default.createElement(material.FormGroup, null, React__default.createElement(material.FormLabel, {
+    className: "fw-medium mb-1"
+  }, t("pass_code"), React__default.createElement("span", {
+    className: "text-danger"
+  }, "*")), React__default.createElement(InputText, {
+    id: "pass-code",
+    placeholder: t("enter_pass_code"),
+    value: passCode,
+    onChange: handleChangePassCode
+  })))), React__default.createElement(material.DialogActions, {
+    className: ""
+  }, React__default.createElement(material.Button, {
+    variant: "contained",
+    sx: {
+      bgcolor: theme.palette.grey[700]
+    },
+    onClick: handleClose
+  }, t("cancel")), React__default.createElement(material.Button, {
+    variant: "contained",
+    onClick: handleSubmit,
+    disabled: !passCode.trim().length
+  }, t("submit"))));
+};
+
+var PASS_CODE_URL = SUPER_ADMIN_BASE_URL + "/api/passCodes";
+var checkPassCodeApi = function checkPassCodeApi(code, academyDomain) {
+  return api.post(PASS_CODE_URL + "/check", {
+    code: code,
+    academyDomain: academyDomain
+  });
+};
+
+var usePassCodeCheck = function usePassCodeCheck(props) {
+  var history = props.history,
+    role = props.role,
+    homeAcademyUrl = props.homeAcademyUrl,
+    homeUrl = props.homeUrl,
+    registerUrl = props.registerUrl,
+    domain = props.domain;
+  var _useTranslation = reactI18next.useTranslation(),
+    t = _useTranslation.t;
+  var dispatch = reactRedux.useDispatch();
+  var email = reactRedux.useSelector(function (state) {
+    var _state$common, _state$common$user;
+    return state === null || state === void 0 ? void 0 : (_state$common = state.common) === null || _state$common === void 0 ? void 0 : (_state$common$user = _state$common.user) === null || _state$common$user === void 0 ? void 0 : _state$common$user.email;
+  });
+  var academyDomain = reactRedux.useSelector(function (state) {
+    var _state$common2, _state$common2$user;
+    return state === null || state === void 0 ? void 0 : (_state$common2 = state.common) === null || _state$common2 === void 0 ? void 0 : (_state$common2$user = _state$common2.user) === null || _state$common2$user === void 0 ? void 0 : _state$common2$user.academyDomain;
+  });
+  var _useState = React.useState(),
+    academy = _useState[0],
+    setAcademy = _useState[1];
+  var _useState2 = React.useState(),
+    isLoadingAcademy = _useState2[0],
+    setLoadingAcademy = _useState2[1];
+  var _useLogin = useLogin(history, homeAcademyUrl, homeUrl, registerUrl),
+    handleLoginAccessToken = _useLogin.handleLoginAccessToken;
+  var handleCheckPassCode = function handleCheckPassCode(form, callback) {
+    try {
+      var _temp2 = function _temp2(_result) {
+        if (_exit) return _result;
+        dispatch(setLoading(false));
+      };
+      var _exit = false;
+      dispatch(setLoading(true));
+      var _temp = _catch(function () {
+        if (role !== exports.Role.Student) {
+          _exit = true;
+          return;
+        }
+        return Promise.resolve(checkPassCodeApi(form.code, form.academyDomain)).then(function (res) {
+          var data = res.data;
+          var requestBody = {
+            accessToken: data.accessToken,
+            email: email,
+            academyId: data.academyId,
+            role: exports.Role.Student
+          };
+          return Promise.resolve(handleLoginAccessToken(requestBody, false)).then(function () {
+            localStorage.setItem(ACADEMY_DOMAIN, data.academyDomain);
+            callback === null || callback === void 0 ? void 0 : callback();
+          });
+        });
+      }, function (error) {
+        reactToastify.toast.error(getErrorMessage(t, error));
+      });
+      return Promise.resolve(_temp && _temp.then ? _temp.then(_temp2) : _temp2(_temp));
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  };
+  var getAcademyByDomain = function getAcademyByDomain() {
+    try {
+      var _temp6 = function _temp6(_result2) {
+        if (_exit2) return _result2;
+        setLoadingAcademy(false);
+      };
+      var _exit2 = false;
+      if (!domain) return Promise.resolve();
+      setLoadingAcademy(true);
+      var _temp5 = _catch(function () {
+        return Promise.resolve(getAcademyByDomainApi(domain, exports.Role.Student)).then(function (res) {
+          var _res$data;
+          var _exit3 = false;
+          function _temp4(_result3) {
+            if (_exit3) return _result3;
+            setAcademy(academy);
+          }
+          var academy = (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.data;
+          var _temp3 = function () {
+            if (academy.isOwned) {
+              return Promise.resolve(switchSuperAdminAcademy(academy.id, exports.Role.Student)).then(function (switchAcademyRes) {
+                var switchAcademyData = switchAcademyRes.data;
+                var requestBody = {
+                  accessToken: switchAcademyData.accessToken,
+                  email: email,
+                  academyId: academy.id,
+                  role: exports.Role.Student
+                };
+                localStorage.setItem(ACADEMY_DOMAIN, domain);
+                return Promise.resolve(handleLoginAccessToken(requestBody, false)).then(function () {
+                  _exit2 = true;
+                });
+              });
+            }
+          }();
+          return _temp3 && _temp3.then ? _temp3.then(_temp4) : _temp4(_temp3);
+        });
+      }, function (error) {
+        console.log("error", error);
+      });
+      return Promise.resolve(_temp5 && _temp5.then ? _temp5.then(_temp6) : _temp6(_temp5));
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  };
+  React.useEffect(function () {
+    email && !academyDomain && getAcademyByDomain();
+  }, [domain, academyDomain, email]);
+  return {
+    academy: academy,
+    isLoadingAcademy: isLoadingAcademy,
+    academyDomain: academyDomain,
+    email: email,
+    handleCheckPassCode: handleCheckPassCode
+  };
+};
+
+var PassCodeCheck = function PassCodeCheck(props) {
+  var role = props.role,
+    open = props.open,
+    domain = props.domain,
+    onClose = props.onClose;
+  var _usePassCodeCheck = usePassCodeCheck(props),
+    academy = _usePassCodeCheck.academy,
+    isLoadingAcademy = _usePassCodeCheck.isLoadingAcademy,
+    academyDomain = _usePassCodeCheck.academyDomain,
+    email = _usePassCodeCheck.email,
+    handleCheckPassCode = _usePassCodeCheck.handleCheckPassCode;
+  if (role !== exports.Role.Student || domain && isLoadingAcademy === false && !academy) return React__default.createElement(NotFound, null);
+  return React__default.createElement(React.Fragment, null, React__default.createElement(LoadingComponent, {
+    isLoading: !!isLoadingAcademy
+  }), !!email && !academyDomain && (!domain || !!academy) && React__default.createElement(PassCodeDialog, {
+    open: open,
+    academyDomain: domain,
+    onClose: onClose,
+    onSubmit: handleCheckPassCode
+  }));
+};
+
+var PAGE_TITLE$3 = "academy_list";
 var AcademyList = function AcademyList(_ref) {
   var theme = _ref.theme,
     history = _ref.history,
@@ -15706,10 +16408,19 @@ var AcademyList = function AcademyList(_ref) {
     registerUrl = _ref.registerUrl;
   var _useTranslation = reactI18next.useTranslation(),
     t = _useTranslation.t;
+  var _useState = React.useState(false),
+    isOpenPassCode = _useState[0],
+    setOpenPassCode = _useState[1];
+  var handleTogglePassCodeDialog = function handleTogglePassCodeDialog() {
+    setOpenPassCode(!isOpenPassCode);
+  };
   useAutoAcademyDomain(function () {}, history, [], "", window.location.pathname, true);
   var _useAcademyList = useAcademyList(history, role, homeAcademyUrl, homeUrl, registerUrl),
     academyList = _useAcademyList.academyList,
     handleSwitchAcademy = _useAcademyList.handleSwitchAcademy;
+  React.useEffect(function () {
+    document.title = t("study_peak") + " | " + t(PAGE_TITLE$3);
+  }, [t]);
   return React__default.createElement("div", {
     className: "py-3 px-4"
   }, React__default.createElement(Grid, {
@@ -15718,10 +16429,18 @@ var AcademyList = function AcademyList(_ref) {
   }, React__default.createElement(Grid, {
     item: true,
     xs: 12
+  }, React__default.createElement(material.Stack, {
+    direction: "row",
+    justifyContent: "space-between",
+    alignItems: "center",
+    spacing: 3
   }, React__default.createElement(Typography, {
     fontSize: 24,
     fontWeight: 600
-  }, t("academy_list"))), React__default.createElement(Grid, {
+  }, t("academy_list")), role === exports.Role.Student && React__default.createElement(material.Button, {
+    variant: "contained",
+    onClick: handleTogglePassCodeDialog
+  }, t("enter_academy_pass_code")))), React__default.createElement(Grid, {
     item: true,
     xs: 12
   }, React__default.createElement(Grid, {
@@ -15741,7 +16460,15 @@ var AcademyList = function AcademyList(_ref) {
   }), !academyList.length && React__default.createElement(Grid, {
     item: true,
     xs: 3
-  }, React__default.createElement("span", null, t("no_academy_available"), "."))))));
+  }, React__default.createElement("span", null, t("no_academy_available"), "."))))), React__default.createElement(PassCodeCheck, {
+    role: role,
+    open: isOpenPassCode,
+    onClose: handleTogglePassCodeDialog,
+    homeAcademyUrl: homeAcademyUrl,
+    homeUrl: homeUrl,
+    registerUrl: registerUrl,
+    history: history
+  }));
 };
 
 var EXAM_SESSION_URL$1 = BASE_URL + "/api/examSession";
@@ -15921,28 +16648,28 @@ var useVirtualizeList = function useVirtualizeList(totalItems, rowHeight, offset
 
 exports.moment = moment;
 Object.defineProperty(exports, 'I18nextProvider', {
-  enumerable: true,
-  get: function () {
-    return reactI18next.I18nextProvider;
-  }
+    enumerable: true,
+    get: function () {
+        return reactI18next.I18nextProvider;
+    }
 });
 Object.defineProperty(exports, 'useTranslation', {
-  enumerable: true,
-  get: function () {
-    return reactI18next.useTranslation;
-  }
+    enumerable: true,
+    get: function () {
+        return reactI18next.useTranslation;
+    }
 });
 Object.defineProperty(exports, 'ToastContainer', {
-  enumerable: true,
-  get: function () {
-    return reactToastify.ToastContainer;
-  }
+    enumerable: true,
+    get: function () {
+        return reactToastify.ToastContainer;
+    }
 });
 Object.defineProperty(exports, 'toast', {
-  enumerable: true,
-  get: function () {
-    return reactToastify.toast;
-  }
+    enumerable: true,
+    get: function () {
+        return reactToastify.toast;
+    }
 });
 exports.ACADEMY_DOMAIN = ACADEMY_DOMAIN;
 exports.ACCESS_TOKEN = ACCESS_TOKEN;
@@ -15976,11 +16703,14 @@ exports.InputText = InputText;
 exports.LANGUAGES = LANGUAGES;
 exports.LayoutContext = LayoutContext;
 exports.Loading = Loading;
+exports.LoadingComponent = LoadingComponent;
 exports.Login = Login;
 exports.LoginWithPassword = SignIn;
 exports.NotFound = NotFound;
 exports.PUSHER_CONFIG = PUSHER_CONFIG;
+exports.PassCodeCheck = PassCodeCheck;
 exports.QuestionCountSelector = QuestionCountSelector;
+exports.RecentUserAction = RecentUserAction;
 exports.SUPER_ADMIN_BASE_URL = SUPER_ADMIN_BASE_URL;
 exports.ScoreSelector = ScoreSelector;
 exports.SubjectSelector = SubjectSelector;
@@ -15993,12 +16723,15 @@ exports.Types = index$3;
 exports.api = api;
 exports.apiUpload = apiUpload;
 exports.canAccessRoute = canAccess;
+exports.checkSuperUrl = checkSuperUrl;
+exports.createRecentUserActionListApi = createRecentUserActionListApi;
 exports.diffFromNow = diffFromNow;
 exports.formatTime = formatTime;
 exports.getAcademyDomain = getAcademyDomain;
 exports.getAccessToken = getAccessToken;
 exports.getErrorMessage = getErrorMessage;
 exports.getOrdinalSuffix = getOrdinalSuffix;
+exports.getRecentUserActionListApi = getRecentUserActionListApi;
 exports.i18n = i18n;
 exports.minutesToTimeSpan = minutesToTimeSpan;
 exports.setAlert = setAlert;