@ozdao/prometheus-framework 0.2.52 → 0.2.54

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

@@ -0,0 +1,90 @@
+<template>
+  <div class="pd-thin">
+    <Block class="radius-big mn-b-thin flex-nowrap flex-v-center flex">
+      <h1 class="mn-r-auto">
+        Product Categories
+      </h1>
+
+      <router-link 
+        :to="{
+          name: 'CategoryAdd', 
+          params: { 
+            _id: $route.params._id
+          } 
+        }"
+        class="mn-r-medium uppercase t-medium pd-small radius-big  bg-white nav-link"
+      >
+        Add category
+      </router-link>
+
+      <Button 
+        @click="updateCategoriesOrder" 
+        class="pd-small radius-big bg-black t-white uppercase t-medium"
+      >
+        Change Order
+      </Button>
+    </Block>
+
+    <VueDraggableNext 
+      class="dragArea list-group w-full" 
+      :list="categories.state.all" 
+      item-key="order" 
+      @end="updateOrder"
+    >
+      <CardCategory 
+        v-for="(category, index) in categories.state.all"
+        :key="category.id"
+        :category="category" 
+        @delete="deleteCategory"
+        class="pd-medium bg-grey radius-medium mn-b-thin"
+      />
+    </VueDraggableNext>
+  </div>
+</template>
+
+<script setup>
+  import { onMounted } from 'vue';
+  import { VueDraggableNext } from 'vue-draggable-next';
+
+  import { useRoute, useRouter } from 'vue-router';
+
+  import * as categories from '@pf/src/modules/products/store/categories'; 
+
+  const route = useRoute();
+  const router = useRouter();
+
+  import Button from "@pf/src/components/Button/Button.vue";
+  import Block from '@pf/src/components/Block/Block.vue';
+  import CardCategory from '@pf/src/modules/products/components/blocks/CardCategory.vue';
+
+  onMounted(async () => {
+    await categories.actions.fetchCategories();
+  });
+
+  function updateOrder() {
+    categories.state.all.forEach((category, index) => {
+      category.order = index;
+    });
+    updateCategoriesOrder();
+  }
+
+  async function updateCategoriesOrder() {
+    await categories.actions.updateCategories(categories.state.all);
+  }
+
+  async function deleteCategory(category) {
+  // Запрашиваем подтверждение у пользователя
+    const isConfirmed = confirm(`Are you sure you want to delete the category "${category.name}"?`);
+    
+    // Если пользователь подтвердил удаление, продолжаем процесс
+    if (isConfirmed) {
+      await categories.actions.deleteCategory(category.url);
+    } else {
+      alert('Category deletion cancelled'); 
+    }
+  }
+
+</script>
+
+<style lang="scss">
+</style>

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

@@ -0,0 +1,214 @@
+<template>
+  <Block class="radius-big mn-b-thin flex-nowrap flex-v-center flex">
+    <h1 class="mn-r-auto">
+      {{route.params.category ? 'Edit Category' : 'Add Category'}}
+    </h1>
+
+    <Button 
+      :submit="onSubmit"
+      :callback="redirectTo"
+      class="pd-small radius-big bg-main t-black uppercase t-medium"
+    >
+      Save Category 
+    </Button>
+  </Block>
+  
+  <Block 
+    title="Profile"
+    class="mn-b-thin"
+  >
+    <div class="mn-b-medium w-100 flex-nowrap gap-thin flex">
+       <Field
+          v-model:field="categories.state.current.order"
+          label="Order"
+          :disabled="true"
+          class="w-25 bg-white radius-small pd-medium"
+        />  
+       <Field
+          v-model:field="categories.state.current.url"
+          label="URL"
+          placeholder="Enter category URL"
+          class="w-100 bg-white radius-small pd-medium"
+        />  
+        <Field
+          v-model:field="categories.state.current.name"
+          label="Name"
+          placeholder="Enter category name"
+          class="w-100 bg-white radius-small pd-medium"
+        />  
+    </div>
+
+    <Select 
+      v-model:select="categories.state.current.status"
+      label="Status"
+      :options="[
+        'draft', 
+        'internal',
+        'published',
+        'removed'
+      ]"
+      placeholder="Display product"
+      class="pos-relative w-100 mn-b-small bg-white radius-small pd-medium"
+    />
+
+    <div class="flex-v-center flex-nowrap flex">
+      <h4  class="mn-r-thin t-medium">Localization</h4>
+        
+      <button 
+        @click="() => categories.state.current.localization.push({locale: '', text: ''})" 
+        class="i-small pd-thin button-delete button"
+      >
+        +
+      </button>
+    </div>
+    <div 
+      class="gap-thin mn-b-thin flex-nowrap flex" 
+      v-for="(item, index) in categories.state.current.localization" 
+      :key="index"
+    > 
+      <Field
+        v-model:field="item.locale"
+        placeholder="Locale"
+        class="w-100 bg-white radius-small pd-medium"
+      />  
+      <Field
+        v-model:field="item.text"
+        placeholder="Text"
+        class="w-100 bg-white radius-small pd-medium"
+      />
+      <div
+        @click="() => categories.state.current.localization.splice(index, 1)"  
+        class="radius-small pd-small flex-center flex aspect-1x1 bg-red"
+      >
+        <IconDelete 
+          class="i-medium"
+        />
+      </div>
+    </div>
+
+    
+  </Block>
+  <!-- Subcategories -->
+  <Block
+    title="Subcategories"
+    placeholder="No subcategories added yet"
+    :actions="[{
+      label: '+',
+      function: () => categories.state.current.subcategories.push({name: '', url: ''})
+    }]"
+    class="mn-b-thin"
+  >
+    <div 
+      class="gap-thin mn-b-thin flex-nowrap flex" 
+      v-for="(item, index) in categories.state.current.subcategories" 
+      :key="index"
+    > 
+      <Field
+        v-model:field="item.name"
+        placeholder="Subcategory name"
+        class="w-100 bg-white radius-small pd-medium"
+      />  
+      <Field
+        v-model:field="item.url"
+        placeholder="Subcategory"
+        class="w-100 bg-white radius-small pd-medium"
+      />
+      <div
+        @click="() => categories.state.current.subcategories.splice(index, 1)"  
+        class="radius-small pd-small flex-center flex aspect-1x1 bg-red"
+      >
+        <IconDelete 
+          class="i-medium"
+        />
+      </div>
+    </div> 
+  </Block>
+   <!-- Filters -->
+  <Block
+    title="Filters"
+    placeholder="No filters added yet"
+    :actions="[{
+      label: '+',
+      function: () => categories.state.current.filters.push({name: '', url: ''})
+    }]"
+  >
+    <div 
+      class="gap-thin mn-b-thin flex-nowrap flex" 
+      v-for="(item, index) in categories.state.current.filters" 
+      :key="index"
+    > 
+      <Field
+        v-model:field="item.name"
+        placeholder="Filter name"
+        class="w-100 bg-white radius-small pd-medium"
+      />  
+      <Field
+        v-model:field="item.options"
+        placeholder="Filter options divided by ,"
+        class="w-100 bg-white radius-small pd-medium"
+      />
+      <div
+        @click="() => categories.state.current.filters.splice(index, 1)"  
+        class="radius-small pd-small flex-center flex aspect-1x1 bg-red"
+      >
+        <IconDelete 
+          class="i-medium"
+        />
+      </div>
+    </div> 
+  </Block>
+ 
+</template>
+
+<script setup>
+  // Import libs
+  import { computed } from 'vue'
+  import { useRoute,useRouter } from 'vue-router'
+  
+  import IconDelete from '@pf/src/modules/icons/navigation/IconDelete.vue';
+
+  import Button from "@pf/src/components/Button/Button.vue";
+  import Select from "@pf/src/components/Select/Select.vue";
+  import Field from "@pf/src/components/Field/Field.vue";
+
+  import Block from '@pf/src/components/Block/Block.vue';
+
+  // Import the new store structure
+  import * as categories from '@pf/src/modules/products/store/categories';
+
+  const route = useRoute()
+  const router = useRouter()
+
+  // Data prefetching
+  if (route.params.category) {
+    categories.actions.fetchCategory(route.params.category)
+  } else {
+    categories.actions.resetCategory() // Adjusted based on the new store's method to reset the category state
+  }
+
+  // Accessing state
+  const category = computed(() => categories.state.current)
+  const routePath = computed(() => route.name)
+
+  // Functions
+  function onSubmit() {
+    if (route.params.category) {
+      categories.actions.updateCategory(route.params.category)
+    } else {
+      categories.actions.addCategory()
+    }
+  }
+
+  function redirectTo () {
+    router.push({
+      name: 'Categories Organization', 
+      params: { 
+        _id: route.params._id
+      } 
+    })
+  }
+</script>
+
+<style lang="scss">
+  /* Your styles here */
+</style>

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

@@ -48,6 +48,15 @@
 
 			<Block
   			title="Categories"
+  			:actions="[{
+	        label: '+',
+	        function: () => router.push({
+						name: 'Categories Organization', 
+						params: { 
+							_id: route.params._id
+						} 
+					})
+	      }]"
   		>
 				<Checkbox 
 					v-for="(category, index) in categories.state.all"
@@ -224,7 +233,6 @@
 	import Block from '@pf/src/components/Block/Block.vue';
 	import Tab from "@pf/src/components/Tab/Tab.vue";
 	import Field from "@pf/src/components/Field/Field.vue";
-	import Select from "@pf/src/components/Select/Select.vue";
 	import Checkbox from "@pf/src/components/Checkbox/Checkbox.vue";
 	import Button from "@pf/src/components/Button/Button.vue";
 	import Popup from "@pf/src/components/Popup/Popup.vue";

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

@@ -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/products.controller.js

@@ -5,11 +5,12 @@ const path = require('path');
 
 const OpenAI = require("openai");
 
-console.log(process.env.OPENAI_API_KEY)
 const openai = new OpenAI({
-  apiKey: process.env.OPENAI_API_KEY
+  organization: process.env.OPENAI_ORG_KEY,
+  apiKey: process.env.OPENAI_API_KEY,
 });
 
+
 // Factory
 const controllerFactory = (db) => {
   const Product = db.product;

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/users/components/pages/Profile.vue

@@ -203,7 +203,7 @@
 			    </span>
 			  </MenuItem>
 
-			  <MenuItem 
+			  <!-- <MenuItem 
 			  	@click="router.push({
 			  		name: 'Legal', 
 			  		params: {
@@ -214,7 +214,7 @@
 			    <span>
 			    	About
 			    </span>
-			  </MenuItem>
+			  </MenuItem> -->
 			  
 			  <MenuItem 
 			  	class="cursor-pointer"

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>