@ozdao/prometheus-framework 0.2.40 → 0.2.41

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ozdao/prometheus-framework",
-  "version": "0.2.40",
+  "version": "0.2.41",
   "description": "Web3 Framework focused on user experience and ease of development.",
   "author": "OZ DAO <hello@ozdao.dev>",
   "license": "GPL-3.0-or-later",

package/src/components/Countdown/Countdown.vue

@@ -27,11 +27,10 @@
 import { ref, onMounted, onBeforeUnmount } from 'vue';
 
 const props = defineProps([
-  'content',
-  'options'
+  'date',
 ])
 
-const targetDate = new Date(props.options?.date || 'January 13, 2024 16:00:00').getTime();
+const targetDate = new Date(props.date).getTime();
 const currentDate = ref(new Date().getTime());
 
 let interval;
@@ -62,6 +61,8 @@ const calculateTime = () => {
   }
 };
 
+calculateTime();
+
 onMounted(() => {
   interval = setInterval(() => {
     currentDate.value = new Date().getTime();

package/src/components/Header/Header.vue

@@ -61,6 +61,8 @@
 		<Button
 			:submit="a => store.shopcart.actions.toggleShopcart()" 
 			:counter="store.shopcart.getters.cartTotalAmount" 
+			:showSucces="false"
+			:showLoader="false"
 			class="pd-zero mn-l-auto"
 			> 
 			<IconShopcart class="i-semi"/>

package/src/modules/community/components/layouts/Community.vue

@@ -1,5 +1,5 @@
 <template>
-	<div style="grid-template-columns: 1fr 3fr 1fr;" class="cols-3 gap-thin pd-thin">
+	<div style="grid-template-columns: 2fr 4fr 2fr;" class="cols-3 gap-thin pd-thin">
 
 		<ul class="align-self-start pos-sticky pos-t-0 w-100 bg-grey radius-big pd-medium p-medium gap-thin flex-column flex-nowrap flex">
 			<li  	
@@ -81,7 +81,7 @@
 
 		</section>
 
-		<div class="bg-grey radius-big pd-medium">
+		<div class="align-self-start  bg-grey radius-big pd-medium">
 			<div class="gap-thin flex-nowrap flex">
 				<p class="t-medium mn-b-small">Popular Communities</p>
 				

package/src/modules/community/components/pages/CreateBlogPost.vue

@@ -13,6 +13,7 @@
         <Textarea 
           v-if="post" 
           :prop="post" 
+           :setFocus="true"
           content="name" 
           placeholder="Enter post title" 
           class="h2"

package/src/modules/constructor/components/sections/Constructor.vue

@@ -143,7 +143,7 @@ function handleAddBlock(type = 'Textarea', content = '', index, data) {
     class: '',
     content: content,
     blocks: [],
-    setFocus: true,
+    setFocus: false,
   };
   
   if (data && data.blocks && Array.isArray(data.blocks)) {

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

@@ -113,6 +113,18 @@
             class="mn-b-thin w-100 bg-grey pd-medium radius-small" 
           />
 
+          <Field
+            v-model:field="event.specialData.ticketText"
+            placeholder="Promotion text for ticket in hero  "
+            class="w-100  bg-grey radius-small pd-medium"
+          />
+
+           <Field
+            v-model:field="event.specialData.ticketTextButton"
+            placeholder="Text on 'Buy Ticket' button  "
+            class="w-100  bg-grey radius-small pd-medium"
+          />
+
           
         </div>
       </div>
@@ -175,6 +187,12 @@
           placeholder="Link to Main guest spotify track" 
           class="mn-b-thin w-100 bg-grey pd-medium radius-small" 
         />
+
+        <Field 
+          v-model:field="event.specialData.guestYoutube" 
+          placeholder="Link to Main guest youtube video" 
+          class="mn-b-thin w-100 bg-grey pd-medium radius-small" 
+        />
       </div>
 
       <h5
@@ -295,12 +313,41 @@
         "
       />
 
-      <h5
+      <hr class="bg-black-transp-10 mn-b-semi mn-t-semi d-block">
+
+      <h4
+        class="mn-b-thin"
+      >
+        Previous Party Section
+      </h4>
+
+       <h5
         class="mn-b-thin"
       >
         Video in Previous Partys Section
       </h5>
 
+      <Field
+        v-model:field="event.specialData.previousTitle"
+        placeholder="Name"
+        class="w-100  bg-grey radius-small pd-medium"
+      />  
+      <Field
+        v-model:field="event.specialData.previousDescription"
+        placeholder="Name"
+        class="w-100  bg-grey radius-small pd-medium"
+      />  
+      <Field
+        v-model:field="event.specialData.previousLink"
+        placeholder="Name"
+        class="w-100  bg-grey radius-small pd-medium"
+      />  
+      <Field
+        v-model:field="event.specialData.previousLinkText"
+        placeholder="Name"
+        class="w-100  bg-grey radius-small pd-medium"
+      />
+      
       <Upload 
         v-model:field="event.specialData.previousVideo"
         :placeholder="'Upload image'" 
@@ -311,8 +358,6 @@
           mn-b-thin w-100 bg-grey pd-medium radius-small t-black
         "
       />
-
-
     </div>
 
 		<h3 class="mn-b-small">Date</h3>

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

@@ -26,11 +26,12 @@
           title: event.name,
           description: event.description,
           ticketLinkStripe: event.specialData.ticketLinkStripe,
+          ticketText: event.specialData.ticketText,
+          cover: event.cover,
           subtitle: event.specialData.subtitle,
           logos: event.specialData.logos,
           video: event.specialData.video,
-          buyticket: 'Buy ticket',
-          booktable: 'Book table'
+          ticketTextButton: event.specialData.ticketTextButton,
         }"
         :options="{
           date: event.date.start,
@@ -52,15 +53,15 @@
           video: event.specialData.guestVideo,
           spotify: event.specialData.guestSpotify,
           soundcloud: event.specialData.guestSoundcloud,
+          youtube: event.specialData.guestYoutube
         }"
         class="mn-b-thin"
       />
-
       <section 
         v-if="!isLoading && event && event.special"
         :style="`
-          background-image: url(${event.specialData.lineupBackground}); 
           background-size: 100%; background-repeat: no-repeat;
+          background-image: url(${event.specialData.lineupBackground}); 
         `" 
         class="mn-b-thin t-white gap-big w-100 h-max o-hidden radius-big pd-big pos-relative bg-black"
       >
@@ -68,13 +69,13 @@
         <div 
           class="gap-big mn-b-thin"
           :class="{
-            'cols-2': event.specialData.guests.lenght > 0,
-            'cols-1': event.specialData.guests.lenght > 1
+            'cols-2': event.specialData.guests.length > 0,
+            'cols-1': event.specialData.guests.length > 1
           }"
         >
           
           <SectionSpecialGuests 
-            v-if="event.specialData.guests.lenght > 0"
+            v-if="event.specialData.guests.length > 0"
             :content="{
               title: 'Special Guests',
               guests: event.specialData.guests
@@ -92,7 +93,14 @@
 
         <SectionPreviousEvents
           :content="{
-            ticket: event.specialData.ticketImage
+            ticket: event.specialData.ticketImage,
+            ticketTextButton: event.specialData.ticketTextButton,
+            paymentText: event.specialData.paymentText,
+            paymentContact: event.specialData.paymentContact,
+            previousTitle: event.specialData.previousTitle,
+            previousDescription: event.specialData.previousDescription,
+            previousLink: event.specialData.previousLink,
+            previousLinkText: event.specialData.previousLinkText,
           }"
           :options="{
             link:  event.specialData.ticketLinkStripe,

package/src/modules/events/components/sections/HeroEvent.vue

@@ -4,7 +4,6 @@
 	  	t-white
 	  	t-center
 	  	w-100 
-	  	h-100
 	  	pos-relative
 	  	gap-thin
 	  	cols-2
@@ -15,6 +14,9 @@
    		style="min-height: 20rem;"
    		class="desktop-only radius-big o-hidden bg-black  pos-relative"
    	>
+
+	    <img  v-if="content.cover && !content.video" :src="content.cover" 	class="desktop-only object-fit-cover pos-absolute z-index-0 pos-t-0 pos-l-0 w-100 h-100">
+
 			<video 
 				v-if="content.video"
 				style="object-fit: cover;" 
@@ -36,7 +38,7 @@
 	  	pd-big mn-r-auto mn-l-auto t-white flex-h-center flex-column o-hidden flex-v-start t-left flex w-100 h-100 gap-zero">
     	<!-- <img src="/logo/jungle-stereo-cosmonaut.png"  class="h-8r mn-b-small z-index-1"/> -->
     	<div class="mn-b-big z-index-1 flex-nowrap flex gap-small">
-	    	<img v-for="logo in content.logos" class="i-big" :src="logo">
+	    	<img v-for="logo in content.logos" class="radius-thin i-big" :src="logo">
 	    </div>
 
     	<h3 class="pd-thin z-index-1  w-max br-solid br-2px br-white radius-extra 	mn-b-thin">
@@ -51,25 +53,32 @@
 	    		{{content?.description}}
 	    </p>
 	  	
-	  	<p class="z-index-1  t-transp p-small mn-b-thin">
-
-			Hurry up and purchase your ticket at a special price of only <span class="bg-white t-black pd-t-nano pd-b-nano pd-r-micro pd-l-micro radius-extra">{{options?.price}} {{returnCurrency()}}</span>
+	  	<p class="z-index-1 t-transp p-small mn-b-thin">
+				<span>
+					{{content?.ticketText }}
+				</span>
+
+				<span v-if="options?.price" class="bg-white t-black pd-t-nano pd-b-nano pd-r-micro pd-l-micro radius-extra">
+					{{options?.price}} {{returnCurrency()}}
+				</span>
 	    </p>
 	    
 
+
 	    <Countdown 
-	    	class="z-index-1  mn-b-small w-40"
-	    	:options="props.options"
+	    	v-if="options.date"
+	    	class="z-index-1 mn-t-medium w-100 w-max-30r"
+	    	:date="options.date"
 	    />
+
 	    <div v-if="content?.ticketLinkStripe" class="z-index-1  mn-t-medium mn-b-small 	flex-nowrap flex gap-thin">
-	    	<!-- <a href="#" class="pd-l-medium pd-r-medium pd-t-small pd-b-small radius-extra uppercase t-medium t-black bg-white  ">
-	    		Sold Out
-	    	</a> -->
 	    	<a href="#" @click="clickBuyTicket()" class="pd-l-medium pd-r-medium pd-t-small pd-b-small radius-extra uppercase t-medium t-black bg-white  ">
-	    			{{content?.buyticket}}
+	    			{{content?.ticketTextButton || 'Buy Ticket' }}
 	    	</a>
 	    </div>
 
+	    <img style="object-fit: cover; opacity: 0.2;"  v-if="content.cover && !content.video" :src="content.cover" 	class="mobile-only pos-absolute z-index-0 pos-t-0 pos-l-0 w-100 h-100">
+
 	    <video 
 		    v-if="content.video"
 				style="object-fit: cover; opacity: 0.2;" 
@@ -89,30 +98,36 @@
 
 
 <script setup>
+	import { ref, onMounted } from 'vue'
 	import { useI18n } from 'vue-i18n'
 
 	import Countdown from "@pf/src/components/Countdown/Countdown.vue"
 
-	import { ref, onMounted } from 'vue'
+
+	const props = defineProps({
+		content: {
+			type: Object
+		},
+		options: {
+			type: Object
+		}
+	})
+
+
 	const videoElement = ref(null)
 
 	var isPlaying = false;
 
 	function	checkAndPlayVideo() {
-    // Initializing values
-
-		// On video playing toggle values
 		videoElement.value.onplaying = function() {
 		  isPlaying = true;
 		};
 
-		// On video pause toggle values
 		videoElement.value.onpause = function() {
 		  isPlaying = false;
 		};	
   }
 
-  // Play video function
 	async function playVid() {      
     if (videoElement.value.paused && !isPlaying) {
       return videoElement.value.play();
@@ -124,17 +139,6 @@
 		playVid()
 	})
 	
-
-	const props = defineProps({
-		content: {
-			type: Object
-		},
-		options: {
-			type: Object
-		}
-	})
-
-
 	function clickBuyTicket () {
 		gtag('event', 'buy_ticket', {
 	    'event_category': 'conversion',

package/src/modules/events/components/sections/SectionMainGuest.vue

@@ -11,11 +11,11 @@
 	     		class="mn-b-semi"
 		    />
 
-	    	<h2 class="mn-b-big">
+	    	<h2 class="mn-b-semi">
 					{{content?.title}}
 		    </h2>
 
-		    <p class="p-medium" v-html="content?.description"/>
+		    <p class="p-medium t-transp" v-html="content?.description"/>
 		    <slot></slot>
 		    <iframe class="radius-big o-hidden mn-t-medium" v-if="content?.soundcloud" width="100%" height="200" scrolling="no" frameborder="no" allow="autoplay"
 					:src="`https://w.soundcloud.com/player/?url=https%3A//soundcloud.com/${content.soundcloud}
@@ -33,6 +33,7 @@
 		    	loading="lazy"
 		    	class="mn-t-thin radius-big o-hidden"
 		    ></iframe>
+		    <iframe v-if="content?.youtube"  width="100%" class="radius-big mn-t-semi" height="315" :src="`https://www.youtube.com/embed/${content?.youtube}`" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" allowfullscreen></iframe>
 	    </div>
 
 	    <div style="min-height: 20rem;" class="o-hidden pos-relative">

package/src/modules/events/components/sections/SectionPreviousEvents.vue

@@ -3,40 +3,48 @@
 	<div class="cols-2 gap-big pos-relative ">
 		 <div class="cols-1 gap-small ">
 		  <a v-if="options?.link" @click="clickBuyTicket()" href="#"  class="bg-main flex-child-grow-1  flex-child-shrink-0 flex-child-basis-auto o-hidden  radius-big pd-big flex-center flex-column flex w-100 gap-zero">
-		  	<img class="w-100" :src="content?.ticket">
+		  	<img v-if="content?.ticket" class="w-100" :src="content?.ticket">
 
-	    	<a class="t-white bg-black pd-l-medium pd-b-thin pd-t-thin pd-r-small h4 radius-extra uppercase t-nye204">
+	    	<a class="t-white bg-black pd-l-small pd-b-thin pd-t-thin pd-r-small h4 radius-extra uppercase t-nye204">
 	    		<!-- SOLD OUT -->
-					{{t('nye2024.buyticket')}}
+					{{ content?.ticketTextButton || 'Buy Ticket'}}
 		    </a>
 		    
 		  </a>
 
-		  <p class="pd-small radius-big bg-second flex flex-center gap-small p-medium t-medium t-white">
-	    	<span>For extra payment options contact</span> 
-  			<a class="t-black bg-white radius-extra pd-thin" href="https://t.me/thecommunebar" target="_blank">@thecommunebar</a>
+		  <p v-if="content?.paymentContact" class="pd-small radius-big bg-second flex flex-center gap-small p-medium t-medium t-white">
+	    	<span>{{content?.paymentText}}</span> 
+  			<a class="t-black bg-white radius-extra pd-thin" :href="content?.paymentContactURL" target="_blank">{{content?.paymentContact}}</a>
   		</p>
   	</div>
 
 		<div class="br-solid br-1px br-white-transp-10 o-hidden radius-big bg-black ">
-			<video v-if="options?.video" style="max-height: 20rem; object-fit: cover;" ref="videoElement"  class="pos-t-0 pos-l-0 w-100 h-auto" preload autoplay muted loop playsinlineclass playsinline :src="options?.video" itemprop="video" type="video/mp4" ></video>
+
+			<video 
+				v-if="options?.video" style="max-height: 20rem; object-fit: cover;" 
+				ref="videoElement"  class="pos-t-0 pos-l-0 w-100 h-auto" 
+				preload autoplay muted loop playsinlineclass playsinline 
+				:src="options?.video" itemprop="video" type="video/mp4"
+			>
+			</video>
 
 
 	    <div class="pd-big flex-column flex w-100 h-100 gap-zero">
-	    	<h3 class="t-unna t-nye204 mn-b-small">
-					{{t('nye2024.title')}}
+	    	<h3  v-if="content?.previousTitle" class="t-unna t-nye204 mn-b-small">
+					{{content?.previousTitle}}
 		    </h3>
 		    
-		    <p class="p-medium t-transp mn-b-big">
-		    	{{t('nye2024.description')}}
+		    <p  v-if="content?.previousDescription" class="p-medium t-transp mn-b-big">
+		    	{{content?.previousDescription}}
 		    </p>
 
-		    <div class="flex-nowrap flex gap-thin">
-		    	<a href="https://www.instagram.com/thecommune.phuket/" 	target="_blank" class="pd-l-medium pd-r-medium pd-t-small pd-b-small t-black radius-extra uppercase t-medium bg-white">
-		    		{{t('nye2024.checkinblog')}}
+		    <div v-if="content?.previousLink" class="flex-nowrap flex gap-thin">
+		    	<a :href="content?.previousLink" 	target="_blank" class="pd-l-medium pd-r-medium pd-t-small pd-b-small t-black radius-extra uppercase t-medium bg-white">
+		    		{{content?.previousLinkText || 'Check'}}
 		    	</a>
 		    </div>
 	    </div>
+	    
 	  </div>
 
 	 
@@ -68,7 +76,6 @@
 		      "titleTicket":"Are you ready?",
 		      "description":"Experience the ultimate party vibe at The Commune! Elevate your evening with distinctive and exhilarating activities, ensuring an unforgettable time. Dive into the excitement and make every moment special.",
 		      "checkinblog":"CHECK IN INSTAGRAM",
-		      "buyticket": "Buy Ticket Now →"
 		    }
 		  }
 		}

package/src/modules/events/models/event.model.js

@@ -34,6 +34,8 @@ module.exports = (db) => {
             default: () => ({
                 subtitle: 'NMS Presents', 
                 ticketPrice: '499',
+                ticketText: 'Hurry up and purchase your ticket at a special price of only',
+                ticketTextButton: 'Buy Ticket Now →',
                 ticketImage: null,
                 ticketLinkStripe: null,
                 video: null,
@@ -47,6 +49,13 @@ module.exports = (db) => {
                 guestTwitter: null,
                 guestSoundcloud: null,
                 guestSpotify: null,
+                guestYoutube: null,
+                paymentContact: null,
+                paymentText: 'For extra payment options contact',
+                previousTitle: null,
+                previousDescription:  null,
+                previousLink:  null,
+                previousLinkText:  null,
                 logos: [],
                 lineup: [],
                 lineupBackground: null,

package/src/modules/files/middlewares/server/middlewareBusboy.js

@@ -59,7 +59,18 @@ const handleFileUpload = (req, res, next, publicPath, { folderNameDefault = 'uns
       return;
     }
 
-    const fileName = `${Math.floor(Math.random() * 10000)}-${info.filename}`;
+    const normalizeFileName = (filename) => {
+      return filename
+        // Заменяем пробелы на подчеркивания
+        .replace(/\s/g, '_')
+        // Удаляем или заменяем небезопасные символы
+        .replace(/[^a-zA-Z0-9-_\.]/g, '')
+        // Опционально: сокращаем имя файла, если оно слишком длинное
+        .slice(0, 80);
+    };
+
+    // Применяем нормализацию к имени файла
+    const fileName = `${Math.floor(Math.random() * 10000)}-${normalizeFileName(info.filename)}`;
     const fileFullPath = path.join(filePath, fileName);
 
     const fileProcess = fsp.mkdir(path.dirname(fileFullPath), { recursive: true })
@@ -67,7 +78,7 @@ const handleFileUpload = (req, res, next, publicPath, { folderNameDefault = 'uns
         const stream = file.pipe(fs.createWriteStream(fileFullPath));
         stream.on('finish', () => {
           files.push(path.relative(publicPath, fileFullPath));
-          resolve(); // This line replaces the thumbnail creation process
+          resolve(); 
         });
         stream.on('error', reject);
       }));

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

@@ -10,7 +10,7 @@
   				<span v-if="localPosition.country">{{localPosition.country}}</span>
     		</span>
 
-    		<span v-else @click="a => { store.globals.state.isOpenLocationPopup = true }"  class="t-semi t-main">
+    		<span v-else @click="a => { store.globals.state.isOpenLocationPopup = true }"  class="t-semi t-black cursor-pointer hover-t-underline">
 						The World
     		</span>
     	</h2>

package/src/modules/orders/store/shopcart.js

@@ -28,11 +28,12 @@ const actions = {
   setShopcart() {
     try {
       const storedShopcart = localStorage.getItem('shopcart');
+
       if (storedShopcart) {
         const shopcartData = JSON.parse(storedShopcart);
         state.positions = shopcartData.positions; // Восстанавливаем продукты
         state.organization = shopcartData.organization; // Восстанавливаем _id организации
-      }
+      } 
     } catch (error) {
       console.error(error);
       throw error;
@@ -74,11 +75,16 @@ const actions = {
 
     if (cartItemIndex > -1) {
       state.positions.splice(cartItemIndex, 1);
-
-      localStorage.setItem('shopcart', JSON.stringify(state.positions));
+      
+      // Сохраняем весь объект корзины, а не только позиции
+      localStorage.setItem('shopcart', JSON.stringify({
+        positions: state.positions,
+        organization: state.organization
+      }));
     }
   },
 
+
   decrementItemQuantity(_id) {
     const cartItem = state.positions.find(
       (item) => item._id === _id
@@ -92,10 +98,15 @@ const actions = {
         state.positions.splice(cartItemIndex, 1);
       }
 
-      localStorage.setItem('shopcart', JSON.stringify(state.positions));
+      // Сохраняем весь объект корзины, а не только позиции
+      localStorage.setItem('shopcart', JSON.stringify({
+        positions: state.positions,
+        organization: state.organization
+      }));
     }
   },
 
+
   incrementItemQuantity(_id) {
     const cartItem = state.positions.find(
       (item) => item._id === _id
@@ -104,10 +115,15 @@ const actions = {
     if (cartItem) {
       cartItem.quantity++;
 
-      localStorage.setItem('shopcart', JSON.stringify(state.positions));
+      // Сохраняем весь объект корзины, а не только позиции
+      localStorage.setItem('shopcart', JSON.stringify({
+        positions: state.positions,
+        organization: state.organization
+      }));
     }
   },
 
+
   resetShopcart({ state }) {
     state.positions = [];