@ozdao/prometheus-framework 0.2.111 → 0.2.113

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

@@ -1,116 +1,71 @@
 <template>
 	<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
-     "
+    <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 pd-thin t-semi radius-extra uppercase p-medium"
-			:class="[
-        store.marketplace.state.filter.categories.length > 0 ? 'bg-white t-black' : ''
-      ]"
-		>
-			<div class="w-100 h-100 radius-semi o-hidden bg-black">
-      	<Checkbox 
-  				v-for="(category, index) in categories"
-          :label="category.name"
-          name="categories"
-          :value="category.url"
-          class="cursor-pointer  w-100  bg-black t-white radius-small pd-small"
-          :radio="store.marketplace.state.filter.categories"
-          @update:radio="event => store.marketplace.state.filter.categories = event"
-        />
-     	</div>
-     </Dropdown>
-
-    <Dropdown 
-      id="fitlerPrice"
-     	:label="t('filters.price.title')" 
-     	class="cursor-pointer pd-thin t-semi radius-extra uppercase p-medium"
-     	:class="[
-        store.marketplace.state.filter.prices.length > 0 ? 'bg-white t-black' : ''
-      ]"
-     >
-      <div class="w-100 h-100 radius-semi o-hidden bg-black">
-      	<Checkbox 
-  				v-for="(price, index) in prices"
-          :label="price.label"
-          name="prices"
-          :value="price.value"
-          class="cursor-pointer  w-100 mn-t-small bg-black t-white radius-small pd-small"
-          :radio="store.marketplace.state.filter.prices"
-          @update:radio="event => store.marketplace.state.filter.prices = event"
-        />
-      </div>
-     </Dropdown>
-
-    <Dropdown 
-   	  label="Delivery" 
-      id="fitlerDelivery"
-     	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>
-    </div>
-    <div class="flex-stretch flex-nowrap gap-thin flex">
-  		<Select 
-        :options="['products','distance','popularity']"
-        v-model:select="store.marketplace.state.sort.param" 
-        placeholder="Select type"
-        class="
-          bg-white
-          cursor-pointer
-          radius-small 
-          pd-thin t-semi uppercase p-medium
-         	w-8r
-         	t-center
-          t-black
-        "
-      />
-      <div 
-        @click="() => {
-          if (store.marketplace.state.sort.order === 'desc') { 
-            store.marketplace.state.sort.order = 'asc' 
-          }
-          else {
-            store.marketplace.state.sort.order = 'desc' 
-          }
-        }"
-        class="
-          bg-white
-          cursor-pointer
-          pd-thin 
-          w-2r
-          t-center
-          t-black
-          radius-small 
-          flex-justify-between
-          flex-column
-          flex
-          aspect-1x1
-        "
+  		<Dropdown 
+        id="fitlerCategory"
+  			:label="t('categoriesTitle')" 
+  			class="cursor-pointer pd-thin t-semi radius-extra uppercase p-medium"
+  			:class="[
+          store.marketplace.state.filter.categories.length > 0 ? 'bg-white t-black' : ''
+        ]"
+  		>
+  			<div class="w-100 h-100 radius-semi o-hidden bg-black">
+        	<Checkbox 
+    				v-for="(category, index) in categories"
+            :label="category.name"
+            name="categories"
+            :value="category.url"
+            class="cursor-pointer  w-100  bg-black t-white radius-small pd-small"
+            :radio="store.marketplace.state.filter.categories"
+            @update:radio="event => store.marketplace.state.filter.categories = event"
+          />
+       	</div>
+       </Dropdown>
+
+      <Dropdown 
+        id="fitlerPrice"
+       	:label="t('filters.price.title')" 
+       	class="cursor-pointer pd-thin t-semi radius-extra uppercase p-medium"
+       	:class="[
+          store.marketplace.state.filter.prices.length > 0 ? 'bg-white t-black' : ''
+        ]"
+       >
+        <div class="w-100 h-100 radius-semi o-hidden bg-black">
+        	<Checkbox 
+    				v-for="(price, index) in prices"
+            :label="price.label"
+            name="prices"
+            :value="price.value"
+            class="cursor-pointer  w-100 mn-t-small bg-black t-white radius-small pd-small"
+            :radio="store.marketplace.state.filter.prices"
+            @update:radio="event => store.marketplace.state.filter.prices = event"
+          />
+        </div>
+       </Dropdown>
+
+      <Dropdown 
+     	  label="Delivery" 
+        id="fitlerDelivery"
+       	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 v-for="i in 4" :style="`height: 0.2rem; width: ${store.marketplace.state.sort.order === 'desc' ? 100 / i : 25 * i }%;`" class="transition-linear radius-small bg-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>
-      </div>	
+      </Dropdown>
     </div>
+  </div>
 
 </template>
 
@@ -119,6 +74,7 @@
 
 
  	import Checkbox from "@pf/src/components/Checkbox/Checkbox.vue";
+  import Radio from "@pf/src/components/Radio/Radio.vue";
  	import Select from "@pf/src/components/Select/Select.vue";
  	import Dropdown from "@pf/src/components/Dropdown/Dropdown.vue";
 
@@ -192,15 +148,7 @@
       status: 'published'
     }
 
-    console.log(options)
-    console.log()
 		await store.categories.actions.fetchCategories(options)
-
-		store.categories.state.all.forEach( category => {
-	  	category.localization.forEach( localization => {
-	    	text.messages[localization.locale].categories.push(localization.text)
-	  	})
-		})
 	})
 
 	

package/src/modules/marketplace/store/marketplace.js

@@ -1,22 +1,18 @@
-// Dependencies
-import axios from 'axios';
-import Cookies from 'js-cookie'
-// Vue modules
 import { reactive, watch  } from "vue";
-// Globals 
-import { setError }   from '@pf/src/modules/globals/store/globals'
-// Setup Axios
-const $axios = axios.create({baseURL: process.env.API_URL, withCredentials: true}) 
-// Setup Cookies
-$axios.defaults.withCredentials = true
+
 // State
 const state = reactive({
-  all: [],
+  shops: [],
   popular: [],
   pagination: {
     page: 1,
     perPage: 18,
   },
+  search: {
+    active: false,
+    current: '',
+    result:[]
+  },
   filter: {
     categories: [],
     prices: [],
@@ -25,170 +21,29 @@ const state = reactive({
   },
   sort: {
     param: 'distance',
-    order: 'asc'
-  },
-  search: {
-    active: false,
-    current: '',
-    result:[]
-  },
-  current: {
-    _id: null,
-    profile: {
-      categories: [],
-      photo: '',
-      name: '',
-      description: ''
-    },
-    structure: [],
-    owner: null,
-    types: '',
-    contacts: {
-      email: '',
-      website: '',
-      phone: '',
-      address: '',
-    },
-    social: {
-      telegram: '',
-      line: '',
-      facebook: '',
-      instagram: ''
-    },
-    rating: {
-      popularity: 0,
-      median: 0,
-      amount: 0,
-    }
+    order: 'asc',
+    options: [{
+      label: 'Distance',
+      value: 'distance'
+    },{
+      label: 'Popularity',
+      value: 'views'
+    },{
+      label: 'Products',
+      value: 'products'
+    }]
   }
 });
 
-const actions = {
-    // Create
-  async create(organization,owner) {
-    organization.owner = owner
-    try {
-      const response = await $axios.post('/api/organizations/create', organization);
-      console.log('Organization created successfully');
-      state.current = response.data;
-      return response.data;
-    } catch (error) {
-      console.log('Organization creation failed');
-      setError(error);
-      throw error;
-    }
-  },
-  // Read
-  async read(options = {}) {
-    console.log(options)
-
-    // Handle fetching a specific organization by website
-    if (options._id) {
-      options.params = options.params || {};
-      options.params._id = options._id;
-    }
-
-    // Handle fetching organization by type
-    if (options.types) {
-      options.params = options.params || {};
-      options.params.types = options.types;
-    }
-
-    if (options.owner) {
-      options.params = options.params || {};
-      options.params.owner = options.owner;
-    }
-
-    // Handle pagination
-    if (option.skip && option.limit) { 
-      options.params = options.params || {};
-      options.params.skip = options.skip || 0;
-      options.params.limit = options.limit || 10;
-    }
-
-    options.params.sort = 'createdAt';
-
-    try {
-      console.log('Request params:' + options.params)
-      const response = await $axios.get('/api/organizations', { params: options.params });
-
-      // Check if we are fetching a single organization or all organizations
-      if (options._id) {
-        state.current = response.data[0]; // Assuming that the response.data is the organization object
-      } else {
-        state.all = response.data; // Assuming that the response.data is an array of organization objects
-      }
-      return Promise.resolve(response.data);
-    } catch (error) {
-      setError(error)
-      return Promise.reject(error);
-    }
-  },
-  // Update
-  async update(_id, updatedData) {
-    console.log(_id,updatedData)
-    return await $axios
-      .post(`/api/organizations/${_id}/update`, updatedData)
-      .then(
-        (response) => {
-          console.log('Organization updated successfully');
-          return Promise.resolve(response.data);
-        },
-        (error) => {
-          console.log('Updating organization failed');
-          return Promise.reject(error);
-        }
-      );
-  },
-  // Remove
-  async remove(organizationId) {
-    await $axios
-      .delete(`/api/organizations/${organizationId}/delete`)
-      .then(
-        (response) => {
-           state.error = null;
-
-           // Получить текущую куку
-          let cookieValue = Cookies.get('user');
-          let cookieObject = JSON.parse(cookieValue);
-
-          // Изменить значение нужного поля
-          cookieObject.organization = null
-          // cookieObject.accessToken = response.data
-
-          // Установить обновленную куку
-          Cookies.set('user', JSON.stringify(cookieObject),{ expires: 7, domain: '.osi.plus', sameSite: 'none', secure: true });
-          return Promise.resolve(response.data);
-        },
-        (error) => {
-          setError(error)
-          return Promise.reject(error);
-        }
-       )
-      .catch(error => {
-        setError(error)
-      });
-  },
-  // Reset
-  async reset () {
-    state._id = null
-    state.details = {
-      name: '',
-      type: '',
-    }
-  }
-}
-
-const history = []
-history.push(state) 
+// History
+const history = []; history.push(state);
 
-// // Watch
+// Watch
 watch(state, (newState, oldState) => {
   history.push(newState)
 })
 
 // Module Export
 export {
-  state,
-  actions
+  state
 }

package/src/modules/mobile/components/Walkthrough/Walkthrough.vue

@@ -47,7 +47,7 @@
 	      @click="scrollTo(index)"
 	      :class="[
 	        'embla__dot i-small radius-extra br-solid br-main br-2px',
-					{ 'bg-grey': index !== selectedIndex },
+					{ 'bg-light': index !== selectedIndex },
 	        { 'bg-main': index === selectedIndex }
 	      ]"
 	    >

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

@@ -4,7 +4,7 @@
   >
 
     <div class="pos-relative  w-100 gap-thin flex-stretch flex-nowrap flex">
-      <div class="bg-grey h-100 o-hidden pos-relative radius-small aspect-1x1"
+      <div class="bg-light h-100 o-hidden pos-relative radius-small aspect-1x1"
         style="flex: 1 0 auto"
       >
         <!-- Item Image -->
@@ -15,7 +15,7 @@
         >
         <PlaceholderImage
           v-if="!product.images[0]" 
-          class="bg-grey pos-absolute radius-small w-100 h-100"
+          class="bg-light pos-absolute radius-small w-100 h-100"
         />
       </div>
       
@@ -39,15 +39,15 @@
         <div v-if="editable" class="mn-t-thin gap-thin flex-nojustify flex">
           <IconAdd
             @click="increase_(product)"
-            class="hover-scale-1 cursor-pointer bg-grey i-big pd-thin radius-small"
+            class="hover-scale-1 cursor-pointer bg-light i-big pd-thin radius-small"
           />
           <IconMinus
             @click="decrease(product)"
-            class="hover-scale-1 cursor-pointer bg-grey i-big pd-thin radius-small"
+            class="hover-scale-1 cursor-pointer bg-light i-big pd-thin radius-small"
           />
           <IconDelete
             @click="remove(product)"
-            class="hover-scale-1 cursor-pointer bg-grey i-big pd-thin radius-small"
+            class="hover-scale-1 cursor-pointer bg-light i-big pd-thin radius-small"
           />
         </div>
 
@@ -83,7 +83,7 @@
 
 	const props = defineProps({
 		product: Object,
-		editable: String,
+		editable: Boolean,
 		increase: Function,
 		decrease: Function,
 		remove: Function

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

@@ -7,7 +7,7 @@
 
           }
         }" 
-         class="bg-grey pd-medium radius-big"
+         class="bg-light pd-medium radius-big"
       >
         <CardHeader 
           :entity="order"

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

@@ -1,5 +1,5 @@
 <template>
-  <div class="bg-grey radius-medium w-100">
+  <div class="bg-light radius-medium w-100">
     <h3 class="pd-medium">Tracking History</h3>
     <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">

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

@@ -13,13 +13,13 @@
 
 	  	<div class="radius-extra  mn-b-medium flex-nowrap flex h-1r pos-relativew-40r">
 	  		<div 
-	  			class="bg-grey br-anim br-glow radius-extra mn-r-thin h-100 w-20"
+	  			class="bg-light br-anim br-glow radius-extra mn-r-thin h-100 w-20"
 	  			:class="
 	  				{'br-anim br-glow br-glow-anim': ['created','confirmed', 'packing','in delivery','delivered'].indexOf(order.status) === 0 }
 	  			"
 	  		/>
 	  		<div 
-	  			class="bg-grey br-anim br-glow radius-extra mn-r-thin h-100 w-20"
+	  			class="bg-light br-anim br-glow radius-extra mn-r-thin h-100 w-20"
 	  			:class="
 	  				{'br-anim br-glow br-glow-anim': ['created','confirmed', 'packing','in delivery','delivered'].indexOf(order.status) === 0 },
 	  					{'t-transp': ['created','confirmed', 'packing','in delivery','delivered'].indexOf(order.status) === -1 },
@@ -32,10 +32,10 @@
 	  				{'t-transp': ['confirmed', 'packing','in delivery','delivered'].indexOf(order.status) === -1 },
 	  				{'blink': order.status === 'confirmed' }
 	  			"
-	  			class="bg-grey radius-extra mn-r-thin h-100 w-40"
+	  			class="bg-light radius-extra mn-r-thin h-100 w-40"
 	  		/>
 	  		<div 
-	  			class="bg-grey radius-extra mn-r-thin h-100 w-40"
+	  			class="bg-light radius-extra mn-r-thin h-100 w-40"
 	  			:class="
 	  				{'br-anim br-glow br-glow-anim': ['packing','in delivery','delivered'].indexOf(order.status) === 0 },
 	  				{'t-transp': ['packing','in delivery','delivered'].indexOf(order.status) === -1 },
@@ -43,7 +43,7 @@
 	  			"
 	  		/>
 	  		<div 
-	  			class="bg-grey radius-extra h-100 w-20"
+	  			class="bg-light radius-extra h-100 w-20"
 	  			:class="
 	  				{'br-anim br-glow br-glow-anim': ['in delivery','delivered'].indexOf(order.status) === 0 },
 	  				{'t-transp': ['in delivery','delivered'].indexOf(order.status) === -1 },
@@ -82,11 +82,11 @@
 		      :showRating="true"
 		      :showFollowers="false"
 		      :showProducts="false"
-		      class="bg-grey mn-b-thin w-100 o-hidden radius-big pd-small "
+		      class="bg-light mn-b-thin w-100 o-hidden radius-big pd-small "
 		    />
 
 		    <div 
-		    	class="mn-b-thin bg-grey w-100 o-hidden radius-medium "
+		    	class="mn-b-thin bg-light w-100 o-hidden radius-medium "
 		    >
 		    	<div class="pd-small flex-nowrap flex">
 			    	<div class="mn-r-auto">
@@ -164,7 +164,7 @@
 	     	<span class="t-transp" v-if="payment && payment.Status === 'CONFIRMED'">Paid</span> 
 	    </div>  
 
-	    <div class="bg-grey radius-big pd-medium  mn-r-bold pd-r-big br-right-dark w-100">
+	    <div class="bg-light radius-big pd-medium  mn-r-bold pd-r-big br-right-dark w-100">
 	  		<h3 class="mn-b-small">Order Summary</h3>
 
 	  		<ul class="flex gap-thin flex-column mn-b-semi">

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

@@ -11,7 +11,7 @@
   	<div class="flex-nowrap flex gap-thin pos-relative ">
 	    <div v-for="(status, index) in statuses" :key="index" class="w-20">
 	      <div
-	      	class="bg-grey br-anim br-glow radius-extra h-1r w-100"
+	      	class="bg-light br-anim br-glow radius-extra h-1r w-100"
 	        :class="
 				    { 'br-glow-anim': isActiveStatus(index) },
 				    { 't-transp': !isActiveStatus(index) },
@@ -25,7 +25,7 @@
 		  </div>
 	  </div>
 
-	  <div class="bg-grey mn-b-thin pd-thin radius-extra flex-nowrap flex">
+	  <div class="bg-light mn-b-thin pd-thin radius-extra flex-nowrap flex">
   		<div class="w-max flex-v-center gap-thin flex-nowrap flex pd-thin radius-small bg-white-transp-20">
   			<IconTime class="i-semi t-transp" fill="rgb(var(--black)" />
         <p class="t-medium mn-r-auto"><span class="p-small t-transp">Estimated Arrival</span><br>{{formatDate(order.deadline)}}</p>
@@ -43,13 +43,13 @@
       class="bg-white w-min-30r w-max-30r radius-big pd-big"
     >
 
-			<VueDatePicker v-model="order.deadline" :hide-navigation="['calendar']" :flow="['time']" class="z-index-3 bg-grey radius-small pd-small mn-b-thin mn-b-semi" />
+			<VueDatePicker v-model="order.deadline" :hide-navigation="['calendar']" :flow="['time']" class="z-index-3 bg-light radius-small pd-small mn-b-thin mn-b-semi" />
 
 			<p class="t-medium p-medium mn-b-thin">
 		    Positions
 		  </p>
 
-    	<ul class="bg-grey pd-small radius-small flex gap-thin flex-column mn-b-semi">
+    	<ul class="bg-light pd-small radius-small flex gap-thin flex-column mn-b-semi">
   			<CardOrderItem
   				v-for="(product, index) in orderProducts" :key="product._id"
   				:editable="false" 
@@ -74,12 +74,12 @@
 		      :showRating="true"
 		      :showFollowers="false"
 		      :showProducts="false"
-		      class="bg-grey mn-b-thin w-100 o-hidden radius-big pd-small "
+		      class="bg-light mn-b-thin w-100 o-hidden radius-big pd-small "
 		    />
 
 
 		    <div 
-		    	class="mn-b-thin bg-grey w-100 o-hidden radius-medium "
+		    	class="mn-b-thin bg-light w-100 o-hidden radius-medium "
 		    >
 		    	<div class="pd-small flex-nowrap flex">
 			    	<div class="mn-r-auto">
@@ -148,7 +148,7 @@
 	     	<span class="t-transp" v-if="payment && payment.Status === 'CONFIRMED'">Paid</span> 
 	    </div>  
 
-	    <div class="bg-grey radius-big pd-medium  mn-r-bold pd-r-big br-right-dark w-100">
+	    <div class="bg-light radius-big pd-medium  mn-r-bold pd-r-big br-right-dark w-100">
 	  		<h3 class="mn-b-small">Order Summary</h3>
 
 	  		<ul class="flex gap-thin flex-column mn-b-semi">

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

@@ -44,7 +44,7 @@
 				<CardOrderItem 
 					v-for="product in shopcart.state.positions" 
 					:key="product._id" 
-					editable="true" 
+					:editable="true" 
 					:product="product" 
 	        :increase="product => shopcart.actions.incrementItemQuantity(product._id)"
 	        :decrease="product => shopcart.actions.decrementItemQuantity(product._id)"

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

@@ -21,7 +21,7 @@
         {name: 'Delivery', value: 'delivery'},
         {name: 'Payment', value: 'payment'}
       ]"
-      class="t-medium radius-medium bg-grey mn-b-small"
+      class="t-medium radius-medium bg-light mn-b-small"
     />
 
     <Popup 
@@ -32,7 +32,7 @@
 
       <h3 class="mn-b-small">Add to order</h3>
 
-      <div class="bg-grey h-max-100 mn-b-thin o-scroll pd-medium radius-big">
+      <div class="bg-light h-max-100 mn-b-thin o-scroll pd-medium radius-big">
         <Feed
           :search="{
             placeholder: 'Search products...',
@@ -141,7 +141,7 @@
         v-slot="{ 
           items 
         }"
-        class="bg-grey h-max-20r o-scroll"
+        class="bg-light h-max-20r o-scroll"
       >
         <CardUser
           v-for="(user, index) in items"