@ozdao/prometheus-framework 0.2.47 → 0.2.50

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

@@ -163,44 +163,51 @@
 			:product="products.state.current"
 		/> -->
 
-		<Block
-	    title="Add Ingridient"
-	    class="mn-b-semi"
-	  >
+		<Popup 
+      title="Add ingredient" 
+      @close-popup="closeIngredientPopup" 
+      :isPopupOpen="isOpenIngredientPopup"
+      class="bg-white pd-big radius-big"
+    >
 	    <CardPosition 
 	      @add="(item) => globals.actions.add(
-	        products.state.current.ingridients,
+	        products.state.current.ingredients,
 	        item 
 	      )"
 	      :products="Products"
+	      class="flex-column"
 	    />
+		</Popup>
 
-	    <Block
-		    placeholder="No positions added yet"
-		    class="pd-zero mn-b-semi"
-		  >
+		<Block
+	    title="Ingredients"
+			placeholder="No positions added yet"
+			:actions="[{
+        label: '+',
+        function: () => openIngredientPopup()
+      }]"
+	  >
+	  	<div class="cols-1 gap-thin">
 		    <CardPosition 
-		      v-for="(product, index) in products.state.current.ingridients" 
+		      v-for="(product, index) in products.state.current.ingredients" 
 		      :key="product._id" 
 		      :product="product"
-		      :array="products.state.current.ingridients"
+		      :array="products.state.current.ingredients"
 		      :products="Products"
-		      @add="(item) => globals.actions.add(
-		        products.state.current.ingridients,
-		        item 
-		      )"
-		      @update="(item) => globals.actions.update(
-		        products.state.current.ingridients,
-		        item,
-		        index
-		      )"
-		      @delete="(item) => globals.actions.delete(
-		        products.state.current.ingridients,
-		        item,
-		        index
-		      )"
+		      @add="(item) => {
+				    globals.actions.add(products.state.current.ingredients, item);
+				    closeIngredientPopup();
+				  }"
+				  @update="(item) => {
+				    globals.actions.update(products.state.current.ingredients, item, index);
+				    closeIngredientPopup();
+				  }"
+				  @delete="(item) => {
+				    globals.actions.delete(products.state.current.ingredients, item, index);
+				    closeIngredientPopup();
+				  }"
 		    />
-		  </Block>
+		  </div>
 	  </Block>
 
 </div>
@@ -221,6 +228,7 @@
 	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";
+
 	import EditImages           from '@pf/src/components/EditImages/EditImages.vue';
 
 	import IconDelete from '@pf/src/modules/icons/navigation/IconDelete.vue';
@@ -240,6 +248,18 @@
 	const router = useRouter()
 
   const Products = ref(products.state.all);
+  const isOpenIngredientPopup = ref(false);
+
+
+  function openIngredientPopup(member) {
+	  isOpenIngredientPopup.value = true;
+	  // if (typeof member === "number") selectedMember.value = member;
+	}
+
+	function closeIngredientPopup() {
+	  isOpenIngredientPopup.value = false;
+	  // selectedMember.value = null;
+	}
 
   onMounted(async() => { 
 
@@ -263,8 +283,8 @@
 	  	// await commit('products/clearProductState')
 	  }
 
-	  if (!products.state.current.ingridients) {
-	  	products.state.current.ingridients = []
+	  if (!products.state.current.ingredients) {
+	  	products.state.current.ingredients = []
 	  }
 
   })

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

@@ -119,7 +119,7 @@ const controllerFactory = (db) => {
   const Update = async (req, res) => {
     try {
       const { _id } = req.params;
-      console.log(_id);
+      console.log(req.body.ingredients);
 
       const updatedProduct = await Product.findOneAndUpdate(
         { _id },
@@ -134,7 +134,8 @@ const controllerFactory = (db) => {
           information: req.body.information,
           localization: req.body.localization,
           quantity: req.body.quantity,
-          quantityDiscount: req.body.quantityDiscount
+          quantityDiscount: req.body.quantityDiscount,
+          ingredients: req.body.ingredients
         },
         { new: true }
       );
@@ -213,18 +214,18 @@ const controllerFactory = (db) => {
       "withIngredients": [
         {
           $match: {
-            ingridients: { $exists: true, $not: {$size: 0} } // Продукты с ингредиентами
+            ingredients: { $exists: true, $not: {$size: 0} } // Продукты с ингредиентами
           }
         },
         {
           $lookup: {
             from: "products",
-            localField: "ingridients",
+            localField: "ingredients",
             foreignField: "_id",
             as: "ingredientDetails"
           }
         },
-        { $unwind: "$ingredientDetails" },
+        // { $unwind: "$ingredientDetails" },
         {
           $lookup: {
             from: "leftovers",
@@ -259,8 +260,8 @@ const controllerFactory = (db) => {
         {
           $match: {
             $or: [
-              { ingridients: { $exists: false } }, // Продукты без ингредиентов
-              { ingridients: { $size: 0 } }
+              { ingredients: { $exists: false } }, // Продукты без ингредиентов
+              { ingredients: { $size: 0 } }
             ]
           }
         },
@@ -403,22 +404,29 @@ const controllerFactory = (db) => {
   // Get product
   const getProduct = async (req, res) => {
     try {
-       const product = await Product.aggregate([
-        { 
-            $match: { "_id": new ObjectId(req.params._id) } 
+      const product = await Product.aggregate([
+        {
+          $match: { "_id": new ObjectId(req.params._id) }
         },
         {
           $lookup: {
             from: "leftovers",
-            let: { productId: "$_id", ingredients: { $ifNull: ["$ingredients", []] } },
+            let: { productId: "$_id", ingredientsIds: "$ingredients._id" },
             pipeline: [
               {
                 $unwind: "$positions"
               },
-              { 
-                "$match": { "$expr": { "$eq": ["$positions._id", "$$productId"] }}
+              {
+                $match: {
+                  $expr: {
+                    $or: [
+                      { $eq: ["$positions._id", "$$productId"] },
+                      { $in: ["$positions._id", { $ifNull: ["$$ingredientsIds", []] }] } // Исправлено
+                    ]
+                  }
+                }
               },
-              { 
+              {
                 "$addFields": {
                   "positions.quantity": {
                     $cond: {
@@ -429,7 +437,7 @@ const controllerFactory = (db) => {
                   }
                 }
               },
-              { 
+              {
                 "$project": {
                   _id: "$positions._id",
                   quantity: "$positions.quantity",
@@ -437,19 +445,74 @@ const controllerFactory = (db) => {
                 }
               }
             ],
-            as: "variants"
+            as: "leftovers"
+          }
+        },
+        {
+          $addFields: {
+            ingredientsQuantities: {
+              $cond: {
+                if: { $isArray: "$ingredients" },
+                then: {
+                  $map: {
+                    input: "$ingredients",
+                    as: "ingredient",
+                    in: {
+                      $let: {
+                        vars: {
+                          ingredientId: "$$ingredient._id",
+                          ingredientQuantity: { $ifNull: ["$$ingredient.quantity", 0] }
+                        },
+                        in: {
+                          $divide: [
+                            {
+                              $sum: {
+                                $map: {
+                                  input: "$leftovers",
+                                  as: "leftover",
+                                  in: {
+                                    $cond: {
+                                      if: { $eq: ["$$leftover._id", "$$ingredientId"] },
+                                      then: "$$leftover.quantity",
+                                      else: 0
+                                    }
+                                  }
+                                }
+                              }
+                            },
+                            {
+                              $cond: {
+                                if: { $eq: ["$$ingredientQuantity", 0] },
+                                then: 1,
+                                else: "$$ingredientQuantity"
+                              }
+                            }
+                          ]
+                        }
+                      }
+                    }
+                  }
+                },
+                else: []
+              }
+            }
           }
         },
-        { 
-          $set: { 
+        {
+          $set: {
             quantity: {
-              $sum: ["$quantity", {$sum: "$variants.quantity"}]
-            } 
-          } 
+              $cond: {
+                if: { $gt: [{ $size: { $ifNull: ["$ingredients", []] } }, 0] }, // Снова проверяем, не пустой ли массив ингредиентов
+                then: { $floor: { $min: "$ingredientsQuantities" } },
+                else: { $sum: "$leftovers.quantity" } // Просто суммируем quantity из leftovers, если ингредиентов нет
+              }
+            }
+          }
         },
+        { $unset: ["leftovers", "ingredientsQuantities"] }
+      ]);
 
-        { $unset: "variants" }
-    ]);
+    console.log(product)
 
     if (!product || product.length < 1) {
       return res.status(404).send({ message: "Product not found." });
@@ -461,7 +524,7 @@ const controllerFactory = (db) => {
       { new: true }
     );
 
-    console.log('Popularity updated:', updatedProduct);
+    // console.log('Popularity updated:', updatedProduct);
 
    res.status(200).send(product);
   } catch (err) {

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

@@ -18,7 +18,22 @@ module.exports = (mongoose) => {
         images:         {type: Array},
         popularity:     {type: Number}, 
         localization:   {type: Array},
-        ingredients: {type: Array},
+        ingredients: [{
+            _id: {
+                type: mongoose.Schema.Types.ObjectId,
+                ref: 'Product',
+            },
+            price: {
+                type: Number,
+                required: true,
+                min: [0, 'Price cannot be less than 0']
+            },
+            quantity: {
+                type: Number,
+                required: true,
+                min: [1, 'Quantity cannot be less than 1']
+            },    
+        }],
         information:    [{
             name: {type: String}, 
             value: {type: String}

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

@@ -26,7 +26,7 @@ const state = reactive({
     localization: [],
     modifications: [],
     quantityDiscount: [],
-    ingridients: [],
+    ingredients: [],
     description: ''
   }
 });

package/src/modules/users/components/pages/ProfileOrganizations.vue

@@ -22,20 +22,49 @@
 		/>
 
 		<transition name="slide-fade">
-			<Feed 
+			<Feed
 				v-if="tabOrganization === 'member'"
-		  		:user="auth.state.user._id"
-				:owner="route.params._id"
-			/>
+	      :states="{
+	        empty: {
+	          title: 'No Organization Found',
+	          description: 'Currently, there are no organization available.'
+	        }
+	      }"
+	      :store="{
+	        read: (options) => organizations.actions.read(options),
+	        state: organizations.state
+	      }"
+	      :options="{
+	        	user: auth.state.user._id,
+	        	member: auth.state.user._id,
+						limit: 10
+	      }"
+	      v-slot="{ 
+	        items 
+	      }"
+	    >
+	    	<CardOrganization 
+    			v-for="organization in items"
+        	:key="organization._id" 
+	      	:organization="organization"
+	      	:user="auth.state.user"
+	      	:showProducts="false"
+	      	:showRating="false"
+	      	:showFeatured="false"
+	      	:showFollowers="false"
+					@updateMembership="handleMembershipUpdate"
+					class="mn-b-thin w-100 pd-0 bg-white radius-big o-hidden"
+		    />
+	    </Feed>
 		</transition>
 
-		<transition name="slide-fade">
+		<!-- <transition name="slide-fade">
 			<Feed 
 				v-if="tabOrganization === 'follower'"
 		  		:user="auth.state.user._id"
 		  		:subscriber="route.params._id"
 			/>
-		</transition>
+		</transition> -->
 	</div>
 </template>
 
@@ -44,9 +73,14 @@
 	import { useRoute, useRouter } from 'vue-router'
 	// Components
 	import Tab  		from '@pf/src/components/Tab/Tab.vue'
-	import Feed from '@pf/src/modules/organizations/components/sections/Feed.vue'; 
+	import Feed from '@pf/src/components/Feed/Feed.vue'
+	
+	import CardOrganization from '@pf/src/modules/organizations/components/blocks/CardOrganization.vue'
+	
+	// import Feed from '@pf/src/modules/organizations/components/sections/Feed.vue'; 
 
 	import * as auth from '@pf/src/modules/auth/store/auth';
+	import * as organizations from '@pf/src/modules/organizations/store/organizations'
 	// Accessing router
 	const route = useRoute()
 	const router = useRouter()

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

@@ -1,64 +0,0 @@
-<template>
-  <transition name="slide-fade">
-    <div>
-      <EmptyState
-        v-if="FirstLevelDepartments.length < 1"
-        title="You don't have any spots yet."
-        description="Add spots to your hub."
-        action="Add spot"
-        :callback="() => $router.push(`/organizations/${props.organization._id}/departments/create`)"
-      />
-
-      <div>
-        <CardDepartment
-          v-for="(department, index) in FirstLevelDepartments"
-          :key="index"
-          :department="department"
-          :organization="organization"
-          class="radius-big bg-grey mn-b-thin"
-        />
-        <button
-          v-if="FirstLevelDepartments.length > 0 && auth.state.user._id === organization.owner"
-          @click="$router.push(`/organizations/${props.organization._id}/departments/create`)"
-          class="mn-b-thin button w-100"
-        >
-          Add spot
-        </button>
-      </div>
-    </div>
-  </transition>
-</template>
-
-<script setup>
-import { ref, computed } from 'vue';
-import Tab from '@pf/src/components/Tab/Tab.vue';
-import EmptyState from '@pf/src/modules/organizations/components/blocks/EmptyState.vue';
-import CardDepartment from '@pf/src/modules/organizations/components/blocks/CardDepartment.vue';
-import { state as departmentState, actions as departmentActions } from '@pf/src/modules/organizations/store/departments';
-import * as auth from '@pf/src/modules/auth/store/auth'
-
-const props = defineProps({
-  organization: Object,
-  units: Array,
-  memberships: Array
-});
-
-const tabStructure = ref('departments');
-
-await departmentActions.read(props.organization._id);
-
-const FirstLevelDepartments = computed(() => {
-  const departments = departmentState.departments;
-
-  const subdepartmentIds = departments.flatMap(department =>
-    department.subdepartments.map(subdepartment => subdepartment._id)
-  );
-
-  return departments.filter(department =>
-    !subdepartmentIds.includes(department._id)
-  );
-});
-</script>
-
-<style scoped>
-</style>

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

@@ -1,85 +0,0 @@
-<template>
-	<section class="mn-b-big radius-medium bg-white">
-	  <Tab 
-	    v-model:selected="tabMemberships"
-	    class="br-grey br-b br-solid radius-small"
-	    :tabs="[
-	      { name: 'Участники',    value: 'members' }, 
-	      { name: 'Приглашения',  value: 'invites' }, 
-	    ]"
-	  />
-	  <!-- Members -->
-	 	<div 
-	 		v-if="tabMemberships === 'members'"
-	 		class="pd-semi"
-	 	>
-		 	<div 
-		    v-for="(member, index) in memberships" 
-		    class="br-grey br-1px br-solid radius-small flex-nowrap flex-v-center flex  pd-medium"
-		  >
-		    <span class="w-100 mn-r-small">{{member.user.email}} {{member.user.phone}}</span>
-		    <span class="t-transp">{{member.position}}</span>
-
-		    <div v-if="member.position !== 'Основатель'" class="mn-l-medium flex-v-center flex">
-          <button @click="removeMember(index,member)" class="button-small button">×</button>
-        </div>
-
-		  </div>
-		</div>
-		<!-- Invites -->
-		<div 
-			v-if="tabMemberships === 'invites'"
-			class="pd-semi"
-		>	
-			<span v-if="invites.length < 1">В организации нет приглашений</span>
-		 	<div 
-		    v-for="(invite, index) in invites" 
-		    class="br-grey br-1px br-solid radius-small mn-b-thin flex-nowrap flex-v-center flex  pd-medium"
-		  >
-
-		    <span class="w-100 mn-r-small">{{invite.invitedEmail}} {{invite.invitedPhone}}</span>
-		    <span class="t-transp">{{invite.status}}</span>
-
-		    <div class="mn-l-medium flex-v-center flex">
-          <button @click="removeInvite(index,invite)" class="button-small button">×</button>
-        </div>
-
-		  </div>
-		</div>
-
-
-	</section>
-</template>
-
-<script setup>
-import { ref } from "vue";
-// Import components
-// Global
-import Tab  		from '@pf/src/components/Tab/Tab.vue'
-// Define props
-const props = defineProps({
-  organization: Object,
-  memberships: Array,
-  invites: Array,
-});
-
-const emits = defineEmits([['removeMember','removeInvite']])
-// Define emits
-
-// Accesing state
-const tabMemberships = ref('members')
-
-function removeMember(index,member) {
-  props.memberships.splice(index, 1);
-  emits('removeMember', member)
-}
-
-function removeInvite(index,invite) {
-  props.invites.splice(index, 1);
-  emits('removeInvite', invite)
-}
-
-
-
-
-</script>

package/src/modules/organizations/store/invites.js

@@ -1,93 +0,0 @@
-// Dependencies
-import axios from 'axios';
-import Cookies from 'js-cookie'
-// Vue modules
-import { reactive, watch  } from "vue";
-// Globals 
-import { setError }   from '@pf/src/modules/globals/store/globals'
-// State
-import * as auth from '@pf/src/modules/auth/store/auth'
-// Setup Axios
-const $axios = axios.create({baseURL: process.env.API_URL, withCredentials: true}) 
-// Setup Cookies
-$axios.defaults.withCredentials = true
-// State
-const state = reactive({
-  invites: [],
-  invite: null,
-  error: null,
-});
-// Methods
-const actions = {
-  async read(organizationId) {
-    await $axios
-      .get(`/api/invites/${organizationId}`)
-      .then(response => {
-        state.invites = response.data;
-        state.error = null;
-      })
-      .catch(error => {
-        setError(error)
-      });
-  },
-  async readOne(inviteId) {
-
-    await $axios
-      .get(`/api/invites/get/${inviteId}`) // Измените URL, чтобы использовать inviteId
-      .then(response => {
-        state.invite = response.data; // Используйте отдельное свойство для хранения одного инвайта
-
-        auth.state.user.phone = response.data.invitedPhone
-        auth.state.user.email = response.data.invitedEmail
-
-      })
-      .catch(error => {
-        setError(error);
-      });
-  },
-  async create(organizationId, invite) {
-    await $axios
-      .post(`/api/invites/${organizationId}/create`, invite)
-      .then(() => {
-        state.error = null;
-      })
-      .catch(error => {
-        setError(error)
-      });
-  },
-  async update(organizationId, membership) {
-    await $axios
-      .put(`/api/invites/${organizationId}/update`, membership)
-      .then(() => {
-        state.error = null;
-      })
-      .catch(error => {
-        setError(error)
-      });
-  },
-  async delete(inviteID) {
-    await $axios
-      .delete(`/api/invites/${inviteID}/delete`)
-      .then(() => {
-        state.error = null;
-      })
-      .catch(error => {
-        setError(error)
-      });
-  },
-};
-
-// // History
-const history = []
-history.push(state) 
-
-// // Watch
-watch(state, (newState, oldState) => {
-  history.push(newState)
-})
-
-// Module Export
-export {
-  state,
-  actions,
-}