@ozdao/prometheus-framework 0.2.306 → 0.2.307

package/src/modules/organizations/components/pages/Organizations.vue

@@ -1,6 +1,6 @@
 <template>
 	<div>
-	<header v-if="!MOBILE_APP"  class="pd-small flex-v-center flex-nowrap flex">
+		<header v-if="!MOBILE_APP"  class="pd-small bg-red flex-v-center flex-nowrap flex">
     	<h2 class="mn-r-medium">Groups</h2>
     	<button 
     		@click="$router.push({
@@ -18,7 +18,6 @@
     			+
     	</button>
 		</header>
-
 		<Tab 
 			v-model:selected="tabOrganization"
 			:tabs="[
@@ -26,6 +25,7 @@
 				{ name: 'Member', 	value: 'member' },
 				{ name: 'Follower', value: 'follower' }		
 			]"
+			style="flex: 1 0 auto;"
 			class="
 				o-hidden 
 				h5 
@@ -35,46 +35,47 @@
 			"
 			tabClass="bg-light pd-small radius-small w-100"
 		/>
-			<div class="pd-small">
-		<transition name="slide-fade">
-			<Feed
-        :showLoadMore="false" 
-        :search="{
-          placeholder: 'Search organization...',
-          class: 'mn-b-small'
-        }"
-        :states="{
-          empty: {
-            title: 'No organizations Found',
-            description: 'Currently, there are no such organizations available.'
-          }
-        }"
-        :store="{
-          read: (options) => organizations.actions.read(options),
-          state: null
-        }"
-        :options="{
-          user: auth.state.user._id,
-          [tabOrganization === 'owner' ? 'owner' : 
-           tabOrganization === 'member' ? 'member' : 'subscriber']: route.params._id,
-          lookup: ['memberships']
-        }"
-        v-slot="{ 
-          items 
-        }"
-      >
-      	<CardOrganization 
-			   	v-for="(organization, index) in items" 
-          v-memo="[organization._id, organization.profile.name]"
-			    :organization="organization"
-			    :showRating="true"
-			    :showFollowers="true"
-			    :showProducts="false"
-			    class="bg-light mn-b-thin w-100 o-hidden radius-big pd-medium"
-			  />
-      </Feed>
-	</transition>
-</div>
+			<div class="pd-small  h-100  bg-white">
+				<transition name="slide-fade">
+					<Feed
+		        :showLoadMore="false" 
+		        :search="{
+		          placeholder: 'Search organization...',
+		          class: 'mn-b-small'
+		        }"
+		        :states="{
+		          empty: {
+		            title: 'No organizations Found',
+		            description: 'Currently, there are no such organizations available.'
+		          }
+		        }"
+		        :store="{
+		          read: (options) => organizations.actions.read(options),
+		          state: null
+		        }"
+		        :options="{
+		          user: auth.state.user._id,
+		          [tabOrganization === 'owner' ? 'owner' : 
+		           tabOrganization === 'member' ? 'member' : 'subscriber']: route.params._id,
+		          lookup: ['memberships']
+		        }"
+		        v-slot="{ 
+		          items 
+		        }"
+		         style="height: 200rem"
+		      >
+		      	<CardOrganization 
+					   	v-for="(organization, index) in items" 
+		          v-memo="[organization._id, organization.profile.name]"
+					    :organization="organization"
+					    :showRating="true"
+					    :showFollowers="true"
+					    :showProducts="false"
+					    class="bg-light mn-b-thin w-100 o-hidden radius-big pd-medium"
+					  />
+		      </Feed>
+			</transition>
+		</div>
 	</div>
 </template>
 

package/src/modules/products/components/pages/Products.vue

@@ -1,18 +1,18 @@
 <template>
-  <div>
-  <header 
-    v-if="route.name !== 'Organization'"
-    class="mn-b-medium flex-v-center flex-nowrap flex"
-  >
-    <h2 class="mn-r-medium">Products</h2>
-    <button 
-      @click="$router.push({
-        name: route.params._id ? 'Organization_ProductAdd' : 'ProductAdd'
-      })" 
-      class="radius-100 i-big hover-scale-1 cursor-pointer t-white bg-second">
-        +
-    </button>
-  </header>
+  <div class="h-100">
+    <header 
+      v-if="route.name !== 'Organization' && !MOBILE_APP"
+      class="mn-b-medium flex-v-center flex-nowrap flex"
+    >
+      <h2 class="mn-r-medium">Products</h2>
+      <button 
+        @click="$router.push({
+          name: route.params._id ? 'Organization_ProductAdd' : 'ProductAdd'
+        })" 
+        class="radius-100 i-big hover-scale-1 cursor-pointer t-white bg-second">
+          +
+      </button>
+    </header>
 
   <Tab 
     v-if="route.name !== 'Organization'"
@@ -23,27 +23,38 @@
       { name: 'Unpublished',  value: 'unpublished' }, 
       { name: 'Archivied',    value: 'archivied' } 
     ]"
-    class="mn-b-small o-hidden h5 radius-big bg-light"
+    style="flex: 0 0 auto"
+   class="
+        o-hidden 
+        h5 
+        bg-light
+        gap-micro pd-small pd-t-thin pd-b-thin
+        pos-sticky pos-t-0
+        z-index-1
+      "
+      tabClass="bg-white pd-small radius-small w-100"
   />
 
-  <div class="cols-2-1_3 bg-light pd-thin radius-big gap-thin">
+  <div class="cols-2-1_3 h-100 z-index-3 pos-relative radius-big gap-thin">
 
     <BlockFilter
       v-model:filter="marketplace.state.filter"
       :options="marketplace.state.filter.options"
-      class="h-100 w-100 desktop-only"
+      class="h-100 w-100 z-index-2 desktop-only"
     />
 
 
-    <div class="rows-1">
-      <!-- <BlockSearch 
-        @search="updateSearch"
-        placeholder="Enter product name"
-        class="bg-white mn-b-thin"
-      /> -->
+    <div class="rows-1 h-100 z-index-3 bg-white radius-tl-big radius-tr-big">
+      <div class="pd-thin z-index-3 radius-tl-big radius-tr-big pos-t-0 pos-sticky">
+        <BlockSearch 
+          @search="updateSearch"
+          placeholder="Enter product name"
+          class="bg-light h-4r"
+        />
+      </div>
       <Feed
         v-model:filter="marketplace.state.filter"
-        :search="true"
+        
         :states="{
           empty: {
             title: 'No Products Found',
@@ -67,14 +78,14 @@
         v-slot="{ 
           items 
         }"
-        class="cols-4 gap-thin"
+        class="cols-4 pd-thin gap-thin"
       >
         <CardProduct
           v-for="product in items"
           :key="product._id"
           :product="product"
           :user="auth.state.access"
-          class="h-max"
+          class="h-max bg-white"
           @click.capture="$router.push({
             name: 'Organization_Product', 
             params: { 

package/src/modules/products/router/products.router.js

@@ -1,5 +1,9 @@
 import * as validationAuth from '@pf/src/modules/auth/views/middlewares/auth.validation';
 
+import * as auth from '@pf/src/modules/auth/views/store/auth';
+
+import IconPlus from '@pf/src/modules/icons/navigation/IconPlus.vue'
+
 export function createProductRoutes(prefix = '', options = {}) {
   const nameWithPrefix = (name) => prefix ? `${prefix}${name}` : name;
 
@@ -14,6 +18,17 @@ export function createProductRoutes(prefix = '', options = {}) {
             en: 'Products',
             ru: 'Товары'
           },
+
+          actions: [
+          {
+            component: IconPlus,
+            props: {
+              fill: "rgb(var(--main))" 
+            },
+            condition: () => auth.state.user && auth.state.user._id,
+            action: (router) => router.push({ name: 'ProductAdd' })
+          }
+        ],
           authorize: options.productsAuthorize || []
         },
         component: () => import(/* webpackChunkName: 'Products' */ '@pf/src/modules/products/components/pages/Products.vue'),

package/src/modules/wallet/controllers/factories/rewards.factory.js

@@ -37,6 +37,7 @@ const rewardsControllerFactory = (db, wdmClient, wss) => {
   const lookup = {};
 
   wss.on('connection', (ws, req) => {
+    ws.type = 'rewards';
     if (req.userId) {
       lookup[req.userId] = ws;
 

package/src/modules/wallet/wallet.server.js

@@ -17,7 +17,7 @@ function initializePayments(app, db, wss, wdmClient, origins, publicPath) {
   // Setup routes if the app object is provided
   if (app) {
     RoutesPayments(app, db, origins, publicPath)
-    RoutesRewards(app, db, wss, wdmClient, origins)
+    // RoutesRewards(app, db, wss, wdmClient, origins)
   }
 }
 

package/src/styles/typography.scss

@@ -12,12 +12,11 @@ body {
 }
 
 // Font Styles
-.h0  		{ font-family: var(--font-main); font-weight: 500; font-size: 8.000rem; 	line-height: 1.000; letter-spacing: -0.05rem; 	text-transform: none; }
-h1,.h1  { font-family: var(--font-main); font-weight: 500; font-size: 3.500rem; 	line-height: 1.000; letter-spacing: -0.05rem; 	text-transform: none; }
-h2,.h2  { font-family: var(--font-main); font-weight: 500; font-size: 3.000rem; 	line-height: 1.000; letter-spacing: -0.05rem;	text-transform: none; }
-h3,.h3  { font-family: var(--font-main); font-weight: 500; font-size: 2.000rem; 	line-height: 1.000; letter-spacing: -0.05rem;	text-transform: none; }
-h4,.h4  { font-family: var(--font-main); font-weight: 500; font-size: 1.250rem; 	line-height: 1.250; letter-spacing: +0.0rem; 	text-transform: none; }
-h5,.h5 	{ font-family: var(--font-main); font-weight: 500; font-size: 1.000rem; 	line-height: 1.250;	letter-spacing: -0.0rem; 	text-transform: none; }
+h1,.h1  { font-family: var(--font-main); font-weight: 500; font-size: 3.750rem; 	line-height: 1.000; letter-spacing: -0.05rem; 	text-transform: none; }
+h2,.h2  { font-family: var(--font-main); font-weight: 500; font-size: 2.500rem; 	line-height: 1.000; letter-spacing: -0.05rem;	text-transform: none; }
+h3,.h3  { font-family: var(--font-main); font-weight: 500; font-size: 1.250rem; 	line-height: 1.000; letter-spacing: -0.05rem;	text-transform: none; }
+h4,.h4  { font-family: var(--font-main); font-weight: 500; font-size: 1.500rem; 	line-height: 1.250; letter-spacing: +0.0rem; 	text-transform: none; }
+h5,.h5 	{ font-family: var(--font-main); font-weight: 500; font-size: 0.750rem; 	line-height: 1.250;	letter-spacing: -0.0rem; 	text-transform: none; }
 
 // Typogragy Styles
 		.p-small     	{ font-family: var(--font-second); font-weight: 400;				font-size: 0.75rem;		line-height: 1.250; }