underpost 2.7.1 → 2.7.2

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

@@ -1,77 +1,76 @@
-import { titleFormatted } from './CommonJs.js';
-import { loggerFactory } from './Logger.js';
-import { getProxyPath, getQueryParams, htmls, s, setPath } from './VanillaJs.js';
-
-// Router
-
-const logger = loggerFactory(import.meta);
-
-const setDocTitle = (options = { Routes: () => {}, route: '', NameApp: '' }) => {
-  const { Routes, route, NameApp } = options;
-  let title = titleFormatted(Routes()[`/${route}`].title);
-  if (Routes()[`/${route}`].upperCase) title = title.toUpperCase();
-  htmls('title', html`${title} | ${NameApp}`);
-  {
-    const routeId = route === '' ? 'home' : route;
-    if (s(`.main-btn-${routeId}`)) {
-      if (s(`.main-btn-menu-active`)) s(`.main-btn-menu-active`).classList.remove(`main-btn-menu-active`);
-      if (s(`.main-btn-${routeId}`)) s(`.main-btn-${routeId}`).classList.add(`main-btn-menu-active`);
-    }
-  }
-};
-
-const RouterEvents = {};
-
-const Router = function (options = { Routes: () => {}, e: new PopStateEvent(), NameApp: '' }) {
-  const { e, Routes, NameApp } = options;
-  const proxyPath = getProxyPath();
-  let path = window.location.pathname;
-  logger.info(options);
-
-  for (let route of Object.keys(Routes())) {
-    route = route.slice(1);
-    let pushPath = `${proxyPath}${route}`;
-
-    if (path[path.length - 1] !== '/') path = `${path}/`;
-    if (pushPath[pushPath.length - 1] !== '/') pushPath = `${pushPath}/`;
-
-    const routerEvent = { path, pushPath, route };
-
-    logger.info(routerEvent);
-
-    for (const event of Object.keys(RouterEvents)) RouterEvents[event](routerEvent);
-
-    if (path === pushPath) {
-      setDocTitle({ Routes, route, NameApp });
-      return Routes()[`/${route}`].render();
-    }
-  }
-};
-
-const LoadRouter = function (RouterInstance) {
-  Router(RouterInstance);
-  window.onpopstate = (e) => Router({ ...RouterInstance, e });
-};
-
-const setQueryPath = (options = { path: '', queryPath: '' }, queryKey = 'p') => {
-  const { queryPath, path } = options;
-  const newUri = `${getProxyPath()}${path}${queryPath ? `/?${queryKey}=${queryPath}` : ''}`;
-  const currentUri = `${window.location.pathname}${location.search}`;
-  if (currentUri !== newUri && currentUri !== `${newUri}/`) setPath(newUri);
-};
-
-const listenQueryPathInstance = ({ id, routeId, event }, queryKey = 'p') => {
-  RouterEvents[id] = ({ path, pushPath, proxyPath, route }) => {
-    if (route === routeId) {
-      setTimeout(() => {
-        const path = getQueryParams()[queryKey];
-        if (path) event(path);
-      });
-    }
-  };
-  setTimeout(() => {
-    RouterEvents[id]({ route: routeId });
-  });
-};
-
-export { Router, setDocTitle, LoadRouter, RouterEvents, setQueryPath, listenQueryPathInstance };
+import { titleFormatted } from './CommonJs.js';
+import { loggerFactory } from './Logger.js';
+import { getProxyPath, getQueryParams, htmls, s, setPath } from './VanillaJs.js';
+
+// Router
+
+const logger = loggerFactory(import.meta);
+
+const setDocTitle = (options = { Routes: () => {}, route: '', NameApp: '' }) => {
+  const { Routes, route, NameApp } = options;
+  let title = titleFormatted(Routes()[`/${route}`].title);
+  if (Routes()[`/${route}`].upperCase) title = title.toUpperCase();
+  htmls('title', html`${title} | ${NameApp}`);
+  {
+    const routeId = route === '' ? 'home' : route;
+    if (s(`.main-btn-${routeId}`)) {
+      if (s(`.main-btn-menu-active`)) s(`.main-btn-menu-active`).classList.remove(`main-btn-menu-active`);
+      if (s(`.main-btn-${routeId}`)) s(`.main-btn-${routeId}`).classList.add(`main-btn-menu-active`);
+    }
+  }
+};
+
+const RouterEvents = {};
+
+const Router = function (options = { Routes: () => {}, e: new PopStateEvent(), NameApp: '' }) {
+  const { e, Routes, NameApp } = options;
+  const proxyPath = getProxyPath();
+  let path = window.location.pathname;
+  logger.info(options);
+
+  for (let route of Object.keys(Routes())) {
+    route = route.slice(1);
+    let pushPath = `${proxyPath}${route}`;
+
+    if (path[path.length - 1] !== '/') path = `${path}/`;
+    if (pushPath[pushPath.length - 1] !== '/') pushPath = `${pushPath}/`;
+
+    const routerEvent = { path, pushPath, route };
+
+    if (path === pushPath) {
+      for (const event of Object.keys(RouterEvents)) RouterEvents[event](routerEvent);
+      setDocTitle({ Routes, route, NameApp });
+      return Routes()[`/${route}`].render();
+    }
+  }
+};
+
+const LoadRouter = function (RouterInstance) {
+  Router(RouterInstance);
+  window.onpopstate = (e) => Router({ ...RouterInstance, e });
+};
+
+const setQueryPath = (options = { path: '', queryPath: '' }, queryKey = 'cid') => {
+  const { queryPath, path } = options;
+  const newUri = `${getProxyPath()}${path === 'home' ? '' : `${path}/`}${queryPath ? `?${queryKey}=${queryPath}` : ''}`;
+  const currentUri = `${window.location.pathname}${location.search}`;
+  if (currentUri !== newUri && currentUri !== `${newUri}/`) setPath(newUri);
+};
+
+const listenQueryPathInstance = ({ id, routeId, event }, queryKey = 'cid') => {
+  RouterEvents[id] = ({ path, pushPath, proxyPath, route }) => {
+    if ((route === '' && routeId === 'home') || (route && routeId && route === routeId)) {
+      setTimeout(() => {
+        const path = getQueryParams()[queryKey];
+        if (path) event(path);
+        else event('');
+      });
+    }
+  };
+  if (routeId && routeId !== 'home')
+    setTimeout(() => {
+      RouterEvents[id]({ route: routeId });
+    });
+};
+
+export { Router, setDocTitle, LoadRouter, RouterEvents, setQueryPath, listenQueryPathInstance };

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

@@ -0,0 +1,34 @@
+import { s } from './VanillaJs.js';
+
+const Scroll = {
+  data: {},
+  init: function (selector) {
+    s(selector).addEventListener('scroll', Scroll.scrollHandler);
+    Scroll.data[selector] = {
+      element: s(selector),
+    };
+    return Scroll.data[selector];
+  },
+  getScrollPosition: function (selector) {
+    // Scroll.data[selector].element.clientHeight -
+    return Scroll.data[selector].element.scrollTop;
+  },
+  scrollHandler: async function () {
+    for (const selector in Scroll.data) await Scroll.data[selector].callback(Scroll.getScrollPosition(selector));
+  },
+  addEvent: function (selector = '', callback = () => {}) {
+    Scroll.data[selector].callback = callback;
+  },
+  removeEvent: function (selector) {
+    delete Scroll.data[selector];
+  },
+  to: function (elector = '', options = { top: 100, left: 100, behavior: 'smooth' }) {
+    Scroll.data[selector].element.scrollTo({
+      top: options.top || Scroll.getScrollPosition(selector),
+      left: options.left || 0,
+      behavior: options.behavior || 'smooth',
+    });
+  },
+};
+
+export { Scroll };

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

@@ -1,125 +1,125 @@
-import { UserService } from '../../services/user/user.service.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';
-import { s } from './VanillaJs.js';
-
-const SignUp = {
-  Event: {},
-  Trigger: async function (options) {
-    for (const eventKey of Object.keys(this.Event)) await this.Event[eventKey](options);
-  },
-  Render: async function (options = { bottomRender: async () => '' }) {
-    setTimeout(async () => {
-      const formData = [
-        {
-          model: 'username',
-          id: `sign-up-username`,
-          rules: [{ type: 'isEmpty' }, { type: 'isLength', options: { min: 2, max: 20 } }],
-        },
-        { model: 'email', id: `sign-up-email`, rules: [{ type: 'isEmpty' }, { type: 'isEmail' }] },
-        {
-          model: 'password',
-          id: `sign-up-password`,
-          rules: [{ type: 'isStrongPassword' }],
-        },
-        {
-          id: `sign-up-repeat-password`,
-          rules: [{ type: 'isEmpty' }, { type: 'passwordMismatch', options: `sign-up-password` }],
-        },
-      ];
-      const validators = await Validator.instance(formData);
-
-      EventsUI.onClick(`.btn-sign-up`, async (e) => {
-        e.preventDefault();
-        const { errorMessage } = await validators();
-        if (errorMessage) return;
-        const body = {};
-        for (const inputData of formData) {
-          if ('model' in inputData) body[inputData.model] = s(`.${inputData.id}`).value;
-        }
-        const result = await UserService.post({ body });
-        NotificationManager.Push({
-          html:
-            typeof result.data === 'string'
-              ? result.data
-              : result.status === 'success'
-              ? Translate.Render(`success-register-user`)
-              : Translate.Render(`no-valid-register`),
-          status: result.status,
-        });
-        if (result.status === 'success') {
-          await this.Trigger(result.data);
-          await LogIn.Trigger(result.data);
-        }
-      });
-      s(`.btn-sign-up-i-have-account`).onclick = () => {
-        s(`.main-btn-log-in`).click();
-      };
-    });
-    return html`
-      ${await BtnIcon.Render({
-        class: 'section-mp form-button btn-sign-up-i-have-account',
-        label: html`<i class="fas fa-sign-in-alt"></i> ${Translate.Render('i-have-account')}<br />${Translate.Render(
-            'log-in',
-          )}`,
-        type: 'button',
-      })}
-      <form class="in">
-        <div class="in">
-          ${await Input.Render({
-            id: `sign-up-username`,
-            type: 'text',
-            label: html`<i class="fa-solid fa-pen-to-square"></i> ${Translate.Render('username')}`,
-            containerClass: 'inl section-mp width-mini-box input-container',
-            placeholder: true,
-          })}
-        </div>
-        <div class="in">
-          ${await Input.Render({
-            id: `sign-up-email`,
-            type: 'email',
-            label: html`<i class="fa-solid fa-envelope"></i> ${Translate.Render('email')}`,
-            containerClass: 'inl section-mp width-mini-box input-container',
-            placeholder: true,
-            autocomplete: 'email',
-          })}
-        </div>
-        <div class="in">
-          ${await Input.Render({
-            id: `sign-up-password`,
-            type: 'password',
-            autocomplete: 'new-password',
-            label: html`<i class="fa-solid fa-lock"></i> ${Translate.Render('password')}`,
-            containerClass: 'inl section-mp width-mini-box input-container',
-            placeholder: true,
-          })}
-        </div>
-        <div class="in">
-          ${await Input.Render({
-            id: `sign-up-repeat-password`,
-            type: 'password',
-            autocomplete: 'new-password',
-            label: html`<i class="fa-solid fa-lock"></i> ${Translate.Render('repeat')} ${Translate.Render('password')}`,
-            containerClass: 'inl section-mp width-mini-box input-container',
-            placeholder: true,
-          })}
-        </div>
-        ${options?.bottomRender ? await options.bottomRender() : ``}
-        <div class="in">
-          ${await BtnIcon.Render({
-            class: 'section-mp form-button btn-sign-up',
-            label: Translate.Render('sign-up'),
-            type: 'submit',
-          })}
-        </div>
-      </form>
-    `;
-  },
-};
-
-export { SignUp };
+import { UserService } from '../../services/user/user.service.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';
+import { s } from './VanillaJs.js';
+
+const SignUp = {
+  Event: {},
+  Trigger: async function (options) {
+    for (const eventKey of Object.keys(this.Event)) await this.Event[eventKey](options);
+  },
+  Render: async function (options = { bottomRender: async () => '' }) {
+    setTimeout(async () => {
+      const formData = [
+        {
+          model: 'username',
+          id: `sign-up-username`,
+          rules: [{ type: 'isEmpty' }, { type: 'isLength', options: { min: 2, max: 20 } }],
+        },
+        { model: 'email', id: `sign-up-email`, rules: [{ type: 'isEmpty' }, { type: 'isEmail' }] },
+        {
+          model: 'password',
+          id: `sign-up-password`,
+          rules: [{ type: 'isStrongPassword' }],
+        },
+        {
+          id: `sign-up-repeat-password`,
+          rules: [{ type: 'isEmpty' }, { type: 'passwordMismatch', options: `sign-up-password` }],
+        },
+      ];
+      const validators = await Validator.instance(formData);
+
+      EventsUI.onClick(`.btn-sign-up`, async (e) => {
+        e.preventDefault();
+        const { errorMessage } = await validators();
+        if (errorMessage) return;
+        const body = {};
+        for (const inputData of formData) {
+          if ('model' in inputData) body[inputData.model] = s(`.${inputData.id}`).value;
+        }
+        const result = await UserService.post({ body });
+        NotificationManager.Push({
+          html:
+            typeof result.data === 'string'
+              ? result.data
+              : result.status === 'success'
+              ? Translate.Render(`success-register-user`)
+              : Translate.Render(`no-valid-register`),
+          status: result.status,
+        });
+        if (result.status === 'success') {
+          await this.Trigger(result.data);
+          await LogIn.Trigger(result.data);
+        }
+      });
+      s(`.btn-sign-up-i-have-account`).onclick = () => {
+        s(`.main-btn-log-in`).click();
+      };
+    });
+    return html`
+      ${await BtnIcon.Render({
+        class: 'section-mp form-button btn-sign-up-i-have-account',
+        label: html`<i class="fas fa-sign-in-alt"></i> ${Translate.Render('i-have-account')}<br />${Translate.Render(
+            'log-in',
+          )}`,
+        type: 'button',
+      })}
+      <form class="in">
+        <div class="in">
+          ${await Input.Render({
+            id: `sign-up-username`,
+            type: 'text',
+            label: html`<i class="fa-solid fa-pen-to-square"></i> ${Translate.Render('username')}`,
+            containerClass: 'inl section-mp width-mini-box input-container',
+            placeholder: true,
+          })}
+        </div>
+        <div class="in">
+          ${await Input.Render({
+            id: `sign-up-email`,
+            type: 'email',
+            label: html`<i class="fa-solid fa-envelope"></i> ${Translate.Render('email')}`,
+            containerClass: 'inl section-mp width-mini-box input-container',
+            placeholder: true,
+            autocomplete: 'email',
+          })}
+        </div>
+        <div class="in">
+          ${await Input.Render({
+            id: `sign-up-password`,
+            type: 'password',
+            autocomplete: 'new-password',
+            label: html`<i class="fa-solid fa-lock"></i> ${Translate.Render('password')}`,
+            containerClass: 'inl section-mp width-mini-box input-container',
+            placeholder: true,
+          })}
+        </div>
+        <div class="in">
+          ${await Input.Render({
+            id: `sign-up-repeat-password`,
+            type: 'password',
+            autocomplete: 'new-password',
+            label: html`<i class="fa-solid fa-lock"></i> ${Translate.Render('repeat')} ${Translate.Render('password')}`,
+            containerClass: 'inl section-mp width-mini-box input-container',
+            placeholder: true,
+          })}
+        </div>
+        ${options?.bottomRender ? await options.bottomRender() : ``}
+        <div class="in">
+          ${await BtnIcon.Render({
+            class: 'section-mp form-button btn-sign-up',
+            label: Translate.Render('sign-up'),
+            type: 'submit',
+          })}
+        </div>
+      </form>
+    `;
+  },
+};
+
+export { SignUp };

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

@@ -1,72 +1,72 @@
-import { io } from 'socket.io/client-dist/socket.io.esm.min.js';
-import { loggerFactory } from './Logger.js';
-import { getWsBasePath, getWsBaseUrl } from '../../services/core/core.service.js';
-
-const logger = loggerFactory(import.meta);
-
-const SocketIo = {
-  Event: {
-    connect: {},
-    connect_error: {},
-    disconnect: {},
-  },
-  /** @type {import('socket.io').Socket} */
-  socket: null,
-  Emit: function (channel = '', payload = {}) {
-    try {
-      this.socket.emit(channel, JSON.stringify(payload));
-    } catch (error) {
-      logger.error(error);
-    }
-  },
-  Init: async function (options) {
-    if (this.socket) this.socket.disconnect();
-    this.host = getWsBaseUrl({ wsBasePath: '' });
-    logger.info(`ws host:`, this.host);
-    const path = getWsBasePath();
-    const connectOptions = {
-      path,
-      // auth: {
-      //   token: '',
-      // },
-      // query: {
-      //   'my-key': 'my-value',
-      // },
-      // forceNew: true,
-      // reconnectionAttempts: 'Infinity',
-      // timeout: 10000,
-      transports: ['websocket', 'polling', 'flashsocket'],
-    };
-    // logger.error(`connect options:`, JSON.stringify(connectOptions, null, 4));
-    this.socket = io(this.host, connectOptions);
-
-    this.socket.on('connect', () => {
-      logger.info(`event: connect | session id: ${this.socket.id}`);
-      Object.keys(this.Event.connect).map((keyEvent) => this.Event.connect[keyEvent]());
-    });
-
-    this.socket.on('connect_error', (err) => {
-      logger.info(`event: connect_error | reason: ${err.message}`);
-      Object.keys(this.Event.connect_error).map((keyEvent) => this.Event.connect_error[keyEvent](err));
-    });
-
-    this.socket.on('disconnect', (reason) => {
-      logger.info(`event: disconnect | reason: ${reason}`);
-      Object.keys(this.Event.disconnect).map((keyEvent) => this.Event.disconnect[keyEvent](reason));
-    });
-
-    if (options && 'channels' in options) this.setChannels(options.channels);
-  },
-  setChannels: function (channels) {
-    Object.keys(channels).map((type) => {
-      logger.info(`load chanel`, type);
-      this.Event[type] = {};
-      this.socket.on(type, (...args) => {
-        // logger.info(`event: ${type} | ${JSON.stringify(args, null, 4)}`);
-        Object.keys(this.Event[type]).map((keyEvent) => this.Event[type][keyEvent](args));
-      });
-    });
-  },
-};
-
-export { SocketIo };
+import { io } from 'socket.io/client-dist/socket.io.esm.min.js';
+import { loggerFactory } from './Logger.js';
+import { getWsBasePath, getWsBaseUrl } from '../../services/core/core.service.js';
+
+const logger = loggerFactory(import.meta);
+
+const SocketIo = {
+  Event: {
+    connect: {},
+    connect_error: {},
+    disconnect: {},
+  },
+  /** @type {import('socket.io').Socket} */
+  socket: null,
+  Emit: function (channel = '', payload = {}) {
+    try {
+      this.socket.emit(channel, JSON.stringify(payload));
+    } catch (error) {
+      logger.error(error);
+    }
+  },
+  Init: async function (options) {
+    if (this.socket) this.socket.disconnect();
+    this.host = getWsBaseUrl({ wsBasePath: '' });
+    logger.info(`ws host:`, this.host);
+    const path = getWsBasePath();
+    const connectOptions = {
+      path,
+      // auth: {
+      //   token: '',
+      // },
+      // query: {
+      //   'my-key': 'my-value',
+      // },
+      // forceNew: true,
+      // reconnectionAttempts: 'Infinity',
+      // timeout: 10000,
+      transports: ['websocket', 'polling', 'flashsocket'],
+    };
+    // logger.error(`connect options:`, JSON.stringify(connectOptions, null, 4));
+    this.socket = io(this.host, connectOptions);
+
+    this.socket.on('connect', () => {
+      logger.info(`event: connect | session id: ${this.socket.id}`);
+      Object.keys(this.Event.connect).map((keyEvent) => this.Event.connect[keyEvent]());
+    });
+
+    this.socket.on('connect_error', (err) => {
+      logger.info(`event: connect_error | reason: ${err.message}`);
+      Object.keys(this.Event.connect_error).map((keyEvent) => this.Event.connect_error[keyEvent](err));
+    });
+
+    this.socket.on('disconnect', (reason) => {
+      logger.info(`event: disconnect | reason: ${reason}`);
+      Object.keys(this.Event.disconnect).map((keyEvent) => this.Event.disconnect[keyEvent](reason));
+    });
+
+    if (options && 'channels' in options) this.setChannels(options.channels);
+  },
+  setChannels: function (channels) {
+    Object.keys(channels).map((type) => {
+      logger.info(`load chanel`, type);
+      this.Event[type] = {};
+      this.socket.on(type, (...args) => {
+        // logger.info(`event: ${type} | ${JSON.stringify(args, null, 4)}`);
+        Object.keys(this.Event[type]).map((keyEvent) => this.Event[type][keyEvent](args));
+      });
+    });
+  },
+};
+
+export { SocketIo };