@ozdao/prometheus-framework 0.0.85 → 0.0.86

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ozdao/prometheus-framework",
-  "version": "0.0.85",
+  "version": "0.0.86",
   "description": "Web3 Framework focused on user experience and ease of development.",
   "author": "OZ DAO <hello@ozdao.dev>",
   "license": "GPL-3.0-or-later",

package/src/modules/icons/entities/IconCommunity.vue

@@ -0,0 +1,8 @@
+<template>
+	<svg width="56" height="56" viewBox="0 0 56 56" fill="none" xmlns="http://www.w3.org/2000/svg">
+		<path d="M28.2899 50C24.4282 50.007 20.6332 48.9927 17.2899 47.06L12.5299 49.17C11.6317 49.567 10.6307 49.6695 9.67068 49.4627C8.71061 49.2558 7.84068 48.7503 7.1856 48.0186C6.53051 47.2869 6.12391 46.3666 6.02409 45.3896C5.92426 44.4126 6.13634 43.4291 6.62991 42.58L8.96991 38.58C6.65145 34.3531 5.78562 29.4816 6.50556 24.7147C7.22549 19.9478 9.49132 15.5493 12.9546 12.1956C16.418 8.84187 20.887 6.71863 25.6747 6.15233C30.4623 5.58604 35.3034 6.60805 39.4536 9.06121C43.6037 11.5144 46.8332 15.2629 48.6454 19.7303C50.4576 24.1977 50.7522 29.1367 49.4839 33.7879C48.2155 38.4391 45.4545 42.5448 41.6254 45.4739C37.7962 48.403 33.1109 49.9932 28.2899 50ZM17.4799 42.81C17.8631 42.811 18.238 42.9221 18.5599 43.13C22.2995 45.5441 26.7982 46.4939 31.1945 45.7975C35.5908 45.1011 39.5757 42.8075 42.3861 39.3558C45.1966 35.9041 46.6349 31.537 46.4258 27.0908C46.2167 22.6446 44.3748 18.4318 41.2529 15.2591C38.1309 12.0864 33.9483 10.1769 29.5061 9.89616C25.0638 9.61544 20.6741 10.9833 17.1776 13.7377C13.6811 16.4921 11.3235 20.4396 10.5563 24.8241C9.78918 29.2086 10.6664 33.722 13.0199 37.5C13.2068 37.8111 13.3055 38.1671 13.3055 38.53C13.3055 38.8929 13.2068 39.2489 13.0199 39.56L10.0899 44.56C10.0202 44.6791 9.99023 44.8174 10.0043 44.9547C10.0184 45.0919 10.0759 45.2212 10.1683 45.3237C10.2608 45.4262 10.3834 45.4966 10.5186 45.5247C10.6537 45.5528 10.7943 45.5371 10.9199 45.48L16.6699 43C16.9236 42.8806 17.1996 42.8159 17.4799 42.81Z" fill="white"/>
+		<path d="M28.2898 30C27.7594 30 27.2507 29.7893 26.8756 29.4142C26.5005 29.0391 26.2898 28.5304 26.2898 28C26.2898 27.4696 26.5005 26.9609 26.8756 26.5858C27.2507 26.2107 27.7594 26 28.2898 26C28.8202 26 29.3289 26.2107 29.704 26.5858C30.0791 26.9609 30.2898 27.4696 30.2898 28C30.2898 28.5304 30.0791 29.0391 29.704 29.4142C29.3289 29.7893 28.8202 30 28.2898 30Z" fill="white"/>
+		<path d="M20.2898 30C19.7594 30 19.2507 29.7893 18.8756 29.4142C18.5005 29.0391 18.2898 28.5304 18.2898 28C18.2898 27.4696 18.5005 26.9609 18.8756 26.5858C19.2507 26.2107 19.7594 26 20.2898 26C20.8202 26 21.3289 26.2107 21.704 26.5858C22.0791 26.9609 22.2898 27.4696 22.2898 28C22.2898 28.5304 22.0791 29.0391 21.704 29.4142C21.3289 29.7893 20.8202 30 20.2898 30Z" fill="white"/>
+		<path d="M36.2898 30C35.7594 30 35.2507 29.7893 34.8756 29.4142C34.5005 29.0391 34.2898 28.5304 34.2898 28C34.2898 27.4696 34.5005 26.9609 34.8756 26.5858C35.2507 26.2107 35.7594 26 36.2898 26C36.8202 26 37.3289 26.2107 37.704 26.5858C38.0791 26.9609 38.2898 27.4696 38.2898 28C38.2898 28.5304 38.0791 29.0391 37.704 29.4142C37.3289 29.7893 36.8202 30 36.2898 30Z" fill="white"/>
+	</svg>
+</template>

package/src/modules/organizations/components/blocks/CardOrganization.vue

@@ -3,7 +3,7 @@
     class="bg-grey radius-big o-hidden"
     @click="$router.push({name: 'Organization', params: {_id: organization._id}})"
   >
-    <div class="pd-medium br-b br-solid br-black-transp flex-v-center flex-nowrap flex">
+    <div class="pd-medium flex-v-center flex-nowrap flex">
       <img 
         v-if="organization.profile.photo && organization.profile.photo.length > 0"
         :src="organization.profile.photo" 
@@ -18,7 +18,7 @@
       <div class="mn-l-small">
         <p class="h3 mn-r-semi mn-thin">{{organization.profile.name}}</p>
 
-        <div v-if="organization.rating" class="w-max star-container flex-v-center flex">
+        <div v-if="organization.ratingS" class="w-max star-container flex-v-center flex">
           <span class="mn-r-thin pd-r-thin pd-l-thin pd-micro radius-small t-semi uppercase bg-main p-small">
             {{organization.types[0]}}
           </span> 

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

@@ -26,6 +26,7 @@
 	import { onMounted, ref } from 'vue'
 	import CardOrganization from '@pf/src/modules/organizations/components/blocks/CardOrganization.vue'
 	import EmptyState from '@pf/src/components/EmptyState/EmptyState.vue'
+	
 	import * as auth from '@pf/src/modules/auth/store/auth'
 	import * as organization from '@pf/src/modules/organizations/store/organizations'
 	import * as memberships from '@pf/src/modules/organizations/store/memberships'

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

@@ -53,7 +53,7 @@ const controllerFactory = (db) => {
       ...(req.query.member ? [{"memberships.user": new ObjectId(req.query.member), "memberships.role": { $ne: 'subscriber' } } ] : [] ),
       ...(req.query.subscriber ? [{"memberships.user": new ObjectId(req.query.subscriber), "memberships.role": 'subscriber'} ] : [] ),
       ...(req.query.postable ? [{$or: [{$and: [{ types: { $elemMatch: { $eq: 'public' } } }, { "memberships.user": new ObjectId(req.query.postable) } ] }, {$and: [{types: {$elemMatch: {$in: ['exclusive', 'hidden'] } } }, { "memberships.user": new ObjectId(req.query.postable) }, { "memberships.role": { $ne: 'subscriber' } } ] } ] } ] : [] ),
-      ...(req.query.types ?  [{ types: { $in: req.query.types.split(',') } }] : []),  // Если req.query.types - строка
+      ...(req.query.types ?  [{ types: { $in: req.query.types } }] : []),  // Если req.query.types - строка
       // to remove
       ...(req.query.onlyuser ? [{ "memberships.user": new ObjectId(req.query.onlyuser) }] : []),
       ...(categories.length > 0 ? [{ "products.category": { $in: categories } }] : []),

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

@@ -7,7 +7,7 @@
 			class="pd-thin w-100"
 		>
 			<ProfileCompletion 
-				v-if="route.params._id === auth.state.user._id" 
+				v-if="route.params._id === auth.state.user._id && show" 
 		    :user="auth.state.user._id"
 		    :target="users.state.current"
 		    :cta="true" 
@@ -91,6 +91,7 @@
 			    <span>Groups</span>
 			  </MenuItem>
 			 	<MenuItem @click="router.push({name: 'User Blogposts', params: {_id: route.params._id}})" class="cursor-pointer">
+			 		<IconCommunity class="i-semi" :icon="true"/>
 			    <span>Posts</span>
 			  </MenuItem> 
 			</Menu>
@@ -121,7 +122,9 @@
 			  </MenuItem>
 			  
 			  <MenuItem 
-			  	class="cursor-pointer">
+			  	class="cursor-pointer"
+					@click="logout()"
+			  >
 			    <span 
 			    	class="t-red"
 			    >
@@ -129,7 +132,7 @@
 			    	</span>
 			  </MenuItem>
 			</Menu>
-			
+
 		</div>
 	</div>
 </template>
@@ -150,6 +153,7 @@ import ProfileCompletion from '@pf/src/modules/users/components/sections/Profile
 // Icons Module
 import IconEvents from '@pf/src/modules/icons/entities/IconEvents.vue'
 import IconGroups from '@pf/src/modules/icons/entities/IconGroups.vue'
+import IconCommunity from '@pf/src/modules/icons/entities/IconCommunity.vue'
 
 import IconEdit from '@pf/src/modules/icons/navigation/IconEdit.vue'
 
@@ -165,14 +169,21 @@ import * as memberships from '@pf/src/modules/organizations/store/memberships'
 const route = useRoute()
 const router = useRouter()
 // Get organization _id from cookie
+const show = ref(false)
 
- onMounted(async () => {
+onMounted(async () => {
  	await users.actions.read({ _id: route.params._id, user: auth.state.user._id });
+ 	show.value = true
 })
 
 const handleMembershipUpdate = ({ membership, isMember, targetId }) => {
   memberships.mutations.handleMembershipUpdate(users.state.current, membership, isMember, targetId)
 };
+
+function logout () {
+  auth.actions.logout()
+  router.push({name: 'Sign In'})
+}
 </script>
 
 <style lang="scss">