@ozdao/prometheus-framework 0.2.91 → 0.2.93

package/src/components/Map/Map.vue

@@ -1,12 +1,18 @@
 <template>
   <div ref="gmap" class="gmap"></div>
+  
 </template>
 
 <script setup>
 import { ref, onMounted, watch } from 'vue';
 
+
+import { Loader as GMLoader } from "@googlemaps/js-api-loader";
+
+
 const props = defineProps({
   location: Object,
+  apiKey: String,
 });
 
 let gmap = ref(null);
@@ -14,25 +20,33 @@ let map = null;
 let marker = null;
 
 onMounted(async () => {
-  // Инициализировать карту
-  map = new google.maps.Map(gmap.value, {
-    zoom: 13,
-    center: {
-      lat: props.location.lat,
-      lng: props.location.lng,
-    },
+  const loader = new GMLoader({
+    apiKey: props.apiKey,
+    version: "weekly",
+    libraries: ["places"]
   });
 
-  // Добавить маркер
-  marker = new google.maps.Marker({
-    position: {
-      lat: props.location.lat,
-      lng: props.location.lng,
-    },
-    map: map,
+  loader.load().then(() => {
+    map = new google.maps.Map(gmap.value, {
+      zoom: 13,
+      center: {
+        lat: props.location.lat,
+        lng: props.location.lng,
+      },
+    });
+
+    // Добавить маркер
+    marker = new google.maps.Marker({
+      position: {
+        lat: props.location.lat,
+        lng: props.location.lng,
+      },
+      map: map,
+    });
+ }).catch(e => {
+    console.error(e);
   });
 });
-
 watch(() => props.location, () => {
   if (map && marker) {
     // Обновить позицию маркера

package/src/modules/constructor/components/elements/VideoPlayer.vue

@@ -1,10 +1,10 @@
 <template>
   <div 
-    class="mn-b-thin w-100 pd-medium bg-white radius-medium"
+    class="mn-b-thin w-100 pd-medium bg-black radius-medium"
   >
       
     <div v-if="prop.content" class="flex-center flex">
-      <video controls class="w-100">
+      <video controls class="w-100 h-max-30r">
         <source :src="prop.content" type="video/mp4">
         Your browser does not support the video tag.
       </video>

package/src/modules/events/components/layouts/layoutEvents.vue

@@ -1,12 +1,5 @@
 <template>
-
   <div class="pd-thin h-min-100">
-    <DatePicker
-      v-model:date="events.state.filter.date"
-      :locale="$i18n.locale"
-      class="radius-semi o-hidden bg-grey mn-b-thin pd-l-zero pd-r-zero pd-medium"
-    />
-
     <router-view v-slot="{ Component, route }">
       <transition name="scaleIn" mode="out-in">
         <component ref="page" :key="route.query" :is="Component" />
@@ -17,60 +10,10 @@
 
 <script setup="props">
   import { computed,onMounted, toRefs,ref, watch } from 'vue'
-  import { useRoute,useRouter } from 'vue-router'
-
-  import Select from '@pf/src/components/Select/Select.vue'
-  import DatePicker from '@pf/src/components/DatePicker/DatePicker.vue'
-  // Import state
-  import * as events from '@pf/src/modules/events/store/events.js';
-
-  // State
+  import { useRoute,useRouter } from 'vue-router';
+  // Router
   const route = useRoute();
   const router = useRouter()
-
-  let baseDate = new Date();
-  const formattedDate = formatDateForRouter(baseDate);
-  
-  function formatDateForRouter(date) {
-    return `${date.getDate().toString().padStart(2, '0')}${(date.getMonth() + 1).toString().padStart(2, '0')}${date.getFullYear()}`;
-  }
-
-  if (route.query) {
-    const query = route.query;
-    
-    const newFilterValue = {
-      tags: query.tags ? query.tags.split(',') : null,
-      date: query.date ? query.date : formattedDate,
-    };
-
-    events.state.filter = newFilterValue;  // <-- Modified
-  } else {
-    const newFilterValue = {
-      date: formattedDate,
-    };
-
-    events.state.filter = newFilterValue;
-  }
-
-  watch(() => events.state.filter, (newFilterValue, oldFilterValue) => {  // <-- Modified
-    const query = { ...route.query };
-
-    Object.keys(oldFilterValue).forEach(key => {
-      if (query[key]) {
-        delete query[key];
-      }
-    });
-
-    const newQueryValues = Object.fromEntries(
-      Object.entries(newFilterValue)
-        .filter(([key, value]) => (Array.isArray(value) && value.length > 0) || (typeof value === 'string' && value))
-        .map(([key, value]) => [key, Array.isArray(value) ? value.join(',') : value])
-    );
-    Object.assign(query, newQueryValues);
-
-    router.push({ query });
-  }, { deep: true })
-
 </script>
 
 <style lang="scss">

package/src/modules/events/components/pages/Events.vue

@@ -1,34 +1,72 @@
 <template>
   <section class="pd-thin">
+    <header 
+      class="mn-b-medium flex-v-center flex-nowrap flex"
+    >
+      <h2
+        class="mn-r-medium"
+      >
+        Featured
+      </h2>
+    </header>
     <List
       :user="auth.state.user._id"
-      class="bg-grey mn-b-thin radius-big"
-      :phase="'week'"
+      class="bg-grey mn-b-medium radius-big"
+      :phase="'planned'"
     />
     <header 
       class="mn-b-medium flex-v-center flex-nowrap flex"
     >
-          <h2
-            class="mn-r-medium"
-          >
-            Events
-          </h2>
-          
-          <button 
-            @click="router.push({name: 'Create Event'})" 
-            class="radius-100 i-big hover-scale-1 cursor-pointer t-white bg-second"
-          >
-            +
-          </button>
+      <h2
+        class="mn-r-medium"
+      >
+        All Events
+      </h2>
+      
+      <button 
+        @click="router.push({name: 'Create Event'})" 
+        class="radius-100 i-big hover-scale-1 cursor-pointer t-white bg-second"
+      >
+        +
+      </button>
     </header>
 
-    
-    <Feed 
-      :user="auth.state.user._id"
-      :owner="route.params._id"
-      :sortOrder="'desc'"
-      :sortParam="'date.start'"
+     <DatePicker
+      v-model:date="events.state.filter.date"
+      :locale="$i18n.locale"
+      class="radius-semi o-hidden bg-grey mn-b-thin pd-l-zero pd-r-zero pd-medium"
     />
+
+    <Feed
+      :states="{
+        empty: {
+          title: 'No Events Found',
+          description: 'Currently, there are no events available.'
+        }
+      }"
+      :store="{
+        read: (options) => events.read(options),
+        state: events.state
+      }"
+      :options="{
+          user: auth.state.user._id,
+          date: events.state.filter.date,
+          limit: 10
+      }"
+      v-slot="{ 
+        items 
+      }"
+    >
+       <CardEvent 
+        @click="$router.push({name: 'Event', params: {url: event.url}})" 
+        v-for="(event,index) in items" 
+        :key="event._id" 
+        :event="event" 
+        :user="auth.state.user._id" 
+        :type="'normal'"
+        class="bg-grey radius-big mn-b-medium"
+      />
+    </Feed>
   </section>
 </template>
 
@@ -37,16 +75,61 @@
   import { useRoute, useRouter } from 'vue-router';
 
   import Breadcrumbs from '@pf/src/components/Breadcrumbs/Breadcrumbs.vue';
-  import Feed from '@pf/src/modules/events/components/sections/Feed.vue'; 
-  import List from '@pf/src/modules/events/components/sections/List.vue'; 
+  import Feed from '@pf/src/components/Feed/Feed.vue'
+  import DatePicker from '@pf/src/components/DatePicker/DatePicker.vue'
 
+  import List from '@pf/src/modules/events/components/sections/List.vue';   
+  import CardEvent from '@pf/src/modules/events/components/blocks/CardEvent.vue';
   // Import state
-  import * as events from '@pf/src/modules/events/store/events.js';  // <-- Modified
+  import * as events from '@pf/src/modules/events/store/events.js'; 
   import * as auth from '@pf/src/modules/auth/store/auth'
 
   // State
   const route = useRoute();
   const router = useRouter();
+
+  let baseDate = new Date();
+  const formattedDate = formatDateForRouter(baseDate);
+  
+  function formatDateForRouter(date) {
+    return `${date.getDate().toString().padStart(2, '0')}${(date.getMonth() + 1).toString().padStart(2, '0')}${date.getFullYear()}`;
+  }
+
+  if (route.query) {
+    const query = route.query;
+    
+    const newFilterValue = {
+      tags: query.tags ? query.tags.split(',') : null,
+      date: query.date ? query.date : formattedDate,
+    };
+
+    events.state.filter = newFilterValue;  // <-- Modified
+  } else {
+    const newFilterValue = {
+      date: formattedDate,
+    };
+
+    events.state.filter = newFilterValue;
+  }
+
+  watch(() => events.state.filter, (newFilterValue, oldFilterValue) => {  // <-- Modified
+    const query = { ...route.query };
+
+    Object.keys(oldFilterValue).forEach(key => {
+      if (query[key]) {
+        delete query[key];
+      }
+    });
+
+    const newQueryValues = Object.fromEntries(
+      Object.entries(newFilterValue)
+        .filter(([key, value]) => (Array.isArray(value) && value.length > 0) || (typeof value === 'string' && value))
+        .map(([key, value]) => [key, Array.isArray(value) ? value.join(',') : value])
+    );
+    Object.assign(query, newQueryValues);
+
+    router.push({ query });
+  }, { deep: true })
 </script>
 
 <style lang="scss">

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

@@ -127,10 +127,13 @@ const middlewareFactory = (db) => {
     event = req.body
 
     // Update related product and payment link
-    const { product, price, paymentLink } = await serviceStripe.updateProduct(event);
+    if (event.special) {
+      const { product, price, paymentLink } = await serviceStripe.updateProduct(event);
+
+      if (paymentLink) {
+        event.specialData.ticketLinkStripe = paymentLink.url; // Update with new payment link
+      }
 
-    if (paymentLink) {
-      event.specialData.ticketLinkStripe = paymentLink.url; // Update with new payment link
     }
 
     await Event.updateOne({ _id: event._id }, { $set: event });
@@ -148,7 +151,7 @@ const middlewareFactory = (db) => {
   const deleteMethod = async (req, res) => {
     try {
       const event = await Event.findOneAndDelete({
-        id: req.body.id
+        _id: req.body._id
       }).exec();
 
       if (!event) {
@@ -156,9 +159,9 @@ const middlewareFactory = (db) => {
           message: "Event is not deleted."
         });
       }
-
-      await serviceStripe.deactivateProduct(event);
-
+      if (event.special) {
+        await serviceStripe.deactivateProduct(event);
+      }
       res.status(200).send(event);
     } catch (err) {
       return res.status(500).send({

package/src/modules/globals/components/blocks/CardHeader.vue

@@ -47,7 +47,7 @@
 							}
 						})" 
 					>
-						{{owner.target?.profile?.name}}
+						{{owner.target?.profile?.name || creator.target?.username || 'Anonymous'}}
 					</span>
 
 					<span
@@ -59,7 +59,7 @@
 							}
 						})" 
 					>
-						· by {{creator.target?.profile?.name}}
+						· by {{creator.target?.profile?.name || creator.target?.username || 'Anonymous'}}
 					</span>
 
 					<span v-if="date" class="pos-relative">
@@ -78,7 +78,7 @@
 
 				<div class="d-block mn-l-auto flex-nowrap flex flex-v-center">
 					
-					<div v-if="members" class="w-4r i-thin">
+					<div v-if="members" class="w-4r pos-relative i-thin">
 					    <!-- Круг с числом участников -->
 					    <span 
 					        :style="{ 
@@ -103,8 +103,12 @@
 					    </span>
 
 					    <!-- Аватарки -->
-					    <img 
-					        v-for="(photo, index) in membersPhotos.slice(0,2)"
+					    <template
+								v-for="(photo, index) in membersPhotos.slice(0,2)"
+					    >
+						    <img 
+					    		v-if="photo"
+					     
 					        :key="index"
 					        :src="(FILE_SERVER_URL || '') + photo"
 					        :style="{ 
@@ -121,7 +125,28 @@
 					        	bg-grey 
 					        	radius-big
 					        "
-					    />
+						    />
+
+						    <PlaceholderUserpic
+									v-else
+									:style="{ 
+					        	position: 'absolute', 
+					        	top: '0px', 
+					        	right: (index * 20 + 20) + '%', 
+					        	zIndex: 1 - index 
+					        }"
+									class="
+					        	br-solid 
+					        	br-2px 
+					        	br-white 
+					        	i-thin 
+					        	bg-grey 
+					        	radius-big
+					        "
+								/>
+							</template> 
+
+
 					</div>
 				</div>
 

package/src/modules/integrations/stripe/controllers/services/stripe.service.js

@@ -104,13 +104,24 @@ class servicePaymentStripe extends servicePayment {
         return { product, price: newPrice, paymentLink };
     }
 
-    async deactivateProduct(event) {
-        // Retrieve the default price and deactivate it
-        const product = await stripe.products.retrieve(event._id);
+      async deactivateProduct(event) {
+        try {
+            // Попытка получить продукт по ID
+            const product = await stripe.products.retrieve(event._id.toString());
+
+            // Если продукт найден, деактивировать его цену
+            if (product && product.default_price) {
+                await stripe.prices.update(product.default_price, {
+                    active: false
+                });
+            }
+        } catch (error) {
+            // Обработка ошибки, если продукт не найден или другая ошибка API
+            console.error("Ошибка при деактивации продукта:", error.message);
+            // Можно здесь добавить дополнительную логику, если нужно
 
-        await stripe.prices.update(product.default_price, {
-            active: false
-        });
+            // Ошибка игнорируется, чтобы пропустить этот шаг
+        }
     }
 
     async createPaymentLink(event) {