@underpostnet/underpost 2.7.94 → 2.8.1

package/src/client/components/core/Account.js

@@ -1,11 +1,11 @@
 import { UserService } from '../../services/user/user.service.js';
+import { Auth } from './Auth.js';
 import { BtnIcon } from './BtnIcon.js';
 import { newInstance, s4 } from './CommonJs.js';
 import { renderStatus, renderWave } from './Css.js';
 import { EventsUI } from './EventsUI.js';
 import { fileFormDataFactory, Input } from './Input.js';
 import { LogIn } from './LogIn.js';
-import { LogOut } from './LogOut.js';
 import { Modal } from './Modal.js';
 import { NotificationManager } from './NotificationManager.js';
 import { Translate } from './Translate.js';
@@ -21,19 +21,19 @@ const Account = {
     const waveAnimationId = 'account-wave';
     const profileFileAccept = ['image/png', 'image/jpeg'];
     setTimeout(async () => {
-      if (LogIn.Scope.user.main.model.user.profileImage) {
-        append(
-          `.wave-animation-container-${waveAnimationId}`,
-          html` <div class="abs center account-profile-image-container">
-              <img
-                class="abs center account-profile-image"
-                style="opacity: 1"
-                src="${LogIn.Scope.user.main.model.user.profileImage.imageSrc}"
-              />
-            </div>
-            <div class="abs center account-profile-image-loading" style="color: white"></div>`,
-        );
-      }
+      append(
+        `.wave-animation-container-${waveAnimationId}`,
+        html` <div class="abs center account-profile-image-container">
+            <img
+              class="abs center account-profile-image"
+              style="opacity: 1"
+              ${LogIn.Scope.user.main.model.user.profileImage
+                ? `src="${LogIn.Scope.user.main.model.user.profileImage.imageSrc}"`
+                : ''}
+            />
+          </div>
+          <div class="abs center account-profile-image-loading" style="color: white"></div>`,
+      );
 
       const formData = [
         {
@@ -49,133 +49,141 @@ const Account = {
           rules: [{ type: 'isStrongPassword' }],
         },
       ];
-      const validators = await Validator.instance(formData);
 
-      for (const inputData of formData) {
-        s(`.${inputData.id}`).value =
-          !user[inputData.model] && inputData.defaultValue ? inputData.defaultValue : user[inputData.model];
-      }
-      let lastUser;
-      const submit = async () => {
-        lastUser = newInstance(user);
-        const { errorMessage } = await validators();
-        if (errorMessage) return;
-        const body = {};
+      this.formData = formData;
+
+      this.instanceModalUiEvents = async ({ user }) => {
+        const validators = await Validator.instance(formData);
+
         for (const inputData of formData) {
-          if (!s(`.${inputData.id}`).value || s(`.${inputData.id}`).value === 'undefined') continue;
-          if ('model' in inputData) {
-            body[inputData.model] = s(`.${inputData.id}`).value;
-            user[inputData.model] = s(`.${inputData.id}`).value;
-          }
+          s(`.${inputData.id}`).value =
+            !user[inputData.model] && inputData.defaultValue ? inputData.defaultValue : user[inputData.model];
         }
-        const result = await UserService.put({ id: user._id, body });
-        NotificationManager.Push({
-          html:
-            result.status === 'error' && result.message
-              ? result.message
-              : Translate.Render(`${result.status}-update-user`),
-          status: result.status,
-        });
-        if (result.status === 'success') {
-          user = result.data;
-          this.triggerUpdateEvent({ user });
-          if (lastUser.emailConfirmed !== user.emailConfirmed) {
-            this.renderVerifyEmailStatus(user);
-          }
+        let lastUser;
+        const submit = async () => {
           lastUser = newInstance(user);
-        }
-      };
-      EventsUI.onClick(`.btn-account`, async (e) => {
-        e.preventDefault();
-        await submit();
-      });
-      EventsUI.onClick(`.btn-account-update-username`, async (e) => {
-        e.preventDefault();
-        await submit();
-      });
-
-      if (s(`.btn-confirm-email`))
-        EventsUI.onClick(`.btn-confirm-email`, async (e) => {
-          e.preventDefault();
-          const result = await UserService.post({
-            id: 'mailer/verify-email',
-            body: { email: s(`.account-email`).value },
-          });
+          const { successKeys } = await validators();
+          if (successKeys.length === 0) return;
+          const body = {};
+          for (const inputData of formData) {
+            if (!s(`.${inputData.id}`).value || s(`.${inputData.id}`).value === 'undefined') continue;
+            if ('model' in inputData && successKeys.includes(inputData.id)) {
+              body[inputData.model] = s(`.${inputData.id}`).value;
+              user[inputData.model] = s(`.${inputData.id}`).value;
+            }
+          }
+          const result = await UserService.put({ id: user._id, body });
           NotificationManager.Push({
-            html: result.status === 'error' ? result.message : Translate.Render(`email send`),
+            html:
+              result.status === 'error' && result.message
+                ? result.message
+                : Translate.Render(`${result.status}-update-user`),
             status: result.status,
           });
+          if (result.status === 'success') {
+            user = result.data;
+            this.triggerUpdateEvent({ user });
+            if (lastUser.emailConfirmed !== user.emailConfirmed) {
+              this.renderVerifyEmailStatus(user);
+            }
+            lastUser = newInstance(user);
+          }
+        };
+        EventsUI.onClick(`.btn-account`, async (e) => {
+          e.preventDefault();
+          await submit();
         });
-      this.renderVerifyEmailStatus(user);
-
-      s(`.${waveAnimationId}`).style.cursor = 'pointer';
-      s(`.${waveAnimationId}`).onclick = async (e) => {
-        e.preventDefault();
-        s(`.account-profile-image-input`).click();
-      };
-      EventsUI.onChange(
-        `.account-profile-image-input`,
-        async (e) => {
+        EventsUI.onClick(`.btn-account-update-username`, async (e) => {
           e.preventDefault();
-          s(`.account-profile-image`).style.opacity = 0;
-          const formFile = fileFormDataFactory(e, profileFileAccept);
+          await submit();
+        });
 
-          const { status, data } = await UserService.put({
-            id: `profile-image/${user._id}`,
-            body: formFile,
-            headerId: 'file',
+        if (s(`.btn-confirm-email`))
+          EventsUI.onClick(`.btn-confirm-email`, async (e) => {
+            e.preventDefault();
+            const result = await UserService.post({
+              id: 'mailer/verify-email',
+              body: { email: s(`.account-email`).value },
+            });
+            NotificationManager.Push({
+              html: result.status === 'error' ? result.message : Translate.Render(`email send`),
+              status: result.status,
+            });
           });
+        this.renderVerifyEmailStatus(user);
 
-          if (status === 'success') {
-            user.profileImageId = data.profileImageId;
-            delete LogIn.Scope.user.main.model.user.profileImage;
-            await LogIn.Trigger({ user });
-            s(`.account-profile-image`).src = LogIn.Scope.user.main.model.user.profileImage.imageSrc;
-          } else {
-            NotificationManager.Push({
-              html: Translate.Render('file-upload-failed'),
-              status: 'error',
+        s(`.${waveAnimationId}`).style.cursor = 'pointer';
+        s(`.${waveAnimationId}`).onclick = async (e) => {
+          e.preventDefault();
+          s(`.account-profile-image-input`).click();
+        };
+        EventsUI.onChange(
+          `.account-profile-image-input`,
+          async (e) => {
+            e.preventDefault();
+            s(`.account-profile-image`).style.opacity = 0;
+            const formFile = fileFormDataFactory(e, profileFileAccept);
+
+            const { status, data } = await UserService.put({
+              id: `profile-image/${user._id}`,
+              body: formFile,
+              headerId: 'file',
             });
-          }
 
-          s(`.account-profile-image`).style.opacity = 1;
-        },
-        { loadingContainer: `.account-profile-image-loading` },
-      );
-      s(`.btn-account-change-password`).onclick = (e) => {
-        e.preventDefault();
-        // s(`.btn-close-modal-account`).click();
-        s(`.main-btn-recover`).click();
-      };
-      s(`.btn-account-delete-confirm`).onclick = async (e) => {
-        e.preventDefault();
-        const confirmResult = await Modal.RenderConfirm({
-          html: async () => {
-            return html`
-              <div class="in section-mp" style="text-align: center">${Translate.Render('confirm-delete-account')}</div>
-            `;
+            if (status === 'success') {
+              user.profileImageId = data.profileImageId;
+              delete LogIn.Scope.user.main.model.user.profileImage;
+              await LogIn.Trigger({ user });
+              s(`.account-profile-image`).src = LogIn.Scope.user.main.model.user.profileImage.imageSrc;
+            } else {
+              NotificationManager.Push({
+                html: Translate.Render('file-upload-failed'),
+                status: 'error',
+              });
+            }
+
+            s(`.account-profile-image`).style.opacity = 1;
           },
-          id: 'delete-account-modal',
+          { loadingContainer: `.account-profile-image-loading` },
+        );
+        s(`.btn-account-change-password`).onclick = (e) => {
+          e.preventDefault();
+          // s(`.btn-close-modal-account`).click();
+          s(`.main-btn-recover`).click();
+        };
+        s(`.btn-account-delete-confirm`).onclick = async (e) => {
+          e.preventDefault();
+          const confirmResult = await Modal.RenderConfirm({
+            html: async () => {
+              return html`
+                <div class="in section-mp" style="text-align: center">
+                  ${Translate.Render('confirm-delete-account')}
+                </div>
+              `;
+            },
+            id: 'delete-account-modal',
+          });
+          if (confirmResult.status === 'cancelled') return;
+          s(`.btn-account-delete-confirm`).classList.add('hide');
+          s(`.btn-account-delete`).classList.remove('hide');
+          s(`.btn-account-delete`).click();
+        };
+        EventsUI.onClick(`.btn-account-delete`, async (e) => {
+          e.preventDefault();
+          const result = await UserService.delete({ id: user._id });
+          NotificationManager.Push({
+            html: result.status === 'error' ? result.message : Translate.Render(`success-delete-account`),
+            status: result.status,
+          });
+          s(`.btn-account-delete-confirm`).classList.remove('hide');
+          s(`.btn-account-delete`).classList.add('hide');
+          if (result.status === 'success') {
+            s(`.main-btn-home`).click();
+            await Auth.sessionOut();
+          }
         });
-        if (confirmResult.status === 'cancelled') return;
-        s(`.btn-account-delete-confirm`).classList.add('hide');
-        s(`.btn-account-delete`).classList.remove('hide');
-        s(`.btn-account-delete`).click();
       };
-      EventsUI.onClick(`.btn-account-delete`, async (e) => {
-        e.preventDefault();
-        const result = await UserService.delete({ id: user._id });
-        NotificationManager.Push({
-          html: result.status === 'error' ? result.message : Translate.Render(`success-delete-account`),
-          status: result.status,
-        });
-        s(`.btn-account-delete-confirm`).classList.remove('hide');
-        s(`.btn-account-delete`).classList.add('hide');
-        if (result.status === 'success') {
-          LogOut.Trigger();
-          s(`.main-btn-home`).click();
-        }
-      });
+      await this.instanceModalUiEvents({ user });
     });
     return html`
       <input type="file" accept="${profileFileAccept.join(', ')}" class="account-profile-image-input hide" />
@@ -285,6 +293,18 @@ const Account = {
       if (user.emailConfirmed === true) s(`.account-email`).setAttribute('disabled', '');
     }
   },
+  instanceModalUiEvents: async (user) => null,
+  updateForm: async function (user) {
+    if (!s(`.modal-account`)) return;
+    await this.instanceModalUiEvents({ user });
+    s(`.account-profile-image`).style.opacity = 0;
+    for (const inputData of this.formData)
+      if (s(`.${inputData.id}`)) s(`.${inputData.id}`).value = user[inputData.model];
+    if (LogIn.Scope.user.main.model.user.profileImage) {
+      s(`.account-profile-image`).src = LogIn.Scope.user.main.model.user.profileImage.imageSrc;
+      s(`.account-profile-image`).style.opacity = 1;
+    }
+  },
 };
 
 export { Account };

package/src/client/components/core/Auth.js

@@ -1,7 +1,19 @@
+import { UserMock, UserService } from '../../services/user/user.service.js';
+import { Account } from './Account.js';
+import { loggerFactory } from './Logger.js';
+import { LogIn } from './LogIn.js';
+import { LogOut } from './LogOut.js';
+import { SignUp } from './SignUp.js';
+
+const logger = loggerFactory(import.meta);
+
 const token = Symbol('token');
 
+const guestToken = Symbol('guestToken');
+
 const Auth = {
   [token]: '',
+  [guestToken]: '',
   setToken: function (value = '') {
     return (this[token] = value);
   },
@@ -11,8 +23,89 @@ const Auth = {
   getToken: function () {
     return this[token];
   },
+  setGuestToken: function (value = '') {
+    return (this[guestToken] = value);
+  },
+  deleteGuestToken: function () {
+    return (this[guestToken] = '');
+  },
+  getGuestToken: function () {
+    return this[guestToken];
+  },
+  // jwt
   getJWT: function () {
-    return `Bearer ${this.getToken()}`;
+    return `Bearer ${this.getToken() ? this.getToken() : this.getGuestToken()}`;
+  },
+  signUpToken: async function (
+    result = {
+      data: {
+        token: '',
+        user: null,
+      },
+    },
+  ) {
+    try {
+      localStorage.setItem('jwt', result.data.token);
+      await SignUp.Trigger(result.data);
+      await Auth.sessionIn();
+    } catch (error) {
+      logger.error(error);
+      localStorage.removeItem('jwt');
+    }
+  },
+  sessionIn: async function (userServicePayload) {
+    try {
+      const token = userServicePayload?.data?.token ? userServicePayload.data.token : localStorage.getItem('jwt');
+
+      if (token) {
+        this.setToken(token);
+        const result = userServicePayload
+          ? userServicePayload
+          : await (async () => {
+              const _result = await UserService.get({ id: 'auth' });
+              return {
+                status: _result.status,
+                data: {
+                  user: _result.data,
+                },
+              };
+            })();
+        const { status, data, message } = result;
+        if (status === 'success') {
+          localStorage.setItem('jwt', token);
+          await LogIn.Trigger({ user: data.user });
+          await Account.updateForm(data.user);
+          return { user: data.user };
+        }
+      }
+
+      // anon guest session
+      this.deleteToken();
+      localStorage.removeItem('jwt');
+      let guestToken = localStorage.getItem('jwt.g');
+
+      if (!guestToken) {
+        const result = await UserService.post({ id: 'guest' });
+        localStorage.setItem('jwt.g', result.data.token);
+        guestToken = result.data.token;
+      }
+
+      this.setGuestToken(guestToken);
+      let { data, status, message } = await UserService.get({ id: 'auth' });
+      if (status === 'error') throw new Error(message);
+      await Account.updateForm(data);
+      return { user: data };
+    } catch (error) {
+      logger.error(error);
+      localStorage.removeItem('jwt');
+      localStorage.removeItem('jwt.g');
+      return { user: UserMock.default };
+    }
+  },
+  sessionOut: async function () {
+    this.deleteToken();
+    localStorage.removeItem('jwt');
+    await LogOut.Trigger(await this.sessionIn());
   },
 };
 

package/src/client/components/core/Docs.js

@@ -1,3 +1,4 @@
+import { _VERSION, CoreService } from '../../services/core/core.service.js';
 import { Badge } from './Badge.js';
 import { BtnIcon } from './BtnIcon.js';
 import { rgbToHex } from './CommonJs.js';
@@ -79,7 +80,7 @@ const Docs = {
       icon: html`<i class="fa-brands fa-osi"></i>`,
       text: 'Source Docs',
       url: function () {
-        return `${getProxyPath()}docs/engine/2.7.94`;
+        return `${getProxyPath()}docs/engine/${_VERSION}`;
       },
     },
     {

package/src/client/components/core/JoyStick.js

@@ -24,13 +24,16 @@ const JoyStick = {
             z-index: 3;
           }
           .joy-img-background-${id} {
-            width: 93%;
-            height: 93%;
+            width: 50%;
+            height: 50%;
             opacity: 0.8;
+            transition: 0.1;
           }
-          .dynamic-joystick-container-${id}:hover .joy-img-background-${id} {
-            width: 97%;
-            height: 97%;
+          .dynamic-joystick-container-${id}:hover {
+          }
+          .joy-img-background-${id}:hover {
+            width: 54%;
+            height: 54%;
             opacity: 1;
           }
         </style>

package/src/client/components/core/LogIn.js

@@ -1,6 +1,7 @@
 import { CoreService } from '../../services/core/core.service.js';
 import { FileService } from '../../services/file/file.service.js';
 import { UserService } from '../../services/user/user.service.js';
+import { Auth } from './Auth.js';
 import { BtnIcon } from './BtnIcon.js';
 import { EventsUI } from './EventsUI.js';
 import { Input } from './Input.js';
@@ -102,7 +103,13 @@ const LogIn = {
           if ('model' in inputData) body[inputData.model] = s(`.${inputData.id}`).value;
         }
         const result = await UserService.post({ id: 'auth', body });
-        if (result.status === 'success') this.Trigger(result.data);
+        if (result.status === 'success') {
+          await Auth.sessionIn(result);
+          setTimeout(() => {
+            if (s(`.modal-log-in`)) s(`.btn-close-modal-log-in`).click();
+            if (s(`.modal-sign-up`)) s(`.btn-close-modal-sign-up`).click();
+          });
+        }
         if (result.status === 'error' && result.message.match('attempts')) {
           htmls(`.login-attempt-warn-value`, result.message.split(':')[1]);
           s(`.login-attempt-warn-container`).classList.remove('hide');

package/src/client/components/core/LogOut.js

@@ -1,3 +1,4 @@
+import { Auth } from './Auth.js';
 import { BtnIcon } from './BtnIcon.js';
 import { LogIn } from './LogIn.js';
 import { Translate } from './Translate.js';
@@ -37,9 +38,9 @@ const LogOut = {
   },
   Render: async function () {
     setTimeout(() => {
-      s('.btn-log-out').onclick = (e) => {
+      s('.btn-log-out').onclick = async (e) => {
         e.preventDefault();
-        LogOut.Trigger();
+        await Auth.sessionOut();
       };
     });
     // Translate.Render('confirm-logout')

package/src/client/components/core/Modal.js

@@ -65,12 +65,6 @@ const Modal = {
       options.heightTopBar = options.heightTopBar + options.heightBottomBar;
       options.heightBottomBar = 0;
     }
-    const setCenterRestore = () => {
-      const ResponsiveData = Responsive.getResponsiveData();
-      top = `${ResponsiveData.height / 2 - height / 2}px`;
-      left = `${ResponsiveData.width / 2 - width / 2}px`;
-    };
-    setCenterRestore();
     let transition = `opacity 0.3s, box-shadow 0.3s, bottom 0.3s`;
     const originSlideMenuWidth = 320;
     const collapseSlideMenuWidth = 50;
@@ -87,8 +81,16 @@ const Modal = {
       onObserverListener: {},
       onClickListener: {},
       onExpandUiListener: {},
+      onBarUiOpen: {},
+      onBarUiClose: {},
       query: options.query ? `${window.location.search}` : undefined,
     };
+    const setCenterRestore = () => {
+      const ResponsiveData = Responsive.getResponsiveData();
+      top = `${ResponsiveData.height / 2 - height / 2}px`;
+      left = `${ResponsiveData.width / 2 - width / 2}px`;
+    };
+    if (idModal !== 'main-body') setCenterRestore();
     if (options && 'mode' in options) {
       this.Data[idModal][options.mode] = {};
       switch (options.mode) {
@@ -263,6 +265,7 @@ const Modal = {
                         <i class="fas fa-caret-up main-body-btn-ui-close"></i>
                       </div>
                     </div>
+                    <div class="main-body-btn-container-custom"></div>
                   </div>
                 `,
               );
@@ -286,6 +289,8 @@ const Modal = {
                   s(`.modal-menu`).style.top = '0px';
                   s(`.main-body-btn-container`).style.top = '50px';
                   s(`.main-body`).style.top = '0px';
+                  for (const event of Object.keys(Modal.Data[idModal].onBarUiClose))
+                    Modal.Data[idModal].onBarUiClose[event]();
                 } else {
                   s(`.main-body-btn-ui-close`).classList.remove('hide');
                   s(`.main-body-btn-ui-open`).classList.add('hide');
@@ -296,6 +301,8 @@ const Modal = {
                   s(`.slide-menu-top-bar`).classList.remove('hide');
                   s(`.bottom-bar`).classList.remove('hide');
                   s(`.main-body`).style.top = `${options.heightTopBar}px`;
+                  for (const event of Object.keys(Modal.Data[idModal].onBarUiOpen))
+                    Modal.Data[idModal].onBarUiOpen[event]();
                 }
                 Responsive.Event[`slide-menu-modal-menu`]();
                 Object.keys(this.Data).map((_idModal) => {
@@ -1321,7 +1328,6 @@ const Modal = {
       case 'slide-menu-right':
       case 'slide-menu-left':
         const backMenuButtonEvent = async () => {
-          if (location.pathname !== getProxyPath()) setPath(getProxyPath());
           if (s(`.menu-btn-container-children`)) htmls(`.menu-btn-container-children`, '');
           // htmls(`.nav-title-display-${'modal-menu'}`, html`<i class="fas fa-home"></i> ${Translate.Render('home')}`);
           htmls(`.nav-title-display-${'modal-menu'}`, html``);
@@ -1340,8 +1346,7 @@ const Modal = {
             backMenuButtonEvent();
           }
           s(`.btn-close-modal-menu`).click();
-          if (window.location.pathname !== (getProxyPath() === '/' ? getProxyPath() : `${getProxyPath()}/`))
-            setPath(getProxyPath());
+          setPath(getProxyPath());
           setDocTitle({ ...options.RouterInstance, route: '' });
         };
         EventsUI.onClick(`.btn-icon-menu-back`, backMenuButtonEvent);

package/src/client/components/core/Panel.js

@@ -77,6 +77,7 @@ const Panel = {
       const { id } = obj;
 
       setTimeout(async () => {
+        if (!s(`.${idPanel}`)) return;
         LoadingAnimation.spinner.play(`.${idPanel}-img-spinner-${id}`, 'dual-ring');
         if (options && options.callBackPanelRender)
           await options.callBackPanelRender({
@@ -372,13 +373,26 @@ const Panel = {
         } else {
           Responsive.Event[`${idPanel}-responsive`] = () => {
             if (s(`.${idPanel}-form-container`))
-              s(`.${idPanel}-form-container`).style.maxHeight = `${
-                window.innerHeight - heightTopBar - heightBottomBar
-              }px`;
+              s(`.${idPanel}-form-container`).style.maxHeight =
+                options.route === 'home' &&
+                s(`.${idPanel}-form-body`) &&
+                !s(`.${idPanel}-form-body`).classList.contains('hide') &&
+                !s(`.main-body-btn-ui-open`).classList.contains('hide')
+                  ? `${window.innerHeight}px`
+                  : `${window.innerHeight - heightTopBar - heightBottomBar}px`;
           };
           Responsive.Event[`${idPanel}-responsive`]();
         }
       };
+      if (options.route === 'home') {
+        Modal.Data['modal-menu'].onBarUiClose[`${idPanel}-responsive`] = () => {
+          resizeParentModal();
+        };
+
+        Modal.Data['modal-menu'].onBarUiOpen[`${idPanel}-responsive`] = () => {
+          resizeParentModal();
+        };
+      }
       setTimeout(resizeParentModal);
       if (options.route) {
         RouterEvents[options.parentIdModal] = ({ route }) => {

package/src/client/components/core/PanelForm.js

@@ -113,6 +113,7 @@ const PanelForm = {
         filesData: () => PanelForm.Data[idPanel].filesData,
         scrollClassContainer: options.scrollClassContainer ? options.scrollClassContainer : 'main-body',
         titleIcon,
+        route: options.route,
         formContainerClass: 'session-in-log-in',
         onClick: async function ({ payload }) {
           if (options.route) {
@@ -455,7 +456,13 @@ const PanelForm = {
       });
 
     // if (options.route === 'home') setTimeout(this.Data[idPanel].updatePanel);
-    if (!Auth.getToken()) setTimeout(this.Data[idPanel].updatePanel);
+    setTimeout(() => {
+      if (
+        options.route !== 'home' &&
+        (!PanelForm.Data[idPanel].originData || PanelForm.Data[idPanel].originData.length === 0)
+      )
+        this.Data[idPanel].updatePanel();
+    });
 
     if (options.parentIdModal) {
       htmls(`.html-${options.parentIdModal}`, await renderSrrPanelData());

package/src/client/components/core/SignUp.js

@@ -1,8 +1,8 @@
 import { UserService } from '../../services/user/user.service.js';
+import { Auth } from './Auth.js';
 import { BtnIcon } from './BtnIcon.js';
 import { EventsUI } from './EventsUI.js';
 import { Input } from './Input.js';
-import { LogIn } from './LogIn.js';
 import { NotificationManager } from './NotificationManager.js';
 import { Translate } from './Translate.js';
 import { Validator } from './Validator.js';
@@ -53,8 +53,8 @@ const SignUp = {
           status: result.status,
         });
         if (result.status === 'success') {
-          await this.Trigger(result.data);
-          await LogIn.Trigger(result.data);
+          await Auth.signUpToken(result);
+          s(`.btn-close-${options.idModal}`).click();
         }
       });
       s(`.btn-sign-up-i-have-account`).onclick = () => {