@ozdao/prometheus-framework 0.2.48 → 0.2.51

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

@@ -1,7 +1,7 @@
 <template>
   <div>
-      <section class="mn-b-medium radius-medium pd-semi bg-white">
-        <h3 class="mn-b-medium">Добавить участников</h3>
+      <section class="mn-b-medium radius-medium pd-semi bg-grey">
+        <h3 class="mn-b-medium">Add members</h3>
         <p class="mn-b-small t-transp p-medium">Укажите email или телефон, чтобы отправить ссылку с приглашением:</p> 
       
         <div
@@ -10,49 +10,42 @@
           class="
             br-1px br-solid br-grey
             flex
+            gap-thin
             radius-small
             mn-b-thin
           ">
-          
-          <div class="w-100 flex-nowrap flex">
             <Field 
               v-model:field="member.contact"   
-              placeholder="Email или телефон" 
-              class="w-100 bg-white"
+              placeholder="Enter email or phone" 
+              class="pd-small radius-small w-100 bg-white"
               :validation="contactValidation"
             />
-
+            <Select 
+              v-model:select="member.role"
+              label="Role"
+              :options="[
+                'owner',
+                'manager',
+                'member'
+              ]"
+              placeholder="Select"
+              class="pos-relative w-100 bg-white radius-small pd-small"
+            />
             <div v-if="index > 0" class="mn-r-medium flex-v-center flex">
-              <button  @click="removeMember(index)" class="button-small button">×</button>
+              <button @click="removeMember(index)" class="button-small button">×</button>
             </div>
           </div>
 
-          <Select 
-            :options="[
-              {name: 'Директор',        value: 'director'}, 
-              {name: 'Менеджер',        value: 'manager'},
-              {name: 'Сотрудник',       value: 'member'}, 
-            ]"
-            :prop="member"
-            content="role" 
-            placeholder="Роль" 
-            size="small"
-            class="w-80"
-          />
-          
-        </div>
-
-        <div @click="addMember" class="mn-b-small flex-v-center flex-nowrap flex">
-          <p class="t-blue mn-r-small">+ Добавить приглашение</p>
-        </div>
-
-        <Button  
-          :submit="a = () => handleSendInvite(invites.state.invites)" 
-          :callback="reloadPage"
-          class="mn-t-medium">
-          <span >Отправить приглашения </span>
-        </Button>
+          <div @click="addMember" class="mn-b-small flex-v-center flex-nowrap flex">
+            <p class="t-blue mn-r-small">+ Добавить приглашение</p>
+          </div>
 
+          <Button  
+            :submit="a = () => handleSendInvite(invites.state.invites)" 
+            :callback="reloadPage"
+            class="w-100 bg-main">
+            <span>Invite to organization</span>
+          </Button>
       </section>
   </div>
 </template>
@@ -65,7 +58,7 @@
   import Button   from '@pf/src/components/Button/Button.vue'
   // Import validation
   import * as inputsValidation from '@pf/src/modules/middlewares/client/inputs.validation'
-  import * as invites from '@pf/src/modules/organizations/store/invites';
+  import * as invites from '@pf/src/modules/auth/store/invites';
   // Props
   const props = defineProps({
     organization: Object,

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

@@ -37,7 +37,6 @@
 	import Button  	from '@pf/src/components/Button/Button.vue'
 	// Local
 	import DetailsTab 		from '@pf/src/modules/organizations/components/sections/DetailsTab.vue'
-	import FeedDepartments 	from '@pf/src/modules/organizations/components/sections/FeedDepartments.vue'
 	import CardOrganization from '@pf/src/modules/organizations/components/blocks/CardOrganization.vue'
 	// Blocks
 	import EmptyState 		from '@pf/src/modules/organizations/components/blocks/EmptyState.vue'

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

@@ -1,35 +1,40 @@
+const ObjectId = require('mongoose').Types.ObjectId;
+
 const controllerFactory = (db) => {
   const Membership = db.membership;
 
   const read = async (req, res) => {
-    let query = {};
-    let options = {};
-
-    if (req.query.user) {
-      query.user = req.query.user;
-    }
-
-    if (req.query.type) {
-      query.type = req.query.type;
-    }
-
-    if (req.query.target) {
-      query.target = req.query.target;
-    }
-
-    if (req.query.role) {
-      query.role = req.query.role;
-    }
-
     try {
-      const memberships = await Membership.find(query, null, options).populate('user');
-      if (!memberships) {
-        return res.status(404).send({ errorCode: "MEMBERSHIPS_NOT_FOUND" });
+      const memberships = await Membership.aggregate([
+        {
+          $match: {
+            ...(req.query.user && { user: req.query.user }),
+            ...(req.query.type && { type: req.query.type }),
+            ...(req.query.target && { target: req.query.target }),
+            ...(req.query.role && { role: req.query.role }),
+          },
+        },
+        {
+          $lookup: {
+            from: 'users',
+            localField: 'user',
+            foreignField: '_id',
+            as: 'user',
+          },
+        },
+        {
+          $unwind: '$user',
+        },
+      ]);
+
+      if (!memberships || memberships.length === 0) {
+        return res.status(404).send({ errorCode: 'MEMBERSHIPS_NOT_FOUND' });
       }
+
       res.send(memberships);
     } catch (err) {
-      console.log(err)
-      res.status(500).send({ errorCode: "SERVER_ERROR" });
+      console.log(err);
+      res.status(500).send({ errorCode: 'SERVER_ERROR' });
     }
   };
 
@@ -64,13 +69,15 @@ const controllerFactory = (db) => {
   };
 
   const deleteMembership = async (req, res) => {
-    const { type, target, user, role } = req.body;
+    // const { type, target, user, role } = req.body;
     
 
     console.log(req.body)
 
     try {
-      const membership = await Membership.findOne({ type, target, user, role });
+      // const membership = await Membership.findOne({ type, target, user, role });
+      const membership = await Membership.findOneAndDelete({ _id: new ObjectId(req.body._id)})
+      // const membership = await Membership.findOne({ type, target, user, role });
 
       if (!membership) {
         return res.status(404).send({ errorCode: 'MEMBERSHIP_NOT_FOUND' });

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

@@ -61,7 +61,7 @@ const controllerFactory = (db) => {
     const matchConditions = [
       ...(req.query._id ? [{ _id: new ObjectId(req.query._id) }] : []),
       ...(req.query.owner ? [{ owner: new ObjectId(req.query.owner) }] : []),
-      ...(req.query.member ? [{"memberships.user": new ObjectId(req.query.member), "memberships.role": { $nin:  ['subscriber', 'owner'] } } ] : [] ),
+      ...(req.query.member ? [{"memberships.user": new ObjectId(req.query.member), "memberships.role": 'member' } ] : [] ),
       ...(req.query.subscriber ? [{"memberships.user": new ObjectId(req.query.subscriber), "memberships.role": 'subscriber'} ] : [] ),
       ...(req.query.postable ? [{$or: [{$and: [{ types: { $elemMatch: { $eq: 'public' } } }, { "memberships.user": new ObjectId(req.query.postable) } ] }, {$and: [{types: {$elemMatch: {$in: ['exclusive', 'hidden'] } } }, { "memberships.user": new ObjectId(req.query.postable) }, { "memberships.role": { $ne: 'subscriber' } } ] } ] } ] : [] ),
       ...(req.query.types ?  [{ types: { $in: req.query.types } }] : []),  // Если req.query.types - строка

package/src/modules/organizations/models/department.model.js

@@ -15,22 +15,6 @@ module.exports = (mongoose) => {
       description:  { type: String },
       categories:   [String]
     },
-    // Working hours
-    address: String,
-    // Position on map
-    location: {
-      lat: Number,
-      lng: Number,
-      type: {
-        type: String,
-        enum: ['Point'], // 'location.type' must be 'Point'
-        required: true
-      },
-      coordinates: {
-        type: [Number],
-        required: true
-      }
-    },
     worktime: [{
       day: String,
       time: {
@@ -63,9 +47,6 @@ module.exports = (mongoose) => {
 
   departmentSchema.index({ organization: 1 })
 
-  departmentSchema.index({ location: '2dsphere' });
-
-
   const Department = mongoose.model('Department', departmentSchema);
 
   return Department

package/src/modules/organizations/models/membership.model.js

@@ -15,6 +15,10 @@ module.exports = (mongoose) => {
       type: String,
       default: 'subscriber'
     },
+    label: {
+      type: String,
+      default: 'subscriber'
+    },
     target: {  // заменяем 'organization' на 'target', так как это может быть или User, или Organization
       type: mongoose.Schema.Types.ObjectId,
       ref: function (value) {

package/src/modules/organizations/organizations.client.js

@@ -18,17 +18,15 @@ import Contacts from './components/blocks/Contacts.vue';
 import Socials from './components/blocks/Socials.vue';
 
 import MembersAdd from './components/sections/MembersAdd.vue';
-import FeedDepartments from './components/sections/FeedDepartments.vue';
 import DetailsTab from './components/sections/DetailsTab.vue';
 import OrganizationsSection from './components/sections/Organizations.vue';
 import Publics from './components/sections/Publics.vue';
 import Documents from './components/sections/Documents.vue';
-import MembersList from './components/sections/MembersList.vue';
 
 import ButtonToggleMembership from './components/elements/ButtonToggleMembership.vue';
 
 // Import Vuex store modules
-import * as invitesStore from './store/invites.js';
+
 import * as departmentsStore from './store/departments.js';
 import * as membershipsStore from './store/memberships.js';
 import * as organizationStore from './store/organizations.js';
@@ -55,14 +53,11 @@ EmptyState,
 Contacts,
 Socials,
 MembersAdd,
-FeedDepartments,
 DetailsTab,
 OrganizationsSection,
 Publics,
 Documents,
-MembersList,
 ButtonToggleMembership,
-invitesStore,
 departmentsStore,
 membershipsStore,
 organizationStore,

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

@@ -37,58 +37,62 @@ const state = reactive({
 // Methods
 const actions = {
   async readOne(departmentID) {
-    await $axios
-      .get(`/api/departments/get/${departmentID}`)
-      .then(response => {
-        state.department = response.data;
-        state.error = null;
-      })
-      .catch(error => {
-        setError(error)
-      });
+    try {
+      const response = await $axios.get(`/api/departments/get/${departmentID}`);
+      state.department = response.data;
+      state.error = null;
+      return response.data; // Return the response data
+    } catch (error) {
+      setError(error);
+      return null; // Return null or appropriate error response
+    }
   },
+
   async read(organizationId) {
-    await $axios
-      .get(`/api/departments/${organizationId}`)
-      .then(response => {
-        console.log('Response:', response);
-        state.departments = response.data;
-        state.error = null;
-      })
-      .catch(error => {
-        setError(error)
-      });
+    try {
+      const response = await $axios.get(`/api/departments/${organizationId}`);
+      console.log('Response:', response);
+      state.departments = response.data;
+      state.error = null;
+      return response.data; // Return the response data
+    } catch (error) {
+      setError(error);
+      return null; // Return null or appropriate error response
+    }
   },
+
   async create(organizationId, department) {
-    await $axios
-      .post(`/api/departments/${organizationId}/create`, department)
-      .then(response => {
-        state.error = null;
-        state.department = response.data;
-      })
-      .catch(error => {
-        setError(error)
-      });
+    try {
+      const response = await $axios.post(`/api/departments/${organizationId}/create`, department);
+      state.error = null;
+      state.department = response.data;
+      return response.data; // Return the response data
+    } catch (error) {
+      setError(error);
+      return null; // Return null or appropriate error response
+    }
   },
+
   async update(organizationId, department) {
-    await $axios
-      .post(`/api/departments/${organizationId}/update`, department)
-      .then(() => {
-        state.error = null;
-      })
-      .catch(error => {
-        setError(error)
-      });
+    try {
+      const response = await $axios.post(`/api/departments/${organizationId}/update`, department);
+      state.error = null;
+      return response; // Return the response for update operations, might not have body data
+    } catch (error) {
+      setError(error);
+      return null; // Return null or appropriate error response
+    }
   },
+
   async delete(organizationId, departmentId) {
-    await $axios
-      .delete(`/api/departments/${organizationId}/delete`, { data: { _id: departmentId } })
-      .then(() => {
-        state.error = null;
-      })
-      .catch(error => {
-        setError(error)
-      });
+    try {
+      await $axios.delete(`/api/departments/${organizationId}/delete`, { data: { _id: departmentId } });
+      state.error = null;
+      return true; // Return true to indicate successful deletion
+    } catch (error) {
+      setError(error);
+      return false; // Return false or appropriate error response
+    }
   },
 };
 

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

@@ -21,9 +21,17 @@ const state = reactive({
 
 // Methods
 const actions = {
-  async read({ user, type, target, role }) {
+  async read(options = {}) {
+   
+    let params = {}
+
+    if (options._id) params._id = options._id;
+    if (options.user) params.user = options.user;
+    if (options.target) params.target = options.target;
+    if (options.roles) params.roles = options.roles;
+
     try {
-      const response = await $axios.get(`/api/memberships`, { params: { user, type, target, role } });
+      const response = await $axios.get(`/api/memberships`, { params: params });
       state.error = null;
       state.memberships = response.data;
       return Promise.resolve(response.data);
@@ -54,7 +62,7 @@ const actions = {
   },
   async delete(membership) {
     try {
-      const response = await $axios.post(`/api/memberships/delete`, membership);
+      const response = await $axios.post(`/api/memberships/delete`, {_id: membership});
       state.error = null;
       return Promise.resolve(response.data);
     } catch (error) {

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

@@ -7,7 +7,7 @@
 			:multiple="false"
 			:taggable="false"
 			placeholder="Select a product"
-			class="bg-white h-100 pd-small radius-small" 
+			class="bg-white pd-small radius-small" 
 		/>
 		<Field 
 			v-model:field="productPrice"
@@ -29,7 +29,7 @@
 				'g',
 				'ml'
 			]"
-			class="h-100 bg-grey pd-thin radius-thin"
+			class="bg-grey pd-thin radius-thin"
 		/>
 
 		</Field>

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

@@ -1,7 +1,12 @@
 <template>
 	<div class="flex flex-column w-100 o-hidden gap-thin pd-thin">
 		<!-- <Breadcrumbs class="bg-grey radius-big pd-small"/> -->
-		<!-- {{product.quantity}} -->
+		{{product.quantity}}
+		<div v-if="product.ingredients">
+			{{product?.ingredients[0]?._id}}
+			{{product?.ingredients[0]?.quantity}}
+			{{product?.ingredients[1]?.quantity}}
+		</div>
 		<SectionProduct v-if="product" :product="product" :user="auth.state.user" class="pos-relative"/>
 
 		<PopularProducts />

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 = []
 	  }
 
   })