@ozdao/prometheus-framework 0.2.51 → 0.2.53

package/src/modules/organizations/components/pages/Organization.vue

@@ -10,76 +10,43 @@
 			class="mn-b-semi"
 		/>
 
-		<!-- MEMBERS TAB -->
-		<Menu 
-			class="mn-b-regular bg-grey"
-		>
-		  <MenuItem 
-		  	@click="router.push({
-					name: 'Organization Members', 
-					params: {
-						_id: route.params._id
-					}
-				})" 
-		  	class="cursor-pointer"
-		  	theme="black"
-		  >
-		    <span>
-		    	{{organization.state.current.numberOfMembers}} members
-		    </span>
-		  </MenuItem> 
-		</Menu>
-
-		<div class="cols-2 pd-medium bg-grey radius-bg">
-
-			<Block
-		    title="Departments"
-				:actions="[{
-	        label: '+',
-	        function: () => $router.push(`/organizations/${route.params._id}/departments/create`)
-	      }]"
-		  >
-		  	<Feed
-		      :states="{
-		        empty: {
-		          title: 'No Departments Found',
-		          description: 'Currently, there are no departments available.'
-		        }
-		      }"
-		      :store="{
-		        read: (options) => departments.actions.read(route.params._id),
-		        state: null
-		      }"
-		      :options="{
-		          user: auth.state.user._id,
-		          sort: 'numberOfMemberships',
-		          limit: 10
-		      }"
-		      v-slot="{ 
-		        items 
-		      }"
-		    >
-		      <CardDepartment
-		        v-for="(department, index) in items"
-		        :key="index"
-		        :department="department"
-		        :organization="route.params._id"
-		        class="radius-big bg-white pos-relative mn-b-thin"
-		      />
-		     </Feed>
-			</Block>
-		   <div>
-		   	<User 
-		      v-for="(member, index) in organization.state.current.memberships" 
-		      :key="index" 
-		      :user="member" 
-		      :position="member.position" 
-		      class="bg-grey radius-small flex-nowrap flex  pd-medium"
-		    />
-
-	    </div>
-    </div>
-
+		<Block
+	    :title="`${organization.state.current.numberOfMembers} members`"
+			:actions="[{
+        label: '>',
+        function: () => $router.push(`/organizations/${route.params._id}/departments/create`)
+      }]"
+    	class="mn-b-semi"
+	  >
+	  	<Feed
+	      :states="{
+	        empty: {
+	          title: 'No Departments Found',
+	          description: 'Currently, there are no departments available.'
+	        }
+	      }"
+	      :store="{
+	        read: (options) => departments.actions.read(route.params._id),
+	        state: null
+	      }"
+	      :options="{
+	          user: auth.state.user._id,
+	          sort: 'numberOfMemberships',
+	          limit: 10
+	      }"
+	      v-slot="{ 
+	        items 
+	      }"
+	    >
+	      <CardDepartment
+	        v-for="(department, index) in items"
+	        :key="index"
+	        :department="department"
+	        :organization="route.params._id"
+	        class="radius-big bg-white pos-relative mn-b-thin"
+	      />
+	     </Feed>
+		</Block>	
 
 		<Tab 
 			v-model:selected="tabOrganization"
@@ -265,7 +232,7 @@
 	route.query.tab = tabOrganization.value
 
 	watch(tabOrganization, (newValue) => {
-	  router.replace({ query: { ...route.query, tab: newValue } });
+	  router.replace({ query: null});
 	});
 </script>
 

package/src/modules/organizations/components/sections/Feed.vue

@@ -129,7 +129,7 @@
 
   onMounted(async () => {
     isLoading.value = true;
-    console.log(props.selectedDate)
+    
     const data = await organizations.actions.read({
       skip: skip.value,
       limit: limit.value,

package/src/modules/organizations/controllers/memberships.controller.js

@@ -8,9 +8,9 @@ const controllerFactory = (db) => {
       const memberships = await Membership.aggregate([
         {
           $match: {
-            ...(req.query.user && { user: req.query.user }),
+            ...(req.query.user && { user: new ObjectId(req.query.user) }),
             ...(req.query.type && { type: req.query.type }),
-            ...(req.query.target && { target: req.query.target }),
+            ...(req.query.target && { target: new ObjectId(req.query.target) }),
             ...(req.query.role && { role: req.query.role }),
           },
         },

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

@@ -147,7 +147,6 @@ const controllerFactory = (db) => {
       });
     }
 
-
     if (location) {
 
       console.log(location)

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

@@ -1,6 +1,7 @@
 import * as validationAuth from '@pf/src/modules/middlewares/client/auth.validation.js';
 
-const productRoutes = [{
+const productRoutes = [
+{
   path: ':_id/products/:product',
   name: 'Product Organization',
   meta: {
@@ -20,6 +21,25 @@ const productRoutes = [{
   name: 'ProductAdd',
   component: () => import('@pf/src/modules/products/components/pages/ProductEdit.vue')
 },{
+  path: ':_id/categories',
+  name: 'Categories Organization',
+  meta: {
+    title: {
+      en: 'Category',
+      ru: 'Категория'
+    }
+  },
+  component: () => import('@pf/src/modules/products/components/pages/Categories.vue')
+}, {
+  path: ':_id/categories/add',
+  name: 'CategoryAdd',
+  component: () => import('@pf/src/modules/products/components/pages/CategoryEdit.vue')
+},{
+  path: ':_id/categories/:category/edit',
+  name: 'CategoryEdit',
+  beforeEnter: [validationAuth.requiresAuth],
+  component: () => import('@pf/src/modules/products/components/pages/CategoryEdit.vue')
+}, {
   path: ':_id/leftovers',
   name: 'Leftovers',
   meta: {
@@ -41,8 +61,7 @@ const productRoutes = [{
     authorize: []
   },
   component: () => import(/* webpackChunkName: 'LeftoverEdit' */ '@pf/src/modules/products/components/pages/EditLeftover.vue')
-},
-{
+},{
   path: ':_id/leftovers/:leftover',
   name: 'LeftoverEdit',
   meta: {
@@ -53,6 +72,7 @@ const productRoutes = [{
     authorize: []
   },
   component: () => import(/* webpackChunkName: 'LeftoverEdit' */ '@pf/src/modules/products/components/pages/EditLeftover.vue')
-},];
+}
+];  
 
 export default productRoutes;

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

@@ -0,0 +1,53 @@
+<template>
+  <div class="flex-v-center flex">
+    <h4 class="mn-r-auto">{{category.name}}</h4>
+
+    <router-link 
+    	:to="{
+				name: 'CategoryEdit', 
+				params: { 
+					_id: route.params._id,
+					category: category.url
+				} 
+			}"
+    	class="mn-r-medium nav-link"
+    >
+    	Edit
+   	</router-link>
+    <a 
+    	class="nav-link" 
+    	@click="deleteCategory(category)"
+    >
+  		Delete
+  	</a>
+   </div>
+</template>
+
+
+<script setup>
+import { toRef, onMounted, defineEmits } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
+
+const props = defineProps({
+  category: Object,
+});
+
+const emits = defineEmits(['delete']);
+
+const route = useRoute();
+const router = useRouter();
+
+const deleteCategory = (category) => {
+  emits('delete', category);
+};
+
+</script>
+
+
+<style lang="scss">
+.categories-card {
+
+}
+</style>
+
+

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/EditLeftover.vue

@@ -112,7 +112,7 @@
 
   const totalPrice = computed(() => {
     return leftovers.state.current.positions.reduce((sum, position) => {
-      return sum + (position.price * (position.quantity || 1));
+      return sum + position.price;
     }, 0);
   });
 
@@ -147,14 +147,16 @@
   }
 
   function onSubmit() {
+    leftovers.state.current.organization = route.params._id;
+
     if (route.params.leftover) {
       leftovers.actions.update(leftovers.state.current).then(
-        () => router.push({ name: 'Backoffice Leftovers' }),
+        () => router.push({ name: 'Leftovers', params: {_id: route.params._id} }),
         (error) => console.error('error')
       );
     } else {
       leftovers.actions.create(leftovers.state.current).then(
-        () => router.push({ name: 'Backoffice Leftovers' }),
+        () => router.push({ name: 'Leftovers', params: {_id: route.params._id} }),
         (error) => console.error('error')
       );
     }
@@ -162,7 +164,7 @@
 
   function onDelete() {
     leftovers.actions.delete(route.params.leftover).then(
-      () => router.push({ name: 'Backoffice Leftovers' }),
+      () => router.push({ name: 'Leftovers', params: {_id: route.params._id} }),
       (error) => console.error('error')
     );
   }

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";