@ozdao/prometheus-framework 0.2.92 → 0.2.93

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

@@ -0,0 +1,164 @@
+<template>
+  <section id="viewpoint" class="br-b-white hero" itemscope itemtype="http://schema.org/BarOrPub">
+    
+    <div class="cols-2 gap-thin">
+      <!-- Left col -->
+      <div class="col-1 flex-justify flex-column flex o-hidden" itemprop="description">
+        
+
+        <div class="pd-big bg-main mn-b-thin  radius-big">
+	        <h1 class="mn-b-small">
+	        	<span class="text-fade-in">
+							<span class="text-splitted" v-html="t('viewpoint.title')"/>
+						</span>
+	        </h1>
+	        
+	        <p class="p-big t-transp">{{ t('viewpoint.description') }}</p>
+	      </div>
+
+        <div class="pd-big bg-black t-white radius-big">
+          <p class="p-big mn-b-small" itemprop="name">{{ t('contacts.name') }}</p>
+          
+          <address class="d-block mn-b-small" itemprop="address" itemscope itemtype="http://schema.org/PostalAddress">
+            <a :href="t('contacts.addressLink')" target="_blank" rel="noopener"> 
+              <span itemprop="streetAddress">{{ t('contacts.streetAddress') }}</span>, 
+              <span itemprop="addressLocality">{{ t('contacts.addressLocality') }}</span>, 
+              <span itemprop="addressRegion">{{ t('contacts.addressRegion') }}</span>, 
+              <span itemprop="postalCode">{{ t('contacts.postalCode') }}</span>
+            </a>
+          </address>
+          
+          <span class="d-block mn-b-small" itemprop="telephone">
+            <a :href="'tel:' + t('contacts.telephone')" class="t-black">{{ t('contacts.telephone') }}</a>
+          </span>
+
+          <span class="d-block mn-b-medium" itemprop="email">
+            <a :href="'mailto:' + t('contacts.email')" class="t-black">{{ t('contacts.email') }}</a>
+          </span>
+
+          <a :href="t('contacts.addressLink')" target="_blank" rel="noopener" class="button hover-scale-1 t-black bg-main">
+            {{ t('contacts.seeongoogle') }}
+          </a>
+        </div>
+
+			</div>
+      <!-- Right col -->
+      <div class="col-2 w-100 flex">
+      	<div class="pos-relative radius-big video-wrapper w-100 h-100 o-hidden">
+      		<div class="video-gradient"></div>
+    			<video ref="videoElement" style="object-fit: cover; position: absolute;" class="video-height" preload autoplay muted loop playsinlineclass playsinline src="/videos/farming.mp4" itemprop="video" type="video/mp4" ></video>
+      	</div>
+      </div>
+      
+    </div>
+  </section>
+</template>
+
+
+<script setup>
+	/////////////////////////////
+	// COMPONENT DEPENDENCIES
+	/////////////////////////////
+	import { ref, onMounted } from 'vue';
+	import { useI18n } from 'vue-i18n'
+	
+	let text = { 
+		messages: {
+		  "en":{
+		    "viewpoint":{
+		      "title":"Increase Your Earnings from Canna-Business with Weeder Farms",
+		      "description":"Using Top-Tier Technology to Streamline Your Cannabis Farming Operations"
+		    },
+		    "contacts": {
+		    	"name": "Запишитесь на бесплатную консультацию и узнайте как увеличить ваш доход на 30%",
+		    	"seeongoogle": "Book a free consultation"
+		    }
+		  },
+		  "ru":{
+		    "viewpoint":{
+		      "title":"Живописная Терраса и Бар с Видом на Море",
+		      "description":"Откройте для себя всё лучшее, что может предложить Пхукет, в The Commune, стильном баре и террасе на пляже Карон. Насладитесь впечатляющим видом на море, попивая изысканные коктейли и пробуя превосходные блюда из нашего меню."
+		    }
+		  }
+		}
+	}
+
+	const { t } = useI18n(text)
+	/////////////////////////////
+	// CREATED
+	/////////////////////////////
+	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();
+    }
+	} 
+  
+	onMounted(() => {
+		checkAndPlayVideo()
+		playVid()
+			})
+</script>
+
+<style lang="scss">
+	.video-height {
+		  width: 100%;
+	    min-height: 100%;
+	    max-height: 45vh;
+	    object-fit: cover;
+	}
+
+	@media screen and (max-width: 1024px) {
+		.video-wrapper  {
+			position: absolute;
+			left: 0;
+			top: 0;
+			border-radius: 0 !important; 
+
+			.video-gradient {
+				position: absolute;
+				pointer-events: none;
+				top: 7px;
+				left: 0;
+				width: 100%;
+				height: 100%;
+
+				background: linear-gradient(to bottom, transparent, rgba(var(--white),1));
+				z-index: 1;
+			}
+		}
+
+		#viewpoint {
+			.cols-2 {
+		    .col-1 {
+		     	order: 2;
+		     	border: 0;
+		    }
+
+		    .col-2 {
+		      order: 1;
+		      min-height: 33vh
+		    }
+		  }
+	  }
+	}
+</style>
+

package/src/modules/landing/router/landing.js

@@ -18,6 +18,17 @@ const landing = [
     },
     component: () => import(/* webpackChunkName: 'Governance' */ '@pf/src/modules/landing/components/pages/Governance.vue'),
   },
+  {
+    path: 'farming',
+    name: 'Farming',
+    meta: {
+      title: {
+        en: 'Governance',
+        ru: 'Управления'
+      }
+    },
+    component: () => import(/* webpackChunkName: 'Governance' */ '@pf/src/modules/landing/components/pages/Farming.vue'),
+  },
   {
     path: 'pages/:url',
     name: 'Page',

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

@@ -1,10 +1,14 @@
 <template>
-	<div class="z-index-1 pos-relative radius-big bg-black t-white pd-medium flex-v-center flex-nowrap flex o-scroll">
+	<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> -->
+    <div class="
+     mn-r-auto pd-micro gap-micro br-solid br-2px br-white  radius-extra flex-nowrap flex
+     "
+    >
 		<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="cursor-pointer pd-thin t-semi radius-extra uppercase p-medium"
 			:class="[
         store.marketplace.state.filter.categories.length > 0 ? 'bg-white t-black' : ''
       ]"
@@ -22,10 +26,10 @@
      	</div>
      </Dropdown>
 
-     <Dropdown 
-       id="fitlerPrice"
+    <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="cursor-pointer pd-thin t-semi radius-extra uppercase p-medium"
      	:class="[
         store.marketplace.state.filter.prices.length > 0 ? 'bg-white t-black' : ''
       ]"
@@ -43,29 +47,28 @@
       </div>
      </Dropdown>
 
-     <Dropdown 
-     	label="Delivery" 
+    <Dropdown 
+   	  label="Delivery" 
       id="fitlerDelivery"
-     	class="cursor-pointer mn-r-small br-solid br-2px br-white pd-thin t-semi radius-extra uppercase p-medium"
+     	class="cursor-pointer pd-thin t-semi radius-extra uppercase p-medium"
      	:class="[
         store.marketplace.state.filter.delivery.length > 0 ? 'bg-white t-black' : ''
       ]"
-     >
-      <div class="w-100 h-100 radius-semi o-hidden bg-black">
-      	<Checkbox 
-  				v-for="(delivery, index) in delivery"
-          :label="delivery.label"
-          name="prices"
-          :value="delivery.value"
-          class="cursor-pointer  w-100 mn-t-small bg-black t-white radius-small pd-small"
-          :radio="store.marketplace.state.filter.delivery"
-          @update:radio="event => store.marketplace.state.filter.delivery = event"
-        />
-      </div>
-     </Dropdown>
-		<!-- Reset filter -->
-		<p class="t-semi radius-extra uppercase p-medium mn-r-thin t-nowrap">Sort by</p>
+    >
+    <div class="w-100 h-100 radius-semi o-hidden bg-black">
+    	<Checkbox 
+				v-for="(delivery, index) in delivery"
+        :label="delivery.label"
+        name="prices"
+        :value="delivery.value"
+        class="cursor-pointer  w-100 mn-t-small bg-black t-white radius-small pd-small"
+        :radio="store.marketplace.state.filter.delivery"
+        @update:radio="event => store.marketplace.state.filter.delivery = event"
+      />
+    </div>
 
+   </Dropdown>
+    </div>
     <div class="flex-stretch flex-nowrap gap-thin flex">
   		<Select 
         :options="['products','distance','popularity']"

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

@@ -52,6 +52,14 @@
         </div>
 
       </div>
+
+     <!--  <div class="flex-nowrap flex">
+        <button @click="openStatusPopup" class="w-100 bg-black t-white button button-small">
+          Confirm
+        </button>
+
+      </div> -->
+
     </div>
   </div>
 

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

@@ -1,17 +1,22 @@
 <template>
   <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-for="status in statusDetailedHistory" :key="status" class="w-100 br-t br-solid br-black-transp-10 pd-medium flex-v-center flex-nowrap flex">
       <div class="flex-center flex i-big radius-extra br-solid br-2px br-black-transp-10 mn-r-small">
-        
         <IconCheckmark
-          v-if="isStatusInHistory(status.value)"
+          v-if="isStatusInHistory(status.status)"
           class="i-medium"
         />
       </div>
-      <p class="h4 w-8r">{{status.name}}</p>
+
+      <div>
+        <p class="h4 w-8r">{{status.status}}</p>
+        <p v-if="status.timestamp" class="h5 w-8r">{{formatDate(status.timestamp)}}</p>
+      </div>
+      
+      <p class="h5 w-8r">{{status._id}}</p>
        <!-- <button v-if="status.value === 'delivered'"  @click="printReceipt()" class="mn-l-auto bg-main button radius-big">Print</button> -->
-      <button v-if="edit" :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)" @click="setStatus(status)" class="mn-l-auto bg-main button radius-big">Set status</button>
     </div>
   </div>
 </template>
@@ -32,46 +37,22 @@ const props = defineProps({
   },
   edit: {
     type: Boolean
+  },
+  statuses: {
+    type: Array
   }
 })
 
-// Инициализация состояния компонента
-const statuses = ref([
-  {
-  value: 'created',
-  name: 'Received',
-  nextstatus: 'Confirming order...',
-  description: 'Your order has been successfully created. Our manager will contact you within five minutes to confirm your order.'
-  },{
-    value: 'confirming',
-    name: 'Confirming',
-    nextstatus: 'Confirming order...',
-    description: 'Your order has been confirmed. We are now processing your items and preparing them for shipment.'
-  },{
-    value: 'confirmed',
-    name: 'Confirmed',
-    nextstatus: 'Order is confirmed. Packing order...',
-    description: 'Your order has been confirmed. We are now processing your items and preparing them for shipment.'
-  },{
-    value: 'packing',
-    name: 'Packing',
-    nextstatus: 'Packing order...',
-    description: 'Your order is now awaiting shipment. Once shipped, you will receive a notification with tracking information.'
-  },{
-    value: 'packed',
-    name: 'Packed',
-    nextstatus: 'Delivering order...',
-    description: 'Your order is now awaiting shipment. Once shipped, you will receive a notification with tracking information.'
-  },{
-    value: 'in delivery',
-    name: 'Delivering',
-    description: 'Your order is currently in transit. Our delivery team is working hard to get your items to you as soon as possible.'
-  },{
-    value: 'delivered',
-    name: 'Delivered',
-    description: 'Congratulations! Your order has been successfully delivered. If you have any concerns or feedback, feel free to contact us.'
-  }
-]);
+const statusDetailedHistory = props.statuses.map(status => {
+  const historyEntry = props.statusHistory.find(entry => entry.status === status);
+
+  return {
+    status,
+    timestamp: historyEntry ? historyEntry.timestamp : 'N/A',
+    inHistory: !!historyEntry,
+    _id: historyEntry ? historyEntry._id : null
+  };
+});
 
 const statusCurrent = ref(props.statusCurrent);
 const statusHistory = ref(props.statusHistory);
@@ -83,20 +64,11 @@ const isStatusInHistory = (statusValue) => {
 
 // Проверка, является ли статус следующим возможным действием
 const isNextPossibleStatus = (statusValue) => {
-  const currentIndex = statuses.value.findIndex(status => status.value === statusCurrent.value);
-  console.log(status.status === statusCurrent.value)
-  console.log(statusCurrent.value)
-   console.log(status)
+  const currentIndex = props.statuses.findIndex(status => status === statusCurrent.value);
   const nextIndex = currentIndex + 1;
-  return statuses.value[nextIndex] && statuses.value[nextIndex].value === statusValue;
+  return props.statuses[nextIndex] && props.statuses[nextIndex] === statusValue;
 };
 
-// Функция установки нового статуса
-const setStatus = async (newStatus) => {
-  // console.log(status)
-  // orders.state.current.status = status.value
-  // await orders.actions.update(orders.state.current)
-} 
 
 const printerIP = ref('192.168.1.197');
 const printerPort = ref(9100);

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

@@ -210,7 +210,7 @@
 <script setup="props">
 	import { computed, ref, onMounted  } from 'vue'
 	import { useRouter, useRoute } from 'vue-router'
-	// Block
+	
 	import CardOrderItem  from '@pf/src/modules/orders/components/blocks/CardOrderItem.vue'
 	import CardOrganization from '@pf/src/modules/organizations/components/blocks/CardOrganization.vue'
 
@@ -242,7 +242,6 @@
 	    _id: order.value?.owner.target._id,
 	    location: globals.state.position?.location,
 	  });
-
 	})
 
 	let cartTotalPrice = computed(() => {
@@ -262,10 +261,7 @@
 
 	    const product = productsOrganization.value.find(product => product._id === _id)
 
-	    console.log(product)
-	    console.log(productsOrganization)
-
-	    return {
+		    return {
 	      name: product.name,
 	      images: product.images,
 	      price: product.price,