@ozdao/prometheus-framework 0.2.251 → 0.2.253

package/src/modules/products/models/category.model.js

@@ -1,5 +1,5 @@
-module.exports = (mongoose) => {
-  const СategorySchema = new mongoose.Schema({
+module.exports = (db) => {
+  const СategorySchema = new db.mongoose.Schema({
     name: {
       type: String, 
       required: true, 
@@ -69,7 +69,7 @@ module.exports = (mongoose) => {
 
   СategorySchema.index({ 'owner.target': 1, 'creator.target': 1});
 
-  const Сategory = mongoose.model('Сategory', СategorySchema, 'categories');
+  const Сategory = db.mongoose.model('Сategory', СategorySchema, 'categories');
 
   return Сategory;
 }

package/src/modules/products/models/product.model.js

@@ -1,5 +1,5 @@
-module.exports = (mongoose) => {
-    const ProductSchema = new mongoose.Schema({
+module.exports = (db) => {
+    const ProductSchema = new db.mongoose.Schema({
         status:         {type: String}, 
         name:           {type: String}, 
         category:       {type: Array},
@@ -19,7 +19,7 @@ module.exports = (mongoose) => {
         prices: { type: Array}, 
         // 
         variants: [{ 
-            _id: { type: mongoose.Schema.Types.ObjectId, auto: true },
+            _id: { type: db.mongoose.Schema.Types.ObjectId, auto: true },
             name: { type: String }, 
             price:{ type: Number },
             options: [{ 
@@ -30,7 +30,7 @@ module.exports = (mongoose) => {
         }],
         ingredients: [{
             _id: {
-                type: mongoose.Schema.Types.ObjectId,
+                type: db.mongoose.Schema.Types.ObjectId,
                 ref: 'Product',
             },
             price: {
@@ -65,11 +65,11 @@ module.exports = (mongoose) => {
         }],
         // Refactor
         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',
         },
     }, {
@@ -83,7 +83,7 @@ module.exports = (mongoose) => {
     ProductSchema.index({ price: 1 }); // Создаем индекс
 
 
-    const Product = mongoose.model('Product', ProductSchema);
+    const Product = db.mongoose.model('Product', ProductSchema);
 
     return Product;
 }

package/src/modules/products/products.client.js

@@ -1,47 +1,116 @@
-// Импортирование Vue компонентов
-// import EditFilters from './components/blocks/EditFilters.vue';
+// Router
+import { createProductRoutes } from './router/products.router';
+import routerMarketplace from './router/marketplace.router.js';
+
+//Store
+import * as storeCategories from './store/categories.js';
+import * as storeLeftovers from './store/leftovers.js';
+import * as storeProducts from './store/products.js';
+import * as storeMarketplace from './store/marketplace.js';
+
+// Layouts 
+import Marketplace from './components/layouts/Marketplace.vue';
+
+// Blocks
 import ImagesThumbnails from './components/blocks/ImagesThumbnails.vue';
 import LeftoverPositions from './components/blocks/LeftoverPositions.vue';
 import ListPositions from './components/blocks/ListPositions.vue';
-
 import CardCategory from './components/blocks/CardCategory.vue';
 import CardProduct from './components/blocks/CardProduct.vue';
 import CardLeftover from './components/blocks/CardLeftover.vue';
-
 import Images360 from './components/blocks/Images360.vue';
 import CardPosition from './components/blocks/CardPosition.vue';
 
+// Sections
 import SectionProduct from './components/sections/SectionProduct.vue';
-// import ProductInformationSection from './components/sections/ProductInformationSection.vue';
 import HeroRecommendation from './components/sections/HeroRecommendation.vue';
 import FilterProducts from './components/sections/FilterProducts.vue';
-// import MenuSection from './components/sections/MenuSection.vue';
+import MenuSection from './components/sections/MenuSection.vue';
 import EditModifications from './components/sections/EditModifications.vue';
 import PopularProducts from './components/sections/PopularProducts.vue';
 import EditProductInfo from './components/sections/EditProductInfo.vue';
+import Filters from './components/sections/Filters.vue';
 
+// Elements
 import Price from './components/elements/Price.vue';
 import THC from './components/elements/THC.vue';
 
+// Pages
 import Product from './components/pages/Product.vue';
-
 import ProductEdit from './components/pages/ProductEdit.vue';
 import EditLeftover from './components/pages/EditLeftover.vue';
-import ProductRecommendation from './components/pages/ProductRecommmendation.vue'; // Исправленная опечатка
+import ProductRecommendation from './components/pages/ProductRecommmendation.vue';
 import Products from './components/pages/Products.vue';
 import Leftovers from './components/pages/Leftovers.vue';
+import Catalog from './components/pages/Catalog.vue';
+
+// Пример функции инициализации для модуля продуктов
+function initializeProducts(app, store, router, options = {}) {
+  const route = options.route || 'Home';
 
-// Импортирование Vuex модулей хранилища
-import * as categoriesStore from './store/categories.js';
-import * as leftoversStore from './store/leftovers.js';
-import * as productsStore from './store/products.js';
+  const routesProducts = createProductRoutes();
+  
+  router.addRoute(route, routesProducts);
 
-// Импортирование Vue Router маршрутов
-// import productsRoutes from './router/products.router.js';
+  router.addRoute(route, routerMarketplace);
+  
+  store.addStore('categories', storeCategories);
+  store.addStore('leftovers', storeLeftovers);
+  store.addStore('products', storeProducts);
+  store.addStore('marketplace', storeMarketplace);
+}
+
+const ModuleProducts = {
+  initialize: initializeProducts,
+  views: {
+    store: {
+      storeCategories,
+      storeLeftovers,
+      storeProducts,
+      storeMarketplace,
+      routerMarketplace
+    },
+    router: {
+      createProductRoutes
+    },
+    components: {
+      // Elements
+      Price,
+      THC,
+      // Blocks
+      ImagesThumbnails,
+      LeftoverPositions,
+      ListPositions,
+      CardCategory,
+      CardProduct,
+      CardLeftover,
+      Images360,
+      CardPosition,
+      // Sections
+      SectionProduct,
+      HeroRecommendation,
+      FilterProducts,
+      MenuSection,
+      EditModifications,
+      PopularProducts,
+      EditProductInfo,
+      Filters,
+      // Pages
+      Product,
+      ProductEdit,
+      EditLeftover,
+      ProductRecommendation,
+      Products,
+      Leftovers,
+      Catalog,
+      // Layouts
+      Marketplace
+    }
+  }
+}
 
-// Экспортирование компонентов, модулей хранилища и маршрутов
 export {
-  // EditFilters,
+  // Blocks
   ImagesThumbnails,
   LeftoverPositions,
   ListPositions,
@@ -50,29 +119,28 @@ export {
   CardLeftover,
   Images360,
   CardPosition,
-
+  // Sections
   SectionProduct,
-  // ProductInformationSection,
   HeroRecommendation,
   FilterProducts,
-  // MenuSection,
+  MenuSection,
   EditModifications,
   PopularProducts,
   EditProductInfo,
-
+  Filters,
+  // Elements
   Price,
   THC,
-
+  // Pages
   Product,
   ProductEdit,
   EditLeftover,
   ProductRecommendation,
   Products,
   Leftovers,
-
-  categoriesStore,
-  leftoversStore,
-  productsStore,
-
-  // productsRoutes
+  Catalog,
+  // Layouts
+  Marketplace
 };
+
+export default ModuleProducts;

package/src/modules/products/products.server.js

@@ -1,17 +1,48 @@
-// Models
-import ProductModel from './models/product.model.js';
-import CategoryModel from './models/category.model.js';
-import LeftoverModel from './models/leftover.model.js';
-// Routes
-import productsRoutes from './routes/products.routes.js'
-import categoriesRoutes from './routes/categories.routes.js'
-import leftoversRoutes from './routes/leftovers.routes.js'
+// Импортируем модели
+const ProductModel = require('./models/product.model.js');
+const CategoryModel = require('./models/category.model.js');
+const LeftoverModel = require('./models/leftover.model.js');
 
-export {
-	ProductModel,
-	CategoryModel,
-	LeftoverModel,
-	productsRoutes,
-	categoriesRoutes,
-	leftoversRoutes
-}
+// Импортируем роуты
+const productsRoutes = require('./routes/products.routes.js');
+const categoriesRoutes = require('./routes/categories.routes.js');
+const leftoversRoutes = require('./routes/leftovers.routes.js');
+
+// Импортируем контроллеры (предполагаем, что они существуют или будут созданы)
+const ProductController = require('./controllers/products.controller.js');
+const CategoryController = require('./controllers/categories.controller.js');
+const LeftoverController = require('./controllers/leftovers.controller.js');
+
+function initializeProduct(app, db, origins, publicPath) {
+  // Настраиваем модели в объекте базы данных
+  db.product = ProductModel(db);
+  db.category = CategoryModel(db);
+  db.leftover = LeftoverModel(db);
+
+  // Настраиваем маршруты, если объект приложения передан
+  if (app) {
+    productsRoutes(app, db, origins, publicPath);
+    categoriesRoutes(app, db, origins, publicPath);
+    leftoversRoutes(app, db, origins, publicPath);
+  }
+}
+
+// Экспортируем функцию инициализации, контроллеры, роуты и модели
+module.exports = {
+  initialize: initializeProduct,
+  models: {
+    ProductModel,
+    CategoryModel,
+    LeftoverModel,
+  },
+  routes: {
+    productsRoutes,
+    categoriesRoutes,
+    leftoversRoutes,
+  },
+  controllers: {
+    ProductController,
+    CategoryController,
+    LeftoverController,
+  }
+};

package/src/modules/products/router/marketplace.router.js

@@ -0,0 +1,38 @@
+import layoutEmpty from '@pf/src/modules/globals/views/components/layouts/Empty.vue'
+import layoutMarketplace from '../components/layouts/Marketplace.vue'
+
+const marketplace = {
+  path: 'marketplace',
+  component: layoutMarketplace,
+  name: 'Marketplace',
+  meta: {
+    title: {
+      en: 'Marketplace',
+      ru: 'Маркетплейс'
+    }
+  },
+  children: [
+    {
+      path: ':country?',
+      component: () => import(/* webpackChunkName: 'Deliveries' */ '../components/pages/Catalog.vue'),
+      children: [
+        {
+          path: ':state?',
+          name: 'State',
+          component: () => import(/* webpackChunkName: 'Deliveries' */ '../components/pages/Catalog.vue'),
+          children: [
+            {
+              path: ':city?',
+              name: 'City',
+              component: () => import(/* webpackChunkName: 'Deliveries' */ '../components/pages/Catalog.vue'),
+            }
+          ]
+        }
+      ]
+    },
+  ],
+}
+
+
+
+export default marketplace;

package/src/modules/products/router/products.router.js

@@ -1,35 +1,75 @@
 import * as validationAuth from '@pf/src/modules/auth/views/middlewares/auth.validation';
 
-const productRoutes = [{
-  path: 'products',
-  name: 'Products',
-  meta: {
-    title: {
-      en: 'Products',
-      ru: 'Товары'
-    },
-    authorize: []
-  },
-  component: () => import(/* webpackChunkName: 'Products' */ '@pf/src/modules/products/components/pages/Products.vue'),
-},{
-  path: 'products/add',
-  name: 'ProductAdd',
-  component: () => import('@pf/src/modules/products/components/pages/ProductEdit.vue')
-},{
-  path: 'products/:product',
-  name: 'Product Organization',
-  meta: {
-    title: {
-      en: 'Product',
-      ru: 'Продукт'
-    }
-  },
-  component: () => import('@pf/src/modules/products/components/pages/Product.vue')
-}, {
-  path: 'products/:product/edit',
-  name: 'ProductEdit',
-  beforeEnter: [validationAuth.requiresAuth],
-  component: () => import('@pf/src/modules/products/components/pages/ProductEdit.vue')
-}];  
+export function createProductRoutes(prefix = '', options = {}) {
+  const nameWithPrefix = (name) => prefix ? `${prefix}${name}` : name;
 
-export default productRoutes;
+  const routes = {
+    path: options.basePath || 'products',
+    children: [
+      {
+        path: '',
+        name: nameWithPrefix('Products'),
+        meta: {
+          title: {
+            en: 'Products',
+            ru: 'Товары'
+          },
+          authorize: options.productsAuthorize || []
+        },
+        component: () => import(/* webpackChunkName: 'Products' */ '@pf/src/modules/products/components/pages/Products.vue'),
+      },
+      {
+        path: 'add',
+        name: nameWithPrefix('ProductAdd'),
+        meta: {
+          title: {
+            en: 'Add Product',
+            ru: 'Добавить товар'
+          },
+          authorize: options.addProductAuthorize || []
+        },
+        component: () => import('@pf/src/modules/products/components/pages/ProductEdit.vue')
+      },
+      {
+        path: ':product',
+        name: nameWithPrefix('Product'),
+        meta: {
+          title: {
+            en: 'Product',
+            ru: 'Продукт'
+          }
+        },
+        component: () => import('@pf/src/modules/products/components/pages/Product.vue')
+      },
+      {
+        path: ':product/edit',
+        name: nameWithPrefix('ProductEdit'),
+        meta: {
+          title: {
+            en: 'Edit Product',
+            ru: 'Редактировать продукт'
+          },
+          authorize: options.editProductAuthorize || []
+        },
+        beforeEnter: [validationAuth.requiresAuth],
+        component: () => import('@pf/src/modules/products/components/pages/ProductEdit.vue')
+      },
+      {
+        path: 'recommendation',
+        name: nameWithPrefix('ProductRecommmendation'),
+        meta: {
+          title: {
+            en: 'Product Recommmendation',
+            ru: 'Рекомендации продукта'
+          },
+          header_theme: 'dark',
+          footer_theme: 'dark',
+        },
+        component: () => import(/* webpackChunkName: 'Product Recommmendation' */ '@pf/src/modules/products/components/pages/ProductRecommmendation.vue'),
+        props: route => ({ mood: route.query.mood })
+      }
+    ]
+  };
+
+  return routes;
+}

package/src/modules/spots/components/layouts/Spots.vue

@@ -61,7 +61,7 @@
 
 	import * as globals from '@pf/src/modules/globals/views/store/globals';
 	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';
 
 	// Accessing router and store
 	const route = useRoute()

package/src/modules/spots/components/pages/Map.vue

@@ -25,7 +25,7 @@ import Button from '@pf/src/components/Button/Button.vue'
 import { state, actions } from '@pf/src/modules/organizations/store/organizations'
 
 import * as globals from '@pf/src/modules/globals/views/store/globals';
-import * as marketplace from '@pf/src/modules/marketplace/store/marketplace';
+import * as marketplace from '@pf/src/modules/products/store/marketplace';
 
 const router = useRouter();
 const route = useRoute();

package/src/modules/spots/components/pages/Spot.vue

@@ -92,7 +92,7 @@ import Map      from '@pf/src/components/Map/Map.vue';
 
 
 import SpotSub from '@pf/src/modules/spots/components/blocks/SpotSub.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({
   spot: Object,

package/src/modules/backoffice/router/admin.js

@@ -1,51 +0,0 @@
-// import layoutAdmin from '/src/components/layout/admin.vue'
-
-// const admin = [
-//   {
-//     path: 'admin',
-//     component: layoutAdmin,
-//     meta: { authorize: ["ROLE_MODERATOR"] }, 
-//     children: [{
-//       path: 'backcalls',
-//       name: 'Backcalls',
-//       // meta: { authorize: ["ROLE_MODERATOR"] }, 
-//       component: () => import(/* webpackChunkName: 'Backcalls' */ '@/components/pages/admin/Backcalls.vue')
-//     },{
-//       path: 'fastorder',
-//       name: 'FastOrders',
-//       // meta: { authorize: ["ROLE_MODERATOR"] }, 
-//       component: () => import(/* webpackChunkName: 'FastOrders' */ '@/components/pages/admin/FastOrders.vue')
-//     },{
-//       path: 'users',
-//       name: 'Users',
-//       component: () => import(/* webpackChunkName: 'Users' */ '@/components/pages/admin/Users.vue')
-//     },{
-//       path: 'users/:phone',
-//       name: 'User',
-//       component: () => import(/* webpackChunkName: 'User' */ '@/components/pages/admin/User.vue')
-//     }]
-//   } 
-// ];
-
-// export default admin;
-
-import layoutBackoffice from '../components/layouts/Backoffice.vue'
-
-const backofficeRoutes = [{
-  path: 'backoffice',
-  component: layoutBackoffice,
-  children: [{
-    path: ':_id',
-    name: 'Backoffice',
-    meta: {
-      title: {
-        en: 'Backoffice',
-        ru: 'Управление'
-      },
-      authorize: []
-    },
-    component: () => import(/* webpackChunkName: 'BackofficeGallery' */ '@pf/src/modules/gallery/components/sections/BackofficeGallery.vue'),
-  }]
-}];
-
-export default backofficeRoutes;

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

@@ -1,3 +0,0 @@
-<template>
-  <div>404 Not Found</div>
-</template>