@ozdao/prometheus-framework 0.2.81 → 0.2.83

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

@@ -1,64 +1,152 @@
 <template>
-  <transition name="slide-fade">
-    <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>
-      
+  <div class="pd-thin">
+    <SectionPageTitle
+      title="Members"
+      @update:tabs_current="(update) => tab = update"
+      :tabs_current="tab"
+      :tabs="[
+        { name: `Members (${organization.state.current.numberOfMembers})`, value: 'members' },
+        { name: 'Departments', value: 'departments' },
+        { name: 'Invites', value: 'invites' }
+      ]"
+      :actions="[
+        { method: openMembersAddPopup, label: 'Invite members' }
+      ]"
+      class="mn-b-small bg-grey bg-grey radius-big"
+    />
+
+    <Popup 
+      title="Add members"
+      @close-popup="closeMembersAddPopup" 
+      :isPopupOpen="isOpenMembersAddPopup"
+      class="bg-white w-min-30r w-max-30r radius-big pd-medium"
+    >
       <MembersAdd 
+        text="Please enter your email or phone number to send an invitation link:"
         :organization="organizationData"
         @send-invite="handleSendInvite"
       />
-
-      <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"
+    </Popup>  
+
+    <Block
+      v-if="tab === 'departments'"
+      class="mn-b-semi"
+    >
+      <Feed
+        :states="{
+          empty: {
+            title: 'No Departments Found',
+            description: 'Currently, there are no departments available.',
+            action: 'Add department',
+            callback:  () => $router.push(`/organizations/${route.params._id}/departments/create`)
+          }
+        }"
+        :store="{
+          read: (options) => departments.actions.read(options),
+          state: null
+        }"
+        :options="{
+          organization: route.params._id,
+          user: auth.state.user._id,
+          hidden: false,
+        }"
+        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>  
+
+    <section class="mn-b-big radius-medium bg-white">
+      <!-- Members -->
+      <div 
+        v-if="tab === 'members'"
+        class="cols-1 gap-thin"
+      >
+        <Feed
+          :search="true"
+          :states="{
+            empty: {
+              title: 'No Members Found',
+              description: 'Currently, there are no members.'
+            }
+          }"
+          :store="{
+            read: (options) => memberships.actions.read(options)
+          }"
+          :options="{
+            target: route.params._id
+          }"
+          v-slot="{ 
+            items 
+          }"
+          class="gap-thin cols-1"
         >
-          <User 
-            v-for="(member, index) in memberships.state.memberships" 
+          <CardUser 
+            v-for="(member,index) in items" 
             :key="index" 
-            :user="member" 
-            @click="$router.push(`/app/profile/${member._id}`)" 
-            class="bg-grey radius-small flex-nowrap flex  pd-medium"
-
+            :user="member"
+            :_id="member.user._id"
+            :photo="member.user.profile.photo" 
+            :phone="member.user.phone"
+            :email="member.user.email"
+            :name="member.user.profile.name || 'No name'"
+            :role="member.label || member.role"
+            @click="$router.push(`/profile/${member.user._id}`)" 
+            :action=" member.role !== 'owner' ? {
+              label: 'x',
+              method: () => removeMember(index, member)
+            } : null"
+            class="w-100 bg-grey radius-big flex-nowrap flex pd-medium"
+          />
+        </Feed>
+      </div>
+      <!-- Invites -->
+      <div 
+        v-if="tab === 'invites'"
+      > 
+        <Feed
+          :search="true"
+          :states="{
+            empty: {
+              title: 'No Invites Found',
+              description: 'Currently, there are no members.'
+            }
+          }"
+          :store="{
+            read: (options) => invites.actions.read(options)
+          }"
+          :options="{
+            owner: route.params._id
+          }"
+          v-slot="{ 
+            items 
+          }"
+          class="gap-thin cols-1"
+        >
+          <CardUser 
+            v-for="invite in items" 
+            :key="index" 
+            :user="{ type: 'invite'} "
+            :name="invite.email || invite.phone"
+            :role="invite.status"
+            :action="{
+              label: 'x',
+              method: () => removeInvite(index, invite)
+            }"
+            class="w-100 bg-grey radius-big 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>
+        </Feed>
+      </div>
+    </section>
+  </div>
 </template>
 
 <script setup>
@@ -68,7 +156,9 @@ import { useRoute, useRouter } from 'vue-router'
 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 Popup from '@pf/src/components/Popup/Popup.vue';
 
+import SectionPageTitle from '@pf/src/modules/globals/components/sections/SectionPageTitle.vue'
 import PlaceholderUserpic from '@pf/src/modules/icons/placeholders/PlaceholderUserpic.vue'
 
 import MembersAdd from '@pf/src/modules/organizations/components/sections/MembersAdd.vue';
@@ -77,8 +167,8 @@ import MembersAdd from '@pf/src/modules/organizations/components/sections/Member
 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 CardUser from '@pf/src/modules/users/components/blocks/CardUser.vue';
+import CardDepartment from '@pf/src/modules/organizations/components/blocks/CardDepartment.vue';
 
 import * as auth      from '@pf/src/modules/auth/store/auth'
 import * as invites from '@pf/src/modules/organizations/store/invites';
@@ -90,12 +180,22 @@ const route   = useRoute()
 const router   = useRouter()
 const organizationData = ref(null)
 
-const tabMemberships = ref('members')
+// Tab logic
+const tab = ref('members')
+// Popup
+const isOpenMembersAddPopup = ref(false);
+
+function openMembersAddPopup() {
+  isOpenMembersAddPopup.value = true;
+}
+
+function closeMembersAddPopup() {
+  isOpenMembersAddPopup.value = false;
+}
 
 onMounted(async () => {
   organizationData.value = (await organization.actions.read({_id: route.params._id, user: auth.state.user._id}))[0]
-  await memberships.actions.read({target: route.params._id});
-  await invites.actions.read(organizationData.value._id);
+  ;
 })
 
 const FirstLevelDepartments = computed(() => {
@@ -110,18 +210,32 @@ const FirstLevelDepartments = computed(() => {
   );
 });
 
-async function handleSendInvite(invite) {
-  await invites.actions.create(organizationData.value._id, invite);
+async function handleSendInvite(list) {
+  await invites.actions.create({
+    owner: {
+      type: 'Organization',
+      target: organizationData.value._id
+    },
+    creator: {
+      type: 'User',
+      target: auth.state.user._id
+    },
+    invites: list,
+  });
 }
 
 async function removeMember(index,member) {
-  memberships.state.memberships.splice(index, 1);
-  await memberships.actions.delete(member._id);
+  if (confirm("Confirm remove of member") == true) {
+    memberships.state.memberships.splice(index, 1);
+    await memberships.actions.delete(member._id);
+  } 
 }
 
 async function removeInvite(index,invite) {
-  invites.state.invites.splice(index, 1);
-  await invites.actions.delete(invite._id);
+  if (confirm("Confirm remove of member") == true) {
+    invites.state.invites.splice(index, 1);
+    await invites.actions.delete(invite._id);
+  }
 }
 </script>
 

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

@@ -10,44 +10,6 @@
 			class="mn-b-semi"
 		/>
 
-		<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(options),
-	        state: null
-	      }"
-	      :options="{
-      		organization: route.params._id,
-          user: auth.state.user._id,
-          hidden: false,
-	      }"
-	      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"
 			:tabs="[
@@ -192,9 +154,7 @@
 	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';
+	import User from '@pf/src/modules/users/components/blocks/CardUser.vue';
 	// Feeds
 	import FeedEvents from '@pf/src/modules/events/components/sections/Feed.vue'; 
 	import FeedCommunity from '@pf/src/modules/community/components/sections/Feed.vue'; 

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

@@ -1,9 +1,7 @@
 <template>
   <div>
-      <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> 
-      
+    <p class="mn-b-thin t-transp p-medium">{{text}}</p> 
+      <section class="cols-1 mn-b-small radius-medium pd-semi bg-grey">
         <div
           v-for="(member, index) in members" 
           :key="index" 
@@ -13,40 +11,45 @@
             gap-thin
             radius-small
             mn-b-thin
-          ">
-            <Field 
-              v-model:field="member.contact"   
-              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>
+          "
+        >
+          <Field 
+            v-model:field="member.contact"   
+            placeholder="Enter email or phone" 
+            class="w-100 pd-small radius-small bg-white"
+            :validation="contactValidation"
+          >
+            <div 
+              v-if="index < 1" 
+              @click="() => members.push({contact: ''})"  
+              class="radius-small h-100 i-big flex-center flex aspect-1x1 bg-green"
+            >
+              <IconAdd 
+                class="i-medium"
+                :fill="'rgb(var(--white)'"
+              />
             </div>
-          </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="w-100 bg-main">
-            <span>Invite to organization</span>
-          </Button>
+            <div 
+              v-else 
+              @click="() => members.splice(index, 1)" 
+              class="radius-small h-100 i-big flex-center flex aspect-1x1 bg-red"
+            >
+              <IconDelete 
+                class="i-medium"
+                :fill="'rgb(var(--white)'"
+              />
+            </div>
+          </Field>
+        </div>
       </section>
+
+
+      <Button  
+        :submit="submitMembers" 
+        class="w-100 bg-main">
+        <span>Invite to organization</span>
+      </Button>
   </div>
 </template>
 
@@ -56,12 +59,17 @@
   import Field    from '@pf/src/components/Field/Field.vue'
   import Select   from '@pf/src/components/Select/Select.vue'
   import Button   from '@pf/src/components/Button/Button.vue'
+
+  import IconDelete from '@pf/src/modules/icons/navigation/IconDelete.vue';
+  import IconAdd from '@pf/src/modules/icons/navigation/IconAdd.vue';
   // Import validation
   import * as inputsValidation from '@pf/src/modules/middlewares/client/inputs.validation'
+
   import * as invites from '@pf/src/modules/organizations/store/invites';
   // Props
   const props = defineProps({
     organization: Object,
+    text: String,
   });
 
   // Validation
@@ -69,25 +77,9 @@
   // Define Emits
   const emits = defineEmits(['send-invite']);
   // Define State
-  const members = ref([{ contact: '', role: ''}]);
-  // Define Methods
-  function addMember() {
-    members.value.push({ contact: '', role: ''});
-  }
-
-  function removeMember(index) {
-    members.value.splice(index, 1);
-  }
-  async function handleSendInvite(invite) {
-    await invites.actions.create(props.organization._id, members.value)
-  }
-
+  const members = ref([{ contact: ''}]);
 
   async function submitMembers() {
     emits('send-invite', members.value);
   }
-
-  function reloadPage() {
-    // location.reload();
-  }
 </script>

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

@@ -17,10 +17,8 @@ const controllerFactory = (db) => {
   };
 
   const read = (req, res) => {
-   let query = {};
-   let options = {};
-
-   console.log(req.query)
+    let query = {};
+    let options = {};
     
     if (req.query.organization) {
       query.organization = new db.mongoose.Types.ObjectId(req.query.organization);

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

@@ -21,10 +21,12 @@ const сontrollerFactory = (db) => {
 
   const read = async (req, res) => {
     try {
-      const invites = await Invite.find({ organization: req.params._id })
-      if (!invites) {
-        return res.status(404).send({ message: "Invites not found" });
+      const invites = await Invite.find({ 'owner.target': req.params._id })
+
+      if (!invites || invites.length === 0) {
+        return res.status(200).send([]);
       }
+
       res.send(invites);
     } catch (err) {
       res.status(500).send({ message: err.message });
@@ -32,12 +34,12 @@ const сontrollerFactory = (db) => {
   };
 
   const create = async (req, res) => {
-    const userInviter = JSON.parse(req.cookies.user);
-    const organizationId = req.params._id;
+    const creator = req.body.creator
+    const owner = req.body.owner
+    const list = req.body.invites
 
     try {
-      const invites = req.body;
-      for (let invite of invites) {
+      for (let invite of list) {
         let user = null;
 
         if (invite.contact.includes('@')) {
@@ -47,46 +49,45 @@ const сontrollerFactory = (db) => {
         }
         
         if (user) {
-
-          console.log(invite)
           
           const membership = new Membership({
             user: user._id,
             type: 'organization',
-            target: organizationId,
-            role: invite.role,
+            target: req.body.owner.target,
+            role: 'member',
+            label: 'member'
           });
 
           await membership.save();
-          res.status(200).json({ message: 'Invites sent successfully!' });
         } else {
           const newInvite = new Invite({
             code: uuid(),
-            organization: organizationId,
-            role: invite.role,
-            createdBy: userInviter._id,
-            invitedEmail: invite.contact.includes('@') ? invite.contact : null,
-            invitedPhone: !invite.contact.includes('@') ? invite.contact : null,
+            creator: creator,
+            owner: owner,
+            role: 'member',
+            email: invite.contact.includes('@') ? invite.contact : null,
+            phone: !invite.contact.includes('@') ? invite.contact : null,
           });
+
           const savedInvite = await newInvite.save();
 
-          if (savedInvite.invitedEmail) {
-            const to = savedInvite.invitedEmail;
+          if (savedInvite.email !== null) {
+            const to = savedInvite.email;
             const subject = 'You have been added to the organization';
             const text = `You have been invited to join an organization on ${process.env.APP_NAME}! Use this link to register: ${process.env.API_URL}/auth/invite?inviteCode=${newInvite.code}&type=email"`;
+            
             await sendEmail(to, subject, text);
           }
 
-          if (savedInvite.invitedPhone !== null) {
-            const phone = savedInvite.invitedPhone;
+          if (savedInvite.phone !== null) {
+            const phone = savedInvite.phone;
             const message = `You have been invited to join an organization on ${process.env.APP_NAME}! Use this link to register: ${process.env.API_URL}/auth/invite?inviteCode=${newInvite.code}&type=phone`;
 
             await sendSms(phone, message);
           }
-
-          res.status(200).json({ message: 'Invites sent successfully!' });
         }
       }
+      res.status(200).json({ message: 'Invites sent successfully!' });
     } catch (error) {
       console.error(error);
       res.status(500).json({ message: 'Something went wrong' });

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

@@ -23,7 +23,7 @@ const controllerFactory = (db) => {
     // Auth Module
     const User = db.user;
     const Role = db.role;
-   
+    
     const sortParam = req.query.sortParam || 'numberOfProducts';
     const sortOrder = req.query.sortOrder || 'desc';
     

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

@@ -21,11 +21,59 @@ module.exports = (mongoose) => {
         start: String,
         end: String
       }
-    }],   
+    }],
     hidden: {
       type: Boolean,
       default: false,
     },
+
+    accesses: {
+      products: {
+        read: {
+          type: Boolean,
+          default: false,
+        },
+        edit: {
+          type: Boolean,
+          default: false,
+        },
+        delete: {
+          type: Boolean,
+          default: false,
+        },
+      },
+
+      orders: {
+        read: {
+          type: Boolean,
+          default: false,
+        },
+        confirm: {
+          type: Boolean,
+          default: false,
+        },
+        delete: {
+          type: Boolean,
+          default: false,
+        },
+      },
+
+      departments: {
+        read: {
+          type: Boolean,
+          default: false,
+        },
+        edit: {
+          type: Boolean,
+          default: false,
+        },
+        delete: {
+          type: Boolean,
+          default: false,
+        },
+      },
+    },
+
     // Marketplace options
     delivery: [String],
     payment: [String],
@@ -47,8 +95,10 @@ module.exports = (mongoose) => {
         ref: 'Department',
       },
     ],
+  }, { 
+    timestamps: true 
   });
-
+  
   departmentSchema.index({ organization: 1 })
 
   const Department = mongoose.model('Department', departmentSchema);