@ozdao/prometheus-framework 0.2.252 → 0.2.254

package/src/modules/community/models/reaction.model.js

@@ -1,8 +1,8 @@
-module.exports = (mongoose) => {
+module.exports = (db) => {
 
-    const ReactionSchema = new mongoose.Schema({
+    const ReactionSchema = new db.mongoose.Schema({
         user: {
-            type: mongoose.Schema.Types.ObjectId,
+            type: db.mongoose.Schema.Types.ObjectId,
             ref: function (value) {
                 if (this.owner.type === 'user') return 'User';
                 if (this.owner.type === 'organization') return 'Organization';
@@ -16,7 +16,7 @@ module.exports = (mongoose) => {
           required: true,
         },
         target: {
-            type: mongoose.Schema.Types.ObjectId,
+            type: db.mongoose.Schema.Types.ObjectId,
             ref: function (value) {
                 if (this.owner.type === 'event') return 'Event';
                 if (this.owner.type === 'comment') return 'Comment';
@@ -42,7 +42,7 @@ module.exports = (mongoose) => {
     },{
         strict: false
     });
-    const Reaction = mongoose.model("Reaction", ReactionSchema);
+    const Reaction = db.mongoose.model("Reaction", ReactionSchema);
 
     return Reaction;
 }

package/src/modules/community/router/blogposts.js

@@ -1,73 +1,71 @@
 import layoutCommunity from '../components/layouts/Community.vue'
+
 import * as validationAuth from '@pf/src/modules/auth/views/middlewares/auth.validation';
 import * as validationOwnership from '@pf/src/modules/auth/views/middlewares/ownership.validation';
 
+const community = {
+  path: 'community',
+  component: layoutCommunity,
+  meta: {
+    title: {
+      en: 'Community',
+      ru: 'Коммьюнити'
+    },
+    breadcrumbs: {
+      hidden: true
+    },
+    title_hide: true
 
-const community = [
-  {
-    path: 'community',
-    component: layoutCommunity,
+  },
+  children: [{
+    path: ':category?',
+    name: 'Blog',
     meta: {
       title: {
         en: 'Community',
         ru: 'Коммьюнити'
       },
-      breadcrumbs: {
-        hidden: true
-      },
       title_hide: true
-
     },
-    children: [{
-      path: ':category?',
-      name: 'Blog',
-      meta: {
-        title: {
-          en: 'Community',
-          ru: 'Коммьюнити'
-        },
-        title_hide: true
-      },
-      component: () => import(/* webpackChunkName: 'Blog' */ '../components/pages/Blog.vue')
-    },{
-      path: 'posts/create',
-      name: 'Create BlogPost',
-      meta: {
-        title: {
-          en: 'Create Post',
-          ru: 'Создать Пост'
-        },
-      },
-      // beforeEnter: [
-      //   validationAuth.requiresAuth,
-      // ],
-      component: () => import(/* webpackChunkName: 'CreateBlogPost' */ '../components/pages/CreateBlogPost.vue')
-    },{
-      path: 'posts/:url',
-      name: 'BlogPost',
-      meta: {
-        title: {
-          en: 'Post',
-          ru: 'Пост'
-        }
+    component: () => import(/* webpackChunkName: 'Blog' */ '../components/pages/Blog.vue')
+  },{
+    path: 'posts/create',
+    name: 'Create BlogPost',
+    meta: {
+      title: {
+        en: 'Create Post',
+        ru: 'Создать Пост'
       },
-      component: () => import(/* webpackChunkName: 'BlogPost' */ '../components/pages/BlogPost.vue')
-    },{
-      path: 'posts/:url/edit',
-      name: 'Edit BlogPost',
-       meta: {
-        title: {
-          en: 'Edit Post',
-          ru: 'Редактировать пост'
-        },
+    },
+    // beforeEnter: [
+    //   validationAuth.requiresAuth,
+    // ],
+    component: () => import(/* webpackChunkName: 'CreateBlogPost' */ '../components/pages/CreateBlogPost.vue')
+  },{
+    path: 'posts/:url',
+    name: 'BlogPost',
+    meta: {
+      title: {
+        en: 'Post',
+        ru: 'Пост'
+      }
+    },
+    component: () => import(/* webpackChunkName: 'BlogPost' */ '../components/pages/BlogPost.vue')
+  },{
+    path: 'posts/:url/edit',
+    name: 'Edit BlogPost',
+     meta: {
+      title: {
+        en: 'Edit Post',
+        ru: 'Редактировать пост'
       },
-      beforeEnter: [
-        validationAuth.requiresAuth,
-        validationOwnership.requiresEditAccess
-      ],
-      component: () => import(/* webpackChunkName: 'CreateBlogPost' */ '../components/pages/CreateBlogPost.vue')
-    }]
-  },
-];
+    },
+    beforeEnter: [
+      validationAuth.requiresAuth,
+      validationOwnership.requiresEditAccess
+    ],
+    component: () => import(/* webpackChunkName: 'CreateBlogPost' */ '../components/pages/CreateBlogPost.vue')
+  }]
+}
 
 export default community;

package/src/modules/events/events.server.js

@@ -1,19 +1,40 @@
-// Importing controllers
-import EventsController from './controllers/events.controller.js';
+// Импортируем контроллеры
+const EventsController = require('./controllers/events.controller.js');
+const TicketsController = require('./controllers/tickets.controller.js');
 
-// Importing routes
-import eventsRoutes from './routes/events.routes.js';
-import ticketsRoutes from './routes/tickets.routes.js';
+// Импортируем роуты
+const eventsRoutes = require('./routes/events.routes.js');
+const ticketsRoutes = require('./routes/tickets.routes.js');
 
-// Importing models
-import EventModel from './models/event.model.js';
-import TicketModel from './models/ticket.model.js';
+// Импортируем модели
+const EventModel = require('./models/event.model.js');
+const TicketModel = require('./models/ticket.model.js');
 
-// Exporting controllers, routes, and models
-export {
-  EventsController,
-  eventsRoutes,
-  ticketsRoutes,
-  EventModel,
-  TicketModel
-};
+function initializeEvent(app, db, origins, publicPath) {
+  // Настраиваем модели в объекте базы данных
+  db.event = EventModel(db);
+  db.ticket = TicketModel(db);
+
+  // Настраиваем маршруты, если объект приложения передан
+  if (app) {
+    eventsRoutes(app, db, origins, publicPath);
+    ticketsRoutes(app, db, origins, publicPath);
+  }
+}
+
+// Экспортируем функцию инициализации, контроллеры, роуты и модели
+module.exports = {
+  initialize: initializeEvent,
+  models: {
+    EventModel,
+    TicketModel,
+  },
+  routes: {
+    eventsRoutes,
+    ticketsRoutes,
+  },
+  controllers: {
+    EventsController,
+    TicketsController,
+  }
+};

package/src/modules/events/models/ticket.model.js

@@ -1,7 +1,7 @@
-module.exports = (mongoose) => {
-  const TicketSchema = new mongoose.Schema({
+module.exports = (db) => {
+  const TicketSchema = new db.mongoose.Schema({
     client: {
-      type: mongoose.Schema.Types.ObjectId,
+      type: db.mongoose.Schema.Types.ObjectId,
       ref: 'Client',
     },
     client_refactor: {
@@ -13,7 +13,7 @@ module.exports = (mongoose) => {
       },
     },
     user: {
-      type: mongoose.Schema.Types.ObjectId,
+      type: db.mongoose.Schema.Types.ObjectId,
       ref: 'User',
     },
     type: {
@@ -23,7 +23,7 @@ module.exports = (mongoose) => {
       required: true,
     },
     target: {  
-      type: mongoose.Schema.Types.ObjectId,
+      type: db.mongoose.Schema.Types.ObjectId,
       ref: function (value) {
         if (this.type === 'event') return 'Event';
         if (this.type === 'parking') return 'Parking';
@@ -53,7 +53,7 @@ module.exports = (mongoose) => {
 
   TicketSchema.index({ user: 1, type: 1, target: 1 });
 
-  const Ticket = mongoose.model('Ticket', TicketSchema);
+  const Ticket = db.mongoose.model('Ticket', TicketSchema);
 
   return Ticket;
 }

package/src/modules/files/files.server.js

@@ -2,12 +2,22 @@
 const filesController = require('./controllers/files.controller.js');
 // Importing routes from the routes directory
 const filesRoutes = require('./routes/files.routes.js');
-// Models
-// const FileModel = require('./models/file.model.js');
 
-// Exporting controllers, routes, and models
+function initializeFiles(app, db, origins, publicPath) {
+  // Настраиваем маршруты, если объект приложения передан
+  if (app) {
+    filesRoutes(app, db, origins, publicPath);
+  }
+}
+
+// Экспортируем функцию инициализации, контроллеры, роуты и модели
 module.exports = {
-  filesController,
-  filesRoutes,
-  // FileModel
-};
+  initialize: initializeFiles,
+
+  routes: {
+    filesRoutes
+  },
+  controllers: {
+    filesController
+  }
+};

package/src/modules/gallery/gallery.client.js

@@ -1,10 +1,46 @@
-import galleryStore from './store/gallery.js';
+// Store
+import * as storeGallery from './store/gallery.js';
 
-// Importing Vue Router routes from the router directory
-import galleryRouter from './router/gallery.router.js';
+// Router
+import routerGallery from './router/gallery.router';
+// import { createGalleryBackofficeRoutes } from './router/gallery.backoffice.router';
 
-// Exporting components, store modules, and routes
-export {
-  galleryStore,
-  galleryRouter,
-};
+// Views
+// Pages
+import Gallery from './components/pages/Gallery.vue';
+
+// Sections
+import BackofficeGallery from './components/sections/BackofficeGallery.vue';
+
+// Пример функции инициализации для модуля галереи
+function initializeGallery(app, store, router, options = {}) {
+  const route = options.route || 'Home';
+
+  // const routesGallery = createGalleryRoutes();
+  // const routesGalleryBackoffice = createGalleryBackofficeRoutes();
+  
+  router.addRoute(route, routerGallery);
+  // router.addRoute('Backoffice', routesGalleryBackoffice);
+  
+  store.addStore('gallery', storeGallery);
+}
+
+const ModuleGallery = {
+  initialize: initializeGallery,
+  views: {
+    store: {
+      storeGallery
+    },
+    router: {
+      routerGallery
+    },
+    components: {
+      // Pages
+      Gallery,
+      // Sections
+      BackofficeGallery
+    }
+  }
+}
+
+export default ModuleGallery;

package/src/modules/gallery/gallery.server.js

@@ -1,13 +1,32 @@
-// Importing controllers from the controllers directory
-const galleryController = require('./controllers/gallery.controller.js');
-// Importing routes from the routes directory
+// Импортируем контроллеры
+const GalleryController = require('./controllers/gallery.controller.js');
+
+// Импортируем роуты
 const galleryRoutes = require('./routes/gallery.routes.js');
-// Models
+
+// Импортируем модели
 const PhotoModel = require('./models/photo.model.js');
 
-// Exporting controllers, routes, and models
+function initializeGallery(app, db, origins, publicPath) {
+  // Настраиваем модели в объекте базы данных
+  db.photo = PhotoModel(db);
+
+  // Настраиваем маршруты, если объект приложения передан
+  if (app) {
+    galleryRoutes(app, db, origins, publicPath);
+  }
+}
+
+// Экспортируем функцию инициализации, контроллеры, роуты и модели
 module.exports = {
-  galleryController,
-  galleryRoutes,
-  PhotoModel
-};
+  initialize: initializeGallery,
+  models: {
+    PhotoModel,
+  },
+  routes: {
+    galleryRoutes,
+  },
+  controllers: {
+    GalleryController,
+  }
+};

package/src/modules/gallery/router/gallery.router.js

@@ -1,10 +1,10 @@
-const gallery = [{
+const gallery = {
   name: 'Gallery',
   path: 'gallery',
   meta: {
     title_hide: true
   },
   component: () => import(/* webpackChunkName: 'Gallery' */ '@pf/src/modules/gallery/components/pages/Gallery.vue'),
-}];
+};
 
 export default gallery;

package/src/modules/orders/components/pages/OrderCreate.vue

@@ -132,7 +132,7 @@ import * as auth from '@pf/src/modules/auth/views/store/auth';
 import * as shopcart from '@pf/src/modules/orders/store/shopcart';
 import * as organizations from '@pf/src/modules/organizations/store/organizations';
 import * as orders from '@pf/src/modules/orders/store/orders';
-import * as users from '@pf/src/modules/users/store/users';
+import * as users from '@pf/src/modules/auth/views/store/users';
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // Variables and computed
 ///////////////////////////////////////////////////////////////////////////////////////////////////

package/src/modules/orders/components/pages/OrderCreateBackoffice.vue

@@ -206,7 +206,7 @@
 
   import CardOrderItem  from '@pf/src/modules/orders/components/blocks/CardOrderItem.vue'
   import CardPosition from '@pf/src/modules/products/components/blocks/CardPosition.vue';
-  import CardUser from '@pf/src/modules/users/components/blocks/CardUser.vue'
+  import CardUser from '@pf/src/modules/auth/views/components/blocks/CardUser.vue'
 
   import BlockSearch from '@pf/src/modules/globals/views/components/blocks/BlockSearch.vue'
 

package/src/modules/orders/components/sections/FormAddCustomer.vue

@@ -87,11 +87,11 @@ import Button from '@pf/src/components/Button/Button.vue'
 
 import BlockSearch from '@pf/src/modules/globals/views/components/blocks/BlockSearch.vue'
 
-import CardUser from '@pf/src/modules/users/components/blocks/CardUser.vue'
+import CardUser from '@pf/src/modules/auth/views/components/blocks/CardUser.vue'
 
 import FormCustomerDetails from '@pf/src/modules/orders/components/sections/FormCustomerDetails.vue'
 
-import * as users from '@pf/src/modules/users/store/users';
+import * as users from '@pf/src/modules/auth/views/store/users';
 import * as auth from '@pf/src/modules/auth/views/store/auth';
 
 import { setError } from '@pf/src/modules/globals/views/store/globals'

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

@@ -1,6 +1,7 @@
 // Store
 import * as storeOrders from './store/orders.js';
 import * as storeShopcart from './store/shopcart.js';
+import * as storeTestimonials from './store/testimonials';  
 // Router
 import routerOrders from './router/orders.router.js';
 // Views
@@ -30,6 +31,7 @@ function initializeOrders(app, store, router, options = {}) {
   router.addRoute(route, routerOrders);
   store.addStore('orders', storeOrders);
   store.addStore('shopcart', storeShopcart);
+  store.addStore('testimonials', storeTestimonials);
 }
 
 const ModuleOrder = {
@@ -37,7 +39,8 @@ const ModuleOrder = {
   views: {
     store: {
       storeOrders,
-      storeShopcart
+      storeShopcart,
+      storeTestimonials
     },
     router: {
       routerOrders

package/src/modules/orders/orders.server.js

@@ -5,6 +5,7 @@ const ModelApplication = require('./models/application.model.js');
 
 const RoutesOrder = require('./routes/orders.routes.js');
 const RoutesApplications = require('./routes/applications.routes.js');
+// require('@pf/src/modules/orders/routes/testimonials.routes')(app);
 
 const FactoryOrder = require('./controllers/orders.controller.js');
 

package/src/modules/organizations/components/blocks/CardDepartment.vue

@@ -53,7 +53,7 @@ import IconEdit from '@pf/src/modules/icons/navigation/IconEdit.vue'
 
 import Spoiler  from '@pf/src/components/Spoiler/Spoiler.vue';
 import DepartmentSub from '@pf/src/modules/organizations/components/blocks/DepartmentSub.vue';
-import User from '@pf/src/modules/users/components/blocks/CardUser.vue';
+import User from '@pf/src/modules/auth/views/components/blocks/CardUser.vue';
 
 const props = defineProps({
   department: Object,

package/src/modules/organizations/components/blocks/CardOrganization.vue

@@ -89,7 +89,7 @@
     <div v-if="showProducts && organization.products.length > 0" class="w-100 o-scroll radius-medium">
       <div class="w-max flex-nowrap flex gap-thin">
         <CardOrderItem  
-          @click.stop="$router.push({name: 'Product Organization', params: {_id: organization._id, product: product._id}})" 
+          @click.stop="$router.push({name: 'Organization_Product', params: {_id: organization._id, product: product._id}})" 
           v-for="product in organization.products.slice(0,5)" 
           :key="product._id" 
           :editable="false" 

package/src/modules/organizations/components/pages/Department.vue

@@ -64,7 +64,7 @@ import { useRoute, useRouter } from 'vue-router';
 
 import Spoiler from '@pf/src/components/Spoiler/Spoiler.vue';
 import DepartmentSub from '@pf/src/modules/organizations/components/blocks/DepartmentSub.vue';
-import User from '@pf/src/modules/users/components/blocks/CardUser.vue';
+import User from '@pf/src/modules/auth/views/components/blocks/CardUser.vue';
 import * as departments from '@pf/src/modules/organizations/store/departments';
 
 import IconEdit from '@pf/src/modules/icons/navigation/IconEdit.vue'

package/src/modules/organizations/components/pages/DepartmentEdit.vue

@@ -331,7 +331,7 @@ import IconDelete from '@pf/src/modules/icons/navigation/IconDelete.vue'
 import EditArray from "@pf/src/modules/organizations/components/blocks/EditArray.vue";
 import DepartmentSub from "@pf/src/modules/organizations/components/blocks/DepartmentSub.vue";
 
-import CardUser from '@pf/src/modules/users/components/blocks/CardUser.vue'
+import CardUser from '@pf/src/modules/auth/views/components/blocks/CardUser.vue'
 
 import * as globals from "@pf/src/modules/globals/views/store/globals";
 import * as departments from "@pf/src/modules/organizations/store/departments";

package/src/modules/organizations/components/pages/Members.vue

@@ -177,7 +177,7 @@ import MembersAdd from '@pf/src/modules/organizations/components/sections/Member
 import Menu from '@pf/src/components/Menu/Menu.vue'
 import MenuItem from '@pf/src/components/Menu/MenuItem.vue'
 
-import CardUser from '@pf/src/modules/users/components/blocks/CardUser.vue';
+import CardUser from '@pf/src/modules/auth/views/components/blocks/CardUser.vue';
 import CardDepartment from '@pf/src/modules/organizations/components/blocks/CardDepartment.vue';
 
 import IconDelete from '@pf/src/modules/icons/navigation/IconDelete.vue'

package/src/modules/organizations/components/pages/Organization.vue

@@ -184,7 +184,7 @@
 	// Organizations
 	import DepartmentSub from '@pf/src/modules/organizations/components/blocks/DepartmentSub.vue';
 	import DetailsTabSection from '@pf/src/modules/organizations/components/sections/DetailsTabSection.vue'
-	import User from '@pf/src/modules/users/components/blocks/CardUser.vue';
+	import User from '@pf/src/modules/auth/views/components/blocks/CardUser.vue';
 	// Feeds
 	import FeedEvents from '@pf/src/modules/events/components/sections/Feed.vue'; 
 	// Spots

package/src/modules/organizations/components/sections/MembersAdd.vue

@@ -112,14 +112,14 @@
 
   import BlockSearch from '@pf/src/modules/globals/views/components/blocks/BlockSearch.vue'
 
-  import CardUser from '@pf/src/modules/users/components/blocks/CardUser.vue'
+  import CardUser from '@pf/src/modules/auth/views/components/blocks/CardUser.vue'
 
   import IconDelete from '@pf/src/modules/icons/navigation/IconDelete.vue';
   import IconAdd from '@pf/src/modules/icons/navigation/IconAdd.vue';
   // Import validation
   import * as inputsValidation from '@pf/src/modules/auth/views/validations/inputs.validation'
   // Store
-  import * as users from '@pf/src/modules/users/store/users';
+  import * as users from '@pf/src/modules/auth/views/store/users';
   // Props
   const props = defineProps({
     organization: Object,

package/src/modules/organizations/controllers/organizations.controller.js

@@ -14,8 +14,6 @@ const parseCookie = require('@pf/src/modules/globals/controllers/utils/parseCook
 const controllerFactory = (db) => {
   const Organization = db.organization;
   const Membership = db.membership;
-  const User = db.user;
-  const Role = db.role;
 
   const read = async (req, res) => {
     //////////////////////////////////////

package/src/modules/organizations/models/department.model.js

@@ -1,14 +1,14 @@
 const accessesSchema = require('./schemas/accesses.schema.js');
 
-module.exports = (mongoose) => {
+module.exports = (db) => {
   // Схема отдела
-  const departmentSchema = new mongoose.Schema({
+  const departmentSchema = new db.mongoose.Schema({
     owner: {
-      type: mongoose.Schema.Types.ObjectId,
+      type: db.mongoose.Schema.Types.ObjectId,
       ref: 'User', 
     },
     organization: {
-      type: mongoose.Schema.Types.ObjectId,
+      type: db.mongoose.Schema.Types.ObjectId,
       ref: 'Organization',
     },
     profile: {
@@ -37,7 +37,7 @@ module.exports = (mongoose) => {
     members: [
       {
         user: {
-          type: mongoose.Schema.Types.ObjectId,
+          type: db.mongoose.Schema.Types.ObjectId,
           ref: 'User',
         },
         position: { 
@@ -48,7 +48,7 @@ module.exports = (mongoose) => {
     ],
     subdepartments: [
       {
-        type: mongoose.Schema.Types.ObjectId,
+        type: db.mongoose.Schema.Types.ObjectId,
         ref: 'Department',
       },
     ],
@@ -58,7 +58,7 @@ module.exports = (mongoose) => {
   
   departmentSchema.index({ organization: 1 })
 
-  const Department = mongoose.model('Department', departmentSchema);
+  const Department = db.mongoose.model('Department', departmentSchema);
 
   return Department
 }

package/src/modules/organizations/models/membership.model.js

@@ -1,7 +1,7 @@
-module.exports = (mongoose) => {
-  const MembershipSchema = new mongoose.Schema({
+module.exports = (db) => {
+  const MembershipSchema = new db.mongoose.Schema({
     user: {
-      type: mongoose.Schema.Types.ObjectId,
+      type: db.mongoose.Schema.Types.ObjectId,
       ref: 'User',
       required: true,
     },
@@ -20,7 +20,7 @@ module.exports = (mongoose) => {
       default: 'subscriber'
     },
     target: {  // заменяем 'organization' на 'target', так как это может быть или User, или Organization
-      type: mongoose.Schema.Types.ObjectId,
+      type: db.mongoose.Schema.Types.ObjectId,
       ref: function (value) {
         if (this.type === 'user') return 'User';
         if (this.type === 'organization') return 'Organization';
@@ -33,7 +33,7 @@ module.exports = (mongoose) => {
 
   MembershipSchema.index({ user: 1, target: 1});
 
-  const Membership = mongoose.model('Membership', MembershipSchema);
+  const Membership = db.mongoose.model('Membership', MembershipSchema);
 
   return Membership;
 }