underpost 2.8.0 → 2.8.1

package/.vscode/settings.json

@@ -12,6 +12,7 @@
   "cSpell.words": [
     "ANAME",
     "browserconfig",
+    "Bymyelectrics",
     "certbot",
     "certonly",
     "changefreq",
@@ -77,7 +78,7 @@
   "[xml]": {
     "editor.defaultFormatter": "redhat.vscode-xml"
   },
-  "docwriter.style": "JSDoc",
+  "docwriter.style": "Auto-detect",
   "docwriter.progress.trackFunctions": false,
   "docwriter.progress.trackMethods": false,
   "files.exclude": {

package/bin/deploy.js

@@ -752,22 +752,8 @@ try {
           );
 
         fs.writeFileSync(
-          `./src/client/components/core/Docs.js`,
-          fs
-            .readFileSync(`./src/client/components/core/Docs.js`, 'utf8')
-            .replaceAll(`/engine/${version}`, `/engine/${newVersion}`),
-          'utf8',
-        );
-
-        fs.writeFileSync(
-          `./src/client/ssr/body/CacheControl.js`,
-          fs.readFileSync(`./src/client/ssr/body/CacheControl.js`, 'utf8').replaceAll(`v${version}`, `v${newVersion}`),
-          'utf8',
-        );
-
-        fs.writeFileSync(
-          `./bin/index.js`,
-          fs.readFileSync(`./bin/index.js`, 'utf8').replaceAll(`${version}`, `${newVersion}`),
+          `./src/index.js`,
+          fs.readFileSync(`./src/index.js`, 'utf8').replaceAll(`${version}`, `${newVersion}`),
           'utf8',
         );
 

package/bin/index.js

@@ -6,6 +6,7 @@ import fs from 'fs-extra';
 import { Command } from 'commander';
 import { MongooseDB } from '../src/db/mongo/MongooseDB.js';
 import { loggerFactory, underpostASCI } from '../src/server/logger.js';
+import Underpost from '../src/index.js';
 
 dotenv.config();
 
@@ -19,9 +20,7 @@ const globalBinFolder = `${shellExec(`npm root -g`, {
 
 const program = new Command();
 
-const version = '2.8.0';
-
-program.name('underpost').description(`underpost.net ci/cd cli ${version}`).version(version);
+program.name('underpost').description(`underpost.net ci/cd cli ${Underpost.version}`).version(Underpost.version);
 
 program
   .command('new <app-name>')
@@ -30,7 +29,7 @@ program
     console.log(
       underpostASCI() +
         `
-    v${version} https://www.nexodev.org/docs
+    ${Underpost.version} https://www.nexodev.org/docs
     `,
     );
     await logger.setUpInfo();
@@ -65,7 +64,7 @@ program
     console.log(
       underpostASCI() +
         `
-    v${version} https://www.nexodev.org/docs
+    ${Underpost.version} https://www.nexodev.org/docs
     `,
     );
     shellCd(`${globalBinFolder}`);

package/bin/util.js

@@ -13,6 +13,7 @@ import { network } from '../src/server/network.js';
 import { Config } from '../src/server/conf.js';
 import { FileFactory } from '../src/api/file/file.service.js';
 import { buildTextImg, faBase64Png, getBufferPngText } from '../src/server/client-icons.js';
+import keyword_extractor from 'keyword-extractor';
 
 const httpsAgent = new https.Agent({
   rejectUnauthorized: false,
@@ -203,7 +204,24 @@ try {
       shellExec(`git checkout jsdoc.json`);
       break;
     }
+    case 'get-keys': {
+      const sentence = fs.existsSync('./_')
+        ? fs.readFileSync('./_', 'utf8')
+        : process.argv[3]
+        ? process.argv[3]
+        : 'President Obama woke up Monday facing a Congressional defeat that many in both parties believed could hobble his presidency.';
+
+      //  Extract the keywords
+      const extraction_result = keyword_extractor.extract(sentence, {
+        language: 'english',
+        remove_digits: true,
+        // return_changed_case: true,
+        // remove_duplicates: false,
+      });
 
+      console.log(extraction_result.join(', '));
+      break;
+    }
     default:
       break;
   }

package/conf.js

@@ -3,7 +3,7 @@ const DefaultConf = {
     default: {
       metadata: {
         title: 'Demo App',
-        backgroundImage: './src/client/public/default/assets/background/white0-min.jpg',
+        backgroundImage: 'assets/background/white0-min.jpg',
         description: 'Web application',
         keywords: ['web', 'app', 'spa', 'demo', 'github-pages'],
         author: 'https://github.com/underpostnet',
@@ -193,6 +193,13 @@ const DefaultConf = {
           head: [],
           body: [],
         },
+        {
+          path: '/maintenance',
+          title: 'Server Maintenance',
+          client: 'Maintenance',
+          head: [],
+          body: [],
+        },
       ],
       pages: [
         {

package/docker-compose.yml

@@ -58,7 +58,7 @@ services:
           cpus: '0.25'
           memory: 20M
     labels: # labels in Compose file instead of Dockerfile
-      engine.version: '2.8.0'
+      engine.version: '2.8.1'
     networks:
       - load-balancer
 

package/package.json

@@ -2,7 +2,7 @@
   "type": "module",
   "main": "src/index.js",
   "name": "underpost",
-  "version": "2.8.0",
+  "version": "2.8.1",
   "description": "pwa api rest template",
   "scripts": {
     "start": "env-cmd -f .env.production node --max-old-space-size=8192 src/server",
@@ -55,7 +55,6 @@
     "@fortawesome/fontawesome-free": "^6.4.2",
     "@loadingio/css-spinner": "^2.0.2",
     "@neodrag/vanilla": "^2.0.3",
-    "@xenova/transformers": "^2.17.2",
     "adm-zip": "^0.5.10",
     "ag-grid-community": "31.0.0",
     "axios": "^1.5.1",
@@ -84,24 +83,26 @@
     "html-minifier-terser": "^7.2.0",
     "http-proxy-middleware": "^2.0.6",
     "ignore-walk": "^6.0.4",
+    "iovalkey": "^0.2.1",
     "is-admin": "^4.0.0",
     "is-ip": "^5.0.1",
     "jimp": "^0.22.12",
     "joystick-controller": "^1.0.15",
     "json-colorizer": "^2.2.2",
     "jsonwebtoken": "^9.0.2",
+    "keyword-extractor": "^0.0.28",
     "kill-port-process": "^3.2.0",
     "log-update": "^6.0.0",
     "mariadb": "^3.2.2",
     "marked": "^12.0.2",
-    "mongoose": "^8.0.1",
+    "mongoose": "^8.9.5",
     "morgan": "^1.10.0",
     "nodemailer": "^6.9.9",
     "nodemon": "^3.0.1",
     "pathfinding": "^0.4.18",
     "peer": "^1.0.2",
     "peerjs": "^1.5.2",
-    "pixi.js": "7.4.0",
+    "pixi.js": "7.4.2",
     "prom-client": "^15.1.2",
     "public-ip": "^6.0.1",
     "read": "^2.1.0",
@@ -114,18 +115,19 @@
     "sortablejs": "^1.15.0",
     "split-file": "^2.3.0",
     "swagger-ui-express": "^5.0.0",
-    "systeminformation": "^5.21.17",
+    "systeminformation": "^5.23.7",
     "uglify-js": "^3.17.4",
     "validator": "^13.11.0",
-    "winston": "^3.11.0",
-    "iovalkey": "^0.2.1"
+    "vanilla-jsoneditor": "^2.3.2",
+    "web3": "^4.13.0",
+    "winston": "^3.11.0"
   },
   "devDependencies": {
     "clean-jsdoc-theme": "^4.3.0",
+    "easy-json-schema": "^0.0.2-beta",
     "mocha": "^10.4.0",
     "plantuml": "^0.0.2",
-    "swagger-autogen": "^2.23.7",
-    "easy-json-schema": "^0.0.2-beta"
+    "swagger-autogen": "^2.23.7"
   },
   "publishConfig": {
     "provenance": true,

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

@@ -300,8 +300,10 @@ const Account = {
     s(`.account-profile-image`).style.opacity = 0;
     for (const inputData of this.formData)
       if (s(`.${inputData.id}`)) s(`.${inputData.id}`).value = user[inputData.model];
-    s(`.account-profile-image`).src = LogIn.Scope.user.main.model.user.profileImage.imageSrc;
-    s(`.account-profile-image`).style.opacity = 1;
+    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;
+    }
   },
 };
 

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

@@ -46,8 +46,8 @@ const Auth = {
   ) {
     try {
       localStorage.setItem('jwt', result.data.token);
-      await Auth.sessionIn();
       await SignUp.Trigger(result.data);
+      await Auth.sessionIn();
     } catch (error) {
       logger.error(error);
       localStorage.removeItem('jwt');
@@ -76,7 +76,7 @@ const Auth = {
           await LogIn.Trigger({ user: data.user });
           await Account.updateForm(data.user);
           return { user: data.user };
-        } else throw new Error(message);
+        }
       }
 
       // anon guest session

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

@@ -344,7 +344,7 @@ const renderBubbleDialog = async function (
   }
   if (options.trianglePositionCss) cssTrianglePosition = options.trianglePositionCss;
   return html` <div
-    class="${options?.classSelectors ? options.classSelectors : 'in'} bubble-dialog bubble-dialog-${id}"
+    class="${options?.classSelectors ? options.classSelectors : 'inl'} bubble-dialog bubble-dialog-${id}"
     ${options.bubbleCss ? `style='${options.bubbleCss}'` : ''}
   >
     <style class="style-bubble-dialog-triangle-${id}">

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.8.0`;
+        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/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;
@@ -91,6 +85,12 @@ const Modal = {
       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) {
@@ -265,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>
                 `,
               );

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({

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

@@ -456,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

@@ -52,7 +52,10 @@ const SignUp = {
               : Translate.Render(`no-valid-register`),
           status: result.status,
         });
-        if (result.status === 'success') await Auth.signUpToken(result);
+        if (result.status === 'success') {
+          await Auth.signUpToken(result);
+          s(`.btn-close-${options.idModal}`).click();
+        }
       });
       s(`.btn-sign-up-i-have-account`).onclick = () => {
         s(`.main-btn-log-in`).click();

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

@@ -460,6 +460,20 @@ const TranslateCore = {
       es: 'Carga completada',
     };
     Translate.Data['play'] = { es: 'Jugar', en: 'Play' };
+    Translate.Data['pause'] = { es: 'Pausar', en: 'Pause' };
+    Translate.Data['stop'] = { es: 'Parar', en: 'Stop' };
+    Translate.Data['previous'] = { es: 'Anterior', en: 'Previous' };
+    Translate.Data['next'] = { es: 'Siguiente', en: 'Next' };
+    Translate.Data['buy'] = { es: 'comprar', en: 'Buy' };
+    Translate.Data['sell'] = { es: 'Vender', en: 'sell' };
+
+    Translate.Data['monday'] = { es: 'Lunes', en: 'Monday' };
+    Translate.Data['tuesday'] = { es: 'Martes', en: 'Tuesday' };
+    Translate.Data['wednesday'] = { es: 'Miércoles', en: 'Wednesday' };
+    Translate.Data['thursday'] = { es: 'Jueves', en: 'Thursday' };
+    Translate.Data['friday'] = { es: 'Viernes', en: 'Friday' };
+    Translate.Data['saturday'] = { es: 'Sábado', en: 'Saturday' };
+    Translate.Data['sunday'] = { es: 'Domingo', en: 'Sunday' };
   },
 };