touchstudy-core 0.1.54 → 0.1.56

package/dist/index.css

@@ -174,32 +174,36 @@
     height: 100%;
     border-radius: 50%;
     -o-object-fit: cover;
-       object-fit: cover; }
+       object-fit: cover;
+    border: 1px solid #DFE3E8; }
   @media (min-width: 992px) {
     ._2ibYC {
       margin-right: 12px; } }
 
 ._1JMRU {
+  border-radius: 0 !important;
+  border: 0;
   max-width: 268px;
-  border: 1px solid #ebebff !important;
-  border-radius: 50% !important;
-  padding: 0px !important;
   min-width: unset !important;
+  margin: 0 !important;
+  padding: 8px !important;
   display: flex !important;
-  justify-content: space-between !important; }
-  @media (min-width: 992px) {
-    ._1JMRU {
-      border-radius: 6px !important;
-      padding: 8px !important; } }
+  justify-content: space-between !important;
+  gap: 12px; }
+
+._1JMRU:hover {
+  background: none !important; }
 
 ._N4FNf {
   width: 34px;
   height: 34px;
   display: flex;
+  border-radius: 100%;
+  background-color: #FBFBF9;
   justify-content: center;
   align-items: center; }
   ._N4FNf svg {
-    fill: #18442A; }
+    fill: #349056; }
 
 ._31Dr0 {
   width: 100%;
@@ -416,7 +420,7 @@
   ._3xnI5._1CQPn {
     display: flex;
     justify-content: space-between;
-    padding: 0 27px 0 27px;
+    padding: 0 27px;
     border-bottom: 1px solid var(--gray-300); }
   ._3xnI5 ._3hx2T {
     text-align: start; }
@@ -427,18 +431,18 @@
     border-radius: 0; }
   ._3xnI5 a._1AqMh,
   ._3xnI5 a._1TGKA {
-    color: #3DC674; }
+    color: #349056; }
   ._3xnI5 ._3UyhW {
     font-size: 14px;
     font-weight: 700;
     height: 100%;
-    padding: 7px 12px;
+    padding: 8px 0px;
     display: inline-table;
     text-align: center;
     line-height: 4.5;
     color: #aeabac;
     display: flex;
-    align-items: center; }
+    align-items: end; }
   ._3xnI5 ._2RI6G {
     width: unset;
     height: unset;
@@ -470,9 +474,7 @@
     display: flex;
     flex-wrap: nowrap; }
     ._3xnI5 ._3hx2T ._3UyhW div span {
-      display: inline-block; }
-  ._3xnI5 ._3UyhW {
-    padding: 7px 16px; } }
+      display: inline-block; } }
 
 ._2oGcJ {
   width: 48px;
@@ -823,7 +825,8 @@
     height: 100%;
     border-radius: 50%;
     -o-object-fit: cover;
-       object-fit: cover; }
+       object-fit: cover;
+    border: 1px solid #DFE3E8; }
 
 ._1dveO ._mxRxf:nth-child(1) {
   font-family: "Pretendard";

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { setLoading, setAlert, setUser, setLanguage, setReFetchUserAcademies, setReadyRegisterPusher } from "./redux/commons/action";
-import { BASE_URL, SUPER_ADMIN_BASE_URL, ACCESS_TOKEN, PUSHER_CONFIG, EXAM_CHANNEL, EXAM_STUDENT_CHANNEL, DATE_MIN_VALUE, DATE_TIME_MIN_VALUE, ACADEMY_DOMAIN, getAcademyDomain, AcademyHeaders, Role } from "./utils/constants";
+import { BASE_URL, SUPER_ADMIN_BASE_URL, ACCESS_TOKEN, PUSHER_CONFIG, EXAM_CHANNEL, EXAM_STUDENT_CHANNEL, DATE_MIN_VALUE, DATE_TIME_MIN_VALUE, ACADEMY_DOMAIN, getAcademyDomain, AcademyHeaders, Role, DefaultErrorMessage } from "./utils/constants";
 import utcToLocalTime from "./utils/utcToLocalTime";
 import Login from "./containers/Login/views/Login";
 import store from "./store";
@@ -64,4 +64,5 @@ import LoginWithPassword from './containers/Login/views/LoginWithPassword';
 import Header from "./layouts/Header";
 import { DEFAULT_PAGING_RESPONSE, PagingResponse } from "./utils/types/pagingResponse";
 import AcademyList from "./containers/Academies/views/AcademyList";
-export { diffFromNow, formatTime, utcToLocalTime, setLoading, setReadyRegisterPusher, BASE_URL, SUPER_ADMIN_BASE_URL, ACCESS_TOKEN, Login, store, setAlert, setUser, Loading, NotFound, LayoutContext, api, apiUpload, ConfirmDialog, CommonDialog, CustomPagination, useGoogleSignOut, PUSHER_CONFIG, ExamEvent, EXAM_CHANNEL, EXAM_STUDENT_CHANNEL, setLanguage, i18n, TheLanguageDropdown, TheAcademyDropdown, useTranslation, I18nextProvider, DATE_MIN_VALUE, DATE_TIME_MIN_VALUE, ACADEMY_DOMAIN, minutesToTimeSpan, toISOString, canAccessRoute, CustomSelect, CustomAsyncSelect, CustomSelectOption, LoginWithPassword, getAccessToken, ChatContainer, IChatContainerProps, IChatItemProps, IChatHeaderProps, IInputChatProps, ChatItemType, useChatContainer, ConversationResponse, usePusherConversation, ExamResultV2, ToastContainer, toast, Role, useLanguage, useSwitchAcademy, LANGUAGES, CustomCreatable, moment, ExamDetailView, ExamDetailViewProps, Exam, Question, ArticleGroup, getAcademyDomain, useSubjectSelect, useLogin, useAutoAcademyDomain, LoginAccessTokenRequest, LoginRequest, setReFetchUserAcademies, ChatTypes, AcademyHeaders, Types, Enums, CoreHooks, ArticleGroupView, AnswerCountSelector, QuestionCountSelector, ScoreSelector, ArticleCategorySelector, SubjectSelector, useCategorySelect, InputText, Textbook, TextbookDetail, TextbookList, timeUtils, Header, DEFAULT_PAGING_RESPONSE, PagingResponse, AcademyList };
+import { getErrorMessage } from "./utils/getErrorMessage";
+export { diffFromNow, formatTime, utcToLocalTime, setLoading, setReadyRegisterPusher, BASE_URL, SUPER_ADMIN_BASE_URL, ACCESS_TOKEN, Login, store, setAlert, setUser, Loading, NotFound, LayoutContext, api, apiUpload, ConfirmDialog, CommonDialog, CustomPagination, useGoogleSignOut, PUSHER_CONFIG, ExamEvent, EXAM_CHANNEL, EXAM_STUDENT_CHANNEL, setLanguage, i18n, TheLanguageDropdown, TheAcademyDropdown, useTranslation, I18nextProvider, DATE_MIN_VALUE, DATE_TIME_MIN_VALUE, ACADEMY_DOMAIN, minutesToTimeSpan, toISOString, canAccessRoute, CustomSelect, CustomAsyncSelect, CustomSelectOption, LoginWithPassword, getAccessToken, ChatContainer, IChatContainerProps, IChatItemProps, IChatHeaderProps, IInputChatProps, ChatItemType, useChatContainer, ConversationResponse, usePusherConversation, ExamResultV2, ToastContainer, toast, Role, useLanguage, useSwitchAcademy, LANGUAGES, CustomCreatable, moment, ExamDetailView, ExamDetailViewProps, Exam, Question, ArticleGroup, getAcademyDomain, useSubjectSelect, useLogin, useAutoAcademyDomain, LoginAccessTokenRequest, LoginRequest, setReFetchUserAcademies, ChatTypes, AcademyHeaders, Types, Enums, CoreHooks, ArticleGroupView, AnswerCountSelector, QuestionCountSelector, ScoreSelector, ArticleCategorySelector, SubjectSelector, useCategorySelect, InputText, Textbook, TextbookDetail, TextbookList, timeUtils, Header, DEFAULT_PAGING_RESPONSE, PagingResponse, AcademyList, getErrorMessage, DefaultErrorMessage };

package/dist/index.js

@@ -24,11 +24,11 @@ var MenuItem = _interopDefault(require('@mui/material/MenuItem'));
 var IconButton = _interopDefault(require('@mui/material/IconButton'));
 var go = require('react-icons/go');
 var reactToastify = require('react-toastify');
+var io = require('react-icons/io');
 var Select = require('react-select');
 var Select__default = _interopDefault(Select);
 var fa = require('react-icons/fa');
 var pi = require('react-icons/pi');
-var io = require('react-icons/io');
 var _ = _interopDefault(require('lodash'));
 var fa6 = require('react-icons/fa6');
 var CreatableSelect = _interopDefault(require('react-select/creatable'));
@@ -71,7 +71,10 @@ var PUSHER_CONFIG = {
 };
 var ACCESS_TOKEN = "ACCESS_TOKEN";
 var ACADEMY_DOMAIN = "ACADEMY_DOMAIN";
+var REDIRECT_URL = "REDIRECT_URL";
 var AcademyHeaders = "Academy-Headers";
+var LanguageHeaders = "Accept-Language";
+var DefaultErrorMessage = "an_unexpected_error_has_occurred";
 var DATE_MIN_VALUE = "0001-01-01T00:00:00+00:00";
 var DATE_TIME_MIN_VALUE = "0001-01-01T00:00:00";
 var EXAM_CHANNEL = "presence-exam-channel";
@@ -90,6 +93,13 @@ var getAcademyDomain = function getAcademyDomain() {
     return null;
   }
 };
+var getRedirectUrl = function getRedirectUrl() {
+  try {
+    return localStorage.getItem(REDIRECT_URL);
+  } catch (err) {
+    return undefined;
+  }
+};
 var encodeParams = function encodeParams(params) {
   return Object.keys(params).filter(function (key) {
     return params[key] || params[key] === 0 || params[key] === false;
@@ -394,15 +404,15 @@ var apiUpload = axios.create({
     var token = getAccessToken();
     var searchParams = new URLSearchParams(window.location.search);
     var paramDomain = searchParams.get('domain');
+    var paramLang = searchParams.get('lang');
     var academyDomainStorage = getAcademyDomain();
     var academyDomain = paramDomain || academyDomainStorage;
     if (token) {
       config.headers.Authorization = "Bearer " + token;
-      localStorage.setItem("LAST_TIME_REQUETST", moment().utc().format("YYYY-MM-DD HH:mm:ss"));
-    }
-    if (academyDomain && !config.headers[AcademyHeaders]) {
-      config.headers[AcademyHeaders] = "" + academyDomain;
+      localStorage.setItem("LAST_TIME_REQUEST", moment().utc().format("YYYY-MM-DD HH:mm:ss"));
     }
+    if (academyDomain && !config.headers[AcademyHeaders]) config.headers[AcademyHeaders] = "" + academyDomain;
+    if (paramLang) config.headers[LanguageHeaders] = "" + paramLang;
     return config;
   }, function (error) {
     return Promise.reject(error);
@@ -412,11 +422,17 @@ var apiUpload = axios.create({
   return i.interceptors.response.use(function (response) {
     return response;
   }, function (error) {
-    var _error$response, _error$response2;
+    var _error$response, _error$response2, _error$response3;
     console.log({
       error: error
     });
-    if (((_error$response = error.response) === null || _error$response === void 0 ? void 0 : _error$response.status) === 401 || ((_error$response2 = error.response) === null || _error$response2 === void 0 ? void 0 : _error$response2.status) == 403) {
+    if (((_error$response = error.response) === null || _error$response === void 0 ? void 0 : _error$response.status) === 401) {
+      var _window$location = window.location,
+        pathname = _window$location.pathname,
+        search = _window$location.search;
+      if (!pathname.startsWith("/login")) localStorage.setItem(REDIRECT_URL, "" + pathname + search);
+    }
+    if (((_error$response2 = error.response) === null || _error$response2 === void 0 ? void 0 : _error$response2.status) === 401 || ((_error$response3 = error.response) === null || _error$response3 === void 0 ? void 0 : _error$response3.status) == 403) {
       localStorage.removeItem(ACCESS_TOKEN);
       window.location.href = "/login";
     }
@@ -491,7 +507,15 @@ var pushTo = function pushTo(history, data) {
   if (history.push) history.push(data);else history(data);
 };
 
-var ERROR_MESSAGE = "request_login_fail";
+var getErrorMessage = function getErrorMessage(t, error, defaultErrorMessage) {
+  var _error$response, _error$response$data, _error$response2, _error$response2$data;
+  var errorMessage = error === null || error === void 0 ? void 0 : (_error$response = error.response) === null || _error$response === void 0 ? void 0 : (_error$response$data = _error$response.data) === null || _error$response$data === void 0 ? void 0 : _error$response$data.title;
+  if (typeof errorMessage === "string") return errorMessage;
+  errorMessage = (error === null || error === void 0 ? void 0 : error.message) || (error === null || error === void 0 ? void 0 : (_error$response2 = error.response) === null || _error$response2 === void 0 ? void 0 : (_error$response2$data = _error$response2.data) === null || _error$response2$data === void 0 ? void 0 : _error$response2$data.message);
+  if (typeof errorMessage === "string") return errorMessage;
+  return defaultErrorMessage || t(DefaultErrorMessage);
+};
+
 var useLogin = function useLogin(history, homeAcademyUrl, homeUrl, registerUrl) {
   var dispatch = reactRedux.useDispatch();
   var _useTranslation = reactI18next.useTranslation(),
@@ -572,14 +596,12 @@ var useLogin = function useLogin(history, homeAcademyUrl, homeUrl, registerUrl)
             user = loginResponse.user;
           var isAcademy = !!(user !== null && user !== void 0 && user.academyDomain);
           var needToRegister = isStudent && isFirstLogin && isAcademy;
-          var redirectUrl = needToRegister ? registerUrl : isAcademy ? homeAcademyUrl : homeUrl;
+          var redirectUrl = getRedirectUrl();
+          if (!redirectUrl) redirectUrl = needToRegister ? registerUrl : isAcademy ? homeAcademyUrl : homeUrl;
           redirectLoginUser(user, token, redirectUrl);
         });
       }, function (error) {
-        var _error$response, _error$response$data, _error$response2, _error$response2$data, _error$response3;
-        var message = undefined;
-        message = t((error === null || error === void 0 ? void 0 : (_error$response = error.response) === null || _error$response === void 0 ? void 0 : (_error$response$data = _error$response.data) === null || _error$response$data === void 0 ? void 0 : _error$response$data.message) || (error === null || error === void 0 ? void 0 : (_error$response2 = error.response) === null || _error$response2 === void 0 ? void 0 : (_error$response2$data = _error$response2.data) === null || _error$response2$data === void 0 ? void 0 : _error$response2$data.title) || (error === null || error === void 0 ? void 0 : (_error$response3 = error.response) === null || _error$response3 === void 0 ? void 0 : _error$response3.data) || ERROR_MESSAGE);
-        message && alert(message);
+        alert(getErrorMessage(t, error));
         isLogout && handleSignOut();
       });
       return Promise.resolve(_temp3 && _temp3.then ? _temp3.then(_temp4) : _temp4(_temp3));
@@ -592,7 +614,10 @@ var useLogin = function useLogin(history, homeAcademyUrl, homeUrl, registerUrl)
     !data.academyDomain && localStorage.removeItem(ACADEMY_DOMAIN);
     !!data.academyDomain && localStorage.setItem(ACADEMY_DOMAIN, data.academyDomain);
     dispatch(setUser(_extends({}, data)));
-    if (redirectUrl) pushTo(history, redirectUrl);
+    if (redirectUrl) {
+      pushTo(history, redirectUrl);
+      localStorage.removeItem(REDIRECT_URL);
+    }
   };
   return {
     handleLoginGoogle: handleLoginGoogle,
@@ -2299,6 +2324,8 @@ var articles = "조항";
 var add_lesson = "레슨 추가";
 var date = "날짜";
 var the_code_has_been_copied_to_your_clipboard = "코드가 클립보드에 복사되었습니다.";
+var an_unexpected_error_has_occurred = "예상치 못한 오류가 발생했습니다";
+var select_roles = "역할 선택";
 var lang_ko = {
 	problem_solving: problem_solving,
 	my_story: my_story,
@@ -2810,7 +2837,9 @@ var lang_ko = {
 	articles: articles,
 	add_lesson: add_lesson,
 	date: date,
-	the_code_has_been_copied_to_your_clipboard: the_code_has_been_copied_to_your_clipboard
+	the_code_has_been_copied_to_your_clipboard: the_code_has_been_copied_to_your_clipboard,
+	an_unexpected_error_has_occurred: an_unexpected_error_has_occurred,
+	select_roles: select_roles
 };
 
 var problem_solving$1 = "Problem Solving";
@@ -3356,6 +3385,8 @@ var total_uses$1 = "Total Uses";
 var articles$1 = "Articles";
 var add_lesson$1 = "Add Lesson";
 var the_code_has_been_copied_to_your_clipboard$1 = "The code has been copied to your clipboard";
+var an_unexpected_error_has_occurred$1 = "An unexpected error has occurred";
+var select_roles$1 = "Select roles";
 var lang_en = {
 	problem_solving: problem_solving$1,
 	my_story: my_story$1,
@@ -3894,7 +3925,9 @@ var lang_en = {
 	total_uses: total_uses$1,
 	articles: articles$1,
 	add_lesson: add_lesson$1,
-	the_code_has_been_copied_to_your_clipboard: the_code_has_been_copied_to_your_clipboard$1
+	the_code_has_been_copied_to_your_clipboard: the_code_has_been_copied_to_your_clipboard$1,
+	an_unexpected_error_has_occurred: an_unexpected_error_has_occurred$1,
+	select_roles: select_roles$1
 };
 
 i18n.use(reactI18next.initReactI18next).init({
@@ -4118,7 +4151,10 @@ var TheAcademyDropdown = function TheAcademyDropdown(_ref) {
     history = _ref.history,
     homeAcademyUrl = _ref.homeAcademyUrl,
     homeUrl = _ref.homeUrl,
+    onSignOut = _ref.onSignOut,
     hideAcademyName = _ref.hideAcademyName;
+  var theme = material.useTheme();
+  var isLargerThanLg = material.useMediaQuery(theme.breakpoints.up("lg"));
   var _useSwitchAcademy = useSwitchAcademy(role, history, homeAcademyUrl, homeUrl),
     academyList = _useSwitchAcademy.academyList,
     handleSwitchAcademy = _useSwitchAcademy.handleSwitchAcademy,
@@ -4159,18 +4195,19 @@ var TheAcademyDropdown = function TheAcademyDropdown(_ref) {
   }, selectedAcademy !== null && selectedAcademy !== void 0 && selectedAcademy.image ? React__default.createElement("img", {
     src: selectedAcademy === null || selectedAcademy === void 0 ? void 0 : selectedAcademy.image,
     alt: selectedAcademy === null || selectedAcademy === void 0 ? void 0 : selectedAcademy.name
-  }) : React__default.createElement("span", null, firstLetter)), !hideAcademyName && React__default.createElement(material.Typography, {
-    className: "text-start d-none d-lg-block",
+  }) : React__default.createElement("span", null, firstLetter)), !hideAcademyName && isLargerThanLg && React__default.createElement(material.Typography, {
+    className: "text-start",
     sx: {
       fontSize: 14,
       fontWeight: 600,
-      color: styles.dark,
+      color: styles.gray_900,
       minWidth: 150
     }
   }, (selectedAcademy === null || selectedAcademy === void 0 ? void 0 : selectedAcademy.name) || t(role === exports.Role.Admin ? "switch_academy_admin" : "switch_academy")), React__default.createElement("div", {
-    className: styles["switch-icon"] + " d-none d-lg-flex"
+    className: "" + styles["switch-icon"]
   }, React__default.createElement(go.GoArrowSwitch, {
-    size: 14
+    size: 14,
+    color: styles.gray_900
   }))), (isSuperAdmin || !isAdmin) && React__default.createElement(Popover, {
     open: !!open,
     anchorEl: open,
@@ -4219,7 +4256,27 @@ var TheAcademyDropdown = function TheAcademyDropdown(_ref) {
       alt: option.name,
       src: option.image
     }) : React__default.createElement("span", null, (_option$name$charAt = option.name.charAt(0)) === null || _option$name$charAt === void 0 ? void 0 : _option$name$charAt.toUpperCase())), option.name);
-  })));
+  }), React__default.createElement(MenuItemCustom, null, React__default.createElement(material.Stack, {
+    display: "flex",
+    gap: "8px",
+    width: "100%",
+    flexDirection: "row",
+    justifyContent: "center",
+    alignItems: "center",
+    className: "" + styles["userImg"],
+    onClick: onSignOut
+  }, React__default.createElement(io.IoIosLogOut, {
+    size: 24,
+    color: "#000"
+  }), React__default.createElement(material.Typography, {
+    sx: {
+      typography: "body2",
+      p: "8px",
+      borderRadius: "4px",
+      fontSize: 14,
+      fontWeight: 700
+    }
+  }, t("logout"))))));
 };
 
 var minutesToTimeSpan = (function (time) {
@@ -8205,13 +8262,10 @@ var CustomSelectOption = function CustomSelectOption(_ref) {
   var initialValues = defaultValue !== null && typeof defaultValue !== "undefined" ? options.find(function (option) {
     return option.value === defaultValue;
   }) || null : null;
-  var optionValue = value !== null && typeof value !== "undefined" ? options.find(function (option) {
-    return option.value === value;
-  }) || null : null;
   return React__default.createElement(Select__default, Object.assign({
     isDisabled: isDisabled,
     options: options,
-    value: optionValue,
+    value: value,
     defaultValue: initialValues,
     menuPlacement: scrollBottom ? "top" : "auto",
     isMulti: isMulti,
@@ -14326,22 +14380,31 @@ var Header = function Header(_ref) {
     }
   }, [isTeacher, language]);
   var pathname = location.pathname.toLowerCase();
-  return React__default.createElement("div", {
-    className: "col-sm-12 col-xl-12 " + styles["tabBox"] + " " + styles["headers"]
-  }, React__default.createElement(reactRouterDom.Link, {
-    "aria-current": "page",
-    to: homeRoute.path,
-    className: "border-none"
+  return React__default.createElement(material.Stack, {
+    width: "100%",
+    display: "flex",
+    flexDirection: "row",
+    gap: "24px",
+    className: styles["tabBox"] + " " + styles["headers"]
   }, React__default.createElement(material.Stack, {
+    padding: "10px 0",
+    display: "flex",
     justifyContent: "center",
-    height: "100%",
-    className: styles["logo"] + " d-none d-lg-flex"
-  }, logo), React__default.createElement(material.Stack, {
-    justifyContent: "center",
-    height: "100%",
-    className: styles["logo"] + " d-flex d-lg-none"
-  }, React__default.createElement(singleLogo, null))), React__default.createElement("div", {
-    className: styles["routerBox"] + " d-flex flex-grow-1 flex-nowrap px-3"
+    alignItems: "center"
+  }, React__default.createElement(TheAcademyDropdown, {
+    homeAcademyUrl: academyListRoute.path,
+    homeUrl: homeRoute.path,
+    role: role,
+    history: history,
+    hideAcademyName: !isLargerThanXL && headerTabs.length > 6,
+    onSignOut: onSignOut
+  })), React__default.createElement(material.Stack, {
+    display: "flex",
+    flexGrow: 1,
+    flexWrap: "nowrap",
+    flexDirection: "row",
+    gap: '12px',
+    className: "" + styles["routerBox"]
   }, headerTabs.map(function (_ref2) {
     var path = _ref2.path,
       icon = _ref2.icon,
@@ -14354,7 +14417,7 @@ var Header = function Header(_ref) {
       to: !academyDomain && !isMain ? "#" : 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["router-link-exact-active"] : "") + " " + styles["tabText"] + " " + (!academyDomain && !isMain ? styles["disabled-link"] : "")
+      }) : pathname.startsWith(path)) ? "" + styles["router-link-active"] : "") + " " + styles["tabText"] + " " + (!academyDomain && !isMain ? styles["disabled-link"] : "")
     }, React__default.createElement(material.Stack, {
       sx: {
         justifyContent: "center",
@@ -14363,43 +14426,39 @@ var Header = function Header(_ref) {
         textOverflow: "ellipsis",
         overflow: "hidden",
         display: "flex",
-        flexWrap: "nowrap"
+        flexWrap: "nowrap",
+        padding: activePaths !== null && activePaths !== void 0 && activePaths.some(function (a) {
+          return pathname.startsWith(a);
+        }) || pathname.startsWith(path) ? "6px 12px" : "6px 24px"
+      }
+    }, icon, React__default.createElement(material.Typography, {
+      sx: {
+        textWrap: "nowrap",
+        fontWeight: 700,
+        fontSize: "14px",
+        display: activePaths !== null && activePaths !== void 0 && activePaths.some(function (a) {
+          return pathname.startsWith(a);
+        }) || pathname.startsWith(path) ? 'block' : 'none'
       }
-    }, icon, React__default.createElement("span", {
-      className: "text-nowrap"
-    }, isLargerThanXL || headerTabs.length < 4 ? t(label) : ellipsisText(t(label), 4))));
+    }, t(label))));
   })), React__default.createElement(material.Stack, {
     direction: "row",
     alignItems: "center"
-  }, React__default.createElement(material.Typography, {
-    color: styles.dark,
-    className: "fw-bold me-2 text-nowrap",
-    sx: {
-      minWidth: "60px",
-      maxWidth: "120px",
-      overflow: "hidden",
-      textOverflow: "ellipsis"
-    }
-  }, user === null || user === void 0 ? void 0 : user.fullName), React__default.createElement("div", null, React__default.createElement(TheAcademyDropdown, {
-    homeAcademyUrl: academyListRoute.path,
-    homeUrl: homeRoute.path,
-    role: role,
-    history: history,
-    hideAcademyName: !isLargerThanXL && headerTabs.length > 6
-  })), React__default.createElement("div", {
-    className: "me-2"
-  }, React__default.createElement(TheLanguageDropdown, null)), React__default.createElement("div", {
-    className: styles["userImg"] + " d-none d-md-none d-lg-block",
-    onClick: onSignOut
-  }, React__default.createElement("p", {
-    className: "text-nowrap mb-0"
-  }, t("logout"))), React__default.createElement("div", {
-    className: styles["userImg"] + " d-block d-md-block d-lg-none",
-    onClick: onSignOut
-  }, React__default.createElement(io.IoIosLogOut, {
-    size: 24,
-    color: "#959595"
-  }))));
+  }, React__default.createElement(reactRouterDom.Link, {
+    "aria-current": "page",
+    to: homeRoute.path,
+    className: "border-none"
+  }, React__default.createElement(material.Stack, {
+    justifyContent: "center",
+    height: "100%",
+    className: styles["logo"] + " d-none d-lg-flex"
+  }, logo), React__default.createElement(material.Stack, {
+    justifyContent: "center",
+    height: "100%",
+    className: styles["logo"] + " d-flex d-lg-none"
+  }, React__default.createElement(singleLogo, null))), React__default.createElement("div", {
+    className: "me-2 d-none"
+  }, React__default.createElement(TheLanguageDropdown, null))));
 };
 
 var ACADEMY_URL$1 = BASE_URL + "/api/academy";
@@ -14598,6 +14657,7 @@ exports.CustomSelectOption = CustomSelectOption;
 exports.DATE_MIN_VALUE = DATE_MIN_VALUE;
 exports.DATE_TIME_MIN_VALUE = DATE_TIME_MIN_VALUE;
 exports.DEFAULT_PAGING_RESPONSE = DEFAULT_PAGING_RESPONSE;
+exports.DefaultErrorMessage = DefaultErrorMessage;
 exports.EXAM_CHANNEL = EXAM_CHANNEL;
 exports.EXAM_STUDENT_CHANNEL = EXAM_STUDENT_CHANNEL;
 exports.Enums = index;
@@ -14629,6 +14689,7 @@ exports.diffFromNow = diffFromNow;
 exports.formatTime = formatTime;
 exports.getAcademyDomain = getAcademyDomain;
 exports.getAccessToken = getAccessToken$1;
+exports.getErrorMessage = getErrorMessage;
 exports.i18n = i18n;
 exports.minutesToTimeSpan = minutesToTimeSpan;
 exports.setAlert = setAlert;