@opengis/admin 0.1.75 → 0.1.77

package/package.json

@@ -1,82 +1,82 @@
-{
-  "name": "@opengis/admin",
-  "version": "0.1.75",
-  "description": "This project Softpro Admin",
-  "main": "dist/admin.js",
-  "type": "module",
-  "directories": {
-    "test": "test"
-  },
-  "files": [
-    "dist/*",
-    "module/*",
-    "server/*",
-    "plugin.js",
-    "utils.js",
-    "config.js"
-  ],
-  "scripts": {
-    "test": "node --test test/**/*.test.js",
-    "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore",
-    "build": "vite build",
-    "build-app": "cross-env APP=true vite build",
-    "admin": "cross-env NODE_ENV=admin npm run start",
-    "prod": "cross-env NODE_ENV=production npm run start",
-    "start": "node --watch-path=server server vite ",
-    "docs:dev": "vitepress dev docs",
-    "docs:build": "vitepress build docs",
-    "docs:preview": "vitepress preview docs"
-  },
-  "keywords": [],
-  "author": "Softpro",
-  "license": "ISC",
-  "dependencies": {
-    "@fancyapps/ui": "^5.0.36",
-    "@opengis/admin": "^0.1.69",
-    "@opengis/fastify-auth": "^1.0.41",
-    "@opengis/fastify-file": "^1.0.17",
-    "@opengis/fastify-table": "^1.1.51",
-    "@opengis/v3-core": "^0.2.36",
-    "@opengis/v3-filter": "^0.0.39",
-    "@tiptap/core": "^2.8.0",
-    "@tiptap/extension-color": "^2.8.0",
-    "@tiptap/extension-mention": "^2.8.0",
-    "@tiptap/extension-placeholder": "^2.8.0",
-    "@tiptap/extension-text": "^2.8.0",
-    "@tiptap/extension-text-style": "^2.8.0",
-    "@tiptap/extension-underline": "^2.8.0",
-    "@tiptap/pm": "^2.8.0",
-    "@tiptap/starter-kit": "^2.8.0",
-    "@tiptap/suggestion": "^2.8.0",
-    "@tiptap/vue-3": "^2.8.0",
-    "@turf/turf": "^7.1.0",
-    "@vitejs/plugin-vue": "^5.0.4",
-    "close-with-grace": "^1.3.0",
-    "cross-env": "^7.0.3",
-    "fastify": "^4.26.1",
-    "fastify-plugin": "^4.0.0",
-    "maplibre-gl": "^4.7.0",
-    "moment": "^2.30.1",
-    "vite": "^5.1.4",
-    "vue": "^3.4.21",
-    "vue-router": "^4.3.0"
-  },
-  "devDependencies": {
-    "@panzoom/panzoom": "^4.5.1",
-    "@vue/eslint-config-typescript": "^12.0.0",
-    "autoprefixer": "^10.4.20",
-    "eslint": "^8.49.0",
-    "eslint-config-airbnb": "^19.0.4",
-    "eslint-plugin-import": "^2.25.3",
-    "eslint-plugin-vue": "^9.17.0",
-    "markdown-it-abbr": "^2.0.0",
-    "mermaid": "^10.9.0",
-    "postcss": "^8.4.47",
-    "sass-embedded": "^1.79.1",
-    "tailwindcss": "^3.4.13",
-    "vitepress": "^1.1.3",
-    "vitepress-plugin-mermaid": "^2.0.16",
-    "vitepress-plugin-tabs": "^0.5.0",
-    "vitepress-sidebar": "^1.22.0"
-  }
-}
+{
+  "name": "@opengis/admin",
+  "version": "0.1.77",
+  "description": "This project Softpro Admin",
+  "main": "dist/admin.js",
+  "type": "module",
+  "directories": {
+    "test": "test"
+  },
+  "files": [
+    "dist/*",
+    "module/*",
+    "server/*",
+    "plugin.js",
+    "utils.js",
+    "config.js"
+  ],
+  "scripts": {
+    "test": "node --test test/**/*.test.js",
+    "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore",
+    "build": "vite build",
+    "build-app": "cross-env APP=true vite build",
+    "admin": "cross-env NODE_ENV=admin npm run start",
+    "prod": "cross-env NODE_ENV=production npm run start",
+    "start": "node --watch-path=server server vite ",
+    "docs:dev": "vitepress dev docs",
+    "docs:build": "vitepress build docs",
+    "docs:preview": "vitepress preview docs"
+  },
+  "keywords": [],
+  "author": "Softpro",
+  "license": "ISC",
+  "dependencies": {
+    "@fancyapps/ui": "^5.0.36",
+    "@opengis/admin": "^0.1.69",
+    "@opengis/fastify-auth": "^1.0.44",
+    "@opengis/fastify-file": "^1.0.27",
+    "@opengis/fastify-table": "^1.1.58",
+    "@opengis/v3-core": "^0.2.36",
+    "@opengis/v3-filter": "^0.0.39",
+    "@tiptap/core": "^2.8.0",
+    "@tiptap/extension-color": "^2.8.0",
+    "@tiptap/extension-mention": "^2.8.0",
+    "@tiptap/extension-placeholder": "^2.8.0",
+    "@tiptap/extension-text": "^2.8.0",
+    "@tiptap/extension-text-style": "^2.8.0",
+    "@tiptap/extension-underline": "^2.8.0",
+    "@tiptap/pm": "^2.8.0",
+    "@tiptap/starter-kit": "^2.8.0",
+    "@tiptap/suggestion": "^2.8.0",
+    "@tiptap/vue-3": "^2.8.0",
+    "@turf/turf": "^7.1.0",
+    "@vitejs/plugin-vue": "^5.0.4",
+    "close-with-grace": "^1.3.0",
+    "cross-env": "^7.0.3",
+    "fastify": "^4.26.1",
+    "fastify-plugin": "^4.0.0",
+    "maplibre-gl": "^4.7.0",
+    "moment": "^2.30.1",
+    "vite": "^5.1.4",
+    "vue": "^3.4.21",
+    "vue-router": "^4.3.0"
+  },
+  "devDependencies": {
+    "@panzoom/panzoom": "^4.5.1",
+    "@vue/eslint-config-typescript": "^12.0.0",
+    "autoprefixer": "^10.4.20",
+    "eslint": "^8.49.0",
+    "eslint-config-airbnb": "^19.0.4",
+    "eslint-plugin-import": "^2.25.3",
+    "eslint-plugin-vue": "^9.17.0",
+    "markdown-it-abbr": "^2.0.0",
+    "mermaid": "^10.9.0",
+    "postcss": "^8.4.47",
+    "sass-embedded": "^1.79.1",
+    "tailwindcss": "^3.4.13",
+    "vitepress": "^1.1.3",
+    "vitepress-plugin-mermaid": "^2.0.16",
+    "vitepress-plugin-tabs": "^0.5.0",
+    "vitepress-sidebar": "^1.22.0"
+  }
+}

package/plugin.js

@@ -1,25 +1,28 @@
-import fp from 'fastify-plugin';
-
-import config from './config.js';
-
-config.prefix = config.prefix || '/api';
-
-async function plugin(fastify, opts = config) {
-  // const prefix = config.prefix || '/api';
-
-  fastify.register(import('./server/helpers/index.mjs'), opts);
-  // fastify.register(import('@opengis/fastify-auth'), config);
-
-  fastify.register(import('./server/plugins/cron.js'), opts); // cron / scheduler
-  fastify.register(import('./server/plugins/hook.js'), opts); // data / template hooks
-
-  // API
-  fastify.register(import('./server/routes/properties/index.mjs'), opts);
-  fastify.register(import('./server/routes/calendar/index.mjs'), opts);
-  fastify.register(import('./server/routes/notifications/index.mjs'), opts);
-  fastify.register(import('./server/routes/templates/index.mjs'), opts);
-  fastify.register(import('./server/routes/menu/index.mjs'), opts);
-  fastify.register(import('./server/routes/data/index.mjs'), opts);
-
-}
+import fp from 'fastify-plugin';
+
+import config from './config.js';
+
+config.prefix = config.prefix || '/api';
+
+async function plugin(fastify, opts = config) {
+  // const prefix = config.prefix || '/api';
+
+  fastify.register(import('./server/helpers/index.mjs'), opts);
+  // fastify.register(import('@opengis/fastify-auth'), config);
+
+  fastify.register(import('./server/plugins/cron.js'), opts); // cron / scheduler
+  fastify.register(import('./server/plugins/hook.js'), opts); // data / template hooks
+
+  // API
+  fastify.register(import('./server/routes/properties/index.mjs'), opts);
+  fastify.register(import('./server/routes/calendar/index.mjs'), opts);
+  fastify.register(import('./server/routes/notifications/index.mjs'), opts);
+  fastify.register(import('./server/routes/templates/index.mjs'), opts);
+  fastify.register(import('./server/routes/menu/index.mjs'), opts);
+  fastify.register(import('./server/routes/data/index.mjs'), opts);
+
+  fastify.register(import('./server/routes/user/index.mjs'), opts);
+  fastify.register(import('./server/routes/widget/index.mjs'), opts);
+
+}
 export default fp(plugin)

package/server/helpers/controllers/badge.js

@@ -1,12 +1,12 @@
-export default async function badge(data, options = {}) {
-    if (!data) return '-';
-    //const cls = await getSelect(options.data, { val: data, full: 1 });
-
-    return data;
-    /*const html = cls?.map((el) => {
-        const color = bscolor[el.color] || el.color || '#aaa';
-        return `<span class="el-tag el-tag--mini" style="color:${color || '#aaa'};border-color:${color || '#aaa'};background:unset;">
-        ${funcs.locale(el.id, { lang: root.lang, prefix: opt.data, type: 'cls' }) || el.text}</span>`;
-    }).join(', ');
-    return html;*/
+export default async function badge(data, options = {}) {
+    if (!data) return '-';
+    //const cls = await getSelect(options.data, { val: data, full: 1 });
+
+    return data;
+    /*const html = cls?.map((el) => {
+        const color = bscolor[el.color] || el.color || '#aaa';
+        return `<span class="el-tag el-tag--mini" style="color:${color || '#aaa'};border-color:${color || '#aaa'};background:unset;">
+        ${funcs.locale(el.id, { lang: root.lang, prefix: opt.data, type: 'cls' }) || el.text}</span>`;
+    }).join(', ');
+    return html;*/
 }

package/server/helpers/controllers/hb.js

@@ -1,3 +1,3 @@
-export default async function _hb() {
-    return '';
+export default async function _hb() {
+    return '';
 }

package/server/helpers/controllers/map.js

@@ -1,3 +1,3 @@
-export default async function map() {
-    return '';
+export default async function map() {
+    return '';
 }

package/server/helpers/controllers/mls.js

@@ -1,3 +1,3 @@
-export default async function _mls(data, options={}) {
-    return data.hash?.ua || options?.hash?.ua || '';
+export default async function _mls(data, options={}) {
+    return data.hash?.ua || options?.hash?.ua || '';
 }

package/server/helpers/controllers/vue.js

@@ -1,3 +1,3 @@
-export default async function _vue() {
-    return '';
+export default async function _vue() {
+    return '';
 }

package/server/helpers/index.mjs

@@ -1,13 +1,15 @@
-import _hb from "./controllers/hb.js";
-import _vue from "./controllers/vue.js";
-import map from "./controllers/map.js";
-import _mls from "./controllers/mls.js";
-import badge from "./controllers/badge.js";
-
-export default async function route(fastify) {
-    fastify.handlebars.registerHelper('_hb', _hb);
-    fastify.handlebars.registerHelper('_vue', _vue);
-    fastify.handlebars.registerHelper('map', map);
-    fastify.handlebars.registerHelper('mls', _mls);
-    fastify.handlebars.registerHelper('badge', badge);
-}
+import _hb from "./controllers/hb.js";
+import _vue from "./controllers/vue.js";
+import map from "./controllers/map.js";
+import _mls from "./controllers/mls.js";
+import badge from "./controllers/badge.js";
+
+import { handlebars } from "@opengis/fastify-table/utils.js";
+
+export default async function route(fastify) {
+    handlebars.registerHelper('_hb', _hb);
+    handlebars.registerHelper('_vue', _vue);
+    handlebars.registerHelper('map', map);
+    handlebars.registerHelper('mls', _mls);
+    handlebars.registerHelper('badge', badge);
+}

package/server/plugins/adminHook.js

@@ -1,93 +1,93 @@
-import fp from 'fastify-plugin';
-import fs from 'node:fs';
-import path from 'node:path';
-
-import { getTemplatePath, getTemplate, pgClients } from '@opengis/fastify-table/utils.js';
-
-import getMenu from '../routes/menu/controllers/getMenu.js';
-
-import config from '../../config.js';
-
-// to export the decorators to the outer scope
-
-async function plugin(fastify) {
-  fastify.decorate('config', config);
-
-  // pre Request
-  fastify.addHook('onRequest', async (req) => {
-    req.funcs = fastify;
-    const { user } = req.session?.passport || {};
-    req.user = user;
-  });
-
-  // preSerialization
-  fastify.addHook('preSerialization', async (req, reply, payload) => {
-    if (req.url.includes('/suggest/') && !req.query.json) {
-      return payload?.data;
-    }
-    if (payload?.redirect) {
-      return reply.redirect(payload.redirect);
-    }
-    if (reply.sent) {
-      return null;
-    }
-
-    if (['200', '400', '500', '403', '404'].includes(payload?.status)) {
-      reply.status(payload.status);
-    }
-    /* if (payload.headers) {
-      reply.headers(payload.headers);
-    } */
-    if (payload?.buffer) {
-      return payload.buffer;
-    }
-    if (payload?.file) {
-      // const buffer = await readFile(payload.file);
-      // return reply.send(buffer);
-      const stream = fs.createReadStream(payload.file);
-      return stream;
-      // return reply.send(stream);
-    }
-
-    if (payload?.message) {
-      return payload.message;
-    }
-    return payload;
-  });
-
-  //  preValidation
-  fastify.addHook('preValidation', async (req) => {
-    const parseRawBody = ['POST', 'PUT'].includes(req.method) && req.body && typeof req.body === 'string'
-      && req.body.trim(/\r\n/g).startsWith('{')
-      && req.body.trim(/\r\n/g).endsWith('}');
-    if (parseRawBody) {
-      try {
-        req.body = JSON.parse(req.body || '{}');
-      }
-      catch (err) {
-        // throw new Error('invalid body');
-        // return { error: 'invalid body', status: 400 };
-      }
-    }
-  });
-
-  // allow upload file
-  const kIsMultipart = Symbol.for('[FastifyMultipart.isMultipart]');
-  fastify.addContentTypeParser('multipart', (request, _, done) => {
-    request[kIsMultipart] = true;
-    done(null);
-  });
-
-  // parse Body
-  function contentParser(req, body, done) {
-    const parseBody = decodeURIComponent(body.toString()).split('&').reduce((acc, el) => {
-      const [key, val] = el.split('=');
-      return { ...acc, [key]: val };
-    }, {});
-    done(null, parseBody);
-  }
-
-  fastify.addContentTypeParser('application/x-www-form-urlencoded', { parseAs: 'buffer' }, contentParser);
-}
-
-export default fp(plugin);
+import fp from 'fastify-plugin';
+import fs from 'node:fs';
+import path from 'node:path';
+
+import { getTemplatePath, getTemplate, pgClients } from '@opengis/fastify-table/utils.js';
+
+import getMenu from '../routes/menu/controllers/getMenu.js';
+
+import config from '../../config.js';
+
+// to export the decorators to the outer scope
+
+async function plugin(fastify) {
+  fastify.decorate('config', config);
+
+  // pre Request
+  fastify.addHook('onRequest', async (req) => {
+    req.funcs = fastify;
+    const { user } = req.session?.passport || {};
+    req.user = user;
+  });
+
+  // preSerialization
+  fastify.addHook('preSerialization', async (req, reply, payload) => {
+    if (req.url.includes('/suggest/') && !req.query.json) {
+      return payload?.data;
+    }
+    if (payload?.redirect) {
+      return reply.redirect(payload.redirect);
+    }
+    if (reply.sent) {
+      return null;
+    }
+
+    if (['200', '400', '500', '403', '404'].includes(payload?.status)) {
+      reply.status(payload.status);
+    }
+    /* if (payload.headers) {
+      reply.headers(payload.headers);
+    } */
+    if (payload?.buffer) {
+      return payload.buffer;
+    }
+    if (payload?.file) {
+      // const buffer = await readFile(payload.file);
+      // return reply.send(buffer);
+      const stream = fs.createReadStream(payload.file);
+      return stream;
+      // return reply.send(stream);
+    }
+
+    if (payload?.message) {
+      return payload.message;
+    }
+    return payload;
+  });
+
+  //  preValidation
+  fastify.addHook('preValidation', async (req) => {
+    const parseRawBody = ['POST', 'PUT'].includes(req.method) && req.body && typeof req.body === 'string'
+      && req.body.trim(/\r\n/g).startsWith('{')
+      && req.body.trim(/\r\n/g).endsWith('}');
+    if (parseRawBody) {
+      try {
+        req.body = JSON.parse(req.body || '{}');
+      }
+      catch (err) {
+        // throw new Error('invalid body');
+        // return { error: 'invalid body', status: 400 };
+      }
+    }
+  });
+
+  // allow upload file
+  const kIsMultipart = Symbol.for('[FastifyMultipart.isMultipart]');
+  fastify.addContentTypeParser('multipart', (request, _, done) => {
+    request[kIsMultipart] = true;
+    done(null);
+  });
+
+  // parse Body
+  function contentParser(req, body, done) {
+    const parseBody = decodeURIComponent(body.toString()).split('&').reduce((acc, el) => {
+      const [key, val] = el.split('=');
+      return { ...acc, [key]: val };
+    }, {});
+    done(null, parseBody);
+  }
+
+  fastify.addContentTypeParser('application/x-www-form-urlencoded', { parseAs: 'buffer' }, contentParser);
+}
+
+export default fp(plugin);

package/server/plugins/cron.js

@@ -1,11 +1,11 @@
-//import { addCron } from '@opengis/fastify-table/utils.js';
-
-async function deleteOldNotifications({ pg }) {
-    const { rowCount } = pg?.pk?.['crm.notifications'] ? await pg.query('delete from crm.notifications where CURRENT_DATE - \'14 days\'::interval > cdate') : {};
-    return { rowCount };
-}
-
-export default async function cron(fastify) {
-    // addCron(deleteOldNotifications, 60 * 60 * 24, fastify);
-    //  addCron(deleteOldNotifications, 60 * 1, fastify); // debug
+//import { addCron } from '@opengis/fastify-table/utils.js';
+
+async function deleteOldNotifications({ pg }) {
+    const { rowCount } = pg?.pk?.['crm.notifications'] ? await pg.query('delete from crm.notifications where CURRENT_DATE - \'14 days\'::interval > cdate') : {};
+    return { rowCount };
+}
+
+export default async function cron(fastify) {
+    // addCron(deleteOldNotifications, 60 * 60 * 24, fastify);
+    //  addCron(deleteOldNotifications, 60 * 1, fastify); // debug
 }

package/server/plugins/docs.js

@@ -1,28 +1,28 @@
-'use strict'
-
-import path, { dirname } from 'path';
-import { fileURLToPath } from 'url';
-import fs from 'fs';
-
-const dir = dirname(fileURLToPath(import.meta.url));
-const root = `${dir}/../../`;
-
-
-async function plugin(fastify, opts) {
-  fastify.get('/docs*', async (req, reply) => {
-    if (!fs.existsSync(path.join(root, 'docs/.vitepress/dist/'))) {
-      return reply.status(404).send('docs not exists');
-    }
-    const { params } = req;
-    const url = params['*']
-    const filePath = url && url[url.length - 1] !== '/' ? path.join(root, 'docs/.vitepress/dist/', url) : path.join(root, 'docs/.vitepress/dist/', url, 'index.html')
-    const ext = path.extname(filePath);
-    const mime = {
-      '.js': 'text/javascript', '.css': 'text/css', '.woff2': 'application/font-woff', '.png': 'image/png', '.svg': 'image/svg+xml', '.jpg': 'image/jpg'
-    }[ext];
-    const stream = fs.createReadStream(filePath);
-    return mime ? reply.type(mime).send(stream) : stream;
-
-  })
-}
-export default plugin;
+'use strict'
+
+import path, { dirname } from 'path';
+import { fileURLToPath } from 'url';
+import fs from 'fs';
+
+const dir = dirname(fileURLToPath(import.meta.url));
+const root = `${dir}/../../`;
+
+
+async function plugin(fastify, opts) {
+  fastify.get('/docs*', async (req, reply) => {
+    if (!fs.existsSync(path.join(root, 'docs/.vitepress/dist/'))) {
+      return reply.status(404).send('docs not exists');
+    }
+    const { params } = req;
+    const url = params['*']
+    const filePath = url && url[url.length - 1] !== '/' ? path.join(root, 'docs/.vitepress/dist/', url) : path.join(root, 'docs/.vitepress/dist/', url, 'index.html')
+    const ext = path.extname(filePath);
+    const mime = {
+      '.js': 'text/javascript', '.css': 'text/css', '.woff2': 'application/font-woff', '.png': 'image/png', '.svg': 'image/svg+xml', '.jpg': 'image/jpg'
+    }[ext];
+    const stream = fs.createReadStream(filePath);
+    return mime ? reply.type(mime).send(stream) : stream;
+
+  })
+}
+export default plugin;