@ozdao/prometheus-framework 0.2.130 → 0.2.132

package/src/modules/organizations/components/sections/DetailsTab.vue

@@ -26,16 +26,16 @@
 					</FormReport>
 
 					<ButtonToggleMembership
-							v-if="user._id && user._id !== organization.owner"
-				      :user="user._id"
-				      :type="'organization'" 
-			      	:role="'blocked'" 
-				      :target="organization._id" 
-				      :status="organization.isBlocked" 
-				      :text="{create: 'Block', remove: 'Unblock'}"
-				      @updateMembership="event => handleMembershipUpdate(event, 'isBlocked')"
-				       class="t-white w-100 mn-t-thin bg-red" 
-			    	/>
+						v-if="user._id && user._id !== organization.owner"
+			      :user="user._id"
+			      :type="'organization'" 
+		      	:role="'blocked'" 
+			      :target="organization._id" 
+			      :status="organization.isBlocked" 
+			      :text="{create: 'Block', remove: 'Unblock'}"
+			      @updateMembership="event => handleMembershipUpdate(event, 'isBlocked')"
+			       class="t-white w-100 mn-t-thin bg-red" 
+		    	/>
 				</section>
       </Dropdown>
 

package/src/modules/organizations/components/sections/Publics.vue

@@ -14,7 +14,7 @@
 	        	:key="organization._id" 
 		      	:organization="organization"
 		      	:user="auth.state.user"
-						@updateMembership="handleMembershipUpdate"
+						@updateMembership="event => handleMembershipUpdate(event, 'isSubscriber', 'numberOfSubscribers')"
 						class="w-max-20r radius-big"
 		    />
 		</div>
@@ -42,7 +42,7 @@
 
 	// Methods
 	const handleMembershipUpdate = ({ membership, status, target }, statusName, statusNumber) => {
-	  memberships.mutations.handleMembershipUpdate(organizations.state.current, membership, status, target, statusName, statusNumber)
+	  memberships.mutations.handleMembershipUpdate(publics.value, membership, status, target, statusName, statusNumber)
 	};
 </script>
 

package/src/modules/organizations/controllers/memberships.controller.js

@@ -107,15 +107,14 @@ const controllerFactory = (db) => {
   };
 
   const deleteMembership = async (req, res) => {
-    // const { type, target, user, role } = req.body;
+    const { _id, type, target, user, role } = req.body;
     
 
     console.log(req.body)
 
     try {
       // const membership = await Membership.findOne({ type, target, user, role });
-      const membership = await Membership.findOneAndDelete({ _id: new ObjectId(req.body._id)})
-      // const membership = await Membership.findOne({ type, target, user, role });
+      const membership = _id ? await Membership.findOneAndDelete({ _id: new ObjectId(req.body._id)}) : await Membership.findOne({ type, target, user, role })
 
       if (!membership) {
         return res.status(404).send({ errorCode: 'MEMBERSHIP_NOT_FOUND' });

package/src/modules/organizations/controllers/organizations.controller.js

@@ -26,8 +26,8 @@ const controllerFactory = (db) => {
 
     const sort = {
       ...(sortParam === 'distance' ? { 'distanceExist': -1 } : {}),
-      'numberOfProducts': -1,
       [sortParam]: sortOrder === 'desc' ? -1 : 1,
+      'numberOfProducts': -1,
       "_id": 1
     };
     console.log(sort)

package/src/modules/organizations/store/memberships.js

@@ -55,7 +55,7 @@ const actions = {
   },
   async delete(membership) {
     try {
-      const response = await $axios.post(`/api/memberships/delete`, {_id: membership});
+      const response = await $axios.post(`/api/memberships/delete`, membership);
       state.error = null;
       return Promise.resolve(response.data);
     } catch (error) {
@@ -69,6 +69,9 @@ const mutations = {
   handleMembershipUpdate(data, membership, status, target, statusName, statusNumber) {
     let entity;
 
+    console.log('public is', data)
+      console.log('isArray', (Array.isArray(data)))
+
     if (Array.isArray(data)) {
       // Если data - это массив, ищем в нем сущность
       entity = data.find(o => o._id === membership.target);

package/src/modules/products/components/blocks/CardProduct.vue

@@ -50,7 +50,7 @@
 			<!-- Image Wrappers  -->
 			<img 
 				v-if="product.images[0]" 
-				:src="(FILE_SERVER_URL || '') + product.images[0]" 
+				:src="(FILE_SERVER_URL || '') + product.images[0].split('/').slice(0, -1).join('/') + '/thumbnail_' + product.images[0].split('/').pop()"
 				class="pos-absolute object-fit-cover h-max-100 w-100"
 			>
 

package/src/modules/products/components/sections/HeroRecommendation.vue

@@ -2,6 +2,7 @@
 	import { ref, onMounted } from 'vue'
 
 	import FieldBig from "@pf/src/components/FieldBig/FieldBig.vue";
+	import Shader from "@pf/src/components/Shader/Shader.vue";
 
 	import { useRouter } from 'vue-router'
 	import { useI18n } from 'vue-i18n'
@@ -30,7 +31,7 @@
 		      "euphoric": "euphoric"
 		    },
 		    "placeholder": "Tell us what you're after...",
-		    "action": "Transmit&nbsp→"
+		    "action": "Transmit"
 		  },
 		  "ru": {
 		    "title": "Персональный Накур,<br><b class='t-main'>Напрямую от AI</b>",
@@ -50,7 +51,7 @@
 		    },
 		    "subdescription": "Или выберите тег, и наш AI направит тебя к самым крутым вариантам:",
 		    "placeholder": "Опиши свой желаемый хай, bro...",
-		    "action": "Передать&nbsp→"
+		    "action": "Передать"
 		  }
 		}	
 	}
@@ -94,7 +95,7 @@
 		    :action="t('action')"
 		    @update:input="mood = $event"
 		    @action="router.push({name: 'Product Recommmendation', query: {mood: mood}})"
-				class="mn-b-big pd-big bg-black-transp-50 bg-blur-thin w-100 w-max-40r"
+				class="mn-b-big pd-big bg-dark-transp-50 bg-blur-thin w-100 w-max-40r"
 			/>
 
 			<p 
@@ -104,7 +105,7 @@
 
 			<div style="max-width: 50rem;" class="w-100 h-max gap-thin cols-6">
 
-				<a 
+				<button 
 					v-for="(preset,index) in presets" 
 					:key="preset" 
 					@click.stop="router.push({name: 'Product Recommmendation', query: {mood: preset}})"
@@ -116,7 +117,7 @@
 						flex-column
 						flex-nowrap
 						flex
-						bg-black-transp-50 
+						bg-dark-transp-50 
 						bg-blur-thin
 						radius-semi
 						cursor-pointer
@@ -132,15 +133,17 @@
 					<span class="t-white"> 
 						{{ t(`presets.` + preset) }}
 					</span>
-				</a>
+				</button>
 
 			</div>
 
 		</div>
 
-    <div class="w-100 h-100 flex flex-center pos-absolute pos-t-0 pos-r-0 z-index-0">
+		<!-- <Shader class="w-100 h-100 flex flex-center pos-absolute pos-t-0 pos-r-0 z-index-0"/> -->
+
+    <!-- <div class="w-100 h-100 flex flex-center pos-absolute pos-t-0 pos-r-0 z-index-0">
   	  <div style="background-image: url(/spiral.jpg)" class="spiral"></div>
-    </div>
+    </div> -->
 
 	</div>
 </template>

package/src/modules/products/models/product.model.js

@@ -15,7 +15,8 @@ module.exports = (mongoose) => {
             value: {type: String}
         }],
         // ЗАДАЧА: Нужно отрефачить price, перенести его в default variant
-        price:     {type: Number}, 
+        price: { type: Number },
+        prices: { type: Array}, 
         // 
         variants: [{ 
             _id: { type: mongoose.Schema.Types.ObjectId, auto: true },

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

@@ -157,10 +157,7 @@
 	  // replace the current route
 	  router.replace(currentRoute);
 	}, { deep: true });
-
-
 	
-
   const text = {
     locale: 'en',
     messages: {

package/src/modules/spots/components/pages/Map.vue

@@ -54,6 +54,7 @@ let skip = ref(0);
 let limit = ref(50);
 
 let currentMapCenter = ref({lat: 0, lng: 0});
+let currentMapZoom = ref(null);
 
 async function getCountry() {
   try {
@@ -176,10 +177,9 @@ onMounted(async () => {
     delivery: route.query.delivery,
     sortParam: route.query.sortParam || marketplace.state.sort.param,
     sortOrder: route.query.sortOrder || marketplace.state.sort.order,
-    skip: skip.value,
-    limit: 100,
     location: {coordinates: [lng,lat] },
-    locationRadius: 500,
+    locationRadius: 1000,
+    limit: 500,
   };
 
   console.log(params)
@@ -508,6 +508,10 @@ onMounted(async () => {
       };
     });
 
+    google.maps.event.addListener(map.value, 'zoom_changed', () => {
+      currentMapZoom.value = map.value.getZoom();
+    });
+
   })
 
 });
@@ -521,12 +525,18 @@ const searchInCurrentLocation = async () => {
     categories: route.query.categories,
     prices: route.query.prices,
     delivery: route.query.delivery,
+    sortParam: route.query.sortParam || marketplace.state.sort.param,
+    sortOrder: route.query.sortOrder || marketplace.state.sort.order,
+    locationRadius: 8000/currentMapZoom.value,
+    limit: 100,
     location: {
       type: "Point",
       coordinates: [currentMapCenter.value.lng, currentMapCenter.value.lat]
     }
   };
 
+  console.log([currentMapCenter.value.lng, currentMapCenter.value.lat])
+
   try {
     const data = await actions.read(params);
     // Remove old markers

package/src/modules/users/components/blocks/CardUser.vue

@@ -3,7 +3,7 @@
     <img 
       v-if="photo" 
       :src="(FILE_SERVER_URL || '') + photo" 
-      class="radius-medium bg-white object-fit-cover mn-r-thin h-100 w-auto" 
+      class="radius-medium aspect-1x1 bg-white object-fit-cover mn-r-thin h-100 w-auto" 
 
       @click.stop="$router.push({
         name: user.type === 'user' ? 'User Profile' : 'Organization', 
@@ -15,7 +15,7 @@
 
     <PlaceholderUserpic
       v-if="!photo"
-      class="radius-medium mn-r-thin h-100 w-auto"
+      class="radius-medium aspect-1x1 mn-r-thin h-100 w-auto"
 
       @click.stop="$router.push({
         name: 'User Profile', 

package/src/modules/users/components/pages/ProfileBlogposts.vue

@@ -1,15 +1,15 @@
 <template>
 	<div class="pd-thin">
 		<header class="mn-b-medium flex-v-center flex-nowrap flex">
-	      	<h2 class="mn-r-medium">Posts</h2>
-	      	<button 
-	      		v-if="auth.state.user._id === route.params._id"
-	      		@click="$router.push({
-	      			name: 'Create BlogPost'
-	      		})" 
-	      		class="radius-100 t-white t-semi i-big hover-scale-1 cursor-pointer t-white bg-second">
-	      			+
-	      	</button>
+    	<h2 class="mn-r-medium">Posts</h2>
+    	<button 
+    		v-if="auth.state.user._id === route.params._id"
+    		@click="$router.push({
+    			name: 'Create BlogPost'
+    		})" 
+    		class="radius-100 t-white t-semi i-big hover-scale-1 cursor-pointer t-white bg-second">
+    			+
+    	</button>
 		</header>
 
 		<Tab 
@@ -23,24 +23,37 @@
 			class="mn-b-small o-hidden h5 radius-big bg-light"
 		/>
 
-		<Feed 
-			v-if="tabOrganization === 'posts'"
-	  		:user="auth.state.user._id"
-			:creator="route.params._id"
-		/>
-
-		<Feed 
-			v-if="tabOrganization === 'drafts'"
-	  		:user="auth.state.user._id"
-			:creator="route.params._id"
-			:status="'draft'"
-		/>
-
-		<Feed 
-			v-if="tabOrganization === 'following'"
-	  		:user="auth.state.user._id"
-			:following="route.params._id"
-		/>
+		<Feed
+			:showLoadMore="false"
+			:states="{
+				empty: {
+					title: 'No Blog Posts Found',
+					description: 'Currently, there are no posts available in this blog. Please check back later.'
+				},
+			}"
+			:store="{
+				read: (options) => blog.read(options)
+			}"
+			:options="{
+				limit: 15,
+				category: route.params.category,
+				period: route.query.period,
+				status: tabOrganization === 'drafts' ? 'draft' : 'published',
+				user: auth.state.user._id,
+				creator: ['posts', 'drafts'].includes(tabOrganization) ? route.params._id : null,
+				following: tabOrganization === 'following' ? auth.state.user._id : null,
+			}"
+			v-slot="{ items }"
+			class="row-1 gap-thin"
+		>
+			<CardBlogpost 
+				v-for="item in items" 
+				:key="item._id" 
+				:blogpost="item" 
+				:user="auth.state.user._id" 
+				class="h-max-40r mn-b-medium"
+			/>
+		</Feed>
 	</div>
 </template>
 
@@ -49,9 +62,13 @@
 	import { useRoute, useRouter } from 'vue-router'
 	// Components
 	import Tab  		from '@pf/src/components/Tab/Tab.vue'
-	import Feed from '@pf/src/modules/community/components/sections/Feed.vue'; 
+
+	import Feed from '@pf/src/components/Feed/Feed.vue'
+
+  import CardBlogpost from '@pf/src/modules/community/components/blocks/CardBlogpost.vue';
 
 	import * as auth from '@pf/src/modules/auth/store/auth';
+  import * as blog from '@pf/src/modules/community/store/blogposts.js';
 	// Accessing router
 	const route = useRoute()
 	const router = useRouter()

package/src/modules/wallet/components/blocks/CardBalanceReplenished.vue

@@ -0,0 +1,40 @@
+<template>
+  <h2 class="mn-b-small t-center t-bold">{{ t('balanceReplenished') }}</h2>
+
+  <div class="radius-medium br-1px br-black br-solid pd-big flex flex-column flex-justify-center flex-items-center">
+    <h3 class="t-semi">
+      {{ t('youReceived') }}
+    </h3>
+    <h3 class="t-semi">
+      500 WDT
+    </h3>
+
+  </div>
+
+  <button
+    class="uppercase w-100 bg-main t-black pd-thin radius-medium t-center br-solid br-2px br-black-transp-10 mn-t-small"
+    @click="close"
+  >
+    {{ t('backToWallet') }}
+  </button>
+</template>
+
+<script setup>
+  import text from '@pf/src/modules/wallet/localization/Wallet.json'
+  import { useI18n } from 'vue-i18n'
+
+  const emits = defineEmits(['close'])
+
+  // Localization
+  const { t } = useI18n({
+    useScope: 'global', 
+    ...text
+  })
+
+  function close() {
+    emits("close")
+  }
+</script>
+
+<style scoped>
+</style>

package/src/modules/wallet/components/blocks/CardDeposite.vue

@@ -0,0 +1,55 @@
+<template>
+  <h2 class="mn-b-small t-center t-bold">Deposit with card</h2>
+
+  <div class="bg-grey radius-big mn-t-semi mn-b-semi flex flex-justify-between">
+    <Field
+      :placeholder="t('enterAmount')"
+      class="pd-medium radius-small"
+    />
+
+    <div class="uppercase flex flex-justify-center flex-items-center mn-r-semi t-semi">
+      USD
+    </div>
+  </div>
+
+  <h3 class="t-semi">You will receieve: 0 WDT</h3>
+
+  <button
+    class="uppercase w-100 bg-main t-black pd-thin radius-medium t-center br-solid br-2px br-black-transp-10 mn-t-small"
+    @click="switchMenu(3)"
+  >
+    {{ t('pay') }}
+  </button>
+
+  <button
+    class="uppercase w-100 bg-main t-black pd-thin radius-medium t-center br-solid br-2px br-black-transp-10 mn-t-small"
+    @click="backSelection"
+  >
+    {{ t('backToSelection') }}
+  </button>
+</template>
+
+<script setup>
+  import text from '@pf/src/modules/wallet/localization/Wallet.json'
+  import Field from '@pf/src/components/Field/Field.vue'
+  import { useI18n } from 'vue-i18n'
+
+  const emits = defineEmits(['back-selection', 'switch-menu'])
+
+  // Localization
+  const { t } = useI18n({
+    useScope: 'global', 
+    ...text
+  })
+
+  function backSelection() {
+    emits("back-selection")
+  }
+
+  function switchMenu(screen = 0) {
+    emits("switch-menu", screen)
+  }
+</script>
+
+<style scoped>
+</style>

package/src/modules/wallet/components/blocks/CashDeposite.vue

@@ -0,0 +1,28 @@
+<template>
+  <h2 class="mn-b-small t-center t-bold">Deposit with cash</h2>
+
+  <p class="t-transp t-center">
+    You need to go to casse to topup balance
+  </p>
+
+  <div
+    class="w-100 bg-grey radius-medium mn-t-medium mn-b-medium"
+    style="height: 152px"
+  />
+
+  <button
+      class="w-100 bg-main t-black pd-thin radius-medium t-center br-solid br-2px br-black-transp-10 mn-t-small"
+      @click="backSelection">Back to selection
+  </button>
+</template>
+
+<script setup>
+  const emits = defineEmits(['back-selection'])
+
+  function backSelection() {
+    emits("back-selection");
+  }
+</script>
+
+<style scoped>
+</style>

package/src/modules/wallet/components/blocks/CryptoDeposite.vue

@@ -0,0 +1,55 @@
+<template>
+  <h2 class="mn-b-small t-center t-bold">{{ t('depositeWithCrypto') }}</h2>
+
+  <div class="bg-grey radius-big mn-t-semi mn-b-semi flex flex-justify-between">
+    <Field
+      :placeholder="t('enterAmount')"
+      class="pd-medium radius-small"
+    />
+
+    <div class="uppercase flex flex-justify-center flex-items-center mn-r-semi t-semi">
+      POLY USDT
+    </div>
+  </div>
+
+  <h3 class="t-semi">You will receieve: 0 WDT</h3>
+
+  <button
+    class="uppercase w-100 bg-main t-black pd-thin radius-medium t-center br-solid br-2px br-black-transp-10 mn-t-small"
+    @click="switchMenu(3)"
+  >
+    {{ t('pay') }}
+  </button>
+
+  <button
+    class="uppercase w-100 bg-main t-black pd-thin radius-medium t-center br-solid br-2px br-black-transp-10 mn-t-small"
+    @click="backSelection"
+  >
+    {{ t('backToSelection') }}
+  </button>
+</template>
+
+<script setup>
+  import text from '@pf/src/modules/wallet/localization/Wallet.json'
+  import Field from '@pf/src/components/Field/Field.vue'
+  import { useI18n } from 'vue-i18n'
+
+  const emits = defineEmits(['back-selection', 'switch-menu'])
+
+  // Localization
+  const { t } = useI18n({
+    useScope: 'global', 
+    ...text
+  })
+
+  function backSelection() {
+    emits("back-selection")
+  }
+
+  function switchMenu(screen = 0) {
+    emits("switch-menu", screen)
+  }
+</script>
+
+<style scoped>
+</style>