touchstudy-core 0.1.57 → 0.1.59

package/dist/index.css

@@ -157,33 +157,33 @@
   justify-content: space-between !important; }
 
 ._2ibYC {
-  width: 40px;
-  height: 40px;
-  min-width: 40px;
-  border-radius: 50%;
-  display: flex;
-  justify-content: center;
-  align-items: center;
   font-size: 20px;
   font-weight: 600;
   line-height: 1;
-  color: #fff;
-  background: #349056; }
-  ._3RDWF {
-    margin-right: 12px; }
+  color: #fff; }
   ._2ibYC img {
-    width: 100%;
-    height: 100%;
+    width: 40px;
+    min-width: 40px;
+    max-width: 40px;
+    aspect-ratio: 1;
     border-radius: 50%;
     -o-object-fit: cover;
        object-fit: cover;
     border: 1px solid #DFE3E8; }
-  @media (min-width: 992px) {
-    ._2ibYC {
-      margin-right: 12px; } }
+  ._2ibYC span {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    width: 40px;
+    min-width: 40px;
+    max-width: 40px;
+    aspect-ratio: 1;
+    border-radius: 50%;
+    background: #349056;
+    border: 1px solid #DFE3E8; }
 
 ._1JMRU {
-  border-radius: 0 !important;
+  border-radius: 6px !important;
   border: 0;
   max-width: 268px;
   min-width: unset !important;
@@ -478,6 +478,16 @@
     ._3xnI5 ._3hx2T ._3UyhW div span {
       display: inline-block; } }
 
+._3fpky {
+  overflow: hidden;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
+  line-height: 1.5;
+  max-height: 3em;
+  text-overflow: ellipsis;
+  word-wrap: break-word; }
+
 ._2oGcJ {
   width: 48px;
   height: 48px;

package/dist/index.js

@@ -165,7 +165,7 @@ function _objectWithoutPropertiesLoose(source, excluded) {
   return target;
 }
 
-var styles = {"lighter":"#F0FFF6","light":"#C8F8DB","less_dark":"#3DC674","dark":"#349056","darker":"#18442A","gray_100":"#F9FAFB","gray_300":"#DFE3E8","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","image-academy--item":"_3RDWF","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"};
+var styles = {"lighter":"#F0FFF6","light":"#C8F8DB","less_dark":"#3DC674","dark":"#349056","darker":"#18442A","gray_100":"#F9FAFB","gray_300":"#DFE3E8","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"};
 
 // A type of promise-like that resolves synchronously and supports only one observer
 const _Pact = /*#__PURE__*/(function() {
@@ -508,10 +508,11 @@ var pushTo = function pushTo(history, data) {
 };
 
 var getErrorMessage = function getErrorMessage(t, error, defaultErrorMessage) {
-  var _error$response, _error$response$data, _error$response2, _error$response2$data;
+  var _error$response, _error$response$data, _error$response2, _error$response3, _error$response3$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 ((error === null || error === void 0 ? void 0 : (_error$response2 = error.response) === null || _error$response2 === void 0 ? void 0 : _error$response2.status) === 500) return defaultErrorMessage || t(DefaultErrorMessage);
   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);
+  errorMessage = (error === null || error === void 0 ? void 0 : error.message) || (error === null || error === void 0 ? void 0 : (_error$response3 = error.response) === null || _error$response3 === void 0 ? void 0 : (_error$response3$data = _error$response3.data) === null || _error$response3$data === void 0 ? void 0 : _error$response3$data.message);
   if (typeof errorMessage === "string") return errorMessage;
   return defaultErrorMessage || t(DefaultErrorMessage);
 };
@@ -2326,6 +2327,7 @@ var date = "날짜";
 var the_code_has_been_copied_to_your_clipboard = "코드가 클립보드에 복사되었습니다.";
 var an_unexpected_error_has_occurred = "예상치 못한 오류가 발생했습니다";
 var select_roles = "역할 선택";
+var no_academy_selected = "선택한 아카데미 없음";
 var lang_ko = {
 	problem_solving: problem_solving,
 	my_story: my_story,
@@ -2839,7 +2841,8 @@ var lang_ko = {
 	date: date,
 	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
+	select_roles: select_roles,
+	no_academy_selected: no_academy_selected
 };
 
 var problem_solving$1 = "Problem Solving";
@@ -3387,6 +3390,7 @@ 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 no_academy_selected$1 = "No Academy Selected";
 var lang_en = {
 	problem_solving: problem_solving$1,
 	my_story: my_story$1,
@@ -3927,7 +3931,8 @@ var lang_en = {
 	add_lesson: add_lesson$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
+	select_roles: select_roles$1,
+	no_academy_selected: no_academy_selected$1
 };
 
 i18n.use(reactI18next.initReactI18next).init({
@@ -4190,25 +4195,66 @@ var TheAcademyDropdown = function TheAcademyDropdown(_ref) {
     onClick: handleOpen,
     className: "" + styles["academy-btn"],
     sx: _extends({}, popoverStyle)
-  }, React__default.createElement("div", {
-    className: styles["image-academy"] + " me-0 me-lg-2"
+  }, React__default.createElement(material.Grid, {
+    container: true,
+    spacing: isLargerThanLg ? "0" : "12px",
+    width: isLargerThanLg ? "260px" : "auto"
+  }, React__default.createElement(material.Grid, {
+    item: true,
+    xs: 6,
+    lg: 2,
+    className: "" + styles["image-academy"]
   }, 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 && isLargerThanLg && React__default.createElement(material.Typography, {
-    className: "text-start",
+  }) : React__default.createElement("span", null, firstLetter)), isLargerThanLg && React__default.createElement(material.Grid, {
+    item: true,
+    xs: 0,
+    lg: 8
+  }, !hideAcademyName && React__default.createElement(Box, {
+    sx: {
+      position: "relative",
+      height: "100%",
+      px: isLargerThanLg ? "12px" : 0,
+      display: "flex",
+      alignItems: "center"
+    }
+  }, selectedAcademy !== null && selectedAcademy !== void 0 && selectedAcademy.name ? React__default.createElement(material.Typography, {
+    textAlign: "start",
+    className: "" + styles["line-clamp"],
     sx: {
       fontSize: 14,
       fontWeight: 600,
-      color: styles.gray_900,
-      minWidth: 150
+      lineHeight: '1.5em',
+      color: styles.gray_900
     }
-  }, (selectedAcademy === null || selectedAcademy === void 0 ? void 0 : selectedAcademy.name) || t(role === exports.Role.Admin ? "switch_academy_admin" : "switch_academy")), React__default.createElement("div", {
+  }, selectedAcademy.name) : 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, {
+    item: true,
+    xs: 6,
+    lg: 2,
+    justifyContent: "center",
+    alignItems: "center"
+  }, React__default.createElement(material.Stack, {
+    flexDirection: "row",
+    width: "100%",
+    height: "100%",
+    justifyContent: "center",
+    alignItems: "center"
+  }, React__default.createElement("div", {
     className: "" + styles["switch-icon"]
   }, React__default.createElement(go.GoArrowSwitch, {
     size: 14,
     color: styles.gray_900
-  }))), (isSuperAdmin || !isAdmin) && React__default.createElement(Popover, {
+  })))))), (isSuperAdmin || !isAdmin) && React__default.createElement(Popover, {
     open: !!open,
     anchorEl: open,
     onClose: handleClose,
@@ -4239,24 +4285,46 @@ var TheAcademyDropdown = function TheAcademyDropdown(_ref) {
     return React__default.createElement(MenuItemCustom, {
       key: option.id,
       selected: option.id === (selectedAcademy === null || selectedAcademy === void 0 ? void 0 : selectedAcademy.id),
+      sx: {
+        whiteSpace: "wrap",
+        borderRadius: "6px"
+      },
       onClick: function onClick() {
         return option.id !== (selectedAcademy === null || selectedAcademy === void 0 ? void 0 : selectedAcademy.id) && handleChangeAcademy(option);
-      },
-      sx: {
-        typography: "body2",
-        p: "8px",
-        borderRadius: "4px",
-        fontSize: 14,
-        fontWeight: 600
       }
-    }, React__default.createElement("div", {
-      className: styles["image-academy"] + " " + styles["image-academy--item"]
+    }, React__default.createElement(material.Stack, {
+      flexDirection: "row",
+      gap: "12px",
+      position: "relative",
+      width: "100%"
+    }, React__default.createElement(material.Stack, {
+      className: styles["image-academy"] + " " + styles["image-academy--item"],
+      minWidth: "40px"
     }, option.image ? React__default.createElement(Box, {
       component: "img",
       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, {
+    }) : React__default.createElement("span", null, (_option$name$charAt = option.name.charAt(0)) === null || _option$name$charAt === void 0 ? void 0 : _option$name$charAt.toUpperCase())), React__default.createElement(Box, {
+      sx: {
+        position: "relative",
+        display: "flex",
+        alignItems: "center",
+        maxWidth: isLargerThanLg ? "200px" : "100px"
+      }
+    }, React__default.createElement(material.Typography, {
+      className: "" + styles["line-clamp"],
+      sx: {
+        fontSize: 14,
+        lineHeight: '1.5em',
+        fontWeight: 600
+      }
+    }, option.name))));
+  }), React__default.createElement(MenuItemCustom, {
+    sx: {
+      whiteSpace: "wrap",
+      borderRadius: "6px"
+    }
+  }, React__default.createElement(material.Stack, {
     display: "flex",
     gap: "8px",
     width: "100%",
@@ -14388,6 +14456,7 @@ var Header = function Header(_ref) {
     className: styles["tabBox"] + " " + styles["headers"]
   }, React__default.createElement(material.Stack, {
     padding: "10px 0",
+    maxWidth: "280px",
     display: "flex",
     justifyContent: "center",
     alignItems: "center"
@@ -14456,8 +14525,9 @@ var Header = function Header(_ref) {
     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(singleLogo, null))), React__default.createElement(material.Stack, {
+    className: "me-2",
+    display: "none"
   }, React__default.createElement(TheLanguageDropdown, null))));
 };