@ozdao/prometheus-framework 0.2.51 → 0.2.53

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

@@ -1,47 +1,57 @@
 <template>
-  <div class="cols-2-1_3 bg-grey radius-big gap-thin pd-thin">
+  <div class="cols-2-1_3 bg-grey pd-thin radius-big gap-thin">
+
     <FilterProducts
 
     /> 
-    <Feed
-      :states="{
-        empty: {
-          title: 'No Products Found',
-          description: 'Currently, there are no products available.'
-        }
-      }"
-      :store="{
-        read: (options) => products.actions.read(options),
-        state: products.state
-      }"
-      :options="{
-        limit: 15,
-        organization: route.params._id,
-        categories: route.query.categories,
-        prices: route.query.prices,
-        delivery: route.query.delivery,
-        // user: user
-      }"
-      v-slot="{ 
-        items 
-      }"
-      class="cols-3 gap-thin"
-    >
-      <CardProduct
-        v-for="product in items"
-        :key="product._id"
-        :product="product"
-        class="h-max"
-        @click="$router.push({
-          name: 'Product Organization', 
-          params: { 
-            _id: route.params._id, 
-            product: product._id 
-          } 
-        })" 
+
+    <div>
+      <BlockSearch 
+        @search="updateSearch"
+        placeholder="Enter product name"
+        class="bg-white mn-b-thin"
       />
-    </Feed>
 
+      <Feed
+        :states="{
+          empty: {
+            title: 'No Products Found',
+            description: 'Currently, there are no products available.'
+          }
+        }"
+        :store="{
+          read: (options) => products.actions.read(options),
+          state: products.state
+        }"
+        :options="{
+          limit: 15,
+          organization: route.params._id,
+          categories: route.query.categories,
+          prices: route.query.prices,
+          delivery: route.query.delivery,
+          search: route.query.search
+          // user: user
+        }"
+        v-slot="{ 
+          items 
+        }"
+        class="cols-3 gap-thin"
+      >
+        <CardProduct
+          v-for="product in items"
+          :key="product._id"
+          :product="product"
+          class="h-max"
+          @click="$router.push({
+            name: 'Product Organization', 
+            params: { 
+              _id: route.params._id, 
+              product: product._id 
+            } 
+          })" 
+        />
+      </Feed>
+    </div>
   </div>
 </template>
 
@@ -54,6 +64,8 @@
 
   // Import components
   import FilterProducts from '@pf/src/modules/products/components/sections/FilterProducts.vue'
+  import BlockSearch from '@pf/src/modules/globals/components/blocks/BlockSearch.vue'
+  
 
   import Feed from '@pf/src/components/Feed/Feed.vue'
   import CardProduct from '@pf/src/modules/products/components/blocks/CardProduct.vue'
@@ -61,6 +73,14 @@
   // Accessing router and store
   import * as products from '@pf/src/modules/products/store/products';
 
+  function updateSearch(search) {
+    let query = { ...route.query}
+    
+    query.search = search
+    
+    router.push({ query });
+  }
+
   const route = useRoute()
   const router = useRouter()
 </script>

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

@@ -1,8 +1,8 @@
   <template>
-    <div class="pd-medium bg-grey radius-big">
+    <div class="pd-medium bg-white-transp-50 radius-big">
       <!-- Categories Filter -->
       <Spoiler 
-        class="radius-small o-hidden br-1px br-solid br-grey mn-b-small"
+        class="radius-small o-hidden mn-b-small"
         :status="true"
       >
         <template #header>
@@ -22,11 +22,11 @@
         </template>
       </Spoiler>
 
-      <hr class="mn-b-small">
+      <hr class="mn-b-small t-transp">
 
       <!-- Prices Filter -->
       <Spoiler 
-        class="radius-small o-hidden br-1px br-solid br-grey mn-b-small"
+        class="radius-small o-hidden mn-b-small"
         :status="false"
       >
         <template #header>
@@ -46,7 +46,7 @@
         </template>
       </Spoiler>
 
-      <hr class="mn-b-small">
+      <!-- <hr class="mn-b-small"> -->
 
       <!-- Delivery Filter -->
      <!--  <Spoiler 
@@ -91,7 +91,10 @@ const router = useRouter()
 import * as categories from '@pf/src/modules/products/store/categories';
 import * as marketplace from '@pf/src/modules/marketplace/store/marketplace';
 
-await categories.actions.fetchCategories()
+let options = {
+  status: 'published'
+}
+await categories.actions.fetchCategories(options)
 
 let selectedFilters = ref({
   categories: [],

package/src/modules/products/controllers/categories.controller.js

@@ -4,7 +4,17 @@ const controllerFactory = (db) => {
     const getCategories = async (req, res) => {
         console.log(Category)
         try {
-            const categories = await Category.find({}).sort({'order': 'asc'}).exec();
+            
+            let query = {};
+            let options = {};
+
+            // Проверка наличия req.query.organization
+            if (req.query.status) {
+                // Создание ObjectId из строки
+                query.status = req.query.status;
+            }
+
+            const categories = await Category.find(query, null, options).sort({'order': 'asc'}).exec();
             
             if (!categories) {
                 return res.status(404).send({ message: "Categories not found." });
@@ -17,25 +27,27 @@ const controllerFactory = (db) => {
     };
 
     const updateCategories = async (req, res) => {
+        console.log(req.body);
         try {
-            const updates = req.body.all.map(async (categoryUpdated) => {
-                const category = await Category.findOneAndUpdate(
-                    { url: categoryUpdated.url },
-                    { $set: categoryUpdated },
-                    { new: true }
-                ).exec();
-                if (!category) {
-                    throw new Error("Categories is not updated.");
+            const bulkOps = req.body.map((categoryUpdated) => ({
+                updateOne: {
+                    filter: { url: categoryUpdated.url },
+                    update: { $set: categoryUpdated },
+                    upsert: false 
                 }
-            });
-            await Promise.all(updates);
-            console.log('success');
+            }));
+
+            // Выполнение пакетного обновления
+            const result = await Category.bulkWrite(bulkOps, { ordered: false });
+            console.log('Success', result);
             res.status(200).send({ message: "Categories updated successfully." });
         } catch (err) {
-            res.send({ message: err.message });
+            console.error('Error processing bulk update', err);
+            res.status(500).send({ message: err.message });
         }
     };
 
+
     const getCategory = async (req, res) => {
         try {
             const category = await Category.findOne({ url: req.params.url }).exec();
@@ -50,7 +62,12 @@ const controllerFactory = (db) => {
 
     const addCategory = async (req, res) => {
         try {
+
+            const highestOrderDoc = await Category.findOne().sort('-order'); 
+            req.body.order = highestOrderDoc ? highestOrderDoc.order + 1 : 1;
+
             const category = await Category.create(req.body);
+
             if (!category) {
                 return res.status(404).send({ message: "Category is not created." });
             }

package/src/modules/products/controllers/leftovers.controller.js

@@ -1,5 +1,3 @@
-const ObjectId = require('mongoose').Types.ObjectId;
-
 const controllerFactory = (db) => {
   const Leftover = db.leftover;
 
@@ -8,16 +6,25 @@ const controllerFactory = (db) => {
       let query = {};
       let options = {};
 
-      if (req.query.organization) query.organization = new ObjectId(req.query.organization)
+      // Проверка наличия req.query.organization
+      if (req.query.organization) {
+        // Создание ObjectId из строки
+        query.organization = new db.mongoose.Types.ObjectId(req.query.organization);
+      }
+
+      console.log(query);
+
+      const leftoveres = await Leftover.find(query, null, options)
+        .sort({ createdAt: "desc" })
+        .exec();
 
-      const leftoveres = await Leftover.find(query, null, options).sort({ 'createdAt': 'desc' }).exec();
-      
       if (!leftoveres) {
         return res.status(404).send({ message: "LEFTOVERES_NOT_FOUND" });
       }
 
       res.status(200).send(leftoveres);
     } catch (err) {
+      console.error(err);
       res.status(500).send({ message: "ERROR_GET_ALL_LEFTOVERES" });
     }
   };

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

@@ -62,6 +62,24 @@ const controllerFactory = (db) => {
         query.delivery = { $in: deliveryOptions };
       }
 
+      const search = req.query.search;
+
+      if (search) {
+        const parts = search.split('.');
+
+        let regexPattern = '';
+
+        if (parts.length === 2) {
+          // Создаем паттерн, который допускает замену одного символа в каждой части
+          regexPattern = parts.map(part => part.substr(0, part.length - 1) + '.{1}').join('\\.');
+        } else {
+          // Если нет точки, применяем аналогичный подход к всей строке
+          regexPattern = search.substr(0, search.length - 1) + '.{1}';
+        }
+
+        query.name = { $regex: regexPattern, $options: 'i' } 
+      }
+
       // Handle price ranges
       const prices = req.query.prices?.split(',') || [];
 

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

@@ -5,6 +5,16 @@ module.exports = (mongoose) => {
       required: true, 
       trim: true
     }, 
+    status: {
+      type: String,
+      enum: ['draft','internal','published','removed'], 
+      default: 'draft',
+      required: true,
+    },
+    order: {
+      type: Number, 
+      required: true
+    }, 
     url: {
       type: String, 
       required: true, 
@@ -19,38 +29,38 @@ module.exports = (mongoose) => {
     filters: {
       type: Array
     },
-    owner: {
-      type: {
-        type: String,
-        required: true
-      },
-      target: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: function (value) {
-          if (this.owner.type === 'user') return 'User';
-          if (this.owner.type === 'organization') return 'Organization';
-        },
-        required: true,
-      },
-    },
-    creator: {
-      hidden: {
-        type: Boolean,
-        required: true
-      },
-      type: {
-        type: String,
-        required: true
-      },
-      target: {
-        type: mongoose.Schema.Types.ObjectId,
-        ref: function (value) {
-          if (this.owner.type === 'user') return 'User';
-          if (this.owner.type === 'organization') return 'Organization';
-        },
-        required: true,
-      },
-    }
+    // owner: {
+    //   type: {
+    //     type: String,
+    //     required: true
+    //   },
+    //   target: {
+    //     type: mongoose.Schema.Types.ObjectId,
+    //     ref: function (value) {
+    //       if (this.owner.type === 'user') return 'User';
+    //       if (this.owner.type === 'organization') return 'Organization';
+    //     },
+    //     required: true,
+    //   },
+    // },
+    // creator: {
+    //   hidden: {
+    //     type: Boolean,
+    //     required: true
+    //   },
+    //   type: {
+    //     type: String,
+    //     required: true
+    //   },
+    //   target: {
+    //     type: mongoose.Schema.Types.ObjectId,
+    //     ref: function (value) {
+    //       if (this.owner.type === 'user') return 'User';
+    //       if (this.owner.type === 'organization') return 'Organization';
+    //     },
+    //     required: true,
+    //   },
+    // }
   }, {
     timestamps: { 
       currentTime: () => Date.now() 

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

@@ -3,9 +3,11 @@
 import ImagesThumbnails from './components/blocks/ImagesThumbnails.vue';
 import LeftoverPositions from './components/blocks/LeftoverPositions.vue';
 import ListPositions from './components/blocks/ListPositions.vue';
-import CategoryCard from './components/blocks/CategoryCard.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';
 
@@ -50,7 +52,7 @@ export {
   ImagesThumbnails,
   LeftoverPositions,
   ListPositions,
-  CategoryCard,
+  CardCategory,
   CardProduct,
   CardLeftover,
   Images360,

package/src/modules/products/store/categories.js

@@ -11,9 +11,10 @@ const $axios = axios.create({baseURL: process.env.API_URL, withCredentials: true
 const state = reactive({
   all: [],
   current: {
-    order: "1",
+    order: 1,
     name: "",
     url: "",
+    status: "draft",
     subcategories: [],
     filters: [],
     localization: [],
@@ -21,8 +22,9 @@ const state = reactive({
 });
 
 const actions = {
-  async fetchCategories() {
-    return await $axios.get(`/categories`).then(
+  async fetchCategories(options) {
+    console.log(options)
+    return await $axios.get(`/categories`, { params: options }).then(
       categories => {
         state.all = categories.data;
         return Promise.resolve(categories.data);
@@ -86,6 +88,18 @@ const actions = {
     );
   },
 
+  resetCategory(){
+    state.current = {
+      order: 0,
+      name: "",
+      url: "",
+      status: "draft",
+      subcategories: [],
+      filters: [],
+      localization: [],
+    }
+  },
+
   deleteCategory(url) {
     return $axios.delete("/categories/" + url).then(
       (response) => {

package/src/modules/products/store/products.js

@@ -92,6 +92,10 @@ const actions = {
       query.status = options.status;
     }
 
+    if (options.search) {
+      query.search = options.search;
+    }
+
     query.sort = 'createdAt';
     
     query.skip = options.skip || 0;

package/src/modules/backoffice/components/admin/Categories.vue

@@ -1,53 +0,0 @@
-<template>
-<div>
-  <!-- Toolbar -->
-  <section class="pageheader section">
-    <div class="mn-b-big title">
-      <h1>Категории товаров</h1>
-      <router-link :to="'/admin/categories/add'"  class="i-regular pd-thin button-delete button"><img src="@/assets/icons/plus-white.svg"></router-link>
-    </div>
-  </section>
-
-  <section class="bg-grey  section-subsection section">
-    <VueDraggableNext class="dragArea list-group w-full" :list="categories.all"  :sort="true" @change="log">
-        <div  v-for="(category,index) in categories.all"  >
-          {{test(category,index)}}
-           <CategoryCard   :category="category" :key="index" class="list-group-item mn-b-medium"></CategoryCard>
-        </div>
-    </VueDraggableNext>
-    <button @click="store.dispatch('categories/updateCategories', categories)" class="button">Обновить порядок</button>
-  </section>
-</div>
-</template>
-
-
-<script setup>
-
-  import { computed,ref} from 'vue'
-  
-
-  import { VueDraggableNext } from 'vue-draggable-next'
-
-  import CategoryCard from '@/components/blocks/CategoryCard.vue';
-
-
-  const store = useStore()
-
-  await store.dispatch('categories/fetchCategories')
-  
-  const categories = ref(store.state.categories);
-
-  function log(event) {
-    // store.commit('categories/updateCategories', ) 
-  }
-  function test(category,index) {
-    category.order = index;
-    // store.commit('categories/updateCategories', ) 
-  }
-
- 
-</script>
-
-<style lang="scss">
-  
-</style>

package/src/modules/backoffice/components/admin/CategoryEdit.vue

@@ -1,98 +0,0 @@
-<template>
-	<!-- ---------------------------------------------------------------- -->
-	<!-- 01. Page Title  -->
-	<!-- ---------------------------------------------------------------- -->
-	<section class="pageheader section">
-		<div class="mn-b-big title">
-			<h1 v-if="route.params.url">Редактировать категорию</h1>
-			<h1 v-else>Добавить категорию</h1>
-		</div>
-	</section>
-	
-	<!-- ---------------------------------------------------------------- -->
-	<!-- 03. Page Content  -->
-	<!-- ---------------------------------------------------------------- -->
-	<section class=" bg-grey br-bot-dark section-subsection section">
-
-		<form  onsubmit="return false">
-			<!-- ---------------------------------------------------------------- -->
-			<!-- Category Info -->
-			<!-- ---------------------------------------------------------------- -->
-			<div class="mn-b-big flex-column flex block">
-				<div class="w-100 flex-nowrap flex">
-					<InputText :obj="'categories'" :prop="'current.url'" :value="category.url" label="URL категории" class="mn-r-small"/>
-					<InputText :obj="'categories'" :prop="'current.name'" :value="category.name" label="Название"/>
-				</div>
-			</div>
-			<!-- Subcategories -->
-			<EditCategories 
-			:category="category"
-			title="Подкатегории" 
-			obj="categories"
-			prop="current.subcategories"
-			name="subcategories"
-			keyname="name"
-			parname="url"
-			/>
-			<!-- Filters -->
-			<EditCategories 
-			:category="category" 
-			title="Фильтры для категории" 
-			obj="categories"
-			prop='current.filters'
-			name="filters"
-			keyname="name"
-			parname="options"
-			/>
-			<!-- Localization -->
-			<EditCategories 
-			:category="category" 
-			title="Локализация" 
-			obj="categories"
-			prop='current.localization'
-			name="localization"
-			keyname="locale"
-			parname="text"
-			/>
-			<!-- Sumbmit  -->
-			<a @click="onSubmit()" class="button">Сохранить</a> 
-		</form>
-		<!-- End of page form -->
-	</section>  
-	<!-- End of page content -->
-</template>
-
-<script setup>
-	// Import components
-	import InputText  			from '@/components/elements/InputText.vue'
-	import EditCategories  	from '@pf/src/modules/products/components/blocks/EditCategories.vue'
-	import EditFilters  		from '@/components/blocks/EditFilters.vue'
-	// Import libs
-	import { computed, onMounted } from 'vue'
-	
-	import { useRoute } from 'vue-router'
-	// Accessing router and store
-	const store = useStore()
-	const route = useRoute()
-	// Data prefetching
-	if (route.params.url) {
-  	store.dispatch('categories/fetchCategory', route.params.url)
-  } else {
-  	await store.commit('categories/cleanCategoryState')
-  }
-	// Accessing state
-	const category = computed(() => store.state.categories.current)
-	const routePath = computed(() => route.name)
-	// Filters and subcategory
-	function onSubmit() {
-    if (route.params.url) {
-    	store.dispatch('categories/updateCategory', route.params.url)
-  	} else {
-  		store.dispatch('categories/addCategory')
-  	}
-	}
-</script>
-
-<style lang="scss">
-
-</style>

package/src/modules/products/components/blocks/CategoryCard.vue

@@ -1,42 +0,0 @@
-<template>
-	<div class="card">
-    <div class="flex-v-center flex">
-          <h4>{{category.name}}</h4>
-          <div class="actions">
-	          <router-link :to="'/admin/categories/' + category.url + '/edit'" class="mn-r-medium nav-link">Редактировать</router-link>
-	          <a class="nav-link" @click="deleteCategory(category)">Удалить</a>
-	      </div>
-     </div>
-	</div>
-</template>
-
-
-<script>
-	import { toRef,onMounted } from 'vue'
-	
-	export default {
-		props: ['category'], 
-		name: 'CategoryCard',
-		setup(props) {
-			onMounted(() => {
-			})
-
-			return {
-			}
-		},
-    methods: {
-    	deleteCategory(category) {
-		    this.$store.commit('categories/deleteCategory', category);
-		    this.$store.dispatch('categories/deleteCategory', category.url)
-		}
-    }
-	}
-</script>
-
-<style lang="scss">
-.categories-card {
-
-}
-</style>
-
-