@ozdao/prometheus-framework 0.1.30 → 0.1.31

package/src/modules/legal/router/legal.js

@@ -7,7 +7,6 @@ const legal = [
         en: 'Legal',
         ru: 'Юридическая информация'
       },
-      authorize: []
     },
     component: () => import(/* webpackChunkName: 'Legal' */ '../components/pages/Legal.vue'),
   },
@@ -19,7 +18,6 @@ const legal = [
         en: 'Privacy Policy',
         ru: 'Политика конфиденциальности'
       },
-      authorize: []
     },
     component: () => import(/* webpackChunkName: 'Privacy' */ '../components/pages/legal/Privacy.vue'),
   },
@@ -31,7 +29,6 @@ const legal = [
         en: 'Terms of Use',
         ru: 'Условия использования'
       },
-      authorize: []
     },
     component: () => import(/* webpackChunkName: 'Terms' */ '../components/pages/legal/Terms.vue'),
   },
@@ -43,9 +40,19 @@ const legal = [
         en: 'Cookie Policy',
         ru: 'Политика Сookies'
       },
-      authorize: []
     },
     component: () => import(/* webpackChunkName: 'Cookies' */ '../components/pages/legal/Cookies.vue'),
+  },
+  {
+    path: 'legal/eula',
+    name: 'EULA',
+    meta: {
+      title: {
+        en: 'EULA',
+        ru: 'EULA'
+      },
+    },
+    component: () => import(/* webpackChunkName: 'Cookies' */ '../components/pages/legal/EULA.vue'),
   }
 ];
 

package/src/modules/middlewares/client/auth.validation.js

@@ -15,6 +15,19 @@ function requiresAuth(to, from, next) {
   next();
 }
 
+function requiresAdmin(to, from, next) {
+
+  const isAdmin = auth.state.access.roles.includes('ROLE_ADMIN');
+
+  if (isAdmin !== true) {
+    return next('/404');
+  }
+
+  next();
+}
+
+
+
 function requiresNoAuth(to, from, next) {
   const isLogin = auth.state.access.status;
   // to.meta.requiresNoAuth 
@@ -26,6 +39,7 @@ function requiresNoAuth(to, from, next) {
 }
 
 export  {
+  requiresAdmin,
   requiresAuth,
   requiresNoAuth
 }

package/src/modules/mobile/components/Menu/Menu.vue

@@ -1,5 +1,5 @@
 <template>
-  <section class="mobile-menu-section mn-semi pd-r-zero pd-t-thin pd-b-thin pd-medium radius-medium">
+  <section class="mobile-menu-section  pd-r-zero pd-t-thin pd-b-thin pd-medium radius-medium">
     <slot></slot>
   </section>
 </template>

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

@@ -36,7 +36,7 @@
         </div>
 
         <div>
-            <p class="mn-thin ">{{organization.numberOfMemberships}} followers</p>
+            <p class="mn-thin ">{{organization.numberOfSubscribers}} followers</p>
 
             <ButtonFollow 
               v-if="user._id"

package/src/modules/organizations/components/elements/ButtonFollow.vue

@@ -3,7 +3,7 @@
     :submit="toggleFollow"
     class="bg-main button-small button"
   >
-    {{ isMember ? 'Unfollow' : 'Follow' }}
+    {{ status ? 'Unfollow' : 'Follow' }}
   </Button>
 </template>
 
@@ -25,7 +25,7 @@
       type: String,
       required: true
     },
-    isMember: {
+    status: {
       type: Boolean,
       required: true
     },
@@ -36,7 +36,7 @@
   });
 
   const toggleFollow = async () => {
-    if (props.isMember) {
+    if (props.status) {
       await unfollowPublic(props.targetId);
     } else {
       await followPublic(props.targetId);
@@ -48,11 +48,12 @@
         const membershipData = {
           type: props.type,
           target: targetId,
-          user: props.userId
+          user: props.userId,
+          role: 'subscriber'
         };
 
         const response = await memberships.actions.create(membershipData);
-        emits('updateMembership', { membership: response, isMember: true, targetId: props.targetId });
+        emits('updateMembership', { membership: response, status: true, targetId: props.targetId });
       } catch (error) {
         console.log(error)
         throw error;
@@ -63,12 +64,13 @@
       const membershipData = {
         type: props.type,
         target: targetId,
-        user:  props.userId
+        user:  props.userId,
+        role: 'subscriber'
       };
 
       try {
         const response = await memberships.actions.delete(membershipData);
-        emits('updateMembership', { membership: response, isMember: false, targetId: props.targetId });
+        emits('updateMembership', { membership: response, status: false, targetId: props.targetId });
       } catch (error) {
          console.log(error)
         throw error;

package/src/modules/organizations/components/elements/ButtonToggleMembership.vue

@@ -0,0 +1,101 @@
+<template>
+  <Button
+    :submit="toggleMembership"
+    :showSucces="false"
+    class="button-small button"
+  >
+  {{ !status ? props.text.create : props.text.remove }}
+</Button>
+</template>
+
+<script setup>
+  import Button from "@pf/src/components/Button/Button.vue";
+  
+  import { ref } from 'vue'
+  import * as auth from '@pf/src/modules/auth/store/auth'
+  import * as memberships from '@pf/src/modules/organizations/store/memberships'
+
+  const emits = defineEmits(['updateMembership'])
+
+  const props = defineProps({
+    user: {
+      type: String,
+      required: true
+    },
+    type: {
+      type: String,
+      required: true
+    },
+    role: {
+      type: String,
+      required: false
+    },
+    target: {
+      type: String,
+      required: true
+    },
+    text: {
+      type: Object,
+      default: {
+        create: 'join',
+        remove: 'leave'
+      }
+    },
+    status: {
+      type: Boolean,
+      required: true
+    }
+  });
+
+  const toggleMembership = async () => {
+    if (!props.status) {
+      await createMembership();
+    } else {
+      await removeMembership();
+    }
+  }
+
+  async function createMembership() {
+    try {
+      const membershipData = {
+        user: props.user,
+        type: props.type,
+        role: props.role,
+        target: props.target
+      };
+
+      const response = await memberships.actions.create(membershipData);
+
+      emits('updateMembership', { 
+        membership: response, 
+        target: props.target, 
+        status: true,
+      });
+    } catch (error) {
+      console.log(error)
+      throw error;
+    }
+  }
+
+  async function removeMembership(targetId) {
+    const membershipData = {
+      user: props.user,
+      type: props.type,
+      role: props.role,
+      target: props.target
+    };
+
+    try {
+      const response = await memberships.actions.delete(membershipData);
+
+      emits('updateMembership', {
+        membership: response, 
+        target: props.target, 
+        status: false,
+      });
+    } catch (error) {
+      console.log(error)
+      throw error;
+   }
+ }
+</script>

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

@@ -11,31 +11,7 @@
 			:organization="organization.state.current" 
 			:user="auth.state.user"
 			class="mn-semi"
-		>
-
-			<p 
-				class="t-semi mn-small"
-			>
-				<!-- 👍 3 212 likes ·  -->
-				<!-- 💬 342 comments ·  -->
-				👨‍👨‍👧‍👧 {{organization.state.current.numberOfMemberships}} followers
-			</p>
-
-			<ButtonFollow 
-		      v-if="
-		      	auth.state.user._id 
-		      	&& route.params._id 
-		      	&& route.params._id !== auth.state.user._id
-		      	&& organization.state.current.owner !== auth.state.user._id
-		      "
-		      :type="'organization'" 
-		      :isMember="organization.state.current.isMember" 
-		      :targetId="organization.state.current._id" 
-		      :userId="auth.state.user._id"
-		      class="w-min mn-auto" 
-		      @updateMembership="handleMembershipUpdate"
-	    	/>
-		</DetailsTab>
+		/>
 
 		<!-- { name: 'Spots', 		value: 'spots' }, -->
 		<!-- { name: 'Products', 	value: 'products' }, -->
@@ -48,8 +24,6 @@
 			]"
 			class="mn-small o-hidden h5 radius-big bg-grey"
 		/>
-
-
 	
 		<transition name="slide-fade">
 			<Feed 
@@ -132,13 +106,6 @@
 	watch(tabOrganization, (newValue) => {
 	  router.replace({ query: { ...route.query, tab: newValue } });
 	});
-	// Get organization _id from cookie
-  	// Async requests
-
-
- 	const handleMembershipUpdate = ({ membership, isMember, targetId }) => {
-	  memberships.mutations.handleMembershipUpdate(organization.state.current, membership, isMember, targetId)
-	};
 </script>
 
 <style lang="scss">

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

@@ -2,6 +2,43 @@
 	<transition name="slide-fade">
 		<section class="t-center flex-center flex-column flex pd-medium radius-big bg-grey">
 
+			<Dropdown 
+				v-if="user._id !== organization.owner"
+				:label="'...'" 
+				:align="'right'"
+				class="cursor-pointer pos-absolute pos-r-0 pos-t-0 pd-thin radius-extra "
+			>
+				<section 
+					class="bg-black pd-thin radius-small"
+				>
+					<FormReport 
+						:user="user._id"
+						:type="'organization'" 
+						:target="organization._id" 
+						:text="'Report'" 
+						class="w-100"
+					>
+						<button 
+							class="w-100 bg-black br-solid br-1px br-white-transp-20 t-white button-small button"
+						>
+							Report
+						</button>
+					</FormReport>
+
+					<ButtonToggleMembership
+							v-if="user._id && user._id !== organization.owner"
+				      :user="user._id"
+				      :type="'organization'" 
+			      	:role="'blocked'" 
+				      :target="organization._id" 
+				      :status="organization.isBlocked" 
+				      :text="{create: 'Block', remove: 'Unblock'}"
+				      @updateMembership="event => handleMembershipUpdate(event, 'isBlocked')"
+				       class="t-white mn-t-thin bg-red" 
+			    	/>
+				</section>
+      </Dropdown>
+
 			<IconEdit
 				v-if="user._id === organization.owner"
 				@click="$router.push({
@@ -42,7 +79,30 @@
 		      	</span> 
 			</div>
 
-		 	<slot></slot>
+		 	<p 
+				class="t-semi mn-small"
+			>
+				<!-- 👍 3 212 likes ·  -->
+				<!-- 💬 342 comments ·  -->
+				👨‍👨‍👧‍👧 {{organization.numberOfSubscribers}} followers
+			</p>
+
+		 	<ButtonToggleMembership
+    		v-if="
+	      	user._id 
+	      	&& route.params._id 
+	      	&& route.params._id !== user._id
+	      	&& organization.owner !== user._id
+	      "
+	      :user="user._id"
+	      :type="'organization'" 
+      	:role="'subscriber'" 
+	      :target="organization._id" 
+	      :status="organization.isSubscriber" 
+				:text="{create: 'Follow', remove: 'Unfollow'}"
+	      @updateMembership="event => handleMembershipUpdate(event, 'isSubscriber', 'numberOfSubscribers')"
+	      class="w-min mn-medium	mn-r-auto mn-l-auto" 
+    	/>
 
       <h4 
       	v-if="Object.values(organization.socials).some(value => value)" 
@@ -81,18 +141,36 @@
 
 <script setup>
 	import { ref, computed } from 'vue'
-
-	import Contacts from '@pf/src/modules/organizations/components/blocks/Contacts.vue'
-	import Rating from '@pf/src/modules/organizations/components/blocks/Rating.vue'
-	import Socials from '@pf/src/modules/organizations/components/blocks/Socials.vue'
-	
+	import { useRoute, useRouter } from 'vue-router'
+	// Import components
+	import Dropdown from "@pf/src/components/Dropdown/Dropdown.vue";
 	import Text  		from '@pf/src/components/Text/Text.vue'
-
+	// Icons
 	import IconEdit from '@pf/src/modules/icons/navigation/IconEdit.vue'
 	import PlaceholderUserpic from '@pf/src/modules/icons/placeholders/PlaceholderUserpic.vue'
-
+	// Org Module
+	import ButtonToggleMembership from '@pf/src/modules/organizations/components/elements/ButtonToggleMembership.vue'
+	import Contacts from '@pf/src/modules/organizations/components/blocks/Contacts.vue'
+	import Rating from '@pf/src/modules/organizations/components/blocks/Rating.vue'
+	import Socials from '@pf/src/modules/organizations/components/blocks/Socials.vue'
+	// Report Module
+	import FormReport from '@pf/src/modules/reports/components/sections/FormReport.vue' 
+	// Store 
+	import * as organizations 	from '@pf/src/modules/organizations/store/organizations'
+	import * as memberships 	from '@pf/src/modules/organizations/store/memberships'
+	// ///////////////////////////////////////
+ 	// Components Props
+ 	// ///////////////////////////////////////
 	const props = defineProps({
 		organization: Object,
 		user: Object
 	})
+	// Store
+	const route = useRoute()
+	
+	// Methods
+	const handleMembershipUpdate = ({ membership, status, target }, statusName, statusNumber) => {
+	  memberships.mutations.handleMembershipUpdate(organizations.state.current, membership, status, target, statusName, statusNumber)
+	};
+
 </script>

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

@@ -34,6 +34,8 @@ const controllerFactory = (db) => {
   };
 
   const create = async (req, res) => {
+
+    console.log(req.body)
     const newMembership = new Membership({
       user: req.body.user,
       type: req.body.type,
@@ -62,19 +64,20 @@ const controllerFactory = (db) => {
   };
 
   const deleteMembership = async (req, res) => {
-    const { type, target, user } = req.body;
+    const { type, target, user, role } = req.body;
+    
+
+    console.log(req.body)
 
     try {
-      const membership = await Membership.findOne({ type, target, user });
+      const membership = await Membership.findOne({ type, target, user, role });
 
       if (!membership) {
         return res.status(404).send({ errorCode: 'MEMBERSHIP_NOT_FOUND' });
+      } else {
+        await Membership.deleteOne({ _id: membership._id });
+        res.status(200).send(membership);
       }
-
-      console.log(membership)
-      await membership.remove();
-
-      res.status(200).send(membership);
     } catch (error) {
       console.log(error)
       res.status(500).send({ errorCode: 'SERVER_ERROR' });

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

@@ -5,6 +5,10 @@ const { uuid } = require('uuidv4');
 const ObjectId = require('mongoose').Types.ObjectId;
 const { Client } = require('@googlemaps/google-maps-services-js');
 const client = new Client({});
+
+const addUserStatusFields = require('@pf/src/modules/organizations/controllers/utils/addUserStatusFields');
+const addMembersQuantity = require('@pf/src/modules/organizations/controllers/utils/addMembersQuantity');
+
 const parseCookie = require('@pf/src/modules/globals/utils/parseCookie'); // Assuming this is your utility function for parsing cookies
 
 const controllerFactory = (db) => {
@@ -158,25 +162,8 @@ const controllerFactory = (db) => {
         as: "memberships"
       }
     },
-    {
-      $addFields: {
-        numberOfMemberships: { $size: '$memberships' }
-      }
-    },
-    {
-      $addFields: {
-        isMember: {
-          $cond: {
-            if: req.query.user,
-            then: {
-              $in: [ new ObjectId(req.query.user), "$memberships.user" ]
-            },
-            else: "$$REMOVE"
-          }
-        }
-      }
-    },
-
+    addMembersQuantity(),
+    addUserStatusFields(req.query.user),
     {
       $addFields: {
         numberOfProducts: { $size: '$products' }
@@ -193,9 +180,11 @@ const controllerFactory = (db) => {
       rating: 1,
       socials: 1,
       numberOfProducts: 1, 
-      numberOfMemberships: 1,
+      numberOfSubscribers: 1,
       memberships: 1,
       isMember: 1,
+      isSubscriber: 1,
+      isBlocked: 1,
       departments: 1 
     }
     },

package/src/modules/organizations/controllers/utils/addMembersQuantity.js

@@ -0,0 +1,21 @@
+// userStatus.js
+
+const { ObjectId } = require('mongodb'); // Make sure to import ObjectId correctly from your MongoDB driver
+
+const addMembersQuantity= (user) => {
+  return {
+    $addFields: {
+        numberOfSubscribers: {
+          $size: {
+            $filter: {
+              input: '$memberships',
+              as: 'membership',
+              cond: { $eq: ['$$membership.role', 'subscriber'] } // здесь мы проверяем, что роль должна быть "subscriber"
+            }
+          }
+        }
+      }
+    };
+}
+
+module.exports = addMembersQuantity;

package/src/modules/organizations/controllers/utils/addUserStatusFields.js

@@ -0,0 +1,65 @@
+const { ObjectId } = require('mongodb');
+
+const addUserStatusFields = (user) => {
+  return {
+    $addFields: {
+      isSubscriber: {
+        $cond: {
+          if: {
+            $and: [
+              user,
+              {
+                $in: [new ObjectId(user), "$memberships.user"],
+              },
+              {
+                $in: ["subscriber", "$memberships.role"],
+              },
+            ],
+          },
+          then: true,
+          else: false,
+        },
+      },
+      isMember: {
+        $cond: {
+          if: {
+            $and: [
+              user,
+              {
+                $in: [new ObjectId(user), "$memberships.user"],
+              },
+              {
+                $not: [
+                  {
+                    $in: ["$memberships.role", ["subscriber", "blocked"]],
+                  },
+                ],
+              },
+            ],
+          },
+          then: true,
+          else: false,
+        },
+      },
+      isBlocked: {
+        $cond: {
+          if: {
+            $and: [
+              user,
+              {
+                $in: [new ObjectId(user), "$memberships.user"],
+              },
+              {
+                $in: ["blocked", "$memberships.role"],
+              },
+            ],
+          },
+          then: true,
+          else: false,
+        },
+      },
+    },
+  };
+}
+
+module.exports = addUserStatusFields;

package/src/modules/organizations/controllers/utils/excludeBlockedMembers.js

@@ -0,0 +1,18 @@
+async function getBlockedMembers(Membership, userId) {
+    const memberships = await Membership.find({ user: userId });
+    return memberships
+        .filter(membership => membership.role === 'blocked')
+        .map(membership => membership.target);
+}
+
+function addConditionsForBlocked(matchStage, field, blockedMembers) {
+    const conditionsForBlocked = { "$nin": blockedMembers };
+
+    if (matchStage[field]) {
+        matchStage[field] = { "$eq": matchStage[field], ...conditionsForBlocked };
+    } else {
+        matchStage[field] = conditionsForBlocked;
+    }
+}
+
+module.exports = { getBlockedMembers, addConditionsForBlocked };

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

@@ -11,6 +11,10 @@ module.exports = (mongoose) => {
       default: 'organization',
       required: true,
     },
+    role: {
+      type: String,
+      default: 'subscriber'
+    },
     target: {  // заменяем 'organization' на 'target', так как это может быть или User, или Organization
       type: mongoose.Schema.Types.ObjectId,
       ref: function (value) {
@@ -18,11 +22,7 @@ module.exports = (mongoose) => {
         if (this.type === 'organization') return 'Organization';
       },
       required: true,
-    },
-    role: {
-      type: String,
-      default: 'subscriber'
-    },
+    }
   });
 
   const Membership = mongoose.model('Membership', MembershipSchema);

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

@@ -65,7 +65,7 @@ const actions = {
 };
 
 const mutations = {
-  handleMembershipUpdate(data, membership, isMember) {
+  handleMembershipUpdate(data, membership, status, target, statusName, statusNumber) {
     let entity;
 
     if (Array.isArray(data)) {
@@ -77,23 +77,23 @@ const mutations = {
     }
 
     if (entity) {
-        entity.isMember = isMember;
+        entity[statusName] = status;
 
-        if (isMember) {
+        if (status) {
             entity.memberships.push(membership);
-            entity.numberOfMemberships += 1;
+            entity[statusNumber] += 1;
         } else {
             const index = entity.memberships.findIndex(m => m._id === membership._id);
+            
             if (index !== -1) {
                 entity.memberships.splice(index, 1);
-                entity.numberOfMemberships -= 1;
+                entity[statusNumber] -= 1;
             }
         }
     }
   }
 }
 
-
 // History
 const history = [];
 history.push(state);

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

@@ -140,7 +140,6 @@ const actions = {
 
       // Check if we are fetching a single organization or all organizations
       if (options._id) {
-        console.log(response.data)
         Object.assign(state.current || {}, response.data[0])
         console.log(state.current) // Assuming that the response.data is the organization object
       } else {