@ozdao/prometheus-framework 0.2.309 → 0.2.310

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

@@ -1,168 +1,202 @@
 <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"
+  <div  class="pd-thin bg-white for-transition w-100">
+    <Block v-if="!MOBILE_APP" 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"
     >
-      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"
-        />  
+      <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-40 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"
+          />  
+         
+      </div>
        <Field
-          v-model:field="categories.state.current.url"
-          label="URL"
-          placeholder="Enter category URL"
+            v-model:field="categories.state.current.name"
+            label="Name"
+            placeholder="Enter category name"
+            class="w-100 mn-b-small bg-white radius-small pd-medium"
+          />  
+
+      <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="categories.state.current.name"
-          label="Name"
-          placeholder="Enter category name"
+          v-model:field="item.text"
+          placeholder="Text"
           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
+          @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>
-    </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"
+      
+    </Block>
+    <!-- Subcategories -->
+    <Block
+      title="Subcategories"
+      placeholder="No subcategories added yet"
+      :actions="[{
+        label: '+',
+        function: () => categories.state.current.children.push({name: '', url: ''})
+      }]"
+      class="mn-b-thin"
+    >
+
+      {{categories.state.current.children}}
+      <Feed
+        :states="{
+          empty: {
+            title: 'No Events Found',
+            description: 'Currently, there are no events available.'
+          }
+        }"
+        :store="{
+          read: (options) => categories.actions.read(options),
+          state: categories.state
+        }"
+        :options="{
+            user: auth.state.user._id,
+            limit: 10
+        }"
+        v-slot="{ 
+          items 
+        }"
       >
-        <IconDelete 
-          class="i-medium"
+        <div 
+          v-for="(category,index) in items"
+          @click="() => { categories.state.current.children.push(category._id) }"
+          class="bg-white pd-medium radius-small mn-b-medium"
+        >
+          {{category.name}}
+        </div>
+        
+      </Feed>
+   
+      <div 
+        class="gap-thin mn-b-thin flex-nowrap flex" 
+        v-for="(item, index) in categories.state.current.children" 
+        :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>
-    </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
+          @click="() => categories.state.current.children.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>
-    </div> 
-  </Block>
+        <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>
+  </div>
  
 </template>
 
 <script setup>
   // Import libs
-  import { computed } from 'vue'
+  import { computed, onUnmounted } from 'vue'
   import { useRoute,useRouter } from 'vue-router'
   
   import IconDelete from '@pf/src/modules/icons/navigation/IconDelete.vue';
@@ -170,10 +204,15 @@
   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 Feed from '@pf/src/components/Feed/Feed.vue'
 
   import Block from '@pf/src/components/Block/Block.vue';
 
+  import IconCheckmark from '@pf/src/modules/icons/navigation/IconCheckmark.vue'
+
   // Import the new store structure
+  import * as globals from '@pf/src/modules/globals/views/store/globals';
+  import * as auth from '@pf/src/modules/auth/views/store/auth'; 
   import * as categories from '@pf/src/modules/products/store/categories';
 
   const route = useRoute()
@@ -181,21 +220,37 @@
 
   // Data prefetching
   if (route.params.category) {
-    categories.actions.fetchCategory(route.params.category)
+    categories.actions.read({url: route.params.category})
   } else {
-    categories.actions.resetCategory() // Adjusted based on the new store's method to reset the category state
+    categories.actions.clean() // 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)
 
+  // Navigation Bar
+  globals.state.navigation_bar.actions = [{
+    component: IconCheckmark,
+    props: {
+      fill: "rgb(var(--main))" 
+    },
+    condition: () => auth.state.user && auth.state.user._id,
+    action: () => onSubmit()
+  }],
+
+ onUnmounted(() => {
+    globals.state.navigation_bar.actions = [];
+  });
+
+
+
   // Functions
   function onSubmit() {
     if (route.params.category) {
-      categories.actions.updateCategory(route.params.category)
+      categories.actions.update(categories.state.current)
     } else {
-      categories.actions.addCategory()
+      categories.actions.create(categories.state.current)
     }
   }
 

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() {