touchstudy-core 0.1.115 → 0.1.117

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

@@ -5,11 +5,7 @@ export declare const signInApi: ({ email, password, role }: {
     password: string;
     role: string;
 }) => Promise<import("axios").AxiosResponse<any, any>>;
-export declare const signInWithEmailApi: ({ isAcademy, email, reCaptcha }: {
-    isAcademy: boolean;
-    email: string;
-    reCaptcha: string;
-}) => Promise<import("axios").AxiosResponse<any, any>>;
+export declare const signInWithEmailApi: ({ isAcademy, email, reCaptcha, role }: any) => Promise<import("axios").AxiosResponse<any, any>>;
 export declare const signInWithOTPApi: ({ isAcademy, otp, email, reCaptcha, role }: SignInOTPRequest) => Promise<import("axios").AxiosResponse<any, any>>;
 export declare const signInWithKeyApi: ({ isAcademy, key, role }: {
     isAcademy: boolean;

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

@@ -1,4 +1,4 @@
-import { Role } from './../../../utils/constants';
+import { Role } from "./../../../utils/constants";
 declare type Props = {
     history: any;
     role?: Role;

package/dist/index.js

@@ -1369,6 +1369,8 @@ var update_schedule = "업데이트 일정";
 var back_month = "이전 달";
 var today_schedule = "오늘 스케줄";
 var schedule_achieved = "달성한 스케줄";
+var i_dont_have_my_phone_number_yet = "휴대폰 번호가 없어요";
+var duplicate_passcode_for_siblings_please_contact_admin_for_assistance = "형제자매의 중복된 비밀번호. 도움이 필요하면 관리자에게 문의하세요";
 var lang_ko = {
 	problem_solving: problem_solving,
 	my_story: my_story,
@@ -2381,7 +2383,9 @@ var lang_ko = {
 	update_schedule: update_schedule,
 	back_month: back_month,
 	today_schedule: today_schedule,
-	schedule_achieved: schedule_achieved
+	schedule_achieved: schedule_achieved,
+	i_dont_have_my_phone_number_yet: i_dont_have_my_phone_number_yet,
+	duplicate_passcode_for_siblings_please_contact_admin_for_assistance: duplicate_passcode_for_siblings_please_contact_admin_for_assistance
 };
 
 var problem_solving$1 = "Problem Solving";
@@ -3413,6 +3417,8 @@ var update_schedule$1 = "Update Schedule";
 var back_month$1 = "Back Month";
 var today_schedule$1 = "Today's schedule";
 var schedule_achieved$1 = "Schedule achieved";
+var i_dont_have_my_phone_number_yet$1 = "I don't have my phone number yet";
+var duplicate_passcode_for_siblings_please_contact_admin_for_assistance$1 = "Duplicate passcode for siblings. Please contact admin for assistance";
 var lang_en = {
 	problem_solving: problem_solving$1,
 	my_story: my_story$1,
@@ -4427,7 +4433,9 @@ var lang_en = {
 	update_schedule: update_schedule$1,
 	back_month: back_month$1,
 	today_schedule: today_schedule$1,
-	schedule_achieved: schedule_achieved$1
+	schedule_achieved: schedule_achieved$1,
+	i_dont_have_my_phone_number_yet: i_dont_have_my_phone_number_yet$1,
+	duplicate_passcode_for_siblings_please_contact_admin_for_assistance: duplicate_passcode_for_siblings_please_contact_admin_for_assistance$1
 };
 
 i18n__default.use(reactI18next.initReactI18next).init({
@@ -4751,8 +4759,10 @@ var timeSpanToLocalMoment = function timeSpanToLocalMoment(time, date) {
   var times = time.split(":");
   if (times.length !== 3) return null;
   var totalSeconds = +times[0] * 60 * 60 + +times[1] * 60 + +times[2];
-  var value = date ? moment.utc(date).startOf("day").add(totalSeconds, "seconds").local() : moment().startOf("day").add(totalSeconds, "seconds");
-  return value;
+  var startOfDay = moment.utc(date).startOf("day");
+  var dateTime = date ? startOfDay.add(totalSeconds, "seconds") : moment().startOf("day");
+  if (date && dateTime.isBefore(moment.utc(date))) dateTime = dateTime.add(1, "day");
+  return dateTime;
 };
 var convertHHMMSStoSeconds = function convertHHMMSStoSeconds(time) {
   var times = time.split(":");
@@ -9937,11 +9947,14 @@ var useLoginPhoneNumber = function useLoginPhoneNumber(props) {
           var isAcademy = !!(user !== null && user !== void 0 && user.academyDomain) || !!(user !== null && user !== void 0 && user.isLearningSpace);
           var needToRegister = isFirstLogin && isAcademy;
           var redirectUrl = needToRegister ? registerUrl : isAcademy ? homeAcademyUrl : homeUrl;
-          redirectLoginUser(user, token, redirectUrl);
+          redirectLoginUser(_extends({}, user, {
+            isNotEnoughStatements: isFirstLogin
+          }), token, redirectUrl);
           setPhoneNumber("");
         });
       }, function (error) {
-        reactToastify.toast.error(getErrorMessage(t, error));
+        var _error$response, _error$response2, _error$response2$data;
+        if ((error === null || error === void 0 ? void 0 : (_error$response = error.response) === null || _error$response === void 0 ? void 0 : _error$response.status) === 500 && (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) === "PhoneNumberIsDuplicated") reactToastify.toast.error(t("duplicate_passcode_for_siblings_please_contact_admin_for_assistance"));else reactToastify.toast.error(getErrorMessage(t, error));
       });
       return Promise.resolve(_temp && _temp.then ? _temp.then(_temp2) : _temp2(_temp));
     } catch (e) {
@@ -10280,10 +10293,12 @@ var signInApi = function signInApi(_ref) {
 var signInWithEmailApi = function signInWithEmailApi(_ref2) {
   var isAcademy = _ref2.isAcademy,
     email = _ref2.email,
-    reCaptcha = _ref2.reCaptcha;
+    reCaptcha = _ref2.reCaptcha,
+    role = _ref2.role;
   return api.post((isAcademy ? SIGN_IN_URL : SIGN_IN_SUPER_ADMIN_URL) + "/email", {
     email: email,
-    reCaptcha: reCaptcha
+    reCaptcha: reCaptcha,
+    role: role
   }, {
     headers: {
       Domain: window.location.protocol + '//' + window.location.hostname + (window.location.port ? ':' + window.location.port : '')
@@ -10419,8 +10434,17 @@ var useLogin$1 = function useLogin(_ref) {
                 var isAcademy = !!(user !== null && user !== void 0 && user.academyDomain) || !!(user !== null && user !== void 0 && user.isLearningSpace);
                 var needToRegister = isFirstLogin && isAcademy;
                 var redirectUrl = needToRegister ? registerUrl : isAcademy ? homeAcademyUrl : homeUrl;
+                console.log({
+                  isFirstLogin: isFirstLogin,
+                  isAcademy: isAcademy,
+                  token: token,
+                  user: user,
+                  redirectUrl: redirectUrl
+                });
                 handleSwitchOTP(false);
-                redirectLoginUser(user, token, redirectUrl);
+                redirectLoginUser(_extends({}, user, {
+                  isNotEnoughStatements: isFirstLogin
+                }), token, redirectUrl);
               });
             }
           }();
@@ -10431,7 +10455,8 @@ var useLogin$1 = function useLogin(_ref) {
             return Promise.resolve(signInWithEmailApi({
               isAcademy: isAcademyReq,
               email: email,
-              reCaptcha: tokenReCaptcha
+              reCaptcha: tokenReCaptcha,
+              role: role
             })).then(function () {
               reactToastify.toast.success(t("please_check_your_mailbox"));
               handleSwitchOTP(true);
@@ -10622,7 +10647,9 @@ var useLogiQRCode = function useLogiQRCode(props) {
           var isAcademy = !!(user !== null && user !== void 0 && user.academyDomain) || !!(user !== null && user !== void 0 && user.isLearningSpace);
           var needToRegister = isFirstLogin && isAcademy;
           var redirectUrl = needToRegister ? registerUrl : isAcademy ? homeAcademyUrl : homeUrl;
-          redirectLoginUser(user, token, redirectUrl);
+          redirectLoginUser(_extends({}, user, {
+            isNotEnoughStatements: isFirstLogin
+          }), token, redirectUrl);
         });
       }, function () {
         setInvalid(true);
@@ -10872,7 +10899,9 @@ var useLoginWithEmail = function useLoginWithEmail(_ref) {
           var isAcademy = !!(user !== null && user !== void 0 && user.academyDomain) || !!(user !== null && user !== void 0 && user.isLearningSpace);
           var needToRegister = isFirstLogin && isAcademy;
           var redirectUrl = needToRegister ? registerUrl : isAcademy ? homeAcademyUrl : homeUrl;
-          redirectLoginUser(user, token, redirectUrl);
+          redirectLoginUser(_extends({}, user, {
+            isNotEnoughStatements: isFirstLogin
+          }), token, redirectUrl);
         });
       }, function (error) {
         console.log(error);
@@ -10932,7 +10961,7 @@ var useLogin$2 = function useLogin(_ref) {
     passwordError = _useState2[0],
     setPasswordError = _useState2[1];
   var searchParams = new URLSearchParams(window.location.search);
-  var paramDomain = searchParams.get('domain');
+  var paramDomain = searchParams.get("domain");
   var academyDomain = paramDomain || getAcademyDomain();
   var isStudent = role === exports.Role.Student;
   var isAcademyReq = isStudent || !!academyDomain;
@@ -10990,11 +11019,13 @@ var useLogin$2 = function useLogin(_ref) {
           var isAcademy = !!(user !== null && user !== void 0 && user.academyDomain) || !!(user !== null && user !== void 0 && user.isLearningSpace);
           var needToRegister = isFirstLogin && isAcademy;
           var redirectUrl = needToRegister ? registerUrl : isAcademy ? homeAcademyUrl : homeUrl;
-          redirectLoginUser(user, token, redirectUrl);
+          redirectLoginUser(_extends({}, user, {
+            isNotEnoughStatements: isFirstLogin
+          }), token, redirectUrl);
         });
       }, function (error) {
         console.log(error);
-        reactToastify.toast.error(getErrorMessage(t, error, t('request_login_fail')));
+        reactToastify.toast.error(getErrorMessage(t, error, t("request_login_fail")));
       }));
     } catch (e) {
       return Promise.reject(e);
@@ -12350,7 +12381,7 @@ var SelectDialog = function SelectDialog(_ref) {
   }))), React__default.createElement(material.TableBody, null, isStudent ? userList.map(function (i, index) {
     var isItemSelected = isSelected(i.studentId);
     return React__default.createElement(material.TableRow, {
-      key: i.id
+      key: i.studentId
     }, React__default.createElement(material.TableCell, {
       padding: "checkbox"
     }, React__default.createElement(material.Checkbox, {
@@ -21294,6 +21325,7 @@ var UserDialog = function UserDialog(_ref) {
     var isDefaultPassCode = !(data !== null && data !== void 0 && data.passCode);
     setUseDefaultPassCode(isDefaultPassCode);
     setDefaultPassCodeChanged(false);
+    setPassCode(data === null || data === void 0 ? void 0 : data.passCode);
   };
   React.useEffect(function () {
     resetData();
@@ -21839,6 +21871,7 @@ var useUserList = function useUserList(role) {
       var _temp8 = function _temp8() {
         dispatch(setLoading(false));
       };
+      setUserDetail(undefined);
       if (!id) return Promise.resolve();
       dispatch(setLoading(true));
       var _temp7 = _catch(function () {
@@ -21896,7 +21929,7 @@ var useUserList = function useUserList(role) {
   };
   var handleOpenUserDialog = function handleOpenUserDialog(user) {
     try {
-      setUserDetail(undefined);
+      setUserDetail(user);
       setSelectedUser(user);
       setOpenUserDialog(true);
       return Promise.resolve(_catch(function () {
@@ -21920,6 +21953,7 @@ var useUserList = function useUserList(role) {
   };
   var handleCloseUserDialog = function handleCloseUserDialog() {
     setOpenUserDialog(false);
+    setUserDetail(undefined);
     setSelectedUser({
       id: 0,
       fullName: "",