touchstudy-core 0.1.63 → 0.1.65

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

@@ -5,7 +5,7 @@ declare type LoginInfo = {
     captcha: string;
     rememberMe: boolean;
 };
-declare const useLogin: (history: any) => {
+declare const useLogin: () => {
     defaultInfo: LoginInfo;
     openLogin: boolean;
     toggle: () => void;

package/dist/index.js

@@ -499,8 +499,16 @@ var useGoogleSignOut = function useGoogleSignOut(props) {
   };
 };
 
-var pushTo = function pushTo(history, data) {
-  if (history.push) history.push(data);else history(data);
+var pushTo = function pushTo(history, data, isReplace) {
+  if (isReplace === void 0) {
+    isReplace = false;
+  }
+  if (history.push && !isReplace || history.replace && isReplace) {
+    !isReplace && history.push(data);
+    isReplace && history.replace(data);
+  } else history(data, {
+    replace: isReplace
+  });
 };
 
 var getErrorMessage = function getErrorMessage(t, error, defaultErrorMessage) {
@@ -936,7 +944,7 @@ var defaultInfo = {
   captcha: "",
   rememberMe: false
 };
-var useLogin$1 = function useLogin(history) {
+var useLogin$1 = function useLogin() {
   var _useState = React.useState(false),
     openLogin = _useState[0],
     setOpenLogin = _useState[1];
@@ -960,7 +968,7 @@ var useLogin$1 = function useLogin(history) {
   }, [gapiScript.gapi]);
   React.useEffect(function () {
     var token = getAccessToken();
-    if (!!token) pushTo(history, "/");
+    if (token) window.location.href = "/";
   }, []);
   return {
     defaultInfo: defaultInfo,
@@ -1019,8 +1027,9 @@ var useLanguage = function useLanguage(history) {
     var search = window.location.search;
     var searchParams = new URLSearchParams(search);
     if (!languageItem) {
+      var _navigator$language, _navigator$language$s;
       var storedLanguage = getLanguage();
-      var browserLanguage = navigator.language;
+      var browserLanguage = (_navigator$language = navigator.language) === null || _navigator$language === void 0 ? void 0 : (_navigator$language$s = _navigator$language.split("-")) === null || _navigator$language$s === void 0 ? void 0 : _navigator$language$s[0];
       var defaultLanguageCode = storedLanguage || browserLanguage;
       languageItem = LANGUAGES.find(function (i) {
         return i.code === defaultLanguageCode;
@@ -1034,7 +1043,7 @@ var useLanguage = function useLanguage(history) {
     searchParams.set("lang", languageItem.code);
     pushTo(history, _extends({}, window.location, {
       search: searchParams.toString()
-    }));
+    }), true);
   };
   var handleChangeLanguageParam = function handleChangeLanguageParam() {
     var search = window.location.search;
@@ -1070,7 +1079,7 @@ var _excluded = ["history"];
 var Login = function Login(_ref) {
   var history = _ref.history,
     rest = _objectWithoutPropertiesLoose(_ref, _excluded);
-  var _useLogin = useLogin$1(history),
+  var _useLogin = useLogin$1(),
     defaultInfo = _useLogin.defaultInfo;
   useLanguage(history);
   return React__default.createElement("div", {
@@ -1375,7 +1384,6 @@ var Loading = function Loading() {
   var isLoading = reactRedux.useSelector(function (state) {
     return state.common.isLoading;
   });
-  localStorage.setItem("LAST_TIME_REQUETST", moment().utc().format("YYYY-MM-DD HH:mm:ss"));
   return isLoading ? React__default.createElement("div", {
     style: loadingStyle
   }, React__default.createElement("div", {
@@ -1901,6 +1909,7 @@ var correct_answer_for_each_student = "학생별 정답 여부";
 var information_by_question = "문항별 정보";
 var no_data = "데이터 없음";
 var internet_connection_was_lost = "인터넷 연결이 끊어졌습니다";
+var internet_connection_is_back = "인터넷 연결이 다시 돌아왔습니다";
 var problem = "문제";
 var number_problem = "{{number}}문제";
 var problems = "문제";
@@ -2529,6 +2538,7 @@ var lang_ko = {
 	information_by_question: information_by_question,
 	no_data: no_data,
 	internet_connection_was_lost: internet_connection_was_lost,
+	internet_connection_is_back: internet_connection_is_back,
 	problem: problem,
 	number_problem: number_problem,
 	problems: problems,
@@ -3147,7 +3157,8 @@ var question_time_for_each_student$1 = "Question time for each student";
 var correct_answer_for_each_student$1 = "Correct answer for each student";
 var information_by_question$1 = "Information by question";
 var no_data$1 = "No data";
-var internet_connection_was_lost$1 = "Internet connection was lost";
+var internet_connection_was_lost$1 = "The internet connection was lost";
+var internet_connection_is_back$1 = "The internet connection is back";
 var problem$1 = "Problem";
 var number_problem$1 = "No.{{number}}";
 var problems$1 = "Problems";
@@ -3776,6 +3787,7 @@ var lang_en = {
 	information_by_question: information_by_question$1,
 	no_data: no_data$1,
 	internet_connection_was_lost: internet_connection_was_lost$1,
+	internet_connection_is_back: internet_connection_is_back$1,
 	problem: problem$1,
 	number_problem: number_problem$1,
 	problems: problems$1,
@@ -9496,7 +9508,7 @@ var useAutoAcademyDomain = function useAutoAcademyDomain(logout, history, superU
         searchParams["delete"]("domain");
         pushTo(history, _extends({}, window.location, {
           search: searchParams.toString()
-        }));
+        }), true);
         return;
       }
     } else {
@@ -9516,7 +9528,7 @@ var useAutoAcademyDomain = function useAutoAcademyDomain(logout, history, superU
         searchParams.set("domain", academyDomain);
         pushTo(history, _extends({}, window.location, {
           search: searchParams.toString()
-        }));
+        }), true);
         return;
       }
     }
@@ -14400,7 +14412,7 @@ var useLogin$2 = function useLogin(_ref) {
   };
   React.useEffect(function () {
     var token = getAccessToken();
-    if (!!token) pushTo(history, "/");
+    if (token) window.location.href = "/";
   }, []);
   return {
     handleSubmit: handleSubmit,