underpost 2.8.85 → 2.8.87

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

@@ -67,7 +67,7 @@ const ToggleSwitch = {
 
     if (options.type === 'checkbox') {
     }
-    return html`
+    const htmlRender = html`
       ${options?.displayMode === 'checkbox'
         ? html`<div class="${options?.containerClass ? options.containerClass : 'inl box-content-border'} ${id}">
             <div class="in ${id}-content toggle-switch-content-checkbox">
@@ -81,6 +81,20 @@ const ToggleSwitch = {
           </div>`}
       <input type="checkbox" class="${id}-checkbox" style="display: none" />
     `;
+    if (options.wrapper) {
+      setTimeout(() => (s(`.toggle-form-container-${id}`).onclick = () => ToggleSwitch.Tokens[`${id}`].click()));
+      return html`
+        <div class="in toggle-form-container toggle-form-container-${id} hover">
+          <div class="fl ">
+            <div class="in fll" style="width: 70%">
+              <div class="in">${options.wrapperLabel}</div>
+            </div>
+            <div class="in fll" style="width: 30%">${htmlRender}</div>
+          </div>
+        </div>
+      `;
+    }
+    return htmlRender;
   },
 };
 

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

@@ -147,8 +147,40 @@ const pasteData = () => new Promise((resolve) => navigator.clipboard.readText().
  * @memberof VanillaJS
  */
 const setPath = (path = '/', stateStorage = {}, title = '') => {
-  if (window.location.pathname === path || window.location.pathname === `${path}/`) return;
-  return history.pushState(stateStorage, title, path);
+  if (!path) path = '/';
+
+  const [inputPath, inputSearch] = `${path}`.split('?');
+
+  let sanitizedPath = (inputPath[0] !== '/' ? `/${inputPath}` : inputPath)
+    .trim()
+    .replaceAll('//', '/')
+    .replaceAll(`\\`, '/');
+
+  if (sanitizedPath.length > 1 && sanitizedPath[sanitizedPath.length - 1] === '/')
+    sanitizedPath = sanitizedPath.slice(0, -1);
+
+  if (window.location.pathname === sanitizedPath && (!inputSearch || inputSearch === location.search)) {
+    console.warn('Prevent overwriting same path', {
+      inputPath: inputPath,
+      inputSearch: inputSearch,
+      sanitizedPath: sanitizedPath,
+      currentLocationSearch: location.search,
+      currentLocationHash: location.hash,
+    });
+    return;
+  }
+  console.warn('Set path', {
+    inputPath: inputPath,
+    inputSearch: inputSearch,
+    sanitizedPath: sanitizedPath,
+    currentLocationSearch: location.search,
+    currentLocationHash: location.hash,
+  });
+  return history.pushState(
+    stateStorage,
+    title,
+    `${sanitizedPath}${inputSearch ? `?${inputSearch}` : ''}${location.hash ?? ''}`,
+  );
 };
 
 /**
@@ -425,6 +457,19 @@ const getLang = () =>
     .slice(0, 2)
     .toLowerCase();
 
+function hexToRgbA(hex) {
+  let c;
+  if (/^#([A-Fa-f0-9]{3}){1,2}$/.test(hex)) {
+    c = hex.substring(1).split('');
+    if (c.length == 3) {
+      c = [c[0], c[0], c[1], c[1], c[2], c[2]];
+    }
+    c = '0x' + c.join('');
+    return [(c >> 16) & 255, (c >> 8) & 255, c & 255];
+  }
+  throw new Error('Invalid Hex');
+}
+
 export {
   s,
   htmls,
@@ -454,4 +499,5 @@ export {
   isDevInstance,
   getDataFromInputFile,
   getLang,
+  hexToRgbA,
 };

package/src/client/components/default/MenuDefault.js

@@ -35,7 +35,7 @@ const MenuDefault = {
     const id = getId(this.Data, 'menu-');
     this.Data[id] = {};
     const RouterInstance = RouterDefault();
-    const { NameApp } = RouterInstance;
+    const { BannerAppTemplate } = RouterInstance;
     const { barConfig } = await Themes[Css.currentTheme]();
     const heightTopBar = 50;
     const heightBottomBar = 50;
@@ -162,7 +162,7 @@ const MenuDefault = {
         </div>
       `,
       barConfig: newInstance(barConfig),
-      title: NameApp,
+      title: BannerAppTemplate,
       // titleClass: 'hide',
       titleRender: () => {
         ThemeEvents['titleRender'] = () => {

package/src/client/components/default/RoutesDefault.js

@@ -4,7 +4,7 @@ import { getProxyPath, s } from '../core/VanillaJs.js';
 
 const logger = loggerFactory(import.meta);
 
-const NameApp = html`<strong class="inl" style="font-family: system-ui">PWA</strong>`;
+const BannerAppTemplate = html`<strong class="inl" style="font-family: system-ui">PWA</strong>`;
 
 // Router
 const RoutesDefault = () => {
@@ -39,7 +39,7 @@ const RoutesDefault = () => {
 window.Routes = RoutesDefault;
 
 const RouterDefault = () => {
-  return { Routes: RoutesDefault, NameApp };
+  return { Routes: RoutesDefault, BannerAppTemplate };
 };
 
-export { RoutesDefault, RouterDefault, NameApp };
+export { RoutesDefault, RouterDefault, BannerAppTemplate };

package/src/index.js

@@ -35,7 +35,7 @@ class Underpost {
    * @type {String}
    * @memberof Underpost
    */
-  static version = 'v2.8.85';
+  static version = 'v2.8.87';
   /**
    * Repository cli API
    * @static

package/src/mailer/MailerProvider.js

@@ -48,6 +48,43 @@ const MailerProvider = {
         ...options,
         transporter,
         templates: await EmailRender.getTemplates(options),
+        translateTemplates: {
+          confirmEmail: {
+            H1: {
+              en: 'Confirm Your Email',
+              es: 'Confirma tu correo electrónico',
+            },
+            P1: {
+              en: `Email confirmed! Thanks.
+               <br />
+             <span style="font-size: 12px; color: gray"> 
+                If it is not automatically verified, 
+                please allow the image to be seen, thank you.
+             </span>
+              `,
+              es: `Correo electrónico confirmado! Gracias.
+              <br />
+              <span style="font-size: 12px; color: gray"> 
+               Si no se verifica automáticamente, por favor permita que se vea la imagen, gracias.
+              </span>
+              `,
+            },
+          },
+          recoverEmail: {
+            H1: {
+              en: 'Recover your account',
+              es: 'Recupera tu cuenta',
+            },
+            P1: {
+              en: 'To recover your account, please click the button below:',
+              es: 'Para recuperar tu cuenta, haz click en el botón de abajo:',
+            },
+            BTN_LABEL: {
+              en: 'Recover Password',
+              es: 'Recuperar Contraseña',
+            },
+          },
+        },
       };
 
       return this.instance[id];

package/src/server/client-build-docs.js

@@ -159,7 +159,7 @@ const buildCoverage = async ({ host, path }) => {
     shellExec(`npm test`);
   }
 
-  const coverageBuildPath = `${jsDocsConfig.opts.destination}/coverage`;
+  const coverageBuildPath = `${jsDocsConfig.opts.destination}coverage`;
   fs.mkdirSync(coverageBuildPath, { recursive: true });
   fs.copySync(`./coverage`, coverageBuildPath);
 

package/src/server/client-build-live.js

@@ -59,7 +59,7 @@ const clientLiveBuild = async () => {
     const updates = JSON.parse(fs.readFileSync(`./tmp/client.build.json`, 'utf8'));
     const liveClientBuildPaths = [];
     for (let srcPath of updates) {
-      srcPath = srcPath.replaceAll('/', `\\`); // linux case
+      srcPath = srcPath.replaceAll('/', `\\`);
 
       const srcBuildPath = `./src${srcPath.split('src')[1].replace(/\\/g, '/')}`;
       if (

package/src/server/client-build.js

@@ -19,7 +19,7 @@ import * as dir from 'path';
 import { shellExec } from './process.js';
 import { SitemapStream, streamToPromise } from 'sitemap';
 import { Readable } from 'stream';
-import { buildIcons, buildTextImg, getBufferPngText } from './client-icons.js';
+import { buildIcons } from './client-icons.js';
 import Underpost from '../index.js';
 import { buildDocs } from './client-build-docs.js';
 
@@ -65,16 +65,8 @@ const fullBuild = async ({
   fs.removeSync(rootClientPath);
 
   if (fs.existsSync(`./src/client/public/${publicClientId}`)) {
-    if (iconsBuild) {
-      const defaultBaseIconFolderPath = `src/client/public/${publicClientId}/assets/logo`;
-      if (!fs.existsSync(defaultBaseIconFolderPath)) fs.mkdirSync(defaultBaseIconFolderPath, { recursive: true });
-      const defaultBaseIconPath = `${defaultBaseIconFolderPath}/base-icon.png`;
-      if (!fs.existsSync(defaultBaseIconPath))
-        await buildTextImg(metadata.title, { debugFilename: defaultBaseIconPath });
-
-      if (!fs.existsSync(`./src/client/public/${publicClientId}/site.webmanifest`))
-        await buildIcons({ publicClientId, metadata });
-    }
+    if (iconsBuild === true) await buildIcons({ publicClientId, metadata });
+
     fs.copySync(
       `./src/client/public/${publicClientId}`,
       rootClientPath /* {
@@ -535,7 +527,7 @@ Sitemap: https://${host}${path === '/' ? '' : path}/sitemap.xml`,
         );
       }
 
-      if (!enableLiveRebuild && !process.argv.includes('l') && !process.argv.includes('deploy') && docsBuild) {
+      if (fullBuildEnabled && !enableLiveRebuild && !process.argv.includes('l') && docsBuild) {
         await buildDocs({
           host,
           path,

package/src/server/client-dev-server.js

@@ -7,7 +7,7 @@ const logger = loggerFactory(import.meta);
 
 const createClientDevServer = () => {
   // process.argv.slice(2).join(' ')
-  shellExec(`env-cmd -f .env.development node bin/deploy build-full-client ${process.argv.slice(2).join(' ')} l`);
+  shellExec(`env-cmd -f .env.development node bin/deploy build-full-client ${process.argv.slice(2).join(' ')}`);
   shellExec(
     `env-cmd -f .env.development node src/api ${process.argv[2]}${process.argv[5] ? ` ${process.argv[5]}` : ''}${
       process.argv.includes('static') ? ' static' : ''

package/src/server/client-icons.js

@@ -1,80 +1,17 @@
 import { favicons } from 'favicons';
-// TODO: search alternatives
-// import textToImage from 'text-to-image';
 import { loggerFactory } from './logger.js';
 import fs from 'fs-extra';
-import { getCapVariableName, s4 } from '../client/components/core/CommonJs.js';
-import { FileFactory } from '../api/file/file.service.js';
-import { svg, png, png3x } from 'font-awesome-assets';
+import { getCapVariableName } from '../client/components/core/CommonJs.js';
 
 const logger = loggerFactory(import.meta);
 
-const faBase64Png = (faId = 'check', width = 100, height = 100, color = '#209e00') => {
-  const b64Src = png3x(faId, color, width, height);
-  return b64Src.split('src="data:image/png;base64,')[1].split('"')[0];
-};
-
-const defaultBaseTextImgOptions = {
-  debug: true,
-  fontFamily: 'Arial',
-  fontWeight: 'bold',
-  bgColor: 'black',
-  textColor: 'white',
-  debugFilename: 'src/client/public/text-image.png',
-  verticalAlign: 'center',
-  textAlign: 'center',
-};
-
-const defaultBaseTextImgOptionsSizes = {
-  '70x70': {
-    maxWidth: 70,
-    customHeight: 70,
-    fontSize: 25,
-    margin: 10,
-  },
-  '100x100': {
-    maxWidth: 100,
-    customHeight: 100,
-    fontSize: 30,
-    margin: 12,
-  },
-  '100x300': {
-    maxWidth: 300,
-    customHeight: 100,
-    fontSize: 30,
-    margin: 12,
-  },
-  '1200x1200': {
-    maxWidth: 1200,
-    customHeight: 1200,
-    fontSize: 500,
-    margin: 50,
-  },
-};
-
-const buildTextImg = async (text = 'APP', options, size = '1200x1200') => {
-  options = { ...defaultBaseTextImgOptions, ...defaultBaseTextImgOptionsSizes[size], ...options };
-  // await textToImage.generate(text, options);
-};
-
-const getBufferPngText = async ({ text, textColor, bgColor, size, debugFilename }) => {
-  if (!text) text = 'Hello World!';
-  if (!textColor) textColor = '#000000';
-  if (!bgColor) bgColor = '#ffffff';
-  if (!size) size = '100x300';
-  if (!debugFilename) debugFilename = `./${s4()}${s4()}${s4()}.png`;
-  await buildTextImg(text, { textColor, bgColor, size, debugFilename }, size);
-  if (!fs.existsSync(debugFilename)) return Buffer.alloc(0); // Return empty buffer if file not found
-  const bufferImage = fs.readFileSync(debugFilename);
-  fs.removeSync(debugFilename);
-  return bufferImage;
-};
-
 const buildIcons = async ({
   publicClientId,
-  metadata: { title, description, keywords, author, thumbnail, themeColor },
+  metadata: { title, description, keywords, author, thumbnail, themeColor, baseBuildIconReference },
 }) => {
-  const source = `src/client/public/${publicClientId}/assets/logo/base-icon.png`; // Source image(s). `string`, `buffer` or array of `string`
+  const source = baseBuildIconReference
+    ? baseBuildIconReference
+    : `src/client/public/${publicClientId}/assets/logo/base-icon.png`; // Source image(s). `string`, `buffer` or array of `string`
 
   const configuration = {
     path: '/', // Path for overriding default icons path. `string`
@@ -149,13 +86,4 @@ const buildIcons = async ({
   }
 };
 
-const getDefaultProfileImageId = async (File) => {
-  const faId = 'user';
-  const tmpFilePath = `./tmp/${faId}-${s4() + s4()}.svg`;
-  fs.writeFileSync(tmpFilePath, svg(faId, '#f5f5f5d1'), 'utf8');
-  const file = await new File(FileFactory.svg(fs.readFileSync(tmpFilePath), `${faId}.svg`)).save();
-  fs.removeSync(tmpFilePath);
-  return file._id;
-};
-
-export { buildIcons, buildTextImg, defaultBaseTextImgOptions, faBase64Png, getBufferPngText, getDefaultProfileImageId };
+export { buildIcons };