@ozdao/prometheus-framework 0.2.138 → 0.2.139

package/src/modules/auth/routes/auth.routes.js

@@ -2,7 +2,7 @@
 const controllerFactory = require("../controllers/auth.controller");
 const controllerFactoryTwofa = require("../controllers/twofa.controller");
 // Middlewares
-const middlewareFactory = require('@pf/src/modules/middlewares/server');
+const middlewareFactory = require('@pf/src/modules/auth/middlewares');
 // Routes
 module.exports = function(app, db, origins) {
   const controller = controllerFactory(db);
@@ -40,7 +40,7 @@ module.exports = function(app, db, origins) {
   app.get(
     "/api/auth/check-accesses",
     [
-      authJwt.verifyToken,
+      authJwt.verifyToken(true),
     ],
      controller.checkAccesses
   );

package/src/modules/auth/routes/twofa.routes.js

@@ -1,7 +1,7 @@
 // Factories
 const controllerFactory = require("../controllers/twofa.controller");
 // Middlewares
-const middlewareFactory = require('@pf/src/modules/middlewares/server');
+const middlewareFactory = require('@pf/src/modules/auth/middlewares');
 // Routes
 module.exports = function(app, db) {
   const controller = controllerFactory(db);

package/src/modules/auth/store/auth.js

@@ -85,6 +85,8 @@
           roles: response.data.roles
         });
 
+        await initialize();
+
         return response.data;
       } catch (error) {
 
@@ -141,6 +143,8 @@
           roles: response.data.roles
         });
 
+        await initialize();
+
         return response.data;
       } catch (error) {
         setError(error);
@@ -153,6 +157,8 @@
       removeCookie('user');
 
       Object.assign(state.user, {
+        _id: undefined,
+        username: '',
         email: '',
         phone: '',
         password: '',
@@ -160,9 +166,12 @@
       });
 
       Object.assign(state.access, {
+        roles: null,
         token: null,
         status: false
       });
+
+      state.accesses = []
     },
 
     async resetPassword(user, type) {

package/src/modules/chats/routes/chats.routes.js

@@ -1,7 +1,7 @@
 // Factories
 const controllerFactory = require('../controllers/chats.controller.js');
 // Middlewares
-const middlewareFactory = require('@pf/src/modules/middlewares/server');
+const middlewareFactory = require('@pf/src/modules/auth/middlewares');
 // Routes
 module.exports = function(app, db, wss) {
   const controller = controllerFactory(db);

package/src/modules/community/routes/blog.routes.js

@@ -1,12 +1,12 @@
 const controllerFactory = require("../controllers/blog.controller");
 
-const middlewareFactoryGlobal = require('@pf/src/modules/middlewares/server');
+const middlewareFactoryAuth = require('@pf/src/modules/auth/middlewares');
 const middlewareFactoryCommunity = require('../middlewares/server');
 
 module.exports = function(app, db, origins) {
   const controller = controllerFactory(db);
 
-  const { authJwt } = middlewareFactoryGlobal(db);
+  const { authJwt } = middlewareFactoryAuth(db);
   const { verifyBlogpost } = middlewareFactoryCommunity(db);
 
   app.get(

package/src/modules/events/routes/events.routes.js

@@ -1,13 +1,13 @@
 // Factories
 const controllerFactory = require("../controllers/events.controller");
 // Middlewares
-const middlewareFactoryGlobal = require('@pf/src/modules/middlewares/server');
+const middlewareFactoryAuth = require('@pf/src/modules/auth/middlewares');
 const middlewareFactoryEvents = require('../middlewares/server');
 // Routes
 module.exports = function(app, db, origins) {
   const controller = controllerFactory(db);
 
-  const { authJwt } = middlewareFactoryGlobal(db);
+  const { authJwt } = middlewareFactoryAuth(db);
   const { verifyEvent } = middlewareFactoryEvents(db);
 
   app.get(

package/src/modules/files/routes/files.routes.js

@@ -1,13 +1,13 @@
 // Factories
 const controllerFactory = require("../controllers/files.controller");
 // Middlewares
-const middlewareFactoryGlobal = require('@pf/src/modules/middlewares/server');
+const middlewareFactoryAuth = require('@pf/src/modules/auth/middlewares');
 const middlewareFactoryFiles = require('../middlewares/server');
 
 module.exports = function(app, db, origins, publicPath) {
   const controller = controllerFactory(db, publicPath);
 
-  const { authJwt } = middlewareFactoryGlobal(db);
+  const { authJwt } = middlewareFactoryAuth(db);
   const { middlewareBusboy } = middlewareFactoryFiles(db, publicPath);
 
   app.post(

package/src/modules/gallery/routes/gallery.routes.js

@@ -1,20 +1,19 @@
 // Factories
 const controllerFactory = require("../controllers/gallery.controller");
 // Middlewares
-const middlewareFactoryGlobal = require('@pf/src/modules/middlewares/server');
-const middlewareFactoryAccesses = require('@pf/src/modules/middlewares/server/verifyAccesses')
+const middlewareFactoryAuth = require('@pf/src/modules/auth/middlewares');
+const middlewareFactoryAccesses = require('@pf/src/modules/auth/middlewares/verifyAccesses')
 
 module.exports = function(app, db, origins) {
   const controller = controllerFactory(db);
 
-  const { authJwt } = middlewareFactoryGlobal(db);
+  const { authJwt } = middlewareFactoryAuth(db);
   const { verifyRead } = middlewareFactoryAccesses(db)
 
-
   app.get(
     "/api/gallery/read",
     [
-      authJwt.verifyToken,
+      authJwt.verifyToken(true),
       verifyRead('gallery'),
     ],
     controller.read

package/src/modules/globals/services/globals.crud.js

@@ -1,12 +1,12 @@
 const globalsQuery = require('@pf/src/modules/globals/controllers/utils/queryProcessor');
 
-const Cashe = require('@pf/src/modules/globals/services/globals.cashe');
+const Cache = require('@pf/src/modules/globals/services/globals.cache');
 const Logger = require('@pf/src/modules/globals/services/globals.logger');
 
 class CRUD {
   constructor(basePath, app, db, model) {
     this.model = model;
-    this.cache = new Cashe();
+    this.cache = new Cache();
     this.logger = new Logger(db);
 
     this.app = app;

package/src/modules/marketplace/store/marketplace.js

@@ -47,7 +47,7 @@ const state = reactive({
       value: 'views'
     },{
       label: 'Products',
-      value: 'products'
+      value: 'numberOfProducts'
     }]
   }
 });

package/src/modules/orders/components/pages/OrderCreateBackoffice.vue

@@ -117,7 +117,7 @@
         @click="() => { 
           orders.mutations.resetCustomer(orders.state.current.customer)
         }"
-        class="bg-white pd-thin radius-medium w-100 mn-b-thin"
+        class="bg-white pd-thin h-4r radius-medium w-100 mn-b-thin"
       />
       <Feed
         v-else
@@ -152,7 +152,7 @@
           @click="() => { 
             orders.state.current.customer = user
           }"
-          class="bg-white pd-thin radius-medium w-100 mn-b-thin"
+          class="bg-white pd-thin h-4r radius-medium w-100 mn-b-thin"
         />
       </Feed>
       

package/src/modules/orders/components/sections/FormAddCustomer.vue

@@ -15,7 +15,7 @@
       @click="() => { 
         dataCustomer.user = null
       }"
-      class="bg-white pd-thin radius-medium w-100"
+      class="bg-white h-2r pd-thin radius-medium w-100"
     />
 
     <div 
@@ -54,7 +54,7 @@
             dataCustomer.email = user.email
             dataCustomer.socials = user.socials
           }"
-          class="bg-white pd-thin radius-medium w-100 mn-b-thin"
+          class="bg-white h-2r pd-thin radius-medium w-100 mn-b-thin"
         />
       </Feed>
     </div>

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

@@ -76,6 +76,7 @@ async function findOrCreateCustomer(Customer, customerInfo, orderOwner, orderCre
 const controllerFactory = (db) => {
   const Order = db.order;
   const Customer = db.customer;
+  const Leftover = db.leftover;
 
   // Создание заказа
   const create = async (req, res) => {

package/src/modules/orders/routes/applications.routes.js

@@ -1,11 +1,11 @@
 // Factories
 const controllerFactory = require("../controllers/applications.controller");
 // Middlewares
-const middlewareFactoryGlobal = require('@pf/src/modules/middlewares/server');
+const middlewareFactoryAuth = require('@pf/src/modules/auth/middlewares');
 module.exports = function(app, db, origins) {
   const controller = controllerFactory(db);
 
-  const { authJwt } = middlewareFactoryGlobal(db);
+  const { authJwt } = middlewareFactoryAuth(db);
 
   app.post(
     "/applications",

package/src/modules/orders/routes/orders.routes.js

@@ -1,11 +1,11 @@
 // Factories
 const controllerFactory = require("../controllers/orders.controller");
 // Middlewares
-const middlewareFactory = require('@pf/src/modules/middlewares/server');
+const middlewareFactoryAuth = require('@pf/src/modules/auth/middlewares');
 // Routes
 module.exports = function(app, db, origins, publicPath) {
   const controller = controllerFactory(db);
-  const middleware = middlewareFactory(db);
+  const middleware = middlewareFactoryAuth(db);
 
   app.post(
     "/api/orders/create",

package/src/modules/organizations/components/blocks/CardOrganization.vue

@@ -69,14 +69,16 @@
       <IconTime class="i-medium mn-r-micro"/>
       <span class="mn-r-thin">{{
         organization.distance ? 
-          Math.ceil((5 + 5 + 3 * organization.distance) / 5) * 5 
-          + '-' 
-          + Math.ceil((15 + 5 + 3 * organization.distance) / 5) * 5 
-          + ' MIN' : 'Unavailable' 
+          organization.distance > 50 ? 
+            '3-5 days' : 
+            Math.ceil((5 + 5 + 3 * organization.distance) / 5) * 5 
+            + '-' 
+            + Math.ceil((15 + 5 + 3 * organization.distance) / 5) * 5 
+            + ' MIN' : 'Unavailable' 
         }} 
       </span>
-      <span v-if="organization.distance" class="t-transp mn-r-thin">|</span>
-      <span class="mn-r-thin">{{organization.distance ? organization.distance.toFixed(1) + ' KM' : ''}} </span>
+      <span v-if="organization.distance && organization.distance < 50" class="t-transp mn-r-thin">|</span>
+      <span v-if="organization.distance && organization.distance < 50" class="mn-r-thin">{{organization.distance ? organization.distance.toFixed(1) + ' KM' : ''}} </span>
       <!-- <span class="mn-r-thin">{{organization.nearestSpotDistance}}</span> -->
       <IconPrice class="i-medium mn-r-micro"/>
       <span class="mn-r-thin">{{returnCurrency()}}500 </span>
@@ -88,7 +90,7 @@
       <div class="w-max flex-nowrap flex gap-thin">
         <CardOrderItem  
           @click.stop="$router.push({name: 'Product Organization', params: {_id: organization._id, product: product._id}})" 
-          v-for="product in organization.products.slice(0,10)" 
+          v-for="product in organization.products.slice(0,5)" 
           :key="product._id" 
           :editable="false" 
           :product="product" 

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

@@ -120,7 +120,7 @@
         v-if="tab === 'invites'"
       > 
         <Feed
-          :search="true"
+          v-model:items="invitesState"
           :states="{
             empty: {
               title: 'No Invites Found',
@@ -183,6 +183,7 @@ import CardDepartment from '@pf/src/modules/organizations/components/blocks/Card
 import IconDelete from '@pf/src/modules/icons/navigation/IconDelete.vue'
 
 import * as auth      from '@pf/src/modules/auth/store/auth'
+import * as globals      from '@pf/src/modules/globals/store/globals'
 import * as invites from '@pf/src/modules/organizations/store/invites';
 import * as memberships from '@pf/src/modules/organizations/store/memberships';
 import * as organization  from '@pf/src/modules/organizations/store/organizations'
@@ -194,6 +195,8 @@ const organizationData = ref(null)
 
 // Tab logic
 const tab = ref('members')
+// States
+const invitesState = ref([])
 // Popup
 const isOpenMembersAddPopup = ref(false);
 
@@ -222,19 +225,27 @@ const FirstLevelDepartments = computed(() => {
   );
 });
 
-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,
-  });
-  closeMembersAddPopup()
+async function handleSendInvite(list, resolve, reject) {
+  try {
+    const response = await invites.actions.create({
+      owner: {
+        type: 'Organization',
+        target: organizationData.value._id
+      },
+      creator: {
+        type: 'User',
+        target: auth.state.user._id
+      },
+      invites: list,
+    });
+    for (let invite of response.createdInvites) {
+      globals.actions.add(invitesState.value, invite)
+    }
+    closeMembersAddPopup();
+    resolve(); // Вызываем resolve, когда все операции завершены успешно
+  } catch (error) {
+    reject(error); // Вызываем reject, если произошла ошибка
+  }
 }
 
 async function removeMember(index,member) {
@@ -246,7 +257,7 @@ async function removeMember(index,member) {
 
 async function removeInvite(index,invite) {
   if (confirm("Confirm remove of member") == true) {
-    invites.state.invites.splice(index, 1);
+    globals.actions.delete(invitesState.value, invite)
     await invites.actions.delete(invite._id);
   }
 }

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

@@ -91,7 +91,7 @@
       </div>
 
       <p class="w-max-50r mn-t-regular mn-b-medium p-big">
-     		<Text :text="organization.profile.description || ''" :maxLen="240" />
+     		<Text :text="organization.profile.description || ''" :showToggleText="true" :maxLen="320" />
     	</p>  
 
     	<Chips 

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

@@ -1,48 +1,97 @@
 <template>
   <div>
     <p class="mn-b-thin t-transp p-medium">{{text}}</p> 
-      <section class="cols-1 mn-b-small radius-medium pd-semi bg-light">
-        <div
-          v-for="(member, index) in members" 
-          :key="index" 
-          class="
-            br-1px br-solid br-grey-transp-25
-            flex
-            gap-thin
-            radius-small
-            mn-b-thin
-          "
+
+    <div class="mn-b-thin pos-relative">
+      <BlockSearch 
+        v-click-outside="() => {searchUserShow = false}" 
+        @search="(event) => { searchUser = event; searchUserShow = true }"
+        placeholder="Enter name, phone or email"
+        class="bg-grey"
+      />
+
+      <div 
+        v-if="searchUser && searchUserShow" 
+        class="mn-t-thin pos-absolute w-100 pos-t-100 pos-l-0 z-index-3 bg-light pd-small radius-small
+      ">
+        <Feed
+          :states="{
+            empty: {
+              title: 'No User Found',
+              description: 'Currently, there are no such user.'
+            }
+          }"
+          :store="{
+            read: (options) => users.actions.read(options),
+            state: null
+          }"
+          :options="{
+            search: searchUser
+          }"
+          :showLoadMore="false"
+          v-slot="{ 
+            items 
+          }"
+          class="h-max-20r o-scroll"
+        >
+          <CardUser
+            v-for="(user, index) in items" :key="user._id"
+            :user="user"
+            :photo="user.profile.photo"
+            :name="user.profile.name || user.phone || user.email"
+            @click="() => { 
+              members.push({contact: user.email || user.phone})
+              searchUserShow = false
+            }"
+            class="bg-white h-2r pd-thin radius-medium w-100 mn-b-thin"
+          />
+        </Feed>
+      </div>
+    </div>
+
+    <section class="cols-1 mn-b-small radius-medium pd-semi bg-light pos-relative">
+
+      <div
+        v-for="(member, index) in members" 
+        :key="index" 
+        class="
+          br-1px br-solid br-grey-transp-25
+          flex
+          gap-thin
+          radius-small
+          mn-b-thin
+        "
+      >
+        <Field 
+          v-model:field="member.contact"   
+          placeholder="Enter email or phone" 
+          class="w-100 pd-small radius-small bg-white"
+          :validation="contactValidation"
         >
-          <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"
           >
-            <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>
+            <IconAdd 
+              class="i-medium"
+              :fill="'rgb(var(--white)'"
+            />
+          </div>
 
-            <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>
+          <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  
@@ -59,19 +108,26 @@
   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 Feed from '@pf/src/components/Feed/Feed.vue'
+
+  import BlockSearch from '@pf/src/modules/globals/components/blocks/BlockSearch.vue'
+
+  import CardUser from '@pf/src/modules/users/components/blocks/CardUser.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';
+  // Store
+  import * as users from '@pf/src/modules/users/store/users';
   // Props
   const props = defineProps({
     organization: Object,
     text: String,
   });
-
+  // User Search
+  let searchUser = ref(null)
+  let searchUserShow = ref(false)
   // Validation
   const contactValidation = ref(null)
   // Define Emits
@@ -80,6 +136,8 @@
   const members = ref([{ contact: ''}]);
 
   async function submitMembers() {
-    emits('send-invite', members.value);
+    return new Promise((resolve, reject) => {
+      emits('send-invite', members.value, resolve, reject);
+    });
   }
 </script>

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

@@ -34,15 +34,20 @@ const сontrollerFactory = (db) => {
   };
 
   const create = async (req, res) => {
-    const creator = req.body.creator
-    const owner = req.body.owner
-
-    const list = req.body.invites
+    const creator = req.body.creator;
+    const owner = req.body.owner;
+    const list = req.body.invites;
+    const createdInvites = [];
+    const createdMemberships = [];
 
     try {
       for (let invite of list) {
         let user = null;
 
+        if (!invite || !invite.contact) {
+          continue; // Пропускаем пустые объекты или объекты без contact
+        }
+        
         if (invite.contact.includes('@')) {
           user = await User.findOne({ email: invite.contact });
         } else {
@@ -50,7 +55,6 @@ const сontrollerFactory = (db) => {
         }
         
         if (user) {
-          
           const membership = new Membership({
             user: user._id,
             type: 'organization',
@@ -58,10 +62,9 @@ const сontrollerFactory = (db) => {
             role: 'member',
             label: 'member'
           });
-
-          await membership.save();
+          const savedMembership = await membership.save();
+          createdMemberships.push(savedMembership);
         } else {
-          
           const newInvite = new Invite({
             code: uuid(),
             creator: creator,
@@ -70,26 +73,28 @@ const сontrollerFactory = (db) => {
             email: invite.contact.includes('@') ? invite.contact : null,
             phone: !invite.contact.includes('@') ? invite.contact : null,
           });
-
           const savedInvite = await newInvite.save();
+          createdInvites.push(savedInvite);
 
           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"`;
+            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.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!',
+        createdInvites: createdInvites,
+        createdMemberships: createdMemberships
+      });
     } catch (error) {
       console.error(error);
       res.status(500).json({ message: 'Something went wrong' });