touchstudy-core 0.1.58 → 0.1.59

package/dist/index.css

@@ -157,26 +157,33 @@
   justify-content: space-between !important; }
 
 ._2ibYC {
-  max-width: 40px;
-  max-height: 40px;
-  border-radius: 50%;
-  display: flex;
-  justify-content: center;
-  align-items: center;
   font-size: 20px;
   font-weight: 600;
   line-height: 1;
   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; }
+  ._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;

package/dist/index.js

@@ -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({
@@ -4192,7 +4197,8 @@ var TheAcademyDropdown = function TheAcademyDropdown(_ref) {
     sx: _extends({}, popoverStyle)
   }, React__default.createElement(material.Grid, {
     container: true,
-    spacing: isLargerThanLg ? "0" : "12px"
+    spacing: isLargerThanLg ? "0" : "12px",
+    width: isLargerThanLg ? "260px" : "auto"
   }, React__default.createElement(material.Grid, {
     item: true,
     xs: 6,
@@ -4209,9 +4215,11 @@ var TheAcademyDropdown = function TheAcademyDropdown(_ref) {
     sx: {
       position: "relative",
       height: "100%",
-      px: isLargerThanLg ? "12px" : 0
+      px: isLargerThanLg ? "12px" : 0,
+      display: "flex",
+      alignItems: "center"
     }
-  }, React__default.createElement(material.Typography, {
+  }, selectedAcademy !== null && selectedAcademy !== void 0 && selectedAcademy.name ? React__default.createElement(material.Typography, {
     textAlign: "start",
     className: "" + styles["line-clamp"],
     sx: {
@@ -4220,16 +4228,33 @@ var TheAcademyDropdown = function TheAcademyDropdown(_ref) {
       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(material.Grid, {
+  }, 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
+    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,
@@ -4260,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%",