touchstudy-core 0.1.85 → 0.1.87

package/dist/index.js

@@ -799,11 +799,16 @@ var BlockLogin = function BlockLogin(_ref3) {
     onSubmit: onSubmit
   }, function (_ref4) {
     var errors = _ref4.errors,
+      values = _ref4.values,
       setFieldValue = _ref4.setFieldValue;
+    console.log({
+      errors: errors,
+      values: values
+    });
     React.useEffect(function () {
-      if (isEmail) setFieldValue("otp", "");
-      if (!isOTP && !isEmail) {
+      if (isOTP) {
         setFieldValue("email", "");
+      } else {
         setFieldValue("otp", "");
       }
     }, [isOTP, isEmail]);
@@ -839,9 +844,8 @@ var BlockLogin = function BlockLogin(_ref3) {
       fontSize: "14px",
       fontWeight: 700,
       color: colors.blue[700]
-    }, t("sign_in_with_email"))))), (isEmail || isOTP) && React__default.createElement(material.Stack, null, React__default.createElement(material.Stack, {
+    }, t("sign_in_with_email"))))), (isEmail || isOTP) && React__default.createElement(material.Stack, null, !isOTP ? React__default.createElement(material.Stack, {
       flexDirection: "column",
-      display: isOTP ? "none" : "flex",
       gap: 1
     }, React__default.createElement(material.Typography, {
       fontWeight: 700,
@@ -857,9 +861,8 @@ var BlockLogin = function BlockLogin(_ref3) {
       fontSize: "10px",
       lineHeight: "11.93px",
       color: !(errors !== null && errors !== void 0 && errors.email) ? "#97A1AF" : "#F34B4B"
-    }, errors === null || errors === void 0 ? void 0 : errors.email)), React__default.createElement(material.Stack, {
+    }, errors === null || errors === void 0 ? void 0 : errors.email)) : React__default.createElement(material.Stack, {
       flexDirection: "column",
-      display: !isOTP ? "none" : "flex",
       gap: 1
     }, React__default.createElement(material.Typography, {
       fontWeight: 700,
@@ -898,18 +901,10 @@ var BlockLogin = function BlockLogin(_ref3) {
       color: colors.blue[700]
     }, t("sign_in_with_google_account"))), React__default.createElement(material.Stack, {
       flexDirection: "row",
-      justifyContent: isOTP ? "space-between" : "end",
+      justifyContent: "end",
       gap: 1,
       mt: 2
-    }, isOTP && React__default.createElement(material.Button, {
-      variant: "contained",
-      color: "secondary",
-      className: "bg-secondary",
-      onClick: function onClick() {
-        handleSwitchEmail(true);
-        handleSwitchOTP(false);
-      }
-    }, t("back")), React__default.createElement(material.Button, {
+    }, React__default.createElement(material.Button, {
       variant: "contained",
       color: "primary",
       type: "submit",
@@ -946,14 +941,10 @@ var signInWithEmailApi = function signInWithEmailApi(_ref2) {
 var signInWithOTPApi = function signInWithOTPApi(_ref3) {
   var academyDomain = _ref3.academyDomain,
     otp = _ref3.otp,
-    email = _ref3.email,
-    reCaptcha = _ref3.reCaptcha,
     role = _ref3.role;
   return api.post((academyDomain ? SIGN_IN_URL : SIGN_IN_SUPER_ADMIN_URL) + "/otp", {
     otp: otp,
-    email: email,
-    role: role,
-    reCaptcha: reCaptcha
+    role: role
   });
 };
 var signInWithKeyApi = function signInWithKeyApi(_ref4) {
@@ -1040,9 +1031,6 @@ var useLogin$1 = function useLogin(_ref) {
   var handleSubmit = function handleSubmit(values) {
     try {
       var _temp5 = function _temp5() {
-        setRefreshReCaptcha(function (b) {
-          return !b;
-        });
         dispatch(setLoading(false));
       };
       if (!tokenReCaptcha) return Promise.resolve();
@@ -1052,13 +1040,11 @@ var useLogin$1 = function useLogin(_ref) {
       var _temp4 = _catch(function () {
         function _temp3() {
           var _temp = function () {
-            if (email && otp) {
+            if (otp) {
               return Promise.resolve(signInWithOTPApi({
                 academyDomain: academyDomain,
-                email: email,
                 otp: otp,
-                role: role,
-                reCaptcha: tokenReCaptcha
+                role: role
               })).then(function (res) {
                 var loginResponse = res === null || res === void 0 ? void 0 : res.data;
                 var isFirstLogin = loginResponse.isFirstLogin,
@@ -1075,7 +1061,7 @@ var useLogin$1 = function useLogin(_ref) {
           if (_temp && _temp.then) return _temp.then(function () {});
         }
         var _temp2 = function () {
-          if (email && !otp) {
+          if (email) {
             return Promise.resolve(signInWithEmailApi({
               academyDomain: academyDomain,
               email: email,
@@ -1084,6 +1070,9 @@ var useLogin$1 = function useLogin(_ref) {
               reactToastify.toast.success(t("please_check_your_mailbox"));
               handleSwitchOTP(true);
               handleSwitchEmail(false);
+              setRefreshReCaptcha(function (b) {
+                return !b;
+              });
             });
           }
         }();
@@ -2481,6 +2470,7 @@ var trick_problem = "함정 문제";
 var differential_problem = "변별력 문제";
 var difficult_problem = "어려운 문제";
 var general_problem = "일반적인 문제";
+var super_difficult_problem = "엄청 어려운 문제";
 var fingerprint = "지문";
 var end = "종료";
 var ask_for_feedback = "피드백 요청하기";
@@ -2901,6 +2891,16 @@ var max_is_6 = "최대는 6입니다";
 var must_be_number = "숫자여야 합니다.";
 var sign_in_with_google_account = "구글 계정으로 로그인";
 var academy_role = "아카데미 역할";
+var academy_management = "아카데미 관리";
+var manage_users = "사용자 관리";
+var manage_classes = "수업 관리";
+var manage_notifications = "알림 관리";
+var late = "늦은";
+var total_student = "총 학생 수";
+var total_teacher = "총 교사 수";
+var total_exam = "총 시험 수";
+var total_exam_time = "총 시험 시간";
+var total_question = "총 질문 수";
 var lang_ko = {
 	problem_solving: problem_solving,
 	my_story: my_story,
@@ -3265,6 +3265,7 @@ var lang_ko = {
 	differential_problem: differential_problem,
 	difficult_problem: difficult_problem,
 	general_problem: general_problem,
+	super_difficult_problem: super_difficult_problem,
 	fingerprint: fingerprint,
 	end: end,
 	ask_for_feedback: ask_for_feedback,
@@ -3688,7 +3689,17 @@ var lang_ko = {
 	max_is_6: max_is_6,
 	must_be_number: must_be_number,
 	sign_in_with_google_account: sign_in_with_google_account,
-	academy_role: academy_role
+	academy_role: academy_role,
+	academy_management: academy_management,
+	manage_users: manage_users,
+	manage_classes: manage_classes,
+	manage_notifications: manage_notifications,
+	late: late,
+	total_student: total_student,
+	total_teacher: total_teacher,
+	total_exam: total_exam,
+	total_exam_time: total_exam_time,
+	total_question: total_question
 };
 
 var problem_solving$1 = "Problem Solving";
@@ -3926,7 +3937,7 @@ var check_attendance$1 = "Check attendance";
 var attendance_check$1 = "Attendance check";
 var class_date$1 = "Class date";
 var class_time$1 = "Class time";
-var attendance$1 = "Attendance List";
+var attendance$1 = "Attendance";
 var attendance_completed$1 = "Attendance completed";
 var none_attendance$1 = "Non-attendance";
 var academy_list$1 = "Academy list";
@@ -4089,6 +4100,7 @@ var trick_problem$1 = "Trick problem";
 var differential_problem$1 = "Differential problem";
 var difficult_problem$1 = "Difficult problem";
 var general_problem$1 = "General problem";
+var super_difficult_problem$1 = "Super difficult problem";
 var fingerprint$1 = "Fingerprint";
 var end$1 = "end";
 var ask_for_feedback$1 = "Ask for feedback";
@@ -4486,6 +4498,16 @@ var max_is_6$1 = "Max is 6";
 var must_be_number$1 = "Must be number";
 var sign_in_with_google_account$1 = "Sign in with google account";
 var academy_role$1 = "Academy role";
+var academy_management$1 = "Academy management";
+var manage_users$1 = "Manage users";
+var manage_classes$1 = "Manage classes";
+var manage_notifications$1 = "Manage notifications";
+var late$1 = "Late";
+var total_student$1 = "Total Student";
+var total_teacher$1 = "Total Teacher";
+var total_exam$1 = "Total Exam";
+var total_exam_time$1 = "Total Exam Time";
+var total_question$1 = "Total Question";
 var lang_en = {
 	problem_solving: problem_solving$1,
 	my_story: my_story$1,
@@ -4874,6 +4896,7 @@ var lang_en = {
 	differential_problem: differential_problem$1,
 	difficult_problem: difficult_problem$1,
 	general_problem: general_problem$1,
+	super_difficult_problem: super_difficult_problem$1,
 	fingerprint: fingerprint$1,
 	end: end$1,
 	ask_for_feedback: ask_for_feedback$1,
@@ -5274,7 +5297,17 @@ var lang_en = {
 	max_is_6: max_is_6$1,
 	must_be_number: must_be_number$1,
 	sign_in_with_google_account: sign_in_with_google_account$1,
-	academy_role: academy_role$1
+	academy_role: academy_role$1,
+	academy_management: academy_management$1,
+	manage_users: manage_users$1,
+	manage_classes: manage_classes$1,
+	manage_notifications: manage_notifications$1,
+	late: late$1,
+	total_student: total_student$1,
+	total_teacher: total_teacher$1,
+	total_exam: total_exam$1,
+	total_exam_time: total_exam_time$1,
+	total_question: total_question$1
 };
 
 i18n__default.use(reactI18next.initReactI18next).init({
@@ -14202,13 +14235,13 @@ var CompareGrass = function CompareGrass(_ref2) {
             fontSize: "11px"
           },
           className: "" + printStyles["avoid-break-inside"]
-        }, t("general_problem")), problem === 4 && React__default.createElement(ChipCustom, {
+        }, t("general_problem")), (problem === 4 || problem === 5) && React__default.createElement(ChipCustom, {
           style: {
             border: "1px solid #FF0000",
             fontSize: "11px"
           },
           className: "" + printStyles["avoid-break-inside"]
-        }, t("difficult_problem")));
+        }, t(problem === 4 ? "difficult_problem" : "super_difficult_problem")));
       }))));
     });
   };