touchstudy-core 0.1.55 → 0.1.56

package/dist/index.modern.js

@@ -9,7 +9,7 @@ import { useDispatch, useSelector } from 'react-redux';
 import axios from 'axios';
 import { useTranslation, initReactI18next } from 'react-i18next';
 export { I18nextProvider, useTranslation } from 'react-i18next';
-import { Paper, Card, Stack, Grid, Dialog, DialogTitle, IconButton, DialogContent, TextField, DialogActions, Button, Box, Typography, Pagination, styled, Tooltip, tooltipClasses, ClickAwayListener, useTheme, useMediaQuery, CircularProgress, FormControl, RadioGroup, FormControlLabel, Radio, FormGroup, FormLabel, Checkbox, InputLabel, Container, Table, TableBody, TableRow, TableCell, TableHead, InputBase } from '@mui/material';
+import { Paper, Card, Stack, Grid, Dialog, DialogTitle, IconButton, DialogContent, TextField, DialogActions, Button, Box, Typography, Pagination, styled, useTheme, useMediaQuery, Tooltip, tooltipClasses, ClickAwayListener, CircularProgress, FormControl, RadioGroup, FormControlLabel, Radio, FormGroup, FormLabel, Checkbox, InputLabel, Container, Table, TableBody, TableRow, TableCell, TableHead, InputBase } from '@mui/material';
 import 'moment/locale/ko.js';
 import 'moment/locale/en-au.js';
 import { gapi } from 'gapi-script';
@@ -23,10 +23,10 @@ import IconButton$1 from '@mui/material/IconButton';
 import { GoArrowSwitch } from 'react-icons/go';
 import { toast } from 'react-toastify';
 export { ToastContainer, toast } from 'react-toastify';
+import { IoIosLogOut, IoMdArrowBack } from 'react-icons/io';
 import Select, { components } from 'react-select';
 import { FaCaretDown, FaTrash, FaPlus, FaSave, FaPencilAlt, FaPlusCircle, FaTimes, FaSortUp, FaSortDown, FaEye } from 'react-icons/fa';
 import { PiDotsNineLight } from 'react-icons/pi';
-import { IoMdArrowBack, IoIosLogOut } from 'react-icons/io';
 import _ from 'lodash';
 import { FaPencil } from 'react-icons/fa6';
 import CreatableSelect from 'react-select/creatable';
@@ -69,7 +69,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";
@@ -88,6 +91,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;
@@ -393,15 +403,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);
@@ -411,11 +421,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";
     }
@@ -490,7 +506,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 = useDispatch();
   var _useTranslation = useTranslation(),
@@ -571,14 +595,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));
@@ -591,7 +613,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,
@@ -2300,6 +2325,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,
@@ -2811,7 +2838,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";
@@ -3357,6 +3386,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,
@@ -3895,7 +3926,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(initReactI18next).init({
@@ -4119,7 +4152,10 @@ var TheAcademyDropdown = function TheAcademyDropdown(_ref) {
     history = _ref.history,
     homeAcademyUrl = _ref.homeAcademyUrl,
     homeUrl = _ref.homeUrl,
+    onSignOut = _ref.onSignOut,
     hideAcademyName = _ref.hideAcademyName;
+  var theme = useTheme();
+  var isLargerThanLg = useMediaQuery(theme.breakpoints.up("lg"));
   var _useSwitchAcademy = useSwitchAcademy(role, history, homeAcademyUrl, homeUrl),
     academyList = _useSwitchAcademy.academyList,
     handleSwitchAcademy = _useSwitchAcademy.handleSwitchAcademy,
@@ -4160,18 +4196,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(Typography, {
-    className: "text-start d-none d-lg-block",
+  }) : React__default.createElement("span", null, firstLetter)), !hideAcademyName && isLargerThanLg && React__default.createElement(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 === 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(GoArrowSwitch, {
-    size: 14
+    size: 14,
+    color: styles.gray_900
   }))), (isSuperAdmin || !isAdmin) && React__default.createElement(Popover, {
     open: !!open,
     anchorEl: open,
@@ -4220,7 +4257,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(Stack, {
+    display: "flex",
+    gap: "8px",
+    width: "100%",
+    flexDirection: "row",
+    justifyContent: "center",
+    alignItems: "center",
+    className: "" + styles["userImg"],
+    onClick: onSignOut
+  }, React__default.createElement(IoIosLogOut, {
+    size: 24,
+    color: "#000"
+  }), React__default.createElement(Typography, {
+    sx: {
+      typography: "body2",
+      p: "8px",
+      borderRadius: "4px",
+      fontSize: 14,
+      fontWeight: 700
+    }
+  }, t("logout"))))));
 };
 
 var minutesToTimeSpan = (function (time) {
@@ -14325,22 +14382,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(Link, {
-    "aria-current": "page",
-    to: homeRoute.path,
-    className: "border-none"
+  return React__default.createElement(Stack, {
+    width: "100%",
+    display: "flex",
+    flexDirection: "row",
+    gap: "24px",
+    className: styles["tabBox"] + " " + styles["headers"]
   }, React__default.createElement(Stack, {
+    padding: "10px 0",
+    display: "flex",
     justifyContent: "center",
-    height: "100%",
-    className: styles["logo"] + " d-none d-lg-flex"
-  }, logo), React__default.createElement(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(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,
@@ -14353,7 +14419,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(Stack, {
       sx: {
         justifyContent: "center",
@@ -14362,43 +14428,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("span", {
-      className: "text-nowrap"
-    }, isLargerThanXL || headerTabs.length < 4 ? t(label) : ellipsisText(t(label), 4))));
+    }, icon, React__default.createElement(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'
+      }
+    }, t(label))));
   })), React__default.createElement(Stack, {
     direction: "row",
     alignItems: "center"
-  }, React__default.createElement(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(IoIosLogOut, {
-    size: 24,
-    color: "#959595"
-  }))));
+  }, React__default.createElement(Link, {
+    "aria-current": "page",
+    to: homeRoute.path,
+    className: "border-none"
+  }, React__default.createElement(Stack, {
+    justifyContent: "center",
+    height: "100%",
+    className: styles["logo"] + " d-none d-lg-flex"
+  }, logo), React__default.createElement(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";
@@ -14551,5 +14613,5 @@ var AcademyList = function AcademyList(_ref) {
   }, React__default.createElement("span", null, t("no_academy_available"), "."))))));
 };
 
-export { ACADEMY_DOMAIN, ACCESS_TOKEN, AcademyHeaders, AcademyList, AnswerCountSelector, ArticleCategorySelector, ArticleGroupView, BASE_URL, ChatContainer, ChatItemType, types as ChatTypes, CommonDialog, ConfirmDialog, index$1 as CoreHooks, CustomAsyncSelect, CustomCreatable, CustomPagination, CustomSelect, CustomSelectOption, DATE_MIN_VALUE, DATE_TIME_MIN_VALUE, DEFAULT_PAGING_RESPONSE, EXAM_CHANNEL, EXAM_STUDENT_CHANNEL, index as Enums, ExamDetailView, ExamEvent, ExamResultV2, Header, InputText, LANGUAGES, LayoutContext, Loading, Login, SignIn as LoginWithPassword, NotFound, PUSHER_CONFIG, QuestionCountSelector, Role, SUPER_ADMIN_BASE_URL, ScoreSelector, SubjectSelector, index$2 as Textbook, TextbookViewDetail as TextbookDetail, TextbookList, TheAcademyDropdown, TheLanguageDropdown, index$3 as Types, api, apiUpload, canAccess as canAccessRoute, diffFromNow, formatTime, getAcademyDomain, getAccessToken$1 as getAccessToken, i18n, minutesToTimeSpan, setAlert, setLanguage, setLoading, setReFetchUserAcademies, setReadyRegisterPusher, setUser, store, times as timeUtils, toISOString, useAutoAcademyDomain, useCategorySelect, useChatContainer, useGoogleSignOut, useLanguage, useLogin, usePusherConversation, useSubjectSelect, useSwitchAcademy, utcToLocalTime };
+export { ACADEMY_DOMAIN, ACCESS_TOKEN, AcademyHeaders, AcademyList, AnswerCountSelector, ArticleCategorySelector, ArticleGroupView, BASE_URL, ChatContainer, ChatItemType, types as ChatTypes, CommonDialog, ConfirmDialog, index$1 as CoreHooks, CustomAsyncSelect, CustomCreatable, CustomPagination, CustomSelect, CustomSelectOption, DATE_MIN_VALUE, DATE_TIME_MIN_VALUE, DEFAULT_PAGING_RESPONSE, DefaultErrorMessage, EXAM_CHANNEL, EXAM_STUDENT_CHANNEL, index as Enums, ExamDetailView, ExamEvent, ExamResultV2, Header, InputText, LANGUAGES, LayoutContext, Loading, Login, SignIn as LoginWithPassword, NotFound, PUSHER_CONFIG, QuestionCountSelector, Role, SUPER_ADMIN_BASE_URL, ScoreSelector, SubjectSelector, index$2 as Textbook, TextbookViewDetail as TextbookDetail, TextbookList, TheAcademyDropdown, TheLanguageDropdown, index$3 as Types, api, apiUpload, canAccess as canAccessRoute, diffFromNow, formatTime, getAcademyDomain, getAccessToken$1 as getAccessToken, getErrorMessage, i18n, minutesToTimeSpan, setAlert, setLanguage, setLoading, setReFetchUserAcademies, setReadyRegisterPusher, setUser, store, times as timeUtils, toISOString, useAutoAcademyDomain, useCategorySelect, useChatContainer, useGoogleSignOut, useLanguage, useLogin, usePusherConversation, useSubjectSelect, useSwitchAcademy, utcToLocalTime };
 //# sourceMappingURL=index.modern.js.map