@ozdao/martyrs 0.2.506 → 0.2.507

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

@@ -8,166 +8,19 @@
 			:organization="organization.state.current" 
 			:user="auth.state.user"
 			class="mn-b-thin"
-		>
-
-		</DetailsTabSection>
-
-		<Tab 
-			v-model:selected="tabOrganization"
-			:tabs="[
-				{ name: 'Community', value: 'community' },
-				{ name: 'Menu', value: 'products' },	
-				{ name: 'Events', value: 'events' },
-				{ name: 'Spots', value: 'spots' }	
-			]"
-			class="mn-b-thin o-x-scroll scroll-hide flex-child-default o-hidden t-medium p-medium radius-medium pd-thin bg-light"
 		/>
 
+		<!-- Organization Info Section -->
 		<div class="pos-relative">
-
-			<transition name="slide-fade">
-		    <Feed
-		    	v-if="tabOrganization === 'community'"
-			    :showLoadMore="false"
-			    :states="{
-			      empty: {
-			        title: 'No Blog Posts Found',
-			        description: 'Currently, there are no posts available in this blog. Please check back later.'
-			      }
-			    }"
-			    :store="{
-			      read: (options) => blog.read(options)
-			    }"
-			    :options="{
-			      status: 'published',
-			      user: auth.state.user._id,
-			      owner: route.params._id,
-			    }"
-			    v-slot="{ 
-			      items 
-			    }"
-			    class="rows-1 gap-thin"
-			  >
-			    <CardBlogpost 
-			      v-for="item in items" 
-			      :key="item._id" 
-			      :blogpost="item" 
-			      :user="auth.state.user._id" 
-			      class="h-max-40r bg-light radius-medium"
-			    />
-			  </Feed>
-			</transition>
-
-	
-			<transition name="slide-fade">
-				<FeedEvents 
-					v-if="tabOrganization === 'events'"
-			  	:user="auth.state.user._id"
-					:owner="route.params._id"
-					:sortOrder="'desc'"
-					:sortParam="'date.start'"
-				/>
-			</transition>
-
-			
-
-			<transition name="slide-fade">
-				<Products 
-					v-if="tabOrganization === 'products'"
-					:organization="organization.state.current"
-				>
-					<Block
-						v-if="hasAccess(route.params._id, null, null, auth.state.accesses, auth.state.access.roles)"
-						class="o-x-scroll pd-small scroll-hide w-100 pos-relative mn-b-thin"
-					>
-						<div class="w-100 gap-thin flex flex-nowrap	 o-x-scroll">
-							<router-link 
-								class="bg-black t-nowrap t-white uppercase t-semi pd-thin radius-small "
-								:to="{
-									name:'Organization_ProductAdd', 
-									params: {
-										_id: route.params._id
-									}
-								}"
-								>
-								Add Product
-							</router-link>
-
-							<router-link 
-								class=" uppercase t-nowrap t-semi  pd-thin"
-								:to="{
-									name:'OrganizationInventoryList', 
-									params: {
-										_id: route.params._id
-									}
-								}"
-								>
-								Change Invetory
-							</router-link>
-
-							
-							<router-link 
-								class="d-block t-nowrap  mn-l-auto uppercase t-semi bg-white pd-thin radius-small "
-								:to="{
-									name:'Backoffice', 
-									params: {
-										_id: route.params._id
-									}
-								}"
-								>
-								Go to Backoffice
-							</router-link>
-						</div>
-					</Block>
-				</Products>
-
-			</transition>
-
-			<transition name="slide-fade">
-				<div v-if="tabOrganization === 'spots'">
-					<Feed
-			      :states="{
-			        empty: {
-			          title: 'No Spots Found',
-			          description: 'Currently, there are no spots available.'
-			        }
-			      }"
-			      :store="{
-			        read: (options) => spots.actions.read(options),
-			        state: organization.state
-			      }"
-			      :options="{
-			        	user: auth.state.user._id,
-								organization: route.params._id,
-								limit: 10
-			      }"
-			      v-slot="{ 
-			        items 
-			      }"
-			    >
-			    	<CardSpot
-		          v-for="(spot, index) in items"
-		          :key="index"
-		          :spot="spot"
-		          :organization="organization.state.current"
-		          :editAccess="hasAccess(route.params._id, 'spots', 'edit', auth.state.accesses, auth.state.access.roles)"
-		          :showDeliveryOptions="true"
-		          :showPaymentOptions="true"
-		          class="radius-medium h-min-big bg-light mn-b-thin"
-		        />
-			    </Feed>
-
-			    <button
-	          v-if="hasAccess(route.params._id, 'spots', 'create', auth.state.accesses, auth.state.access.roles)"
-	          @click="$router.push(`/spots/${organization.state.current._id}/spots/create`)"
-	          class="mn-b-thin bg-main button w-100"
-	        >
-	          Add spot
-	        </button>
-
-				</div>
-			</transition>
-
+			<div class="bg-light radius-medium pd-medium">
+				<h3 class="mn-b-small">About {{ organization.state.current?.profile?.name }}</h3>
+				<p v-if="organization.state.current?.profile?.description" class="t-medium">
+					{{ organization.state.current.profile.description }}
+				</p>
+				<p v-else class="t-medium t-black-transp-60">
+					No description available.
+				</p>
+			</div>
 		</div>
 	</div>
 </template>
@@ -177,11 +30,7 @@
 	import { useRoute, useRouter } from 'vue-router'
 	// Import components
 	import Breadcrumbs 	from '@martyrs/src/components/Breadcrumbs/Breadcrumbs.vue'
-	import Tab  		from '@martyrs/src/components/Tab/Tab.vue'
 	import Block  		from '@martyrs/src/components/Block/Block.vue'
-	import Feed from '@martyrs/src/components/Feed/Feed.vue'
-	// Community
-	  import CardBlogpost from '@martyrs/src/modules/community/components/blocks/CardBlogpost.vue';
 	// Mobile Module
 	import Menu from '@martyrs/src/components/Menu/Menu.vue'
 	import MenuItem from '@martyrs/src/components/Menu/MenuItem.vue'
@@ -189,33 +38,17 @@
 	import DepartmentSub from '@martyrs/src/modules/organizations/components/blocks/DepartmentSub.vue';
 	import DetailsTabSection from '@martyrs/src/modules/organizations/components/sections/DetailsTabSection.vue'
 	import User from '@martyrs/src/modules/auth/views/components/blocks/CardUser.vue';
-	// Feeds
-	import FeedEvents from '@martyrs/src/modules/events/components/sections/Feed.vue'; 
-	// Spots
-	import CardSpot from '@martyrs/src/modules/spots/components/blocks/CardSpot.vue';	
-	// Local
-	import Products from '@martyrs/src/modules/products/components/pages/Products.vue';
 	// Import state
 	import * as auth from '@martyrs/src/modules/auth/views/store/auth.js';
 	import * as organization from '@martyrs/src/modules/organizations/store/organizations.js';
 	import * as memberships from '@martyrs/src/modules/organizations/store/memberships.js';
 	import * as departments from '@martyrs/src/modules/organizations/store/departments.js';
-	// Community
-  import * as blog from '@martyrs/src/modules/community/store/blogposts.js';
-	// Spots
-	import * as spots from '@martyrs/src/modules/spots/store/spots.js';
 	// Init router
 	const router 	= useRouter()
 	const route 	= useRoute()
-	// Accesing state
-	let tab = route.query.tab ? route.query.tab : 'products';
 
 	const organizationData = ref(null)
 
-	const tabOrganization = ref(tab)
-
-	route.query.tab = tabOrganization.value
-
 	onMounted(async () => {
 		
 		organizationData.value = await organization.actions.read({
@@ -236,31 +69,7 @@
 			});
 		}
 	})
-
-	watch(tabOrganization, (newValue) => {
-	  router.replace({ query: { ...route.query, tab: newValue } });
-	});
 </script>
 
 <style lang="scss">
-	.slide-fade-enter-active {
-		// min-height: 100vh;
-	  transition: all  0.3s cubic-bezier(0.4, 0, 0.2, 1);
-	}
-
-	.slide-fade-leave-active {
-		// min-height: 100vh;
-	  transition: all  0.3s cubic-bezier(0.4, 0, 0.2, 1);
-	}
-
-	.slide-fade-enter-from,
-	.slide-fade-leave-to {
-		min-height: 0;
-		position: absolute;
-	  transform: translateX(20px);
-	  opacity: 0;
-	  left: 0;
-	  top: 0;
-	}
-
 </style>

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

@@ -100,9 +100,9 @@
       />
     </div>
 
-    <p class="w-max-50r mn-t-regular mn-b-medium p-semi">
+    <!-- <p class="w-max-50r mn-t-regular mn-b-medium p-semi">
    		<Text :text="organization.profile.description || ''" :showToggleText="true" :maxLen="320" />
-  	</p>  
+  	</p>   -->
 
   	<Chips 
     	v-if="organization.profile?.tags?.length > 0" 

package/src/modules/organizations/configs/navigation.organization.config.js

@@ -10,6 +10,7 @@ import IconDate from '@martyrs/src/modules/icons/entities/IconDate.vue';
 import IconPrice from '@martyrs/src/modules/icons/entities/IconPrice.vue';
 import IconSettings from '@martyrs/src/modules/icons/entities/IconSettings.vue';
 import IconHome from '@martyrs/src/modules/icons/entities/IconHome.vue';
+import IconAddress from '@martyrs/src/modules/icons/entities/IconAddress.vue';
 
 // Import global mixins for access control
 import { useGlobalMixins } from '@martyrs/src/modules/globals/views/mixins/mixins.js';
@@ -19,6 +20,7 @@ const { hasAccess } = useGlobalMixins();
 export const navigationItems = [
   {
     category: 'Organization',
+    visible: () => true, // Always visible - has both public and private items
     items: [
       {
         title: 'Profile',
@@ -27,13 +29,7 @@ export const navigationItems = [
           name: 'Organization',
           params: { _id: route.params._id }
         }),
-        visible: (auth, route) => hasAccess(
-          route.params._id, 
-          'members', 
-          'read', 
-          auth.accesses, 
-          auth.access.roles
-        )
+        visible: () => true // Public access
       },
       {
         title: 'Members',
@@ -42,13 +38,7 @@ export const navigationItems = [
           name: 'Organization Members',
           params: { _id: route.params._id }
         }),
-        visible: (auth, route) => hasAccess(
-          route.params._id, 
-          'members', 
-          'read', 
-          auth.accesses, 
-          auth.access.roles
-        )
+        visible: () => true // Public access
       },
       {
         title: 'Settings',
@@ -68,7 +58,8 @@ export const navigationItems = [
     ]
   },
   {
-    category: 'Shop',
+    category: 'Discover',
+    visible: () => true, // Always visible - public category
     items: [
       {
         title: 'Products',
@@ -77,14 +68,50 @@ export const navigationItems = [
           name: 'Organization_Products',
           params: { _id: route.params._id }
         }),
-        visible: (auth, route) => hasAccess(
-          route.params._id, 
-          'products', 
-          'read', 
-          auth.accesses, 
-          auth.access.roles
-        )
+        visible: () => true // Public access
+      },
+      {
+        title: 'Events',
+        iconComponent: IconEvents,
+        route: (auth, route) => ({
+          name: 'Organization_Events',
+          params: { _id: route.params._id }
+        }),
+        visible: () => true // Public access
+      },
+      {
+        title: 'Posts',
+        iconComponent: IconCommunity,
+        route: (auth, route) => ({
+          name: 'Organization_Posts',
+          params: { _id: route.params._id }
+        }),
+        visible: () => true // Public access
+      },
+      {
+        title: 'Spots',
+        iconComponent: IconAddress,
+        route: (auth, route) => ({
+          name: 'Organization_Spots',
+          params: { _id: route.params._id }
+        }),
+        visible: () => true // Public access
+      },
+      {
+        title: 'Gallery',
+        iconComponent: IconGallery,
+        route: (auth, route) => ({
+          name: 'Backoffice Gallery',
+          params: { _id: route.params._id }
+        }),
+        visible: () => true // Public access
       },
+    ]
+  },
+  {
+    category: 'Management',
+    visible: (auth, route) => auth.state && auth.state.user && auth.state.user._id, // Only for authenticated users
+    items: [
       {
         title: 'Categories',
         iconComponent: IconPrice,
@@ -115,16 +142,11 @@ export const navigationItems = [
           auth.access.roles
         )
       },
-    ]
-  },
-  {
-    category: 'Orders & Sales',
-    items: [
       {
-        title: 'Orders',
-        iconComponent: IconOrders,
+        title: 'Rents',
+        iconComponent: IconEvents,
         route: (auth, route) => ({
-          name: 'OrganizationOrdersList',
+          name: 'Organization_Rents',
           params: { _id: route.params._id }
         }),
         visible: (auth, route) => hasAccess(
@@ -135,11 +157,17 @@ export const navigationItems = [
           auth.access.roles
         )
       },
+    ]
+  },
+  {
+    category: 'Orders & Sales',
+    visible: (auth, route) => auth.state && auth.state.user && auth.state.user._id, // Only for authenticated users
+    items: [
       {
-        title: 'Rents',
-        iconComponent: IconEvents,
+        title: 'Orders',
+        iconComponent: IconOrders,
         route: (auth, route) => ({
-          name: 'Organization_Rents',
+          name: 'OrganizationOrdersList',
           params: { _id: route.params._id }
         }),
         visible: (auth, route) => hasAccess(
@@ -150,82 +178,38 @@ export const navigationItems = [
           auth.access.roles
         )
       },
-    ]
-  },
-  {
-    category: 'Content',
-    items: [
       {
-        title: 'Gallery',
-        iconComponent: IconGallery,
+        title: 'Customers',
+        iconComponent: IconCommunity,
         route: (auth, route) => ({
-          name: 'Backoffice Gallery',
+          name: 'OrganizationCustomers',
           params: { _id: route.params._id }
         }),
         visible: (auth, route) => hasAccess(
           route.params._id, 
-          'gallery', 
+          'orders', 
           'read', 
           auth.accesses, 
           auth.access.roles
         )
       },
       {
-        title: 'Events',
-        iconComponent: IconEvents,
+        title: 'Applications',
+        iconComponent: IconOrders,
         route: (auth, route) => ({
-          name: 'Organization_Events Backoffice',
+          name: 'OrganizationApplications',
           params: { _id: route.params._id }
         }),
         visible: (auth, route) => hasAccess(
           route.params._id, 
-          'events', 
+          'orders', 
           'read', 
           auth.accesses, 
           auth.access.roles
         )
       },
-      // Закомментированные пункты меню из оригинала также можно добавить при необходимости
-      // {
-      //   title: 'Community',
-      //   iconComponent: IconCommunity,
-      //   route: (auth, route) => ({
-      //     name: 'Backoffice Community',
-      //     params: { _id: route.params._id }
-      //   }),
-      // },
-      // {
-      //   title: 'Payments',
-      //   icon: '💰',
-      //   route: (auth, route) => ({
-      //     name: 'Payments',
-      //     params: { _id: route.params._id }
-      //   }),
-      // },
     ]
   },
-  // Закомментированное меню из оригинала
-  // {
-  //   category: 'System',
-  //   items: [
-  //     {
-  //       title: 'Organizations',
-  //       iconComponent: IconGroups,
-  //       route: (auth, route) => ({
-  //         name: 'Backoffice Organizations',
-  //         params: { _id: route.params._id }
-  //       }),
-  //     },
-  //     {
-  //       title: 'Reports',
-  //       icon: '📊',
-  //       route: (auth, route) => ({
-  //         name: 'Backoffice Reports',
-  //         params: { _id: route.params._id }
-  //       }),
-  //     },
-  //   ]
-  // },
 ];
 
 export default navigationItems;

package/src/modules/organizations/router/organizations.js

@@ -8,6 +8,9 @@ import { createRentsRoutes } from '@martyrs/src/modules/rents/views/router/rents
 import categoriesRoutes from '@martyrs/src/modules/products/router/categories.router.js';
 import { createProductRoutes } from '@martyrs/src/modules/products/router/products.router.js';
 
+import { createSpotsRoutes } from '@martyrs/src/modules/spots/router/spots.js';
+import { createPostsRoutes } from '@martyrs/src/modules/community/router/blogposts.js';
+
 import galleryBackofficeRoutes from '@martyrs/src/modules/gallery/router/gallery.backoffice.router.js';
 import paymentsRoutes from '@martyrs/src/modules/wallet/views/router/payments.router.js';
 
@@ -71,6 +74,8 @@ const organizations = {
         createProductRoutes('Organization_'),
         createEventRoutes('Organization_'),
         createRentsRoutes('Organization_'),
+        createSpotsRoutes('Organization_'),
+        createPostsRoutes('Organization_'),
         ...categoriesRoutes,
         ...paymentsRoutes,
         ...galleryBackofficeRoutes,

package/src/modules/pages/views/components/pages/Page.vue

@@ -22,7 +22,7 @@
 
     <div  v-if="!isMenuOpen" class="cols-2-1_3 h-100 bg-light z-index-0 pos-relative">
 
-      <div v-if="pageParent.url !== page.url" class="desktop-only h-100 bg-white o-scroll z-index-0  pos-relative">
+      <div class="desktop-only h-100 bg-white o-scroll z-index-0  pos-relative">
         <ul 
           class="transition-ease-in-out w-100  bg-light"
         >

package/src/modules/products/TASKS.MD

@@ -0,0 +1,157 @@
+теперь добавь фильтрацию по выбранному периоду на фронте и беке. На фронте в lookups надо добавить rents в случае если есть период (чтобы не грузить лишний раз), в products.lookup.config
+   добавить rents и добавить в product.query фильтрацию по доступности с учетом quantityЖ Для фильтрации доступных товаров при агрегации на основе аренд, вам нужно использовать $lookup для
+   проверки пересечений с активными арендами. Вот пример агрегации:
+
+  javascript
+  const checkAvailability = async (startDate, endDate) => {
+    const pipeline = [
+      // Фильтр по нужным критериям товаров
+      {
+        $match: {
+          listing: 'rent',
+          status: 'active' // или другие условия
+        }
+      },
+      
+      // Присоединяем аренды для каждого товара
+      {
+        $lookup: {
+          from: 'rents',
+          let: { productId: '$_id' },
+          pipeline: [
+            {
+              $match: {
+                $expr: {
+                  $and: [
+                    { $eq: ['$product', '$productId'] },
+                    // Только активные аренды
+                    { $in: ['$status', ['confirmed', 'active']] },
+                    // Проверка пересечения дат
+                    {
+                      $or: [
+                        // Аренда начинается в запрашиваемый период
+                        {
+                          $and: [
+                            { $gte: ['$startDate', new Date(startDate)] },
+                            { $lte: ['$startDate', new Date(endDate)] }
+                          ]
+                        },
+                        // Аренда заканчивается в запрашиваемый период
+                        {
+                          $and: [
+                            { $gte: ['$endDate', new Date(startDate)] },
+                            { $lte: ['$endDate', new Date(endDate)] }
+                          ]
+                        },
+                        // Аренда полностью покрывает запрашиваемый период
+                        {
+                          $and: [
+                            { $lte: ['$startDate', new Date(startDate)] },
+                            { $gte: ['$endDate', new Date(endDate)] }
+                          ]
+                        }
+                      ]
+                    }
+                  ]
+                }
+              }
+            }
+          ],
+          as: 'activeRents'
+        }
+      },
+      
+      // Фильтруем только доступные товары
+      {
+        $match: {
+          activeRents: { $size: 0 } // Нет активных аренд в этот период
+        }
+      },
+      
+      // Убираем поле activeRents из результата
+      {
+        $project: {
+          activeRents: 0
+        }
+      }
+    ];
+
+    return await Product.aggregate(pipeline);
+  };
+  Если у вас товары могут иметь количество (например, несколько единиц одного товара), то нужно модифицировать логику:
+
+  javascript
+  const checkAvailabilityWithQuantity = async (startDate, endDate, requestedQuantity = 1) => {
+    const pipeline = [
+      {
+        $match: {
+          listing: 'rent',
+          status: 'active'
+        }
+      },
+      
+      {
+        $lookup: {
+          from: 'rents',
+          let: { productId: '$_id' },
+          pipeline: [
+            {
+              $match: {
+                $expr: {
+                  $and: [
+                    { $eq: ['$product', '$productId'] },
+                    { $in: ['$status', ['confirmed', 'active']] },
+                    // Проверка пересечения дат (та же логика)
+                  ]
+                }
+              }
+            },
+            // Суммируем количество в активных арендах
+            {
+              $group: {
+                _id: null,
+                totalRented: { $sum: '$quantity' }
+              }
+            }
+          ],
+          as: 'rentInfo'
+        }
+      },
+      
+      // Добавляем поле с доступным количеством
+      {
+        $addFields: {
+          rentedQuantity: {
+            $ifNull: [{ $arrayElemAt: ['$rentInfo.totalRented', 0] }, 0]
+          },
+          availableQuantity: {
+            $subtract: [
+              { $ifNull: ['$quantity', 1] }, // quantity товара или 1 по умолчанию
+              { $ifNull: [{ $arrayElemAt: ['$rentInfo.totalRented', 0] }, 0] }
+            ]
+          }
+        }
+      },
+      
+      // Фильтруем товары с достаточным количеством
+      {
+        $match: {
+          availableQuantity: { $gte: requestedQuantity }
+        }
+      },
+      
+      // Убираем временные поля
+      {
+        $project: {
+          rentInfo: 0,
+          rentedQuantity: 0
+        }
+      }
+    ];
+
+    return await Product.aggregate(pipeline);
+  };
+
+
+
+   сделать нужно минималистично и ничего кроме этого