@ozdao/prometheus-framework 0.2.47 → 0.2.50

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

@@ -1,67 +1,126 @@
 <template>
   <transition name="slide-fade">
-    <div>
-      <section class="mn-b-medium radius-medium pd-semi bg-white">
-        <h2 class="mn-b-regular">Участники</h2>
-        <p class="t-transp p-big">Добавляйте новых участников организации и настраивайте права доступа.</p> 
+    <div class="pd-thin">
+      <section class="mn-b-medium radius-medium pd-semi bg-grey">
+        <h2 class="mn-b-regular">Members</h2>
+        <p class="t-transp p-big">Add new memberships to the group and configure access rights.</p> 
       </section>
-
-      <FeedDepartments 
-        :organization="organization.state.current"
-        :memberships="members.state.memberships"
-      />
-
+      
       <MembersAdd 
         :organization="organizationData"
         @send-invite="handleSendInvite"
       />
 
-      <MembersList 
-        :organization="organization"
-        :memberships="memberships"
-        :invites="invites.state.invites"
-        @removeInvite="removeInvite"
-        @removeMember="removeMember"
+      <Tab 
+        v-model:selected="tabMemberships"
+        class="mn-b-medium bg-grey radius-small"
+        :tabs="[
+          { name: 'Members',    value: 'members' }, 
+          { name: 'Invites',  value: 'invites' }, 
+        ]"
       />
+
+      <section class="mn-b-big radius-medium bg-white">
+        <!-- Members -->
+        <div 
+          v-if="tabMemberships === 'members'"
+          class="cols-1 gap-thin"
+        >
+          <User 
+            v-for="(member, index) in memberships.state.memberships" 
+            :key="index" 
+            :user="member" 
+            @click="$router.push(`/app/profile/${member._id}`)" 
+            class="bg-grey radius-small flex-nowrap flex  pd-medium"
+
+          />
+        </div>
+        <!-- Invites -->
+        <div 
+          v-if="tabMemberships === 'invites'"
+        > 
+          <span v-if="invites.length < 1">В организации нет приглашений</span>
+          <div 
+            v-for="(invite, index) in invites.state.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>
     </div>
   </transition>
 </template>
 
 <script setup>
-import { ref,onMounted } from 'vue';
+import { ref, computed, onMounted } from 'vue';
 import { useRoute, useRouter } from 'vue-router'
 
-import FeedDepartments from '@pf/src/modules/organizations/components/sections/FeedDepartments.vue'
+import Feed from '@pf/src/components/Feed/Feed.vue'
+import Tab      from '@pf/src/components/Tab/Tab.vue'
+import Block      from '@pf/src/components/Block/Block.vue'
+
+import PlaceholderUserpic from '@pf/src/modules/icons/placeholders/PlaceholderUserpic.vue'
+
 import MembersAdd from '@pf/src/modules/organizations/components/sections/MembersAdd.vue';
-import MembersList from '@pf/src/modules/organizations/components/sections/MembersList.vue';
+
 // Mobile Module
 import Menu from '@pf/src/modules/mobile/components/Menu/Menu.vue'
 import MenuItem from '@pf/src/modules/mobile/components/Menu/MenuItem.vue'
 
+import User from '@pf/src/modules/organizations/components/blocks/User.vue';
+
+
 import * as auth      from '@pf/src/modules/auth/store/auth'
-import * as invites from '@pf/src/modules/organizations/store/invites';
-import * as members from '@pf/src/modules/organizations/store/memberships';
+import * as invites from '@pf/src/modules/auth/store/invites';
+import * as memberships from '@pf/src/modules/organizations/store/memberships';
 import * as organization  from '@pf/src/modules/organizations/store/organizations'
+import * as departments from '@pf/src/modules/organizations/store/departments';
 
 const route   = useRoute()
-
+const router   = useRouter()
 const organizationData = ref(null)
 
+const tabMemberships = ref('members')
+
 onMounted(async () => {
   organizationData.value = (await organization.actions.read({_id: route.params._id, user: auth.state.user._id}))[0]
-  await members.actions.read(route.params._id)
+  await memberships.actions.read({target: route.params._id});
   await invites.actions.read(organizationData.value._id);
 })
 
+const FirstLevelDepartments = computed(() => {
+  const departmentsState = departments.state.departments;
+
+  const subdepartmentIds = departmentsState.flatMap(department =>
+    department.subdepartments.map(subdepartment => subdepartment._id)
+  );
+
+  return departmentsState.filter(department =>
+    !subdepartmentIds.includes(department._id)
+  );
+});
+
 async function handleSendInvite(invite) {
   await invites.actions.create(organizationData.value._id, invite);
 }
 
-async function removeMember(member) {
-  await members.actions.delete(member._id);
+async function removeMember(index,member) {
+  memberships.state.memberships.splice(index, 1);
+  await memberships.actions.delete(member._id);
 }
 
-async function removeInvite(invite) {
+async function removeInvite(index,invite) {
+  invites.state.invites.splice(index, 1);
   await invites.actions.delete(invite._id);
 }
 </script>

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

@@ -11,8 +11,7 @@
 		/>
 
 		<!-- MEMBERS TAB -->
-
-		<!-- <Menu 
+		<Menu 
 			class="mn-b-regular bg-grey"
 		>
 		  <MenuItem 
@@ -29,7 +28,59 @@
 		    	{{organization.state.current.numberOfMembers}} members
 		    </span>
 		  </MenuItem> 
-		</Menu> -->
+		</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" 
+		      @click="$router.push(`/app/profile/${member.user._id}`)" 
+		      class="bg-grey radius-small flex-nowrap flex  pd-medium"
+		    />
+
+	    </div>
+    </div>
+
 
 		<Tab 
 			v-model:selected="tabOrganization"
@@ -114,7 +165,6 @@
 
 			</transition>
 
-
 			<transition name="slide-fade">
 				<div v-if="tabOrganization === 'spots'">
 					<Feed
@@ -173,6 +223,11 @@
 	// Mobile Module
 	import Menu from '@pf/src/modules/mobile/components/Menu/Menu.vue'
 	import MenuItem from '@pf/src/modules/mobile/components/Menu/MenuItem.vue'
+	// Organizations
+	import DepartmentSub from '@pf/src/modules/organizations/components/blocks/DepartmentSub.vue';
+	import User from '@pf/src/modules/organizations/components/blocks/User.vue';
+	// Ssds
+	import CardDepartment from '@pf/src/modules/organizations/components/blocks/CardDepartment.vue';
 	// Feeds
 	import FeedEvents from '@pf/src/modules/events/components/sections/Feed.vue'; 
 	import FeedCommunity from '@pf/src/modules/community/components/sections/Feed.vue'; 
@@ -185,6 +240,7 @@
 	import * as auth 			from '@pf/src/modules/auth/store/auth'
 	import * as organization 	from '@pf/src/modules/organizations/store/organizations'
 	import * as memberships 	from '@pf/src/modules/organizations/store/memberships'
+	import * as departments from '@pf/src/modules/organizations/store/departments';
 	// Spots
 	import * as spots from '@pf/src/modules/spots/store/spots';
 	// Init router

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,3 +1,5 @@
+const ObjectId = require('mongoose').Types.ObjectId;
+
 const controllerFactory = (db) => {
   const Membership = db.membership;
 
@@ -64,13 +66,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/blocks/CardProduct.vue

@@ -36,7 +36,7 @@
 				v-else
 				class="pos-absolute h-100 w-100"
 			/>
-			<THC v-if="product.information.length > 0 && product.information[1].name === 'THC'" :product="product" />
+			<THC v-if="product.information?.length > 0 && product.information[1]?.name === 'THC'" :product="product" />
 		</div>
 
 		<!-- Product Info Start -->

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 />