touchstudy-core 0.1.78 → 0.1.80

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

@@ -6,6 +6,7 @@ declare type LoginInfo = {
     rememberMe: boolean;
 };
 declare const useLogin: (homeAcademyUrl: string, homeUrl: string) => {
+    clientId: string | undefined;
     defaultInfo: LoginInfo;
     openLogin: boolean;
     toggle: () => void;

package/dist/containers/Login/views/block/BlockLogin.d.ts

@@ -7,6 +7,7 @@ interface Props {
     homeAcademyUrl: string;
     homeUrl: string;
     registerUrl?: string;
+    clientId: string;
 }
 declare const BlockLogin: FC<Props & INavigateProps>;
 export default BlockLogin;

package/dist/index.js

@@ -724,7 +724,8 @@ var BlockLogin = function BlockLogin(_ref) {
     role = _ref$role === void 0 ? exports.Role.Student : _ref$role,
     homeAcademyUrl = _ref.homeAcademyUrl,
     homeUrl = _ref.homeUrl,
-    registerUrl = _ref.registerUrl;
+    registerUrl = _ref.registerUrl,
+    clientId = _ref.clientId;
   var language = reactRedux.useSelector(function (state) {
     var _state$common;
     return state === null || state === void 0 ? void 0 : (_state$common = state.common) === null || _state$common === void 0 ? void 0 : _state$common.language;
@@ -794,7 +795,7 @@ var BlockLogin = function BlockLogin(_ref) {
     })), React__default.createElement("div", {
       className: "p-0 mt-1 mb-4"
     }, React__default.createElement(GoogleLogin__default, {
-      clientId: GOOGLE_CLIENT_ID,
+      clientId: clientId,
       buttonText: t("sign_in_with_your_google_account"),
       onSuccess: onSuccessGoogle,
       onFailure: onFailureGoogle,
@@ -819,23 +820,29 @@ var useLogin$1 = function useLogin(homeAcademyUrl, homeUrl) {
   var _useState2 = React.useState(),
     infoUser = _useState2[0],
     setInfoUser = _useState2[1];
+  var _useState3 = React.useState(),
+    clientId = _useState3[0],
+    setClientId = _useState3[1];
   var _useTranslation = reactI18next.useTranslation(),
     t = _useTranslation.t;
   var toggle = React.useCallback(function () {
     setOpenLogin(!openLogin);
   }, [openLogin]);
-  var _useState3 = React.useState(false),
-    isShowPassword = _useState3[0],
-    setIsShowPassword = _useState3[1];
+  var _useState4 = React.useState(false),
+    isShowPassword = _useState4[0],
+    setIsShowPassword = _useState4[1];
+  React.useEffect(function () {
+    setClientId(GOOGLE_CLIENT_ID);
+  }, []);
   React.useEffect(function () {
     var start = function start() {
       gapiScript.gapi.client.init({
-        clientId: GOOGLE_CLIENT_ID,
+        clientId: clientId,
         scope: "email"
       });
     };
-    !!gapiScript.gapi && gapiScript.gapi.load("client:auth2", start);
-  }, [gapiScript.gapi]);
+    gapiScript.gapi && clientId && gapiScript.gapi.load("client:auth2", start);
+  }, [gapiScript.gapi, clientId]);
   React.useEffect(function () {
     var token = getAccessToken();
     var academyDomain = getAcademyDomain();
@@ -846,6 +853,7 @@ var useLogin$1 = function useLogin(homeAcademyUrl, homeUrl) {
     document.title = t("study_peak") + " | " + t(PAGE_TITLE);
   }, [t]);
   return {
+    clientId: clientId,
     defaultInfo: defaultInfo,
     openLogin: openLogin,
     toggle: toggle,
@@ -955,7 +963,8 @@ var Login = function Login(_ref) {
   var history = _ref.history,
     rest = _objectWithoutPropertiesLoose(_ref, _excluded);
   var _useLogin = useLogin$1(rest.homeAcademyUrl, rest.homeUrl),
-    defaultInfo = _useLogin.defaultInfo;
+    defaultInfo = _useLogin.defaultInfo,
+    clientId = _useLogin.clientId;
   useLanguage(history);
   return React__default.createElement("div", {
     className: styles["login"] + " font-family-lato"
@@ -967,9 +976,10 @@ var Login = function Login(_ref) {
     item: true,
     xs: 12,
     className: "d-flex justify-content-center h-100 align-items-center"
-  }, React__default.createElement(BlockLogin, Object.assign({
+  }, clientId && React__default.createElement(BlockLogin, Object.assign({
     defaultInfo: defaultInfo,
-    history: history
+    history: history,
+    clientId: clientId
   }, rest)))));
 };
 
@@ -16758,9 +16768,13 @@ var PrintExamView2 = function PrintExamView2(_ref) {
     var examSessionId = _ref2.examSessionId,
       studentId = _ref2.studentId,
       code = _ref2.code;
+    var width = 200;
+    var height = 200;
+    var left = window.screenX + window.outerWidth / 2 - width / 2;
+    var top = window.screenY + window.outerHeight / 2 - height / 2;
     var url = isTeacher ? window.location.origin + "/teacher/exam-results/" + examSessionId + "/students/" + studentId + "/print" : window.location.origin + "/student/exam-results/" + code + "/print";
     var windowName = isTeacher ? "popup-" + examSessionId + "-" + studentId : "popup-" + code;
-    var windowSpecs = "left=" + (window.innerWidth - 100) + ",top=" + (window.innerHeight - 100) + ",width=100,height=100,location=yes,resizable=yes,scrollbars=yes,status=yes";
+    var windowSpecs = "left=" + left + ",top=" + top + ",width=" + width + ",height=" + height + ",location=yes,resizable=yes,scrollbars=yes,status=yes";
     var childWindow = window.open(url, windowName, windowSpecs);
     if (childWindow == null) {
       setErrorLinks(function (prev) {