touchstudy-core 0.1.85 → 0.1.86

package/dist/containers/Login/apiClient/index.d.ts

@@ -1,4 +1,3 @@
-import { SignInOTPRequest } from "../configs/types";
 export declare const getGoogleClientId: () => Promise<import("axios").AxiosResponse<any, any>>;
 export declare const signInApi: ({ email, password, role }: {
     email: string;
@@ -10,7 +9,11 @@ export declare const signInWithEmailApi: ({ academyDomain, email, reCaptcha }: {
     email: string;
     reCaptcha: string;
 }) => Promise<import("axios").AxiosResponse<any, any>>;
-export declare const signInWithOTPApi: ({ academyDomain, otp, email, reCaptcha, role }: SignInOTPRequest) => Promise<import("axios").AxiosResponse<any, any>>;
+export declare const signInWithOTPApi: ({ academyDomain, otp, role }: {
+    academyDomain: string;
+    otp: number;
+    role?: string | undefined;
+}) => Promise<import("axios").AxiosResponse<any, any>>;
 export declare const signInWithKeyApi: ({ academyDomain, key, role }: {
     academyDomain: string;
     key: string;

package/dist/containers/Login/hooks/useLogin.d.ts

@@ -1,6 +1,5 @@
 /// <reference types="react" />
 import { Role } from "../../../utils/constants";
-import { LoginEmailRequest } from "../configs/types";
 declare type LoginInfo = {
     email: string;
     otp: number | string;
@@ -27,7 +26,10 @@ declare const useLogin: ({ history, homeAcademyUrl, homeUrl, registerUrl, role }
     isShowPassword: boolean;
     setIsShowPassword: import("react").Dispatch<import("react").SetStateAction<boolean>>;
     infoUser: any;
-    handleSubmit: (values: LoginEmailRequest) => Promise<void>;
+    handleSubmit: (values: {
+        email?: string;
+        otp?: number;
+    }) => Promise<void>;
     setInfoUser: import("react").Dispatch<any>;
 };
 export default useLogin;

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 = "피드백 요청하기";
@@ -3265,6 +3255,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,
@@ -4089,6 +4080,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";
@@ -4874,6 +4866,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,
@@ -14202,13 +14195,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")));
       }))));
     });
   };