@ozdao/prometheus-framework 0.2.112 → 0.2.113

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

@@ -3,25 +3,25 @@
   <h2 class="mn-auto pd-t-big pd-b-big t-center" v-html="t('title')"/>
   
   <div class="cols-4 gap-thin">
-    <router-link to="/marketplace" class="t-center cursor-pointer hover-scale-0 transition-ease-in pd-big bg-grey t-black radius-big">
+    <router-link to="/marketplace" class="t-center cursor-pointer hover-scale-0 transition-ease-in pd-big bg-light t-black radius-big">
       <img src="/sections/1.png" alt="" class="section-image">
       <h3 class="mn-b-medium">{{t('section1.title')}}</h3>
       <p class="t-transp">{{t('section1.text')}}</p>
     </router-link >
 
-    <router-link to="/spots" class="t-center cursor-pointer hover-scale-0 transition-ease-in pd-big bg-grey t-black radius-big">
+    <router-link to="/spots" class="t-center cursor-pointer hover-scale-0 transition-ease-in pd-big bg-light t-black radius-big">
       <img src="/sections/2.png" alt="" class="section-image">
       <h3 class="mn-b-medium">{{t('section2.title')}}</h3>
       <p class="t-transp">{{t('section2.text')}}</p>
     </router-link>
 
-    <router-link to="/community" class="t-center cursor-pointer hover-scale-0 transition-ease-in pd-big bg-grey t-black radius-big">
+    <router-link to="/community" class="t-center cursor-pointer hover-scale-0 transition-ease-in pd-big bg-light t-black radius-big">
       <img src="/sections/3.png" alt="" class="section-image">
       <h3 class="mn-b-medium">{{t('section3.title')}}</h3>
       <p class="t-transp">{{t('section3.text')}}</p>
     </router-link>
 
-    <router-link to="/governance" class="t-center cursor-pointer hover-scale-0 transition-ease-in pd-big bg-grey t-black radius-big">
+    <router-link to="/governance" class="t-center cursor-pointer hover-scale-0 transition-ease-in pd-big bg-light t-black radius-big">
       <img src="/sections/4.png" alt="" class="section-image">
       <h3 class="mn-b-medium">{{t('section4.title')}}</h3>
       <p class="t-transp">{{t('section4.text')}}</p>

package/src/modules/{orders → landing}/components/sections/SubscribeNewsletter.vue

@@ -8,8 +8,6 @@
         </header>
 
         <div class="z-index-1 w-100 flex-nowrap flex"> 
-
-            <!-- v-model:field="store.applications.state.form.data.email"  -->
           <FieldBig 
             :input="email" 
             :typingSpeed="75"

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

@@ -10,20 +10,20 @@
 
     <div class="cols-3 gap-thin">
 
-      <div class="w-100 pd-medium bg-grey radius-big">
-        <img class="radius-medium bg-grey h-max-20r object-fit-cover w-100 mn-b-medium" src="@/assets/images/howitworks/step1.png"> 
+      <div class="w-100 pd-medium bg-light radius-big">
+        <img class="radius-medium bg-light h-max-20r object-fit-cover w-100 mn-b-medium" src="@/assets/images/howitworks/step1.png"> 
         <h3 class="mn-b-medium">{{t('steps.step1.headline')}}</h3>
         <p class="t-transp">{{t('steps.step1.text')}}</p>
       </div>
 
-      <div class="w-100 pd-medium bg-grey radius-big">
-        <img class="radius-medium bg-grey  h-max-20r object-fit-cover w-100 mn-b-medium" src="@/assets/images/howitworks/step2.png"> 
+      <div class="w-100 pd-medium bg-light radius-big">
+        <img class="radius-medium bg-light  h-max-20r object-fit-cover w-100 mn-b-medium" src="@/assets/images/howitworks/step2.png"> 
         <h3 class="mn-b-medium">{{t('steps.step2.headline')}}</h3>
         <p class="t-transp">{{t('steps.step2.text')}}</p>
       </div>
 
-      <div class="w-100 pd-medium bg-grey radius-big">
-        <img class="radius-medium bg-grey  h-max-20r object-fit-cover w-100 mn-b-medium" src="@/assets/images/howitworks/step3.png">
+      <div class="w-100 pd-medium bg-light radius-big">
+        <img class="radius-medium bg-light  h-max-20r object-fit-cover w-100 mn-b-medium" src="@/assets/images/howitworks/step3.png">
         <h3 class="mn-b-medium">{{t('steps.step3.headline')}}</h3>
         <p class="t-transp">{{t('steps.step3.text')}}</p>
       </div>

package/src/modules/landing/landing.client.js

@@ -1,5 +1,6 @@
 // Importing Vue components
 import MobileApp from './components/sections/MobileApp.vue';
+import SubscribeNewsletter from './components/sections/SubscribeNewsletter.vue';
 import SectionFeatures from './components/sections/SectionFeatures.vue';
 
 import FloatingImages from './components/elements/FloatingImages.vue';
@@ -7,6 +8,7 @@ import AnimatedGrid from './components/elements/AnimatedGrid.vue';
 
 export {
   MobileApp,
+  SubscribeNewsletter,
   SectionFeatures,
   FloatingImages,
   AnimatedGrid

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

@@ -1,7 +1,7 @@
 const landing = [
   {
     path: '',
-    name: "Home Page",
+    name: "Home",
     meta: {
       title_hide: true
     },

package/src/modules/legal/components/pages/Legal.vue

@@ -2,7 +2,7 @@
 	<div 
 		class="for-transition w-100 pd-medium"
 	>
-		<div class="bg-grey radius-medium pd-medium mn-b-small">
+		<div class="bg-light radius-medium pd-medium mn-b-small">
 			<h2 class="mn-b-small">About No More Snow CO., LTD.</h2>
 			<p class="mn-b-small">
 				Welcome to NO MORE SNOW CO., LTD.! We are dedicated to providing top-notch services and creating a trustworthy environment for our users. Your trust and safety are our priority, and we are committed to being transparent about our policies and practices.
@@ -18,7 +18,7 @@
 			</p>
 		</div>
 
-		<Menu class="bg-grey">
+		<Menu class="bg-light">
 			<MenuItem @click="router.push({name: 'Terms of Use'})" class="cursor-pointer">
 				<span>Terms of Use</span>
 			</MenuItem> 

package/src/modules/legal/components/pages/legal/Cookies.vue

@@ -1,6 +1,6 @@
 <template>
         <div class="pd-medium">
-                <div class="pd-big bg-grey radius-big">
+                <div class="pd-big bg-light radius-big">
                         <h1>Cookie Policy</h1>
             <div><br></div>
             <div>

package/src/modules/legal/components/pages/legal/EULA.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="pd-medium">
-        <div class="pd-big bg-grey radius-big">
+        <div class="pd-big bg-light radius-big">
 
       <div  style="text-align: left;">
         <h1>EULA</h1>

package/src/modules/legal/components/pages/legal/Privacy.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="pd-medium">
-		<div class="pd-big bg-grey radius-big">
+		<div class="pd-big bg-light radius-big">
 		  	<h1>Privacy Policy</h1>
 		  <div><br></div>
 		  <div>

package/src/modules/legal/components/pages/legal/Terms.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="pd-medium">
-		<div class="pd-big bg-grey radius-big">
+		<div class="pd-big bg-light radius-big">
 		   <div align="center" style="text-align: left;">
 	            <h1>Terms of Use</h1>
 		      <div class="MsoNormal" style="line-height: 1.5;"><br></div>

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

@@ -1,14 +1,18 @@
 <template>
 	<div style="min-height: 100%;" class="h-min-100 pd-thin">
-		<header class="mn-b-thin radius-big bg-main pd-medium flex-v-center t-left flex-nowrap flex">
-    	<h2 class="t-left">
+		<header class="">
+    	<h2 class="t-semi  mn-b-thin t-left">
     		<span class="">Weed in </span>
 
-    		<span @click="a => { store.globals.state.isOpenLocationPopup = true }" v-if="localPosition.city || localPosition.state || localPosition.country" class="t-semi t-black cursor-pointer hover-t-underline">
-  				<span v-if="localPosition.city">{{localPosition.city}}, </span>
-  				<span v-if="localPosition.state">{{localPosition.state}}, </span>
-  				<span v-if="localPosition.country">{{localPosition.country}}</span>
-    		</span>
+    		<p 
+    			v-if="localPosition.city || localPosition.state || localPosition.country"
+    			@click="a => { store.globals.state.isOpenLocationPopup = true }" 
+    			class="h2 pd-l-small pd-r-small pd-t-micro pd-b-micro d-inline-block t-semi radius-extra bg-main t-black cursor-pointer "
+    		>
+  				<template v-if="localPosition.city">{{localPosition.city}}, </template>
+  				<template v-if="localPosition.state">{{localPosition.state}}, </template>
+  				<template v-if="localPosition.country">{{localPosition.country}}</template>
+    		</p>
 
     		<span v-else @click="a => { store.globals.state.isOpenLocationPopup = true }"  class="t-semi t-black cursor-pointer hover-t-underline">
 						The World
@@ -16,21 +20,14 @@
     	</h2>
 		</header>
 
-		<Filters
+		<!-- <Filters
 			class="mn-b-thin"
-		/>
+		/> -->
 
-		<BlockSearch 
-			@search="updateSearch"
-		/>
-		
 		<!-- Catalog wrapper -->
 		<div class="cols-1 gap-thin pd-thin">
-			<!-- Products section -->
 			<router-view  v-slot="{ Component, route }">
-				<transition  name="scaleIn" mode="out-in">
-					<component ref="page" :key="route" :localPosition="localPosition" :is="Component" />
-				</transition>
+				<component ref="page" :key="route" :localPosition="localPosition" :is="Component" />
 			</router-view>
 		</div>
 	</div>
@@ -48,8 +45,6 @@
 	import BlockSearch from '@pf/src/modules/globals/components/blocks/BlockSearch.vue'
 
 	import Filters from '@pf/src/modules/marketplace/components/sections/Filters.vue'
-	import IconSearch from '@pf/src/modules/icons/navigation/IconSearch.vue'
-	import Field from '@pf/src/components/Field/Field.vue'
 
 	// Accessing router and store
 	const store = useStore()
@@ -75,42 +70,35 @@
 	    .replace(/[^a-z0-9-]/g, '');
 	}
 
-	function updateSearch(search) {
-		let query = { ...route.query}
-		
-		query.search = search
-	  
-	  router.push({ query });
-	}
-
-	onMounted(async () => {
-	  if (route.params) {
-	    // Загружаем новые значения из параметров маршрута в состояние
-	    let newState = {
-	      country: denormalizeUrlParam(route.params.country),
-	      state: denormalizeUrlParam(route.params.state),
-	      city: denormalizeUrlParam(route.params.city),
-	    };
+	if (route.params) {
+    // Загружаем новые значения из параметров маршрута в состояние
+    let newState = {
+      country: denormalizeUrlParam(route.params.country),
+      state: denormalizeUrlParam(route.params.state),
+      city: denormalizeUrlParam(route.params.city),
+    };
 
-		  // Обновляем глобальное состояние
-		  localPosition.value = newState;
-		}
+	  // Обновляем глобальное состояние
+	  localPosition.value = newState;
+	}
 
-		if (route.query) {
-		 	const query = route.query;
+	if (route.query) {
+	 	const query = route.query;
 
-		  const newFilterValue = {
-		    categories: query.categories ? query.categories.split(',') : [],
-		    prices: query.prices ? query.prices.split(',') : [],
-		    delivery: query.delivery ? query.delivery.split(',') : [],
-		  };
+	  const newFilterValue = {
+	    categories: query.categories ? query.categories.split(',') : [],
+	    prices: query.prices ? query.prices.split(',') : [],
+	    delivery: query.delivery ? query.delivery.split(',') : [],
+	  };
 
-			store.marketplace.state.filter = newFilterValue;
-		}
+		store.marketplace.state.filter = newFilterValue;
+	}
 
+	if (route.query.sortParam) store.marketplace.state.sort.param = route.query.sortParam
+	if (route.query.sortOrder) store.marketplace.state.sort.order = route.query.sortOrder
 
-		if (route.query.sortParam) store.marketplace.state.sort.param = route.query.sortParam
-		if (route.query.sortOrder) store.marketplace.state.sort.order = route.query.sortOrder
+	onMounted(async () => {
+	  
 	})
 
 	watch(() => store.marketplace.state.sort, (newSortValue, oldSortValue) => {

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

@@ -1,144 +1,56 @@
 <template>
-	<div class="for-transition radius-big w-100">
-
-		<transition name="fade">
-			<Loader v-if="isLoading" class="z-index-5 pos-t-50 left-t-50 pos-absolute"/>
-		</transition>
-
-		<transition name="fade">
-			<EmptyState 
-				v-if="!isLoading && organization.state.all.length < 1"
-				title="No Organizations Found"
-				description="It looks like there are no organizations available at the moment."
-				class="radius-big pd-medium bg-grey"
-			/>
-      <div v-else class="w-100 cols-1 gap-thin">
-      	<CardOrganization 
-		      v-for="organization in organization.state.all" 
-		      :key="organization._id"
-		      :organization="organization"
-		      :showRating="true"
-		      :showFollowers="false"
-		      :showProducts="true"
-		      class="bg-grey w-100 o-hidden radius-big pd-small "
-		    />
-			</div>
-		</transition>
-
-		<button 
-			v-if="hasMorePosts" 
-			@click="loadMorePosts" 
-			class="mn-t-thin bg-main t-black w-100 button"
-		>
-			Load more
-		</button>
-
-	</div>
+	<Feed
+		v-model:sort="store.marketplace.state.sort"
+    :search="true"
+    :states="{
+      empty: {
+        title: 'No Shops Found',
+        description: 'Currently, there are no shops.'
+      },
+    }"
+    :store="{
+      read: (options) => organization.actions.read(options)
+    }"
+    :options="{
+      country: route.params.country,
+	    state: route.params.state,
+	    city: route.params.city,
+	    categories: route.query.categories,
+	    prices: route.query.prices,
+	    delivery: route.query.delivery,
+	    location: store.globals.state.position?.location,
+	    contain: route.query.contain?.split(','),
+    }"
+    v-slot="{ 
+      items 
+    }"
+    class="cols-1 gap-thin"
+  >
+    <CardOrganization 
+	    v-for="organization in items" 
+	    :key="organization._id"
+	    :organization="organization"
+	    :showRating="true"
+	    :showFollowers="false"
+	    :showProducts="true"
+	    class="bg-light w-100 o-hidden radius-big pd-small "
+	  />
+  </Feed>
 </template>
 
 <script setup>
 	import { computed,reactive,ref, onMounted,watch  } from 'vue'
-	import { useRoute, useRouter } from 'vue-router'
+	import { useRoute } from 'vue-router'
 	import { useStore } from '@/store'
-	// Import dependencies
-	import Cookies from 'js-cookie'
-	// Import components
-	import Loader from '@pf/src/components/Loader/Loader.vue'
-	// Global
-	import Tab  		from '@pf/src/components/Tab/Tab.vue'
-	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 CardOrganization from '@pf/src/modules/organizations/components/blocks/CardOrganization.vue'
-	// Blocks
-	import EmptyState 		from '@pf/src/components/EmptyState/EmptyState.vue'
-	import Unit   	from '@pf/src/modules/organizations/components/sections/Unit.vue'
-	// Import state
+	
 	import * as organization from '@pf/src/modules/organizations/store/organizations'
 
-	const props = defineProps({
-	  localPosition: Object
-	});
+	import Feed from '@pf/src/components/Feed/Feed.vue'
 
-	// Init router
+	import CardOrganization from '@pf/src/modules/organizations/components/blocks/CardOrganization.vue'
+	
+	const route = useRoute()
 	const store = useStore()
-	const router 	= useRouter()
-	const route 	= useRoute()
-
-	let skip = ref(0);
-	let limit = ref(9);
-
-	const hasMorePosts = ref(false);
-  let isLoading = ref(true);
-
-  const params = {
-    country: route.params.country,
-    state: route.params.state,
-    city: route.params.city,
-    categories: route.query.categories,
-    prices: route.query.prices,
-    delivery: route.query.delivery,
-    skip: skip.value, 
-    limit: limit.value,
-    sortParam: route.query.sortParam || store.marketplace.state.sort.param,
-    sortOrder: route.query.sortOrder || store.marketplace.state.sort.order,
-    location: store.globals.state.position?.location,
-    search: route.query.search,
-    contain: route.query.contain?.split(','),
-  };
-
-	const loadMorePosts = async () => {
-    skip.value += limit.value;
-
-    params.skip = skip.value
-
-	  const data = await organization.actions.read(params);
-
-    if (data.length < limit.value) {
-      hasMorePosts.value = false;
-    } else {
-    	hasMorePosts.value = true;
-    }
-
-    organization.state.all = [...organization.state.all, ...data];
-  };
-
-	onMounted(async () => {
-		organization.state.all = [];
-
-	 	const data = await organization.actions.read(params);
-
-    if (data.length < limit.value) {
-      hasMorePosts.value = false;
-    } else {
-    	hasMorePosts.value = true;
-    }
-
-    organization.state.all = [...organization.state.all, ...data];
-
-    isLoading.value = false;
-	});
-
-	watch(() => route.params, async (newParams, oldParams) => {
-	  if (newParams !== oldParams) {
-
-			params.skip = skip.value
-
-	    const data = await organization.actions.read(params);
-
-	     if (data.length < limit.value) {
-	      hasMorePosts.value = false;
-	    }
-
-
-	    organization.state.all = data;
-	  }
-	}, { deep: true });
-
 </script>
 
 <style lang="scss">