@ozdao/prometheus-framework 0.2.30 → 0.2.31

package/src/modules/products/store/products.js

@@ -17,7 +17,6 @@ const state = reactive({
     category: [],
     status: 'unpublished',
     information: [],
-    coverImage: '',
     images: [],
     files: [],
     image3d: false,
@@ -26,6 +25,8 @@ const state = reactive({
     price: 0,
     localization: [],
     modifications: [],
+    quantityDiscount: [],
+    ingridients: [],
     description: ''
   }
 });
@@ -55,40 +56,56 @@ const actions = {
   async read(options = {}) {
     // query.params = options.params || {};
     
-    let query = { params: {}}
+    let query = {}
 
     // Handle fetching a specific post by _id
     if (options._id) {
-      query.params._id = options._id ;
+      query._id = options._id ;
     }
 
     // Handle fetching posts by category
     if (options.category) {
-      query.params.category = options.category;
+      query.category = options.category;
     }
-  
-    query.params.skip = options.skip || 0;
-    query.params.limit = options.limit || 10;
 
     if (options.organization) {
-      query.params.organization = options.organization;
+      query.organization = options.organization;
+    }
+
+    if (options.count) {
+      query.count = options.count
     }
 
-    console.log(options)
-     if (options.status) {
-      query.params.status = options.status;
+    if (options.categories) {
+      query.categories = options.categories;
     }
 
-    query.params.sort = 'createdAt';
+    if (options.prices) {
+      query.prices = options.prices;
+    }
+
+    if (options.delivery) {
+      query.delivery = options.delivery;
+    }
+
+    if (options.status) {
+      query.status = options.status;
+    }
+
+    query.sort = 'createdAt';
     
-    console.log(query)
+    query.skip = options.skip || 0;
+    query.limit = options.limit || 10;
+
+      console.log(query)
     try {
-      const response = await $axios.get('/products/read', { params: query.params });
+      const response = await $axios.get('/products/read', { params: query });
       
-       if (options._id) {
-        state.current = response.data[0]; 
+      if (options._id) {
+        state.current = {...response.data[0]}; 
+        return Promise.resolve(response.data[0]);
       } else {
-        state.all = response.data;
+        return Promise.resolve(response.data);
       }
       return Promise.resolve(response.data);
     } catch (error) {
@@ -187,19 +204,16 @@ const actions = {
   },
 
   async fetchProduct(_id) {
-    return await $axios.get("/products/" + _id).then(
-      (product) => {
-        if (!product.localization) {
-          product.localization = [];
-        }
-        state.current = product.data;
-        return Promise.resolve(product.data);
-      },
-      (error) => {
-        setError(error);
-        return Promise.reject(error);
-      }
-    );
+   try {
+      const response = await $axios.get("/products/" + _id);
+
+      console.log(response)
+      state.current = response.data[0]; 
+      return Promise.resolve(response.data[0]);
+    } catch (error) {
+      setError(error)
+      return Promise.reject(error);
+    }
   },
 
   async fetchProductPopular() {

package/src/modules/spots/components/blocks/CardSpot.vue

@@ -3,93 +3,64 @@
     <Map :location="{lat: spot.location.coordinates[1] ,lng: spot.location.coordinates[0]}" class=""/>
 
     <div class="pd-medium w-100">
-     <svg  @click="$router.push(`/organizations/${props.organization._id}/spots/${spot._id}/edit`)" class="i-regular pos-absolute pos-r-0 pos-t-0 t-transp" width="652" height="652" viewBox="0 0 652 652" fill="none" xmlns="http://www.w3.org/2000/svg">
-        <path d="M515.693 9.52082C510.095 3.91669 502.49 0.765625 494.563 0.765625C486.635 0.765625 479.036 3.91669 473.432 9.52082L48.7255 434.307C44.8244 438.214 42.0848 443.125 40.8088 448.496L0.939444 615.069C-1.47202 625.168 1.528 635.788 8.86652 643.132C16.2103 650.47 26.8305 653.47 36.9292 651.059L203.516 611.261H203.511C208.88 609.985 213.792 607.246 217.699 603.35L642.485 178.496C648.089 172.892 651.241 165.293 651.241 157.366C651.241 149.439 648.089 141.835 642.485 136.235L515.693 9.52082ZM113.76 453.708L388.307 179.161L472.828 263.682L198.281 538.229L113.76 453.708ZM87.1041 511.5L140.416 564.812L70.3014 581.614L87.1041 511.5ZM515.091 221.793L430.195 136.897L494.184 72.9075L579.08 157.429L515.091 221.793Z" fill="black"/>
-      </svg>
-      
+
+        <!-- v-if="user === event.creator.target._id" -->
+      <IconEdit
+        @click="$router.push({
+        name: 'Spot Edit',
+        params: {
+          _id: props.organization._id,
+          spot: spot._id
+        }
+      })" 
+        class="z-index-2 pos-absolute pos-t-regular pos-r-regular i-regular t-transp"
+      />
+   
+    
+
+        <p 
+        @click="$router.push(`/app/organization/${props.organization._id}/spots/${spot._id}`)"
+        class="pd-thin bg-white radius-small mn-b-thin p-small w-max"
+      >
+        {{spot.address}}
+      </p>
+
       <h3 
         @click="$router.push(`/app/organization/${props.organization._id}/spots/${spot._id}`)"
-        class="mn-b-small w-100"
+        class="mn-b-thin w-100"
         v-html="spot.profile.name"
       />
 
-       <p 
-        @click="$router.push(`/app/organization/${props.organization._id}/spots/${spot._id}`)"
-        class="mn-b-small p-big w-100"
-        v-html="spot.address"
-      />
     
-      <Spoiler 
-        class="
-          radius-small 
-          o-hidden
-          br-1px br-solid br-grey 
-          mn-b-thin
-        "
-        >
-        <template #header>
-          <div class="pd-small flex-v-center flex-nowrap flex">
-            <h5 class="w-100" >Contacts </h5>
-            <p class="mn-r-small">{{spot.members.length}}&nbsp;человек</p>
-            <svg width="14" height="9" viewBox="0 0 14 9" fill="none" xmlns="http://www.w3.org/2000/svg">
-              <path fill-rule="evenodd" clip-rule="evenodd" d="M12.4697 0.469727L13.5304 1.53039L7.00006 8.06072L0.469727 1.53039L1.53039 0.469727L7.00006 5.9394L12.4697 0.469727Z" fill="#8A8A8A"/>
-            </svg>
-
-          </div>
-        </template>
-        <template #content>
-           <ul>
-            <li v-if="spot.members.length < 1">В отделе еще нет участников</li>
-            <User 
-              class="br-b br-solid br-grey" 
-              v-for="(member, index) in spot.members" 
-              :key="index" 
-              :user="member.user" 
-              :position="member.position" 
-              @click="$router.push(`/app/profile/${member.user._id}`)" 
-            />
-          </ul>
-        </template>
-      </Spoiler>
-
-      <Spoiler 
-        class="
-          radius-small 
-          o-hidden
-          br-1px br-solid br-grey 
-          mn-b-thin
-        "
-        >
-        <template #header>
-          <div class="pd-small flex-v-center flex-nowrap flex">
-            <h5 class="w-100" >Working Hours </h5>
-            <p class="mn-r-small">{{spot.subspots ? spot.subspots.length : 0}}&nbsp;отделов</p>
-            <svg width="14" height="9" viewBox="0 0 14 9" fill="none" xmlns="http://www.w3.org/2000/svg">
-              <path fill-rule="evenodd" clip-rule="evenodd" d="M12.4697 0.469727L13.5304 1.53039L7.00006 8.06072L0.469727 1.53039L1.53039 0.469727L7.00006 5.9394L12.4697 0.469727Z" fill="#8A8A8A"/>
-            </svg>
-
-          </div>
-        </template>
-        <template #content>
-          <ul>
-            <li v-if="spot.subspots.length < 1">В отделе еще нет подотделов</li>
-            <SpotSub  v-for="(subspotsartment, index) in spot.subspots" @click="$router.push(`/app/organization/spots/${subspotsartment._id}`)" :key="index" class="br-b br-solid br-grey" :spot="subspotsartment" />
-          </ul>
-        </template>
-      </Spoiler>
+
+      <p class="d-block p-big mn-b-semi">{{spot.profile.description}}</p>
+
+      <h4>Delivery:</h4>
+      <Chips 
+        v-if="type !== 'short' && spot.delivery.length > 0" 
+        :chips="spot.delivery"
+      />
+
+      <h4>Accepted Payment:</h4>
+      <Chips 
+        v-if="type !== 'short' && spot.payment.length > 0" 
+        :chips="spot.payment"
+      />
+
+
 
     </div>
   </div>
+
 </template>
 
 <script setup>
 import { ref } from 'vue';
 
-import Spoiler  from '@pf/src/components/Spoiler/Spoiler.vue';
-import Map      from '@pf/src/components/Map/Map.vue';
+import IconEdit from '@pf/src/modules/icons/navigation/IconEdit.vue'
 
-import SpotSub from '@pf/src/modules/spots/components/blocks/SpotSub.vue';
-import User from '@pf/src/modules/organizations/components/blocks/User.vue';
+import Chips  from '@pf/src/components/Chips/Chips.vue'
+import Map      from '@pf/src/components/Map/Map.vue';
 
 const props = defineProps({
   spot: Object,

package/src/modules/spots/components/layouts/Spots.vue

@@ -1,13 +1,7 @@
 <template>
-	<div class="">
-		<div class="pd-b-zero pd-thin">
-			<Breadcrumbs class="pd-medium bg-grey radius-big"/>
-		</div>
-
+	<div class="w-100 h-100">
 		<!-- Catalog wrapper -->
-		<div class="cols-1 gap-thin pd-thin">
-					
-				<!-- Products wrapper  -->
+		<div class="h-100 w-100 flex-nowrap flex-column flex gap-thin pd-thin">
 
 					<!-- Sorting section -->
 					<div class="pd-medium bg-grey radius-big">
@@ -16,85 +10,24 @@
 				      	<h2 class="t-left">
 				      		<span class="">Weed in </span>
 
-				      		<span @click="a => { globals.state.isLocationPopupOpen = true }" v-if="localPosition.city || localPosition.state || localPosition.country" class="t-semi t-main">
+				      		<span @click="a => { globals.state.isOpenLocationPopup = true }" v-if="localPosition.city || localPosition.state || localPosition.country" class="t-semi t-main">
 			      				<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>
 
-				      		<span v-else @click="a => { globals.state.isLocationPopupOpen = true }"  class="t-semi t-main">
+				      		<span v-else @click="a => { globals.state.isOpenLocationPopup = true }"  class="t-semi t-main">
  										The World
 				      		</span>
 				      	</h2>
 							</header>
 
-							<button class="bg-main button">See on map</button>
+							<!-- <button class="bg-main button">See on map</button> -->
 						</div>
 					</div>
 
-					<!-- Filters wrapper -->
-					<div class="pd-medium bg-grey radius-big flex-nowrap flex">
-						<h3 class="mn-b-small">Filters</h3>
-						
-						<Dropdown :label="t('categoriesTitle')">
-	          	<Checkbox 
-								v-for="(category, index) in categories"
-			          :label="category.name"
-			          name="categories"
-			          :value="category.url"
-			          class="w-100 mn-t-small mn-b-small bg-white radius-small pd-small"
-			          :radio="marketplace.state.filter.categories"
-			        />
-			       </Dropdown>
-
-			       <Dropdown :label="t('filters.price.title')">
-	          	<Checkbox 
-								v-for="(price, index) in prices"
-			          :label="price.label"
-			          name="prices"
-			          :value="price.value"
-			          class="w-100 mn-t-small bg-white radius-small pd-small"
-			          :radio="marketplace.state.filter.prices"
-			        />
-			       </Dropdown>
-
-			       <Dropdown label="Delivery">
-	          	<Checkbox 
-								v-for="(delivery, index) in delivery"
-			          :label="delivery.label"
-			          name="prices"
-			          :value="delivery.value"
-			          class="w-100 mn-t-small bg-white radius-small pd-small"
-			          :radio="marketplace.state.filter.delivery"
-			        />
-			       </Dropdown>
-						<!-- Reset filter -->
-						<button @click="resetFilterButton()" class="bg-main button">{{t('filters.reset')}}</button>
-
-					</div>	
-
-					<!-- <div class="pd-medium mn-b-thin bg-grey radius-big">
-						<div class="flex-nowrap flex flex-v-center">
-							<p class="mn-r-auto p-big t-semi t-transp">2,982 results</p>
-
-							<button 
-								@click="setSort('price')" 
-								class="button-active button-sort button">
-								{{t('sort.price')}}
-							</button>
-							<button 
-								@click="setSort('createdAt')" 
-								class="button-sort button">
-								{{t('sort.newest')}}
-							</button>
-							<button 
-								@click="setSort('popularity')" 
-								class="button-sort button">
-									{{t('sort.popularity')}}
-							</button>
-						</div>
-						
-					</div> -->
+
+					<!-- <Filters/> -->
 
 					<!-- Products section -->
 					<router-view  v-slot="{ Component, route }">
@@ -124,6 +57,8 @@
 	import Footer from '@pf/src/components/Footer/Footer.vue'
  	import Dropdown from "@pf/src/components/Dropdown/Dropdown.vue";
 
+ 	import Filters from '@pf/src/modules/marketplace/components/sections/Filters.vue'
+
 
 	import * as globals from '@pf/src/modules/globals/store/globals';
 	import * as categories from '@pf/src/modules/products/store/categories';
@@ -133,23 +68,6 @@
 	const route = useRoute()
 	const router = useRouter()
 
-
-	// Accessing state
-	const categories2 = computed(() => categories.state.all)
-
-	const delivery = [
-    { label: 'Pickup',					value: 'pickup' },
-    { label: 'Courier',					value: 'courier' },
-    { label: 'Post',						value: 'post' }
-	]
-
-	const prices = [
-    { label: 'Under $5',				value: '<5' },
-    { label: '$5 to $10',				value: '5-10' },
-    { label: '$10 to $20',			value: '10-20' },
-    { label: '$20 and above',		value: '>20' }
-	]
-
 	const localPosition = ref({
 		city: null,
 		state: null,