@ozdao/prometheus-framework 0.2.251 → 0.2.253

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;
 }

package/src/modules/organizations/organizations.client.js

@@ -1,10 +1,21 @@
-// Import Vue components (layouts, blocks, sections, elements, and pages)
+// Store
+import * as storeDepartments from './store/departments.js';
+import * as storeMemberships from './store/memberships.js';
+import * as storeOrganizations from './store/organizations.js';
+import * as storeInvites from './store/invites.js';
+
+// Router
+import routerOrganization from './router/organizations';
+
+// Views
+// Pages
 import Organization from './components/pages/Organization.vue';
 import Department from './components/pages/Department.vue';
 import OrganizationEdit from './components/pages/OrganizationEdit.vue';
 import Organizations from './components/pages/Organizations.vue';
 import DepartmentEdit from './components/pages/DepartmentEdit.vue';
 
+// Blocks
 import CardOrganization from './components/blocks/CardOrganization.vue';
 import EditArray from './components/blocks/EditArray.vue';
 import Unit from './components/blocks/Unit.vue';
@@ -15,23 +26,27 @@ import EmptyState from './components/blocks/EmptyState.vue';
 import Contacts from './components/blocks/Contacts.vue';
 import Socials from './components/blocks/Socials.vue';
 
+// Sections
 import MembersAdd from './components/sections/MembersAdd.vue';
 import DetailsTabSection from './components/sections/DetailsTabSection.vue';
 import OrganizationsSection from './components/sections/Organizations.vue';
 import Publics from './components/sections/Publics.vue';
 import Documents from './components/sections/Documents.vue';
 
+// Elements
 import ButtonToggleMembership from './components/elements/ButtonToggleMembership.vue';
 
-// Import Vuex store modules
-
-import * as departmentsStore from './store/departments.js';
-import * as membershipsStore from './store/memberships.js';
-import * as organizationStore from './store/organizations.js';
-import * as invitesStore from './store/invites.js';
-
-// Import Vue Router routes
-import organizationsRouter from './router/organizations.js';
+// Пример функции инициализации для модуля организаций
+function initializeOrganization(app, store, router, options = {}) {
+  const route = options.route || 'Home';
+  
+  router.addRoute(route, routerOrganization);
+  
+  store.addStore('departments', storeDepartments);
+  store.addStore('memberships', storeMemberships);
+  store.addStore('organizations', storeOrganizations);
+  store.addStore('invites', storeInvites);
+}
 
 // Export components, store modules, and routes
 export {
@@ -55,13 +70,53 @@ export {
 	Publics,
 	Documents,
 	ButtonToggleMembership,
-	departmentsStore,
-	membershipsStore,
-	organizationStore,
-	invitesStore,
-	organizationsRouter
+	storeDepartments,
+	storeMemberships,
+	storeOrganizations,
+	storeInvites,
+	routerOrganization
 };
 
 
+const ModuleOrganization = {
+  initialize: initializeOrganization,
+  views: {
+    store: {
+      storeDepartments,
+      storeMemberships,
+      storeOrganizations,
+      storeInvites
+    },
+    router: {
+      routerOrganization
+    },
+    components: {
+      // Pages
+      Organization,
+      Department,
+      OrganizationEdit,
+      Organizations,
+      DepartmentEdit,
+      // Blocks
+      CardOrganization,
+      EditArray,
+      Unit,
+      DepartmentSub,
+      CardDepartment,
+      Rating,
+      EmptyState,
+      Contacts,
+      Socials,
+      // Sections
+      MembersAdd,
+      DetailsTabSection,
+      OrganizationsSection,
+      Publics,
+      Documents,
+      // Elements
+      ButtonToggleMembership
+    }
+  }
+}
 
-
+export default ModuleOrganization;

package/src/modules/organizations/organizations.server.js

@@ -1,31 +1,56 @@
-// Importing controllers
+// Импортируем контроллеры
 const DepartmentsController = require('./controllers/departments.controller.js');
 const OrganizationsController = require('./controllers/organizations.controller.js');
 const MembershipsController = require('./controllers/memberships.controller.js');
 const InvitesController = require('./controllers/invites.controller.js');
-// Importing routes
+
+// Импортируем роуты
 const departmentsRoutes = require('./routes/departments.routes.js');
 const organizationsRoutes = require('./routes/organizations.routes.js');
 const membershipsRoutes = require('./routes/memberships.routes.js');
-const invitesRoutes = require('./routes/invites.routes.js')
-// Importing models
+const invitesRoutes = require('./routes/invites.routes.js');
+
+// Импортируем модели
 const DepartmentModel = require('./models/department.model.js');
 const OrganizationModel = require('./models/organization.model.js');
 const MembershipModel = require('./models/membership.model.js');
 const InviteModel = require('./models/invite.model.js');
 
-// Exporting
+function initializeOrganization(app, db, origins, publicPath) {
+  // Настраиваем модели в объекте базы данных
+  db.department = DepartmentModel(db);
+  db.organization = OrganizationModel(db);
+  db.membership = MembershipModel(db);
+  db.invite = InviteModel(db);
+
+  // Настраиваем маршруты, если объект приложения передан
+  if (app) {
+    departmentsRoutes(app, db, origins, publicPath);
+    organizationsRoutes(app, db, origins, publicPath);
+    membershipsRoutes(app, db, origins, publicPath);
+    invitesRoutes(app, db, origins, publicPath);
+  }
+}
+
+// Экспортируем функцию инициализации, контроллеры, роуты и модели
 module.exports = {
-  DepartmentsController,
-  OrganizationsController,
-  MembershipsController,
-  InvitesController,
-  departmentsRoutes,
-  organizationsRoutes,
-  membershipsRoutes,
-  invitesRoutes,
-  DepartmentModel,
-  OrganizationModel,
-  MembershipModel,
-  InviteModel
-};
+  initialize: initializeOrganization,
+  models: {
+    DepartmentModel,
+    OrganizationModel,
+    MembershipModel,
+    InviteModel,
+  },
+  routes: {
+    departmentsRoutes,
+    organizationsRoutes,
+    membershipsRoutes,
+    invitesRoutes,
+  },
+  controllers: {
+    DepartmentsController,
+    OrganizationsController,
+    MembershipsController,
+    InvitesController,
+  }
+};

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

@@ -1,10 +1,9 @@
-import layoutEmpty from '@pf/src/modules/globals/views/components/layouts/Empty.vue';
-
 import membersRoutes from './members.router.js';
 import departmentRoutes from './departments.router.js'
+import backofficeRoutes from '@pf/src/modules/organizations/router/backoffice.router.js'
 
-import productRoutes from '@pf/src/modules/products/router/products.router.js'
 import { createEventRoutes } from '@pf/src/modules/events/router/events';
+import { createProductRoutes } from '@pf/src/modules/products/router/products.router';
 import categoriesRoutes from '@pf/src/modules/products/router/categories.router.js'
 import leftoversRoutes from '@pf/src/modules/products/router/leftovers.router.js'
 
@@ -12,15 +11,10 @@ import paymentsRoutes from '@pf/src/modules/wallet/views/router/payments.router.
 import ordersBackofficeRoutes from '@pf/src/modules/orders/router/orders.backoffice.router.js'
 import galleryBackofficeRoutes from '@pf/src/modules/gallery/router/gallery.backoffice.router.js'
 
-import backofficeRoutes from '@pf/src/modules/organizations/router/backoffice.router.js'
-
 import * as validationAuth from '@pf/src/modules/auth/views/middlewares/auth.validation';
 
-const eventsRoutes = createEventRoutes('Organization_');
-
-const organizations = [{
+const organizations = {
   path: 'organizations',
-  component: layoutEmpty,
   meta: {
     title: {
       en: 'Organizations',
@@ -50,7 +44,6 @@ const organizations = [{
         ru: 'Группа'
       },
     },
-    component: layoutEmpty,
     children: [
       {
         path: '',
@@ -68,8 +61,8 @@ const organizations = [{
       },
       ...membersRoutes,
       ...departmentRoutes,
-      ...productRoutes,
-      eventsRoutes,
+      createProductRoutes('Organization_'),
+      createEventRoutes('Organization_'),
       ...categoriesRoutes,
       ...leftoversRoutes,
       ...paymentsRoutes,
@@ -89,6 +82,6 @@ const organizations = [{
     beforeEnter: [validationAuth.requiresAuth],
     component: () => import('@pf/src/modules/organizations/components/pages/OrganizationEdit.vue'),
   }]
-}];
+};
 
 export default organizations;

package/src/modules/pages/views/store/pages.js

@@ -1,9 +1,7 @@
 import { reactive, watch } from "vue";
-import axios from "axios";
 import { setError } from "@pf/src/modules/globals/views/store/globals";
 
-const clientUrl = process.env.API_URL;
-const $axios = axios.create({ baseURL: clientUrl });
+import $axios from '@pf/src/modules/globals/views/utils/axios-instance.js';
 
 const state = reactive({
   all: [],

package/src/modules/{marketplace → products}/components/layouts/Marketplace.vue

@@ -6,7 +6,7 @@
 
     		<span 
     			v-if="localPosition.city || localPosition.state || localPosition.country"
-    			@click="a => { store.globals.state.isOpenLocationPopup = true }" 
+    			@click="a => { globals.state.isOpenLocationPopup = true }" 
     			class="t-main t-semi cursor-pointer "
     		>
   				<template v-if="localPosition.city">{{localPosition.city}}, </template>
@@ -14,7 +14,7 @@
   				<template v-if="localPosition.country">{{localPosition.country}}</template>
     		</span>
 
-    		<span v-else @click="a => { store.globals.state.isOpenLocationPopup = true }"  class="h2 pd-l-small pd-r-small pd-t-micro pd-b-micro d-inline-block t-semi radius-extra bg-main t-black cursor-pointer">
+    		<span v-else @click="a => { globals.state.isOpenLocationPopup = true }"  class="h2 pd-l-small pd-r-small pd-t-micro pd-b-micro d-inline-block t-semi radius-extra bg-main t-black cursor-pointer">
 						The World
     		</span>
     	</h2>
@@ -23,8 +23,8 @@
 		<div class="gap-thin 	cols-2-1_3">
 			<div class="desktop-only radius-big o-hidden">
 	     <BlockFilter
-          v-model:filter="store.marketplace.state.filter"
-          :options="store.marketplace.state.filter.options"
+          v-model:filter="marketplace.state.filter"
+          :options="marketplace.state.filter.options"
           class="h-100 w-100 pd-small bg-light"
         />
       </div>
@@ -42,15 +42,15 @@
 <script setup="props">
 	// Import libs
 	import { computed, onMounted, watch, ref } from 'vue'
-	import { useStore } from '@/store'
 	import { useRoute, useRouter,onBeforeRouteLeave } from 'vue-router'
 	import { useI18n } from 'vue-i18n'
 
-
 	import BlockFilter  from '@pf/src/modules/globals/views/components/blocks/BlockFilter.vue'
 
+	import * as marketplace from '@pf/src/modules/products/store/marketplace';
+  import * as categories from '@pf/src/modules/products/store/categories';
+
 	// Accessing router and store
-	const store = useStore()
 	const route = useRoute()
 	const router = useRouter()
 
@@ -90,27 +90,27 @@
 	if (route.query) {
 	 	const query = route.query;
 
-		store.marketplace.state.filter.selected.categories = query.categories ? query.categories.split(',') : [];
-		store.marketplace.state.filter.selected.prices = query.prices ? query.prices.split(',') : [];
-		store.marketplace.state.filter.selected.delivery = query.delivery ? query.delivery.split(',') : [];
+		marketplace.state.filter.selected.categories = query.categories ? query.categories.split(',') : [];
+		marketplace.state.filter.selected.prices = query.prices ? query.prices.split(',') : [];
+		marketplace.state.filter.selected.delivery = query.delivery ? query.delivery.split(',') : [];
 	}
 
-	if (route.query.sortParam) store.marketplace.state.sort.param = route.query.sortParam
-	if (route.query.sortOrder) store.marketplace.state.sort.order = route.query.sortOrder
+	if (route.query.sortParam) marketplace.state.sort.param = route.query.sortParam
+	if (route.query.sortOrder) marketplace.state.sort.order = route.query.sortOrder
 
 	onMounted(async () => {
 	  let options = {
       status: 'published'
     }
 
-    let categoriesFilter = await store.categories.actions.fetchCategories(options);
+    let categoriesFilter = await categories.actions.fetchCategories(options);
 
     categoriesFilter = categoriesFilter.map(category => ({
       value: category.url,
       label: category.name
     }));
 
-    const index = store.marketplace.state.filter.options.findIndex(option => option.value === 'categories');
+    const index = marketplace.state.filter.options.findIndex(option => option.value === 'categories');
 
     const categoryOption = {
       title: 'Categories',
@@ -119,13 +119,13 @@
     };
 
     if (index !== -1) {
-        store.marketplace.state.filter.options[index] = categoryOption;
+        marketplace.state.filter.options[index] = categoryOption;
     } else {
-        store.marketplace.state.filter.options.unshift(categoryOption);
+        marketplace.state.filter.options.unshift(categoryOption);
     }
 	})
 
-	watch(() => store.marketplace.state.sort, (newSortValue, oldSortValue) => {
+	watch(() => marketplace.state.sort, (newSortValue, oldSortValue) => {
 		let query = { ...route.query}
 		
 		query.sortParam = newSortValue.param
@@ -136,7 +136,7 @@
 	}, { deep: true });
 
 
-	watch(() => store.marketplace.state.filter.selected, (newFilterValue, oldFilterValue) => {
+	watch(() => marketplace.state.filter.selected, (newFilterValue, oldFilterValue) => {
 	  // Переводим фильтр в формат query
 	  const query = { ...route.query };
 
@@ -161,7 +161,7 @@
 	  router.replace({ query });
 	}, { deep: true })
 
-	watch(() => store.globals.state.position, (newPosition) => {
+	watch(() => globals.state.position, (newPosition) => {
 	  // get the current route
 	  const currentRoute = { ...router.currentRoute.value };
 	  

package/src/modules/{marketplace → products}/components/pages/Catalog.vue

@@ -43,7 +43,6 @@
 <script setup>
 	import { computed,reactive,ref, onMounted,watch  } from 'vue'
 	import { useRoute } from 'vue-router'
-	import { useStore } from '@/store'
 	
 	import * as organization from '@pf/src/modules/organizations/store/organizations'
 
@@ -52,7 +51,6 @@
 	import CardOrganization from '@pf/src/modules/organizations/components/blocks/CardOrganization.vue'
 	
 	const route = useRoute()
-	const store = useStore()
 </script>
 
 <style lang="scss">

package/src/modules/products/components/pages/Products.vue

@@ -76,7 +76,7 @@
           :user="auth.state.access"
           class="h-max"
           @click.capture="$router.push({
-            name: 'Product Organization', 
+            name: 'Organization_Product', 
             params: { 
               _id: route.params._id, 
               product: product._id 
@@ -108,7 +108,7 @@
   // Accessing router and store
   import * as auth from '@pf/src/modules/auth/views/store/auth';
   import * as products from '@pf/src/modules/products/store/products';
-  import * as marketplace from '@pf/src/modules/marketplace/store/marketplace';
+  import * as marketplace from '@pf/src/modules/products/store/marketplace';
   import * as categories from '@pf/src/modules/products/store/categories';
 
   const route = useRoute()

package/src/modules/products/components/sections/FilterProducts.vue

@@ -89,7 +89,7 @@ const route = useRoute()
 const router = useRouter()
 
 import * as categories from '@pf/src/modules/products/store/categories';
-import * as marketplace from '@pf/src/modules/marketplace/store/marketplace';
+import * as marketplace from '@pf/src/modules/products/store/marketplace';
 
 let options = {
   status: 'published'

package/src/modules/{marketplace → products}/components/sections/Filters.vue

@@ -7,7 +7,7 @@
   			:label="t('categoriesTitle')" 
   			class="cursor-pointer pd-thin t-semi radius-extra uppercase p-medium"
   			:class="[
-          store.marketplace.state.filter.categories.length > 0 ? 'bg-white t-black' : ''
+          marketplace.state.filter.categories.length > 0 ? 'bg-white t-black' : ''
         ]"
   		>
   			<div class="w-100 h-100 radius-semi o-hidden bg-black">
@@ -17,8 +17,8 @@
             name="categories"
             :value="category.url"
             class="cursor-pointer  w-100  bg-black t-white radius-small pd-small"
-            :radio="store.marketplace.state.filter.categories"
-            @update:radio="event => store.marketplace.state.filter.categories = event"
+            :radio="marketplace.state.filter.categories"
+            @update:radio="event => marketplace.state.filter.categories = event"
           />
        	</div>
        </Dropdown>
@@ -28,7 +28,7 @@
        	:label="t('filters.price.title')" 
        	class="cursor-pointer pd-thin t-semi radius-extra uppercase p-medium"
        	:class="[
-          store.marketplace.state.filter.prices.length > 0 ? 'bg-white t-black' : ''
+          marketplace.state.filter.prices.length > 0 ? 'bg-white t-black' : ''
         ]"
        >
         <div class="w-100 h-100 radius-semi o-hidden bg-black">
@@ -38,8 +38,8 @@
             name="prices"
             :value="price.value"
             class="cursor-pointer  w-100 mn-t-small bg-black t-white radius-small pd-small"
-            :radio="store.marketplace.state.filter.prices"
-            @update:radio="event => store.marketplace.state.filter.prices = event"
+            :radio="marketplace.state.filter.prices"
+            @update:radio="event => marketplace.state.filter.prices = event"
           />
         </div>
        </Dropdown>
@@ -49,7 +49,7 @@
         id="fitlerDelivery"
        	class="cursor-pointer pd-thin t-semi radius-extra uppercase p-medium"
        	:class="[
-          store.marketplace.state.filter.delivery.length > 0 ? 'bg-white t-black' : ''
+          marketplace.state.filter.delivery.length > 0 ? 'bg-white t-black' : ''
         ]"
       >
         <div class="w-100 h-100 radius-semi o-hidden bg-black">
@@ -59,8 +59,8 @@
             name="prices"
             :value="delivery.value"
             class="cursor-pointer  w-100 mn-t-small bg-black t-white radius-small pd-small"
-            :radio="store.marketplace.state.filter.delivery"
-            @update:radio="event => store.marketplace.state.filter.delivery = event"
+            :radio="marketplace.state.filter.delivery"
+            @update:radio="event => marketplace.state.filter.delivery = event"
           />
         </div>
       </Dropdown>
@@ -72,18 +72,15 @@
 <script setup>
 	import { computed, onMounted, ref } from 'vue'
 
-
  	import Checkbox from "@pf/src/components/Checkbox/Checkbox.vue";
   import Radio from "@pf/src/components/Radio/Radio.vue";
  	import Select from "@pf/src/components/Select/Select.vue";
  	import Dropdown from "@pf/src/components/Dropdown/Dropdown.vue";
 
-	import { useStore } from '@/store'
 	import { useI18n } from 'vue-i18n'
 
-	const store = useStore()
-
-	const categories = computed(() => store.categories.state.all)
+	import * as marketplace from '@pf/src/modules/products/store/marketplace';
+  import * as categories from '@pf/src/modules/products/store/categories';
 
 	const delivery = [
     { label: 'Pickup',					value: 'pickup' },
@@ -148,7 +145,7 @@
       status: 'published'
     }
 
-		await store.categories.actions.fetchCategories(options)
+		await categories.actions.fetchCategories(options)
 	})
 
 	

package/src/modules/products/components/sections/HeroRecommendation.vue

@@ -108,7 +108,7 @@
 				<button 
 					v-for="(preset,index) in presets" 
 					:key="preset" 
-					@click.stop="router.push({name: 'Product Recommmendation', query: {mood: preset}})"
+					@click.stop="router.push({name: 'ProductRecommmendation', query: {mood: preset}})"
 					class="
 						uppercase 
 						pd-thin

package/src/modules/products/components/sections/MenuSection.vue

@@ -11,7 +11,7 @@
 
 			<ul v-else class="gap-thin grid-container">
 				<router-link :to="getMarketplaceLink([category.url])"
-					v-for="(category,index) in store.categories.state.all.slice(0,5)" 
+					v-for="(category,index) in categories.state.all.slice(0,5)" 
 					:key="category" 
 					class="cursor-pointer hover-scale-0 flex-v-center flex-h-center flex-nowrap flex-row flex bg-light radius-big pd-medium grid-item"
 				>
@@ -22,7 +22,7 @@
 						autoplay loop muted
 					>
 					  <source 
-					  	src="/output.webm" 
+					  	:src="'/output.webm'" 
 					  	type="video/webm"
 					  >
 					</video>
@@ -68,14 +68,13 @@
 	import Loader from '@pf/src/components/Loader/Loader.vue'
 
 	import { useRouter } from 'vue-router'
-	import { useStore } from '@/store';	
 	import { useI18n } from 'vue-i18n'
 		
-	
-	const store = useStore()
+	import * as categories from '@pf/src/modules/products/store/categories';
+	import * as products from '@pf/src/modules/products/store/products';
+
 	const router = useRouter()
 	
-
  	const text = {
     locale: 'en',
     messages: {
@@ -88,7 +87,7 @@
     }
   }
 
-  store.categories.state.all.forEach( category => {
+  categories.state.all.forEach( category => {
     category.localization.forEach( localization => {
       text.messages[localization.locale].categories.push(localization.text)
     })
@@ -100,8 +99,8 @@
 	const menu = ref(false)
 
 	onMounted( async () => {
-		countProduct.value = await store.products.actions.read({count: true})
-		await store.categories.actions.fetchCategories()
+		countProduct.value = await products.actions.read({count: true})
+		await categories.actions.fetchCategories()
 		menu.value = true
 	})
 

package/src/modules/products/components/sections/PopularProducts.vue

@@ -18,7 +18,7 @@
 						<CardProduct 
 							v-else 
 							@click="$router.push({
-			          name: 'Product Organization', 
+			          name: 'Organization_Product', 
 			          params: { 
 			            _id: value.organization, 
 			            product: value._id