@ozdao/prometheus-framework 0.2.156 → 0.2.158

package/src/modules/globals/components/layouts/Empty.vue

@@ -2,9 +2,4 @@
 	<router-view v-slot="{ Component, route }">
 		<component :is="Component" />
 	</router-view>
-</template>
-
-
-<script setup>
-
-</script>
+</template>

package/src/modules/globals/components/pages/404.vue

@@ -2,4 +2,4 @@
   <div class="">
     404 Not Found
   </div>
-</template>
+</template>

package/src/modules/globals/components/sections/SectionPageTitle.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <header class="br-b br-solid br-black-transp-10 pd-medium flex-v-center flex-nowrap flex">
+    <header class="pd-medium flex-v-center flex-nowrap flex">
       <h1 class="mn-r-auto">{{ title }}</h1>
 
       <template  
@@ -31,7 +31,7 @@
       :selected="tabs_current"
       @update:selected="updateTabsCurrent"
       :tabs="tabs"
-      class="w-100 t-nowrap o-scroll h5"
+      class="br-t br-solid br-black-transp-10 w-100 t-nowrap o-scroll h5"
     />
   </div>
 </template>

package/src/modules/globals/mixins/mixins.js

@@ -1,110 +1,142 @@
-// mixins.js
-export const globalMixins = {
-  methods: {
-    hasAccess(organizationId, rightCategory, rightType, accesses) {
-      const accessArray = accesses;
-      
-      const organizationAccess = accessArray.find(access => access.organization === organizationId);
-
-      if (!organizationAccess) {
-        return false;
-      }
+// useGlobalMixins.js
 
-      const categoryAccess = organizationAccess.rights[rightCategory];
+export function useGlobalMixins() {
+  const isAdmin = (roles) => {
+    if (roles) {
+      const isAdmin = roles.includes('ROLE_ADMIN') ? roles.includes('ROLE_ADMIN') : false;
 
-      if (!categoryAccess) {
-        return false;
+      if (isAdmin !== true) {
+        return false
       }
 
-      return categoryAccess[rightType] === true;
-    },
-    returnCurrency() {
-      const currency = '฿'
-      return currency
-    },
-    formatPrice(number) {
-      const currency = this.returnCurrency();
-      let formattedNumber = number.toFixed(2).replace('.', ',').replace(/\B(?=(\d{3})+(?!\d))/g, ' ');
-      return `${formattedNumber} ${currency}`;
-    },
-    formatDate(d, options = {}) {
-      var fixedDate = new Date(d);
-      var yyyy = fixedDate.getFullYear().toString();
-      var mm = (fixedDate.getMonth() + 1).toString();
-      var dd = fixedDate.getDate().toString();
-      var hh = fixedDate.getHours().toString();
-      var minmin = fixedDate.getMinutes().toString();
-
-      // Параметры для форматирования
-      var format = {
-        dateOnly: options.dateOnly || false,
-        timeOnly: options.timeOnly || false,
-        dayMonth: options.dayMonth || false,
-        dayTime: options.dayTime || false,
-        monthYear: options.monthYear || false,
-        yearOnly: options.yearOnly || false,
-        custom: options.custom || ""
-      };
-
-      // Формирование строки в зависимости от параметров
-      if (format.dateOnly) {
-        return yyyy + '.' + (mm[1] ? mm : "0" + mm[0]) + '.' + (dd[1] ? dd : "0" + dd[0]);
-      } else if (format.timeOnly) {
-        return (hh[1] ? hh : "0" + hh[0]) + ':' + (minmin[1] ? minmin : "0" + minmin[0]);
-      } else if (format.dayMonth) {
-        return (dd[1] ? dd : "0" + dd[0]) + '.' + (mm[1] ? mm : "0" + mm[0]);
-      } else if (format.dayTime) {
-        return (dd[1] ? dd : "0" + dd[0]) + " в " + (hh[1] ? hh : "0" + hh[0]) + ':' + (minmin[1] ? minmin : "0" + minmin[0]);
-      } else if (format.monthYear) {
-        return (mm[1] ? mm : "0" + mm[0]) + '.' + yyyy;
-      } else if (format.yearOnly) {
-        return yyyy;
-      } else if (format.custom) {
-        // Пользователь может определить свой формат
-        return format.custom.replace("yyyy", yyyy).replace("mm", (mm[1] ? mm : "0" + mm[0])).replace("dd", (dd[1] ? dd : "0" + dd[0])).replace("hh", (hh[1] ? hh : "0" + hh[0])).replace("min", (minmin[1] ? minmin : "0" + minmin[0]));
-      }
+      return true
+    } else {
+      return false
+    }
+  }
+  const hasAccess = (organizationId, rightCategory, rightType, accesses) => {
+    const accessArray = accesses;
+    
+    const organizationAccess = accessArray.find(access => access.organization === organizationId);
 
-      // Формат по умолчанию
-      return (hh[1] ? hh : "0" + hh[0]) + ':' + (minmin[1] ? minmin : "0" + minmin[0]) + ", " + yyyy + '.' + (mm[1] ? mm : "0" + mm[0]) + '.' + (dd[1] ? dd : "0" + dd[0]);
-    },
-
-    normalizeUrlParam(param) {
-      if (!param) param = ''
-
-      return param
-        .toLowerCase()
-        .replace(/ /g, '-')
-        .replace(/[^a-z0-9-]/g, '');
-    },
-    getMarketplaceLink(categories, country, state, city) {
-      let country_normalized = country ? this.normalizeUrlParam(country) : '';
-      let state_normalized = state ? this.normalizeUrlParam(state) : '';
-      let city_normalized = city ? this.normalizeUrlParam(city) : '';
-
-      let base = '/marketplace';
-      base += country_normalized ? `/${country_normalized}` : '';
-      base += country_normalized && state_normalized ? `/${state_normalized}` : '';
-      base += country_normalized && state_normalized && city_normalized ? `/${city_normalized}` : '';
-
-      if (categories && categories.length) {
-        base += `?categories=${categories.join(",")}`;
-      }
+    if (!organizationAccess) {
+      return false;
+    }
+
+    const categoryAccess = organizationAccess.rights[rightCategory];
+
+    if (!categoryAccess) {
+      return false;
+    }
+
+    return categoryAccess[rightType] === true;
+  }
+
+  const returnCurrency = () => {
+    const currency = '฿'
+    return currency
+  }
+
+  const formatPrice = (number) => {
+    const currency = returnCurrency();
+    let formattedNumber = number.toFixed(2).replace('.', ',').replace(/\B(?=(\d{3})+(?!\d))/g, ' ');
+    return `${formattedNumber} ${currency}`;
+  }
 
-      return base;
-    },
+  const formatDate = (d, options = {}) => {
+    var fixedDate = new Date(d);
+    var yyyy = fixedDate.getFullYear().toString();
+    var mm = (fixedDate.getMonth() + 1).toString();
+    var dd = fixedDate.getDate().toString();
+    var hh = fixedDate.getHours().toString();
+    var minmin = fixedDate.getMinutes().toString();
+
+    var format = {
+      dateOnly: options.dateOnly || false,
+      timeOnly: options.timeOnly || false,
+      dayMonth: options.dayMonth || false,
+      dayTime: options.dayTime || false,
+      monthYear: options.monthYear || false,
+      yearOnly: options.yearOnly || false,
+      custom: options.custom || ""
+    };
+
+    if (format.dateOnly) {
+      return yyyy + '.' + (mm[1] ? mm : "0" + mm[0]) + '.' + (dd[1] ? dd : "0" + dd[0]);
+    } else if (format.timeOnly) {
+      return (hh[1] ? hh : "0" + hh[0]) + ':' + (minmin[1] ? minmin : "0" + minmin[0]);
+    } else if (format.dayMonth) {
+      return (dd[1] ? dd : "0" + dd[0]) + '.' + (mm[1] ? mm : "0" + mm[0]);
+    } else if (format.dayTime) {
+      return (dd[1] ? dd : "0" + dd[0]) + " в " + (hh[1] ? hh : "0" + hh[0]) + ':' + (minmin[1] ? minmin : "0" + minmin[0]);
+    } else if (format.monthYear) {
+      return (mm[1] ? mm : "0" + mm[0]) + '.' + yyyy;
+    } else if (format.yearOnly) {
+      return yyyy;
+    } else if (format.custom) {
+      return format.custom.replace("yyyy", yyyy).replace("mm", (mm[1] ? mm : "0" + mm[0])).replace("dd", (dd[1] ? dd : "0" + dd[0])).replace("hh", (hh[1] ? hh : "0" + hh[0])).replace("min", (minmin[1] ? minmin : "0" + minmin[0]));
+    }
+
+    return (hh[1] ? hh : "0" + hh[0]) + ':' + (minmin[1] ? minmin : "0" + minmin[0]) + ", " + yyyy + '.' + (mm[1] ? mm : "0" + mm[0]) + '.' + (dd[1] ? dd : "0" + dd[0]);
+  }
+
+  const normalizeUrlParam = (param) => {
+    if (!param) param = ''
+
+    return param
+      .toLowerCase()
+      .replace(/ /g, '-')
+      .replace(/[^a-z0-9-]/g, '');
+  }
+
+  const joinArrayToUrl = (arr) => {
+    return arr.join('/')
+  }
 
-    getSpotsLink(country, state, city) {
-      let country_normalized = country ? this.normalizeUrlParam(country) : '';
-      let state_normalized = state ? this.normalizeUrlParam(state) : '';
-      let city_normalized = city ? this.normalizeUrlParam(city) : '';
+  const getMarketplaceLink = (categories, country, state, city) => {
+    let country_normalized = country ? normalizeUrlParam(country) : '';
+    let state_normalized = state ? normalizeUrlParam(state) : '';
+    let city_normalized = city ? normalizeUrlParam(city) : '';
 
-      let base = '/spots';
-      base += country_normalized ? `/${country_normalized}` : '';
-      base += country_normalized && state_normalized ? `/${state_normalized}` : '';
-      base += country_normalized && state_normalized && city_normalized ? `/${city_normalized}` : '';
+    let base = '/marketplace';
+    base += country_normalized ? `/${country_normalized}` : '';
+    base += country_normalized && state_normalized ? `/${state_normalized}` : '';
+    base += country_normalized && state_normalized && city_normalized ? `/${city_normalized}` : '';
 
-      return base;
+    if (categories && categories.length) {
+      base += `?categories=${categories.join(",")}`;
     }
 
+    return base;
+  }
+
+  const getSpotsLink = (country, state, city) => {
+    let country_normalized = country ? normalizeUrlParam(country) : '';
+    let state_normalized = state ? normalizeUrlParam(state) : '';
+    let city_normalized = city ? normalizeUrlParam(city) : '';
+
+    let base = '/spots';
+    base += country_normalized ? `/${country_normalized}` : '';
+    base += country_normalized && state_normalized ? `/${state_normalized}` : '';
+    base += country_normalized && state_normalized && city_normalized ? `/${city_normalized}` : '';
+
+    return base;
+  }
+
+  return {
+    isAdmin,
+    hasAccess,
+    returnCurrency,
+    formatPrice,
+    formatDate,
+    normalizeUrlParam,
+    joinArrayToUrl,
+    getMarketplaceLink,
+    getSpotsLink
   }
 }
+
+// Экспорт для глобальной регистрации
+export const globalMixins = {
+  methods: useGlobalMixins()
+}

package/src/modules/landing/router/landing.js

@@ -5,6 +5,9 @@ const landing = [
     meta: {
       title_hide: true,
       header_theme: 'dark',
+      breadcrumbs: {
+        hide: true
+      },
     },
     component: () => import(/* webpackChunkName: 'Home' */ '@pf/src/modules/landing/components/pages/Home.vue'),
   },

package/src/modules/marketplace/components/pages/Catalog.vue

@@ -21,7 +21,7 @@
 	    prices: route.query.prices,
 	    delivery: route.query.delivery,
 	    location: store.globals.state.position?.location,
-	    contain: route.query.contain?.split(','),
+	    contain: ['products'],
     }"
     v-slot="{ 
       items 

package/src/modules/middlewares/client/auth.validation.js

@@ -1,7 +1,17 @@
 import * as auth from '@pf/src/modules/auth/store/auth'
 
-function requiresAuth(to, from, next) {
+function requiresNoAuth(to, from, next) {
+
+  const isLogin = auth.state.access.status;
+
+  if (isLogin) {
+    return next('/profile/' + auth.state.user._id);
+  }
+
+  next();
+}
 
+function requiresAuth(to, from, next) {
   const isLogin = auth.state.access.status;
 
   if (isLogin !== true) {
@@ -11,7 +21,7 @@ function requiresAuth(to, from, next) {
   next();
 }
 
-function requiresAdmin(to, from, next) {
+async function requiresAdmin(to, from, next) {
 
   const isAdmin = auth.state.access.roles?.includes('ROLE_ADMIN') ? auth.state.access.roles.includes('ROLE_ADMIN') : false;
 
@@ -22,21 +32,10 @@ function requiresAdmin(to, from, next) {
   next();
 }
 
-function requiresNoAuth(to, from, next) {
-  console.log('hello')
 
-  const isLogin = auth.state.access.status;
-   console.log(auth.state.access)
-  // to.meta.requiresNoAuth 
-  if (isLogin) {
-    return next('/profile/' + auth.state.user._id);
-  }
-
-  next();
-}
 
 export  {
-  requiresAdmin,
+  requiresNoAuth,
   requiresAuth,
-  requiresNoAuth
+  requiresAdmin,
 }

package/src/modules/orders/orders.client.js

@@ -24,8 +24,10 @@ import Succes from './components/sections/Succes.vue';
 import ShopCart from './components/partials/ShopCart.vue';
 
 // Пример функции инициализации для модуля заказов
-function initializeOrders(app, store, router) {
-  router.addRoute('Home', routerOrders);
+function initializeOrders(app, store, router, options = {}) {
+  const route = options.route || 'Home';
+  
+  router.addRoute(route, routerOrders);
   store.addStore('orders', storeOrders);
   store.addStore('shopcart', storeShopcart);
 }

package/src/modules/organizations/router/organizations.js

@@ -22,7 +22,10 @@ const organizations = [{
     title: {
       en: 'Organizations',
       ru: 'Организации'
-    }
+    },
+    breadcrumbs: {
+      hidden: true
+    },
   },
   children: [{
     path: 'create',
@@ -42,7 +45,7 @@ const organizations = [{
       title: {
         en: 'Group',
         ru: 'Группа'
-      }
+      },
     },
     component: layoutEmpty,
     children: [
@@ -53,7 +56,10 @@ const organizations = [{
           title: {
             en: 'Group',
             ru: 'Группа'
-          }
+          },
+          breadcrumbs: {
+            hidden: true
+          },
         },
         component: () => import('@pf/src/modules/organizations/components/pages/Organization.vue'),
       },

package/src/modules/pages/controllers/factories/pages.factory.js

@@ -0,0 +1,106 @@
+const createPageController = (db) => {
+  const Page = db.page;
+
+  async function populateChildrenRecursively(page) {
+    await page.populate('children');
+    for (let child of page.children) {
+      await populateChildrenRecursively(child);
+    }
+  }
+
+  const create = async (req, res) => {
+    try {
+
+      const page = await Page.create(req.body);
+
+      if (!page) {
+        return res.status(404).send({ message: "Something wrong when creating page." });
+      }
+
+      if (req.body.parent) {
+        const parentPage = await Page.findById(req.body.parent);
+
+        if (parentPage) {
+          if (!parentPage.children) {
+            parentPage.children = [];
+          }
+          parentPage.children.push(page._id);
+          await parentPage.save();
+        } else {
+          console.warn(`Parent page with id ${req.body.parent} not found.`);
+        }
+      }
+
+      res.status(200).send(page);
+    } catch (err) {
+      res.status(500).send({ message: err.message });
+    }
+  };
+
+  const read = async (req, res) => {
+    try {
+      const { url } = req.query;
+
+      if (url) {
+        // Fetch a single page
+        const page = await Page.findOne({ url }).populate('parent');
+        
+        if (!page) {
+          return res.status(404).json({ message: 'Page not found' });
+        }
+        
+        await populateChildrenRecursively(page);
+
+        res.status(200).send(page);
+      } else {
+        // Fetch all pages
+        const topLevelPages = await Page.find({ parent: null });
+
+        for (let page of topLevelPages) {
+          await populateChildrenRecursively(page);
+        }
+        res.json(topLevelPages);
+      }
+    } catch (error) {
+      console.error('Error:', error);
+      res.status(500).json({ message: 'Server error' });
+    }
+  };
+
+  const update = async (req, res) => {
+    try {
+      const page = await Page.findOneAndUpdate({ _id: req.body._id }, req.body);
+
+      if (!page) {
+        return res.status(404).send({ message: "Page not found." });
+      }
+
+      res.status(200).send(page);
+    } catch (err) {
+      res.status(500).send({ message: err.message });
+    }
+  };
+
+  const deletePage = async (req, res) => {
+    try {
+      const page = await Page.findOneAndDelete({ _id: req.body._id });
+
+      if (!page) {
+        return res.status(404).send({ message: "Something wrong when deleting page." });
+      }
+
+      res.status(200).send(page);
+    } catch (err) {
+      res.status(500).send({ message: err.message });
+    }
+  };
+
+  return {
+    create,
+    read,
+    update,
+    delete: deletePage
+  };
+};
+
+module.exports = createPageController;

package/src/modules/pages/controllers/routes/pages.routes.js

@@ -0,0 +1,24 @@
+// Factories
+const controllerFactory = require("../factories/pages.factory");
+
+module.exports = function(app, db, origins, publicPath) {
+
+  const controller = controllerFactory(db);
+ 
+  app.get(
+    "/api/pages/read",
+    controller.read
+  );
+  app.post(
+    "/api/pages/create",
+    controller.create
+  );
+  app.put(
+    "/api/pages/update",
+    controller.update
+  );
+  app.delete(
+    "/api/pages/delete",
+    controller.delete
+  );
+};

package/src/modules/pages/models/page.model.js

@@ -1,16 +1,23 @@
-const mongoose = require('mongoose');
-
-const PageSchema = new mongoose.Schema({ 
-  name: {type: Object},
-  localization: {type: Array},
-  url: {type: String}, 
-  groups: {type: Array},
-  content: {type: Object},
+module.exports = (db) => {
+  const PageSchema = new db.mongoose.Schema({ 
+    name: {type: Object},
+    url: {type: String}, 
+    groups: {type: Array},
+    content: {type: [Object,Array]},
+    parent:{
+      type: db.mongoose.Schema.Types.ObjectId,
+      ref: "Page"
+    },
+    children:[{
+      type: db.mongoose.Schema.Types.ObjectId,
+      ref: "Page"
+    }],
   }, {
-    timestamps: { currentTime: () => Date.now() }
+      timestamps: { currentTime: () => Date.now() }
   });
 
+  const Page = db.mongoose.model("Page", PageSchema);
 
-const Page = mongoose.model("Page", PageSchema);
+  return Page;
+};
 
-module.exports = Page;

package/src/modules/pages/pages.client.js

@@ -0,0 +1,40 @@
+// Store
+import * as storePages from './views/store/pages.js';
+// Router
+import routerPages from './views/router/pages.router.js';
+import routerPagesBackoffice from './views/router/pages.backoffice.router.js';
+// Views
+import Pages from './views/components/pages/Pages.vue';
+import Page from './views/components/pages/Page.vue';
+import PageEdit from './views/components/pages/PageEdit.vue';
+
+// Пример функции инициализации для модуля страниц
+function initializePages(app, store, router, options = {}) {
+  const routeHome = options.route?.home || 'Home';
+  const routeBO = options.route?.backoffice || 'Backoffice Root';
+
+  router.addRoute(routeHome, routerPages);  
+  router.addRoute(routeBO, routerPagesBackoffice);
+  
+  store.addStore('pages', storePages);
+}
+
+const ModulePages = { 
+  initialize: initializePages,
+  views: {
+    store: {
+      storePages
+    },
+    router: {
+      routerPages
+    },
+    components: {
+      // Pages
+      Pages,
+      Page,
+      PageEdit
+    }
+  }
+}
+
+export default ModulePages;

package/src/modules/pages/pages.server.js

@@ -0,0 +1,32 @@
+const ModelPage = require('./models/page.model.js');
+
+const RoutesPage = require('./controllers/routes/pages.routes.js');
+const FactoryPage = require('./controllers/factories/pages.factory.js');
+
+const CRUD = require('@pf/src/modules/globals/services/globals.crud');
+
+function initializePages(app, db, origins, publicPath) {
+  // Setup models in the database object
+  db.page = ModelPage(db);
+
+  // Setup routes if the app object is provided
+  if (app) {
+    RoutesPage(app, db, origins, publicPath);
+  }
+
+  // new CRUD('/api/pages', app, db, db.page);
+}
+
+// Exporting controllers, routes, and models
+module.exports = {
+  initialize: initializePages,
+  models: {
+    ModelPage
+  },
+  routes: {
+    RoutesPage
+  },
+  controllers: {
+    FactoryPage
+  }
+};