@ozdao/prometheus-framework 0.1.35 → 0.1.37

package/src/modules/globals/controllers/utils/queryProcessor.js

@@ -2,16 +2,17 @@ const ObjectId = require('mongoose').Types.ObjectId;
 
 function getBasicOptions(query) {
   // Деструктуризация для извлечения параметров запроса
-  const { _id, url, owner, creator } = query;
+  const { _id, url, status, owner, creator } = query;
 
   // Подготовка условий для каждого возможного параметра
   const conditions = [];
 
   if (_id) { conditions.push({ _id:  new ObjectId(_id) }); }
   if (url) { conditions.push({ url: url }); }
+  if (status) { conditions.push({ status: status }); }
   if (owner) { conditions.push({ "owner.target": new ObjectId(owner) }); }
   if (creator) { conditions.push({ "creator.target": new ObjectId(creator) }); }
-
+  
   // Проверяем, есть ли условия для применения
   if (conditions.length > 0) {
     return [{ $match: { $and: conditions } }];
@@ -20,132 +21,35 @@ function getBasicOptions(query) {
   }
 }
 
-function getSortingOptions(query) {
-  const sortParam = query.sortParam || 'date.start';
-  const sortOrder = query.sortOrder || 'desc';
+function getTagsOptions(tags) {
+  if (tags && tags.length > 0) {
+    [{ $in: tags.split(',') }]
+  } else {
+    return [];
+  }
+}
 
+function getSortingOptions(param = 'createdAt', order = 'desc') {
   let sort = {
-    [sortParam]: sortOrder === 'desc' ? -1 : 1,
+    [param]: order === 'desc' ? -1 : 1,
     '_id': 1,
   };
 
-  return [{ $sort: sort }]
+  return [{ $sort: sort }];
 }
 
-function getPaginationOptions(query) {
+
+
+function getPaginationOptions(skip, limit) {
   let pagination = {
-    skip: parseInt(query.skip) || 0,
-    limit: parseInt(query.limit) || 20,
+    skip: parseInt(skip) || 0,
+    limit: parseInt(limit) || 20,
   };
 
   return [{ $skip: pagination.skip },{ $limit: pagination.limit }]
 }
 
-function getDateConditions(date) {
-  if (date) {
-    const dateString = date.toString(); // Just to ensure it's a string
-
-    const day = parseInt(dateString.substring(0, 2), 10);
-    const month = parseInt(dateString.substring(2, 4), 10) - 1; // months are 0-based in JavaScript
-    const year = parseInt(dateString.substring(4, 8), 10);
-    
-    const customDate = new Date(year, month, day);
-    customDate.setHours(0, 0, 0, 0); // Set the start of the day
-    
-    const customDateEnd = new Date(year, month, day);
-    customDateEnd.setHours(23, 59, 59, 999); // Set the end of the day
-
-    return [{ $match: { "date.start": { $gte: customDate, $lte: customDateEnd } } }];
-  } else {
-    return []
-  }
-}
-
-function getPeriodConditions(period,periodStart, periodEnd) {
-  const now = new Date();
-
-  let startDate, endDate;
-
-  if (periodStart && periodEnd) {
-    startDate = new Date(periodStart);
-    endDate = new Date(periodEnd);
-
-    return [{ 
-      $match: { 
-        "date.start": { 
-          $gte: startDate, 
-          $lte: endDate 
-        } 
-      } 
-    }];
-  } else if (period) {
-    startDate = new Date(now.getTime()); // Make a copy
-    endDate = new Date(now.getTime());  // New end date variable
-    
-    switch (period) {
-    case 'today':
-      startDate.setHours(0, 0, 0, 0);
-      endDate.setHours(23, 59, 59, 999);
-      break;
-    case 'week':
-      endDate.setDate(now.getDate() + 7);
-      break;
-    case 'month':
-        endDate.setDate(now.getDate() + 30); // Or endDate.setMonth(now.getMonth() + 1); based on your requirement
-        break;
-    case 'year':
-      endDate.setFullYear(now.getFullYear() + 1);
-      break;
-    default:
-      break;
-    }
-    return [{ 
-      $match: { 
-        "date.start": { 
-          $gte: startDate, 
-          $lte: endDate 
-        } 
-      } 
-    }];
-  } else {
-    return []
-  }
-}
-
-function getStatusConditions(status) {
-  const now = new Date();
-
-  const todayStart = new Date(now.getTime());
-  todayStart.setHours(0, 0, 0, 0);
-  const todayEnd = new Date(now.getTime());
-  todayEnd.setHours(23, 59, 59, 999);
-
-  let matchConditions = [];
-
-  switch (status) {
-    case 'finished':
-      matchConditions.push({ "date.start": { $lt: now } });
-      break;
-    case 'today':
-      matchConditions.push({ "date.start": { $gte: todayStart, $lte: todayEnd } });
-      break;
-    case 'live':
-      matchConditions.push({ "date.start": { $lte: now } });
-      matchConditions.push({ "date.end": { $gte: now } });
-      break;
-    case 'planned':
-      matchConditions.push({ "date.start": { $gt: now } });
-      break;
-    default:
-      break;
-  }
 
-  if (matchConditions && matchConditions.length > 0) {
-    return [{ $match: { $and: matchConditions } }];
-  } else {
-    return []
-  }
-}
 
 function getCreatorUserLookupStage() {
   return {
@@ -216,9 +120,7 @@ module.exports = {
   getBasicOptions,
   getSortingOptions, 
   getPaginationOptions,
-  getDateConditions,
-  getStatusConditions,
-  getPeriodConditions,
+  getTagsOptions,
 // Creator and Owner
   getCreatorUserLookupStage,
   getCreatorOrganizationLookupStage,

package/src/modules/globals/models/engagement.schema.js

@@ -1,32 +1,36 @@
-module.exports = function applyEngagementSchema(schema,db) {
-  // Добавляем поля
-  schema.add({
-    views: { 
-      type: Number,
-    default: 0 
-    }
-  });
+module.exports = function applyEngagementSchema(schema, db) {
+  // Добавление нового поля в схему
+  schema.add({ views: { type: Number, default: 0 } });
 
-  // Если есть middleware для этой схемы, добавляем его здесь
+  // Middleware после агрегации
   schema.post('aggregate', async function(docs) {
+    // Если документы отсутствуют, выход из функции
+    if (docs.length === 0) return;
+
+    console.log('Post-aggregate hook in engagement schema triggered');
+
+    const model = this._model;
+
+    if (!model) {
+      console.error("No model is associated with this schema!");
+      return;
+    }
     
-    // Проверяем, возвращены ли какие-либо документы
-    if (docs.length > 0) {
-      console.log('Post-aggregate hook in engagement schena triggered');
-      try {
-                // Так как мы не можем использовать `this` для обновления внутри агрегации, 
-                // мы должны выполнить обновление вручную для каждого соответствующего документа.
-        await Promise.all(docs.map(async (doc) => {
-                    // Предполагается, что у каждого документа есть уникальный идентификатор '_id'
-          console.log(doc._id)
-          const updatedViews = await db.event.findOneAndUpdate({ _id: doc._id }, { $inc: { views: 1 } }).exec();
-                    // console.log(updatedViews)
-        }));
-      } catch (error) {
-        console.error("Error updating views:", error);
-      }
+    // Обновление просмотров с обработкой ошибок
+    try {
+      await updateDocumentViews(docs, model);
+    } catch (error) {
+      console.error("Error updating views:", error);
     }
   });
 
-  // Возвращать схему не нужно, так как мы модифицируем её напрямую
+  // Функция для обновления просмотров документов
+  async function updateDocumentViews(docs, model) {
+    const updateViewsPromises = docs.map(doc => model.findOneAndUpdate(
+      { _id: doc._id }, 
+      { $inc: { views: 1 } }
+    ).exec());
+
+    await Promise.all(updateViewsPromises);
+  }
 };

package/src/modules/globals/utils/mailing.js

@@ -15,7 +15,7 @@ async function sendEmail(to, subject, text) {
   });
 
   const mailOptions = {
-    from: `${process.env.SMTP_USER} <${process.env.SMTP_USER}>`,
+    from: `${process.env.SMTP_NAME} <${process.env.SMTP_EMAIL}>`,
     to: to,
     subject: subject,
     text: text

package/src/modules/icons/icons.client.js

@@ -0,0 +1,51 @@
+// Importing icons
+import PlaceholderUserpic from './placeholders/PlaceholderUserpic.vue';
+import LabelGooglePlay from './labels/LabelGooglePlay.vue';
+import LabelAppStore from './labels/LabelAppStore.vue';
+import IconCross from './navigation/IconCross.vue';
+import IconChevronRight from './navigation/IconChevronRight.vue';
+import IconEdit from './navigation/IconEdit.vue';
+import SkeletonEventShort from './skeletons/SkeletonEventShort.vue';
+import SkeletonBlogpost from './skeletons/SkeletonBlogpost.vue';
+import SkeletonOrganization from './skeletons/SkeletonOrganization.vue';
+import SkeletonEvent from './skeletons/SkeletonEvent.vue';
+import Vk from './socials/vk.vue';
+import Instagram from './socials/instagram.vue';
+import Telegram from './socials/telegram.vue';
+import Twitter from './socials/twitter.vue';
+import Linkedin from './socials/linkedin.vue';
+import Reddit from './socials/reddit.vue';
+import Dribbble from './socials/dribbble.vue';
+import Facebook from './socials/facebook.vue';
+import Youtube from './socials/youtube.vue';
+import Line from './socials/line.vue';
+import IconCommunity from './entities/IconCommunity.vue';
+import IconEvents from './entities/IconEvents.vue';
+import IconGroups from './entities/IconGroups.vue';
+
+// Exporting icons
+export {
+  PlaceholderUserpic,
+  LabelGooglePlay,
+  LabelAppStore,
+  IconCross,
+  IconChevronRight,
+  IconEdit,
+  SkeletonEventShort,
+  SkeletonBlogpost,
+  SkeletonOrganization,
+  SkeletonEvent,
+  Vk,
+  Instagram,
+  Telegram,
+  Twitter,
+  Linkedin,
+  Reddit,
+  Dribbble,
+  Facebook,
+  Youtube,
+  Line,
+  IconCommunity,
+  IconEvents,
+  IconGroups
+};

package/src/modules/marketplace/components/layouts/Marketplace.vue

@@ -120,7 +120,7 @@
  	// Partials
 	import Breadcrumbs from '@pf/src/components/Breadcrumbs/Breadcrumbs.vue'
 	// Import components
-	import ProductCard from '@pf/src/modules/products/components/blocks/ProductCard.vue'
+	import CardProduct from '@pf/src/modules/products/components/blocks/CardProduct.vue'
 
 	// Accessing router and store
 	const store = useStore()

package/src/modules/marketplace/components/pages/Catalog.vue

@@ -40,14 +40,13 @@
 	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'
+	// Mobile Module
+	import Menu from '@pf/src/modules/mobile/components/Menu/Menu.vue'
+	import MenuItem from '@pf/src/modules/mobile/components/Menu/MenuItem.vue'
 	// Local
-	import DetailsTab 		from '@pf/src/modules/organizations/components/sections/DetailsTab.vue'
-	import StructureTab 	from '@pf/src/modules/organizations/components/sections/StructureTab.vue'
-	import MembersTab 		from '@pf/src/modules/organizations/components/sections/MembersTab.vue'
 	import CardOrganization from '@pf/src/modules/organizations/components/blocks/CardOrganization.vue'
 	// Blocks
 	import EmptyState 		from '@pf/src/components/EmptyState/EmptyState.vue'
-  import CardOrderItem from '@pf/src/modules/orders/components/blocks/CardOrderItem.vue';
 	import Unit   	from '@pf/src/modules/organizations/components/sections/Unit.vue'
 	// Import state
 	import * as organization from '@pf/src/modules/organizations/store/organizations'

package/src/modules/marketplace/router/marketplace.js

@@ -30,17 +30,6 @@ const marketplace = [
           }
         ]
       },
-      {
-        path: 'order',
-        name: 'Order',
-        meta: {
-          title: {
-            en: 'Order',
-            ru: 'Заказ'
-          }
-        },
-        component: () => import(/* webpackChunkName: 'Order' */ '@pf/src/modules/orders/components/pages/Order.vue')
-      },
       {
         path: 'products/recommendation',
         name: 'Product Recommmendation',

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

@@ -17,7 +17,7 @@ function requiresAuth(to, from, next) {
 
 function requiresAdmin(to, from, next) {
 
-  const isAdmin = auth.state.access.roles.includes('ROLE_ADMIN');
+  const isAdmin = auth.state.access.roles?.includes('ROLE_ADMIN') ? auth.state.access.roles.includes('ROLE_ADMIN') : false;
 
   if (isAdmin !== true) {
     return next('/404');

package/src/modules/orders/components/blocks/CardOrderItem.vue

@@ -9,8 +9,7 @@
       fill="none" 
       xmlns="http://www.w3.org/2000/svg"
       v-if="!product.images[0]" 
-       class=" aspect-1x1"  
-      style="object-fit: cover;"
+       class="i-extra"
     >
       <rect width="524" height="345" fill="white"/>
       <rect width="524" height="345" fill="white" />

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

@@ -0,0 +1,238 @@
+<template>
+  <header class="mn-medium flex-v-center flex-nowrap flex">
+    <h2 class="mn-r-medium">Edit Order</h2>
+
+    <!-- <button 
+      @click="$router.push({
+        name: 'AdminOrder'
+      })" 
+      class="radius-100p i-big hover-scale-1 cursor-pointer t-white bg-second">
+        +
+    </button> -->
+  </header>
+
+	<section class="gap-thin flex-nowrap flex mn-semi">
+	    
+	  <div class="w-100 br-solid br-1px br-black-transp-10 radius-big pd-medium">
+	    <p class=" mn-small p-big">
+	      Статус заказа:<br>{{order.status}}
+	    </p>
+	    <button class="button">Подтвердить заказ</button>
+	  </div>
+
+	  <div class="w-100 br-solid br-1px br-black-transp-10 radius-big pd-medium">
+	    <p class="mn-semi p-big">Статус оплаты:<br>{{order.payment?.status}}</p>
+	    <button class="button">Изменить статус оплаты</button>
+	  </div>
+
+	   
+	</section>
+
+
+<div class="mn-thin cols-2">
+	<section class="">
+
+	    <h5 class="w-100 mn-small">Информация о заказе
+
+	         <a v-if="showAddNew === false" class="mn-l-small t-main h5" @click="reserOrderList()">Редактировать</a>
+
+	    </h5>
+
+	    <div class="cols-2 mn-medium ">
+	       <!-- <p class="w-100">Время создания: {{DateToFormattedString(order.createdAt)}}</p> -->
+	      <div class="col flex block">
+	        <p class="mn-small w-100">
+	          Номер клиента:  {{order.info?.phone}}<br>
+	        </p>
+	        <p class="mn-small w-100">
+	          Имя клиента: {{order.info?.name}} {{order.info?.surname}}
+	        </p>
+	        <p class="mn-small w-100">
+	          Контактный email: {{order.info?.email}} 
+	        </p>
+	      </div>
+	       <div class="col flex block">
+	      <p class="mn-small w-100">
+	        Тип доставки: {{order.info?.delivery}} 
+	      </p>
+	      <p class="mn-small w-100">
+	        Город: {{order.info?.city}} 
+	      </p>
+	      <p class="mn-small w-100">
+	        Адресс: {{order.info?.adress}} 
+	      </p>
+	    </div>
+	      
+	    </div> 
+	     <div class="block">
+	      <p class="w-100">
+	        Комментарий: {{order.info?.comment}} 
+	      </p>
+	    </div>
+
+	</section>
+
+	<section class="">
+	    
+	 
+
+	    <div class="order-list">
+	      	<div class="flex">
+		      	<h5 class="mn-small">
+		        	Состав заказа
+		      	</h5>
+	        	<div>
+			       	<a v-if="showAddNew === false" class="t-main h5" @click="changeAdd()">Добавить</a>
+			       	<a v-else class="t-main h5" @click="changeAdd()">Закрыть</a>
+			        <a v-if="showAddNew === false" class="mn-l-small t-main h5" @click="reserOrderList()">Сбросить</a>
+			       	<a v-if="showAddNew === false" class="mn-l-small t-main h5" @click="saveItemList()">Сохранить</a> 
+	     		</div>
+	     	 </div>
+
+	      	<div v-if="showAddNew !== false" class="mn-small w-100 block">
+	        	<vue-select :options="Products"  v-model="techStack" :label-by="'name'"  searchable clear-on-close :close-on-select="true"> </vue-select>
+	         	<button @click="addProductToOrder()" class="w-25 button">Добавить в заказ</button>
+	      	</div>
+
+	      	<ul class="mn-semi">
+	      		<li v-for="(product, index) in orderProducts" :key="product.id" class="shop-cart-item mn-small block">
+	      			<!-- <img :src="require( `@/assets/images/products/${product.images}`)"> -->
+	      			<div class="text-left">
+	      				<p class="name">{{ product.name }}</p>
+
+	      				<div class="mn-small flex">
+	      					<div class="small-underline variant">
+	      						<span v-if="!product.size && !product.color" class="">One-size</span>
+	      						<span v-if="product.size" class="">{{ product.size}}</span>
+	      						<span v-if="product.color && product.size" class="">, </span>
+	      						<span v-if="product.color" class="">{{ product.color}}</span>
+	      						<div v-if="product.edit">{{product.edit}}</div>
+	      					</div>
+
+
+
+	      					<p  class="t-demi">{{product.quantity}} x {{product.price / 100}} ₽ </p>
+	      				</div>
+	      				<div v-if="data[index]" class="flex-nowrap flex w-100">
+
+	      					<input 
+	      					@input="updateInputText('orders', 'current.items[' + index + '].quantity', $event)" 
+	      					:value="product.quantity" 
+	      					placeholder="Маргарита"
+	      					class="mn-small input-text input" 
+	      					/>
+	      				</div>
+	      				<a v-if="!data[index]" @click="changeEdit(index)">Редактировать</a>
+	      				<a v-if="data[index]" @click="deleteItem(product)">Удалить</a>
+	      				<a v-if="data[index]" @click="changeEdit(index)">Закрыть</a>
+	      			</div>
+	      		</li>
+	      	</ul>
+	    </div>
+	</section>
+</div>
+
+<div class="mn-thinw-100 flex-v-center flex block">
+	<p class="p-big">Сумма к оплате:
+		<span v-if="order.info?.delivery === 'Самовывоз'" class="p-big t-semi">{{ orderTotalPrice / 100 }} ₽</span>
+		<span v-if="order.info?.delivery === 'Курьером'" class="p-big t-semi">{{ orderTotalPrice / 100 + 350 }} ₽</span>
+		<span v-if="order.info?.delivery === 'Почтой'" class="p-big t-semi">{{ orderTotalPrice / 100 + 550 }} ₽</span>
+		(Заказ {{orderTotalPrice / 100}} ₽ + доставка
+		<span v-if="order.info?.delivery === 'Самовывоз'" >0</span>
+		<span v-if="order.info?.delivery === 'Курьером'" >350</span>
+		<span v-if="order.info?.delivery === 'Почтой'">550</span>
+	    ₽)  
+	</p>
+
+	<button class="mn-l-auto button">Запросить онлайн</button>
+</div>
+
+
+
+</template>
+
+<script setup="props">
+  // Import Vue functionality
+  import { computed, ref, defineProps, onMounted, reactive, toRefs, watch } from 'vue'
+  import { useRoute } from 'vue-router'
+
+  // Import your store
+  import { state, actions } from '@pf/src/modules/orders/store/orders';
+
+  // Accessing router
+  const route = useRoute()
+
+  // Define props
+  const props = defineProps(['showProduct'])
+  props.showProduct = [];
+
+  // Reactive data
+  let data = reactive([])
+  let reactiveData = toRefs(data)
+  var showAddNew = ref(false)
+
+  // Initialize order and products
+  let order = ref({})
+  let products = ref([])
+
+  // Function declarations
+  function test() {
+    console.log('Test Function')
+  }
+
+  function addProductToOrder() {
+    // Update your order state
+    actions.addProductToOrder() // Add your parameters here
+    showAddNew.value = !showAddNew.value
+  }
+
+  // ... [Continue with other function definitions]
+
+  // Replace store actions with your actions
+  onMounted(async () => {
+    // Replace Vuex actions with your actions
+    await actions.fetchProducts() // Implement this action in your store
+    await actions.fetchOrder(route.params.id) // Implement this action in your store
+
+    order.value = state.current // Replace Vuex state with your state
+    products.value = state.all // Replace Vuex state with your state
+  })
+
+  function deleteItem(item) {
+    actions.deleteItemFromOrder(item) // Replace Vuex mutation with your action
+  }
+
+  function saveItemList() {
+    actions.updateOrderItems(route.params.id) // Replace Vuex action with your action
+  }
+
+  function changeEdit(index) {
+    data[index] = !data[index]
+  }
+
+  function resetOrderList() {
+    actions.fetchOrder(route.params.id) // Replace Vuex action with your action
+  }
+
+  function changeAdd() {
+    showAddNew.value = !showAddNew.value
+  }
+
+  // Replace computed properties with reactive state
+  const Products = computed(() => state.products.all) // Update this line to match your state structure
+  const orderTotalPrice = computed(() => 100) // Implement this getter in your actions
+  const orderProducts = computed(() => []) // Implement this getter in your actions
+</script>
+
+
+<style lang="scss">
+
+.vue-select {
+  width: inherit;
+
+  margin-right: 1rem;
+}
+.vue-select-header {
+  height: 3rem;
+}
+</style>

package/src/modules/{backoffice → orders}/components/pages/Favorites.vue

@@ -4,7 +4,7 @@
 		<hr class="mn-semi">
 		<div class="grid-layout">
 			 <p v-if="(favorites.length == 0)" style="padding-top: 1.5rem;"><i>У вас еще нет товаров в избранном. Может стоит что-нибудь добавить?</i></p>
-			<ProductCard v-if="favorites" v-for="product in favorites" :product="product" :key="product"></ProductCard>
+			<CardProduct v-if="favorites" v-for="product in favorites" :product="product" :key="product"></CardProduct>
 		</div>
 	</div>
 </template>
@@ -14,7 +14,7 @@
 // COMPONENT DEPENDENCIES
 /////////////////////////////
 import { toRefs } from 'vue';
-import ProductCard from '@/components/blocks/ProductCard.vue';
+import CardProduct from '@/components/blocks/CardProduct.vue';
 
 
 /////////////////////////////