@ozdao/prometheus-framework 0.2.34 → 0.2.36

package/src/components/Footer/Footer.vue

@@ -1,6 +1,6 @@
 <template>
 <div class="pd-t-zero pd-thin">
-  <footer class="bg-black t-white radius-small pd-thin">
+  <footer class="bg-grey t-black radius-big pd-thin">
 <!-- 
     <div id="top-footer" class="cols-3 section">
      
@@ -117,10 +117,10 @@
         email: 'Contact by email',
         // request: 'hello@weeder.delivery',
         time: "24 / 7 Seven days a week",
-        copyright: "2022 © Weeder Delivery. Proudly created with OZ DAO.",
+        copyright: "2024 © Weeder Delivery. Proudly created with OZ DAO.",
         pages: [],
         categories: [],
-        year: "2023",
+        year: "2024",
         heart: "❤",
         name: "Weeder",
         tagline: "Builded with love in"
@@ -136,7 +136,7 @@
         email: 'Связаться по email',
         // request: 'hello@weeder.delivery',
         time: "24 / 7 без перерывов",
-        copyright: "2022 © Weeder Delivery. С гордостью создано OZ DAO.",
+        copyright: "2024 © Weeder Delivery. С гордостью создано OZ DAO.",
         pages: [],
         categories: []
       }

package/src/components/Header/Header.vue

@@ -57,13 +57,14 @@
       name="prices"
       class="desktop-only t-semi pd-micro br-2px br-solid radius-extra br-black-transp-5"
     />
+
 		<Button
 			:submit="a => store.shopcart.actions.toggleShopcart()" 
 			:counter="store.shopcart.getters.cartTotalAmount" 
 			class="pd-zero mn-l-auto"
 			> 
 			<IconShopcart class="i-semi"/>
-
+			<!-- <div class="w-max p-small pos-absolute pos-t-100 pos-r-0">Product Added to Shopcart</div> -->
 		</Button>
 		
 		<Button 

package/src/components/Select/Select.vue

@@ -22,9 +22,10 @@
     <!-- Dropdown menu -->
     <transition mode="out-in" name="TransitionTranslateY">
       <ul 
-        v-if="showMenu" 
+        v-show="showMenu" 
         :class="$attrs.class"
         class="bs-black pos-absolute pos-t-100 pos-l-0 z-index-5 w-100 mn-t-thin"
+        style="min-width: max-content;"
       >
         <li @click.stop="selectOption(option)" v-for="option in optionsListed">
           <span v-if="option" class="w-100">

package/src/modules/chats/components/sections/ChatWindow.vue

@@ -7,7 +7,7 @@
         :message="message"
       />
     </div>
-    <input class="bg-main w-100 radius-big pd-small" placeholder="Enter your message" type="text" v-model="newMessage" @keyup.enter="sendMessage" />
+    <input class="bg-white w-100 radius-big pd-small" placeholder="Enter your message" type="text" v-model="newMessage" @keyup.enter="sendMessage" />
   </div>
 </template>
 
@@ -27,7 +27,9 @@ const sendMessage = () => {
       username: chatStore.state.username,
       chatId: chatStore.state.currentChatId
     };
+
     chatStore.methods.addMessage(message);
+    
     newMessage.value = '';
   }
 };

package/src/modules/chats/store/chat.store.js

@@ -19,7 +19,7 @@ const methods = {
         const message = JSON.parse(event.data);
 
         if (message.chatId === state.currentChatId) {
-          methods.addMessage(message);
+          state.messages.push(message);
         }
       };
       state.websocket.onerror = function(err) {
@@ -31,8 +31,6 @@ const methods = {
     state.messages = messages;
   },
   addMessage(message) {
-    state.messages.push(message);
-
     if (state.websocket) {
       state.websocket.send(JSON.stringify(message));
     }

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

@@ -73,6 +73,7 @@
       >
           Video in Hero Section
       </h5>
+      <p>Need to upload in webm format because of needs of optimization</p>
       <Upload 
         v-model:field="event.specialData.video"
         :placeholder="'Upload video'" 
@@ -125,7 +126,7 @@
       </h4>
 
       <Field 
-        v-model:field="event.specialData.titleMainGuest" 
+        v-model:field="event.specialData.guestTitle" 
         placeholder="Title for Main Guest section" 
         class="mn-b-thin w-100 bg-grey pd-medium radius-small" 
       />

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

@@ -65,12 +65,18 @@
         class="mn-b-thin t-white gap-big w-100 h-max o-hidden radius-big pd-big pos-relative bg-black"
       >
         <h2 class="mn-b-big w-100 t-center">Event Details</h2>
-        <div class="gap-big mn-b-thin cols-2">
+        <div 
+          class="gap-big mn-b-thin"
+          :class="{
+            'cols-2': event.specialData.guests.lenght > 0,
+            'cols-1': event.specialData.guests.lenght > 1
+          }"
+        >
           
           <SectionSpecialGuests 
+            v-if="event.specialData.guests.lenght > 0"
             :content="{
               title: 'Special Guests',
-              description:'Enjoy a festive dining experience  at The Commune, featuring a fine selection of dishes and drinks presented on your table throughout the evening.',
               guests: event.specialData.guests
             }"
           />

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

@@ -31,7 +31,7 @@
 		    	allowfullscreen="" 
 		    	allow="autoplay; clipboard-write; encrypted-media; fullscreen; picture-in-picture" 
 		    	loading="lazy"
-		    	class="mn-t-big"
+		    	class="mn-t-thin radius-big o-hidden"
 		    ></iframe>
 	    </div>
 

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

@@ -1,7 +1,6 @@
 <template>
 
   	<div class="o-hidden bg-black-transp-15 bg-blur-extra t-white pos-relative radius-big gap-zero pos-relative">
-  		<!-- <h3>Event Crew</h3> -->
   		<h3 class="t-center w-100 pd-small br-b br-white-transp-20 br-solid">{{content?.title}}</h3>
 	   	
 	   	<div style="max-height: 100%"  class="cols-1 gap-semi">

package/src/modules/events/store/events.js

@@ -28,9 +28,7 @@ const state = reactive({
   current: {
     _id: "",
     special: false,
-    specialData: {
-      subtitle: null
-    },
+    specialData: {},
     cover: "",
     url: "",
     status: "",
@@ -169,6 +167,28 @@ function clean () {
     url: "",
     phase: "",
     name: "",
+    special: false,
+    specialData: {
+      subtitle: '',
+      logos: [],
+      video: '',
+      ticketImage: '',
+      ticketLinkStripe: '',
+      ticketPrice: '',
+      guestTitle: '',
+      guestDescription: '',
+      guestFacebook: '',
+      guestInstagram: '',
+      guestTwitter: '',
+      guestTelegram: '',
+      guestSoundcloud: '',
+      guestSpotify: '',
+      guestVideo: '',
+      guests: [],
+      lineup: [],
+      lineupBackground: '',
+      previousVideo: ''
+    },
     tags: [],
     date: {
       start: null,

package/src/modules/globals/mixins/mixins.js

@@ -10,7 +10,7 @@ export const globalMixins = {
       let formattedNumber = number.toFixed(2).replace('.', ',').replace(/\B(?=(\d{3})+(?!\d))/g, ' ');
       return `${formattedNumber} ${currency}`;
     },
-    formatDate(d) {
+    formatDate(d, options = {}) {
       var fixedDate = new Date(d);
       var yyyy = fixedDate.getFullYear().toString();
       var mm = (fixedDate.getMonth() + 1).toString();
@@ -18,8 +18,39 @@ export const globalMixins = {
       var hh = fixedDate.getHours().toString();
       var minmin = fixedDate.getMinutes().toString();
 
-      return yyyy + '.' + (mm[1] ? mm : "0" + mm[0]) + '.' + (dd[1] ? dd : "0" + dd[0]) + " в " + (hh[1] ? hh : "0" + hh[0]) + ':' + (minmin[1] ? minmin : "0" + minmin[0]);
+      // Параметры для форматирования
+      var format = {
+        dateOnly: options.dateOnly || false,
+        timeOnly: options.timeOnly || false,
+        dayMonth: options.dayMonth || false,
+        dayTime: options.dayTime || false,
+        monthYear: options.monthYear || false,
+        yearOnly: options.yearOnly || false,
+        custom: options.custom || ""
+      };
+
+      // Формирование строки в зависимости от параметров
+      if (format.dateOnly) {
+        return yyyy + '.' + (mm[1] ? mm : "0" + mm[0]) + '.' + (dd[1] ? dd : "0" + dd[0]);
+      } else if (format.timeOnly) {
+        return (hh[1] ? hh : "0" + hh[0]) + ':' + (minmin[1] ? minmin : "0" + minmin[0]);
+      } else if (format.dayMonth) {
+        return (dd[1] ? dd : "0" + dd[0]) + '.' + (mm[1] ? mm : "0" + mm[0]);
+      } else if (format.dayTime) {
+        return (dd[1] ? dd : "0" + dd[0]) + " в " + (hh[1] ? hh : "0" + hh[0]) + ':' + (minmin[1] ? minmin : "0" + minmin[0]);
+      } else if (format.monthYear) {
+        return (mm[1] ? mm : "0" + mm[0]) + '.' + yyyy;
+      } else if (format.yearOnly) {
+        return yyyy;
+      } else if (format.custom) {
+        // Пользователь может определить свой формат
+        return format.custom.replace("yyyy", yyyy).replace("mm", (mm[1] ? mm : "0" + mm[0])).replace("dd", (dd[1] ? dd : "0" + dd[0])).replace("hh", (hh[1] ? hh : "0" + hh[0])).replace("min", (minmin[1] ? minmin : "0" + minmin[0]));
+      }
+
+      // Формат по умолчанию
+      return (hh[1] ? hh : "0" + hh[0]) + ':' + (minmin[1] ? minmin : "0" + minmin[0]) + ", " + yyyy + '.' + (mm[1] ? mm : "0" + mm[0]) + '.' + (dd[1] ? dd : "0" + dd[0]);
     },
+
     normalizeUrlParam(param) {
       if (!param) param = ''
 

package/src/modules/globals/store/globals.js

@@ -139,6 +139,7 @@ function setError(error) {
   state.error.show = true;
 
   setTimeout(() => state.error.show = false, 3000);
+
 }
 
 function invertColors(variableNames, originalColors) {

package/src/modules/landing/components/sections/HeroGovernance.vue

@@ -0,0 +1,156 @@
+<script setup>
+	import { useRouter } from 'vue-router'
+	import { useI18n } from 'vue-i18n'
+
+	const props = defineProps({
+	  textData: {
+	    type: Object,
+	    default: () => ({
+	      messages: {
+	      	en: {
+				    TITLE: "Smoke Weed Every Day &<b> Get A Slice Of The Pie</b>",
+				    DESCRIPTION: "Earn Weeder Token and Get part of the profits of Weeder Delivery. The more tokens you have, the bigger your cut of the profits will be. So what are you waiting for?",
+				    ACTION: "Open Marketplace →",
+				    SUBACTION: "Sign Up To Start"
+			    }
+			  }
+			})
+		}
+	})
+
+	const { t } = useI18n(props.textData)
+</script>
+
+
+<template>
+	<div 
+		id="heroGovernance" 
+		class="pd-thin"
+	>
+
+		<div 
+			class="pos-relative bg-black o-hidden t-white t-center pd-extra radius-big flex-column flex-center flex"
+		>
+			<div class="sheen h-5r mn-b-small radius-extra o-hidden pos-relative ">
+		  	<img src="/logo/wdt.svg" class="w-100 h-100">
+		  </div>
+
+			<h1 
+				class="w-max-35r mn-b-medium" 
+				v-html="t('TITLE')"
+			/>
+
+			<p 
+				class="w-max-40r mn-b-big t-transp p-big" 
+				v-html="t('DESCRIPTION')"
+			/>
+
+			<div 
+				class="t-white gap-small cols-2-fit-content"
+			>
+				<router-link 
+					:to="{
+						name: 'Sign In'
+					}"
+					class="w-max bg-light t-dark br-light button"
+					v-html="t('SUBACTION')"
+				/>
+
+				<router-link  
+					:to="{
+						name: 'Marketplace'
+					}"
+					class="w-max bg-dark t-white button"
+					v-html="t('ACTION')"
+				/>
+			</div>
+
+			<div class="w-100 h-100 pos-absolute pos-t-0 pos-r-0 z-index-0 grid ">
+				<div class="grid-lines"></div>
+			</div>
+
+		</div>
+
+	</div>
+</template>
+
+<style lang="scss">
+	.sheen:after {
+	content:'';
+  top:0;
+  left: -25%;
+	transform:translateX(100%);
+	width:100%;
+	height:220px;
+	position: absolute;
+	z-index:1;
+	animation: slide 3s infinite;
+	 
+  /* 
+  CSS Gradient - complete browser support from http://www.colorzilla.com/gradient-editor/ 
+  */
+  background: -moz-linear-gradient(left, rgba(255,255,255,0) 0%, rgba(255,255,255,0.8) 50%, rgba(128,186,232,0) 99%, rgba(125,185,232,0) 100%); /* FF3.6+ */
+	background: -webkit-gradient(linear, left top, right top, color-stop(0%,rgba(255,255,255,0)), color-stop(50%,rgba(255,255,255,0.8)), color-stop(99%,rgba(128,186,232,0)), color-stop(100%,rgba(125,185,232,0))); /* Chrome,Safari4+ */
+	background: -webkit-linear-gradient(left, rgba(255,255,255,0) 0%,rgba(255,255,255,0.8) 50%,rgba(128,186,232,0) 99%,rgba(125,185,232,0) 100%); /* Chrome10+,Safari5.1+ */
+	background: -o-linear-gradient(left, rgba(255,255,255,0) 0%,rgba(255,255,255,0.8) 50%,rgba(128,186,232,0) 99%,rgba(125,185,232,0) 100%); /* Opera 11.10+ */
+	background: -ms-linear-gradient(left, rgba(255,255,255,0) 0%,rgba(255,255,255,0.8) 50%,rgba(128,186,232,0) 99%,rgba(125,185,232,0) 100%); /* IE10+ */
+	background: linear-gradient(to right, rgba(255,255,255,0) 0%,rgba(255,255,255,0.8) 50%,rgba(128,186,232,0) 99%,rgba(125,185,232,0) 100%); /* W3C */
+	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#00ffffff', endColorstr='#007db9e8',GradientType=1 ); /* IE6-9 */
+}
+
+/* animation */
+
+@keyframes slide {
+	0% {	
+		transform:translateX(-00%); 
+		opacity: 0;
+	}
+	20% {
+		opacity: 1
+	}
+	80% {
+		opacity: 1
+	}
+	100% {
+		transform:translateX(100%); 
+			opacity: 0
+	}
+}
+	
+
+	.grid {
+  perspective: 450px;
+  background-size: cover;
+}
+
+.grid-lines {
+  width: 100%;
+  height: 200%;
+  background-image: linear-gradient(to right, rgba(255, 255, 255, 0.1) 1px, transparent 0), linear-gradient(to bottom, rgba(255, 255, 255, 0.1) 1px, transparent 0);
+  background-size: 45px 30px;
+  background-repeat: repeat;
+  transform-origin: 100% 0 0;
+  animation: play 15s linear infinite;
+}
+
+@keyframes play {
+  0% {
+    transform: rotateX(45deg) translateY(-50%);
+  }
+  100% {
+    transform: rotateX(45deg) translateY(0);
+  }
+}
+
+ @media screen and (max-width: 1025px) {
+    #mobileApp {
+      text-align: center;
+      > section {
+        flex-direction: column;
+        > div {
+          order: 1;
+        }
+      }
+    }
+  }
+</style>

package/src/modules/marketplace/components/sections/Filters.vue

@@ -2,6 +2,7 @@
 	<div class="z-index-1 pos-relative radius-big bg-black t-white pd-medium flex-v-center flex-nowrap flex">
 		<!-- <p class="t-semi radius-extra uppercase p-medium mn-r-thin">Filter by</p> -->
 		<Dropdown 
+      id="fitlerCategory"
 			:label="t('categoriesTitle')" 
 			class="cursor-pointer mn-r-small br-solid br-2px br-white pd-thin t-semi radius-extra uppercase p-medium"
 			:class="[
@@ -22,6 +23,7 @@
      </Dropdown>
 
      <Dropdown 
+       id="fitlerPrice"
      	:label="t('filters.price.title')" 
      	class="cursor-pointer  mn-r-small br-solid br-2px br-white pd-thin t-semi radius-extra uppercase p-medium"
      	:class="[
@@ -43,6 +45,7 @@
 
      <Dropdown 
      	label="Delivery" 
+      id="fitlerDelivery"
      	class="cursor-pointer mn-r-auto br-solid br-2px br-white pd-thin t-semi radius-extra uppercase p-medium"
      	:class="[
         store.marketplace.state.filter.delivery.length > 0 ? 'bg-white t-black' : ''

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

@@ -5,6 +5,7 @@ const marketplace = [
   {
     path: 'marketplace',
     component: layoutMarketplace,
+    name: 'Marketplace',
     meta: {
       title: {
         en: 'Marketplace',

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

@@ -2,9 +2,11 @@
   <div class="bg-grey radius-medium w-100">
     <h3 class="pd-medium">Tracking History</h3>
     <div v-for="status in statuses" :key="status.value" class="w-100 br-t br-solid br-black-transp-10 pd-medium flex-v-center flex-nowrap flex">
-      <div v-if="isStatusInHistory(status.value)" class="flex-center flex i-big radius-extra br-solid br-2px br-black-transp-10 mn-r-small">✔</div>
+      <div class="flex-center flex i-big radius-extra br-solid br-2px br-black-transp-10 mn-r-small">
+        <span  v-if="isStatusInHistory(status.value)">✔</span>
+      </div>
       <p class="h4 w-8r">{{status.name}}</p>
-      <button :disabled="!isNextPossibleStatus(status.value)" @click="setStatus(status)" class="mn-l-auto bg-main button radius-big">Set status</button>
+      <button v-if="edit" :disabled="!isNextPossibleStatus(status.value)" @click="setStatus(status)" class="mn-l-auto bg-main button radius-big">Set status</button>
     </div>
   </div>
 </template>
@@ -18,6 +20,9 @@ const props = defineProps({
   },
   statusCurrent: {
     type: String
+  },
+  edit: {
+    type: Boolean
   }
 })
 
@@ -77,7 +82,7 @@ const isNextPossibleStatus = (statusValue) => {
 
 // Функция установки нового статуса
 const setStatus = async (newStatus) => {
-  console.log(status)
+  // console.log(status)
   // orders.state.current.status = status.value
   // await orders.actions.update(orders.state.current)
 }

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

@@ -119,27 +119,25 @@
   let order = ref({})
   // Replace store orders.actions with your orders.actions
   onMounted(async () => {
-   
-
-    await orders.actions.fetchOrder(route.params.order) // Implement this action in your store
-
-    order.value = orders.state.current
-
-     // Replace Vuex orders.actions with your orders.actions
+    // Replace Vuex orders.actions with your orders.actions
     try {
       const productsResponse = await products.actions.read({
-        organization: orders.state.current.organization
+        organization: '65141c476cf9860013b49f6d'
       });
       console.log(productsResponse)
       Products.value = productsResponse;
     } catch (error) {
       console.error('error');
     }
+
+    await orders.actions.fetchOrder(route.params.id) // Implement this action in your store
+
+    order.value = orders.state.current
   })
 
 
   function saveItemList() {
-    orders.actions.updateOrderpositions(route.params.order) // Replace Vuex action with your action
+    orders.actions.updateOrderpositions(route.params.id) // Replace Vuex action with your action
   }
 
   function changeEdit(index) {
@@ -147,7 +145,7 @@
   }
 
   function resetOrderList() {
-    orders.actions.fetchOrder(route.params.order) // Replace Vuex action with your action
+    orders.actions.fetchOrder(route.params.id) // Replace Vuex action with your action
   }
 
   function changeAdd() {
@@ -171,4 +169,4 @@
 .vue-select-header {
   height: 3rem;
 }
-</style>
+</style>