@ozdao/prometheus-framework 0.2.30 → 0.2.31

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

@@ -10,48 +10,34 @@
 			class="mn-b-semi"
 		/>
 
-		<!-- <section 
-			@click="router.push({
-				name: 'Organization Members', 
-				params: {
-					_id: route.params._id
-				}
-			})"
-			class="
-				mn-b-semi
-				bg-grey
-				radius-big
-				pd-medium
-			"
-		>
-			<p>34 members</p>
-		</section> -->
+		<!-- MEMBERS TAB -->
 
-		<!-- <Menu class="mn-b-semi bg-grey">
-		 	<MenuItem @click="router.push({name: 'User Blogposts', params: {_id: route.params._id}})" class="cursor-pointer">
-		 		<IconCommunity class="i-semi" :icon="true"/>
-		    <span>Legal</span>
+		<!-- <Menu 
+			class="mn-b-regular bg-grey"
+		>
+		  <MenuItem 
+		  	@click="router.push({
+					name: 'Organization Members', 
+					params: {
+						_id: route.params._id
+					}
+				})" 
+		  	class="cursor-pointer"
+		  	theme="black"
+		  >
+		    <span>
+		    	{{organization.state.current.numberOfMembers}} members
+		    </span>
 		  </MenuItem> 
 		</Menu> -->
 
-		<!-- <FeedDepartments 
-			:organization="organization.state.current"
-			:memberships="memberships.state.memberships"
-		/>
-
-		<Members
-			:organization="organization.state.current"
-			:memberships="memberships.state.memberships"
-		/> -->
-
 		<Tab 
 			v-model:selected="tabOrganization"
 			:tabs="[
-
-				{ name: 'Community', 	value: 'community' },
-				// { name: 'Products', 	value: 'products' },	
-				{ name: 'Events', 		value: 'events' },
-				// { name: 'Spots', 		value: 'spots' }	
+				{ name: 'Community', value: 'community' },
+				{ name: 'Menu', value: 'products' },	
+				{ name: 'Events', value: 'events' },
+				{ name: 'Spots', value: 'spots' }	
 			]"
 			class="mn-b-small o-hidden h5 radius-big bg-grey"
 		/>
@@ -61,7 +47,7 @@
 			<transition name="slide-fade">
 				<FeedCommunity 
 					v-if="tabOrganization === 'community'"
-			      	:user="auth.state.user._id"
+			    :user="auth.state.user._id"
 					:owner="route.params._id"
 			    />
 			</transition>
@@ -70,28 +56,108 @@
 			<transition name="slide-fade">
 				<FeedEvents 
 					v-if="tabOrganization === 'events'"
-			  		:user="auth.state.user._id"
+			  	:user="auth.state.user._id"
 					:owner="route.params._id"
 					:sortOrder="'desc'"
 					:sortParam="'date.start'"
 				/>
 			</transition>
 
+			<Block
+				v-if="tabOrganization === 'products' && auth.state.user._id === organization.state.current.owner"
+				class="flex-nowrap	 gap-thin mn-b-small flex"
+			>
+
+				<router-link 
+					class="bg-black t-white uppercase t-semi pd-thin radius-extra "
+					:to="{
+						name:'ProductAdd', 
+						params: {
+							_id: route.params._id
+						}
+					}"
+					>
+					Add Product
+				</router-link>
+
+				<router-link 
+					class=" uppercase t-semi  pd-thin radius-extra "
+					:to="{
+						name:'Leftovers', 
+						params: {
+							_id: route.params._id
+						}
+					}"
+					>
+					Change Invetory
+				</router-link>
+
+				<router-link 
+					class="d-block mn-l-auto uppercase t-semi bg-white pd-thin radius-extra "
+					:to="{
+						name:'Backoffice', 
+						params: {
+							_id: route.params._id
+						}
+					}"
+					>
+					Go to Backoffice
+				</router-link>
+
+			</Block>
+
 			<transition name="slide-fade">
 				<Products 
 					v-if="tabOrganization === 'products'"
 					:organization="organization.state.current"
 				/>
+
 			</transition>
 
+
 			<transition name="slide-fade">
 				<div v-if="tabOrganization === 'spots'">
-					<FeedSpots 
-						:organization="organization.state.current"
-						:memberships="memberships.state.memberships"
-					/>
+					<Feed
+			      :states="{
+			        empty: {
+			          title: 'No Spots Found',
+			          description: 'Currently, there are no spots available.'
+			        }
+			      }"
+			      :store="{
+			        read: (options) => spots.actions.read(route.params._id),
+			        state: organization.state
+			      }"
+			      :options="{
+			        	user: auth.state.user._id,
+								sort: 'numberOfMemberships',
+								contain: ['blogposts'],
+								limit: 10
+			      }"
+			      v-slot="{ 
+			        items 
+			      }"
+			    >
+			    	<CardSpot
+		          v-for="(spot, index) in items"
+		          :key="index"
+		          :spot="spot"
+		          :organization="organization.state.current"
+		          class="radius-big bg-grey mn-b-thin"
+		        />
+			    </Feed>
+
+			    <button
+	          v-if="auth.state.user._id === organization.state.current.owner"
+	          @click="$router.push(`/spots/${organization.state.current._id}/spots/create`)"
+	          class="mn-b-thin button w-100"
+	        >
+	          Add spot
+	        </button>
+
 				</div>
 			</transition>
+
 		</div>
 	</div>
 </template>
@@ -100,8 +166,10 @@
 	import { computed,reactive,ref, onMounted,watch  } from 'vue'
 	import { useRoute, useRouter } from 'vue-router'
 	// Import components
-  	import Breadcrumbs 	from '@pf/src/components/Breadcrumbs/Breadcrumbs.vue'
+	import Breadcrumbs 	from '@pf/src/components/Breadcrumbs/Breadcrumbs.vue'
 	import Tab  		from '@pf/src/components/Tab/Tab.vue'
+	import Block  		from '@pf/src/components/Block/Block.vue'
+	import Feed from '@pf/src/components/Feed/Feed.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'
@@ -109,28 +177,31 @@
 	import FeedEvents from '@pf/src/modules/events/components/sections/Feed.vue'; 
 	import FeedCommunity from '@pf/src/modules/community/components/sections/Feed.vue'; 
 	// Spots
-	import FeedSpots from '@pf/src/modules/spots/components/sections/Feed.vue'; 
-	
+	import CardSpot from '@pf/src/modules/spots/components/blocks/CardSpot.vue';	
 	// Local
 	import DetailsTab 	from '@pf/src/modules/organizations/components/sections/DetailsTab.vue'
 	import Products 	from '@pf/src/modules/products/components/pages/Products.vue'
-	import FeedDepartments from '@pf/src/modules/organizations/components/sections/FeedDepartments.vue'
-	import Members 	from '@pf/src/modules/organizations/components/pages/Members.vue'
 	// Import state
 	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'
+	// Spots
+	import * as spots from '@pf/src/modules/spots/store/spots';
 	// Init router
 	const router 	= useRouter()
 	const route 	= useRoute()
 	// Accesing state
-	// console.log(route.query.tab)
-	let tab = route.query.tab ? route.query.tab : 'events';
+	let tab = route.query.tab ? route.query.tab : 'community';
 
 	const organizationData = ref(null)
 
 	onMounted(async () => {
-		organizationData.value = await organization.actions.read({_id: route.params._id, user: auth.state.user._id})
+		
+		organizationData.value = await organization.actions.read({
+			_id: route.params._id, 
+			user: auth.state.user._id
+		})
+
  		await memberships.actions.read(route.params._id)
 	})
 

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

@@ -68,11 +68,18 @@
       placeholder="" 
       class="mn-b-thin bg-grey pd-medium radius-small" 
     />
+    <Field 
+      v-model:field="organization.state.current.socials.youtube"
+      label="Telegram"   
+      placeholder="" 
+      class="mn-b-thin bg-grey pd-medium radius-small" 
+    />
    
-    <Button :submit="onSubmit" :callback="redirectTo" class="mn-b-thin">Save</Button>
+    <Button :submit="onSubmit" :callback="redirectTo" class="bg-main w-100 mn-b-thin">Save</Button>
     <!-- <Button :submit="onDelete" :callback="redirectDash" class="mn-b-thin bg-fourth">Delete</Button> -->
 
 </div>
+
 </template>
 
 <script setup>

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

@@ -3,11 +3,17 @@
 		<header class="mn-b-medium flex-v-center flex-nowrap flex">
 	      	<h2 class="mn-r-medium">Groups</h2>
 	      	<button 
-	      		v-if="auth.state.user._id === route.params._id"
 	      		@click="$router.push({
 	      			name: 'Create Organization'
 	      		})" 
-	      		class="radius-100p i-big hover-scale-1 cursor-pointer t-white bg-second">
+	      		class="
+	      			bg-second
+	      			radius-100 
+	      			i-big 
+	      			hover-scale-1
+	      			cursor-pointer
+	      			t-whitebg-second
+	      		">
 	      			+
 	      	</button>
 		</header>
@@ -15,20 +21,35 @@
 		<Tab 
 			v-model:selected="tabOrganization"
 			:tabs="[
+				{ name: 'Owner', 		value: 'owner' },
 				{ name: 'Member', 	value: 'member' },
 				{ name: 'Follower', value: 'follower' }		
 			]"
-			class="mn-b-medium mn-r-medium o-hidden h5 radius-big bg-grey"
+			class="
+				mn-b-medium 
+				o-hidden 
+				h5 
+				radius-big 
+				bg-grey
+			"
 		/>
 
 		<transition name="slide-fade">
 			<Feed 
-				v-if="tabOrganization === 'member'"
-		  		:user="auth.state.user._id"
+				v-if="tabOrganization === 'owner'"
+		  	:user="auth.state.user._id"
 				:owner="route.params._id"
 			/>
 		</transition>
 
+		<transition name="slide-fade">
+			<Feed 
+				v-if="tabOrganization === 'member'"
+		  	:user="auth.state.user._id"
+				:member="route.params._id"
+			/>
+		</transition>
+
 		<transition name="slide-fade">
 			<Feed 
 				v-if="tabOrganization === 'follower'"
@@ -51,7 +72,7 @@
 	const route = useRoute()
 	const router = useRouter()
 	// State
-	let tab = route.query.tab ? route.query.tab : 'member';
+	let tab = route.query.tab ? route.query.tab : 'owner';
 
 	const tabOrganization = ref(tab)
 

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

@@ -34,7 +34,7 @@
 				      :status="organization.isBlocked" 
 				      :text="{create: 'Block', remove: 'Unblock'}"
 				      @updateMembership="event => handleMembershipUpdate(event, 'isBlocked')"
-				       class="t-white mn-t-thin bg-red" 
+				       class="t-white  mn-t-thin bg-red" 
 			    	/>
 				</section>
       </Dropdown>
@@ -47,7 +47,7 @@
 						_id: organization._id
 					}
 				})" 
-				class="pos-absolute pos-t-regular pos-r-regular i-regular t-transp"
+				class="pos-absolute cursor-pointer pos-t-big pos-r-big i-regular t-transp"
 			/>
 
 			<img 
@@ -56,7 +56,7 @@
 				class="radius-big bg-grey flex-center flex mn-b-small i-extra" 
 			/>
 
-			<PlaceholderUserpic
+			<PlaceholderOrganizationPic
 				v-else
 				class="radius-medium mn-b-small i-extra"
 			/>
@@ -73,11 +73,11 @@
 
 
 	        
-	        <div class="flex-center flex-wrap gap-thin flex mn-b-semi">
-		      	<span v-for="tag in organization.profile.tags" class=" pd-thin radius-small t-semi uppercase t-black bg-main p-medium">
-		      		{{tag}}
-		      	</span> 
-			</div>
+	    <Chips 
+      	v-if="organization.profile.tags.length > 0" 
+      	:chips="organization.profile.tags"
+      	class="mn-b-semi"
+     	/>
 
 		 	<p 
 				class="t-semi mn-b-small"
@@ -116,6 +116,7 @@
      		:facebook="organization.socials.facebook"
      		:instagram="organization.socials.instagram"
      		:twitter="organization.socials.twitter"
+     		:youtube="organization.socials.youtube"
      	/>
 		</section>
 
@@ -145,9 +146,10 @@
 	// Import components
 	import Dropdown from "@pf/src/components/Dropdown/Dropdown.vue";
 	import Text  		from '@pf/src/components/Text/Text.vue'
+	import Chips  from '@pf/src/components/Chips/Chips.vue'
 	// Icons
 	import IconEdit from '@pf/src/modules/icons/navigation/IconEdit.vue'
-	import PlaceholderUserpic from '@pf/src/modules/icons/placeholders/PlaceholderUserpic.vue'
+	import PlaceholderOrganizationPic from '@pf/src/modules/icons/placeholders/PlaceholderOrganizationPic.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'

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

@@ -26,9 +26,6 @@
         :user="user" 
         :type="'normal'"
         class="w-100 radius-big mn-b-medium"
-        :class="{
-          'br-b br-solid br-black-transp-10': index !== organizationsList.length - 1
-        }"
       />
       <button v-if="hasMoreOrganizations && organizationsList.length > 0" @click="loadMoreOrganizations" class="w-100 bg-main button">Load more</button> 
     </TransitionGroup>  

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

@@ -6,7 +6,7 @@
         title="You don't have any spots yet."
         description="Add spots to your hub."
         action="Add spot"
-        :callback="() => $router.push(`/organization/${props.organization._id}/departments/create`)"
+        :callback="() => $router.push(`/organizations/${props.organization._id}/departments/create`)"
       />
 
       <div>
@@ -19,7 +19,7 @@
         />
         <button
           v-if="FirstLevelDepartments.length > 0 && auth.state.user._id === organization.owner"
-          @click="$router.push(`/organization/${props.organization._id}/departments/create`)"
+          @click="$router.push(`/organizations/${props.organization._id}/departments/create`)"
           class="mn-b-thin button w-100"
         >
           Add spot

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

@@ -23,12 +23,12 @@ const controllerFactory = (db) => {
     // Auth Module
     const User = db.user;
     const Role = db.role;
-    // Init
-    console.log(req)
    
     const sortParam = req.query.sortParam || 'numberOfProducts';
     const sortOrder = req.query.sortOrder || 'desc';
+    
     const sort = {
+      'numberOfProducts': -1,
       [sortParam]: sortOrder === 'desc' ? -1 : 1,
       "_id": 1
     };
@@ -49,25 +49,35 @@ const controllerFactory = (db) => {
       return { "products.price": { $gte: min, $lte: max } };
     });
 
-    console.log(req.query.postable)
+    let containConditions = []
+
+
+    if (req.query.contain) { 
+      containConditions = req.query.contain.map(property => ({
+        [property]: { $exists: true, $not: { $size: 0 } }
+      }));
+    } 
 
     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": { $ne: 'subscriber' } } ] : [] ),
+      ...(req.query.member ? [{"memberships.user": new ObjectId(req.query.member), "memberships.role": { $nin:  ['subscriber', 'owner'] } } ] : [] ),
       ...(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 - строка
       // to remove
       ...(req.query.onlyuser ? [{ "memberships.user": new ObjectId(req.query.onlyuser) }] : []),
       ...(categories.length > 0 ? [{ "products.category": { $in: categories } }] : []),
-      ...(delivery.length > 0 ? [{ "departments.delivery": { $all: delivery } }] : []),
+      ...(delivery.length > 0 ? [{ "spots.delivery": { $all: delivery } }] : []),
       ...(priceConditions.length > 0 ? [{ $or: priceConditions }] : []),
+      ...(req.query.contain ? containConditions : []),
     ];
 
-    let { location, address, city, state, country } = req.query;
+    let { location, address, locationRadius, city, state, country } = req.query;
+
+    let userLocation = { coordinates:[0,0] }
 
-    if (!location && address || city || state || country) {
+    if (!location && (address || city || state || country)) {
       let geoLocation;
 
       // Create a string to pass to geocoding client
@@ -83,6 +93,13 @@ const controllerFactory = (db) => {
 
         if (geoResponse.data.results && geoResponse.data.results.length > 0) {
           geoLocation = geoResponse.data.results[0].geometry.location;
+          
+          userLocation.coordinates = [
+            geoResponse.data.results[0].geometry.location.lng,
+            geoResponse.data.results[0].geometry.location.lat,
+          ]
+
+          console.log(userLocation)
         } else {
           return res.status(400).send({ message: 'Unable to geocode the provided location.' });
         }
@@ -92,14 +109,14 @@ const controllerFactory = (db) => {
       }
 
       // Determine the search radius based on the level of specificity
-      const radius = city ? 50 : state ? 100 : 500;
+      const radius = city ? 500 : state ? 1000 : 5000;
 
       // Use MongoDB's $geoNear to find organizations within a certain radius
       matchConditions.push({
-        "departments.location.coordinates": {
+        "spots.location.coordinates": {
           $geoWithin: {
             $centerSphere: [
-              [geoLocation.lng, geoLocation.lat],
+              [parseFloat(geoLocation.lng),parseFloat(geoLocation.lat),],
               radius / 6378.1
             ]
           }
@@ -107,21 +124,57 @@ const controllerFactory = (db) => {
       });
     } 
 
+    const search = req.query.search;
+
+    if (search) {
+      const parts = search.split('.');
+
+      let regexPattern = '';
+
+      if (parts.length === 2) {
+        // Создаем паттерн, который допускает замену одного символа в каждой части
+        regexPattern = parts.map(part => part.substr(0, part.length - 1) + '.{1}').join('\\.');
+      } else {
+        // Если нет точки, применяем аналогичный подход к всей строке
+        regexPattern = search.substr(0, search.length - 1) + '.{1}';
+      }
+
+      matchConditions.push({
+        $or: [
+          { "profile.name": { $regex: regexPattern, $options: 'i' } },
+          { "products.name": { $regex: regexPattern, $options: 'i' } }
+        ]
+      });
+    }
+
+
     if (location) {
-       console.log('Location is ' + location)
+
+      console.log(location)
 
       if (typeof location === 'string') {
         location = JSON.parse(location);
       }
 
-      let [lng, lat] = location.coordinates;
+     let lng
+      let lat
+      
+      if (location.lng) {
+         lng = location.lng
+         lat = location.lat
+          userLocation.coordinates = [lng,lat]
+       } else {
+        lng = location.coordinates[0]
+        lat = location.coordinates[1]
+        userLocation.coordinates = [lng,lat]
+      }
 
       matchConditions.push({
-        "departments.location.coordinates": {
+        "spots.location.coordinates": {
           $geoWithin: {
             $centerSphere: [
-              [lng, lat],
-              20 / 6378.1
+              [parseFloat(lng), parseFloat(lat)],
+              (locationRadius || 50) / 6378.1
             ]
           }
         }
@@ -139,6 +192,14 @@ const controllerFactory = (db) => {
         as: "products"
       }
     },
+    {
+      $lookup: {
+        from: "blogposts",
+        localField: "_id",
+        foreignField: "owner.target",
+        as: "blogposts"
+      }
+    },
     {
       $addFields: {
         numberOfProducts: { $size: '$products' }
@@ -160,6 +221,56 @@ const controllerFactory = (db) => {
         as: "spots"
       }
     },
+    {
+      $addFields: {
+        spots: {
+          $map: {
+            input: "$spots",
+            as: "spot",
+            in: {
+              $mergeObjects: [
+                "$$spot",
+                {
+                  distance: {
+                    $function: {
+                      body: `function(spotCoords, userCoords, isMiles) {
+                        // The function remains the same
+                        function toRad(x) {
+                          return x * Math.PI / 180;
+                        }
+                        var lon1 = spotCoords[0];
+                        var lat1 = spotCoords[1];
+                        var lon2 = userCoords[0];
+                        var lat2 = userCoords[1];
+                        var R = 6371; // Radius of the Earth in km
+                        if (isMiles) R = 3959; // Radius of the Earth in miles
+                        var x1 = lat2 - lat1;
+                        var dLat = toRad(x1);
+                        var x2 = lon2 - lon1;
+                        var dLon = toRad(x2);
+                        var a = Math.sin(dLat / 2) * Math.sin(dLat / 2) +
+                                Math.cos(toRad(lat1)) * Math.cos(toRad(lat2)) *
+                                Math.sin(dLon / 2) * Math.sin(dLon / 2);
+                        var c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
+                        var d = R * c;
+                        return d;
+                      }`,
+                      args: ["$$spot.location.coordinates", userLocation.coordinates, false], // Use actual field names
+                      lang: "js"
+                    }
+                  }
+                }
+              ]
+            }
+          }
+        },
+      }
+    },
+    {
+      $addFields: {
+        distance: { $min: "$spots.distance" } // Add the minDistance field here
+      }
+    },
     {
       $lookup: {
         from: "memberships",

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

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