@ozdao/prometheus-framework 0.2.308 → 0.2.310

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

@@ -1,11 +1,11 @@
 <template>
-	<div class="for-transition w-100 cols-1 pd-thin gap-thin">
+	<div class="for-transition w-100 cols-1 bg-white pd-thin gap-thin">
     
-    <Block class="flex-nowrap flex-v-center flex">
+    <Block v-if="!MOBILE_APP" class="flex-nowrap gap-small flex-v-center flex">
       
-      <h1 class="mn-r-auto">
+      <h2 class="t-nowrap mn-r-auto">
 			  {{ route.params.product ? products.state.current.name : 'Create Product' }}
-			</h1>
+			</h2>
 
 			<Button 
 				v-if="route.params.product"
@@ -46,6 +46,63 @@
 				/>
 			</Block>
 
+			<Block
+				title="Categories"
+				:actions="[{
+		      label: '+',
+		      function: () => router.push({
+						name: 'Categories', 
+						params: { 
+							_id: route.params._id
+						} 
+					})
+		    }]"
+			>
+				<Checkbox 
+					v-for="(category, index) in categories.state.all"
+		      :label="category.name"
+		      name="categories"
+		      :value="category.url"
+		      class="w-100 mn-t-small bg-white radius-small pd-small"
+		      :radio="products.state.current.category"
+		      @update:radio="event => products.state.current.category = event"
+		    />
+			</Block>
+
+			<Block
+				title="Parameters"
+				placeholder="No parameters added yet"
+				:actions="[{
+					label: '+',
+					function: () => products.state.current.information.push({name: '', value: ''})
+				}]"
+				class="cols-1 gap-thin"
+			>
+        <div 
+        	class="gap-thin flex-nowrap flex" 
+        	v-for="(item, index) in products.state.current.information" 
+        	:key="index"
+        > 
+          <Field
+            v-model:field="item.name"
+            placeholder="Название параметра"
+            class="w-100 bg-white radius-small pd-medium"
+          />  
+          <Field
+            v-model:field="item.value"
+            placeholder="Значение параметра"
+            class="w-100 bg-white radius-small pd-medium"
+          />
+          <div class="radius-small h-100 i-big flex-center flex aspect-1x1 bg-red">
+	          <IconDelete 
+	          	@click="() => products.state.current.information.splice(index, 1)" 
+	          	class="i-medium"
+	          />
+	        </div>
+        </div>
+			</Block>
+
+
 			<Block
 		    title="Ingredients"
 				placeholder="No ingridients added yet"
@@ -127,64 +184,6 @@
 
 		</div> 
 
-			<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"
-          :label="category.name"
-          name="categories"
-          :value="category.url"
-          class="w-100 mn-t-small bg-white radius-small pd-small"
-          :radio="products.state.current.category"
-          @update:radio="event => products.state.current.category = event"
-        />
-			</Block>
-
-
-			<Block
-				title="Parameters"
-				placeholder="No parameters added yet"
-				:actions="[{
-					label: '+',
-					function: () => products.state.current.information.push({name: '', value: ''})
-				}]"
-				class="cols-1 gap-thin"
-			>
-        <div 
-        	class="gap-thin flex-nowrap flex" 
-        	v-for="(item, index) in products.state.current.information" 
-        	:key="index"
-        > 
-          <Field
-            v-model:field="item.name"
-            placeholder="Название параметра"
-            class="w-100 bg-white radius-small pd-medium"
-          />  
-          <Field
-            v-model:field="item.value"
-            placeholder="Значение параметра"
-            class="w-100 bg-white radius-small pd-medium"
-          />
-          <div class="radius-small h-100 i-big flex-center flex aspect-1x1 bg-red">
-	          <IconDelete 
-	          	@click="() => products.state.current.information.splice(index, 1)" 
-	          	class="i-medium"
-	          />
-	        </div>
-        </div>
-			</Block>
-
-
 			<Block
 				title="Localization"
 				placeholder="No localizations added yet"
@@ -217,6 +216,23 @@
         </div>
 			</Block>
 
+			<Button 
+				v-if="route.params.product"
+      	:submit="onDelete" 
+      	:callback="redirectTo"
+      	class="bg-red w-100 mn-b-thin"
+      >
+    		Delete 
+    	</Button>
+
+      <Button 
+      	:submit="onSubmit" 
+      	:callback="redirectTo"
+      	class="w-100 bg-main"
+      >
+    		Save
+    	</Button>
+
 	
 		
 		<!-- <Block
@@ -278,7 +294,7 @@
 	import Popup from "@pf/src/components/Popup/Popup.vue";
 	import Feed from "@pf/src/components/Feed/Feed.vue";
 
-	import EditImages           from '@pf/src/components/EditImages/EditImages.vue';
+	import EditImages from '@pf/src/components/EditImages/EditImages.vue';
 
 	import IconDelete from '@pf/src/modules/icons/navigation/IconDelete.vue';
 
@@ -291,9 +307,12 @@
   
 	// Accessing router and store
 	import * as globals from '@pf/src/modules/globals/views/store/globals';
+	import * as auth from '@pf/src/modules/auth/views/store/auth';
  	import * as products from '@pf/src/modules/products/store/products';
   import * as categories from '@pf/src/modules/products/store/categories';
 
+	import { setError } from '@pf/src/modules/globals/views/store/globals'
+	
 	const route = useRoute()
 	const router = useRouter()
 
@@ -340,12 +359,31 @@
 	  products.state.current.images = newImages;
 	}
 	
-	function onSubmit() {
-		if (route.params.product) {
-			products.actions.update(route.params.product, products.state.current)
-		} else {
-			products.actions.create(route.params._id, products.state.current)
-		}
+	async function onSubmit() {
+	  try {
+	    if (route.params.product) {
+	      await products.actions.update(route.params.product, products.state.current)
+	    } else {
+	      products.state.current.owner = {
+	        target: route.params._id || auth.state.user._id,
+	        type: route.params._id ? 'organization' : 'user'
+	      }
+	      
+	      products.state.current.creator = {
+	        target: auth.state.user._id,
+	        type: 'user',
+	        hidden: false
+	      }
+	      await products.actions.create(products.state.current)
+	    }
+	  } catch (error) {
+	  	setError({ response: { data: { errorCode: "PRODUCT_NOT_CREATED" }} })
+	    console.error('Product creation error:', error)
+	    // Здесь можно добавить обработку ошибки, например:
+	    // - показать уведомление пользователю
+	    // - отправить ошибку в систему мониторинга
+	    // - выполнить откат изменений при необходимости
+	  }
 	}
 
 	function onDelete() {

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

@@ -7,7 +7,7 @@
       <h2 class="mn-r-medium">Products</h2>
       <button 
         @click="$router.push({
-          name: route.params._id ? 'Organization_ProductAdd' : 'ProductAdd'
+          name: route.params?._id ? 'Organization_ProductAdd' : 'ProductAdd'
         })" 
         class="radius-100 i-big hover-scale-1 cursor-pointer t-white bg-second">
           +
@@ -31,8 +31,9 @@
         gap-micro pd-small pd-t-thin pd-b-thin
         pos-sticky pos-t-0
         z-index-1
+
       "
-      tabClass="bg-white pd-small radius-small w-100"
+      tabClass="bg-white  uppercase pd-small radius-small w-100"
   />
 
   <div class="cols-2-1_3 h-100 z-index-3 pos-relative radius-big gap-thin">
@@ -67,7 +68,7 @@
         }"
         :options="{
           limit: 15,
-          organization: route.params._id,
+          owner: route.params._id,
           categories: route.query.categories,
           prices: route.query.prices,
           delivery: route.query.delivery,
@@ -78,23 +79,22 @@
         v-slot="{ 
           items 
         }"
-        class="cols-4 pd-thin gap-thin"
+        class="cols-4 rows-1 pd-t-zero pd-thin gap-thin"
       >
-        <CardProduct
-          v-for="product in items"
-          :key="product._id"
-          :product="product"
-          :user="auth.state.access"
-          class="h-max bg-white"
-          @click.capture="$router.push({
-            name: 'Organization_Product', 
-            params: { 
-              _id: route.params._id, 
-              product: product._id 
-            } 
-          })" 
-        />
+        <router-link  
+          v-for="product in items" 
+          :to="route.params._id ? { name: 'Organization_Product', params: { _id: route.params._id, product: product._id  } } : { name: 'Product', params: { product: product._id  } }">
+          <CardProduct
+            :key="product._id"
+            :product="product"
+            :user="auth.state.access"
+            :organization="route.params._id"
+            :access="hasAccess(route.params._id, 'products', 'edit', auth.state.accesses)"
+            class="h-max bg-light"
+          />
+        </router-link>
       </Feed>
+
     </div>
   </div>
 </div>
@@ -103,7 +103,7 @@
 
 <script setup="props">
   // Import libs
-  import { computed, watch, onMounted, ref } from 'vue'
+  import { ref, computed, watch, onMounted, onUnmounted } from 'vue'
   import { useRoute, useRouter } from 'vue-router'
 
   // Import components
@@ -116,8 +116,11 @@
 
   import CardProduct from '@pf/src/modules/products/components/blocks/CardProduct.vue'
 
+  import IconPlus from '@pf/src/modules/icons/navigation/IconPlus.vue'
+
   // Accessing router and store
   import * as auth from '@pf/src/modules/auth/views/store/auth';
+  import * as globals from '@pf/src/modules/globals/views/store/globals';
   import * as products from '@pf/src/modules/products/store/products';
   import * as marketplace from '@pf/src/modules/products/store/marketplace';
   import * as categories from '@pf/src/modules/products/store/categories';
@@ -138,11 +141,19 @@
     marketplace.state.filter.selected.delivery = query.delivery ? query.delivery.split(',') : [];
   }
 
-
   watch(tabProducts, (newValue) => {
     if (route.name !== 'Organization') router.replace({ query: { ...route.query, tabProducts: newValue } });
   });
 
+  globals.state.navigation_bar.actions = [{
+    component: IconPlus,
+    props: {
+      fill: "rgb(var(--main))" 
+    },
+    condition: () => auth.state.user && auth.state.user._id,
+    action: () => route.params._id ? router.push({ name: 'Organization_ProductAdd', params: { _id: route.params._id} }) : router.push({ name: 'ProductAdd' })
+  }],
+
   onMounted(async () => {
     let categoriesFilter = await categories.actions.fetchCategories();
 
@@ -166,6 +177,10 @@
     }
   })
 
+  onUnmounted(() => {
+    globals.state.navigation_bar.actions = [];
+  });
+
   watch(() => marketplace.state.sort, (newSortValue, oldSortValue) => {
     let query = { ...route.query}
     

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

@@ -0,0 +1,102 @@
+<template>
+  <VueDraggableNext
+    v-bind="dragOptions" 
+    class="dragArea list-group w-full"
+    :list="items"
+    @change="handleChange"
+  >
+    <div v-for="category in items" :key="category._id" class="pd-medium bg-light radius-medium mn-b-thin">
+      <CardCategory 
+        :category="category" 
+        @delete="deleteCategory" 
+      />
+      <div
+      >
+      <!-- Subcategories: -->
+      <CategoryList 
+        :items="category.children"
+        :state="items"
+        @update="emitChange"
+      />
+      </div>
+    </div>
+  </VueDraggableNext>
+</template>
+
+<script setup>
+import { VueDraggableNext } from 'vue-draggable-next';
+import CardCategory from '@pf/src/modules/products/components/blocks/CardCategory.vue';
+import CategoryList from '@pf/src/modules/products/components/sections/CategoriesTree.vue';
+import * as categories from '@pf/src/modules/products/store/categories';
+
+const props = defineProps({
+  items: Array,
+   state: Array
+});
+
+const emits = defineEmits(['update']);
+
+const dragOptions = {
+  animation: 200,
+  group: 'category',
+  ghostClass: 'ghost'
+};
+
+async function deleteCategory(category) {
+  if (confirm(`Are you sure you want to delete the category "${category.name}"?`)) {
+    await categories.actions.deleteCategory(category.url);
+  }
+}
+
+function findCategoryAndUpdateParent(items, targetId, parentId = null) {
+  for (const item of items) {
+    if (item._id === targetId) {
+      item.parent = parentId;
+      return item;
+    }
+    
+    if (item.children) {
+      const found = findCategoryAndUpdateParent(item.children, targetId, item._id);
+      if (found) {
+        return found;
+      }
+    }
+  }
+  return null;
+}
+
+function updateOrders(items, startOrder = 0) {
+  let currentOrder = startOrder;
+  
+  items.forEach(item => {
+    item.order = currentOrder++;
+    
+    if (item.children?.length) {
+      currentOrder = updateOrders(item.children, currentOrder);
+    }
+  });
+  
+  return currentOrder;
+}
+
+function handleChange(event) {
+  if (!event.added && !event.moved) return;
+  
+  const targetId = event.added ? 
+    event.added.element._id : 
+    props.items[event.moved.newIndex]._id;
+    
+  const updatedCategory = findCategoryAndUpdateParent(props.state, targetId);
+  if (!updatedCategory) return;
+  
+  // Обновляем order для всего дерева категорий
+  updateOrders(props.state);
+  
+  // Отправляем обновленную категорию
+  emits('update', updatedCategory);
+}
+
+function emitChange(event) {
+  emits('update', event);
+}
+</script> 

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

@@ -1,48 +1,62 @@
 <template>
+  <Select 
+    v-model:select="product.status"
+    label="Status"
+    :options="[
+      'unpublished', 
+      'published',
+      'archivied'
+    ]"
+    
+    placeholder="Display product"
+    class="pos-relative w-100 mn-b-small bg-white radius-small pd-medium"
+  />
+ <Select 
+    v-model:select="product.listing"
+    label="Type"
+    :options="[
+      'sale', 
+      'rent',
+    ]"
+    placeholder="Type of listing"
+    class="pos-relative w-100 mn-b-small bg-white radius-small pd-medium"
+  />
+
+
+  <Field 
+    v-model:field="product.name" 
+    label="Name"
+    placeholder="Enter product name"
+    class="w-100 mn-b-small bg-white radius-small pd-medium"
+  />
+  <Field 
+    v-model:field="product.price" 
+    label="Price"
+    placeholder="Enter product price" 
+    class="w-100 mn-b-small bg-white radius-small pd-medium"
+    type="number"
+  >
     <Select 
-      v-model:select="product.status"
-      label="Status"
+      v-model:select="product.price_currency" 
+      placeholder="$"
       :options="[
-        'unpublished', 
-        'published',
-        'archivied'
+        '$',
+        '£',
+        '€',
+        '฿',
       ]"
-      
-      placeholder="Display product"
-      class="pos-relative w-100 mn-b-small bg-white radius-small pd-medium"
+      class="pos-relative bg-light pd-thin radius-thin"
     />
+  </Field>
 
-    <Field 
-      v-model:field="product.name" 
-      label="Name"
-      placeholder="Enter product name"
-      class="w-100 mn-b-small bg-white radius-small pd-medium"
-    />
-    <Field 
-      v-model:field="product.price" 
-      label="Price"
-      placeholder="Enter product price" 
-      class="w-100 mn-b-small bg-white radius-small pd-medium"
-      type="number"
-    >
-      <Select 
-        v-model:select="product.price.currency" 
-        placeholder="฿"
-        :options="[
-          '฿'
-        ]"
-        class="pos-relative bg-light pd-thin radius-thin"
-      />
-    </Field>
-
-
-    <Field
-      v-model:field="product.description" 
-      label="Description"
-      placeholder="Enter product description" 
-      class="w-100 bg-white radius-small pd-medium"
-      type="textarea"
-    />
+
+  <Field
+    v-model:field="product.description" 
+    label="Description"
+    placeholder="Enter product description" 
+    class="w-100 bg-white radius-small pd-medium"
+    type="textarea"
+  />
 </template>
 
 <script setup>
@@ -51,7 +65,6 @@ import Button  from '@pf/src/components/Button/Button.vue'
 import Field from "@pf/src/components/Field/Field.vue";
 import Select from "@pf/src/components/Select/Select.vue";
 
-
 const props = defineProps({
   product: Object,
 });