@ozdao/martyrs 0.2.507 → 0.2.509

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

@@ -4,11 +4,133 @@
 		<!-- <Breadcrumbs class="mn-b-thin pd-medium bg-light radius-big"/> -->
 		<!-- <pre>{{organization.state.current}}</pre> -->
 
-		<DetailsTabSection 	
-			:organization="organization.state.current" 
-			:user="auth.state.user"
-			class="mn-b-thin"
-		/>
+		<section class="flex-center flex flex-column t-center pd-medium radius-medium bg-light mn-b-thin">
+
+			<Dropdown 
+				v-if="auth.state.user._id !== organization.state.current.owner"
+				:label="{ component: IconEllipsis, class: 'i-regular t-transp' }"
+				:align="'right'"
+				class="cursor-pointer pos-absolute pos-r-regular pos-t-regular pd-thin radius-extra "
+			>
+				<section 
+					class="bg-black pd-thin radius-small"
+				>
+					<FormReport 
+						:user="auth.state.user._id"
+						:type="'organization'" 
+						:target="organization.state.current._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="auth.state.user._id && auth.state.user._id !== organization.state.current.owner"
+			      :user="auth.state.user._id"
+			      :type="'organization'" 
+	      	:role="'blocked'" 
+			      :target="organization.state.current._id" 
+			      :status="organization.state.current.isBlocked" 
+			      :text="{create: 'Block', remove: 'Unblock'}"
+			      @updateMembership="event => handleMembershipUpdate(event, 'isBlocked')"
+			       class="t-white w-100 mn-t-thin bg-red" 
+	    	/>
+				</section>
+	    </Dropdown>
+
+	   <router-link
+				v-if="auth.state.user._id === organization.state.current.owner"
+	      :to="{
+					name: 'Organization Edit', 
+					params: {
+						_id: organization.state.current._id
+					}
+				}" 
+	      class="
+	      	z-index-2
+	        cursor-pointer 
+	        pos-absolute pos-t-regular pos-r-regular
+	        radius-extra pd-thin bg-second
+	      "
+	    >
+	      <IconEdit
+	        class="i-regular"
+	        classes="fill-white"
+	      />
+	    </router-link>
+
+
+			<img loading="lazy" 
+				v-if="organization.state.current.profile.photo" 
+				:src="(FILE_SERVER_URL || '') + organization.state.current.profile.photo" 
+				class="radius-big bg-light flex-center flex mn-b-small w-8r" 
+			/>
+
+			<PlaceholderOrganizationPic
+				v-else
+				class="radius-medium mn-b-small i-extra"
+			/>
+
+	    <h1
+	    	class="mn-b-thin"
+	    >
+	  		{{ organization.state.current.profile.name }}
+	  	</h1>
+
+	   	<div class="flex-center  pd-r-thin pd-l-thin flex-nowrap flex mn-t-thin bg-white radius-extra w-max">
+	   		<IconFollowing class="i-medium mn-r-micro t-transp"/>
+
+	      <p class="mn-t-thin p-medium t-medium uppercase mn-b-thin">{{organization.state.current.numberOfSubscribers}} followers</p>
+
+	      <ButtonToggleMembership
+	        v-if="
+		      	auth.state.user._id 
+		      	&& route.params._id 
+		      	&& route.params._id !== auth.state.user._id
+		      	&& organization.state.current.owner !== auth.state.user._id
+		      "
+	        :user="auth.state.user._id"
+	        :type="'organization'" 
+	        :role="'subscriber'" 
+	        :target="organization.state.current._id" 
+	        :status="organization.state.current.isSubscriber" 
+	        :text="{create: '+', remove: '-'}"
+	        @updateMembership="event => handleMembershipUpdate(event, 'isSubscriber', 'numberOfSubscribers')"
+	        class=" mn-l-thin p-medium t-medium radius-extra i-semi" 
+	      />
+	    </div>
+
+	    <!-- <p class="w-max-50r mn-t-regular mn-b-medium p-semi">
+	   		<Text :text="organization.profile.description || ''" :showToggleText="true" :maxLen="320" />
+	  	</p>   -->
+
+	  	<Chips 
+	    	v-if="organization.state.current.profile?.tags?.length > 0" 
+	    	:chips="organization.state.current.profile.tags"
+	    	class="p-medium"
+	   	/>
+
+
+	    <h4 
+	    	v-if="Object.values(organization.state.current.socials).some(value => value)" 
+	    	class="mn-t-small mn-b-thin"
+	    >
+	  		Find us in socials
+	  	</h4>
+	  	
+	   	<Socials 
+	   		:telegram="organization.state.current.socials.telegram"
+	   		:facebook="organization.state.current.socials.facebook"
+	   		:instagram="organization.state.current.socials.instagram"
+	   		:twitter="organization.state.current.socials.twitter"
+	   		:youtube="organization.state.current.socials.youtube"
+	   	/>
+		</section>
 
 		<!-- Organization Info Section -->
 		<div class="pos-relative">
@@ -31,13 +153,26 @@
 	// Import components
 	import Breadcrumbs 	from '@martyrs/src/components/Breadcrumbs/Breadcrumbs.vue'
 	import Block  		from '@martyrs/src/components/Block/Block.vue'
+	import Dropdown from "@martyrs/src/components/Dropdown/Dropdown.vue";
+	import Text  		from '@martyrs/src/components/Text/Text.vue'
+	import Chips  from '@martyrs/src/components/Chips/Chips.vue'
 	// Mobile Module
 	import Menu from '@martyrs/src/components/Menu/Menu.vue'
 	import MenuItem from '@martyrs/src/components/Menu/MenuItem.vue'
+	// Icons
+	import IconFollowing from '@martyrs/src/modules/icons/entities/IconFollowing.vue'
+	import IconEdit from '@martyrs/src/modules/icons/navigation/IconEdit.vue'
+	import IconEllipsis from '@martyrs/src/modules/icons/navigation/IconEllipsis.vue'
+	import PlaceholderOrganizationPic from '@martyrs/src/modules/icons/placeholders/PlaceholderOrganizationPic.vue'
 	// Organizations
 	import DepartmentSub from '@martyrs/src/modules/organizations/components/blocks/DepartmentSub.vue';
-	import DetailsTabSection from '@martyrs/src/modules/organizations/components/sections/DetailsTabSection.vue'
+	import ButtonToggleMembership from '@martyrs/src/modules/organizations/components/elements/ButtonToggleMembership.vue'
+	import Contacts from '@martyrs/src/modules/organizations/components/blocks/Contacts.vue'
+	import Rating from '@martyrs/src/modules/organizations/components/blocks/Rating.vue'
+	import Socials from '@martyrs/src/modules/organizations/components/blocks/Socials.vue'
 	import User from '@martyrs/src/modules/auth/views/components/blocks/CardUser.vue';
+	// Report Module
+	import FormReport from '@martyrs/src/modules/reports/components/sections/FormReport.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';
@@ -69,6 +204,11 @@
 			});
 		}
 	})
+
+	// Methods
+	const handleMembershipUpdate = ({ membership, status, target }, statusName, statusNumber) => {
+	  memberships.mutations.handleMembershipUpdate(organization.state.current, membership, status, target, statusName, statusNumber)
+	};
 </script>
 
 <style lang="scss">

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

@@ -110,7 +110,13 @@ export const navigationItems = [
   },
   {
     category: 'Management',
-    visible: (auth, route) => auth.state && auth.state.user && auth.state.user._id, // Only for authenticated users
+    visible: (auth, route) => hasAccess(
+      route.params._id, 
+      'products', 
+      'read', 
+      auth.accesses, 
+      auth.access.roles
+    ),
     items: [
       {
         title: 'Categories',
@@ -161,7 +167,13 @@ export const navigationItems = [
   },
   {
     category: 'Orders & Sales',
-    visible: (auth, route) => auth.state && auth.state.user && auth.state.user._id, // Only for authenticated users
+    visible: (auth, route) => hasAccess(
+      route.params._id, 
+      'orders', 
+      'read', 
+      auth.accesses, 
+      auth.access.roles
+    ),
     items: [
       {
         title: 'Orders',
@@ -169,14 +181,7 @@ export const navigationItems = [
         route: (auth, route) => ({
           name: 'OrganizationOrdersList',
           params: { _id: route.params._id }
-        }),
-        visible: (auth, route) => hasAccess(
-          route.params._id, 
-          'orders', 
-          'read', 
-          auth.accesses, 
-          auth.access.roles
-        )
+        })
       },
       {
         title: 'Customers',
@@ -184,14 +189,7 @@ export const navigationItems = [
         route: (auth, route) => ({
           name: 'OrganizationCustomers',
           params: { _id: route.params._id }
-        }),
-        visible: (auth, route) => hasAccess(
-          route.params._id, 
-          'orders', 
-          'read', 
-          auth.accesses, 
-          auth.access.roles
-        )
+        })
       },
       {
         title: 'Applications',
@@ -199,14 +197,7 @@ export const navigationItems = [
         route: (auth, route) => ({
           name: 'OrganizationApplications',
           params: { _id: route.params._id }
-        }),
-        visible: (auth, route) => hasAccess(
-          route.params._id, 
-          'orders', 
-          'read', 
-          auth.accesses, 
-          auth.access.roles
-        )
+        })
       },
     ]
   },

package/src/modules/organizations/organizations.client.js

@@ -26,7 +26,6 @@ import Socials from './components/blocks/Socials.vue';
 import Unit from './components/blocks/Unit.vue';
 
 // Sections
-import DetailsTabSection from './components/sections/DetailsTabSection.vue';
 import Documents from './components/sections/Documents.vue';
 import MembersAdd from './components/sections/MembersAdd.vue';
 import OrganizationsSection from './components/sections/Organizations.vue';
@@ -56,7 +55,6 @@ export {
   Department,
   DepartmentEdit,
   DepartmentSub,
-  DetailsTabSection,
   Documents,
   EmptyState,
   MembersAdd,
@@ -105,7 +103,6 @@ const ModuleOrganization = {
       Socials,
       // Sections
       MembersAdd,
-      DetailsTabSection,
       OrganizationsSection,
       Publics,
       Documents,

package/src/modules/products/TASKS.MD

@@ -1,157 +1 @@
-теперь добавь фильтрацию по выбранному периоду на фронте и беке. На фронте в 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);
-  };
-
-
-
-   сделать нужно минималистично и ничего кроме этого
+ПРОВЕРИТЬ РАБОТУ ИНГРЕДИЕНТОВ НА БЕКЕНДЕ И ФРОНТЕНДЕ

package/src/modules/products/components/elements/QuantitySelector.vue

@@ -8,15 +8,15 @@
     >
       <span class="i-regular">-</span>
     </button>
-
     <div class="radius-small br-solid br-1px br-light w-3r pd-small">
-    <input
-      type="number"
-      v-model.number="modelValue"
-      class="w-100 h-1r t-center"
-      :min="1"
-      :max="maxValue"
-    />
+      <input
+        type="number"
+        v-model.number="modelValue"
+        @input="validateInput"
+        class="w-100 h-1r t-center"
+        :min="1"
+        :max="maxValue"
+      />
     </div>
     <button 
       @click="incrementQuantity" 
@@ -38,6 +38,14 @@ const props = defineProps({
 
 const modelValue = defineModel();
 
+function validateInput() {
+  if (modelValue.value < 1) {
+    modelValue.value = 1;
+  } else if (modelValue.value > props.maxValue) {
+    modelValue.value = props.maxValue;
+  }
+}
+
 function incrementQuantity() {
   if (modelValue.value < props.maxValue) {
     modelValue.value++;
@@ -49,4 +57,4 @@ function decrementQuantity() {
     modelValue.value--;
   }
 }
-</script>
+</script>

package/src/modules/products/components/pages/Product.vue

@@ -1,6 +1,6 @@
 <template>
   <div v-if="products.state.current" class="w-100 mobile:pd-thin pd-small bg-white">
-    <div class="cols-2 mobile:cols-1 w-100 gap-medium">
+    <div class="cols-2 mobile:cols-1 tablet:cols-1 w-100 gap-medium">
 
       <ProductImages
         :images="currentImages"

package/src/modules/products/components/pages/Products.vue

@@ -69,7 +69,6 @@
             </template>
           </Spoiler>
          
-
           <!-- Цена за сутки -->
           <Spoiler 
             class="o-hidden mn-b-medium"
@@ -152,6 +151,7 @@
           <Filters
             v-model:filters="availableFilters"
             v-model:selected="selectedFilters"
+            class="mn-b-thin mobile-only"
           />
           <slot></slot>
           <!-- <div class="pos-relative w-100  z-index-3 radius-tl-big radius-tr-big">
@@ -161,7 +161,8 @@
               class="bg-light mn-b-thin h-4r"
             />
           </div> -->
-          <div class="mn-b-thin w-100 o-y-scroll scroll-hide scroll-snap-type-x-mandatory scroll-pd-regular">
+
+          <div class="mn-b-thin mobile-only w-100 o-y-scroll scroll-hide scroll-snap-type-x-mandatory scroll-pd-regular">
             <div class="gap-thin flex-nowrap flex">
               <div
                 v-for="category in currentCategories"
@@ -173,6 +174,8 @@
               </div>
             </div>
           </div>
+
+
           <Feed
             :search="true"
             v-model:filter="products.state.filter"

package/src/modules/products/components/sections/ProductsPopular.vue

@@ -1,18 +1,23 @@
 <template>
   <Carousel
     :store="{
-      read: products.actions.read
+      read: (options) => products.actions.read(options)
     }"
     :options="{ 
-      limit: 10 
+      limit: 16,
+      sortParam: 'popularity',
+      owner: $route.name?.includes('Organization') ? $route.params._id : null,
+      lookup: ['variants'],
     }"
     :text="{ title: 'No products available' }"
     :showDots="true"
     class="popupar_products"
+    v-slot="{ 
+      item
+    }"
   >
-    <template #default="{ item }">
       <router-link  
-        :to="{ name: 'Organization_Product', params: { _id: item.owner.target, product: item._id } }"
+        :to="{ name: 'Organization_Product', params: { _id: item.owner.target._id || item.owner.target, product: item._id } }"
         class="h-100 pos-relative block"
       >
         <CardProduct  
@@ -20,7 +25,6 @@
           class="h-max-40r h-100 bg-light"
         />
       </router-link>
-    </template>
   </Carousel>
 </template>
 

package/src/modules/products/components/sections/ProductsRecommended.vue

@@ -139,7 +139,7 @@ const addSelectedToCart = async () => {
 <template>
   <div>
     <h3 class="mn-b-small">Frequently Bought Together</h3>
-    <div class="recommended-products cols-4 mobile:cols-2 gap-thin">
+    <div class="recommended-products cols-4 rows-auto-1fr mobile:cols-2 gap-thin">
       
       <CardProduct  
         v-for="(product, index) in products" 
@@ -166,7 +166,10 @@ const addSelectedToCart = async () => {
         <p class="mn-b-small">Total price:</p>
         <p class="mn-b-medium h3 t-medium">${{ totalPrice }}</p>
         <Button 
+          :disabled="selectedProducts.length < 1"
           class="bg-main gap-micro"
+          :showSuccess="false"
+          :showLoader="false"
           :submit="canAddToCart ? addSelectedToCart : undefined"
         >
           <IconShopcartAdd class="i-semi"/>

package/src/modules/products/controllers/configs/products.lookup.config.js

@@ -81,7 +81,17 @@ export default  {
       from: 'products',
       localField: 'recommended',
       foreignField: '_id',
-      as: 'recommended'
+      as: 'recommended',
+      pipeline: [
+        {
+          $lookup: {
+            from: 'variants',
+            localField: '_id',
+            foreignField: 'product',
+            as: 'variants'
+          }
+        }
+      ]
     }
   },
   // Лукап для категорий продукта

package/src/styles/base/all.scss

@@ -259,10 +259,15 @@ body {
 	}
 	.rows-1 {display: grid;  grid-template-columns: 100%; grid-auto-rows: minmax(auto, max-content); }
 	.rows-1-min0_max1 {display: grid; grid-template-rows: minmax(0, 1fr); }
-	.rows-auto {   grid-auto-flow: row;
-  grid-auto-columns: auto;
-  grid-template-rows: auto;
-  grid-auto-rows: auto;}
+	.rows-auto {   
+		grid-auto-flow: row;
+	  grid-auto-columns: auto;
+	  grid-template-rows: auto;
+	  grid-auto-rows: auto;
+	}
+	.rows-auto-1fr {
+		grid-auto-rows: 1fr;
+	}
 	// REFACTOR THIS SHIT
 	.grid {
 	  display: grid;

package/src/styles/config.scss

@@ -336,6 +336,12 @@ $display-values: (
   'table-cell': table-cell
 );
 
+$text-align-values: (
+  'left': left,
+  'center': center,
+  'right': right,
+);
+
 $order: (
   '1': 1,
   '2': 2,
@@ -395,6 +401,10 @@ body {
   @include generate-utility-classes('o-y', 'overflow-y', null, $overflow-xy-values, $breakpoints);
   @include generate-utility-classes('d', 'display', null, $display-values, $breakpoints);
 
+  /* Typography */
+  @include generate-utility-classes('t', 'text-align', null, $text-align-values, $breakpoints);
+
+
 
 	@include generate-utility-classes('cols', 'grid-template-columns', null, $cols, $breakpoints);
 	

package/src/styles/responsive.scss

@@ -65,7 +65,8 @@ $xxl-desktop-min:                   1921px;
     }
     
      // Cols
-    .cols-1, .cols-2, .cols-4,  .cols-2-2_1, .cols-2-1_2, .cols-2-1_3, .cols-2-golden-ration   { display: grid !important; grid-template-columns: 1fr !important;  }
+/*     .cols-2,*/
+    .cols-1,  .cols-4,  .cols-2-2_1, .cols-2-1_2, .cols-2-1_3, .cols-2-golden-ration   { display: grid !important; grid-template-columns: 1fr !important;  }
     .cols-4.no-responsive { grid-template-columns: 1fr 1fr 1fr 1fr !important }
     .cols-2 { >.col { width: 100% !important;  } }
 

package/src/styles/typography.scss

@@ -80,11 +80,6 @@ a:hover   { cursor: pointer;}
   -ms-user-select: none; /* IE 10 and IE 11 */
   user-select: none; /* Standard syntax */  
 }
-// Text align
-
-.t-left   	{ text-align: left; 	}
-.t-center   { text-align: center; }
-.t-right  	{ text-align: right; 	}
 // Font weights
 .t-bold   	{ font-weight: 900;}
 .t-demi   	{ font-weight: 700;}